diff --git a/include/data.h b/include/data.h
index 0fe2ea577..0154b9f82 100644
--- a/include/data.h
+++ b/include/data.h
@@ -52,7 +52,7 @@ struct TrainerMon
     bool8 isShiny : 1;
 };
 
-#define EVERYTHING_CUSTOMIZED(partyArray) partyArray, .partySize = ARRAY_COUNT(partyArray)
+#define TRAINER_PARTY(partyArray) partyArray, .partySize = ARRAY_COUNT(partyArray)
 
 struct Trainer
 {
diff --git a/src/data/trainers.h b/src/data/trainers.h
index d2ffe3972..7a34223b8 100644
--- a/src/data/trainers.h
+++ b/src/data/trainers.h
@@ -21,7 +21,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Sawyer1),
+        .party = TRAINER_PARTY(sParty_Sawyer1),
     },
 
     [TRAINER_GRUNT_AQUA_HIDEOUT_1] =
@@ -33,7 +33,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_GruntAquaHideout1),
+        .party = TRAINER_PARTY(sParty_GruntAquaHideout1),
     },
 
     [TRAINER_GRUNT_AQUA_HIDEOUT_2] =
@@ -45,7 +45,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_GruntAquaHideout2),
+        .party = TRAINER_PARTY(sParty_GruntAquaHideout2),
     },
 
     [TRAINER_GRUNT_AQUA_HIDEOUT_3] =
@@ -57,7 +57,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_GruntAquaHideout3),
+        .party = TRAINER_PARTY(sParty_GruntAquaHideout3),
     },
 
     [TRAINER_GRUNT_AQUA_HIDEOUT_4] =
@@ -69,7 +69,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_GruntAquaHideout4),
+        .party = TRAINER_PARTY(sParty_GruntAquaHideout4),
     },
 
     [TRAINER_GRUNT_SEAFLOOR_CAVERN_1] =
@@ -81,7 +81,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_GruntSeafloorCavern1),
+        .party = TRAINER_PARTY(sParty_GruntSeafloorCavern1),
     },
 
     [TRAINER_GRUNT_SEAFLOOR_CAVERN_2] =
@@ -93,7 +93,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_GruntSeafloorCavern2),
+        .party = TRAINER_PARTY(sParty_GruntSeafloorCavern2),
     },
 
     [TRAINER_GRUNT_SEAFLOOR_CAVERN_3] =
@@ -105,7 +105,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_GruntSeafloorCavern3),
+        .party = TRAINER_PARTY(sParty_GruntSeafloorCavern3),
     },
 
     [TRAINER_GABRIELLE_1] =
@@ -117,7 +117,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Gabrielle1),
+        .party = TRAINER_PARTY(sParty_Gabrielle1),
     },
 
     [TRAINER_GRUNT_PETALBURG_WOODS] =
@@ -129,7 +129,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_GruntPetalburgWoods),
+        .party = TRAINER_PARTY(sParty_GruntPetalburgWoods),
     },
 
     [TRAINER_MARCEL] =
@@ -141,7 +141,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Marcel),
+        .party = TRAINER_PARTY(sParty_Marcel),
     },
 
     [TRAINER_ALBERTO] =
@@ -153,7 +153,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Alberto),
+        .party = TRAINER_PARTY(sParty_Alberto),
     },
 
     [TRAINER_ED] =
@@ -165,7 +165,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Ed),
+        .party = TRAINER_PARTY(sParty_Ed),
     },
 
     [TRAINER_GRUNT_SEAFLOOR_CAVERN_4] =
@@ -177,7 +177,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_GruntSeafloorCavern4),
+        .party = TRAINER_PARTY(sParty_GruntSeafloorCavern4),
     },
 
     [TRAINER_DECLAN] =
@@ -189,7 +189,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Declan),
+        .party = TRAINER_PARTY(sParty_Declan),
     },
 
     [TRAINER_GRUNT_RUSTURF_TUNNEL] =
@@ -201,7 +201,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_GruntRusturfTunnel),
+        .party = TRAINER_PARTY(sParty_GruntRusturfTunnel),
     },
 
     [TRAINER_GRUNT_WEATHER_INST_1] =
@@ -213,7 +213,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_GruntWeatherInst1),
+        .party = TRAINER_PARTY(sParty_GruntWeatherInst1),
     },
 
     [TRAINER_GRUNT_WEATHER_INST_2] =
@@ -225,7 +225,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_GruntWeatherInst2),
+        .party = TRAINER_PARTY(sParty_GruntWeatherInst2),
     },
 
     [TRAINER_GRUNT_WEATHER_INST_3] =
@@ -237,7 +237,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_GruntWeatherInst3),
+        .party = TRAINER_PARTY(sParty_GruntWeatherInst3),
     },
 
     [TRAINER_GRUNT_MUSEUM_1] =
@@ -249,7 +249,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_GruntMuseum1),
+        .party = TRAINER_PARTY(sParty_GruntMuseum1),
     },
 
     [TRAINER_GRUNT_MUSEUM_2] =
@@ -261,7 +261,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_GruntMuseum2),
+        .party = TRAINER_PARTY(sParty_GruntMuseum2),
     },
 
     [TRAINER_GRUNT_SPACE_CENTER_1] =
@@ -273,7 +273,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_GruntSpaceCenter1),
+        .party = TRAINER_PARTY(sParty_GruntSpaceCenter1),
     },
 
     [TRAINER_GRUNT_MT_PYRE_1] =
@@ -285,7 +285,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_GruntMtPyre1),
+        .party = TRAINER_PARTY(sParty_GruntMtPyre1),
     },
 
     [TRAINER_GRUNT_MT_PYRE_2] =
@@ -297,7 +297,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_GruntMtPyre2),
+        .party = TRAINER_PARTY(sParty_GruntMtPyre2),
     },
 
     [TRAINER_GRUNT_MT_PYRE_3] =
@@ -309,7 +309,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_GruntMtPyre3),
+        .party = TRAINER_PARTY(sParty_GruntMtPyre3),
     },
 
     [TRAINER_GRUNT_WEATHER_INST_4] =
@@ -321,7 +321,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_GruntWeatherInst4),
+        .party = TRAINER_PARTY(sParty_GruntWeatherInst4),
     },
 
     [TRAINER_GRUNT_AQUA_HIDEOUT_5] =
@@ -333,7 +333,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_GruntAquaHideout5),
+        .party = TRAINER_PARTY(sParty_GruntAquaHideout5),
     },
 
     [TRAINER_GRUNT_AQUA_HIDEOUT_6] =
@@ -345,7 +345,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_GruntAquaHideout6),
+        .party = TRAINER_PARTY(sParty_GruntAquaHideout6),
     },
 
     [TRAINER_FREDRICK] =
@@ -357,7 +357,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Fredrick),
+        .party = TRAINER_PARTY(sParty_Fredrick),
     },
 
     [TRAINER_MATT] =
@@ -369,7 +369,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Matt),
+        .party = TRAINER_PARTY(sParty_Matt),
     },
 
     [TRAINER_ZANDER] =
@@ -381,7 +381,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Zander),
+        .party = TRAINER_PARTY(sParty_Zander),
     },
 
     [TRAINER_SHELLY_WEATHER_INSTITUTE] =
@@ -393,7 +393,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_ShellyWeatherInstitute),
+        .party = TRAINER_PARTY(sParty_ShellyWeatherInstitute),
     },
 
     [TRAINER_SHELLY_SEAFLOOR_CAVERN] =
@@ -405,7 +405,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_ShellySeafloorCavern),
+        .party = TRAINER_PARTY(sParty_ShellySeafloorCavern),
     },
 
     [TRAINER_ARCHIE] =
@@ -417,7 +417,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Archie),
+        .party = TRAINER_PARTY(sParty_Archie),
     },
 
     [TRAINER_LEAH] =
@@ -429,7 +429,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Leah),
+        .party = TRAINER_PARTY(sParty_Leah),
     },
 
     [TRAINER_DAISY] =
@@ -441,7 +441,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Daisy),
+        .party = TRAINER_PARTY(sParty_Daisy),
     },
 
     [TRAINER_ROSE_1] =
@@ -453,7 +453,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Rose1),
+        .party = TRAINER_PARTY(sParty_Rose1),
     },
 
     [TRAINER_FELIX] =
@@ -465,7 +465,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Felix),
+        .party = TRAINER_PARTY(sParty_Felix),
     },
 
     [TRAINER_VIOLET] =
@@ -477,7 +477,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Violet),
+        .party = TRAINER_PARTY(sParty_Violet),
     },
 
     [TRAINER_ROSE_2] =
@@ -489,7 +489,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Rose2),
+        .party = TRAINER_PARTY(sParty_Rose2),
     },
 
     [TRAINER_ROSE_3] =
@@ -501,7 +501,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Rose3),
+        .party = TRAINER_PARTY(sParty_Rose3),
     },
 
     [TRAINER_ROSE_4] =
@@ -513,7 +513,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Rose4),
+        .party = TRAINER_PARTY(sParty_Rose4),
     },
 
     [TRAINER_ROSE_5] =
@@ -525,7 +525,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Rose5),
+        .party = TRAINER_PARTY(sParty_Rose5),
     },
 
     [TRAINER_DUSTY_1] =
@@ -537,7 +537,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Dusty1),
+        .party = TRAINER_PARTY(sParty_Dusty1),
     },
 
     [TRAINER_CHIP] =
@@ -549,7 +549,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Chip),
+        .party = TRAINER_PARTY(sParty_Chip),
     },
 
     [TRAINER_FOSTER] =
@@ -561,7 +561,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Foster),
+        .party = TRAINER_PARTY(sParty_Foster),
     },
 
     [TRAINER_DUSTY_2] =
@@ -573,7 +573,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Dusty2),
+        .party = TRAINER_PARTY(sParty_Dusty2),
     },
 
     [TRAINER_DUSTY_3] =
@@ -585,7 +585,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Dusty3),
+        .party = TRAINER_PARTY(sParty_Dusty3),
     },
 
     [TRAINER_DUSTY_4] =
@@ -597,7 +597,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Dusty4),
+        .party = TRAINER_PARTY(sParty_Dusty4),
     },
 
     [TRAINER_DUSTY_5] =
@@ -609,7 +609,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Dusty5),
+        .party = TRAINER_PARTY(sParty_Dusty5),
     },
 
     [TRAINER_GABBY_AND_TY_1] =
@@ -621,7 +621,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_GabbyAndTy1),
+        .party = TRAINER_PARTY(sParty_GabbyAndTy1),
     },
 
     [TRAINER_GABBY_AND_TY_2] =
@@ -633,7 +633,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_GabbyAndTy2),
+        .party = TRAINER_PARTY(sParty_GabbyAndTy2),
     },
 
     [TRAINER_GABBY_AND_TY_3] =
@@ -645,7 +645,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_GabbyAndTy3),
+        .party = TRAINER_PARTY(sParty_GabbyAndTy3),
     },
 
     [TRAINER_GABBY_AND_TY_4] =
@@ -657,7 +657,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_GabbyAndTy4),
+        .party = TRAINER_PARTY(sParty_GabbyAndTy4),
     },
 
     [TRAINER_GABBY_AND_TY_5] =
@@ -669,7 +669,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_GabbyAndTy5),
+        .party = TRAINER_PARTY(sParty_GabbyAndTy5),
     },
 
     [TRAINER_GABBY_AND_TY_6] =
@@ -681,7 +681,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_GabbyAndTy6),
+        .party = TRAINER_PARTY(sParty_GabbyAndTy6),
     },
 
     [TRAINER_LOLA_1] =
@@ -693,7 +693,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Lola1),
+        .party = TRAINER_PARTY(sParty_Lola1),
     },
 
     [TRAINER_AUSTINA] =
@@ -705,7 +705,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Austina),
+        .party = TRAINER_PARTY(sParty_Austina),
     },
 
     [TRAINER_GWEN] =
@@ -717,7 +717,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Gwen),
+        .party = TRAINER_PARTY(sParty_Gwen),
     },
 
     [TRAINER_LOLA_2] =
@@ -729,7 +729,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Lola2),
+        .party = TRAINER_PARTY(sParty_Lola2),
     },
 
     [TRAINER_LOLA_3] =
@@ -741,7 +741,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Lola3),
+        .party = TRAINER_PARTY(sParty_Lola3),
     },
 
     [TRAINER_LOLA_4] =
@@ -753,7 +753,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Lola4),
+        .party = TRAINER_PARTY(sParty_Lola4),
     },
 
     [TRAINER_LOLA_5] =
@@ -765,7 +765,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Lola5),
+        .party = TRAINER_PARTY(sParty_Lola5),
     },
 
     [TRAINER_RICKY_1] =
@@ -777,7 +777,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Ricky1),
+        .party = TRAINER_PARTY(sParty_Ricky1),
     },
 
     [TRAINER_SIMON] =
@@ -789,7 +789,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Simon),
+        .party = TRAINER_PARTY(sParty_Simon),
     },
 
     [TRAINER_CHARLIE] =
@@ -801,7 +801,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Charlie),
+        .party = TRAINER_PARTY(sParty_Charlie),
     },
 
     [TRAINER_RICKY_2] =
@@ -813,7 +813,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Ricky2),
+        .party = TRAINER_PARTY(sParty_Ricky2),
     },
 
     [TRAINER_RICKY_3] =
@@ -825,7 +825,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Ricky3),
+        .party = TRAINER_PARTY(sParty_Ricky3),
     },
 
     [TRAINER_RICKY_4] =
@@ -837,7 +837,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Ricky4),
+        .party = TRAINER_PARTY(sParty_Ricky4),
     },
 
     [TRAINER_RICKY_5] =
@@ -849,7 +849,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Ricky5),
+        .party = TRAINER_PARTY(sParty_Ricky5),
     },
 
     [TRAINER_RANDALL] =
@@ -861,7 +861,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Randall),
+        .party = TRAINER_PARTY(sParty_Randall),
     },
 
     [TRAINER_PARKER] =
@@ -873,7 +873,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Parker),
+        .party = TRAINER_PARTY(sParty_Parker),
     },
 
     [TRAINER_GEORGE] =
@@ -885,7 +885,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_George),
+        .party = TRAINER_PARTY(sParty_George),
     },
 
     [TRAINER_BERKE] =
@@ -897,7 +897,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Berke),
+        .party = TRAINER_PARTY(sParty_Berke),
     },
 
     [TRAINER_BRAXTON] =
@@ -909,7 +909,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Braxton),
+        .party = TRAINER_PARTY(sParty_Braxton),
     },
 
     [TRAINER_VINCENT] =
@@ -921,7 +921,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Vincent),
+        .party = TRAINER_PARTY(sParty_Vincent),
     },
 
     [TRAINER_LEROY] =
@@ -933,7 +933,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Leroy),
+        .party = TRAINER_PARTY(sParty_Leroy),
     },
 
     [TRAINER_WILTON_1] =
@@ -945,7 +945,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Wilton1),
+        .party = TRAINER_PARTY(sParty_Wilton1),
     },
 
     [TRAINER_EDGAR] =
@@ -957,7 +957,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Edgar),
+        .party = TRAINER_PARTY(sParty_Edgar),
     },
 
     [TRAINER_ALBERT] =
@@ -969,7 +969,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Albert),
+        .party = TRAINER_PARTY(sParty_Albert),
     },
 
     [TRAINER_SAMUEL] =
@@ -981,7 +981,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Samuel),
+        .party = TRAINER_PARTY(sParty_Samuel),
     },
 
     [TRAINER_VITO] =
@@ -993,7 +993,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Vito),
+        .party = TRAINER_PARTY(sParty_Vito),
     },
 
     [TRAINER_OWEN] =
@@ -1005,7 +1005,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Owen),
+        .party = TRAINER_PARTY(sParty_Owen),
     },
 
     [TRAINER_WILTON_2] =
@@ -1017,7 +1017,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Wilton2),
+        .party = TRAINER_PARTY(sParty_Wilton2),
     },
 
     [TRAINER_WILTON_3] =
@@ -1029,7 +1029,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Wilton3),
+        .party = TRAINER_PARTY(sParty_Wilton3),
     },
 
     [TRAINER_WILTON_4] =
@@ -1041,7 +1041,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Wilton4),
+        .party = TRAINER_PARTY(sParty_Wilton4),
     },
 
     [TRAINER_WILTON_5] =
@@ -1053,7 +1053,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Wilton5),
+        .party = TRAINER_PARTY(sParty_Wilton5),
     },
 
     [TRAINER_WARREN] =
@@ -1065,7 +1065,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Warren),
+        .party = TRAINER_PARTY(sParty_Warren),
     },
 
     [TRAINER_MARY] =
@@ -1077,7 +1077,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Mary),
+        .party = TRAINER_PARTY(sParty_Mary),
     },
 
     [TRAINER_ALEXIA] =
@@ -1089,7 +1089,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Alexia),
+        .party = TRAINER_PARTY(sParty_Alexia),
     },
 
     [TRAINER_JODY] =
@@ -1101,7 +1101,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_SETUP_FIRST_TURN,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Jody),
+        .party = TRAINER_PARTY(sParty_Jody),
     },
 
     [TRAINER_WENDY] =
@@ -1113,7 +1113,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_SETUP_FIRST_TURN,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Wendy),
+        .party = TRAINER_PARTY(sParty_Wendy),
     },
 
     [TRAINER_KEIRA] =
@@ -1125,7 +1125,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_SETUP_FIRST_TURN,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Keira),
+        .party = TRAINER_PARTY(sParty_Keira),
     },
 
     [TRAINER_BROOKE_1] =
@@ -1137,7 +1137,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Brooke1),
+        .party = TRAINER_PARTY(sParty_Brooke1),
     },
 
     [TRAINER_JENNIFER] =
@@ -1149,7 +1149,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Jennifer),
+        .party = TRAINER_PARTY(sParty_Jennifer),
     },
 
     [TRAINER_HOPE] =
@@ -1161,7 +1161,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Hope),
+        .party = TRAINER_PARTY(sParty_Hope),
     },
 
     [TRAINER_SHANNON] =
@@ -1173,7 +1173,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Shannon),
+        .party = TRAINER_PARTY(sParty_Shannon),
     },
 
     [TRAINER_MICHELLE] =
@@ -1185,7 +1185,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Michelle),
+        .party = TRAINER_PARTY(sParty_Michelle),
     },
 
     [TRAINER_CAROLINE] =
@@ -1197,7 +1197,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Caroline),
+        .party = TRAINER_PARTY(sParty_Caroline),
     },
 
     [TRAINER_JULIE] =
@@ -1209,7 +1209,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Julie),
+        .party = TRAINER_PARTY(sParty_Julie),
     },
 
     [TRAINER_BROOKE_2] =
@@ -1221,7 +1221,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Brooke2),
+        .party = TRAINER_PARTY(sParty_Brooke2),
     },
 
     [TRAINER_BROOKE_3] =
@@ -1233,7 +1233,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Brooke3),
+        .party = TRAINER_PARTY(sParty_Brooke3),
     },
 
     [TRAINER_BROOKE_4] =
@@ -1245,7 +1245,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Brooke4),
+        .party = TRAINER_PARTY(sParty_Brooke4),
     },
 
     [TRAINER_BROOKE_5] =
@@ -1257,7 +1257,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Brooke5),
+        .party = TRAINER_PARTY(sParty_Brooke5),
     },
 
     [TRAINER_PATRICIA] =
@@ -1269,7 +1269,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Patricia),
+        .party = TRAINER_PARTY(sParty_Patricia),
     },
 
     [TRAINER_KINDRA] =
@@ -1281,7 +1281,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Kindra),
+        .party = TRAINER_PARTY(sParty_Kindra),
     },
 
     [TRAINER_TAMMY] =
@@ -1293,7 +1293,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Tammy),
+        .party = TRAINER_PARTY(sParty_Tammy),
     },
 
     [TRAINER_VALERIE_1] =
@@ -1305,7 +1305,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Valerie1),
+        .party = TRAINER_PARTY(sParty_Valerie1),
     },
 
     [TRAINER_TASHA] =
@@ -1317,7 +1317,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Tasha),
+        .party = TRAINER_PARTY(sParty_Tasha),
     },
 
     [TRAINER_VALERIE_2] =
@@ -1329,7 +1329,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Valerie2),
+        .party = TRAINER_PARTY(sParty_Valerie2),
     },
 
     [TRAINER_VALERIE_3] =
@@ -1341,7 +1341,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Valerie3),
+        .party = TRAINER_PARTY(sParty_Valerie3),
     },
 
     [TRAINER_VALERIE_4] =
@@ -1353,7 +1353,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Valerie4),
+        .party = TRAINER_PARTY(sParty_Valerie4),
     },
 
     [TRAINER_VALERIE_5] =
@@ -1365,7 +1365,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Valerie5),
+        .party = TRAINER_PARTY(sParty_Valerie5),
     },
 
     [TRAINER_CINDY_1] =
@@ -1377,7 +1377,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Cindy1),
+        .party = TRAINER_PARTY(sParty_Cindy1),
     },
 
     [TRAINER_DAPHNE] =
@@ -1389,7 +1389,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Daphne),
+        .party = TRAINER_PARTY(sParty_Daphne),
     },
 
     [TRAINER_GRUNT_SPACE_CENTER_2] =
@@ -1401,7 +1401,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_GruntSpaceCenter2),
+        .party = TRAINER_PARTY(sParty_GruntSpaceCenter2),
     },
 
     [TRAINER_CINDY_2] =
@@ -1413,7 +1413,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Cindy2),
+        .party = TRAINER_PARTY(sParty_Cindy2),
     },
 
     [TRAINER_BRIANNA] =
@@ -1425,7 +1425,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Brianna),
+        .party = TRAINER_PARTY(sParty_Brianna),
     },
 
     [TRAINER_NAOMI] =
@@ -1437,7 +1437,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Naomi),
+        .party = TRAINER_PARTY(sParty_Naomi),
     },
 
     [TRAINER_CINDY_3] =
@@ -1449,7 +1449,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Cindy3),
+        .party = TRAINER_PARTY(sParty_Cindy3),
     },
 
     [TRAINER_CINDY_4] =
@@ -1461,7 +1461,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Cindy4),
+        .party = TRAINER_PARTY(sParty_Cindy4),
     },
 
     [TRAINER_CINDY_5] =
@@ -1473,7 +1473,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Cindy5),
+        .party = TRAINER_PARTY(sParty_Cindy5),
     },
 
     [TRAINER_CINDY_6] =
@@ -1485,7 +1485,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Cindy6),
+        .party = TRAINER_PARTY(sParty_Cindy6),
     },
 
     [TRAINER_MELISSA] =
@@ -1497,7 +1497,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Melissa),
+        .party = TRAINER_PARTY(sParty_Melissa),
     },
 
     [TRAINER_SHEILA] =
@@ -1509,7 +1509,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Sheila),
+        .party = TRAINER_PARTY(sParty_Sheila),
     },
 
     [TRAINER_SHIRLEY] =
@@ -1521,7 +1521,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Shirley),
+        .party = TRAINER_PARTY(sParty_Shirley),
     },
 
     [TRAINER_JESSICA_1] =
@@ -1533,7 +1533,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Jessica1),
+        .party = TRAINER_PARTY(sParty_Jessica1),
     },
 
     [TRAINER_CONNIE] =
@@ -1545,7 +1545,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Connie),
+        .party = TRAINER_PARTY(sParty_Connie),
     },
 
     [TRAINER_BRIDGET] =
@@ -1557,7 +1557,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Bridget),
+        .party = TRAINER_PARTY(sParty_Bridget),
     },
 
     [TRAINER_OLIVIA] =
@@ -1569,7 +1569,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Olivia),
+        .party = TRAINER_PARTY(sParty_Olivia),
     },
 
     [TRAINER_TIFFANY] =
@@ -1581,7 +1581,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Tiffany),
+        .party = TRAINER_PARTY(sParty_Tiffany),
     },
 
     [TRAINER_JESSICA_2] =
@@ -1593,7 +1593,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Jessica2),
+        .party = TRAINER_PARTY(sParty_Jessica2),
     },
 
     [TRAINER_JESSICA_3] =
@@ -1605,7 +1605,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Jessica3),
+        .party = TRAINER_PARTY(sParty_Jessica3),
     },
 
     [TRAINER_JESSICA_4] =
@@ -1617,7 +1617,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Jessica4),
+        .party = TRAINER_PARTY(sParty_Jessica4),
     },
 
     [TRAINER_JESSICA_5] =
@@ -1629,7 +1629,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Jessica5),
+        .party = TRAINER_PARTY(sParty_Jessica5),
     },
 
     [TRAINER_WINSTON_1] =
@@ -1641,7 +1641,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Winston1),
+        .party = TRAINER_PARTY(sParty_Winston1),
     },
 
     [TRAINER_MOLLIE] =
@@ -1653,7 +1653,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Mollie),
+        .party = TRAINER_PARTY(sParty_Mollie),
     },
 
     [TRAINER_GARRET] =
@@ -1665,7 +1665,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Garret),
+        .party = TRAINER_PARTY(sParty_Garret),
     },
 
     [TRAINER_WINSTON_2] =
@@ -1677,7 +1677,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Winston2),
+        .party = TRAINER_PARTY(sParty_Winston2),
     },
 
     [TRAINER_WINSTON_3] =
@@ -1689,7 +1689,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Winston3),
+        .party = TRAINER_PARTY(sParty_Winston3),
     },
 
     [TRAINER_WINSTON_4] =
@@ -1701,7 +1701,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Winston4),
+        .party = TRAINER_PARTY(sParty_Winston4),
     },
 
     [TRAINER_WINSTON_5] =
@@ -1713,7 +1713,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Winston5),
+        .party = TRAINER_PARTY(sParty_Winston5),
     },
 
     [TRAINER_STEVE_1] =
@@ -1725,7 +1725,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Steve1),
+        .party = TRAINER_PARTY(sParty_Steve1),
     },
 
     [TRAINER_THALIA_1] =
@@ -1737,7 +1737,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Thalia1),
+        .party = TRAINER_PARTY(sParty_Thalia1),
     },
 
     [TRAINER_MARK] =
@@ -1749,7 +1749,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Mark),
+        .party = TRAINER_PARTY(sParty_Mark),
     },
 
     [TRAINER_GRUNT_MT_CHIMNEY_1] =
@@ -1761,7 +1761,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_GruntMtChimney1),
+        .party = TRAINER_PARTY(sParty_GruntMtChimney1),
     },
 
     [TRAINER_STEVE_2] =
@@ -1773,7 +1773,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Steve2),
+        .party = TRAINER_PARTY(sParty_Steve2),
     },
 
     [TRAINER_STEVE_3] =
@@ -1785,7 +1785,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Steve3),
+        .party = TRAINER_PARTY(sParty_Steve3),
     },
 
     [TRAINER_STEVE_4] =
@@ -1797,7 +1797,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Steve4),
+        .party = TRAINER_PARTY(sParty_Steve4),
     },
 
     [TRAINER_STEVE_5] =
@@ -1809,7 +1809,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Steve5),
+        .party = TRAINER_PARTY(sParty_Steve5),
     },
 
     [TRAINER_LUIS] =
@@ -1821,7 +1821,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Luis),
+        .party = TRAINER_PARTY(sParty_Luis),
     },
 
     [TRAINER_DOMINIK] =
@@ -1833,7 +1833,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Dominik),
+        .party = TRAINER_PARTY(sParty_Dominik),
     },
 
     [TRAINER_DOUGLAS] =
@@ -1845,7 +1845,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Douglas),
+        .party = TRAINER_PARTY(sParty_Douglas),
     },
 
     [TRAINER_DARRIN] =
@@ -1857,7 +1857,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Darrin),
+        .party = TRAINER_PARTY(sParty_Darrin),
     },
 
     [TRAINER_TONY_1] =
@@ -1869,7 +1869,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Tony1),
+        .party = TRAINER_PARTY(sParty_Tony1),
     },
 
     [TRAINER_JEROME] =
@@ -1881,7 +1881,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Jerome),
+        .party = TRAINER_PARTY(sParty_Jerome),
     },
 
     [TRAINER_MATTHEW] =
@@ -1893,7 +1893,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Matthew),
+        .party = TRAINER_PARTY(sParty_Matthew),
     },
 
     [TRAINER_DAVID] =
@@ -1905,7 +1905,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_David),
+        .party = TRAINER_PARTY(sParty_David),
     },
 
     [TRAINER_SPENCER] =
@@ -1917,7 +1917,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Spencer),
+        .party = TRAINER_PARTY(sParty_Spencer),
     },
 
     [TRAINER_ROLAND] =
@@ -1929,7 +1929,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Roland),
+        .party = TRAINER_PARTY(sParty_Roland),
     },
 
     [TRAINER_NOLEN] =
@@ -1941,7 +1941,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Nolen),
+        .party = TRAINER_PARTY(sParty_Nolen),
     },
 
     [TRAINER_STAN] =
@@ -1953,7 +1953,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Stan),
+        .party = TRAINER_PARTY(sParty_Stan),
     },
 
     [TRAINER_BARRY] =
@@ -1965,7 +1965,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Barry),
+        .party = TRAINER_PARTY(sParty_Barry),
     },
 
     [TRAINER_DEAN] =
@@ -1977,7 +1977,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Dean),
+        .party = TRAINER_PARTY(sParty_Dean),
     },
 
     [TRAINER_RODNEY] =
@@ -1989,7 +1989,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Rodney),
+        .party = TRAINER_PARTY(sParty_Rodney),
     },
 
     [TRAINER_RICHARD] =
@@ -2001,7 +2001,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Richard),
+        .party = TRAINER_PARTY(sParty_Richard),
     },
 
     [TRAINER_HERMAN] =
@@ -2013,7 +2013,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Herman),
+        .party = TRAINER_PARTY(sParty_Herman),
     },
 
     [TRAINER_SANTIAGO] =
@@ -2025,7 +2025,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Santiago),
+        .party = TRAINER_PARTY(sParty_Santiago),
     },
 
     [TRAINER_GILBERT] =
@@ -2037,7 +2037,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Gilbert),
+        .party = TRAINER_PARTY(sParty_Gilbert),
     },
 
     [TRAINER_FRANKLIN] =
@@ -2049,7 +2049,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Franklin),
+        .party = TRAINER_PARTY(sParty_Franklin),
     },
 
     [TRAINER_KEVIN] =
@@ -2061,7 +2061,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Kevin),
+        .party = TRAINER_PARTY(sParty_Kevin),
     },
 
     [TRAINER_JACK] =
@@ -2073,7 +2073,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Jack),
+        .party = TRAINER_PARTY(sParty_Jack),
     },
 
     [TRAINER_DUDLEY] =
@@ -2085,7 +2085,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Dudley),
+        .party = TRAINER_PARTY(sParty_Dudley),
     },
 
     [TRAINER_CHAD] =
@@ -2097,7 +2097,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Chad),
+        .party = TRAINER_PARTY(sParty_Chad),
     },
 
     [TRAINER_TONY_2] =
@@ -2109,7 +2109,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Tony2),
+        .party = TRAINER_PARTY(sParty_Tony2),
     },
 
     [TRAINER_TONY_3] =
@@ -2121,7 +2121,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Tony3),
+        .party = TRAINER_PARTY(sParty_Tony3),
     },
 
     [TRAINER_TONY_4] =
@@ -2133,7 +2133,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Tony4),
+        .party = TRAINER_PARTY(sParty_Tony4),
     },
 
     [TRAINER_TONY_5] =
@@ -2145,7 +2145,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Tony5),
+        .party = TRAINER_PARTY(sParty_Tony5),
     },
 
     [TRAINER_TAKAO] =
@@ -2157,7 +2157,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Takao),
+        .party = TRAINER_PARTY(sParty_Takao),
     },
 
     [TRAINER_HITOSHI] =
@@ -2169,7 +2169,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Hitoshi),
+        .party = TRAINER_PARTY(sParty_Hitoshi),
     },
 
     [TRAINER_KIYO] =
@@ -2181,7 +2181,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Kiyo),
+        .party = TRAINER_PARTY(sParty_Kiyo),
     },
 
     [TRAINER_KOICHI] =
@@ -2193,7 +2193,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Koichi),
+        .party = TRAINER_PARTY(sParty_Koichi),
     },
 
     [TRAINER_NOB_1] =
@@ -2205,7 +2205,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Nob1),
+        .party = TRAINER_PARTY(sParty_Nob1),
     },
 
     [TRAINER_NOB_2] =
@@ -2217,7 +2217,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Nob2),
+        .party = TRAINER_PARTY(sParty_Nob2),
     },
 
     [TRAINER_NOB_3] =
@@ -2229,7 +2229,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Nob3),
+        .party = TRAINER_PARTY(sParty_Nob3),
     },
 
     [TRAINER_NOB_4] =
@@ -2241,7 +2241,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Nob4),
+        .party = TRAINER_PARTY(sParty_Nob4),
     },
 
     [TRAINER_NOB_5] =
@@ -2253,7 +2253,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Nob5),
+        .party = TRAINER_PARTY(sParty_Nob5),
     },
 
     [TRAINER_YUJI] =
@@ -2265,7 +2265,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Yuji),
+        .party = TRAINER_PARTY(sParty_Yuji),
     },
 
     [TRAINER_DAISUKE] =
@@ -2277,7 +2277,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Daisuke),
+        .party = TRAINER_PARTY(sParty_Daisuke),
     },
 
     [TRAINER_ATSUSHI] =
@@ -2289,7 +2289,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Atsushi),
+        .party = TRAINER_PARTY(sParty_Atsushi),
     },
 
     [TRAINER_KIRK] =
@@ -2301,7 +2301,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Kirk),
+        .party = TRAINER_PARTY(sParty_Kirk),
     },
 
     [TRAINER_GRUNT_AQUA_HIDEOUT_7] =
@@ -2313,7 +2313,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_GruntAquaHideout7),
+        .party = TRAINER_PARTY(sParty_GruntAquaHideout7),
     },
 
     [TRAINER_GRUNT_AQUA_HIDEOUT_8] =
@@ -2325,7 +2325,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_GruntAquaHideout8),
+        .party = TRAINER_PARTY(sParty_GruntAquaHideout8),
     },
 
     [TRAINER_SHAWN] =
@@ -2337,7 +2337,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Shawn),
+        .party = TRAINER_PARTY(sParty_Shawn),
     },
 
     [TRAINER_FERNANDO_1] =
@@ -2349,7 +2349,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Fernando1),
+        .party = TRAINER_PARTY(sParty_Fernando1),
     },
 
     [TRAINER_DALTON_1] =
@@ -2361,7 +2361,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Dalton1),
+        .party = TRAINER_PARTY(sParty_Dalton1),
     },
 
     [TRAINER_DALTON_2] =
@@ -2373,7 +2373,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Dalton2),
+        .party = TRAINER_PARTY(sParty_Dalton2),
     },
 
     [TRAINER_DALTON_3] =
@@ -2385,7 +2385,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Dalton3),
+        .party = TRAINER_PARTY(sParty_Dalton3),
     },
 
     [TRAINER_DALTON_4] =
@@ -2397,7 +2397,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Dalton4),
+        .party = TRAINER_PARTY(sParty_Dalton4),
     },
 
     [TRAINER_DALTON_5] =
@@ -2409,7 +2409,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Dalton5),
+        .party = TRAINER_PARTY(sParty_Dalton5),
     },
 
     [TRAINER_COLE] =
@@ -2421,7 +2421,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Cole),
+        .party = TRAINER_PARTY(sParty_Cole),
     },
 
     [TRAINER_JEFF] =
@@ -2433,7 +2433,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Jeff),
+        .party = TRAINER_PARTY(sParty_Jeff),
     },
 
     [TRAINER_AXLE] =
@@ -2445,7 +2445,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Axle),
+        .party = TRAINER_PARTY(sParty_Axle),
     },
 
     [TRAINER_JACE] =
@@ -2457,7 +2457,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Jace),
+        .party = TRAINER_PARTY(sParty_Jace),
     },
 
     [TRAINER_KEEGAN] =
@@ -2469,7 +2469,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Keegan),
+        .party = TRAINER_PARTY(sParty_Keegan),
     },
 
     [TRAINER_BERNIE_1] =
@@ -2481,7 +2481,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Bernie1),
+        .party = TRAINER_PARTY(sParty_Bernie1),
     },
 
     [TRAINER_BERNIE_2] =
@@ -2493,7 +2493,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Bernie2),
+        .party = TRAINER_PARTY(sParty_Bernie2),
     },
 
     [TRAINER_BERNIE_3] =
@@ -2505,7 +2505,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Bernie3),
+        .party = TRAINER_PARTY(sParty_Bernie3),
     },
 
     [TRAINER_BERNIE_4] =
@@ -2517,7 +2517,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Bernie4),
+        .party = TRAINER_PARTY(sParty_Bernie4),
     },
 
     [TRAINER_BERNIE_5] =
@@ -2529,7 +2529,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Bernie5),
+        .party = TRAINER_PARTY(sParty_Bernie5),
     },
 
     [TRAINER_DREW] =
@@ -2541,7 +2541,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Drew),
+        .party = TRAINER_PARTY(sParty_Drew),
     },
 
     [TRAINER_BEAU] =
@@ -2553,7 +2553,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Beau),
+        .party = TRAINER_PARTY(sParty_Beau),
     },
 
     [TRAINER_LARRY] =
@@ -2565,7 +2565,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Larry),
+        .party = TRAINER_PARTY(sParty_Larry),
     },
 
     [TRAINER_SHANE] =
@@ -2577,7 +2577,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Shane),
+        .party = TRAINER_PARTY(sParty_Shane),
     },
 
     [TRAINER_JUSTIN] =
@@ -2589,7 +2589,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Justin),
+        .party = TRAINER_PARTY(sParty_Justin),
     },
 
     [TRAINER_ETHAN_1] =
@@ -2601,7 +2601,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Ethan1),
+        .party = TRAINER_PARTY(sParty_Ethan1),
     },
 
     [TRAINER_AUTUMN] =
@@ -2613,7 +2613,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Autumn),
+        .party = TRAINER_PARTY(sParty_Autumn),
     },
 
     [TRAINER_TRAVIS] =
@@ -2625,7 +2625,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Travis),
+        .party = TRAINER_PARTY(sParty_Travis),
     },
 
     [TRAINER_ETHAN_2] =
@@ -2637,7 +2637,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Ethan2),
+        .party = TRAINER_PARTY(sParty_Ethan2),
     },
 
     [TRAINER_ETHAN_3] =
@@ -2649,7 +2649,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Ethan3),
+        .party = TRAINER_PARTY(sParty_Ethan3),
     },
 
     [TRAINER_ETHAN_4] =
@@ -2661,7 +2661,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Ethan4),
+        .party = TRAINER_PARTY(sParty_Ethan4),
     },
 
     [TRAINER_ETHAN_5] =
@@ -2673,7 +2673,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Ethan5),
+        .party = TRAINER_PARTY(sParty_Ethan5),
     },
 
     [TRAINER_BRENT] =
@@ -2685,7 +2685,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Brent),
+        .party = TRAINER_PARTY(sParty_Brent),
     },
 
     [TRAINER_DONALD] =
@@ -2697,7 +2697,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Donald),
+        .party = TRAINER_PARTY(sParty_Donald),
     },
 
     [TRAINER_TAYLOR] =
@@ -2709,7 +2709,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Taylor),
+        .party = TRAINER_PARTY(sParty_Taylor),
     },
 
     [TRAINER_JEFFREY_1] =
@@ -2721,7 +2721,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Jeffrey1),
+        .party = TRAINER_PARTY(sParty_Jeffrey1),
     },
 
     [TRAINER_DEREK] =
@@ -2733,7 +2733,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Derek),
+        .party = TRAINER_PARTY(sParty_Derek),
     },
 
     [TRAINER_JEFFREY_2] =
@@ -2745,7 +2745,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Jeffrey2),
+        .party = TRAINER_PARTY(sParty_Jeffrey2),
     },
 
     [TRAINER_JEFFREY_3] =
@@ -2757,7 +2757,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Jeffrey3),
+        .party = TRAINER_PARTY(sParty_Jeffrey3),
     },
 
     [TRAINER_JEFFREY_4] =
@@ -2769,7 +2769,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Jeffrey4),
+        .party = TRAINER_PARTY(sParty_Jeffrey4),
     },
 
     [TRAINER_JEFFREY_5] =
@@ -2781,7 +2781,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Jeffrey5),
+        .party = TRAINER_PARTY(sParty_Jeffrey5),
     },
 
     [TRAINER_EDWARD] =
@@ -2793,7 +2793,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Edward),
+        .party = TRAINER_PARTY(sParty_Edward),
     },
 
     [TRAINER_PRESTON] =
@@ -2805,7 +2805,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Preston),
+        .party = TRAINER_PARTY(sParty_Preston),
     },
 
     [TRAINER_VIRGIL] =
@@ -2817,7 +2817,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Virgil),
+        .party = TRAINER_PARTY(sParty_Virgil),
     },
 
     [TRAINER_BLAKE] =
@@ -2829,7 +2829,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Blake),
+        .party = TRAINER_PARTY(sParty_Blake),
     },
 
     [TRAINER_WILLIAM] =
@@ -2841,7 +2841,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_William),
+        .party = TRAINER_PARTY(sParty_William),
     },
 
     [TRAINER_JOSHUA] =
@@ -2853,7 +2853,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Joshua),
+        .party = TRAINER_PARTY(sParty_Joshua),
     },
 
     [TRAINER_CAMERON_1] =
@@ -2865,7 +2865,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Cameron1),
+        .party = TRAINER_PARTY(sParty_Cameron1),
     },
 
     [TRAINER_CAMERON_2] =
@@ -2877,7 +2877,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Cameron2),
+        .party = TRAINER_PARTY(sParty_Cameron2),
     },
 
     [TRAINER_CAMERON_3] =
@@ -2889,7 +2889,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Cameron3),
+        .party = TRAINER_PARTY(sParty_Cameron3),
     },
 
     [TRAINER_CAMERON_4] =
@@ -2901,7 +2901,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Cameron4),
+        .party = TRAINER_PARTY(sParty_Cameron4),
     },
 
     [TRAINER_CAMERON_5] =
@@ -2913,7 +2913,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Cameron5),
+        .party = TRAINER_PARTY(sParty_Cameron5),
     },
 
     [TRAINER_JACLYN] =
@@ -2925,7 +2925,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Jaclyn),
+        .party = TRAINER_PARTY(sParty_Jaclyn),
     },
 
     [TRAINER_HANNAH] =
@@ -2937,7 +2937,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Hannah),
+        .party = TRAINER_PARTY(sParty_Hannah),
     },
 
     [TRAINER_SAMANTHA] =
@@ -2949,7 +2949,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Samantha),
+        .party = TRAINER_PARTY(sParty_Samantha),
     },
 
     [TRAINER_MAURA] =
@@ -2961,7 +2961,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Maura),
+        .party = TRAINER_PARTY(sParty_Maura),
     },
 
     [TRAINER_KAYLA] =
@@ -2973,7 +2973,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Kayla),
+        .party = TRAINER_PARTY(sParty_Kayla),
     },
 
     [TRAINER_ALEXIS] =
@@ -2985,7 +2985,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Alexis),
+        .party = TRAINER_PARTY(sParty_Alexis),
     },
 
     [TRAINER_JACKI_1] =
@@ -2997,7 +2997,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Jacki1),
+        .party = TRAINER_PARTY(sParty_Jacki1),
     },
 
     [TRAINER_JACKI_2] =
@@ -3009,7 +3009,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Jacki2),
+        .party = TRAINER_PARTY(sParty_Jacki2),
     },
 
     [TRAINER_JACKI_3] =
@@ -3021,7 +3021,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Jacki3),
+        .party = TRAINER_PARTY(sParty_Jacki3),
     },
 
     [TRAINER_JACKI_4] =
@@ -3033,7 +3033,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Jacki4),
+        .party = TRAINER_PARTY(sParty_Jacki4),
     },
 
     [TRAINER_JACKI_5] =
@@ -3045,7 +3045,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Jacki5),
+        .party = TRAINER_PARTY(sParty_Jacki5),
     },
 
     [TRAINER_WALTER_1] =
@@ -3057,7 +3057,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Walter1),
+        .party = TRAINER_PARTY(sParty_Walter1),
     },
 
     [TRAINER_MICAH] =
@@ -3069,7 +3069,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Micah),
+        .party = TRAINER_PARTY(sParty_Micah),
     },
 
     [TRAINER_THOMAS] =
@@ -3081,7 +3081,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Thomas),
+        .party = TRAINER_PARTY(sParty_Thomas),
     },
 
     [TRAINER_WALTER_2] =
@@ -3093,7 +3093,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Walter2),
+        .party = TRAINER_PARTY(sParty_Walter2),
     },
 
     [TRAINER_WALTER_3] =
@@ -3105,7 +3105,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Walter3),
+        .party = TRAINER_PARTY(sParty_Walter3),
     },
 
     [TRAINER_WALTER_4] =
@@ -3117,7 +3117,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Walter4),
+        .party = TRAINER_PARTY(sParty_Walter4),
     },
 
     [TRAINER_WALTER_5] =
@@ -3129,7 +3129,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Walter5),
+        .party = TRAINER_PARTY(sParty_Walter5),
     },
 
     [TRAINER_SIDNEY] =
@@ -3141,7 +3141,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY | AI_FLAG_SETUP_FIRST_TURN,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Sidney),
+        .party = TRAINER_PARTY(sParty_Sidney),
     },
 
     [TRAINER_PHOEBE] =
@@ -3153,7 +3153,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Phoebe),
+        .party = TRAINER_PARTY(sParty_Phoebe),
     },
 
     [TRAINER_GLACIA] =
@@ -3165,7 +3165,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Glacia),
+        .party = TRAINER_PARTY(sParty_Glacia),
     },
 
     [TRAINER_DRAKE] =
@@ -3177,7 +3177,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Drake),
+        .party = TRAINER_PARTY(sParty_Drake),
     },
 
     [TRAINER_ROXANNE_1] =
@@ -3189,7 +3189,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_POTION, ITEM_POTION, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Roxanne1),
+        .party = TRAINER_PARTY(sParty_Roxanne1),
     },
 
     [TRAINER_BRAWLY_1] =
@@ -3201,7 +3201,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Brawly1),
+        .party = TRAINER_PARTY(sParty_Brawly1),
     },
 
     [TRAINER_WATTSON_1] =
@@ -3213,7 +3213,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Wattson1),
+        .party = TRAINER_PARTY(sParty_Wattson1),
     },
 
     [TRAINER_FLANNERY_1] =
@@ -3225,7 +3225,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Flannery1),
+        .party = TRAINER_PARTY(sParty_Flannery1),
     },
 
     [TRAINER_NORMAN_1] =
@@ -3237,7 +3237,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Norman1),
+        .party = TRAINER_PARTY(sParty_Norman1),
     },
 
     [TRAINER_WINONA_1] =
@@ -3249,7 +3249,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY | AI_FLAG_RISKY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Winona1),
+        .party = TRAINER_PARTY(sParty_Winona1),
     },
 
     [TRAINER_TATE_AND_LIZA_1] =
@@ -3261,7 +3261,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_HYPER_POTION},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_TateAndLiza1),
+        .party = TRAINER_PARTY(sParty_TateAndLiza1),
     },
 
     [TRAINER_JUAN_1] =
@@ -3273,7 +3273,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Juan1),
+        .party = TRAINER_PARTY(sParty_Juan1),
     },
 
     [TRAINER_JERRY_1] =
@@ -3285,7 +3285,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Jerry1),
+        .party = TRAINER_PARTY(sParty_Jerry1),
     },
 
     [TRAINER_TED] =
@@ -3297,7 +3297,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Ted),
+        .party = TRAINER_PARTY(sParty_Ted),
     },
 
     [TRAINER_PAUL] =
@@ -3309,7 +3309,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Paul),
+        .party = TRAINER_PARTY(sParty_Paul),
     },
 
     [TRAINER_JERRY_2] =
@@ -3321,7 +3321,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Jerry2),
+        .party = TRAINER_PARTY(sParty_Jerry2),
     },
 
     [TRAINER_JERRY_3] =
@@ -3333,7 +3333,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Jerry3),
+        .party = TRAINER_PARTY(sParty_Jerry3),
     },
 
     [TRAINER_JERRY_4] =
@@ -3345,7 +3345,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Jerry4),
+        .party = TRAINER_PARTY(sParty_Jerry4),
     },
 
     [TRAINER_JERRY_5] =
@@ -3357,7 +3357,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Jerry5),
+        .party = TRAINER_PARTY(sParty_Jerry5),
     },
 
     [TRAINER_KAREN_1] =
@@ -3369,7 +3369,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Karen1),
+        .party = TRAINER_PARTY(sParty_Karen1),
     },
 
     [TRAINER_GEORGIA] =
@@ -3381,7 +3381,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Georgia),
+        .party = TRAINER_PARTY(sParty_Georgia),
     },
 
     [TRAINER_KAREN_2] =
@@ -3393,7 +3393,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Karen2),
+        .party = TRAINER_PARTY(sParty_Karen2),
     },
 
     [TRAINER_KAREN_3] =
@@ -3405,7 +3405,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Karen3),
+        .party = TRAINER_PARTY(sParty_Karen3),
     },
 
     [TRAINER_KAREN_4] =
@@ -3417,7 +3417,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Karen4),
+        .party = TRAINER_PARTY(sParty_Karen4),
     },
 
     [TRAINER_KAREN_5] =
@@ -3429,7 +3429,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Karen5),
+        .party = TRAINER_PARTY(sParty_Karen5),
     },
 
     [TRAINER_KATE_AND_JOY] =
@@ -3441,7 +3441,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_KateAndJoy),
+        .party = TRAINER_PARTY(sParty_KateAndJoy),
     },
 
     [TRAINER_ANNA_AND_MEG_1] =
@@ -3453,7 +3453,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_AnnaAndMeg1),
+        .party = TRAINER_PARTY(sParty_AnnaAndMeg1),
     },
 
     [TRAINER_ANNA_AND_MEG_2] =
@@ -3465,7 +3465,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_AnnaAndMeg2),
+        .party = TRAINER_PARTY(sParty_AnnaAndMeg2),
     },
 
     [TRAINER_ANNA_AND_MEG_3] =
@@ -3477,7 +3477,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_AnnaAndMeg3),
+        .party = TRAINER_PARTY(sParty_AnnaAndMeg3),
     },
 
     [TRAINER_ANNA_AND_MEG_4] =
@@ -3489,7 +3489,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_AnnaAndMeg4),
+        .party = TRAINER_PARTY(sParty_AnnaAndMeg4),
     },
 
     [TRAINER_ANNA_AND_MEG_5] =
@@ -3501,7 +3501,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_AnnaAndMeg5),
+        .party = TRAINER_PARTY(sParty_AnnaAndMeg5),
     },
 
     [TRAINER_VICTOR] =
@@ -3513,7 +3513,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Victor),
+        .party = TRAINER_PARTY(sParty_Victor),
     },
 
     [TRAINER_MIGUEL_1] =
@@ -3525,7 +3525,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Miguel1),
+        .party = TRAINER_PARTY(sParty_Miguel1),
     },
 
     [TRAINER_COLTON] =
@@ -3537,7 +3537,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Colton),
+        .party = TRAINER_PARTY(sParty_Colton),
     },
 
     [TRAINER_MIGUEL_2] =
@@ -3549,7 +3549,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Miguel2),
+        .party = TRAINER_PARTY(sParty_Miguel2),
     },
 
     [TRAINER_MIGUEL_3] =
@@ -3561,7 +3561,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Miguel3),
+        .party = TRAINER_PARTY(sParty_Miguel3),
     },
 
     [TRAINER_MIGUEL_4] =
@@ -3573,7 +3573,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Miguel4),
+        .party = TRAINER_PARTY(sParty_Miguel4),
     },
 
     [TRAINER_MIGUEL_5] =
@@ -3585,7 +3585,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Miguel5),
+        .party = TRAINER_PARTY(sParty_Miguel5),
     },
 
     [TRAINER_VICTORIA] =
@@ -3597,7 +3597,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Victoria),
+        .party = TRAINER_PARTY(sParty_Victoria),
     },
 
     [TRAINER_VANESSA] =
@@ -3609,7 +3609,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Vanessa),
+        .party = TRAINER_PARTY(sParty_Vanessa),
     },
 
     [TRAINER_BETHANY] =
@@ -3621,7 +3621,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Bethany),
+        .party = TRAINER_PARTY(sParty_Bethany),
     },
 
     [TRAINER_ISABEL_1] =
@@ -3633,7 +3633,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Isabel1),
+        .party = TRAINER_PARTY(sParty_Isabel1),
     },
 
     [TRAINER_ISABEL_2] =
@@ -3645,7 +3645,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Isabel2),
+        .party = TRAINER_PARTY(sParty_Isabel2),
     },
 
     [TRAINER_ISABEL_3] =
@@ -3657,7 +3657,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Isabel3),
+        .party = TRAINER_PARTY(sParty_Isabel3),
     },
 
     [TRAINER_ISABEL_4] =
@@ -3669,7 +3669,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Isabel4),
+        .party = TRAINER_PARTY(sParty_Isabel4),
     },
 
     [TRAINER_ISABEL_5] =
@@ -3681,7 +3681,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Isabel5),
+        .party = TRAINER_PARTY(sParty_Isabel5),
     },
 
     [TRAINER_TIMOTHY_1] =
@@ -3693,7 +3693,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Timothy1),
+        .party = TRAINER_PARTY(sParty_Timothy1),
     },
 
     [TRAINER_TIMOTHY_2] =
@@ -3705,7 +3705,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Timothy2),
+        .party = TRAINER_PARTY(sParty_Timothy2),
     },
 
     [TRAINER_TIMOTHY_3] =
@@ -3717,7 +3717,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Timothy3),
+        .party = TRAINER_PARTY(sParty_Timothy3),
     },
 
     [TRAINER_TIMOTHY_4] =
@@ -3729,7 +3729,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Timothy4),
+        .party = TRAINER_PARTY(sParty_Timothy4),
     },
 
     [TRAINER_TIMOTHY_5] =
@@ -3741,7 +3741,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Timothy5),
+        .party = TRAINER_PARTY(sParty_Timothy5),
     },
 
     [TRAINER_VICKY] =
@@ -3753,7 +3753,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Vicky),
+        .party = TRAINER_PARTY(sParty_Vicky),
     },
 
     [TRAINER_SHELBY_1] =
@@ -3765,7 +3765,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Shelby1),
+        .party = TRAINER_PARTY(sParty_Shelby1),
     },
 
     [TRAINER_SHELBY_2] =
@@ -3777,7 +3777,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Shelby2),
+        .party = TRAINER_PARTY(sParty_Shelby2),
     },
 
     [TRAINER_SHELBY_3] =
@@ -3789,7 +3789,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Shelby3),
+        .party = TRAINER_PARTY(sParty_Shelby3),
     },
 
     [TRAINER_SHELBY_4] =
@@ -3801,7 +3801,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Shelby4),
+        .party = TRAINER_PARTY(sParty_Shelby4),
     },
 
     [TRAINER_SHELBY_5] =
@@ -3813,7 +3813,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Shelby5),
+        .party = TRAINER_PARTY(sParty_Shelby5),
     },
 
     [TRAINER_CALVIN_1] =
@@ -3825,7 +3825,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Calvin1),
+        .party = TRAINER_PARTY(sParty_Calvin1),
     },
 
     [TRAINER_BILLY] =
@@ -3837,7 +3837,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Billy),
+        .party = TRAINER_PARTY(sParty_Billy),
     },
 
     [TRAINER_JOSH] =
@@ -3849,7 +3849,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Josh),
+        .party = TRAINER_PARTY(sParty_Josh),
     },
 
     [TRAINER_TOMMY] =
@@ -3861,7 +3861,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Tommy),
+        .party = TRAINER_PARTY(sParty_Tommy),
     },
 
     [TRAINER_JOEY] =
@@ -3873,7 +3873,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Joey),
+        .party = TRAINER_PARTY(sParty_Joey),
     },
 
     [TRAINER_BEN] =
@@ -3885,7 +3885,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Ben),
+        .party = TRAINER_PARTY(sParty_Ben),
     },
 
     [TRAINER_QUINCY] =
@@ -3897,7 +3897,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Quincy),
+        .party = TRAINER_PARTY(sParty_Quincy),
     },
 
     [TRAINER_KATELYNN] =
@@ -3909,7 +3909,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Katelynn),
+        .party = TRAINER_PARTY(sParty_Katelynn),
     },
 
     [TRAINER_JAYLEN] =
@@ -3921,7 +3921,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Jaylen),
+        .party = TRAINER_PARTY(sParty_Jaylen),
     },
 
     [TRAINER_DILLON] =
@@ -3933,7 +3933,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Dillon),
+        .party = TRAINER_PARTY(sParty_Dillon),
     },
 
     [TRAINER_CALVIN_2] =
@@ -3945,7 +3945,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Calvin2),
+        .party = TRAINER_PARTY(sParty_Calvin2),
     },
 
     [TRAINER_CALVIN_3] =
@@ -3957,7 +3957,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Calvin3),
+        .party = TRAINER_PARTY(sParty_Calvin3),
     },
 
     [TRAINER_CALVIN_4] =
@@ -3969,7 +3969,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Calvin4),
+        .party = TRAINER_PARTY(sParty_Calvin4),
     },
 
     [TRAINER_CALVIN_5] =
@@ -3981,7 +3981,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Calvin5),
+        .party = TRAINER_PARTY(sParty_Calvin5),
     },
 
     [TRAINER_EDDIE] =
@@ -3993,7 +3993,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Eddie),
+        .party = TRAINER_PARTY(sParty_Eddie),
     },
 
     [TRAINER_ALLEN] =
@@ -4005,7 +4005,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Allen),
+        .party = TRAINER_PARTY(sParty_Allen),
     },
 
     [TRAINER_TIMMY] =
@@ -4017,7 +4017,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Timmy),
+        .party = TRAINER_PARTY(sParty_Timmy),
     },
 
     [TRAINER_WALLACE] =
@@ -4029,7 +4029,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Wallace),
+        .party = TRAINER_PARTY(sParty_Wallace),
     },
 
     [TRAINER_ANDREW] =
@@ -4041,7 +4041,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Andrew),
+        .party = TRAINER_PARTY(sParty_Andrew),
     },
 
     [TRAINER_IVAN] =
@@ -4053,7 +4053,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Ivan),
+        .party = TRAINER_PARTY(sParty_Ivan),
     },
 
     [TRAINER_CLAUDE] =
@@ -4065,7 +4065,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Claude),
+        .party = TRAINER_PARTY(sParty_Claude),
     },
 
     [TRAINER_ELLIOT_1] =
@@ -4077,7 +4077,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Elliot1),
+        .party = TRAINER_PARTY(sParty_Elliot1),
     },
 
     [TRAINER_NED] =
@@ -4089,7 +4089,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Ned),
+        .party = TRAINER_PARTY(sParty_Ned),
     },
 
     [TRAINER_DALE] =
@@ -4101,7 +4101,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Dale),
+        .party = TRAINER_PARTY(sParty_Dale),
     },
 
     [TRAINER_NOLAN] =
@@ -4113,7 +4113,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Nolan),
+        .party = TRAINER_PARTY(sParty_Nolan),
     },
 
     [TRAINER_BARNY] =
@@ -4125,7 +4125,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Barny),
+        .party = TRAINER_PARTY(sParty_Barny),
     },
 
     [TRAINER_WADE] =
@@ -4137,7 +4137,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Wade),
+        .party = TRAINER_PARTY(sParty_Wade),
     },
 
     [TRAINER_CARTER] =
@@ -4149,7 +4149,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Carter),
+        .party = TRAINER_PARTY(sParty_Carter),
     },
 
     [TRAINER_ELLIOT_2] =
@@ -4161,7 +4161,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Elliot2),
+        .party = TRAINER_PARTY(sParty_Elliot2),
     },
 
     [TRAINER_ELLIOT_3] =
@@ -4173,7 +4173,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Elliot3),
+        .party = TRAINER_PARTY(sParty_Elliot3),
     },
 
     [TRAINER_ELLIOT_4] =
@@ -4185,7 +4185,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Elliot4),
+        .party = TRAINER_PARTY(sParty_Elliot4),
     },
 
     [TRAINER_ELLIOT_5] =
@@ -4197,7 +4197,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Elliot5),
+        .party = TRAINER_PARTY(sParty_Elliot5),
     },
 
     [TRAINER_RONALD] =
@@ -4209,7 +4209,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Ronald),
+        .party = TRAINER_PARTY(sParty_Ronald),
     },
 
     [TRAINER_JACOB] =
@@ -4221,7 +4221,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Jacob),
+        .party = TRAINER_PARTY(sParty_Jacob),
     },
 
     [TRAINER_ANTHONY] =
@@ -4233,7 +4233,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Anthony),
+        .party = TRAINER_PARTY(sParty_Anthony),
     },
 
     [TRAINER_BENJAMIN_1] =
@@ -4245,7 +4245,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Benjamin1),
+        .party = TRAINER_PARTY(sParty_Benjamin1),
     },
 
     [TRAINER_BENJAMIN_2] =
@@ -4257,7 +4257,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Benjamin2),
+        .party = TRAINER_PARTY(sParty_Benjamin2),
     },
 
     [TRAINER_BENJAMIN_3] =
@@ -4269,7 +4269,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Benjamin3),
+        .party = TRAINER_PARTY(sParty_Benjamin3),
     },
 
     [TRAINER_BENJAMIN_4] =
@@ -4281,7 +4281,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Benjamin4),
+        .party = TRAINER_PARTY(sParty_Benjamin4),
     },
 
     [TRAINER_BENJAMIN_5] =
@@ -4293,7 +4293,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Benjamin5),
+        .party = TRAINER_PARTY(sParty_Benjamin5),
     },
 
     [TRAINER_ABIGAIL_1] =
@@ -4305,7 +4305,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Abigail1),
+        .party = TRAINER_PARTY(sParty_Abigail1),
     },
 
     [TRAINER_JASMINE] =
@@ -4317,7 +4317,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Jasmine),
+        .party = TRAINER_PARTY(sParty_Jasmine),
     },
 
     [TRAINER_ABIGAIL_2] =
@@ -4329,7 +4329,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Abigail2),
+        .party = TRAINER_PARTY(sParty_Abigail2),
     },
 
     [TRAINER_ABIGAIL_3] =
@@ -4341,7 +4341,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Abigail3),
+        .party = TRAINER_PARTY(sParty_Abigail3),
     },
 
     [TRAINER_ABIGAIL_4] =
@@ -4353,7 +4353,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Abigail4),
+        .party = TRAINER_PARTY(sParty_Abigail4),
     },
 
     [TRAINER_ABIGAIL_5] =
@@ -4365,7 +4365,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Abigail5),
+        .party = TRAINER_PARTY(sParty_Abigail5),
     },
 
     [TRAINER_DYLAN_1] =
@@ -4377,7 +4377,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Dylan1),
+        .party = TRAINER_PARTY(sParty_Dylan1),
     },
 
     [TRAINER_DYLAN_2] =
@@ -4389,7 +4389,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Dylan2),
+        .party = TRAINER_PARTY(sParty_Dylan2),
     },
 
     [TRAINER_DYLAN_3] =
@@ -4401,7 +4401,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Dylan3),
+        .party = TRAINER_PARTY(sParty_Dylan3),
     },
 
     [TRAINER_DYLAN_4] =
@@ -4413,7 +4413,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Dylan4),
+        .party = TRAINER_PARTY(sParty_Dylan4),
     },
 
     [TRAINER_DYLAN_5] =
@@ -4425,7 +4425,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Dylan5),
+        .party = TRAINER_PARTY(sParty_Dylan5),
     },
 
     [TRAINER_MARIA_1] =
@@ -4437,7 +4437,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Maria1),
+        .party = TRAINER_PARTY(sParty_Maria1),
     },
 
     [TRAINER_MARIA_2] =
@@ -4449,7 +4449,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Maria2),
+        .party = TRAINER_PARTY(sParty_Maria2),
     },
 
     [TRAINER_MARIA_3] =
@@ -4461,7 +4461,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Maria3),
+        .party = TRAINER_PARTY(sParty_Maria3),
     },
 
     [TRAINER_MARIA_4] =
@@ -4473,7 +4473,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Maria4),
+        .party = TRAINER_PARTY(sParty_Maria4),
     },
 
     [TRAINER_MARIA_5] =
@@ -4485,7 +4485,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Maria5),
+        .party = TRAINER_PARTY(sParty_Maria5),
     },
 
     [TRAINER_CAMDEN] =
@@ -4497,7 +4497,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Camden),
+        .party = TRAINER_PARTY(sParty_Camden),
     },
 
     [TRAINER_DEMETRIUS] =
@@ -4509,7 +4509,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Demetrius),
+        .party = TRAINER_PARTY(sParty_Demetrius),
     },
 
     [TRAINER_ISAIAH_1] =
@@ -4521,7 +4521,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Isaiah1),
+        .party = TRAINER_PARTY(sParty_Isaiah1),
     },
 
     [TRAINER_PABLO_1] =
@@ -4533,7 +4533,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Pablo1),
+        .party = TRAINER_PARTY(sParty_Pablo1),
     },
 
     [TRAINER_CHASE] =
@@ -4545,7 +4545,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Chase),
+        .party = TRAINER_PARTY(sParty_Chase),
     },
 
     [TRAINER_ISAIAH_2] =
@@ -4557,7 +4557,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Isaiah2),
+        .party = TRAINER_PARTY(sParty_Isaiah2),
     },
 
     [TRAINER_ISAIAH_3] =
@@ -4569,7 +4569,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Isaiah3),
+        .party = TRAINER_PARTY(sParty_Isaiah3),
     },
 
     [TRAINER_ISAIAH_4] =
@@ -4581,7 +4581,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Isaiah4),
+        .party = TRAINER_PARTY(sParty_Isaiah4),
     },
 
     [TRAINER_ISAIAH_5] =
@@ -4593,7 +4593,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Isaiah5),
+        .party = TRAINER_PARTY(sParty_Isaiah5),
     },
 
     [TRAINER_ISOBEL] =
@@ -4605,7 +4605,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Isobel),
+        .party = TRAINER_PARTY(sParty_Isobel),
     },
 
     [TRAINER_DONNY] =
@@ -4617,7 +4617,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Donny),
+        .party = TRAINER_PARTY(sParty_Donny),
     },
 
     [TRAINER_TALIA] =
@@ -4629,7 +4629,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Talia),
+        .party = TRAINER_PARTY(sParty_Talia),
     },
 
     [TRAINER_KATELYN_1] =
@@ -4641,7 +4641,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Katelyn1),
+        .party = TRAINER_PARTY(sParty_Katelyn1),
     },
 
     [TRAINER_ALLISON] =
@@ -4653,7 +4653,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Allison),
+        .party = TRAINER_PARTY(sParty_Allison),
     },
 
     [TRAINER_KATELYN_2] =
@@ -4665,7 +4665,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Katelyn2),
+        .party = TRAINER_PARTY(sParty_Katelyn2),
     },
 
     [TRAINER_KATELYN_3] =
@@ -4677,7 +4677,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Katelyn3),
+        .party = TRAINER_PARTY(sParty_Katelyn3),
     },
 
     [TRAINER_KATELYN_4] =
@@ -4689,7 +4689,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Katelyn4),
+        .party = TRAINER_PARTY(sParty_Katelyn4),
     },
 
     [TRAINER_KATELYN_5] =
@@ -4701,7 +4701,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Katelyn5),
+        .party = TRAINER_PARTY(sParty_Katelyn5),
     },
 
     [TRAINER_NICOLAS_1] =
@@ -4713,7 +4713,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Nicolas1),
+        .party = TRAINER_PARTY(sParty_Nicolas1),
     },
 
     [TRAINER_NICOLAS_2] =
@@ -4725,7 +4725,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Nicolas2),
+        .party = TRAINER_PARTY(sParty_Nicolas2),
     },
 
     [TRAINER_NICOLAS_3] =
@@ -4737,7 +4737,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Nicolas3),
+        .party = TRAINER_PARTY(sParty_Nicolas3),
     },
 
     [TRAINER_NICOLAS_4] =
@@ -4749,7 +4749,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Nicolas4),
+        .party = TRAINER_PARTY(sParty_Nicolas4),
     },
 
     [TRAINER_NICOLAS_5] =
@@ -4761,7 +4761,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Nicolas5),
+        .party = TRAINER_PARTY(sParty_Nicolas5),
     },
 
     [TRAINER_AARON] =
@@ -4773,7 +4773,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Aaron),
+        .party = TRAINER_PARTY(sParty_Aaron),
     },
 
     [TRAINER_PERRY] =
@@ -4785,7 +4785,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Perry),
+        .party = TRAINER_PARTY(sParty_Perry),
     },
 
     [TRAINER_HUGH] =
@@ -4797,7 +4797,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Hugh),
+        .party = TRAINER_PARTY(sParty_Hugh),
     },
 
     [TRAINER_PHIL] =
@@ -4809,7 +4809,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Phil),
+        .party = TRAINER_PARTY(sParty_Phil),
     },
 
     [TRAINER_JARED] =
@@ -4821,7 +4821,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Jared),
+        .party = TRAINER_PARTY(sParty_Jared),
     },
 
     [TRAINER_HUMBERTO] =
@@ -4833,7 +4833,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Humberto),
+        .party = TRAINER_PARTY(sParty_Humberto),
     },
 
     [TRAINER_PRESLEY] =
@@ -4845,7 +4845,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Presley),
+        .party = TRAINER_PARTY(sParty_Presley),
     },
 
     [TRAINER_EDWARDO] =
@@ -4857,7 +4857,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Edwardo),
+        .party = TRAINER_PARTY(sParty_Edwardo),
     },
 
     [TRAINER_COLIN] =
@@ -4869,7 +4869,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Colin),
+        .party = TRAINER_PARTY(sParty_Colin),
     },
 
     [TRAINER_ROBERT_1] =
@@ -4881,7 +4881,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Robert1),
+        .party = TRAINER_PARTY(sParty_Robert1),
     },
 
     [TRAINER_BENNY] =
@@ -4893,7 +4893,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Benny),
+        .party = TRAINER_PARTY(sParty_Benny),
     },
 
     [TRAINER_CHESTER] =
@@ -4905,7 +4905,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Chester),
+        .party = TRAINER_PARTY(sParty_Chester),
     },
 
     [TRAINER_ROBERT_2] =
@@ -4917,7 +4917,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Robert2),
+        .party = TRAINER_PARTY(sParty_Robert2),
     },
 
     [TRAINER_ROBERT_3] =
@@ -4929,7 +4929,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Robert3),
+        .party = TRAINER_PARTY(sParty_Robert3),
     },
 
     [TRAINER_ROBERT_4] =
@@ -4941,7 +4941,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Robert4),
+        .party = TRAINER_PARTY(sParty_Robert4),
     },
 
     [TRAINER_ROBERT_5] =
@@ -4953,7 +4953,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Robert5),
+        .party = TRAINER_PARTY(sParty_Robert5),
     },
 
     [TRAINER_ALEX] =
@@ -4965,7 +4965,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Alex),
+        .party = TRAINER_PARTY(sParty_Alex),
     },
 
     [TRAINER_BECK] =
@@ -4977,7 +4977,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Beck),
+        .party = TRAINER_PARTY(sParty_Beck),
     },
 
     [TRAINER_YASU] =
@@ -4989,7 +4989,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Yasu),
+        .party = TRAINER_PARTY(sParty_Yasu),
     },
 
     [TRAINER_TAKASHI] =
@@ -5001,7 +5001,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Takashi),
+        .party = TRAINER_PARTY(sParty_Takashi),
     },
 
     [TRAINER_DIANNE] =
@@ -5013,7 +5013,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = 0,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Dianne),
+        .party = TRAINER_PARTY(sParty_Dianne),
     },
 
     [TRAINER_JANI] =
@@ -5025,7 +5025,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = 0,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Jani),
+        .party = TRAINER_PARTY(sParty_Jani),
     },
 
     [TRAINER_LAO_1] =
@@ -5037,7 +5037,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = 0,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Lao1),
+        .party = TRAINER_PARTY(sParty_Lao1),
     },
 
     [TRAINER_LUNG] =
@@ -5049,7 +5049,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = 0,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Lung),
+        .party = TRAINER_PARTY(sParty_Lung),
     },
 
     [TRAINER_LAO_2] =
@@ -5061,7 +5061,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = 0,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Lao2),
+        .party = TRAINER_PARTY(sParty_Lao2),
     },
 
     [TRAINER_LAO_3] =
@@ -5073,7 +5073,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = 0,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Lao3),
+        .party = TRAINER_PARTY(sParty_Lao3),
     },
 
     [TRAINER_LAO_4] =
@@ -5085,7 +5085,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = 0,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Lao4),
+        .party = TRAINER_PARTY(sParty_Lao4),
     },
 
     [TRAINER_LAO_5] =
@@ -5097,7 +5097,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = 0,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Lao5),
+        .party = TRAINER_PARTY(sParty_Lao5),
     },
 
     [TRAINER_JOCELYN] =
@@ -5109,7 +5109,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Jocelyn),
+        .party = TRAINER_PARTY(sParty_Jocelyn),
     },
 
     [TRAINER_LAURA] =
@@ -5121,7 +5121,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Laura),
+        .party = TRAINER_PARTY(sParty_Laura),
     },
 
     [TRAINER_CYNDY_1] =
@@ -5133,7 +5133,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Cyndy1),
+        .party = TRAINER_PARTY(sParty_Cyndy1),
     },
 
     [TRAINER_CORA] =
@@ -5145,7 +5145,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Cora),
+        .party = TRAINER_PARTY(sParty_Cora),
     },
 
     [TRAINER_PAULA] =
@@ -5157,7 +5157,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Paula),
+        .party = TRAINER_PARTY(sParty_Paula),
     },
 
     [TRAINER_CYNDY_2] =
@@ -5169,7 +5169,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Cyndy2),
+        .party = TRAINER_PARTY(sParty_Cyndy2),
     },
 
     [TRAINER_CYNDY_3] =
@@ -5181,7 +5181,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Cyndy3),
+        .party = TRAINER_PARTY(sParty_Cyndy3),
     },
 
     [TRAINER_CYNDY_4] =
@@ -5193,7 +5193,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Cyndy4),
+        .party = TRAINER_PARTY(sParty_Cyndy4),
     },
 
     [TRAINER_CYNDY_5] =
@@ -5205,7 +5205,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Cyndy5),
+        .party = TRAINER_PARTY(sParty_Cyndy5),
     },
 
     [TRAINER_MADELINE_1] =
@@ -5217,7 +5217,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Madeline1),
+        .party = TRAINER_PARTY(sParty_Madeline1),
     },
 
     [TRAINER_CLARISSA] =
@@ -5229,7 +5229,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Clarissa),
+        .party = TRAINER_PARTY(sParty_Clarissa),
     },
 
     [TRAINER_ANGELICA] =
@@ -5241,7 +5241,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Angelica),
+        .party = TRAINER_PARTY(sParty_Angelica),
     },
 
     [TRAINER_MADELINE_2] =
@@ -5253,7 +5253,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Madeline2),
+        .party = TRAINER_PARTY(sParty_Madeline2),
     },
 
     [TRAINER_MADELINE_3] =
@@ -5265,7 +5265,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Madeline3),
+        .party = TRAINER_PARTY(sParty_Madeline3),
     },
 
     [TRAINER_MADELINE_4] =
@@ -5277,7 +5277,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Madeline4),
+        .party = TRAINER_PARTY(sParty_Madeline4),
     },
 
     [TRAINER_MADELINE_5] =
@@ -5289,7 +5289,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Madeline5),
+        .party = TRAINER_PARTY(sParty_Madeline5),
     },
 
     [TRAINER_BEVERLY] =
@@ -5301,7 +5301,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Beverly),
+        .party = TRAINER_PARTY(sParty_Beverly),
     },
 
     [TRAINER_IMANI] =
@@ -5313,7 +5313,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Imani),
+        .party = TRAINER_PARTY(sParty_Imani),
     },
 
     [TRAINER_KYLA] =
@@ -5325,7 +5325,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Kyla),
+        .party = TRAINER_PARTY(sParty_Kyla),
     },
 
     [TRAINER_DENISE] =
@@ -5337,7 +5337,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Denise),
+        .party = TRAINER_PARTY(sParty_Denise),
     },
 
     [TRAINER_BETH] =
@@ -5349,7 +5349,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Beth),
+        .party = TRAINER_PARTY(sParty_Beth),
     },
 
     [TRAINER_TARA] =
@@ -5361,7 +5361,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Tara),
+        .party = TRAINER_PARTY(sParty_Tara),
     },
 
     [TRAINER_MISSY] =
@@ -5373,7 +5373,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Missy),
+        .party = TRAINER_PARTY(sParty_Missy),
     },
 
     [TRAINER_ALICE] =
@@ -5385,7 +5385,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Alice),
+        .party = TRAINER_PARTY(sParty_Alice),
     },
 
     [TRAINER_JENNY_1] =
@@ -5397,7 +5397,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Jenny1),
+        .party = TRAINER_PARTY(sParty_Jenny1),
     },
 
     [TRAINER_GRACE] =
@@ -5409,7 +5409,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Grace),
+        .party = TRAINER_PARTY(sParty_Grace),
     },
 
     [TRAINER_TANYA] =
@@ -5421,7 +5421,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Tanya),
+        .party = TRAINER_PARTY(sParty_Tanya),
     },
 
     [TRAINER_SHARON] =
@@ -5433,7 +5433,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Sharon),
+        .party = TRAINER_PARTY(sParty_Sharon),
     },
 
     [TRAINER_NIKKI] =
@@ -5445,7 +5445,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Nikki),
+        .party = TRAINER_PARTY(sParty_Nikki),
     },
 
     [TRAINER_BRENDA] =
@@ -5457,7 +5457,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Brenda),
+        .party = TRAINER_PARTY(sParty_Brenda),
     },
 
     [TRAINER_KATIE] =
@@ -5469,7 +5469,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Katie),
+        .party = TRAINER_PARTY(sParty_Katie),
     },
 
     [TRAINER_SUSIE] =
@@ -5481,7 +5481,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Susie),
+        .party = TRAINER_PARTY(sParty_Susie),
     },
 
     [TRAINER_KARA] =
@@ -5493,7 +5493,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Kara),
+        .party = TRAINER_PARTY(sParty_Kara),
     },
 
     [TRAINER_DANA] =
@@ -5505,7 +5505,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Dana),
+        .party = TRAINER_PARTY(sParty_Dana),
     },
 
     [TRAINER_SIENNA] =
@@ -5517,7 +5517,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Sienna),
+        .party = TRAINER_PARTY(sParty_Sienna),
     },
 
     [TRAINER_DEBRA] =
@@ -5529,7 +5529,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Debra),
+        .party = TRAINER_PARTY(sParty_Debra),
     },
 
     [TRAINER_LINDA] =
@@ -5541,7 +5541,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Linda),
+        .party = TRAINER_PARTY(sParty_Linda),
     },
 
     [TRAINER_KAYLEE] =
@@ -5553,7 +5553,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Kaylee),
+        .party = TRAINER_PARTY(sParty_Kaylee),
     },
 
     [TRAINER_LAUREL] =
@@ -5565,7 +5565,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Laurel),
+        .party = TRAINER_PARTY(sParty_Laurel),
     },
 
     [TRAINER_CARLEE] =
@@ -5577,7 +5577,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Carlee),
+        .party = TRAINER_PARTY(sParty_Carlee),
     },
 
     [TRAINER_JENNY_2] =
@@ -5589,7 +5589,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Jenny2),
+        .party = TRAINER_PARTY(sParty_Jenny2),
     },
 
     [TRAINER_JENNY_3] =
@@ -5601,7 +5601,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Jenny3),
+        .party = TRAINER_PARTY(sParty_Jenny3),
     },
 
     [TRAINER_JENNY_4] =
@@ -5613,7 +5613,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Jenny4),
+        .party = TRAINER_PARTY(sParty_Jenny4),
     },
 
     [TRAINER_JENNY_5] =
@@ -5625,7 +5625,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Jenny5),
+        .party = TRAINER_PARTY(sParty_Jenny5),
     },
 
     [TRAINER_HEIDI] =
@@ -5637,7 +5637,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Heidi),
+        .party = TRAINER_PARTY(sParty_Heidi),
     },
 
     [TRAINER_BECKY] =
@@ -5649,7 +5649,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Becky),
+        .party = TRAINER_PARTY(sParty_Becky),
     },
 
     [TRAINER_CAROL] =
@@ -5661,7 +5661,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Carol),
+        .party = TRAINER_PARTY(sParty_Carol),
     },
 
     [TRAINER_NANCY] =
@@ -5673,7 +5673,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Nancy),
+        .party = TRAINER_PARTY(sParty_Nancy),
     },
 
     [TRAINER_MARTHA] =
@@ -5685,7 +5685,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Martha),
+        .party = TRAINER_PARTY(sParty_Martha),
     },
 
     [TRAINER_DIANA_1] =
@@ -5697,7 +5697,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Diana1),
+        .party = TRAINER_PARTY(sParty_Diana1),
     },
 
     [TRAINER_CEDRIC] =
@@ -5709,7 +5709,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Cedric),
+        .party = TRAINER_PARTY(sParty_Cedric),
     },
 
     [TRAINER_IRENE] =
@@ -5721,7 +5721,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Irene),
+        .party = TRAINER_PARTY(sParty_Irene),
     },
 
     [TRAINER_DIANA_2] =
@@ -5733,7 +5733,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Diana2),
+        .party = TRAINER_PARTY(sParty_Diana2),
     },
 
     [TRAINER_DIANA_3] =
@@ -5745,7 +5745,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Diana3),
+        .party = TRAINER_PARTY(sParty_Diana3),
     },
 
     [TRAINER_DIANA_4] =
@@ -5757,7 +5757,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Diana4),
+        .party = TRAINER_PARTY(sParty_Diana4),
     },
 
     [TRAINER_DIANA_5] =
@@ -5769,7 +5769,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Diana5),
+        .party = TRAINER_PARTY(sParty_Diana5),
     },
 
     [TRAINER_AMY_AND_LIV_1] =
@@ -5781,7 +5781,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_AmyAndLiv1),
+        .party = TRAINER_PARTY(sParty_AmyAndLiv1),
     },
 
     [TRAINER_AMY_AND_LIV_2] =
@@ -5793,7 +5793,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_AmyAndLiv2),
+        .party = TRAINER_PARTY(sParty_AmyAndLiv2),
     },
 
     [TRAINER_GINA_AND_MIA_1] =
@@ -5805,7 +5805,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_GinaAndMia1),
+        .party = TRAINER_PARTY(sParty_GinaAndMia1),
     },
 
     [TRAINER_MIU_AND_YUKI] =
@@ -5817,7 +5817,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_MiuAndYuki),
+        .party = TRAINER_PARTY(sParty_MiuAndYuki),
     },
 
     [TRAINER_AMY_AND_LIV_3] =
@@ -5829,7 +5829,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_AmyAndLiv3),
+        .party = TRAINER_PARTY(sParty_AmyAndLiv3),
     },
 
     [TRAINER_GINA_AND_MIA_2] =
@@ -5841,7 +5841,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_GinaAndMia2),
+        .party = TRAINER_PARTY(sParty_GinaAndMia2),
     },
 
     [TRAINER_AMY_AND_LIV_4] =
@@ -5853,7 +5853,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_AmyAndLiv4),
+        .party = TRAINER_PARTY(sParty_AmyAndLiv4),
     },
 
     [TRAINER_AMY_AND_LIV_5] =
@@ -5865,7 +5865,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_AmyAndLiv5),
+        .party = TRAINER_PARTY(sParty_AmyAndLiv5),
     },
 
     [TRAINER_AMY_AND_LIV_6] =
@@ -5877,7 +5877,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_AmyAndLiv6),
+        .party = TRAINER_PARTY(sParty_AmyAndLiv6),
     },
 
     [TRAINER_HUEY] =
@@ -5889,7 +5889,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Huey),
+        .party = TRAINER_PARTY(sParty_Huey),
     },
 
     [TRAINER_EDMOND] =
@@ -5901,7 +5901,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Edmond),
+        .party = TRAINER_PARTY(sParty_Edmond),
     },
 
     [TRAINER_ERNEST_1] =
@@ -5913,7 +5913,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Ernest1),
+        .party = TRAINER_PARTY(sParty_Ernest1),
     },
 
     [TRAINER_DWAYNE] =
@@ -5925,7 +5925,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Dwayne),
+        .party = TRAINER_PARTY(sParty_Dwayne),
     },
 
     [TRAINER_PHILLIP] =
@@ -5937,7 +5937,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Phillip),
+        .party = TRAINER_PARTY(sParty_Phillip),
     },
 
     [TRAINER_LEONARD] =
@@ -5949,7 +5949,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Leonard),
+        .party = TRAINER_PARTY(sParty_Leonard),
     },
 
     [TRAINER_DUNCAN] =
@@ -5961,7 +5961,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Duncan),
+        .party = TRAINER_PARTY(sParty_Duncan),
     },
 
     [TRAINER_ERNEST_2] =
@@ -5973,7 +5973,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Ernest2),
+        .party = TRAINER_PARTY(sParty_Ernest2),
     },
 
     [TRAINER_ERNEST_3] =
@@ -5985,7 +5985,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Ernest3),
+        .party = TRAINER_PARTY(sParty_Ernest3),
     },
 
     [TRAINER_ERNEST_4] =
@@ -5997,7 +5997,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Ernest4),
+        .party = TRAINER_PARTY(sParty_Ernest4),
     },
 
     [TRAINER_ERNEST_5] =
@@ -6009,7 +6009,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Ernest5),
+        .party = TRAINER_PARTY(sParty_Ernest5),
     },
 
     [TRAINER_ELI] =
@@ -6021,7 +6021,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Eli),
+        .party = TRAINER_PARTY(sParty_Eli),
     },
 
     [TRAINER_ANNIKA] =
@@ -6033,7 +6033,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Annika),
+        .party = TRAINER_PARTY(sParty_Annika),
     },
 
     [TRAINER_JAZMYN] =
@@ -6045,7 +6045,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Jazmyn),
+        .party = TRAINER_PARTY(sParty_Jazmyn),
     },
 
     [TRAINER_JONAS] =
@@ -6057,7 +6057,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Jonas),
+        .party = TRAINER_PARTY(sParty_Jonas),
     },
 
     [TRAINER_KAYLEY] =
@@ -6069,7 +6069,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Kayley),
+        .party = TRAINER_PARTY(sParty_Kayley),
     },
 
     [TRAINER_AURON] =
@@ -6081,7 +6081,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Auron),
+        .party = TRAINER_PARTY(sParty_Auron),
     },
 
     [TRAINER_KELVIN] =
@@ -6093,7 +6093,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Kelvin),
+        .party = TRAINER_PARTY(sParty_Kelvin),
     },
 
     [TRAINER_MARLEY] =
@@ -6105,7 +6105,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Marley),
+        .party = TRAINER_PARTY(sParty_Marley),
     },
 
     [TRAINER_REYNA] =
@@ -6117,7 +6117,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Reyna),
+        .party = TRAINER_PARTY(sParty_Reyna),
     },
 
     [TRAINER_HUDSON] =
@@ -6129,7 +6129,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Hudson),
+        .party = TRAINER_PARTY(sParty_Hudson),
     },
 
     [TRAINER_CONOR] =
@@ -6141,7 +6141,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Conor),
+        .party = TRAINER_PARTY(sParty_Conor),
     },
 
     [TRAINER_EDWIN_1] =
@@ -6153,7 +6153,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Edwin1),
+        .party = TRAINER_PARTY(sParty_Edwin1),
     },
 
     [TRAINER_HECTOR] =
@@ -6165,7 +6165,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Hector),
+        .party = TRAINER_PARTY(sParty_Hector),
     },
 
     [TRAINER_TABITHA_MOSSDEEP] =
@@ -6177,7 +6177,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_TabithaMossdeep),
+        .party = TRAINER_PARTY(sParty_TabithaMossdeep),
     },
 
     [TRAINER_EDWIN_2] =
@@ -6189,7 +6189,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Edwin2),
+        .party = TRAINER_PARTY(sParty_Edwin2),
     },
 
     [TRAINER_EDWIN_3] =
@@ -6201,7 +6201,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Edwin3),
+        .party = TRAINER_PARTY(sParty_Edwin3),
     },
 
     [TRAINER_EDWIN_4] =
@@ -6213,7 +6213,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Edwin4),
+        .party = TRAINER_PARTY(sParty_Edwin4),
     },
 
     [TRAINER_EDWIN_5] =
@@ -6225,7 +6225,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Edwin5),
+        .party = TRAINER_PARTY(sParty_Edwin5),
     },
 
     [TRAINER_WALLY_VR_1] =
@@ -6237,7 +6237,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_WallyVR1),
+        .party = TRAINER_PARTY(sParty_WallyVR1),
     },
 
     [TRAINER_BRENDAN_ROUTE_103_MUDKIP] =
@@ -6249,7 +6249,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_BrendanRoute103Mudkip),
+        .party = TRAINER_PARTY(sParty_BrendanRoute103Mudkip),
     },
 
     [TRAINER_BRENDAN_ROUTE_110_MUDKIP] =
@@ -6261,7 +6261,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_BrendanRoute110Mudkip),
+        .party = TRAINER_PARTY(sParty_BrendanRoute110Mudkip),
     },
 
     [TRAINER_BRENDAN_ROUTE_119_MUDKIP] =
@@ -6273,7 +6273,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_BrendanRoute119Mudkip),
+        .party = TRAINER_PARTY(sParty_BrendanRoute119Mudkip),
     },
 
     [TRAINER_BRENDAN_ROUTE_103_TREECKO] =
@@ -6285,7 +6285,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_SETUP_FIRST_TURN,
-        .party = EVERYTHING_CUSTOMIZED(sParty_BrendanRoute103Treecko),
+        .party = TRAINER_PARTY(sParty_BrendanRoute103Treecko),
     },
 
     [TRAINER_BRENDAN_ROUTE_110_TREECKO] =
@@ -6297,7 +6297,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_BrendanRoute110Treecko),
+        .party = TRAINER_PARTY(sParty_BrendanRoute110Treecko),
     },
 
     [TRAINER_BRENDAN_ROUTE_119_TREECKO] =
@@ -6309,7 +6309,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_BrendanRoute119Treecko),
+        .party = TRAINER_PARTY(sParty_BrendanRoute119Treecko),
     },
 
     [TRAINER_BRENDAN_ROUTE_103_TORCHIC] =
@@ -6321,7 +6321,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_BrendanRoute103Torchic),
+        .party = TRAINER_PARTY(sParty_BrendanRoute103Torchic),
     },
 
     [TRAINER_BRENDAN_ROUTE_110_TORCHIC] =
@@ -6333,7 +6333,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_BrendanRoute110Torchic),
+        .party = TRAINER_PARTY(sParty_BrendanRoute110Torchic),
     },
 
     [TRAINER_BRENDAN_ROUTE_119_TORCHIC] =
@@ -6345,7 +6345,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_BrendanRoute119Torchic),
+        .party = TRAINER_PARTY(sParty_BrendanRoute119Torchic),
     },
 
     [TRAINER_MAY_ROUTE_103_MUDKIP] =
@@ -6357,7 +6357,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_MayRoute103Mudkip),
+        .party = TRAINER_PARTY(sParty_MayRoute103Mudkip),
     },
 
     [TRAINER_MAY_ROUTE_110_MUDKIP] =
@@ -6369,7 +6369,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_MayRoute110Mudkip),
+        .party = TRAINER_PARTY(sParty_MayRoute110Mudkip),
     },
 
     [TRAINER_MAY_ROUTE_119_MUDKIP] =
@@ -6381,7 +6381,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_MayRoute119Mudkip),
+        .party = TRAINER_PARTY(sParty_MayRoute119Mudkip),
     },
 
     [TRAINER_MAY_ROUTE_103_TREECKO] =
@@ -6393,7 +6393,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_MayRoute103Treecko),
+        .party = TRAINER_PARTY(sParty_MayRoute103Treecko),
     },
 
     [TRAINER_MAY_ROUTE_110_TREECKO] =
@@ -6405,7 +6405,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_MayRoute110Treecko),
+        .party = TRAINER_PARTY(sParty_MayRoute110Treecko),
     },
 
     [TRAINER_MAY_ROUTE_119_TREECKO] =
@@ -6417,7 +6417,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_MayRoute119Treecko),
+        .party = TRAINER_PARTY(sParty_MayRoute119Treecko),
     },
 
     [TRAINER_MAY_ROUTE_103_TORCHIC] =
@@ -6429,7 +6429,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_MayRoute103Torchic),
+        .party = TRAINER_PARTY(sParty_MayRoute103Torchic),
     },
 
     [TRAINER_MAY_ROUTE_110_TORCHIC] =
@@ -6441,7 +6441,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_MayRoute110Torchic),
+        .party = TRAINER_PARTY(sParty_MayRoute110Torchic),
     },
 
     [TRAINER_MAY_ROUTE_119_TORCHIC] =
@@ -6453,7 +6453,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_MayRoute119Torchic),
+        .party = TRAINER_PARTY(sParty_MayRoute119Torchic),
     },
 
     [TRAINER_ISAAC_1] =
@@ -6465,7 +6465,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Isaac1),
+        .party = TRAINER_PARTY(sParty_Isaac1),
     },
 
     [TRAINER_DAVIS] =
@@ -6477,7 +6477,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Davis),
+        .party = TRAINER_PARTY(sParty_Davis),
     },
 
     [TRAINER_MITCHELL] =
@@ -6489,7 +6489,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Mitchell),
+        .party = TRAINER_PARTY(sParty_Mitchell),
     },
 
     [TRAINER_ISAAC_2] =
@@ -6501,7 +6501,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Isaac2),
+        .party = TRAINER_PARTY(sParty_Isaac2),
     },
 
     [TRAINER_ISAAC_3] =
@@ -6513,7 +6513,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Isaac3),
+        .party = TRAINER_PARTY(sParty_Isaac3),
     },
 
     [TRAINER_ISAAC_4] =
@@ -6525,7 +6525,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Isaac4),
+        .party = TRAINER_PARTY(sParty_Isaac4),
     },
 
     [TRAINER_ISAAC_5] =
@@ -6537,7 +6537,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Isaac5),
+        .party = TRAINER_PARTY(sParty_Isaac5),
     },
 
     [TRAINER_LYDIA_1] =
@@ -6549,7 +6549,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Lydia1),
+        .party = TRAINER_PARTY(sParty_Lydia1),
     },
 
     [TRAINER_HALLE] =
@@ -6561,7 +6561,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Halle),
+        .party = TRAINER_PARTY(sParty_Halle),
     },
 
     [TRAINER_GARRISON] =
@@ -6573,7 +6573,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Garrison),
+        .party = TRAINER_PARTY(sParty_Garrison),
     },
 
     [TRAINER_LYDIA_2] =
@@ -6585,7 +6585,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Lydia2),
+        .party = TRAINER_PARTY(sParty_Lydia2),
     },
 
     [TRAINER_LYDIA_3] =
@@ -6597,7 +6597,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Lydia3),
+        .party = TRAINER_PARTY(sParty_Lydia3),
     },
 
     [TRAINER_LYDIA_4] =
@@ -6609,7 +6609,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Lydia4),
+        .party = TRAINER_PARTY(sParty_Lydia4),
     },
 
     [TRAINER_LYDIA_5] =
@@ -6621,7 +6621,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Lydia5),
+        .party = TRAINER_PARTY(sParty_Lydia5),
     },
 
     [TRAINER_JACKSON_1] =
@@ -6633,7 +6633,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Jackson1),
+        .party = TRAINER_PARTY(sParty_Jackson1),
     },
 
     [TRAINER_LORENZO] =
@@ -6645,7 +6645,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Lorenzo),
+        .party = TRAINER_PARTY(sParty_Lorenzo),
     },
 
     [TRAINER_SEBASTIAN] =
@@ -6657,7 +6657,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Sebastian),
+        .party = TRAINER_PARTY(sParty_Sebastian),
     },
 
     [TRAINER_JACKSON_2] =
@@ -6669,7 +6669,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_SETUP_FIRST_TURN,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Jackson2),
+        .party = TRAINER_PARTY(sParty_Jackson2),
     },
 
     [TRAINER_JACKSON_3] =
@@ -6681,7 +6681,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Jackson3),
+        .party = TRAINER_PARTY(sParty_Jackson3),
     },
 
     [TRAINER_JACKSON_4] =
@@ -6693,7 +6693,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_SETUP_FIRST_TURN,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Jackson4),
+        .party = TRAINER_PARTY(sParty_Jackson4),
     },
 
     [TRAINER_JACKSON_5] =
@@ -6705,7 +6705,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Jackson5),
+        .party = TRAINER_PARTY(sParty_Jackson5),
     },
 
     [TRAINER_CATHERINE_1] =
@@ -6717,7 +6717,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_SETUP_FIRST_TURN,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Catherine1),
+        .party = TRAINER_PARTY(sParty_Catherine1),
     },
 
     [TRAINER_JENNA] =
@@ -6729,7 +6729,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_SETUP_FIRST_TURN,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Jenna),
+        .party = TRAINER_PARTY(sParty_Jenna),
     },
 
     [TRAINER_SOPHIA] =
@@ -6741,7 +6741,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Sophia),
+        .party = TRAINER_PARTY(sParty_Sophia),
     },
 
     [TRAINER_CATHERINE_2] =
@@ -6753,7 +6753,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_SETUP_FIRST_TURN,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Catherine2),
+        .party = TRAINER_PARTY(sParty_Catherine2),
     },
 
     [TRAINER_CATHERINE_3] =
@@ -6765,7 +6765,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Catherine3),
+        .party = TRAINER_PARTY(sParty_Catherine3),
     },
 
     [TRAINER_CATHERINE_4] =
@@ -6777,7 +6777,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_SETUP_FIRST_TURN,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Catherine4),
+        .party = TRAINER_PARTY(sParty_Catherine4),
     },
 
     [TRAINER_CATHERINE_5] =
@@ -6789,7 +6789,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Catherine5),
+        .party = TRAINER_PARTY(sParty_Catherine5),
     },
 
     [TRAINER_JULIO] =
@@ -6801,7 +6801,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Julio),
+        .party = TRAINER_PARTY(sParty_Julio),
     },
 
     [TRAINER_GRUNT_SEAFLOOR_CAVERN_5] =
@@ -6813,7 +6813,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_GruntSeafloorCavern5),
+        .party = TRAINER_PARTY(sParty_GruntSeafloorCavern5),
     },
 
     [TRAINER_GRUNT_UNUSED] =
@@ -6825,7 +6825,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_GruntUnused),
+        .party = TRAINER_PARTY(sParty_GruntUnused),
     },
 
     [TRAINER_GRUNT_MT_PYRE_4] =
@@ -6837,7 +6837,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_GruntMtPyre4),
+        .party = TRAINER_PARTY(sParty_GruntMtPyre4),
     },
 
     [TRAINER_GRUNT_JAGGED_PASS] =
@@ -6849,7 +6849,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_GruntJaggedPass),
+        .party = TRAINER_PARTY(sParty_GruntJaggedPass),
     },
 
     [TRAINER_MARC] =
@@ -6861,7 +6861,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Marc),
+        .party = TRAINER_PARTY(sParty_Marc),
     },
 
     [TRAINER_BRENDEN] =
@@ -6873,7 +6873,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Brenden),
+        .party = TRAINER_PARTY(sParty_Brenden),
     },
 
     [TRAINER_LILITH] =
@@ -6885,7 +6885,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Lilith),
+        .party = TRAINER_PARTY(sParty_Lilith),
     },
 
     [TRAINER_CRISTIAN] =
@@ -6897,7 +6897,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Cristian),
+        .party = TRAINER_PARTY(sParty_Cristian),
     },
 
     [TRAINER_SYLVIA] =
@@ -6909,7 +6909,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Sylvia),
+        .party = TRAINER_PARTY(sParty_Sylvia),
     },
 
     [TRAINER_LEONARDO] =
@@ -6921,7 +6921,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Leonardo),
+        .party = TRAINER_PARTY(sParty_Leonardo),
     },
 
     [TRAINER_ATHENA] =
@@ -6933,7 +6933,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Athena),
+        .party = TRAINER_PARTY(sParty_Athena),
     },
 
     [TRAINER_HARRISON] =
@@ -6945,7 +6945,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Harrison),
+        .party = TRAINER_PARTY(sParty_Harrison),
     },
 
     [TRAINER_GRUNT_MT_CHIMNEY_2] =
@@ -6957,7 +6957,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_GruntMtChimney2),
+        .party = TRAINER_PARTY(sParty_GruntMtChimney2),
     },
 
     [TRAINER_CLARENCE] =
@@ -6969,7 +6969,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Clarence),
+        .party = TRAINER_PARTY(sParty_Clarence),
     },
 
     [TRAINER_TERRY] =
@@ -6981,7 +6981,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Terry),
+        .party = TRAINER_PARTY(sParty_Terry),
     },
 
     [TRAINER_NATE] =
@@ -6993,7 +6993,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Nate),
+        .party = TRAINER_PARTY(sParty_Nate),
     },
 
     [TRAINER_KATHLEEN] =
@@ -7005,7 +7005,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Kathleen),
+        .party = TRAINER_PARTY(sParty_Kathleen),
     },
 
     [TRAINER_CLIFFORD] =
@@ -7017,7 +7017,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Clifford),
+        .party = TRAINER_PARTY(sParty_Clifford),
     },
 
     [TRAINER_NICHOLAS] =
@@ -7029,7 +7029,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Nicholas),
+        .party = TRAINER_PARTY(sParty_Nicholas),
     },
 
     [TRAINER_GRUNT_SPACE_CENTER_3] =
@@ -7041,7 +7041,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_GruntSpaceCenter3),
+        .party = TRAINER_PARTY(sParty_GruntSpaceCenter3),
     },
 
     [TRAINER_GRUNT_SPACE_CENTER_4] =
@@ -7053,7 +7053,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_GruntSpaceCenter4),
+        .party = TRAINER_PARTY(sParty_GruntSpaceCenter4),
     },
 
     [TRAINER_GRUNT_SPACE_CENTER_5] =
@@ -7065,7 +7065,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_GruntSpaceCenter5),
+        .party = TRAINER_PARTY(sParty_GruntSpaceCenter5),
     },
 
     [TRAINER_GRUNT_SPACE_CENTER_6] =
@@ -7077,7 +7077,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_GruntSpaceCenter6),
+        .party = TRAINER_PARTY(sParty_GruntSpaceCenter6),
     },
 
     [TRAINER_GRUNT_SPACE_CENTER_7] =
@@ -7089,7 +7089,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_GruntSpaceCenter7),
+        .party = TRAINER_PARTY(sParty_GruntSpaceCenter7),
     },
 
     [TRAINER_MACEY] =
@@ -7101,7 +7101,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Macey),
+        .party = TRAINER_PARTY(sParty_Macey),
     },
 
     [TRAINER_BRENDAN_RUSTBORO_TREECKO] =
@@ -7113,7 +7113,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_BrendanRustboroTreecko),
+        .party = TRAINER_PARTY(sParty_BrendanRustboroTreecko),
     },
 
     [TRAINER_BRENDAN_RUSTBORO_MUDKIP] =
@@ -7125,7 +7125,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_BrendanRustboroMudkip),
+        .party = TRAINER_PARTY(sParty_BrendanRustboroMudkip),
     },
 
     [TRAINER_PAXTON] =
@@ -7137,7 +7137,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Paxton),
+        .party = TRAINER_PARTY(sParty_Paxton),
     },
 
     [TRAINER_ISABELLA] =
@@ -7149,7 +7149,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Isabella),
+        .party = TRAINER_PARTY(sParty_Isabella),
     },
 
     [TRAINER_GRUNT_WEATHER_INST_5] =
@@ -7161,7 +7161,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_GruntWeatherInst5),
+        .party = TRAINER_PARTY(sParty_GruntWeatherInst5),
     },
 
     [TRAINER_TABITHA_MT_CHIMNEY] =
@@ -7173,7 +7173,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_TabithaMtChimney),
+        .party = TRAINER_PARTY(sParty_TabithaMtChimney),
     },
 
     [TRAINER_JONATHAN] =
@@ -7185,7 +7185,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_SETUP_FIRST_TURN,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Jonathan),
+        .party = TRAINER_PARTY(sParty_Jonathan),
     },
 
     [TRAINER_BRENDAN_RUSTBORO_TORCHIC] =
@@ -7197,7 +7197,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_BrendanRustboroTorchic),
+        .party = TRAINER_PARTY(sParty_BrendanRustboroTorchic),
     },
 
     [TRAINER_MAY_RUSTBORO_MUDKIP] =
@@ -7209,7 +7209,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_SETUP_FIRST_TURN,
-        .party = EVERYTHING_CUSTOMIZED(sParty_MayRustboroMudkip),
+        .party = TRAINER_PARTY(sParty_MayRustboroMudkip),
     },
 
     [TRAINER_MAXIE_MAGMA_HIDEOUT] =
@@ -7221,7 +7221,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_MaxieMagmaHideout),
+        .party = TRAINER_PARTY(sParty_MaxieMagmaHideout),
     },
 
     [TRAINER_MAXIE_MT_CHIMNEY] =
@@ -7233,7 +7233,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_MaxieMtChimney),
+        .party = TRAINER_PARTY(sParty_MaxieMtChimney),
     },
 
     [TRAINER_TIANA] =
@@ -7245,7 +7245,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Tiana),
+        .party = TRAINER_PARTY(sParty_Tiana),
     },
 
     [TRAINER_HALEY_1] =
@@ -7257,7 +7257,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Haley1),
+        .party = TRAINER_PARTY(sParty_Haley1),
     },
 
     [TRAINER_JANICE] =
@@ -7269,7 +7269,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Janice),
+        .party = TRAINER_PARTY(sParty_Janice),
     },
 
     [TRAINER_VIVI] =
@@ -7281,7 +7281,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Vivi),
+        .party = TRAINER_PARTY(sParty_Vivi),
     },
 
     [TRAINER_HALEY_2] =
@@ -7293,7 +7293,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Haley2),
+        .party = TRAINER_PARTY(sParty_Haley2),
     },
 
     [TRAINER_HALEY_3] =
@@ -7305,7 +7305,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Haley3),
+        .party = TRAINER_PARTY(sParty_Haley3),
     },
 
     [TRAINER_HALEY_4] =
@@ -7317,7 +7317,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Haley4),
+        .party = TRAINER_PARTY(sParty_Haley4),
     },
 
     [TRAINER_HALEY_5] =
@@ -7329,7 +7329,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Haley5),
+        .party = TRAINER_PARTY(sParty_Haley5),
     },
 
     [TRAINER_SALLY] =
@@ -7341,7 +7341,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Sally),
+        .party = TRAINER_PARTY(sParty_Sally),
     },
 
     [TRAINER_ROBIN] =
@@ -7353,7 +7353,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Robin),
+        .party = TRAINER_PARTY(sParty_Robin),
     },
 
     [TRAINER_ANDREA] =
@@ -7365,7 +7365,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Andrea),
+        .party = TRAINER_PARTY(sParty_Andrea),
     },
 
     [TRAINER_CRISSY] =
@@ -7377,7 +7377,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Crissy),
+        .party = TRAINER_PARTY(sParty_Crissy),
     },
 
     [TRAINER_RICK] =
@@ -7389,7 +7389,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Rick),
+        .party = TRAINER_PARTY(sParty_Rick),
     },
 
     [TRAINER_LYLE] =
@@ -7401,7 +7401,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Lyle),
+        .party = TRAINER_PARTY(sParty_Lyle),
     },
 
     [TRAINER_JOSE] =
@@ -7413,7 +7413,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Jose),
+        .party = TRAINER_PARTY(sParty_Jose),
     },
 
     [TRAINER_DOUG] =
@@ -7425,7 +7425,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Doug),
+        .party = TRAINER_PARTY(sParty_Doug),
     },
 
     [TRAINER_GREG] =
@@ -7437,7 +7437,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Greg),
+        .party = TRAINER_PARTY(sParty_Greg),
     },
 
     [TRAINER_KENT] =
@@ -7449,7 +7449,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Kent),
+        .party = TRAINER_PARTY(sParty_Kent),
     },
 
     [TRAINER_JAMES_1] =
@@ -7461,7 +7461,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_James1),
+        .party = TRAINER_PARTY(sParty_James1),
     },
 
     [TRAINER_JAMES_2] =
@@ -7473,7 +7473,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_James2),
+        .party = TRAINER_PARTY(sParty_James2),
     },
 
     [TRAINER_JAMES_3] =
@@ -7485,7 +7485,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_James3),
+        .party = TRAINER_PARTY(sParty_James3),
     },
 
     [TRAINER_JAMES_4] =
@@ -7497,7 +7497,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_James4),
+        .party = TRAINER_PARTY(sParty_James4),
     },
 
     [TRAINER_JAMES_5] =
@@ -7509,7 +7509,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_James5),
+        .party = TRAINER_PARTY(sParty_James5),
     },
 
     [TRAINER_BRICE] =
@@ -7521,7 +7521,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Brice),
+        .party = TRAINER_PARTY(sParty_Brice),
     },
 
     [TRAINER_TRENT_1] =
@@ -7533,7 +7533,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Trent1),
+        .party = TRAINER_PARTY(sParty_Trent1),
     },
 
     [TRAINER_LENNY] =
@@ -7545,7 +7545,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Lenny),
+        .party = TRAINER_PARTY(sParty_Lenny),
     },
 
     [TRAINER_LUCAS_1] =
@@ -7557,7 +7557,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Lucas1),
+        .party = TRAINER_PARTY(sParty_Lucas1),
     },
 
     [TRAINER_ALAN] =
@@ -7569,7 +7569,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Alan),
+        .party = TRAINER_PARTY(sParty_Alan),
     },
 
     [TRAINER_CLARK] =
@@ -7581,7 +7581,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Clark),
+        .party = TRAINER_PARTY(sParty_Clark),
     },
 
     [TRAINER_ERIC] =
@@ -7593,7 +7593,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Eric),
+        .party = TRAINER_PARTY(sParty_Eric),
     },
 
     [TRAINER_LUCAS_2] =
@@ -7605,7 +7605,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Lucas2),
+        .party = TRAINER_PARTY(sParty_Lucas2),
     },
 
     [TRAINER_MIKE_1] =
@@ -7617,7 +7617,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Mike1),
+        .party = TRAINER_PARTY(sParty_Mike1),
     },
 
     [TRAINER_MIKE_2] =
@@ -7629,7 +7629,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Mike2),
+        .party = TRAINER_PARTY(sParty_Mike2),
     },
 
     [TRAINER_TRENT_2] =
@@ -7641,7 +7641,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Trent2),
+        .party = TRAINER_PARTY(sParty_Trent2),
     },
 
     [TRAINER_TRENT_3] =
@@ -7653,7 +7653,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Trent3),
+        .party = TRAINER_PARTY(sParty_Trent3),
     },
 
     [TRAINER_TRENT_4] =
@@ -7665,7 +7665,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Trent4),
+        .party = TRAINER_PARTY(sParty_Trent4),
     },
 
     [TRAINER_TRENT_5] =
@@ -7677,7 +7677,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Trent5),
+        .party = TRAINER_PARTY(sParty_Trent5),
     },
 
     [TRAINER_DEZ_AND_LUKE] =
@@ -7689,7 +7689,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_DezAndLuke),
+        .party = TRAINER_PARTY(sParty_DezAndLuke),
     },
 
     [TRAINER_LEA_AND_JED] =
@@ -7701,7 +7701,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_LeaAndJed),
+        .party = TRAINER_PARTY(sParty_LeaAndJed),
     },
 
     [TRAINER_KIRA_AND_DAN_1] =
@@ -7713,7 +7713,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_KiraAndDan1),
+        .party = TRAINER_PARTY(sParty_KiraAndDan1),
     },
 
     [TRAINER_KIRA_AND_DAN_2] =
@@ -7725,7 +7725,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_KiraAndDan2),
+        .party = TRAINER_PARTY(sParty_KiraAndDan2),
     },
 
     [TRAINER_KIRA_AND_DAN_3] =
@@ -7737,7 +7737,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_KiraAndDan3),
+        .party = TRAINER_PARTY(sParty_KiraAndDan3),
     },
 
     [TRAINER_KIRA_AND_DAN_4] =
@@ -7749,7 +7749,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_KiraAndDan4),
+        .party = TRAINER_PARTY(sParty_KiraAndDan4),
     },
 
     [TRAINER_KIRA_AND_DAN_5] =
@@ -7761,7 +7761,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_KiraAndDan5),
+        .party = TRAINER_PARTY(sParty_KiraAndDan5),
     },
 
     [TRAINER_JOHANNA] =
@@ -7773,7 +7773,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Johanna),
+        .party = TRAINER_PARTY(sParty_Johanna),
     },
 
     [TRAINER_GERALD] =
@@ -7785,7 +7785,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Gerald),
+        .party = TRAINER_PARTY(sParty_Gerald),
     },
 
     [TRAINER_VIVIAN] =
@@ -7797,7 +7797,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Vivian),
+        .party = TRAINER_PARTY(sParty_Vivian),
     },
 
     [TRAINER_DANIELLE] =
@@ -7809,7 +7809,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Danielle),
+        .party = TRAINER_PARTY(sParty_Danielle),
     },
 
     [TRAINER_HIDEO] =
@@ -7821,7 +7821,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Hideo),
+        .party = TRAINER_PARTY(sParty_Hideo),
     },
 
     [TRAINER_KEIGO] =
@@ -7833,7 +7833,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Keigo),
+        .party = TRAINER_PARTY(sParty_Keigo),
     },
 
     [TRAINER_RILEY] =
@@ -7845,7 +7845,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Riley),
+        .party = TRAINER_PARTY(sParty_Riley),
     },
 
     [TRAINER_FLINT] =
@@ -7857,7 +7857,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Flint),
+        .party = TRAINER_PARTY(sParty_Flint),
     },
 
     [TRAINER_ASHLEY] =
@@ -7869,7 +7869,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Ashley),
+        .party = TRAINER_PARTY(sParty_Ashley),
     },
 
     [TRAINER_WALLY_MAUVILLE] =
@@ -7881,7 +7881,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_WallyMauville),
+        .party = TRAINER_PARTY(sParty_WallyMauville),
     },
 
     [TRAINER_WALLY_VR_2] =
@@ -7893,7 +7893,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_WallyVR2),
+        .party = TRAINER_PARTY(sParty_WallyVR2),
     },
 
     [TRAINER_WALLY_VR_3] =
@@ -7905,7 +7905,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_WallyVR3),
+        .party = TRAINER_PARTY(sParty_WallyVR3),
     },
 
     [TRAINER_WALLY_VR_4] =
@@ -7917,7 +7917,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_WallyVR4),
+        .party = TRAINER_PARTY(sParty_WallyVR4),
     },
 
     [TRAINER_WALLY_VR_5] =
@@ -7929,7 +7929,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_WallyVR5),
+        .party = TRAINER_PARTY(sParty_WallyVR5),
     },
 
     [TRAINER_BRENDAN_LILYCOVE_MUDKIP] =
@@ -7941,7 +7941,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_BrendanLilycoveMudkip),
+        .party = TRAINER_PARTY(sParty_BrendanLilycoveMudkip),
     },
 
     [TRAINER_BRENDAN_LILYCOVE_TREECKO] =
@@ -7953,7 +7953,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_BrendanLilycoveTreecko),
+        .party = TRAINER_PARTY(sParty_BrendanLilycoveTreecko),
     },
 
     [TRAINER_BRENDAN_LILYCOVE_TORCHIC] =
@@ -7965,7 +7965,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_BrendanLilycoveTorchic),
+        .party = TRAINER_PARTY(sParty_BrendanLilycoveTorchic),
     },
 
     [TRAINER_MAY_LILYCOVE_MUDKIP] =
@@ -7977,7 +7977,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_MayLilycoveMudkip),
+        .party = TRAINER_PARTY(sParty_MayLilycoveMudkip),
     },
 
     [TRAINER_MAY_LILYCOVE_TREECKO] =
@@ -7989,7 +7989,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_MayLilycoveTreecko),
+        .party = TRAINER_PARTY(sParty_MayLilycoveTreecko),
     },
 
     [TRAINER_MAY_LILYCOVE_TORCHIC] =
@@ -8001,7 +8001,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_MayLilycoveTorchic),
+        .party = TRAINER_PARTY(sParty_MayLilycoveTorchic),
     },
 
     [TRAINER_JONAH] =
@@ -8013,7 +8013,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Jonah),
+        .party = TRAINER_PARTY(sParty_Jonah),
     },
 
     [TRAINER_HENRY] =
@@ -8025,7 +8025,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Henry),
+        .party = TRAINER_PARTY(sParty_Henry),
     },
 
     [TRAINER_ROGER] =
@@ -8037,7 +8037,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Roger),
+        .party = TRAINER_PARTY(sParty_Roger),
     },
 
     [TRAINER_ALEXA] =
@@ -8049,7 +8049,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Alexa),
+        .party = TRAINER_PARTY(sParty_Alexa),
     },
 
     [TRAINER_RUBEN] =
@@ -8061,7 +8061,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Ruben),
+        .party = TRAINER_PARTY(sParty_Ruben),
     },
 
     [TRAINER_KOJI_1] =
@@ -8073,7 +8073,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Koji1),
+        .party = TRAINER_PARTY(sParty_Koji1),
     },
 
     [TRAINER_WAYNE] =
@@ -8085,7 +8085,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Wayne),
+        .party = TRAINER_PARTY(sParty_Wayne),
     },
 
     [TRAINER_AIDAN] =
@@ -8097,7 +8097,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Aidan),
+        .party = TRAINER_PARTY(sParty_Aidan),
     },
 
     [TRAINER_REED] =
@@ -8109,7 +8109,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Reed),
+        .party = TRAINER_PARTY(sParty_Reed),
     },
 
     [TRAINER_TISHA] =
@@ -8121,7 +8121,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Tisha),
+        .party = TRAINER_PARTY(sParty_Tisha),
     },
 
     [TRAINER_TORI_AND_TIA] =
@@ -8133,7 +8133,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_ToriAndTia),
+        .party = TRAINER_PARTY(sParty_ToriAndTia),
     },
 
     [TRAINER_KIM_AND_IRIS] =
@@ -8145,7 +8145,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_KimAndIris),
+        .party = TRAINER_PARTY(sParty_KimAndIris),
     },
 
     [TRAINER_TYRA_AND_IVY] =
@@ -8157,7 +8157,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_TyraAndIvy),
+        .party = TRAINER_PARTY(sParty_TyraAndIvy),
     },
 
     [TRAINER_MEL_AND_PAUL] =
@@ -8169,7 +8169,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_MelAndPaul),
+        .party = TRAINER_PARTY(sParty_MelAndPaul),
     },
 
     [TRAINER_JOHN_AND_JAY_1] =
@@ -8181,7 +8181,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_JohnAndJay1),
+        .party = TRAINER_PARTY(sParty_JohnAndJay1),
     },
 
     [TRAINER_JOHN_AND_JAY_2] =
@@ -8193,7 +8193,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_JohnAndJay2),
+        .party = TRAINER_PARTY(sParty_JohnAndJay2),
     },
 
     [TRAINER_JOHN_AND_JAY_3] =
@@ -8205,7 +8205,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_JohnAndJay3),
+        .party = TRAINER_PARTY(sParty_JohnAndJay3),
     },
 
     [TRAINER_JOHN_AND_JAY_4] =
@@ -8217,7 +8217,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_SETUP_FIRST_TURN,
-        .party = EVERYTHING_CUSTOMIZED(sParty_JohnAndJay4),
+        .party = TRAINER_PARTY(sParty_JohnAndJay4),
     },
 
     [TRAINER_JOHN_AND_JAY_5] =
@@ -8229,7 +8229,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_JohnAndJay5),
+        .party = TRAINER_PARTY(sParty_JohnAndJay5),
     },
 
     [TRAINER_RELI_AND_IAN] =
@@ -8241,7 +8241,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_ReliAndIan),
+        .party = TRAINER_PARTY(sParty_ReliAndIan),
     },
 
     [TRAINER_LILA_AND_ROY_1] =
@@ -8253,7 +8253,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_LilaAndRoy1),
+        .party = TRAINER_PARTY(sParty_LilaAndRoy1),
     },
 
     [TRAINER_LILA_AND_ROY_2] =
@@ -8265,7 +8265,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_LilaAndRoy2),
+        .party = TRAINER_PARTY(sParty_LilaAndRoy2),
     },
 
     [TRAINER_LILA_AND_ROY_3] =
@@ -8277,7 +8277,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_LilaAndRoy3),
+        .party = TRAINER_PARTY(sParty_LilaAndRoy3),
     },
 
     [TRAINER_LILA_AND_ROY_4] =
@@ -8289,7 +8289,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_LilaAndRoy4),
+        .party = TRAINER_PARTY(sParty_LilaAndRoy4),
     },
 
     [TRAINER_LILA_AND_ROY_5] =
@@ -8301,7 +8301,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_LilaAndRoy5),
+        .party = TRAINER_PARTY(sParty_LilaAndRoy5),
     },
 
     [TRAINER_LISA_AND_RAY] =
@@ -8313,7 +8313,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_LisaAndRay),
+        .party = TRAINER_PARTY(sParty_LisaAndRay),
     },
 
     [TRAINER_CHRIS] =
@@ -8325,7 +8325,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Chris),
+        .party = TRAINER_PARTY(sParty_Chris),
     },
 
     [TRAINER_DAWSON] =
@@ -8337,7 +8337,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Dawson),
+        .party = TRAINER_PARTY(sParty_Dawson),
     },
 
     [TRAINER_SARAH] =
@@ -8349,7 +8349,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Sarah),
+        .party = TRAINER_PARTY(sParty_Sarah),
     },
 
     [TRAINER_DARIAN] =
@@ -8361,7 +8361,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Darian),
+        .party = TRAINER_PARTY(sParty_Darian),
     },
 
     [TRAINER_HAILEY] =
@@ -8373,7 +8373,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Hailey),
+        .party = TRAINER_PARTY(sParty_Hailey),
     },
 
     [TRAINER_CHANDLER] =
@@ -8385,7 +8385,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Chandler),
+        .party = TRAINER_PARTY(sParty_Chandler),
     },
 
     [TRAINER_KALEB] =
@@ -8397,7 +8397,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Kaleb),
+        .party = TRAINER_PARTY(sParty_Kaleb),
     },
 
     [TRAINER_JOSEPH] =
@@ -8409,7 +8409,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Joseph),
+        .party = TRAINER_PARTY(sParty_Joseph),
     },
 
     [TRAINER_ALYSSA] =
@@ -8421,7 +8421,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Alyssa),
+        .party = TRAINER_PARTY(sParty_Alyssa),
     },
 
     [TRAINER_MARCOS] =
@@ -8433,7 +8433,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Marcos),
+        .party = TRAINER_PARTY(sParty_Marcos),
     },
 
     [TRAINER_RHETT] =
@@ -8445,7 +8445,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Rhett),
+        .party = TRAINER_PARTY(sParty_Rhett),
     },
 
     [TRAINER_TYRON] =
@@ -8457,7 +8457,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Tyron),
+        .party = TRAINER_PARTY(sParty_Tyron),
     },
 
     [TRAINER_CELINA] =
@@ -8469,7 +8469,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Celina),
+        .party = TRAINER_PARTY(sParty_Celina),
     },
 
     [TRAINER_BIANCA] =
@@ -8481,7 +8481,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Bianca),
+        .party = TRAINER_PARTY(sParty_Bianca),
     },
 
     [TRAINER_HAYDEN] =
@@ -8493,7 +8493,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Hayden),
+        .party = TRAINER_PARTY(sParty_Hayden),
     },
 
     [TRAINER_SOPHIE] =
@@ -8505,7 +8505,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Sophie),
+        .party = TRAINER_PARTY(sParty_Sophie),
     },
 
     [TRAINER_COBY] =
@@ -8517,7 +8517,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Coby),
+        .party = TRAINER_PARTY(sParty_Coby),
     },
 
     [TRAINER_LAWRENCE] =
@@ -8529,7 +8529,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Lawrence),
+        .party = TRAINER_PARTY(sParty_Lawrence),
     },
 
     [TRAINER_WYATT] =
@@ -8541,7 +8541,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Wyatt),
+        .party = TRAINER_PARTY(sParty_Wyatt),
     },
 
     [TRAINER_ANGELINA] =
@@ -8553,7 +8553,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Angelina),
+        .party = TRAINER_PARTY(sParty_Angelina),
     },
 
     [TRAINER_KAI] =
@@ -8565,7 +8565,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Kai),
+        .party = TRAINER_PARTY(sParty_Kai),
     },
 
     [TRAINER_CHARLOTTE] =
@@ -8577,7 +8577,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Charlotte),
+        .party = TRAINER_PARTY(sParty_Charlotte),
     },
 
     [TRAINER_DEANDRE] =
@@ -8589,7 +8589,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Deandre),
+        .party = TRAINER_PARTY(sParty_Deandre),
     },
 
     [TRAINER_GRUNT_MAGMA_HIDEOUT_1] =
@@ -8601,7 +8601,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_GruntMagmaHideout1),
+        .party = TRAINER_PARTY(sParty_GruntMagmaHideout1),
     },
 
     [TRAINER_GRUNT_MAGMA_HIDEOUT_2] =
@@ -8613,7 +8613,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_GruntMagmaHideout2),
+        .party = TRAINER_PARTY(sParty_GruntMagmaHideout2),
     },
 
     [TRAINER_GRUNT_MAGMA_HIDEOUT_3] =
@@ -8625,7 +8625,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_GruntMagmaHideout3),
+        .party = TRAINER_PARTY(sParty_GruntMagmaHideout3),
     },
 
     [TRAINER_GRUNT_MAGMA_HIDEOUT_4] =
@@ -8637,7 +8637,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_GruntMagmaHideout4),
+        .party = TRAINER_PARTY(sParty_GruntMagmaHideout4),
     },
 
     [TRAINER_GRUNT_MAGMA_HIDEOUT_5] =
@@ -8649,7 +8649,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_GruntMagmaHideout5),
+        .party = TRAINER_PARTY(sParty_GruntMagmaHideout5),
     },
 
     [TRAINER_GRUNT_MAGMA_HIDEOUT_6] =
@@ -8661,7 +8661,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_GruntMagmaHideout6),
+        .party = TRAINER_PARTY(sParty_GruntMagmaHideout6),
     },
 
     [TRAINER_GRUNT_MAGMA_HIDEOUT_7] =
@@ -8673,7 +8673,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_GruntMagmaHideout7),
+        .party = TRAINER_PARTY(sParty_GruntMagmaHideout7),
     },
 
     [TRAINER_GRUNT_MAGMA_HIDEOUT_8] =
@@ -8685,7 +8685,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_GruntMagmaHideout8),
+        .party = TRAINER_PARTY(sParty_GruntMagmaHideout8),
     },
 
     [TRAINER_GRUNT_MAGMA_HIDEOUT_9] =
@@ -8697,7 +8697,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_GruntMagmaHideout9),
+        .party = TRAINER_PARTY(sParty_GruntMagmaHideout9),
     },
 
     [TRAINER_GRUNT_MAGMA_HIDEOUT_10] =
@@ -8709,7 +8709,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_GruntMagmaHideout10),
+        .party = TRAINER_PARTY(sParty_GruntMagmaHideout10),
     },
 
     [TRAINER_GRUNT_MAGMA_HIDEOUT_11] =
@@ -8721,7 +8721,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_GruntMagmaHideout11),
+        .party = TRAINER_PARTY(sParty_GruntMagmaHideout11),
     },
 
     [TRAINER_GRUNT_MAGMA_HIDEOUT_12] =
@@ -8733,7 +8733,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_GruntMagmaHideout12),
+        .party = TRAINER_PARTY(sParty_GruntMagmaHideout12),
     },
 
     [TRAINER_GRUNT_MAGMA_HIDEOUT_13] =
@@ -8745,7 +8745,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_GruntMagmaHideout13),
+        .party = TRAINER_PARTY(sParty_GruntMagmaHideout13),
     },
 
     [TRAINER_GRUNT_MAGMA_HIDEOUT_14] =
@@ -8757,7 +8757,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_GruntMagmaHideout14),
+        .party = TRAINER_PARTY(sParty_GruntMagmaHideout14),
     },
 
     [TRAINER_GRUNT_MAGMA_HIDEOUT_15] =
@@ -8769,7 +8769,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_GruntMagmaHideout15),
+        .party = TRAINER_PARTY(sParty_GruntMagmaHideout15),
     },
 
     [TRAINER_GRUNT_MAGMA_HIDEOUT_16] =
@@ -8781,7 +8781,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_GruntMagmaHideout16),
+        .party = TRAINER_PARTY(sParty_GruntMagmaHideout16),
     },
 
     [TRAINER_TABITHA_MAGMA_HIDEOUT] =
@@ -8793,7 +8793,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_TabithaMagmaHideout),
+        .party = TRAINER_PARTY(sParty_TabithaMagmaHideout),
     },
 
     [TRAINER_DARCY] =
@@ -8805,7 +8805,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Darcy),
+        .party = TRAINER_PARTY(sParty_Darcy),
     },
 
     [TRAINER_MAXIE_MOSSDEEP] =
@@ -8817,7 +8817,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_MaxieMossdeep),
+        .party = TRAINER_PARTY(sParty_MaxieMossdeep),
     },
 
     [TRAINER_PETE] =
@@ -8829,7 +8829,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Pete),
+        .party = TRAINER_PARTY(sParty_Pete),
     },
 
     [TRAINER_ISABELLE] =
@@ -8841,7 +8841,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Isabelle),
+        .party = TRAINER_PARTY(sParty_Isabelle),
     },
 
     [TRAINER_ANDRES_1] =
@@ -8853,7 +8853,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Andres1),
+        .party = TRAINER_PARTY(sParty_Andres1),
     },
 
     [TRAINER_JOSUE] =
@@ -8865,7 +8865,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Josue),
+        .party = TRAINER_PARTY(sParty_Josue),
     },
 
     [TRAINER_CAMRON] =
@@ -8877,7 +8877,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Camron),
+        .party = TRAINER_PARTY(sParty_Camron),
     },
 
     [TRAINER_CORY_1] =
@@ -8889,7 +8889,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Cory1),
+        .party = TRAINER_PARTY(sParty_Cory1),
     },
 
     [TRAINER_CAROLINA] =
@@ -8901,7 +8901,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Carolina),
+        .party = TRAINER_PARTY(sParty_Carolina),
     },
 
     [TRAINER_ELIJAH] =
@@ -8913,7 +8913,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Elijah),
+        .party = TRAINER_PARTY(sParty_Elijah),
     },
 
     [TRAINER_CELIA] =
@@ -8925,7 +8925,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Celia),
+        .party = TRAINER_PARTY(sParty_Celia),
     },
 
     [TRAINER_BRYAN] =
@@ -8937,7 +8937,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Bryan),
+        .party = TRAINER_PARTY(sParty_Bryan),
     },
 
     [TRAINER_BRANDEN] =
@@ -8949,7 +8949,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Branden),
+        .party = TRAINER_PARTY(sParty_Branden),
     },
 
     [TRAINER_BRYANT] =
@@ -8961,7 +8961,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Bryant),
+        .party = TRAINER_PARTY(sParty_Bryant),
     },
 
     [TRAINER_SHAYLA] =
@@ -8973,7 +8973,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Shayla),
+        .party = TRAINER_PARTY(sParty_Shayla),
     },
 
     [TRAINER_KYRA] =
@@ -8985,7 +8985,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Kyra),
+        .party = TRAINER_PARTY(sParty_Kyra),
     },
 
     [TRAINER_JAIDEN] =
@@ -8997,7 +8997,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Jaiden),
+        .party = TRAINER_PARTY(sParty_Jaiden),
     },
 
     [TRAINER_ALIX] =
@@ -9009,7 +9009,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Alix),
+        .party = TRAINER_PARTY(sParty_Alix),
     },
 
     [TRAINER_HELENE] =
@@ -9021,7 +9021,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Helene),
+        .party = TRAINER_PARTY(sParty_Helene),
     },
 
     [TRAINER_MARLENE] =
@@ -9033,7 +9033,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Marlene),
+        .party = TRAINER_PARTY(sParty_Marlene),
     },
 
     [TRAINER_DEVAN] =
@@ -9045,7 +9045,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Devan),
+        .party = TRAINER_PARTY(sParty_Devan),
     },
 
     [TRAINER_JOHNSON] =
@@ -9057,7 +9057,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Johnson),
+        .party = TRAINER_PARTY(sParty_Johnson),
     },
 
     [TRAINER_MELINA] =
@@ -9069,7 +9069,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Melina),
+        .party = TRAINER_PARTY(sParty_Melina),
     },
 
     [TRAINER_BRANDI] =
@@ -9081,7 +9081,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Brandi),
+        .party = TRAINER_PARTY(sParty_Brandi),
     },
 
     [TRAINER_AISHA] =
@@ -9093,7 +9093,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Aisha),
+        .party = TRAINER_PARTY(sParty_Aisha),
     },
 
     [TRAINER_MAKAYLA] =
@@ -9105,7 +9105,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Makayla),
+        .party = TRAINER_PARTY(sParty_Makayla),
     },
 
     [TRAINER_FABIAN] =
@@ -9117,7 +9117,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Fabian),
+        .party = TRAINER_PARTY(sParty_Fabian),
     },
 
     [TRAINER_DAYTON] =
@@ -9129,7 +9129,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Dayton),
+        .party = TRAINER_PARTY(sParty_Dayton),
     },
 
     [TRAINER_RACHEL] =
@@ -9141,7 +9141,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Rachel),
+        .party = TRAINER_PARTY(sParty_Rachel),
     },
 
     [TRAINER_LEONEL] =
@@ -9153,7 +9153,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Leonel),
+        .party = TRAINER_PARTY(sParty_Leonel),
     },
 
     [TRAINER_CALLIE] =
@@ -9165,7 +9165,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Callie),
+        .party = TRAINER_PARTY(sParty_Callie),
     },
 
     [TRAINER_CALE] =
@@ -9177,7 +9177,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Cale),
+        .party = TRAINER_PARTY(sParty_Cale),
     },
 
     [TRAINER_MYLES] =
@@ -9189,7 +9189,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Myles),
+        .party = TRAINER_PARTY(sParty_Myles),
     },
 
     [TRAINER_PAT] =
@@ -9201,7 +9201,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Pat),
+        .party = TRAINER_PARTY(sParty_Pat),
     },
 
     [TRAINER_CRISTIN_1] =
@@ -9213,7 +9213,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Cristin1),
+        .party = TRAINER_PARTY(sParty_Cristin1),
     },
 
     [TRAINER_MAY_RUSTBORO_TREECKO] =
@@ -9225,7 +9225,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_MayRustboroTreecko),
+        .party = TRAINER_PARTY(sParty_MayRustboroTreecko),
     },
 
     [TRAINER_MAY_RUSTBORO_TORCHIC] =
@@ -9237,7 +9237,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_MayRustboroTorchic),
+        .party = TRAINER_PARTY(sParty_MayRustboroTorchic),
     },
 
     [TRAINER_ROXANNE_2] =
@@ -9249,7 +9249,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Roxanne2),
+        .party = TRAINER_PARTY(sParty_Roxanne2),
     },
 
     [TRAINER_ROXANNE_3] =
@@ -9261,7 +9261,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Roxanne3),
+        .party = TRAINER_PARTY(sParty_Roxanne3),
     },
 
     [TRAINER_ROXANNE_4] =
@@ -9273,7 +9273,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Roxanne4),
+        .party = TRAINER_PARTY(sParty_Roxanne4),
     },
 
     [TRAINER_ROXANNE_5] =
@@ -9285,7 +9285,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Roxanne5),
+        .party = TRAINER_PARTY(sParty_Roxanne5),
     },
 
     [TRAINER_BRAWLY_2] =
@@ -9297,7 +9297,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Brawly2),
+        .party = TRAINER_PARTY(sParty_Brawly2),
     },
 
     [TRAINER_BRAWLY_3] =
@@ -9309,7 +9309,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Brawly3),
+        .party = TRAINER_PARTY(sParty_Brawly3),
     },
 
     [TRAINER_BRAWLY_4] =
@@ -9321,7 +9321,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Brawly4),
+        .party = TRAINER_PARTY(sParty_Brawly4),
     },
 
     [TRAINER_BRAWLY_5] =
@@ -9333,7 +9333,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Brawly5),
+        .party = TRAINER_PARTY(sParty_Brawly5),
     },
 
     [TRAINER_WATTSON_2] =
@@ -9345,7 +9345,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Wattson2),
+        .party = TRAINER_PARTY(sParty_Wattson2),
     },
 
     [TRAINER_WATTSON_3] =
@@ -9357,7 +9357,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Wattson3),
+        .party = TRAINER_PARTY(sParty_Wattson3),
     },
 
     [TRAINER_WATTSON_4] =
@@ -9369,7 +9369,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Wattson4),
+        .party = TRAINER_PARTY(sParty_Wattson4),
     },
 
     [TRAINER_WATTSON_5] =
@@ -9381,7 +9381,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Wattson5),
+        .party = TRAINER_PARTY(sParty_Wattson5),
     },
 
     [TRAINER_FLANNERY_2] =
@@ -9393,7 +9393,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Flannery2),
+        .party = TRAINER_PARTY(sParty_Flannery2),
     },
 
     [TRAINER_FLANNERY_3] =
@@ -9405,7 +9405,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Flannery3),
+        .party = TRAINER_PARTY(sParty_Flannery3),
     },
 
     [TRAINER_FLANNERY_4] =
@@ -9417,7 +9417,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Flannery4),
+        .party = TRAINER_PARTY(sParty_Flannery4),
     },
 
     [TRAINER_FLANNERY_5] =
@@ -9429,7 +9429,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Flannery5),
+        .party = TRAINER_PARTY(sParty_Flannery5),
     },
 
     [TRAINER_NORMAN_2] =
@@ -9441,7 +9441,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Norman2),
+        .party = TRAINER_PARTY(sParty_Norman2),
     },
 
     [TRAINER_NORMAN_3] =
@@ -9453,7 +9453,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Norman3),
+        .party = TRAINER_PARTY(sParty_Norman3),
     },
 
     [TRAINER_NORMAN_4] =
@@ -9465,7 +9465,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Norman4),
+        .party = TRAINER_PARTY(sParty_Norman4),
     },
 
     [TRAINER_NORMAN_5] =
@@ -9477,7 +9477,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Norman5),
+        .party = TRAINER_PARTY(sParty_Norman5),
     },
 
     [TRAINER_WINONA_2] =
@@ -9489,7 +9489,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY | AI_FLAG_RISKY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Winona2),
+        .party = TRAINER_PARTY(sParty_Winona2),
     },
 
     [TRAINER_WINONA_3] =
@@ -9501,7 +9501,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY | AI_FLAG_RISKY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Winona3),
+        .party = TRAINER_PARTY(sParty_Winona3),
     },
 
     [TRAINER_WINONA_4] =
@@ -9513,7 +9513,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY | AI_FLAG_RISKY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Winona4),
+        .party = TRAINER_PARTY(sParty_Winona4),
     },
 
     [TRAINER_WINONA_5] =
@@ -9525,7 +9525,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY | AI_FLAG_RISKY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Winona5),
+        .party = TRAINER_PARTY(sParty_Winona5),
     },
 
     [TRAINER_TATE_AND_LIZA_2] =
@@ -9537,7 +9537,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_TateAndLiza2),
+        .party = TRAINER_PARTY(sParty_TateAndLiza2),
     },
 
     [TRAINER_TATE_AND_LIZA_3] =
@@ -9549,7 +9549,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_TateAndLiza3),
+        .party = TRAINER_PARTY(sParty_TateAndLiza3),
     },
 
     [TRAINER_TATE_AND_LIZA_4] =
@@ -9561,7 +9561,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_TateAndLiza4),
+        .party = TRAINER_PARTY(sParty_TateAndLiza4),
     },
 
     [TRAINER_TATE_AND_LIZA_5] =
@@ -9573,7 +9573,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_TateAndLiza5),
+        .party = TRAINER_PARTY(sParty_TateAndLiza5),
     },
 
     [TRAINER_JUAN_2] =
@@ -9585,7 +9585,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Juan2),
+        .party = TRAINER_PARTY(sParty_Juan2),
     },
 
     [TRAINER_JUAN_3] =
@@ -9597,7 +9597,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Juan3),
+        .party = TRAINER_PARTY(sParty_Juan3),
     },
 
     [TRAINER_JUAN_4] =
@@ -9609,7 +9609,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Juan4),
+        .party = TRAINER_PARTY(sParty_Juan4),
     },
 
     [TRAINER_JUAN_5] =
@@ -9621,7 +9621,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Juan5),
+        .party = TRAINER_PARTY(sParty_Juan5),
     },
 
     [TRAINER_ANGELO] =
@@ -9633,7 +9633,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Angelo),
+        .party = TRAINER_PARTY(sParty_Angelo),
     },
 
     [TRAINER_DARIUS] =
@@ -9645,7 +9645,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Darius),
+        .party = TRAINER_PARTY(sParty_Darius),
     },
 
     [TRAINER_STEVEN] =
@@ -9657,7 +9657,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Steven),
+        .party = TRAINER_PARTY(sParty_Steven),
     },
 
     [TRAINER_ANABEL] =
@@ -9669,7 +9669,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Anabel),
+        .party = TRAINER_PARTY(sParty_Anabel),
     },
 
     [TRAINER_TUCKER] =
@@ -9681,7 +9681,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Tucker),
+        .party = TRAINER_PARTY(sParty_Tucker),
     },
 
     [TRAINER_SPENSER] =
@@ -9693,7 +9693,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Spenser),
+        .party = TRAINER_PARTY(sParty_Spenser),
     },
 
     [TRAINER_GRETA] =
@@ -9705,7 +9705,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Greta),
+        .party = TRAINER_PARTY(sParty_Greta),
     },
 
     [TRAINER_NOLAND] =
@@ -9717,7 +9717,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Noland),
+        .party = TRAINER_PARTY(sParty_Noland),
     },
 
     [TRAINER_LUCY] =
@@ -9729,7 +9729,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Lucy),
+        .party = TRAINER_PARTY(sParty_Lucy),
     },
 
     [TRAINER_BRANDON] =
@@ -9741,7 +9741,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Brandon),
+        .party = TRAINER_PARTY(sParty_Brandon),
     },
 
     [TRAINER_ANDRES_2] =
@@ -9753,7 +9753,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Andres2),
+        .party = TRAINER_PARTY(sParty_Andres2),
     },
 
     [TRAINER_ANDRES_3] =
@@ -9765,7 +9765,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Andres3),
+        .party = TRAINER_PARTY(sParty_Andres3),
     },
 
     [TRAINER_ANDRES_4] =
@@ -9777,7 +9777,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Andres4),
+        .party = TRAINER_PARTY(sParty_Andres4),
     },
 
     [TRAINER_ANDRES_5] =
@@ -9789,7 +9789,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Andres5),
+        .party = TRAINER_PARTY(sParty_Andres5),
     },
 
     [TRAINER_CORY_2] =
@@ -9801,7 +9801,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Cory2),
+        .party = TRAINER_PARTY(sParty_Cory2),
     },
 
     [TRAINER_CORY_3] =
@@ -9813,7 +9813,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Cory3),
+        .party = TRAINER_PARTY(sParty_Cory3),
     },
 
     [TRAINER_CORY_4] =
@@ -9825,7 +9825,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Cory4),
+        .party = TRAINER_PARTY(sParty_Cory4),
     },
 
     [TRAINER_CORY_5] =
@@ -9837,7 +9837,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Cory5),
+        .party = TRAINER_PARTY(sParty_Cory5),
     },
 
     [TRAINER_PABLO_2] =
@@ -9849,7 +9849,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Pablo2),
+        .party = TRAINER_PARTY(sParty_Pablo2),
     },
 
     [TRAINER_PABLO_3] =
@@ -9861,7 +9861,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Pablo3),
+        .party = TRAINER_PARTY(sParty_Pablo3),
     },
 
     [TRAINER_PABLO_4] =
@@ -9873,7 +9873,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Pablo4),
+        .party = TRAINER_PARTY(sParty_Pablo4),
     },
 
     [TRAINER_PABLO_5] =
@@ -9885,7 +9885,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Pablo5),
+        .party = TRAINER_PARTY(sParty_Pablo5),
     },
 
     [TRAINER_KOJI_2] =
@@ -9897,7 +9897,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Koji2),
+        .party = TRAINER_PARTY(sParty_Koji2),
     },
 
     [TRAINER_KOJI_3] =
@@ -9909,7 +9909,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Koji3),
+        .party = TRAINER_PARTY(sParty_Koji3),
     },
 
     [TRAINER_KOJI_4] =
@@ -9921,7 +9921,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Koji4),
+        .party = TRAINER_PARTY(sParty_Koji4),
     },
 
     [TRAINER_KOJI_5] =
@@ -9933,7 +9933,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Koji5),
+        .party = TRAINER_PARTY(sParty_Koji5),
     },
 
     [TRAINER_CRISTIN_2] =
@@ -9945,7 +9945,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Cristin2),
+        .party = TRAINER_PARTY(sParty_Cristin2),
     },
 
     [TRAINER_CRISTIN_3] =
@@ -9957,7 +9957,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Cristin3),
+        .party = TRAINER_PARTY(sParty_Cristin3),
     },
 
     [TRAINER_CRISTIN_4] =
@@ -9969,7 +9969,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Cristin4),
+        .party = TRAINER_PARTY(sParty_Cristin4),
     },
 
     [TRAINER_CRISTIN_5] =
@@ -9981,7 +9981,7 @@ const struct Trainer gTrainers[] = {
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Cristin5),
+        .party = TRAINER_PARTY(sParty_Cristin5),
     },
 
     [TRAINER_FERNANDO_2] =
@@ -9993,7 +9993,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Fernando2),
+        .party = TRAINER_PARTY(sParty_Fernando2),
     },
 
     [TRAINER_FERNANDO_3] =
@@ -10005,7 +10005,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Fernando3),
+        .party = TRAINER_PARTY(sParty_Fernando3),
     },
 
     [TRAINER_FERNANDO_4] =
@@ -10017,7 +10017,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Fernando4),
+        .party = TRAINER_PARTY(sParty_Fernando4),
     },
 
     [TRAINER_FERNANDO_5] =
@@ -10029,7 +10029,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Fernando5),
+        .party = TRAINER_PARTY(sParty_Fernando5),
     },
 
     [TRAINER_SAWYER_2] =
@@ -10041,7 +10041,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Sawyer2),
+        .party = TRAINER_PARTY(sParty_Sawyer2),
     },
 
     [TRAINER_SAWYER_3] =
@@ -10053,7 +10053,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Sawyer3),
+        .party = TRAINER_PARTY(sParty_Sawyer3),
     },
 
     [TRAINER_SAWYER_4] =
@@ -10065,7 +10065,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Sawyer4),
+        .party = TRAINER_PARTY(sParty_Sawyer4),
     },
 
     [TRAINER_SAWYER_5] =
@@ -10077,7 +10077,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Sawyer5),
+        .party = TRAINER_PARTY(sParty_Sawyer5),
     },
 
     [TRAINER_GABRIELLE_2] =
@@ -10089,7 +10089,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Gabrielle2),
+        .party = TRAINER_PARTY(sParty_Gabrielle2),
     },
 
     [TRAINER_GABRIELLE_3] =
@@ -10101,7 +10101,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Gabrielle3),
+        .party = TRAINER_PARTY(sParty_Gabrielle3),
     },
 
     [TRAINER_GABRIELLE_4] =
@@ -10113,7 +10113,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Gabrielle4),
+        .party = TRAINER_PARTY(sParty_Gabrielle4),
     },
 
     [TRAINER_GABRIELLE_5] =
@@ -10125,7 +10125,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Gabrielle5),
+        .party = TRAINER_PARTY(sParty_Gabrielle5),
     },
 
     [TRAINER_THALIA_2] =
@@ -10137,7 +10137,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Thalia2),
+        .party = TRAINER_PARTY(sParty_Thalia2),
     },
 
     [TRAINER_THALIA_3] =
@@ -10149,7 +10149,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Thalia3),
+        .party = TRAINER_PARTY(sParty_Thalia3),
     },
 
     [TRAINER_THALIA_4] =
@@ -10161,7 +10161,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Thalia4),
+        .party = TRAINER_PARTY(sParty_Thalia4),
     },
 
     [TRAINER_THALIA_5] =
@@ -10173,7 +10173,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Thalia5),
+        .party = TRAINER_PARTY(sParty_Thalia5),
     },
 
     [TRAINER_MARIELA] =
@@ -10185,7 +10185,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = 0,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Mariela),
+        .party = TRAINER_PARTY(sParty_Mariela),
     },
 
     [TRAINER_ALVARO] =
@@ -10197,7 +10197,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = 0,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Alvaro),
+        .party = TRAINER_PARTY(sParty_Alvaro),
     },
 
     [TRAINER_EVERETT] =
@@ -10209,7 +10209,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = 0,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Everett),
+        .party = TRAINER_PARTY(sParty_Everett),
     },
 
     [TRAINER_RED] =
@@ -10221,7 +10221,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = 0,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Red),
+        .party = TRAINER_PARTY(sParty_Red),
     },
 
     [TRAINER_LEAF] =
@@ -10233,7 +10233,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = 0,
-        .party = EVERYTHING_CUSTOMIZED(sParty_Leaf),
+        .party = TRAINER_PARTY(sParty_Leaf),
     },
 
     [TRAINER_BRENDAN_PLACEHOLDER] =
@@ -10245,7 +10245,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = 0,
-        .party = EVERYTHING_CUSTOMIZED(sParty_BrendanLinkPlaceholder),
+        .party = TRAINER_PARTY(sParty_BrendanLinkPlaceholder),
     },
 
     [TRAINER_MAY_PLACEHOLDER] =
@@ -10257,6 +10257,6 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = 0,
-        .party = EVERYTHING_CUSTOMIZED(sParty_MayLinkPlaceholder),
+        .party = TRAINER_PARTY(sParty_MayLinkPlaceholder),
     },
 };
diff --git a/test/trainer_control.c b/test/trainer_control.c
index 2032fa9a0..bd3cb3d6a 100644
--- a/test/trainer_control.c
+++ b/test/trainer_control.c
@@ -38,7 +38,7 @@ static const struct TrainerMon sTestParty1[] =
 static const struct Trainer sTestTrainer1 =
 {
     .trainerName = _("Test1"),
-    .party = EVERYTHING_CUSTOMIZED(sTestParty1),
+    .party = TRAINER_PARTY(sTestParty1),
 };
 
 TEST("CreateNPCTrainerPartyForTrainer generates customized Pokémon")