Merge remote-tracking branch 'upstream' into tustin2121-patch-5

30 files changed, 17644 insertions, 18672 deletions

diff --git a/src/data/battle_frontier/apprentice.h b/src/data/battle_frontier/apprentice.h
new file mode 100644
index 000000000..349dc9619
--- /dev/null
+++ b/src/data/battle_frontier/apprentice.h
@@ -0,0 +1,982 @@
+// data/text/apprentice.inc
+extern const u8 gText_ApprenticePleaseTeach0[];
+extern const u8 gText_ApprenticePleaseTeach1[];
+extern const u8 gText_ApprenticePleaseTeach2[];
+extern const u8 gText_ApprenticePleaseTeach3[];
+extern const u8 gText_ApprenticePleaseTeach4[];
+extern const u8 gText_ApprenticePleaseTeach5[];
+extern const u8 gText_ApprenticePleaseTeach6[];
+extern const u8 gText_ApprenticePleaseTeach7[];
+extern const u8 gText_ApprenticePleaseTeach8[];
+extern const u8 gText_ApprenticePleaseTeach9[];
+extern const u8 gText_ApprenticePleaseTeach10[];
+extern const u8 gText_ApprenticePleaseTeach11[];
+extern const u8 gText_ApprenticePleaseTeach12[];
+extern const u8 gText_ApprenticePleaseTeach13[];
+extern const u8 gText_ApprenticePleaseTeach14[];
+extern const u8 gText_ApprenticePleaseTeach15[];
+extern const u8 gText_ApprenticeRejectTeaching0[];
+extern const u8 gText_ApprenticeRejectTeaching1[];
+extern const u8 gText_ApprenticeRejectTeaching2[];
+extern const u8 gText_ApprenticeRejectTeaching3[];
+extern const u8 gText_ApprenticeRejectTeaching4[];
+extern const u8 gText_ApprenticeRejectTeaching5[];
+extern const u8 gText_ApprenticeRejectTeaching6[];
+extern const u8 gText_ApprenticeRejectTeaching7[];
+extern const u8 gText_ApprenticeRejectTeaching8[];
+extern const u8 gText_ApprenticeRejectTeaching9[];
+extern const u8 gText_ApprenticeRejectTeaching10[];
+extern const u8 gText_ApprenticeRejectTeaching11[];
+extern const u8 gText_ApprenticeRejectTeaching12[];
+extern const u8 gText_ApprenticeRejectTeaching13[];
+extern const u8 gText_ApprenticeRejectTeaching14[];
+extern const u8 gText_ApprenticeRejectTeaching15[];
+extern const u8 gText_ApprenticeWhichLevelMode0[];
+extern const u8 gText_ApprenticeWhichLevelMode1[];
+extern const u8 gText_ApprenticeWhichLevelMode2[];
+extern const u8 gText_ApprenticeWhichLevelMode3[];
+extern const u8 gText_ApprenticeWhichLevelMode4[];
+extern const u8 gText_ApprenticeWhichLevelMode5[];
+extern const u8 gText_ApprenticeWhichLevelMode6[];
+extern const u8 gText_ApprenticeWhichLevelMode7[];
+extern const u8 gText_ApprenticeWhichLevelMode8[];
+extern const u8 gText_ApprenticeWhichLevelMode9[];
+extern const u8 gText_ApprenticeWhichLevelMode10[];
+extern const u8 gText_ApprenticeWhichLevelMode11[];
+extern const u8 gText_ApprenticeWhichLevelMode12[];
+extern const u8 gText_ApprenticeWhichLevelMode13[];
+extern const u8 gText_ApprenticeWhichLevelMode14[];
+extern const u8 gText_ApprenticeWhichLevelMode15[];
+extern const u8 gText_ApprenticeLevelModeThanks0[];
+extern const u8 gText_ApprenticeLevelModeThanks1[];
+extern const u8 gText_ApprenticeLevelModeThanks2[];
+extern const u8 gText_ApprenticeLevelModeThanks3[];
+extern const u8 gText_ApprenticeLevelModeThanks4[];
+extern const u8 gText_ApprenticeLevelModeThanks5[];
+extern const u8 gText_ApprenticeLevelModeThanks6[];
+extern const u8 gText_ApprenticeLevelModeThanks7[];
+extern const u8 gText_ApprenticeLevelModeThanks8[];
+extern const u8 gText_ApprenticeLevelModeThanks9[];
+extern const u8 gText_ApprenticeLevelModeThanks10[];
+extern const u8 gText_ApprenticeLevelModeThanks11[];
+extern const u8 gText_ApprenticeLevelModeThanks12[];
+extern const u8 gText_ApprenticeLevelModeThanks13[];
+extern const u8 gText_ApprenticeLevelModeThanks14[];
+extern const u8 gText_ApprenticeLevelModeThanks15[];
+
+extern const u8 gText_ApprenticeWhichMon0[];
+extern const u8 gText_ApprenticeWhichMon1[];
+extern const u8 gText_ApprenticeWhichMon2[];
+extern const u8 gText_ApprenticeWhichMon3[];
+extern const u8 gText_ApprenticeWhichMon4[];
+extern const u8 gText_ApprenticeWhichMon5[];
+extern const u8 gText_ApprenticeWhichMon6[];
+extern const u8 gText_ApprenticeWhichMon7[];
+extern const u8 gText_ApprenticeWhichMon8[];
+extern const u8 gText_ApprenticeWhichMon9[];
+extern const u8 gText_ApprenticeWhichMon10[];
+extern const u8 gText_ApprenticeWhichMon11[];
+extern const u8 gText_ApprenticeWhichMon12[];
+extern const u8 gText_ApprenticeWhichMon13[];
+extern const u8 gText_ApprenticeWhichMon14[];
+extern const u8 gText_ApprenticeWhichMon15[];
+extern const u8 gText_ApprenticeMonThanks0[];
+extern const u8 gText_ApprenticeMonThanks1[];
+extern const u8 gText_ApprenticeMonThanks2[];
+extern const u8 gText_ApprenticeMonThanks3[];
+extern const u8 gText_ApprenticeMonThanks4[];
+extern const u8 gText_ApprenticeMonThanks5[];
+extern const u8 gText_ApprenticeMonThanks6[];
+extern const u8 gText_ApprenticeMonThanks7[];
+extern const u8 gText_ApprenticeMonThanks8[];
+extern const u8 gText_ApprenticeMonThanks9[];
+extern const u8 gText_ApprenticeMonThanks10[];
+extern const u8 gText_ApprenticeMonThanks11[];
+extern const u8 gText_ApprenticeMonThanks12[];
+extern const u8 gText_ApprenticeMonThanks13[];
+extern const u8 gText_ApprenticeMonThanks14[];
+extern const u8 gText_ApprenticeMonThanks15[];
+
+extern const u8 gText_ApprenticeWhatHeldItem0[];
+extern const u8 gText_ApprenticeWhatHeldItem1[];
+extern const u8 gText_ApprenticeWhatHeldItem2[];
+extern const u8 gText_ApprenticeWhatHeldItem3[];
+extern const u8 gText_ApprenticeWhatHeldItem4[];
+extern const u8 gText_ApprenticeWhatHeldItem5[];
+extern const u8 gText_ApprenticeWhatHeldItem6[];
+extern const u8 gText_ApprenticeWhatHeldItem7[];
+extern const u8 gText_ApprenticeWhatHeldItem8[];
+extern const u8 gText_ApprenticeWhatHeldItem9[];
+extern const u8 gText_ApprenticeWhatHeldItem10[];
+extern const u8 gText_ApprenticeWhatHeldItem11[];
+extern const u8 gText_ApprenticeWhatHeldItem12[];
+extern const u8 gText_ApprenticeWhatHeldItem13[];
+extern const u8 gText_ApprenticeWhatHeldItem14[];
+extern const u8 gText_ApprenticeWhatHeldItem15[];
+extern const u8 gText_ApprenticeHoldNothing0[];
+extern const u8 gText_ApprenticeHoldNothing1[];
+extern const u8 gText_ApprenticeHoldNothing2[];
+extern const u8 gText_ApprenticeHoldNothing3[];
+extern const u8 gText_ApprenticeHoldNothing4[];
+extern const u8 gText_ApprenticeHoldNothing5[];
+extern const u8 gText_ApprenticeHoldNothing6[];
+extern const u8 gText_ApprenticeHoldNothing7[];
+extern const u8 gText_ApprenticeHoldNothing8[];
+extern const u8 gText_ApprenticeHoldNothing9[];
+extern const u8 gText_ApprenticeHoldNothing10[];
+extern const u8 gText_ApprenticeHoldNothing11[];
+extern const u8 gText_ApprenticeHoldNothing12[];
+extern const u8 gText_ApprenticeHoldNothing13[];
+extern const u8 gText_ApprenticeHoldNothing14[];
+extern const u8 gText_ApprenticeHoldNothing15[];
+extern const u8 gText_ApprenticeThanksNoHeldItem0[];
+extern const u8 gText_ApprenticeThanksNoHeldItem1[];
+extern const u8 gText_ApprenticeThanksNoHeldItem2[];
+extern const u8 gText_ApprenticeThanksNoHeldItem3[];
+extern const u8 gText_ApprenticeThanksNoHeldItem4[];
+extern const u8 gText_ApprenticeThanksNoHeldItem5[];
+extern const u8 gText_ApprenticeThanksNoHeldItem6[];
+extern const u8 gText_ApprenticeThanksNoHeldItem7[];
+extern const u8 gText_ApprenticeThanksNoHeldItem8[];
+extern const u8 gText_ApprenticeThanksNoHeldItem9[];
+extern const u8 gText_ApprenticeThanksNoHeldItem10[];
+extern const u8 gText_ApprenticeThanksNoHeldItem11[];
+extern const u8 gText_ApprenticeThanksNoHeldItem12[];
+extern const u8 gText_ApprenticeThanksNoHeldItem13[];
+extern const u8 gText_ApprenticeThanksNoHeldItem14[];
+extern const u8 gText_ApprenticeThanksNoHeldItem15[];
+extern const u8 gText_ApprenticeThanksHeldItem0[];
+extern const u8 gText_ApprenticeThanksHeldItem1[];
+extern const u8 gText_ApprenticeThanksHeldItem2[];
+extern const u8 gText_ApprenticeThanksHeldItem3[];
+extern const u8 gText_ApprenticeThanksHeldItem4[];
+extern const u8 gText_ApprenticeThanksHeldItem5[];
+extern const u8 gText_ApprenticeThanksHeldItem6[];
+extern const u8 gText_ApprenticeThanksHeldItem7[];
+extern const u8 gText_ApprenticeThanksHeldItem8[];
+extern const u8 gText_ApprenticeThanksHeldItem9[];
+extern const u8 gText_ApprenticeThanksHeldItem10[];
+extern const u8 gText_ApprenticeThanksHeldItem11[];
+extern const u8 gText_ApprenticeThanksHeldItem12[];
+extern const u8 gText_ApprenticeThanksHeldItem13[];
+extern const u8 gText_ApprenticeThanksHeldItem14[];
+extern const u8 gText_ApprenticeThanksHeldItem15[];
+extern const u8 gText_ApprenticeItemAlreadyRecommended0[];
+extern const u8 gText_ApprenticeItemAlreadyRecommended1[];
+extern const u8 gText_ApprenticeItemAlreadyRecommended2[];
+extern const u8 gText_ApprenticeItemAlreadyRecommended3[];
+extern const u8 gText_ApprenticeItemAlreadyRecommended4[];
+extern const u8 gText_ApprenticeItemAlreadyRecommended5[];
+extern const u8 gText_ApprenticeItemAlreadyRecommended6[];
+extern const u8 gText_ApprenticeItemAlreadyRecommended7[];
+extern const u8 gText_ApprenticeItemAlreadyRecommended8[];
+extern const u8 gText_ApprenticeItemAlreadyRecommended9[];
+extern const u8 gText_ApprenticeItemAlreadyRecommended10[];
+extern const u8 gText_ApprenticeItemAlreadyRecommended11[];
+extern const u8 gText_ApprenticeItemAlreadyRecommended12[];
+extern const u8 gText_ApprenticeItemAlreadyRecommended13[];
+extern const u8 gText_ApprenticeItemAlreadyRecommended14[];
+extern const u8 gText_ApprenticeItemAlreadyRecommended15[];
+
+extern const u8 gText_ApprenticeWhichMove0[];
+extern const u8 gText_ApprenticeWhichMove1[];
+extern const u8 gText_ApprenticeWhichMove2[];
+extern const u8 gText_ApprenticeWhichMove3[];
+extern const u8 gText_ApprenticeWhichMove4[];
+extern const u8 gText_ApprenticeWhichMove5[];
+extern const u8 gText_ApprenticeWhichMove6[];
+extern const u8 gText_ApprenticeWhichMove7[];
+extern const u8 gText_ApprenticeWhichMove8[];
+extern const u8 gText_ApprenticeWhichMove9[];
+extern const u8 gText_ApprenticeWhichMove10[];
+extern const u8 gText_ApprenticeWhichMove11[];
+extern const u8 gText_ApprenticeWhichMove12[];
+extern const u8 gText_ApprenticeWhichMove13[];
+extern const u8 gText_ApprenticeWhichMove14[];
+extern const u8 gText_ApprenticeWhichMove15[];
+extern const u8 gText_ApprenticeMoveThanks0[];
+extern const u8 gText_ApprenticeMoveThanks1[];
+extern const u8 gText_ApprenticeMoveThanks2[];
+extern const u8 gText_ApprenticeMoveThanks3[];
+extern const u8 gText_ApprenticeMoveThanks4[];
+extern const u8 gText_ApprenticeMoveThanks5[];
+extern const u8 gText_ApprenticeMoveThanks6[];
+extern const u8 gText_ApprenticeMoveThanks7[];
+extern const u8 gText_ApprenticeMoveThanks8[];
+extern const u8 gText_ApprenticeMoveThanks9[];
+extern const u8 gText_ApprenticeMoveThanks10[];
+extern const u8 gText_ApprenticeMoveThanks11[];
+extern const u8 gText_ApprenticeMoveThanks12[];
+extern const u8 gText_ApprenticeMoveThanks13[];
+extern const u8 gText_ApprenticeMoveThanks14[];
+extern const u8 gText_ApprenticeMoveThanks15[];
+
+extern const u8 gText_ApprenticeWhichMonFirst0[];
+extern const u8 gText_ApprenticeWhichMonFirst1[];
+extern const u8 gText_ApprenticeWhichMonFirst2[];
+extern const u8 gText_ApprenticeWhichMonFirst3[];
+extern const u8 gText_ApprenticeWhichMonFirst4[];
+extern const u8 gText_ApprenticeWhichMonFirst5[];
+extern const u8 gText_ApprenticeWhichMonFirst6[];
+extern const u8 gText_ApprenticeWhichMonFirst7[];
+extern const u8 gText_ApprenticeWhichMonFirst8[];
+extern const u8 gText_ApprenticeWhichMonFirst9[];
+extern const u8 gText_ApprenticeWhichMonFirst10[];
+extern const u8 gText_ApprenticeWhichMonFirst11[];
+extern const u8 gText_ApprenticeWhichMonFirst12[];
+extern const u8 gText_ApprenticeWhichMonFirst13[];
+extern const u8 gText_ApprenticeWhichMonFirst14[];
+extern const u8 gText_ApprenticeWhichMonFirst15[];
+extern const u8 gText_ApprenticeMonFirstThanks0[];
+extern const u8 gText_ApprenticeMonFirstThanks1[];
+extern const u8 gText_ApprenticeMonFirstThanks2[];
+extern const u8 gText_ApprenticeMonFirstThanks3[];
+extern const u8 gText_ApprenticeMonFirstThanks4[];
+extern const u8 gText_ApprenticeMonFirstThanks5[];
+extern const u8 gText_ApprenticeMonFirstThanks6[];
+extern const u8 gText_ApprenticeMonFirstThanks7[];
+extern const u8 gText_ApprenticeMonFirstThanks8[];
+extern const u8 gText_ApprenticeMonFirstThanks9[];
+extern const u8 gText_ApprenticeMonFirstThanks10[];
+extern const u8 gText_ApprenticeMonFirstThanks11[];
+extern const u8 gText_ApprenticeMonFirstThanks12[];
+extern const u8 gText_ApprenticeMonFirstThanks13[];
+extern const u8 gText_ApprenticeMonFirstThanks14[];
+extern const u8 gText_ApprenticeMonFirstThanks15[];
+
+extern const u8 gText_ApprenticePickWinSpeech0[];
+extern const u8 gText_ApprenticePickWinSpeech1[];
+extern const u8 gText_ApprenticePickWinSpeech2[];
+extern const u8 gText_ApprenticePickWinSpeech3[];
+extern const u8 gText_ApprenticePickWinSpeech4[];
+extern const u8 gText_ApprenticePickWinSpeech5[];
+extern const u8 gText_ApprenticePickWinSpeech6[];
+extern const u8 gText_ApprenticePickWinSpeech7[];
+extern const u8 gText_ApprenticePickWinSpeech8[];
+extern const u8 gText_ApprenticePickWinSpeech9[];
+extern const u8 gText_ApprenticePickWinSpeech10[];
+extern const u8 gText_ApprenticePickWinSpeech11[];
+extern const u8 gText_ApprenticePickWinSpeech12[];
+extern const u8 gText_ApprenticePickWinSpeech13[];
+extern const u8 gText_ApprenticePickWinSpeech14[];
+extern const u8 gText_ApprenticePickWinSpeech15[];
+extern const u8 gText_ApprenticeWinSpeechThanks0[];
+extern const u8 gText_ApprenticeWinSpeechThanks1[];
+extern const u8 gText_ApprenticeWinSpeechThanks2[];
+extern const u8 gText_ApprenticeWinSpeechThanks3[];
+extern const u8 gText_ApprenticeWinSpeechThanks4[];
+extern const u8 gText_ApprenticeWinSpeechThanks5[];
+extern const u8 gText_ApprenticeWinSpeechThanks6[];
+extern const u8 gText_ApprenticeWinSpeechThanks7[];
+extern const u8 gText_ApprenticeWinSpeechThanks8[];
+extern const u8 gText_ApprenticeWinSpeechThanks9[];
+extern const u8 gText_ApprenticeWinSpeechThanks10[];
+extern const u8 gText_ApprenticeWinSpeechThanks11[];
+extern const u8 gText_ApprenticeWinSpeechThanks12[];
+extern const u8 gText_ApprenticeWinSpeechThanks13[];
+extern const u8 gText_ApprenticeWinSpeechThanks14[];
+extern const u8 gText_ApprenticeWinSpeechThanks15[];
+
+extern const u8 gText_ApprenticeChallenge0[];
+extern const u8 gText_ApprenticeChallenge1[];
+extern const u8 gText_ApprenticeChallenge2[];
+extern const u8 gText_ApprenticeChallenge3[];
+extern const u8 gText_ApprenticeChallenge4[];
+extern const u8 gText_ApprenticeChallenge5[];
+extern const u8 gText_ApprenticeChallenge6[];
+extern const u8 gText_ApprenticeChallenge7[];
+extern const u8 gText_ApprenticeChallenge8[];
+extern const u8 gText_ApprenticeChallenge9[];
+extern const u8 gText_ApprenticeChallenge10[];
+extern const u8 gText_ApprenticeChallenge11[];
+extern const u8 gText_ApprenticeChallenge12[];
+extern const u8 gText_ApprenticeChallenge13[];
+extern const u8 gText_ApprenticeChallenge14[];
+extern const u8 gText_ApprenticeChallenge15[];
+
+const struct ApprenticeTrainer gApprentices[NUM_APPRENTICES] =
+{
+    {
+        .name = {_("サダヒロ"), _("ALANN"), _("ALAIN"), _("ADELFO"), _("CLAUS"), _("TEO")},
+        .otId = 0xBDC9,
+        .facilityClass = FACILITY_CLASS_BUG_CATCHER,
+        .species = {SPECIES_BEAUTIFLY, SPECIES_DUSTOX, SPECIES_ILLUMISE, SPECIES_SHIFTRY, SPECIES_BRELOOM, SPECIES_NINJASK, SPECIES_SHEDINJA, SPECIES_PINSIR, SPECIES_HERACROSS, SPECIES_VOLBEAT},
+        .id = 0,
+        .speechLost = {EC_WORD_NO, EC_WORD_MISTAKE, EC_WORD_EXCL, EC_WORD_I, EC_WORD_LOST, EC_WORD_BADLY},
+    },
+    {
+        .name = {_("ヒロオ"), _("LIONEL"), _("LIONEL"), _("CAIO"), _("LUDWIG"), _("LEO")},
+        .otId = 0xCF09,
+        .facilityClass = FACILITY_CLASS_YOUNGSTER,
+        .species = {SPECIES_SWELLOW, SPECIES_SWALOT, SPECIES_SHUCKLE, SPECIES_MANECTRIC, SPECIES_TORKOAL, SPECIES_HARIYAMA, SPECIES_MIGHTYENA, SPECIES_LUDICOLO, SPECIES_CRAWDAUNT, SPECIES_WHISCASH},
+        .id = 1,
+        .speechLost = {EC_WORD_OKAY, EC_WORD_I, EC_WORD_LOST, EC_WORD_YOU_RE, EC_WORD_A, EC_WORD_MASTER},
+    },
+    {
+        .name = {_("ケイジ"), _("SONNY"), _("HERVE"), _("FEDRO"), _("WENZEL"), _("SANTI")},
+        .otId = 0x2E34,
+        .facilityClass = FACILITY_CLASS_SCHOOL_KID_M,
+        .species = {SPECIES_LINOONE, SPECIES_MIGHTYENA, SPECIES_WHISCASH, SPECIES_ZANGOOSE, SPECIES_SEVIPER, SPECIES_NINETALES, SPECIES_KECLEON, SPECIES_SHUCKLE, SPECIES_MANECTRIC, SPECIES_MACHAMP},
+        .id = 2,
+        .speechLost = {EC_WORD_I, EC_WORD_WENT, EC_WORD_AND, EC_WORD_LOST, EC_WORD_AWW, EC_WORD_ELLIPSIS},
+    },
+    {
+        .name = {_("ユラ"), _("LAYLA"), _("LAYLA"), _("ASTRID"), _("SONJA"), _("LOLA")},
+        .otId = 0x84EF,
+        .facilityClass = FACILITY_CLASS_LASS,
+        .species = {SPECIES_SWALOT, SPECIES_XATU, SPECIES_ALTARIA, SPECIES_GOLDUCK, SPECIES_FLYGON, SPECIES_ALAKAZAM, SPECIES_GARDEVOIR, SPECIES_WAILORD, SPECIES_GRUMPIG, SPECIES_MIGHTYENA},
+        .id = 3,
+        .speechLost = {EC_WORD_IS, EC_WORD_THIS, EC_WORD_TOO, EC_WORD_MUCH, EC_WORD_QUES, 0xFFFF},
+    },
+    {
+        .name = {_("ヨウカ"), _("MACY"), _("AMELIE"), _("CLEO"), _("MARIA"), _("ELISA")},
+        .otId = 0x1E43,
+        .facilityClass = FACILITY_CLASS_SCHOOL_KID_F,
+        .species = {SPECIES_WIGGLYTUFF, SPECIES_LINOONE, SPECIES_KINGDRA, SPECIES_DELCATTY, SPECIES_RAICHU, SPECIES_FEAROW, SPECIES_STARMIE, SPECIES_MEDICHAM, SPECIES_SHIFTRY, SPECIES_BEAUTIFLY},
+        .id = 4,
+        .speechLost = {EC_WORD_THIS, EC_WORD_WON_T, EC_WORD_BE, EC_WORD_HAPPENING, EC_WORD_NEXT, EC_WORD_TIME},
+    },
+    {
+        .name = {_("ヤスシ"), _("DONTE"), _("BRAHIM"), _("GLAUCO"), _("JOSEF"), _("ROQUE")},
+        .otId = 0x379F,
+        .facilityClass = FACILITY_CLASS_RUNNING_TRIATHLETE_M,
+        .species = {SPECIES_STARMIE, SPECIES_DODRIO, SPECIES_AGGRON, SPECIES_MAGNETON, SPECIES_MACHAMP, SPECIES_ARMALDO, SPECIES_HERACROSS, SPECIES_NOSEPASS, SPECIES_EXPLOUD, SPECIES_MIGHTYENA},
+        .id = 5,
+        .speechLost = {EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_TO, EC_WORD_RUN, EC_WORD_BYE_BYE, EC_WORD_EXCL},
+    },
+    {
+        .name = {_("ミサオ"), _("AMIRA"), _("LAURE"), _("DAFNE"), _("AMELIE"), _("LARA")},
+        .otId = 0xF555,
+        .facilityClass = FACILITY_CLASS_RUNNING_TRIATHLETE_F,
+        .species = {SPECIES_STARMIE, SPECIES_DODRIO, SPECIES_MAGNETON, SPECIES_MEDICHAM, SPECIES_MIGHTYENA, SPECIES_GLALIE, SPECIES_GOLEM, SPECIES_ELECTRODE, SPECIES_PELIPPER, SPECIES_SHARPEDO},
+        .id = 6,
+        .speechLost = {EC_WORD_AHAHA, EC_WORD_DEFEATED, EC_WORD_EXCL, EC_WORD_IT_S, EC_WORD_NOTHING, EC_WORD_EXCL},
+    },
+    {
+        .name = {_("カズサ"), _("KALI"), _("JODIE"), _("ILENIA"), _("KARO"), _("ELSA")},
+        .otId = 0x8D26,
+        .facilityClass = FACILITY_CLASS_BEAUTY,
+        .species = {SPECIES_NINETALES, SPECIES_ALAKAZAM, SPECIES_SCEPTILE, SPECIES_SALAMENCE, SPECIES_GOLDUCK, SPECIES_MAWILE, SPECIES_WEEZING, SPECIES_LANTURN, SPECIES_GARDEVOIR, SPECIES_MILOTIC},
+        .id = 7,
+        .speechLost = {EC_WORD_YOU_RE, EC_WORD_STRONG, EC_WORD_AREN_T, EC_WORD_YOU, EC_WORD_QUES, 0xFFFF},
+    },
+    {
+        .name = {_("スミレ"), _("ANNIE"), _("ANNIE"), _("IMELDA"), _("INES"), _("ROSA")},
+        .otId = 0x800C,
+        .facilityClass = FACILITY_CLASS_AROMA_LADY,
+        .species = {SPECIES_SCEPTILE, SPECIES_VILEPLUME, SPECIES_BELLOSSOM, SPECIES_ROSELIA, SPECIES_CORSOLA, SPECIES_FLYGON, SPECIES_BRELOOM, SPECIES_MILOTIC, SPECIES_ALTARIA, SPECIES_CRADILY},
+        .id = 8,
+        .speechLost = {EC_WORD_WHAT, EC_WORD_TOUGH, EC_WORD_POKEMON, EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_EXCL},
+    },
+    {
+        .name = {_("アキノリ"), _("DILLEN"), _("RENE"), _("INDRO"), _("DETLEF"), _("PEDRO")},
+        .otId = 0x469f,
+        .facilityClass = FACILITY_CLASS_HIKER,
+        .species = {SPECIES_SKARMORY, SPECIES_GOLEM, SPECIES_BLAZIKEN, SPECIES_CAMERUPT, SPECIES_DONPHAN, SPECIES_MUK, SPECIES_SALAMENCE, SPECIES_TROPIUS, SPECIES_SOLROCK, SPECIES_RHYDON},
+        .id = 9,
+        .speechLost = {EC_WORD_WE, EC_WORD_WERE, EC_WORD_JUST, EC_WORD_SHREDDED, EC_WORD_ELLIPSIS, 0xFFFF},
+    },
+    {
+        .name = {_("トウゾウ"), _("DALLAS"), _("BRUNO"), _("LEARCO"), _("ANSGAR"), _("MANOLO")},
+        .otId = 0x71FC,
+        .facilityClass = FACILITY_CLASS_FISHERMAN,
+        .species = {SPECIES_SEAKING, SPECIES_STARMIE, SPECIES_GOLDUCK, SPECIES_TENTACRUEL, SPECIES_OCTILLERY, SPECIES_GOREBYSS, SPECIES_GLALIE, SPECIES_WAILORD, SPECIES_SHARPEDO, SPECIES_KINGDRA},
+        .id = 10,
+        .speechLost = {EC_WORD_YOUR, EC_WORD_WIN, EC_WORD_ANGERS, EC_WORD_ME, EC_WORD_EXCL, 0xFFFF},
+    },
+    {
+        .name = {_("セイヤ"), _("FRANK"), _("FRANK"), _("OLINDO"), _("FRANK"), _("MAURO")},
+        .otId = 0xA39E,
+        .facilityClass = FACILITY_CLASS_SAILOR,
+        .species = {SPECIES_QUAGSIRE, SPECIES_STARMIE, SPECIES_PELIPPER, SPECIES_CRAWDAUNT, SPECIES_WAILORD, SPECIES_GYARADOS, SPECIES_SWAMPERT, SPECIES_LANTURN, SPECIES_WHISCASH, SPECIES_SHUCKLE},
+        .id = 11,
+        .speechLost = {EC_WORD_LOSING, EC_WORD_DOESN_T, EC_MOVE(CUT), EC_WORD_ME, EC_WORD_DEEP, EC_WORD_OK_QUES},
+    },
+    {
+        .name = {_("リュウジ"), _("LAMONT"), _("XAV"), _("ORFEO"), _("JÜRGEN"), _("JORGE")},
+        .otId = 0xE590,
+        .facilityClass = FACILITY_CLASS_GUITARIST,
+        .species = {SPECIES_ABSOL, SPECIES_CROBAT, SPECIES_EXPLOUD, SPECIES_MAGNETON, SPECIES_SHARPEDO, SPECIES_MANECTRIC, SPECIES_METAGROSS, SPECIES_ELECTRODE, SPECIES_NOSEPASS, SPECIES_WEEZING},
+        .id = 12,
+        .speechLost = {EC_WORD_A, EC_WORD_LOSS, EC_WORD_IS, EC_WORD_WHAT, EC_WORD_THIS, EC_WORD_IS},
+    },
+    {
+        .name = {_("カツアキ"), _("TYRESE"), _("ANDY"), _("PARIDE"), _("DAVID"), _("CHICHO")},
+        .otId = 0xD018,
+        .facilityClass = FACILITY_CLASS_BLACK_BELT,
+        .species = {SPECIES_BLAZIKEN, SPECIES_GOLEM, SPECIES_MACHAMP, SPECIES_RHYDON, SPECIES_HARIYAMA, SPECIES_AGGRON, SPECIES_MEDICHAM, SPECIES_ZANGOOSE, SPECIES_VIGOROTH, SPECIES_SLAKING},
+        .id = 13,
+        .speechLost = {EC_WORD_I_AM, EC_WORD_TOO_WEAK, EC_WORD_AND, EC_WORD_LOW, EC_WORD_OF, EC_WORD_POWER},
+    },
+    {
+        .name = {_("トシミツ"), _("DANTE"), _("DANTE"), _("RAOUL"), _("LOTHAR"), _("PABLO")},
+        .otId = 0xBC75,
+        .facilityClass = FACILITY_CLASS_RUIN_MANIAC,
+        .species = {SPECIES_SCEPTILE, SPECIES_SANDSLASH, SPECIES_FLYGON, SPECIES_CLAYDOL, SPECIES_ARMALDO, SPECIES_CROBAT, SPECIES_CRADILY, SPECIES_SOLROCK, SPECIES_LUNATONE, SPECIES_GOLEM},
+        .id = 14,
+        .speechLost = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_UNDERSTAND, EC_WORD_WHAT, EC_WORD_IS, EC_WORD_HAPPENING},
+    },
+    {
+        .name = {_("ローウェン"), _("ARTURO"), _("ARTURO"), _("ROMOLO"), _("BRIAN"), _("ARTURO")},
+        .otId = 0xFA02,
+        .facilityClass = FACILITY_CLASS_GENTLEMAN,
+        .species = {SPECIES_ABSOL, SPECIES_MIGHTYENA, SPECIES_ALAKAZAM, SPECIES_BANETTE, SPECIES_NINETALES, SPECIES_CLAYDOL, SPECIES_MUK, SPECIES_SALAMENCE, SPECIES_WALREIN, SPECIES_DUSCLOPS},
+        .id = 15,
+        .speechLost = {EC_WORD_THIS, EC_WORD_HAS, EC_WORD_TO, EC_WORD_BE, EC_WORD_A, EC_WORD_LIE},
+    },
+};
+
+// Sequence of 4 messages for the first meeting with the apprentice
+static const u8 *const sApprenticeFirstMeetingTexts[NUM_APPRENTICES][4] =
+{
+    {gText_ApprenticePleaseTeach0,  gText_ApprenticeRejectTeaching0,  gText_ApprenticeWhichLevelMode0,  gText_ApprenticeLevelModeThanks0},
+    {gText_ApprenticePleaseTeach1,  gText_ApprenticeRejectTeaching1,  gText_ApprenticeWhichLevelMode1,  gText_ApprenticeLevelModeThanks1},
+    {gText_ApprenticePleaseTeach2,  gText_ApprenticeRejectTeaching2,  gText_ApprenticeWhichLevelMode2,  gText_ApprenticeLevelModeThanks2},
+    {gText_ApprenticePleaseTeach3,  gText_ApprenticeRejectTeaching3,  gText_ApprenticeWhichLevelMode3,  gText_ApprenticeLevelModeThanks3},
+    {gText_ApprenticePleaseTeach4,  gText_ApprenticeRejectTeaching4,  gText_ApprenticeWhichLevelMode4,  gText_ApprenticeLevelModeThanks4},
+    {gText_ApprenticePleaseTeach5,  gText_ApprenticeRejectTeaching5,  gText_ApprenticeWhichLevelMode5,  gText_ApprenticeLevelModeThanks5},
+    {gText_ApprenticePleaseTeach6,  gText_ApprenticeRejectTeaching6,  gText_ApprenticeWhichLevelMode6,  gText_ApprenticeLevelModeThanks6},
+    {gText_ApprenticePleaseTeach7,  gText_ApprenticeRejectTeaching7,  gText_ApprenticeWhichLevelMode7,  gText_ApprenticeLevelModeThanks7},
+    {gText_ApprenticePleaseTeach8,  gText_ApprenticeRejectTeaching8,  gText_ApprenticeWhichLevelMode8,  gText_ApprenticeLevelModeThanks8},
+    {gText_ApprenticePleaseTeach9,  gText_ApprenticeRejectTeaching9,  gText_ApprenticeWhichLevelMode9,  gText_ApprenticeLevelModeThanks9},
+    {gText_ApprenticePleaseTeach10, gText_ApprenticeRejectTeaching10, gText_ApprenticeWhichLevelMode10, gText_ApprenticeLevelModeThanks10},
+    {gText_ApprenticePleaseTeach11, gText_ApprenticeRejectTeaching11, gText_ApprenticeWhichLevelMode11, gText_ApprenticeLevelModeThanks11},
+    {gText_ApprenticePleaseTeach12, gText_ApprenticeRejectTeaching12, gText_ApprenticeWhichLevelMode12, gText_ApprenticeLevelModeThanks12},
+    {gText_ApprenticePleaseTeach13, gText_ApprenticeRejectTeaching13, gText_ApprenticeWhichLevelMode13, gText_ApprenticeLevelModeThanks13},
+    {gText_ApprenticePleaseTeach14, gText_ApprenticeRejectTeaching14, gText_ApprenticeWhichLevelMode14, gText_ApprenticeLevelModeThanks14},
+    {gText_ApprenticePleaseTeach15, gText_ApprenticeRejectTeaching15, gText_ApprenticeWhichLevelMode15, gText_ApprenticeLevelModeThanks15},
+};
+
+static const u8 *const sApprenticeWhichMonTexts[NUM_APPRENTICES][2] =
+{
+    {gText_ApprenticeWhichMon0,  gText_ApprenticeMonThanks0},
+    {gText_ApprenticeWhichMon1,  gText_ApprenticeMonThanks1},
+    {gText_ApprenticeWhichMon2,  gText_ApprenticeMonThanks2},
+    {gText_ApprenticeWhichMon3,  gText_ApprenticeMonThanks3},
+    {gText_ApprenticeWhichMon4,  gText_ApprenticeMonThanks4},
+    {gText_ApprenticeWhichMon5,  gText_ApprenticeMonThanks5},
+    {gText_ApprenticeWhichMon6,  gText_ApprenticeMonThanks6},
+    {gText_ApprenticeWhichMon7,  gText_ApprenticeMonThanks7},
+    {gText_ApprenticeWhichMon8,  gText_ApprenticeMonThanks8},
+    {gText_ApprenticeWhichMon9,  gText_ApprenticeMonThanks9},
+    {gText_ApprenticeWhichMon10, gText_ApprenticeMonThanks10},
+    {gText_ApprenticeWhichMon11, gText_ApprenticeMonThanks11},
+    {gText_ApprenticeWhichMon12, gText_ApprenticeMonThanks12},
+    {gText_ApprenticeWhichMon13, gText_ApprenticeMonThanks13},
+    {gText_ApprenticeWhichMon14, gText_ApprenticeMonThanks14},
+    {gText_ApprenticeWhichMon15, gText_ApprenticeMonThanks15},
+};
+
+// Sequence of 5 messages for suggesting a held item to the apprentice
+static const u8 *const sApprenticeHeldItemTexts[NUM_APPRENTICES][5] =
+{
+    {gText_ApprenticeWhatHeldItem0,  gText_ApprenticeHoldNothing0,  gText_ApprenticeThanksNoHeldItem0,  gText_ApprenticeThanksHeldItem0,  gText_ApprenticeItemAlreadyRecommended0},
+    {gText_ApprenticeWhatHeldItem1,  gText_ApprenticeHoldNothing1,  gText_ApprenticeThanksNoHeldItem1,  gText_ApprenticeThanksHeldItem1,  gText_ApprenticeItemAlreadyRecommended1},
+    {gText_ApprenticeWhatHeldItem2,  gText_ApprenticeHoldNothing2,  gText_ApprenticeThanksNoHeldItem2,  gText_ApprenticeThanksHeldItem2,  gText_ApprenticeItemAlreadyRecommended2},
+    {gText_ApprenticeWhatHeldItem3,  gText_ApprenticeHoldNothing3,  gText_ApprenticeThanksNoHeldItem3,  gText_ApprenticeThanksHeldItem3,  gText_ApprenticeItemAlreadyRecommended3},
+    {gText_ApprenticeWhatHeldItem4,  gText_ApprenticeHoldNothing4,  gText_ApprenticeThanksNoHeldItem4,  gText_ApprenticeThanksHeldItem4,  gText_ApprenticeItemAlreadyRecommended4},
+    {gText_ApprenticeWhatHeldItem5,  gText_ApprenticeHoldNothing5,  gText_ApprenticeThanksNoHeldItem5,  gText_ApprenticeThanksHeldItem5,  gText_ApprenticeItemAlreadyRecommended5},
+    {gText_ApprenticeWhatHeldItem6,  gText_ApprenticeHoldNothing6,  gText_ApprenticeThanksNoHeldItem6,  gText_ApprenticeThanksHeldItem6,  gText_ApprenticeItemAlreadyRecommended6},
+    {gText_ApprenticeWhatHeldItem7,  gText_ApprenticeHoldNothing7,  gText_ApprenticeThanksNoHeldItem7,  gText_ApprenticeThanksHeldItem7,  gText_ApprenticeItemAlreadyRecommended7},
+    {gText_ApprenticeWhatHeldItem8,  gText_ApprenticeHoldNothing8,  gText_ApprenticeThanksNoHeldItem8,  gText_ApprenticeThanksHeldItem8,  gText_ApprenticeItemAlreadyRecommended8},
+    {gText_ApprenticeWhatHeldItem9,  gText_ApprenticeHoldNothing9,  gText_ApprenticeThanksNoHeldItem9,  gText_ApprenticeThanksHeldItem9,  gText_ApprenticeItemAlreadyRecommended9},
+    {gText_ApprenticeWhatHeldItem10, gText_ApprenticeHoldNothing10, gText_ApprenticeThanksNoHeldItem10, gText_ApprenticeThanksHeldItem10, gText_ApprenticeItemAlreadyRecommended10},
+    {gText_ApprenticeWhatHeldItem11, gText_ApprenticeHoldNothing11, gText_ApprenticeThanksNoHeldItem11, gText_ApprenticeThanksHeldItem11, gText_ApprenticeItemAlreadyRecommended11},
+    {gText_ApprenticeWhatHeldItem12, gText_ApprenticeHoldNothing12, gText_ApprenticeThanksNoHeldItem12, gText_ApprenticeThanksHeldItem12, gText_ApprenticeItemAlreadyRecommended12},
+    {gText_ApprenticeWhatHeldItem13, gText_ApprenticeHoldNothing13, gText_ApprenticeThanksNoHeldItem13, gText_ApprenticeThanksHeldItem13, gText_ApprenticeItemAlreadyRecommended13},
+    {gText_ApprenticeWhatHeldItem14, gText_ApprenticeHoldNothing14, gText_ApprenticeThanksNoHeldItem14, gText_ApprenticeThanksHeldItem14, gText_ApprenticeItemAlreadyRecommended14},
+    {gText_ApprenticeWhatHeldItem15, gText_ApprenticeHoldNothing15, gText_ApprenticeThanksNoHeldItem15, gText_ApprenticeThanksHeldItem15, gText_ApprenticeItemAlreadyRecommended15},
+};
+
+static const u8 *const sApprenticeWhichMoveTexts[NUM_APPRENTICES][2] =
+{
+    {gText_ApprenticeWhichMove0,  gText_ApprenticeMoveThanks0},
+    {gText_ApprenticeWhichMove1,  gText_ApprenticeMoveThanks1},
+    {gText_ApprenticeWhichMove2,  gText_ApprenticeMoveThanks2},
+    {gText_ApprenticeWhichMove3,  gText_ApprenticeMoveThanks3},
+    {gText_ApprenticeWhichMove4,  gText_ApprenticeMoveThanks4},
+    {gText_ApprenticeWhichMove5,  gText_ApprenticeMoveThanks5},
+    {gText_ApprenticeWhichMove6,  gText_ApprenticeMoveThanks6},
+    {gText_ApprenticeWhichMove7,  gText_ApprenticeMoveThanks7},
+    {gText_ApprenticeWhichMove8,  gText_ApprenticeMoveThanks8},
+    {gText_ApprenticeWhichMove9,  gText_ApprenticeMoveThanks9},
+    {gText_ApprenticeWhichMove10, gText_ApprenticeMoveThanks10},
+    {gText_ApprenticeWhichMove11, gText_ApprenticeMoveThanks11},
+    {gText_ApprenticeWhichMove12, gText_ApprenticeMoveThanks12},
+    {gText_ApprenticeWhichMove13, gText_ApprenticeMoveThanks13},
+    {gText_ApprenticeWhichMove14, gText_ApprenticeMoveThanks14},
+    {gText_ApprenticeWhichMove15, gText_ApprenticeMoveThanks15},
+};
+
+static const u8 *const sApprenticeWhichMonFirstTexts[NUM_APPRENTICES][2] =
+{
+    {gText_ApprenticeWhichMonFirst0,  gText_ApprenticeMonFirstThanks0},
+    {gText_ApprenticeWhichMonFirst1,  gText_ApprenticeMonFirstThanks1},
+    {gText_ApprenticeWhichMonFirst2,  gText_ApprenticeMonFirstThanks2},
+    {gText_ApprenticeWhichMonFirst3,  gText_ApprenticeMonFirstThanks3},
+    {gText_ApprenticeWhichMonFirst4,  gText_ApprenticeMonFirstThanks4},
+    {gText_ApprenticeWhichMonFirst5,  gText_ApprenticeMonFirstThanks5},
+    {gText_ApprenticeWhichMonFirst6,  gText_ApprenticeMonFirstThanks6},
+    {gText_ApprenticeWhichMonFirst7,  gText_ApprenticeMonFirstThanks7},
+    {gText_ApprenticeWhichMonFirst8,  gText_ApprenticeMonFirstThanks8},
+    {gText_ApprenticeWhichMonFirst9,  gText_ApprenticeMonFirstThanks9},
+    {gText_ApprenticeWhichMonFirst10, gText_ApprenticeMonFirstThanks10},
+    {gText_ApprenticeWhichMonFirst11, gText_ApprenticeMonFirstThanks11},
+    {gText_ApprenticeWhichMonFirst12, gText_ApprenticeMonFirstThanks12},
+    {gText_ApprenticeWhichMonFirst13, gText_ApprenticeMonFirstThanks13},
+    {gText_ApprenticeWhichMonFirst14, gText_ApprenticeMonFirstThanks14},
+    {gText_ApprenticeWhichMonFirst15, gText_ApprenticeMonFirstThanks15},
+};
+
+static const u8 *const sApprenticePickWinSpeechTexts[NUM_APPRENTICES][2] =
+{
+    {gText_ApprenticePickWinSpeech0,  gText_ApprenticeWinSpeechThanks0},
+    {gText_ApprenticePickWinSpeech1,  gText_ApprenticeWinSpeechThanks1},
+    {gText_ApprenticePickWinSpeech2,  gText_ApprenticeWinSpeechThanks2},
+    {gText_ApprenticePickWinSpeech3,  gText_ApprenticeWinSpeechThanks3},
+    {gText_ApprenticePickWinSpeech4,  gText_ApprenticeWinSpeechThanks4},
+    {gText_ApprenticePickWinSpeech5,  gText_ApprenticeWinSpeechThanks5},
+    {gText_ApprenticePickWinSpeech6,  gText_ApprenticeWinSpeechThanks6},
+    {gText_ApprenticePickWinSpeech7,  gText_ApprenticeWinSpeechThanks7},
+    {gText_ApprenticePickWinSpeech8,  gText_ApprenticeWinSpeechThanks8},
+    {gText_ApprenticePickWinSpeech9,  gText_ApprenticeWinSpeechThanks9},
+    {gText_ApprenticePickWinSpeech10, gText_ApprenticeWinSpeechThanks10},
+    {gText_ApprenticePickWinSpeech11, gText_ApprenticeWinSpeechThanks11},
+    {gText_ApprenticePickWinSpeech12, gText_ApprenticeWinSpeechThanks12},
+    {gText_ApprenticePickWinSpeech13, gText_ApprenticeWinSpeechThanks13},
+    {gText_ApprenticePickWinSpeech14, gText_ApprenticeWinSpeechThanks14},
+    {gText_ApprenticePickWinSpeech15, gText_ApprenticeWinSpeechThanks15},
+};
+
+static const u8 *const sApprenticeChallengeTexts[NUM_APPRENTICES] =
+{
+    gText_ApprenticeChallenge0,
+    gText_ApprenticeChallenge1,
+    gText_ApprenticeChallenge2,
+    gText_ApprenticeChallenge3,
+    gText_ApprenticeChallenge4,
+    gText_ApprenticeChallenge5,
+    gText_ApprenticeChallenge6,
+    gText_ApprenticeChallenge7,
+    gText_ApprenticeChallenge8,
+    gText_ApprenticeChallenge9,
+    gText_ApprenticeChallenge10,
+    gText_ApprenticeChallenge11,
+    gText_ApprenticeChallenge12,
+    gText_ApprenticeChallenge13,
+    gText_ApprenticeChallenge14,
+    gText_ApprenticeChallenge15,
+};
+
+// Unclear what the criteria are for valid moves
+// Notably, a large percentage of multi-strike moves are not valid
+static const bool8 sValidApprenticeMoves[MOVES_COUNT] =
+{
+    [MOVE_NONE] = FALSE,
+    [MOVE_POUND] = FALSE,
+    [MOVE_KARATE_CHOP] = TRUE,
+    [MOVE_DOUBLE_SLAP] = TRUE,
+    [MOVE_COMET_PUNCH] = FALSE,
+    [MOVE_MEGA_PUNCH] = TRUE,
+    [MOVE_PAY_DAY] = FALSE,
+    [MOVE_FIRE_PUNCH] = TRUE,
+    [MOVE_ICE_PUNCH] = TRUE,
+    [MOVE_THUNDER_PUNCH] = TRUE,
+    [MOVE_SCRATCH] = FALSE,
+    [MOVE_VICE_GRIP] = FALSE,
+    [MOVE_GUILLOTINE] = TRUE,
+    [MOVE_RAZOR_WIND] = FALSE,
+    [MOVE_SWORDS_DANCE] = TRUE,
+    [MOVE_CUT] = FALSE,
+    [MOVE_GUST] = FALSE,
+    [MOVE_WING_ATTACK] = FALSE,
+    [MOVE_WHIRLWIND] = TRUE,
+    [MOVE_FLY] = TRUE,
+    [MOVE_BIND] = TRUE,
+    [MOVE_SLAM] = TRUE,
+    [MOVE_VINE_WHIP] = FALSE,
+    [MOVE_STOMP] = TRUE,
+    [MOVE_DOUBLE_KICK] = TRUE,
+    [MOVE_MEGA_KICK] = TRUE,
+    [MOVE_JUMP_KICK] = TRUE,
+    [MOVE_ROLLING_KICK] = TRUE,
+    [MOVE_SAND_ATTACK] = TRUE,
+    [MOVE_HEADBUTT] = TRUE,
+    [MOVE_HORN_ATTACK] = FALSE,
+    [MOVE_FURY_ATTACK] = FALSE,
+    [MOVE_HORN_DRILL] = TRUE,
+    [MOVE_TACKLE] = FALSE,
+    [MOVE_BODY_SLAM] = TRUE,
+    [MOVE_WRAP] = TRUE,
+    [MOVE_TAKE_DOWN] = TRUE,
+    [MOVE_THRASH] = TRUE,
+    [MOVE_DOUBLE_EDGE] = TRUE,
+    [MOVE_TAIL_WHIP] = FALSE,
+    [MOVE_POISON_STING] = FALSE,
+    [MOVE_TWINEEDLE] = TRUE,
+    [MOVE_PIN_MISSILE] = FALSE,
+    [MOVE_LEER] = FALSE,
+    [MOVE_BITE] = TRUE,
+    [MOVE_GROWL] = FALSE,
+    [MOVE_ROAR] = TRUE,
+    [MOVE_SING] = TRUE,
+    [MOVE_SUPERSONIC] = TRUE,
+    [MOVE_SONIC_BOOM] = TRUE,
+    [MOVE_DISABLE] = TRUE,
+    [MOVE_ACID] = FALSE,
+    [MOVE_EMBER] = FALSE,
+    [MOVE_FLAMETHROWER] = TRUE,
+    [MOVE_MIST] = TRUE,
+    [MOVE_WATER_GUN] = FALSE,
+    [MOVE_HYDRO_PUMP] = TRUE,
+    [MOVE_SURF] = TRUE,
+    [MOVE_ICE_BEAM] = TRUE,
+    [MOVE_BLIZZARD] = TRUE,
+    [MOVE_PSYBEAM] = TRUE,
+    [MOVE_BUBBLE_BEAM] = FALSE,
+    [MOVE_AURORA_BEAM] = FALSE,
+    [MOVE_HYPER_BEAM] = TRUE,
+    [MOVE_PECK] = FALSE,
+    [MOVE_DRILL_PECK] = TRUE,
+    [MOVE_SUBMISSION] = TRUE,
+    [MOVE_LOW_KICK] = TRUE,
+    [MOVE_COUNTER] = TRUE,
+    [MOVE_SEISMIC_TOSS] = TRUE,
+    [MOVE_STRENGTH] = TRUE,
+    [MOVE_ABSORB] = FALSE,
+    [MOVE_MEGA_DRAIN] = FALSE,
+    [MOVE_LEECH_SEED] = TRUE,
+    [MOVE_GROWTH] = TRUE,
+    [MOVE_RAZOR_LEAF] = TRUE,
+    [MOVE_SOLAR_BEAM] = TRUE,
+    [MOVE_POISON_POWDER] = TRUE,
+    [MOVE_STUN_SPORE] = TRUE,
+    [MOVE_SLEEP_POWDER] = TRUE,
+    [MOVE_PETAL_DANCE] = TRUE,
+    [MOVE_STRING_SHOT] = FALSE,
+    [MOVE_DRAGON_RAGE] = TRUE,
+    [MOVE_FIRE_SPIN] = TRUE,
+    [MOVE_THUNDER_SHOCK] = FALSE,
+    [MOVE_THUNDERBOLT] = TRUE,
+    [MOVE_THUNDER_WAVE] = TRUE,
+    [MOVE_THUNDER] = TRUE,
+    [MOVE_ROCK_THROW] = FALSE,
+    [MOVE_EARTHQUAKE] = TRUE,
+    [MOVE_FISSURE] = TRUE,
+    [MOVE_DIG] = TRUE,
+    [MOVE_TOXIC] = TRUE,
+    [MOVE_CONFUSION] = FALSE,
+    [MOVE_PSYCHIC] = TRUE,
+    [MOVE_HYPNOSIS] = TRUE,
+    [MOVE_MEDITATE] = TRUE,
+    [MOVE_AGILITY] = TRUE,
+    [MOVE_QUICK_ATTACK] = TRUE,
+    [MOVE_RAGE] = FALSE,
+    [MOVE_TELEPORT] = FALSE,
+    [MOVE_NIGHT_SHADE] = TRUE,
+    [MOVE_MIMIC] = TRUE,
+    [MOVE_SCREECH] = TRUE,
+    [MOVE_DOUBLE_TEAM] = TRUE,
+    [MOVE_RECOVER] = TRUE,
+    [MOVE_HARDEN] = TRUE,
+    [MOVE_MINIMIZE] = TRUE,
+    [MOVE_SMOKESCREEN] = TRUE,
+    [MOVE_CONFUSE_RAY] = TRUE,
+    [MOVE_WITHDRAW] = TRUE,
+    [MOVE_DEFENSE_CURL] = TRUE,
+    [MOVE_BARRIER] = TRUE,
+    [MOVE_LIGHT_SCREEN] = TRUE,
+    [MOVE_HAZE] = TRUE,
+    [MOVE_REFLECT] = TRUE,
+    [MOVE_FOCUS_ENERGY] = TRUE,
+    [MOVE_BIDE] = FALSE,
+    [MOVE_METRONOME] = TRUE,
+    [MOVE_MIRROR_MOVE] = TRUE,
+    [MOVE_SELF_DESTRUCT] = TRUE,
+    [MOVE_EGG_BOMB] = TRUE,
+    [MOVE_LICK] = TRUE,
+    [MOVE_SMOG] = FALSE,
+    [MOVE_SLUDGE] = FALSE,
+    [MOVE_BONE_CLUB] = FALSE,
+    [MOVE_FIRE_BLAST] = TRUE,
+    [MOVE_WATERFALL] = TRUE,
+    [MOVE_CLAMP] = TRUE,
+    [MOVE_SWIFT] = TRUE,
+    [MOVE_SKULL_BASH] = TRUE,
+    [MOVE_SPIKE_CANNON] = FALSE,
+    [MOVE_CONSTRICT] = FALSE,
+    [MOVE_AMNESIA] = TRUE,
+    [MOVE_KINESIS] = TRUE,
+    [MOVE_SOFT_BOILED] = TRUE,
+    [MOVE_HI_JUMP_KICK] = TRUE,
+    [MOVE_GLARE] = TRUE,
+    [MOVE_DREAM_EATER] = TRUE,
+    [MOVE_POISON_GAS] = FALSE,
+    [MOVE_BARRAGE] = FALSE,
+    [MOVE_LEECH_LIFE] = FALSE,
+    [MOVE_LOVELY_KISS] = TRUE,
+    [MOVE_SKY_ATTACK] = TRUE,
+    [MOVE_TRANSFORM] = TRUE,
+    [MOVE_BUBBLE] = FALSE,
+    [MOVE_DIZZY_PUNCH] = TRUE,
+    [MOVE_SPORE] = TRUE,
+    [MOVE_FLASH] = TRUE,
+    [MOVE_PSYWAVE] = TRUE,
+    [MOVE_SPLASH] = FALSE,
+    [MOVE_ACID_ARMOR] = TRUE,
+    [MOVE_CRABHAMMER] = TRUE,
+    [MOVE_EXPLOSION] = TRUE,
+    [MOVE_FURY_SWIPES] = FALSE,
+    [MOVE_BONEMERANG] = TRUE,
+    [MOVE_REST] = TRUE,
+    [MOVE_ROCK_SLIDE] = TRUE,
+    [MOVE_HYPER_FANG] = TRUE,
+    [MOVE_SHARPEN] = TRUE,
+    [MOVE_CONVERSION] = TRUE,
+    [MOVE_TRI_ATTACK] = TRUE,
+    [MOVE_SUPER_FANG] = TRUE,
+    [MOVE_SLASH] = TRUE,
+    [MOVE_SUBSTITUTE] = TRUE,
+    [MOVE_STRUGGLE] = TRUE,
+    [MOVE_SKETCH] = TRUE,
+    [MOVE_TRIPLE_KICK] = TRUE,
+    [MOVE_THIEF] = TRUE,
+    [MOVE_SPIDER_WEB] = TRUE,
+    [MOVE_MIND_READER] = TRUE,
+    [MOVE_NIGHTMARE] = TRUE,
+    [MOVE_FLAME_WHEEL] = FALSE,
+    [MOVE_SNORE] = TRUE,
+    [MOVE_CURSE] = TRUE,
+    [MOVE_FLAIL] = TRUE,
+    [MOVE_CONVERSION_2] = TRUE,
+    [MOVE_AEROBLAST] = TRUE,
+    [MOVE_COTTON_SPORE] = TRUE,
+    [MOVE_REVERSAL] = TRUE,
+    [MOVE_SPITE] = TRUE,
+    [MOVE_POWDER_SNOW] = FALSE,
+    [MOVE_PROTECT] = TRUE,
+    [MOVE_MACH_PUNCH] = TRUE,
+    [MOVE_SCARY_FACE] = TRUE,
+    [MOVE_FAINT_ATTACK] = TRUE,
+    [MOVE_SWEET_KISS] = TRUE,
+    [MOVE_BELLY_DRUM] = TRUE,
+    [MOVE_SLUDGE_BOMB] = TRUE,
+    [MOVE_MUD_SLAP] = TRUE,
+    [MOVE_OCTAZOOKA] = TRUE,
+    [MOVE_SPIKES] = TRUE,
+    [MOVE_ZAP_CANNON] = TRUE,
+    [MOVE_FORESIGHT] = TRUE,
+    [MOVE_DESTINY_BOND] = TRUE,
+    [MOVE_PERISH_SONG] = TRUE,
+    [MOVE_ICY_WIND] = TRUE,
+    [MOVE_DETECT] = TRUE,
+    [MOVE_BONE_RUSH] = FALSE,
+    [MOVE_LOCK_ON] = TRUE,
+    [MOVE_OUTRAGE] = TRUE,
+    [MOVE_SANDSTORM] = TRUE,
+    [MOVE_GIGA_DRAIN] = TRUE,
+    [MOVE_ENDURE] = TRUE,
+    [MOVE_CHARM] = TRUE,
+    [MOVE_ROLLOUT] = TRUE,
+    [MOVE_FALSE_SWIPE] = TRUE,
+    [MOVE_SWAGGER] = TRUE,
+    [MOVE_MILK_DRINK] = TRUE,
+    [MOVE_SPARK] = FALSE,
+    [MOVE_FURY_CUTTER] = TRUE,
+    [MOVE_STEEL_WING] = TRUE,
+    [MOVE_MEAN_LOOK] = TRUE,
+    [MOVE_ATTRACT] = TRUE,
+    [MOVE_SLEEP_TALK] = TRUE,
+    [MOVE_HEAL_BELL] = TRUE,
+    [MOVE_RETURN] = TRUE,
+    [MOVE_PRESENT] = TRUE,
+    [MOVE_FRUSTRATION] = TRUE,
+    [MOVE_SAFEGUARD] = TRUE,
+    [MOVE_PAIN_SPLIT] = TRUE,
+    [MOVE_SACRED_FIRE] = TRUE,
+    [MOVE_MAGNITUDE] = FALSE,
+    [MOVE_DYNAMIC_PUNCH] = TRUE,
+    [MOVE_MEGAHORN] = TRUE,
+    [MOVE_DRAGON_BREATH] = TRUE,
+    [MOVE_BATON_PASS] = TRUE,
+    [MOVE_ENCORE] = TRUE,
+    [MOVE_PURSUIT] = TRUE,
+    [MOVE_RAPID_SPIN] = TRUE,
+    [MOVE_SWEET_SCENT] = TRUE,
+    [MOVE_IRON_TAIL] = TRUE,
+    [MOVE_METAL_CLAW] = TRUE,
+    [MOVE_VITAL_THROW] = TRUE,
+    [MOVE_MORNING_SUN] = TRUE,
+    [MOVE_SYNTHESIS] = TRUE,
+    [MOVE_MOONLIGHT] = TRUE,
+    [MOVE_HIDDEN_POWER] = TRUE,
+    [MOVE_CROSS_CHOP] = TRUE,
+    [MOVE_TWISTER] = FALSE,
+    [MOVE_RAIN_DANCE] = TRUE,
+    [MOVE_SUNNY_DAY] = TRUE,
+    [MOVE_CRUNCH] = TRUE,
+    [MOVE_MIRROR_COAT] = TRUE,
+    [MOVE_PSYCH_UP] = TRUE,
+    [MOVE_EXTREME_SPEED] = TRUE,
+    [MOVE_ANCIENT_POWER] = TRUE,
+    [MOVE_SHADOW_BALL] = TRUE,
+    [MOVE_FUTURE_SIGHT] = TRUE,
+    [MOVE_ROCK_SMASH] = TRUE,
+    [MOVE_WHIRLPOOL] = TRUE,
+    [MOVE_BEAT_UP] = TRUE,
+    [MOVE_FAKE_OUT] = TRUE,
+    [MOVE_UPROAR] = TRUE,
+    [MOVE_STOCKPILE] = TRUE,
+    [MOVE_SPIT_UP] = TRUE,
+    [MOVE_SWALLOW] = TRUE,
+    [MOVE_HEAT_WAVE] = TRUE,
+    [MOVE_HAIL] = TRUE,
+    [MOVE_TORMENT] = TRUE,
+    [MOVE_FLATTER] = TRUE,
+    [MOVE_WILL_O_WISP] = TRUE,
+    [MOVE_MEMENTO] = TRUE,
+    [MOVE_FACADE] = TRUE,
+    [MOVE_FOCUS_PUNCH] = TRUE,
+    [MOVE_SMELLING_SALT] = TRUE,
+    [MOVE_FOLLOW_ME] = TRUE,
+    [MOVE_NATURE_POWER] = TRUE,
+    [MOVE_CHARGE] = TRUE,
+    [MOVE_TAUNT] = TRUE,
+    [MOVE_HELPING_HAND] = TRUE,
+    [MOVE_TRICK] = TRUE,
+    [MOVE_ROLE_PLAY] = TRUE,
+    [MOVE_WISH] = TRUE,
+    [MOVE_ASSIST] = TRUE,
+    [MOVE_INGRAIN] = TRUE,
+    [MOVE_SUPERPOWER] = TRUE,
+    [MOVE_MAGIC_COAT] = TRUE,
+    [MOVE_RECYCLE] = TRUE,
+    [MOVE_REVENGE] = TRUE,
+    [MOVE_BRICK_BREAK] = TRUE,
+    [MOVE_YAWN] = TRUE,
+    [MOVE_KNOCK_OFF] = TRUE,
+    [MOVE_ENDEAVOR] = TRUE,
+    [MOVE_ERUPTION] = TRUE,
+    [MOVE_SKILL_SWAP] = TRUE,
+    [MOVE_IMPRISON] = TRUE,
+    [MOVE_REFRESH] = TRUE,
+    [MOVE_GRUDGE] = TRUE,
+    [MOVE_SNATCH] = TRUE,
+    [MOVE_SECRET_POWER] = TRUE,
+    [MOVE_DIVE] = TRUE,
+    [MOVE_ARM_THRUST] = FALSE,
+    [MOVE_CAMOUFLAGE] = TRUE,
+    [MOVE_TAIL_GLOW] = TRUE,
+    [MOVE_LUSTER_PURGE] = TRUE,
+    [MOVE_MIST_BALL] = TRUE,
+    [MOVE_FEATHER_DANCE] = TRUE,
+    [MOVE_TEETER_DANCE] = TRUE,
+    [MOVE_BLAZE_KICK] = TRUE,
+    [MOVE_MUD_SPORT] = TRUE,
+    [MOVE_ICE_BALL] = FALSE,
+    [MOVE_NEEDLE_ARM] = TRUE,
+    [MOVE_SLACK_OFF] = TRUE,
+    [MOVE_HYPER_VOICE] = TRUE,
+    [MOVE_POISON_FANG] = FALSE,
+    [MOVE_CRUSH_CLAW] = TRUE,
+    [MOVE_BLAST_BURN] = TRUE,
+    [MOVE_HYDRO_CANNON] = TRUE,
+    [MOVE_METEOR_MASH] = TRUE,
+    [MOVE_ASTONISH] = TRUE,
+    [MOVE_WEATHER_BALL] = TRUE,
+    [MOVE_AROMATHERAPY] = TRUE,
+    [MOVE_FAKE_TEARS] = TRUE,
+    [MOVE_AIR_CUTTER] = TRUE,
+    [MOVE_OVERHEAT] = TRUE,
+    [MOVE_ODOR_SLEUTH] = TRUE,
+    [MOVE_ROCK_TOMB] = TRUE,
+    [MOVE_SILVER_WIND] = TRUE,
+    [MOVE_METAL_SOUND] = TRUE,
+    [MOVE_GRASS_WHISTLE] = TRUE,
+    [MOVE_TICKLE] = TRUE,
+    [MOVE_COSMIC_POWER] = TRUE,
+    [MOVE_WATER_SPOUT] = TRUE,
+    [MOVE_SIGNAL_BEAM] = TRUE,
+    [MOVE_SHADOW_PUNCH] = TRUE,
+    [MOVE_EXTRASENSORY] = TRUE,
+    [MOVE_SKY_UPPERCUT] = TRUE,
+    [MOVE_SAND_TOMB] = TRUE,
+    [MOVE_SHEER_COLD] = TRUE,
+    [MOVE_MUDDY_WATER] = TRUE,
+    [MOVE_BULLET_SEED] = FALSE,
+    [MOVE_AERIAL_ACE] = TRUE,
+    [MOVE_ICICLE_SPEAR] = FALSE,
+    [MOVE_IRON_DEFENSE] = TRUE,
+    [MOVE_BLOCK] = TRUE,
+    [MOVE_HOWL] = TRUE,
+    [MOVE_DRAGON_CLAW] = TRUE,
+    [MOVE_FRENZY_PLANT] = TRUE,
+    [MOVE_BULK_UP] = TRUE,
+    [MOVE_BOUNCE] = TRUE,
+    [MOVE_MUD_SHOT] = FALSE,
+    [MOVE_POISON_TAIL] = TRUE,
+    [MOVE_COVET] = TRUE,
+    [MOVE_VOLT_TACKLE] = TRUE,
+    [MOVE_MAGICAL_LEAF] = TRUE,
+    [MOVE_WATER_SPORT] = TRUE,
+    [MOVE_CALM_MIND] = TRUE,
+    [MOVE_LEAF_BLADE] = TRUE,
+    [MOVE_DRAGON_DANCE] = TRUE,
+    [MOVE_ROCK_BLAST] = FALSE,
+    [MOVE_SHOCK_WAVE] = TRUE,
+    [MOVE_WATER_PULSE] = TRUE,
+    [MOVE_DOOM_DESIRE] = TRUE,
+    [MOVE_PSYCHO_BOOST] = TRUE,
+};
+
+// The possible questions to ask after the initial 3 WHICH MON questions. Retrieved from here and shuffled
+// WHAT_ITEM has max 3 occurrences, one for each party member
+// WHICH_MOVE has max 5 occurrences, defined as NUM_WHICH_MOVE_QUESTIONS
+// WHICH_FIRST has max 1 occurrence, lead mon should only be chosen once
+// WHICH_SPEECH has max 1 occurrence, as the apprentice leaves after its asked
+static const u8 sQuestionPossibilities[MAX_APPRENTICE_QUESTIONS] = 
+{
+    QUESTION_ID_WHAT_ITEM,
+    QUESTION_ID_WHAT_ITEM, 
+    QUESTION_ID_WHAT_ITEM, 
+    QUESTION_ID_WHICH_MOVE,
+    QUESTION_ID_WHICH_MOVE, 
+    QUESTION_ID_WHICH_MOVE, 
+    QUESTION_ID_WHICH_MOVE, 
+    QUESTION_ID_WHICH_MOVE, 
+    QUESTION_ID_WHICH_FIRST, 
+    QUESTION_ID_WIN_SPEECH 
+};
+
+static void (* const sApprenticeFunctions[])(void) =
+{
+    [APPRENTICE_FUNC_GAVE_LVLMODE]        = Script_GivenApprenticeLvlMode,
+    [APPRENTICE_FUNC_SET_LVLMODE]         = Script_SetApprenticeLvlMode,
+    [APPRENTICE_FUNC_SET_ID]              = Script_SetApprenticeId,
+    [APPRENTICE_FUNC_SHUFFLE_SPECIES]     = ShuffleApprenticeSpecies,
+    [APPRENTICE_FUNC_RANDOMIZE_QUESTIONS] = Script_SetRandomQuestionData,
+    [APPRENTICE_FUNC_ANSWERED_QUESTION]   = IncrementQuestionsAnswered,
+    [APPRENTICE_FUNC_IS_FINAL_QUESTION]   = IsFinalQuestion,
+    [APPRENTICE_FUNC_MENU]                = Script_CreateApprenticeMenu,
+    [APPRENTICE_FUNC_PRINT_MSG]           = Script_PrintApprenticeMessage,
+    [APPRENTICE_FUNC_RESET]               = Script_ResetPlayerApprentice,
+    [APPRENTICE_FUNC_CHECK_GONE]          = GetShouldCheckApprenticeGone,
+    [APPRENTICE_FUNC_GET_QUESTION]        = ApprenticeGetQuestion,
+    [APPRENTICE_FUNC_GET_NUM_PARTY_MONS]  = GetNumApprenticePartyMonsAssigned,
+    [APPRENTICE_FUNC_SET_PARTY_MON]       = SetApprenticePartyMon,
+    [APPRENTICE_FUNC_INIT_QUESTION_DATA]  = InitQuestionData,
+    [APPRENTICE_FUNC_FREE_QUESTION_DATA]  = FreeQuestionData,
+    [APPRENTICE_FUNC_BUFFER_STRING]       = ApprenticeBufferString,
+    [APPRENTICE_FUNC_SET_MOVE]            = SetApprenticeMonMove,
+    [APPRENTICE_FUNC_SET_LEAD_MON]        = SetLeadApprenticeMon,
+    [APPRENTICE_FUNC_OPEN_BAG]            = Script_ApprenticeOpenBagMenu,
+    [APPRENTICE_FUNC_TRY_SET_HELD_ITEM]   = TrySetApprenticeHeldItem,
+    [APPRENTICE_FUNC_SAVE]                = SaveApprentice,
+    [APPRENTICE_FUNC_SET_GFX_SAVED]       = SetSavedApprenticeTrainerGfxId,
+    [APPRENTICE_FUNC_SET_GFX]             = SetPlayerApprenticeTrainerGfxId,
+    [APPRENTICE_FUNC_SHOULD_LEAVE]        = GetShouldApprenticeLeave,
+    [APPRENTICE_FUNC_SHIFT_SAVED]         = ShiftSavedApprentices,
+};
+
+// The first Apprentice can only be one of these
+static const u8 sInitialApprenticeIds[8] = {0, 1, 2, 3, 6, 7, 8, 9};
diff --git a/src/data/battle_frontier/battle_frontier_exchange_corner.h b/src/data/battle_frontier/battle_frontier_exchange_corner.h
new file mode 100644
index 000000000..d29dbdc44
--- /dev/null
+++ b/src/data/battle_frontier/battle_frontier_exchange_corner.h
@@ -0,0 +1,99 @@
+static const u16 sFrontierExchangeCorner_Decor1[] =
+{ 
+    DECOR_KISS_POSTER, 
+    DECOR_KISS_CUSHION, 
+    DECOR_SMOOCHUM_DOLL, 
+    DECOR_TOGEPI_DOLL, 
+    DECOR_MEOWTH_DOLL, 
+    DECOR_CLEFAIRY_DOLL, 
+    DECOR_DITTO_DOLL, 
+    DECOR_CYNDAQUIL_DOLL, 
+    DECOR_CHIKORITA_DOLL, 
+    DECOR_TOTODILE_DOLL, 
+    0xFFFF 
+};
+
+static const u16 sFrontierExchangeCorner_Decor2[] =
+{ 
+    DECOR_LAPRAS_DOLL, 
+    DECOR_SNORLAX_DOLL, 
+    DECOR_VENUSAUR_DOLL, 
+    DECOR_CHARIZARD_DOLL, 
+    DECOR_BLASTOISE_DOLL, 
+    0xFFFF 
+};
+
+static const u16 sFrontierExchangeCorner_Vitamins[] =
+{ 
+    ITEM_PROTEIN, 
+    ITEM_CALCIUM, 
+    ITEM_IRON, 
+    ITEM_ZINC, 
+    ITEM_CARBOS, 
+    ITEM_HP_UP, 
+    0xFFFF 
+};
+
+static const u16 sFrontierExchangeCorner_HoldItems[] =
+{ 
+    ITEM_LEFTOVERS, 
+    ITEM_WHITE_HERB, 
+    ITEM_QUICK_CLAW, 
+    ITEM_MENTAL_HERB, 
+    ITEM_BRIGHT_POWDER, 
+    ITEM_CHOICE_BAND, 
+    ITEM_KINGS_ROCK, 
+    ITEM_FOCUS_BAND, 
+    ITEM_SCOPE_LENS, 
+    0xFFFF 
+};
+
+static const u8 *const sFrontierExchangeCorner_Decor1Descriptions[] =
+{
+    BattleFrontier_ExchangeServiceCorner_Text_KissPosterDesc,
+    BattleFrontier_ExchangeServiceCorner_Text_KissCushionDesc,
+    BattleFrontier_ExchangeServiceCorner_Text_SmoochumDollDesc,
+    BattleFrontier_ExchangeServiceCorner_Text_TogepiDollDesc,
+    BattleFrontier_ExchangeServiceCorner_Text_MeowthDollDesc,
+    BattleFrontier_ExchangeServiceCorner_Text_ClefairyDollDesc,
+    BattleFrontier_ExchangeServiceCorner_Text_DittoDollDesc,
+    BattleFrontier_ExchangeServiceCorner_Text_CyndaquilDollDesc,
+    BattleFrontier_ExchangeServiceCorner_Text_ChikoritaDollDesc,
+    BattleFrontier_ExchangeServiceCorner_Text_TotodileDollDesc,
+    gText_Exit,
+};
+
+static const u8 *const sFrontierExchangeCorner_Decor2Descriptions[] = 
+{
+    BattleFrontier_ExchangeServiceCorner_Text_LargeDollDesc,
+    BattleFrontier_ExchangeServiceCorner_Text_LargeDollDesc,
+    BattleFrontier_ExchangeServiceCorner_Text_LargeDollDesc,
+    BattleFrontier_ExchangeServiceCorner_Text_LargeDollDesc,
+    BattleFrontier_ExchangeServiceCorner_Text_LargeDollDesc,
+    gText_Exit
+};
+
+static const u8 *const sFrontierExchangeCorner_VitaminsDescriptions[] = 
+{
+    BattleFrontier_ExchangeServiceCorner_Text_ProteinDesc,
+    BattleFrontier_ExchangeServiceCorner_Text_CalciumDesc,
+    BattleFrontier_ExchangeServiceCorner_Text_IronDesc,
+    BattleFrontier_ExchangeServiceCorner_Text_ZincDesc,
+    BattleFrontier_ExchangeServiceCorner_Text_CarbosDesc,
+    BattleFrontier_ExchangeServiceCorner_Text_HPUpDesc,
+    gText_Exit
+};
+
+static const u8 *const sFrontierExchangeCorner_HoldItemsDescriptions[] = 
+{
+    BattleFrontier_ExchangeServiceCorner_Text_LeftoversDesc,
+    BattleFrontier_ExchangeServiceCorner_Text_WhiteHerbDesc,
+    BattleFrontier_ExchangeServiceCorner_Text_QuickClawDesc,
+    BattleFrontier_ExchangeServiceCorner_Text_MentalHerbDesc,
+    BattleFrontier_ExchangeServiceCorner_Text_BrightpowderDesc,
+    BattleFrontier_ExchangeServiceCorner_Text_ChoiceBandDesc,
+    BattleFrontier_ExchangeServiceCorner_Text_KingsRockDesc,
+    BattleFrontier_ExchangeServiceCorner_Text_FocusBandDesc,
+    BattleFrontier_ExchangeServiceCorner_Text_ScopeLensDesc,
+    gText_Exit
+};
diff --git a/src/data/battle_frontier/battle_frontier_mons.h b/src/data/battle_frontier/battle_frontier_mons.h
index 44cfb8036..d94d6acaf 100644
--- a/src/data/battle_frontier/battle_frontier_mons.h
+++ b/src/data/battle_frontier/battle_frontier_mons.h
@@ -1,6173 +1,6173 @@
-const struct FacilityMon gBattleFrontierMons[] =
+const struct FacilityMon gBattleFrontierMons[NUM_FRONTIER_MONS] =
 {
-    [0] = {
+    [FRONTIER_MON_SUNKERN] = {
         .species = SPECIES_SUNKERN,
         .moves = {MOVE_MEGA_DRAIN, MOVE_HELPING_HAND, MOVE_SUNNY_DAY, MOVE_LIGHT_SCREEN},
         .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_RELAXED
     },
-    [1] = {
+    [FRONTIER_MON_AZURILL] = {
         .species = SPECIES_AZURILL,
         .moves = {MOVE_WATER_PULSE, MOVE_ATTRACT, MOVE_SING, MOVE_CHARM},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_RASH
     },
-    [2] = {
+    [FRONTIER_MON_CATERPIE] = {
         .species = SPECIES_CATERPIE,
         .moves = {MOVE_TACKLE, MOVE_STRING_SHOT, MOVE_NONE, MOVE_NONE},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_QUIRKY
     },
-    [3] = {
+    [FRONTIER_MON_WEEDLE] = {
         .species = SPECIES_WEEDLE,
         .moves = {MOVE_POISON_STING, MOVE_STRING_SHOT, MOVE_NONE, MOVE_NONE},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_QUIRKY
     },
-    [4] = {
+    [FRONTIER_MON_WURMPLE] = {
         .species = SPECIES_WURMPLE,
         .moves = {MOVE_TACKLE, MOVE_STRING_SHOT, MOVE_POISON_STING, MOVE_NONE},
         .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_QUIRKY
     },
-    [5] = {
+    [FRONTIER_MON_RALTS] = {
         .species = SPECIES_RALTS,
         .moves = {MOVE_CONFUSION, MOVE_IMPRISON, MOVE_DOUBLE_TEAM, MOVE_LIGHT_SCREEN},
         .itemTableId = BATTLE_FRONTIER_ITEM_TWISTED_SPOON,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [6] = {
+    [FRONTIER_MON_MAGIKARP] = {
         .species = SPECIES_MAGIKARP,
         .moves = {MOVE_FLAIL, MOVE_NONE, MOVE_NONE, MOVE_NONE},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_HARDY
     },
-    [7] = {
+    [FRONTIER_MON_FEEBAS] = {
         .species = SPECIES_FEEBAS,
         .moves = {MOVE_FLAIL, MOVE_MIRROR_COAT, MOVE_NONE, MOVE_NONE},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_LONELY
     },
-    [8] = {
+    [FRONTIER_MON_METAPOD] = {
         .species = SPECIES_METAPOD,
         .moves = {MOVE_HARDEN, MOVE_NONE, MOVE_NONE, MOVE_NONE},
         .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_BASHFUL
     },
-    [9] = {
+    [FRONTIER_MON_KAKUNA] = {
         .species = SPECIES_KAKUNA,
         .moves = {MOVE_HARDEN, MOVE_NONE, MOVE_NONE, MOVE_NONE},
         .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_BASHFUL
     },
-    [10] = {
+    [FRONTIER_MON_PICHU] = {
         .species = SPECIES_PICHU,
         .moves = {MOVE_SWEET_KISS, MOVE_THUNDER_WAVE, MOVE_ATTRACT, MOVE_SHOCK_WAVE},
         .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_RASH
     },
-    [11] = {
+    [FRONTIER_MON_SILCOON] = {
         .species = SPECIES_SILCOON,
         .moves = {MOVE_HARDEN, MOVE_NONE, MOVE_NONE, MOVE_NONE},
         .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_BASHFUL
     },
-    [12] = {
+    [FRONTIER_MON_CASCOON] = {
         .species = SPECIES_CASCOON,
         .moves = {MOVE_HARDEN, MOVE_NONE, MOVE_NONE, MOVE_NONE},
         .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_BASHFUL
     },
-    [13] = {
+    [FRONTIER_MON_IGGLYBUFF] = {
         .species = SPECIES_IGGLYBUFF,
         .moves = {MOVE_SWEET_KISS, MOVE_SING, MOVE_ATTRACT, MOVE_SEISMIC_TOSS},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [14] = {
+    [FRONTIER_MON_WOOPER] = {
         .species = SPECIES_WOOPER,
         .moves = {MOVE_YAWN, MOVE_DIG, MOVE_WATER_PULSE, MOVE_RAIN_DANCE},
         .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [15] = {
+    [FRONTIER_MON_TYROGUE] = {
         .species = SPECIES_TYROGUE,
         .moves = {MOVE_MACH_PUNCH, MOVE_PROTECT, MOVE_DOUBLE_TEAM, MOVE_FACADE},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [16] = {
+    [FRONTIER_MON_SENTRET] = {
         .species = SPECIES_SENTRET,
         .moves = {MOVE_QUICK_ATTACK, MOVE_FOLLOW_ME, MOVE_HELPING_HAND, MOVE_ASSIST},
         .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [17] = {
+    [FRONTIER_MON_CLEFFA] = {
         .species = SPECIES_CLEFFA,
         .moves = {MOVE_SWEET_KISS, MOVE_SING, MOVE_ATTRACT, MOVE_METRONOME},
         .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_SERIOUS
     },
-    [18] = {
+    [FRONTIER_MON_SEEDOT] = {
         .species = SPECIES_SEEDOT,
         .moves = {MOVE_BULLET_SEED, MOVE_BIDE, MOVE_DEFENSE_CURL, MOVE_ROLLOUT},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [19] = {
+    [FRONTIER_MON_LOTAD] = {
         .species = SPECIES_LOTAD,
         .moves = {MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_SUNNY_DAY, MOVE_MEGA_DRAIN},
         .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [20] = {
+    [FRONTIER_MON_POOCHYENA] = {
         .species = SPECIES_POOCHYENA,
         .moves = {MOVE_CRUNCH, MOVE_SWAGGER, MOVE_ROAR, MOVE_SAND_ATTACK},
         .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_RELAXED
     },
-    [21] = {
+    [FRONTIER_MON_SHEDINJA] = {
         .species = SPECIES_SHEDINJA,
         .moves = {MOVE_SHADOW_BALL, MOVE_CONFUSE_RAY, MOVE_SILVER_WIND, MOVE_GRUDGE},
         .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP,
         .nature = NATURE_NAIVE
     },
-    [22] = {
+    [FRONTIER_MON_MAKUHITA] = {
         .species = SPECIES_MAKUHITA,
         .moves = {MOVE_FAKE_OUT, MOVE_SEISMIC_TOSS, MOVE_DETECT, MOVE_WHIRLWIND},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [23] = {
+    [FRONTIER_MON_WHISMUR] = {
         .species = SPECIES_WHISMUR,
         .moves = {MOVE_UPROAR, MOVE_SWAGGER, MOVE_BODY_SLAM, MOVE_SMELLING_SALT},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_RELAXED
     },
-    [24] = {
+    [FRONTIER_MON_ZIGZAGOON] = {
         .species = SPECIES_ZIGZAGOON,
         .moves = {MOVE_HEADBUTT, MOVE_PIN_MISSILE, MOVE_SWIFT, MOVE_SAND_ATTACK},
         .itemTableId = BATTLE_FRONTIER_ITEM_SILK_SCARF,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_TIMID
     },
-    [25] = {
+    [FRONTIER_MON_ZUBAT] = {
         .species = SPECIES_ZUBAT,
         .moves = {MOVE_POISON_FANG, MOVE_WHIRLWIND, MOVE_CONFUSE_RAY, MOVE_AERIAL_ACE},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_SASSY
     },
-    [26] = {
+    [FRONTIER_MON_TOGEPI] = {
         .species = SPECIES_TOGEPI,
         .moves = {MOVE_RETURN, MOVE_YAWN, MOVE_WISH, MOVE_SWEET_KISS},
         .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_RELAXED
     },
-    [27] = {
+    [FRONTIER_MON_SPINARAK] = {
         .species = SPECIES_SPINARAK,
         .moves = {MOVE_SIGNAL_BEAM, MOVE_NIGHT_SHADE, MOVE_SPIDER_WEB, MOVE_SCARY_FACE},
         .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_QUIRKY
     },
-    [28] = {
+    [FRONTIER_MON_MARILL] = {
         .species = SPECIES_MARILL,
         .moves = {MOVE_WATER_PULSE, MOVE_RAIN_DANCE, MOVE_LIGHT_SCREEN, MOVE_RETURN},
         .itemTableId = BATTLE_FRONTIER_ITEM_MYSTIC_WATER,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_GENTLE
     },
-    [29] = {
+    [FRONTIER_MON_HOPPIP] = {
         .species = SPECIES_HOPPIP,
         .moves = {MOVE_MEGA_DRAIN, MOVE_LEECH_SEED, MOVE_SLEEP_POWDER, MOVE_STUN_SPORE},
         .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_LAX
     },
-    [30] = {
+    [FRONTIER_MON_SLUGMA] = {
         .species = SPECIES_SLUGMA,
         .moves = {MOVE_EMBER, MOVE_ROCK_SLIDE, MOVE_YAWN, MOVE_BODY_SLAM},
         .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_SASSY
     },
-    [31] = {
+    [FRONTIER_MON_SWINUB] = {
         .species = SPECIES_SWINUB,
         .moves = {MOVE_ICY_WIND, MOVE_DIG, MOVE_ROCK_TOMB, MOVE_ENDURE},
         .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_GENTLE
     },
-    [32] = {
+    [FRONTIER_MON_SMEARGLE] = {
         .species = SPECIES_SMEARGLE,
         .moves = {MOVE_EXTREME_SPEED, MOVE_FAKE_OUT, MOVE_QUICK_ATTACK, MOVE_MACH_PUNCH},
         .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_HARDY
     },
-    [33] = {
+    [FRONTIER_MON_PIDGEY] = {
         .species = SPECIES_PIDGEY,
         .moves = {MOVE_GUST, MOVE_SAND_ATTACK, MOVE_WHIRLWIND, MOVE_QUICK_ATTACK},
         .itemTableId = BATTLE_FRONTIER_ITEM_SHARP_BEAK,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_LONELY
     },
-    [34] = {
+    [FRONTIER_MON_RATTATA] = {
         .species = SPECIES_RATTATA,
         .moves = {MOVE_HYPER_FANG, MOVE_PURSUIT, MOVE_QUICK_ATTACK, MOVE_SWAGGER},
         .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [35] = {
+    [FRONTIER_MON_WYNAUT] = {
         .species = SPECIES_WYNAUT,
         .moves = {MOVE_ENCORE, MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_CHARM},
         .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_JOLLY
     },
-    [36] = {
+    [FRONTIER_MON_SKITTY] = {
         .species = SPECIES_SKITTY,
         .moves = {MOVE_SING, MOVE_ATTRACT, MOVE_CHARM, MOVE_DOUBLE_SLAP},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [37] = {
+    [FRONTIER_MON_SPEAROW] = {
         .species = SPECIES_SPEAROW,
         .moves = {MOVE_FURY_ATTACK, MOVE_PURSUIT, MOVE_MIRROR_MOVE, MOVE_PROTECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [38] = {
+    [FRONTIER_MON_HOOTHOOT] = {
         .species = SPECIES_HOOTHOOT,
         .moves = {MOVE_CONFUSION, MOVE_HYPNOSIS, MOVE_SUPERSONIC, MOVE_REFLECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_QUIRKY
     },
-    [39] = {
+    [FRONTIER_MON_DIGLETT] = {
         .species = SPECIES_DIGLETT,
         .moves = {MOVE_MAGNITUDE, MOVE_SLASH, MOVE_ROCK_TOMB, MOVE_SAND_ATTACK},
         .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_NAIVE
     },
-    [40] = {
+    [FRONTIER_MON_LEDYBA] = {
         .species = SPECIES_LEDYBA,
         .moves = {MOVE_PSYBEAM, MOVE_AGILITY, MOVE_BATON_PASS, MOVE_LIGHT_SCREEN},
         .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_BASHFUL
     },
-    [41] = {
+    [FRONTIER_MON_NINCADA] = {
         .species = SPECIES_NINCADA,
         .moves = {MOVE_MUD_SLAP, MOVE_DIG, MOVE_TOXIC, MOVE_PROTECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_PECHA_BERRY,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_CALM
     },
-    [42] = {
+    [FRONTIER_MON_SURSKIT] = {
         .species = SPECIES_SURSKIT,
         .moves = {MOVE_BUBBLE_BEAM, MOVE_RAIN_DANCE, MOVE_SWEET_SCENT, MOVE_QUICK_ATTACK},
         .itemTableId = BATTLE_FRONTIER_ITEM_MYSTIC_WATER,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_RELAXED
     },
-    [43] = {
+    [FRONTIER_MON_JIGGLYPUFF] = {
         .species = SPECIES_JIGGLYPUFF,
         .moves = {MOVE_SING, MOVE_WISH, MOVE_MIMIC, MOVE_DOUBLE_SLAP},
         .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_RELAXED
     },
-    [44] = {
+    [FRONTIER_MON_TAILLOW] = {
         .species = SPECIES_TAILLOW,
         .moves = {MOVE_FLY, MOVE_QUICK_ATTACK, MOVE_ENDEAVOR, MOVE_FOCUS_ENERGY},
         .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_GENTLE
     },
-    [45] = {
+    [FRONTIER_MON_WINGULL] = {
         .species = SPECIES_WINGULL,
         .moves = {MOVE_WATER_PULSE, MOVE_FLY, MOVE_QUICK_ATTACK, MOVE_STEEL_WING},
         .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_HARDY
     },
-    [46] = {
+    [FRONTIER_MON_NIDORAN_M] = {
         .species = SPECIES_NIDORAN_M,
         .moves = {MOVE_DOUBLE_KICK, MOVE_POISON_STING, MOVE_DISABLE, MOVE_HELPING_HAND},
         .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_QUIRKY
     },
-    [47] = {
+    [FRONTIER_MON_NIDORAN_F] = {
         .species = SPECIES_NIDORAN_F,
         .moves = {MOVE_CRUNCH, MOVE_DOUBLE_KICK, MOVE_FLATTER, MOVE_HELPING_HAND},
         .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_QUIRKY
     },
-    [48] = {
+    [FRONTIER_MON_KIRLIA] = {
         .species = SPECIES_KIRLIA,
         .moves = {MOVE_CONFUSION, MOVE_WILL_O_WISP, MOVE_FUTURE_SIGHT, MOVE_LIGHT_SCREEN},
         .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [49] = {
+    [FRONTIER_MON_MAREEP] = {
         .species = SPECIES_MAREEP,
         .moves = {MOVE_SHOCK_WAVE, MOVE_FLASH, MOVE_REFLECT, MOVE_COTTON_SPORE},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_RELAXED
     },
-    [50] = {
+    [FRONTIER_MON_MEDITITE] = {
         .species = SPECIES_MEDITITE,
         .moves = {MOVE_HI_JUMP_KICK, MOVE_MEDITATE, MOVE_SWAGGER, MOVE_PSYCH_UP},
         .itemTableId = BATTLE_FRONTIER_ITEM_MENTAL_HERB,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_NAUGHTY
     },
-    [51] = {
+    [FRONTIER_MON_SLAKOTH] = {
         .species = SPECIES_SLAKOTH,
         .moves = {MOVE_YAWN, MOVE_SCRATCH, MOVE_ENCORE, MOVE_COUNTER},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_QUIRKY
     },
-    [52] = {
+    [FRONTIER_MON_PARAS] = {
         .species = SPECIES_PARAS,
         .moves = {MOVE_SPORE, MOVE_LEECH_LIFE, MOVE_SLASH, MOVE_LIGHT_SCREEN},
         .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_RELAXED
     },
-    [53] = {
+    [FRONTIER_MON_EKANS] = {
         .species = SPECIES_EKANS,
         .moves = {MOVE_ACID, MOVE_DIG, MOVE_SCREECH, MOVE_TORMENT},
         .itemTableId = BATTLE_FRONTIER_ITEM_POISON_BARB,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [54] = {
+    [FRONTIER_MON_DITTO] = {
         .species = SPECIES_DITTO,
         .moves = {MOVE_TRANSFORM, MOVE_NONE, MOVE_NONE, MOVE_NONE},
         .itemTableId = BATTLE_FRONTIER_ITEM_METAL_POWDER,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP,
         .nature = NATURE_HARDY
     },
-    [55] = {
+    [FRONTIER_MON_BARBOACH] = {
         .species = SPECIES_BARBOACH,
         .moves = {MOVE_MAGNITUDE, MOVE_WATER_PULSE, MOVE_SPARK, MOVE_FUTURE_SIGHT},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_BASHFUL
     },
-    [56] = {
+    [FRONTIER_MON_MEOWTH] = {
         .species = SPECIES_MEOWTH,
         .moves = {MOVE_SLASH, MOVE_BITE, MOVE_SCREECH, MOVE_FAKE_OUT},
         .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_QUIRKY
     },
-    [57] = {
+    [FRONTIER_MON_PINECO] = {
         .species = SPECIES_PINECO,
         .moves = {MOVE_SELF_DESTRUCT, MOVE_TAKE_DOWN, MOVE_REFLECT, MOVE_LIGHT_SCREEN},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_QUIRKY
     },
-    [58] = {
+    [FRONTIER_MON_TRAPINCH] = {
         .species = SPECIES_TRAPINCH,
         .moves = {MOVE_TOXIC, MOVE_DIG, MOVE_SANDSTORM, MOVE_SAND_ATTACK},
         .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_SERIOUS
     },
-    [59] = {
+    [FRONTIER_MON_SPHEAL] = {
         .species = SPECIES_SPHEAL,
         .moves = {MOVE_ICE_BALL, MOVE_WATER_PULSE, MOVE_HAIL, MOVE_MUD_SLAP},
         .itemTableId = BATTLE_FRONTIER_ITEM_NEVER_MELT_ICE,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [60] = {
+    [FRONTIER_MON_HORSEA] = {
         .species = SPECIES_HORSEA,
         .moves = {MOVE_WATER_GUN, MOVE_AGILITY, MOVE_ICY_WIND, MOVE_TWISTER},
         .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_RELAXED
     },
-    [61] = {
+    [FRONTIER_MON_SHROOMISH] = {
         .species = SPECIES_SHROOMISH,
         .moves = {MOVE_SPORE, MOVE_BULLET_SEED, MOVE_LEECH_SEED, MOVE_HEADBUTT},
         .itemTableId = BATTLE_FRONTIER_ITEM_MIRACLE_SEED,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_RELAXED
     },
-    [62] = {
+    [FRONTIER_MON_SHUPPET] = {
         .species = SPECIES_SHUPPET,
         .moves = {MOVE_WILL_O_WISP, MOVE_NIGHT_SHADE, MOVE_GRUDGE, MOVE_KNOCK_OFF},
         .itemTableId = BATTLE_FRONTIER_ITEM_RAWST_BERRY,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_RASH
     },
-    [63] = {
+    [FRONTIER_MON_DUSKULL] = {
         .species = SPECIES_DUSKULL,
         .moves = {MOVE_SKILL_SWAP, MOVE_NIGHT_SHADE, MOVE_DISABLE, MOVE_CONFUSE_RAY},
         .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP,
         .nature = NATURE_QUIRKY
     },
-    [64] = {
+    [FRONTIER_MON_ELECTRIKE] = {
         .species = SPECIES_ELECTRIKE,
         .moves = {MOVE_SPARK, MOVE_THUNDER_WAVE, MOVE_ROAR, MOVE_QUICK_ATTACK},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [65] = {
+    [FRONTIER_MON_VULPIX] = {
         .species = SPECIES_VULPIX,
         .moves = {MOVE_WILL_O_WISP, MOVE_CONFUSE_RAY, MOVE_FIRE_SPIN, MOVE_QUICK_ATTACK},
         .itemTableId = BATTLE_FRONTIER_ITEM_RAWST_BERRY,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [66] = {
+    [FRONTIER_MON_PIKACHU] = {
         .species = SPECIES_PIKACHU,
         .moves = {MOVE_THUNDER_PUNCH, MOVE_THUNDER_WAVE, MOVE_DOUBLE_TEAM, MOVE_QUICK_ATTACK},
         .itemTableId = BATTLE_FRONTIER_ITEM_LIGHT_BALL,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [67] = {
+    [FRONTIER_MON_SANDSHREW] = {
         .species = SPECIES_SANDSHREW,
         .moves = {MOVE_DIG, MOVE_ROCK_TOMB, MOVE_SANDSTORM, MOVE_SAND_ATTACK},
         .itemTableId = BATTLE_FRONTIER_ITEM_SOFT_SAND,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [68] = {
+    [FRONTIER_MON_POLIWAG] = {
         .species = SPECIES_POLIWAG,
         .moves = {MOVE_HYPNOSIS, MOVE_ICY_WIND, MOVE_WATER_GUN, MOVE_RAIN_DANCE},
         .itemTableId = BATTLE_FRONTIER_ITEM_MYSTIC_WATER,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP,
         .nature = NATURE_RELAXED
     },
-    [69] = {
+    [FRONTIER_MON_BELLSPROUT] = {
         .species = SPECIES_BELLSPROUT,
         .moves = {MOVE_RAZOR_LEAF, MOVE_ACID, MOVE_STUN_SPORE, MOVE_WRAP},
         .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_LAX
     },
-    [70] = {
+    [FRONTIER_MON_GEODUDE] = {
         .species = SPECIES_GEODUDE,
         .moves = {MOVE_MAGNITUDE, MOVE_ROCK_BLAST, MOVE_STRENGTH, MOVE_PROTECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_BRAVE
     },
-    [71] = {
+    [FRONTIER_MON_DRATINI] = {
         .species = SPECIES_DRATINI,
         .moves = {MOVE_OUTRAGE, MOVE_THUNDER_WAVE, MOVE_SUPERSONIC, MOVE_WATER_PULSE},
         .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [72] = {
+    [FRONTIER_MON_SNUBBULL] = {
         .species = SPECIES_SNUBBULL,
         .moves = {MOVE_BITE, MOVE_CHARM, MOVE_SWAGGER, MOVE_SCARY_FACE},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_RELAXED
     },
-    [73] = {
+    [FRONTIER_MON_REMORAID] = {
         .species = SPECIES_REMORAID,
         .moves = {MOVE_BUBBLE_BEAM, MOVE_AURORA_BEAM, MOVE_PSYBEAM, MOVE_PROTECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_QUIRKY
     },
-    [74] = {
+    [FRONTIER_MON_LARVITAR] = {
         .species = SPECIES_LARVITAR,
         .moves = {MOVE_THRASH, MOVE_ROCK_SLIDE, MOVE_DIG, MOVE_DRAGON_DANCE},
         .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_NAUGHTY
     },
-    [75] = {
+    [FRONTIER_MON_BALTOY] = {
         .species = SPECIES_BALTOY,
         .moves = {MOVE_PSYBEAM, MOVE_ANCIENT_POWER, MOVE_LIGHT_SCREEN, MOVE_MUD_SLAP},
         .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_NAUGHTY
     },
-    [76] = {
+    [FRONTIER_MON_SNORUNT] = {
         .species = SPECIES_SNORUNT,
         .moves = {MOVE_ICY_WIND, MOVE_HEADBUTT, MOVE_LEER, MOVE_BITE},
         .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_BRAVE
     },
-    [77] = {
+    [FRONTIER_MON_BAGON] = {
         .species = SPECIES_BAGON,
         .moves = {MOVE_DRAGON_BREATH, MOVE_HEADBUTT, MOVE_BRICK_BREAK, MOVE_SCARY_FACE},
         .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_NAUGHTY
     },
-    [78] = {
+    [FRONTIER_MON_BELDUM] = {
         .species = SPECIES_BELDUM,
         .moves = {MOVE_TAKE_DOWN, MOVE_NONE, MOVE_NONE, MOVE_NONE},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_HARDY
     },
-    [79] = {
+    [FRONTIER_MON_GULPIN] = {
         .species = SPECIES_GULPIN,
         .moves = {MOVE_TOXIC, MOVE_YAWN, MOVE_PAIN_SPLIT, MOVE_ATTRACT},
         .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_SERIOUS
     },
-    [80] = {
+    [FRONTIER_MON_VENONAT] = {
         .species = SPECIES_VENONAT,
         .moves = {MOVE_PSYBEAM, MOVE_SUPERSONIC, MOVE_STUN_SPORE, MOVE_SKILL_SWAP},
         .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_RELAXED
     },
-    [81] = {
+    [FRONTIER_MON_MANKEY] = {
         .species = SPECIES_MANKEY,
         .moves = {MOVE_KARATE_CHOP, MOVE_LOW_KICK, MOVE_SCREECH, MOVE_SWAGGER},
         .itemTableId = BATTLE_FRONTIER_ITEM_BLACK_BELT,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_NAUGHTY
     },
-    [82] = {
+    [FRONTIER_MON_MACHOP] = {
         .species = SPECIES_MACHOP,
         .moves = {MOVE_SEISMIC_TOSS, MOVE_REVENGE, MOVE_ROCK_TOMB, MOVE_SCARY_FACE},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [83] = {
+    [FRONTIER_MON_SHELLDER] = {
         .species = SPECIES_SHELLDER,
         .moves = {MOVE_ICICLE_SPEAR, MOVE_SUPERSONIC, MOVE_CLAMP, MOVE_WITHDRAW},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_RELAXED
     },
-    [84] = {
+    [FRONTIER_MON_SMOOCHUM] = {
         .species = SPECIES_SMOOCHUM,
         .moves = {MOVE_SWEET_KISS, MOVE_SING, MOVE_MUD_SLAP, MOVE_FAKE_OUT},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [85] = {
+    [FRONTIER_MON_NUMEL] = {
         .species = SPECIES_NUMEL,
         .moves = {MOVE_EMBER, MOVE_MAGNITUDE, MOVE_ROCK_TOMB, MOVE_SANDSTORM},
         .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_HARDY
     },
-    [86] = {
+    [FRONTIER_MON_CARVANHA] = {
         .species = SPECIES_CARVANHA,
         .moves = {MOVE_BITE, MOVE_SCREECH, MOVE_SCARY_FACE, MOVE_SWAGGER},
         .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_QUIET
     },
-    [87] = {
+    [FRONTIER_MON_CORPHISH] = {
         .species = SPECIES_CORPHISH,
         .moves = {MOVE_CRABHAMMER, MOVE_WATER_PULSE, MOVE_MUD_SLAP, MOVE_PROTECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_MYSTIC_WATER,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_BRAVE
     },
-    [88] = {
+    [FRONTIER_MON_CHARMANDER] = {
         .species = SPECIES_CHARMANDER,
         .moves = {MOVE_FIRE_SPIN, MOVE_METAL_CLAW, MOVE_SMOKESCREEN, MOVE_SCARY_FACE},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [89] = {
+    [FRONTIER_MON_CYNDAQUIL] = {
         .species = SPECIES_CYNDAQUIL,
         .moves = {MOVE_EMBER, MOVE_SWIFT, MOVE_QUICK_ATTACK, MOVE_SMOKESCREEN},
         .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [90] = {
+    [FRONTIER_MON_ABRA] = {
         .species = SPECIES_ABRA,
         .moves = {MOVE_MIMIC, MOVE_METRONOME, MOVE_FLASH, MOVE_SEISMIC_TOSS},
         .itemTableId = BATTLE_FRONTIER_ITEM_TWISTED_SPOON,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP,
         .nature = NATURE_LONELY
     },
-    [91] = {
+    [FRONTIER_MON_DODUO] = {
         .species = SPECIES_DODUO,
         .moves = {MOVE_FURY_ATTACK, MOVE_UPROAR, MOVE_MUD_SLAP, MOVE_FAINT_ATTACK},
         .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP,
         .nature = NATURE_LONELY
     },
-    [92] = {
+    [FRONTIER_MON_GASTLY] = {
         .species = SPECIES_GASTLY,
         .moves = {MOVE_DREAM_EATER, MOVE_HYPNOSIS, MOVE_NIGHT_SHADE, MOVE_CONFUSE_RAY},
         .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP,
         .nature = NATURE_LONELY
     },
-    [93] = {
+    [FRONTIER_MON_SWABLU] = {
         .species = SPECIES_SWABLU,
         .moves = {MOVE_TAKE_DOWN, MOVE_DREAM_EATER, MOVE_SING, MOVE_ATTRACT},
         .itemTableId = BATTLE_FRONTIER_ITEM_MENTAL_HERB,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_LONELY
     },
-    [94] = {
+    [FRONTIER_MON_TREECKO] = {
         .species = SPECIES_TREECKO,
         .moves = {MOVE_BULLET_SEED, MOVE_AERIAL_ACE, MOVE_QUICK_ATTACK, MOVE_DOUBLE_TEAM},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_LONELY
     },
-    [95] = {
+    [FRONTIER_MON_TORCHIC] = {
         .species = SPECIES_TORCHIC,
         .moves = {MOVE_FIRE_SPIN, MOVE_QUICK_ATTACK, MOVE_SAND_ATTACK, MOVE_DOUBLE_TEAM},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_LONELY
     },
-    [96] = {
+    [FRONTIER_MON_MUDKIP] = {
         .species = SPECIES_MUDKIP,
         .moves = {MOVE_WHIRLPOOL, MOVE_ENDEAVOR, MOVE_MUD_SPORT, MOVE_MUD_SLAP},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [97] = {
+    [FRONTIER_MON_SQUIRTLE] = {
         .species = SPECIES_SQUIRTLE,
         .moves = {MOVE_WATER_PULSE, MOVE_BITE, MOVE_WITHDRAW, MOVE_PROTECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [98] = {
+    [FRONTIER_MON_TOTODILE] = {
         .species = SPECIES_TOTODILE,
         .moves = {MOVE_SLASH, MOVE_WATER_PULSE, MOVE_SCREECH, MOVE_ICY_WIND},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [99] = {
+    [FRONTIER_MON_SLOWPOKE] = {
         .species = SPECIES_SLOWPOKE,
         .moves = {MOVE_CONFUSION, MOVE_DISABLE, MOVE_WATER_PULSE, MOVE_YAWN},
         .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_BRAVE
     },
-    [100] = {
+    [FRONTIER_MON_BULBASAUR] = {
         .species = SPECIES_BULBASAUR,
         .moves = {MOVE_RAZOR_LEAF, MOVE_SWEET_SCENT, MOVE_SLEEP_POWDER, MOVE_LIGHT_SCREEN},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_RELAXED
     },
-    [101] = {
+    [FRONTIER_MON_CHIKORITA] = {
         .species = SPECIES_CHIKORITA,
         .moves = {MOVE_SECRET_POWER, MOVE_BULLET_SEED, MOVE_MUD_SLAP, MOVE_LIGHT_SCREEN},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_RELAXED
     },
-    [102] = {
+    [FRONTIER_MON_ODDISH] = {
         .species = SPECIES_ODDISH,
         .moves = {MOVE_ACID, MOVE_STUN_SPORE, MOVE_SWEET_SCENT, MOVE_MOONLIGHT},
         .itemTableId = BATTLE_FRONTIER_ITEM_PECHA_BERRY,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_RELAXED
     },
-    [103] = {
+    [FRONTIER_MON_PSYDUCK] = {
         .species = SPECIES_PSYDUCK,
         .moves = {MOVE_CONFUSION, MOVE_FURY_SWIPES, MOVE_AERIAL_ACE, MOVE_DISABLE},
         .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_HASTY
     },
-    [104] = {
+    [FRONTIER_MON_CUBONE] = {
         .species = SPECIES_CUBONE,
         .moves = {MOVE_BONE_CLUB, MOVE_HEADBUTT, MOVE_BRICK_BREAK, MOVE_AERIAL_ACE},
         .itemTableId = BATTLE_FRONTIER_ITEM_SOFT_SAND,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_HARDY
     },
-    [105] = {
+    [FRONTIER_MON_GOLDEEN] = {
         .species = SPECIES_GOLDEEN,
         .moves = {MOVE_WATERFALL, MOVE_FURY_ATTACK, MOVE_AGILITY, MOVE_PSYBEAM},
         .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [106] = {
+    [FRONTIER_MON_NATU] = {
         .species = SPECIES_NATU,
         .moves = {MOVE_NIGHT_SHADE, MOVE_FUTURE_SIGHT, MOVE_CONFUSE_RAY, MOVE_FLASH},
         .itemTableId = BATTLE_FRONTIER_ITEM_TWISTED_SPOON,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_RELAXED
     },
-    [107] = {
+    [FRONTIER_MON_CLEFAIRY] = {
         .species = SPECIES_CLEFAIRY,
         .moves = {MOVE_FOLLOW_ME, MOVE_RETURN, MOVE_ENCORE, MOVE_SING},
         .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_LONELY
     },
-    [108] = {
+    [FRONTIER_MON_MAGNEMITE] = {
         .species = SPECIES_MAGNEMITE,
         .moves = {MOVE_SHOCK_WAVE, MOVE_SUPERSONIC, MOVE_METAL_SOUND, MOVE_REFLECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_RAWST_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_GENTLE
     },
-    [109] = {
+    [FRONTIER_MON_SEEL] = {
         .species = SPECIES_SEEL,
         .moves = {MOVE_AURORA_BEAM, MOVE_DIVE, MOVE_BODY_SLAM, MOVE_FAKE_OUT},
         .itemTableId = BATTLE_FRONTIER_ITEM_ASPEAR_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_HARDY
     },
-    [110] = {
+    [FRONTIER_MON_GRIMER] = {
         .species = SPECIES_GRIMER,
         .moves = {MOVE_SLUDGE, MOVE_ROCK_TOMB, MOVE_ACID_ARMOR, MOVE_MINIMIZE},
         .itemTableId = BATTLE_FRONTIER_ITEM_PECHA_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_QUIRKY
     },
-    [111] = {
+    [FRONTIER_MON_KRABBY] = {
         .species = SPECIES_KRABBY,
         .moves = {MOVE_CRABHAMMER, MOVE_MUD_SHOT, MOVE_FLAIL, MOVE_KNOCK_OFF},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_HARDY
     },
-    [112] = {
+    [FRONTIER_MON_EXEGGCUTE] = {
         .species = SPECIES_EXEGGCUTE,
         .moves = {MOVE_CONFUSION, MOVE_ANCIENT_POWER, MOVE_LEECH_SEED, MOVE_LIGHT_SCREEN},
         .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_NAUGHTY
     },
-    [113] = {
+    [FRONTIER_MON_EEVEE] = {
         .species = SPECIES_EEVEE,
         .moves = {MOVE_CHARM, MOVE_ATTRACT, MOVE_FLAIL, MOVE_ENDURE},
         .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [114] = {
+    [FRONTIER_MON_DROWZEE] = {
         .species = SPECIES_DROWZEE,
         .moves = {MOVE_CONFUSION, MOVE_HEADBUTT, MOVE_DISABLE, MOVE_BARRIER},
         .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_QUIRKY
     },
-    [115] = {
+    [FRONTIER_MON_VOLTORB] = {
         .species = SPECIES_VOLTORB,
         .moves = {MOVE_SPARK, MOVE_SCREECH, MOVE_ROLLOUT, MOVE_LIGHT_SCREEN},
         .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [116] = {
+    [FRONTIER_MON_CHINCHOU] = {
         .species = SPECIES_CHINCHOU,
         .moves = {MOVE_SPARK, MOVE_DIVE, MOVE_CONFUSE_RAY, MOVE_TAKE_DOWN},
         .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_HARDY
     },
-    [117] = {
+    [FRONTIER_MON_TEDDIURSA] = {
         .species = SPECIES_TEDDIURSA,
         .moves = {MOVE_SECRET_POWER, MOVE_FAKE_TEARS, MOVE_FAINT_ATTACK, MOVE_REST},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_RELAXED
     },
-    [118] = {
+    [FRONTIER_MON_DELIBIRD] = {
         .species = SPECIES_DELIBIRD,
         .moves = {MOVE_PRESENT, MOVE_ICE_BALL, MOVE_AERIAL_ACE, MOVE_HAIL},
         .itemTableId = BATTLE_FRONTIER_ITEM_NEVER_MELT_ICE,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [119] = {
+    [FRONTIER_MON_HOUNDOUR] = {
         .species = SPECIES_HOUNDOUR,
         .moves = {MOVE_CRUNCH, MOVE_EMBER, MOVE_ROAR, MOVE_PROTECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHARCOAL,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [120] = {
+    [FRONTIER_MON_PHANPY] = {
         .species = SPECIES_PHANPY,
         .moves = {MOVE_ROLLOUT, MOVE_DEFENSE_CURL, MOVE_ROCK_TOMB, MOVE_SANDSTORM},
         .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_NAUGHTY
     },
-    [121] = {
+    [FRONTIER_MON_SPOINK] = {
         .species = SPECIES_SPOINK,
         .moves = {MOVE_PSYWAVE, MOVE_BOUNCE, MOVE_MAGIC_COAT, MOVE_CONFUSE_RAY},
         .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_RELAXED
     },
-    [122] = {
+    [FRONTIER_MON_ARON] = {
         .species = SPECIES_ARON,
         .moves = {MOVE_METAL_CLAW, MOVE_AERIAL_ACE, MOVE_METAL_SOUND, MOVE_ROAR},
         .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [123] = {
+    [FRONTIER_MON_LUVDISC] = {
         .species = SPECIES_LUVDISC,
         .moves = {MOVE_SWEET_KISS, MOVE_ATTRACT, MOVE_DIVE, MOVE_RAIN_DANCE},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_RELAXED
     },
-    [124] = {
+    [FRONTIER_MON_TENTACOOL] = {
         .species = SPECIES_TENTACOOL,
         .moves = {MOVE_BUBBLE_BEAM, MOVE_ACID, MOVE_BARRIER, MOVE_WRAP},
         .itemTableId = BATTLE_FRONTIER_ITEM_PECHA_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_HARDY
     },
-    [125] = {
+    [FRONTIER_MON_CACNEA] = {
         .species = SPECIES_CACNEA,
         .moves = {MOVE_NEEDLE_ARM, MOVE_FAINT_ATTACK, MOVE_COTTON_SPORE, MOVE_SAND_ATTACK},
         .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_QUIRKY
     },
-    [126] = {
+    [FRONTIER_MON_UNOWN] = {
         .species = SPECIES_UNOWN,
         .moves = {MOVE_HIDDEN_POWER, MOVE_NONE, MOVE_NONE, MOVE_NONE},
         .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_HARDY
     },
-    [127] = {
+    [FRONTIER_MON_KOFFING] = {
         .species = SPECIES_KOFFING,
         .moves = {MOVE_SLUDGE, MOVE_SMOKESCREEN, MOVE_TORMENT, MOVE_HAZE},
         .itemTableId = BATTLE_FRONTIER_ITEM_POISON_BARB,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_QUIRKY
     },
-    [128] = {
+    [FRONTIER_MON_STARYU] = {
         .species = SPECIES_STARYU,
         .moves = {MOVE_BUBBLE_BEAM, MOVE_MINIMIZE, MOVE_SWIFT, MOVE_LIGHT_SCREEN},
         .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_QUIRKY
     },
-    [129] = {
+    [FRONTIER_MON_SKIPLOOM] = {
         .species = SPECIES_SKIPLOOM,
         .moves = {MOVE_MEGA_DRAIN, MOVE_CONFUSION, MOVE_COTTON_SPORE, MOVE_SYNTHESIS},
         .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [130] = {
+    [FRONTIER_MON_NUZLEAF] = {
         .species = SPECIES_NUZLEAF,
         .moves = {MOVE_EXTRASENSORY, MOVE_FAKE_OUT, MOVE_RAZOR_WIND, MOVE_FAINT_ATTACK},
         .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_HARDY
     },
-    [131] = {
+    [FRONTIER_MON_LOMBRE] = {
         .species = SPECIES_LOMBRE,
         .moves = {MOVE_WATER_PULSE, MOVE_FAKE_OUT, MOVE_BRICK_BREAK, MOVE_ABSORB},
         .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_QUIRKY
     },
-    [132] = {
+    [FRONTIER_MON_VIBRAVA] = {
         .species = SPECIES_VIBRAVA,
         .moves = {MOVE_DRAGON_BREATH, MOVE_DIG, MOVE_SCREECH, MOVE_ROCK_TOMB},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_QUIRKY
     },
-    [133] = {
+    [FRONTIER_MON_RHYHORN] = {
         .species = SPECIES_RHYHORN,
         .moves = {MOVE_ROCK_BLAST, MOVE_DIG, MOVE_SCARY_FACE, MOVE_ROAR},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_HARDY
     },
-    [134] = {
+    [FRONTIER_MON_CLAMPERL] = {
         .species = SPECIES_CLAMPERL,
         .moves = {MOVE_DIVE, MOVE_TOXIC, MOVE_IRON_DEFENSE, MOVE_DOUBLE_TEAM},
         .itemTableId = BATTLE_FRONTIER_ITEM_DEEP_SEA_SCALE,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [135] = {
+    [FRONTIER_MON_PIDGEOTTO] = {
         .species = SPECIES_PIDGEOTTO,
         .moves = {MOVE_AERIAL_ACE, MOVE_QUICK_ATTACK, MOVE_FEATHER_DANCE, MOVE_SAND_ATTACK},
         .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_QUIRKY
     },
-    [136] = {
+    [FRONTIER_MON_GROWLITHE] = {
         .species = SPECIES_GROWLITHE,
         .moves = {MOVE_FLAME_WHEEL, MOVE_BITE, MOVE_ROAR, MOVE_AGILITY},
         .itemTableId = BATTLE_FRONTIER_ITEM_RAWST_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [137] = {
+    [FRONTIER_MON_FARFETCHD] = {
         .species = SPECIES_FARFETCHD,
         .moves = {MOVE_SLASH, MOVE_KNOCK_OFF, MOVE_SWORDS_DANCE, MOVE_AGILITY},
         .itemTableId = BATTLE_FRONTIER_ITEM_STICK,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_RELAXED
     },
-    [138] = {
+    [FRONTIER_MON_OMANYTE] = {
         .species = SPECIES_OMANYTE,
         .moves = {MOVE_MUD_SHOT, MOVE_WATER_GUN, MOVE_ANCIENT_POWER, MOVE_TICKLE},
         .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_QUIRKY
     },
-    [139] = {
+    [FRONTIER_MON_KABUTO] = {
         .species = SPECIES_KABUTO,
         .moves = {MOVE_MEGA_DRAIN, MOVE_ANCIENT_POWER, MOVE_SAND_ATTACK, MOVE_PROTECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_HARDY
     },
-    [140] = {
+    [FRONTIER_MON_LILEEP] = {
         .species = SPECIES_LILEEP,
         .moves = {MOVE_ANCIENT_POWER, MOVE_ACID, MOVE_INGRAIN, MOVE_CONFUSE_RAY},
         .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [141] = {
+    [FRONTIER_MON_ANORITH] = {
         .species = SPECIES_ANORITH,
         .moves = {MOVE_METAL_CLAW, MOVE_FURY_CUTTER, MOVE_ANCIENT_POWER, MOVE_WATER_GUN},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_HARDY
     },
-    [142] = {
+    [FRONTIER_MON_AIPOM] = {
         .species = SPECIES_AIPOM,
         .moves = {MOVE_FURY_SWIPES, MOVE_SAND_ATTACK, MOVE_BATON_PASS, MOVE_AGILITY},
         .itemTableId = BATTLE_FRONTIER_ITEM_SILK_SCARF,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_RELAXED
     },
-    [143] = {
+    [FRONTIER_MON_ELEKID] = {
         .species = SPECIES_ELEKID,
         .moves = {MOVE_THUNDER_PUNCH, MOVE_QUICK_ATTACK, MOVE_SWIFT, MOVE_LIGHT_SCREEN},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_NAIVE
     },
-    [144] = {
+    [FRONTIER_MON_LOUDRED] = {
         .species = SPECIES_LOUDRED,
         .moves = {MOVE_STOMP, MOVE_HOWL, MOVE_ASTONISH, MOVE_SUPERSONIC},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_RELAXED
     },
-    [145] = {
+    [FRONTIER_MON_SPINDA] = {
         .species = SPECIES_SPINDA,
         .moves = {MOVE_DIZZY_PUNCH, MOVE_TEETER_DANCE, MOVE_PSYBEAM, MOVE_FAINT_ATTACK},
         .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_RELAXED
     },
-    [146] = {
+    [FRONTIER_MON_NIDORINA] = {
         .species = SPECIES_NIDORINA,
         .moves = {MOVE_DOUBLE_KICK, MOVE_BITE, MOVE_AERIAL_ACE, MOVE_FLATTER},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_QUIRKY
     },
-    [147] = {
+    [FRONTIER_MON_NIDORINO] = {
         .species = SPECIES_NIDORINO,
         .moves = {MOVE_DOUBLE_KICK, MOVE_WATER_PULSE, MOVE_MUD_SLAP, MOVE_FLATTER},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_QUIRKY
     },
-    [148] = {
+    [FRONTIER_MON_FLAAFFY] = {
         .species = SPECIES_FLAAFFY,
         .moves = {MOVE_SHOCK_WAVE, MOVE_THUNDER_WAVE, MOVE_COTTON_SPORE, MOVE_LIGHT_SCREEN},
         .itemTableId = BATTLE_FRONTIER_ITEM_MAGNET,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_MILD
     },
-    [149] = {
+    [FRONTIER_MON_MAGBY] = {
         .species = SPECIES_MAGBY,
         .moves = {MOVE_FIRE_PUNCH, MOVE_SMOKESCREEN, MOVE_CONFUSE_RAY, MOVE_SMOG},
         .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [150] = {
+    [FRONTIER_MON_NOSEPASS] = {
         .species = SPECIES_NOSEPASS,
         .moves = {MOVE_ROCK_SLIDE, MOVE_SHOCK_WAVE, MOVE_THUNDER_WAVE, MOVE_SANDSTORM},
         .itemTableId = BATTLE_FRONTIER_ITEM_HARD_STONE,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_SASSY
     },
-    [151] = {
+    [FRONTIER_MON_CORSOLA] = {
         .species = SPECIES_CORSOLA,
         .moves = {MOVE_BUBBLE_BEAM, MOVE_MIRROR_COAT, MOVE_ATTRACT, MOVE_ANCIENT_POWER},
         .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_IMPISH
     },
-    [152] = {
+    [FRONTIER_MON_MAWILE] = {
         .species = SPECIES_MAWILE,
         .moves = {MOVE_CRUNCH, MOVE_FAKE_TEARS, MOVE_IRON_DEFENSE, MOVE_BATON_PASS},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [153] = {
+    [FRONTIER_MON_BUTTERFREE] = {
         .species = SPECIES_BUTTERFREE,
         .moves = {MOVE_SILVER_WIND, MOVE_PSYBEAM, MOVE_TOXIC, MOVE_WHIRLWIND},
         .itemTableId = BATTLE_FRONTIER_ITEM_PECHA_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_QUIRKY
     },
-    [154] = {
+    [FRONTIER_MON_BEEDRILL] = {
         .species = SPECIES_BEEDRILL,
         .moves = {MOVE_TWINEEDLE, MOVE_PURSUIT, MOVE_ENDEAVOR, MOVE_AGILITY},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_NAUGHTY
     },
-    [155] = {
+    [FRONTIER_MON_POLIWHIRL] = {
         .species = SPECIES_POLIWHIRL,
         .moves = {MOVE_WATER_PULSE, MOVE_DOUBLE_SLAP, MOVE_ICY_WIND, MOVE_RAIN_DANCE},
         .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_QUIRKY
     },
-    [156] = {
+    [FRONTIER_MON_ONIX] = {
         .species = SPECIES_ONIX,
         .moves = {MOVE_ROCK_SLIDE, MOVE_BIND, MOVE_DRAGON_BREATH, MOVE_SANDSTORM},
         .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_HARDY
     },
-    [157] = {
+    [FRONTIER_MON_BEAUTIFLY] = {
         .species = SPECIES_BEAUTIFLY,
         .moves = {MOVE_SILVER_WIND, MOVE_MEGA_DRAIN, MOVE_ATTRACT, MOVE_WHIRLWIND},
         .itemTableId = BATTLE_FRONTIER_ITEM_MENTAL_HERB,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [158] = {
+    [FRONTIER_MON_DUSTOX] = {
         .species = SPECIES_DUSTOX,
         .moves = {MOVE_SILVER_WIND, MOVE_TOXIC, MOVE_PSYBEAM, MOVE_WHIRLWIND},
         .itemTableId = BATTLE_FRONTIER_ITEM_SILVER_POWDER,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [159] = {
+    [FRONTIER_MON_LEDIAN] = {
         .species = SPECIES_LEDIAN,
         .moves = {MOVE_COMET_PUNCH, MOVE_BATON_PASS, MOVE_SWORDS_DANCE, MOVE_AGILITY},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_BASHFUL
     },
-    [160] = {
+    [FRONTIER_MON_ARIADOS] = {
         .species = SPECIES_ARIADOS,
         .moves = {MOVE_SIGNAL_BEAM, MOVE_SPIDER_WEB, MOVE_NIGHT_SHADE, MOVE_TOXIC},
         .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_SERIOUS
     },
-    [161] = {
+    [FRONTIER_MON_YANMA] = {
         .species = SPECIES_YANMA,
         .moves = {MOVE_SIGNAL_BEAM, MOVE_AERIAL_ACE, MOVE_DOUBLE_TEAM, MOVE_DETECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_RELAXED
     },
-    [162] = {
+    [FRONTIER_MON_DELCATTY_1] = {
         .species = SPECIES_DELCATTY,
         .moves = {MOVE_SECRET_POWER, MOVE_FAINT_ATTACK, MOVE_DOUBLE_TEAM, MOVE_HEAL_BELL},
         .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_LONELY
     },
-    [163] = {
+    [FRONTIER_MON_SABLEYE_1] = {
         .species = SPECIES_SABLEYE,
         .moves = {MOVE_FAINT_ATTACK, MOVE_CONFUSE_RAY, MOVE_KNOCK_OFF, MOVE_FAKE_OUT},
         .itemTableId = BATTLE_FRONTIER_ITEM_BLACK_GLASSES,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_LONELY
     },
-    [164] = {
+    [FRONTIER_MON_LICKITUNG_1] = {
         .species = SPECIES_LICKITUNG,
         .moves = {MOVE_SLAM, MOVE_BRICK_BREAK, MOVE_LICK, MOVE_MUD_SLAP},
         .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_QUIRKY
     },
-    [165] = {
+    [FRONTIER_MON_WEEPINBELL_1] = {
         .species = SPECIES_WEEPINBELL,
         .moves = {MOVE_RAZOR_LEAF, MOVE_ACID, MOVE_WRAP, MOVE_SWEET_SCENT},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_QUIET
     },
-    [166] = {
+    [FRONTIER_MON_GRAVELER_1] = {
         .species = SPECIES_GRAVELER,
         .moves = {MOVE_MAGNITUDE, MOVE_ROCK_THROW, MOVE_DEFENSE_CURL, MOVE_BRICK_BREAK},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [167] = {
+    [FRONTIER_MON_GLOOM_1] = {
         .species = SPECIES_GLOOM,
         .moves = {MOVE_PETAL_DANCE, MOVE_ACID, MOVE_STUN_SPORE, MOVE_MOONLIGHT},
         .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_QUIRKY
     },
-    [168] = {
+    [FRONTIER_MON_PORYGON_1] = {
         .species = SPECIES_PORYGON,
         .moves = {MOVE_PSYBEAM, MOVE_ICY_WIND, MOVE_RECYCLE, MOVE_AGILITY},
         .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_RELAXED
     },
-    [169] = {
+    [FRONTIER_MON_KADABRA_1] = {
         .species = SPECIES_KADABRA,
         .moves = {MOVE_CONFUSION, MOVE_ROLE_PLAY, MOVE_FUTURE_SIGHT, MOVE_DISABLE},
         .itemTableId = BATTLE_FRONTIER_ITEM_TWISTED_SPOON,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_IMPISH
     },
-    [170] = {
+    [FRONTIER_MON_WAILMER_1] = {
         .species = SPECIES_WAILMER,
         .moves = {MOVE_WHIRLPOOL, MOVE_ROAR, MOVE_DEFENSE_CURL, MOVE_ROLLOUT},
         .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_DOCILE
     },
-    [171] = {
+    [FRONTIER_MON_ROSELIA_1] = {
         .species = SPECIES_ROSELIA,
         .moves = {MOVE_MAGICAL_LEAF, MOVE_TOXIC, MOVE_GRASS_WHISTLE, MOVE_COTTON_SPORE},
         .itemTableId = BATTLE_FRONTIER_ITEM_PECHA_BERRY,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [172] = {
+    [FRONTIER_MON_VOLBEAT_1] = {
         .species = SPECIES_VOLBEAT,
         .moves = {MOVE_SILVER_WIND, MOVE_CONFUSE_RAY, MOVE_QUICK_ATTACK, MOVE_HELPING_HAND},
         .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_QUIRKY
     },
-    [173] = {
+    [FRONTIER_MON_ILLUMISE_1] = {
         .species = SPECIES_ILLUMISE,
         .moves = {MOVE_SILVER_WIND, MOVE_WISH, MOVE_QUICK_ATTACK, MOVE_HELPING_HAND},
         .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_QUIRKY
     },
-    [174] = {
+    [FRONTIER_MON_IVYSAUR_1] = {
         .species = SPECIES_IVYSAUR,
         .moves = {MOVE_PETAL_DANCE, MOVE_GROWTH, MOVE_SWEET_SCENT, MOVE_FURY_CUTTER},
         .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_GENTLE
     },
-    [175] = {
+    [FRONTIER_MON_CHARMELEON_1] = {
         .species = SPECIES_CHARMELEON,
         .moves = {MOVE_SLASH, MOVE_FIRE_SPIN, MOVE_SWORDS_DANCE, MOVE_AERIAL_ACE},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_NAUGHTY
     },
-    [176] = {
+    [FRONTIER_MON_WARTORTLE_1] = {
         .species = SPECIES_WARTORTLE,
         .moves = {MOVE_WATER_PULSE, MOVE_BITE, MOVE_MUD_SLAP, MOVE_YAWN},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [177] = {
+    [FRONTIER_MON_PARASECT_1] = {
         .species = SPECIES_PARASECT,
         .moves = {MOVE_SLASH, MOVE_PSYBEAM, MOVE_STUN_SPORE, MOVE_FLASH},
         .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_RASH
     },
-    [178] = {
+    [FRONTIER_MON_MACHOKE_1] = {
         .species = SPECIES_MACHOKE,
         .moves = {MOVE_LOW_KICK, MOVE_ROCK_TOMB, MOVE_FORESIGHT, MOVE_SCARY_FACE},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [179] = {
+    [FRONTIER_MON_HAUNTER_1] = {
         .species = SPECIES_HAUNTER,
         .moves = {MOVE_SHADOW_PUNCH, MOVE_CONFUSE_RAY, MOVE_SPITE, MOVE_GRUDGE},
         .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_RASH
     },
-    [180] = {
+    [FRONTIER_MON_BAYLEEF_1] = {
         .species = SPECIES_BAYLEEF,
         .moves = {MOVE_RAZOR_LEAF, MOVE_TOXIC, MOVE_SAFEGUARD, MOVE_LIGHT_SCREEN},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [181] = {
+    [FRONTIER_MON_QUILAVA_1] = {
         .species = SPECIES_QUILAVA,
         .moves = {MOVE_FLAME_WHEEL, MOVE_FURY_SWIPES, MOVE_SWIFT, MOVE_SMOKESCREEN},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [182] = {
+    [FRONTIER_MON_CROCONAW_1] = {
         .species = SPECIES_CROCONAW,
         .moves = {MOVE_SLASH, MOVE_WATER_PULSE, MOVE_BITE, MOVE_SCARY_FACE},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_DOCILE
     },
-    [183] = {
+    [FRONTIER_MON_TOGETIC_1] = {
         .species = SPECIES_TOGETIC,
         .moves = {MOVE_AERIAL_ACE, MOVE_MAGICAL_LEAF, MOVE_WISH, MOVE_FOLLOW_ME},
         .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_RELAXED
     },
-    [184] = {
+    [FRONTIER_MON_MURKROW_1] = {
         .species = SPECIES_MURKROW,
         .moves = {MOVE_FAINT_ATTACK, MOVE_FLY, MOVE_TORMENT, MOVE_TAUNT},
         .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_QUIRKY
     },
-    [185] = {
+    [FRONTIER_MON_WOBBUFFET_1] = {
         .species = SPECIES_WOBBUFFET,
         .moves = {MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_CHARM, MOVE_SAFEGUARD},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_CAREFUL
     },
-    [186] = {
+    [FRONTIER_MON_PLUSLE_1] = {
         .species = SPECIES_PLUSLE,
         .moves = {MOVE_SPARK, MOVE_FAKE_TEARS, MOVE_QUICK_ATTACK, MOVE_HELPING_HAND},
         .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [187] = {
+    [FRONTIER_MON_MINUN_1] = {
         .species = SPECIES_MINUN,
         .moves = {MOVE_SPARK, MOVE_CHARM, MOVE_ENCORE, MOVE_HELPING_HAND},
         .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [188] = {
+    [FRONTIER_MON_GROVYLE_1] = {
         .species = SPECIES_GROVYLE,
         .moves = {MOVE_FURY_CUTTER, MOVE_ENDEAVOR, MOVE_BRICK_BREAK, MOVE_DOUBLE_TEAM},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_RELAXED
     },
-    [189] = {
+    [FRONTIER_MON_COMBUSKEN_1] = {
         .species = SPECIES_COMBUSKEN,
         .moves = {MOVE_EMBER, MOVE_DOUBLE_KICK, MOVE_QUICK_ATTACK, MOVE_SAND_ATTACK},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_DOCILE
     },
-    [190] = {
+    [FRONTIER_MON_MARSHTOMP_1] = {
         .species = SPECIES_MARSHTOMP,
         .moves = {MOVE_MUD_SHOT, MOVE_WATER_GUN, MOVE_ROCK_TOMB, MOVE_MUD_SLAP},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_HARDY
     },
-    [191] = {
+    [FRONTIER_MON_PONYTA_1] = {
         .species = SPECIES_PONYTA,
         .moves = {MOVE_FIRE_SPIN, MOVE_BOUNCE, MOVE_QUICK_ATTACK, MOVE_TAIL_WHIP},
         .itemTableId = BATTLE_FRONTIER_ITEM_RAWST_BERRY,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_HARDY
     },
-    [192] = {
+    [FRONTIER_MON_AZUMARILL_1] = {
         .species = SPECIES_AZUMARILL,
         .moves = {MOVE_BUBBLE_BEAM, MOVE_FACADE, MOVE_DIG, MOVE_PROTECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_DOCILE
     },
-    [193] = {
+    [FRONTIER_MON_SUDOWOODO_1] = {
         .species = SPECIES_SUDOWOODO,
         .moves = {MOVE_ROCK_SLIDE, MOVE_FAINT_ATTACK, MOVE_SANDSTORM, MOVE_BLOCK},
         .itemTableId = BATTLE_FRONTIER_ITEM_HARD_STONE,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_HARDY
     },
-    [194] = {
+    [FRONTIER_MON_MAGCARGO_1] = {
         .species = SPECIES_MAGCARGO,
         .moves = {MOVE_ROCK_SLIDE, MOVE_EMBER, MOVE_ACID_ARMOR, MOVE_SANDSTORM},
         .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_GENTLE
     },
-    [195] = {
+    [FRONTIER_MON_PUPITAR_1] = {
         .species = SPECIES_PUPITAR,
         .moves = {MOVE_DIG, MOVE_BITE, MOVE_SCARY_FACE, MOVE_SANDSTORM},
         .itemTableId = BATTLE_FRONTIER_ITEM_SOFT_SAND,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP,
         .nature = NATURE_HARDY
     },
-    [196] = {
+    [FRONTIER_MON_SEALEO_1] = {
         .species = SPECIES_SEALEO,
         .moves = {MOVE_ICE_BALL, MOVE_HAIL, MOVE_SNORE, MOVE_REST},
         .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_QUIRKY
     },
-    [197] = {
+    [FRONTIER_MON_RATICATE_1] = {
         .species = SPECIES_RATICATE,
         .moves = {MOVE_ENDEAVOR, MOVE_PURSUIT, MOVE_SCARY_FACE, MOVE_QUICK_ATTACK},
         .itemTableId = BATTLE_FRONTIER_ITEM_SILK_SCARF,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_NAIVE
     },
-    [198] = {
+    [FRONTIER_MON_MASQUERAIN_1] = {
         .species = SPECIES_MASQUERAIN,
         .moves = {MOVE_SILVER_WIND, MOVE_AERIAL_ACE, MOVE_ICY_WIND, MOVE_STUN_SPORE},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_RELAXED
     },
-    [199] = {
+    [FRONTIER_MON_FURRET_1] = {
         .species = SPECIES_FURRET,
         .moves = {MOVE_SLAM, MOVE_PROTECT, MOVE_HELPING_HAND, MOVE_FOLLOW_ME},
         .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_SERIOUS
     },
-    [200] = {
+    [FRONTIER_MON_DUNSPARCE_1] = {
         .species = SPECIES_DUNSPARCE,
         .moves = {MOVE_HEADBUTT, MOVE_GLARE, MOVE_DEFENSE_CURL, MOVE_ROLLOUT},
         .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [201] = {
+    [FRONTIER_MON_DRAGONAIR_1] = {
         .species = SPECIES_DRAGONAIR,
         .moves = {MOVE_DRAGON_BREATH, MOVE_LEER, MOVE_WRAP, MOVE_SAFEGUARD},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [202] = {
+    [FRONTIER_MON_MIGHTYENA_1] = {
         .species = SPECIES_MIGHTYENA,
         .moves = {MOVE_BITE, MOVE_POISON_FANG, MOVE_TAUNT, MOVE_ROAR},
         .itemTableId = BATTLE_FRONTIER_ITEM_MENTAL_HERB,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_TIMID
     },
-    [203] = {
+    [FRONTIER_MON_LINOONE_1] = {
         .species = SPECIES_LINOONE,
         .moves = {MOVE_SECRET_POWER, MOVE_SAND_ATTACK, MOVE_COVET, MOVE_TICKLE},
         .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [204] = {
+    [FRONTIER_MON_CASTFORM_1] = {
         .species = SPECIES_CASTFORM,
         .moves = {MOVE_EMBER, MOVE_WATER_PULSE, MOVE_SHOCK_WAVE, MOVE_ICY_WIND},
         .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_HASTY
     },
-    [205] = {
+    [FRONTIER_MON_SHELGON_1] = {
         .species = SPECIES_SHELGON,
         .moves = {MOVE_HEADBUTT, MOVE_DRAGON_BREATH, MOVE_PROTECT, MOVE_SCARY_FACE},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_HARDY
     },
-    [206] = {
+    [FRONTIER_MON_METANG_1] = {
         .species = SPECIES_METANG,
         .moves = {MOVE_METAL_CLAW, MOVE_CONFUSION, MOVE_PURSUIT, MOVE_SCARY_FACE},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_HARDY
     },
-    [207] = {
+    [FRONTIER_MON_WIGGLYTUFF_1] = {
         .species = SPECIES_WIGGLYTUFF,
         .moves = {MOVE_SING, MOVE_DISABLE, MOVE_WISH, MOVE_SECRET_POWER},
         .itemTableId = BATTLE_FRONTIER_ITEM_SILK_SCARF,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_RELAXED
     },
-    [208] = {
+    [FRONTIER_MON_SUNFLORA_1] = {
         .species = SPECIES_SUNFLORA,
         .moves = {MOVE_PETAL_DANCE, MOVE_INGRAIN, MOVE_LEECH_SEED, MOVE_LIGHT_SCREEN},
         .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_QUIRKY
     },
-    [209] = {
+    [FRONTIER_MON_CHIMECHO_1] = {
         .species = SPECIES_CHIMECHO,
         .moves = {MOVE_PSYWAVE, MOVE_TAKE_DOWN, MOVE_HEAL_BELL, MOVE_SAFEGUARD},
         .itemTableId = BATTLE_FRONTIER_ITEM_TWISTED_SPOON,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_SASSY
     },
-    [210] = {
+    [FRONTIER_MON_GLIGAR_1] = {
         .species = SPECIES_GLIGAR,
         .moves = {MOVE_METAL_CLAW, MOVE_DIG, MOVE_AERIAL_ACE, MOVE_QUICK_ATTACK},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_HASTY
     },
-    [211] = {
+    [FRONTIER_MON_QWILFISH_1] = {
         .species = SPECIES_QWILFISH,
         .moves = {MOVE_BUBBLE_BEAM, MOVE_PIN_MISSILE, MOVE_SPIKES, MOVE_MINIMIZE},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK,
         .nature = NATURE_IMPISH
     },
-    [212] = {
+    [FRONTIER_MON_SNEASEL_1] = {
         .species = SPECIES_SNEASEL,
         .moves = {MOVE_FAINT_ATTACK, MOVE_FAKE_OUT, MOVE_ICY_WIND, MOVE_QUICK_ATTACK},
         .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_RELAXED
     },
-    [213] = {
+    [FRONTIER_MON_PELIPPER_1] = {
         .species = SPECIES_PELIPPER,
         .moves = {MOVE_WATER_PULSE, MOVE_AERIAL_ACE, MOVE_STOCKPILE, MOVE_SWALLOW},
         .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_QUIET
     },
-    [214] = {
+    [FRONTIER_MON_SWELLOW_1] = {
         .species = SPECIES_SWELLOW,
         .moves = {MOVE_FLY, MOVE_ENDEAVOR, MOVE_FACADE, MOVE_QUICK_ATTACK},
         .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [215] = {
+    [FRONTIER_MON_LAIRON_1] = {
         .species = SPECIES_LAIRON,
         .moves = {MOVE_METAL_CLAW, MOVE_ROCK_TOMB, MOVE_IRON_DEFENSE, MOVE_PROTECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_METAL_COAT,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_SASSY
     },
-    [216] = {
+    [FRONTIER_MON_TANGELA_1] = {
         .species = SPECIES_TANGELA,
         .moves = {MOVE_MEGA_DRAIN, MOVE_SLAM, MOVE_TOXIC, MOVE_BIND},
         .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_HARDY
     },
-    [217] = {
+    [FRONTIER_MON_ARBOK_1] = {
         .species = SPECIES_ARBOK,
         .moves = {MOVE_POISON_FANG, MOVE_DIG, MOVE_BITE, MOVE_GLARE},
         .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [218] = {
+    [FRONTIER_MON_PERSIAN_1] = {
         .species = SPECIES_PERSIAN,
         .moves = {MOVE_FAKE_OUT, MOVE_SLASH, MOVE_TORMENT, MOVE_SWAGGER},
         .itemTableId = BATTLE_FRONTIER_ITEM_SILK_SCARF,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_QUIRKY
     },
-    [219] = {
+    [FRONTIER_MON_SEADRA_1] = {
         .species = SPECIES_SEADRA,
         .moves = {MOVE_AURORA_BEAM, MOVE_SMOKESCREEN, MOVE_WATER_GUN, MOVE_RAIN_DANCE},
         .itemTableId = BATTLE_FRONTIER_ITEM_MYSTIC_WATER,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_SASSY
     },
-    [220] = {
+    [FRONTIER_MON_KECLEON_1] = {
         .species = SPECIES_KECLEON,
         .moves = {MOVE_SECRET_POWER, MOVE_PSYBEAM, MOVE_MAGIC_COAT, MOVE_SEISMIC_TOSS},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_NAIVE
     },
-    [221] = {
+    [FRONTIER_MON_VIGOROTH_1] = {
         .species = SPECIES_VIGOROTH,
         .moves = {MOVE_SLASH, MOVE_COUNTER, MOVE_ENCORE, MOVE_UPROAR},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_LONELY
     },
-    [222] = {
+    [FRONTIER_MON_LUNATONE_1] = {
         .species = SPECIES_LUNATONE,
         .moves = {MOVE_CONFUSION, MOVE_COSMIC_POWER, MOVE_LIGHT_SCREEN, MOVE_SANDSTORM},
         .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_QUIET
     },
-    [223] = {
+    [FRONTIER_MON_SOLROCK_1] = {
         .species = SPECIES_SOLROCK,
         .moves = {MOVE_CONFUSION, MOVE_FIRE_SPIN, MOVE_LIGHT_SCREEN, MOVE_SANDSTORM},
         .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_QUIET
     },
-    [224] = {
+    [FRONTIER_MON_NOCTOWL_1] = {
         .species = SPECIES_NOCTOWL,
         .moves = {MOVE_CONFUSION, MOVE_AERIAL_ACE, MOVE_FAINT_ATTACK, MOVE_REFLECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_RELAXED
     },
-    [225] = {
+    [FRONTIER_MON_SANDSLASH_1] = {
         .species = SPECIES_SANDSLASH,
         .moves = {MOVE_CRUSH_CLAW, MOVE_ROCK_SLIDE, MOVE_SWIFT, MOVE_SANDSTORM},
         .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [226] = {
+    [FRONTIER_MON_VENOMOTH_1] = {
         .species = SPECIES_VENOMOTH,
         .moves = {MOVE_SILVER_WIND, MOVE_PSYBEAM, MOVE_SLEEP_POWDER, MOVE_SKILL_SWAP},
         .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP,
         .nature = NATURE_QUIRKY
     },
-    [227] = {
+    [FRONTIER_MON_CHANSEY_1] = {
         .species = SPECIES_CHANSEY,
         .moves = {MOVE_METRONOME, MOVE_REFRESH, MOVE_DEFENSE_CURL, MOVE_MINIMIZE},
         .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_RELAXED
     },
-    [228] = {
+    [FRONTIER_MON_SEAKING_1] = {
         .species = SPECIES_SEAKING,
         .moves = {MOVE_WATER_PULSE, MOVE_PSYBEAM, MOVE_SWIFT, MOVE_AGILITY},
         .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [229] = {
+    [FRONTIER_MON_JUMPLUFF_1] = {
         .species = SPECIES_JUMPLUFF,
         .moves = {MOVE_AERIAL_ACE, MOVE_SWAGGER, MOVE_PSYCH_UP, MOVE_SYNTHESIS},
         .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [230] = {
+    [FRONTIER_MON_PILOSWINE_1] = {
         .species = SPECIES_PILOSWINE,
         .moves = {MOVE_DIG, MOVE_ANCIENT_POWER, MOVE_HAIL, MOVE_LIGHT_SCREEN},
         .itemTableId = BATTLE_FRONTIER_ITEM_SOFT_SAND,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_QUIRKY
     },
-    [231] = {
+    [FRONTIER_MON_GOLBAT_1] = {
         .species = SPECIES_GOLBAT,
         .moves = {MOVE_AIR_CUTTER, MOVE_CONFUSE_RAY, MOVE_TOXIC, MOVE_STEEL_WING},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_RELAXED
     },
-    [232] = {
+    [FRONTIER_MON_PRIMEAPE_1] = {
         .species = SPECIES_PRIMEAPE,
         .moves = {MOVE_KARATE_CHOP, MOVE_COUNTER, MOVE_SWAGGER, MOVE_SCREECH},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_QUIRKY
     },
-    [233] = {
+    [FRONTIER_MON_HITMONLEE_1] = {
         .species = SPECIES_HITMONLEE,
         .moves = {MOVE_ROLLING_KICK, MOVE_BRICK_BREAK, MOVE_FOCUS_ENERGY, MOVE_FACADE},
         .itemTableId = BATTLE_FRONTIER_ITEM_BLACK_BELT,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [234] = {
+    [FRONTIER_MON_HITMONCHAN_1] = {
         .species = SPECIES_HITMONCHAN,
         .moves = {MOVE_MACH_PUNCH, MOVE_SKY_UPPERCUT, MOVE_DETECT, MOVE_COUNTER},
         .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [235] = {
+    [FRONTIER_MON_GIRAFARIG_1] = {
         .species = SPECIES_GIRAFARIG,
         .moves = {MOVE_PSYBEAM, MOVE_STOMP, MOVE_WISH, MOVE_SKILL_SWAP},
         .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_QUIET
     },
-    [236] = {
+    [FRONTIER_MON_HITMONTOP_1] = {
         .species = SPECIES_HITMONTOP,
         .moves = {MOVE_TRIPLE_KICK, MOVE_DIG, MOVE_MACH_PUNCH, MOVE_QUICK_ATTACK},
         .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_HARDY
     },
-    [237] = {
+    [FRONTIER_MON_BANETTE_1] = {
         .species = SPECIES_BANETTE,
         .moves = {MOVE_NIGHT_SHADE, MOVE_WILL_O_WISP, MOVE_SPITE, MOVE_KNOCK_OFF},
         .itemTableId = BATTLE_FRONTIER_ITEM_RAWST_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_SASSY
     },
-    [238] = {
+    [FRONTIER_MON_NINJASK_1] = {
         .species = SPECIES_NINJASK,
         .moves = {MOVE_BATON_PASS, MOVE_SWORDS_DANCE, MOVE_ENDURE, MOVE_DIG},
         .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_MILD
     },
-    [239] = {
+    [FRONTIER_MON_SEVIPER_1] = {
         .species = SPECIES_SEVIPER,
         .moves = {MOVE_POISON_TAIL, MOVE_BITE, MOVE_GLARE, MOVE_SCREECH},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_HARDY
     },
-    [240] = {
+    [FRONTIER_MON_ZANGOOSE_1] = {
         .species = SPECIES_ZANGOOSE,
         .moves = {MOVE_SLASH, MOVE_DOUBLE_KICK, MOVE_ROAR, MOVE_QUICK_ATTACK},
         .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_HARDY
     },
-    [241] = {
+    [FRONTIER_MON_CAMERUPT_1] = {
         .species = SPECIES_CAMERUPT,
         .moves = {MOVE_MAGNITUDE, MOVE_PROTECT, MOVE_SANDSTORM, MOVE_ROCK_SLIDE},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_QUIRKY
     },
-    [242] = {
+    [FRONTIER_MON_SHARPEDO_1] = {
         .species = SPECIES_SHARPEDO,
         .moves = {MOVE_SLASH, MOVE_BITE, MOVE_WATER_PULSE, MOVE_SCARY_FACE},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [243] = {
+    [FRONTIER_MON_TROPIUS_1] = {
         .species = SPECIES_TROPIUS,
         .moves = {MOVE_MAGICAL_LEAF, MOVE_WHIRLWIND, MOVE_AERIAL_ACE, MOVE_STEEL_WING},
         .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_HARDY
     },
-    [244] = {
+    [FRONTIER_MON_MAGNETON_1] = {
         .species = SPECIES_MAGNETON,
         .moves = {MOVE_SHOCK_WAVE, MOVE_SONIC_BOOM, MOVE_THUNDER_WAVE, MOVE_SUPERSONIC},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_LONELY
     },
-    [245] = {
+    [FRONTIER_MON_MANTINE_1] = {
         .species = SPECIES_MANTINE,
         .moves = {MOVE_BUBBLE_BEAM, MOVE_AERIAL_ACE, MOVE_RAIN_DANCE, MOVE_ICY_WIND},
         .itemTableId = BATTLE_FRONTIER_ITEM_MYSTIC_WATER,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [246] = {
+    [FRONTIER_MON_STANTLER_1] = {
         .species = SPECIES_STANTLER,
         .moves = {MOVE_EXTRASENSORY, MOVE_CONFUSE_RAY, MOVE_STOMP, MOVE_SAND_ATTACK},
         .itemTableId = BATTLE_FRONTIER_ITEM_TWISTED_SPOON,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_GENTLE
     },
-    [247] = {
+    [FRONTIER_MON_ABSOL_1] = {
         .species = SPECIES_ABSOL,
         .moves = {MOVE_BITE, MOVE_RAZOR_WIND, MOVE_FUTURE_SIGHT, MOVE_QUICK_ATTACK},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [248] = {
+    [FRONTIER_MON_SWALOT_1] = {
         .species = SPECIES_SWALOT,
         .moves = {MOVE_STOCKPILE, MOVE_SWALLOW, MOVE_SPIT_UP, MOVE_SLUDGE},
         .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_QUIRKY
     },
-    [249] = {
+    [FRONTIER_MON_CRAWDAUNT_1] = {
         .species = SPECIES_CRAWDAUNT,
         .moves = {MOVE_BUBBLE_BEAM, MOVE_VICE_GRIP, MOVE_KNOCK_OFF, MOVE_PROTECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [250] = {
+    [FRONTIER_MON_PIDGEOT_1] = {
         .species = SPECIES_PIDGEOT,
         .moves = {MOVE_AERIAL_ACE, MOVE_FEATHER_DANCE, MOVE_MUD_SLAP, MOVE_FAINT_ATTACK},
         .itemTableId = BATTLE_FRONTIER_ITEM_SHARP_BEAK,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_HARDY
     },
-    [251] = {
+    [FRONTIER_MON_GRUMPIG_1] = {
         .species = SPECIES_GRUMPIG,
         .moves = {MOVE_PSYBEAM, MOVE_CONFUSE_RAY, MOVE_FUTURE_SIGHT, MOVE_MAGIC_COAT},
         .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_RELAXED
     },
-    [252] = {
+    [FRONTIER_MON_TORKOAL_1] = {
         .species = SPECIES_TORKOAL,
         .moves = {MOVE_EMBER, MOVE_FIRE_SPIN, MOVE_SMOKESCREEN, MOVE_AMNESIA},
         .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_RELAXED
     },
-    [253] = {
+    [FRONTIER_MON_KINGLER_1] = {
         .species = SPECIES_KINGLER,
         .moves = {MOVE_CRABHAMMER, MOVE_METAL_CLAW, MOVE_MUD_SHOT, MOVE_PROTECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_HARDY
     },
-    [254] = {
+    [FRONTIER_MON_CACTURNE_1] = {
         .species = SPECIES_CACTURNE,
         .moves = {MOVE_NEEDLE_ARM, MOVE_FAINT_ATTACK, MOVE_ACID, MOVE_MEGA_PUNCH},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP,
         .nature = NATURE_HASTY
     },
-    [255] = {
+    [FRONTIER_MON_BELLOSSOM_1] = {
         .species = SPECIES_BELLOSSOM,
         .moves = {MOVE_PETAL_DANCE, MOVE_SAFEGUARD, MOVE_SUNNY_DAY, MOVE_SYNTHESIS},
         .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_QUIET
     },
-    [256] = {
+    [FRONTIER_MON_OCTILLERY_1] = {
         .species = SPECIES_OCTILLERY,
         .moves = {MOVE_OCTAZOOKA, MOVE_AURORA_BEAM, MOVE_PSYBEAM, MOVE_ROCK_BLAST},
         .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_HARDY
     },
-    [257] = {
+    [FRONTIER_MON_HUNTAIL_1] = {
         .species = SPECIES_HUNTAIL,
         .moves = {MOVE_WHIRLPOOL, MOVE_SCARY_FACE, MOVE_MUD_SLAP, MOVE_BITE},
         .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_QUIET
     },
-    [258] = {
+    [FRONTIER_MON_GOREBYSS_1] = {
         .species = SPECIES_GOREBYSS,
         .moves = {MOVE_WHIRLPOOL, MOVE_AMNESIA, MOVE_ICY_WIND, MOVE_CONFUSION},
         .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_BRAVE
     },
-    [259] = {
+    [FRONTIER_MON_RELICANTH_1] = {
         .species = SPECIES_RELICANTH,
         .moves = {MOVE_ANCIENT_POWER, MOVE_WATER_PULSE, MOVE_HARDEN, MOVE_AMNESIA},
         .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_SASSY
     },
-    [260] = {
+    [FRONTIER_MON_OMASTAR_1] = {
         .species = SPECIES_OMASTAR,
         .moves = {MOVE_BUBBLE_BEAM, MOVE_SPIKE_CANNON, MOVE_TICKLE, MOVE_ANCIENT_POWER},
         .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_QUIRKY
     },
-    [261] = {
+    [FRONTIER_MON_KABUTOPS_1] = {
         .species = SPECIES_KABUTOPS,
         .moves = {MOVE_SLASH, MOVE_DIG, MOVE_FURY_CUTTER, MOVE_KNOCK_OFF},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [262] = {
+    [FRONTIER_MON_POLIWRATH_1] = {
         .species = SPECIES_POLIWRATH,
         .moves = {MOVE_SUBMISSION, MOVE_DIG, MOVE_ROCK_TOMB, MOVE_BUBBLE_BEAM},
         .itemTableId = BATTLE_FRONTIER_ITEM_BLACK_BELT,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [263] = {
+    [FRONTIER_MON_SCYTHER_1] = {
         .species = SPECIES_SCYTHER,
         .moves = {MOVE_FURY_CUTTER, MOVE_AERIAL_ACE, MOVE_LIGHT_SCREEN, MOVE_DOUBLE_TEAM},
         .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_RELAXED
     },
-    [264] = {
+    [FRONTIER_MON_PINSIR_1] = {
         .species = SPECIES_PINSIR,
         .moves = {MOVE_SUBMISSION, MOVE_FOCUS_ENERGY, MOVE_SWORDS_DANCE, MOVE_REVENGE},
         .itemTableId = BATTLE_FRONTIER_ITEM_BLACK_BELT,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_NAUGHTY
     },
-    [265] = {
+    [FRONTIER_MON_POLITOED_1] = {
         .species = SPECIES_POLITOED,
         .moves = {MOVE_DIVE, MOVE_DIG, MOVE_HYPNOSIS, MOVE_SWAGGER},
         .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_RELAXED
     },
-    [266] = {
+    [FRONTIER_MON_CLOYSTER_1] = {
         .species = SPECIES_CLOYSTER,
         .moves = {MOVE_AURORA_BEAM, MOVE_SPIKE_CANNON, MOVE_SUPERSONIC, MOVE_PROTECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_NEVER_MELT_ICE,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_SASSY
     },
-    [267] = {
+    [FRONTIER_MON_DELCATTY_2] = {
         .species = SPECIES_DELCATTY,
         .moves = {MOVE_FAKE_TEARS, MOVE_SING, MOVE_THUNDERBOLT, MOVE_ICE_BEAM},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [268] = {
+    [FRONTIER_MON_SABLEYE_2] = {
         .species = SPECIES_SABLEYE,
         .moves = {MOVE_SHADOW_BALL, MOVE_FAINT_ATTACK, MOVE_CONFUSE_RAY, MOVE_RECOVER},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_QUIRKY
     },
-    [269] = {
+    [FRONTIER_MON_LICKITUNG_2] = {
         .species = SPECIES_LICKITUNG,
         .moves = {MOVE_EARTHQUAKE, MOVE_BODY_SLAM, MOVE_SHADOW_BALL, MOVE_ROCK_SLIDE},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [270] = {
+    [FRONTIER_MON_WEEPINBELL_2] = {
         .species = SPECIES_WEEPINBELL,
         .moves = {MOVE_SLUDGE_BOMB, MOVE_RAZOR_LEAF, MOVE_SLEEP_POWDER, MOVE_REFLECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_QUIRKY
     },
-    [271] = {
+    [FRONTIER_MON_GRAVELER_2] = {
         .species = SPECIES_GRAVELER,
         .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_BRICK_BREAK, MOVE_COUNTER},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [272] = {
+    [FRONTIER_MON_GLOOM_2] = {
         .species = SPECIES_GLOOM,
         .moves = {MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY, MOVE_SLUDGE_BOMB, MOVE_MOONLIGHT},
         .itemTableId = BATTLE_FRONTIER_ITEM_PECHA_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_QUIRKY
     },
-    [273] = {
+    [FRONTIER_MON_PORYGON_2] = {
         .species = SPECIES_PORYGON,
         .moves = {MOVE_TRI_ATTACK, MOVE_PSYCHIC, MOVE_THUNDER_WAVE, MOVE_RECOVER},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_QUIET
     },
-    [274] = {
+    [FRONTIER_MON_KADABRA_2] = {
         .species = SPECIES_KADABRA,
         .moves = {MOVE_PSYCHIC, MOVE_THUNDER_WAVE, MOVE_REFLECT, MOVE_RECOVER},
         .itemTableId = BATTLE_FRONTIER_ITEM_TWISTED_SPOON,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_MODEST
     },
-    [275] = {
+    [FRONTIER_MON_WAILMER_2] = {
         .species = SPECIES_WAILMER,
         .moves = {MOVE_WATER_SPOUT, MOVE_EARTHQUAKE, MOVE_BODY_SLAM, MOVE_REST},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_DOCILE
     },
-    [276] = {
+    [FRONTIER_MON_ROSELIA_2] = {
         .species = SPECIES_ROSELIA,
         .moves = {MOVE_GIGA_DRAIN, MOVE_SLUDGE_BOMB, MOVE_GRASS_WHISTLE, MOVE_SYNTHESIS},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [277] = {
+    [FRONTIER_MON_VOLBEAT_2] = {
         .species = SPECIES_VOLBEAT,
         .moves = {MOVE_SIGNAL_BEAM, MOVE_THUNDERBOLT, MOVE_ICE_PUNCH, MOVE_TAIL_GLOW},
         .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_QUIRKY
     },
-    [278] = {
+    [FRONTIER_MON_ILLUMISE_2] = {
         .species = SPECIES_ILLUMISE,
         .moves = {MOVE_SILVER_WIND, MOVE_THUNDERBOLT, MOVE_ICE_PUNCH, MOVE_GIGA_DRAIN},
         .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_QUIRKY
     },
-    [279] = {
+    [FRONTIER_MON_IVYSAUR_2] = {
         .species = SPECIES_IVYSAUR,
         .moves = {MOVE_GIGA_DRAIN, MOVE_SLUDGE_BOMB, MOVE_SLEEP_POWDER, MOVE_LEECH_SEED},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_QUIRKY
     },
-    [280] = {
+    [FRONTIER_MON_CHARMELEON_2] = {
         .species = SPECIES_CHARMELEON,
         .moves = {MOVE_FLAMETHROWER, MOVE_SLASH, MOVE_ANCIENT_POWER, MOVE_DRAGON_RAGE},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_HARDY
     },
-    [281] = {
+    [FRONTIER_MON_WARTORTLE_2] = {
         .species = SPECIES_WARTORTLE,
         .moves = {MOVE_SURF, MOVE_ICE_BEAM, MOVE_RAPID_SPIN, MOVE_PROTECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [282] = {
+    [FRONTIER_MON_PARASECT_2] = {
         .species = SPECIES_PARASECT,
         .moves = {MOVE_SPORE, MOVE_GIGA_DRAIN, MOVE_DIG, MOVE_DOUBLE_TEAM},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_CALM
     },
-    [283] = {
+    [FRONTIER_MON_MACHOKE_2] = {
         .species = SPECIES_MACHOKE,
         .moves = {MOVE_CROSS_CHOP, MOVE_ROCK_SLIDE, MOVE_FORESIGHT, MOVE_SCARY_FACE},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [284] = {
+    [FRONTIER_MON_HAUNTER_2] = {
         .species = SPECIES_HAUNTER,
         .moves = {MOVE_PSYCHIC, MOVE_HYPNOSIS, MOVE_NIGHTMARE, MOVE_CONFUSE_RAY},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_RELAXED
     },
-    [285] = {
+    [FRONTIER_MON_BAYLEEF_2] = {
         .species = SPECIES_BAYLEEF,
         .moves = {MOVE_GIGA_DRAIN, MOVE_BODY_SLAM, MOVE_GRASS_WHISTLE, MOVE_REST},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [286] = {
+    [FRONTIER_MON_QUILAVA_2] = {
         .species = SPECIES_QUILAVA,
         .moves = {MOVE_FLAMETHROWER, MOVE_CRUSH_CLAW, MOVE_BODY_SLAM, MOVE_SMOKESCREEN},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_DOCILE
     },
-    [287] = {
+    [FRONTIER_MON_CROCONAW_2] = {
         .species = SPECIES_CROCONAW,
         .moves = {MOVE_MEGA_KICK, MOVE_AERIAL_ACE, MOVE_ROCK_SLIDE, MOVE_DIG},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [288] = {
+    [FRONTIER_MON_TOGETIC_2] = {
         .species = SPECIES_TOGETIC,
         .moves = {MOVE_RETURN, MOVE_SWEET_KISS, MOVE_AERIAL_ACE, MOVE_YAWN},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_RELAXED
     },
-    [289] = {
+    [FRONTIER_MON_MURKROW_2] = {
         .species = SPECIES_MURKROW,
         .moves = {MOVE_PERISH_SONG, MOVE_MEAN_LOOK, MOVE_DOUBLE_TEAM, MOVE_THUNDER_WAVE},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_QUIRKY
     },
-    [290] = {
+    [FRONTIER_MON_WOBBUFFET_2] = {
         .species = SPECIES_WOBBUFFET,
         .moves = {MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_ENCORE, MOVE_DESTINY_BOND},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_CAREFUL
     },
-    [291] = {
+    [FRONTIER_MON_PLUSLE_2] = {
         .species = SPECIES_PLUSLE,
         .moves = {MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_SEISMIC_TOSS, MOVE_WISH},
         .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_DOCILE
     },
-    [292] = {
+    [FRONTIER_MON_MINUN_2] = {
         .species = SPECIES_MINUN,
         .moves = {MOVE_THUNDERBOLT, MOVE_ATTRACT, MOVE_CHARM, MOVE_WISH},
         .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_DOCILE
     },
-    [293] = {
+    [FRONTIER_MON_GROVYLE_2] = {
         .species = SPECIES_GROVYLE,
         .moves = {MOVE_GIGA_DRAIN, MOVE_CRUSH_CLAW, MOVE_SCREECH, MOVE_ROCK_TOMB},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_DOCILE
     },
-    [294] = {
+    [FRONTIER_MON_COMBUSKEN_2] = {
         .species = SPECIES_COMBUSKEN,
         .moves = {MOVE_FLAMETHROWER, MOVE_SKY_UPPERCUT, MOVE_SLASH, MOVE_SAND_ATTACK},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_DOCILE
     },
-    [295] = {
+    [FRONTIER_MON_MARSHTOMP_2] = {
         .species = SPECIES_MARSHTOMP,
         .moves = {MOVE_MUDDY_WATER, MOVE_EARTHQUAKE, MOVE_MUD_SLAP, MOVE_PROTECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_DOCILE
     },
-    [296] = {
+    [FRONTIER_MON_PONYTA_2] = {
         .species = SPECIES_PONYTA,
         .moves = {MOVE_FLAMETHROWER, MOVE_BODY_SLAM, MOVE_DOUBLE_KICK, MOVE_DOUBLE_TEAM},
         .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_QUIRKY
     },
-    [297] = {
+    [FRONTIER_MON_AZUMARILL_2] = {
         .species = SPECIES_AZUMARILL,
         .moves = {MOVE_MEGA_KICK, MOVE_BRICK_BREAK, MOVE_IRON_TAIL, MOVE_DIG},
         .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [298] = {
+    [FRONTIER_MON_SUDOWOODO_2] = {
         .species = SPECIES_SUDOWOODO,
         .moves = {MOVE_MEGA_KICK, MOVE_EARTHQUAKE, MOVE_LOW_KICK, MOVE_SELF_DESTRUCT},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_HARDY
     },
-    [299] = {
+    [FRONTIER_MON_MAGCARGO_2] = {
         .species = SPECIES_MAGCARGO,
         .moves = {MOVE_OVERHEAT, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_BODY_SLAM},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_QUIET
     },
-    [300] = {
+    [FRONTIER_MON_PUPITAR_2] = {
         .species = SPECIES_PUPITAR,
         .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_CRUNCH, MOVE_SCARY_FACE},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_HARDY
     },
-    [301] = {
+    [FRONTIER_MON_SEALEO_2] = {
         .species = SPECIES_SEALEO,
         .moves = {MOVE_ICE_BEAM, MOVE_SURF, MOVE_BODY_SLAM, MOVE_HAIL},
         .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_QUIET
     },
-    [302] = {
+    [FRONTIER_MON_RATICATE_2] = {
         .species = SPECIES_RATICATE,
         .moves = {MOVE_SUPER_FANG, MOVE_HYPER_FANG, MOVE_SHADOW_BALL, MOVE_SCARY_FACE},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [303] = {
+    [FRONTIER_MON_MASQUERAIN_2] = {
         .species = SPECIES_MASQUERAIN,
         .moves = {MOVE_HYDRO_PUMP, MOVE_ICE_BEAM, MOVE_GIGA_DRAIN, MOVE_STUN_SPORE},
         .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_QUIET
     },
-    [304] = {
+    [FRONTIER_MON_FURRET_2] = {
         .species = SPECIES_FURRET,
         .moves = {MOVE_TRICK, MOVE_FRUSTRATION, MOVE_SHADOW_BALL, MOVE_FOLLOW_ME},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [305] = {
+    [FRONTIER_MON_DUNSPARCE_2] = {
         .species = SPECIES_DUNSPARCE,
         .moves = {MOVE_ICE_BEAM, MOVE_ROCK_TOMB, MOVE_BITE, MOVE_SHADOW_BALL},
         .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_QUIET
     },
-    [306] = {
+    [FRONTIER_MON_DRAGONAIR_2] = {
         .species = SPECIES_DRAGONAIR,
         .moves = {MOVE_RETURN, MOVE_REST, MOVE_THUNDER_WAVE, MOVE_DRAGON_DANCE},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [307] = {
+    [FRONTIER_MON_MIGHTYENA_2] = {
         .species = SPECIES_MIGHTYENA,
         .moves = {MOVE_CRUNCH, MOVE_SHADOW_BALL, MOVE_FRUSTRATION, MOVE_SCARY_FACE},
         .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_QUIRKY
     },
-    [308] = {
+    [FRONTIER_MON_LINOONE_2] = {
         .species = SPECIES_LINOONE,
         .moves = {MOVE_TRICK, MOVE_FRUSTRATION, MOVE_THUNDER_WAVE, MOVE_SAND_ATTACK},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_JOLLY
     },
-    [309] = {
+    [FRONTIER_MON_CASTFORM_2] = {
         .species = SPECIES_CASTFORM,
         .moves = {MOVE_THUNDERBOLT, MOVE_FLAMETHROWER, MOVE_ICE_BEAM, MOVE_WATER_PULSE},
         .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_MODEST
     },
-    [310] = {
+    [FRONTIER_MON_SHELGON_2] = {
         .species = SPECIES_SHELGON,
         .moves = {MOVE_FRUSTRATION, MOVE_DRAGON_DANCE, MOVE_CRUNCH, MOVE_SCARY_FACE},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_HARDY
     },
-    [311] = {
+    [FRONTIER_MON_METANG_2] = {
         .species = SPECIES_METANG,
         .moves = {MOVE_METEOR_MASH, MOVE_PSYCHIC, MOVE_BODY_SLAM, MOVE_SCARY_FACE},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_QUIRKY
     },
-    [312] = {
+    [FRONTIER_MON_WIGGLYTUFF_2] = {
         .species = SPECIES_WIGGLYTUFF,
         .moves = {MOVE_FAKE_TEARS, MOVE_SING, MOVE_DREAM_EATER, MOVE_BRICK_BREAK},
         .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_DOCILE
     },
-    [313] = {
+    [FRONTIER_MON_SUNFLORA_2] = {
         .species = SPECIES_SUNFLORA,
         .moves = {MOVE_GIGA_DRAIN, MOVE_GRASS_WHISTLE, MOVE_GROWTH, MOVE_DOUBLE_TEAM},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_QUIET
     },
-    [314] = {
+    [FRONTIER_MON_CHIMECHO_2] = {
         .species = SPECIES_CHIMECHO,
         .moves = {MOVE_PSYCHIC, MOVE_HYPNOSIS, MOVE_DREAM_EATER, MOVE_HEAL_BELL},
         .itemTableId = BATTLE_FRONTIER_ITEM_TWISTED_SPOON,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_QUIET
     },
-    [315] = {
+    [FRONTIER_MON_GLIGAR_2] = {
         .species = SPECIES_GLIGAR,
         .moves = {MOVE_EARTHQUAKE, MOVE_AERIAL_ACE, MOVE_GUILLOTINE, MOVE_SCREECH},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [316] = {
+    [FRONTIER_MON_QWILFISH_2] = {
         .species = SPECIES_QWILFISH,
         .moves = {MOVE_REVENGE, MOVE_SLUDGE_BOMB, MOVE_SHADOW_BALL, MOVE_DESTINY_BOND},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [317] = {
+    [FRONTIER_MON_SNEASEL_2] = {
         .species = SPECIES_SNEASEL,
         .moves = {MOVE_CRUSH_CLAW, MOVE_BRICK_BREAK, MOVE_AERIAL_ACE, MOVE_SCREECH},
         .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_JOLLY
     },
-    [318] = {
+    [FRONTIER_MON_PELIPPER_2] = {
         .species = SPECIES_PELIPPER,
         .moves = {MOVE_SURF, MOVE_BLIZZARD, MOVE_AERIAL_ACE, MOVE_PROTECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_QUIET
     },
-    [319] = {
+    [FRONTIER_MON_SWELLOW_2] = {
         .species = SPECIES_SWELLOW,
         .moves = {MOVE_FACADE, MOVE_AERIAL_ACE, MOVE_PURSUIT, MOVE_DOUBLE_TEAM},
         .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [320] = {
+    [FRONTIER_MON_LAIRON_2] = {
         .species = SPECIES_LAIRON,
         .moves = {MOVE_EARTHQUAKE, MOVE_IRON_TAIL, MOVE_ROAR, MOVE_PROTECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_SASSY
     },
-    [321] = {
+    [FRONTIER_MON_TANGELA_2] = {
         .species = SPECIES_TANGELA,
         .moves = {MOVE_GIGA_DRAIN, MOVE_STUN_SPORE, MOVE_REST, MOVE_AMNESIA},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_CALM
     },
-    [322] = {
+    [FRONTIER_MON_ARBOK_2] = {
         .species = SPECIES_ARBOK,
         .moves = {MOVE_SLUDGE_BOMB, MOVE_EARTHQUAKE, MOVE_IRON_TAIL, MOVE_GLARE},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [323] = {
+    [FRONTIER_MON_PERSIAN_2] = {
         .species = SPECIES_PERSIAN,
         .moves = {MOVE_FRUSTRATION, MOVE_SHADOW_BALL, MOVE_ROAR, MOVE_FAKE_OUT},
         .itemTableId = BATTLE_FRONTIER_ITEM_SILK_SCARF,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_QUIRKY
     },
-    [324] = {
+    [FRONTIER_MON_SEADRA_2] = {
         .species = SPECIES_SEADRA,
         .moves = {MOVE_HYDRO_PUMP, MOVE_FRUSTRATION, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE},
         .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [325] = {
+    [FRONTIER_MON_KECLEON_2] = {
         .species = SPECIES_KECLEON,
         .moves = {MOVE_TRICK, MOVE_BRICK_BREAK, MOVE_SHADOW_BALL, MOVE_SKILL_SWAP},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [326] = {
+    [FRONTIER_MON_VIGOROTH_2] = {
         .species = SPECIES_VIGOROTH,
         .moves = {MOVE_CRUSH_CLAW, MOVE_REVERSAL, MOVE_ENDURE, MOVE_SHADOW_BALL},
         .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [327] = {
+    [FRONTIER_MON_LUNATONE_2] = {
         .species = SPECIES_LUNATONE,
         .moves = {MOVE_PSYCHIC, MOVE_ICE_BEAM, MOVE_COSMIC_POWER, MOVE_CALM_MIND},
         .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_QUIET
     },
-    [328] = {
+    [FRONTIER_MON_SOLROCK_2] = {
         .species = SPECIES_SOLROCK,
         .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_COSMIC_POWER, MOVE_OVERHEAT},
         .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_HARDY
     },
-    [329] = {
+    [FRONTIER_MON_NOCTOWL_2] = {
         .species = SPECIES_NOCTOWL,
         .moves = {MOVE_PSYCHIC, MOVE_FAINT_ATTACK, MOVE_AERIAL_ACE, MOVE_REFLECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_QUIET
     },
-    [330] = {
+    [FRONTIER_MON_SANDSLASH_2] = {
         .species = SPECIES_SANDSLASH,
         .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_CRUSH_CLAW, MOVE_SANDSTORM},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [331] = {
+    [FRONTIER_MON_VENOMOTH_2] = {
         .species = SPECIES_VENOMOTH,
         .moves = {MOVE_SIGNAL_BEAM, MOVE_PSYCHIC, MOVE_SLUDGE_BOMB, MOVE_GIGA_DRAIN},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [332] = {
+    [FRONTIER_MON_CHANSEY_2] = {
         .species = SPECIES_CHANSEY,
         .moves = {MOVE_SEISMIC_TOSS, MOVE_SHADOW_BALL, MOVE_DOUBLE_TEAM, MOVE_SOFT_BOILED},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_RELAXED
     },
-    [333] = {
+    [FRONTIER_MON_SEAKING_2] = {
         .species = SPECIES_SEAKING,
         .moves = {MOVE_HORN_DRILL, MOVE_MEGAHORN, MOVE_SLEEP_TALK, MOVE_REST},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_IMPISH
     },
-    [334] = {
+    [FRONTIER_MON_JUMPLUFF_2] = {
         .species = SPECIES_JUMPLUFF,
         .moves = {MOVE_LEECH_SEED, MOVE_SLEEP_POWDER, MOVE_GIGA_DRAIN, MOVE_DOUBLE_TEAM},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_BOLD
     },
-    [335] = {
+    [FRONTIER_MON_PILOSWINE_2] = {
         .species = SPECIES_PILOSWINE,
         .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_BODY_SLAM, MOVE_ROAR},
         .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_ADAMANT
     },
-    [336] = {
+    [FRONTIER_MON_GOLBAT_2] = {
         .species = SPECIES_GOLBAT,
         .moves = {MOVE_SLUDGE_BOMB, MOVE_SHADOW_BALL, MOVE_CONFUSE_RAY, MOVE_AIR_CUTTER},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [337] = {
+    [FRONTIER_MON_PRIMEAPE_2] = {
         .species = SPECIES_PRIMEAPE,
         .moves = {MOVE_CROSS_CHOP, MOVE_ROCK_TOMB, MOVE_OVERHEAT, MOVE_BULK_UP},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_QUIRKY
     },
-    [338] = {
+    [FRONTIER_MON_HITMONLEE_2] = {
         .species = SPECIES_HITMONLEE,
         .moves = {MOVE_MEGA_KICK, MOVE_BRICK_BREAK, MOVE_FORESIGHT, MOVE_ROCK_TOMB},
         .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [339] = {
+    [FRONTIER_MON_HITMONCHAN_2] = {
         .species = SPECIES_HITMONCHAN,
         .moves = {MOVE_DYNAMIC_PUNCH, MOVE_MACH_PUNCH, MOVE_DETECT, MOVE_COUNTER},
         .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [340] = {
+    [FRONTIER_MON_GIRAFARIG_2] = {
         .species = SPECIES_GIRAFARIG,
         .moves = {MOVE_PSYCHIC, MOVE_CRUNCH, MOVE_BATON_PASS, MOVE_AGILITY},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_MODEST
     },
-    [341] = {
+    [FRONTIER_MON_HITMONTOP_2] = {
         .species = SPECIES_HITMONTOP,
         .moves = {MOVE_DOUBLE_EDGE, MOVE_SEISMIC_TOSS, MOVE_ROCK_SLIDE, MOVE_COUNTER},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [342] = {
+    [FRONTIER_MON_BANETTE_2] = {
         .species = SPECIES_BANETTE,
         .moves = {MOVE_SHADOW_BALL, MOVE_FRUSTRATION, MOVE_SCREECH, MOVE_WILL_O_WISP},
         .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_ADAMANT
     },
-    [343] = {
+    [FRONTIER_MON_NINJASK_2] = {
         .species = SPECIES_NINJASK,
         .moves = {MOVE_SLASH, MOVE_SHADOW_BALL, MOVE_SWORDS_DANCE, MOVE_BATON_PASS},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_QUIRKY
     },
-    [344] = {
+    [FRONTIER_MON_SEVIPER_2] = {
         .species = SPECIES_SEVIPER,
         .moves = {MOVE_SLUDGE_BOMB, MOVE_EARTHQUAKE, MOVE_CRUNCH, MOVE_GIGA_DRAIN},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_QUIRKY
     },
-    [345] = {
+    [FRONTIER_MON_ZANGOOSE_2] = {
         .species = SPECIES_ZANGOOSE,
         .moves = {MOVE_CRUSH_CLAW, MOVE_SHADOW_BALL, MOVE_BRICK_BREAK, MOVE_AERIAL_ACE},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [346] = {
+    [FRONTIER_MON_CAMERUPT_2] = {
         .species = SPECIES_CAMERUPT,
         .moves = {MOVE_EARTHQUAKE, MOVE_ERUPTION, MOVE_BODY_SLAM, MOVE_SCARY_FACE},
         .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_QUIRKY
     },
-    [347] = {
+    [FRONTIER_MON_SHARPEDO_2] = {
         .species = SPECIES_SHARPEDO,
         .moves = {MOVE_DOUBLE_EDGE, MOVE_CRUNCH, MOVE_EARTHQUAKE, MOVE_SURF},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_QUIRKY
     },
-    [348] = {
+    [FRONTIER_MON_TROPIUS_2] = {
         .species = SPECIES_TROPIUS,
         .moves = {MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY, MOVE_SYNTHESIS, MOVE_BODY_SLAM},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_QUIET
     },
-    [349] = {
+    [FRONTIER_MON_MAGNETON_2] = {
         .species = SPECIES_MAGNETON,
         .moves = {MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_THUNDER_WAVE, MOVE_METAL_SOUND},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_HARDY
     },
-    [350] = {
+    [FRONTIER_MON_MANTINE_2] = {
         .species = SPECIES_MANTINE,
         .moves = {MOVE_SURF, MOVE_ICE_BEAM, MOVE_RAIN_DANCE, MOVE_CONFUSE_RAY},
         .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_MODEST
     },
-    [351] = {
+    [FRONTIER_MON_STANTLER_2] = {
         .species = SPECIES_STANTLER,
         .moves = {MOVE_FRUSTRATION, MOVE_SHADOW_BALL, MOVE_THUNDER_WAVE, MOVE_CONFUSE_RAY},
         .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [352] = {
+    [FRONTIER_MON_ABSOL_2] = {
         .species = SPECIES_ABSOL,
         .moves = {MOVE_DOUBLE_EDGE, MOVE_SHADOW_BALL, MOVE_AERIAL_ACE, MOVE_IRON_TAIL},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [353] = {
+    [FRONTIER_MON_SWALOT_2] = {
         .species = SPECIES_SWALOT,
         .moves = {MOVE_SLUDGE_BOMB, MOVE_SHADOW_BALL, MOVE_BODY_SLAM, MOVE_COUNTER},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [354] = {
+    [FRONTIER_MON_CRAWDAUNT_2] = {
         .species = SPECIES_CRAWDAUNT,
         .moves = {MOVE_GUILLOTINE, MOVE_FRUSTRATION, MOVE_ANCIENT_POWER, MOVE_AERIAL_ACE},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [355] = {
+    [FRONTIER_MON_PIDGEOT_2] = {
         .species = SPECIES_PIDGEOT,
         .moves = {MOVE_RETURN, MOVE_AERIAL_ACE, MOVE_STEEL_WING, MOVE_MUD_SLAP},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [356] = {
+    [FRONTIER_MON_GRUMPIG_2] = {
         .species = SPECIES_GRUMPIG,
         .moves = {MOVE_PSYCHIC, MOVE_ICE_PUNCH, MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_MODEST
     },
-    [357] = {
+    [FRONTIER_MON_TORKOAL_2] = {
         .species = SPECIES_TORKOAL,
         .moves = {MOVE_OVERHEAT, MOVE_BODY_SLAM, MOVE_SMOKESCREEN, MOVE_PROTECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_SASSY
     },
-    [358] = {
+    [FRONTIER_MON_KINGLER_2] = {
         .species = SPECIES_KINGLER,
         .moves = {MOVE_GUILLOTINE, MOVE_ROCK_TOMB, MOVE_FLAIL, MOVE_ENDURE},
         .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [359] = {
+    [FRONTIER_MON_CACTURNE_2] = {
         .species = SPECIES_CACTURNE,
         .moves = {MOVE_MEGA_KICK, MOVE_TEETER_DANCE, MOVE_FAINT_ATTACK, MOVE_SANDSTORM},
         .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_HARDY
     },
-    [360] = {
+    [FRONTIER_MON_BELLOSSOM_2] = {
         .species = SPECIES_BELLOSSOM,
         .moves = {MOVE_SOLAR_BEAM, MOVE_ATTRACT, MOVE_SUNNY_DAY, MOVE_SYNTHESIS},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_MODEST
     },
-    [361] = {
+    [FRONTIER_MON_OCTILLERY_2] = {
         .species = SPECIES_OCTILLERY,
         .moves = {MOVE_OCTAZOOKA, MOVE_FIRE_BLAST, MOVE_THUNDER_WAVE, MOVE_MUD_SLAP},
         .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_QUIRKY
     },
-    [362] = {
+    [FRONTIER_MON_HUNTAIL_2] = {
         .species = SPECIES_HUNTAIL,
         .moves = {MOVE_SURF, MOVE_RAIN_DANCE, MOVE_CRUNCH, MOVE_BODY_SLAM},
         .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_QUIET
     },
-    [363] = {
+    [FRONTIER_MON_GOREBYSS_2] = {
         .species = SPECIES_GOREBYSS,
         .moves = {MOVE_SURF, MOVE_RAIN_DANCE, MOVE_PSYCHIC, MOVE_BODY_SLAM},
         .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_QUIET
     },
-    [364] = {
+    [FRONTIER_MON_RELICANTH_2] = {
         .species = SPECIES_RELICANTH,
         .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_AMNESIA, MOVE_REST},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_SASSY
     },
-    [365] = {
+    [FRONTIER_MON_OMASTAR_2] = {
         .species = SPECIES_OMASTAR,
         .moves = {MOVE_HYDRO_PUMP, MOVE_RAIN_DANCE, MOVE_ICE_BEAM, MOVE_PROTECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_MODEST
     },
-    [366] = {
+    [FRONTIER_MON_KABUTOPS_2] = {
         .species = SPECIES_KABUTOPS,
         .moves = {MOVE_SLASH, MOVE_ROCK_SLIDE, MOVE_FLAIL, MOVE_ENDURE},
         .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [367] = {
+    [FRONTIER_MON_POLIWRATH_2] = {
         .species = SPECIES_POLIWRATH,
         .moves = {MOVE_BRICK_BREAK, MOVE_HYPNOSIS, MOVE_REST, MOVE_BELLY_DRUM},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [368] = {
+    [FRONTIER_MON_SCYTHER_2] = {
         .species = SPECIES_SCYTHER,
         .moves = {MOVE_SILVER_WIND, MOVE_AERIAL_ACE, MOVE_SWORDS_DANCE, MOVE_DOUBLE_TEAM},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [369] = {
+    [FRONTIER_MON_PINSIR_2] = {
         .species = SPECIES_PINSIR,
         .moves = {MOVE_GUILLOTINE, MOVE_SWORDS_DANCE, MOVE_FLAIL, MOVE_ENDURE},
         .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP,
         .nature = NATURE_JOLLY
     },
-    [370] = {
+    [FRONTIER_MON_POLITOED_2] = {
         .species = SPECIES_POLITOED,
         .moves = {MOVE_SURF, MOVE_PSYCHIC, MOVE_MUD_SLAP, MOVE_SWAGGER},
         .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_MODEST
     },
-    [371] = {
+    [FRONTIER_MON_CLOYSTER_2] = {
         .species = SPECIES_CLOYSTER,
         .moves = {MOVE_DIVE, MOVE_TOXIC, MOVE_DOUBLE_TEAM, MOVE_PROTECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_CAREFUL
     },
-    [372] = {
+    [FRONTIER_MON_DUGTRIO_1] = {
         .species = SPECIES_DUGTRIO,
         .moves = {MOVE_EARTHQUAKE, MOVE_TRI_ATTACK, MOVE_SLASH, MOVE_SAND_TOMB},
         .itemTableId = BATTLE_FRONTIER_ITEM_SOFT_SAND,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [373] = {
+    [FRONTIER_MON_MEDICHAM_1] = {
         .species = SPECIES_MEDICHAM,
         .moves = {MOVE_PSYCHIC, MOVE_HI_JUMP_KICK, MOVE_CALM_MIND, MOVE_BATON_PASS},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_DOCILE
     },
-    [374] = {
+    [FRONTIER_MON_MISDREAVUS_1] = {
         .species = SPECIES_MISDREAVUS,
         .moves = {MOVE_PAIN_SPLIT, MOVE_SHADOW_BALL, MOVE_CONFUSE_RAY, MOVE_THUNDER_WAVE},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_IMPISH
     },
-    [375] = {
+    [FRONTIER_MON_FEAROW_1] = {
         .species = SPECIES_FEAROW,
         .moves = {MOVE_DRILL_PECK, MOVE_TRI_ATTACK, MOVE_FACADE, MOVE_MUD_SLAP},
         .itemTableId = BATTLE_FRONTIER_ITEM_SHARP_BEAK,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [376] = {
+    [FRONTIER_MON_GRANBULL_1] = {
         .species = SPECIES_GRANBULL,
         .moves = {MOVE_MEGA_KICK, MOVE_SMELLING_SALT, MOVE_THUNDER_WAVE, MOVE_ROAR},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [377] = {
+    [FRONTIER_MON_JYNX_1] = {
         .species = SPECIES_JYNX,
         .moves = {MOVE_ICE_BEAM, MOVE_FAKE_OUT, MOVE_LOVELY_KISS, MOVE_ATTRACT},
         .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_MODEST
     },
-    [378] = {
+    [FRONTIER_MON_DUSCLOPS_1] = {
         .species = SPECIES_DUSCLOPS,
         .moves = {MOVE_WILL_O_WISP, MOVE_SEISMIC_TOSS, MOVE_PAIN_SPLIT, MOVE_CONFUSE_RAY},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_IMPISH
     },
-    [379] = {
+    [FRONTIER_MON_DODRIO_1] = {
         .species = SPECIES_DODRIO,
         .moves = {MOVE_DRILL_PECK, MOVE_TRI_ATTACK, MOVE_SLEEP_TALK, MOVE_REST},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [380] = {
+    [FRONTIER_MON_MR_MIME_1] = {
         .species = SPECIES_MR_MIME,
         .moves = {MOVE_PSYCHIC, MOVE_MAGICAL_LEAF, MOVE_FAKE_OUT, MOVE_REFLECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_RELAXED
     },
-    [381] = {
+    [FRONTIER_MON_LANTURN_1] = {
         .species = SPECIES_LANTURN,
         .moves = {MOVE_SURF, MOVE_CONFUSE_RAY, MOVE_ATTRACT, MOVE_THUNDER_WAVE},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_QUIET
     },
-    [382] = {
+    [FRONTIER_MON_BRELOOM_1] = {
         .species = SPECIES_BRELOOM,
         .moves = {MOVE_SKY_UPPERCUT, MOVE_MACH_PUNCH, MOVE_HEADBUTT, MOVE_COUNTER},
         .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_JOLLY
     },
-    [383] = {
+    [FRONTIER_MON_FORRETRESS_1] = {
         .species = SPECIES_FORRETRESS,
         .moves = {MOVE_DOUBLE_EDGE, MOVE_ROCK_SLIDE, MOVE_LIGHT_SCREEN, MOVE_SPIKES},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [384] = {
+    [FRONTIER_MON_WHISCASH_1] = {
         .species = SPECIES_WHISCASH,
         .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_AMNESIA, MOVE_REST},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [385] = {
+    [FRONTIER_MON_XATU_1] = {
         .species = SPECIES_XATU,
         .moves = {MOVE_DRILL_PECK, MOVE_NIGHT_SHADE, MOVE_WISH, MOVE_FUTURE_SIGHT},
         .itemTableId = BATTLE_FRONTIER_ITEM_SHARP_BEAK,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_HARDY
     },
-    [386] = {
+    [FRONTIER_MON_SKARMORY_1] = {
         .species = SPECIES_SKARMORY,
         .moves = {MOVE_STEEL_WING, MOVE_AIR_CUTTER, MOVE_COUNTER, MOVE_AGILITY},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [387] = {
+    [FRONTIER_MON_MAROWAK_1] = {
         .species = SPECIES_MAROWAK,
         .moves = {MOVE_BONEMERANG, MOVE_ROCK_SLIDE, MOVE_ICY_WIND, MOVE_HEADBUTT},
         .itemTableId = BATTLE_FRONTIER_ITEM_THICK_CLUB,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [388] = {
+    [FRONTIER_MON_QUAGSIRE_1] = {
         .species = SPECIES_QUAGSIRE,
         .moves = {MOVE_EARTHQUAKE, MOVE_BRICK_BREAK, MOVE_COUNTER, MOVE_MUD_SLAP},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [389] = {
+    [FRONTIER_MON_CLEFABLE_1] = {
         .species = SPECIES_CLEFABLE,
         .moves = {MOVE_METRONOME, MOVE_DOUBLE_TEAM, MOVE_REFLECT, MOVE_FOLLOW_ME},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_BRAVE
     },
-    [390] = {
+    [FRONTIER_MON_HARIYAMA_1] = {
         .species = SPECIES_HARIYAMA,
         .moves = {MOVE_CROSS_CHOP, MOVE_ROCK_SLIDE, MOVE_COUNTER, MOVE_FAKE_OUT},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [391] = {
+    [FRONTIER_MON_RAICHU_1] = {
         .species = SPECIES_RAICHU,
         .moves = {MOVE_THUNDERBOLT, MOVE_QUICK_ATTACK, MOVE_LIGHT_SCREEN, MOVE_DOUBLE_TEAM},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_MODEST
     },
-    [392] = {
+    [FRONTIER_MON_DEWGONG_1] = {
         .species = SPECIES_DEWGONG,
         .moves = {MOVE_ICE_BEAM, MOVE_ICY_WIND, MOVE_HEADBUTT, MOVE_FAKE_OUT},
         .itemTableId = BATTLE_FRONTIER_ITEM_NEVER_MELT_ICE,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_QUIET
     },
-    [393] = {
+    [FRONTIER_MON_MANECTRIC_1] = {
         .species = SPECIES_MANECTRIC,
         .moves = {MOVE_THUNDERBOLT, MOVE_FLASH, MOVE_QUICK_ATTACK, MOVE_ROAR},
         .itemTableId = BATTLE_FRONTIER_ITEM_MAGNET,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [394] = {
+    [FRONTIER_MON_VILEPLUME_1] = {
         .species = SPECIES_VILEPLUME,
         .moves = {MOVE_SLUDGE_BOMB, MOVE_PETAL_DANCE, MOVE_MOONLIGHT, MOVE_AROMATHERAPY},
         .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_IMPISH
     },
-    [395] = {
+    [FRONTIER_MON_VICTREEBEL_1] = {
         .species = SPECIES_VICTREEBEL,
         .moves = {MOVE_GIGA_DRAIN, MOVE_SLEEP_POWDER, MOVE_SWEET_SCENT, MOVE_SYNTHESIS},
         .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_QUIET
     },
-    [396] = {
+    [FRONTIER_MON_ELECTRODE_1] = {
         .species = SPECIES_ELECTRODE,
         .moves = {MOVE_THUNDERBOLT, MOVE_SWIFT, MOVE_LIGHT_SCREEN, MOVE_PROTECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_QUIET
     },
-    [397] = {
+    [FRONTIER_MON_EXPLOUD_1] = {
         .species = SPECIES_EXPLOUD,
         .moves = {MOVE_HYPER_VOICE, MOVE_SHADOW_BALL, MOVE_SLEEP_TALK, MOVE_REST},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_IMPISH
     },
-    [398] = {
+    [FRONTIER_MON_SHIFTRY_1] = {
         .species = SPECIES_SHIFTRY,
         .moves = {MOVE_GIGA_DRAIN, MOVE_FAINT_ATTACK, MOVE_QUICK_ATTACK, MOVE_FAKE_OUT},
         .itemTableId = BATTLE_FRONTIER_ITEM_MIRACLE_SEED,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_QUIET
     },
-    [399] = {
+    [FRONTIER_MON_GLALIE_1] = {
         .species = SPECIES_GLALIE,
         .moves = {MOVE_ICE_BEAM, MOVE_CRUNCH, MOVE_HAIL, MOVE_PROTECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_MODEST
     },
-    [400] = {
+    [FRONTIER_MON_LUDICOLO_1] = {
         .species = SPECIES_LUDICOLO,
         .moves = {MOVE_SURF, MOVE_RAIN_DANCE, MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH},
         .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_QUIET
     },
-    [401] = {
+    [FRONTIER_MON_HYPNO_1] = {
         .species = SPECIES_HYPNO,
         .moves = {MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_HYPNOSIS},
         .itemTableId = BATTLE_FRONTIER_ITEM_TWISTED_SPOON,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_QUIET
     },
-    [402] = {
+    [FRONTIER_MON_GOLEM_1] = {
         .species = SPECIES_GOLEM,
         .moves = {MOVE_EARTHQUAKE, MOVE_BODY_SLAM, MOVE_COUNTER, MOVE_ROCK_TOMB},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [403] = {
+    [FRONTIER_MON_RHYDON_1] = {
         .species = SPECIES_RHYDON,
         .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_TOMB, MOVE_SCARY_FACE, MOVE_BRICK_BREAK},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [404] = {
+    [FRONTIER_MON_ALAKAZAM_1] = {
         .species = SPECIES_ALAKAZAM,
         .moves = {MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_THUNDER_WAVE},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_MODEST
     },
-    [405] = {
+    [FRONTIER_MON_WEEZING_1] = {
         .species = SPECIES_WEEZING,
         .moves = {MOVE_SLUDGE_BOMB, MOVE_WILL_O_WISP, MOVE_SHADOW_BALL, MOVE_SMOKESCREEN},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [406] = {
+    [FRONTIER_MON_KANGASKHAN_1] = {
         .species = SPECIES_KANGASKHAN,
         .moves = {MOVE_DIZZY_PUNCH, MOVE_BRICK_BREAK, MOVE_COUNTER, MOVE_FAKE_OUT},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [407] = {
+    [FRONTIER_MON_ELECTABUZZ_1] = {
         .species = SPECIES_ELECTABUZZ,
         .moves = {MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_BRICK_BREAK, MOVE_LIGHT_SCREEN},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_RELAXED
     },
-    [408] = {
+    [FRONTIER_MON_TAUROS_1] = {
         .species = SPECIES_TAUROS,
         .moves = {MOVE_EARTHQUAKE, MOVE_THRASH, MOVE_SWAGGER, MOVE_FACADE},
         .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [409] = {
+    [FRONTIER_MON_SLOWBRO_1] = {
         .species = SPECIES_SLOWBRO,
         .moves = {MOVE_SURF, MOVE_RAIN_DANCE, MOVE_HEADBUTT, MOVE_ICE_PUNCH},
         .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_QUIET
     },
-    [410] = {
+    [FRONTIER_MON_SLOWKING_1] = {
         .species = SPECIES_SLOWKING,
         .moves = {MOVE_PSYCHIC, MOVE_BRICK_BREAK, MOVE_AMNESIA, MOVE_ATTRACT},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_QUIET
     },
-    [411] = {
+    [FRONTIER_MON_MILTANK_1] = {
         .species = SPECIES_MILTANK,
         .moves = {MOVE_FACADE, MOVE_SHADOW_BALL, MOVE_COUNTER, MOVE_MILK_DRINK},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_CAREFUL
     },
-    [412] = {
+    [FRONTIER_MON_ALTARIA_1] = {
         .species = SPECIES_ALTARIA,
         .moves = {MOVE_DRAGON_CLAW, MOVE_AERIAL_ACE, MOVE_REFRESH, MOVE_BODY_SLAM},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [413] = {
+    [FRONTIER_MON_NIDOQUEEN_1] = {
         .species = SPECIES_NIDOQUEEN,
         .moves = {MOVE_SLUDGE_BOMB, MOVE_DOUBLE_KICK, MOVE_BODY_SLAM, MOVE_COUNTER},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [414] = {
+    [FRONTIER_MON_NIDOKING_1] = {
         .species = SPECIES_NIDOKING,
         .moves = {MOVE_HORN_DRILL, MOVE_DOUBLE_KICK, MOVE_BODY_SLAM, MOVE_COUNTER},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [415] = {
+    [FRONTIER_MON_MAGMAR_1] = {
         .species = SPECIES_MAGMAR,
         .moves = {MOVE_FLAMETHROWER, MOVE_SMOKESCREEN, MOVE_BRICK_BREAK, MOVE_BARRIER},
         .itemTableId = BATTLE_FRONTIER_ITEM_RAWST_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_RELAXED
     },
-    [416] = {
+    [FRONTIER_MON_CRADILY_1] = {
         .species = SPECIES_CRADILY,
         .moves = {MOVE_GIGA_DRAIN, MOVE_ROCK_SLIDE, MOVE_BARRIER, MOVE_CONFUSE_RAY},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_RELAXED
     },
-    [417] = {
+    [FRONTIER_MON_ARMALDO_1] = {
         .species = SPECIES_ARMALDO,
         .moves = {MOVE_SLASH, MOVE_AERIAL_ACE, MOVE_ANCIENT_POWER, MOVE_PROTECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [418] = {
+    [FRONTIER_MON_GOLDUCK_1] = {
         .species = SPECIES_GOLDUCK,
         .moves = {MOVE_HYDRO_PUMP, MOVE_DIG, MOVE_BRICK_BREAK, MOVE_LIGHT_SCREEN},
         .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_QUIET
     },
-    [419] = {
+    [FRONTIER_MON_RAPIDASH_1] = {
         .species = SPECIES_RAPIDASH,
         .moves = {MOVE_FLAMETHROWER, MOVE_DOUBLE_KICK, MOVE_QUICK_ATTACK, MOVE_PROTECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHARCOAL,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_QUIET
     },
-    [420] = {
+    [FRONTIER_MON_MUK_1] = {
         .species = SPECIES_MUK,
         .moves = {MOVE_SLUDGE_BOMB, MOVE_BODY_SLAM, MOVE_SCREECH, MOVE_MINIMIZE},
         .itemTableId = BATTLE_FRONTIER_ITEM_POISON_BARB,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [421] = {
+    [FRONTIER_MON_GENGAR_1] = {
         .species = SPECIES_GENGAR,
         .moves = {MOVE_DREAM_EATER, MOVE_HYPNOSIS, MOVE_CONFUSE_RAY, MOVE_ATTRACT},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP,
         .nature = NATURE_TIMID
     },
-    [422] = {
+    [FRONTIER_MON_AMPHAROS_1] = {
         .species = SPECIES_AMPHAROS,
         .moves = {MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_THUNDER_WAVE, MOVE_ATTRACT},
         .itemTableId = BATTLE_FRONTIER_ITEM_MAGNET,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_RELAXED
     },
-    [423] = {
+    [FRONTIER_MON_SCIZOR_1] = {
         .species = SPECIES_SCIZOR,
         .moves = {MOVE_METAL_CLAW, MOVE_AERIAL_ACE, MOVE_COUNTER, MOVE_QUICK_ATTACK},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [424] = {
+    [FRONTIER_MON_HERACROSS_1] = {
         .species = SPECIES_HERACROSS,
         .moves = {MOVE_MEGAHORN, MOVE_BRICK_BREAK, MOVE_ROCK_TOMB, MOVE_COUNTER},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [425] = {
+    [FRONTIER_MON_URSARING_1] = {
         .species = SPECIES_URSARING,
         .moves = {MOVE_MEGA_KICK, MOVE_CRUNCH, MOVE_AERIAL_ACE, MOVE_COUNTER},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [426] = {
+    [FRONTIER_MON_HOUNDOOM_1] = {
         .species = SPECIES_HOUNDOOM,
         .moves = {MOVE_FLAMETHROWER, MOVE_SHADOW_BALL, MOVE_COUNTER, MOVE_WILL_O_WISP},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_QUIRKY
     },
-    [427] = {
+    [FRONTIER_MON_DONPHAN_1] = {
         .species = SPECIES_DONPHAN,
         .moves = {MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_SWAGGER, MOVE_REST},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [428] = {
+    [FRONTIER_MON_CLAYDOL_1] = {
         .species = SPECIES_CLAYDOL,
         .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_SWAGGER, MOVE_PSYCH_UP},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [429] = {
+    [FRONTIER_MON_WAILORD_1] = {
         .species = SPECIES_WAILORD,
         .moves = {MOVE_SURF, MOVE_ICY_WIND, MOVE_BODY_SLAM, MOVE_ROAR},
         .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_SASSY
     },
-    [430] = {
+    [FRONTIER_MON_NINETALES_1] = {
         .species = SPECIES_NINETALES,
         .moves = {MOVE_FLAMETHROWER, MOVE_ROAR, MOVE_CONFUSE_RAY, MOVE_WILL_O_WISP},
         .itemTableId = BATTLE_FRONTIER_ITEM_RAWST_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [431] = {
+    [FRONTIER_MON_MACHAMP_1] = {
         .species = SPECIES_MACHAMP,
         .moves = {MOVE_CROSS_CHOP, MOVE_ROCK_SLIDE, MOVE_COUNTER, MOVE_SCARY_FACE},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [432] = {
+    [FRONTIER_MON_SHUCKLE_1] = {
         .species = SPECIES_SHUCKLE,
         .moves = {MOVE_ROLLOUT, MOVE_DEFENSE_CURL, MOVE_SLEEP_TALK, MOVE_REST},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_BRAVE
     },
-    [433] = {
+    [FRONTIER_MON_STEELIX_1] = {
         .species = SPECIES_STEELIX,
         .moves = {MOVE_EARTHQUAKE, MOVE_DRAGON_BREATH, MOVE_ROCK_TOMB, MOVE_ROAR},
         .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [434] = {
+    [FRONTIER_MON_TENTACRUEL_1] = {
         .species = SPECIES_TENTACRUEL,
         .moves = {MOVE_SLUDGE_BOMB, MOVE_ICY_WIND, MOVE_BARRIER, MOVE_CONFUSE_RAY},
         .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_IMPISH
     },
-    [435] = {
+    [FRONTIER_MON_AERODACTYL_1] = {
         .species = SPECIES_AERODACTYL,
         .moves = {MOVE_ANCIENT_POWER, MOVE_DRAGON_BREATH, MOVE_AERIAL_ACE, MOVE_ROAR},
         .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [436] = {
+    [FRONTIER_MON_PORYGON2_1] = {
         .species = SPECIES_PORYGON2,
         .moves = {MOVE_TRI_ATTACK, MOVE_AERIAL_ACE, MOVE_SHADOW_BALL, MOVE_RECOVER},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [437] = {
+    [FRONTIER_MON_GARDEVOIR_1] = {
         .species = SPECIES_GARDEVOIR,
         .moves = {MOVE_DREAM_EATER, MOVE_HYPNOSIS, MOVE_MAGICAL_LEAF, MOVE_REFLECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_TIMID
     },
-    [438] = {
+    [FRONTIER_MON_EXEGGUTOR_1] = {
         .species = SPECIES_EXEGGUTOR,
         .moves = {MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY, MOVE_SYNTHESIS, MOVE_LIGHT_SCREEN},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_QUIET
     },
-    [439] = {
+    [FRONTIER_MON_STARMIE_1] = {
         .species = SPECIES_STARMIE,
         .moves = {MOVE_PSYCHIC, MOVE_CONFUSE_RAY, MOVE_THUNDER_WAVE, MOVE_RECOVER},
         .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_MODEST
     },
-    [440] = {
+    [FRONTIER_MON_FLYGON_1] = {
         .species = SPECIES_FLYGON,
         .moves = {MOVE_EARTHQUAKE, MOVE_STEEL_WING, MOVE_FAINT_ATTACK, MOVE_FACADE},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [441] = {
+    [FRONTIER_MON_VENUSAUR_1] = {
         .species = SPECIES_VENUSAUR,
         .moves = {MOVE_GIGA_DRAIN, MOVE_SUNNY_DAY, MOVE_SYNTHESIS, MOVE_SLEEP_POWDER},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_QUIET
     },
-    [442] = {
+    [FRONTIER_MON_VAPOREON_1] = {
         .species = SPECIES_VAPOREON,
         .moves = {MOVE_SURF, MOVE_ROAR, MOVE_BITE, MOVE_QUICK_ATTACK},
         .itemTableId = BATTLE_FRONTIER_ITEM_MYSTIC_WATER,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_MODEST
     },
-    [443] = {
+    [FRONTIER_MON_JOLTEON_1] = {
         .species = SPECIES_JOLTEON,
         .moves = {MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_ATTRACT, MOVE_PROTECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [444] = {
+    [FRONTIER_MON_FLAREON_1] = {
         .species = SPECIES_FLAREON,
         .moves = {MOVE_FLAMETHROWER, MOVE_ROAR, MOVE_BITE, MOVE_SAND_ATTACK},
         .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_MODEST
     },
-    [445] = {
+    [FRONTIER_MON_MEGANIUM_1] = {
         .species = SPECIES_MEGANIUM,
         .moves = {MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY, MOVE_LIGHT_SCREEN, MOVE_SYNTHESIS},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_MODEST
     },
-    [446] = {
+    [FRONTIER_MON_ESPEON_1] = {
         .species = SPECIES_ESPEON,
         .moves = {MOVE_PSYCHIC, MOVE_CHARM, MOVE_CALM_MIND, MOVE_BATON_PASS},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_MODEST
     },
-    [447] = {
+    [FRONTIER_MON_UMBREON_1] = {
         .species = SPECIES_UMBREON,
         .moves = {MOVE_CONFUSE_RAY, MOVE_FAINT_ATTACK, MOVE_DOUBLE_TEAM, MOVE_BATON_PASS},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_BOLD
     },
-    [448] = {
+    [FRONTIER_MON_BLASTOISE_1] = {
         .species = SPECIES_BLASTOISE,
         .moves = {MOVE_HYDRO_PUMP, MOVE_RAIN_DANCE, MOVE_BITE, MOVE_SEISMIC_TOSS},
         .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_MODEST
     },
-    [449] = {
+    [FRONTIER_MON_FERALIGATR_1] = {
         .species = SPECIES_FERALIGATR,
         .moves = {MOVE_SURF, MOVE_RAIN_DANCE, MOVE_AERIAL_ACE, MOVE_ROAR},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_QUIET
     },
-    [450] = {
+    [FRONTIER_MON_AGGRON_1] = {
         .species = SPECIES_AGGRON,
         .moves = {MOVE_IRON_TAIL, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE, MOVE_ROAR},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [451] = {
+    [FRONTIER_MON_BLAZIKEN_1] = {
         .species = SPECIES_BLAZIKEN,
         .moves = {MOVE_FLAMETHROWER, MOVE_SUNNY_DAY, MOVE_DOUBLE_KICK, MOVE_ROAR},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_DOCILE
     },
-    [452] = {
+    [FRONTIER_MON_WALREIN_1] = {
         .species = SPECIES_WALREIN,
         .moves = {MOVE_BLIZZARD, MOVE_HAIL, MOVE_YAWN, MOVE_PROTECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_QUIET
     },
-    [453] = {
+    [FRONTIER_MON_SCEPTILE_1] = {
         .species = SPECIES_SCEPTILE,
         .moves = {MOVE_LEAF_BLADE, MOVE_LEECH_SEED, MOVE_AERIAL_ACE, MOVE_DETECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [454] = {
+    [FRONTIER_MON_CHARIZARD_1] = {
         .species = SPECIES_CHARIZARD,
         .moves = {MOVE_FIRE_BLAST, MOVE_SUNNY_DAY, MOVE_ROAR, MOVE_SCARY_FACE},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [455] = {
+    [FRONTIER_MON_TYPHLOSION_1] = {
         .species = SPECIES_TYPHLOSION,
         .moves = {MOVE_FIRE_BLAST, MOVE_SUNNY_DAY, MOVE_SMOKESCREEN, MOVE_ROAR},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [456] = {
+    [FRONTIER_MON_LAPRAS_1] = {
         .species = SPECIES_LAPRAS,
         .moves = {MOVE_SURF, MOVE_ATTRACT, MOVE_CONFUSE_RAY, MOVE_SING},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_BOLD
     },
-    [457] = {
+    [FRONTIER_MON_CROBAT_1] = {
         .species = SPECIES_CROBAT,
         .moves = {MOVE_SLUDGE_BOMB, MOVE_BITE, MOVE_ASTONISH, MOVE_SCREECH},
         .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_QUIRKY
     },
-    [458] = {
+    [FRONTIER_MON_SWAMPERT_1] = {
         .species = SPECIES_SWAMPERT,
         .moves = {MOVE_EARTHQUAKE, MOVE_COUNTER, MOVE_REST, MOVE_CURSE},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [459] = {
+    [FRONTIER_MON_GYARADOS_1] = {
         .species = SPECIES_GYARADOS,
         .moves = {MOVE_RETURN, MOVE_BITE, MOVE_THUNDER_WAVE, MOVE_DRAGON_DANCE},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_CAREFUL
     },
-    [460] = {
+    [FRONTIER_MON_SNORLAX_1] = {
         .species = SPECIES_SNORLAX,
         .moves = {MOVE_FACADE, MOVE_SHADOW_BALL, MOVE_ATTRACT, MOVE_DOUBLE_TEAM},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [461] = {
+    [FRONTIER_MON_KINGDRA_1] = {
         .species = SPECIES_KINGDRA,
         .moves = {MOVE_HYDRO_PUMP, MOVE_DRAGON_BREATH, MOVE_ICY_WIND, MOVE_ATTRACT},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_MODEST
     },
-    [462] = {
+    [FRONTIER_MON_BLISSEY_1] = {
         .species = SPECIES_BLISSEY,
         .moves = {MOVE_TOXIC, MOVE_DOUBLE_TEAM, MOVE_SING, MOVE_SOFT_BOILED},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_BOLD
     },
-    [463] = {
+    [FRONTIER_MON_MILOTIC_1] = {
         .species = SPECIES_MILOTIC,
         .moves = {MOVE_HYDRO_PUMP, MOVE_ICY_WIND, MOVE_RECOVER, MOVE_MIRROR_COAT},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_MODEST
     },
-    [464] = {
+    [FRONTIER_MON_ARCANINE_1] = {
         .species = SPECIES_ARCANINE,
         .moves = {MOVE_FLAMETHROWER, MOVE_EXTREME_SPEED, MOVE_CRUNCH, MOVE_BODY_SLAM},
         .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [465] = {
+    [FRONTIER_MON_SALAMENCE_1] = {
         .species = SPECIES_SALAMENCE,
         .moves = {MOVE_DRAGON_CLAW, MOVE_AERIAL_ACE, MOVE_HEADBUTT, MOVE_ROCK_SLIDE},
         .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_HARDY
     },
-    [466] = {
+    [FRONTIER_MON_METAGROSS_1] = {
         .species = SPECIES_METAGROSS,
         .moves = {MOVE_METEOR_MASH, MOVE_AERIAL_ACE, MOVE_FACADE, MOVE_LIGHT_SCREEN},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [467] = {
+    [FRONTIER_MON_SLAKING_1] = {
         .species = SPECIES_SLAKING,
         .moves = {MOVE_YAWN, MOVE_BULK_UP, MOVE_SWAGGER, MOVE_AERIAL_ACE},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [468] = {
+    [FRONTIER_MON_DUGTRIO_2] = {
         .species = SPECIES_DUGTRIO,
         .moves = {MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_AERIAL_ACE, MOVE_TRI_ATTACK},
         .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [469] = {
+    [FRONTIER_MON_MEDICHAM_2] = {
         .species = SPECIES_MEDICHAM,
         .moves = {MOVE_REVERSAL, MOVE_ENDURE, MOVE_PSYCHIC, MOVE_FAKE_OUT},
         .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_HARDY
     },
-    [470] = {
+    [FRONTIER_MON_MAROWAK_2] = {
         .species = SPECIES_MAROWAK,
         .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_SWORDS_DANCE, MOVE_ICY_WIND},
         .itemTableId = BATTLE_FRONTIER_ITEM_THICK_CLUB,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [471] = {
+    [FRONTIER_MON_QUAGSIRE_2] = {
         .species = SPECIES_QUAGSIRE,
         .moves = {MOVE_CURSE, MOVE_ATTRACT, MOVE_YAWN, MOVE_ANCIENT_POWER},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_SASSY
     },
-    [472] = {
+    [FRONTIER_MON_MISDREAVUS_2] = {
         .species = SPECIES_MISDREAVUS,
         .moves = {MOVE_PSYCHIC, MOVE_ATTRACT, MOVE_THUNDER_WAVE, MOVE_CONFUSE_RAY},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_BOLD
     },
-    [473] = {
+    [FRONTIER_MON_FEAROW_2] = {
         .species = SPECIES_FEAROW,
         .moves = {MOVE_DRILL_PECK, MOVE_TRI_ATTACK, MOVE_ATTRACT, MOVE_PURSUIT},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [474] = {
+    [FRONTIER_MON_GRANBULL_2] = {
         .species = SPECIES_GRANBULL,
         .moves = {MOVE_OVERHEAT, MOVE_THUNDERBOLT, MOVE_ICE_PUNCH, MOVE_FACADE},
         .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK,
         .nature = NATURE_QUIET
     },
-    [475] = {
+    [FRONTIER_MON_JYNX_2] = {
         .species = SPECIES_JYNX,
         .moves = {MOVE_PERISH_SONG, MOVE_MEAN_LOOK, MOVE_LOVELY_KISS, MOVE_PROTECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_IMPISH
     },
-    [476] = {
+    [FRONTIER_MON_DUSCLOPS_2] = {
         .species = SPECIES_DUSCLOPS,
         .moves = {MOVE_TOXIC, MOVE_CONFUSE_RAY, MOVE_DOUBLE_TEAM, MOVE_PROTECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_IMPISH
     },
-    [477] = {
+    [FRONTIER_MON_DODRIO_2] = {
         .species = SPECIES_DODRIO,
         .moves = {MOVE_DRILL_PECK, MOVE_DOUBLE_EDGE, MOVE_FAINT_ATTACK, MOVE_PROTECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [478] = {
+    [FRONTIER_MON_MR_MIME_2] = {
         .species = SPECIES_MR_MIME,
         .moves = {MOVE_BATON_PASS, MOVE_SWAGGER, MOVE_PSYCH_UP, MOVE_PSYCHIC},
         .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [479] = {
+    [FRONTIER_MON_LANTURN_2] = {
         .species = SPECIES_LANTURN,
         .moves = {MOVE_FLAIL, MOVE_ENDURE, MOVE_THUNDERBOLT, MOVE_SURF},
         .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_DOCILE
     },
-    [480] = {
+    [FRONTIER_MON_BRELOOM_2] = {
         .species = SPECIES_BRELOOM,
         .moves = {MOVE_GIGA_DRAIN, MOVE_LEECH_SEED, MOVE_FOCUS_PUNCH, MOVE_SPORE},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_DOCILE
     },
-    [481] = {
+    [FRONTIER_MON_FORRETRESS_2] = {
         .species = SPECIES_FORRETRESS,
         .moves = {MOVE_EARTHQUAKE, MOVE_DOUBLE_EDGE, MOVE_COUNTER, MOVE_PROTECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [482] = {
+    [FRONTIER_MON_SKARMORY_2] = {
         .species = SPECIES_SKARMORY,
         .moves = {MOVE_SPIKES, MOVE_ROAR, MOVE_DRILL_PECK, MOVE_TOXIC},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_CAREFUL
     },
-    [483] = {
+    [FRONTIER_MON_WHISCASH_2] = {
         .species = SPECIES_WHISCASH,
         .moves = {MOVE_SURF, MOVE_EARTHQUAKE, MOVE_SPARK, MOVE_FUTURE_SIGHT},
         .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_HARDY
     },
-    [484] = {
+    [FRONTIER_MON_XATU_2] = {
         .species = SPECIES_XATU,
         .moves = {MOVE_FLY, MOVE_TOXIC, MOVE_CONFUSE_RAY, MOVE_ATTRACT},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_IMPISH
     },
-    [485] = {
+    [FRONTIER_MON_CLEFABLE_2] = {
         .species = SPECIES_CLEFABLE,
         .moves = {MOVE_METEOR_MASH, MOVE_COSMIC_POWER, MOVE_DOUBLE_TEAM, MOVE_FOLLOW_ME},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [486] = {
+    [FRONTIER_MON_HARIYAMA_2] = {
         .species = SPECIES_HARIYAMA,
         .moves = {MOVE_CROSS_CHOP, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_THUNDER_PUNCH},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_QUIET
     },
-    [487] = {
+    [FRONTIER_MON_RAICHU_2] = {
         .species = SPECIES_RAICHU,
         .moves = {MOVE_THUNDERBOLT, MOVE_REVERSAL, MOVE_ENDURE, MOVE_AGILITY},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [488] = {
+    [FRONTIER_MON_DEWGONG_2] = {
         .species = SPECIES_DEWGONG,
         .moves = {MOVE_BLIZZARD, MOVE_DOUBLE_EDGE, MOVE_ENCORE, MOVE_DISABLE},
         .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_DOCILE
     },
-    [489] = {
+    [FRONTIER_MON_MANECTRIC_2] = {
         .species = SPECIES_MANECTRIC,
         .moves = {MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_CRUNCH, MOVE_ROAR},
         .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [490] = {
+    [FRONTIER_MON_VILEPLUME_2] = {
         .species = SPECIES_VILEPLUME,
         .moves = {MOVE_INGRAIN, MOVE_DOUBLE_TEAM, MOVE_TOXIC, MOVE_GIGA_DRAIN},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_BOLD
     },
-    [491] = {
+    [FRONTIER_MON_VICTREEBEL_2] = {
         .species = SPECIES_VICTREEBEL,
         .moves = {MOVE_GIGA_DRAIN, MOVE_SLUDGE_BOMB, MOVE_SLEEP_POWDER, MOVE_ATTRACT},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_SERIOUS
     },
-    [492] = {
+    [FRONTIER_MON_ELECTRODE_2] = {
         .species = SPECIES_ELECTRODE,
         .moves = {MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_DOUBLE_TEAM, MOVE_SWAGGER},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_MODEST
     },
-    [493] = {
+    [FRONTIER_MON_EXPLOUD_2] = {
         .species = SPECIES_EXPLOUD,
         .moves = {MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE, MOVE_COUNTER},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_QUIRKY
     },
-    [494] = {
+    [FRONTIER_MON_SHIFTRY_2] = {
         .species = SPECIES_SHIFTRY,
         .moves = {MOVE_LEECH_SEED, MOVE_DIG, MOVE_DOUBLE_TEAM, MOVE_REST},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_IMPISH
     },
-    [495] = {
+    [FRONTIER_MON_GLALIE_2] = {
         .species = SPECIES_GLALIE,
         .moves = {MOVE_EXPLOSION, MOVE_ENDURE, MOVE_BODY_SLAM, MOVE_ICY_WIND},
         .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_QUIRKY
     },
-    [496] = {
+    [FRONTIER_MON_LUDICOLO_2] = {
         .species = SPECIES_LUDICOLO,
         .moves = {MOVE_SURF, MOVE_ICE_BEAM, MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH},
         .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_MODEST
     },
-    [497] = {
+    [FRONTIER_MON_HYPNO_2] = {
         .species = SPECIES_HYPNO,
         .moves = {MOVE_HYPNOSIS, MOVE_NIGHTMARE, MOVE_DREAM_EATER, MOVE_PSYCHIC},
         .itemTableId = BATTLE_FRONTIER_ITEM_TWISTED_SPOON,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_MODEST
     },
-    [498] = {
+    [FRONTIER_MON_GOLEM_2] = {
         .species = SPECIES_GOLEM,
         .moves = {MOVE_FOCUS_PUNCH, MOVE_SUBSTITUTE, MOVE_DOUBLE_TEAM, MOVE_REST},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [499] = {
+    [FRONTIER_MON_RHYDON_2] = {
         .species = SPECIES_RHYDON,
         .moves = {MOVE_EARTHQUAKE, MOVE_HORN_DRILL, MOVE_ROCK_SLIDE, MOVE_BRICK_BREAK},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [500] = {
+    [FRONTIER_MON_ALAKAZAM_2] = {
         .species = SPECIES_ALAKAZAM,
         .moves = {MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_THUNDER_WAVE, MOVE_RECOVER},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_MODEST
     },
-    [501] = {
+    [FRONTIER_MON_WEEZING_2] = {
         .species = SPECIES_WEEZING,
         .moves = {MOVE_MEMENTO, MOVE_SLUDGE_BOMB, MOVE_FACADE, MOVE_DESTINY_BOND},
         .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [502] = {
+    [FRONTIER_MON_KANGASKHAN_2] = {
         .species = SPECIES_KANGASKHAN,
         .moves = {MOVE_CRUSH_CLAW, MOVE_SHADOW_BALL, MOVE_ATTRACT, MOVE_REST},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [503] = {
+    [FRONTIER_MON_ELECTABUZZ_2] = {
         .species = SPECIES_ELECTABUZZ,
         .moves = {MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_ATTRACT, MOVE_FOCUS_PUNCH},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_QUIRKY
     },
-    [504] = {
+    [FRONTIER_MON_TAUROS_2] = {
         .species = SPECIES_TAUROS,
         .moves = {MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_DOUBLE_TEAM, MOVE_REST},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [505] = {
+    [FRONTIER_MON_SLOWBRO_2] = {
         .species = SPECIES_SLOWBRO,
         .moves = {MOVE_SURF, MOVE_ICE_BEAM, MOVE_CALM_MIND, MOVE_YAWN},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_MODEST
     },
-    [506] = {
+    [FRONTIER_MON_SLOWKING_2] = {
         .species = SPECIES_SLOWKING,
         .moves = {MOVE_YAWN, MOVE_THUNDER_WAVE, MOVE_SURF, MOVE_PSYCHIC},
         .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_MODEST
     },
-    [507] = {
+    [FRONTIER_MON_MILTANK_2] = {
         .species = SPECIES_MILTANK,
         .moves = {MOVE_FOCUS_PUNCH, MOVE_SHADOW_BALL, MOVE_ATTRACT, MOVE_THUNDER_WAVE},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_CAREFUL
     },
-    [508] = {
+    [FRONTIER_MON_ALTARIA_2] = {
         .species = SPECIES_ALTARIA,
         .moves = {MOVE_PERISH_SONG, MOVE_DRAGON_BREATH, MOVE_PURSUIT, MOVE_ATTRACT},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_BOLD
     },
-    [509] = {
+    [FRONTIER_MON_NIDOQUEEN_2] = {
         .species = SPECIES_NIDOQUEEN,
         .moves = {MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE, MOVE_ROCK_SLIDE},
         .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [510] = {
+    [FRONTIER_MON_NIDOKING_2] = {
         .species = SPECIES_NIDOKING,
         .moves = {MOVE_MEGA_KICK, MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_BRICK_BREAK},
         .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [511] = {
+    [FRONTIER_MON_MAGMAR_2] = {
         .species = SPECIES_MAGMAR,
         .moves = {MOVE_FIRE_BLAST, MOVE_SMOKESCREEN, MOVE_THUNDER_PUNCH, MOVE_CONFUSE_RAY},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [512] = {
+    [FRONTIER_MON_CRADILY_2] = {
         .species = SPECIES_CRADILY,
         .moves = {MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_SWAGGER, MOVE_PSYCH_UP},
         .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [513] = {
+    [FRONTIER_MON_ARMALDO_2] = {
         .species = SPECIES_ARMALDO,
         .moves = {MOVE_IRON_TAIL, MOVE_ANCIENT_POWER, MOVE_BRICK_BREAK, MOVE_KNOCK_OFF},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [514] = {
+    [FRONTIER_MON_GOLDUCK_2] = {
         .species = SPECIES_GOLDUCK,
         .moves = {MOVE_CROSS_CHOP, MOVE_SURF, MOVE_SWAGGER, MOVE_PSYCH_UP},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_QUIRKY
     },
-    [515] = {
+    [FRONTIER_MON_RAPIDASH_2] = {
         .species = SPECIES_RAPIDASH,
         .moves = {MOVE_FIRE_BLAST, MOVE_BOUNCE, MOVE_DOUBLE_TEAM, MOVE_ATTRACT},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_DOCILE
     },
-    [516] = {
+    [FRONTIER_MON_MUK_2] = {
         .species = SPECIES_MUK,
         .moves = {MOVE_CURSE, MOVE_REST, MOVE_SLUDGE_BOMB, MOVE_DYNAMIC_PUNCH},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_HARDY
     },
-    [517] = {
+    [FRONTIER_MON_GENGAR_2] = {
         .species = SPECIES_GENGAR,
         .moves = {MOVE_SLUDGE_BOMB, MOVE_SHADOW_BALL, MOVE_CONFUSE_RAY, MOVE_WILL_O_WISP},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [518] = {
+    [FRONTIER_MON_AMPHAROS_2] = {
         .species = SPECIES_AMPHAROS,
         .moves = {MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH, MOVE_FOCUS_PUNCH, MOVE_THUNDER_WAVE},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_HARDY
     },
-    [519] = {
+    [FRONTIER_MON_SCIZOR_2] = {
         .species = SPECIES_SCIZOR,
         .moves = {MOVE_SILVER_WIND, MOVE_STEEL_WING, MOVE_SWORDS_DANCE, MOVE_LIGHT_SCREEN},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [520] = {
+    [FRONTIER_MON_HERACROSS_2] = {
         .species = SPECIES_HERACROSS,
         .moves = {MOVE_MEGAHORN, MOVE_EARTHQUAKE, MOVE_ATTRACT, MOVE_BULK_UP},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP,
         .nature = NATURE_JOLLY
     },
-    [521] = {
+    [FRONTIER_MON_URSARING_2] = {
         .species = SPECIES_URSARING,
         .moves = {MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_BRICK_BREAK, MOVE_COUNTER},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [522] = {
+    [FRONTIER_MON_HOUNDOOM_2] = {
         .species = SPECIES_HOUNDOOM,
         .moves = {MOVE_FIRE_BLAST, MOVE_CRUNCH, MOVE_ROAR, MOVE_REST},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [523] = {
+    [FRONTIER_MON_DONPHAN_2] = {
         .species = SPECIES_DONPHAN,
         .moves = {MOVE_FLAIL, MOVE_ENDURE, MOVE_EARTHQUAKE, MOVE_ROCK_TOMB},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_JOLLY
     },
-    [524] = {
+    [FRONTIER_MON_CLAYDOL_2] = {
         .species = SPECIES_CLAYDOL,
         .moves = {MOVE_PSYCHIC, MOVE_EARTHQUAKE, MOVE_DOUBLE_TEAM, MOVE_COSMIC_POWER},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_CALM
     },
-    [525] = {
+    [FRONTIER_MON_WAILORD_2] = {
         .species = SPECIES_WAILORD,
         .moves = {MOVE_DOUBLE_EDGE, MOVE_REST, MOVE_CURSE, MOVE_AMNESIA},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [526] = {
+    [FRONTIER_MON_NINETALES_2] = {
         .species = SPECIES_NINETALES,
         .moves = {MOVE_HEAT_WAVE, MOVE_BODY_SLAM, MOVE_GRUDGE, MOVE_SUNNY_DAY},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_QUIRKY
     },
-    [527] = {
+    [FRONTIER_MON_MACHAMP_2] = {
         .species = SPECIES_MACHAMP,
         .moves = {MOVE_CROSS_CHOP, MOVE_EARTHQUAKE, MOVE_BULK_UP, MOVE_REST},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [528] = {
+    [FRONTIER_MON_SHUCKLE_2] = {
         .species = SPECIES_SHUCKLE,
         .moves = {MOVE_SANDSTORM, MOVE_DIG, MOVE_FLASH, MOVE_DOUBLE_TEAM},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_CAREFUL
     },
-    [529] = {
+    [FRONTIER_MON_STEELIX_2] = {
         .species = SPECIES_STEELIX,
         .moves = {MOVE_EARTHQUAKE, MOVE_DRAGON_BREATH, MOVE_SANDSTORM, MOVE_BLOCK},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_HARDY
     },
-    [530] = {
+    [FRONTIER_MON_TENTACRUEL_2] = {
         .species = SPECIES_TENTACRUEL,
         .moves = {MOVE_TOXIC, MOVE_GIGA_DRAIN, MOVE_CONFUSE_RAY, MOVE_SURF},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_HARDY
     },
-    [531] = {
+    [FRONTIER_MON_AERODACTYL_2] = {
         .species = SPECIES_AERODACTYL,
         .moves = {MOVE_HYPER_BEAM, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE, MOVE_ANCIENT_POWER},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [532] = {
+    [FRONTIER_MON_PORYGON2_2] = {
         .species = SPECIES_PORYGON2,
         .moves = {MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY, MOVE_THUNDER_WAVE, MOVE_RECOVER},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_MODEST
     },
-    [533] = {
+    [FRONTIER_MON_GARDEVOIR_2] = {
         .species = SPECIES_GARDEVOIR,
         .moves = {MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_DOUBLE_TEAM, MOVE_REST},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_MODEST
     },
-    [534] = {
+    [FRONTIER_MON_EXEGGUTOR_2] = {
         .species = SPECIES_EXEGGUTOR,
         .moves = {MOVE_RETURN, MOVE_CURSE, MOVE_SLEEP_POWDER, MOVE_REST},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_HARDY
     },
-    [535] = {
+    [FRONTIER_MON_STARMIE_2] = {
         .species = SPECIES_STARMIE,
         .moves = {MOVE_HYDRO_PUMP, MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_RECOVER},
         .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_MODEST
     },
-    [536] = {
+    [FRONTIER_MON_FLYGON_2] = {
         .species = SPECIES_FLYGON,
         .moves = {MOVE_SOLAR_BEAM, MOVE_FIRE_BLAST, MOVE_CRUNCH, MOVE_SUNNY_DAY},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [537] = {
+    [FRONTIER_MON_VENUSAUR_2] = {
         .species = SPECIES_VENUSAUR,
         .moves = {MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_DOUBLE_TEAM, MOVE_LIGHT_SCREEN},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_BOLD
     },
-    [538] = {
+    [FRONTIER_MON_VAPOREON_2] = {
         .species = SPECIES_VAPOREON,
         .moves = {MOVE_SURF, MOVE_ICE_BEAM, MOVE_BODY_SLAM, MOVE_SHADOW_BALL},
         .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [539] = {
+    [FRONTIER_MON_JOLTEON_2] = {
         .species = SPECIES_JOLTEON,
         .moves = {MOVE_THUNDERBOLT, MOVE_DIG, MOVE_DOUBLE_KICK, MOVE_ROAR},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_HARDY
     },
-    [540] = {
+    [FRONTIER_MON_FLAREON_2] = {
         .species = SPECIES_FLAREON,
         .moves = {MOVE_CURSE, MOVE_ATTRACT, MOVE_DOUBLE_EDGE, MOVE_SHADOW_BALL},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_RELAXED
     },
-    [541] = {
+    [FRONTIER_MON_MEGANIUM_2] = {
         .species = SPECIES_MEGANIUM,
         .moves = {MOVE_LEECH_SEED, MOVE_SUBSTITUTE, MOVE_DOUBLE_TEAM, MOVE_GRASS_WHISTLE},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_CALM
     },
-    [542] = {
+    [FRONTIER_MON_ESPEON_2] = {
         .species = SPECIES_ESPEON,
         .moves = {MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_CALM_MIND, MOVE_REST},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_DOCILE
     },
-    [543] = {
+    [FRONTIER_MON_UMBREON_2] = {
         .species = SPECIES_UMBREON,
         .moves = {MOVE_CURSE, MOVE_SCREECH, MOVE_DOUBLE_TEAM, MOVE_DOUBLE_EDGE},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [544] = {
+    [FRONTIER_MON_BLASTOISE_2] = {
         .species = SPECIES_BLASTOISE,
         .moves = {MOVE_HYDRO_PUMP, MOVE_MEGA_KICK, MOVE_BRICK_BREAK, MOVE_MIRROR_COAT},
         .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_BRAVE
     },
-    [545] = {
+    [FRONTIER_MON_FERALIGATR_2] = {
         .species = SPECIES_FERALIGATR,
         .moves = {MOVE_SURF, MOVE_DRAGON_CLAW, MOVE_BRICK_BREAK, MOVE_SCARY_FACE},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_SASSY
     },
-    [546] = {
+    [FRONTIER_MON_AGGRON_2] = {
         .species = SPECIES_AGGRON,
         .moves = {MOVE_FOCUS_PUNCH, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_THUNDER_WAVE},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [547] = {
+    [FRONTIER_MON_BLAZIKEN_2] = {
         .species = SPECIES_BLAZIKEN,
         .moves = {MOVE_BLAZE_KICK, MOVE_MEGA_KICK, MOVE_THUNDER_PUNCH, MOVE_BRICK_BREAK},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_DOCILE
     },
-    [548] = {
+    [FRONTIER_MON_WALREIN_2] = {
         .species = SPECIES_WALREIN,
         .moves = {MOVE_EARTHQUAKE, MOVE_ICE_BEAM, MOVE_CURSE, MOVE_DOUBLE_TEAM},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_QUIRKY
     },
-    [549] = {
+    [FRONTIER_MON_SCEPTILE_2] = {
         .species = SPECIES_SCEPTILE,
         .moves = {MOVE_LEAF_BLADE, MOVE_THUNDER_PUNCH, MOVE_ATTRACT, MOVE_DOUBLE_TEAM},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [550] = {
+    [FRONTIER_MON_CHARIZARD_2] = {
         .species = SPECIES_CHARIZARD,
         .moves = {MOVE_EARTHQUAKE, MOVE_AERIAL_ACE, MOVE_DRAGON_DANCE, MOVE_SMOKESCREEN},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [551] = {
+    [FRONTIER_MON_TYPHLOSION_2] = {
         .species = SPECIES_TYPHLOSION,
         .moves = {MOVE_FLAMETHROWER, MOVE_THUNDER_PUNCH, MOVE_AERIAL_ACE, MOVE_ROCK_SLIDE},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_HARDY
     },
-    [552] = {
+    [FRONTIER_MON_LAPRAS_2] = {
         .species = SPECIES_LAPRAS,
         .moves = {MOVE_SURF, MOVE_ICE_BEAM, MOVE_BODY_SLAM, MOVE_ROAR},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_TIMID
     },
-    [553] = {
+    [FRONTIER_MON_CROBAT_2] = {
         .species = SPECIES_CROBAT,
         .moves = {MOVE_TOXIC, MOVE_GIGA_DRAIN, MOVE_CONFUSE_RAY, MOVE_DOUBLE_TEAM},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_CALM
     },
-    [554] = {
+    [FRONTIER_MON_SWAMPERT_2] = {
         .species = SPECIES_SWAMPERT,
         .moves = {MOVE_SURF, MOVE_EARTHQUAKE, MOVE_COUNTER, MOVE_MIRROR_COAT},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [555] = {
+    [FRONTIER_MON_GYARADOS_2] = {
         .species = SPECIES_GYARADOS,
         .moves = {MOVE_HYDRO_PUMP, MOVE_THUNDERBOLT, MOVE_FIRE_BLAST, MOVE_BLIZZARD},
         .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [556] = {
+    [FRONTIER_MON_SNORLAX_2] = {
         .species = SPECIES_SNORLAX,
         .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_CURSE, MOVE_REST},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [557] = {
+    [FRONTIER_MON_KINGDRA_2] = {
         .species = SPECIES_KINGDRA,
         .moves = {MOVE_SURF, MOVE_ICE_BEAM, MOVE_DRAGON_BREATH, MOVE_REST},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_MODEST
     },
-    [558] = {
+    [FRONTIER_MON_BLISSEY_2] = {
         .species = SPECIES_BLISSEY,
         .moves = {MOVE_SEISMIC_TOSS, MOVE_SING, MOVE_ATTRACT, MOVE_SUBSTITUTE},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_BOLD
     },
-    [559] = {
+    [FRONTIER_MON_MILOTIC_2] = {
         .species = SPECIES_MILOTIC,
         .moves = {MOVE_SURF, MOVE_ICE_BEAM, MOVE_SAFEGUARD, MOVE_MIRROR_COAT},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_MODEST
     },
-    [560] = {
+    [FRONTIER_MON_ARCANINE_2] = {
         .species = SPECIES_ARCANINE,
         .moves = {MOVE_FIRE_BLAST, MOVE_SUNNY_DAY, MOVE_CRUNCH, MOVE_ROAR},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_DOCILE
     },
-    [561] = {
+    [FRONTIER_MON_SALAMENCE_2] = {
         .species = SPECIES_SALAMENCE,
         .moves = {MOVE_DOUBLE_EDGE, MOVE_CRUNCH, MOVE_SWAGGER, MOVE_PROTECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_HARDY
     },
-    [562] = {
+    [FRONTIER_MON_METAGROSS_2] = {
         .species = SPECIES_METAGROSS,
         .moves = {MOVE_EARTHQUAKE, MOVE_METEOR_MASH, MOVE_PSYCH_UP, MOVE_SWAGGER},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [563] = {
+    [FRONTIER_MON_SLAKING_2] = {
         .species = SPECIES_SLAKING,
         .moves = {MOVE_MEGA_KICK, MOVE_SHADOW_BALL, MOVE_YAWN, MOVE_AMNESIA},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_ADAMANT
     },
-    [564] = {
+    [FRONTIER_MON_DUGTRIO_3] = {
         .species = SPECIES_DUGTRIO,
         .moves = {MOVE_EARTHQUAKE, MOVE_DOUBLE_EDGE, MOVE_SLUDGE_BOMB, MOVE_FISSURE},
         .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [565] = {
+    [FRONTIER_MON_MEDICHAM_3] = {
         .species = SPECIES_MEDICHAM,
         .moves = {MOVE_DYNAMIC_PUNCH, MOVE_THUNDER_PUNCH, MOVE_ICE_PUNCH, MOVE_FIRE_PUNCH},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_HARDY
     },
-    [566] = {
+    [FRONTIER_MON_MISDREAVUS_3] = {
         .species = SPECIES_MISDREAVUS,
         .moves = {MOVE_PERISH_SONG, MOVE_MEAN_LOOK, MOVE_THUNDER_WAVE, MOVE_CONFUSE_RAY},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_BOLD
     },
-    [567] = {
+    [FRONTIER_MON_FEAROW_3] = {
         .species = SPECIES_FEAROW,
         .moves = {MOVE_DRILL_PECK, MOVE_RETURN, MOVE_STEEL_WING, MOVE_FAINT_ATTACK},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_HARDY
     },
-    [568] = {
+    [FRONTIER_MON_GRANBULL_3] = {
         .species = SPECIES_GRANBULL,
         .moves = {MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_SLUDGE_BOMB, MOVE_ROCK_SLIDE},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [569] = {
+    [FRONTIER_MON_JYNX_3] = {
         .species = SPECIES_JYNX,
         .moves = {MOVE_DREAM_EATER, MOVE_LOVELY_KISS, MOVE_ATTRACT, MOVE_SUBSTITUTE},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_HARDY
     },
-    [570] = {
+    [FRONTIER_MON_DUSCLOPS_3] = {
         .species = SPECIES_DUSCLOPS,
         .moves = {MOVE_PSYCH_UP, MOVE_SWAGGER, MOVE_SHADOW_BALL, MOVE_EARTHQUAKE},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [571] = {
+    [FRONTIER_MON_DODRIO_3] = {
         .species = SPECIES_DODRIO,
         .moves = {MOVE_DOUBLE_EDGE, MOVE_DRILL_PECK, MOVE_STEEL_WING, MOVE_FAINT_ATTACK},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [572] = {
+    [FRONTIER_MON_MR_MIME_3] = {
         .species = SPECIES_MR_MIME,
         .moves = {MOVE_TRICK, MOVE_TORMENT, MOVE_PSYCHIC, MOVE_THUNDERBOLT},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_MODEST
     },
-    [573] = {
+    [FRONTIER_MON_LANTURN_3] = {
         .species = SPECIES_LANTURN,
         .moves = {MOVE_HYDRO_PUMP, MOVE_THUNDER, MOVE_CONFUSE_RAY, MOVE_RAIN_DANCE},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [574] = {
+    [FRONTIER_MON_BRELOOM_3] = {
         .species = SPECIES_BRELOOM,
         .moves = {MOVE_IRON_TAIL, MOVE_FOCUS_PUNCH, MOVE_ATTRACT, MOVE_SPORE},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [575] = {
+    [FRONTIER_MON_FORRETRESS_3] = {
         .species = SPECIES_FORRETRESS,
         .moves = {MOVE_EXPLOSION, MOVE_EARTHQUAKE, MOVE_GIGA_DRAIN, MOVE_ZAP_CANNON},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_QUIET
     },
-    [576] = {
+    [FRONTIER_MON_WHISCASH_3] = {
         .species = SPECIES_WHISCASH,
         .moves = {MOVE_SLEEP_TALK, MOVE_REST, MOVE_SURF, MOVE_FISSURE},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_HARDY
     },
-    [577] = {
+    [FRONTIER_MON_XATU_3] = {
         .species = SPECIES_XATU,
         .moves = {MOVE_DRILL_PECK, MOVE_PSYCHIC, MOVE_GIGA_DRAIN, MOVE_STEEL_WING},
         .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_JOLLY
     },
-    [578] = {
+    [FRONTIER_MON_SKARMORY_3] = {
         .species = SPECIES_SKARMORY,
         .moves = {MOVE_TOXIC, MOVE_CURSE, MOVE_REST, MOVE_FLY},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_CAREFUL
     },
-    [579] = {
+    [FRONTIER_MON_MAROWAK_3] = {
         .species = SPECIES_MAROWAK,
         .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_SWORDS_DANCE, MOVE_BRICK_BREAK},
         .itemTableId = BATTLE_FRONTIER_ITEM_THICK_CLUB,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [580] = {
+    [FRONTIER_MON_QUAGSIRE_3] = {
         .species = SPECIES_QUAGSIRE,
         .moves = {MOVE_EARTHQUAKE, MOVE_SLUDGE_BOMB, MOVE_DOUBLE_EDGE, MOVE_CURSE},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [581] = {
+    [FRONTIER_MON_CLEFABLE_3] = {
         .species = SPECIES_CLEFABLE,
         .moves = {MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_FLAMETHROWER, MOVE_MAGICAL_LEAF},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_MODEST
     },
-    [582] = {
+    [FRONTIER_MON_HARIYAMA_3] = {
         .species = SPECIES_HARIYAMA,
         .moves = {MOVE_CROSS_CHOP, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_FACADE},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [583] = {
+    [FRONTIER_MON_RAICHU_3] = {
         .species = SPECIES_RAICHU,
         .moves = {MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_IRON_TAIL, MOVE_ATTRACT},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_DOCILE
     },
-    [584] = {
+    [FRONTIER_MON_DEWGONG_3] = {
         .species = SPECIES_DEWGONG,
         .moves = {MOVE_HORN_DRILL, MOVE_SHEER_COLD, MOVE_SLEEP_TALK, MOVE_REST},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_BOLD
     },
-    [585] = {
+    [FRONTIER_MON_MANECTRIC_3] = {
         .species = SPECIES_MANECTRIC,
         .moves = {MOVE_THUNDERBOLT, MOVE_IRON_TAIL, MOVE_THUNDER_WAVE, MOVE_ROAR},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_QUIRKY
     },
-    [586] = {
+    [FRONTIER_MON_VILEPLUME_3] = {
         .species = SPECIES_VILEPLUME,
         .moves = {MOVE_ATTRACT, MOVE_STUN_SPORE, MOVE_SLUDGE_BOMB, MOVE_GIGA_DRAIN},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_QUIRKY
     },
-    [587] = {
+    [FRONTIER_MON_VICTREEBEL_3] = {
         .species = SPECIES_VICTREEBEL,
         .moves = {MOVE_STUN_SPORE, MOVE_INGRAIN, MOVE_GIGA_DRAIN, MOVE_SLUDGE_BOMB},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_QUIRKY
     },
-    [588] = {
+    [FRONTIER_MON_ELECTRODE_3] = {
         .species = SPECIES_ELECTRODE,
         .moves = {MOVE_EXPLOSION, MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_ENDURE},
         .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_NAUGHTY
     },
-    [589] = {
+    [FRONTIER_MON_EXPLOUD_3] = {
         .species = SPECIES_EXPLOUD,
         .moves = {MOVE_OVERHEAT, MOVE_ICE_BEAM, MOVE_THUNDER_PUNCH, MOVE_EXTRASENSORY},
         .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [590] = {
+    [FRONTIER_MON_SHIFTRY_3] = {
         .species = SPECIES_SHIFTRY,
         .moves = {MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY, MOVE_EXPLOSION, MOVE_SYNTHESIS},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_QUIRKY
     },
-    [591] = {
+    [FRONTIER_MON_GLALIE_3] = {
         .species = SPECIES_GLALIE,
         .moves = {MOVE_BLIZZARD, MOVE_EARTHQUAKE, MOVE_DOUBLE_EDGE, MOVE_SHADOW_BALL},
         .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_HARDY
     },
-    [592] = {
+    [FRONTIER_MON_LUDICOLO_3] = {
         .species = SPECIES_LUDICOLO,
         .moves = {MOVE_LEECH_SEED, MOVE_RAIN_DANCE, MOVE_DOUBLE_TEAM, MOVE_GIGA_DRAIN},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_BOLD
     },
-    [593] = {
+    [FRONTIER_MON_HYPNO_3] = {
         .species = SPECIES_HYPNO,
         .moves = {MOVE_PSYCH_UP, MOVE_SWAGGER, MOVE_MEGA_KICK, MOVE_SHADOW_BALL},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [594] = {
+    [FRONTIER_MON_GOLEM_3] = {
         .species = SPECIES_GOLEM,
         .moves = {MOVE_EXPLOSION, MOVE_EARTHQUAKE, MOVE_FLAMETHROWER, MOVE_BRICK_BREAK},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [595] = {
+    [FRONTIER_MON_RHYDON_3] = {
         .species = SPECIES_RHYDON,
         .moves = {MOVE_MEGAHORN, MOVE_CRUSH_CLAW, MOVE_EARTHQUAKE, MOVE_HORN_DRILL},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [596] = {
+    [FRONTIER_MON_ALAKAZAM_3] = {
         .species = SPECIES_ALAKAZAM,
         .moves = {MOVE_TRICK, MOVE_DISABLE, MOVE_PSYCHIC, MOVE_SKILL_SWAP},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_MODEST
     },
-    [597] = {
+    [FRONTIER_MON_WEEZING_3] = {
         .species = SPECIES_WEEZING,
         .moves = {MOVE_EXPLOSION, MOVE_SLUDGE_BOMB, MOVE_FLAMETHROWER, MOVE_THUNDERBOLT},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_QUIRKY
     },
-    [598] = {
+    [FRONTIER_MON_KANGASKHAN_3] = {
         .species = SPECIES_KANGASKHAN,
         .moves = {MOVE_REVERSAL, MOVE_ENDURE, MOVE_THUNDERBOLT, MOVE_EARTHQUAKE},
         .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_JOLLY
     },
-    [599] = {
+    [FRONTIER_MON_ELECTABUZZ_3] = {
         .species = SPECIES_ELECTABUZZ,
         .moves = {MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_THUNDERBOLT, MOVE_CROSS_CHOP},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_QUIRKY
     },
-    [600] = {
+    [FRONTIER_MON_TAUROS_3] = {
         .species = SPECIES_TAUROS,
         .moves = {MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_FLAMETHROWER, MOVE_ICE_BEAM},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_DOCILE
     },
-    [601] = {
+    [FRONTIER_MON_SLOWBRO_3] = {
         .species = SPECIES_SLOWBRO,
         .moves = {MOVE_SURF, MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_ATTRACT},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK,
         .nature = NATURE_QUIET
     },
-    [602] = {
+    [FRONTIER_MON_SLOWKING_3] = {
         .species = SPECIES_SLOWKING,
         .moves = {MOVE_PSYCHIC, MOVE_SURF, MOVE_ICE_BEAM, MOVE_EARTHQUAKE},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_QUIET
     },
-    [603] = {
+    [FRONTIER_MON_MILTANK_3] = {
         .species = SPECIES_MILTANK,
         .moves = {MOVE_REVERSAL, MOVE_ENDURE, MOVE_EARTHQUAKE, MOVE_SHADOW_BALL},
         .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [604] = {
+    [FRONTIER_MON_ALTARIA_3] = {
         .species = SPECIES_ALTARIA,
         .moves = {MOVE_SING, MOVE_DRAGON_DANCE, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [605] = {
+    [FRONTIER_MON_NIDOQUEEN_3] = {
         .species = SPECIES_NIDOQUEEN,
         .moves = {MOVE_THUNDERBOLT, MOVE_FLAMETHROWER, MOVE_ICE_BEAM, MOVE_CRUNCH},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_MODEST
     },
-    [606] = {
+    [FRONTIER_MON_NIDOKING_3] = {
         .species = SPECIES_NIDOKING,
         .moves = {MOVE_HORN_DRILL, MOVE_FIRE_BLAST, MOVE_BLIZZARD, MOVE_SURF},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEPPA_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_MODEST
     },
-    [607] = {
+    [FRONTIER_MON_MAGMAR_3] = {
         .species = SPECIES_MAGMAR,
         .moves = {MOVE_MEGA_KICK, MOVE_CROSS_CHOP, MOVE_IRON_TAIL, MOVE_COUNTER},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_IMPISH
     },
-    [608] = {
+    [FRONTIER_MON_CRADILY_3] = {
         .species = SPECIES_CRADILY,
         .moves = {MOVE_SUBSTITUTE, MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY, MOVE_RECOVER},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_MODEST
     },
-    [609] = {
+    [FRONTIER_MON_ARMALDO_3] = {
         .species = SPECIES_ARMALDO,
         .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_BRICK_BREAK, MOVE_SWORDS_DANCE},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [610] = {
+    [FRONTIER_MON_GOLDUCK_3] = {
         .species = SPECIES_GOLDUCK,
         .moves = {MOVE_HYDRO_PUMP, MOVE_CROSS_CHOP, MOVE_BLIZZARD, MOVE_PROTECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_DOCILE
     },
-    [611] = {
+    [FRONTIER_MON_RAPIDASH_3] = {
         .species = SPECIES_RAPIDASH,
         .moves = {MOVE_OVERHEAT, MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY, MOVE_HYPNOSIS},
         .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP,
         .nature = NATURE_MODEST
     },
-    [612] = {
+    [FRONTIER_MON_MUK_3] = {
         .species = SPECIES_MUK,
         .moves = {MOVE_SLUDGE_BOMB, MOVE_THUNDERBOLT, MOVE_FLAMETHROWER, MOVE_ICE_PUNCH},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_QUIET
     },
-    [613] = {
+    [FRONTIER_MON_GENGAR_3] = {
         .species = SPECIES_GENGAR,
         .moves = {MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_GIGA_DRAIN, MOVE_SKILL_SWAP},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [614] = {
+    [FRONTIER_MON_AMPHAROS_3] = {
         .species = SPECIES_AMPHAROS,
         .moves = {MOVE_THUNDERBOLT, MOVE_MEGA_KICK, MOVE_IRON_TAIL, MOVE_BRICK_BREAK},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_HARDY
     },
-    [615] = {
+    [FRONTIER_MON_SCIZOR_3] = {
         .species = SPECIES_SCIZOR,
         .moves = {MOVE_REVERSAL, MOVE_ENDURE, MOVE_AGILITY, MOVE_SLASH},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_CAREFUL
     },
-    [616] = {
+    [FRONTIER_MON_HERACROSS_3] = {
         .species = SPECIES_HERACROSS,
         .moves = {MOVE_MEGAHORN, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_BRICK_BREAK},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [617] = {
+    [FRONTIER_MON_URSARING_3] = {
         .species = SPECIES_URSARING,
         .moves = {MOVE_FIRE_PUNCH, MOVE_THUNDER_PUNCH, MOVE_ICE_PUNCH, MOVE_CRUNCH},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP,
         .nature = NATURE_MODEST
     },
-    [618] = {
+    [FRONTIER_MON_HOUNDOOM_3] = {
         .species = SPECIES_HOUNDOOM,
         .moves = {MOVE_OVERHEAT, MOVE_SHADOW_BALL, MOVE_SLUDGE_BOMB, MOVE_DOUBLE_EDGE},
         .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_QUIRKY
     },
-    [619] = {
+    [FRONTIER_MON_DONPHAN_3] = {
         .species = SPECIES_DONPHAN,
         .moves = {MOVE_FISSURE, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_SECRET_POWER},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [620] = {
+    [FRONTIER_MON_CLAYDOL_3] = {
         .species = SPECIES_CLAYDOL,
         .moves = {MOVE_PSYCHIC, MOVE_ICE_BEAM, MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY},
         .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_MODEST
     },
-    [621] = {
+    [FRONTIER_MON_WAILORD_3] = {
         .species = SPECIES_WAILORD,
         .moves = {MOVE_HYDRO_PUMP, MOVE_FISSURE, MOVE_DOUBLE_TEAM, MOVE_REST},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_MODEST
     },
-    [622] = {
+    [FRONTIER_MON_NINETALES_3] = {
         .species = SPECIES_NINETALES,
         .moves = {MOVE_FIRE_BLAST, MOVE_IRON_TAIL, MOVE_CONFUSE_RAY, MOVE_ATTRACT},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_QUIRKY
     },
-    [623] = {
+    [FRONTIER_MON_MACHAMP_3] = {
         .species = SPECIES_MACHAMP,
         .moves = {MOVE_CROSS_CHOP, MOVE_FIRE_BLAST, MOVE_THUNDER_PUNCH, MOVE_ICE_PUNCH},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_HARDY
     },
-    [624] = {
+    [FRONTIER_MON_SHUCKLE_3] = {
         .species = SPECIES_SHUCKLE,
         .moves = {MOVE_SUBSTITUTE, MOVE_ATTRACT, MOVE_TOXIC, MOVE_DOUBLE_TEAM},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_CAREFUL
     },
-    [625] = {
+    [FRONTIER_MON_STEELIX_3] = {
         .species = SPECIES_STEELIX,
         .moves = {MOVE_EARTHQUAKE, MOVE_BODY_SLAM, MOVE_ROCK_SLIDE, MOVE_EXPLOSION},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [626] = {
+    [FRONTIER_MON_TENTACRUEL_3] = {
         .species = SPECIES_TENTACRUEL,
         .moves = {MOVE_SURF, MOVE_GIGA_DRAIN, MOVE_ICE_BEAM, MOVE_MIRROR_COAT},
         .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_MODEST
     },
-    [627] = {
+    [FRONTIER_MON_AERODACTYL_3] = {
         .species = SPECIES_AERODACTYL,
         .moves = {MOVE_DOUBLE_EDGE, MOVE_ROCK_SLIDE, MOVE_FIRE_BLAST, MOVE_DRAGON_CLAW},
         .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_HARDY
     },
-    [628] = {
+    [FRONTIER_MON_PORYGON2_3] = {
         .species = SPECIES_PORYGON2,
         .moves = {MOVE_PSYCHIC, MOVE_TRI_ATTACK, MOVE_THUNDER_WAVE, MOVE_RECOVER},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_MODEST
     },
-    [629] = {
+    [FRONTIER_MON_GARDEVOIR_3] = {
         .species = SPECIES_GARDEVOIR,
         .moves = {MOVE_PSYCHIC, MOVE_ICE_PUNCH, MOVE_FIRE_PUNCH, MOVE_MAGICAL_LEAF},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [630] = {
+    [FRONTIER_MON_EXEGGUTOR_3] = {
         .species = SPECIES_EXEGGUTOR,
         .moves = {MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC, MOVE_EXPLOSION},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_HARDY
     },
-    [631] = {
+    [FRONTIER_MON_STARMIE_3] = {
         .species = SPECIES_STARMIE,
         .moves = {MOVE_SURF, MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_ICE_BEAM},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [632] = {
+    [FRONTIER_MON_FLYGON_3] = {
         .species = SPECIES_FLYGON,
         .moves = {MOVE_EARTHQUAKE, MOVE_DRAGON_CLAW, MOVE_FLAMETHROWER, MOVE_GIGA_DRAIN},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_HARDY
     },
-    [633] = {
+    [FRONTIER_MON_VENUSAUR_3] = {
         .species = SPECIES_VENUSAUR,
         .moves = {MOVE_DOUBLE_EDGE, MOVE_SLUDGE_BOMB, MOVE_EARTHQUAKE, MOVE_SLEEP_POWDER},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [634] = {
+    [FRONTIER_MON_VAPOREON_3] = {
         .species = SPECIES_VAPOREON,
         .moves = {MOVE_SURF, MOVE_ICE_BEAM, MOVE_ACID_ARMOR, MOVE_BATON_PASS},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_CALM
     },
-    [635] = {
+    [FRONTIER_MON_JOLTEON_3] = {
         .species = SPECIES_JOLTEON,
         .moves = {MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_AGILITY, MOVE_BATON_PASS},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_BOLD
     },
-    [636] = {
+    [FRONTIER_MON_FLAREON_3] = {
         .species = SPECIES_FLAREON,
         .moves = {MOVE_SHADOW_BALL, MOVE_FLAIL, MOVE_ENDURE, MOVE_OVERHEAT},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_JOLLY
     },
-    [637] = {
+    [FRONTIER_MON_MEGANIUM_3] = {
         .species = SPECIES_MEGANIUM,
         .moves = {MOVE_EARTHQUAKE, MOVE_FLAIL, MOVE_ENDURE, MOVE_GIGA_DRAIN},
         .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_JOLLY
     },
-    [638] = {
+    [FRONTIER_MON_ESPEON_3] = {
         .species = SPECIES_ESPEON,
         .moves = {MOVE_PSYCHIC, MOVE_BITE, MOVE_WISH, MOVE_REFLECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [639] = {
+    [FRONTIER_MON_UMBREON_3] = {
         .species = SPECIES_UMBREON,
         .moves = {MOVE_SWAGGER, MOVE_PSYCH_UP, MOVE_ATTRACT, MOVE_SHADOW_BALL},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_BOLD
     },
-    [640] = {
+    [FRONTIER_MON_BLASTOISE_3] = {
         .species = SPECIES_BLASTOISE,
         .moves = {MOVE_SURF, MOVE_EARTHQUAKE, MOVE_ICE_BEAM, MOVE_COUNTER},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [641] = {
+    [FRONTIER_MON_FERALIGATR_3] = {
         .species = SPECIES_FERALIGATR,
         .moves = {MOVE_HYDRO_PUMP, MOVE_CRUNCH, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_HARDY
     },
-    [642] = {
+    [FRONTIER_MON_AGGRON_3] = {
         .species = SPECIES_AGGRON,
         .moves = {MOVE_SURF, MOVE_THUNDER, MOVE_FIRE_BLAST, MOVE_BLIZZARD},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_MODEST
     },
-    [643] = {
+    [FRONTIER_MON_BLAZIKEN_3] = {
         .species = SPECIES_BLAZIKEN,
         .moves = {MOVE_OVERHEAT, MOVE_EARTHQUAKE, MOVE_ENDURE, MOVE_REVERSAL},
         .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_HARDY
     },
-    [644] = {
+    [FRONTIER_MON_WALREIN_3] = {
         .species = SPECIES_WALREIN,
         .moves = {MOVE_SHEER_COLD, MOVE_FISSURE, MOVE_SURF, MOVE_ATTRACT},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_HARDY
     },
-    [645] = {
+    [FRONTIER_MON_SCEPTILE_3] = {
         .species = SPECIES_SCEPTILE,
         .moves = {MOVE_LEAF_BLADE, MOVE_EARTHQUAKE, MOVE_CRUSH_CLAW, MOVE_AERIAL_ACE},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_DOCILE
     },
-    [646] = {
+    [FRONTIER_MON_CHARIZARD_3] = {
         .species = SPECIES_CHARIZARD,
         .moves = {MOVE_FLAMETHROWER, MOVE_DRAGON_CLAW, MOVE_BITE, MOVE_BRICK_BREAK},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [647] = {
+    [FRONTIER_MON_TYPHLOSION_3] = {
         .species = SPECIES_TYPHLOSION,
         .moves = {MOVE_EARTHQUAKE, MOVE_OVERHEAT, MOVE_ENDURE, MOVE_REVERSAL},
         .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [648] = {
+    [FRONTIER_MON_LAPRAS_3] = {
         .species = SPECIES_LAPRAS,
         .moves = {MOVE_DOUBLE_EDGE, MOVE_PSYCHIC, MOVE_CONFUSE_RAY, MOVE_DRAGON_DANCE},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [649] = {
+    [FRONTIER_MON_CROBAT_3] = {
         .species = SPECIES_CROBAT,
         .moves = {MOVE_AIR_CUTTER, MOVE_DOUBLE_EDGE, MOVE_SHADOW_BALL, MOVE_SCREECH},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [650] = {
+    [FRONTIER_MON_SWAMPERT_3] = {
         .species = SPECIES_SWAMPERT,
         .moves = {MOVE_SURF, MOVE_EARTHQUAKE, MOVE_ICE_BEAM, MOVE_COUNTER},
         .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_BRAVE
     },
-    [651] = {
+    [FRONTIER_MON_GYARADOS_3] = {
         .species = SPECIES_GYARADOS,
         .moves = {MOVE_SURF, MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_EARTHQUAKE},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_QUIRKY
     },
-    [652] = {
+    [FRONTIER_MON_SNORLAX_3] = {
         .species = SPECIES_SNORLAX,
         .moves = {MOVE_MEGA_KICK, MOVE_SHADOW_BALL, MOVE_SWAGGER, MOVE_PSYCH_UP},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_ADAMANT
     },
-    [653] = {
+    [FRONTIER_MON_KINGDRA_3] = {
         .species = SPECIES_KINGDRA,
         .moves = {MOVE_FLAIL, MOVE_HYDRO_PUMP, MOVE_DRAGON_DANCE, MOVE_ENDURE},
         .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [654] = {
+    [FRONTIER_MON_BLISSEY_3] = {
         .species = SPECIES_BLISSEY,
         .moves = {MOVE_FIRE_BLAST, MOVE_BLIZZARD, MOVE_CALM_MIND, MOVE_SOFT_BOILED},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_BOLD
     },
-    [655] = {
+    [FRONTIER_MON_MILOTIC_3] = {
         .species = SPECIES_MILOTIC,
         .moves = {MOVE_SURF, MOVE_BLIZZARD, MOVE_ATTRACT, MOVE_RECOVER},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_BOLD
     },
-    [656] = {
+    [FRONTIER_MON_ARCANINE_3] = {
         .species = SPECIES_ARCANINE,
         .moves = {MOVE_OVERHEAT, MOVE_EXTREME_SPEED, MOVE_CRUNCH, MOVE_AERIAL_ACE},
         .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [657] = {
+    [FRONTIER_MON_SALAMENCE_3] = {
         .species = SPECIES_SALAMENCE,
         .moves = {MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_CRUNCH, MOVE_ENDURE},
         .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_HARDY
     },
-    [658] = {
+    [FRONTIER_MON_METAGROSS_3] = {
         .species = SPECIES_METAGROSS,
         .moves = {MOVE_EARTHQUAKE, MOVE_METEOR_MASH, MOVE_DOUBLE_TEAM, MOVE_REST},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [659] = {
+    [FRONTIER_MON_SLAKING_3] = {
         .species = SPECIES_SLAKING,
         .moves = {MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_AERIAL_ACE, MOVE_BRICK_BREAK},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_ADAMANT
     },
-    [660] = {
+    [FRONTIER_MON_DUGTRIO_4] = {
         .species = SPECIES_DUGTRIO,
         .moves = {MOVE_EARTHQUAKE, MOVE_DOUBLE_EDGE, MOVE_ROCK_SLIDE, MOVE_FISSURE},
         .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [661] = {
+    [FRONTIER_MON_MEDICHAM_4] = {
         .species = SPECIES_MEDICHAM,
         .moves = {MOVE_MEGA_KICK, MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_ROCK_SLIDE},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_HARDY
     },
-    [662] = {
+    [FRONTIER_MON_MISDREAVUS_4] = {
         .species = SPECIES_MISDREAVUS,
         .moves = {MOVE_DESTINY_BOND, MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_THUNDERBOLT},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_TIMID
     },
-    [663] = {
+    [FRONTIER_MON_FEAROW_4] = {
         .species = SPECIES_FEAROW,
         .moves = {MOVE_DRILL_PECK, MOVE_DOUBLE_EDGE, MOVE_STEEL_WING, MOVE_SKY_ATTACK},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_HARDY
     },
-    [664] = {
+    [FRONTIER_MON_GRANBULL_4] = {
         .species = SPECIES_GRANBULL,
         .moves = {MOVE_MEGA_KICK, MOVE_EARTHQUAKE, MOVE_CRUNCH, MOVE_SHADOW_BALL},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_BRAVE
     },
-    [665] = {
+    [FRONTIER_MON_JYNX_4] = {
         .species = SPECIES_JYNX,
         .moves = {MOVE_PSYCHIC, MOVE_ICE_BEAM, MOVE_LOVELY_KISS, MOVE_FAKE_TEARS},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_MODEST
     },
-    [666] = {
+    [FRONTIER_MON_DUSCLOPS_4] = {
         .species = SPECIES_DUSCLOPS,
         .moves = {MOVE_DOUBLE_EDGE, MOVE_SHADOW_BALL, MOVE_CURSE, MOVE_REST},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [667] = {
+    [FRONTIER_MON_DODRIO_4] = {
         .species = SPECIES_DODRIO,
         .moves = {MOVE_FLAIL, MOVE_ENDURE, MOVE_DRILL_PECK, MOVE_FACADE},
         .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [668] = {
+    [FRONTIER_MON_MR_MIME_4] = {
         .species = SPECIES_MR_MIME,
         .moves = {MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_ICE_PUNCH, MOVE_FIRE_PUNCH},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_MODEST
     },
-    [669] = {
+    [FRONTIER_MON_LANTURN_4] = {
         .species = SPECIES_LANTURN,
         .moves = {MOVE_SURF, MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_CONFUSE_RAY},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [670] = {
+    [FRONTIER_MON_BRELOOM_4] = {
         .species = SPECIES_BRELOOM,
         .moves = {MOVE_FOCUS_PUNCH, MOVE_SLUDGE_BOMB, MOVE_SPORE, MOVE_DOUBLE_TEAM},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [671] = {
+    [FRONTIER_MON_FORRETRESS_4] = {
         .species = SPECIES_FORRETRESS,
         .moves = {MOVE_EXPLOSION, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_DOUBLE_EDGE},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [672] = {
+    [FRONTIER_MON_WHISCASH_4] = {
         .species = SPECIES_WHISCASH,
         .moves = {MOVE_FISSURE, MOVE_SURF, MOVE_EARTHQUAKE, MOVE_ICE_BEAM},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_QUIET
     },
-    [673] = {
+    [FRONTIER_MON_XATU_4] = {
         .species = SPECIES_XATU,
         .moves = {MOVE_PSYCHIC, MOVE_DRILL_PECK, MOVE_SHADOW_BALL, MOVE_CONFUSE_RAY},
         .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_DOCILE
     },
-    [674] = {
+    [FRONTIER_MON_SKARMORY_4] = {
         .species = SPECIES_SKARMORY,
         .moves = {MOVE_DRILL_PECK, MOVE_STEEL_WING, MOVE_COUNTER, MOVE_ROCK_SLIDE},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [675] = {
+    [FRONTIER_MON_MAROWAK_4] = {
         .species = SPECIES_MAROWAK,
         .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_SWORDS_DANCE, MOVE_MEGA_KICK},
         .itemTableId = BATTLE_FRONTIER_ITEM_THICK_CLUB,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [676] = {
+    [FRONTIER_MON_QUAGSIRE_4] = {
         .species = SPECIES_QUAGSIRE,
         .moves = {MOVE_SURF, MOVE_EARTHQUAKE, MOVE_ICE_BEAM, MOVE_AMNESIA},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_SASSY
     },
-    [677] = {
+    [FRONTIER_MON_CLEFABLE_4] = {
         .species = SPECIES_CLEFABLE,
         .moves = {MOVE_MEGA_KICK, MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_SOFT_BOILED},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_DOCILE
     },
-    [678] = {
+    [FRONTIER_MON_HARIYAMA_4] = {
         .species = SPECIES_HARIYAMA,
         .moves = {MOVE_CROSS_CHOP, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_FAKE_OUT},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [679] = {
+    [FRONTIER_MON_RAICHU_4] = {
         .species = SPECIES_RAICHU,
         .moves = {MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_PROTECT, MOVE_MEGA_KICK},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_DOCILE
     },
-    [680] = {
+    [FRONTIER_MON_DEWGONG_4] = {
         .species = SPECIES_DEWGONG,
         .moves = {MOVE_SHEER_COLD, MOVE_ICE_BEAM, MOVE_SURF, MOVE_SIGNAL_BEAM},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_DOCILE
     },
-    [681] = {
+    [FRONTIER_MON_MANECTRIC_4] = {
         .species = SPECIES_MANECTRIC,
         .moves = {MOVE_THUNDERBOLT, MOVE_CRUNCH, MOVE_THUNDER_WAVE, MOVE_ROAR},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [682] = {
+    [FRONTIER_MON_VILEPLUME_4] = {
         .species = SPECIES_VILEPLUME,
         .moves = {MOVE_SOLAR_BEAM, MOVE_SLUDGE_BOMB, MOVE_SUNNY_DAY, MOVE_SYNTHESIS},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_QUIET
     },
-    [683] = {
+    [FRONTIER_MON_VICTREEBEL_4] = {
         .species = SPECIES_VICTREEBEL,
         .moves = {MOVE_GIGA_DRAIN, MOVE_DOUBLE_EDGE, MOVE_SLUDGE_BOMB, MOVE_SYNTHESIS},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_QUIRKY
     },
-    [684] = {
+    [FRONTIER_MON_ELECTRODE_4] = {
         .species = SPECIES_ELECTRODE,
         .moves = {MOVE_EXPLOSION, MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_MIRROR_COAT},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_NAUGHTY
     },
-    [685] = {
+    [FRONTIER_MON_EXPLOUD_4] = {
         .species = SPECIES_EXPLOUD,
         .moves = {MOVE_MEGA_KICK, MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_OVERHEAT},
         .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_HARDY
     },
-    [686] = {
+    [FRONTIER_MON_SHIFTRY_4] = {
         .species = SPECIES_SHIFTRY,
         .moves = {MOVE_EXPLOSION, MOVE_GIGA_DRAIN, MOVE_MEGA_KICK, MOVE_FAKE_OUT},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_HARDY
     },
-    [687] = {
+    [FRONTIER_MON_GLALIE_4] = {
         .species = SPECIES_GLALIE,
         .moves = {MOVE_ICE_BEAM, MOVE_EARTHQUAKE, MOVE_CRUNCH, MOVE_SHADOW_BALL},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_HARDY
     },
-    [688] = {
+    [FRONTIER_MON_LUDICOLO_4] = {
         .species = SPECIES_LUDICOLO,
         .moves = {MOVE_LEECH_SEED, MOVE_RAIN_DANCE, MOVE_DOUBLE_TEAM, MOVE_TOXIC},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_BOLD
     },
-    [689] = {
+    [FRONTIER_MON_HYPNO_4] = {
         .species = SPECIES_HYPNO,
         .moves = {MOVE_PSYCHIC, MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_MODEST
     },
-    [690] = {
+    [FRONTIER_MON_GOLEM_4] = {
         .species = SPECIES_GOLEM,
         .moves = {MOVE_EXPLOSION, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_DOUBLE_EDGE},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [691] = {
+    [FRONTIER_MON_RHYDON_4] = {
         .species = SPECIES_RHYDON,
         .moves = {MOVE_MEGAHORN, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_HORN_DRILL},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [692] = {
+    [FRONTIER_MON_ALAKAZAM_4] = {
         .species = SPECIES_ALAKAZAM,
         .moves = {MOVE_PSYCHIC, MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_MODEST
     },
-    [693] = {
+    [FRONTIER_MON_WEEZING_4] = {
         .species = SPECIES_WEEZING,
         .moves = {MOVE_EXPLOSION, MOVE_SLUDGE_BOMB, MOVE_FRUSTRATION, MOVE_SHADOW_BALL},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [694] = {
+    [FRONTIER_MON_KANGASKHAN_4] = {
         .species = SPECIES_KANGASKHAN,
         .moves = {MOVE_MEGA_KICK, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE, MOVE_SHADOW_BALL},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [695] = {
+    [FRONTIER_MON_ELECTABUZZ_4] = {
         .species = SPECIES_ELECTABUZZ,
         .moves = {MOVE_THUNDERBOLT, MOVE_PSYCHIC, MOVE_MEGA_KICK, MOVE_CROSS_CHOP},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_DOCILE
     },
-    [696] = {
+    [FRONTIER_MON_TAUROS_4] = {
         .species = SPECIES_TAUROS,
         .moves = {MOVE_DOUBLE_EDGE, MOVE_ROCK_TOMB, MOVE_THUNDERBOLT, MOVE_SURF},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_DOCILE
     },
-    [697] = {
+    [FRONTIER_MON_SLOWBRO_4] = {
         .species = SPECIES_SLOWBRO,
         .moves = {MOVE_PSYCHIC, MOVE_SURF, MOVE_EARTHQUAKE, MOVE_ICE_BEAM},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK,
         .nature = NATURE_SASSY
     },
-    [698] = {
+    [FRONTIER_MON_SLOWKING_4] = {
         .species = SPECIES_SLOWKING,
         .moves = {MOVE_PSYCHIC, MOVE_SURF, MOVE_ICE_BEAM, MOVE_FLAMETHROWER},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_MODEST
     },
-    [699] = {
+    [FRONTIER_MON_MILTANK_4] = {
         .species = SPECIES_MILTANK,
         .moves = {MOVE_DOUBLE_EDGE, MOVE_CURSE, MOVE_DOUBLE_TEAM, MOVE_MILK_DRINK},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [700] = {
+    [FRONTIER_MON_ALTARIA_4] = {
         .species = SPECIES_ALTARIA,
         .moves = {MOVE_DRAGON_CLAW, MOVE_EARTHQUAKE, MOVE_FLAMETHROWER, MOVE_ICE_BEAM},
         .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_DOCILE
     },
-    [701] = {
+    [FRONTIER_MON_NIDOQUEEN_4] = {
         .species = SPECIES_NIDOQUEEN,
         .moves = {MOVE_SUPERPOWER, MOVE_SLUDGE_BOMB, MOVE_EARTHQUAKE, MOVE_SHADOW_BALL},
         .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [702] = {
+    [FRONTIER_MON_NIDOKING_4] = {
         .species = SPECIES_NIDOKING,
         .moves = {MOVE_MEGAHORN, MOVE_SLUDGE_BOMB, MOVE_EARTHQUAKE, MOVE_THUNDER},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_DOCILE
     },
-    [703] = {
+    [FRONTIER_MON_MAGMAR_4] = {
         .species = SPECIES_MAGMAR,
         .moves = {MOVE_FLAMETHROWER, MOVE_PSYCHIC, MOVE_CROSS_CHOP, MOVE_CONFUSE_RAY},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [704] = {
+    [FRONTIER_MON_CRADILY_4] = {
         .species = SPECIES_CRADILY,
         .moves = {MOVE_TOXIC, MOVE_INGRAIN, MOVE_MIRROR_COAT, MOVE_GIGA_DRAIN},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_BOLD
     },
-    [705] = {
+    [FRONTIER_MON_ARMALDO_4] = {
         .species = SPECIES_ARMALDO,
         .moves = {MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE, MOVE_ROCK_SLIDE},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [706] = {
+    [FRONTIER_MON_GOLDUCK_4] = {
         .species = SPECIES_GOLDUCK,
         .moves = {MOVE_SURF, MOVE_CROSS_CHOP, MOVE_ICE_BEAM, MOVE_AERIAL_ACE},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_DOCILE
     },
-    [707] = {
+    [FRONTIER_MON_RAPIDASH_4] = {
         .species = SPECIES_RAPIDASH,
         .moves = {MOVE_OVERHEAT, MOVE_DOUBLE_EDGE, MOVE_IRON_TAIL, MOVE_DOUBLE_KICK},
         .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_DOCILE
     },
-    [708] = {
+    [FRONTIER_MON_MUK_4] = {
         .species = SPECIES_MUK,
         .moves = {MOVE_SLUDGE_BOMB, MOVE_BRICK_BREAK, MOVE_GIGA_DRAIN, MOVE_EXPLOSION},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_BRAVE
     },
-    [709] = {
+    [FRONTIER_MON_GENGAR_4] = {
         .species = SPECIES_GENGAR,
         .moves = {MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_DESTINY_BOND},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [710] = {
+    [FRONTIER_MON_AMPHAROS_4] = {
         .species = SPECIES_AMPHAROS,
         .moves = {MOVE_THUNDERBOLT, MOVE_FIRE_PUNCH, MOVE_THUNDER_WAVE, MOVE_REFLECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_MODEST
     },
-    [711] = {
+    [FRONTIER_MON_SCIZOR_4] = {
         .species = SPECIES_SCIZOR,
         .moves = {MOVE_SILVER_WIND, MOVE_SWORDS_DANCE, MOVE_AGILITY, MOVE_BATON_PASS},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_CAREFUL
     },
-    [712] = {
+    [FRONTIER_MON_HERACROSS_4] = {
         .species = SPECIES_HERACROSS,
         .moves = {MOVE_MEGAHORN, MOVE_EARTHQUAKE, MOVE_REVERSAL, MOVE_ENDURE},
         .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [713] = {
+    [FRONTIER_MON_URSARING_4] = {
         .species = SPECIES_URSARING,
         .moves = {MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_AERIAL_ACE},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [714] = {
+    [FRONTIER_MON_HOUNDOOM_4] = {
         .species = SPECIES_HOUNDOOM,
         .moves = {MOVE_OVERHEAT, MOVE_SOLAR_BEAM, MOVE_CRUNCH, MOVE_SUNNY_DAY},
         .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [715] = {
+    [FRONTIER_MON_DONPHAN_4] = {
         .species = SPECIES_DONPHAN,
         .moves = {MOVE_FISSURE, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_IRON_TAIL},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [716] = {
+    [FRONTIER_MON_CLAYDOL_4] = {
         .species = SPECIES_CLAYDOL,
         .moves = {MOVE_PSYCHIC, MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_EXPLOSION},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [717] = {
+    [FRONTIER_MON_WAILORD_4] = {
         .species = SPECIES_WAILORD,
         .moves = {MOVE_SURF, MOVE_ICE_BEAM, MOVE_EARTHQUAKE, MOVE_FISSURE},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_HARDY
     },
-    [718] = {
+    [FRONTIER_MON_NINETALES_4] = {
         .species = SPECIES_NINETALES,
         .moves = {MOVE_OVERHEAT, MOVE_DOUBLE_EDGE, MOVE_CONFUSE_RAY, MOVE_WILL_O_WISP},
         .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_QUIRKY
     },
-    [719] = {
+    [FRONTIER_MON_MACHAMP_4] = {
         .species = SPECIES_MACHAMP,
         .moves = {MOVE_CROSS_CHOP, MOVE_EARTHQUAKE, MOVE_FLAMETHROWER, MOVE_ROCK_SLIDE},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_HARDY
     },
-    [720] = {
+    [FRONTIER_MON_SHUCKLE_4] = {
         .species = SPECIES_SHUCKLE,
         .moves = {MOVE_TOXIC, MOVE_DOUBLE_TEAM, MOVE_WRAP, MOVE_REST},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_CAREFUL
     },
-    [721] = {
+    [FRONTIER_MON_STEELIX_4] = {
         .species = SPECIES_STEELIX,
         .moves = {MOVE_EARTHQUAKE, MOVE_IRON_TAIL, MOVE_DOUBLE_EDGE, MOVE_EXPLOSION},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [722] = {
+    [FRONTIER_MON_TENTACRUEL_4] = {
         .species = SPECIES_TENTACRUEL,
         .moves = {MOVE_HYDRO_PUMP, MOVE_SLUDGE_BOMB, MOVE_ICE_BEAM, MOVE_MIRROR_COAT},
         .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_QUIRKY
     },
-    [723] = {
+    [FRONTIER_MON_AERODACTYL_4] = {
         .species = SPECIES_AERODACTYL,
         .moves = {MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_FIRE_BLAST, MOVE_BITE},
         .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_HARDY
     },
-    [724] = {
+    [FRONTIER_MON_PORYGON2_4] = {
         .species = SPECIES_PORYGON2,
         .moves = {MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_RECOVER},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_MODEST
     },
-    [725] = {
+    [FRONTIER_MON_GARDEVOIR_4] = {
         .species = SPECIES_GARDEVOIR,
         .moves = {MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_ICE_PUNCH, MOVE_FIRE_PUNCH},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [726] = {
+    [FRONTIER_MON_EXEGGUTOR_4] = {
         .species = SPECIES_EXEGGUTOR,
         .moves = {MOVE_PSYCHIC, MOVE_GIGA_DRAIN, MOVE_SLUDGE_BOMB, MOVE_EXPLOSION},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_HARDY
     },
-    [727] = {
+    [FRONTIER_MON_STARMIE_4] = {
         .species = SPECIES_STARMIE,
         .moves = {MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_RECOVER},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [728] = {
+    [FRONTIER_MON_FLYGON_4] = {
         .species = SPECIES_FLYGON,
         .moves = {MOVE_EARTHQUAKE, MOVE_DRAGON_CLAW, MOVE_DOUBLE_EDGE, MOVE_CRUNCH},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_HARDY
     },
-    [729] = {
+    [FRONTIER_MON_VENUSAUR_4] = {
         .species = SPECIES_VENUSAUR,
         .moves = {MOVE_SOLAR_BEAM, MOVE_SLUDGE_BOMB, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_DOCILE
     },
-    [730] = {
+    [FRONTIER_MON_VAPOREON_4] = {
         .species = SPECIES_VAPOREON,
         .moves = {MOVE_SURF, MOVE_ICE_BEAM, MOVE_ACID_ARMOR, MOVE_REST},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_CALM
     },
-    [731] = {
+    [FRONTIER_MON_JOLTEON_4] = {
         .species = SPECIES_JOLTEON,
         .moves = {MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_BITE, MOVE_SHADOW_BALL},
         .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_TIMID
     },
-    [732] = {
+    [FRONTIER_MON_FLAREON_4] = {
         .species = SPECIES_FLAREON,
         .moves = {MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_DOUBLE_EDGE, MOVE_SHADOW_BALL},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_QUIET
     },
-    [733] = {
+    [FRONTIER_MON_MEGANIUM_4] = {
         .species = SPECIES_MEGANIUM,
         .moves = {MOVE_GIGA_DRAIN, MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_BODY_SLAM},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_HARDY
     },
-    [734] = {
+    [FRONTIER_MON_ESPEON_4] = {
         .species = SPECIES_ESPEON,
         .moves = {MOVE_PSYCHIC, MOVE_BITE, MOVE_ATTRACT, MOVE_CALM_MIND},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [735] = {
+    [FRONTIER_MON_UMBREON_4] = {
         .species = SPECIES_UMBREON,
         .moves = {MOVE_CONFUSE_RAY, MOVE_TOXIC, MOVE_FAINT_ATTACK, MOVE_DOUBLE_TEAM},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_BOLD
     },
-    [736] = {
+    [FRONTIER_MON_BLASTOISE_4] = {
         .species = SPECIES_BLASTOISE,
         .moves = {MOVE_SURF, MOVE_EARTHQUAKE, MOVE_ICE_BEAM, MOVE_MIRROR_COAT},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [737] = {
+    [FRONTIER_MON_FERALIGATR_4] = {
         .species = SPECIES_FERALIGATR,
         .moves = {MOVE_HYDRO_PUMP, MOVE_ICE_BEAM, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_HARDY
     },
-    [738] = {
+    [FRONTIER_MON_AGGRON_4] = {
         .species = SPECIES_AGGRON,
         .moves = {MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_AERIAL_ACE},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [739] = {
+    [FRONTIER_MON_BLAZIKEN_4] = {
         .species = SPECIES_BLAZIKEN,
         .moves = {MOVE_OVERHEAT, MOVE_EARTHQUAKE, MOVE_THUNDER_PUNCH, MOVE_ROCK_SLIDE},
         .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_HARDY
     },
-    [740] = {
+    [FRONTIER_MON_WALREIN_4] = {
         .species = SPECIES_WALREIN,
         .moves = {MOVE_SURF, MOVE_ICE_BEAM, MOVE_EARTHQUAKE, MOVE_SHEER_COLD},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_QUIET
     },
-    [741] = {
+    [FRONTIER_MON_SCEPTILE_4] = {
         .species = SPECIES_SCEPTILE,
         .moves = {MOVE_LEAF_BLADE, MOVE_DRAGON_CLAW, MOVE_CRUNCH, MOVE_THUNDER_PUNCH},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [742] = {
+    [FRONTIER_MON_CHARIZARD_4] = {
         .species = SPECIES_CHARIZARD,
         .moves = {MOVE_OVERHEAT, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE, MOVE_ROCK_SLIDE},
         .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_HARDY
     },
-    [743] = {
+    [FRONTIER_MON_TYPHLOSION_4] = {
         .species = SPECIES_TYPHLOSION,
         .moves = {MOVE_OVERHEAT, MOVE_THUNDER_PUNCH, MOVE_EARTHQUAKE, MOVE_CRUSH_CLAW},
         .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_HARDY
     },
-    [744] = {
+    [FRONTIER_MON_LAPRAS_4] = {
         .species = SPECIES_LAPRAS,
         .moves = {MOVE_SURF, MOVE_ICE_BEAM, MOVE_THUNDERBOLT, MOVE_PSYCHIC},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_MODEST
     },
-    [745] = {
+    [FRONTIER_MON_CROBAT_4] = {
         .species = SPECIES_CROBAT,
         .moves = {MOVE_SLUDGE_BOMB, MOVE_AERIAL_ACE, MOVE_SHADOW_BALL, MOVE_CONFUSE_RAY},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [746] = {
+    [FRONTIER_MON_SWAMPERT_4] = {
         .species = SPECIES_SWAMPERT,
         .moves = {MOVE_SURF, MOVE_EARTHQUAKE, MOVE_ICE_BEAM, MOVE_MIRROR_COAT},
         .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_QUIET
     },
-    [747] = {
+    [FRONTIER_MON_GYARADOS_4] = {
         .species = SPECIES_GYARADOS,
         .moves = {MOVE_RETURN, MOVE_EARTHQUAKE, MOVE_DRAGON_DANCE, MOVE_REST},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [748] = {
+    [FRONTIER_MON_SNORLAX_4] = {
         .species = SPECIES_SNORLAX,
         .moves = {MOVE_DOUBLE_EDGE, MOVE_SHADOW_BALL, MOVE_BRICK_BREAK, MOVE_CURSE},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [749] = {
+    [FRONTIER_MON_KINGDRA_4] = {
         .species = SPECIES_KINGDRA,
         .moves = {MOVE_DOUBLE_EDGE, MOVE_ICE_BEAM, MOVE_DRAGON_DANCE, MOVE_REST},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_HARDY
     },
-    [750] = {
+    [FRONTIER_MON_BLISSEY_4] = {
         .species = SPECIES_BLISSEY,
         .moves = {MOVE_ICE_BEAM, MOVE_CALM_MIND, MOVE_COUNTER, MOVE_SOFT_BOILED},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_BOLD
     },
-    [751] = {
+    [FRONTIER_MON_MILOTIC_4] = {
         .species = SPECIES_MILOTIC,
         .moves = {MOVE_SURF, MOVE_ICE_BEAM, MOVE_RECOVER, MOVE_MIRROR_COAT},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_MODEST
     },
-    [752] = {
+    [FRONTIER_MON_ARCANINE_4] = {
         .species = SPECIES_ARCANINE,
         .moves = {MOVE_OVERHEAT, MOVE_EXTREME_SPEED, MOVE_CRUNCH, MOVE_DOUBLE_EDGE},
         .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_DOCILE
     },
-    [753] = {
+    [FRONTIER_MON_SALAMENCE_4] = {
         .species = SPECIES_SALAMENCE,
         .moves = {MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE, MOVE_DRAGON_DANCE},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [754] = {
+    [FRONTIER_MON_METAGROSS_4] = {
         .species = SPECIES_METAGROSS,
         .moves = {MOVE_METEOR_MASH, MOVE_PSYCHIC, MOVE_EARTHQUAKE, MOVE_SHADOW_BALL},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_HARDY
     },
-    [755] = {
+    [FRONTIER_MON_SLAKING_4] = {
         .species = SPECIES_SLAKING,
         .moves = {MOVE_THUNDERBOLT, MOVE_FLAMETHROWER, MOVE_ICE_BEAM, MOVE_YAWN},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK,
         .nature = NATURE_MODEST
     },
-    [756] = {
+    [FRONTIER_MON_ARTICUNO_1] = {
         .species = SPECIES_ARTICUNO,
         .moves = {MOVE_ICE_BEAM, MOVE_WATER_PULSE, MOVE_ICY_WIND, MOVE_ROAR},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [757] = {
+    [FRONTIER_MON_ZAPDOS_1] = {
         .species = SPECIES_ZAPDOS,
         .moves = {MOVE_THUNDERBOLT, MOVE_DRILL_PECK, MOVE_THUNDER_WAVE, MOVE_ROAR},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_DOCILE
     },
-    [758] = {
+    [FRONTIER_MON_MOLTRES_1] = {
         .species = SPECIES_MOLTRES,
         .moves = {MOVE_FLAMETHROWER, MOVE_AERIAL_ACE, MOVE_MUD_SLAP, MOVE_ROAR},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_DOCILE
     },
-    [759] = {
+    [FRONTIER_MON_RAIKOU_1] = {
         .species = SPECIES_RAIKOU,
         .moves = {MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_CALM_MIND, MOVE_REST},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [760] = {
+    [FRONTIER_MON_ENTEI_1] = {
         .species = SPECIES_ENTEI,
         .moves = {MOVE_FLAMETHROWER, MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_REST},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [761] = {
+    [FRONTIER_MON_SUICUNE_1] = {
         .species = SPECIES_SUICUNE,
         .moves = {MOVE_SURF, MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_REST},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [762] = {
+    [FRONTIER_MON_REGIROCK_1] = {
         .species = SPECIES_REGIROCK,
         .moves = {MOVE_SUPERPOWER, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_EXPLOSION},
         .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [763] = {
+    [FRONTIER_MON_REGICE_1] = {
         .species = SPECIES_REGICE,
         .moves = {MOVE_ICE_BEAM, MOVE_THUNDERBOLT, MOVE_AMNESIA, MOVE_REST},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_MODEST
     },
-    [764] = {
+    [FRONTIER_MON_REGISTEEL_1] = {
         .species = SPECIES_REGISTEEL,
         .moves = {MOVE_METAL_CLAW, MOVE_CURSE, MOVE_AMNESIA, MOVE_REST},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [765] = {
+    [FRONTIER_MON_LATIAS_1] = {
         .species = SPECIES_LATIAS,
         .moves = {MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_DRAGON_CLAW},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_MODEST
     },
-    [766] = {
+    [FRONTIER_MON_LATIOS_1] = {
         .species = SPECIES_LATIOS,
         .moves = {MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_DRAGON_CLAW},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_MODEST
     },
-    [767] = {
+    [FRONTIER_MON_ARTICUNO_2] = {
         .species = SPECIES_ARTICUNO,
         .moves = {MOVE_SUBSTITUTE, MOVE_TOXIC, MOVE_BLIZZARD, MOVE_DOUBLE_TEAM},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_IMPISH
     },
-    [768] = {
+    [FRONTIER_MON_ZAPDOS_2] = {
         .species = SPECIES_ZAPDOS,
         .moves = {MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_DRILL_PECK, MOVE_DOUBLE_TEAM},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_DOCILE
     },
-    [769] = {
+    [FRONTIER_MON_MOLTRES_2] = {
         .species = SPECIES_MOLTRES,
         .moves = {MOVE_OVERHEAT, MOVE_AERIAL_ACE, MOVE_DOUBLE_TEAM, MOVE_PROTECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_HARDY
     },
-    [770] = {
+    [FRONTIER_MON_RAIKOU_2] = {
         .species = SPECIES_RAIKOU,
         .moves = {MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_DOUBLE_TEAM, MOVE_REFLECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [771] = {
+    [FRONTIER_MON_ENTEI_2] = {
         .species = SPECIES_ENTEI,
         .moves = {MOVE_FIRE_BLAST, MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_REFLECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [772] = {
+    [FRONTIER_MON_SUICUNE_2] = {
         .species = SPECIES_SUICUNE,
         .moves = {MOVE_TOXIC, MOVE_DIVE, MOVE_DOUBLE_TEAM, MOVE_PROTECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_CALM
     },
-    [773] = {
+    [FRONTIER_MON_REGIROCK_2] = {
         .species = SPECIES_REGIROCK,
         .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_COUNTER, MOVE_EXPLOSION},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [774] = {
+    [FRONTIER_MON_REGICE_2] = {
         .species = SPECIES_REGICE,
         .moves = {MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_BLIZZARD, MOVE_BRICK_BREAK},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_QUIET
     },
-    [775] = {
+    [FRONTIER_MON_REGISTEEL_2] = {
         .species = SPECIES_REGISTEEL,
         .moves = {MOVE_THUNDERBOLT, MOVE_ICE_PUNCH, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_QUIET
     },
-    [776] = {
+    [FRONTIER_MON_LATIAS_2] = {
         .species = SPECIES_LATIAS,
         .moves = {MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_EARTHQUAKE},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_DOCILE
     },
-    [777] = {
+    [FRONTIER_MON_LATIOS_2] = {
         .species = SPECIES_LATIOS,
         .moves = {MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_EARTHQUAKE},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_DOCILE
     },
-    [778] = {
+    [FRONTIER_MON_ARTICUNO_3] = {
         .species = SPECIES_ARTICUNO,
         .moves = {MOVE_ICE_BEAM, MOVE_FACADE, MOVE_AERIAL_ACE, MOVE_PROTECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_DOCILE
     },
-    [779] = {
+    [FRONTIER_MON_ZAPDOS_3] = {
         .species = SPECIES_ZAPDOS,
         .moves = {MOVE_THUNDERBOLT, MOVE_DRILL_PECK, MOVE_THUNDER_WAVE, MOVE_SUBSTITUTE},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_DOCILE
     },
-    [780] = {
+    [FRONTIER_MON_MOLTRES_3] = {
         .species = SPECIES_MOLTRES,
         .moves = {MOVE_FIRE_BLAST, MOVE_SUNNY_DAY, MOVE_DOUBLE_TEAM, MOVE_REST},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [781] = {
+    [FRONTIER_MON_RAIKOU_3] = {
         .species = SPECIES_RAIKOU,
         .moves = {MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_QUICK_ATTACK, MOVE_ROAR},
         .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [782] = {
+    [FRONTIER_MON_ENTEI_3] = {
         .species = SPECIES_ENTEI,
         .moves = {MOVE_FLAMETHROWER, MOVE_DOUBLE_EDGE, MOVE_SWAGGER, MOVE_PSYCH_UP},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_DOCILE
     },
-    [783] = {
+    [FRONTIER_MON_SUICUNE_3] = {
         .species = SPECIES_SUICUNE,
         .moves = {MOVE_SURF, MOVE_ICE_BEAM, MOVE_RAIN_DANCE, MOVE_ROAR},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [784] = {
+    [FRONTIER_MON_REGIROCK_3] = {
         .species = SPECIES_REGIROCK,
         .moves = {MOVE_ROCK_SLIDE, MOVE_EARTHQUAKE, MOVE_CURSE, MOVE_REST},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [785] = {
+    [FRONTIER_MON_REGICE_3] = {
         .species = SPECIES_REGICE,
         .moves = {MOVE_ICE_BEAM, MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_EXPLOSION},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_QUIET
     },
-    [786] = {
+    [FRONTIER_MON_REGISTEEL_3] = {
         .species = SPECIES_REGISTEEL,
         .moves = {MOVE_ANCIENT_POWER, MOVE_AMNESIA, MOVE_COUNTER, MOVE_EXPLOSION},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [787] = {
+    [FRONTIER_MON_LATIAS_3] = {
         .species = SPECIES_LATIAS,
         .moves = {MOVE_DRAGON_CLAW, MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_EARTHQUAKE},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_DOCILE
     },
-    [788] = {
+    [FRONTIER_MON_LATIOS_3] = {
         .species = SPECIES_LATIOS,
         .moves = {MOVE_DRAGON_CLAW, MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_EARTHQUAKE},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_DOCILE
     },
-    [789] = {
+    [FRONTIER_MON_ARTICUNO_4] = {
         .species = SPECIES_ARTICUNO,
         .moves = {MOVE_BLIZZARD, MOVE_DOUBLE_EDGE, MOVE_REST, MOVE_REFLECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_DOCILE
     },
-    [790] = {
+    [FRONTIER_MON_ZAPDOS_4] = {
         .species = SPECIES_ZAPDOS,
         .moves = {MOVE_THUNDERBOLT, MOVE_DRILL_PECK, MOVE_THUNDER_WAVE, MOVE_LIGHT_SCREEN},
         .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_DOCILE
     },
-    [791] = {
+    [FRONTIER_MON_MOLTRES_4] = {
         .species = SPECIES_MOLTRES,
         .moves = {MOVE_OVERHEAT, MOVE_DOUBLE_EDGE, MOVE_STEEL_WING, MOVE_SAFEGUARD},
         .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_QUIET
     },
-    [792] = {
+    [FRONTIER_MON_RAIKOU_4] = {
         .species = SPECIES_RAIKOU,
         .moves = {MOVE_THUNDERBOLT, MOVE_BITE, MOVE_THUNDER_WAVE, MOVE_REFLECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [793] = {
+    [FRONTIER_MON_ENTEI_4] = {
         .species = SPECIES_ENTEI,
         .moves = {MOVE_FLAMETHROWER, MOVE_BITE, MOVE_DOUBLE_TEAM, MOVE_REFLECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [794] = {
+    [FRONTIER_MON_SUICUNE_4] = {
         .species = SPECIES_SUICUNE,
         .moves = {MOVE_SURF, MOVE_ICE_BEAM, MOVE_BITE, MOVE_REFLECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [795] = {
+    [FRONTIER_MON_REGIROCK_4] = {
         .species = SPECIES_REGIROCK,
         .moves = {MOVE_ROCK_SLIDE, MOVE_BRICK_BREAK, MOVE_DOUBLE_TEAM, MOVE_THUNDER_WAVE},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_CAREFUL
     },
-    [796] = {
+    [FRONTIER_MON_REGICE_4] = {
         .species = SPECIES_REGICE,
         .moves = {MOVE_ICE_BEAM, MOVE_HAIL, MOVE_DOUBLE_TEAM, MOVE_THUNDER_WAVE},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_BOLD
     },
-    [797] = {
+    [FRONTIER_MON_REGISTEEL_4] = {
         .species = SPECIES_REGISTEEL,
         .moves = {MOVE_ANCIENT_POWER, MOVE_EARTHQUAKE, MOVE_DOUBLE_TEAM, MOVE_THUNDER_WAVE},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_IMPISH
     },
-    [798] = {
+    [FRONTIER_MON_LATIAS_4] = {
         .species = SPECIES_LATIAS,
         .moves = {MOVE_MIST_BALL, MOVE_SHADOW_BALL, MOVE_CHARM, MOVE_REFLECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [799] = {
+    [FRONTIER_MON_LATIOS_4] = {
         .species = SPECIES_LATIOS,
         .moves = {MOVE_LUSTER_PURGE, MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_DRAGON_CLAW},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_MODEST
     },
-    [800] = {
+    [FRONTIER_MON_GENGAR_5] = {
         .species = SPECIES_GENGAR,
         .moves = {MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_THUNDERBOLT, MOVE_FIRE_PUNCH},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [801] = {
+    [FRONTIER_MON_GENGAR_6] = {
         .species = SPECIES_GENGAR,
         .moves = {MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_THUNDERBOLT, MOVE_ICE_PUNCH},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [802] = {
+    [FRONTIER_MON_GENGAR_7] = {
         .species = SPECIES_GENGAR,
         .moves = {MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_FIRE_PUNCH, MOVE_DESTINY_BOND},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [803] = {
+    [FRONTIER_MON_GENGAR_8] = {
         .species = SPECIES_GENGAR,
         .moves = {MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_ICE_PUNCH, MOVE_DESTINY_BOND},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [804] = {
+    [FRONTIER_MON_URSARING_5] = {
         .species = SPECIES_URSARING,
         .moves = {MOVE_MEGA_KICK, MOVE_AERIAL_ACE, MOVE_ROCK_SLIDE, MOVE_BRICK_BREAK},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [805] = {
+    [FRONTIER_MON_URSARING_6] = {
         .species = SPECIES_URSARING,
         .moves = {MOVE_HYPER_BEAM, MOVE_YAWN, MOVE_SWORDS_DANCE, MOVE_DOUBLE_TEAM},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [806] = {
+    [FRONTIER_MON_URSARING_7] = {
         .species = SPECIES_URSARING,
         .moves = {MOVE_FACADE, MOVE_EARTHQUAKE, MOVE_CRUNCH, MOVE_BULK_UP},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [807] = {
+    [FRONTIER_MON_URSARING_8] = {
         .species = SPECIES_URSARING,
         .moves = {MOVE_FACADE, MOVE_EARTHQUAKE, MOVE_CRUNCH, MOVE_BRICK_BREAK},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [808] = {
+    [FRONTIER_MON_MACHAMP_5] = {
         .species = SPECIES_MACHAMP,
         .moves = {MOVE_CROSS_CHOP, MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [809] = {
+    [FRONTIER_MON_MACHAMP_6] = {
         .species = SPECIES_MACHAMP,
         .moves = {MOVE_CROSS_CHOP, MOVE_EARTHQUAKE, MOVE_COUNTER, MOVE_ROCK_TOMB},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [810] = {
+    [FRONTIER_MON_MACHAMP_7] = {
         .species = SPECIES_MACHAMP,
         .moves = {MOVE_FOCUS_PUNCH, MOVE_SUBSTITUTE, MOVE_ATTRACT, MOVE_DOUBLE_TEAM},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [811] = {
+    [FRONTIER_MON_MACHAMP_8] = {
         .species = SPECIES_MACHAMP,
         .moves = {MOVE_REVENGE, MOVE_ROCK_SLIDE, MOVE_FACADE, MOVE_COUNTER},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [812] = {
+    [FRONTIER_MON_GARDEVOIR_5] = {
         .species = SPECIES_GARDEVOIR,
         .moves = {MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_ENDURE, MOVE_DESTINY_BOND},
         .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [813] = {
+    [FRONTIER_MON_GARDEVOIR_6] = {
         .species = SPECIES_GARDEVOIR,
         .moves = {MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_WILL_O_WISP, MOVE_DESTINY_BOND},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP,
         .nature = NATURE_TIMID
     },
-    [814] = {
+    [FRONTIER_MON_GARDEVOIR_7] = {
         .species = SPECIES_GARDEVOIR,
         .moves = {MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_WILL_O_WISP, MOVE_DESTINY_BOND},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_BOLD
     },
-    [815] = {
+    [FRONTIER_MON_GARDEVOIR_8] = {
         .species = SPECIES_GARDEVOIR,
         .moves = {MOVE_PSYCHIC, MOVE_MAGICAL_LEAF, MOVE_ATTRACT, MOVE_DOUBLE_TEAM},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [816] = {
+    [FRONTIER_MON_STARMIE_5] = {
         .species = SPECIES_STARMIE,
         .moves = {MOVE_SURF, MOVE_PSYCHIC, MOVE_RECOVER, MOVE_LIGHT_SCREEN},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [817] = {
+    [FRONTIER_MON_STARMIE_6] = {
         .species = SPECIES_STARMIE,
         .moves = {MOVE_SURF, MOVE_CONFUSE_RAY, MOVE_THUNDER_WAVE, MOVE_RECOVER},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_CALM
     },
-    [818] = {
+    [FRONTIER_MON_STARMIE_7] = {
         .species = SPECIES_STARMIE,
         .moves = {MOVE_PSYCHIC, MOVE_ICE_BEAM, MOVE_COSMIC_POWER, MOVE_RECOVER},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [819] = {
+    [FRONTIER_MON_STARMIE_8] = {
         .species = SPECIES_STARMIE,
         .moves = {MOVE_SURF, MOVE_THUNDERBOLT, MOVE_COSMIC_POWER, MOVE_RECOVER},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [820] = {
+    [FRONTIER_MON_LAPRAS_5] = {
         .species = SPECIES_LAPRAS,
         .moves = {MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_IRON_TAIL, MOVE_DOUBLE_EDGE},
         .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_DOCILE
     },
-    [821] = {
+    [FRONTIER_MON_LAPRAS_6] = {
         .species = SPECIES_LAPRAS,
         .moves = {MOVE_HYDRO_PUMP, MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_BLIZZARD},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_MODEST
     },
-    [822] = {
+    [FRONTIER_MON_LAPRAS_7] = {
         .species = SPECIES_LAPRAS,
         .moves = {MOVE_SHEER_COLD, MOVE_HORN_DRILL, MOVE_REST, MOVE_SLEEP_TALK},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEPPA_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_CALM
     },
-    [823] = {
+    [FRONTIER_MON_LAPRAS_8] = {
         .species = SPECIES_LAPRAS,
         .moves = {MOVE_SHEER_COLD, MOVE_HORN_DRILL, MOVE_SING, MOVE_ATTRACT},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_CALM
     },
-    [824] = {
+    [FRONTIER_MON_SNORLAX_5] = {
         .species = SPECIES_SNORLAX,
         .moves = {MOVE_MEGA_KICK, MOVE_SHADOW_BALL, MOVE_BRICK_BREAK, MOVE_COUNTER},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [825] = {
+    [FRONTIER_MON_SNORLAX_6] = {
         .species = SPECIES_SNORLAX,
         .moves = {MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_BRICK_BREAK, MOVE_COUNTER},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [826] = {
+    [FRONTIER_MON_SNORLAX_7] = {
         .species = SPECIES_SNORLAX,
         .moves = {MOVE_HYPER_BEAM, MOVE_SHADOW_BALL, MOVE_EARTHQUAKE, MOVE_CURSE},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [827] = {
+    [FRONTIER_MON_SNORLAX_8] = {
         .species = SPECIES_SNORLAX,
         .moves = {MOVE_RETURN, MOVE_SHADOW_BALL, MOVE_BELLY_DRUM, MOVE_REST},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [828] = {
+    [FRONTIER_MON_SALAMENCE_5] = {
         .species = SPECIES_SALAMENCE,
         .moves = {MOVE_FACADE, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_DRAGON_DANCE},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [829] = {
+    [FRONTIER_MON_SALAMENCE_6] = {
         .species = SPECIES_SALAMENCE,
         .moves = {MOVE_HEADBUTT, MOVE_AERIAL_ACE, MOVE_CRUNCH, MOVE_DRAGON_DANCE},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_HARDY
     },
-    [830] = {
+    [FRONTIER_MON_SALAMENCE_7] = {
         .species = SPECIES_SALAMENCE,
         .moves = {MOVE_FLAMETHROWER, MOVE_DRAGON_CLAW, MOVE_CRUNCH, MOVE_BRICK_BREAK},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [831] = {
+    [FRONTIER_MON_SALAMENCE_8] = {
         .species = SPECIES_SALAMENCE,
         .moves = {MOVE_FLAMETHROWER, MOVE_DRAGON_CLAW, MOVE_CRUNCH, MOVE_ATTRACT},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [832] = {
+    [FRONTIER_MON_METAGROSS_5] = {
         .species = SPECIES_METAGROSS,
         .moves = {MOVE_EXPLOSION, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_BRICK_BREAK},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_JOLLY
     },
-    [833] = {
+    [FRONTIER_MON_METAGROSS_6] = {
         .species = SPECIES_METAGROSS,
         .moves = {MOVE_METEOR_MASH, MOVE_PSYCHIC, MOVE_ICE_PUNCH, MOVE_THUNDER_PUNCH},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_HARDY
     },
-    [834] = {
+    [FRONTIER_MON_METAGROSS_7] = {
         .species = SPECIES_METAGROSS,
         .moves = {MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_ICE_PUNCH, MOVE_THUNDER_PUNCH},
         .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_HARDY
     },
-    [835] = {
+    [FRONTIER_MON_METAGROSS_8] = {
         .species = SPECIES_METAGROSS,
         .moves = {MOVE_METEOR_MASH, MOVE_EARTHQUAKE, MOVE_BRICK_BREAK, MOVE_EXPLOSION},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [836] = {
+    [FRONTIER_MON_REGIROCK_5] = {
         .species = SPECIES_REGIROCK,
         .moves = {MOVE_HYPER_BEAM, MOVE_FOCUS_PUNCH, MOVE_ROCK_SLIDE, MOVE_DOUBLE_TEAM},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [837] = {
+    [FRONTIER_MON_REGIROCK_6] = {
         .species = SPECIES_REGIROCK,
         .moves = {MOVE_SWAGGER, MOVE_PSYCH_UP, MOVE_ROCK_SLIDE, MOVE_EXPLOSION},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [838] = {
+    [FRONTIER_MON_REGICE_5] = {
         .species = SPECIES_REGICE,
         .moves = {MOVE_EARTHQUAKE, MOVE_ICE_BEAM, MOVE_CURSE, MOVE_COUNTER},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_BRAVE
     },
-    [839] = {
+    [FRONTIER_MON_REGICE_6] = {
         .species = SPECIES_REGICE,
         .moves = {MOVE_ICE_BEAM, MOVE_THUNDERBOLT, MOVE_SLEEP_TALK, MOVE_REST},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_MODEST
     },
-    [840] = {
+    [FRONTIER_MON_REGISTEEL_5] = {
         .species = SPECIES_REGISTEEL,
         .moves = {MOVE_FOCUS_PUNCH, MOVE_SUBSTITUTE, MOVE_TOXIC, MOVE_DOUBLE_TEAM},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [841] = {
+    [FRONTIER_MON_REGISTEEL_6] = {
         .species = SPECIES_REGISTEEL,
         .moves = {MOVE_SUPERPOWER, MOVE_AERIAL_ACE, MOVE_SWAGGER, MOVE_PSYCH_UP},
         .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [842] = {
+    [FRONTIER_MON_LATIAS_5] = {
         .species = SPECIES_LATIAS,
         .moves = {MOVE_DRAGON_CLAW, MOVE_THUNDER_WAVE, MOVE_CALM_MIND, MOVE_RECOVER},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_MODEST
     },
-    [843] = {
+    [FRONTIER_MON_LATIAS_6] = {
         .species = SPECIES_LATIAS,
         .moves = {MOVE_MIST_BALL, MOVE_DRAGON_CLAW, MOVE_ATTRACT, MOVE_THUNDER_WAVE},
         .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_MODEST
     },
-    [844] = {
+    [FRONTIER_MON_LATIAS_7] = {
         .species = SPECIES_LATIAS,
         .moves = {MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_SWAGGER, MOVE_PSYCH_UP},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [845] = {
+    [FRONTIER_MON_LATIAS_8] = {
         .species = SPECIES_LATIAS,
         .moves = {MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE},
         .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_DOCILE
     },
-    [846] = {
+    [FRONTIER_MON_LATIOS_5] = {
         .species = SPECIES_LATIOS,
         .moves = {MOVE_DRAGON_CLAW, MOVE_THUNDER_WAVE, MOVE_CALM_MIND, MOVE_RECOVER},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_MODEST
     },
-    [847] = {
+    [FRONTIER_MON_LATIOS_6] = {
         .species = SPECIES_LATIOS,
         .moves = {MOVE_LUSTER_PURGE, MOVE_SHADOW_BALL, MOVE_DRAGON_CLAW, MOVE_THUNDER_WAVE},
         .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_DOCILE
     },
-    [848] = {
+    [FRONTIER_MON_LATIOS_7] = {
         .species = SPECIES_LATIOS,
         .moves = {MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_DRAGON_DANCE, MOVE_RECOVER},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [849] = {
+    [FRONTIER_MON_LATIOS_8] = {
         .species = SPECIES_LATIOS,
         .moves = {MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE},
         .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_DOCILE
     },
-    [850] = {
+    [FRONTIER_MON_DRAGONITE_1] = {
         .species = SPECIES_DRAGONITE,
         .moves = {MOVE_EARTHQUAKE, MOVE_AERIAL_ACE, MOVE_BRICK_BREAK, MOVE_DRAGON_DANCE},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [851] = {
+    [FRONTIER_MON_DRAGONITE_2] = {
         .species = SPECIES_DRAGONITE,
         .moves = {MOVE_EARTHQUAKE, MOVE_DOUBLE_EDGE, MOVE_AERIAL_ACE, MOVE_DRAGON_DANCE},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [852] = {
+    [FRONTIER_MON_DRAGONITE_3] = {
         .species = SPECIES_DRAGONITE,
         .moves = {MOVE_HYPER_BEAM, MOVE_ATTRACT, MOVE_DOUBLE_TEAM, MOVE_THUNDER_WAVE},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [853] = {
+    [FRONTIER_MON_DRAGONITE_4] = {
         .species = SPECIES_DRAGONITE,
         .moves = {MOVE_HYPER_BEAM, MOVE_THUNDER_WAVE, MOVE_DRAGON_DANCE, MOVE_REST},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [854] = {
+    [FRONTIER_MON_DRAGONITE_5] = {
         .species = SPECIES_DRAGONITE,
         .moves = {MOVE_OUTRAGE, MOVE_DOUBLE_EDGE, MOVE_THUNDER_WAVE, MOVE_ROAR},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_DOCILE
     },
-    [855] = {
+    [FRONTIER_MON_DRAGONITE_6] = {
         .species = SPECIES_DRAGONITE,
         .moves = {MOVE_DRAGON_CLAW, MOVE_THUNDERBOLT, MOVE_SURF, MOVE_FLAMETHROWER},
         .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [856] = {
+    [FRONTIER_MON_DRAGONITE_7] = {
         .species = SPECIES_DRAGONITE,
         .moves = {MOVE_DRAGON_CLAW, MOVE_THUNDERBOLT, MOVE_SURF, MOVE_ICE_BEAM},
         .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [857] = {
+    [FRONTIER_MON_DRAGONITE_8] = {
         .species = SPECIES_DRAGONITE,
         .moves = {MOVE_DRAGON_CLAW, MOVE_FLAMETHROWER, MOVE_ICE_BEAM, MOVE_BRICK_BREAK},
         .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [858] = {
+    [FRONTIER_MON_DRAGONITE_9] = {
         .species = SPECIES_DRAGONITE,
         .moves = {MOVE_THUNDER, MOVE_SURF, MOVE_RAIN_DANCE, MOVE_EARTHQUAKE},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [859] = {
+    [FRONTIER_MON_DRAGONITE_10] = {
         .species = SPECIES_DRAGONITE,
         .moves = {MOVE_FIRE_BLAST, MOVE_BLIZZARD, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [860] = {
+    [FRONTIER_MON_TYRANITAR_1] = {
         .species = SPECIES_TYRANITAR,
         .moves = {MOVE_EARTHQUAKE, MOVE_AERIAL_ACE, MOVE_THUNDERBOLT, MOVE_SURF},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_HARDY
     },
-    [861] = {
+    [FRONTIER_MON_TYRANITAR_2] = {
         .species = SPECIES_TYRANITAR,
         .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_CRUNCH, MOVE_THUNDERBOLT},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_HARDY
     },
-    [862] = {
+    [FRONTIER_MON_TYRANITAR_3] = {
         .species = SPECIES_TYRANITAR,
         .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_COUNTER, MOVE_DRAGON_DANCE},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [863] = {
+    [FRONTIER_MON_TYRANITAR_4] = {
         .species = SPECIES_TYRANITAR,
         .moves = {MOVE_CRUNCH, MOVE_ICE_BEAM, MOVE_THUNDERBOLT, MOVE_FLAMETHROWER},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_MODEST
     },
-    [864] = {
+    [FRONTIER_MON_TYRANITAR_5] = {
         .species = SPECIES_TYRANITAR,
         .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_DRAGON_DANCE, MOVE_REST},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [865] = {
+    [FRONTIER_MON_TYRANITAR_6] = {
         .species = SPECIES_TYRANITAR,
         .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_CURSE, MOVE_REST},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [866] = {
+    [FRONTIER_MON_TYRANITAR_7] = {
         .species = SPECIES_TYRANITAR,
         .moves = {MOVE_ROCK_SLIDE, MOVE_AERIAL_ACE, MOVE_BRICK_BREAK, MOVE_CURSE},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [867] = {
+    [FRONTIER_MON_TYRANITAR_8] = {
         .species = SPECIES_TYRANITAR,
         .moves = {MOVE_ROCK_SLIDE, MOVE_THUNDER_WAVE, MOVE_DRAGON_DANCE, MOVE_REST},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [868] = {
+    [FRONTIER_MON_TYRANITAR_9] = {
         .species = SPECIES_TYRANITAR,
         .moves = {MOVE_CRUNCH, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE, MOVE_ATTRACT},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_HARDY
     },
-    [869] = {
+    [FRONTIER_MON_TYRANITAR_10] = {
         .species = SPECIES_TYRANITAR,
         .moves = {MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_DRAGON_DANCE},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [870] = {
+    [FRONTIER_MON_ARTICUNO_5] = {
         .species = SPECIES_ARTICUNO,
         .moves = {MOVE_BLIZZARD, MOVE_DOUBLE_EDGE, MOVE_AGILITY, MOVE_SWAGGER},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_DOCILE
     },
-    [871] = {
+    [FRONTIER_MON_ARTICUNO_6] = {
         .species = SPECIES_ARTICUNO,
         .moves = {MOVE_ICE_BEAM, MOVE_AERIAL_ACE, MOVE_REFLECT, MOVE_REST},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_DOCILE
     },
-    [872] = {
+    [FRONTIER_MON_ZAPDOS_5] = {
         .species = SPECIES_ZAPDOS,
         .moves = {MOVE_THUNDERBOLT, MOVE_DRILL_PECK, MOVE_DOUBLE_EDGE, MOVE_THUNDER_WAVE},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_DOCILE
     },
-    [873] = {
+    [FRONTIER_MON_ZAPDOS_6] = {
         .species = SPECIES_ZAPDOS,
         .moves = {MOVE_THUNDER, MOVE_DRILL_PECK, MOVE_RAIN_DANCE, MOVE_DOUBLE_EDGE},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_DOCILE
     },
-    [874] = {
+    [FRONTIER_MON_MOLTRES_5] = {
         .species = SPECIES_MOLTRES,
         .moves = {MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_SWAGGER, MOVE_FACADE},
         .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_DOCILE
     },
-    [875] = {
+    [FRONTIER_MON_MOLTRES_6] = {
         .species = SPECIES_MOLTRES,
         .moves = {MOVE_OVERHEAT, MOVE_DOUBLE_EDGE, MOVE_AERIAL_ACE, MOVE_STEEL_WING},
         .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_DOCILE
     },
-    [876] = {
+    [FRONTIER_MON_RAIKOU_5] = {
         .species = SPECIES_RAIKOU,
         .moves = {MOVE_THUNDERBOLT, MOVE_DOUBLE_EDGE, MOVE_ROAR, MOVE_REFLECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [877] = {
+    [FRONTIER_MON_RAIKOU_6] = {
         .species = SPECIES_RAIKOU,
         .moves = {MOVE_THUNDERBOLT, MOVE_CALM_MIND, MOVE_SUBSTITUTE, MOVE_REST},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_MODEST
     },
-    [878] = {
+    [FRONTIER_MON_ENTEI_5] = {
         .species = SPECIES_ENTEI,
         .moves = {MOVE_FIRE_BLAST, MOVE_DOUBLE_EDGE, MOVE_ENDURE, MOVE_REFLECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_DOCILE
     },
-    [879] = {
+    [FRONTIER_MON_ENTEI_6] = {
         .species = SPECIES_ENTEI,
         .moves = {MOVE_FLAMETHROWER, MOVE_CALM_MIND, MOVE_ROAR, MOVE_REST},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_MODEST
     },
-    [880] = {
+    [FRONTIER_MON_SUICUNE_5] = {
         .species = SPECIES_SUICUNE,
         .moves = {MOVE_SURF, MOVE_ICE_BEAM, MOVE_CALM_MIND, MOVE_ICY_WIND},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_MODEST
     },
-    [881] = {
+    [FRONTIER_MON_SUICUNE_6] = {
         .species = SPECIES_SUICUNE,
         .moves = {MOVE_SURF, MOVE_ICE_BEAM, MOVE_CALM_MIND, MOVE_REST},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY,
diff --git a/src/data/battle_frontier/battle_frontier_trainer_mons.h b/src/data/battle_frontier/battle_frontier_trainer_mons.h
index d0e21172b..183964f2d 100644
--- a/src/data/battle_frontier/battle_frontier_trainer_mons.h
+++ b/src/data/battle_frontier/battle_frontier_trainer_mons.h
@@ -1,15229 +1,7369 @@
+// Also used by early Pkmn Breeder, Collector, and Beauty trainers
+#define FRONTIER_MONS_YOUNGSTER_LASS_1 \
+    FRONTIER_MON_SUNKERN,        \
+    FRONTIER_MON_AZURILL,        \
+    FRONTIER_MON_CATERPIE,       \
+    FRONTIER_MON_WEEDLE,         \
+    FRONTIER_MON_WURMPLE,        \
+    FRONTIER_MON_RALTS,          \
+    FRONTIER_MON_MAGIKARP,       \
+    FRONTIER_MON_FEEBAS,         \
+    FRONTIER_MON_PICHU,          \
+    FRONTIER_MON_IGGLYBUFF,      \
+    FRONTIER_MON_WOOPER,         \
+    FRONTIER_MON_TYROGUE,        \
+    FRONTIER_MON_SENTRET,        \
+    FRONTIER_MON_CLEFFA,         \
+    FRONTIER_MON_SEEDOT,         \
+    FRONTIER_MON_LOTAD,          \
+    FRONTIER_MON_POOCHYENA,      \
+    FRONTIER_MON_SHEDINJA,       \
+    FRONTIER_MON_MAKUHITA,       \
+    FRONTIER_MON_WHISMUR,        \
+    FRONTIER_MON_ZIGZAGOON,      \
+    FRONTIER_MON_ZUBAT,          \
+    FRONTIER_MON_TOGEPI,         \
+    FRONTIER_MON_SPINARAK,       \
+    FRONTIER_MON_MARILL,         \
+    FRONTIER_MON_HOPPIP,         \
+    FRONTIER_MON_SLUGMA,         \
+    FRONTIER_MON_SWINUB,         \
+    FRONTIER_MON_SMEARGLE,       \
+    FRONTIER_MON_PIDGEY,         \
+    FRONTIER_MON_RATTATA,        \
+    FRONTIER_MON_WYNAUT,         \
+    FRONTIER_MON_SKITTY,         \
+    FRONTIER_MON_SPEAROW,        \
+    FRONTIER_MON_HOOTHOOT,       \
+    FRONTIER_MON_DIGLETT,        \
+    FRONTIER_MON_LEDYBA,         \
+    FRONTIER_MON_NINCADA,        \
+    FRONTIER_MON_SURSKIT,        \
+    FRONTIER_MON_JIGGLYPUFF,     \
+    FRONTIER_MON_TAILLOW,        \
+    FRONTIER_MON_WINGULL,        \
+    FRONTIER_MON_NIDORAN_M,      \
+    FRONTIER_MON_NIDORAN_F,      \
+    FRONTIER_MON_KIRLIA,         \
+    FRONTIER_MON_MAREEP,         \
+    FRONTIER_MON_MEDITITE,       \
+    FRONTIER_MON_SLAKOTH,        \
+    FRONTIER_MON_PARAS,          \
+    FRONTIER_MON_EKANS,          \
+    FRONTIER_MON_DITTO,          \
+    FRONTIER_MON_BARBOACH,       \
+    FRONTIER_MON_MEOWTH,         \
+    FRONTIER_MON_PINECO,         \
+    FRONTIER_MON_TRAPINCH,       \
+    FRONTIER_MON_SPHEAL,         \
+    FRONTIER_MON_HORSEA,         \
+    FRONTIER_MON_SHROOMISH,      \
+    FRONTIER_MON_SHUPPET,        \
+    FRONTIER_MON_DUSKULL,        \
+    FRONTIER_MON_ELECTRIKE,      \
+    FRONTIER_MON_VULPIX,         \
+    -1
+
+// Also used by early Pkmn Breeder, Collector, and Beauty trainers
+#define FRONTIER_MONS_SCHOOL_KID_1 \
+    FRONTIER_MON_PIKACHU,       \
+    FRONTIER_MON_SANDSHREW,     \
+    FRONTIER_MON_POLIWAG,       \
+    FRONTIER_MON_BELLSPROUT,    \
+    FRONTIER_MON_GEODUDE,       \
+    FRONTIER_MON_DRATINI,       \
+    FRONTIER_MON_SNUBBULL,      \
+    FRONTIER_MON_REMORAID,      \
+    FRONTIER_MON_LARVITAR,      \
+    FRONTIER_MON_BALTOY,        \
+    FRONTIER_MON_SNORUNT,       \
+    FRONTIER_MON_BAGON,         \
+    FRONTIER_MON_BELDUM,        \
+    FRONTIER_MON_GULPIN,        \
+    FRONTIER_MON_VENONAT,       \
+    FRONTIER_MON_MANKEY,        \
+    FRONTIER_MON_MACHOP,        \
+    FRONTIER_MON_SHELLDER,      \
+    FRONTIER_MON_SMOOCHUM,      \
+    FRONTIER_MON_NUMEL,         \
+    FRONTIER_MON_CARVANHA,      \
+    FRONTIER_MON_CORPHISH,      \
+    FRONTIER_MON_CHARMANDER,    \
+    FRONTIER_MON_CYNDAQUIL,     \
+    FRONTIER_MON_ABRA,          \
+    FRONTIER_MON_DODUO,         \
+    FRONTIER_MON_GASTLY,        \
+    FRONTIER_MON_SWABLU,        \
+    FRONTIER_MON_TREECKO,       \
+    FRONTIER_MON_TORCHIC,       \
+    FRONTIER_MON_MUDKIP,        \
+    FRONTIER_MON_SQUIRTLE,      \
+    FRONTIER_MON_TOTODILE,      \
+    FRONTIER_MON_SLOWPOKE,      \
+    FRONTIER_MON_BULBASAUR,     \
+    FRONTIER_MON_CHIKORITA,     \
+    FRONTIER_MON_ODDISH,        \
+    FRONTIER_MON_PSYDUCK,       \
+    FRONTIER_MON_CUBONE,        \
+    FRONTIER_MON_GOLDEEN,       \
+    FRONTIER_MON_NATU,          \
+    FRONTIER_MON_CLEFAIRY,      \
+    FRONTIER_MON_MAGNEMITE,     \
+    FRONTIER_MON_SEEL,          \
+    -1
+
+#define FRONTIER_MONS_RICH_BOY_LADY_1 \
+    FRONTIER_MON_RALTS,          \
+    FRONTIER_MON_POOCHYENA,      \
+    FRONTIER_MON_SHEDINJA,       \
+    FRONTIER_MON_ZUBAT,          \
+    FRONTIER_MON_SPINARAK,       \
+    FRONTIER_MON_WYNAUT,         \
+    FRONTIER_MON_NIDORAN_M,      \
+    FRONTIER_MON_NIDORAN_F,      \
+    FRONTIER_MON_KIRLIA,         \
+    FRONTIER_MON_MEDITITE,       \
+    FRONTIER_MON_EKANS,          \
+    FRONTIER_MON_SHUPPET,        \
+    FRONTIER_MON_DUSKULL,        \
+    FRONTIER_MON_BELLSPROUT,     \
+    FRONTIER_MON_BALTOY,         \
+    FRONTIER_MON_BELDUM,         \
+    FRONTIER_MON_GULPIN,         \
+    FRONTIER_MON_VENONAT,        \
+    FRONTIER_MON_SMOOCHUM,       \
+    FRONTIER_MON_ABRA,           \
+    FRONTIER_MON_GASTLY,         \
+    FRONTIER_MON_SLOWPOKE,       \
+    FRONTIER_MON_BULBASAUR,      \
+    FRONTIER_MON_ODDISH,         \
+    FRONTIER_MON_NATU,           \
+    FRONTIER_MON_GRIMER,         \
+    FRONTIER_MON_EXEGGCUTE,      \
+    FRONTIER_MON_DROWZEE,        \
+    FRONTIER_MON_HOUNDOUR,       \
+    FRONTIER_MON_SPOINK,         \
+    FRONTIER_MON_TENTACOOL,      \
+    FRONTIER_MON_KOFFING,        \
+    FRONTIER_MON_NIDORINA,       \
+    FRONTIER_MON_NIDORINO,       \
+    FRONTIER_MON_BEEDRILL,       \
+    FRONTIER_MON_DUSTOX,         \
+    FRONTIER_MON_ARIADOS,        \
+    -1
+
+// Also used by early Pkmn Breeder, Collector, and Beauty trainers
+#define FRONTIER_MONS_CAMPER_PICNICKER_1 \
+    FRONTIER_MON_GRIMER,        \
+    FRONTIER_MON_KRABBY,        \
+    FRONTIER_MON_EXEGGCUTE,     \
+    FRONTIER_MON_EEVEE,         \
+    FRONTIER_MON_DROWZEE,       \
+    FRONTIER_MON_VOLTORB,       \
+    FRONTIER_MON_CHINCHOU,      \
+    FRONTIER_MON_TEDDIURSA,     \
+    FRONTIER_MON_DELIBIRD,      \
+    FRONTIER_MON_HOUNDOUR,      \
+    FRONTIER_MON_PHANPY,        \
+    FRONTIER_MON_SPOINK,        \
+    FRONTIER_MON_ARON,          \
+    FRONTIER_MON_LUVDISC,       \
+    FRONTIER_MON_TENTACOOL,     \
+    FRONTIER_MON_CACNEA,        \
+    FRONTIER_MON_KOFFING,       \
+    FRONTIER_MON_STARYU,        \
+    FRONTIER_MON_SKIPLOOM,      \
+    FRONTIER_MON_NUZLEAF,       \
+    FRONTIER_MON_LOMBRE,        \
+    FRONTIER_MON_VIBRAVA,       \
+    FRONTIER_MON_RHYHORN,       \
+    FRONTIER_MON_CLAMPERL,      \
+    FRONTIER_MON_PIDGEOTTO,     \
+    FRONTIER_MON_GROWLITHE,     \
+    FRONTIER_MON_FARFETCHD,     \
+    FRONTIER_MON_OMANYTE,       \
+    FRONTIER_MON_KABUTO,        \
+    FRONTIER_MON_LILEEP,        \
+    FRONTIER_MON_ANORITH,       \
+    FRONTIER_MON_AIPOM,         \
+    FRONTIER_MON_ELEKID,        \
+    FRONTIER_MON_LOUDRED,       \
+    FRONTIER_MON_SPINDA,        \
+    FRONTIER_MON_NIDORINA,      \
+    FRONTIER_MON_NIDORINO,      \
+    FRONTIER_MON_FLAAFFY,       \
+    FRONTIER_MON_MAGBY,         \
+    FRONTIER_MON_NOSEPASS,      \
+    FRONTIER_MON_CORSOLA,       \
+    FRONTIER_MON_MAWILE,        \
+    FRONTIER_MON_BUTTERFREE,    \
+    FRONTIER_MON_BEEDRILL,      \
+    FRONTIER_MON_POLIWHIRL,     \
+    FRONTIER_MON_ONIX,          \
+    FRONTIER_MON_BEAUTIFLY,     \
+    FRONTIER_MON_DUSTOX,        \
+    FRONTIER_MON_LEDIAN,        \
+    FRONTIER_MON_ARIADOS,       \
+    FRONTIER_MON_YANMA,         \
+    -1
+
+#define FRONTIER_MONS_TUBER_1   \
+    FRONTIER_MON_RALTS,         \
+    FRONTIER_MON_MAGIKARP,      \
+    FRONTIER_MON_FEEBAS,        \
+    FRONTIER_MON_WOOPER,        \
+    FRONTIER_MON_LOTAD,         \
+    FRONTIER_MON_MARILL,        \
+    FRONTIER_MON_WYNAUT,        \
+    FRONTIER_MON_SURSKIT,       \
+    FRONTIER_MON_WINGULL,       \
+    FRONTIER_MON_KIRLIA,        \
+    FRONTIER_MON_MEDITITE,      \
+    FRONTIER_MON_BARBOACH,      \
+    FRONTIER_MON_SPHEAL,        \
+    FRONTIER_MON_HORSEA,        \
+    FRONTIER_MON_POLIWAG,       \
+    FRONTIER_MON_REMORAID,      \
+    FRONTIER_MON_SHELLDER,      \
+    FRONTIER_MON_SMOOCHUM,      \
+    FRONTIER_MON_CARVANHA,      \
+    FRONTIER_MON_CORPHISH,      \
+    FRONTIER_MON_ABRA,          \
+    FRONTIER_MON_MUDKIP,        \
+    FRONTIER_MON_SQUIRTLE,      \
+    FRONTIER_MON_TOTODILE,      \
+    FRONTIER_MON_SLOWPOKE,      \
+    FRONTIER_MON_PSYDUCK,       \
+    FRONTIER_MON_GOLDEEN,       \
+    FRONTIER_MON_NATU,          \
+    FRONTIER_MON_SEEL,          \
+    FRONTIER_MON_EXEGGCUTE,     \
+    FRONTIER_MON_DROWZEE,       \
+    FRONTIER_MON_SPOINK,        \
+    -1
+
+#define FRONTIER_MONS_SWIMMER_M_1 \
+    FRONTIER_MON_AZURILL,       \
+    FRONTIER_MON_IGGLYBUFF,     \
+    FRONTIER_MON_TYROGUE,       \
+    FRONTIER_MON_SENTRET,       \
+    FRONTIER_MON_CLEFFA,        \
+    FRONTIER_MON_MAKUHITA,      \
+    FRONTIER_MON_WHISMUR,       \
+    FRONTIER_MON_ZIGZAGOON,     \
+    FRONTIER_MON_TOGEPI,        \
+    FRONTIER_MON_SMEARGLE,      \
+    FRONTIER_MON_RATTATA,       \
+    FRONTIER_MON_SKITTY,        \
+    FRONTIER_MON_JIGGLYPUFF,    \
+    FRONTIER_MON_MEDITITE,      \
+    FRONTIER_MON_SLAKOTH,       \
+    FRONTIER_MON_DITTO,         \
+    FRONTIER_MON_MEOWTH,        \
+    FRONTIER_MON_POLIWAG,       \
+    FRONTIER_MON_SNUBBULL,      \
+    FRONTIER_MON_REMORAID,      \
+    FRONTIER_MON_MANKEY,        \
+    FRONTIER_MON_MACHOP,        \
+    FRONTIER_MON_SHELLDER,      \
+    FRONTIER_MON_CARVANHA,      \
+    FRONTIER_MON_CORPHISH,      \
+    FRONTIER_MON_MUDKIP,        \
+    FRONTIER_MON_SQUIRTLE,      \
+    FRONTIER_MON_TOTODILE,      \
+    FRONTIER_MON_SLOWPOKE,      \
+    FRONTIER_MON_PSYDUCK,       \
+    FRONTIER_MON_GOLDEEN,       \
+    FRONTIER_MON_CLEFAIRY,      \
+    FRONTIER_MON_SEEL,          \
+    FRONTIER_MON_KRABBY,        \
+    FRONTIER_MON_EEVEE,         \
+    FRONTIER_MON_CHINCHOU,      \
+    FRONTIER_MON_TEDDIURSA,     \
+    FRONTIER_MON_LUVDISC,       \
+    FRONTIER_MON_TENTACOOL,     \
+    FRONTIER_MON_STARYU,        \
+    FRONTIER_MON_LOMBRE,        \
+    FRONTIER_MON_CLAMPERL,      \
+    FRONTIER_MON_OMANYTE,       \
+    FRONTIER_MON_KABUTO,        \
+    FRONTIER_MON_AIPOM,         \
+    FRONTIER_MON_LOUDRED,       \
+    FRONTIER_MON_SPINDA,        \
+    FRONTIER_MON_CORSOLA,       \
+    FRONTIER_MON_MAWILE,        \
+    FRONTIER_MON_POLIWHIRL,     \
+    -1
+
+#define FRONTIER_MONS_SWIMMER_F_1 \
+    FRONTIER_MON_AZURILL,       \
+    FRONTIER_MON_IGGLYBUFF,     \
+    FRONTIER_MON_SENTRET,       \
+    FRONTIER_MON_CLEFFA,        \
+    FRONTIER_MON_WHISMUR,       \
+    FRONTIER_MON_ZIGZAGOON,     \
+    FRONTIER_MON_TOGEPI,        \
+    FRONTIER_MON_SMEARGLE,      \
+    FRONTIER_MON_RATTATA,       \
+    FRONTIER_MON_SKITTY,        \
+    FRONTIER_MON_JIGGLYPUFF,    \
+    FRONTIER_MON_SLAKOTH,       \
+    FRONTIER_MON_DITTO,         \
+    FRONTIER_MON_MEOWTH,        \
+    FRONTIER_MON_POLIWAG,       \
+    FRONTIER_MON_SNUBBULL,      \
+    FRONTIER_MON_REMORAID,      \
+    FRONTIER_MON_SNORUNT,       \
+    FRONTIER_MON_SHELLDER,      \
+    FRONTIER_MON_SMOOCHUM,      \
+    FRONTIER_MON_CARVANHA,      \
+    FRONTIER_MON_CORPHISH,      \
+    FRONTIER_MON_MUDKIP,        \
+    FRONTIER_MON_SQUIRTLE,      \
+    FRONTIER_MON_TOTODILE,      \
+    FRONTIER_MON_SLOWPOKE,      \
+    FRONTIER_MON_PSYDUCK,       \
+    FRONTIER_MON_GOLDEEN,       \
+    FRONTIER_MON_CLEFAIRY,      \
+    FRONTIER_MON_SEEL,          \
+    FRONTIER_MON_KRABBY,        \
+    FRONTIER_MON_EEVEE,         \
+    FRONTIER_MON_CHINCHOU,      \
+    FRONTIER_MON_TEDDIURSA,     \
+    FRONTIER_MON_DELIBIRD,      \
+    FRONTIER_MON_LUVDISC,       \
+    FRONTIER_MON_TENTACOOL,     \
+    FRONTIER_MON_STARYU,        \
+    FRONTIER_MON_LOMBRE,        \
+    FRONTIER_MON_CLAMPERL,      \
+    FRONTIER_MON_OMANYTE,       \
+    FRONTIER_MON_KABUTO,        \
+    FRONTIER_MON_AIPOM,         \
+    FRONTIER_MON_LOUDRED,       \
+    FRONTIER_MON_SPINDA,        \
+    FRONTIER_MON_CORSOLA,       \
+    FRONTIER_MON_POLIWHIRL,     \
+    -1 
+
+#define FRONTIER_MONS_POKEFAN_M_1 \
+    FRONTIER_MON_SMOOCHUM,      \
+    FRONTIER_MON_NUMEL,         \
+    FRONTIER_MON_CORPHISH,      \
+    FRONTIER_MON_CHARMANDER,    \
+    FRONTIER_MON_CYNDAQUIL,     \
+    FRONTIER_MON_SWABLU,        \
+    FRONTIER_MON_TREECKO,       \
+    FRONTIER_MON_TORCHIC,       \
+    FRONTIER_MON_MUDKIP,        \
+    FRONTIER_MON_SQUIRTLE,      \
+    FRONTIER_MON_TOTODILE,      \
+    FRONTIER_MON_SLOWPOKE,      \
+    FRONTIER_MON_BULBASAUR,     \
+    FRONTIER_MON_CHIKORITA,     \
+    FRONTIER_MON_ODDISH,        \
+    FRONTIER_MON_PSYDUCK,       \
+    FRONTIER_MON_GOLDEEN,       \
+    FRONTIER_MON_NATU,          \
+    FRONTIER_MON_CLEFAIRY,      \
+    FRONTIER_MON_SEEL,          \
+    FRONTIER_MON_EXEGGCUTE,     \
+    FRONTIER_MON_EEVEE,         \
+    FRONTIER_MON_TEDDIURSA,     \
+    FRONTIER_MON_PHANPY,        \
+    FRONTIER_MON_SPOINK,        \
+    FRONTIER_MON_LUVDISC,       \
+    FRONTIER_MON_SKIPLOOM,      \
+    FRONTIER_MON_CLAMPERL,      \
+    FRONTIER_MON_AIPOM,         \
+    FRONTIER_MON_ELEKID,        \
+    FRONTIER_MON_SPINDA,        \
+    FRONTIER_MON_FLAAFFY,       \
+    FRONTIER_MON_MAGBY,         \
+    FRONTIER_MON_CORSOLA,       \
+    FRONTIER_MON_MAWILE,        \
+    FRONTIER_MON_POLIWHIRL,     \
+    -1
+
+#define FRONTIER_MONS_POKEFAN_F_1 \
+    FRONTIER_MON_AZURILL,       \
+    FRONTIER_MON_RALTS,         \
+    FRONTIER_MON_MAGIKARP,      \
+    FRONTIER_MON_PICHU,         \
+    FRONTIER_MON_IGGLYBUFF,     \
+    FRONTIER_MON_WOOPER,        \
+    FRONTIER_MON_SENTRET,       \
+    FRONTIER_MON_CLEFFA,        \
+    FRONTIER_MON_SEEDOT,        \
+    FRONTIER_MON_LOTAD,         \
+    FRONTIER_MON_POOCHYENA,     \
+    FRONTIER_MON_WHISMUR,       \
+    FRONTIER_MON_ZIGZAGOON,     \
+    FRONTIER_MON_TOGEPI,        \
+    FRONTIER_MON_MARILL,        \
+    FRONTIER_MON_HOPPIP,        \
+    FRONTIER_MON_SWINUB,        \
+    FRONTIER_MON_SMEARGLE,      \
+    FRONTIER_MON_PIDGEY,        \
+    FRONTIER_MON_RATTATA,       \
+    FRONTIER_MON_WYNAUT,        \
+    FRONTIER_MON_SKITTY,        \
+    FRONTIER_MON_SURSKIT,       \
+    FRONTIER_MON_JIGGLYPUFF,    \
+    FRONTIER_MON_TAILLOW,       \
+    FRONTIER_MON_WINGULL,       \
+    FRONTIER_MON_NIDORAN_M,     \
+    FRONTIER_MON_NIDORAN_F,     \
+    FRONTIER_MON_KIRLIA,        \
+    FRONTIER_MON_MAREEP,        \
+    FRONTIER_MON_DITTO,         \
+    FRONTIER_MON_MEOWTH,        \
+    FRONTIER_MON_SPHEAL,        \
+    FRONTIER_MON_SHROOMISH,     \
+    FRONTIER_MON_VULPIX,        \
+    FRONTIER_MON_PIKACHU,       \
+    FRONTIER_MON_SANDSHREW,     \
+    FRONTIER_MON_POLIWAG,       \
+    FRONTIER_MON_DRATINI,       \
+    FRONTIER_MON_SNUBBULL,      \
+    FRONTIER_MON_GULPIN,        \
+    -1
+
+#define FRONTIER_MONS_BUG_CATCHER_1 \
+    FRONTIER_MON_CATERPIE,      \
+    FRONTIER_MON_WEEDLE,        \
+    FRONTIER_MON_WURMPLE,       \
+    FRONTIER_MON_SHEDINJA,      \
+    FRONTIER_MON_SPINARAK,      \
+    FRONTIER_MON_DIGLETT,       \
+    FRONTIER_MON_LEDYBA,        \
+    FRONTIER_MON_NINCADA,       \
+    FRONTIER_MON_SURSKIT,       \
+    FRONTIER_MON_PARAS,         \
+    FRONTIER_MON_PINECO,        \
+    FRONTIER_MON_TRAPINCH,      \
+    FRONTIER_MON_VENONAT,       \
+    FRONTIER_MON_EXEGGCUTE,     \
+    FRONTIER_MON_VIBRAVA,       \
+    FRONTIER_MON_ANORITH,       \
+    FRONTIER_MON_BUTTERFREE,    \
+    FRONTIER_MON_BEEDRILL,      \
+    FRONTIER_MON_BEAUTIFLY,     \
+    FRONTIER_MON_DUSTOX,        \
+    FRONTIER_MON_LEDIAN,        \
+    FRONTIER_MON_ARIADOS,       \
+    FRONTIER_MON_YANMA,         \
+    -1
+
+// Identical to above with 2 additions. Might be possible to merge the two
+#define FRONTIER_MONS_BUG_CATCHER_1_EXTRA(species1, species2) \
+    FRONTIER_MON_CATERPIE,      \
+    FRONTIER_MON_WEEDLE,        \
+    FRONTIER_MON_WURMPLE,       \
+    FRONTIER_MON_##species1,    \
+    FRONTIER_MON_##species2,    \
+    FRONTIER_MON_SHEDINJA,      \
+    FRONTIER_MON_SPINARAK,      \
+    FRONTIER_MON_DIGLETT,       \
+    FRONTIER_MON_LEDYBA,        \
+    FRONTIER_MON_NINCADA,       \
+    FRONTIER_MON_SURSKIT,       \
+    FRONTIER_MON_PARAS,         \
+    FRONTIER_MON_PINECO,        \
+    FRONTIER_MON_TRAPINCH,      \
+    FRONTIER_MON_VENONAT,       \
+    FRONTIER_MON_EXEGGCUTE,     \
+    FRONTIER_MON_VIBRAVA,       \
+    FRONTIER_MON_ANORITH,       \
+    FRONTIER_MON_BUTTERFREE,    \
+    FRONTIER_MON_BEEDRILL,      \
+    FRONTIER_MON_BEAUTIFLY,     \
+    FRONTIER_MON_DUSTOX,        \
+    FRONTIER_MON_LEDIAN,        \
+    FRONTIER_MON_ARIADOS,       \
+    FRONTIER_MON_YANMA,         \
+    -1
+
+#define FRONTIER_MONS_NINJA_BOY_1 \
+    FRONTIER_MON_RALTS,         \
+    FRONTIER_MON_SHEDINJA,      \
+    FRONTIER_MON_ZUBAT,         \
+    FRONTIER_MON_SPINARAK,      \
+    FRONTIER_MON_WYNAUT,        \
+    FRONTIER_MON_DIGLETT,       \
+    FRONTIER_MON_LEDYBA,        \
+    FRONTIER_MON_NINCADA,       \
+    FRONTIER_MON_SURSKIT,       \
+    FRONTIER_MON_NIDORAN_M,     \
+    FRONTIER_MON_NIDORAN_F,     \
+    FRONTIER_MON_KIRLIA,        \
+    FRONTIER_MON_MEDITITE,      \
+    FRONTIER_MON_PARAS,         \
+    FRONTIER_MON_EKANS,         \
+    FRONTIER_MON_PINECO,        \
+    FRONTIER_MON_TRAPINCH,      \
+    FRONTIER_MON_SHUPPET,       \
+    FRONTIER_MON_DUSKULL,       \
+    FRONTIER_MON_BELLSPROUT,    \
+    FRONTIER_MON_BALTOY,        \
+    FRONTIER_MON_BELDUM,        \
+    FRONTIER_MON_GULPIN,        \
+    FRONTIER_MON_VENONAT,       \
+    FRONTIER_MON_SMOOCHUM,      \
+    FRONTIER_MON_ABRA,          \
+    FRONTIER_MON_GASTLY,        \
+    FRONTIER_MON_SLOWPOKE,      \
+    FRONTIER_MON_BULBASAUR,     \
+    FRONTIER_MON_ODDISH,        \
+    FRONTIER_MON_NATU,          \
+    FRONTIER_MON_GRIMER,        \
+    FRONTIER_MON_EXEGGCUTE,     \
+    FRONTIER_MON_DROWZEE,       \
+    FRONTIER_MON_SPOINK,        \
+    FRONTIER_MON_TENTACOOL,     \
+    FRONTIER_MON_KOFFING,       \
+    FRONTIER_MON_VIBRAVA,       \
+    FRONTIER_MON_ANORITH,       \
+    FRONTIER_MON_NIDORINA,      \
+    FRONTIER_MON_NIDORINO,      \
+    FRONTIER_MON_BUTTERFREE,    \
+    FRONTIER_MON_BEEDRILL,      \
+    FRONTIER_MON_BEAUTIFLY,     \
+    FRONTIER_MON_DUSTOX,        \
+    FRONTIER_MON_LEDIAN,        \
+    FRONTIER_MON_ARIADOS,       \
+    FRONTIER_MON_YANMA,         \
+    -1 
+
+#define FRONTIER_MONS_BUG_MANIAC_1 \
+    FRONTIER_MON_SHEDINJA,      \
+    FRONTIER_MON_SPINARAK,      \
+    FRONTIER_MON_HOPPIP,        \
+    FRONTIER_MON_DIGLETT,       \
+    FRONTIER_MON_LEDYBA,        \
+    FRONTIER_MON_NINCADA,       \
+    FRONTIER_MON_SURSKIT,       \
+    FRONTIER_MON_PARAS,         \
+    FRONTIER_MON_PINECO,        \
+    FRONTIER_MON_TRAPINCH,      \
+    FRONTIER_MON_SHROOMISH,     \
+    FRONTIER_MON_SHUPPET,       \
+    FRONTIER_MON_DUSKULL,       \
+    FRONTIER_MON_BELLSPROUT,    \
+    FRONTIER_MON_VENONAT,       \
+    FRONTIER_MON_GASTLY,        \
+    FRONTIER_MON_ODDISH,        \
+    FRONTIER_MON_EXEGGCUTE,     \
+    FRONTIER_MON_CACNEA,        \
+    FRONTIER_MON_SKIPLOOM,      \
+    FRONTIER_MON_VIBRAVA,       \
+    FRONTIER_MON_LILEEP,        \
+    FRONTIER_MON_ANORITH,       \
+    FRONTIER_MON_BUTTERFREE,    \
+    FRONTIER_MON_BEEDRILL,      \
+    FRONTIER_MON_BEAUTIFLY,     \
+    FRONTIER_MON_DUSTOX,        \
+    FRONTIER_MON_LEDIAN,        \
+    FRONTIER_MON_ARIADOS,       \
+    FRONTIER_MON_YANMA,         \
+    -1 
+
+#define FRONTIER_MONS_FISHERMAN_1 \
+    FRONTIER_MON_MAGIKARP,      \
+    FRONTIER_MON_FEEBAS,        \
+    FRONTIER_MON_BARBOACH,      \
+    FRONTIER_MON_HORSEA,        \
+    FRONTIER_MON_POLIWAG,       \
+    FRONTIER_MON_REMORAID,      \
+    FRONTIER_MON_SHELLDER,      \
+    FRONTIER_MON_CARVANHA,      \
+    FRONTIER_MON_CORPHISH,      \
+    FRONTIER_MON_GOLDEEN,       \
+    FRONTIER_MON_KRABBY,        \
+    FRONTIER_MON_CHINCHOU,      \
+    FRONTIER_MON_LUVDISC,       \
+    FRONTIER_MON_TENTACOOL,     \
+    FRONTIER_MON_STARYU,        \
+    FRONTIER_MON_CLAMPERL,      \
+    FRONTIER_MON_OMANYTE,       \
+    FRONTIER_MON_KABUTO,        \
+    FRONTIER_MON_CORSOLA,       \
+    -1
+
+#define FRONTIER_MONS_RUIN_MANIAC_1 \
+    FRONTIER_MON_SWINUB,        \
+    FRONTIER_MON_DIGLETT,       \
+    FRONTIER_MON_TRAPINCH,      \
+    FRONTIER_MON_SANDSHREW,     \
+    FRONTIER_MON_GEODUDE,       \
+    FRONTIER_MON_LARVITAR,      \
+    FRONTIER_MON_BALTOY,        \
+    FRONTIER_MON_BELDUM,        \
+    FRONTIER_MON_NUMEL,         \
+    FRONTIER_MON_CUBONE,        \
+    FRONTIER_MON_MAGNEMITE,     \
+    FRONTIER_MON_PHANPY,        \
+    FRONTIER_MON_ARON,          \
+    FRONTIER_MON_RHYHORN,       \
+    FRONTIER_MON_OMANYTE,       \
+    FRONTIER_MON_KABUTO,        \
+    FRONTIER_MON_LILEEP,        \
+    FRONTIER_MON_ANORITH,       \
+    FRONTIER_MON_NOSEPASS,      \
+    FRONTIER_MON_CORSOLA,       \
+    FRONTIER_MON_MAWILE,        \
+    FRONTIER_MON_ONIX,          \
+    -1 
+
+#define FRONTIER_MONS_PARASOL_LADY_1 \
+    FRONTIER_MON_SUNKERN,       \
+    FRONTIER_MON_WOOPER,        \
+    FRONTIER_MON_LOTAD,         \
+    FRONTIER_MON_MARILL,        \
+    FRONTIER_MON_SURSKIT,       \
+    FRONTIER_MON_TRAPINCH,      \
+    FRONTIER_MON_SPHEAL,        \
+    FRONTIER_MON_SANDSHREW,     \
+    FRONTIER_MON_POLIWAG,       \
+    FRONTIER_MON_NUMEL,         \
+    FRONTIER_MON_DELIBIRD,      \
+    FRONTIER_MON_PHANPY,        \
+    FRONTIER_MON_LUVDISC,       \
+    FRONTIER_MON_POLIWHIRL,     \
+    FRONTIER_MON_ONIX,          \
+    FRONTIER_MON_SUDOWOODO_1,   \
+    -1
+
+#define FRONTIER_MONS_AROMA_LADY_1 \
+    FRONTIER_MON_SUNKERN,       \
+    FRONTIER_MON_RALTS,         \
+    FRONTIER_MON_SEEDOT,        \
+    FRONTIER_MON_LOTAD,         \
+    FRONTIER_MON_HOPPIP,        \
+    FRONTIER_MON_WYNAUT,        \
+    FRONTIER_MON_KIRLIA,        \
+    FRONTIER_MON_MEDITITE,      \
+    FRONTIER_MON_PARAS,         \
+    FRONTIER_MON_SHROOMISH,     \
+    FRONTIER_MON_BELLSPROUT,    \
+    FRONTIER_MON_BALTOY,        \
+    FRONTIER_MON_BELDUM,        \
+    FRONTIER_MON_SMOOCHUM,      \
+    FRONTIER_MON_ABRA,          \
+    FRONTIER_MON_TREECKO,       \
+    FRONTIER_MON_SLOWPOKE,      \
+    FRONTIER_MON_BULBASAUR,     \
+    FRONTIER_MON_CHIKORITA,     \
+    FRONTIER_MON_ODDISH,        \
+    FRONTIER_MON_NATU,          \
+    FRONTIER_MON_EXEGGCUTE,     \
+    FRONTIER_MON_DROWZEE,       \
+    FRONTIER_MON_SPOINK,        \
+    FRONTIER_MON_CACNEA,        \
+    FRONTIER_MON_SKIPLOOM,      \
+    FRONTIER_MON_NUZLEAF,       \
+    FRONTIER_MON_LOMBRE,        \
+    FRONTIER_MON_LILEEP,        \
+    -1
+
+#define FRONTIER_MONS_GUITARIST_1 \
+    FRONTIER_MON_RALTS,         \
+    FRONTIER_MON_PICHU,         \
+    FRONTIER_MON_POOCHYENA,     \
+    FRONTIER_MON_WYNAUT,        \
+    FRONTIER_MON_KIRLIA,        \
+    FRONTIER_MON_MAREEP,        \
+    FRONTIER_MON_MEDITITE,      \
+    FRONTIER_MON_SHUPPET,       \
+    FRONTIER_MON_DUSKULL,       \
+    FRONTIER_MON_ELECTRIKE,     \
+    FRONTIER_MON_PIKACHU,       \
+    FRONTIER_MON_DRATINI,       \
+    FRONTIER_MON_BALTOY,        \
+    FRONTIER_MON_BAGON,         \
+    FRONTIER_MON_BELDUM,        \
+    FRONTIER_MON_SMOOCHUM,      \
+    FRONTIER_MON_ABRA,          \
+    FRONTIER_MON_GASTLY,        \
+    FRONTIER_MON_SLOWPOKE,      \
+    FRONTIER_MON_NATU,          \
+    FRONTIER_MON_MAGNEMITE,     \
+    FRONTIER_MON_EXEGGCUTE,     \
+    FRONTIER_MON_DROWZEE,       \
+    FRONTIER_MON_VOLTORB,       \
+    FRONTIER_MON_CHINCHOU,      \
+    FRONTIER_MON_HOUNDOUR,      \
+    FRONTIER_MON_SPOINK,        \
+    FRONTIER_MON_ARON,          \
+    FRONTIER_MON_ELEKID,        \
+    FRONTIER_MON_FLAAFFY,       \
+    FRONTIER_MON_MAWILE,        \
+    -1 
+
+#define FRONTIER_MONS_BIRD_KEEPER_1 \
+    FRONTIER_MON_AZURILL,       \
+    FRONTIER_MON_IGGLYBUFF,     \
+    FRONTIER_MON_SENTRET,       \
+    FRONTIER_MON_CLEFFA,        \
+    FRONTIER_MON_WHISMUR,       \
+    FRONTIER_MON_ZIGZAGOON,     \
+    FRONTIER_MON_ZUBAT,         \
+    FRONTIER_MON_TOGEPI,        \
+    FRONTIER_MON_SMEARGLE,      \
+    FRONTIER_MON_PIDGEY,        \
+    FRONTIER_MON_RATTATA,       \
+    FRONTIER_MON_SKITTY,        \
+    FRONTIER_MON_SPEAROW,       \
+    FRONTIER_MON_HOOTHOOT,      \
+    FRONTIER_MON_JIGGLYPUFF,    \
+    FRONTIER_MON_TAILLOW,       \
+    FRONTIER_MON_WINGULL,       \
+    FRONTIER_MON_SLAKOTH,       \
+    FRONTIER_MON_DITTO,         \
+    FRONTIER_MON_MEOWTH,        \
+    FRONTIER_MON_SNUBBULL,      \
+    FRONTIER_MON_DODUO,         \
+    FRONTIER_MON_SWABLU,        \
+    FRONTIER_MON_TORCHIC,       \
+    FRONTIER_MON_NATU,          \
+    FRONTIER_MON_CLEFAIRY,      \
+    FRONTIER_MON_EEVEE,         \
+    FRONTIER_MON_TEDDIURSA,     \
+    FRONTIER_MON_DELIBIRD,      \
+    FRONTIER_MON_PIDGEOTTO,     \
+    FRONTIER_MON_FARFETCHD,     \
+    FRONTIER_MON_AIPOM,         \
+    FRONTIER_MON_LOUDRED,       \
+    FRONTIER_MON_SPINDA,        \
+    -1
+
+#define FRONTIER_MONS_SAILOR_1  \
+    FRONTIER_MON_TYROGUE,       \
+    FRONTIER_MON_MAKUHITA,      \
+    FRONTIER_MON_MEDITITE,      \
+    FRONTIER_MON_SANDSHREW,     \
+    FRONTIER_MON_GEODUDE,       \
+    FRONTIER_MON_DRATINI,       \
+    FRONTIER_MON_LARVITAR,      \
+    FRONTIER_MON_BAGON,         \
+    FRONTIER_MON_MANKEY,        \
+    FRONTIER_MON_MACHOP,        \
+    FRONTIER_MON_SHELLDER,      \
+    FRONTIER_MON_CARVANHA,      \
+    FRONTIER_MON_CORPHISH,      \
+    FRONTIER_MON_MUDKIP,        \
+    FRONTIER_MON_SQUIRTLE,      \
+    FRONTIER_MON_TOTODILE,      \
+    FRONTIER_MON_SLOWPOKE,      \
+    FRONTIER_MON_PSYDUCK,       \
+    FRONTIER_MON_CUBONE,        \
+    FRONTIER_MON_SEEL,          \
+    FRONTIER_MON_KRABBY,        \
+    FRONTIER_MON_PHANPY,        \
+    FRONTIER_MON_TENTACOOL,     \
+    FRONTIER_MON_STARYU,        \
+    FRONTIER_MON_LOMBRE,        \
+    FRONTIER_MON_RHYHORN,       \
+    FRONTIER_MON_CLAMPERL,      \
+    FRONTIER_MON_OMANYTE,       \
+    FRONTIER_MON_KABUTO,        \
+    FRONTIER_MON_CORSOLA,       \
+    FRONTIER_MON_POLIWHIRL,     \
+    FRONTIER_MON_ONIX,          \
+    -1 
+
+#define FRONTIER_MONS_HIKER_1   \
+    FRONTIER_MON_TYROGUE,       \
+    FRONTIER_MON_MAKUHITA,      \
+    FRONTIER_MON_SWINUB,        \
+    FRONTIER_MON_DIGLETT,       \
+    FRONTIER_MON_MEDITITE,      \
+    FRONTIER_MON_SLAKOTH,       \
+    FRONTIER_MON_TRAPINCH,      \
+    FRONTIER_MON_SANDSHREW,     \
+    FRONTIER_MON_GEODUDE,       \
+    FRONTIER_MON_LARVITAR,      \
+    FRONTIER_MON_BALTOY,        \
+    FRONTIER_MON_MANKEY,        \
+    FRONTIER_MON_MACHOP,        \
+    FRONTIER_MON_NUMEL,         \
+    FRONTIER_MON_CUBONE,        \
+    FRONTIER_MON_PHANPY,        \
+    FRONTIER_MON_ARON,          \
+    FRONTIER_MON_VIBRAVA,       \
+    FRONTIER_MON_RHYHORN,       \
+    FRONTIER_MON_OMANYTE,       \
+    FRONTIER_MON_KABUTO,        \
+    FRONTIER_MON_LILEEP,        \
+    FRONTIER_MON_ANORITH,       \
+    FRONTIER_MON_AIPOM,         \
+    FRONTIER_MON_LOUDRED,       \
+    FRONTIER_MON_NOSEPASS,      \
+    FRONTIER_MON_ONIX,          \
+    -1 
+
+#define FRONTIER_MONS_KINDLER_1 \
+    FRONTIER_MON_SLUGMA,        \
+    FRONTIER_MON_SHUPPET,       \
+    FRONTIER_MON_DUSKULL,       \
+    FRONTIER_MON_VULPIX,        \
+    FRONTIER_MON_GEODUDE,       \
+    FRONTIER_MON_LARVITAR,      \
+    FRONTIER_MON_BAGON,         \
+    FRONTIER_MON_BELDUM,        \
+    FRONTIER_MON_NUMEL,         \
+    FRONTIER_MON_CHARMANDER,    \
+    FRONTIER_MON_CYNDAQUIL,     \
+    FRONTIER_MON_TORCHIC,       \
+    FRONTIER_MON_MAGNEMITE,     \
+    FRONTIER_MON_HOUNDOUR,      \
+    FRONTIER_MON_ARON,          \
+    FRONTIER_MON_RHYHORN,       \
+    FRONTIER_MON_GROWLITHE,     \
+    FRONTIER_MON_MAGBY,         \
+    FRONTIER_MON_NOSEPASS,      \
+    FRONTIER_MON_MAWILE,        \
+    FRONTIER_MON_ONIX,          \
+    -1 
+
+#define FRONTIER_MONS_RUNNING_TRIATHLETE_1 \
+    FRONTIER_MON_AZURILL,       \
+    FRONTIER_MON_IGGLYBUFF,     \
+    FRONTIER_MON_TYROGUE,       \
+    FRONTIER_MON_SENTRET,       \
+    FRONTIER_MON_CLEFFA,        \
+    FRONTIER_MON_MAKUHITA,      \
+    FRONTIER_MON_WHISMUR,       \
+    FRONTIER_MON_ZIGZAGOON,     \
+    FRONTIER_MON_TOGEPI,        \
+    FRONTIER_MON_SMEARGLE,      \
+    FRONTIER_MON_PIDGEY,        \
+    FRONTIER_MON_RATTATA,       \
+    FRONTIER_MON_SKITTY,        \
+    FRONTIER_MON_SPEAROW,       \
+    FRONTIER_MON_HOOTHOOT,      \
+    FRONTIER_MON_JIGGLYPUFF,    \
+    FRONTIER_MON_TAILLOW,       \
+    FRONTIER_MON_MEDITITE,      \
+    FRONTIER_MON_SLAKOTH,       \
+    FRONTIER_MON_DITTO,         \
+    FRONTIER_MON_MEOWTH,        \
+    FRONTIER_MON_SANDSHREW,     \
+    FRONTIER_MON_GEODUDE,       \
+    FRONTIER_MON_SNUBBULL,      \
+    FRONTIER_MON_LARVITAR,      \
+    FRONTIER_MON_BALTOY,        \
+    FRONTIER_MON_MANKEY,        \
+    FRONTIER_MON_MACHOP,        \
+    FRONTIER_MON_NUMEL,         \
+    FRONTIER_MON_DODUO,         \
+    FRONTIER_MON_SWABLU,        \
+    FRONTIER_MON_CUBONE,        \
+    FRONTIER_MON_CLEFAIRY,      \
+    FRONTIER_MON_EEVEE,         \
+    FRONTIER_MON_TEDDIURSA,     \
+    FRONTIER_MON_PHANPY,        \
+    FRONTIER_MON_VIBRAVA,       \
+    FRONTIER_MON_RHYHORN,       \
+    FRONTIER_MON_PIDGEOTTO,     \
+    FRONTIER_MON_FARFETCHD,     \
+    FRONTIER_MON_AIPOM,         \
+    FRONTIER_MON_LOUDRED,       \
+    FRONTIER_MON_SPINDA,        \
+    FRONTIER_MON_ONIX,          \
+    -1 
+
+#define FRONTIER_MONS_SWIMMING_TRIATHLETE_1 \
+    FRONTIER_MON_TYROGUE,       \
+    FRONTIER_MON_MAKUHITA,      \
+    FRONTIER_MON_MEDITITE,      \
+    FRONTIER_MON_DRATINI,       \
+    FRONTIER_MON_SNUBBULL,      \
+    FRONTIER_MON_SNORUNT,       \
+    FRONTIER_MON_BAGON,         \
+    FRONTIER_MON_MANKEY,        \
+    FRONTIER_MON_MACHOP,        \
+    FRONTIER_MON_SHELLDER,      \
+    FRONTIER_MON_SMOOCHUM,      \
+    FRONTIER_MON_CORPHISH,      \
+    FRONTIER_MON_MUDKIP,        \
+    FRONTIER_MON_SQUIRTLE,      \
+    FRONTIER_MON_TOTODILE,      \
+    FRONTIER_MON_SLOWPOKE,      \
+    FRONTIER_MON_PSYDUCK,       \
+    FRONTIER_MON_CLEFAIRY,      \
+    FRONTIER_MON_SEEL,          \
+    FRONTIER_MON_KRABBY,        \
+    FRONTIER_MON_EEVEE,         \
+    FRONTIER_MON_TEDDIURSA,     \
+    FRONTIER_MON_DELIBIRD,      \
+    FRONTIER_MON_LOMBRE,        \
+    FRONTIER_MON_CLAMPERL,      \
+    FRONTIER_MON_OMANYTE,       \
+    FRONTIER_MON_KABUTO,        \
+    FRONTIER_MON_AIPOM,         \
+    FRONTIER_MON_LOUDRED,       \
+    FRONTIER_MON_SPINDA,        \
+    FRONTIER_MON_CORSOLA,       \
+    FRONTIER_MON_POLIWHIRL,     \
+    -1 
+
+#define FRONTIER_MONS_CYCLING_TRIATHLETE_1 \
+    FRONTIER_MON_PICHU,         \
+    FRONTIER_MON_TYROGUE,       \
+    FRONTIER_MON_MAKUHITA,      \
+    FRONTIER_MON_MAREEP,        \
+    FRONTIER_MON_MEDITITE,      \
+    FRONTIER_MON_ELECTRIKE,     \
+    FRONTIER_MON_PIKACHU,       \
+    FRONTIER_MON_DRATINI,       \
+    FRONTIER_MON_SNUBBULL,      \
+    FRONTIER_MON_BAGON,         \
+    FRONTIER_MON_BELDUM,        \
+    FRONTIER_MON_MANKEY,        \
+    FRONTIER_MON_MACHOP,        \
+    FRONTIER_MON_DODUO,         \
+    FRONTIER_MON_SWABLU,        \
+    FRONTIER_MON_CLEFAIRY,      \
+    FRONTIER_MON_MAGNEMITE,     \
+    FRONTIER_MON_EEVEE,         \
+    FRONTIER_MON_VOLTORB,       \
+    FRONTIER_MON_TEDDIURSA,     \
+    FRONTIER_MON_ARON,          \
+    FRONTIER_MON_PIDGEOTTO,     \
+    FRONTIER_MON_FARFETCHD,     \
+    FRONTIER_MON_AIPOM,         \
+    FRONTIER_MON_ELEKID,        \
+    FRONTIER_MON_LOUDRED,       \
+    FRONTIER_MON_SPINDA,        \
+    FRONTIER_MON_FLAAFFY,       \
+    FRONTIER_MON_MAWILE,        \
+    -1 
+
+#define FRONTIER_MONS_RUNNING_TRIATHLETE_2 \
+    FRONTIER_MON_DELCATTY_1,    \
+    FRONTIER_MON_LICKITUNG_1,   \
+    FRONTIER_MON_PORYGON_1,     \
+    FRONTIER_MON_MACHOKE_1,     \
+    FRONTIER_MON_TOGETIC_1,     \
+    FRONTIER_MON_MURKROW_1,     \
+    FRONTIER_MON_COMBUSKEN_1,   \
+    FRONTIER_MON_RATICATE_1,    \
+    FRONTIER_MON_FURRET_1,      \
+    FRONTIER_MON_DUNSPARCE_1,   \
+    FRONTIER_MON_LINOONE_1,     \
+    FRONTIER_MON_CASTFORM_1,    \
+    FRONTIER_MON_WIGGLYTUFF_1,  \
+    FRONTIER_MON_GLIGAR_1,      \
+    FRONTIER_MON_PELIPPER_1,    \
+    FRONTIER_MON_SWELLOW_1,     \
+    FRONTIER_MON_PERSIAN_1,     \
+    FRONTIER_MON_KECLEON_1,     \
+    FRONTIER_MON_VIGOROTH_1,    \
+    FRONTIER_MON_NOCTOWL_1,     \
+    FRONTIER_MON_CHANSEY_1,     \
+    FRONTIER_MON_GOLBAT_1,      \
+    FRONTIER_MON_PRIMEAPE_1,    \
+    FRONTIER_MON_HITMONLEE_1,   \
+    FRONTIER_MON_HITMONCHAN_1,  \
+    FRONTIER_MON_GIRAFARIG_1,   \
+    FRONTIER_MON_HITMONTOP_1,   \
+    FRONTIER_MON_NINJASK_1,     \
+    FRONTIER_MON_ZANGOOSE_1,    \
+    FRONTIER_MON_TROPIUS_1,     \
+    FRONTIER_MON_MANTINE_1,     \
+    FRONTIER_MON_STANTLER_1,    \
+    FRONTIER_MON_PIDGEOT_1,     \
+    FRONTIER_MON_SCYTHER_1,     \
+    -1 
+
+#define FRONTIER_MONS_SWIMMING_TRIATHLETE_2 \
+    FRONTIER_MON_WAILMER_1,     \
+    FRONTIER_MON_WARTORTLE_1,   \
+    FRONTIER_MON_MACHOKE_1,     \
+    FRONTIER_MON_CROCONAW_1,    \
+    FRONTIER_MON_COMBUSKEN_1,   \
+    FRONTIER_MON_MARSHTOMP_1,   \
+    FRONTIER_MON_AZUMARILL_1,   \
+    FRONTIER_MON_SEALEO_1,      \
+    FRONTIER_MON_QWILFISH_1,    \
+    FRONTIER_MON_SNEASEL_1,     \
+    FRONTIER_MON_PELIPPER_1,    \
+    FRONTIER_MON_SEADRA_1,      \
+    FRONTIER_MON_SEAKING_1,     \
+    FRONTIER_MON_PILOSWINE_1,   \
+    FRONTIER_MON_PRIMEAPE_1,    \
+    FRONTIER_MON_HITMONLEE_1,   \
+    FRONTIER_MON_HITMONCHAN_1,  \
+    FRONTIER_MON_HITMONTOP_1,   \
+    FRONTIER_MON_SHARPEDO_1,    \
+    FRONTIER_MON_MANTINE_1,     \
+    FRONTIER_MON_CRAWDAUNT_1,   \
+    FRONTIER_MON_KINGLER_1,     \
+    FRONTIER_MON_OCTILLERY_1,   \
+    FRONTIER_MON_HUNTAIL_1,     \
+    FRONTIER_MON_GOREBYSS_1,    \
+    FRONTIER_MON_RELICANTH_1,   \
+    FRONTIER_MON_OMASTAR_1,     \
+    FRONTIER_MON_KABUTOPS_1,    \
+    FRONTIER_MON_POLIWRATH_1,   \
+    FRONTIER_MON_POLITOED_1,    \
+    FRONTIER_MON_CLOYSTER_1,    \
+    -1 
+
+#define FRONTIER_MONS_CYCLING_TRIATHLETE_2 \
+    FRONTIER_MON_DELCATTY_1,    \
+    FRONTIER_MON_LICKITUNG_1,   \
+    FRONTIER_MON_PORYGON_1,     \
+    FRONTIER_MON_MACHOKE_1,     \
+    FRONTIER_MON_TOGETIC_1,     \
+    FRONTIER_MON_PLUSLE_1,      \
+    FRONTIER_MON_MINUN_1,       \
+    FRONTIER_MON_COMBUSKEN_1,   \
+    FRONTIER_MON_RATICATE_1,    \
+    FRONTIER_MON_FURRET_1,      \
+    FRONTIER_MON_DUNSPARCE_1,   \
+    FRONTIER_MON_LINOONE_1,     \
+    FRONTIER_MON_CASTFORM_1,    \
+    FRONTIER_MON_METANG_1,      \
+    FRONTIER_MON_WIGGLYTUFF_1,  \
+    FRONTIER_MON_SWELLOW_1,     \
+    FRONTIER_MON_LAIRON_1,      \
+    FRONTIER_MON_PERSIAN_1,     \
+    FRONTIER_MON_KECLEON_1,     \
+    FRONTIER_MON_VIGOROTH_1,    \
+    FRONTIER_MON_NOCTOWL_1,     \
+    FRONTIER_MON_CHANSEY_1,     \
+    FRONTIER_MON_PRIMEAPE_1,    \
+    FRONTIER_MON_HITMONLEE_1,   \
+    FRONTIER_MON_HITMONCHAN_1,  \
+    FRONTIER_MON_GIRAFARIG_1,   \
+    FRONTIER_MON_HITMONTOP_1,   \
+    FRONTIER_MON_ZANGOOSE_1,    \
+    FRONTIER_MON_MAGNETON_1,    \
+    FRONTIER_MON_STANTLER_1,    \
+    FRONTIER_MON_PIDGEOT_1,     \
+    -1 
+
+#define FRONTIER_MONS_BLACK_BELT_BATTLE_GIRL_1 \
+    FRONTIER_MON_LICKITUNG_1,   \
+    FRONTIER_MON_GRAVELER_1,    \
+    FRONTIER_MON_CHARMELEON_1,  \
+    FRONTIER_MON_MACHOKE_1,     \
+    FRONTIER_MON_QUILAVA_1,     \
+    FRONTIER_MON_COMBUSKEN_1,   \
+    FRONTIER_MON_PONYTA_1,      \
+    FRONTIER_MON_SUDOWOODO_1,   \
+    FRONTIER_MON_MAGCARGO_1,    \
+    FRONTIER_MON_PUPITAR_1,     \
+    FRONTIER_MON_RATICATE_1,    \
+    FRONTIER_MON_FURRET_1,      \
+    FRONTIER_MON_DUNSPARCE_1,   \
+    FRONTIER_MON_MIGHTYENA_1,   \
+    FRONTIER_MON_LINOONE_1,     \
+    FRONTIER_MON_SHELGON_1,     \
+    FRONTIER_MON_METANG_1,      \
+    FRONTIER_MON_WIGGLYTUFF_1,  \
+    FRONTIER_MON_GLIGAR_1,      \
+    FRONTIER_MON_LAIRON_1,      \
+    FRONTIER_MON_PERSIAN_1,     \
+    FRONTIER_MON_KECLEON_1,     \
+    FRONTIER_MON_VIGOROTH_1,    \
+    FRONTIER_MON_LUNATONE_1,    \
+    FRONTIER_MON_SOLROCK_1,     \
+    FRONTIER_MON_SANDSLASH_1,   \
+    FRONTIER_MON_CHANSEY_1,     \
+    FRONTIER_MON_PILOSWINE_1,   \
+    FRONTIER_MON_PRIMEAPE_1,    \
+    FRONTIER_MON_HITMONLEE_1,   \
+    FRONTIER_MON_HITMONCHAN_1,  \
+    FRONTIER_MON_GIRAFARIG_1,   \
+    FRONTIER_MON_HITMONTOP_1,   \
+    FRONTIER_MON_ZANGOOSE_1,    \
+    FRONTIER_MON_CAMERUPT_1,    \
+    FRONTIER_MON_STANTLER_1,    \
+    FRONTIER_MON_ABSOL_1,       \
+    FRONTIER_MON_TORKOAL_1,     \
+    FRONTIER_MON_CACTURNE_1,    \
+    FRONTIER_MON_POLIWRATH_1,   \
+    -1 
+
+#define FRONTIER_MONS_EXPERT_1A \
+    FRONTIER_MON_DELCATTY_1,    \
+    FRONTIER_MON_SABLEYE_1,     \
+    FRONTIER_MON_LICKITUNG_1,   \
+    FRONTIER_MON_WEEPINBELL_1,  \
+    FRONTIER_MON_GRAVELER_1,    \
+    FRONTIER_MON_GLOOM_1,       \
+    FRONTIER_MON_PORYGON_1,     \
+    FRONTIER_MON_KADABRA_1,     \
+    FRONTIER_MON_WAILMER_1,     \
+    FRONTIER_MON_ROSELIA_1,     \
+    FRONTIER_MON_VOLBEAT_1,     \
+    FRONTIER_MON_ILLUMISE_1,    \
+    FRONTIER_MON_IVYSAUR_1,     \
+    FRONTIER_MON_CHARMELEON_1,  \
+    FRONTIER_MON_WARTORTLE_1,   \
+    FRONTIER_MON_PARASECT_1,    \
+    FRONTIER_MON_MACHOKE_1,     \
+    FRONTIER_MON_HAUNTER_1,     \
+    FRONTIER_MON_BAYLEEF_1,     \
+    FRONTIER_MON_QUILAVA_1,     \
+    FRONTIER_MON_CROCONAW_1,    \
+    FRONTIER_MON_TOGETIC_1,     \
+    FRONTIER_MON_MURKROW_1,     \
+    FRONTIER_MON_WOBBUFFET_1,   \
+    FRONTIER_MON_PLUSLE_1,      \
+    FRONTIER_MON_MINUN_1,       \
+    FRONTIER_MON_GROVYLE_1,     \
+    FRONTIER_MON_COMBUSKEN_1,   \
+    FRONTIER_MON_MARSHTOMP_1,   \
+    FRONTIER_MON_PONYTA_1,      \
+    FRONTIER_MON_AZUMARILL_1,   \
+    FRONTIER_MON_SUDOWOODO_1,   \
+    FRONTIER_MON_MAGCARGO_1,    \
+    FRONTIER_MON_PUPITAR_1,     \
+    FRONTIER_MON_SEALEO_1,      \
+    FRONTIER_MON_RATICATE_1,    \
+    FRONTIER_MON_MASQUERAIN_1,  \
+    FRONTIER_MON_FURRET_1,      \
+    -1 
+
+#define FRONTIER_MONS_EXPERT_1B \
+    FRONTIER_MON_DUNSPARCE_1,   \
+    FRONTIER_MON_DRAGONAIR_1,   \
+    FRONTIER_MON_MIGHTYENA_1,   \
+    FRONTIER_MON_LINOONE_1,     \
+    FRONTIER_MON_CASTFORM_1,    \
+    FRONTIER_MON_SHELGON_1,     \
+    FRONTIER_MON_METANG_1,      \
+    FRONTIER_MON_WIGGLYTUFF_1,  \
+    FRONTIER_MON_SUNFLORA_1,    \
+    FRONTIER_MON_CHIMECHO_1,    \
+    FRONTIER_MON_GLIGAR_1,      \
+    FRONTIER_MON_QWILFISH_1,    \
+    FRONTIER_MON_SNEASEL_1,     \
+    FRONTIER_MON_PELIPPER_1,    \
+    FRONTIER_MON_SWELLOW_1,     \
+    FRONTIER_MON_LAIRON_1,      \
+    FRONTIER_MON_TANGELA_1,     \
+    FRONTIER_MON_ARBOK_1,       \
+    FRONTIER_MON_PERSIAN_1,     \
+    FRONTIER_MON_SEADRA_1,      \
+    FRONTIER_MON_KECLEON_1,     \
+    FRONTIER_MON_VIGOROTH_1,    \
+    FRONTIER_MON_LUNATONE_1,    \
+    FRONTIER_MON_SOLROCK_1,     \
+    FRONTIER_MON_NOCTOWL_1,     \
+    FRONTIER_MON_SANDSLASH_1,   \
+    FRONTIER_MON_VENOMOTH_1,    \
+    FRONTIER_MON_CHANSEY_1,     \
+    FRONTIER_MON_SEAKING_1,     \
+    FRONTIER_MON_JUMPLUFF_1,    \
+    FRONTIER_MON_PILOSWINE_1,   \
+    FRONTIER_MON_GOLBAT_1,      \
+    FRONTIER_MON_PRIMEAPE_1,    \
+    FRONTIER_MON_HITMONLEE_1,   \
+    FRONTIER_MON_HITMONCHAN_1,  \
+    FRONTIER_MON_GIRAFARIG_1,   \
+    FRONTIER_MON_HITMONTOP_1,   \
+    -1 
+
+#define FRONTIER_MONS_EXPERT_1C \
+    FRONTIER_MON_BANETTE_1,     \
+    FRONTIER_MON_NINJASK_1,     \
+    FRONTIER_MON_SEVIPER_1,     \
+    FRONTIER_MON_ZANGOOSE_1,    \
+    FRONTIER_MON_CAMERUPT_1,    \
+    FRONTIER_MON_SHARPEDO_1,    \
+    FRONTIER_MON_TROPIUS_1,     \
+    FRONTIER_MON_MAGNETON_1,    \
+    FRONTIER_MON_MANTINE_1,     \
+    FRONTIER_MON_STANTLER_1,    \
+    FRONTIER_MON_ABSOL_1,       \
+    FRONTIER_MON_SWALOT_1,      \
+    FRONTIER_MON_CRAWDAUNT_1,   \
+    FRONTIER_MON_PIDGEOT_1,     \
+    FRONTIER_MON_GRUMPIG_1,     \
+    FRONTIER_MON_TORKOAL_1,     \
+    FRONTIER_MON_KINGLER_1,     \
+    FRONTIER_MON_CACTURNE_1,    \
+    FRONTIER_MON_BELLOSSOM_1,   \
+    FRONTIER_MON_OCTILLERY_1,   \
+    FRONTIER_MON_HUNTAIL_1,     \
+    FRONTIER_MON_GOREBYSS_1,    \
+    FRONTIER_MON_RELICANTH_1,   \
+    FRONTIER_MON_OMASTAR_1,     \
+    FRONTIER_MON_KABUTOPS_1,    \
+    FRONTIER_MON_POLIWRATH_1,   \
+    FRONTIER_MON_SCYTHER_1,     \
+    FRONTIER_MON_PINSIR_1,      \
+    FRONTIER_MON_POLITOED_1,    \
+    FRONTIER_MON_CLOYSTER_1,    \
+    -1 
+
+#define FRONTIER_MONS_PSYCHIC_1 \
+    FRONTIER_MON_DELCATTY_2,    \
+    FRONTIER_MON_SABLEYE_2,     \
+    FRONTIER_MON_PORYGON_2,     \
+    FRONTIER_MON_KADABRA_2,     \
+    FRONTIER_MON_ROSELIA_2,     \
+    FRONTIER_MON_HAUNTER_2,     \
+    FRONTIER_MON_MURKROW_2,     \
+    FRONTIER_MON_WOBBUFFET_2,   \
+    FRONTIER_MON_PLUSLE_2,      \
+    FRONTIER_MON_MINUN_2,       \
+    FRONTIER_MON_MIGHTYENA_2,   \
+    FRONTIER_MON_LINOONE_2,     \
+    FRONTIER_MON_METANG_2,      \
+    FRONTIER_MON_WIGGLYTUFF_2,  \
+    FRONTIER_MON_CHIMECHO_2,    \
+    FRONTIER_MON_SNEASEL_2,     \
+    FRONTIER_MON_KECLEON_2,     \
+    FRONTIER_MON_LUNATONE_2,    \
+    FRONTIER_MON_SOLROCK_2,     \
+    FRONTIER_MON_NOCTOWL_2,     \
+    FRONTIER_MON_VENOMOTH_2,    \
+    FRONTIER_MON_CHANSEY_2,     \
+    FRONTIER_MON_GIRAFARIG_2,   \
+    FRONTIER_MON_BANETTE_2,     \
+    FRONTIER_MON_SHARPEDO_2,    \
+    FRONTIER_MON_MAGNETON_2,    \
+    FRONTIER_MON_STANTLER_2,    \
+    FRONTIER_MON_ABSOL_2,       \
+    FRONTIER_MON_CRAWDAUNT_2,   \
+    FRONTIER_MON_GRUMPIG_2,     \
+    FRONTIER_MON_CACTURNE_2,    \
+    FRONTIER_MON_GOREBYSS_2,    \
+    FRONTIER_MON_POLITOED_2,    \
+    -1 
+
+#define FRONTIER_MONS_HEX_MANIAC_1 \
+    FRONTIER_MON_SABLEYE_2,     \
+    FRONTIER_MON_WEEPINBELL_2,  \
+    FRONTIER_MON_GLOOM_2,       \
+    FRONTIER_MON_KADABRA_2,     \
+    FRONTIER_MON_PARASECT_2,    \
+    FRONTIER_MON_HAUNTER_2,     \
+    FRONTIER_MON_MURKROW_2,     \
+    FRONTIER_MON_WOBBUFFET_2,   \
+    FRONTIER_MON_MASQUERAIN_2,  \
+    FRONTIER_MON_MIGHTYENA_2,   \
+    FRONTIER_MON_METANG_2,      \
+    FRONTIER_MON_CHIMECHO_2,    \
+    FRONTIER_MON_SNEASEL_2,     \
+    FRONTIER_MON_ARBOK_2,       \
+    FRONTIER_MON_LUNATONE_2,    \
+    FRONTIER_MON_SOLROCK_2,     \
+    FRONTIER_MON_VENOMOTH_2,    \
+    FRONTIER_MON_GOLBAT_2,      \
+    FRONTIER_MON_GIRAFARIG_2,   \
+    FRONTIER_MON_BANETTE_2,     \
+    FRONTIER_MON_SEVIPER_2,     \
+    FRONTIER_MON_SHARPEDO_2,    \
+    FRONTIER_MON_ABSOL_2,       \
+    FRONTIER_MON_SWALOT_2,      \
+    FRONTIER_MON_CRAWDAUNT_2,   \
+    FRONTIER_MON_GRUMPIG_2,     \
+    FRONTIER_MON_CACTURNE_2,    \
+    -1 
+
+#define FRONTIER_MONS_POKEMANIAC_1 \
+    FRONTIER_MON_LICKITUNG_2,   \
+    FRONTIER_MON_GRAVELER_2,    \
+    FRONTIER_MON_WAILMER_2,     \
+    FRONTIER_MON_IVYSAUR_2,     \
+    FRONTIER_MON_CHARMELEON_2,  \
+    FRONTIER_MON_WARTORTLE_2,   \
+    FRONTIER_MON_MACHOKE_2,     \
+    FRONTIER_MON_BAYLEEF_2,     \
+    FRONTIER_MON_QUILAVA_2,     \
+    FRONTIER_MON_CROCONAW_2,    \
+    FRONTIER_MON_GROVYLE_2,     \
+    FRONTIER_MON_COMBUSKEN_2,   \
+    FRONTIER_MON_MARSHTOMP_2,   \
+    FRONTIER_MON_PUPITAR_2,     \
+    FRONTIER_MON_RATICATE_2,    \
+    FRONTIER_MON_MIGHTYENA_2,   \
+    FRONTIER_MON_SHELGON_2,     \
+    FRONTIER_MON_METANG_2,      \
+    FRONTIER_MON_LAIRON_2,      \
+    FRONTIER_MON_ARBOK_2,       \
+    FRONTIER_MON_VIGOROTH_2,    \
+    FRONTIER_MON_SANDSLASH_2,   \
+    FRONTIER_MON_CHANSEY_2,     \
+    FRONTIER_MON_PILOSWINE_2,   \
+    FRONTIER_MON_SEVIPER_2,     \
+    FRONTIER_MON_ZANGOOSE_2,    \
+    FRONTIER_MON_CAMERUPT_2,    \
+    FRONTIER_MON_TROPIUS_2,     \
+    FRONTIER_MON_MANTINE_2,     \
+    FRONTIER_MON_SWALOT_2,      \
+    FRONTIER_MON_TORKOAL_2,     \
+    -1 
+
+#define FRONTIER_MONS_GENTLEMAN_1A \
+    FRONTIER_MON_DELCATTY_2,    \
+    FRONTIER_MON_SABLEYE_2,     \
+    FRONTIER_MON_LICKITUNG_2,   \
+    FRONTIER_MON_WEEPINBELL_2,  \
+    FRONTIER_MON_GRAVELER_2,    \
+    FRONTIER_MON_GLOOM_2,       \
+    FRONTIER_MON_PORYGON_2,     \
+    FRONTIER_MON_KADABRA_2,     \
+    FRONTIER_MON_WAILMER_2,     \
+    FRONTIER_MON_ROSELIA_2,     \
+    FRONTIER_MON_VOLBEAT_2,     \
+    FRONTIER_MON_ILLUMISE_2,    \
+    FRONTIER_MON_IVYSAUR_2,     \
+    FRONTIER_MON_CHARMELEON_2,  \
+    FRONTIER_MON_WARTORTLE_2,   \
+    FRONTIER_MON_PARASECT_2,    \
+    FRONTIER_MON_MACHOKE_2,     \
+    FRONTIER_MON_HAUNTER_2,     \
+    FRONTIER_MON_BAYLEEF_2,     \
+    FRONTIER_MON_QUILAVA_2,     \
+    FRONTIER_MON_CROCONAW_2,    \
+    FRONTIER_MON_TOGETIC_2,     \
+    FRONTIER_MON_MURKROW_2,     \
+    FRONTIER_MON_WOBBUFFET_2,   \
+    FRONTIER_MON_PLUSLE_2,      \
+    FRONTIER_MON_MINUN_2,       \
+    FRONTIER_MON_GROVYLE_2,     \
+    FRONTIER_MON_COMBUSKEN_2,   \
+    FRONTIER_MON_MARSHTOMP_2,   \
+    FRONTIER_MON_PONYTA_2,      \
+    FRONTIER_MON_AZUMARILL_2,   \
+    FRONTIER_MON_SUDOWOODO_2,   \
+    FRONTIER_MON_MAGCARGO_2,    \
+    FRONTIER_MON_PUPITAR_2,     \
+    FRONTIER_MON_SEALEO_2,      \
+    FRONTIER_MON_RATICATE_2,    \
+    FRONTIER_MON_MASQUERAIN_2,  \
+    FRONTIER_MON_FURRET_2,      \
+    -1 
+
+#define FRONTIER_MONS_GENTLEMAN_1B \
+    FRONTIER_MON_DUNSPARCE_2,   \
+    FRONTIER_MON_DRAGONAIR_2,   \
+    FRONTIER_MON_MIGHTYENA_2,   \
+    FRONTIER_MON_LINOONE_2,     \
+    FRONTIER_MON_CASTFORM_2,    \
+    FRONTIER_MON_SHELGON_2,     \
+    FRONTIER_MON_METANG_2,      \
+    FRONTIER_MON_WIGGLYTUFF_2,  \
+    FRONTIER_MON_SUNFLORA_2,    \
+    FRONTIER_MON_CHIMECHO_2,    \
+    FRONTIER_MON_GLIGAR_2,      \
+    FRONTIER_MON_QWILFISH_2,    \
+    FRONTIER_MON_SNEASEL_2,     \
+    FRONTIER_MON_PELIPPER_2,    \
+    FRONTIER_MON_SWELLOW_2,     \
+    FRONTIER_MON_LAIRON_2,      \
+    FRONTIER_MON_TANGELA_2,     \
+    FRONTIER_MON_ARBOK_2,       \
+    FRONTIER_MON_PERSIAN_2,     \
+    FRONTIER_MON_SEADRA_2,      \
+    FRONTIER_MON_KECLEON_2,     \
+    FRONTIER_MON_VIGOROTH_2,    \
+    FRONTIER_MON_LUNATONE_2,    \
+    FRONTIER_MON_SOLROCK_2,     \
+    FRONTIER_MON_NOCTOWL_2,     \
+    FRONTIER_MON_SANDSLASH_2,   \
+    FRONTIER_MON_VENOMOTH_2,    \
+    FRONTIER_MON_CHANSEY_2,     \
+    FRONTIER_MON_SEAKING_2,     \
+    FRONTIER_MON_JUMPLUFF_2,    \
+    FRONTIER_MON_PILOSWINE_2,   \
+    FRONTIER_MON_GOLBAT_2,      \
+    FRONTIER_MON_PRIMEAPE_2,    \
+    FRONTIER_MON_HITMONLEE_2,   \
+    FRONTIER_MON_HITMONCHAN_2,  \
+    FRONTIER_MON_GIRAFARIG_2,   \
+    FRONTIER_MON_HITMONTOP_2,   \
+    -1 
+
+#define FRONTIER_MONS_BUG_MANIAC_2 \
+    FRONTIER_MON_LEDIAN,        \
+    FRONTIER_MON_ARIADOS,       \
+    FRONTIER_MON_YANMA,         \
+    FRONTIER_MON_VOLBEAT_1,     \
+    FRONTIER_MON_ILLUMISE_1,    \
+    FRONTIER_MON_PARASECT_1,    \
+    FRONTIER_MON_MASQUERAIN_1,  \
+    FRONTIER_MON_VENOMOTH_1,    \
+    FRONTIER_MON_NINJASK_1,     \
+    FRONTIER_MON_SCYTHER_1,     \
+    FRONTIER_MON_PINSIR_1,      \
+    FRONTIER_MON_VOLBEAT_2,     \
+    FRONTIER_MON_ILLUMISE_2,    \
+    FRONTIER_MON_PARASECT_2,    \
+    FRONTIER_MON_MASQUERAIN_2,  \
+    FRONTIER_MON_VENOMOTH_2,    \
+    FRONTIER_MON_NINJASK_2,     \
+    FRONTIER_MON_SCYTHER_2,     \
+    FRONTIER_MON_PINSIR_2,      \
+    -1 
+
+#define FRONTIER_MONS_RUIN_MANIAC_2 \
+    FRONTIER_MON_GRAVELER_2,    \
+    FRONTIER_MON_MACHOKE_2,     \
+    FRONTIER_MON_COMBUSKEN_2,   \
+    FRONTIER_MON_MARSHTOMP_2,   \
+    FRONTIER_MON_SUDOWOODO_2,   \
+    FRONTIER_MON_MAGCARGO_2,    \
+    FRONTIER_MON_PUPITAR_2,     \
+    FRONTIER_MON_METANG_2,      \
+    FRONTIER_MON_GLIGAR_2,      \
+    FRONTIER_MON_LAIRON_2,      \
+    FRONTIER_MON_LUNATONE_2,    \
+    FRONTIER_MON_SOLROCK_2,     \
+    FRONTIER_MON_SANDSLASH_2,   \
+    FRONTIER_MON_PILOSWINE_2,   \
+    FRONTIER_MON_PRIMEAPE_2,    \
+    FRONTIER_MON_HITMONLEE_2,   \
+    FRONTIER_MON_HITMONCHAN_2,  \
+    FRONTIER_MON_HITMONTOP_2,   \
+    FRONTIER_MON_CAMERUPT_2,    \
+    FRONTIER_MON_RELICANTH_2,   \
+    FRONTIER_MON_OMASTAR_2,     \
+    FRONTIER_MON_KABUTOPS_2,    \
+    -1 
+
+#define FRONTIER_MONS_COLLECTOR_1 \
+    FRONTIER_MON_BANETTE_2,     \
+    FRONTIER_MON_NINJASK_2,     \
+    FRONTIER_MON_SEVIPER_2,     \
+    FRONTIER_MON_ZANGOOSE_2,    \
+    FRONTIER_MON_CAMERUPT_2,    \
+    FRONTIER_MON_SHARPEDO_2,    \
+    FRONTIER_MON_TROPIUS_2,     \
+    FRONTIER_MON_MAGNETON_2,    \
+    FRONTIER_MON_MANTINE_2,     \
+    FRONTIER_MON_STANTLER_2,    \
+    FRONTIER_MON_ABSOL_2,       \
+    FRONTIER_MON_SWALOT_2,      \
+    FRONTIER_MON_CRAWDAUNT_2,   \
+    FRONTIER_MON_PIDGEOT_2,     \
+    FRONTIER_MON_GRUMPIG_2,     \
+    FRONTIER_MON_TORKOAL_2,     \
+    FRONTIER_MON_KINGLER_2,     \
+    FRONTIER_MON_CACTURNE_2,    \
+    FRONTIER_MON_BELLOSSOM_2,   \
+    FRONTIER_MON_OCTILLERY_2,   \
+    FRONTIER_MON_HUNTAIL_2,     \
+    FRONTIER_MON_GOREBYSS_2,    \
+    FRONTIER_MON_RELICANTH_2,   \
+    FRONTIER_MON_OMASTAR_2,     \
+    FRONTIER_MON_KABUTOPS_2,    \
+    FRONTIER_MON_POLIWRATH_2,   \
+    FRONTIER_MON_SCYTHER_2,     \
+    FRONTIER_MON_PINSIR_2,      \
+    FRONTIER_MON_POLITOED_2,    \
+    FRONTIER_MON_CLOYSTER_2,    \
+    -1 
+
+#define FRONTIER_MONS_PARASOL_LADY_2 \
+    FRONTIER_MON_GLOOM_2,       \
+    FRONTIER_MON_SEALEO_2,      \
+    FRONTIER_MON_CASTFORM_2,    \
+    FRONTIER_MON_SANDSLASH_2,   \
+    FRONTIER_MON_TROPIUS_2,     \
+    FRONTIER_MON_MAGNETON_2,    \
+    FRONTIER_MON_MANTINE_2,     \
+    FRONTIER_MON_CACTURNE_2,    \
+    FRONTIER_MON_BELLOSSOM_2,   \
+    FRONTIER_MON_HUNTAIL_2,     \
+    FRONTIER_MON_GOREBYSS_2,    \
+    FRONTIER_MON_OMASTAR_2,     \
+    -1 
+
+#define FRONTIER_MONS_BEAUTY_1  \
+    FRONTIER_MON_DELCATTY_2,    \
+    FRONTIER_MON_LICKITUNG_2,   \
+    FRONTIER_MON_WEEPINBELL_2,  \
+    FRONTIER_MON_GLOOM_2,       \
+    FRONTIER_MON_PORYGON_2,     \
+    FRONTIER_MON_ROSELIA_2,     \
+    FRONTIER_MON_IVYSAUR_2,     \
+    FRONTIER_MON_HAUNTER_2,     \
+    FRONTIER_MON_TOGETIC_2,     \
+    FRONTIER_MON_RATICATE_2,    \
+    FRONTIER_MON_FURRET_2,      \
+    FRONTIER_MON_DUNSPARCE_2,   \
+    FRONTIER_MON_LINOONE_2,     \
+    FRONTIER_MON_CASTFORM_2,    \
+    FRONTIER_MON_WIGGLYTUFF_2,  \
+    FRONTIER_MON_QWILFISH_2,    \
+    FRONTIER_MON_SWELLOW_2,     \
+    FRONTIER_MON_ARBOK_2,       \
+    FRONTIER_MON_PERSIAN_2,     \
+    FRONTIER_MON_KECLEON_2,     \
+    FRONTIER_MON_VIGOROTH_2,    \
+    FRONTIER_MON_NOCTOWL_2,     \
+    FRONTIER_MON_VENOMOTH_2,    \
+    FRONTIER_MON_CHANSEY_2,     \
+    FRONTIER_MON_GOLBAT_2,      \
+    FRONTIER_MON_GIRAFARIG_2,   \
+    FRONTIER_MON_SEVIPER_2,     \
+    FRONTIER_MON_ZANGOOSE_2,    \
+    FRONTIER_MON_STANTLER_2,    \
+    FRONTIER_MON_SWALOT_2,      \
+    FRONTIER_MON_PIDGEOT_2,     \
+    -1 
+
+#define FRONTIER_MONS_AROMA_LADY_2 \
+    FRONTIER_MON_WEEPINBELL_2,  \
+    FRONTIER_MON_GLOOM_2,       \
+    FRONTIER_MON_KADABRA_2,     \
+    FRONTIER_MON_ROSELIA_2,     \
+    FRONTIER_MON_IVYSAUR_2,     \
+    FRONTIER_MON_PARASECT_2,    \
+    FRONTIER_MON_BAYLEEF_2,     \
+    FRONTIER_MON_WOBBUFFET_2,   \
+    FRONTIER_MON_GROVYLE_2,     \
+    FRONTIER_MON_SUNFLORA_2,    \
+    FRONTIER_MON_CHIMECHO_2,    \
+    FRONTIER_MON_TANGELA_2,     \
+    FRONTIER_MON_JUMPLUFF_2,    \
+    FRONTIER_MON_GIRAFARIG_2,   \
+    FRONTIER_MON_TROPIUS_2,     \
+    FRONTIER_MON_GRUMPIG_2,     \
+    FRONTIER_MON_CACTURNE_2,    \
+    FRONTIER_MON_BELLOSSOM_2,   \
+    -1 
+
+#define FRONTIER_MONS_COOLTRAINER_1A \
+    FRONTIER_MON_DUGTRIO_1,     \
+    FRONTIER_MON_MEDICHAM_1,    \
+    FRONTIER_MON_MISDREAVUS_1,  \
+    FRONTIER_MON_FEAROW_1,      \
+    FRONTIER_MON_GRANBULL_1,    \
+    FRONTIER_MON_JYNX_1,        \
+    FRONTIER_MON_DUSCLOPS_1,    \
+    FRONTIER_MON_DODRIO_1,      \
+    FRONTIER_MON_MR_MIME_1,     \
+    FRONTIER_MON_LANTURN_1,     \
+    FRONTIER_MON_BRELOOM_1,     \
+    FRONTIER_MON_FORRETRESS_1,  \
+    FRONTIER_MON_WHISCASH_1,    \
+    FRONTIER_MON_XATU_1,        \
+    FRONTIER_MON_SKARMORY_1,    \
+    FRONTIER_MON_MAROWAK_1,     \
+    FRONTIER_MON_QUAGSIRE_1,    \
+    FRONTIER_MON_CLEFABLE_1,    \
+    FRONTIER_MON_HARIYAMA_1,    \
+    FRONTIER_MON_RAICHU_1,      \
+    FRONTIER_MON_DEWGONG_1,     \
+    FRONTIER_MON_MANECTRIC_1,   \
+    FRONTIER_MON_VILEPLUME_1,   \
+    FRONTIER_MON_VICTREEBEL_1,  \
+    FRONTIER_MON_ELECTRODE_1,   \
+    FRONTIER_MON_EXPLOUD_1,     \
+    FRONTIER_MON_SHIFTRY_1,     \
+    FRONTIER_MON_GLALIE_1,      \
+    FRONTIER_MON_LUDICOLO_1,    \
+    FRONTIER_MON_HYPNO_1,       \
+    FRONTIER_MON_GOLEM_1,       \
+    FRONTIER_MON_RHYDON_1,      \
+    FRONTIER_MON_ALAKAZAM_1,    \
+    -1 
+
+#define FRONTIER_MONS_COOLTRAINER_1B \
+    FRONTIER_MON_WEEZING_1,     \
+    FRONTIER_MON_KANGASKHAN_1,  \
+    FRONTIER_MON_ELECTABUZZ_1,  \
+    FRONTIER_MON_TAUROS_1,      \
+    FRONTIER_MON_SLOWBRO_1,     \
+    FRONTIER_MON_SLOWKING_1,    \
+    FRONTIER_MON_MILTANK_1,     \
+    FRONTIER_MON_ALTARIA_1,     \
+    FRONTIER_MON_NIDOQUEEN_1,   \
+    FRONTIER_MON_NIDOKING_1,    \
+    FRONTIER_MON_MAGMAR_1,      \
+    FRONTIER_MON_CRADILY_1,     \
+    FRONTIER_MON_ARMALDO_1,     \
+    FRONTIER_MON_GOLDUCK_1,     \
+    FRONTIER_MON_RAPIDASH_1,    \
+    FRONTIER_MON_MUK_1,         \
+    FRONTIER_MON_GENGAR_1,      \
+    FRONTIER_MON_AMPHAROS_1,    \
+    FRONTIER_MON_SCIZOR_1,      \
+    FRONTIER_MON_HERACROSS_1,   \
+    FRONTIER_MON_URSARING_1,    \
+    FRONTIER_MON_HOUNDOOM_1,    \
+    FRONTIER_MON_DONPHAN_1,     \
+    FRONTIER_MON_CLAYDOL_1,     \
+    FRONTIER_MON_WAILORD_1,     \
+    FRONTIER_MON_NINETALES_1,   \
+    FRONTIER_MON_MACHAMP_1,     \
+    FRONTIER_MON_SHUCKLE_1,     \
+    FRONTIER_MON_STEELIX_1,     \
+    FRONTIER_MON_TENTACRUEL_1,  \
+    FRONTIER_MON_AERODACTYL_1,  \
+    FRONTIER_MON_PORYGON2_1,    \
+    FRONTIER_MON_GARDEVOIR_1,   \
+    -1 
+
+#define FRONTIER_MONS_COOLTRAINER_1C \
+    FRONTIER_MON_EXEGGUTOR_1,   \
+    FRONTIER_MON_STARMIE_1,     \
+    FRONTIER_MON_FLYGON_1,      \
+    FRONTIER_MON_VENUSAUR_1,    \
+    FRONTIER_MON_VAPOREON_1,    \
+    FRONTIER_MON_JOLTEON_1,     \
+    FRONTIER_MON_FLAREON_1,     \
+    FRONTIER_MON_MEGANIUM_1,    \
+    FRONTIER_MON_ESPEON_1,      \
+    FRONTIER_MON_UMBREON_1,     \
+    FRONTIER_MON_BLASTOISE_1,   \
+    FRONTIER_MON_FERALIGATR_1,  \
+    FRONTIER_MON_AGGRON_1,      \
+    FRONTIER_MON_BLAZIKEN_1,    \
+    FRONTIER_MON_WALREIN_1,     \
+    FRONTIER_MON_SCEPTILE_1,    \
+    FRONTIER_MON_CHARIZARD_1,   \
+    FRONTIER_MON_TYPHLOSION_1,  \
+    FRONTIER_MON_LAPRAS_1,      \
+    FRONTIER_MON_CROBAT_1,      \
+    FRONTIER_MON_SWAMPERT_1,    \
+    FRONTIER_MON_GYARADOS_1,    \
+    FRONTIER_MON_SNORLAX_1,     \
+    FRONTIER_MON_KINGDRA_1,     \
+    FRONTIER_MON_BLISSEY_1,     \
+    FRONTIER_MON_MILOTIC_1,     \
+    FRONTIER_MON_ARCANINE_1,    \
+    FRONTIER_MON_SALAMENCE_1,   \
+    FRONTIER_MON_METAGROSS_1,   \
+    FRONTIER_MON_SLAKING_1,     \
+    -1 
+
+#define FRONTIER_MONS_PKMN_RANGER_1 \
+    FRONTIER_MON_NINJASK_1,     \
+    FRONTIER_MON_VENOMOTH_2,    \
+    FRONTIER_MON_NINJASK_2,     \
+    FRONTIER_MON_SCYTHER_2,     \
+    FRONTIER_MON_PINSIR_2,      \
+    FRONTIER_MON_FEAROW_1,      \
+    FRONTIER_MON_GRANBULL_1,    \
+    FRONTIER_MON_DODRIO_1,      \
+    FRONTIER_MON_BRELOOM_1,     \
+    FRONTIER_MON_FORRETRESS_1,  \
+    FRONTIER_MON_CLEFABLE_1,    \
+    FRONTIER_MON_VILEPLUME_1,   \
+    FRONTIER_MON_VICTREEBEL_1,  \
+    FRONTIER_MON_EXPLOUD_1,     \
+    FRONTIER_MON_SHIFTRY_1,     \
+    FRONTIER_MON_LUDICOLO_1,    \
+    FRONTIER_MON_KANGASKHAN_1,  \
+    FRONTIER_MON_TAUROS_1,      \
+    FRONTIER_MON_MILTANK_1,     \
+    FRONTIER_MON_CRADILY_1,     \
+    FRONTIER_MON_ARMALDO_1,     \
+    FRONTIER_MON_SCIZOR_1,      \
+    FRONTIER_MON_HERACROSS_1,   \
+    FRONTIER_MON_URSARING_1,    \
+    FRONTIER_MON_SHUCKLE_1,     \
+    FRONTIER_MON_PORYGON2_1,    \
+    FRONTIER_MON_EXEGGUTOR_1,   \
+    FRONTIER_MON_VENUSAUR_1,    \
+    FRONTIER_MON_MEGANIUM_1,    \
+    FRONTIER_MON_SCEPTILE_1,    \
+    FRONTIER_MON_SNORLAX_1,     \
+    FRONTIER_MON_BLISSEY_1,     \
+    FRONTIER_MON_SLAKING_1,     \
+    -1
+
+#define FRONTIER_MONS_DRAGON_TAMER_1 \
+    FRONTIER_MON_SKARMORY_1,    \
+    FRONTIER_MON_RHYDON_1,      \
+    FRONTIER_MON_ALTARIA_1,     \
+    FRONTIER_MON_NIDOQUEEN_1,   \
+    FRONTIER_MON_NIDOKING_1,    \
+    FRONTIER_MON_STEELIX_1,     \
+    FRONTIER_MON_AERODACTYL_1,  \
+    FRONTIER_MON_FLYGON_1,      \
+    FRONTIER_MON_AGGRON_1,      \
+    FRONTIER_MON_SCEPTILE_1,    \
+    FRONTIER_MON_CHARIZARD_1,   \
+    FRONTIER_MON_LAPRAS_1,      \
+    FRONTIER_MON_GYARADOS_1,    \
+    FRONTIER_MON_KINGDRA_1,     \
+    FRONTIER_MON_MILOTIC_1,     \
+    FRONTIER_MON_ARCANINE_1,    \
+    FRONTIER_MON_SALAMENCE_1,   \
+    -1
+
+#define FRONTIER_MONS_POKEFAN_2 \
+    FRONTIER_MON_MISDREAVUS_1,  \
+    FRONTIER_MON_LANTURN_1,     \
+    FRONTIER_MON_BRELOOM_1,     \
+    FRONTIER_MON_XATU_1,        \
+    FRONTIER_MON_QUAGSIRE_1,    \
+    FRONTIER_MON_CLEFABLE_1,    \
+    FRONTIER_MON_RAICHU_1,      \
+    FRONTIER_MON_DEWGONG_1,     \
+    FRONTIER_MON_VILEPLUME_1,   \
+    FRONTIER_MON_SLOWBRO_1,     \
+    FRONTIER_MON_MILTANK_1,     \
+    FRONTIER_MON_ALTARIA_1,     \
+    FRONTIER_MON_RAPIDASH_1,    \
+    FRONTIER_MON_NINETALES_1,   \
+    FRONTIER_MON_SHUCKLE_1,     \
+    FRONTIER_MON_PORYGON2_1,    \
+    FRONTIER_MON_FLYGON_1,      \
+    FRONTIER_MON_LAPRAS_1,      \
+    FRONTIER_MON_SNORLAX_1,     \
+    FRONTIER_MON_BLISSEY_1,     \
+    FRONTIER_MON_MILOTIC_1,     \
+    FRONTIER_MON_SLAKING_1,     \
+    -1
+
+#define FRONTIER_MONS_PKMN_BREEDER_M_1 \
+    FRONTIER_MON_MUK_1,         \
+    FRONTIER_MON_GENGAR_1,      \
+    FRONTIER_MON_AMPHAROS_1,    \
+    FRONTIER_MON_SCIZOR_1,      \
+    FRONTIER_MON_HERACROSS_1,   \
+    FRONTIER_MON_URSARING_1,    \
+    FRONTIER_MON_HOUNDOOM_1,    \
+    FRONTIER_MON_DONPHAN_1,     \
+    FRONTIER_MON_CLAYDOL_1,     \
+    FRONTIER_MON_WAILORD_1,     \
+    FRONTIER_MON_NINETALES_1,   \
+    FRONTIER_MON_MACHAMP_1,     \
+    FRONTIER_MON_SHUCKLE_1,     \
+    FRONTIER_MON_STEELIX_1,     \
+    FRONTIER_MON_TENTACRUEL_1,  \
+    FRONTIER_MON_AERODACTYL_1,  \
+    FRONTIER_MON_PORYGON2_1,    \
+    FRONTIER_MON_GARDEVOIR_1,   \
+    FRONTIER_MON_EXEGGUTOR_1,   \
+    FRONTIER_MON_STARMIE_1,     \
+    FRONTIER_MON_FLYGON_1,      \
+    FRONTIER_MON_VENUSAUR_1,    \
+    FRONTIER_MON_VAPOREON_1,    \
+    FRONTIER_MON_JOLTEON_1,     \
+    FRONTIER_MON_FLAREON_1,     \
+    FRONTIER_MON_MEGANIUM_1,    \
+    FRONTIER_MON_ESPEON_1,      \
+    FRONTIER_MON_UMBREON_1,     \
+    FRONTIER_MON_BLASTOISE_1,   \
+    FRONTIER_MON_FERALIGATR_1,  \
+    FRONTIER_MON_AGGRON_1,      \
+    FRONTIER_MON_BLAZIKEN_1,    \
+    FRONTIER_MON_WALREIN_1,     \
+    FRONTIER_MON_SCEPTILE_1,    \
+    FRONTIER_MON_CHARIZARD_1,   \
+    FRONTIER_MON_TYPHLOSION_1,  \
+    FRONTIER_MON_LAPRAS_1,      \
+    FRONTIER_MON_CROBAT_1,      \
+    FRONTIER_MON_SWAMPERT_1,    \
+    FRONTIER_MON_GYARADOS_1,    \
+    FRONTIER_MON_SNORLAX_1,     \
+    FRONTIER_MON_KINGDRA_1,     \
+    FRONTIER_MON_BLISSEY_1,     \
+    FRONTIER_MON_MILOTIC_1,     \
+    FRONTIER_MON_ARCANINE_1,    \
+    FRONTIER_MON_SALAMENCE_1,   \
+    FRONTIER_MON_METAGROSS_1,   \
+    FRONTIER_MON_SLAKING_1,     \
+    -1 
+
+#define FRONTIER_MONS_PKMN_BREEDER_F_1 \
+    FRONTIER_MON_DUGTRIO_1,     \
+    FRONTIER_MON_MEDICHAM_1,    \
+    FRONTIER_MON_MISDREAVUS_1,  \
+    FRONTIER_MON_FEAROW_1,      \
+    FRONTIER_MON_GRANBULL_1,    \
+    FRONTIER_MON_JYNX_1,        \
+    FRONTIER_MON_DUSCLOPS_1,    \
+    FRONTIER_MON_DODRIO_1,      \
+    FRONTIER_MON_MR_MIME_1,     \
+    FRONTIER_MON_LANTURN_1,     \
+    FRONTIER_MON_BRELOOM_1,     \
+    FRONTIER_MON_FORRETRESS_1,  \
+    FRONTIER_MON_WHISCASH_1,    \
+    FRONTIER_MON_XATU_1,        \
+    FRONTIER_MON_SKARMORY_1,    \
+    FRONTIER_MON_MAROWAK_1,     \
+    FRONTIER_MON_QUAGSIRE_1,    \
+    FRONTIER_MON_CLEFABLE_1,    \
+    FRONTIER_MON_HARIYAMA_1,    \
+    FRONTIER_MON_RAICHU_1,      \
+    FRONTIER_MON_DEWGONG_1,     \
+    FRONTIER_MON_MANECTRIC_1,   \
+    FRONTIER_MON_VILEPLUME_1,   \
+    FRONTIER_MON_VICTREEBEL_1,  \
+    FRONTIER_MON_ELECTRODE_1,   \
+    FRONTIER_MON_EXPLOUD_1,     \
+    FRONTIER_MON_SHIFTRY_1,     \
+    FRONTIER_MON_GLALIE_1,      \
+    FRONTIER_MON_LUDICOLO_1,    \
+    FRONTIER_MON_HYPNO_1,       \
+    FRONTIER_MON_GOLEM_1,       \
+    FRONTIER_MON_RHYDON_1,      \
+    FRONTIER_MON_ALAKAZAM_1,    \
+    FRONTIER_MON_WEEZING_1,     \
+    FRONTIER_MON_KANGASKHAN_1,  \
+    FRONTIER_MON_ELECTABUZZ_1,  \
+    FRONTIER_MON_TAUROS_1,      \
+    FRONTIER_MON_SLOWBRO_1,     \
+    FRONTIER_MON_SLOWKING_1,    \
+    FRONTIER_MON_MILTANK_1,     \
+    FRONTIER_MON_ALTARIA_1,     \
+    FRONTIER_MON_NIDOQUEEN_1,   \
+    FRONTIER_MON_NIDOKING_1,    \
+    FRONTIER_MON_MAGMAR_1,      \
+    FRONTIER_MON_CRADILY_1,     \
+    FRONTIER_MON_ARMALDO_1,     \
+    FRONTIER_MON_GOLDUCK_1,     \
+    FRONTIER_MON_RAPIDASH_1,    \
+    -1 
+
+// Odd, all the other Youngster/Lass trainers of this group have Dugtrio, but one does not
+#define FRONTIER_MONS_YOUNGSTER_LASS_2_NO_DUGTRIO \
+    FRONTIER_MON_MEDICHAM_2,    \
+    FRONTIER_MON_MAROWAK_2,     \
+    FRONTIER_MON_QUAGSIRE_2,    \
+    FRONTIER_MON_MISDREAVUS_2,  \
+    FRONTIER_MON_FEAROW_2,      \
+    FRONTIER_MON_GRANBULL_2,    \
+    FRONTIER_MON_JYNX_2,        \
+    FRONTIER_MON_DUSCLOPS_2,    \
+    FRONTIER_MON_DODRIO_2,      \
+    FRONTIER_MON_MR_MIME_2,     \
+    FRONTIER_MON_LANTURN_2,     \
+    FRONTIER_MON_BRELOOM_2,     \
+    FRONTIER_MON_FORRETRESS_2,  \
+    FRONTIER_MON_SKARMORY_2,    \
+    FRONTIER_MON_WHISCASH_2,    \
+    FRONTIER_MON_XATU_2,        \
+    FRONTIER_MON_CLEFABLE_2,    \
+    FRONTIER_MON_HARIYAMA_2,    \
+    FRONTIER_MON_RAICHU_2,      \
+    FRONTIER_MON_DEWGONG_2,     \
+    FRONTIER_MON_MANECTRIC_2,   \
+    FRONTIER_MON_VILEPLUME_2,   \
+    FRONTIER_MON_VICTREEBEL_2,  \
+    FRONTIER_MON_ELECTRODE_2,   \
+    FRONTIER_MON_EXPLOUD_2,     \
+    FRONTIER_MON_SHIFTRY_2,     \
+    FRONTIER_MON_GLALIE_2,      \
+    FRONTIER_MON_LUDICOLO_2,    \
+    FRONTIER_MON_HYPNO_2,       \
+    FRONTIER_MON_GOLEM_2,       \
+    FRONTIER_MON_RHYDON_2,      \
+    FRONTIER_MON_ALAKAZAM_2,    \
+    -1 
+
+#define FRONTIER_MONS_YOUNGSTER_LASS_2 \
+    FRONTIER_MON_DUGTRIO_2,            \
+    FRONTIER_MONS_YOUNGSTER_LASS_2_NO_DUGTRIO
+
+#define FRONTIER_MONS_SCHOOL_KID_2 \
+    FRONTIER_MON_WEEZING_2,     \
+    FRONTIER_MON_KANGASKHAN_2,  \
+    FRONTIER_MON_ELECTABUZZ_2,  \
+    FRONTIER_MON_TAUROS_2,      \
+    FRONTIER_MON_SLOWBRO_2,     \
+    FRONTIER_MON_SLOWKING_2,    \
+    FRONTIER_MON_MILTANK_2,     \
+    FRONTIER_MON_ALTARIA_2,     \
+    FRONTIER_MON_NIDOQUEEN_2,   \
+    FRONTIER_MON_NIDOKING_2,    \
+    FRONTIER_MON_MAGMAR_2,      \
+    FRONTIER_MON_CRADILY_2,     \
+    FRONTIER_MON_ARMALDO_2,     \
+    FRONTIER_MON_GOLDUCK_2,     \
+    FRONTIER_MON_RAPIDASH_2,    \
+    FRONTIER_MON_MUK_2,         \
+    FRONTIER_MON_GENGAR_2,      \
+    FRONTIER_MON_AMPHAROS_2,    \
+    FRONTIER_MON_SCIZOR_2,      \
+    FRONTIER_MON_HERACROSS_2,   \
+    FRONTIER_MON_URSARING_2,    \
+    FRONTIER_MON_HOUNDOOM_2,    \
+    FRONTIER_MON_DONPHAN_2,     \
+    FRONTIER_MON_CLAYDOL_2,     \
+    FRONTIER_MON_WAILORD_2,     \
+    FRONTIER_MON_NINETALES_2,   \
+    FRONTIER_MON_MACHAMP_2,     \
+    FRONTIER_MON_SHUCKLE_2,     \
+    FRONTIER_MON_STEELIX_2,     \
+    FRONTIER_MON_TENTACRUEL_2,  \
+    FRONTIER_MON_AERODACTYL_2,  \
+    FRONTIER_MON_PORYGON2_2,    \
+    FRONTIER_MON_GARDEVOIR_2,   \
+    -1
+
+#define FRONTIER_MONS_RICH_BOY_LADY_2 \
+    FRONTIER_MON_EXEGGUTOR_2,   \
+    FRONTIER_MON_STARMIE_2,     \
+    FRONTIER_MON_FLYGON_2,      \
+    FRONTIER_MON_VENUSAUR_2,    \
+    FRONTIER_MON_VAPOREON_2,    \
+    FRONTIER_MON_JOLTEON_2,     \
+    FRONTIER_MON_FLAREON_2,     \
+    FRONTIER_MON_MEGANIUM_2,    \
+    FRONTIER_MON_ESPEON_2,      \
+    FRONTIER_MON_UMBREON_2,     \
+    FRONTIER_MON_BLASTOISE_2,   \
+    FRONTIER_MON_FERALIGATR_2,  \
+    FRONTIER_MON_AGGRON_2,      \
+    FRONTIER_MON_BLAZIKEN_2,    \
+    FRONTIER_MON_WALREIN_2,     \
+    FRONTIER_MON_SCEPTILE_2,    \
+    FRONTIER_MON_CHARIZARD_2,   \
+    FRONTIER_MON_TYPHLOSION_2,  \
+    FRONTIER_MON_LAPRAS_2,      \
+    FRONTIER_MON_CROBAT_2,      \
+    FRONTIER_MON_SWAMPERT_2,    \
+    FRONTIER_MON_GYARADOS_2,    \
+    FRONTIER_MON_SNORLAX_2,     \
+    FRONTIER_MON_KINGDRA_2,     \
+    FRONTIER_MON_BLISSEY_2,     \
+    FRONTIER_MON_MILOTIC_2,     \
+    FRONTIER_MON_ARCANINE_2,    \
+    FRONTIER_MON_SALAMENCE_2,   \
+    FRONTIER_MON_METAGROSS_2,   \
+    FRONTIER_MON_SLAKING_2,     \
+    -1 
+
+#define FRONTIER_MONS_BUG_CATCHER_2 \
+    FRONTIER_MON_NINJASK_2,     \
+    FRONTIER_MON_SCYTHER_2,     \
+    FRONTIER_MON_PINSIR_2,      \
+    FRONTIER_MON_FORRETRESS_1,  \
+    FRONTIER_MON_ARMALDO_1,     \
+    FRONTIER_MON_SCIZOR_1,      \
+    FRONTIER_MON_HERACROSS_1,   \
+    FRONTIER_MON_SHUCKLE_1,     \
+    FRONTIER_MON_BRELOOM_2,     \
+    FRONTIER_MON_FORRETRESS_2,  \
+    FRONTIER_MON_VILEPLUME_2,   \
+    FRONTIER_MON_VICTREEBEL_2,  \
+    FRONTIER_MON_SHIFTRY_2,     \
+    FRONTIER_MON_LUDICOLO_2,    \
+    FRONTIER_MON_CRADILY_2,     \
+    FRONTIER_MON_ARMALDO_2,     \
+    FRONTIER_MON_SCIZOR_2,      \
+    FRONTIER_MON_HERACROSS_2,   \
+    FRONTIER_MON_SHUCKLE_2,     \
+    FRONTIER_MON_EXEGGUTOR_2,   \
+    FRONTIER_MON_VENUSAUR_2,    \
+    FRONTIER_MON_MEGANIUM_2,    \
+    FRONTIER_MON_SCEPTILE_2,    \
+    -1 
+
+#define FRONTIER_MONS_NINJA_BOY_2 \
+    FRONTIER_MON_PARASECT_2,    \
+    FRONTIER_MON_VENOMOTH_2,    \
+    FRONTIER_MON_NINJASK_2,     \
+    FRONTIER_MON_SCYTHER_2,     \
+    FRONTIER_MON_PINSIR_2,      \
+    FRONTIER_MON_MEDICHAM_2,    \
+    FRONTIER_MON_MISDREAVUS_2,  \
+    FRONTIER_MON_JYNX_2,        \
+    FRONTIER_MON_DUSCLOPS_2,    \
+    FRONTIER_MON_MR_MIME_2,     \
+    FRONTIER_MON_FORRETRESS_2,  \
+    FRONTIER_MON_XATU_2,        \
+    FRONTIER_MON_VILEPLUME_2,   \
+    FRONTIER_MON_VICTREEBEL_2,  \
+    FRONTIER_MON_HYPNO_2,       \
+    FRONTIER_MON_ALAKAZAM_2,    \
+    FRONTIER_MON_WEEZING_2,     \
+    FRONTIER_MON_NIDOQUEEN_2,   \
+    FRONTIER_MON_NIDOKING_2,    \
+    FRONTIER_MON_ARMALDO_2,     \
+    FRONTIER_MON_MUK_2,         \
+    FRONTIER_MON_GENGAR_2,      \
+    FRONTIER_MON_SCIZOR_2,      \
+    FRONTIER_MON_HERACROSS_2,   \
+    FRONTIER_MON_CLAYDOL_2,     \
+    FRONTIER_MON_SHUCKLE_2,     \
+    FRONTIER_MON_TENTACRUEL_2,  \
+    FRONTIER_MON_GARDEVOIR_2,   \
+    FRONTIER_MON_EXEGGUTOR_2,   \
+    FRONTIER_MON_VENUSAUR_2,    \
+    FRONTIER_MON_ESPEON_2,      \
+    FRONTIER_MON_CROBAT_2,      \
+    -1 
+
+#define FRONTIER_MONS_TUBER_2   \
+    FRONTIER_MON_QUAGSIRE_2,    \
+    FRONTIER_MON_GRANBULL_2,    \
+    FRONTIER_MON_JYNX_2,        \
+    FRONTIER_MON_LANTURN_2,     \
+    FRONTIER_MON_WHISCASH_2,    \
+    FRONTIER_MON_CLEFABLE_2,    \
+    FRONTIER_MON_DEWGONG_2,     \
+    FRONTIER_MON_EXPLOUD_2,     \
+    FRONTIER_MON_GLALIE_2,      \
+    FRONTIER_MON_LUDICOLO_2,    \
+    FRONTIER_MON_KANGASKHAN_2,  \
+    FRONTIER_MON_TAUROS_2,      \
+    FRONTIER_MON_SLOWBRO_2,     \
+    FRONTIER_MON_SLOWKING_2,    \
+    FRONTIER_MON_MILTANK_2,     \
+    FRONTIER_MON_GOLDUCK_2,     \
+    FRONTIER_MON_URSARING_2,    \
+    FRONTIER_MON_WAILORD_2,     \
+    FRONTIER_MON_TENTACRUEL_2,  \
+    FRONTIER_MON_PORYGON2_2,    \
+    FRONTIER_MON_STARMIE_2,     \
+    FRONTIER_MON_VAPOREON_2,    \
+    FRONTIER_MON_BLASTOISE_2,   \
+    FRONTIER_MON_FERALIGATR_2,  \
+    FRONTIER_MON_WALREIN_2,     \
+    FRONTIER_MON_LAPRAS_2,      \
+    FRONTIER_MON_SWAMPERT_2,    \
+    FRONTIER_MON_GYARADOS_2,    \
+    FRONTIER_MON_SNORLAX_2,     \
+    FRONTIER_MON_KINGDRA_2,     \
+    FRONTIER_MON_BLISSEY_2,     \
+    FRONTIER_MON_MILOTIC_2,     \
+    FRONTIER_MON_SLAKING_2,     \
+    -1
+
+#define FRONTIER_MONS_BUG_MANIAC_3 \
+    FRONTIER_MON_VOLBEAT_2,     \
+    FRONTIER_MON_ILLUMISE_2,    \
+    FRONTIER_MON_PARASECT_2,    \
+    FRONTIER_MON_MASQUERAIN_2,  \
+    FRONTIER_MON_VENOMOTH_2,    \
+    FRONTIER_MON_NINJASK_2,     \
+    FRONTIER_MON_SCYTHER_2,     \
+    FRONTIER_MON_PINSIR_2,      \
+    FRONTIER_MON_FORRETRESS_1,  \
+    FRONTIER_MON_ARMALDO_1,     \
+    FRONTIER_MON_SCIZOR_1,      \
+    FRONTIER_MON_HERACROSS_1,   \
+    FRONTIER_MON_SHUCKLE_1,     \
+    FRONTIER_MON_FORRETRESS_2,  \
+    FRONTIER_MON_ARMALDO_2,     \
+    FRONTIER_MON_SCIZOR_2,      \
+    FRONTIER_MON_HERACROSS_2,   \
+    FRONTIER_MON_SHUCKLE_2,     \
+    FRONTIER_MON_FORRETRESS_3,  \
+    FRONTIER_MON_ARMALDO_3,     \
+    FRONTIER_MON_SCIZOR_3,      \
+    FRONTIER_MON_HERACROSS_3,   \
+    FRONTIER_MON_SHUCKLE_3,     \
+    -1
+
+#define FRONTIER_MONS_FISHERMAN_2 \
+    FRONTIER_MON_QWILFISH_2,    \
+    FRONTIER_MON_SEAKING_2,     \
+    FRONTIER_MON_SHARPEDO_2,    \
+    FRONTIER_MON_MANTINE_2,     \
+    FRONTIER_MON_CRAWDAUNT_2,   \
+    FRONTIER_MON_KINGLER_2,     \
+    FRONTIER_MON_OCTILLERY_2,   \
+    FRONTIER_MON_HUNTAIL_2,     \
+    FRONTIER_MON_GOREBYSS_2,    \
+    FRONTIER_MON_RELICANTH_2,   \
+    FRONTIER_MON_LANTURN_3,     \
+    FRONTIER_MON_WHISCASH_3,    \
+    FRONTIER_MON_WAILORD_3,     \
+    FRONTIER_MON_TENTACRUEL_3,  \
+    FRONTIER_MON_STARMIE_3,     \
+    -1 
+
+#define FRONTIER_MONS_RUIN_MANIAC_3 \
+    FRONTIER_MON_DUGTRIO_3,     \
+    FRONTIER_MON_FORRETRESS_3,  \
+    FRONTIER_MON_WHISCASH_3,    \
+    FRONTIER_MON_SKARMORY_3,    \
+    FRONTIER_MON_MAROWAK_3,     \
+    FRONTIER_MON_QUAGSIRE_3,    \
+    FRONTIER_MON_GOLEM_3,       \
+    FRONTIER_MON_RHYDON_3,      \
+    FRONTIER_MON_NIDOQUEEN_3,   \
+    FRONTIER_MON_NIDOKING_3,    \
+    FRONTIER_MON_CRADILY_3,     \
+    FRONTIER_MON_ARMALDO_3,     \
+    FRONTIER_MON_SCIZOR_3,      \
+    FRONTIER_MON_DONPHAN_3,     \
+    FRONTIER_MON_CLAYDOL_3,     \
+    FRONTIER_MON_SHUCKLE_3,     \
+    FRONTIER_MON_STEELIX_3,     \
+    FRONTIER_MON_AERODACTYL_3,  \
+    FRONTIER_MON_FLYGON_3,      \
+    FRONTIER_MON_AGGRON_3,      \
+    FRONTIER_MON_SWAMPERT_3,    \
+    FRONTIER_MON_METAGROSS_3,   \
+    -1 
+
+#define FRONTIER_MONS_COLLECTOR_2 \
+    FRONTIER_MON_DUGTRIO_3,     \
+    FRONTIER_MON_MEDICHAM_3,    \
+    FRONTIER_MON_MISDREAVUS_3,  \
+    FRONTIER_MON_FEAROW_3,      \
+    FRONTIER_MON_GRANBULL_3,    \
+    FRONTIER_MON_JYNX_3,        \
+    FRONTIER_MON_DUSCLOPS_3,    \
+    FRONTIER_MON_DODRIO_3,      \
+    FRONTIER_MON_MR_MIME_3,     \
+    FRONTIER_MON_LANTURN_3,     \
+    FRONTIER_MON_BRELOOM_3,     \
+    FRONTIER_MON_FORRETRESS_3,  \
+    FRONTIER_MON_WHISCASH_3,    \
+    FRONTIER_MON_XATU_3,        \
+    FRONTIER_MON_SKARMORY_3,    \
+    FRONTIER_MON_MAROWAK_3,     \
+    FRONTIER_MON_QUAGSIRE_3,    \
+    FRONTIER_MON_CLEFABLE_3,    \
+    FRONTIER_MON_HARIYAMA_3,    \
+    FRONTIER_MON_RAICHU_3,      \
+    FRONTIER_MON_DEWGONG_3,     \
+    FRONTIER_MON_MANECTRIC_3,   \
+    FRONTIER_MON_VILEPLUME_3,   \
+    FRONTIER_MON_VICTREEBEL_3,  \
+    FRONTIER_MON_ELECTRODE_3,   \
+    FRONTIER_MON_EXPLOUD_3,     \
+    FRONTIER_MON_SHIFTRY_3,     \
+    FRONTIER_MON_GLALIE_3,      \
+    FRONTIER_MON_LUDICOLO_3,    \
+    FRONTIER_MON_HYPNO_3,       \
+    FRONTIER_MON_GOLEM_3,       \
+    FRONTIER_MON_RHYDON_3,      \
+    FRONTIER_MON_ALAKAZAM_3,    \
+    FRONTIER_MON_WEEZING_3,     \
+    FRONTIER_MON_KANGASKHAN_3,  \
+    FRONTIER_MON_ELECTABUZZ_3,  \
+    FRONTIER_MON_TAUROS_3,      \
+    FRONTIER_MON_SLOWBRO_3,     \
+    FRONTIER_MON_SLOWKING_3,    \
+    FRONTIER_MON_MILTANK_3,     \
+    FRONTIER_MON_ALTARIA_3,     \
+    FRONTIER_MON_NIDOQUEEN_3,   \
+    FRONTIER_MON_NIDOKING_3,    \
+    FRONTIER_MON_MAGMAR_3,      \
+    FRONTIER_MON_CRADILY_3,     \
+    FRONTIER_MON_ARMALDO_3,     \
+    FRONTIER_MON_GOLDUCK_3,     \
+    FRONTIER_MON_RAPIDASH_3,    \
+    -1 
+
+#define FRONTIER_MONS_GUITARIST_2 \
+    FRONTIER_MON_SABLEYE_2,     \
+    FRONTIER_MON_MIGHTYENA_2,   \
+    FRONTIER_MON_SNEASEL_2,     \
+    FRONTIER_MON_MAGNETON_2,    \
+    FRONTIER_MON_ABSOL_2,       \
+    FRONTIER_MON_LANTURN_3,     \
+    FRONTIER_MON_RAICHU_3,      \
+    FRONTIER_MON_MANECTRIC_3,   \
+    FRONTIER_MON_ELECTRODE_3,   \
+    FRONTIER_MON_SHIFTRY_3,     \
+    FRONTIER_MON_ELECTABUZZ_3,  \
+    FRONTIER_MON_AMPHAROS_3,    \
+    FRONTIER_MON_HOUNDOOM_3,    \
+    FRONTIER_MON_JOLTEON_3,     \
+    FRONTIER_MON_UMBREON_3,     \
+    -1 
+
+#define FRONTIER_MONS_BIRD_KEEPER_2 \
+    FRONTIER_MON_MURKROW_2,     \
+    FRONTIER_MON_PELIPPER_2,    \
+    FRONTIER_MON_SWELLOW_2,     \
+    FRONTIER_MON_NOCTOWL_2,     \
+    FRONTIER_MON_PIDGEOT_2,     \
+    FRONTIER_MON_FEAROW_1,      \
+    FRONTIER_MON_DODRIO_1,      \
+    FRONTIER_MON_XATU_1,        \
+    FRONTIER_MON_SKARMORY_1,    \
+    FRONTIER_MON_CROBAT_1,      \
+    FRONTIER_MON_FEAROW_2,      \
+    FRONTIER_MON_DODRIO_2,      \
+    FRONTIER_MON_SKARMORY_2,    \
+    FRONTIER_MON_XATU_2,        \
+    FRONTIER_MON_CROBAT_2,      \
+    FRONTIER_MON_FEAROW_3,      \
+    FRONTIER_MON_DODRIO_3,      \
+    FRONTIER_MON_XATU_3,        \
+    FRONTIER_MON_SKARMORY_3,    \
+    FRONTIER_MON_CROBAT_3,      \
+    -1
+
+#define FRONTIER_MONS_SAILOR_2  \
+    FRONTIER_MON_MEDICHAM_3,    \
+    FRONTIER_MON_LANTURN_3,     \
+    FRONTIER_MON_WHISCASH_3,    \
+    FRONTIER_MON_QUAGSIRE_3,    \
+    FRONTIER_MON_HARIYAMA_3,    \
+    FRONTIER_MON_DEWGONG_3,     \
+    FRONTIER_MON_LUDICOLO_3,    \
+    FRONTIER_MON_SLOWBRO_3,     \
+    FRONTIER_MON_SLOWKING_3,    \
+    FRONTIER_MON_GOLDUCK_3,     \
+    FRONTIER_MON_WAILORD_3,     \
+    FRONTIER_MON_MACHAMP_3,     \
+    FRONTIER_MON_TENTACRUEL_3,  \
+    FRONTIER_MON_STARMIE_3,     \
+    FRONTIER_MON_VAPOREON_3,    \
+    FRONTIER_MON_BLASTOISE_3,   \
+    FRONTIER_MON_FERALIGATR_3,  \
+    FRONTIER_MON_WALREIN_3,     \
+    FRONTIER_MON_LAPRAS_3,      \
+    FRONTIER_MON_SWAMPERT_3,    \
+    FRONTIER_MON_GYARADOS_3,    \
+    FRONTIER_MON_KINGDRA_3,     \
+    FRONTIER_MON_MILOTIC_3,     \
+    -1
+
+#define FRONTIER_MONS_HIKER_2   \
+    FRONTIER_MON_DUGTRIO_3,     \
+    FRONTIER_MON_MEDICHAM_3,    \
+    FRONTIER_MON_BRELOOM_3,     \
+    FRONTIER_MON_MAROWAK_3,     \
+    FRONTIER_MON_HARIYAMA_3,    \
+    FRONTIER_MON_GOLEM_3,       \
+    FRONTIER_MON_RHYDON_3,      \
+    FRONTIER_MON_NIDOQUEEN_3,   \
+    FRONTIER_MON_NIDOKING_3,    \
+    FRONTIER_MON_CRADILY_3,     \
+    FRONTIER_MON_ARMALDO_3,     \
+    FRONTIER_MON_HERACROSS_3,   \
+    FRONTIER_MON_DONPHAN_3,     \
+    FRONTIER_MON_CLAYDOL_3,     \
+    FRONTIER_MON_MACHAMP_3,     \
+    FRONTIER_MON_SHUCKLE_3,     \
+    FRONTIER_MON_STEELIX_3,     \
+    FRONTIER_MON_AERODACTYL_3,  \
+    FRONTIER_MON_AGGRON_3,      \
+    FRONTIER_MON_BLAZIKEN_3,    \
+    -1 
+
+#define FRONTIER_MONS_KINDLER_2 \
+    FRONTIER_MON_GRANBULL_3,    \
+    FRONTIER_MON_CLEFABLE_3,    \
+    FRONTIER_MON_EXPLOUD_3,     \
+    FRONTIER_MON_KANGASKHAN_3,  \
+    FRONTIER_MON_TAUROS_3,      \
+    FRONTIER_MON_MILTANK_3,     \
+    FRONTIER_MON_MAGMAR_3,      \
+    FRONTIER_MON_RAPIDASH_3,    \
+    FRONTIER_MON_URSARING_3,    \
+    FRONTIER_MON_HOUNDOOM_3,    \
+    FRONTIER_MON_NINETALES_3,   \
+    FRONTIER_MON_FLAREON_3,     \
+    FRONTIER_MON_BLAZIKEN_3,    \
+    FRONTIER_MON_CHARIZARD_3,   \
+    FRONTIER_MON_TYPHLOSION_3,  \
+    FRONTIER_MON_SNORLAX_3,     \
+    FRONTIER_MON_BLISSEY_3,     \
+    FRONTIER_MON_ARCANINE_3,    \
+    FRONTIER_MON_SLAKING_3,     \
+    -1 
+
+#define FRONTIER_MONS_GENTLEMAN_2 \
+    FRONTIER_MON_MUK_3,         \
+    FRONTIER_MON_GENGAR_3,      \
+    FRONTIER_MON_AMPHAROS_3,    \
+    FRONTIER_MON_SCIZOR_3,      \
+    FRONTIER_MON_HERACROSS_3,   \
+    FRONTIER_MON_URSARING_3,    \
+    FRONTIER_MON_HOUNDOOM_3,    \
+    FRONTIER_MON_DONPHAN_3,     \
+    FRONTIER_MON_CLAYDOL_3,     \
+    FRONTIER_MON_WAILORD_3,     \
+    FRONTIER_MON_NINETALES_3,   \
+    FRONTIER_MON_MACHAMP_3,     \
+    FRONTIER_MON_SHUCKLE_3,     \
+    FRONTIER_MON_STEELIX_3,     \
+    FRONTIER_MON_TENTACRUEL_3,  \
+    FRONTIER_MON_AERODACTYL_3,  \
+    FRONTIER_MON_PORYGON2_3,    \
+    FRONTIER_MON_GARDEVOIR_3,   \
+    FRONTIER_MON_EXEGGUTOR_3,   \
+    FRONTIER_MON_STARMIE_3,     \
+    FRONTIER_MON_FLYGON_3,      \
+    FRONTIER_MON_VENUSAUR_3,    \
+    FRONTIER_MON_VAPOREON_3,    \
+    FRONTIER_MON_JOLTEON_3,     \
+    FRONTIER_MON_FLAREON_3,     \
+    FRONTIER_MON_MEGANIUM_3,    \
+    FRONTIER_MON_ESPEON_3,      \
+    FRONTIER_MON_UMBREON_3,     \
+    FRONTIER_MON_BLASTOISE_3,   \
+    FRONTIER_MON_FERALIGATR_3,  \
+    FRONTIER_MON_AGGRON_3,      \
+    FRONTIER_MON_BLAZIKEN_3,    \
+    FRONTIER_MON_WALREIN_3,     \
+    FRONTIER_MON_SCEPTILE_3,    \
+    FRONTIER_MON_CHARIZARD_3,   \
+    FRONTIER_MON_TYPHLOSION_3,  \
+    FRONTIER_MON_LAPRAS_3,      \
+    FRONTIER_MON_CROBAT_3,      \
+    FRONTIER_MON_SWAMPERT_3,    \
+    FRONTIER_MON_GYARADOS_3,    \
+    FRONTIER_MON_SNORLAX_3,     \
+    FRONTIER_MON_KINGDRA_3,     \
+    FRONTIER_MON_BLISSEY_3,     \
+    FRONTIER_MON_MILOTIC_3,     \
+    FRONTIER_MON_ARCANINE_3,    \
+    FRONTIER_MON_SALAMENCE_3,   \
+    FRONTIER_MON_METAGROSS_3,   \
+    FRONTIER_MON_SLAKING_3,     \
+    -1 
+
+#define FRONTIER_MONS_YOUNGSTER_LASS_3 \
+    FRONTIER_MON_DUGTRIO_4,     \
+    FRONTIER_MON_MEDICHAM_4,    \
+    FRONTIER_MON_MISDREAVUS_4,  \
+    FRONTIER_MON_FEAROW_4,      \
+    FRONTIER_MON_GRANBULL_4,    \
+    FRONTIER_MON_JYNX_4,        \
+    FRONTIER_MON_DUSCLOPS_4,    \
+    FRONTIER_MON_DODRIO_4,      \
+    FRONTIER_MON_MR_MIME_4,     \
+    FRONTIER_MON_LANTURN_4,     \
+    FRONTIER_MON_BRELOOM_4,     \
+    FRONTIER_MON_FORRETRESS_4,  \
+    FRONTIER_MON_WHISCASH_4,    \
+    FRONTIER_MON_XATU_4,        \
+    FRONTIER_MON_SKARMORY_4,    \
+    FRONTIER_MON_MAROWAK_4,     \
+    FRONTIER_MON_QUAGSIRE_4,    \
+    FRONTIER_MON_CLEFABLE_4,    \
+    FRONTIER_MON_HARIYAMA_4,    \
+    FRONTIER_MON_RAICHU_4,      \
+    FRONTIER_MON_DEWGONG_4,     \
+    FRONTIER_MON_MANECTRIC_4,   \
+    FRONTIER_MON_VILEPLUME_4,   \
+    FRONTIER_MON_VICTREEBEL_4,  \
+    FRONTIER_MON_ELECTRODE_4,   \
+    FRONTIER_MON_EXPLOUD_4,     \
+    FRONTIER_MON_SHIFTRY_4,     \
+    FRONTIER_MON_GLALIE_4,      \
+    FRONTIER_MON_LUDICOLO_4,    \
+    FRONTIER_MON_HYPNO_4,       \
+    FRONTIER_MON_GOLEM_4,       \
+    FRONTIER_MON_RHYDON_4,      \
+    FRONTIER_MON_ALAKAZAM_4,    \
+    -1 
+
+#define FRONTIER_MONS_CAMPER_PICNICKER_2 \
+    FRONTIER_MON_WEEZING_4,     \
+    FRONTIER_MON_KANGASKHAN_4,  \
+    FRONTIER_MON_ELECTABUZZ_4,  \
+    FRONTIER_MON_TAUROS_4,      \
+    FRONTIER_MON_SLOWBRO_4,     \
+    FRONTIER_MON_SLOWKING_4,    \
+    FRONTIER_MON_MILTANK_4,     \
+    FRONTIER_MON_ALTARIA_4,     \
+    FRONTIER_MON_NIDOQUEEN_4,   \
+    FRONTIER_MON_NIDOKING_4,    \
+    FRONTIER_MON_MAGMAR_4,      \
+    FRONTIER_MON_CRADILY_4,     \
+    FRONTIER_MON_ARMALDO_4,     \
+    FRONTIER_MON_GOLDUCK_4,     \
+    FRONTIER_MON_RAPIDASH_4,    \
+    FRONTIER_MON_MUK_4,         \
+    FRONTIER_MON_GENGAR_4,      \
+    FRONTIER_MON_AMPHAROS_4,    \
+    FRONTIER_MON_SCIZOR_4,      \
+    FRONTIER_MON_HERACROSS_4,   \
+    FRONTIER_MON_URSARING_4,    \
+    FRONTIER_MON_HOUNDOOM_4,    \
+    FRONTIER_MON_DONPHAN_4,     \
+    FRONTIER_MON_CLAYDOL_4,     \
+    FRONTIER_MON_WAILORD_4,     \
+    FRONTIER_MON_NINETALES_4,   \
+    FRONTIER_MON_MACHAMP_4,     \
+    FRONTIER_MON_SHUCKLE_4,     \
+    FRONTIER_MON_STEELIX_4,     \
+    FRONTIER_MON_TENTACRUEL_4,  \
+    FRONTIER_MON_AERODACTYL_4,  \
+    FRONTIER_MON_PORYGON2_4,    \
+    FRONTIER_MON_GARDEVOIR_4,   \
+    -1
+
+#define FRONTIER_MONS_SWIMMER_M_2 \
+    FRONTIER_MON_SHARPEDO_2,    \
+    FRONTIER_MON_MEDICHAM_4,    \
+    FRONTIER_MON_GRANBULL_4,    \
+    FRONTIER_MON_LANTURN_4,     \
+    FRONTIER_MON_WHISCASH_4,    \
+    FRONTIER_MON_QUAGSIRE_4,    \
+    FRONTIER_MON_CLEFABLE_4,    \
+    FRONTIER_MON_HARIYAMA_4,    \
+    FRONTIER_MON_DEWGONG_4,     \
+    FRONTIER_MON_EXPLOUD_4,     \
+    FRONTIER_MON_LUDICOLO_4,    \
+    FRONTIER_MON_KANGASKHAN_4,  \
+    FRONTIER_MON_TAUROS_4,      \
+    FRONTIER_MON_SLOWBRO_4,     \
+    FRONTIER_MON_SLOWKING_4,    \
+    FRONTIER_MON_MILTANK_4,     \
+    FRONTIER_MON_GOLDUCK_4,     \
+    FRONTIER_MON_URSARING_4,    \
+    FRONTIER_MON_WAILORD_4,     \
+    FRONTIER_MON_MACHAMP_4,     \
+    FRONTIER_MON_TENTACRUEL_4,  \
+    FRONTIER_MON_PORYGON2_4,    \
+    FRONTIER_MON_STARMIE_4,     \
+    FRONTIER_MON_VAPOREON_4,    \
+    FRONTIER_MON_BLASTOISE_4,   \
+    FRONTIER_MON_FERALIGATR_4,  \
+    FRONTIER_MON_WALREIN_4,     \
+    FRONTIER_MON_LAPRAS_4,      \
+    FRONTIER_MON_SWAMPERT_4,    \
+    FRONTIER_MON_GYARADOS_4,    \
+    FRONTIER_MON_SNORLAX_4,     \
+    FRONTIER_MON_KINGDRA_4,     \
+    FRONTIER_MON_BLISSEY_4,     \
+    FRONTIER_MON_MILOTIC_4,     \
+    FRONTIER_MON_SLAKING_4,     \
+    -1 
+
+#define FRONTIER_MONS_SWIMMER_F_2 \
+    FRONTIER_MON_GRANBULL_4,    \
+    FRONTIER_MON_JYNX_4,        \
+    FRONTIER_MON_LANTURN_4,     \
+    FRONTIER_MON_WHISCASH_4,    \
+    FRONTIER_MON_QUAGSIRE_4,    \
+    FRONTIER_MON_CLEFABLE_4,    \
+    FRONTIER_MON_DEWGONG_4,     \
+    FRONTIER_MON_EXPLOUD_4,     \
+    FRONTIER_MON_GLALIE_4,      \
+    FRONTIER_MON_LUDICOLO_4,    \
+    FRONTIER_MON_KANGASKHAN_4,  \
+    FRONTIER_MON_TAUROS_4,      \
+    FRONTIER_MON_SLOWBRO_4,     \
+    FRONTIER_MON_SLOWKING_4,    \
+    FRONTIER_MON_MILTANK_4,     \
+    FRONTIER_MON_GOLDUCK_4,     \
+    FRONTIER_MON_URSARING_4,    \
+    FRONTIER_MON_WAILORD_4,     \
+    FRONTIER_MON_TENTACRUEL_4,  \
+    FRONTIER_MON_PORYGON2_4,    \
+    FRONTIER_MON_STARMIE_4,     \
+    FRONTIER_MON_VAPOREON_4,    \
+    FRONTIER_MON_BLASTOISE_4,   \
+    FRONTIER_MON_FERALIGATR_4,  \
+    FRONTIER_MON_WALREIN_4,     \
+    FRONTIER_MON_LAPRAS_4,      \
+    FRONTIER_MON_SWAMPERT_4,    \
+    FRONTIER_MON_GYARADOS_4,    \
+    FRONTIER_MON_SNORLAX_4,     \
+    FRONTIER_MON_KINGDRA_4,     \
+    FRONTIER_MON_BLISSEY_4,     \
+    FRONTIER_MON_MILOTIC_4,     \
+    FRONTIER_MON_SLAKING_4,     \
+    -1
+
+#define FRONTIER_MONS_POKEFAN_3 \
+    FRONTIER_MON_DELCATTY_2,    \
+    FRONTIER_MON_PORYGON_2,     \
+    FRONTIER_MON_DUNSPARCE_2,   \
+    FRONTIER_MON_WIGGLYTUFF_2,  \
+    FRONTIER_MON_KECLEON_2,     \
+    FRONTIER_MON_CHANSEY_2,     \
+    FRONTIER_MON_ABSOL_2,       \
+    FRONTIER_MON_MISDREAVUS_4,  \
+    FRONTIER_MON_JYNX_4,        \
+    FRONTIER_MON_MR_MIME_4,     \
+    FRONTIER_MON_LANTURN_4,     \
+    FRONTIER_MON_BRELOOM_4,     \
+    FRONTIER_MON_WHISCASH_4,    \
+    FRONTIER_MON_XATU_4,        \
+    FRONTIER_MON_QUAGSIRE_4,    \
+    FRONTIER_MON_CLEFABLE_4,    \
+    FRONTIER_MON_RAICHU_4,      \
+    FRONTIER_MON_DEWGONG_4,     \
+    FRONTIER_MON_VILEPLUME_4,   \
+    FRONTIER_MON_LUDICOLO_4,    \
+    FRONTIER_MON_SLOWBRO_4,     \
+    FRONTIER_MON_SLOWKING_4,    \
+    FRONTIER_MON_MILTANK_4,     \
+    FRONTIER_MON_ALTARIA_4,     \
+    FRONTIER_MON_RAPIDASH_4,    \
+    FRONTIER_MON_AMPHAROS_4,    \
+    FRONTIER_MON_NINETALES_4,   \
+    FRONTIER_MON_SHUCKLE_4,     \
+    FRONTIER_MON_PORYGON2_4,    \
+    FRONTIER_MON_GARDEVOIR_4,   \
+    FRONTIER_MON_FLYGON_4,      \
+    FRONTIER_MON_VAPOREON_4,    \
+    FRONTIER_MON_JOLTEON_4,     \
+    FRONTIER_MON_FLAREON_4,     \
+    FRONTIER_MON_ESPEON_4,      \
+    FRONTIER_MON_UMBREON_4,     \
+    FRONTIER_MON_LAPRAS_4,      \
+    FRONTIER_MON_SNORLAX_4,     \
+    FRONTIER_MON_BLISSEY_4,     \
+    FRONTIER_MON_MILOTIC_4,     \
+    -1
+
+#define FRONTIER_MONS_PKMN_BREEDER_2 \
+    FRONTIER_MON_EXEGGUTOR_4,   \
+    FRONTIER_MON_STARMIE_4,     \
+    FRONTIER_MON_FLYGON_4,      \
+    FRONTIER_MON_VENUSAUR_4,    \
+    FRONTIER_MON_VAPOREON_4,    \
+    FRONTIER_MON_JOLTEON_4,     \
+    FRONTIER_MON_FLAREON_4,     \
+    FRONTIER_MON_MEGANIUM_4,    \
+    FRONTIER_MON_ESPEON_4,      \
+    FRONTIER_MON_UMBREON_4,     \
+    FRONTIER_MON_BLASTOISE_4,   \
+    FRONTIER_MON_FERALIGATR_4,  \
+    FRONTIER_MON_AGGRON_4,      \
+    FRONTIER_MON_BLAZIKEN_4,    \
+    FRONTIER_MON_WALREIN_4,     \
+    FRONTIER_MON_SCEPTILE_4,    \
+    FRONTIER_MON_CHARIZARD_4,   \
+    FRONTIER_MON_TYPHLOSION_4,  \
+    FRONTIER_MON_LAPRAS_4,      \
+    FRONTIER_MON_CROBAT_4,      \
+    FRONTIER_MON_SWAMPERT_4,    \
+    FRONTIER_MON_GYARADOS_4,    \
+    FRONTIER_MON_SNORLAX_4,     \
+    FRONTIER_MON_KINGDRA_4,     \
+    FRONTIER_MON_BLISSEY_4,     \
+    FRONTIER_MON_MILOTIC_4,     \
+    FRONTIER_MON_ARCANINE_4,    \
+    FRONTIER_MON_SALAMENCE_4,   \
+    FRONTIER_MON_METAGROSS_4,   \
+    FRONTIER_MON_SLAKING_4,     \
+    -1
+
+#define FRONTIER_MONS_COOLTRAINER_M_2A \
+    FRONTIER_MON_MUK_1,         \
+    FRONTIER_MON_GENGAR_1,      \
+    FRONTIER_MON_AMPHAROS_1,    \
+    FRONTIER_MON_SCIZOR_1,      \
+    FRONTIER_MON_HERACROSS_1,   \
+    FRONTIER_MON_URSARING_1,    \
+    FRONTIER_MON_HOUNDOOM_1,    \
+    FRONTIER_MON_DONPHAN_1,     \
+    FRONTIER_MON_CLAYDOL_1,     \
+    FRONTIER_MON_WAILORD_1,     \
+    FRONTIER_MON_NINETALES_1,   \
+    FRONTIER_MON_MACHAMP_1,     \
+    FRONTIER_MON_SHUCKLE_1,     \
+    FRONTIER_MON_STEELIX_1,     \
+    FRONTIER_MON_TENTACRUEL_1,  \
+    FRONTIER_MON_AERODACTYL_1,  \
+    FRONTIER_MON_PORYGON2_1,    \
+    FRONTIER_MON_GARDEVOIR_1,   \
+    FRONTIER_MON_EXEGGUTOR_1,   \
+    FRONTIER_MON_STARMIE_1,     \
+    FRONTIER_MON_FLYGON_1,      \
+    FRONTIER_MON_VENUSAUR_1,    \
+    FRONTIER_MON_VAPOREON_1,    \
+    FRONTIER_MON_JOLTEON_1,     \
+    FRONTIER_MON_MUK_2,         \
+    FRONTIER_MON_GENGAR_2,      \
+    FRONTIER_MON_AMPHAROS_2,    \
+    FRONTIER_MON_SCIZOR_2,      \
+    FRONTIER_MON_HERACROSS_2,   \
+    FRONTIER_MON_URSARING_2,    \
+    FRONTIER_MON_HOUNDOOM_2,    \
+    FRONTIER_MON_DONPHAN_2,     \
+    FRONTIER_MON_CLAYDOL_2,     \
+    FRONTIER_MON_WAILORD_2,     \
+    FRONTIER_MON_NINETALES_2,   \
+    FRONTIER_MON_MACHAMP_2,     \
+    FRONTIER_MON_SHUCKLE_2,     \
+    FRONTIER_MON_STEELIX_2,     \
+    FRONTIER_MON_TENTACRUEL_2,  \
+    FRONTIER_MON_AERODACTYL_2,  \
+    FRONTIER_MON_PORYGON2_2,    \
+    FRONTIER_MON_GARDEVOIR_2,   \
+    FRONTIER_MON_EXEGGUTOR_2,   \
+    FRONTIER_MON_STARMIE_2,     \
+    FRONTIER_MON_FLYGON_2,      \
+    FRONTIER_MON_VENUSAUR_2,    \
+    FRONTIER_MON_VAPOREON_2,    \
+    FRONTIER_MON_JOLTEON_2,     \
+    FRONTIER_MON_MUK_3,         \
+    FRONTIER_MON_GENGAR_3,      \
+    FRONTIER_MON_AMPHAROS_3,    \
+    FRONTIER_MON_SCIZOR_3,      \
+    FRONTIER_MON_HERACROSS_3,   \
+    FRONTIER_MON_URSARING_3,    \
+    FRONTIER_MON_HOUNDOOM_3,    \
+    FRONTIER_MON_DONPHAN_3,     \
+    FRONTIER_MON_CLAYDOL_3,     \
+    FRONTIER_MON_WAILORD_3,     \
+    FRONTIER_MON_NINETALES_3,   \
+    FRONTIER_MON_MACHAMP_3,     \
+    FRONTIER_MON_SHUCKLE_3,     \
+    FRONTIER_MON_STEELIX_3,     \
+    FRONTIER_MON_TENTACRUEL_3,  \
+    FRONTIER_MON_AERODACTYL_3,  \
+    FRONTIER_MON_PORYGON2_3,    \
+    FRONTIER_MON_GARDEVOIR_3,   \
+    FRONTIER_MON_EXEGGUTOR_3,   \
+    FRONTIER_MON_STARMIE_3,     \
+    FRONTIER_MON_FLYGON_3,      \
+    FRONTIER_MON_VENUSAUR_3,    \
+    FRONTIER_MON_VAPOREON_3,    \
+    FRONTIER_MON_JOLTEON_3,     \
+    FRONTIER_MON_MUK_4,         \
+    FRONTIER_MON_GENGAR_4,      \
+    FRONTIER_MON_AMPHAROS_4,    \
+    FRONTIER_MON_SCIZOR_4,      \
+    FRONTIER_MON_HERACROSS_4,   \
+    FRONTIER_MON_URSARING_4,    \
+    FRONTIER_MON_HOUNDOOM_4,    \
+    FRONTIER_MON_DONPHAN_4,     \
+    FRONTIER_MON_CLAYDOL_4,     \
+    FRONTIER_MON_WAILORD_4,     \
+    FRONTIER_MON_NINETALES_4,   \
+    FRONTIER_MON_MACHAMP_4,     \
+    FRONTIER_MON_SHUCKLE_4,     \
+    FRONTIER_MON_STEELIX_4,     \
+    FRONTIER_MON_TENTACRUEL_4,  \
+    FRONTIER_MON_AERODACTYL_4,  \
+    FRONTIER_MON_PORYGON2_4,    \
+    FRONTIER_MON_GARDEVOIR_4,   \
+    FRONTIER_MON_EXEGGUTOR_4,   \
+    FRONTIER_MON_STARMIE_4,     \
+    FRONTIER_MON_FLYGON_4,      \
+    FRONTIER_MON_VENUSAUR_4,    \
+    FRONTIER_MON_VAPOREON_4,    \
+    FRONTIER_MON_JOLTEON_4,     \
+    -1
+
+#define FRONTIER_MONS_COOLTRAINER_M_2B \
+    FRONTIER_MON_FLAREON_1,     \
+    FRONTIER_MON_MEGANIUM_1,    \
+    FRONTIER_MON_ESPEON_1,      \
+    FRONTIER_MON_UMBREON_1,     \
+    FRONTIER_MON_BLASTOISE_1,   \
+    FRONTIER_MON_FERALIGATR_1,  \
+    FRONTIER_MON_AGGRON_1,      \
+    FRONTIER_MON_BLAZIKEN_1,    \
+    FRONTIER_MON_WALREIN_1,     \
+    FRONTIER_MON_SCEPTILE_1,    \
+    FRONTIER_MON_CHARIZARD_1,   \
+    FRONTIER_MON_TYPHLOSION_1,  \
+    FRONTIER_MON_LAPRAS_1,      \
+    FRONTIER_MON_CROBAT_1,      \
+    FRONTIER_MON_SWAMPERT_1,    \
+    FRONTIER_MON_GYARADOS_1,    \
+    FRONTIER_MON_SNORLAX_1,     \
+    FRONTIER_MON_KINGDRA_1,     \
+    FRONTIER_MON_BLISSEY_1,     \
+    FRONTIER_MON_MILOTIC_1,     \
+    FRONTIER_MON_ARCANINE_1,    \
+    FRONTIER_MON_SALAMENCE_1,   \
+    FRONTIER_MON_METAGROSS_1,   \
+    FRONTIER_MON_SLAKING_1,     \
+    FRONTIER_MON_FLAREON_2,     \
+    FRONTIER_MON_MEGANIUM_2,    \
+    FRONTIER_MON_ESPEON_2,      \
+    FRONTIER_MON_UMBREON_2,     \
+    FRONTIER_MON_BLASTOISE_2,   \
+    FRONTIER_MON_FERALIGATR_2,  \
+    FRONTIER_MON_AGGRON_2,      \
+    FRONTIER_MON_BLAZIKEN_2,    \
+    FRONTIER_MON_WALREIN_2,     \
+    FRONTIER_MON_SCEPTILE_2,    \
+    FRONTIER_MON_CHARIZARD_2,   \
+    FRONTIER_MON_TYPHLOSION_2,  \
+    FRONTIER_MON_LAPRAS_2,      \
+    FRONTIER_MON_CROBAT_2,      \
+    FRONTIER_MON_SWAMPERT_2,    \
+    FRONTIER_MON_GYARADOS_2,    \
+    FRONTIER_MON_SNORLAX_2,     \
+    FRONTIER_MON_KINGDRA_2,     \
+    FRONTIER_MON_BLISSEY_2,     \
+    FRONTIER_MON_MILOTIC_2,     \
+    FRONTIER_MON_ARCANINE_2,    \
+    FRONTIER_MON_SALAMENCE_2,   \
+    FRONTIER_MON_METAGROSS_2,   \
+    FRONTIER_MON_SLAKING_2,     \
+    FRONTIER_MON_FLAREON_3,     \
+    FRONTIER_MON_MEGANIUM_3,    \
+    FRONTIER_MON_ESPEON_3,      \
+    FRONTIER_MON_UMBREON_3,     \
+    FRONTIER_MON_BLASTOISE_3,   \
+    FRONTIER_MON_FERALIGATR_3,  \
+    FRONTIER_MON_AGGRON_3,      \
+    FRONTIER_MON_BLAZIKEN_3,    \
+    FRONTIER_MON_WALREIN_3,     \
+    FRONTIER_MON_SCEPTILE_3,    \
+    FRONTIER_MON_CHARIZARD_3,   \
+    FRONTIER_MON_TYPHLOSION_3,  \
+    FRONTIER_MON_LAPRAS_3,      \
+    FRONTIER_MON_CROBAT_3,      \
+    FRONTIER_MON_SWAMPERT_3,    \
+    FRONTIER_MON_GYARADOS_3,    \
+    FRONTIER_MON_SNORLAX_3,     \
+    FRONTIER_MON_KINGDRA_3,     \
+    FRONTIER_MON_BLISSEY_3,     \
+    FRONTIER_MON_MILOTIC_3,     \
+    FRONTIER_MON_ARCANINE_3,    \
+    FRONTIER_MON_SALAMENCE_3,   \
+    FRONTIER_MON_METAGROSS_3,   \
+    FRONTIER_MON_SLAKING_3,     \
+    FRONTIER_MON_FLAREON_4,     \
+    FRONTIER_MON_MEGANIUM_4,    \
+    FRONTIER_MON_ESPEON_4,      \
+    FRONTIER_MON_UMBREON_4,     \
+    FRONTIER_MON_BLASTOISE_4,   \
+    FRONTIER_MON_FERALIGATR_4,  \
+    FRONTIER_MON_AGGRON_4,      \
+    FRONTIER_MON_BLAZIKEN_4,    \
+    FRONTIER_MON_WALREIN_4,     \
+    FRONTIER_MON_SCEPTILE_4,    \
+    FRONTIER_MON_CHARIZARD_4,   \
+    FRONTIER_MON_TYPHLOSION_4,  \
+    FRONTIER_MON_LAPRAS_4,      \
+    FRONTIER_MON_CROBAT_4,      \
+    FRONTIER_MON_SWAMPERT_4,    \
+    FRONTIER_MON_GYARADOS_4,    \
+    FRONTIER_MON_SNORLAX_4,     \
+    FRONTIER_MON_KINGDRA_4,     \
+    FRONTIER_MON_BLISSEY_4,     \
+    FRONTIER_MON_MILOTIC_4,     \
+    FRONTIER_MON_ARCANINE_4,    \
+    FRONTIER_MON_SALAMENCE_4,   \
+    FRONTIER_MON_METAGROSS_4,   \
+    FRONTIER_MON_SLAKING_4,     \
+    -1
+
+// Cooltrainer M uses Latios, Cooltrainer F uses Latias
+#define FRONTIER_MONS_COOLTRAINER_2C(lati)  \
+    FRONTIER_MON_GENGAR_1,      \
+    FRONTIER_MON_URSARING_1,    \
+    FRONTIER_MON_MACHAMP_1,     \
+    FRONTIER_MON_GARDEVOIR_1,   \
+    FRONTIER_MON_STARMIE_1,     \
+    FRONTIER_MON_LAPRAS_1,      \
+    FRONTIER_MON_SNORLAX_1,     \
+    FRONTIER_MON_SALAMENCE_1,   \
+    FRONTIER_MON_METAGROSS_1,   \
+    FRONTIER_MON_GENGAR_2,      \
+    FRONTIER_MON_URSARING_2,    \
+    FRONTIER_MON_MACHAMP_2,     \
+    FRONTIER_MON_GARDEVOIR_2,   \
+    FRONTIER_MON_STARMIE_2,     \
+    FRONTIER_MON_LAPRAS_2,      \
+    FRONTIER_MON_SNORLAX_2,     \
+    FRONTIER_MON_SALAMENCE_2,   \
+    FRONTIER_MON_METAGROSS_2,   \
+    FRONTIER_MON_GENGAR_3,      \
+    FRONTIER_MON_URSARING_3,    \
+    FRONTIER_MON_MACHAMP_3,     \
+    FRONTIER_MON_GARDEVOIR_3,   \
+    FRONTIER_MON_STARMIE_3,     \
+    FRONTIER_MON_LAPRAS_3,      \
+    FRONTIER_MON_SNORLAX_3,     \
+    FRONTIER_MON_SALAMENCE_3,   \
+    FRONTIER_MON_METAGROSS_3,   \
+    FRONTIER_MON_GENGAR_4,      \
+    FRONTIER_MON_URSARING_4,    \
+    FRONTIER_MON_MACHAMP_4,     \
+    FRONTIER_MON_GARDEVOIR_4,   \
+    FRONTIER_MON_STARMIE_4,     \
+    FRONTIER_MON_LAPRAS_4,      \
+    FRONTIER_MON_SNORLAX_4,     \
+    FRONTIER_MON_SALAMENCE_4,   \
+    FRONTIER_MON_METAGROSS_4,   \
+    FRONTIER_MON_##lati##_1,    \
+    FRONTIER_MON_##lati##_2,    \
+    FRONTIER_MON_##lati##_3,    \
+    FRONTIER_MON_##lati##_4,    \
+    FRONTIER_MON_GENGAR_5,      \
+    FRONTIER_MON_GENGAR_6,      \
+    FRONTIER_MON_GENGAR_7,      \
+    FRONTIER_MON_GENGAR_8,      \
+    FRONTIER_MON_URSARING_5,    \
+    FRONTIER_MON_URSARING_6,    \
+    FRONTIER_MON_URSARING_7,    \
+    FRONTIER_MON_URSARING_8,    \
+    FRONTIER_MON_MACHAMP_5,     \
+    FRONTIER_MON_MACHAMP_6,     \
+    FRONTIER_MON_MACHAMP_7,     \
+    FRONTIER_MON_MACHAMP_8,     \
+    FRONTIER_MON_GARDEVOIR_5,   \
+    FRONTIER_MON_GARDEVOIR_6,   \
+    FRONTIER_MON_GARDEVOIR_7,   \
+    FRONTIER_MON_GARDEVOIR_8,   \
+    FRONTIER_MON_STARMIE_5,     \
+    FRONTIER_MON_STARMIE_6,     \
+    FRONTIER_MON_STARMIE_7,     \
+    FRONTIER_MON_STARMIE_8,     \
+    FRONTIER_MON_LAPRAS_5,      \
+    FRONTIER_MON_LAPRAS_6,      \
+    FRONTIER_MON_LAPRAS_7,      \
+    FRONTIER_MON_LAPRAS_8,      \
+    FRONTIER_MON_SNORLAX_5,     \
+    FRONTIER_MON_SNORLAX_6,     \
+    FRONTIER_MON_SNORLAX_7,     \
+    FRONTIER_MON_SNORLAX_8,     \
+    FRONTIER_MON_SALAMENCE_5,   \
+    FRONTIER_MON_SALAMENCE_6,   \
+    FRONTIER_MON_SALAMENCE_7,   \
+    FRONTIER_MON_SALAMENCE_8,   \
+    FRONTIER_MON_METAGROSS_5,   \
+    FRONTIER_MON_METAGROSS_6,   \
+    FRONTIER_MON_METAGROSS_7,   \
+    FRONTIER_MON_METAGROSS_8,   \
+    FRONTIER_MON_##lati##_5,    \
+    FRONTIER_MON_##lati##_6,    \
+    FRONTIER_MON_##lati##_7,    \
+    FRONTIER_MON_##lati##_8,    \
+    FRONTIER_MON_DRAGONITE_1,   \
+    FRONTIER_MON_DRAGONITE_2,   \
+    FRONTIER_MON_DRAGONITE_3,   \
+    FRONTIER_MON_DRAGONITE_4,   \
+    FRONTIER_MON_DRAGONITE_5,   \
+    FRONTIER_MON_DRAGONITE_6,   \
+    FRONTIER_MON_DRAGONITE_7,   \
+    FRONTIER_MON_DRAGONITE_8,   \
+    FRONTIER_MON_DRAGONITE_9,   \
+    FRONTIER_MON_DRAGONITE_10,  \
+    FRONTIER_MON_TYRANITAR_1,   \
+    FRONTIER_MON_TYRANITAR_2,   \
+    FRONTIER_MON_TYRANITAR_3,   \
+    FRONTIER_MON_TYRANITAR_4,   \
+    FRONTIER_MON_TYRANITAR_5,   \
+    FRONTIER_MON_TYRANITAR_6,   \
+    FRONTIER_MON_TYRANITAR_7,   \
+    FRONTIER_MON_TYRANITAR_8,   \
+    FRONTIER_MON_TYRANITAR_9,   \
+    FRONTIER_MON_TYRANITAR_10,  \
+    -1
+
+// Also used by Pkmn Ranger M/F
+// For both classes, M uses Latios and F uses Latias
+#define FRONTIER_MONS_COOLTRAINER_2D(lati)  \
+    FRONTIER_MON_ARTICUNO_1,    \
+    FRONTIER_MON_ZAPDOS_1,      \
+    FRONTIER_MON_MOLTRES_1,     \
+    FRONTIER_MON_RAIKOU_1,      \
+    FRONTIER_MON_ENTEI_1,       \
+    FRONTIER_MON_SUICUNE_1,     \
+    FRONTIER_MON_REGIROCK_1,    \
+    FRONTIER_MON_REGICE_1,      \
+    FRONTIER_MON_REGISTEEL_1,   \
+    FRONTIER_MON_##lati##_1,    \
+    FRONTIER_MON_ARTICUNO_2,    \
+    FRONTIER_MON_ZAPDOS_2,      \
+    FRONTIER_MON_MOLTRES_2,     \
+    FRONTIER_MON_RAIKOU_2,      \
+    FRONTIER_MON_ENTEI_2,       \
+    FRONTIER_MON_SUICUNE_2,     \
+    FRONTIER_MON_REGIROCK_2,    \
+    FRONTIER_MON_REGICE_2,      \
+    FRONTIER_MON_REGISTEEL_2,   \
+    FRONTIER_MON_##lati##_2,    \
+    FRONTIER_MON_ARTICUNO_3,    \
+    FRONTIER_MON_ZAPDOS_3,      \
+    FRONTIER_MON_MOLTRES_3,     \
+    FRONTIER_MON_RAIKOU_3,      \
+    FRONTIER_MON_ENTEI_3,       \
+    FRONTIER_MON_SUICUNE_3,     \
+    FRONTIER_MON_REGIROCK_3,    \
+    FRONTIER_MON_REGICE_3,      \
+    FRONTIER_MON_REGISTEEL_3,   \
+    FRONTIER_MON_##lati##_3,    \
+    FRONTIER_MON_ARTICUNO_4,    \
+    FRONTIER_MON_ZAPDOS_4,      \
+    FRONTIER_MON_MOLTRES_4,     \
+    FRONTIER_MON_RAIKOU_4,      \
+    FRONTIER_MON_ENTEI_4,       \
+    FRONTIER_MON_SUICUNE_4,     \
+    FRONTIER_MON_REGIROCK_4,    \
+    FRONTIER_MON_REGICE_4,      \
+    FRONTIER_MON_REGISTEEL_4,   \
+    FRONTIER_MON_##lati##_4,    \
+    FRONTIER_MON_REGIROCK_5,    \
+    FRONTIER_MON_REGIROCK_6,    \
+    FRONTIER_MON_REGICE_5,      \
+    FRONTIER_MON_REGICE_6,      \
+    FRONTIER_MON_REGISTEEL_5,   \
+    FRONTIER_MON_REGISTEEL_6,   \
+    FRONTIER_MON_##lati##_5,    \
+    FRONTIER_MON_##lati##_6,    \
+    FRONTIER_MON_##lati##_7,    \
+    FRONTIER_MON_##lati##_8,    \
+    FRONTIER_MON_DRAGONITE_1,   \
+    FRONTIER_MON_DRAGONITE_2,   \
+    FRONTIER_MON_DRAGONITE_3,   \
+    FRONTIER_MON_DRAGONITE_4,   \
+    FRONTIER_MON_DRAGONITE_5,   \
+    FRONTIER_MON_DRAGONITE_6,   \
+    FRONTIER_MON_DRAGONITE_7,   \
+    FRONTIER_MON_DRAGONITE_8,   \
+    FRONTIER_MON_DRAGONITE_9,   \
+    FRONTIER_MON_DRAGONITE_10,  \
+    FRONTIER_MON_TYRANITAR_1,   \
+    FRONTIER_MON_TYRANITAR_2,   \
+    FRONTIER_MON_TYRANITAR_3,   \
+    FRONTIER_MON_TYRANITAR_4,   \
+    FRONTIER_MON_TYRANITAR_5,   \
+    FRONTIER_MON_TYRANITAR_6,   \
+    FRONTIER_MON_TYRANITAR_7,   \
+    FRONTIER_MON_TYRANITAR_8,   \
+    FRONTIER_MON_TYRANITAR_9,   \
+    FRONTIER_MON_TYRANITAR_10,  \
+    FRONTIER_MON_ARTICUNO_5,    \
+    FRONTIER_MON_ARTICUNO_6,    \
+    FRONTIER_MON_ZAPDOS_5,      \
+    FRONTIER_MON_ZAPDOS_6,      \
+    FRONTIER_MON_MOLTRES_5,     \
+    FRONTIER_MON_MOLTRES_6,     \
+    FRONTIER_MON_RAIKOU_5,      \
+    FRONTIER_MON_RAIKOU_6,      \
+    FRONTIER_MON_ENTEI_5,       \
+    FRONTIER_MON_ENTEI_6,       \
+    FRONTIER_MON_SUICUNE_5,     \
+    FRONTIER_MON_SUICUNE_6,     \
+    -1
+
+#define FRONTIER_MONS_COOLTRAINER_F_2A \
+    FRONTIER_MON_DUGTRIO_1,     \
+    FRONTIER_MON_MEDICHAM_1,    \
+    FRONTIER_MON_MISDREAVUS_1,  \
+    FRONTIER_MON_FEAROW_1,      \
+    FRONTIER_MON_GRANBULL_1,    \
+    FRONTIER_MON_JYNX_1,        \
+    FRONTIER_MON_DUSCLOPS_1,    \
+    FRONTIER_MON_DODRIO_1,      \
+    FRONTIER_MON_MR_MIME_1,     \
+    FRONTIER_MON_LANTURN_1,     \
+    FRONTIER_MON_BRELOOM_1,     \
+    FRONTIER_MON_FORRETRESS_1,  \
+    FRONTIER_MON_WHISCASH_1,    \
+    FRONTIER_MON_XATU_1,        \
+    FRONTIER_MON_SKARMORY_1,    \
+    FRONTIER_MON_MAROWAK_1,     \
+    FRONTIER_MON_QUAGSIRE_1,    \
+    FRONTIER_MON_CLEFABLE_1,    \
+    FRONTIER_MON_HARIYAMA_1,    \
+    FRONTIER_MON_RAICHU_1,      \
+    FRONTIER_MON_DEWGONG_1,     \
+    FRONTIER_MON_MANECTRIC_1,   \
+    FRONTIER_MON_VILEPLUME_1,   \
+    FRONTIER_MON_VICTREEBEL_1,  \
+    FRONTIER_MON_DUGTRIO_2,     \
+    FRONTIER_MON_MEDICHAM_2,    \
+    FRONTIER_MON_MAROWAK_2,     \
+    FRONTIER_MON_QUAGSIRE_2,    \
+    FRONTIER_MON_MISDREAVUS_2,  \
+    FRONTIER_MON_FEAROW_2,      \
+    FRONTIER_MON_GRANBULL_2,    \
+    FRONTIER_MON_JYNX_2,        \
+    FRONTIER_MON_DUSCLOPS_2,    \
+    FRONTIER_MON_DODRIO_2,      \
+    FRONTIER_MON_MR_MIME_2,     \
+    FRONTIER_MON_LANTURN_2,     \
+    FRONTIER_MON_BRELOOM_2,     \
+    FRONTIER_MON_FORRETRESS_2,  \
+    FRONTIER_MON_SKARMORY_2,    \
+    FRONTIER_MON_WHISCASH_2,    \
+    FRONTIER_MON_XATU_2,        \
+    FRONTIER_MON_CLEFABLE_2,    \
+    FRONTIER_MON_HARIYAMA_2,    \
+    FRONTIER_MON_RAICHU_2,      \
+    FRONTIER_MON_DEWGONG_2,     \
+    FRONTIER_MON_MANECTRIC_2,   \
+    FRONTIER_MON_VILEPLUME_2,   \
+    FRONTIER_MON_VICTREEBEL_2,  \
+    FRONTIER_MON_DUGTRIO_3,     \
+    FRONTIER_MON_MEDICHAM_3,    \
+    FRONTIER_MON_MISDREAVUS_3,  \
+    FRONTIER_MON_FEAROW_3,      \
+    FRONTIER_MON_GRANBULL_3,    \
+    FRONTIER_MON_JYNX_3,        \
+    FRONTIER_MON_DUSCLOPS_3,    \
+    FRONTIER_MON_DODRIO_3,      \
+    FRONTIER_MON_MR_MIME_3,     \
+    FRONTIER_MON_LANTURN_3,     \
+    FRONTIER_MON_BRELOOM_3,     \
+    FRONTIER_MON_FORRETRESS_3,  \
+    FRONTIER_MON_WHISCASH_3,    \
+    FRONTIER_MON_XATU_3,        \
+    FRONTIER_MON_SKARMORY_3,    \
+    FRONTIER_MON_MAROWAK_3,     \
+    FRONTIER_MON_QUAGSIRE_3,    \
+    FRONTIER_MON_CLEFABLE_3,    \
+    FRONTIER_MON_HARIYAMA_3,    \
+    FRONTIER_MON_RAICHU_3,      \
+    FRONTIER_MON_DEWGONG_3,     \
+    FRONTIER_MON_MANECTRIC_3,   \
+    FRONTIER_MON_VILEPLUME_3,   \
+    FRONTIER_MON_VICTREEBEL_3,  \
+    FRONTIER_MON_DUGTRIO_4,     \
+    FRONTIER_MON_MEDICHAM_4,    \
+    FRONTIER_MON_MISDREAVUS_4,  \
+    FRONTIER_MON_FEAROW_4,      \
+    FRONTIER_MON_GRANBULL_4,    \
+    FRONTIER_MON_JYNX_4,        \
+    FRONTIER_MON_DUSCLOPS_4,    \
+    FRONTIER_MON_DODRIO_4,      \
+    FRONTIER_MON_MR_MIME_4,     \
+    FRONTIER_MON_LANTURN_4,     \
+    FRONTIER_MON_BRELOOM_4,     \
+    FRONTIER_MON_FORRETRESS_4,  \
+    FRONTIER_MON_WHISCASH_4,    \
+    FRONTIER_MON_XATU_4,        \
+    FRONTIER_MON_SKARMORY_4,    \
+    FRONTIER_MON_MAROWAK_4,     \
+    FRONTIER_MON_QUAGSIRE_4,    \
+    FRONTIER_MON_CLEFABLE_4,    \
+    FRONTIER_MON_HARIYAMA_4,    \
+    FRONTIER_MON_RAICHU_4,      \
+    FRONTIER_MON_DEWGONG_4,     \
+    FRONTIER_MON_MANECTRIC_4,   \
+    FRONTIER_MON_VILEPLUME_4,   \
+    FRONTIER_MON_VICTREEBEL_4,  \
+    -1 
+
+#define FRONTIER_MONS_COOLTRAINER_F_2B \
+    FRONTIER_MON_ELECTRODE_1,   \
+    FRONTIER_MON_EXPLOUD_1,     \
+    FRONTIER_MON_SHIFTRY_1,     \
+    FRONTIER_MON_GLALIE_1,      \
+    FRONTIER_MON_LUDICOLO_1,    \
+    FRONTIER_MON_HYPNO_1,       \
+    FRONTIER_MON_GOLEM_1,       \
+    FRONTIER_MON_RHYDON_1,      \
+    FRONTIER_MON_ALAKAZAM_1,    \
+    FRONTIER_MON_WEEZING_1,     \
+    FRONTIER_MON_KANGASKHAN_1,  \
+    FRONTIER_MON_ELECTABUZZ_1,  \
+    FRONTIER_MON_TAUROS_1,      \
+    FRONTIER_MON_SLOWBRO_1,     \
+    FRONTIER_MON_SLOWKING_1,    \
+    FRONTIER_MON_MILTANK_1,     \
+    FRONTIER_MON_ALTARIA_1,     \
+    FRONTIER_MON_NIDOQUEEN_1,   \
+    FRONTIER_MON_NIDOKING_1,    \
+    FRONTIER_MON_MAGMAR_1,      \
+    FRONTIER_MON_CRADILY_1,     \
+    FRONTIER_MON_ARMALDO_1,     \
+    FRONTIER_MON_GOLDUCK_1,     \
+    FRONTIER_MON_RAPIDASH_1,    \
+    FRONTIER_MON_ELECTRODE_2,   \
+    FRONTIER_MON_EXPLOUD_2,     \
+    FRONTIER_MON_SHIFTRY_2,     \
+    FRONTIER_MON_GLALIE_2,      \
+    FRONTIER_MON_LUDICOLO_2,    \
+    FRONTIER_MON_HYPNO_2,       \
+    FRONTIER_MON_GOLEM_2,       \
+    FRONTIER_MON_RHYDON_2,      \
+    FRONTIER_MON_ALAKAZAM_2,    \
+    FRONTIER_MON_WEEZING_2,     \
+    FRONTIER_MON_KANGASKHAN_2,  \
+    FRONTIER_MON_ELECTABUZZ_2,  \
+    FRONTIER_MON_TAUROS_2,      \
+    FRONTIER_MON_SLOWBRO_2,     \
+    FRONTIER_MON_SLOWKING_2,    \
+    FRONTIER_MON_MILTANK_2,     \
+    FRONTIER_MON_ALTARIA_2,     \
+    FRONTIER_MON_NIDOQUEEN_2,   \
+    FRONTIER_MON_NIDOKING_2,    \
+    FRONTIER_MON_MAGMAR_2,      \
+    FRONTIER_MON_CRADILY_2,     \
+    FRONTIER_MON_ARMALDO_2,     \
+    FRONTIER_MON_GOLDUCK_2,     \
+    FRONTIER_MON_RAPIDASH_2,    \
+    FRONTIER_MON_ELECTRODE_3,   \
+    FRONTIER_MON_EXPLOUD_3,     \
+    FRONTIER_MON_SHIFTRY_3,     \
+    FRONTIER_MON_GLALIE_3,      \
+    FRONTIER_MON_LUDICOLO_3,    \
+    FRONTIER_MON_HYPNO_3,       \
+    FRONTIER_MON_GOLEM_3,       \
+    FRONTIER_MON_RHYDON_3,      \
+    FRONTIER_MON_ALAKAZAM_3,    \
+    FRONTIER_MON_WEEZING_3,     \
+    FRONTIER_MON_KANGASKHAN_3,  \
+    FRONTIER_MON_ELECTABUZZ_3,  \
+    FRONTIER_MON_TAUROS_3,      \
+    FRONTIER_MON_SLOWBRO_3,     \
+    FRONTIER_MON_SLOWKING_3,    \
+    FRONTIER_MON_MILTANK_3,     \
+    FRONTIER_MON_ALTARIA_3,     \
+    FRONTIER_MON_NIDOQUEEN_3,   \
+    FRONTIER_MON_NIDOKING_3,    \
+    FRONTIER_MON_MAGMAR_3,      \
+    FRONTIER_MON_CRADILY_3,     \
+    FRONTIER_MON_ARMALDO_3,     \
+    FRONTIER_MON_GOLDUCK_3,     \
+    FRONTIER_MON_RAPIDASH_3,    \
+    FRONTIER_MON_ELECTRODE_4,   \
+    FRONTIER_MON_EXPLOUD_4,     \
+    FRONTIER_MON_SHIFTRY_4,     \
+    FRONTIER_MON_GLALIE_4,      \
+    FRONTIER_MON_LUDICOLO_4,    \
+    FRONTIER_MON_HYPNO_4,       \
+    FRONTIER_MON_GOLEM_4,       \
+    FRONTIER_MON_RHYDON_4,      \
+    FRONTIER_MON_ALAKAZAM_4,    \
+    FRONTIER_MON_WEEZING_4,     \
+    FRONTIER_MON_KANGASKHAN_4,  \
+    FRONTIER_MON_ELECTABUZZ_4,  \
+    FRONTIER_MON_TAUROS_4,      \
+    FRONTIER_MON_SLOWBRO_4,     \
+    FRONTIER_MON_SLOWKING_4,    \
+    FRONTIER_MON_MILTANK_4,     \
+    FRONTIER_MON_ALTARIA_4,     \
+    FRONTIER_MON_NIDOQUEEN_4,   \
+    FRONTIER_MON_NIDOKING_4,    \
+    FRONTIER_MON_MAGMAR_4,      \
+    FRONTIER_MON_CRADILY_4,     \
+    FRONTIER_MON_ARMALDO_4,     \
+    FRONTIER_MON_GOLDUCK_4,     \
+    FRONTIER_MON_RAPIDASH_4,    \
+    -1
+
+// Used by Pkmn Ranger M, Gentleman, Running Triathlete, and Cycling Triathlete
+#define FRONTIER_MONS_GENERAL_A \
+    FRONTIER_MON_DUGTRIO_4,     \
+    FRONTIER_MON_MEDICHAM_4,    \
+    FRONTIER_MON_MISDREAVUS_4,  \
+    FRONTIER_MON_FEAROW_4,      \
+    FRONTIER_MON_GRANBULL_4,    \
+    FRONTIER_MON_JYNX_4,        \
+    FRONTIER_MON_DUSCLOPS_4,    \
+    FRONTIER_MON_DODRIO_4,      \
+    FRONTIER_MON_MR_MIME_4,     \
+    FRONTIER_MON_LANTURN_4,     \
+    FRONTIER_MON_BRELOOM_4,     \
+    FRONTIER_MON_FORRETRESS_4,  \
+    FRONTIER_MON_WHISCASH_4,    \
+    FRONTIER_MON_XATU_4,        \
+    FRONTIER_MON_SKARMORY_4,    \
+    FRONTIER_MON_MAROWAK_4,     \
+    FRONTIER_MON_QUAGSIRE_4,    \
+    FRONTIER_MON_CLEFABLE_4,    \
+    FRONTIER_MON_HARIYAMA_4,    \
+    FRONTIER_MON_RAICHU_4,      \
+    FRONTIER_MON_DEWGONG_4,     \
+    FRONTIER_MON_MANECTRIC_4,   \
+    FRONTIER_MON_VILEPLUME_4,   \
+    FRONTIER_MON_VICTREEBEL_4,  \
+    FRONTIER_MON_ELECTRODE_4,   \
+    FRONTIER_MON_EXPLOUD_4,     \
+    FRONTIER_MON_SHIFTRY_4,     \
+    FRONTIER_MON_GLALIE_4,      \
+    FRONTIER_MON_LUDICOLO_4,    \
+    FRONTIER_MON_HYPNO_4,       \
+    FRONTIER_MON_GOLEM_4,       \
+    FRONTIER_MON_RHYDON_4,      \
+    FRONTIER_MON_ALAKAZAM_4,    \
+    FRONTIER_MON_WEEZING_4,     \
+    FRONTIER_MON_KANGASKHAN_4,  \
+    FRONTIER_MON_ELECTABUZZ_4,  \
+    FRONTIER_MON_TAUROS_4,      \
+    FRONTIER_MON_SLOWBRO_4,     \
+    FRONTIER_MON_SLOWKING_4,    \
+    FRONTIER_MON_MILTANK_4,     \
+    FRONTIER_MON_ALTARIA_4,     \
+    FRONTIER_MON_NIDOQUEEN_4,   \
+    FRONTIER_MON_NIDOKING_4,    \
+    FRONTIER_MON_MAGMAR_4,      \
+    FRONTIER_MON_CRADILY_4,     \
+    FRONTIER_MON_ARMALDO_4,     \
+    FRONTIER_MON_GOLDUCK_4,     \
+    FRONTIER_MON_RAPIDASH_4,    \
+    FRONTIER_MON_MUK_4,         \
+    FRONTIER_MON_GENGAR_4,      \
+    FRONTIER_MON_AMPHAROS_4,    \
+    FRONTIER_MON_SCIZOR_4,      \
+    FRONTIER_MON_HERACROSS_4,   \
+    FRONTIER_MON_URSARING_4,    \
+    FRONTIER_MON_HOUNDOOM_4,    \
+    FRONTIER_MON_DONPHAN_4,     \
+    FRONTIER_MON_CLAYDOL_4,     \
+    FRONTIER_MON_WAILORD_4,     \
+    FRONTIER_MON_NINETALES_4,   \
+    FRONTIER_MON_MACHAMP_4,     \
+    FRONTIER_MON_SHUCKLE_4,     \
+    FRONTIER_MON_STEELIX_4,     \
+    FRONTIER_MON_TENTACRUEL_4,  \
+    FRONTIER_MON_AERODACTYL_4,  \
+    FRONTIER_MON_PORYGON2_4,    \
+    FRONTIER_MON_GARDEVOIR_4,   \
+    FRONTIER_MON_EXEGGUTOR_4,   \
+    FRONTIER_MON_STARMIE_4,     \
+    FRONTIER_MON_FLYGON_4,      \
+    FRONTIER_MON_VENUSAUR_4,    \
+    FRONTIER_MON_VAPOREON_4,    \
+    FRONTIER_MON_JOLTEON_4,     \
+    FRONTIER_MON_FLAREON_4,     \
+    FRONTIER_MON_MEGANIUM_4,    \
+    FRONTIER_MON_ESPEON_4,      \
+    FRONTIER_MON_UMBREON_4,     \
+    FRONTIER_MON_BLASTOISE_4,   \
+    FRONTIER_MON_FERALIGATR_4,  \
+    FRONTIER_MON_AGGRON_4,      \
+    FRONTIER_MON_BLAZIKEN_4,    \
+    FRONTIER_MON_WALREIN_4,     \
+    FRONTIER_MON_SCEPTILE_4,    \
+    FRONTIER_MON_CHARIZARD_4,   \
+    FRONTIER_MON_TYPHLOSION_4,  \
+    FRONTIER_MON_LAPRAS_4,      \
+    FRONTIER_MON_CROBAT_4,      \
+    FRONTIER_MON_SWAMPERT_4,    \
+    FRONTIER_MON_GYARADOS_4,    \
+    FRONTIER_MON_SNORLAX_4,     \
+    FRONTIER_MON_KINGDRA_4,     \
+    FRONTIER_MON_BLISSEY_4,     \
+    FRONTIER_MON_MILOTIC_4,     \
+    FRONTIER_MON_ARCANINE_4,    \
+    FRONTIER_MON_SALAMENCE_4,   \
+    FRONTIER_MON_METAGROSS_4,   \
+    FRONTIER_MON_SLAKING_4,     \
+    -1
+
+// Identical to FRONTIER_MONS_GENERAL_A but _3
+// Used by Pkmn Ranger, Running Triathlete, and Cycling Triathlete
+#define FRONTIER_MONS_GENERAL_B \
+    FRONTIER_MON_DUGTRIO_3,     \
+    FRONTIER_MON_MEDICHAM_3,    \
+    FRONTIER_MON_MISDREAVUS_3,  \
+    FRONTIER_MON_FEAROW_3,      \
+    FRONTIER_MON_GRANBULL_3,    \
+    FRONTIER_MON_JYNX_3,        \
+    FRONTIER_MON_DUSCLOPS_3,    \
+    FRONTIER_MON_DODRIO_3,      \
+    FRONTIER_MON_MR_MIME_3,     \
+    FRONTIER_MON_LANTURN_3,     \
+    FRONTIER_MON_BRELOOM_3,     \
+    FRONTIER_MON_FORRETRESS_3,  \
+    FRONTIER_MON_WHISCASH_3,    \
+    FRONTIER_MON_XATU_3,        \
+    FRONTIER_MON_SKARMORY_3,    \
+    FRONTIER_MON_MAROWAK_3,     \
+    FRONTIER_MON_QUAGSIRE_3,    \
+    FRONTIER_MON_CLEFABLE_3,    \
+    FRONTIER_MON_HARIYAMA_3,    \
+    FRONTIER_MON_RAICHU_3,      \
+    FRONTIER_MON_DEWGONG_3,     \
+    FRONTIER_MON_MANECTRIC_3,   \
+    FRONTIER_MON_VILEPLUME_3,   \
+    FRONTIER_MON_VICTREEBEL_3,  \
+    FRONTIER_MON_ELECTRODE_3,   \
+    FRONTIER_MON_EXPLOUD_3,     \
+    FRONTIER_MON_SHIFTRY_3,     \
+    FRONTIER_MON_GLALIE_3,      \
+    FRONTIER_MON_LUDICOLO_3,    \
+    FRONTIER_MON_HYPNO_3,       \
+    FRONTIER_MON_GOLEM_3,       \
+    FRONTIER_MON_RHYDON_3,      \
+    FRONTIER_MON_ALAKAZAM_3,    \
+    FRONTIER_MON_WEEZING_3,     \
+    FRONTIER_MON_KANGASKHAN_3,  \
+    FRONTIER_MON_ELECTABUZZ_3,  \
+    FRONTIER_MON_TAUROS_3,      \
+    FRONTIER_MON_SLOWBRO_3,     \
+    FRONTIER_MON_SLOWKING_3,    \
+    FRONTIER_MON_MILTANK_3,     \
+    FRONTIER_MON_ALTARIA_3,     \
+    FRONTIER_MON_NIDOQUEEN_3,   \
+    FRONTIER_MON_NIDOKING_3,    \
+    FRONTIER_MON_MAGMAR_3,      \
+    FRONTIER_MON_CRADILY_3,     \
+    FRONTIER_MON_ARMALDO_3,     \
+    FRONTIER_MON_GOLDUCK_3,     \
+    FRONTIER_MON_RAPIDASH_3,    \
+    FRONTIER_MON_MUK_3,         \
+    FRONTIER_MON_GENGAR_3,      \
+    FRONTIER_MON_AMPHAROS_3,    \
+    FRONTIER_MON_SCIZOR_3,      \
+    FRONTIER_MON_HERACROSS_3,   \
+    FRONTIER_MON_URSARING_3,    \
+    FRONTIER_MON_HOUNDOOM_3,    \
+    FRONTIER_MON_DONPHAN_3,     \
+    FRONTIER_MON_CLAYDOL_3,     \
+    FRONTIER_MON_WAILORD_3,     \
+    FRONTIER_MON_NINETALES_3,   \
+    FRONTIER_MON_MACHAMP_3,     \
+    FRONTIER_MON_SHUCKLE_3,     \
+    FRONTIER_MON_STEELIX_3,     \
+    FRONTIER_MON_TENTACRUEL_3,  \
+    FRONTIER_MON_AERODACTYL_3,  \
+    FRONTIER_MON_PORYGON2_3,    \
+    FRONTIER_MON_GARDEVOIR_3,   \
+    FRONTIER_MON_EXEGGUTOR_3,   \
+    FRONTIER_MON_STARMIE_3,     \
+    FRONTIER_MON_FLYGON_3,      \
+    FRONTIER_MON_VENUSAUR_3,    \
+    FRONTIER_MON_VAPOREON_3,    \
+    FRONTIER_MON_JOLTEON_3,     \
+    FRONTIER_MON_FLAREON_3,     \
+    FRONTIER_MON_MEGANIUM_3,    \
+    FRONTIER_MON_ESPEON_3,      \
+    FRONTIER_MON_UMBREON_3,     \
+    FRONTIER_MON_BLASTOISE_3,   \
+    FRONTIER_MON_FERALIGATR_3,  \
+    FRONTIER_MON_AGGRON_3,      \
+    FRONTIER_MON_BLAZIKEN_3,    \
+    FRONTIER_MON_WALREIN_3,     \
+    FRONTIER_MON_SCEPTILE_3,    \
+    FRONTIER_MON_CHARIZARD_3,   \
+    FRONTIER_MON_TYPHLOSION_3,  \
+    FRONTIER_MON_LAPRAS_3,      \
+    FRONTIER_MON_CROBAT_3,      \
+    FRONTIER_MON_SWAMPERT_3,    \
+    FRONTIER_MON_GYARADOS_3,    \
+    FRONTIER_MON_SNORLAX_3,     \
+    FRONTIER_MON_KINGDRA_3,     \
+    FRONTIER_MON_BLISSEY_3,     \
+    FRONTIER_MON_MILOTIC_3,     \
+    FRONTIER_MON_ARCANINE_3,    \
+    FRONTIER_MON_SALAMENCE_3,   \
+    FRONTIER_MON_METAGROSS_3,   \
+    FRONTIER_MON_SLAKING_3,     \
+    -1
+
+// Similar to FRONTIER_MONS_GENERAL_A/B but _2
+// Used by Pkmn Ranger, Running Triathlete, and Cycling Triathlete
+#define FRONTIER_MONS_GENERAL_C \
+    FRONTIER_MON_DUGTRIO_2,     \
+    FRONTIER_MON_MEDICHAM_2,    \
+    FRONTIER_MON_MAROWAK_2,     \
+    FRONTIER_MON_QUAGSIRE_2,    \
+    FRONTIER_MON_MISDREAVUS_2,  \
+    FRONTIER_MON_FEAROW_2,      \
+    FRONTIER_MON_GRANBULL_2,    \
+    FRONTIER_MON_JYNX_2,        \
+    FRONTIER_MON_DUSCLOPS_2,    \
+    FRONTIER_MON_DODRIO_2,      \
+    FRONTIER_MON_MR_MIME_2,     \
+    FRONTIER_MON_LANTURN_2,     \
+    FRONTIER_MON_BRELOOM_2,     \
+    FRONTIER_MON_FORRETRESS_2,  \
+    FRONTIER_MON_SKARMORY_2,    \
+    FRONTIER_MON_WHISCASH_2,    \
+    FRONTIER_MON_XATU_2,        \
+    FRONTIER_MON_CLEFABLE_2,    \
+    FRONTIER_MON_HARIYAMA_2,    \
+    FRONTIER_MON_RAICHU_2,      \
+    FRONTIER_MON_DEWGONG_2,     \
+    FRONTIER_MON_MANECTRIC_2,   \
+    FRONTIER_MON_VILEPLUME_2,   \
+    FRONTIER_MON_VICTREEBEL_2,  \
+    FRONTIER_MON_ELECTRODE_2,   \
+    FRONTIER_MON_EXPLOUD_2,     \
+    FRONTIER_MON_SHIFTRY_2,     \
+    FRONTIER_MON_GLALIE_2,      \
+    FRONTIER_MON_LUDICOLO_2,    \
+    FRONTIER_MON_HYPNO_2,       \
+    FRONTIER_MON_GOLEM_2,       \
+    FRONTIER_MON_RHYDON_2,      \
+    FRONTIER_MON_ALAKAZAM_2,    \
+    FRONTIER_MON_WEEZING_2,     \
+    FRONTIER_MON_KANGASKHAN_2,  \
+    FRONTIER_MON_ELECTABUZZ_2,  \
+    FRONTIER_MON_TAUROS_2,      \
+    FRONTIER_MON_SLOWBRO_2,     \
+    FRONTIER_MON_SLOWKING_2,    \
+    FRONTIER_MON_MILTANK_2,     \
+    FRONTIER_MON_ALTARIA_2,     \
+    FRONTIER_MON_NIDOQUEEN_2,   \
+    FRONTIER_MON_NIDOKING_2,    \
+    FRONTIER_MON_MAGMAR_2,      \
+    FRONTIER_MON_CRADILY_2,     \
+    FRONTIER_MON_ARMALDO_2,     \
+    FRONTIER_MON_GOLDUCK_2,     \
+    FRONTIER_MON_RAPIDASH_2,    \
+    FRONTIER_MON_MUK_2,         \
+    FRONTIER_MON_GENGAR_2,      \
+    FRONTIER_MON_AMPHAROS_2,    \
+    FRONTIER_MON_SCIZOR_2,      \
+    FRONTIER_MON_HERACROSS_2,   \
+    FRONTIER_MON_URSARING_2,    \
+    FRONTIER_MON_HOUNDOOM_2,    \
+    FRONTIER_MON_DONPHAN_2,     \
+    FRONTIER_MON_CLAYDOL_2,     \
+    FRONTIER_MON_WAILORD_2,     \
+    FRONTIER_MON_NINETALES_2,   \
+    FRONTIER_MON_MACHAMP_2,     \
+    FRONTIER_MON_SHUCKLE_2,     \
+    FRONTIER_MON_STEELIX_2,     \
+    FRONTIER_MON_TENTACRUEL_2,  \
+    FRONTIER_MON_AERODACTYL_2,  \
+    FRONTIER_MON_PORYGON2_2,    \
+    FRONTIER_MON_GARDEVOIR_2,   \
+    FRONTIER_MON_EXEGGUTOR_2,   \
+    FRONTIER_MON_STARMIE_2,     \
+    FRONTIER_MON_FLYGON_2,      \
+    FRONTIER_MON_VENUSAUR_2,    \
+    FRONTIER_MON_VAPOREON_2,    \
+    FRONTIER_MON_JOLTEON_2,     \
+    FRONTIER_MON_FLAREON_2,     \
+    FRONTIER_MON_MEGANIUM_2,    \
+    FRONTIER_MON_ESPEON_2,      \
+    FRONTIER_MON_UMBREON_2,     \
+    FRONTIER_MON_BLASTOISE_2,   \
+    FRONTIER_MON_FERALIGATR_2,  \
+    FRONTIER_MON_AGGRON_2,      \
+    FRONTIER_MON_BLAZIKEN_2,    \
+    FRONTIER_MON_WALREIN_2,     \
+    FRONTIER_MON_SCEPTILE_2,    \
+    FRONTIER_MON_CHARIZARD_2,   \
+    FRONTIER_MON_TYPHLOSION_2,  \
+    FRONTIER_MON_LAPRAS_2,      \
+    FRONTIER_MON_CROBAT_2,      \
+    FRONTIER_MON_SWAMPERT_2,    \
+    FRONTIER_MON_GYARADOS_2,    \
+    FRONTIER_MON_SNORLAX_2,     \
+    FRONTIER_MON_KINGDRA_2,     \
+    FRONTIER_MON_BLISSEY_2,     \
+    FRONTIER_MON_MILOTIC_2,     \
+    FRONTIER_MON_ARCANINE_2,    \
+    FRONTIER_MON_SALAMENCE_2,   \
+    FRONTIER_MON_METAGROSS_2,   \
+    FRONTIER_MON_SLAKING_2,     \
+    -1 
+
+// Similar to FRONTIER_MONS_GENERAL_C but _1 (would be identical if not for re-ordering)
+// Used by Pkmn Ranger, Running Triathlete, Cycling Triathlete
+#define FRONTIER_MONS_GENERAL_D \
+    FRONTIER_MON_DUGTRIO_1,     \
+    FRONTIER_MON_MEDICHAM_1,    \
+    FRONTIER_MON_MISDREAVUS_1,  \
+    FRONTIER_MON_FEAROW_1,      \
+    FRONTIER_MON_GRANBULL_1,    \
+    FRONTIER_MON_JYNX_1,        \
+    FRONTIER_MON_DUSCLOPS_1,    \
+    FRONTIER_MON_DODRIO_1,      \
+    FRONTIER_MON_MR_MIME_1,     \
+    FRONTIER_MON_LANTURN_1,     \
+    FRONTIER_MON_BRELOOM_1,     \
+    FRONTIER_MON_FORRETRESS_1,  \
+    FRONTIER_MON_WHISCASH_1,    \
+    FRONTIER_MON_XATU_1,        \
+    FRONTIER_MON_SKARMORY_1,    \
+    FRONTIER_MON_MAROWAK_1,     \
+    FRONTIER_MON_QUAGSIRE_1,    \
+    FRONTIER_MON_CLEFABLE_1,    \
+    FRONTIER_MON_HARIYAMA_1,    \
+    FRONTIER_MON_RAICHU_1,      \
+    FRONTIER_MON_DEWGONG_1,     \
+    FRONTIER_MON_MANECTRIC_1,   \
+    FRONTIER_MON_VILEPLUME_1,   \
+    FRONTIER_MON_VICTREEBEL_1,  \
+    FRONTIER_MON_ELECTRODE_1,   \
+    FRONTIER_MON_EXPLOUD_1,     \
+    FRONTIER_MON_SHIFTRY_1,     \
+    FRONTIER_MON_GLALIE_1,      \
+    FRONTIER_MON_LUDICOLO_1,    \
+    FRONTIER_MON_HYPNO_1,       \
+    FRONTIER_MON_GOLEM_1,       \
+    FRONTIER_MON_RHYDON_1,      \
+    FRONTIER_MON_ALAKAZAM_1,    \
+    FRONTIER_MON_WEEZING_1,     \
+    FRONTIER_MON_KANGASKHAN_1,  \
+    FRONTIER_MON_ELECTABUZZ_1,  \
+    FRONTIER_MON_TAUROS_1,      \
+    FRONTIER_MON_SLOWBRO_1,     \
+    FRONTIER_MON_SLOWKING_1,    \
+    FRONTIER_MON_MILTANK_1,     \
+    FRONTIER_MON_ALTARIA_1,     \
+    FRONTIER_MON_NIDOQUEEN_1,   \
+    FRONTIER_MON_NIDOKING_1,    \
+    FRONTIER_MON_MAGMAR_1,      \
+    FRONTIER_MON_CRADILY_1,     \
+    FRONTIER_MON_ARMALDO_1,     \
+    FRONTIER_MON_GOLDUCK_1,     \
+    FRONTIER_MON_RAPIDASH_1,    \
+    FRONTIER_MON_MUK_1,         \
+    FRONTIER_MON_GENGAR_1,      \
+    FRONTIER_MON_AMPHAROS_1,    \
+    FRONTIER_MON_SCIZOR_1,      \
+    FRONTIER_MON_HERACROSS_1,   \
+    FRONTIER_MON_URSARING_1,    \
+    FRONTIER_MON_HOUNDOOM_1,    \
+    FRONTIER_MON_DONPHAN_1,     \
+    FRONTIER_MON_CLAYDOL_1,     \
+    FRONTIER_MON_WAILORD_1,     \
+    FRONTIER_MON_NINETALES_1,   \
+    FRONTIER_MON_MACHAMP_1,     \
+    FRONTIER_MON_SHUCKLE_1,     \
+    FRONTIER_MON_STEELIX_1,     \
+    FRONTIER_MON_TENTACRUEL_1,  \
+    FRONTIER_MON_AERODACTYL_1,  \
+    FRONTIER_MON_PORYGON2_1,    \
+    FRONTIER_MON_GARDEVOIR_1,   \
+    FRONTIER_MON_EXEGGUTOR_1,   \
+    FRONTIER_MON_STARMIE_1,     \
+    FRONTIER_MON_FLYGON_1,      \
+    FRONTIER_MON_VENUSAUR_1,    \
+    FRONTIER_MON_VAPOREON_1,    \
+    FRONTIER_MON_JOLTEON_1,     \
+    FRONTIER_MON_FLAREON_1,     \
+    FRONTIER_MON_MEGANIUM_1,    \
+    FRONTIER_MON_ESPEON_1,      \
+    FRONTIER_MON_UMBREON_1,     \
+    FRONTIER_MON_BLASTOISE_1,   \
+    FRONTIER_MON_FERALIGATR_1,  \
+    FRONTIER_MON_AGGRON_1,      \
+    FRONTIER_MON_BLAZIKEN_1,    \
+    FRONTIER_MON_WALREIN_1,     \
+    FRONTIER_MON_SCEPTILE_1,    \
+    FRONTIER_MON_CHARIZARD_1,   \
+    FRONTIER_MON_TYPHLOSION_1,  \
+    FRONTIER_MON_LAPRAS_1,      \
+    FRONTIER_MON_CROBAT_1,      \
+    FRONTIER_MON_SWAMPERT_1,    \
+    FRONTIER_MON_GYARADOS_1,    \
+    FRONTIER_MON_SNORLAX_1,     \
+    FRONTIER_MON_KINGDRA_1,     \
+    FRONTIER_MON_BLISSEY_1,     \
+    FRONTIER_MON_MILOTIC_1,     \
+    FRONTIER_MON_ARCANINE_1,    \
+    FRONTIER_MON_SALAMENCE_1,   \
+    FRONTIER_MON_METAGROSS_1,   \
+    FRONTIER_MON_SLAKING_1,     \
+    -1
+
+#define FRONTIER_MONS_DRAGON_TAMER_2 \
+    FRONTIER_MON_RHYDON_1,      \
+    FRONTIER_MON_ALTARIA_1,     \
+    FRONTIER_MON_NIDOQUEEN_1,   \
+    FRONTIER_MON_NIDOKING_1,    \
+    FRONTIER_MON_STEELIX_1,     \
+    FRONTIER_MON_AERODACTYL_1,  \
+    FRONTIER_MON_FLYGON_1,      \
+    FRONTIER_MON_AGGRON_1,      \
+    FRONTIER_MON_CHARIZARD_1,   \
+    FRONTIER_MON_LAPRAS_1,      \
+    FRONTIER_MON_GYARADOS_1,    \
+    FRONTIER_MON_KINGDRA_1,     \
+    FRONTIER_MON_MILOTIC_1,     \
+    FRONTIER_MON_SALAMENCE_1,   \
+    FRONTIER_MON_RHYDON_2,      \
+    FRONTIER_MON_ALTARIA_2,     \
+    FRONTIER_MON_NIDOQUEEN_2,   \
+    FRONTIER_MON_NIDOKING_2,    \
+    FRONTIER_MON_STEELIX_2,     \
+    FRONTIER_MON_AERODACTYL_2,  \
+    FRONTIER_MON_FLYGON_2,      \
+    FRONTIER_MON_AGGRON_2,      \
+    FRONTIER_MON_CHARIZARD_2,   \
+    FRONTIER_MON_LAPRAS_2,      \
+    FRONTIER_MON_GYARADOS_2,    \
+    FRONTIER_MON_KINGDRA_2,     \
+    FRONTIER_MON_MILOTIC_2,     \
+    FRONTIER_MON_SALAMENCE_2,   \
+    FRONTIER_MON_RHYDON_3,      \
+    FRONTIER_MON_ALTARIA_3,     \
+    FRONTIER_MON_NIDOQUEEN_3,   \
+    FRONTIER_MON_NIDOKING_3,    \
+    FRONTIER_MON_STEELIX_3,     \
+    FRONTIER_MON_AERODACTYL_3,  \
+    FRONTIER_MON_FLYGON_3,      \
+    FRONTIER_MON_AGGRON_3,      \
+    FRONTIER_MON_CHARIZARD_3,   \
+    FRONTIER_MON_LAPRAS_3,      \
+    FRONTIER_MON_GYARADOS_3,    \
+    FRONTIER_MON_KINGDRA_3,     \
+    FRONTIER_MON_MILOTIC_3,     \
+    FRONTIER_MON_SALAMENCE_3,   \
+    FRONTIER_MON_RHYDON_4,      \
+    FRONTIER_MON_ALTARIA_4,     \
+    FRONTIER_MON_NIDOQUEEN_4,   \
+    FRONTIER_MON_NIDOKING_4,    \
+    FRONTIER_MON_STEELIX_4,     \
+    FRONTIER_MON_AERODACTYL_4,  \
+    FRONTIER_MON_FLYGON_4,      \
+    FRONTIER_MON_AGGRON_4,      \
+    FRONTIER_MON_CHARIZARD_4,   \
+    FRONTIER_MON_LAPRAS_4,      \
+    FRONTIER_MON_GYARADOS_4,    \
+    FRONTIER_MON_KINGDRA_4,     \
+    FRONTIER_MON_MILOTIC_4,     \
+    FRONTIER_MON_SALAMENCE_4,   \
+    FRONTIER_MON_LATIAS_1,      \
+    FRONTIER_MON_LATIOS_1,      \
+    FRONTIER_MON_LATIAS_2,      \
+    FRONTIER_MON_LATIOS_2,      \
+    FRONTIER_MON_LATIAS_3,      \
+    FRONTIER_MON_LATIOS_3,      \
+    FRONTIER_MON_LATIAS_4,      \
+    FRONTIER_MON_LATIOS_4,      \
+    FRONTIER_MON_SALAMENCE_5,   \
+    FRONTIER_MON_SALAMENCE_6,   \
+    FRONTIER_MON_SALAMENCE_7,   \
+    FRONTIER_MON_SALAMENCE_8,   \
+    FRONTIER_MON_LATIAS_5,      \
+    FRONTIER_MON_LATIAS_6,      \
+    FRONTIER_MON_LATIAS_7,      \
+    FRONTIER_MON_LATIAS_8,      \
+    FRONTIER_MON_LATIOS_5,      \
+    FRONTIER_MON_LATIOS_6,      \
+    FRONTIER_MON_LATIOS_7,      \
+    FRONTIER_MON_LATIOS_8,      \
+    FRONTIER_MON_DRAGONITE_1,   \
+    FRONTIER_MON_DRAGONITE_2,   \
+    FRONTIER_MON_DRAGONITE_3,   \
+    FRONTIER_MON_DRAGONITE_4,   \
+    FRONTIER_MON_DRAGONITE_5,   \
+    FRONTIER_MON_DRAGONITE_6,   \
+    FRONTIER_MON_DRAGONITE_7,   \
+    FRONTIER_MON_DRAGONITE_8,   \
+    FRONTIER_MON_DRAGONITE_9,   \
+    FRONTIER_MON_DRAGONITE_10,  \
+    FRONTIER_MON_TYRANITAR_1,   \
+    FRONTIER_MON_TYRANITAR_2,   \
+    FRONTIER_MON_TYRANITAR_3,   \
+    FRONTIER_MON_TYRANITAR_4,   \
+    FRONTIER_MON_TYRANITAR_5,   \
+    FRONTIER_MON_TYRANITAR_6,   \
+    FRONTIER_MON_TYRANITAR_7,   \
+    FRONTIER_MON_TYRANITAR_8,   \
+    FRONTIER_MON_TYRANITAR_9,   \
+    FRONTIER_MON_TYRANITAR_10,  \
+    -1
+
+#define FRONTIER_MONS_BLACK_BELT_2A \
+    FRONTIER_MON_MEDICHAM_1,    \
+    FRONTIER_MON_BRELOOM_1,     \
+    FRONTIER_MON_HARIYAMA_1,    \
+    FRONTIER_MON_GOLEM_1,       \
+    FRONTIER_MON_RHYDON_1,      \
+    FRONTIER_MON_CRADILY_1,     \
+    FRONTIER_MON_ARMALDO_1,     \
+    FRONTIER_MON_HERACROSS_1,   \
+    FRONTIER_MON_MACHAMP_1,     \
+    FRONTIER_MON_SHUCKLE_1,     \
+    FRONTIER_MON_AERODACTYL_1,  \
+    FRONTIER_MON_AGGRON_1,      \
+    FRONTIER_MON_BLAZIKEN_1,    \
+    FRONTIER_MON_MEDICHAM_2,    \
+    FRONTIER_MON_BRELOOM_2,     \
+    FRONTIER_MON_HARIYAMA_2,    \
+    FRONTIER_MON_GOLEM_2,       \
+    FRONTIER_MON_RHYDON_2,      \
+    FRONTIER_MON_CRADILY_2,     \
+    FRONTIER_MON_ARMALDO_2,     \
+    FRONTIER_MON_HERACROSS_2,   \
+    FRONTIER_MON_MACHAMP_2,     \
+    FRONTIER_MON_SHUCKLE_2,     \
+    FRONTIER_MON_AERODACTYL_2,  \
+    FRONTIER_MON_AGGRON_2,      \
+    FRONTIER_MON_BLAZIKEN_2,    \
+    FRONTIER_MON_MEDICHAM_3,    \
+    FRONTIER_MON_BRELOOM_3,     \
+    FRONTIER_MON_HARIYAMA_3,    \
+    FRONTIER_MON_GOLEM_3,       \
+    FRONTIER_MON_RHYDON_3,      \
+    FRONTIER_MON_CRADILY_3,     \
+    FRONTIER_MON_ARMALDO_3,     \
+    FRONTIER_MON_HERACROSS_3,   \
+    FRONTIER_MON_MACHAMP_3,     \
+    FRONTIER_MON_SHUCKLE_3,     \
+    FRONTIER_MON_AERODACTYL_3,  \
+    FRONTIER_MON_AGGRON_3,      \
+    FRONTIER_MON_BLAZIKEN_3,    \
+    FRONTIER_MON_MEDICHAM_4,    \
+    FRONTIER_MON_BRELOOM_4,     \
+    FRONTIER_MON_HARIYAMA_4,    \
+    FRONTIER_MON_GOLEM_4,       \
+    FRONTIER_MON_RHYDON_4,      \
+    FRONTIER_MON_CRADILY_4,     \
+    FRONTIER_MON_ARMALDO_4,     \
+    FRONTIER_MON_HERACROSS_4,   \
+    FRONTIER_MON_MACHAMP_4,     \
+    FRONTIER_MON_SHUCKLE_4,     \
+    FRONTIER_MON_AERODACTYL_4,  \
+    FRONTIER_MON_AGGRON_4,      \
+    FRONTIER_MON_BLAZIKEN_4,    \
+    FRONTIER_MON_MACHAMP_5,     \
+    FRONTIER_MON_MACHAMP_6,     \
+    FRONTIER_MON_MACHAMP_7,     \
+    FRONTIER_MON_MACHAMP_8,     \
+    -1
+
+#define FRONTIER_MONS_BATTLE_GIRL_2A \
+    FRONTIER_MON_MEDICHAM_1,    \
+    FRONTIER_MON_BRELOOM_1,     \
+    FRONTIER_MON_MAROWAK_1,     \
+    FRONTIER_MON_HARIYAMA_1,    \
+    FRONTIER_MON_GOLEM_1,       \
+    FRONTIER_MON_RHYDON_1,      \
+    FRONTIER_MON_NIDOQUEEN_1,   \
+    FRONTIER_MON_NIDOKING_1,    \
+    FRONTIER_MON_HERACROSS_1,   \
+    FRONTIER_MON_DONPHAN_1,     \
+    FRONTIER_MON_MACHAMP_1,     \
+    FRONTIER_MON_STEELIX_1,     \
+    FRONTIER_MON_BLAZIKEN_1,    \
+    FRONTIER_MON_MEDICHAM_2,    \
+    FRONTIER_MON_MAROWAK_2,     \
+    FRONTIER_MON_BRELOOM_2,     \
+    FRONTIER_MON_HARIYAMA_2,    \
+    FRONTIER_MON_GOLEM_2,       \
+    FRONTIER_MON_RHYDON_2,      \
+    FRONTIER_MON_NIDOQUEEN_2,   \
+    FRONTIER_MON_NIDOKING_2,    \
+    FRONTIER_MON_HERACROSS_2,   \
+    FRONTIER_MON_DONPHAN_2,     \
+    FRONTIER_MON_MACHAMP_2,     \
+    FRONTIER_MON_STEELIX_2,     \
+    FRONTIER_MON_BLAZIKEN_2,    \
+    FRONTIER_MON_MEDICHAM_3,    \
+    FRONTIER_MON_BRELOOM_3,     \
+    FRONTIER_MON_MAROWAK_3,     \
+    FRONTIER_MON_HARIYAMA_3,    \
+    FRONTIER_MON_GOLEM_3,       \
+    FRONTIER_MON_RHYDON_3,      \
+    FRONTIER_MON_NIDOQUEEN_3,   \
+    FRONTIER_MON_NIDOKING_3,    \
+    FRONTIER_MON_HERACROSS_3,   \
+    FRONTIER_MON_DONPHAN_3,     \
+    FRONTIER_MON_MACHAMP_3,     \
+    FRONTIER_MON_STEELIX_3,     \
+    FRONTIER_MON_BLAZIKEN_3,    \
+    FRONTIER_MON_MEDICHAM_4,    \
+    FRONTIER_MON_BRELOOM_4,     \
+    FRONTIER_MON_MAROWAK_4,     \
+    FRONTIER_MON_HARIYAMA_4,    \
+    FRONTIER_MON_GOLEM_4,       \
+    FRONTIER_MON_RHYDON_4,      \
+    FRONTIER_MON_NIDOQUEEN_4,   \
+    FRONTIER_MON_NIDOKING_4,    \
+    FRONTIER_MON_HERACROSS_4,   \
+    FRONTIER_MON_DONPHAN_4,     \
+    FRONTIER_MON_MACHAMP_4,     \
+    FRONTIER_MON_STEELIX_4,     \
+    FRONTIER_MON_BLAZIKEN_4,    \
+    FRONTIER_MON_MACHAMP_5,     \
+    FRONTIER_MON_MACHAMP_6,     \
+    FRONTIER_MON_MACHAMP_7,     \
+    FRONTIER_MON_MACHAMP_8,     \
+    -1
+
+#define FRONTIER_MONS_BLACK_BELT_BATTLE_GIRL_2B \
+    FRONTIER_MON_MEDICHAM_1,    \
+    FRONTIER_MON_BRELOOM_1,     \
+    FRONTIER_MON_HARIYAMA_1,    \
+    FRONTIER_MON_MAGMAR_1,      \
+    FRONTIER_MON_RAPIDASH_1,    \
+    FRONTIER_MON_HERACROSS_1,   \
+    FRONTIER_MON_HOUNDOOM_1,    \
+    FRONTIER_MON_NINETALES_1,   \
+    FRONTIER_MON_MACHAMP_1,     \
+    FRONTIER_MON_FLAREON_1,     \
+    FRONTIER_MON_BLAZIKEN_1,    \
+    FRONTIER_MON_CHARIZARD_1,   \
+    FRONTIER_MON_TYPHLOSION_1,  \
+    FRONTIER_MON_ARCANINE_1,    \
+    FRONTIER_MON_MEDICHAM_2,    \
+    FRONTIER_MON_BRELOOM_2,     \
+    FRONTIER_MON_HARIYAMA_2,    \
+    FRONTIER_MON_MAGMAR_2,      \
+    FRONTIER_MON_RAPIDASH_2,    \
+    FRONTIER_MON_HERACROSS_2,   \
+    FRONTIER_MON_HOUNDOOM_2,    \
+    FRONTIER_MON_NINETALES_2,   \
+    FRONTIER_MON_MACHAMP_2,     \
+    FRONTIER_MON_FLAREON_2,     \
+    FRONTIER_MON_BLAZIKEN_2,    \
+    FRONTIER_MON_CHARIZARD_2,   \
+    FRONTIER_MON_TYPHLOSION_2,  \
+    FRONTIER_MON_ARCANINE_2,    \
+    FRONTIER_MON_MEDICHAM_3,    \
+    FRONTIER_MON_BRELOOM_3,     \
+    FRONTIER_MON_HARIYAMA_3,    \
+    FRONTIER_MON_MAGMAR_3,      \
+    FRONTIER_MON_RAPIDASH_3,    \
+    FRONTIER_MON_HERACROSS_3,   \
+    FRONTIER_MON_HOUNDOOM_3,    \
+    FRONTIER_MON_NINETALES_3,   \
+    FRONTIER_MON_MACHAMP_3,     \
+    FRONTIER_MON_FLAREON_3,     \
+    FRONTIER_MON_BLAZIKEN_3,    \
+    FRONTIER_MON_CHARIZARD_3,   \
+    FRONTIER_MON_TYPHLOSION_3,  \
+    FRONTIER_MON_ARCANINE_3,    \
+    FRONTIER_MON_MEDICHAM_4,    \
+    FRONTIER_MON_BRELOOM_4,     \
+    FRONTIER_MON_HARIYAMA_4,    \
+    FRONTIER_MON_MAGMAR_4,      \
+    FRONTIER_MON_RAPIDASH_4,    \
+    FRONTIER_MON_HERACROSS_4,   \
+    FRONTIER_MON_HOUNDOOM_4,    \
+    FRONTIER_MON_NINETALES_4,   \
+    FRONTIER_MON_MACHAMP_4,     \
+    FRONTIER_MON_FLAREON_4,     \
+    FRONTIER_MON_BLAZIKEN_4,    \
+    FRONTIER_MON_CHARIZARD_4,   \
+    FRONTIER_MON_TYPHLOSION_4,  \
+    FRONTIER_MON_ARCANINE_4,    \
+    FRONTIER_MON_MACHAMP_5,     \
+    FRONTIER_MON_MACHAMP_6,     \
+    FRONTIER_MON_MACHAMP_7,     \
+    FRONTIER_MON_MACHAMP_8,     \
+    -1
+
+#define FRONTIER_MONS_BLACK_BELT_BATTLE_GIRL_2C \
+    FRONTIER_MON_MEDICHAM_1,    \
+    FRONTIER_MON_BRELOOM_1,     \
+    FRONTIER_MON_FORRETRESS_1,  \
+    FRONTIER_MON_SKARMORY_1,    \
+    FRONTIER_MON_HARIYAMA_1,    \
+    FRONTIER_MON_SCIZOR_1,      \
+    FRONTIER_MON_HERACROSS_1,   \
+    FRONTIER_MON_MACHAMP_1,     \
+    FRONTIER_MON_STEELIX_1,     \
+    FRONTIER_MON_AGGRON_1,      \
+    FRONTIER_MON_BLAZIKEN_1,    \
+    FRONTIER_MON_METAGROSS_1,   \
+    FRONTIER_MON_MEDICHAM_2,    \
+    FRONTIER_MON_BRELOOM_2,     \
+    FRONTIER_MON_FORRETRESS_2,  \
+    FRONTIER_MON_SKARMORY_2,    \
+    FRONTIER_MON_HARIYAMA_2,    \
+    FRONTIER_MON_SCIZOR_2,      \
+    FRONTIER_MON_HERACROSS_2,   \
+    FRONTIER_MON_MACHAMP_2,     \
+    FRONTIER_MON_STEELIX_2,     \
+    FRONTIER_MON_AGGRON_2,      \
+    FRONTIER_MON_BLAZIKEN_2,    \
+    FRONTIER_MON_METAGROSS_2,   \
+    FRONTIER_MON_MEDICHAM_3,    \
+    FRONTIER_MON_BRELOOM_3,     \
+    FRONTIER_MON_FORRETRESS_3,  \
+    FRONTIER_MON_SKARMORY_3,    \
+    FRONTIER_MON_HARIYAMA_3,    \
+    FRONTIER_MON_SCIZOR_3,      \
+    FRONTIER_MON_HERACROSS_3,   \
+    FRONTIER_MON_MACHAMP_3,     \
+    FRONTIER_MON_STEELIX_3,     \
+    FRONTIER_MON_AGGRON_3,      \
+    FRONTIER_MON_BLAZIKEN_3,    \
+    FRONTIER_MON_METAGROSS_3,   \
+    FRONTIER_MON_MEDICHAM_4,    \
+    FRONTIER_MON_BRELOOM_4,     \
+    FRONTIER_MON_FORRETRESS_4,  \
+    FRONTIER_MON_SKARMORY_4,    \
+    FRONTIER_MON_HARIYAMA_4,    \
+    FRONTIER_MON_SCIZOR_4,      \
+    FRONTIER_MON_HERACROSS_4,   \
+    FRONTIER_MON_MACHAMP_4,     \
+    FRONTIER_MON_STEELIX_4,     \
+    FRONTIER_MON_AGGRON_4,      \
+    FRONTIER_MON_BLAZIKEN_4,    \
+    FRONTIER_MON_METAGROSS_4,   \
+    FRONTIER_MON_MACHAMP_5,     \
+    FRONTIER_MON_MACHAMP_6,     \
+    FRONTIER_MON_MACHAMP_7,     \
+    FRONTIER_MON_MACHAMP_8,     \
+    FRONTIER_MON_METAGROSS_5,   \
+    FRONTIER_MON_METAGROSS_6,   \
+    FRONTIER_MON_METAGROSS_7,   \
+    FRONTIER_MON_METAGROSS_8,   \
+    -1
+
+// For this group, Expert M uses Tyranitar, Expert F uses Dragonite
+#define FRONTIER_MONS_EXPERT_2A(lastmon) \
+    FRONTIER_MON_BRELOOM_1,     \
+    FRONTIER_MON_MAROWAK_1,     \
+    FRONTIER_MON_RHYDON_1,      \
+    FRONTIER_MON_SCIZOR_1,      \
+    FRONTIER_MON_HERACROSS_1,   \
+    FRONTIER_MON_URSARING_1,    \
+    FRONTIER_MON_MACHAMP_1,     \
+    FRONTIER_MON_STEELIX_1,     \
+    FRONTIER_MON_AERODACTYL_1,  \
+    FRONTIER_MON_AGGRON_1,      \
+    FRONTIER_MON_GYARADOS_1,    \
+    FRONTIER_MON_KINGDRA_1,     \
+    FRONTIER_MON_SALAMENCE_1,   \
+    FRONTIER_MON_METAGROSS_1,   \
+    FRONTIER_MON_MAROWAK_2,     \
+    FRONTIER_MON_BRELOOM_2,     \
+    FRONTIER_MON_RHYDON_2,      \
+    FRONTIER_MON_SCIZOR_2,      \
+    FRONTIER_MON_HERACROSS_2,   \
+    FRONTIER_MON_URSARING_2,    \
+    FRONTIER_MON_MACHAMP_2,     \
+    FRONTIER_MON_STEELIX_2,     \
+    FRONTIER_MON_AERODACTYL_2,  \
+    FRONTIER_MON_AGGRON_2,      \
+    FRONTIER_MON_GYARADOS_2,    \
+    FRONTIER_MON_KINGDRA_2,     \
+    FRONTIER_MON_SALAMENCE_2,   \
+    FRONTIER_MON_METAGROSS_2,   \
+    FRONTIER_MON_BRELOOM_3,     \
+    FRONTIER_MON_MAROWAK_3,     \
+    FRONTIER_MON_RHYDON_3,      \
+    FRONTIER_MON_SCIZOR_3,      \
+    FRONTIER_MON_HERACROSS_3,   \
+    FRONTIER_MON_URSARING_3,    \
+    FRONTIER_MON_MACHAMP_3,     \
+    FRONTIER_MON_STEELIX_3,     \
+    FRONTIER_MON_AERODACTYL_3,  \
+    FRONTIER_MON_AGGRON_3,      \
+    FRONTIER_MON_GYARADOS_3,    \
+    FRONTIER_MON_KINGDRA_3,     \
+    FRONTIER_MON_SALAMENCE_3,   \
+    FRONTIER_MON_METAGROSS_3,   \
+    FRONTIER_MON_BRELOOM_4,     \
+    FRONTIER_MON_MAROWAK_4,     \
+    FRONTIER_MON_RHYDON_4,      \
+    FRONTIER_MON_SCIZOR_4,      \
+    FRONTIER_MON_HERACROSS_4,   \
+    FRONTIER_MON_URSARING_4,    \
+    FRONTIER_MON_MACHAMP_4,     \
+    FRONTIER_MON_STEELIX_4,     \
+    FRONTIER_MON_AERODACTYL_4,  \
+    FRONTIER_MON_AGGRON_4,      \
+    FRONTIER_MON_GYARADOS_4,    \
+    FRONTIER_MON_KINGDRA_4,     \
+    FRONTIER_MON_SALAMENCE_4,   \
+    FRONTIER_MON_METAGROSS_4,   \
+    FRONTIER_MON_REGIROCK_1,    \
+    FRONTIER_MON_REGICE_1,      \
+    FRONTIER_MON_REGISTEEL_1,   \
+    FRONTIER_MON_REGIROCK_2,    \
+    FRONTIER_MON_REGICE_2,      \
+    FRONTIER_MON_REGISTEEL_2,   \
+    FRONTIER_MON_REGIROCK_3,    \
+    FRONTIER_MON_REGICE_3,      \
+    FRONTIER_MON_REGISTEEL_3,   \
+    FRONTIER_MON_REGIROCK_4,    \
+    FRONTIER_MON_REGICE_4,      \
+    FRONTIER_MON_REGISTEEL_4,   \
+    FRONTIER_MON_URSARING_5,    \
+    FRONTIER_MON_URSARING_6,    \
+    FRONTIER_MON_URSARING_7,    \
+    FRONTIER_MON_URSARING_8,    \
+    FRONTIER_MON_MACHAMP_5,     \
+    FRONTIER_MON_MACHAMP_6,     \
+    FRONTIER_MON_MACHAMP_7,     \
+    FRONTIER_MON_MACHAMP_8,     \
+    FRONTIER_MON_SALAMENCE_5,   \
+    FRONTIER_MON_SALAMENCE_6,   \
+    FRONTIER_MON_SALAMENCE_7,   \
+    FRONTIER_MON_SALAMENCE_8,   \
+    FRONTIER_MON_METAGROSS_5,   \
+    FRONTIER_MON_METAGROSS_6,   \
+    FRONTIER_MON_METAGROSS_7,   \
+    FRONTIER_MON_METAGROSS_8,   \
+    FRONTIER_MON_REGIROCK_5,    \
+    FRONTIER_MON_REGIROCK_6,    \
+    FRONTIER_MON_REGICE_5,      \
+    FRONTIER_MON_REGICE_6,      \
+    FRONTIER_MON_REGISTEEL_5,   \
+    FRONTIER_MON_REGISTEEL_6,   \
+    FRONTIER_MON_##lastmon##_1, \
+    FRONTIER_MON_##lastmon##_2, \
+    FRONTIER_MON_##lastmon##_3, \
+    FRONTIER_MON_##lastmon##_4, \
+    FRONTIER_MON_##lastmon##_5, \
+    FRONTIER_MON_##lastmon##_6, \
+    FRONTIER_MON_##lastmon##_7, \
+    FRONTIER_MON_##lastmon##_8, \
+    FRONTIER_MON_##lastmon##_9, \
+    FRONTIER_MON_##lastmon##_10,\
+    -1
+
+// For this group, Expert M uses Latios, Expert F uses Latias
+#define FRONTIER_MONS_EXPERT_2B(lati) \
+    FRONTIER_MON_MISDREAVUS_1,  \
+    FRONTIER_MON_JYNX_1,        \
+    FRONTIER_MON_ALAKAZAM_1,    \
+    FRONTIER_MON_GENGAR_1,      \
+    FRONTIER_MON_AMPHAROS_1,    \
+    FRONTIER_MON_HOUNDOOM_1,    \
+    FRONTIER_MON_GARDEVOIR_1,   \
+    FRONTIER_MON_STARMIE_1,     \
+    FRONTIER_MON_ESPEON_1,      \
+    FRONTIER_MON_BLAZIKEN_1,    \
+    FRONTIER_MON_SCEPTILE_1,    \
+    FRONTIER_MON_CROBAT_1,      \
+    FRONTIER_MON_SWAMPERT_1,    \
+    FRONTIER_MON_MISDREAVUS_2,  \
+    FRONTIER_MON_JYNX_2,        \
+    FRONTIER_MON_ALAKAZAM_2,    \
+    FRONTIER_MON_GENGAR_2,      \
+    FRONTIER_MON_AMPHAROS_2,    \
+    FRONTIER_MON_HOUNDOOM_2,    \
+    FRONTIER_MON_GARDEVOIR_2,   \
+    FRONTIER_MON_STARMIE_2,     \
+    FRONTIER_MON_ESPEON_2,      \
+    FRONTIER_MON_BLAZIKEN_2,    \
+    FRONTIER_MON_SCEPTILE_2,    \
+    FRONTIER_MON_CROBAT_2,      \
+    FRONTIER_MON_SWAMPERT_2,    \
+    FRONTIER_MON_MISDREAVUS_3,  \
+    FRONTIER_MON_JYNX_3,        \
+    FRONTIER_MON_ALAKAZAM_3,    \
+    FRONTIER_MON_GENGAR_3,      \
+    FRONTIER_MON_AMPHAROS_3,    \
+    FRONTIER_MON_HOUNDOOM_3,    \
+    FRONTIER_MON_GARDEVOIR_3,   \
+    FRONTIER_MON_STARMIE_3,     \
+    FRONTIER_MON_ESPEON_3,      \
+    FRONTIER_MON_BLAZIKEN_3,    \
+    FRONTIER_MON_SCEPTILE_3,    \
+    FRONTIER_MON_CROBAT_3,      \
+    FRONTIER_MON_SWAMPERT_3,    \
+    FRONTIER_MON_MISDREAVUS_4,  \
+    FRONTIER_MON_JYNX_4,        \
+    FRONTIER_MON_ALAKAZAM_4,    \
+    FRONTIER_MON_GENGAR_4,      \
+    FRONTIER_MON_AMPHAROS_4,    \
+    FRONTIER_MON_HOUNDOOM_4,    \
+    FRONTIER_MON_GARDEVOIR_4,   \
+    FRONTIER_MON_STARMIE_4,     \
+    FRONTIER_MON_ESPEON_4,      \
+    FRONTIER_MON_BLAZIKEN_4,    \
+    FRONTIER_MON_SCEPTILE_4,    \
+    FRONTIER_MON_CROBAT_4,      \
+    FRONTIER_MON_SWAMPERT_4,    \
+    FRONTIER_MON_REGIROCK_1,    \
+    FRONTIER_MON_REGICE_1,      \
+    FRONTIER_MON_REGISTEEL_1,   \
+    FRONTIER_MON_##lati##_1,    \
+    FRONTIER_MON_REGIROCK_2,    \
+    FRONTIER_MON_REGICE_2,      \
+    FRONTIER_MON_REGISTEEL_2,   \
+    FRONTIER_MON_##lati##_2,    \
+    FRONTIER_MON_REGIROCK_3,    \
+    FRONTIER_MON_REGICE_3,      \
+    FRONTIER_MON_REGISTEEL_3,   \
+    FRONTIER_MON_##lati##_3,    \
+    FRONTIER_MON_REGIROCK_4,    \
+    FRONTIER_MON_REGICE_4,      \
+    FRONTIER_MON_REGISTEEL_4,   \
+    FRONTIER_MON_##lati##_4,    \
+    FRONTIER_MON_GENGAR_5,      \
+    FRONTIER_MON_GENGAR_6,      \
+    FRONTIER_MON_GENGAR_7,      \
+    FRONTIER_MON_GENGAR_8,      \
+    FRONTIER_MON_GARDEVOIR_5,   \
+    FRONTIER_MON_GARDEVOIR_6,   \
+    FRONTIER_MON_GARDEVOIR_7,   \
+    FRONTIER_MON_GARDEVOIR_8,   \
+    FRONTIER_MON_STARMIE_5,     \
+    FRONTIER_MON_STARMIE_6,     \
+    FRONTIER_MON_STARMIE_7,     \
+    FRONTIER_MON_STARMIE_8,     \
+    FRONTIER_MON_REGIROCK_5,    \
+    FRONTIER_MON_REGIROCK_6,    \
+    FRONTIER_MON_REGICE_5,      \
+    FRONTIER_MON_REGICE_6,      \
+    FRONTIER_MON_REGISTEEL_5,   \
+    FRONTIER_MON_REGISTEEL_6,   \
+    FRONTIER_MON_##lati##_5,    \
+    FRONTIER_MON_##lati##_6,    \
+    FRONTIER_MON_##lati##_7,    \
+    FRONTIER_MON_##lati##_8,    \
+    FRONTIER_MON_TYRANITAR_1,   \
+    FRONTIER_MON_TYRANITAR_2,   \
+    FRONTIER_MON_TYRANITAR_3,   \
+    FRONTIER_MON_TYRANITAR_4,   \
+    FRONTIER_MON_TYRANITAR_5,   \
+    FRONTIER_MON_TYRANITAR_6,   \
+    FRONTIER_MON_TYRANITAR_7,   \
+    FRONTIER_MON_TYRANITAR_8,   \
+    FRONTIER_MON_TYRANITAR_9,   \
+    FRONTIER_MON_TYRANITAR_10,  \
+    -1 
+
+// For this group, Expert M uses Tyranitar, Expert F uses Dragonite
+#define FRONTIER_MONS_EXPERT_2C(lastmon) \
+    FRONTIER_MON_DUSCLOPS_1,    \
+    FRONTIER_MON_QUAGSIRE_1,    \
+    FRONTIER_MON_LUDICOLO_1,    \
+    FRONTIER_MON_SLOWBRO_1,     \
+    FRONTIER_MON_SLOWKING_1,    \
+    FRONTIER_MON_MILTANK_1,     \
+    FRONTIER_MON_CRADILY_1,     \
+    FRONTIER_MON_WAILORD_1,     \
+    FRONTIER_MON_SHUCKLE_1,     \
+    FRONTIER_MON_EXEGGUTOR_1,   \
+    FRONTIER_MON_UMBREON_1,     \
+    FRONTIER_MON_WALREIN_1,     \
+    FRONTIER_MON_LAPRAS_1,      \
+    FRONTIER_MON_SNORLAX_1,     \
+    FRONTIER_MON_BLISSEY_1,     \
+    FRONTIER_MON_MILOTIC_1,     \
+    FRONTIER_MON_QUAGSIRE_2,    \
+    FRONTIER_MON_DUSCLOPS_2,    \
+    FRONTIER_MON_LUDICOLO_2,    \
+    FRONTIER_MON_SLOWBRO_2,     \
+    FRONTIER_MON_SLOWKING_2,    \
+    FRONTIER_MON_MILTANK_2,     \
+    FRONTIER_MON_CRADILY_2,     \
+    FRONTIER_MON_WAILORD_2,     \
+    FRONTIER_MON_SHUCKLE_2,     \
+    FRONTIER_MON_EXEGGUTOR_2,   \
+    FRONTIER_MON_UMBREON_2,     \
+    FRONTIER_MON_WALREIN_2,     \
+    FRONTIER_MON_LAPRAS_2,      \
+    FRONTIER_MON_SNORLAX_2,     \
+    FRONTIER_MON_BLISSEY_2,     \
+    FRONTIER_MON_MILOTIC_2,     \
+    FRONTIER_MON_DUSCLOPS_3,    \
+    FRONTIER_MON_QUAGSIRE_3,    \
+    FRONTIER_MON_LUDICOLO_3,    \
+    FRONTIER_MON_SLOWBRO_3,     \
+    FRONTIER_MON_SLOWKING_3,    \
+    FRONTIER_MON_MILTANK_3,     \
+    FRONTIER_MON_CRADILY_3,     \
+    FRONTIER_MON_WAILORD_3,     \
+    FRONTIER_MON_SHUCKLE_3,     \
+    FRONTIER_MON_EXEGGUTOR_3,   \
+    FRONTIER_MON_UMBREON_3,     \
+    FRONTIER_MON_WALREIN_3,     \
+    FRONTIER_MON_LAPRAS_3,      \
+    FRONTIER_MON_SNORLAX_3,     \
+    FRONTIER_MON_BLISSEY_3,     \
+    FRONTIER_MON_MILOTIC_3,     \
+    FRONTIER_MON_DUSCLOPS_4,    \
+    FRONTIER_MON_QUAGSIRE_4,    \
+    FRONTIER_MON_LUDICOLO_4,    \
+    FRONTIER_MON_SLOWBRO_4,     \
+    FRONTIER_MON_SLOWKING_4,    \
+    FRONTIER_MON_MILTANK_4,     \
+    FRONTIER_MON_CRADILY_4,     \
+    FRONTIER_MON_WAILORD_4,     \
+    FRONTIER_MON_SHUCKLE_4,     \
+    FRONTIER_MON_EXEGGUTOR_4,   \
+    FRONTIER_MON_UMBREON_4,     \
+    FRONTIER_MON_WALREIN_4,     \
+    FRONTIER_MON_LAPRAS_4,      \
+    FRONTIER_MON_SNORLAX_4,     \
+    FRONTIER_MON_BLISSEY_4,     \
+    FRONTIER_MON_MILOTIC_4,     \
+    FRONTIER_MON_REGIROCK_1,    \
+    FRONTIER_MON_REGICE_1,      \
+    FRONTIER_MON_REGISTEEL_1,   \
+    FRONTIER_MON_REGIROCK_2,    \
+    FRONTIER_MON_REGICE_2,      \
+    FRONTIER_MON_REGISTEEL_2,   \
+    FRONTIER_MON_REGIROCK_3,    \
+    FRONTIER_MON_REGICE_3,      \
+    FRONTIER_MON_REGISTEEL_3,   \
+    FRONTIER_MON_REGIROCK_4,    \
+    FRONTIER_MON_REGICE_4,      \
+    FRONTIER_MON_REGISTEEL_4,   \
+    FRONTIER_MON_LAPRAS_5,      \
+    FRONTIER_MON_LAPRAS_6,      \
+    FRONTIER_MON_LAPRAS_7,      \
+    FRONTIER_MON_LAPRAS_8,      \
+    FRONTIER_MON_SNORLAX_5,     \
+    FRONTIER_MON_SNORLAX_6,     \
+    FRONTIER_MON_SNORLAX_7,     \
+    FRONTIER_MON_SNORLAX_8,     \
+    FRONTIER_MON_REGIROCK_5,    \
+    FRONTIER_MON_REGIROCK_6,    \
+    FRONTIER_MON_REGICE_5,      \
+    FRONTIER_MON_REGICE_6,      \
+    FRONTIER_MON_REGISTEEL_5,   \
+    FRONTIER_MON_REGISTEEL_6,   \
+    FRONTIER_MON_##lastmon##_1, \
+    FRONTIER_MON_##lastmon##_2, \
+    FRONTIER_MON_##lastmon##_3, \
+    FRONTIER_MON_##lastmon##_4, \
+    FRONTIER_MON_##lastmon##_5, \
+    FRONTIER_MON_##lastmon##_6, \
+    FRONTIER_MON_##lastmon##_7, \
+    FRONTIER_MON_##lastmon##_8, \
+    FRONTIER_MON_##lastmon##_9, \
+    FRONTIER_MON_##lastmon##_10,\
+    -1 
+
+// The strong Psychic M/F trainers all use the below pokemon
+// Additionally they use 1 of 3 legendary trios, and Latios or Latias depending on gender
+#define FRONTIER_MONS_PSYCHIC_2(lati, legend1, legend2, legend3) \
+    FRONTIER_MON_WOBBUFFET_1,   \
+    FRONTIER_MON_WOBBUFFET_2,   \
+    FRONTIER_MON_JYNX_1,        \
+    FRONTIER_MON_MR_MIME_1,     \
+    FRONTIER_MON_XATU_1,        \
+    FRONTIER_MON_HYPNO_1,       \
+    FRONTIER_MON_ALAKAZAM_1,    \
+    FRONTIER_MON_SLOWBRO_1,     \
+    FRONTIER_MON_SLOWKING_1,    \
+    FRONTIER_MON_CLAYDOL_1,     \
+    FRONTIER_MON_GARDEVOIR_1,   \
+    FRONTIER_MON_EXEGGUTOR_1,   \
+    FRONTIER_MON_STARMIE_1,     \
+    FRONTIER_MON_ESPEON_1,      \
+    FRONTIER_MON_METAGROSS_1,   \
+    FRONTIER_MON_JYNX_2,        \
+    FRONTIER_MON_MR_MIME_2,     \
+    FRONTIER_MON_XATU_2,        \
+    FRONTIER_MON_HYPNO_2,       \
+    FRONTIER_MON_ALAKAZAM_2,    \
+    FRONTIER_MON_SLOWBRO_2,     \
+    FRONTIER_MON_SLOWKING_2,    \
+    FRONTIER_MON_CLAYDOL_2,     \
+    FRONTIER_MON_GARDEVOIR_2,   \
+    FRONTIER_MON_EXEGGUTOR_2,   \
+    FRONTIER_MON_STARMIE_2,     \
+    FRONTIER_MON_ESPEON_2,      \
+    FRONTIER_MON_METAGROSS_2,   \
+    FRONTIER_MON_JYNX_3,        \
+    FRONTIER_MON_MR_MIME_3,     \
+    FRONTIER_MON_XATU_3,        \
+    FRONTIER_MON_HYPNO_3,       \
+    FRONTIER_MON_ALAKAZAM_3,    \
+    FRONTIER_MON_SLOWBRO_3,     \
+    FRONTIER_MON_SLOWKING_3,    \
+    FRONTIER_MON_CLAYDOL_3,     \
+    FRONTIER_MON_GARDEVOIR_3,   \
+    FRONTIER_MON_EXEGGUTOR_3,   \
+    FRONTIER_MON_STARMIE_3,     \
+    FRONTIER_MON_ESPEON_3,      \
+    FRONTIER_MON_METAGROSS_3,   \
+    FRONTIER_MON_JYNX_4,        \
+    FRONTIER_MON_MR_MIME_4,     \
+    FRONTIER_MON_XATU_4,        \
+    FRONTIER_MON_HYPNO_4,       \
+    FRONTIER_MON_ALAKAZAM_4,    \
+    FRONTIER_MON_SLOWBRO_4,     \
+    FRONTIER_MON_SLOWKING_4,    \
+    FRONTIER_MON_CLAYDOL_4,     \
+    FRONTIER_MON_GARDEVOIR_4,   \
+    FRONTIER_MON_EXEGGUTOR_4,   \
+    FRONTIER_MON_STARMIE_4,     \
+    FRONTIER_MON_ESPEON_4,      \
+    FRONTIER_MON_METAGROSS_4,   \
+    FRONTIER_MON_##legend1##_1, \
+    FRONTIER_MON_##legend2##_1, \
+    FRONTIER_MON_##legend3##_1, \
+    FRONTIER_MON_##lati##_1,    \
+    FRONTIER_MON_##legend1##_2, \
+    FRONTIER_MON_##legend2##_2, \
+    FRONTIER_MON_##legend3##_2, \
+    FRONTIER_MON_##lati##_2,    \
+    FRONTIER_MON_##legend1##_3, \
+    FRONTIER_MON_##legend2##_3, \
+    FRONTIER_MON_##legend3##_3, \
+    FRONTIER_MON_##lati##_3,    \
+    FRONTIER_MON_##legend1##_4, \
+    FRONTIER_MON_##legend2##_4, \
+    FRONTIER_MON_##legend3##_4, \
+    FRONTIER_MON_##lati##_4,    \
+    FRONTIER_MON_GARDEVOIR_5,   \
+    FRONTIER_MON_GARDEVOIR_6,   \
+    FRONTIER_MON_GARDEVOIR_7,   \
+    FRONTIER_MON_GARDEVOIR_8,   \
+    FRONTIER_MON_STARMIE_5,     \
+    FRONTIER_MON_STARMIE_6,     \
+    FRONTIER_MON_STARMIE_7,     \
+    FRONTIER_MON_STARMIE_8,     \
+    FRONTIER_MON_METAGROSS_5,   \
+    FRONTIER_MON_METAGROSS_6,   \
+    FRONTIER_MON_METAGROSS_7,   \
+    FRONTIER_MON_METAGROSS_8,
+
+#define FRONTIER_MONS_PSYCHIC_2A(lati) \
+    FRONTIER_MONS_PSYCHIC_2(lati, ARTICUNO, ZAPDOS, MOLTRES) \
+    FRONTIER_MON_##lati##_5,    \
+    FRONTIER_MON_##lati##_6,    \
+    FRONTIER_MON_##lati##_7,    \
+    FRONTIER_MON_##lati##_8,    \
+    FRONTIER_MON_ARTICUNO_5,    \
+    FRONTIER_MON_ARTICUNO_6,    \
+    FRONTIER_MON_ZAPDOS_5,      \
+    FRONTIER_MON_ZAPDOS_6,      \
+    FRONTIER_MON_MOLTRES_5,     \
+    FRONTIER_MON_MOLTRES_6,     \
+    -1 
+
+#define FRONTIER_MONS_PSYCHIC_2B(lati) \
+    FRONTIER_MONS_PSYCHIC_2(lati, RAIKOU, ENTEI, SUICUNE) \
+    FRONTIER_MON_##lati##_5,    \
+    FRONTIER_MON_##lati##_6,    \
+    FRONTIER_MON_##lati##_7,    \
+    FRONTIER_MON_##lati##_8,    \
+    FRONTIER_MON_RAIKOU_5,      \
+    FRONTIER_MON_RAIKOU_6,      \
+    FRONTIER_MON_ENTEI_5,       \
+    FRONTIER_MON_ENTEI_6,       \
+    FRONTIER_MON_SUICUNE_5,     \
+    FRONTIER_MON_SUICUNE_6,     \
+    -1 
+
+// Because the regis/latis are swapped here they cant all be merged into the same macro and match
+#define FRONTIER_MONS_PSYCHIC_2C(lati) \
+    FRONTIER_MONS_PSYCHIC_2(lati, REGIROCK, REGICE, REGISTEEL) \
+    FRONTIER_MON_REGIROCK_5,    \
+    FRONTIER_MON_REGIROCK_6,    \
+    FRONTIER_MON_REGICE_5,      \
+    FRONTIER_MON_REGICE_6,      \
+    FRONTIER_MON_REGISTEEL_5,   \
+    FRONTIER_MON_REGISTEEL_6,   \
+    FRONTIER_MON_##lati##_5,    \
+    FRONTIER_MON_##lati##_6,    \
+    FRONTIER_MON_##lati##_7,    \
+    FRONTIER_MON_##lati##_8,    \
+    -1 
+
+#define FRONTIER_MONS_HEX_MANIAC_2A \
+    FRONTIER_MON_SHARPEDO_2,    \
+    FRONTIER_MON_ABSOL_2,       \
+    FRONTIER_MON_MISDREAVUS_1,  \
+    FRONTIER_MON_DUSCLOPS_1,    \
+    FRONTIER_MON_SHIFTRY_1,     \
+    FRONTIER_MON_GENGAR_1,      \
+    FRONTIER_MON_HOUNDOOM_1,    \
+    FRONTIER_MON_UMBREON_1,     \
+    FRONTIER_MON_MISDREAVUS_2,  \
+    FRONTIER_MON_DUSCLOPS_2,    \
+    FRONTIER_MON_SHIFTRY_2,     \
+    FRONTIER_MON_GENGAR_2,      \
+    FRONTIER_MON_HOUNDOOM_2,    \
+    FRONTIER_MON_UMBREON_2,     \
+    FRONTIER_MON_MISDREAVUS_3,  \
+    FRONTIER_MON_DUSCLOPS_3,    \
+    FRONTIER_MON_SHIFTRY_3,     \
+    FRONTIER_MON_GENGAR_3,      \
+    FRONTIER_MON_HOUNDOOM_3,    \
+    FRONTIER_MON_UMBREON_3,     \
+    FRONTIER_MON_MISDREAVUS_4,  \
+    FRONTIER_MON_DUSCLOPS_4,    \
+    FRONTIER_MON_SHIFTRY_4,     \
+    FRONTIER_MON_GENGAR_4,      \
+    FRONTIER_MON_HOUNDOOM_4,    \
+    FRONTIER_MON_UMBREON_4,     \
+    FRONTIER_MON_GENGAR_5,      \
+    FRONTIER_MON_GENGAR_6,      \
+    FRONTIER_MON_GENGAR_7,      \
+    FRONTIER_MON_GENGAR_8,      \
+    -1 
+
+#define FRONTIER_MONS_HEX_MANIAC_2B \
+    FRONTIER_MON_SEVIPER_2,     \
+    FRONTIER_MON_MISDREAVUS_1,  \
+    FRONTIER_MON_DUSCLOPS_1,    \
+    FRONTIER_MON_VILEPLUME_1,   \
+    FRONTIER_MON_VICTREEBEL_1,  \
+    FRONTIER_MON_WEEZING_1,     \
+    FRONTIER_MON_NIDOQUEEN_1,   \
+    FRONTIER_MON_NIDOKING_1,    \
+    FRONTIER_MON_MUK_1,         \
+    FRONTIER_MON_GENGAR_1,      \
+    FRONTIER_MON_TENTACRUEL_1,  \
+    FRONTIER_MON_VENUSAUR_1,    \
+    FRONTIER_MON_CROBAT_1,      \
+    FRONTIER_MON_MISDREAVUS_2,  \
+    FRONTIER_MON_DUSCLOPS_2,    \
+    FRONTIER_MON_VILEPLUME_2,   \
+    FRONTIER_MON_VICTREEBEL_2,  \
+    FRONTIER_MON_WEEZING_2,     \
+    FRONTIER_MON_NIDOQUEEN_2,   \
+    FRONTIER_MON_NIDOKING_2,    \
+    FRONTIER_MON_MUK_2,         \
+    FRONTIER_MON_GENGAR_2,      \
+    FRONTIER_MON_TENTACRUEL_2,  \
+    FRONTIER_MON_VENUSAUR_2,    \
+    FRONTIER_MON_CROBAT_2,      \
+    FRONTIER_MON_MISDREAVUS_3,  \
+    FRONTIER_MON_DUSCLOPS_3,    \
+    FRONTIER_MON_VILEPLUME_3,   \
+    FRONTIER_MON_VICTREEBEL_3,  \
+    FRONTIER_MON_WEEZING_3,     \
+    FRONTIER_MON_NIDOQUEEN_3,   \
+    FRONTIER_MON_NIDOKING_3,    \
+    FRONTIER_MON_MUK_3,         \
+    FRONTIER_MON_GENGAR_3,      \
+    FRONTIER_MON_TENTACRUEL_3,  \
+    FRONTIER_MON_VENUSAUR_3,    \
+    FRONTIER_MON_CROBAT_3,      \
+    FRONTIER_MON_MISDREAVUS_4,  \
+    FRONTIER_MON_DUSCLOPS_4,    \
+    FRONTIER_MON_VILEPLUME_4,   \
+    FRONTIER_MON_VICTREEBEL_4,  \
+    FRONTIER_MON_WEEZING_4,     \
+    FRONTIER_MON_NIDOQUEEN_4,   \
+    FRONTIER_MON_NIDOKING_4,    \
+    FRONTIER_MON_MUK_4,         \
+    FRONTIER_MON_GENGAR_4,      \
+    FRONTIER_MON_TENTACRUEL_4,  \
+    FRONTIER_MON_VENUSAUR_4,    \
+    FRONTIER_MON_CROBAT_4,      \
+    FRONTIER_MON_GENGAR_5,      \
+    FRONTIER_MON_GENGAR_6,      \
+    FRONTIER_MON_GENGAR_7,      \
+    FRONTIER_MON_GENGAR_8,      \
+    -1 
+
+#define FRONTIER_MONS_HEX_MANIAC_2C \
+    FRONTIER_MON_SEVIPER_2,     \
+    FRONTIER_MON_SHARPEDO_2,    \
+    FRONTIER_MON_ABSOL_2,       \
+    FRONTIER_MON_VILEPLUME_1,   \
+    FRONTIER_MON_VICTREEBEL_1,  \
+    FRONTIER_MON_SHIFTRY_1,     \
+    FRONTIER_MON_WEEZING_1,     \
+    FRONTIER_MON_NIDOQUEEN_1,   \
+    FRONTIER_MON_NIDOKING_1,    \
+    FRONTIER_MON_MUK_1,         \
+    FRONTIER_MON_GENGAR_1,      \
+    FRONTIER_MON_HOUNDOOM_1,    \
+    FRONTIER_MON_TENTACRUEL_1,  \
+    FRONTIER_MON_VENUSAUR_1,    \
+    FRONTIER_MON_UMBREON_1,     \
+    FRONTIER_MON_CROBAT_1,      \
+    FRONTIER_MON_VILEPLUME_2,   \
+    FRONTIER_MON_VICTREEBEL_2,  \
+    FRONTIER_MON_SHIFTRY_2,     \
+    FRONTIER_MON_WEEZING_2,     \
+    FRONTIER_MON_NIDOQUEEN_2,   \
+    FRONTIER_MON_NIDOKING_2,    \
+    FRONTIER_MON_MUK_2,         \
+    FRONTIER_MON_GENGAR_2,      \
+    FRONTIER_MON_HOUNDOOM_2,    \
+    FRONTIER_MON_TENTACRUEL_2,  \
+    FRONTIER_MON_VENUSAUR_2,    \
+    FRONTIER_MON_UMBREON_2,     \
+    FRONTIER_MON_CROBAT_2,      \
+    FRONTIER_MON_VILEPLUME_3,   \
+    FRONTIER_MON_VICTREEBEL_3,  \
+    FRONTIER_MON_SHIFTRY_3,     \
+    FRONTIER_MON_WEEZING_3,     \
+    FRONTIER_MON_NIDOQUEEN_3,   \
+    FRONTIER_MON_NIDOKING_3,    \
+    FRONTIER_MON_MUK_3,         \
+    FRONTIER_MON_GENGAR_3,      \
+    FRONTIER_MON_HOUNDOOM_3,    \
+    FRONTIER_MON_TENTACRUEL_3,  \
+    FRONTIER_MON_VENUSAUR_3,    \
+    FRONTIER_MON_UMBREON_3,     \
+    FRONTIER_MON_CROBAT_3,      \
+    FRONTIER_MON_VILEPLUME_4,   \
+    FRONTIER_MON_VICTREEBEL_4,  \
+    FRONTIER_MON_SHIFTRY_4,     \
+    FRONTIER_MON_WEEZING_4,     \
+    FRONTIER_MON_NIDOQUEEN_4,   \
+    FRONTIER_MON_NIDOKING_4,    \
+    FRONTIER_MON_MUK_4,         \
+    FRONTIER_MON_GENGAR_4,      \
+    FRONTIER_MON_HOUNDOOM_4,    \
+    FRONTIER_MON_TENTACRUEL_4,  \
+    FRONTIER_MON_VENUSAUR_4,    \
+    FRONTIER_MON_UMBREON_4,     \
+    FRONTIER_MON_CROBAT_4,      \
+    FRONTIER_MON_GENGAR_5,      \
+    FRONTIER_MON_GENGAR_6,      \
+    FRONTIER_MON_GENGAR_7,      \
+    FRONTIER_MON_GENGAR_8,      \
+    -1 
+
+// For whatever reason FRONTIER_MON_MAROWAK_2 is in a different order than _1 _3 and _4
+// This order change is the only difference btween FRONITER_MONS_POKEMANIAC_2A and FRONTIER_MONS_POKEMANIAC_2B other than the numbered suffixes
+#define FRONTIER_MONS_POKEMANIAC_2A \
+    FRONTIER_MON_ZANGOOSE_2,    \
+    FRONTIER_MON_GRANBULL_1,    \
+    FRONTIER_MON_SKARMORY_1,    \
+    FRONTIER_MON_MAROWAK_1,     \
+    FRONTIER_MON_EXPLOUD_1,     \
+    FRONTIER_MON_GLALIE_1,      \
+    FRONTIER_MON_GOLEM_1,       \
+    FRONTIER_MON_RHYDON_1,      \
+    FRONTIER_MON_KANGASKHAN_1,  \
+    FRONTIER_MON_TAUROS_1,      \
+    FRONTIER_MON_MILTANK_1,     \
+    FRONTIER_MON_NIDOQUEEN_1,   \
+    FRONTIER_MON_NIDOKING_1,    \
+    FRONTIER_MON_URSARING_1,    \
+    FRONTIER_MON_DONPHAN_1,     \
+    FRONTIER_MON_WAILORD_1,     \
+    FRONTIER_MON_STEELIX_1,     \
+    FRONTIER_MON_AERODACTYL_1,  \
+    FRONTIER_MON_FLYGON_1,      \
+    FRONTIER_MON_VENUSAUR_1,    \
+    FRONTIER_MON_MEGANIUM_1,    \
+    FRONTIER_MON_BLASTOISE_1,   \
+    FRONTIER_MON_FERALIGATR_1,  \
+    FRONTIER_MON_AGGRON_1,      \
+    FRONTIER_MON_WALREIN_1,     \
+    FRONTIER_MON_CHARIZARD_1,   \
+    FRONTIER_MON_LAPRAS_1,      \
+    FRONTIER_MON_SWAMPERT_1,    \
+    FRONTIER_MON_GYARADOS_1,    \
+    FRONTIER_MON_SNORLAX_1,     \
+    FRONTIER_MON_BLISSEY_1,     \
+    FRONTIER_MON_SALAMENCE_1,   \
+    FRONTIER_MON_METAGROSS_1,   \
+    FRONTIER_MON_SLAKING_1,     \
+    FRONTIER_MON_MAROWAK_2,     \
+    FRONTIER_MON_GRANBULL_2,    \
+    FRONTIER_MON_SKARMORY_2,    \
+    FRONTIER_MON_EXPLOUD_2,     \
+    FRONTIER_MON_GLALIE_2,      \
+    FRONTIER_MON_GOLEM_2,       \
+    FRONTIER_MON_RHYDON_2,      \
+    FRONTIER_MON_KANGASKHAN_2,  \
+    FRONTIER_MON_TAUROS_2,      \
+    FRONTIER_MON_MILTANK_2,     \
+    FRONTIER_MON_NIDOQUEEN_2,   \
+    FRONTIER_MON_NIDOKING_2,    \
+    FRONTIER_MON_URSARING_2,    \
+    FRONTIER_MON_DONPHAN_2,     \
+    FRONTIER_MON_WAILORD_2,     \
+    FRONTIER_MON_STEELIX_2,     \
+    FRONTIER_MON_AERODACTYL_2,  \
+    FRONTIER_MON_FLYGON_2,      \
+    FRONTIER_MON_VENUSAUR_2,    \
+    FRONTIER_MON_MEGANIUM_2,    \
+    FRONTIER_MON_BLASTOISE_2,   \
+    FRONTIER_MON_FERALIGATR_2,  \
+    FRONTIER_MON_AGGRON_2,      \
+    FRONTIER_MON_WALREIN_2,     \
+    FRONTIER_MON_CHARIZARD_2,   \
+    FRONTIER_MON_LAPRAS_2,      \
+    FRONTIER_MON_SWAMPERT_2,    \
+    FRONTIER_MON_GYARADOS_2,    \
+    FRONTIER_MON_SNORLAX_2,     \
+    FRONTIER_MON_BLISSEY_2,     \
+    FRONTIER_MON_SALAMENCE_2,   \
+    FRONTIER_MON_METAGROSS_2,   \
+    FRONTIER_MON_SLAKING_2,     \
+    FRONTIER_MON_DRAGONITE_1,   \
+    FRONTIER_MON_DRAGONITE_2,   \
+    FRONTIER_MON_DRAGONITE_3,   \
+    FRONTIER_MON_DRAGONITE_4,   \
+    FRONTIER_MON_DRAGONITE_5,   \
+    FRONTIER_MON_DRAGONITE_6,   \
+    FRONTIER_MON_DRAGONITE_7,   \
+    FRONTIER_MON_DRAGONITE_8,   \
+    FRONTIER_MON_DRAGONITE_9,   \
+    FRONTIER_MON_DRAGONITE_10,  \
+    FRONTIER_MON_TYRANITAR_1,   \
+    FRONTIER_MON_TYRANITAR_2,   \
+    FRONTIER_MON_TYRANITAR_3,   \
+    FRONTIER_MON_TYRANITAR_4,   \
+    FRONTIER_MON_TYRANITAR_5,   \
+    FRONTIER_MON_TYRANITAR_6,   \
+    FRONTIER_MON_TYRANITAR_7,   \
+    FRONTIER_MON_TYRANITAR_8,   \
+    FRONTIER_MON_TYRANITAR_9,   \
+    FRONTIER_MON_TYRANITAR_10,  \
+    -1 
+
+#define FRONTIER_MONS_POKEMANIAC_2B \
+    FRONTIER_MON_ZANGOOSE_2,    \
+    FRONTIER_MON_GRANBULL_3,    \
+    FRONTIER_MON_SKARMORY_3,    \
+    FRONTIER_MON_MAROWAK_3,     \
+    FRONTIER_MON_EXPLOUD_3,     \
+    FRONTIER_MON_GLALIE_3,      \
+    FRONTIER_MON_GOLEM_3,       \
+    FRONTIER_MON_RHYDON_3,      \
+    FRONTIER_MON_KANGASKHAN_3,  \
+    FRONTIER_MON_TAUROS_3,      \
+    FRONTIER_MON_MILTANK_3,     \
+    FRONTIER_MON_NIDOQUEEN_3,   \
+    FRONTIER_MON_NIDOKING_3,    \
+    FRONTIER_MON_URSARING_3,    \
+    FRONTIER_MON_DONPHAN_3,     \
+    FRONTIER_MON_WAILORD_3,     \
+    FRONTIER_MON_STEELIX_3,     \
+    FRONTIER_MON_AERODACTYL_3,  \
+    FRONTIER_MON_FLYGON_3,      \
+    FRONTIER_MON_VENUSAUR_3,    \
+    FRONTIER_MON_MEGANIUM_3,    \
+    FRONTIER_MON_BLASTOISE_3,   \
+    FRONTIER_MON_FERALIGATR_3,  \
+    FRONTIER_MON_AGGRON_3,      \
+    FRONTIER_MON_WALREIN_3,     \
+    FRONTIER_MON_CHARIZARD_3,   \
+    FRONTIER_MON_LAPRAS_3,      \
+    FRONTIER_MON_SWAMPERT_3,    \
+    FRONTIER_MON_GYARADOS_3,    \
+    FRONTIER_MON_SNORLAX_3,     \
+    FRONTIER_MON_BLISSEY_3,     \
+    FRONTIER_MON_SALAMENCE_3,   \
+    FRONTIER_MON_METAGROSS_3,   \
+    FRONTIER_MON_SLAKING_3,     \
+    FRONTIER_MON_GRANBULL_4,    \
+    FRONTIER_MON_SKARMORY_4,    \
+    FRONTIER_MON_MAROWAK_4,     \
+    FRONTIER_MON_EXPLOUD_4,     \
+    FRONTIER_MON_GLALIE_4,      \
+    FRONTIER_MON_GOLEM_4,       \
+    FRONTIER_MON_RHYDON_4,      \
+    FRONTIER_MON_KANGASKHAN_4,  \
+    FRONTIER_MON_TAUROS_4,      \
+    FRONTIER_MON_MILTANK_4,     \
+    FRONTIER_MON_NIDOQUEEN_4,   \
+    FRONTIER_MON_NIDOKING_4,    \
+    FRONTIER_MON_URSARING_4,    \
+    FRONTIER_MON_DONPHAN_4,     \
+    FRONTIER_MON_WAILORD_4,     \
+    FRONTIER_MON_STEELIX_4,     \
+    FRONTIER_MON_AERODACTYL_4,  \
+    FRONTIER_MON_FLYGON_4,      \
+    FRONTIER_MON_VENUSAUR_4,    \
+    FRONTIER_MON_MEGANIUM_4,    \
+    FRONTIER_MON_BLASTOISE_4,   \
+    FRONTIER_MON_FERALIGATR_4,  \
+    FRONTIER_MON_AGGRON_4,      \
+    FRONTIER_MON_WALREIN_4,     \
+    FRONTIER_MON_CHARIZARD_4,   \
+    FRONTIER_MON_LAPRAS_4,      \
+    FRONTIER_MON_SWAMPERT_4,    \
+    FRONTIER_MON_GYARADOS_4,    \
+    FRONTIER_MON_SNORLAX_4,     \
+    FRONTIER_MON_BLISSEY_4,     \
+    FRONTIER_MON_SALAMENCE_4,   \
+    FRONTIER_MON_METAGROSS_4,   \
+    FRONTIER_MON_SLAKING_4,     \
+    FRONTIER_MON_DRAGONITE_1,   \
+    FRONTIER_MON_DRAGONITE_2,   \
+    FRONTIER_MON_DRAGONITE_3,   \
+    FRONTIER_MON_DRAGONITE_4,   \
+    FRONTIER_MON_DRAGONITE_5,   \
+    FRONTIER_MON_DRAGONITE_6,   \
+    FRONTIER_MON_DRAGONITE_7,   \
+    FRONTIER_MON_DRAGONITE_8,   \
+    FRONTIER_MON_DRAGONITE_9,   \
+    FRONTIER_MON_DRAGONITE_10,  \
+    FRONTIER_MON_TYRANITAR_1,   \
+    FRONTIER_MON_TYRANITAR_2,   \
+    FRONTIER_MON_TYRANITAR_3,   \
+    FRONTIER_MON_TYRANITAR_4,   \
+    FRONTIER_MON_TYRANITAR_5,   \
+    FRONTIER_MON_TYRANITAR_6,   \
+    FRONTIER_MON_TYRANITAR_7,   \
+    FRONTIER_MON_TYRANITAR_8,   \
+    FRONTIER_MON_TYRANITAR_9,   \
+    FRONTIER_MON_TYRANITAR_10,  \
+    -1
+
+#define FRONTIER_MONS_POKEMANIAC_2C \
+    FRONTIER_MON_ZANGOOSE_2,    \
+    FRONTIER_MON_URSARING_1,    \
+    FRONTIER_MON_STEELIX_1,     \
+    FRONTIER_MON_AERODACTYL_1,  \
+    FRONTIER_MON_MEGANIUM_1,    \
+    FRONTIER_MON_AGGRON_1,      \
+    FRONTIER_MON_CHARIZARD_1,   \
+    FRONTIER_MON_LAPRAS_1,      \
+    FRONTIER_MON_SWAMPERT_1,    \
+    FRONTIER_MON_GYARADOS_1,    \
+    FRONTIER_MON_SNORLAX_1,     \
+    FRONTIER_MON_SALAMENCE_1,   \
+    FRONTIER_MON_METAGROSS_1,   \
+    FRONTIER_MON_URSARING_2,    \
+    FRONTIER_MON_STEELIX_2,     \
+    FRONTIER_MON_AERODACTYL_2,  \
+    FRONTIER_MON_MEGANIUM_2,    \
+    FRONTIER_MON_AGGRON_2,      \
+    FRONTIER_MON_CHARIZARD_2,   \
+    FRONTIER_MON_LAPRAS_2,      \
+    FRONTIER_MON_SWAMPERT_2,    \
+    FRONTIER_MON_GYARADOS_2,    \
+    FRONTIER_MON_SNORLAX_2,     \
+    FRONTIER_MON_SALAMENCE_2,   \
+    FRONTIER_MON_METAGROSS_2,   \
+    FRONTIER_MON_URSARING_3,    \
+    FRONTIER_MON_STEELIX_3,     \
+    FRONTIER_MON_AERODACTYL_3,  \
+    FRONTIER_MON_MEGANIUM_3,    \
+    FRONTIER_MON_AGGRON_3,      \
+    FRONTIER_MON_CHARIZARD_3,   \
+    FRONTIER_MON_LAPRAS_3,      \
+    FRONTIER_MON_SWAMPERT_3,    \
+    FRONTIER_MON_GYARADOS_3,    \
+    FRONTIER_MON_SNORLAX_3,     \
+    FRONTIER_MON_SALAMENCE_3,   \
+    FRONTIER_MON_METAGROSS_3,   \
+    FRONTIER_MON_URSARING_4,    \
+    FRONTIER_MON_STEELIX_4,     \
+    FRONTIER_MON_AERODACTYL_4,  \
+    FRONTIER_MON_MEGANIUM_4,    \
+    FRONTIER_MON_AGGRON_4,      \
+    FRONTIER_MON_CHARIZARD_4,   \
+    FRONTIER_MON_LAPRAS_4,      \
+    FRONTIER_MON_SWAMPERT_4,    \
+    FRONTIER_MON_GYARADOS_4,    \
+    FRONTIER_MON_SNORLAX_4,     \
+    FRONTIER_MON_SALAMENCE_4,   \
+    FRONTIER_MON_METAGROSS_4,   \
+    FRONTIER_MON_URSARING_5,    \
+    FRONTIER_MON_URSARING_6,    \
+    FRONTIER_MON_URSARING_7,    \
+    FRONTIER_MON_URSARING_8,    \
+    FRONTIER_MON_LAPRAS_5,      \
+    FRONTIER_MON_LAPRAS_6,      \
+    FRONTIER_MON_LAPRAS_7,      \
+    FRONTIER_MON_LAPRAS_8,      \
+    FRONTIER_MON_SNORLAX_5,     \
+    FRONTIER_MON_SNORLAX_6,     \
+    FRONTIER_MON_SNORLAX_7,     \
+    FRONTIER_MON_SNORLAX_8,     \
+    FRONTIER_MON_SALAMENCE_5,   \
+    FRONTIER_MON_SALAMENCE_6,   \
+    FRONTIER_MON_SALAMENCE_7,   \
+    FRONTIER_MON_SALAMENCE_8,   \
+    FRONTIER_MON_METAGROSS_5,   \
+    FRONTIER_MON_METAGROSS_6,   \
+    FRONTIER_MON_METAGROSS_7,   \
+    FRONTIER_MON_METAGROSS_8,   \
+    FRONTIER_MON_DRAGONITE_1,   \
+    FRONTIER_MON_DRAGONITE_2,   \
+    FRONTIER_MON_DRAGONITE_3,   \
+    FRONTIER_MON_DRAGONITE_4,   \
+    FRONTIER_MON_DRAGONITE_5,   \
+    FRONTIER_MON_DRAGONITE_6,   \
+    FRONTIER_MON_DRAGONITE_7,   \
+    FRONTIER_MON_DRAGONITE_8,   \
+    FRONTIER_MON_DRAGONITE_9,   \
+    FRONTIER_MON_DRAGONITE_10,  \
+    FRONTIER_MON_TYRANITAR_1,   \
+    FRONTIER_MON_TYRANITAR_2,   \
+    FRONTIER_MON_TYRANITAR_3,   \
+    FRONTIER_MON_TYRANITAR_4,   \
+    FRONTIER_MON_TYRANITAR_5,   \
+    FRONTIER_MON_TYRANITAR_6,   \
+    FRONTIER_MON_TYRANITAR_7,   \
+    FRONTIER_MON_TYRANITAR_8,   \
+    FRONTIER_MON_TYRANITAR_9,   \
+    FRONTIER_MON_TYRANITAR_10,  \
+    -1
+
+// Identical to FRONTIER_MONS_COOLTRAINER_2C but with both latias and latios
+#define FRONTIER_MONS_GENTLEMAN_3A \
+    FRONTIER_MON_GENGAR_1,      \
+    FRONTIER_MON_URSARING_1,    \
+    FRONTIER_MON_MACHAMP_1,     \
+    FRONTIER_MON_GARDEVOIR_1,   \
+    FRONTIER_MON_STARMIE_1,     \
+    FRONTIER_MON_LAPRAS_1,      \
+    FRONTIER_MON_SNORLAX_1,     \
+    FRONTIER_MON_SALAMENCE_1,   \
+    FRONTIER_MON_METAGROSS_1,   \
+    FRONTIER_MON_GENGAR_2,      \
+    FRONTIER_MON_URSARING_2,    \
+    FRONTIER_MON_MACHAMP_2,     \
+    FRONTIER_MON_GARDEVOIR_2,   \
+    FRONTIER_MON_STARMIE_2,     \
+    FRONTIER_MON_LAPRAS_2,      \
+    FRONTIER_MON_SNORLAX_2,     \
+    FRONTIER_MON_SALAMENCE_2,   \
+    FRONTIER_MON_METAGROSS_2,   \
+    FRONTIER_MON_GENGAR_3,      \
+    FRONTIER_MON_URSARING_3,    \
+    FRONTIER_MON_MACHAMP_3,     \
+    FRONTIER_MON_GARDEVOIR_3,   \
+    FRONTIER_MON_STARMIE_3,     \
+    FRONTIER_MON_LAPRAS_3,      \
+    FRONTIER_MON_SNORLAX_3,     \
+    FRONTIER_MON_SALAMENCE_3,   \
+    FRONTIER_MON_METAGROSS_3,   \
+    FRONTIER_MON_GENGAR_4,      \
+    FRONTIER_MON_URSARING_4,    \
+    FRONTIER_MON_MACHAMP_4,     \
+    FRONTIER_MON_GARDEVOIR_4,   \
+    FRONTIER_MON_STARMIE_4,     \
+    FRONTIER_MON_LAPRAS_4,      \
+    FRONTIER_MON_SNORLAX_4,     \
+    FRONTIER_MON_SALAMENCE_4,   \
+    FRONTIER_MON_METAGROSS_4,   \
+    FRONTIER_MON_LATIAS_1,      \
+    FRONTIER_MON_LATIOS_1,      \
+    FRONTIER_MON_LATIAS_2,      \
+    FRONTIER_MON_LATIOS_2,      \
+    FRONTIER_MON_LATIAS_3,      \
+    FRONTIER_MON_LATIOS_3,      \
+    FRONTIER_MON_LATIAS_4,      \
+    FRONTIER_MON_LATIOS_4,      \
+    FRONTIER_MON_GENGAR_5,      \
+    FRONTIER_MON_GENGAR_6,      \
+    FRONTIER_MON_GENGAR_7,      \
+    FRONTIER_MON_GENGAR_8,      \
+    FRONTIER_MON_URSARING_5,    \
+    FRONTIER_MON_URSARING_6,    \
+    FRONTIER_MON_URSARING_7,    \
+    FRONTIER_MON_URSARING_8,    \
+    FRONTIER_MON_MACHAMP_5,     \
+    FRONTIER_MON_MACHAMP_6,     \
+    FRONTIER_MON_MACHAMP_7,     \
+    FRONTIER_MON_MACHAMP_8,     \
+    FRONTIER_MON_GARDEVOIR_5,   \
+    FRONTIER_MON_GARDEVOIR_6,   \
+    FRONTIER_MON_GARDEVOIR_7,   \
+    FRONTIER_MON_GARDEVOIR_8,   \
+    FRONTIER_MON_STARMIE_5,     \
+    FRONTIER_MON_STARMIE_6,     \
+    FRONTIER_MON_STARMIE_7,     \
+    FRONTIER_MON_STARMIE_8,     \
+    FRONTIER_MON_LAPRAS_5,      \
+    FRONTIER_MON_LAPRAS_6,      \
+    FRONTIER_MON_LAPRAS_7,      \
+    FRONTIER_MON_LAPRAS_8,      \
+    FRONTIER_MON_SNORLAX_5,     \
+    FRONTIER_MON_SNORLAX_6,     \
+    FRONTIER_MON_SNORLAX_7,     \
+    FRONTIER_MON_SNORLAX_8,     \
+    FRONTIER_MON_SALAMENCE_5,   \
+    FRONTIER_MON_SALAMENCE_6,   \
+    FRONTIER_MON_SALAMENCE_7,   \
+    FRONTIER_MON_SALAMENCE_8,   \
+    FRONTIER_MON_METAGROSS_5,   \
+    FRONTIER_MON_METAGROSS_6,   \
+    FRONTIER_MON_METAGROSS_7,   \
+    FRONTIER_MON_METAGROSS_8,   \
+    FRONTIER_MON_DRAGONITE_1,   \
+    FRONTIER_MON_DRAGONITE_2,   \
+    FRONTIER_MON_DRAGONITE_3,   \
+    FRONTIER_MON_DRAGONITE_4,   \
+    FRONTIER_MON_DRAGONITE_5,   \
+    FRONTIER_MON_DRAGONITE_6,   \
+    FRONTIER_MON_DRAGONITE_7,   \
+    FRONTIER_MON_DRAGONITE_8,   \
+    FRONTIER_MON_DRAGONITE_9,   \
+    FRONTIER_MON_DRAGONITE_10,  \
+    FRONTIER_MON_TYRANITAR_1,   \
+    FRONTIER_MON_TYRANITAR_2,   \
+    FRONTIER_MON_TYRANITAR_3,   \
+    FRONTIER_MON_TYRANITAR_4,   \
+    FRONTIER_MON_TYRANITAR_5,   \
+    FRONTIER_MON_TYRANITAR_6,   \
+    FRONTIER_MON_TYRANITAR_7,   \
+    FRONTIER_MON_TYRANITAR_8,   \
+    FRONTIER_MON_TYRANITAR_9,   \
+    FRONTIER_MON_TYRANITAR_10,  \
+    -1 
+
+// Identical to FRONTIER_MONS_COOLTRAINER_2D but with both latias and latios
+#define FRONTIER_MONS_GENTLEMAN_3B  \
+    FRONTIER_MON_ARTICUNO_1,    \
+    FRONTIER_MON_ZAPDOS_1,      \
+    FRONTIER_MON_MOLTRES_1,     \
+    FRONTIER_MON_RAIKOU_1,      \
+    FRONTIER_MON_ENTEI_1,       \
+    FRONTIER_MON_SUICUNE_1,     \
+    FRONTIER_MON_REGIROCK_1,    \
+    FRONTIER_MON_REGICE_1,      \
+    FRONTIER_MON_REGISTEEL_1,   \
+    FRONTIER_MON_LATIAS_1,      \
+    FRONTIER_MON_LATIOS_1,      \
+    FRONTIER_MON_ARTICUNO_2,    \
+    FRONTIER_MON_ZAPDOS_2,      \
+    FRONTIER_MON_MOLTRES_2,     \
+    FRONTIER_MON_RAIKOU_2,      \
+    FRONTIER_MON_ENTEI_2,       \
+    FRONTIER_MON_SUICUNE_2,     \
+    FRONTIER_MON_REGIROCK_2,    \
+    FRONTIER_MON_REGICE_2,      \
+    FRONTIER_MON_REGISTEEL_2,   \
+    FRONTIER_MON_LATIAS_2,      \
+    FRONTIER_MON_LATIOS_2,      \
+    FRONTIER_MON_ARTICUNO_3,    \
+    FRONTIER_MON_ZAPDOS_3,      \
+    FRONTIER_MON_MOLTRES_3,     \
+    FRONTIER_MON_RAIKOU_3,      \
+    FRONTIER_MON_ENTEI_3,       \
+    FRONTIER_MON_SUICUNE_3,     \
+    FRONTIER_MON_REGIROCK_3,    \
+    FRONTIER_MON_REGICE_3,      \
+    FRONTIER_MON_REGISTEEL_3,   \
+    FRONTIER_MON_LATIAS_3,      \
+    FRONTIER_MON_LATIOS_3,      \
+    FRONTIER_MON_ARTICUNO_4,    \
+    FRONTIER_MON_ZAPDOS_4,      \
+    FRONTIER_MON_MOLTRES_4,     \
+    FRONTIER_MON_RAIKOU_4,      \
+    FRONTIER_MON_ENTEI_4,       \
+    FRONTIER_MON_SUICUNE_4,     \
+    FRONTIER_MON_REGIROCK_4,    \
+    FRONTIER_MON_REGICE_4,      \
+    FRONTIER_MON_REGISTEEL_4,   \
+    FRONTIER_MON_LATIAS_4,      \
+    FRONTIER_MON_LATIOS_4,      \
+    FRONTIER_MON_REGIROCK_5,    \
+    FRONTIER_MON_REGIROCK_6,    \
+    FRONTIER_MON_REGICE_5,      \
+    FRONTIER_MON_REGICE_6,      \
+    FRONTIER_MON_REGISTEEL_5,   \
+    FRONTIER_MON_REGISTEEL_6,   \
+    FRONTIER_MON_LATIAS_5,      \
+    FRONTIER_MON_LATIAS_6,      \
+    FRONTIER_MON_LATIAS_7,      \
+    FRONTIER_MON_LATIAS_8,      \
+    FRONTIER_MON_LATIOS_5,      \
+    FRONTIER_MON_LATIOS_6,      \
+    FRONTIER_MON_LATIOS_7,      \
+    FRONTIER_MON_LATIOS_8,      \
+    FRONTIER_MON_DRAGONITE_1,   \
+    FRONTIER_MON_DRAGONITE_2,   \
+    FRONTIER_MON_DRAGONITE_3,   \
+    FRONTIER_MON_DRAGONITE_4,   \
+    FRONTIER_MON_DRAGONITE_5,   \
+    FRONTIER_MON_DRAGONITE_6,   \
+    FRONTIER_MON_DRAGONITE_7,   \
+    FRONTIER_MON_DRAGONITE_8,   \
+    FRONTIER_MON_DRAGONITE_9,   \
+    FRONTIER_MON_DRAGONITE_10,  \
+    FRONTIER_MON_TYRANITAR_1,   \
+    FRONTIER_MON_TYRANITAR_2,   \
+    FRONTIER_MON_TYRANITAR_3,   \
+    FRONTIER_MON_TYRANITAR_4,   \
+    FRONTIER_MON_TYRANITAR_5,   \
+    FRONTIER_MON_TYRANITAR_6,   \
+    FRONTIER_MON_TYRANITAR_7,   \
+    FRONTIER_MON_TYRANITAR_8,   \
+    FRONTIER_MON_TYRANITAR_9,   \
+    FRONTIER_MON_TYRANITAR_10,  \
+    FRONTIER_MON_ARTICUNO_5,    \
+    FRONTIER_MON_ARTICUNO_6,    \
+    FRONTIER_MON_ZAPDOS_5,      \
+    FRONTIER_MON_ZAPDOS_6,      \
+    FRONTIER_MON_MOLTRES_5,     \
+    FRONTIER_MON_MOLTRES_6,     \
+    FRONTIER_MON_RAIKOU_5,      \
+    FRONTIER_MON_RAIKOU_6,      \
+    FRONTIER_MON_ENTEI_5,       \
+    FRONTIER_MON_ENTEI_6,       \
+    FRONTIER_MON_SUICUNE_5,     \
+    FRONTIER_MON_SUICUNE_6,     \
+    -1 
+
+#define FRONTIER_MONS_SWIMMING_TRIATHLETE_M_3 \
+    FRONTIER_MON_SNEASEL_2,     \
+    FRONTIER_MON_CLOYSTER_2,    \
+    FRONTIER_MON_MEDICHAM_1,    \
+    FRONTIER_MON_JYNX_1,        \
+    FRONTIER_MON_HARIYAMA_1,    \
+    FRONTIER_MON_DEWGONG_1,     \
+    FRONTIER_MON_GLALIE_1,      \
+    FRONTIER_MON_MACHAMP_1,     \
+    FRONTIER_MON_WALREIN_1,     \
+    FRONTIER_MON_LAPRAS_1,      \
+    FRONTIER_MON_MEDICHAM_2,    \
+    FRONTIER_MON_JYNX_2,        \
+    FRONTIER_MON_HARIYAMA_2,    \
+    FRONTIER_MON_DEWGONG_2,     \
+    FRONTIER_MON_GLALIE_2,      \
+    FRONTIER_MON_MACHAMP_2,     \
+    FRONTIER_MON_WALREIN_2,     \
+    FRONTIER_MON_LAPRAS_2,      \
+    FRONTIER_MON_MEDICHAM_3,    \
+    FRONTIER_MON_JYNX_3,        \
+    FRONTIER_MON_LANTURN_3,     \
+    FRONTIER_MON_WHISCASH_3,    \
+    FRONTIER_MON_QUAGSIRE_3,    \
+    FRONTIER_MON_HARIYAMA_3,    \
+    FRONTIER_MON_DEWGONG_3,     \
+    FRONTIER_MON_GLALIE_3,      \
+    FRONTIER_MON_LUDICOLO_3,    \
+    FRONTIER_MON_SLOWBRO_3,     \
+    FRONTIER_MON_SLOWKING_3,    \
+    FRONTIER_MON_GOLDUCK_3,     \
+    FRONTIER_MON_WAILORD_3,     \
+    FRONTIER_MON_MACHAMP_3,     \
+    FRONTIER_MON_TENTACRUEL_3,  \
+    FRONTIER_MON_STARMIE_3,     \
+    FRONTIER_MON_VAPOREON_3,    \
+    FRONTIER_MON_BLASTOISE_3,   \
+    FRONTIER_MON_FERALIGATR_3,  \
+    FRONTIER_MON_WALREIN_3,     \
+    FRONTIER_MON_LAPRAS_3,      \
+    FRONTIER_MON_SWAMPERT_3,    \
+    FRONTIER_MON_GYARADOS_3,    \
+    FRONTIER_MON_KINGDRA_3,     \
+    FRONTIER_MON_MILOTIC_3,     \
+    FRONTIER_MON_MEDICHAM_4,    \
+    FRONTIER_MON_JYNX_4,        \
+    FRONTIER_MON_LANTURN_4,     \
+    FRONTIER_MON_WHISCASH_4,    \
+    FRONTIER_MON_QUAGSIRE_4,    \
+    FRONTIER_MON_HARIYAMA_4,    \
+    FRONTIER_MON_DEWGONG_4,     \
+    FRONTIER_MON_GLALIE_4,      \
+    FRONTIER_MON_LUDICOLO_4,    \
+    FRONTIER_MON_SLOWBRO_4,     \
+    FRONTIER_MON_SLOWKING_4,    \
+    FRONTIER_MON_GOLDUCK_4,     \
+    FRONTIER_MON_WAILORD_4,     \
+    FRONTIER_MON_MACHAMP_4,     \
+    FRONTIER_MON_TENTACRUEL_4,  \
+    FRONTIER_MON_STARMIE_4,     \
+    FRONTIER_MON_VAPOREON_4,    \
+    FRONTIER_MON_BLASTOISE_4,   \
+    FRONTIER_MON_FERALIGATR_4,  \
+    FRONTIER_MON_WALREIN_4,     \
+    FRONTIER_MON_LAPRAS_4,      \
+    FRONTIER_MON_SWAMPERT_4,    \
+    FRONTIER_MON_GYARADOS_4,    \
+    FRONTIER_MON_KINGDRA_4,     \
+    FRONTIER_MON_MILOTIC_4,     \
+    FRONTIER_MON_MACHAMP_5,     \
+    FRONTIER_MON_MACHAMP_6,     \
+    FRONTIER_MON_MACHAMP_7,     \
+    FRONTIER_MON_MACHAMP_8,     \
+    FRONTIER_MON_STARMIE_5,     \
+    FRONTIER_MON_STARMIE_6,     \
+    FRONTIER_MON_STARMIE_7,     \
+    FRONTIER_MON_STARMIE_8,     \
+    FRONTIER_MON_LAPRAS_5,      \
+    FRONTIER_MON_LAPRAS_6,      \
+    FRONTIER_MON_LAPRAS_7,      \
+    FRONTIER_MON_LAPRAS_8,      \
+    -1 
+
+#define FRONTIER_MONS_SWIMMING_TRIATHLETE_F_3 \
+    FRONTIER_MON_SNEASEL_2,     \
+    FRONTIER_MON_CLOYSTER_2,    \
+    FRONTIER_MON_MEDICHAM_1,    \
+    FRONTIER_MON_JYNX_1,        \
+    FRONTIER_MON_LANTURN_1,     \
+    FRONTIER_MON_WHISCASH_1,    \
+    FRONTIER_MON_QUAGSIRE_1,    \
+    FRONTIER_MON_HARIYAMA_1,    \
+    FRONTIER_MON_DEWGONG_1,     \
+    FRONTIER_MON_GLALIE_1,      \
+    FRONTIER_MON_LUDICOLO_1,    \
+    FRONTIER_MON_SLOWBRO_1,     \
+    FRONTIER_MON_SLOWKING_1,    \
+    FRONTIER_MON_GOLDUCK_1,     \
+    FRONTIER_MON_WAILORD_1,     \
+    FRONTIER_MON_MACHAMP_1,     \
+    FRONTIER_MON_TENTACRUEL_1,  \
+    FRONTIER_MON_STARMIE_1,     \
+    FRONTIER_MON_VAPOREON_1,    \
+    FRONTIER_MON_BLASTOISE_1,   \
+    FRONTIER_MON_FERALIGATR_1,  \
+    FRONTIER_MON_WALREIN_1,     \
+    FRONTIER_MON_LAPRAS_1,      \
+    FRONTIER_MON_SWAMPERT_1,    \
+    FRONTIER_MON_GYARADOS_1,    \
+    FRONTIER_MON_KINGDRA_1,     \
+    FRONTIER_MON_MILOTIC_1,     \
+    FRONTIER_MON_MEDICHAM_2,    \
+    FRONTIER_MON_QUAGSIRE_2,    \
+    FRONTIER_MON_JYNX_2,        \
+    FRONTIER_MON_LANTURN_2,     \
+    FRONTIER_MON_WHISCASH_2,    \
+    FRONTIER_MON_HARIYAMA_2,    \
+    FRONTIER_MON_DEWGONG_2,     \
+    FRONTIER_MON_GLALIE_2,      \
+    FRONTIER_MON_LUDICOLO_2,    \
+    FRONTIER_MON_SLOWBRO_2,     \
+    FRONTIER_MON_SLOWKING_2,    \
+    FRONTIER_MON_GOLDUCK_2,     \
+    FRONTIER_MON_WAILORD_2,     \
+    FRONTIER_MON_MACHAMP_2,     \
+    FRONTIER_MON_TENTACRUEL_2,  \
+    FRONTIER_MON_STARMIE_2,     \
+    FRONTIER_MON_VAPOREON_2,    \
+    FRONTIER_MON_BLASTOISE_2,   \
+    FRONTIER_MON_FERALIGATR_2,  \
+    FRONTIER_MON_WALREIN_2,     \
+    FRONTIER_MON_LAPRAS_2,      \
+    FRONTIER_MON_SWAMPERT_2,    \
+    FRONTIER_MON_GYARADOS_2,    \
+    FRONTIER_MON_KINGDRA_2,     \
+    FRONTIER_MON_MILOTIC_2,     \
+    FRONTIER_MON_MEDICHAM_3,    \
+    FRONTIER_MON_JYNX_3,        \
+    FRONTIER_MON_HARIYAMA_3,    \
+    FRONTIER_MON_DEWGONG_3,     \
+    FRONTIER_MON_GLALIE_3,      \
+    FRONTIER_MON_MACHAMP_3,     \
+    FRONTIER_MON_WALREIN_3,     \
+    FRONTIER_MON_LAPRAS_3,      \
+    FRONTIER_MON_MEDICHAM_4,    \
+    FRONTIER_MON_JYNX_4,        \
+    FRONTIER_MON_HARIYAMA_4,    \
+    FRONTIER_MON_DEWGONG_4,     \
+    FRONTIER_MON_GLALIE_4,      \
+    FRONTIER_MON_MACHAMP_4,     \
+    FRONTIER_MON_WALREIN_4,     \
+    FRONTIER_MON_LAPRAS_4,      \
+    FRONTIER_MON_MACHAMP_5,     \
+    FRONTIER_MON_MACHAMP_6,     \
+    FRONTIER_MON_MACHAMP_7,     \
+    FRONTIER_MON_MACHAMP_8,     \
+    FRONTIER_MON_STARMIE_5,     \
+    FRONTIER_MON_STARMIE_6,     \
+    FRONTIER_MON_STARMIE_7,     \
+    FRONTIER_MON_STARMIE_8,     \
+    FRONTIER_MON_LAPRAS_5,      \
+    FRONTIER_MON_LAPRAS_6,      \
+    FRONTIER_MON_LAPRAS_7,      \
+    FRONTIER_MON_LAPRAS_8,      \
+    -1
+
+#define FRONTIER_MONS_BUG_MANIAC_4 \
+    FRONTIER_MON_SHEDINJA,      \
+    FRONTIER_MON_NINJASK_1,     \
+    FRONTIER_MON_PARASECT_2,    \
+    FRONTIER_MON_MASQUERAIN_2,  \
+    FRONTIER_MON_VENOMOTH_2,    \
+    FRONTIER_MON_NINJASK_2,     \
+    FRONTIER_MON_SCYTHER_2,     \
+    FRONTIER_MON_PINSIR_2,      \
+    FRONTIER_MON_FORRETRESS_1,  \
+    FRONTIER_MON_ARMALDO_1,     \
+    FRONTIER_MON_SCIZOR_1,      \
+    FRONTIER_MON_HERACROSS_1,   \
+    FRONTIER_MON_SHUCKLE_1,     \
+    FRONTIER_MON_FORRETRESS_2,  \
+    FRONTIER_MON_ARMALDO_2,     \
+    FRONTIER_MON_SCIZOR_2,      \
+    FRONTIER_MON_HERACROSS_2,   \
+    FRONTIER_MON_SHUCKLE_2,     \
+    FRONTIER_MON_FORRETRESS_3,  \
+    FRONTIER_MON_ARMALDO_3,     \
+    FRONTIER_MON_SCIZOR_3,      \
+    FRONTIER_MON_HERACROSS_3,   \
+    FRONTIER_MON_SHUCKLE_3,     \
+    FRONTIER_MON_FORRETRESS_4,  \
+    FRONTIER_MON_ARMALDO_4,     \
+    FRONTIER_MON_SCIZOR_4,      \
+    FRONTIER_MON_HERACROSS_4,   \
+    FRONTIER_MON_SHUCKLE_4,     \
+    -1 
+
+#define FRONTIER_MONS_FISHERMAN_3 \
+    FRONTIER_MON_SEAKING_2,     \
+    FRONTIER_MON_SHARPEDO_2,    \
+    FRONTIER_MON_MANTINE_2,     \
+    FRONTIER_MON_CRAWDAUNT_2,   \
+    FRONTIER_MON_KINGLER_2,     \
+    FRONTIER_MON_OCTILLERY_2,   \
+    FRONTIER_MON_HUNTAIL_2,     \
+    FRONTIER_MON_GOREBYSS_2,    \
+    FRONTIER_MON_RELICANTH_2,   \
+    FRONTIER_MON_CLOYSTER_2,    \
+    FRONTIER_MON_LANTURN_1,     \
+    FRONTIER_MON_WHISCASH_1,    \
+    FRONTIER_MON_WAILORD_1,     \
+    FRONTIER_MON_TENTACRUEL_1,  \
+    FRONTIER_MON_STARMIE_1,     \
+    FRONTIER_MON_LANTURN_2,     \
+    FRONTIER_MON_WHISCASH_2,    \
+    FRONTIER_MON_WAILORD_2,     \
+    FRONTIER_MON_TENTACRUEL_2,  \
+    FRONTIER_MON_STARMIE_2,     \
+    FRONTIER_MON_LANTURN_3,     \
+    FRONTIER_MON_WHISCASH_3,    \
+    FRONTIER_MON_WAILORD_3,     \
+    FRONTIER_MON_TENTACRUEL_3,  \
+    FRONTIER_MON_STARMIE_3,     \
+    FRONTIER_MON_LANTURN_4,     \
+    FRONTIER_MON_WHISCASH_4,    \
+    FRONTIER_MON_WAILORD_4,     \
+    FRONTIER_MON_TENTACRUEL_4,  \
+    FRONTIER_MON_STARMIE_4,     \
+    FRONTIER_MON_STARMIE_5,     \
+    FRONTIER_MON_STARMIE_6,     \
+    FRONTIER_MON_STARMIE_7,     \
+    FRONTIER_MON_STARMIE_8,     \
+    -1
+
+#define FRONTIER_MONS_RUIN_MANIAC_4 \
+    FRONTIER_MON_FORRETRESS_1,  \
+    FRONTIER_MON_SKARMORY_1,    \
+    FRONTIER_MON_GOLEM_1,       \
+    FRONTIER_MON_RHYDON_1,      \
+    FRONTIER_MON_CRADILY_1,     \
+    FRONTIER_MON_ARMALDO_1,     \
+    FRONTIER_MON_SCIZOR_1,      \
+    FRONTIER_MON_SHUCKLE_1,     \
+    FRONTIER_MON_STEELIX_1,     \
+    FRONTIER_MON_AERODACTYL_1,  \
+    FRONTIER_MON_AGGRON_1,      \
+    FRONTIER_MON_METAGROSS_1,   \
+    FRONTIER_MON_FORRETRESS_2,  \
+    FRONTIER_MON_SKARMORY_2,    \
+    FRONTIER_MON_GOLEM_2,       \
+    FRONTIER_MON_RHYDON_2,      \
+    FRONTIER_MON_CRADILY_2,     \
+    FRONTIER_MON_ARMALDO_2,     \
+    FRONTIER_MON_SCIZOR_2,      \
+    FRONTIER_MON_SHUCKLE_2,     \
+    FRONTIER_MON_STEELIX_2,     \
+    FRONTIER_MON_AERODACTYL_2,  \
+    FRONTIER_MON_AGGRON_2,      \
+    FRONTIER_MON_METAGROSS_2,   \
+    FRONTIER_MON_FORRETRESS_3,  \
+    FRONTIER_MON_SKARMORY_3,    \
+    FRONTIER_MON_GOLEM_3,       \
+    FRONTIER_MON_RHYDON_3,      \
+    FRONTIER_MON_CRADILY_3,     \
+    FRONTIER_MON_ARMALDO_3,     \
+    FRONTIER_MON_SCIZOR_3,      \
+    FRONTIER_MON_SHUCKLE_3,     \
+    FRONTIER_MON_STEELIX_3,     \
+    FRONTIER_MON_AERODACTYL_3,  \
+    FRONTIER_MON_AGGRON_3,      \
+    FRONTIER_MON_METAGROSS_3,   \
+    FRONTIER_MON_FORRETRESS_4,  \
+    FRONTIER_MON_SKARMORY_4,    \
+    FRONTIER_MON_GOLEM_4,       \
+    FRONTIER_MON_RHYDON_4,      \
+    FRONTIER_MON_CRADILY_4,     \
+    FRONTIER_MON_ARMALDO_4,     \
+    FRONTIER_MON_SCIZOR_4,      \
+    FRONTIER_MON_SHUCKLE_4,     \
+    FRONTIER_MON_STEELIX_4,     \
+    FRONTIER_MON_AERODACTYL_4,  \
+    FRONTIER_MON_AGGRON_4,      \
+    FRONTIER_MON_METAGROSS_4,   \
+    FRONTIER_MON_REGIROCK_1,    \
+    FRONTIER_MON_REGICE_1,      \
+    FRONTIER_MON_REGISTEEL_1,   \
+    FRONTIER_MON_REGIROCK_2,    \
+    FRONTIER_MON_REGICE_2,      \
+    FRONTIER_MON_REGISTEEL_2,   \
+    FRONTIER_MON_REGIROCK_3,    \
+    FRONTIER_MON_REGICE_3,      \
+    FRONTIER_MON_REGISTEEL_3,   \
+    FRONTIER_MON_REGIROCK_4,    \
+    FRONTIER_MON_REGICE_4,      \
+    FRONTIER_MON_REGISTEEL_4,   \
+    FRONTIER_MON_METAGROSS_5,   \
+    FRONTIER_MON_METAGROSS_6,   \
+    FRONTIER_MON_METAGROSS_7,   \
+    FRONTIER_MON_METAGROSS_8,   \
+    FRONTIER_MON_REGIROCK_5,    \
+    FRONTIER_MON_REGIROCK_6,    \
+    FRONTIER_MON_REGICE_5,      \
+    FRONTIER_MON_REGICE_6,      \
+    FRONTIER_MON_REGISTEEL_5,   \
+    FRONTIER_MON_REGISTEEL_6,   \
+    -1 
+
+#define FRONTIER_MONS_COLLECTOR_3 \
+    FRONTIER_MON_VENUSAUR_1,    \
+    FRONTIER_MON_MEGANIUM_1,    \
+    FRONTIER_MON_BLASTOISE_1,   \
+    FRONTIER_MON_FERALIGATR_1,  \
+    FRONTIER_MON_BLAZIKEN_1,    \
+    FRONTIER_MON_SCEPTILE_1,    \
+    FRONTIER_MON_CHARIZARD_1,   \
+    FRONTIER_MON_TYPHLOSION_1,  \
+    FRONTIER_MON_SWAMPERT_1,    \
+    FRONTIER_MON_VENUSAUR_2,    \
+    FRONTIER_MON_MEGANIUM_2,    \
+    FRONTIER_MON_BLASTOISE_2,   \
+    FRONTIER_MON_FERALIGATR_2,  \
+    FRONTIER_MON_BLAZIKEN_2,    \
+    FRONTIER_MON_SCEPTILE_2,    \
+    FRONTIER_MON_CHARIZARD_2,   \
+    FRONTIER_MON_TYPHLOSION_2,  \
+    FRONTIER_MON_SWAMPERT_2,    \
+    FRONTIER_MON_VENUSAUR_3,    \
+    FRONTIER_MON_MEGANIUM_3,    \
+    FRONTIER_MON_BLASTOISE_3,   \
+    FRONTIER_MON_FERALIGATR_3,  \
+    FRONTIER_MON_BLAZIKEN_3,    \
+    FRONTIER_MON_SCEPTILE_3,    \
+    FRONTIER_MON_CHARIZARD_3,   \
+    FRONTIER_MON_TYPHLOSION_3,  \
+    FRONTIER_MON_SWAMPERT_3,    \
+    FRONTIER_MON_VENUSAUR_4,    \
+    FRONTIER_MON_MEGANIUM_4,    \
+    FRONTIER_MON_BLASTOISE_4,   \
+    FRONTIER_MON_FERALIGATR_4,  \
+    FRONTIER_MON_BLAZIKEN_4,    \
+    FRONTIER_MON_SCEPTILE_4,    \
+    FRONTIER_MON_CHARIZARD_4,   \
+    FRONTIER_MON_TYPHLOSION_4,  \
+    FRONTIER_MON_SWAMPERT_4,    \
+    -1 
+
+#define FRONTIER_MONS_GUITARIST_3A \
+    FRONTIER_MON_ABSOL_2,       \
+    FRONTIER_MON_LANTURN_1,     \
+    FRONTIER_MON_RAICHU_1,      \
+    FRONTIER_MON_MANECTRIC_1,   \
+    FRONTIER_MON_ELECTRODE_1,   \
+    FRONTIER_MON_SHIFTRY_1,     \
+    FRONTIER_MON_ELECTABUZZ_1,  \
+    FRONTIER_MON_AMPHAROS_1,    \
+    FRONTIER_MON_HOUNDOOM_1,    \
+    FRONTIER_MON_JOLTEON_1,     \
+    FRONTIER_MON_UMBREON_1,     \
+    FRONTIER_MON_LANTURN_2,     \
+    FRONTIER_MON_RAICHU_2,      \
+    FRONTIER_MON_MANECTRIC_2,   \
+    FRONTIER_MON_ELECTRODE_2,   \
+    FRONTIER_MON_SHIFTRY_2,     \
+    FRONTIER_MON_ELECTABUZZ_2,  \
+    FRONTIER_MON_AMPHAROS_2,    \
+    FRONTIER_MON_HOUNDOOM_2,    \
+    FRONTIER_MON_JOLTEON_2,     \
+    FRONTIER_MON_UMBREON_2,     \
+    FRONTIER_MON_LANTURN_3,     \
+    FRONTIER_MON_RAICHU_3,      \
+    FRONTIER_MON_MANECTRIC_3,   \
+    FRONTIER_MON_ELECTRODE_3,   \
+    FRONTIER_MON_SHIFTRY_3,     \
+    FRONTIER_MON_ELECTABUZZ_3,  \
+    FRONTIER_MON_AMPHAROS_3,    \
+    FRONTIER_MON_HOUNDOOM_3,    \
+    FRONTIER_MON_JOLTEON_3,     \
+    FRONTIER_MON_UMBREON_3,     \
+    FRONTIER_MON_LANTURN_4,     \
+    FRONTIER_MON_RAICHU_4,      \
+    FRONTIER_MON_MANECTRIC_4,   \
+    FRONTIER_MON_ELECTRODE_4,   \
+    FRONTIER_MON_SHIFTRY_4,     \
+    FRONTIER_MON_ELECTABUZZ_4,  \
+    FRONTIER_MON_AMPHAROS_4,    \
+    FRONTIER_MON_HOUNDOOM_4,    \
+    FRONTIER_MON_JOLTEON_4,     \
+    FRONTIER_MON_UMBREON_4,     \
+    FRONTIER_MON_ARTICUNO_1,    \
+    FRONTIER_MON_ZAPDOS_1,      \
+    FRONTIER_MON_MOLTRES_1,     \
+    FRONTIER_MON_ARTICUNO_2,    \
+    FRONTIER_MON_ZAPDOS_2,      \
+    FRONTIER_MON_MOLTRES_2,     \
+    FRONTIER_MON_ARTICUNO_3,    \
+    FRONTIER_MON_ZAPDOS_3,      \
+    FRONTIER_MON_MOLTRES_3,     \
+    FRONTIER_MON_ARTICUNO_4,    \
+    FRONTIER_MON_ZAPDOS_4,      \
+    FRONTIER_MON_MOLTRES_4,     \
+    FRONTIER_MON_ARTICUNO_5,    \
+    FRONTIER_MON_ARTICUNO_6,    \
+    FRONTIER_MON_ZAPDOS_5,      \
+    FRONTIER_MON_ZAPDOS_6,      \
+    FRONTIER_MON_MOLTRES_5,     \
+    FRONTIER_MON_MOLTRES_6,     \
+    -1 
+
+#define FRONTIER_MONS_GUITARIST_3B \
+    FRONTIER_MON_MISDREAVUS_1,  \
+    FRONTIER_MON_GRANBULL_1,    \
+    FRONTIER_MON_LANTURN_1,     \
+    FRONTIER_MON_ALAKAZAM_1,    \
+    FRONTIER_MON_ELECTABUZZ_1,  \
+    FRONTIER_MON_AMPHAROS_1,    \
+    FRONTIER_MON_STARMIE_1,     \
+    FRONTIER_MON_JOLTEON_1,     \
+    FRONTIER_MON_GYARADOS_1,    \
+    FRONTIER_MON_MISDREAVUS_2,  \
+    FRONTIER_MON_ALAKAZAM_2,    \
+    FRONTIER_MON_SLOWKING_2,    \
+    FRONTIER_MON_MILTANK_2,     \
+    FRONTIER_MON_AMPHAROS_2,    \
+    FRONTIER_MON_PORYGON2_2,    \
+    FRONTIER_MON_AGGRON_2,      \
+    FRONTIER_MON_MISDREAVUS_3,  \
+    FRONTIER_MON_MANECTRIC_3,   \
+    FRONTIER_MON_ELECTRODE_3,   \
+    FRONTIER_MON_PORYGON2_3,    \
+    FRONTIER_MON_JOLTEON_3,     \
+    FRONTIER_MON_RAICHU_4,      \
+    FRONTIER_MON_MANECTRIC_4,   \
+    FRONTIER_MON_ELECTRODE_4,   \
+    FRONTIER_MON_AMPHAROS_4,    \
+    FRONTIER_MON_JOLTEON_4,     \
+    FRONTIER_MON_REGICE_3,      \
+    FRONTIER_MON_REGIROCK_4,    \
+    FRONTIER_MON_REGICE_4,      \
+    FRONTIER_MON_REGISTEEL_4,   \
+    FRONTIER_MON_STARMIE_6,     \
+    FRONTIER_MON_LATIAS_5,      \
+    FRONTIER_MON_LATIAS_6,      \
+    FRONTIER_MON_LATIOS_5,      \
+    FRONTIER_MON_LATIOS_6,      \
+    -1 
+
+#define FRONTIER_MONS_BIRD_KEEPER_3 \
+    FRONTIER_MON_PIDGEOT_2,     \
+    FRONTIER_MON_FEAROW_1,      \
+    FRONTIER_MON_DODRIO_1,      \
+    FRONTIER_MON_XATU_1,        \
+    FRONTIER_MON_SKARMORY_1,    \
+    FRONTIER_MON_ALTARIA_1,     \
+    FRONTIER_MON_AERODACTYL_1,  \
+    FRONTIER_MON_FLYGON_1,      \
+    FRONTIER_MON_CHARIZARD_1,   \
+    FRONTIER_MON_CROBAT_1,      \
+    FRONTIER_MON_GYARADOS_1,    \
+    FRONTIER_MON_SALAMENCE_1,   \
+    FRONTIER_MON_FEAROW_2,      \
+    FRONTIER_MON_DODRIO_2,      \
+    FRONTIER_MON_SKARMORY_2,    \
+    FRONTIER_MON_XATU_2,        \
+    FRONTIER_MON_ALTARIA_2,     \
+    FRONTIER_MON_AERODACTYL_2,  \
+    FRONTIER_MON_FLYGON_2,      \
+    FRONTIER_MON_CHARIZARD_2,   \
+    FRONTIER_MON_CROBAT_2,      \
+    FRONTIER_MON_GYARADOS_2,    \
+    FRONTIER_MON_SALAMENCE_2,   \
+    FRONTIER_MON_FEAROW_3,      \
+    FRONTIER_MON_DODRIO_3,      \
+    FRONTIER_MON_XATU_3,        \
+    FRONTIER_MON_SKARMORY_3,    \
+    FRONTIER_MON_ALTARIA_3,     \
+    FRONTIER_MON_AERODACTYL_3,  \
+    FRONTIER_MON_FLYGON_3,      \
+    FRONTIER_MON_CHARIZARD_3,   \
+    FRONTIER_MON_CROBAT_3,      \
+    FRONTIER_MON_GYARADOS_3,    \
+    FRONTIER_MON_SALAMENCE_3,   \
+    FRONTIER_MON_FEAROW_4,      \
+    FRONTIER_MON_DODRIO_4,      \
+    FRONTIER_MON_XATU_4,        \
+    FRONTIER_MON_SKARMORY_4,    \
+    FRONTIER_MON_ALTARIA_4,     \
+    FRONTIER_MON_AERODACTYL_4,  \
+    FRONTIER_MON_FLYGON_4,      \
+    FRONTIER_MON_CHARIZARD_4,   \
+    FRONTIER_MON_CROBAT_4,      \
+    FRONTIER_MON_GYARADOS_4,    \
+    FRONTIER_MON_SALAMENCE_4,   \
+    FRONTIER_MON_ARTICUNO_1,    \
+    FRONTIER_MON_ZAPDOS_1,      \
+    FRONTIER_MON_MOLTRES_1,     \
+    FRONTIER_MON_ARTICUNO_2,    \
+    FRONTIER_MON_ZAPDOS_2,      \
+    FRONTIER_MON_MOLTRES_2,     \
+    FRONTIER_MON_ARTICUNO_3,    \
+    FRONTIER_MON_ZAPDOS_3,      \
+    FRONTIER_MON_MOLTRES_3,     \
+    FRONTIER_MON_ARTICUNO_4,    \
+    FRONTIER_MON_ZAPDOS_4,      \
+    FRONTIER_MON_MOLTRES_4,     \
+    FRONTIER_MON_SALAMENCE_5,   \
+    FRONTIER_MON_SALAMENCE_6,   \
+    FRONTIER_MON_SALAMENCE_7,   \
+    FRONTIER_MON_SALAMENCE_8,   \
+    -1 
+
+#define FRONTIER_MONS_SAILOR_3  \
+    FRONTIER_MON_MEDICHAM_1,    \
+    FRONTIER_MON_QUAGSIRE_1,    \
+    FRONTIER_MON_HARIYAMA_1,    \
+    FRONTIER_MON_DEWGONG_1,     \
+    FRONTIER_MON_LUDICOLO_1,    \
+    FRONTIER_MON_SLOWBRO_1,     \
+    FRONTIER_MON_SLOWKING_1,    \
+    FRONTIER_MON_GOLDUCK_1,     \
+    FRONTIER_MON_MACHAMP_1,     \
+    FRONTIER_MON_VAPOREON_1,    \
+    FRONTIER_MON_BLASTOISE_1,   \
+    FRONTIER_MON_FERALIGATR_1,  \
+    FRONTIER_MON_WALREIN_1,     \
+    FRONTIER_MON_LAPRAS_1,      \
+    FRONTIER_MON_SWAMPERT_1,    \
+    FRONTIER_MON_GYARADOS_1,    \
+    FRONTIER_MON_KINGDRA_1,     \
+    FRONTIER_MON_MILOTIC_1,     \
+    FRONTIER_MON_MEDICHAM_2,    \
+    FRONTIER_MON_QUAGSIRE_2,    \
+    FRONTIER_MON_HARIYAMA_2,    \
+    FRONTIER_MON_DEWGONG_2,     \
+    FRONTIER_MON_LUDICOLO_2,    \
+    FRONTIER_MON_SLOWBRO_2,     \
+    FRONTIER_MON_SLOWKING_2,    \
+    FRONTIER_MON_GOLDUCK_2,     \
+    FRONTIER_MON_MACHAMP_2,     \
+    FRONTIER_MON_VAPOREON_2,    \
+    FRONTIER_MON_BLASTOISE_2,   \
+    FRONTIER_MON_FERALIGATR_2,  \
+    FRONTIER_MON_WALREIN_2,     \
+    FRONTIER_MON_LAPRAS_2,      \
+    FRONTIER_MON_SWAMPERT_2,    \
+    FRONTIER_MON_GYARADOS_2,    \
+    FRONTIER_MON_KINGDRA_2,     \
+    FRONTIER_MON_MILOTIC_2,     \
+    FRONTIER_MON_MEDICHAM_3,    \
+    FRONTIER_MON_QUAGSIRE_3,    \
+    FRONTIER_MON_HARIYAMA_3,    \
+    FRONTIER_MON_DEWGONG_3,     \
+    FRONTIER_MON_LUDICOLO_3,    \
+    FRONTIER_MON_SLOWBRO_3,     \
+    FRONTIER_MON_SLOWKING_3,    \
+    FRONTIER_MON_GOLDUCK_3,     \
+    FRONTIER_MON_MACHAMP_3,     \
+    FRONTIER_MON_VAPOREON_3,    \
+    FRONTIER_MON_BLASTOISE_3,   \
+    FRONTIER_MON_FERALIGATR_3,  \
+    FRONTIER_MON_WALREIN_3,     \
+    FRONTIER_MON_LAPRAS_3,      \
+    FRONTIER_MON_SWAMPERT_3,    \
+    FRONTIER_MON_GYARADOS_3,    \
+    FRONTIER_MON_KINGDRA_3,     \
+    FRONTIER_MON_MILOTIC_3,     \
+    FRONTIER_MON_MEDICHAM_4,    \
+    FRONTIER_MON_QUAGSIRE_4,    \
+    FRONTIER_MON_HARIYAMA_4,    \
+    FRONTIER_MON_DEWGONG_4,     \
+    FRONTIER_MON_LUDICOLO_4,    \
+    FRONTIER_MON_SLOWBRO_4,     \
+    FRONTIER_MON_SLOWKING_4,    \
+    FRONTIER_MON_GOLDUCK_4,     \
+    FRONTIER_MON_MACHAMP_4,     \
+    FRONTIER_MON_VAPOREON_4,    \
+    FRONTIER_MON_BLASTOISE_4,   \
+    FRONTIER_MON_FERALIGATR_4,  \
+    FRONTIER_MON_WALREIN_4,     \
+    FRONTIER_MON_LAPRAS_4,      \
+    FRONTIER_MON_SWAMPERT_4,    \
+    FRONTIER_MON_GYARADOS_4,    \
+    FRONTIER_MON_KINGDRA_4,     \
+    FRONTIER_MON_MILOTIC_4,     \
+    FRONTIER_MON_MACHAMP_5,     \
+    FRONTIER_MON_MACHAMP_6,     \
+    FRONTIER_MON_MACHAMP_7,     \
+    FRONTIER_MON_MACHAMP_8,     \
+    FRONTIER_MON_LAPRAS_5,      \
+    FRONTIER_MON_LAPRAS_6,      \
+    FRONTIER_MON_LAPRAS_7,      \
+    FRONTIER_MON_LAPRAS_8,      \
+    -1 
+
+#define FRONTIER_MONS_HIKER_3   \
+    FRONTIER_MON_DUGTRIO_1,     \
+    FRONTIER_MON_MAROWAK_1,     \
+    FRONTIER_MON_GOLEM_1,       \
+    FRONTIER_MON_RHYDON_1,      \
+    FRONTIER_MON_NIDOQUEEN_1,   \
+    FRONTIER_MON_NIDOKING_1,    \
+    FRONTIER_MON_CRADILY_1,     \
+    FRONTIER_MON_ARMALDO_1,     \
+    FRONTIER_MON_DONPHAN_1,     \
+    FRONTIER_MON_CLAYDOL_1,     \
+    FRONTIER_MON_SHUCKLE_1,     \
+    FRONTIER_MON_STEELIX_1,     \
+    FRONTIER_MON_AERODACTYL_1,  \
+    FRONTIER_MON_FLYGON_1,      \
+    FRONTIER_MON_AGGRON_1,      \
+    FRONTIER_MON_METAGROSS_1,   \
+    FRONTIER_MON_DUGTRIO_2,     \
+    FRONTIER_MON_MAROWAK_2,     \
+    FRONTIER_MON_GOLEM_2,       \
+    FRONTIER_MON_RHYDON_2,      \
+    FRONTIER_MON_NIDOQUEEN_2,   \
+    FRONTIER_MON_NIDOKING_2,    \
+    FRONTIER_MON_CRADILY_2,     \
+    FRONTIER_MON_ARMALDO_2,     \
+    FRONTIER_MON_DONPHAN_2,     \
+    FRONTIER_MON_CLAYDOL_2,     \
+    FRONTIER_MON_SHUCKLE_2,     \
+    FRONTIER_MON_STEELIX_2,     \
+    FRONTIER_MON_AERODACTYL_2,  \
+    FRONTIER_MON_FLYGON_2,      \
+    FRONTIER_MON_AGGRON_2,      \
+    FRONTIER_MON_METAGROSS_2,   \
+    FRONTIER_MON_DUGTRIO_3,     \
+    FRONTIER_MON_MAROWAK_3,     \
+    FRONTIER_MON_GOLEM_3,       \
+    FRONTIER_MON_RHYDON_3,      \
+    FRONTIER_MON_NIDOQUEEN_3,   \
+    FRONTIER_MON_NIDOKING_3,    \
+    FRONTIER_MON_CRADILY_3,     \
+    FRONTIER_MON_ARMALDO_3,     \
+    FRONTIER_MON_DONPHAN_3,     \
+    FRONTIER_MON_CLAYDOL_3,     \
+    FRONTIER_MON_SHUCKLE_3,     \
+    FRONTIER_MON_STEELIX_3,     \
+    FRONTIER_MON_AERODACTYL_3,  \
+    FRONTIER_MON_FLYGON_3,      \
+    FRONTIER_MON_AGGRON_3,      \
+    FRONTIER_MON_METAGROSS_3,   \
+    FRONTIER_MON_DUGTRIO_4,     \
+    FRONTIER_MON_MAROWAK_4,     \
+    FRONTIER_MON_GOLEM_4,       \
+    FRONTIER_MON_RHYDON_4,      \
+    FRONTIER_MON_NIDOQUEEN_4,   \
+    FRONTIER_MON_NIDOKING_4,    \
+    FRONTIER_MON_CRADILY_4,     \
+    FRONTIER_MON_ARMALDO_4,     \
+    FRONTIER_MON_DONPHAN_4,     \
+    FRONTIER_MON_CLAYDOL_4,     \
+    FRONTIER_MON_SHUCKLE_4,     \
+    FRONTIER_MON_STEELIX_4,     \
+    FRONTIER_MON_AERODACTYL_4,  \
+    FRONTIER_MON_FLYGON_4,      \
+    FRONTIER_MON_AGGRON_4,      \
+    FRONTIER_MON_METAGROSS_4,   \
+    FRONTIER_MON_METAGROSS_5,   \
+    FRONTIER_MON_METAGROSS_6,   \
+    FRONTIER_MON_METAGROSS_7,   \
+    FRONTIER_MON_METAGROSS_8,   \
+    FRONTIER_MON_TYRANITAR_1,   \
+    FRONTIER_MON_TYRANITAR_2,   \
+    FRONTIER_MON_TYRANITAR_3,   \
+    FRONTIER_MON_TYRANITAR_4,   \
+    FRONTIER_MON_TYRANITAR_5,   \
+    FRONTIER_MON_TYRANITAR_6,   \
+    FRONTIER_MON_TYRANITAR_7,   \
+    FRONTIER_MON_TYRANITAR_8,   \
+    FRONTIER_MON_TYRANITAR_9,   \
+    FRONTIER_MON_TYRANITAR_10,  \
+    -1 
+
+#define FRONTIER_MONS_KINDLER_3 \
+    FRONTIER_MON_MISDREAVUS_1,  \
+    FRONTIER_MON_DUSCLOPS_1,    \
+    FRONTIER_MON_MAGMAR_1,      \
+    FRONTIER_MON_RAPIDASH_1,    \
+    FRONTIER_MON_GENGAR_1,      \
+    FRONTIER_MON_HOUNDOOM_1,    \
+    FRONTIER_MON_NINETALES_1,   \
+    FRONTIER_MON_FLAREON_1,     \
+    FRONTIER_MON_BLAZIKEN_1,    \
+    FRONTIER_MON_CHARIZARD_1,   \
+    FRONTIER_MON_TYPHLOSION_1,  \
+    FRONTIER_MON_ARCANINE_1,    \
+    FRONTIER_MON_MISDREAVUS_2,  \
+    FRONTIER_MON_DUSCLOPS_2,    \
+    FRONTIER_MON_MAGMAR_2,      \
+    FRONTIER_MON_RAPIDASH_2,    \
+    FRONTIER_MON_GENGAR_2,      \
+    FRONTIER_MON_HOUNDOOM_2,    \
+    FRONTIER_MON_NINETALES_2,   \
+    FRONTIER_MON_FLAREON_2,     \
+    FRONTIER_MON_BLAZIKEN_2,    \
+    FRONTIER_MON_CHARIZARD_2,   \
+    FRONTIER_MON_TYPHLOSION_2,  \
+    FRONTIER_MON_ARCANINE_2,    \
+    FRONTIER_MON_MISDREAVUS_3,  \
+    FRONTIER_MON_DUSCLOPS_3,    \
+    FRONTIER_MON_MAGMAR_3,      \
+    FRONTIER_MON_RAPIDASH_3,    \
+    FRONTIER_MON_GENGAR_3,      \
+    FRONTIER_MON_HOUNDOOM_3,    \
+    FRONTIER_MON_NINETALES_3,   \
+    FRONTIER_MON_FLAREON_3,     \
+    FRONTIER_MON_BLAZIKEN_3,    \
+    FRONTIER_MON_CHARIZARD_3,   \
+    FRONTIER_MON_TYPHLOSION_3,  \
+    FRONTIER_MON_ARCANINE_3,    \
+    FRONTIER_MON_MISDREAVUS_4,  \
+    FRONTIER_MON_DUSCLOPS_4,    \
+    FRONTIER_MON_MAGMAR_4,      \
+    FRONTIER_MON_RAPIDASH_4,    \
+    FRONTIER_MON_GENGAR_4,      \
+    FRONTIER_MON_HOUNDOOM_4,    \
+    FRONTIER_MON_NINETALES_4,   \
+    FRONTIER_MON_FLAREON_4,     \
+    FRONTIER_MON_BLAZIKEN_4,    \
+    FRONTIER_MON_CHARIZARD_4,   \
+    FRONTIER_MON_TYPHLOSION_4,  \
+    FRONTIER_MON_ARCANINE_4,    \
+    FRONTIER_MON_GENGAR_5,      \
+    FRONTIER_MON_GENGAR_6,      \
+    FRONTIER_MON_GENGAR_7,      \
+    FRONTIER_MON_GENGAR_8,      \
+    FRONTIER_MON_DRAGONITE_1,   \
+    FRONTIER_MON_DRAGONITE_2,   \
+    FRONTIER_MON_DRAGONITE_3,   \
+    FRONTIER_MON_DRAGONITE_4,   \
+    FRONTIER_MON_DRAGONITE_5,   \
+    FRONTIER_MON_DRAGONITE_6,   \
+    FRONTIER_MON_DRAGONITE_7,   \
+    FRONTIER_MON_DRAGONITE_8,   \
+    FRONTIER_MON_DRAGONITE_9,   \
+    FRONTIER_MON_DRAGONITE_10,  \
+    -1 
+
+#define FRONTIER_MONS_PARASOL_LADY_3 \
+    FRONTIER_MON_GLALIE_1,      \
+    FRONTIER_MON_LUDICOLO_1,    \
+    FRONTIER_MON_SLOWBRO_1,     \
+    FRONTIER_MON_AMPHAROS_1,    \
+    FRONTIER_MON_EXEGGUTOR_1,   \
+    FRONTIER_MON_VENUSAUR_1,    \
+    FRONTIER_MON_MEGANIUM_1,    \
+    FRONTIER_MON_BLASTOISE_1,   \
+    FRONTIER_MON_FERALIGATR_1,  \
+    FRONTIER_MON_BLAZIKEN_1,    \
+    FRONTIER_MON_WALREIN_1,     \
+    FRONTIER_MON_CHARIZARD_1,   \
+    FRONTIER_MON_TYPHLOSION_1,  \
+    FRONTIER_MON_MANECTRIC_2,   \
+    FRONTIER_MON_ELECTRODE_2,   \
+    FRONTIER_MON_EXPLOUD_2,     \
+    FRONTIER_MON_ELECTABUZZ_2,  \
+    FRONTIER_MON_NINETALES_2,   \
+    FRONTIER_MON_PORYGON2_2,    \
+    FRONTIER_MON_STARMIE_2,     \
+    FRONTIER_MON_FLYGON_2,      \
+    FRONTIER_MON_ARCANINE_2,    \
+    FRONTIER_MON_LANTURN_3,     \
+    FRONTIER_MON_RAICHU_3,      \
+    FRONTIER_MON_SHIFTRY_3,     \
+    FRONTIER_MON_LUDICOLO_3,    \
+    FRONTIER_MON_CRADILY_3,     \
+    FRONTIER_MON_RAPIDASH_3,    \
+    FRONTIER_MON_CLAYDOL_3,     \
+    FRONTIER_MON_GYARADOS_3,    \
+    FRONTIER_MON_VILEPLUME_4,   \
+    FRONTIER_MON_LUDICOLO_4,    \
+    FRONTIER_MON_HOUNDOOM_4,    \
+    FRONTIER_MON_VENUSAUR_4,    \
+    FRONTIER_MON_FLAREON_4,     \
+    -1 
+
+// Only used by one Beauty
+#define FRONTIER_MONS_EEVEELUTIONS \
+    FRONTIER_MON_VAPOREON_1,    \
+    FRONTIER_MON_JOLTEON_1,     \
+    FRONTIER_MON_FLAREON_1,     \
+    FRONTIER_MON_ESPEON_1,      \
+    FRONTIER_MON_UMBREON_1,     \
+    FRONTIER_MON_VAPOREON_2,    \
+    FRONTIER_MON_JOLTEON_2,     \
+    FRONTIER_MON_FLAREON_2,     \
+    FRONTIER_MON_ESPEON_2,      \
+    FRONTIER_MON_UMBREON_2,     \
+    FRONTIER_MON_VAPOREON_3,    \
+    FRONTIER_MON_JOLTEON_3,     \
+    FRONTIER_MON_FLAREON_3,     \
+    FRONTIER_MON_ESPEON_3,      \
+    FRONTIER_MON_UMBREON_3,     \
+    FRONTIER_MON_VAPOREON_4,    \
+    FRONTIER_MON_JOLTEON_4,     \
+    FRONTIER_MON_FLAREON_4,     \
+    FRONTIER_MON_ESPEON_4,      \
+    FRONTIER_MON_UMBREON_4,     \
+    -1 
+
+#define FRONTIER_MONS_BEAUTY_2  \
+    FRONTIER_MON_JYNX_1,        \
+    FRONTIER_MON_LANTURN_1,     \
+    FRONTIER_MON_SLOWKING_1,    \
+    FRONTIER_MON_GENGAR_1,      \
+    FRONTIER_MON_AMPHAROS_1,    \
+    FRONTIER_MON_JOLTEON_1,     \
+    FRONTIER_MON_LAPRAS_1,      \
+    FRONTIER_MON_SNORLAX_1,     \
+    FRONTIER_MON_KINGDRA_1,     \
+    FRONTIER_MON_QUAGSIRE_2,    \
+    FRONTIER_MON_MISDREAVUS_2,  \
+    FRONTIER_MON_FEAROW_2,      \
+    FRONTIER_MON_XATU_2,        \
+    FRONTIER_MON_VICTREEBEL_2,  \
+    FRONTIER_MON_KANGASKHAN_2,  \
+    FRONTIER_MON_ELECTABUZZ_2,  \
+    FRONTIER_MON_MILTANK_2,     \
+    FRONTIER_MON_ALTARIA_2,     \
+    FRONTIER_MON_RAPIDASH_2,    \
+    FRONTIER_MON_HERACROSS_2,   \
+    FRONTIER_MON_FLAREON_2,     \
+    FRONTIER_MON_SCEPTILE_2,    \
+    FRONTIER_MON_JYNX_3,        \
+    FRONTIER_MON_BRELOOM_3,     \
+    FRONTIER_MON_RAICHU_3,      \
+    FRONTIER_MON_VILEPLUME_3,   \
+    FRONTIER_MON_SLOWBRO_3,     \
+    FRONTIER_MON_NINETALES_3,   \
+    FRONTIER_MON_SHUCKLE_3,     \
+    FRONTIER_MON_UMBREON_3,     \
+    FRONTIER_MON_WALREIN_3,     \
+    FRONTIER_MON_MILOTIC_3,     \
+    FRONTIER_MON_ESPEON_4,      \
+    FRONTIER_MON_URSARING_5,    \
+    FRONTIER_MON_MACHAMP_7,     \
+    FRONTIER_MON_GARDEVOIR_8,   \
+    FRONTIER_MON_LAPRAS_8,      \
+    FRONTIER_MON_SALAMENCE_8,   \
+    FRONTIER_MON_LATIAS_6,      \
+    -1 
+
+#define FRONTIER_MONS_AROMA_LADY_3  \
+    FRONTIER_MON_WOBBUFFET_1,   \
+    FRONTIER_MON_WOBBUFFET_2,   \
+    FRONTIER_MON_SUNFLORA_2,    \
+    FRONTIER_MON_JUMPLUFF_2,    \
+    FRONTIER_MON_TROPIUS_2,     \
+    FRONTIER_MON_CACTURNE_2,    \
+    FRONTIER_MON_BELLOSSOM_2,   \
+    FRONTIER_MON_JYNX_1,        \
+    FRONTIER_MON_MR_MIME_1,     \
+    FRONTIER_MON_BRELOOM_1,     \
+    FRONTIER_MON_XATU_1,        \
+    FRONTIER_MON_VILEPLUME_1,   \
+    FRONTIER_MON_VICTREEBEL_1,  \
+    FRONTIER_MON_SHIFTRY_1,     \
+    FRONTIER_MON_LUDICOLO_1,    \
+    FRONTIER_MON_HYPNO_1,       \
+    FRONTIER_MON_ALAKAZAM_1,    \
+    FRONTIER_MON_SLOWBRO_1,     \
+    FRONTIER_MON_SLOWKING_1,    \
+    FRONTIER_MON_CRADILY_1,     \
+    FRONTIER_MON_GARDEVOIR_1,   \
+    FRONTIER_MON_EXEGGUTOR_1,   \
+    FRONTIER_MON_STARMIE_1,     \
+    FRONTIER_MON_VENUSAUR_1,    \
+    FRONTIER_MON_MEGANIUM_1,    \
+    FRONTIER_MON_ESPEON_1,      \
+    FRONTIER_MON_SCEPTILE_1,    \
+    FRONTIER_MON_JYNX_2,        \
+    FRONTIER_MON_MR_MIME_2,     \
+    FRONTIER_MON_BRELOOM_2,     \
+    FRONTIER_MON_XATU_2,        \
+    FRONTIER_MON_VILEPLUME_2,   \
+    FRONTIER_MON_VICTREEBEL_2,  \
+    FRONTIER_MON_SHIFTRY_2,     \
+    FRONTIER_MON_LUDICOLO_2,    \
+    FRONTIER_MON_HYPNO_2,       \
+    FRONTIER_MON_ALAKAZAM_2,    \
+    FRONTIER_MON_SLOWBRO_2,     \
+    FRONTIER_MON_SLOWKING_2,    \
+    FRONTIER_MON_CRADILY_2,     \
+    FRONTIER_MON_GARDEVOIR_2,   \
+    FRONTIER_MON_EXEGGUTOR_2,   \
+    FRONTIER_MON_STARMIE_2,     \
+    FRONTIER_MON_VENUSAUR_2,    \
+    FRONTIER_MON_MEGANIUM_2,    \
+    FRONTIER_MON_ESPEON_2,      \
+    FRONTIER_MON_SCEPTILE_2,    \
+    FRONTIER_MON_JYNX_3,        \
+    FRONTIER_MON_MR_MIME_3,     \
+    FRONTIER_MON_BRELOOM_3,     \
+    FRONTIER_MON_XATU_3,        \
+    FRONTIER_MON_VILEPLUME_3,   \
+    FRONTIER_MON_VICTREEBEL_3,  \
+    FRONTIER_MON_SHIFTRY_3,     \
+    FRONTIER_MON_LUDICOLO_3,    \
+    FRONTIER_MON_HYPNO_3,       \
+    FRONTIER_MON_ALAKAZAM_3,    \
+    FRONTIER_MON_SLOWBRO_3,     \
+    FRONTIER_MON_SLOWKING_3,    \
+    FRONTIER_MON_CRADILY_3,     \
+    FRONTIER_MON_GARDEVOIR_3,   \
+    FRONTIER_MON_EXEGGUTOR_3,   \
+    FRONTIER_MON_STARMIE_3,     \
+    FRONTIER_MON_VENUSAUR_3,    \
+    FRONTIER_MON_MEGANIUM_3,    \
+    FRONTIER_MON_ESPEON_3,      \
+    FRONTIER_MON_SCEPTILE_3,    \
+    FRONTIER_MON_JYNX_4,        \
+    FRONTIER_MON_MR_MIME_4,     \
+    FRONTIER_MON_BRELOOM_4,     \
+    FRONTIER_MON_XATU_4,        \
+    FRONTIER_MON_VILEPLUME_4,   \
+    FRONTIER_MON_VICTREEBEL_4,  \
+    FRONTIER_MON_SHIFTRY_4,     \
+    FRONTIER_MON_LUDICOLO_4,    \
+    FRONTIER_MON_HYPNO_4,       \
+    FRONTIER_MON_ALAKAZAM_4,    \
+    FRONTIER_MON_SLOWBRO_4,     \
+    FRONTIER_MON_SLOWKING_4,    \
+    FRONTIER_MON_CRADILY_4,     \
+    FRONTIER_MON_GARDEVOIR_4,   \
+    FRONTIER_MON_EXEGGUTOR_4,   \
+    FRONTIER_MON_STARMIE_4,     \
+    FRONTIER_MON_VENUSAUR_4,    \
+    FRONTIER_MON_MEGANIUM_4,    \
+    FRONTIER_MON_ESPEON_4,      \
+    FRONTIER_MON_SCEPTILE_4,    \
+    FRONTIER_MON_GARDEVOIR_5,   \
+    FRONTIER_MON_GARDEVOIR_6,   \
+    FRONTIER_MON_GARDEVOIR_7,   \
+    FRONTIER_MON_GARDEVOIR_8,   \
+    FRONTIER_MON_STARMIE_5,     \
+    FRONTIER_MON_STARMIE_6,     \
+    FRONTIER_MON_STARMIE_7,     \
+    FRONTIER_MON_STARMIE_8,     \
+    -1 
+
 const u16 gBattleFrontierTrainerMons_Brady[] = 
 {
-    0,
-    1,
-    2,
-    3,
-    4,
-    5,
-    6,
-    7,
-    10,
-    13,
-    14,
-    15,
-    16,
-    17,
-    18,
-    19,
-    20,
-    21,
-    22,
-    23,
-    24,
-    25,
-    26,
-    27,
-    28,
-    29,
-    30,
-    31,
-    32,
-    33,
-    34,
-    35,
-    36,
-    37,
-    38,
-    39,
-    40,
-    41,
-    42,
-    43,
-    44,
-    45,
-    46,
-    47,
-    48,
-    49,
-    50,
-    51,
-    52,
-    53,
-    54,
-    55,
-    56,
-    57,
-    58,
-    59,
-    60,
-    61,
-    62,
-    63,
-    64,
-    65,
-    -1 
+    FRONTIER_MONS_YOUNGSTER_LASS_1
 };
 
 const u16 gBattleFrontierTrainerMons_Conner[] = 
 {
-    0,
-    1,
-    2,
-    3,
-    4,
-    5,
-    6,
-    7,
-    10,
-    13,
-    14,
-    15,
-    16,
-    17,
-    18,
-    19,
-    20,
-    21,
-    22,
-    23,
-    24,
-    25,
-    26,
-    27,
-    28,
-    29,
-    30,
-    31,
-    32,
-    33,
-    34,
-    35,
-    36,
-    37,
-    38,
-    39,
-    40,
-    41,
-    42,
-    43,
-    44,
-    45,
-    46,
-    47,
-    48,
-    49,
-    50,
-    51,
-    52,
-    53,
-    54,
-    55,
-    56,
-    57,
-    58,
-    59,
-    60,
-    61,
-    62,
-    63,
-    64,
-    65,
-    -1 
+    FRONTIER_MONS_YOUNGSTER_LASS_1
 };
 
 const u16 gBattleFrontierTrainerMons_Bradley[] = 
 {
-    0,
-    1,
-    2,
-    3,
-    4,
-    5,
-    6,
-    7,
-    10,
-    13,
-    14,
-    15,
-    16,
-    17,
-    18,
-    19,
-    20,
-    21,
-    22,
-    23,
-    24,
-    25,
-    26,
-    27,
-    28,
-    29,
-    30,
-    31,
-    32,
-    33,
-    34,
-    35,
-    36,
-    37,
-    38,
-    39,
-    40,
-    41,
-    42,
-    43,
-    44,
-    45,
-    46,
-    47,
-    48,
-    49,
-    50,
-    51,
-    52,
-    53,
-    54,
-    55,
-    56,
-    57,
-    58,
-    59,
-    60,
-    61,
-    62,
-    63,
-    64,
-    65,
-    -1 
+    FRONTIER_MONS_YOUNGSTER_LASS_1
 };
 
 const u16 gBattleFrontierTrainerMons_Cybil[] = 
 {
-    0,
-    1,
-    2,
-    3,
-    4,
-    5,
-    6,
-    7,
-    10,
-    13,
-    14,
-    15,
-    16,
-    17,
-    18,
-    19,
-    20,
-    21,
-    22,
-    23,
-    24,
-    25,
-    26,
-    27,
-    28,
-    29,
-    30,
-    31,
-    32,
-    33,
-    34,
-    35,
-    36,
-    37,
-    38,
-    39,
-    40,
-    41,
-    42,
-    43,
-    44,
-    45,
-    46,
-    47,
-    48,
-    49,
-    50,
-    51,
-    52,
-    53,
-    54,
-    55,
-    56,
-    57,
-    58,
-    59,
-    60,
-    61,
-    62,
-    63,
-    64,
-    65,
-    -1 
+    FRONTIER_MONS_YOUNGSTER_LASS_1
 };
 
 const u16 gBattleFrontierTrainerMons_Rodette[] = 
 {
-    0,
-    1,
-    2,
-    3,
-    4,
-    5,
-    6,
-    7,
-    10,
-    13,
-    14,
-    15,
-    16,
-    17,
-    18,
-    19,
-    20,
-    21,
-    22,
-    23,
-    24,
-    25,
-    26,
-    27,
-    28,
-    29,
-    30,
-    31,
-    32,
-    33,
-    34,
-    35,
-    36,
-    37,
-    38,
-    39,
-    40,
-    41,
-    42,
-    43,
-    44,
-    45,
-    46,
-    47,
-    48,
-    49,
-    50,
-    51,
-    52,
-    53,
-    54,
-    55,
-    56,
-    57,
-    58,
-    59,
-    60,
-    61,
-    62,
-    63,
-    64,
-    65,
-    -1 
+    FRONTIER_MONS_YOUNGSTER_LASS_1
 };
 
 const u16 gBattleFrontierTrainerMons_Peggy[] = 
 {
-    0,
-    1,
-    2,
-    3,
-    4,
-    5,
-    6,
-    7,
-    10,
-    13,
-    14,
-    15,
-    16,
-    17,
-    18,
-    19,
-    20,
-    21,
-    22,
-    23,
-    24,
-    25,
-    26,
-    27,
-    28,
-    29,
-    30,
-    31,
-    32,
-    33,
-    34,
-    35,
-    36,
-    37,
-    38,
-    39,
-    40,
-    41,
-    42,
-    43,
-    44,
-    45,
-    46,
-    47,
-    48,
-    49,
-    50,
-    51,
-    52,
-    53,
-    54,
-    55,
-    56,
-    57,
-    58,
-    59,
-    60,
-    61,
-    62,
-    63,
-    64,
-    65,
-    -1 
+    FRONTIER_MONS_YOUNGSTER_LASS_1
 };
 
 const u16 gBattleFrontierTrainerMons_Keith[] = 
 {
-    66,
-    67,
-    68,
-    69,
-    70,
-    71,
-    72,
-    73,
-    74,
-    75,
-    76,
-    77,
-    78,
-    79,
-    80,
-    81,
-    82,
-    83,
-    84,
-    85,
-    86,
-    87,
-    88,
-    89,
-    90,
-    91,
-    92,
-    93,
-    94,
-    95,
-    96,
-    97,
-    98,
-    99,
-    100,
-    101,
-    102,
-    103,
-    104,
-    105,
-    106,
-    107,
-    108,
-    109,
-    -1 
+    FRONTIER_MONS_SCHOOL_KID_1
 };
 
 const u16 gBattleFrontierTrainerMons_Grayson[] = 
 {
-    66,
-    67,
-    68,
-    69,
-    70,
-    71,
-    72,
-    73,
-    74,
-    75,
-    76,
-    77,
-    78,
-    79,
-    80,
-    81,
-    82,
-    83,
-    84,
-    85,
-    86,
-    87,
-    88,
-    89,
-    90,
-    91,
-    92,
-    93,
-    94,
-    95,
-    96,
-    97,
-    98,
-    99,
-    100,
-    101,
-    102,
-    103,
-    104,
-    105,
-    106,
-    107,
-    108,
-    109,
-    -1 
+    FRONTIER_MONS_SCHOOL_KID_1
 };
 
 const u16 gBattleFrontierTrainerMons_Glenn[] = 
 {
-    66,
-    67,
-    68,
-    69,
-    70,
-    71,
-    72,
-    73,
-    74,
-    75,
-    76,
-    77,
-    78,
-    79,
-    80,
-    81,
-    82,
-    83,
-    84,
-    85,
-    86,
-    87,
-    88,
-    89,
-    90,
-    91,
-    92,
-    93,
-    94,
-    95,
-    96,
-    97,
-    98,
-    99,
-    100,
-    101,
-    102,
-    103,
-    104,
-    105,
-    106,
-    107,
-    108,
-    109,
-    -1 
+    FRONTIER_MONS_SCHOOL_KID_1
 };
 
 const u16 gBattleFrontierTrainerMons_Liliana[] = 
 {
-    66,
-    67,
-    68,
-    69,
-    70,
-    71,
-    72,
-    73,
-    74,
-    75,
-    76,
-    77,
-    78,
-    79,
-    80,
-    81,
-    82,
-    83,
-    84,
-    85,
-    86,
-    87,
-    88,
-    89,
-    90,
-    91,
-    92,
-    93,
-    94,
-    95,
-    96,
-    97,
-    98,
-    99,
-    100,
-    101,
-    102,
-    103,
-    104,
-    105,
-    106,
-    107,
-    108,
-    109,
-    -1 
+    FRONTIER_MONS_SCHOOL_KID_1
 };
 
 const u16 gBattleFrontierTrainerMons_Elise[] = 
 {
-    66,
-    67,
-    68,
-    69,
-    70,
-    71,
-    72,
-    73,
-    74,
-    75,
-    76,
-    77,
-    78,
-    79,
-    80,
-    81,
-    82,
-    83,
-    84,
-    85,
-    86,
-    87,
-    88,
-    89,
-    90,
-    91,
-    92,
-    93,
-    94,
-    95,
-    96,
-    97,
-    98,
-    99,
-    100,
-    101,
-    102,
-    103,
-    104,
-    105,
-    106,
-    107,
-    108,
-    109,
-    -1 
+    FRONTIER_MONS_SCHOOL_KID_1
 };
 
 const u16 gBattleFrontierTrainerMons_Zoey[] = 
 {
-    66,
-    67,
-    68,
-    69,
-    70,
-    71,
-    72,
-    73,
-    74,
-    75,
-    76,
-    77,
-    78,
-    79,
-    80,
-    81,
-    82,
-    83,
-    84,
-    85,
-    86,
-    87,
-    88,
-    89,
-    90,
-    91,
-    92,
-    93,
-    94,
-    95,
-    96,
-    97,
-    98,
-    99,
-    100,
-    101,
-    102,
-    103,
-    104,
-    105,
-    106,
-    107,
-    108,
-    109,
-    -1 
+    FRONTIER_MONS_SCHOOL_KID_1
 };
 
 const u16 gBattleFrontierTrainerMons_Manuel[] = 
 {
-    5,
-    20,
-    21,
-    25,
-    27,
-    35,
-    46,
-    47,
-    48,
-    50,
-    53,
-    62,
-    63,
-    69,
-    75,
-    78,
-    79,
-    80,
-    84,
-    90,
-    92,
-    99,
-    100,
-    102,
-    106,
-    110,
-    112,
-    114,
-    119,
-    121,
-    124,
-    127,
-    146,
-    147,
-    154,
-    158,
-    160,
-    -1 
+    FRONTIER_MONS_RICH_BOY_LADY_1
 };
 
 const u16 gBattleFrontierTrainerMons_Russ[] = 
 {
-    5,
-    20,
-    21,
-    25,
-    27,
-    35,
-    46,
-    47,
-    48,
-    50,
-    53,
-    62,
-    63,
-    69,
-    75,
-    78,
-    79,
-    80,
-    84,
-    90,
-    92,
-    99,
-    100,
-    102,
-    106,
-    110,
-    112,
-    114,
-    119,
-    121,
-    124,
-    127,
-    146,
-    147,
-    154,
-    158,
-    160,
-    -1 
+    FRONTIER_MONS_RICH_BOY_LADY_1
 };
 
 const u16 gBattleFrontierTrainerMons_Dustin[] = 
 {
-    5,
-    20,
-    21,
-    25,
-    27,
-    35,
-    46,
-    47,
-    48,
-    50,
-    53,
-    62,
-    63,
-    69,
-    75,
-    78,
-    79,
-    80,
-    84,
-    90,
-    92,
-    99,
-    100,
-    102,
-    106,
-    110,
-    112,
-    114,
-    119,
-    121,
-    124,
-    127,
-    146,
-    147,
-    154,
-    158,
-    160,
-    -1 
+    FRONTIER_MONS_RICH_BOY_LADY_1
 };
 
 const u16 gBattleFrontierTrainerMons_Tina[] = 
 {
-    5,
-    20,
-    21,
-    25,
-    27,
-    35,
-    46,
-    47,
-    48,
-    50,
-    53,
-    62,
-    63,
-    69,
-    75,
-    78,
-    79,
-    80,
-    84,
-    90,
-    92,
-    99,
-    100,
-    102,
-    106,
-    110,
-    112,
-    114,
-    119,
-    121,
-    124,
-    127,
-    146,
-    147,
-    154,
-    158,
-    160,
-    -1 
+    FRONTIER_MONS_RICH_BOY_LADY_1
 };
 
 const u16 gBattleFrontierTrainerMons_Gillian[] = 
 {
-    5,
-    20,
-    21,
-    25,
-    27,
-    35,
-    46,
-    47,
-    48,
-    50,
-    53,
-    62,
-    63,
-    69,
-    75,
-    78,
-    79,
-    80,
-    84,
-    90,
-    92,
-    99,
-    100,
-    102,
-    106,
-    110,
-    112,
-    114,
-    119,
-    121,
-    124,
-    127,
-    146,
-    147,
-    154,
-    158,
-    160,
-    -1 
+    FRONTIER_MONS_RICH_BOY_LADY_1
 };
 
 const u16 gBattleFrontierTrainerMons_Zoe[] = 
 {
-    5,
-    20,
-    21,
-    25,
-    27,
-    35,
-    46,
-    47,
-    48,
-    50,
-    53,
-    62,
-    63,
-    69,
-    75,
-    78,
-    79,
-    80,
-    84,
-    90,
-    92,
-    99,
-    100,
-    102,
-    106,
-    110,
-    112,
-    114,
-    119,
-    121,
-    124,
-    127,
-    146,
-    147,
-    154,
-    158,
-    160,
-    -1 
+    FRONTIER_MONS_RICH_BOY_LADY_1
 };
 
 const u16 gBattleFrontierTrainerMons_Chen[] = 
 {
-    110,
-    111,
-    112,
-    113,
-    114,
-    115,
-    116,
-    117,
-    118,
-    119,
-    120,
-    121,
-    122,
-    123,
-    124,
-    125,
-    127,
-    128,
-    129,
-    130,
-    131,
-    132,
-    133,
-    134,
-    135,
-    136,
-    137,
-    138,
-    139,
-    140,
-    141,
-    142,
-    143,
-    144,
-    145,
-    146,
-    147,
-    148,
-    149,
-    150,
-    151,
-    152,
-    153,
-    154,
-    155,
-    156,
-    157,
-    158,
-    159,
-    160,
-    161,
-    -1 
+    FRONTIER_MONS_CAMPER_PICNICKER_1
 };
 
 const u16 gBattleFrontierTrainerMons_Al[] = 
 {
-    110,
-    111,
-    112,
-    113,
-    114,
-    115,
-    116,
-    117,
-    118,
-    119,
-    120,
-    121,
-    122,
-    123,
-    124,
-    125,
-    127,
-    128,
-    129,
-    130,
-    131,
-    132,
-    133,
-    134,
-    135,
-    136,
-    137,
-    138,
-    139,
-    140,
-    141,
-    142,
-    143,
-    144,
-    145,
-    146,
-    147,
-    148,
-    149,
-    150,
-    151,
-    152,
-    153,
-    154,
-    155,
-    156,
-    157,
-    158,
-    159,
-    160,
-    161,
-    -1 
+    FRONTIER_MONS_CAMPER_PICNICKER_1
 };
 
 const u16 gBattleFrontierTrainerMons_Mitch[] = 
 {
-    110,
-    111,
-    112,
-    113,
-    114,
-    115,
-    116,
-    117,
-    118,
-    119,
-    120,
-    121,
-    122,
-    123,
-    124,
-    125,
-    127,
-    128,
-    129,
-    130,
-    131,
-    132,
-    133,
-    134,
-    135,
-    136,
-    137,
-    138,
-    139,
-    140,
-    141,
-    142,
-    143,
-    144,
-    145,
-    146,
-    147,
-    148,
-    149,
-    150,
-    151,
-    152,
-    153,
-    154,
-    155,
-    156,
-    157,
-    158,
-    159,
-    160,
-    161,
-    -1 
+    FRONTIER_MONS_CAMPER_PICNICKER_1 
 };
 
 const u16 gBattleFrontierTrainerMons_Anne[] = 
 {
-    110,
-    111,
-    112,
-    113,
-    114,
-    115,
-    116,
-    117,
-    118,
-    119,
-    120,
-    121,
-    122,
-    123,
-    124,
-    125,
-    127,
-    128,
-    129,
-    130,
-    131,
-    132,
-    133,
-    134,
-    135,
-    136,
-    137,
-    138,
-    139,
-    140,
-    141,
-    142,
-    143,
-    144,
-    145,
-    146,
-    147,
-    148,
-    149,
-    150,
-    151,
-    152,
-    153,
-    154,
-    155,
-    156,
-    157,
-    158,
-    159,
-    160,
-    161,
-    -1 
+    FRONTIER_MONS_CAMPER_PICNICKER_1
 };
 
 const u16 gBattleFrontierTrainerMons_Alize[] = 
 {
-    110,
-    111,
-    112,
-    113,
-    114,
-    115,
-    116,
-    117,
-    118,
-    119,
-    120,
-    121,
-    122,
-    123,
-    124,
-    125,
-    127,
-    128,
-    129,
-    130,
-    131,
-    132,
-    133,
-    134,
-    135,
-    136,
-    137,
-    138,
-    139,
-    140,
-    141,
-    142,
-    143,
-    144,
-    145,
-    146,
-    147,
-    148,
-    149,
-    150,
-    151,
-    152,
-    153,
-    154,
-    155,
-    156,
-    157,
-    158,
-    159,
-    160,
-    161,
-    -1 
+    FRONTIER_MONS_CAMPER_PICNICKER_1
 };
 
 const u16 gBattleFrontierTrainerMons_Lauren[] = 
 {
-    110,
-    111,
-    112,
-    113,
-    114,
-    115,
-    116,
-    117,
-    118,
-    119,
-    120,
-    121,
-    122,
-    123,
-    124,
-    125,
-    127,
-    128,
-    129,
-    130,
-    131,
-    132,
-    133,
-    134,
-    135,
-    136,
-    137,
-    138,
-    139,
-    140,
-    141,
-    142,
-    143,
-    144,
-    145,
-    146,
-    147,
-    148,
-    149,
-    150,
-    151,
-    152,
-    153,
-    154,
-    155,
-    156,
-    157,
-    158,
-    159,
-    160,
-    161,
-    -1 
+    FRONTIER_MONS_CAMPER_PICNICKER_1 
 };
 
 const u16 gBattleFrontierTrainerMons_Kipp[] = 
 {
-    5,
-    6,
-    7,
-    14,
-    19,
-    28,
-    35,
-    42,
-    45,
-    48,
-    50,
-    55,
-    59,
-    60,
-    68,
-    73,
-    83,
-    84,
-    86,
-    87,
-    90,
-    96,
-    97,
-    98,
-    99,
-    103,
-    105,
-    106,
-    109,
-    112,
-    114,
-    121,
-    -1 
+    FRONTIER_MONS_TUBER_1
 };
 
 const u16 gBattleFrontierTrainerMons_Jason[] = 
 {
-    5,
-    6,
-    7,
-    14,
-    19,
-    28,
-    35,
-    42,
-    45,
-    48,
-    50,
-    55,
-    59,
-    60,
-    68,
-    73,
-    83,
-    84,
-    86,
-    87,
-    90,
-    96,
-    97,
-    98,
-    99,
-    103,
-    105,
-    106,
-    109,
-    112,
-    114,
-    121,
-    -1 
+    FRONTIER_MONS_TUBER_1
 };
 
 const u16 gBattleFrontierTrainerMons_John[] = 
 {
-    5,
-    6,
-    7,
-    14,
-    19,
-    28,
-    35,
-    42,
-    45,
-    48,
-    50,
-    55,
-    59,
-    60,
-    68,
-    73,
-    83,
-    84,
-    86,
-    87,
-    90,
-    96,
-    97,
-    98,
-    99,
-    103,
-    105,
-    106,
-    109,
-    112,
-    114,
-    121,
-    -1 
+    FRONTIER_MONS_TUBER_1
 };
 
 const u16 gBattleFrontierTrainerMons_Ann[] = 
 {
-    5,
-    6,
-    7,
-    14,
-    19,
-    28,
-    35,
-    42,
-    45,
-    48,
-    50,
-    55,
-    59,
-    60,
-    68,
-    73,
-    83,
-    84,
-    86,
-    87,
-    90,
-    96,
-    97,
-    98,
-    99,
-    103,
-    105,
-    106,
-    109,
-    112,
-    114,
-    121,
-    -1 
+    FRONTIER_MONS_TUBER_1
 };
 
 const u16 gBattleFrontierTrainerMons_Eileen[] = 
 {
-    5,
-    6,
-    7,
-    14,
-    19,
-    28,
-    35,
-    42,
-    45,
-    48,
-    50,
-    55,
-    59,
-    60,
-    68,
-    73,
-    83,
-    84,
-    86,
-    87,
-    90,
-    96,
-    97,
-    98,
-    99,
-    103,
-    105,
-    106,
-    109,
-    112,
-    114,
-    121,
-    -1 
+    FRONTIER_MONS_TUBER_1
 };
 
 const u16 gBattleFrontierTrainerMons_Carlie[] = 
 {
-    5,
-    6,
-    7,
-    14,
-    19,
-    28,
-    35,
-    42,
-    45,
-    48,
-    50,
-    55,
-    59,
-    60,
-    68,
-    73,
-    83,
-    84,
-    86,
-    87,
-    90,
-    96,
-    97,
-    98,
-    99,
-    103,
-    105,
-    106,
-    109,
-    112,
-    114,
-    121,
-    -1 
+    FRONTIER_MONS_TUBER_1
 };
 
 const u16 gBattleFrontierTrainerMons_Gordon[] = 
 {
-    1,
-    13,
-    15,
-    16,
-    17,
-    22,
-    23,
-    24,
-    26,
-    32,
-    34,
-    36,
-    43,
-    50,
-    51,
-    54,
-    56,
-    68,
-    72,
-    73,
-    81,
-    82,
-    83,
-    86,
-    87,
-    96,
-    97,
-    98,
-    99,
-    103,
-    105,
-    107,
-    109,
-    111,
-    113,
-    116,
-    117,
-    123,
-    124,
-    128,
-    131,
-    134,
-    138,
-    139,
-    142,
-    144,
-    145,
-    151,
-    152,
-    155,
-    -1 
+    FRONTIER_MONS_SWIMMER_M_1
 };
 
 const u16 gBattleFrontierTrainerMons_Ayden[] = 
 {
-    1,
-    13,
-    15,
-    16,
-    17,
-    22,
-    23,
-    24,
-    26,
-    32,
-    34,
-    36,
-    43,
-    50,
-    51,
-    54,
-    56,
-    68,
-    72,
-    73,
-    81,
-    82,
-    83,
-    86,
-    87,
-    96,
-    97,
-    98,
-    99,
-    103,
-    105,
-    107,
-    109,
-    111,
-    113,
-    116,
-    117,
-    123,
-    124,
-    128,
-    131,
-    134,
-    138,
-    139,
-    142,
-    144,
-    145,
-    151,
-    152,
-    155,
-    -1 
+    FRONTIER_MONS_SWIMMER_M_1
 };
 
 const u16 gBattleFrontierTrainerMons_Marco[] = 
 {
-    1,
-    13,
-    15,
-    16,
-    17,
-    22,
-    23,
-    24,
-    26,
-    32,
-    34,
-    36,
-    43,
-    50,
-    51,
-    54,
-    56,
-    68,
-    72,
-    73,
-    81,
-    82,
-    83,
-    86,
-    87,
-    96,
-    97,
-    98,
-    99,
-    103,
-    105,
-    107,
-    109,
-    111,
-    113,
-    116,
-    117,
-    123,
-    124,
-    128,
-    131,
-    134,
-    138,
-    139,
-    142,
-    144,
-    145,
-    151,
-    152,
-    155,
-    -1 
+    FRONTIER_MONS_SWIMMER_M_1
 };
 
 const u16 gBattleFrontierTrainerMons_Cierra[] = 
 {
-    1,
-    13,
-    16,
-    17,
-    23,
-    24,
-    26,
-    32,
-    34,
-    36,
-    43,
-    51,
-    54,
-    56,
-    68,
-    72,
-    73,
-    76,
-    83,
-    84,
-    86,
-    87,
-    96,
-    97,
-    98,
-    99,
-    103,
-    105,
-    107,
-    109,
-    111,
-    113,
-    116,
-    117,
-    118,
-    123,
-    124,
-    128,
-    131,
-    134,
-    138,
-    139,
-    142,
-    144,
-    145,
-    151,
-    155,
-    -1 
+    FRONTIER_MONS_SWIMMER_F_1
 };
 
 const u16 gBattleFrontierTrainerMons_Marcy[] = 
 {
-    1,
-    13,
-    16,
-    17,
-    23,
-    24,
-    26,
-    32,
-    34,
-    36,
-    43,
-    51,
-    54,
-    56,
-    68,
-    72,
-    73,
-    76,
-    83,
-    84,
-    86,
-    87,
-    96,
-    97,
-    98,
-    99,
-    103,
-    105,
-    107,
-    109,
-    111,
-    113,
-    116,
-    117,
-    118,
-    123,
-    124,
-    128,
-    131,
-    134,
-    138,
-    139,
-    142,
-    144,
-    145,
-    151,
-    155,
-    -1 
+    FRONTIER_MONS_SWIMMER_F_1
 };
 
 const u16 gBattleFrontierTrainerMons_Kathy[] = 
 {
-    1,
-    13,
-    16,
-    17,
-    23,
-    24,
-    26,
-    32,
-    34,
-    36,
-    43,
-    51,
-    54,
-    56,
-    68,
-    72,
-    73,
-    76,
-    83,
-    84,
-    86,
-    87,
-    96,
-    97,
-    98,
-    99,
-    103,
-    105,
-    107,
-    109,
-    111,
-    113,
-    116,
-    117,
-    118,
-    123,
-    124,
-    128,
-    131,
-    134,
-    138,
-    139,
-    142,
-    144,
-    145,
-    151,
-    155,
-    -1 
+    FRONTIER_MONS_SWIMMER_F_1
 };
 
 const u16 gBattleFrontierTrainerMons_Peyton[] = 
 {
-    84,
-    85,
-    87,
-    88,
-    89,
-    93,
-    94,
-    95,
-    96,
-    97,
-    98,
-    99,
-    100,
-    101,
-    102,
-    103,
-    105,
-    106,
-    107,
-    109,
-    112,
-    113,
-    117,
-    120,
-    121,
-    123,
-    129,
-    134,
-    142,
-    143,
-    145,
-    148,
-    149,
-    151,
-    152,
-    155,
-    -1 
+    FRONTIER_MONS_POKEFAN_M_1
 };
 
 const u16 gBattleFrontierTrainerMons_Julian[] = 
 {
-    84,
-    85,
-    87,
-    88,
-    89,
-    93,
-    94,
-    95,
-    96,
-    97,
-    98,
-    99,
-    100,
-    101,
-    102,
-    103,
-    105,
-    106,
-    107,
-    109,
-    112,
-    113,
-    117,
-    120,
-    121,
-    123,
-    129,
-    134,
-    142,
-    143,
-    145,
-    148,
-    149,
-    151,
-    152,
-    155,
-    -1 
+    FRONTIER_MONS_POKEFAN_M_1
 };
 
 const u16 gBattleFrontierTrainerMons_Quinn[] = 
 {
-    84,
-    85,
-    87,
-    88,
-    89,
-    93,
-    94,
-    95,
-    96,
-    97,
-    98,
-    99,
-    100,
-    101,
-    102,
-    103,
-    105,
-    106,
-    107,
-    109,
-    112,
-    113,
-    117,
-    120,
-    121,
-    123,
-    129,
-    134,
-    142,
-    143,
-    145,
-    148,
-    149,
-    151,
-    152,
-    155,
-    -1 
+    FRONTIER_MONS_POKEFAN_M_1
 };
 
 const u16 gBattleFrontierTrainerMons_Haylee[] = 
 {
-    1,
-    5,
-    6,
-    10,
-    13,
-    14,
-    16,
-    17,
-    18,
-    19,
-    20,
-    23,
-    24,
-    26,
-    28,
-    29,
-    31,
-    32,
-    33,
-    34,
-    35,
-    36,
-    42,
-    43,
-    44,
-    45,
-    46,
-    47,
-    48,
-    49,
-    54,
-    56,
-    59,
-    61,
-    65,
-    66,
-    67,
-    68,
-    71,
-    72,
-    79,
-    -1 
+    FRONTIER_MONS_POKEFAN_F_1 
 };
 
 const u16 gBattleFrontierTrainerMons_Amanda[] = 
 {
-    1,
-    5,
-    6,
-    10,
-    13,
-    14,
-    16,
-    17,
-    18,
-    19,
-    20,
-    23,
-    24,
-    26,
-    28,
-    29,
-    31,
-    32,
-    33,
-    34,
-    35,
-    36,
-    42,
-    43,
-    44,
-    45,
-    46,
-    47,
-    48,
-    49,
-    54,
-    56,
-    59,
-    61,
-    65,
-    66,
-    67,
-    68,
-    71,
-    72,
-    79,
-    -1 
+    FRONTIER_MONS_POKEFAN_F_1 
 };
 
 const u16 gBattleFrontierTrainerMons_Stacy[] = 
 {
-    1,
-    5,
-    6,
-    10,
-    13,
-    14,
-    16,
-    17,
-    18,
-    19,
-    20,
-    23,
-    24,
-    26,
-    28,
-    29,
-    31,
-    32,
-    33,
-    34,
-    35,
-    36,
-    42,
-    43,
-    44,
-    45,
-    46,
-    47,
-    48,
-    49,
-    54,
-    56,
-    59,
-    61,
-    65,
-    66,
-    67,
-    68,
-    71,
-    72,
-    79,
-    -1 
+    FRONTIER_MONS_POKEFAN_F_1
 };
 
+// The below 6 are the early Pkmn Breeder class trainers, which use groups from other general classes
 const u16 gBattleFrontierTrainerMons_Rafael[] = 
 {
-    0,
-    1,
-    2,
-    3,
-    4,
-    5,
-    6,
-    7,
-    10,
-    13,
-    14,
-    15,
-    16,
-    17,
-    18,
-    19,
-    20,
-    21,
-    22,
-    23,
-    24,
-    25,
-    26,
-    27,
-    28,
-    29,
-    30,
-    31,
-    32,
-    33,
-    34,
-    35,
-    36,
-    37,
-    38,
-    39,
-    40,
-    41,
-    42,
-    43,
-    44,
-    45,
-    46,
-    47,
-    48,
-    49,
-    50,
-    51,
-    52,
-    53,
-    54,
-    55,
-    56,
-    57,
-    58,
-    59,
-    60,
-    61,
-    62,
-    63,
-    64,
-    65,
-    -1 
+    FRONTIER_MONS_YOUNGSTER_LASS_1
 };
 
 const u16 gBattleFrontierTrainerMons_Oliver[] = 
 {
-    66,
-    67,
-    68,
-    69,
-    70,
-    71,
-    72,
-    73,
-    74,
-    75,
-    76,
-    77,
-    78,
-    79,
-    80,
-    81,
-    82,
-    83,
-    84,
-    85,
-    86,
-    87,
-    88,
-    89,
-    90,
-    91,
-    92,
-    93,
-    94,
-    95,
-    96,
-    97,
-    98,
-    99,
-    100,
-    101,
-    102,
-    103,
-    104,
-    105,
-    106,
-    107,
-    108,
-    109,
-    -1 
+    FRONTIER_MONS_SCHOOL_KID_1
 };
 
 const u16 gBattleFrontierTrainerMons_Payton[] = 
 {
-    110,
-    111,
-    112,
-    113,
-    114,
-    115,
-    116,
-    117,
-    118,
-    119,
-    120,
-    121,
-    122,
-    123,
-    124,
-    125,
-    127,
-    128,
-    129,
-    130,
-    131,
-    132,
-    133,
-    134,
-    135,
-    136,
-    137,
-    138,
-    139,
-    140,
-    141,
-    142,
-    143,
-    144,
-    145,
-    146,
-    147,
-    148,
-    149,
-    150,
-    151,
-    152,
-    153,
-    154,
-    155,
-    156,
-    157,
-    158,
-    159,
-    160,
-    161,
-    -1 
+    FRONTIER_MONS_CAMPER_PICNICKER_1
 };
 
 const u16 gBattleFrontierTrainerMons_Pamela[] = 
 {
-    0,
-    1,
-    2,
-    3,
-    4,
-    5,
-    6,
-    7,
-    10,
-    13,
-    14,
-    15,
-    16,
-    17,
-    18,
-    19,
-    20,
-    21,
-    22,
-    23,
-    24,
-    25,
-    26,
-    27,
-    28,
-    29,
-    30,
-    31,
-    32,
-    33,
-    34,
-    35,
-    36,
-    37,
-    38,
-    39,
-    40,
-    41,
-    42,
-    43,
-    44,
-    45,
-    46,
-    47,
-    48,
-    49,
-    50,
-    51,
-    52,
-    53,
-    54,
-    55,
-    56,
-    57,
-    58,
-    59,
-    60,
-    61,
-    62,
-    63,
-    64,
-    65,
-    -1 
+    FRONTIER_MONS_YOUNGSTER_LASS_1
 };
 
 const u16 gBattleFrontierTrainerMons_Eliza[] = 
 {
-    66,
-    67,
-    68,
-    69,
-    70,
-    71,
-    72,
-    73,
-    74,
-    75,
-    76,
-    77,
-    78,
-    79,
-    80,
-    81,
-    82,
-    83,
-    84,
-    85,
-    86,
-    87,
-    88,
-    89,
-    90,
-    91,
-    92,
-    93,
-    94,
-    95,
-    96,
-    97,
-    98,
-    99,
-    100,
-    101,
-    102,
-    103,
-    104,
-    105,
-    106,
-    107,
-    108,
-    109,
-    -1 
+    FRONTIER_MONS_SCHOOL_KID_1 
 };
 
 const u16 gBattleFrontierTrainerMons_Marisa[] = 
 {
-    110,
-    111,
-    112,
-    113,
-    114,
-    115,
-    116,
-    117,
-    118,
-    119,
-    120,
-    121,
-    122,
-    123,
-    124,
-    125,
-    127,
-    128,
-    129,
-    130,
-    131,
-    132,
-    133,
-    134,
-    135,
-    136,
-    137,
-    138,
-    139,
-    140,
-    141,
-    142,
-    143,
-    144,
-    145,
-    146,
-    147,
-    148,
-    149,
-    150,
-    151,
-    152,
-    153,
-    154,
-    155,
-    156,
-    157,
-    158,
-    159,
-    160,
-    161,
-    -1 
+    FRONTIER_MONS_CAMPER_PICNICKER_1 
 };
 
 const u16 gBattleFrontierTrainerMons_Lewis[] = 
 {
-    2,
-    3,
-    4,
-    8,
-    9,
-    21,
-    27,
-    39,
-    40,
-    41,
-    42,
-    52,
-    57,
-    58,
-    80,
-    112,
-    132,
-    141,
-    153,
-    154,
-    157,
-    158,
-    159,
-    160,
-    161,
-    -1 
+    FRONTIER_MONS_BUG_CATCHER_1_EXTRA(METAPOD, KAKUNA)
 };
 
 const u16 gBattleFrontierTrainerMons_Yoshi[] = 
 {
-    2,
-    3,
-    4,
-    11,
-    12,
-    21,
-    27,
-    39,
-    40,
-    41,
-    42,
-    52,
-    57,
-    58,
-    80,
-    112,
-    132,
-    141,
-    153,
-    154,
-    157,
-    158,
-    159,
-    160,
-    161,
-    -1 
+    FRONTIER_MONS_BUG_CATCHER_1_EXTRA(SILCOON, CASCOON) 
 };
 
 const u16 gBattleFrontierTrainerMons_Destin[] = 
 {
-    2,
-    3,
-    4,
-    21,
-    27,
-    39,
-    40,
-    41,
-    42,
-    52,
-    57,
-    58,
-    80,
-    112,
-    132,
-    141,
-    153,
-    154,
-    157,
-    158,
-    159,
-    160,
-    161,
-    -1 
+    FRONTIER_MONS_BUG_CATCHER_1
 };
 
 const u16 gBattleFrontierTrainerMons_Keon[] = 
 {
-    5,
-    21,
-    25,
-    27,
-    35,
-    39,
-    40,
-    41,
-    42,
-    46,
-    47,
-    48,
-    50,
-    52,
-    53,
-    57,
-    58,
-    62,
-    63,
-    69,
-    75,
-    78,
-    79,
-    80,
-    84,
-    90,
-    92,
-    99,
-    100,
-    102,
-    106,
-    110,
-    112,
-    114,
-    121,
-    124,
-    127,
-    132,
-    141,
-    146,
-    147,
-    153,
-    154,
-    157,
-    158,
-    159,
-    160,
-    161,
-    -1 
+    FRONTIER_MONS_NINJA_BOY_1
 };
 
 const u16 gBattleFrontierTrainerMons_Stuart[] = 
 {
-    5,
-    21,
-    25,
-    27,
-    35,
-    39,
-    40,
-    41,
-    42,
-    46,
-    47,
-    48,
-    50,
-    52,
-    53,
-    57,
-    58,
-    62,
-    63,
-    69,
-    75,
-    78,
-    79,
-    80,
-    84,
-    90,
-    92,
-    99,
-    100,
-    102,
-    106,
-    110,
-    112,
-    114,
-    121,
-    124,
-    127,
-    132,
-    141,
-    146,
-    147,
-    153,
-    154,
-    157,
-    158,
-    159,
-    160,
-    161,
-    -1 
+    FRONTIER_MONS_NINJA_BOY_1
 };
 
 const u16 gBattleFrontierTrainerMons_Nestor[] = 
 {
-    5,
-    21,
-    25,
-    27,
-    35,
-    39,
-    40,
-    41,
-    42,
-    46,
-    47,
-    48,
-    50,
-    52,
-    53,
-    57,
-    58,
-    62,
-    63,
-    69,
-    75,
-    78,
-    79,
-    80,
-    84,
-    90,
-    92,
-    99,
-    100,
-    102,
-    106,
-    110,
-    112,
-    114,
-    121,
-    124,
-    127,
-    132,
-    141,
-    146,
-    147,
-    153,
-    154,
-    157,
-    158,
-    159,
-    160,
-    161,
-    -1 
+    FRONTIER_MONS_NINJA_BOY_1 
 };
 
 const u16 gBattleFrontierTrainerMons_Derrick[] = 
 {
-    21,
-    27,
-    29,
-    39,
-    40,
-    41,
-    42,
-    52,
-    57,
-    58,
-    61,
-    62,
-    63,
-    69,
-    80,
-    92,
-    102,
-    112,
-    125,
-    129,
-    132,
-    140,
-    141,
-    153,
-    154,
-    157,
-    158,
-    159,
-    160,
-    161,
-    -1 
+    FRONTIER_MONS_BUG_MANIAC_1
 };
 
 const u16 gBattleFrontierTrainerMons_Bryson[] = 
 {
-    21,
-    27,
-    29,
-    39,
-    40,
-    41,
-    42,
-    52,
-    57,
-    58,
-    61,
-    62,
-    63,
-    69,
-    80,
-    92,
-    102,
-    112,
-    125,
-    129,
-    132,
-    140,
-    141,
-    153,
-    154,
-    157,
-    158,
-    159,
-    160,
-    161,
-    -1 
+    FRONTIER_MONS_BUG_MANIAC_1
 };
 
 const u16 gBattleFrontierTrainerMons_Clayton[] = 
 {
-    21,
-    27,
-    29,
-    39,
-    40,
-    41,
-    42,
-    52,
-    57,
-    58,
-    61,
-    62,
-    63,
-    69,
-    80,
-    92,
-    102,
-    112,
-    125,
-    129,
-    132,
-    140,
-    141,
-    153,
-    154,
-    157,
-    158,
-    159,
-    160,
-    161,
-    -1 
+    FRONTIER_MONS_BUG_MANIAC_1
 };
 
 const u16 gBattleFrontierTrainerMons_Trenton[] = 
 {
-    6,
-    7,
-    55,
-    60,
-    68,
-    73,
-    83,
-    86,
-    87,
-    105,
-    111,
-    116,
-    123,
-    124,
-    128,
-    134,
-    138,
-    139,
-    151,
-    -1 
+    FRONTIER_MONS_FISHERMAN_1 
 };
 
 const u16 gBattleFrontierTrainerMons_Jenson[] = 
 {
-    6,
-    7,
-    55,
-    60,
-    68,
-    73,
-    83,
-    86,
-    87,
-    105,
-    111,
-    116,
-    123,
-    124,
-    128,
-    134,
-    138,
-    139,
-    151,
-    -1 
+    FRONTIER_MONS_FISHERMAN_1
 };
 
 const u16 gBattleFrontierTrainerMons_Wesley[] = 
 {
-    6,
-    7,
-    55,
-    60,
-    68,
-    73,
-    83,
-    86,
-    87,
-    105,
-    111,
-    116,
-    123,
-    124,
-    128,
-    134,
-    138,
-    139,
-    151,
-    -1 
+    FRONTIER_MONS_FISHERMAN_1
 };
 
 const u16 gBattleFrontierTrainerMons_Anton[] = 
 {
-    31,
-    39,
-    58,
-    67,
-    70,
-    74,
-    75,
-    78,
-    85,
-    104,
-    108,
-    120,
-    122,
-    133,
-    138,
-    139,
-    140,
-    141,
-    150,
-    151,
-    152,
-    156,
-    -1 
+    FRONTIER_MONS_RUIN_MANIAC_1
 };
 
 const u16 gBattleFrontierTrainerMons_Lawson[] = 
 {
-    31,
-    39,
-    58,
-    67,
-    70,
-    74,
-    75,
-    78,
-    85,
-    104,
-    108,
-    120,
-    122,
-    133,
-    138,
-    139,
-    140,
-    141,
-    150,
-    151,
-    152,
-    156,
-    -1 
+    FRONTIER_MONS_RUIN_MANIAC_1
 };
 
 const u16 gBattleFrontierTrainerMons_Sammy[] = 
 {
-    31,
-    39,
-    58,
-    67,
-    70,
-    74,
-    75,
-    78,
-    85,
-    104,
-    108,
-    120,
-    122,
-    133,
-    138,
-    139,
-    140,
-    141,
-    150,
-    151,
-    152,
-    156,
-    -1 
+    FRONTIER_MONS_RUIN_MANIAC_1
 };
 
+// The below 3 are the early Collector class trainers, which use groups from other general classes
 const u16 gBattleFrontierTrainerMons_Arnie[] = 
 {
-    0,
-    1,
-    2,
-    3,
-    4,
-    5,
-    6,
-    7,
-    10,
-    13,
-    14,
-    15,
-    16,
-    17,
-    18,
-    19,
-    20,
-    21,
-    22,
-    23,
-    24,
-    25,
-    26,
-    27,
-    28,
-    29,
-    30,
-    31,
-    32,
-    33,
-    34,
-    35,
-    36,
-    37,
-    38,
-    39,
-    40,
-    41,
-    42,
-    43,
-    44,
-    45,
-    46,
-    47,
-    48,
-    49,
-    50,
-    51,
-    52,
-    53,
-    54,
-    55,
-    56,
-    57,
-    58,
-    59,
-    60,
-    61,
-    62,
-    63,
-    64,
-    65,
-    -1 
+    FRONTIER_MONS_YOUNGSTER_LASS_1
 };
 
 const u16 gBattleFrontierTrainerMons_Adrian[] = 
 {
-    66,
-    67,
-    68,
-    69,
-    70,
-    71,
-    72,
-    73,
-    74,
-    75,
-    76,
-    77,
-    78,
-    79,
-    80,
-    81,
-    82,
-    83,
-    84,
-    85,
-    86,
-    87,
-    88,
-    89,
-    90,
-    91,
-    92,
-    93,
-    94,
-    95,
-    96,
-    97,
-    98,
-    99,
-    100,
-    101,
-    102,
-    103,
-    104,
-    105,
-    106,
-    107,
-    108,
-    109,
-    -1 
+    FRONTIER_MONS_SCHOOL_KID_1
 };
 
 const u16 gBattleFrontierTrainerMons_Tristan[] = 
 {
-    110,
-    111,
-    112,
-    113,
-    114,
-    115,
-    116,
-    117,
-    118,
-    119,
-    120,
-    121,
-    122,
-    123,
-    124,
-    125,
-    127,
-    128,
-    129,
-    130,
-    131,
-    132,
-    133,
-    134,
-    135,
-    136,
-    137,
-    138,
-    139,
-    140,
-    141,
-    142,
-    143,
-    144,
-    145,
-    146,
-    147,
-    148,
-    149,
-    150,
-    151,
-    152,
-    153,
-    154,
-    155,
-    156,
-    157,
-    158,
-    159,
-    160,
-    161,
-    -1 
+    FRONTIER_MONS_CAMPER_PICNICKER_1
 };
 
 const u16 gBattleFrontierTrainerMons_Juliana[] = 
 {
-    0,
-    14,
-    19,
-    28,
-    42,
-    58,
-    59,
-    67,
-    68,
-    85,
-    118,
-    120,
-    123,
-    155,
-    156,
-    193,
-    -1 
+    FRONTIER_MONS_PARASOL_LADY_1
 };
 
 const u16 gBattleFrontierTrainerMons_Rylee[] = 
 {
-    0,
-    14,
-    19,
-    28,
-    42,
-    58,
-    59,
-    67,
-    68,
-    85,
-    118,
-    120,
-    123,
-    155,
-    156,
-    193,
-    -1 
+    FRONTIER_MONS_PARASOL_LADY_1
 };
 
 const u16 gBattleFrontierTrainerMons_Chelsea[] = 
 {
-    0,
-    14,
-    19,
-    28,
-    42,
-    58,
-    59,
-    67,
-    68,
-    85,
-    118,
-    120,
-    123,
-    155,
-    156,
-    193,
-    -1 
+    FRONTIER_MONS_PARASOL_LADY_1
 };
 
+// The below 3 are the early Beauty class trainers, which use groups from other general classes
 const u16 gBattleFrontierTrainerMons_Danela[] = 
 {
-    0,
-    1,
-    2,
-    3,
-    4,
-    5,
-    6,
-    7,
-    10,
-    13,
-    14,
-    15,
-    16,
-    17,
-    18,
-    19,
-    20,
-    21,
-    22,
-    23,
-    24,
-    25,
-    26,
-    27,
-    28,
-    29,
-    30,
-    31,
-    32,
-    33,
-    34,
-    35,
-    36,
-    37,
-    38,
-    39,
-    40,
-    41,
-    42,
-    43,
-    44,
-    45,
-    46,
-    47,
-    48,
-    49,
-    50,
-    51,
-    52,
-    53,
-    54,
-    55,
-    56,
-    57,
-    58,
-    59,
-    60,
-    61,
-    62,
-    63,
-    64,
-    65,
-    -1 
+    FRONTIER_MONS_YOUNGSTER_LASS_1
 };
 
 const u16 gBattleFrontierTrainerMons_Lizbeth[] = 
 {
-    66,
-    67,
-    68,
-    69,
-    70,
-    71,
-    72,
-    73,
-    74,
-    75,
-    76,
-    77,
-    78,
-    79,
-    80,
-    81,
-    82,
-    83,
-    84,
-    85,
-    86,
-    87,
-    88,
-    89,
-    90,
-    91,
-    92,
-    93,
-    94,
-    95,
-    96,
-    97,
-    98,
-    99,
-    100,
-    101,
-    102,
-    103,
-    104,
-    105,
-    106,
-    107,
-    108,
-    109,
-    -1 
+    FRONTIER_MONS_SCHOOL_KID_1
 };
 
 const u16 gBattleFrontierTrainerMons_Amelia[] = 
 {
-    110,
-    111,
-    112,
-    113,
-    114,
-    115,
-    116,
-    117,
-    118,
-    119,
-    120,
-    121,
-    122,
-    123,
-    124,
-    125,
-    127,
-    128,
-    129,
-    130,
-    131,
-    132,
-    133,
-    134,
-    135,
-    136,
-    137,
-    138,
-    139,
-    140,
-    141,
-    142,
-    143,
-    144,
-    145,
-    146,
-    147,
-    148,
-    149,
-    150,
-    151,
-    152,
-    153,
-    154,
-    155,
-    156,
-    157,
-    158,
-    159,
-    160,
-    161,
-    -1 
+    FRONTIER_MONS_CAMPER_PICNICKER_1
 };
 
 const u16 gBattleFrontierTrainerMons_Jillian[] = 
 {
-    0,
-    5,
-    18,
-    19,
-    29,
-    35,
-    48,
-    50,
-    52,
-    61,
-    69,
-    75,
-    78,
-    84,
-    90,
-    94,
-    99,
-    100,
-    101,
-    102,
-    106,
-    112,
-    114,
-    121,
-    125,
-    129,
-    130,
-    131,
-    140,
-    -1 
+    FRONTIER_MONS_AROMA_LADY_1 
 };
 
 const u16 gBattleFrontierTrainerMons_Abbie[] = 
 {
-    0,
-    5,
-    18,
-    19,
-    29,
-    35,
-    48,
-    50,
-    52,
-    61,
-    69,
-    75,
-    78,
-    84,
-    90,
-    94,
-    99,
-    100,
-    101,
-    102,
-    106,
-    112,
-    114,
-    121,
-    125,
-    129,
-    130,
-    131,
-    140,
-    -1 
+    FRONTIER_MONS_AROMA_LADY_1 
 };
 
 const u16 gBattleFrontierTrainerMons_Briana[] = 
 {
-    0,
-    5,
-    18,
-    19,
-    29,
-    35,
-    48,
-    50,
-    52,
-    61,
-    69,
-    75,
-    78,
-    84,
-    90,
-    94,
-    99,
-    100,
-    101,
-    102,
-    106,
-    112,
-    114,
-    121,
-    125,
-    129,
-    130,
-    131,
-    140,
-    -1 
+    FRONTIER_MONS_AROMA_LADY_1
 };
 
 const u16 gBattleFrontierTrainerMons_Antonio[] = 
 {
-    5,
-    10,
-    20,
-    35,
-    48,
-    49,
-    50,
-    62,
-    63,
-    64,
-    66,
-    71,
-    75,
-    77,
-    78,
-    84,
-    90,
-    92,
-    99,
-    106,
-    108,
-    112,
-    114,
-    115,
-    116,
-    119,
-    121,
-    122,
-    143,
-    148,
-    152,
-    -1 
+    FRONTIER_MONS_GUITARIST_1
 };
 
 const u16 gBattleFrontierTrainerMons_Jaden[] = 
 {
-    5,
-    10,
-    20,
-    35,
-    48,
-    49,
-    50,
-    62,
-    63,
-    64,
-    66,
-    71,
-    75,
-    77,
-    78,
-    84,
-    90,
-    92,
-    99,
-    106,
-    108,
-    112,
-    114,
-    115,
-    116,
-    119,
-    121,
-    122,
-    143,
-    148,
-    152,
-    -1 
+    FRONTIER_MONS_GUITARIST_1
 };
 
 const u16 gBattleFrontierTrainerMons_Dakota[] = 
 {
-    5,
-    10,
-    20,
-    35,
-    48,
-    49,
-    50,
-    62,
-    63,
-    64,
-    66,
-    71,
-    75,
-    77,
-    78,
-    84,
-    90,
-    92,
-    99,
-    106,
-    108,
-    112,
-    114,
-    115,
-    116,
-    119,
-    121,
-    122,
-    143,
-    148,
-    152,
-    -1 
+    FRONTIER_MONS_GUITARIST_1 
 };
 
 const u16 gBattleFrontierTrainerMons_Brayden[] = 
 {
-    1,
-    13,
-    16,
-    17,
-    23,
-    24,
-    25,
-    26,
-    32,
-    33,
-    34,
-    36,
-    37,
-    38,
-    43,
-    44,
-    45,
-    51,
-    54,
-    56,
-    72,
-    91,
-    93,
-    95,
-    106,
-    107,
-    113,
-    117,
-    118,
-    135,
-    137,
-    142,
-    144,
-    145,
-    -1 
+    FRONTIER_MONS_BIRD_KEEPER_1
 };
 
 const u16 gBattleFrontierTrainerMons_Corson[] = 
 {
-    1,
-    13,
-    16,
-    17,
-    23,
-    24,
-    25,
-    26,
-    32,
-    33,
-    34,
-    36,
-    37,
-    38,
-    43,
-    44,
-    45,
-    51,
-    54,
-    56,
-    72,
-    91,
-    93,
-    95,
-    106,
-    107,
-    113,
-    117,
-    118,
-    135,
-    137,
-    142,
-    144,
-    145,
-    -1 
+    FRONTIER_MONS_BIRD_KEEPER_1
 };
 
 const u16 gBattleFrontierTrainerMons_Trevin[] = 
 {
-    1,
-    13,
-    16,
-    17,
-    23,
-    24,
-    25,
-    26,
-    32,
-    33,
-    34,
-    36,
-    37,
-    38,
-    43,
-    44,
-    45,
-    51,
-    54,
-    56,
-    72,
-    91,
-    93,
-    95,
-    106,
-    107,
-    113,
-    117,
-    118,
-    135,
-    137,
-    142,
-    144,
-    145,
-    -1 
+    FRONTIER_MONS_BIRD_KEEPER_1
 };
 
 const u16 gBattleFrontierTrainerMons_Patrick[] = 
 {
-    15,
-    22,
-    50,
-    67,
-    70,
-    71,
-    74,
-    77,
-    81,
-    82,
-    83,
-    86,
-    87,
-    96,
-    97,
-    98,
-    99,
-    103,
-    104,
-    109,
-    111,
-    120,
-    124,
-    128,
-    131,
-    133,
-    134,
-    138,
-    139,
-    151,
-    155,
-    156,
-    -1 
+    FRONTIER_MONS_SAILOR_1
 };
 
 const u16 gBattleFrontierTrainerMons_Kaden[] = 
 {
-    15,
-    22,
-    50,
-    67,
-    70,
-    71,
-    74,
-    77,
-    81,
-    82,
-    83,
-    86,
-    87,
-    96,
-    97,
-    98,
-    99,
-    103,
-    104,
-    109,
-    111,
-    120,
-    124,
-    128,
-    131,
-    133,
-    134,
-    138,
-    139,
-    151,
-    155,
-    156,
-    -1 
+    FRONTIER_MONS_SAILOR_1
 };
 
 const u16 gBattleFrontierTrainerMons_Maxwell[] = 
 {
-    15,
-    22,
-    50,
-    67,
-    70,
-    71,
-    74,
-    77,
-    81,
-    82,
-    83,
-    86,
-    87,
-    96,
-    97,
-    98,
-    99,
-    103,
-    104,
-    109,
-    111,
-    120,
-    124,
-    128,
-    131,
-    133,
-    134,
-    138,
-    139,
-    151,
-    155,
-    156,
-    -1 
+    FRONTIER_MONS_SAILOR_1
 };
 
 const u16 gBattleFrontierTrainerMons_Daryl[] = 
 {
-    15,
-    22,
-    31,
-    39,
-    50,
-    51,
-    58,
-    67,
-    70,
-    74,
-    75,
-    81,
-    82,
-    85,
-    104,
-    120,
-    122,
-    132,
-    133,
-    138,
-    139,
-    140,
-    141,
-    142,
-    144,
-    150,
-    156,
-    -1 
+    FRONTIER_MONS_HIKER_1
 };
 
 const u16 gBattleFrontierTrainerMons_Kenneth[] = 
 {
-    15,
-    22,
-    31,
-    39,
-    50,
-    51,
-    58,
-    67,
-    70,
-    74,
-    75,
-    81,
-    82,
-    85,
-    104,
-    120,
-    122,
-    132,
-    133,
-    138,
-    139,
-    140,
-    141,
-    142,
-    144,
-    150,
-    156,
-    -1 
+    FRONTIER_MONS_HIKER_1
 };
 
 const u16 gBattleFrontierTrainerMons_Rich[] = 
 {
-    15,
-    22,
-    31,
-    39,
-    50,
-    51,
-    58,
-    67,
-    70,
-    74,
-    75,
-    81,
-    82,
-    85,
-    104,
-    120,
-    122,
-    132,
-    133,
-    138,
-    139,
-    140,
-    141,
-    142,
-    144,
-    150,
-    156,
-    -1 
+    FRONTIER_MONS_HIKER_1
 };
 
 const u16 gBattleFrontierTrainerMons_Caden[] = 
 {
-    30,
-    62,
-    63,
-    65,
-    70,
-    74,
-    77,
-    78,
-    85,
-    88,
-    89,
-    95,
-    108,
-    119,
-    122,
-    133,
-    136,
-    149,
-    150,
-    152,
-    156,
-    -1 
+    FRONTIER_MONS_KINDLER_1
 };
 
 const u16 gBattleFrontierTrainerMons_Marlon[] = 
 {
-    30,
-    62,
-    63,
-    65,
-    70,
-    74,
-    77,
-    78,
-    85,
-    88,
-    89,
-    95,
-    108,
-    119,
-    122,
-    133,
-    136,
-    149,
-    150,
-    152,
-    156,
-    -1 
+    FRONTIER_MONS_KINDLER_1
 };
 
 const u16 gBattleFrontierTrainerMons_Nash[] = 
 {
-    30,
-    62,
-    63,
-    65,
-    70,
-    74,
-    77,
-    78,
-    85,
-    88,
-    89,
-    95,
-    108,
-    119,
-    122,
-    133,
-    136,
-    149,
-    150,
-    152,
-    156,
-    -1 
+    FRONTIER_MONS_KINDLER_1
 };
 
 const u16 gBattleFrontierTrainerMons_Robby[] = 
 {
-    1,
-    13,
-    15,
-    16,
-    17,
-    22,
-    23,
-    24,
-    26,
-    32,
-    33,
-    34,
-    36,
-    37,
-    38,
-    43,
-    44,
-    50,
-    51,
-    54,
-    56,
-    67,
-    70,
-    72,
-    74,
-    75,
-    81,
-    82,
-    85,
-    91,
-    93,
-    104,
-    107,
-    113,
-    117,
-    120,
-    132,
-    133,
-    135,
-    137,
-    142,
-    144,
-    145,
-    156,
-    -1 
+    FRONTIER_MONS_RUNNING_TRIATHLETE_1
 };
 
 const u16 gBattleFrontierTrainerMons_Reece[] = 
 {
-    1,
-    13,
-    15,
-    16,
-    17,
-    22,
-    23,
-    24,
-    26,
-    32,
-    33,
-    34,
-    36,
-    37,
-    38,
-    43,
-    44,
-    50,
-    51,
-    54,
-    56,
-    67,
-    70,
-    72,
-    74,
-    75,
-    81,
-    82,
-    85,
-    91,
-    93,
-    104,
-    107,
-    113,
-    117,
-    120,
-    132,
-    133,
-    135,
-    137,
-    142,
-    144,
-    145,
-    156,
-    -1 
+    FRONTIER_MONS_RUNNING_TRIATHLETE_1
 };
 
 const u16 gBattleFrontierTrainerMons_Kathryn[] = 
 {
-    1,
-    13,
-    15,
-    16,
-    17,
-    22,
-    23,
-    24,
-    26,
-    32,
-    33,
-    34,
-    36,
-    37,
-    38,
-    43,
-    44,
-    50,
-    51,
-    54,
-    56,
-    67,
-    70,
-    72,
-    74,
-    75,
-    81,
-    82,
-    85,
-    91,
-    93,
-    104,
-    107,
-    113,
-    117,
-    120,
-    132,
-    133,
-    135,
-    137,
-    142,
-    144,
-    145,
-    156,
-    -1 
+    FRONTIER_MONS_RUNNING_TRIATHLETE_1
 };
 
 const u16 gBattleFrontierTrainerMons_Ellen[] = 
 {
-    1,
-    13,
-    15,
-    16,
-    17,
-    22,
-    23,
-    24,
-    26,
-    32,
-    33,
-    34,
-    36,
-    37,
-    38,
-    43,
-    44,
-    50,
-    51,
-    54,
-    56,
-    67,
-    70,
-    72,
-    74,
-    75,
-    81,
-    82,
-    85,
-    91,
-    93,
-    104,
-    107,
-    113,
-    117,
-    120,
-    132,
-    133,
-    135,
-    137,
-    142,
-    144,
-    145,
-    156,
-    -1 
+    FRONTIER_MONS_RUNNING_TRIATHLETE_1
 };
 
 const u16 gBattleFrontierTrainerMons_Ramon[] = 
 {
-    15,
-    22,
-    50,
-    71,
-    72,
-    76,
-    77,
-    81,
-    82,
-    83,
-    84,
-    87,
-    96,
-    97,
-    98,
-    99,
-    103,
-    107,
-    109,
-    111,
-    113,
-    117,
-    118,
-    131,
-    134,
-    138,
-    139,
-    142,
-    144,
-    145,
-    151,
-    155,
-    -1 
+    FRONTIER_MONS_SWIMMING_TRIATHLETE_1
 };
 
 const u16 gBattleFrontierTrainerMons_Arthur[] = 
 {
-    15,
-    22,
-    50,
-    71,
-    72,
-    76,
-    77,
-    81,
-    82,
-    83,
-    84,
-    87,
-    96,
-    97,
-    98,
-    99,
-    103,
-    107,
-    109,
-    111,
-    113,
-    117,
-    118,
-    131,
-    134,
-    138,
-    139,
-    142,
-    144,
-    145,
-    151,
-    155,
-    -1 
+    FRONTIER_MONS_SWIMMING_TRIATHLETE_1
 };
 
 const u16 gBattleFrontierTrainerMons_Alondra[] = 
 {
-    15,
-    22,
-    50,
-    71,
-    72,
-    76,
-    77,
-    81,
-    82,
-    83,
-    84,
-    87,
-    96,
-    97,
-    98,
-    99,
-    103,
-    107,
-    109,
-    111,
-    113,
-    117,
-    118,
-    131,
-    134,
-    138,
-    139,
-    142,
-    144,
-    145,
-    151,
-    155,
-    -1 
+    FRONTIER_MONS_SWIMMING_TRIATHLETE_1
 };
 
 const u16 gBattleFrontierTrainerMons_Adriana[] = 
 {
-    15,
-    22,
-    50,
-    71,
-    72,
-    76,
-    77,
-    81,
-    82,
-    83,
-    84,
-    87,
-    96,
-    97,
-    98,
-    99,
-    103,
-    107,
-    109,
-    111,
-    113,
-    117,
-    118,
-    131,
-    134,
-    138,
-    139,
-    142,
-    144,
-    145,
-    151,
-    155,
-    -1 
+    FRONTIER_MONS_SWIMMING_TRIATHLETE_1
 };
 
 const u16 gBattleFrontierTrainerMons_Malik[] = 
 {
-    10,
-    15,
-    22,
-    49,
-    50,
-    64,
-    66,
-    71,
-    72,
-    77,
-    78,
-    81,
-    82,
-    91,
-    93,
-    107,
-    108,
-    113,
-    115,
-    117,
-    122,
-    135,
-    137,
-    142,
-    143,
-    144,
-    145,
-    148,
-    152,
-    -1 
+    FRONTIER_MONS_CYCLING_TRIATHLETE_1
 };
 
 const u16 gBattleFrontierTrainerMons_Jill[] = 
 {
-    10,
-    15,
-    22,
-    49,
-    50,
-    64,
-    66,
-    71,
-    72,
-    77,
-    78,
-    81,
-    82,
-    91,
-    93,
-    107,
-    108,
-    113,
-    115,
-    117,
-    122,
-    135,
-    137,
-    142,
-    143,
-    144,
-    145,
-    148,
-    152,
-    -1 
+    FRONTIER_MONS_CYCLING_TRIATHLETE_1
 };
 
 const u16 gBattleFrontierTrainerMons_Erik[] = 
 {
-    162,
-    164,
-    168,
-    178,
-    183,
-    184,
-    189,
-    197,
-    199,
-    200,
-    203,
-    204,
-    207,
-    210,
-    213,
-    214,
-    218,
-    220,
-    221,
-    224,
-    227,
-    231,
-    232,
-    233,
-    234,
-    235,
-    236,
-    238,
-    240,
-    243,
-    245,
-    246,
-    250,
-    263,
-    -1 
+    FRONTIER_MONS_RUNNING_TRIATHLETE_2
 };
 
 const u16 gBattleFrontierTrainerMons_Yazmin[] = 
 {
-    162,
-    164,
-    168,
-    178,
-    183,
-    184,
-    189,
-    197,
-    199,
-    200,
-    203,
-    204,
-    207,
-    210,
-    213,
-    214,
-    218,
-    220,
-    221,
-    224,
-    227,
-    231,
-    232,
-    233,
-    234,
-    235,
-    236,
-    238,
-    240,
-    243,
-    245,
-    246,
-    250,
-    263,
-    -1 
+    FRONTIER_MONS_RUNNING_TRIATHLETE_2
 };
 
 const u16 gBattleFrontierTrainerMons_Jamal[] = 
 {
-    170,
-    176,
-    178,
-    182,
-    189,
-    190,
-    192,
-    196,
-    211,
-    212,
-    213,
-    219,
-    228,
-    230,
-    232,
-    233,
-    234,
-    236,
-    242,
-    245,
-    249,
-    253,
-    256,
-    257,
-    258,
-    259,
-    260,
-    261,
-    262,
-    265,
-    266,
-    -1 
+    FRONTIER_MONS_SWIMMING_TRIATHLETE_2
 };
 
 const u16 gBattleFrontierTrainerMons_Leslie[] = 
 {
-    170,
-    176,
-    178,
-    182,
-    189,
-    190,
-    192,
-    196,
-    211,
-    212,
-    213,
-    219,
-    228,
-    230,
-    232,
-    233,
-    234,
-    236,
-    242,
-    245,
-    249,
-    253,
-    256,
-    257,
-    258,
-    259,
-    260,
-    261,
-    262,
-    265,
-    266,
-    -1 
+    FRONTIER_MONS_SWIMMING_TRIATHLETE_2
 };
 
 const u16 gBattleFrontierTrainerMons_Dave[] = 
 {
-    162,
-    164,
-    168,
-    178,
-    183,
-    186,
-    187,
-    189,
-    197,
-    199,
-    200,
-    203,
-    204,
-    206,
-    207,
-    214,
-    215,
-    218,
-    220,
-    221,
-    224,
-    227,
-    232,
-    233,
-    234,
-    235,
-    236,
-    240,
-    244,
-    246,
-    250,
-    -1 
+    FRONTIER_MONS_CYCLING_TRIATHLETE_2
 };
 
 const u16 gBattleFrontierTrainerMons_Carlo[] = 
 {
-    162,
-    164,
-    168,
-    178,
-    183,
-    186,
-    187,
-    189,
-    197,
-    199,
-    200,
-    203,
-    204,
-    206,
-    207,
-    214,
-    215,
-    218,
-    220,
-    221,
-    224,
-    227,
-    232,
-    233,
-    234,
-    235,
-    236,
-    240,
-    244,
-    246,
-    250,
-    -1 
+    FRONTIER_MONS_CYCLING_TRIATHLETE_2
 };
 
 const u16 gBattleFrontierTrainerMons_Emilia[] = 
 {
-    162,
-    164,
-    168,
-    178,
-    183,
-    186,
-    187,
-    189,
-    197,
-    199,
-    200,
-    203,
-    204,
-    206,
-    207,
-    214,
-    215,
-    218,
-    220,
-    221,
-    224,
-    227,
-    232,
-    233,
-    234,
-    235,
-    236,
-    240,
-    244,
-    246,
-    250,
-    -1 
+    FRONTIER_MONS_CYCLING_TRIATHLETE_2
 };
 
 const u16 gBattleFrontierTrainerMons_Dalia[] = 
 {
-    162,
-    164,
-    168,
-    178,
-    183,
-    186,
-    187,
-    189,
-    197,
-    199,
-    200,
-    203,
-    204,
-    206,
-    207,
-    214,
-    215,
-    218,
-    220,
-    221,
-    224,
-    227,
-    232,
-    233,
-    234,
-    235,
-    236,
-    240,
-    244,
-    246,
-    250,
-    -1 
+    FRONTIER_MONS_CYCLING_TRIATHLETE_2
 };
 
 const u16 gBattleFrontierTrainerMons_Hitomi[] = 
 {
-    164,
-    166,
-    175,
-    178,
-    181,
-    189,
-    191,
-    193,
-    194,
-    195,
-    197,
-    199,
-    200,
-    202,
-    203,
-    205,
-    206,
-    207,
-    210,
-    215,
-    218,
-    220,
-    221,
-    222,
-    223,
-    225,
-    227,
-    230,
-    232,
-    233,
-    234,
-    235,
-    236,
-    240,
-    241,
-    246,
-    247,
-    252,
-    254,
-    262,
-    -1 
+    FRONTIER_MONS_BLACK_BELT_BATTLE_GIRL_1
 };
 
 const u16 gBattleFrontierTrainerMons_Ricardo[] = 
 {
-    164,
-    166,
-    175,
-    178,
-    181,
-    189,
-    191,
-    193,
-    194,
-    195,
-    197,
-    199,
-    200,
-    202,
-    203,
-    205,
-    206,
-    207,
-    210,
-    215,
-    218,
-    220,
-    221,
-    222,
-    223,
-    225,
-    227,
-    230,
-    232,
-    233,
-    234,
-    235,
-    236,
-    240,
-    241,
-    246,
-    247,
-    252,
-    254,
-    262,
-    -1 
+    FRONTIER_MONS_BLACK_BELT_BATTLE_GIRL_1
 };
 
 const u16 gBattleFrontierTrainerMons_Shizuka[] = 
 {
-    164,
-    166,
-    175,
-    178,
-    181,
-    189,
-    191,
-    193,
-    194,
-    195,
-    197,
-    199,
-    200,
-    202,
-    203,
-    205,
-    206,
-    207,
-    210,
-    215,
-    218,
-    220,
-    221,
-    222,
-    223,
-    225,
-    227,
-    230,
-    232,
-    233,
-    234,
-    235,
-    236,
-    240,
-    241,
-    246,
-    247,
-    252,
-    254,
-    262,
-    -1 
+    FRONTIER_MONS_BLACK_BELT_BATTLE_GIRL_1
 };
 
 const u16 gBattleFrontierTrainerMons_Joana[] = 
 {
-    164,
-    166,
-    175,
-    178,
-    181,
-    189,
-    191,
-    193,
-    194,
-    195,
-    197,
-    199,
-    200,
-    202,
-    203,
-    205,
-    206,
-    207,
-    210,
-    215,
-    218,
-    220,
-    221,
-    222,
-    223,
-    225,
-    227,
-    230,
-    232,
-    233,
-    234,
-    235,
-    236,
-    240,
-    241,
-    246,
-    247,
-    252,
-    254,
-    262,
-    -1 
+    FRONTIER_MONS_BLACK_BELT_BATTLE_GIRL_1
 };
 
 const u16 gBattleFrontierTrainerMons_Kelly[] = 
 {
-    164,
-    166,
-    175,
-    178,
-    181,
-    189,
-    191,
-    193,
-    194,
-    195,
-    197,
-    199,
-    200,
-    202,
-    203,
-    205,
-    206,
-    207,
-    210,
-    215,
-    218,
-    220,
-    221,
-    222,
-    223,
-    225,
-    227,
-    230,
-    232,
-    233,
-    234,
-    235,
-    236,
-    240,
-    241,
-    246,
-    247,
-    252,
-    254,
-    262,
-    -1 
+    FRONTIER_MONS_BLACK_BELT_BATTLE_GIRL_1
 };
 
 const u16 gBattleFrontierTrainerMons_Rayna[] = 
 {
-    164,
-    166,
-    175,
-    178,
-    181,
-    189,
-    191,
-    193,
-    194,
-    195,
-    197,
-    199,
-    200,
-    202,
-    203,
-    205,
-    206,
-    207,
-    210,
-    215,
-    218,
-    220,
-    221,
-    222,
-    223,
-    225,
-    227,
-    230,
-    232,
-    233,
-    234,
-    235,
-    236,
-    240,
-    241,
-    246,
-    247,
-    252,
-    254,
-    262,
-    -1 
+    FRONTIER_MONS_BLACK_BELT_BATTLE_GIRL_1
 };
 
 const u16 gBattleFrontierTrainerMons_Evan[] = 
 {
-    162,
-    163,
-    164,
-    165,
-    166,
-    167,
-    168,
-    169,
-    170,
-    171,
-    172,
-    173,
-    174,
-    175,
-    176,
-    177,
-    178,
-    179,
-    180,
-    181,
-    182,
-    183,
-    184,
-    185,
-    186,
-    187,
-    188,
-    189,
-    190,
-    191,
-    192,
-    193,
-    194,
-    195,
-    196,
-    197,
-    198,
-    199,
-    -1 
+    FRONTIER_MONS_EXPERT_1A
 };
 
 const u16 gBattleFrontierTrainerMons_Jordan[] = 
 {
-    200,
-    201,
-    202,
-    203,
-    204,
-    205,
-    206,
-    207,
-    208,
-    209,
-    210,
-    211,
-    212,
-    213,
-    214,
-    215,
-    216,
-    217,
-    218,
-    219,
-    220,
-    221,
-    222,
-    223,
-    224,
-    225,
-    226,
-    227,
-    228,
-    229,
-    230,
-    231,
-    232,
-    233,
-    234,
-    235,
-    236,
-    -1 
+    FRONTIER_MONS_EXPERT_1B
 };
 
 const u16 gBattleFrontierTrainerMons_Joel[] = 
 {
-    237,
-    238,
-    239,
-    240,
-    241,
-    242,
-    243,
-    244,
-    245,
-    246,
-    247,
-    248,
-    249,
-    250,
-    251,
-    252,
-    253,
-    254,
-    255,
-    256,
-    257,
-    258,
-    259,
-    260,
-    261,
-    262,
-    263,
-    264,
-    265,
-    266,
-    -1 
+    FRONTIER_MONS_EXPERT_1C
 };
 
 const u16 gBattleFrontierTrainerMons_Kristen[] = 
 {
-    162,
-    163,
-    164,
-    165,
-    166,
-    167,
-    168,
-    169,
-    170,
-    171,
-    172,
-    173,
-    174,
-    175,
-    176,
-    177,
-    178,
-    179,
-    180,
-    181,
-    182,
-    183,
-    184,
-    185,
-    186,
-    187,
-    188,
-    189,
-    190,
-    191,
-    192,
-    193,
-    194,
-    195,
-    196,
-    197,
-    198,
-    199,
-    -1 
+    FRONTIER_MONS_EXPERT_1A
 };
 
 const u16 gBattleFrontierTrainerMons_Selphy[] = 
 {
-    200,
-    201,
-    202,
-    203,
-    204,
-    205,
-    206,
-    207,
-    208,
-    209,
-    210,
-    211,
-    212,
-    213,
-    214,
-    215,
-    216,
-    217,
-    218,
-    219,
-    220,
-    221,
-    222,
-    223,
-    224,
-    225,
-    226,
-    227,
-    228,
-    229,
-    230,
-    231,
-    232,
-    233,
-    234,
-    235,
-    236,
-    -1 
+    FRONTIER_MONS_EXPERT_1B
 };
 
 const u16 gBattleFrontierTrainerMons_Chloe[] = 
 {
-    237,
-    238,
-    239,
-    240,
-    241,
-    242,
-    243,
-    244,
-    245,
-    246,
-    247,
-    248,
-    249,
-    250,
-    251,
-    252,
-    253,
-    254,
-    255,
-    256,
-    257,
-    258,
-    259,
-    260,
-    261,
-    262,
-    263,
-    264,
-    265,
-    266,
-    -1 
+    FRONTIER_MONS_EXPERT_1C
 };
 
 const u16 gBattleFrontierTrainerMons_Norton[] = 
 {
-    267,
-    268,
-    273,
-    274,
-    276,
-    284,
-    289,
-    290,
-    291,
-    292,
-    307,
-    308,
-    311,
-    312,
-    314,
-    317,
-    325,
-    327,
-    328,
-    329,
-    331,
-    332,
-    340,
-    342,
-    347,
-    349,
-    351,
-    352,
-    354,
-    356,
-    359,
-    363,
-    370,
-    -1 
+    FRONTIER_MONS_PSYCHIC_1
 };
 
 const u16 gBattleFrontierTrainerMons_Lukas[] = 
 {
-    267,
-    268,
-    273,
-    274,
-    276,
-    284,
-    289,
-    290,
-    291,
-    292,
-    307,
-    308,
-    311,
-    312,
-    314,
-    317,
-    325,
-    327,
-    328,
-    329,
-    331,
-    332,
-    340,
-    342,
-    347,
-    349,
-    351,
-    352,
-    354,
-    356,
-    359,
-    363,
-    370,
-    -1 
+    FRONTIER_MONS_PSYCHIC_1
 };
 
 const u16 gBattleFrontierTrainerMons_Zach[] = 
 {
-    267,
-    268,
-    273,
-    274,
-    276,
-    284,
-    289,
-    290,
-    291,
-    292,
-    307,
-    308,
-    311,
-    312,
-    314,
-    317,
-    325,
-    327,
-    328,
-    329,
-    331,
-    332,
-    340,
-    342,
-    347,
-    349,
-    351,
-    352,
-    354,
-    356,
-    359,
-    363,
-    370,
-    -1 
+    FRONTIER_MONS_PSYCHIC_1
 };
 
 const u16 gBattleFrontierTrainerMons_Kaitlyn[] = 
 {
-    267,
-    268,
-    273,
-    274,
-    276,
-    284,
-    289,
-    290,
-    291,
-    292,
-    307,
-    308,
-    311,
-    312,
-    314,
-    317,
-    325,
-    327,
-    328,
-    329,
-    331,
-    332,
-    340,
-    342,
-    347,
-    349,
-    351,
-    352,
-    354,
-    356,
-    359,
-    363,
-    370,
-    -1 
+    FRONTIER_MONS_PSYCHIC_1
 };
 
 const u16 gBattleFrontierTrainerMons_Breanna[] = 
 {
-    267,
-    268,
-    273,
-    274,
-    276,
-    284,
-    289,
-    290,
-    291,
-    292,
-    307,
-    308,
-    311,
-    312,
-    314,
-    317,
-    325,
-    327,
-    328,
-    329,
-    331,
-    332,
-    340,
-    342,
-    347,
-    349,
-    351,
-    352,
-    354,
-    356,
-    359,
-    363,
-    370,
-    -1 
+    FRONTIER_MONS_PSYCHIC_1
 };
 
 const u16 gBattleFrontierTrainerMons_Kendra[] = 
 {
-    267,
-    268,
-    273,
-    274,
-    276,
-    284,
-    289,
-    290,
-    291,
-    292,
-    307,
-    308,
-    311,
-    312,
-    314,
-    317,
-    325,
-    327,
-    328,
-    329,
-    331,
-    332,
-    340,
-    342,
-    347,
-    349,
-    351,
-    352,
-    354,
-    356,
-    359,
-    363,
-    370,
-    -1 
+    FRONTIER_MONS_PSYCHIC_1
 };
 
 const u16 gBattleFrontierTrainerMons_Molly[] = 
 {
-    268,
-    270,
-    272,
-    274,
-    282,
-    284,
-    289,
-    290,
-    303,
-    307,
-    311,
-    314,
-    317,
-    322,
-    327,
-    328,
-    331,
-    336,
-    340,
-    342,
-    344,
-    347,
-    352,
-    353,
-    354,
-    356,
-    359,
-    -1 
+    FRONTIER_MONS_HEX_MANIAC_1
 };
 
 const u16 gBattleFrontierTrainerMons_Jazmin[] = 
 {
-    268,
-    270,
-    272,
-    274,
-    282,
-    284,
-    289,
-    290,
-    303,
-    307,
-    311,
-    314,
-    317,
-    322,
-    327,
-    328,
-    331,
-    336,
-    340,
-    342,
-    344,
-    347,
-    352,
-    353,
-    354,
-    356,
-    359,
-    -1 
+    FRONTIER_MONS_HEX_MANIAC_1
 };
 
 const u16 gBattleFrontierTrainerMons_Kelsey[] = 
 {
-    268,
-    270,
-    272,
-    274,
-    282,
-    284,
-    289,
-    290,
-    303,
-    307,
-    311,
-    314,
-    317,
-    322,
-    327,
-    328,
-    331,
-    336,
-    340,
-    342,
-    344,
-    347,
-    352,
-    353,
-    354,
-    356,
-    359,
-    -1 
+    FRONTIER_MONS_HEX_MANIAC_1
 };
 
 const u16 gBattleFrontierTrainerMons_Jalen[] = 
 {
-    269,
-    271,
-    275,
-    279,
-    280,
-    281,
-    283,
-    285,
-    286,
-    287,
-    293,
-    294,
-    295,
-    300,
-    302,
-    307,
-    310,
-    311,
-    320,
-    322,
-    326,
-    330,
-    332,
-    335,
-    344,
-    345,
-    346,
-    348,
-    350,
-    353,
-    357,
-    -1 
+    FRONTIER_MONS_POKEMANIAC_1
 };
 
 const u16 gBattleFrontierTrainerMons_Griffen[] = 
 {
-    269,
-    271,
-    275,
-    279,
-    280,
-    281,
-    283,
-    285,
-    286,
-    287,
-    293,
-    294,
-    295,
-    300,
-    302,
-    307,
-    310,
-    311,
-    320,
-    322,
-    326,
-    330,
-    332,
-    335,
-    344,
-    345,
-    346,
-    348,
-    350,
-    353,
-    357,
-    -1 
+    FRONTIER_MONS_POKEMANIAC_1
 };
 
 const u16 gBattleFrontierTrainerMons_Xander[] = 
 {
-    269,
-    271,
-    275,
-    279,
-    280,
-    281,
-    283,
-    285,
-    286,
-    287,
-    293,
-    294,
-    295,
-    300,
-    302,
-    307,
-    310,
-    311,
-    320,
-    322,
-    326,
-    330,
-    332,
-    335,
-    344,
-    345,
-    346,
-    348,
-    350,
-    353,
-    357,
-    -1 
+    FRONTIER_MONS_POKEMANIAC_1
 };
 
 const u16 gBattleFrontierTrainerMons_Marvin[] = 
 {
-    267,
-    268,
-    269,
-    270,
-    271,
-    272,
-    273,
-    274,
-    275,
-    276,
-    277,
-    278,
-    279,
-    280,
-    281,
-    282,
-    283,
-    284,
-    285,
-    286,
-    287,
-    288,
-    289,
-    290,
-    291,
-    292,
-    293,
-    294,
-    295,
-    296,
-    297,
-    298,
-    299,
-    300,
-    301,
-    302,
-    303,
-    304,
-    -1 
+    FRONTIER_MONS_GENTLEMAN_1A
 };
 
 const u16 gBattleFrontierTrainerMons_Brennan[] = 
 {
-    305,
-    306,
-    307,
-    308,
-    309,
-    310,
-    311,
-    312,
-    313,
-    314,
-    315,
-    316,
-    317,
-    318,
-    319,
-    320,
-    321,
-    322,
-    323,
-    324,
-    325,
-    326,
-    327,
-    328,
-    329,
-    330,
-    331,
-    332,
-    333,
-    334,
-    335,
-    336,
-    337,
-    338,
-    339,
-    340,
-    341,
-    -1 
+    FRONTIER_MONS_GENTLEMAN_1B
 };
 
 const u16 gBattleFrontierTrainerMons_Baley[] = 
 {
-    159,
-    160,
-    161,
-    172,
-    173,
-    177,
-    198,
-    226,
-    238,
-    263,
-    264,
-    277,
-    278,
-    282,
-    303,
-    331,
-    343,
-    368,
-    369,
-    -1 
+    FRONTIER_MONS_BUG_MANIAC_2
 };
 
 const u16 gBattleFrontierTrainerMons_Zackary[] = 
 {
-    271,
-    283,
-    294,
-    295,
-    298,
-    299,
-    300,
-    311,
-    315,
-    320,
-    327,
-    328,
-    330,
-    335,
-    337,
-    338,
-    339,
-    341,
-    346,
-    364,
-    365,
-    366,
-    -1 
+    FRONTIER_MONS_RUIN_MANIAC_2
 };
 
 const u16 gBattleFrontierTrainerMons_Gabriel[] = 
 {
-    342,
-    343,
-    344,
-    345,
-    346,
-    347,
-    348,
-    349,
-    350,
-    351,
-    352,
-    353,
-    354,
-    355,
-    356,
-    357,
-    358,
-    359,
-    360,
-    361,
-    362,
-    363,
-    364,
-    365,
-    366,
-    367,
-    368,
-    369,
-    370,
-    371,
-    -1 
+    FRONTIER_MONS_COLLECTOR_1
 };
 
 const u16 gBattleFrontierTrainerMons_Emily[] = 
 {
-    272,
-    301,
-    309,
-    330,
-    348,
-    349,
-    350,
-    359,
-    360,
-    362,
-    363,
-    365,
-    -1 
+    FRONTIER_MONS_PARASOL_LADY_2
 };
 
 const u16 gBattleFrontierTrainerMons_Jordyn[] = 
 {
-    267,
-    269,
-    270,
-    272,
-    273,
-    276,
-    279,
-    284,
-    288,
-    302,
-    304,
-    305,
-    308,
-    309,
-    312,
-    316,
-    319,
-    322,
-    323,
-    325,
-    326,
-    329,
-    331,
-    332,
-    336,
-    340,
-    344,
-    345,
-    351,
-    353,
-    355,
-    -1 
+    FRONTIER_MONS_BEAUTY_1
 };
 
 const u16 gBattleFrontierTrainerMons_Sofia[] = 
 {
-    270,
-    272,
-    274,
-    276,
-    279,
-    282,
-    285,
-    290,
-    293,
-    313,
-    314,
-    321,
-    334,
-    340,
-    348,
-    356,
-    359,
-    360,
-    -1 
+    FRONTIER_MONS_AROMA_LADY_2
 };
 
 const u16 gBattleFrontierTrainerMons_Braden[] = 
 {
-    372,
-    373,
-    374,
-    375,
-    376,
-    377,
-    378,
-    379,
-    380,
-    381,
-    382,
-    383,
-    384,
-    385,
-    386,
-    387,
-    388,
-    389,
-    390,
-    391,
-    392,
-    393,
-    394,
-    395,
-    396,
-    397,
-    398,
-    399,
-    400,
-    401,
-    402,
-    403,
-    404,
-    -1 
+    FRONTIER_MONS_COOLTRAINER_1A
 };
 
 const u16 gBattleFrontierTrainerMons_Kayden[] = 
 {
-    405,
-    406,
-    407,
-    408,
-    409,
-    410,
-    411,
-    412,
-    413,
-    414,
-    415,
-    416,
-    417,
-    418,
-    419,
-    420,
-    421,
-    422,
-    423,
-    424,
-    425,
-    426,
-    427,
-    428,
-    429,
-    430,
-    431,
-    432,
-    433,
-    434,
-    435,
-    436,
-    437,
-    -1 
+    FRONTIER_MONS_COOLTRAINER_1B
 };
 
 const u16 gBattleFrontierTrainerMons_Cooper[] = 
 {
-    438,
-    439,
-    440,
-    441,
-    442,
-    443,
-    444,
-    445,
-    446,
-    447,
-    448,
-    449,
-    450,
-    451,
-    452,
-    453,
-    454,
-    455,
-    456,
-    457,
-    458,
-    459,
-    460,
-    461,
-    462,
-    463,
-    464,
-    465,
-    466,
-    467,
-    -1 
+    FRONTIER_MONS_COOLTRAINER_1C
 };
 
 const u16 gBattleFrontierTrainerMons_Julia[] = 
 {
-    372,
-    373,
-    374,
-    375,
-    376,
-    377,
-    378,
-    379,
-    380,
-    381,
-    382,
-    383,
-    384,
-    385,
-    386,
-    387,
-    388,
-    389,
-    390,
-    391,
-    392,
-    393,
-    394,
-    395,
-    396,
-    397,
-    398,
-    399,
-    400,
-    401,
-    402,
-    403,
-    404,
-    -1 
+    FRONTIER_MONS_COOLTRAINER_1A
 };
 
 const u16 gBattleFrontierTrainerMons_Amara[] = 
 {
-    405,
-    406,
-    407,
-    408,
-    409,
-    410,
-    411,
-    412,
-    413,
-    414,
-    415,
-    416,
-    417,
-    418,
-    419,
-    420,
-    421,
-    422,
-    423,
-    424,
-    425,
-    426,
-    427,
-    428,
-    429,
-    430,
-    431,
-    432,
-    433,
-    434,
-    435,
-    436,
-    437,
-    -1 
+    FRONTIER_MONS_COOLTRAINER_1B
 };
 
 const u16 gBattleFrontierTrainerMons_Lynn[] = 
 {
-    438,
-    439,
-    440,
-    441,
-    442,
-    443,
-    444,
-    445,
-    446,
-    447,
-    448,
-    449,
-    450,
-    451,
-    452,
-    453,
-    454,
-    455,
-    456,
-    457,
-    458,
-    459,
-    460,
-    461,
-    462,
-    463,
-    464,
-    465,
-    466,
-    467,
-    -1 
+    FRONTIER_MONS_COOLTRAINER_1C
 };
 
 const u16 gBattleFrontierTrainerMons_Jovan[] = 
 {
-    238,
-    331,
-    343,
-    368,
-    369,
-    375,
-    376,
-    379,
-    382,
-    383,
-    389,
-    394,
-    395,
-    397,
-    398,
-    400,
-    406,
-    408,
-    411,
-    416,
-    417,
-    423,
-    424,
-    425,
-    432,
-    436,
-    438,
-    441,
-    445,
-    453,
-    460,
-    462,
-    467,
-    -1 
+    FRONTIER_MONS_PKMN_RANGER_1
 };
 
 const u16 gBattleFrontierTrainerMons_Dominic[] = 
 {
-    238,
-    331,
-    343,
-    368,
-    369,
-    375,
-    376,
-    379,
-    382,
-    383,
-    389,
-    394,
-    395,
-    397,
-    398,
-    400,
-    406,
-    408,
-    411,
-    416,
-    417,
-    423,
-    424,
-    425,
-    432,
-    436,
-    438,
-    441,
-    445,
-    453,
-    460,
-    462,
-    467,
-    -1 
+    FRONTIER_MONS_PKMN_RANGER_1
 };
 
 const u16 gBattleFrontierTrainerMons_Nikolas[] = 
 {
-    238,
-    331,
-    343,
-    368,
-    369,
-    375,
-    376,
-    379,
-    382,
-    383,
-    389,
-    394,
-    395,
-    397,
-    398,
-    400,
-    406,
-    408,
-    411,
-    416,
-    417,
-    423,
-    424,
-    425,
-    432,
-    436,
-    438,
-    441,
-    445,
-    453,
-    460,
-    462,
-    467,
-    -1 
+    FRONTIER_MONS_PKMN_RANGER_1
 };
 
 const u16 gBattleFrontierTrainerMons_Valeria[] = 
 {
-    238,
-    331,
-    343,
-    368,
-    369,
-    375,
-    376,
-    379,
-    382,
-    383,
-    389,
-    394,
-    395,
-    397,
-    398,
-    400,
-    406,
-    408,
-    411,
-    416,
-    417,
-    423,
-    424,
-    425,
-    432,
-    436,
-    438,
-    441,
-    445,
-    453,
-    460,
-    462,
-    467,
-    -1 
+    FRONTIER_MONS_PKMN_RANGER_1
 };
 
 const u16 gBattleFrontierTrainerMons_Delaney[] = 
 {
-    238,
-    331,
-    343,
-    368,
-    369,
-    375,
-    376,
-    379,
-    382,
-    383,
-    389,
-    394,
-    395,
-    397,
-    398,
-    400,
-    406,
-    408,
-    411,
-    416,
-    417,
-    423,
-    424,
-    425,
-    432,
-    436,
-    438,
-    441,
-    445,
-    453,
-    460,
-    462,
-    467,
-    -1 
+    FRONTIER_MONS_PKMN_RANGER_1
 };
 
 const u16 gBattleFrontierTrainerMons_Meghan[] = 
 {
-    238,
-    331,
-    343,
-    368,
-    369,
-    375,
-    376,
-    379,
-    382,
-    383,
-    389,
-    394,
-    395,
-    397,
-    398,
-    400,
-    406,
-    408,
-    411,
-    416,
-    417,
-    423,
-    424,
-    425,
-    432,
-    436,
-    438,
-    441,
-    445,
-    453,
-    460,
-    462,
-    467,
-    -1 
+    FRONTIER_MONS_PKMN_RANGER_1
 };
 
 const u16 gBattleFrontierTrainerMons_Roberto[] = 
 {
-    386,
-    403,
-    412,
-    413,
-    414,
-    433,
-    435,
-    440,
-    450,
-    453,
-    454,
-    456,
-    459,
-    461,
-    463,
-    464,
-    465,
-    -1 
+    FRONTIER_MONS_DRAGON_TAMER_1
 };
 
 const u16 gBattleFrontierTrainerMons_Damian[] = 
 {
-    386,
-    403,
-    412,
-    413,
-    414,
-    433,
-    435,
-    440,
-    450,
-    453,
-    454,
-    456,
-    459,
-    461,
-    463,
-    464,
-    465,
-    -1 
+    FRONTIER_MONS_DRAGON_TAMER_1
 };
 
 const u16 gBattleFrontierTrainerMons_Brody[] = 
 {
-    386,
-    403,
-    412,
-    413,
-    414,
-    433,
-    435,
-    440,
-    450,
-    453,
-    454,
-    456,
-    459,
-    461,
-    463,
-    464,
-    465,
-    -1 
+    FRONTIER_MONS_DRAGON_TAMER_1
 };
 
 const u16 gBattleFrontierTrainerMons_Graham[] = 
 {
-    386,
-    403,
-    412,
-    413,
-    414,
-    433,
-    435,
-    440,
-    450,
-    453,
-    454,
-    456,
-    459,
-    461,
-    463,
-    464,
-    465,
-    -1 
+    FRONTIER_MONS_DRAGON_TAMER_1
 };
 
 const u16 gBattleFrontierTrainerMons_Tylor[] = 
 {
-    374,
-    381,
-    382,
-    385,
-    388,
-    389,
-    391,
-    392,
-    394,
-    409,
-    411,
-    412,
-    419,
-    430,
-    432,
-    436,
-    440,
-    456,
-    460,
-    462,
-    463,
-    467,
-    -1 
+    FRONTIER_MONS_POKEFAN_2
 };
 
 const u16 gBattleFrontierTrainerMons_Jaren[] = 
 {
-    374,
-    381,
-    382,
-    385,
-    388,
-    389,
-    391,
-    392,
-    394,
-    409,
-    411,
-    412,
-    419,
-    430,
-    432,
-    436,
-    440,
-    456,
-    460,
-    462,
-    463,
-    467,
-    -1 
+    FRONTIER_MONS_POKEFAN_2
 };
 
 const u16 gBattleFrontierTrainerMons_Cordell[] = 
 {
-    420,
-    421,
-    422,
-    423,
-    424,
-    425,
-    426,
-    427,
-    428,
-    429,
-    430,
-    431,
-    432,
-    433,
-    434,
-    435,
-    436,
-    437,
-    438,
-    439,
-    440,
-    441,
-    442,
-    443,
-    444,
-    445,
-    446,
-    447,
-    448,
-    449,
-    450,
-    451,
-    452,
-    453,
-    454,
-    455,
-    456,
-    457,
-    458,
-    459,
-    460,
-    461,
-    462,
-    463,
-    464,
-    465,
-    466,
-    467,
-    -1 
+    FRONTIER_MONS_PKMN_BREEDER_M_1
 };
 
 const u16 gBattleFrontierTrainerMons_Jazlyn[] = 
 {
-    372,
-    373,
-    374,
-    375,
-    376,
-    377,
-    378,
-    379,
-    380,
-    381,
-    382,
-    383,
-    384,
-    385,
-    386,
-    387,
-    388,
-    389,
-    390,
-    391,
-    392,
-    393,
-    394,
-    395,
-    396,
-    397,
-    398,
-    399,
-    400,
-    401,
-    402,
-    403,
-    404,
-    405,
-    406,
-    407,
-    408,
-    409,
-    410,
-    411,
-    412,
-    413,
-    414,
-    415,
-    416,
-    417,
-    418,
-    419,
-    -1 
+    FRONTIER_MONS_PKMN_BREEDER_F_1
 };
 
 const u16 gBattleFrontierTrainerMons_Zachery[] = 
 {
-    468,
-    469,
-    470,
-    471,
-    472,
-    473,
-    474,
-    475,
-    476,
-    477,
-    478,
-    479,
-    480,
-    481,
-    482,
-    483,
-    484,
-    485,
-    486,
-    487,
-    488,
-    489,
-    490,
-    491,
-    492,
-    493,
-    494,
-    495,
-    496,
-    497,
-    498,
-    499,
-    500,
-    -1 
+    FRONTIER_MONS_YOUNGSTER_LASS_2
 };
 
 const u16 gBattleFrontierTrainerMons_Johan[] = 
 {
-    469,
-    470,
-    471,
-    472,
-    473,
-    474,
-    475,
-    476,
-    477,
-    478,
-    479,
-    480,
-    481,
-    482,
-    483,
-    484,
-    485,
-    486,
-    487,
-    488,
-    489,
-    490,
-    491,
-    492,
-    493,
-    494,
-    495,
-    496,
-    497,
-    498,
-    499,
-    500,
-    -1 
+    FRONTIER_MONS_YOUNGSTER_LASS_2_NO_DUGTRIO
 };
 
 const u16 gBattleFrontierTrainerMons_Shea[] = 
 {
-    468,
-    469,
-    470,
-    471,
-    472,
-    473,
-    474,
-    475,
-    476,
-    477,
-    478,
-    479,
-    480,
-    481,
-    482,
-    483,
-    484,
-    485,
-    486,
-    487,
-    488,
-    489,
-    490,
-    491,
-    492,
-    493,
-    494,
-    495,
-    496,
-    497,
-    498,
-    499,
-    500,
-    -1 
+    FRONTIER_MONS_YOUNGSTER_LASS_2
 };
 
 const u16 gBattleFrontierTrainerMons_Kaila[] = 
 {
-    468,
-    469,
-    470,
-    471,
-    472,
-    473,
-    474,
-    475,
-    476,
-    477,
-    478,
-    479,
-    480,
-    481,
-    482,
-    483,
-    484,
-    485,
-    486,
-    487,
-    488,
-    489,
-    490,
-    491,
-    492,
-    493,
-    494,
-    495,
-    496,
-    497,
-    498,
-    499,
-    500,
-    -1 
+    FRONTIER_MONS_YOUNGSTER_LASS_2
 };
 
 const u16 gBattleFrontierTrainerMons_Isiah[] = 
 {
-    501,
-    502,
-    503,
-    504,
-    505,
-    506,
-    507,
-    508,
-    509,
-    510,
-    511,
-    512,
-    513,
-    514,
-    515,
-    516,
-    517,
-    518,
-    519,
-    520,
-    521,
-    522,
-    523,
-    524,
-    525,
-    526,
-    527,
-    528,
-    529,
-    530,
-    531,
-    532,
-    533,
-    -1 
+    FRONTIER_MONS_SCHOOL_KID_2
 };
 
 const u16 gBattleFrontierTrainerMons_Garrett[] = 
 {
-    501,
-    502,
-    503,
-    504,
-    505,
-    506,
-    507,
-    508,
-    509,
-    510,
-    511,
-    512,
-    513,
-    514,
-    515,
-    516,
-    517,
-    518,
-    519,
-    520,
-    521,
-    522,
-    523,
-    524,
-    525,
-    526,
-    527,
-    528,
-    529,
-    530,
-    531,
-    532,
-    533,
-    -1 
+    FRONTIER_MONS_SCHOOL_KID_2
 };
 
 const u16 gBattleFrontierTrainerMons_Haylie[] = 
 {
-    501,
-    502,
-    503,
-    504,
-    505,
-    506,
-    507,
-    508,
-    509,
-    510,
-    511,
-    512,
-    513,
-    514,
-    515,
-    516,
-    517,
-    518,
-    519,
-    520,
-    521,
-    522,
-    523,
-    524,
-    525,
-    526,
-    527,
-    528,
-    529,
-    530,
-    531,
-    532,
-    533,
-    -1 
+    FRONTIER_MONS_SCHOOL_KID_2
 };
 
 const u16 gBattleFrontierTrainerMons_Megan[] = 
 {
-    501,
-    502,
-    503,
-    504,
-    505,
-    506,
-    507,
-    508,
-    509,
-    510,
-    511,
-    512,
-    513,
-    514,
-    515,
-    516,
-    517,
-    518,
-    519,
-    520,
-    521,
-    522,
-    523,
-    524,
-    525,
-    526,
-    527,
-    528,
-    529,
-    530,
-    531,
-    532,
-    533,
-    -1 
+    FRONTIER_MONS_SCHOOL_KID_2
 };
 
 const u16 gBattleFrontierTrainerMons_Issac[] = 
 {
-    534,
-    535,
-    536,
-    537,
-    538,
-    539,
-    540,
-    541,
-    542,
-    543,
-    544,
-    545,
-    546,
-    547,
-    548,
-    549,
-    550,
-    551,
-    552,
-    553,
-    554,
-    555,
-    556,
-    557,
-    558,
-    559,
-    560,
-    561,
-    562,
-    563,
-    -1 
+    FRONTIER_MONS_RICH_BOY_LADY_2
 };
 
 const u16 gBattleFrontierTrainerMons_Quinton[] = 
 {
-    534,
-    535,
-    536,
-    537,
-    538,
-    539,
-    540,
-    541,
-    542,
-    543,
-    544,
-    545,
-    546,
-    547,
-    548,
-    549,
-    550,
-    551,
-    552,
-    553,
-    554,
-    555,
-    556,
-    557,
-    558,
-    559,
-    560,
-    561,
-    562,
-    563,
-    -1 
+    FRONTIER_MONS_RICH_BOY_LADY_2
 };
 
 const u16 gBattleFrontierTrainerMons_Salma[] = 
 {
-    534,
-    535,
-    536,
-    537,
-    538,
-    539,
-    540,
-    541,
-    542,
-    543,
-    544,
-    545,
-    546,
-    547,
-    548,
-    549,
-    550,
-    551,
-    552,
-    553,
-    554,
-    555,
-    556,
-    557,
-    558,
-    559,
-    560,
-    561,
-    562,
-    563,
-    -1 
+    FRONTIER_MONS_RICH_BOY_LADY_2
 };
 
 const u16 gBattleFrontierTrainerMons_Ansley[] = 
 {
-    534,
-    535,
-    536,
-    537,
-    538,
-    539,
-    540,
-    541,
-    542,
-    543,
-    544,
-    545,
-    546,
-    547,
-    548,
-    549,
-    550,
-    551,
-    552,
-    553,
-    554,
-    555,
-    556,
-    557,
-    558,
-    559,
-    560,
-    561,
-    562,
-    563,
-    -1 
+    FRONTIER_MONS_RICH_BOY_LADY_2
 };
 
 const u16 gBattleFrontierTrainerMons_Holden[] = 
 {
-    343,
-    368,
-    369,
-    383,
-    417,
-    423,
-    424,
-    432,
-    480,
-    481,
-    490,
-    491,
-    494,
-    496,
-    512,
-    513,
-    519,
-    520,
-    528,
-    534,
-    537,
-    541,
-    549,
-    -1 
+    FRONTIER_MONS_BUG_CATCHER_2
 };
 
 const u16 gBattleFrontierTrainerMons_Luca[] = 
 {
-    343,
-    368,
-    369,
-    383,
-    417,
-    423,
-    424,
-    432,
-    480,
-    481,
-    490,
-    491,
-    494,
-    496,
-    512,
-    513,
-    519,
-    520,
-    528,
-    534,
-    537,
-    541,
-    549,
-    -1 
+    FRONTIER_MONS_BUG_CATCHER_2
 };
 
 const u16 gBattleFrontierTrainerMons_Jamison[] = 
 {
-    282,
-    331,
-    343,
-    368,
-    369,
-    469,
-    472,
-    475,
-    476,
-    478,
-    481,
-    484,
-    490,
-    491,
-    497,
-    500,
-    501,
-    509,
-    510,
-    513,
-    516,
-    517,
-    519,
-    520,
-    524,
-    528,
-    530,
-    533,
-    534,
-    537,
-    542,
-    553,
-    -1 
+    FRONTIER_MONS_NINJA_BOY_2
 };
 
 const u16 gBattleFrontierTrainerMons_Gunnar[] = 
 {
-    282,
-    331,
-    343,
-    368,
-    369,
-    469,
-    472,
-    475,
-    476,
-    478,
-    481,
-    484,
-    490,
-    491,
-    497,
-    500,
-    501,
-    509,
-    510,
-    513,
-    516,
-    517,
-    519,
-    520,
-    524,
-    528,
-    530,
-    533,
-    534,
-    537,
-    542,
-    553,
-    -1 
+    FRONTIER_MONS_NINJA_BOY_2
 };
 
 const u16 gBattleFrontierTrainerMons_Craig[] = 
 {
-    471,
-    474,
-    475,
-    479,
-    483,
-    485,
-    488,
-    493,
-    495,
-    496,
-    502,
-    504,
-    505,
-    506,
-    507,
-    514,
-    521,
-    525,
-    530,
-    532,
-    535,
-    538,
-    544,
-    545,
-    548,
-    552,
-    554,
-    555,
-    556,
-    557,
-    558,
-    559,
-    563,
-    -1 
+    FRONTIER_MONS_TUBER_2
 };
 
 const u16 gBattleFrontierTrainerMons_Pierce[] = 
 {
-    471,
-    474,
-    475,
-    479,
-    483,
-    485,
-    488,
-    493,
-    495,
-    496,
-    502,
-    504,
-    505,
-    506,
-    507,
-    514,
-    521,
-    525,
-    530,
-    532,
-    535,
-    538,
-    544,
-    545,
-    548,
-    552,
-    554,
-    555,
-    556,
-    557,
-    558,
-    559,
-    563,
-    -1 
+    FRONTIER_MONS_TUBER_2
 };
 
 const u16 gBattleFrontierTrainerMons_Regina[] = 
 {
-    471,
-    474,
-    475,
-    479,
-    483,
-    485,
-    488,
-    493,
-    495,
-    496,
-    502,
-    504,
-    505,
-    506,
-    507,
-    514,
-    521,
-    525,
-    530,
-    532,
-    535,
-    538,
-    544,
-    545,
-    548,
-    552,
-    554,
-    555,
-    556,
-    557,
-    558,
-    559,
-    563,
-    -1 
+    FRONTIER_MONS_TUBER_2
 };
 
 const u16 gBattleFrontierTrainerMons_Alison[] = 
 {
-    471,
-    474,
-    475,
-    479,
-    483,
-    485,
-    488,
-    493,
-    495,
-    496,
-    502,
-    504,
-    505,
-    506,
-    507,
-    514,
-    521,
-    525,
-    530,
-    532,
-    535,
-    538,
-    544,
-    545,
-    548,
-    552,
-    554,
-    555,
-    556,
-    557,
-    558,
-    559,
-    563,
-    -1 
+    FRONTIER_MONS_TUBER_2
 };
 
 const u16 gBattleFrontierTrainerMons_Hank[] = 
 {
-    277,
-    278,
-    282,
-    303,
-    331,
-    343,
-    368,
-    369,
-    383,
-    417,
-    423,
-    424,
-    432,
-    481,
-    513,
-    519,
-    520,
-    528,
-    575,
-    609,
-    615,
-    616,
-    624,
-    -1 
+    FRONTIER_MONS_BUG_MANIAC_3
 };
 
 const u16 gBattleFrontierTrainerMons_Earl[] = 
 {
-    277,
-    278,
-    282,
-    303,
-    331,
-    343,
-    368,
-    369,
-    383,
-    417,
-    423,
-    424,
-    432,
-    481,
-    513,
-    519,
-    520,
-    528,
-    575,
-    609,
-    615,
-    616,
-    624,
-    -1 
+    FRONTIER_MONS_BUG_MANIAC_3
 };
 
 const u16 gBattleFrontierTrainerMons_Ramiro[] = 
 {
-    316,
-    333,
-    347,
-    350,
-    354,
-    358,
-    361,
-    362,
-    363,
-    364,
-    573,
-    576,
-    621,
-    626,
-    631,
-    -1 
+    FRONTIER_MONS_FISHERMAN_2
 };
 
 const u16 gBattleFrontierTrainerMons_Hunter[] = 
 {
-    316,
-    333,
-    347,
-    350,
-    354,
-    358,
-    361,
-    362,
-    363,
-    364,
-    573,
-    576,
-    621,
-    626,
-    631,
-    -1 
+    FRONTIER_MONS_FISHERMAN_2
 };
 
 const u16 gBattleFrontierTrainerMons_Aiden[] = 
 {
-    564,
-    575,
-    576,
-    578,
-    579,
-    580,
-    594,
-    595,
-    605,
-    606,
-    608,
-    609,
-    615,
-    619,
-    620,
-    624,
-    625,
-    627,
-    632,
-    642,
-    650,
-    658,
-    -1 
+    FRONTIER_MONS_RUIN_MANIAC_3
 };
 
 const u16 gBattleFrontierTrainerMons_Xavier[] = 
 {
-    564,
-    575,
-    576,
-    578,
-    579,
-    580,
-    594,
-    595,
-    605,
-    606,
-    608,
-    609,
-    615,
-    619,
-    620,
-    624,
-    625,
-    627,
-    632,
-    642,
-    650,
-    658,
-    -1 
+    FRONTIER_MONS_RUIN_MANIAC_3
 };
 
 const u16 gBattleFrontierTrainerMons_Clinton[] = 
 {
-    564,
-    565,
-    566,
-    567,
-    568,
-    569,
-    570,
-    571,
-    572,
-    573,
-    574,
-    575,
-    576,
-    577,
-    578,
-    579,
-    580,
-    581,
-    582,
-    583,
-    584,
-    585,
-    586,
-    587,
-    588,
-    589,
-    590,
-    591,
-    592,
-    593,
-    594,
-    595,
-    596,
-    597,
-    598,
-    599,
-    600,
-    601,
-    602,
-    603,
-    604,
-    605,
-    606,
-    607,
-    608,
-    609,
-    610,
-    611,
-    -1 
+    FRONTIER_MONS_COLLECTOR_2
 };
 
 const u16 gBattleFrontierTrainerMons_Jesse[] = 
 {
-    564,
-    565,
-    566,
-    567,
-    568,
-    569,
-    570,
-    571,
-    572,
-    573,
-    574,
-    575,
-    576,
-    577,
-    578,
-    579,
-    580,
-    581,
-    582,
-    583,
-    584,
-    585,
-    586,
-    587,
-    588,
-    589,
-    590,
-    591,
-    592,
-    593,
-    594,
-    595,
-    596,
-    597,
-    598,
-    599,
-    600,
-    601,
-    602,
-    603,
-    604,
-    605,
-    606,
-    607,
-    608,
-    609,
-    610,
-    611,
-    -1 
+    FRONTIER_MONS_COLLECTOR_2
 };
 
 const u16 gBattleFrontierTrainerMons_Eduardo[] = 
 {
-    268,
-    307,
-    317,
-    349,
-    352,
-    573,
-    583,
-    585,
-    588,
-    590,
-    599,
-    614,
-    618,
-    635,
-    639,
-    -1 
+    FRONTIER_MONS_GUITARIST_2
 };
 
 const u16 gBattleFrontierTrainerMons_Hal[] = 
 {
-    268,
-    307,
-    317,
-    349,
-    352,
-    573,
-    583,
-    585,
-    588,
-    590,
-    599,
-    614,
-    618,
-    635,
-    639,
-    -1 
+    FRONTIER_MONS_GUITARIST_2
 };
 
 const u16 gBattleFrontierTrainerMons_Gage[] = 
 {
-    289,
-    318,
-    319,
-    329,
-    355,
-    375,
-    379,
-    385,
-    386,
-    457,
-    473,
-    477,
-    482,
-    484,
-    553,
-    567,
-    571,
-    577,
-    578,
-    649,
-    -1 
+    FRONTIER_MONS_BIRD_KEEPER_2
 };
 
 const u16 gBattleFrontierTrainerMons_Arnold[] = 
 {
-    289,
-    318,
-    319,
-    329,
-    355,
-    375,
-    379,
-    385,
-    386,
-    457,
-    473,
-    477,
-    482,
-    484,
-    553,
-    567,
-    571,
-    577,
-    578,
-    649,
-    -1 
+    FRONTIER_MONS_BIRD_KEEPER_2
 };
 
 const u16 gBattleFrontierTrainerMons_Jarrett[] = 
 {
-    565,
-    573,
-    576,
-    580,
-    582,
-    584,
-    592,
-    601,
-    602,
-    610,
-    621,
-    623,
-    626,
-    631,
-    634,
-    640,
-    641,
-    644,
-    648,
-    650,
-    651,
-    653,
-    655,
-    -1 
+    FRONTIER_MONS_SAILOR_2
 };
 
 const u16 gBattleFrontierTrainerMons_Garett[] = 
 {
-    565,
-    573,
-    576,
-    580,
-    582,
-    584,
-    592,
-    601,
-    602,
-    610,
-    621,
-    623,
-    626,
-    631,
-    634,
-    640,
-    641,
-    644,
-    648,
-    650,
-    651,
-    653,
-    655,
-    -1 
+    FRONTIER_MONS_SAILOR_2
 };
 
 const u16 gBattleFrontierTrainerMons_Emanuel[] = 
 {
-    564,
-    565,
-    574,
-    579,
-    582,
-    594,
-    595,
-    605,
-    606,
-    608,
-    609,
-    616,
-    619,
-    620,
-    623,
-    624,
-    625,
-    627,
-    642,
-    643,
-    -1 
+    FRONTIER_MONS_HIKER_2
 };
 
 const u16 gBattleFrontierTrainerMons_Gustavo[] = 
 {
-    564,
-    565,
-    574,
-    579,
-    582,
-    594,
-    595,
-    605,
-    606,
-    608,
-    609,
-    616,
-    619,
-    620,
-    623,
-    624,
-    625,
-    627,
-    642,
-    643,
-    -1 
+    FRONTIER_MONS_HIKER_2
 };
 
 const u16 gBattleFrontierTrainerMons_Kameron[] = 
 {
-    568,
-    581,
-    589,
-    598,
-    600,
-    603,
-    607,
-    611,
-    617,
-    618,
-    622,
-    636,
-    643,
-    646,
-    647,
-    652,
-    654,
-    656,
-    659,
-    -1 
+    FRONTIER_MONS_KINDLER_2
 };
 
 const u16 gBattleFrontierTrainerMons_Alfredo[] = 
 {
-    568,
-    581,
-    589,
-    598,
-    600,
-    603,
-    607,
-    611,
-    617,
-    618,
-    622,
-    636,
-    643,
-    646,
-    647,
-    652,
-    654,
-    656,
-    659,
-    -1 
+    FRONTIER_MONS_KINDLER_2
 };
 
 const u16 gBattleFrontierTrainerMons_Ruben[] = 
 {
-    612,
-    613,
-    614,
-    615,
-    616,
-    617,
-    618,
-    619,
-    620,
-    621,
-    622,
-    623,
-    624,
-    625,
-    626,
-    627,
-    628,
-    629,
-    630,
-    631,
-    632,
-    633,
-    634,
-    635,
-    636,
-    637,
-    638,
-    639,
-    640,
-    641,
-    642,
-    643,
-    644,
-    645,
-    646,
-    647,
-    648,
-    649,
-    650,
-    651,
-    652,
-    653,
-    654,
-    655,
-    656,
-    657,
-    658,
-    659,
-    -1 
+    FRONTIER_MONS_GENTLEMAN_2
 };
 
 const u16 gBattleFrontierTrainerMons_Lamar[] = 
 {
-    612,
-    613,
-    614,
-    615,
-    616,
-    617,
-    618,
-    619,
-    620,
-    621,
-    622,
-    623,
-    624,
-    625,
-    626,
-    627,
-    628,
-    629,
-    630,
-    631,
-    632,
-    633,
-    634,
-    635,
-    636,
-    637,
-    638,
-    639,
-    640,
-    641,
-    642,
-    643,
-    644,
-    645,
-    646,
-    647,
-    648,
-    649,
-    650,
-    651,
-    652,
-    653,
-    654,
-    655,
-    656,
-    657,
-    658,
-    659,
-    -1 
+    FRONTIER_MONS_GENTLEMAN_2
 };
 
 const u16 gBattleFrontierTrainerMons_Jaxon[] = 
 {
-    660,
-    661,
-    662,
-    663,
-    664,
-    665,
-    666,
-    667,
-    668,
-    669,
-    670,
-    671,
-    672,
-    673,
-    674,
-    675,
-    676,
-    677,
-    678,
-    679,
-    680,
-    681,
-    682,
-    683,
-    684,
-    685,
-    686,
-    687,
-    688,
-    689,
-    690,
-    691,
-    692,
-    -1 
+    FRONTIER_MONS_YOUNGSTER_LASS_3
 };
 
 const u16 gBattleFrontierTrainerMons_Logan[] = 
 {
-    660,
-    661,
-    662,
-    663,
-    664,
-    665,
-    666,
-    667,
-    668,
-    669,
-    670,
-    671,
-    672,
-    673,
-    674,
-    675,
-    676,
-    677,
-    678,
-    679,
-    680,
-    681,
-    682,
-    683,
-    684,
-    685,
-    686,
-    687,
-    688,
-    689,
-    690,
-    691,
-    692,
-    -1 
+    FRONTIER_MONS_YOUNGSTER_LASS_3
 };
 
 const u16 gBattleFrontierTrainerMons_Emilee[] = 
 {
-    660,
-    661,
-    662,
-    663,
-    664,
-    665,
-    666,
-    667,
-    668,
-    669,
-    670,
-    671,
-    672,
-    673,
-    674,
-    675,
-    676,
-    677,
-    678,
-    679,
-    680,
-    681,
-    682,
-    683,
-    684,
-    685,
-    686,
-    687,
-    688,
-    689,
-    690,
-    691,
-    692,
-    -1 
+    FRONTIER_MONS_YOUNGSTER_LASS_3
 };
 
 const u16 gBattleFrontierTrainerMons_Josie[] = 
 {
-    660,
-    661,
-    662,
-    663,
-    664,
-    665,
-    666,
-    667,
-    668,
-    669,
-    670,
-    671,
-    672,
-    673,
-    674,
-    675,
-    676,
-    677,
-    678,
-    679,
-    680,
-    681,
-    682,
-    683,
-    684,
-    685,
-    686,
-    687,
-    688,
-    689,
-    690,
-    691,
-    692,
-    -1 
+    FRONTIER_MONS_YOUNGSTER_LASS_3
 };
 
 const u16 gBattleFrontierTrainerMons_Armando[] = 
 {
-    693,
-    694,
-    695,
-    696,
-    697,
-    698,
-    699,
-    700,
-    701,
-    702,
-    703,
-    704,
-    705,
-    706,
-    707,
-    708,
-    709,
-    710,
-    711,
-    712,
-    713,
-    714,
-    715,
-    716,
-    717,
-    718,
-    719,
-    720,
-    721,
-    722,
-    723,
-    724,
-    725,
-    -1 
+    FRONTIER_MONS_CAMPER_PICNICKER_2
 };
 
 const u16 gBattleFrontierTrainerMons_Skyler[] = 
 {
-    693,
-    694,
-    695,
-    696,
-    697,
-    698,
-    699,
-    700,
-    701,
-    702,
-    703,
-    704,
-    705,
-    706,
-    707,
-    708,
-    709,
-    710,
-    711,
-    712,
-    713,
-    714,
-    715,
-    716,
-    717,
-    718,
-    719,
-    720,
-    721,
-    722,
-    723,
-    724,
-    725,
-    -1 
+    FRONTIER_MONS_CAMPER_PICNICKER_2
 };
 
 const u16 gBattleFrontierTrainerMons_Ruth[] = 
 {
-    693,
-    694,
-    695,
-    696,
-    697,
-    698,
-    699,
-    700,
-    701,
-    702,
-    703,
-    704,
-    705,
-    706,
-    707,
-    708,
-    709,
-    710,
-    711,
-    712,
-    713,
-    714,
-    715,
-    716,
-    717,
-    718,
-    719,
-    720,
-    721,
-    722,
-    723,
-    724,
-    725,
-    -1 
+    FRONTIER_MONS_CAMPER_PICNICKER_2
 };
 
 const u16 gBattleFrontierTrainerMons_Melody[] = 
 {
-    693,
-    694,
-    695,
-    696,
-    697,
-    698,
-    699,
-    700,
-    701,
-    702,
-    703,
-    704,
-    705,
-    706,
-    707,
-    708,
-    709,
-    710,
-    711,
-    712,
-    713,
-    714,
-    715,
-    716,
-    717,
-    718,
-    719,
-    720,
-    721,
-    722,
-    723,
-    724,
-    725,
-    -1 
+    FRONTIER_MONS_CAMPER_PICNICKER_2
 };
 
 const u16 gBattleFrontierTrainerMons_Pedro[] = 
 {
-    347,
-    661,
-    664,
-    669,
-    672,
-    676,
-    677,
-    678,
-    680,
-    685,
-    688,
-    694,
-    696,
-    697,
-    698,
-    699,
-    706,
-    713,
-    717,
-    719,
-    722,
-    724,
-    727,
-    730,
-    736,
-    737,
-    740,
-    744,
-    746,
-    747,
-    748,
-    749,
-    750,
-    751,
-    755,
-    -1 
+    FRONTIER_MONS_SWIMMER_M_2
 };
 
 const u16 gBattleFrontierTrainerMons_Erick[] = 
 {
-    347,
-    661,
-    664,
-    669,
-    672,
-    676,
-    677,
-    678,
-    680,
-    685,
-    688,
-    694,
-    696,
-    697,
-    698,
-    699,
-    706,
-    713,
-    717,
-    719,
-    722,
-    724,
-    727,
-    730,
-    736,
-    737,
-    740,
-    744,
-    746,
-    747,
-    748,
-    749,
-    750,
-    751,
-    755,
-    -1 
+    FRONTIER_MONS_SWIMMER_M_2
 };
 
 const u16 gBattleFrontierTrainerMons_Elaine[] = 
 {
-    664,
-    665,
-    669,
-    672,
-    676,
-    677,
-    680,
-    685,
-    687,
-    688,
-    694,
-    696,
-    697,
-    698,
-    699,
-    706,
-    713,
-    717,
-    722,
-    724,
-    727,
-    730,
-    736,
-    737,
-    740,
-    744,
-    746,
-    747,
-    748,
-    749,
-    750,
-    751,
-    755,
-    -1 
+    FRONTIER_MONS_SWIMMER_F_2
 };
 
 const u16 gBattleFrontierTrainerMons_Joyce[] = 
 {
-    664,
-    665,
-    669,
-    672,
-    676,
-    677,
-    680,
-    685,
-    687,
-    688,
-    694,
-    696,
-    697,
-    698,
-    699,
-    706,
-    713,
-    717,
-    722,
-    724,
-    727,
-    730,
-    736,
-    737,
-    740,
-    744,
-    746,
-    747,
-    748,
-    749,
-    750,
-    751,
-    755,
-    -1 
+    FRONTIER_MONS_SWIMMER_F_2
 };
 
 const u16 gBattleFrontierTrainerMons_Todd[] = 
 {
-    267,
-    273,
-    305,
-    312,
-    325,
-    332,
-    352,
-    662,
-    665,
-    668,
-    669,
-    670,
-    672,
-    673,
-    676,
-    677,
-    679,
-    680,
-    682,
-    688,
-    697,
-    698,
-    699,
-    700,
-    707,
-    710,
-    718,
-    720,
-    724,
-    725,
-    728,
-    730,
-    731,
-    732,
-    734,
-    735,
-    744,
-    748,
-    750,
-    751,
-    -1 
+    FRONTIER_MONS_POKEFAN_3
 };
 
 const u16 gBattleFrontierTrainerMons_Gavin[] = 
 {
-    267,
-    273,
-    305,
-    312,
-    325,
-    332,
-    352,
-    662,
-    665,
-    668,
-    669,
-    670,
-    672,
-    673,
-    676,
-    677,
-    679,
-    680,
-    682,
-    688,
-    697,
-    698,
-    699,
-    700,
-    707,
-    710,
-    718,
-    720,
-    724,
-    725,
-    728,
-    730,
-    731,
-    732,
-    734,
-    735,
-    744,
-    748,
-    750,
-    751,
-    -1 
+    FRONTIER_MONS_POKEFAN_3
 };
 
 const u16 gBattleFrontierTrainerMons_Malory[] = 
 {
-    267,
-    273,
-    305,
-    312,
-    325,
-    332,
-    352,
-    662,
-    665,
-    668,
-    669,
-    670,
-    672,
-    673,
-    676,
-    677,
-    679,
-    680,
-    682,
-    688,
-    697,
-    698,
-    699,
-    700,
-    707,
-    710,
-    718,
-    720,
-    724,
-    725,
-    728,
-    730,
-    731,
-    732,
-    734,
-    735,
-    744,
-    748,
-    750,
-    751,
-    -1 
+    FRONTIER_MONS_POKEFAN_3
 };
 
 const u16 gBattleFrontierTrainerMons_Esther[] = 
 {
-    267,
-    273,
-    305,
-    312,
-    325,
-    332,
-    352,
-    662,
-    665,
-    668,
-    669,
-    670,
-    672,
-    673,
-    676,
-    677,
-    679,
-    680,
-    682,
-    688,
-    697,
-    698,
-    699,
-    700,
-    707,
-    710,
-    718,
-    720,
-    724,
-    725,
-    728,
-    730,
-    731,
-    732,
-    734,
-    735,
-    744,
-    748,
-    750,
-    751,
-    -1 
+    FRONTIER_MONS_POKEFAN_3
 };
 
 const u16 gBattleFrontierTrainerMons_Oscar[] = 
 {
-    726,
-    727,
-    728,
-    729,
-    730,
-    731,
-    732,
-    733,
-    734,
-    735,
-    736,
-    737,
-    738,
-    739,
-    740,
-    741,
-    742,
-    743,
-    744,
-    745,
-    746,
-    747,
-    748,
-    749,
-    750,
-    751,
-    752,
-    753,
-    754,
-    755,
-    -1 
+    FRONTIER_MONS_PKMN_BREEDER_2
 };
 
 const u16 gBattleFrontierTrainerMons_Wilson[] = 
 {
-    726,
-    727,
-    728,
-    729,
-    730,
-    731,
-    732,
-    733,
-    734,
-    735,
-    736,
-    737,
-    738,
-    739,
-    740,
-    741,
-    742,
-    743,
-    744,
-    745,
-    746,
-    747,
-    748,
-    749,
-    750,
-    751,
-    752,
-    753,
-    754,
-    755,
-    -1 
+    FRONTIER_MONS_PKMN_BREEDER_2
 };
 
 const u16 gBattleFrontierTrainerMons_Clare[] = 
 {
-    726,
-    727,
-    728,
-    729,
-    730,
-    731,
-    732,
-    733,
-    734,
-    735,
-    736,
-    737,
-    738,
-    739,
-    740,
-    741,
-    742,
-    743,
-    744,
-    745,
-    746,
-    747,
-    748,
-    749,
-    750,
-    751,
-    752,
-    753,
-    754,
-    755,
-    -1 
+    FRONTIER_MONS_PKMN_BREEDER_2
 };
 
 const u16 gBattleFrontierTrainerMons_Tess[] = 
 {
-    726,
-    727,
-    728,
-    729,
-    730,
-    731,
-    732,
-    733,
-    734,
-    735,
-    736,
-    737,
-    738,
-    739,
-    740,
-    741,
-    742,
-    743,
-    744,
-    745,
-    746,
-    747,
-    748,
-    749,
-    750,
-    751,
-    752,
-    753,
-    754,
-    755,
-    -1 
+    FRONTIER_MONS_PKMN_BREEDER_2
 };
 
 const u16 gBattleFrontierTrainerMons_Leon[] = 
 {
-    420,
-    421,
-    422,
-    423,
-    424,
-    425,
-    426,
-    427,
-    428,
-    429,
-    430,
-    431,
-    432,
-    433,
-    434,
-    435,
-    436,
-    437,
-    438,
-    439,
-    440,
-    441,
-    442,
-    443,
-    516,
-    517,
-    518,
-    519,
-    520,
-    521,
-    522,
-    523,
-    524,
-    525,
-    526,
-    527,
-    528,
-    529,
-    530,
-    531,
-    532,
-    533,
-    534,
-    535,
-    536,
-    537,
-    538,
-    539,
-    612,
-    613,
-    614,
-    615,
-    616,
-    617,
-    618,
-    619,
-    620,
-    621,
-    622,
-    623,
-    624,
-    625,
-    626,
-    627,
-    628,
-    629,
-    630,
-    631,
-    632,
-    633,
-    634,
-    635,
-    708,
-    709,
-    710,
-    711,
-    712,
-    713,
-    714,
-    715,
-    716,
-    717,
-    718,
-    719,
-    720,
-    721,
-    722,
-    723,
-    724,
-    725,
-    726,
-    727,
-    728,
-    729,
-    730,
-    731,
-    -1 
+    FRONTIER_MONS_COOLTRAINER_M_2A
 };
 
 const u16 gBattleFrontierTrainerMons_Alonzo[] = 
 {
-    444,
-    445,
-    446,
-    447,
-    448,
-    449,
-    450,
-    451,
-    452,
-    453,
-    454,
-    455,
-    456,
-    457,
-    458,
-    459,
-    460,
-    461,
-    462,
-    463,
-    464,
-    465,
-    466,
-    467,
-    540,
-    541,
-    542,
-    543,
-    544,
-    545,
-    546,
-    547,
-    548,
-    549,
-    550,
-    551,
-    552,
-    553,
-    554,
-    555,
-    556,
-    557,
-    558,
-    559,
-    560,
-    561,
-    562,
-    563,
-    636,
-    637,
-    638,
-    639,
-    640,
-    641,
-    642,
-    643,
-    644,
-    645,
-    646,
-    647,
-    648,
-    649,
-    650,
-    651,
-    652,
-    653,
-    654,
-    655,
-    656,
-    657,
-    658,
-    659,
-    732,
-    733,
-    734,
-    735,
-    736,
-    737,
-    738,
-    739,
-    740,
-    741,
-    742,
-    743,
-    744,
-    745,
-    746,
-    747,
-    748,
-    749,
-    750,
-    751,
-    752,
-    753,
-    754,
-    755,
-    -1 
+    FRONTIER_MONS_COOLTRAINER_M_2B
 };
 
 const u16 gBattleFrontierTrainerMons_Vince[] = 
 {
-    421,
-    425,
-    431,
-    437,
-    439,
-    456,
-    460,
-    465,
-    466,
-    517,
-    521,
-    527,
-    533,
-    535,
-    552,
-    556,
-    561,
-    562,
-    613,
-    617,
-    623,
-    629,
-    631,
-    648,
-    652,
-    657,
-    658,
-    709,
-    713,
-    719,
-    725,
-    727,
-    744,
-    748,
-    753,
-    754,
-    766,
-    777,
-    788,
-    799,
-    800,
-    801,
-    802,
-    803,
-    804,
-    805,
-    806,
-    807,
-    808,
-    809,
-    810,
-    811,
-    812,
-    813,
-    814,
-    815,
-    816,
-    817,
-    818,
-    819,
-    820,
-    821,
-    822,
-    823,
-    824,
-    825,
-    826,
-    827,
-    828,
-    829,
-    830,
-    831,
-    832,
-    833,
-    834,
-    835,
-    846,
-    847,
-    848,
-    849,
-    850,
-    851,
-    852,
-    853,
-    854,
-    855,
-    856,
-    857,
-    858,
-    859,
-    860,
-    861,
-    862,
-    863,
-    864,
-    865,
-    866,
-    867,
-    868,
-    869,
-    -1 
+    FRONTIER_MONS_COOLTRAINER_2C(LATIOS)
 };
 
 const u16 gBattleFrontierTrainerMons_Bryon[] = 
 {
-    756,
-    757,
-    758,
-    759,
-    760,
-    761,
-    762,
-    763,
-    764,
-    766,
-    767,
-    768,
-    769,
-    770,
-    771,
-    772,
-    773,
-    774,
-    775,
-    777,
-    778,
-    779,
-    780,
-    781,
-    782,
-    783,
-    784,
-    785,
-    786,
-    788,
-    789,
-    790,
-    791,
-    792,
-    793,
-    794,
-    795,
-    796,
-    797,
-    799,
-    836,
-    837,
-    838,
-    839,
-    840,
-    841,
-    846,
-    847,
-    848,
-    849,
-    850,
-    851,
-    852,
-    853,
-    854,
-    855,
-    856,
-    857,
-    858,
-    859,
-    860,
-    861,
-    862,
-    863,
-    864,
-    865,
-    866,
-    867,
-    868,
-    869,
-    870,
-    871,
-    872,
-    873,
-    874,
-    875,
-    876,
-    877,
-    878,
-    879,
-    880,
-    881,
-    -1 
+    FRONTIER_MONS_COOLTRAINER_2D(LATIOS)
 };
 
 const u16 gBattleFrontierTrainerMons_Ava[] = 
 {
-    372,
-    373,
-    374,
-    375,
-    376,
-    377,
-    378,
-    379,
-    380,
-    381,
-    382,
-    383,
-    384,
-    385,
-    386,
-    387,
-    388,
-    389,
-    390,
-    391,
-    392,
-    393,
-    394,
-    395,
-    468,
-    469,
-    470,
-    471,
-    472,
-    473,
-    474,
-    475,
-    476,
-    477,
-    478,
-    479,
-    480,
-    481,
-    482,
-    483,
-    484,
-    485,
-    486,
-    487,
-    488,
-    489,
-    490,
-    491,
-    564,
-    565,
-    566,
-    567,
-    568,
-    569,
-    570,
-    571,
-    572,
-    573,
-    574,
-    575,
-    576,
-    577,
-    578,
-    579,
-    580,
-    581,
-    582,
-    583,
-    584,
-    585,
-    586,
-    587,
-    660,
-    661,
-    662,
-    663,
-    664,
-    665,
-    666,
-    667,
-    668,
-    669,
-    670,
-    671,
-    672,
-    673,
-    674,
-    675,
-    676,
-    677,
-    678,
-    679,
-    680,
-    681,
-    682,
-    683,
-    -1 
+    FRONTIER_MONS_COOLTRAINER_F_2A
 };
 
 const u16 gBattleFrontierTrainerMons_Miriam[] = 
 {
-    396,
-    397,
-    398,
-    399,
-    400,
-    401,
-    402,
-    403,
-    404,
-    405,
-    406,
-    407,
-    408,
-    409,
-    410,
-    411,
-    412,
-    413,
-    414,
-    415,
-    416,
-    417,
-    418,
-    419,
-    492,
-    493,
-    494,
-    495,
-    496,
-    497,
-    498,
-    499,
-    500,
-    501,
-    502,
-    503,
-    504,
-    505,
-    506,
-    507,
-    508,
-    509,
-    510,
-    511,
-    512,
-    513,
-    514,
-    515,
-    588,
-    589,
-    590,
-    591,
-    592,
-    593,
-    594,
-    595,
-    596,
-    597,
-    598,
-    599,
-    600,
-    601,
-    602,
-    603,
-    604,
-    605,
-    606,
-    607,
-    608,
-    609,
-    610,
-    611,
-    684,
-    685,
-    686,
-    687,
-    688,
-    689,
-    690,
-    691,
-    692,
-    693,
-    694,
-    695,
-    696,
-    697,
-    698,
-    699,
-    700,
-    701,
-    702,
-    703,
-    704,
-    705,
-    706,
-    707,
-    -1 
+    FRONTIER_MONS_COOLTRAINER_F_2B
 };
 
 const u16 gBattleFrontierTrainerMons_Carrie[] = 
 {
-    421,
-    425,
-    431,
-    437,
-    439,
-    456,
-    460,
-    465,
-    466,
-    517,
-    521,
-    527,
-    533,
-    535,
-    552,
-    556,
-    561,
-    562,
-    613,
-    617,
-    623,
-    629,
-    631,
-    648,
-    652,
-    657,
-    658,
-    709,
-    713,
-    719,
-    725,
-    727,
-    744,
-    748,
-    753,
-    754,
-    765,
-    776,
-    787,
-    798,
-    800,
-    801,
-    802,
-    803,
-    804,
-    805,
-    806,
-    807,
-    808,
-    809,
-    810,
-    811,
-    812,
-    813,
-    814,
-    815,
-    816,
-    817,
-    818,
-    819,
-    820,
-    821,
-    822,
-    823,
-    824,
-    825,
-    826,
-    827,
-    828,
-    829,
-    830,
-    831,
-    832,
-    833,
-    834,
-    835,
-    842,
-    843,
-    844,
-    845,
-    850,
-    851,
-    852,
-    853,
-    854,
-    855,
-    856,
-    857,
-    858,
-    859,
-    860,
-    861,
-    862,
-    863,
-    864,
-    865,
-    866,
-    867,
-    868,
-    869,
-    -1 
+    FRONTIER_MONS_COOLTRAINER_2C(LATIAS)
 };
 
 const u16 gBattleFrontierTrainerMons_Gillian2[] = 
 {
-    756,
-    757,
-    758,
-    759,
-    760,
-    761,
-    762,
-    763,
-    764,
-    765,
-    767,
-    768,
-    769,
-    770,
-    771,
-    772,
-    773,
-    774,
-    775,
-    776,
-    778,
-    779,
-    780,
-    781,
-    782,
-    783,
-    784,
-    785,
-    786,
-    787,
-    789,
-    790,
-    791,
-    792,
-    793,
-    794,
-    795,
-    796,
-    797,
-    798,
-    836,
-    837,
-    838,
-    839,
-    840,
-    841,
-    842,
-    843,
-    844,
-    845,
-    850,
-    851,
-    852,
-    853,
-    854,
-    855,
-    856,
-    857,
-    858,
-    859,
-    860,
-    861,
-    862,
-    863,
-    864,
-    865,
-    866,
-    867,
-    868,
-    869,
-    870,
-    871,
-    872,
-    873,
-    874,
-    875,
-    876,
-    877,
-    878,
-    879,
-    880,
-    881,
-    -1 
+    FRONTIER_MONS_COOLTRAINER_2D(LATIAS)
 };
 
 const u16 gBattleFrontierTrainerMons_Tyler[] = 
 {
-    660,
-    661,
-    662,
-    663,
-    664,
-    665,
-    666,
-    667,
-    668,
-    669,
-    670,
-    671,
-    672,
-    673,
-    674,
-    675,
-    676,
-    677,
-    678,
-    679,
-    680,
-    681,
-    682,
-    683,
-    684,
-    685,
-    686,
-    687,
-    688,
-    689,
-    690,
-    691,
-    692,
-    693,
-    694,
-    695,
-    696,
-    697,
-    698,
-    699,
-    700,
-    701,
-    702,
-    703,
-    704,
-    705,
-    706,
-    707,
-    708,
-    709,
-    710,
-    711,
-    712,
-    713,
-    714,
-    715,
-    716,
-    717,
-    718,
-    719,
-    720,
-    721,
-    722,
-    723,
-    724,
-    725,
-    726,
-    727,
-    728,
-    729,
-    730,
-    731,
-    732,
-    733,
-    734,
-    735,
-    736,
-    737,
-    738,
-    739,
-    740,
-    741,
-    742,
-    743,
-    744,
-    745,
-    746,
-    747,
-    748,
-    749,
-    750,
-    751,
-    752,
-    753,
-    754,
-    755,
-    -1 
+    FRONTIER_MONS_GENERAL_A
 };
 
 const u16 gBattleFrontierTrainerMons_Chaz[] = 
 {
-    564,
-    565,
-    566,
-    567,
-    568,
-    569,
-    570,
-    571,
-    572,
-    573,
-    574,
-    575,
-    576,
-    577,
-    578,
-    579,
-    580,
-    581,
-    582,
-    583,
-    584,
-    585,
-    586,
-    587,
-    588,
-    589,
-    590,
-    591,
-    592,
-    593,
-    594,
-    595,
-    596,
-    597,
-    598,
-    599,
-    600,
-    601,
-    602,
-    603,
-    604,
-    605,
-    606,
-    607,
-    608,
-    609,
-    610,
-    611,
-    612,
-    613,
-    614,
-    615,
-    616,
-    617,
-    618,
-    619,
-    620,
-    621,
-    622,
-    623,
-    624,
-    625,
-    626,
-    627,
-    628,
-    629,
-    630,
-    631,
-    632,
-    633,
-    634,
-    635,
-    636,
-    637,
-    638,
-    639,
-    640,
-    641,
-    642,
-    643,
-    644,
-    645,
-    646,
-    647,
-    648,
-    649,
-    650,
-    651,
-    652,
-    653,
-    654,
-    655,
-    656,
-    657,
-    658,
-    659,
-    -1 
+    FRONTIER_MONS_GENERAL_B
 };
 
 const u16 gBattleFrontierTrainerMons_Nelson[] = 
 {
-    756,
-    757,
-    758,
-    759,
-    760,
-    761,
-    762,
-    763,
-    764,
-    766,
-    767,
-    768,
-    769,
-    770,
-    771,
-    772,
-    773,
-    774,
-    775,
-    777,
-    778,
-    779,
-    780,
-    781,
-    782,
-    783,
-    784,
-    785,
-    786,
-    788,
-    789,
-    790,
-    791,
-    792,
-    793,
-    794,
-    795,
-    796,
-    797,
-    799,
-    836,
-    837,
-    838,
-    839,
-    840,
-    841,
-    846,
-    847,
-    848,
-    849,
-    850,
-    851,
-    852,
-    853,
-    854,
-    855,
-    856,
-    857,
-    858,
-    859,
-    860,
-    861,
-    862,
-    863,
-    864,
-    865,
-    866,
-    867,
-    868,
-    869,
-    870,
-    871,
-    872,
-    873,
-    874,
-    875,
-    876,
-    877,
-    878,
-    879,
-    880,
-    881,
-    -1 
+    FRONTIER_MONS_COOLTRAINER_2D(LATIOS)
 };
 
 const u16 gBattleFrontierTrainerMons_Shania[] = 
 {
-    468,
-    469,
-    470,
-    471,
-    472,
-    473,
-    474,
-    475,
-    476,
-    477,
-    478,
-    479,
-    480,
-    481,
-    482,
-    483,
-    484,
-    485,
-    486,
-    487,
-    488,
-    489,
-    490,
-    491,
-    492,
-    493,
-    494,
-    495,
-    496,
-    497,
-    498,
-    499,
-    500,
-    501,
-    502,
-    503,
-    504,
-    505,
-    506,
-    507,
-    508,
-    509,
-    510,
-    511,
-    512,
-    513,
-    514,
-    515,
-    516,
-    517,
-    518,
-    519,
-    520,
-    521,
-    522,
-    523,
-    524,
-    525,
-    526,
-    527,
-    528,
-    529,
-    530,
-    531,
-    532,
-    533,
-    534,
-    535,
-    536,
-    537,
-    538,
-    539,
-    540,
-    541,
-    542,
-    543,
-    544,
-    545,
-    546,
-    547,
-    548,
-    549,
-    550,
-    551,
-    552,
-    553,
-    554,
-    555,
-    556,
-    557,
-    558,
-    559,
-    560,
-    561,
-    562,
-    563,
-    -1 
+    FRONTIER_MONS_GENERAL_C
 };
 
 const u16 gBattleFrontierTrainerMons_Stella[] = 
 {
-    372,
-    373,
-    374,
-    375,
-    376,
-    377,
-    378,
-    379,
-    380,
-    381,
-    382,
-    383,
-    384,
-    385,
-    386,
-    387,
-    388,
-    389,
-    390,
-    391,
-    392,
-    393,
-    394,
-    395,
-    396,
-    397,
-    398,
-    399,
-    400,
-    401,
-    402,
-    403,
-    404,
-    405,
-    406,
-    407,
-    408,
-    409,
-    410,
-    411,
-    412,
-    413,
-    414,
-    415,
-    416,
-    417,
-    418,
-    419,
-    420,
-    421,
-    422,
-    423,
-    424,
-    425,
-    426,
-    427,
-    428,
-    429,
-    430,
-    431,
-    432,
-    433,
-    434,
-    435,
-    436,
-    437,
-    438,
-    439,
-    440,
-    441,
-    442,
-    443,
-    444,
-    445,
-    446,
-    447,
-    448,
-    449,
-    450,
-    451,
-    452,
-    453,
-    454,
-    455,
-    456,
-    457,
-    458,
-    459,
-    460,
-    461,
-    462,
-    463,
-    464,
-    465,
-    466,
-    467,
-    -1 
+    FRONTIER_MONS_GENERAL_D
 };
 
 const u16 gBattleFrontierTrainerMons_Dorine[] = 
 {
-    756,
-    757,
-    758,
-    759,
-    760,
-    761,
-    762,
-    763,
-    764,
-    765,
-    767,
-    768,
-    769,
-    770,
-    771,
-    772,
-    773,
-    774,
-    775,
-    776,
-    778,
-    779,
-    780,
-    781,
-    782,
-    783,
-    784,
-    785,
-    786,
-    787,
-    789,
-    790,
-    791,
-    792,
-    793,
-    794,
-    795,
-    796,
-    797,
-    798,
-    836,
-    837,
-    838,
-    839,
-    840,
-    841,
-    842,
-    843,
-    844,
-    845,
-    850,
-    851,
-    852,
-    853,
-    854,
-    855,
-    856,
-    857,
-    858,
-    859,
-    860,
-    861,
-    862,
-    863,
-    864,
-    865,
-    866,
-    867,
-    868,
-    869,
-    870,
-    871,
-    872,
-    873,
-    874,
-    875,
-    876,
-    877,
-    878,
-    879,
-    880,
-    881,
-    -1 
+    FRONTIER_MONS_COOLTRAINER_2D(LATIAS)
 };
 
 const u16 gBattleFrontierTrainerMons_Maddox[] = 
 {
-    403,
-    412,
-    413,
-    414,
-    433,
-    435,
-    440,
-    450,
-    454,
-    456,
-    459,
-    461,
-    463,
-    465,
-    499,
-    508,
-    509,
-    510,
-    529,
-    531,
-    536,
-    546,
-    550,
-    552,
-    555,
-    557,
-    559,
-    561,
-    595,
-    604,
-    605,
-    606,
-    625,
-    627,
-    632,
-    642,
-    646,
-    648,
-    651,
-    653,
-    655,
-    657,
-    691,
-    700,
-    701,
-    702,
-    721,
-    723,
-    728,
-    738,
-    742,
-    744,
-    747,
-    749,
-    751,
-    753,
-    765,
-    766,
-    776,
-    777,
-    787,
-    788,
-    798,
-    799,
-    828,
-    829,
-    830,
-    831,
-    842,
-    843,
-    844,
-    845,
-    846,
-    847,
-    848,
-    849,
-    850,
-    851,
-    852,
-    853,
-    854,
-    855,
-    856,
-    857,
-    858,
-    859,
-    860,
-    861,
-    862,
-    863,
-    864,
-    865,
-    866,
-    867,
-    868,
-    869,
-    -1 
+    FRONTIER_MONS_DRAGON_TAMER_2
 };
 
 const u16 gBattleFrontierTrainerMons_Davin[] = 
 {
-    403,
-    412,
-    413,
-    414,
-    433,
-    435,
-    440,
-    450,
-    454,
-    456,
-    459,
-    461,
-    463,
-    465,
-    499,
-    508,
-    509,
-    510,
-    529,
-    531,
-    536,
-    546,
-    550,
-    552,
-    555,
-    557,
-    559,
-    561,
-    595,
-    604,
-    605,
-    606,
-    625,
-    627,
-    632,
-    642,
-    646,
-    648,
-    651,
-    653,
-    655,
-    657,
-    691,
-    700,
-    701,
-    702,
-    721,
-    723,
-    728,
-    738,
-    742,
-    744,
-    747,
-    749,
-    751,
-    753,
-    765,
-    766,
-    776,
-    777,
-    787,
-    788,
-    798,
-    799,
-    828,
-    829,
-    830,
-    831,
-    842,
-    843,
-    844,
-    845,
-    846,
-    847,
-    848,
-    849,
-    850,
-    851,
-    852,
-    853,
-    854,
-    855,
-    856,
-    857,
-    858,
-    859,
-    860,
-    861,
-    862,
-    863,
-    864,
-    865,
-    866,
-    867,
-    868,
-    869,
-    -1 
+    FRONTIER_MONS_DRAGON_TAMER_2
 };
 
 const u16 gBattleFrontierTrainerMons_Trevon[] = 
 {
-    403,
-    412,
-    413,
-    414,
-    433,
-    435,
-    440,
-    450,
-    454,
-    456,
-    459,
-    461,
-    463,
-    465,
-    499,
-    508,
-    509,
-    510,
-    529,
-    531,
-    536,
-    546,
-    550,
-    552,
-    555,
-    557,
-    559,
-    561,
-    595,
-    604,
-    605,
-    606,
-    625,
-    627,
-    632,
-    642,
-    646,
-    648,
-    651,
-    653,
-    655,
-    657,
-    691,
-    700,
-    701,
-    702,
-    721,
-    723,
-    728,
-    738,
-    742,
-    744,
-    747,
-    749,
-    751,
-    753,
-    765,
-    766,
-    776,
-    777,
-    787,
-    788,
-    798,
-    799,
-    828,
-    829,
-    830,
-    831,
-    842,
-    843,
-    844,
-    845,
-    846,
-    847,
-    848,
-    849,
-    850,
-    851,
-    852,
-    853,
-    854,
-    855,
-    856,
-    857,
-    858,
-    859,
-    860,
-    861,
-    862,
-    863,
-    864,
-    865,
-    866,
-    867,
-    868,
-    869,
-    -1 
+    FRONTIER_MONS_DRAGON_TAMER_2
 };
 
 const u16 gBattleFrontierTrainerMons_Mateo[] = 
 {
-    373,
-    382,
-    390,
-    402,
-    403,
-    416,
-    417,
-    424,
-    431,
-    432,
-    435,
-    450,
-    451,
-    469,
-    480,
-    486,
-    498,
-    499,
-    512,
-    513,
-    520,
-    527,
-    528,
-    531,
-    546,
-    547,
-    565,
-    574,
-    582,
-    594,
-    595,
-    608,
-    609,
-    616,
-    623,
-    624,
-    627,
-    642,
-    643,
-    661,
-    670,
-    678,
-    690,
-    691,
-    704,
-    705,
-    712,
-    719,
-    720,
-    723,
-    738,
-    739,
-    808,
-    809,
-    810,
-    811,
-    -1 
+    FRONTIER_MONS_BLACK_BELT_2A
 };
 
 const u16 gBattleFrontierTrainerMons_Bret[] = 
 {
-    373,
-    382,
-    390,
-    415,
-    419,
-    424,
-    426,
-    430,
-    431,
-    444,
-    451,
-    454,
-    455,
-    464,
-    469,
-    480,
-    486,
-    511,
-    515,
-    520,
-    522,
-    526,
-    527,
-    540,
-    547,
-    550,
-    551,
-    560,
-    565,
-    574,
-    582,
-    607,
-    611,
-    616,
-    618,
-    622,
-    623,
-    636,
-    643,
-    646,
-    647,
-    656,
-    661,
-    670,
-    678,
-    703,
-    707,
-    712,
-    714,
-    718,
-    719,
-    732,
-    739,
-    742,
-    743,
-    752,
-    808,
-    809,
-    810,
-    811,
-    -1 
+    FRONTIER_MONS_BLACK_BELT_BATTLE_GIRL_2B
 };
 
 const u16 gBattleFrontierTrainerMons_Raul[] = 
 {
-    373,
-    382,
-    383,
-    386,
-    390,
-    423,
-    424,
-    431,
-    433,
-    450,
-    451,
-    466,
-    469,
-    480,
-    481,
-    482,
-    486,
-    519,
-    520,
-    527,
-    529,
-    546,
-    547,
-    562,
-    565,
-    574,
-    575,
-    578,
-    582,
-    615,
-    616,
-    623,
-    625,
-    642,
-    643,
-    658,
-    661,
-    670,
-    671,
-    674,
-    678,
-    711,
-    712,
-    719,
-    721,
-    738,
-    739,
-    754,
-    808,
-    809,
-    810,
-    811,
-    832,
-    833,
-    834,
-    835,
-    -1 
+    FRONTIER_MONS_BLACK_BELT_BATTLE_GIRL_2C
 };
 
 const u16 gBattleFrontierTrainerMons_Kay[] = 
 {
-    373,
-    382,
-    387,
-    390,
-    402,
-    403,
-    413,
-    414,
-    424,
-    427,
-    431,
-    433,
-    451,
-    469,
-    470,
-    480,
-    486,
-    498,
-    499,
-    509,
-    510,
-    520,
-    523,
-    527,
-    529,
-    547,
-    565,
-    574,
-    579,
-    582,
-    594,
-    595,
-    605,
-    606,
-    616,
-    619,
-    623,
-    625,
-    643,
-    661,
-    670,
-    675,
-    678,
-    690,
-    691,
-    701,
-    702,
-    712,
-    715,
-    719,
-    721,
-    739,
-    808,
-    809,
-    810,
-    811,
-    -1 
+    FRONTIER_MONS_BATTLE_GIRL_2A
 };
 
 const u16 gBattleFrontierTrainerMons_Elena[] = 
 {
-    373,
-    382,
-    390,
-    415,
-    419,
-    424,
-    426,
-    430,
-    431,
-    444,
-    451,
-    454,
-    455,
-    464,
-    469,
-    480,
-    486,
-    511,
-    515,
-    520,
-    522,
-    526,
-    527,
-    540,
-    547,
-    550,
-    551,
-    560,
-    565,
-    574,
-    582,
-    607,
-    611,
-    616,
-    618,
-    622,
-    623,
-    636,
-    643,
-    646,
-    647,
-    656,
-    661,
-    670,
-    678,
-    703,
-    707,
-    712,
-    714,
-    718,
-    719,
-    732,
-    739,
-    742,
-    743,
-    752,
-    808,
-    809,
-    810,
-    811,
-    -1 
+    FRONTIER_MONS_BLACK_BELT_BATTLE_GIRL_2B
 };
 
 const u16 gBattleFrontierTrainerMons_Alana[] = 
 {
-    373,
-    382,
-    383,
-    386,
-    390,
-    423,
-    424,
-    431,
-    433,
-    450,
-    451,
-    466,
-    469,
-    480,
-    481,
-    482,
-    486,
-    519,
-    520,
-    527,
-    529,
-    546,
-    547,
-    562,
-    565,
-    574,
-    575,
-    578,
-    582,
-    615,
-    616,
-    623,
-    625,
-    642,
-    643,
-    658,
-    661,
-    670,
-    671,
-    674,
-    678,
-    711,
-    712,
-    719,
-    721,
-    738,
-    739,
-    754,
-    808,
-    809,
-    810,
-    811,
-    832,
-    833,
-    834,
-    835,
-    -1 
+    FRONTIER_MONS_BLACK_BELT_BATTLE_GIRL_2C
 };
 
 const u16 gBattleFrontierTrainerMons_Alexas[] = 
 {
-    382,
-    387,
-    403,
-    423,
-    424,
-    425,
-    431,
-    433,
-    435,
-    450,
-    459,
-    461,
-    465,
-    466,
-    470,
-    480,
-    499,
-    519,
-    520,
-    521,
-    527,
-    529,
-    531,
-    546,
-    555,
-    557,
-    561,
-    562,
-    574,
-    579,
-    595,
-    615,
-    616,
-    617,
-    623,
-    625,
-    627,
-    642,
-    651,
-    653,
-    657,
-    658,
-    670,
-    675,
-    691,
-    711,
-    712,
-    713,
-    719,
-    721,
-    723,
-    738,
-    747,
-    749,
-    753,
-    754,
-    762,
-    763,
-    764,
-    773,
-    774,
-    775,
-    784,
-    785,
-    786,
-    795,
-    796,
-    797,
-    804,
-    805,
-    806,
-    807,
-    808,
-    809,
-    810,
-    811,
-    828,
-    829,
-    830,
-    831,
-    832,
-    833,
-    834,
-    835,
-    836,
-    837,
-    838,
-    839,
-    840,
-    841,
-    860,
-    861,
-    862,
-    863,
-    864,
-    865,
-    866,
-    867,
-    868,
-    869,
-    -1 
+    FRONTIER_MONS_EXPERT_2A(TYRANITAR)
 };
 
 const u16 gBattleFrontierTrainerMons_Weston[] = 
 {
-    374,
-    377,
-    404,
-    421,
-    422,
-    426,
-    437,
-    439,
-    446,
-    451,
-    453,
-    457,
-    458,
-    472,
-    475,
-    500,
-    517,
-    518,
-    522,
-    533,
-    535,
-    542,
-    547,
-    549,
-    553,
-    554,
-    566,
-    569,
-    596,
-    613,
-    614,
-    618,
-    629,
-    631,
-    638,
-    643,
-    645,
-    649,
-    650,
-    662,
-    665,
-    692,
-    709,
-    710,
-    714,
-    725,
-    727,
-    734,
-    739,
-    741,
-    745,
-    746,
-    762,
-    763,
-    764,
-    766,
-    773,
-    774,
-    775,
-    777,
-    784,
-    785,
-    786,
-    788,
-    795,
-    796,
-    797,
-    799,
-    800,
-    801,
-    802,
-    803,
-    812,
-    813,
-    814,
-    815,
-    816,
-    817,
-    818,
-    819,
-    836,
-    837,
-    838,
-    839,
-    840,
-    841,
-    846,
-    847,
-    848,
-    849,
-    860,
-    861,
-    862,
-    863,
-    864,
-    865,
-    866,
-    867,
-    868,
-    869,
-    -1 
+    FRONTIER_MONS_EXPERT_2B(LATIOS)
 };
 
 const u16 gBattleFrontierTrainerMons_Jasper[] = 
 {
-    378,
-    388,
-    400,
-    409,
-    410,
-    411,
-    416,
-    429,
-    432,
-    438,
-    447,
-    452,
-    456,
-    460,
-    462,
-    463,
-    471,
-    476,
-    496,
-    505,
-    506,
-    507,
-    512,
-    525,
-    528,
-    534,
-    543,
-    548,
-    552,
-    556,
-    558,
-    559,
-    570,
-    580,
-    592,
-    601,
-    602,
-    603,
-    608,
-    621,
-    624,
-    630,
-    639,
-    644,
-    648,
-    652,
-    654,
-    655,
-    666,
-    676,
-    688,
-    697,
-    698,
-    699,
-    704,
-    717,
-    720,
-    726,
-    735,
-    740,
-    744,
-    748,
-    750,
-    751,
-    762,
-    763,
-    764,
-    773,
-    774,
-    775,
-    784,
-    785,
-    786,
-    795,
-    796,
-    797,
-    820,
-    821,
-    822,
-    823,
-    824,
-    825,
-    826,
-    827,
-    836,
-    837,
-    838,
-    839,
-    840,
-    841,
-    860,
-    861,
-    862,
-    863,
-    864,
-    865,
-    866,
-    867,
-    868,
-    869,
-    -1 
+    FRONTIER_MONS_EXPERT_2C(TYRANITAR)
 };
 
 const u16 gBattleFrontierTrainerMons_Nadia[] = 
 {
-    382,
-    387,
-    403,
-    423,
-    424,
-    425,
-    431,
-    433,
-    435,
-    450,
-    459,
-    461,
-    465,
-    466,
-    470,
-    480,
-    499,
-    519,
-    520,
-    521,
-    527,
-    529,
-    531,
-    546,
-    555,
-    557,
-    561,
-    562,
-    574,
-    579,
-    595,
-    615,
-    616,
-    617,
-    623,
-    625,
-    627,
-    642,
-    651,
-    653,
-    657,
-    658,
-    670,
-    675,
-    691,
-    711,
-    712,
-    713,
-    719,
-    721,
-    723,
-    738,
-    747,
-    749,
-    753,
-    754,
-    762,
-    763,
-    764,
-    773,
-    774,
-    775,
-    784,
-    785,
-    786,
-    795,
-    796,
-    797,
-    804,
-    805,
-    806,
-    807,
-    808,
-    809,
-    810,
-    811,
-    828,
-    829,
-    830,
-    831,
-    832,
-    833,
-    834,
-    835,
-    836,
-    837,
-    838,
-    839,
-    840,
-    841,
-    850,
-    851,
-    852,
-    853,
-    854,
-    855,
-    856,
-    857,
-    858,
-    859,
-    -1 
+    FRONTIER_MONS_EXPERT_2A(DRAGONITE)
 };
 
 const u16 gBattleFrontierTrainerMons_Miranda[] = 
 {
-    374,
-    377,
-    404,
-    421,
-    422,
-    426,
-    437,
-    439,
-    446,
-    451,
-    453,
-    457,
-    458,
-    472,
-    475,
-    500,
-    517,
-    518,
-    522,
-    533,
-    535,
-    542,
-    547,
-    549,
-    553,
-    554,
-    566,
-    569,
-    596,
-    613,
-    614,
-    618,
-    629,
-    631,
-    638,
-    643,
-    645,
-    649,
-    650,
-    662,
-    665,
-    692,
-    709,
-    710,
-    714,
-    725,
-    727,
-    734,
-    739,
-    741,
-    745,
-    746,
-    762,
-    763,
-    764,
-    765,
-    773,
-    774,
-    775,
-    776,
-    784,
-    785,
-    786,
-    787,
-    795,
-    796,
-    797,
-    798,
-    800,
-    801,
-    802,
-    803,
-    812,
-    813,
-    814,
-    815,
-    816,
-    817,
-    818,
-    819,
-    836,
-    837,
-    838,
-    839,
-    840,
-    841,
-    842,
-    843,
-    844,
-    845,
-    860,
-    861,
-    862,
-    863,
-    864,
-    865,
-    866,
-    867,
-    868,
-    869,
-    -1 
+    FRONTIER_MONS_EXPERT_2B(LATIAS)
 };
 
 const u16 gBattleFrontierTrainerMons_Emma[] = 
 {
-    378,
-    388,
-    400,
-    409,
-    410,
-    411,
-    416,
-    429,
-    432,
-    438,
-    447,
-    452,
-    456,
-    460,
-    462,
-    463,
-    471,
-    476,
-    496,
-    505,
-    506,
-    507,
-    512,
-    525,
-    528,
-    534,
-    543,
-    548,
-    552,
-    556,
-    558,
-    559,
-    570,
-    580,
-    592,
-    601,
-    602,
-    603,
-    608,
-    621,
-    624,
-    630,
-    639,
-    644,
-    648,
-    652,
-    654,
-    655,
-    666,
-    676,
-    688,
-    697,
-    698,
-    699,
-    704,
-    717,
-    720,
-    726,
-    735,
-    740,
-    744,
-    748,
-    750,
-    751,
-    762,
-    763,
-    764,
-    773,
-    774,
-    775,
-    784,
-    785,
-    786,
-    795,
-    796,
-    797,
-    820,
-    821,
-    822,
-    823,
-    824,
-    825,
-    826,
-    827,
-    836,
-    837,
-    838,
-    839,
-    840,
-    841,
-    850,
-    851,
-    852,
-    853,
-    854,
-    855,
-    856,
-    857,
-    858,
-    859,
-    -1 
+    FRONTIER_MONS_EXPERT_2C(DRAGONITE)
 };
 
 const u16 gBattleFrontierTrainerMons_Rolando[] = 
 {
-    185,
-    290,
-    377,
-    380,
-    385,
-    401,
-    404,
-    409,
-    410,
-    428,
-    437,
-    438,
-    439,
-    446,
-    466,
-    475,
-    478,
-    484,
-    497,
-    500,
-    505,
-    506,
-    524,
-    533,
-    534,
-    535,
-    542,
-    562,
-    569,
-    572,
-    577,
-    593,
-    596,
-    601,
-    602,
-    620,
-    629,
-    630,
-    631,
-    638,
-    658,
-    665,
-    668,
-    673,
-    689,
-    692,
-    697,
-    698,
-    716,
-    725,
-    726,
-    727,
-    734,
-    754,
-    756,
-    757,
-    758,
-    766,
-    767,
-    768,
-    769,
-    777,
-    778,
-    779,
-    780,
-    788,
-    789,
-    790,
-    791,
-    799,
-    812,
-    813,
-    814,
-    815,
-    816,
-    817,
-    818,
-    819,
-    832,
-    833,
-    834,
-    835,
-    846,
-    847,
-    848,
-    849,
-    870,
-    871,
-    872,
-    873,
-    874,
-    875,
-    -1 
+    FRONTIER_MONS_PSYCHIC_2A(LATIOS)
 };
 
 const u16 gBattleFrontierTrainerMons_Stanly[] = 
 {
-    185,
-    290,
-    377,
-    380,
-    385,
-    401,
-    404,
-    409,
-    410,
-    428,
-    437,
-    438,
-    439,
-    446,
-    466,
-    475,
-    478,
-    484,
-    497,
-    500,
-    505,
-    506,
-    524,
-    533,
-    534,
-    535,
-    542,
-    562,
-    569,
-    572,
-    577,
-    593,
-    596,
-    601,
-    602,
-    620,
-    629,
-    630,
-    631,
-    638,
-    658,
-    665,
-    668,
-    673,
-    689,
-    692,
-    697,
-    698,
-    716,
-    725,
-    726,
-    727,
-    734,
-    754,
-    759,
-    760,
-    761,
-    766,
-    770,
-    771,
-    772,
-    777,
-    781,
-    782,
-    783,
-    788,
-    792,
-    793,
-    794,
-    799,
-    812,
-    813,
-    814,
-    815,
-    816,
-    817,
-    818,
-    819,
-    832,
-    833,
-    834,
-    835,
-    846,
-    847,
-    848,
-    849,
-    876,
-    877,
-    878,
-    879,
-    880,
-    881,
-    -1 
+    FRONTIER_MONS_PSYCHIC_2B(LATIOS)
 };
 
 const u16 gBattleFrontierTrainerMons_Dario[] = 
 {
-    185,
-    290,
-    377,
-    380,
-    385,
-    401,
-    404,
-    409,
-    410,
-    428,
-    437,
-    438,
-    439,
-    446,
-    466,
-    475,
-    478,
-    484,
-    497,
-    500,
-    505,
-    506,
-    524,
-    533,
-    534,
-    535,
-    542,
-    562,
-    569,
-    572,
-    577,
-    593,
-    596,
-    601,
-    602,
-    620,
-    629,
-    630,
-    631,
-    638,
-    658,
-    665,
-    668,
-    673,
-    689,
-    692,
-    697,
-    698,
-    716,
-    725,
-    726,
-    727,
-    734,
-    754,
-    762,
-    763,
-    764,
-    766,
-    773,
-    774,
-    775,
-    777,
-    784,
-    785,
-    786,
-    788,
-    795,
-    796,
-    797,
-    799,
-    812,
-    813,
-    814,
-    815,
-    816,
-    817,
-    818,
-    819,
-    832,
-    833,
-    834,
-    835,
-    836,
-    837,
-    838,
-    839,
-    840,
-    841,
-    846,
-    847,
-    848,
-    849,
-    -1 
+    FRONTIER_MONS_PSYCHIC_2C(LATIOS)
 };
 
 const u16 gBattleFrontierTrainerMons_Karlee[] = 
 {
-    185,
-    290,
-    377,
-    380,
-    385,
-    401,
-    404,
-    409,
-    410,
-    428,
-    437,
-    438,
-    439,
-    446,
-    466,
-    475,
-    478,
-    484,
-    497,
-    500,
-    505,
-    506,
-    524,
-    533,
-    534,
-    535,
-    542,
-    562,
-    569,
-    572,
-    577,
-    593,
-    596,
-    601,
-    602,
-    620,
-    629,
-    630,
-    631,
-    638,
-    658,
-    665,
-    668,
-    673,
-    689,
-    692,
-    697,
-    698,
-    716,
-    725,
-    726,
-    727,
-    734,
-    754,
-    756,
-    757,
-    758,
-    765,
-    767,
-    768,
-    769,
-    776,
-    778,
-    779,
-    780,
-    787,
-    789,
-    790,
-    791,
-    798,
-    812,
-    813,
-    814,
-    815,
-    816,
-    817,
-    818,
-    819,
-    832,
-    833,
-    834,
-    835,
-    842,
-    843,
-    844,
-    845,
-    870,
-    871,
-    872,
-    873,
-    874,
-    875,
-    -1 
+    FRONTIER_MONS_PSYCHIC_2A(LATIAS)
 };
 
 const u16 gBattleFrontierTrainerMons_Jaylin[] = 
 {
-    185,
-    290,
-    377,
-    380,
-    385,
-    401,
-    404,
-    409,
-    410,
-    428,
-    437,
-    438,
-    439,
-    446,
-    466,
-    475,
-    478,
-    484,
-    497,
-    500,
-    505,
-    506,
-    524,
-    533,
-    534,
-    535,
-    542,
-    562,
-    569,
-    572,
-    577,
-    593,
-    596,
-    601,
-    602,
-    620,
-    629,
-    630,
-    631,
-    638,
-    658,
-    665,
-    668,
-    673,
-    689,
-    692,
-    697,
-    698,
-    716,
-    725,
-    726,
-    727,
-    734,
-    754,
-    759,
-    760,
-    761,
-    765,
-    770,
-    771,
-    772,
-    776,
-    781,
-    782,
-    783,
-    787,
-    792,
-    793,
-    794,
-    798,
-    812,
-    813,
-    814,
-    815,
-    816,
-    817,
-    818,
-    819,
-    832,
-    833,
-    834,
-    835,
-    842,
-    843,
-    844,
-    845,
-    876,
-    877,
-    878,
-    879,
-    880,
-    881,
-    -1 
+    FRONTIER_MONS_PSYCHIC_2B(LATIAS)
 };
 
 const u16 gBattleFrontierTrainerMons_Ingrid[] = 
 {
-    185,
-    290,
-    377,
-    380,
-    385,
-    401,
-    404,
-    409,
-    410,
-    428,
-    437,
-    438,
-    439,
-    446,
-    466,
-    475,
-    478,
-    484,
-    497,
-    500,
-    505,
-    506,
-    524,
-    533,
-    534,
-    535,
-    542,
-    562,
-    569,
-    572,
-    577,
-    593,
-    596,
-    601,
-    602,
-    620,
-    629,
-    630,
-    631,
-    638,
-    658,
-    665,
-    668,
-    673,
-    689,
-    692,
-    697,
-    698,
-    716,
-    725,
-    726,
-    727,
-    734,
-    754,
-    762,
-    763,
-    764,
-    765,
-    773,
-    774,
-    775,
-    776,
-    784,
-    785,
-    786,
-    787,
-    795,
-    796,
-    797,
-    798,
-    812,
-    813,
-    814,
-    815,
-    816,
-    817,
-    818,
-    819,
-    832,
-    833,
-    834,
-    835,
-    836,
-    837,
-    838,
-    839,
-    840,
-    841,
-    842,
-    843,
-    844,
-    845,
-    -1 
+    FRONTIER_MONS_PSYCHIC_2C(LATIAS)
 };
 
 const u16 gBattleFrontierTrainerMons_Delilah[] = 
 {
-    347,
-    352,
-    374,
-    378,
-    398,
-    421,
-    426,
-    447,
-    472,
-    476,
-    494,
-    517,
-    522,
-    543,
-    566,
-    570,
-    590,
-    613,
-    618,
-    639,
-    662,
-    666,
-    686,
-    709,
-    714,
-    735,
-    800,
-    801,
-    802,
-    803,
-    -1 
+    FRONTIER_MONS_HEX_MANIAC_2A
 };
 
 const u16 gBattleFrontierTrainerMons_Carly[] = 
 {
-    344,
-    374,
-    378,
-    394,
-    395,
-    405,
-    413,
-    414,
-    420,
-    421,
-    434,
-    441,
-    457,
-    472,
-    476,
-    490,
-    491,
-    501,
-    509,
-    510,
-    516,
-    517,
-    530,
-    537,
-    553,
-    566,
-    570,
-    586,
-    587,
-    597,
-    605,
-    606,
-    612,
-    613,
-    626,
-    633,
-    649,
-    662,
-    666,
-    682,
-    683,
-    693,
-    701,
-    702,
-    708,
-    709,
-    722,
-    729,
-    745,
-    800,
-    801,
-    802,
-    803,
-    -1 
+    FRONTIER_MONS_HEX_MANIAC_2B
 };
 
 const u16 gBattleFrontierTrainerMons_Lexie[] = 
 {
-    344,
-    347,
-    352,
-    394,
-    395,
-    398,
-    405,
-    413,
-    414,
-    420,
-    421,
-    426,
-    434,
-    441,
-    447,
-    457,
-    490,
-    491,
-    494,
-    501,
-    509,
-    510,
-    516,
-    517,
-    522,
-    530,
-    537,
-    543,
-    553,
-    586,
-    587,
-    590,
-    597,
-    605,
-    606,
-    612,
-    613,
-    618,
-    626,
-    633,
-    639,
-    649,
-    682,
-    683,
-    686,
-    693,
-    701,
-    702,
-    708,
-    709,
-    714,
-    722,
-    729,
-    735,
-    745,
-    800,
-    801,
-    802,
-    803,
-    -1 
+    FRONTIER_MONS_HEX_MANIAC_2C
 };
 
 const u16 gBattleFrontierTrainerMons_Miller[] = 
 {
-    345,
-    376,
-    386,
-    387,
-    397,
-    399,
-    402,
-    403,
-    406,
-    408,
-    411,
-    413,
-    414,
-    425,
-    427,
-    429,
-    433,
-    435,
-    440,
-    441,
-    445,
-    448,
-    449,
-    450,
-    452,
-    454,
-    456,
-    458,
-    459,
-    460,
-    462,
-    465,
-    466,
-    467,
-    470,
-    474,
-    482,
-    493,
-    495,
-    498,
-    499,
-    502,
-    504,
-    507,
-    509,
-    510,
-    521,
-    523,
-    525,
-    529,
-    531,
-    536,
-    537,
-    541,
-    544,
-    545,
-    546,
-    548,
-    550,
-    552,
-    554,
-    555,
-    556,
-    558,
-    561,
-    562,
-    563,
-    850,
-    851,
-    852,
-    853,
-    854,
-    855,
-    856,
-    857,
-    858,
-    859,
-    860,
-    861,
-    862,
-    863,
-    864,
-    865,
-    866,
-    867,
-    868,
-    869,
-    -1 
+    FRONTIER_MONS_POKEMANIAC_2A
 };
 
 const u16 gBattleFrontierTrainerMons_Marv[] = 
 {
-    345,
-    568,
-    578,
-    579,
-    589,
-    591,
-    594,
-    595,
-    598,
-    600,
-    603,
-    605,
-    606,
-    617,
-    619,
-    621,
-    625,
-    627,
-    632,
-    633,
-    637,
-    640,
-    641,
-    642,
-    644,
-    646,
-    648,
-    650,
-    651,
-    652,
-    654,
-    657,
-    658,
-    659,
-    664,
-    674,
-    675,
-    685,
-    687,
-    690,
-    691,
-    694,
-    696,
-    699,
-    701,
-    702,
-    713,
-    715,
-    717,
-    721,
-    723,
-    728,
-    729,
-    733,
-    736,
-    737,
-    738,
-    740,
-    742,
-    744,
-    746,
-    747,
-    748,
-    750,
-    753,
-    754,
-    755,
-    850,
-    851,
-    852,
-    853,
-    854,
-    855,
-    856,
-    857,
-    858,
-    859,
-    860,
-    861,
-    862,
-    863,
-    864,
-    865,
-    866,
-    867,
-    868,
-    869,
-    -1 
+    FRONTIER_MONS_POKEMANIAC_2B
 };
 
 const u16 gBattleFrontierTrainerMons_Layton[] = 
 {
-    345,
-    425,
-    433,
-    435,
-    445,
-    450,
-    454,
-    456,
-    458,
-    459,
-    460,
-    465,
-    466,
-    521,
-    529,
-    531,
-    541,
-    546,
-    550,
-    552,
-    554,
-    555,
-    556,
-    561,
-    562,
-    617,
-    625,
-    627,
-    637,
-    642,
-    646,
-    648,
-    650,
-    651,
-    652,
-    657,
-    658,
-    713,
-    721,
-    723,
-    733,
-    738,
-    742,
-    744,
-    746,
-    747,
-    748,
-    753,
-    754,
-    804,
-    805,
-    806,
-    807,
-    820,
-    821,
-    822,
-    823,
-    824,
-    825,
-    826,
-    827,
-    828,
-    829,
-    830,
-    831,
-    832,
-    833,
-    834,
-    835,
-    850,
-    851,
-    852,
-    853,
-    854,
-    855,
-    856,
-    857,
-    858,
-    859,
-    860,
-    861,
-    862,
-    863,
-    864,
-    865,
-    866,
-    867,
-    868,
-    869,
-    -1 
+    FRONTIER_MONS_POKEMANIAC_2C
 };
 
 const u16 gBattleFrontierTrainerMons_Brooks[] = 
 {
-    660,
-    661,
-    662,
-    663,
-    664,
-    665,
-    666,
-    667,
-    668,
-    669,
-    670,
-    671,
-    672,
-    673,
-    674,
-    675,
-    676,
-    677,
-    678,
-    679,
-    680,
-    681,
-    682,
-    683,
-    684,
-    685,
-    686,
-    687,
-    688,
-    689,
-    690,
-    691,
-    692,
-    693,
-    694,
-    695,
-    696,
-    697,
-    698,
-    699,
-    700,
-    701,
-    702,
-    703,
-    704,
-    705,
-    706,
-    707,
-    708,
-    709,
-    710,
-    711,
-    712,
-    713,
-    714,
-    715,
-    716,
-    717,
-    718,
-    719,
-    720,
-    721,
-    722,
-    723,
-    724,
-    725,
-    726,
-    727,
-    728,
-    729,
-    730,
-    731,
-    732,
-    733,
-    734,
-    735,
-    736,
-    737,
-    738,
-    739,
-    740,
-    741,
-    742,
-    743,
-    744,
-    745,
-    746,
-    747,
-    748,
-    749,
-    750,
-    751,
-    752,
-    753,
-    754,
-    755,
-    -1 
+    FRONTIER_MONS_GENERAL_A
 };
 
 const u16 gBattleFrontierTrainerMons_Gregory[] = 
 {
-    421,
-    425,
-    431,
-    437,
-    439,
-    456,
-    460,
-    465,
-    466,
-    517,
-    521,
-    527,
-    533,
-    535,
-    552,
-    556,
-    561,
-    562,
-    613,
-    617,
-    623,
-    629,
-    631,
-    648,
-    652,
-    657,
-    658,
-    709,
-    713,
-    719,
-    725,
-    727,
-    744,
-    748,
-    753,
-    754,
-    765,
-    766,
-    776,
-    777,
-    787,
-    788,
-    798,
-    799,
-    800,
-    801,
-    802,
-    803,
-    804,
-    805,
-    806,
-    807,
-    808,
-    809,
-    810,
-    811,
-    812,
-    813,
-    814,
-    815,
-    816,
-    817,
-    818,
-    819,
-    820,
-    821,
-    822,
-    823,
-    824,
-    825,
-    826,
-    827,
-    828,
-    829,
-    830,
-    831,
-    832,
-    833,
-    834,
-    835,
-    850,
-    851,
-    852,
-    853,
-    854,
-    855,
-    856,
-    857,
-    858,
-    859,
-    860,
-    861,
-    862,
-    863,
-    864,
-    865,
-    866,
-    867,
-    868,
-    869,
-    -1 
+    FRONTIER_MONS_GENTLEMAN_3A
 };
 
 const u16 gBattleFrontierTrainerMons_Reese[] = 
 {
-    756,
-    757,
-    758,
-    759,
-    760,
-    761,
-    762,
-    763,
-    764,
-    765,
-    766,
-    767,
-    768,
-    769,
-    770,
-    771,
-    772,
-    773,
-    774,
-    775,
-    776,
-    777,
-    778,
-    779,
-    780,
-    781,
-    782,
-    783,
-    784,
-    785,
-    786,
-    787,
-    788,
-    789,
-    790,
-    791,
-    792,
-    793,
-    794,
-    795,
-    796,
-    797,
-    798,
-    799,
-    836,
-    837,
-    838,
-    839,
-    840,
-    841,
-    842,
-    843,
-    844,
-    845,
-    846,
-    847,
-    848,
-    849,
-    850,
-    851,
-    852,
-    853,
-    854,
-    855,
-    856,
-    857,
-    858,
-    859,
-    860,
-    861,
-    862,
-    863,
-    864,
-    865,
-    866,
-    867,
-    868,
-    869,
-    870,
-    871,
-    872,
-    873,
-    874,
-    875,
-    876,
-    877,
-    878,
-    879,
-    880,
-    881,
-    -1 
+    FRONTIER_MONS_GENTLEMAN_3B
 };
 
 const u16 gBattleFrontierTrainerMons_Mason[] = 
 {
-    660,
-    661,
-    662,
-    663,
-    664,
-    665,
-    666,
-    667,
-    668,
-    669,
-    670,
-    671,
-    672,
-    673,
-    674,
-    675,
-    676,
-    677,
-    678,
-    679,
-    680,
-    681,
-    682,
-    683,
-    684,
-    685,
-    686,
-    687,
-    688,
-    689,
-    690,
-    691,
-    692,
-    693,
-    694,
-    695,
-    696,
-    697,
-    698,
-    699,
-    700,
-    701,
-    702,
-    703,
-    704,
-    705,
-    706,
-    707,
-    708,
-    709,
-    710,
-    711,
-    712,
-    713,
-    714,
-    715,
-    716,
-    717,
-    718,
-    719,
-    720,
-    721,
-    722,
-    723,
-    724,
-    725,
-    726,
-    727,
-    728,
-    729,
-    730,
-    731,
-    732,
-    733,
-    734,
-    735,
-    736,
-    737,
-    738,
-    739,
-    740,
-    741,
-    742,
-    743,
-    744,
-    745,
-    746,
-    747,
-    748,
-    749,
-    750,
-    751,
-    752,
-    753,
-    754,
-    755,
-    -1 
+    FRONTIER_MONS_GENERAL_A
 };
 
 const u16 gBattleFrontierTrainerMons_Toby[] = 
 {
-    564,
-    565,
-    566,
-    567,
-    568,
-    569,
-    570,
-    571,
-    572,
-    573,
-    574,
-    575,
-    576,
-    577,
-    578,
-    579,
-    580,
-    581,
-    582,
-    583,
-    584,
-    585,
-    586,
-    587,
-    588,
-    589,
-    590,
-    591,
-    592,
-    593,
-    594,
-    595,
-    596,
-    597,
-    598,
-    599,
-    600,
-    601,
-    602,
-    603,
-    604,
-    605,
-    606,
-    607,
-    608,
-    609,
-    610,
-    611,
-    612,
-    613,
-    614,
-    615,
-    616,
-    617,
-    618,
-    619,
-    620,
-    621,
-    622,
-    623,
-    624,
-    625,
-    626,
-    627,
-    628,
-    629,
-    630,
-    631,
-    632,
-    633,
-    634,
-    635,
-    636,
-    637,
-    638,
-    639,
-    640,
-    641,
-    642,
-    643,
-    644,
-    645,
-    646,
-    647,
-    648,
-    649,
-    650,
-    651,
-    652,
-    653,
-    654,
-    655,
-    656,
-    657,
-    658,
-    659,
-    -1 
+    FRONTIER_MONS_GENERAL_B
 };
 
 const u16 gBattleFrontierTrainerMons_Dorothy[] = 
 {
-    468,
-    469,
-    470,
-    471,
-    472,
-    473,
-    474,
-    475,
-    476,
-    477,
-    478,
-    479,
-    480,
-    481,
-    482,
-    483,
-    484,
-    485,
-    486,
-    487,
-    488,
-    489,
-    490,
-    491,
-    492,
-    493,
-    494,
-    495,
-    496,
-    497,
-    498,
-    499,
-    500,
-    501,
-    502,
-    503,
-    504,
-    505,
-    506,
-    507,
-    508,
-    509,
-    510,
-    511,
-    512,
-    513,
-    514,
-    515,
-    516,
-    517,
-    518,
-    519,
-    520,
-    521,
-    522,
-    523,
-    524,
-    525,
-    526,
-    527,
-    528,
-    529,
-    530,
-    531,
-    532,
-    533,
-    534,
-    535,
-    536,
-    537,
-    538,
-    539,
-    540,
-    541,
-    542,
-    543,
-    544,
-    545,
-    546,
-    547,
-    548,
-    549,
-    550,
-    551,
-    552,
-    553,
-    554,
-    555,
-    556,
-    557,
-    558,
-    559,
-    560,
-    561,
-    562,
-    563,
-    -1 
+    FRONTIER_MONS_GENERAL_C
 };
 
 const u16 gBattleFrontierTrainerMons_Piper[] = 
 {
-    372,
-    373,
-    374,
-    375,
-    376,
-    377,
-    378,
-    379,
-    380,
-    381,
-    382,
-    383,
-    384,
-    385,
-    386,
-    387,
-    388,
-    389,
-    390,
-    391,
-    392,
-    393,
-    394,
-    395,
-    396,
-    397,
-    398,
-    399,
-    400,
-    401,
-    402,
-    403,
-    404,
-    405,
-    406,
-    407,
-    408,
-    409,
-    410,
-    411,
-    412,
-    413,
-    414,
-    415,
-    416,
-    417,
-    418,
-    419,
-    420,
-    421,
-    422,
-    423,
-    424,
-    425,
-    426,
-    427,
-    428,
-    429,
-    430,
-    431,
-    432,
-    433,
-    434,
-    435,
-    436,
-    437,
-    438,
-    439,
-    440,
-    441,
-    442,
-    443,
-    444,
-    445,
-    446,
-    447,
-    448,
-    449,
-    450,
-    451,
-    452,
-    453,
-    454,
-    455,
-    456,
-    457,
-    458,
-    459,
-    460,
-    461,
-    462,
-    463,
-    464,
-    465,
-    466,
-    467,
-    -1 
+    FRONTIER_MONS_GENERAL_D
 };
 
 const u16 gBattleFrontierTrainerMons_Finn[] = 
 {
-    317,
-    371,
-    373,
-    377,
-    390,
-    392,
-    399,
-    431,
-    452,
-    456,
-    469,
-    475,
-    486,
-    488,
-    495,
-    527,
-    548,
-    552,
-    565,
-    569,
-    573,
-    576,
-    580,
-    582,
-    584,
-    591,
-    592,
-    601,
-    602,
-    610,
-    621,
-    623,
-    626,
-    631,
-    634,
-    640,
-    641,
-    644,
-    648,
-    650,
-    651,
-    653,
-    655,
-    661,
-    665,
-    669,
-    672,
-    676,
-    678,
-    680,
-    687,
-    688,
-    697,
-    698,
-    706,
-    717,
-    719,
-    722,
-    727,
-    730,
-    736,
-    737,
-    740,
-    744,
-    746,
-    747,
-    749,
-    751,
-    808,
-    809,
-    810,
-    811,
-    816,
-    817,
-    818,
-    819,
-    820,
-    821,
-    822,
-    823,
-    -1 
+    FRONTIER_MONS_SWIMMING_TRIATHLETE_M_3
 };
 
 const u16 gBattleFrontierTrainerMons_Samir[] = 
 {
-    317,
-    371,
-    373,
-    377,
-    390,
-    392,
-    399,
-    431,
-    452,
-    456,
-    469,
-    475,
-    486,
-    488,
-    495,
-    527,
-    548,
-    552,
-    565,
-    569,
-    573,
-    576,
-    580,
-    582,
-    584,
-    591,
-    592,
-    601,
-    602,
-    610,
-    621,
-    623,
-    626,
-    631,
-    634,
-    640,
-    641,
-    644,
-    648,
-    650,
-    651,
-    653,
-    655,
-    661,
-    665,
-    669,
-    672,
-    676,
-    678,
-    680,
-    687,
-    688,
-    697,
-    698,
-    706,
-    717,
-    719,
-    722,
-    727,
-    730,
-    736,
-    737,
-    740,
-    744,
-    746,
-    747,
-    749,
-    751,
-    808,
-    809,
-    810,
-    811,
-    816,
-    817,
-    818,
-    819,
-    820,
-    821,
-    822,
-    823,
-    -1 
+    FRONTIER_MONS_SWIMMING_TRIATHLETE_M_3
 };
 
 const u16 gBattleFrontierTrainerMons_Fiona[] = 
 {
-    317,
-    371,
-    373,
-    377,
-    381,
-    384,
-    388,
-    390,
-    392,
-    399,
-    400,
-    409,
-    410,
-    418,
-    429,
-    431,
-    434,
-    439,
-    442,
-    448,
-    449,
-    452,
-    456,
-    458,
-    459,
-    461,
-    463,
-    469,
-    471,
-    475,
-    479,
-    483,
-    486,
-    488,
-    495,
-    496,
-    505,
-    506,
-    514,
-    525,
-    527,
-    530,
-    535,
-    538,
-    544,
-    545,
-    548,
-    552,
-    554,
-    555,
-    557,
-    559,
-    565,
-    569,
-    582,
-    584,
-    591,
-    623,
-    644,
-    648,
-    661,
-    665,
-    678,
-    680,
-    687,
-    719,
-    740,
-    744,
-    808,
-    809,
-    810,
-    811,
-    816,
-    817,
-    818,
-    819,
-    820,
-    821,
-    822,
-    823,
-    -1 
+    FRONTIER_MONS_SWIMMING_TRIATHLETE_F_3
 };
 
 const u16 gBattleFrontierTrainerMons_Gloria[] = 
 {
-    317,
-    371,
-    373,
-    377,
-    381,
-    384,
-    388,
-    390,
-    392,
-    399,
-    400,
-    409,
-    410,
-    418,
-    429,
-    431,
-    434,
-    439,
-    442,
-    448,
-    449,
-    452,
-    456,
-    458,
-    459,
-    461,
-    463,
-    469,
-    471,
-    475,
-    479,
-    483,
-    486,
-    488,
-    495,
-    496,
-    505,
-    506,
-    514,
-    525,
-    527,
-    530,
-    535,
-    538,
-    544,
-    545,
-    548,
-    552,
-    554,
-    555,
-    557,
-    559,
-    565,
-    569,
-    582,
-    584,
-    591,
-    623,
-    644,
-    648,
-    661,
-    665,
-    678,
-    680,
-    687,
-    719,
-    740,
-    744,
-    808,
-    809,
-    810,
-    811,
-    816,
-    817,
-    818,
-    819,
-    820,
-    821,
-    822,
-    823,
-    -1 
+    FRONTIER_MONS_SWIMMING_TRIATHLETE_F_3
 };
 
 const u16 gBattleFrontierTrainerMons_Nico[] = 
 {
-    660,
-    661,
-    662,
-    663,
-    664,
-    665,
-    666,
-    667,
-    668,
-    669,
-    670,
-    671,
-    672,
-    673,
-    674,
-    675,
-    676,
-    677,
-    678,
-    679,
-    680,
-    681,
-    682,
-    683,
-    684,
-    685,
-    686,
-    687,
-    688,
-    689,
-    690,
-    691,
-    692,
-    693,
-    694,
-    695,
-    696,
-    697,
-    698,
-    699,
-    700,
-    701,
-    702,
-    703,
-    704,
-    705,
-    706,
-    707,
-    708,
-    709,
-    710,
-    711,
-    712,
-    713,
-    714,
-    715,
-    716,
-    717,
-    718,
-    719,
-    720,
-    721,
-    722,
-    723,
-    724,
-    725,
-    726,
-    727,
-    728,
-    729,
-    730,
-    731,
-    732,
-    733,
-    734,
-    735,
-    736,
-    737,
-    738,
-    739,
-    740,
-    741,
-    742,
-    743,
-    744,
-    745,
-    746,
-    747,
-    748,
-    749,
-    750,
-    751,
-    752,
-    753,
-    754,
-    755,
-    -1 
+    FRONTIER_MONS_GENERAL_A
 };
 
 const u16 gBattleFrontierTrainerMons_Jeremy[] = 
 {
-    564,
-    565,
-    566,
-    567,
-    568,
-    569,
-    570,
-    571,
-    572,
-    573,
-    574,
-    575,
-    576,
-    577,
-    578,
-    579,
-    580,
-    581,
-    582,
-    583,
-    584,
-    585,
-    586,
-    587,
-    588,
-    589,
-    590,
-    591,
-    592,
-    593,
-    594,
-    595,
-    596,
-    597,
-    598,
-    599,
-    600,
-    601,
-    602,
-    603,
-    604,
-    605,
-    606,
-    607,
-    608,
-    609,
-    610,
-    611,
-    612,
-    613,
-    614,
-    615,
-    616,
-    617,
-    618,
-    619,
-    620,
-    621,
-    622,
-    623,
-    624,
-    625,
-    626,
-    627,
-    628,
-    629,
-    630,
-    631,
-    632,
-    633,
-    634,
-    635,
-    636,
-    637,
-    638,
-    639,
-    640,
-    641,
-    642,
-    643,
-    644,
-    645,
-    646,
-    647,
-    648,
-    649,
-    650,
-    651,
-    652,
-    653,
-    654,
-    655,
-    656,
-    657,
-    658,
-    659,
-    -1 
+    FRONTIER_MONS_GENERAL_B
 };
 
 const u16 gBattleFrontierTrainerMons_Caitlin[] = 
 {
-    468,
-    469,
-    470,
-    471,
-    472,
-    473,
-    474,
-    475,
-    476,
-    477,
-    478,
-    479,
-    480,
-    481,
-    482,
-    483,
-    484,
-    485,
-    486,
-    487,
-    488,
-    489,
-    490,
-    491,
-    492,
-    493,
-    494,
-    495,
-    496,
-    497,
-    498,
-    499,
-    500,
-    501,
-    502,
-    503,
-    504,
-    505,
-    506,
-    507,
-    508,
-    509,
-    510,
-    511,
-    512,
-    513,
-    514,
-    515,
-    516,
-    517,
-    518,
-    519,
-    520,
-    521,
-    522,
-    523,
-    524,
-    525,
-    526,
-    527,
-    528,
-    529,
-    530,
-    531,
-    532,
-    533,
-    534,
-    535,
-    536,
-    537,
-    538,
-    539,
-    540,
-    541,
-    542,
-    543,
-    544,
-    545,
-    546,
-    547,
-    548,
-    549,
-    550,
-    551,
-    552,
-    553,
-    554,
-    555,
-    556,
-    557,
-    558,
-    559,
-    560,
-    561,
-    562,
-    563,
-    -1 
+    FRONTIER_MONS_GENERAL_C
 };
 
 const u16 gBattleFrontierTrainerMons_Reena[] = 
 {
-    372,
-    373,
-    374,
-    375,
-    376,
-    377,
-    378,
-    379,
-    380,
-    381,
-    382,
-    383,
-    384,
-    385,
-    386,
-    387,
-    388,
-    389,
-    390,
-    391,
-    392,
-    393,
-    394,
-    395,
-    396,
-    397,
-    398,
-    399,
-    400,
-    401,
-    402,
-    403,
-    404,
-    405,
-    406,
-    407,
-    408,
-    409,
-    410,
-    411,
-    412,
-    413,
-    414,
-    415,
-    416,
-    417,
-    418,
-    419,
-    420,
-    421,
-    422,
-    423,
-    424,
-    425,
-    426,
-    427,
-    428,
-    429,
-    430,
-    431,
-    432,
-    433,
-    434,
-    435,
-    436,
-    437,
-    438,
-    439,
-    440,
-    441,
-    442,
-    443,
-    444,
-    445,
-    446,
-    447,
-    448,
-    449,
-    450,
-    451,
-    452,
-    453,
-    454,
-    455,
-    456,
-    457,
-    458,
-    459,
-    460,
-    461,
-    462,
-    463,
-    464,
-    465,
-    466,
-    467,
-    -1 
+    FRONTIER_MONS_GENERAL_D
 };
 
 const u16 gBattleFrontierTrainerMons_Avery[] = 
 {
-    21,
-    238,
-    282,
-    303,
-    331,
-    343,
-    368,
-    369,
-    383,
-    417,
-    423,
-    424,
-    432,
-    481,
-    513,
-    519,
-    520,
-    528,
-    575,
-    609,
-    615,
-    616,
-    624,
-    671,
-    705,
-    711,
-    712,
-    720,
-    -1 
+    FRONTIER_MONS_BUG_MANIAC_4
 };
 
 const u16 gBattleFrontierTrainerMons_Liam[] = 
 {
-    21,
-    238,
-    282,
-    303,
-    331,
-    343,
-    368,
-    369,
-    383,
-    417,
-    423,
-    424,
-    432,
-    481,
-    513,
-    519,
-    520,
-    528,
-    575,
-    609,
-    615,
-    616,
-    624,
-    671,
-    705,
-    711,
-    712,
-    720,
-    -1 
+    FRONTIER_MONS_BUG_MANIAC_4
 };
 
 const u16 gBattleFrontierTrainerMons_Theo[] = 
 {
-    333,
-    347,
-    350,
-    354,
-    358,
-    361,
-    362,
-    363,
-    364,
-    371,
-    381,
-    384,
-    429,
-    434,
-    439,
-    479,
-    483,
-    525,
-    530,
-    535,
-    573,
-    576,
-    621,
-    626,
-    631,
-    669,
-    672,
-    717,
-    722,
-    727,
-    816,
-    817,
-    818,
-    819,
-    -1 
+    FRONTIER_MONS_FISHERMAN_3
 };
 
 const u16 gBattleFrontierTrainerMons_Bailey[] = 
 {
-    333,
-    347,
-    350,
-    354,
-    358,
-    361,
-    362,
-    363,
-    364,
-    371,
-    381,
-    384,
-    429,
-    434,
-    439,
-    479,
-    483,
-    525,
-    530,
-    535,
-    573,
-    576,
-    621,
-    626,
-    631,
-    669,
-    672,
-    717,
-    722,
-    727,
-    816,
-    817,
-    818,
-    819,
-    -1 
+    FRONTIER_MONS_FISHERMAN_3
 };
 
 const u16 gBattleFrontierTrainerMons_Hugo[] = 
 {
-    383,
-    386,
-    402,
-    403,
-    416,
-    417,
-    423,
-    432,
-    433,
-    435,
-    450,
-    466,
-    481,
-    482,
-    498,
-    499,
-    512,
-    513,
-    519,
-    528,
-    529,
-    531,
-    546,
-    562,
-    575,
-    578,
-    594,
-    595,
-    608,
-    609,
-    615,
-    624,
-    625,
-    627,
-    642,
-    658,
-    671,
-    674,
-    690,
-    691,
-    704,
-    705,
-    711,
-    720,
-    721,
-    723,
-    738,
-    754,
-    762,
-    763,
-    764,
-    773,
-    774,
-    775,
-    784,
-    785,
-    786,
-    795,
-    796,
-    797,
-    832,
-    833,
-    834,
-    835,
-    836,
-    837,
-    838,
-    839,
-    840,
-    841,
-    -1 
+    FRONTIER_MONS_RUIN_MANIAC_4
 };
 
 const u16 gBattleFrontierTrainerMons_Bryce[] = 
 {
-    383,
-    386,
-    402,
-    403,
-    416,
-    417,
-    423,
-    432,
-    433,
-    435,
-    450,
-    466,
-    481,
-    482,
-    498,
-    499,
-    512,
-    513,
-    519,
-    528,
-    529,
-    531,
-    546,
-    562,
-    575,
-    578,
-    594,
-    595,
-    608,
-    609,
-    615,
-    624,
-    625,
-    627,
-    642,
-    658,
-    671,
-    674,
-    690,
-    691,
-    704,
-    705,
-    711,
-    720,
-    721,
-    723,
-    738,
-    754,
-    762,
-    763,
-    764,
-    773,
-    774,
-    775,
-    784,
-    785,
-    786,
-    795,
-    796,
-    797,
-    832,
-    833,
-    834,
-    835,
-    836,
-    837,
-    838,
-    839,
-    840,
-    841,
-    -1 
+    FRONTIER_MONS_RUIN_MANIAC_4
 };
 
 const u16 gBattleFrontierTrainerMons_Gideon[] = 
 {
-    441,
-    445,
-    448,
-    449,
-    451,
-    453,
-    454,
-    455,
-    458,
-    537,
-    541,
-    544,
-    545,
-    547,
-    549,
-    550,
-    551,
-    554,
-    633,
-    637,
-    640,
-    641,
-    643,
-    645,
-    646,
-    647,
-    650,
-    729,
-    733,
-    736,
-    737,
-    739,
-    741,
-    742,
-    743,
-    746,
-    -1 
+    FRONTIER_MONS_COLLECTOR_3
 };
 
 const u16 gBattleFrontierTrainerMons_Triston[] = 
 {
-    441,
-    445,
-    448,
-    449,
-    451,
-    453,
-    454,
-    455,
-    458,
-    537,
-    541,
-    544,
-    545,
-    547,
-    549,
-    550,
-    551,
-    554,
-    633,
-    637,
-    640,
-    641,
-    643,
-    645,
-    646,
-    647,
-    650,
-    729,
-    733,
-    736,
-    737,
-    739,
-    741,
-    742,
-    743,
-    746,
-    -1 
+    FRONTIER_MONS_COLLECTOR_3
 };
 
 const u16 gBattleFrontierTrainerMons_Charles[] = 
 {
-    352,
-    381,
-    391,
-    393,
-    396,
-    398,
-    407,
-    422,
-    426,
-    443,
-    447,
-    479,
-    487,
-    489,
-    492,
-    494,
-    503,
-    518,
-    522,
-    539,
-    543,
-    573,
-    583,
-    585,
-    588,
-    590,
-    599,
-    614,
-    618,
-    635,
-    639,
-    669,
-    679,
-    681,
-    684,
-    686,
-    695,
-    710,
-    714,
-    731,
-    735,
-    756,
-    757,
-    758,
-    767,
-    768,
-    769,
-    778,
-    779,
-    780,
-    789,
-    790,
-    791,
-    870,
-    871,
-    872,
-    873,
-    874,
-    875,
-    -1 
+    FRONTIER_MONS_GUITARIST_3A
 };
 
 const u16 gBattleFrontierTrainerMons_Raymond[] = 
 {
-    374,
-    376,
-    381,
-    404,
-    407,
-    422,
-    439,
-    443,
-    459,
-    472,
-    500,
-    506,
-    507,
-    518,
-    532,
-    546,
-    566,
-    585,
-    588,
-    628,
-    635,
-    679,
-    681,
-    684,
-    710,
-    731,
-    785,
-    795,
-    796,
-    797,
-    817,
-    842,
-    843,
-    846,
-    847,
-    -1 
+    FRONTIER_MONS_GUITARIST_3B
 };
 
 const u16 gBattleFrontierTrainerMons_Dirk[] = 
 {
-    355,
-    375,
-    379,
-    385,
-    386,
-    412,
-    435,
-    440,
-    454,
-    457,
-    459,
-    465,
-    473,
-    477,
-    482,
-    484,
-    508,
-    531,
-    536,
-    550,
-    553,
-    555,
-    561,
-    567,
-    571,
-    577,
-    578,
-    604,
-    627,
-    632,
-    646,
-    649,
-    651,
-    657,
-    663,
-    667,
-    673,
-    674,
-    700,
-    723,
-    728,
-    742,
-    745,
-    747,
-    753,
-    756,
-    757,
-    758,
-    767,
-    768,
-    769,
-    778,
-    779,
-    780,
-    789,
-    790,
-    791,
-    828,
-    829,
-    830,
-    831,
-    -1 
+    FRONTIER_MONS_BIRD_KEEPER_3
 };
 
 const u16 gBattleFrontierTrainerMons_Harold[] = 
 {
-    355,
-    375,
-    379,
-    385,
-    386,
-    412,
-    435,
-    440,
-    454,
-    457,
-    459,
-    465,
-    473,
-    477,
-    482,
-    484,
-    508,
-    531,
-    536,
-    550,
-    553,
-    555,
-    561,
-    567,
-    571,
-    577,
-    578,
-    604,
-    627,
-    632,
-    646,
-    649,
-    651,
-    657,
-    663,
-    667,
-    673,
-    674,
-    700,
-    723,
-    728,
-    742,
-    745,
-    747,
-    753,
-    756,
-    757,
-    758,
-    767,
-    768,
-    769,
-    778,
-    779,
-    780,
-    789,
-    790,
-    791,
-    828,
-    829,
-    830,
-    831,
-    -1 
+    FRONTIER_MONS_BIRD_KEEPER_3
 };
 
 const u16 gBattleFrontierTrainerMons_Omar[] = 
 {
-    373,
-    388,
-    390,
-    392,
-    400,
-    409,
-    410,
-    418,
-    431,
-    442,
-    448,
-    449,
-    452,
-    456,
-    458,
-    459,
-    461,
-    463,
-    469,
-    471,
-    486,
-    488,
-    496,
-    505,
-    506,
-    514,
-    527,
-    538,
-    544,
-    545,
-    548,
-    552,
-    554,
-    555,
-    557,
-    559,
-    565,
-    580,
-    582,
-    584,
-    592,
-    601,
-    602,
-    610,
-    623,
-    634,
-    640,
-    641,
-    644,
-    648,
-    650,
-    651,
-    653,
-    655,
-    661,
-    676,
-    678,
-    680,
-    688,
-    697,
-    698,
-    706,
-    719,
-    730,
-    736,
-    737,
-    740,
-    744,
-    746,
-    747,
-    749,
-    751,
-    808,
-    809,
-    810,
-    811,
-    820,
-    821,
-    822,
-    823,
-    -1 
+    FRONTIER_MONS_SAILOR_3
 };
 
 const u16 gBattleFrontierTrainerMons_Peter[] = 
 {
-    373,
-    388,
-    390,
-    392,
-    400,
-    409,
-    410,
-    418,
-    431,
-    442,
-    448,
-    449,
-    452,
-    456,
-    458,
-    459,
-    461,
-    463,
-    469,
-    471,
-    486,
-    488,
-    496,
-    505,
-    506,
-    514,
-    527,
-    538,
-    544,
-    545,
-    548,
-    552,
-    554,
-    555,
-    557,
-    559,
-    565,
-    580,
-    582,
-    584,
-    592,
-    601,
-    602,
-    610,
-    623,
-    634,
-    640,
-    641,
-    644,
-    648,
-    650,
-    651,
-    653,
-    655,
-    661,
-    676,
-    678,
-    680,
-    688,
-    697,
-    698,
-    706,
-    719,
-    730,
-    736,
-    737,
-    740,
-    744,
-    746,
-    747,
-    749,
-    751,
-    808,
-    809,
-    810,
-    811,
-    820,
-    821,
-    822,
-    823,
-    -1 
+    FRONTIER_MONS_SAILOR_3
 };
 
 const u16 gBattleFrontierTrainerMons_Dev[] = 
 {
-    372,
-    387,
-    402,
-    403,
-    413,
-    414,
-    416,
-    417,
-    427,
-    428,
-    432,
-    433,
-    435,
-    440,
-    450,
-    466,
-    468,
-    470,
-    498,
-    499,
-    509,
-    510,
-    512,
-    513,
-    523,
-    524,
-    528,
-    529,
-    531,
-    536,
-    546,
-    562,
-    564,
-    579,
-    594,
-    595,
-    605,
-    606,
-    608,
-    609,
-    619,
-    620,
-    624,
-    625,
-    627,
-    632,
-    642,
-    658,
-    660,
-    675,
-    690,
-    691,
-    701,
-    702,
-    704,
-    705,
-    715,
-    716,
-    720,
-    721,
-    723,
-    728,
-    738,
-    754,
-    832,
-    833,
-    834,
-    835,
-    860,
-    861,
-    862,
-    863,
-    864,
-    865,
-    866,
-    867,
-    868,
-    869,
-    -1 
+    FRONTIER_MONS_HIKER_3
 };
 
 const u16 gBattleFrontierTrainerMons_Corey[] = 
 {
-    372,
-    387,
-    402,
-    403,
-    413,
-    414,
-    416,
-    417,
-    427,
-    428,
-    432,
-    433,
-    435,
-    440,
-    450,
-    466,
-    468,
-    470,
-    498,
-    499,
-    509,
-    510,
-    512,
-    513,
-    523,
-    524,
-    528,
-    529,
-    531,
-    536,
-    546,
-    562,
-    564,
-    579,
-    594,
-    595,
-    605,
-    606,
-    608,
-    609,
-    619,
-    620,
-    624,
-    625,
-    627,
-    632,
-    642,
-    658,
-    660,
-    675,
-    690,
-    691,
-    701,
-    702,
-    704,
-    705,
-    715,
-    716,
-    720,
-    721,
-    723,
-    728,
-    738,
-    754,
-    832,
-    833,
-    834,
-    835,
-    860,
-    861,
-    862,
-    863,
-    864,
-    865,
-    866,
-    867,
-    868,
-    869,
-    -1 
+    FRONTIER_MONS_HIKER_3
 };
 
 const u16 gBattleFrontierTrainerMons_Andre[] = 
 {
-    374,
-    378,
-    415,
-    419,
-    421,
-    426,
-    430,
-    444,
-    451,
-    454,
-    455,
-    464,
-    472,
-    476,
-    511,
-    515,
-    517,
-    522,
-    526,
-    540,
-    547,
-    550,
-    551,
-    560,
-    566,
-    570,
-    607,
-    611,
-    613,
-    618,
-    622,
-    636,
-    643,
-    646,
-    647,
-    656,
-    662,
-    666,
-    703,
-    707,
-    709,
-    714,
-    718,
-    732,
-    739,
-    742,
-    743,
-    752,
-    800,
-    801,
-    802,
-    803,
-    850,
-    851,
-    852,
-    853,
-    854,
-    855,
-    856,
-    857,
-    858,
-    859,
-    -1 
+    FRONTIER_MONS_KINDLER_3
 };
 
 const u16 gBattleFrontierTrainerMons_Ferris[] = 
 {
-    374,
-    378,
-    415,
-    419,
-    421,
-    426,
-    430,
-    444,
-    451,
-    454,
-    455,
-    464,
-    472,
-    476,
-    511,
-    515,
-    517,
-    522,
-    526,
-    540,
-    547,
-    550,
-    551,
-    560,
-    566,
-    570,
-    607,
-    611,
-    613,
-    618,
-    622,
-    636,
-    643,
-    646,
-    647,
-    656,
-    662,
-    666,
-    703,
-    707,
-    709,
-    714,
-    718,
-    732,
-    739,
-    742,
-    743,
-    752,
-    800,
-    801,
-    802,
-    803,
-    850,
-    851,
-    852,
-    853,
-    854,
-    855,
-    856,
-    857,
-    858,
-    859,
-    -1 
+    FRONTIER_MONS_KINDLER_3
 };
 
 const u16 gBattleFrontierTrainerMons_Alivia[] = 
 {
-    399,
-    400,
-    409,
-    422,
-    438,
-    441,
-    445,
-    448,
-    449,
-    451,
-    452,
-    454,
-    455,
-    489,
-    492,
-    493,
-    503,
-    526,
-    532,
-    535,
-    536,
-    560,
-    573,
-    583,
-    590,
-    592,
-    608,
-    611,
-    620,
-    651,
-    682,
-    688,
-    714,
-    729,
-    732,
-    -1 
+    FRONTIER_MONS_PARASOL_LADY_3
 };
 
 const u16 gBattleFrontierTrainerMons_Paige[] = 
 {
-    399,
-    400,
-    409,
-    422,
-    438,
-    441,
-    445,
-    448,
-    449,
-    451,
-    452,
-    454,
-    455,
-    489,
-    492,
-    493,
-    503,
-    526,
-    532,
-    535,
-    536,
-    560,
-    573,
-    583,
-    590,
-    592,
-    608,
-    611,
-    620,
-    651,
-    682,
-    688,
-    714,
-    729,
-    732,
-    -1 
+    FRONTIER_MONS_PARASOL_LADY_3
 };
 
 const u16 gBattleFrontierTrainerMons_Anya[] = 
 {
-    442,
-    443,
-    444,
-    446,
-    447,
-    538,
-    539,
-    540,
-    542,
-    543,
-    634,
-    635,
-    636,
-    638,
-    639,
-    730,
-    731,
-    732,
-    734,
-    735,
-    -1 
+    FRONTIER_MONS_EEVEELUTIONS
 };
 
 const u16 gBattleFrontierTrainerMons_Dawn[] = 
 {
-    377,
-    381,
-    410,
-    421,
-    422,
-    443,
-    456,
-    460,
-    461,
-    471,
-    472,
-    473,
-    484,
-    491,
-    502,
-    503,
-    507,
-    508,
-    515,
-    520,
-    540,
-    549,
-    569,
-    574,
-    583,
-    586,
-    601,
-    622,
-    624,
-    639,
-    644,
-    655,
-    734,
-    804,
-    810,
-    815,
-    823,
-    831,
-    843,
-    -1 
+    FRONTIER_MONS_BEAUTY_2
 };
 
 const u16 gBattleFrontierTrainerMons_Abby[] = 
 {
-    185,
-    290,
-    313,
-    334,
-    348,
-    359,
-    360,
-    377,
-    380,
-    382,
-    385,
-    394,
-    395,
-    398,
-    400,
-    401,
-    404,
-    409,
-    410,
-    416,
-    437,
-    438,
-    439,
-    441,
-    445,
-    446,
-    453,
-    475,
-    478,
-    480,
-    484,
-    490,
-    491,
-    494,
-    496,
-    497,
-    500,
-    505,
-    506,
-    512,
-    533,
-    534,
-    535,
-    537,
-    541,
-    542,
-    549,
-    569,
-    572,
-    574,
-    577,
-    586,
-    587,
-    590,
-    592,
-    593,
-    596,
-    601,
-    602,
-    608,
-    629,
-    630,
-    631,
-    633,
-    637,
-    638,
-    645,
-    665,
-    668,
-    670,
-    673,
-    682,
-    683,
-    686,
-    688,
-    689,
-    692,
-    697,
-    698,
-    704,
-    725,
-    726,
-    727,
-    729,
-    733,
-    734,
-    741,
-    812,
-    813,
-    814,
-    815,
-    816,
-    817,
-    818,
-    819,
-    -1 
+    FRONTIER_MONS_AROMA_LADY_3
 };
 
 const u16 gBattleFrontierTrainerMons_Gretel[] = 
 {
-    185,
-    290,
-    313,
-    334,
-    348,
-    359,
-    360,
-    377,
-    380,
-    382,
-    385,
-    394,
-    395,
-    398,
-    400,
-    401,
-    404,
-    409,
-    410,
-    416,
-    437,
-    438,
-    439,
-    441,
-    445,
-    446,
-    453,
-    475,
-    478,
-    480,
-    484,
-    490,
-    491,
-    494,
-    496,
-    497,
-    500,
-    505,
-    506,
-    512,
-    533,
-    534,
-    535,
-    537,
-    541,
-    542,
-    549,
-    569,
-    572,
-    574,
-    577,
-    586,
-    587,
-    590,
-    592,
-    593,
-    596,
-    601,
-    602,
-    608,
-    629,
-    630,
-    631,
-    633,
-    637,
-    638,
-    645,
-    665,
-    668,
-    670,
-    673,
-    682,
-    683,
-    686,
-    688,
-    689,
-    692,
-    697,
-    698,
-    704,
-    725,
-    726,
-    727,
-    729,
-    733,
-    734,
-    741,
-    812,
-    813,
-    814,
-    815,
-    816,
-    817,
-    818,
-    819,
-    -1 
+    FRONTIER_MONS_AROMA_LADY_3
 };
diff --git a/src/data/battle_frontier/battle_frontier_trainers.h b/src/data/battle_frontier/battle_frontier_trainers.h
index faef40656..bbd88d76f 100644
--- a/src/data/battle_frontier/battle_frontier_trainers.h
+++ b/src/data/battle_frontier/battle_frontier_trainers.h
@@ -1,2403 +1,2403 @@
-const struct BattleFrontierTrainer gBattleFrontierTrainers[] =
+const struct BattleFrontierTrainer gBattleFrontierTrainers[FRONTIER_TRAINERS_COUNT] =
 {
-    [0] = {
+    [FRONTIER_TRAINER_BRADY] = {
         .facilityClass = FACILITY_CLASS_YOUNGSTER,
         .trainerName = _("BRADY"),
         .speechBefore = {EC_WORD_I_AM, EC_WORD_NEVER, EC_WORD_GOING, EC_WORD_TO, EC_WORD_LOSE, EC_WORD_EXCL},
         .speechWin = {EC_WORD_I_AM, EC_WORD_STRONG, EC_WORD_AREN_T, EC_WORD_I, EC_WORD_QUES, 0xFFFF},
         .speechLose = {EC_WORD_WHAT, EC_WORD_QUES, 0xFFFF, EC_WORD_BUT, EC_WORD_HOW, EC_WORD_QUES},
-        .monSets = gBattleFrontierTrainerMons_Brady
+        .monSet = gBattleFrontierTrainerMons_Brady
     },
-    [1] = {
+    [FRONTIER_TRAINER_CONNER] = {
         .facilityClass = FACILITY_CLASS_YOUNGSTER,
         .trainerName = _("CONNER"),
         .speechBefore = {EC_WORD_LOSING, EC_WORD_DOESN_T, EC_WORD_BUG, EC_WORD_ME, 0xFFFF, 0xFFFF},
         .speechWin = {EC_WORD_A, EC_WORD_WIN, EC_WORD_IS, EC_WORD_JUST, EC_WORD_AWESOME, 0xFFFF},
         .speechLose = {EC_WORD_DARN, EC_WORD_ELLIPSIS, EC_WORD_LOSING, EC_WORD_DOES, EC_WORD_BUG, EC_WORD_ME},
-        .monSets = gBattleFrontierTrainerMons_Conner
+        .monSet = gBattleFrontierTrainerMons_Conner
     },
-    [2] = {
+    [FRONTIER_TRAINER_BRADLEY] = {
         .facilityClass = FACILITY_CLASS_YOUNGSTER,
         .trainerName = _("BRADLEY"),
         .speechBefore = {EC_WORD_HEY_THERE, EC_WORD_EXCL, EC_WORD_YOU_RE, EC_WORD_MY, EC_WORD_OPPONENT, EC_WORD_TODAY},
         .speechWin = {EC_WORD_HAHAHA, EC_WORD_EXCL, 0xFFFF, EC_WORD_SEE_YA, EC_WORD_LATER, EC_WORD_EXCL},
         .speechLose = {EC_WORD_TOMORROW, EC_WORD_IS, EC_WORD_WHEN, EC_WORD_WE, EC_WORD_REALLY, EC_WORD_BATTLE},
-        .monSets = gBattleFrontierTrainerMons_Bradley
+        .monSet = gBattleFrontierTrainerMons_Bradley
     },
-    [3] = {
+    [FRONTIER_TRAINER_CYBIL] = {
         .facilityClass = FACILITY_CLASS_LASS,
         .trainerName = _("CYBIL"),
         .speechBefore = {EC_WORD_YOU_RE, EC_WORD_REALLY, EC_WORD_NOT_VERY, EC_WORD_SCARY, EC_WORD_AT, EC_WORD_ALL},
         .speechWin = {EC_WORD_IT_S, EC_WORD_SAD, EC_WORD_TO, EC_WORD_SEE, EC_WORD_YOU, EC_MOVE2(STRUGGLE)},
         .speechLose = {EC_WORD_THIS, EC_WORD_CAN_T, EC_WORD_BE, EC_WORD_HAPPENING, EC_WORD_TO_ME, EC_WORD_EXCL},
-        .monSets = gBattleFrontierTrainerMons_Cybil
+        .monSet = gBattleFrontierTrainerMons_Cybil
     },
-    [4] = {
+    [FRONTIER_TRAINER_RODETTE] = {
         .facilityClass = FACILITY_CLASS_LASS,
         .trainerName = _("RODETTE"),
         .speechBefore = {EC_WORD_OH, EC_WORD_THIS, EC_WORD_IS, EC_WORD_SO, EC_WORD_EXCITING, EC_WORD_EXCL},
         .speechWin = {EC_WORD_IT_S, EC_WORD_INCREDIBLE, EC_WORD_HOW, EC_WORD_STRONG, EC_WORD_I_AM, EC_WORD_EXCL},
         .speechLose = {EC_WORD_OH_DEAR, EC_WORD_ELLIPSIS, EC_WORD_I_AM, EC_WORD_JUST, EC_WORD_NO, EC_WORD_GOOD},
-        .monSets = gBattleFrontierTrainerMons_Rodette
+        .monSet = gBattleFrontierTrainerMons_Rodette
     },
-    [5] = {
+    [FRONTIER_TRAINER_PEGGY] = {
         .facilityClass = FACILITY_CLASS_LASS,
         .trainerName = _("PEGGY"),
         .speechBefore = {EC_WORD_GET, EC_WORD_READY, EC_WORD_TO, EC_WORD_BE, EC_WORD_DESTROYED, EC_WORD_EXCL},
         .speechWin = {EC_WORD_HAHAHA, EC_WORD_EXCL_EXCL, 0xFFFF, EC_WORD_I_AM, EC_WORD_LOLLING, EC_WORD_EXCL},
         .speechLose = {EC_WORD_I_AM, EC_WORD_FEELING, EC_WORD_SAD, EC_WORD_THANKS, EC_WORD_TO, EC_WORD_YOU},
-        .monSets = gBattleFrontierTrainerMons_Peggy
+        .monSet = gBattleFrontierTrainerMons_Peggy
     },
-    [6] = {
+    [FRONTIER_TRAINER_KEITH] = {
         .facilityClass = FACILITY_CLASS_SCHOOL_KID_M,
         .trainerName = _("KEITH"),
         .speechBefore = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_JUST, EC_WORD_STUDY, EC_WORD_YOU, EC_WORD_KNOW},
         .speechWin = {EC_WORD_YOU, EC_WORD_DON_T, EC_WORD_STUDY, EC_WORD_ENOUGH, EC_WORD_ELLIPSIS, 0xFFFF},
         .speechLose = {EC_WORD_I, EC_WORD_NEED, EC_WORD_TO, EC_WORD_STUDY, EC_WORD_MORE, EC_WORD_ELLIPSIS},
-        .monSets = gBattleFrontierTrainerMons_Keith
+        .monSet = gBattleFrontierTrainerMons_Keith
     },
-    [7] = {
+    [FRONTIER_TRAINER_GRAYSON] = {
         .facilityClass = FACILITY_CLASS_SCHOOL_KID_M,
         .trainerName = _("GRAYSON"),
         .speechBefore = {EC_WORD_A, EC_WORD_POKEMON, EC_WORD_BATTLE, EC_WORD_ISN_T, EC_WORD_CHILD_S_PLAY, EC_WORD_EXCL},
         .speechWin = {EC_WORD_YOU_RE, EC_WORD_DONE, EC_WORD_AREN_T, EC_WORD_YOU, EC_WORD_QUES, 0xFFFF},
         .speechLose = {EC_WORD_WE, EC_WORD_WERE, EC_WORD_LIKE, EC_WORD_TOYS, EC_WORD_TO, EC_WORD_YOU},
-        .monSets = gBattleFrontierTrainerMons_Grayson
+        .monSet = gBattleFrontierTrainerMons_Grayson
     },
-    [8] = {
+    [FRONTIER_TRAINER_GLENN] = {
         .facilityClass = FACILITY_CLASS_SCHOOL_KID_M,
         .trainerName = _("GLENN"),
         .speechBefore = {EC_WORD_I, EC_WORD_WOULD, EC_WORD_BE, EC_WORD_COOL, EC_WORD_IF_I_WIN, 0xFFFF},
         .speechWin = {EC_WORD_COOL, EC_WORD_EXCL, 0xFFFF, EC_WORD_THAT_S, EC_WORD_WHAT, EC_WORD_I_AM},
         .speechLose = {EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_GOING, EC_WORD_TO, EC_WORD_BE, EC_WORD_COOL},
-        .monSets = gBattleFrontierTrainerMons_Glenn
+        .monSet = gBattleFrontierTrainerMons_Glenn
     },
-    [9] = {
+    [FRONTIER_TRAINER_LILIANA] = {
         .facilityClass = FACILITY_CLASS_SCHOOL_KID_F,
         .trainerName = _("LILIANA"),
         .speechBefore = {EC_WORD_I, EC_WORD_WON_T, EC_WORD_GIVE_UP, EC_WORD_UNTIL, EC_WORD_I, EC_WORD_WIN},
         .speechWin = {EC_WORD_THERE, EC_WORD_IS, EC_WORD_NO, EC_WORD_SURRENDER, EC_WORD_IN, EC_WORD_ME},
         .speechLose = {EC_WORD_THAT_S, EC_WORD_IT, EC_WORD_ELLIPSIS, EC_WORD_I, EC_WORD_GIVE_UP, EC_WORD_ELLIPSIS},
-        .monSets = gBattleFrontierTrainerMons_Liliana
+        .monSet = gBattleFrontierTrainerMons_Liliana
     },
-    [10] = {
+    [FRONTIER_TRAINER_ELISE] = {
         .facilityClass = FACILITY_CLASS_SCHOOL_KID_F,
         .trainerName = _("ELISE"),
         .speechBefore = {EC_WORD_MY, EC_WORD_STRATEGY, EC_WORD_IS, EC_WORD_FROM, EC_WORD_MY, EC_WORD_FATHER},
         .speechWin = {EC_WORD_I, EC_WORD_WIN, EC_WORD_EXCL, EC_WORD_FATHER, EC_WORD_I_VE, EC_WORD_WON},
         .speechLose = {EC_WORD_FORGIVE, EC_WORD_ME, EC_WORD_FATHER, EC_WORD_FOR, EC_WORD_I_VE, EC_WORD_LOST},
-        .monSets = gBattleFrontierTrainerMons_Elise
+        .monSet = gBattleFrontierTrainerMons_Elise
     },
-    [11] = {
+    [FRONTIER_TRAINER_ZOEY] = {
         .facilityClass = FACILITY_CLASS_SCHOOL_KID_F,
         .trainerName = _("ZOEY"),
         .speechBefore = {EC_WORD_PLEASE, EC_WORD_BATTLE, EC_WORD_LIKE, EC_WORD_YOU, EC_WORD_MEAN, EC_WORD_IT},
         .speechWin = {EC_WORD_THANK_YOU, EC_WORD_EXCL_EXCL, 0xFFFF, EC_WORD_THANK_YOU, EC_WORD_SO, EC_WORD_MUCH},
         .speechLose = {EC_WORD_WERE, EC_WORD_YOU, EC_WORD_REALLY, EC_WORD_BEING, EC_WORD_SERIOUS, EC_WORD_QUES},
-        .monSets = gBattleFrontierTrainerMons_Zoey
+        .monSet = gBattleFrontierTrainerMons_Zoey
     },
-    [12] = {
+    [FRONTIER_TRAINER_MANUEL] = {
         .facilityClass = FACILITY_CLASS_RICH_BOY,
         .trainerName = _("MANUEL"),
         .speechBefore = {EC_WORD_ME, EC_WORD_LOSE, EC_WORD_QUES, EC_WORD_THAT_S, EC_WORD_PREPOSTEROUS, EC_WORD_EXCL},
         .speechWin = {EC_WORD_NATURALLY, EC_WORD_I, EC_WORD_WIN, 0xFFFF, 0xFFFF, 0xFFFF},
         .speechLose = {EC_WORD_WAAAH, EC_WORD_EXCL, 0xFFFF, EC_WORD_I, EC_WORD_LOST, EC_WORD_MOTHER},
-        .monSets = gBattleFrontierTrainerMons_Manuel
+        .monSet = gBattleFrontierTrainerMons_Manuel
     },
-    [13] = {
+    [FRONTIER_TRAINER_RUSS] = {
         .facilityClass = FACILITY_CLASS_RICH_BOY,
         .trainerName = _("RUSS"),
         .speechBefore = {EC_WORD_THEY, EC_WORD_ALL, EC_WORD_WANT, EC_WORD_MY, EC_WORD_FABULOUS, EC_WORD_POKEMON},
         .speechWin = {EC_WORD_I, EC_WORD_WILL, EC_WORD_HAVE, EC_WORD_A, EC_WORD_POKEMON, EC_WORD_PARTY},
         .speechLose = {EC_WORD_HOW, EC_WORD_COULD, EC_WORD_YOU, EC_WORD_DO, EC_WORD_THAT, EC_WORD_QUES},
-        .monSets = gBattleFrontierTrainerMons_Russ
+        .monSet = gBattleFrontierTrainerMons_Russ
     },
-    [14] = {
+    [FRONTIER_TRAINER_DUSTIN] = {
         .facilityClass = FACILITY_CLASS_RICH_BOY,
         .trainerName = _("DUSTIN"),
         .speechBefore = {EC_WORD_I, EC_WORD_REALLY, EC_WORD_LIKE, EC_WORD_COOL, EC_WORD_POKEMON, 0xFFFF},
         .speechWin = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_MYSELF, EC_WORD_WHEN_I_WIN, EC_WORD_EXCL, 0xFFFF},
         .speechLose = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_MYSELF, EC_WORD_IF_I_LOSE, EC_WORD_TOO, 0xFFFF},
-        .monSets = gBattleFrontierTrainerMons_Dustin
+        .monSet = gBattleFrontierTrainerMons_Dustin
     },
-    [15] = {
+    [FRONTIER_TRAINER_TINA] = {
         .facilityClass = FACILITY_CLASS_LADY,
         .trainerName = _("TINA"),
         .speechBefore = {EC_WORD_IF_I_WIN, EC_WORD_YOU, EC_WORD_CAN, EC_WORD_HAVE, EC_WORD_A, EC_MOVE2(SWEET_KISS)},
         .speechWin = {EC_WORD_HERE_IT_IS, EC_WORD_YOUR, EC_MOVE2(SWEET_KISS), EC_WORD_FROM, EC_WORD_MY, EC_POKEMON2(JYNX)},
         .speechLose = {EC_WORD_YOU, EC_WORD_WANT, EC_WORD_A, EC_MOVE(SWIFT), EC_MOVE2(MEGA_KICK), EC_WORD_INSTEAD},
-        .monSets = gBattleFrontierTrainerMons_Tina
+        .monSet = gBattleFrontierTrainerMons_Tina
     },
-    [16] = {
+    [FRONTIER_TRAINER_GILLIAN1] = {
         .facilityClass = FACILITY_CLASS_LADY,
         .trainerName = _("GILLIAN"),
         .speechBefore = {EC_WORD_THE, EC_WORD_GOURMET, EC_WORD_THING, EC_WORD_IS, EC_WORD_SO, EC_WORD_YESTERDAY},
         .speechWin = {EC_WORD_POKEMON, EC_WORD_NEVER, EC_WORD_GO, EC_WORD_OUT, EC_WORD_OF, EC_WORD_FASHION},
         .speechLose = {EC_WORD_LOSING, EC_WORD_DOESN_T, EC_WORD_DISAPPOINT, EC_WORD_ME, 0xFFFF, 0xFFFF},
-        .monSets = gBattleFrontierTrainerMons_Gillian
+        .monSet = gBattleFrontierTrainerMons_Gillian
     },
-    [17] = {
+    [FRONTIER_TRAINER_ZOE] = {
         .facilityClass = FACILITY_CLASS_LADY,
         .trainerName = _("ZOE"),
         .speechBefore = {EC_WORD_I, EC_WORD_HAVEN_T, EC_WORD_A, EC_WORD_WORRY, EC_WORD_AT, EC_WORD_ALL},
         .speechWin = {EC_WORD_LIFE, EC_WORD_IS, EC_WORD_ALWAYS, EC_WORD_GOOD, EC_WORD_TO_ME, 0xFFFF},
         .speechLose = {EC_WORD_I, EC_WORD_WORRY, EC_WORD_ABOUT, EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_SKILL},
-        .monSets = gBattleFrontierTrainerMons_Zoe
+        .monSet = gBattleFrontierTrainerMons_Zoe
     },
-    [18] = {
+    [FRONTIER_TRAINER_CHEN] = {
         .facilityClass = FACILITY_CLASS_CAMPER,
         .trainerName = _("CHEN"),
         .speechBefore = {EC_WORD_I_AM, EC_WORD_TOTALLY, EC_WORD_READY, EC_WORD_TO, EC_WORD_ROCK, EC_WORD_TODAY},
         .speechWin = {EC_WORD_I_AM, EC_WORD_READY, EC_WORD_TO, EC_WORD_GO, EC_WORD_ON, EC_WORD_EXCL},
         .speechLose = {EC_WORD_I_VE, EC_WORD_LOST, EC_WORD_MY, EC_MOVE(FOCUS_ENERGY), EC_WORD_AND, EC_WORD_TOUGHNESS},
-        .monSets = gBattleFrontierTrainerMons_Chen
+        .monSet = gBattleFrontierTrainerMons_Chen
     },
-    [19] = {
+    [FRONTIER_TRAINER_AL] = {
         .facilityClass = FACILITY_CLASS_CAMPER,
         .trainerName = _("AL"),
         .speechBefore = {EC_WORD_YOUR, EC_WORD_LOOK, EC_WORD_SAYS, EC_WORD_YOU_RE, EC_WORD_REALLY, EC_WORD_TOUGH},
         .speechWin = {EC_WORD_IT_S, EC_WORD_ME, EC_WORD_WHO_IS, EC_WORD_REALLY, EC_WORD_TOUGH, 0xFFFF},
         .speechLose = {EC_WORD_I_AM, EC_WORD_RIGHT, EC_WORD_EXCL, EC_WORD_YOU_RE, EC_WORD_REALLY, EC_WORD_TOUGH},
-        .monSets = gBattleFrontierTrainerMons_Al
+        .monSet = gBattleFrontierTrainerMons_Al
     },
-    [20] = {
+    [FRONTIER_TRAINER_MITCH] = {
         .facilityClass = FACILITY_CLASS_CAMPER,
         .trainerName = _("MITCH"),
         .speechBefore = {EC_WORD_MOTHER, EC_WORD_NATURE, EC_WORD_IS, EC_WORD_MY, EC_WORD_ALLY, EC_WORD_EXCL},
         .speechWin = {EC_WORD_WAS, EC_WORD_THAT, EC_WORD_ENOUGH, EC_WORD_FOR, EC_WORD_YOU, EC_WORD_QUES},
         .speechLose = {EC_WORD_MOTHER, EC_WORD_NATURE, EC_WORD_DIDN_T, EC_WORD_LET_ME_WIN, EC_WORD_QUES, 0xFFFF},
-        .monSets = gBattleFrontierTrainerMons_Mitch
+        .monSet = gBattleFrontierTrainerMons_Mitch
     },
-    [21] = {
+    [FRONTIER_TRAINER_ANNE] = {
         .facilityClass = FACILITY_CLASS_PICNICKER,
         .trainerName = _("ANNE"),
         .speechBefore = {EC_WORD_I, EC_WORD_CAN_T, EC_WORD_WAIT, EC_WORD_LET_S, EC_WORD_BATTLE, EC_WORD_NOW},
         .speechWin = {EC_WORD_MY, EC_WORD_HAPPINESS, EC_WORD_IS, EC_WORD_OVERWHELMING, EC_WORD_EXCL, 0xFFFF},
         .speechLose = {EC_WORD_YOU_VE, EC_WORD_DESTROYED, EC_WORD_MY, EC_WORD_HAPPINESS, EC_WORD_ELLIPSIS, 0xFFFF},
-        .monSets = gBattleFrontierTrainerMons_Anne
+        .monSet = gBattleFrontierTrainerMons_Anne
     },
-    [22] = {
+    [FRONTIER_TRAINER_ALIZE] = {
         .facilityClass = FACILITY_CLASS_PICNICKER,
         .trainerName = _("ALIZE"),
         .speechBefore = {EC_WORD_CUTE, EC_WORD_AND, EC_WORD_AWFULLY, EC_WORD_STRONG, EC_WORD_THAT_S, EC_WORD_ME},
         .speechWin = {EC_WORD_YUP, EC_WORD_I_AM, EC_WORD_CUTE, EC_WORD_AND, EC_WORD_AWFULLY, EC_WORD_STRONG},
         .speechLose = {EC_WORD_I_AM, EC_WORD_WEAK, EC_WORD_ELLIPSIS, EC_WORD_BUT, EC_WORD_I_AM, EC_WORD_CUTE},
-        .monSets = gBattleFrontierTrainerMons_Alize
+        .monSet = gBattleFrontierTrainerMons_Alize
     },
-    [23] = {
+    [FRONTIER_TRAINER_LAUREN] = {
         .facilityClass = FACILITY_CLASS_PICNICKER,
         .trainerName = _("LAUREN"),
         .speechBefore = {EC_WORD_I_AM, EC_WORD_OLD, EC_WORD_BUT, EC_WORD_I_AM, EC_WORD_ALSO, EC_WORD_GOOD},
         .speechWin = {EC_WORD_I, EC_WORD_SAID, EC_WORD_I_WAS, EC_WORD_OLD, EC_WORD_BUT, EC_WORD_GOOD},
         .speechLose = {EC_WORD_WHAT, EC_WORD_A, EC_WORD_WEIRD, EC_WORD_DREAM, EC_WORD_THAT_WAS, EC_WORD_EXCL},
-        .monSets = gBattleFrontierTrainerMons_Lauren
+        .monSet = gBattleFrontierTrainerMons_Lauren
     },
-    [24] = {
+    [FRONTIER_TRAINER_KIPP] = {
         .facilityClass = FACILITY_CLASS_TUBER_M,
         .trainerName = _("KIPP"),
         .speechBefore = {EC_WORD_IF_I_WIN, EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_TO, EC_WORD_GO, EC_MOVE2(SURF)},
         .speechWin = {EC_WORD_YEAH, EC_WORD_EXCL, EC_WORD_I_AM, EC_WORD_OFF, EC_WORD_TO, EC_MOVE2(SURF)},
         .speechLose = {EC_WORD_OH, EC_WORD_NO, EC_WORD_EXCL, EC_WORD_A, EC_MOVE(WHIRLPOOL), EC_WORD_EXCL},
-        .monSets = gBattleFrontierTrainerMons_Kipp
+        .monSet = gBattleFrontierTrainerMons_Kipp
     },
-    [25] = {
+    [FRONTIER_TRAINER_JASON] = {
         .facilityClass = FACILITY_CLASS_TUBER_M,
         .trainerName = _("JASON"),
         .speechBefore = {EC_WORD_TEACH, EC_WORD_ME, EC_WORD_A, EC_WORD_GOOD, EC_WORD_STRATEGY, 0xFFFF},
         .speechWin = {EC_WORD_THAT_WAS, EC_WORD_YOUR, EC_WORD_GOOD, EC_WORD_STRATEGY, EC_WORD_QUES_EXCL, 0xFFFF},
         .speechLose = {EC_WORD_WOW, EC_WORD_THAT, EC_WORD_IS, EC_WORD_AN, EC_WORD_AWESOME, EC_WORD_STRATEGY},
-        .monSets = gBattleFrontierTrainerMons_Jason
+        .monSet = gBattleFrontierTrainerMons_Jason
     },
-    [26] = {
+    [FRONTIER_TRAINER_JOHN] = {
         .facilityClass = FACILITY_CLASS_TUBER_M,
         .trainerName = _("JOHN"),
         .speechBefore = {EC_WORD_I_AM, EC_WORD_A, EC_WORD_PRETTY, EC_WORD_NEW, EC_WORD_TRAINER, 0xFFFF},
         .speechWin = {EC_WORD_I_AM, EC_WORD_NEW, EC_WORD_BUT, EC_WORD_I, EC_WORD_WON, EC_WORD_EXCL},
         .speechLose = {EC_WORD_I_AM, EC_WORD_NEW, EC_WORD_SO, EC_WORD_WHAT, EC_WORD_IF_I_LOSE, EC_WORD_QUES},
-        .monSets = gBattleFrontierTrainerMons_John
+        .monSet = gBattleFrontierTrainerMons_John
     },
-    [27] = {
+    [FRONTIER_TRAINER_ANN] = {
         .facilityClass = FACILITY_CLASS_TUBER_F,
         .trainerName = _("ANN"),
         .speechBefore = {EC_WORD_IT_S, EC_WORD_SO, EC_WORD_EXCITING, EC_WORD_IT, EC_WORD_REALLY, EC_WORD_IS},
         .speechWin = {EC_WORD_I_AM, EC_WORD_SO, EC_WORD_HAPPY, EC_WORD_I, EC_WORD_CAN, EC_WORD_CRY},
         .speechLose = {EC_WORD_I_AM, EC_WORD_SO, EC_WORD_SAD, EC_WORD_I, EC_WORD_WILL, EC_WORD_CRY},
-        .monSets = gBattleFrontierTrainerMons_Ann
+        .monSet = gBattleFrontierTrainerMons_Ann
     },
-    [28] = {
+    [FRONTIER_TRAINER_EILEEN] = {
         .facilityClass = FACILITY_CLASS_TUBER_F,
         .trainerName = _("EILEEN"),
         .speechBefore = {EC_WORD_LET_S, EC_WORD_PRETEND, EC_WORD_I_AM, EC_WORD_AN, EC_WORD_ADULT, EC_WORD_OK_QUES},
         .speechWin = {EC_WORD_SO, EC_WORD_THIS, EC_WORD_IS, EC_WORD_AN, EC_WORD_ADULT, EC_WORD_FEELING},
         .speechLose = {EC_WORD_AN, EC_WORD_ADULT, EC_WORD_CAN_T, EC_WORD_BEAT, EC_WORD_YOU, EC_WORD_QUES},
-        .monSets = gBattleFrontierTrainerMons_Eileen
+        .monSet = gBattleFrontierTrainerMons_Eileen
     },
-    [29] = {
+    [FRONTIER_TRAINER_CARLIE] = {
         .facilityClass = FACILITY_CLASS_TUBER_F,
         .trainerName = _("CARLIE"),
         .speechBefore = {EC_WORD_MY, EC_WORD_SUMMER, EC_WORD_VACATION, EC_WORD_IS, EC_WORD_FOR, EC_WORD_POKEMON},
         .speechWin = {EC_WORD_MY, EC_WORD_SUMMER, EC_WORD_VACATION, EC_WORD_WILL, EC_WORD_BE, EC_WORD_AWESOME},
         .speechLose = {EC_WORD_I, EC_WORD_CAN_T_WIN, EC_WORD_LIKE, EC_WORD_THIS, EC_WORD_ELLIPSIS, 0xFFFF},
-        .monSets = gBattleFrontierTrainerMons_Carlie
+        .monSet = gBattleFrontierTrainerMons_Carlie
     },
-    [30] = {
+    [FRONTIER_TRAINER_GORDON] = {
         .facilityClass = FACILITY_CLASS_SWIMMER_M,
         .trainerName = _("GORDON"),
         .speechBefore = {EC_WORD_VICTORY, EC_WORD_WILL, EC_WORD_COME, EC_WORD_TO_ME, EC_WORD_EXCL, 0xFFFF},
         .speechWin = {EC_WORD_OH_YEAH, EC_WORD_EXCL, 0xFFFF, EC_WORD_I, EC_WORD_REALLY, EC_WORD_WON},
         .speechLose = {EC_WORD_NOTHING, EC_WORD_IS, EC_WORD_WORKING, EC_WORD_OUT, EC_WORD_FOR, EC_WORD_ME},
-        .monSets = gBattleFrontierTrainerMons_Gordon
+        .monSet = gBattleFrontierTrainerMons_Gordon
     },
-    [31] = {
+    [FRONTIER_TRAINER_AYDEN] = {
         .facilityClass = FACILITY_CLASS_SWIMMER_M,
         .trainerName = _("AYDEN"),
         .speechBefore = {EC_WORD_COME_ON, EC_WORD_I, EC_WORD_NEED, EC_WORD_A, EC_WORD_HOT, EC_WORD_BATTLE},
         .speechWin = {EC_WORD_I, EC_WORD_NEED, EC_WORD_WATER, EC_WORD_TO, EC_WORD_COOL, EC_WORD_DOWN},
         .speechLose = {EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_ME, EC_WORD_FEELING, EC_WORD_ICE, EC_WORD_COLD},
-        .monSets = gBattleFrontierTrainerMons_Ayden
+        .monSet = gBattleFrontierTrainerMons_Ayden
     },
-    [32] = {
+    [FRONTIER_TRAINER_MARCO] = {
         .facilityClass = FACILITY_CLASS_SWIMMER_M,
         .trainerName = _("MARCO"),
         .speechBefore = {EC_WORD_I, EC_MOVE2(SURF), EC_WORD_IN, EC_WORD_THE, EC_WORD_WINTER, EC_WORD_TOO},
         .speechWin = {EC_WORD_I, EC_WORD_WILL, EC_WORD_GO, EC_MOVE2(SURF), EC_WORD_RIGHT, EC_WORD_NOW},
         .speechLose = {EC_WORD_I, EC_WORD_WILL, EC_MOVE2(BEAT_UP), EC_WORD_MY, EC_MOVE2(SURF), EC_WORD_BOARD},
-        .monSets = gBattleFrontierTrainerMons_Marco
+        .monSet = gBattleFrontierTrainerMons_Marco
     },
-    [33] = {
+    [FRONTIER_TRAINER_CIERRA] = {
         .facilityClass = FACILITY_CLASS_SWIMMER_F,
         .trainerName = _("CIERRA"),
         .speechBefore = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_TO, EC_WORD_SYNCHRONIZE, EC_WORD_MY, EC_WORD_SWIFT_SWIM},
         .speechWin = {EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_SYNCHRONIZE, EC_WORD_WITH, EC_WORD_ME, 0xFFFF},
         .speechLose = {EC_WORD_I, EC_WORD_NEED, EC_WORD_TO, EC_WORD_SYNCHRONIZE, EC_WORD_BETTER, EC_WORD_ELLIPSIS},
-        .monSets = gBattleFrontierTrainerMons_Cierra
+        .monSet = gBattleFrontierTrainerMons_Cierra
     },
-    [34] = {
+    [FRONTIER_TRAINER_MARCY] = {
         .facilityClass = FACILITY_CLASS_SWIMMER_F,
         .trainerName = _("MARCY"),
         .speechBefore = {EC_WORD_I_AM, EC_WORD_A, EC_WORD_KNOCKOUT, EC_WORD_YOU, EC_WORD_CAN_T_WIN, EC_WORD_EXCL},
         .speechWin = {EC_WORD_AFTER, EC_WORD_ALL, EC_WORD_I_AM, EC_WORD_A, EC_WORD_KNOCKOUT, EC_WORD_EXCL},
         .speechLose = {EC_WORD_THAT_S, EC_WORD_NOT, EC_WORD_THE, EC_WORD_KNOCKOUT, EC_WORD_I, EC_WORD_MEAN},
-        .monSets = gBattleFrontierTrainerMons_Marcy
+        .monSet = gBattleFrontierTrainerMons_Marcy
     },
-    [35] = {
+    [FRONTIER_TRAINER_KATHY] = {
         .facilityClass = FACILITY_CLASS_SWIMMER_F,
         .trainerName = _("KATHY"),
         .speechBefore = {EC_WORD_I_VE, EC_WORD_WON, EC_WORD_EVERY, EC_WORD_MATCH, EC_WORD_TODAY, EC_WORD_EXCL},
         .speechWin = {EC_WORD_IT_S, EC_WORD_SO, EC_WORD_GREAT, EC_WORD_TO, EC_WORD_WIN, EC_WORD_EXCL},
         .speechLose = {EC_WORD_HUH_QUES, EC_WORD_I, EC_WORD_SHOULD, EC_WORD_NOT, EC_WORD_HAVE, EC_WORD_LOST},
-        .monSets = gBattleFrontierTrainerMons_Kathy
+        .monSet = gBattleFrontierTrainerMons_Kathy
     },
-    [36] = {
+    [FRONTIER_TRAINER_PEYTON] = {
         .facilityClass = FACILITY_CLASS_POKEFAN_M,
         .trainerName = _("PEYTON"),
         .speechBefore = {EC_WORD_I_AM, EC_WORD_NEVER, EC_WORD_DISAPPOINTED, EC_WORD_WITH, EC_WORD_MY, EC_WORD_POKEMON},
         .speechWin = {EC_WORD_I_AM, EC_WORD_HAPPY, EC_WORD_IF, EC_WORD_WE, EC_WORD_WIN, EC_WORD_TOGETHER},
         .speechLose = {EC_WORD_I, EC_WORD_ADORE, EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_MORE, EC_WORD_IF_I_LOSE},
-        .monSets = gBattleFrontierTrainerMons_Peyton
+        .monSet = gBattleFrontierTrainerMons_Peyton
     },
-    [37] = {
+    [FRONTIER_TRAINER_JULIAN] = {
         .facilityClass = FACILITY_CLASS_POKEFAN_M,
         .trainerName = _("JULIAN"),
         .speechBefore = {EC_WORD_YOU, EC_WORD_ADORE, EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_RIGHT, EC_WORD_QUES},
         .speechWin = {EC_WORD_YOU_RE, EC_WORD_TOTALLY, EC_WORD_OUT, EC_WORD_OF, EC_WORD_THE, EC_WORD_QUESTION},
         .speechLose = {EC_WORD_YOU, EC_WORD_DO, EC_WORD_ADORE, EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_EXCL},
-        .monSets = gBattleFrontierTrainerMons_Julian
+        .monSet = gBattleFrontierTrainerMons_Julian
     },
-    [38] = {
+    [FRONTIER_TRAINER_QUINN] = {
         .facilityClass = FACILITY_CLASS_POKEFAN_M,
         .trainerName = _("QUINN"),
         .speechBefore = {EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_BUT, EC_WORD_A, EC_WORD_DREAM},
         .speechWin = {EC_WORD_THIS, EC_WORD_IS, EC_WORD_A, EC_WORD_BEAUTIFUL, EC_WORD_DREAM, EC_WORD_EXCL},
         .speechLose = {EC_WORD_THIS, EC_WORD_IS, EC_WORD_AN, EC_WORD_AWFUL, EC_MOVE(NIGHTMARE), EC_WORD_EXCL},
-        .monSets = gBattleFrontierTrainerMons_Quinn
+        .monSet = gBattleFrontierTrainerMons_Quinn
     },
-    [39] = {
+    [FRONTIER_TRAINER_HAYLEE] = {
         .facilityClass = FACILITY_CLASS_POKEFAN_F,
         .trainerName = _("HAYLEE"),
         .speechBefore = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_KNOW, EC_WORD_HOW, EC_WORD_I_AM, EC_WORD_FEELING},
         .speechWin = {EC_WORD_I_AM, EC_WORD_FEELING, EC_WORD_OVERWHELMING, EC_WORD_JOY, EC_WORD_OVER, EC_WORD_THIS},
         .speechLose = {EC_WORD_DESTROYED, EC_WORD_IS, EC_WORD_THE, EC_WORD_WAY, EC_WORD_I_AM, EC_WORD_FEELING},
-        .monSets = gBattleFrontierTrainerMons_Haylee
+        .monSet = gBattleFrontierTrainerMons_Haylee
     },
-    [40] = {
+    [FRONTIER_TRAINER_AMANDA] = {
         .facilityClass = FACILITY_CLASS_POKEFAN_F,
         .trainerName = _("AMANDA"),
         .speechBefore = {EC_WORD_I, EC_WORD_COME, EC_WORD_FROM, EC_WORD_A, EC_WORD_TRAINER, EC_WORD_FAMILY},
         .speechWin = {EC_WORD_I, EC_WORD_WILL, EC_WORD_TREASURE, EC_WORD_THIS, EC_WORD_WIN, 0xFFFF},
         .speechLose = {EC_WORD_I, EC_WORD_WANT, EC_WORD_TO, EC_WORD_GO_HOME, EC_WORD_RIGHT, EC_WORD_NOW},
-        .monSets = gBattleFrontierTrainerMons_Amanda
+        .monSet = gBattleFrontierTrainerMons_Amanda
     },
-    [41] = {
+    [FRONTIER_TRAINER_STACY] = {
         .facilityClass = FACILITY_CLASS_POKEFAN_F,
         .trainerName = _("STACY"),
         .speechBefore = {EC_WORD_ALL, EC_WORD_POKEMON, EC_WORD_HAVE, EC_WORD_THEIR, EC_WORD_OWN, EC_WORD_CUTE_CHARM},
         .speechWin = {EC_WORD_YOU, EC_WORD_SEE, EC_WORD_WHAT, EC_WORD_I, EC_WORD_MEAN, EC_WORD_QUES},
         .speechLose = {EC_WORD_SHOULD, EC_WORD_I, EC_WORD_NOT, EC_WORD_ADORE, EC_WORD_POKEMON, EC_WORD_QUES},
-        .monSets = gBattleFrontierTrainerMons_Stacy
+        .monSet = gBattleFrontierTrainerMons_Stacy
     },
-    [42] = {
+    [FRONTIER_TRAINER_RAFAEL] = {
         .facilityClass = FACILITY_CLASS_PKMN_BREEDER_M,
         .trainerName = _("RAFAEL"),
         .speechBefore = {EC_WORD_COME_ON, EC_WORD_EXCL, EC_WORD_LET_S, EC_WORD_SEE, EC_WORD_SOME, EC_WORD_SPIRIT},
         .speechWin = {EC_WORD_THAT_S_IT_EXCL, EC_WORD_THAT_S, EC_WORD_THE, EC_WORD_SPIRIT, EC_WORD_EXCL, 0xFFFF},
         .speechLose = {EC_WORD_WELL, EC_WORD_SO, EC_WORD_MUCH, EC_WORD_FOR, EC_WORD_OUR, EC_WORD_SPIRIT},
-        .monSets = gBattleFrontierTrainerMons_Rafael
+        .monSet = gBattleFrontierTrainerMons_Rafael
     },
-    [43] = {
+    [FRONTIER_TRAINER_OLIVER] = {
         .facilityClass = FACILITY_CLASS_PKMN_BREEDER_M,
         .trainerName = _("OLIVER"),
         .speechBefore = {EC_WORD_A, EC_WORD_GENIUS, EC_WORD_THAT_S, EC_WORD_WHAT, EC_WORD_I_AM, EC_WORD_EXCL},
         .speechWin = {EC_WORD_THAT_S, EC_WORD_HOW, EC_WORD_A, EC_WORD_GENIUS, EC_WORD_WORKS, EC_WORD_EXCL},
         .speechLose = {EC_WORD_YOU_RE, EC_WORD_MORE, EC_WORD_A, EC_WORD_GENIUS, EC_WORD_THAN, EC_WORD_I_AM},
-        .monSets = gBattleFrontierTrainerMons_Oliver
+        .monSet = gBattleFrontierTrainerMons_Oliver
     },
-    [44] = {
+    [FRONTIER_TRAINER_PAYTON] = {
         .facilityClass = FACILITY_CLASS_PKMN_BREEDER_M,
         .trainerName = _("PAYTON"),
         .speechBefore = {EC_WORD_I, EC_WORD_TRAIN, EC_WORD_FROM, EC_WORD_THE, EC_WORD_EGG, EC_WORD_UP},
         .speechWin = {EC_WORD_WELL, EC_WORD_DONE, EC_WORD_EXCL, 0xFFFF, 0xFFFF, 0xFFFF},
         .speechLose = {EC_WORD_THAT_WAS, EC_WORD_A, EC_MOVE2(SOFT_BOILED), EC_WORD_LOSS, EC_WORD_ELLIPSIS, 0xFFFF},
-        .monSets = gBattleFrontierTrainerMons_Payton
+        .monSet = gBattleFrontierTrainerMons_Payton
     },
-    [45] = {
-        .facilityClass = FACILITY_CLASS_POKEMON_BREEDER_F,
+    [FRONTIER_TRAINER_PAMELA] = {
+        .facilityClass = FACILITY_CLASS_PKMN_BREEDER_F,
         .trainerName = _("PAMELA"),
         .speechBefore = {EC_WORD_ALL, EC_WORD_POKEMON, EC_WORD_ADORE, EC_WORD_A, EC_WORD_KIND, EC_WORD_TRAINER},
         .speechWin = {EC_WORD_IT_S, EC_WORD_TOO, EC_WORD_BAD, EC_WORD_YOU, EC_WORD_LOST, 0xFFFF},
         .speechLose = {EC_WORD_YOU_RE, EC_WORD_KIND, EC_WORD_AND, EC_WORD_YOU_RE, EC_WORD_ALSO, EC_WORD_STRONG},
-        .monSets = gBattleFrontierTrainerMons_Pamela
+        .monSet = gBattleFrontierTrainerMons_Pamela
     },
-    [46] = {
-        .facilityClass = FACILITY_CLASS_POKEMON_BREEDER_F,
+    [FRONTIER_TRAINER_ELIZA] = {
+        .facilityClass = FACILITY_CLASS_PKMN_BREEDER_F,
         .trainerName = _("ELIZA"),
         .speechBefore = {EC_WORD_I, EC_WORD_ADORE, EC_WORD_POKEMON, EC_WORD_LIKE, EC_WORD_MY, EC_WORD_CHILDREN},
         .speechWin = {EC_WORD_I_AM, EC_WORD_SO, EC_WORD_HAPPY, EC_WORD_FOR, EC_WORD_MY, EC_WORD_POKEMON},
         .speechLose = {EC_WORD_OH_DEAR, EC_WORD_I_AM, EC_WORD_SO, EC_WORD_SORRY, EC_WORD_ABOUT, EC_WORD_THIS},
-        .monSets = gBattleFrontierTrainerMons_Eliza
+        .monSet = gBattleFrontierTrainerMons_Eliza
     },
-    [47] = {
-        .facilityClass = FACILITY_CLASS_POKEMON_BREEDER_F,
+    [FRONTIER_TRAINER_MARISA] = {
+        .facilityClass = FACILITY_CLASS_PKMN_BREEDER_F,
         .trainerName = _("MARISA"),
         .speechBefore = {EC_WORD_I, EC_WORD_PROMISE, EC_WORD_TO, EC_WORD_BATTLE, EC_WORD_SERIOUSLY, 0xFFFF},
         .speechWin = {EC_WORD_PROMISE, EC_WORD_ME, EC_WORD_YOU, EC_WORD_WILL, EC_WORD_DO, EC_WORD_BETTER},
         .speechLose = {EC_WORD_PROMISE, EC_WORD_ME, EC_WORD_ANOTHER, EC_WORD_BATTLE, EC_WORD_PLEASE, EC_WORD_EXCL},
-        .monSets = gBattleFrontierTrainerMons_Marisa
+        .monSet = gBattleFrontierTrainerMons_Marisa
     },
-    [48] = {
+    [FRONTIER_TRAINER_LEWIS] = {
         .facilityClass = FACILITY_CLASS_BUG_CATCHER,
         .trainerName = _("LEWIS"),
         .speechBefore = {EC_WORD_A_LITTLE, EC_WORD_BUG, EC_WORD_IS, EC_WORD_SCARY, EC_WORD_QUES, EC_WORD_HAHAHA},
         .speechWin = {EC_WORD_LOOK, EC_WORD_LOOK, EC_WORD_EXCL, EC_WORD_A, EC_WORD_SCARY, EC_WORD_BUG},
         .speechLose = {EC_WORD_OH, EC_WORD_A, EC_WORD_BUG, EC_WORD_ISN_T, EC_WORD_SCARY, EC_WORD_ELLIPSIS},
-        .monSets = gBattleFrontierTrainerMons_Lewis
+        .monSet = gBattleFrontierTrainerMons_Lewis
     },
-    [49] = {
+    [FRONTIER_TRAINER_YOSHI] = {
         .facilityClass = FACILITY_CLASS_BUG_CATCHER,
         .trainerName = _("YOSHI"),
         .speechBefore = {EC_WORD_BUG, EC_WORD_POKEMON, EC_WORD_MAKE, EC_WORD_ME, EC_WORD_FEELING, EC_WORD_LOVEY_DOVEY},
         .speechWin = {EC_WORD_BUG, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_THE, EC_WORD_BEST, EC_WORD_EXCL},
         .speechLose = {EC_WORD_YOU_RE, EC_WORD_IGNORANT, EC_WORD_ABOUT, EC_WORD_BUG, EC_WORD_POKEMON, 0xFFFF},
-        .monSets = gBattleFrontierTrainerMons_Yoshi
+        .monSet = gBattleFrontierTrainerMons_Yoshi
     },
-    [50] = {
+    [FRONTIER_TRAINER_DESTIN] = {
         .facilityClass = FACILITY_CLASS_BUG_CATCHER,
         .trainerName = _("DESTIN"),
         .speechBefore = {EC_WORD_IT_S, EC_WORD_WAY, EC_WORD_TOO, EC_WORD_HOT, EC_WORD_HERE, 0xFFFF},
         .speechWin = {EC_WORD_I_AM, EC_WORD_ABOUT, EC_WORD_TO, EC_MOVE(OVERHEAT), 0xFFFF, 0xFFFF},
         .speechLose = {EC_WORD_PLEASE, EC_WORD_I, EC_WORD_NEED, EC_WORD_SOME, EC_WORD_WATER, 0xFFFF},
-        .monSets = gBattleFrontierTrainerMons_Destin
+        .monSet = gBattleFrontierTrainerMons_Destin
     },
-    [51] = {
+    [FRONTIER_TRAINER_KEON] = {
         .facilityClass = FACILITY_CLASS_NINJA_BOY,
         .trainerName = _("KEON"),
         .speechBefore = {EC_WORD_FORGIVE, EC_WORD_ME, EC_WORD_BUT, EC_WORD_HERE_I_COME, EC_WORD_EXCL, 0xFFFF},
         .speechWin = {EC_WORD_FORGIVE, EC_WORD_ME, EC_WORD_FOR, EC_WORD_MY, EC_WORD_OVERWHELMING, EC_WORD_POWER},
         .speechLose = {EC_WORD_I_AM, EC_WORD_SORRY, EC_WORD_ELLIPSIS, 0xFFFF, 0xFFFF, 0xFFFF},
-        .monSets = gBattleFrontierTrainerMons_Keon
+        .monSet = gBattleFrontierTrainerMons_Keon
     },
-    [52] = {
+    [FRONTIER_TRAINER_STUART] = {
         .facilityClass = FACILITY_CLASS_NINJA_BOY,
         .trainerName = _("STUART"),
         .speechBefore = {EC_WORD_I, EC_WORD_PROMISE, EC_WORD_YOU, EC_WORD_A, EC_WORD_HOT, EC_WORD_BATTLE},
         .speechWin = {EC_WORD_THE, EC_WORD_MASTER, EC_WORD_OF, EC_WORD_COOL, EC_WORD_THAT_S, EC_WORD_ME},
         .speechLose = {EC_WORD_I, EC_WORD_SEE, EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_SO, EC_WORD_COOL},
-        .monSets = gBattleFrontierTrainerMons_Stuart
+        .monSet = gBattleFrontierTrainerMons_Stuart
     },
-    [53] = {
+    [FRONTIER_TRAINER_NESTOR] = {
         .facilityClass = FACILITY_CLASS_NINJA_BOY,
         .trainerName = _("NESTOR"),
         .speechBefore = {EC_WORD_SHOW, EC_WORD_ME, EC_WORD_A, EC_WORD_REALLY, EC_WORD_SMOOTH, EC_WORD_MOVE},
         .speechWin = {EC_WORD_THERE, EC_WORD_WAS, EC_WORD_NOTHING, EC_WORD_SMOOTH, EC_WORD_ABOUT, EC_WORD_THAT},
         .speechLose = {EC_WORD_YOU, EC_WORD_REALLY, EC_WORD_ARE, EC_WORD_SMOOTH, EC_WORD_EXCL, 0xFFFF},
-        .monSets = gBattleFrontierTrainerMons_Nestor
+        .monSet = gBattleFrontierTrainerMons_Nestor
     },
-    [54] = {
+    [FRONTIER_TRAINER_DERRICK] = {
         .facilityClass = FACILITY_CLASS_BUG_MANIAC,
         .trainerName = _("DERRICK"),
         .speechBefore = {EC_WORD_LET_S, EC_WORD_SEE, EC_WORD_YOU, EC_MOVE2(MEDITATE), EC_WORD_LIKE, EC_WORD_ME},
         .speechWin = {EC_WORD_HOW, EC_WORD_I, EC_MOVE2(MEDITATE), EC_WORD_IS, EC_WORD_JUST, EC_WORD_BEAUTIFUL},
         .speechLose = {EC_WORD_I, EC_WORD_WILL, EC_MOVE2(MEDITATE), EC_WORD_FOR, EC_WORD_A, EC_MOVE2(CALM_MIND)},
-        .monSets = gBattleFrontierTrainerMons_Derrick
+        .monSet = gBattleFrontierTrainerMons_Derrick
     },
-    [55] = {
+    [FRONTIER_TRAINER_BRYSON] = {
         .facilityClass = FACILITY_CLASS_BUG_MANIAC,
         .trainerName = _("BRYSON"),
         .speechBefore = {EC_MOVE2(POISON_POWDER), EC_WORD_IS, EC_WORD_IN, EC_WORD_OUR, EC_MOVE2(COTTON_SPORE), EC_WORD_MOVE},
         .speechWin = {EC_WORD_HOW_DO, EC_WORD_YOU, EC_WORD_LIKE, EC_WORD_OUR, EC_MOVE2(POISON_POWDER), EC_WORD_QUES},
         .speechLose = {EC_WORD_MY, EC_MOVE2(COTTON_SPORE), EC_WORD_WAS, EC_WORD_USELESS, 0xFFFF, 0xFFFF},
-        .monSets = gBattleFrontierTrainerMons_Bryson
+        .monSet = gBattleFrontierTrainerMons_Bryson
     },
-    [56] = {
+    [FRONTIER_TRAINER_CLAYTON] = {
         .facilityClass = FACILITY_CLASS_BUG_MANIAC,
         .trainerName = _("CLAYTON"),
         .speechBefore = {EC_WORD_HUH_QUES, 0xFFFF, 0xFFFF, EC_WORD_WHERE, EC_WORD_IS_IT_QUES, 0xFFFF},
         .speechWin = {EC_WORD_WHERE, EC_WORD_IS_IT_QUES, EC_WORD_I_VE, EC_WORD_LOST, EC_WORD_MY, EC_WORD_POKENAV},
         .speechLose = {EC_WORD_WHERE, EC_WORD_IS_IT_QUES, EC_WORD_I_VE, EC_WORD_LOST, EC_WORD_MY, EC_WORD_SENSE},
-        .monSets = gBattleFrontierTrainerMons_Clayton
+        .monSet = gBattleFrontierTrainerMons_Clayton
     },
-    [57] = {
+    [FRONTIER_TRAINER_TRENTON] = {
         .facilityClass = FACILITY_CLASS_FISHERMAN,
         .trainerName = _("TRENTON"),
         .speechBefore = {EC_WORD_COME_OVER, EC_WORD_FOR, EC_WORD_SOME, EC_WORD_TASTY, EC_WORD_WATER, 0xFFFF},
         .speechWin = {EC_WORD_MMM, EC_WORD_DO, EC_WORD_YOU, EC_WORD_WANT, EC_WORD_SOME, EC_WORD_QUES},
         .speechLose = {EC_WORD_I, EC_WORD_GOT, EC_WORD_THIS, EC_WORD_TASTY, EC_WORD_WATER, EC_WORD_SHOPPING},
-        .monSets = gBattleFrontierTrainerMons_Trenton
+        .monSet = gBattleFrontierTrainerMons_Trenton
     },
-    [58] = {
+    [FRONTIER_TRAINER_JENSON] = {
         .facilityClass = FACILITY_CLASS_FISHERMAN,
         .trainerName = _("JENSON"),
         .speechBefore = {EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_WILL, EC_WORD_MAKE, EC_WORD_YOU, EC_WORD_DOWNCAST},
         .speechWin = {EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_DON_T, EC_WORD_MAKE, EC_WORD_THE, EC_MOVE(CUT)},
         .speechLose = {EC_WORD_I_AM, EC_WORD_THE, EC_WORD_TRAINER, EC_WORD_WHO_IS, EC_WORD_FEELING, EC_WORD_DOWNCAST},
-        .monSets = gBattleFrontierTrainerMons_Jenson
+        .monSet = gBattleFrontierTrainerMons_Jenson
     },
-    [59] = {
+    [FRONTIER_TRAINER_WESLEY] = {
         .facilityClass = FACILITY_CLASS_FISHERMAN,
         .trainerName = _("WESLEY"),
         .speechBefore = {EC_POKEMON2(MEW), EC_POKEMON2(MEW), EC_WORD_IS, EC_WORD_HOW, EC_WORD_I, EC_WORD_CRY},
         .speechWin = {EC_WORD_YES, EC_WORD_I, EC_WORD_KNOW, EC_WORD_I_AM, EC_WORD_CUTE, EC_WORD_EXCL},
         .speechLose = {EC_POKEMON2(MEW), EC_POKEMON2(MEW), EC_WORD_EXCL, EC_POKEMON2(MEW), EC_WORD_EXCL_EXCL, 0xFFFF},
-        .monSets = gBattleFrontierTrainerMons_Wesley
+        .monSet = gBattleFrontierTrainerMons_Wesley
     },
-    [60] = {
+    [FRONTIER_TRAINER_ANTON] = {
         .facilityClass = FACILITY_CLASS_RUIN_MANIAC,
         .trainerName = _("ANTON"),
         .speechBefore = {EC_WORD_GET, EC_WORD_READY, EC_WORD_FOR, EC_WORD_ME, EC_WORD_TO, EC_MOVE(THRASH)},
         .speechWin = {EC_WORD_WAHAHAHA, EC_WORD_EXCL, EC_WORD_SORRY, EC_WORD_ABOUT, EC_WORD_THAT, EC_WORD_EXCL},
         .speechLose = {EC_WORD_IT_S, EC_WORD_A, EC_WORD_TOUGH, EC_WORD_LOSS, EC_WORD_TO, EC_MOVE2(SWALLOW)},
-        .monSets = gBattleFrontierTrainerMons_Anton
+        .monSet = gBattleFrontierTrainerMons_Anton
     },
-    [61] = {
+    [FRONTIER_TRAINER_LAWSON] = {
         .facilityClass = FACILITY_CLASS_RUIN_MANIAC,
         .trainerName = _("LAWSON"),
         .speechBefore = {EC_WORD_I_AM, EC_WORD_YOUNG, EC_WORD_AT, EC_WORD_HEART, EC_WORD_EXCL, 0xFFFF},
         .speechWin = {EC_WORD_NOT, EC_WORD_COOL, EC_WORD_EXCL, EC_WORD_NOT, EC_WORD_AT, EC_WORD_ALL},
         .speechLose = {EC_WORD_I_AM, EC_WORD_OLD, EC_WORD_AND, EC_WORD_FEELING, EC_WORD_SHAKY, EC_WORD_ELLIPSIS},
-        .monSets = gBattleFrontierTrainerMons_Lawson
+        .monSet = gBattleFrontierTrainerMons_Lawson
     },
-    [62] = {
+    [FRONTIER_TRAINER_SAMMY] = {
         .facilityClass = FACILITY_CLASS_RUIN_MANIAC,
         .trainerName = _("SAMMY"),
         .speechBefore = {EC_WORD_MY, EC_WORD_PARTY, EC_WORD_IS, EC_WORD_READY, EC_WORD_TO, EC_WORD_ROCK},
         .speechWin = {EC_WORD_MY, EC_WORD_PARTY, EC_WORD_IS, EC_WORD_JUST, EC_WORD_INCREDIBLE, EC_WORD_EXCL},
         .speechLose = {EC_WORD_I, EC_WORD_CRY, EC_WORD_FOR, EC_WORD_MY, EC_WORD_PARTY, EC_WORD_ELLIPSIS},
-        .monSets = gBattleFrontierTrainerMons_Sammy
+        .monSet = gBattleFrontierTrainerMons_Sammy
     },
-    [63] = {
+    [FRONTIER_TRAINER_ARNIE] = {
         .facilityClass = FACILITY_CLASS_COLLECTOR,
         .trainerName = _("ARNIE"),
         .speechBefore = {EC_WORD_I_AM, EC_WORD_NO_1, EC_WORD_I, EC_WORD_HAVE, EC_WORD_NO, EC_WORD_RIVAL},
         .speechWin = {EC_WORD_YOU, EC_WORD_SEE, EC_WORD_QUES, EC_WORD_I, EC_WORD_CAN_T, EC_WORD_LOSE},
         .speechLose = {EC_WORD_NO, EC_WORD_EXCL, EC_WORD_I, EC_WORD_WON_T, EC_WORD_ACCEPT, EC_WORD_THIS},
-        .monSets = gBattleFrontierTrainerMons_Arnie
+        .monSet = gBattleFrontierTrainerMons_Arnie
     },
-    [64] = {
+    [FRONTIER_TRAINER_ADRIAN] = {
         .facilityClass = FACILITY_CLASS_COLLECTOR,
         .trainerName = _("ADRIAN"),
         .speechBefore = {EC_WORD_YAHOO, EC_WORD_EXCL, 0xFFFF, EC_WORD_YAHOO, EC_WORD_EXCL_EXCL, 0xFFFF},
         .speechWin = {EC_WORD_THANK_YOU, EC_WORD_EXCL, 0xFFFF, EC_WORD_THANK_YOU, EC_WORD_EXCL_EXCL, 0xFFFF},
         .speechLose = {EC_WORD_GOOD_BYE, EC_WORD_EXCL, 0xFFFF, EC_WORD_GOOD_BYE, EC_WORD_EXCL_EXCL, 0xFFFF},
-        .monSets = gBattleFrontierTrainerMons_Adrian
+        .monSet = gBattleFrontierTrainerMons_Adrian
     },
-    [65] = {
+    [FRONTIER_TRAINER_TRISTAN] = {
         .facilityClass = FACILITY_CLASS_COLLECTOR,
         .trainerName = _("TRISTAN"),
         .speechBefore = {EC_WORD_CONFUSED, EC_WORD_QUES, 0xFFFF, EC_WORD_I_AM, EC_WORD_A, EC_WORD_GENIUS},
         .speechWin = {EC_WORD_SEE, EC_WORD_QUES, 0xFFFF, EC_WORD_I_AM, EC_WORD_A, EC_WORD_GENIUS},
         .speechLose = {EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_A, EC_WORD_GENIUS, EC_WORD_IN, EC_WORD_BATTLE},
-        .monSets = gBattleFrontierTrainerMons_Tristan
+        .monSet = gBattleFrontierTrainerMons_Tristan
     },
-    [66] = {
+    [FRONTIER_TRAINER_JULIANA] = {
         .facilityClass = FACILITY_CLASS_PARASOL_LADY,
         .trainerName = _("JULIANA"),
         .speechBefore = {EC_WORD_I, EC_WORD_THINK, EC_WORD_I_AM, EC_WORD_SHOPPING, EC_WORD_TOO, EC_WORD_MUCH},
         .speechWin = {EC_WORD_BUT, EC_WORD_I, EC_WORD_WANT, EC_WORD_A, EC_WORD_POKEMON, EC_WORD_PLUSH_DOLL},
         .speechLose = {EC_WORD_I, EC_WORD_SO, EC_WORD_WANT, EC_WORD_ANOTHER, EC_WORD_POKEMON, EC_WORD_PLUSH_DOLL},
-        .monSets = gBattleFrontierTrainerMons_Juliana
+        .monSet = gBattleFrontierTrainerMons_Juliana
     },
-    [67] = {
+    [FRONTIER_TRAINER_RYLEE] = {
         .facilityClass = FACILITY_CLASS_PARASOL_LADY,
         .trainerName = _("RYLEE"),
         .speechBefore = {EC_WORD_SHOW, EC_WORD_ME, EC_WORD_THAT, EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_GUTS},
         .speechWin = {EC_WORD_BYE_BYE, EC_WORD_EXCL, EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_NO, EC_WORD_GUTS},
         .speechLose = {EC_WORD_THAT_WAS, EC_WORD_GUTSY, EC_WORD_ELLIPSIS, EC_WORD_YOU_RE, EC_WORD_QUITE, EC_WORD_SUPER},
-        .monSets = gBattleFrontierTrainerMons_Rylee
+        .monSet = gBattleFrontierTrainerMons_Rylee
     },
-    [68] = {
+    [FRONTIER_TRAINER_CHELSEA] = {
         .facilityClass = FACILITY_CLASS_PARASOL_LADY,
         .trainerName = _("CHELSEA"),
         .speechBefore = {EC_WORD_I, EC_WORD_SERIOUSLY, EC_WORD_MEAN, EC_WORD_TO, EC_WORD_WIN, EC_WORD_EXCL},
         .speechWin = {EC_WORD_THAT_WAS, EC_WORD_MY, EC_WORD_WILL, EC_WORD_TO, EC_WORD_WIN, 0xFFFF},
         .speechLose = {EC_WORD_YOU_RE, EC_WORD_FAR, EC_WORD_TOO_STRONG, EC_WORD_FOR, EC_WORD_ME, 0xFFFF},
-        .monSets = gBattleFrontierTrainerMons_Chelsea
+        .monSet = gBattleFrontierTrainerMons_Chelsea
     },
-    [69] = {
+    [FRONTIER_TRAINER_DANELA] = {
         .facilityClass = FACILITY_CLASS_BEAUTY,
         .trainerName = _("DANELA"),
         .speechBefore = {EC_WORD_YOU, EC_WORD_MUST_BE, EC_WORD_MY, EC_WORD_OPPONENT, EC_WORD_NOW, EC_WORD_EXCL},
         .speechWin = {EC_WORD_OH_DEAR, EC_WORD_TOO_WEAK, EC_WORD_EXCL, EC_WORD_DON_T, EC_WORD_GIVE_UP, EC_WORD_EXCL},
         .speechLose = {EC_WORD_THAT_WAS, EC_WORD_GOOD, EC_WORD_AND, EC_WORD_THIS, EC_WORD_IS, EC_WORD_GOOD_BYE},
-        .monSets = gBattleFrontierTrainerMons_Danela
+        .monSet = gBattleFrontierTrainerMons_Danela
     },
-    [70] = {
+    [FRONTIER_TRAINER_LIZBETH] = {
         .facilityClass = FACILITY_CLASS_BEAUTY,
         .trainerName = _("LIZBETH"),
         .speechBefore = {EC_WORD_IF_I_LOSE, EC_WORD_YOU, EC_WORD_CAN, EC_WORD_HAVE, EC_WORD_A, EC_MOVE2(PRESENT)},
         .speechWin = {EC_WORD_HERE_IT_IS, EC_WORD_A_LITTLE, EC_WORD_PRAISE, EC_WORD_AS, EC_WORD_YOUR, EC_MOVE2(PRESENT)},
         .speechLose = {EC_WORD_YOUR, EC_MOVE2(PRESENT), EC_WORD_QUES_EXCL, EC_WORD_HERE_IT_IS, EC_WORD_A, EC_MOVE(DOUBLE_SLAP)},
-        .monSets = gBattleFrontierTrainerMons_Lizbeth
+        .monSet = gBattleFrontierTrainerMons_Lizbeth
     },
-    [71] = {
+    [FRONTIER_TRAINER_AMELIA] = {
         .facilityClass = FACILITY_CLASS_BEAUTY,
         .trainerName = _("AMELIA"),
         .speechBefore = {EC_WORD_I, EC_WORD_BELIEVE, EC_WORD_IN, EC_WORD_CUTE, EC_WORD_FASHION, EC_WORD_APPEAL},
         .speechWin = {EC_WORD_YOUR, EC_WORD_FASHION, EC_WORD_SENSE, EC_WORD_IS, EC_WORD_A, EC_WORD_DISASTER},
         .speechLose = {EC_WORD_THAT_WAS, EC_WORD_AWFUL, EC_WORD_EXCL, EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_HOME},
-        .monSets = gBattleFrontierTrainerMons_Amelia
+        .monSet = gBattleFrontierTrainerMons_Amelia
     },
-    [72] = {
+    [FRONTIER_TRAINER_JILLIAN] = {
         .facilityClass = FACILITY_CLASS_AROMA_LADY,
         .trainerName = _("JILLIAN"),
         .speechBefore = {EC_WORD_WHAT, EC_WORD_IS, EC_WORD_THAT, EC_WORD_I, EC_WORD_SMELL, EC_WORD_QUES},
         .speechWin = {EC_WORD_IT_S, EC_WORD_THE, EC_MOVE(SWEET_SCENT), EC_WORD_OF, EC_WORD_TASTY, EC_WORD_WATER},
         .speechLose = {EC_WORD_IT_S, EC_WORD_YOUR, EC_WORD_OFFENSIVE, EC_WORD_STENCH, EC_WORD_THAT_S, EC_WORD_WHAT},
-        .monSets = gBattleFrontierTrainerMons_Jillian
+        .monSet = gBattleFrontierTrainerMons_Jillian
     },
-    [73] = {
+    [FRONTIER_TRAINER_ABBIE] = {
         .facilityClass = FACILITY_CLASS_AROMA_LADY,
         .trainerName = _("ABBIE"),
         .speechBefore = {EC_WORD_YOU, EC_WORD_TRY, EC_WORD_MY, EC_WORD_SECRET, EC_MOVE(AROMATHERAPY), EC_WORD_OK_QUES},
         .speechWin = {EC_WORD_MY, EC_MOVE(AROMATHERAPY), EC_WORD_IS, EC_WORD_TERRIBLE, EC_WORD_FOR, EC_WORD_YOU},
         .speechLose = {EC_WORD_DIDN_T, EC_WORD_YOU, EC_WORD_SMELL, EC_WORD_A, EC_WORD_THING, EC_WORD_QUES_EXCL},
-        .monSets = gBattleFrontierTrainerMons_Abbie
+        .monSet = gBattleFrontierTrainerMons_Abbie
     },
-    [74] = {
+    [FRONTIER_TRAINER_BRIANA] = {
         .facilityClass = FACILITY_CLASS_AROMA_LADY,
         .trainerName = _("BRIANA"),
         .speechBefore = {EC_WORD_MY, EC_WORD_BOY, EC_WORD_FRIEND, EC_WORD_WORKS, EC_WORD_TOO, EC_WORD_MUCH},
         .speechWin = {EC_WORD_I, EC_WORD_ONLY, EC_WORD_MISS, EC_WORD_HIM, EC_WORD_MORE, EC_WORD_ELLIPSIS},
         .speechLose = {EC_WORD_I_AM, EC_WORD_SO, EC_WORD_LONESOME, EC_WORD_WITHOUT, EC_WORD_HIM, EC_WORD_ELLIPSIS},
-        .monSets = gBattleFrontierTrainerMons_Briana
+        .monSet = gBattleFrontierTrainerMons_Briana
     },
-    [75] = {
+    [FRONTIER_TRAINER_ANTONIO] = {
         .facilityClass = FACILITY_CLASS_GUITARIST,
         .trainerName = _("ANTONIO"),
         .speechBefore = {EC_WORD_I, EC_WORD_KNOW, EC_WORD_HOW, EC_WORD_TO, EC_WORD_GO, EC_WORD_GO},
         .speechWin = {EC_WORD_BUT, EC_WORD_I, EC_WORD_DON_T, EC_WORD_LIKE, EC_WORD_TO, EC_WORD_DANCE},
         .speechLose = {EC_WORD_GO, EC_WORD_GO, EC_WORD_ELLIPSIS, EC_WORD_JUST, EC_MOVE(FLAIL), EC_WORD_ABOUT},
-        .monSets = gBattleFrontierTrainerMons_Antonio
+        .monSet = gBattleFrontierTrainerMons_Antonio
     },
-    [76] = {
+    [FRONTIER_TRAINER_JADEN] = {
         .facilityClass = FACILITY_CLASS_GUITARIST,
         .trainerName = _("JADEN"),
         .speechBefore = {EC_WORD_HELLO, EC_WORD_I, EC_WORD_THINK, EC_WORD_I, EC_WORD_ADORE, EC_WORD_YOU},
         .speechWin = {EC_WORD_YOU, EC_WORD_MAKE, EC_WORD_ME, EC_MOVE(THRASH), EC_WORD_IN, EC_MOVE2(FRUSTRATION)},
         .speechLose = {EC_WORD_THIS_IS_IT_EXCL, 0xFFFF, 0xFFFF, EC_WORD_GOOD_BYE, EC_WORD_FOREVER, EC_WORD_EXCL},
-        .monSets = gBattleFrontierTrainerMons_Jaden
+        .monSet = gBattleFrontierTrainerMons_Jaden
     },
-    [77] = {
+    [FRONTIER_TRAINER_DAKOTA] = {
         .facilityClass = FACILITY_CLASS_GUITARIST,
         .trainerName = _("DAKOTA"),
         .speechBefore = {EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_TO, EC_WORD_DANCE, EC_WORD_WITH, EC_WORD_POWER},
         .speechWin = {EC_WORD_GOT, EC_WORD_IT, EC_WORD_QUES, EC_WORD_DANCE, EC_WORD_WITH, EC_WORD_POWER},
         .speechLose = {EC_WORD_OKAY, EC_WORD_YOU, EC_WORD_UNDERSTAND, EC_WORD_ALL_RIGHT, EC_WORD_EXCL, 0xFFFF},
-        .monSets = gBattleFrontierTrainerMons_Dakota
+        .monSet = gBattleFrontierTrainerMons_Dakota
     },
-    [78] = {
+    [FRONTIER_TRAINER_BRAYDEN] = {
         .facilityClass = FACILITY_CLASS_BIRD_KEEPER,
         .trainerName = _("BRAYDEN"),
         .speechBefore = {EC_WORD_COLOR_CHANGE, EC_WORD_VERSION, EC_WORD_TOYS, EC_WORD_ARE, EC_WORD_USELESS, EC_WORD_EXCL},
         .speechWin = {EC_WORD_I, EC_WORD_ONLY, EC_WORD_COLLECT, EC_WORD_NORMAL, EC_WORD_VERSION, EC_WORD_TOYS},
         .speechLose = {EC_WORD_I, EC_MOVE2(ATTRACT), EC_WORD_COLOR_CHANGE, EC_WORD_VERSION, EC_WORD_TOYS, EC_WORD_ELLIPSIS},
-        .monSets = gBattleFrontierTrainerMons_Brayden
+        .monSet = gBattleFrontierTrainerMons_Brayden
     },
-    [79] = {
+    [FRONTIER_TRAINER_CORSON] = {
         .facilityClass = FACILITY_CLASS_BIRD_KEEPER,
         .trainerName = _("CORSON"),
         .speechBefore = {EC_WORD_I, EC_WORD_GET, EC_WORD_TO, EC_MOVE2(BEAT_UP), EC_WORD_ON, EC_WORD_YOU},
         .speechWin = {EC_WORD_TOO, EC_WORD_EASY, EC_WORD_EXCL, EC_WORD_I_AM, EC_WORD_SO, EC_WORD_COOL},
         .speechLose = {EC_WORD_WHY, EC_WORD_QUES_EXCL, 0xFFFF, EC_WORD_I, EC_MOVE2(CURSE), EC_WORD_YOU},
-        .monSets = gBattleFrontierTrainerMons_Corson
+        .monSet = gBattleFrontierTrainerMons_Corson
     },
-    [80] = {
+    [FRONTIER_TRAINER_TREVIN] = {
         .facilityClass = FACILITY_CLASS_BIRD_KEEPER,
         .trainerName = _("TREVIN"),
         .speechBefore = {EC_WORD_THERE, EC_WORD_IS, EC_WORD_NONE, EC_WORD_BETTER, EC_WORD_THAN, EC_WORD_ME},
         .speechWin = {EC_WORD_YES_SIR_EXCL, 0xFFFF, 0xFFFF, EC_WORD_I_AM, EC_WORD_THE, EC_WORD_BEST},
         .speechLose = {EC_WORD_SERIOUS, EC_WORD_QUES_EXCL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF},
-        .monSets = gBattleFrontierTrainerMons_Trevin
+        .monSet = gBattleFrontierTrainerMons_Trevin
     },
-    [81] = {
+    [FRONTIER_TRAINER_PATRICK] = {
         .facilityClass = FACILITY_CLASS_SAILOR,
         .trainerName = _("PATRICK"),
         .speechBefore = {EC_WORD_I_AM, EC_WORD_PERFECT, EC_WORD_EXCL, EC_WORD_GIVE_UP, EC_WORD_NOW, 0xFFFF},
         .speechWin = {EC_WORD_DON_T, EC_WORD_BE, EC_WORD_DISAPPOINTED, EC_WORD_I_AM, EC_WORD_PERFECT, 0xFFFF},
         .speechLose = {EC_WORD_BUT, EC_WORD_HOW, EC_WORD_QUES, EC_WORD_I_AM, EC_WORD_PERFECT, EC_WORD_ELLIPSIS},
-        .monSets = gBattleFrontierTrainerMons_Patrick
+        .monSet = gBattleFrontierTrainerMons_Patrick
     },
-    [82] = {
+    [FRONTIER_TRAINER_KADEN] = {
         .facilityClass = FACILITY_CLASS_SAILOR,
         .trainerName = _("KADEN"),
         .speechBefore = {EC_WORD_WHAT, EC_WORD_ARE, EC_WORD_YOU, EC_WORD_UP, EC_WORD_TO, EC_WORD_QUES},
         .speechWin = {EC_WORD_YOU, EC_WORD_WERE, EC_WORD_A, EC_WORD_SURPRISE, EC_WORD_TO_ME, EC_WORD_EXCL},
         .speechLose = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_KNOW, EC_WORD_WHO, EC_WORD_I_AM, EC_WORD_ELLIPSIS},
-        .monSets = gBattleFrontierTrainerMons_Kaden
+        .monSet = gBattleFrontierTrainerMons_Kaden
     },
-    [83] = {
+    [FRONTIER_TRAINER_MAXWELL] = {
         .facilityClass = FACILITY_CLASS_SAILOR,
         .trainerName = _("MAXWELL"),
         .speechBefore = {EC_WORD_HEY_THERE, EC_WORD_WHO_IS, EC_WORD_YOUR, EC_WORD_RIVAL, EC_WORD_QUES, 0xFFFF},
         .speechWin = {EC_WORD_MY, EC_WORD_RIVAL, EC_WORD_IS, EC_WORD_MY, EC_WORD_GIRL, EC_WORD_FRIEND},
         .speechLose = {EC_WORD_I_AM, EC_WORD_MAKING, EC_WORD_YOU, EC_WORD_MY, EC_WORD_RIVAL, 0xFFFF},
-        .monSets = gBattleFrontierTrainerMons_Maxwell
+        .monSet = gBattleFrontierTrainerMons_Maxwell
     },
-    [84] = {
+    [FRONTIER_TRAINER_DARYL] = {
         .facilityClass = FACILITY_CLASS_HIKER,
         .trainerName = _("DARYL"),
         .speechBefore = {EC_WORD_I, EC_WORD_ONLY, EC_WORD_KNOW, EC_WORD_HOW, EC_WORD_TO, EC_MOVE(CHARGE)},
         .speechWin = {EC_WORD_AM, EC_WORD_I, EC_WORD_OVERWHELMING, EC_WORD_OR, EC_WORD_WHAT, EC_WORD_QUES},
         .speechLose = {EC_WORD_YOU_RE, EC_WORD_GOING, EC_WORD_TO, EC_WORD_A, EC_WORD_LEGEND, EC_WORD_EXCL},
-        .monSets = gBattleFrontierTrainerMons_Daryl
+        .monSet = gBattleFrontierTrainerMons_Daryl
     },
-    [85] = {
+    [FRONTIER_TRAINER_KENNETH] = {
         .facilityClass = FACILITY_CLASS_HIKER,
         .trainerName = _("KENNETH"),
         .speechBefore = {EC_WORD_YOU, EC_WORD_BETTER, EC_WORD_NOT, EC_MOVE2(SLACK_OFF), EC_WORD_WITH, EC_WORD_ME},
         .speechWin = {EC_WORD_DID, EC_WORD_MY, EC_MOVE2(TAUNT), EC_WORD_INTIMIDATE, EC_WORD_YOU, EC_WORD_QUES},
         .speechLose = {EC_WORD_I_AM, EC_WORD_SORRY, EC_WORD_ELLIPSIS, 0xFFFF, 0xFFFF, 0xFFFF},
-        .monSets = gBattleFrontierTrainerMons_Kenneth
+        .monSet = gBattleFrontierTrainerMons_Kenneth
     },
-    [86] = {
+    [FRONTIER_TRAINER_RICH] = {
         .facilityClass = FACILITY_CLASS_HIKER,
         .trainerName = _("RICH"),
         .speechBefore = {EC_WORD_YOUR, EC_MOVE(FACADE), EC_WORD_DOESN_T, EC_MOVE2(TRICK), EC_WORD_ME, 0xFFFF},
         .speechWin = {EC_WORD_SERIOUSLY, EC_WORD_ARE, EC_WORD_YOU, EC_WORD_REALLY, EC_WORD_OK_QUES, 0xFFFF},
         .speechLose = {EC_WORD_THAT_WAS, EC_WORD_REALLY, EC_WORD_TOUGH, EC_WORD_ON, EC_WORD_ME, 0xFFFF},
-        .monSets = gBattleFrontierTrainerMons_Rich
+        .monSet = gBattleFrontierTrainerMons_Rich
     },
-    [87] = {
+    [FRONTIER_TRAINER_CADEN] = {
         .facilityClass = FACILITY_CLASS_KINDLER,
         .trainerName = _("CADEN"),
         .speechBefore = {EC_WORD_I, EC_WORD_CAN_T, EC_WORD_BE, EC_WORD_DEFEATED, EC_WORD_EXCL, 0xFFFF},
         .speechWin = {EC_WORD_FIRE, EC_WORD_EXCL, 0xFFFF, EC_WORD_FIRE, EC_WORD_EXCL_EXCL, 0xFFFF},
         .speechLose = {EC_WORD_I_AM, EC_WORD_TIRED, EC_WORD_ELLIPSIS, EC_WORD_IT_S, EC_WORD_SO, EC_WORD_HOT},
-        .monSets = gBattleFrontierTrainerMons_Caden
+        .monSet = gBattleFrontierTrainerMons_Caden
     },
-    [88] = {
+    [FRONTIER_TRAINER_MARLON] = {
         .facilityClass = FACILITY_CLASS_KINDLER,
         .trainerName = _("MARLON"),
         .speechBefore = {EC_WORD_A, EC_WORD_POKEDEX, EC_WORD_IS, EC_WORD_A_LITTLE, EC_WORD_RADIO, EC_WORD_QUES},
         .speechWin = {EC_WORD_A_LITTLE, EC_WORD_RADIO, EC_WORD_HUH_QUES, EC_WORD_THAT_S, EC_WORD_TOTALLY, EC_WORD_COOL},
         .speechLose = {EC_WORD_IT_S, EC_WORD_NOT, EC_WORD_QUES, EC_WORD_IS, EC_WORD_POKENAV, EC_WORD_QUES},
-        .monSets = gBattleFrontierTrainerMons_Marlon
+        .monSet = gBattleFrontierTrainerMons_Marlon
     },
-    [89] = {
+    [FRONTIER_TRAINER_NASH] = {
         .facilityClass = FACILITY_CLASS_KINDLER,
         .trainerName = _("NASH"),
         .speechBefore = {EC_WORD_I_AM, EC_WORD_ON, EC_WORD_FIRE, EC_WORD_BABY, EC_WORD_EXCL, 0xFFFF},
         .speechWin = {EC_WORD_I, EC_WORD_LEFT, EC_WORD_YOU, EC_WORD_JUST, EC_WORD_AN, EC_MOVE2(EMBER)},
         .speechLose = {EC_WORD_AIYEEH, EC_WORD_EXCL_EXCL, 0xFFFF, EC_WORD_NO, EC_WORD_WATER, EC_WORD_PLEASE},
-        .monSets = gBattleFrontierTrainerMons_Nash
+        .monSet = gBattleFrontierTrainerMons_Nash
     },
-    [90] = {
+    [FRONTIER_TRAINER_ROBBY] = {
         .facilityClass = FACILITY_CLASS_RUNNING_TRIATHLETE_M,
         .trainerName = _("ROBBY"),
         .speechBefore = {EC_WORD_HAHAHA, EC_WORD_EXCL, EC_WORD_HAPPY, EC_WORD_TO, EC_WORD_MEET_YOU, EC_WORD_EXCL},
         .speechWin = {EC_WORD_I_AM, EC_WORD_THE, EC_WORD_LEADER, EC_WORD_WITH, EC_WORD_REFRESHING, EC_WORD_SERENE_GRACE},
         .speechLose = {EC_WORD_I, EC_WORD_WILL, EC_MOVE(THRASH), EC_WORD_MY, EC_WORD_TOYS, EC_WORD_EXCL},
-        .monSets = gBattleFrontierTrainerMons_Robby
+        .monSet = gBattleFrontierTrainerMons_Robby
     },
-    [91] = {
+    [FRONTIER_TRAINER_REECE] = {
         .facilityClass = FACILITY_CLASS_RUNNING_TRIATHLETE_M,
         .trainerName = _("REECE"),
         .speechBefore = {EC_WORD_MY, EC_MOVE2(QUICK_ATTACK), EC_WORD_CAN, EC_WORD_BEAT, EC_WORD_A, EC_MOVE2(TELEPORT)},
         .speechWin = {EC_WORD_LIKE, EC_WORD_I, EC_WORD_SAID, EC_WORD_I_AM, EC_WORD_DARN, EC_WORD_FAST},
         .speechLose = {EC_WORD_I_WAS, EC_WORD_KIDDING, EC_WORD_ABOUT, EC_WORD_THAT, EC_MOVE2(TELEPORT), EC_WORD_THING},
-        .monSets = gBattleFrontierTrainerMons_Reece
+        .monSet = gBattleFrontierTrainerMons_Reece
     },
-    [92] = {
+    [FRONTIER_TRAINER_KATHRYN] = {
         .facilityClass = FACILITY_CLASS_RUNNING_TRIATHLETE_F,
         .trainerName = _("KATHRYN"),
         .speechBefore = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_TRAIN, EC_WORD_GOOD, EC_WORD_ENOUGH, EC_WORD_QUES},
         .speechWin = {EC_WORD_DON_T, EC_MOVE2(TAUNT), EC_WORD_ME, EC_WORD_LIKE, EC_WORD_THAT, EC_WORD_OK_QUES},
         .speechLose = {EC_WORD_WHY, EC_WORD_COULDN_T, EC_WORD_I, EC_WORD_WIN, EC_WORD_THIS, EC_WORD_QUES},
-        .monSets = gBattleFrontierTrainerMons_Kathryn
+        .monSet = gBattleFrontierTrainerMons_Kathryn
     },
-    [93] = {
+    [FRONTIER_TRAINER_ELLEN] = {
         .facilityClass = FACILITY_CLASS_RUNNING_TRIATHLETE_F,
         .trainerName = _("ELLEN"),
         .speechBefore = {EC_WORD_CRUSH, EC_WORD_YOU, EC_WORD_LIKE, EC_WORD_AN, EC_WORD_EGG, EC_WORD_EXCL},
         .speechWin = {EC_WORD_THAT_WAS, EC_WORD_A, EC_WORD_TASTY, EC_WORD_VICTORY, EC_WORD_FOR, EC_WORD_ME},
         .speechLose = {EC_WORD_TOO, EC_WORD_TOUGH, EC_WORD_TO, EC_WORD_CRUSH, EC_WORD_EXCL, 0xFFFF},
-        .monSets = gBattleFrontierTrainerMons_Ellen
+        .monSet = gBattleFrontierTrainerMons_Ellen
     },
-    [94] = {
+    [FRONTIER_TRAINER_RAMON] = {
         .facilityClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_M,
         .trainerName = _("RAMON"),
         .speechBefore = {EC_WORD_OKAY, EC_WORD_EXCL, 0xFFFF, EC_WORD_THIS, EC_WORD_IS, EC_WORD_PERFECTION},
         .speechWin = {EC_WORD_I_AM, EC_WORD_HAPPY, EC_WORD_THAT, EC_WORD_I, EC_WORD_WON, EC_WORD_EXCL},
         .speechLose = {EC_WORD_IT_S, EC_WORD_A, EC_WORD_SECRET, EC_WORD_WHY, EC_WORD_I_AM, EC_WORD_HAPPY},
-        .monSets = gBattleFrontierTrainerMons_Ramon
+        .monSet = gBattleFrontierTrainerMons_Ramon
     },
-    [95] = {
+    [FRONTIER_TRAINER_ARTHUR] = {
         .facilityClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_M,
         .trainerName = _("ARTHUR"),
         .speechBefore = {EC_WORD_HERE_I_COME, EC_WORD_FEELING, EC_WORD_READY, EC_WORD_FOR, EC_WORD_IT, EC_WORD_ALL},
         .speechWin = {EC_WORD_THAT_S_IT_EXCL, 0xFFFF, 0xFFFF, EC_WORD_THAT_WAS, EC_WORD_FABULOUS, EC_WORD_EXCL},
         .speechLose = {EC_WORD_THAT_WAS, EC_WORD_NOT, EC_WORD_WHAT, EC_WORD_I, EC_WORD_NEED, 0xFFFF},
-        .monSets = gBattleFrontierTrainerMons_Arthur
+        .monSet = gBattleFrontierTrainerMons_Arthur
     },
-    [96] = {
+    [FRONTIER_TRAINER_ALONDRA] = {
         .facilityClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_F,
         .trainerName = _("ALONDRA"),
         .speechBefore = {EC_WORD_EVERY, EC_WORD_DAY, EC_WORD_IS, EC_WORD_A, EC_WORD_GREAT, EC_WORD_DAY},
         .speechWin = {EC_WORD_MY, EC_MOVE2(DIVE), EC_WORD_WILL, EC_WORD_BE, EC_WORD_A, EC_WORD_LEGEND},
         .speechLose = {EC_WORD_MY, EC_MOVE2(DIVE), EC_WORD_LEFT, EC_WORD_ME, EC_WORD_COLD, EC_WORD_ELLIPSIS},
-        .monSets = gBattleFrontierTrainerMons_Alondra
+        .monSet = gBattleFrontierTrainerMons_Alondra
     },
-    [97] = {
+    [FRONTIER_TRAINER_ADRIANA] = {
         .facilityClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_F,
         .trainerName = _("ADRIANA"),
         .speechBefore = {EC_WORD_COME, EC_WORD_SEE, EC_WORD_AN, EC_WORD_INCREDIBLE, EC_WORD_SWIFT_SWIM, EC_WORD_EXCL},
         .speechWin = {EC_WORD_I, EC_WORD_MAKE, EC_WORD_IT, EC_WORD_LOOK, EC_WORD_SO, EC_WORD_EASY},
         .speechLose = {EC_WORD_I_AM, EC_WORD_FEELING, EC_MOVE2(BEAT_UP), EC_WORD_AND, EC_WORD_TIRED, 0xFFFF},
-        .monSets = gBattleFrontierTrainerMons_Adriana
+        .monSet = gBattleFrontierTrainerMons_Adriana
     },
-    [98] = {
+    [FRONTIER_TRAINER_MALIK] = {
         .facilityClass = FACILITY_CLASS_CYCLING_TRIATHLETE_M,
         .trainerName = _("MALIK"),
         .speechBefore = {EC_WORD_OH, EC_WORD_NOT, EC_WORD_ANOTHER, EC_WORD_BATTLE, EC_WORD_PLEASE, EC_WORD_ELLIPSIS},
         .speechWin = {EC_WORD_I, EC_WORD_FINALLY, EC_WORD_WON, EC_WORD_ELLIPSIS, EC_WORD_I_AM, EC_WORD_TIRED},
         .speechLose = {EC_WORD_I, EC_WORD_FINALLY, EC_WORD_LOST, EC_WORD_ELLIPSIS, EC_WORD_I_AM, EC_WORD_TIRED},
-        .monSets = gBattleFrontierTrainerMons_Malik
+        .monSet = gBattleFrontierTrainerMons_Malik
     },
-    [99] = {
+    [FRONTIER_TRAINER_JILL] = {
         .facilityClass = FACILITY_CLASS_CYCLING_TRIATHLETE_F,
         .trainerName = _("JILL"),
         .speechBefore = {EC_WORD_I_AM, EC_WORD_THE, EC_MOVE2(QUICK_ATTACK), EC_WORD_TRAINER, EC_WORD_EXCL, 0xFFFF},
         .speechWin = {EC_WORD_THE, EC_MOVE2(QUICK_ATTACK), EC_WORD_TRAINER, EC_WORD_WINS, EC_WORD_EXCL, 0xFFFF},
         .speechLose = {EC_WORD_THE, EC_MOVE2(QUICK_ATTACK), EC_WORD_TRAINER, EC_WORD_GIVES, EC_WORD_UP, EC_WORD_EXCL},
-        .monSets = gBattleFrontierTrainerMons_Jill
+        .monSet = gBattleFrontierTrainerMons_Jill
     },
-    [100] = {
+    [FRONTIER_TRAINER_ERIK] = {
         .facilityClass = FACILITY_CLASS_RUNNING_TRIATHLETE_M,
         .trainerName = _("ERIK"),
         .speechBefore = {EC_WORD_I_AM, EC_WORD_THE, EC_WORD_SPEED_BOOST, EC_WORD_HERO, EC_WORD_EXCL, 0xFFFF},
         .speechWin = {EC_WORD_THANK_YOU, EC_WORD_FROM, EC_WORD_THE, EC_WORD_SPEED_BOOST, EC_WORD_HERO, EC_WORD_EXCL},
         .speechLose = {EC_WORD_WAAAH, EC_WORD_EXCL_EXCL, 0xFFFF, EC_WORD_NO, EC_WORD_NO, EC_WORD_EXCL_EXCL},
-        .monSets = gBattleFrontierTrainerMons_Erik
+        .monSet = gBattleFrontierTrainerMons_Erik
     },
-    [101] = {
+    [FRONTIER_TRAINER_YAZMIN] = {
         .facilityClass = FACILITY_CLASS_RUNNING_TRIATHLETE_F,
         .trainerName = _("YAZMIN"),
         .speechBefore = {EC_WORD_I, EC_WORD_WOULD, EC_WORD_RATHER, EC_WORD_RUN, EC_WORD_THAN, EC_WORD_BIKE},
         .speechWin = {EC_WORD_YES, EC_WORD_I, EC_WORD_WOULD, EC_WORD_MUCH, EC_WORD_RATHER, EC_WORD_RUN},
         .speechLose = {EC_WORD_BYE_BYE, EC_WORD_EXCL, EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_TO, EC_WORD_RUN_AWAY},
-        .monSets = gBattleFrontierTrainerMons_Yazmin
+        .monSet = gBattleFrontierTrainerMons_Yazmin
     },
-    [102] = {
+    [FRONTIER_TRAINER_JAMAL] = {
         .facilityClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_M,
         .trainerName = _("JAMAL"),
         .speechBefore = {EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_TO, EC_WORD_BE, EC_WORD_A, EC_WORD_FATHER},
         .speechWin = {EC_WORD_I, EC_WORD_CAN_T, EC_WORD_WAIT, EC_WORD_FOR, EC_WORD_MY, EC_WORD_BABY},
         .speechLose = {EC_WORD_MY, EC_WORD_BABY, EC_WORD_WILL, EC_WORD_BE, EC_WORD_TOTALLY, EC_WORD_AWESOME},
-        .monSets = gBattleFrontierTrainerMons_Jamal
+        .monSet = gBattleFrontierTrainerMons_Jamal
     },
-    [103] = {
+    [FRONTIER_TRAINER_LESLIE] = {
         .facilityClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_F,
         .trainerName = _("LESLIE"),
         .speechBefore = {EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_TO, EC_WORD_BE, EC_WORD_A, EC_WORD_MOTHER},
         .speechWin = {EC_WORD_A, EC_WORD_BABY, EC_WORD_WILL, EC_WORD_BE, EC_WORD_A_LITTLE, EC_WORD_CHALLENGE},
         .speechLose = {EC_WORD_I_AM, EC_WORD_TOO, EC_WORD_HAPPY, EC_WORD_TO, EC_WORD_BE, EC_WORD_ANGRY},
-        .monSets = gBattleFrontierTrainerMons_Leslie
+        .monSet = gBattleFrontierTrainerMons_Leslie
     },
-    [104] = {
+    [FRONTIER_TRAINER_DAVE] = {
         .facilityClass = FACILITY_CLASS_CYCLING_TRIATHLETE_M,
         .trainerName = _("DAVE"),
         .speechBefore = {EC_WORD_WHAT, EC_WORD_SHOULD, EC_WORD_I, EC_WORD_DO, EC_WORD_TODAY, EC_WORD_QUES},
         .speechWin = {EC_WORD_I, EC_WORD_SHOULD, EC_WORD_ENJOY, EC_WORD_SOME, EC_WORD_SPORTS, EC_WORD_EXCL},
         .speechLose = {EC_WORD_I, EC_WORD_WILL, EC_WORD_GO, EC_WORD_PLAY, EC_WORD_A, EC_WORD_GAME},
-        .monSets = gBattleFrontierTrainerMons_Dave
+        .monSet = gBattleFrontierTrainerMons_Dave
     },
-    [105] = {
+    [FRONTIER_TRAINER_CARLO] = {
         .facilityClass = FACILITY_CLASS_CYCLING_TRIATHLETE_M,
         .trainerName = _("CARLO"),
         .speechBefore = {EC_WORD_HAH, EC_WORD_EXCL_EXCL, 0xFFFF, EC_WORD_YEAH, EC_WORD_EXCL_EXCL, 0xFFFF},
         .speechWin = {EC_WORD_I, EC_WORD_DO, EC_WORD_THINGS, EC_WORD_AT, EC_MOVE(EXTREME_SPEED), EC_WORD_EXCL},
         .speechLose = {EC_WORD_I, EC_WORD_LOST, EC_WORD_AT, EC_MOVE(EXTREME_SPEED), EC_WORD_ELLIPSIS, 0xFFFF},
-        .monSets = gBattleFrontierTrainerMons_Carlo
+        .monSet = gBattleFrontierTrainerMons_Carlo
     },
-    [106] = {
+    [FRONTIER_TRAINER_EMILIA] = {
         .facilityClass = FACILITY_CLASS_CYCLING_TRIATHLETE_F,
         .trainerName = _("EMILIA"),
         .speechBefore = {EC_WORD_ME, EC_WORD_WORRY, EC_WORD_QUES, EC_WORD_I, EC_WORD_HAVE, EC_WORD_NONE},
         .speechWin = {EC_WORD_AHAHA, EC_WORD_SEE, EC_WORD_QUES, EC_WORD_THAT_WAS, EC_WORD_FANTASTIC, EC_WORD_EXCL},
         .speechLose = {EC_WORD_AHAHA, EC_WORD_SEE, EC_WORD_QUES, EC_WORD_THAT_WAS, EC_WORD_ENTERTAINING, EC_WORD_EXCL},
-        .monSets = gBattleFrontierTrainerMons_Emilia
+        .monSet = gBattleFrontierTrainerMons_Emilia
     },
-    [107] = {
+    [FRONTIER_TRAINER_DALIA] = {
         .facilityClass = FACILITY_CLASS_CYCLING_TRIATHLETE_F,
         .trainerName = _("DALIA"),
         .speechBefore = {EC_WORD_MY, EC_WORD_BIKE, EC_WORD_IS, EC_WORD_VERY, EC_WORD_EXPENSIVE, 0xFFFF},
         .speechWin = {EC_WORD_DON_T, EC_WORD_COME, EC_WORD_NEAR, EC_WORD_MY, EC_WORD_BIKE, EC_WORD_EXCL},
         .speechLose = {EC_WORD_MY, EC_WORD_BIKE, EC_WORD_IS, EC_WORD_MY, EC_WORD_BEST, EC_WORD_FRIEND},
-        .monSets = gBattleFrontierTrainerMons_Dalia
+        .monSet = gBattleFrontierTrainerMons_Dalia
     },
-    [108] = {
+    [FRONTIER_TRAINER_HITOMI] = {
         .facilityClass = FACILITY_CLASS_BLACK_BELT,
         .trainerName = _("HITOMI"),
         .speechBefore = {EC_WORD_YEAH, EC_WORD_EXCL_EXCL, 0xFFFF, EC_WORD_HAH, EC_WORD_EXCL_EXCL, 0xFFFF},
         .speechWin = {EC_WORD_WHAT, EC_WORD_QUES_EXCL, 0xFFFF, EC_WORD_I, EC_WORD_WON, EC_WORD_QUES_EXCL},
         .speechLose = {EC_WORD_AIYEEH, EC_WORD_EXCL_EXCL, 0xFFFF, EC_WORD_I_AM, EC_WORD_SORRY, EC_WORD_EXCL_EXCL},
-        .monSets = gBattleFrontierTrainerMons_Hitomi
+        .monSet = gBattleFrontierTrainerMons_Hitomi
     },
-    [109] = {
+    [FRONTIER_TRAINER_RICARDO] = {
         .facilityClass = FACILITY_CLASS_BLACK_BELT,
         .trainerName = _("RICARDO"),
         .speechBefore = {EC_WORD_COME_ON, EC_WORD_EXCL, EC_WORD_PLAY, EC_WORD_TIME, EC_WORD_IS, EC_WORD_OVER},
         .speechWin = {EC_WORD_YOU_RE, EC_WORD_OUT, EC_WORD_OF, EC_WORD_HERE, EC_WORD_EXCL, 0xFFFF},
         .speechLose = {EC_WORD_PLEASE, EC_WORD_DON_T, EC_WORD_HIT, EC_WORD_ME, EC_WORD_EXCL, 0xFFFF},
-        .monSets = gBattleFrontierTrainerMons_Ricardo
+        .monSet = gBattleFrontierTrainerMons_Ricardo
     },
-    [110] = {
+    [FRONTIER_TRAINER_SHIZUKA] = {
         .facilityClass = FACILITY_CLASS_BLACK_BELT,
         .trainerName = _("SHIZUKA"),
         .speechBefore = {EC_WORD_SHOW, EC_WORD_ME, EC_WORD_THAT, EC_WORD_YOU_RE, EC_WORD_SERIOUS, EC_WORD_EXCL},
         .speechWin = {EC_WORD_I, EC_WORD_WON_T, EC_WORD_FORGET, EC_WORD_ABOUT, EC_WORD_YOU, 0xFFFF},
         .speechLose = {EC_WORD_YOU_RE, EC_WORD_PERFECT, EC_WORD_IN, EC_WORD_EVERY, EC_WORD_WAY, EC_WORD_EXCL},
-        .monSets = gBattleFrontierTrainerMons_Shizuka
+        .monSet = gBattleFrontierTrainerMons_Shizuka
     },
-    [111] = {
+    [FRONTIER_TRAINER_JOANA] = {
         .facilityClass = FACILITY_CLASS_BATTLE_GIRL,
         .trainerName = _("JOANA"),
         .speechBefore = {EC_WORD_YOU_RE, EC_WORD_GOING, EC_WORD_TO, EC_WORD_LOSE, EC_WORD_RIGHT, EC_WORD_AWAY},
         .speechWin = {EC_WORD_I_AM, EC_WORD_THE, EC_WORD_WINNER, EC_WORD_HEAR, EC_WORD_ME, EC_MOVE2(ROAR)},
         .speechLose = {EC_WORD_I, EC_WORD_REFUSE, EC_WORD_TO, EC_WORD_ACCEPT, EC_WORD_THAT, EC_MOVE(OUTRAGE)},
-        .monSets = gBattleFrontierTrainerMons_Joana
+        .monSet = gBattleFrontierTrainerMons_Joana
     },
-    [112] = {
+    [FRONTIER_TRAINER_KELLY] = {
         .facilityClass = FACILITY_CLASS_BATTLE_GIRL,
         .trainerName = _("KELLY"),
         .speechBefore = {EC_WORD_MY, EC_WORD_NIGHT, EC_WORD_SCHOOL, EC_WORD_IS, EC_WORD_REALLY, EC_WORD_SCARY},
         .speechWin = {EC_WORD_A, EC_WORD_LADY, EC_WORD_GHOST, EC_WORD_APPEARS, EC_WORD_THERE, 0xFFFF},
         .speechLose = {EC_WORD_THE, EC_WORD_HOME, EC_WORD_WORK, EC_WORD_IS, EC_WORD_AWFULLY, EC_WORD_SCARY},
-        .monSets = gBattleFrontierTrainerMons_Kelly
+        .monSet = gBattleFrontierTrainerMons_Kelly
     },
-    [113] = {
+    [FRONTIER_TRAINER_RAYNA] = {
         .facilityClass = FACILITY_CLASS_BATTLE_GIRL,
         .trainerName = _("RAYNA"),
         .speechBefore = {EC_WORD_I_AM, EC_WORD_NO_1, EC_WORD_WHEN, EC_WORD_IT_S, EC_WORD_ABOUT, EC_WORD_POWER},
         .speechWin = {EC_WORD_UNDERSTAND, EC_WORD_MY, EC_WORD_POWER, EC_WORD_NOW, EC_WORD_QUES, 0xFFFF},
         .speechLose = {EC_WORD_TERRIBLE, EC_WORD_ELLIPSIS, 0xFFFF, EC_WORD_I_AM, EC_WORD_TERRIBLE, EC_WORD_ELLIPSIS},
-        .monSets = gBattleFrontierTrainerMons_Rayna
+        .monSet = gBattleFrontierTrainerMons_Rayna
     },
-    [114] = {
+    [FRONTIER_TRAINER_EVAN] = {
         .facilityClass = FACILITY_CLASS_EXPERT_M,
         .trainerName = _("EVAN"),
         .speechBefore = {EC_WORD_EVERY, EC_WORD_BATTLE, EC_WORD_HAS, EC_WORD_A, EC_WORD_SMELL, 0xFFFF},
         .speechWin = {EC_WORD_OH, EC_WORD_EXCL, EC_WORD_THE, EC_MOVE(SWEET_SCENT), EC_WORD_OF, EC_WORD_VICTORY},
         .speechLose = {EC_WORD_THE, EC_WORD_AWFUL, EC_WORD_STENCH, EC_WORD_OF, EC_WORD_A, EC_WORD_LOSS},
-        .monSets = gBattleFrontierTrainerMons_Evan
+        .monSet = gBattleFrontierTrainerMons_Evan
     },
-    [115] = {
+    [FRONTIER_TRAINER_JORDAN] = {
         .facilityClass = FACILITY_CLASS_EXPERT_M,
         .trainerName = _("JORDAN"),
         .speechBefore = {EC_WORD_GOOD, EC_WORD_EXCL, 0xFFFF, EC_WORD_COME_ON, EC_WORD_EXCL_EXCL, 0xFFFF},
         .speechWin = {EC_WORD_YOU, EC_WORD_CAN_T, EC_WORD_BEAT, EC_WORD_ME, EC_WORD_EXCL, 0xFFFF},
         .speechLose = {EC_WORD_WHAT, EC_WORD_QUES_EXCL, 0xFFFF, EC_WORD_BUT, EC_WORD_HOW, EC_WORD_QUES},
-        .monSets = gBattleFrontierTrainerMons_Jordan
+        .monSet = gBattleFrontierTrainerMons_Jordan
     },
-    [116] = {
+    [FRONTIER_TRAINER_JOEL] = {
         .facilityClass = FACILITY_CLASS_EXPERT_M,
         .trainerName = _("JOEL"),
         .speechBefore = {EC_WORD_FUFUFU, EC_WORD_ELLIPSIS, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF},
         .speechWin = {EC_WORD_GIGGLE, EC_WORD_ELLIPSIS, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF},
         .speechLose = {EC_WORD_HAHAHA, EC_WORD_ELLIPSIS, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF},
-        .monSets = gBattleFrontierTrainerMons_Joel
+        .monSet = gBattleFrontierTrainerMons_Joel
     },
-    [117] = {
+    [FRONTIER_TRAINER_KRISTEN] = {
         .facilityClass = FACILITY_CLASS_EXPERT_F,
         .trainerName = _("KRISTEN"),
         .speechBefore = {EC_WORD_HAHAHA, EC_WORD_ELLIPSIS, 0xFFFF, EC_WORD_A, EC_WORD_KID, EC_WORD_ELLIPSIS},
         .speechWin = {EC_WORD_JUST, EC_WORD_A_LITTLE, EC_WORD_KID, EC_WORD_AFTER, EC_WORD_ALL, EC_WORD_EXCL},
         .speechLose = {EC_WORD_A, EC_WORD_TOUGH, EC_WORD_KID, EC_WORD_HUH_QUES, EC_WORD_HUMPH, EC_WORD_EXCL},
-        .monSets = gBattleFrontierTrainerMons_Kristen
+        .monSet = gBattleFrontierTrainerMons_Kristen
     },
-    [118] = {
+    [FRONTIER_TRAINER_SELPHY] = {
         .facilityClass = FACILITY_CLASS_EXPERT_F,
         .trainerName = _("SELPHY"),
         .speechBefore = {EC_WORD_HUH_QUES, EC_WORD_WHAT, EC_WORD_IS_IT_QUES, 0xFFFF, 0xFFFF, 0xFFFF},
         .speechWin = {EC_WORD_OH, EC_WORD_YES, EC_WORD_EXCL, EC_WORD_WHY, EC_WORD_NOT, EC_WORD_QUES},
         .speechLose = {EC_WORD_OH, EC_WORD_NO, EC_WORD_EXCL, EC_WORD_WHY, EC_WORD_NOT, EC_WORD_QUES},
-        .monSets = gBattleFrontierTrainerMons_Selphy
+        .monSet = gBattleFrontierTrainerMons_Selphy
     },
-    [119] = {
+    [FRONTIER_TRAINER_CHLOE] = {
         .facilityClass = FACILITY_CLASS_EXPERT_F,
         .trainerName = _("CHLOE"),
         .speechBefore = {EC_WORD_COME, EC_WORD_WE, EC_WORD_WILL, EC_WORD_DO, EC_WORD_BATTLE, EC_WORD_NOW},
         .speechWin = {EC_WORD_MORE, EC_WORD_EXCL, 0xFFFF, EC_WORD_ANOTHER, EC_WORD_BATTLE, EC_WORD_EXCL},
         .speechLose = {EC_WORD_OH, EC_WORD_EXCL, 0xFFFF, EC_WORD_STRONG, EC_WORD_YOU, EC_WORD_ARE},
-        .monSets = gBattleFrontierTrainerMons_Chloe
+        .monSet = gBattleFrontierTrainerMons_Chloe
     },
-    [120] = {
+    [FRONTIER_TRAINER_NORTON] = {
         .facilityClass = FACILITY_CLASS_PSYCHIC_M,
         .trainerName = _("NORTON"),
         .speechBefore = {EC_WORD_I, EC_WORD_KNOW, EC_WORD_ONLY, EC_WORD_YOU, 0xFFFF, 0xFFFF},
         .speechWin = {EC_WORD_EXCUSE_ME, EC_WORD_BUT, EC_WORD_YOU_RE, EC_WORD_A, EC_WORD_PUSHOVER, EC_WORD_EXCL},
         .speechLose = {EC_WORD_YOU_RE, EC_WORD_SOME, EC_WORD_KIND, EC_WORD_OF, EC_WORD_AWESOME, EC_WORD_EXCL},
-        .monSets = gBattleFrontierTrainerMons_Norton
+        .monSet = gBattleFrontierTrainerMons_Norton
     },
-    [121] = {
+    [FRONTIER_TRAINER_LUKAS] = {
         .facilityClass = FACILITY_CLASS_PSYCHIC_M,
         .trainerName = _("LUKAS"),
         .speechBefore = {EC_WORD_MY, EC_WORD_JOKING, EC_WORD_IS, EC_WORD_PRETTY, EC_WORD_TERRIBLE, EC_WORD_ELLIPSIS},
         .speechWin = {EC_WORD_YOUR, EC_WORD_ROCK_HEAD, EC_WORD_EXISTS, EC_WORD_TO, EC_WORD_SHINE, EC_WORD_EXCL},
         .speechLose = {EC_WORD_YOUR, EC_WORD_ROCK_HEAD, EC_WORD_COME, EC_WORD_TO, EC_WORD_SHINE, 0xFFFF},
-        .monSets = gBattleFrontierTrainerMons_Lukas
+        .monSet = gBattleFrontierTrainerMons_Lukas
     },
-    [122] = {
+    [FRONTIER_TRAINER_ZACH] = {
         .facilityClass = FACILITY_CLASS_PSYCHIC_M,
         .trainerName = _("ZACH"),
         .speechBefore = {EC_WORD_I_AM, EC_WORD_AN, EC_WORD_EXCELLENT, EC_MOVE2(MIMIC), EC_WORD_OF, EC_WORD_POKEMON},
         .speechWin = {EC_WORD_I_AM, EC_WORD_HAPPY, EC_WORD_LIKE, EC_WORD_A_LITTLE, EC_POKEMON2(TOGEPI), EC_WORD_EXCL},
         .speechLose = {EC_WORD_I_AM, EC_WORD_ANGRY, EC_WORD_LIKE, EC_WORD_A, EC_POKEMON2(MANKEY), EC_WORD_EXCL},
-        .monSets = gBattleFrontierTrainerMons_Zach
+        .monSet = gBattleFrontierTrainerMons_Zach
     },
-    [123] = {
+    [FRONTIER_TRAINER_KAITLYN] = {
         .facilityClass = FACILITY_CLASS_PSYCHIC_F,
         .trainerName = _("KAITLYN"),
         .speechBefore = {EC_WORD_I, EC_WORD_CRUSH, EC_WORD_THINGS, EC_WORD_WITH, EC_WORD_PSYCHIC, EC_WORD_POWER},
         .speechWin = {EC_WORD_MY, EC_WORD_VICTORY, EC_WORD_WILL, EC_WORD_MAKE, EC_WORD_THE, EC_WORD_NEWS},
         .speechLose = {EC_WORD_NO, EC_WORD_NO, EC_WORD_ELLIPSIS, EC_WORD_THIS, EC_WORD_WON_T, EC_WORD_DO},
-        .monSets = gBattleFrontierTrainerMons_Kaitlyn
+        .monSet = gBattleFrontierTrainerMons_Kaitlyn
     },
-    [124] = {
+    [FRONTIER_TRAINER_BREANNA] = {
         .facilityClass = FACILITY_CLASS_PSYCHIC_F,
         .trainerName = _("BREANNA"),
         .speechBefore = {EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_WILL, EC_WORD_CRUSH, EC_WORD_YOU, EC_WORD_EXCL},
         .speechWin = {EC_WORD_HAVE, EC_WORD_SOME, EC_WORD_MORE, EC_WORD_OF, EC_WORD_THIS, EC_WORD_EXCL},
         .speechLose = {EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_GUTS, EC_WORD_AND, EC_WORD_SKILL, 0xFFFF},
-        .monSets = gBattleFrontierTrainerMons_Breanna
+        .monSet = gBattleFrontierTrainerMons_Breanna
     },
-    [125] = {
+    [FRONTIER_TRAINER_KENDRA] = {
         .facilityClass = FACILITY_CLASS_PSYCHIC_F,
         .trainerName = _("KENDRA"),
         .speechBefore = {EC_WORD_IF, EC_WORD_YOU_RE, EC_WORD_SMART, EC_WORD_STOP, EC_WORD_RIGHT, EC_WORD_NOW},
         .speechWin = {EC_WORD_I, EC_WORD_SAID, EC_WORD_THAT, EC_WORD_YOU, EC_WORD_SHOULD, EC_WORD_STOP},
         .speechLose = {EC_WORD_WHY, EC_WORD_DIDN_T, EC_WORD_YOU, EC_WORD_STOP, EC_WORD_QUES, 0xFFFF},
-        .monSets = gBattleFrontierTrainerMons_Kendra
+        .monSet = gBattleFrontierTrainerMons_Kendra
     },
-    [126] = {
+    [FRONTIER_TRAINER_MOLLY] = {
         .facilityClass = FACILITY_CLASS_HEX_MANIAC,
         .trainerName = _("MOLLY"),
         .speechBefore = {EC_WORD_WILL, EC_WORD_MY, EC_WORD_CUTE_CHARM, EC_MOVE2(ATTRACT), EC_WORD_YOU, EC_WORD_QUES},
         .speechWin = {EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_MY, EC_WORD_TOYS, EC_WORD_NOW},
         .speechLose = {EC_WORD_OH, EC_WORD_HOW, EC_WORD_COULD, EC_WORD_YOU, EC_WORD_QUES, 0xFFFF},
-        .monSets = gBattleFrontierTrainerMons_Molly
+        .monSet = gBattleFrontierTrainerMons_Molly
     },
-    [127] = {
+    [FRONTIER_TRAINER_JAZMIN] = {
         .facilityClass = FACILITY_CLASS_HEX_MANIAC,
         .trainerName = _("JAZMIN"),
         .speechBefore = {EC_WORD_I, EC_WORD_FORECAST, EC_WORD_TERRIBLE, EC_WORD_THINGS, EC_WORD_FOR, EC_WORD_YOU},
         .speechWin = {EC_WORD_THERE, EC_WORD_WASN_T, EC_WORD_MY, EC_WORD_FORECAST, EC_WORD_RIGHT, EC_WORD_QUES},
         .speechLose = {EC_WORD_MY, EC_MOVE2(FORESIGHT), EC_WORD_DIDN_T, EC_WORD_SHOW, EC_WORD_ME, EC_WORD_THIS},
-        .monSets = gBattleFrontierTrainerMons_Jazmin
+        .monSet = gBattleFrontierTrainerMons_Jazmin
     },
-    [128] = {
+    [FRONTIER_TRAINER_KELSEY] = {
         .facilityClass = FACILITY_CLASS_HEX_MANIAC,
         .trainerName = _("KELSEY"),
         .speechBefore = {EC_WORD_I, EC_WORD_HAVEN_T, EC_WORD_SLEPT, EC_WORD_IN, EC_WORD_DAYS, EC_WORD_ELLIPSIS},
         .speechWin = {EC_WORD_MY, EC_WORD_SLEEP, EC_WORD_WILL, EC_WORD_BE, EC_WORD_EXCELLENT, EC_WORD_NOW},
         .speechLose = {EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_DESTROYED, EC_WORD_MY, EC_WORD_SLEEP, EC_WORD_ELLIPSIS},
-        .monSets = gBattleFrontierTrainerMons_Kelsey
+        .monSet = gBattleFrontierTrainerMons_Kelsey
     },
-    [129] = {
+    [FRONTIER_TRAINER_JALEN] = {
         .facilityClass = FACILITY_CLASS_POKEMANIAC,
         .trainerName = _("JALEN"),
         .speechBefore = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_ALLOW, EC_WORD_POKEMON, EC_WORD_TO, EC_MOVE(THRASH)},
         .speechWin = {EC_WORD_HAHAHA, EC_WORD_EXCL, EC_WORD_ARE, EC_WORD_YOU, EC_WORD_ANGRY, EC_WORD_QUES},
         .speechLose = {EC_WORD_WHY, EC_WORD_IS, EC_WORD_THIS, EC_WORD_SO, EC_WORD_HARD, EC_WORD_QUES},
-        .monSets = gBattleFrontierTrainerMons_Jalen
+        .monSet = gBattleFrontierTrainerMons_Jalen
     },
-    [130] = {
+    [FRONTIER_TRAINER_GRIFFEN] = {
         .facilityClass = FACILITY_CLASS_POKEMANIAC,
         .trainerName = _("GRIFFEN"),
         .speechBefore = {EC_WORD_I, EC_MOVE2(SWALLOW), EC_MOVE2(SLUDGE), EC_WORD_TO, EC_MOVE2(TRANSFORM), EC_WORD_MYSELF},
         .speechWin = {EC_WORD_I, EC_WORD_HAVE, EC_WORD_A, EC_MOVE(GROWTH), EC_WORD_OF, EC_MOVE2(ACID_ARMOR)},
         .speechLose = {EC_WORD_I, EC_WORD_HAVE, EC_WORD_A, EC_MOVE(GROWTH), EC_WORD_OF, EC_WORD_SUCTION_CUPS},
-        .monSets = gBattleFrontierTrainerMons_Griffen
+        .monSet = gBattleFrontierTrainerMons_Griffen
     },
-    [131] = {
+    [FRONTIER_TRAINER_XANDER] = {
         .facilityClass = FACILITY_CLASS_POKEMANIAC,
         .trainerName = _("XANDER"),
         .speechBefore = {EC_WORD_I, EC_WORD_GOT, EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_ON, EC_WORD_RENTAL},
         .speechWin = {EC_WORD_IT_S, EC_WORD_INCREDIBLE, EC_WORD_MY, EC_WORD_RENTAL, EC_WORD_POKEMON, EC_WORD_WON},
         .speechLose = {EC_WORD_RENTAL, EC_WORD_POKEMON, EC_WORD_AREN_T, EC_WORD_UP, EC_WORD_TO, EC_MOVE2(SCRATCH)},
-        .monSets = gBattleFrontierTrainerMons_Xander
+        .monSet = gBattleFrontierTrainerMons_Xander
     },
-    [132] = {
+    [FRONTIER_TRAINER_MARVIN] = {
         .facilityClass = FACILITY_CLASS_GENTLEMAN,
         .trainerName = _("MARVIN"),
         .speechBefore = {EC_WORD_YOU_RE, EC_WORD_UP, EC_WORD_TO, EC_WORD_THE, EC_WORD_CHALLENGE, EC_WORD_QUES},
         .speechWin = {EC_WORD_I, EC_WORD_DIDN_T, EC_WORD_THINK, EC_WORD_YOU_RE, EC_WORD_GOOD, EC_WORD_ENOUGH},
         .speechLose = {EC_WORD_I_AM, EC_WORD_FEELING, EC_WORD_PERFECT, EC_WORD_THANK_YOU, EC_WORD_SO, EC_WORD_MUCH},
-        .monSets = gBattleFrontierTrainerMons_Marvin
+        .monSet = gBattleFrontierTrainerMons_Marvin
     },
-    [133] = {
+    [FRONTIER_TRAINER_BRENNAN] = {
         .facilityClass = FACILITY_CLASS_GENTLEMAN,
         .trainerName = _("BRENNAN"),
         .speechBefore = {EC_WORD_I, EC_MOVE2(WISH), EC_WORD_TO, EC_WORD_SEE, EC_WORD_THE, EC_WORD_NEWS},
         .speechWin = {EC_WORD_COMICS, EC_WORD_GET, EC_WORD_DAMP, EC_WORD_FROM, EC_WORD_DRIZZLE, EC_WORD_QUES},
         .speechLose = {EC_WORD_THE, EC_WORD_TIGHT, EC_WORD_MONEY, EC_WORD_LIVING, EC_WORD_CHANNEL, EC_WORD_QUES_EXCL},
-        .monSets = gBattleFrontierTrainerMons_Brennan
+        .monSet = gBattleFrontierTrainerMons_Brennan
     },
-    [134] = {
+    [FRONTIER_TRAINER_BALEY] = {
         .facilityClass = FACILITY_CLASS_BUG_MANIAC,
         .trainerName = _("BALEY"),
         .speechBefore = {EC_MOVE(SCREECH), EC_WORD_IS, EC_WORD_LIKE, EC_WORD_MUSIC, EC_WORD_TO_ME, EC_WORD_EXCL},
         .speechWin = {EC_WORD_MY, EC_MOVE(SCREECH), EC_WORD_STRATEGY, EC_WORD_IS, EC_WORD_THE, EC_WORD_BEST},
         .speechLose = {EC_WORD_YOU_RE, EC_WORD_SOUNDPROOF, EC_WORD_QUES, 0xFFFF, 0xFFFF, 0xFFFF},
-        .monSets = gBattleFrontierTrainerMons_Baley
+        .monSet = gBattleFrontierTrainerMons_Baley
     },
-    [135] = {
+    [FRONTIER_TRAINER_ZACKARY] = {
         .facilityClass = FACILITY_CLASS_RUIN_MANIAC,
         .trainerName = _("ZACKARY"),
         .speechBefore = {EC_WORD_CAN, EC_WORD_YOU, EC_MOVE(DIG), EC_WORD_IT, EC_WORD_YO, EC_WORD_QUES},
         .speechWin = {EC_MOVE2(TAKE_DOWN), EC_WORD_TAKE, EC_WORD_A, EC_MOVE2(DIVE), EC_WORD_YO, EC_WORD_YO},
         .speechLose = {EC_WORD_BREAK, EC_WORD_DOWN, EC_MOVE2(DIVE), EC_WORD_TIME, EC_WORD_FOR, EC_WORD_ME},
-        .monSets = gBattleFrontierTrainerMons_Zackary
+        .monSet = gBattleFrontierTrainerMons_Zackary
     },
-    [136] = {
+    [FRONTIER_TRAINER_GABRIEL] = {
         .facilityClass = FACILITY_CLASS_COLLECTOR,
         .trainerName = _("GABRIEL"),
         .speechBefore = {EC_MOVE2(POUND), EC_WORD_THE, EC_WORD_THICK_FAT, EC_WORD_ON, EC_WORD_MY, EC_MOVE2(BELLY_DRUM)},
         .speechWin = {EC_MOVE2(POUND), EC_WORD_MY, EC_MOVE2(BELLY_DRUM), EC_MOVE2(POUND), EC_WORD_MY, EC_MOVE2(BELLY_DRUM)},
         .speechLose = {EC_WORD_MY, EC_MOVE2(BELLY_DRUM), EC_WORD_WAS, EC_WORD_TOO_WEAK, EC_WORD_ELLIPSIS, 0xFFFF},
-        .monSets = gBattleFrontierTrainerMons_Gabriel
+        .monSet = gBattleFrontierTrainerMons_Gabriel
     },
-    [137] = {
+    [FRONTIER_TRAINER_EMILY] = {
         .facilityClass = FACILITY_CLASS_PARASOL_LADY,
         .trainerName = _("EMILY"),
         .speechBefore = {EC_WORD_HOW, EC_WORD_ABOUT, EC_WORD_A_TINY_BIT, EC_WORD_OF, EC_MOVE(HYPNOSIS), EC_WORD_QUES},
         .speechWin = {EC_WORD_MY, EC_MOVE(HYPNOSIS), EC_WORD_STRATEGY, EC_WORD_WORKS, EC_WORD_TO, EC_WORD_PERFECTION},
         .speechLose = {EC_WORD_MY, EC_MOVE(HYPNOSIS), EC_WORD_STRATEGY, EC_WORD_WENT, EC_WORD_BADLY, EC_WORD_ELLIPSIS},
-        .monSets = gBattleFrontierTrainerMons_Emily
+        .monSet = gBattleFrontierTrainerMons_Emily
     },
-    [138] = {
+    [FRONTIER_TRAINER_JORDYN] = {
         .facilityClass = FACILITY_CLASS_BEAUTY,
         .trainerName = _("JORDYN"),
         .speechBefore = {EC_WORD_YOU, EC_WORD_DON_T, EC_WORD_KNOW, EC_WORD_MY, EC_WORD_SECRET, EC_WORD_ELLIPSIS},
         .speechWin = {EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_AS, EC_WORD_I, EC_WORD_APPEAR, EC_WORD_ELLIPSIS},
         .speechLose = {EC_WORD_BUT, EC_WORD_HOW, EC_WORD_DID, EC_WORD_YOU, EC_WORD_KNOW, EC_WORD_QUES},
-        .monSets = gBattleFrontierTrainerMons_Jordyn
+        .monSet = gBattleFrontierTrainerMons_Jordyn
     },
-    [139] = {
+    [FRONTIER_TRAINER_SOFIA] = {
         .facilityClass = FACILITY_CLASS_AROMA_LADY,
         .trainerName = _("SOFIA"),
         .speechBefore = {EC_POKEMON(LOUDRED), EC_WORD_PROBABLY, EC_WORD_HAS, EC_WORD_A, EC_MOVE(SWEET_SCENT), 0xFFFF},
         .speechWin = {EC_WORD_THAT_S, EC_WORD_THE, EC_WORD_FEELING, EC_WORD_THAT, EC_WORD_I, EC_WORD_GET},
         .speechLose = {EC_WORD_I, EC_WORD_WORK, EC_WORD_AT, EC_WORD_THE, EC_WORD_DEPT_STORE, 0xFFFF},
-        .monSets = gBattleFrontierTrainerMons_Sofia
+        .monSet = gBattleFrontierTrainerMons_Sofia
     },
-    [140] = {
+    [FRONTIER_TRAINER_BRADEN] = {
         .facilityClass = FACILITY_CLASS_COOLTRAINER_M,
         .trainerName = _("BRADEN"),
         .speechBefore = {EC_WORD_I_CHOOSE_YOU, EC_WORD_EXCL, 0xFFFF, EC_WORD_THIS_IS_IT_EXCL, 0xFFFF, 0xFFFF},
         .speechWin = {EC_WORD_I_AM, EC_WORD_FEELING, EC_WORD_PRETTY, EC_WORD_AWESOME, EC_WORD_ABOUT, EC_WORD_MYSELF},
         .speechLose = {EC_WORD_ALL_RIGHT, EC_WORD_EXCL, 0xFFFF, EC_WORD_I, EC_WORD_SURRENDER, EC_WORD_EXCL},
-        .monSets = gBattleFrontierTrainerMons_Braden
+        .monSet = gBattleFrontierTrainerMons_Braden
     },
-    [141] = {
+    [FRONTIER_TRAINER_KAYDEN] = {
         .facilityClass = FACILITY_CLASS_COOLTRAINER_M,
         .trainerName = _("KAYDEN"),
         .speechBefore = {EC_WORD_THEY, EC_WORD_OVERDO, EC_WORD_THAT, EC_WORD_GOURMET, EC_WORD_THING, EC_WORD_ELLIPSIS},
         .speechWin = {EC_WORD_THAT, EC_WORD_GOURMET, EC_WORD_THING, EC_WORD_ISN_T, EC_WORD_FOR, EC_WORD_ME},
         .speechLose = {EC_WORD_HEY, EC_WORD_THIS, EC_WORD_IS, EC_WORD_PRETTY, EC_WORD_TASTY, 0xFFFF},
-        .monSets = gBattleFrontierTrainerMons_Kayden
+        .monSet = gBattleFrontierTrainerMons_Kayden
     },
-    [142] = {
+    [FRONTIER_TRAINER_COOPER] = {
         .facilityClass = FACILITY_CLASS_COOLTRAINER_M,
         .trainerName = _("COOPER"),
         .speechBefore = {EC_WORD_THIS, EC_WORD_SHOULD, EC_WORD_ABSOLUTELY, EC_WORD_BE, EC_WORD_A, EC_WORD_PUSHOVER},
         .speechWin = {EC_WORD_THAT_WAS, EC_WORD_TOO, EC_WORD_EXCITING, EC_WORD_FOR, EC_WORD_ME, EC_WORD_ELLIPSIS},
         .speechLose = {EC_WORD_PLEASE, EC_WORD_EXCL, 0xFFFF, EC_WORD_SORRY, EC_WORD_I_AM, EC_WORD_SORRY},
-        .monSets = gBattleFrontierTrainerMons_Cooper
+        .monSet = gBattleFrontierTrainerMons_Cooper
     },
-    [143] = {
+    [FRONTIER_TRAINER_JULIA] = {
         .facilityClass = FACILITY_CLASS_COOLTRAINER_F,
         .trainerName = _("JULIA"),
         .speechBefore = {EC_WORD_SPIRIT, EC_WORD_ALONE, EC_WORD_WON_T, EC_WORD_MAKE, EC_WORD_YOU, EC_WORD_WIN},
         .speechWin = {EC_WORD_YOU, EC_WORD_SHOULD, EC_WORD_ACCEPT, EC_WORD_THIS, EC_WORD_WITH, EC_WORD_SERENE_GRACE},
         .speechLose = {EC_WORD_FOR_NOW, EC_WORD_GOOD_BYE, EC_WORD_BUT, EC_WORD_IT_S, EC_WORD_NOT, EC_WORD_OVER},
-        .monSets = gBattleFrontierTrainerMons_Julia
+        .monSet = gBattleFrontierTrainerMons_Julia
     },
-    [144] = {
+    [FRONTIER_TRAINER_AMARA] = {
         .facilityClass = FACILITY_CLASS_COOLTRAINER_F,
         .trainerName = _("AMARA"),
         .speechBefore = {EC_WORD_WROOOAAR_EXCL, EC_WORD_EXCL_EXCL, EC_WORD_I_AM, EC_WORD_SO, EC_WORD_READY, EC_WORD_EXCL_EXCL},
         .speechWin = {EC_WORD_I, EC_WORD_LOSE, EC_WORD_MYSELF, EC_WORD_IF, EC_WORD_IT_S, EC_WORD_EXCITING},
         .speechLose = {EC_WORD_THAT_S, EC_WORD_TOO, EC_WORD_MUCH, EC_WORD_TO, EC_MOVE2(TACKLE), EC_WORD_EXCL},
-        .monSets = gBattleFrontierTrainerMons_Amara
+        .monSet = gBattleFrontierTrainerMons_Amara
     },
-    [145] = {
+    [FRONTIER_TRAINER_LYNN] = {
         .facilityClass = FACILITY_CLASS_COOLTRAINER_F,
         .trainerName = _("LYNN"),
         .speechBefore = {EC_WORD_YOUR, EC_WORD_SECRET, EC_WORD_CAN_T, EC_WORD_BE, EC_WORD_HIDDEN, EC_WORD_FOREVER},
         .speechWin = {EC_WORD_I, EC_WORD_KNOW, EC_WORD_YOUR, EC_WORD_SECRET, EC_WORD_NOW, EC_WORD_EXCL},
         .speechLose = {EC_WORD_YOU, EC_WORD_CAN_T, EC_MOVE(SAFEGUARD), EC_WORD_YOUR, EC_WORD_OWN, EC_WORD_SECRET},
-        .monSets = gBattleFrontierTrainerMons_Lynn
+        .monSet = gBattleFrontierTrainerMons_Lynn
     },
-    [146] = {
+    [FRONTIER_TRAINER_JOVAN] = {
         .facilityClass = FACILITY_CLASS_PKMN_RANGER_M,
         .trainerName = _("JOVAN"),
         .speechBefore = {EC_WORD_YOUR, EC_WORD_BATTLE, EC_WORD_SENSE, EC_WORD_IS, EC_WORD_SADLY, EC_WORD_LACKING},
         .speechWin = {EC_WORD_MY, EC_WORD_BATTLE, EC_WORD_SENSE, EC_WORD_IS, EC_WORD_COOL, EC_WORD_ISN_T_IT_QUES},
         .speechLose = {EC_WORD_I_WAS, EC_WORD_MINUS, EC_WORD_MY, EC_WORD_NORMAL, EC_WORD_POWER, EC_WORD_TODAY},
-        .monSets = gBattleFrontierTrainerMons_Jovan
+        .monSet = gBattleFrontierTrainerMons_Jovan
     },
-    [147] = {
+    [FRONTIER_TRAINER_DOMINIC] = {
         .facilityClass = FACILITY_CLASS_PKMN_RANGER_M,
         .trainerName = _("DOMINIC"),
         .speechBefore = {EC_WORD_I, EC_WORD_HAVE, EC_WORD_THIS, EC_WORD_EXCELLENT, EC_WORD_CAMERA, 0xFFFF},
         .speechWin = {EC_WORD_MY, EC_WORD_CAMERA, EC_WORD_WAS, EC_WORD_AWFULLY, EC_WORD_EXPENSIVE, 0xFFFF},
         .speechLose = {EC_WORD_MY, EC_WORD_CAMERA, EC_WORD_DOESN_T, EC_WORD_MISS, EC_WORD_A, EC_WORD_THING},
-        .monSets = gBattleFrontierTrainerMons_Dominic
+        .monSet = gBattleFrontierTrainerMons_Dominic
     },
-    [148] = {
+    [FRONTIER_TRAINER_NIKOLAS] = {
         .facilityClass = FACILITY_CLASS_PKMN_RANGER_M,
         .trainerName = _("NIKOLAS"),
         .speechBefore = {EC_WORD_I, EC_MOVE2(MIMIC), EC_WORD_POKEMON, EC_WORD_AFTER, EC_WORD_EVERY, EC_WORD_BATTLE},
         .speechWin = {EC_WORD_IF_I_WIN, EC_WORD_I, EC_WORD_PRETEND, EC_WORD_I_AM, EC_WORD_A, EC_POKEMON2(TAUROS)},
         .speechLose = {EC_WORD_IF_I_LOSE, EC_WORD_I, EC_WORD_PRETEND, EC_WORD_I_AM, EC_WORD_A, EC_POKEMON2(MILTANK)},
-        .monSets = gBattleFrontierTrainerMons_Nikolas
+        .monSet = gBattleFrontierTrainerMons_Nikolas
     },
-    [149] = {
+    [FRONTIER_TRAINER_VALERIA] = {
         .facilityClass = FACILITY_CLASS_PKMN_RANGER_F,
         .trainerName = _("VALERIA"),
         .speechBefore = {EC_WORD_I, EC_MOVE2(WISH), EC_WORD_YOU, EC_WORD_WOULD, EC_WORD_NOT, EC_MOVE2(GLARE)},
         .speechWin = {EC_WORD_YOU_RE, EC_WORD_MEAN, EC_WORD_EXCL, EC_WORD_I, EC_WORD_MEAN, EC_WORD_REALLY},
         .speechLose = {EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_A, EC_WORD_REALLY, EC_MOVE(SCARY_FACE), EC_WORD_EXCL},
-        .monSets = gBattleFrontierTrainerMons_Valeria
+        .monSet = gBattleFrontierTrainerMons_Valeria
     },
-    [150] = {
+    [FRONTIER_TRAINER_DELANEY] = {
         .facilityClass = FACILITY_CLASS_PKMN_RANGER_F,
         .trainerName = _("DELANEY"),
         .speechBefore = {EC_WORD_SCHOOL, EC_WORD_IS, EC_WORD_OVER, EC_WORD_TIME, EC_WORD_TO, EC_WORD_PLAY},
         .speechWin = {EC_WORD_MY, EC_WORD_BOY, EC_WORD_FRIEND, EC_WORD_IS, EC_WORD_FROM, EC_WORD_SCHOOL},
         .speechLose = {EC_WORD_I, EC_WORD_HAVE, EC_WORD_TO, EC_WORD_WORK, EC_WORD_NEXT, EC_WORD_WEEK},
-        .monSets = gBattleFrontierTrainerMons_Delaney
+        .monSet = gBattleFrontierTrainerMons_Delaney
     },
-    [151] = {
+    [FRONTIER_TRAINER_MEGHAN] = {
         .facilityClass = FACILITY_CLASS_PKMN_RANGER_F,
         .trainerName = _("MEGHAN"),
         .speechBefore = {EC_WORD_SCHOOL, EC_WORD_IS, EC_WORD_OUT, EC_WORD_TIME, EC_WORD_TO, EC_WORD_PLAY},
         .speechWin = {EC_WORD_MY, EC_WORD_BOY, EC_WORD_FRIEND, EC_WORD_LIKES, EC_WORD_COMICS, 0xFFFF},
         .speechLose = {EC_WORD_IT_S, EC_WORD_BACK, EC_WORD_TO, EC_WORD_SCHOOL, EC_WORD_SOON, 0xFFFF},
-        .monSets = gBattleFrontierTrainerMons_Meghan
+        .monSet = gBattleFrontierTrainerMons_Meghan
     },
-    [152] = {
+    [FRONTIER_TRAINER_ROBERTO] = {
         .facilityClass = FACILITY_CLASS_DRAGON_TAMER,
         .trainerName = _("ROBERTO"),
         .speechBefore = {EC_WORD_DRAGON, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_INVINCIBLE, EC_WORD_EXCL, 0xFFFF},
         .speechWin = {EC_WORD_YOU, EC_WORD_WEREN_T, EC_WORD_BAD, EC_WORD_I_WAS, EC_WORD_JUST, EC_WORD_BETTER},
         .speechLose = {EC_WORD_AREN_T, EC_WORD_YOU, EC_WORD_SATISFIED, EC_WORD_YET, EC_WORD_QUES, 0xFFFF},
-        .monSets = gBattleFrontierTrainerMons_Roberto
+        .monSet = gBattleFrontierTrainerMons_Roberto
     },
-    [153] = {
+    [FRONTIER_TRAINER_DAMIAN] = {
         .facilityClass = FACILITY_CLASS_DRAGON_TAMER,
         .trainerName = _("DAMIAN"),
         .speechBefore = {EC_WORD_MY, EC_WORD_PURE_POWER, EC_WORD_IS, EC_WORD_MACHINE, EC_WORD_LIKE, EC_WORD_EXCL},
         .speechWin = {EC_WORD_MY, EC_MOVE2(MACH_PUNCH), EC_WORD_WILL, EC_WORD_MAKE, EC_WORD_A, EC_MOVE(BRICK_BREAK)},
         .speechLose = {EC_WORD_ARRGH, EC_WORD_EXCL, 0xFFFF, EC_WORD_NO, EC_WORD_EXCL_EXCL, 0xFFFF},
-        .monSets = gBattleFrontierTrainerMons_Damian
+        .monSet = gBattleFrontierTrainerMons_Damian
     },
-    [154] = {
+    [FRONTIER_TRAINER_BRODY] = {
         .facilityClass = FACILITY_CLASS_DRAGON_TAMER,
         .trainerName = _("BRODY"),
         .speechBefore = {EC_WORD_MY, EC_WORD_FASHION, EC_WORD_SENSE, EC_WORD_SEEMS, EC_POKEMON(ODDISH), EC_WORD_QUES},
         .speechWin = {EC_WORD_IT_S, EC_WORD_MY, EC_WORD_FAMILY, EC_WORD_STAY_AT_HOME, EC_WORD_LOOK, EC_WORD_EXCL},
         .speechLose = {EC_WORD_I, EC_WORD_QUESTION, EC_WORD_YOUR, EC_WORD_FASHION, EC_WORD_SENSE, EC_WORD_SERIOUSLY},
-        .monSets = gBattleFrontierTrainerMons_Brody
+        .monSet = gBattleFrontierTrainerMons_Brody
     },
-    [155] = {
+    [FRONTIER_TRAINER_GRAHAM] = {
         .facilityClass = FACILITY_CLASS_DRAGON_TAMER,
         .trainerName = _("GRAHAM"),
         .speechBefore = {EC_WORD_YEAH, EC_WORD_EXCL, 0xFFFF, EC_WORD_YEAH_YEAH, EC_WORD_EXCL_EXCL, 0xFFFF},
         .speechWin = {EC_WORD_WAHAHAHA, EC_WORD_WAHAHAHA, EC_WORD_EXCL, EC_WORD_WAHAHAHA, EC_WORD_WAHAHAHA, EC_WORD_EXCL_EXCL},
         .speechLose = {EC_WORD_I_AM, EC_WORD_SORRY, EC_WORD_ELLIPSIS, EC_WORD_IT_S, EC_WORD_MY, EC_WORD_BAD},
-        .monSets = gBattleFrontierTrainerMons_Graham
+        .monSet = gBattleFrontierTrainerMons_Graham
     },
-    [156] = {
+    [FRONTIER_TRAINER_TYLOR] = {
         .facilityClass = FACILITY_CLASS_POKEFAN_M,
         .trainerName = _("TYLOR"),
         .speechBefore = {EC_WORD_ARE, EC_WORD_YOU, EC_WORD_FEELING, EC_WORD_MY, EC_MOVE2(HEAT_WAVE), EC_WORD_QUES},
         .speechWin = {EC_WORD_YES, EC_WORD_I_AM, EC_WORD_ON, EC_WORD_FIRE, EC_WORD_EXCL, 0xFFFF},
         .speechLose = {EC_WORD_BUT, EC_WORD_I_WAS, EC_WORD_ON, EC_WORD_FIRE, EC_WORD_FOR, EC_WORD_YOU},
-        .monSets = gBattleFrontierTrainerMons_Tylor
+        .monSet = gBattleFrontierTrainerMons_Tylor
     },
-    [157] = {
+    [FRONTIER_TRAINER_JAREN] = {
         .facilityClass = FACILITY_CLASS_POKEFAN_F,
         .trainerName = _("JAREN"),
         .speechBefore = {EC_WORD_FIGHTING, EC_WORD_SPIRIT, EC_WORD_QUES, EC_WORD_ME, EC_WORD_QUES, 0xFFFF},
         .speechWin = {EC_WORD_I, EC_WORD_WANT, EC_WORD_MORE, EC_WORD_CUTE, EC_WORD_POKEMON, 0xFFFF},
         .speechLose = {EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_LOOK, EC_WORD_QUITE, EC_WORD_CUTE, 0xFFFF},
-        .monSets = gBattleFrontierTrainerMons_Jaren
+        .monSet = gBattleFrontierTrainerMons_Jaren
     },
-    [158] = {
+    [FRONTIER_TRAINER_CORDELL] = {
         .facilityClass = FACILITY_CLASS_PKMN_BREEDER_M,
         .trainerName = _("CORDELL"),
         .speechBefore = {EC_WORD_A, EC_WORD_BATTLE, EC_WORD_IS, EC_WORD_DECIDED, EC_WORD_ON, EC_WORD_SPIRIT},
         .speechWin = {EC_WORD_CAN_T, EC_WORD_YOU, EC_WORD_ACCEPT, EC_WORD_THAT, EC_WORD_QUES, 0xFFFF},
         .speechLose = {EC_WORD_I, EC_WORD_WILL, EC_WORD_BE, EC_WORD_ON, EC_WORD_MY, EC_WORD_WAY},
-        .monSets = gBattleFrontierTrainerMons_Cordell
+        .monSet = gBattleFrontierTrainerMons_Cordell
     },
-    [159] = {
-        .facilityClass = FACILITY_CLASS_POKEMON_BREEDER_F,
+    [FRONTIER_TRAINER_JAZLYN] = {
+        .facilityClass = FACILITY_CLASS_PKMN_BREEDER_F,
         .trainerName = _("JAZLYN"),
         .speechBefore = {EC_WORD_IS, EC_WORD_YOUR, EC_WORD_POKEDEX, EC_WORD_REALLY, EC_WORD_AWESOME, EC_WORD_QUES},
         .speechWin = {EC_WORD_OH_YEAH, EC_WORD_WOW, EC_WORD_YOUR, EC_WORD_POKEDEX, EC_WORD_IS, EC_WORD_SUPER},
         .speechLose = {EC_WORD_AN, EC_WORD_AVANT_GARDE, EC_WORD_POKEDEX, EC_WORD_WOULD, EC_WORD_BE, EC_WORD_AWESOME},
-        .monSets = gBattleFrontierTrainerMons_Jazlyn
+        .monSet = gBattleFrontierTrainerMons_Jazlyn
     },
-    [160] = {
+    [FRONTIER_TRAINER_ZACHERY] = {
         .facilityClass = FACILITY_CLASS_YOUNGSTER,
         .trainerName = _("ZACHERY"),
         .speechBefore = {EC_WORD_I, EC_WORD_HAVE, EC_WORD_MY, EC_WORD_OWN, EC_WORD_PLACE, EC_WORD_YEEHAW_EXCL},
         .speechWin = {EC_WORD_IT_S, EC_WORD_AN, EC_WORD_EXCITING, EC_WORD_TIME, EC_WORD_FOR, EC_WORD_ME},
         .speechLose = {EC_WORD_YOU, EC_WORD_CAN_T, EC_WORD_FLATTEN, EC_WORD_MY, EC_WORD_HAPPINESS, EC_WORD_EXCL},
-        .monSets = gBattleFrontierTrainerMons_Zachery
+        .monSet = gBattleFrontierTrainerMons_Zachery
     },
-    [161] = {
+    [FRONTIER_TRAINER_JOHAN] = {
         .facilityClass = FACILITY_CLASS_YOUNGSTER,
         .trainerName = _("JOHAN"),
         .speechBefore = {EC_WORD_WINTER, EC_WORD_WILL, EC_WORD_SOON, EC_WORD_BE, EC_WORD_HERE, 0xFFFF},
         .speechWin = {EC_WORD_MY, EC_WORD_ALLOWANCE, EC_WORD_COULD, EC_WORD_USE, EC_WORD_A, EC_MOVE2(HELPING_HAND)},
         .speechLose = {EC_WORD_I, EC_WORD_ALWAYS, EC_WORD_USE, EC_WORD_MY, EC_WORD_ALLOWANCE, EC_WORD_UP},
-        .monSets = gBattleFrontierTrainerMons_Johan
+        .monSet = gBattleFrontierTrainerMons_Johan
     },
-    [162] = {
+    [FRONTIER_TRAINER_SHEA] = {
         .facilityClass = FACILITY_CLASS_LASS,
         .trainerName = _("SHEA"),
         .speechBefore = {EC_WORD_DO, EC_WORD_YOU, EC_WORD_BATTLE, EC_WORD_WITH, EC_WORD_BEAUTY, EC_WORD_QUES},
         .speechWin = {EC_WORD_YOU, EC_WORD_BATTLE, EC_WORD_IN, EC_WORD_AN, EC_WORD_UGLY, EC_WORD_WAY},
         .speechLose = {EC_WORD_WHAT, EC_WORD_IS, EC_WORD_BEAUTY, EC_WORD_TO, EC_WORD_YOU, EC_WORD_QUES},
-        .monSets = gBattleFrontierTrainerMons_Shea
+        .monSet = gBattleFrontierTrainerMons_Shea
     },
-    [163] = {
+    [FRONTIER_TRAINER_KAILA] = {
         .facilityClass = FACILITY_CLASS_LASS,
         .trainerName = _("KAILA"),
         .speechBefore = {EC_WORD_I_AM, EC_WORD_FEELING, EC_WORD_THIRSTY, EC_WORD_RIGHT, EC_WORD_NOW, EC_WORD_ELLIPSIS},
         .speechWin = {EC_WORD_I, EC_WORD_COULD, EC_WORD_USE, EC_WORD_A, EC_WORD_COLD, EC_WORD_DRINK},
         .speechLose = {EC_WORD_THAT, EC_WORD_LOSS, EC_WORD_IS, EC_WORD_HARD, EC_WORD_TO, EC_MOVE2(SWALLOW)},
-        .monSets = gBattleFrontierTrainerMons_Kaila
+        .monSet = gBattleFrontierTrainerMons_Kaila
     },
-    [164] = {
+    [FRONTIER_TRAINER_ISIAH] = {
         .facilityClass = FACILITY_CLASS_SCHOOL_KID_M,
         .trainerName = _("ISIAH"),
         .speechBefore = {EC_WORD_I, EC_WORD_PRETEND, EC_WORD_TO, EC_WORD_STUDY, EC_WORD_A_LOT, 0xFFFF},
         .speechWin = {EC_WORD_I, EC_MOVE2(TRICK), EC_WORD_MOTHER, EC_WORD_FOR, EC_WORD_MY, EC_WORD_ALLOWANCE},
         .speechLose = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_WANT, EC_WORD_TO, EC_WORD_STUDY, EC_WORD_MORE},
-        .monSets = gBattleFrontierTrainerMons_Isiah
+        .monSet = gBattleFrontierTrainerMons_Isiah
     },
-    [165] = {
+    [FRONTIER_TRAINER_GARRETT] = {
         .facilityClass = FACILITY_CLASS_SCHOOL_KID_M,
         .trainerName = _("GARRETT"),
         .speechBefore = {EC_WORD_I, EC_WORD_ENJOY, EC_WORD_COMICS, EC_WORD_AND, EC_WORD_THIS, EC_WORD_GAME},
         .speechWin = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_THIS, EC_WORD_MUSIC, EC_WORD_IDOL, EC_WORD_TOO},
         .speechLose = {EC_WORD_BUT, EC_WORD_I, EC_WORD_HAVE, EC_WORD_TO, EC_WORD_STUDY, EC_WORD_MORE},
-        .monSets = gBattleFrontierTrainerMons_Garrett
+        .monSet = gBattleFrontierTrainerMons_Garrett
     },
-    [166] = {
+    [FRONTIER_TRAINER_HAYLIE] = {
         .facilityClass = FACILITY_CLASS_SCHOOL_KID_F,
         .trainerName = _("HAYLIE"),
         .speechBefore = {EC_WORD_I, EC_WORD_WORRY, EC_WORD_TOO, EC_WORD_MUCH, EC_WORD_TO, EC_WORD_SLEEP},
         .speechWin = {EC_WORD_A, EC_WORD_WIN, EC_WORD_GIVES, EC_WORD_ME, EC_WORD_A, EC_MOVE2(CALM_MIND)},
         .speechLose = {EC_WORD_MY, EC_WORD_INSOMNIA, EC_WORD_WILL, EC_WORD_GET, EC_WORD_BAD, EC_WORD_ELLIPSIS},
-        .monSets = gBattleFrontierTrainerMons_Haylie
+        .monSet = gBattleFrontierTrainerMons_Haylie
     },
-    [167] = {
+    [FRONTIER_TRAINER_MEGAN] = {
         .facilityClass = FACILITY_CLASS_SCHOOL_KID_F,
         .trainerName = _("MEGAN"),
         .speechBefore = {EC_WORD_I, EC_WORD_BELIEVE, EC_WORD_IN, EC_WORD_AN, EC_MOVE(AROMATHERAPY), EC_WORD_BATH},
         .speechWin = {EC_WORD_I, EC_WORD_WANT, EC_WORD_A, EC_WORD_HEALTHY, EC_WORD_CLEAR_BODY, 0xFFFF},
         .speechLose = {EC_WORD_IF, EC_WORD_ONLY, EC_MOVE(AROMATHERAPY), EC_WORD_WERE, EC_WORD_LESS, EC_WORD_EXPENSIVE},
-        .monSets = gBattleFrontierTrainerMons_Megan
+        .monSet = gBattleFrontierTrainerMons_Megan
     },
-    [168] = {
+    [FRONTIER_TRAINER_ISSAC] = {
         .facilityClass = FACILITY_CLASS_RICH_BOY,
         .trainerName = _("ISSAC"),
         .speechBefore = {EC_WORD_MY, EC_WORD_HOBBY, EC_WORD_QUES, 0xFFFF, 0xFFFF, 0xFFFF},
         .speechWin = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_ANY, EC_WORD_KIND, EC_WORD_OF, EC_MOVE2(WATER_SPORT)},
         .speechLose = {EC_WORD_I, EC_WORD_DISLIKE, EC_WORD_ANY, EC_WORD_KIND, EC_WORD_OF, EC_MOVE2(MUD_SPORT)},
-        .monSets = gBattleFrontierTrainerMons_Issac
+        .monSet = gBattleFrontierTrainerMons_Issac
     },
-    [169] = {
+    [FRONTIER_TRAINER_QUINTON] = {
         .facilityClass = FACILITY_CLASS_RICH_BOY,
         .trainerName = _("QUINTON"),
         .speechBefore = {EC_WORD_I_AM, EC_WORD_SAD, EC_WORD_CAUSE, EC_WORD_I_AM, EC_WORD_TOO_WEAK, 0xFFFF},
         .speechWin = {EC_WORD_YOU, EC_WORD_AREN_T, EC_WORD_TOO_STRONG, EC_WORD_FOR, EC_WORD_ME, 0xFFFF},
         .speechLose = {EC_WORD_HEY, EC_WORD_WHAT, EC_WORD_DID, EC_WORD_I, EC_WORD_DO, EC_WORD_QUES},
-        .monSets = gBattleFrontierTrainerMons_Quinton
+        .monSet = gBattleFrontierTrainerMons_Quinton
     },
-    [170] = {
+    [FRONTIER_TRAINER_SALMA] = {
         .facilityClass = FACILITY_CLASS_LADY,
         .trainerName = _("SALMA"),
         .speechBefore = {EC_WORD_YOU_VE, EC_WORD_GOT, EC_WORD_YOUR, EC_WORD_HUSTLE, EC_WORD_ON, EC_WORD_EXCL},
         .speechWin = {EC_WORD_I, EC_WORD_WIN, EC_WORD_YOU, EC_WORD_HUSTLE, EC_WORD_ON, EC_WORD_OUT},
         .speechLose = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_GET, EC_WORD_HOW, EC_WORD_I, EC_WORD_LOST},
-        .monSets = gBattleFrontierTrainerMons_Salma
+        .monSet = gBattleFrontierTrainerMons_Salma
     },
-    [171] = {
+    [FRONTIER_TRAINER_ANSLEY] = {
         .facilityClass = FACILITY_CLASS_LADY,
         .trainerName = _("ANSLEY"),
         .speechBefore = {EC_WORD_I_AM, EC_WORD_BORED, EC_WORD_ELLIPSIS, EC_WORD_DANCE, EC_WORD_FOR, EC_WORD_ME},
         .speechWin = {EC_WORD_YOU_VE, EC_WORD_BORED, EC_WORD_ME, EC_WORD_SOME, EC_WORD_MORE, 0xFFFF},
         .speechLose = {EC_WORD_TAKE, EC_WORD_YOUR, EC_MOVE2(FRUSTRATION), EC_WORD_SOME, EC_WORD_OTHER, EC_WORD_PLACE},
-        .monSets = gBattleFrontierTrainerMons_Ansley
+        .monSet = gBattleFrontierTrainerMons_Ansley
     },
-    [172] = {
+    [FRONTIER_TRAINER_HOLDEN] = {
         .facilityClass = FACILITY_CLASS_BUG_CATCHER,
         .trainerName = _("HOLDEN"),
         .speechBefore = {EC_WORD_LET_S, EC_WORD_COMMEMORATE, EC_WORD_MY, EC_WORD_COOLNESS, EC_WORD_IN, EC_WORD_BATTLE},
         .speechWin = {EC_WORD_YOU_RE, EC_WORD_TOO_WEAK, EC_WORD_FOR, EC_WORD_ANY, EC_WORD_PRAISE, 0xFFFF},
         .speechLose = {EC_WORD_YOUR, EC_WORD_BATTLE, EC_WORD_SENSE, EC_WORD_IS, EC_WORD_AMUSING, 0xFFFF},
-        .monSets = gBattleFrontierTrainerMons_Holden
+        .monSet = gBattleFrontierTrainerMons_Holden
     },
-    [173] = {
+    [FRONTIER_TRAINER_LUCA] = {
         .facilityClass = FACILITY_CLASS_BUG_CATCHER,
         .trainerName = _("LUCA"),
         .speechBefore = {EC_WORD_WE, EC_WORD_WILL, EC_WORD_HAVE, EC_WORD_A, EC_WORD_COOL, EC_WORD_BATTLE},
         .speechWin = {EC_WORD_I, EC_WORD_WON, EC_WORD_IN, EC_WORD_A, EC_WORD_COOL, EC_WORD_WAY},
         .speechLose = {EC_WORD_HELLO, EC_WORD_QUES, EC_WORD_I_AM, EC_WORD_JUST, EC_WORD_A, EC_WORD_KID},
-        .monSets = gBattleFrontierTrainerMons_Luca
+        .monSet = gBattleFrontierTrainerMons_Luca
     },
-    [174] = {
+    [FRONTIER_TRAINER_JAMISON] = {
         .facilityClass = FACILITY_CLASS_NINJA_BOY,
         .trainerName = _("JAMISON"),
         .speechBefore = {EC_WORD_MY, EC_MOVE2(SECRET_POWER), EC_WORD_IS, EC_WORD_OVERWHELMING, EC_WORD_TO, EC_WORD_POKEMON},
         .speechWin = {EC_WORD_DID, EC_WORD_YOU, EC_WORD_SEE, EC_WORD_THAT, EC_WORD_QUES, 0xFFFF},
         .speechLose = {EC_WORD_I, EC_WORD_WILL, EC_WORD_USE, EC_MOVE(SMOKESCREEN), EC_WORD_TO, EC_WORD_ESCAPE},
-        .monSets = gBattleFrontierTrainerMons_Jamison
+        .monSet = gBattleFrontierTrainerMons_Jamison
     },
-    [175] = {
+    [FRONTIER_TRAINER_GUNNAR] = {
         .facilityClass = FACILITY_CLASS_NINJA_BOY,
         .trainerName = _("GUNNAR"),
         .speechBefore = {EC_WORD_I, EC_MOVE(CUT), EC_WORD_DOWN, EC_WORD_EVERY, EC_WORD_OPPONENT, 0xFFFF},
         .speechWin = {EC_WORD_DON_T, EC_MOVE(GRUDGE), EC_WORD_ME, EC_WORD_FOR, EC_WORD_YOUR, EC_WORD_LOSS},
         .speechLose = {EC_WORD_PLEASE, EC_WORD_LOSE, EC_WORD_THAT, EC_MOVE(SCARY_FACE), EC_WORD_OF, EC_WORD_YOURS},
-        .monSets = gBattleFrontierTrainerMons_Gunnar
+        .monSet = gBattleFrontierTrainerMons_Gunnar
     },
-    [176] = {
+    [FRONTIER_TRAINER_CRAIG] = {
         .facilityClass = FACILITY_CLASS_TUBER_M,
         .trainerName = _("CRAIG"),
         .speechBefore = {EC_WORD_I, EC_WORD_CAN_T, EC_WORD_WAIT, EC_WORD_FOR, EC_WORD_MY, EC_WORD_TRAIN},
         .speechWin = {EC_WORD_MY, EC_WORD_TRAIN, EC_WORD_ISN_T, EC_WORD_HERE, EC_WORD_YET, EC_WORD_ELLIPSIS},
         .speechLose = {EC_WORD_HERE_IT_IS, EC_WORD_MY, EC_WORD_TRAIN, EC_WORD_SEE_YA, EC_WORD_EXCL, 0xFFFF},
-        .monSets = gBattleFrontierTrainerMons_Craig
+        .monSet = gBattleFrontierTrainerMons_Craig
     },
-    [177] = {
+    [FRONTIER_TRAINER_PIERCE] = {
         .facilityClass = FACILITY_CLASS_TUBER_M,
         .trainerName = _("PIERCE"),
         .speechBefore = {EC_WORD_THERE, EC_WORD_WAS, EC_WORD_A, EC_MOVE2(HEAT_WAVE), EC_WORD_LAST, EC_WORD_WEEK},
         .speechWin = {EC_WORD_I, EC_WORD_CAN_T, EC_WORD_TAKE, EC_WORD_A, EC_MOVE2(HEAT_WAVE), 0xFFFF},
         .speechLose = {EC_WORD_DIDN_T, EC_WORD_IT, EC_MOVE(HAIL), EC_WORD_TOO, EC_WORD_QUES, 0xFFFF},
-        .monSets = gBattleFrontierTrainerMons_Pierce
+        .monSet = gBattleFrontierTrainerMons_Pierce
     },
-    [178] = {
+    [FRONTIER_TRAINER_REGINA] = {
         .facilityClass = FACILITY_CLASS_TUBER_F,
         .trainerName = _("REGINA"),
         .speechBefore = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_TO, EC_WORD_PLAY, EC_WORD_IN, EC_WORD_WATER},
         .speechWin = {EC_WORD_I, EC_WORD_REFUSE, EC_WORD_TO, EC_WORD_COME, EC_WORD_OUT, 0xFFFF},
         .speechLose = {EC_WORD_YOU_RE, EC_WORD_NOT, EC_WORD_MUCH, EC_WORD_GOOD, EC_WORD_IN, EC_WORD_WATER},
-        .monSets = gBattleFrontierTrainerMons_Regina
+        .monSet = gBattleFrontierTrainerMons_Regina
     },
-    [179] = {
+    [FRONTIER_TRAINER_ALISON] = {
         .facilityClass = FACILITY_CLASS_TUBER_F,
         .trainerName = _("ALISON"),
         .speechBefore = {EC_WORD_THIS, EC_WORD_KINDERGARTEN, EC_WORD_MAGAZINE, EC_WORD_IS, EC_WORD_TOO, EC_WORD_MUCH},
         .speechWin = {EC_WORD_HOW, EC_WORD_TO, EC_WORD_BUG, EC_WORD_YOUR, EC_WORD_TEACHER, EC_WORD_QUES},
         .speechLose = {EC_WORD_ENJOY, EC_WORD_A, EC_WORD_TASTY, EC_WORD_SCHOOL, EC_WORD_DIET, EC_WORD_QUES},
-        .monSets = gBattleFrontierTrainerMons_Alison
+        .monSet = gBattleFrontierTrainerMons_Alison
     },
-    [180] = {
+    [FRONTIER_TRAINER_HANK] = {
         .facilityClass = FACILITY_CLASS_BUG_MANIAC,
         .trainerName = _("HANK"),
         .speechBefore = {EC_WORD_THERE, EC_WORD_IS, EC_WORD_A, EC_WORD_BUG, EC_WORD_EVENT, EC_WORD_SOON},
         .speechWin = {EC_WORD_IT_S, EC_WORD_A, EC_WORD_BUG, EC_WORD_FASHION, EC_WORD_SHOW, EC_WORD_EXCL},
         .speechLose = {EC_WORD_DON_T, EC_WORD_YOU, EC_WORD_LIKE, EC_WORD_BUG, EC_WORD_POKEMON, EC_WORD_QUES},
-        .monSets = gBattleFrontierTrainerMons_Hank
+        .monSet = gBattleFrontierTrainerMons_Hank
     },
-    [181] = {
+    [FRONTIER_TRAINER_EARL] = {
         .facilityClass = FACILITY_CLASS_BUG_MANIAC,
         .trainerName = _("EARL"),
         .speechBefore = {EC_WORD_THE, EC_WORD_INVINCIBLE, EC_WORD_BUG, EC_WORD_TRAINER, EC_WORD_IS, EC_WORD_HERE},
         .speechWin = {EC_WORD_THE, EC_WORD_INVINCIBLE, EC_WORD_BUG, EC_WORD_TRAINER, EC_WORD_AM, EC_WORD_I},
         .speechLose = {EC_WORD_SEE, EC_WORD_HOW, EC_WORD_FAST, EC_WORD_I, EC_WORD_RUN_AWAY, EC_WORD_EXCL},
-        .monSets = gBattleFrontierTrainerMons_Earl
+        .monSet = gBattleFrontierTrainerMons_Earl
     },
-    [182] = {
+    [FRONTIER_TRAINER_RAMIRO] = {
         .facilityClass = FACILITY_CLASS_FISHERMAN,
         .trainerName = _("RAMIRO"),
         .speechBefore = {EC_WORD_I, EC_WORD_WENT, EC_WORD_TO, EC_WORD_A, EC_WORD_FISHING, EC_WORD_SCHOOL},
         .speechWin = {EC_WORD_SERIOUSLY, EC_WORD_I_AM, EC_WORD_IN, EC_WORD_THE, EC_WORD_FISHING, EC_WORD_HALL_OF_FAME},
         .speechLose = {EC_WORD_I, EC_WORD_WANT, EC_WORD_TO, EC_WORD_GO, EC_WORD_BACK, EC_WORD_ELLIPSIS},
-        .monSets = gBattleFrontierTrainerMons_Ramiro
+        .monSet = gBattleFrontierTrainerMons_Ramiro
     },
-    [183] = {
+    [FRONTIER_TRAINER_HUNTER] = {
         .facilityClass = FACILITY_CLASS_FISHERMAN,
         .trainerName = _("HUNTER"),
         .speechBefore = {EC_WORD_SHOW, EC_WORD_ME, EC_WORD_A, EC_WORD_TOTALLY, EC_WORD_COOL, EC_MOVE(CROSS_CHOP)},
         .speechWin = {EC_WORD_YOU_RE, EC_WORD_TOO_WEAK, EC_WORD_TO, EC_WORD_DO, EC_WORD_A, EC_MOVE(CROSS_CHOP)},
         .speechLose = {EC_WORD_WAS, EC_WORD_IT, EC_WORD_A, EC_WORD_MISTAKE, EC_WORD_QUES, 0xFFFF},
-        .monSets = gBattleFrontierTrainerMons_Hunter
+        .monSet = gBattleFrontierTrainerMons_Hunter
     },
-    [184] = {
+    [FRONTIER_TRAINER_AIDEN] = {
         .facilityClass = FACILITY_CLASS_RUIN_MANIAC,
         .trainerName = _("AIDEN"),
         .speechBefore = {EC_WORD_MY, EC_WORD_WORK, EC_WORD_IS, EC_WORD_MAKING, EC_WORD_ME, EC_WORD_HEALTHY},
         .speechWin = {EC_WORD_YOU, EC_WORD_SEE, EC_WORD_QUES, EC_WORD_I_AM, EC_WORD_HEALTHY, EC_WORD_EXCL},
         .speechLose = {EC_WORD_YOU_RE, EC_WORD_MORE, EC_WORD_HEALTHY, EC_WORD_THAN, EC_WORD_I_AM, EC_WORD_ELLIPSIS},
-        .monSets = gBattleFrontierTrainerMons_Aiden
+        .monSet = gBattleFrontierTrainerMons_Aiden
     },
-    [185] = {
+    [FRONTIER_TRAINER_XAVIER] = {
         .facilityClass = FACILITY_CLASS_RUIN_MANIAC,
         .trainerName = _("XAVIER"),
         .speechBefore = {EC_WORD_HEY_THERE, EC_WORD_EXCL, 0xFFFF, EC_WORD_LOOK, EC_WORD_LOOK, EC_WORD_EXCL_EXCL},
         .speechWin = {EC_WORD_GOOD_BYE, EC_WORD_AND, EC_WORD_THANK_YOU, EC_WORD_THAT_WAS, EC_WORD_FUNNY, 0xFFFF},
         .speechLose = {EC_WORD_WOWEE, EC_WORD_EXCL, 0xFFFF, EC_WORD_NO, EC_WORD_NO, EC_WORD_EXCL_EXCL},
-        .monSets = gBattleFrontierTrainerMons_Xavier
+        .monSet = gBattleFrontierTrainerMons_Xavier
     },
-    [186] = {
+    [FRONTIER_TRAINER_CLINTON] = {
         .facilityClass = FACILITY_CLASS_COLLECTOR,
         .trainerName = _("CLINTON"),
         .speechBefore = {EC_WORD_WANT, EC_WORD_TO, EC_WORD_SEE, EC_WORD_MY, EC_MOVE(HYPNOSIS), EC_WORD_QUES},
         .speechWin = {EC_WORD_YOUR, EC_MOVE2(FURY_SWIPES), EC_WORD_YOUR, EC_MOVE(STRENGTH), EC_WORD_YOUNG, EC_WORD_TRAINER},
         .speechLose = {EC_WORD_TCH, EC_WORD_ELLIPSIS, 0xFFFF, EC_WORD_I_AM, EC_WORD_TOO_WEAK, EC_WORD_ELLIPSIS},
-        .monSets = gBattleFrontierTrainerMons_Clinton
+        .monSet = gBattleFrontierTrainerMons_Clinton
     },
-    [187] = {
+    [FRONTIER_TRAINER_JESSE] = {
         .facilityClass = FACILITY_CLASS_COLLECTOR,
         .trainerName = _("JESSE"),
         .speechBefore = {EC_WORD_THIS, EC_WORD_BATTLE, EC_WORD_IS, EC_WORD_FOR, EC_WORD_MY, EC_WORD_MOTHER},
         .speechWin = {EC_WORD_MOTHER, EC_WORD_WILL, EC_WORD_BE, EC_WORD_HAPPY, EC_WORD_FOR, EC_WORD_ME},
         .speechLose = {EC_WORD_I, EC_WORD_WANT, EC_WORD_MY, EC_WORD_MOTHER, EC_WORD_EXCL, 0xFFFF},
-        .monSets = gBattleFrontierTrainerMons_Jesse
+        .monSet = gBattleFrontierTrainerMons_Jesse
     },
-    [188] = {
+    [FRONTIER_TRAINER_EDUARDO] = {
         .facilityClass = FACILITY_CLASS_GUITARIST,
         .trainerName = _("EDUARDO"),
         .speechBefore = {EC_WORD_OUR, EC_WORD_MUSIC, EC_WORD_WILL, EC_WORD_PLAY, EC_WORD_ALL, EC_WORD_NIGHT},
         .speechWin = {EC_WORD_NIGHTTIME, EC_WORD_IS, EC_WORD_WHEN, EC_WORD_I, EC_WORD_PLAY, EC_WORD_BEST},
         .speechLose = {EC_WORD_LET_S, EC_WORD_PARTY, EC_WORD_UNTIL, EC_WORD_THE, EC_MOVE(MORNING_SUN), EC_WORD_EXCL},
-        .monSets = gBattleFrontierTrainerMons_Eduardo
+        .monSet = gBattleFrontierTrainerMons_Eduardo
     },
-    [189] = {
+    [FRONTIER_TRAINER_HAL] = {
         .facilityClass = FACILITY_CLASS_GUITARIST,
         .trainerName = _("HAL"),
         .speechBefore = {EC_WORD_I_AM, EC_WORD_TRENDY, EC_WORD_AREN_T, EC_WORD_I, EC_WORD_QUES, 0xFFFF},
         .speechWin = {EC_WORD_I_AM, EC_WORD_FEELING, EC_WORD_HIP_AND, EC_WORD_HAPPENING, EC_WORD_OH_YEAH, EC_WORD_EXCL},
         .speechLose = {EC_WORD_I_AM, EC_WORD_ALWAYS, EC_WORD_TRENDY, EC_WORD_THANK_YOU, EC_WORD_VERY, EC_WORD_MUCH},
-        .monSets = gBattleFrontierTrainerMons_Hal
+        .monSet = gBattleFrontierTrainerMons_Hal
     },
-    [190] = {
+    [FRONTIER_TRAINER_GAGE] = {
         .facilityClass = FACILITY_CLASS_BIRD_KEEPER,
         .trainerName = _("GAGE"),
         .speechBefore = {EC_WORD_HERE_IT_IS, EC_WORD_A, EC_WORD_FLYING, EC_WORD_TYPE, EC_WORD_HIDDEN, EC_WORD_MOVE},
         .speechWin = {EC_WORD_IT_S, EC_WORD_A, EC_WORD_FLYING, EC_WORD_TYPE, EC_WORD_VICTORY, EC_WORD_EXCL},
         .speechLose = {EC_WORD_IF_I_LOSE, EC_WORD_I, EC_WORD_JUST, EC_MOVE(FLY), EC_WORD_AWAY, 0xFFFF},
-        .monSets = gBattleFrontierTrainerMons_Gage
+        .monSet = gBattleFrontierTrainerMons_Gage
     },
-    [191] = {
+    [FRONTIER_TRAINER_ARNOLD] = {
         .facilityClass = FACILITY_CLASS_BIRD_KEEPER,
         .trainerName = _("ARNOLD"),
         .speechBefore = {EC_WORD_I_AM, EC_WORD_FEELING, EC_WORD_WEIRD, EC_WORD_FROM, EC_WORD_A, EC_WORD_DREAM},
         .speechWin = {EC_WORD_YOUR, EC_MOVE(SCARY_FACE), EC_WORD_WAS, EC_WORD_IN, EC_WORD_MY, EC_WORD_DREAM},
         .speechLose = {EC_WORD_MY, EC_WORD_INCREDIBLE, EC_WORD_DREAM, EC_WORD_WAS, EC_WORD_SO, EC_WORD_WEIRD},
-        .monSets = gBattleFrontierTrainerMons_Arnold
+        .monSet = gBattleFrontierTrainerMons_Arnold
     },
-    [192] = {
+    [FRONTIER_TRAINER_JARRETT] = {
         .facilityClass = FACILITY_CLASS_SAILOR,
         .trainerName = _("JARRETT"),
         .speechBefore = {EC_WORD_COME_ON, EC_WORD_LET_S, EC_WORD_DANCE, EC_WORD_LIKE, EC_WORD_IT_S, EC_WORD_YESTERDAY},
         .speechWin = {EC_WORD_YOU, EC_WORD_LIKE, EC_WORD_HOW, EC_WORD_I, EC_WORD_DANCE, EC_WORD_QUES},
         .speechLose = {EC_WORD_YOU, EC_WORD_DON_T, EC_WORD_APPRECIATE, EC_WORD_HOW, EC_WORD_I, EC_WORD_DANCE},
-        .monSets = gBattleFrontierTrainerMons_Jarrett
+        .monSet = gBattleFrontierTrainerMons_Jarrett
     },
-    [193] = {
+    [FRONTIER_TRAINER_GARETT] = {
         .facilityClass = FACILITY_CLASS_SAILOR,
         .trainerName = _("GARETT"),
         .speechBefore = {EC_WORD_MY, EC_WORD_GIRL, EC_WORD_GIVES, EC_WORD_ME, EC_WORD_A_LITTLE, EC_MOVE2(SWEET_KISS)},
         .speechWin = {EC_WORD_MY, EC_WORD_GIRL, EC_WORD_FRIEND, EC_WORD_IS, EC_WORD_MY, EC_WORD_TREASURE},
         .speechLose = {EC_WORD_A, EC_WORD_TREASURE, EC_WORD_ISN_T, EC_WORD_ALWAYS, EC_WORD_ABOUT, EC_WORD_MONEY},
-        .monSets = gBattleFrontierTrainerMons_Garett
+        .monSet = gBattleFrontierTrainerMons_Garett
     },
-    [194] = {
+    [FRONTIER_TRAINER_EMANUEL] = {
         .facilityClass = FACILITY_CLASS_HIKER,
         .trainerName = _("EMANUEL"),
         .speechBefore = {EC_WORD_SMARTNESS, EC_WORD_ALONE, EC_WORD_WON_T, EC_WORD_MAKE, EC_WORD_YOU, EC_WORD_WIN},
         .speechWin = {EC_WORD_I_AM, EC_WORD_NOT_VERY, EC_WORD_SMART, EC_WORD_BUT, EC_WORD_I, EC_WORD_WON},
         .speechLose = {EC_WORD_HOW, EC_WORD_DID, EC_WORD_YOU, EC_MOVE2(FAKE_OUT), EC_WORD_ME, EC_WORD_QUES},
-        .monSets = gBattleFrontierTrainerMons_Emanuel
+        .monSet = gBattleFrontierTrainerMons_Emanuel
     },
-    [195] = {
+    [FRONTIER_TRAINER_GUSTAVO] = {
         .facilityClass = FACILITY_CLASS_HIKER,
         .trainerName = _("GUSTAVO"),
         .speechBefore = {EC_MOVE(CHARGE), EC_WORD_EXCL, 0xFFFF, EC_MOVE(CHARGE), EC_WORD_EXCL_EXCL, 0xFFFF},
         .speechWin = {EC_WORD_SURRENDER, EC_WORD_QUES, 0xFFFF, EC_WORD_SO, EC_WORD_SOON, EC_WORD_QUES},
         .speechLose = {EC_WORD_YOU, EC_WORD_CAN_T, EC_WORD_MAKE, EC_WORD_ME, EC_WORD_SURRENDER, EC_WORD_YET},
-        .monSets = gBattleFrontierTrainerMons_Gustavo
+        .monSet = gBattleFrontierTrainerMons_Gustavo
     },
-    [196] = {
+    [FRONTIER_TRAINER_KAMERON] = {
         .facilityClass = FACILITY_CLASS_KINDLER,
         .trainerName = _("KAMERON"),
         .speechBefore = {EC_WORD_TAKE_THAT, EC_WORD_EXCL, EC_WORD_IT_S, EC_WORD_MY, EC_WORD_FIERY, EC_MOVE2(TRICK)},
         .speechWin = {EC_WORD_DID, EC_WORD_MY, EC_WORD_FIERY, EC_MOVE2(TRICK), EC_MOVE(ASTONISH), EC_WORD_QUES},
         .speechLose = {EC_WORD_YOU, EC_WORD_DIDN_T, EC_WORD_FALL, EC_WORD_FOR, EC_WORD_MY, EC_MOVE2(TRICK)},
-        .monSets = gBattleFrontierTrainerMons_Kameron
+        .monSet = gBattleFrontierTrainerMons_Kameron
     },
-    [197] = {
+    [FRONTIER_TRAINER_ALFREDO] = {
         .facilityClass = FACILITY_CLASS_KINDLER,
         .trainerName = _("ALFREDO"),
         .speechBefore = {EC_WORD_A, EC_WORD_FIERY, EC_WORD_GOURMET, EC_WORD_AM, EC_WORD_I, EC_WORD_EXCL},
         .speechWin = {EC_WORD_IT_S, EC_WORD_A, EC_WORD_TASTY, EC_WORD_GOURMET, EC_WORD_VICTORY, EC_WORD_EXCL},
         .speechLose = {EC_WORD_WHAT, EC_WORD_A, EC_WORD_DISASTER, EC_WORD_THAT_WAS, EC_WORD_EXCL, 0xFFFF},
-        .monSets = gBattleFrontierTrainerMons_Alfredo
+        .monSet = gBattleFrontierTrainerMons_Alfredo
     },
-    [198] = {
+    [FRONTIER_TRAINER_RUBEN] = {
         .facilityClass = FACILITY_CLASS_GENTLEMAN,
         .trainerName = _("RUBEN"),
         .speechBefore = {EC_WORD_I, EC_WORD_CAN_T, EC_WORD_WAIT, EC_WORD_TO, EC_WORD_GET, EC_WORD_GOING},
         .speechWin = {EC_WORD_GET, EC_WORD_GOING, EC_WORD_EXCL, EC_WORD_THIS, EC_WORD_IS, EC_WORD_GOOD_BYE},
         .speechLose = {EC_WORD_I_VE, EC_WORD_GOT, EC_WORD_TO, EC_WORD_GET, EC_WORD_GOING, 0xFFFF},
-        .monSets = gBattleFrontierTrainerMons_Ruben
+        .monSet = gBattleFrontierTrainerMons_Ruben
     },
-    [199] = {
+    [FRONTIER_TRAINER_LAMAR] = {
         .facilityClass = FACILITY_CLASS_GENTLEMAN,
         .trainerName = _("LAMAR"),
         .speechBefore = {EC_WORD_A, EC_MOVE2(PRESENT), EC_WORD_FOR, EC_WORD_ME, EC_WORD_QUES, 0xFFFF},
         .speechWin = {EC_WORD_MMM, EC_WORD_THIS, EC_WORD_IS, EC_WORD_QUITE, EC_WORD_TASTY, EC_WORD_ELLIPSIS},
         .speechLose = {EC_WORD_OH, EC_WORD_IT_S, EC_WORD_A, EC_WORD_GAME, EC_WORD_IS_IT_QUES, 0xFFFF},
-        .monSets = gBattleFrontierTrainerMons_Lamar
+        .monSet = gBattleFrontierTrainerMons_Lamar
     },
-    [200] = {
+    [FRONTIER_TRAINER_JAXON] = {
         .facilityClass = FACILITY_CLASS_YOUNGSTER,
         .trainerName = _("JAXON"),
         .speechBefore = {EC_WORD_A, EC_WORD_SHELL_ARMOR, EC_WORD_IS, EC_WORD_WHAT, EC_WORD_I, EC_WORD_WANT},
         .speechWin = {EC_WORD_MY, EC_WORD_FATHER, EC_WORD_AND, EC_WORD_MOTHER, EC_WORD_WON_T, EC_WORD_ACCEPT},
         .speechLose = {EC_WORD_PLEASE, EC_WORD_I, EC_WORD_NEED, EC_WORD_A, EC_WORD_SHELL_ARMOR, EC_WORD_EXCL},
-        .monSets = gBattleFrontierTrainerMons_Jaxon
+        .monSet = gBattleFrontierTrainerMons_Jaxon
     },
-    [201] = {
+    [FRONTIER_TRAINER_LOGAN] = {
         .facilityClass = FACILITY_CLASS_YOUNGSTER,
         .trainerName = _("LOGAN"),
         .speechBefore = {EC_WORD_IF_I_LOSE, EC_WORD_I, EC_WORD_WILL, EC_WORD_STUDY, EC_WORD_FOR, EC_WORD_SCHOOL},
         .speechWin = {EC_WORD_ME, EC_WORD_STUDY, EC_WORD_QUES, EC_WORD_NOT_VERY, EC_WORD_LIKELY_TO, EC_WORD_SEE},
         .speechLose = {EC_WORD_NO, EC_WORD_THANKS, EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_TO, EC_WORD_SLEEP},
-        .monSets = gBattleFrontierTrainerMons_Logan
+        .monSet = gBattleFrontierTrainerMons_Logan
     },
-    [202] = {
+    [FRONTIER_TRAINER_EMILEE] = {
         .facilityClass = FACILITY_CLASS_LASS,
         .trainerName = _("EMILEE"),
         .speechBefore = {EC_WORD_IS, EC_WORD_THIS, EC_WORD_KIND, EC_WORD_OF, EC_WORD_BATTLE, EC_WORD_OK_QUES},
         .speechWin = {EC_WORD_LET_S, EC_WORD_GO, EC_WORD_FOR, EC_WORD_AN, EC_MOVE(ICY_WIND), EC_MOVE2(SURF)},
         .speechLose = {EC_WORD_HOW, EC_WORD_ABOUT, EC_WORD_A, EC_MOVE(ROCK_SLIDE), EC_WORD_SHOW, EC_WORD_QUES},
-        .monSets = gBattleFrontierTrainerMons_Emilee
+        .monSet = gBattleFrontierTrainerMons_Emilee
     },
-    [203] = {
+    [FRONTIER_TRAINER_JOSIE] = {
         .facilityClass = FACILITY_CLASS_LASS,
         .trainerName = _("JOSIE"),
         .speechBefore = {EC_WORD_A, EC_WORD_POKEMON, EC_WORD_FASHION, EC_WORD_CONTEST, EC_WORD_IS, EC_WORD_PRETTY},
         .speechWin = {EC_WORD_I, EC_WORD_REALLY, EC_WORD_LIKE, EC_WORD_MODE, EC_WORD_FASHION, EC_WORD_THINGS},
         .speechLose = {EC_WORD_YOU_RE, EC_WORD_TOTALLY, EC_WORD_LACKING, EC_WORD_IN, EC_WORD_FASHION, EC_WORD_SENSE},
-        .monSets = gBattleFrontierTrainerMons_Josie
+        .monSet = gBattleFrontierTrainerMons_Josie
     },
-    [204] = {
+    [FRONTIER_TRAINER_ARMANDO] = {
         .facilityClass = FACILITY_CLASS_CAMPER,
         .trainerName = _("ARMANDO"),
         .speechBefore = {EC_WORD_I, EC_WORD_NEED, EC_WORD_MORE, EC_WORD_GRASS, EC_WORD_TYPE, EC_WORD_POKEMON},
         .speechWin = {EC_WORD_TRADE, EC_WORD_ME, EC_WORD_A, EC_WORD_GRASS, EC_WORD_POKEMON, EC_WORD_PLEASE},
         .speechLose = {EC_WORD_THERE, EC_WORD_AREN_T, EC_WORD_ENOUGH, EC_WORD_GRASS, EC_WORD_TYPE, EC_WORD_POKEMON},
-        .monSets = gBattleFrontierTrainerMons_Armando
+        .monSet = gBattleFrontierTrainerMons_Armando
     },
-    [205] = {
+    [FRONTIER_TRAINER_SKYLER] = {
         .facilityClass = FACILITY_CLASS_CAMPER,
         .trainerName = _("SKYLER"),
         .speechBefore = {EC_MOVE2(INGRAIN), EC_WORD_IS, EC_WORD_MY, EC_WORD_CHOICE, EC_WORD_BATTLE, EC_WORD_MOVE},
         .speechWin = {EC_WORD_YOU, EC_WORD_CAN_T, EC_WORD_MOVE, EC_WORD_ME, EC_WORD_NOW, EC_WORD_EXCL},
         .speechLose = {EC_WORD_YOU, EC_MOVE(CUT), EC_WORD_ME, EC_WORD_DOWN, EC_WORD_ELLIPSIS, 0xFFFF},
-        .monSets = gBattleFrontierTrainerMons_Skyler
+        .monSet = gBattleFrontierTrainerMons_Skyler
     },
-    [206] = {
+    [FRONTIER_TRAINER_RUTH] = {
         .facilityClass = FACILITY_CLASS_PICNICKER,
         .trainerName = _("RUTH"),
         .speechBefore = {EC_WORD_I, EC_WORD_WANT, EC_WORD_TO, EC_WORD_ENJOY, EC_WORD_THIS, EC_WORD_BATTLE},
         .speechWin = {EC_WORD_THAT_WAS, EC_WORD_MUCH, EC_WORD_TOO, EC_WORD_EASY, EC_WORD_EXCL, 0xFFFF},
         .speechLose = {EC_WORD_PLEASE, EC_WORD_STOP, EC_WORD_I, EC_WORD_DON_T, EC_WORD_ENJOY, EC_WORD_THIS},
-        .monSets = gBattleFrontierTrainerMons_Ruth
+        .monSet = gBattleFrontierTrainerMons_Ruth
     },
-    [207] = {
+    [FRONTIER_TRAINER_MELODY] = {
         .facilityClass = FACILITY_CLASS_PICNICKER,
         .trainerName = _("MELODY"),
         .speechBefore = {EC_WORD_I, EC_MOVE2(WISH), EC_WORD_SUNDAY, EC_WORD_IS, EC_WORD_A, EC_MOVE2(SUNNY_DAY)},
         .speechWin = {EC_WORD_SUNDAY, EC_WORD_SEEMS, EC_WORD_FOREVER, EC_WORD_TO, EC_WORD_COME, EC_WORD_ELLIPSIS},
         .speechLose = {EC_WORD_THE, EC_WORD_FORECAST, EC_WORD_SAYS, EC_WORD_IT, EC_WORD_WILL, EC_MOVE(HAIL)},
-        .monSets = gBattleFrontierTrainerMons_Melody
+        .monSet = gBattleFrontierTrainerMons_Melody
     },
-    [208] = {
+    [FRONTIER_TRAINER_PEDRO] = {
         .facilityClass = FACILITY_CLASS_SWIMMER_M,
         .trainerName = _("PEDRO"),
         .speechBefore = {EC_WORD_A, EC_WORD_SWIFT_SWIM, EC_WORD_WILL, EC_WORD_DO, EC_WORD_YOU, EC_WORD_GOOD},
         .speechWin = {EC_WORD_THAT_S, EC_WORD_HOW, EC_WORD_I, EC_WORD_SINK, EC_WORD_AN, EC_WORD_OPPONENT},
         .speechLose = {EC_WORD_UH_OH, EC_WORD_EXCL, 0xFFFF, EC_WORD_A, EC_MOVE(WHIRLPOOL), EC_WORD_EXCL},
-        .monSets = gBattleFrontierTrainerMons_Pedro
+        .monSet = gBattleFrontierTrainerMons_Pedro
     },
-    [209] = {
+    [FRONTIER_TRAINER_ERICK] = {
         .facilityClass = FACILITY_CLASS_SWIMMER_M,
         .trainerName = _("ERICK"),
         .speechBefore = {EC_WORD_I, EC_WORD_WILL, EC_MOVE2(TACKLE), EC_WORD_YOU, EC_WORD_DOWN, EC_WORD_EXCL},
         .speechWin = {EC_WORD_DON_T, EC_WORD_YOU, EC_WORD_RUN_AWAY, EC_WORD_YOU, EC_WORD_LOSER, EC_WORD_EXCL},
         .speechLose = {EC_WORD_I, EC_WORD_DIDN_T, EC_WORD_THINK, EC_WORD_YOU, EC_WORD_WOULD, EC_MOVE(COUNTER)},
-        .monSets = gBattleFrontierTrainerMons_Erick
+        .monSet = gBattleFrontierTrainerMons_Erick
     },
-    [210] = {
+    [FRONTIER_TRAINER_ELAINE] = {
         .facilityClass = FACILITY_CLASS_SWIMMER_F,
         .trainerName = _("ELAINE"),
         .speechBefore = {EC_WORD_MY, EC_WORD_HEROINE, EC_WORD_ADVENTURE, EC_WORD_ISN_T, EC_WORD_GOING, EC_WORD_WELL},
         .speechWin = {EC_WORD_THANK_YOU, EC_WORD_EXCL, EC_WORD_THAT_S, EC_WORD_WHAT, EC_WORD_I, EC_WORD_NEED},
         .speechLose = {EC_WORD_I, EC_WORD_KNOW, EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_A, EC_WORD_HEROINE},
-        .monSets = gBattleFrontierTrainerMons_Elaine
+        .monSet = gBattleFrontierTrainerMons_Elaine
     },
-    [211] = {
+    [FRONTIER_TRAINER_JOYCE] = {
         .facilityClass = FACILITY_CLASS_SWIMMER_F,
         .trainerName = _("JOYCE"),
         .speechBefore = {EC_WORD_YOU, EC_WORD_MAKE, EC_WORD_ME, EC_WORD_GO, EC_WORD_AHAHA, EC_WORD_EXCL},
         .speechWin = {EC_WORD_LALALA, EC_WORD_NO, EC_WORD_LOSING, EC_WORD_FOR, EC_WORD_ME, EC_WORD_EXCL},
         .speechLose = {EC_WORD_LALALA, EC_WORD_ELLIPSIS, 0xFFFF, EC_WORD_HUH_QUES, 0xFFFF, 0xFFFF},
-        .monSets = gBattleFrontierTrainerMons_Joyce
+        .monSet = gBattleFrontierTrainerMons_Joyce
     },
-    [212] = {
+    [FRONTIER_TRAINER_TODD] = {
         .facilityClass = FACILITY_CLASS_POKEFAN_M,
         .trainerName = _("TODD"),
         .speechBefore = {EC_WORD_YOU_RE, EC_WORD_A, EC_WORD_LIGHTNINGROD, EC_WORD_FOR, EC_WORD_MY, EC_WORD_POWER},
         .speechWin = {EC_WORD_THAT_S, EC_WORD_ALL, EC_WORD_YOU, EC_WORD_COULD, EC_MOVE(ABSORB), EC_WORD_QUES},
         .speechLose = {EC_WORD_YOU, EC_MOVE2(REFLECT), EC_WORD_MY, EC_WORD_POWER, EC_WORD_BACK, EC_WORD_QUES},
-        .monSets = gBattleFrontierTrainerMons_Todd
+        .monSet = gBattleFrontierTrainerMons_Todd
     },
-    [213] = {
+    [FRONTIER_TRAINER_GAVIN] = {
         .facilityClass = FACILITY_CLASS_POKEFAN_M,
         .trainerName = _("GAVIN"),
         .speechBefore = {EC_WORD_I, EC_WORD_WILL, EC_MOVE(BIDE), EC_WORD_MY, EC_WORD_TIME, 0xFFFF},
         .speechWin = {EC_WORD_IT_S, EC_WORD_OVER, EC_WORD_SO, EC_WORD_SOON, EC_WORD_QUES, 0xFFFF},
         .speechLose = {EC_WORD_MY, EC_WORD_MISTAKE, EC_WORD_WAS, EC_WORD_TOO, EC_WORD_EXPENSIVE, EC_WORD_ELLIPSIS},
-        .monSets = gBattleFrontierTrainerMons_Gavin
+        .monSet = gBattleFrontierTrainerMons_Gavin
     },
-    [214] = {
+    [FRONTIER_TRAINER_MALORY] = {
         .facilityClass = FACILITY_CLASS_POKEFAN_F,
         .trainerName = _("MALORY"),
         .speechBefore = {EC_WORD_PROMISE, EC_WORD_TO, EC_WORD_SHOW, EC_WORD_ME, EC_WORD_CUTE, EC_WORD_POKEMON},
         .speechWin = {EC_WORD_GIGGLE, EC_WORD_ELLIPSIS, 0xFFFF, EC_WORD_THANK_YOU, EC_WORD_SO, EC_WORD_MUCH},
         .speechLose = {EC_WORD_TCH, EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_AREN_T, EC_WORD_VERY, EC_WORD_NICE},
-        .monSets = gBattleFrontierTrainerMons_Malory
+        .monSet = gBattleFrontierTrainerMons_Malory
     },
-    [215] = {
+    [FRONTIER_TRAINER_ESTHER] = {
         .facilityClass = FACILITY_CLASS_POKEFAN_F,
         .trainerName = _("ESTHER"),
         .speechBefore = {EC_WORD_I, EC_WORD_WANT, EC_WORD_A, EC_WORD_NICE, EC_MOVE2(PRESENT), EC_WORD_ELLIPSIS},
         .speechWin = {EC_WORD_PLEASE, EC_WORD_GET, EC_WORD_ME, EC_WORD_A, EC_WORD_POKEMON, EC_WORD_GAME},
         .speechLose = {EC_WORD_MESSAGE, EC_WORD_CARDS, EC_WORD_MAKE, EC_WORD_A, EC_WORD_WEAK, EC_MOVE2(PRESENT)},
-        .monSets = gBattleFrontierTrainerMons_Esther
+        .monSet = gBattleFrontierTrainerMons_Esther
     },
-    [216] = {
+    [FRONTIER_TRAINER_OSCAR] = {
         .facilityClass = FACILITY_CLASS_PKMN_BREEDER_M,
         .trainerName = _("OSCAR"),
         .speechBefore = {EC_WORD_LET_S, EC_WORD_SEE, EC_WORD_YOUR, EC_WORD_POWER, EC_WORD_IN, EC_WORD_FULL},
         .speechWin = {EC_WORD_THAT_WAS, EC_WORD_NOT, EC_WORD_YOUR, EC_WORD_FULL, EC_WORD_POWER, EC_WORD_EXCL},
         .speechLose = {EC_WORD_NOT, EC_WORD_FUNNY, EC_WORD_ELLIPSIS, EC_WORD_YOU_RE, EC_WORD_TOO_STRONG, 0xFFFF},
-        .monSets = gBattleFrontierTrainerMons_Oscar
+        .monSet = gBattleFrontierTrainerMons_Oscar
     },
-    [217] = {
+    [FRONTIER_TRAINER_WILSON] = {
         .facilityClass = FACILITY_CLASS_PKMN_BREEDER_M,
         .trainerName = _("WILSON"),
         .speechBefore = {EC_WORD_WORK, EC_WORD_IS, EC_WORD_MAKING, EC_WORD_ME, EC_WORD_AN, EC_WORD_EARLY_BIRD},
         .speechWin = {EC_WORD_ALL, EC_WORD_WORK, EC_WORD_AND, EC_WORD_NO, EC_WORD_PLAY, EC_WORD_ELLIPSIS},
         .speechLose = {EC_MOVE(ENDURE), EC_WORD_IS, EC_WORD_ALL, EC_WORD_I, EC_WORD_CAN, EC_WORD_DO},
-        .monSets = gBattleFrontierTrainerMons_Wilson
+        .monSet = gBattleFrontierTrainerMons_Wilson
     },
-    [218] = {
-        .facilityClass = FACILITY_CLASS_POKEMON_BREEDER_F,
+    [FRONTIER_TRAINER_CLARE] = {
+        .facilityClass = FACILITY_CLASS_PKMN_BREEDER_F,
         .trainerName = _("CLARE"),
         .speechBefore = {EC_WORD_YAY, EC_WORD_EXCL, EC_WORD_A, EC_WORD_TOUGH, EC_WORD_TRAINER, EC_WORD_EXCL},
         .speechWin = {EC_WORD_AWW, EC_WORD_EXCL, EC_WORD_A, EC_WORD_WIMPY, EC_WORD_TRAINER, EC_WORD_EXCL},
         .speechLose = {EC_WORD_COOL, EC_WORD_EXCL, EC_WORD_A, EC_WORD_GENIUS, EC_WORD_TRAINER, EC_WORD_EXCL},
-        .monSets = gBattleFrontierTrainerMons_Clare
+        .monSet = gBattleFrontierTrainerMons_Clare
     },
-    [219] = {
-        .facilityClass = FACILITY_CLASS_POKEMON_BREEDER_F,
+    [FRONTIER_TRAINER_TESS] = {
+        .facilityClass = FACILITY_CLASS_PKMN_BREEDER_F,
         .trainerName = _("TESS"),
         .speechBefore = {EC_WORD_WANT, EC_WORD_SOME, EC_POKEMON(GULPIN), EC_WORD_DESIGN, EC_WORD_SWEETS, EC_WORD_QUES},
         .speechWin = {EC_WORD_THEY_RE, EC_WORD_A, EC_WORD_SECRET, EC_WORD_POKEMON, EC_WORD_GOURMET, EC_WORD_ITEM},
         .speechLose = {EC_WORD_THEY_RE, EC_WORD_TASTY, EC_WORD_EXCL, EC_WORD_REFRESHING, EC_WORD_TOO, EC_WORD_EXCL},
-        .monSets = gBattleFrontierTrainerMons_Tess
+        .monSet = gBattleFrontierTrainerMons_Tess
     },
-    [220] = {
+    [FRONTIER_TRAINER_LEON] = {
         .facilityClass = FACILITY_CLASS_COOLTRAINER_M,
         .trainerName = _("LEON"),
         .speechBefore = {EC_WORD_I_AM, EC_WORD_BETTER, EC_WORD_THAN, EC_WORD_ANY, EC_WORD_OTHER, EC_WORD_TRAINER},
         .speechWin = {EC_WORD_I, EC_WORD_DID, EC_WORD_IT, EC_MOVE2(JUMP_KICK), EC_WORD_FOR, EC_WORD_JOY},
         .speechLose = {EC_WORD_BACK, EC_WORD_HOME, EC_WORD_I, EC_WORD_WILL, EC_WORD_GO, EC_WORD_ELLIPSIS},
-        .monSets = gBattleFrontierTrainerMons_Leon
+        .monSet = gBattleFrontierTrainerMons_Leon
     },
-    [221] = {
+    [FRONTIER_TRAINER_ALONZO] = {
         .facilityClass = FACILITY_CLASS_COOLTRAINER_M,
         .trainerName = _("ALONZO"),
         .speechBefore = {EC_WORD_I_VE, EC_WORD_NOT, EC_WORD_LOST, EC_WORD_ONCE, EC_WORD_YET, EC_WORD_EXCL},
         .speechWin = {EC_WORD_YOUR, EC_WORD_SAD, EC_WORD_LOOK, EC_WORD_BECOMES, EC_WORD_YOU, 0xFFFF},
         .speechLose = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_BELIEVE, EC_WORD_THIS, EC_WORD_ELLIPSIS, 0xFFFF},
-        .monSets = gBattleFrontierTrainerMons_Alonzo
+        .monSet = gBattleFrontierTrainerMons_Alonzo
     },
-    [222] = {
+    [FRONTIER_TRAINER_VINCE] = {
         .facilityClass = FACILITY_CLASS_COOLTRAINER_M,
         .trainerName = _("VINCE"),
         .speechBefore = {EC_WORD_THE, EC_WORD_TOP, EC_WORD_TRAINER, EC_WORD_THAT_S, EC_WORD_ME, EC_WORD_EXCL},
         .speechWin = {EC_WORD_THE, EC_WORD_TOP, EC_WORD_RANK, EC_WORD_BELONGS_TO, EC_WORD_ME, EC_WORD_EXCL},
         .speechLose = {EC_WORD_I, EC_WORD_WILL, EC_WORD_APPEAL, EC_WORD_THIS, EC_MOVE(OUTRAGE), EC_WORD_EXCL},
-        .monSets = gBattleFrontierTrainerMons_Vince
+        .monSet = gBattleFrontierTrainerMons_Vince
     },
-    [223] = {
+    [FRONTIER_TRAINER_BRYON] = {
         .facilityClass = FACILITY_CLASS_COOLTRAINER_M,
         .trainerName = _("BRYON"),
         .speechBefore = {EC_WORD_MY, EC_MOVE2(BARRAGE), EC_WORD_WILL, EC_MOVE2(SLAM), EC_WORD_YOU, EC_WORD_EXCL},
         .speechWin = {EC_WORD_YOU, EC_WORD_DIDN_T, EC_WORD_COUNT_ON, EC_WORD_ANY, EC_WORD_LESS, EC_WORD_QUES},
         .speechLose = {EC_WORD_I, EC_WORD_JUST, EC_WORD_DON_T, EC_WORD_GET, EC_WORD_IT, EC_WORD_ELLIPSIS},
-        .monSets = gBattleFrontierTrainerMons_Bryon
+        .monSet = gBattleFrontierTrainerMons_Bryon
     },
-    [224] = {
+    [FRONTIER_TRAINER_AVA] = {
         .facilityClass = FACILITY_CLASS_COOLTRAINER_F,
         .trainerName = _("AVA"),
         .speechBefore = {EC_WORD_I_AM, EC_WORD_A, EC_WORD_TREASURE, EC_WORD_OF, EC_WORD_THIS, EC_WORD_WORLD},
         .speechWin = {EC_WORD_MY, EC_WORD_WORLD, EC_WORD_IS, EC_WORD_FULL, EC_WORD_OF, EC_WORD_WONDER},
         .speechLose = {EC_WORD_WHY, EC_WORD_ARE, EC_WORD_YOU, EC_WORD_SO, EC_WORD_TERRIBLE, EC_WORD_QUES},
-        .monSets = gBattleFrontierTrainerMons_Ava
+        .monSet = gBattleFrontierTrainerMons_Ava
     },
-    [225] = {
+    [FRONTIER_TRAINER_MIRIAM] = {
         .facilityClass = FACILITY_CLASS_COOLTRAINER_F,
         .trainerName = _("MIRIAM"),
         .speechBefore = {EC_WORD_OH, EC_WORD_A, EC_WORD_TRAINER, EC_WORD_WITH, EC_WORD_A, EC_MOVE(SCARY_FACE)},
         .speechWin = {EC_WORD_AHAHA, EC_WORD_YOU, EC_WORD_ONLY, EC_WORD_LOOK, EC_WORD_SCARY, EC_WORD_EXCL},
         .speechLose = {EC_WORD_AIYEEH, EC_WORD_EXCL, EC_WORD_YOU, EC_WORD_REALLY, EC_WORD_ARE, EC_WORD_SCARY},
-        .monSets = gBattleFrontierTrainerMons_Miriam
+        .monSet = gBattleFrontierTrainerMons_Miriam
     },
-    [226] = {
+    [FRONTIER_TRAINER_CARRIE] = {
         .facilityClass = FACILITY_CLASS_COOLTRAINER_F,
         .trainerName = _("CARRIE"),
         .speechBefore = {EC_WORD_I, EC_WORD_WILL, EC_WORD_SHOW, EC_WORD_YOU, EC_WORD_GUTSY, EC_WORD_EXCL},
         .speechWin = {EC_WORD_IT_S, EC_WORD_ALL, EC_WORD_ABOUT, EC_WORD_GUTS, EC_WORD_EXCL, 0xFFFF},
         .speechLose = {EC_WORD_OH, EC_WORD_NO, EC_WORD_ELLIPSIS, EC_MOVE(SELF_DESTRUCT), EC_WORD_MODE, EC_WORD_EXCL},
-        .monSets = gBattleFrontierTrainerMons_Carrie
+        .monSet = gBattleFrontierTrainerMons_Carrie
     },
-    [227] = {
+    [FRONTIER_TRAINER_GILLIAN2] = {
         .facilityClass = FACILITY_CLASS_COOLTRAINER_F,
         .trainerName = _("GILLIAN"),
         .speechBefore = {EC_WORD_I, EC_WORD_SEEK, EC_WORD_A, EC_WORD_TRULY, EC_WORD_GREAT, EC_WORD_BATTLE},
         .speechWin = {EC_WORD_I, EC_WORD_NEED, EC_WORD_A_LOT, EC_WORD_BETTER, EC_WORD_BATTLE, EC_WORD_ELLIPSIS},
         .speechLose = {EC_WORD_THAT_WAS, EC_WORD_A_LITTLE, EC_WORD_TOO, EC_WORD_MUCH, EC_WORD_TO, EC_WORD_TAKE},
-        .monSets = gBattleFrontierTrainerMons_Gillian2
+        .monSet = gBattleFrontierTrainerMons_Gillian2
     },
-    [228] = {
+    [FRONTIER_TRAINER_TYLER] = {
         .facilityClass = FACILITY_CLASS_PKMN_RANGER_M,
         .trainerName = _("TYLER"),
         .speechBefore = {EC_WORD_YO, EC_WORD_EXCL, 0xFFFF, EC_WORD_LET_S, EC_WORD_GO, EC_WORD_EXCL_EXCL},
         .speechWin = {EC_WORD_YO, EC_WORD_EXCL, 0xFFFF, EC_WORD_I, EC_WORD_WON, EC_WORD_YO},
         .speechLose = {EC_WORD_YO, EC_WORD_EXCL, 0xFFFF, EC_WORD_I, EC_WORD_LOST, EC_WORD_YO},
-        .monSets = gBattleFrontierTrainerMons_Tyler
+        .monSet = gBattleFrontierTrainerMons_Tyler
     },
-    [229] = {
+    [FRONTIER_TRAINER_CHAZ] = {
         .facilityClass = FACILITY_CLASS_PKMN_RANGER_M,
         .trainerName = _("CHAZ"),
         .speechBefore = {EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_HAVE, EC_WORD_TOO, EC_WORD_MUCH, EC_WORD_POWER},
         .speechWin = {EC_WORD_THEY, EC_WORD_HAVE, EC_WORD_MORE, EC_WORD_POWER, EC_WORD_NOW, EC_WORD_EXCL},
         .speechLose = {EC_WORD_YEAH, EC_MOVE2(TAKE_DOWN), EC_WORD_THEIR, EC_WORD_POWER, EC_WORD_A_TINY_BIT, EC_WORD_PLEASE},
-        .monSets = gBattleFrontierTrainerMons_Chaz
+        .monSet = gBattleFrontierTrainerMons_Chaz
     },
-    [230] = {
+    [FRONTIER_TRAINER_NELSON] = {
         .facilityClass = FACILITY_CLASS_PKMN_RANGER_M,
         .trainerName = _("NELSON"),
         .speechBefore = {EC_WORD_WELL_THEN, EC_WORD_WILL, EC_WORD_THIS, EC_WORD_POKEMON, EC_WORD_WORK, EC_WORD_QUES},
         .speechWin = {EC_WORD_I, EC_WORD_SEE, EC_WORD_THAT, EC_WORD_IT, EC_WORD_WAS, EC_WORD_TOO_STRONG},
         .speechLose = {EC_WORD_IT, EC_WORD_DIDN_T, EC_WORD_MATCH_UP, EC_WORD_WELL, EC_WORD_I, EC_WORD_THINK},
-        .monSets = gBattleFrontierTrainerMons_Nelson
+        .monSet = gBattleFrontierTrainerMons_Nelson
     },
-    [231] = {
+    [FRONTIER_TRAINER_SHANIA] = {
         .facilityClass = FACILITY_CLASS_PKMN_RANGER_F,
         .trainerName = _("SHANIA"),
         .speechBefore = {EC_WORD_ALL, EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_ABSOLUTELY, EC_WORD_ADORE, EC_WORD_ME},
         .speechWin = {EC_WORD_HAPPINESS, EC_WORD_IS, EC_WORD_A, EC_WORD_POKEMON, EC_WORD_WITH, EC_WORD_CUTE_CHARM},
         .speechLose = {EC_WORD_YOU_RE, EC_WORD_SO, EC_WORD_MEAN, EC_WORD_TO, EC_WORD_CUTE, EC_WORD_POKEMON},
-        .monSets = gBattleFrontierTrainerMons_Shania
+        .monSet = gBattleFrontierTrainerMons_Shania
     },
-    [232] = {
+    [FRONTIER_TRAINER_STELLA] = {
         .facilityClass = FACILITY_CLASS_PKMN_RANGER_F,
         .trainerName = _("STELLA"),
         .speechBefore = {EC_WORD_I, EC_WORD_WANT, EC_WORD_TO, EC_WORD_SEE, EC_WORD_YOUR, EC_WORD_POKEMON},
         .speechWin = {EC_WORD_WELL, EC_WORD_AREN_T, EC_WORD_THEY, EC_WORD_BORING, EC_WORD_QUES, EC_WORD_AHAHA},
         .speechLose = {EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_SOMETHING, EC_WORD_ELSE, EC_WORD_ALL_RIGHT},
-        .monSets = gBattleFrontierTrainerMons_Stella
+        .monSet = gBattleFrontierTrainerMons_Stella
     },
-    [233] = {
+    [FRONTIER_TRAINER_DORINE] = {
         .facilityClass = FACILITY_CLASS_PKMN_RANGER_F,
         .trainerName = _("DORINE"),
         .speechBefore = {EC_WORD_I_AM, EC_WORD_YOUNG, EC_WORD_AND, EC_WORD_STRONG, EC_WORD_EXCL, 0xFFFF},
         .speechWin = {EC_WORD_SEE, EC_WORD_QUES, EC_WORD_AREN_T, EC_WORD_I, EC_WORD_GOOD, EC_WORD_QUES},
         .speechLose = {EC_WORD_THIS, EC_WORD_ISN_T, EC_WORD_WORKING, EC_WORD_OUT, EC_WORD_AT, EC_WORD_ALL},
-        .monSets = gBattleFrontierTrainerMons_Dorine
+        .monSet = gBattleFrontierTrainerMons_Dorine
     },
-    [234] = {
+    [FRONTIER_TRAINER_MADDOX] = {
         .facilityClass = FACILITY_CLASS_DRAGON_TAMER,
         .trainerName = _("MADDOX"),
         .speechBefore = {EC_WORD_DRAGON, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_MY, EC_WORD_NO_1, EC_WORD_CHOICE},
         .speechWin = {EC_WORD_IT_S, EC_WORD_NO, EC_WORD_SECRET, EC_WORD_DRAGON, EC_WORD_POKEMON, EC_WORD_WIN},
         .speechLose = {EC_WORD_DRAGON, EC_WORD_POKEMON, EC_WORD_SHOULD, EC_WORD_NOT, EC_WORD_LOSE, EC_WORD_EXCL},
-        .monSets = gBattleFrontierTrainerMons_Maddox
+        .monSet = gBattleFrontierTrainerMons_Maddox
     },
-    [235] = {
+    [FRONTIER_TRAINER_DAVIN] = {
         .facilityClass = FACILITY_CLASS_DRAGON_TAMER,
         .trainerName = _("DAVIN"),
         .speechBefore = {EC_WORD_LET_S, EC_WORD_HEAR, EC_WORD_YOU, EC_MOVE2(ROAR), EC_WORD_EXCL, 0xFFFF},
         .speechWin = {EC_WORD_WROOOAAR_EXCL, 0xFFFF, 0xFFFF, EC_WORD_VICTORY, EC_WORD_EXCL_EXCL, 0xFFFF},
         .speechLose = {EC_WORD_WROOOAAR_EXCL, 0xFFFF, 0xFFFF, EC_WORD_WHY, EC_WORD_QUES_EXCL, 0xFFFF},
-        .monSets = gBattleFrontierTrainerMons_Davin
+        .monSet = gBattleFrontierTrainerMons_Davin
     },
-    [236] = {
+    [FRONTIER_TRAINER_TREVON] = {
         .facilityClass = FACILITY_CLASS_DRAGON_TAMER,
         .trainerName = _("TREVON"),
         .speechBefore = {EC_WORD_I_AM, EC_WORD_LIVING, EC_WORD_ONLY, EC_WORD_WITH, EC_WORD_DRAGON, EC_WORD_POKEMON},
         .speechWin = {EC_WORD_THE, EC_WORD_WAY, EC_WORD_I_AM, EC_WORD_LIVING, EC_WORD_IS, EC_WORD_PERFECT},
         .speechLose = {EC_WORD_YOU_VE, EC_WORD_DESTROYED, EC_WORD_THE, EC_WORD_WAY, EC_WORD_I_AM, EC_WORD_LIVING},
-        .monSets = gBattleFrontierTrainerMons_Trevon
+        .monSet = gBattleFrontierTrainerMons_Trevon
     },
-    [237] = {
+    [FRONTIER_TRAINER_MATEO] = {
         .facilityClass = FACILITY_CLASS_BLACK_BELT,
         .trainerName = _("MATEO"),
         .speechBefore = {EC_WORD_THIS, EC_WORD_SHOULD, EC_WORD_BE, EC_WORD_OVER, EC_WORD_SOON, EC_WORD_ENOUGH},
         .speechWin = {EC_WORD_WELL, EC_WORD_THAT, EC_WORD_DIDN_T, EC_WORD_TAKE, EC_WORD_VERY, EC_WORD_MUCH},
         .speechLose = {EC_WORD_I, EC_WORD_CAN_T, EC_WORD_LOSE, EC_WORD_SO, EC_WORD_SOON, EC_WORD_EXCL},
-        .monSets = gBattleFrontierTrainerMons_Mateo
+        .monSet = gBattleFrontierTrainerMons_Mateo
     },
-    [238] = {
+    [FRONTIER_TRAINER_BRET] = {
         .facilityClass = FACILITY_CLASS_BLACK_BELT,
         .trainerName = _("BRET"),
         .speechBefore = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_ROCK_SOLID, EC_WORD_POKEMON, EC_WORD_THE, EC_WORD_BEST},
         .speechWin = {EC_WORD_TOUGHNESS, EC_WORD_IS, EC_WORD_THE, EC_WORD_WAY, EC_WORD_TO, EC_WORD_GO},
         .speechLose = {EC_WORD_I, EC_WORD_ALSO, EC_WORD_HAVE, EC_WORD_A, EC_WORD_PLUSH_DOLL, EC_WORD_COLLECTION},
-        .monSets = gBattleFrontierTrainerMons_Bret
+        .monSet = gBattleFrontierTrainerMons_Bret
     },
-    [239] = {
+    [FRONTIER_TRAINER_RAUL] = {
         .facilityClass = FACILITY_CLASS_BLACK_BELT,
         .trainerName = _("RAUL"),
         .speechBefore = {EC_WORD_I, EC_WORD_REJECT, EC_WORD_EVERY, EC_WORD_WEAK, EC_WORD_TRAINER, 0xFFFF},
         .speechWin = {EC_WORD_HUMPH, EC_WORD_EXCL, EC_WORD_ANOTHER, EC_WORD_WEAK, EC_WORD_TRAINER, EC_WORD_ELLIPSIS},
         .speechLose = {EC_WORD_THERE, EC_WORD_IS, EC_WORD_NOTHING, EC_WORD_WEAK, EC_WORD_ABOUT, EC_WORD_YOU},
-        .monSets = gBattleFrontierTrainerMons_Raul
+        .monSet = gBattleFrontierTrainerMons_Raul
     },
-    [240] = {
+    [FRONTIER_TRAINER_KAY] = {
         .facilityClass = FACILITY_CLASS_BATTLE_GIRL,
         .trainerName = _("KAY"),
         .speechBefore = {EC_WORD_AND, EC_WORD_YET, EC_WORD_ANOTHER, EC_WORD_BATTLE, EC_WORD_QUES, 0xFFFF},
         .speechWin = {EC_WORD_I, EC_WORD_WON, EC_WORD_BUT, EC_WORD_I_AM, EC_WORD_TIRED, EC_WORD_ELLIPSIS},
         .speechLose = {EC_WORD_GOOD, EC_WORD_IT_S, EC_WORD_OVER, EC_WORD_AT, EC_WORD_LAST, EC_WORD_ELLIPSIS},
-        .monSets = gBattleFrontierTrainerMons_Kay
+        .monSet = gBattleFrontierTrainerMons_Kay
     },
-    [241] = {
+    [FRONTIER_TRAINER_ELENA] = {
         .facilityClass = FACILITY_CLASS_BATTLE_GIRL,
         .trainerName = _("ELENA"),
         .speechBefore = {EC_WORD_A, EC_WORD_BATTLE, EC_WORD_GIRL, EC_WORD_THAT_S, EC_WORD_ME, EC_WORD_EXCL},
         .speechWin = {EC_WORD_ISN_T, EC_WORD_A, EC_WORD_BATTLE, EC_WORD_GIRL, EC_WORD_AWESOME, EC_WORD_QUES},
         .speechLose = {EC_WORD_YOU, EC_WORD_DISLIKE, EC_WORD_A, EC_WORD_BATTLE, EC_WORD_GIRL, EC_WORD_QUES},
-        .monSets = gBattleFrontierTrainerMons_Elena
+        .monSet = gBattleFrontierTrainerMons_Elena
     },
-    [242] = {
+    [FRONTIER_TRAINER_ALANA] = {
         .facilityClass = FACILITY_CLASS_BATTLE_GIRL,
         .trainerName = _("ALANA"),
         .speechBefore = {EC_WORD_EAT, EC_WORD_MY, EC_WORD_INVINCIBLE, EC_WORD_ATTACK, EC_WORD_YOU, EC_WORD_EXCL},
         .speechWin = {EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_MUCH, EC_WORD_TO, EC_WORD_LEARN, 0xFFFF},
         .speechLose = {EC_WORD_SO, EC_WORD_MUCH, EC_WORD_FOR, EC_WORD_MY, EC_WORD_INVINCIBLE, EC_WORD_ATTACK},
-        .monSets = gBattleFrontierTrainerMons_Alana
+        .monSet = gBattleFrontierTrainerMons_Alana
     },
-    [243] = {
+    [FRONTIER_TRAINER_ALEXAS] = {
         .facilityClass = FACILITY_CLASS_EXPERT_M,
         .trainerName = _("ALEXAS"),
         .speechBefore = {EC_WORD_GOOD, EC_WORD_TO, EC_WORD_MEET_YOU, EC_WORD_YOUNG, EC_WORD_TRAINER, EC_WORD_EXCL},
         .speechWin = {EC_WORD_WAHAHAHA, EC_WORD_EXCL, 0xFFFF, EC_WORD_GIVE, EC_WORD_IT, EC_WORD_UP},
         .speechLose = {EC_WORD_YOU, EC_WORD_ARE, EC_WORD_A, EC_WORD_STRONG, EC_WORD_TRAINER, EC_WORD_KID},
-        .monSets = gBattleFrontierTrainerMons_Alexas
+        .monSet = gBattleFrontierTrainerMons_Alexas
     },
-    [244] = {
+    [FRONTIER_TRAINER_WESTON] = {
         .facilityClass = FACILITY_CLASS_EXPERT_M,
         .trainerName = _("WESTON"),
         .speechBefore = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_PLAY, EC_WORD_DOWN, EC_WORD_ALL_RIGHT, EC_WORD_QUES},
         .speechWin = {EC_WORD_YOU_RE, EC_WORD_FAR, EC_WORD_TOO, EC_WORD_EASY, EC_WORD_TO, EC_WORD_ATTACK},
         .speechLose = {EC_WORD_WELL, EC_WORD_WELL, EC_WORD_ELLIPSIS, EC_WORD_I, EC_WORD_SURRENDER, EC_WORD_ELLIPSIS},
-        .monSets = gBattleFrontierTrainerMons_Weston
+        .monSet = gBattleFrontierTrainerMons_Weston
     },
-    [245] = {
+    [FRONTIER_TRAINER_JASPER] = {
         .facilityClass = FACILITY_CLASS_EXPERT_M,
         .trainerName = _("JASPER"),
         .speechBefore = {EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_OLD, EC_WORD_I_AM, EC_WORD_SKILLED, EC_WORD_EXCL},
         .speechWin = {EC_WORD_SKILLED, EC_WORD_THAT_S, EC_WORD_WHAT, EC_WORD_I_AM, EC_WORD_EXCL, 0xFFFF},
         .speechLose = {EC_WORD_I_AM, EC_WORD_SHOCKED, EC_WORD_EXCL, EC_WORD_DOWN, EC_WORD_I, EC_WORD_GO},
-        .monSets = gBattleFrontierTrainerMons_Jasper
+        .monSet = gBattleFrontierTrainerMons_Jasper
     },
-    [246] = {
+    [FRONTIER_TRAINER_NADIA] = {
         .facilityClass = FACILITY_CLASS_EXPERT_F,
         .trainerName = _("NADIA"),
         .speechBefore = {EC_WORD_YOU, EC_WORD_CAN_T, EC_WORD_BEAT, EC_WORD_ME, EC_WORD_DOWN, EC_WORD_EXCL},
         .speechWin = {EC_WORD_HAH, EC_WORD_EXCL, 0xFFFF, EC_WORD_I, EC_WORD_BEAT, EC_WORD_YOU},
         .speechLose = {EC_WORD_I_AM, EC_MOVE2(BEAT_UP), EC_WORD_AND, EC_WORD_DOWNCAST, EC_WORD_ELLIPSIS, 0xFFFF},
-        .monSets = gBattleFrontierTrainerMons_Nadia
+        .monSet = gBattleFrontierTrainerMons_Nadia
     },
-    [247] = {
+    [FRONTIER_TRAINER_MIRANDA] = {
         .facilityClass = FACILITY_CLASS_EXPERT_F,
         .trainerName = _("MIRANDA"),
         .speechBefore = {EC_WORD_WELL, EC_WORD_WELL, 0xFFFF, EC_WORD_LET_S, EC_WORD_START, 0xFFFF},
         .speechWin = {EC_WORD_WHAT, EC_WORD_QUES, EC_WORD_DONE, EC_WORD_SO, EC_WORD_SOON, EC_WORD_QUES},
         .speechLose = {EC_WORD_WELL, EC_WORD_I, EC_WORD_SEE, EC_WORD_THAT, EC_WORD_I_AM, EC_WORD_TOO_WEAK},
-        .monSets = gBattleFrontierTrainerMons_Miranda
+        .monSet = gBattleFrontierTrainerMons_Miranda
     },
-    [248] = {
+    [FRONTIER_TRAINER_EMMA] = {
         .facilityClass = FACILITY_CLASS_EXPERT_F,
         .trainerName = _("EMMA"),
         .speechBefore = {EC_WORD_I_VE, EC_WORD_BEEN, EC_WORD_HEARING, EC_WORD_ABOUT, EC_WORD_YOU, 0xFFFF},
         .speechWin = {EC_WORD_I, EC_WORD_THINK, EC_WORD_I_VE, EC_WORD_MISHEARD, EC_WORD_THINGS, 0xFFFF},
         .speechLose = {EC_WORD_WHAT, EC_WORD_I_VE, EC_WORD_BEEN, EC_WORD_HEARING, EC_WORD_IS, EC_WORD_RIGHT},
-        .monSets = gBattleFrontierTrainerMons_Emma
+        .monSet = gBattleFrontierTrainerMons_Emma
     },
-    [249] = {
+    [FRONTIER_TRAINER_ROLANDO] = {
         .facilityClass = FACILITY_CLASS_PSYCHIC_M,
         .trainerName = _("ROLANDO"),
         .speechBefore = {EC_WORD_I_AM, EC_WORD_A, EC_WORD_SUPER, EC_WORD_POKEMON, EC_WORD_HERO, EC_WORD_EXCL},
         .speechWin = {EC_WORD_WAS, EC_WORD_THAT, EC_WORD_ENOUGH, EC_WORD_FOR, EC_WORD_YOU, EC_WORD_QUES},
         .speechLose = {EC_WORD_YOU, EC_WORD_SHOULD, EC_WORD_NOT, EC_WORD_BEAT, EC_WORD_A, EC_WORD_HERO},
-        .monSets = gBattleFrontierTrainerMons_Rolando
+        .monSet = gBattleFrontierTrainerMons_Rolando
     },
-    [250] = {
+    [FRONTIER_TRAINER_STANLY] = {
         .facilityClass = FACILITY_CLASS_PSYCHIC_M,
         .trainerName = _("STANLY"),
         .speechBefore = {EC_WORD_THIS, EC_WORD_SHOULD, EC_WORD_BE, EC_WORD_AN, EC_WORD_EASY, EC_WORD_MATCH},
         .speechWin = {EC_WORD_IT, EC_WORD_REALLY, EC_WORD_WAS, EC_WORD_EASY, 0xFFFF, 0xFFFF},
         .speechLose = {EC_WORD_ARE, EC_WORD_YOU, EC_WORD_HAPPY, EC_WORD_NOW, EC_WORD_QUES, 0xFFFF},
-        .monSets = gBattleFrontierTrainerMons_Stanly
+        .monSet = gBattleFrontierTrainerMons_Stanly
     },
-    [251] = {
+    [FRONTIER_TRAINER_DARIO] = {
         .facilityClass = FACILITY_CLASS_PSYCHIC_M,
         .trainerName = _("DARIO"),
         .speechBefore = {EC_WORD_MY, EC_MOVE2(FORESIGHT), EC_WORD_SAYS, EC_WORD_I, EC_WORD_WILL, EC_WORD_WIN},
         .speechWin = {EC_WORD_MY, EC_MOVE2(FORESIGHT), EC_WORD_HAS, EC_WORD_BEEN, EC_WORD_PERFECT, 0xFFFF},
         .speechLose = {EC_WORD_I, EC_WORD_DIDN_T, EC_WORD_SEE, EC_WORD_THIS, EC_MOVE(REVERSAL), EC_WORD_ELLIPSIS},
-        .monSets = gBattleFrontierTrainerMons_Dario
+        .monSet = gBattleFrontierTrainerMons_Dario
     },
-    [252] = {
+    [FRONTIER_TRAINER_KARLEE] = {
         .facilityClass = FACILITY_CLASS_PSYCHIC_F,
         .trainerName = _("KARLEE"),
         .speechBefore = {EC_WORD_SOMETHING, EC_WORD_GOOD, EC_WORD_WILL, EC_WORD_COME, EC_WORD_OF, EC_WORD_THIS},
         .speechWin = {EC_WORD_YOU, EC_WORD_SEE, EC_WORD_QUES, EC_WORD_FANTASTIC, EC_WORD_EXCL, 0xFFFF},
         .speechLose = {EC_WORD_THAT, EC_WORD_SOMETHING, EC_WORD_GOOD, EC_WORD_WENT, EC_WORD_TO, EC_WORD_YOU},
-        .monSets = gBattleFrontierTrainerMons_Karlee
+        .monSet = gBattleFrontierTrainerMons_Karlee
     },
-    [253] = {
+    [FRONTIER_TRAINER_JAYLIN] = {
         .facilityClass = FACILITY_CLASS_PSYCHIC_F,
         .trainerName = _("JAYLIN"),
         .speechBefore = {EC_WORD_EVERY, EC_WORD_TRAINER, EC_WORD_HAS, EC_WORD_BEEN, EC_WORD_TOO_WEAK, EC_WORD_ELLIPSIS},
         .speechWin = {EC_WORD_IT_S, EC_WORD_MAKING, EC_WORD_ME, EC_MOVE(YAWN), EC_WORD_THAT, EC_WORD_BATTLE},
         .speechLose = {EC_WORD_I, EC_WORD_SLEPT, EC_WORD_AND, EC_WORD_SO, EC_WORD_I, EC_WORD_LOST},
-        .monSets = gBattleFrontierTrainerMons_Jaylin
+        .monSet = gBattleFrontierTrainerMons_Jaylin
     },
-    [254] = {
+    [FRONTIER_TRAINER_INGRID] = {
         .facilityClass = FACILITY_CLASS_PSYCHIC_F,
         .trainerName = _("INGRID"),
         .speechBefore = {EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_A, EC_WORD_VERY, EC_WORD_MEAN, EC_WORD_TRAINER},
         .speechWin = {EC_WORD_WASN_T, EC_WORD_THAT, EC_WORD_A, EC_WORD_GOOD, EC_WORD_MATCH, EC_WORD_QUES},
         .speechLose = {EC_WORD_I, EC_WORD_LOST, EC_WORD_CAUSE, EC_WORD_YOU_RE, EC_WORD_MEAN, EC_WORD_ELLIPSIS},
-        .monSets = gBattleFrontierTrainerMons_Ingrid
+        .monSet = gBattleFrontierTrainerMons_Ingrid
     },
-    [255] = {
+    [FRONTIER_TRAINER_DELILAH] = {
         .facilityClass = FACILITY_CLASS_HEX_MANIAC,
         .trainerName = _("DELILAH"),
         .speechBefore = {EC_WORD_DON_T, EC_MOVE(GRUDGE), EC_WORD_ME, EC_WORD_IF_I_WIN, EC_WORD_OK_QUES, 0xFFFF},
         .speechWin = {EC_WORD_I_AM, EC_WORD_SORRY, EC_WORD_TO, EC_WORD_SEE, EC_WORD_YOU, EC_WORD_ANGRY},
         .speechLose = {EC_WORD_I, EC_WORD_HAVE, EC_WORD_A, EC_MOVE(GRUDGE), EC_WORD_WITH, EC_WORD_YOU},
-        .monSets = gBattleFrontierTrainerMons_Delilah
+        .monSet = gBattleFrontierTrainerMons_Delilah
     },
-    [256] = {
+    [FRONTIER_TRAINER_CARLY] = {
         .facilityClass = FACILITY_CLASS_HEX_MANIAC,
         .trainerName = _("CARLY"),
         .speechBefore = {EC_WORD_I, EC_WORD_WILL, EC_WORD_SCATTER, EC_WORD_SOME, EC_MOVE2(POISON_POWDER), EC_WORD_ABOUT},
         .speechWin = {EC_WORD_IT_S, EC_WORD_SCARY, EC_WORD_HOW, EC_WORD_MY, EC_WORD_STRATEGY, EC_WORD_WORKS},
         .speechLose = {EC_WORD_I, EC_WORD_DISLIKE, EC_WORD_YOU, EC_WORD_AND, EC_WORD_YOUR, EC_WORD_POKEMON},
-        .monSets = gBattleFrontierTrainerMons_Carly
+        .monSet = gBattleFrontierTrainerMons_Carly
     },
-    [257] = {
+    [FRONTIER_TRAINER_LEXIE] = {
         .facilityClass = FACILITY_CLASS_HEX_MANIAC,
         .trainerName = _("LEXIE"),
         .speechBefore = {EC_WORD_WANT, EC_WORD_TO, EC_WORD_SEE, EC_WORD_SCARY, EC_WORD_POKEMON, EC_WORD_QUES},
         .speechWin = {EC_WORD_WASN_T, EC_WORD_THAT, EC_WORD_SCARY, EC_WORD_EH_QUES, 0xFFFF, 0xFFFF},
         .speechLose = {EC_WORD_YOU_RE, EC_WORD_MORE, EC_WORD_SCARY, EC_WORD_THAN, EC_WORD_MY, EC_WORD_POKEMON},
-        .monSets = gBattleFrontierTrainerMons_Lexie
+        .monSet = gBattleFrontierTrainerMons_Lexie
     },
-    [258] = {
+    [FRONTIER_TRAINER_MILLER] = {
         .facilityClass = FACILITY_CLASS_POKEMANIAC,
         .trainerName = _("MILLER"),
         .speechBefore = {EC_WORD_HELLO, EC_WORD_QUES, 0xFFFF, EC_WORD_HELLO, EC_WORD_QUES_EXCL, 0xFFFF},
         .speechWin = {EC_WORD_HELLO, EC_WORD_MOTHER, EC_WORD_EXCL, EC_WORD_I, EC_WORD_WON, EC_WORD_EXCL},
         .speechLose = {EC_WORD_MY, EC_WORD_PHONE, EC_WORD_ISN_T, EC_WORD_WORKING, EC_WORD_ELLIPSIS, 0xFFFF},
-        .monSets = gBattleFrontierTrainerMons_Miller
+        .monSet = gBattleFrontierTrainerMons_Miller
     },
-    [259] = {
+    [FRONTIER_TRAINER_MARV] = {
         .facilityClass = FACILITY_CLASS_POKEMANIAC,
         .trainerName = _("MARV"),
         .speechBefore = {EC_WORD_YOU, EC_WORD_CAN, EC_WORD_LOSE, EC_WORD_YOUR, EC_MOVE(SWAGGER), EC_WORD_NOW},
         .speechWin = {EC_WORD_THERE, EC_WORD_IS, EC_WORD_NO, EC_MOVE(SWAGGER), EC_WORD_LEFT, EC_WORD_EH_QUES},
         .speechLose = {EC_WORD_GO, EC_WORD_ON, EC_MOVE(SWAGGER), EC_WORD_ALL, EC_WORD_YOU, EC_WORD_WANT},
-        .monSets = gBattleFrontierTrainerMons_Marv
+        .monSet = gBattleFrontierTrainerMons_Marv
     },
-    [260] = {
+    [FRONTIER_TRAINER_LAYTON] = {
         .facilityClass = FACILITY_CLASS_POKEMANIAC,
         .trainerName = _("LAYTON"),
         .speechBefore = {EC_WORD_I, EC_WORD_KNOW, EC_WORD_I_AM, EC_WORD_TOTALLY, EC_WORD_COOL, EC_WORD_EXCL},
         .speechWin = {EC_WORD_YOU, EC_WORD_CAN, EC_WORD_LOOK, EC_WORD_UP, EC_WORD_TO, EC_WORD_ME},
         .speechLose = {EC_WORD_YOU_RE, EC_WORD_COOL, EC_WORD_EXCL, EC_WORD_NO, EC_WORD_REALLY, EC_WORD_EXCL},
-        .monSets = gBattleFrontierTrainerMons_Layton
+        .monSet = gBattleFrontierTrainerMons_Layton
     },
-    [261] = {
+    [FRONTIER_TRAINER_BROOKS] = {
         .facilityClass = FACILITY_CLASS_GENTLEMAN,
         .trainerName = _("BROOKS"),
         .speechBefore = {EC_WORD_THIS, EC_WORD_IS, EC_WORD_A, EC_WORD_HIGH, EC_WORD_LEVEL, EC_WORD_BATTLE},
         .speechWin = {EC_WORD_THAT_WAS, EC_WORD_HIGH, EC_WORD_LEVEL, EC_WORD_AND, EC_WORD_EXCITING, EC_WORD_TOO},
         .speechLose = {EC_WORD_YOU_RE, EC_WORD_TOO, EC_WORD_HIGH, EC_WORD_IN, EC_WORD_LEVEL, EC_WORD_ELLIPSIS},
-        .monSets = gBattleFrontierTrainerMons_Brooks
+        .monSet = gBattleFrontierTrainerMons_Brooks
     },
-    [262] = {
+    [FRONTIER_TRAINER_GREGORY] = {
         .facilityClass = FACILITY_CLASS_GENTLEMAN,
         .trainerName = _("GREGORY"),
         .speechBefore = {EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_THAT, EC_WORD_OLD, EC_WORD_YET, 0xFFFF},
         .speechWin = {EC_WORD_WHO, EC_WORD_SAYS, EC_WORD_I_AM, EC_WORD_TOO, EC_WORD_OLD, EC_WORD_QUES},
         .speechLose = {EC_WORD_PLEASE, EC_WORD_I_AM, EC_WORD_REALLY, EC_WORD_NOT, EC_WORD_THAT, EC_WORD_OLD},
-        .monSets = gBattleFrontierTrainerMons_Gregory
+        .monSet = gBattleFrontierTrainerMons_Gregory
     },
-    [263] = {
+    [FRONTIER_TRAINER_REESE] = {
         .facilityClass = FACILITY_CLASS_GENTLEMAN,
         .trainerName = _("REESE"),
         .speechBefore = {EC_WORD_I_VE, EC_WORD_A, EC_WORD_COUPLE, EC_WORD_THINGS, 0xFFFF, 0xFFFF},
         .speechWin = {EC_WORD_DON_T, EC_WORD_DIET, EC_WORD_PLAY, EC_WORD_SPORTS, EC_WORD_INSTEAD, 0xFFFF},
         .speechLose = {EC_WORD_INSTEAD, EC_WORD_OF, EC_WORD_TELEVISION, EC_WORD_GET, EC_WORD_A, EC_WORD_BOOK},
-        .monSets = gBattleFrontierTrainerMons_Reese
+        .monSet = gBattleFrontierTrainerMons_Reese
     },
-    [264] = {
+    [FRONTIER_TRAINER_MASON] = {
         .facilityClass = FACILITY_CLASS_RUNNING_TRIATHLETE_M,
         .trainerName = _("MASON"),
         .speechBefore = {EC_WORD_PLEASE, EC_WORD_DON_T, EC_WORD_MAKE, EC_WORD_THIS, EC_WORD_SCARY, 0xFFFF},
         .speechWin = {EC_WORD_THANK_YOU, EC_WORD_ELLIPSIS, 0xFFFF, EC_WORD_I_AM, EC_WORD_HAPPY, EC_WORD_NOW},
         .speechLose = {EC_WORD_I_AM, EC_WORD_DISAPPOINTED, EC_WORD_ELLIPSIS, 0xFFFF, 0xFFFF, 0xFFFF},
-        .monSets = gBattleFrontierTrainerMons_Mason
+        .monSet = gBattleFrontierTrainerMons_Mason
     },
-    [265] = {
+    [FRONTIER_TRAINER_TOBY] = {
         .facilityClass = FACILITY_CLASS_RUNNING_TRIATHLETE_M,
         .trainerName = _("TOBY"),
         .speechBefore = {EC_WORD_LISTEN, EC_WORD_UP, 0xFFFF, EC_WORD_I, EC_WORD_ALWAYS, EC_WORD_WIN},
         .speechWin = {EC_WORD_I_AM, EC_WORD_A, EC_WORD_GENIUS, EC_WORD_OR, EC_WORD_WHAT, EC_WORD_QUES},
         .speechLose = {EC_WORD_I, EC_WORD_CAN, EC_WORD_BEAT, EC_WORD_YOU, EC_WORD_AT, EC_WORD_SMARTNESS},
-        .monSets = gBattleFrontierTrainerMons_Toby
+        .monSet = gBattleFrontierTrainerMons_Toby
     },
-    [266] = {
+    [FRONTIER_TRAINER_DOROTHY] = {
         .facilityClass = FACILITY_CLASS_RUNNING_TRIATHLETE_F,
         .trainerName = _("DOROTHY"),
         .speechBefore = {EC_WORD_THE, EC_WORD_SPORTS, EC_WORD_WORLD, EC_WORD_SHOULD, EC_WORD_ACCEPT, EC_WORD_POKEMON},
         .speechWin = {EC_WORD_THANK_YOU, EC_WORD_EXCL, EC_WORD_THAT, EC_WORD_WIN, EC_WORD_WAS, EC_WORD_REFRESHING},
         .speechLose = {EC_WORD_THANK_YOU, EC_WORD_EXCL, EC_WORD_THAT, EC_WORD_LOSS, EC_WORD_WAS, EC_WORD_REFRESHING},
-        .monSets = gBattleFrontierTrainerMons_Dorothy
+        .monSet = gBattleFrontierTrainerMons_Dorothy
     },
-    [267] = {
+    [FRONTIER_TRAINER_PIPER] = {
         .facilityClass = FACILITY_CLASS_RUNNING_TRIATHLETE_F,
         .trainerName = _("PIPER"),
         .speechBefore = {EC_WORD_COME_ON, EC_WORD_YOU, EC_WORD_NEED, EC_WORD_A, EC_WORD_SPEED_BOOST, EC_WORD_QUES},
         .speechWin = {EC_WORD_YOU, EC_WORD_NEED, EC_WORD_TO, EC_WORD_SHOW, EC_WORD_MORE, EC_WORD_GUTS},
         .speechLose = {EC_WORD_OH, EC_WORD_YOU, EC_WORD_EXCL, 0xFFFF, 0xFFFF, 0xFFFF},
-        .monSets = gBattleFrontierTrainerMons_Piper
+        .monSet = gBattleFrontierTrainerMons_Piper
     },
-    [268] = {
+    [FRONTIER_TRAINER_FINN] = {
         .facilityClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_M,
         .trainerName = _("FINN"),
         .speechBefore = {EC_WORD_NOT, EC_WORD_ANOTHER, EC_WORD_TRAINER, EC_WORD_BATTLE, EC_WORD_ELLIPSIS, 0xFFFF},
         .speechWin = {EC_WORD_WON_T, EC_WORD_THIS, EC_WORD_EVER, EC_WORD_END, EC_WORD_QUES, 0xFFFF},
         .speechLose = {EC_WORD_I, EC_WORD_FINALLY, EC_WORD_GET, EC_WORD_TO, EC_MOVE2(REST), EC_WORD_A_LITTLE},
-        .monSets = gBattleFrontierTrainerMons_Finn
+        .monSet = gBattleFrontierTrainerMons_Finn
     },
-    [269] = {
+    [FRONTIER_TRAINER_SAMIR] = {
         .facilityClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_M,
         .trainerName = _("SAMIR"),
         .speechBefore = {EC_WORD_I, EC_MOVE2(DIVE), EC_WORD_BELOW, EC_WORD_THE, EC_MOVE2(SURF), EC_WORD_EXCL},
         .speechWin = {EC_WORD_YAHOO, EC_WORD_TAKE, EC_WORD_A, EC_MOVE2(DIVE), EC_WORD_YOU, EC_WORD_EXCL},
         .speechLose = {EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_TO, EC_WORD_SINK, EC_WORD_ELLIPSIS, 0xFFFF},
-        .monSets = gBattleFrontierTrainerMons_Samir
+        .monSet = gBattleFrontierTrainerMons_Samir
     },
-    [270] = {
+    [FRONTIER_TRAINER_FIONA] = {
         .facilityClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_F,
         .trainerName = _("FIONA"),
         .speechBefore = {EC_WORD_DID, EC_WORD_YOU, EC_WORD_LIMBER, EC_WORD_UP, EC_WORD_BEFORE, EC_WORD_QUES},
         .speechWin = {EC_WORD_YOU, EC_WORD_NEED, EC_WORD_TO, EC_WORD_BE, EC_WORD_MORE, EC_WORD_READY},
         .speechLose = {EC_WORD_BEING, EC_WORD_LIMBER, EC_WORD_DIDN_T, EC_WORD_WORK, EC_WORD_FOR, EC_WORD_ME},
-        .monSets = gBattleFrontierTrainerMons_Fiona
+        .monSet = gBattleFrontierTrainerMons_Fiona
     },
-    [271] = {
+    [FRONTIER_TRAINER_GLORIA] = {
         .facilityClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_F,
         .trainerName = _("GLORIA"),
         .speechBefore = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_TO, EC_WORD_ATTACK, EC_WORD_WITH, EC_WORD_SUCTION_CUPS},
         .speechWin = {EC_WORD_GIGGLE, EC_WORD_ELLIPSIS, EC_WORD_IT_S, EC_WORD_OVER, EC_WORD_FOR, EC_WORD_YOU},
         .speechLose = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_GET, EC_WORD_HOW, EC_WORD_SUCTION_CUPS, EC_WORD_WORK},
-        .monSets = gBattleFrontierTrainerMons_Gloria
+        .monSet = gBattleFrontierTrainerMons_Gloria
     },
-    [272] = {
+    [FRONTIER_TRAINER_NICO] = {
         .facilityClass = FACILITY_CLASS_CYCLING_TRIATHLETE_M,
         .trainerName = _("NICO"),
         .speechBefore = {EC_WORD_LIKE, EC_WORD_A, EC_MOVE(SONIC_BOOM), EC_WORD_I_VE_ARRIVED, 0xFFFF, 0xFFFF},
         .speechWin = {EC_WORD_SORRY, EC_WORD_TO, EC_WORD_MAKE, EC_WORD_YOU, EC_WORD_SO, EC_WORD_DOWNCAST},
         .speechLose = {EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_WITH, EC_WORD_A, EC_MOVE2(SUPERSONIC), EC_WORD_SPEED_BOOST},
-        .monSets = gBattleFrontierTrainerMons_Nico
+        .monSet = gBattleFrontierTrainerMons_Nico
     },
-    [273] = {
+    [FRONTIER_TRAINER_JEREMY] = {
         .facilityClass = FACILITY_CLASS_CYCLING_TRIATHLETE_M,
         .trainerName = _("JEREMY"),
         .speechBefore = {EC_WORD_A, EC_WORD_POKEMON, EC_WORD_MASTER, EC_WORD_THAT_S, EC_WORD_MY, EC_WORD_DREAM},
         .speechWin = {EC_WORD_MY, EC_WORD_DREAM, EC_WORD_ISN_T, EC_WORD_FAR, EC_WORD_OFF, EC_WORD_EXCL},
         .speechLose = {EC_WORD_WHAT, EC_WORD_I, EC_WORD_DREAM, EC_WORD_ISN_T, EC_WORD_HAPPENING, EC_WORD_ELLIPSIS},
-        .monSets = gBattleFrontierTrainerMons_Jeremy
+        .monSet = gBattleFrontierTrainerMons_Jeremy
     },
-    [274] = {
+    [FRONTIER_TRAINER_CAITLIN] = {
         .facilityClass = FACILITY_CLASS_CYCLING_TRIATHLETE_F,
         .trainerName = _("CAITLIN"),
         .speechBefore = {EC_WORD_DON_T, EC_WORD_YOU, EC_WORD_THINK, EC_WORD_I_AM, EC_WORD_CUTE, EC_WORD_QUES},
         .speechWin = {EC_WORD_THERE, EC_WORD_IS, EC_WORD_MORE, EC_WORD_TO_ME, EC_WORD_THAN, EC_WORD_CUTENESS},
         .speechLose = {EC_WORD_MY, EC_WORD_CUTE_CHARM, EC_WORD_DOESN_T, EC_MOVE2(ATTRACT), EC_WORD_YOU, EC_WORD_QUES},
-        .monSets = gBattleFrontierTrainerMons_Caitlin
+        .monSet = gBattleFrontierTrainerMons_Caitlin
     },
-    [275] = {
+    [FRONTIER_TRAINER_REENA] = {
         .facilityClass = FACILITY_CLASS_CYCLING_TRIATHLETE_F,
         .trainerName = _("REENA"),
         .speechBefore = {EC_WORD_I_AM, EC_WORD_ALWAYS, EC_WORD_HAPPY, EC_WORD_HAPPY, EC_WORD_HAPPY, EC_WORD_EXCL},
         .speechWin = {EC_WORD_OH, EC_WORD_YAY, EC_WORD_EXCL, EC_WORD_YAHOO, EC_WORD_FOR, EC_WORD_ME},
         .speechLose = {EC_WORD_YAHOO, EC_WORD_EXCL, EC_WORD_I_AM, EC_WORD_HAPPY, EC_WORD_FOR, EC_WORD_YOU},
-        .monSets = gBattleFrontierTrainerMons_Reena
+        .monSet = gBattleFrontierTrainerMons_Reena
     },
-    [276] = {
+    [FRONTIER_TRAINER_AVERY] = {
         .facilityClass = FACILITY_CLASS_BUG_MANIAC,
         .trainerName = _("AVERY"),
         .speechBefore = {EC_WORD_I_VE, EC_WORD_GOT, EC_WORD_A_LOT, EC_WORD_OF, EC_WORD_BUG, EC_WORD_POKEMON},
         .speechWin = {EC_WORD_MY, EC_WORD_BUG, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_ALL, EC_WORD_UNBELIEVABLE},
         .speechLose = {EC_WORD_MY, EC_WORD_BUG, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_ALL, EC_WORD_UPSIDE_DOWN},
-        .monSets = gBattleFrontierTrainerMons_Avery
+        .monSet = gBattleFrontierTrainerMons_Avery
     },
-    [277] = {
+    [FRONTIER_TRAINER_LIAM] = {
         .facilityClass = FACILITY_CLASS_BUG_MANIAC,
         .trainerName = _("LIAM"),
         .speechBefore = {EC_WORD_WE, EC_WORD_REALLY, EC_WORD_DISLIKE, EC_WORD_FIRE, EC_WORD_AND, EC_WORD_FLYING},
         .speechWin = {EC_WORD_BUG, EC_WORD_POKEMON, EC_WORD_AREN_T, EC_WORD_BAD, EC_WORD_HEY_QUES, 0xFFFF},
         .speechLose = {EC_WORD_YOU, EC_WORD_KNOW, EC_WORD_WHAT, EC_WORD_WE, EC_WORD_DISLIKE, EC_WORD_HEY_QUES},
-        .monSets = gBattleFrontierTrainerMons_Liam
+        .monSet = gBattleFrontierTrainerMons_Liam
     },
-    [278] = {
+    [FRONTIER_TRAINER_THEO] = {
         .facilityClass = FACILITY_CLASS_FISHERMAN,
         .trainerName = _("THEO"),
         .speechBefore = {EC_WORD_FISHING, EC_WORD_IS, EC_WORD_MY, EC_WORD_CHOICE, EC_WORD_IN, EC_WORD_LIFE},
         .speechWin = {EC_WORD_WATER, EC_WORD_POKEMON, EC_MOVE2(ATTRACT), EC_WORD_ME, EC_WORD_WITHOUT, EC_WORD_END},
         .speechLose = {EC_WORD_DON_T, EC_WORD_COUNT_ON, EC_WORD_THAT, EC_WORD_HAPPENING, EC_WORD_ANOTHER, EC_WORD_TIME},
-        .monSets = gBattleFrontierTrainerMons_Theo
+        .monSet = gBattleFrontierTrainerMons_Theo
     },
-    [279] = {
+    [FRONTIER_TRAINER_BAILEY] = {
         .facilityClass = FACILITY_CLASS_FISHERMAN,
         .trainerName = _("BAILEY"),
         .speechBefore = {EC_WORD_I_AM, EC_WORD_AN, EC_WORD_ADULT, EC_WORD_I, EC_WORD_BATTLE, EC_WORD_EASY},
         .speechWin = {EC_WORD_I_AM, EC_WORD_AN, EC_WORD_ADULT, EC_WORD_I, EC_MOVE2(SWALLOW), EC_WORD_JOY},
         .speechLose = {EC_WORD_I_AM, EC_WORD_AN, EC_WORD_ADULT, EC_WORD_I, EC_MOVE2(SWALLOW), EC_MOVE2(FRUSTRATION)},
-        .monSets = gBattleFrontierTrainerMons_Bailey
+        .monSet = gBattleFrontierTrainerMons_Bailey
     },
-    [280] = {
+    [FRONTIER_TRAINER_HUGO] = {
         .facilityClass = FACILITY_CLASS_RUIN_MANIAC,
         .trainerName = _("HUGO"),
         .speechBefore = {EC_WORD_I, EC_WORD_TRY, EC_WORD_THE, EC_WORD_BEST, EC_WORD_I, EC_WORD_CAN},
         .speechWin = {EC_WORD_I, EC_WORD_CAN_WIN, EC_WORD_IF, EC_WORD_I, EC_WORD_TRY, EC_WORD_ENOUGH},
         .speechLose = {EC_WORD_I, EC_WORD_DID, EC_WORD_TRY, EC_WORD_DIDN_T, EC_WORD_I, EC_WORD_QUES},
-        .monSets = gBattleFrontierTrainerMons_Hugo
+        .monSet = gBattleFrontierTrainerMons_Hugo
     },
-    [281] = {
+    [FRONTIER_TRAINER_BRYCE] = {
         .facilityClass = FACILITY_CLASS_RUIN_MANIAC,
         .trainerName = _("BRYCE"),
         .speechBefore = {EC_WORD_I_WAS, EC_WORD_ON, EC_WORD_VACATION, EC_WORD_UNTIL, EC_WORD_ONLY, EC_WORD_YESTERDAY},
         .speechWin = {EC_WORD_I, EC_WORD_HAVEN_T, EC_WORD_LOST, EC_WORD_MY, EC_WORD_SKILL, EC_WORD_YET},
         .speechLose = {EC_WORD_THAT_S, EC_WORD_IT, EC_WORD_ELLIPSIS, EC_WORD_I, EC_WORD_NEED, EC_WORD_SLEEP},
-        .monSets = gBattleFrontierTrainerMons_Bryce
+        .monSet = gBattleFrontierTrainerMons_Bryce
     },
-    [282] = {
+    [FRONTIER_TRAINER_GIDEON] = {
         .facilityClass = FACILITY_CLASS_COLLECTOR,
         .trainerName = _("GIDEON"),
         .speechBefore = {EC_WORD_WHAT_S_UP_QUES, EC_WORD_YOU, EC_WORD_THINK, EC_WORD_I_AM, EC_WORD_SCARY, EC_WORD_QUES},
         .speechWin = {EC_WORD_I_AM, EC_WORD_COOL, EC_WORD_BUT, EC_WORD_NOT, EC_WORD_SCARY, EC_WORD_EXCL},
         .speechLose = {EC_WORD_LOOK, EC_WORD_AT, EC_WORD_MY, EC_WORD_FABULOUS, EC_WORD_FASHION, EC_WORD_SENSE},
-        .monSets = gBattleFrontierTrainerMons_Gideon
+        .monSet = gBattleFrontierTrainerMons_Gideon
     },
-    [283] = {
+    [FRONTIER_TRAINER_TRISTON] = {
         .facilityClass = FACILITY_CLASS_COLLECTOR,
         .trainerName = _("TRISTON"),
         .speechBefore = {EC_WORD_I, EC_WORD_WOULD, EC_WORD_RATHER, EC_WORD_LOOK, EC_WORD_AT, EC_WORD_POKEMON},
         .speechWin = {EC_WORD_HUH_QUES, EC_WORD_YOU, EC_WORD_MEAN, EC_WORD_I, EC_WORD_WON, EC_WORD_QUES_EXCL},
         .speechLose = {EC_WORD_SEE, EC_WORD_QUES, 0xFFFF, EC_WORD_I, EC_WORD_ALWAYS, EC_WORD_LOSE},
-        .monSets = gBattleFrontierTrainerMons_Triston
+        .monSet = gBattleFrontierTrainerMons_Triston
     },
-    [284] = {
+    [FRONTIER_TRAINER_CHARLES] = {
         .facilityClass = FACILITY_CLASS_GUITARIST,
         .trainerName = _("CHARLES"),
         .speechBefore = {EC_WORD_IT_S, EC_WORD_HOPELESS, EC_WORD_TO, EC_MOVE2(STRUGGLE), EC_WORD_WITH, EC_WORD_ME},
         .speechWin = {EC_MOVE(SUBMISSION), EC_WORD_WAS, EC_WORD_YOUR, EC_WORD_ONLY, EC_WORD_CHOICE, 0xFFFF},
         .speechLose = {EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_DOWN, EC_WORD_DOWN, EC_WORD_DOWN, EC_WORD_EXCL},
-        .monSets = gBattleFrontierTrainerMons_Charles
+        .monSet = gBattleFrontierTrainerMons_Charles
     },
-    [285] = {
+    [FRONTIER_TRAINER_RAYMOND] = {
         .facilityClass = FACILITY_CLASS_GUITARIST,
         .trainerName = _("RAYMOND"),
         .speechBefore = {EC_WORD_WANT, EC_WORD_TO, EC_WORD_HEAR, EC_WORD_MY, EC_WORD_SONG, EC_WORD_QUES},
         .speechWin = {EC_WORD_SATISFIED, EC_WORD_THAT_S, EC_WORD_WHAT, EC_WORD_I_AM, EC_WORD_EXCL, 0xFFFF},
         .speechLose = {EC_WORD_SATISFIED, EC_WORD_IS, EC_WORD_WHAT, EC_WORD_I, EC_WORD_CAN_T, EC_WORD_BE},
-        .monSets = gBattleFrontierTrainerMons_Raymond
+        .monSet = gBattleFrontierTrainerMons_Raymond
     },
-    [286] = {
+    [FRONTIER_TRAINER_DIRK] = {
         .facilityClass = FACILITY_CLASS_BIRD_KEEPER,
         .trainerName = _("DIRK"),
         .speechBefore = {EC_WORD_FLYING, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_ABOVE, EC_WORD_THE, EC_MOVE2(REST)},
         .speechWin = {EC_WORD_YOU, EC_WORD_CAN_T_WIN, EC_WORD_EXCL, EC_WORD_FLYING, EC_WORD_POKEMON, EC_WORD_RULE},
         .speechLose = {EC_WORD_AREN_T, EC_WORD_THERE, EC_WORD_MORE, EC_WORD_FLYING, EC_WORD_POKEMON, EC_WORD_QUES},
-        .monSets = gBattleFrontierTrainerMons_Dirk
+        .monSet = gBattleFrontierTrainerMons_Dirk
     },
-    [287] = {
+    [FRONTIER_TRAINER_HAROLD] = {
         .facilityClass = FACILITY_CLASS_BIRD_KEEPER,
         .trainerName = _("HAROLD"),
         .speechBefore = {EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_APPEAL, EC_WORD_TO, EC_WORD_YOU, EC_WORD_QUES},
         .speechWin = {EC_WORD_YOU, EC_WORD_DO, EC_WORD_LIKE, EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_QUES},
         .speechLose = {EC_WORD_SO, EC_WORD_YOU, EC_WORD_DISLIKE, EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_QUES},
-        .monSets = gBattleFrontierTrainerMons_Harold
+        .monSet = gBattleFrontierTrainerMons_Harold
     },
-    [288] = {
+    [FRONTIER_TRAINER_OMAR] = {
         .facilityClass = FACILITY_CLASS_SAILOR,
         .trainerName = _("OMAR"),
         .speechBefore = {EC_WORD_LET_ME_WIN, EC_WORD_IN, EC_MOVE(RETURN), EC_WORD_FOR, EC_WORD_A, EC_MOVE2(PRESENT)},
         .speechWin = {EC_WORD_HERE, EC_WORD_YOU, EC_WORD_ARE, EC_WORD_SOME, EC_MOVE2(TOXIC), EC_WORD_SWEETS},
         .speechLose = {EC_WORD_YOUR, EC_MOVE2(PRESENT), EC_WORD_QUES, EC_WORD_WHAT, EC_WORD_FOR, EC_WORD_QUES_EXCL},
-        .monSets = gBattleFrontierTrainerMons_Omar
+        .monSet = gBattleFrontierTrainerMons_Omar
     },
-    [289] = {
+    [FRONTIER_TRAINER_PETER] = {
         .facilityClass = FACILITY_CLASS_SAILOR,
         .trainerName = _("PETER"),
         .speechBefore = {EC_WORD_I, EC_WORD_BRAG, EC_WORD_ABOUT, EC_WORD_MY, EC_WORD_HAPPINESS, EC_WORD_OK_QUES},
         .speechWin = {EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_TO, EC_WORD_LISTEN, EC_WORD_TO_ME, EC_WORD_BRAG},
         .speechLose = {EC_WORD_I_AM, EC_WORD_DISAPPOINTED, EC_WORD_YOU, EC_WORD_WON_T, EC_WORD_LISTEN, EC_WORD_TO_ME},
-        .monSets = gBattleFrontierTrainerMons_Peter
+        .monSet = gBattleFrontierTrainerMons_Peter
     },
-    [290] = {
+    [FRONTIER_TRAINER_DEV] = {
         .facilityClass = FACILITY_CLASS_HIKER,
         .trainerName = _("DEV"),
         .speechBefore = {EC_WORD_COME_ON, EC_WORD_LET_S, EC_WORD_GET, EC_WORD_A, EC_WORD_MOVE, EC_WORD_ON},
         .speechWin = {EC_WORD_I, EC_WORD_GET, EC_WORD_TO, EC_WORD_NAP, EC_WORD_AFTER, EC_WORD_THAT},
         .speechLose = {EC_WORD_I, EC_WORD_NEED, EC_WORD_TO, EC_WORD_NAP, EC_WORD_AFTER, EC_WORD_THAT},
-        .monSets = gBattleFrontierTrainerMons_Dev
+        .monSet = gBattleFrontierTrainerMons_Dev
     },
-    [291] = {
+    [FRONTIER_TRAINER_COREY] = {
         .facilityClass = FACILITY_CLASS_HIKER,
         .trainerName = _("COREY"),
         .speechBefore = {EC_WORD_LET_S, EC_WORD_TEACH, EC_WORD_YOU, EC_WORD_HOW, EC_WORD_TOUGH, EC_WORD_I_AM},
         .speechWin = {EC_WORD_LOOK, EC_WORD_AT, EC_WORD_ME, EC_WORD_MAKE, EC_WORD_A, EC_MOVE(BRICK_BREAK)},
         .speechLose = {EC_WORD_MY, EC_MOVE2(FRUSTRATION), EC_WORD_IS, EC_WORD_CLOSE, EC_WORD_TO, EC_MOVE2(ERUPTION)},
-        .monSets = gBattleFrontierTrainerMons_Corey
+        .monSet = gBattleFrontierTrainerMons_Corey
     },
-    [292] = {
+    [FRONTIER_TRAINER_ANDRE] = {
         .facilityClass = FACILITY_CLASS_KINDLER,
         .trainerName = _("ANDRE"),
         .speechBefore = {EC_WORD_NOW, EC_WORD_THIS, EC_WORD_IS, EC_WORD_A, EC_WORD_PERFECT, EC_WORD_FLAME_BODY},
         .speechWin = {EC_WORD_LOOK, EC_WORD_AT, EC_WORD_MY, EC_WORD_FIERY, EC_WORD_DANCE, EC_WORD_EXCL},
         .speechLose = {EC_WORD_YOU, EC_WORD_WANT, EC_WORD_AN, EC_MOVE2(EXPLOSION), EC_WORD_HERE, EC_WORD_QUES},
-        .monSets = gBattleFrontierTrainerMons_Andre
+        .monSet = gBattleFrontierTrainerMons_Andre
     },
-    [293] = {
+    [FRONTIER_TRAINER_FERRIS] = {
         .facilityClass = FACILITY_CLASS_KINDLER,
         .trainerName = _("FERRIS"),
         .speechBefore = {EC_WORD_I_AM, EC_WORD_NO_1, EC_WORD_IN, EC_WORD_THE, EC_WORD_OLD, EC_WORD_CLASS},
         .speechWin = {EC_WORD_NO_1, EC_WORD_THAT_S, EC_WORD_WHAT, EC_WORD_I_AM, EC_WORD_EXCL, 0xFFFF},
         .speechLose = {EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_NO_1, EC_WORD_ANY, EC_WORD_MORE, EC_WORD_ELLIPSIS},
-        .monSets = gBattleFrontierTrainerMons_Ferris
+        .monSet = gBattleFrontierTrainerMons_Ferris
     },
-    [294] = {
+    [FRONTIER_TRAINER_ALIVIA] = {
         .facilityClass = FACILITY_CLASS_PARASOL_LADY,
         .trainerName = _("ALIVIA"),
         .speechBefore = {EC_WORD_I_AM, EC_WORD_FEELING, EC_WORD_GIDDY, EC_WORD_SO, EC_WORD_SHOULD, EC_WORD_YOU},
         .speechWin = {EC_WORD_IT, EC_WORD_WAS, EC_WORD_ALL, EC_WORD_TOGETHER, EC_WORD_TOO, EC_WORD_EASY},
         .speechLose = {EC_WORD_I, EC_WORD_WILL, EC_WORD_GIDDY, EC_WORD_UP, EC_WORD_AND, EC_WORD_AWAY},
-        .monSets = gBattleFrontierTrainerMons_Alivia
+        .monSet = gBattleFrontierTrainerMons_Alivia
     },
-    [295] = {
+    [FRONTIER_TRAINER_PAIGE] = {
         .facilityClass = FACILITY_CLASS_PARASOL_LADY,
         .trainerName = _("PAIGE"),
         .speechBefore = {EC_WORD_LET_S, EC_WORD_ENJOY, EC_WORD_OUR, EC_WORD_BATTLE, EC_WORD_TOGETHER, 0xFFFF},
         .speechWin = {EC_WORD_THAT_S_IT_EXCL, 0xFFFF, 0xFFFF, EC_WORD_THANK_YOU, EC_WORD_VERY, EC_WORD_MUCH},
         .speechLose = {EC_WORD_THAT_S_IT_EXCL, 0xFFFF, 0xFFFF, EC_WORD_DO, EC_WORD_GO, EC_WORD_ON},
-        .monSets = gBattleFrontierTrainerMons_Paige
+        .monSet = gBattleFrontierTrainerMons_Paige
     },
-    [296] = {
+    [FRONTIER_TRAINER_ANYA] = {
         .facilityClass = FACILITY_CLASS_BEAUTY,
         .trainerName = _("ANYA"),
         .speechBefore = {EC_WORD_I, EC_WORD_DISLIKE, EC_WORD_OH, EC_WORD_SO, EC_WORD_PRETTY, EC_WORD_FASHION},
         .speechWin = {EC_WORD_FASHION, EC_WORD_SHOULD, EC_WORD_MATCH, EC_WORD_THE, EC_WORD_PERSON, 0xFFFF},
         .speechLose = {EC_WORD_PRETTY, EC_WORD_COULD, EC_WORD_BE, EC_WORD_GOOD, 0xFFFF, 0xFFFF},
-        .monSets = gBattleFrontierTrainerMons_Anya
+        .monSet = gBattleFrontierTrainerMons_Anya
     },
-    [297] = {
+    [FRONTIER_TRAINER_DAWN] = {
         .facilityClass = FACILITY_CLASS_BEAUTY,
         .trainerName = _("DAWN"),
         .speechBefore = {EC_WORD_I, EC_WORD_GO, EC_WORD_ALL, EC_WORD_OUT, EC_WORD_EXCL, 0xFFFF},
         .speechWin = {EC_WORD_DON_T, EC_WORD_BE, EC_WORD_A, EC_WORD_BABY, EC_WORD_EXCL, 0xFFFF},
         .speechLose = {EC_WORD_YOU, EC_WORD_WON, EC_WORD_EXCL, EC_WORD_MOVE, EC_WORD_ON, EC_WORD_EXCL},
-        .monSets = gBattleFrontierTrainerMons_Dawn
+        .monSet = gBattleFrontierTrainerMons_Dawn
     },
-    [298] = {
+    [FRONTIER_TRAINER_ABBY] = {
         .facilityClass = FACILITY_CLASS_AROMA_LADY,
         .trainerName = _("ABBY"),
         .speechBefore = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_A, EC_WORD_TRAINER, EC_WORD_THAT_S, EC_WORD_REFRESHING},
         .speechWin = {EC_WORD_VICTORY, EC_WORD_HAS, EC_WORD_A, EC_MOVE(SWEET_SCENT), EC_WORD_EXCL, 0xFFFF},
         .speechLose = {EC_WORD_WHAT, EC_WORD_AN, EC_WORD_AWFUL, EC_WORD_STENCH, EC_WORD_EXCL, 0xFFFF},
-        .monSets = gBattleFrontierTrainerMons_Abby
+        .monSet = gBattleFrontierTrainerMons_Abby
     },
-    [299] = {
+    [FRONTIER_TRAINER_GRETEL] = {
         .facilityClass = FACILITY_CLASS_AROMA_LADY,
         .trainerName = _("GRETEL"),
         .speechBefore = {EC_WORD_I, EC_WORD_CAUSE, EC_MOVE(OUTRAGE), EC_WORD_AS, EC_WORD_A, EC_WORD_TRAINER},
         .speechWin = {EC_WORD_IT_S, EC_WORD_ONLY, EC_WORD_NATURAL, EC_WORD_SEE_YA, EC_WORD_BYE_BYE, EC_WORD_EXCL},
         .speechLose = {EC_WORD_IT_S, EC_WORD_HARD, EC_WORD_TO, EC_WORD_BELIEVE, EC_WORD_BUT, EC_WORD_CONGRATS},
-        .monSets = gBattleFrontierTrainerMons_Gretel
+        .monSet = gBattleFrontierTrainerMons_Gretel
     }
 };
diff --git a/src/data/battle_frontier/battle_tent.h b/src/data/battle_frontier/battle_tent.h
index 946ca0187..bf89c5bc3 100644
--- a/src/data/battle_frontier/battle_tent.h
+++ b/src/data/battle_frontier/battle_tent.h
@@ -1,1242 +1,1242 @@
 // Slateport Battle Tent.
 const u16 gSlateportBattleTentTrainerMons_Jolie[] = 
 {
-    9,
-    10,
-    13,
-    27,
-    35,
-    37,
-    42,
-    44,
-    45,
-    46,
-    63,
+    SLATEPORT_TENT_MON_CACNEA_1,
+    SLATEPORT_TENT_MON_LOMBRE_1,
+    SLATEPORT_TENT_MON_NUZLEAF,
+    SLATEPORT_TENT_MON_CACNEA_2,
+    SLATEPORT_TENT_MON_MAKUHITA,
+    SLATEPORT_TENT_MON_BARBOACH,
+    SLATEPORT_TENT_MON_SOLROCK,
+    SLATEPORT_TENT_MON_KECLEON_2,
+    SLATEPORT_TENT_MON_SHROOMISH_1,
+    SLATEPORT_TENT_MON_SHROOMISH_2,
+    SLATEPORT_TENT_MON_BRELOOM,
     -1
 };
 
 const u16 gSlateportBattleTentTrainerMons_Malachi[] = 
 {
-    9,
-    16,
-    17,
-    27,
-    36,
-    39,
-    42,
-    45,
-    48,
-    49,
-    53,
+    SLATEPORT_TENT_MON_CACNEA_1,
+    SLATEPORT_TENT_MON_GRAVELER,
+    SLATEPORT_TENT_MON_BALTOY,
+    SLATEPORT_TENT_MON_CACNEA_2,
+    SLATEPORT_TENT_MON_NUMEL_1,
+    SLATEPORT_TENT_MON_VIGOROTH,
+    SLATEPORT_TENT_MON_SOLROCK,
+    SLATEPORT_TENT_MON_SHROOMISH_1,
+    SLATEPORT_TENT_MON_NUMEL_2,
+    SLATEPORT_TENT_MON_TRAPINCH_2,
+    SLATEPORT_TENT_MON_SKITTY,
     -1
 };
 
 const u16 gSlateportBattleTentTrainerMons_Kelsie[] = 
 {
-    4,
-    5,
-    6,
-    11,
-    28,
-    34,
-    35,
-    37,
-    43,
-    51,
-    53,
+    SLATEPORT_TENT_MON_WAILMER_1,
+    SLATEPORT_TENT_MON_WAILMER_2,
+    SLATEPORT_TENT_MON_MARILL_1,
+    SLATEPORT_TENT_MON_LOTAD,
+    SLATEPORT_TENT_MON_TAILLOW,
+    SLATEPORT_TENT_MON_WHISMUR,
+    SLATEPORT_TENT_MON_MAKUHITA,
+    SLATEPORT_TENT_MON_BARBOACH,
+    SLATEPORT_TENT_MON_KECLEON_1,
+    SLATEPORT_TENT_MON_WINGULL_2,
+    SLATEPORT_TENT_MON_SKITTY,
     -1
 };
 
 const u16 gSlateportBattleTentTrainerMons_Davon[] = 
 {
-    4,
-    5,
-    6,
-    12,
-    26,
-    36,
-    37,
-    38,
-    40,
-    44,
-    46,
-    50,
+    SLATEPORT_TENT_MON_WAILMER_1,
+    SLATEPORT_TENT_MON_WAILMER_2,
+    SLATEPORT_TENT_MON_MARILL_1,
+    SLATEPORT_TENT_MON_SEEDOT,
+    SLATEPORT_TENT_MON_TRAPINCH_1,
+    SLATEPORT_TENT_MON_NUMEL_1,
+    SLATEPORT_TENT_MON_BARBOACH,
+    SLATEPORT_TENT_MON_TENTACOOL,
+    SLATEPORT_TENT_MON_MAGIKARP,
+    SLATEPORT_TENT_MON_KECLEON_2,
+    SLATEPORT_TENT_MON_SHROOMISH_2,
+    SLATEPORT_TENT_MON_PELIPPER_2,
     -1
 };
 
 const u16 gSlateportBattleTentTrainerMons_Glenda[] = 
 {
-    0,
-    1,
-    17,
-    18,
-    19,
-    22,
-    23,
-    33,
-    42,
-    61,
-    64,
-    65,
-    66,
+    SLATEPORT_TENT_MON_ZIGZAGOON_1,
+    SLATEPORT_TENT_MON_ZIGZAGOON_2,
+    SLATEPORT_TENT_MON_BALTOY,
+    SLATEPORT_TENT_MON_MIGHTYENA_1,
+    SLATEPORT_TENT_MON_MIGHTYENA_2,
+    SLATEPORT_TENT_MON_ELECTRIKE_1,
+    SLATEPORT_TENT_MON_VOLTORB,
+    SLATEPORT_TENT_MON_MAGNEMITE,
+    SLATEPORT_TENT_MON_SOLROCK,
+    SLATEPORT_TENT_MON_KADABRA,
+    SLATEPORT_TENT_MON_PLUSLE_1,
+    SLATEPORT_TENT_MON_PLUSLE_2,
+    SLATEPORT_TENT_MON_ELECTRIKE_2,
     -1
 };
 
 const u16 gSlateportBattleTentTrainerMons_Helena[] = 
 {
-    18,
-    19,
-    21,
-    38,
-    39,
-    41,
-    42,
-    52,
-    54,
-    58,
-    63,
+    SLATEPORT_TENT_MON_MIGHTYENA_1,
+    SLATEPORT_TENT_MON_MIGHTYENA_2,
+    SLATEPORT_TENT_MON_GOLDEEN,
+    SLATEPORT_TENT_MON_TENTACOOL,
+    SLATEPORT_TENT_MON_VIGOROTH,
+    SLATEPORT_TENT_MON_SEVIPER_1,
+    SLATEPORT_TENT_MON_SOLROCK,
+    SLATEPORT_TENT_MON_MARILL_2,
+    SLATEPORT_TENT_MON_SEVIPER_2,
+    SLATEPORT_TENT_MON_SWALOT,
+    SLATEPORT_TENT_MON_BRELOOM,
     -1
 };
 
 const u16 gSlateportBattleTentTrainerMons_Rodolfo[] = 
 {
-    0,
-    1,
-    4,
-    5,
-    7,
-    8,
-    18,
-    20,
-    21,
-    37,
-    38,
-    40,
-    62,
+    SLATEPORT_TENT_MON_ZIGZAGOON_1,
+    SLATEPORT_TENT_MON_ZIGZAGOON_2,
+    SLATEPORT_TENT_MON_WAILMER_1,
+    SLATEPORT_TENT_MON_WAILMER_2,
+    SLATEPORT_TENT_MON_WINGULL_1,
+    SLATEPORT_TENT_MON_PELIPPER_1,
+    SLATEPORT_TENT_MON_MIGHTYENA_1,
+    SLATEPORT_TENT_MON_LINOONE,
+    SLATEPORT_TENT_MON_GOLDEEN,
+    SLATEPORT_TENT_MON_BARBOACH,
+    SLATEPORT_TENT_MON_TENTACOOL,
+    SLATEPORT_TENT_MON_MAGIKARP,
+    SLATEPORT_TENT_MON_KIRLIA,
     -1
 };
 
 const u16 gSlateportBattleTentTrainerMons_Davion[] = 
 {
-    17,
-    23,
-    24,
-    25,
-    31,
-    32,
-    33,
-    34,
-    39,
-    43,
-    44,
-    49,
-    57,
-    69,
+    SLATEPORT_TENT_MON_BALTOY,
+    SLATEPORT_TENT_MON_VOLTORB,
+    SLATEPORT_TENT_MON_ARON_1,
+    SLATEPORT_TENT_MON_ARON_2,
+    SLATEPORT_TENT_MON_LOUDRED,
+    SLATEPORT_TENT_MON_SPINDA,
+    SLATEPORT_TENT_MON_MAGNEMITE,
+    SLATEPORT_TENT_MON_WHISMUR,
+    SLATEPORT_TENT_MON_VIGOROTH,
+    SLATEPORT_TENT_MON_KECLEON_1,
+    SLATEPORT_TENT_MON_KECLEON_2,
+    SLATEPORT_TENT_MON_TRAPINCH_2,
+    SLATEPORT_TENT_MON_SANDSHREW,
+    SLATEPORT_TENT_MON_MACHOKE,
     -1
 };
 
 const u16 gSlateportBattleTentTrainerMons_Kendall[] = 
 {
-    4,
-    7,
-    8,
-    9,
-    11,
-    12,
-    13,
-    27,
-    38,
-    40,
-    45,
-    46,
-    47,
-    63,
+    SLATEPORT_TENT_MON_WAILMER_1,
+    SLATEPORT_TENT_MON_WINGULL_1,
+    SLATEPORT_TENT_MON_PELIPPER_1,
+    SLATEPORT_TENT_MON_CACNEA_1,
+    SLATEPORT_TENT_MON_LOTAD,
+    SLATEPORT_TENT_MON_SEEDOT,
+    SLATEPORT_TENT_MON_NUZLEAF,
+    SLATEPORT_TENT_MON_CACNEA_2,
+    SLATEPORT_TENT_MON_TENTACOOL,
+    SLATEPORT_TENT_MON_MAGIKARP,
+    SLATEPORT_TENT_MON_SHROOMISH_1,
+    SLATEPORT_TENT_MON_SHROOMISH_2,
+    SLATEPORT_TENT_MON_LOMBRE_2,
+    SLATEPORT_TENT_MON_BRELOOM,
     -1
 };
 
 const u16 gSlateportBattleTentTrainerMons_Colten[] = 
 {
-    0,
-    2,
-    12,
-    22,
-    28,
-    30,
-    35,
-    38,
-    43,
-    44,
-    56,
-    57,
+    SLATEPORT_TENT_MON_ZIGZAGOON_1,
+    SLATEPORT_TENT_MON_BEAUTIFLY,
+    SLATEPORT_TENT_MON_SEEDOT,
+    SLATEPORT_TENT_MON_ELECTRIKE_1,
+    SLATEPORT_TENT_MON_TAILLOW,
+    SLATEPORT_TENT_MON_GOLBAT_1,
+    SLATEPORT_TENT_MON_MAKUHITA,
+    SLATEPORT_TENT_MON_TENTACOOL,
+    SLATEPORT_TENT_MON_KECLEON_1,
+    SLATEPORT_TENT_MON_KECLEON_2,
+    SLATEPORT_TENT_MON_RALTS,
+    SLATEPORT_TENT_MON_SANDSHREW,
     -1
 };
 
 const u16 gSlateportBattleTentTrainerMons_Irvin[] = 
 {
-    0,
-    1,
-    2,
-    3,
-    14,
-    15,
-    24,
-    25,
-    32,
-    34,
-    39,
-    59,
-    60,
+    SLATEPORT_TENT_MON_ZIGZAGOON_1,
+    SLATEPORT_TENT_MON_ZIGZAGOON_2,
+    SLATEPORT_TENT_MON_BEAUTIFLY,
+    SLATEPORT_TENT_MON_DUSTOX,
+    SLATEPORT_TENT_MON_NINJASK_1,
+    SLATEPORT_TENT_MON_NINJASK_2,
+    SLATEPORT_TENT_MON_ARON_1,
+    SLATEPORT_TENT_MON_ARON_2,
+    SLATEPORT_TENT_MON_SPINDA,
+    SLATEPORT_TENT_MON_WHISMUR,
+    SLATEPORT_TENT_MON_VIGOROTH,
+    SLATEPORT_TENT_MON_VOLBEAT,
+    SLATEPORT_TENT_MON_ILLUMISE,
     -1
 };
 
 const u16 gSlateportBattleTentTrainerMons_Shaun[] = 
 {
-    17,
-    18,
-    19,
-    22,
-    29,
-    36,
-    42,
-    48,
-    61,
-    62,
-    66,
-    68,
-    69,
+    SLATEPORT_TENT_MON_BALTOY,
+    SLATEPORT_TENT_MON_MIGHTYENA_1,
+    SLATEPORT_TENT_MON_MIGHTYENA_2,
+    SLATEPORT_TENT_MON_ELECTRIKE_1,
+    SLATEPORT_TENT_MON_SWELLOW,
+    SLATEPORT_TENT_MON_NUMEL_1,
+    SLATEPORT_TENT_MON_SOLROCK,
+    SLATEPORT_TENT_MON_NUMEL_2,
+    SLATEPORT_TENT_MON_KADABRA,
+    SLATEPORT_TENT_MON_KIRLIA,
+    SLATEPORT_TENT_MON_ELECTRIKE_2,
+    SLATEPORT_TENT_MON_MACHOP,
+    SLATEPORT_TENT_MON_MACHOKE,
     -1
 };
 
 const u16 gSlateportBattleTentTrainerMons_Kyler[] = 
 {
-    22,
-    23,
-    28,
-    29,
-    31,
-    32,
-    34,
-    39,
-    55,
-    64,
-    65,
-    67,
+    SLATEPORT_TENT_MON_ELECTRIKE_1,
+    SLATEPORT_TENT_MON_VOLTORB,
+    SLATEPORT_TENT_MON_TAILLOW,
+    SLATEPORT_TENT_MON_SWELLOW,
+    SLATEPORT_TENT_MON_LOUDRED,
+    SLATEPORT_TENT_MON_SPINDA,
+    SLATEPORT_TENT_MON_WHISMUR,
+    SLATEPORT_TENT_MON_VIGOROTH,
+    SLATEPORT_TENT_MON_GOLBAT_2,
+    SLATEPORT_TENT_MON_PLUSLE_1,
+    SLATEPORT_TENT_MON_PLUSLE_2,
+    SLATEPORT_TENT_MON_SWABLU,
     -1
 };
 
 const u16 gSlateportBattleTentTrainerMons_Maggie[] = 
 {
-    10,
-    13,
-    17,
-    27,
-    45,
-    46,
-    53,
-    56,
-    61,
-    62,
-    63,
+    SLATEPORT_TENT_MON_LOMBRE_1,
+    SLATEPORT_TENT_MON_NUZLEAF,
+    SLATEPORT_TENT_MON_BALTOY,
+    SLATEPORT_TENT_MON_CACNEA_2,
+    SLATEPORT_TENT_MON_SHROOMISH_1,
+    SLATEPORT_TENT_MON_SHROOMISH_2,
+    SLATEPORT_TENT_MON_SKITTY,
+    SLATEPORT_TENT_MON_RALTS,
+    SLATEPORT_TENT_MON_KADABRA,
+    SLATEPORT_TENT_MON_KIRLIA,
+    SLATEPORT_TENT_MON_BRELOOM,
     -1
 };
 
 const u16 gSlateportBattleTentTrainerMons_Stephon[] = 
 {
-    8,
-    10,
-    16,
-    23,
-    29,
-    43,
-    44,
-    60,
-    62,
-    63,
-    68,
+    SLATEPORT_TENT_MON_PELIPPER_1,
+    SLATEPORT_TENT_MON_LOMBRE_1,
+    SLATEPORT_TENT_MON_GRAVELER,
+    SLATEPORT_TENT_MON_VOLTORB,
+    SLATEPORT_TENT_MON_SWELLOW,
+    SLATEPORT_TENT_MON_KECLEON_1,
+    SLATEPORT_TENT_MON_KECLEON_2,
+    SLATEPORT_TENT_MON_ILLUMISE,
+    SLATEPORT_TENT_MON_KIRLIA,
+    SLATEPORT_TENT_MON_BRELOOM,
+    SLATEPORT_TENT_MON_MACHOP,
     -1
 };
 
 const u16 gSlateportBattleTentTrainerMons_Rebecca[] = 
 {
-    8,
-    13,
-    21,
-    29,
-    33,
-    41,
-    48,
-    54,
-    59,
-    61,
-    68,
+    SLATEPORT_TENT_MON_PELIPPER_1,
+    SLATEPORT_TENT_MON_NUZLEAF,
+    SLATEPORT_TENT_MON_GOLDEEN,
+    SLATEPORT_TENT_MON_SWELLOW,
+    SLATEPORT_TENT_MON_MAGNEMITE,
+    SLATEPORT_TENT_MON_SEVIPER_1,
+    SLATEPORT_TENT_MON_NUMEL_2,
+    SLATEPORT_TENT_MON_SEVIPER_2,
+    SLATEPORT_TENT_MON_VOLBEAT,
+    SLATEPORT_TENT_MON_KADABRA,
+    SLATEPORT_TENT_MON_MACHOP,
     -1
 };
 
 const u16 gSlateportBattleTentTrainerMons_Reggie[] = 
 {
-    6,
-    7,
-    17,
-    23,
-    24,
-    26,
-    32,
-    36,
-    52,
-    53,
-    57,
-    65,
+    SLATEPORT_TENT_MON_MARILL_1,
+    SLATEPORT_TENT_MON_WINGULL_1,
+    SLATEPORT_TENT_MON_BALTOY,
+    SLATEPORT_TENT_MON_VOLTORB,
+    SLATEPORT_TENT_MON_ARON_1,
+    SLATEPORT_TENT_MON_TRAPINCH_1,
+    SLATEPORT_TENT_MON_SPINDA,
+    SLATEPORT_TENT_MON_NUMEL_1,
+    SLATEPORT_TENT_MON_MARILL_2,
+    SLATEPORT_TENT_MON_SKITTY,
+    SLATEPORT_TENT_MON_SANDSHREW,
+    SLATEPORT_TENT_MON_PLUSLE_2,
     -1
 };
 
 const u16 gSlateportBattleTentTrainerMons_Janae[] = 
 {
-    0,
-    1,
-    27,
-    28,
-    32,
-    34,
-    36,
-    37,
-    52,
-    53,
-    57,
-    65,
+    SLATEPORT_TENT_MON_ZIGZAGOON_1,
+    SLATEPORT_TENT_MON_ZIGZAGOON_2,
+    SLATEPORT_TENT_MON_CACNEA_2,
+    SLATEPORT_TENT_MON_TAILLOW,
+    SLATEPORT_TENT_MON_SPINDA,
+    SLATEPORT_TENT_MON_WHISMUR,
+    SLATEPORT_TENT_MON_NUMEL_1,
+    SLATEPORT_TENT_MON_BARBOACH,
+    SLATEPORT_TENT_MON_MARILL_2,
+    SLATEPORT_TENT_MON_SKITTY,
+    SLATEPORT_TENT_MON_SANDSHREW,
+    SLATEPORT_TENT_MON_PLUSLE_2,
     -1
 };
 
 const u16 gSlateportBattleTentTrainerMons_Caiden[] = 
 {
-    10,
-    14,
-    15,
-    16,
-    20,
-    21,
-    25,
-    30,
-    35,
-    47,
-    48,
-    50,
-    69,
+    SLATEPORT_TENT_MON_LOMBRE_1,
+    SLATEPORT_TENT_MON_NINJASK_1,
+    SLATEPORT_TENT_MON_NINJASK_2,
+    SLATEPORT_TENT_MON_GRAVELER,
+    SLATEPORT_TENT_MON_LINOONE,
+    SLATEPORT_TENT_MON_GOLDEEN,
+    SLATEPORT_TENT_MON_ARON_2,
+    SLATEPORT_TENT_MON_GOLBAT_1,
+    SLATEPORT_TENT_MON_MAKUHITA,
+    SLATEPORT_TENT_MON_LOMBRE_2,
+    SLATEPORT_TENT_MON_NUMEL_2,
+    SLATEPORT_TENT_MON_PELIPPER_2,
+    SLATEPORT_TENT_MON_MACHOKE,
     -1
 };
 
 const u16 gSlateportBattleTentTrainerMons_Kirsten[] = 
 {
-    10,
-    16,
-    18,
-    19,
-    20,
-    21,
-    25,
-    30,
-    35,
-    39,
-    41,
-    48,
-    69,
+    SLATEPORT_TENT_MON_LOMBRE_1,
+    SLATEPORT_TENT_MON_GRAVELER,
+    SLATEPORT_TENT_MON_MIGHTYENA_1,
+    SLATEPORT_TENT_MON_MIGHTYENA_2,
+    SLATEPORT_TENT_MON_LINOONE,
+    SLATEPORT_TENT_MON_GOLDEEN,
+    SLATEPORT_TENT_MON_ARON_2,
+    SLATEPORT_TENT_MON_GOLBAT_1,
+    SLATEPORT_TENT_MON_MAKUHITA,
+    SLATEPORT_TENT_MON_VIGOROTH,
+    SLATEPORT_TENT_MON_SEVIPER_1,
+    SLATEPORT_TENT_MON_NUMEL_2,
+    SLATEPORT_TENT_MON_MACHOKE,
     -1
 };
 
 const u16 gSlateportBattleTentTrainerMons_Kurtis[] = 
 {
-    0,
-    1,
-    36,
-    37,
-    40,
-    46,
-    49,
-    51,
-    64,
-    67,
-    68,
+    SLATEPORT_TENT_MON_ZIGZAGOON_1,
+    SLATEPORT_TENT_MON_ZIGZAGOON_2,
+    SLATEPORT_TENT_MON_NUMEL_1,
+    SLATEPORT_TENT_MON_BARBOACH,
+    SLATEPORT_TENT_MON_MAGIKARP,
+    SLATEPORT_TENT_MON_SHROOMISH_2,
+    SLATEPORT_TENT_MON_TRAPINCH_2,
+    SLATEPORT_TENT_MON_WINGULL_2,
+    SLATEPORT_TENT_MON_PLUSLE_1,
+    SLATEPORT_TENT_MON_SWABLU,
+    SLATEPORT_TENT_MON_MACHOP,
     -1
 };
 
 const u16 gSlateportBattleTentTrainerMons_Stefan[] = 
 {
-    4,
-    5,
-    21,
-    33,
-    37,
-    38,
-    40,
-    51,
-    52,
-    64,
-    65,
+    SLATEPORT_TENT_MON_WAILMER_1,
+    SLATEPORT_TENT_MON_WAILMER_2,
+    SLATEPORT_TENT_MON_GOLDEEN,
+    SLATEPORT_TENT_MON_MAGNEMITE,
+    SLATEPORT_TENT_MON_BARBOACH,
+    SLATEPORT_TENT_MON_TENTACOOL,
+    SLATEPORT_TENT_MON_MAGIKARP,
+    SLATEPORT_TENT_MON_WINGULL_2,
+    SLATEPORT_TENT_MON_MARILL_2,
+    SLATEPORT_TENT_MON_PLUSLE_1,
+    SLATEPORT_TENT_MON_PLUSLE_2,
     -1
 };
 
 const u16 gSlateportBattleTentTrainerMons_Avery[] = 
 {
-    2,
-    3,
-    7,
-    8,
-    22,
-    23,
-    28,
-    29,
-    30,
-    51,
-    67,
+    SLATEPORT_TENT_MON_BEAUTIFLY,
+    SLATEPORT_TENT_MON_DUSTOX,
+    SLATEPORT_TENT_MON_WINGULL_1,
+    SLATEPORT_TENT_MON_PELIPPER_1,
+    SLATEPORT_TENT_MON_ELECTRIKE_1,
+    SLATEPORT_TENT_MON_VOLTORB,
+    SLATEPORT_TENT_MON_TAILLOW,
+    SLATEPORT_TENT_MON_SWELLOW,
+    SLATEPORT_TENT_MON_GOLBAT_1,
+    SLATEPORT_TENT_MON_WINGULL_2,
+    SLATEPORT_TENT_MON_SWABLU,
     -1
 };
 
 const u16 gSlateportBattleTentTrainerMons_Dwane[] = 
 {
-    14,
-    15,
-    30,
-    43,
-    44,
-    45,
-    46,
-    55,
-    58,
-    59,
-    63,
+    SLATEPORT_TENT_MON_NINJASK_1,
+    SLATEPORT_TENT_MON_NINJASK_2,
+    SLATEPORT_TENT_MON_GOLBAT_1,
+    SLATEPORT_TENT_MON_KECLEON_1,
+    SLATEPORT_TENT_MON_KECLEON_2,
+    SLATEPORT_TENT_MON_SHROOMISH_1,
+    SLATEPORT_TENT_MON_SHROOMISH_2,
+    SLATEPORT_TENT_MON_GOLBAT_2,
+    SLATEPORT_TENT_MON_SWALOT,
+    SLATEPORT_TENT_MON_VOLBEAT,
+    SLATEPORT_TENT_MON_BRELOOM,
     -1
 };
 
 const u16 gSlateportBattleTentTrainerMons_Mckenna[] = 
 {
-    27,
-    29,
-    30,
-    32,
-    36,
-    48,
-    51,
-    52,
-    53,
-    57,
-    67,
+    SLATEPORT_TENT_MON_CACNEA_2,
+    SLATEPORT_TENT_MON_SWELLOW,
+    SLATEPORT_TENT_MON_GOLBAT_1,
+    SLATEPORT_TENT_MON_SPINDA,
+    SLATEPORT_TENT_MON_NUMEL_1,
+    SLATEPORT_TENT_MON_NUMEL_2,
+    SLATEPORT_TENT_MON_WINGULL_2,
+    SLATEPORT_TENT_MON_MARILL_2,
+    SLATEPORT_TENT_MON_SKITTY,
+    SLATEPORT_TENT_MON_SANDSHREW,
+    SLATEPORT_TENT_MON_SWABLU,
     -1
 };
 
 const u16 gSlateportBattleTentTrainerMons_Camryn[] = 
 {
-    5,
-    6,
-    7,
-    8,
-    10,
-    16,
-    17,
-    20,
-    21,
-    37,
-    43,
-    44,
+    SLATEPORT_TENT_MON_WAILMER_2,
+    SLATEPORT_TENT_MON_MARILL_1,
+    SLATEPORT_TENT_MON_WINGULL_1,
+    SLATEPORT_TENT_MON_PELIPPER_1,
+    SLATEPORT_TENT_MON_LOMBRE_1,
+    SLATEPORT_TENT_MON_GRAVELER,
+    SLATEPORT_TENT_MON_BALTOY,
+    SLATEPORT_TENT_MON_LINOONE,
+    SLATEPORT_TENT_MON_GOLDEEN,
+    SLATEPORT_TENT_MON_BARBOACH,
+    SLATEPORT_TENT_MON_KECLEON_1,
+    SLATEPORT_TENT_MON_KECLEON_2,
     -1
 };
 
 const u16 gSlateportBattleTentTrainerMons_Natasha[] = 
 {
-    1,
-    3,
-    4,
-    5,
-    9,
-    11,
-    12,
-    20,
-    21,
-    22,
-    51,
+    SLATEPORT_TENT_MON_ZIGZAGOON_2,
+    SLATEPORT_TENT_MON_DUSTOX,
+    SLATEPORT_TENT_MON_WAILMER_1,
+    SLATEPORT_TENT_MON_WAILMER_2,
+    SLATEPORT_TENT_MON_CACNEA_1,
+    SLATEPORT_TENT_MON_LOTAD,
+    SLATEPORT_TENT_MON_SEEDOT,
+    SLATEPORT_TENT_MON_LINOONE,
+    SLATEPORT_TENT_MON_GOLDEEN,
+    SLATEPORT_TENT_MON_ELECTRIKE_1,
+    SLATEPORT_TENT_MON_WINGULL_2,
     -1
 };
 
 const u16 gSlateportBattleTentTrainerMons_Austyn[] = 
 {
-    25,
-    31,
-    35,
-    37,
-    38,
-    39,
-    50,
-    51,
-    52,
-    58,
-    68,
-    69,
+    SLATEPORT_TENT_MON_ARON_2,
+    SLATEPORT_TENT_MON_LOUDRED,
+    SLATEPORT_TENT_MON_MAKUHITA,
+    SLATEPORT_TENT_MON_BARBOACH,
+    SLATEPORT_TENT_MON_TENTACOOL,
+    SLATEPORT_TENT_MON_VIGOROTH,
+    SLATEPORT_TENT_MON_PELIPPER_2,
+    SLATEPORT_TENT_MON_WINGULL_2,
+    SLATEPORT_TENT_MON_MARILL_2,
+    SLATEPORT_TENT_MON_SWALOT,
+    SLATEPORT_TENT_MON_MACHOP,
+    SLATEPORT_TENT_MON_MACHOKE,
     -1
 };
 
 const u16 gSlateportBattleTentTrainerMons_Donovan[] = 
 {
-    10,
-    16,
-    17,
-    24,
-    25,
-    43,
-    44,
-    47,
-    49,
-    53,
-    59,
-    60,
-    64,
-    65,
+    SLATEPORT_TENT_MON_LOMBRE_1,
+    SLATEPORT_TENT_MON_GRAVELER,
+    SLATEPORT_TENT_MON_BALTOY,
+    SLATEPORT_TENT_MON_ARON_1,
+    SLATEPORT_TENT_MON_ARON_2,
+    SLATEPORT_TENT_MON_KECLEON_1,
+    SLATEPORT_TENT_MON_KECLEON_2,
+    SLATEPORT_TENT_MON_LOMBRE_2,
+    SLATEPORT_TENT_MON_TRAPINCH_2,
+    SLATEPORT_TENT_MON_SKITTY,
+    SLATEPORT_TENT_MON_VOLBEAT,
+    SLATEPORT_TENT_MON_ILLUMISE,
+    SLATEPORT_TENT_MON_PLUSLE_1,
+    SLATEPORT_TENT_MON_PLUSLE_2,
     -1
 };
 
 const u16 gSlateportBattleTentTrainerMons_Tamia[] = 
 {
-    2,
-    6,
-    9,
-    13,
-    17,
-    19,
-    20,
-    24,
-    27,
-    29,
-    30,
+    SLATEPORT_TENT_MON_BEAUTIFLY,
+    SLATEPORT_TENT_MON_MARILL_1,
+    SLATEPORT_TENT_MON_CACNEA_1,
+    SLATEPORT_TENT_MON_NUZLEAF,
+    SLATEPORT_TENT_MON_BALTOY,
+    SLATEPORT_TENT_MON_MIGHTYENA_2,
+    SLATEPORT_TENT_MON_LINOONE,
+    SLATEPORT_TENT_MON_ARON_1,
+    SLATEPORT_TENT_MON_CACNEA_2,
+    SLATEPORT_TENT_MON_SWELLOW,
+    SLATEPORT_TENT_MON_GOLBAT_1,
     -1
 };
 
-const struct BattleFrontierTrainer gSlateportBattleTentTrainers[] = 
+const struct BattleFrontierTrainer gSlateportBattleTentTrainers[NUM_BATTLE_TENT_TRAINERS] = 
 {
-    [0] = {
+    [SLATEPORT_TENT_TRAINER_JOLIE] = {
         .facilityClass = FACILITY_CLASS_AROMA_LADY,
         .trainerName = _("JOLIE"),
         .speechBefore = {EC_WORD_WHAT, EC_WORD_WILL, EC_WORD_I, EC_WORD_BE, EC_WORD_TOMORROW, EC_WORD_QUES},
         .speechWin = {EC_WORD_I_AM, EC_WORD_FEELING, EC_WORD_LIKE, EC_WORD_IT_S, EC_WORD_FRIDAY, EC_WORD_EXCL},
         .speechLose = {EC_WORD_I_AM, EC_WORD_FEELING, EC_WORD_LIKE, EC_WORD_IT_S, EC_WORD_MONDAY, EC_WORD_ELLIPSIS},
-        .monSets = gSlateportBattleTentTrainerMons_Jolie
+        .monSet = gSlateportBattleTentTrainerMons_Jolie
     },
-    [1] = {
+    [SLATEPORT_TENT_TRAINER_MALACHI] = {
         .facilityClass = FACILITY_CLASS_RUIN_MANIAC,
         .trainerName = _("MALACHI"),
         .speechBefore = {EC_WORD_BAD, EC_WORD_NEWS, EC_WORD_EXCL, EC_WORD_IT_S, EC_WORD_A, EC_MOVE(SAND_TOMB)},
         .speechWin = {EC_WORD_YEEHAW_EXCL, -1, -1, EC_WORD_I_VE, EC_WORD_DONE, EC_WORD_IT},
         .speechLose = {EC_WORD_I_VE, EC_WORD_LOST, EC_WORD_IN, EC_WORD_THIS, EC_MOVE(SAND_TOMB), EC_WORD_ELLIPSIS},
-        .monSets = gSlateportBattleTentTrainerMons_Malachi
+        .monSet = gSlateportBattleTentTrainerMons_Malachi
     },
-    [2] = {
+    [SLATEPORT_TENT_TRAINER_KELSIE] = {
         .facilityClass = FACILITY_CLASS_TUBER_F,
         .trainerName = _("KELSIE"),
         .speechBefore = {EC_WORD_GO, EC_WORD_EXCL_EXCL, EC_WORD_MY, EC_WORD_BATH, EC_WORD_POKEMON, EC_WORD_EXCL_EXCL},
         .speechWin = {EC_WORD_YAHOO, EC_WORD_EXCL_EXCL, EC_WORD_MY, EC_WORD_BATH, EC_WORD_POKEMON, EC_WORD_EXCL_EXCL},
         .speechLose = {EC_WORD_GWAH, EC_WORD_EXCL_EXCL, EC_WORD_MY, EC_WORD_BATH, EC_WORD_POKEMON, EC_WORD_EXCL_EXCL},
-        .monSets = gSlateportBattleTentTrainerMons_Kelsie
+        .monSet = gSlateportBattleTentTrainerMons_Kelsie
     },
-    [3] = {
+    [SLATEPORT_TENT_TRAINER_DAVON] = {
         .facilityClass = FACILITY_CLASS_TUBER_M,
         .trainerName = _("DAVON"),
         .speechBefore = {EC_WORD_YEAH_YEAH, EC_WORD_EXCL_EXCL, -1, EC_WORD_GREAT, EC_MOVE(WHIRLPOOL), EC_WORD_ISN_T_IT_QUES},
         .speechWin = {EC_WORD_THAT_WAS, EC_WORD_LIKE, EC_WORD_A, EC_MOVE(WHIRLPOOL), EC_WORD_YEAH_YEAH, EC_WORD_EXCL_EXCL},
         .speechLose = {EC_WORD_DON_T, EC_WORD_GET, EC_MOVE2(BEAT_UP), EC_WORD_IN, EC_WORD_THAT, EC_MOVE(WHIRLPOOL)},
-        .monSets = gSlateportBattleTentTrainerMons_Davon
+        .monSet = gSlateportBattleTentTrainerMons_Davon
     },
-    [4] = {
+    [SLATEPORT_TENT_TRAINER_GLENDA] = {
         .facilityClass = FACILITY_CLASS_LADY,
         .trainerName = _("GLENDA"),
         .speechBefore = {EC_WORD_CONVERSATION, EC_WORD_CAN, EC_WORD_WAIT, EC_WORD_UNTIL, EC_WORD_I, EC_WORD_WIN},
         .speechWin = {EC_WORD_FABULOUS, EC_WORD_EXCL, EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_TO, EC_WORD_ROCK},
         .speechLose = {EC_WORD_NO, EC_WORD_EXCL, -1, EC_WORD_I, EC_WORD_WASN_T, EC_WORD_SERIOUS},
-        .monSets = gSlateportBattleTentTrainerMons_Glenda
+        .monSet = gSlateportBattleTentTrainerMons_Glenda
     },
-    [5] = {
+    [SLATEPORT_TENT_TRAINER_HELENA] = {
         .facilityClass = FACILITY_CLASS_BEAUTY,
         .trainerName = _("HELENA"),
         .speechBefore = {EC_WORD_DOES, EC_WORD_MY, EC_WORD_BEAUTY, EC_WORD_INTIMIDATE, EC_WORD_YOU, EC_WORD_QUES},
         .speechWin = {EC_WORD_I_AM, EC_WORD_SO, EC_WORD_SORRY, EC_WORD_BUT, EC_WORD_YOU_RE, EC_WORD_BORING},
         .speechLose = {EC_WORD_I, EC_WORD_DO, EC_WORD_SO, EC_WORD_ENJOY, EC_WORD_THIS, EC_WORD_EXCL},
-        .monSets = gSlateportBattleTentTrainerMons_Helena
+        .monSet = gSlateportBattleTentTrainerMons_Helena
     },
-    [6] = {
+    [SLATEPORT_TENT_TRAINER_RODOLFO] = {
         .facilityClass = FACILITY_CLASS_RICH_BOY,
         .trainerName = _("RODOLFO"),
         .speechBefore = {EC_WORD_GO, EC_WORD_GET, EC_WORD_A, EC_POKEMON(WHISCASH), EC_WORD_FOR, EC_WORD_ME},
         .speechWin = {EC_WORD_AWW, EC_WORD_YOU, EC_WORD_DON_T, EC_WORD_HAVE, EC_WORD_A, EC_POKEMON(WHISCASH)},
         .speechLose = {EC_WORD_PLEASE, EC_WORD_I, EC_WORD_NEED, EC_WORD_A, EC_POKEMON(WHISCASH), EC_WORD_BADLY},
-        .monSets = gSlateportBattleTentTrainerMons_Rodolfo
+        .monSet = gSlateportBattleTentTrainerMons_Rodolfo
     },
-    [7] = {
+    [SLATEPORT_TENT_TRAINER_DAVION] = {
         .facilityClass = FACILITY_CLASS_POKEMANIAC,
         .trainerName = _("DAVION"),
         .speechBefore = {EC_WORD_GRAAAH, EC_WORD_GRAAAH, EC_WORD_EXCL_EXCL, EC_WORD_GRAAAH, EC_WORD_GRAAAH, EC_WORD_EXCL_EXCL},
         .speechWin = {EC_MOVE2(ROAR), EC_WORD_EXCL, -1, EC_MOVE2(ROAR), EC_WORD_EXCL_EXCL, -1},
         .speechLose = {EC_WORD_URGH, EC_WORD_WAAAH, EC_WORD_EXCL_EXCL, -1, -1, -1},
-        .monSets = gSlateportBattleTentTrainerMons_Davion
+        .monSet = gSlateportBattleTentTrainerMons_Davion
     },
-    [8] = {
+    [SLATEPORT_TENT_TRAINER_KENDALL] = {
         .facilityClass = FACILITY_CLASS_SWIMMER_M,
         .trainerName = _("KENDALL"),
         .speechBefore = {EC_WORD_A_LITTLE, EC_MOVE2(PETAL_DANCE), EC_WORD_TO, EC_WORD_PLEASE, EC_WORD_YOU, EC_WORD_EXCL},
         .speechWin = {EC_WORD_I, EC_WORD_DO, EC_WORD_THIS, EC_WORD_ONLY, EC_WORD_FOR, EC_WORD_WORK},
         .speechLose = {EC_WORD_HOW, EC_WORD_COULD, EC_WORD_YOU, EC_MOVE2(POUND), EC_WORD_ME, EC_WORD_QUES},
-        .monSets = gSlateportBattleTentTrainerMons_Kendall
+        .monSet = gSlateportBattleTentTrainerMons_Kendall
     },
-    [9] = {
+    [SLATEPORT_TENT_TRAINER_COLTEN] = {
         .facilityClass = FACILITY_CLASS_CAMPER,
         .trainerName = _("COLTEN"),
         .speechBefore = {EC_WORD_I, EC_WORD_WANT, EC_WORD_TO, EC_WORD_GO, EC_WORD_RUN, EC_WORD_AROUND},
         .speechWin = {EC_WORD_YAY, EC_WORD_EXCL, EC_WORD_WANT, EC_WORD_TO, EC_WORD_RUN, EC_WORD_QUES},
         .speechLose = {EC_WORD_A, EC_WORD_SWIFT_SWIM, EC_WORD_WOULD, EC_WORD_BE, EC_WORD_GOOD, EC_WORD_TOO},
-        .monSets = gSlateportBattleTentTrainerMons_Colten
+        .monSet = gSlateportBattleTentTrainerMons_Colten
     },
-    [10] = {
+    [SLATEPORT_TENT_TRAINER_IRVIN] = {
         .facilityClass = FACILITY_CLASS_BUG_MANIAC,
         .trainerName = _("IRVIN"),
         .speechBefore = {EC_WORD_HAVE, EC_WORD_A, EC_WORD_LOOK, EC_WORD_AT, EC_WORD_MY, EC_MOVE(CONFUSE_RAY)},
         .speechWin = {EC_WORD_YAHOO, EC_WORD_MY, EC_MOVE(CONFUSE_RAY), EC_WORD_IS, EC_WORD_THE, EC_WORD_BEST},
         .speechLose = {EC_WORD_GWAH, EC_WORD_EXCL_EXCL, -1, EC_WORD_I_AM, EC_WORD_SORRY, EC_WORD_EXCL},
-        .monSets = gSlateportBattleTentTrainerMons_Irvin
+        .monSet = gSlateportBattleTentTrainerMons_Irvin
     },
-    [11] = {
+    [SLATEPORT_TENT_TRAINER_SHAUN] = {
         .facilityClass = FACILITY_CLASS_GENTLEMAN,
         .trainerName = _("SHAUN"),
         .speechBefore = {EC_WORD_LISTEN, EC_WORD_ELLIPSIS, EC_WORD_YOU, EC_WORD_AREN_T, EC_WORD_VERY, EC_WORD_GOOD},
         .speechWin = {EC_WORD_YOU, EC_WORD_SEE, EC_WORD_QUES, EC_WORD_I, EC_WORD_WAS, EC_WORD_RIGHT},
         .speechLose = {EC_WORD_YES, EC_WORD_YES, EC_WORD_ELLIPSIS, EC_WORD_YOU_RE, EC_WORD_QUITE, EC_WORD_SOMETHING},
-        .monSets = gSlateportBattleTentTrainerMons_Shaun
+        .monSet = gSlateportBattleTentTrainerMons_Shaun
     },
-    [12] = {
+    [SLATEPORT_TENT_TRAINER_KYLER] = {
         .facilityClass = FACILITY_CLASS_GUITARIST,
         .trainerName = _("KYLER"),
         .speechBefore = {EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_QUES},
         .speechWin = {EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_YAY},
         .speechLose = {EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_WOW},
-        .monSets = gSlateportBattleTentTrainerMons_Kyler
+        .monSet = gSlateportBattleTentTrainerMons_Kyler
     },
-    [13] = {
+    [SLATEPORT_TENT_TRAINER_MAGGIE] = {
         .facilityClass = FACILITY_CLASS_SCHOOL_KID_F,
         .trainerName = _("MAGGIE"),
         .speechBefore = {EC_POKEMON(VULPIX), EC_POKEMON(XATU), EC_POKEMON2(UMBREON), EC_WORD_ELLIPSIS, EC_WORD_UM, EC_WORD_ELLIPSIS},
         .speechWin = {EC_POKEMON(NOSEPASS), EC_WORD_ELLIPSIS, EC_WORD_UM, EC_POKEMON(SEVIPER), EC_WORD_EXCL, -1},
         .speechLose = {EC_POKEMON(NOSEPASS), EC_WORD_ELLIPSIS, EC_WORD_UM, EC_POKEMON2(SNORLAX), EC_WORD_ELLIPSIS, EC_WORD_UH_OH},
-        .monSets = gSlateportBattleTentTrainerMons_Maggie
+        .monSet = gSlateportBattleTentTrainerMons_Maggie
     },
-    [14] = {
+    [SLATEPORT_TENT_TRAINER_STEPHON] = {
         .facilityClass = FACILITY_CLASS_COOLTRAINER_M,
         .trainerName = _("STEPHON"),
         .speechBefore = {EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_TO, EC_WORD_ENJOY, EC_WORD_AN, EC_WORD_EGG},
         .speechWin = {EC_WORD_I, EC_WORD_WILL, EC_WORD_ENJOY, EC_WORD_THIS, EC_WORD_TASTY, EC_WORD_VICTORY},
         .speechLose = {EC_WORD_AWFUL, EC_WORD_EXCL_EXCL, -1, EC_WORD_JUST, EC_WORD_AWFUL, EC_WORD_EXCL_EXCL},
-        .monSets = gSlateportBattleTentTrainerMons_Stephon
+        .monSet = gSlateportBattleTentTrainerMons_Stephon
     },
-    [15] = {
+    [SLATEPORT_TENT_TRAINER_REBECCA] = {
         .facilityClass = FACILITY_CLASS_COOLTRAINER_F,
         .trainerName = _("REBECCA"),
         .speechBefore = {EC_WORD_THAT, EC_WORD_EGG, EC_WORD_HAS, EC_WORD_A, EC_WORD_TASTY, EC_WORD_SHINE},
         .speechWin = {EC_WORD_I, EC_WORD_CAN_T, EC_WORD_EXCL, EC_WORD_SMELL, EC_WORD_THAT, EC_WORD_STENCH},
         .speechLose = {EC_WORD_YOU, EC_WORD_CAN_T, EC_WORD_MAKE, EC_WORD_ME, EC_WORD_STOP, EC_WORD_ELLIPSIS},
-        .monSets = gSlateportBattleTentTrainerMons_Rebecca
+        .monSet = gSlateportBattleTentTrainerMons_Rebecca
     },
-    [16] = {
+    [SLATEPORT_TENT_TRAINER_REGGIE] = {
         .facilityClass = FACILITY_CLASS_POKEFAN_M,
         .trainerName = _("REGGIE"),
         .speechBefore = {EC_WORD_POKEMON, EC_WORD_COME, EC_WORD_BEFORE, EC_WORD_MONEY, EC_WORD_OR, EC_WORD_FAMILY},
         .speechWin = {EC_WORD_THAT_S, EC_WORD_WHAT, EC_WORD_IS, EC_WORD_MAKING, EC_WORD_ME, EC_WORD_STRONG},
         .speechLose = {EC_WORD_THAT_S, EC_WORD_WHY, EC_WORD_I_AM, EC_WORD_SO, EC_WORD_THICK, EC_WORD_ELLIPSIS},
-        .monSets = gSlateportBattleTentTrainerMons_Reggie
+        .monSet = gSlateportBattleTentTrainerMons_Reggie
     },
-    [17] = {
+    [SLATEPORT_TENT_TRAINER_JANAE] = {
         .facilityClass = FACILITY_CLASS_POKEFAN_F,
         .trainerName = _("JANAE"),
         .speechBefore = {EC_WORD_I, EC_WORD_JUST, EC_WORD_ADORE, EC_WORD_YOUR, EC_WORD_TOUGH, EC_WORD_LOOK},
         .speechWin = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_HOW, EC_WORD_YOU, EC_MOVE2(STRUGGLE), -1},
         .speechLose = {EC_WORD_YOU_RE, EC_WORD_A, EC_WORD_MEAN, EC_WORD_AND, EC_WORD_AWFUL, EC_WORD_TRAINER},
-        .monSets = gSlateportBattleTentTrainerMons_Janae
+        .monSet = gSlateportBattleTentTrainerMons_Janae
     },
-    [18] = {
+    [SLATEPORT_TENT_TRAINER_CAIDEN] = {
         .facilityClass = FACILITY_CLASS_EXPERT_M,
         .trainerName = _("CAIDEN"),
         .speechBefore = {EC_WORD_MY, EC_MOVE2(CURSE), EC_WORD_WILL, EC_WORD_BREAK, EC_WORD_YOUR, EC_WORD_SPIRIT},
         .speechWin = {EC_MOVE2(CURSE), EC_WORD_QUES, EC_WORD_IT_S, EC_WORD_A, EC_WORD_LIE, EC_WORD_ELLIPSIS},
         .speechLose = {EC_WORD_MY, EC_MOVE2(CURSE), EC_WORD_WILL, EC_WORD_LAST, EC_WORD_FOREVER, -1},
-        .monSets = gSlateportBattleTentTrainerMons_Caiden
+        .monSet = gSlateportBattleTentTrainerMons_Caiden
     },
-    [19] = {
+    [SLATEPORT_TENT_TRAINER_KIRSTEN] = {
         .facilityClass = FACILITY_CLASS_EXPERT_F,
         .trainerName = _("KIRSTEN"),
         .speechBefore = {EC_WORD_HUH_QUES, EC_WORD_A, EC_WORD_BATTLE, EC_WORD_YOU, EC_WORD_SAID, EC_WORD_QUES},
         .speechWin = {EC_WORD_HUH_QUES, EC_WORD_STRONG, EC_WORD_BUT, EC_WORD_NOT, EC_WORD_STRONG, EC_WORD_ENOUGH},
         .speechLose = {EC_WORD_HUH_QUES, EC_WORD_I, EC_WORD_SURRENDER, EC_WORD_TO, EC_WORD_YOUR, EC_MOVE(STRENGTH)},
-        .monSets = gSlateportBattleTentTrainerMons_Kirsten
+        .monSet = gSlateportBattleTentTrainerMons_Kirsten
     },
-    [20] = {
+    [SLATEPORT_TENT_TRAINER_KURTIS] = {
         .facilityClass = FACILITY_CLASS_YOUNGSTER,
         .trainerName = _("KURTIS"),
         .speechBefore = {EC_WORD_SORRY, EC_WORD_YOU_RE, EC_WORD_GOING, EC_WORD_TO, EC_WORD_GET, EC_MOVE2(BEAT_UP)},
         .speechWin = {EC_WORD_I, EC_WORD_SAID, EC_WORD_WE, EC_WORD_WOULD, EC_MOVE2(POUND), EC_WORD_YOU},
         .speechLose = {EC_WORD_HOW, EC_WORD_DID, EC_WORD_I, EC_WORD_GET, EC_MOVE2(BEAT_UP), EC_WORD_QUES},
-        .monSets = gSlateportBattleTentTrainerMons_Kurtis
+        .monSet = gSlateportBattleTentTrainerMons_Kurtis
     },
-    [21] = {
+    [SLATEPORT_TENT_TRAINER_STEFAN] = {
         .facilityClass = FACILITY_CLASS_FISHERMAN,
         .trainerName = _("STEFAN"),
         .speechBefore = {EC_WORD_I, EC_WORD_ONLY, EC_WORD_WANT, EC_WORD_CUTE, EC_WORD_POKEMON, -1},
         .speechWin = {EC_WORD_WHAT, EC_WORD_IS, EC_WORD_IT, EC_WORD_TO, EC_WORD_YOU, EC_WORD_QUES},
         .speechLose = {EC_WORD_YOU_RE, EC_WORD_KIND, EC_WORD_OF, EC_WORD_AWESOME, EC_WORD_ELLIPSIS, -1},
-        .monSets = gSlateportBattleTentTrainerMons_Stefan
+        .monSet = gSlateportBattleTentTrainerMons_Stefan
     },
-    [22] = {
+    [SLATEPORT_TENT_TRAINER_AVERY] = {
         .facilityClass = FACILITY_CLASS_BIRD_KEEPER,
         .trainerName = _("AVERY"),
         .speechBefore = {EC_WORD_TOYS, EC_WORD_EXCL, EC_WORD_I, EC_WORD_NEED, EC_WORD_MORE, EC_WORD_TOYS},
         .speechWin = {EC_WORD_I, EC_WORD_NEED, EC_WORD_SOME, EC_WORD_EASY, EC_WORD_MONEY, EC_WORD_FAST},
         .speechLose = {EC_WORD_I, EC_WORD_NEED, EC_WORD_TO, EC_WORD_WORK, EC_WORD_FOR, EC_WORD_MONEY},
-        .monSets = gSlateportBattleTentTrainerMons_Avery
+        .monSet = gSlateportBattleTentTrainerMons_Avery
     },
-    [23] = {
+    [SLATEPORT_TENT_TRAINER_DWANE] = {
         .facilityClass = FACILITY_CLASS_NINJA_BOY,
         .trainerName = _("DWANE"),
         .speechBefore = {EC_WORD_MMM, EC_WORD_TASTY, EC_WORD_ELLIPSIS, EC_WORD_WONDER, EC_WORD_WHAT, EC_WORD_QUES},
         .speechWin = {EC_WORD_MMM, EC_WORD_MMM, EC_WORD_ELLIPSIS, EC_WORD_YOU, EC_WORD_DON_T, EC_WORD_KNOW},
         .speechLose = {EC_WORD_MMM, EC_WORD_MMM, EC_WORD_ELLIPSIS, EC_WORD_OH_YEAH, EC_WORD_THIS_IS_IT_EXCL, -1},
-        .monSets = gSlateportBattleTentTrainerMons_Dwane
+        .monSet = gSlateportBattleTentTrainerMons_Dwane
     },
-    [24] = {
+    [SLATEPORT_TENT_TRAINER_MCKENNA] = {
         .facilityClass = FACILITY_CLASS_PARASOL_LADY,
         .trainerName = _("MCKENNA"),
         .speechBefore = {EC_WORD_I, EC_WORD_DISLIKE, EC_WORD_SMALL, EC_WORD_TALK, EC_WORD_LET_S, EC_WORD_GO},
         .speechWin = {EC_WORD_YUP, EC_WORD_THAT_S, EC_WORD_THAT, -1, -1, -1},
         .speechLose = {EC_WORD_KTHX_BYE, -1, -1, -1, -1, -1},
-        .monSets = gSlateportBattleTentTrainerMons_Mckenna
+        .monSet = gSlateportBattleTentTrainerMons_Mckenna
     },
-    [25] = {
+    [SLATEPORT_TENT_TRAINER_CAMRYN] = {
         .facilityClass = FACILITY_CLASS_SWIMMER_F,
         .trainerName = _("CAMRYN"),
         .speechBefore = {EC_WORD_MR, EC_WORD_JUDGE, EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_OUR, EC_WORD_TRUST},
         .speechWin = {EC_WORD_YES_SIR_EXCL, EC_WORD_WE_RE, EC_WORD_NO_1, EC_WORD_IN, EC_WORD_THIS, EC_WORD_CONTEST},
         .speechLose = {EC_WORD_I, EC_WORD_WON_T, EC_WORD_GIVE_UP, EC_WORD_MY, EC_WORD_IDOL, EC_WORD_DREAM},
-        .monSets = gSlateportBattleTentTrainerMons_Camryn
+        .monSet = gSlateportBattleTentTrainerMons_Camryn
     },
-    [26] = {
+    [SLATEPORT_TENT_TRAINER_NATASHA] = {
         .facilityClass = FACILITY_CLASS_PICNICKER,
         .trainerName = _("NATASHA"),
         .speechBefore = {EC_WORD_COME_OVER, EC_WORD_TO, EC_WORD_MY, EC_WORD_PLACE, EC_WORD_OK_QUES, -1},
         .speechWin = {EC_WORD_COME_ON, EC_WORD_OVER, EC_WORD_IT, EC_WORD_WILL, EC_WORD_BE, EC_WORD_GREAT},
         .speechLose = {EC_WORD_AWW, EC_WORD_WON_T, EC_WORD_YOU, EC_WORD_COME_OVER, EC_WORD_QUES, -1},
-        .monSets = gSlateportBattleTentTrainerMons_Natasha
+        .monSet = gSlateportBattleTentTrainerMons_Natasha
     },
-    [27] = {
+    [SLATEPORT_TENT_TRAINER_AUSTYN] = {
         .facilityClass = FACILITY_CLASS_SAILOR,
         .trainerName = _("AUSTYN"),
         .speechBefore = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_CARE, EC_WORD_HOW, EC_WORD_WE, EC_WORD_MATCH_UP},
         .speechWin = {EC_WORD_HAH, EC_WORD_BACK, EC_WORD_TO, EC_WORD_SCHOOL, EC_WORD_FOR, EC_WORD_YOU},
         .speechLose = {EC_WORD_I, EC_WORD_NEED, EC_WORD_TO, EC_WORD_STUDY, EC_WORD_MY, EC_WORD_LESSONS},
-        .monSets = gSlateportBattleTentTrainerMons_Austyn
+        .monSet = gSlateportBattleTentTrainerMons_Austyn
     },
-    [28] = {
+    [SLATEPORT_TENT_TRAINER_DONOVAN] = {
         .facilityClass = FACILITY_CLASS_COLLECTOR,
         .trainerName = _("DONOVAN"),
         .speechBefore = {EC_WORD_OH, EC_WORD_I_AM, EC_WORD_FEELING, EC_WORD_SLIMY, EC_WORD_ALL, EC_WORD_OVER},
         .speechWin = {EC_WORD_YOU_RE, EC_WORD_GOING, EC_WORD_DOWN, EC_WORD_THE, EC_MOVE2(MEGA_DRAIN), EC_WORD_HAHAHA},
         .speechLose = {EC_WORD_I_AM, EC_WORD_NATURALLY, EC_WORD_SLIMY, EC_WORD_THAT_S, EC_WORD_WHAT, EC_WORD_I_AM},
-        .monSets = gSlateportBattleTentTrainerMons_Donovan
+        .monSet = gSlateportBattleTentTrainerMons_Donovan
     },
-    [29] = {
+    [SLATEPORT_TENT_TRAINER_TAMIA] = {
         .facilityClass = FACILITY_CLASS_LASS,
         .trainerName = _("TAMIA"),
         .speechBefore = {EC_WORD_I_AM, EC_WORD_ANGRY, EC_WORD_WITH, EC_WORD_MY, EC_WORD_FATHER, EC_WORD_ELLIPSIS},
         .speechWin = {EC_WORD_I, EC_WORD_REALLY, EC_WORD_DISLIKE, EC_WORD_MY, EC_WORD_FATHER, EC_WORD_EXCL},
         .speechLose = {EC_WORD_I, EC_WORD_JUST, EC_WORD_SO, EC_WORD_ADORE, EC_WORD_MY, EC_WORD_FATHER},
-        .monSets = gSlateportBattleTentTrainerMons_Tamia
+        .monSet = gSlateportBattleTentTrainerMons_Tamia
     }
 };
 
-const struct FacilityMon gSlateportBattleTentMons[] = 
+const struct FacilityMon gSlateportBattleTentMons[NUM_SLATEPORT_TENT_MONS] = 
 {
-    [0] = {
+    [SLATEPORT_TENT_MON_ZIGZAGOON_1] = {
         .species = SPECIES_ZIGZAGOON,
         .moves = {MOVE_TACKLE, MOVE_CHARM, MOVE_ODOR_SLEUTH, MOVE_PIN_MISSILE},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHOICE_BAND,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_JOLLY
     },
-    [1] = {
+    [SLATEPORT_TENT_MON_ZIGZAGOON_2] = {
         .species = SPECIES_ZIGZAGOON,
         .moves = {MOVE_DIG, MOVE_MUD_SPORT, MOVE_TAIL_WHIP, MOVE_REST},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_JOLLY
     },
-    [2] = {
+    [SLATEPORT_TENT_MON_BEAUTIFLY] = {
         .species = SPECIES_BEAUTIFLY,
         .moves = {MOVE_STUN_SPORE, MOVE_MEGA_DRAIN, MOVE_GUST, MOVE_HARDEN},
         .itemTableId = BATTLE_FRONTIER_ITEM_NONE,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [3] = {
+    [SLATEPORT_TENT_MON_DUSTOX] = {
         .species = SPECIES_DUSTOX,
         .moves = {MOVE_POISON_STING, MOVE_MOONLIGHT, MOVE_PROTECT, MOVE_GUST},
         .itemTableId = BATTLE_FRONTIER_ITEM_ORAN_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_MODEST
     },
-    [4] = {
+    [SLATEPORT_TENT_MON_WAILMER_1] = {
         .species = SPECIES_WAILMER,
         .moves = {MOVE_ROLLOUT, MOVE_CURSE, MOVE_GROWL, MOVE_WHIRLPOOL},
         .itemTableId = BATTLE_FRONTIER_ITEM_RAWST_BERRY,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [5] = {
+    [SLATEPORT_TENT_MON_WAILMER_2] = {
         .species = SPECIES_WAILMER,
         .moves = {MOVE_ROLLOUT, MOVE_GROWL, MOVE_WHIRLPOOL, MOVE_WATER_PULSE},
         .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_MODEST
     },
-    [6] = {
+    [SLATEPORT_TENT_MON_MARILL_1] = {
         .species = SPECIES_MARILL,
         .moves = {MOVE_ROLLOUT, MOVE_DEFENSE_CURL, MOVE_TAIL_WHIP, MOVE_BUBBLE_BEAM},
         .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_IMPISH
     },
-    [7] = {
+    [SLATEPORT_TENT_MON_WINGULL_1] = {
         .species = SPECIES_WINGULL,
         .moves = {MOVE_SUPERSONIC, MOVE_GROWL, MOVE_WING_ATTACK, MOVE_STEEL_WING},
         .itemTableId = BATTLE_FRONTIER_ITEM_METAL_COAT,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_NAIVE
     },
-    [8] = {
+    [SLATEPORT_TENT_MON_PELIPPER_1] = {
         .species = SPECIES_PELIPPER,
         .moves = {MOVE_TWISTER, MOVE_WATER_SPORT, MOVE_GROWL, MOVE_WING_ATTACK},
         .itemTableId = BATTLE_FRONTIER_ITEM_DRAGON_FANG,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_MODEST
     },
-    [9] = {
+    [SLATEPORT_TENT_MON_CACNEA_1] = {
         .species = SPECIES_CACNEA,
         .moves = {MOVE_SANDSTORM, MOVE_LEER, MOVE_LEECH_SEED, MOVE_PIN_MISSILE},
         .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE,
         .evSpread = F_EV_SPREAD_SPEED,
         .nature = NATURE_JOLLY
     },
-    [10] = {
+    [SLATEPORT_TENT_MON_LOMBRE_1] = {
         .species = SPECIES_LOMBRE,
         .moves = {MOVE_ASTONISH, MOVE_WATER_GUN, MOVE_FAKE_OUT, MOVE_ABSORB},
         .itemTableId = BATTLE_FRONTIER_ITEM_MIRACLE_SEED,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_MODEST
     },
-    [11] = {
+    [SLATEPORT_TENT_MON_LOTAD] = {
         .species = SPECIES_LOTAD,
         .moves = {MOVE_SYNTHESIS, MOVE_NATURE_POWER, MOVE_RAIN_DANCE, MOVE_MEGA_DRAIN},
         .itemTableId = BATTLE_FRONTIER_ITEM_MYSTIC_WATER,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_DOCILE
     },
-    [12] = {
+    [SLATEPORT_TENT_MON_SEEDOT] = {
         .species = SPECIES_SEEDOT,
         .moves = {MOVE_SUNNY_DAY, MOVE_SYNTHESIS, MOVE_LEECH_SEED, MOVE_BIDE},
         .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_TIMID
     },
-    [13] = {
+    [SLATEPORT_TENT_MON_NUZLEAF] = {
         .species = SPECIES_NUZLEAF,
         .moves = {MOVE_FAKE_OUT, MOVE_NATURE_POWER, MOVE_HARDEN, MOVE_ATTRACT},
         .itemTableId = BATTLE_FRONTIER_ITEM_NONE,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_LONELY
     },
-    [14] = {
+    [SLATEPORT_TENT_MON_NINJASK_1] = {
         .species = SPECIES_NINJASK,
         .moves = {MOVE_FURY_CUTTER, MOVE_SCREECH, MOVE_SWORDS_DANCE, MOVE_DOUBLE_TEAM},
         .itemTableId = BATTLE_FRONTIER_ITEM_NONE,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_QUIRKY
     },
-    [15] = {
+    [SLATEPORT_TENT_MON_NINJASK_2] = {
         .species = SPECIES_NINJASK,
         .moves = {MOVE_FURY_CUTTER, MOVE_DOUBLE_TEAM, MOVE_SCREECH, MOVE_SAND_ATTACK},
         .itemTableId = BATTLE_FRONTIER_ITEM_SILVER_POWDER,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_NAUGHTY
     },
-    [16] = {
+    [SLATEPORT_TENT_MON_GRAVELER] = {
         .species = SPECIES_GRAVELER,
         .moves = {MOVE_MUD_SPORT, MOVE_BLOCK, MOVE_ROCK_TOMB, MOVE_MAGNITUDE},
         .itemTableId = BATTLE_FRONTIER_ITEM_NONE,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_BRAVE
     },
-    [17] = {
+    [SLATEPORT_TENT_MON_BALTOY] = {
         .species = SPECIES_BALTOY,
         .moves = {MOVE_SELF_DESTRUCT, MOVE_ANCIENT_POWER, MOVE_PSYBEAM, MOVE_REFLECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_NONE,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_NAIVE
     },
-    [18] = {
+    [SLATEPORT_TENT_MON_MIGHTYENA_1] = {
         .species = SPECIES_MIGHTYENA,
         .moves = {MOVE_BITE, MOVE_ROAR, MOVE_SWAGGER, MOVE_TACKLE},
         .itemTableId = BATTLE_FRONTIER_ITEM_BLACK_GLASSES,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP,
         .nature = NATURE_CALM
     },
-    [19] = {
+    [SLATEPORT_TENT_MON_MIGHTYENA_2] = {
         .species = SPECIES_MIGHTYENA,
         .moves = {MOVE_ODOR_SLEUTH, MOVE_HOWL, MOVE_SAND_ATTACK, MOVE_POISON_FANG},
         .itemTableId = BATTLE_FRONTIER_ITEM_SHELL_BELL,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_LONELY
     },
-    [20] = {
+    [SLATEPORT_TENT_MON_LINOONE] = {
         .species = SPECIES_LINOONE,
         .moves = {MOVE_HEADBUTT, MOVE_TICKLE, MOVE_TAIL_WHIP, MOVE_REST},
         .itemTableId = BATTLE_FRONTIER_ITEM_MENTAL_HERB,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_JOLLY
     },
-    [21] = {
+    [SLATEPORT_TENT_MON_GOLDEEN] = {
         .species = SPECIES_GOLDEEN,
         .moves = {MOVE_WATER_SPORT, MOVE_HORN_ATTACK, MOVE_WATERFALL, MOVE_SUPERSONIC},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_CALM
     },
-    [22] = {
+    [SLATEPORT_TENT_MON_ELECTRIKE_1] = {
         .species = SPECIES_ELECTRIKE,
         .moves = {MOVE_BITE, MOVE_SPARK, MOVE_ROAR, MOVE_FLASH},
         .itemTableId = BATTLE_FRONTIER_ITEM_MAGNET,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_MODEST
     },
-    [23] = {
+    [SLATEPORT_TENT_MON_VOLTORB] = {
         .species = SPECIES_VOLTORB,
         .moves = {MOVE_SPARK, MOVE_ROLLOUT, MOVE_CHARGE, MOVE_SCREECH},
         .itemTableId = BATTLE_FRONTIER_ITEM_NONE,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK,
         .nature = NATURE_MILD
     },
-    [24] = {
+    [SLATEPORT_TENT_MON_ARON_1] = {
         .species = SPECIES_ARON,
         .moves = {MOVE_DIG, MOVE_METAL_CLAW, MOVE_IRON_DEFENSE, MOVE_ENDEAVOR},
         .itemTableId = BATTLE_FRONTIER_ITEM_NONE,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_NAUGHTY
     },
-    [25] = {
+    [SLATEPORT_TENT_MON_ARON_2] = {
         .species = SPECIES_ARON,
         .moves = {MOVE_MUD_SLAP, MOVE_IRON_TAIL, MOVE_HARDEN, MOVE_ROAR},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEPPA_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_MODEST
     },
-    [26] = {
+    [SLATEPORT_TENT_MON_TRAPINCH_1] = {
         .species = SPECIES_TRAPINCH,
         .moves = {MOVE_BODY_SLAM, MOVE_FOCUS_ENERGY, MOVE_SAND_TOMB, MOVE_SAND_ATTACK},
         .itemTableId = BATTLE_FRONTIER_ITEM_NONE,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_BRAVE
     },
-    [27] = {
+    [SLATEPORT_TENT_MON_CACNEA_2] = {
         .species = SPECIES_CACNEA,
         .moves = {MOVE_INGRAIN, MOVE_SANDSTORM, MOVE_POISON_STING, MOVE_DESTINY_BOND},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP,
         .nature = NATURE_TIMID
     },
-    [28] = {
+    [SLATEPORT_TENT_MON_TAILLOW] = {
         .species = SPECIES_TAILLOW,
         .moves = {MOVE_GROWL, MOVE_AERIAL_ACE, MOVE_AGILITY, MOVE_ENDEAVOR},
         .itemTableId = BATTLE_FRONTIER_ITEM_SHARP_BEAK,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [29] = {
+    [SLATEPORT_TENT_MON_SWELLOW] = {
         .species = SPECIES_SWELLOW,
         .moves = {MOVE_SUPERSONIC, MOVE_GROWL, MOVE_FOCUS_ENERGY, MOVE_PECK},
         .itemTableId = BATTLE_FRONTIER_ITEM_NONE,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_IMPISH
     },
-    [30] = {
+    [SLATEPORT_TENT_MON_GOLBAT_1] = {
         .species = SPECIES_GOLBAT,
         .moves = {MOVE_ASTONISH, MOVE_GUST, MOVE_MEAN_LOOK, MOVE_CONFUSE_RAY},
         .itemTableId = BATTLE_FRONTIER_ITEM_SPELL_TAG,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_TIMID
     },
-    [31] = {
+    [SLATEPORT_TENT_MON_LOUDRED] = {
         .species = SPECIES_LOUDRED,
         .moves = {MOVE_ASTONISH, MOVE_SCREECH, MOVE_UPROAR, MOVE_SUPERSONIC},
         .itemTableId = BATTLE_FRONTIER_ITEM_NONE,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [32] = {
+    [SLATEPORT_TENT_MON_SPINDA] = {
         .species = SPECIES_SPINDA,
         .moves = {MOVE_DIZZY_PUNCH, MOVE_FAINT_ATTACK, MOVE_HYPNOSIS, MOVE_REST},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [33] = {
+    [SLATEPORT_TENT_MON_MAGNEMITE] = {
         .species = SPECIES_MAGNEMITE,
         .moves = {MOVE_METAL_SOUND, MOVE_SUPERSONIC, MOVE_THUNDER_WAVE, MOVE_SPARK},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_SERIOUS
     },
-    [34] = {
+    [SLATEPORT_TENT_MON_WHISMUR] = {
         .species = SPECIES_WHISMUR,
         .moves = {MOVE_REST, MOVE_SLEEP_TALK, MOVE_HOWL, MOVE_BODY_SLAM},
         .itemTableId = BATTLE_FRONTIER_ITEM_SILK_SCARF,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [35] = {
+    [SLATEPORT_TENT_MON_MAKUHITA] = {
         .species = SPECIES_MAKUHITA,
         .moves = {MOVE_SAND_ATTACK, MOVE_KNOCK_OFF, MOVE_ARM_THRUST, MOVE_BELLY_DRUM},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [36] = {
+    [SLATEPORT_TENT_MON_NUMEL_1] = {
         .species = SPECIES_NUMEL,
         .moves = {MOVE_EMBER, MOVE_TAKE_DOWN, MOVE_GROWL, MOVE_FOCUS_ENERGY},
         .itemTableId = BATTLE_FRONTIER_ITEM_NONE,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_MODEST
     },
-    [37] = {
+    [SLATEPORT_TENT_MON_BARBOACH] = {
         .species = SPECIES_BARBOACH,
         .moves = {MOVE_MAGNITUDE, MOVE_MUD_SPORT, MOVE_WATER_SPORT, MOVE_WATER_GUN},
         .itemTableId = BATTLE_FRONTIER_ITEM_SEA_INCENSE,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_JOLLY
     },
-    [38] = {
+    [SLATEPORT_TENT_MON_TENTACOOL] = {
         .species = SPECIES_TENTACOOL,
         .moves = {MOVE_SCREECH, MOVE_BUBBLE_BEAM, MOVE_ACID, MOVE_BARRIER},
         .itemTableId = BATTLE_FRONTIER_ITEM_POISON_BARB,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [39] = {
+    [SLATEPORT_TENT_MON_VIGOROTH] = {
         .species = SPECIES_VIGOROTH,
         .moves = {MOVE_FOCUS_ENERGY, MOVE_FURY_SWIPES, MOVE_ENDURE, MOVE_YAWN},
         .itemTableId = BATTLE_FRONTIER_ITEM_AGUAV_BERRY,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [40] = {
+    [SLATEPORT_TENT_MON_MAGIKARP] = {
         .species = SPECIES_MAGIKARP,
         .moves = {MOVE_TACKLE, MOVE_FLAIL, MOVE_SPLASH, MOVE_NONE},
         .itemTableId = BATTLE_FRONTIER_ITEM_DRAGON_SCALE,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [41] = {
+    [SLATEPORT_TENT_MON_SEVIPER_1] = {
         .species = SPECIES_SEVIPER,
         .moves = {MOVE_LICK, MOVE_POISON_FANG, MOVE_GLARE, MOVE_WRAP},
         .itemTableId = BATTLE_FRONTIER_ITEM_NONE,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [42] = {
+    [SLATEPORT_TENT_MON_SOLROCK] = {
         .species = SPECIES_SOLROCK,
         .moves = {MOVE_ROCK_THROW, MOVE_HARDEN, MOVE_PSYWAVE, MOVE_TACKLE},
         .itemTableId = BATTLE_FRONTIER_ITEM_HARD_STONE,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [43] = {
+    [SLATEPORT_TENT_MON_KECLEON_1] = {
         .species = SPECIES_KECLEON,
         .moves = {MOVE_PSYBEAM, MOVE_SUBSTITUTE, MOVE_THIEF, MOVE_TAIL_WHIP},
         .itemTableId = BATTLE_FRONTIER_ITEM_NONE,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP,
         .nature = NATURE_MODEST
     },
-    [44] = {
+    [SLATEPORT_TENT_MON_KECLEON_2] = {
         .species = SPECIES_KECLEON,
         .moves = {MOVE_FAINT_ATTACK, MOVE_ASTONISH, MOVE_LICK, MOVE_SCREECH},
         .itemTableId = BATTLE_FRONTIER_ITEM_IAPAPA_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_CALM
     },
-    [45] = {
+    [SLATEPORT_TENT_MON_SHROOMISH_1] = {
         .species = SPECIES_SHROOMISH,
         .moves = {MOVE_STUN_SPORE, MOVE_TACKLE, MOVE_LEECH_SEED, MOVE_MEGA_DRAIN},
         .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [46] = {
+    [SLATEPORT_TENT_MON_SHROOMISH_2] = {
         .species = SPECIES_SHROOMISH,
         .moves = {MOVE_ABSORB, MOVE_STUN_SPORE, MOVE_SPORE, MOVE_LEECH_SEED},
         .itemTableId = BATTLE_FRONTIER_ITEM_FIGY_BERRY,
         .evSpread = F_EV_SPREAD_ATTACK,
         .nature = NATURE_BRAVE
     },
-    [47] = {
+    [SLATEPORT_TENT_MON_LOMBRE_2] = {
         .species = SPECIES_LOMBRE,
         .moves = {MOVE_NATURE_POWER, MOVE_ASTONISH, MOVE_GROWL, MOVE_ABSORB},
         .itemTableId = BATTLE_FRONTIER_ITEM_NONE,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_LONELY
     },
-    [48] = {
+    [SLATEPORT_TENT_MON_NUMEL_2] = {
         .species = SPECIES_NUMEL,
         .moves = {MOVE_EMBER, MOVE_GROWL, MOVE_EARTHQUAKE, MOVE_SUNNY_DAY},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHARCOAL,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_MODEST
     },
-    [49] = {
+    [SLATEPORT_TENT_MON_TRAPINCH_2] = {
         .species = SPECIES_TRAPINCH,
         .moves = {MOVE_FAINT_ATTACK, MOVE_DIG, MOVE_BITE, MOVE_QUICK_ATTACK},
         .itemTableId = BATTLE_FRONTIER_ITEM_ASPEAR_BERRY,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_BRAVE
     },
-    [50] = {
+    [SLATEPORT_TENT_MON_PELIPPER_2] = {
         .species = SPECIES_PELIPPER,
         .moves = {MOVE_WING_ATTACK, MOVE_SUPERSONIC, MOVE_MIST, MOVE_AGILITY},
         .itemTableId = BATTLE_FRONTIER_ITEM_WIKI_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [51] = {
+    [SLATEPORT_TENT_MON_WINGULL_2] = {
         .species = SPECIES_WINGULL,
         .moves = {MOVE_WATER_GUN, MOVE_SUPERSONIC, MOVE_GROWL, MOVE_ICY_WIND},
         .itemTableId = BATTLE_FRONTIER_ITEM_NEVER_MELT_ICE,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [52] = {
+    [SLATEPORT_TENT_MON_MARILL_2] = {
         .species = SPECIES_MARILL,
         .moves = {MOVE_DOUBLE_EDGE, MOVE_RAIN_DANCE, MOVE_TAIL_WHIP, MOVE_WATER_GUN},
         .itemTableId = BATTLE_FRONTIER_ITEM_GANLON_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_MODEST
     },
-    [53] = {
+    [SLATEPORT_TENT_MON_SKITTY] = {
         .species = SPECIES_SKITTY,
         .moves = {MOVE_ASSIST, MOVE_ATTRACT, MOVE_SING, MOVE_CHARM},
         .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_CAREFUL
     },
-    [54] = {
+    [SLATEPORT_TENT_MON_SEVIPER_2] = {
         .species = SPECIES_SEVIPER,
         .moves = {MOVE_SWAGGER, MOVE_WRAP, MOVE_POISON_TAIL, MOVE_HAZE},
         .itemTableId = BATTLE_FRONTIER_ITEM_NONE,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_BRAVE
     },
-    [55] = {
+    [SLATEPORT_TENT_MON_GOLBAT_2] = {
         .species = SPECIES_GOLBAT,
         .moves = {MOVE_BITE, MOVE_TORMENT, MOVE_SCREECH, MOVE_POISON_FANG},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP,
         .nature = NATURE_HARDY
     },
-    [56] = {
+    [SLATEPORT_TENT_MON_RALTS] = {
         .species = SPECIES_RALTS,
         .moves = {MOVE_HYPNOSIS, MOVE_IMPRISON, MOVE_PSYCHIC, MOVE_DREAM_EATER},
         .itemTableId = BATTLE_FRONTIER_ITEM_MAGO_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_TIMID
     },
-    [57] = {
+    [SLATEPORT_TENT_MON_SANDSHREW] = {
         .species = SPECIES_SANDSHREW,
         .moves = {MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_SAND_TOMB, MOVE_DEFENSE_CURL},
         .itemTableId = BATTLE_FRONTIER_ITEM_SOFT_SAND,
         .evSpread = 0,
         .nature = NATURE_HARDY
     },
-    [58] = {
+    [SLATEPORT_TENT_MON_SWALOT] = {
         .species = SPECIES_SWALOT,
         .moves = {MOVE_YAWN, MOVE_SLUDGE, MOVE_ENCORE, MOVE_POUND},
         .itemTableId = BATTLE_FRONTIER_ITEM_NONE,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_IMPISH
     },
-    [59] = {
+    [SLATEPORT_TENT_MON_VOLBEAT] = {
         .species = SPECIES_VOLBEAT,
         .moves = {MOVE_TACKLE, MOVE_CONFUSE_RAY, MOVE_QUICK_ATTACK, MOVE_DOUBLE_TEAM},
         .itemTableId = BATTLE_FRONTIER_ITEM_NONE,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_HARDY
     },
-    [60] = {
+    [SLATEPORT_TENT_MON_ILLUMISE] = {
         .species = SPECIES_ILLUMISE,
         .moves = {MOVE_CHARM, MOVE_TACKLE, MOVE_ENCORE, MOVE_MOONLIGHT},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHERI_BERRY,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [61] = {
+    [SLATEPORT_TENT_MON_KADABRA] = {
         .species = SPECIES_KADABRA,
         .moves = {MOVE_DISABLE, MOVE_CONFUSION, MOVE_REFLECT, MOVE_RECOVER},
         .itemTableId = BATTLE_FRONTIER_ITEM_NONE,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_QUIRKY
     },
-    [62] = {
+    [SLATEPORT_TENT_MON_KIRLIA] = {
         .species = SPECIES_KIRLIA,
         .moves = {MOVE_CALM_MIND, MOVE_CONFUSION, MOVE_DOUBLE_TEAM, MOVE_GROWL},
         .itemTableId = BATTLE_FRONTIER_ITEM_TWISTED_SPOON,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_CAREFUL
     },
-    [63] = {
+    [SLATEPORT_TENT_MON_BRELOOM] = {
         .species = SPECIES_BRELOOM,
         .moves = {MOVE_ABSORB, MOVE_TACKLE, MOVE_STUN_SPORE, MOVE_MEGA_DRAIN},
         .itemTableId = BATTLE_FRONTIER_ITEM_NONE,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_NAIVE
     },
-    [64] = {
+    [SLATEPORT_TENT_MON_PLUSLE_1] = {
         .species = SPECIES_PLUSLE,
         .moves = {MOVE_SPARK, MOVE_ENCORE, MOVE_THUNDER_WAVE, MOVE_GROWL},
         .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_LONELY
     },
-    [65] = {
+    [SLATEPORT_TENT_MON_PLUSLE_2] = {
         .species = SPECIES_PLUSLE,
         .moves = {MOVE_SPARK, MOVE_FAKE_TEARS, MOVE_SUBSTITUTE, MOVE_QUICK_ATTACK},
         .itemTableId = BATTLE_FRONTIER_ITEM_PECHA_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_MILD
     },
-    [66] = {
+    [SLATEPORT_TENT_MON_ELECTRIKE_2] = {
         .species = SPECIES_ELECTRIKE,
         .moves = {MOVE_SPARK, MOVE_CHARGE, MOVE_ROAR, MOVE_THUNDER_WAVE},
         .itemTableId = BATTLE_FRONTIER_ITEM_APICOT_BERRY,
         .evSpread = F_EV_SPREAD_SPEED,
         .nature = NATURE_TIMID
     },
-    [67] = {
+    [SLATEPORT_TENT_MON_SWABLU] = {
         .species = SPECIES_SWABLU,
         .moves = {MOVE_SING, MOVE_PECK, MOVE_STEEL_WING, MOVE_SAFEGUARD},
         .itemTableId = BATTLE_FRONTIER_ITEM_NONE,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_JOLLY
     },
-    [68] = {
+    [SLATEPORT_TENT_MON_MACHOP] = {
         .species = SPECIES_MACHOP,
         .moves = {MOVE_FOCUS_ENERGY, MOVE_VITAL_THROW, MOVE_SEISMIC_TOSS, MOVE_FORESIGHT},
         .itemTableId = BATTLE_FRONTIER_ITEM_BLACK_BELT,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [69] = {
+    [SLATEPORT_TENT_MON_MACHOKE] = {
         .species = SPECIES_MACHOKE,
         .moves = {MOVE_FOCUS_ENERGY, MOVE_LEER, MOVE_KARATE_CHOP, MOVE_FORESIGHT},
         .itemTableId = BATTLE_FRONTIER_ITEM_NONE,
@@ -1248,873 +1248,873 @@ const struct FacilityMon gSlateportBattleTentMons[] =
 // Verdanturf Battle Tent.
 const u16 gVerdanturfBattleTentTrainerMons_Brenna[] = 
 {
-    4,
-    11,
-    13,
-    18,
-    26,
+    VERDANTURF_TENT_MON_SHROOMISH,
+    VERDANTURF_TENT_MON_SWALOT,
+    VERDANTURF_TENT_MON_BALTOY,
+    VERDANTURF_TENT_MON_LOTAD,
+    VERDANTURF_TENT_MON_NUZLEAF,
     -1
 };
 
 const u16 gVerdanturfBattleTentTrainerMons_Dilan[] = 
 {
-    30,
-    37,
-    13,
-    29,
-    42,
+    VERDANTURF_TENT_MON_GRAVELER,
+    VERDANTURF_TENT_MON_TRAPINCH,
+    VERDANTURF_TENT_MON_BALTOY,
+    VERDANTURF_TENT_MON_SOLROCK,
+    VERDANTURF_TENT_MON_MACHOKE,
     -1
 };
 
 const u16 gVerdanturfBattleTentTrainerMons_Eliana[] = 
 {
-    6,
-    7,
-    17,
-    18,
-    40,
+    VERDANTURF_TENT_MON_MAGIKARP,
+    VERDANTURF_TENT_MON_BARBOACH,
+    VERDANTURF_TENT_MON_GOLDEEN_1,
+    VERDANTURF_TENT_MON_LOTAD,
+    VERDANTURF_TENT_MON_WAILMER,
     -1
 };
 
 const u16 gVerdanturfBattleTentTrainerMons_Markus[] = 
 {
-    6,
-    7,
-    18,
-    24,
-    38,
+    VERDANTURF_TENT_MON_MAGIKARP,
+    VERDANTURF_TENT_MON_BARBOACH,
+    VERDANTURF_TENT_MON_LOTAD,
+    VERDANTURF_TENT_MON_GOLDEEN_2,
+    VERDANTURF_TENT_MON_TENTACOOL,
     -1
 };
 
 const u16 gVerdanturfBattleTentTrainerMons_Caitlyn[] = 
 {
-    0,
-    12,
-    25,
-    28,
-    22,
-    44,
+    VERDANTURF_TENT_MON_POOCHYENA,
+    VERDANTURF_TENT_MON_KECLEON,
+    VERDANTURF_TENT_MON_ELECTRIKE,
+    VERDANTURF_TENT_MON_MIGHTYENA,
+    VERDANTURF_TENT_MON_SKARMORY,
+    VERDANTURF_TENT_MON_CACNEA,
     -1
 };
 
 const u16 gVerdanturfBattleTentTrainerMons_Desiree[] = 
 {
-    8,
-    12,
-    21,
-    22,
-    31,
+    VERDANTURF_TENT_MON_WINGULL,
+    VERDANTURF_TENT_MON_KECLEON,
+    VERDANTURF_TENT_MON_SEVIPER,
+    VERDANTURF_TENT_MON_SKARMORY,
+    VERDANTURF_TENT_MON_KADABRA,
     -1
 };
 
 const u16 gVerdanturfBattleTentTrainerMons_Ronald[] = 
 {
-    1,
-    20,
-    23,
-    25,
-    32,
+    VERDANTURF_TENT_MON_ZIGZAGOON,
+    VERDANTURF_TENT_MON_LINOONE,
+    VERDANTURF_TENT_MON_SWELLOW,
+    VERDANTURF_TENT_MON_ELECTRIKE,
+    VERDANTURF_TENT_MON_VOLTORB,
     -1
 };
 
 const u16 gVerdanturfBattleTentTrainerMons_Ashten[] = 
 {
-    9,
-    12,
-    27,
-    37,
-    43,
+    VERDANTURF_TENT_MON_ARON_1,
+    VERDANTURF_TENT_MON_KECLEON,
+    VERDANTURF_TENT_MON_ARON_2,
+    VERDANTURF_TENT_MON_TRAPINCH,
+    VERDANTURF_TENT_MON_WHISMUR,
     -1
 };
 
 const u16 gVerdanturfBattleTentTrainerMons_Gerard[] = 
 {
-    36,
-    7,
-    34,
-    6,
-    40,
+    VERDANTURF_TENT_MON_MARILL,
+    VERDANTURF_TENT_MON_BARBOACH,
+    VERDANTURF_TENT_MON_PELIPPER,
+    VERDANTURF_TENT_MON_MAGIKARP,
+    VERDANTURF_TENT_MON_WAILMER,
     -1
 };
 
 const u16 gVerdanturfBattleTentTrainerMons_Bradly[] = 
 {
-    26,
-    3,
-    0,
-    2,
-    17,
+    VERDANTURF_TENT_MON_NUZLEAF,
+    VERDANTURF_TENT_MON_TAILLOW,
+    VERDANTURF_TENT_MON_POOCHYENA,
+    VERDANTURF_TENT_MON_DUSTOX,
+    VERDANTURF_TENT_MON_GOLDEEN_1,
     -1
 };
 
 const u16 gVerdanturfBattleTentTrainerMons_Dennis[] = 
 {
-    14,
-    37,
-    2,
-    38,
-    27,
+    VERDANTURF_TENT_MON_NINJASK,
+    VERDANTURF_TENT_MON_TRAPINCH,
+    VERDANTURF_TENT_MON_DUSTOX,
+    VERDANTURF_TENT_MON_TENTACOOL,
+    VERDANTURF_TENT_MON_ARON_2,
     -1
 };
 
 const u16 gVerdanturfBattleTentTrainerMons_Prestin[] = 
 {
-    31,
-    28,
-    22,
-    25,
-    44,
-    43,
-    41,
+    VERDANTURF_TENT_MON_KADABRA,
+    VERDANTURF_TENT_MON_MIGHTYENA,
+    VERDANTURF_TENT_MON_SKARMORY,
+    VERDANTURF_TENT_MON_ELECTRIKE,
+    VERDANTURF_TENT_MON_CACNEA,
+    VERDANTURF_TENT_MON_WHISMUR,
+    VERDANTURF_TENT_MON_ILLUMISE,
     -1
 };
 
 const u16 gVerdanturfBattleTentTrainerMons_Ernesto[] = 
 {
-    33,
-    32,
-    25,
-    35,
-    34,
+    VERDANTURF_TENT_MON_MAGNEMITE,
+    VERDANTURF_TENT_MON_VOLTORB,
+    VERDANTURF_TENT_MON_ELECTRIKE,
+    VERDANTURF_TENT_MON_LOUDRED,
+    VERDANTURF_TENT_MON_PELIPPER,
     -1
 };
 
 const u16 gVerdanturfBattleTentTrainerMons_Nala[] = 
 {
-    1,
-    4,
-    8,
-    11,
-    17,
-    40,
-    34,
+    VERDANTURF_TENT_MON_ZIGZAGOON,
+    VERDANTURF_TENT_MON_SHROOMISH,
+    VERDANTURF_TENT_MON_WINGULL,
+    VERDANTURF_TENT_MON_SWALOT,
+    VERDANTURF_TENT_MON_GOLDEEN_1,
+    VERDANTURF_TENT_MON_WAILMER,
+    VERDANTURF_TENT_MON_PELIPPER,
     -1
 };
 
 const u16 gVerdanturfBattleTentTrainerMons_Darnell[] = 
 {
-    0,
-    29,
-    35,
-    37,
-    39,
-    43,
+    VERDANTURF_TENT_MON_POOCHYENA,
+    VERDANTURF_TENT_MON_SOLROCK,
+    VERDANTURF_TENT_MON_LOUDRED,
+    VERDANTURF_TENT_MON_TRAPINCH,
+    VERDANTURF_TENT_MON_VIGOROTH,
+    VERDANTURF_TENT_MON_WHISMUR,
     -1
 };
 
 const u16 gVerdanturfBattleTentTrainerMons_Ashlyn[] = 
 {
-    29,
-    36,
-    32,
-    30,
-    17,
-    6,
-    44,
+    VERDANTURF_TENT_MON_SOLROCK,
+    VERDANTURF_TENT_MON_MARILL,
+    VERDANTURF_TENT_MON_VOLTORB,
+    VERDANTURF_TENT_MON_GRAVELER,
+    VERDANTURF_TENT_MON_GOLDEEN_1,
+    VERDANTURF_TENT_MON_MAGIKARP,
+    VERDANTURF_TENT_MON_CACNEA,
     -1
 };
 
 const u16 gVerdanturfBattleTentTrainerMons_Addison[] = 
 {
-    0,
-    1,
-    16,
-    31,
-    6,
+    VERDANTURF_TENT_MON_POOCHYENA,
+    VERDANTURF_TENT_MON_ZIGZAGOON,
+    VERDANTURF_TENT_MON_SWABLU,
+    VERDANTURF_TENT_MON_KADABRA,
+    VERDANTURF_TENT_MON_MAGIKARP,
     -1
 };
 
 const u16 gVerdanturfBattleTentTrainerMons_Justine[] = 
 {
-    0,
-    1,
-    16,
-    36,
-    18,
+    VERDANTURF_TENT_MON_POOCHYENA,
+    VERDANTURF_TENT_MON_ZIGZAGOON,
+    VERDANTURF_TENT_MON_SWABLU,
+    VERDANTURF_TENT_MON_MARILL,
+    VERDANTURF_TENT_MON_LOTAD,
     -1
 };
 
 const u16 gVerdanturfBattleTentTrainerMons_Tyson[] = 
 {
-    5,
-    15,
-    22,
-    30,
-    16,
-    39,
-    43,
+    VERDANTURF_TENT_MON_MACHOP,
+    VERDANTURF_TENT_MON_MAKUHITA,
+    VERDANTURF_TENT_MON_SKARMORY,
+    VERDANTURF_TENT_MON_GRAVELER,
+    VERDANTURF_TENT_MON_SWABLU,
+    VERDANTURF_TENT_MON_VIGOROTH,
+    VERDANTURF_TENT_MON_WHISMUR,
     -1
 };
 
 const u16 gVerdanturfBattleTentTrainerMons_Laila[] = 
 {
-    5,
-    15,
-    19,
-    24,
-    41,
-    43,
+    VERDANTURF_TENT_MON_MACHOP,
+    VERDANTURF_TENT_MON_MAKUHITA,
+    VERDANTURF_TENT_MON_NUMEL_2,
+    VERDANTURF_TENT_MON_GOLDEEN_2,
+    VERDANTURF_TENT_MON_ILLUMISE,
+    VERDANTURF_TENT_MON_WHISMUR,
     -1
 };
 
 const u16 gVerdanturfBattleTentTrainerMons_Waren[] = 
 {
-    0,
-    9,
-    10,
-    11,
-    23,
+    VERDANTURF_TENT_MON_POOCHYENA,
+    VERDANTURF_TENT_MON_ARON_1,
+    VERDANTURF_TENT_MON_NUMEL_1,
+    VERDANTURF_TENT_MON_SWALOT,
+    VERDANTURF_TENT_MON_SWELLOW,
     -1
 };
 
 const u16 gVerdanturfBattleTentTrainerMons_Tobias[] = 
 {
-    6,
-    7,
-    24,
-    38,
-    40,
+    VERDANTURF_TENT_MON_MAGIKARP,
+    VERDANTURF_TENT_MON_BARBOACH,
+    VERDANTURF_TENT_MON_GOLDEEN_2,
+    VERDANTURF_TENT_MON_TENTACOOL,
+    VERDANTURF_TENT_MON_WAILMER,
     -1
 };
 
 const u16 gVerdanturfBattleTentTrainerMons_Josiah[] = 
 {
-    8,
-    16,
-    23,
-    34,
-    3,
+    VERDANTURF_TENT_MON_WINGULL,
+    VERDANTURF_TENT_MON_SWABLU,
+    VERDANTURF_TENT_MON_SWELLOW,
+    VERDANTURF_TENT_MON_PELIPPER,
+    VERDANTURF_TENT_MON_TAILLOW,
     -1
 };
 
 const u16 gVerdanturfBattleTentTrainerMons_Dion[] = 
 {
-    14,
-    2,
-    11,
-    39,
-    21,
-    38,
+    VERDANTURF_TENT_MON_NINJASK,
+    VERDANTURF_TENT_MON_DUSTOX,
+    VERDANTURF_TENT_MON_SWALOT,
+    VERDANTURF_TENT_MON_VIGOROTH,
+    VERDANTURF_TENT_MON_SEVIPER,
+    VERDANTURF_TENT_MON_TENTACOOL,
     -1
 };
 
 const u16 gVerdanturfBattleTentTrainerMons_Kenzie[] = 
 {
-    18,
-    10,
-    16,
-    26,
-    25,
-    27,
+    VERDANTURF_TENT_MON_LOTAD,
+    VERDANTURF_TENT_MON_NUMEL_1,
+    VERDANTURF_TENT_MON_SWABLU,
+    VERDANTURF_TENT_MON_NUZLEAF,
+    VERDANTURF_TENT_MON_ELECTRIKE,
+    VERDANTURF_TENT_MON_ARON_2,
     -1
 };
 
 const u16 gVerdanturfBattleTentTrainerMons_Lillian[] = 
 {
-    24,
-    34,
-    36,
-    38,
-    5,
+    VERDANTURF_TENT_MON_GOLDEEN_2,
+    VERDANTURF_TENT_MON_PELIPPER,
+    VERDANTURF_TENT_MON_MARILL,
+    VERDANTURF_TENT_MON_TENTACOOL,
+    VERDANTURF_TENT_MON_MACHOP,
     -1
 };
 
 const u16 gVerdanturfBattleTentTrainerMons_Lesley[] = 
 {
-    26,
-    0,
-    18,
-    13,
-    25,
+    VERDANTURF_TENT_MON_NUZLEAF,
+    VERDANTURF_TENT_MON_POOCHYENA,
+    VERDANTURF_TENT_MON_LOTAD,
+    VERDANTURF_TENT_MON_BALTOY,
+    VERDANTURF_TENT_MON_ELECTRIKE,
     -1
 };
 
 const u16 gVerdanturfBattleTentTrainerMons_Marquis[] = 
 {
-    24,
-    34,
-    5,
-    15,
-    7,
-    42,
+    VERDANTURF_TENT_MON_GOLDEEN_2,
+    VERDANTURF_TENT_MON_PELIPPER,
+    VERDANTURF_TENT_MON_MACHOP,
+    VERDANTURF_TENT_MON_MAKUHITA,
+    VERDANTURF_TENT_MON_BARBOACH,
+    VERDANTURF_TENT_MON_MACHOKE,
     -1
 };
 
 const u16 gVerdanturfBattleTentTrainerMons_Freddy[] = 
 {
-    18,
-    21,
-    26,
-    29,
-    41,
+    VERDANTURF_TENT_MON_LOTAD,
+    VERDANTURF_TENT_MON_SEVIPER,
+    VERDANTURF_TENT_MON_NUZLEAF,
+    VERDANTURF_TENT_MON_SOLROCK,
+    VERDANTURF_TENT_MON_ILLUMISE,
     -1
 };
 
 const u16 gVerdanturfBattleTentTrainerMons_Cecilia[] = 
 {
-    23,
-    26,
-    27,
-    28,
-    31,
+    VERDANTURF_TENT_MON_SWELLOW,
+    VERDANTURF_TENT_MON_NUZLEAF,
+    VERDANTURF_TENT_MON_ARON_2,
+    VERDANTURF_TENT_MON_MIGHTYENA,
+    VERDANTURF_TENT_MON_KADABRA,
     -1
 };
 
-const struct BattleFrontierTrainer gVerdanturfBattleTentTrainers[] = 
+const struct BattleFrontierTrainer gVerdanturfBattleTentTrainers[NUM_BATTLE_TENT_TRAINERS] = 
 {
-    [0] = {
+    [VERDANTURF_TENT_TRAINER_BRENNA] = {
         .facilityClass = FACILITY_CLASS_AROMA_LADY,
         .trainerName = _("BRENNA"),
         .speechBefore = {EC_WORD_NO, EC_WORD_DAYS, EC_WORD_GO, EC_WORD_WITHOUT, EC_WORD_MY, EC_MOVE(FAKE_TEARS)},
         .speechWin = {EC_WORD_OH, EC_WORD_THAT_WAS, EC_WORD_SO, EC_WORD_REFRESHING, EC_WORD_EXCL, -1},
         .speechLose = {EC_WORD_ALL, EC_WORD_I, EC_WORD_EVER, EC_WORD_GET, EC_WORD_IS, EC_MOVE(TORMENT)},
-        .monSets = gVerdanturfBattleTentTrainerMons_Brenna
+        .monSet = gVerdanturfBattleTentTrainerMons_Brenna
     },
-    [1] = {
+    [VERDANTURF_TENT_TRAINER_DILAN] = {
         .facilityClass = FACILITY_CLASS_RUIN_MANIAC,
         .trainerName = _("DILAN"),
         .speechBefore = {EC_WORD_YOU, EC_WORD_DON_T, EC_WORD_KNOW, EC_WORD_HOW, EC_WORD_BORED, EC_WORD_I_AM},
         .speechWin = {EC_WORD_LOSING, EC_WORD_ISN_T, EC_WORD_EXCITING, EC_WORD_AT, EC_WORD_ALL, EC_WORD_ELLIPSIS},
         .speechLose = {EC_WORD_EXCITING, EC_WORD_EXCL_EXCL, EC_WORD_BYE_BYE, EC_WORD_TO, EC_WORD_BEING, EC_WORD_BORED},
-        .monSets = gVerdanturfBattleTentTrainerMons_Dilan
+        .monSet = gVerdanturfBattleTentTrainerMons_Dilan
     },
-    [2] = {
+    [VERDANTURF_TENT_TRAINER_ELIANA] = {
         .facilityClass = FACILITY_CLASS_TUBER_F,
         .trainerName = _("ELIANA"),
         .speechBefore = {EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_ON, EC_WORD_A, EC_WORD_VACATION, EC_WORD_SOON},
         .speechWin = {EC_WORD_I, EC_WORD_NEED, EC_WORD_TO, EC_WORD_GET, EC_WORD_SOME, EC_WORD_MONEY},
         .speechLose = {EC_WORD_NO, EC_WORD_SLEEP, EC_WORD_UNTIL, EC_WORD_I, EC_WORD_GET, EC_WORD_HOME},
-        .monSets = gVerdanturfBattleTentTrainerMons_Eliana
+        .monSet = gVerdanturfBattleTentTrainerMons_Eliana
     },
-    [3] = {
+    [VERDANTURF_TENT_TRAINER_MARKUS] = {
         .facilityClass = FACILITY_CLASS_TUBER_M,
         .trainerName = _("MARKUS"),
         .speechBefore = {EC_WORD_I_AM, EC_WORD_SMART, EC_WORD_EXCL, EC_WORD_IF_I_LOSE, EC_WORD_I, EC_MOVE(SELF_DESTRUCT)},
         .speechWin = {EC_WORD_IT_S, EC_WORD_A, EC_WORD_NON_STOP, EC_MOVE2(EXPLOSION), EC_WORD_OF, EC_WORD_JOY},
         .speechLose = {EC_WORD_I_VE, EC_WORD_LOST, EC_WORD_ELLIPSIS, EC_WORD_TIME, EC_WORD_TO, EC_MOVE(SELF_DESTRUCT)},
-        .monSets = gVerdanturfBattleTentTrainerMons_Markus
+        .monSet = gVerdanturfBattleTentTrainerMons_Markus
     },
-    [4] = {
+    [VERDANTURF_TENT_TRAINER_CAITLYN] = {
         .facilityClass = FACILITY_CLASS_LADY,
         .trainerName = _("CAITLYN"),
         .speechBefore = {EC_WORD_I_AM, EC_WORD_BORED, EC_WORD_OF, EC_WORD_BEING, EC_WORD_AN, EC_WORD_IDOL},
         .speechWin = {EC_WORD_A, EC_WORD_BATTLE, EC_WORD_IS, EC_WORD_BEST, EC_WORD_FOR, EC_WORD_HAPPINESS},
         .speechLose = {EC_WORD_LOSING, EC_WORD_DOESN_T, EC_WORD_BUG, EC_WORD_ME, EC_WORD_AT, EC_WORD_ALL},
-        .monSets = gVerdanturfBattleTentTrainerMons_Caitlyn
+        .monSet = gVerdanturfBattleTentTrainerMons_Caitlyn
     },
-    [5] = {
+    [VERDANTURF_TENT_TRAINER_DESIREE] = {
         .facilityClass = FACILITY_CLASS_BEAUTY,
         .trainerName = _("DESIREE"),
         .speechBefore = {EC_WORD_DOESN_T, EC_WORD_MY, EC_WORD_BEAUTY, EC_MOVE(ASTONISH), EC_WORD_YOU, EC_WORD_QUES},
         .speechWin = {EC_WORD_DID, EC_WORD_I, EC_WORD_INTIMIDATE, EC_WORD_YOU, EC_WORD_QUES, -1},
         .speechLose = {EC_WORD_MY, EC_WORD_BEAUTY, EC_WORD_DID, EC_WORD_NOTHING, EC_WORD_FOR, EC_WORD_YOU},
-        .monSets = gVerdanturfBattleTentTrainerMons_Desiree
+        .monSet = gVerdanturfBattleTentTrainerMons_Desiree
     },
-    [6] = {
+    [VERDANTURF_TENT_TRAINER_RONALD] = {
         .facilityClass = FACILITY_CLASS_RICH_BOY,
         .trainerName = _("RONALD"),
         .speechBefore = {EC_WORD_COME_ON, EC_WORD_I, EC_WORD_WILL, EC_WORD_BATTLE, EC_WORD_SERIOUSLY, -1},
         .speechWin = {EC_WORD_GIVE_UP, EC_WORD_QUES, -1, EC_WORD_THAT_S, EC_WORD_REALLY, EC_WORD_WEAK},
         .speechLose = {EC_WORD_I, EC_WORD_NEED, EC_WORD_TO, EC_WORD_DO, EC_WORD_A, EC_MOVE2(BATON_PASS)},
-        .monSets = gVerdanturfBattleTentTrainerMons_Ronald
+        .monSet = gVerdanturfBattleTentTrainerMons_Ronald
     },
-    [7] = {
+    [VERDANTURF_TENT_TRAINER_ASHTEN] = {
         .facilityClass = FACILITY_CLASS_POKEMANIAC,
         .trainerName = _("ASHTEN"),
         .speechBefore = {EC_WORD_OH_YEAH, EC_WORD_ANOTHER, EC_WORD_EXCITING, EC_WORD_BATTLE, EC_WORD_EXCL, -1},
         .speechWin = {EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_WIMPY, EC_WORD_AND, EC_WORD_BORING},
         .speechLose = {EC_WORD_THAT_WAS, EC_WORD_AN, EC_WORD_EXCITING, EC_WORD_LOSS, EC_WORD_WOW, EC_WORD_EXCL},
-        .monSets = gVerdanturfBattleTentTrainerMons_Ashten
+        .monSet = gVerdanturfBattleTentTrainerMons_Ashten
     },
-    [8] = {
+    [VERDANTURF_TENT_TRAINER_GERARD] = {
         .facilityClass = FACILITY_CLASS_SWIMMER_M,
         .trainerName = _("GERARD"),
         .speechBefore = {EC_WORD_LOOK, EC_WORD_AT, EC_WORD_MY, EC_WORD_SUPER, EC_MOVE2(TEETER_DANCE), EC_WORD_EXCL},
         .speechWin = {EC_WORD_THAT_WAS, EC_WORD_HARD, EC_WORD_ELLIPSIS, EC_WORD_AM, EC_WORD_I, EC_WORD_OK_QUES},
         .speechLose = {EC_WORD_I, EC_WORD_WON_T, EC_WORD_FORGIVE, EC_WORD_YOU, EC_WORD_FOR, EC_WORD_THAT},
-        .monSets = gVerdanturfBattleTentTrainerMons_Gerard
+        .monSet = gVerdanturfBattleTentTrainerMons_Gerard
     },
-    [9] = {
+    [VERDANTURF_TENT_TRAINER_BRADLY] = {
         .facilityClass = FACILITY_CLASS_CAMPER,
         .trainerName = _("BRADLY"),
         .speechBefore = {EC_WORD_IT_S, EC_WORD_LONESOME, EC_WORD_BUT, EC_WORD_I, EC_WORD_VACATION, EC_WORD_ALONE},
         .speechWin = {EC_WORD_I, EC_WORD_WILL, EC_MOVE(WITHDRAW), EC_WORD_INSIDE, EC_WORD_MY, EC_WORD_SHELL_ARMOR},
         .speechLose = {EC_WORD_OH, EC_WORD_ELLIPSIS, -1, EC_WORD_ALONE, EC_WORD_AS, EC_WORD_ALWAYS},
-        .monSets = gVerdanturfBattleTentTrainerMons_Bradly
+        .monSet = gVerdanturfBattleTentTrainerMons_Bradly
     },
-    [10] = {
+    [VERDANTURF_TENT_TRAINER_DENNIS] = {
         .facilityClass = FACILITY_CLASS_BUG_MANIAC,
         .trainerName = _("DENNIS"),
         .speechBefore = {EC_WORD_ARE, EC_WORD_YOU, EC_WORD_REALLY, EC_WORD_STRONG, EC_WORD_QUES, -1},
         .speechWin = {EC_WORD_WAHAHAHA, EC_WORD_EXCL, -1, EC_WORD_WAHAHAHA, EC_WORD_EXCL_EXCL, -1},
         .speechLose = {EC_WORD_NICE, EC_WORD_GOING, EC_WORD_EXCL, EC_WORD_I, EC_WORD_WAS, EC_WORD_CHILD_S_PLAY},
-        .monSets = gVerdanturfBattleTentTrainerMons_Dennis
+        .monSet = gVerdanturfBattleTentTrainerMons_Dennis
     },
-    [11] = {
+    [VERDANTURF_TENT_TRAINER_PRESTIN] = {
         .facilityClass = FACILITY_CLASS_GENTLEMAN,
         .trainerName = _("PRESTIN"),
         .speechBefore = {EC_WORD_THIS, EC_WORD_IS, EC_WORD_A, EC_MOVE(NIGHTMARE), EC_WORD_FOR, EC_WORD_YOU},
         .speechWin = {EC_WORD_FORGIVE, EC_WORD_ME, EC_WORD_ELLIPSIS, EC_WORD_IT_S, EC_WORD_A, EC_WORD_DREAM},
         .speechLose = {EC_WORD_I, EC_WORD_WANT, EC_WORD_TO, EC_WORD_WAKE_UP, EC_WORD_FROM, EC_WORD_THIS},
-        .monSets = gVerdanturfBattleTentTrainerMons_Prestin
+        .monSet = gVerdanturfBattleTentTrainerMons_Prestin
     },
-    [12] = {
+    [VERDANTURF_TENT_TRAINER_ERNESTO] = {
         .facilityClass = FACILITY_CLASS_GUITARIST,
         .trainerName = _("ERNESTO"),
         .speechBefore = {EC_WORD_THIS, EC_WORD_PARTY, EC_WORD_GOES, EC_WORD_ON, EC_WORD_FOREVER, EC_WORD_EXCL},
         .speechWin = {EC_WORD_THE, EC_WORD_MUSIC, EC_WORD_PLAYS, EC_WORD_ON, EC_WORD_WITHOUT, EC_WORD_END},
         .speechLose = {EC_WORD_NO, EC_WORD_EXCL, EC_WORD_THE, EC_WORD_MUSIC, EC_WORD_CAN_T, EC_WORD_STOP},
-        .monSets = gVerdanturfBattleTentTrainerMons_Ernesto
+        .monSet = gVerdanturfBattleTentTrainerMons_Ernesto
     },
-    [13] = {
+    [VERDANTURF_TENT_TRAINER_NALA] = {
         .facilityClass = FACILITY_CLASS_SCHOOL_KID_F,
         .trainerName = _("NALA"),
         .speechBefore = {EC_WORD_I, EC_WORD_WANT, EC_WORD_THE, EC_WORD_WORLD, EC_WORD_MOVIE, EC_WORD_COLLECTION},
         .speechWin = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_LIKE, EC_WORD_RADIO, EC_WORD_VERY, EC_WORD_MUCH},
         .speechLose = {EC_WORD_I, EC_WORD_REFUSE, EC_WORD_TO, EC_WORD_BELIEVE, EC_WORD_THIS, EC_WORD_EXCL},
-        .monSets = gVerdanturfBattleTentTrainerMons_Nala
+        .monSet = gVerdanturfBattleTentTrainerMons_Nala
     },
-    [14] = {
+    [VERDANTURF_TENT_TRAINER_DARNELL] = {
         .facilityClass = FACILITY_CLASS_COOLTRAINER_M,
         .trainerName = _("DARNELL"),
         .speechBefore = {EC_WORD_I, EC_WORD_WILL, EC_WORD_GO_EASY, EC_WORD_ON, EC_WORD_YOU, -1},
         .speechWin = {EC_WORD_YOUR, EC_MOVE2(FRUSTRATION), EC_WORD_SHOULD, EC_WORD_BE, EC_WORD_HIDDEN, EC_WORD_AWAY},
         .speechLose = {EC_WORD_YOU_RE, EC_WORD_TOO, EC_WORD_MUCH, EC_WORD_TO, EC_WORD_TAKE, EC_WORD_ELLIPSIS},
-        .monSets = gVerdanturfBattleTentTrainerMons_Darnell
+        .monSet = gVerdanturfBattleTentTrainerMons_Darnell
     },
-    [15] = {
+    [VERDANTURF_TENT_TRAINER_ASHLYN] = {
         .facilityClass = FACILITY_CLASS_COOLTRAINER_F,
         .trainerName = _("ASHLYN"),
         .speechBefore = {EC_WORD_I, EC_WORD_LOOK, EC_WORD_TOUGH, EC_WORD_DO, EC_WORD_I, EC_WORD_QUES},
         .speechWin = {EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_OVER, EC_WORD_YOUR, EC_MOVE2(TAUNT), EC_WORD_YET},
         .speechLose = {EC_WORD_YOU_RE, EC_WORD_MEAN, EC_WORD_EXCL_EXCL, -1, -1, -1},
-        .monSets = gVerdanturfBattleTentTrainerMons_Ashlyn
+        .monSet = gVerdanturfBattleTentTrainerMons_Ashlyn
     },
-    [16] = {
+    [VERDANTURF_TENT_TRAINER_ADDISON] = {
         .facilityClass = FACILITY_CLASS_POKEFAN_M,
         .trainerName = _("ADDISON"),
         .speechBefore = {EC_WORD_YES, EC_WORD_EXCL, -1, EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_EXCL},
         .speechWin = {EC_WORD_WELL, EC_WORD_WASN_T, EC_WORD_THAT, EC_WORD_EASY, EC_WORD_QUES, -1},
         .speechLose = {EC_WORD_WAAAH, EC_WORD_EXCL, -1, EC_WORD_BUT, EC_WORD_WHY, EC_WORD_QUES},
-        .monSets = gVerdanturfBattleTentTrainerMons_Addison
+        .monSet = gVerdanturfBattleTentTrainerMons_Addison
     },
-    [17] = {
+    [VERDANTURF_TENT_TRAINER_JUSTINE] = {
         .facilityClass = FACILITY_CLASS_POKEFAN_F,
         .trainerName = _("JUSTINE"),
         .speechBefore = {EC_WORD_YES, EC_WORD_EXCL, -1, EC_WORD_COME_ON, EC_WORD_I_AM, EC_WORD_READY},
         .speechWin = {EC_WORD_YOU_RE, EC_WORD_JUST, EC_WORD_NOT, EC_WORD_GOOD, EC_WORD_ENOUGH, EC_WORD_EXCL},
         .speechLose = {EC_WORD_WOWEE, EC_WORD_EXCL_EXCL, -1, -1, -1, -1},
-        .monSets = gVerdanturfBattleTentTrainerMons_Justine
+        .monSet = gVerdanturfBattleTentTrainerMons_Justine
     },
-    [18] = {
+    [VERDANTURF_TENT_TRAINER_TYSON] = {
         .facilityClass = FACILITY_CLASS_EXPERT_M,
         .trainerName = _("TYSON"),
         .speechBefore = {EC_WORD_YOU_RE, EC_WORD_GOING, EC_WORD_TO, EC_WORD_PRESSURE, EC_WORD_ME, EC_WORD_QUES},
         .speechWin = {EC_WORD_WHAT, EC_WORD_QUES, EC_WORD_YOU_RE, EC_WORD_MUCH, EC_WORD_TOO_WEAK, EC_WORD_EXCL},
         .speechLose = {EC_WORD_THIS, EC_WORD_DOESN_T, EC_WORD_MAKE, EC_WORD_ME, EC_WORD_HAPPY, EC_WORD_EXCL},
-        .monSets = gVerdanturfBattleTentTrainerMons_Tyson
+        .monSet = gVerdanturfBattleTentTrainerMons_Tyson
     },
-    [19] = {
+    [VERDANTURF_TENT_TRAINER_LAILA] = {
         .facilityClass = FACILITY_CLASS_EXPERT_F,
         .trainerName = _("LAILA"),
         .speechBefore = {EC_WORD_A, EC_MOVE2(STRUGGLE), EC_WORD_ISN_T, EC_WORD_VERY, EC_WORD_COOL, -1},
         .speechWin = {EC_WORD_NOPE, EC_WORD_NOT_VERY, EC_WORD_COOL, EC_WORD_AT, EC_WORD_ALL, EC_WORD_EXCL},
         .speechLose = {EC_WORD_YOU_RE, EC_WORD_NOT, EC_WORD_COOL, EC_WORD_BUT, EC_WORD_YOU, EC_WORD_WON},
-        .monSets = gVerdanturfBattleTentTrainerMons_Laila
+        .monSet = gVerdanturfBattleTentTrainerMons_Laila
     },
-    [20] = {
+    [VERDANTURF_TENT_TRAINER_WAREN] = {
         .facilityClass = FACILITY_CLASS_YOUNGSTER,
         .trainerName = _("WAREN"),
         .speechBefore = {EC_WORD_DANGER, EC_WORD_EXCL, -1, EC_WORD_I, EC_WORD_SENSE, EC_WORD_DANGER},
         .speechWin = {EC_WORD_DID, EC_WORD_YOU, EC_WORD_BELIEVE, EC_WORD_MY, EC_WORD_LIE, EC_WORD_QUES_EXCL},
         .speechLose = {EC_WORD_I, EC_WORD_REALLY, EC_WORD_DID, EC_WORD_SENSE, EC_WORD_DANGER, EC_WORD_ELLIPSIS},
-        .monSets = gVerdanturfBattleTentTrainerMons_Waren
+        .monSet = gVerdanturfBattleTentTrainerMons_Waren
     },
-    [21] = {
+    [VERDANTURF_TENT_TRAINER_TOBIAS] = {
         .facilityClass = FACILITY_CLASS_FISHERMAN,
         .trainerName = _("TOBIAS"),
         .speechBefore = {EC_MOVE2(BARRIER), EC_WORD_EXCL_EXCL, -1, EC_WORD_NOW, EC_WORD_COME_ON, EC_WORD_EXCL},
         .speechWin = {EC_WORD_HUH_QUES, EC_WORD_YOU, EC_WORD_MEAN, EC_WORD_I, EC_WORD_WON, EC_WORD_QUES},
         .speechLose = {EC_WORD_I, EC_WORD_SHOULD, EC_WORD_KNOW, EC_WORD_THAT, EC_WORD_IT_S, EC_WORD_HOPELESS},
-        .monSets = gVerdanturfBattleTentTrainerMons_Tobias
+        .monSet = gVerdanturfBattleTentTrainerMons_Tobias
     },
-    [22] = {
+    [VERDANTURF_TENT_TRAINER_JOSIAH] = {
         .facilityClass = FACILITY_CLASS_BIRD_KEEPER,
         .trainerName = _("JOSIAH"),
         .speechBefore = {EC_WORD_I, EC_WORD_PROMISE, EC_WORD_TO, EC_MOVE(FLY), EC_WORD_IF_I_LOSE, -1},
         .speechWin = {EC_WORD_TOO_WEAK, EC_WORD_ELLIPSIS, -1, EC_WORD_YOU, EC_MOVE(FLY), EC_WORD_INSTEAD},
         .speechLose = {EC_WORD_I, EC_WORD_PROMISE, EC_WORD_TO, EC_MOVE(FLY), EC_WORD_SOMETIME, EC_WORD_SOON},
-        .monSets = gVerdanturfBattleTentTrainerMons_Josiah
+        .monSet = gVerdanturfBattleTentTrainerMons_Josiah
     },
-    [23] = {
+    [VERDANTURF_TENT_TRAINER_DION] = {
         .facilityClass = FACILITY_CLASS_NINJA_BOY,
         .trainerName = _("DION"),
         .speechBefore = {EC_WORD_IT_S, EC_WORD_TRENDY, EC_WORD_UM, EC_WORD_BATTLE, EC_WORD_SOMETHING, -1},
         .speechWin = {EC_WORD_WAS, EC_WORD_IT, EC_WORD_ELLIPSIS, EC_WORD_BATTLE, EC_WORD_DATE, EC_WORD_QUES},
         .speechLose = {EC_WORD_WAS, EC_WORD_IT, EC_WORD_ELLIPSIS, EC_WORD_BATTLE, EC_WORD_GOURMET, EC_WORD_QUES},
-        .monSets = gVerdanturfBattleTentTrainerMons_Dion
+        .monSet = gVerdanturfBattleTentTrainerMons_Dion
     },
-    [24] = {
+    [VERDANTURF_TENT_TRAINER_KENZIE] = {
         .facilityClass = FACILITY_CLASS_PARASOL_LADY,
         .trainerName = _("KENZIE"),
         .speechBefore = {EC_WORD_THE, EC_MOVE(MORNING_SUN), EC_WORD_GIVES, EC_WORD_ME, EC_MOVE(STRENGTH), -1},
         .speechWin = {EC_WORD_BUT, EC_WORD_I, EC_WORD_LIKE, EC_MOVE2(MOONLIGHT), EC_WORD_TOO, -1},
         .speechLose = {EC_WORD_YOU_RE, EC_WORD_LIKE, EC_WORD_A, EC_WORD_TERRIBLE, EC_MOVE(SANDSTORM), EC_WORD_ELLIPSIS},
-        .monSets = gVerdanturfBattleTentTrainerMons_Kenzie
+        .monSet = gVerdanturfBattleTentTrainerMons_Kenzie
     },
-    [25] = {
+    [VERDANTURF_TENT_TRAINER_LILLIAN] = {
         .facilityClass = FACILITY_CLASS_SWIMMER_F,
         .trainerName = _("LILLIAN"),
         .speechBefore = {EC_WORD_I, EC_WORD_DO, EC_WORD_THINGS, EC_WORD_AT, EC_WORD_MY, EC_WORD_OWN_TEMPO},
         .speechWin = {EC_WORD_I, EC_WORD_WON, EC_WORD_QUES, EC_WORD_WHAT, EC_WORD_A, EC_WORD_SURPRISE},
         .speechLose = {EC_WORD_AWW, EC_WORD_ELLIPSIS, EC_WORD_I, EC_WORD_NEED, EC_WORD_A, EC_WORD_NAP},
-        .monSets = gVerdanturfBattleTentTrainerMons_Lillian
+        .monSet = gVerdanturfBattleTentTrainerMons_Lillian
     },
-    [26] = {
+    [VERDANTURF_TENT_TRAINER_LESLEY] = {
         .facilityClass = FACILITY_CLASS_PICNICKER,
         .trainerName = _("LESLEY"),
         .speechBefore = {EC_WORD_YOU, EC_WORD_SHOULD, EC_WORD_NOT, EC_WORD_BE, EC_WORD_LOLLING, EC_WORD_ABOUT},
         .speechWin = {EC_WORD_YOU, EC_WORD_SHOULD, EC_WORD_GET, EC_WORD_UP, EC_WORD_EARLIER, -1},
         .speechLose = {EC_WORD_THIS, EC_WORD_SHOULD, EC_WORD_NOT, EC_WORD_BE, EC_WORD_HAPPENING, EC_WORD_EXCL},
-        .monSets = gVerdanturfBattleTentTrainerMons_Lesley
+        .monSet = gVerdanturfBattleTentTrainerMons_Lesley
     },
-    [27] = {
+    [VERDANTURF_TENT_TRAINER_MARQUIS] = {
         .facilityClass = FACILITY_CLASS_SAILOR,
         .trainerName = _("MARQUIS"),
         .speechBefore = {EC_WORD_NONE, EC_WORD_OF, EC_WORD_THIS, EC_WORD_IS, EC_WORD_MAKING, EC_WORD_SENSE},
         .speechWin = {EC_WORD_SEE, EC_WORD_QUES, EC_WORD_THIS, EC_WORD_JUST, EC_WORD_ISN_T, EC_WORD_NORMAL},
         .speechLose = {EC_WORD_SHOULD, EC_WORD_I, EC_WORD_CAUSE, EC_WORD_AN, EC_MOVE(UPROAR), EC_WORD_QUES},
-        .monSets = gVerdanturfBattleTentTrainerMons_Marquis
+        .monSet = gVerdanturfBattleTentTrainerMons_Marquis
     },
-    [28] = {
+    [VERDANTURF_TENT_TRAINER_FREDDY] = {
         .facilityClass = FACILITY_CLASS_COLLECTOR,
         .trainerName = _("FREDDY"),
         .speechBefore = {EC_WORD_I, EC_WORD_ADORE, EC_WORD_THIS, EC_WORD_CUTE, EC_WORD_TELEVISION, EC_WORD_IDOL},
         .speechWin = {EC_WORD_YOU_RE, EC_WORD_SO, EC_WORD_FUNNY, EC_WORD_WHEN, EC_WORD_YOU_RE, EC_WORD_ANGRY},
         .speechLose = {EC_WORD_LATE, EC_WORD_NIGHT, EC_WORD_TELEVISION, EC_WORD_IS, EC_WORD_MY, EC_WORD_LIFE},
-        .monSets = gVerdanturfBattleTentTrainerMons_Freddy
+        .monSet = gVerdanturfBattleTentTrainerMons_Freddy
     },
-    [29] = {
+    [VERDANTURF_TENT_TRAINER_CECILIA] = {
         .facilityClass = FACILITY_CLASS_LASS,
         .trainerName = _("CECILIA"),
         .speechBefore = {EC_WORD_MY, EC_WORD_FABULOUS, EC_WORD_CUTENESS, EC_WORD_IS, EC_WORD_IN, EC_WORD_FASHION},
         .speechWin = {EC_WORD_YOU_RE, EC_WORD_NO, EC_WORD_MATCH, EC_WORD_FOR, EC_WORD_MY, EC_WORD_CUTE_CHARM},
         .speechLose = {EC_WORD_DON_T, EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_FASHION, EC_WORD_SENSE, EC_WORD_QUES},
-        .monSets = gVerdanturfBattleTentTrainerMons_Cecilia
+        .monSet = gVerdanturfBattleTentTrainerMons_Cecilia
     }
 };
 
-const struct FacilityMon gVerdanturfBattleTentMons[] = 
+const struct FacilityMon gVerdanturfBattleTentMons[NUM_VERDANTURF_TENT_MONS] = 
 {
-    [0] = {
+    [VERDANTURF_TENT_MON_POOCHYENA] = {
         .species = SPECIES_POOCHYENA,
         .moves = {MOVE_ROAR, MOVE_THIEF, MOVE_BITE, MOVE_HOWL},
         .itemTableId = BATTLE_FRONTIER_ITEM_BLACK_GLASSES,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_NAUGHTY
     },
-    [1] = {
+    [VERDANTURF_TENT_MON_ZIGZAGOON] = {
         .species = SPECIES_ZIGZAGOON,
         .moves = {MOVE_COVET, MOVE_GROWL, MOVE_PIN_MISSILE, MOVE_MUD_SPORT},
         .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [2] = {
+    [VERDANTURF_TENT_MON_DUSTOX] = {
         .species = SPECIES_DUSTOX,
         .moves = {MOVE_CONFUSION, MOVE_MOONLIGHT, MOVE_PROTECT, MOVE_FLASH},
         .itemTableId = BATTLE_FRONTIER_ITEM_SILVER_POWDER,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_MODEST
     },
-    [3] = {
+    [VERDANTURF_TENT_MON_TAILLOW] = {
         .species = SPECIES_TAILLOW,
         .moves = {MOVE_AGILITY, MOVE_DOUBLE_TEAM, MOVE_WING_ATTACK, MOVE_GROWL},
         .itemTableId = BATTLE_FRONTIER_ITEM_ORAN_BERRY,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_RELAXED
     },
-    [4] = {
+    [VERDANTURF_TENT_MON_SHROOMISH] = {
         .species = SPECIES_SHROOMISH,
         .moves = {MOVE_HEADBUTT, MOVE_STUN_SPORE, MOVE_LEECH_SEED, MOVE_FLASH},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_HP,
         .nature = NATURE_RASH
     },
-    [5] = {
+    [VERDANTURF_TENT_MON_MACHOP] = {
         .species = SPECIES_MACHOP,
         .moves = {MOVE_LOW_KICK, MOVE_LEER, MOVE_FOCUS_ENERGY, MOVE_ENCORE},
         .itemTableId = BATTLE_FRONTIER_ITEM_PERSIM_BERRY,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_LONELY
     },
-    [6] = {
+    [VERDANTURF_TENT_MON_MAGIKARP] = {
         .species = SPECIES_MAGIKARP,
         .moves = {MOVE_SPLASH, MOVE_FLAIL, MOVE_TACKLE, MOVE_NONE},
         .itemTableId = BATTLE_FRONTIER_ITEM_SILK_SCARF,
         .evSpread = F_EV_SPREAD_ATTACK,
         .nature = NATURE_HARDY
     },
-    [7] = {
+    [VERDANTURF_TENT_MON_BARBOACH] = {
         .species = SPECIES_BARBOACH,
         .moves = {MOVE_MUD_SLAP, MOVE_WATER_GUN, MOVE_RAIN_DANCE, MOVE_SPARK},
         .itemTableId = BATTLE_FRONTIER_ITEM_ASPEAR_BERRY,
         .evSpread = F_EV_SPREAD_SPEED,
         .nature = NATURE_HASTY
     },
-    [8] = {
+    [VERDANTURF_TENT_MON_WINGULL] = {
         .species = SPECIES_WINGULL,
         .moves = {MOVE_ATTRACT, MOVE_TWISTER, MOVE_WING_ATTACK, MOVE_SUPERSONIC},
         .itemTableId = BATTLE_FRONTIER_ITEM_DRAGON_FANG,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_IMPISH
     },
-    [9] = {
+    [VERDANTURF_TENT_MON_ARON_1] = {
         .species = SPECIES_ARON,
         .moves = {MOVE_ENDEAVOR, MOVE_METAL_CLAW, MOVE_TACKLE, MOVE_ATTRACT},
         .itemTableId = BATTLE_FRONTIER_ITEM_PECHA_BERRY,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_HARDY
     },
-    [10] = {
+    [VERDANTURF_TENT_MON_NUMEL_1] = {
         .species = SPECIES_NUMEL,
         .moves = {MOVE_EMBER, MOVE_ROCK_SLIDE, MOVE_ROLLOUT, MOVE_GROWL},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHARCOAL,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_SASSY
     },
-    [11] = {
+    [VERDANTURF_TENT_MON_SWALOT] = {
         .species = SPECIES_SWALOT,
         .moves = {MOVE_YAWN, MOVE_SLUDGE, MOVE_ACID_ARMOR, MOVE_AMNESIA},
         .itemTableId = BATTLE_FRONTIER_ITEM_POISON_BARB,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_BOLD
     },
-    [12] = {
+    [VERDANTURF_TENT_MON_KECLEON] = {
         .species = SPECIES_KECLEON,
         .moves = {MOVE_SUBSTITUTE, MOVE_FAINT_ATTACK, MOVE_DOUBLE_TEAM, MOVE_BIND},
         .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_QUIET
     },
-    [13] = {
+    [VERDANTURF_TENT_MON_BALTOY] = {
         .species = SPECIES_BALTOY,
         .moves = {MOVE_SANDSTORM, MOVE_FLASH, MOVE_SELF_DESTRUCT, MOVE_HARDEN},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_NAUGHTY
     },
-    [14] = {
+    [VERDANTURF_TENT_MON_NINJASK] = {
         .species = SPECIES_NINJASK,
         .moves = {MOVE_DIG, MOVE_SCREECH, MOVE_SWORDS_DANCE, MOVE_LEECH_LIFE},
         .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_SASSY
     },
-    [15] = {
+    [VERDANTURF_TENT_MON_MAKUHITA] = {
         .species = SPECIES_MAKUHITA,
         .moves = {MOVE_BULK_UP, MOVE_ARM_THRUST, MOVE_SMELLING_SALT, MOVE_SAND_ATTACK},
         .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_NAUGHTY
     },
-    [16] = {
+    [VERDANTURF_TENT_MON_SWABLU] = {
         .species = SPECIES_SWABLU,
         .moves = {MOVE_REFRESH, MOVE_SAFEGUARD, MOVE_ATTRACT, MOVE_MIRROR_MOVE},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MILD
     },
-    [17] = {
+    [VERDANTURF_TENT_MON_GOLDEEN_1] = {
         .species = SPECIES_GOLDEEN,
         .moves = {MOVE_WATERFALL, MOVE_MUD_SPORT, MOVE_SUPERSONIC, MOVE_DOUBLE_TEAM},
         .itemTableId = BATTLE_FRONTIER_ITEM_MYSTIC_WATER,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_GENTLE
     },
-    [18] = {
+    [VERDANTURF_TENT_MON_LOTAD] = {
         .species = SPECIES_LOTAD,
         .moves = {MOVE_GROWL, MOVE_WATER_GUN, MOVE_MEGA_DRAIN, MOVE_PROTECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_IAPAPA_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_QUIRKY
     },
-    [19] = {
+    [VERDANTURF_TENT_MON_NUMEL_2] = {
         .species = SPECIES_NUMEL,
         .moves = {MOVE_MAGNITUDE, MOVE_EMBER, MOVE_GROWL, MOVE_DEFENSE_CURL},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHARCOAL,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_RELAXED
     },
-    [20] = {
+    [VERDANTURF_TENT_MON_LINOONE] = {
         .species = SPECIES_LINOONE,
         .moves = {MOVE_HEADBUTT, MOVE_TICKLE, MOVE_PROTECT, MOVE_REST},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_IMPISH
     },
-    [21] = {
+    [VERDANTURF_TENT_MON_SEVIPER] = {
         .species = SPECIES_SEVIPER,
         .moves = {MOVE_WRAP, MOVE_GLARE, MOVE_POISON_FANG, MOVE_SWAGGER},
         .itemTableId = BATTLE_FRONTIER_ITEM_ASPEAR_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_LONELY
     },
-    [22] = {
+    [VERDANTURF_TENT_MON_SKARMORY] = {
         .species = SPECIES_SKARMORY,
         .moves = {MOVE_AIR_CUTTER, MOVE_SANDSTORM, MOVE_LEER, MOVE_AGILITY},
         .itemTableId = BATTLE_FRONTIER_ITEM_MACHO_BRACE,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_BASHFUL
     },
-    [23] = {
+    [VERDANTURF_TENT_MON_SWELLOW] = {
         .species = SPECIES_SWELLOW,
         .moves = {MOVE_AGILITY, MOVE_WING_ATTACK, MOVE_DOUBLE_TEAM, MOVE_SUPERSONIC},
         .itemTableId = BATTLE_FRONTIER_ITEM_SHARP_BEAK,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_NAUGHTY
     },
-    [24] = {
+    [VERDANTURF_TENT_MON_GOLDEEN_2] = {
         .species = SPECIES_GOLDEEN,
         .moves = {MOVE_PECK, MOVE_SUPERSONIC, MOVE_PSYBEAM, MOVE_RAIN_DANCE},
         .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP,
         .nature = NATURE_GENTLE
     },
-    [25] = {
+    [VERDANTURF_TENT_MON_ELECTRIKE] = {
         .species = SPECIES_ELECTRIKE,
         .moves = {MOVE_SHOCK_WAVE, MOVE_TACKLE, MOVE_CHARGE, MOVE_THUNDER_WAVE},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_MILD
     },
-    [26] = {
+    [VERDANTURF_TENT_MON_NUZLEAF] = {
         .species = SPECIES_NUZLEAF,
         .moves = {MOVE_SUNNY_DAY, MOVE_TORMENT, MOVE_FAKE_OUT, MOVE_THIEF},
         .itemTableId = BATTLE_FRONTIER_ITEM_BLACK_GLASSES,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_BOLD
     },
-    [27] = {
+    [VERDANTURF_TENT_MON_ARON_2] = {
         .species = SPECIES_ARON,
         .moves = {MOVE_TAKE_DOWN, MOVE_METAL_CLAW, MOVE_IRON_DEFENSE, MOVE_ATTRACT},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_MODEST
     },
-    [28] = {
+    [VERDANTURF_TENT_MON_MIGHTYENA] = {
         .species = SPECIES_MIGHTYENA,
         .moves = {MOVE_HOWL, MOVE_TAKE_DOWN, MOVE_ODOR_SLEUTH, MOVE_SAND_ATTACK},
         .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_QUIRKY
     },
-    [29] = {
+    [VERDANTURF_TENT_MON_SOLROCK] = {
         .species = SPECIES_SOLROCK,
         .moves = {MOVE_HARDEN, MOVE_FIRE_SPIN, MOVE_MIMIC, MOVE_PSYWAVE},
         .itemTableId = BATTLE_FRONTIER_ITEM_TWISTED_SPOON,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [30] = {
+    [VERDANTURF_TENT_MON_GRAVELER] = {
         .species = SPECIES_GRAVELER,
         .moves = {MOVE_ROLLOUT, MOVE_ROCK_SMASH, MOVE_SANDSTORM, MOVE_BLOCK},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_IMPISH
     },
-    [31] = {
+    [VERDANTURF_TENT_MON_KADABRA] = {
         .species = SPECIES_KADABRA,
         .moves = {MOVE_ENCORE, MOVE_PSYBEAM, MOVE_DISABLE, MOVE_KINESIS},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP,
         .nature = NATURE_QUIET
     },
-    [32] = {
+    [VERDANTURF_TENT_MON_VOLTORB] = {
         .species = SPECIES_VOLTORB,
         .moves = {MOVE_PROTECT, MOVE_SELF_DESTRUCT, MOVE_SPARK, MOVE_SCREECH},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_BASHFUL
     },
-    [33] = {
+    [VERDANTURF_TENT_MON_MAGNEMITE] = {
         .species = SPECIES_MAGNEMITE,
         .moves = {MOVE_METAL_SOUND, MOVE_SUPERSONIC, MOVE_THUNDER_WAVE, MOVE_SHOCK_WAVE},
         .itemTableId = BATTLE_FRONTIER_ITEM_MAGNET,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_SERIOUS
     },
-    [34] = {
+    [VERDANTURF_TENT_MON_PELIPPER] = {
         .species = SPECIES_PELIPPER,
         .moves = {MOVE_WING_ATTACK, MOVE_MIST, MOVE_AGILITY, MOVE_PROTECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_FIGY_BERRY,
         .evSpread = 0,
         .nature = NATURE_BRAVE
     },
-    [35] = {
+    [VERDANTURF_TENT_MON_LOUDRED] = {
         .species = SPECIES_LOUDRED,
         .moves = {MOVE_HOWL, MOVE_UPROAR, MOVE_REST, MOVE_SCREECH},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_CALM
     },
-    [36] = {
+    [VERDANTURF_TENT_MON_MARILL] = {
         .species = SPECIES_MARILL,
         .moves = {MOVE_ROLLOUT, MOVE_DEFENSE_CURL, MOVE_TAIL_WHIP, MOVE_BUBBLE_BEAM},
         .itemTableId = BATTLE_FRONTIER_ITEM_RAWST_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_JOLLY
     },
-    [37] = {
+    [VERDANTURF_TENT_MON_TRAPINCH] = {
         .species = SPECIES_TRAPINCH,
         .moves = {MOVE_DIG, MOVE_ROCK_TOMB, MOVE_SANDSTORM, MOVE_FAINT_ATTACK},
         .itemTableId = BATTLE_FRONTIER_ITEM_NONE,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_NAUGHTY
     },
-    [38] = {
+    [VERDANTURF_TENT_MON_TENTACOOL] = {
         .species = SPECIES_TENTACOOL,
         .moves = {MOVE_SCREECH, MOVE_CONFUSE_RAY, MOVE_WRAP, MOVE_ATTRACT},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_RELAXED
     },
-    [39] = {
+    [VERDANTURF_TENT_MON_VIGOROTH] = {
         .species = SPECIES_VIGOROTH,
         .moves = {MOVE_ENCORE, MOVE_SLACK_OFF, MOVE_YAWN, MOVE_SECRET_POWER},
         .itemTableId = BATTLE_FRONTIER_ITEM_MENTAL_HERB,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_QUIRKY
     },
-    [40] = {
+    [VERDANTURF_TENT_MON_WAILMER] = {
         .species = SPECIES_WAILMER,
         .moves = {MOVE_WATER_PULSE, MOVE_ROLLOUT, MOVE_CURSE, MOVE_PROTECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_WHITE_HERB,
         .evSpread = F_EV_SPREAD_HP,
         .nature = NATURE_RELAXED
     },
-    [41] = {
+    [VERDANTURF_TENT_MON_ILLUMISE] = {
         .species = SPECIES_ILLUMISE,
         .moves = {MOVE_TACKLE, MOVE_SWEET_SCENT, MOVE_WISH, MOVE_ENCORE},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_QUIRKY
     },
-    [42] = {
+    [VERDANTURF_TENT_MON_MACHOKE] = {
         .species = SPECIES_MACHOKE,
         .moves = {MOVE_LEER, MOVE_KARATE_CHOP, MOVE_BULK_UP, MOVE_REST},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_CALM
     },
-    [43] = {
+    [VERDANTURF_TENT_MON_WHISMUR] = {
         .species = SPECIES_WHISMUR,
         .moves = {MOVE_SECRET_POWER, MOVE_SUPERSONIC, MOVE_STOMP, MOVE_ROAR},
         .itemTableId = BATTLE_FRONTIER_ITEM_RAWST_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_QUIRKY
     },
-    [44] = {
+    [VERDANTURF_TENT_MON_CACNEA] = {
         .species = SPECIES_CACNEA,
         .moves = {MOVE_INGRAIN, MOVE_LEECH_SEED, MOVE_NEEDLE_ARM, MOVE_GROWTH},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
@@ -2126,876 +2126,876 @@ const struct FacilityMon gVerdanturfBattleTentMons[] =
 // Fallarbor Battle Tent.
 const u16 gFallarborBattleTentTrainerMons_Amber[] = 
 {
-    39,
-    40,
-    41,
-    42,
-    43,
-    44,
+    FALLARBOR_TENT_MON_SWALOT,
+    FALLARBOR_TENT_MON_SHROOMISH,
+    FALLARBOR_TENT_MON_KIRLIA,
+    FALLARBOR_TENT_MON_LOMBRE,
+    FALLARBOR_TENT_MON_NUZLEAF,
+    FALLARBOR_TENT_MON_CACNEA,
     -1
 };
 
 const u16 gFallarborBattleTentTrainerMons_Javier[] = 
 {
-    6,
-    35,
-    36,
-    37,
-    38,
-    44,
+    FALLARBOR_TENT_MON_SOLROCK,
+    FALLARBOR_TENT_MON_TRAPINCH,
+    FALLARBOR_TENT_MON_BALTOY,
+    FALLARBOR_TENT_MON_GRAVELER,
+    FALLARBOR_TENT_MON_SANDSHREW,
+    FALLARBOR_TENT_MON_CACNEA,
     -1
 };
 
 const u16 gFallarborBattleTentTrainerMons_Natalie[] = 
 {
-    5,
-    29,
-    30,
-    32,
-    34,
+    FALLARBOR_TENT_MON_MAGIKARP,
+    FALLARBOR_TENT_MON_PELIPPER,
+    FALLARBOR_TENT_MON_BARBOACH,
+    FALLARBOR_TENT_MON_MARILL,
+    FALLARBOR_TENT_MON_GOLDEEN_2,
     -1
 };
 
 const u16 gFallarborBattleTentTrainerMons_Treve[] = 
 {
-    28,
-    29,
-    30,
-    32,
-    33,
+    FALLARBOR_TENT_MON_WINGULL,
+    FALLARBOR_TENT_MON_PELIPPER,
+    FALLARBOR_TENT_MON_BARBOACH,
+    FALLARBOR_TENT_MON_MARILL,
+    FALLARBOR_TENT_MON_GOLDEEN_1,
     -1
 };
 
 const u16 gFallarborBattleTentTrainerMons_Arianna[] = 
 {
-    18,
-    23,
-    24,
-    27,
-    44,
+    FALLARBOR_TENT_MON_ELECTRIKE,
+    FALLARBOR_TENT_MON_LINOONE_2,
+    FALLARBOR_TENT_MON_MIGHTYENA,
+    FALLARBOR_TENT_MON_GOLBAT,
+    FALLARBOR_TENT_MON_CACNEA,
     -1
 };
 
 const u16 gFallarborBattleTentTrainerMons_Jadyn[] = 
 {
-    0,
-    22,
-    24,
-    27,
-    32,
-    39,
+    FALLARBOR_TENT_MON_NUMEL,
+    FALLARBOR_TENT_MON_LOUDRED,
+    FALLARBOR_TENT_MON_MIGHTYENA,
+    FALLARBOR_TENT_MON_GOLBAT,
+    FALLARBOR_TENT_MON_MARILL,
+    FALLARBOR_TENT_MON_SWALOT,
     -1
 };
 
 const u16 gFallarborBattleTentTrainerMons_Gerardo[] = 
 {
-    6,
-    18,
-    23,
-    24,
-    29,
+    FALLARBOR_TENT_MON_SOLROCK,
+    FALLARBOR_TENT_MON_ELECTRIKE,
+    FALLARBOR_TENT_MON_LINOONE_2,
+    FALLARBOR_TENT_MON_MIGHTYENA,
+    FALLARBOR_TENT_MON_PELIPPER,
     -1
 };
 
 const u16 gFallarborBattleTentTrainerMons_Jonn[] = 
 {
-    16,
-    17,
-    21,
-    22,
-    37,
+    FALLARBOR_TENT_MON_ARON_1,
+    FALLARBOR_TENT_MON_ARON_2,
+    FALLARBOR_TENT_MON_WHISMUR,
+    FALLARBOR_TENT_MON_LOUDRED,
+    FALLARBOR_TENT_MON_GRAVELER,
     -1
 };
 
 const u16 gFallarborBattleTentTrainerMons_Esteban[] = 
 {
-    5,
-    28,
-    30,
-    33,
-    42,
+    FALLARBOR_TENT_MON_MAGIKARP,
+    FALLARBOR_TENT_MON_WINGULL,
+    FALLARBOR_TENT_MON_BARBOACH,
+    FALLARBOR_TENT_MON_GOLDEEN_1,
+    FALLARBOR_TENT_MON_LOMBRE,
     -1
 };
 
 const u16 gFallarborBattleTentTrainerMons_Jameson[] = 
 {
-    1,
-    2,
-    3,
-    5,
-    9,
+    FALLARBOR_TENT_MON_LINOONE_1,
+    FALLARBOR_TENT_MON_PLUSLE,
+    FALLARBOR_TENT_MON_POOCHYENA,
+    FALLARBOR_TENT_MON_MAGIKARP,
+    FALLARBOR_TENT_MON_NINCADA,
     -1
 };
 
 const u16 gFallarborBattleTentTrainerMons_Alanzo[] = 
 {
-    9,
-    10,
-    11,
-    12,
-    13,
-    14,
-    15,
+    FALLARBOR_TENT_MON_NINCADA,
+    FALLARBOR_TENT_MON_BEAUTIFLY,
+    FALLARBOR_TENT_MON_DUSTOX,
+    FALLARBOR_TENT_MON_ILLUMISE,
+    FALLARBOR_TENT_MON_VOLBEAT,
+    FALLARBOR_TENT_MON_NINJASK_1,
+    FALLARBOR_TENT_MON_NINJASK_2,
     -1
 };
 
 const u16 gFallarborBattleTentTrainerMons_Howard[] = 
 {
-    18,
-    23,
-    31,
-    38,
-    43,
+    FALLARBOR_TENT_MON_ELECTRIKE,
+    FALLARBOR_TENT_MON_LINOONE_2,
+    FALLARBOR_TENT_MON_WAILMER,
+    FALLARBOR_TENT_MON_SANDSHREW,
+    FALLARBOR_TENT_MON_NUZLEAF,
     -1
 };
 
 const u16 gFallarborBattleTentTrainerMons_Conrad[] = 
 {
-    18,
-    19,
-    20,
-    21,
-    22,
+    FALLARBOR_TENT_MON_ELECTRIKE,
+    FALLARBOR_TENT_MON_MAGNEMITE,
+    FALLARBOR_TENT_MON_VOLTORB,
+    FALLARBOR_TENT_MON_WHISMUR,
+    FALLARBOR_TENT_MON_LOUDRED,
     -1
 };
 
 const u16 gFallarborBattleTentTrainerMons_Makenna[] = 
 {
-    4,
-    21,
-    25,
-    36,
-    40,
+    FALLARBOR_TENT_MON_KECLEON,
+    FALLARBOR_TENT_MON_WHISMUR,
+    FALLARBOR_TENT_MON_SWABLU,
+    FALLARBOR_TENT_MON_BALTOY,
+    FALLARBOR_TENT_MON_SHROOMISH,
     -1
 };
 
 const u16 gFallarborBattleTentTrainerMons_Brayan[] = 
 {
-    0,
-    4,
-    6,
-    12,
-    19,
-    23,
-    28,
+    FALLARBOR_TENT_MON_NUMEL,
+    FALLARBOR_TENT_MON_KECLEON,
+    FALLARBOR_TENT_MON_SOLROCK,
+    FALLARBOR_TENT_MON_ILLUMISE,
+    FALLARBOR_TENT_MON_MAGNEMITE,
+    FALLARBOR_TENT_MON_LINOONE_2,
+    FALLARBOR_TENT_MON_WINGULL,
     -1
 };
 
 const u16 gFallarborBattleTentTrainerMons_Mariana[] = 
 {
-    0,
-    4,
-    13,
-    19,
-    28,
-    30,
-    37,
+    FALLARBOR_TENT_MON_NUMEL,
+    FALLARBOR_TENT_MON_KECLEON,
+    FALLARBOR_TENT_MON_VOLBEAT,
+    FALLARBOR_TENT_MON_MAGNEMITE,
+    FALLARBOR_TENT_MON_WINGULL,
+    FALLARBOR_TENT_MON_BARBOACH,
+    FALLARBOR_TENT_MON_GRAVELER,
     -1
 };
 
 const u16 gFallarborBattleTentTrainerMons_Sheldon[] = 
 {
-    2,
-    3,
-    21,
-    31,
-    39,
+    FALLARBOR_TENT_MON_PLUSLE,
+    FALLARBOR_TENT_MON_POOCHYENA,
+    FALLARBOR_TENT_MON_WHISMUR,
+    FALLARBOR_TENT_MON_WAILMER,
+    FALLARBOR_TENT_MON_SWALOT,
     -1
 };
 
 const u16 gFallarborBattleTentTrainerMons_Gianna[] = 
 {
-    1,
-    2,
-    30,
-    32,
-    41,
+    FALLARBOR_TENT_MON_LINOONE_1,
+    FALLARBOR_TENT_MON_PLUSLE,
+    FALLARBOR_TENT_MON_BARBOACH,
+    FALLARBOR_TENT_MON_MARILL,
+    FALLARBOR_TENT_MON_KIRLIA,
     -1
 };
 
 const u16 gFallarborBattleTentTrainerMons_Yahir[] = 
 {
-    4,
-    8,
-    15,
-    17,
-    22,
-    24,
+    FALLARBOR_TENT_MON_KECLEON,
+    FALLARBOR_TENT_MON_MACHOKE,
+    FALLARBOR_TENT_MON_NINJASK_2,
+    FALLARBOR_TENT_MON_ARON_2,
+    FALLARBOR_TENT_MON_LOUDRED,
+    FALLARBOR_TENT_MON_MIGHTYENA,
     -1
 };
 
 const u16 gFallarborBattleTentTrainerMons_Britney[] = 
 {
-    4,
-    7,
-    14,
-    20,
-    23,
-    43,
+    FALLARBOR_TENT_MON_KECLEON,
+    FALLARBOR_TENT_MON_MAKUHITA,
+    FALLARBOR_TENT_MON_NINJASK_1,
+    FALLARBOR_TENT_MON_VOLTORB,
+    FALLARBOR_TENT_MON_LINOONE_2,
+    FALLARBOR_TENT_MON_NUZLEAF,
     -1
 };
 
 const u16 gFallarborBattleTentTrainerMons_Hecter[] = 
 {
-    0,
-    1,
-    2,
-    5,
-    9,
-    35,
+    FALLARBOR_TENT_MON_NUMEL,
+    FALLARBOR_TENT_MON_LINOONE_1,
+    FALLARBOR_TENT_MON_PLUSLE,
+    FALLARBOR_TENT_MON_MAGIKARP,
+    FALLARBOR_TENT_MON_NINCADA,
+    FALLARBOR_TENT_MON_TRAPINCH,
     -1
 };
 
 const u16 gFallarborBattleTentTrainerMons_Tannor[] = 
 {
-    5,
-    30,
-    31,
-    33,
-    34,
+    FALLARBOR_TENT_MON_MAGIKARP,
+    FALLARBOR_TENT_MON_BARBOACH,
+    FALLARBOR_TENT_MON_WAILMER,
+    FALLARBOR_TENT_MON_GOLDEEN_1,
+    FALLARBOR_TENT_MON_GOLDEEN_2,
     -1
 };
 
 const u16 gFallarborBattleTentTrainerMons_Benji[] = 
 {
-    25,
-    26,
-    27,
-    28,
-    29,
+    FALLARBOR_TENT_MON_SWABLU,
+    FALLARBOR_TENT_MON_SKARMORY,
+    FALLARBOR_TENT_MON_GOLBAT,
+    FALLARBOR_TENT_MON_WINGULL,
+    FALLARBOR_TENT_MON_PELIPPER,
     -1
 };
 
 const u16 gFallarborBattleTentTrainerMons_Rory[] = 
 {
-    9,
-    11,
-    14,
-    15,
-    27,
-    39,
+    FALLARBOR_TENT_MON_NINCADA,
+    FALLARBOR_TENT_MON_DUSTOX,
+    FALLARBOR_TENT_MON_NINJASK_1,
+    FALLARBOR_TENT_MON_NINJASK_2,
+    FALLARBOR_TENT_MON_GOLBAT,
+    FALLARBOR_TENT_MON_SWALOT,
     -1
 };
 
 const u16 gFallarborBattleTentTrainerMons_Eleanor[] = 
 {
-    23,
-    28,
-    31,
-    36,
-    38,
-    42,
-    44,
+    FALLARBOR_TENT_MON_LINOONE_2,
+    FALLARBOR_TENT_MON_WINGULL,
+    FALLARBOR_TENT_MON_WAILMER,
+    FALLARBOR_TENT_MON_BALTOY,
+    FALLARBOR_TENT_MON_SANDSHREW,
+    FALLARBOR_TENT_MON_LOMBRE,
+    FALLARBOR_TENT_MON_CACNEA,
     -1
 };
 
 const u16 gFallarborBattleTentTrainerMons_Evelyn[] = 
 {
-    29,
-    31,
-    32,
-    33,
-    34,
+    FALLARBOR_TENT_MON_PELIPPER,
+    FALLARBOR_TENT_MON_WAILMER,
+    FALLARBOR_TENT_MON_MARILL,
+    FALLARBOR_TENT_MON_GOLDEEN_1,
+    FALLARBOR_TENT_MON_GOLDEEN_2,
     -1
 };
 
 const u16 gFallarborBattleTentTrainerMons_Arielle[] = 
 {
-    1,
-    3,
-    38,
-    39,
-    41,
+    FALLARBOR_TENT_MON_LINOONE_1,
+    FALLARBOR_TENT_MON_POOCHYENA,
+    FALLARBOR_TENT_MON_SANDSHREW,
+    FALLARBOR_TENT_MON_SWALOT,
+    FALLARBOR_TENT_MON_KIRLIA,
     -1
 };
 
 const u16 gFallarborBattleTentTrainerMons_Connar[] = 
 {
-    7,
-    8,
-    28,
-    29,
-    31,
-    32,
+    FALLARBOR_TENT_MON_MAKUHITA,
+    FALLARBOR_TENT_MON_MACHOKE,
+    FALLARBOR_TENT_MON_WINGULL,
+    FALLARBOR_TENT_MON_PELIPPER,
+    FALLARBOR_TENT_MON_WAILMER,
+    FALLARBOR_TENT_MON_MARILL,
     -1
 };
 
 const u16 gFallarborBattleTentTrainerMons_Maurice[] = 
 {
-    4,
-    5,
-    6,
-    12,
-    13,
+    FALLARBOR_TENT_MON_KECLEON,
+    FALLARBOR_TENT_MON_MAGIKARP,
+    FALLARBOR_TENT_MON_SOLROCK,
+    FALLARBOR_TENT_MON_ILLUMISE,
+    FALLARBOR_TENT_MON_VOLBEAT,
     -1
 };
 
 const u16 gFallarborBattleTentTrainerMons_Kianna[] = 
 {
-    22,
-    24,
-    26,
-    27,
-    34,
-    37,
+    FALLARBOR_TENT_MON_LOUDRED,
+    FALLARBOR_TENT_MON_MIGHTYENA,
+    FALLARBOR_TENT_MON_SKARMORY,
+    FALLARBOR_TENT_MON_GOLBAT,
+    FALLARBOR_TENT_MON_GOLDEEN_2,
+    FALLARBOR_TENT_MON_GRAVELER,
     -1
 };
 
-const struct BattleFrontierTrainer gFallarborBattleTentTrainers[] = 
+const struct BattleFrontierTrainer gFallarborBattleTentTrainers[NUM_BATTLE_TENT_TRAINERS] = 
 {
-    [0] = {
+    [FALLARBOR_TENT_TRAINER_AMBER] = {
         .facilityClass = FACILITY_CLASS_AROMA_LADY,
         .trainerName = _("AMBER"),
         .speechBefore = {EC_WORD_I, EC_WORD_HAVE, EC_WORD_TO, EC_WORD_DIET, EC_WORD_EVERY, EC_WORD_DAY},
         .speechWin = {EC_WORD_A, EC_MOVE(NIGHTMARE), EC_WORD_OF, EC_WORD_SWEETS, EC_WORD_SHOCKED, EC_WORD_ME},
         .speechLose = {EC_WORD_IF, EC_WORD_YOU, EC_WORD_GIVE_UP, EC_WORD_YOU, EC_WORD_WILL, EC_WORD_LOSE},
-        .monSets = gFallarborBattleTentTrainerMons_Amber
+        .monSet = gFallarborBattleTentTrainerMons_Amber
     },
-    [1] = {
+    [FALLARBOR_TENT_TRAINER_JAVIER] = {
         .facilityClass = FACILITY_CLASS_RUIN_MANIAC,
         .trainerName = _("JAVIER"),
         .speechBefore = {EC_WORD_I, EC_WORD_NEVER, EC_WORD_EVER, EC_WORD_HAVE, EC_WORD_ENOUGH, EC_WORD_MONEY},
         .speechWin = {EC_WORD_I, EC_WORD_WON, EC_WORD_BUT, EC_WORD_I, EC_WORD_NEED, EC_WORD_MONEY},
         .speechLose = {EC_WORD_I, EC_WORD_NEED, EC_WORD_MONEY, EC_WORD_FOR, EC_WORD_A, EC_WORD_BIKE},
-        .monSets = gFallarborBattleTentTrainerMons_Javier
+        .monSet = gFallarborBattleTentTrainerMons_Javier
     },
-    [2] = {
+    [FALLARBOR_TENT_TRAINER_NATALIA] = {
         .facilityClass = FACILITY_CLASS_TUBER_F,
         .trainerName = _("NATALIE"),
         .speechBefore = {EC_WORD_THE, EC_WORD_WAY, EC_WORD_I, EC_WORD_BATTLE, EC_WORD_IS, EC_WORD_WEIRD},
         .speechWin = {EC_WORD_YOU_RE, EC_WORD_MUCH, EC_WORD_TOO_WEAK, EC_WORD_FOR, EC_WORD_THIS, EC_WORD_PLACE},
         .speechLose = {EC_WORD_GIVE_ME, EC_WORD_AN, EC_WORD_EASY, EC_WORD_MATCH, EC_WORD_NEXT, EC_WORD_TIME},
-        .monSets = gFallarborBattleTentTrainerMons_Natalie
+        .monSet = gFallarborBattleTentTrainerMons_Natalie
     },
-    [3] = {
+    [FALLARBOR_TENT_TRAINER_TREVE] = {
         .facilityClass = FACILITY_CLASS_TUBER_M,
         .trainerName = _("TREVE"),
         .speechBefore = {EC_WORD_LOOK, EC_WORD_AT, EC_WORD_MY, EC_MOVE2(METRONOME), EC_WORD_AND, EC_WORD_SLEEP},
         .speechWin = {EC_WORD_YEAH, EC_WORD_EXCL, EC_MOVE(HYPNOSIS), EC_WORD_IS, EC_WORD_TOTALLY, EC_WORD_GREAT},
         .speechLose = {EC_WORD_MY, EC_MOVE(HYPNOSIS), EC_WORD_DIDN_T, EC_WORD_WORK, EC_WORD_ELLIPSIS, -1},
-        .monSets = gFallarborBattleTentTrainerMons_Treve
+        .monSet = gFallarborBattleTentTrainerMons_Treve
     },
-    [4] = {
+    [FALLARBOR_TENT_TRAINER_ARIANNA] = {
         .facilityClass = FACILITY_CLASS_LADY,
         .trainerName = _("ARIANNA"),
         .speechBefore = {EC_WORD_IF_I_WIN, EC_WORD_GIVE_ME, EC_WORD_POKEMON, EC_WORD_FOR, EC_WORD_MY, EC_WORD_COLLECTION},
         .speechWin = {EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_TOO_WEAK, EC_WORD_TO, EC_WORD_COLLECT},
         .speechLose = {EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_SOMETHING, EC_WORD_ELSE, EC_WORD_ELLIPSIS},
-        .monSets = gFallarborBattleTentTrainerMons_Arianna
+        .monSet = gFallarborBattleTentTrainerMons_Arianna
     },
-    [5] = {
+    [FALLARBOR_TENT_TRAINER_JADYN] = {
         .facilityClass = FACILITY_CLASS_BEAUTY,
         .trainerName = _("JADYN"),
         .speechBefore = {EC_WORD_MY, EC_WORD_NAME, EC_WORD_IS, EC_WORD_REALLY, EC_WORD_A, EC_WORD_MYSTERY},
         .speechWin = {EC_WORD_MY, EC_WORD_NAME, EC_WORD_GOES, EC_WORD_ON, EC_WORD_A, EC_WORD_MYSTERY},
         .speechLose = {EC_WORD_MY, EC_WORD_NAME, EC_WORD_QUES, EC_WORD_I_AM, EC_WORD_YOUR, EC_WORD_MOTHER},
-        .monSets = gFallarborBattleTentTrainerMons_Jadyn
+        .monSet = gFallarborBattleTentTrainerMons_Jadyn
     },
-    [6] = {
+    [FALLARBOR_TENT_TRAINER_GERARDO] = {
         .facilityClass = FACILITY_CLASS_RICH_BOY,
         .trainerName = _("GERARDO"),
         .speechBefore = {EC_WORD_I_AM, EC_WORD_THE, EC_WORD_BEST, EC_WORD_HERO, EC_WORD_EVER, EC_WORD_EXCL},
         .speechWin = {EC_WORD_SEE, EC_WORD_WHAT, EC_WORD_I, EC_WORD_MEAN, EC_WORD_QUES, -1},
         .speechLose = {EC_WORD_HUH_QUES, EC_WORD_YOU, EC_WORD_WERE, EC_WORD_RIGHT, EC_WORD_QUES, -1},
-        .monSets = gFallarborBattleTentTrainerMons_Gerardo
+        .monSet = gFallarborBattleTentTrainerMons_Gerardo
     },
-    [7] = {
+    [FALLARBOR_TENT_TRAINER_JONN] = {
         .facilityClass = FACILITY_CLASS_POKEMANIAC,
         .trainerName = _("JONN"),
         .speechBefore = {EC_WORD_THE, EC_WORD_WORLD, EC_MOVE2(SUPERPOWER), EC_MOVE2(STOMP), EC_WORD_CONTEST, EC_WORD_EXCL_EXCL},
         .speechWin = {EC_WORD_I_AM, EC_WORD_NO_1, EC_WORD_EXCL_EXCL, EC_WORD_HEAR, EC_WORD_ME, EC_MOVE2(ROAR)},
         .speechLose = {EC_WORD_I, EC_WORD_GIVE_UP, EC_WORD_EXCL, EC_WORD_YOU_RE, EC_WORD_NO_1, EC_WORD_EXCL},
-        .monSets = gFallarborBattleTentTrainerMons_Jonn
+        .monSet = gFallarborBattleTentTrainerMons_Jonn
     },
-    [8] = {
+    [FALLARBOR_TENT_TRAINER_ESTEBAN] = {
         .facilityClass = FACILITY_CLASS_SWIMMER_M,
         .trainerName = _("ESTEBAN"),
         .speechBefore = {EC_WORD_YOU_RE, EC_WORD_A, EC_WORD_GOOD, EC_WORD_TRAINER, EC_WORD_QUES, EC_WORD_UNBELIEVABLE},
         .speechWin = {EC_WORD_YOU_RE, EC_WORD_SOME, EC_WORD_PUSHOVER, EC_WORD_OF, EC_WORD_A, EC_WORD_TRAINER},
         .speechLose = {EC_WORD_YOU_RE, EC_WORD_MUCH, EC_WORD_TOO, EC_WORD_MUCH, EC_WORD_FOR, EC_WORD_ME},
-        .monSets = gFallarborBattleTentTrainerMons_Esteban
+        .monSet = gFallarborBattleTentTrainerMons_Esteban
     },
-    [9] = {
+    [FALLARBOR_TENT_TRAINER_JAMESON] = {
         .facilityClass = FACILITY_CLASS_CAMPER,
         .trainerName = _("JAMESON"),
         .speechBefore = {EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_SILKY, EC_WORD_SMOOTH, EC_WORD_EXCL},
         .speechWin = {EC_WORD_MY, EC_WORD_SILKY, EC_WORD_SMOOTH, EC_WORD_POKEMON, EC_WORD_RULE, EC_WORD_EXCL},
         .speechLose = {EC_WORD_MY, EC_WORD_POKEMON, EC_MOVE2(STRUGGLE), EC_WORD_IN, EC_WORD_YOUR, EC_WORD_STICKY_HOLD},
-        .monSets = gFallarborBattleTentTrainerMons_Jameson
+        .monSet = gFallarborBattleTentTrainerMons_Jameson
     },
-    [10] = {
+    [FALLARBOR_TENT_TRAINER_ALANZO] = {
         .facilityClass = FACILITY_CLASS_BUG_MANIAC,
         .trainerName = _("ALANZO"),
         .speechBefore = {EC_MOVE2(FORESIGHT), EC_WORD_IS, EC_WORD_A, EC_WORD_POWER, EC_WORD_I, EC_WORD_HAVE},
         .speechWin = {EC_WORD_YOU_RE, EC_WORD_OBLIVIOUS, EC_WORD_ABOUT, EC_MOVE2(FORESIGHT), EC_WORD_EXCL, -1},
         .speechLose = {EC_WORD_MY, EC_MOVE2(FORESIGHT), EC_WORD_IS, EC_WORD_ALWAYS, EC_WORD_RIGHT, EC_WORD_EXCL},
-        .monSets = gFallarborBattleTentTrainerMons_Alanzo
+        .monSet = gFallarborBattleTentTrainerMons_Alanzo
     },
-    [11] = {
+    [FALLARBOR_TENT_TRAINER_HOWARD] = {
         .facilityClass = FACILITY_CLASS_GENTLEMAN,
         .trainerName = _("HOWARD"),
         .speechBefore = {EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_CAN_T, EC_WORD_BEAT, EC_WORD_ME, -1},
         .speechWin = {EC_WORD_YOU, EC_WORD_COULDN_T, EC_WORD_WIN, EC_WORD_COULD, EC_WORD_YOU, EC_WORD_QUES},
         .speechLose = {EC_WORD_YOU, EC_WORD_WOULD, EC_WORD_GO, EC_WORD_ALL, EC_WORD_OUT, EC_WORD_ELLIPSIS},
-        .monSets = gFallarborBattleTentTrainerMons_Howard
+        .monSet = gFallarborBattleTentTrainerMons_Howard
     },
-    [12] = {
+    [FALLARBOR_TENT_TRAINER_CONRAD] = {
         .facilityClass = FACILITY_CLASS_GUITARIST,
         .trainerName = _("CONRAD"),
         .speechBefore = {EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_PRETTY, EC_WORD_WILD, EC_WORD_EXCL},
         .speechWin = {EC_WORD_WHOAH, EC_WORD_EXCL_EXCL, -1, EC_WORD_LET_S, EC_WORD_DANCE, EC_WORD_EXCL},
         .speechLose = {EC_WORD_MY, EC_WORD_MUSIC, EC_WORD_WILL, EC_WORD_PLAY, EC_WORD_ON, EC_WORD_ELLIPSIS},
-        .monSets = gFallarborBattleTentTrainerMons_Conrad
+        .monSet = gFallarborBattleTentTrainerMons_Conrad
     },
-    [13] = {
+    [FALLARBOR_TENT_TRAINER_MAKENNA] = {
         .facilityClass = FACILITY_CLASS_SCHOOL_KID_F,
         .trainerName = _("MAKENNA"),
         .speechBefore = {EC_WORD_SHOW, EC_WORD_ME, EC_WORD_THAT, EC_WORD_YOU, EC_WORD_MEAN, EC_WORD_IT},
         .speechWin = {EC_WORD_THAT_S, EC_WORD_WHY, EC_WORD_I, EC_WORD_STUDY, EC_WORD_EVERY, EC_WORD_DAY},
         .speechLose = {EC_WORD_AWW, EC_WORD_I, EC_WORD_STUDY, EC_WORD_EVERY, EC_WORD_DAY, EC_WORD_TOO},
-        .monSets = gFallarborBattleTentTrainerMons_Makenna
+        .monSet = gFallarborBattleTentTrainerMons_Makenna
     },
-    [14] = {
+    [FALLARBOR_TENT_TRAINER_BRAYAN] = {
         .facilityClass = FACILITY_CLASS_COOLTRAINER_M,
         .trainerName = _("BRAYAN"),
         .speechBefore = {EC_WORD_CAN, EC_WORD_YOU, EC_WORD_SEE, EC_WORD_MY, EC_WORD_POWER, EC_WORD_QUES},
         .speechWin = {EC_WORD_HOW, EC_WORD_BORING, EC_WORD_ELLIPSIS, EC_WORD_THIS, EC_WORD_IS, EC_WORD_GOOD_BYE},
         .speechLose = {EC_WORD_AM, EC_WORD_I, EC_WORD_THE, EC_WORD_WEAK, EC_WORD_TRAINER, EC_WORD_QUES},
-        .monSets = gFallarborBattleTentTrainerMons_Brayan
+        .monSet = gFallarborBattleTentTrainerMons_Brayan
     },
-    [15] = {
+    [FALLARBOR_TENT_TRAINER_MARIANA] = {
         .facilityClass = FACILITY_CLASS_COOLTRAINER_F,
         .trainerName = _("MARIANA"),
         .speechBefore = {EC_WORD_A, EC_WORD_LIE, EC_WORD_CAN, EC_WORD_BE, EC_WORD_KIND, EC_WORD_ELLIPSIS},
         .speechWin = {EC_WORD_THIS, EC_WORD_IS, EC_WORD_LIKE, EC_WORD_THE, EC_WORD_SUNDAY, EC_WORD_COMICS},
         .speechLose = {EC_WORD_THIS, EC_WORD_IS, EC_WORD_LIKE, EC_WORD_FROM, EC_WORD_A, EC_WORD_MOVIE},
-        .monSets = gFallarborBattleTentTrainerMons_Mariana
+        .monSet = gFallarborBattleTentTrainerMons_Mariana
     },
-    [16] = {
+    [FALLARBOR_TENT_TRAINER_SHELDON] = {
         .facilityClass = FACILITY_CLASS_POKEFAN_M,
         .trainerName = _("SHELDON"),
         .speechBefore = {EC_WORD_A, EC_WORD_POKEMON, EC_WORD_TEACHER, EC_WORD_GETS, EC_WORD_NO, EC_MOVE2(REST)},
         .speechWin = {EC_WORD_MY, EC_WORD_SMARTNESS, EC_WORD_GETS, EC_WORD_ME, EC_WORD_EASY, EC_WORD_WINS},
         .speechLose = {EC_WORD_I, EC_WORD_HAVE, EC_WORD_TO, EC_WORD_GO, EC_WORD_WORK, EC_WORD_BYE_BYE},
-        .monSets = gFallarborBattleTentTrainerMons_Sheldon
+        .monSet = gFallarborBattleTentTrainerMons_Sheldon
     },
-    [17] = {
+    [FALLARBOR_TENT_TRAINER_GIANNA] = {
         .facilityClass = FACILITY_CLASS_POKEFAN_F,
         .trainerName = _("GIANNA"),
         .speechBefore = {EC_WORD_AHAHA, EC_WORD_YES, EC_WORD_EXCL, EC_WORD_LOVEY_DOVEY, EC_WORD_POKEMON, EC_WORD_WORLD},
         .speechWin = {EC_WORD_MY, EC_WORD_SHINE, EC_WORD_IS, EC_WORD_MAKING, EC_WORD_THINGS, EC_WORD_BETTER},
         .speechLose = {EC_WORD_DO, EC_WORD_YOU, EC_WORD_DISLIKE, EC_WORD_POKEMON, EC_WORD_QUES, -1},
-        .monSets = gFallarborBattleTentTrainerMons_Gianna
+        .monSet = gFallarborBattleTentTrainerMons_Gianna
     },
-    [18] = {
+    [FALLARBOR_TENT_TRAINER_YAHIR] = {
         .facilityClass = FACILITY_CLASS_EXPERT_M,
         .trainerName = _("YAHIR"),
         .speechBefore = {EC_WORD_YOU, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_COME_ON, EC_WORD_EXCL},
         .speechWin = {EC_WORD_YOU, EC_WORD_NEED, EC_WORD_TO, EC_WORD_TRAIN, EC_WORD_A_LOT, EC_WORD_MORE},
         .speechLose = {EC_WORD_NOT, EC_WORD_ENOUGH, EC_WORD_ELLIPSIS, EC_WORD_JUST, EC_WORD_NOT, EC_WORD_ENOUGH},
-        .monSets = gFallarborBattleTentTrainerMons_Yahir
+        .monSet = gFallarborBattleTentTrainerMons_Yahir
     },
-    [19] = {
+    [FALLARBOR_TENT_TRAINER_BRITNEY] = {
         .facilityClass = FACILITY_CLASS_EXPERT_F,
         .trainerName = _("BRITNEY"),
         .speechBefore = {EC_WORD_IT, EC_WORD_SEEMS, EC_WORD_THAT, EC_WORD_YOU_RE, EC_WORD_QUITE, EC_WORD_GOOD},
         .speechWin = {EC_WORD_YOU_RE, EC_WORD_A, EC_WORD_LUKEWARM, EC_WORD_TALENT, EC_WORD_AT, EC_WORD_BEST},
         .speechLose = {EC_WORD_YOU_RE, EC_WORD_A, EC_WORD_COOL, EC_WORD_HERO, EC_WORD_AT, EC_WORD_THIS},
-        .monSets = gFallarborBattleTentTrainerMons_Britney
+        .monSet = gFallarborBattleTentTrainerMons_Britney
     },
-    [20] = {
+    [FALLARBOR_TENT_TRAINER_HECTER] = {
         .facilityClass = FACILITY_CLASS_YOUNGSTER,
         .trainerName = _("HECTER"),
         .speechBefore = {EC_WORD_MY, EC_MOVE2(HIDDEN_POWER), EC_WORD_IS, EC_WORD_EXCITING, EC_WORD_ME, EC_WORD_EXCL},
         .speechWin = {EC_WORD_YEEHAW_EXCL, EC_WORD_LET_S, EC_WORD_HAVE, EC_WORD_A, EC_MOVE2(HIDDEN_POWER), EC_WORD_PARTY},
         .speechLose = {EC_WORD_WAAAH, EC_WORD_EXCL, EC_WORD_DON_T, EC_WORD_YOU, EC_MOVE2(MIMIC), EC_WORD_ME},
-        .monSets = gFallarborBattleTentTrainerMons_Hecter
+        .monSet = gFallarborBattleTentTrainerMons_Hecter
     },
-    [21] = {
+    [FALLARBOR_TENT_TRAINER_TANNOR] = {
         .facilityClass = FACILITY_CLASS_FISHERMAN,
         .trainerName = _("TANNOR"),
         .speechBefore = {EC_WORD_YOU, EC_WORD_HAVE, EC_WORD_GOT, EC_WORD_TO, EC_WORD_BE, EC_WORD_JOKING},
         .speechWin = {EC_WORD_YOU_RE, EC_WORD_THE, EC_WORD_BEST, EC_WORD_AT, EC_WORD_BEING, EC_WORD_FUNNY},
         .speechLose = {EC_WORD_YOU, EC_WORD_WEREN_T, EC_WORD_BEING, EC_WORD_FUNNY, EC_WORD_AT, EC_WORD_ALL},
-        .monSets = gFallarborBattleTentTrainerMons_Tannor
+        .monSet = gFallarborBattleTentTrainerMons_Tannor
     },
-    [22] = {
+    [FALLARBOR_TENT_TRAINER_BENJI] = {
         .facilityClass = FACILITY_CLASS_BIRD_KEEPER,
         .trainerName = _("BENJI"),
         .speechBefore = {EC_WORD_YOU, EC_WORD_DON_T, EC_WORD_THINK, EC_WORD_VERY, EC_WORD_FAST, EC_WORD_HUH_QUES},
         .speechWin = {EC_WORD_SORRY, EC_WORD_EXCL, EC_WORD_I, EC_WORD_DIDN_T, EC_WORD_MEAN, EC_WORD_YOU},
         .speechLose = {EC_WORD_YOU, EC_WORD_LEFT, EC_WORD_ME, EC_WORD_FEELING, EC_WORD_SAD, EC_WORD_ELLIPSIS},
-        .monSets = gFallarborBattleTentTrainerMons_Benji
+        .monSet = gFallarborBattleTentTrainerMons_Benji
     },
-    [23] = {
+    [FALLARBOR_TENT_TRAINER_RORY] = {
         .facilityClass = FACILITY_CLASS_NINJA_BOY,
         .trainerName = _("RORY"),
         .speechBefore = {EC_WORD_DON_T, EC_WORD_CAUSE, EC_WORD_AN, EC_MOVE(UPROAR), EC_WORD_YOU, EC_WORD_EXCL},
         .speechWin = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_NEED, EC_WORD_AN, EC_MOVE(UPROAR), EC_WORD_EXCL},
         .speechLose = {EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_TO, EC_WORD_CAUSE, EC_WORD_AN, EC_MOVE(UPROAR)},
-        .monSets = gFallarborBattleTentTrainerMons_Rory
+        .monSet = gFallarborBattleTentTrainerMons_Rory
     },
-    [24] = {
+    [FALLARBOR_TENT_TRAINER_ELEANOR] = {
         .facilityClass = FACILITY_CLASS_PARASOL_LADY,
         .trainerName = _("ELEANOR"),
         .speechBefore = {EC_WORD_I, EC_WORD_REALLY, EC_WORD_WANT, EC_WORD_TO, EC_WORD_PARTY, -1},
         .speechWin = {EC_WORD_A, EC_WORD_TRENDY, EC_WORD_PARTY, EC_WORD_WOULD, EC_WORD_BE, EC_WORD_REFRESHING},
         .speechLose = {EC_WORD_DON_T, EC_WORD_YOU, EC_WORD_LIKE, EC_WORD_TO, EC_WORD_PARTY, EC_WORD_QUES},
-        .monSets = gFallarborBattleTentTrainerMons_Eleanor
+        .monSet = gFallarborBattleTentTrainerMons_Eleanor
     },
-    [25] = {
+    [FALLARBOR_TENT_TRAINER_EVELYN] = {
         .facilityClass = FACILITY_CLASS_SWIMMER_F,
         .trainerName = _("EVELYN"),
         .speechBefore = {EC_WORD_MY, EC_WORD_PC, EC_WORD_IS, EC_WORD_MY, EC_WORD_SECRET_BASE, EC_WORD_EXCL},
         .speechWin = {EC_WORD_IT_S, EC_WORD_ALL, EC_WORD_SECRET, EC_WORD_ON, EC_WORD_MY, EC_WORD_PC},
         .speechLose = {EC_WORD_NO, EC_WORD_EXCL, -1, EC_WORD_I, EC_WORD_REJECT, EC_WORD_THIS},
-        .monSets = gFallarborBattleTentTrainerMons_Evelyn
+        .monSet = gFallarborBattleTentTrainerMons_Evelyn
     },
-    [26] = {
+    [FALLARBOR_TENT_TRAINER_ARIELLE] = {
         .facilityClass = FACILITY_CLASS_PICNICKER,
         .trainerName = _("ARIELLE"),
         .speechBefore = {EC_WORD_IT_S, EC_WORD_NOT_VERY, EC_WORD_PRETTY, EC_WORD_BUT, EC_WORD_I, EC_WORD_TRY},
         .speechWin = {EC_WORD_WE_RE, EC_WORD_NOT_VERY, EC_WORD_PRETTY, EC_WORD_BUT, EC_WORD_WE_RE, EC_WORD_GREAT},
         .speechLose = {EC_WORD_THAT_WAS, EC_WORD_PRETTY, EC_WORD_MEAN, EC_WORD_OF, EC_WORD_YOU, EC_WORD_EXCL},
-        .monSets = gFallarborBattleTentTrainerMons_Arielle
+        .monSet = gFallarborBattleTentTrainerMons_Arielle
     },
-    [27] = {
+    [FALLARBOR_TENT_TRAINER_CONNAR] = {
         .facilityClass = FACILITY_CLASS_SAILOR,
         .trainerName = _("CONNAR"),
         .speechBefore = {EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_STRONG, EC_WORD_ENOUGH, EC_WORD_FOR, EC_WORD_THIS},
         .speechWin = {EC_WORD_DO, EC_WORD_YOU, EC_WORD_THINK, EC_WORD_YOU_RE, EC_WORD_OK_QUES, -1},
         .speechLose = {EC_WORD_GOOD_BYE, EC_WORD_AND, EC_WORD_THANK_YOU, -1, -1, -1},
-        .monSets = gFallarborBattleTentTrainerMons_Connar
+        .monSet = gFallarborBattleTentTrainerMons_Connar
     },
-    [28] = {
+    [FALLARBOR_TENT_TRAINER_MAURICE] = {
         .facilityClass = FACILITY_CLASS_COLLECTOR,
         .trainerName = _("MAURICE"),
         .speechBefore = {EC_WORD_THERE, EC_WORD_IS, EC_WORD_NO, EC_WORD_RADIO, EC_WORD_OR, EC_WORD_TELEVISION},
         .speechWin = {EC_WORD_BUT, EC_WORD_THERE, EC_WORD_IS, EC_WORD_A_LOT, EC_WORD_OF, EC_WORD_POKEMON},
         .speechLose = {EC_WORD_I, EC_WORD_CAN_T, EC_WORD_ENJOY, EC_WORD_MYSELF, EC_WORD_WITHOUT, EC_WORD_MONEY},
-        .monSets = gFallarborBattleTentTrainerMons_Maurice
+        .monSet = gFallarborBattleTentTrainerMons_Maurice
     },
-    [29] = {
+    [FALLARBOR_TENT_TRAINER_KIANNA] = {
         .facilityClass = FACILITY_CLASS_LASS,
         .trainerName = _("KIANNA"),
         .speechBefore = {EC_WORD_I, EC_WORD_WANT, EC_WORD_TO, EC_WORD_GO, EC_WORD_DEPT_STORE, EC_WORD_SHOPPING},
         .speechWin = {EC_WORD_I, EC_WORD_DISLIKE, EC_WORD_SHOPPING, EC_WORD_ALONE, -1, -1},
         .speechLose = {EC_WORD_WANT, EC_WORD_TO, EC_WORD_GO, EC_WORD_SHOPPING, EC_WORD_TOGETHER, EC_WORD_QUES},
-        .monSets = gFallarborBattleTentTrainerMons_Kianna
+        .monSet = gFallarborBattleTentTrainerMons_Kianna
     }
 };
 
-const struct FacilityMon gFallarborBattleTentMons[] = 
+const struct FacilityMon gFallarborBattleTentMons[NUM_FALLARBOR_TENT_MONS] = 
 {
-    [0] = {
+    [FALLARBOR_TENT_MON_NUMEL] = {
         .species = SPECIES_NUMEL,
         .moves = {MOVE_GROWL, MOVE_FLAMETHROWER, MOVE_TACKLE, MOVE_SUNNY_DAY},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHARCOAL,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_QUIET
     },
-    [1] = {
+    [FALLARBOR_TENT_MON_LINOONE_1] = {
         .species = SPECIES_LINOONE,
         .moves = {MOVE_ODOR_SLEUTH, MOVE_COVET, MOVE_ROCK_SMASH, MOVE_CHARM},
         .itemTableId = BATTLE_FRONTIER_ITEM_SILK_SCARF,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_SASSY
     },
-    [2] = {
+    [FALLARBOR_TENT_MON_PLUSLE] = {
         .species = SPECIES_PLUSLE,
         .moves = {MOVE_SPARK, MOVE_GROWL, MOVE_QUICK_ATTACK, MOVE_FAKE_TEARS},
         .itemTableId = BATTLE_FRONTIER_ITEM_MENTAL_HERB,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [3] = {
+    [FALLARBOR_TENT_MON_POOCHYENA] = {
         .species = SPECIES_POOCHYENA,
         .moves = {MOVE_YAWN, MOVE_ODOR_SLEUTH, MOVE_HOWL, MOVE_FRUSTRATION},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEPPA_BERRY,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_NAUGHTY
     },
-    [4] = {
+    [FALLARBOR_TENT_MON_KECLEON] = {
         .species = SPECIES_KECLEON,
         .moves = {MOVE_LICK, MOVE_SLASH, MOVE_FAINT_ATTACK, MOVE_PSYBEAM},
         .itemTableId = BATTLE_FRONTIER_ITEM_WIKI_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_MODEST
     },
-    [5] = {
+    [FALLARBOR_TENT_MON_MAGIKARP] = {
         .species = SPECIES_MAGIKARP,
         .moves = {MOVE_SPLASH, MOVE_TACKLE, MOVE_FLAIL, MOVE_NONE},
         .itemTableId = BATTLE_FRONTIER_ITEM_DRAGON_SCALE,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_QUIRKY
     },
-    [6] = {
+    [FALLARBOR_TENT_MON_SOLROCK] = {
         .species = SPECIES_SOLROCK,
         .moves = {MOVE_ROCK_THROW, MOVE_FLASH, MOVE_SANDSTORM, MOVE_PSYWAVE},
         .itemTableId = BATTLE_FRONTIER_ITEM_HARD_STONE,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_SASSY
     },
-    [7] = {
+    [FALLARBOR_TENT_MON_MAKUHITA] = {
         .species = SPECIES_MAKUHITA,
         .moves = {MOVE_DETECT, MOVE_ARM_THRUST, MOVE_FAKE_OUT, MOVE_SMELLING_SALT},
         .itemTableId = BATTLE_FRONTIER_ITEM_BLACK_BELT,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [8] = {
+    [FALLARBOR_TENT_MON_MACHOKE] = {
         .species = SPECIES_MACHOKE,
         .moves = {MOVE_COUNTER, MOVE_REVENGE, MOVE_BULK_UP, MOVE_FOCUS_ENERGY},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_NAIVE
     },
-    [9] = {
+    [FALLARBOR_TENT_MON_NINCADA] = {
         .species = SPECIES_NINCADA,
         .moves = {MOVE_FURY_SWIPES, MOVE_ENDURE, MOVE_MUD_SLAP, MOVE_DIG},
         .itemTableId = BATTLE_FRONTIER_ITEM_LUM_BERRY,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_SERIOUS
     },
-    [10] = {
+    [FALLARBOR_TENT_MON_BEAUTIFLY] = {
         .species = SPECIES_BEAUTIFLY,
         .moves = {MOVE_FLASH, MOVE_MORNING_SUN, MOVE_HARDEN, MOVE_MEGA_DRAIN},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_QUIRKY
     },
-    [11] = {
+    [FALLARBOR_TENT_MON_DUSTOX] = {
         .species = SPECIES_DUSTOX,
         .moves = {MOVE_MOONLIGHT, MOVE_HARDEN, MOVE_POISON_STING, MOVE_PSYBEAM},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE,
         .nature = NATURE_DOCILE
     },
-    [12] = {
+    [FALLARBOR_TENT_MON_ILLUMISE] = {
         .species = SPECIES_ILLUMISE,
         .moves = {MOVE_METRONOME, MOVE_FLATTER, MOVE_WISH, MOVE_ATTRACT},
         .itemTableId = BATTLE_FRONTIER_ITEM_SALAC_BERRY,
         .evSpread = F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [13] = {
+    [FALLARBOR_TENT_MON_VOLBEAT] = {
         .species = SPECIES_VOLBEAT,
         .moves = {MOVE_TACKLE, MOVE_MOONLIGHT, MOVE_SIGNAL_BEAM, MOVE_TAIL_GLOW},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEPPA_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [14] = {
+    [FALLARBOR_TENT_MON_NINJASK_1] = {
         .species = SPECIES_NINJASK,
         .moves = {MOVE_DOUBLE_TEAM, MOVE_PROTECT, MOVE_DIG, MOVE_SAND_ATTACK},
         .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_TIMID
     },
-    [15] = {
+    [FALLARBOR_TENT_MON_NINJASK_2] = {
         .species = SPECIES_NINJASK,
         .moves = {MOVE_SWORDS_DANCE, MOVE_CUT, MOVE_FURY_CUTTER, MOVE_LEECH_LIFE},
         .itemTableId = BATTLE_FRONTIER_ITEM_SILVER_POWDER,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [16] = {
+    [FALLARBOR_TENT_MON_ARON_1] = {
         .species = SPECIES_ARON,
         .moves = {MOVE_METAL_CLAW, MOVE_PROTECT, MOVE_SHOCK_WAVE, MOVE_METAL_SOUND},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_LONELY
     },
-    [17] = {
+    [FALLARBOR_TENT_MON_ARON_2] = {
         .species = SPECIES_ARON,
         .moves = {MOVE_SECRET_POWER, MOVE_METAL_CLAW, MOVE_IRON_DEFENSE, MOVE_MUD_SLAP},
         .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_GENTLE
     },
-    [18] = {
+    [FALLARBOR_TENT_MON_ELECTRIKE] = {
         .species = SPECIES_ELECTRIKE,
         .moves = {MOVE_CRUNCH, MOVE_THUNDER_WAVE, MOVE_HOWL, MOVE_QUICK_ATTACK},
         .itemTableId = BATTLE_FRONTIER_ITEM_SEA_INCENSE,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_HASTY
     },
-    [19] = {
+    [FALLARBOR_TENT_MON_MAGNEMITE] = {
         .species = SPECIES_MAGNEMITE,
         .moves = {MOVE_THUNDER_WAVE, MOVE_SUPERSONIC, MOVE_ENDURE, MOVE_SPARK},
         .itemTableId = BATTLE_FRONTIER_ITEM_MAGNET,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_QUIET
     },
-    [20] = {
+    [FALLARBOR_TENT_MON_VOLTORB] = {
         .species = SPECIES_VOLTORB,
         .moves = {MOVE_CHARGE, MOVE_SPARK, MOVE_SCREECH, MOVE_SONIC_BOOM},
         .itemTableId = BATTLE_FRONTIER_ITEM_ASPEAR_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [21] = {
+    [FALLARBOR_TENT_MON_WHISMUR] = {
         .species = SPECIES_WHISMUR,
         .moves = {MOVE_REST, MOVE_SLEEP_TALK, MOVE_HYPER_VOICE, MOVE_ATTRACT},
         .itemTableId = BATTLE_FRONTIER_ITEM_LAX_INCENSE,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [22] = {
+    [FALLARBOR_TENT_MON_LOUDRED] = {
         .species = SPECIES_LOUDRED,
         .moves = {MOVE_STOMP, MOVE_REST, MOVE_SCREECH, MOVE_UPROAR},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [23] = {
+    [FALLARBOR_TENT_MON_LINOONE_2] = {
         .species = SPECIES_LINOONE,
         .moves = {MOVE_FURY_SWIPES, MOVE_SAND_ATTACK, MOVE_SHOCK_WAVE, MOVE_GROWL},
         .itemTableId = BATTLE_FRONTIER_ITEM_MAGNET,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_MODEST
     },
-    [24] = {
+    [FALLARBOR_TENT_MON_MIGHTYENA] = {
         .species = SPECIES_MIGHTYENA,
         .moves = {MOVE_SAND_ATTACK, MOVE_HOWL, MOVE_SWAGGER, MOVE_SECRET_POWER},
         .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_JOLLY
     },
-    [25] = {
+    [FALLARBOR_TENT_MON_SWABLU] = {
         .species = SPECIES_SWABLU,
         .moves = {MOVE_TAKE_DOWN, MOVE_SING, MOVE_GROWL, MOVE_SAFEGUARD},
         .itemTableId = BATTLE_FRONTIER_ITEM_FOCUS_BAND,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_QUIRKY
     },
-    [26] = {
+    [FALLARBOR_TENT_MON_SKARMORY] = {
         .species = SPECIES_SKARMORY,
         .moves = {MOVE_AGILITY, MOVE_STEEL_WING, MOVE_SAND_ATTACK, MOVE_TORMENT},
         .itemTableId = BATTLE_FRONTIER_ITEM_METAL_COAT,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_BOLD
     },
-    [27] = {
+    [FALLARBOR_TENT_MON_GOLBAT] = {
         .species = SPECIES_GOLBAT,
         .moves = {MOVE_CONFUSE_RAY, MOVE_BITE, MOVE_DOUBLE_TEAM, MOVE_SUBSTITUTE},
         .itemTableId = BATTLE_FRONTIER_ITEM_PETAYA_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_BOLD
     },
-    [28] = {
+    [FALLARBOR_TENT_MON_WINGULL] = {
         .species = SPECIES_WINGULL,
         .moves = {MOVE_WING_ATTACK, MOVE_HAIL, MOVE_DOUBLE_TEAM, MOVE_SUPERSONIC},
         .itemTableId = BATTLE_FRONTIER_ITEM_RAWST_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED,
         .nature = NATURE_MODEST
     },
-    [29] = {
+    [FALLARBOR_TENT_MON_PELIPPER] = {
         .species = SPECIES_PELIPPER,
         .moves = {MOVE_TWISTER, MOVE_ICY_WIND, MOVE_DOUBLE_TEAM, MOVE_WATER_GUN},
         .itemTableId = BATTLE_FRONTIER_ITEM_DRAGON_FANG,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [30] = {
+    [FALLARBOR_TENT_MON_BARBOACH] = {
         .species = SPECIES_BARBOACH,
         .moves = {MOVE_SPARK, MOVE_WATER_GUN, MOVE_EARTHQUAKE, MOVE_WATER_SPORT},
         .itemTableId = BATTLE_FRONTIER_ITEM_LIECHI_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_MODEST
     },
-    [31] = {
+    [FALLARBOR_TENT_MON_WAILMER] = {
         .species = SPECIES_WAILMER,
         .moves = {MOVE_WATER_PULSE, MOVE_RAIN_DANCE, MOVE_SPLASH, MOVE_CURSE},
         .itemTableId = BATTLE_FRONTIER_ITEM_KINGS_ROCK,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_QUIET
     },
-    [32] = {
+    [FALLARBOR_TENT_MON_MARILL] = {
         .species = SPECIES_MARILL,
         .moves = {MOVE_DEFENSE_CURL, MOVE_ROLLOUT, MOVE_BUBBLE_BEAM, MOVE_ATTRACT},
         .itemTableId = BATTLE_FRONTIER_ITEM_HARD_STONE,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [33] = {
+    [FALLARBOR_TENT_MON_GOLDEEN_1] = {
         .species = SPECIES_GOLDEEN,
         .moves = {MOVE_WATERFALL, MOVE_RAIN_DANCE, MOVE_FLAIL, MOVE_PROTECT},
         .itemTableId = BATTLE_FRONTIER_ITEM_GANLON_BERRY,
         .evSpread = F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK,
         .nature = NATURE_HASTY
     },
-    [34] = {
+    [FALLARBOR_TENT_MON_GOLDEEN_2] = {
         .species = SPECIES_GOLDEEN,
         .moves = {MOVE_SLEEP_TALK, MOVE_HORN_DRILL, MOVE_REST, MOVE_SUPERSONIC},
         .itemTableId = BATTLE_FRONTIER_ITEM_MENTAL_HERB,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_CAREFUL
     },
-    [35] = {
+    [FALLARBOR_TENT_MON_TRAPINCH] = {
         .species = SPECIES_TRAPINCH,
         .moves = {MOVE_RETURN, MOVE_SAND_ATTACK, MOVE_ATTRACT, MOVE_STRENGTH},
         .itemTableId = BATTLE_FRONTIER_ITEM_MAGO_BERRY,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [36] = {
+    [FALLARBOR_TENT_MON_BALTOY] = {
         .species = SPECIES_BALTOY,
         .moves = {MOVE_SELF_DESTRUCT, MOVE_SANDSTORM, MOVE_RAPID_SPIN, MOVE_MIMIC},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_JOLLY
     },
-    [37] = {
+    [FALLARBOR_TENT_MON_GRAVELER] = {
         .species = SPECIES_GRAVELER,
         .moves = {MOVE_ROCK_BLAST, MOVE_DEFENSE_CURL, MOVE_MAGNITUDE, MOVE_MUD_SPORT},
         .itemTableId = BATTLE_FRONTIER_ITEM_HARD_STONE,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_ADAMANT
     },
-    [38] = {
+    [FALLARBOR_TENT_MON_SANDSHREW] = {
         .species = SPECIES_SANDSHREW,
         .moves = {MOVE_SAND_TOMB, MOVE_SANDSTORM, MOVE_DOUBLE_TEAM, MOVE_FOCUS_PUNCH},
         .itemTableId = BATTLE_FRONTIER_ITEM_SOFT_SAND,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_JOLLY
     },
-    [39] = {
+    [FALLARBOR_TENT_MON_SWALOT] = {
         .species = SPECIES_SWALOT,
         .moves = {MOVE_YAWN, MOVE_ENCORE, MOVE_BULLET_SEED, MOVE_SLUDGE},
         .itemTableId = BATTLE_FRONTIER_ITEM_SCOPE_LENS,
         .evSpread = F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP,
         .nature = NATURE_BRAVE
     },
-    [40] = {
+    [FALLARBOR_TENT_MON_SHROOMISH] = {
         .species = SPECIES_SHROOMISH,
         .moves = {MOVE_HEADBUTT, MOVE_SPORE, MOVE_SWAGGER, MOVE_LEECH_SEED},
         .itemTableId = BATTLE_FRONTIER_ITEM_QUICK_CLAW,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_IMPISH
     },
-    [41] = {
+    [FALLARBOR_TENT_MON_KIRLIA] = {
         .species = SPECIES_KIRLIA,
         .moves = {MOVE_HYPNOSIS, MOVE_GROWL, MOVE_ATTRACT, MOVE_DREAM_EATER},
         .itemTableId = BATTLE_FRONTIER_ITEM_SITRUS_BERRY,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [42] = {
+    [FALLARBOR_TENT_MON_LOMBRE] = {
         .species = SPECIES_LOMBRE,
         .moves = {MOVE_NATURE_POWER, MOVE_WATER_GUN, MOVE_RAIN_DANCE, MOVE_FLASH},
         .itemTableId = BATTLE_FRONTIER_ITEM_LEFTOVERS,
         .evSpread = F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP,
         .nature = NATURE_BASHFUL
     },
-    [43] = {
+    [FALLARBOR_TENT_MON_NUZLEAF] = {
         .species = SPECIES_NUZLEAF,
         .moves = {MOVE_NATURE_POWER, MOVE_TORMENT, MOVE_SWAGGER, MOVE_REST},
         .itemTableId = BATTLE_FRONTIER_ITEM_CHESTO_BERRY,
         .evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
         .nature = NATURE_ADAMANT
     },
-    [44] = {
+    [FALLARBOR_TENT_MON_CACNEA] = {
         .species = SPECIES_CACNEA,
         .moves = {MOVE_SANDSTORM, MOVE_NEEDLE_ARM, MOVE_TEETER_DANCE, MOVE_LEECH_SEED},
         .itemTableId = BATTLE_FRONTIER_ITEM_BRIGHT_POWDER,
diff --git a/src/data/battle_frontier/trainer_hill.h b/src/data/battle_frontier/trainer_hill.h
index 54d49422a..cfd5dd994 100644
--- a/src/data/battle_frontier/trainer_hill.h
+++ b/src/data/battle_frontier/trainer_hill.h
@@ -1,16 +1,17 @@
 #define TRAINER_HILL_OTID 0x10000000
 
-static const struct TrHillTag gUnknown_0862609C = {
-    .unkField_0 = 4,
+static const struct TrHillTag sDataTagJPDefault = {
+    .numTrainers = NUM_TRAINER_HILL_TRAINERS_JP,
     .unused1 = 1,
-    .numFloors = 2,
+    .numFloors = NUM_TRAINER_HILL_FLOORS_JP,
     .checksum = 0x0
 };
 
-static const struct TrHillFloor gUnknown_0862609C_floors[] = {
+
+static const struct TrHillFloor sDataTagJPDefault_Floors[] = {
     [0] = {
-        .unk0 = 0,
-        .unk1 = 0,
+        .trainerNum1 = 0,
+        .trainerNum2 = 0,
         .trainers = {
             [0] = {
                 .name = __("シゲノブ$$$$   "),
@@ -33,7 +34,7 @@ static const struct TrHillFloor gUnknown_0862609C_floors[] = {
                         .speedEV = 100,
                         .spAttackEV = 0,
                         .spDefenseEV = 100,
-                        .otId = 0x10000000,
+                        .otId = TRAINER_HILL_OTID,
                         .hpIV = 5,
                         .attackIV = 5,
                         .defenseIV = 5,
@@ -57,7 +58,7 @@ static const struct TrHillFloor gUnknown_0862609C_floors[] = {
                         .speedEV = 0,
                         .spAttackEV = 150,
                         .spDefenseEV = 120,
-                        .otId = 0x10000000,
+                        .otId = TRAINER_HILL_OTID,
                         .hpIV = 5,
                         .attackIV = 5,
                         .defenseIV = 5,
@@ -81,7 +82,7 @@ static const struct TrHillFloor gUnknown_0862609C_floors[] = {
                         .speedEV = 0,
                         .spAttackEV = 0,
                         .spDefenseEV = 200,
-                        .otId = 0x10000000,
+                        .otId = TRAINER_HILL_OTID,
                         .hpIV = 5,
                         .attackIV = 5,
                         .defenseIV = 5,
@@ -122,7 +123,7 @@ static const struct TrHillFloor gUnknown_0862609C_floors[] = {
                         .speedEV = 0,
                         .spAttackEV = 100,
                         .spDefenseEV = 100,
-                        .otId = 0x10000000,
+                        .otId = TRAINER_HILL_OTID,
                         .hpIV = 5,
                         .attackIV = 5,
                         .defenseIV = 5,
@@ -146,7 +147,7 @@ static const struct TrHillFloor gUnknown_0862609C_floors[] = {
                         .speedEV = 0,
                         .spAttackEV = 100,
                         .spDefenseEV = 100,
-                        .otId = 0x10000000,
+                        .otId = TRAINER_HILL_OTID,
                         .hpIV = 5,
                         .attackIV = 5,
                         .defenseIV = 5,
@@ -170,7 +171,7 @@ static const struct TrHillFloor gUnknown_0862609C_floors[] = {
                         .speedEV = 0,
                         .spAttackEV = 100,
                         .spDefenseEV = 100,
-                        .otId = 0x10000000,
+                        .otId = TRAINER_HILL_OTID,
                         .hpIV = 5,
                         .attackIV = 5,
                         .defenseIV = 5,
@@ -194,8 +195,8 @@ static const struct TrHillFloor gUnknown_0862609C_floors[] = {
         }
     },
     [1] = {
-        .unk0 = 0,
-        .unk1 = 0,
+        .trainerNum1 = 0,
+        .trainerNum2 = 0,
         .trainers = {
             [0] = {
                 .name = __("シゲゾウ$$$$   "),
@@ -218,7 +219,7 @@ static const struct TrHillFloor gUnknown_0862609C_floors[] = {
                         .speedEV = 120,
                         .spAttackEV = 150,
                         .spDefenseEV = 0,
-                        .otId = 0x10000000,
+                        .otId = TRAINER_HILL_OTID,
                         .hpIV = 5,
                         .attackIV = 5,
                         .defenseIV = 5,
@@ -242,7 +243,7 @@ static const struct TrHillFloor gUnknown_0862609C_floors[] = {
                         .speedEV = 0,
                         .spAttackEV = 100,
                         .spDefenseEV = 100,
-                        .otId = 0x10000000,
+                        .otId = TRAINER_HILL_OTID,
                         .hpIV = 5,
                         .attackIV = 5,
                         .defenseIV = 5,
@@ -266,7 +267,7 @@ static const struct TrHillFloor gUnknown_0862609C_floors[] = {
                         .speedEV = 0,
                         .spAttackEV = 110,
                         .spDefenseEV = 100,
-                        .otId = 0x10000000,
+                        .otId = TRAINER_HILL_OTID,
                         .hpIV = 5,
                         .attackIV = 5,
                         .defenseIV = 5,
@@ -307,7 +308,7 @@ static const struct TrHillFloor gUnknown_0862609C_floors[] = {
                         .speedEV = 0,
                         .spAttackEV = 110,
                         .spDefenseEV = 100,
-                        .otId = 0x10000000,
+                        .otId = TRAINER_HILL_OTID,
                         .hpIV = 5,
                         .attackIV = 5,
                         .defenseIV = 5,
@@ -331,7 +332,7 @@ static const struct TrHillFloor gUnknown_0862609C_floors[] = {
                         .speedEV = 100,
                         .spAttackEV = 110,
                         .spDefenseEV = 100,
-                        .otId = 0x10000000,
+                        .otId = TRAINER_HILL_OTID,
                         .hpIV = 5,
                         .attackIV = 5,
                         .defenseIV = 5,
@@ -355,7 +356,7 @@ static const struct TrHillFloor gUnknown_0862609C_floors[] = {
                         .speedEV = 80,
                         .spAttackEV = 80,
                         .spDefenseEV = 80,
-                        .otId = 0x10000000,
+                        .otId = TRAINER_HILL_OTID,
                         .hpIV = 5,
                         .attackIV = 5,
                         .defenseIV = 5,
@@ -382,18 +383,18 @@ static const struct TrHillFloor gUnknown_0862609C_floors[] = {
 
 static const struct TrHillTag sDataTagNormal =
 {
-    .unkField_0 = 8,
+    .numTrainers = NUM_TRAINER_HILL_TRAINERS,
     .unused1 = 2,
-    .numFloors = 4,
+    .numFloors = NUM_TRAINER_HILL_FLOORS,
     .checksum = 0x00051E05
 };
 
-static const struct TrHillFloor sDataTagNormal_floors[] =
+static const struct TrHillFloor sDataTagNormal_Floors[] =
 {
     [0] =
     {
-        .unk0 = 0x11,
-        .unk1 = 0x12,
+        .trainerNum1 = 17,
+        .trainerNum2 = 18,
         .trainers =
         {
             [0] =
@@ -694,8 +695,8 @@ static const struct TrHillFloor sDataTagNormal_floors[] =
     },
     [1] =
     {
-        .unk0 = 0x13,
-        .unk1 = 0x14,
+        .trainerNum1 = 19,
+        .trainerNum2 = 20,
         .trainers =
         {
             [0] =
@@ -846,7 +847,7 @@ static const struct TrHillFloor sDataTagNormal_floors[] =
             [1] =
             {
                 .name = _("JAYDEN"),
-                .facilityClass = FACILITY_CLASS_POKEMON_BREEDER_F,
+                .facilityClass = FACILITY_CLASS_PKMN_BREEDER_F,
                 .unused = 0,
                 .speechBefore = {EC_WORD_SOME, EC_WORD_THINGS, EC_WORD_YOU, EC_WORD_CAN_T, EC_WORD_DO, EC_WORD_ALONE},
                 .speechWin = {EC_WORD_YOU, EC_WORD_WIN, EC_WORD_AS, EC_WORD_A, EC_WORD_GROUP, 0xFFFF},
@@ -999,8 +1000,8 @@ static const struct TrHillFloor sDataTagNormal_floors[] =
     },
     [2] =
     {
-        .unk0 = 0x15,
-        .unk1 = 0x16,
+        .trainerNum1 = 21,
+        .trainerNum2 = 22,
         .trainers =
         {
             [0] =
@@ -1151,7 +1152,7 @@ static const struct TrHillFloor sDataTagNormal_floors[] =
             [1] =
             {
                 .name = _("VERONICA"),
-                .facilityClass = FACILITY_CLASS_POKEMON_BREEDER_F,
+                .facilityClass = FACILITY_CLASS_PKMN_BREEDER_F,
                 .unused = 0,
                 .speechBefore = {EC_WORD_I_AM, EC_WORD_THE, EC_WORD_STRONG, EC_WORD_BEAUTY, EC_WORD_AROUND, EC_WORD_HERE},
                 .speechWin = {EC_WORD_I_AM, EC_WORD_STRONG, EC_WORD_THAT_S, EC_WORD_WHY, EC_WORD_EXCL, 0xFFFF},
@@ -1303,8 +1304,8 @@ static const struct TrHillFloor sDataTagNormal_floors[] =
     },
     [3] =
     {
-        .unk0 = 0x17,
-        .unk1 = 0x18,
+        .trainerNum1 = 23,
+        .trainerNum2 = 24,
         .trainers =
         {
             [0] =
@@ -1602,17 +1603,17 @@ static const struct TrHillFloor sDataTagNormal_floors[] =
 
 static const struct TrHillTag sDataTagVariety =
 {
-    .unkField_0 = 8,
+    .numTrainers = NUM_TRAINER_HILL_TRAINERS,
     .unused1 = 1,
-    .numFloors = 4,
+    .numFloors = NUM_TRAINER_HILL_FLOORS,
     .checksum = 0x00054C15
 };
 
-static const struct TrHillFloor sDataTagVariety_floors[] = {
+static const struct TrHillFloor sDataTagVariety_Floors[] = {
     [0] =
         {
-            .unk0 = 0x29,
-            .unk1 = 0x2A,
+            .trainerNum1 = 41,
+            .trainerNum2 = 42,
             .trainers =
                 {
                     [0] =
@@ -1904,8 +1905,8 @@ static const struct TrHillFloor sDataTagVariety_floors[] = {
         },
     [1] =
         {
-            .unk0 = 0x2B,
-            .unk1 = 0x2C,
+            .trainerNum1 = 43,
+            .trainerNum2 = 44,
             .trainers =
                 {
                     [0] =
@@ -2227,8 +2228,8 @@ static const struct TrHillFloor sDataTagVariety_floors[] = {
         },
     [2] =
         {
-            .unk0 = 0x2D,
-            .unk1 = 0x2E,
+            .trainerNum1 = 45,
+            .trainerNum2 = 46,
             .trainers =
                 {
                     [0] =
@@ -2531,8 +2532,8 @@ static const struct TrHillFloor sDataTagVariety_floors[] = {
         },
     [3] =
         {
-            .unk0 = 0x2F,
-            .unk1 = 0x30,
+            .trainerNum1 = 47,
+            .trainerNum2 = 48,
             .trainers =
                 {
                     [0] =
@@ -2828,17 +2829,17 @@ static const struct TrHillFloor sDataTagVariety_floors[] = {
 
 static const struct TrHillTag sDataTagUnique =
 {
-    .unkField_0 = 8,
+    .numTrainers = NUM_TRAINER_HILL_TRAINERS,
     .unused1 = 3,
-    .numFloors = 4,
+    .numFloors = NUM_TRAINER_HILL_FLOORS,
     .checksum = 0x000652F3
 };
 
-static const struct TrHillFloor sDataTagUnique_floors[] = {
+static const struct TrHillFloor sDataTagUnique_Floors[] = {
     [0] =
         {
-            .unk0 = 0x31,
-            .unk1 = 0x32,
+            .trainerNum1 = 49,
+            .trainerNum2 = 50,
             .trainers =
                 {
                     [0] =
@@ -3135,8 +3136,8 @@ static const struct TrHillFloor sDataTagUnique_floors[] = {
         },
     [1] =
         {
-            .unk0 = 0x33,
-            .unk1 = 0x34,
+            .trainerNum1 = 51,
+            .trainerNum2 = 52,
             .trainers =
                 {
                     [0] =
@@ -3439,8 +3440,8 @@ static const struct TrHillFloor sDataTagUnique_floors[] = {
         },
     [2] =
         {
-            .unk0 = 0x35,
-            .unk1 = 0x36,
+            .trainerNum1 = 53,
+            .trainerNum2 = 54,
             .trainers =
                 {
                     [0] =
@@ -3743,8 +3744,8 @@ static const struct TrHillFloor sDataTagUnique_floors[] = {
         },
     [3] =
         {
-            .unk0 = 0x38,
-            .unk1 = 0x37,
+            .trainerNum1 = 56,
+            .trainerNum2 = 55,
             .trainers =
                 {
                     [0] =
@@ -4039,17 +4040,17 @@ static const struct TrHillFloor sDataTagUnique_floors[] = {
 
 static const struct TrHillTag sDataTagExpert =
 {
-    .unkField_0 = 8,
+    .numTrainers = NUM_TRAINER_HILL_TRAINERS,
     .unused1 = 1,
-    .numFloors = 4,
+    .numFloors = NUM_TRAINER_HILL_FLOORS,
     .checksum = 0x00061F3F
 };
 
-static const struct TrHillFloor sDataTagExpert_floors[] = {
+static const struct TrHillFloor sDataTagExpert_Floors[] = {
     [0] =
         {
-            .unk0 = 0x39,
-            .unk1 = 0x3A,
+            .trainerNum1 = 57,
+            .trainerNum2 = 58,
             .trainers =
                 {
                     [0] =
@@ -4353,8 +4354,8 @@ static const struct TrHillFloor sDataTagExpert_floors[] = {
         },
     [1] =
         {
-            .unk0 = 0x3B,
-            .unk1 = 0x3C,
+            .trainerNum1 = 59,
+            .trainerNum2 = 60,
             .trainers =
                 {
                     [0] =
@@ -4658,8 +4659,8 @@ static const struct TrHillFloor sDataTagExpert_floors[] = {
         },
     [2] =
         {
-            .unk0 = 0x3D,
-            .unk1 = 0x3E,
+            .trainerNum1 = 61,
+            .trainerNum2 = 62,
             .trainers =
                 {
                     [0] =
@@ -4963,8 +4964,8 @@ static const struct TrHillFloor sDataTagExpert_floors[] = {
         },
     [3] =
         {
-            .unk0 = 0x3F,
-            .unk1 = 0x40,
+            .trainerNum1 = 63,
+            .trainerNum2 = 64,
             .trainers =
                 {
                     [0] =
diff --git a/src/data/contest_text_tables.h b/src/data/contest_text_tables.h
index 8375520d1..f893bc66a 100644
--- a/src/data/contest_text_tables.h
+++ b/src/data/contest_text_tables.h
@@ -1,414 +1,439 @@
 
 #include "global.h"
 
-extern const u8 gContestEffect00hDescription[];
-extern const u8 gContestEffect01hDescription[];
-extern const u8 gContestEffect02hDescription[];
-extern const u8 gContestEffect03hDescription[];
-extern const u8 gContestEffect04hDescription[];
-extern const u8 gContestEffect05hDescription[];
-extern const u8 gContestEffect06hDescription[];
-extern const u8 gContestEffect07hDescription[];
-extern const u8 gContestEffect08hDescription[];
-extern const u8 gContestEffect09hDescription[];
-extern const u8 gContestEffect0AhDescription[];
-extern const u8 gContestEffect0BhDescription[];
-extern const u8 gContestEffect0ChDescription[];
-extern const u8 gContestEffect0DhDescription[];
-extern const u8 gContestEffect0EhDescription[];
-extern const u8 gContestEffect0FhDescription[];
-extern const u8 gContestEffect10hDescription[];
-extern const u8 gContestEffect11hDescription[];
-extern const u8 gContestEffect12hDescription[];
-extern const u8 gContestEffect13hDescription[];
-extern const u8 gContestEffect14hDescription[];
-extern const u8 gContestEffect15hDescription[];
-extern const u8 gContestEffect16hDescription[];
-extern const u8 gContestEffect17hDescription[];
-extern const u8 gContestEffect18hDescription[];
-extern const u8 gContestEffect19hDescription[];
-extern const u8 gContestEffect1AhDescription[];
-extern const u8 gContestEffect1BhDescription[];
-extern const u8 gContestEffect1ChDescription[];
-extern const u8 gContestEffect1DhDescription[];
-extern const u8 gContestEffect1EhDescription[];
-extern const u8 gContestEffect1FhDescription[];
-extern const u8 gContestEffect20hDescription[];
-extern const u8 gContestEffect21hDescription[];
-extern const u8 gContestEffect22hDescription[];
-extern const u8 gContestEffect23hDescription[];
-extern const u8 gContestEffect24hDescription[];
-extern const u8 gContestEffect25hDescription[];
-extern const u8 gContestEffect26hDescription[];
-extern const u8 gContestEffect27hDescription[];
-extern const u8 gContestEffect28hDescription[];
-extern const u8 gContestEffect29hDescription[];
-extern const u8 gContestEffect2AhDescription[];
-extern const u8 gContestEffect2BhDescription[];
-extern const u8 gContestEffect2ChDescription[];
-extern const u8 gContestEffect2DhDescription[];
-extern const u8 gContestEffect2EhDescription[];
-extern const u8 gContestEffect2FhDescription[];
+// gContestEffectDescriptionPointers
+extern const u8 gText_HighlyAppealingMove[];
+extern const u8 gText_UserMoreEasilyStartled[];
+extern const u8 gText_GreatAppealButNoMoreToEnd[];
+extern const u8 gText_UsedRepeatedlyWithoutBoringJudge[];
+extern const u8 gText_AvoidStartledByOthersOnce[];
+extern const u8 gText_AvoidStartledByOthers[];
+extern const u8 gText_AvoidStartledByOthersLittle[];
+extern const u8 gText_UserLessLikelyStartled[];
+extern const u8 gText_SlightlyStartleFrontMon[];
+extern const u8 gText_SlightlyStartleAppealed[];
+extern const u8 gText_StartleAppealedBeforeUser[];
+extern const u8 gText_StartleAllAppealed[];
+extern const u8 gText_BadlyStartleFrontMon[];
+extern const u8 gText_BadlyStartleAppealed[];
+extern const u8 gText_StartleAppealedBeforeUser2[];
+extern const u8 gText_StartleAllAppealed2[];
+extern const u8 gText_ShiftJudgesAttentionFromOthers[];
+extern const u8 gText_StartleMonHasJudgesAttention[];
+extern const u8 gText_JamOthersMissesTurn[];
+extern const u8 gText_StartleMonsMadeSameTypeAppeal[];
+extern const u8 gText_BadlyStartleCoolAppeals[];
+extern const u8 gText_BadlyStartleBeautyAppeals[];
+extern const u8 gText_BadlyStartleCuteAppeals[];
+extern const u8 gText_BadlyStartleSmartAppeals[];
+extern const u8 gText_BadlyStartleToughAppeals[];
+extern const u8 gText_MakeMonAfterUserNervous[];
+extern const u8 gText_MakeAllMonsAfterUserNervous[];
+extern const u8 gText_WorsenConditionOfThoseMadeAppeals[];
+extern const u8 gText_BadlyStartleMonsGoodCondition[];
+extern const u8 gText_AppealGreatIfPerformedFirst[];
+extern const u8 gText_AppealGreatIfPerformedLast[];
+extern const u8 gText_AppealAsGoodAsThoseBeforeIt[];
+extern const u8 gText_AppealAsGoodAsOneBeforeIt[];
+extern const u8 gText_AppealBetterLaterItsPerformed[];
+extern const u8 gText_AppealVariesDependingOnTiming[];
+extern const u8 gText_WorksWellIfSameTypeAsBefore[];
+extern const u8 gText_WorksWellIfDifferentTypeAsBefore[];
+extern const u8 gText_AffectedByAppealInFront[];
+extern const u8 gText_UpsConditionHelpsPreventNervousness[];
+extern const u8 gText_AppealWorksWellIfConditionGood[];
+extern const u8 gText_NextAppealMadeEarlier[];
+extern const u8 gText_NextAppealMadeLater[];
+extern const u8 gText_TurnOrderMoreEasilyScrambled[];
+extern const u8 gText_ScrambleOrderOfNextAppeals[];
+extern const u8 gText_AppealExcitesAudienceInAnyContest[];
+extern const u8 gText_BadlyStartlesMonsGoodAppeals[];
+extern const u8 gText_AppealBestMoreCrowdExcited[];
+extern const u8 gText_TemporarilyStopCrowdExcited[];
 
-extern const u8 gUnusedContestMoveName0[];
-extern const u8 gUnusedContestMoveName1[];
-extern const u8 gUnusedContestMoveName2[];
-extern const u8 gUnusedContestMoveName3[];
-extern const u8 gUnusedContestMoveName4[];
-extern const u8 gUnusedContestMoveName5[];
-extern const u8 gUnusedContestMoveName6[];
-extern const u8 gUnusedContestMoveName7[];
-extern const u8 gUnusedContestMoveName8[];
-extern const u8 gUnusedContestMoveName9[];
-extern const u8 gUnusedContestMoveName10[];
-extern const u8 gUnusedContestMoveName11[];
-extern const u8 gUnusedContestMoveName12[];
+// sUnusedComboMoveNameTexts
+extern const u8 gText_RainDance[];
+extern const u8 gText_Rage[];
+extern const u8 gText_FocusEnergy[];
+extern const u8 gText_Hypnosis[];
+extern const u8 gText_Softboiled[];
+extern const u8 gText_HornAttack[];
+extern const u8 gText_SwordsDance[];
+extern const u8 gText_Conversion[];
+extern const u8 gText_SunnyDay[];
+extern const u8 gText_Rest2[];
+extern const u8 gText_Vicegrip[];
+extern const u8 gText_DefenseCurl[];
+extern const u8 gText_LockOn[];
 
+// gContestMoveTypeTextPointers
 extern const u8 gContestMoveTypeCoolText[];
 extern const u8 gContestMoveTypeBeautyText[];
 extern const u8 gContestMoveTypeCuteText[];
 extern const u8 gContestMoveTypeSmartText[];
 extern const u8 gContestMoveTypeToughText[];
 
-extern const u8 gText_0827D5C1[];
-extern const u8 gText_0827D5DC[];
-extern const u8 gText_0827D600[];
-extern const u8 gText_0827D612[];
-extern const u8 gText_0827D612[];
-extern const u8 gText_0827D62D[];
-extern const u8 gText_0827D654[];
-extern const u8 gText_0827D67E[];
-extern const u8 gText_0827D69C[];
-extern const u8 gText_0827D6BA[];
-extern const u8 gText_0827D6E5[];
-extern const u8 gText_0827D706[];
-extern const u8 gText_0827D71D[];
+// sUnusedAppealResultTexts
+extern const u8 gText_ButAppealWasJammed[];
+extern const u8 gText_FollowedAnotherMonsLead[];
+extern const u8 gText_ButItMessedUp[];
+extern const u8 gText_WentBetterThanUsual[];
+extern const u8 gText_JudgeLookedAwayForSomeReason[];
+extern const u8 gText_WorkedHardToBuildOnPastMistakes[];
+extern const u8 gText_CantMakeAnyMoreMoves[];
+extern const u8 gText_WorkedFrighteninglyWell[];
+extern const u8 gText_WorkedHardAsStandoutMon[];
+extern const u8 gText_JudgedLookedOnExpectantly[];
+extern const u8 gText_WorkedRatherWell[];
+extern const u8 gText_WorkedLittleBetterThanUsual[];
 
-extern const u8 gText_0827D743[];
-extern const u8 gText_0827D764[];
-extern const u8 gText_0827D785[];
-extern const u8 gText_0827D7A5[];
-extern const u8 gText_0827D7C8[];
-extern const u8 gText_0827D7E8[];
-extern const u8 gText_0827D831[];
-extern const u8 gText_0827D855[];
-extern const u8 gText_0827D830[];
-extern const u8 gText_0827D872[];
-extern const u8 gText_0827D88F[];
-extern const u8 gText_0827D8B5[];
-extern const u8 gText_0827D8E4[];
-extern const u8 gText_0827D8FE[];
-extern const u8 gText_0827D926[];
-extern const u8 gText_0827D947[];
-extern const u8 gText_0827D961[];
-extern const u8 gText_0827D986[];
-extern const u8 gText_0827D9B1[];
-extern const u8 gText_0827D9D9[];
-extern const u8 gText_0827DA03[];
-extern const u8 gText_0827DA31[];
-extern const u8 gText_0827DA5B[];
-extern const u8 gText_0827DA85[];
-extern const u8 gText_0827DAB2[];
-extern const u8 gText_0827DADA[];
-extern const u8 gText_0827DB03[];
-extern const u8 gText_0827D830[];
-extern const u8 gText_0827D830[];
-extern const u8 gText_0827D830[];
-extern const u8 gText_0827DB1F[];
-extern const u8 gText_0827DB4E[];
+// sRoundResultTexts
+extern const u8 gText_MonFailedToStandOutAtAll[];
+extern const u8 gText_MonDidntStandOutVeryMuch[];
+extern const u8 gText_MonCaughtALittleAttention[];
+extern const u8 gText_MonAttractedALotOfAttention[];
+extern const u8 gText_MonCommandedTotalAttention[];
+extern const u8 gText_MonHasntMadeItsAppeal[];
+extern const u8 gText_JudgesViewsOnMonHeldFirm[];
+extern const u8 gText_MonsXChangedPerceptions[];
+extern const u8 gText_EmptyContestString[];
+extern const u8 gText_MonsAppealEffectWoreOff[];
+extern const u8 gText_SpecialAppealsEffectWoreOff[];
+extern const u8 gText_EveryonesAppealsMadeToLookSame[];
+extern const u8 gText_CheapenedMonsAppeal[];
+extern const u8 gText_CheapenedMonsAppeal2[];
+extern const u8 gText_CheapenedAppealOfThoseAhead[];
+extern const u8 gText_CheapenedAppealOfThoseAhead2[];
+extern const u8 gText_StoleAttentionAwayFromMon[];
+extern const u8 gText_SeverelyCheapenedOtherAppeals[];
+extern const u8 gText_AnticipationSwelledForMonsAppealNext[];
+extern const u8 gText_CheapenedJudgesFavoriteAppeal[];
+extern const u8 gText_AppealsOfOthersCheapenedByHalf[];
+extern const u8 gText_StoodOutToMakeUpForBeingJammed[];
+extern const u8 gText_CantParticipateInAppealsAnyMore[];
+extern const u8 gText_TouchedJudgeForFantasticAppeal[];
+extern const u8 gText_AnticipationRoseForUpcomingAppeals[];
+extern const u8 gText_StoodOutAsMuchAsSpecialAppeals[];
+extern const u8 gText_StoodOutAsMuchAsMon[];
+extern const u8 gText_JammedAppealsMadeEvenLessNoticeable[];
+extern const u8 gText_EveryonesAppealsMadeSame[];
 
-extern const u8 gText_827DB75[];
-extern const u8 gText_827DBB0[];
-extern const u8 gText_827DBE0[];
-extern const u8 gText_827DC0F[];
-extern const u8 gText_827DC45[];
-extern const u8 gText_827DC7C[];
-extern const u8 gText_827DCB4[];
-extern const u8 gText_827DCE7[];
-extern const u8 gText_827DD12[];
-extern const u8 gText_827DD3D[];
-extern const u8 gText_827DD6F[];
-extern const u8 gText_827DD8E[];
-extern const u8 gText_827DDC7[];
-extern const u8 gText_827DDF2[];
-extern const u8 gText_827DE14[];
-extern const u8 gText_827DE44[];
-extern const u8 gText_827DE73[];
-extern const u8 gText_827DEA5[];
-extern const u8 gText_827DED9[];
-extern const u8 gText_827DF02[];
-extern const u8 gText_827DF3A[];
-extern const u8 gText_827DF63[];
-extern const u8 gText_827DF8C[];
-extern const u8 gText_827DFB8[];
-extern const u8 gText_827DFE2[];
-extern const u8 gText_827E00C[];
-extern const u8 gText_827E02F[];
-extern const u8 gText_827E05F[];
-extern const u8 gText_827E08B[];
-extern const u8 gText_827E0B5[];
-extern const u8 gText_827E0DD[];
-extern const u8 gText_827E107[];
-extern const u8 gText_827E143[];
-extern const u8 gText_827E17F[];
-extern const u8 gText_827E1BB[];
-extern const u8 gText_827E1F3[];
-extern const u8 gText_827E220[];
-extern const u8 gText_827E254[];
-extern const u8 gText_827E289[];
-extern const u8 gText_827E2C5[];
-extern const u8 gText_0827E2FE[];
-extern const u8 gText_0827E32E[];
-extern const u8 gText_0827E35B[];
-extern const u8 gText_0827E38D[];
-extern const u8 gText_0827E3C1[];
-extern const u8 gText_0827E3EB[];
-extern const u8 gText_0827E416[];
-extern const u8 gText_0827E448[];
-extern const u8 gText_0827E473[];
-extern const u8 gText_0827E4A6[];
-extern const u8 gText_0827E4D5[];
-extern const u8 gText_0827E504[];
-extern const u8 gText_0827E531[];
-extern const u8 gText_0827E55A[];
-extern const u8 gText_0827E5B2[];
-extern const u8 gText_0827E5D0[];
-extern const u8 gText_0827E606[];
-extern const u8 gText_0827E638[];
-extern const u8 gText_0827E658[];
-extern const u8 gText_0827E68B[];
-extern const u8 gText_0827E6C4[];
-extern const u8 gText_0827E7BA[];
+// sAppealResultTexts
+extern const u8 gText_BecameMoreConsciousOfOtherMons[];
+extern const u8 gText_MonCantMakeAnAppealAfterThis[];
+extern const u8 gText_SettledDownJustLittleBit[];
+extern const u8 gText_BecameObliviousToOtherMons[];
+extern const u8 gText_BecameLessAwareOfOtherMons[];
+extern const u8 gText_StoppedCaringAboutOtherMons[];
+extern const u8 gText_TriedToStartleOtherMons[];
+extern const u8 gText_TriedToDazzleOthers[];
+extern const u8 gText_JudgeLookedAwayFromMon[];
+extern const u8 gText_TriedToUnnerveNextMon[];
+extern const u8 gText_MonBecameNervous[];
+extern const u8 gText_AppealTriedToUnnerveWaitingMons[];
+extern const u8 gText_TauntedMonsDoingWell[];
+extern const u8 gText_MonRegainedItsForm[];
+extern const u8 gText_TriedToJamMonDoingWell[];
+extern const u8 gText_StandoutMonHustledEvenMore[];
+extern const u8 gText_LargelyUnnoticedMonWorkedHard[];
+extern const u8 gText_WorkedAsMuchAsMonBefore[];
+extern const u8 gText_WorkedAsMuchAsPrecedingMon[];
+extern const u8 gText_MonsAppealWasDud[];
+extern const u8 gText_MonsAppealDidNotGoWell[];
+extern const u8 gText_MonsAppealDidNotGoWell2[];
+extern const u8 gText_MonsAppealDidNotGoWell3[];
+extern const u8 gText_MonsAppealDidNotWorkVeryWell[];
+extern const u8 gText_MonsAppealWentSlightlyWell[];
+extern const u8 gText_MonsAppealWentSlightlyWell2[];
+extern const u8 gText_MonsAppealWentPrettyWell[];
+extern const u8 gText_MonsAppealWentPrettyWell2[];
+extern const u8 gText_MonsAppealWentVeryWell[];
+extern const u8 gText_MonsAppealWentExcellently[];
+extern const u8 gText_MonsAppealWentExcellently2[];
+extern const u8 gText_SameTypeAsOneBeforeGood[];
+extern const u8 gText_NotSameTypeAsOneBeforeGood[];
+extern const u8 gText_StoodOutMuchMoreThanMonBefore[];
+extern const u8 gText_DidntDoAsWellAsMonBefore[];
+extern const u8 gText_MonsConditionRoseAboveUsual[];
+extern const u8 gText_MonsHotStatusMadeGreatAppeal[];
+extern const u8 gText_MovedUpInLineForNextAppeal[];
+extern const u8 gText_MovedBackInLineForNextAppeal[];
+extern const u8 gText_ScrambledUpOrderForNextTurn[];
+extern const u8 gText_JudgeLookedAtMonExpectantly[];
+extern const u8 gText_AppealComboWentOverWell[];
+extern const u8 gText_AppealComboWentOverVeryWell[];
+extern const u8 gText_AppealComboWentOverExcellently[];
+extern const u8 gText_MonManagedToAvertGaze[];
+extern const u8 gText_MonManagedToAvoidSeeingIt[];
+extern const u8 gText_MonIsntFazedByThatSortOfThing[];
+extern const u8 gText_MonBecameALittleDistracted[];
+extern const u8 gText_TriedToStartleOtherPokemon[];
+extern const u8 gText_MonLookedDownOutOfDistraction[];
+extern const u8 gText_MonTurnedBackOutOfDistraction[];
+extern const u8 gText_MonCouldntHelpUtteringCry[];
+extern const u8 gText_MonCouldntHelpLeapingUp[];
+extern const u8 gText_MonTrippedOutOfDistraction[];
+extern const u8 gText_ButItMessedUp2[];
+extern const u8 gText_ButItFailedToMakeTargetNervous[];
+extern const u8 gText_ButItFailedToMakeAnyoneNervous[];
+extern const u8 gText_ButItWasIgnored[];
+extern const u8 gText_CouldntImproveItsCondition[];
+extern const u8 gText_BadConditionResultedInWeakAppeal[];
+extern const u8 gText_MonWasUnaffected[];
+extern const u8 gText_AttractedCrowdsAttention[];
+ 
+// sContestConditions
+extern const u8 gText_Contest_Coolness[];
+extern const u8 gText_Contest_Beauty[];
+extern const u8 gText_Contest_Cuteness[];
+extern const u8 gText_Contest_Smartness[];
+extern const u8 gText_Contest_Toughness[];
 
-extern const u8 gText_0827E85F[];
-extern const u8 gText_0827E868[];
-extern const u8 gText_0827E86F[];
-extern const u8 gText_0827E878[];
-extern const u8 gText_0827E882[];
+// sInvalidContestMoveNames
+extern const u8 gText_CoolMove[];
+extern const u8 gText_BeautyMove[];
+extern const u8 gText_CuteMove[];
+extern const u8 gText_SmartMove[];
+extern const u8 gText_ToughMove[];
+extern const u8 gText_3QuestionMarks[];
 
-extern const u8 gText_0827E894[];
-extern const u8 gText_0827E89E[];
-extern const u8 gText_0827E8AA[];
-extern const u8 gText_0827E8B4[];
-extern const u8 gText_0827E8BF[];
-extern const u8 gText_0827E8CA[];
+// Misc, used directly
+extern const u8 gText_MonAppealedWithMove[];
+extern const u8 gText_MonCantAppealNextTurn[];
+extern const u8 gText_RepeatedAppeal[];
+extern const u8 gText_MonsXDidntGoOverWell[];
+extern const u8 gText_MonsXWentOverGreat[];
+extern const u8 gText_MonsXGotTheCrowdGoing[];
+extern const u8 gText_CrowdContinuesToWatchMon[];
+extern const u8 gText_MonsMoveIsIgnored[];
+extern const u8 gText_MonWasTooNervousToMove[];
+extern const u8 gText_MonWasWatchingOthers[];
+extern const u8 gText_AllOutOfAppealTime[];
+extern const u8 gText_Contest_Shyness[];
+extern const u8 gText_Contest_Anxiety[];
+extern const u8 gText_Contest_Laziness[];
+extern const u8 gText_Contest_Hesitancy[];
+extern const u8 gText_Contest_Fear[];
+extern const u8 gText_AppealNumWhichMoveWillBePlayed[];
+extern const u8 gText_AppealNumButItCantParticipate[];
 
 const u8 *const gContestEffectDescriptionPointers[] =
 {
-    gContestEffect00hDescription,
-    gContestEffect01hDescription,
-    gContestEffect02hDescription,
-    gContestEffect03hDescription,
-    gContestEffect04hDescription,
-    gContestEffect05hDescription,
-    gContestEffect06hDescription,
-    gContestEffect07hDescription,
-    gContestEffect08hDescription,
-    gContestEffect09hDescription,
-    gContestEffect0AhDescription,
-    gContestEffect0BhDescription,
-    gContestEffect0ChDescription,
-    gContestEffect0DhDescription,
-    gContestEffect0EhDescription,
-    gContestEffect0FhDescription,
-    gContestEffect10hDescription,
-    gContestEffect11hDescription,
-    gContestEffect12hDescription,
-    gContestEffect13hDescription,
-    gContestEffect14hDescription,
-    gContestEffect15hDescription,
-    gContestEffect16hDescription,
-    gContestEffect17hDescription,
-    gContestEffect18hDescription,
-    gContestEffect19hDescription,
-    gContestEffect1AhDescription,
-    gContestEffect1BhDescription,
-    gContestEffect1ChDescription,
-    gContestEffect1DhDescription,
-    gContestEffect1EhDescription,
-    gContestEffect1FhDescription,
-    gContestEffect20hDescription,
-    gContestEffect21hDescription,
-    gContestEffect22hDescription,
-    gContestEffect23hDescription,
-    gContestEffect24hDescription,
-    gContestEffect25hDescription,
-    gContestEffect26hDescription,
-    gContestEffect27hDescription,
-    gContestEffect28hDescription,
-    gContestEffect29hDescription,
-    gContestEffect2AhDescription,
-    gContestEffect2BhDescription,
-    gContestEffect2ChDescription,
-    gContestEffect2DhDescription,
-    gContestEffect2EhDescription,
-    gContestEffect2FhDescription
+    [CONTEST_EFFECT_HIGHLY_APPEALING]                      = gText_HighlyAppealingMove,
+    [CONTEST_EFFECT_USER_MORE_EASILY_STARTLED]             = gText_UserMoreEasilyStartled,
+    [CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES]        = gText_GreatAppealButNoMoreToEnd,
+    [CONTEST_EFFECT_REPETITION_NOT_BORING]                 = gText_UsedRepeatedlyWithoutBoringJudge,
+    [CONTEST_EFFECT_AVOID_STARTLE_ONCE]                    = gText_AvoidStartledByOthersOnce,
+    [CONTEST_EFFECT_AVOID_STARTLE]                         = gText_AvoidStartledByOthers,
+    [CONTEST_EFFECT_AVOID_STARTLE_SLIGHTLY]                = gText_AvoidStartledByOthersLittle,
+    [CONTEST_EFFECT_USER_LESS_EASILY_STARTLED]             = gText_UserLessLikelyStartled,
+    [CONTEST_EFFECT_STARTLE_FRONT_MON]                     = gText_SlightlyStartleFrontMon,
+    [CONTEST_EFFECT_SLIGHTLY_STARTLE_PREV_MONS]            = gText_SlightlyStartleAppealed,
+    [CONTEST_EFFECT_STARTLE_PREV_MON]                      = gText_StartleAppealedBeforeUser,
+    [CONTEST_EFFECT_STARTLE_PREV_MONS]                     = gText_StartleAllAppealed,
+    [CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON]               = gText_BadlyStartleFrontMon,
+    [CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS]               = gText_BadlyStartleAppealed,
+    [CONTEST_EFFECT_STARTLE_PREV_MON_2]                    = gText_StartleAppealedBeforeUser2,
+    [CONTEST_EFFECT_STARTLE_PREV_MONS_2]                   = gText_StartleAllAppealed2,
+    [CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION]                 = gText_ShiftJudgesAttentionFromOthers,
+    [CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION]     = gText_StartleMonHasJudgesAttention,
+    [CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN]         = gText_JamOthersMissesTurn,
+    [CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL]         = gText_StartleMonsMadeSameTypeAppeal,
+    [CONTEST_EFFECT_STARTLE_MONS_COOL_APPEAL]              = gText_BadlyStartleCoolAppeals,
+    [CONTEST_EFFECT_STARTLE_MONS_BEAUTY_APPEAL]            = gText_BadlyStartleBeautyAppeals,
+    [CONTEST_EFFECT_STARTLE_MONS_CUTE_APPEAL]              = gText_BadlyStartleCuteAppeals,
+    [CONTEST_EFFECT_STARTLE_MONS_SMART_APPEAL]             = gText_BadlyStartleSmartAppeals,
+    [CONTEST_EFFECT_STARTLE_MONS_TOUGH_APPEAL]             = gText_BadlyStartleToughAppeals,
+    [CONTEST_EFFECT_MAKE_FOLLOWING_MON_NERVOUS]            = gText_MakeMonAfterUserNervous,
+    [CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS]           = gText_MakeAllMonsAfterUserNervous,
+    [CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS]         = gText_WorsenConditionOfThoseMadeAppeals,
+    [CONTEST_EFFECT_BADLY_STARTLES_MONS_IN_GOOD_CONDITION] = gText_BadlyStartleMonsGoodCondition,
+    [CONTEST_EFFECT_BETTER_IF_FIRST]                       = gText_AppealGreatIfPerformedFirst,
+    [CONTEST_EFFECT_BETTER_IF_LAST]                        = gText_AppealGreatIfPerformedLast,
+    [CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES]           = gText_AppealAsGoodAsThoseBeforeIt,
+    [CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE]            = gText_AppealAsGoodAsOneBeforeIt,
+    [CONTEST_EFFECT_BETTER_WHEN_LATER]                     = gText_AppealBetterLaterItsPerformed,
+    [CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING]             = gText_AppealVariesDependingOnTiming,
+    [CONTEST_EFFECT_BETTER_IF_SAME_TYPE]                   = gText_WorksWellIfSameTypeAsBefore,
+    [CONTEST_EFFECT_BETTER_IF_DIFF_TYPE]                   = gText_WorksWellIfDifferentTypeAsBefore,
+    [CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL]               = gText_AffectedByAppealInFront,
+    [CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS] = gText_UpsConditionHelpsPreventNervousness,
+    [CONTEST_EFFECT_BETTER_WITH_GOOD_CONDITION]            = gText_AppealWorksWellIfConditionGood,
+    [CONTEST_EFFECT_NEXT_APPEAL_EARLIER]                   = gText_NextAppealMadeEarlier,
+    [CONTEST_EFFECT_NEXT_APPEAL_LATER]                     = gText_NextAppealMadeLater,
+    [CONTEST_EFFECT_MAKE_SCRAMBLING_TURN_ORDER_EASIER]     = gText_TurnOrderMoreEasilyScrambled,
+    [CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER]              = gText_ScrambleOrderOfNextAppeals,
+    [CONTEST_EFFECT_EXCITE_AUDIENCE_IN_ANY_CONTEST]        = gText_AppealExcitesAudienceInAnyContest,
+    [CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS]  = gText_BadlyStartlesMonsGoodAppeals,
+    [CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED]          = gText_AppealBestMoreCrowdExcited,
+    [CONTEST_EFFECT_DONT_EXCITE_AUDIENCE]                  = gText_TemporarilyStopCrowdExcited
 };
 
 // Unreferenced array of pointers to move names.
 // All of the moves except Conversion are combo starters, so this may have
 // been an early list of combo starters.
-const u8 *const gUnknown_8587D10[] =
+static const u8 *const sUnusedComboMoveNameTexts[] =
 {
-    gUnusedContestMoveName0,
-    gUnusedContestMoveName0,
-    gUnusedContestMoveName1,
-    gUnusedContestMoveName2,
-    gUnusedContestMoveName3,
-    gUnusedContestMoveName4,
-    gUnusedContestMoveName5,
-    gUnusedContestMoveName6,
-    gUnusedContestMoveName7,
-    gUnusedContestMoveName8,
-    gUnusedContestMoveName9,
-    gUnusedContestMoveName10,
-    gUnusedContestMoveName11,
-    gUnusedContestMoveName12
+    gText_RainDance,
+    gText_RainDance,
+    gText_Rage,
+    gText_FocusEnergy,
+    gText_Hypnosis,
+    gText_Softboiled,
+    gText_HornAttack,
+    gText_SwordsDance,
+    gText_Conversion,
+    gText_SunnyDay,
+    gText_Rest2,
+    gText_Vicegrip,
+    gText_DefenseCurl,
+    gText_LockOn
 };
 
 const u8 *const gContestMoveTypeTextPointers[] =
 {
-    gContestMoveTypeCoolText,
-    gContestMoveTypeBeautyText,
-    gContestMoveTypeCuteText,
-    gContestMoveTypeSmartText,
-    gContestMoveTypeToughText
+    [CONTEST_CATEGORY_COOL]   = gContestMoveTypeCoolText,
+    [CONTEST_CATEGORY_BEAUTY] = gContestMoveTypeBeautyText,
+    [CONTEST_CATEGORY_CUTE]   = gContestMoveTypeCuteText,
+    [CONTEST_CATEGORY_SMART]  = gContestMoveTypeSmartText,
+    [CONTEST_CATEGORY_TOUGH]  = gContestMoveTypeToughText
 };
 
-const u8 *const gUnknown_08587D5C[] =
+static const u8 *const sUnusedAppealResultTexts[] =
 {
-    gText_0827D5C1,
-    gText_0827D5DC,
-    gText_0827D600,
-    gText_0827D612,
-    gText_0827D612,
-    gText_0827D62D,
-    gText_0827D654,
-    gText_0827D67E,
-    gText_0827D69C,
-    gText_0827D6BA,
-    gText_0827D6E5,
-    gText_0827D706,
-    gText_0827D71D
+    gText_ButAppealWasJammed,
+    gText_FollowedAnotherMonsLead,
+    gText_ButItMessedUp,
+    gText_WentBetterThanUsual,
+    gText_WentBetterThanUsual,
+    gText_JudgeLookedAwayForSomeReason,
+    gText_WorkedHardToBuildOnPastMistakes,
+    gText_CantMakeAnyMoreMoves,
+    gText_WorkedFrighteninglyWell,
+    gText_WorkedHardAsStandoutMon,
+    gText_JudgedLookedOnExpectantly,
+    gText_WorkedRatherWell,
+    gText_WorkedLittleBetterThanUsual
 };
 
-const u8 *const gUnknown_08587D90[] =
+// Takes the .attentionLevel of a contestant as an index. Only 0-5 are used
+static const u8 *const sRoundResultTexts[] =
 {
-    gText_0827D743,
-    gText_0827D764,
-    gText_0827D785,
-    gText_0827D7A5,
-    gText_0827D7C8,
-    gText_0827D7E8,
-    gText_0827D831,
-    gText_0827D855,
-    gText_0827D830,
-    gText_0827D872,
-    gText_0827D88F,
-    gText_0827D8B5,
-    gText_0827D8E4,
-    gText_0827D8FE,
-    gText_0827D926,
-    gText_0827D947,
-    gText_0827D961,
-    gText_0827D986,
-    gText_0827D9B1,
-    gText_0827D9D9,
-    gText_0827DA03,
-    gText_0827DA31,
-    gText_0827DA5B,
-    gText_0827DA85,
-    gText_0827DAB2,
-    gText_0827DADA,
-    gText_0827DB03,
-    gText_0827D830,
-    gText_0827D830,
-    gText_0827D830,
-    gText_0827DB1F,
-    gText_0827DB4E
+    gText_MonFailedToStandOutAtAll,
+    gText_MonDidntStandOutVeryMuch,
+    gText_MonCaughtALittleAttention,
+    gText_MonAttractedALotOfAttention,
+    gText_MonCommandedTotalAttention,
+    gText_MonHasntMadeItsAppeal,
+    gText_JudgesViewsOnMonHeldFirm, // here below unused
+    gText_MonsXChangedPerceptions,
+    gText_EmptyContestString,
+    gText_MonsAppealEffectWoreOff,
+    gText_SpecialAppealsEffectWoreOff,
+    gText_EveryonesAppealsMadeToLookSame,
+    gText_CheapenedMonsAppeal,
+    gText_CheapenedAppealOfThoseAhead,
+    gText_StoleAttentionAwayFromMon,
+    gText_CheapenedMonsAppeal2,
+    gText_SeverelyCheapenedOtherAppeals,
+    gText_AnticipationSwelledForMonsAppealNext,
+    gText_CheapenedAppealOfThoseAhead2,
+    gText_CheapenedJudgesFavoriteAppeal,
+    gText_AppealsOfOthersCheapenedByHalf,
+    gText_StoodOutToMakeUpForBeingJammed,
+    gText_CantParticipateInAppealsAnyMore,
+    gText_TouchedJudgeForFantasticAppeal,
+    gText_AnticipationRoseForUpcomingAppeals,
+    gText_StoodOutAsMuchAsSpecialAppeals,
+    gText_StoodOutAsMuchAsMon,
+    gText_EmptyContestString,
+    gText_EmptyContestString,
+    gText_EmptyContestString,
+    gText_JammedAppealsMadeEvenLessNoticeable,
+    gText_EveryonesAppealsMadeSame
 };
 
-const u8 *const gUnknown_08587E10[] =
+static const u8 *const sAppealResultTexts[] =
 {
-    gText_827DB75,
-    gText_827DBB0,
-    gText_827DBE0,
-    gText_827DC0F,
-    gText_827DC45,
-    gText_827DC7C,
-    gText_827DCB4,
-    gText_827DCE7,
-    gText_827DD12,
-    gText_827DD3D,
-    gText_827DD6F,
-    gText_827DD8E,
-    gText_827DDC7,
-    gText_827DDF2,
-    gText_827DE14,
-    gText_827DE44,
-    gText_827DE73,
-    gText_827DEA5,
-    gText_827DED9,
-    gText_827DF02,
-    gText_827DF3A,
-    gText_827DF63,
-    gText_827DF8C,
-    gText_827DFB8,
-    gText_827DFE2,
-    gText_827E00C,
-    gText_827E02F,
-    gText_827E05F,
-    gText_827E08B,
-    gText_827E0B5,
-    gText_827E0DD,
-    gText_827E107,
-    gText_827E143,
-    gText_827E17F,
-    gText_827E1BB,
-    gText_827E1F3,
-    gText_827E220,
-    gText_827E254,
-    gText_827E289,
-    gText_827E2C5,
-    gText_0827E2FE,
-    gText_0827E32E,
-    gText_0827E35B,
-    gText_0827E38D,
-    gText_0827E3C1,
-    gText_0827E3EB,
-    gText_0827E416,
-    gText_0827E448,
-    gText_0827E473,
-    gText_0827E4A6,
-    gText_0827E4D5,
-    gText_0827E504,
-    gText_0827E531,
-    gText_0827E55A,
-    gText_0827E5B2,
-    gText_0827E5D0,
-    gText_0827E606,
-    gText_0827E638,
-    gText_0827E658,
-    gText_0827E68B,
-    gText_0827E6C4,
-    gText_0827E7BA
+    [CONTEST_STRING_MORE_CONSCIOUS]            = gText_BecameMoreConsciousOfOtherMons,
+    [CONTEST_STRING_NO_APPEAL]                 = gText_MonCantMakeAnAppealAfterThis,
+    [CONTEST_STRING_SETTLE_DOWN]               = gText_SettledDownJustLittleBit,
+    [CONTEST_STRING_OBLIVIOUS_TO_OTHERS]       = gText_BecameObliviousToOtherMons,
+    [CONTEST_STRING_LESS_AWARE]                = gText_BecameLessAwareOfOtherMons,
+    [CONTEST_STRING_STOPPED_CARING]            = gText_StoppedCaringAboutOtherMons,
+    [CONTEST_STRING_STARTLE_ATTEMPT]           = gText_TriedToStartleOtherMons,
+    [CONTEST_STRING_DAZZLE_ATTEMPT]            = gText_TriedToDazzleOthers,
+    [CONTEST_STRING_JUDGE_LOOK_AWAY2]          = gText_JudgeLookedAwayFromMon,
+    [CONTEST_STRING_UNNERVE_ATTEMPT]           = gText_TriedToUnnerveNextMon,
+    [CONTEST_STRING_NERVOUS]                   = gText_MonBecameNervous,
+    [CONTEST_STRING_UNNERVE_WAITING]           = gText_AppealTriedToUnnerveWaitingMons,
+    [CONTEST_STRING_TAUNT_WELL]                = gText_TauntedMonsDoingWell,
+    [CONTEST_STRING_REGAINED_FORM]             = gText_MonRegainedItsForm,
+    [CONTEST_STRING_JAM_WELL]                  = gText_TriedToJamMonDoingWell,
+    [CONTEST_STRING_HUSTLE_STANDOUT]           = gText_StandoutMonHustledEvenMore,
+    [CONTEST_STRING_WORK_HARD_UNNOTICED]       = gText_LargelyUnnoticedMonWorkedHard,
+    [CONTEST_STRING_WORK_BEFORE]               = gText_WorkedAsMuchAsMonBefore,
+    [CONTEST_STRING_APPEAL_NOT_WELL]           = gText_MonsAppealDidNotGoWell,
+    [CONTEST_STRING_WORK_PRECEDING]            = gText_WorkedAsMuchAsPrecedingMon,
+    [CONTEST_STRING_APPEAL_NOT_WELL2]          = gText_MonsAppealDidNotGoWell2,
+    [CONTEST_STRING_APPEAL_NOT_SHOWN_WELL]     = gText_MonsAppealDidNotGoWell3,
+    [CONTEST_STRING_APPEAL_SLIGHTLY_WELL]      = gText_MonsAppealWentSlightlyWell,
+    [CONTEST_STRING_APPEAL_PRETTY_WELL]        = gText_MonsAppealWentPrettyWell,
+    [CONTEST_STRING_APPEAL_EXCELLENTLY]        = gText_MonsAppealWentExcellently,
+    [CONTEST_STRING_APPEAL_DUD]                = gText_MonsAppealWasDud,
+    [CONTEST_STRING_APPEAL_NOT_VERY_WELL]      = gText_MonsAppealDidNotWorkVeryWell,
+    [CONTEST_STRING_APPEAL_SLIGHTLY_WELL2]     = gText_MonsAppealWentSlightlyWell2,
+    [CONTEST_STRING_APPEAL_PRETTY_WELL2]       = gText_MonsAppealWentPrettyWell2,
+    [CONTEST_STRING_APPEAL_VERY_WELL]          = gText_MonsAppealWentVeryWell,
+    [CONTEST_STRING_APPEAL_EXCELLENTLY2]       = gText_MonsAppealWentExcellently2,
+    [CONTEST_STRING_SAME_TYPE_GOOD]            = gText_SameTypeAsOneBeforeGood,
+    [CONTEST_STRING_DIFF_TYPE_GOOD]            = gText_NotSameTypeAsOneBeforeGood,
+    [CONTEST_STRING_STOOD_OUT_AS_MUCH]         = gText_StoodOutMuchMoreThanMonBefore,
+    [CONTEST_STRING_NOT_AS_WELL]               = gText_DidntDoAsWellAsMonBefore,
+    [CONTEST_STRING_CONDITION_ROSE]            = gText_MonsConditionRoseAboveUsual,
+    [CONTEST_STRING_HOT_STATUS]                = gText_MonsHotStatusMadeGreatAppeal,
+    [CONTEST_STRING_MOVE_UP_LINE]              = gText_MovedUpInLineForNextAppeal,
+    [CONTEST_STRING_MOVE_BACK_LINE]            = gText_MovedBackInLineForNextAppeal,
+    [CONTEST_STRING_SCRAMBLE_ORDER]            = gText_ScrambledUpOrderForNextTurn,
+    [CONTEST_STRING_JUDGE_EXPECTANTLY2]        = gText_JudgeLookedAtMonExpectantly,
+    [CONTEST_STRING_WENT_OVER_WELL]            = gText_AppealComboWentOverWell,
+    [CONTEST_STRING_WENT_OVER_VERY_WELL]       = gText_AppealComboWentOverVeryWell,
+    [CONTEST_STRING_APPEAL_COMBO_EXCELLENTLY]  = gText_AppealComboWentOverExcellently,
+    [CONTEST_STRING_AVERT_GAZE]                = gText_MonManagedToAvertGaze,
+    [CONTEST_STRING_AVOID_SEEING]              = gText_MonManagedToAvoidSeeingIt,
+    [CONTEST_STRING_NOT_FAZED]                 = gText_MonIsntFazedByThatSortOfThing,
+    [CONTEST_STRING_LITTLE_DISTRACTED]         = gText_MonBecameALittleDistracted,
+    [CONTEST_STRING_ATTEMPT_STARTLE]           = gText_TriedToStartleOtherPokemon,
+    [CONTEST_STRING_LOOKED_DOWN]               = gText_MonLookedDownOutOfDistraction,
+    [CONTEST_STRING_TURNED_BACK]               = gText_MonTurnedBackOutOfDistraction,
+    [CONTEST_STRING_UTTER_CRY]                 = gText_MonCouldntHelpUtteringCry,
+    [CONTEST_STRING_LEAPT_UP]                  = gText_MonCouldntHelpLeapingUp,
+    [CONTEST_STRING_TRIPPED_OVER]              = gText_MonTrippedOutOfDistraction,
+    [CONTEST_STRING_MESSED_UP2]                = gText_ButItMessedUp2,
+    [CONTEST_STRING_FAILED_TARGET_NERVOUS]     = gText_ButItFailedToMakeTargetNervous,
+    [CONTEST_STRING_FAILED_ANYONE_NERVOUS]     = gText_ButItFailedToMakeAnyoneNervous,
+    [CONTEST_STRING_IGNORED]                   = gText_ButItWasIgnored,
+    [CONTEST_STRING_NO_CONDITION_IMPROVE]      = gText_CouldntImproveItsCondition,
+    [CONTEST_STRING_BAD_CONDITION_WEAK_APPEAL] = gText_BadConditionResultedInWeakAppeal,
+    [CONTEST_STRING_UNAFFECTED]                = gText_MonWasUnaffected,
+    [CONTEST_STRING_ATTRACTED_ATTENTION]       = gText_AttractedCrowdsAttention
 };
 
-const u8 *const gUnknown_08587F08[] =
+static const u8 *const sContestConditions[] =
 {
-    gText_0827E85F,
-    gText_0827E868,
-    gText_0827E86F,
-    gText_0827E878,
-    gText_0827E882
+    [CONTEST_CATEGORY_COOL]   = gText_Contest_Coolness,
+    [CONTEST_CATEGORY_BEAUTY] = gText_Contest_Beauty,
+    [CONTEST_CATEGORY_CUTE]   = gText_Contest_Cuteness,
+    [CONTEST_CATEGORY_SMART]  = gText_Contest_Smartness,
+    [CONTEST_CATEGORY_TOUGH]  = gText_Contest_Toughness
 };
 
-const u8 *const gUnknown_08587F1C[] =
+static const u8 *const sInvalidContestMoveNames[] =
 {
-    gText_0827E894,
-    gText_0827E89E,
-    gText_0827E8AA,
-    gText_0827E8B4,
-    gText_0827E8BF,
-    gText_0827E8CA
+    [CONTEST_CATEGORY_COOL]    = gText_CoolMove,
+    [CONTEST_CATEGORY_BEAUTY]  = gText_BeautyMove,
+    [CONTEST_CATEGORY_CUTE]    = gText_CuteMove,
+    [CONTEST_CATEGORY_SMART]   = gText_SmartMove,
+    [CONTEST_CATEGORY_TOUGH]   = gText_ToughMove,
+    [CONTEST_CATEGORIES_COUNT] = gText_3QuestionMarks
 };
diff --git a/src/data/decoration/icon.h b/src/data/decoration/icon.h
index 58d9cea7b..b29dab20f 100644
--- a/src/data/decoration/icon.h
+++ b/src/data/decoration/icon.h
@@ -1,123 +1,124 @@
-const u32 *const gUnknown_085A6BE8[][2] = {
-    {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
-    {NULL, NULL},
-    {NULL, NULL},
-    {gUnknown_08DB7AA0, gUnknown_08DB7B34},
-    {gUnknown_08DB7B5C, gUnknown_08DB7BEC},
-    {gUnknown_08DB7C08, gUnknown_08DB7CE8},
-    {gUnknown_08DB7D08, gUnknown_08DB7DCC},
-    {gUnknown_08DB7DF4, gUnknown_08DB7EA0},
-    {gUnknown_08DB7EC4, gUnknown_08DB7F60},
-    {gUnknown_08DB7F7C, gUnknown_08DB8070},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {gUnknown_08DB808C, gUnknown_08DB8138},
-    {gUnknown_08DB8160, gUnknown_08DB8218},
-    {gUnknown_08DB823C, gUnknown_08DB8300},
-    {gUnknown_08DB8328, gUnknown_08DB8430},
-    {gUnknown_08DB8458, gUnknown_08DB8528},
-    {gUnknown_08DB854C, gUnknown_08DB862C},
-    {gUnknown_08DB8654, gUnknown_08DB86C4},
-    {gUnknown_08DB86E0, gUnknown_08DB8750},
-    {gUnknown_08DB876C, gUnknown_08DB87DC},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {gUnknown_08DB87F8, gUnknown_08DB88D8},
-    {gUnknown_08DB8900, gUnknown_08DB89E0},
-    {gUnknown_08DB8A08, gUnknown_08DB8A68},
-    {gUnknown_08DB8A84, gUnknown_08DB8B40},
-    {NULL, NULL},
-    {NULL, NULL},
-    {gUnknown_08DB8B68, gUnknown_08DB8C40},
-    {gUnknown_08DB8C5C, gUnknown_08DB8CF4},
-    {NULL, NULL},
-    {gUnknown_08DB8D18, gUnknown_08DB8DB0},
-    {gUnknown_08DB8DD4, gUnknown_08DB8E80},
-    {NULL, NULL},
-    {NULL, NULL},
-    {gUnknown_08DB8EA0, gUnknown_08DB8F58},
-    {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},
-    {gUnknown_08DB8F7C, gUnknown_08DB9038},
-    {gUnknown_08DB9058, gUnknown_08DB9130},
-    {gUnknown_08DB9154, gUnknown_08DB9218},
-    {gUnknown_08DB9234, gUnknown_08DB92FC},
-    {gUnknown_08DB931C, gUnknown_08DB93E8},
-    {gUnknown_08DB940C, gUnknown_08DB94CC},
-    {gUnknown_08DB94E8, gUnknown_08DB95AC},
-    {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},
-    {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},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {gUnknown_08DB95D0, gUnknown_08DB96C4},
-    {gUnknown_08DB96EC, gUnknown_08DB97F4},
-    {gUnknown_08DB981C, gUnknown_08DB9908},
-    {gUnknown_08DB9930, gUnknown_08DB9A54},
-    {gUnknown_08DB9A7C, gUnknown_08DB9B7C},
-    {gUnknown_08DB9BA4, gUnknown_08DB9CB0},
-    {gUnknown_08DB9CD8, gUnknown_08DB9DAC},
-    {gUnknown_08DB9F08, gUnknown_08DB9FFC},
-    {gUnknown_08DB9DD4, gUnknown_08DB9EE4},
-    {gUnknown_08DBA020, gUnknown_08DBA12C}
+const u32 *const gDecorIconTable[][2] = 
+{
+    [DECOR_NONE]            = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [DECOR_SMALL_DESK]      = {NULL, NULL},
+    [DECOR_POKEMON_DESK]    = {NULL, NULL},
+    [DECOR_HEAVY_DESK]      = {gDecorIcon_HeavyDesk, gDecorIconPalette_HeavyDesk},
+    [DECOR_RAGGED_DESK]     = {gDecorIcon_RaggedDesk, gDecorIconPalette_RaggedDesk},
+    [DECOR_COMFORT_DESK]    = {gDecorIcon_ComfortDesk, gDecorIconPalette_ComfortDesk},
+    [DECOR_PRETTY_DESK]     = {gDecorIcon_PrettyDesk, gDecorIconPalette_PrettyDesk},
+    [DECOR_BRICK_DESK]      = {gDecorIcon_BrickDesk, gDecorIconPalette_BrickDesk},
+    [DECOR_CAMP_DESK]       = {gDecorIcon_CampDesk, gDecorIconPalette_CampDesk},
+    [DECOR_HARD_DESK]       = {gDecorIcon_HardDesk, gDecorIconPalette_HardDesk},
+    [DECOR_SMALL_CHAIR]     = {NULL, NULL},
+    [DECOR_POKEMON_CHAIR]   = {NULL, NULL},
+    [DECOR_HEAVY_CHAIR]     = {NULL, NULL},
+    [DECOR_PRETTY_CHAIR]    = {NULL, NULL},
+    [DECOR_COMFORT_CHAIR]   = {NULL, NULL},
+    [DECOR_RAGGED_CHAIR]    = {NULL, NULL},
+    [DECOR_BRICK_CHAIR]     = {NULL, NULL},
+    [DECOR_CAMP_CHAIR]      = {NULL, NULL},
+    [DECOR_HARD_CHAIR]      = {NULL, NULL},
+    [DECOR_RED_PLANT]       = {gDecorIcon_RedPlant, gDecorIconPalette_RedPlant},
+    [DECOR_TROPICAL_PLANT]  = {gDecorIcon_TropicalPlant, gDecorIconPalette_TropicalPlant},
+    [DECOR_PRETTY_FLOWERS]  = {gDecorIcon_PrettyFlowers, gDecorIconPalette_PrettyFlowers},
+    [DECOR_COLORFUL_PLANT]  = {gDecorIcon_ColorfulPlant, gDecorIconPalette_ColorfulPlant},
+    [DECOR_BIG_PLANT]       = {gDecorIcon_BigPlant, gDecorIconPalette_BigPlant},
+    [DECOR_GORGEOUS_PLANT]  = {gDecorIcon_GorgeousPlant, gDecorIconPalette_GorgeousPlant},
+    [DECOR_RED_BRICK]       = {gDecorIcon_RedBrick, gDecorIconPalette_RedBrick},
+    [DECOR_YELLOW_BRICK]    = {gDecorIcon_YellowBrick, gDecorIconPalette_YellowBrick},
+    [DECOR_BLUE_BRICK]      = {gDecorIcon_BlueBrick, gDecorIconPalette_BlueBrick},
+    [DECOR_RED_BALLOON]     = {NULL, NULL},
+    [DECOR_BLUE_BALLOON]    = {NULL, NULL},
+    [DECOR_YELLOW_BALLOON]  = {NULL, NULL},
+    [DECOR_RED_TENT]        = {gDecorIcon_RedTent, gDecorIconPalette_RedTent},
+    [DECOR_BLUE_TENT]       = {gDecorIcon_BlueTent, gDecorIconPalette_BlueTent},
+    [DECOR_SOLID_BOARD]     = {gDecorIcon_SolidBoard, gDecorIconPalette_SolidBoard},
+    [DECOR_SLIDE]           = {gDecorIcon_Slide, gDecorIconPalette_Slide},
+    [DECOR_FENCE_LENGTH]    = {NULL, NULL},
+    [DECOR_FENCE_WIDTH]     = {NULL, NULL},
+    [DECOR_TIRE]            = {gDecorIcon_Tire, gDecorIconPalette_Tire},
+    [DECOR_STAND]           = {gDecorIcon_Stand, gDecorIconPalette_Stand},
+    [DECOR_MUD_BALL]        = {NULL, NULL},
+    [DECOR_BREAKABLE_DOOR]  = {gDecorIcon_BreakableDoor, gDecorIconPalette_BreakableDoor},
+    [DECOR_SAND_ORNAMENT]   = {gDecorIcon_SandOrnament, gDecorIconPalette_SandOrnament},
+    [DECOR_SILVER_SHIELD]   = {NULL, NULL},
+    [DECOR_GOLD_SHIELD]     = {NULL, NULL},
+    [DECOR_GLASS_ORNAMENT]  = {gDecorIcon_GlassOrnament, gDecorIconPalette_GlassOrnament},
+    [DECOR_TV]              = {NULL, NULL},
+    [DECOR_ROUND_TV]        = {NULL, NULL},
+    [DECOR_CUTE_TV]         = {NULL, NULL},
+    [DECOR_GLITTER_MAT]     = {NULL, NULL},
+    [DECOR_JUMP_MAT]        = {NULL, NULL},
+    [DECOR_SPIN_MAT]        = {NULL, NULL},
+    [DECOR_C_LOW_NOTE_MAT]  = {NULL, NULL},
+    [DECOR_D_NOTE_MAT]      = {NULL, NULL},
+    [DECOR_E_NOTE_MAT]      = {NULL, NULL},
+    [DECOR_F_NOTE_MAT]      = {NULL, NULL},
+    [DECOR_G_NOTE_MAT]      = {NULL, NULL},
+    [DECOR_A_NOTE_MAT]      = {NULL, NULL},
+    [DECOR_B_NOTE_MAT]      = {NULL, NULL},
+    [DECOR_C_HIGH_NOTE_MAT] = {NULL, NULL},
+    [DECOR_SURF_MAT]        = {gDecorIcon_SurfMat, gDecorIconPalette_SurfMat},
+    [DECOR_THUNDER_MAT]     = {gDecorIcon_ThunderMat, gDecorIconPalette_ThunderMat},
+    [DECOR_FIRE_BLAST_MAT]  = {gDecorIcon_FireBlastMat, gDecorIconPalette_FireBlastMat},
+    [DECOR_POWDER_SNOW_MAT] = {gDecorIcon_PowderSnowMat, gDecorIconPalette_PowderSnowMat},
+    [DECOR_ATTRACT_MAT]     = {gDecorIcon_AttractMat, gDecorIconPalette_AttractMat},
+    [DECOR_FISSURE_MAT]     = {gDecorIcon_FissureMat, gDecorIconPalette_FissureMat},
+    [DECOR_SPIKES_MAT]      = {gDecorIcon_SpikesMat, gDecorIconPalette_SpikesMat},
+    [DECOR_BALL_POSTER]     = {NULL, NULL},
+    [DECOR_GREEN_POSTER]    = {NULL, NULL},
+    [DECOR_RED_POSTER]      = {NULL, NULL},
+    [DECOR_BLUE_POSTER]     = {NULL, NULL},
+    [DECOR_CUTE_POSTER]     = {NULL, NULL},
+    [DECOR_PIKA_POSTER]     = {NULL, NULL},
+    [DECOR_LONG_POSTER]     = {NULL, NULL},
+    [DECOR_SEA_POSTER]      = {NULL, NULL},
+    [DECOR_SKY_POSTER]      = {NULL, NULL},
+    [DECOR_KISS_POSTER]     = {NULL, NULL},
+    [DECOR_PICHU_DOLL]      = {NULL, NULL},
+    [DECOR_PIKACHU_DOLL]    = {NULL, NULL},
+    [DECOR_MARILL_DOLL]     = {NULL, NULL},
+    [DECOR_TOGEPI_DOLL]     = {NULL, NULL},
+    [DECOR_CYNDAQUIL_DOLL]  = {NULL, NULL},
+    [DECOR_CHIKORITA_DOLL]  = {NULL, NULL},
+    [DECOR_TOTODILE_DOLL]   = {NULL, NULL},
+    [DECOR_JIGGLYPUFF_DOLL] = {NULL, NULL},
+    [DECOR_MEOWTH_DOLL]     = {NULL, NULL},
+    [DECOR_CLEFAIRY_DOLL]   = {NULL, NULL},
+    [DECOR_DITTO_DOLL]      = {NULL, NULL},
+    [DECOR_SMOOCHUM_DOLL]   = {NULL, NULL},
+    [DECOR_TREECKO_DOLL]    = {NULL, NULL},
+    [DECOR_TORCHIC_DOLL]    = {NULL, NULL},
+    [DECOR_MUDKIP_DOLL]     = {NULL, NULL},
+    [DECOR_DUSKULL_DOLL]    = {NULL, NULL},
+    [DECOR_WYNAUT_DOLL]     = {NULL, NULL},
+    [DECOR_BALTOY_DOLL]     = {NULL, NULL},
+    [DECOR_KECLEON_DOLL]    = {NULL, NULL},
+    [DECOR_AZURILL_DOLL]    = {NULL, NULL},
+    [DECOR_SKITTY_DOLL]     = {NULL, NULL},
+    [DECOR_SWABLU_DOLL]     = {NULL, NULL},
+    [DECOR_GULPIN_DOLL]     = {NULL, NULL},
+    [DECOR_LOTAD_DOLL]      = {NULL, NULL},
+    [DECOR_SEEDOT_DOLL]     = {NULL, NULL},
+    [DECOR_PIKA_CUSHION]    = {NULL, NULL},
+    [DECOR_ROUND_CUSHION]   = {NULL, NULL},
+    [DECOR_KISS_CUSHION]    = {NULL, NULL},
+    [DECOR_ZIGZAG_CUSHION]  = {NULL, NULL},
+    [DECOR_SPIN_CUSHION]    = {NULL, NULL},
+    [DECOR_DIAMOND_CUSHION] = {NULL, NULL},
+    [DECOR_BALL_CUSHION]    = {NULL, NULL},
+    [DECOR_GRASS_CUSHION]   = {NULL, NULL},
+    [DECOR_FIRE_CUSHION]    = {NULL, NULL},
+    [DECOR_WATER_CUSHION]   = {NULL, NULL},
+    [DECOR_SNORLAX_DOLL]    = {gDecorIcon_SnorlaxDoll, gDecorIconPalette_SnorlaxDoll},
+    [DECOR_RHYDON_DOLL]     = {gDecorIcon_RhydonDoll, gDecorIconPalette_RhydonDoll},
+    [DECOR_LAPRAS_DOLL]     = {gDecorIcon_LaprasDoll, gDecorIconPalette_LaprasDoll},
+    [DECOR_VENUSAUR_DOLL]   = {gDecorIcon_VenusaurDoll, gDecorIconPalette_VenusaurDoll},
+    [DECOR_CHARIZARD_DOLL]  = {gDecorIcon_CharizardDoll, gDecorIconPalette_CharizardDoll},
+    [DECOR_BLASTOISE_DOLL]  = {gDecorIcon_BlastoiseDoll, gDecorIconPalette_BlastoiseDoll},
+    [DECOR_WAILMER_DOLL]    = {gDecorIcon_WailmerDoll, gDecorIconPalette_WailmerDoll},
+    [DECOR_REGIROCK_DOLL]   = {gDecorIcon_RegirockDoll, gDecorIconPalette_RegirockDoll},
+    [DECOR_REGICE_DOLL]     = {gDecorIcon_RegiceDoll, gDecorIconPalette_RegiceDoll},
+    [DECOR_REGISTEEL_DOLL]  = {gDecorIcon_RegisteelDoll, gDecorIconPalette_RegisteelDoll}
 };
diff --git a/src/data/field_event_obj/event_object_graphics.h b/src/data/field_event_obj/event_object_graphics.h
index f7f1f33ba..1702392ca 100755
--- a/src/data/field_event_obj/event_object_graphics.h
+++ b/src/data/field_event_obj/event_object_graphics.h
@@ -326,7 +326,7 @@ const u32 gFieldEffectObjectPic_SandDisguisePlaceholder[] = INCBIN_U32("graphics
 const u32 gFieldEffectObjectPic_HotSpringsWater[] = INCBIN_U32("graphics/event_objects/pics/effects/hot_springs_water.4bpp");
 const u16 gFieldEffectObjectPalette2[] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_02.gbapal");
 const u32 gFieldEffectObjectPic_JumpOutOfAsh[] = INCBIN_U32("graphics/event_objects/pics/effects/jump_out_of_ash.4bpp");
-const u32 gFieldEffectObjectPic_Unknown33[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_33.4bpp");
+const u32 gFieldEffectObjectPic_LavaridgeGymWarp[] = INCBIN_U32("graphics/event_objects/pics/effects/lavaridge_gym_warp.4bpp");
 const u32 gFieldEffectObjectPic_Bubbles[] = INCBIN_U32("graphics/event_objects/pics/effects/bubbles.4bpp");
 const u32 gFieldEffectObjectPic_Unknown35[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_35.4bpp");
 const u16 gFieldEffectObjectPalette3[] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_03.gbapal");
diff --git a/src/data/field_event_obj/event_object_graphics_info_pointers.h b/src/data/field_event_obj/event_object_graphics_info_pointers.h
index 0b8aa79b2..661539d57 100755
--- a/src/data/field_event_obj/event_object_graphics_info_pointers.h
+++ b/src/data/field_event_obj/event_object_graphics_info_pointers.h
@@ -489,11 +489,11 @@ const struct EventObjectGraphicsInfo *const gEventObjectGraphicsInfoPointers[] =
 };
 
 const struct EventObjectGraphicsInfo *const gMauvilleOldManGraphicsInfoPointers[] = {
-    &gEventObjectGraphicsInfo_Bard,
-    &gEventObjectGraphicsInfo_Hipster,
-    &gEventObjectGraphicsInfo_Trader,
-    &gEventObjectGraphicsInfo_Storyteller,
-    &gEventObjectGraphicsInfo_Giddy,
-    &gEventObjectGraphicsInfo_UnusedMauvilleOldMan1,
-    &gEventObjectGraphicsInfo_UnusedMauvilleOldMan2,
+    [MAUVILLE_MAN_BARD]        = &gEventObjectGraphicsInfo_Bard,
+    [MAUVILLE_MAN_HIPSTER]     = &gEventObjectGraphicsInfo_Hipster,
+    [MAUVILLE_MAN_TRADER]      = &gEventObjectGraphicsInfo_Trader,
+    [MAUVILLE_MAN_STORYTELLER] = &gEventObjectGraphicsInfo_Storyteller,
+    [MAUVILLE_MAN_GIDDY]       = &gEventObjectGraphicsInfo_Giddy,
+    [MAUVILLE_MAN_UNUSED1]     = &gEventObjectGraphicsInfo_UnusedMauvilleOldMan1,
+    [MAUVILLE_MAN_UNUSED2]     = &gEventObjectGraphicsInfo_UnusedMauvilleOldMan2,
 };
diff --git a/src/data/field_event_obj/event_object_subsprites.h b/src/data/field_event_obj/event_object_subsprites.h
index 5da262731..0b4a80f72 100755
--- a/src/data/field_event_obj/event_object_subsprites.h
+++ b/src/data/field_event_obj/event_object_subsprites.h
@@ -1,24 +1,80 @@
 const struct Subsprite gEventObjectSpriteOamTable_16x16_0[] = {
-    { -8,  -8, 0, 1, 0, 2}
+    { 
+        .x = -8,  
+        .y = -8, 
+        .shape = SPRITE_SHAPE(16x16), 
+        .size = SPRITE_SIZE(16x16), 
+        .tileOffset = 0, 
+        .priority = 2
+    }
 };
 
 const struct Subsprite gEventObjectSpriteOamTable_16x16_1[] = {
-    { -8,  -8, 0, 1, 0, 1}
+    { 
+        .x = -8,  
+        .y = -8, 
+        .shape = SPRITE_SHAPE(16x16), 
+        .size = SPRITE_SIZE(16x16),
+        .tileOffset = 0, 
+        .priority = 1
+    }
 };
 
 const struct Subsprite gEventObjectSpriteOamTable_16x16_2[] = {
-    { -8,  -8, 1, 0, 0, 2},
-    { -8,   0, 1, 0, 2, 3}
+    { 
+        .x = -8,  
+        .y = -8, 
+        .shape = SPRITE_SHAPE(16x8), 
+        .size = SPRITE_SIZE(16x8), 
+        .tileOffset = 0, 
+        .priority = 2
+    },
+    { 
+        .x = -8,  
+        .y =  0, 
+        .shape = SPRITE_SHAPE(16x8), 
+        .size = SPRITE_SIZE(16x8), 
+        .tileOffset = 2, 
+        .priority = 3
+    }
 };
 
 const struct Subsprite gEventObjectSpriteOamTable_16x16_3[] = {
-    { -8,  -8, 0, 1, 0, 2},
-    { -8,  -8, 0, 1, 0, 3}
+    { 
+        .x = -8,  
+        .y = -8, 
+        .shape = SPRITE_SHAPE(16x16), 
+        .size = SPRITE_SIZE(16x16), 
+        .tileOffset = 0, 
+        .priority = 2
+    },
+    { 
+        .x = -8,  
+        .y = -8, 
+        .shape = SPRITE_SHAPE(16x16), 
+        .size = SPRITE_SIZE(16x16), 
+        .tileOffset = 0, 
+        .priority = 3
+    }
 };
 
 const struct Subsprite gEventObjectSpriteOamTable_16x16_4[] = {
-    { -8,  -8, 0, 1, 0, 1},
-    { -8,  -8, 0, 1, 0, 3}
+    { 
+        .x = -8,  
+        .y = -8, 
+        .shape = SPRITE_SHAPE(16x16), 
+        .size = SPRITE_SIZE(16x16), 
+        .tileOffset = 0, 
+        .priority = 1
+    },
+    { 
+        .x = -8,  
+        .y = -8, 
+        .shape = SPRITE_SHAPE(16x16), 
+        .size = SPRITE_SIZE(16x16), 
+        .tileOffset = 0, 
+        .priority = 3
+    }
 };
 
 const struct SubspriteTable gEventObjectSpriteOamTables_16x16[] = {
@@ -31,27 +87,90 @@ const struct SubspriteTable gEventObjectSpriteOamTables_16x16[] = {
 };
 
 const struct Subsprite gEventObjectSpriteOamTable_16x32_0[] = {
-    { -8, -16, 2, 2, 0, 2}
+    { 
+        .x = -8, 
+        .y = -16, 
+        .shape = SPRITE_SHAPE(16x32), 
+        .size = SPRITE_SIZE(16x32), 
+        .tileOffset = 0, 
+        .priority = 2
+    }
 };
 
 const struct Subsprite gEventObjectSpriteOamTable_16x32_1[] = {
-    { -8, -16, 2, 2, 0, 1}
+    { 
+        .x = -8, 
+        .y = -16, 
+        .shape = SPRITE_SHAPE(16x32), 
+        .size = SPRITE_SIZE(16x32),
+        .tileOffset = 0, 
+        .priority = 1
+    }
 };
 
 const struct Subsprite gEventObjectSpriteOamTable_16x32_2[] = {
-    { -8, -16, 0, 1, 0, 2},
-    { -8,   0, 1, 0, 4, 2},
-    { -8,   8, 1, 0, 6, 3}
+    { 
+        .x = -8, 
+        .y = -16, 
+        .shape = SPRITE_SHAPE(16x16), 
+        .size = SPRITE_SIZE(16x16), 
+        .tileOffset = 0, 
+        .priority = 2
+    },
+    { 
+        .x = -8, 
+        .y =   0, 
+        .shape = SPRITE_SHAPE(16x8), 
+        .size = SPRITE_SIZE(16x8), 
+        .tileOffset = 4, 
+        .priority = 2
+    },
+    { 
+        .x = -8, 
+        .y =   8, 
+        .shape = SPRITE_SHAPE(16x8), 
+        .size = SPRITE_SIZE(16x8), 
+        .tileOffset = 6, 
+        .priority = 3
+    }
 };
 
 const struct Subsprite gEventObjectSpriteOamTable_16x32_3[] = {
-    { -8, -16, 0, 1, 0, 2},
-    { -8,   0, 0, 1, 4, 3}
+    { 
+        .x = -8, 
+        .y = -16, 
+        .shape = SPRITE_SHAPE(16x16), 
+        .size = SPRITE_SIZE(16x16), 
+        .tileOffset = 0, 
+        .priority = 2
+    },
+    { 
+        .x = -8, 
+        .y =   0, 
+        .shape = SPRITE_SHAPE(16x16), 
+        .size = SPRITE_SIZE(16x16), 
+        .tileOffset = 4, 
+        .priority = 3
+    }
 };
 
 const struct Subsprite gEventObjectSpriteOamTable_16x32_4[] = {
-    { -8, -16, 0, 1, 0, 1},
-    { -8,   0, 0, 1, 4, 3}
+    { 
+        .x = -8, 
+        .y = -16, 
+        .shape = SPRITE_SHAPE(16x16), 
+        .size = SPRITE_SIZE(16x16), 
+        .tileOffset = 0, 
+        .priority = 1
+    },
+    { 
+        .x = -8, 
+        .y =   0, 
+        .shape = SPRITE_SHAPE(16x16), 
+        .size = SPRITE_SIZE(16x16), 
+        .tileOffset = 4, 
+        .priority = 3
+    }
 };
 
 const struct SubspriteTable gEventObjectSpriteOamTables_16x32[] = {
@@ -64,27 +183,90 @@ const struct SubspriteTable gEventObjectSpriteOamTables_16x32[] = {
 };
 
 const struct Subsprite gEventObjectSpriteOamTable_32x32_0[] = {
-    {-16, -16, 0, 2, 0, 2}
+    {
+        .x = -16, 
+        .y = -16, 
+        .shape = SPRITE_SHAPE(32x32), 
+        .size = SPRITE_SIZE(32x32), 
+        .tileOffset = 0, 
+        .priority = 2
+    }
 };
 
 const struct Subsprite gEventObjectSpriteOamTable_32x32_1[] = {
-    {-16, -16, 0, 2, 0, 1}
+    {
+        .x = -16, 
+        .y = -16, 
+        .shape = SPRITE_SHAPE(32x32), 
+        .size = SPRITE_SIZE(32x32),
+        .tileOffset = 0, 
+        .priority = 1
+    }
 };
 
 const struct Subsprite gEventObjectSpriteOamTable_32x32_2[] = {
-    {-16, -16, 1, 2, 0, 2},
-    {-16,   0, 1, 1, 8, 2},
-    {-16,   8, 1, 1, 12, 3}
+    {
+        .x = -16, 
+        .y = -16, 
+        .shape = SPRITE_SHAPE(32x16), 
+        .size = SPRITE_SIZE(32x16), 
+        .tileOffset = 0, 
+        .priority = 2
+    },
+    {
+        .x = -16, 
+        .y =   0, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 8, 
+        .priority = 2
+    },
+    {
+        .x = -16, 
+        .y =   8, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 12, 
+        .priority = 3
+    }
 };
 
 const struct Subsprite gEventObjectSpriteOamTable_32x32_3[] = {
-    {-16, -16, 1, 2, 0, 2},
-    {-16,   0, 1, 2, 8, 3}
+    {
+        .x = -16, 
+        .y = -16, 
+        .shape = SPRITE_SHAPE(32x16), 
+        .size = SPRITE_SIZE(32x16), 
+        .tileOffset = 0, 
+        .priority = 2
+    },
+    {
+        .x = -16, 
+        .y =   0, 
+        .shape = SPRITE_SHAPE(32x16), 
+        .size = SPRITE_SIZE(32x16),
+        .tileOffset = 8, 
+        .priority = 3
+    }
 };
 
 const struct Subsprite gEventObjectSpriteOamTable_32x32_4[] = {
-    {-16, -16, 1, 2, 0, 1},
-    {-16,   0, 1, 2, 8, 3}
+    {
+        .x = -16, 
+        .y = -16, 
+        .shape = SPRITE_SHAPE(32x16), 
+        .size = SPRITE_SIZE(32x16),
+        .tileOffset = 0, 
+        .priority = 1
+    },
+    {
+        .x = -16, 
+        .y =   0, 
+        .shape = SPRITE_SHAPE(32x16), 
+        .size = SPRITE_SIZE(32x16),
+        .tileOffset = 8, 
+        .priority = 3
+    }
 };
 
 const struct SubspriteTable gEventObjectSpriteOamTables_32x32[] = {
@@ -97,18 +279,102 @@ const struct SubspriteTable gEventObjectSpriteOamTables_32x32[] = {
 };
 
 const struct Subsprite gEventObjectSpriteOamTable_Truck_0[] = {
-    {-24, -24, 1, 1, 0, 2},
-    {  8, -24, 1, 0, 4, 2},
-    {-24, -16, 1, 1, 6, 2},
-    {  8, -16, 1, 0, 10, 2},
-    {-24,  -8, 1, 1, 12, 2},
-    {  8,  -8, 1, 0, 16, 2},
-    {-24,   0, 1, 1, 18, 2},
-    {  8,   0, 1, 0, 22, 2},
-    {-24,   8, 1, 1, 24, 2},
-    {  8,   8, 1, 0, 28, 2},
-    {-24,  16, 1, 1, 30, 2},
-    {  8,  16, 1, 0, 34, 2}
+    {
+        .x = -24, 
+        .y = -24, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 0, 
+        .priority = 2
+    },
+    {
+        .x =   8, 
+        .y = -24, 
+        .shape = SPRITE_SHAPE(16x8), 
+        .size = SPRITE_SIZE(16x8), 
+        .tileOffset = 4, 
+        .priority = 2
+    },
+    {
+        .x = -24, 
+        .y = -16, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 6, 
+        .priority = 2
+    },
+    {
+        .x =   8, 
+        .y = -16, 
+        .shape = SPRITE_SHAPE(16x8), 
+        .size = SPRITE_SIZE(16x8), 
+        .tileOffset = 10, 
+        .priority = 2
+    },
+    {
+        .x = -24, 
+        .y =  -8, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 12, 
+        .priority = 2
+    },
+    {
+        .x =   8, 
+        .y =  -8, 
+        .shape = SPRITE_SHAPE(16x8), 
+        .size = SPRITE_SIZE(16x8), 
+        .tileOffset = 16, 
+        .priority = 2
+    },
+    {
+        .x = -24, 
+        .y =   0, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 18, 
+        .priority = 2
+    },
+    {
+        .x =   8, 
+        .y =   0, 
+        .shape = SPRITE_SHAPE(16x8), 
+        .size = SPRITE_SIZE(16x8), 
+        .tileOffset = 22, 
+        .priority = 2
+    },
+    {
+        .x = -24, 
+        .y =   8, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 24, 
+        .priority = 2
+    },
+    {
+        .x =   8, 
+        .y =   8, 
+        .shape = SPRITE_SHAPE(16x8), 
+        .size = SPRITE_SIZE(16x8), 
+        .tileOffset = 28, 
+        .priority = 2
+    },
+    {
+        .x = -24, 
+        .y =  16, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 30, 
+        .priority = 2
+    },
+    {
+        .x =   8, 
+        .y =  16, 
+        .shape = SPRITE_SHAPE(16x8), 
+        .size = SPRITE_SIZE(16x8), 
+        .tileOffset = 34, 
+        .priority = 2
+    }
 };
 
 const struct SubspriteTable gEventObjectSpriteOamTables_Truck[] = {
@@ -121,19 +387,47 @@ const struct SubspriteTable gEventObjectSpriteOamTables_Truck[] = {
 };
 
 const struct Subsprite gEventObjectSpriteOamTable_Unused_0[] = {
-    {-32, -16, 1, 3, 0, 2}
+    {
+        .x = -32, 
+        .y = -16, 
+        .shape = SPRITE_SHAPE(64x32), 
+        .size = SPRITE_SIZE(64x32), 
+        .tileOffset = 0, 
+        .priority = 2
+    }
 };
 
 const struct Subsprite gEventObjectSpriteOamTable_Unused_1[] = {
-    {-32, -16, 1, 3, 0, 1}
+    {
+        .x = -32, 
+        .y = -16, 
+        .shape = SPRITE_SHAPE(64x32), 
+        .size = SPRITE_SIZE(64x32), 
+        .tileOffset = 0, 
+        .priority = 1
+    }
 };
 
 const struct Subsprite gEventObjectSpriteOamTable_Unused_2[] = {
-    {-32, -16, 1, 3, 0, 2}
+    {
+        .x = -32, 
+        .y = -16, 
+        .shape = SPRITE_SHAPE(64x32), 
+        .size = SPRITE_SIZE(64x32), 
+        .tileOffset = 0, 
+        .priority = 2
+    }
 };
 
 const struct Subsprite gEventObjectSpriteOamTable_Unused_3[] = {
-    {-32, -16, 1, 3, 0, 2}
+    {
+        .x = -32, 
+        .y = -16, 
+        .shape = SPRITE_SHAPE(64x32), 
+        .size = SPRITE_SIZE(64x32), 
+        .tileOffset = 0, 
+        .priority = 2
+    }
 };
 
 const struct SubspriteTable gEventObjectSpriteOamTables_Unused[] = {
@@ -146,19 +440,47 @@ const struct SubspriteTable gEventObjectSpriteOamTables_Unused[] = {
 };
 
 const struct Subsprite gEventObjectSpriteOamTable_64x64_0[] = {
-    {-32, -32, 0, 3, 0, 2}
+    {
+        .x = -32, 
+        .y = -32, 
+        .shape = SPRITE_SHAPE(64x64), 
+        .size = SPRITE_SIZE(64x64), 
+        .tileOffset = 0, 
+        .priority = 2
+    }
 };
 
 const struct Subsprite gEventObjectSpriteOamTable_64x64_1[] = {
-    {-32, -32, 0, 3, 0, 1}
+    {
+        .x = -32, 
+        .y = -32, 
+        .shape = SPRITE_SHAPE(64x64), 
+        .size = SPRITE_SIZE(64x64), 
+        .tileOffset = 0, 
+        .priority = 1
+    }
 };
 
 const struct Subsprite gEventObjectSpriteOamTable_64x64_2[] = {
-    {-32, -32, 0, 3, 0, 2}
+    {
+        .x = -32, 
+        .y = -32, 
+        .shape = SPRITE_SHAPE(64x64), 
+        .size = SPRITE_SIZE(64x64), 
+        .tileOffset = 0, 
+        .priority = 2
+    }
 };
 
 const struct Subsprite gEventObjectSpriteOamTable_64x64_3[] = {
-    {-32, -32, 0, 3, 0, 2}
+    {
+        .x = -32, 
+        .y = -32, 
+        .shape = SPRITE_SHAPE(64x64), 
+        .size = SPRITE_SIZE(64x64), 
+        .tileOffset = 0, 
+        .priority = 2
+    }
 };
 
 const struct SubspriteTable gEventObjectSpriteOamTables_64x64[] = {
@@ -171,75 +493,495 @@ const struct SubspriteTable gEventObjectSpriteOamTables_64x64[] = {
 };
 
 const struct Subsprite gEventObjectSpriteOamTable_SSTidal_0[] = {
-    {-48, -20, 1, 1, 0, 2},
-    {-16, -20, 1, 1, 4, 2},
-    { 16, -20, 1, 1, 8, 2},
-    {-48, -12, 1, 1, 12, 2},
-    {-16, -12, 1, 1, 16, 2},
-    { 16, -12, 1, 1, 20, 2},
-    {-48,  -4, 1, 1, 24, 2},
-    {-16,  -4, 1, 1, 28, 2},
-    { 16,  -4, 1, 1, 32, 2},
-    {-48,   4, 1, 1, 36, 2},
-    {-16,   4, 1, 1, 40, 2},
-    { 16,   4, 1, 1, 44, 2},
-    {-48,  12, 1, 1, 48, 2},
-    {-16,  12, 1, 1, 52, 2},
-    { 16,  12, 1, 1, 56, 2}
+    {
+        .x = -48, 
+        .y = -20, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 0, 
+        .priority = 2
+    },
+    {
+        .x = -16, 
+        .y = -20, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 4, 
+        .priority = 2
+    },
+    {
+        .x =  16, 
+        .y = -20, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 8, 
+        .priority = 2
+    },
+    {
+        .x = -48, 
+        .y = -12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 12, 
+        .priority = 2
+    },
+    {
+        .x = -16, 
+        .y = -12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 16, 
+        .priority = 2
+    },
+    {
+        .x =  16, 
+        .y = -12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 20, 
+        .priority = 2
+    },
+    {
+        .x = -48, 
+        .y =  -4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 24, 
+        .priority = 2
+    },
+    {
+        .x = -16, 
+        .y =  -4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 28, 
+        .priority = 2
+    },
+    {
+        .x =  16, 
+        .y =  -4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 32, 
+        .priority = 2
+    },
+    {
+        .x = -48, 
+        .y =   4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 36, 
+        .priority = 2
+    },
+    {
+        .x = -16, 
+        .y =   4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 40, 
+        .priority = 2
+    },
+    {
+        .x =  16, 
+        .y =   4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 44, 
+        .priority = 2
+    },
+    {
+        .x = -48, 
+        .y =  12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 48, 
+        .priority = 2
+    },
+    {
+        .x = -16, 
+        .y =  12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 52, 
+        .priority = 2
+    },
+    {
+        .x =  16, 
+        .y =  12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 56, 
+        .priority = 2
+    }
 };
 
 const struct Subsprite gEventObjectSpriteOamTable_SSTidal_1[] = {
-    {-48, -20, 1, 1, 0, 1},
-    {-16, -20, 1, 1, 4, 1},
-    { 16, -20, 1, 1, 8, 1},
-    {-48, -12, 1, 1, 12, 1},
-    {-16, -12, 1, 1, 16, 1},
-    { 16, -12, 1, 1, 20, 1},
-    {-48,  -4, 1, 1, 24, 1},
-    {-16,  -4, 1, 1, 28, 1},
-    { 16,  -4, 1, 1, 32, 1},
-    {-48,   4, 1, 1, 36, 1},
-    {-16,   4, 1, 1, 40, 1},
-    { 16,   4, 1, 1, 44, 1},
-    {-48,  12, 1, 1, 48, 1},
-    {-16,  12, 1, 1, 52, 1},
-    { 16,  12, 1, 1, 56, 1}
+    {
+        .x = -48, 
+        .y = -20, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 0, 
+        .priority = 1
+    },
+    {
+        .x = -16, 
+        .y = -20, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 4, 
+        .priority = 1
+    },
+    {
+        .x =  16, 
+        .y = -20, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 8, 
+        .priority = 1
+    },
+    {
+        .x = -48, 
+        .y = -12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 12, 
+        .priority = 1
+    },
+    {
+        .x = -16, 
+        .y = -12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 16, 
+        .priority = 1
+    },
+    {
+        .x =  16, 
+        .y = -12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 20, 
+        .priority = 1
+    },
+    {
+        .x = -48, 
+        .y =  -4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 24, 
+        .priority = 1
+    },
+    {
+        .x = -16, 
+        .y =  -4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 28, 
+        .priority = 1
+    },
+    {
+        .x =  16, 
+        .y =  -4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 32, 
+        .priority = 1
+    },
+    {
+        .x = -48, 
+        .y =   4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 36, 
+        .priority = 1
+    },
+    {
+        .x = -16, 
+        .y =   4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 40, 
+        .priority = 1
+    },
+    {
+        .x =  16, 
+        .y =   4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 44, 
+        .priority = 1
+    },
+    {
+        .x = -48, 
+        .y =  12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 48, 
+        .priority = 1
+    },
+    {
+        .x = -16, 
+        .y =  12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 52, 
+        .priority = 1
+    },
+    {
+        .x =  16, 
+        .y =  12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 56, 
+        .priority = 1
+    }
 };
 
 const struct Subsprite gEventObjectSpriteOamTable_SSTidal_2[] = {
-    {-48, -20, 1, 1, 0, 2},
-    {-16, -20, 1, 1, 4, 2},
-    { 16, -20, 1, 1, 8, 2},
-    {-48, -12, 1, 1, 12, 2},
-    {-16, -12, 1, 1, 16, 2},
-    { 16, -12, 1, 1, 20, 2},
-    {-48,  -4, 1, 1, 24, 2},
-    {-16,  -4, 1, 1, 28, 2},
-    { 16,  -4, 1, 1, 32, 2},
-    {-48,   4, 1, 1, 36, 2},
-    {-16,   4, 1, 1, 40, 2},
-    { 16,   4, 1, 1, 44, 2},
-    {-48,  12, 1, 1, 48, 2},
-    {-16,  12, 1, 1, 52, 2},
-    { 16,  12, 1, 1, 56, 2}
+    {
+        .x = -48, 
+        .y = -20, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 0, 
+        .priority = 2
+    },
+    {
+        .x = -16, 
+        .y = -20, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 4, 
+        .priority = 2
+    },
+    {
+        .x =  16, 
+        .y = -20, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 8, 
+        .priority = 2
+    },
+    {
+        .x = -48, 
+        .y = -12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 12, 
+        .priority = 2
+    },
+    {
+        .x = -16, 
+        .y = -12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 16, 
+        .priority = 2
+    },
+    {
+        .x =  16, 
+        .y = -12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 20, 
+        .priority = 2
+    },
+    {
+        .x = -48, 
+        .y =  -4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 24, 
+        .priority = 2
+    },
+    {
+        .x = -16, 
+        .y =  -4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 28, 
+        .priority = 2
+    },
+    {
+        .x =  16, 
+        .y =  -4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 32, 
+        .priority = 2
+    },
+    {
+        .x = -48, 
+        .y =   4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 36, 
+        .priority = 2
+    },
+    {
+        .x = -16, 
+        .y =   4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 40, 
+        .priority = 2
+    },
+    {
+        .x =  16, 
+        .y =   4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 44, 
+        .priority = 2
+    },
+    {
+        .x = -48, 
+        .y =  12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 48, 
+        .priority = 2
+    },
+    {
+        .x = -16, 
+        .y =  12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 52, 
+        .priority = 2
+    },
+    {
+        .x =  16, 
+        .y =  12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 56, 
+        .priority = 2
+    }
 };
 
 const struct Subsprite gEventObjectSpriteOamTable_SSTidal_3[] = {
-    {-48, -20, 1, 1, 0, 1},
-    {-16, -20, 1, 1, 4, 1},
-    { 16, -20, 1, 1, 8, 1},
-    {-48, -12, 1, 1, 12, 1},
-    {-16, -12, 1, 1, 16, 1},
-    { 16, -12, 1, 1, 20, 1},
-    {-48,  -4, 1, 1, 24, 2},
-    {-16,  -4, 1, 1, 28, 2},
-    { 16,  -4, 1, 1, 32, 2},
-    {-48,   4, 1, 1, 36, 2},
-    {-16,   4, 1, 1, 40, 2},
-    { 16,   4, 1, 1, 44, 2},
-    {-48,  12, 1, 1, 48, 2},
-    {-16,  12, 1, 1, 52, 2},
-    { 16,  12, 1, 1, 56, 2}
+    {
+        .x = -48, 
+        .y = -20, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 0, 
+        .priority = 1
+    },
+    {
+        .x = -16, 
+        .y = -20, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 4, 
+        .priority = 1
+    },
+    {
+        .x =  16, 
+        .y = -20, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 8, 
+        .priority = 1
+    },
+    {
+        .x = -48, 
+        .y = -12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 12, 
+        .priority = 1
+    },
+    {
+        .x = -16, 
+        .y = -12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 16, 
+        .priority = 1
+    },
+    {
+        .x =  16, 
+        .y = -12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 20, 
+        .priority = 1
+    },
+    {
+        .x = -48, 
+        .y =  -4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 24, 
+        .priority = 2
+    },
+    {
+        .x = -16, 
+        .y =  -4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 28, 
+        .priority = 2
+    },
+    {
+        .x =  16, 
+        .y =  -4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 32, 
+        .priority = 2
+    },
+    {
+        .x = -48, 
+        .y =   4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 36, 
+        .priority = 2
+    },
+    {
+        .x = -16, 
+        .y =   4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 40, 
+        .priority = 2
+    },
+    {
+        .x =  16, 
+        .y =   4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 44, 
+        .priority = 2
+    },
+    {
+        .x = -48, 
+        .y =  12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 48, 
+        .priority = 2
+    },
+    {
+        .x = -16, 
+        .y =  12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 52, 
+        .priority = 2
+    },
+    {
+        .x =  16, 
+        .y =  12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 56, 
+        .priority = 2
+    }
 };
 
 const struct SubspriteTable gEventObjectSpriteOamTables_SSTidal[] = {
@@ -252,79 +994,527 @@ const struct SubspriteTable gEventObjectSpriteOamTables_SSTidal[] = {
 };
 
 const struct Subsprite gEventObjectSpriteOamTable_SubmarineShadow_0[] = {
-    {-48, -20, 1, 1, 0, 2},
-    {-16, -20, 1, 1, 4, 2},
-    { 16, -20, 1, 0, 8, 2},
-    { 32, -20, 0, 0, 10, 2},
-    {-48, -12, 1, 1, 11, 2},
-    {-16, -12, 1, 1, 15, 2},
-    { 16, -12, 1, 0, 19, 2},
-    { 32, -12, 0, 0, 21, 2},
-    {-48,  -4, 1, 1, 22, 2},
-    {-16,  -4, 1, 1, 26, 2},
-    { 16,  -4, 1, 0, 30, 2},
-    { 32,  -4, 0, 0, 32, 2},
-    {-48,   4, 1, 1, 33, 2},
-    {-16,   4, 1, 1, 37, 2},
-    { 16,   4, 1, 0, 41, 2},
-    { 32,   4, 0, 0, 43, 2}
+    {
+        .x = -48, 
+        .y = -20, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 0, 
+        .priority = 2
+    },
+    {
+        .x = -16, 
+        .y = -20, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 4, 
+        .priority = 2
+    },
+    {
+        .x =  16, 
+        .y = -20, 
+        .shape = SPRITE_SHAPE(16x8), 
+        .size = SPRITE_SIZE(16x8), 
+        .tileOffset = 8, 
+        .priority = 2
+    },
+    {
+        .x =  32, 
+        .y = -20, 
+        .shape = SPRITE_SHAPE(8x8), 
+        .size = SPRITE_SIZE(8x8), 
+        .tileOffset = 10, 
+        .priority = 2
+    },
+    {
+        .x = -48, 
+        .y = -12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 11, 
+        .priority = 2
+    },
+    {
+        .x = -16, 
+        .y = -12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 15, 
+        .priority = 2
+    },
+    {
+        .x =  16, 
+        .y = -12, 
+        .shape = SPRITE_SHAPE(16x8), 
+        .size = SPRITE_SIZE(16x8), 
+        .tileOffset = 19, 
+        .priority = 2
+    },
+    {
+        .x =  32, 
+        .y = -12, 
+        .shape = SPRITE_SHAPE(8x8), 
+        .size = SPRITE_SIZE(8x8), 
+        .tileOffset = 21, 
+        .priority = 2
+    },
+    {
+        .x = -48, 
+        .y =  -4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 22, 
+        .priority = 2
+    },
+    {
+        .x = -16, 
+        .y =  -4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 26, 
+        .priority = 2
+    },
+    {
+        .x =  16, 
+        .y =  -4, 
+        .shape = SPRITE_SHAPE(16x8), 
+        .size = SPRITE_SIZE(16x8), 
+        .tileOffset = 30, 
+        .priority = 2
+    },
+    {
+        .x =  32, 
+        .y =  -4, 
+        .shape = SPRITE_SHAPE(8x8), 
+        .size = SPRITE_SIZE(8x8), 
+        .tileOffset = 32, 
+        .priority = 2
+    },
+    {
+        .x = -48, 
+        .y =   4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 33, 
+        .priority = 2
+    },
+    {
+        .x = -16, 
+        .y =   4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 37, 
+        .priority = 2
+    },
+    {
+        .x =  16, 
+        .y =   4, 
+        .shape = SPRITE_SHAPE(16x8), 
+        .size = SPRITE_SIZE(16x8), 
+        .tileOffset = 41, 
+        .priority = 2
+    },
+    {
+        .x =  32, 
+        .y =   4, 
+        .shape = SPRITE_SHAPE(8x8), 
+        .size = SPRITE_SIZE(8x8), 
+        .tileOffset = 43, 
+        .priority = 2
+    }
 };
 
 const struct Subsprite gEventObjectSpriteOamTable_SubmarineShadow_1[] = {
-    {-48, -20, 1, 1, 0, 1},
-    {-16, -20, 1, 1, 4, 1},
-    { 16, -20, 1, 0, 8, 1},
-    { 32, -20, 0, 0, 10, 1},
-    {-48, -12, 1, 1, 11, 1},
-    {-16, -12, 1, 1, 15, 1},
-    { 16, -12, 1, 0, 19, 1},
-    { 32, -12, 0, 0, 21, 1},
-    {-48,  -4, 1, 1, 22, 1},
-    {-16,  -4, 1, 1, 26, 1},
-    { 16,  -4, 1, 0, 30, 1},
-    { 32,  -4, 0, 0, 32, 1},
-    {-48,   4, 1, 1, 33, 1},
-    {-16,   4, 1, 1, 37, 1},
-    { 16,   4, 1, 0, 41, 1},
-    { 32,   4, 0, 0, 43, 1}
+    {
+        .x = -48, 
+        .y = -20, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 0, 
+        .priority = 1
+    },
+    {
+        .x = -16, 
+        .y = -20, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 4, 
+        .priority = 1
+    },
+    {
+        .x =  16, 
+        .y = -20, 
+        .shape = SPRITE_SHAPE(16x8), 
+        .size = SPRITE_SIZE(16x8), 
+        .tileOffset = 8, 
+        .priority = 1
+    },
+    {
+        .x =  32, 
+        .y = -20, 
+        .shape = SPRITE_SHAPE(8x8), 
+        .size = SPRITE_SIZE(8x8), 
+        .tileOffset = 10, 
+        .priority = 1
+    },
+    {
+        .x = -48, 
+        .y = -12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 11, 
+        .priority = 1
+    },
+    {
+        .x = -16, 
+        .y = -12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 15, 
+        .priority = 1
+    },
+    {
+        .x =  16, 
+        .y = -12, 
+        .shape = SPRITE_SHAPE(16x8), 
+        .size = SPRITE_SIZE(16x8), 
+        .tileOffset = 19, 
+        .priority = 1
+    },
+    {
+        .x =  32, 
+        .y = -12, 
+        .shape = SPRITE_SHAPE(8x8), 
+        .size = SPRITE_SIZE(8x8), 
+        .tileOffset = 21, 
+        .priority = 1
+    },
+    {
+        .x = -48, 
+        .y =  -4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 22, 
+        .priority = 1
+    },
+    {
+        .x = -16, 
+        .y =  -4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 26, 
+        .priority = 1
+    },
+    {
+        .x =  16, 
+        .y =  -4, 
+        .shape = SPRITE_SHAPE(16x8), 
+        .size = SPRITE_SIZE(16x8), 
+        .tileOffset = 30, 
+        .priority = 1
+    },
+    {
+        .x =  32, 
+        .y =  -4, 
+        .shape = SPRITE_SHAPE(8x8), 
+        .size = SPRITE_SIZE(8x8), 
+        .tileOffset = 32, 
+        .priority = 1
+    },
+    {
+        .x = -48, 
+        .y =   4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 33, 
+        .priority = 1
+    },
+    {
+        .x = -16, 
+        .y =   4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 37, 
+        .priority = 1
+    },
+    {
+        .x =  16, 
+        .y =   4, 
+        .shape = SPRITE_SHAPE(16x8), 
+        .size = SPRITE_SIZE(16x8), 
+        .tileOffset = 41, 
+        .priority = 1
+    },
+    {
+        .x =  32, 
+        .y =   4, 
+        .shape = SPRITE_SHAPE(8x8), 
+        .size = SPRITE_SIZE(8x8), 
+        .tileOffset = 43, 
+        .priority = 1
+    }
 };
 
 const struct Subsprite gEventObjectSpriteOamTable_SubmarineShadow_2[] = {
-    {-48, -20, 1, 1, 0, 2},
-    {-16, -20, 1, 1, 4, 2},
-    { 16, -20, 1, 0, 8, 2},
-    { 32, -20, 0, 0, 10, 2},
-    {-48, -12, 1, 1, 11, 2},
-    {-16, -12, 1, 1, 15, 2},
-    { 16, -12, 1, 0, 19, 2},
-    { 32, -12, 0, 0, 21, 2},
-    {-48,  -4, 1, 1, 22, 2},
-    {-16,  -4, 1, 1, 26, 2},
-    { 16,  -4, 1, 0, 30, 2},
-    { 32,  -4, 0, 0, 32, 2},
-    {-48,   4, 1, 1, 33, 2},
-    {-16,   4, 1, 1, 37, 2},
-    { 16,   4, 1, 0, 41, 2},
-    { 32,   4, 0, 0, 43, 2}
+    {
+        .x = -48, 
+        .y = -20, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 0, 
+        .priority = 2
+    },
+    {
+        .x = -16, 
+        .y = -20, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 4, 
+        .priority = 2
+    },
+    {
+        .x =  16, 
+        .y = -20, 
+        .shape = SPRITE_SHAPE(16x8), 
+        .size = SPRITE_SIZE(16x8), 
+        .tileOffset = 8, 
+        .priority = 2
+    },
+    {
+        .x =  32, 
+        .y = -20, 
+        .shape = SPRITE_SHAPE(8x8), 
+        .size = SPRITE_SIZE(8x8), 
+        .tileOffset = 10, 
+        .priority = 2
+    },
+    {
+        .x = -48, 
+        .y = -12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 11, 
+        .priority = 2
+    },
+    {
+        .x = -16, 
+        .y = -12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 15, 
+        .priority = 2
+    },
+    {
+        .x =  16, 
+        .y = -12, 
+        .shape = SPRITE_SHAPE(16x8), 
+        .size = SPRITE_SIZE(16x8), 
+        .tileOffset = 19, 
+        .priority = 2
+    },
+    {
+        .x =  32, 
+        .y = -12, 
+        .shape = SPRITE_SHAPE(8x8), 
+        .size = SPRITE_SIZE(8x8), 
+        .tileOffset = 21, 
+        .priority = 2
+    },
+    {
+        .x = -48, 
+        .y =  -4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 22, 
+        .priority = 2
+    },
+    {
+        .x = -16, 
+        .y =  -4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 26, 
+        .priority = 2
+    },
+    {
+        .x =  16, 
+        .y =  -4, 
+        .shape = SPRITE_SHAPE(16x8), 
+        .size = SPRITE_SIZE(16x8), 
+        .tileOffset = 30, 
+        .priority = 2
+    },
+    {
+        .x =  32, 
+        .y =  -4, 
+        .shape = SPRITE_SHAPE(8x8), 
+        .size = SPRITE_SIZE(8x8), 
+        .tileOffset = 32, 
+        .priority = 2
+    },
+    {
+        .x = -48, 
+        .y =   4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 33, 
+        .priority = 2
+    },
+    {
+        .x = -16, 
+        .y =   4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 37, 
+        .priority = 2
+    },
+    {
+        .x =  16, 
+        .y =   4, 
+        .shape = SPRITE_SHAPE(16x8), 
+        .size = SPRITE_SIZE(16x8), 
+        .tileOffset = 41, 
+        .priority = 2
+    },
+    {
+        .x =  32, 
+        .y =   4, 
+        .shape = SPRITE_SHAPE(8x8), 
+        .size = SPRITE_SIZE(8x8), 
+        .tileOffset = 43, 
+        .priority = 2
+    }
 };
 
 const struct Subsprite gEventObjectSpriteOamTable_SubmarineShadow_3[] = {
-    {-48, -20, 1, 1, 0, 1},
-    {-16, -20, 1, 1, 4, 1},
-    { 16, -20, 1, 0, 8, 1},
-    { 32, -20, 0, 0, 10, 1},
-    {-48, -12, 1, 1, 11, 1},
-    {-16, -12, 1, 1, 15, 1},
-    { 16, -12, 1, 0, 19, 1},
-    { 32, -12, 0, 0, 21, 1},
-    {-48,  -4, 1, 1, 22, 2},
-    {-16,  -4, 1, 1, 26, 2},
-    { 16,  -4, 1, 0, 30, 2},
-    { 32,  -4, 0, 0, 32, 2},
-    {-48,   4, 1, 1, 33, 2},
-    {-16,   4, 1, 1, 37, 2},
-    { 16,   4, 1, 0, 41, 2},
-    { 32,   4, 0, 0, 43, 2}
+    {
+        .x = -48, 
+        .y = -20, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 0, 
+        .priority = 1
+    },
+    {
+        .x = -16, 
+        .y = -20, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 4, 
+        .priority = 1
+    },
+    {
+        .x =  16, 
+        .y = -20, 
+        .shape = SPRITE_SHAPE(16x8), 
+        .size = SPRITE_SIZE(16x8), 
+        .tileOffset = 8, 
+        .priority = 1
+    },
+    {
+        .x =  32, 
+        .y = -20, 
+        .shape = SPRITE_SHAPE(8x8), 
+        .size = SPRITE_SIZE(8x8), 
+        .tileOffset = 10, 
+        .priority = 1
+    },
+    {
+        .x = -48, 
+        .y = -12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 11, 
+        .priority = 1
+    },
+    {
+        .x = -16, 
+        .y = -12, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 15, 
+        .priority = 1
+    },
+    {
+        .x =  16, 
+        .y = -12, 
+        .shape = SPRITE_SHAPE(16x8), 
+        .size = SPRITE_SIZE(16x8), 
+        .tileOffset = 19, 
+        .priority = 1
+    },
+    {
+        .x =  32, 
+        .y = -12, 
+        .shape = SPRITE_SHAPE(8x8), 
+        .size = SPRITE_SIZE(8x8), 
+        .tileOffset = 21, 
+        .priority = 1
+    },
+    {
+        .x = -48, 
+        .y =  -4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 22, 
+        .priority = 2
+    },
+    {
+        .x = -16, 
+        .y =  -4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 26, 
+        .priority = 2
+    },
+    {
+        .x =  16, 
+        .y =  -4, 
+        .shape = SPRITE_SHAPE(16x8), 
+        .size = SPRITE_SIZE(16x8), 
+        .tileOffset = 30, 
+        .priority = 2
+    },
+    {
+        .x =  32, 
+        .y =  -4, 
+        .shape = SPRITE_SHAPE(8x8), 
+        .size = SPRITE_SIZE(8x8), 
+        .tileOffset = 32, 
+        .priority = 2
+    },
+    {
+        .x = -48, 
+        .y =   4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 33, 
+        .priority = 2
+    },
+    {
+        .x = -16, 
+        .y =   4, 
+        .shape = SPRITE_SHAPE(32x8), 
+        .size = SPRITE_SIZE(32x8), 
+        .tileOffset = 37, 
+        .priority = 2
+    },
+    {
+        .x =  16, 
+        .y =   4, 
+        .shape = SPRITE_SHAPE(16x8), 
+        .size = SPRITE_SIZE(16x8), 
+        .tileOffset = 41, 
+        .priority = 2
+    },
+    {
+        .x =  32, 
+        .y =   4, 
+        .shape = SPRITE_SHAPE(8x8), 
+        .size = SPRITE_SIZE(8x8), 
+        .tileOffset = 43, 
+        .priority = 2
+    }
 };
 
 const struct SubspriteTable gEventObjectSpriteOamTables_SubmarineShadow[] = {
diff --git a/src/data/field_event_obj/field_effect_object_template_pointers.h b/src/data/field_event_obj/field_effect_object_template_pointers.h
index 32d2b069a..de39e6db3 100755
--- a/src/data/field_event_obj/field_effect_object_template_pointers.h
+++ b/src/data/field_event_obj/field_effect_object_template_pointers.h
@@ -31,7 +31,7 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown29;
 const struct SpriteTemplate gFieldEffectObjectTemplate_ShortGrass;
 const struct SpriteTemplate gFieldEffectObjectTemplate_HotSpringsWater;
 const struct SpriteTemplate gFieldEffectObjectTemplate_JumpOutOfAsh;
-const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown33;
+const struct SpriteTemplate gFieldEffectObjectTemplate_LavaridgeGymWarp;
 const struct SpriteTemplate gFieldEffectObjectTemplate_Bubbles;
 const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown35;
 const struct SpriteTemplate gFieldEffectObjectTemplate_Rayquaza;
@@ -70,7 +70,7 @@ const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[] = {
     &gFieldEffectObjectTemplate_ShortGrass,
     &gFieldEffectObjectTemplate_HotSpringsWater,
     &gFieldEffectObjectTemplate_JumpOutOfAsh,
-    &gFieldEffectObjectTemplate_Unknown33,
+    &gFieldEffectObjectTemplate_LavaridgeGymWarp,
     &gFieldEffectObjectTemplate_Bubbles,
     &gFieldEffectObjectTemplate_Unknown35,
     &gFieldEffectObjectTemplate_Rayquaza,
diff --git a/src/data/field_event_obj/field_effect_objects.h b/src/data/field_event_obj/field_effect_objects.h
index a3944de36..d28357765 100755
--- a/src/data/field_event_obj/field_effect_objects.h
+++ b/src/data/field_event_obj/field_effect_objects.h
@@ -892,19 +892,28 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_JumpOutOfAsh[] =
     gFieldEffectObjectImageAnim_850D54C,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_JumpOutOfAsh = {0xFFFF, 0x100D, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_JumpOutOfAsh, gFieldEffectObjectPicTable_JumpOutOfAsh, gDummySpriteAffineAnimTable, sub_80B7CAC};
+const struct SpriteTemplate gFieldEffectObjectTemplate_JumpOutOfAsh = 
+{
+    .tileTag = 0xFFFF, 
+    .paletteTag = 0x100D, 
+    .oam = &gEventObjectBaseOam_16x16, 
+    .anims = gFieldEffectObjectImageAnimTable_JumpOutOfAsh, 
+    .images = gFieldEffectObjectPicTable_JumpOutOfAsh, 
+    .affineAnims = gDummySpriteAffineAnimTable, 
+    .callback = SpriteCB_PopOutOfAsh
+};
 
 const struct SpritePalette gFieldEffectObjectPaletteInfo2 = {gFieldEffectObjectPalette2, 0x100D};
 
-const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown33[] = {
-    overworld_frame(gFieldEffectObjectPic_Unknown33, 2, 2, 0),
-    overworld_frame(gFieldEffectObjectPic_Unknown33, 2, 2, 1),
-    overworld_frame(gFieldEffectObjectPic_Unknown33, 2, 2, 2),
-    overworld_frame(gFieldEffectObjectPic_Unknown33, 2, 2, 3),
-    overworld_frame(gFieldEffectObjectPic_Unknown33, 2, 2, 4),
+const struct SpriteFrameImage gFieldEffectObjectPicTable_LavaridgeGymWarp[] = {
+    overworld_frame(gFieldEffectObjectPic_LavaridgeGymWarp, 2, 2, 0),
+    overworld_frame(gFieldEffectObjectPic_LavaridgeGymWarp, 2, 2, 1),
+    overworld_frame(gFieldEffectObjectPic_LavaridgeGymWarp, 2, 2, 2),
+    overworld_frame(gFieldEffectObjectPic_LavaridgeGymWarp, 2, 2, 3),
+    overworld_frame(gFieldEffectObjectPic_LavaridgeGymWarp, 2, 2, 4),
 };
 
-const union AnimCmd gFieldEffectObjectImageAnim_850D5B0[] =
+const union AnimCmd gFieldEffectObjectImageAnim_LavaridgeGymWarp[] =
 {
     ANIMCMD_FRAME(0, 6),
     ANIMCMD_FRAME(1, 6),
@@ -914,12 +923,21 @@ const union AnimCmd gFieldEffectObjectImageAnim_850D5B0[] =
     ANIMCMD_END,
 };
 
-const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown33[] =
+const union AnimCmd *const gFieldEffectObjectImageAnimTable_LavaridgeGymWarp[] =
 {
-    gFieldEffectObjectImageAnim_850D5B0,
+    gFieldEffectObjectImageAnim_LavaridgeGymWarp,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown33 = {0xFFFF, 0x100D, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown33, gFieldEffectObjectPicTable_Unknown33, gDummySpriteAffineAnimTable, sub_80B7A58};
+const struct SpriteTemplate gFieldEffectObjectTemplate_LavaridgeGymWarp = 
+{
+    .tileTag = 0xFFFF, 
+    .paletteTag = 0x100D, 
+    .oam = &gEventObjectBaseOam_16x16, 
+    .anims = gFieldEffectObjectImageAnimTable_LavaridgeGymWarp, 
+    .images = gFieldEffectObjectPicTable_LavaridgeGymWarp, 
+    .affineAnims = gDummySpriteAffineAnimTable, 
+    .callback = SpriteCB_LavaridgeGymWarp
+};
 
 const struct SpriteFrameImage gFieldEffectObjectPicTable_Bubbles[] = {
     overworld_frame(gFieldEffectObjectPic_Bubbles, 2, 4, 0),
diff --git a/src/data/field_event_obj/movement_action_func_tables.h b/src/data/field_event_obj/movement_action_func_tables.h
index 712988f5e..8e136b58b 100755
--- a/src/data/field_event_obj/movement_action_func_tables.h
+++ b/src/data/field_event_obj/movement_action_func_tables.h
@@ -170,8 +170,8 @@ u8 MovementAction_SetFixedPriority_Step0(struct EventObject *, struct Sprite *);
 u8 MovementAction_ClearFixedPriority_Step0(struct EventObject *, struct Sprite *);
 u8 MovementAction_InitAffineAnim_Step0(struct EventObject *, struct Sprite *);
 u8 MovementAction_ClearAffineAnim_Step0(struct EventObject *, struct Sprite *);
-u8 MovementAction_Unknown1_Step0(struct EventObject *, struct Sprite *);
-u8 MovementAction_Unknown2_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_HideReflection_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_ShowReflection_Step0(struct EventObject *, struct Sprite *);
 u8 MovementAction_WalkDownStartAffine_Step0(struct EventObject *, struct Sprite *);
 u8 MovementAction_WalkDownStartAffine_Step1(struct EventObject *, struct Sprite *);
 u8 MovementAction_WalkDownAffine_Step0(struct EventObject *, struct Sprite *);
@@ -358,8 +358,8 @@ u8 (*const gMovementActionFuncs_SetFixedPriority[])(struct EventObject *, struct
 u8 (*const gMovementActionFuncs_ClearFixedPriority[])(struct EventObject *, struct Sprite *);
 u8 (*const gMovementActionFuncs_InitAffineAnim[])(struct EventObject *, struct Sprite *);
 u8 (*const gMovementActionFuncs_ClearAffineAnim[])(struct EventObject *, struct Sprite *);
-u8 (*const gMovementActionFuncs_Unknown1[])(struct EventObject *, struct Sprite *);
-u8 (*const gMovementActionFuncs_Unknown2[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_HideReflection[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_ShowReflection[])(struct EventObject *, struct Sprite *);
 u8 (*const gMovementActionFuncs_WalkDownStartAffine[])(struct EventObject *, struct Sprite *);
 u8 (*const gMovementActionFuncs_WalkDownAffine[])(struct EventObject *, struct Sprite *);
 u8 (*const gMovementActionFuncs_AcroWheelieFaceDown[])(struct EventObject *, struct Sprite *);
@@ -518,8 +518,8 @@ u8 (*const *const gMovementActionFuncs[])(struct EventObject *, struct Sprite *)
     [MOVEMENT_ACTION_CLEAR_FIXED_PRIORITY] = gMovementActionFuncs_ClearFixedPriority,
     [MOVEMENT_ACTION_INIT_AFFINE_ANIM] = gMovementActionFuncs_InitAffineAnim,
     [MOVEMENT_ACTION_CLEAR_AFFINE_ANIM] = gMovementActionFuncs_ClearAffineAnim,
-    [MOVEMENT_ACTION_UNKNOWN1] = gMovementActionFuncs_Unknown1,
-    [MOVEMENT_ACTION_UNKNOWN2] = gMovementActionFuncs_Unknown2,
+    [MOVEMENT_ACTION_HIDE_REFLECTION] = gMovementActionFuncs_HideReflection,
+    [MOVEMENT_ACTION_SHOW_REFLECTION] = gMovementActionFuncs_ShowReflection,
     [MOVEMENT_ACTION_WALK_DOWN_START_AFFINE] = gMovementActionFuncs_WalkDownStartAffine,
     [MOVEMENT_ACTION_WALK_DOWN_AFFINE] = gMovementActionFuncs_WalkDownAffine,
     [MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN] = gMovementActionFuncs_AcroWheelieFaceDown,
@@ -1197,13 +1197,13 @@ u8 (*const gMovementActionFuncs_ClearAffineAnim[])(struct EventObject *, struct
     MovementAction_Finish,
 };
 
-u8 (*const gMovementActionFuncs_Unknown1[])(struct EventObject *, struct Sprite *) = {
-    MovementAction_Unknown1_Step0,
+u8 (*const gMovementActionFuncs_HideReflection[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_HideReflection_Step0,
     MovementAction_Finish,
 };
 
-u8 (*const gMovementActionFuncs_Unknown2[])(struct EventObject *, struct Sprite *) = {
-    MovementAction_Unknown2_Step0,
+u8 (*const gMovementActionFuncs_ShowReflection[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_ShowReflection_Step0,
     MovementAction_Finish,
 };
 
diff --git a/src/data/graphics/decorations.h b/src/data/graphics/decorations.h
index 62d86d48e..d8b865fcf 100644
--- a/src/data/graphics/decorations.h
+++ b/src/data/graphics/decorations.h
@@ -1,125 +1,125 @@
-const u32 gUnknown_08DB7AA0[] = INCBIN_U32("graphics/decorations/decor_heavy_desk.4bpp.lz");
-const u32 gUnknown_08DB7B34[] = INCBIN_U32("graphics/decorations/decor_heavy_desk.gbapal.lz");
+const u32 gDecorIcon_HeavyDesk[] = INCBIN_U32("graphics/decorations/decor_heavy_desk.4bpp.lz");
+const u32 gDecorIconPalette_HeavyDesk[] = INCBIN_U32("graphics/decorations/decor_heavy_desk.gbapal.lz");
 
-const u32 gUnknown_08DB7B5C[] = INCBIN_U32("graphics/decorations/decor_ragged_desk.4bpp.lz");
-const u32 gUnknown_08DB7BEC[] = INCBIN_U32("graphics/decorations/decor_ragged_desk.gbapal.lz");
+const u32 gDecorIcon_RaggedDesk[] = INCBIN_U32("graphics/decorations/decor_ragged_desk.4bpp.lz");
+const u32 gDecorIconPalette_RaggedDesk[] = INCBIN_U32("graphics/decorations/decor_ragged_desk.gbapal.lz");
 
-const u32 gUnknown_08DB7C08[] = INCBIN_U32("graphics/decorations/decor_comfort_desk.4bpp.lz");
-const u32 gUnknown_08DB7CE8[] = INCBIN_U32("graphics/decorations/decor_comfort_desk.gbapal.lz");
+const u32 gDecorIcon_ComfortDesk[] = INCBIN_U32("graphics/decorations/decor_comfort_desk.4bpp.lz");
+const u32 gDecorIconPalette_ComfortDesk[] = INCBIN_U32("graphics/decorations/decor_comfort_desk.gbapal.lz");
 
-const u32 gUnknown_08DB7D08[] = INCBIN_U32("graphics/decorations/decor_pretty_desk.4bpp.lz");
-const u32 gUnknown_08DB7DCC[] = INCBIN_U32("graphics/decorations/decor_pretty_desk.gbapal.lz");
+const u32 gDecorIcon_PrettyDesk[] = INCBIN_U32("graphics/decorations/decor_pretty_desk.4bpp.lz");
+const u32 gDecorIconPalette_PrettyDesk[] = INCBIN_U32("graphics/decorations/decor_pretty_desk.gbapal.lz");
 
-const u32 gUnknown_08DB7DF4[] = INCBIN_U32("graphics/decorations/decor_brick_desk.4bpp.lz");
-const u32 gUnknown_08DB7EA0[] = INCBIN_U32("graphics/decorations/decor_brick_desk.gbapal.lz");
+const u32 gDecorIcon_BrickDesk[] = INCBIN_U32("graphics/decorations/decor_brick_desk.4bpp.lz");
+const u32 gDecorIconPalette_BrickDesk[] = INCBIN_U32("graphics/decorations/decor_brick_desk.gbapal.lz");
 
-const u32 gUnknown_08DB7EC4[] = INCBIN_U32("graphics/decorations/decor_camp_desk.4bpp.lz");
-const u32 gUnknown_08DB7F60[] = INCBIN_U32("graphics/decorations/decor_camp_desk.gbapal.lz");
+const u32 gDecorIcon_CampDesk[] = INCBIN_U32("graphics/decorations/decor_camp_desk.4bpp.lz");
+const u32 gDecorIconPalette_CampDesk[] = INCBIN_U32("graphics/decorations/decor_camp_desk.gbapal.lz");
 
-const u32 gUnknown_08DB7F7C[] = INCBIN_U32("graphics/decorations/decor_hard_desk.4bpp.lz");
-const u32 gUnknown_08DB8070[] = INCBIN_U32("graphics/decorations/decor_hard_desk.gbapal.lz");
+const u32 gDecorIcon_HardDesk[] = INCBIN_U32("graphics/decorations/decor_hard_desk.4bpp.lz");
+const u32 gDecorIconPalette_HardDesk[] = INCBIN_U32("graphics/decorations/decor_hard_desk.gbapal.lz");
 
-const u32 gUnknown_08DB808C[] = INCBIN_U32("graphics/decorations/decor_red_plant.4bpp.lz");
-const u32 gUnknown_08DB8138[] = INCBIN_U32("graphics/decorations/decor_red_plant.gbapal.lz");
+const u32 gDecorIcon_RedPlant[] = INCBIN_U32("graphics/decorations/decor_red_plant.4bpp.lz");
+const u32 gDecorIconPalette_RedPlant[] = INCBIN_U32("graphics/decorations/decor_red_plant.gbapal.lz");
 
-const u32 gUnknown_08DB8160[] = INCBIN_U32("graphics/decorations/decor_tropical_plant.4bpp.lz");
-const u32 gUnknown_08DB8218[] = INCBIN_U32("graphics/decorations/decor_tropical_plant.gbapal.lz");
+const u32 gDecorIcon_TropicalPlant[] = INCBIN_U32("graphics/decorations/decor_tropical_plant.4bpp.lz");
+const u32 gDecorIconPalette_TropicalPlant[] = INCBIN_U32("graphics/decorations/decor_tropical_plant.gbapal.lz");
 
-const u32 gUnknown_08DB823C[] = INCBIN_U32("graphics/decorations/decor_pretty_flowers.4bpp.lz");
-const u32 gUnknown_08DB8300[] = INCBIN_U32("graphics/decorations/decor_pretty_flowers.gbapal.lz");
+const u32 gDecorIcon_PrettyFlowers[] = INCBIN_U32("graphics/decorations/decor_pretty_flowers.4bpp.lz");
+const u32 gDecorIconPalette_PrettyFlowers[] = INCBIN_U32("graphics/decorations/decor_pretty_flowers.gbapal.lz");
 
-const u32 gUnknown_08DB8328[] = INCBIN_U32("graphics/decorations/decor_colorful_plant.4bpp.lz");
-const u32 gUnknown_08DB8430[] = INCBIN_U32("graphics/decorations/decor_colorful_plant.gbapal.lz");
+const u32 gDecorIcon_ColorfulPlant[] = INCBIN_U32("graphics/decorations/decor_colorful_plant.4bpp.lz");
+const u32 gDecorIconPalette_ColorfulPlant[] = INCBIN_U32("graphics/decorations/decor_colorful_plant.gbapal.lz");
 
-const u32 gUnknown_08DB8458[] = INCBIN_U32("graphics/decorations/decor_big_plant.4bpp.lz");
-const u32 gUnknown_08DB8528[] = INCBIN_U32("graphics/decorations/decor_big_plant.gbapal.lz");
+const u32 gDecorIcon_BigPlant[] = INCBIN_U32("graphics/decorations/decor_big_plant.4bpp.lz");
+const u32 gDecorIconPalette_BigPlant[] = INCBIN_U32("graphics/decorations/decor_big_plant.gbapal.lz");
 
-const u32 gUnknown_08DB854C[] = INCBIN_U32("graphics/decorations/decor_gorgeous_plant.4bpp.lz");
-const u32 gUnknown_08DB862C[] = INCBIN_U32("graphics/decorations/decor_gorgeous_plant.gbapal.lz");
+const u32 gDecorIcon_GorgeousPlant[] = INCBIN_U32("graphics/decorations/decor_gorgeous_plant.4bpp.lz");
+const u32 gDecorIconPalette_GorgeousPlant[] = INCBIN_U32("graphics/decorations/decor_gorgeous_plant.gbapal.lz");
 
-const u32 gUnknown_08DB8654[] = INCBIN_U32("graphics/decorations/decor_red_brick.4bpp.lz");
-const u32 gUnknown_08DB86C4[] = INCBIN_U32("graphics/decorations/decor_red_brick.gbapal.lz");
+const u32 gDecorIcon_RedBrick[] = INCBIN_U32("graphics/decorations/decor_red_brick.4bpp.lz");
+const u32 gDecorIconPalette_RedBrick[] = INCBIN_U32("graphics/decorations/decor_red_brick.gbapal.lz");
 
-const u32 gUnknown_08DB86E0[] = INCBIN_U32("graphics/decorations/decor_yellow_brick.4bpp.lz");
-const u32 gUnknown_08DB8750[] = INCBIN_U32("graphics/decorations/decor_yellow_brick.gbapal.lz");
+const u32 gDecorIcon_YellowBrick[] = INCBIN_U32("graphics/decorations/decor_yellow_brick.4bpp.lz");
+const u32 gDecorIconPalette_YellowBrick[] = INCBIN_U32("graphics/decorations/decor_yellow_brick.gbapal.lz");
 
-const u32 gUnknown_08DB876C[] = INCBIN_U32("graphics/decorations/decor_blue_brick.4bpp.lz");
-const u32 gUnknown_08DB87DC[] = INCBIN_U32("graphics/decorations/decor_blue_brick.gbapal.lz");
+const u32 gDecorIcon_BlueBrick[] = INCBIN_U32("graphics/decorations/decor_blue_brick.4bpp.lz");
+const u32 gDecorIconPalette_BlueBrick[] = INCBIN_U32("graphics/decorations/decor_blue_brick.gbapal.lz");
 
-const u32 gUnknown_08DB87F8[] = INCBIN_U32("graphics/decorations/decor_red_tent.4bpp.lz");
-const u32 gUnknown_08DB88D8[] = INCBIN_U32("graphics/decorations/decor_red_tent.gbapal.lz");
+const u32 gDecorIcon_RedTent[] = INCBIN_U32("graphics/decorations/decor_red_tent.4bpp.lz");
+const u32 gDecorIconPalette_RedTent[] = INCBIN_U32("graphics/decorations/decor_red_tent.gbapal.lz");
 
-const u32 gUnknown_08DB8900[] = INCBIN_U32("graphics/decorations/decor_blue_tent.4bpp.lz");
-const u32 gUnknown_08DB89E0[] = INCBIN_U32("graphics/decorations/decor_blue_tent.gbapal.lz");
+const u32 gDecorIcon_BlueTent[] = INCBIN_U32("graphics/decorations/decor_blue_tent.4bpp.lz");
+const u32 gDecorIconPalette_BlueTent[] = INCBIN_U32("graphics/decorations/decor_blue_tent.gbapal.lz");
 
-const u32 gUnknown_08DB8A08[] = INCBIN_U32("graphics/decorations/decor_solid_board.4bpp.lz");
-const u32 gUnknown_08DB8A68[] = INCBIN_U32("graphics/decorations/decor_solid_board.gbapal.lz");
+const u32 gDecorIcon_SolidBoard[] = INCBIN_U32("graphics/decorations/decor_solid_board.4bpp.lz");
+const u32 gDecorIconPalette_SolidBoard[] = INCBIN_U32("graphics/decorations/decor_solid_board.gbapal.lz");
 
-const u32 gUnknown_08DB8A84[] = INCBIN_U32("graphics/decorations/decor_slide.4bpp.lz");
-const u32 gUnknown_08DB8B40[] = INCBIN_U32("graphics/decorations/decor_slide.gbapal.lz");
+const u32 gDecorIcon_Slide[] = INCBIN_U32("graphics/decorations/decor_slide.4bpp.lz");
+const u32 gDecorIconPalette_Slide[] = INCBIN_U32("graphics/decorations/decor_slide.gbapal.lz");
 
-const u32 gUnknown_08DB8B68[] = INCBIN_U32("graphics/decorations/decor_tire.4bpp.lz");
-const u32 gUnknown_08DB8C40[] = INCBIN_U32("graphics/decorations/decor_tire.gbapal.lz");
+const u32 gDecorIcon_Tire[] = INCBIN_U32("graphics/decorations/decor_tire.4bpp.lz");
+const u32 gDecorIconPalette_Tire[] = INCBIN_U32("graphics/decorations/decor_tire.gbapal.lz");
 
-const u32 gUnknown_08DB8C5C[] = INCBIN_U32("graphics/decorations/decor_stand.4bpp.lz");
-const u32 gUnknown_08DB8CF4[] = INCBIN_U32("graphics/decorations/decor_stand.gbapal.lz");
+const u32 gDecorIcon_Stand[] = INCBIN_U32("graphics/decorations/decor_stand.4bpp.lz");
+const u32 gDecorIconPalette_Stand[] = INCBIN_U32("graphics/decorations/decor_stand.gbapal.lz");
 
-const u32 gUnknown_08DB8D18[] = INCBIN_U32("graphics/decorations/decor_breakable_door.4bpp.lz");
-const u32 gUnknown_08DB8DB0[] = INCBIN_U32("graphics/decorations/decor_breakable_door.gbapal.lz");
+const u32 gDecorIcon_BreakableDoor[] = INCBIN_U32("graphics/decorations/decor_breakable_door.4bpp.lz");
+const u32 gDecorIconPalette_BreakableDoor[] = INCBIN_U32("graphics/decorations/decor_breakable_door.gbapal.lz");
 
-const u32 gUnknown_08DB8DD4[] = INCBIN_U32("graphics/decorations/decor_sand_ornament.4bpp.lz");
-const u32 gUnknown_08DB8E80[] = INCBIN_U32("graphics/decorations/decor_sand_ornament.gbapal.lz");
+const u32 gDecorIcon_SandOrnament[] = INCBIN_U32("graphics/decorations/decor_sand_ornament.4bpp.lz");
+const u32 gDecorIconPalette_SandOrnament[] = INCBIN_U32("graphics/decorations/decor_sand_ornament.gbapal.lz");
 
-const u32 gUnknown_08DB8EA0[] = INCBIN_U32("graphics/decorations/decor_glass_ornament.4bpp.lz");
-const u32 gUnknown_08DB8F58[] = INCBIN_U32("graphics/decorations/decor_glass_ornament.gbapal.lz");
+const u32 gDecorIcon_GlassOrnament[] = INCBIN_U32("graphics/decorations/decor_glass_ornament.4bpp.lz");
+const u32 gDecorIconPalette_GlassOrnament[] = INCBIN_U32("graphics/decorations/decor_glass_ornament.gbapal.lz");
 
-const u32 gUnknown_08DB8F7C[] = INCBIN_U32("graphics/decorations/decor_surf_mat.4bpp.lz");
-const u32 gUnknown_08DB9038[] = INCBIN_U32("graphics/decorations/decor_surf_mat.gbapal.lz");
+const u32 gDecorIcon_SurfMat[] = INCBIN_U32("graphics/decorations/decor_surf_mat.4bpp.lz");
+const u32 gDecorIconPalette_SurfMat[] = INCBIN_U32("graphics/decorations/decor_surf_mat.gbapal.lz");
 
-const u32 gUnknown_08DB9058[] = INCBIN_U32("graphics/decorations/decor_thunder_mat.4bpp.lz");
-const u32 gUnknown_08DB9130[] = INCBIN_U32("graphics/decorations/decor_thunder_mat.gbapal.lz");
+const u32 gDecorIcon_ThunderMat[] = INCBIN_U32("graphics/decorations/decor_thunder_mat.4bpp.lz");
+const u32 gDecorIconPalette_ThunderMat[] = INCBIN_U32("graphics/decorations/decor_thunder_mat.gbapal.lz");
 
-const u32 gUnknown_08DB9154[] = INCBIN_U32("graphics/decorations/decor_fire_blast_mat.4bpp.lz");
-const u32 gUnknown_08DB9218[] = INCBIN_U32("graphics/decorations/decor_fire_blast_mat.gbapal.lz");
+const u32 gDecorIcon_FireBlastMat[] = INCBIN_U32("graphics/decorations/decor_fire_blast_mat.4bpp.lz");
+const u32 gDecorIconPalette_FireBlastMat[] = INCBIN_U32("graphics/decorations/decor_fire_blast_mat.gbapal.lz");
 
-const u32 gUnknown_08DB9234[] = INCBIN_U32("graphics/decorations/decor_powder_snow_mat.4bpp.lz");
-const u32 gUnknown_08DB92FC[] = INCBIN_U32("graphics/decorations/decor_powder_snow_mat.gbapal.lz");
+const u32 gDecorIcon_PowderSnowMat[] = INCBIN_U32("graphics/decorations/decor_powder_snow_mat.4bpp.lz");
+const u32 gDecorIconPalette_PowderSnowMat[] = INCBIN_U32("graphics/decorations/decor_powder_snow_mat.gbapal.lz");
 
-const u32 gUnknown_08DB931C[] = INCBIN_U32("graphics/decorations/decor_attract_mat.4bpp.lz");
-const u32 gUnknown_08DB93E8[] = INCBIN_U32("graphics/decorations/decor_attract_mat.gbapal.lz");
+const u32 gDecorIcon_AttractMat[] = INCBIN_U32("graphics/decorations/decor_attract_mat.4bpp.lz");
+const u32 gDecorIconPalette_AttractMat[] = INCBIN_U32("graphics/decorations/decor_attract_mat.gbapal.lz");
 
-const u32 gUnknown_08DB940C[] = INCBIN_U32("graphics/decorations/decor_fissure_mat.4bpp.lz");
-const u32 gUnknown_08DB94CC[] = INCBIN_U32("graphics/decorations/decor_fissure_mat.gbapal.lz");
+const u32 gDecorIcon_FissureMat[] = INCBIN_U32("graphics/decorations/decor_fissure_mat.4bpp.lz");
+const u32 gDecorIconPalette_FissureMat[] = INCBIN_U32("graphics/decorations/decor_fissure_mat.gbapal.lz");
 
-const u32 gUnknown_08DB94E8[] = INCBIN_U32("graphics/decorations/decor_spikes_mat.4bpp.lz");
-const u32 gUnknown_08DB95AC[] = INCBIN_U32("graphics/decorations/decor_spikes_mat.gbapal.lz");
+const u32 gDecorIcon_SpikesMat[] = INCBIN_U32("graphics/decorations/decor_spikes_mat.4bpp.lz");
+const u32 gDecorIconPalette_SpikesMat[] = INCBIN_U32("graphics/decorations/decor_spikes_mat.gbapal.lz");
 
-const u32 gUnknown_08DB95D0[] = INCBIN_U32("graphics/decorations/decor_snorlax_doll.4bpp.lz");
-const u32 gUnknown_08DB96C4[] = INCBIN_U32("graphics/decorations/decor_snorlax_doll.gbapal.lz");
+const u32 gDecorIcon_SnorlaxDoll[] = INCBIN_U32("graphics/decorations/decor_snorlax_doll.4bpp.lz");
+const u32 gDecorIconPalette_SnorlaxDoll[] = INCBIN_U32("graphics/decorations/decor_snorlax_doll.gbapal.lz");
 
-const u32 gUnknown_08DB96EC[] = INCBIN_U32("graphics/decorations/decor_rhydon_doll.4bpp.lz");
-const u32 gUnknown_08DB97F4[] = INCBIN_U32("graphics/decorations/decor_rhydon_doll.gbapal.lz");
+const u32 gDecorIcon_RhydonDoll[] = INCBIN_U32("graphics/decorations/decor_rhydon_doll.4bpp.lz");
+const u32 gDecorIconPalette_RhydonDoll[] = INCBIN_U32("graphics/decorations/decor_rhydon_doll.gbapal.lz");
 
-const u32 gUnknown_08DB981C[] = INCBIN_U32("graphics/decorations/decor_lapras_doll.4bpp.lz");
-const u32 gUnknown_08DB9908[] = INCBIN_U32("graphics/decorations/decor_lapras_doll.gbapal.lz");
+const u32 gDecorIcon_LaprasDoll[] = INCBIN_U32("graphics/decorations/decor_lapras_doll.4bpp.lz");
+const u32 gDecorIconPalette_LaprasDoll[] = INCBIN_U32("graphics/decorations/decor_lapras_doll.gbapal.lz");
 
-const u32 gUnknown_08DB9930[] = INCBIN_U32("graphics/decorations/decor_venusaur_doll.4bpp.lz");
-const u32 gUnknown_08DB9A54[] = INCBIN_U32("graphics/decorations/decor_venusaur_doll.gbapal.lz");
+const u32 gDecorIcon_VenusaurDoll[] = INCBIN_U32("graphics/decorations/decor_venusaur_doll.4bpp.lz");
+const u32 gDecorIconPalette_VenusaurDoll[] = INCBIN_U32("graphics/decorations/decor_venusaur_doll.gbapal.lz");
 
-const u32 gUnknown_08DB9A7C[] = INCBIN_U32("graphics/decorations/decor_charizard_doll.4bpp.lz");
-const u32 gUnknown_08DB9B7C[] = INCBIN_U32("graphics/decorations/decor_charizard_doll.gbapal.lz");
+const u32 gDecorIcon_CharizardDoll[] = INCBIN_U32("graphics/decorations/decor_charizard_doll.4bpp.lz");
+const u32 gDecorIconPalette_CharizardDoll[] = INCBIN_U32("graphics/decorations/decor_charizard_doll.gbapal.lz");
 
-const u32 gUnknown_08DB9BA4[] = INCBIN_U32("graphics/decorations/decor_blastoise_doll.4bpp.lz");
-const u32 gUnknown_08DB9CB0[] = INCBIN_U32("graphics/decorations/decor_blastoise_doll.gbapal.lz");
+const u32 gDecorIcon_BlastoiseDoll[] = INCBIN_U32("graphics/decorations/decor_blastoise_doll.4bpp.lz");
+const u32 gDecorIconPalette_BlastoiseDoll[] = INCBIN_U32("graphics/decorations/decor_blastoise_doll.gbapal.lz");
 
-const u32 gUnknown_08DB9CD8[] = INCBIN_U32("graphics/decorations/decor_wailmer_doll.4bpp.lz");
-const u32 gUnknown_08DB9DAC[] = INCBIN_U32("graphics/decorations/decor_wailmer_doll.gbapal.lz");
+const u32 gDecorIcon_WailmerDoll[] = INCBIN_U32("graphics/decorations/decor_wailmer_doll.4bpp.lz");
+const u32 gDecorIconPalette_WailmerDoll[] = INCBIN_U32("graphics/decorations/decor_wailmer_doll.gbapal.lz");
 
-const u32 gUnknown_08DB9DD4[] = INCBIN_U32("graphics/decorations/decor_regice_doll.4bpp.lz");
-const u32 gUnknown_08DB9EE4[] = INCBIN_U32("graphics/decorations/decor_regice_doll.gbapal.lz");
+const u32 gDecorIcon_RegiceDoll[] = INCBIN_U32("graphics/decorations/decor_regice_doll.4bpp.lz");
+const u32 gDecorIconPalette_RegiceDoll[] = INCBIN_U32("graphics/decorations/decor_regice_doll.gbapal.lz");
 
-const u32 gUnknown_08DB9F08[] = INCBIN_U32("graphics/decorations/decor_regirock_doll.4bpp.lz");
-const u32 gUnknown_08DB9FFC[] = INCBIN_U32("graphics/decorations/decor_regirock_doll.gbapal.lz");
+const u32 gDecorIcon_RegirockDoll[] = INCBIN_U32("graphics/decorations/decor_regirock_doll.4bpp.lz");
+const u32 gDecorIconPalette_RegirockDoll[] = INCBIN_U32("graphics/decorations/decor_regirock_doll.gbapal.lz");
 
-const u32 gUnknown_08DBA020[] = INCBIN_U32("graphics/decorations/decor_registeel_doll.4bpp.lz");
-const u32 gUnknown_08DBA12C[] = INCBIN_U32("graphics/decorations/decor_registeel_doll.gbapal.lz");
+const u32 gDecorIcon_RegisteelDoll[] = INCBIN_U32("graphics/decorations/decor_registeel_doll.4bpp.lz");
+const u32 gDecorIconPalette_RegisteelDoll[] = INCBIN_U32("graphics/decorations/decor_registeel_doll.gbapal.lz");
diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h
index 07415949d..45e34030f 100644
--- a/src/data/graphics/pokemon.h
+++ b/src/data/graphics/pokemon.h
@@ -572,12 +572,12 @@ const u32 gMonShinyPalette_Magneton[] = INCBIN_U32("graphics/pokemon/magneton/sh
 const u8 gMonIcon_Magneton[] = INCBIN_U8("graphics/pokemon/magneton/icon.4bpp");
 const u8 gMonFootprint_Magneton[] = INCBIN_U8("graphics/pokemon/magneton/footprint.1bpp");
 
-const u32 gMonStillFrontPic_Farfetchd[] = INCBIN_U32("graphics/pokemon/farfetch_d/front.4bpp.lz");
-const u32 gMonPalette_Farfetchd[] = INCBIN_U32("graphics/pokemon/farfetch_d/normal.gbapal.lz");
-const u32 gMonBackPic_Farfetchd[] = INCBIN_U32("graphics/pokemon/farfetch_d/back.4bpp.lz");
-const u32 gMonShinyPalette_Farfetchd[] = INCBIN_U32("graphics/pokemon/farfetch_d/shiny.gbapal.lz");
-const u8 gMonIcon_Farfetchd[] = INCBIN_U8("graphics/pokemon/farfetch_d/icon.4bpp");
-const u8 gMonFootprint_Farfetchd[] = INCBIN_U8("graphics/pokemon/farfetch_d/footprint.1bpp");
+const u32 gMonStillFrontPic_Farfetchd[] = INCBIN_U32("graphics/pokemon/farfetchd/front.4bpp.lz");
+const u32 gMonPalette_Farfetchd[] = INCBIN_U32("graphics/pokemon/farfetchd/normal.gbapal.lz");
+const u32 gMonBackPic_Farfetchd[] = INCBIN_U32("graphics/pokemon/farfetchd/back.4bpp.lz");
+const u32 gMonShinyPalette_Farfetchd[] = INCBIN_U32("graphics/pokemon/farfetchd/shiny.gbapal.lz");
+const u8 gMonIcon_Farfetchd[] = INCBIN_U8("graphics/pokemon/farfetchd/icon.4bpp");
+const u8 gMonFootprint_Farfetchd[] = INCBIN_U8("graphics/pokemon/farfetchd/footprint.1bpp");
 
 const u32 gMonStillFrontPic_Doduo[] = INCBIN_U32("graphics/pokemon/doduo/front.4bpp.lz");
 const u32 gMonPalette_Doduo[] = INCBIN_U32("graphics/pokemon/doduo/normal.gbapal.lz");
diff --git a/src/data/party_menu.h b/src/data/party_menu.h
new file mode 100644
index 000000000..3c3a3e1ce
--- /dev/null
+++ b/src/data/party_menu.h
@@ -0,0 +1,1255 @@
+static const struct BgTemplate sPartyMenuBgTemplates[] =
+{
+    {
+        .bg = 0,
+        .charBaseIndex = 0,
+        .mapBaseIndex = 31,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 1,
+        .baseTile = 0
+    },
+    {
+        .bg = 1,
+        .charBaseIndex = 0,
+        .mapBaseIndex = 30,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 2,
+        .baseTile = 0
+    },
+    {
+        .bg = 2,
+        .charBaseIndex = 0,
+        .mapBaseIndex = 28,
+        .screenSize = 1,
+        .paletteMode = 0,
+        .priority = 0,
+        .baseTile = 0
+    },
+};
+
+enum
+{
+    PARTY_BOX_LEFT_COLUMN,
+    PARTY_BOX_RIGHT_COLUMN
+};
+
+static const struct PartyMenuBoxInfoRects sPartyBoxInfoRects[] =
+{
+    [PARTY_BOX_LEFT_COLUMN] = 
+    {
+        BlitBitmapToPartyWindow_LeftColumn, 
+        {
+            //The below are the x, y, width, and height for each of the following info
+            24, 11, 40, 13, // Nickname
+            32, 20, 32,  8, // Level
+            64, 20,  8,  8, // Gender
+            38, 37, 24,  8, // HP
+            53, 37, 24,  8, // Max HP
+            24, 35, 48,  3  // HP bar
+        }, 
+        12, 34, 64, 16      // Description text (e.g. NO USE)
+    },
+    [PARTY_BOX_RIGHT_COLUMN] = 
+    {
+        BlitBitmapToPartyWindow_RightColumn, 
+        {
+             // See above comment
+             22,  3, 40, 13, // Nickname
+             30, 12, 32,  8, // Level
+             62, 12,  8,  8, // Gender
+            102, 12, 24,  8, // HP
+            117, 12, 24,  8, // Max HP
+             88, 10, 48,  3  // HP bar
+        }, 
+        77, 4, 64, 16        // Description text
+    },
+};
+
+
+// Each layout array has an array for each of the 6 party slots
+// The array for each slot has the sprite coords of its various sprites in the following order
+// Pokemon icon (x, y), held item (x, y), status condition (x, y), menu pokeball (x, y)
+static const u8 sPartyMenuSpriteCoords[PARTY_LAYOUT_COUNT][PARTY_SIZE][4 * 2] =
+{
+    [PARTY_LAYOUT_SINGLE] = 
+    {
+        { 16,  40,  20,  50,  50,  52,  16,  34},
+        {104,  18, 108,  28, 136,  27, 102,  25},
+        {104,  42, 108,  52, 136,  51, 102,  49},
+        {104,  66, 108,  76, 136,  75, 102,  73},
+        {104,  90, 108, 100, 136,  99, 102,  97},
+        {104, 114, 108, 124, 136, 123, 102, 121},
+    },
+    [PARTY_LAYOUT_DOUBLE] = 
+    {
+        {16, 24, 20, 34, 50, 36, 16, 18},
+        {16, 80, 20, 90, 50, 92, 16, 74},
+        {104, 18, 108, 28, 136, 27, 102, 25},
+        {104, 50, 108, 60, 136, 59, 102, 57},
+        {104, 82, 108, 92, 136, 91, 102, 89},
+        {104, 114, 108, 124, 136, 123, 102, 121},
+    },
+    [PARTY_LAYOUT_MULTI] = 
+    {
+        {16, 24, 20, 34, 50, 36, 16, 18},
+        {16, 80, 20, 90, 50, 92, 16, 74},
+        {104, 26, 106, 36, 136, 35, 102, 33},
+        {104, 50, 106, 60, 136, 59, 102, 57},
+        {104, 82, 106, 92, 136, 91, 102, 89},
+        {104, 106, 106, 116, 136, 115, 102, 113},
+    },
+    [PARTY_LAYOUT_MULTI_SHOWCASE] = 
+    {
+        {16, 32, 20, 42, 50, 44, 16, 26},
+        {104, 34, 106, 44, 136, 43, 102, 41},
+        {104, 58, 106, 68, 136, 67, 102, 65},
+        {16, 104, 20, 114, 50, 116, 16, 98},
+        {104, 106, 106, 116, 136, 115, 102, 113},
+        {104, 130, 106, 140, 136, 139, 102, 137},
+    },
+};
+
+// Used only when both Cancel and Confirm are present
+static const u32 sConfirmButton_Tilemap[] = INCBIN_U32("graphics/interface/party_menu_confirm_button.bin");
+static const u32 sCancelButton_Tilemap[] = INCBIN_U32("graphics/interface/party_menu_cancel_button.bin");
+
+// Text colors for BG, FG, and Shadow in that order
+static const u8 sFontColorTable[][3] =
+{
+    {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_LIGHT_GREY, TEXT_COLOR_DARK_GREY},  // Default
+    {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_WHITE,      TEXT_COLOR_GREEN},      // Unused
+    {TEXT_COLOR_TRANSPARENT, TEXT_DYNAMIC_COLOR_2,  TEXT_DYNAMIC_COLOR_3},  // Gender symbol
+    {TEXT_COLOR_WHITE,       TEXT_COLOR_DARK_GREY,  TEXT_COLOR_LIGHT_GREY}, // Selection actions
+    {TEXT_COLOR_WHITE,       TEXT_COLOR_BLUE,       TEXT_COLOR_LIGHT_BLUE}, // Field moves
+    {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_WHITE,      TEXT_COLOR_DARK_GREY},  // Unused
+};
+
+static const struct WindowTemplate sSinglePartyMenuWindowTemplate[] =
+{
+    {
+        .bg = 0,
+        .tilemapLeft = 1,
+        .tilemapTop = 3,
+        .width = 10,
+        .height = 7,
+        .paletteNum = 3,
+        .baseBlock = 0x63,
+    },
+    {
+        .bg = 0,
+        .tilemapLeft = 12,
+        .tilemapTop = 1,
+        .width = 18,
+        .height = 3,
+        .paletteNum = 4,
+        .baseBlock = 0xA9,
+    },
+    {
+        .bg = 0,
+        .tilemapLeft = 12,
+        .tilemapTop = 4,
+        .width = 18,
+        .height = 3,
+        .paletteNum = 5,
+        .baseBlock = 0xDF,
+    },
+    {
+        .bg = 0,
+        .tilemapLeft = 12,
+        .tilemapTop = 7,
+        .width = 18,
+        .height = 3,
+        .paletteNum = 6,
+        .baseBlock = 0x115,
+    },
+    {
+        .bg = 0,
+        .tilemapLeft = 12,
+        .tilemapTop = 10,
+        .width = 18,
+        .height = 3,
+        .paletteNum = 7,
+        .baseBlock = 0x14B,
+    },
+    {
+        .bg = 0,
+        .tilemapLeft = 12,
+        .tilemapTop = 13,
+        .width = 18,
+        .height = 3,
+        .paletteNum = 8,
+        .baseBlock = 0x181,
+    },
+    {
+        .bg = 2,
+        .tilemapLeft = 1,
+        .tilemapTop = 15,
+        .width = 28,
+        .height = 4,
+        .paletteNum = 14,
+        .baseBlock = 0x1DF,
+    },
+    DUMMY_WIN_TEMPLATE
+};
+
+static const struct WindowTemplate sDoublePartyMenuWindowTemplate[] =
+{
+    {
+        .bg = 0,
+        .tilemapLeft = 1,
+        .tilemapTop = 1,
+        .width = 10,
+        .height = 7,
+        .paletteNum = 3,
+        .baseBlock = 0x63,
+    },
+    {
+        .bg = 0,
+        .tilemapLeft = 1,
+        .tilemapTop = 8,
+        .width = 10,
+        .height = 7,
+        .paletteNum = 4,
+        .baseBlock = 0xA9,
+    },
+    {
+        .bg = 0,
+        .tilemapLeft = 12,
+        .tilemapTop = 1,
+        .width = 18,
+        .height = 3,
+        .paletteNum = 5,
+        .baseBlock = 0xEF,
+    },
+    {
+        .bg = 0,
+        .tilemapLeft = 12,
+        .tilemapTop = 5,
+        .width = 18,
+        .height = 3,
+        .paletteNum = 6,
+        .baseBlock = 0x125,
+    },
+    {
+        .bg = 0,
+        .tilemapLeft = 12,
+        .tilemapTop = 9,
+        .width = 18,
+        .height = 3,
+        .paletteNum = 7,
+        .baseBlock = 0x15B,
+    },
+    {
+        .bg = 0,
+        .tilemapLeft = 12,
+        .tilemapTop = 13,
+        .width = 18,
+        .height = 3,
+        .paletteNum = 8,
+        .baseBlock = 0x191,
+    },
+    {
+        .bg = 2,
+        .tilemapLeft = 1,
+        .tilemapTop = 15,
+        .width = 28,
+        .height = 4,
+        .paletteNum = 14,
+        .baseBlock = 0x1DF,
+    },
+    DUMMY_WIN_TEMPLATE
+};
+
+static const struct WindowTemplate sMultiPartyMenuWindowTemplate[] =
+{
+    {
+        .bg = 0,
+        .tilemapLeft = 1,
+        .tilemapTop = 1,
+        .width = 10,
+        .height = 7,
+        .paletteNum = 3,
+        .baseBlock = 0x63,
+    },
+    {
+        .bg = 0,
+        .tilemapLeft = 1,
+        .tilemapTop = 8,
+        .width = 10,
+        .height = 7,
+        .paletteNum = 4,
+        .baseBlock = 0xA9,
+    },
+    {
+        .bg = 0,
+        .tilemapLeft = 12,
+        .tilemapTop = 2,
+        .width = 18,
+        .height = 3,
+        .paletteNum = 5,
+        .baseBlock = 0xEF,
+    },
+    {
+        .bg = 0,
+        .tilemapLeft = 12,
+        .tilemapTop = 5,
+        .width = 18,
+        .height = 3,
+        .paletteNum = 6,
+        .baseBlock = 0x125,
+    },
+    {
+        .bg = 0,
+        .tilemapLeft = 12,
+        .tilemapTop = 9,
+        .width = 18,
+        .height = 3,
+        .paletteNum = 7,
+        .baseBlock = 0x15B,
+    },
+    {
+        .bg = 0,
+        .tilemapLeft = 12,
+        .tilemapTop = 12,
+        .width = 18,
+        .height = 3,
+        .paletteNum = 8,
+        .baseBlock = 0x191,
+    },
+    {
+        .bg = 2,
+        .tilemapLeft = 1,
+        .tilemapTop = 15,
+        .width = 28,
+        .height = 4,
+        .paletteNum = 14,
+        .baseBlock = 0x1DF,
+    },
+    DUMMY_WIN_TEMPLATE
+};
+
+static const struct WindowTemplate sShowcaseMultiPartyMenuWindowTemplate[] =
+{
+    {
+        .bg = 0,
+        .tilemapLeft = 1,
+        .tilemapTop = 2,
+        .width = 10,
+        .height = 7,
+        .paletteNum = 3,
+        .baseBlock = 0x63,
+    },
+    {
+        .bg = 0,
+        .tilemapLeft = 12,
+        .tilemapTop = 3,
+        .width = 18,
+        .height = 3,
+        .paletteNum = 5,
+        .baseBlock = 0xA9,
+    },
+    {
+        .bg = 0,
+        .tilemapLeft = 12,
+        .tilemapTop = 6,
+        .width = 18,
+        .height = 3,
+        .paletteNum = 6,
+        .baseBlock = 0xDF,
+    },
+    {
+        .bg = 2,
+        .tilemapLeft = 1,
+        .tilemapTop = 11,
+        .width = 10,
+        .height = 7,
+        .paletteNum = 4,
+        .baseBlock = 0x115,
+    },
+    {
+        .bg = 2,
+        .tilemapLeft = 12,
+        .tilemapTop = 12,
+        .width = 18,
+        .height = 3,
+        .paletteNum = 7,
+        .baseBlock = 0x16B,
+    },
+    {
+        .bg = 2,
+        .tilemapLeft = 12,
+        .tilemapTop = 15,
+        .width = 18,
+        .height = 3,
+        .paletteNum = 8,
+        .baseBlock = 0x1A1,
+    },
+    DUMMY_WIN_TEMPLATE
+};
+
+static const struct WindowTemplate sCancelButtonWindowTemplate =
+{
+    .bg = 0,
+    .tilemapLeft = 24,
+    .tilemapTop = 17,
+    .width = 6,
+    .height = 2,
+    .paletteNum = 3,
+    .baseBlock = 0x1C7,
+};
+
+static const struct WindowTemplate sMultiCancelButtonWindowTemplate =
+{
+    .bg = 0,
+    .tilemapLeft = 24,
+    .tilemapTop = 18,
+    .width = 6,
+    .height = 2,
+    .paletteNum = 3,
+    .baseBlock = 0x1C7,
+};
+
+static const struct WindowTemplate sConfirmButtonWindowTemplate =
+{
+    .bg = 0,
+    .tilemapLeft = 24,
+    .tilemapTop = 16,
+    .width = 6,
+    .height = 2,
+    .paletteNum = 3,
+    .baseBlock = 0x1D3,
+};
+
+static const struct WindowTemplate sDefaultPartyMsgWindowTemplate =
+{
+    .bg = 2,
+    .tilemapLeft = 1,
+    .tilemapTop = 17,
+    .width = 21,
+    .height = 2,
+    .paletteNum = 15,
+    .baseBlock = 0x24F,
+};
+
+static const struct WindowTemplate sDoWhatWithMonMsgWindowTemplate =
+{
+    .bg = 2,
+    .tilemapLeft = 1,
+    .tilemapTop = 17,
+    .width = 16,
+    .height = 2,
+    .paletteNum = 15,
+    .baseBlock = 0x279,
+};
+
+static const struct WindowTemplate sDoWhatWithItemMsgWindowTemplate =
+{
+    .bg = 2,
+    .tilemapLeft = 1,
+    .tilemapTop = 17,
+    .width = 20,
+    .height = 2,
+    .paletteNum = 15,
+    .baseBlock = 0x299,
+};
+
+static const struct WindowTemplate sDoWhatWithMailMsgWindowTemplate =
+{
+    .bg = 2,
+    .tilemapLeft = 1,
+    .tilemapTop = 17,
+    .width = 18,
+    .height = 2,
+    .paletteNum = 15,
+    .baseBlock = 0x299,
+};
+
+static const struct WindowTemplate sWhichMoveMsgWindowTemplate =
+{
+    .bg = 2,
+    .tilemapLeft = 1,
+    .tilemapTop = 17,
+    .width = 16,
+    .height = 2,
+    .paletteNum = 15,
+    .baseBlock = 0x299,
+};
+
+static const struct WindowTemplate sAlreadyHoldingOneMsgWindowTemplate =
+{
+    .bg = 2,
+    .tilemapLeft = 1,
+    .tilemapTop = 15,
+    .width = 20,
+    .height = 4,
+    .paletteNum = 15,
+    .baseBlock = 0x299,
+};
+
+static const struct WindowTemplate sItemGiveTakeWindowTemplate =
+{
+    .bg = 2,
+    .tilemapLeft = 23,
+    .tilemapTop = 13,
+    .width = 6,
+    .height = 6,
+    .paletteNum = 14,
+    .baseBlock = 0x39D,
+};
+
+static const struct WindowTemplate sMailReadTakeWindowTemplate =
+{
+    .bg = 2,
+    .tilemapLeft = 21,
+    .tilemapTop = 13,
+    .width = 8,
+    .height = 6,
+    .paletteNum = 14,
+    .baseBlock = 0x39D,
+};
+
+static const struct WindowTemplate sMoveSelectWindowTemplate =
+{
+    .bg = 2,
+    .tilemapLeft = 19,
+    .tilemapTop = 11,
+    .width = 10,
+    .height = 8,
+    .paletteNum = 14,
+    .baseBlock = 0x2E9,
+};
+
+static const struct WindowTemplate sPartyMenuYesNoWindowTemplate =
+{
+    .bg = 2,
+    .tilemapLeft = 21,
+    .tilemapTop = 9,
+    .width = 5,
+    .height = 4,
+    .paletteNum = 14,
+    .baseBlock = 0x2E9,
+};
+
+static const struct WindowTemplate sLevelUpStatsWindowTemplate =
+{
+    .bg = 2,
+    .tilemapLeft = 19,
+    .tilemapTop = 1,
+    .width = 10,
+    .height = 11,
+    .paletteNum = 14,
+    .baseBlock = 0x2E9,
+};
+
+static const struct WindowTemplate sUnusedWindowTemplate_08615978 =
+{
+    .bg = 2,
+    .tilemapLeft = 2,
+    .tilemapTop = 15,
+    .width = 27,
+    .height = 4,
+    .paletteNum = 14,
+    .baseBlock = 0x1DF,
+};
+
+static const struct WindowTemplate sUnusedWindowTemplate_08615980 =
+{
+    .bg = 2,
+    .tilemapLeft = 0,
+    .tilemapTop = 13,
+    .width = 18,
+    .height = 3,
+    .paletteNum = 12,
+    .baseBlock = 0x39D,
+};
+
+// Tile nums
+static const u8 sMainSlotTileNums[] = {24, 25, 25, 25, 25, 25, 25, 25, 25, 26,
+                                       32, 33, 33, 33, 33, 33, 33, 33, 33, 34,
+                                       32, 33, 33, 33, 33, 33, 33, 33, 33, 34,
+                                       32, 33, 33, 33, 33, 33, 33, 33, 33, 34,
+                                       40, 59, 60, 58, 58, 58, 58, 58, 58, 61,
+                                       15, 16, 16, 16, 16, 16, 16, 16, 16, 17,
+                                       46, 47, 47, 47, 47, 47, 47, 47, 47, 48};
+
+static const u8 sMainSlotTileNums_Egg[] = {24, 25, 25, 25, 25, 25, 25, 25, 25, 26,
+                                           32, 33, 33, 33, 33, 33, 33, 33, 33, 34,
+                                           32, 33, 33, 33, 33, 33, 33, 33, 33, 34,
+                                           32, 33, 33, 33, 33, 33, 33, 33, 33, 34,
+                                           40, 41, 41, 41, 41, 41, 41, 41, 41, 42,
+                                           15, 16, 16, 16, 16, 16, 16, 16, 16, 17,
+                                           46, 47, 47, 47, 47, 47, 47, 47, 47, 48};
+
+static const u8 sOtherSlotsTileNums[] = {43, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 45,
+                                         49, 33, 33, 33, 33, 33, 33, 33, 33, 52, 53, 51, 51, 51, 51, 51, 51, 54,
+                                         55, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 57};
+
+static const u8 sOtherSlotsTileNums_Egg[] = {43, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 45,
+                                             49, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 50,
+                                             55, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 57};
+
+static const u8 sEmptySlotTileNums[] = {21, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 23,
+                                        30, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 31,
+                                        37, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 39};
+
+// Palette offsets
+static const u8 sGenderPalOffsets[] = {11, 12};
+static const u8 sHPBarPalOffsets[] = {9, 10};
+static const u8 sPartyBoxPalOffsets1[] = {4, 5, 6};
+static const u8 sPartyBoxPalOffsets2[] = {1, 7, 8};
+static const u8 sPartyBoxNoMonPalOffsets[] = {1, 11, 12};
+
+// Palette ids
+static const u8 sGenderMalePalIds[] = {59, 60};
+static const u8 sGenderFemalePalIds[] = {75, 76};
+static const u8 sHPBarGreenPalIds[] = {57, 58};
+static const u8 sHPBarYellowPalIds[] = {73, 74};
+static const u8 sHPBarRedPalIds[] = {89, 90};
+static const u8 sPartyBoxEmptySlotPalIds1[] = {52, 53, 54};
+static const u8 sPartyBoxMultiPalIds1[] = {68, 69, 70};
+static const u8 sPartyBoxFaintedPalIds1[] = {84, 85, 86};
+static const u8 sPartyBoxCurrSelectionPalIds1[] = {116, 117, 118};
+static const u8 sPartyBoxCurrSelectionMultiPalIds[] = {132, 133, 134};
+static const u8 sPartyBoxCurrSelectionFaintedPalIds[] = {148, 149, 150};
+static const u8 sPartyBoxSelectedForActionPalIds1[] = {100, 101, 102};
+static const u8 sPartyBoxEmptySlotPalIds2[] = {49, 55, 56};
+static const u8 sPartyBoxMultiPalIds2[] = {65, 71, 72};
+static const u8 sPartyBoxFaintedPalIds2[] = {81, 87, 88};
+static const u8 sPartyBoxCurrSelectionPalIds2[] = {97, 103, 104};
+static const u8 sPartyBoxSelectedForActionPalIds2[] = {161, 167, 168};
+static const u8 sPartyBoxNoMonPalIds[] = {17, 27, 28};
+
+static const u8 *const sActionStringTable[] =
+{
+    [PARTY_MSG_CHOOSE_MON]             = gText_ChoosePokemon,
+    [PARTY_MSG_CHOOSE_MON_OR_CANCEL]   = gText_ChoosePokemonCancel,
+    [PARTY_MSG_CHOOSE_MON_AND_CONFIRM] = gText_ChoosePokemonConfirm,
+    [PARTY_MSG_MOVE_TO_WHERE]          = gText_MoveToWhere,
+    [PARTY_MSG_TEACH_WHICH_MON]        = gText_TeachWhichPokemon,
+    [PARTY_MSG_USE_ON_WHICH_MON]       = gText_UseOnWhichPokemon,
+    [PARTY_MSG_GIVE_TO_WHICH_MON]      = gText_GiveToWhichPokemon,
+    [PARTY_MSG_NOTHING_TO_CUT]         = gText_NothingToCut,
+    [PARTY_MSG_CANT_SURF_HERE]         = gText_CantSurfHere,
+    [PARTY_MSG_ALREADY_SURFING]        = gText_AlreadySurfing,
+    [PARTY_MSG_CURRENT_TOO_FAST]       = gText_CurrentIsTooFast,
+    [PARTY_MSG_ENJOY_CYCLING]          = gText_EnjoyCycling,
+    [PARTY_MSG_ALREADY_IN_USE]         = gText_InUseAlready_PM,
+    [PARTY_MSG_CANT_USE_HERE]          = gText_CantUseHere,
+    [PARTY_MSG_NO_MON_FOR_BATTLE]      = gText_NoPokemonForBattle,
+    [PARTY_MSG_CHOOSE_MON_2]           = gText_ChoosePokemon2,
+    [PARTY_MSG_NOT_ENOUGH_HP]          = gText_NotEnoughHp,
+    [PARTY_MSG_X_MONS_ARE_NEEDED]      = gText_PokemonAreNeeded,
+    [PARTY_MSG_MONS_CANT_BE_SAME]      = gText_PokemonCantBeSame,
+    [PARTY_MSG_NO_SAME_HOLD_ITEMS]     = gText_NoIdenticalHoldItems,
+    [PARTY_MSG_UNUSED]                 = gText_EmptyString2,
+    [PARTY_MSG_DO_WHAT_WITH_MON]       = gText_DoWhatWithPokemon,
+    [PARTY_MSG_RESTORE_WHICH_MOVE]     = gText_RestoreWhichMove,
+    [PARTY_MSG_BOOST_PP_WHICH_MOVE]    = gText_BoostPp,
+    [PARTY_MSG_DO_WHAT_WITH_ITEM]      = gText_DoWhatWithItem,
+    [PARTY_MSG_DO_WHAT_WITH_MAIL]      = gText_DoWhatWithMail,
+    [PARTY_MSG_ALREADY_HOLDING_ONE]    = gText_AlreadyHoldingOne,
+};
+
+static const u8 *const sDescriptionStringTable[] =
+{
+    [PARTYBOX_DESC_NO_USE]     = gText_NoUse,
+    [PARTYBOX_DESC_ABLE_3]     = gText_Able,
+    [PARTYBOX_DESC_FIRST]      = gText_First_PM,
+    [PARTYBOX_DESC_SECOND]     = gText_Second_PM,
+    [PARTYBOX_DESC_THIRD]      = gText_Third_PM,
+    [PARTYBOX_DESC_FOURTH]     = gText_Fourth,
+    [PARTYBOX_DESC_ABLE]       = gText_Able2,
+    [PARTYBOX_DESC_NOT_ABLE]   = gText_NotAble,
+    [PARTYBOX_DESC_ABLE_2]     = gText_Able3,
+    [PARTYBOX_DESC_NOT_ABLE_2] = gText_NotAble2,
+    [PARTYBOX_DESC_LEARNED]    = gText_Learned,
+    [PARTYBOX_DESC_HAVE]       = gText_Have,
+    [PARTYBOX_DESC_DONT_HAVE]  = gText_DontHave,
+};
+
+static const u16 sUnused_08615B94[] =
+{
+    0x0108, 0x0151, 0x0160, 0x015b, 0x002e, 0x005c, 0x0102, 0x0153, 0x014b, 0x00ed, 0x00f1, 0x010d, 0x003a, 0x003b, 0x003f, 0x0071,
+    0x00b6, 0x00f0, 0x00ca, 0x00db, 0x00da, 0x004c, 0x00e7, 0x0055, 0x0057, 0x0059, 0x00d8, 0x005b, 0x005e, 0x00f7, 0x0118, 0x0068,
+    0x0073, 0x015f, 0x0035, 0x00bc, 0x00c9, 0x007e, 0x013d, 0x014c, 0x0103, 0x0107, 0x0122, 0x009c, 0x00d5, 0x00a8, 0x00d3, 0x011d,
+    0x0121, 0x013b, 0x000f, 0x0013, 0x0039, 0x0046, 0x0094, 0x00f9, 0x007f, 0x0123,
+};
+
+enum
+{
+    MENU_SUMMARY,
+    MENU_SWITCH,
+    MENU_CANCEL1,
+    MENU_ITEM,
+    MENU_GIVE,
+    MENU_TAKE_ITEM,
+    MENU_MAIL,
+    MENU_TAKE_MAIL,
+    MENU_READ,
+    MENU_CANCEL2,
+    MENU_SHIFT,
+    MENU_SEND_OUT,
+    MENU_ENTER,
+    MENU_NO_ENTRY,
+    MENU_STORE,
+    MENU_REGISTER,
+    MENU_TRADE1,
+    MENU_TRADE2,
+    MENU_TOSS,
+    MENU_FIELD_MOVES,
+};
+
+enum
+{
+    FIELD_MOVE_CUT,
+    FIELD_MOVE_FLASH,
+    FIELD_MOVE_ROCK_SMASH,
+    FIELD_MOVE_STRENGTH,
+    FIELD_MOVE_SURF,
+    FIELD_MOVE_FLY,
+    FIELD_MOVE_DIVE,
+    FIELD_MOVE_WATERFALL,
+    FIELD_MOVE_TELEPORT,
+    FIELD_MOVE_DIG,
+    FIELD_MOVE_SECRET_POWER,
+    FIELD_MOVE_MILK_DRINK,
+    FIELD_MOVE_SOFT_BOILED,
+    FIELD_MOVE_SWEET_SCENT,
+};
+
+// What a weird choice of table termination;
+#define FIELD_MOVE_TERMINATOR MOVE_SWORDS_DANCE
+
+struct
+{
+    const u8 *text;
+    TaskFunc func;
+} static const sCursorOptions[] =
+{
+    [MENU_SUMMARY] = {gText_Summary5, CursorCb_Summary},
+    [MENU_SWITCH] = {gText_Switch2, CursorCb_Switch},
+    [MENU_CANCEL1] = {gText_Cancel2, CursorCb_Cancel1},
+    [MENU_ITEM] = {gText_Item, CursorCb_Item},
+    [MENU_GIVE] = {gMenuText_Give, CursorCb_Give},
+    [MENU_TAKE_ITEM] = {gText_Take, CursorCb_TakeItem},
+    [MENU_MAIL] = {gText_Mail, CursorCb_Mail},
+    [MENU_TAKE_MAIL] = {gText_Take2, CursorCb_TakeMail},
+    [MENU_READ] = {gText_Read2, CursorCb_Read},
+    [MENU_CANCEL2] = {gText_Cancel2, CursorCb_Cancel2},
+    [MENU_SHIFT] = {gText_Shift, CursorCb_SendMon},
+    [MENU_SEND_OUT] = {gText_SendOut, CursorCb_SendMon},
+    [MENU_ENTER] = {gText_Enter, CursorCb_Enter},
+    [MENU_NO_ENTRY] = {gText_NoEntry, CursorCb_NoEntry},
+    [MENU_STORE] = {gText_Store, CursorCb_Store},
+    [MENU_REGISTER] = {gText_Register, CursorCb_Register},
+    [MENU_TRADE1] = {gText_Trade4, CursorCb_Trade1},
+    [MENU_TRADE2] = {gText_Trade4, CursorCb_Trade2},
+    [MENU_TOSS] = {gMenuText_Toss, CursorCb_Toss},
+    [MENU_FIELD_MOVES + FIELD_MOVE_CUT] = {gMoveNames[MOVE_CUT], CursorCb_FieldMove},
+    [MENU_FIELD_MOVES + FIELD_MOVE_FLASH] = {gMoveNames[MOVE_FLASH], CursorCb_FieldMove},
+    [MENU_FIELD_MOVES + FIELD_MOVE_ROCK_SMASH] = {gMoveNames[MOVE_ROCK_SMASH], CursorCb_FieldMove},
+    [MENU_FIELD_MOVES + FIELD_MOVE_STRENGTH] = {gMoveNames[MOVE_STRENGTH], CursorCb_FieldMove},
+    [MENU_FIELD_MOVES + FIELD_MOVE_SURF] = {gMoveNames[MOVE_SURF], CursorCb_FieldMove},
+    [MENU_FIELD_MOVES + FIELD_MOVE_FLY] = {gMoveNames[MOVE_FLY], CursorCb_FieldMove},
+    [MENU_FIELD_MOVES + FIELD_MOVE_DIVE] = {gMoveNames[MOVE_DIVE], CursorCb_FieldMove},
+    [MENU_FIELD_MOVES + FIELD_MOVE_WATERFALL] = {gMoveNames[MOVE_WATERFALL], CursorCb_FieldMove},
+    [MENU_FIELD_MOVES + FIELD_MOVE_TELEPORT] = {gMoveNames[MOVE_TELEPORT], CursorCb_FieldMove},
+    [MENU_FIELD_MOVES + FIELD_MOVE_DIG] = {gMoveNames[MOVE_DIG], CursorCb_FieldMove},
+    [MENU_FIELD_MOVES + FIELD_MOVE_SECRET_POWER] = {gMoveNames[MOVE_SECRET_POWER], CursorCb_FieldMove},
+    [MENU_FIELD_MOVES + FIELD_MOVE_MILK_DRINK] = {gMoveNames[MOVE_MILK_DRINK], CursorCb_FieldMove},
+    [MENU_FIELD_MOVES + FIELD_MOVE_SOFT_BOILED] = {gMoveNames[MOVE_SOFT_BOILED], CursorCb_FieldMove},
+    [MENU_FIELD_MOVES + FIELD_MOVE_SWEET_SCENT] = {gMoveNames[MOVE_SWEET_SCENT], CursorCb_FieldMove},
+};
+
+static const u8 sPartyMenuAction_SummarySwitchCancel[] = {MENU_SUMMARY, MENU_SWITCH, MENU_CANCEL1};
+static const u8 sPartyMenuAction_ShiftSummaryCancel[] = {MENU_SHIFT, MENU_SUMMARY, MENU_CANCEL1};
+static const u8 sPartyMenuAction_SendOutSummaryCancel[] = {MENU_SEND_OUT, MENU_SUMMARY, MENU_CANCEL1};
+static const u8 sPartyMenuAction_SummaryCancel[] = {MENU_SUMMARY, MENU_CANCEL1};
+static const u8 sPartyMenuAction_EnterSummaryCancel[] = {MENU_ENTER, MENU_SUMMARY, MENU_CANCEL1};
+static const u8 sPartyMenuAction_NoEntrySummaryCancel[] = {MENU_NO_ENTRY, MENU_SUMMARY, MENU_CANCEL1};
+static const u8 sPartyMenuAction_StoreSummaryCancel[] = {MENU_STORE, MENU_SUMMARY, MENU_CANCEL1};
+static const u8 sPartyMenuAction_GiveTakeItemCancel[] = {MENU_GIVE, MENU_TAKE_ITEM, MENU_CANCEL2};
+static const u8 sPartyMenuAction_ReadTakeMailCancel[] = {MENU_READ, MENU_TAKE_MAIL, MENU_CANCEL2};
+static const u8 sPartyMenuAction_RegisterSummaryCancel[] = {MENU_REGISTER, MENU_SUMMARY, MENU_CANCEL1};
+static const u8 sPartyMenuAction_TradeSummaryCancel1[] = {MENU_TRADE1, MENU_SUMMARY, MENU_CANCEL1};
+static const u8 sPartyMenuAction_TradeSummaryCancel2[] = {MENU_TRADE2, MENU_SUMMARY, MENU_CANCEL1};
+static const u8 sPartyMenuAction_TakeItemTossCancel[] = {MENU_TAKE_ITEM, MENU_TOSS, MENU_CANCEL1};
+
+// IDs for the action lists that appear when a party mon is selected
+enum
+{
+    ACTIONS_NONE,
+    ACTIONS_SWITCH,
+    ACTIONS_SHIFT,
+    ACTIONS_SEND_OUT,
+    ACTIONS_ENTER,
+    ACTIONS_NO_ENTRY,
+    ACTIONS_STORE,
+    ACTIONS_SUMMARY_ONLY,
+    ACTIONS_ITEM,
+    ACTIONS_MAIL,
+    ACTIONS_REGISTER,
+    ACTIONS_TRADE,
+    ACTIONS_SPIN_TRADE,
+    ACTIONS_TAKEITEM_TOSS
+};
+
+static const u8 *const sPartyMenuActions[] =
+{
+    [ACTIONS_NONE]          = NULL,
+    [ACTIONS_SWITCH]        = sPartyMenuAction_SummarySwitchCancel,
+    [ACTIONS_SHIFT]         = sPartyMenuAction_ShiftSummaryCancel,
+    [ACTIONS_SEND_OUT]      = sPartyMenuAction_SendOutSummaryCancel,
+    [ACTIONS_ENTER]         = sPartyMenuAction_EnterSummaryCancel,
+    [ACTIONS_NO_ENTRY]      = sPartyMenuAction_NoEntrySummaryCancel,
+    [ACTIONS_STORE]         = sPartyMenuAction_StoreSummaryCancel,
+    [ACTIONS_SUMMARY_ONLY]  = sPartyMenuAction_SummaryCancel,
+    [ACTIONS_ITEM]          = sPartyMenuAction_GiveTakeItemCancel,
+    [ACTIONS_MAIL]          = sPartyMenuAction_ReadTakeMailCancel,
+    [ACTIONS_REGISTER]      = sPartyMenuAction_RegisterSummaryCancel,
+    [ACTIONS_TRADE]         = sPartyMenuAction_TradeSummaryCancel1,
+    [ACTIONS_SPIN_TRADE]    = sPartyMenuAction_TradeSummaryCancel2,
+    [ACTIONS_TAKEITEM_TOSS] = sPartyMenuAction_TakeItemTossCancel,
+};
+
+static const u8 sPartyMenuActionCounts[] =
+{
+    [ACTIONS_NONE]          = 0,
+    [ACTIONS_SWITCH]        = ARRAY_COUNT(sPartyMenuAction_SummarySwitchCancel),
+    [ACTIONS_SHIFT]         = ARRAY_COUNT(sPartyMenuAction_ShiftSummaryCancel),
+    [ACTIONS_SEND_OUT]      = ARRAY_COUNT(sPartyMenuAction_SendOutSummaryCancel),
+    [ACTIONS_ENTER]         = ARRAY_COUNT(sPartyMenuAction_EnterSummaryCancel),
+    [ACTIONS_NO_ENTRY]      = ARRAY_COUNT(sPartyMenuAction_NoEntrySummaryCancel),
+    [ACTIONS_STORE]         = ARRAY_COUNT(sPartyMenuAction_StoreSummaryCancel),
+    [ACTIONS_SUMMARY_ONLY]  = ARRAY_COUNT(sPartyMenuAction_SummaryCancel),
+    [ACTIONS_ITEM]          = ARRAY_COUNT(sPartyMenuAction_GiveTakeItemCancel),
+    [ACTIONS_MAIL]          = ARRAY_COUNT(sPartyMenuAction_ReadTakeMailCancel),
+    [ACTIONS_REGISTER]      = ARRAY_COUNT(sPartyMenuAction_RegisterSummaryCancel),
+    [ACTIONS_TRADE]         = ARRAY_COUNT(sPartyMenuAction_TradeSummaryCancel1),
+    [ACTIONS_SPIN_TRADE]    = ARRAY_COUNT(sPartyMenuAction_TradeSummaryCancel2),
+    [ACTIONS_TAKEITEM_TOSS] = ARRAY_COUNT(sPartyMenuAction_TakeItemTossCancel)
+};
+
+static const u16 sFieldMoves[] =
+{
+    MOVE_CUT, MOVE_FLASH, MOVE_ROCK_SMASH, MOVE_STRENGTH, MOVE_SURF, MOVE_FLY, MOVE_DIVE, MOVE_WATERFALL, MOVE_TELEPORT,
+    MOVE_DIG, MOVE_SECRET_POWER, MOVE_MILK_DRINK, MOVE_SOFT_BOILED, MOVE_SWEET_SCENT, FIELD_MOVE_TERMINATOR
+};
+
+struct
+{
+    bool8 (*fieldMoveFunc)(void);
+    u8 msgId;
+} static const sFieldMoveCursorCallbacks[] =
+{
+    [FIELD_MOVE_CUT]          = {SetUpFieldMove_Cut,         PARTY_MSG_NOTHING_TO_CUT},
+    [FIELD_MOVE_FLASH]        = {SetUpFieldMove_Flash,       PARTY_MSG_CANT_USE_HERE},
+    [FIELD_MOVE_ROCK_SMASH]   = {SetUpFieldMove_RockSmash,   PARTY_MSG_CANT_USE_HERE},
+    [FIELD_MOVE_STRENGTH]     = {SetUpFieldMove_Strength,    PARTY_MSG_CANT_USE_HERE},
+    [FIELD_MOVE_SURF]         = {SetUpFieldMove_Surf,        PARTY_MSG_CANT_SURF_HERE},
+    [FIELD_MOVE_FLY]          = {SetUpFieldMove_Fly,         PARTY_MSG_CANT_USE_HERE},
+    [FIELD_MOVE_DIVE]         = {SetUpFieldMove_Dive,        PARTY_MSG_CANT_USE_HERE},
+    [FIELD_MOVE_WATERFALL]    = {SetUpFieldMove_Waterfall,   PARTY_MSG_CANT_USE_HERE},
+    [FIELD_MOVE_TELEPORT]     = {SetUpFieldMove_Teleport,    PARTY_MSG_CANT_USE_HERE},
+    [FIELD_MOVE_DIG]          = {SetUpFieldMove_Dig,         PARTY_MSG_CANT_USE_HERE},
+    [FIELD_MOVE_SECRET_POWER] = {SetUpFieldMove_SecretPower, PARTY_MSG_CANT_USE_HERE},
+    [FIELD_MOVE_MILK_DRINK]   = {SetUpFieldMove_SoftBoiled,  PARTY_MSG_NOT_ENOUGH_HP},
+    [FIELD_MOVE_SOFT_BOILED]  = {SetUpFieldMove_SoftBoiled,  PARTY_MSG_NOT_ENOUGH_HP},
+    [FIELD_MOVE_SWEET_SCENT]  = {SetUpFieldMove_SweetScent,  PARTY_MSG_CANT_USE_HERE},
+};
+
+static const u8 *const sUnionRoomTradeMessages[] =
+{
+    [UR_TRADE_MSG_NOT_MON_PARTNER_WANTS - 1]       = gText_NotPkmnOtherTrainerWants,
+    [UR_TRADE_MSG_NOT_EGG - 1]                     = gText_ThatIsntAnEgg,
+    [UR_TRADE_MSG_MON_CANT_BE_TRADED_1 - 1]        = gText_PkmnCantBeTradedNow,
+    [UR_TRADE_MSG_MON_CANT_BE_TRADED_2 - 1]        = gText_PkmnCantBeTradedNow,
+    [UR_TRADE_MSG_PARTNERS_MON_CANT_BE_TRADED - 1] = gText_OtherTrainersPkmnCantBeTraded,
+    [UR_TRADE_MSG_EGG_CANT_BE_TRADED -1]           = gText_EggCantBeTradedNow,
+    [UR_TRADE_MSG_PARTNER_CANT_ACCEPT_MON - 1]     = gText_OtherTrainerCantAcceptPkmn,
+    [UR_TRADE_MSG_CANT_TRADE_WITH_PARTNER_1 - 1]   = gText_CantTradeWithTrainer,
+    [UR_TRADE_MSG_CANT_TRADE_WITH_PARTNER_2 - 1]   = gText_CantTradeWithTrainer,
+};
+
+static const u32 sHeldItemGfx[] = INCBIN_U32("graphics/interface/hold_icons.4bpp");
+static const u16 sHeldItemPalette[] = INCBIN_U16("graphics/interface/hold_icons.gbapal");
+
+static const struct OamData sOamData_HeldItem =
+{
+    .y = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
+    .mosaic = 0,
+    .bpp = ST_OAM_4BPP,
+    .shape = SPRITE_SHAPE(8x8),
+    .x = 0,
+    .matrixNum = 0,
+    .size = SPRITE_SIZE(8x8),
+    .tileNum = 0,
+    .priority = 1,
+    .paletteNum = 0,
+    .affineParam = 0,
+};
+
+static const union AnimCmd sSpriteAnim_HeldItem[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_HeldMail[] =
+{
+    ANIMCMD_FRAME(1, 1),
+    ANIMCMD_END
+};
+
+static const union AnimCmd *const sSpriteAnimTable_HeldItem[] =
+{
+    sSpriteAnim_HeldItem,
+    sSpriteAnim_HeldMail,
+};
+
+static const struct SpriteSheet sSpriteSheet_HeldItem =
+{
+    sHeldItemGfx, sizeof(sHeldItemGfx), 0xd750
+};
+
+static const struct SpritePalette sSpritePalette_HeldItem =
+{
+    sHeldItemPalette, 0xd750
+};
+
+static const struct SpriteTemplate sSpriteTemplate_HeldItem =
+{
+    0xd750,
+    0xd750,
+    &sOamData_HeldItem,
+    sSpriteAnimTable_HeldItem,
+    NULL,
+    gDummySpriteAffineAnimTable,
+    SpriteCallbackDummy
+};
+
+static const struct OamData sOamData_MenuPokeball =
+{
+    .y = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
+    .mosaic = 0,
+    .bpp = ST_OAM_4BPP,
+    .shape = SPRITE_SHAPE(32x32),
+    .x = 0,
+    .matrixNum = 0,
+    .size = SPRITE_SIZE(32x32),
+    .tileNum = 0,
+    .priority = 1,
+    .paletteNum = 0,
+    .affineParam = 0
+};
+
+static const union AnimCmd sPokeballAnim_Closed[] =
+{
+    ANIMCMD_FRAME(0, 0),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sPokeballAnim_Open[] =
+{
+    ANIMCMD_FRAME(16, 0),
+    ANIMCMD_END
+};
+
+static const union AnimCmd *const sSpriteAnimTable_MenuPokeball[] =
+{
+    sPokeballAnim_Closed,
+    sPokeballAnim_Open
+};
+
+static const struct CompressedSpriteSheet sSpriteSheet_MenuPokeball =
+{
+    gPartyMenuPokeball_Gfx, 0x400, 0x04b0
+};
+
+static const struct CompressedSpritePalette sSpritePalette_MenuPokeball =
+{
+    gPartyMenuPokeball_Pal, 0x04b0
+};
+
+// Used for the pokeball sprite on each party slot / Cancel button
+static const struct SpriteTemplate sSpriteTemplate_MenuPokeball =
+{
+    .tileTag = 0x04b0,
+    .paletteTag = 0x04b0,
+    .oam = &sOamData_MenuPokeball,
+    .anims = sSpriteAnimTable_MenuPokeball,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy,
+};
+
+static const struct OamData sOamData_MenuPokeballSmall =
+{
+    .y = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
+    .mosaic = 0,
+    .bpp = ST_OAM_4BPP,
+    .shape = SPRITE_SHAPE(16x16),
+    .x = 0,
+    .matrixNum = 0,
+    .size = SPRITE_SIZE(16x16),
+    .tileNum = 0,
+    .priority = 2,
+    .paletteNum = 0,
+    .affineParam = 0
+};
+
+static const union AnimCmd sSmallPokeballAnim_Closed[] =
+{
+    ANIMCMD_FRAME(0, 0),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSmallPokeballAnim_Open[] =
+{
+    ANIMCMD_FRAME(4, 0),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSmallPokeballAnim_Blank1[] =
+{
+    ANIMCMD_FRAME(8, 0),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSmallPokeballAnim_Blank2[] =
+{
+    ANIMCMD_FRAME(12, 0),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSmallPokeballAnim_Blank3[] =
+{
+    ANIMCMD_FRAME(16, 0),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSmallPokeballAnim_Blank4[] =
+{
+    ANIMCMD_FRAME(20, 0),
+    ANIMCMD_END
+};
+
+// The blanks below are never used. See SpriteCB_BounceConfirmCancelButton, where they were intended to be used
+static const union AnimCmd *const sSpriteAnimTable_MenuPokeballSmall[] =
+{
+    sSmallPokeballAnim_Closed,
+    sSmallPokeballAnim_Open,
+    sSmallPokeballAnim_Blank1,
+    sSmallPokeballAnim_Blank2,
+    sSmallPokeballAnim_Blank3,
+    sSmallPokeballAnim_Blank4
+};
+
+static const struct CompressedSpriteSheet sSpriteSheet_MenuPokeballSmall =
+{
+    gPartyMenuPokeballSmall_Gfx, 0x0300, 0x04b1
+};
+
+// Used for the pokeball sprite next to Cancel and Confirm when both are present, otherwise sSpriteTemplate_MenuPokeball is used
+static const struct SpriteTemplate sSpriteTemplate_MenuPokeballSmall =
+{
+    .tileTag = 1201,
+    .paletteTag = 1200,
+    .oam = &sOamData_MenuPokeballSmall,
+    .anims = sSpriteAnimTable_MenuPokeballSmall,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy,
+};
+
+static const struct OamData sOamData_StatusCondition =
+{
+    .y = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
+    .mosaic = 0,
+    .bpp = ST_OAM_4BPP,
+    .shape = SPRITE_SHAPE(32x8),
+    .x = 0,
+    .matrixNum = 0,
+    .size = SPRITE_SIZE(32x8),
+    .tileNum = 0,
+    .priority = 1,
+    .paletteNum = 0,
+    .affineParam = 0
+};
+
+static const union AnimCmd sSpriteAnim_StatusPoison[] =
+{
+    ANIMCMD_FRAME(0, 0),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_StatusParalyzed[] =
+{
+    ANIMCMD_FRAME(4, 0),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_StatusSleep[] =
+{
+    ANIMCMD_FRAME(8, 0),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_StatusFrozen[] =
+{
+    ANIMCMD_FRAME(12, 0),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_StatusBurn[] =
+{
+    ANIMCMD_FRAME(16, 0),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_StatusPokerus[] =
+{
+    ANIMCMD_FRAME(20, 0),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_StatusFaint[] =
+{
+    ANIMCMD_FRAME(24, 0),
+    ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_Blank[] =
+{
+    ANIMCMD_FRAME(28, 0),
+    ANIMCMD_END
+};
+
+static const union AnimCmd *const sSpriteTemplate_StatusCondition[] =
+{
+    sSpriteAnim_StatusPoison,
+    sSpriteAnim_StatusParalyzed,
+    sSpriteAnim_StatusSleep,
+    sSpriteAnim_StatusFrozen,
+    sSpriteAnim_StatusBurn,
+    sSpriteAnim_StatusPokerus,
+    sSpriteAnim_StatusFaint,
+    sSpriteAnim_Blank
+};
+
+static const struct CompressedSpriteSheet sSpriteSheet_StatusIcons =
+{
+    gStatusGfx_Icons, 0x400, 1202
+};
+
+static const struct CompressedSpritePalette sSpritePalette_StatusIcons =
+{
+    gStatusPal_Icons, 1202
+};
+
+static const struct SpriteTemplate sSpriteTemplate_StatusIcons =
+{
+    .tileTag = 1202,
+    .paletteTag = 1202,
+    .oam = &sOamData_StatusCondition,
+    .anims = sSpriteTemplate_StatusCondition,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy,
+};
+
+// Mask for the partners party in a multi battle. TRUE if in the partners party, FALSE otherwise
+// The 7th slot is Cancel, and the 8th slot is unreachable
+// Used only to determine whether or not to show the Deoxys form icon sprite
+static const bool8 sMultiBattlePartnersPartyMask[PARTY_SIZE + 2] = 
+{
+    FALSE, 
+    TRUE, 
+    FALSE, 
+    FALSE, 
+    TRUE, 
+    TRUE, 
+    FALSE
+};
+
+static const u8 *const sUnused_StatStrings[] =
+{
+    gText_HP4,
+    gText_Attack3,
+    gText_Defense3,
+    gText_SpAtk4,
+    gText_SpDef4,
+    gText_Speed2
+};
+
+static const u16 sTMHMMoves[] =
+{
+    MOVE_FOCUS_PUNCH,
+    MOVE_DRAGON_CLAW,
+    MOVE_WATER_PULSE,
+    MOVE_CALM_MIND,
+    MOVE_ROAR,
+    MOVE_TOXIC,
+    MOVE_HAIL,
+    MOVE_BULK_UP,
+    MOVE_BULLET_SEED,
+    MOVE_HIDDEN_POWER,
+    MOVE_SUNNY_DAY,
+    MOVE_TAUNT,
+    MOVE_ICE_BEAM,
+    MOVE_BLIZZARD,
+    MOVE_HYPER_BEAM,
+    MOVE_LIGHT_SCREEN,
+    MOVE_PROTECT,
+    MOVE_RAIN_DANCE,
+    MOVE_GIGA_DRAIN,
+    MOVE_SAFEGUARD,
+    MOVE_FRUSTRATION,
+    MOVE_SOLAR_BEAM,
+    MOVE_IRON_TAIL,
+    MOVE_THUNDERBOLT,
+    MOVE_THUNDER,
+    MOVE_EARTHQUAKE,
+    MOVE_RETURN,
+    MOVE_DIG,
+    MOVE_PSYCHIC,
+    MOVE_SHADOW_BALL,
+    MOVE_BRICK_BREAK,
+    MOVE_DOUBLE_TEAM,
+    MOVE_REFLECT,
+    MOVE_SHOCK_WAVE,
+    MOVE_FLAMETHROWER,
+    MOVE_SLUDGE_BOMB,
+    MOVE_SANDSTORM,
+    MOVE_FIRE_BLAST,
+    MOVE_ROCK_TOMB,
+    MOVE_AERIAL_ACE,
+    MOVE_TORMENT,
+    MOVE_FACADE,
+    MOVE_SECRET_POWER,
+    MOVE_REST,
+    MOVE_ATTRACT,
+    MOVE_THIEF,
+    MOVE_STEEL_WING,
+    MOVE_SKILL_SWAP,
+    MOVE_SNATCH,
+    MOVE_OVERHEAT,
+    MOVE_CUT,
+    MOVE_FLY,
+    MOVE_SURF,
+    MOVE_STRENGTH,
+    MOVE_FLASH,
+    MOVE_ROCK_SMASH,
+    MOVE_WATERFALL,
+    MOVE_DIVE,
+};
diff --git a/src/data/pokemon/item_effects.h b/src/data/pokemon/item_effects.h
index 1697a1e7e..698d97a43 100644
--- a/src/data/pokemon/item_effects.h
+++ b/src/data/pokemon/item_effects.h
@@ -236,7 +236,7 @@ const u8 gItemEffect_PPMax[9] = {
 };
 
 const u8 gItemEffect_GuardSpec[8] = {
-    [3] = ITEM3_MIST,
+    [3] = ITEM3_GUARD_SPEC,
     [5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID,
     [6] = 1,
     [7] = 1,
@@ -377,7 +377,7 @@ const u8 gItemEffect_QualotBerry[10] = {
     [9] = 2,
 };
 
-const u8 gItemEffect_HondrewBerry[10] = {
+const u8 gItemEffect_HondewBerry[10] = {
     [5] = ITEM5_EV_SPATK | ITEM5_FRIENDSHIP_ALL,
     [6] = -10,
     [7] = 10,
@@ -469,7 +469,7 @@ const u8 *const gItemEffectTable[] =
     [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_HONDEW_BERRY - ITEM_POTION] = gItemEffect_HondewBerry,
     [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/level_up_learnsets.h b/src/data/pokemon/level_up_learnsets.h
index 727cc0959..c78b9ef0a 100644
--- a/src/data/pokemon/level_up_learnsets.h
+++ b/src/data/pokemon/level_up_learnsets.h
@@ -1,5 +1,4 @@
 #define LEVEL_UP_MOVE(lvl, move) ((lvl << 9) | move)
-#define LEVEL_UP_END 0xffff
 
 static const u16 sBulbasaurLevelUpLearnset[] = {
     LEVEL_UP_MOVE( 1, MOVE_TACKLE),
diff --git a/src/data/pokemon/trainer_class_lookups.h b/src/data/pokemon/trainer_class_lookups.h
index 0f2b53a18..2edefb274 100644
--- a/src/data/pokemon/trainer_class_lookups.h
+++ b/src/data/pokemon/trainer_class_lookups.h
@@ -2,7 +2,7 @@ const u8 gFacilityClassToPicIndex[] =
 {
     [FACILITY_CLASS_HIKER] = TRAINER_PIC_HIKER,
     [FACILITY_CLASS_AQUA_GRUNT_M] = TRAINER_PIC_AQUA_GRUNT_M,
-    [FACILITY_CLASS_POKEMON_BREEDER_F] = TRAINER_PIC_POKEMON_BREEDER_F,
+    [FACILITY_CLASS_PKMN_BREEDER_F] = TRAINER_PIC_POKEMON_BREEDER_F,
     [FACILITY_CLASS_COOLTRAINER_M] = TRAINER_PIC_COOLTRAINER_M,
     [FACILITY_CLASS_BIRD_KEEPER] = TRAINER_PIC_BIRD_KEEPER,
     [FACILITY_CLASS_COLLECTOR] = TRAINER_PIC_COLLECTOR,
@@ -88,7 +88,7 @@ const u8 gFacilityClassToTrainerClass[] =
 {
     [FACILITY_CLASS_HIKER] = TRAINER_CLASS_HIKER,
     [FACILITY_CLASS_AQUA_GRUNT_M] = TRAINER_CLASS_TEAM_AQUA,
-    [FACILITY_CLASS_POKEMON_BREEDER_F] = TRAINER_CLASS_PKMN_BREEDER,
+    [FACILITY_CLASS_PKMN_BREEDER_F] = TRAINER_CLASS_PKMN_BREEDER,
     [FACILITY_CLASS_COOLTRAINER_M] = TRAINER_CLASS_COOLTRAINER,
     [FACILITY_CLASS_BIRD_KEEPER] = TRAINER_CLASS_BIRD_KEEPER,
     [FACILITY_CLASS_COLLECTOR] = TRAINER_CLASS_COLLECTOR,
diff --git a/src/data/pokemon/tutor_learnsets.h b/src/data/pokemon/tutor_learnsets.h
index 0a930e993..2c8c3b362 100644
--- a/src/data/pokemon/tutor_learnsets.h
+++ b/src/data/pokemon/tutor_learnsets.h
@@ -1,35 +1,4 @@
-#define TUTOR_MOVE_MEGA_PUNCH 0
-#define TUTOR_MOVE_SWORDS_DANCE 1
-#define TUTOR_MOVE_MEGA_KICK 2
-#define TUTOR_MOVE_BODY_SLAM 3
-#define TUTOR_MOVE_DOUBLE_EDGE 4
-#define TUTOR_MOVE_COUNTER 5
-#define TUTOR_MOVE_SEISMIC_TOSS 6
-#define TUTOR_MOVE_MIMIC 7
-#define TUTOR_MOVE_METRONOME 8
-#define TUTOR_MOVE_SOFT_BOILED 9
-#define TUTOR_MOVE_DREAM_EATER 10
-#define TUTOR_MOVE_THUNDER_WAVE 11
-#define TUTOR_MOVE_EXPLOSION 12
-#define TUTOR_MOVE_ROCK_SLIDE 13
-#define TUTOR_MOVE_SUBSTITUTE 14
-#define TUTOR_MOVE_DYNAMIC_PUNCH 15
-#define TUTOR_MOVE_ROLLOUT 16
-#define TUTOR_MOVE_PSYCH_UP 17
-#define TUTOR_MOVE_SNORE 18
-#define TUTOR_MOVE_ICY_WIND 19
-#define TUTOR_MOVE_ENDURE 20
-#define TUTOR_MOVE_MUD_SLAP 21
-#define TUTOR_MOVE_ICE_PUNCH 22
-#define TUTOR_MOVE_SWAGGER 23
-#define TUTOR_MOVE_SLEEP_TALK 24
-#define TUTOR_MOVE_SWIFT 25
-#define TUTOR_MOVE_DEFENSE_CURL 26
-#define TUTOR_MOVE_THUNDER_PUNCH 27
-#define TUTOR_MOVE_FIRE_PUNCH 28
-#define TUTOR_MOVE_FURY_CUTTER 29
-
-const u16 gTutorMoves[] =
+const u16 gTutorMoves[TUTOR_MOVE_COUNT] =
 {
     [TUTOR_MOVE_MEGA_PUNCH] = MOVE_MEGA_PUNCH,
     [TUTOR_MOVE_SWORDS_DANCE] = MOVE_SWORDS_DANCE,
diff --git a/src/data/script_menu.h b/src/data/script_menu.h
new file mode 100644
index 000000000..3880c3c0c
--- /dev/null
+++ b/src/data/script_menu.h
@@ -0,0 +1,1006 @@
+// multichoice lists
+static const struct MenuAction MultichoiceList_BrineyOnDewford[] =
+{
+    {gText_Petalburg},
+    {gText_Slateport},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_EnterInfo[] =
+{
+    {gText_Enter2},
+    {gText_Info2},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_ContestInfo[] =
+{
+    {gText_WhatsAContest},
+    {gText_TypesOfContests},
+    {gText_Ranks},
+    {gText_Cancel2},
+};
+
+static const struct MenuAction MultichoiceList_ContestType[] =
+{
+    {gText_CoolnessContest},
+    {gText_BeautyContest},
+    {gText_CutenessContest},
+    {gText_SmartnessContest},
+    {gText_ToughnessContest},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_BasePCWithRegistry[] =
+{
+    {gText_Decoration2},
+    {gText_PackUp},
+    {gText_Registry},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_BasePCNoRegistry[] =
+{
+    {gText_Decoration2},
+    {gText_PackUp},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_RegisterMenu[] =
+{
+    {gMenuText_Register},
+    {gText_Registry},
+    {gText_Information},
+    {gText_Cancel2},
+};
+
+static const struct MenuAction MultichoiceList_Bike[] =
+{
+    {gText_Mach},
+    {gText_Acro},
+};
+
+static const struct MenuAction MultichoiceList_StatusInfo[] =
+{
+    {gText_Psn},
+    {gText_Par},
+    {gText_Slp},
+    {gText_Brn},
+    {gText_Frz},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_BrineyOffDewford[] =
+{
+    {gText_Dewford},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_ViewedPaintings[] =
+{
+    {gText_SawIt},
+    {gText_NotYet},
+};
+
+static const struct MenuAction MultichoiceList_YesNoInfo2[] =
+{
+    {gText_Yes},
+    {gText_No},
+    {gText_Info2},
+};
+
+static const struct MenuAction MultichoiceList_ChallengeInfo[] =
+{
+    {gText_Challenge},
+    {gText_Info3},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_LevelMode[] =
+{
+    {gText_Lv50},
+    {gText_OpenLevel},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_Mechadoll1_Q1[] =
+{
+    {gTrickHouse_Mechadoll_Oddish},
+    {gTrickHouse_Mechadoll_Poochyena},
+    {gTrickHouse_Mechadoll_Taillow},
+};
+
+static const struct MenuAction MultichoiceList_Mechadoll1_Q2[] = 
+{
+    {gTrickHouse_Mechadoll_Azurill},
+    {gTrickHouse_Mechadoll_Lotad},
+    {gTrickHouse_Mechadoll_Wingull},
+};
+
+static const struct MenuAction MultichoiceList_Mechadoll1_Q3[] = 
+{
+    {gTrickHouse_Mechadoll_Dustox},
+    {gTrickHouse_Mechadoll_Zubat},
+    {gTrickHouse_Mechadoll_Nincada},
+};
+
+static const struct MenuAction MultichoiceList_Mechadoll2_Q1[] = 
+{
+    {gTrickHouse_Mechadoll_Ralts},
+    {gTrickHouse_Mechadoll_Zigzagoon},
+    {gTrickHouse_Mechadoll_Slakoth},
+};
+
+static const struct MenuAction MultichoiceList_Mechadoll2_Q2[] = 
+{
+    {gTrickHouse_Mechadoll_Poochyena2},
+    {gTrickHouse_Mechadoll_Shroomish},
+    {gTrickHouse_Mechadoll_Zigzagoon2},
+};
+
+static const struct MenuAction MultichoiceList_Mechadoll2_Q3[] = 
+{
+    {gTrickHouse_Mechadoll_Poochyena3},
+    {gTrickHouse_Mechadoll_Zubat2},
+    {gTrickHouse_Mechadoll_Carvanha},
+};
+
+static const struct MenuAction MultichoiceList_Mechadoll3_Q1[] =
+{
+    {gTrickHouse_Mechadoll_BurnHeal},
+    {gTrickHouse_Mechadoll_HarborMail},
+    {gTrickHouse_Mechadoll_SamePrice},
+};
+
+static const struct MenuAction MultichoiceList_Mechadoll3_Q2[] = 
+{
+    {gTrickHouse_Mechadoll_60Yen},
+    {gTrickHouse_Mechadoll_55Yen},
+    {gTrickHouse_Mechadoll_Nothing},
+};
+
+static const struct MenuAction MultichoiceList_Mechadoll3_Q3[] = 
+{
+    {gTrickHouse_Mechadoll_CostMore},
+    {gTrickHouse_Mechadoll_CostLess},
+    {gTrickHouse_Mechadoll_SamePrice2},
+};
+
+static const struct MenuAction MultichoiceList_Mechadoll4_Q1[] = 
+{
+    {gTrickHouse_Mechadoll_Male},
+    {gTrickHouse_Mechadoll_Female},
+    {gTrickHouse_Mechadoll_Neither},
+};
+
+static const struct MenuAction MultichoiceList_Mechadoll4_Q2[] = 
+{
+    {gTrickHouse_Mechadoll_ElderlyMen},
+    {gTrickHouse_Mechadoll_ElderlyLadies},
+    {gTrickHouse_Mechadoll_SameNumber},
+};
+
+static const struct MenuAction MultichoiceList_Mechadoll4_Q3[] = 
+{
+    {gTrickHouse_Mechadoll_None},
+    {gTrickHouse_Mechadoll_One},
+    {gTrickHouse_Mechadoll_Two},
+};
+
+static const struct MenuAction MultichoiceList_Mechadoll5_Q1[] = 
+{
+    {gTrickHouse_Mechadoll_Two2},
+    {gTrickHouse_Mechadoll_Three},
+    {gTrickHouse_Mechadoll_Four},
+};
+
+static const struct MenuAction MultichoiceList_Mechadoll5_Q2[] = 
+{
+    {gTrickHouse_Mechadoll_Six},
+    {gTrickHouse_Mechadoll_Seven},
+    {gTrickHouse_Mechadoll_Eight},
+};
+
+static const struct MenuAction MultichoiceList_Mechadoll5_Q3[] = 
+{
+    {gTrickHouse_Mechadoll_Six2},
+    {gTrickHouse_Mechadoll_Seven2},
+    {gTrickHouse_Mechadoll_Eight2},
+};
+
+static const struct MenuAction MultichoiceList_VendingMachine[] =
+{
+    {gText_FreshWaterAndPrice},
+    {gText_SodaPopAndPrice},
+    {gText_LemonadeAndPrice},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_MachBikeInfo[] =
+{
+    {gText_HowToRide},
+    {gText_HowToTurn},
+    {gText_SandySlopes},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_AcroBikeInfo[] =
+{
+    {gText_Wheelies},
+    {gText_BunnyHops},
+    {gText_Jump},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_Satisfaction[] =
+{
+    {gText_Satisfied},
+    {gText_Dissatisfied},
+};
+
+static const struct MenuAction MultichoiceList_SternDeepSea[] =
+{
+    {gText_DeepSeaTooth},
+    {gText_DeepSeaScale},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_UnusedAshVendor[] =
+{
+    {gText_BlueFlute2},
+    {gText_YellowFlute2},
+    {gText_RedFlute2},
+    {gText_WhiteFlute2},
+    {gText_BlackFlute2},
+    {gText_GlassChair},
+    {gText_GlassDesk},
+    {gText_Cancel2},
+};
+
+static const struct MenuAction MultichoiceList_GameCornerDolls[] =
+{
+    {gText_TreeckoDollAndPrice},
+    {gText_TorchicDollAndPrice},
+    {gText_MudkipDollAndPrice},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_GameCornerTMs[] =
+{
+    {gText_TM32AndPrice},
+    {gText_TM29AndPrice},
+    {gText_TM35AndPrice},
+    {gText_TM24AndPrice},
+    {gText_TM13AndPrice},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_GameCornerCoins[] =
+{
+    {gText_50CoinsAndPrice},
+    {gText_500CoinsAndPrice},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_HowsFishing[] =
+{
+    {gText_Excellent2},
+    {gText_NotSoGood},
+};
+
+static const struct MenuAction MultichoiceList_SSTidalSlateportWithBF[] =
+{
+    {gText_LilycoveCity},
+    {gText_BattleFrontier},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_SSTidalBattleFrontier[] =
+{
+    {gText_SlateportCity},
+    {gText_LilycoveCity},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_RightLeft[] =
+{
+    {gText_Right},
+    {gText_Left},
+};
+
+static const struct MenuAction MultichoiceList_SSTidalSlateportNoBF[] =
+{
+    {gText_LilycoveCity},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_Floors[] =
+{
+    {gText_5F},
+    {gText_4F},
+    {gText_3F},
+    {gText_2F},
+    {gText_1F},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_ShardsR[] =
+{
+    {gText_RedShard},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_ShardsY[] =
+{
+    {gText_YellowShard},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_ShardsRY[] =
+{
+    {gText_RedShard},
+    {gText_YellowShard},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_ShardsB[] =
+{
+    {gText_BlueShard},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_ShardsRB[] =
+{
+    {gText_RedShard},
+    {gText_BlueShard},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_ShardsYB[] =
+{
+    {gText_YellowShard},
+    {gText_BlueShard},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_ShardsRYB[] =
+{
+    {gText_RedShard},
+    {gText_YellowShard},
+    {gText_BlueShard},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_ShardsG[] =
+{
+    {gText_GreenShard},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_ShardsRG[] =
+{
+    {gText_RedShard},
+    {gText_GreenShard},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_ShardsYG[] =
+{
+    {gText_YellowShard},
+    {gText_GreenShard},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_ShardsRYG[] =
+{
+    {gText_RedShard},
+    {gText_YellowShard},
+    {gText_GreenShard},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_ShardsBG[] =
+{
+    {gText_BlueShard},
+    {gText_GreenShard},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_ShardsRBG[] =
+{
+    {gText_RedShard},
+    {gText_BlueShard},
+    {gText_GreenShard},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_ShardsYBG[] =
+{
+    {gText_YellowShard},
+    {gText_BlueShard},
+    {gText_GreenShard},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_ShardsRYBG[] =
+{
+    {gText_RedShard},
+    {gText_YellowShard},
+    {gText_BlueShard},
+    {gText_GreenShard},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_TourneyWithRecord[] =
+{
+    {gText_Opponent},
+    {gText_Tourney_Tree},
+    {gText_ReadyToStart},
+    {gText_Record2},
+    {gText_Rest},
+    {gText_Retire},
+};
+
+static const struct MenuAction MultichoiceList_TourneyNoRecord[] =
+{
+    {gText_Opponent},
+    {gText_Tourney_Tree},
+    {gText_ReadyToStart},
+    {gText_Rest},
+    {gText_Retire},
+};
+
+static const struct MenuAction MultichoiceList_Tent[] =
+{
+    {gText_RedTent},
+    {gText_BlueTent},
+};
+
+static const struct MenuAction MultichoiceList_LinkServicesNoBerry[] =
+{
+    {gText_TradeCenter},
+    {gText_Colosseum},
+    {gText_RecordCorner},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_YesNoInfo[] =
+{
+    {gText_Yes},
+    {gText_No},
+    {gText_Info2},
+};
+
+static const struct MenuAction MultichoiceList_BattleMode[] =
+{
+    {gText_SingleBattle},
+    {gText_DoubleBattle},
+    {gText_MultiBattle},
+    {gText_Info2},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_LinkServicesNoRecord[] =
+{
+    {gText_TradeCenter},
+    {gText_Colosseum},
+    {gText_BerryCrush3},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_LinkServicesAll[] =
+{
+    {gText_TradeCenter},
+    {gText_Colosseum},
+    {gText_RecordCorner},
+    {gText_BerryCrush3},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_LinkServicesNoRecordBerry[] =
+{
+    {gText_TradeCenter},
+    {gText_Colosseum},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_WirelessMinigame[] =
+{
+    {gText_PokemonJump},
+    {gText_DodrioBerryPicking},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_LinkLeader[] =
+{
+    {gText_JoinGroup},
+    {gText_BecomeLeader},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_ContestRank[] =
+{
+    {gText_NormalRank},
+    {gText_SuperRank},
+    {gText_HyperRank},
+    {gText_MasterRank},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_FrontierItemChoose[] =
+{
+    {gText_BattleBag},
+    {gText_HeldItem},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_LinkContestInfo[] =
+{
+    {gText_LinkContest},
+    {gText_AboutE_Mode},
+    {gText_AboutG_Mode},
+    {gText_Cancel2},
+};
+
+static const struct MenuAction MultichoiceList_LinkContestMode[] =
+{
+    {gText_E_Mode},
+    {gText_G_Mode},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_ForcedStartMenu[] =
+{
+    {gText_MenuOptionPokedex},
+    {gText_MenuOptionPokemon},
+    {gText_MenuOptionBag},
+    {gText_MenuOptionPokenav},
+    {gText_Blank}, // blank because it's filled by the player's name
+    {gText_MenuOptionSave},
+    {gText_MenuOptionOption},
+    {gText_MenuOptionExit},
+};
+
+static const struct MenuAction MultichoiceList_FrontierGamblerBet[] =
+{
+    {gText_5BP},
+    {gText_10BP},
+    {gText_15BP},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_UnusedSSTidal1[] =
+{
+    {gText_SouthernIsland},
+    {gText_BirthIsland},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_UnusedSSTidal2[] =
+{
+    {gText_SouthernIsland},
+    {gText_FarawayIsland},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_UnusedSSTidal3[] =
+{
+    {gText_BirthIsland},
+    {gText_FarawayIsland},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_UnusedSSTidal4[] =
+{
+    {gText_SouthernIsland},
+    {gText_BirthIsland},
+    {gText_FarawayIsland},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_Fossil[] =
+{
+    {gText_ClawFossil},
+    {gText_RootFossil},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_YesNo[] =
+{
+    {gText_Yes},
+    {gText_No4},
+};
+
+static const struct MenuAction MultichoiceList_FrontierRules[] =
+{
+    {gText_TwoStyles},
+    {gText_Lv50_3},
+    {gText_OpenLevel2},
+    {gText_MonTypeAndNo},
+    {gText_HoldItems},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_FrontierPassInfo[] =
+{
+    {gText_Symbols2},
+    {gText_Record3},
+    {gText_BattlePts},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_BattleArenaRules[] =
+{
+    {gText_BattleRules},
+    {gText_JudgeMind},
+    {gText_JudgeSkill},
+    {gText_JudgeBody},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_BattleTowerRules[] =
+{
+    {gText_TowerInfo},
+    {gText_BattleMon},
+    {gText_BattleSalon},
+    {gText_MultiLink2},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_BattleDomeRules[] =
+{
+    {gText_Matchup},
+    {gText_TourneyTree},
+    {gText_DoubleKO},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_BattleFactoryRules[] =
+{
+    {gText_BasicRules},
+    {gText_SwapPartners},
+    {gText_SwapNumber},
+    {gText_SwapNotes},
+    {gText_OpenLevel3},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_BattlePalaceRules[] =
+{
+    {gText_BattleBasics},
+    {gText_PokemonNature},
+    {gText_PokemonMoves},
+    {gText_Underpowered},
+    {gText_WhenInDanger},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_BattlePyramidRules[] =
+{
+    {gText_PyramidPokemon},
+    {gText_PyramidTrainers},
+    {gText_PyramidMaze},
+    {gText_BattleBag2},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_BattlePikeRules[] =
+{
+    {gText_PokenavAndBag},
+    {gText_HeldItems},
+    {gText_PokemonOrder},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_GoOnRecordRestRetire[] =
+{
+    {gText_GoOn},
+    {gText_Record2},
+    {gText_Rest},
+    {gText_Retire},
+};
+
+static const struct MenuAction MultichoiceList_GoOnRestRetire[] =
+{
+    {gText_GoOn},
+    {gText_Rest},
+    {gText_Retire},
+};
+
+static const struct MenuAction MultichoiceList_GoOnRecordRetire[] =
+{
+    {gText_GoOn},
+    {gText_Record2},
+    {gText_Retire},
+};
+
+static const struct MenuAction MultichoiceList_GoOnRetire[] =
+{
+    {gText_GoOn},
+    {gText_Retire},
+};
+
+static const struct MenuAction MultichoiceList_TVLati[] =
+{
+    {gText_Red},
+    {gText_Blue},
+};
+
+static const struct MenuAction MultichoiceList_BattleTowerFeelings[] =
+{
+    {gText_IllBattleNow},
+    {gText_IWon},
+    {gText_ILost},
+    {gText_IWontTell},
+};
+
+static const struct MenuAction MultichoiceList_WheresRayquaza[] =
+{
+    {gText_CaveOfOrigin},
+    {gText_MtPyre},
+    {gText_SkyPillar},
+    {gText_DontRemember},
+};
+
+static const struct MenuAction MultichoiceList_SlateportTentRules[] =
+{
+    {gText_BasicRules},
+    {gText_SwapPartners},
+    {gText_SwapNumber},
+    {gText_SwapNotes},
+    {gText_BattlePokemon},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_FallarborTentRules[] =
+{
+    {gText_BattleTrainers},
+    {gText_BattleRules},
+    {gText_JudgeMind},
+    {gText_JudgeSkill},
+    {gText_JudgeBody},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_TagMatchType[] =
+{
+    {gText_NormalTagMatch},
+    {gText_VarietyTagMatch},
+    {gText_UniqueTagMatch},
+    {gText_ExpertTagMatch},
+    {gText_Exit},
+};
+
+static const struct MenuAction MultichoiceList_Exit[] =
+{
+    {gText_Exit},
+};
+
+struct MultichoiceListStruct
+{
+    const struct MenuAction *list;
+    u8 count;
+};
+
+static const struct MultichoiceListStruct sMultichoiceLists[] =
+{
+    [MULTI_BRINEY_ON_DEWFORD]          = MULTICHOICE(MultichoiceList_BrineyOnDewford),
+    [MULTI_PC]                         = MULTICHOICE(MultichoiceList_Exit),
+    [MULTI_ENTERINFO]                  = MULTICHOICE(MultichoiceList_EnterInfo),
+    [MULTI_CONTEST_INFO]               = MULTICHOICE(MultichoiceList_ContestInfo),
+    [MULTI_CONTEST_TYPE]               = MULTICHOICE(MultichoiceList_ContestType),
+    [MULTI_BASE_PC_NO_REGISTRY]        = MULTICHOICE(MultichoiceList_BasePCNoRegistry),
+    [MULTI_BASE_PC_WITH_REGISTRY]      = MULTICHOICE(MultichoiceList_BasePCWithRegistry),
+    [MULTI_REGISTER_MENU]              = MULTICHOICE(MultichoiceList_RegisterMenu),
+    [MULTI_SSTIDAL_LILYCOVE]           = MULTICHOICE(MultichoiceList_Exit),
+    [MULTI_UNUSED_9]                   = MULTICHOICE(MultichoiceList_Exit),
+    [MULTI_UNUSED_10]                  = MULTICHOICE(MultichoiceList_Exit),
+    [MULTI_FRONTIER_PASS_INFO]         = MULTICHOICE(MultichoiceList_FrontierPassInfo),
+    [MULTI_BIKE]                       = MULTICHOICE(MultichoiceList_Bike),
+    [MULTI_STATUS_INFO]                = MULTICHOICE(MultichoiceList_StatusInfo),
+    [MULTI_BRINEY_OFF_DEWFORD]         = MULTICHOICE(MultichoiceList_BrineyOffDewford),
+    [MULTI_UNUSED_15]                  = MULTICHOICE(MultichoiceList_Exit),
+    [MULTI_VIEWED_PAINTINGS]           = MULTICHOICE(MultichoiceList_ViewedPaintings),
+    [MULTI_YESNOINFO]                  = MULTICHOICE(MultichoiceList_YesNoInfo),
+    [MULTI_BATTLE_MODE]                = MULTICHOICE(MultichoiceList_BattleMode),
+    [MULTI_UNUSED_19]                  = MULTICHOICE(MultichoiceList_Exit),
+    [MULTI_YESNOINFO_2]                = MULTICHOICE(MultichoiceList_YesNoInfo2),
+    [MULTI_UNUSED_21]                  = MULTICHOICE(MultichoiceList_Exit),
+    [MULTI_UNUSED_22]                  = MULTICHOICE(MultichoiceList_Exit),
+    [MULTI_CHALLENGEINFO]              = MULTICHOICE(MultichoiceList_ChallengeInfo),
+    [MULTI_LEVEL_MODE]                 = MULTICHOICE(MultichoiceList_LevelMode),
+    [MULTI_MECHADOLL1_Q1]              = MULTICHOICE(MultichoiceList_Mechadoll1_Q1),
+    [MULTI_MECHADOLL1_Q2]              = MULTICHOICE(MultichoiceList_Mechadoll1_Q2),
+    [MULTI_MECHADOLL1_Q3]              = MULTICHOICE(MultichoiceList_Mechadoll1_Q3),
+    [MULTI_MECHADOLL2_Q1]              = MULTICHOICE(MultichoiceList_Mechadoll2_Q1),
+    [MULTI_MECHADOLL2_Q2]              = MULTICHOICE(MultichoiceList_Mechadoll2_Q2),
+    [MULTI_MECHADOLL2_Q3]              = MULTICHOICE(MultichoiceList_Mechadoll2_Q3),
+    [MULTI_MECHADOLL3_Q1]              = MULTICHOICE(MultichoiceList_Mechadoll3_Q1),
+    [MULTI_MECHADOLL3_Q2]              = MULTICHOICE(MultichoiceList_Mechadoll3_Q2),
+    [MULTI_MECHADOLL3_Q3]              = MULTICHOICE(MultichoiceList_Mechadoll3_Q3),
+    [MULTI_MECHADOLL4_Q1]              = MULTICHOICE(MultichoiceList_Mechadoll4_Q1),
+    [MULTI_MECHADOLL4_Q2]              = MULTICHOICE(MultichoiceList_Mechadoll4_Q2),
+    [MULTI_MECHADOLL4_Q3]              = MULTICHOICE(MultichoiceList_Mechadoll4_Q3),
+    [MULTI_MECHADOLL5_Q1]              = MULTICHOICE(MultichoiceList_Mechadoll5_Q1),
+    [MULTI_MECHADOLL5_Q2]              = MULTICHOICE(MultichoiceList_Mechadoll5_Q2),
+    [MULTI_MECHADOLL5_Q3]              = MULTICHOICE(MultichoiceList_Mechadoll5_Q3),
+    [MULTI_UNUSED_40]                  = MULTICHOICE(MultichoiceList_Exit),
+    [MULTI_UNUSED_41]                  = MULTICHOICE(MultichoiceList_Exit),
+    [MULTI_VENDING_MACHINE]            = MULTICHOICE(MultichoiceList_VendingMachine),
+    [MULTI_MACH_BIKE_INFO]             = MULTICHOICE(MultichoiceList_MachBikeInfo),
+    [MULTI_ACRO_BIKE_INFO]             = MULTICHOICE(MultichoiceList_AcroBikeInfo),
+    [MULTI_SATISFACTION]               = MULTICHOICE(MultichoiceList_Satisfaction),
+    [MULTI_STERN_DEEPSEA]              = MULTICHOICE(MultichoiceList_SternDeepSea),
+    [MULTI_UNUSED_ASH_VENDOR]          = MULTICHOICE(MultichoiceList_UnusedAshVendor),
+    [MULTI_GAME_CORNER_DOLLS]          = MULTICHOICE(MultichoiceList_GameCornerDolls),
+    [MULTI_GAME_CORNER_COINS]          = MULTICHOICE(MultichoiceList_GameCornerCoins),
+    [MULTI_HOWS_FISHING]               = MULTICHOICE(MultichoiceList_HowsFishing),
+    [MULTI_UNUSED_51]                  = MULTICHOICE(MultichoiceList_Exit),
+    [MULTI_SSTIDAL_SLATEPORT_WITH_BF]  = MULTICHOICE(MultichoiceList_SSTidalSlateportWithBF),
+    [MULTI_SSTIDAL_BATTLE_FRONTIER]    = MULTICHOICE(MultichoiceList_SSTidalBattleFrontier),
+    [MULTI_RIGHTLEFT]                  = MULTICHOICE(MultichoiceList_RightLeft),
+    [MULTI_GAME_CORNER_TMS]            = MULTICHOICE(MultichoiceList_GameCornerTMs),
+    [MULTI_SSTIDAL_SLATEPORT_NO_BF]    = MULTICHOICE(MultichoiceList_SSTidalSlateportNoBF),
+    [MULTI_FLOORS]                     = MULTICHOICE(MultichoiceList_Floors),
+    [MULTI_SHARDS_R]                   = MULTICHOICE(MultichoiceList_ShardsR),
+    [MULTI_SHARDS_Y]                   = MULTICHOICE(MultichoiceList_ShardsY),
+    [MULTI_SHARDS_RY]                  = MULTICHOICE(MultichoiceList_ShardsRY),
+    [MULTI_SHARDS_B]                   = MULTICHOICE(MultichoiceList_ShardsB),
+    [MULTI_SHARDS_RB]                  = MULTICHOICE(MultichoiceList_ShardsRB),
+    [MULTI_SHARDS_YB]                  = MULTICHOICE(MultichoiceList_ShardsYB),
+    [MULTI_SHARDS_RYB]                 = MULTICHOICE(MultichoiceList_ShardsRYB),
+    [MULTI_SHARDS_G]                   = MULTICHOICE(MultichoiceList_ShardsG),
+    [MULTI_SHARDS_RG]                  = MULTICHOICE(MultichoiceList_ShardsRG),
+    [MULTI_SHARDS_YG]                  = MULTICHOICE(MultichoiceList_ShardsYG),
+    [MULTI_SHARDS_RYG]                 = MULTICHOICE(MultichoiceList_ShardsRYG),
+    [MULTI_SHARDS_BG]                  = MULTICHOICE(MultichoiceList_ShardsBG),
+    [MULTI_SHARDS_RBG]                 = MULTICHOICE(MultichoiceList_ShardsRBG),
+    [MULTI_SHARDS_YBG]                 = MULTICHOICE(MultichoiceList_ShardsYBG),
+    [MULTI_SHARDS_RYBG]                = MULTICHOICE(MultichoiceList_ShardsRYBG),
+    [MULTI_TOURNEY_WITH_RECORD]        = MULTICHOICE(MultichoiceList_TourneyWithRecord),
+    [MULTI_CABLE_CLUB_NO_RECORD_MIX]   = MULTICHOICE(MultichoiceList_LinkServicesNoRecordBerry),
+    [MULTI_WIRELESS_NO_RECORD_BERRY]   = MULTICHOICE(MultichoiceList_LinkServicesNoRecordBerry),
+    [MULTI_CABLE_CLUB_WITH_RECORD_MIX] = MULTICHOICE(MultichoiceList_LinkServicesNoBerry),
+    [MULTI_WIRELESS_NO_BERRY]          = MULTICHOICE(MultichoiceList_LinkServicesNoBerry),
+    [MULTI_WIRELESS_NO_RECORD]         = MULTICHOICE(MultichoiceList_LinkServicesNoRecord),
+    [MULTI_WIRELESS_ALL_SERVICES]      = MULTICHOICE(MultichoiceList_LinkServicesAll),
+    [MULTI_WIRELESS_MINIGAME]          = MULTICHOICE(MultichoiceList_WirelessMinigame),
+    [MULTI_LINK_LEADER]                = MULTICHOICE(MultichoiceList_LinkLeader),
+    [MULTI_CONTEST_RANK]               = MULTICHOICE(MultichoiceList_ContestRank),
+    [MULTI_FRONTIER_ITEM_CHOOSE]       = MULTICHOICE(MultichoiceList_FrontierItemChoose),
+    [MULTI_LINK_CONTEST_INFO]          = MULTICHOICE(MultichoiceList_LinkContestInfo),
+    [MULTI_LINK_CONTEST_MODE]          = MULTICHOICE(MultichoiceList_LinkContestMode),
+    [MULTI_FORCED_START_MENU]          = MULTICHOICE(MultichoiceList_ForcedStartMenu),
+    [MULTI_FRONTIER_GAMBLER_BET]       = MULTICHOICE(MultichoiceList_FrontierGamblerBet),
+    [MULTI_TENT]                       = MULTICHOICE(MultichoiceList_Tent),
+    [MULTI_UNUSED_SSTIDAL_1]           = MULTICHOICE(MultichoiceList_UnusedSSTidal1),
+    [MULTI_UNUSED_SSTIDAL_2]           = MULTICHOICE(MultichoiceList_UnusedSSTidal2),
+    [MULTI_UNUSED_SSTIDAL_3]           = MULTICHOICE(MultichoiceList_UnusedSSTidal3),
+    [MULTI_UNUSED_SSTIDAL_4]           = MULTICHOICE(MultichoiceList_UnusedSSTidal4),
+    [MULTI_FOSSIL]                     = MULTICHOICE(MultichoiceList_Fossil),
+    [MULTI_YESNO]                      = MULTICHOICE(MultichoiceList_YesNo),
+    [MULTI_FRONTIER_RULES]             = MULTICHOICE(MultichoiceList_FrontierRules),
+    [MULTI_BATTLE_ARENA_RULES]         = MULTICHOICE(MultichoiceList_BattleArenaRules),
+    [MULTI_BATTLE_TOWER_RULES]         = MULTICHOICE(MultichoiceList_BattleTowerRules),
+    [MULTI_BATTLE_DOME_RULES]          = MULTICHOICE(MultichoiceList_BattleDomeRules),
+    [MULTI_BATTLE_FACTORY_RULES]       = MULTICHOICE(MultichoiceList_BattleFactoryRules),
+    [MULTI_BATTLE_PALACE_RULES]        = MULTICHOICE(MultichoiceList_BattlePalaceRules),
+    [MULTI_BATTLE_PYRAMID_RULES]       = MULTICHOICE(MultichoiceList_BattlePyramidRules),
+    [MULTI_BATTLE_PIKE_RULES]          = MULTICHOICE(MultichoiceList_BattlePikeRules),
+    [MULTI_GO_ON_RECORD_REST_RETIRE]   = MULTICHOICE(MultichoiceList_GoOnRecordRestRetire),
+    [MULTI_GO_ON_REST_RETIRE]          = MULTICHOICE(MultichoiceList_GoOnRestRetire),
+    [MULTI_GO_ON_RECORD_RETIRE]        = MULTICHOICE(MultichoiceList_GoOnRecordRetire),
+    [MULTI_GO_ON_RETIRE]               = MULTICHOICE(MultichoiceList_GoOnRetire),
+    [MULTI_TOURNEY_NO_RECORD]          = MULTICHOICE(MultichoiceList_TourneyNoRecord),
+    [MULTI_TV_LATI]                    = MULTICHOICE(MultichoiceList_TVLati),
+    [MULTI_BATTLE_TOWER_FEELINGS]      = MULTICHOICE(MultichoiceList_BattleTowerFeelings),
+    [MULTI_WHERES_RAYQUAZA]            = MULTICHOICE(MultichoiceList_WheresRayquaza),
+    [MULTI_SLATEPORT_TENT_RULES]       = MULTICHOICE(MultichoiceList_SlateportTentRules),
+    [MULTI_FALLARBOR_TENT_RULES]       = MULTICHOICE(MultichoiceList_FallarborTentRules),
+    [MULTI_TAG_MATCH_TYPE]             = MULTICHOICE(MultichoiceList_TagMatchType),
+};
+
+const u8 *const gStdStrings[] =
+{
+    [STDSTRING_COOL] = gText_Cool,
+    [STDSTRING_BEAUTY] = gText_Beauty,
+    [STDSTRING_CUTE] = gText_Cute,
+    [STDSTRING_SMART] = gText_Smart,
+    [STDSTRING_TOUGH] = gText_Tough,
+    [STDSTRING_NORMAL] = gText_Normal,
+    [STDSTRING_SUPER] = gText_Super,
+    [STDSTRING_HYPER] = gText_Hyper,
+    [STDSTRING_MASTER] = gText_Master,
+    [STDSTRING_COOL2] = gText_Cool2,
+    [STDSTRING_BEAUTY2] = gText_Beauty2,
+    [STDSTRING_CUTE2] = gText_Cute2,
+    [STDSTRING_SMART2] = gText_Smart2,
+    [STDSTRING_TOUGH2] = gText_Tough2,
+    [STDSTRING_ITEMS] = gText_Items,
+    [STDSTRING_KEYITEMS] = gText_Key_Items,
+    [STDSTRING_POKEBALLS] = gText_Poke_Balls,
+    [STDSTRING_TMHMS] = gText_TMs_Hms,
+    [STDSTRING_BERRIES] = gText_Berries2,
+    [STDSTRING_SINGLE] = gText_Single2,
+    [STDSTRING_DOUBLE] = gText_Double2,
+    [STDSTRING_MULTI] = gText_Multi,
+    [STDSTRING_MULTI_LINK] = gText_MultiLink,
+    [STDSTRING_BATTLE_TOWER] = gText_BattleTower2,
+    [STDSTRING_BATTLE_DOME] = gText_BattleDome,
+    [STDSTRING_BATTLE_FACTORY] = gText_BattleFactory,
+    [STDSTRING_BATTLE_PALACE] = gText_BattlePalace,
+    [STDSTRING_BATTLE_ARENA] = gText_BattleArena,
+    [STDSTRING_BATTLE_PIKE] = gText_BattlePike,
+    [STDSTRING_BATTLE_PYRAMID] = gText_BattlePyramid,
+};
+
+static const u8 sLinkServicesMultichoiceIds[] = 
+{ 
+    MULTI_CABLE_CLUB_NO_RECORD_MIX, 
+    MULTI_WIRELESS_NO_RECORD_BERRY, 
+    MULTI_CABLE_CLUB_WITH_RECORD_MIX, 
+    MULTI_WIRELESS_NO_BERRY, 
+    MULTI_WIRELESS_NO_RECORD, 
+    MULTI_WIRELESS_ALL_SERVICES 
+};
+
+static const u8 *const sPCNameStrings[] =
+{
+    gText_SomeonesPC,
+    gText_LanettesPC,
+    gText_PlayersPC,
+    gText_LogOff,
+};
+
+static const u8 *const sLilycoveSSTidalDestinations[SSTIDAL_SELECTION_COUNT] =
+{
+    [SSTIDAL_SELECTION_SLATEPORT]       = gText_SlateportCity,
+    [SSTIDAL_SELECTION_BATTLE_FRONTIER] = gText_BattleFrontier,
+    [SSTIDAL_SELECTION_SOUTHERN_ISLAND] = gText_SouthernIsland,
+    [SSTIDAL_SELECTION_NAVEL_ROCK]      = gText_NavelRock,
+    [SSTIDAL_SELECTION_BIRTH_ISLAND]    = gText_BirthIsland,
+    [SSTIDAL_SELECTION_FARAWAY_ISLAND]  = gText_FarawayIsland,
+    [SSTIDAL_SELECTION_EXIT]            = gText_Exit,
+};
+
+static const u8 *const sCableClubOptions_WithRecordMix[] =
+{
+    CableClub_Text_TradeUsingLinkCable,
+    CableClub_Text_BattleUsingLinkCable,
+    CableClub_Text_RecordCornerUsingLinkCable,
+    CableClub_Text_CancelSelectedItem,
+};
+static const u8 *const sWirelessOptionsNoBerryCrush[] =
+{
+    CableClub_Text_YouMayTradeHere,
+    CableClub_Text_YouMayBattleHere,
+    CableClub_Text_CanMixRecords,
+    CableClub_Text_CancelSelectedItem,
+};
+static const u8 *const sWirelessOptions_NoRecordMix[] =
+{
+    CableClub_Text_YouMayTradeHere,
+    CableClub_Text_YouMayBattleHere,
+    CableClub_Text_CanMakeBerryPowder,
+    CableClub_Text_CancelSelectedItem,
+};
+static const u8 *const sWirelessOptions_AllServices[] =
+{
+    CableClub_Text_YouMayTradeHere,
+    CableClub_Text_YouMayBattleHere,
+    CableClub_Text_CanMixRecords,
+    CableClub_Text_CanMakeBerryPowder,
+    CableClub_Text_CancelSelectedItem,
+};
+static const u8 *const sCableClubOptions_NoRecordMix[] =
+{
+    CableClub_Text_TradeUsingLinkCable,
+    CableClub_Text_BattleUsingLinkCable,
+    CableClub_Text_CancelSelectedItem,
+};
+static const u8 *const sWirelessOptions_NoRecordMixBerryCrush[] =
+{
+    CableClub_Text_YouMayTradeHere,
+    CableClub_Text_YouMayBattleHere,
+    CableClub_Text_CancelSelectedItem,
+};
diff --git a/src/data/text/match_call_messages.h b/src/data/text/match_call_messages.h
index c3015b5a7..6ea3b549f 100644
--- a/src/data/text/match_call_messages.h
+++ b/src/data/text/match_call_messages.h
@@ -1,399 +1,394 @@
-#define MCFLAVOR(name) {gMatchCallFlavorText_##name##_Strategy, \
-                        gMatchCallFlavorText_##name##_Pokemon,  \
-                        gMatchCallFlavorText_##name##_Intro1,   \
-                        gMatchCallFlavorText_##name##_Intro2}
-
-const u8 gMatchCallFlavorText_AromaLady_Rose_Strategy[] = _("Becalm fighting emotions.");
-const u8 gMatchCallFlavorText_AromaLady_Rose_Pokemon[] = _("Fragrant GRASS POKéMON.");
-const u8 gMatchCallFlavorText_AromaLady_Rose_Intro1[] = _("Soothing aromas make the");
-const u8 gMatchCallFlavorText_AromaLady_Rose_Intro2[] = _("body and mind healthy.");
-
-const u8 gMatchCallFlavorText_RuinManiac_Andres_Strategy[] = _("I'm not very good at this.");
-const u8 gMatchCallFlavorText_RuinManiac_Andres_Pokemon[] = _("Ruin-exploration partners.");
-const u8 gMatchCallFlavorText_RuinManiac_Andres_Intro1[] = _("I am searching for undersea");
-const u8 gMatchCallFlavorText_RuinManiac_Andres_Intro2[] = _("ruins and relics.");
-
-const u8 gMatchCallFlavorText_RuinManiac_Dusty_Strategy[] = _("Overwhelm with power!");
-const u8 gMatchCallFlavorText_RuinManiac_Dusty_Pokemon[] = _("Craggy ROCK POKéMON.");
-const u8 gMatchCallFlavorText_RuinManiac_Dusty_Intro1[] = _("In search of ancient lore,");
-const u8 gMatchCallFlavorText_RuinManiac_Dusty_Intro2[] = _("I travel the world.");
-
-const u8 gMatchCallFlavorText_Tuber_Lola_Strategy[] = _("I'm going to try hard!");
-const u8 gMatchCallFlavorText_Tuber_Lola_Pokemon[] = _("Good swimmer POKéMON.");
-const u8 gMatchCallFlavorText_Tuber_Lola_Intro1[] = _("I wish I could swim without");
-const u8 gMatchCallFlavorText_Tuber_Lola_Intro2[] = _("using an inner tube.");
-
-const u8 gMatchCallFlavorText_Tuber_Ricky_Strategy[] = _("I don't know. I'll try hard.");
-const u8 gMatchCallFlavorText_Tuber_Ricky_Pokemon[] = _("WATER POKéMON are buddies.");
-const u8 gMatchCallFlavorText_Tuber_Ricky_Intro1[] = _("It's not like I can't swim.");
-const u8 gMatchCallFlavorText_Tuber_Ricky_Intro2[] = _("I just like my inner tube.");
-
-const u8 gMatchCallFlavorText_SisAndBro_LilaAndRoy_Strategy[] = _("We split our duties.");
-const u8 gMatchCallFlavorText_SisAndBro_LilaAndRoy_Pokemon[] = _("We like friendly POKéMON.");
-const u8 gMatchCallFlavorText_SisAndBro_LilaAndRoy_Intro1[] = _("We enjoy POKéMON together");
-const u8 gMatchCallFlavorText_SisAndBro_LilaAndRoy_Intro2[] = _("as sister and brother.");
-
-const u8 gMatchCallFlavorText_Cooltrainer_Cristin_Strategy[] = _("I finish with power moves!");
-const u8 gMatchCallFlavorText_Cooltrainer_Cristin_Pokemon[] = _("A mix of different types.");
-const u8 gMatchCallFlavorText_Cooltrainer_Cristin_Intro1[] = _("I aim to become the ultimate");
-const u8 gMatchCallFlavorText_Cooltrainer_Cristin_Intro2[] = _("TRAINER!");
-
-const u8 gMatchCallFlavorText_Cooltrainer_Brooke_Strategy[] = _("Exploit the foe's weakness.");
-const u8 gMatchCallFlavorText_Cooltrainer_Brooke_Pokemon[] = _("Balance is crucial.");
-const u8 gMatchCallFlavorText_Cooltrainer_Brooke_Intro1[] = _("My goal is to become the");
-const u8 gMatchCallFlavorText_Cooltrainer_Brooke_Intro2[] = _("POKéMON CHAMPION.");
-
-const u8 gMatchCallFlavorText_Cooltrainer_Wilton_Strategy[] = _("Upset the opponent.");
-const u8 gMatchCallFlavorText_Cooltrainer_Wilton_Pokemon[] = _("Type doesn't matter.");
-const u8 gMatchCallFlavorText_Cooltrainer_Wilton_Intro1[] = _("I'm a top student at the");
-const u8 gMatchCallFlavorText_Cooltrainer_Wilton_Intro2[] = _("TRAINER'S SCHOOL.");
-
-const u8 gMatchCallFlavorText_HexManiac_Valerie_Strategy[] = _("Slow, steady suffering.");
-const u8 gMatchCallFlavorText_HexManiac_Valerie_Pokemon[] = _("Scary to meet at night.");
-const u8 gMatchCallFlavorText_HexManiac_Valerie_Intro1[] = _("I see things that others");
-const u8 gMatchCallFlavorText_HexManiac_Valerie_Intro2[] = _("can't see...");
-
-const u8 gMatchCallFlavorText_Lady_Cindy_Strategy[] = _("Anything to win.");
-const u8 gMatchCallFlavorText_Lady_Cindy_Pokemon[] = _("Gorgeous type!");
-const u8 gMatchCallFlavorText_Lady_Cindy_Intro1[] = _("I have a pool specially for");
-const u8 gMatchCallFlavorText_Lady_Cindy_Intro2[] = _("my POKéMON at home.");
-
-const u8 gMatchCallFlavorText_Beauty_Thalia_Strategy[] = _("You'll fall under my spell!");
-const u8 gMatchCallFlavorText_Beauty_Thalia_Pokemon[] = _("Mature WATER type.");
-const u8 gMatchCallFlavorText_Beauty_Thalia_Intro1[] = _("I dream of cruising around");
-const u8 gMatchCallFlavorText_Beauty_Thalia_Intro2[] = _("the world on a luxury liner.");
-
-const u8 gMatchCallFlavorText_Beauty_Jessica_Strategy[] = _("I'll lead you astray.");
-const u8 gMatchCallFlavorText_Beauty_Jessica_Pokemon[] = _("Cute, of course.");
-const u8 gMatchCallFlavorText_Beauty_Jessica_Intro1[] = _("I love the SAFARI ZONE.");
-const u8 gMatchCallFlavorText_Beauty_Jessica_Intro2[] = _("I seem to end up there.");
-
-const u8 gMatchCallFlavorText_RichBoy_Winston_Strategy[] = _("Strategy? Who needs it?");
-const u8 gMatchCallFlavorText_RichBoy_Winston_Pokemon[] = _("I spent big money on it!");
-const u8 gMatchCallFlavorText_RichBoy_Winston_Intro1[] = _("I, being rich, sleep in a");
-const u8 gMatchCallFlavorText_RichBoy_Winston_Intro2[] = _("custom POKéMON bed.");
-
-const u8 gMatchCallFlavorText_PokeManiac_Steve_Strategy[] = _("Wrestle down with power.");
-const u8 gMatchCallFlavorText_PokeManiac_Steve_Pokemon[] = _("Took all night to catch.");
-const u8 gMatchCallFlavorText_PokeManiac_Steve_Intro1[] = _("Big, burly, and buff");
-const u8 gMatchCallFlavorText_PokeManiac_Steve_Intro2[] = _("POKéMON are the best...");
-
-const u8 gMatchCallFlavorText_Swimmer_Tony_Strategy[] = _("Ram at full speed!");
-const u8 gMatchCallFlavorText_Swimmer_Tony_Pokemon[] = _("Funky WATER type!");
-const u8 gMatchCallFlavorText_Swimmer_Tony_Intro1[] = _("If I can't be out swimming,");
-const u8 gMatchCallFlavorText_Swimmer_Tony_Intro2[] = _("I'll be pumping weights.");
-
-const u8 gMatchCallFlavorText_BlackBelt_Nob_Strategy[] = _("Grand slam pummeling!");
-const u8 gMatchCallFlavorText_BlackBelt_Nob_Pokemon[] = _("FIGHTING type.");
-const u8 gMatchCallFlavorText_BlackBelt_Nob_Intro1[] = _("Not to brag, but I can bust");
-const u8 gMatchCallFlavorText_BlackBelt_Nob_Intro2[] = _("ten roof tiles!");
-
-const u8 gMatchCallFlavorText_BlackBelt_Koji_Strategy[] = _("Witness karate power!");
-const u8 gMatchCallFlavorText_BlackBelt_Koji_Pokemon[] = _("My partners in training!");
-const u8 gMatchCallFlavorText_BlackBelt_Koji_Intro1[] = _("Let us discuss matters of");
-const u8 gMatchCallFlavorText_BlackBelt_Koji_Intro2[] = _("the world with bare fists!");
-
-const u8 gMatchCallFlavorText_Guitarist_Fernando_Strategy[] = _("Rock to stunning sounds!");
-const u8 gMatchCallFlavorText_Guitarist_Fernando_Pokemon[] = _("Electric-and-sound combo!");
-const u8 gMatchCallFlavorText_Guitarist_Fernando_Intro1[] = _("My compositions will shock");
-const u8 gMatchCallFlavorText_Guitarist_Fernando_Intro2[] = _("you and stun you!");
-
-const u8 gMatchCallFlavorText_Guitarist_Dalton_Strategy[] = _("I'll electrify you!");
-const u8 gMatchCallFlavorText_Guitarist_Dalton_Pokemon[] = _("They're ELECTRIC!");
-const u8 gMatchCallFlavorText_Guitarist_Dalton_Intro1[] = _("I want to make people cry");
-const u8 gMatchCallFlavorText_Guitarist_Dalton_Intro2[] = _("with songs from my heart.");
-
-const u8 gMatchCallFlavorText_Kindler_Bernie_Strategy[] = _("Burn it all down!");
-const u8 gMatchCallFlavorText_Kindler_Bernie_Pokemon[] = _("Burn-inducing POKéMON.");
-const u8 gMatchCallFlavorText_Kindler_Bernie_Intro1[] = _("When you light a campfire,");
-const u8 gMatchCallFlavorText_Kindler_Bernie_Intro2[] = _("be sure there's some water.");
-
-const u8 gMatchCallFlavorText_Camper_Ethan_Strategy[] = _("Hang in and be tenacious!");
-const u8 gMatchCallFlavorText_Camper_Ethan_Pokemon[] = _("I'll raise any POKéMON.");
-const u8 gMatchCallFlavorText_Camper_Ethan_Intro1[] = _("POKéMON raised in the wild");
-const u8 gMatchCallFlavorText_Camper_Ethan_Intro2[] = _("grow strong!");
-
-const u8 gMatchCallFlavorText_OldCouple_JohnAndJay_Strategy[] = _("Our love lets us prevail.");
-const u8 gMatchCallFlavorText_OldCouple_JohnAndJay_Pokemon[] = _("We've had them for years.");
-const u8 gMatchCallFlavorText_OldCouple_JohnAndJay_Intro1[] = _("Married 50 years, we've");
-const u8 gMatchCallFlavorText_OldCouple_JohnAndJay_Intro2[] = _("devotedly raised POKéMON.");
-
-const u8 gMatchCallFlavorText_BugManiac_Jeffrey_Strategy[] = _("Attack in waves!");
-const u8 gMatchCallFlavorText_BugManiac_Jeffrey_Pokemon[] = _("BUG POKéMON are cool.");
-const u8 gMatchCallFlavorText_BugManiac_Jeffrey_Intro1[] = _("I go into the forest every");
-const u8 gMatchCallFlavorText_BugManiac_Jeffrey_Intro2[] = _("day to catch BUG POKéMON.");
-
-const u8 gMatchCallFlavorText_Psychic_Cameron_Strategy[] = _("Daze and confuse!");
-const u8 gMatchCallFlavorText_Psychic_Cameron_Pokemon[] = _("Ones with weird powers.");
-const u8 gMatchCallFlavorText_Psychic_Cameron_Intro1[] = _("I can see through exactly");
-const u8 gMatchCallFlavorText_Psychic_Cameron_Intro2[] = _("what you're thinking!");
-
-const u8 gMatchCallFlavorText_Psychic_Jacki_Strategy[] = _("Battle at full power.");
-const u8 gMatchCallFlavorText_Psychic_Jacki_Pokemon[] = _("POKéMON of many mysteries.");
-const u8 gMatchCallFlavorText_Psychic_Jacki_Intro1[] = _("When we spoke, I was really");
-const u8 gMatchCallFlavorText_Psychic_Jacki_Intro2[] = _("using telepathy.");
-
-const u8 gMatchCallFlavorText_Gentleman_Walter_Strategy[] = _("Calm and collected.");
-const u8 gMatchCallFlavorText_Gentleman_Walter_Pokemon[] = _("POKéMON of distinction.");
-const u8 gMatchCallFlavorText_Gentleman_Walter_Intro1[] = _("We enjoy a spot of tea");
-const u8 gMatchCallFlavorText_Gentleman_Walter_Intro2[] = _("every day. It's imported.");
-
-const u8 gMatchCallFlavorText_SchoolKid_Karen_Strategy[] = _("I use my head to battle.");
-const u8 gMatchCallFlavorText_SchoolKid_Karen_Pokemon[] = _("I love any kind of POKéMON!");
-const u8 gMatchCallFlavorText_SchoolKid_Karen_Intro1[] = _("My daddy gives me spending");
-const u8 gMatchCallFlavorText_SchoolKid_Karen_Intro2[] = _("money if I ace a test.");
-
-const u8 gMatchCallFlavorText_SchoolKid_Jerry_Strategy[] = _("My knowledge rules!");
-const u8 gMatchCallFlavorText_SchoolKid_Jerry_Pokemon[] = _("Any smart POKéMON!");
-const u8 gMatchCallFlavorText_SchoolKid_Jerry_Intro1[] = _("I want to be a POKéMON");
-const u8 gMatchCallFlavorText_SchoolKid_Jerry_Intro2[] = _("researcher in the future.");
-
-const u8 gMatchCallFlavorText_SrAndJr_AnnaAndMeg_Strategy[] = _("We talk it over first.");
-const u8 gMatchCallFlavorText_SrAndJr_AnnaAndMeg_Pokemon[] = _("POKéMON that we both like.");
-const u8 gMatchCallFlavorText_SrAndJr_AnnaAndMeg_Intro1[] = _("We're senior and junior");
-const u8 gMatchCallFlavorText_SrAndJr_AnnaAndMeg_Intro2[] = _("students into POKéMON!");
-
-const u8 gMatchCallFlavorText_Pokefan_Isabel_Strategy[] = _("Go for it, my dears!");
-const u8 gMatchCallFlavorText_Pokefan_Isabel_Pokemon[] = _("I have no likes or dislikes.");
-const u8 gMatchCallFlavorText_Pokefan_Isabel_Intro1[] = _("While out shopping for");
-const u8 gMatchCallFlavorText_Pokefan_Isabel_Intro2[] = _("supper, I battle too.");
-
-const u8 gMatchCallFlavorText_Pokefan_Miguel_Strategy[] = _("I battle with love!");
-const u8 gMatchCallFlavorText_Pokefan_Miguel_Pokemon[] = _("A POKéMON raised with love!");
-const u8 gMatchCallFlavorText_Pokefan_Miguel_Intro1[] = _("It's important to build");
-const u8 gMatchCallFlavorText_Pokefan_Miguel_Intro2[] = _("trust with your POKéMON.");
-
-const u8 gMatchCallFlavorText_Expert_Timothy_Strategy[] = _("I see through your moves!");
-const u8 gMatchCallFlavorText_Expert_Timothy_Pokemon[] = _("The essence of FIGHTING.");
-const u8 gMatchCallFlavorText_Expert_Timothy_Intro1[] = _("I'm not ready to give way");
-const u8 gMatchCallFlavorText_Expert_Timothy_Intro2[] = _("to the young yet!");
-
-const u8 gMatchCallFlavorText_Expert_Shelby_Strategy[] = _("Attack while defending.");
-const u8 gMatchCallFlavorText_Expert_Shelby_Pokemon[] = _("The FIGHTING type.");
-const u8 gMatchCallFlavorText_Expert_Shelby_Intro1[] = _("Being old, I have my own");
-const u8 gMatchCallFlavorText_Expert_Shelby_Intro2[] = _("style of battling.");
-
-const u8 gMatchCallFlavorText_Youngster_Calvin_Strategy[] = _("I do what I can.");
-const u8 gMatchCallFlavorText_Youngster_Calvin_Pokemon[] = _("I use different types.");
-const u8 gMatchCallFlavorText_Youngster_Calvin_Intro1[] = _("I'm going to keep working");
-const u8 gMatchCallFlavorText_Youngster_Calvin_Intro2[] = _("until I beat a GYM LEADER.");
-
-const u8 gMatchCallFlavorText_Fisherman_Elliot_Strategy[] = _("I battle patiently.");
-const u8 gMatchCallFlavorText_Fisherman_Elliot_Pokemon[] = _("WATER POKéMON to battle!");
-const u8 gMatchCallFlavorText_Fisherman_Elliot_Intro1[] = _("I'm the world's only guy to");
-const u8 gMatchCallFlavorText_Fisherman_Elliot_Intro2[] = _("catch a huge POKéMON!");
-
-const u8 gMatchCallFlavorText_Triathlete_Isaiah_Strategy[] = _("Exploit the environment!");
-const u8 gMatchCallFlavorText_Triathlete_Isaiah_Pokemon[] = _("All hail the WATER type!");
-const u8 gMatchCallFlavorText_Triathlete_Isaiah_Intro1[] = _("I won't be beaten by some");
-const u8 gMatchCallFlavorText_Triathlete_Isaiah_Intro2[] = _("beach bum SWIMMER!");
-
-const u8 gMatchCallFlavorText_Triathlete_Maria_Strategy[] = _("Speed above all!");
-const u8 gMatchCallFlavorText_Triathlete_Maria_Pokemon[] = _("I use a speedy POKéMON.");
-const u8 gMatchCallFlavorText_Triathlete_Maria_Intro1[] = _("A marathon is a challenge");
-const u8 gMatchCallFlavorText_Triathlete_Maria_Intro2[] = _("against your own self.");
-
-const u8 gMatchCallFlavorText_Triathlete_Abigail_Strategy[] = _("Defense is crucial.");
-const u8 gMatchCallFlavorText_Triathlete_Abigail_Pokemon[] = _("My POKéMON is solid.");
-const u8 gMatchCallFlavorText_Triathlete_Abigail_Intro1[] = _("I started this for dieting,");
-const u8 gMatchCallFlavorText_Triathlete_Abigail_Intro2[] = _("but I got right into it.");
-
-const u8 gMatchCallFlavorText_Triathlete_Dylan_Strategy[] = _("Strike before stricken!");
-const u8 gMatchCallFlavorText_Triathlete_Dylan_Pokemon[] = _("A fast-running POKéMON!");
-const u8 gMatchCallFlavorText_Triathlete_Dylan_Intro1[] = _("If you ran and ran, you'd");
-const u8 gMatchCallFlavorText_Triathlete_Dylan_Intro2[] = _("become one with the wind.");
-
-const u8 gMatchCallFlavorText_Triathlete_Katelyn_Strategy[] = _("All-out offensive!");
-const u8 gMatchCallFlavorText_Triathlete_Katelyn_Pokemon[] = _("WATER POKéMON rule!");
-const u8 gMatchCallFlavorText_Triathlete_Katelyn_Intro1[] = _("I must swim over 6 miles");
-const u8 gMatchCallFlavorText_Triathlete_Katelyn_Intro2[] = _("every day.");
-
-const u8 gMatchCallFlavorText_Triathlete_Benjamin_Strategy[] = _("Push and push again!");
-const u8 gMatchCallFlavorText_Triathlete_Benjamin_Pokemon[] = _("The strength of STEEL.");
-const u8 gMatchCallFlavorText_Triathlete_Benjamin_Intro1[] = _("If you're sweating, get");
-const u8 gMatchCallFlavorText_Triathlete_Benjamin_Intro2[] = _("fluids into you regularly.");
-
-const u8 gMatchCallFlavorText_Triathlete_Pablo_Strategy[] = _("Draw the power of WATER.");
-const u8 gMatchCallFlavorText_Triathlete_Pablo_Pokemon[] = _("Toughened WATER POKéMON.");
-const u8 gMatchCallFlavorText_Triathlete_Pablo_Intro1[] = _("Training POKéMON is good,");
-const u8 gMatchCallFlavorText_Triathlete_Pablo_Intro2[] = _("but don't neglect yourself.");
-
-const u8 gMatchCallFlavorText_DragonTamer_Nicolas_Strategy[] = _("It's about POKéMON power!");
-const u8 gMatchCallFlavorText_DragonTamer_Nicolas_Pokemon[] = _("See the power of DRAGONS!");
-const u8 gMatchCallFlavorText_DragonTamer_Nicolas_Intro1[] = _("I'll become legendary as the");
-const u8 gMatchCallFlavorText_DragonTamer_Nicolas_Intro2[] = _("strongest one day!");
-
-const u8 gMatchCallFlavorText_BirdKeeper_Robert_Strategy[] = _("I'll show you my technique!");
-const u8 gMatchCallFlavorText_BirdKeeper_Robert_Pokemon[] = _("Elegantly wheeling BIRDS.");
-const u8 gMatchCallFlavorText_BirdKeeper_Robert_Intro1[] = _("My BIRD POKéMON, deliver my");
-const u8 gMatchCallFlavorText_BirdKeeper_Robert_Intro2[] = _("love to that girl!");
-
-const u8 gMatchCallFlavorText_NinjaBoy_Lao_Strategy[] = _("You'll suffer from poison!");
-const u8 gMatchCallFlavorText_NinjaBoy_Lao_Pokemon[] = _("Poisonous POKéMON.");
-const u8 gMatchCallFlavorText_NinjaBoy_Lao_Intro1[] = _("I undertake training so");
-const u8 gMatchCallFlavorText_NinjaBoy_Lao_Intro2[] = _("that I may become a ninja.");
-
-const u8 gMatchCallFlavorText_BattleGirl_Cyndy_Strategy[] = _("The first strike wins!");
-const u8 gMatchCallFlavorText_BattleGirl_Cyndy_Pokemon[] = _("Speedy FIGHTING type.");
-const u8 gMatchCallFlavorText_BattleGirl_Cyndy_Intro1[] = _("If my POKéMON lose,");
-const u8 gMatchCallFlavorText_BattleGirl_Cyndy_Intro2[] = _("I'll carry on the fight!");
-
-const u8 gMatchCallFlavorText_ParasolLady_Madeline_Strategy[] = _("Go, go, my POKéMON!");
-const u8 gMatchCallFlavorText_ParasolLady_Madeline_Pokemon[] = _("I'll raise anything.");
-const u8 gMatchCallFlavorText_ParasolLady_Madeline_Intro1[] = _("UV rays are your skin's");
-const u8 gMatchCallFlavorText_ParasolLady_Madeline_Intro2[] = _("enemy. Get protected.");
-
-const u8 gMatchCallFlavorText_Swimmer_Jenny_Strategy[] = _("No mercy!");
-const u8 gMatchCallFlavorText_Swimmer_Jenny_Pokemon[] = _("Cute WATER POKéMON.");
-const u8 gMatchCallFlavorText_Swimmer_Jenny_Intro1[] = _("I have too many fans.");
-const u8 gMatchCallFlavorText_Swimmer_Jenny_Intro2[] = _("I was interviewed on TV.");
-
-const u8 gMatchCallFlavorText_Picnicker_Diana_Strategy[] = _("I think about this & that.");
-const u8 gMatchCallFlavorText_Picnicker_Diana_Pokemon[] = _("I like all POKéMON.");
-const u8 gMatchCallFlavorText_Picnicker_Diana_Intro1[] = _("What lies beyond that");
-const u8 gMatchCallFlavorText_Picnicker_Diana_Intro2[] = _("yonder hill?");
-
-const u8 gMatchCallFlavorText_Twins_AmyAndLiv_Strategy[] = _("We battle together!");
-const u8 gMatchCallFlavorText_Twins_AmyAndLiv_Pokemon[] = _("We train together!");
-const u8 gMatchCallFlavorText_Twins_AmyAndLiv_Intro1[] = _("We like the same POKéMON,");
-const u8 gMatchCallFlavorText_Twins_AmyAndLiv_Intro2[] = _("but different desserts.");
-
-const u8 gMatchCallFlavorText_Sailor_Ernest_Strategy[] = _("I force things with power!");
-const u8 gMatchCallFlavorText_Sailor_Ernest_Pokemon[] = _("WATER and FIGHTING types.");
-const u8 gMatchCallFlavorText_Sailor_Ernest_Intro1[] = _("Seamen are rough spirits!");
-const u8 gMatchCallFlavorText_Sailor_Ernest_Intro2[] = _("Any complaints?");
-
-const u8 gMatchCallFlavorText_Sailor_Cory_Strategy[] = _("Up for a fight anytime!");
-const u8 gMatchCallFlavorText_Sailor_Cory_Pokemon[] = _("WATER POKéMON are my faves!");
-const u8 gMatchCallFlavorText_Sailor_Cory_Intro1[] = _("If you want to shout loud,");
-const u8 gMatchCallFlavorText_Sailor_Cory_Intro2[] = _("suck in air with your belly!");
-
-const u8 gMatchCallFlavorText_Collector_Edwin_Strategy[] = _("Protect POKéMON from harm.");
-const u8 gMatchCallFlavorText_Collector_Edwin_Pokemon[] = _("I love rare POKéMON.");
-const u8 gMatchCallFlavorText_Collector_Edwin_Intro1[] = _("I want to collect all the");
-const u8 gMatchCallFlavorText_Collector_Edwin_Intro2[] = _("world's rare POKéMON.");
-
-const u8 gMatchCallFlavorText_PkmnBreeder_Lydia_Strategy[] = _("I count on power.");
-const u8 gMatchCallFlavorText_PkmnBreeder_Lydia_Pokemon[] = _("POKéMON are my children.");
-const u8 gMatchCallFlavorText_PkmnBreeder_Lydia_Intro1[] = _("It takes knowledge and");
-const u8 gMatchCallFlavorText_PkmnBreeder_Lydia_Intro2[] = _("love to raise POKéMON.");
-
-const u8 gMatchCallFlavorText_PkmnBreeder_Isaac_Strategy[] = _("Full-on attack!");
-const u8 gMatchCallFlavorText_PkmnBreeder_Isaac_Pokemon[] = _("Anything. I'll raise it.");
-const u8 gMatchCallFlavorText_PkmnBreeder_Isaac_Intro1[] = _("I give them {POKEBLOCK}S for");
-const u8 gMatchCallFlavorText_PkmnBreeder_Isaac_Intro2[] = _("going after CONTEST titles.");
-
-const u8 gMatchCallFlavorText_PkmnBreeder_Gabrielle_Strategy[] = _("I raise POKéMON with care.");
-const u8 gMatchCallFlavorText_PkmnBreeder_Gabrielle_Pokemon[] = _("Fun-to-raise POKéMON.");
-const u8 gMatchCallFlavorText_PkmnBreeder_Gabrielle_Intro1[] = _("Treat every POKéMON you");
-const u8 gMatchCallFlavorText_PkmnBreeder_Gabrielle_Intro2[] = _("meet with respect.");
-
-const u8 gMatchCallFlavorText_PkmnRanger_Catherine_Strategy[] = _("I believe in my POKéMON.");
-const u8 gMatchCallFlavorText_PkmnRanger_Catherine_Pokemon[] = _("I like strong POKéMON.");
-const u8 gMatchCallFlavorText_PkmnRanger_Catherine_Intro1[] = _("I'm training for rescue");
-const u8 gMatchCallFlavorText_PkmnRanger_Catherine_Intro2[] = _("work with my POKéMON.");
-
-const u8 gMatchCallFlavorText_PkmnRanger_Jackson_Strategy[] = _("Attack in waves!");
-const u8 gMatchCallFlavorText_PkmnRanger_Jackson_Pokemon[] = _("I use different types.");
-const u8 gMatchCallFlavorText_PkmnRanger_Jackson_Intro1[] = _("Those who destroy nature");
-const u8 gMatchCallFlavorText_PkmnRanger_Jackson_Intro2[] = _("must never be forgiven!");
-
-const u8 gMatchCallFlavorText_Lass_Haley_Strategy[] = _("I'll show you some guts!");
-const u8 gMatchCallFlavorText_Lass_Haley_Pokemon[] = _("Cute POKéMON are my faves!");
-const u8 gMatchCallFlavorText_Lass_Haley_Intro1[] = _("After a battle, I always");
-const u8 gMatchCallFlavorText_Lass_Haley_Intro2[] = _("bathe with my POKéMON.");
-
-const u8 gMatchCallFlavorText_BugCatcher_James_Strategy[] = _("Lightning-fast attack!");
-const u8 gMatchCallFlavorText_BugCatcher_James_Pokemon[] = _("BUG POKéMON are number 1!");
-const u8 gMatchCallFlavorText_BugCatcher_James_Intro1[] = _("If you want to catch BUG");
-const u8 gMatchCallFlavorText_BugCatcher_James_Intro2[] = _("POKéMON, wake up early.");
-
-const u8 gMatchCallFlavorText_Hiker_Trent_Strategy[] = _("I battle with power.");
-const u8 gMatchCallFlavorText_Hiker_Trent_Pokemon[] = _("Hard-bodied POKéMON.");
-const u8 gMatchCallFlavorText_Hiker_Trent_Intro1[] = _("I've been planning a month");
-const u8 gMatchCallFlavorText_Hiker_Trent_Intro2[] = _("for today's hike.");
-
-const u8 gMatchCallFlavorText_Hiker_Sawyer_Strategy[] = _("I like it hot!");
-const u8 gMatchCallFlavorText_Hiker_Sawyer_Pokemon[] = _("Hot POKéMON!");
-const u8 gMatchCallFlavorText_Hiker_Sawyer_Intro1[] = _("As much as I love POKéMON,");
-const u8 gMatchCallFlavorText_Hiker_Sawyer_Intro2[] = _("I surely like hiking!");
-
-const u8 gMatchCallFlavorText_YoungCouple_LoisAndHal_Strategy[] = _("Lovey-dovey strategy!");
-const u8 gMatchCallFlavorText_YoungCouple_LoisAndHal_Pokemon[] = _("Lovey-dovey POKéMON!");
-const u8 gMatchCallFlavorText_YoungCouple_LoisAndHal_Intro1[] = _("We're lovey-dovey!");
-const u8 gMatchCallFlavorText_YoungCouple_LoisAndHal_Intro2[] = _("Forever lovey-dovey!");
-
-const u8 gMatchCallFlavorText_PkmnTrainer_Wally_Strategy[] = _("We let it all hang out.");
-const u8 gMatchCallFlavorText_PkmnTrainer_Wally_Pokemon[] = _("The 1st POKéMON I caught.");
-const u8 gMatchCallFlavorText_PkmnTrainer_Wally_Intro1[] = _("POKéMON and I have grown");
-const u8 gMatchCallFlavorText_PkmnTrainer_Wally_Intro2[] = _("stronger together.");
-
-const u8 gMatchCallFlavorText_RockinWhiz_Roxanne_Strategy[] = _("ROCK-type power attack.");
-const u8 gMatchCallFlavorText_RockinWhiz_Roxanne_Pokemon[] = _("I prefer rock-hard POKéMON.");
-const u8 gMatchCallFlavorText_RockinWhiz_Roxanne_Intro1[] = _("A LEADER of a big GYM bears");
-const u8 gMatchCallFlavorText_RockinWhiz_Roxanne_Intro2[] = _("a lot of responsibility.");
-
-const u8 gMatchCallFlavorText_TheBigHit_Brawly_Strategy[] = _("Direct physical action!");
-const u8 gMatchCallFlavorText_TheBigHit_Brawly_Pokemon[] = _("FIGHTING POKéMON rule!");
-const u8 gMatchCallFlavorText_TheBigHit_Brawly_Intro1[] = _("The world awaits me as the");
-const u8 gMatchCallFlavorText_TheBigHit_Brawly_Intro2[] = _("next big wave!");
-
-const u8 gMatchCallFlavorText_SwellShock_Wattson_Strategy[] = _("I choose to electrify.");
-const u8 gMatchCallFlavorText_SwellShock_Wattson_Pokemon[] = _("Get shocked by electricity!");
-const u8 gMatchCallFlavorText_SwellShock_Wattson_Intro1[] = _("One must never throw a");
-const u8 gMatchCallFlavorText_SwellShock_Wattson_Intro2[] = _("match. Even I must not.");
-
-const u8 gMatchCallFlavorText_PassionBurn_Flannery_Strategy[] = _("Battle aggressively.");
-const u8 gMatchCallFlavorText_PassionBurn_Flannery_Pokemon[] = _("Burn with passion!");
-const u8 gMatchCallFlavorText_PassionBurn_Flannery_Intro1[] = _("Completely wash away daily");
-const u8 gMatchCallFlavorText_PassionBurn_Flannery_Intro2[] = _("fatigue in hot springs!");
-
-const u8 gMatchCallFlavorText_ReliableOne_Dad_Strategy[] = _("I flexibly adapt my style.");
-const u8 gMatchCallFlavorText_ReliableOne_Dad_Pokemon[] = _("Grown in a balanced manner.");
-const u8 gMatchCallFlavorText_ReliableOne_Dad_Intro1[] = _("I walk the 30 minutes from");
-const u8 gMatchCallFlavorText_ReliableOne_Dad_Intro2[] = _("home to here every day.");
-
-const u8 gMatchCallFlavorText_SkyTamer_Winona_Strategy[] = _("I take advantage of speed.");
-const u8 gMatchCallFlavorText_SkyTamer_Winona_Pokemon[] = _("Graceful sky dancers.");
-const u8 gMatchCallFlavorText_SkyTamer_Winona_Intro1[] = _("The ultimate would be to");
-const u8 gMatchCallFlavorText_SkyTamer_Winona_Intro2[] = _("live as one with nature.");
-
-const u8 gMatchCallFlavorText_MysticDuo_TateAndLiza_Strategy[] = _("We battle in cooperation.");
-const u8 gMatchCallFlavorText_MysticDuo_TateAndLiza_Pokemon[] = _("Always friendly POKéMON.");
-const u8 gMatchCallFlavorText_MysticDuo_TateAndLiza_Intro1[] = _("Papa has trouble telling");
-const u8 gMatchCallFlavorText_MysticDuo_TateAndLiza_Intro2[] = _("the two of us apart!");
-
-const u8 gMatchCallFlavorText_DandyCharm_Juan_Strategy[] = _("I use splendid waterpower.");
-const u8 gMatchCallFlavorText_DandyCharm_Juan_Pokemon[] = _("POKéMON of elegance!");
-const u8 gMatchCallFlavorText_DandyCharm_Juan_Intro1[] = _("The adulation of beautiful");
-const u8 gMatchCallFlavorText_DandyCharm_Juan_Intro2[] = _("ladies fills me with energy!");
-
-const u8 gMatchCallFlavorText_EliteFour_Sidney_Strategy[] = _("Offense over defense!");
-const u8 gMatchCallFlavorText_EliteFour_Sidney_Pokemon[] = _("The DARK side's beauties.");
-const u8 gMatchCallFlavorText_EliteFour_Sidney_Intro1[] = _("They said I was a punk, but");
-const u8 gMatchCallFlavorText_EliteFour_Sidney_Intro2[] = _("I'm one of the ELITE FOUR!");
-
-const u8 gMatchCallFlavorText_EliteFour_Phoebe_Strategy[] = _("Confuse and confound.");
-const u8 gMatchCallFlavorText_EliteFour_Phoebe_Pokemon[] = _("There's nothing definite.");
-const u8 gMatchCallFlavorText_EliteFour_Phoebe_Intro1[] = _("I wonder how my grandma at");
-const u8 gMatchCallFlavorText_EliteFour_Phoebe_Intro2[] = _("MT. PYRE is doing?");
-
-const u8 gMatchCallFlavorText_EliteFour_Glacia_Strategy[] = _("I use items for help.");
-const u8 gMatchCallFlavorText_EliteFour_Glacia_Pokemon[] = _("Flaming passion in icy cold!");
-const u8 gMatchCallFlavorText_EliteFour_Glacia_Intro1[] = _("The ICE type can be better");
-const u8 gMatchCallFlavorText_EliteFour_Glacia_Intro2[] = _("trained in this hot land.");
-
-const u8 gMatchCallFlavorText_EliteFour_Drake_Strategy[] = _("Harness strong abilities.");
-const u8 gMatchCallFlavorText_EliteFour_Drake_Pokemon[] = _("The raw power of DRAGONS!");
-const u8 gMatchCallFlavorText_EliteFour_Drake_Intro1[] = _("I dedicate myself to the");
-const u8 gMatchCallFlavorText_EliteFour_Drake_Intro2[] = _("POKéMON that saved me.");
-
-const u8 gMatchCallFlavorText_Champion_Wallace_Strategy[] = _("Dignity and respect.");
-const u8 gMatchCallFlavorText_Champion_Wallace_Pokemon[] = _("I prefer POKéMON of grace.");
-const u8 gMatchCallFlavorText_Champion_Wallace_Intro1[] = _("I represent beauty as");
-const u8 gMatchCallFlavorText_Champion_Wallace_Intro2[] = _("well as intelligence.");
-
-const u8 *const gMatchCallMessages[][4] = 
+const u8 gText_MatchCallAromaLady_Rose_Strategy[] = _("Becalm fighting emotions.");
+const u8 gText_MatchCallAromaLady_Rose_Pokemon[] = _("Fragrant GRASS POKéMON.");
+const u8 gText_MatchCallAromaLady_Rose_Intro1[] = _("Soothing aromas make the");
+const u8 gText_MatchCallAromaLady_Rose_Intro2[] = _("body and mind healthy.");
+
+const u8 gText_MatchCallRuinManiac_Andres_Strategy[] = _("I'm not very good at this.");
+const u8 gText_MatchCallRuinManiac_Andres_Pokemon[] = _("Ruin-exploration partners.");
+const u8 gText_MatchCallRuinManiac_Andres_Intro1[] = _("I am searching for undersea");
+const u8 gText_MatchCallRuinManiac_Andres_Intro2[] = _("ruins and relics.");
+
+const u8 gText_MatchCallRuinManiac_Dusty_Strategy[] = _("Overwhelm with power!");
+const u8 gText_MatchCallRuinManiac_Dusty_Pokemon[] = _("Craggy ROCK POKéMON.");
+const u8 gText_MatchCallRuinManiac_Dusty_Intro1[] = _("In search of ancient lore,");
+const u8 gText_MatchCallRuinManiac_Dusty_Intro2[] = _("I travel the world.");
+
+const u8 gText_MatchCallTuber_Lola_Strategy[] = _("I'm going to try hard!");
+const u8 gText_MatchCallTuber_Lola_Pokemon[] = _("Good swimmer POKéMON.");
+const u8 gText_MatchCallTuber_Lola_Intro1[] = _("I wish I could swim without");
+const u8 gText_MatchCallTuber_Lola_Intro2[] = _("using an inner tube.");
+
+const u8 gText_MatchCallTuber_Ricky_Strategy[] = _("I don't know. I'll try hard.");
+const u8 gText_MatchCallTuber_Ricky_Pokemon[] = _("WATER POKéMON are buddies.");
+const u8 gText_MatchCallTuber_Ricky_Intro1[] = _("It's not like I can't swim.");
+const u8 gText_MatchCallTuber_Ricky_Intro2[] = _("I just like my inner tube.");
+
+const u8 gText_MatchCallSisAndBro_LilaAndRoy_Strategy[] = _("We split our duties.");
+const u8 gText_MatchCallSisAndBro_LilaAndRoy_Pokemon[] = _("We like friendly POKéMON.");
+const u8 gText_MatchCallSisAndBro_LilaAndRoy_Intro1[] = _("We enjoy POKéMON together");
+const u8 gText_MatchCallSisAndBro_LilaAndRoy_Intro2[] = _("as sister and brother.");
+
+const u8 gText_MatchCallCooltrainer_Cristin_Strategy[] = _("I finish with power moves!");
+const u8 gText_MatchCallCooltrainer_Cristin_Pokemon[] = _("A mix of different types.");
+const u8 gText_MatchCallCooltrainer_Cristin_Intro1[] = _("I aim to become the ultimate");
+const u8 gText_MatchCallCooltrainer_Cristin_Intro2[] = _("TRAINER!");
+
+const u8 gText_MatchCallCooltrainer_Brooke_Strategy[] = _("Exploit the foe's weakness.");
+const u8 gText_MatchCallCooltrainer_Brooke_Pokemon[] = _("Balance is crucial.");
+const u8 gText_MatchCallCooltrainer_Brooke_Intro1[] = _("My goal is to become the");
+const u8 gText_MatchCallCooltrainer_Brooke_Intro2[] = _("POKéMON CHAMPION.");
+
+const u8 gText_MatchCallCooltrainer_Wilton_Strategy[] = _("Upset the opponent.");
+const u8 gText_MatchCallCooltrainer_Wilton_Pokemon[] = _("Type doesn't matter.");
+const u8 gText_MatchCallCooltrainer_Wilton_Intro1[] = _("I'm a top student at the");
+const u8 gText_MatchCallCooltrainer_Wilton_Intro2[] = _("TRAINER'S SCHOOL.");
+
+const u8 gText_MatchCallHexManiac_Valerie_Strategy[] = _("Slow, steady suffering.");
+const u8 gText_MatchCallHexManiac_Valerie_Pokemon[] = _("Scary to meet at night.");
+const u8 gText_MatchCallHexManiac_Valerie_Intro1[] = _("I see things that others");
+const u8 gText_MatchCallHexManiac_Valerie_Intro2[] = _("can't see...");
+
+const u8 gText_MatchCallLady_Cindy_Strategy[] = _("Anything to win.");
+const u8 gText_MatchCallLady_Cindy_Pokemon[] = _("Gorgeous type!");
+const u8 gText_MatchCallLady_Cindy_Intro1[] = _("I have a pool specially for");
+const u8 gText_MatchCallLady_Cindy_Intro2[] = _("my POKéMON at home.");
+
+const u8 gText_MatchCallBeauty_Thalia_Strategy[] = _("You'll fall under my spell!");
+const u8 gText_MatchCallBeauty_Thalia_Pokemon[] = _("Mature WATER type.");
+const u8 gText_MatchCallBeauty_Thalia_Intro1[] = _("I dream of cruising around");
+const u8 gText_MatchCallBeauty_Thalia_Intro2[] = _("the world on a luxury liner.");
+
+const u8 gText_MatchCallBeauty_Jessica_Strategy[] = _("I'll lead you astray.");
+const u8 gText_MatchCallBeauty_Jessica_Pokemon[] = _("Cute, of course.");
+const u8 gText_MatchCallBeauty_Jessica_Intro1[] = _("I love the SAFARI ZONE.");
+const u8 gText_MatchCallBeauty_Jessica_Intro2[] = _("I seem to end up there.");
+
+const u8 gText_MatchCallRichBoy_Winston_Strategy[] = _("Strategy? Who needs it?");
+const u8 gText_MatchCallRichBoy_Winston_Pokemon[] = _("I spent big money on it!");
+const u8 gText_MatchCallRichBoy_Winston_Intro1[] = _("I, being rich, sleep in a");
+const u8 gText_MatchCallRichBoy_Winston_Intro2[] = _("custom POKéMON bed.");
+
+const u8 gText_MatchCallPokeManiac_Steve_Strategy[] = _("Wrestle down with power.");
+const u8 gText_MatchCallPokeManiac_Steve_Pokemon[] = _("Took all night to catch.");
+const u8 gText_MatchCallPokeManiac_Steve_Intro1[] = _("Big, burly, and buff");
+const u8 gText_MatchCallPokeManiac_Steve_Intro2[] = _("POKéMON are the best...");
+
+const u8 gText_MatchCallSwimmer_Tony_Strategy[] = _("Ram at full speed!");
+const u8 gText_MatchCallSwimmer_Tony_Pokemon[] = _("Funky WATER type!");
+const u8 gText_MatchCallSwimmer_Tony_Intro1[] = _("If I can't be out swimming,");
+const u8 gText_MatchCallSwimmer_Tony_Intro2[] = _("I'll be pumping weights.");
+
+const u8 gText_MatchCallBlackBelt_Nob_Strategy[] = _("Grand slam pummeling!");
+const u8 gText_MatchCallBlackBelt_Nob_Pokemon[] = _("FIGHTING type.");
+const u8 gText_MatchCallBlackBelt_Nob_Intro1[] = _("Not to brag, but I can bust");
+const u8 gText_MatchCallBlackBelt_Nob_Intro2[] = _("ten roof tiles!");
+
+const u8 gText_MatchCallBlackBelt_Koji_Strategy[] = _("Witness karate power!");
+const u8 gText_MatchCallBlackBelt_Koji_Pokemon[] = _("My partners in training!");
+const u8 gText_MatchCallBlackBelt_Koji_Intro1[] = _("Let us discuss matters of");
+const u8 gText_MatchCallBlackBelt_Koji_Intro2[] = _("the world with bare fists!");
+
+const u8 gText_MatchCallGuitarist_Fernando_Strategy[] = _("Rock to stunning sounds!");
+const u8 gText_MatchCallGuitarist_Fernando_Pokemon[] = _("Electric-and-sound combo!");
+const u8 gText_MatchCallGuitarist_Fernando_Intro1[] = _("My compositions will shock");
+const u8 gText_MatchCallGuitarist_Fernando_Intro2[] = _("you and stun you!");
+
+const u8 gText_MatchCallGuitarist_Dalton_Strategy[] = _("I'll electrify you!");
+const u8 gText_MatchCallGuitarist_Dalton_Pokemon[] = _("They're ELECTRIC!");
+const u8 gText_MatchCallGuitarist_Dalton_Intro1[] = _("I want to make people cry");
+const u8 gText_MatchCallGuitarist_Dalton_Intro2[] = _("with songs from my heart.");
+
+const u8 gText_MatchCallKindler_Bernie_Strategy[] = _("Burn it all down!");
+const u8 gText_MatchCallKindler_Bernie_Pokemon[] = _("Burn-inducing POKéMON.");
+const u8 gText_MatchCallKindler_Bernie_Intro1[] = _("When you light a campfire,");
+const u8 gText_MatchCallKindler_Bernie_Intro2[] = _("be sure there's some water.");
+
+const u8 gText_MatchCallCamper_Ethan_Strategy[] = _("Hang in and be tenacious!");
+const u8 gText_MatchCallCamper_Ethan_Pokemon[] = _("I'll raise any POKéMON.");
+const u8 gText_MatchCallCamper_Ethan_Intro1[] = _("POKéMON raised in the wild");
+const u8 gText_MatchCallCamper_Ethan_Intro2[] = _("grow strong!");
+
+const u8 gText_MatchCallOldCouple_JohnAndJay_Strategy[] = _("Our love lets us prevail.");
+const u8 gText_MatchCallOldCouple_JohnAndJay_Pokemon[] = _("We've had them for years.");
+const u8 gText_MatchCallOldCouple_JohnAndJay_Intro1[] = _("Married 50 years, we've");
+const u8 gText_MatchCallOldCouple_JohnAndJay_Intro2[] = _("devotedly raised POKéMON.");
+
+const u8 gText_MatchCallBugManiac_Jeffrey_Strategy[] = _("Attack in waves!");
+const u8 gText_MatchCallBugManiac_Jeffrey_Pokemon[] = _("BUG POKéMON are cool.");
+const u8 gText_MatchCallBugManiac_Jeffrey_Intro1[] = _("I go into the forest every");
+const u8 gText_MatchCallBugManiac_Jeffrey_Intro2[] = _("day to catch BUG POKéMON.");
+
+const u8 gText_MatchCallPsychic_Cameron_Strategy[] = _("Daze and confuse!");
+const u8 gText_MatchCallPsychic_Cameron_Pokemon[] = _("Ones with weird powers.");
+const u8 gText_MatchCallPsychic_Cameron_Intro1[] = _("I can see through exactly");
+const u8 gText_MatchCallPsychic_Cameron_Intro2[] = _("what you're thinking!");
+
+const u8 gText_MatchCallPsychic_Jacki_Strategy[] = _("Battle at full power.");
+const u8 gText_MatchCallPsychic_Jacki_Pokemon[] = _("POKéMON of many mysteries.");
+const u8 gText_MatchCallPsychic_Jacki_Intro1[] = _("When we spoke, I was really");
+const u8 gText_MatchCallPsychic_Jacki_Intro2[] = _("using telepathy.");
+
+const u8 gText_MatchCallGentleman_Walter_Strategy[] = _("Calm and collected.");
+const u8 gText_MatchCallGentleman_Walter_Pokemon[] = _("POKéMON of distinction.");
+const u8 gText_MatchCallGentleman_Walter_Intro1[] = _("We enjoy a spot of tea");
+const u8 gText_MatchCallGentleman_Walter_Intro2[] = _("every day. It's imported.");
+
+const u8 gText_MatchCallSchoolKid_Karen_Strategy[] = _("I use my head to battle.");
+const u8 gText_MatchCallSchoolKid_Karen_Pokemon[] = _("I love any kind of POKéMON!");
+const u8 gText_MatchCallSchoolKid_Karen_Intro1[] = _("My daddy gives me spending");
+const u8 gText_MatchCallSchoolKid_Karen_Intro2[] = _("money if I ace a test.");
+
+const u8 gText_MatchCallSchoolKid_Jerry_Strategy[] = _("My knowledge rules!");
+const u8 gText_MatchCallSchoolKid_Jerry_Pokemon[] = _("Any smart POKéMON!");
+const u8 gText_MatchCallSchoolKid_Jerry_Intro1[] = _("I want to be a POKéMON");
+const u8 gText_MatchCallSchoolKid_Jerry_Intro2[] = _("researcher in the future.");
+
+const u8 gText_MatchCallSrAndJr_AnnaAndMeg_Strategy[] = _("We talk it over first.");
+const u8 gText_MatchCallSrAndJr_AnnaAndMeg_Pokemon[] = _("POKéMON that we both like.");
+const u8 gText_MatchCallSrAndJr_AnnaAndMeg_Intro1[] = _("We're senior and junior");
+const u8 gText_MatchCallSrAndJr_AnnaAndMeg_Intro2[] = _("students into POKéMON!");
+
+const u8 gText_MatchCallPokefan_Isabel_Strategy[] = _("Go for it, my dears!");
+const u8 gText_MatchCallPokefan_Isabel_Pokemon[] = _("I have no likes or dislikes.");
+const u8 gText_MatchCallPokefan_Isabel_Intro1[] = _("While out shopping for");
+const u8 gText_MatchCallPokefan_Isabel_Intro2[] = _("supper, I battle too.");
+
+const u8 gText_MatchCallPokefan_Miguel_Strategy[] = _("I battle with love!");
+const u8 gText_MatchCallPokefan_Miguel_Pokemon[] = _("A POKéMON raised with love!");
+const u8 gText_MatchCallPokefan_Miguel_Intro1[] = _("It's important to build");
+const u8 gText_MatchCallPokefan_Miguel_Intro2[] = _("trust with your POKéMON.");
+
+const u8 gText_MatchCallExpert_Timothy_Strategy[] = _("I see through your moves!");
+const u8 gText_MatchCallExpert_Timothy_Pokemon[] = _("The essence of FIGHTING.");
+const u8 gText_MatchCallExpert_Timothy_Intro1[] = _("I'm not ready to give way");
+const u8 gText_MatchCallExpert_Timothy_Intro2[] = _("to the young yet!");
+
+const u8 gText_MatchCallExpert_Shelby_Strategy[] = _("Attack while defending.");
+const u8 gText_MatchCallExpert_Shelby_Pokemon[] = _("The FIGHTING type.");
+const u8 gText_MatchCallExpert_Shelby_Intro1[] = _("Being old, I have my own");
+const u8 gText_MatchCallExpert_Shelby_Intro2[] = _("style of battling.");
+
+const u8 gText_MatchCallYoungster_Calvin_Strategy[] = _("I do what I can.");
+const u8 gText_MatchCallYoungster_Calvin_Pokemon[] = _("I use different types.");
+const u8 gText_MatchCallYoungster_Calvin_Intro1[] = _("I'm going to keep working");
+const u8 gText_MatchCallYoungster_Calvin_Intro2[] = _("until I beat a GYM LEADER.");
+
+const u8 gText_MatchCallFisherman_Elliot_Strategy[] = _("I battle patiently.");
+const u8 gText_MatchCallFisherman_Elliot_Pokemon[] = _("WATER POKéMON to battle!");
+const u8 gText_MatchCallFisherman_Elliot_Intro1[] = _("I'm the world's only guy to");
+const u8 gText_MatchCallFisherman_Elliot_Intro2[] = _("catch a huge POKéMON!");
+
+const u8 gText_MatchCallTriathlete_Isaiah_Strategy[] = _("Exploit the environment!");
+const u8 gText_MatchCallTriathlete_Isaiah_Pokemon[] = _("All hail the WATER type!");
+const u8 gText_MatchCallTriathlete_Isaiah_Intro1[] = _("I won't be beaten by some");
+const u8 gText_MatchCallTriathlete_Isaiah_Intro2[] = _("beach bum SWIMMER!");
+
+const u8 gText_MatchCallTriathlete_Maria_Strategy[] = _("Speed above all!");
+const u8 gText_MatchCallTriathlete_Maria_Pokemon[] = _("I use a speedy POKéMON.");
+const u8 gText_MatchCallTriathlete_Maria_Intro1[] = _("A marathon is a challenge");
+const u8 gText_MatchCallTriathlete_Maria_Intro2[] = _("against your own self.");
+
+const u8 gText_MatchCallTriathlete_Abigail_Strategy[] = _("Defense is crucial.");
+const u8 gText_MatchCallTriathlete_Abigail_Pokemon[] = _("My POKéMON is solid.");
+const u8 gText_MatchCallTriathlete_Abigail_Intro1[] = _("I started this for dieting,");
+const u8 gText_MatchCallTriathlete_Abigail_Intro2[] = _("but I got right into it.");
+
+const u8 gText_MatchCallTriathlete_Dylan_Strategy[] = _("Strike before stricken!");
+const u8 gText_MatchCallTriathlete_Dylan_Pokemon[] = _("A fast-running POKéMON!");
+const u8 gText_MatchCallTriathlete_Dylan_Intro1[] = _("If you ran and ran, you'd");
+const u8 gText_MatchCallTriathlete_Dylan_Intro2[] = _("become one with the wind.");
+
+const u8 gText_MatchCallTriathlete_Katelyn_Strategy[] = _("All-out offensive!");
+const u8 gText_MatchCallTriathlete_Katelyn_Pokemon[] = _("WATER POKéMON rule!");
+const u8 gText_MatchCallTriathlete_Katelyn_Intro1[] = _("I must swim over 6 miles");
+const u8 gText_MatchCallTriathlete_Katelyn_Intro2[] = _("every day.");
+
+const u8 gText_MatchCallTriathlete_Benjamin_Strategy[] = _("Push and push again!");
+const u8 gText_MatchCallTriathlete_Benjamin_Pokemon[] = _("The strength of STEEL.");
+const u8 gText_MatchCallTriathlete_Benjamin_Intro1[] = _("If you're sweating, get");
+const u8 gText_MatchCallTriathlete_Benjamin_Intro2[] = _("fluids into you regularly.");
+
+const u8 gText_MatchCallTriathlete_Pablo_Strategy[] = _("Draw the power of WATER.");
+const u8 gText_MatchCallTriathlete_Pablo_Pokemon[] = _("Toughened WATER POKéMON.");
+const u8 gText_MatchCallTriathlete_Pablo_Intro1[] = _("Training POKéMON is good,");
+const u8 gText_MatchCallTriathlete_Pablo_Intro2[] = _("but don't neglect yourself.");
+
+const u8 gText_MatchCallDragonTamer_Nicolas_Strategy[] = _("It's about POKéMON power!");
+const u8 gText_MatchCallDragonTamer_Nicolas_Pokemon[] = _("See the power of DRAGONS!");
+const u8 gText_MatchCallDragonTamer_Nicolas_Intro1[] = _("I'll become legendary as the");
+const u8 gText_MatchCallDragonTamer_Nicolas_Intro2[] = _("strongest one day!");
+
+const u8 gText_MatchCallBirdKeeper_Robert_Strategy[] = _("I'll show you my technique!");
+const u8 gText_MatchCallBirdKeeper_Robert_Pokemon[] = _("Elegantly wheeling BIRDS.");
+const u8 gText_MatchCallBirdKeeper_Robert_Intro1[] = _("My BIRD POKéMON, deliver my");
+const u8 gText_MatchCallBirdKeeper_Robert_Intro2[] = _("love to that girl!");
+
+const u8 gText_MatchCallNinjaBoy_Lao_Strategy[] = _("You'll suffer from poison!");
+const u8 gText_MatchCallNinjaBoy_Lao_Pokemon[] = _("Poisonous POKéMON.");
+const u8 gText_MatchCallNinjaBoy_Lao_Intro1[] = _("I undertake training so");
+const u8 gText_MatchCallNinjaBoy_Lao_Intro2[] = _("that I may become a ninja.");
+
+const u8 gText_MatchCallBattleGirl_Cyndy_Strategy[] = _("The first strike wins!");
+const u8 gText_MatchCallBattleGirl_Cyndy_Pokemon[] = _("Speedy FIGHTING type.");
+const u8 gText_MatchCallBattleGirl_Cyndy_Intro1[] = _("If my POKéMON lose,");
+const u8 gText_MatchCallBattleGirl_Cyndy_Intro2[] = _("I'll carry on the fight!");
+
+const u8 gText_MatchCallParasolLady_Madeline_Strategy[] = _("Go, go, my POKéMON!");
+const u8 gText_MatchCallParasolLady_Madeline_Pokemon[] = _("I'll raise anything.");
+const u8 gText_MatchCallParasolLady_Madeline_Intro1[] = _("UV rays are your skin's");
+const u8 gText_MatchCallParasolLady_Madeline_Intro2[] = _("enemy. Get protected.");
+
+const u8 gText_MatchCallSwimmer_Jenny_Strategy[] = _("No mercy!");
+const u8 gText_MatchCallSwimmer_Jenny_Pokemon[] = _("Cute WATER POKéMON.");
+const u8 gText_MatchCallSwimmer_Jenny_Intro1[] = _("I have too many fans.");
+const u8 gText_MatchCallSwimmer_Jenny_Intro2[] = _("I was interviewed on TV.");
+
+const u8 gText_MatchCallPicnicker_Diana_Strategy[] = _("I think about this & that.");
+const u8 gText_MatchCallPicnicker_Diana_Pokemon[] = _("I like all POKéMON.");
+const u8 gText_MatchCallPicnicker_Diana_Intro1[] = _("What lies beyond that");
+const u8 gText_MatchCallPicnicker_Diana_Intro2[] = _("yonder hill?");
+
+const u8 gText_MatchCallTwins_AmyAndLiv_Strategy[] = _("We battle together!");
+const u8 gText_MatchCallTwins_AmyAndLiv_Pokemon[] = _("We train together!");
+const u8 gText_MatchCallTwins_AmyAndLiv_Intro1[] = _("We like the same POKéMON,");
+const u8 gText_MatchCallTwins_AmyAndLiv_Intro2[] = _("but different desserts.");
+
+const u8 gText_MatchCallSailor_Ernest_Strategy[] = _("I force things with power!");
+const u8 gText_MatchCallSailor_Ernest_Pokemon[] = _("WATER and FIGHTING types.");
+const u8 gText_MatchCallSailor_Ernest_Intro1[] = _("Seamen are rough spirits!");
+const u8 gText_MatchCallSailor_Ernest_Intro2[] = _("Any complaints?");
+
+const u8 gText_MatchCallSailor_Cory_Strategy[] = _("Up for a fight anytime!");
+const u8 gText_MatchCallSailor_Cory_Pokemon[] = _("WATER POKéMON are my faves!");
+const u8 gText_MatchCallSailor_Cory_Intro1[] = _("If you want to shout loud,");
+const u8 gText_MatchCallSailor_Cory_Intro2[] = _("suck in air with your belly!");
+
+const u8 gText_MatchCallCollector_Edwin_Strategy[] = _("Protect POKéMON from harm.");
+const u8 gText_MatchCallCollector_Edwin_Pokemon[] = _("I love rare POKéMON.");
+const u8 gText_MatchCallCollector_Edwin_Intro1[] = _("I want to collect all the");
+const u8 gText_MatchCallCollector_Edwin_Intro2[] = _("world's rare POKéMON.");
+
+const u8 gText_MatchCallPkmnBreeder_Lydia_Strategy[] = _("I count on power.");
+const u8 gText_MatchCallPkmnBreeder_Lydia_Pokemon[] = _("POKéMON are my children.");
+const u8 gText_MatchCallPkmnBreeder_Lydia_Intro1[] = _("It takes knowledge and");
+const u8 gText_MatchCallPkmnBreeder_Lydia_Intro2[] = _("love to raise POKéMON.");
+
+const u8 gText_MatchCallPkmnBreeder_Isaac_Strategy[] = _("Full-on attack!");
+const u8 gText_MatchCallPkmnBreeder_Isaac_Pokemon[] = _("Anything. I'll raise it.");
+const u8 gText_MatchCallPkmnBreeder_Isaac_Intro1[] = _("I give them {POKEBLOCK}S for");
+const u8 gText_MatchCallPkmnBreeder_Isaac_Intro2[] = _("going after CONTEST titles.");
+
+const u8 gText_MatchCallPkmnBreeder_Gabrielle_Strategy[] = _("I raise POKéMON with care.");
+const u8 gText_MatchCallPkmnBreeder_Gabrielle_Pokemon[] = _("Fun-to-raise POKéMON.");
+const u8 gText_MatchCallPkmnBreeder_Gabrielle_Intro1[] = _("Treat every POKéMON you");
+const u8 gText_MatchCallPkmnBreeder_Gabrielle_Intro2[] = _("meet with respect.");
+
+const u8 gText_MatchCallPkmnRanger_Catherine_Strategy[] = _("I believe in my POKéMON.");
+const u8 gText_MatchCallPkmnRanger_Catherine_Pokemon[] = _("I like strong POKéMON.");
+const u8 gText_MatchCallPkmnRanger_Catherine_Intro1[] = _("I'm training for rescue");
+const u8 gText_MatchCallPkmnRanger_Catherine_Intro2[] = _("work with my POKéMON.");
+
+const u8 gText_MatchCallPkmnRanger_Jackson_Strategy[] = _("Attack in waves!");
+const u8 gText_MatchCallPkmnRanger_Jackson_Pokemon[] = _("I use different types.");
+const u8 gText_MatchCallPkmnRanger_Jackson_Intro1[] = _("Those who destroy nature");
+const u8 gText_MatchCallPkmnRanger_Jackson_Intro2[] = _("must never be forgiven!");
+
+const u8 gText_MatchCallLass_Haley_Strategy[] = _("I'll show you some guts!");
+const u8 gText_MatchCallLass_Haley_Pokemon[] = _("Cute POKéMON are my faves!");
+const u8 gText_MatchCallLass_Haley_Intro1[] = _("After a battle, I always");
+const u8 gText_MatchCallLass_Haley_Intro2[] = _("bathe with my POKéMON.");
+
+const u8 gText_MatchCallBugCatcher_James_Strategy[] = _("Lightning-fast attack!");
+const u8 gText_MatchCallBugCatcher_James_Pokemon[] = _("BUG POKéMON are number 1!");
+const u8 gText_MatchCallBugCatcher_James_Intro1[] = _("If you want to catch BUG");
+const u8 gText_MatchCallBugCatcher_James_Intro2[] = _("POKéMON, wake up early.");
+
+const u8 gText_MatchCallHiker_Trent_Strategy[] = _("I battle with power.");
+const u8 gText_MatchCallHiker_Trent_Pokemon[] = _("Hard-bodied POKéMON.");
+const u8 gText_MatchCallHiker_Trent_Intro1[] = _("I've been planning a month");
+const u8 gText_MatchCallHiker_Trent_Intro2[] = _("for today's hike.");
+
+const u8 gText_MatchCallHiker_Sawyer_Strategy[] = _("I like it hot!");
+const u8 gText_MatchCallHiker_Sawyer_Pokemon[] = _("Hot POKéMON!");
+const u8 gText_MatchCallHiker_Sawyer_Intro1[] = _("As much as I love POKéMON,");
+const u8 gText_MatchCallHiker_Sawyer_Intro2[] = _("I surely like hiking!");
+
+const u8 gText_MatchCallYoungCouple_LoisAndHal_Strategy[] = _("Lovey-dovey strategy!");
+const u8 gText_MatchCallYoungCouple_LoisAndHal_Pokemon[] = _("Lovey-dovey POKéMON!");
+const u8 gText_MatchCallYoungCouple_LoisAndHal_Intro1[] = _("We're lovey-dovey!");
+const u8 gText_MatchCallYoungCouple_LoisAndHal_Intro2[] = _("Forever lovey-dovey!");
+
+const u8 gText_MatchCallPkmnTrainer_Wally_Strategy[] = _("We let it all hang out.");
+const u8 gText_MatchCallPkmnTrainer_Wally_Pokemon[] = _("The 1st POKéMON I caught.");
+const u8 gText_MatchCallPkmnTrainer_Wally_Intro1[] = _("POKéMON and I have grown");
+const u8 gText_MatchCallPkmnTrainer_Wally_Intro2[] = _("stronger together.");
+
+const u8 gText_MatchCallRockinWhiz_Roxanne_Strategy[] = _("ROCK-type power attack.");
+const u8 gText_MatchCallRockinWhiz_Roxanne_Pokemon[] = _("I prefer rock-hard POKéMON.");
+const u8 gText_MatchCallRockinWhiz_Roxanne_Intro1[] = _("A LEADER of a big GYM bears");
+const u8 gText_MatchCallRockinWhiz_Roxanne_Intro2[] = _("a lot of responsibility.");
+
+const u8 gText_MatchCallTheBigHit_Brawly_Strategy[] = _("Direct physical action!");
+const u8 gText_MatchCallTheBigHit_Brawly_Pokemon[] = _("FIGHTING POKéMON rule!");
+const u8 gText_MatchCallTheBigHit_Brawly_Intro1[] = _("The world awaits me as the");
+const u8 gText_MatchCallTheBigHit_Brawly_Intro2[] = _("next big wave!");
+
+const u8 gText_MatchCallSwellShock_Wattson_Strategy[] = _("I choose to electrify.");
+const u8 gText_MatchCallSwellShock_Wattson_Pokemon[] = _("Get shocked by electricity!");
+const u8 gText_MatchCallSwellShock_Wattson_Intro1[] = _("One must never throw a");
+const u8 gText_MatchCallSwellShock_Wattson_Intro2[] = _("match. Even I must not.");
+
+const u8 gText_MatchCallPassionBurn_Flannery_Strategy[] = _("Battle aggressively.");
+const u8 gText_MatchCallPassionBurn_Flannery_Pokemon[] = _("Burn with passion!");
+const u8 gText_MatchCallPassionBurn_Flannery_Intro1[] = _("Completely wash away daily");
+const u8 gText_MatchCallPassionBurn_Flannery_Intro2[] = _("fatigue in hot springs!");
+
+const u8 gText_MatchCallReliableOne_Dad_Strategy[] = _("I flexibly adapt my style.");
+const u8 gText_MatchCallReliableOne_Dad_Pokemon[] = _("Grown in a balanced manner.");
+const u8 gText_MatchCallReliableOne_Dad_Intro1[] = _("I walk the 30 minutes from");
+const u8 gText_MatchCallReliableOne_Dad_Intro2[] = _("home to here every day.");
+
+const u8 gText_MatchCallSkyTamer_Winona_Strategy[] = _("I take advantage of speed.");
+const u8 gText_MatchCallSkyTamer_Winona_Pokemon[] = _("Graceful sky dancers.");
+const u8 gText_MatchCallSkyTamer_Winona_Intro1[] = _("The ultimate would be to");
+const u8 gText_MatchCallSkyTamer_Winona_Intro2[] = _("live as one with nature.");
+
+const u8 gText_MatchCallMysticDuo_TateAndLiza_Strategy[] = _("We battle in cooperation.");
+const u8 gText_MatchCallMysticDuo_TateAndLiza_Pokemon[] = _("Always friendly POKéMON.");
+const u8 gText_MatchCallMysticDuo_TateAndLiza_Intro1[] = _("Papa has trouble telling");
+const u8 gText_MatchCallMysticDuo_TateAndLiza_Intro2[] = _("the two of us apart!");
+
+const u8 gText_MatchCallDandyCharm_Juan_Strategy[] = _("I use splendid waterpower.");
+const u8 gText_MatchCallDandyCharm_Juan_Pokemon[] = _("POKéMON of elegance!");
+const u8 gText_MatchCallDandyCharm_Juan_Intro1[] = _("The adulation of beautiful");
+const u8 gText_MatchCallDandyCharm_Juan_Intro2[] = _("ladies fills me with energy!");
+
+const u8 gText_MatchCallEliteFour_Sidney_Strategy[] = _("Offense over defense!");
+const u8 gText_MatchCallEliteFour_Sidney_Pokemon[] = _("The DARK side's beauties.");
+const u8 gText_MatchCallEliteFour_Sidney_Intro1[] = _("They said I was a punk, but");
+const u8 gText_MatchCallEliteFour_Sidney_Intro2[] = _("I'm one of the ELITE FOUR!");
+
+const u8 gText_MatchCallEliteFour_Phoebe_Strategy[] = _("Confuse and confound.");
+const u8 gText_MatchCallEliteFour_Phoebe_Pokemon[] = _("There's nothing definite.");
+const u8 gText_MatchCallEliteFour_Phoebe_Intro1[] = _("I wonder how my grandma at");
+const u8 gText_MatchCallEliteFour_Phoebe_Intro2[] = _("MT. PYRE is doing?");
+
+const u8 gText_MatchCallEliteFour_Glacia_Strategy[] = _("I use items for help.");
+const u8 gText_MatchCallEliteFour_Glacia_Pokemon[] = _("Flaming passion in icy cold!");
+const u8 gText_MatchCallEliteFour_Glacia_Intro1[] = _("The ICE type can be better");
+const u8 gText_MatchCallEliteFour_Glacia_Intro2[] = _("trained in this hot land.");
+
+const u8 gText_MatchCallEliteFour_Drake_Strategy[] = _("Harness strong abilities.");
+const u8 gText_MatchCallEliteFour_Drake_Pokemon[] = _("The raw power of DRAGONS!");
+const u8 gText_MatchCallEliteFour_Drake_Intro1[] = _("I dedicate myself to the");
+const u8 gText_MatchCallEliteFour_Drake_Intro2[] = _("POKéMON that saved me.");
+
+const u8 gText_MatchCallChampion_Wallace_Strategy[] = _("Dignity and respect.");
+const u8 gText_MatchCallChampion_Wallace_Pokemon[] = _("I prefer POKéMON of grace.");
+const u8 gText_MatchCallChampion_Wallace_Intro1[] = _("I represent beauty as");
+const u8 gText_MatchCallChampion_Wallace_Intro2[] = _("well as intelligence.");
+
+const u8 *const gMatchCallFlavorTexts[REMATCH_TABLE_ENTRIES][CHECK_PAGE_ENTRY_COUNT] = 
 {
     [REMATCH_ROSE] = MCFLAVOR(AromaLady_Rose),
     [REMATCH_ANDRES] = MCFLAVOR(RuinManiac_Andres),
diff --git a/src/data/trade.h b/src/data/trade.h
new file mode 100644
index 000000000..8601af2a8
--- /dev/null
+++ b/src/data/trade.h
@@ -0,0 +1,1214 @@
+// Exists unused in RS as well
+static const u32 sUnusedStructSizes[] =
+{
+    sizeof(struct SaveBlock2),
+    sizeof(struct SaveBlock1),
+    sizeof(struct MapHeader),
+ // 0x00000530, in RS
+    sizeof(struct MailStruct),  //or EventObject / EventObjectGraphicsInfo
+    sizeof(struct Pokemon),     //or TrainerCard
+    0x00000528  // 0x000004D8, in RS
+};
+
+static const u16 sTradeMovesBoxTilemap[] = INCBIN_U16("graphics/trade/moves_box_map.bin");
+static const u16 sTradePartyBoxTilemap[] = INCBIN_U16("graphics/trade/party_box_map.bin");
+static const u8 sTradeStripesBG2Tilemap[] = INCBIN_U8("graphics/trade/stripes_bg2_map.bin");
+static const u8 sTradeStripesBG3Tilemap[] = INCBIN_U8("graphics/trade/stripes_bg3_map.bin");
+static const u8 sText_EmptyString[] = _("");
+static const u8 sText_UnusedTextFormat[] = _("{COLOR WHITE}{HIGHLIGHT TRANSPARENT}{SHADOW DARK_GREY}");
+const u8 gText_MaleSymbol4[] = _("♂");
+const u8 gText_FemaleSymbol4[] = _("♀");
+const u8 gText_GenderlessSymbol[] = _("");
+static const u8 sText_SpaceMove[] = _(" MOVE"); // unused
+static const u8 sText_NewLine[] = _("\n");
+static const u8 sText_Slash[] = _("/");
+static const u8 sText_Lv[] = _("Lv. ");
+static const u8 sText_ThreeDashes[] = _("---");
+static const u8 sText_FourQuestionMarks[] = _("????");
+static const u8 sText_832DAE4[] = _("");
+static const u8 sText_IsThisTradeOkay[] = _("Is this trade okay?");
+static const u8 sText_Cancel[] = _("CANCEL");
+static const u8 sText_ChooseAPkmn[] = _("Choose a POKéMON.");
+static const u8 sText_Summary[] = _("SUMMARY");
+static const u8 sText_Trade[] = _("TRADE");
+static const u8 sText_CancelTrade[] = _("Cancel trade?");
+static const u8 sJPText_PressBButtonToQuit[] = _("Bボタン　で　もどります");
+static const u8 sText_Summary2[] = _("SUMMARY");
+static const u8 sText_Trade2[] = _("TRADE");
+static const u8 sText_CommunicationStandby[] = _("{COLOR DARK_GREY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GREY}Communication standby…\nPlease wait.");
+static const u8 sText_TheTradeHasBeenCanceled[] = _("{COLOR DARK_GREY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GREY}The trade has\nbeen canceled.");
+static const u8 sText_OnlyPkmnForBattle[] = _("That's your only\nPOKéMON for battle.");
+static const u8 sText_WaitingForYourFriend[] = _("{COLOR DARK_GREY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GREY}Waiting for your friend\nto finish…");
+static const u8 sText_YourFriendWantsToTrade[] = _("Your friend wants\nto trade POKéMON.");
+
+static const struct OamData sTradeOamData_32x16 =
+{
+    .shape = SPRITE_SHAPE(32x16),
+    .size = SPRITE_SIZE(32x16),
+    .priority = 1
+};
+
+static const struct OamData sTradeOamData_64x32 =
+{
+    .shape = SPRITE_SHAPE(64x32),
+    .size = SPRITE_SIZE(64x32),
+    .priority = 1
+};
+
+static const union AnimCmd gSpriteAnim_832DC24[] =
+{
+    ANIMCMD_FRAME(0, 5),
+    ANIMCMD_END
+};
+
+static const union AnimCmd gSpriteAnim_832DC2C[] =
+{
+    ANIMCMD_FRAME(32, 5),
+    ANIMCMD_END
+};
+
+static const union AnimCmd *const gSpriteAnimTable_832DC34[] =
+{
+    gSpriteAnim_832DC24,
+    gSpriteAnim_832DC2C
+};
+
+static const struct SpriteSheet sTradeButtonsSpriteSheet =
+{
+    .data = gTradeButtons_Gfx,
+    .size = 0x800,
+    .tag = 300
+};
+
+static const struct SpritePalette gUnknown_0832DC44 =
+{
+    .data = gUnknown_08DDB444,
+    .tag = 2345
+};
+
+static const union AnimCmd gSpriteAnim_832DC4C[] =
+{
+    ANIMCMD_FRAME(0, 5),
+    ANIMCMD_END
+};
+
+static const union AnimCmd gSpriteAnim_832DC54[] =
+{
+    ANIMCMD_FRAME(8, 5),
+    ANIMCMD_END
+};
+
+static const union AnimCmd gSpriteAnim_832DC5C[] =
+{
+    ANIMCMD_FRAME(16, 5),
+    ANIMCMD_END
+};
+
+static const union AnimCmd gSpriteAnim_832DC64[] =
+{
+    ANIMCMD_FRAME(24, 5),
+    ANIMCMD_END
+};
+
+static const union AnimCmd gSpriteAnim_832DC6C[] =
+{
+    ANIMCMD_FRAME(32, 5),
+    ANIMCMD_END
+};
+
+static const union AnimCmd gSpriteAnim_832DC74[] =
+{
+    ANIMCMD_FRAME(40, 5),
+    ANIMCMD_END
+};
+
+static const union AnimCmd *const gSpriteAnimTable_832DC7C[] =
+{
+    gSpriteAnim_832DC4C,
+    gSpriteAnim_832DC54,
+    gSpriteAnim_832DC5C,
+    gSpriteAnim_832DC64,
+    gSpriteAnim_832DC6C,
+    gSpriteAnim_832DC74
+};
+
+static const struct SpriteTemplate gSpriteTemplate_832DC94 =
+{
+    .tileTag = 300,
+    .paletteTag = 2345,
+    .oam = &sTradeOamData_64x32,
+    .anims = gSpriteAnimTable_832DC34,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy,
+};
+
+static const struct SpriteTemplate gSpriteTemplate_832DCAC =
+{
+    .tileTag = 200,
+    .paletteTag = 4925,
+    .oam = &sTradeOamData_32x16,
+    .anims = gSpriteAnimTable_832DC7C,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy,
+};
+
+static const u16 TradeScreenTextPalette[] = INCBIN_U16("graphics/trade/text.gbapal");
+static const struct SpritePalette gSpritePalette_TradeScreenText =
+{
+    .data = TradeScreenTextPalette,
+    .tag = 4925
+};
+
+// This is used to determine the next mon to select when the D-Pad is
+// pressed in a given direction.
+// Note that the mons are laid out like this.
+// 0-5 are the player's party and 6-11 are the trading partner's party.
+// 12 is the cancel button.
+//  0  1  6  7
+//  2  3  8  9
+//  4  5 10 11
+//          12
+// 1st array is the current positions
+// 2nd array is directions of input
+// 3rd array is the next positions to go to (unoccupied spaces are skipped over)
+static const u8 sTradeNextSelectedMonTable[(PARTY_SIZE * 2) + 1][4][PARTY_SIZE] =
+{
+    {
+        {4,  2,  12, 12, 0,  0}, // UP
+        {2,  4,  12, 12, 0,  0}, // DOWN
+        {7,  6,  1,  0,  0,  0}, // LEFT
+        {1,  6,  7,  0,  0,  0}  // RIGHT
+    },
+    {
+        {5,  3,  12, 12, 0,  0},
+        {3,  5,  12, 12, 0,  0},
+        {0,  7,  6,  1,  0,  0},
+        {6,  7,  0,  1,  0,  0}
+    },
+    {
+        {0,  0,  0,  0,  0,  0},
+        {4,  0,  0,  0,  0,  0},
+        {9,  8,  7,  6,  0,  0},
+        {3,  1,  0,  0,  0,  0}
+    },
+    {
+        {1,  1,  1,  1,  0,  0},
+        {5,  1,  1,  1,  0,  0},
+        {2,  9,  8,  7,  0,  0},
+        {8,  9,  6,  6,  0,  0}
+    },
+    {
+        {2,  2,  2,  2,  0,  0},
+        {0,  0,  0,  0,  0,  0},
+        {11, 10, 9,  8,  7,  6},
+        {5,  3,  1,  0,  0,  0}
+    },
+    {
+        {3,  3,  3,  3,  0,  0},
+        {1,  1,  1,  1,  0,  0},
+        {4,  4,  4,  4,  0,  0},
+        {10, 8,  6,  0,  0,  0}
+    },
+    {
+        {10, 8,  12, 0,  0,  0},
+        {8,  10, 12, 0,  0,  0},
+        {1,  0,  0,  0,  0,  0},
+        {7,  0,  1,  0,  0,  0}
+    },
+    {
+        {12, 0,  0,  0,  0,  0},
+        {9,  12, 0,  0,  0,  0},
+        {6,  0,  0,  0,  0,  0},
+        {0,  0,  0,  0,  0,  0}
+    },
+    {
+        {6,  0,  0,  0,  0,  0},
+        {10, 6,  0,  0,  0,  0},
+        {3,  2,  1,  0,  0,  0},
+        {9,  7,  0,  0,  0,  0}
+    },
+    {
+        {7,  0,  0,  0,  0,  0},
+        {11, 12, 0,  0,  0,  0},
+        {8,  0,  0,  0,  0,  0},
+        {2,  1,  0,  0,  0,  0}
+    },
+    {
+        {8,  0,  0,  0,  0,  0},
+        {6,  0,  0,  0,  0,  0},
+        {5,  4,  3,  2,  1,  0},
+        {11, 9,  7,  0,  0,  0}
+    },
+    {
+        {9,  0,  0,  0,  0,  0},
+        {12, 0,  0,  0,  0,  0},
+        {10, 0,  0,  0,  0,  0},
+        {4,  2,  0,  0,  0,  0}
+    },
+    {
+        {11, 9,  7,  6,  0,  0},
+        {7,  6,  0,  0,  0,  0},
+        {12, 0,  0,  0,  0,  0},
+        {12, 0,  0,  0,  0,  0}
+    }
+};
+
+static const u8 sTradeMonSpriteCoords[(PARTY_SIZE * 2) + 1][2] =
+{
+    // Your party
+    {1,  5 },
+    {8,  5 },
+    {1,  10},
+    {8,  10},
+    {1,  15},
+    {8,  15},
+
+    // Friend's party
+    {16, 5 },
+    {23, 5 },
+    {16, 10},
+    {23, 10},
+    {16, 15},
+    {23, 15},
+
+    {23, 18} // CANCEL
+};
+
+static const u8 sTradeMonLevelCoords[][2][2] =
+{
+    // Your party
+    {
+        {5, 4},
+        {12, 4},
+    },
+    {
+        {5, 9},
+        {12, 9},
+    },
+    {
+        {5, 14},
+        {12, 14},
+    },
+    // Friend's party
+    {
+
+        {20, 4},
+        {27, 4},
+    },
+    {
+        {20, 9},
+        {27, 9},
+    },
+    {
+        {20, 14},
+        {27, 14},
+    },
+};
+
+static const u8 sTradeMonBoxCoords[][2][2] =
+{
+    // Your party
+    {
+        {1, 3},
+        {8, 3},
+    },
+    {
+        {1, 8},
+        {8, 8},
+    },
+    {
+        {1, 13},
+        {8, 13},
+    },
+    // Friend's party
+    {
+        {16, 3},
+        {23, 3},
+    },
+    {
+        {16, 8},
+        {23, 8},
+    },
+    {
+        {16, 13},
+        {23, 13},
+    },
+};
+
+static const u8 sUnref_0832DE6E[] =
+{
+    0x00, 0x0e,
+    0x0f, 0x1d,
+    0x03, 0x05,
+    0x03, 0x07,
+    0x12, 0x05,
+    0x12, 0x07,
+    0x08, 0x07,
+    0x16, 0x0c,
+    0x08, 0x07,
+    0x16, 0x0c,
+    0x06, 0x07,
+    0x18, 0x0c,
+    0x06, 0x07,
+    0x18, 0x0c,
+    0x08, 0x07,
+    0x16, 0x0c,
+    0x07, 0x07,
+    0x17, 0x0c
+};
+
+static const u8 *const sTradeActionTexts[] =
+{
+    [TRADE_TEXT_CANCEL]       = sText_Cancel,
+    [TRADE_TEXT_CHOOSE_MON]   = sText_ChooseAPkmn,
+    [TRADE_TEXT_SUMMARY]      = sText_Summary,
+    [TRADE_TEXT_TRADE]        = sText_Trade,
+    [TRADE_TEXT_CANCEL_TRADE] = sText_CancelTrade,
+    [TRADE_TEXT_JP_QUIT]      = sJPText_PressBButtonToQuit
+};
+
+static const struct MenuAction sSelectTradeMonActions[] =
+{
+    {sText_Summary2, Task_DrawSelectionSummary},
+    {sText_Trade2,   Task_DrawSelectionTrade}
+};
+
+static const u8 *const sTradeMessages[] = 
+{
+    [TRADE_MSG_STANDBY]                    = sText_CommunicationStandby,
+    [TRADE_MSG_CANCELED]                   = sText_TheTradeHasBeenCanceled,
+    [TRADE_MSG_ONLY_MON1]                  = sText_OnlyPkmnForBattle,
+    [TRADE_MSG_ONLY_MON2]                  = gText_OnlyPkmnForBattle, //identical text to above
+    [TRADE_MSG_WAITING_FOR_FRIEND]         = sText_WaitingForYourFriend,
+    [TRADE_MSG_FRIEND_WANTS_TO_TRADE]      = sText_YourFriendWantsToTrade,
+    [TRADE_MSG_MON_CANT_BE_TRADED]         = gText_PkmnCantBeTradedNow,
+    [TRADE_MSG_EGG_CANT_BE_TRADED]         = gText_EggCantBeTradedNow,
+    [TRADE_MSG_FRIENDS_MON_CANT_BE_TRADED] = gText_OtherTrainersPkmnCantBeTraded
+};
+
+static const u8 sTradeTextColors[] = 
+{ 
+    TEXT_COLOR_TRANSPARENT, //bg color
+    TEXT_COLOR_WHITE,       //fg color
+    TEXT_COLOR_DARK_GREY    //shadow color
+};
+
+static const struct BgTemplate sTradeMenuBgTemplates[] =
+{
+    {
+        .bg = 0,
+        .charBaseIndex = 2,
+        .mapBaseIndex = 31,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 0,
+        .baseTile = 0
+    },
+    {
+        .bg = 1,
+        .charBaseIndex = 0,
+        .mapBaseIndex = 5,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 1,
+        .baseTile = 0
+    },
+    {
+        .bg = 2,
+        .charBaseIndex = 0,
+        .mapBaseIndex = 6,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 2,
+        .baseTile = 0
+    },
+    {
+        .bg = 3,
+        .charBaseIndex = 0,
+        .mapBaseIndex = 7,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 3,
+        .baseTile = 0
+    },
+};
+
+static const struct WindowTemplate sTradeMenuWindowTemplates[] =
+{
+    {
+        .bg = 0,
+        .tilemapLeft = 4,
+        .tilemapTop = 7,
+        .width = 22,
+        .height = 4,
+        .paletteNum = 15,
+        .baseBlock = 30
+    },
+    {
+        .bg = 0,
+        .tilemapLeft = 19,
+        .tilemapTop = 15,
+        .width = 10,
+        .height = 4,
+        .paletteNum = 15,
+        .baseBlock = 118
+    },
+    {
+        .bg = 0,
+        .tilemapLeft = 0,
+        .tilemapTop = 5,
+        .width = 8,
+        .height = 2,
+        .paletteNum = 13,
+        .baseBlock = 158
+    },
+    {
+        .bg = 0,
+        .tilemapLeft = 7,
+        .tilemapTop = 5,
+        .width = 8,
+        .height = 2,
+        .paletteNum = 13,
+        .baseBlock = 174
+    },
+    {
+        .bg = 0,
+        .tilemapLeft = 0,
+        .tilemapTop = 10,
+        .width = 8,
+        .height = 2,
+        .paletteNum = 13,
+        .baseBlock = 190
+    },
+    {
+        .bg = 0,
+        .tilemapLeft = 7,
+        .tilemapTop = 10,
+        .width = 8,
+        .height = 2,
+        .paletteNum = 13,
+        .baseBlock = 206
+    },
+    {
+        .bg = 0,
+        .tilemapLeft = 0,
+        .tilemapTop = 15,
+        .width = 8,
+        .height = 2,
+        .paletteNum = 13,
+        .baseBlock = 222
+    },
+    {
+        .bg = 0,
+        .tilemapLeft = 7,
+        .tilemapTop = 15,
+        .width = 8,
+        .height = 2,
+        .paletteNum = 13,
+        .baseBlock = 238
+    },
+    {
+        .bg = 0,
+        .tilemapLeft = 15,
+        .tilemapTop = 5,
+        .width = 8,
+        .height = 2,
+        .paletteNum = 13,
+        .baseBlock = 254
+    },
+    {
+        .bg = 0,
+        .tilemapLeft = 22,
+        .tilemapTop = 5,
+        .width = 8,
+        .height = 2,
+        .paletteNum = 13,
+        .baseBlock = 270
+    },
+    {
+        .bg = 0,
+        .tilemapLeft = 15,
+        .tilemapTop = 10,
+        .width = 8,
+        .height = 2,
+        .paletteNum = 13,
+        .baseBlock = 286
+    },
+    {
+        .bg = 0,
+        .tilemapLeft = 22,
+        .tilemapTop = 10,
+        .width = 8,
+        .height = 2,
+        .paletteNum = 13,
+        .baseBlock = 302
+    },
+    {
+        .bg = 0,
+        .tilemapLeft = 15,
+        .tilemapTop = 15,
+        .width = 8,
+        .height = 2,
+        .paletteNum = 13,
+        .baseBlock = 318
+    },
+    {
+        .bg = 0,
+        .tilemapLeft = 22,
+        .tilemapTop = 15,
+        .width = 8,
+        .height = 2,
+        .paletteNum = 13,
+        .baseBlock = 334
+    },
+    {
+        .bg = 0,
+        .tilemapLeft = 2,
+        .tilemapTop = 5,
+        .width = 14,
+        .height = 2,
+        .paletteNum = 13,
+        .baseBlock = 350
+    },
+    {
+        .bg = 0,
+        .tilemapLeft = 3,
+        .tilemapTop = 8,
+        .width = 11,
+        .height = 8,
+        .paletteNum = 15,
+        .baseBlock = 378
+    },
+    {
+        .bg = 0,
+        .tilemapLeft = 17,
+        .tilemapTop = 5,
+        .width = 14,
+        .height = 2,
+        .paletteNum = 15,
+        .baseBlock = 466
+    },
+    {
+        .bg = 0,
+        .tilemapLeft = 18,
+        .tilemapTop = 8,
+        .width = 11,
+        .height = 8,
+        .paletteNum = 15,
+        .baseBlock = 494
+    },
+    DUMMY_WIN_TEMPLATE,
+};
+
+static const struct WindowTemplate sTradeYesNoWindowTemplate =
+{
+    .bg = 0,
+    .tilemapLeft = 23,
+    .tilemapTop = 13,
+    .width = 5,
+    .height = 4,
+    .paletteNum = 15,
+    .baseBlock = 582
+};
+
+static const u8 sJPText_Shedinja[] = _("ヌケニン");
+static const u8 sTradeMenuPartyMonBoxDimensions[3][2] =
+{
+    [TRADE_PLAYER]  = {4,  3},
+    [TRADE_PARTNER] = {19, 3}
+};
+
+static const u16 sTradePal_PokeBall[] = INCBIN_U16("graphics/trade/pokeball.gbapal");
+static const u8 sTradeGfx_PokeBall[] = INCBIN_U8("graphics/trade/pokeball.4bpp");
+static const u8 sTradeGfx_PokeBallSymbol[] = INCBIN_U8("graphics/trade/pokeball_symbol.8bpp"); // unused?
+static const u16 sTradeTilemap_Cable[] = INCBIN_U16("graphics/trade/cable_closeup_map.bin");
+static const u16 sTradeTilemap_PokeBallSymbol[] = INCBIN_U16("graphics/trade/pokeball_symbol_map.bin"); // unused?
+static const u16 sUnref_083308C0[] = INCBIN_U16("graphics/trade/unknown_3308C0.gbapal");
+static const u16 sTradePal_Gba[] = INCBIN_U16("graphics/trade/gba.gbapal");
+static const u16 sTradePal_ShadowUnused[] = INCBIN_U16("graphics/trade/shadow.gbapal");
+static const u16 sTradePal_BlackUnused[] = INCBIN_U16("graphics/trade/black.gbapal");
+static const u16 sTradePal_Misc[] = INCBIN_U16("graphics/trade/misc.gbapal");
+static const u8 sTradeGfx_Glow1[] = INCBIN_U8("graphics/trade/glow1.4bpp");
+static const u8 sTradeGfx_Glow2[] = INCBIN_U8("graphics/trade/glow2.4bpp");
+static const u8 sTradeGfx_CableEnd[] = INCBIN_U8("graphics/trade/cable_end.4bpp");
+static const u8 sTradeGfx_GbaScreen[] = INCBIN_U8("graphics/trade/gba_screen.4bpp");
+const u16 gUnknown_08331F60[] = INCBIN_U16("graphics/trade/shadow_map.bin");
+static const u8 sTradeAffine_Gba[] = INCBIN_U8("graphics/trade/gba_affine.8bpp");
+static const u8 sFiller_08335760[64] = {};
+static const u8 sTradeAffineMap_GbaCable[] = INCBIN_U8("graphics/trade/gba_affine_map_cable.bin");
+static const u8 sTradeAffineMap_GbaWireless[] = INCBIN_U8("graphics/trade/gba_affine_map_wireless.bin");
+static const u16 sTradeTilemap_GbaWireless[] = INCBIN_U16("graphics/trade/gba_map_wireless.bin");
+static const u16 sTradeTilemap_GbaCable[] = INCBIN_U16("graphics/trade/gba_map_cable.bin");
+static const u32 gUnknown_083379A0[] = INCBIN_U32("graphics/trade/unknown_3379A0.bin.lz"); //some wireless tilemap
+static const u16 sTradePal_WirelessSignalSend[] = INCBIN_U16("graphics/trade/wireless_signal_send.gbapal");
+static const u16 sTradePal_WirelessSignalReceive[] = INCBIN_U16("graphics/trade/wireless_signal_receive.gbapal");
+static const u16 sTradePal_Black[] = INCBIN_U16("graphics/trade/black.gbapal");
+static const u32 sTradeGfx_WirelessSignal[] = INCBIN_U32("graphics/trade/wireless_signal.4bpp.lz");
+static const u32 sTradeTilemap_WirelessSignal[] = INCBIN_U32("graphics/trade/wireless_signal.bin.lz");
+
+static const struct OamData sTradeOamData_16x16 =
+{
+    .affineMode = ST_OAM_AFFINE_NORMAL,
+    .shape = SPRITE_SHAPE(16x16),
+    .size = SPRITE_SIZE(16x16)
+};
+
+static const union AnimCmd gSpriteAnim_8338C4C[] =
+{
+    ANIMCMD_FRAME( 0, 3),
+    ANIMCMD_FRAME( 4, 3),
+    ANIMCMD_FRAME( 8, 3),
+    ANIMCMD_FRAME(12, 3),
+    ANIMCMD_FRAME(16, 3),
+    ANIMCMD_FRAME(20, 3),
+    ANIMCMD_FRAME(24, 3),
+    ANIMCMD_FRAME(28, 3),
+    ANIMCMD_FRAME(32, 3),
+    ANIMCMD_FRAME(36, 3),
+    ANIMCMD_FRAME(40, 3),
+    ANIMCMD_FRAME(44, 3),
+    ANIMCMD_LOOP(1),
+    ANIMCMD_FRAME( 0, 3),
+    ANIMCMD_END
+};
+
+static const union AnimCmd gSpriteAnim_8338C88[] =
+{
+    ANIMCMD_FRAME( 0, 3),
+    ANIMCMD_FRAME( 4, 3),
+    ANIMCMD_FRAME( 8, 3),
+    ANIMCMD_FRAME(12, 3),
+    ANIMCMD_FRAME(16, 3),
+    ANIMCMD_FRAME(20, 3),
+    ANIMCMD_FRAME(24, 3),
+    ANIMCMD_FRAME(28, 3),
+    ANIMCMD_FRAME(32, 3),
+    ANIMCMD_FRAME(36, 3),
+    ANIMCMD_FRAME(40, 3),
+    ANIMCMD_FRAME(44, 3),
+    ANIMCMD_LOOP(2),
+    ANIMCMD_FRAME( 0, 3),
+    ANIMCMD_END
+};
+
+static const union AnimCmd *const gSpriteAnimTable_8338C88[] =
+{
+    gSpriteAnim_8338C4C,
+    gSpriteAnim_8338C88
+};
+
+static const union AffineAnimCmd gSpriteAffineAnim_8338CCC[] =
+{
+    AFFINEANIMCMD_FRAME(0, 0, 0, 1),
+    AFFINEANIMCMD_END
+};
+
+static const union AffineAnimCmd gSpriteAffineAnim_8338CDC[] =
+{
+    AFFINEANIMCMD_FRAME(-8, 0, 0, 20),
+    AFFINEANIMCMD_END
+};
+
+static const union AffineAnimCmd gSpriteAffineAnim_8338CEC[] =
+{
+    AFFINEANIMCMD_FRAME(0x60, 0x100, 0,  0),
+    AFFINEANIMCMD_FRAME(   0,     0, 0,  5),
+    AFFINEANIMCMD_FRAME(   8,     0, 0, 20),
+    AFFINEANIMCMD_END
+};
+
+static const union AffineAnimCmd *const gSpriteAffineAnimTable_8338D0C[] =
+{
+    gSpriteAffineAnim_8338CCC,
+    gSpriteAffineAnim_8338CDC,
+    gSpriteAffineAnim_8338CEC
+};
+
+static const struct SpriteSheet sPokeBallSpriteSheet =
+{
+    .data = sTradeGfx_PokeBall,
+    .size = 0x600,
+    .tag = 5557
+};
+
+static const struct SpritePalette sPokeBallSpritePalette =
+{
+    .data = sTradePal_PokeBall,
+    .tag = 5558
+};
+
+static const struct SpriteTemplate gSpriteTemplate_8338D28 =
+{
+    .tileTag = 5557,
+    .paletteTag = 5558,
+    .oam = &sTradeOamData_16x16,
+    .anims = gSpriteAnimTable_8338C88,
+    .images = NULL,
+    .affineAnims = gSpriteAffineAnimTable_8338D0C,
+    .callback = sub_807E55C
+};
+
+static const struct OamData sTradeOamData_32x32 =
+{
+    .affineMode = ST_OAM_AFFINE_NORMAL,
+    .objMode = ST_OAM_OBJ_BLEND,
+    .shape = SPRITE_SHAPE(32x32),
+    .size = SPRITE_SIZE(32x32),
+    .priority = 1
+};
+
+static const union AnimCmd gSpriteAnim_8338D48[] =
+{
+    ANIMCMD_FRAME(0, 5, .hFlip = TRUE, .vFlip = TRUE),
+    ANIMCMD_END
+};
+
+static const union AnimCmd *const gSpriteAnimTable_8338D50[] =
+{
+    gSpriteAnim_8338D48
+};
+
+static const union AffineAnimCmd gSpriteAffineAnim_8338D54[] =
+{
+    AFFINEANIMCMD_FRAME(-10, -10, 0, 5),
+    AFFINEANIMCMD_FRAME(10, 10, 0, 5),
+    AFFINEANIMCMD_JUMP(0)
+};
+
+static const union AffineAnimCmd *const gSpriteAffineAnimTable_8338D6C[] =
+{
+    gSpriteAffineAnim_8338D54
+};
+
+static const struct SpriteSheet sGlow1SpriteSheet =
+{
+    .data = sTradeGfx_Glow1,
+    .size = 0x200,
+    .tag = 5550
+};
+
+static const struct SpritePalette sMiscTradeSpritePalette =
+{
+    .data = sTradePal_Misc,
+    .tag = 5551
+};
+
+static const struct SpritePalette sGbaSpritePalette =
+{
+    .data = sTradePal_Gba,
+    .tag = 5555
+};
+
+static const struct SpriteTemplate gUnknown_08338D88 =
+{
+    .tileTag = 5550,
+    .paletteTag = 5551,
+    .oam = &sTradeOamData_32x32,
+    .anims = gSpriteAnimTable_8338D50,
+    .images = NULL,
+    .affineAnims = gSpriteAffineAnimTable_8338D6C,
+    .callback = sub_807AA28
+};
+
+static const struct OamData sTradeOamData_16x32 =
+{
+    .shape = SPRITE_SHAPE(16x32),
+    .size = SPRITE_SIZE(16x32),
+    .priority = 1
+};
+
+static const union AnimCmd gSpriteAnim_8338DA8[] =
+{
+    ANIMCMD_FRAME(0, 5, .vFlip = TRUE, .hFlip = TRUE),
+    ANIMCMD_END
+};
+
+static const union AnimCmd gSpriteAnim_8338DB0[] =
+{
+    ANIMCMD_FRAME(8, 5, .vFlip = TRUE, .hFlip = TRUE),
+    ANIMCMD_END
+};
+
+static const union AnimCmd *const gSpriteAnimTable_8338DB8[] =
+{
+    gSpriteAnim_8338DA8,
+    gSpriteAnim_8338DB0
+};
+
+static const struct SpriteSheet sGlow2SpriteSheet =
+{
+    .data = sTradeGfx_Glow2,
+    .size = 0x300,
+    .tag = 5552
+};
+
+static const struct SpriteTemplate sGlowBallSpriteTemplate =
+{
+    .tileTag = 5552,
+    .paletteTag = 5551,
+    .oam = &sTradeOamData_16x32,
+    .anims = gSpriteAnimTable_8338DB8,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = sub_807AA7C
+};
+
+static const struct OamData sTradeOamData_16x32_2 =
+{
+    .shape = SPRITE_SHAPE(16x32),
+    .size = SPRITE_SIZE(16x32),
+    .priority = 1
+};
+
+static const union AnimCmd gSpriteAnim_8338DE8[] =
+{
+    ANIMCMD_FRAME(0, 10),
+    ANIMCMD_END
+};
+
+static const union AnimCmd *const gSpriteAnimTable_8338DF0[] =
+{
+    gSpriteAnim_8338DE8
+};
+
+static const struct SpriteSheet sCableEndSpriteSheet =
+{
+    .data = sTradeGfx_CableEnd,
+    .size = 0x100,
+    .tag = 5554
+};
+
+static const struct SpriteTemplate gSpriteTemplate_8338DFC =
+{
+    .tileTag = 5554,
+    .paletteTag = 5555,
+    .oam = &sTradeOamData_16x32_2,
+    .anims = gSpriteAnimTable_8338DF0,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = sub_807AABC
+};
+
+static const struct OamData sTradeOamData_64x32_2 =
+{
+    .shape = SPRITE_SHAPE(64x32),
+    .size = SPRITE_SIZE(64x32),
+    .priority = 1
+};
+
+static const union AnimCmd gSpriteAnim_8338E1C[] =
+{
+    ANIMCMD_FRAME( 0, 2, .vFlip = TRUE, .hFlip = TRUE),
+    ANIMCMD_FRAME(32, 2, .vFlip = TRUE, .hFlip = TRUE),
+    ANIMCMD_FRAME(64, 2, .vFlip = TRUE, .hFlip = TRUE),
+    ANIMCMD_FRAME(96, 2, .vFlip = TRUE, .hFlip = TRUE),
+    ANIMCMD_FRAME(64, 2, .vFlip = TRUE, .hFlip = TRUE),
+    ANIMCMD_FRAME(32, 2, .vFlip = TRUE, .hFlip = TRUE),
+    ANIMCMD_FRAME( 0, 2, .vFlip = TRUE, .hFlip = TRUE),
+    ANIMCMD_LOOP(8),
+    ANIMCMD_END
+};
+
+static const union AnimCmd gSpriteAnim_8338E40[] =
+{
+    ANIMCMD_FRAME( 0, 2, .vFlip = TRUE, .hFlip = TRUE),
+    ANIMCMD_FRAME(32, 2, .vFlip = TRUE, .hFlip = TRUE),
+    ANIMCMD_FRAME(64, 2, .vFlip = TRUE, .hFlip = TRUE),
+    ANIMCMD_FRAME(96, 2, .vFlip = TRUE, .hFlip = TRUE),
+    ANIMCMD_FRAME(64, 2, .vFlip = TRUE, .hFlip = TRUE),
+    ANIMCMD_FRAME(32, 2, .vFlip = TRUE, .hFlip = TRUE),
+    ANIMCMD_FRAME( 0, 2, .vFlip = TRUE, .hFlip = TRUE),
+    ANIMCMD_LOOP(2),
+    ANIMCMD_END
+};
+
+static const union AnimCmd *const gSpriteAnimTable_8338E64[] =
+{
+    gSpriteAnim_8338E1C
+};
+
+static const union AnimCmd *const gSpriteAnimTable_8338E68[] =
+{
+    gSpriteAnim_8338E40
+};
+
+static const struct SpriteSheet sGbaScreenSpriteSheet =
+{
+    .data = sTradeGfx_GbaScreen,
+    .size = 0x1000,
+    .tag = 5556
+};
+
+static const struct SpriteTemplate gSpriteTemplate_8338E74 =
+{
+    .tileTag = 5556,
+    .paletteTag = 5555,
+    .oam = &sTradeOamData_64x32_2,
+    .anims = gSpriteAnimTable_8338E64,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = sub_807AB04
+};
+
+static const struct SpriteTemplate gSpriteTemplate_8338E8C =
+{
+    .tileTag = 5556,
+    .paletteTag = 5555,
+    .oam = &sTradeOamData_64x32_2,
+    .anims = gSpriteAnimTable_8338E68,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = sub_807AB04
+};
+
+static const u16 gUnknown_08338EA4[] = INCBIN_U16("graphics/trade/unknown_338EA4.gbapal");
+
+static const union AffineAnimCmd gSpriteAffineAnim_8338EBC[] =
+{
+    AFFINEANIMCMD_FRAME(-0x100, 0x100, 0, 0),
+    AFFINEANIMCMD_JUMP(0)
+};
+
+static const union AffineAnimCmd *const gSpriteAffineAnimTable_8338ECC[] =
+{
+    gSpriteAffineAnim_8338EBC
+};
+
+static const struct InGameTrade sIngameTrades[] =
+{
+    [INGAME_TRADE_SEEDOT] = 
+    {
+        .nickname = _("DOTS"), 
+        .species = SPECIES_SEEDOT,
+        .ivs = {5, 4, 5, 4, 4, 4},
+        .abilityNum = 1, 
+        .otId = 38726,
+        .conditions = {30, 5, 5, 5, 5},
+        .personality = 0x84,
+        .heldItem = ITEM_CHESTO_BERRY, 
+        .mailNum = -1,
+        .otName = _("KOBE"), 
+        .otGender = MALE, 
+        .sheen = 10,
+        .requestedSpecies = SPECIES_RALTS
+    }, 
+    [INGAME_TRADE_PLUSLE] = 
+    {
+        .nickname = _("PLUSES"), 
+        .species = SPECIES_PLUSLE,
+        .ivs = {4, 4, 4, 5, 5, 4},
+        .abilityNum = 0, 
+        .otId = 73996,
+        .conditions = {5, 5, 30, 5, 5},
+        .personality = 0x6F,
+        .heldItem = ITEM_WOOD_MAIL, 
+        .mailNum = 0,
+        .otName = _("ROMAN"), 
+        .otGender = MALE, 
+        .sheen = 10,
+        .requestedSpecies = SPECIES_VOLBEAT
+    }, 
+    [INGAME_TRADE_HORSEA] = 
+    {
+        .nickname = _("SEASOR"),
+        .species = SPECIES_HORSEA,
+        .ivs = {5, 4, 4, 4, 5, 4},
+        .abilityNum = 0, 
+        .otId = 46285,
+        .conditions = {5, 5, 5, 5, 30},
+        .personality = 0x7F,
+        .heldItem = ITEM_WAVE_MAIL, 
+        .mailNum = 1,
+        .otName = _("SKYLAR"), 
+        .otGender = MALE, 
+        .sheen = 10,
+        .requestedSpecies = SPECIES_BAGON
+    }, 
+    [INGAME_TRADE_MEOWTH] = 
+    {
+        .nickname = _("MEOWOW"),
+        .species = SPECIES_MEOWTH,
+        .ivs = {4, 5, 4, 5, 4, 4},
+        .abilityNum = 0, 
+        .otId = 91481,
+        .conditions = {5, 5, 5, 30, 5},
+        .personality = 0x8B,
+        .heldItem = ITEM_RETRO_MAIL, 
+        .mailNum = 2,
+        .otName = _("ISIS"), 
+        .otGender = FEMALE, 
+        .sheen = 10,
+        .requestedSpecies = SPECIES_SKITTY
+    }
+};
+
+static const u16 sIngameTradeMail[][MAIL_WORDS_COUNT + 1] =
+{
+    {
+        EC_WORD_BE,
+        EC_WORD_NICE,
+        EC_WORD_TO,
+        EC_POKEMON(PLUSLE),
+        EC_WORD_EXCL,
+        EC_POKEMON(VOLBEAT),
+        EC_WORD_WILL,
+        EC_WORD_BE,
+        EC_WORD_FANTASTIC
+    }, {
+        EC_WORD_I,
+        EC_WORD_WILL,
+        EC_WORD_MAKE,
+        EC_POKEMON(BAGON),
+        EC_WORD_TOUGH,
+        EC_WORD_PLEASE,
+        EC_WORD_TRAIN,
+        EC_POKEMON(HORSEA),
+        EC_WORD_WELL
+    }, {
+        EC_WORD_THANK_YOU,
+        EC_WORD_FOR,
+        EC_POKEMON(SKITTY),
+        EC_POKEMON2(MEOWTH),
+        EC_WORD_CRIES,
+        EC_WORD_IN,
+        EC_WORD_A,
+        EC_WORD_CUTE,
+        EC_WORD_WAY
+    }
+};
+
+static const struct WindowTemplate sTradeSequenceWindowTemplates[] =
+{
+    {
+        .bg = 0,
+        .tilemapLeft = 2,
+        .tilemapTop = 15,
+        .width = 26,
+        .height = 4,
+        .paletteNum = 0,
+        .baseBlock = 64
+    },
+    DUMMY_WIN_TEMPLATE
+};
+
+const struct WindowTemplate gTradeEvolutionSceneYesNoWindowTemplate =
+{
+    .bg = 0,
+    .tilemapLeft = 21,
+    .tilemapTop = 9,
+    .width = 5,
+    .height = 4,
+    .paletteNum = 15,
+    .baseBlock = 188
+};
+
+static const struct BgTemplate sTradeSequenceBgTemplates[] =
+{
+    {
+        .bg = 0,
+        .charBaseIndex = 3,
+        .mapBaseIndex = 31,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 0,
+        .baseTile = 0
+    },
+    {
+        .bg = 1,
+        .charBaseIndex = 0,
+        .mapBaseIndex = 5,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 2,
+        .baseTile = 0
+    },
+    {
+        .bg = 2,
+        .charBaseIndex = 1,
+        .mapBaseIndex = 18,
+        .screenSize = 1,
+        .paletteMode = 0,
+        .priority = 2,
+        .baseTile = 0
+    },
+    {
+        .bg = 3,
+        .charBaseIndex = 0,
+        .mapBaseIndex = 6,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 3,
+        .baseTile = 0
+    },
+};
+
+static const s8 sTradeBallVerticalVelocityTable[] =
+{
+    0,  0,  1,  0,
+    1,  0,  1,  1,
+    1,  1,  2,  2,
+    2,  2,  3,  3,
+    3,  3,  4,  4,
+    4,  4, -4, -4,
+    -4, -3, -3, -3,
+    -3, -2, -2, -2,
+    -2, -1, -1, -1,
+    -1,  0, -1,  0,
+    -1,  0,  0,  0,
+    0,  0,  1,  0,
+    1,  0,  1,  1,
+    1,  1,  2,  2,
+    2,  2,  3,  3,
+    3,  3,  4,  4,
+    4,  4, -4, -3,
+    -3, -2, -2, -1,
+    -1, -1,  0, -1,
+    0,  0,  0,  0,
+    0,  0,  1,  0,
+    1,  1,  1,  2,
+    2,  3,  3,  4,
+    -4, -3, -2, -1,
+    -1, -1,  0,  0,
+    0,  0,  1,  0,
+    1,  1,  2,  3
+};
+
+static const u8 sWirelessSignalTiming[][2] =
+{
+    {0,  1},
+    {1,  1},
+    {2,  1},
+    {3,  1},
+    {4,  1},
+    {5,  2},
+    {6,  2},
+    {7,  2},
+    {8,  2},
+    {9,  2},
+    {10, 3},
+    {11, 3},
+    {12, 3},
+    {13, 4},
+    {14, 5},
+    {15, 2},
+    {0,  1},
+    {1,  1},
+    {2,  1},
+    {3,  1},
+    {4,  1},
+    {5,  2},
+    {6,  2},
+    {7,  2},
+    {8,  2},
+    {9,  2},
+    {10, 3},
+    {11, 3},
+    {12, 3},
+    {13, 4},
+    {14, 5},
+    {16, 1},
+    {16, 255},
+    {0,  0}
+};
diff --git a/src/data/trainer_parties.h b/src/data/trainer_parties.h
index 252eed760..824a49dc3 100644
--- a/src/data/trainer_parties.h
+++ b/src/data/trainer_parties.h
@@ -6,7 +6,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Sawyer1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout1[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -14,7 +14,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout2[] = {
     {
     .iv = 0,
     .lvl = 31,
@@ -27,7 +27,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout3[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -35,7 +35,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt3[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt4[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout4[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -43,7 +43,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt4[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt5[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntSeafloorCavern1[] = {
     {
     .iv = 0,
     .lvl = 36,
@@ -51,7 +51,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt5[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt6[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntSeafloorCavern2[] = {
     {
     .iv = 0,
     .lvl = 36,
@@ -59,7 +59,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt6[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt7[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntSeafloorCavern3[] = {
     {
     .iv = 0,
     .lvl = 36,
@@ -100,7 +100,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Gabrielle1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt8[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntPetalburgWoods[] = {
     {
     .iv = 0,
     .lvl = 9,
@@ -147,7 +147,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Ed[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt9[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntSeafloorCavern4[] = {
     {
     .iv = 0,
     .lvl = 36,
@@ -163,7 +163,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Declan[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt10[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntRusturfTunnel[] = {
     {
     .iv = 0,
     .lvl = 11,
@@ -171,7 +171,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt10[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt11[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntWeatherInst1[] = {
     {
     .iv = 0,
     .lvl = 27,
@@ -184,7 +184,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt11[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt12[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntWeatherInst2[] = {
     {
     .iv = 0,
     .lvl = 27,
@@ -197,7 +197,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt12[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt13[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntWeatherInst3[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -215,7 +215,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt13[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt14[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMuseum1[] = {
     {
     .iv = 0,
     .lvl = 15,
@@ -223,7 +223,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt14[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt15[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMuseum2[] = {
     {
     .iv = 0,
     .lvl = 14,
@@ -236,7 +236,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt15[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt16[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntSpaceCenter1[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -244,7 +244,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt16[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt17[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMtPyre1[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -252,7 +252,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt17[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt18[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMtPyre2[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -260,7 +260,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt18[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt19[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMtPyre3[] = {
     {
     .iv = 0,
     .lvl = 30,
@@ -273,7 +273,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt19[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt20[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntWeatherInst4[] = {
     {
     .iv = 0,
     .lvl = 28,
@@ -281,7 +281,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt20[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt21[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout5[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -289,7 +289,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt21[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt22[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout6[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -331,7 +331,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Zander[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Shelly1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_ShellyWeatherInstitute[] = {
     {
     .iv = 50,
     .lvl = 28,
@@ -344,7 +344,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Shelly1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Shelly2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_ShellySeafloorCavern[] = {
     {
     .iv = 100,
     .lvl = 37,
@@ -419,13 +419,13 @@ static const struct TrainerMonNoItemCustomMoves sParty_Felix[] = {
     .iv = 0,
     .lvl = 43,
     .species = SPECIES_MEDICHAM,
-    .moves = MOVE_PSYCHIC, MOVE_NONE, MOVE_NONE, MOVE_NONE
+    .moves = {MOVE_PSYCHIC, MOVE_NONE, MOVE_NONE, MOVE_NONE}
     },
     {
     .iv = 0,
     .lvl = 43,
     .species = SPECIES_CLAYDOL,
-    .moves = MOVE_SKILL_SWAP, MOVE_EARTHQUAKE, MOVE_NONE, MOVE_NONE
+    .moves = {MOVE_SKILL_SWAP, MOVE_EARTHQUAKE, MOVE_NONE, MOVE_NONE}
     }
 };
 
@@ -514,7 +514,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Dusty1[] = {
     .iv = 50,
     .lvl = 23,
     .species = SPECIES_SANDSLASH,
-    .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING
+    .moves = {MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING}
     }
 };
 
@@ -523,19 +523,19 @@ static const struct TrainerMonNoItemCustomMoves sParty_Chip[] = {
     .iv = 50,
     .lvl = 27,
     .species = SPECIES_BALTOY,
-    .moves = MOVE_PSYBEAM, MOVE_SELF_DESTRUCT, MOVE_SANDSTORM, MOVE_ANCIENT_POWER
+    .moves = {MOVE_PSYBEAM, MOVE_SELF_DESTRUCT, MOVE_SANDSTORM, MOVE_ANCIENT_POWER}
     },
     {
     .iv = 50,
     .lvl = 27,
     .species = SPECIES_SANDSHREW,
-    .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING
+    .moves = {MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING}
     },
     {
     .iv = 50,
     .lvl = 27,
     .species = SPECIES_SANDSLASH,
-    .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING
+    .moves = {MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING}
     }
 };
 
@@ -544,13 +544,13 @@ static const struct TrainerMonNoItemCustomMoves sParty_Foster[] = {
     .iv = 100,
     .lvl = 25,
     .species = SPECIES_SANDSHREW,
-    .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING
+    .moves = {MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING}
     },
     {
     .iv = 100,
     .lvl = 25,
     .species = SPECIES_SANDSLASH,
-    .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING
+    .moves = {MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING}
     }
 };
 
@@ -559,7 +559,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Dusty2[] = {
     .iv = 60,
     .lvl = 27,
     .species = SPECIES_SANDSLASH,
-    .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING
+    .moves = {MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING}
     }
 };
 
@@ -568,7 +568,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Dusty3[] = {
     .iv = 70,
     .lvl = 30,
     .species = SPECIES_SANDSLASH,
-    .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING
+    .moves = {MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING}
     }
 };
 
@@ -577,7 +577,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Dusty4[] = {
     .iv = 80,
     .lvl = 33,
     .species = SPECIES_SANDSLASH,
-    .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING
+    .moves = {MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING}
     }
 };
 
@@ -586,7 +586,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Dusty5[] = {
     .iv = 90,
     .lvl = 36,
     .species = SPECIES_SANDSLASH,
-    .moves = MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING
+    .moves = {MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING}
     }
 };
 
@@ -660,13 +660,13 @@ static const struct TrainerMonNoItemCustomMoves sParty_GabbyAndTy6[] = {
     .iv = 250,
     .lvl = 39,
     .species = SPECIES_MAGNETON,
-    .moves = MOVE_SONIC_BOOM, MOVE_THUNDER_WAVE, MOVE_METAL_SOUND, MOVE_THUNDERBOLT
+    .moves = {MOVE_SONIC_BOOM, MOVE_THUNDER_WAVE, MOVE_METAL_SOUND, MOVE_THUNDERBOLT}
     },
     {
     .iv = 250,
     .lvl = 39,
     .species = SPECIES_EXPLOUD,
-    .moves = MOVE_ASTONISH, MOVE_STOMP, MOVE_SUPERSONIC, MOVE_HYPER_VOICE
+    .moves = {MOVE_ASTONISH, MOVE_STOMP, MOVE_SUPERSONIC, MOVE_HYPER_VOICE}
     }
 };
 
@@ -756,7 +756,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Ricky1[] = {
     .iv = 10,
     .lvl = 13,
     .species = SPECIES_ZIGZAGOON,
-    .moves = MOVE_SAND_ATTACK, MOVE_HEADBUTT, MOVE_TAIL_WHIP, MOVE_SURF
+    .moves = {MOVE_SAND_ATTACK, MOVE_HEADBUTT, MOVE_TAIL_WHIP, MOVE_SURF}
     }
 };
 
@@ -786,7 +786,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Ricky2[] = {
     .iv = 10,
     .lvl = 27,
     .species = SPECIES_LINOONE,
-    .moves = MOVE_SAND_ATTACK, MOVE_PIN_MISSILE, MOVE_TAIL_WHIP, MOVE_SURF
+    .moves = {MOVE_SAND_ATTACK, MOVE_PIN_MISSILE, MOVE_TAIL_WHIP, MOVE_SURF}
     }
 };
 
@@ -795,7 +795,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Ricky3[] = {
     .iv = 20,
     .lvl = 30,
     .species = SPECIES_LINOONE,
-    .moves = MOVE_SAND_ATTACK, MOVE_PIN_MISSILE, MOVE_TAIL_WHIP, MOVE_SURF
+    .moves = {MOVE_SAND_ATTACK, MOVE_PIN_MISSILE, MOVE_TAIL_WHIP, MOVE_SURF}
     }
 };
 
@@ -804,7 +804,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Ricky4[] = {
     .iv = 30,
     .lvl = 33,
     .species = SPECIES_LINOONE,
-    .moves = MOVE_SAND_ATTACK, MOVE_PIN_MISSILE, MOVE_TAIL_WHIP, MOVE_SURF
+    .moves = {MOVE_SAND_ATTACK, MOVE_PIN_MISSILE, MOVE_TAIL_WHIP, MOVE_SURF}
     }
 };
 
@@ -813,7 +813,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Ricky5[] = {
     .iv = 40,
     .lvl = 36,
     .species = SPECIES_LINOONE,
-    .moves = MOVE_SAND_ATTACK, MOVE_PIN_MISSILE, MOVE_TAIL_WHIP, MOVE_SURF
+    .moves = {MOVE_SAND_ATTACK, MOVE_PIN_MISSILE, MOVE_TAIL_WHIP, MOVE_SURF}
     }
 };
 
@@ -823,7 +823,7 @@ static const struct TrainerMonItemCustomMoves sParty_Randall[] = {
     .lvl = 26,
     .species = SPECIES_SWELLOW,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_QUICK_ATTACK, MOVE_AGILITY, MOVE_WING_ATTACK, MOVE_NONE
+    .moves = {MOVE_QUICK_ATTACK, MOVE_AGILITY, MOVE_WING_ATTACK, MOVE_NONE}
     }
 };
 
@@ -833,7 +833,7 @@ static const struct TrainerMonItemCustomMoves sParty_Parker[] = {
     .lvl = 26,
     .species = SPECIES_SPINDA,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_TEETER_DANCE, MOVE_DIZZY_PUNCH, MOVE_FOCUS_PUNCH, MOVE_NONE
+    .moves = {MOVE_TEETER_DANCE, MOVE_DIZZY_PUNCH, MOVE_FOCUS_PUNCH, MOVE_NONE}
     }
 };
 
@@ -843,7 +843,7 @@ static const struct TrainerMonItemCustomMoves sParty_George[] = {
     .lvl = 26,
     .species = SPECIES_SLAKOTH,
     .heldItem = ITEM_SITRUS_BERRY,
-    .moves = MOVE_SLACK_OFF, MOVE_COUNTER, MOVE_SHADOW_BALL, MOVE_NONE
+    .moves = {MOVE_SLACK_OFF, MOVE_COUNTER, MOVE_SHADOW_BALL, MOVE_NONE}
     }
 };
 
@@ -853,7 +853,7 @@ static const struct TrainerMonItemCustomMoves sParty_Berke[] = {
     .lvl = 26,
     .species = SPECIES_VIGOROTH,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_FOCUS_ENERGY, MOVE_SLASH, MOVE_NONE, MOVE_NONE
+    .moves = {MOVE_FOCUS_ENERGY, MOVE_SLASH, MOVE_NONE, MOVE_NONE}
     }
 };
 
@@ -862,31 +862,31 @@ static const struct TrainerMonNoItemCustomMoves sParty_Braxton[] = {
     .iv = 100,
     .lvl = 28,
     .species = SPECIES_SWELLOW,
-    .moves = MOVE_FOCUS_ENERGY, MOVE_QUICK_ATTACK, MOVE_WING_ATTACK, MOVE_ENDEAVOR
+    .moves = {MOVE_FOCUS_ENERGY, MOVE_QUICK_ATTACK, MOVE_WING_ATTACK, MOVE_ENDEAVOR}
     },
     {
     .iv = 100,
     .lvl = 28,
     .species = SPECIES_TRAPINCH,
-    .moves = MOVE_BITE, MOVE_DIG, MOVE_FAINT_ATTACK, MOVE_SAND_TOMB
+    .moves = {MOVE_BITE, MOVE_DIG, MOVE_FAINT_ATTACK, MOVE_SAND_TOMB}
     },
     {
     .iv = 100,
     .lvl = 28,
     .species = SPECIES_WAILMER,
-    .moves = MOVE_ROLLOUT, MOVE_WHIRLPOOL, MOVE_ASTONISH, MOVE_WATER_PULSE
+    .moves = {MOVE_ROLLOUT, MOVE_WHIRLPOOL, MOVE_ASTONISH, MOVE_WATER_PULSE}
     },
     {
     .iv = 100,
     .lvl = 28,
     .species = SPECIES_MAGNETON,
-    .moves = MOVE_THUNDERBOLT, MOVE_SUPERSONIC, MOVE_THUNDER_WAVE, MOVE_SONIC_BOOM
+    .moves = {MOVE_THUNDERBOLT, MOVE_SUPERSONIC, MOVE_THUNDER_WAVE, MOVE_SONIC_BOOM}
     },
     {
     .iv = 100,
     .lvl = 28,
     .species = SPECIES_SHIFTRY,
-    .moves = MOVE_GIGA_DRAIN, MOVE_FAINT_ATTACK, MOVE_DOUBLE_TEAM, MOVE_SWAGGER
+    .moves = {MOVE_GIGA_DRAIN, MOVE_FAINT_ATTACK, MOVE_DOUBLE_TEAM, MOVE_SWAGGER}
     }
 };
 
@@ -1115,7 +1115,7 @@ static const struct TrainerMonItemCustomMoves sParty_Mary[] = {
     .lvl = 26,
     .species = SPECIES_DELCATTY,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_FAINT_ATTACK, MOVE_SHOCK_WAVE, MOVE_NONE, MOVE_NONE
+    .moves = {MOVE_FAINT_ATTACK, MOVE_SHOCK_WAVE, MOVE_NONE, MOVE_NONE}
     }
 };
 
@@ -1125,7 +1125,7 @@ static const struct TrainerMonItemCustomMoves sParty_Alexia[] = {
     .lvl = 26,
     .species = SPECIES_WIGGLYTUFF,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_DEFENSE_CURL, MOVE_DOUBLE_EDGE, MOVE_SHADOW_BALL, MOVE_NONE
+    .moves = {MOVE_DEFENSE_CURL, MOVE_DOUBLE_EDGE, MOVE_SHADOW_BALL, MOVE_NONE}
     }
 };
 
@@ -1135,7 +1135,7 @@ static const struct TrainerMonItemCustomMoves sParty_Jody[] = {
     .lvl = 26,
     .species = SPECIES_ZANGOOSE,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_SWORDS_DANCE, MOVE_SLASH, MOVE_NONE, MOVE_NONE
+    .moves = {MOVE_SWORDS_DANCE, MOVE_SLASH, MOVE_NONE, MOVE_NONE}
     }
 };
 
@@ -1144,19 +1144,19 @@ static const struct TrainerMonNoItemCustomMoves sParty_Wendy[] = {
     .iv = 100,
     .lvl = 29,
     .species = SPECIES_MAWILE,
-    .moves = MOVE_BATON_PASS, MOVE_FAINT_ATTACK, MOVE_FAKE_TEARS, MOVE_BITE
+    .moves = {MOVE_BATON_PASS, MOVE_FAINT_ATTACK, MOVE_FAKE_TEARS, MOVE_BITE}
     },
     {
     .iv = 100,
     .lvl = 29,
     .species = SPECIES_ROSELIA,
-    .moves = MOVE_MEGA_DRAIN, MOVE_MAGICAL_LEAF, MOVE_GRASS_WHISTLE, MOVE_LEECH_SEED
+    .moves = {MOVE_MEGA_DRAIN, MOVE_MAGICAL_LEAF, MOVE_GRASS_WHISTLE, MOVE_LEECH_SEED}
     },
     {
     .iv = 100,
     .lvl = 29,
     .species = SPECIES_PELIPPER,
-    .moves = MOVE_FLY, MOVE_WATER_GUN, MOVE_MIST, MOVE_PROTECT
+    .moves = {MOVE_FLY, MOVE_WATER_GUN, MOVE_MIST, MOVE_PROTECT}
     }
 };
 
@@ -1463,18 +1463,18 @@ static const struct TrainerMonItemCustomMoves sParty_Daphne[] = {
     .lvl = 39,
     .species = SPECIES_LUVDISC,
     .heldItem = ITEM_NUGGET,
-    .moves = MOVE_ATTRACT, MOVE_SWEET_KISS, MOVE_FLAIL, MOVE_WATER_PULSE
+    .moves = {MOVE_ATTRACT, MOVE_SWEET_KISS, MOVE_FLAIL, MOVE_WATER_PULSE}
     },
     {
     .iv = 100,
     .lvl = 39,
     .species = SPECIES_LUVDISC,
     .heldItem = ITEM_NUGGET,
-    .moves = MOVE_ATTRACT, MOVE_SAFEGUARD, MOVE_TAKE_DOWN, MOVE_WATER_PULSE
+    .moves = {MOVE_ATTRACT, MOVE_SAFEGUARD, MOVE_TAKE_DOWN, MOVE_WATER_PULSE}
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt23[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntSpaceCenter2[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -1498,7 +1498,7 @@ static const struct TrainerMonItemCustomMoves sParty_Cindy2[] = {
     .lvl = 11,
     .species = SPECIES_ZIGZAGOON,
     .heldItem = ITEM_NUGGET,
-    .moves = MOVE_TACKLE, MOVE_TAIL_WHIP, MOVE_NONE, MOVE_NONE
+    .moves = {MOVE_TACKLE, MOVE_TAIL_WHIP, MOVE_NONE, MOVE_NONE}
     }
 };
 
@@ -1553,7 +1553,7 @@ static const struct TrainerMonItemCustomMoves sParty_Cindy6[] = {
     .lvl = 36,
     .species = SPECIES_LINOONE,
     .heldItem = ITEM_NUGGET,
-    .moves = MOVE_FURY_SWIPES, MOVE_MUD_SPORT, MOVE_ODOR_SLEUTH, MOVE_SAND_ATTACK
+    .moves = {MOVE_FURY_SWIPES, MOVE_MUD_SPORT, MOVE_ODOR_SLEUTH, MOVE_SAND_ATTACK}
     }
 };
 
@@ -1586,13 +1586,13 @@ static const struct TrainerMonNoItemCustomMoves sParty_Jessica1[] = {
     .iv = 0,
     .lvl = 29,
     .species = SPECIES_KECLEON,
-    .moves = MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK
+    .moves = {MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK}
     },
     {
     .iv = 0,
     .lvl = 29,
     .species = SPECIES_SEVIPER,
-    .moves = MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH
+    .moves = {MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH}
     }
 };
 
@@ -1617,19 +1617,19 @@ static const struct TrainerMonNoItemCustomMoves sParty_Olivia[] = {
     .iv = 100,
     .lvl = 35,
     .species = SPECIES_CLAMPERL,
-    .moves = MOVE_IRON_DEFENSE, MOVE_WHIRLPOOL, MOVE_RAIN_DANCE, MOVE_WATER_PULSE
+    .moves = {MOVE_IRON_DEFENSE, MOVE_WHIRLPOOL, MOVE_RAIN_DANCE, MOVE_WATER_PULSE}
     },
     {
     .iv = 100,
     .lvl = 37,
     .species = SPECIES_CORPHISH,
-    .moves = MOVE_TAUNT, MOVE_CRABHAMMER, MOVE_WATER_PULSE, MOVE_NONE
+    .moves = {MOVE_TAUNT, MOVE_CRABHAMMER, MOVE_WATER_PULSE, MOVE_NONE}
     },
     {
     .iv = 100,
     .lvl = 39,
     .species = SPECIES_LOMBRE,
-    .moves = MOVE_UPROAR, MOVE_FURY_SWIPES, MOVE_FAKE_OUT, MOVE_WATER_PULSE
+    .moves = {MOVE_UPROAR, MOVE_FURY_SWIPES, MOVE_FAKE_OUT, MOVE_WATER_PULSE}
     }
 };
 
@@ -1651,13 +1651,13 @@ static const struct TrainerMonNoItemCustomMoves sParty_Jessica2[] = {
     .iv = 10,
     .lvl = 35,
     .species = SPECIES_KECLEON,
-    .moves = MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK
+    .moves = {MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK}
     },
     {
     .iv = 10,
     .lvl = 35,
     .species = SPECIES_SEVIPER,
-    .moves = MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH
+    .moves = {MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH}
     }
 };
 
@@ -1666,13 +1666,13 @@ static const struct TrainerMonNoItemCustomMoves sParty_Jessica3[] = {
     .iv = 20,
     .lvl = 38,
     .species = SPECIES_KECLEON,
-    .moves = MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK
+    .moves = {MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK}
     },
     {
     .iv = 20,
     .lvl = 38,
     .species = SPECIES_SEVIPER,
-    .moves = MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH
+    .moves = {MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH}
     }
 };
 
@@ -1681,13 +1681,13 @@ static const struct TrainerMonNoItemCustomMoves sParty_Jessica4[] = {
     .iv = 30,
     .lvl = 41,
     .species = SPECIES_KECLEON,
-    .moves = MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK
+    .moves = {MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK}
     },
     {
     .iv = 30,
     .lvl = 41,
     .species = SPECIES_SEVIPER,
-    .moves = MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH
+    .moves = {MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH}
     }
 };
 
@@ -1696,13 +1696,13 @@ static const struct TrainerMonNoItemCustomMoves sParty_Jessica5[] = {
     .iv = 40,
     .lvl = 44,
     .species = SPECIES_KECLEON,
-    .moves = MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK
+    .moves = {MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK}
     },
     {
     .iv = 40,
     .lvl = 44,
     .species = SPECIES_SEVIPER,
-    .moves = MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH
+    .moves = {MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH}
     }
 };
 
@@ -1770,7 +1770,7 @@ static const struct TrainerMonItemCustomMoves sParty_Winston5[] = {
     .lvl = 36,
     .species = SPECIES_LINOONE,
     .heldItem = ITEM_NUGGET,
-    .moves = MOVE_FURY_SWIPES, MOVE_MUD_SPORT, MOVE_ODOR_SLEUTH, MOVE_SAND_ATTACK
+    .moves = {MOVE_FURY_SWIPES, MOVE_MUD_SPORT, MOVE_ODOR_SLEUTH, MOVE_SAND_ATTACK}
     }
 };
 
@@ -1803,7 +1803,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Mark[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt24[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMtChimney1[] = {
     {
     .iv = 0,
     .lvl = 20,
@@ -2302,17 +2302,17 @@ static const struct TrainerMonNoItemCustomMoves sParty_Kirk[] = {
     .iv = 100,
     .lvl = 17,
     .species = SPECIES_ELECTRIKE,
-    .moves = MOVE_QUICK_ATTACK, MOVE_THUNDER_WAVE, MOVE_SPARK, MOVE_LEER
+    .moves = {MOVE_QUICK_ATTACK, MOVE_THUNDER_WAVE, MOVE_SPARK, MOVE_LEER}
     },
     {
     .iv = 100,
     .lvl = 17,
     .species = SPECIES_VOLTORB,
-    .moves = MOVE_CHARGE, MOVE_SHOCK_WAVE, MOVE_SCREECH, MOVE_NONE
+    .moves = {MOVE_CHARGE, MOVE_SHOCK_WAVE, MOVE_SCREECH, MOVE_NONE}
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt25[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout7[] = {
     {
     .iv = 0,
     .lvl = 31,
@@ -2325,7 +2325,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt25[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt26[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout8[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -2559,7 +2559,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Drew[] = {
     .iv = 0,
     .lvl = 23,
     .species = SPECIES_SANDSHREW,
-    .moves = MOVE_DIG, MOVE_SAND_ATTACK, MOVE_POISON_STING, MOVE_SLASH
+    .moves = {MOVE_DIG, MOVE_SAND_ATTACK, MOVE_POISON_STING, MOVE_SLASH}
     }
 };
 
@@ -2568,19 +2568,19 @@ static const struct TrainerMonNoItemCustomMoves sParty_Beau[] = {
     .iv = 0,
     .lvl = 21,
     .species = SPECIES_BALTOY,
-    .moves = MOVE_RAPID_SPIN, MOVE_MUD_SLAP, MOVE_PSYBEAM, MOVE_ROCK_TOMB
+    .moves = {MOVE_RAPID_SPIN, MOVE_MUD_SLAP, MOVE_PSYBEAM, MOVE_ROCK_TOMB}
     },
     {
     .iv = 0,
     .lvl = 21,
     .species = SPECIES_SANDSHREW,
-    .moves = MOVE_POISON_STING, MOVE_SAND_ATTACK, MOVE_SCRATCH, MOVE_DIG
+    .moves = {MOVE_POISON_STING, MOVE_SAND_ATTACK, MOVE_SCRATCH, MOVE_DIG}
     },
     {
     .iv = 0,
     .lvl = 21,
     .species = SPECIES_BALTOY,
-    .moves = MOVE_RAPID_SPIN, MOVE_MUD_SLAP, MOVE_PSYBEAM, MOVE_ROCK_TOMB
+    .moves = {MOVE_RAPID_SPIN, MOVE_MUD_SLAP, MOVE_PSYBEAM, MOVE_ROCK_TOMB}
     }
 };
 
@@ -2876,7 +2876,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Edward[] = {
     .iv = 0,
     .lvl = 15,
     .species = SPECIES_ABRA,
-    .moves = MOVE_HIDDEN_POWER, MOVE_NONE, MOVE_NONE, MOVE_NONE
+    .moves = {MOVE_HIDDEN_POWER, MOVE_NONE, MOVE_NONE, MOVE_NONE}
     }
 };
 
@@ -3000,7 +3000,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Jaclyn[] = {
     .iv = 0,
     .lvl = 16,
     .species = SPECIES_ABRA,
-    .moves = MOVE_HIDDEN_POWER, MOVE_NONE, MOVE_NONE, MOVE_NONE
+    .moves = {MOVE_HIDDEN_POWER, MOVE_NONE, MOVE_NONE, MOVE_NONE}
     }
 };
 
@@ -3166,13 +3166,13 @@ static const struct TrainerMonNoItemCustomMoves sParty_Walter3[] = {
     .iv = 20,
     .lvl = 36,
     .species = SPECIES_LINOONE,
-    .moves = MOVE_HEADBUTT, MOVE_SAND_ATTACK, MOVE_ODOR_SLEUTH, MOVE_FURY_SWIPES
+    .moves = {MOVE_HEADBUTT, MOVE_SAND_ATTACK, MOVE_ODOR_SLEUTH, MOVE_FURY_SWIPES}
     },
     {
     .iv = 20,
     .lvl = 36,
     .species = SPECIES_MANECTRIC,
-    .moves = MOVE_QUICK_ATTACK, MOVE_SPARK, MOVE_ODOR_SLEUTH, MOVE_ROAR
+    .moves = {MOVE_QUICK_ATTACK, MOVE_SPARK, MOVE_ODOR_SLEUTH, MOVE_ROAR}
     }
 };
 
@@ -3181,13 +3181,13 @@ static const struct TrainerMonNoItemCustomMoves sParty_Walter4[] = {
     .iv = 30,
     .lvl = 39,
     .species = SPECIES_LINOONE,
-    .moves = MOVE_HEADBUTT, MOVE_SAND_ATTACK, MOVE_ODOR_SLEUTH, MOVE_FURY_SWIPES
+    .moves = {MOVE_HEADBUTT, MOVE_SAND_ATTACK, MOVE_ODOR_SLEUTH, MOVE_FURY_SWIPES}
     },
     {
     .iv = 30,
     .lvl = 39,
     .species = SPECIES_MANECTRIC,
-    .moves = MOVE_QUICK_ATTACK, MOVE_SPARK, MOVE_ODOR_SLEUTH, MOVE_NONE
+    .moves = {MOVE_QUICK_ATTACK, MOVE_SPARK, MOVE_ODOR_SLEUTH, MOVE_NONE}
     }
 };
 
@@ -3196,19 +3196,19 @@ static const struct TrainerMonNoItemCustomMoves sParty_Walter5[] = {
     .iv = 40,
     .lvl = 41,
     .species = SPECIES_LINOONE,
-    .moves = MOVE_HEADBUTT, MOVE_SAND_ATTACK, MOVE_ODOR_SLEUTH, MOVE_FURY_SWIPES
+    .moves = {MOVE_HEADBUTT, MOVE_SAND_ATTACK, MOVE_ODOR_SLEUTH, MOVE_FURY_SWIPES}
     },
     {
     .iv = 40,
     .lvl = 41,
     .species = SPECIES_GOLDUCK,
-    .moves = MOVE_FURY_SWIPES, MOVE_DISABLE, MOVE_CONFUSION, MOVE_PSYCH_UP
+    .moves = {MOVE_FURY_SWIPES, MOVE_DISABLE, MOVE_CONFUSION, MOVE_PSYCH_UP}
     },
     {
     .iv = 40,
     .lvl = 41,
     .species = SPECIES_MANECTRIC,
-    .moves = MOVE_QUICK_ATTACK, MOVE_SPARK, MOVE_ODOR_SLEUTH, MOVE_ROAR
+    .moves = {MOVE_QUICK_ATTACK, MOVE_SPARK, MOVE_ODOR_SLEUTH, MOVE_ROAR}
     }
 };
 
@@ -3218,35 +3218,35 @@ static const struct TrainerMonItemCustomMoves sParty_Sidney[] = {
     .lvl = 46,
     .species = SPECIES_MIGHTYENA,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_ROAR, MOVE_DOUBLE_EDGE, MOVE_SAND_ATTACK, MOVE_CRUNCH
+    .moves = {MOVE_ROAR, MOVE_DOUBLE_EDGE, MOVE_SAND_ATTACK, MOVE_CRUNCH}
     },
     {
     .iv = 250,
     .lvl = 48,
     .species = SPECIES_SHIFTRY,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_TORMENT, MOVE_DOUBLE_TEAM, MOVE_SWAGGER, MOVE_EXTRASENSORY
+    .moves = {MOVE_TORMENT, MOVE_DOUBLE_TEAM, MOVE_SWAGGER, MOVE_EXTRASENSORY}
     },
     {
     .iv = 250,
     .lvl = 46,
     .species = SPECIES_CACTURNE,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_LEECH_SEED, MOVE_FAINT_ATTACK, MOVE_NEEDLE_ARM, MOVE_COTTON_SPORE
+    .moves = {MOVE_LEECH_SEED, MOVE_FAINT_ATTACK, MOVE_NEEDLE_ARM, MOVE_COTTON_SPORE}
     },
     {
     .iv = 250,
     .lvl = 48,
     .species = SPECIES_CRAWDAUNT,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_SURF, MOVE_SWORDS_DANCE, MOVE_STRENGTH, MOVE_FACADE
+    .moves = {MOVE_SURF, MOVE_SWORDS_DANCE, MOVE_STRENGTH, MOVE_FACADE}
     },
     {
     .iv = 255,
     .lvl = 49,
     .species = SPECIES_ABSOL,
     .heldItem = ITEM_SITRUS_BERRY,
-    .moves = MOVE_AERIAL_ACE, MOVE_ROCK_SLIDE, MOVE_SWORDS_DANCE, MOVE_SLASH
+    .moves = {MOVE_AERIAL_ACE, MOVE_ROCK_SLIDE, MOVE_SWORDS_DANCE, MOVE_SLASH}
     }
 };
 
@@ -3256,35 +3256,35 @@ static const struct TrainerMonItemCustomMoves sParty_Phoebe[] = {
     .lvl = 48,
     .species = SPECIES_DUSCLOPS,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_SHADOW_PUNCH, MOVE_CONFUSE_RAY, MOVE_CURSE, MOVE_PROTECT
+    .moves = {MOVE_SHADOW_PUNCH, MOVE_CONFUSE_RAY, MOVE_CURSE, MOVE_PROTECT}
     },
     {
     .iv = 250,
     .lvl = 49,
     .species = SPECIES_BANETTE,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_SHADOW_BALL, MOVE_GRUDGE, MOVE_WILL_O_WISP, MOVE_FAINT_ATTACK
+    .moves = {MOVE_SHADOW_BALL, MOVE_GRUDGE, MOVE_WILL_O_WISP, MOVE_FAINT_ATTACK}
     },
     {
     .iv = 250,
     .lvl = 50,
     .species = SPECIES_SABLEYE,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_SHADOW_BALL, MOVE_DOUBLE_TEAM, MOVE_NIGHT_SHADE, MOVE_FAINT_ATTACK
+    .moves = {MOVE_SHADOW_BALL, MOVE_DOUBLE_TEAM, MOVE_NIGHT_SHADE, MOVE_FAINT_ATTACK}
     },
     {
     .iv = 250,
     .lvl = 49,
     .species = SPECIES_BANETTE,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_SHADOW_BALL, MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_FACADE
+    .moves = {MOVE_SHADOW_BALL, MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_FACADE}
     },
     {
     .iv = 255,
     .lvl = 51,
     .species = SPECIES_DUSCLOPS,
     .heldItem = ITEM_SITRUS_BERRY,
-    .moves = MOVE_SHADOW_BALL, MOVE_ICE_BEAM, MOVE_ROCK_SLIDE, MOVE_EARTHQUAKE
+    .moves = {MOVE_SHADOW_BALL, MOVE_ICE_BEAM, MOVE_ROCK_SLIDE, MOVE_EARTHQUAKE}
     }
 };
 
@@ -3294,35 +3294,35 @@ static const struct TrainerMonItemCustomMoves sParty_Glacia[] = {
     .lvl = 50,
     .species = SPECIES_SEALEO,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_ENCORE, MOVE_BODY_SLAM, MOVE_HAIL, MOVE_ICE_BALL
+    .moves = {MOVE_ENCORE, MOVE_BODY_SLAM, MOVE_HAIL, MOVE_ICE_BALL}
     },
     {
     .iv = 250,
     .lvl = 50,
     .species = SPECIES_GLALIE,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_LIGHT_SCREEN, MOVE_CRUNCH, MOVE_ICY_WIND, MOVE_ICE_BEAM
+    .moves = {MOVE_LIGHT_SCREEN, MOVE_CRUNCH, MOVE_ICY_WIND, MOVE_ICE_BEAM}
     },
     {
     .iv = 250,
     .lvl = 52,
     .species = SPECIES_SEALEO,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_ATTRACT, MOVE_DOUBLE_EDGE, MOVE_HAIL, MOVE_BLIZZARD
+    .moves = {MOVE_ATTRACT, MOVE_DOUBLE_EDGE, MOVE_HAIL, MOVE_BLIZZARD}
     },
     {
     .iv = 250,
     .lvl = 52,
     .species = SPECIES_GLALIE,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_SHADOW_BALL, MOVE_EXPLOSION, MOVE_HAIL, MOVE_ICE_BEAM
+    .moves = {MOVE_SHADOW_BALL, MOVE_EXPLOSION, MOVE_HAIL, MOVE_ICE_BEAM}
     },
     {
     .iv = 255,
     .lvl = 53,
     .species = SPECIES_WALREIN,
     .heldItem = ITEM_SITRUS_BERRY,
-    .moves = MOVE_SURF, MOVE_BODY_SLAM, MOVE_ICE_BEAM, MOVE_SHEER_COLD
+    .moves = {MOVE_SURF, MOVE_BODY_SLAM, MOVE_ICE_BEAM, MOVE_SHEER_COLD}
     }
 };
 
@@ -3332,35 +3332,35 @@ static const struct TrainerMonItemCustomMoves sParty_Drake[] = {
     .lvl = 52,
     .species = SPECIES_SHELGON,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_ROCK_TOMB, MOVE_DRAGON_CLAW, MOVE_PROTECT, MOVE_DOUBLE_EDGE
+    .moves = {MOVE_ROCK_TOMB, MOVE_DRAGON_CLAW, MOVE_PROTECT, MOVE_DOUBLE_EDGE}
     },
     {
     .iv = 250,
     .lvl = 54,
     .species = SPECIES_ALTARIA,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_DOUBLE_EDGE, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE, MOVE_AERIAL_ACE
+    .moves = {MOVE_DOUBLE_EDGE, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE, MOVE_AERIAL_ACE}
     },
     {
     .iv = 250,
     .lvl = 53,
     .species = SPECIES_KINGDRA,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_SMOKESCREEN, MOVE_DRAGON_DANCE, MOVE_SURF, MOVE_BODY_SLAM
+    .moves = {MOVE_SMOKESCREEN, MOVE_DRAGON_DANCE, MOVE_SURF, MOVE_BODY_SLAM}
     },
     {
     .iv = 250,
     .lvl = 53,
     .species = SPECIES_FLYGON,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_FLAMETHROWER, MOVE_CRUNCH, MOVE_DRAGON_BREATH, MOVE_EARTHQUAKE
+    .moves = {MOVE_FLAMETHROWER, MOVE_CRUNCH, MOVE_DRAGON_BREATH, MOVE_EARTHQUAKE}
     },
     {
     .iv = 255,
     .lvl = 55,
     .species = SPECIES_SALAMENCE,
     .heldItem = ITEM_SITRUS_BERRY,
-    .moves = MOVE_FLAMETHROWER, MOVE_DRAGON_CLAW, MOVE_ROCK_SLIDE, MOVE_CRUNCH
+    .moves = {MOVE_FLAMETHROWER, MOVE_DRAGON_CLAW, MOVE_ROCK_SLIDE, MOVE_CRUNCH}
     }
 };
 
@@ -3370,21 +3370,21 @@ static const struct TrainerMonItemCustomMoves sParty_Roxanne1[] = {
     .lvl = 12,
     .species = SPECIES_GEODUDE,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_TACKLE, MOVE_DEFENSE_CURL, MOVE_ROCK_THROW, MOVE_ROCK_TOMB
+    .moves = {MOVE_TACKLE, MOVE_DEFENSE_CURL, MOVE_ROCK_THROW, MOVE_ROCK_TOMB}
     },
     {
     .iv = 100,
     .lvl = 12,
     .species = SPECIES_GEODUDE,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_TACKLE, MOVE_DEFENSE_CURL, MOVE_ROCK_THROW, MOVE_ROCK_TOMB
+    .moves = {MOVE_TACKLE, MOVE_DEFENSE_CURL, MOVE_ROCK_THROW, MOVE_ROCK_TOMB}
     },
     {
     .iv = 200,
     .lvl = 15,
     .species = SPECIES_NOSEPASS,
     .heldItem = ITEM_ORAN_BERRY,
-    .moves = MOVE_BLOCK, MOVE_HARDEN, MOVE_TACKLE, MOVE_ROCK_TOMB
+    .moves = {MOVE_BLOCK, MOVE_HARDEN, MOVE_TACKLE, MOVE_ROCK_TOMB}
     }
 };
 
@@ -3394,21 +3394,21 @@ static const struct TrainerMonItemCustomMoves sParty_Brawly1[] = {
     .lvl = 16,
     .species = SPECIES_MACHOP,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_KARATE_CHOP, MOVE_LOW_KICK, MOVE_SEISMIC_TOSS, MOVE_BULK_UP
+    .moves = {MOVE_KARATE_CHOP, MOVE_LOW_KICK, MOVE_SEISMIC_TOSS, MOVE_BULK_UP}
     },
     {
     .iv = 100,
     .lvl = 16,
     .species = SPECIES_MEDITITE,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_FOCUS_PUNCH, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_BULK_UP
+    .moves = {MOVE_FOCUS_PUNCH, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_BULK_UP}
     },
     {
     .iv = 200,
     .lvl = 19,
     .species = SPECIES_MAKUHITA,
     .heldItem = ITEM_SITRUS_BERRY,
-    .moves = MOVE_ARM_THRUST, MOVE_VITAL_THROW, MOVE_REVERSAL, MOVE_BULK_UP
+    .moves = {MOVE_ARM_THRUST, MOVE_VITAL_THROW, MOVE_REVERSAL, MOVE_BULK_UP}
     }
 };
 
@@ -3418,28 +3418,28 @@ static const struct TrainerMonItemCustomMoves sParty_Wattson1[] = {
     .lvl = 20,
     .species = SPECIES_VOLTORB,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_ROLLOUT, MOVE_SPARK, MOVE_SELF_DESTRUCT, MOVE_SHOCK_WAVE
+    .moves = {MOVE_ROLLOUT, MOVE_SPARK, MOVE_SELF_DESTRUCT, MOVE_SHOCK_WAVE}
     },
     {
     .iv = 200,
     .lvl = 20,
     .species = SPECIES_ELECTRIKE,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_SHOCK_WAVE, MOVE_LEER, MOVE_QUICK_ATTACK, MOVE_HOWL
+    .moves = {MOVE_SHOCK_WAVE, MOVE_LEER, MOVE_QUICK_ATTACK, MOVE_HOWL}
     },
     {
     .iv = 220,
     .lvl = 22,
     .species = SPECIES_MAGNETON,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_SUPERSONIC, MOVE_SHOCK_WAVE, MOVE_THUNDER_WAVE, MOVE_SONIC_BOOM
+    .moves = {MOVE_SUPERSONIC, MOVE_SHOCK_WAVE, MOVE_THUNDER_WAVE, MOVE_SONIC_BOOM}
     },
     {
     .iv = 250,
     .lvl = 24,
     .species = SPECIES_MANECTRIC,
     .heldItem = ITEM_SITRUS_BERRY,
-    .moves = MOVE_QUICK_ATTACK, MOVE_THUNDER_WAVE, MOVE_SHOCK_WAVE, MOVE_HOWL
+    .moves = {MOVE_QUICK_ATTACK, MOVE_THUNDER_WAVE, MOVE_SHOCK_WAVE, MOVE_HOWL}
     }
 };
 
@@ -3449,28 +3449,28 @@ static const struct TrainerMonItemCustomMoves sParty_Flannery1[] = {
     .lvl = 24,
     .species = SPECIES_NUMEL,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_OVERHEAT, MOVE_TAKE_DOWN, MOVE_MAGNITUDE, MOVE_SUNNY_DAY
+    .moves = {MOVE_OVERHEAT, MOVE_TAKE_DOWN, MOVE_MAGNITUDE, MOVE_SUNNY_DAY}
     },
     {
     .iv = 200,
     .lvl = 24,
     .species = SPECIES_SLUGMA,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_OVERHEAT, MOVE_SMOG, MOVE_LIGHT_SCREEN, MOVE_SUNNY_DAY
+    .moves = {MOVE_OVERHEAT, MOVE_SMOG, MOVE_LIGHT_SCREEN, MOVE_SUNNY_DAY}
     },
     {
     .iv = 250,
     .lvl = 26,
     .species = SPECIES_CAMERUPT,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_OVERHEAT, MOVE_TACKLE, MOVE_SUNNY_DAY, MOVE_ATTRACT
+    .moves = {MOVE_OVERHEAT, MOVE_TACKLE, MOVE_SUNNY_DAY, MOVE_ATTRACT}
     },
     {
     .iv = 250,
     .lvl = 29,
     .species = SPECIES_TORKOAL,
     .heldItem = ITEM_WHITE_HERB,
-    .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_BODY_SLAM, MOVE_ATTRACT
+    .moves = {MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_BODY_SLAM, MOVE_ATTRACT}
     }
 };
 
@@ -3480,28 +3480,28 @@ static const struct TrainerMonItemCustomMoves sParty_Norman1[] = {
     .lvl = 27,
     .species = SPECIES_SPINDA,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_TEETER_DANCE, MOVE_PSYBEAM, MOVE_FACADE, MOVE_ENCORE
+    .moves = {MOVE_TEETER_DANCE, MOVE_PSYBEAM, MOVE_FACADE, MOVE_ENCORE}
     },
     {
     .iv = 200,
     .lvl = 27,
     .species = SPECIES_VIGOROTH,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_SLASH, MOVE_FACADE, MOVE_ENCORE, MOVE_FAINT_ATTACK
+    .moves = {MOVE_SLASH, MOVE_FACADE, MOVE_ENCORE, MOVE_FAINT_ATTACK}
     },
     {
     .iv = 200,
     .lvl = 29,
     .species = SPECIES_LINOONE,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_SLASH, MOVE_BELLY_DRUM, MOVE_FACADE, MOVE_HEADBUTT
+    .moves = {MOVE_SLASH, MOVE_BELLY_DRUM, MOVE_FACADE, MOVE_HEADBUTT}
     },
     {
     .iv = 250,
     .lvl = 31,
     .species = SPECIES_SLAKING,
     .heldItem = ITEM_SITRUS_BERRY,
-    .moves = MOVE_COUNTER, MOVE_YAWN, MOVE_FACADE, MOVE_FAINT_ATTACK
+    .moves = {MOVE_COUNTER, MOVE_YAWN, MOVE_FACADE, MOVE_FAINT_ATTACK}
     }
 };
 
@@ -3511,35 +3511,35 @@ static const struct TrainerMonItemCustomMoves sParty_Winona1[] = {
     .lvl = 29,
     .species = SPECIES_SWABLU,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_PERISH_SONG, MOVE_MIRROR_MOVE, MOVE_SAFEGUARD, MOVE_AERIAL_ACE
+    .moves = {MOVE_PERISH_SONG, MOVE_MIRROR_MOVE, MOVE_SAFEGUARD, MOVE_AERIAL_ACE}
     },
     {
     .iv = 210,
     .lvl = 29,
     .species = SPECIES_TROPIUS,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_SUNNY_DAY, MOVE_AERIAL_ACE, MOVE_SOLAR_BEAM, MOVE_SYNTHESIS
+    .moves = {MOVE_SUNNY_DAY, MOVE_AERIAL_ACE, MOVE_SOLAR_BEAM, MOVE_SYNTHESIS}
     },
     {
     .iv = 210,
     .lvl = 30,
     .species = SPECIES_PELIPPER,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_WATER_GUN, MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_AERIAL_ACE
+    .moves = {MOVE_WATER_GUN, MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_AERIAL_ACE}
     },
     {
     .iv = 220,
     .lvl = 31,
     .species = SPECIES_SKARMORY,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_SAND_ATTACK, MOVE_FURY_ATTACK, MOVE_STEEL_WING, MOVE_AERIAL_ACE
+    .moves = {MOVE_SAND_ATTACK, MOVE_FURY_ATTACK, MOVE_STEEL_WING, MOVE_AERIAL_ACE}
     },
     {
     .iv = 255,
     .lvl = 33,
     .species = SPECIES_ALTARIA,
     .heldItem = ITEM_ORAN_BERRY,
-    .moves = MOVE_EARTHQUAKE, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE, MOVE_AERIAL_ACE
+    .moves = {MOVE_EARTHQUAKE, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE, MOVE_AERIAL_ACE}
     }
 };
 
@@ -3549,28 +3549,28 @@ static const struct TrainerMonItemCustomMoves sParty_TateAndLiza1[] = {
     .lvl = 41,
     .species = SPECIES_CLAYDOL,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_PSYCHIC, MOVE_LIGHT_SCREEN
+    .moves = {MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_PSYCHIC, MOVE_LIGHT_SCREEN}
     },
     {
     .iv = 250,
     .lvl = 41,
     .species = SPECIES_XATU,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_PSYCHIC, MOVE_SUNNY_DAY, MOVE_CONFUSE_RAY, MOVE_CALM_MIND
+    .moves = {MOVE_PSYCHIC, MOVE_SUNNY_DAY, MOVE_CONFUSE_RAY, MOVE_CALM_MIND}
     },
     {
     .iv = 250,
     .lvl = 42,
     .species = SPECIES_LUNATONE,
     .heldItem = ITEM_SITRUS_BERRY,
-    .moves = MOVE_LIGHT_SCREEN, MOVE_PSYCHIC, MOVE_HYPNOSIS, MOVE_CALM_MIND
+    .moves = {MOVE_LIGHT_SCREEN, MOVE_PSYCHIC, MOVE_HYPNOSIS, MOVE_CALM_MIND}
     },
     {
     .iv = 250,
     .lvl = 42,
     .species = SPECIES_SOLROCK,
     .heldItem = ITEM_SITRUS_BERRY,
-    .moves = MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_PSYCHIC, MOVE_FLAMETHROWER
+    .moves = {MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_PSYCHIC, MOVE_FLAMETHROWER}
     }
 };
 
@@ -3580,35 +3580,35 @@ static const struct TrainerMonItemCustomMoves sParty_Juan1[] = {
     .lvl = 41,
     .species = SPECIES_LUVDISC,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_WATER_PULSE, MOVE_ATTRACT, MOVE_SWEET_KISS, MOVE_FLAIL
+    .moves = {MOVE_WATER_PULSE, MOVE_ATTRACT, MOVE_SWEET_KISS, MOVE_FLAIL}
     },
     {
     .iv = 200,
     .lvl = 41,
     .species = SPECIES_WHISCASH,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_AMNESIA, MOVE_EARTHQUAKE
+    .moves = {MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_AMNESIA, MOVE_EARTHQUAKE}
     },
     {
     .iv = 200,
     .lvl = 43,
     .species = SPECIES_SEALEO,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_ENCORE, MOVE_BODY_SLAM, MOVE_AURORA_BEAM, MOVE_WATER_PULSE
+    .moves = {MOVE_ENCORE, MOVE_BODY_SLAM, MOVE_AURORA_BEAM, MOVE_WATER_PULSE}
     },
     {
     .iv = 200,
     .lvl = 43,
     .species = SPECIES_CRAWDAUNT,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_WATER_PULSE, MOVE_CRABHAMMER, MOVE_TAUNT, MOVE_LEER
+    .moves = {MOVE_WATER_PULSE, MOVE_CRABHAMMER, MOVE_TAUNT, MOVE_LEER}
     },
     {
     .iv = 250,
     .lvl = 46,
     .species = SPECIES_KINGDRA,
     .heldItem = ITEM_CHESTO_BERRY,
-    .moves = MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_ICE_BEAM, MOVE_REST
+    .moves = {MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_ICE_BEAM, MOVE_REST}
     }
 };
 
@@ -3781,13 +3781,13 @@ static const struct TrainerMonNoItemCustomMoves sParty_KateAndJoy[] = {
     .iv = 0,
     .lvl = 30,
     .species = SPECIES_SPINDA,
-    .moves = MOVE_HYPNOSIS, MOVE_PSYBEAM, MOVE_DIZZY_PUNCH, MOVE_TEETER_DANCE
+    .moves = {MOVE_HYPNOSIS, MOVE_PSYBEAM, MOVE_DIZZY_PUNCH, MOVE_TEETER_DANCE}
     },
     {
     .iv = 0,
     .lvl = 32,
     .species = SPECIES_SLAKING,
-    .moves = MOVE_FOCUS_PUNCH, MOVE_YAWN, MOVE_SLACK_OFF, MOVE_FAINT_ATTACK
+    .moves = {MOVE_FOCUS_PUNCH, MOVE_YAWN, MOVE_SLACK_OFF, MOVE_FAINT_ATTACK}
     }
 };
 
@@ -3796,13 +3796,13 @@ static const struct TrainerMonNoItemCustomMoves sParty_AnnaAndMeg1[] = {
     .iv = 0,
     .lvl = 15,
     .species = SPECIES_ZIGZAGOON,
-    .moves = MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH
+    .moves = {MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH}
     },
     {
     .iv = 0,
     .lvl = 17,
     .species = SPECIES_MAKUHITA,
-    .moves = MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE
+    .moves = {MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE}
     }
 };
 
@@ -3811,13 +3811,13 @@ static const struct TrainerMonNoItemCustomMoves sParty_AnnaAndMeg2[] = {
     .iv = 10,
     .lvl = 28,
     .species = SPECIES_ZIGZAGOON,
-    .moves = MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH
+    .moves = {MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH}
     },
     {
     .iv = 10,
     .lvl = 30,
     .species = SPECIES_MAKUHITA,
-    .moves = MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE
+    .moves = {MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE}
     }
 };
 
@@ -3826,13 +3826,13 @@ static const struct TrainerMonNoItemCustomMoves sParty_AnnaAndMeg3[] = {
     .iv = 20,
     .lvl = 31,
     .species = SPECIES_ZIGZAGOON,
-    .moves = MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH
+    .moves = {MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH}
     },
     {
     .iv = 20,
     .lvl = 33,
     .species = SPECIES_MAKUHITA,
-    .moves = MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE
+    .moves = {MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE}
     }
 };
 
@@ -3841,13 +3841,13 @@ static const struct TrainerMonNoItemCustomMoves sParty_AnnaAndMeg4[] = {
     .iv = 30,
     .lvl = 34,
     .species = SPECIES_LINOONE,
-    .moves = MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH
+    .moves = {MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH}
     },
     {
     .iv = 30,
     .lvl = 36,
     .species = SPECIES_MAKUHITA,
-    .moves = MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE
+    .moves = {MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE}
     }
 };
 
@@ -3856,13 +3856,13 @@ static const struct TrainerMonNoItemCustomMoves sParty_AnnaAndMeg5[] = {
     .iv = 40,
     .lvl = 36,
     .species = SPECIES_LINOONE,
-    .moves = MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH
+    .moves = {MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH}
     },
     {
     .iv = 40,
     .lvl = 38,
     .species = SPECIES_HARIYAMA,
-    .moves = MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE
+    .moves = {MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE}
     }
 };
 
@@ -3896,42 +3896,42 @@ static const struct TrainerMonItemCustomMoves sParty_Colton[] = {
     .lvl = 22,
     .species = SPECIES_SKITTY,
     .heldItem = ITEM_ORAN_BERRY,
-    .moves = MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL
+    .moves = {MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL}
     },
     {
     .iv = 0,
     .lvl = 36,
     .species = SPECIES_SKITTY,
     .heldItem = ITEM_ORAN_BERRY,
-    .moves = MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL
+    .moves = {MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL}
     },
     {
     .iv = 0,
     .lvl = 40,
     .species = SPECIES_SKITTY,
     .heldItem = ITEM_ORAN_BERRY,
-    .moves = MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL
+    .moves = {MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL}
     },
     {
     .iv = 0,
     .lvl = 12,
     .species = SPECIES_SKITTY,
     .heldItem = ITEM_ORAN_BERRY,
-    .moves = MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL
+    .moves = {MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL}
     },
     {
     .iv = 0,
     .lvl = 30,
     .species = SPECIES_SKITTY,
     .heldItem = ITEM_ORAN_BERRY,
-    .moves = MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL
+    .moves = {MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL}
     },
     {
     .iv = 0,
     .lvl = 42,
     .species = SPECIES_DELCATTY,
     .heldItem = ITEM_ORAN_BERRY,
-    .moves = MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL
+    .moves = {MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL}
     }
 };
 
@@ -4098,7 +4098,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Timothy2[] = {
     .iv = 210,
     .lvl = 33,
     .species = SPECIES_HARIYAMA,
-    .moves = MOVE_ARM_THRUST, MOVE_KNOCK_OFF, MOVE_SAND_ATTACK, MOVE_DIG
+    .moves = {MOVE_ARM_THRUST, MOVE_KNOCK_OFF, MOVE_SAND_ATTACK, MOVE_DIG}
     }
 };
 
@@ -4107,7 +4107,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Timothy3[] = {
     .iv = 220,
     .lvl = 36,
     .species = SPECIES_HARIYAMA,
-    .moves = MOVE_ARM_THRUST, MOVE_KNOCK_OFF, MOVE_SAND_ATTACK, MOVE_DIG
+    .moves = {MOVE_ARM_THRUST, MOVE_KNOCK_OFF, MOVE_SAND_ATTACK, MOVE_DIG}
     }
 };
 
@@ -4116,7 +4116,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Timothy4[] = {
     .iv = 230,
     .lvl = 39,
     .species = SPECIES_HARIYAMA,
-    .moves = MOVE_ARM_THRUST, MOVE_BELLY_DRUM, MOVE_SAND_ATTACK, MOVE_DIG
+    .moves = {MOVE_ARM_THRUST, MOVE_BELLY_DRUM, MOVE_SAND_ATTACK, MOVE_DIG}
     }
 };
 
@@ -4125,7 +4125,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Timothy5[] = {
     .iv = 240,
     .lvl = 42,
     .species = SPECIES_HARIYAMA,
-    .moves = MOVE_ARM_THRUST, MOVE_BELLY_DRUM, MOVE_SAND_ATTACK, MOVE_DIG
+    .moves = {MOVE_ARM_THRUST, MOVE_BELLY_DRUM, MOVE_SAND_ATTACK, MOVE_DIG}
     }
 };
 
@@ -4134,7 +4134,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Vicky[] = {
     .iv = 200,
     .lvl = 18,
     .species = SPECIES_MEDITITE,
-    .moves = MOVE_HI_JUMP_KICK, MOVE_MEDITATE, MOVE_CONFUSION, MOVE_DETECT
+    .moves = {MOVE_HI_JUMP_KICK, MOVE_MEDITATE, MOVE_CONFUSION, MOVE_DETECT}
     }
 };
 
@@ -4229,7 +4229,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Josh[] = {
     .iv = 100,
     .lvl = 10,
     .species = SPECIES_GEODUDE,
-    .moves = MOVE_TACKLE, MOVE_NONE, MOVE_NONE, MOVE_NONE
+    .moves = {MOVE_TACKLE, MOVE_NONE, MOVE_NONE, MOVE_NONE}
     }
 };
 
@@ -4259,13 +4259,13 @@ static const struct TrainerMonNoItemCustomMoves sParty_Ben[] = {
     .iv = 150,
     .lvl = 17,
     .species = SPECIES_ZIGZAGOON,
-    .moves = MOVE_HEADBUTT, MOVE_SAND_ATTACK, MOVE_GROWL, MOVE_THUNDERBOLT
+    .moves = {MOVE_HEADBUTT, MOVE_SAND_ATTACK, MOVE_GROWL, MOVE_THUNDERBOLT}
     },
     {
     .iv = 150,
     .lvl = 17,
     .species = SPECIES_GULPIN,
-    .moves = MOVE_AMNESIA, MOVE_SLUDGE, MOVE_YAWN, MOVE_POUND
+    .moves = {MOVE_AMNESIA, MOVE_SLUDGE, MOVE_YAWN, MOVE_POUND}
     }
 };
 
@@ -4274,13 +4274,13 @@ static const struct TrainerMonNoItemCustomMoves sParty_Quincy[] = {
     .iv = 100,
     .lvl = 43,
     .species = SPECIES_SLAKING,
-    .moves = MOVE_ATTRACT, MOVE_ICE_BEAM, MOVE_THUNDERBOLT, MOVE_FLAMETHROWER
+    .moves = {MOVE_ATTRACT, MOVE_ICE_BEAM, MOVE_THUNDERBOLT, MOVE_FLAMETHROWER}
     },
     {
     .iv = 100,
     .lvl = 43,
     .species = SPECIES_DUSCLOPS,
-    .moves = MOVE_SKILL_SWAP, MOVE_PROTECT, MOVE_WILL_O_WISP, MOVE_TOXIC
+    .moves = {MOVE_SKILL_SWAP, MOVE_PROTECT, MOVE_WILL_O_WISP, MOVE_TOXIC}
     }
 };
 
@@ -4289,13 +4289,13 @@ static const struct TrainerMonNoItemCustomMoves sParty_Katelynn[] = {
     .iv = 100,
     .lvl = 43,
     .species = SPECIES_GARDEVOIR,
-    .moves = MOVE_SKILL_SWAP, MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_CALM_MIND
+    .moves = {MOVE_SKILL_SWAP, MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_CALM_MIND}
     },
     {
     .iv = 100,
     .lvl = 43,
     .species = SPECIES_SLAKING,
-    .moves = MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_AERIAL_ACE, MOVE_BRICK_BREAK
+    .moves = {MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_AERIAL_ACE, MOVE_BRICK_BREAK}
     }
 };
 
@@ -4417,42 +4417,42 @@ static const struct TrainerMonItemCustomMoves sParty_Wallace[] = {
     .lvl = 57,
     .species = SPECIES_WAILORD,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_RAIN_DANCE, MOVE_WATER_SPOUT, MOVE_DOUBLE_EDGE, MOVE_BLIZZARD
+    .moves = {MOVE_RAIN_DANCE, MOVE_WATER_SPOUT, MOVE_DOUBLE_EDGE, MOVE_BLIZZARD}
     },
     {
     .iv = 255,
     .lvl = 55,
     .species = SPECIES_TENTACRUEL,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_TOXIC, MOVE_HYDRO_PUMP, MOVE_SLUDGE_BOMB, MOVE_ICE_BEAM
+    .moves = {MOVE_TOXIC, MOVE_HYDRO_PUMP, MOVE_SLUDGE_BOMB, MOVE_ICE_BEAM}
     },
     {
     .iv = 255,
     .lvl = 56,
     .species = SPECIES_LUDICOLO,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_GIGA_DRAIN, MOVE_SURF, MOVE_LEECH_SEED, MOVE_DOUBLE_TEAM
+    .moves = {MOVE_GIGA_DRAIN, MOVE_SURF, MOVE_LEECH_SEED, MOVE_DOUBLE_TEAM}
     },
     {
     .iv = 255,
     .lvl = 56,
     .species = SPECIES_WHISCASH,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_EARTHQUAKE, MOVE_SURF, MOVE_AMNESIA, MOVE_HYPER_BEAM
+    .moves = {MOVE_EARTHQUAKE, MOVE_SURF, MOVE_AMNESIA, MOVE_HYPER_BEAM}
     },
     {
     .iv = 255,
     .lvl = 56,
     .species = SPECIES_GYARADOS,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_DRAGON_DANCE, MOVE_EARTHQUAKE, MOVE_HYPER_BEAM, MOVE_SURF
+    .moves = {MOVE_DRAGON_DANCE, MOVE_EARTHQUAKE, MOVE_HYPER_BEAM, MOVE_SURF}
     },
     {
     .iv = 255,
     .lvl = 58,
     .species = SPECIES_MILOTIC,
     .heldItem = ITEM_SITRUS_BERRY,
-    .moves = MOVE_RECOVER, MOVE_SURF, MOVE_ICE_BEAM, MOVE_TOXIC
+    .moves = {MOVE_RECOVER, MOVE_SURF, MOVE_ICE_BEAM, MOVE_TOXIC}
     }
 };
 
@@ -5187,7 +5187,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Aaron[] = {
     .iv = 255,
     .lvl = 34,
     .species = SPECIES_BAGON,
-    .moves = MOVE_DRAGON_BREATH, MOVE_HEADBUTT, MOVE_FOCUS_ENERGY, MOVE_EMBER
+    .moves = {MOVE_DRAGON_BREATH, MOVE_HEADBUTT, MOVE_FOCUS_ENERGY, MOVE_EMBER}
     }
 };
 
@@ -5424,14 +5424,14 @@ static const struct TrainerMonItemCustomMoves sParty_Dianne[] = {
     .lvl = 43,
     .species = SPECIES_CLAYDOL,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_SKILL_SWAP, MOVE_EARTHQUAKE, MOVE_NONE, MOVE_NONE
+    .moves = {MOVE_SKILL_SWAP, MOVE_EARTHQUAKE, MOVE_NONE, MOVE_NONE}
     },
     {
     .iv = 0,
     .lvl = 43,
     .species = SPECIES_LANTURN,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_THUNDERBOLT, MOVE_EARTHQUAKE, MOVE_NONE, MOVE_NONE
+    .moves = {MOVE_THUNDERBOLT, MOVE_EARTHQUAKE, MOVE_NONE, MOVE_NONE}
     }
 };
 
@@ -5448,19 +5448,19 @@ static const struct TrainerMonNoItemCustomMoves sParty_Lao1[] = {
     .iv = 0,
     .lvl = 17,
     .species = SPECIES_KOFFING,
-    .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SMOG, MOVE_SELF_DESTRUCT
+    .moves = {MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SMOG, MOVE_SELF_DESTRUCT}
     },
     {
     .iv = 0,
     .lvl = 17,
     .species = SPECIES_KOFFING,
-    .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SMOG, MOVE_SELF_DESTRUCT
+    .moves = {MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SMOG, MOVE_SELF_DESTRUCT}
     },
     {
     .iv = 0,
     .lvl = 17,
     .species = SPECIES_KOFFING,
-    .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT
+    .moves = {MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT}
     }
 };
 
@@ -5482,25 +5482,25 @@ static const struct TrainerMonNoItemCustomMoves sParty_Lao2[] = {
     .iv = 0,
     .lvl = 24,
     .species = SPECIES_KOFFING,
-    .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT
+    .moves = {MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT}
     },
     {
     .iv = 0,
     .lvl = 24,
     .species = SPECIES_KOFFING,
-    .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE
+    .moves = {MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE}
     },
     {
     .iv = 0,
     .lvl = 24,
     .species = SPECIES_KOFFING,
-    .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT
+    .moves = {MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT}
     },
     {
     .iv = 0,
     .lvl = 26,
     .species = SPECIES_KOFFING,
-    .moves = MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE, MOVE_NONE
+    .moves = {MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE, MOVE_NONE}
     }
 };
 
@@ -5509,25 +5509,25 @@ static const struct TrainerMonNoItemCustomMoves sParty_Lao3[] = {
     .iv = 20,
     .lvl = 27,
     .species = SPECIES_KOFFING,
-    .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT
+    .moves = {MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT}
     },
     {
     .iv = 20,
     .lvl = 27,
     .species = SPECIES_KOFFING,
-    .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT
+    .moves = {MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT}
     },
     {
     .iv = 20,
     .lvl = 27,
     .species = SPECIES_KOFFING,
-    .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE
+    .moves = {MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE}
     },
     {
     .iv = 20,
     .lvl = 29,
     .species = SPECIES_KOFFING,
-    .moves = MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE, MOVE_NONE
+    .moves = {MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE, MOVE_NONE}
     }
 };
 
@@ -5536,25 +5536,25 @@ static const struct TrainerMonNoItemCustomMoves sParty_Lao4[] = {
     .iv = 30,
     .lvl = 30,
     .species = SPECIES_KOFFING,
-    .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE
+    .moves = {MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE}
     },
     {
     .iv = 30,
     .lvl = 30,
     .species = SPECIES_KOFFING,
-    .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE
+    .moves = {MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE}
     },
     {
     .iv = 30,
     .lvl = 30,
     .species = SPECIES_KOFFING,
-    .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE
+    .moves = {MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE}
     },
     {
     .iv = 30,
     .lvl = 32,
     .species = SPECIES_KOFFING,
-    .moves = MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE, MOVE_NONE
+    .moves = {MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE, MOVE_NONE}
     }
 };
 
@@ -5564,28 +5564,28 @@ static const struct TrainerMonItemCustomMoves sParty_Lao5[] = {
     .lvl = 33,
     .species = SPECIES_KOFFING,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE
+    .moves = {MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE}
     },
     {
     .iv = 40,
     .lvl = 33,
     .species = SPECIES_KOFFING,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT
+    .moves = {MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT}
     },
     {
     .iv = 40,
     .lvl = 33,
     .species = SPECIES_KOFFING,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT
+    .moves = {MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT}
     },
     {
     .iv = 40,
     .lvl = 35,
     .species = SPECIES_WEEZING,
     .heldItem = ITEM_SMOKE_BALL,
-    .moves = MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE, MOVE_NONE
+    .moves = {MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE, MOVE_NONE}
     }
 };
 
@@ -5691,7 +5691,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Madeline1[] = {
     .iv = 0,
     .lvl = 19,
     .species = SPECIES_NUMEL,
-    .moves = MOVE_EMBER, MOVE_TACKLE, MOVE_MAGNITUDE, MOVE_SUNNY_DAY
+    .moves = {MOVE_EMBER, MOVE_TACKLE, MOVE_MAGNITUDE, MOVE_SUNNY_DAY}
     }
 };
 
@@ -5713,7 +5713,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Angelica[] = {
     .iv = 50,
     .lvl = 30,
     .species = SPECIES_CASTFORM,
-    .moves = MOVE_RAIN_DANCE, MOVE_WEATHER_BALL, MOVE_THUNDER, MOVE_WATER_PULSE
+    .moves = {MOVE_RAIN_DANCE, MOVE_WEATHER_BALL, MOVE_THUNDER, MOVE_WATER_PULSE}
     }
 };
 
@@ -5722,7 +5722,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Madeline2[] = {
     .iv = 10,
     .lvl = 29,
     .species = SPECIES_NUMEL,
-    .moves = MOVE_EMBER, MOVE_TACKLE, MOVE_MAGNITUDE, MOVE_SUNNY_DAY
+    .moves = {MOVE_EMBER, MOVE_TACKLE, MOVE_MAGNITUDE, MOVE_SUNNY_DAY}
     }
 };
 
@@ -5731,7 +5731,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Madeline3[] = {
     .iv = 20,
     .lvl = 32,
     .species = SPECIES_NUMEL,
-    .moves = MOVE_EMBER, MOVE_TAKE_DOWN, MOVE_MAGNITUDE, MOVE_SUNNY_DAY
+    .moves = {MOVE_EMBER, MOVE_TAKE_DOWN, MOVE_MAGNITUDE, MOVE_SUNNY_DAY}
     }
 };
 
@@ -5740,13 +5740,13 @@ static const struct TrainerMonNoItemCustomMoves sParty_Madeline4[] = {
     .iv = 30,
     .lvl = 34,
     .species = SPECIES_ROSELIA,
-    .moves = MOVE_LEECH_SEED, MOVE_MEGA_DRAIN, MOVE_GRASS_WHISTLE, MOVE_SUNNY_DAY
+    .moves = {MOVE_LEECH_SEED, MOVE_MEGA_DRAIN, MOVE_GRASS_WHISTLE, MOVE_SUNNY_DAY}
     },
     {
     .iv = 30,
     .lvl = 34,
     .species = SPECIES_NUMEL,
-    .moves = MOVE_FLAMETHROWER, MOVE_TAKE_DOWN, MOVE_MAGNITUDE, MOVE_SUNNY_DAY
+    .moves = {MOVE_FLAMETHROWER, MOVE_TAKE_DOWN, MOVE_MAGNITUDE, MOVE_SUNNY_DAY}
     }
 };
 
@@ -5755,13 +5755,13 @@ static const struct TrainerMonNoItemCustomMoves sParty_Madeline5[] = {
     .iv = 40,
     .lvl = 37,
     .species = SPECIES_ROSELIA,
-    .moves = MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY
+    .moves = {MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY}
     },
     {
     .iv = 40,
     .lvl = 37,
     .species = SPECIES_CAMERUPT,
-    .moves = MOVE_FLAMETHROWER, MOVE_TAKE_DOWN, MOVE_EARTHQUAKE, MOVE_SUNNY_DAY
+    .moves = {MOVE_FLAMETHROWER, MOVE_TAKE_DOWN, MOVE_EARTHQUAKE, MOVE_SUNNY_DAY}
     }
 };
 
@@ -6064,13 +6064,13 @@ static const struct TrainerMonNoItemCustomMoves sParty_Heidi[] = {
     .iv = 0,
     .lvl = 22,
     .species = SPECIES_SANDSHREW,
-    .moves = MOVE_DIG, MOVE_SAND_ATTACK, MOVE_POISON_STING, MOVE_SLASH
+    .moves = {MOVE_DIG, MOVE_SAND_ATTACK, MOVE_POISON_STING, MOVE_SLASH}
     },
     {
     .iv = 0,
     .lvl = 22,
     .species = SPECIES_BALTOY,
-    .moves = MOVE_RAPID_SPIN, MOVE_MUD_SLAP, MOVE_PSYBEAM, MOVE_ROCK_TOMB
+    .moves = {MOVE_RAPID_SPIN, MOVE_MUD_SLAP, MOVE_PSYBEAM, MOVE_ROCK_TOMB}
     }
 };
 
@@ -6079,13 +6079,13 @@ static const struct TrainerMonNoItemCustomMoves sParty_Becky[] = {
     .iv = 0,
     .lvl = 22,
     .species = SPECIES_SANDSHREW,
-    .moves = MOVE_SAND_ATTACK, MOVE_POISON_STING, MOVE_SLASH, MOVE_DIG
+    .moves = {MOVE_SAND_ATTACK, MOVE_POISON_STING, MOVE_SLASH, MOVE_DIG}
     },
     {
     .iv = 0,
     .lvl = 22,
     .species = SPECIES_MARILL,
-    .moves = MOVE_ROLLOUT, MOVE_BUBBLE_BEAM, MOVE_TAIL_WHIP, MOVE_DEFENSE_CURL
+    .moves = {MOVE_ROLLOUT, MOVE_BUBBLE_BEAM, MOVE_TAIL_WHIP, MOVE_DEFENSE_CURL}
     }
 };
 
@@ -6151,7 +6151,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Cedric[] = {
     .iv = 0,
     .lvl = 32,
     .species = SPECIES_WOBBUFFET,
-    .moves = MOVE_DESTINY_BOND, MOVE_SAFEGUARD, MOVE_COUNTER, MOVE_MIRROR_COAT
+    .moves = {MOVE_DESTINY_BOND, MOVE_SAFEGUARD, MOVE_COUNTER, MOVE_MIRROR_COAT}
     }
 };
 
@@ -6310,13 +6310,13 @@ static const struct TrainerMonNoItemCustomMoves sParty_GinaAndMia2[] = {
     .iv = 0,
     .lvl = 10,
     .species = SPECIES_DUSKULL,
-    .moves = MOVE_NIGHT_SHADE, MOVE_DISABLE, MOVE_NONE, MOVE_NONE
+    .moves = {MOVE_NIGHT_SHADE, MOVE_DISABLE, MOVE_NONE, MOVE_NONE}
     },
     {
     .iv = 0,
     .lvl = 10,
     .species = SPECIES_SHROOMISH,
-    .moves = MOVE_ABSORB, MOVE_LEECH_SEED, MOVE_NONE, MOVE_NONE
+    .moves = {MOVE_ABSORB, MOVE_LEECH_SEED, MOVE_NONE, MOVE_NONE}
     }
 };
 
@@ -6338,13 +6338,13 @@ static const struct TrainerMonNoItemCustomMoves sParty_AmyAndLiv5[] = {
     .iv = 30,
     .lvl = 33,
     .species = SPECIES_PLUSLE,
-    .moves = MOVE_SPARK, MOVE_CHARGE, MOVE_FAKE_TEARS, MOVE_HELPING_HAND
+    .moves = {MOVE_SPARK, MOVE_CHARGE, MOVE_FAKE_TEARS, MOVE_HELPING_HAND}
     },
     {
     .iv = 30,
     .lvl = 33,
     .species = SPECIES_MINUN,
-    .moves = MOVE_SPARK, MOVE_CHARGE, MOVE_CHARM, MOVE_HELPING_HAND
+    .moves = {MOVE_SPARK, MOVE_CHARGE, MOVE_CHARM, MOVE_HELPING_HAND}
     }
 };
 
@@ -6353,13 +6353,13 @@ static const struct TrainerMonNoItemCustomMoves sParty_AmyAndLiv6[] = {
     .iv = 40,
     .lvl = 36,
     .species = SPECIES_PLUSLE,
-    .moves = MOVE_THUNDER, MOVE_CHARGE, MOVE_FAKE_TEARS, MOVE_HELPING_HAND
+    .moves = {MOVE_THUNDER, MOVE_CHARGE, MOVE_FAKE_TEARS, MOVE_HELPING_HAND}
     },
     {
     .iv = 40,
     .lvl = 36,
     .species = SPECIES_MINUN,
-    .moves = MOVE_THUNDER, MOVE_CHARGE, MOVE_CHARM, MOVE_HELPING_HAND
+    .moves = {MOVE_THUNDER, MOVE_CHARGE, MOVE_CHARM, MOVE_HELPING_HAND}
     }
 };
 
@@ -6545,14 +6545,14 @@ static const struct TrainerMonItemCustomMoves sParty_Annika[] = {
     .lvl = 39,
     .species = SPECIES_FEEBAS,
     .heldItem = ITEM_ORAN_BERRY,
-    .moves = MOVE_FLAIL, MOVE_WATER_PULSE, MOVE_RETURN, MOVE_ATTRACT
+    .moves = {MOVE_FLAIL, MOVE_WATER_PULSE, MOVE_RETURN, MOVE_ATTRACT}
     },
     {
     .iv = 100,
     .lvl = 39,
     .species = SPECIES_FEEBAS,
     .heldItem = ITEM_ORAN_BERRY,
-    .moves = MOVE_FLAIL, MOVE_WATER_PULSE, MOVE_RETURN, MOVE_ATTRACT
+    .moves = {MOVE_FLAIL, MOVE_WATER_PULSE, MOVE_RETURN, MOVE_ATTRACT}
     }
 };
 
@@ -6569,7 +6569,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Jonas[] = {
     .iv = 0,
     .lvl = 31,
     .species = SPECIES_KOFFING,
-    .moves = MOVE_TOXIC, MOVE_THUNDER, MOVE_SELF_DESTRUCT, MOVE_SLUDGE_BOMB
+    .moves = {MOVE_TOXIC, MOVE_THUNDER, MOVE_SELF_DESTRUCT, MOVE_SLUDGE_BOMB}
     }
 };
 
@@ -6578,7 +6578,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Kayley[] = {
     .iv = 0,
     .lvl = 31,
     .species = SPECIES_CASTFORM,
-    .moves = MOVE_SUNNY_DAY, MOVE_WEATHER_BALL, MOVE_FLAMETHROWER, MOVE_SOLAR_BEAM
+    .moves = {MOVE_SUNNY_DAY, MOVE_WEATHER_BALL, MOVE_FLAMETHROWER, MOVE_SOLAR_BEAM}
     }
 };
 
@@ -6614,7 +6614,7 @@ static const struct TrainerMonItemCustomMoves sParty_Marley[] = {
     .lvl = 34,
     .species = SPECIES_MANECTRIC,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_BITE, MOVE_ROAR, MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT
+    .moves = {MOVE_BITE, MOVE_ROAR, MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT}
     }
 };
 
@@ -6678,7 +6678,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Hector[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Tabitha1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_TabithaMossdeep[] = {
     {
     .iv = 100,
     .lvl = 36,
@@ -6748,40 +6748,40 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Edwin5[] = {
     }
 };
 
-static const struct TrainerMonNoItemCustomMoves sParty_Wally1[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_WallyVR1[] = {
     {
     .iv = 150,
     .lvl = 44,
     .species = SPECIES_ALTARIA,
-    .moves = MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE
+    .moves = {MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE}
     },
     {
     .iv = 150,
     .lvl = 43,
     .species = SPECIES_DELCATTY,
-    .moves = MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK
+    .moves = {MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK}
     },
     {
     .iv = 150,
     .lvl = 44,
     .species = SPECIES_ROSELIA,
-    .moves = MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC
+    .moves = {MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC}
     },
     {
     .iv = 150,
     .lvl = 41,
     .species = SPECIES_MAGNETON,
-    .moves = MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH
+    .moves = {MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH}
     },
     {
     .iv = 250,
     .lvl = 45,
     .species = SPECIES_GARDEVOIR,
-    .moves = MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT
+    .moves = {MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT}
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Brendan1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute103Mudkip[] = {
     {
     .iv = 0,
     .lvl = 5,
@@ -6789,7 +6789,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Brendan1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Brendan2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute110Mudkip[] = {
     {
     .iv = 50,
     .lvl = 18,
@@ -6807,7 +6807,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Brendan2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Brendan3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute119Mudkip[] = {
     {
     .iv = 100,
     .lvl = 29,
@@ -6825,7 +6825,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Brendan3[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Brendan4[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute103Treecko[] = {
     {
     .iv = 0,
     .lvl = 5,
@@ -6833,7 +6833,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Brendan4[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Brendan5[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute110Treecko[] = {
     {
     .iv = 50,
     .lvl = 18,
@@ -6851,7 +6851,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Brendan5[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Brendan6[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute119Treecko[] = {
     {
     .iv = 100,
     .lvl = 29,
@@ -6869,7 +6869,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Brendan6[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Brendan7[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute103Torchic[] = {
     {
     .iv = 0,
     .lvl = 5,
@@ -6877,7 +6877,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Brendan7[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Brendan8[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute110Torchic[] = {
     {
     .iv = 50,
     .lvl = 18,
@@ -6895,7 +6895,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Brendan8[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Brendan9[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute119Torchic[] = {
     {
     .iv = 100,
     .lvl = 29,
@@ -6913,7 +6913,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Brendan9[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_May1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute103Mudkip[] = {
     {
     .iv = 0,
     .lvl = 5,
@@ -6921,7 +6921,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_May1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_May2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute110Mudkip[] = {
     {
     .iv = 50,
     .lvl = 18,
@@ -6939,7 +6939,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_May2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_May3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute119Mudkip[] = {
     {
     .iv = 100,
     .lvl = 29,
@@ -6957,7 +6957,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_May3[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_May4[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute103Treecko[] = {
     {
     .iv = 0,
     .lvl = 5,
@@ -6965,7 +6965,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_May4[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_May5[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute110Treecko[] = {
     {
     .iv = 50,
     .lvl = 18,
@@ -6983,7 +6983,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_May5[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_May6[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute119Treecko[] = {
     {
     .iv = 100,
     .lvl = 29,
@@ -7001,7 +7001,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_May6[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_May7[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute103Torchic[] = {
     {
     .iv = 0,
     .lvl = 5,
@@ -7009,7 +7009,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_May7[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_May8[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute110Torchic[] = {
     {
     .iv = 50,
     .lvl = 18,
@@ -7027,7 +7027,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_May8[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_May9[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute119Torchic[] = {
     {
     .iv = 100,
     .lvl = 29,
@@ -7091,13 +7091,13 @@ static const struct TrainerMonNoItemCustomMoves sParty_Mitchell[] = {
     .iv = 0,
     .lvl = 43,
     .species = SPECIES_LUNATONE,
-    .moves = MOVE_EXPLOSION, MOVE_REFLECT, MOVE_LIGHT_SCREEN, MOVE_PSYCHIC
+    .moves = {MOVE_EXPLOSION, MOVE_REFLECT, MOVE_LIGHT_SCREEN, MOVE_PSYCHIC}
     },
     {
     .iv = 0,
     .lvl = 43,
     .species = SPECIES_SOLROCK,
-    .moves = MOVE_EXPLOSION, MOVE_REFLECT, MOVE_LIGHT_SCREEN, MOVE_SHADOW_BALL
+    .moves = {MOVE_EXPLOSION, MOVE_REFLECT, MOVE_LIGHT_SCREEN, MOVE_SHADOW_BALL}
     }
 };
 
@@ -7594,7 +7594,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Julio[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt27[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntSeafloorCavern5[] = {
     {
     .iv = 50,
     .lvl = 35,
@@ -7607,7 +7607,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt27[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt28[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntUnused[] = {
     {
     .iv = 0,
     .lvl = 31,
@@ -7620,7 +7620,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt28[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt29[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMtPyre4[] = {
     {
     .iv = 0,
     .lvl = 30,
@@ -7633,7 +7633,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt29[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt30[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntJaggedPass[] = {
     {
     .iv = 50,
     .lvl = 22,
@@ -7705,14 +7705,14 @@ static const struct TrainerMonItemCustomMoves sParty_Athena[] = {
     .lvl = 32,
     .species = SPECIES_MANECTRIC,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_THUNDER, MOVE_THUNDER_WAVE, MOVE_QUICK_ATTACK, MOVE_NONE
+    .moves = {MOVE_THUNDER, MOVE_THUNDER_WAVE, MOVE_QUICK_ATTACK, MOVE_NONE}
     },
     {
     .iv = 100,
     .lvl = 32,
     .species = SPECIES_LINOONE,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_SURF, MOVE_THIEF, MOVE_NONE, MOVE_NONE
+    .moves = {MOVE_SURF, MOVE_THIEF, MOVE_NONE, MOVE_NONE}
     }
 };
 
@@ -7724,7 +7724,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Harrison[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt31[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMtChimney2[] = {
     {
     .iv = 0,
     .lvl = 20,
@@ -7780,7 +7780,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Nicholas[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt32[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntSpaceCenter3[] = {
     {
     .iv = 0,
     .lvl = 31,
@@ -7793,7 +7793,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt32[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt33[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntSpaceCenter4[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -7801,7 +7801,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt33[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt34[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntSpaceCenter5[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -7809,7 +7809,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt34[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt35[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntSpaceCenter6[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -7817,7 +7817,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt35[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt36[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntSpaceCenter7[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -7833,7 +7833,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Macey[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Brendan10[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRustboroTreecko[] = {
     {
     .iv = 25,
     .lvl = 13,
@@ -7846,7 +7846,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Brendan10[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Brendan11[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRustboroMudkip[] = {
     {
     .iv = 25,
     .lvl = 13,
@@ -7880,7 +7880,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Isabella[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt37[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntWeatherInst5[] = {
     {
     .iv = 0,
     .lvl = 27,
@@ -7893,7 +7893,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt37[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Tabitha2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_TabithaMtChimney[] = {
     {
     .iv = 50,
     .lvl = 18,
@@ -7929,7 +7929,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Jonathan[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Brendan12[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRustboroTorchic[] = {
     {
     .iv = 25,
     .lvl = 13,
@@ -7942,7 +7942,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Brendan12[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_May10[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_MayRustboroMudkip[] = {
     {
     .iv = 25,
     .lvl = 13,
@@ -7955,7 +7955,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_May10[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Maxie1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_MaxieMagmaHideout[] = {
     {
     .iv = 150,
     .lvl = 37,
@@ -7973,7 +7973,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Maxie1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Maxie2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_MaxieMtChimney[] = {
     {
     .iv = 150,
     .lvl = 24,
@@ -8406,7 +8406,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Lucas2[] = {
     .iv = 0,
     .lvl = 9,
     .species = SPECIES_WAILMER,
-    .moves = MOVE_SPLASH, MOVE_WATER_GUN, MOVE_NONE, MOVE_NONE
+    .moves = {MOVE_SPLASH, MOVE_WATER_GUN, MOVE_NONE, MOVE_NONE}
     }
 };
 
@@ -8415,13 +8415,13 @@ static const struct TrainerMonNoItemCustomMoves sParty_Mike1[] = {
     .iv = 0,
     .lvl = 10,
     .species = SPECIES_PELIPPER,
-    .moves = MOVE_GUST, MOVE_GROWL, MOVE_NONE, MOVE_NONE
+    .moves = {MOVE_GUST, MOVE_GROWL, MOVE_NONE, MOVE_NONE}
     },
     {
     .iv = 0,
     .lvl = 10,
     .species = SPECIES_POOCHYENA,
-    .moves = MOVE_BITE, MOVE_SCARY_FACE, MOVE_NONE, MOVE_NONE
+    .moves = {MOVE_BITE, MOVE_SCARY_FACE, MOVE_NONE, MOVE_NONE}
     }
 };
 
@@ -8639,7 +8639,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Gerald[] = {
     .iv = 100,
     .lvl = 23,
     .species = SPECIES_KECLEON,
-    .moves = MOVE_FLAMETHROWER, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK, MOVE_BIND
+    .moves = {MOVE_FLAMETHROWER, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK, MOVE_BIND}
     }
 };
 
@@ -8648,13 +8648,13 @@ static const struct TrainerMonNoItemCustomMoves sParty_Vivian[] = {
     .iv = 100,
     .lvl = 17,
     .species = SPECIES_MEDITITE,
-    .moves = MOVE_BIDE, MOVE_DETECT, MOVE_CONFUSION, MOVE_THUNDER_PUNCH
+    .moves = {MOVE_BIDE, MOVE_DETECT, MOVE_CONFUSION, MOVE_THUNDER_PUNCH}
     },
     {
     .iv = 100,
     .lvl = 17,
     .species = SPECIES_MEDITITE,
-    .moves = MOVE_THUNDER_PUNCH, MOVE_DETECT, MOVE_CONFUSION, MOVE_MEDITATE
+    .moves = {MOVE_THUNDER_PUNCH, MOVE_DETECT, MOVE_CONFUSION, MOVE_MEDITATE}
     }
 };
 
@@ -8663,7 +8663,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Danielle[] = {
     .iv = 100,
     .lvl = 23,
     .species = SPECIES_MEDITITE,
-    .moves = MOVE_BIDE, MOVE_DETECT, MOVE_CONFUSION, MOVE_FIRE_PUNCH
+    .moves = {MOVE_BIDE, MOVE_DETECT, MOVE_CONFUSION, MOVE_FIRE_PUNCH}
     }
 };
 
@@ -8672,13 +8672,13 @@ static const struct TrainerMonNoItemCustomMoves sParty_Hideo[] = {
     .iv = 0,
     .lvl = 25,
     .species = SPECIES_KOFFING,
-    .moves = MOVE_TACKLE, MOVE_SELF_DESTRUCT, MOVE_SLUDGE, MOVE_SMOKESCREEN
+    .moves = {MOVE_TACKLE, MOVE_SELF_DESTRUCT, MOVE_SLUDGE, MOVE_SMOKESCREEN}
     },
     {
     .iv = 0,
     .lvl = 25,
     .species = SPECIES_KOFFING,
-    .moves = MOVE_TACKLE, MOVE_POISON_GAS, MOVE_SLUDGE, MOVE_SMOKESCREEN
+    .moves = {MOVE_TACKLE, MOVE_POISON_GAS, MOVE_SLUDGE, MOVE_SMOKESCREEN}
     }
 };
 
@@ -8687,13 +8687,13 @@ static const struct TrainerMonNoItemCustomMoves sParty_Keigo[] = {
     .iv = 0,
     .lvl = 28,
     .species = SPECIES_KOFFING,
-    .moves = MOVE_POISON_GAS, MOVE_SELF_DESTRUCT, MOVE_SLUDGE, MOVE_SMOKESCREEN
+    .moves = {MOVE_POISON_GAS, MOVE_SELF_DESTRUCT, MOVE_SLUDGE, MOVE_SMOKESCREEN}
     },
     {
     .iv = 0,
     .lvl = 28,
     .species = SPECIES_NINJASK,
-    .moves = MOVE_SAND_ATTACK, MOVE_DOUBLE_TEAM, MOVE_FURY_CUTTER, MOVE_SWORDS_DANCE
+    .moves = {MOVE_SAND_ATTACK, MOVE_DOUBLE_TEAM, MOVE_FURY_CUTTER, MOVE_SWORDS_DANCE}
     }
 };
 
@@ -8702,13 +8702,13 @@ static const struct TrainerMonNoItemCustomMoves sParty_Riley[] = {
     .iv = 0,
     .lvl = 28,
     .species = SPECIES_NINCADA,
-    .moves = MOVE_LEECH_LIFE, MOVE_FURY_SWIPES, MOVE_MIND_READER, MOVE_DIG
+    .moves = {MOVE_LEECH_LIFE, MOVE_FURY_SWIPES, MOVE_MIND_READER, MOVE_DIG}
     },
     {
     .iv = 0,
     .lvl = 28,
     .species = SPECIES_KOFFING,
-    .moves = MOVE_TACKLE, MOVE_SELF_DESTRUCT, MOVE_SLUDGE, MOVE_SMOKESCREEN
+    .moves = {MOVE_TACKLE, MOVE_SELF_DESTRUCT, MOVE_SLUDGE, MOVE_SMOKESCREEN}
     }
 };
 
@@ -8743,7 +8743,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Ashley[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Wally2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_WallyMauville[] = {
     {
     .iv = 30,
     .lvl = 16,
@@ -8751,139 +8751,139 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Wally2[] = {
     }
 };
 
-static const struct TrainerMonNoItemCustomMoves sParty_Wally3[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_WallyVR2[] = {
     {
     .iv = 150,
     .lvl = 47,
     .species = SPECIES_ALTARIA,
-    .moves = MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE
+    .moves = {MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE}
     },
     {
     .iv = 150,
     .lvl = 46,
     .species = SPECIES_DELCATTY,
-    .moves = MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK
+    .moves = {MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK}
     },
     {
     .iv = 150,
     .lvl = 47,
     .species = SPECIES_ROSELIA,
-    .moves = MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC
+    .moves = {MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC}
     },
     {
     .iv = 150,
     .lvl = 44,
     .species = SPECIES_MAGNETON,
-    .moves = MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH
+    .moves = {MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH}
     },
     {
     .iv = 250,
     .lvl = 48,
     .species = SPECIES_GARDEVOIR,
-    .moves = MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT
+    .moves = {MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT}
     }
 };
 
-static const struct TrainerMonNoItemCustomMoves sParty_Wally4[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_WallyVR3[] = {
     {
     .iv = 150,
     .lvl = 50,
     .species = SPECIES_ALTARIA,
-    .moves = MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE
+    .moves = {MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE}
     },
     {
     .iv = 150,
     .lvl = 49,
     .species = SPECIES_DELCATTY,
-    .moves = MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK
+    .moves = {MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK}
     },
     {
     .iv = 150,
     .lvl = 50,
     .species = SPECIES_ROSELIA,
-    .moves = MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC
+    .moves = {MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC}
     },
     {
     .iv = 150,
     .lvl = 47,
     .species = SPECIES_MAGNETON,
-    .moves = MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH
+    .moves = {MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH}
     },
     {
     .iv = 250,
     .lvl = 51,
     .species = SPECIES_GARDEVOIR,
-    .moves = MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT
+    .moves = {MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT}
     }
 };
 
-static const struct TrainerMonNoItemCustomMoves sParty_Wally5[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_WallyVR4[] = {
     {
     .iv = 150,
     .lvl = 53,
     .species = SPECIES_ALTARIA,
-    .moves = MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE
+    .moves = {MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE}
     },
     {
     .iv = 150,
     .lvl = 52,
     .species = SPECIES_DELCATTY,
-    .moves = MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK
+    .moves = {MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK}
     },
     {
     .iv = 150,
     .lvl = 53,
     .species = SPECIES_ROSELIA,
-    .moves = MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC
+    .moves = {MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC}
     },
     {
     .iv = 150,
     .lvl = 50,
     .species = SPECIES_MAGNETON,
-    .moves = MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH
+    .moves = {MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH}
     },
     {
     .iv = 250,
     .lvl = 54,
     .species = SPECIES_GARDEVOIR,
-    .moves = MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT
+    .moves = {MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT}
     }
 };
 
-static const struct TrainerMonNoItemCustomMoves sParty_Wally6[] = {
+static const struct TrainerMonNoItemCustomMoves sParty_WallyVR5[] = {
     {
     .iv = 150,
     .lvl = 56,
     .species = SPECIES_ALTARIA,
-    .moves = MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE
+    .moves = {MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE}
     },
     {
     .iv = 150,
     .lvl = 55,
     .species = SPECIES_DELCATTY,
-    .moves = MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK
+    .moves = {MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK}
     },
     {
     .iv = 150,
     .lvl = 56,
     .species = SPECIES_ROSELIA,
-    .moves = MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC
+    .moves = {MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC}
     },
     {
     .iv = 150,
     .lvl = 53,
     .species = SPECIES_MAGNETON,
-    .moves = MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH
+    .moves = {MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH}
     },
     {
     .iv = 250,
     .lvl = 57,
     .species = SPECIES_GARDEVOIR,
-    .moves = MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT
+    .moves = {MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT}
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Brendan13[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_BrendanLilycoveMudkip[] = {
     {
     .iv = 150,
     .lvl = 31,
@@ -8906,7 +8906,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Brendan13[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Brendan14[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_BrendanLilycoveTreecko[] = {
     {
     .iv = 150,
     .lvl = 31,
@@ -8929,7 +8929,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Brendan14[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Brendan15[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_BrendanLilycoveTorchic[] = {
     {
     .iv = 150,
     .lvl = 31,
@@ -8952,7 +8952,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Brendan15[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_May11[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_MayLilycoveMudkip[] = {
     {
     .iv = 150,
     .lvl = 31,
@@ -8975,7 +8975,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_May11[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_May12[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_MayLilycoveTreecko[] = {
     {
     .iv = 150,
     .lvl = 31,
@@ -8998,7 +8998,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_May12[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_May13[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_MayLilycoveTorchic[] = {
     {
     .iv = 150,
     .lvl = 31,
@@ -9174,13 +9174,13 @@ static const struct TrainerMonNoItemCustomMoves sParty_KimAndIris[] = {
     .iv = 0,
     .lvl = 32,
     .species = SPECIES_SWABLU,
-    .moves = MOVE_SING, MOVE_FURY_ATTACK, MOVE_SAFEGUARD, MOVE_AERIAL_ACE
+    .moves = {MOVE_SING, MOVE_FURY_ATTACK, MOVE_SAFEGUARD, MOVE_AERIAL_ACE}
     },
     {
     .iv = 0,
     .lvl = 35,
     .species = SPECIES_NUMEL,
-    .moves = MOVE_FLAMETHROWER, MOVE_TAKE_DOWN, MOVE_REST, MOVE_EARTHQUAKE
+    .moves = {MOVE_FLAMETHROWER, MOVE_TAKE_DOWN, MOVE_REST, MOVE_EARTHQUAKE}
     }
 };
 
@@ -9189,13 +9189,13 @@ static const struct TrainerMonNoItemCustomMoves sParty_TyraAndIvy[] = {
     .iv = 0,
     .lvl = 18,
     .species = SPECIES_ROSELIA,
-    .moves = MOVE_GROWTH, MOVE_STUN_SPORE, MOVE_MEGA_DRAIN, MOVE_LEECH_SEED
+    .moves = {MOVE_GROWTH, MOVE_STUN_SPORE, MOVE_MEGA_DRAIN, MOVE_LEECH_SEED}
     },
     {
     .iv = 0,
     .lvl = 20,
     .species = SPECIES_GRAVELER,
-    .moves = MOVE_DEFENSE_CURL, MOVE_ROLLOUT, MOVE_MUD_SPORT, MOVE_ROCK_THROW
+    .moves = {MOVE_DEFENSE_CURL, MOVE_ROLLOUT, MOVE_MUD_SPORT, MOVE_ROCK_THROW}
     }
 };
 
@@ -9204,13 +9204,13 @@ static const struct TrainerMonNoItemCustomMoves sParty_MelAndPaul[] = {
     .iv = 0,
     .lvl = 27,
     .species = SPECIES_DUSTOX,
-    .moves = MOVE_GUST, MOVE_PSYBEAM, MOVE_TOXIC, MOVE_PROTECT
+    .moves = {MOVE_GUST, MOVE_PSYBEAM, MOVE_TOXIC, MOVE_PROTECT}
     },
     {
     .iv = 0,
     .lvl = 27,
     .species = SPECIES_BEAUTIFLY,
-    .moves = MOVE_GUST, MOVE_MEGA_DRAIN, MOVE_ATTRACT, MOVE_STUN_SPORE
+    .moves = {MOVE_GUST, MOVE_MEGA_DRAIN, MOVE_ATTRACT, MOVE_STUN_SPORE}
     }
 };
 
@@ -9219,13 +9219,13 @@ static const struct TrainerMonNoItemCustomMoves sParty_JohnAndJay1[] = {
     .iv = 200,
     .lvl = 39,
     .species = SPECIES_MEDICHAM,
-    .moves = MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT
+    .moves = {MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT}
     },
     {
     .iv = 200,
     .lvl = 39,
     .species = SPECIES_HARIYAMA,
-    .moves = MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM
+    .moves = {MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM}
     }
 };
 
@@ -9234,13 +9234,13 @@ static const struct TrainerMonNoItemCustomMoves sParty_JohnAndJay2[] = {
     .iv = 210,
     .lvl = 43,
     .species = SPECIES_MEDICHAM,
-    .moves = MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT
+    .moves = {MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT}
     },
     {
     .iv = 210,
     .lvl = 43,
     .species = SPECIES_HARIYAMA,
-    .moves = MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM
+    .moves = {MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM}
     }
 };
 
@@ -9249,13 +9249,13 @@ static const struct TrainerMonNoItemCustomMoves sParty_JohnAndJay3[] = {
     .iv = 220,
     .lvl = 46,
     .species = SPECIES_MEDICHAM,
-    .moves = MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT
+    .moves = {MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT}
     },
     {
     .iv = 220,
     .lvl = 46,
     .species = SPECIES_HARIYAMA,
-    .moves = MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM
+    .moves = {MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM}
     }
 };
 
@@ -9264,13 +9264,13 @@ static const struct TrainerMonNoItemCustomMoves sParty_JohnAndJay4[] = {
     .iv = 230,
     .lvl = 49,
     .species = SPECIES_MEDICHAM,
-    .moves = MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT
+    .moves = {MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT}
     },
     {
     .iv = 230,
     .lvl = 49,
     .species = SPECIES_HARIYAMA,
-    .moves = MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM
+    .moves = {MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM}
     }
 };
 
@@ -9279,13 +9279,13 @@ static const struct TrainerMonNoItemCustomMoves sParty_JohnAndJay5[] = {
     .iv = 240,
     .lvl = 52,
     .species = SPECIES_MEDICHAM,
-    .moves = MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT
+    .moves = {MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT}
     },
     {
     .iv = 240,
     .lvl = 52,
     .species = SPECIES_HARIYAMA,
-    .moves = MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM
+    .moves = {MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM}
     }
 };
 
@@ -9645,7 +9645,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Deandre[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt38[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout1[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9653,7 +9653,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt38[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt39[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout2[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9661,7 +9661,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt39[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt40[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout3[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9669,7 +9669,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt40[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt41[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout4[] = {
     {
     .iv = 0,
     .lvl = 28,
@@ -9682,7 +9682,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt41[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt42[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout5[] = {
     {
     .iv = 0,
     .lvl = 28,
@@ -9695,7 +9695,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt42[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt43[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout6[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9703,7 +9703,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt43[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt44[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout7[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9711,7 +9711,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt44[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt45[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout8[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9719,7 +9719,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt45[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt46[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout9[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9727,7 +9727,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt46[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt47[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout10[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9735,7 +9735,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt47[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt48[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout11[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9743,7 +9743,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt48[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt49[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout12[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9751,7 +9751,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt49[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt50[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout13[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9759,7 +9759,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt50[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt51[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout14[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9767,7 +9767,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt51[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt52[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout15[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9775,7 +9775,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt52[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt53[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout16[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9783,7 +9783,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt53[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Tabitha3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_TabithaMagmaHideout[] = {
     {
     .iv = 75,
     .lvl = 26,
@@ -9819,7 +9819,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Darcy[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Maxie3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_MaxieMossdeep[] = {
     {
     .iv = 150,
     .lvl = 42,
@@ -10163,7 +10163,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Leonel[] = {
     .iv = 100,
     .lvl = 30,
     .species = SPECIES_MANECTRIC,
-    .moves = MOVE_THUNDER, MOVE_QUICK_ATTACK, MOVE_THUNDER_WAVE, MOVE_NONE
+    .moves = {MOVE_THUNDER, MOVE_QUICK_ATTACK, MOVE_THUNDER_WAVE, MOVE_NONE}
     }
 };
 
@@ -10272,7 +10272,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Cristin1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_May14[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_MayRustboroTreecko[] = {
     {
     .iv = 25,
     .lvl = 13,
@@ -10285,7 +10285,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_May14[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_May15[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_MayRustboroTorchic[] = {
     {
     .iv = 25,
     .lvl = 13,
@@ -10304,28 +10304,28 @@ static const struct TrainerMonItemCustomMoves sParty_Roxanne2[] = {
     .lvl = 32,
     .species = SPECIES_GOLEM,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_PROTECT, MOVE_ROLLOUT, MOVE_MAGNITUDE, MOVE_EXPLOSION
+    .moves = {MOVE_PROTECT, MOVE_ROLLOUT, MOVE_MAGNITUDE, MOVE_EXPLOSION}
     },
     {
     .iv = 255,
     .lvl = 35,
     .species = SPECIES_KABUTO,
     .heldItem = ITEM_SITRUS_BERRY,
-    .moves = MOVE_SWORDS_DANCE, MOVE_ICE_BEAM, MOVE_SURF, MOVE_ROCK_SLIDE
+    .moves = {MOVE_SWORDS_DANCE, MOVE_ICE_BEAM, MOVE_SURF, MOVE_ROCK_SLIDE}
     },
     {
     .iv = 255,
     .lvl = 35,
     .species = SPECIES_ONIX,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_IRON_TAIL, MOVE_EXPLOSION, MOVE_ROAR, MOVE_ROCK_SLIDE
+    .moves = {MOVE_IRON_TAIL, MOVE_EXPLOSION, MOVE_ROAR, MOVE_ROCK_SLIDE}
     },
     {
     .iv = 255,
     .lvl = 37,
     .species = SPECIES_NOSEPASS,
     .heldItem = ITEM_SITRUS_BERRY,
-    .moves = MOVE_DOUBLE_TEAM, MOVE_EXPLOSION, MOVE_PROTECT, MOVE_ROCK_SLIDE
+    .moves = {MOVE_DOUBLE_TEAM, MOVE_EXPLOSION, MOVE_PROTECT, MOVE_ROCK_SLIDE}
     }
 };
 
@@ -10335,35 +10335,35 @@ static const struct TrainerMonItemCustomMoves sParty_Roxanne3[] = {
     .lvl = 37,
     .species = SPECIES_OMANYTE,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_PROTECT, MOVE_ICE_BEAM, MOVE_ROCK_SLIDE, MOVE_SURF
+    .moves = {MOVE_PROTECT, MOVE_ICE_BEAM, MOVE_ROCK_SLIDE, MOVE_SURF}
     },
     {
     .iv = 255,
     .lvl = 37,
     .species = SPECIES_GOLEM,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_PROTECT, MOVE_ROLLOUT, MOVE_MAGNITUDE, MOVE_EXPLOSION
+    .moves = {MOVE_PROTECT, MOVE_ROLLOUT, MOVE_MAGNITUDE, MOVE_EXPLOSION}
     },
     {
     .iv = 255,
     .lvl = 40,
     .species = SPECIES_KABUTOPS,
     .heldItem = ITEM_SITRUS_BERRY,
-    .moves = MOVE_SWORDS_DANCE, MOVE_ICE_BEAM, MOVE_SURF, MOVE_ROCK_SLIDE
+    .moves = {MOVE_SWORDS_DANCE, MOVE_ICE_BEAM, MOVE_SURF, MOVE_ROCK_SLIDE}
     },
     {
     .iv = 255,
     .lvl = 40,
     .species = SPECIES_ONIX,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_IRON_TAIL, MOVE_EXPLOSION, MOVE_ROAR, MOVE_ROCK_SLIDE
+    .moves = {MOVE_IRON_TAIL, MOVE_EXPLOSION, MOVE_ROAR, MOVE_ROCK_SLIDE}
     },
     {
     .iv = 255,
     .lvl = 42,
     .species = SPECIES_NOSEPASS,
     .heldItem = ITEM_SITRUS_BERRY,
-    .moves = MOVE_DOUBLE_TEAM, MOVE_EXPLOSION, MOVE_PROTECT, MOVE_ROCK_SLIDE
+    .moves = {MOVE_DOUBLE_TEAM, MOVE_EXPLOSION, MOVE_PROTECT, MOVE_ROCK_SLIDE}
     }
 };
 
@@ -10373,35 +10373,35 @@ static const struct TrainerMonItemCustomMoves sParty_Roxanne4[] = {
     .lvl = 42,
     .species = SPECIES_OMASTAR,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_PROTECT, MOVE_ICE_BEAM, MOVE_ROCK_SLIDE, MOVE_SURF
+    .moves = {MOVE_PROTECT, MOVE_ICE_BEAM, MOVE_ROCK_SLIDE, MOVE_SURF}
     },
     {
     .iv = 255,
     .lvl = 42,
     .species = SPECIES_GOLEM,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_PROTECT, MOVE_ROLLOUT, MOVE_EARTHQUAKE, MOVE_EXPLOSION
+    .moves = {MOVE_PROTECT, MOVE_ROLLOUT, MOVE_EARTHQUAKE, MOVE_EXPLOSION}
     },
     {
     .iv = 255,
     .lvl = 45,
     .species = SPECIES_KABUTOPS,
     .heldItem = ITEM_SITRUS_BERRY,
-    .moves = MOVE_SWORDS_DANCE, MOVE_ICE_BEAM, MOVE_SURF, MOVE_ROCK_SLIDE
+    .moves = {MOVE_SWORDS_DANCE, MOVE_ICE_BEAM, MOVE_SURF, MOVE_ROCK_SLIDE}
     },
     {
     .iv = 255,
     .lvl = 45,
     .species = SPECIES_ONIX,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_IRON_TAIL, MOVE_EXPLOSION, MOVE_ROAR, MOVE_ROCK_SLIDE
+    .moves = {MOVE_IRON_TAIL, MOVE_EXPLOSION, MOVE_ROAR, MOVE_ROCK_SLIDE}
     },
     {
     .iv = 255,
     .lvl = 47,
     .species = SPECIES_NOSEPASS,
     .heldItem = ITEM_SITRUS_BERRY,
-    .moves = MOVE_DOUBLE_TEAM, MOVE_EXPLOSION, MOVE_PROTECT, MOVE_ROCK_SLIDE
+    .moves = {MOVE_DOUBLE_TEAM, MOVE_EXPLOSION, MOVE_PROTECT, MOVE_ROCK_SLIDE}
     }
 };
 
@@ -10411,42 +10411,42 @@ static const struct TrainerMonItemCustomMoves sParty_Roxanne5[] = {
     .lvl = 47,
     .species = SPECIES_AERODACTYL,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_ROCK_SLIDE, MOVE_HYPER_BEAM, MOVE_SUPERSONIC, MOVE_PROTECT
+    .moves = {MOVE_ROCK_SLIDE, MOVE_HYPER_BEAM, MOVE_SUPERSONIC, MOVE_PROTECT}
     },
     {
     .iv = 255,
     .lvl = 47,
     .species = SPECIES_GOLEM,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_FOCUS_PUNCH, MOVE_ROLLOUT, MOVE_EARTHQUAKE, MOVE_EXPLOSION
+    .moves = {MOVE_FOCUS_PUNCH, MOVE_ROLLOUT, MOVE_EARTHQUAKE, MOVE_EXPLOSION}
     },
     {
     .iv = 255,
     .lvl = 47,
     .species = SPECIES_OMASTAR,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_PROTECT, MOVE_ICE_BEAM, MOVE_ROCK_SLIDE, MOVE_SURF
+    .moves = {MOVE_PROTECT, MOVE_ICE_BEAM, MOVE_ROCK_SLIDE, MOVE_SURF}
     },
     {
     .iv = 255,
     .lvl = 50,
     .species = SPECIES_KABUTOPS,
     .heldItem = ITEM_SITRUS_BERRY,
-    .moves = MOVE_SWORDS_DANCE, MOVE_ICE_BEAM, MOVE_SURF, MOVE_ROCK_SLIDE
+    .moves = {MOVE_SWORDS_DANCE, MOVE_ICE_BEAM, MOVE_SURF, MOVE_ROCK_SLIDE}
     },
     {
     .iv = 255,
     .lvl = 50,
     .species = SPECIES_STEELIX,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_IRON_TAIL, MOVE_EXPLOSION, MOVE_ROAR, MOVE_ROCK_SLIDE
+    .moves = {MOVE_IRON_TAIL, MOVE_EXPLOSION, MOVE_ROAR, MOVE_ROCK_SLIDE}
     },
     {
     .iv = 255,
     .lvl = 52,
     .species = SPECIES_NOSEPASS,
     .heldItem = ITEM_SITRUS_BERRY,
-    .moves = MOVE_DOUBLE_TEAM, MOVE_EXPLOSION, MOVE_PROTECT, MOVE_ROCK_SLIDE
+    .moves = {MOVE_DOUBLE_TEAM, MOVE_EXPLOSION, MOVE_PROTECT, MOVE_ROCK_SLIDE}
     }
 };
 
@@ -10456,28 +10456,28 @@ static const struct TrainerMonItemCustomMoves sParty_Brawly2[] = {
     .lvl = 33,
     .species = SPECIES_MACHAMP,
     .heldItem = ITEM_SITRUS_BERRY,
-    .moves = MOVE_KARATE_CHOP, MOVE_ROCK_SLIDE, MOVE_FOCUS_PUNCH, MOVE_BULK_UP
+    .moves = {MOVE_KARATE_CHOP, MOVE_ROCK_SLIDE, MOVE_FOCUS_PUNCH, MOVE_BULK_UP}
     },
     {
     .iv = 255,
     .lvl = 33,
     .species = SPECIES_MEDITITE,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_PSYCHIC, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_FOCUS_PUNCH
+    .moves = {MOVE_PSYCHIC, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_FOCUS_PUNCH}
     },
     {
     .iv = 255,
     .lvl = 35,
     .species = SPECIES_HITMONTOP,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_PURSUIT, MOVE_COUNTER, MOVE_PROTECT, MOVE_TRIPLE_KICK
+    .moves = {MOVE_PURSUIT, MOVE_COUNTER, MOVE_PROTECT, MOVE_TRIPLE_KICK}
     },
     {
     .iv = 255,
     .lvl = 37,
     .species = SPECIES_HARIYAMA,
     .heldItem = ITEM_SITRUS_BERRY,
-    .moves = MOVE_FAKE_OUT, MOVE_FOCUS_PUNCH, MOVE_BELLY_DRUM, MOVE_EARTHQUAKE
+    .moves = {MOVE_FAKE_OUT, MOVE_FOCUS_PUNCH, MOVE_BELLY_DRUM, MOVE_EARTHQUAKE}
     }
 };
 
@@ -10487,28 +10487,28 @@ static const struct TrainerMonItemCustomMoves sParty_Brawly3[] = {
     .lvl = 38,
     .species = SPECIES_MACHAMP,
     .heldItem = ITEM_SITRUS_BERRY,
-    .moves = MOVE_KARATE_CHOP, MOVE_ROCK_SLIDE, MOVE_FOCUS_PUNCH, MOVE_BULK_UP
+    .moves = {MOVE_KARATE_CHOP, MOVE_ROCK_SLIDE, MOVE_FOCUS_PUNCH, MOVE_BULK_UP}
     },
     {
     .iv = 255,
     .lvl = 38,
     .species = SPECIES_MEDICHAM,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_PSYCHIC, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_FOCUS_PUNCH
+    .moves = {MOVE_PSYCHIC, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_FOCUS_PUNCH}
     },
     {
     .iv = 255,
     .lvl = 40,
     .species = SPECIES_HITMONTOP,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_PURSUIT, MOVE_COUNTER, MOVE_PROTECT, MOVE_TRIPLE_KICK
+    .moves = {MOVE_PURSUIT, MOVE_COUNTER, MOVE_PROTECT, MOVE_TRIPLE_KICK}
     },
     {
     .iv = 255,
     .lvl = 42,
     .species = SPECIES_HARIYAMA,
     .heldItem = ITEM_SITRUS_BERRY,
-    .moves = MOVE_FAKE_OUT, MOVE_FOCUS_PUNCH, MOVE_BELLY_DRUM, MOVE_EARTHQUAKE
+    .moves = {MOVE_FAKE_OUT, MOVE_FOCUS_PUNCH, MOVE_BELLY_DRUM, MOVE_EARTHQUAKE}
     }
 };
 
@@ -10518,35 +10518,35 @@ static const struct TrainerMonItemCustomMoves sParty_Brawly4[] = {
     .lvl = 40,
     .species = SPECIES_HITMONCHAN,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_SKY_UPPERCUT, MOVE_PROTECT, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH
+    .moves = {MOVE_SKY_UPPERCUT, MOVE_PROTECT, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH}
     },
     {
     .iv = 255,
     .lvl = 43,
     .species = SPECIES_MACHAMP,
     .heldItem = ITEM_SITRUS_BERRY,
-    .moves = MOVE_KARATE_CHOP, MOVE_ROCK_SLIDE, MOVE_FOCUS_PUNCH, MOVE_BULK_UP
+    .moves = {MOVE_KARATE_CHOP, MOVE_ROCK_SLIDE, MOVE_FOCUS_PUNCH, MOVE_BULK_UP}
     },
     {
     .iv = 255,
     .lvl = 43,
     .species = SPECIES_MEDICHAM,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_FOCUS_PUNCH, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_PSYCHIC
+    .moves = {MOVE_FOCUS_PUNCH, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_PSYCHIC}
     },
     {
     .iv = 255,
     .lvl = 45,
     .species = SPECIES_HITMONTOP,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_PURSUIT, MOVE_COUNTER, MOVE_PROTECT, MOVE_TRIPLE_KICK
+    .moves = {MOVE_PURSUIT, MOVE_COUNTER, MOVE_PROTECT, MOVE_TRIPLE_KICK}
     },
     {
     .iv = 255,
     .lvl = 47,
     .species = SPECIES_HARIYAMA,
     .heldItem = ITEM_SITRUS_BERRY,
-    .moves = MOVE_FAKE_OUT, MOVE_FOCUS_PUNCH, MOVE_BELLY_DRUM, MOVE_EARTHQUAKE
+    .moves = {MOVE_FAKE_OUT, MOVE_FOCUS_PUNCH, MOVE_BELLY_DRUM, MOVE_EARTHQUAKE}
     }
 };
 
@@ -10556,42 +10556,42 @@ static const struct TrainerMonItemCustomMoves sParty_Brawly5[] = {
     .lvl = 46,
     .species = SPECIES_HITMONLEE,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_MEGA_KICK, MOVE_FOCUS_PUNCH, MOVE_EARTHQUAKE, MOVE_BULK_UP
+    .moves = {MOVE_MEGA_KICK, MOVE_FOCUS_PUNCH, MOVE_EARTHQUAKE, MOVE_BULK_UP}
     },
     {
     .iv = 255,
     .lvl = 46,
     .species = SPECIES_HITMONCHAN,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_SKY_UPPERCUT, MOVE_PROTECT, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH
+    .moves = {MOVE_SKY_UPPERCUT, MOVE_PROTECT, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH}
     },
     {
     .iv = 255,
     .lvl = 48,
     .species = SPECIES_MACHAMP,
     .heldItem = ITEM_SITRUS_BERRY,
-    .moves = MOVE_CROSS_CHOP, MOVE_ROCK_SLIDE, MOVE_FOCUS_PUNCH, MOVE_BULK_UP
+    .moves = {MOVE_CROSS_CHOP, MOVE_ROCK_SLIDE, MOVE_FOCUS_PUNCH, MOVE_BULK_UP}
     },
     {
     .iv = 255,
     .lvl = 48,
     .species = SPECIES_MEDICHAM,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_FOCUS_PUNCH, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_PSYCHIC
+    .moves = {MOVE_FOCUS_PUNCH, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_PSYCHIC}
     },
     {
     .iv = 255,
     .lvl = 50,
     .species = SPECIES_HITMONTOP,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_PURSUIT, MOVE_COUNTER, MOVE_PROTECT, MOVE_TRIPLE_KICK
+    .moves = {MOVE_PURSUIT, MOVE_COUNTER, MOVE_PROTECT, MOVE_TRIPLE_KICK}
     },
     {
     .iv = 255,
     .lvl = 52,
     .species = SPECIES_HARIYAMA,
     .heldItem = ITEM_SITRUS_BERRY,
-    .moves = MOVE_FAKE_OUT, MOVE_FOCUS_PUNCH, MOVE_BELLY_DRUM, MOVE_EARTHQUAKE
+    .moves = {MOVE_FAKE_OUT, MOVE_FOCUS_PUNCH, MOVE_BELLY_DRUM, MOVE_EARTHQUAKE}
     }
 };
 
@@ -10601,28 +10601,28 @@ static const struct TrainerMonItemCustomMoves sParty_Wattson2[] = {
     .lvl = 36,
     .species = SPECIES_MAREEP,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_THUNDER, MOVE_PROTECT, MOVE_THUNDER_WAVE, MOVE_LIGHT_SCREEN
+    .moves = {MOVE_THUNDER, MOVE_PROTECT, MOVE_THUNDER_WAVE, MOVE_LIGHT_SCREEN}
     },
     {
     .iv = 255,
     .lvl = 36,
     .species = SPECIES_ELECTRODE,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_ROLLOUT, MOVE_THUNDER, MOVE_EXPLOSION, MOVE_RAIN_DANCE
+    .moves = {MOVE_ROLLOUT, MOVE_THUNDER, MOVE_EXPLOSION, MOVE_RAIN_DANCE}
     },
     {
     .iv = 255,
     .lvl = 38,
     .species = SPECIES_MAGNETON,
     .heldItem = ITEM_SITRUS_BERRY,
-    .moves = MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_THUNDER, MOVE_RAIN_DANCE
+    .moves = {MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_THUNDER, MOVE_RAIN_DANCE}
     },
     {
     .iv = 255,
     .lvl = 40,
     .species = SPECIES_MANECTRIC,
     .heldItem = ITEM_SITRUS_BERRY,
-    .moves = MOVE_BITE, MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_PROTECT
+    .moves = {MOVE_BITE, MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_PROTECT}
     }
 };
 
@@ -10632,35 +10632,35 @@ static const struct TrainerMonItemCustomMoves sParty_Wattson3[] = {
     .lvl = 39,
     .species = SPECIES_PIKACHU,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_THUNDER, MOVE_SLAM, MOVE_RAIN_DANCE, MOVE_SHOCK_WAVE
+    .moves = {MOVE_THUNDER, MOVE_SLAM, MOVE_RAIN_DANCE, MOVE_SHOCK_WAVE}
     },
     {
     .iv = 255,
     .lvl = 41,
     .species = SPECIES_FLAAFFY,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_THUNDER, MOVE_PROTECT, MOVE_THUNDER_WAVE, MOVE_LIGHT_SCREEN
+    .moves = {MOVE_THUNDER, MOVE_PROTECT, MOVE_THUNDER_WAVE, MOVE_LIGHT_SCREEN}
     },
     {
     .iv = 255,
     .lvl = 41,
     .species = SPECIES_ELECTRODE,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_ROLLOUT, MOVE_THUNDER, MOVE_EXPLOSION, MOVE_RAIN_DANCE
+    .moves = {MOVE_ROLLOUT, MOVE_THUNDER, MOVE_EXPLOSION, MOVE_RAIN_DANCE}
     },
     {
     .iv = 255,
     .lvl = 43,
     .species = SPECIES_MAGNETON,
     .heldItem = ITEM_SITRUS_BERRY,
-    .moves = MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_THUNDER, MOVE_RAIN_DANCE
+    .moves = {MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_THUNDER, MOVE_RAIN_DANCE}
     },
     {
     .iv = 255,
     .lvl = 45,
     .species = SPECIES_MANECTRIC,
     .heldItem = ITEM_SITRUS_BERRY,
-    .moves = MOVE_BITE, MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_PROTECT
+    .moves = {MOVE_BITE, MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_PROTECT}
     }
 };
 
@@ -10670,35 +10670,35 @@ static const struct TrainerMonItemCustomMoves sParty_Wattson4[] = {
     .lvl = 44,
     .species = SPECIES_RAICHU,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_THUNDER, MOVE_SLAM, MOVE_RAIN_DANCE, MOVE_PROTECT
+    .moves = {MOVE_THUNDER, MOVE_SLAM, MOVE_RAIN_DANCE, MOVE_PROTECT}
     },
     {
     .iv = 255,
     .lvl = 46,
     .species = SPECIES_AMPHAROS,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_THUNDER, MOVE_PROTECT, MOVE_THUNDER_WAVE, MOVE_LIGHT_SCREEN
+    .moves = {MOVE_THUNDER, MOVE_PROTECT, MOVE_THUNDER_WAVE, MOVE_LIGHT_SCREEN}
     },
     {
     .iv = 255,
     .lvl = 46,
     .species = SPECIES_ELECTRODE,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_ROLLOUT, MOVE_THUNDER, MOVE_EXPLOSION, MOVE_RAIN_DANCE
+    .moves = {MOVE_ROLLOUT, MOVE_THUNDER, MOVE_EXPLOSION, MOVE_RAIN_DANCE}
     },
     {
     .iv = 255,
     .lvl = 48,
     .species = SPECIES_MAGNETON,
     .heldItem = ITEM_SITRUS_BERRY,
-    .moves = MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_THUNDER, MOVE_RAIN_DANCE
+    .moves = {MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_THUNDER, MOVE_RAIN_DANCE}
     },
     {
     .iv = 255,
     .lvl = 50,
     .species = SPECIES_MANECTRIC,
     .heldItem = ITEM_SITRUS_BERRY,
-    .moves = MOVE_BITE, MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_PROTECT
+    .moves = {MOVE_BITE, MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_PROTECT}
     }
 };
 
@@ -10708,42 +10708,42 @@ static const struct TrainerMonItemCustomMoves sParty_Wattson5[] = {
     .lvl = 50,
     .species = SPECIES_ELECTABUZZ,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_SWIFT, MOVE_FOCUS_PUNCH, MOVE_THUNDER_PUNCH, MOVE_LIGHT_SCREEN
+    .moves = {MOVE_SWIFT, MOVE_FOCUS_PUNCH, MOVE_THUNDER_PUNCH, MOVE_LIGHT_SCREEN}
     },
     {
     .iv = 255,
     .lvl = 51,
     .species = SPECIES_RAICHU,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_THUNDER, MOVE_SLAM, MOVE_RAIN_DANCE, MOVE_PROTECT
+    .moves = {MOVE_THUNDER, MOVE_SLAM, MOVE_RAIN_DANCE, MOVE_PROTECT}
     },
     {
     .iv = 255,
     .lvl = 51,
     .species = SPECIES_AMPHAROS,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_THUNDER, MOVE_PROTECT, MOVE_THUNDER_WAVE, MOVE_LIGHT_SCREEN
+    .moves = {MOVE_THUNDER, MOVE_PROTECT, MOVE_THUNDER_WAVE, MOVE_LIGHT_SCREEN}
     },
     {
     .iv = 255,
     .lvl = 53,
     .species = SPECIES_ELECTRODE,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_ROLLOUT, MOVE_THUNDER, MOVE_EXPLOSION, MOVE_RAIN_DANCE
+    .moves = {MOVE_ROLLOUT, MOVE_THUNDER, MOVE_EXPLOSION, MOVE_RAIN_DANCE}
     },
     {
     .iv = 255,
     .lvl = 53,
     .species = SPECIES_MAGNETON,
     .heldItem = ITEM_SITRUS_BERRY,
-    .moves = MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_THUNDER, MOVE_RAIN_DANCE
+    .moves = {MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_THUNDER, MOVE_RAIN_DANCE}
     },
     {
     .iv = 255,
     .lvl = 55,
     .species = SPECIES_MANECTRIC,
     .heldItem = ITEM_SITRUS_BERRY,
-    .moves = MOVE_BITE, MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_PROTECT
+    .moves = {MOVE_BITE, MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_PROTECT}
     }
 };
 
@@ -10753,28 +10753,28 @@ static const struct TrainerMonItemCustomMoves sParty_Flannery2[] = {
     .lvl = 38,
     .species = SPECIES_MAGCARGO,
     .heldItem = ITEM_WHITE_HERB,
-    .moves = MOVE_OVERHEAT, MOVE_ATTRACT, MOVE_LIGHT_SCREEN, MOVE_ROCK_SLIDE
+    .moves = {MOVE_OVERHEAT, MOVE_ATTRACT, MOVE_LIGHT_SCREEN, MOVE_ROCK_SLIDE}
     },
     {
     .iv = 255,
     .lvl = 36,
     .species = SPECIES_PONYTA,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_FLAMETHROWER, MOVE_ATTRACT, MOVE_SOLAR_BEAM, MOVE_BOUNCE
+    .moves = {MOVE_FLAMETHROWER, MOVE_ATTRACT, MOVE_SOLAR_BEAM, MOVE_BOUNCE}
     },
     {
     .iv = 255,
     .lvl = 38,
     .species = SPECIES_CAMERUPT,
     .heldItem = ITEM_WHITE_HERB,
-    .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE, MOVE_ATTRACT
+    .moves = {MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE, MOVE_ATTRACT}
     },
     {
     .iv = 255,
     .lvl = 40,
     .species = SPECIES_TORKOAL,
     .heldItem = ITEM_WHITE_HERB,
-    .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EXPLOSION, MOVE_ATTRACT
+    .moves = {MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EXPLOSION, MOVE_ATTRACT}
     }
 };
 
@@ -10784,35 +10784,35 @@ static const struct TrainerMonItemCustomMoves sParty_Flannery3[] = {
     .lvl = 41,
     .species = SPECIES_GROWLITHE,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_HELPING_HAND, MOVE_FLAMETHROWER, MOVE_ROAR, MOVE_SUNNY_DAY
+    .moves = {MOVE_HELPING_HAND, MOVE_FLAMETHROWER, MOVE_ROAR, MOVE_SUNNY_DAY}
     },
     {
     .iv = 255,
     .lvl = 43,
     .species = SPECIES_MAGCARGO,
     .heldItem = ITEM_WHITE_HERB,
-    .moves = MOVE_OVERHEAT, MOVE_ATTRACT, MOVE_LIGHT_SCREEN, MOVE_ROCK_SLIDE
+    .moves = {MOVE_OVERHEAT, MOVE_ATTRACT, MOVE_LIGHT_SCREEN, MOVE_ROCK_SLIDE}
     },
     {
     .iv = 255,
     .lvl = 41,
     .species = SPECIES_PONYTA,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_FLAMETHROWER, MOVE_ATTRACT, MOVE_SOLAR_BEAM, MOVE_BOUNCE
+    .moves = {MOVE_FLAMETHROWER, MOVE_ATTRACT, MOVE_SOLAR_BEAM, MOVE_BOUNCE}
     },
     {
     .iv = 255,
     .lvl = 43,
     .species = SPECIES_CAMERUPT,
     .heldItem = ITEM_WHITE_HERB,
-    .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE, MOVE_ATTRACT
+    .moves = {MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE, MOVE_ATTRACT}
     },
     {
     .iv = 255,
     .lvl = 45,
     .species = SPECIES_TORKOAL,
     .heldItem = ITEM_WHITE_HERB,
-    .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EXPLOSION, MOVE_ATTRACT
+    .moves = {MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EXPLOSION, MOVE_ATTRACT}
     }
 };
 
@@ -10822,42 +10822,42 @@ static const struct TrainerMonItemCustomMoves sParty_Flannery4[] = {
     .lvl = 46,
     .species = SPECIES_HOUNDOUR,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_ROAR, MOVE_SOLAR_BEAM, MOVE_TAUNT, MOVE_SUNNY_DAY
+    .moves = {MOVE_ROAR, MOVE_SOLAR_BEAM, MOVE_TAUNT, MOVE_SUNNY_DAY}
     },
     {
     .iv = 255,
     .lvl = 46,
     .species = SPECIES_GROWLITHE,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_HELPING_HAND, MOVE_FLAMETHROWER, MOVE_SUNNY_DAY, MOVE_ROAR
+    .moves = {MOVE_HELPING_HAND, MOVE_FLAMETHROWER, MOVE_SUNNY_DAY, MOVE_ROAR}
     },
     {
     .iv = 255,
     .lvl = 48,
     .species = SPECIES_MAGCARGO,
     .heldItem = ITEM_WHITE_HERB,
-    .moves = MOVE_OVERHEAT, MOVE_ATTRACT, MOVE_LIGHT_SCREEN, MOVE_ROCK_SLIDE
+    .moves = {MOVE_OVERHEAT, MOVE_ATTRACT, MOVE_LIGHT_SCREEN, MOVE_ROCK_SLIDE}
     },
     {
     .iv = 255,
     .lvl = 46,
     .species = SPECIES_RAPIDASH,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_FLAMETHROWER, MOVE_ATTRACT, MOVE_SOLAR_BEAM, MOVE_BOUNCE
+    .moves = {MOVE_FLAMETHROWER, MOVE_ATTRACT, MOVE_SOLAR_BEAM, MOVE_BOUNCE}
     },
     {
     .iv = 255,
     .lvl = 48,
     .species = SPECIES_CAMERUPT,
     .heldItem = ITEM_WHITE_HERB,
-    .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE, MOVE_ATTRACT
+    .moves = {MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE, MOVE_ATTRACT}
     },
     {
     .iv = 255,
     .lvl = 50,
     .species = SPECIES_TORKOAL,
     .heldItem = ITEM_WHITE_HERB,
-    .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EXPLOSION, MOVE_ATTRACT
+    .moves = {MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EXPLOSION, MOVE_ATTRACT}
     }
 };
 
@@ -10867,42 +10867,42 @@ static const struct TrainerMonItemCustomMoves sParty_Flannery5[] = {
     .lvl = 51,
     .species = SPECIES_ARCANINE,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_HELPING_HAND, MOVE_FLAMETHROWER, MOVE_SUNNY_DAY, MOVE_ROAR
+    .moves = {MOVE_HELPING_HAND, MOVE_FLAMETHROWER, MOVE_SUNNY_DAY, MOVE_ROAR}
     },
     {
     .iv = 255,
     .lvl = 53,
     .species = SPECIES_MAGCARGO,
     .heldItem = ITEM_WHITE_HERB,
-    .moves = MOVE_OVERHEAT, MOVE_ATTRACT, MOVE_LIGHT_SCREEN, MOVE_ROCK_SLIDE
+    .moves = {MOVE_OVERHEAT, MOVE_ATTRACT, MOVE_LIGHT_SCREEN, MOVE_ROCK_SLIDE}
     },
     {
     .iv = 255,
     .lvl = 51,
     .species = SPECIES_HOUNDOOM,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_ROAR, MOVE_SOLAR_BEAM, MOVE_TAUNT, MOVE_SUNNY_DAY
+    .moves = {MOVE_ROAR, MOVE_SOLAR_BEAM, MOVE_TAUNT, MOVE_SUNNY_DAY}
     },
     {
     .iv = 255,
     .lvl = 51,
     .species = SPECIES_RAPIDASH,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_FLAMETHROWER, MOVE_ATTRACT, MOVE_SOLAR_BEAM, MOVE_BOUNCE
+    .moves = {MOVE_FLAMETHROWER, MOVE_ATTRACT, MOVE_SOLAR_BEAM, MOVE_BOUNCE}
     },
     {
     .iv = 255,
     .lvl = 53,
     .species = SPECIES_CAMERUPT,
     .heldItem = ITEM_WHITE_HERB,
-    .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE, MOVE_ATTRACT
+    .moves = {MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EARTHQUAKE, MOVE_ATTRACT}
     },
     {
     .iv = 255,
     .lvl = 55,
     .species = SPECIES_TORKOAL,
     .heldItem = ITEM_WHITE_HERB,
-    .moves = MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EXPLOSION, MOVE_ATTRACT
+    .moves = {MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_EXPLOSION, MOVE_ATTRACT}
     }
 };
 
@@ -10912,28 +10912,28 @@ static const struct TrainerMonItemCustomMoves sParty_Norman2[] = {
     .lvl = 42,
     .species = SPECIES_CHANSEY,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_LIGHT_SCREEN, MOVE_SING, MOVE_SKILL_SWAP, MOVE_FOCUS_PUNCH
+    .moves = {MOVE_LIGHT_SCREEN, MOVE_SING, MOVE_SKILL_SWAP, MOVE_FOCUS_PUNCH}
     },
     {
     .iv = 255,
     .lvl = 42,
     .species = SPECIES_SLAKING,
     .heldItem = ITEM_SITRUS_BERRY,
-    .moves = MOVE_BLIZZARD, MOVE_SHADOW_BALL, MOVE_DOUBLE_EDGE, MOVE_FIRE_BLAST
+    .moves = {MOVE_BLIZZARD, MOVE_SHADOW_BALL, MOVE_DOUBLE_EDGE, MOVE_FIRE_BLAST}
     },
     {
     .iv = 255,
     .lvl = 43,
     .species = SPECIES_SPINDA,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_TEETER_DANCE, MOVE_SKILL_SWAP, MOVE_FACADE, MOVE_HYPNOSIS
+    .moves = {MOVE_TEETER_DANCE, MOVE_SKILL_SWAP, MOVE_FACADE, MOVE_HYPNOSIS}
     },
     {
     .iv = 255,
     .lvl = 45,
     .species = SPECIES_SLAKING,
     .heldItem = ITEM_SITRUS_BERRY,
-    .moves = MOVE_HYPER_BEAM, MOVE_FLAMETHROWER, MOVE_THUNDERBOLT, MOVE_SHADOW_BALL
+    .moves = {MOVE_HYPER_BEAM, MOVE_FLAMETHROWER, MOVE_THUNDERBOLT, MOVE_SHADOW_BALL}
     }
 };
 
@@ -10943,35 +10943,35 @@ static const struct TrainerMonItemCustomMoves sParty_Norman3[] = {
     .lvl = 47,
     .species = SPECIES_SLAKING,
     .heldItem = ITEM_SITRUS_BERRY,
-    .moves = MOVE_BLIZZARD, MOVE_SHADOW_BALL, MOVE_DOUBLE_EDGE, MOVE_FIRE_BLAST
+    .moves = {MOVE_BLIZZARD, MOVE_SHADOW_BALL, MOVE_DOUBLE_EDGE, MOVE_FIRE_BLAST}
     },
     {
     .iv = 255,
     .lvl = 47,
     .species = SPECIES_CHANSEY,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_LIGHT_SCREEN, MOVE_SING, MOVE_SKILL_SWAP, MOVE_FOCUS_PUNCH
+    .moves = {MOVE_LIGHT_SCREEN, MOVE_SING, MOVE_SKILL_SWAP, MOVE_FOCUS_PUNCH}
     },
     {
     .iv = 255,
     .lvl = 45,
     .species = SPECIES_KANGASKHAN,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_FAKE_OUT, MOVE_DIZZY_PUNCH, MOVE_ENDURE, MOVE_REVERSAL
+    .moves = {MOVE_FAKE_OUT, MOVE_DIZZY_PUNCH, MOVE_ENDURE, MOVE_REVERSAL}
     },
     {
     .iv = 255,
     .lvl = 48,
     .species = SPECIES_SPINDA,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_TEETER_DANCE, MOVE_SKILL_SWAP, MOVE_FACADE, MOVE_HYPNOSIS
+    .moves = {MOVE_TEETER_DANCE, MOVE_SKILL_SWAP, MOVE_FACADE, MOVE_HYPNOSIS}
     },
     {
     .iv = 255,
     .lvl = 50,
     .species = SPECIES_SLAKING,
     .heldItem = ITEM_SITRUS_BERRY,
-    .moves = MOVE_HYPER_BEAM, MOVE_FLAMETHROWER, MOVE_THUNDERBOLT, MOVE_SHADOW_BALL
+    .moves = {MOVE_HYPER_BEAM, MOVE_FLAMETHROWER, MOVE_THUNDERBOLT, MOVE_SHADOW_BALL}
     }
 };
 
@@ -10981,35 +10981,35 @@ static const struct TrainerMonItemCustomMoves sParty_Norman4[] = {
     .lvl = 52,
     .species = SPECIES_SLAKING,
     .heldItem = ITEM_SITRUS_BERRY,
-    .moves = MOVE_BLIZZARD, MOVE_SHADOW_BALL, MOVE_DOUBLE_EDGE, MOVE_FIRE_BLAST
+    .moves = {MOVE_BLIZZARD, MOVE_SHADOW_BALL, MOVE_DOUBLE_EDGE, MOVE_FIRE_BLAST}
     },
     {
     .iv = 255,
     .lvl = 52,
     .species = SPECIES_BLISSEY,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_LIGHT_SCREEN, MOVE_SING, MOVE_SKILL_SWAP, MOVE_FOCUS_PUNCH
+    .moves = {MOVE_LIGHT_SCREEN, MOVE_SING, MOVE_SKILL_SWAP, MOVE_FOCUS_PUNCH}
     },
     {
     .iv = 255,
     .lvl = 50,
     .species = SPECIES_KANGASKHAN,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_FAKE_OUT, MOVE_DIZZY_PUNCH, MOVE_ENDURE, MOVE_REVERSAL
+    .moves = {MOVE_FAKE_OUT, MOVE_DIZZY_PUNCH, MOVE_ENDURE, MOVE_REVERSAL}
     },
     {
     .iv = 255,
     .lvl = 53,
     .species = SPECIES_SPINDA,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_TEETER_DANCE, MOVE_SKILL_SWAP, MOVE_FACADE, MOVE_HYPNOSIS
+    .moves = {MOVE_TEETER_DANCE, MOVE_SKILL_SWAP, MOVE_FACADE, MOVE_HYPNOSIS}
     },
     {
     .iv = 255,
     .lvl = 55,
     .species = SPECIES_SLAKING,
     .heldItem = ITEM_SITRUS_BERRY,
-    .moves = MOVE_HYPER_BEAM, MOVE_FLAMETHROWER, MOVE_THUNDERBOLT, MOVE_SHADOW_BALL
+    .moves = {MOVE_HYPER_BEAM, MOVE_FLAMETHROWER, MOVE_THUNDERBOLT, MOVE_SHADOW_BALL}
     }
 };
 
@@ -11019,42 +11019,42 @@ static const struct TrainerMonItemCustomMoves sParty_Norman5[] = {
     .lvl = 57,
     .species = SPECIES_SLAKING,
     .heldItem = ITEM_SITRUS_BERRY,
-    .moves = MOVE_BLIZZARD, MOVE_SHADOW_BALL, MOVE_DOUBLE_EDGE, MOVE_FIRE_BLAST
+    .moves = {MOVE_BLIZZARD, MOVE_SHADOW_BALL, MOVE_DOUBLE_EDGE, MOVE_FIRE_BLAST}
     },
     {
     .iv = 255,
     .lvl = 57,
     .species = SPECIES_BLISSEY,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_PROTECT, MOVE_SING, MOVE_SKILL_SWAP, MOVE_FOCUS_PUNCH
+    .moves = {MOVE_PROTECT, MOVE_SING, MOVE_SKILL_SWAP, MOVE_FOCUS_PUNCH}
     },
     {
     .iv = 255,
     .lvl = 55,
     .species = SPECIES_KANGASKHAN,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_FAKE_OUT, MOVE_DIZZY_PUNCH, MOVE_ENDURE, MOVE_REVERSAL
+    .moves = {MOVE_FAKE_OUT, MOVE_DIZZY_PUNCH, MOVE_ENDURE, MOVE_REVERSAL}
     },
     {
     .iv = 255,
     .lvl = 57,
     .species = SPECIES_TAUROS,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_TAKE_DOWN, MOVE_PROTECT, MOVE_FIRE_BLAST, MOVE_EARTHQUAKE
+    .moves = {MOVE_TAKE_DOWN, MOVE_PROTECT, MOVE_FIRE_BLAST, MOVE_EARTHQUAKE}
     },
     {
     .iv = 255,
     .lvl = 58,
     .species = SPECIES_SPINDA,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_TEETER_DANCE, MOVE_SKILL_SWAP, MOVE_FACADE, MOVE_HYPNOSIS
+    .moves = {MOVE_TEETER_DANCE, MOVE_SKILL_SWAP, MOVE_FACADE, MOVE_HYPNOSIS}
     },
     {
     .iv = 255,
     .lvl = 60,
     .species = SPECIES_SLAKING,
     .heldItem = ITEM_SITRUS_BERRY,
-    .moves = MOVE_HYPER_BEAM, MOVE_FLAMETHROWER, MOVE_THUNDERBOLT, MOVE_SHADOW_BALL
+    .moves = {MOVE_HYPER_BEAM, MOVE_FLAMETHROWER, MOVE_THUNDERBOLT, MOVE_SHADOW_BALL}
     }
 };
 
@@ -11064,35 +11064,35 @@ static const struct TrainerMonItemCustomMoves sParty_Winona2[] = {
     .lvl = 40,
     .species = SPECIES_DRATINI,
     .heldItem = ITEM_SITRUS_BERRY,
-    .moves = MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT, MOVE_PROTECT, MOVE_ICE_BEAM
+    .moves = {MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT, MOVE_PROTECT, MOVE_ICE_BEAM}
     },
     {
     .iv = 255,
     .lvl = 38,
     .species = SPECIES_TROPIUS,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_SUNNY_DAY, MOVE_AERIAL_ACE, MOVE_SOLAR_BEAM, MOVE_EARTHQUAKE
+    .moves = {MOVE_SUNNY_DAY, MOVE_AERIAL_ACE, MOVE_SOLAR_BEAM, MOVE_EARTHQUAKE}
     },
     {
     .iv = 255,
     .lvl = 41,
     .species = SPECIES_PELIPPER,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_SURF, MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_AERIAL_ACE
+    .moves = {MOVE_SURF, MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_AERIAL_ACE}
     },
     {
     .iv = 255,
     .lvl = 43,
     .species = SPECIES_SKARMORY,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_WHIRLWIND, MOVE_SPIKES, MOVE_STEEL_WING, MOVE_AERIAL_ACE
+    .moves = {MOVE_WHIRLWIND, MOVE_SPIKES, MOVE_STEEL_WING, MOVE_AERIAL_ACE}
     },
     {
     .iv = 255,
     .lvl = 45,
     .species = SPECIES_ALTARIA,
     .heldItem = ITEM_CHESTO_BERRY,
-    .moves = MOVE_AERIAL_ACE, MOVE_REST, MOVE_DRAGON_DANCE, MOVE_EARTHQUAKE
+    .moves = {MOVE_AERIAL_ACE, MOVE_REST, MOVE_DRAGON_DANCE, MOVE_EARTHQUAKE}
     }
 };
 
@@ -11102,42 +11102,42 @@ static const struct TrainerMonItemCustomMoves sParty_Winona3[] = {
     .lvl = 43,
     .species = SPECIES_HOOTHOOT,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_HYPNOSIS, MOVE_PSYCHIC, MOVE_REFLECT, MOVE_DREAM_EATER
+    .moves = {MOVE_HYPNOSIS, MOVE_PSYCHIC, MOVE_REFLECT, MOVE_DREAM_EATER}
     },
     {
     .iv = 255,
     .lvl = 43,
     .species = SPECIES_TROPIUS,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_SUNNY_DAY, MOVE_AERIAL_ACE, MOVE_SOLAR_BEAM, MOVE_EARTHQUAKE
+    .moves = {MOVE_SUNNY_DAY, MOVE_AERIAL_ACE, MOVE_SOLAR_BEAM, MOVE_EARTHQUAKE}
     },
     {
     .iv = 255,
     .lvl = 45,
     .species = SPECIES_DRAGONAIR,
     .heldItem = ITEM_SITRUS_BERRY,
-    .moves = MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT, MOVE_PROTECT, MOVE_ICE_BEAM
+    .moves = {MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT, MOVE_PROTECT, MOVE_ICE_BEAM}
     },
     {
     .iv = 255,
     .lvl = 46,
     .species = SPECIES_PELIPPER,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_SURF, MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_AERIAL_ACE
+    .moves = {MOVE_SURF, MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_AERIAL_ACE}
     },
     {
     .iv = 255,
     .lvl = 48,
     .species = SPECIES_SKARMORY,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_WHIRLWIND, MOVE_SPIKES, MOVE_STEEL_WING, MOVE_AERIAL_ACE
+    .moves = {MOVE_WHIRLWIND, MOVE_SPIKES, MOVE_STEEL_WING, MOVE_AERIAL_ACE}
     },
     {
     .iv = 255,
     .lvl = 50,
     .species = SPECIES_ALTARIA,
     .heldItem = ITEM_CHESTO_BERRY,
-    .moves = MOVE_AERIAL_ACE, MOVE_REST, MOVE_DRAGON_DANCE, MOVE_EARTHQUAKE
+    .moves = {MOVE_AERIAL_ACE, MOVE_REST, MOVE_DRAGON_DANCE, MOVE_EARTHQUAKE}
     }
 };
 
@@ -11147,42 +11147,42 @@ static const struct TrainerMonItemCustomMoves sParty_Winona4[] = {
     .lvl = 48,
     .species = SPECIES_NOCTOWL,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_HYPNOSIS, MOVE_PSYCHIC, MOVE_REFLECT, MOVE_DREAM_EATER
+    .moves = {MOVE_HYPNOSIS, MOVE_PSYCHIC, MOVE_REFLECT, MOVE_DREAM_EATER}
     },
     {
     .iv = 255,
     .lvl = 49,
     .species = SPECIES_TROPIUS,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_SUNNY_DAY, MOVE_AERIAL_ACE, MOVE_SOLAR_BEAM, MOVE_EARTHQUAKE
+    .moves = {MOVE_SUNNY_DAY, MOVE_AERIAL_ACE, MOVE_SOLAR_BEAM, MOVE_EARTHQUAKE}
     },
     {
     .iv = 255,
     .lvl = 50,
     .species = SPECIES_DRAGONAIR,
     .heldItem = ITEM_SITRUS_BERRY,
-    .moves = MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT, MOVE_PROTECT, MOVE_ICE_BEAM
+    .moves = {MOVE_THUNDER_WAVE, MOVE_THUNDERBOLT, MOVE_PROTECT, MOVE_ICE_BEAM}
     },
     {
     .iv = 255,
     .lvl = 51,
     .species = SPECIES_PELIPPER,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_SURF, MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_AERIAL_ACE
+    .moves = {MOVE_SURF, MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_AERIAL_ACE}
     },
     {
     .iv = 255,
     .lvl = 53,
     .species = SPECIES_SKARMORY,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_WHIRLWIND, MOVE_SPIKES, MOVE_STEEL_WING, MOVE_AERIAL_ACE
+    .moves = {MOVE_WHIRLWIND, MOVE_SPIKES, MOVE_STEEL_WING, MOVE_AERIAL_ACE}
     },
     {
     .iv = 255,
     .lvl = 55,
     .species = SPECIES_ALTARIA,
     .heldItem = ITEM_CHESTO_BERRY,
-    .moves = MOVE_AERIAL_ACE, MOVE_REST, MOVE_DRAGON_DANCE, MOVE_EARTHQUAKE
+    .moves = {MOVE_AERIAL_ACE, MOVE_REST, MOVE_DRAGON_DANCE, MOVE_EARTHQUAKE}
     }
 };
 
@@ -11192,42 +11192,42 @@ static const struct TrainerMonItemCustomMoves sParty_Winona5[] = {
     .lvl = 53,
     .species = SPECIES_NOCTOWL,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_HYPNOSIS, MOVE_PSYCHIC, MOVE_REFLECT, MOVE_DREAM_EATER
+    .moves = {MOVE_HYPNOSIS, MOVE_PSYCHIC, MOVE_REFLECT, MOVE_DREAM_EATER}
     },
     {
     .iv = 255,
     .lvl = 54,
     .species = SPECIES_TROPIUS,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_SUNNY_DAY, MOVE_AERIAL_ACE, MOVE_SOLAR_BEAM, MOVE_EARTHQUAKE
+    .moves = {MOVE_SUNNY_DAY, MOVE_AERIAL_ACE, MOVE_SOLAR_BEAM, MOVE_EARTHQUAKE}
     },
     {
     .iv = 255,
     .lvl = 55,
     .species = SPECIES_PELIPPER,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_SURF, MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_AERIAL_ACE
+    .moves = {MOVE_SURF, MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_AERIAL_ACE}
     },
     {
     .iv = 255,
     .lvl = 55,
     .species = SPECIES_DRAGONITE,
     .heldItem = ITEM_SITRUS_BERRY,
-    .moves = MOVE_HYPER_BEAM, MOVE_THUNDERBOLT, MOVE_EARTHQUAKE, MOVE_ICE_BEAM
+    .moves = {MOVE_HYPER_BEAM, MOVE_THUNDERBOLT, MOVE_EARTHQUAKE, MOVE_ICE_BEAM}
     },
     {
     .iv = 255,
     .lvl = 58,
     .species = SPECIES_SKARMORY,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_WHIRLWIND, MOVE_SPIKES, MOVE_STEEL_WING, MOVE_AERIAL_ACE
+    .moves = {MOVE_WHIRLWIND, MOVE_SPIKES, MOVE_STEEL_WING, MOVE_AERIAL_ACE}
     },
     {
     .iv = 255,
     .lvl = 60,
     .species = SPECIES_ALTARIA,
     .heldItem = ITEM_CHESTO_BERRY,
-    .moves = MOVE_SKY_ATTACK, MOVE_REST, MOVE_DRAGON_DANCE, MOVE_EARTHQUAKE
+    .moves = {MOVE_SKY_ATTACK, MOVE_REST, MOVE_DRAGON_DANCE, MOVE_EARTHQUAKE}
     }
 };
 
@@ -11237,35 +11237,35 @@ static const struct TrainerMonItemCustomMoves sParty_TateAndLiza2[] = {
     .lvl = 48,
     .species = SPECIES_SLOWPOKE,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_YAWN, MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_PROTECT
+    .moves = {MOVE_YAWN, MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_PROTECT}
     },
     {
     .iv = 255,
     .lvl = 49,
     .species = SPECIES_CLAYDOL,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_PSYCHIC, MOVE_LIGHT_SCREEN
+    .moves = {MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_PSYCHIC, MOVE_LIGHT_SCREEN}
     },
     {
     .iv = 255,
     .lvl = 49,
     .species = SPECIES_XATU,
     .heldItem = ITEM_CHESTO_BERRY,
-    .moves = MOVE_PSYCHIC, MOVE_REST, MOVE_CONFUSE_RAY, MOVE_CALM_MIND
+    .moves = {MOVE_PSYCHIC, MOVE_REST, MOVE_CONFUSE_RAY, MOVE_CALM_MIND}
     },
     {
     .iv = 255,
     .lvl = 50,
     .species = SPECIES_LUNATONE,
     .heldItem = ITEM_CHESTO_BERRY,
-    .moves = MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_REST, MOVE_CALM_MIND
+    .moves = {MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_REST, MOVE_CALM_MIND}
     },
     {
     .iv = 255,
     .lvl = 50,
     .species = SPECIES_SOLROCK,
     .heldItem = ITEM_SITRUS_BERRY,
-    .moves = MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_PSYCHIC, MOVE_FLAMETHROWER
+    .moves = {MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_PSYCHIC, MOVE_FLAMETHROWER}
     }
 };
 
@@ -11275,42 +11275,42 @@ static const struct TrainerMonItemCustomMoves sParty_TateAndLiza3[] = {
     .lvl = 53,
     .species = SPECIES_DROWZEE,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_HYPNOSIS, MOVE_DREAM_EATER, MOVE_HEADBUTT, MOVE_PROTECT
+    .moves = {MOVE_HYPNOSIS, MOVE_DREAM_EATER, MOVE_HEADBUTT, MOVE_PROTECT}
     },
     {
     .iv = 255,
     .lvl = 53,
     .species = SPECIES_SLOWPOKE,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_YAWN, MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_PROTECT
+    .moves = {MOVE_YAWN, MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_PROTECT}
     },
     {
     .iv = 255,
     .lvl = 54,
     .species = SPECIES_CLAYDOL,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_EARTHQUAKE, MOVE_EXPLOSION, MOVE_PSYCHIC, MOVE_LIGHT_SCREEN
+    .moves = {MOVE_EARTHQUAKE, MOVE_EXPLOSION, MOVE_PSYCHIC, MOVE_LIGHT_SCREEN}
     },
     {
     .iv = 255,
     .lvl = 54,
     .species = SPECIES_XATU,
     .heldItem = ITEM_CHESTO_BERRY,
-    .moves = MOVE_PSYCHIC, MOVE_REST, MOVE_CONFUSE_RAY, MOVE_CALM_MIND
+    .moves = {MOVE_PSYCHIC, MOVE_REST, MOVE_CONFUSE_RAY, MOVE_CALM_MIND}
     },
     {
     .iv = 255,
     .lvl = 55,
     .species = SPECIES_LUNATONE,
     .heldItem = ITEM_CHESTO_BERRY,
-    .moves = MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_REST, MOVE_CALM_MIND
+    .moves = {MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_REST, MOVE_CALM_MIND}
     },
     {
     .iv = 255,
     .lvl = 55,
     .species = SPECIES_SOLROCK,
     .heldItem = ITEM_SITRUS_BERRY,
-    .moves = MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_PSYCHIC, MOVE_FLAMETHROWER
+    .moves = {MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_PSYCHIC, MOVE_FLAMETHROWER}
     }
 };
 
@@ -11320,42 +11320,42 @@ static const struct TrainerMonItemCustomMoves sParty_TateAndLiza4[] = {
     .lvl = 58,
     .species = SPECIES_HYPNO,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_HYPNOSIS, MOVE_DREAM_EATER, MOVE_HEADBUTT, MOVE_PROTECT
+    .moves = {MOVE_HYPNOSIS, MOVE_DREAM_EATER, MOVE_HEADBUTT, MOVE_PROTECT}
     },
     {
     .iv = 255,
     .lvl = 59,
     .species = SPECIES_CLAYDOL,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_EARTHQUAKE, MOVE_EXPLOSION, MOVE_PSYCHIC, MOVE_LIGHT_SCREEN
+    .moves = {MOVE_EARTHQUAKE, MOVE_EXPLOSION, MOVE_PSYCHIC, MOVE_LIGHT_SCREEN}
     },
     {
     .iv = 255,
     .lvl = 58,
     .species = SPECIES_SLOWPOKE,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_YAWN, MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_PROTECT
+    .moves = {MOVE_YAWN, MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_PROTECT}
     },
     {
     .iv = 255,
     .lvl = 59,
     .species = SPECIES_XATU,
     .heldItem = ITEM_CHESTO_BERRY,
-    .moves = MOVE_PSYCHIC, MOVE_REST, MOVE_CONFUSE_RAY, MOVE_CALM_MIND
+    .moves = {MOVE_PSYCHIC, MOVE_REST, MOVE_CONFUSE_RAY, MOVE_CALM_MIND}
     },
     {
     .iv = 255,
     .lvl = 60,
     .species = SPECIES_LUNATONE,
     .heldItem = ITEM_CHESTO_BERRY,
-    .moves = MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_REST, MOVE_CALM_MIND
+    .moves = {MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_REST, MOVE_CALM_MIND}
     },
     {
     .iv = 255,
     .lvl = 60,
     .species = SPECIES_SOLROCK,
     .heldItem = ITEM_SITRUS_BERRY,
-    .moves = MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_PSYCHIC, MOVE_FLAMETHROWER
+    .moves = {MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_PSYCHIC, MOVE_FLAMETHROWER}
     }
 };
 
@@ -11365,42 +11365,42 @@ static const struct TrainerMonItemCustomMoves sParty_TateAndLiza5[] = {
     .lvl = 63,
     .species = SPECIES_HYPNO,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_HYPNOSIS, MOVE_DREAM_EATER, MOVE_HEADBUTT, MOVE_PROTECT
+    .moves = {MOVE_HYPNOSIS, MOVE_DREAM_EATER, MOVE_HEADBUTT, MOVE_PROTECT}
     },
     {
     .iv = 255,
     .lvl = 64,
     .species = SPECIES_CLAYDOL,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_EARTHQUAKE, MOVE_EXPLOSION, MOVE_PSYCHIC, MOVE_LIGHT_SCREEN
+    .moves = {MOVE_EARTHQUAKE, MOVE_EXPLOSION, MOVE_PSYCHIC, MOVE_LIGHT_SCREEN}
     },
     {
     .iv = 255,
     .lvl = 63,
     .species = SPECIES_SLOWKING,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_YAWN, MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_PROTECT
+    .moves = {MOVE_YAWN, MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_PROTECT}
     },
     {
     .iv = 255,
     .lvl = 64,
     .species = SPECIES_XATU,
     .heldItem = ITEM_CHESTO_BERRY,
-    .moves = MOVE_PSYCHIC, MOVE_REST, MOVE_CONFUSE_RAY, MOVE_CALM_MIND
+    .moves = {MOVE_PSYCHIC, MOVE_REST, MOVE_CONFUSE_RAY, MOVE_CALM_MIND}
     },
     {
     .iv = 255,
     .lvl = 65,
     .species = SPECIES_LUNATONE,
     .heldItem = ITEM_CHESTO_BERRY,
-    .moves = MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_REST, MOVE_CALM_MIND
+    .moves = {MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_REST, MOVE_CALM_MIND}
     },
     {
     .iv = 255,
     .lvl = 65,
     .species = SPECIES_SOLROCK,
     .heldItem = ITEM_SITRUS_BERRY,
-    .moves = MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_PSYCHIC, MOVE_FLAMETHROWER
+    .moves = {MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_PSYCHIC, MOVE_FLAMETHROWER}
     }
 };
 
@@ -11410,35 +11410,35 @@ static const struct TrainerMonItemCustomMoves sParty_Juan2[] = {
     .lvl = 46,
     .species = SPECIES_POLIWAG,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_HYPNOSIS, MOVE_RAIN_DANCE, MOVE_PROTECT, MOVE_HYDRO_PUMP
+    .moves = {MOVE_HYPNOSIS, MOVE_RAIN_DANCE, MOVE_PROTECT, MOVE_HYDRO_PUMP}
     },
     {
     .iv = 255,
     .lvl = 46,
     .species = SPECIES_WHISCASH,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_FISSURE
+    .moves = {MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_FISSURE}
     },
     {
     .iv = 255,
     .lvl = 48,
     .species = SPECIES_WALREIN,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_WATER_PULSE, MOVE_BODY_SLAM, MOVE_PROTECT, MOVE_ICE_BEAM
+    .moves = {MOVE_WATER_PULSE, MOVE_BODY_SLAM, MOVE_PROTECT, MOVE_ICE_BEAM}
     },
     {
     .iv = 255,
     .lvl = 48,
     .species = SPECIES_CRAWDAUNT,
     .heldItem = ITEM_CHESTO_BERRY,
-    .moves = MOVE_REST, MOVE_CRABHAMMER, MOVE_TAUNT, MOVE_DOUBLE_TEAM
+    .moves = {MOVE_REST, MOVE_CRABHAMMER, MOVE_TAUNT, MOVE_DOUBLE_TEAM}
     },
     {
     .iv = 255,
     .lvl = 51,
     .species = SPECIES_KINGDRA,
     .heldItem = ITEM_CHESTO_BERRY,
-    .moves = MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_ICE_BEAM, MOVE_REST
+    .moves = {MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_ICE_BEAM, MOVE_REST}
     }
 };
 
@@ -11448,35 +11448,35 @@ static const struct TrainerMonItemCustomMoves sParty_Juan3[] = {
     .lvl = 50,
     .species = SPECIES_POLIWHIRL,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_HYPNOSIS, MOVE_RAIN_DANCE, MOVE_PROTECT, MOVE_HYDRO_PUMP
+    .moves = {MOVE_HYPNOSIS, MOVE_RAIN_DANCE, MOVE_PROTECT, MOVE_HYDRO_PUMP}
     },
     {
     .iv = 255,
     .lvl = 51,
     .species = SPECIES_WHISCASH,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_FISSURE
+    .moves = {MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_FISSURE}
     },
     {
     .iv = 255,
     .lvl = 53,
     .species = SPECIES_WALREIN,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_WATER_PULSE, MOVE_BODY_SLAM, MOVE_PROTECT, MOVE_ICE_BEAM
+    .moves = {MOVE_WATER_PULSE, MOVE_BODY_SLAM, MOVE_PROTECT, MOVE_ICE_BEAM}
     },
     {
     .iv = 255,
     .lvl = 53,
     .species = SPECIES_CRAWDAUNT,
     .heldItem = ITEM_CHESTO_BERRY,
-    .moves = MOVE_REST, MOVE_GUILLOTINE, MOVE_TAUNT, MOVE_DOUBLE_TEAM
+    .moves = {MOVE_REST, MOVE_GUILLOTINE, MOVE_TAUNT, MOVE_DOUBLE_TEAM}
     },
     {
     .iv = 255,
     .lvl = 56,
     .species = SPECIES_KINGDRA,
     .heldItem = ITEM_CHESTO_BERRY,
-    .moves = MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_ICE_BEAM, MOVE_REST
+    .moves = {MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_ICE_BEAM, MOVE_REST}
     }
 };
 
@@ -11486,42 +11486,42 @@ static const struct TrainerMonItemCustomMoves sParty_Juan4[] = {
     .lvl = 56,
     .species = SPECIES_LAPRAS,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_HYDRO_PUMP, MOVE_PERISH_SONG, MOVE_ICE_BEAM, MOVE_CONFUSE_RAY
+    .moves = {MOVE_HYDRO_PUMP, MOVE_PERISH_SONG, MOVE_ICE_BEAM, MOVE_CONFUSE_RAY}
     },
     {
     .iv = 255,
     .lvl = 58,
     .species = SPECIES_WHISCASH,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_FISSURE
+    .moves = {MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_FISSURE}
     },
     {
     .iv = 255,
     .lvl = 56,
     .species = SPECIES_POLIWHIRL,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_HYPNOSIS, MOVE_RAIN_DANCE, MOVE_PROTECT, MOVE_HYDRO_PUMP
+    .moves = {MOVE_HYPNOSIS, MOVE_RAIN_DANCE, MOVE_PROTECT, MOVE_HYDRO_PUMP}
     },
     {
     .iv = 255,
     .lvl = 58,
     .species = SPECIES_WALREIN,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_WATER_PULSE, MOVE_BODY_SLAM, MOVE_PROTECT, MOVE_ICE_BEAM
+    .moves = {MOVE_WATER_PULSE, MOVE_BODY_SLAM, MOVE_PROTECT, MOVE_ICE_BEAM}
     },
     {
     .iv = 255,
     .lvl = 58,
     .species = SPECIES_CRAWDAUNT,
     .heldItem = ITEM_CHESTO_BERRY,
-    .moves = MOVE_REST, MOVE_GUILLOTINE, MOVE_TAUNT, MOVE_DOUBLE_TEAM
+    .moves = {MOVE_REST, MOVE_GUILLOTINE, MOVE_TAUNT, MOVE_DOUBLE_TEAM}
     },
     {
     .iv = 255,
     .lvl = 61,
     .species = SPECIES_KINGDRA,
     .heldItem = ITEM_CHESTO_BERRY,
-    .moves = MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_ICE_BEAM, MOVE_REST
+    .moves = {MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_ICE_BEAM, MOVE_REST}
     }
 };
 
@@ -11531,42 +11531,42 @@ static const struct TrainerMonItemCustomMoves sParty_Juan5[] = {
     .lvl = 61,
     .species = SPECIES_LAPRAS,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_HYDRO_PUMP, MOVE_PERISH_SONG, MOVE_ICE_BEAM, MOVE_CONFUSE_RAY
+    .moves = {MOVE_HYDRO_PUMP, MOVE_PERISH_SONG, MOVE_ICE_BEAM, MOVE_CONFUSE_RAY}
     },
     {
     .iv = 255,
     .lvl = 63,
     .species = SPECIES_WHISCASH,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_FISSURE
+    .moves = {MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_FISSURE}
     },
     {
     .iv = 255,
     .lvl = 61,
     .species = SPECIES_POLITOED,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_HYPNOSIS, MOVE_RAIN_DANCE, MOVE_HYDRO_PUMP, MOVE_PERISH_SONG
+    .moves = {MOVE_HYPNOSIS, MOVE_RAIN_DANCE, MOVE_HYDRO_PUMP, MOVE_PERISH_SONG}
     },
     {
     .iv = 255,
     .lvl = 63,
     .species = SPECIES_WALREIN,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_WATER_PULSE, MOVE_BODY_SLAM, MOVE_PROTECT, MOVE_SHEER_COLD
+    .moves = {MOVE_WATER_PULSE, MOVE_BODY_SLAM, MOVE_PROTECT, MOVE_SHEER_COLD}
     },
     {
     .iv = 255,
     .lvl = 63,
     .species = SPECIES_CRAWDAUNT,
     .heldItem = ITEM_CHESTO_BERRY,
-    .moves = MOVE_REST, MOVE_GUILLOTINE, MOVE_TAUNT, MOVE_DOUBLE_TEAM
+    .moves = {MOVE_REST, MOVE_GUILLOTINE, MOVE_TAUNT, MOVE_DOUBLE_TEAM}
     },
     {
     .iv = 255,
     .lvl = 66,
     .species = SPECIES_KINGDRA,
     .heldItem = ITEM_CHESTO_BERRY,
-    .moves = MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_ICE_BEAM, MOVE_REST
+    .moves = {MOVE_WATER_PULSE, MOVE_DOUBLE_TEAM, MOVE_ICE_BEAM, MOVE_REST}
     }
 };
 
@@ -11576,14 +11576,14 @@ static const struct TrainerMonItemCustomMoves sParty_Angelo[] = {
     .lvl = 17,
     .species = SPECIES_ILLUMISE,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_SHOCK_WAVE, MOVE_QUICK_ATTACK, MOVE_CHARM, MOVE_NONE
+    .moves = {MOVE_SHOCK_WAVE, MOVE_QUICK_ATTACK, MOVE_CHARM, MOVE_NONE}
     },
     {
     .iv = 100,
     .lvl = 17,
     .species = SPECIES_VOLBEAT,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_SHOCK_WAVE, MOVE_QUICK_ATTACK, MOVE_CONFUSE_RAY, MOVE_NONE
+    .moves = {MOVE_SHOCK_WAVE, MOVE_QUICK_ATTACK, MOVE_CONFUSE_RAY, MOVE_NONE}
     }
 };
 
@@ -11601,42 +11601,42 @@ static const struct TrainerMonItemCustomMoves sParty_Steven[] = {
     .lvl = 77,
     .species = SPECIES_SKARMORY,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_TOXIC, MOVE_AERIAL_ACE, MOVE_SPIKES, MOVE_STEEL_WING
+    .moves = {MOVE_TOXIC, MOVE_AERIAL_ACE, MOVE_SPIKES, MOVE_STEEL_WING}
     },
     {
     .iv = 255,
     .lvl = 75,
     .species = SPECIES_CLAYDOL,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_REFLECT, MOVE_LIGHT_SCREEN, MOVE_ANCIENT_POWER, MOVE_EARTHQUAKE
+    .moves = {MOVE_REFLECT, MOVE_LIGHT_SCREEN, MOVE_ANCIENT_POWER, MOVE_EARTHQUAKE}
     },
     {
     .iv = 255,
     .lvl = 76,
     .species = SPECIES_AGGRON,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_THUNDER, MOVE_EARTHQUAKE, MOVE_SOLAR_BEAM, MOVE_DRAGON_CLAW
+    .moves = {MOVE_THUNDER, MOVE_EARTHQUAKE, MOVE_SOLAR_BEAM, MOVE_DRAGON_CLAW}
     },
     {
     .iv = 255,
     .lvl = 76,
     .species = SPECIES_CRADILY,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_GIGA_DRAIN, MOVE_ANCIENT_POWER, MOVE_INGRAIN, MOVE_CONFUSE_RAY
+    .moves = {MOVE_GIGA_DRAIN, MOVE_ANCIENT_POWER, MOVE_INGRAIN, MOVE_CONFUSE_RAY}
     },
     {
     .iv = 255,
     .lvl = 76,
     .species = SPECIES_ARMALDO,
     .heldItem = ITEM_NONE,
-    .moves = MOVE_WATER_PULSE, MOVE_ANCIENT_POWER, MOVE_AERIAL_ACE, MOVE_SLASH
+    .moves = {MOVE_WATER_PULSE, MOVE_ANCIENT_POWER, MOVE_AERIAL_ACE, MOVE_SLASH}
     },
     {
     .iv = 255,
     .lvl = 78,
     .species = SPECIES_METAGROSS,
     .heldItem = ITEM_SITRUS_BERRY,
-    .moves = MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_METEOR_MASH, MOVE_SHADOW_BALL
+    .moves = {MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_METEOR_MASH, MOVE_SHADOW_BALL}
     }
 };
 
@@ -12419,7 +12419,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Leaf[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Brendan16[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_BrendanLinkPlaceholder[] = {
     {
     .iv = 0,
     .lvl = 5,
@@ -12427,7 +12427,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Brendan16[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_May16[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_MayLinkPlaceholder[] = {
     {
     .iv = 0,
     .lvl = 5,
diff --git a/src/data/trainers.h b/src/data/trainers.h
index c30d21afd..163a8296d 100644
--- a/src/data/trainers.h
+++ b/src/data/trainers.h
@@ -27,7 +27,7 @@ const struct Trainer gTrainers[] = {
         .party = {.NoItemDefaultMoves = sParty_Sawyer1},
     },
 
-    [TRAINER_GRUNT_1] =
+    [TRAINER_GRUNT_AQUA_HIDEOUT_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -37,11 +37,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt1),
-        .party = {.NoItemDefaultMoves = sParty_Grunt1},
+        .partySize = ARRAY_COUNT(sParty_GruntAquaHideout1),
+        .party = {.NoItemDefaultMoves = sParty_GruntAquaHideout1},
     },
 
-    [TRAINER_GRUNT_2] =
+    [TRAINER_GRUNT_AQUA_HIDEOUT_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -51,11 +51,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt2),
-        .party = {.NoItemDefaultMoves = sParty_Grunt2},
+        .partySize = ARRAY_COUNT(sParty_GruntAquaHideout2),
+        .party = {.NoItemDefaultMoves = sParty_GruntAquaHideout2},
     },
 
-    [TRAINER_GRUNT_3] =
+    [TRAINER_GRUNT_AQUA_HIDEOUT_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -65,11 +65,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt3),
-        .party = {.NoItemDefaultMoves = sParty_Grunt3},
+        .partySize = ARRAY_COUNT(sParty_GruntAquaHideout3),
+        .party = {.NoItemDefaultMoves = sParty_GruntAquaHideout3},
     },
 
-    [TRAINER_GRUNT_4] =
+    [TRAINER_GRUNT_AQUA_HIDEOUT_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -79,11 +79,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt4),
-        .party = {.NoItemDefaultMoves = sParty_Grunt4},
+        .partySize = ARRAY_COUNT(sParty_GruntAquaHideout4),
+        .party = {.NoItemDefaultMoves = sParty_GruntAquaHideout4},
     },
 
-    [TRAINER_GRUNT_5] =
+    [TRAINER_GRUNT_SEAFLOOR_CAVERN_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -93,11 +93,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt5),
-        .party = {.NoItemDefaultMoves = sParty_Grunt5},
+        .partySize = ARRAY_COUNT(sParty_GruntSeafloorCavern1),
+        .party = {.NoItemDefaultMoves = sParty_GruntSeafloorCavern1},
     },
 
-    [TRAINER_GRUNT_6] =
+    [TRAINER_GRUNT_SEAFLOOR_CAVERN_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -107,11 +107,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt6),
-        .party = {.NoItemDefaultMoves = sParty_Grunt6},
+        .partySize = ARRAY_COUNT(sParty_GruntSeafloorCavern2),
+        .party = {.NoItemDefaultMoves = sParty_GruntSeafloorCavern2},
     },
 
-    [TRAINER_GRUNT_7] =
+    [TRAINER_GRUNT_SEAFLOOR_CAVERN_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -121,8 +121,8 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt7),
-        .party = {.NoItemDefaultMoves = sParty_Grunt7},
+        .partySize = ARRAY_COUNT(sParty_GruntSeafloorCavern3),
+        .party = {.NoItemDefaultMoves = sParty_GruntSeafloorCavern3},
     },
 
     [TRAINER_GABRIELLE_1] =
@@ -139,7 +139,7 @@ const struct Trainer gTrainers[] = {
         .party = {.NoItemDefaultMoves = sParty_Gabrielle1},
     },
 
-    [TRAINER_GRUNT_8] =
+    [TRAINER_GRUNT_PETALBURG_WOODS] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -149,8 +149,8 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt8),
-        .party = {.NoItemDefaultMoves = sParty_Grunt8},
+        .partySize = ARRAY_COUNT(sParty_GruntPetalburgWoods),
+        .party = {.NoItemDefaultMoves = sParty_GruntPetalburgWoods},
     },
 
     [TRAINER_MARCEL] =
@@ -195,7 +195,7 @@ const struct Trainer gTrainers[] = {
         .party = {.NoItemDefaultMoves = sParty_Ed},
     },
 
-    [TRAINER_GRUNT_9] =
+    [TRAINER_GRUNT_SEAFLOOR_CAVERN_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -205,8 +205,8 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt9),
-        .party = {.NoItemDefaultMoves = sParty_Grunt9},
+        .partySize = ARRAY_COUNT(sParty_GruntSeafloorCavern4),
+        .party = {.NoItemDefaultMoves = sParty_GruntSeafloorCavern4},
     },
 
     [TRAINER_DECLAN] =
@@ -223,7 +223,7 @@ const struct Trainer gTrainers[] = {
         .party = {.NoItemDefaultMoves = sParty_Declan},
     },
 
-    [TRAINER_GRUNT_10] =
+    [TRAINER_GRUNT_RUSTURF_TUNNEL] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -233,11 +233,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt10),
-        .party = {.NoItemDefaultMoves = sParty_Grunt10},
+        .partySize = ARRAY_COUNT(sParty_GruntRusturfTunnel),
+        .party = {.NoItemDefaultMoves = sParty_GruntRusturfTunnel},
     },
 
-    [TRAINER_GRUNT_11] =
+    [TRAINER_GRUNT_WEATHER_INST_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -247,11 +247,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt11),
-        .party = {.NoItemDefaultMoves = sParty_Grunt11},
+        .partySize = ARRAY_COUNT(sParty_GruntWeatherInst1),
+        .party = {.NoItemDefaultMoves = sParty_GruntWeatherInst1},
     },
 
-    [TRAINER_GRUNT_12] =
+    [TRAINER_GRUNT_WEATHER_INST_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -261,11 +261,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt12),
-        .party = {.NoItemDefaultMoves = sParty_Grunt12},
+        .partySize = ARRAY_COUNT(sParty_GruntWeatherInst2),
+        .party = {.NoItemDefaultMoves = sParty_GruntWeatherInst2},
     },
 
-    [TRAINER_GRUNT_13] =
+    [TRAINER_GRUNT_WEATHER_INST_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -275,11 +275,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt13),
-        .party = {.NoItemDefaultMoves = sParty_Grunt13},
+        .partySize = ARRAY_COUNT(sParty_GruntWeatherInst3),
+        .party = {.NoItemDefaultMoves = sParty_GruntWeatherInst3},
     },
 
-    [TRAINER_GRUNT_14] =
+    [TRAINER_GRUNT_MUSEUM_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -289,11 +289,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt14),
-        .party = {.NoItemDefaultMoves = sParty_Grunt14},
+        .partySize = ARRAY_COUNT(sParty_GruntMuseum1),
+        .party = {.NoItemDefaultMoves = sParty_GruntMuseum1},
     },
 
-    [TRAINER_GRUNT_15] =
+    [TRAINER_GRUNT_MUSEUM_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -303,11 +303,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt15),
-        .party = {.NoItemDefaultMoves = sParty_Grunt15},
+        .partySize = ARRAY_COUNT(sParty_GruntMuseum2),
+        .party = {.NoItemDefaultMoves = sParty_GruntMuseum2},
     },
 
-    [TRAINER_GRUNT_16] =
+    [TRAINER_GRUNT_SPACE_CENTER_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -317,11 +317,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt16),
-        .party = {.NoItemDefaultMoves = sParty_Grunt16},
+        .partySize = ARRAY_COUNT(sParty_GruntSpaceCenter1),
+        .party = {.NoItemDefaultMoves = sParty_GruntSpaceCenter1},
     },
 
-    [TRAINER_GRUNT_17] =
+    [TRAINER_GRUNT_MT_PYRE_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -331,11 +331,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt17),
-        .party = {.NoItemDefaultMoves = sParty_Grunt17},
+        .partySize = ARRAY_COUNT(sParty_GruntMtPyre1),
+        .party = {.NoItemDefaultMoves = sParty_GruntMtPyre1},
     },
 
-    [TRAINER_GRUNT_18] =
+    [TRAINER_GRUNT_MT_PYRE_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -345,11 +345,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt18),
-        .party = {.NoItemDefaultMoves = sParty_Grunt18},
+        .partySize = ARRAY_COUNT(sParty_GruntMtPyre2),
+        .party = {.NoItemDefaultMoves = sParty_GruntMtPyre2},
     },
 
-    [TRAINER_GRUNT_19] =
+    [TRAINER_GRUNT_MT_PYRE_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -359,11 +359,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt19),
-        .party = {.NoItemDefaultMoves = sParty_Grunt19},
+        .partySize = ARRAY_COUNT(sParty_GruntMtPyre3),
+        .party = {.NoItemDefaultMoves = sParty_GruntMtPyre3},
     },
 
-    [TRAINER_GRUNT_20] =
+    [TRAINER_GRUNT_WEATHER_INST_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -373,11 +373,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt20),
-        .party = {.NoItemDefaultMoves = sParty_Grunt20},
+        .partySize = ARRAY_COUNT(sParty_GruntWeatherInst4),
+        .party = {.NoItemDefaultMoves = sParty_GruntWeatherInst4},
     },
 
-    [TRAINER_GRUNT_21] =
+    [TRAINER_GRUNT_AQUA_HIDEOUT_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -387,11 +387,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt21),
-        .party = {.NoItemDefaultMoves = sParty_Grunt21},
+        .partySize = ARRAY_COUNT(sParty_GruntAquaHideout5),
+        .party = {.NoItemDefaultMoves = sParty_GruntAquaHideout5},
     },
 
-    [TRAINER_GRUNT_22] =
+    [TRAINER_GRUNT_AQUA_HIDEOUT_6] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -401,8 +401,8 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt22),
-        .party = {.NoItemDefaultMoves = sParty_Grunt22},
+        .partySize = ARRAY_COUNT(sParty_GruntAquaHideout6),
+        .party = {.NoItemDefaultMoves = sParty_GruntAquaHideout6},
     },
 
     [TRAINER_FREDRICK] =
@@ -447,7 +447,7 @@ const struct Trainer gTrainers[] = {
         .party = {.NoItemDefaultMoves = sParty_Zander},
     },
 
-    [TRAINER_SHELLY_1] =
+    [TRAINER_SHELLY_WEATHER_INSTITUTE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AQUA_ADMIN,
@@ -457,11 +457,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
-        .partySize = ARRAY_COUNT(sParty_Shelly1),
-        .party = {.NoItemDefaultMoves = sParty_Shelly1},
+        .partySize = ARRAY_COUNT(sParty_ShellyWeatherInstitute),
+        .party = {.NoItemDefaultMoves = sParty_ShellyWeatherInstitute},
     },
 
-    [TRAINER_SHELLY_2] =
+    [TRAINER_SHELLY_SEAFLOOR_CAVERN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AQUA_ADMIN,
@@ -471,8 +471,8 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
-        .partySize = ARRAY_COUNT(sParty_Shelly2),
-        .party = {.NoItemDefaultMoves = sParty_Shelly2},
+        .partySize = ARRAY_COUNT(sParty_ShellySeafloorCavern),
+        .party = {.NoItemDefaultMoves = sParty_ShellySeafloorCavern},
     },
 
     [TRAINER_ARCHIE] =
@@ -1623,7 +1623,7 @@ const struct Trainer gTrainers[] = {
         .party = {.ItemCustomMoves = sParty_Daphne},
     },
 
-    [TRAINER_GRUNT_23] =
+    [TRAINER_GRUNT_SPACE_CENTER_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -1633,8 +1633,8 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt23),
-        .party = {.NoItemDefaultMoves = sParty_Grunt23},
+        .partySize = ARRAY_COUNT(sParty_GruntSpaceCenter2),
+        .party = {.NoItemDefaultMoves = sParty_GruntSpaceCenter2},
     },
 
     [TRAINER_CINDY_2] =
@@ -2043,7 +2043,7 @@ const struct Trainer gTrainers[] = {
         .party = {.NoItemDefaultMoves = sParty_Mark},
     },
 
-    [TRAINER_GRUNT_24] =
+    [TRAINER_GRUNT_MT_CHIMNEY_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -2053,8 +2053,8 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt24),
-        .party = {.NoItemDefaultMoves = sParty_Grunt24},
+        .partySize = ARRAY_COUNT(sParty_GruntMtChimney1),
+        .party = {.NoItemDefaultMoves = sParty_GruntMtChimney1},
     },
 
     [TRAINER_STEVE_2] =
@@ -2687,7 +2687,7 @@ const struct Trainer gTrainers[] = {
         .party = {.NoItemCustomMoves = sParty_Kirk},
     },
 
-    [TRAINER_GRUNT_25] =
+    [TRAINER_GRUNT_AQUA_HIDEOUT_7] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -2697,11 +2697,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt25),
-        .party = {.NoItemDefaultMoves = sParty_Grunt25},
+        .partySize = ARRAY_COUNT(sParty_GruntAquaHideout7),
+        .party = {.NoItemDefaultMoves = sParty_GruntAquaHideout7},
     },
 
-    [TRAINER_GRUNT_26] =
+    [TRAINER_GRUNT_AQUA_HIDEOUT_8] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -2711,8 +2711,8 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt26),
-        .party = {.NoItemDefaultMoves = sParty_Grunt26},
+        .partySize = ARRAY_COUNT(sParty_GruntAquaHideout8),
+        .party = {.NoItemDefaultMoves = sParty_GruntAquaHideout8},
     },
 
     [TRAINER_SHAWN] =
@@ -7195,7 +7195,7 @@ const struct Trainer gTrainers[] = {
         .party = {.NoItemDefaultMoves = sParty_Hector},
     },
 
-    [TRAINER_TABITHA_1] =
+    [TRAINER_TABITHA_MOSSDEEP] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_MAGMA_ADMIN,
@@ -7205,8 +7205,8 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Tabitha1),
-        .party = {.NoItemDefaultMoves = sParty_Tabitha1},
+        .partySize = ARRAY_COUNT(sParty_TabithaMossdeep),
+        .party = {.NoItemDefaultMoves = sParty_TabithaMossdeep},
     },
 
     [TRAINER_EDWIN_2] =
@@ -7265,7 +7265,7 @@ const struct Trainer gTrainers[] = {
         .party = {.NoItemDefaultMoves = sParty_Edwin5},
     },
 
-    [TRAINER_WALLY_1] =
+    [TRAINER_WALLY_VR_1] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -7275,11 +7275,11 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
-        .partySize = ARRAY_COUNT(sParty_Wally1),
-        .party = {.NoItemCustomMoves = sParty_Wally1},
+        .partySize = ARRAY_COUNT(sParty_WallyVR1),
+        .party = {.NoItemCustomMoves = sParty_WallyVR1},
     },
 
-    [TRAINER_BRENDAN_1] =
+    [TRAINER_BRENDAN_ROUTE_103_MUDKIP] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -7289,11 +7289,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
-        .partySize = ARRAY_COUNT(sParty_Brendan1),
-        .party = {.NoItemDefaultMoves = sParty_Brendan1},
+        .partySize = ARRAY_COUNT(sParty_BrendanRoute103Mudkip),
+        .party = {.NoItemDefaultMoves = sParty_BrendanRoute103Mudkip},
     },
 
-    [TRAINER_BRENDAN_2] =
+    [TRAINER_BRENDAN_ROUTE_110_MUDKIP] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -7303,11 +7303,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
-        .partySize = ARRAY_COUNT(sParty_Brendan2),
-        .party = {.NoItemDefaultMoves = sParty_Brendan2},
+        .partySize = ARRAY_COUNT(sParty_BrendanRoute110Mudkip),
+        .party = {.NoItemDefaultMoves = sParty_BrendanRoute110Mudkip},
     },
 
-    [TRAINER_BRENDAN_3] =
+    [TRAINER_BRENDAN_ROUTE_119_MUDKIP] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -7317,11 +7317,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
-        .partySize = ARRAY_COUNT(sParty_Brendan3),
-        .party = {.NoItemDefaultMoves = sParty_Brendan3},
+        .partySize = ARRAY_COUNT(sParty_BrendanRoute119Mudkip),
+        .party = {.NoItemDefaultMoves = sParty_BrendanRoute119Mudkip},
     },
 
-    [TRAINER_BRENDAN_4] =
+    [TRAINER_BRENDAN_ROUTE_103_TREECKO] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -7331,11 +7331,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_SETUP_FIRST_TURN,
-        .partySize = ARRAY_COUNT(sParty_Brendan4),
-        .party = {.NoItemDefaultMoves = sParty_Brendan4},
+        .partySize = ARRAY_COUNT(sParty_BrendanRoute103Treecko),
+        .party = {.NoItemDefaultMoves = sParty_BrendanRoute103Treecko},
     },
 
-    [TRAINER_BRENDAN_5] =
+    [TRAINER_BRENDAN_ROUTE_110_TREECKO] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -7345,11 +7345,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
-        .partySize = ARRAY_COUNT(sParty_Brendan5),
-        .party = {.NoItemDefaultMoves = sParty_Brendan5},
+        .partySize = ARRAY_COUNT(sParty_BrendanRoute110Treecko),
+        .party = {.NoItemDefaultMoves = sParty_BrendanRoute110Treecko},
     },
 
-    [TRAINER_BRENDAN_6] =
+    [TRAINER_BRENDAN_ROUTE_119_TREECKO] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -7359,11 +7359,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
-        .partySize = ARRAY_COUNT(sParty_Brendan6),
-        .party = {.NoItemDefaultMoves = sParty_Brendan6},
+        .partySize = ARRAY_COUNT(sParty_BrendanRoute119Treecko),
+        .party = {.NoItemDefaultMoves = sParty_BrendanRoute119Treecko},
     },
 
-    [TRAINER_BRENDAN_7] =
+    [TRAINER_BRENDAN_ROUTE_103_TORCHIC] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -7373,11 +7373,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
-        .partySize = ARRAY_COUNT(sParty_Brendan7),
-        .party = {.NoItemDefaultMoves = sParty_Brendan7},
+        .partySize = ARRAY_COUNT(sParty_BrendanRoute103Torchic),
+        .party = {.NoItemDefaultMoves = sParty_BrendanRoute103Torchic},
     },
 
-    [TRAINER_BRENDAN_8] =
+    [TRAINER_BRENDAN_ROUTE_110_TORCHIC] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -7387,11 +7387,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
-        .partySize = ARRAY_COUNT(sParty_Brendan8),
-        .party = {.NoItemDefaultMoves = sParty_Brendan8},
+        .partySize = ARRAY_COUNT(sParty_BrendanRoute110Torchic),
+        .party = {.NoItemDefaultMoves = sParty_BrendanRoute110Torchic},
     },
 
-    [TRAINER_BRENDAN_9] =
+    [TRAINER_BRENDAN_ROUTE_119_TORCHIC] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -7401,11 +7401,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
-        .partySize = ARRAY_COUNT(sParty_Brendan9),
-        .party = {.NoItemDefaultMoves = sParty_Brendan9},
+        .partySize = ARRAY_COUNT(sParty_BrendanRoute119Torchic),
+        .party = {.NoItemDefaultMoves = sParty_BrendanRoute119Torchic},
     },
 
-    [TRAINER_MAY_1] =
+    [TRAINER_MAY_ROUTE_103_MUDKIP] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -7415,11 +7415,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
-        .partySize = ARRAY_COUNT(sParty_May1),
-        .party = {.NoItemDefaultMoves = sParty_May1},
+        .partySize = ARRAY_COUNT(sParty_MayRoute103Mudkip),
+        .party = {.NoItemDefaultMoves = sParty_MayRoute103Mudkip},
     },
 
-    [TRAINER_MAY_2] =
+    [TRAINER_MAY_ROUTE_110_MUDKIP] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -7429,11 +7429,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
-        .partySize = ARRAY_COUNT(sParty_May2),
-        .party = {.NoItemDefaultMoves = sParty_May2},
+        .partySize = ARRAY_COUNT(sParty_MayRoute110Mudkip),
+        .party = {.NoItemDefaultMoves = sParty_MayRoute110Mudkip},
     },
 
-    [TRAINER_MAY_3] =
+    [TRAINER_MAY_ROUTE_119_MUDKIP] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -7443,11 +7443,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
-        .partySize = ARRAY_COUNT(sParty_May3),
-        .party = {.NoItemDefaultMoves = sParty_May3},
+        .partySize = ARRAY_COUNT(sParty_MayRoute119Mudkip),
+        .party = {.NoItemDefaultMoves = sParty_MayRoute119Mudkip},
     },
 
-    [TRAINER_MAY_4] =
+    [TRAINER_MAY_ROUTE_103_TREECKO] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -7457,11 +7457,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
-        .partySize = ARRAY_COUNT(sParty_May4),
-        .party = {.NoItemDefaultMoves = sParty_May4},
+        .partySize = ARRAY_COUNT(sParty_MayRoute103Treecko),
+        .party = {.NoItemDefaultMoves = sParty_MayRoute103Treecko},
     },
 
-    [TRAINER_MAY_5] =
+    [TRAINER_MAY_ROUTE_110_TREECKO] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -7471,11 +7471,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
-        .partySize = ARRAY_COUNT(sParty_May5),
-        .party = {.NoItemDefaultMoves = sParty_May5},
+        .partySize = ARRAY_COUNT(sParty_MayRoute110Treecko),
+        .party = {.NoItemDefaultMoves = sParty_MayRoute110Treecko},
     },
 
-    [TRAINER_MAY_6] =
+    [TRAINER_MAY_ROUTE_119_TREECKO] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -7485,11 +7485,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
-        .partySize = ARRAY_COUNT(sParty_May6),
-        .party = {.NoItemDefaultMoves = sParty_May6},
+        .partySize = ARRAY_COUNT(sParty_MayRoute119Treecko),
+        .party = {.NoItemDefaultMoves = sParty_MayRoute119Treecko},
     },
 
-    [TRAINER_MAY_7] =
+    [TRAINER_MAY_ROUTE_103_TORCHIC] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -7499,11 +7499,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
-        .partySize = ARRAY_COUNT(sParty_May7),
-        .party = {.NoItemDefaultMoves = sParty_May7},
+        .partySize = ARRAY_COUNT(sParty_MayRoute103Torchic),
+        .party = {.NoItemDefaultMoves = sParty_MayRoute103Torchic},
     },
 
-    [TRAINER_MAY_8] =
+    [TRAINER_MAY_ROUTE_110_TORCHIC] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -7513,11 +7513,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
-        .partySize = ARRAY_COUNT(sParty_May8),
-        .party = {.NoItemDefaultMoves = sParty_May8},
+        .partySize = ARRAY_COUNT(sParty_MayRoute110Torchic),
+        .party = {.NoItemDefaultMoves = sParty_MayRoute110Torchic},
     },
 
-    [TRAINER_MAY_9] =
+    [TRAINER_MAY_ROUTE_119_TORCHIC] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -7527,8 +7527,8 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
-        .partySize = ARRAY_COUNT(sParty_May9),
-        .party = {.NoItemDefaultMoves = sParty_May9},
+        .partySize = ARRAY_COUNT(sParty_MayRoute119Torchic),
+        .party = {.NoItemDefaultMoves = sParty_MayRoute119Torchic},
     },
 
     [TRAINER_ISAAC_1] =
@@ -7937,7 +7937,7 @@ const struct Trainer gTrainers[] = {
         .party = {.NoItemDefaultMoves = sParty_Julio},
     },
 
-    [TRAINER_GRUNT_27] =
+    [TRAINER_GRUNT_SEAFLOOR_CAVERN_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -7947,11 +7947,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt27),
-        .party = {.NoItemDefaultMoves = sParty_Grunt27},
+        .partySize = ARRAY_COUNT(sParty_GruntSeafloorCavern5),
+        .party = {.NoItemDefaultMoves = sParty_GruntSeafloorCavern5},
     },
 
-    [TRAINER_GRUNT_28] =
+    [TRAINER_GRUNT_UNUSED] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -7961,11 +7961,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt28),
-        .party = {.NoItemDefaultMoves = sParty_Grunt28},
+        .partySize = ARRAY_COUNT(sParty_GruntUnused),
+        .party = {.NoItemDefaultMoves = sParty_GruntUnused},
     },
 
-    [TRAINER_GRUNT_29] =
+    [TRAINER_GRUNT_MT_PYRE_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -7975,11 +7975,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt29),
-        .party = {.NoItemDefaultMoves = sParty_Grunt29},
+        .partySize = ARRAY_COUNT(sParty_GruntMtPyre4),
+        .party = {.NoItemDefaultMoves = sParty_GruntMtPyre4},
     },
 
-    [TRAINER_GRUNT_30] =
+    [TRAINER_GRUNT_JAGGED_PASS] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -7989,8 +7989,8 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt30),
-        .party = {.NoItemDefaultMoves = sParty_Grunt30},
+        .partySize = ARRAY_COUNT(sParty_GruntJaggedPass),
+        .party = {.NoItemDefaultMoves = sParty_GruntJaggedPass},
     },
 
     [TRAINER_MARC] =
@@ -8105,7 +8105,7 @@ const struct Trainer gTrainers[] = {
         .party = {.NoItemDefaultMoves = sParty_Harrison},
     },
 
-    [TRAINER_GRUNT_31] =
+    [TRAINER_GRUNT_MT_CHIMNEY_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8115,8 +8115,8 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt31),
-        .party = {.NoItemDefaultMoves = sParty_Grunt31},
+        .partySize = ARRAY_COUNT(sParty_GruntMtChimney2),
+        .party = {.NoItemDefaultMoves = sParty_GruntMtChimney2},
     },
 
     [TRAINER_CLARENCE] =
@@ -8203,7 +8203,7 @@ const struct Trainer gTrainers[] = {
         .party = {.NoItemDefaultMoves = sParty_Nicholas},
     },
 
-    [TRAINER_GRUNT_32] =
+    [TRAINER_GRUNT_SPACE_CENTER_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8213,11 +8213,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt32),
-        .party = {.NoItemDefaultMoves = sParty_Grunt32},
+        .partySize = ARRAY_COUNT(sParty_GruntSpaceCenter3),
+        .party = {.NoItemDefaultMoves = sParty_GruntSpaceCenter3},
     },
 
-    [TRAINER_GRUNT_33] =
+    [TRAINER_GRUNT_SPACE_CENTER_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8227,11 +8227,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt33),
-        .party = {.NoItemDefaultMoves = sParty_Grunt33},
+        .partySize = ARRAY_COUNT(sParty_GruntSpaceCenter4),
+        .party = {.NoItemDefaultMoves = sParty_GruntSpaceCenter4},
     },
 
-    [TRAINER_GRUNT_34] =
+    [TRAINER_GRUNT_SPACE_CENTER_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8241,11 +8241,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt34),
-        .party = {.NoItemDefaultMoves = sParty_Grunt34},
+        .partySize = ARRAY_COUNT(sParty_GruntSpaceCenter5),
+        .party = {.NoItemDefaultMoves = sParty_GruntSpaceCenter5},
     },
 
-    [TRAINER_GRUNT_35] =
+    [TRAINER_GRUNT_SPACE_CENTER_6] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8255,11 +8255,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt35),
-        .party = {.NoItemDefaultMoves = sParty_Grunt35},
+        .partySize = ARRAY_COUNT(sParty_GruntSpaceCenter6),
+        .party = {.NoItemDefaultMoves = sParty_GruntSpaceCenter6},
     },
 
-    [TRAINER_GRUNT_36] =
+    [TRAINER_GRUNT_SPACE_CENTER_7] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8269,8 +8269,8 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt36),
-        .party = {.NoItemDefaultMoves = sParty_Grunt36},
+        .partySize = ARRAY_COUNT(sParty_GruntSpaceCenter7),
+        .party = {.NoItemDefaultMoves = sParty_GruntSpaceCenter7},
     },
 
     [TRAINER_MACEY] =
@@ -8287,7 +8287,7 @@ const struct Trainer gTrainers[] = {
         .party = {.NoItemDefaultMoves = sParty_Macey},
     },
 
-    [TRAINER_BRENDAN_10] =
+    [TRAINER_BRENDAN_RUSTBORO_TREECKO] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -8297,11 +8297,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Brendan10),
-        .party = {.NoItemDefaultMoves = sParty_Brendan10},
+        .partySize = ARRAY_COUNT(sParty_BrendanRustboroTreecko),
+        .party = {.NoItemDefaultMoves = sParty_BrendanRustboroTreecko},
     },
 
-    [TRAINER_BRENDAN_11] =
+    [TRAINER_BRENDAN_RUSTBORO_MUDKIP] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -8311,8 +8311,8 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Brendan11),
-        .party = {.NoItemDefaultMoves = sParty_Brendan11},
+        .partySize = ARRAY_COUNT(sParty_BrendanRustboroMudkip),
+        .party = {.NoItemDefaultMoves = sParty_BrendanRustboroMudkip},
     },
 
     [TRAINER_PAXTON] =
@@ -8343,7 +8343,7 @@ const struct Trainer gTrainers[] = {
         .party = {.NoItemDefaultMoves = sParty_Isabella},
     },
 
-    [TRAINER_GRUNT_37] =
+    [TRAINER_GRUNT_WEATHER_INST_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -8353,11 +8353,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt37),
-        .party = {.NoItemDefaultMoves = sParty_Grunt37},
+        .partySize = ARRAY_COUNT(sParty_GruntWeatherInst5),
+        .party = {.NoItemDefaultMoves = sParty_GruntWeatherInst5},
     },
 
-    [TRAINER_TABITHA_2] =
+    [TRAINER_TABITHA_MT_CHIMNEY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_MAGMA_ADMIN,
@@ -8367,8 +8367,8 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
-        .partySize = ARRAY_COUNT(sParty_Tabitha2),
-        .party = {.NoItemDefaultMoves = sParty_Tabitha2},
+        .partySize = ARRAY_COUNT(sParty_TabithaMtChimney),
+        .party = {.NoItemDefaultMoves = sParty_TabithaMtChimney},
     },
 
     [TRAINER_JONATHAN] =
@@ -8385,7 +8385,7 @@ const struct Trainer gTrainers[] = {
         .party = {.NoItemDefaultMoves = sParty_Jonathan},
     },
 
-    [TRAINER_BRENDAN_12] =
+    [TRAINER_BRENDAN_RUSTBORO_TORCHIC] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -8395,11 +8395,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
-        .partySize = ARRAY_COUNT(sParty_Brendan12),
-        .party = {.NoItemDefaultMoves = sParty_Brendan12},
+        .partySize = ARRAY_COUNT(sParty_BrendanRustboroTorchic),
+        .party = {.NoItemDefaultMoves = sParty_BrendanRustboroTorchic},
     },
 
-    [TRAINER_MAY_10] =
+    [TRAINER_MAY_RUSTBORO_MUDKIP] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -8409,11 +8409,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_SETUP_FIRST_TURN,
-        .partySize = ARRAY_COUNT(sParty_May10),
-        .party = {.NoItemDefaultMoves = sParty_May10},
+        .partySize = ARRAY_COUNT(sParty_MayRustboroMudkip),
+        .party = {.NoItemDefaultMoves = sParty_MayRustboroMudkip},
     },
 
-    [TRAINER_MAXIE_1] =
+    [TRAINER_MAXIE_MAGMA_HIDEOUT] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_MAGMA_LEADER,
@@ -8423,11 +8423,11 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
-        .partySize = ARRAY_COUNT(sParty_Maxie1),
-        .party = {.NoItemDefaultMoves = sParty_Maxie1},
+        .partySize = ARRAY_COUNT(sParty_MaxieMagmaHideout),
+        .party = {.NoItemDefaultMoves = sParty_MaxieMagmaHideout},
     },
 
-    [TRAINER_MAXIE_2] =
+    [TRAINER_MAXIE_MT_CHIMNEY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_MAGMA_LEADER,
@@ -8437,8 +8437,8 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
-        .partySize = ARRAY_COUNT(sParty_Maxie2),
-        .party = {.NoItemDefaultMoves = sParty_Maxie2},
+        .partySize = ARRAY_COUNT(sParty_MaxieMtChimney),
+        .party = {.NoItemDefaultMoves = sParty_MaxieMtChimney},
     },
 
     [TRAINER_TIANA] =
@@ -9183,7 +9183,7 @@ const struct Trainer gTrainers[] = {
         .party = {.NoItemDefaultMoves = sParty_Ashley},
     },
 
-    [TRAINER_WALLY_2] =
+    [TRAINER_WALLY_MAUVILLE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -9193,11 +9193,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
-        .partySize = ARRAY_COUNT(sParty_Wally2),
-        .party = {.NoItemDefaultMoves = sParty_Wally2},
+        .partySize = ARRAY_COUNT(sParty_WallyMauville),
+        .party = {.NoItemDefaultMoves = sParty_WallyMauville},
     },
 
-    [TRAINER_WALLY_3] =
+    [TRAINER_WALLY_VR_2] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -9207,11 +9207,11 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
-        .partySize = ARRAY_COUNT(sParty_Wally3),
-        .party = {.NoItemCustomMoves = sParty_Wally3},
+        .partySize = ARRAY_COUNT(sParty_WallyVR2),
+        .party = {.NoItemCustomMoves = sParty_WallyVR2},
     },
 
-    [TRAINER_WALLY_4] =
+    [TRAINER_WALLY_VR_3] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -9221,11 +9221,11 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
-        .partySize = ARRAY_COUNT(sParty_Wally4),
-        .party = {.NoItemCustomMoves = sParty_Wally4},
+        .partySize = ARRAY_COUNT(sParty_WallyVR3),
+        .party = {.NoItemCustomMoves = sParty_WallyVR3},
     },
 
-    [TRAINER_WALLY_5] =
+    [TRAINER_WALLY_VR_4] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -9235,11 +9235,11 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
-        .partySize = ARRAY_COUNT(sParty_Wally5),
-        .party = {.NoItemCustomMoves = sParty_Wally5},
+        .partySize = ARRAY_COUNT(sParty_WallyVR4),
+        .party = {.NoItemCustomMoves = sParty_WallyVR4},
     },
 
-    [TRAINER_WALLY_6] =
+    [TRAINER_WALLY_VR_5] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -9249,11 +9249,11 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
-        .partySize = ARRAY_COUNT(sParty_Wally6),
-        .party = {.NoItemCustomMoves = sParty_Wally6},
+        .partySize = ARRAY_COUNT(sParty_WallyVR5),
+        .party = {.NoItemCustomMoves = sParty_WallyVR5},
     },
 
-    [TRAINER_BRENDAN_13] =
+    [TRAINER_BRENDAN_LILYCOVE_MUDKIP] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -9263,11 +9263,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
-        .partySize = ARRAY_COUNT(sParty_Brendan13),
-        .party = {.NoItemDefaultMoves = sParty_Brendan13},
+        .partySize = ARRAY_COUNT(sParty_BrendanLilycoveMudkip),
+        .party = {.NoItemDefaultMoves = sParty_BrendanLilycoveMudkip},
     },
 
-    [TRAINER_BRENDAN_14] =
+    [TRAINER_BRENDAN_LILYCOVE_TREECKO] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -9277,11 +9277,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
-        .partySize = ARRAY_COUNT(sParty_Brendan14),
-        .party = {.NoItemDefaultMoves = sParty_Brendan14},
+        .partySize = ARRAY_COUNT(sParty_BrendanLilycoveTreecko),
+        .party = {.NoItemDefaultMoves = sParty_BrendanLilycoveTreecko},
     },
 
-    [TRAINER_BRENDAN_15] =
+    [TRAINER_BRENDAN_LILYCOVE_TORCHIC] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -9291,11 +9291,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
-        .partySize = ARRAY_COUNT(sParty_Brendan15),
-        .party = {.NoItemDefaultMoves = sParty_Brendan15},
+        .partySize = ARRAY_COUNT(sParty_BrendanLilycoveTorchic),
+        .party = {.NoItemDefaultMoves = sParty_BrendanLilycoveTorchic},
     },
 
-    [TRAINER_MAY_11] =
+    [TRAINER_MAY_LILYCOVE_MUDKIP] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -9305,11 +9305,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
-        .partySize = ARRAY_COUNT(sParty_May11),
-        .party = {.NoItemDefaultMoves = sParty_May11},
+        .partySize = ARRAY_COUNT(sParty_MayLilycoveMudkip),
+        .party = {.NoItemDefaultMoves = sParty_MayLilycoveMudkip},
     },
 
-    [TRAINER_MAY_12] =
+    [TRAINER_MAY_LILYCOVE_TREECKO] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -9319,11 +9319,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
-        .partySize = ARRAY_COUNT(sParty_May12),
-        .party = {.NoItemDefaultMoves = sParty_May12},
+        .partySize = ARRAY_COUNT(sParty_MayLilycoveTreecko),
+        .party = {.NoItemDefaultMoves = sParty_MayLilycoveTreecko},
     },
 
-    [TRAINER_MAY_13] =
+    [TRAINER_MAY_LILYCOVE_TORCHIC] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -9333,8 +9333,8 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
-        .partySize = ARRAY_COUNT(sParty_May13),
-        .party = {.NoItemDefaultMoves = sParty_May13},
+        .partySize = ARRAY_COUNT(sParty_MayLilycoveTorchic),
+        .party = {.NoItemDefaultMoves = sParty_MayLilycoveTorchic},
     },
 
     [TRAINER_JONAH] =
@@ -10023,7 +10023,7 @@ const struct Trainer gTrainers[] = {
         .party = {.NoItemDefaultMoves = sParty_Deandre},
     },
 
-    [TRAINER_GRUNT_38] =
+    [TRAINER_GRUNT_MAGMA_HIDEOUT_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -10033,11 +10033,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt38),
-        .party = {.NoItemDefaultMoves = sParty_Grunt38},
+        .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout1),
+        .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout1},
     },
 
-    [TRAINER_GRUNT_39] =
+    [TRAINER_GRUNT_MAGMA_HIDEOUT_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -10047,11 +10047,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt39),
-        .party = {.NoItemDefaultMoves = sParty_Grunt39},
+        .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout2),
+        .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout2},
     },
 
-    [TRAINER_GRUNT_40] =
+    [TRAINER_GRUNT_MAGMA_HIDEOUT_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -10061,11 +10061,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt40),
-        .party = {.NoItemDefaultMoves = sParty_Grunt40},
+        .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout3),
+        .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout3},
     },
 
-    [TRAINER_GRUNT_41] =
+    [TRAINER_GRUNT_MAGMA_HIDEOUT_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -10075,11 +10075,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt41),
-        .party = {.NoItemDefaultMoves = sParty_Grunt41},
+        .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout4),
+        .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout4},
     },
 
-    [TRAINER_GRUNT_42] =
+    [TRAINER_GRUNT_MAGMA_HIDEOUT_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -10089,11 +10089,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt42),
-        .party = {.NoItemDefaultMoves = sParty_Grunt42},
+        .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout5),
+        .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout5},
     },
 
-    [TRAINER_GRUNT_43] =
+    [TRAINER_GRUNT_MAGMA_HIDEOUT_6] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -10103,11 +10103,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt43),
-        .party = {.NoItemDefaultMoves = sParty_Grunt43},
+        .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout6),
+        .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout6},
     },
 
-    [TRAINER_GRUNT_44] =
+    [TRAINER_GRUNT_MAGMA_HIDEOUT_7] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -10117,11 +10117,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt44),
-        .party = {.NoItemDefaultMoves = sParty_Grunt44},
+        .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout7),
+        .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout7},
     },
 
-    [TRAINER_GRUNT_45] =
+    [TRAINER_GRUNT_MAGMA_HIDEOUT_8] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -10131,11 +10131,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt45),
-        .party = {.NoItemDefaultMoves = sParty_Grunt45},
+        .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout8),
+        .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout8},
     },
 
-    [TRAINER_GRUNT_46] =
+    [TRAINER_GRUNT_MAGMA_HIDEOUT_9] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -10145,11 +10145,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt46),
-        .party = {.NoItemDefaultMoves = sParty_Grunt46},
+        .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout9),
+        .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout9},
     },
 
-    [TRAINER_GRUNT_47] =
+    [TRAINER_GRUNT_MAGMA_HIDEOUT_10] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -10159,11 +10159,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt47),
-        .party = {.NoItemDefaultMoves = sParty_Grunt47},
+        .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout10),
+        .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout10},
     },
 
-    [TRAINER_GRUNT_48] =
+    [TRAINER_GRUNT_MAGMA_HIDEOUT_11] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -10173,11 +10173,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt48),
-        .party = {.NoItemDefaultMoves = sParty_Grunt48},
+        .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout11),
+        .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout11},
     },
 
-    [TRAINER_GRUNT_49] =
+    [TRAINER_GRUNT_MAGMA_HIDEOUT_12] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -10187,11 +10187,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt49),
-        .party = {.NoItemDefaultMoves = sParty_Grunt49},
+        .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout12),
+        .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout12},
     },
 
-    [TRAINER_GRUNT_50] =
+    [TRAINER_GRUNT_MAGMA_HIDEOUT_13] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -10201,11 +10201,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt50),
-        .party = {.NoItemDefaultMoves = sParty_Grunt50},
+        .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout13),
+        .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout13},
     },
 
-    [TRAINER_GRUNT_51] =
+    [TRAINER_GRUNT_MAGMA_HIDEOUT_14] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -10215,11 +10215,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt51),
-        .party = {.NoItemDefaultMoves = sParty_Grunt51},
+        .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout14),
+        .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout14},
     },
 
-    [TRAINER_GRUNT_52] =
+    [TRAINER_GRUNT_MAGMA_HIDEOUT_15] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -10229,11 +10229,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt52),
-        .party = {.NoItemDefaultMoves = sParty_Grunt52},
+        .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout15),
+        .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout15},
     },
 
-    [TRAINER_GRUNT_53] =
+    [TRAINER_GRUNT_MAGMA_HIDEOUT_16] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -10243,11 +10243,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt53),
-        .party = {.NoItemDefaultMoves = sParty_Grunt53},
+        .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout16),
+        .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout16},
     },
 
-    [TRAINER_TABITHA_3] =
+    [TRAINER_TABITHA_MAGMA_HIDEOUT] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_MAGMA_ADMIN,
@@ -10257,8 +10257,8 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Tabitha3),
-        .party = {.NoItemDefaultMoves = sParty_Tabitha3},
+        .partySize = ARRAY_COUNT(sParty_TabithaMagmaHideout),
+        .party = {.NoItemDefaultMoves = sParty_TabithaMagmaHideout},
     },
 
     [TRAINER_DARCY] =
@@ -10275,7 +10275,7 @@ const struct Trainer gTrainers[] = {
         .party = {.NoItemDefaultMoves = sParty_Darcy},
     },
 
-    [TRAINER_MAXIE_3] =
+    [TRAINER_MAXIE_MOSSDEEP] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_MAGMA_LEADER,
@@ -10285,8 +10285,8 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
-        .partySize = ARRAY_COUNT(sParty_Maxie3),
-        .party = {.NoItemDefaultMoves = sParty_Maxie3},
+        .partySize = ARRAY_COUNT(sParty_MaxieMossdeep),
+        .party = {.NoItemDefaultMoves = sParty_MaxieMossdeep},
     },
 
     [TRAINER_PETE] =
@@ -10751,7 +10751,7 @@ const struct Trainer gTrainers[] = {
         .party = {.NoItemDefaultMoves = sParty_Cristin1},
     },
 
-    [TRAINER_MAY_14] =
+    [TRAINER_MAY_RUSTBORO_TREECKO] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -10761,11 +10761,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
-        .partySize = ARRAY_COUNT(sParty_May14),
-        .party = {.NoItemDefaultMoves = sParty_May14},
+        .partySize = ARRAY_COUNT(sParty_MayRustboroTreecko),
+        .party = {.NoItemDefaultMoves = sParty_MayRustboroTreecko},
     },
 
-    [TRAINER_MAY_15] =
+    [TRAINER_MAY_RUSTBORO_TORCHIC] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@@ -10775,8 +10775,8 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
-        .partySize = ARRAY_COUNT(sParty_May15),
-        .party = {.NoItemDefaultMoves = sParty_May15},
+        .partySize = ARRAY_COUNT(sParty_MayRustboroTorchic),
+        .party = {.NoItemDefaultMoves = sParty_MayRustboroTorchic},
     },
 
     [TRAINER_ROXANNE_2] =
@@ -11941,7 +11941,7 @@ const struct Trainer gTrainers[] = {
         .party = {.NoItemDefaultMoves = sParty_Leaf},
     },
 
-    [TRAINER_BRENDAN_16] =
+    [TRAINER_BRENDAN_PLACEHOLDER] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_RS_PROTAG,
@@ -11951,11 +11951,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = 0,
-        .partySize = ARRAY_COUNT(sParty_Brendan16),
-        .party = {.NoItemDefaultMoves = sParty_Brendan16},
+        .partySize = ARRAY_COUNT(sParty_BrendanLinkPlaceholder),
+        .party = {.NoItemDefaultMoves = sParty_BrendanLinkPlaceholder},
     },
 
-    [TRAINER_MAY_16] =
+    [TRAINER_MAY_PLACEHOLDER] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_RS_PROTAG,
@@ -11965,7 +11965,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = 0,
-        .partySize = ARRAY_COUNT(sParty_May16),
-        .party = {.NoItemDefaultMoves = sParty_May16},
+        .partySize = ARRAY_COUNT(sParty_MayLinkPlaceholder),
+        .party = {.NoItemDefaultMoves = sParty_MayLinkPlaceholder},
     },
 };
diff --git a/src/data/union_room.h b/src/data/union_room.h
new file mode 100644
index 000000000..8cb0bc8aa
--- /dev/null
+++ b/src/data/union_room.h
@@ -0,0 +1,1061 @@
+// const rom data
+
+ALIGNED(4) static const u8 sText_EmptyString[] = _("");
+ALIGNED(4) const u8 sText_Colon[] = _(":");
+ALIGNED(4) const u8 sText_ID[] = _("{ID}");
+ALIGNED(4) const u8 sText_PleaseStartOver[] = _("Please start over from the beginning.");
+ALIGNED(4) const u8 sText_WirelessSearchCanceled[] = _("The WIRELESS COMMUNICATION\nSYSTEM search has been canceled.");
+ALIGNED(4) const u8 sText_AwaitingCommunucation2[] = _("Awaiting communication\nfrom another player."); // Unused
+ALIGNED(4) const u8 sText_AwaitingCommunication[] = _("{STR_VAR_1}! Awaiting\ncommunication from another player.");
+ALIGNED(4) const u8 sText_AwaitingLinkPressStart[] = _("{STR_VAR_1}! Awaiting link!\nPress START when everyone's ready.");
+ALIGNED(4) const u8 sJPText_SingleBattle[] = _("シングルバトルを かいさいする");
+ALIGNED(4) const u8 sJPText_DoubleBattle[] = _("ダブルバトルを かいさいする");
+ALIGNED(4) const u8 sJPText_MultiBattle[] = _("マルチバトルを かいさいする");
+ALIGNED(4) const u8 sJPText_TradePokemon[] = _("ポケモンこうかんを かいさいする");
+ALIGNED(4) const u8 sJPText_Chat[] = _("チャットを かいさいする");
+ALIGNED(4) const u8 sJPText_DistWonderCard[] = _("ふしぎなカードをくばる");
+ALIGNED(4) const u8 sJPText_DistWonderNews[] = _("ふしぎなニュースをくばる");
+ALIGNED(4) const u8 sJPText_DistMysteryEvent[] = _("ふしぎなできごとを かいさいする"); // Unused
+ALIGNED(4) const u8 sJPText_HoldPokemonJump[] = _("なわとびを かいさいする");
+ALIGNED(4) const u8 sJPText_HoldBerryCrush[] = _("きのみマッシャーを かいさいする");
+ALIGNED(4) const u8 sJPText_HoldBerryPicking[] = _("きのみどりを かいさいする");
+ALIGNED(4) const u8 sJPText_HoldSpinTrade[] = _("ぐるぐるこうかんを かいさいする");
+ALIGNED(4) const u8 sJPText_HoldSpinShop[] = _("ぐるぐるショップを かいさいする");
+
+// Unused
+const u8 *const sJPLinkGroupActionTexts[] = {
+    sJPText_SingleBattle,
+    sJPText_DoubleBattle,
+    sJPText_MultiBattle,
+    sJPText_TradePokemon,
+    sJPText_Chat,
+    sJPText_DistWonderCard,
+    sJPText_DistWonderNews,
+    sJPText_DistWonderCard,
+    sJPText_HoldPokemonJump,
+    sJPText_HoldBerryCrush,
+    sJPText_HoldBerryPicking,
+    sJPText_HoldBerryPicking,
+    sJPText_HoldSpinTrade,
+    sJPText_HoldSpinShop
+};
+
+const u8 sText_1PlayerNeeded[] = _("1 player\nneeded.");
+const u8 sText_2PlayersNeeded[] = _("2 players\nneeded.");
+const u8 sText_3PlayersNeeded[] = _("3 players\nneeded.");
+const u8 sText_4PlayersNeeded[] = _("4 players\nneeded.");
+const u8 sText_2PlayerMode[] = _("2-PLAYER\nMODE");
+const u8 sText_3PlayerMode[] = _("3-PLAYER\nMODE");
+const u8 sText_4PlayerMode[] = _("4-PLAYER\nMODE");
+const u8 sText_5PlayerMode[] = _("5-PLAYER\nMODE");
+
+static const u8 *const sPlayersNeededOrModeTexts[][5] = {
+    {
+        sText_1PlayerNeeded,
+        sText_2PlayerMode
+    }, {
+        sText_3PlayersNeeded,
+        sText_2PlayersNeeded,
+        sText_1PlayerNeeded,
+        sText_4PlayerMode
+    }, {
+        sText_1PlayerNeeded,
+        sText_2PlayerMode,
+        sText_3PlayerMode,
+        sText_4PlayerMode,
+        sText_5PlayerMode
+    }, {
+        sText_2PlayersNeeded,
+        sText_1PlayerNeeded,
+        sText_3PlayerMode,
+        sText_4PlayerMode,
+        sText_5PlayerMode
+    }, {
+        sText_1PlayerNeeded,
+        sText_2PlayerMode,
+        sText_3PlayerMode,
+        sText_4PlayerMode
+    }
+};
+
+ALIGNED(4) const u8 sText_BButtonCancel[] = _("{B_BUTTON}CANCEL");
+ALIGNED(4) const u8 sJPText_SearchingForParticipants[] = _("ため\nさんかしゃ ぼしゅうちゅう です！"); // Unused, may have been cut off
+ALIGNED(4) const u8 sText_PlayerContactedYouForXAccept[] = _("{STR_VAR_2} contacted you for\n{STR_VAR_1}. Accept?");
+ALIGNED(4) const u8 sText_PlayerContactedYouShareX[] = _("{STR_VAR_2} contacted you.\nWill you share {STR_VAR_1}?");
+ALIGNED(4) const u8 sText_PlayerContactedYouAddToMembers[] = _("{STR_VAR_2} contacted you.\nAdd to the members?");
+ALIGNED(4) const u8 sText_AreTheseMembersOK[] = _("{STR_VAR_1}!\nAre these members OK?");
+ALIGNED(4) const u8 sText_CancelModeWithTheseMembers[] = _("Cancel {STR_VAR_1} MODE\nwith these members?");
+ALIGNED(4) const u8 sText_AnOKWasSentToPlayer[] = _("An “OK” was sent\nto {STR_VAR_1}.");
+ALIGNED(4) const u8 sText_OtherTrainerUnavailableNow[] = _("The other TRAINER doesn't appear\nto be available now…\p");
+ALIGNED(4) const u8 sText_CantTransmitTrainerTooFar[] = _("You can't transmit with a TRAINER\nwho is too far away.\p");
+ALIGNED(4) const u8 sText_TrainersNotReadyYet[] = _("The other TRAINER(S) is/are not\nready yet.\p");
+
+const u8 *const sCantTransmitToTrainerTexts[] = {
+    sText_CantTransmitTrainerTooFar,
+    sText_TrainersNotReadyYet
+};
+
+ALIGNED(4) const u8 sText_ModeWithTheseMembersWillBeCanceled[] = _("The {STR_VAR_1} MODE with\nthese members will be canceled.{PAUSE 60}");
+ALIGNED(4) const u8 sText_MemberNoLongerAvailable[] = _("There is a member who can no\nlonger remain available.\p");
+
+const u8 *const sPlayerUnavailableTexts[] = {
+    sText_OtherTrainerUnavailableNow,
+    sText_MemberNoLongerAvailable
+};
+
+ALIGNED(4) const u8 sText_TrainerAppearsUnavailable[] = _("The other TRAINER appears\nunavailable…\p");
+ALIGNED(4) const u8 sText_PlayerSentBackOK[] = _("{STR_VAR_1} sent back an “OK”!");
+ALIGNED(4) const u8 sText_PlayerOKdRegistration[] = _("{STR_VAR_1} OK'd your registration as\na member.");
+ALIGNED(4) const u8 sText_PlayerRepliedNo[] = _("{STR_VAR_1} replied, “No…”\p");
+ALIGNED(4) const u8 sText_AwaitingOtherMembers[] = _("{STR_VAR_1}!\nAwaiting other members!");
+ALIGNED(4) const u8 sText_QuitBeingMember[] = _("Quit being a member?");
+ALIGNED(4) const u8 sText_StoppedBeingMember[] = _("You stopped being a member.\p");
+
+const u8 *const sPlayerDisconnectedTexts[] = {
+    NULL,
+    sText_MemberNoLongerAvailable,
+    sText_TrainerAppearsUnavailable,
+    NULL,
+    NULL,
+    NULL,
+    sText_PlayerRepliedNo,
+    NULL,
+    NULL,
+    sText_StoppedBeingMember
+};
+
+ALIGNED(4) const u8 sText_WirelessLinkEstablished[] = _("The WIRELESS COMMUNICATION\nSYSTEM link has been established.");
+ALIGNED(4) const u8 sText_WirelessLinkDropped[] = _("The WIRELESS COMMUNICATION\nSYSTEM link has been dropped…");
+ALIGNED(4) const u8 sText_LinkWithFriendDropped[] = _("The link with your friend has been\ndropped…");
+ALIGNED(4) const u8 sText_PlayerRepliedNo2[] = _("{STR_VAR_1} replied, “No…”");
+
+const u8 *const sLinkDroppedTexts[] = {
+    NULL,
+    sText_LinkWithFriendDropped,
+    sText_LinkWithFriendDropped,
+    NULL,
+    NULL,
+    NULL,
+    sText_PlayerRepliedNo2,
+    NULL,
+    NULL,
+    NULL
+};
+
+ALIGNED(4) const u8 sText_DoYouWantXMode[] = _("Do you want the {STR_VAR_2}\nMODE?");
+ALIGNED(4) const u8 sText_DoYouWantXMode2[] = _("Do you want the {STR_VAR_2}\nMODE?");
+
+// Unused
+static const u8 *const sDoYouWantModeTexts[] = {
+    sText_DoYouWantXMode,
+    sText_DoYouWantXMode2
+};
+
+ALIGNED(4) const u8 sText_CommunicatingPleaseWait[] = _("Communicating…\nPlease wait."); // Unused
+ALIGNED(4) const u8 sText_AwaitingPlayersResponseAboutTrade[] = _("Awaiting {STR_VAR_1}'s response about\nthe trade…");
+ALIGNED(4) const u8 sText_Communicating[] = _("Communicating{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.\n{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.");
+ALIGNED(4) const u8 sText_CommunicatingWithPlayer[] = _("Communicating with {STR_VAR_1}{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.\n{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.");
+ALIGNED(4) const u8 sText_PleaseWaitAWhile[] = _("Please wait a while{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.\n{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.{PAUSE 15}.");
+
+static const u8 *const sCommunicatingWaitTexts[] = {
+    sText_Communicating,
+    sText_CommunicatingWithPlayer,
+    sText_PleaseWaitAWhile
+};
+
+ALIGNED(4) const u8 sText_HiDoSomethingMale[] = _("Hiya! Is there something that you\nwanted to do?");
+ALIGNED(4) const u8 sText_HiDoSomethingFemale[] = _("Hello!\nWould you like to do something?");
+ALIGNED(4) const u8 sText_HiDoSomethingAgainMale[] = _("{STR_VAR_1}: Hiya, we meet again!\nWhat are you up for this time?");
+ALIGNED(4) const u8 sText_HiDoSomethingAgainFemale[] = _("{STR_VAR_1}: Oh! {PLAYER}, hello!\nWould you like to do something?");
+
+static const u8 *const sHiDoSomethingTexts[][GENDER_COUNT] = {
+    {
+        sText_HiDoSomethingMale,
+        sText_HiDoSomethingFemale
+    }, {
+        sText_HiDoSomethingAgainMale,
+        sText_HiDoSomethingAgainFemale
+    }
+};
+
+ALIGNED(4) const u8 sText_DoSomethingMale[] = _("Want to do something?");
+ALIGNED(4) const u8 sText_DoSomethingFemale[] = _("Would you like to do something?");
+ALIGNED(4) const u8 sText_DoSomethingAgainMale[] = _("{STR_VAR_1}: What would you like to\ndo now?");
+ALIGNED(4) const u8 sText_DoSomethingAgainFemale[] = _("{STR_VAR_1}: Want to do anything else?"); // Unused
+
+// Unused
+static const u8 *const sDoSomethingTexts[][GENDER_COUNT] = {
+    {
+        sText_DoSomethingMale,
+        sText_DoSomethingFemale
+    }, {
+        sText_DoSomethingAgainMale,
+        sText_DoSomethingAgainMale // was probably supposed to be sText_DoSomethingAgainFemale
+    }
+};
+
+ALIGNED(4) const u8 sText_SomebodyHasContactedYou[] = _("Somebody has contacted you.{PAUSE 60}");
+ALIGNED(4) const u8 sText_PlayerHasContactedYou[] = _("{STR_VAR_1} has contacted you.{PAUSE 60}");
+
+static const u8 *const sPlayerContactedYouTexts[] = {
+    sText_SomebodyHasContactedYou,
+    sText_PlayerHasContactedYou
+};
+
+ALIGNED(4) const u8 sText_AwaitingResponseFromTrainer[] = _("Awaiting a response from\nthe other TRAINER…");
+ALIGNED(4) const u8 sText_AwaitingResponseFromPlayer[] = _("Awaiting a response from\n{STR_VAR_1}…");
+
+static const u8 *const sAwaitingResponseTexts[] = {
+    sText_AwaitingResponseFromTrainer,
+    sText_AwaitingResponseFromPlayer
+};
+
+ALIGNED(4) const u8 sText_ShowTrainerCard[] = _("The other TRAINER showed\nyou their TRAINER CARD.\pWould you like to show your\nTRAINER CARD?");
+ALIGNED(4) const u8 sText_BattleChallenge[] = _("The other TRAINER challenges you\nto battle.\pWill you accept the battle\nchallenge?");
+ALIGNED(4) const u8 sText_ChatInvitation[] = _("The other TRAINER invites you\nto chat.\pWill you accept the chat\ninvitation?");
+ALIGNED(4) const u8 sText_OfferToTradeMon[] = _("There is an offer to trade your\nregistered Lv. {SPECIAL_F7 0x00} {SPECIAL_F7 0x01}\pin exchange for a\nLv. {SPECIAL_F7 0x02} {SPECIAL_F7 0x03}.\pWill you accept this trade\noffer?");
+ALIGNED(4) const u8 sText_OfferToTradeEgg[] = _("There is an offer to trade your\nregistered EGG.\lWill you accept this trade offer?");
+ALIGNED(4) const u8 sText_ChatDropped[] = _("The chat has been dropped.\p");
+ALIGNED(4) const u8 sText_OfferDeclined1[] = _("You declined the offer.\p");
+ALIGNED(4) const u8 sText_OfferDeclined2[] = _("You declined the offer.\p");
+ALIGNED(4) const u8 sText_ChatEnded[] = _("The chat was ended.\p");
+
+// Unused
+static const u8 *const sInvitationTexts[] = {
+    sText_ShowTrainerCard,
+    sText_BattleChallenge,
+    sText_ChatInvitation,
+    sText_OfferToTradeMon
+};
+
+ALIGNED(4) const u8 sText_JoinChatMale[] = _("Oh, hey! We're in a chat right now.\nWant to join us?");
+ALIGNED(4) const u8 sText_PlayerJoinChatMale[] = _("{STR_VAR_1}: Hey, {PLAYER}!\nWe're having a chat right now.\lWant to join us?");
+ALIGNED(4) const u8 sText_JoinChatFemale[] = _("Oh, hi! We're having a chat now.\nWould you like to join us?");
+ALIGNED(4) const u8 sText_PlayerJoinChatFemale[] = _("{STR_VAR_1}: Oh, hi, {PLAYER}!\nWe're having a chat now.\lWould you like to join us?");
+
+static const u8 *const sJoinChatTexts[][GENDER_COUNT] = {
+    {
+        sText_JoinChatMale,
+        sText_JoinChatFemale
+    }, {
+        sText_PlayerJoinChatMale,
+        sText_PlayerJoinChatFemale
+    }
+};
+
+ALIGNED(4) const u8 sText_TrainerAppearsBusy[] = _("……\nThe TRAINER appears to be busy…\p");
+ALIGNED(4) const u8 sText_WaitForBattleMale[] = _("A battle, huh?\nAll right, just give me some time.");
+ALIGNED(4) const u8 sText_WaitForChatMale[] = _("You want to chat, huh?\nSure, just wait a little.");
+ALIGNED(4) const u8 sText_ShowTrainerCardMale[] = _("Sure thing! As my “Greetings,”\nhere's my TRAINER CARD.");
+ALIGNED(4) const u8 sText_WaitForBattleFemale[] = _("A battle? Of course, but I need\ntime to get ready.");
+ALIGNED(4) const u8 sText_WaitForChatFemale[] = _("Did you want to chat?\nOkay, but please wait a moment.");
+ALIGNED(4) const u8 sText_ShowTrainerCardFemale[] = _("As my introduction, I'll show you\nmy TRAINER CARD.");
+
+const u8 *const sText_WaitOrShowCardTexts[GENDER_COUNT][4] = {
+    {
+        sText_WaitForBattleMale,
+        sText_WaitForChatMale,
+        NULL,
+        sText_ShowTrainerCardMale
+    }, {
+        sText_WaitForBattleFemale,
+        sText_WaitForChatFemale,
+        NULL,
+        sText_ShowTrainerCardFemale
+    }
+};
+
+ALIGNED(4) const u8 sText_WaitForChatMale2[] = _("You want to chat, huh?\nSure, just wait a little."); // Unused
+ALIGNED(4) const u8 sText_DoneWaitingBattleMale[] = _("Thanks for waiting!\nLet's get our battle started!{PAUSE 60}");
+ALIGNED(4) const u8 sText_DoneWaitingChatMale[] = _("All right!\nLet's chat!{PAUSE 60}");
+ALIGNED(4) const u8 sText_DoneWaitingBattleFemale[] = _("Sorry I made you wait!\nLet's get started!{PAUSE 60}");
+ALIGNED(4) const u8 sText_DoneWaitingChatFemale[] = _("Sorry I made you wait!\nLet's chat.{PAUSE 60}");
+ALIGNED(4) const u8 sText_TradeWillBeStarted[] = _("The trade will be started.{PAUSE 60}");
+ALIGNED(4) const u8 sText_BattleWillBeStarted[] = _("The battle will be started.{PAUSE 60}");
+ALIGNED(4) const u8 sText_EnteringChat[] = _("Entering the chat…{PAUSE 60}");
+
+const u8 *const sStartActivityTexts[][GENDER_COUNT][3] = {
+    {
+        {
+            sText_BattleWillBeStarted,
+            sText_EnteringChat,
+            sText_TradeWillBeStarted
+        }, {
+            sText_BattleWillBeStarted,
+            sText_EnteringChat,
+            sText_TradeWillBeStarted
+        }
+    }, {
+        {
+            sText_DoneWaitingBattleMale,
+            sText_DoneWaitingChatMale,
+            sText_TradeWillBeStarted
+        }, {
+            sText_DoneWaitingBattleFemale,
+            sText_DoneWaitingChatFemale,
+            sText_TradeWillBeStarted
+        }
+    }
+};
+
+ALIGNED(4) const u8 sText_BattleDeclinedMale[] = _("Sorry! My POKéMON don't seem to\nbe feeling too well right now.\lLet me battle you another time.\p");
+ALIGNED(4) const u8 sText_BattleDeclinedFemale[] = _("I'm terribly sorry, but my POKéMON\naren't feeling well…\pLet's battle another time.\p");
+
+const u8 *const sBattleDeclinedTexts[GENDER_COUNT] = {
+    sText_BattleDeclinedMale,
+    sText_BattleDeclinedFemale
+};
+
+ALIGNED(4) const u8 sText_ShowTrainerCardDeclinedMale[] = _("Huh? My TRAINER CARD…\nWhere'd it go now?\lSorry! I'll show you another time!\p");
+ALIGNED(4) const u8 sText_ShowTrainerCardDeclinedFemale[] = _("Oh? Now where did I put my\nTRAINER CARD?…\lSorry! I'll show you later!\p");
+
+const u8 *const sShowTrainerCardDeclinedTexts[GENDER_COUNT] = {
+    sText_ShowTrainerCardDeclinedMale,
+    sText_ShowTrainerCardDeclinedFemale
+};
+
+ALIGNED(4) const u8 sText_IfYouWantToDoSomethingMale[] = _("If you want to do something with\nme, just give me a shout!\p");
+ALIGNED(4) const u8 sText_IfYouWantToDoSomethingFemale[] = _("If you want to do something with\nme, don't be shy.\p");
+
+const u8 *const sIfYouWantToDoSomethingTexts[GENDER_COUNT] = {
+    sText_IfYouWantToDoSomethingMale,
+    sText_IfYouWantToDoSomethingFemale
+};
+
+ALIGNED(4) const u8 sText_TrainerBattleBusy[] = _("Whoops! Sorry, but I have to do\nsomething else.\lAnother time, okay?\p");
+ALIGNED(4) const u8 sText_NeedTwoMonsOfLevel30OrLower1[] = _("If you want to battle, you need\ntwo POKéMON that are below\lLv. 30.\p");
+ALIGNED(4) const u8 sText_NeedTwoMonsOfLevel30OrLower2[] = _("For a battle, you need two\nPOKéMON that are below Lv. 30.\p");
+ALIGNED(4) const u8 sText_DeclineBattleMale[] = _("Oh, all right.\nCome see me anytime, okay?\p");
+ALIGNED(4) const u8 stext_DeclineBattleFemale[] = _("Oh…\nPlease come by anytime.\p");
+
+static const u8 *const sDeclineBattleTexts[GENDER_COUNT] = {
+    sText_DeclineBattleMale,
+    stext_DeclineBattleFemale
+};
+
+ALIGNED(4) const u8 sText_ChatDeclinedMale[] = _("Oh, sorry!\nI just can't right this instant.\lLet's chat another time.\p");
+ALIGNED(4) const u8 sText_ChatDeclinedFemale[] = _("Oh, I'm sorry.\nI have too much to do right now.\lLet's chat some other time.\p");
+
+const u8 *const sChatDeclinedTexts[GENDER_COUNT] = {
+    sText_ChatDeclinedMale,
+    sText_ChatDeclinedFemale
+};
+
+ALIGNED(4) const u8 sText_YoureToughMale[] = _("Whoa!\nI can tell you're pretty tough!\p");
+ALIGNED(4) const u8 sText_UsedGoodMoveMale[] = _("You used that move?\nThat's good strategy!\p");
+ALIGNED(4) const u8 sText_BattleSurpriseMale[] = _("Way to go!\nThat was an eye-opener!\p");
+ALIGNED(4) const u8 sText_SwitchedMonsMale[] = _("Oh! How could you use that\nPOKéMON in that situation?\p");
+ALIGNED(4) const u8 sText_YoureToughFemale[] = _("That POKéMON…\nIt's been raised really well!\p");
+ALIGNED(4) const u8 sText_UsedGoodMoveFemale[] = _("That's it!\nThis is the right move now!\p");
+ALIGNED(4) const u8 sText_BattleSurpriseFemale[] = _("That's awesome!\nYou can battle that way?\p");
+ALIGNED(4) const u8 sText_SwitchedMonsFemale[] = _("You have exquisite timing for\nswitching POKéMON!\p");
+
+const u8 *const sBattleReactionTexts[GENDER_COUNT][4] = {
+    {
+        sText_YoureToughMale,
+        sText_UsedGoodMoveMale,
+        sText_BattleSurpriseMale,
+        sText_SwitchedMonsMale
+    }, 
+    {
+        sText_YoureToughFemale,
+        sText_UsedGoodMoveFemale,
+        sText_BattleSurpriseFemale,
+        sText_SwitchedMonsFemale
+    }
+};
+
+ALIGNED(4) const u8 sText_LearnedSomethingMale[] = _("Oh, I see!\nThis is educational!\p");
+ALIGNED(4) const u8 sText_ThatsFunnyMale[] = _("Don't say anything funny anymore!\nI'm sore from laughing!\p");
+ALIGNED(4) const u8 sText_RandomChatMale1[] = _("Oh?\nSomething like that happened.\p");
+ALIGNED(4) const u8 sText_RandomChatMale2[] = _("Hmhm… What?\nSo is this what you're saying?\p");
+ALIGNED(4) const u8 sText_LearnedSomethingFemale[] = _("Is that right?\nI didn't know that.\p");
+ALIGNED(4) const u8 sText_ThatsFunnyFemale[] = _("Ahaha!\nWhat is that about?\p");
+ALIGNED(4) const u8 sText_RandomChatFemale1[] = _("Yes, that's exactly it!\nThat's what I meant.\p");
+ALIGNED(4) const u8 sText_RandomChatFemale2[] = _("In other words…\nYes! That's right!\p");
+
+const u8 *const sChatReactionTexts[GENDER_COUNT][4] = {
+    {
+        sText_LearnedSomethingMale,
+        sText_ThatsFunnyMale,
+        sText_RandomChatMale1,
+        sText_RandomChatMale2
+    }, 
+    {
+        sText_LearnedSomethingFemale,
+        sText_ThatsFunnyFemale,
+        sText_RandomChatFemale1,
+        sText_RandomChatFemale2
+    }
+};
+
+ALIGNED(4) const u8 sText_ShowedTrainerCardMale1[] = _("I'm just showing my TRAINER CARD\nas my way of greeting.\p");
+ALIGNED(4) const u8 sText_ShowedTrainerCardMale2[] = _("I hope I get to know you better!\p");
+ALIGNED(4) const u8 sText_ShowedTrainerCardFemale1[] = _("We're showing each other our\nTRAINER CARDS to get acquainted.\p");
+ALIGNED(4) const u8 sText_ShowedTrainerCardFemale2[] = _("Glad to meet you.\nPlease don't be a stranger!\p");
+
+const u8 *const sTrainerCardReactionTexts[GENDER_COUNT][2] = {
+    {
+        sText_ShowedTrainerCardMale1,
+        sText_ShowedTrainerCardMale2
+    }, 
+    {
+        sText_ShowedTrainerCardFemale1,
+        sText_ShowedTrainerCardFemale2
+    }
+};
+
+ALIGNED(4) const u8 sText_MaleTraded1[] = _("Yeahah!\nI really wanted this POKéMON!\p");
+ALIGNED(4) const u8 sText_MaleTraded2[] = _("Finally, a trade got me that\nPOKéMON I'd wanted a long time.\p");
+ALIGNED(4) const u8 sText_FemaleTraded1[] = _("I'm trading POKéMON right now.\p");
+ALIGNED(4) const u8 sText_FemaleTraded2[] = _("I finally got that POKéMON I\nwanted in a trade!\p");
+
+const u8 *const sTradeReactionTexts[GENDER_COUNT][4] = {
+    {
+        sText_MaleTraded1,
+        sText_MaleTraded2
+    }, 
+    {
+        sText_FemaleTraded1,
+        sText_FemaleTraded2
+    }
+};
+
+ALIGNED(4) const u8 sText_XCheckedTradingBoard[] = _("{STR_VAR_1} checked the\nTRADING BOARD.\p");
+ALIGNED(4) const u8 sText_RegisterMonAtTradingBoard[] = _("Welcome to the TRADING BOARD.\pYou may register your POKéMON\nand offer it up for a trade.\pWould you like to register one of\nyour POKéMON?");
+ALIGNED(4) const u8 sText_TradingBoardInfo[] = _("This TRADING BOARD is used for\noffering a POKéMON for a trade.\pAll you need to do is register a\nPOKéMON for a trade.\pAnother TRAINER may offer a party\nPOKéMON in return for the trade.\pWe hope you will register POKéMON\nand trade them with many, many\lother TRAINERS.\pWould you like to register one of\nyour POKéMON?");
+ALIGNED(4) const u8 sText_ThankYouForRegistering[] = _("We have registered your POKéMON for\ntrade on the TRADING BOARD.\pThank you for using this service!\p"); // unused
+ALIGNED(4) const u8 sText_NobodyHasRegistered[] = _("Nobody has registered any POKéMON\nfor trade on the TRADING BOARD.\p\n"); // unused
+ALIGNED(4) const u8 sText_ChooseRequestedMonType[] = _("Please choose the type of POKéMON\nthat you would like in the trade.\n");
+ALIGNED(4) const u8 sText_WhichMonWillYouOffer[] = _("Which of your party POKéMON will\nyou offer in trade?\p");
+ALIGNED(4) const u8 sText_RegistrationCanceled[] = _("Registration has been canceled.\p");
+ALIGNED(4) const u8 sText_RegistraionCompleted[] = _("Registration has been completed.\p");
+ALIGNED(4) const u8 sText_TradeCanceled[] = _("The trade has been canceled.\p");
+ALIGNED(4) const u8 sText_CancelRegistrationOfMon[] = _("Cancel the registration of your\nLv. {STR_VAR_2} {STR_VAR_1}?");
+ALIGNED(4) const u8 sText_CancelRegistrationOfEgg[] = _("Cancel the registration of your\nEGG?");
+ALIGNED(4) const u8 sText_RegistrationCanceled2[] = _("The registration has been canceled.\p");
+ALIGNED(4) const u8 sText_TradeTrainersWillBeListed[] = _("TRAINERS wishing to make a trade\nwill be listed."); // unused
+ALIGNED(4) const u8 sText_ChooseTrainerToTradeWith2[] = _("Please choose the TRAINER with whom\nyou would like to trade POKéMON."); // unused
+ALIGNED(4) const u8 sText_AskTrainerToMakeTrade[] = _("Would you like to ask {STR_VAR_1} to\nmake a trade?");
+ALIGNED(4) const u8 sText_AwaitingResponseFromTrainer2[] = _("Awaiting a response from\nthe other TRAINER…"); // unused
+ALIGNED(4) const u8 sText_NotRegisteredAMonForTrade[] = _("You have not registered a POKéMON\nfor trading.\p"); // unused
+ALIGNED(4) const u8 sText_DontHaveTypeTrainerWants[] = _("You don't have a {STR_VAR_2}-type\nPOKéMON that {STR_VAR_1} wants.\p");
+ALIGNED(4) const u8 sText_DontHaveEggTrainerWants[] = _("You don't have an EGG that\n{STR_VAR_1} wants.\p");
+ALIGNED(4) const u8 sText_PlayerCantTradeForYourMon[] = _("{STR_VAR_1} can't make a trade for\nyour POKéMON right now.\p");
+ALIGNED(4) const u8 sText_CantTradeForPartnersMon[] = _("You can't make a trade for\n{STR_VAR_1}'s POKéMON right now.\p");
+
+// Unused
+const u8 *const sCantTradeMonTexts[] = {
+    sText_PlayerCantTradeForYourMon,
+    sText_CantTradeForPartnersMon
+};
+
+ALIGNED(4) const u8 sText_TradeOfferRejected[] = _("Your trade offer was rejected.\p");
+ALIGNED(4) const u8 sText_EggTrade[] = _("EGG TRADE");
+ALIGNED(4) const u8 sText_ChooseJoinCancel[] = _("{DPAD_UPDOWN}CHOOSE  {A_BUTTON}JOIN  {B_BUTTON}CANCEL");
+ALIGNED(4) const u8 sText_ChooseTrainer[] = _("Please choose a TRAINER.");
+ALIGNED(4) const u8 sText_ChooseTrainerSingleBattle[] = _("Please choose a TRAINER for\na SINGLE BATTLE.");
+ALIGNED(4) const u8 sText_ChooseTrainerDoubleBattle[] = _("Please choose a TRAINER for\na DOUBLE BATTLE.");
+ALIGNED(4) const u8 sText_ChooseLeaderMultiBattle[] = _("Please choose the LEADER\nfor a MULTI BATTLE.");
+ALIGNED(4) const u8 sText_ChooseTrainerToTradeWith[] = _("Please choose the TRAINER to\ntrade with.");
+ALIGNED(4) const u8 sText_ChooseTrainerToShareWonderCards[] = _("Please choose the TRAINER who is\nsharing WONDER CARDS.");
+ALIGNED(4) const u8 sText_ChooseTrainerToShareWonderNews[] = _("Please choose the TRAINER who is\nsharing WONDER NEWS.");
+ALIGNED(4) const u8 sText_ChooseLeaderPokemonJump[] = _("Jump with mini POKéMON!\nPlease choose the LEADER.");
+ALIGNED(4) const u8 sText_ChooseLeaderBerryCrush[] = _("BERRY CRUSH!\nPlease choose the LEADER.");
+ALIGNED(4) const u8 sText_ChooseLeaderBerryPicking[] = _("DODRIO BERRY-PICKING!\nPlease choose the LEADER.");
+ALIGNED(4) const u8 sText_ChooseLeaderBerryBlender[] = _("BERRY BLENDER!\nPlease choose the LEADER.");
+ALIGNED(4) const u8 sText_ChooseLeaderRecordCorner[] = _("RECORD CORNER!\nPlease choose the LEADER.");
+ALIGNED(4) const u8 sText_ChooseLeaderCoolContest[] = _("COOLNESS CONTEST!\nPlease choose the LEADER.");
+ALIGNED(4) const u8 sText_ChooseLeaderBeautyContest[] = _("BEAUTY CONTEST!\nPlease choose the LEADER.");
+ALIGNED(4) const u8 sText_ChooseLeaderCuteContest[] = _("CUTENESS CONTEST!\nPlease choose the LEADER.");
+ALIGNED(4) const u8 sText_ChooseLeaderSmartContest[] = _("SMARTNESS CONTEST!\nPlease choose the LEADER.");
+ALIGNED(4) const u8 sText_ChooseLeaderToughContest[] = _("TOUGHNESS CONTEST!\nPlease choose the LEADER.");
+ALIGNED(4) const u8 sText_ChooseLeaderBattleTowerLv50[] = _("BATTLE TOWER LEVEL 50!\nPlease choose the LEADER.");
+ALIGNED(4) const u8 sText_ChooseLeaderBattleTowerOpenLv[] = _("BATTLE TOWER OPEN LEVEL!\nPlease choose the LEADER.");
+
+static const u8 *const sChooseTrainerTexts[NUM_LINK_GROUP_TYPES] = 
+{
+    [LINK_GROUP_SINGLE_BATTLE]     = sText_ChooseTrainerSingleBattle,
+    [LINK_GROUP_DOUBLE_BATTLE]     = sText_ChooseTrainerDoubleBattle,
+    [LINK_GROUP_MULTI_BATTLE]      = sText_ChooseLeaderMultiBattle,
+    [LINK_GROUP_TRADE]             = sText_ChooseTrainerToTradeWith,
+    [LINK_GROUP_POKEMON_JUMP]      = sText_ChooseLeaderPokemonJump,
+    [LINK_GROUP_BERRY_CRUSH]       = sText_ChooseLeaderBerryCrush,
+    [LINK_GROUP_BERRY_PICKING]     = sText_ChooseLeaderBerryPicking,
+    [LINK_GROUP_WONDER_CARD]       = sText_ChooseTrainerToShareWonderCards,
+    [LINK_GROUP_WONDER_NEWS]       = sText_ChooseTrainerToShareWonderNews,
+    [LINK_GROUP_UNK_9]             = NULL,
+    [LINK_GROUP_UNK_10]            = NULL,
+    [LINK_GROUP_UNK_11]            = NULL,
+    [LINK_GROUP_RECORD_CORNER]     = sText_ChooseLeaderRecordCorner,
+    [LINK_GROUP_BERRY_BLENDER]     = sText_ChooseLeaderBerryBlender,
+    [LINK_GROUP_UNK_14]            = NULL,
+    [LINK_GROUP_COOL_CONTEST]      = sText_ChooseLeaderCoolContest,
+    [LINK_GROUP_BEAUTY_CONTEST]    = sText_ChooseLeaderBeautyContest,
+    [LINK_GROUP_CUTE_CONTEST]      = sText_ChooseLeaderCuteContest,
+    [LINK_GROUP_SMART_CONTEST]     = sText_ChooseLeaderSmartContest,
+    [LINK_GROUP_TOUGH_CONTEST]     = sText_ChooseLeaderToughContest,
+    [LINK_GROUP_BATTLE_TOWER]      = sText_ChooseLeaderBattleTowerLv50,
+    [LINK_GROUP_BATTLE_TOWER_OPEN] = sText_ChooseLeaderBattleTowerOpenLv
+};
+
+ALIGNED(4) const u8 sText_SearchingForWirelessSystemWait[] = _("Searching for a WIRELESS\nCOMMUNICATION SYSTEM. Wait...");
+ALIGNED(4) const u8 sText_MustHaveTwoMonsForDoubleBattle[] = _("For a DOUBLE BATTLE, you must have\nat least two POKéMON.\p"); // Unused
+ALIGNED(4) const u8 sText_AwaitingPlayersResponse[] = _("Awaiting {STR_VAR_1}'s response…");
+ALIGNED(4) const u8 sText_PlayerHasBeenAskedToRegisterYouPleaseWait[] = _("{STR_VAR_1} has been asked to register\nyou as a member. Please wait.");
+ALIGNED(4) const u8 sText_AwaitingResponseFromWirelessSystem[] = _("Awaiting a response from the\nWIRELESS COMMUNICATION SYSTEM.");
+ALIGNED(4) const u8 sText_PleaseWaitForOtherTrainersToGather[] = _("Please wait for other TRAINERS to\ngather and get ready."); // Unused
+ALIGNED(4) const u8 sText_NoCardsSharedRightNow[] = _("No CARDS appear to be shared \nright now.");
+ALIGNED(4) const u8 sText_NoNewsSharedRightNow[] = _("No NEWS appears to be shared\nright now.");
+
+const u8 *const sNoWonderSharedTexts[] = {
+    sText_NoCardsSharedRightNow,
+    sText_NoNewsSharedRightNow
+};
+
+ALIGNED(4) const u8 sText_Battle[] = _("BATTLE");
+ALIGNED(4) const u8 sText_Chat2[] = _("CHAT");
+ALIGNED(4) const u8 sText_Greetings[] = _("GREETINGS");
+ALIGNED(4) const u8 sText_Exit[] = _("EXIT");
+ALIGNED(4) const u8 sText_Exit2[] = _("EXIT");
+ALIGNED(4) const u8 sText_Info[] = _("INFO");
+ALIGNED(4) const u8 sText_NameWantedOfferLv[] = _("NAME{CLEAR_TO 0x3C}WANTED{CLEAR_TO 0x6E}OFFER{CLEAR_TO 0xC6}LV.");
+ALIGNED(4) const u8 sText_SingleBattle[] = _("SINGLE BATTLE");
+ALIGNED(4) const u8 sText_DoubleBattle[] = _("DOUBLE BATTLE");
+ALIGNED(4) const u8 sText_MultiBattle[] = _("MULTI BATTLE");
+ALIGNED(4) const u8 sText_PokemonTrades[] = _("POKéMON TRADES");
+ALIGNED(4) const u8 sText_Chat[] = _("CHAT");
+ALIGNED(4) const u8 sText_Cards[] = _("CARDS");
+ALIGNED(4) const u8 sText_WonderCards[] = _("WONDER CARDS");
+ALIGNED(4) const u8 sText_WonderNews[] = _("WONDER NEWS");
+ALIGNED(4) const u8 sText_PokemonJump[] = _("POKéMON JUMP");
+ALIGNED(4) const u8 sText_BerryCrush[] = _("BERRY CRUSH");
+ALIGNED(4) const u8 sText_BerryPicking[] = _("BERRY-PICKING");
+ALIGNED(4) const u8 sText_Search[] = _("SEARCH");
+ALIGNED(4) const u8 sText_BerryBlender[] = _("BERRY BLENDER");
+ALIGNED(4) const u8 sText_RecordCorner[] = _("RECORD CORNER");
+ALIGNED(4) const u8 sText_CoolContest[] = _("COOL CONTEST");
+ALIGNED(4) const u8 sText_BeautyContest[] = _("BEAUTY CONTEST");
+ALIGNED(4) const u8 sText_CuteContest[] = _("CUTE CONTEST");
+ALIGNED(4) const u8 sText_SmartContest[] = _("SMART CONTEST");
+ALIGNED(4) const u8 sText_ToughContest[] = _("TOUGH CONTEST");
+ALIGNED(4) const u8 sText_BattleTowerLv50[] = _("BATTLE TOWER LV. 50");
+ALIGNED(4) const u8 sText_BattleTowerOpenLv[] = _("BATTLE TOWER OPEN LEVEL");
+ALIGNED(4) const u8 sText_ItsNormalCard[] = _("It's a NORMAL CARD.");
+ALIGNED(4) const u8 sText_ItsBronzeCard[] = _("It's a BRONZE CARD!");
+ALIGNED(4) const u8 sText_ItsCopperCard[] = _("It's a COPPER CARD!");
+ALIGNED(4) const u8 sText_ItsSilverCard[] = _("It's a SILVER CARD!");
+ALIGNED(4) const u8 sText_ItsGoldCard[] = _("It's a GOLD CARD!");
+
+static const u8 *const sCardColorTexts[] = {
+    sText_ItsNormalCard,
+    sText_ItsBronzeCard,
+    sText_ItsCopperCard,
+    sText_ItsSilverCard,
+    sText_ItsGoldCard
+};
+
+ALIGNED(4) const u8 sText_TrainerCardInfoPage1[] = _("This is {SPECIAL_F7 0x00} {SPECIAL_F7 0x01}'s\nTRAINER CARD…\l{SPECIAL_F7 0x02}\pPOKéDEX: {SPECIAL_F7 0x03}\nTIME:    {SPECIAL_F7 0x04}:{SPECIAL_F7 0x05}\p");
+ALIGNED(4) const u8 sText_TrainerCardInfoPage2[] = _("BATTLES: WINS: {SPECIAL_F7 0x00}  LOSSES: {SPECIAL_F7 0x02}\nTRADES: {SPECIAL_F7 0x03}\p“{SPECIAL_F7 0x04} {SPECIAL_F7 0x05}\n{SPECIAL_F7 0x06} {SPECIAL_F7 0x07}”\p");
+ALIGNED(4) const u8 sText_GladToMeetYouMale[] = _("{SPECIAL_F7 0x01}: Glad to have met you!{PAUSE 60}");
+ALIGNED(4) const u8 sText_GladToMeetYouFemale[] = _("{SPECIAL_F7 0x01}: Glad to meet you!{PAUSE 60}");
+
+const u8 *const sGladToMeetYouTexts[GENDER_COUNT] = {
+    sText_GladToMeetYouMale,
+    sText_GladToMeetYouFemale
+};
+
+ALIGNED(4) const u8 sText_FinishedCheckingPlayersTrainerCard[] = _("Finished checking {SPECIAL_F7 0x01}'s\nTRAINER CARD.{PAUSE 60}");
+
+const u8 *const sLinkGroupActivityTexts[] = {
+    sText_EmptyString,
+    sText_SingleBattle,
+    sText_DoubleBattle,
+    sText_MultiBattle,
+    sText_PokemonTrades,
+    sText_Chat,
+    sText_WonderCards,
+    sText_WonderNews,
+    sText_Cards,
+    sText_PokemonJump,
+    sText_BerryCrush,
+    sText_BerryPicking,
+    sText_Search,
+    sText_EmptyString,
+    sText_BattleTowerOpenLv,
+    sText_RecordCorner,
+    sText_BerryBlender,
+    sText_EmptyString,
+    sText_EmptyString,
+    sText_EmptyString,
+    sText_EmptyString,
+    sText_WonderCards,
+    sText_WonderNews,
+    sText_CoolContest,
+    sText_BeautyContest,
+    sText_CuteContest,
+    sText_SmartContest,
+    sText_ToughContest,
+    sText_BattleTowerLv50
+};
+
+const struct WindowTemplate gUnknown_082F00BC = {
+    .bg = 0x00,
+    .tilemapLeft = 0x00,
+    .tilemapTop = 0x00,
+    .width = 0x1E,
+    .height = 0x02,
+    .paletteNum = 0x0F,
+    .baseBlock = 0x0008
+};
+
+const u32 gUnknown_082F00C4[NUM_LINK_GROUP_TYPES] = {
+    0x0201,
+    0x0202,
+    0x0403,
+    0x0204,
+    0x2509,
+    0x250a,
+    0x350b,
+    0x0000,
+    0x0000,
+    0x0000,
+    0x0000,
+    0x0000,
+    0x240f,
+    0x2410,
+    0x0000,
+    0x2417,
+    0x2418,
+    0x2419,
+    0x241a,
+    0x241b,
+    0x021c,
+    0x020e
+};
+
+const struct WindowTemplate gUnknown_082F011C = {
+    .bg = 0x00,
+    .tilemapLeft = 0x01,
+    .tilemapTop = 0x03,
+    .width = 0x0d,
+    .height = 0x08,
+    .paletteNum = 0x0f,
+    .baseBlock = 0x0044
+};
+
+const struct WindowTemplate gUnknown_082F0124 = {
+    .bg = 0x00,
+    .tilemapLeft = 0x01,
+    .tilemapTop = 0x03,
+    .width = 0x0d,
+    .height = 0x0a,
+    .paletteNum = 0x0f,
+    .baseBlock = 0x0044
+};
+
+const struct WindowTemplate gUnknown_082F012C = {
+    .bg = 0x00,
+    .tilemapLeft = 0x10,
+    .tilemapTop = 0x03,
+    .width = 0x07,
+    .height = 0x04,
+    .paletteNum = 0x0f,
+    .baseBlock = 0x00c6
+};
+
+const struct ListMenuItem gUnknown_082F0134[] = {
+    { sText_EmptyString, 0 },
+    { sText_EmptyString, 1 },
+    { sText_EmptyString, 2 },
+    { sText_EmptyString, 3 },
+    { sText_EmptyString, 4 }
+};
+
+const struct ListMenuTemplate gUnknown_082F015C = {
+    .items = gUnknown_082F0134,
+    .moveCursorFunc = NULL,
+    .itemPrintFunc = sub_8013278,
+    .totalItems = 5,
+    .maxShowed = 5,
+    .windowId = 0,
+    .header_X = 0,
+    .item_X = 0,
+    .cursor_X = 0,
+    .upText_Y = 1,
+    .cursorPal = 2,
+    .fillValue = 1,
+    .cursorShadowPal = 3,
+    .lettersSpacing = 0,
+    .itemVerticalPadding = 0,
+    .scrollMultiple = 0,
+    .fontId = 1,
+    .cursorKind = 1
+};
+
+const struct WindowTemplate gUnknown_082F0174 = {
+    .bg = 0x00,
+    .tilemapLeft = 0x01,
+    .tilemapTop = 0x03,
+    .width = 0x11,
+    .height = 0x0a,
+    .paletteNum = 0x0f,
+    .baseBlock = 0x0044
+};
+
+const struct WindowTemplate gUnknown_082F017C = {
+    .bg = 0x00,
+    .tilemapLeft = 0x14,
+    .tilemapTop = 0x03,
+    .width = 0x07,
+    .height = 0x04,
+    .paletteNum = 0x0f,
+    .baseBlock = 0x00ee
+};
+
+const struct ListMenuItem gUnknown_082F0184[] = {
+    { sText_EmptyString,  0 },
+    { sText_EmptyString,  1 },
+    { sText_EmptyString,  2 },
+    { sText_EmptyString,  3 },
+    { sText_EmptyString,  4 },
+    { sText_EmptyString,  5 },
+    { sText_EmptyString,  6 },
+    { sText_EmptyString,  7 },
+    { sText_EmptyString,  8 },
+    { sText_EmptyString,  9 },
+    { sText_EmptyString, 10 },
+    { sText_EmptyString, 11 },
+    { sText_EmptyString, 12 },
+    { sText_EmptyString, 13 },
+    { sText_EmptyString, 14 },
+    { sText_EmptyString, 15 }
+};
+
+const struct ListMenuTemplate gUnknown_082F0204 = {
+    .items = gUnknown_082F0184,
+    .moveCursorFunc = ListMenuDefaultCursorMoveFunc,
+    .itemPrintFunc = sub_8013DF4,
+    .totalItems = 16,
+    .maxShowed = 5,
+    .windowId = 0,
+    .header_X = 0,
+    .item_X = 8,
+    .cursor_X = 0,
+    .upText_Y = 1,
+    .cursorPal = 2,
+    .fillValue = 1,
+    .cursorShadowPal = 3,
+    .lettersSpacing = 0,
+    .itemVerticalPadding = 0,
+    .scrollMultiple = 1,
+    .fontId = 1,
+    .cursorKind = 0
+};
+
+const struct WindowTemplate gUnknown_082F021C = {
+    .bg = 0x00,
+    .tilemapLeft = 0x14,
+    .tilemapTop = 0x05,
+    .width = 0x10,
+    .height = 0x08,
+    .paletteNum = 0x0f,
+    .baseBlock = 0x0001
+};
+
+const struct ListMenuItem gUnknown_082F0224[] = {
+    { sText_Greetings, 0x208 },
+    { sText_Battle, 0x241 },
+    { sText_Chat2, 0x245 },
+    { sText_Exit, 0x040 }
+};
+
+const struct ListMenuTemplate gUnknown_082F0244 = {
+    .items = gUnknown_082F0224,
+    .moveCursorFunc = ListMenuDefaultCursorMoveFunc,
+    .itemPrintFunc = NULL,
+    .totalItems = 4,
+    .maxShowed = 4,
+    .windowId = 0,
+    .header_X = 0,
+    .item_X = 8,
+    .cursor_X = 0,
+    .upText_Y = 1,
+    .cursorPal = 2,
+    .fillValue = 1,
+    .cursorShadowPal = 3,
+    .lettersSpacing = 0,
+    .itemVerticalPadding = 0,
+    .scrollMultiple = 0,
+    .fontId = 1,
+    .cursorKind = 0
+};
+
+const struct WindowTemplate gUnknown_082F025C = {
+    .bg = 0x00,
+    .tilemapLeft = 0x12,
+    .tilemapTop = 0x07,
+    .width = 0x10,
+    .height = 0x06,
+    .paletteNum = 0x0f,
+    .baseBlock = 0x0001
+};
+
+const struct ListMenuItem gUnknown_082F0264[] = {
+    { gText_Register, 1 },
+    { sText_Info, 2 },
+    { sText_Exit, 3 }
+};
+
+const struct ListMenuTemplate gUnknown_082F027C = {
+    .items = gUnknown_082F0264,
+    .moveCursorFunc = ListMenuDefaultCursorMoveFunc,
+    .itemPrintFunc = NULL,
+    .totalItems = 3,
+    .maxShowed = 3,
+    .windowId = 0,
+    .header_X = 0,
+    .item_X = 8,
+    .cursor_X = 0,
+    .upText_Y = 1,
+    .cursorPal = 2,
+    .fillValue = 1,
+    .cursorShadowPal = 3,
+    .lettersSpacing = 0,
+    .itemVerticalPadding = 0,
+    .scrollMultiple = 0,
+    .fontId = 1,
+    .cursorKind = 0
+};
+
+const struct WindowTemplate gUnknown_082F0294 = {
+    .bg = 0x00,
+    .tilemapLeft = 0x14,
+    .tilemapTop = 0x01,
+    .width = 0x10,
+    .height = 0x0c,
+    .paletteNum = 0x0f,
+    .baseBlock = 0x0001
+};
+
+static const struct ListMenuItem sTradingBoardTypes[] = {
+    { gTypeNames[TYPE_NORMAL],   TYPE_NORMAL         },
+    { gTypeNames[TYPE_FIRE],     TYPE_FIRE           },
+    { gTypeNames[TYPE_WATER],    TYPE_WATER          },
+    { gTypeNames[TYPE_ELECTRIC], TYPE_ELECTRIC       },
+    { gTypeNames[TYPE_GRASS],    TYPE_GRASS          },
+    { gTypeNames[TYPE_ICE],      TYPE_ICE            },
+    { gTypeNames[TYPE_GROUND],   TYPE_GROUND         },
+    { gTypeNames[TYPE_ROCK],     TYPE_ROCK           },
+    { gTypeNames[TYPE_FLYING],   TYPE_FLYING         },
+    { gTypeNames[TYPE_PSYCHIC],  TYPE_PSYCHIC        },
+    { gTypeNames[TYPE_FIGHTING], TYPE_FIGHTING       },
+    { gTypeNames[TYPE_POISON],   TYPE_POISON         },
+    { gTypeNames[TYPE_BUG],      TYPE_BUG            },
+    { gTypeNames[TYPE_GHOST],    TYPE_GHOST          },
+    { gTypeNames[TYPE_DRAGON],   TYPE_DRAGON         },
+    { gTypeNames[TYPE_STEEL],    TYPE_STEEL          },
+    { gTypeNames[TYPE_DARK],     TYPE_DARK           },
+    { sText_Exit,         NUMBER_OF_MON_TYPES }
+};
+
+const struct ListMenuTemplate sMenuTemplate_TradingBoardRequestType = {
+    .items = sTradingBoardTypes,
+    .moveCursorFunc = ListMenuDefaultCursorMoveFunc,
+    .itemPrintFunc = NULL,
+    .totalItems = NUMBER_OF_MON_TYPES,
+    .maxShowed = 6,
+    .windowId = 0,
+    .header_X = 0,
+    .item_X = 8,
+    .cursor_X = 0,
+    .upText_Y = 1,
+    .cursorPal = 2,
+    .fillValue = 1,
+    .cursorShadowPal = 3,
+    .lettersSpacing = 0,
+    .itemVerticalPadding = 0,
+    .scrollMultiple = 0,
+    .fontId = 1,
+    .cursorKind = 0
+};
+
+const struct WindowTemplate gUnknown_082F0344 = {
+    .bg = 0x00,
+    .tilemapLeft = 0x01,
+    .tilemapTop = 0x01,
+    .width = 0x1c,
+    .height = 0x02,
+    .paletteNum = 0x0d,
+    .baseBlock = 0x0001
+};
+
+const struct WindowTemplate gUnknown_082F034C = {
+    .bg = 0x00,
+    .tilemapLeft = 0x01,
+    .tilemapTop = 0x05,
+    .width = 0x1c,
+    .height = 0x0c,
+    .paletteNum = 0x0d,
+    .baseBlock = 0x0039
+};
+
+const struct ListMenuItem gUnknown_082F0354[] = {
+    { sText_EmptyString, -3 },
+    { sText_EmptyString,  0 },
+    { sText_EmptyString,  1 },
+    { sText_EmptyString,  2 },
+    { sText_EmptyString,  3 },
+    { sText_EmptyString,  4 },
+    { sText_EmptyString,  5 },
+    { sText_EmptyString,  6 },
+    { sText_EmptyString,  7 },
+    { sText_Exit2,  8 }
+};
+
+const struct ListMenuTemplate gUnknown_082F03A4 = {
+    .items = gUnknown_082F0354,
+    .moveCursorFunc = ListMenuDefaultCursorMoveFunc,
+    .itemPrintFunc = sub_8017BE8,
+    .totalItems = 10,
+    .maxShowed = 6,
+    .windowId = 0,
+    .header_X = 0,
+    .item_X = 8,
+    .cursor_X = 0,
+    .upText_Y = 1,
+    .cursorPal = 14,
+    .fillValue = 15,
+    .cursorShadowPal = 13,
+    .lettersSpacing = 0,
+    .itemVerticalPadding = 0,
+    .scrollMultiple = 0,
+    .fontId = 1,
+    .cursorKind = 0
+};
+
+const struct WindowTemplate UnrefWindowTemplate_082F03B4 = {
+    .bg = 0x00,
+    .tilemapLeft = 0x01,
+    .tilemapTop = 0x05,
+    .width = 0x1c,
+    .height = 0x0c,
+    .paletteNum = 0x0d,
+    .baseBlock = 0x0039
+};
+
+const struct ListMenuItem gUnknown_082F03C4[] = {
+    { sText_EmptyString,  0 },
+    { sText_EmptyString,  1 },
+    { sText_EmptyString,  2 },
+    { sText_EmptyString,  3 },
+    { sText_EmptyString,  4 },
+    { sText_EmptyString,  5 },
+    { sText_EmptyString,  6 },
+    { sText_EmptyString,  7 },
+    { sText_EmptyString,  8 },
+    { sText_EmptyString,  9 },
+    { sText_EmptyString, 10 },
+    { sText_EmptyString, 11 },
+    { sText_EmptyString, 12 },
+    { sText_EmptyString, 13 },
+    { sText_EmptyString, 14 },
+    { sText_EmptyString, 15 }
+};
+
+const struct ListMenuTemplate UnrefListMenuTemplate_082F0444 = {
+    .items = gUnknown_082F03C4,
+    .moveCursorFunc = ListMenuDefaultCursorMoveFunc,
+    .itemPrintFunc = nullsub_14,
+    .totalItems = 16,
+    .maxShowed = 4,
+    .windowId = 0,
+    .header_X = 0,
+    .item_X = 8,
+    .cursor_X = 0,
+    .upText_Y = 1,
+    .cursorPal = 2,
+    .fillValue = 1,
+    .cursorShadowPal = 3,
+    .lettersSpacing = 0,
+    .itemVerticalPadding = 0,
+    .scrollMultiple = 1,
+    .fontId = 1,
+    .cursorKind = 0
+};
+
+const struct UnkStruct_Shared gUnknown_082F045C = {0};
+
+ALIGNED(4) const u8 gUnknown_082F0474[] = {0x01, 0xff};
+ALIGNED(4) const u8 gUnknown_082F0478[] = {0x02, 0xff};
+ALIGNED(4) const u8 gUnknown_082F047C[] = {0x03, 0xff};
+ALIGNED(4) const u8 gUnknown_082F0480[] = {0x04, 0xff};
+ALIGNED(4) const u8 gUnknown_082F0484[] = {0x09, 0xff};
+ALIGNED(4) const u8 gUnknown_082F0488[] = {0x0a, 0xff};
+ALIGNED(4) const u8 gUnknown_082F048C[] = {0x0b, 0xff};
+ALIGNED(4) const u8 gUnknown_082F0490[] = {0x15, 0xff};
+ALIGNED(4) const u8 gUnknown_082F0494[] = {0x16, 0xff};
+ALIGNED(4) const u8 gUnknown_082F0498[] = {0x40, 0x41, 0x44, 0x45, 0x48, 0x51, 0x52, 0x53, 0x54, 0xff};
+ALIGNED(4) const u8 gUnknown_082F04A4[] = {0x0c, 0xff};
+ALIGNED(4) const u8 gUnknown_082F04A8[] = {0x01, 0x02, 0x03, 0x04, 0x09, 0x0a, 0x0b, 0x15, 0x16, 0x0d, 0xff};
+ALIGNED(4) const u8 gUnknown_082F04B4[] = {0x0f, 0xff};
+ALIGNED(4) const u8 gUnknown_082F04B8[] = {0x10, 0xff};
+ALIGNED(4) const u8 gUnknown_082F04BC[] = {0x17, 0xff};
+ALIGNED(4) const u8 gUnknown_082F04C0[] = {0x18, 0xff};
+ALIGNED(4) const u8 gUnknown_082F04C4[] = {0x19, 0xff};
+ALIGNED(4) const u8 gUnknown_082F04C8[] = {0x1a, 0xff};
+ALIGNED(4) const u8 gUnknown_082F04CC[] = {0x1b, 0xff};
+ALIGNED(4) const u8 gUnknown_082F04D0[] = {0x1c, 0xff};
+ALIGNED(4) const u8 gUnknown_082F04D4[] = {0x0e, 0xff};
+
+const u8 *const gUnknown_082F04D8[NUM_LINK_GROUP_TYPES] = {
+    gUnknown_082F0474,
+    gUnknown_082F0478,
+    gUnknown_082F047C,
+    gUnknown_082F0480,
+    gUnknown_082F0484,
+    gUnknown_082F0488,
+    gUnknown_082F048C,
+    gUnknown_082F0490,
+    gUnknown_082F0494,
+    gUnknown_082F0498,
+    gUnknown_082F04A4,
+    gUnknown_082F04A8,
+    gUnknown_082F04B4,
+    gUnknown_082F04B8,
+    NULL,
+    gUnknown_082F04BC,
+    gUnknown_082F04C0,
+    gUnknown_082F04C4,
+    gUnknown_082F04C8,
+    gUnknown_082F04CC,
+    gUnknown_082F04D0,
+    gUnknown_082F04D4
+};
+
+// Link group type to ID for gUnknown_02022C2C
+const u8 gUnknown_082F0530[NUM_LINK_GROUP_TYPES + 2] = 
+{
+    0x01, 
+    0x02, 
+    0x03, 
+    0x04, 
+    0x09, 
+    0x0a, 
+    0x0b, 
+    0x15,
+    0x16, 
+    0x00, 
+    0x00, 
+    0x00, 
+    0x0f, 
+    0x10, 
+    0x00, 
+    0x17,
+    0x18, 
+    0x19, 
+    0x1a, 
+    0x1b, 
+    0x1c, 
+    0x0e
+};
diff --git a/src/data/wild_encounters.json b/src/data/wild_encounters.json
index ea555bd32..19aa40b00 100755
--- a/src/data/wild_encounters.json
+++ b/src/data/wild_encounters.json
@@ -26,7 +26,12 @@
           "type": "fishing_mons",
           "encounter_rates": [
             70, 30, 60, 20, 20, 40, 40, 15, 4, 1
-          ]
+          ],
+          "groups": {
+            "old_rod": [0, 1],
+            "good_rod": [2, 3, 4],
+            "super_rod": [5, 6, 7, 8, 9]
+          }
         }
       ],
       "encounters": [
diff --git a/src/data/wild_encounters.json.txt b/src/data/wild_encounters.json.txt
index 85755ddec..bf848249f 100755
--- a/src/data/wild_encounters.json.txt
+++ b/src/data/wild_encounters.json.txt
@@ -3,14 +3,26 @@
 ## for wild_encounter_group in wild_encounter_groups
 {% if wild_encounter_group.for_maps %}
 ## for wild_encounter_field in wild_encounter_group.fields
+{% if not existsIn(wild_encounter_field, "groups") %}
 ## for encounter_rate in wild_encounter_field.encounter_rates
-{% if trackVar(encounter_rate, 100) %}
+{% if loop.index == 0 %}
 #define ENCOUNTER_CHANCE_{{ upper(wild_encounter_field.type) }}_SLOT_{{ loop.index }} {{ encounter_rate }} {% else %}#define ENCOUNTER_CHANCE_{{ upper(wild_encounter_field.type) }}_SLOT_{{ loop.index }} ENCOUNTER_CHANCE_{{ upper(wild_encounter_field.type) }}_SLOT_{{ subtract(loop.index, 1) }} + {{ encounter_rate }}{% endif %} {{ setVarInt(wild_encounter_field.type, loop.index) }}
 ## endfor
 #define ENCOUNTER_CHANCE_{{ upper(wild_encounter_field.type) }}_TOTAL (ENCOUNTER_CHANCE_{{ upper(wild_encounter_field.type) }}_SLOT_{{ getVar(wild_encounter_field.type) }})
+{% else %}
+## for field_subgroup_key, field_subgroup_subarray in wild_encounter_field.groups
+## for field_subgroup_index in field_subgroup_subarray
+{% if loop.index == 0 %}
+#define ENCOUNTER_CHANCE_{{ upper(wild_encounter_field.type) }}_{{ upper(field_subgroup_key) }}_SLOT_{{ field_subgroup_index }} {{ at(wild_encounter_field.encounter_rates, field_subgroup_index) }} {% else %}#define ENCOUNTER_CHANCE_{{ upper(wild_encounter_field.type) }}_{{ upper(field_subgroup_key) }}_SLOT_{{ field_subgroup_index }} ENCOUNTER_CHANCE_{{ upper(wild_encounter_field.type) }}_{{ upper(field_subgroup_key) }}_SLOT_{{ getVar("previous_slot") }} + {{ at(wild_encounter_field.encounter_rates, field_subgroup_index) }}{% endif %}{{ setVarInt(concat(wild_encounter_field.type, field_subgroup_key), field_subgroup_index) }}{{ setVarInt("previous_slot", field_subgroup_index) }}
+## endfor
+#define ENCOUNTER_CHANCE_{{ upper(wild_encounter_field.type) }}_{{ upper(field_subgroup_key) }}_TOTAL (ENCOUNTER_CHANCE_{{ upper(wild_encounter_field.type) }}_{{ upper(field_subgroup_key) }}_SLOT_{{ getVar(concat(wild_encounter_field.type, field_subgroup_key)) }})
+## endfor
+{% endif %}
 ## endfor
 {% endif %}
 
+
+
 ## for encounter in wild_encounter_group.encounters
 {% if existsIn(encounter, "land_mons") %}
 const struct WildPokemon {{ encounter.base_label }}_LandMons[] =