From 3dd7a2c09ec3ac28349c8729a050c115dc5d4b1b Mon Sep 17 00:00:00 2001
From: Eduardo Quezada <eduardo602002@gmail.com>
Date: Tue, 4 Jul 2023 21:29:58 -0400
Subject: [PATCH] Removed TrainerMonNoItemDefaultMoves

---
 include/data.h               |    9 -
 src/battle_main.c            |   14 +-
 src/battle_script_commands.c |    6 -
 src/battle_setup.c           |    8 -
 src/battle_tower.c           |    7 -
 src/data/trainer_parties.h   | 1344 ++++++++++++++++-----------------
 src/data/trainers.h          | 1346 +++++++++++++++++-----------------
 src/match_call.c             |    3 -
 test/trainer_control.c       |   20 +-
 9 files changed, 1347 insertions(+), 1410 deletions(-)

diff --git a/include/data.h b/include/data.h
index 0b88973a59..dec0f8841f 100644
--- a/include/data.h
+++ b/include/data.h
@@ -52,19 +52,10 @@ struct TrainerMonCustomized
     bool8 isShiny : 1;
 };
 
-struct TrainerMonNoItemDefaultMoves
-{
-    u16 iv;
-    u8 lvl;
-    u16 species;
-};
-
-#define NO_ITEM_DEFAULT_MOVES(party) { .NoItemDefaultMoves = party }, .partySize = ARRAY_COUNT(party), .partyFlags = 0
 #define EVERYTHING_CUSTOMIZED(party) { .EverythingCustomized = party}, .partySize = ARRAY_COUNT(party), .partyFlags = F_TRAINER_PARTY_EVERYTHING_CUSTOMIZED
 
 union TrainerMonPtr
 {
-    const struct TrainerMonNoItemDefaultMoves *NoItemDefaultMoves;
     const struct TrainerMonCustomized *EverythingCustomized;
 };
 
diff --git a/src/battle_main.c b/src/battle_main.c
index 4c660b4a23..a996f680b3 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -1885,12 +1885,7 @@ static u32 GeneratePartyHash(const struct Trainer *trainer, u32 i)
 {
     const u8 *buffer;
     u32 n;
-    if (trainer->partyFlags == 0)
-    {
-        buffer = (const u8 *) &trainer->party.NoItemDefaultMoves[i];
-        n = sizeof(*trainer->party.NoItemDefaultMoves);
-    }
-    else if (trainer->partyFlags == F_TRAINER_PARTY_EVERYTHING_CUSTOMIZED)
+    if (trainer->partyFlags == F_TRAINER_PARTY_EVERYTHING_CUSTOMIZED)
     {
         buffer = (const u8 *) &trainer->party.EverythingCustomized[i];
         n = sizeof(*trainer->party.EverythingCustomized);
@@ -1982,13 +1977,6 @@ u8 CreateNPCTrainerPartyFromTrainer(struct Pokemon *party, const struct Trainer
             personalityValue += personalityHash << 8;
             switch (trainer->partyFlags)
             {
-            case 0:
-            {
-                const struct TrainerMonNoItemDefaultMoves *partyData = trainer->party.NoItemDefaultMoves;
-                fixedIV = partyData[i].iv * MAX_PER_STAT_IVS / 255;
-                CreateMon(&party[i], partyData[i].species, partyData[i].lvl, fixedIV, TRUE, personalityValue, OT_ID_RANDOM_NO_SHINY, 0);
-                break;
-            }
             case F_TRAINER_PARTY_EVERYTHING_CUSTOMIZED:
             {
                 const struct TrainerMonCustomized *partyData = trainer->party.EverythingCustomized;
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index d922b5352b..ea6f5a3b96 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -7339,12 +7339,6 @@ static u32 GetTrainerMoneyToGive(u16 trainerId)
     {
         switch (gTrainers[trainerId].partyFlags)
         {
-        case 0:
-            {
-                const struct TrainerMonNoItemDefaultMoves *party = gTrainers[trainerId].party.NoItemDefaultMoves;
-                lastMonLevel = party[gTrainers[trainerId].partySize - 1].lvl;
-            }
-            break;
         case F_TRAINER_PARTY_EVERYTHING_CUSTOMIZED:
             {
                 const struct TrainerMonCustomized *party = gTrainers[trainerId].party.EverythingCustomized;
diff --git a/src/battle_setup.c b/src/battle_setup.c
index 3ea68426ed..44a01977bc 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -766,14 +766,6 @@ static u8 GetSumOfEnemyPartyLevel(u16 opponentId, u8 numMons)
 
     switch (gTrainers[opponentId].partyFlags)
     {
-    case 0:
-        {
-            const struct TrainerMonNoItemDefaultMoves *party;
-            party = gTrainers[opponentId].party.NoItemDefaultMoves;
-            for (i = 0; i < count; i++)
-                sum += party[i].lvl;
-        }
-        break;
     case F_TRAINER_PARTY_EVERYTHING_CUSTOMIZED:
         {
             const struct TrainerMonCustomized *party;
diff --git a/src/battle_tower.c b/src/battle_tower.c
index daace40c6a..4b962673b6 100644
--- a/src/battle_tower.c
+++ b/src/battle_tower.c
@@ -3056,13 +3056,6 @@ static void FillPartnerParty(u16 trainerId)
 
             switch (gTrainers[trainerId - TRAINER_CUSTOM_PARTNER].partyFlags)
             {
-            case 0:
-            {
-                const struct TrainerMonNoItemDefaultMoves *partyData = gTrainers[trainerId - TRAINER_CUSTOM_PARTNER].party.NoItemDefaultMoves;
-
-                CreateMon(&gPlayerParty[i + 3], partyData[i].species, partyData[i].lvl, partyData[i].iv * 31 / 255, TRUE, j, TRUE, otID);
-                break;
-            }
             case F_TRAINER_PARTY_EVERYTHING_CUSTOMIZED:
             {
                 const struct TrainerMonCustomized *partyData = gTrainers[trainerId - TRAINER_CUSTOM_PARTNER].party.EverythingCustomized;
diff --git a/src/data/trainer_parties.h b/src/data/trainer_parties.h
index f7b4c696c6..84447a55e0 100644
--- a/src/data/trainer_parties.h
+++ b/src/data/trainer_parties.h
@@ -1,4 +1,4 @@
-static const struct TrainerMonNoItemDefaultMoves sParty_Sawyer1[] = {
+static const struct TrainerMonCustomized sParty_Sawyer1[] = {
     {
     .iv = 0,
     .lvl = 21,
@@ -6,7 +6,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Sawyer1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout1[] = {
+static const struct TrainerMonCustomized sParty_GruntAquaHideout1[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -14,7 +14,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout2[] = {
+static const struct TrainerMonCustomized sParty_GruntAquaHideout2[] = {
     {
     .iv = 0,
     .lvl = 31,
@@ -27,7 +27,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout3[] = {
+static const struct TrainerMonCustomized sParty_GruntAquaHideout3[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -35,7 +35,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout3[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout4[] = {
+static const struct TrainerMonCustomized sParty_GruntAquaHideout4[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -43,7 +43,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout4[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_GruntSeafloorCavern1[] = {
+static const struct TrainerMonCustomized sParty_GruntSeafloorCavern1[] = {
     {
     .iv = 0,
     .lvl = 36,
@@ -51,7 +51,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntSeafloorCavern1[] =
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_GruntSeafloorCavern2[] = {
+static const struct TrainerMonCustomized sParty_GruntSeafloorCavern2[] = {
     {
     .iv = 0,
     .lvl = 36,
@@ -59,7 +59,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntSeafloorCavern2[] =
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_GruntSeafloorCavern3[] = {
+static const struct TrainerMonCustomized sParty_GruntSeafloorCavern3[] = {
     {
     .iv = 0,
     .lvl = 36,
@@ -67,7 +67,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntSeafloorCavern3[] =
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Gabrielle1[] = {
+static const struct TrainerMonCustomized sParty_Gabrielle1[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -100,7 +100,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Gabrielle1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_GruntPetalburgWoods[] = {
+static const struct TrainerMonCustomized sParty_GruntPetalburgWoods[] = {
     {
     .iv = 0,
     .lvl = 9,
@@ -108,7 +108,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntPetalburgWoods[] =
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Marcel[] = {
+static const struct TrainerMonCustomized sParty_Marcel[] = {
     {
     .iv = 100,
     .lvl = 29,
@@ -121,7 +121,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Marcel[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Alberto[] = {
+static const struct TrainerMonCustomized sParty_Alberto[] = {
     {
     .iv = 0,
     .lvl = 30,
@@ -134,7 +134,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Alberto[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Ed[] = {
+static const struct TrainerMonCustomized sParty_Ed[] = {
     {
     .iv = 0,
     .lvl = 30,
@@ -147,7 +147,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Ed[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_GruntSeafloorCavern4[] = {
+static const struct TrainerMonCustomized sParty_GruntSeafloorCavern4[] = {
     {
     .iv = 0,
     .lvl = 36,
@@ -155,7 +155,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntSeafloorCavern4[] =
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Declan[] = {
+static const struct TrainerMonCustomized sParty_Declan[] = {
     {
     .iv = 0,
     .lvl = 34,
@@ -163,7 +163,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Declan[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_GruntRusturfTunnel[] = {
+static const struct TrainerMonCustomized sParty_GruntRusturfTunnel[] = {
     {
     .iv = 0,
     .lvl = 11,
@@ -171,7 +171,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntRusturfTunnel[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_GruntWeatherInst1[] = {
+static const struct TrainerMonCustomized sParty_GruntWeatherInst1[] = {
     {
     .iv = 0,
     .lvl = 27,
@@ -184,7 +184,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntWeatherInst1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_GruntWeatherInst2[] = {
+static const struct TrainerMonCustomized sParty_GruntWeatherInst2[] = {
     {
     .iv = 0,
     .lvl = 27,
@@ -197,7 +197,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntWeatherInst2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_GruntWeatherInst3[] = {
+static const struct TrainerMonCustomized sParty_GruntWeatherInst3[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -215,7 +215,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntWeatherInst3[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_GruntMuseum1[] = {
+static const struct TrainerMonCustomized sParty_GruntMuseum1[] = {
     {
     .iv = 0,
     .lvl = 15,
@@ -223,7 +223,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntMuseum1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_GruntMuseum2[] = {
+static const struct TrainerMonCustomized sParty_GruntMuseum2[] = {
     {
     .iv = 0,
     .lvl = 14,
@@ -236,7 +236,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntMuseum2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_GruntSpaceCenter1[] = {
+static const struct TrainerMonCustomized sParty_GruntSpaceCenter1[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -244,7 +244,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntSpaceCenter1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_GruntMtPyre1[] = {
+static const struct TrainerMonCustomized sParty_GruntMtPyre1[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -252,7 +252,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntMtPyre1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_GruntMtPyre2[] = {
+static const struct TrainerMonCustomized sParty_GruntMtPyre2[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -260,7 +260,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntMtPyre2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_GruntMtPyre3[] = {
+static const struct TrainerMonCustomized sParty_GruntMtPyre3[] = {
     {
     .iv = 0,
     .lvl = 30,
@@ -273,7 +273,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntMtPyre3[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_GruntWeatherInst4[] = {
+static const struct TrainerMonCustomized sParty_GruntWeatherInst4[] = {
     {
     .iv = 0,
     .lvl = 28,
@@ -281,7 +281,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntWeatherInst4[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout5[] = {
+static const struct TrainerMonCustomized sParty_GruntAquaHideout5[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -289,7 +289,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout5[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout6[] = {
+static const struct TrainerMonCustomized sParty_GruntAquaHideout6[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -297,7 +297,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout6[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Fredrick[] = {
+static const struct TrainerMonCustomized sParty_Fredrick[] = {
     {
     .iv = 100,
     .lvl = 30,
@@ -310,7 +310,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Fredrick[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Matt[] = {
+static const struct TrainerMonCustomized sParty_Matt[] = {
     {
     .iv = 50,
     .lvl = 34,
@@ -323,7 +323,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Matt[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Zander[] = {
+static const struct TrainerMonCustomized sParty_Zander[] = {
     {
     .iv = 0,
     .lvl = 31,
@@ -331,7 +331,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Zander[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_ShellyWeatherInstitute[] = {
+static const struct TrainerMonCustomized sParty_ShellyWeatherInstitute[] = {
     {
     .iv = 50,
     .lvl = 28,
@@ -344,7 +344,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_ShellyWeatherInstitute[]
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_ShellySeafloorCavern[] = {
+static const struct TrainerMonCustomized sParty_ShellySeafloorCavern[] = {
     {
     .iv = 100,
     .lvl = 37,
@@ -357,7 +357,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_ShellySeafloorCavern[] =
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Archie[] = {
+static const struct TrainerMonCustomized sParty_Archie[] = {
     {
     .iv = 150,
     .lvl = 41,
@@ -375,7 +375,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Archie[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Leah[] = {
+static const struct TrainerMonCustomized sParty_Leah[] = {
     {
     .iv = 0,
     .lvl = 31,
@@ -383,7 +383,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Leah[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Daisy[] = {
+static const struct TrainerMonCustomized sParty_Daisy[] = {
     {
     .iv = 0,
     .lvl = 14,
@@ -396,7 +396,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Daisy[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Rose1[] = {
+static const struct TrainerMonCustomized sParty_Rose1[] = {
     {
     .iv = 0,
     .lvl = 14,
@@ -429,7 +429,7 @@ static const struct TrainerMonCustomized sParty_Felix[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Violet[] = {
+static const struct TrainerMonCustomized sParty_Violet[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -442,7 +442,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Violet[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Rose2[] = {
+static const struct TrainerMonCustomized sParty_Rose2[] = {
     {
     .iv = 10,
     .lvl = 26,
@@ -455,7 +455,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Rose2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Rose3[] = {
+static const struct TrainerMonCustomized sParty_Rose3[] = {
     {
     .iv = 20,
     .lvl = 28,
@@ -473,7 +473,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Rose3[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Rose4[] = {
+static const struct TrainerMonCustomized sParty_Rose4[] = {
     {
     .iv = 30,
     .lvl = 31,
@@ -491,7 +491,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Rose4[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Rose5[] = {
+static const struct TrainerMonCustomized sParty_Rose5[] = {
     {
     .iv = 40,
     .lvl = 34,
@@ -590,7 +590,7 @@ static const struct TrainerMonCustomized sParty_Dusty5[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_GabbyAndTy1[] = {
+static const struct TrainerMonCustomized sParty_GabbyAndTy1[] = {
     {
     .iv = 50,
     .lvl = 17,
@@ -603,7 +603,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GabbyAndTy1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_GabbyAndTy2[] = {
+static const struct TrainerMonCustomized sParty_GabbyAndTy2[] = {
     {
     .iv = 100,
     .lvl = 27,
@@ -616,7 +616,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GabbyAndTy2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_GabbyAndTy3[] = {
+static const struct TrainerMonCustomized sParty_GabbyAndTy3[] = {
     {
     .iv = 150,
     .lvl = 30,
@@ -629,7 +629,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GabbyAndTy3[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_GabbyAndTy4[] = {
+static const struct TrainerMonCustomized sParty_GabbyAndTy4[] = {
     {
     .iv = 200,
     .lvl = 33,
@@ -642,7 +642,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GabbyAndTy4[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_GabbyAndTy5[] = {
+static const struct TrainerMonCustomized sParty_GabbyAndTy5[] = {
     {
     .iv = 250,
     .lvl = 36,
@@ -670,7 +670,7 @@ static const struct TrainerMonCustomized sParty_GabbyAndTy6[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Lola1[] = {
+static const struct TrainerMonCustomized sParty_Lola1[] = {
     {
     .iv = 10,
     .lvl = 12,
@@ -683,7 +683,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Lola1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Austina[] = {
+static const struct TrainerMonCustomized sParty_Austina[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -691,7 +691,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Austina[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Gwen[] = {
+static const struct TrainerMonCustomized sParty_Gwen[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -699,7 +699,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Gwen[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Lola2[] = {
+static const struct TrainerMonCustomized sParty_Lola2[] = {
     {
     .iv = 10,
     .lvl = 26,
@@ -712,7 +712,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Lola2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Lola3[] = {
+static const struct TrainerMonCustomized sParty_Lola3[] = {
     {
     .iv = 20,
     .lvl = 29,
@@ -725,7 +725,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Lola3[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Lola4[] = {
+static const struct TrainerMonCustomized sParty_Lola4[] = {
     {
     .iv = 30,
     .lvl = 32,
@@ -738,7 +738,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Lola4[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Lola5[] = {
+static const struct TrainerMonCustomized sParty_Lola5[] = {
     {
     .iv = 40,
     .lvl = 35,
@@ -760,7 +760,7 @@ static const struct TrainerMonCustomized sParty_Ricky1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Simon[] = {
+static const struct TrainerMonCustomized sParty_Simon[] = {
     {
     .iv = 0,
     .lvl = 12,
@@ -773,7 +773,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Simon[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Charlie[] = {
+static const struct TrainerMonCustomized sParty_Charlie[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -890,7 +890,7 @@ static const struct TrainerMonCustomized sParty_Braxton[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Vincent[] = {
+static const struct TrainerMonCustomized sParty_Vincent[] = {
     {
     .iv = 100,
     .lvl = 44,
@@ -908,7 +908,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Vincent[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Leroy[] = {
+static const struct TrainerMonCustomized sParty_Leroy[] = {
     {
     .iv = 100,
     .lvl = 46,
@@ -921,7 +921,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Leroy[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Wilton1[] = {
+static const struct TrainerMonCustomized sParty_Wilton1[] = {
     {
     .iv = 100,
     .lvl = 17,
@@ -939,7 +939,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Wilton1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Edgar[] = {
+static const struct TrainerMonCustomized sParty_Edgar[] = {
     {
     .iv = 100,
     .lvl = 43,
@@ -952,7 +952,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Edgar[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Albert[] = {
+static const struct TrainerMonCustomized sParty_Albert[] = {
     {
     .iv = 100,
     .lvl = 43,
@@ -965,7 +965,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Albert[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Samuel[] = {
+static const struct TrainerMonCustomized sParty_Samuel[] = {
     {
     .iv = 100,
     .lvl = 42,
@@ -983,7 +983,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Samuel[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Vito[] = {
+static const struct TrainerMonCustomized sParty_Vito[] = {
     {
     .iv = 100,
     .lvl = 42,
@@ -1006,7 +1006,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Vito[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Owen[] = {
+static const struct TrainerMonCustomized sParty_Owen[] = {
     {
     .iv = 100,
     .lvl = 42,
@@ -1024,7 +1024,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Owen[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Wilton2[] = {
+static const struct TrainerMonCustomized sParty_Wilton2[] = {
     {
     .iv = 110,
     .lvl = 26,
@@ -1042,7 +1042,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Wilton2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Wilton3[] = {
+static const struct TrainerMonCustomized sParty_Wilton3[] = {
     {
     .iv = 120,
     .lvl = 29,
@@ -1060,7 +1060,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Wilton3[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Wilton4[] = {
+static const struct TrainerMonCustomized sParty_Wilton4[] = {
     {
     .iv = 130,
     .lvl = 32,
@@ -1078,7 +1078,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Wilton4[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Wilton5[] = {
+static const struct TrainerMonCustomized sParty_Wilton5[] = {
     {
     .iv = 140,
     .lvl = 35,
@@ -1096,7 +1096,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Wilton5[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Warren[] = {
+static const struct TrainerMonCustomized sParty_Warren[] = {
     {
     .iv = 100,
     .lvl = 33,
@@ -1160,7 +1160,7 @@ static const struct TrainerMonCustomized sParty_Wendy[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Keira[] = {
+static const struct TrainerMonCustomized sParty_Keira[] = {
     {
     .iv = 100,
     .lvl = 45,
@@ -1173,7 +1173,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Keira[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Brooke1[] = {
+static const struct TrainerMonCustomized sParty_Brooke1[] = {
     {
     .iv = 100,
     .lvl = 17,
@@ -1191,7 +1191,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Brooke1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Jennifer[] = {
+static const struct TrainerMonCustomized sParty_Jennifer[] = {
     {
     .iv = 200,
     .lvl = 30,
@@ -1199,7 +1199,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Jennifer[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Hope[] = {
+static const struct TrainerMonCustomized sParty_Hope[] = {
     {
     .iv = 100,
     .lvl = 45,
@@ -1207,7 +1207,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Hope[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Shannon[] = {
+static const struct TrainerMonCustomized sParty_Shannon[] = {
     {
     .iv = 100,
     .lvl = 45,
@@ -1215,7 +1215,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Shannon[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Michelle[] = {
+static const struct TrainerMonCustomized sParty_Michelle[] = {
     {
     .iv = 100,
     .lvl = 42,
@@ -1233,7 +1233,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Michelle[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Caroline[] = {
+static const struct TrainerMonCustomized sParty_Caroline[] = {
     {
     .iv = 100,
     .lvl = 43,
@@ -1246,7 +1246,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Caroline[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Julie[] = {
+static const struct TrainerMonCustomized sParty_Julie[] = {
     {
     .iv = 100,
     .lvl = 42,
@@ -1264,7 +1264,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Julie[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Brooke2[] = {
+static const struct TrainerMonCustomized sParty_Brooke2[] = {
     {
     .iv = 110,
     .lvl = 26,
@@ -1282,7 +1282,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Brooke2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Brooke3[] = {
+static const struct TrainerMonCustomized sParty_Brooke3[] = {
     {
     .iv = 120,
     .lvl = 29,
@@ -1300,7 +1300,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Brooke3[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Brooke4[] = {
+static const struct TrainerMonCustomized sParty_Brooke4[] = {
     {
     .iv = 130,
     .lvl = 32,
@@ -1318,7 +1318,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Brooke4[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Brooke5[] = {
+static const struct TrainerMonCustomized sParty_Brooke5[] = {
     {
     .iv = 140,
     .lvl = 34,
@@ -1336,7 +1336,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Brooke5[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Patricia[] = {
+static const struct TrainerMonCustomized sParty_Patricia[] = {
     {
     .iv = 0,
     .lvl = 41,
@@ -1349,7 +1349,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Patricia[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Kindra[] = {
+static const struct TrainerMonCustomized sParty_Kindra[] = {
     {
     .iv = 0,
     .lvl = 30,
@@ -1362,7 +1362,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Kindra[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Tammy[] = {
+static const struct TrainerMonCustomized sParty_Tammy[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -1375,7 +1375,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Tammy[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Valerie1[] = {
+static const struct TrainerMonCustomized sParty_Valerie1[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -1383,7 +1383,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Valerie1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Tasha[] = {
+static const struct TrainerMonCustomized sParty_Tasha[] = {
     {
     .iv = 50,
     .lvl = 32,
@@ -1391,7 +1391,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Tasha[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Valerie2[] = {
+static const struct TrainerMonCustomized sParty_Valerie2[] = {
     {
     .iv = 10,
     .lvl = 31,
@@ -1404,7 +1404,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Valerie2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Valerie3[] = {
+static const struct TrainerMonCustomized sParty_Valerie3[] = {
     {
     .iv = 20,
     .lvl = 35,
@@ -1417,7 +1417,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Valerie3[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Valerie4[] = {
+static const struct TrainerMonCustomized sParty_Valerie4[] = {
     {
     .iv = 30,
     .lvl = 40,
@@ -1430,7 +1430,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Valerie4[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Valerie5[] = {
+static const struct TrainerMonCustomized sParty_Valerie5[] = {
     {
     .iv = 40,
     .lvl = 42,
@@ -1474,7 +1474,7 @@ static const struct TrainerMonCustomized sParty_Daphne[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_GruntSpaceCenter2[] = {
+static const struct TrainerMonCustomized sParty_GruntSpaceCenter2[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -1557,7 +1557,7 @@ static const struct TrainerMonCustomized sParty_Cindy6[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Melissa[] = {
+static const struct TrainerMonCustomized sParty_Melissa[] = {
     {
     .iv = 0,
     .lvl = 21,
@@ -1565,7 +1565,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Melissa[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Sheila[] = {
+static const struct TrainerMonCustomized sParty_Sheila[] = {
     {
     .iv = 0,
     .lvl = 21,
@@ -1573,7 +1573,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Sheila[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Shirley[] = {
+static const struct TrainerMonCustomized sParty_Shirley[] = {
     {
     .iv = 0,
     .lvl = 21,
@@ -1596,7 +1596,7 @@ static const struct TrainerMonCustomized sParty_Jessica1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Connie[] = {
+static const struct TrainerMonCustomized sParty_Connie[] = {
     {
     .iv = 100,
     .lvl = 40,
@@ -1604,7 +1604,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Connie[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Bridget[] = {
+static const struct TrainerMonCustomized sParty_Bridget[] = {
     {
     .iv = 150,
     .lvl = 40,
@@ -1633,7 +1633,7 @@ static const struct TrainerMonCustomized sParty_Olivia[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Tiffany[] = {
+static const struct TrainerMonCustomized sParty_Tiffany[] = {
     {
     .iv = 100,
     .lvl = 39,
@@ -1715,7 +1715,7 @@ static const struct TrainerMonCustomized sParty_Winston1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Mollie[] = {
+static const struct TrainerMonCustomized sParty_Mollie[] = {
     {
     .iv = 0,
     .lvl = 33,
@@ -1774,7 +1774,7 @@ static const struct TrainerMonCustomized sParty_Winston5[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Steve1[] = {
+static const struct TrainerMonCustomized sParty_Steve1[] = {
     {
     .iv = 0,
     .lvl = 19,
@@ -1782,7 +1782,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Steve1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Thalia1[] = {
+static const struct TrainerMonCustomized sParty_Thalia1[] = {
     {
     .iv = 0,
     .lvl = 25,
@@ -1795,7 +1795,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Thalia1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Mark[] = {
+static const struct TrainerMonCustomized sParty_Mark[] = {
     {
     .iv = 0,
     .lvl = 31,
@@ -1803,7 +1803,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Mark[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_GruntMtChimney1[] = {
+static const struct TrainerMonCustomized sParty_GruntMtChimney1[] = {
     {
     .iv = 0,
     .lvl = 20,
@@ -1811,7 +1811,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntMtChimney1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Steve2[] = {
+static const struct TrainerMonCustomized sParty_Steve2[] = {
     {
     .iv = 10,
     .lvl = 27,
@@ -1819,7 +1819,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Steve2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Steve3[] = {
+static const struct TrainerMonCustomized sParty_Steve3[] = {
     {
     .iv = 20,
     .lvl = 29,
@@ -1832,7 +1832,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Steve3[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Steve4[] = {
+static const struct TrainerMonCustomized sParty_Steve4[] = {
     {
     .iv = 30,
     .lvl = 32,
@@ -1845,7 +1845,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Steve4[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Steve5[] = {
+static const struct TrainerMonCustomized sParty_Steve5[] = {
     {
     .iv = 40,
     .lvl = 35,
@@ -1858,7 +1858,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Steve5[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Luis[] = {
+static const struct TrainerMonCustomized sParty_Luis[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -1866,7 +1866,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Luis[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Dominik[] = {
+static const struct TrainerMonCustomized sParty_Dominik[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -1874,7 +1874,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Dominik[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Douglas[] = {
+static const struct TrainerMonCustomized sParty_Douglas[] = {
     {
     .iv = 10,
     .lvl = 24,
@@ -1887,7 +1887,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Douglas[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Darrin[] = {
+static const struct TrainerMonCustomized sParty_Darrin[] = {
     {
     .iv = 10,
     .lvl = 24,
@@ -1905,7 +1905,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Darrin[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Tony1[] = {
+static const struct TrainerMonCustomized sParty_Tony1[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -1913,7 +1913,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Tony1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Jerome[] = {
+static const struct TrainerMonCustomized sParty_Jerome[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -1921,7 +1921,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Jerome[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Matthew[] = {
+static const struct TrainerMonCustomized sParty_Matthew[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -1929,7 +1929,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Matthew[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_David[] = {
+static const struct TrainerMonCustomized sParty_David[] = {
     {
     .iv = 0,
     .lvl = 25,
@@ -1942,7 +1942,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_David[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Spencer[] = {
+static const struct TrainerMonCustomized sParty_Spencer[] = {
     {
     .iv = 0,
     .lvl = 33,
@@ -1955,7 +1955,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Spencer[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Roland[] = {
+static const struct TrainerMonCustomized sParty_Roland[] = {
     {
     .iv = 0,
     .lvl = 34,
@@ -1963,7 +1963,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Roland[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Nolen[] = {
+static const struct TrainerMonCustomized sParty_Nolen[] = {
     {
     .iv = 0,
     .lvl = 34,
@@ -1971,7 +1971,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Nolen[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Stan[] = {
+static const struct TrainerMonCustomized sParty_Stan[] = {
     {
     .iv = 0,
     .lvl = 34,
@@ -1979,7 +1979,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Stan[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Barry[] = {
+static const struct TrainerMonCustomized sParty_Barry[] = {
     {
     .iv = 0,
     .lvl = 34,
@@ -1987,7 +1987,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Barry[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Dean[] = {
+static const struct TrainerMonCustomized sParty_Dean[] = {
     {
     .iv = 0,
     .lvl = 31,
@@ -2005,7 +2005,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Dean[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Rodney[] = {
+static const struct TrainerMonCustomized sParty_Rodney[] = {
     {
     .iv = 0,
     .lvl = 34,
@@ -2013,7 +2013,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Rodney[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Richard[] = {
+static const struct TrainerMonCustomized sParty_Richard[] = {
     {
     .iv = 0,
     .lvl = 34,
@@ -2021,7 +2021,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Richard[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Herman[] = {
+static const struct TrainerMonCustomized sParty_Herman[] = {
     {
     .iv = 0,
     .lvl = 33,
@@ -2034,7 +2034,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Herman[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Santiago[] = {
+static const struct TrainerMonCustomized sParty_Santiago[] = {
     {
     .iv = 0,
     .lvl = 33,
@@ -2047,7 +2047,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Santiago[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Gilbert[] = {
+static const struct TrainerMonCustomized sParty_Gilbert[] = {
     {
     .iv = 0,
     .lvl = 34,
@@ -2055,7 +2055,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Gilbert[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Franklin[] = {
+static const struct TrainerMonCustomized sParty_Franklin[] = {
     {
     .iv = 0,
     .lvl = 34,
@@ -2063,7 +2063,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Franklin[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Kevin[] = {
+static const struct TrainerMonCustomized sParty_Kevin[] = {
     {
     .iv = 0,
     .lvl = 34,
@@ -2071,7 +2071,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Kevin[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Jack[] = {
+static const struct TrainerMonCustomized sParty_Jack[] = {
     {
     .iv = 0,
     .lvl = 34,
@@ -2079,7 +2079,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Jack[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Dudley[] = {
+static const struct TrainerMonCustomized sParty_Dudley[] = {
     {
     .iv = 0,
     .lvl = 33,
@@ -2097,7 +2097,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Dudley[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Chad[] = {
+static const struct TrainerMonCustomized sParty_Chad[] = {
     {
     .iv = 0,
     .lvl = 33,
@@ -2110,7 +2110,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Chad[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Tony2[] = {
+static const struct TrainerMonCustomized sParty_Tony2[] = {
     {
     .iv = 10,
     .lvl = 30,
@@ -2118,7 +2118,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Tony2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Tony3[] = {
+static const struct TrainerMonCustomized sParty_Tony3[] = {
     {
     .iv = 20,
     .lvl = 33,
@@ -2126,7 +2126,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Tony3[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Tony4[] = {
+static const struct TrainerMonCustomized sParty_Tony4[] = {
     {
     .iv = 30,
     .lvl = 34,
@@ -2139,7 +2139,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Tony4[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Tony5[] = {
+static const struct TrainerMonCustomized sParty_Tony5[] = {
     {
     .iv = 40,
     .lvl = 37,
@@ -2152,7 +2152,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Tony5[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Takao[] = {
+static const struct TrainerMonCustomized sParty_Takao[] = {
     {
     .iv = 127,
     .lvl = 13,
@@ -2160,7 +2160,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Takao[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Hitoshi[] = {
+static const struct TrainerMonCustomized sParty_Hitoshi[] = {
     {
     .iv = 50,
     .lvl = 32,
@@ -2173,7 +2173,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Hitoshi[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Kiyo[] = {
+static const struct TrainerMonCustomized sParty_Kiyo[] = {
     {
     .iv = 100,
     .lvl = 34,
@@ -2181,7 +2181,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Kiyo[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Koichi[] = {
+static const struct TrainerMonCustomized sParty_Koichi[] = {
     {
     .iv = 100,
     .lvl = 24,
@@ -2194,7 +2194,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Koichi[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Nob1[] = {
+static const struct TrainerMonCustomized sParty_Nob1[] = {
     {
     .iv = 100,
     .lvl = 19,
@@ -2202,7 +2202,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Nob1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Nob2[] = {
+static const struct TrainerMonCustomized sParty_Nob2[] = {
     {
     .iv = 110,
     .lvl = 27,
@@ -2210,7 +2210,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Nob2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Nob3[] = {
+static const struct TrainerMonCustomized sParty_Nob3[] = {
     {
     .iv = 120,
     .lvl = 29,
@@ -2223,7 +2223,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Nob3[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Nob4[] = {
+static const struct TrainerMonCustomized sParty_Nob4[] = {
     {
     .iv = 130,
     .lvl = 31,
@@ -2268,7 +2268,7 @@ static const struct TrainerMonCustomized sParty_Nob5[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Yuji[] = {
+static const struct TrainerMonCustomized sParty_Yuji[] = {
     {
     .iv = 100,
     .lvl = 26,
@@ -2281,7 +2281,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Yuji[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Daisuke[] = {
+static const struct TrainerMonCustomized sParty_Daisuke[] = {
     {
     .iv = 100,
     .lvl = 19,
@@ -2289,7 +2289,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Daisuke[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Atsushi[] = {
+static const struct TrainerMonCustomized sParty_Atsushi[] = {
     {
     .iv = 100,
     .lvl = 32,
@@ -2312,7 +2312,7 @@ static const struct TrainerMonCustomized sParty_Kirk[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout7[] = {
+static const struct TrainerMonCustomized sParty_GruntAquaHideout7[] = {
     {
     .iv = 0,
     .lvl = 31,
@@ -2325,7 +2325,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout7[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout8[] = {
+static const struct TrainerMonCustomized sParty_GruntAquaHideout8[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -2333,7 +2333,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout8[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Shawn[] = {
+static const struct TrainerMonCustomized sParty_Shawn[] = {
     {
     .iv = 100,
     .lvl = 17,
@@ -2346,7 +2346,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Shawn[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Fernando1[] = {
+static const struct TrainerMonCustomized sParty_Fernando1[] = {
     {
     .iv = 0,
     .lvl = 30,
@@ -2359,7 +2359,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Fernando1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Dalton1[] = {
+static const struct TrainerMonCustomized sParty_Dalton1[] = {
     {
     .iv = 0,
     .lvl = 15,
@@ -2372,7 +2372,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Dalton1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Dalton2[] = {
+static const struct TrainerMonCustomized sParty_Dalton2[] = {
     {
     .iv = 10,
     .lvl = 25,
@@ -2390,7 +2390,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Dalton2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Dalton3[] = {
+static const struct TrainerMonCustomized sParty_Dalton3[] = {
     {
     .iv = 20,
     .lvl = 28,
@@ -2408,7 +2408,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Dalton3[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Dalton4[] = {
+static const struct TrainerMonCustomized sParty_Dalton4[] = {
     {
     .iv = 30,
     .lvl = 31,
@@ -2426,7 +2426,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Dalton4[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Dalton5[] = {
+static const struct TrainerMonCustomized sParty_Dalton5[] = {
     {
     .iv = 40,
     .lvl = 34,
@@ -2444,7 +2444,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Dalton5[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Cole[] = {
+static const struct TrainerMonCustomized sParty_Cole[] = {
     {
     .iv = 100,
     .lvl = 23,
@@ -2452,7 +2452,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Cole[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Jeff[] = {
+static const struct TrainerMonCustomized sParty_Jeff[] = {
     {
     .iv = 100,
     .lvl = 22,
@@ -2465,7 +2465,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Jeff[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Axle[] = {
+static const struct TrainerMonCustomized sParty_Axle[] = {
     {
     .iv = 100,
     .lvl = 23,
@@ -2473,7 +2473,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Axle[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Jace[] = {
+static const struct TrainerMonCustomized sParty_Jace[] = {
     {
     .iv = 100,
     .lvl = 23,
@@ -2481,7 +2481,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Jace[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Keegan[] = {
+static const struct TrainerMonCustomized sParty_Keegan[] = {
     {
     .iv = 120,
     .lvl = 23,
@@ -2489,7 +2489,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Keegan[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Bernie1[] = {
+static const struct TrainerMonCustomized sParty_Bernie1[] = {
     {
     .iv = 0,
     .lvl = 18,
@@ -2502,7 +2502,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Bernie1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Bernie2[] = {
+static const struct TrainerMonCustomized sParty_Bernie2[] = {
     {
     .iv = 10,
     .lvl = 26,
@@ -2515,7 +2515,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Bernie2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Bernie3[] = {
+static const struct TrainerMonCustomized sParty_Bernie3[] = {
     {
     .iv = 20,
     .lvl = 29,
@@ -2528,7 +2528,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Bernie3[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Bernie4[] = {
+static const struct TrainerMonCustomized sParty_Bernie4[] = {
     {
     .iv = 30,
     .lvl = 32,
@@ -2541,7 +2541,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Bernie4[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Bernie5[] = {
+static const struct TrainerMonCustomized sParty_Bernie5[] = {
     {
     .iv = 40,
     .lvl = 35,
@@ -2584,7 +2584,7 @@ static const struct TrainerMonCustomized sParty_Beau[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Larry[] = {
+static const struct TrainerMonCustomized sParty_Larry[] = {
     {
     .iv = 0,
     .lvl = 18,
@@ -2592,7 +2592,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Larry[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Shane[] = {
+static const struct TrainerMonCustomized sParty_Shane[] = {
     {
     .iv = 0,
     .lvl = 18,
@@ -2605,7 +2605,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Shane[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Justin[] = {
+static const struct TrainerMonCustomized sParty_Justin[] = {
     {
     .iv = 0,
     .lvl = 24,
@@ -2613,7 +2613,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Justin[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Ethan1[] = {
+static const struct TrainerMonCustomized sParty_Ethan1[] = {
     {
     .iv = 0,
     .lvl = 20,
@@ -2626,7 +2626,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Ethan1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Autumn[] = {
+static const struct TrainerMonCustomized sParty_Autumn[] = {
     {
     .iv = 0,
     .lvl = 21,
@@ -2634,7 +2634,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Autumn[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Travis[] = {
+static const struct TrainerMonCustomized sParty_Travis[] = {
     {
     .iv = 0,
     .lvl = 18,
@@ -2642,7 +2642,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Travis[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Ethan2[] = {
+static const struct TrainerMonCustomized sParty_Ethan2[] = {
     {
     .iv = 10,
     .lvl = 26,
@@ -2655,7 +2655,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Ethan2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Ethan3[] = {
+static const struct TrainerMonCustomized sParty_Ethan3[] = {
     {
     .iv = 20,
     .lvl = 29,
@@ -2668,7 +2668,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Ethan3[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Ethan4[] = {
+static const struct TrainerMonCustomized sParty_Ethan4[] = {
     {
     .iv = 30,
     .lvl = 31,
@@ -2686,7 +2686,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Ethan4[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Ethan5[] = {
+static const struct TrainerMonCustomized sParty_Ethan5[] = {
     {
     .iv = 40,
     .lvl = 34,
@@ -2704,7 +2704,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Ethan5[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Brent[] = {
+static const struct TrainerMonCustomized sParty_Brent[] = {
     {
     .iv = 100,
     .lvl = 26,
@@ -2712,7 +2712,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Brent[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Donald[] = {
+static const struct TrainerMonCustomized sParty_Donald[] = {
     {
     .iv = 100,
     .lvl = 24,
@@ -2730,7 +2730,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Donald[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Taylor[] = {
+static const struct TrainerMonCustomized sParty_Taylor[] = {
     {
     .iv = 100,
     .lvl = 27,
@@ -2748,7 +2748,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Taylor[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Jeffrey1[] = {
+static const struct TrainerMonCustomized sParty_Jeffrey1[] = {
     {
     .iv = 0,
     .lvl = 27,
@@ -2766,7 +2766,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Jeffrey1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Derek[] = {
+static const struct TrainerMonCustomized sParty_Derek[] = {
     {
     .iv = 150,
     .lvl = 16,
@@ -2779,7 +2779,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Derek[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Jeffrey2[] = {
+static const struct TrainerMonCustomized sParty_Jeffrey2[] = {
     {
     .iv = 10,
     .lvl = 31,
@@ -2797,7 +2797,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Jeffrey2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Jeffrey3[] = {
+static const struct TrainerMonCustomized sParty_Jeffrey3[] = {
     {
     .iv = 20,
     .lvl = 34,
@@ -2815,7 +2815,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Jeffrey3[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Jeffrey4[] = {
+static const struct TrainerMonCustomized sParty_Jeffrey4[] = {
     {
     .iv = 30,
     .lvl = 36,
@@ -2880,7 +2880,7 @@ static const struct TrainerMonCustomized sParty_Edward[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Preston[] = {
+static const struct TrainerMonCustomized sParty_Preston[] = {
     {
     .iv = 100,
     .lvl = 36,
@@ -2888,7 +2888,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Preston[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Virgil[] = {
+static const struct TrainerMonCustomized sParty_Virgil[] = {
     {
     .iv = 100,
     .lvl = 36,
@@ -2896,7 +2896,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Virgil[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Blake[] = {
+static const struct TrainerMonCustomized sParty_Blake[] = {
     {
     .iv = 100,
     .lvl = 36,
@@ -2904,7 +2904,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Blake[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_William[] = {
+static const struct TrainerMonCustomized sParty_William[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -2922,7 +2922,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_William[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Joshua[] = {
+static const struct TrainerMonCustomized sParty_Joshua[] = {
     {
     .iv = 0,
     .lvl = 41,
@@ -2935,7 +2935,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Joshua[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Cameron1[] = {
+static const struct TrainerMonCustomized sParty_Cameron1[] = {
     {
     .iv = 0,
     .lvl = 31,
@@ -2943,7 +2943,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Cameron1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Cameron2[] = {
+static const struct TrainerMonCustomized sParty_Cameron2[] = {
     {
     .iv = 10,
     .lvl = 33,
@@ -2956,7 +2956,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Cameron2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Cameron3[] = {
+static const struct TrainerMonCustomized sParty_Cameron3[] = {
     {
     .iv = 20,
     .lvl = 38,
@@ -2969,7 +2969,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Cameron3[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Cameron4[] = {
+static const struct TrainerMonCustomized sParty_Cameron4[] = {
     {
     .iv = 30,
     .lvl = 41,
@@ -2982,7 +2982,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Cameron4[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Cameron5[] = {
+static const struct TrainerMonCustomized sParty_Cameron5[] = {
     {
     .iv = 40,
     .lvl = 45,
@@ -3004,7 +3004,7 @@ static const struct TrainerMonCustomized sParty_Jaclyn[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Hannah[] = {
+static const struct TrainerMonCustomized sParty_Hannah[] = {
     {
     .iv = 100,
     .lvl = 36,
@@ -3012,7 +3012,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Hannah[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Samantha[] = {
+static const struct TrainerMonCustomized sParty_Samantha[] = {
     {
     .iv = 100,
     .lvl = 36,
@@ -3020,7 +3020,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Samantha[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Maura[] = {
+static const struct TrainerMonCustomized sParty_Maura[] = {
     {
     .iv = 100,
     .lvl = 36,
@@ -3028,7 +3028,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Maura[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Kayla[] = {
+static const struct TrainerMonCustomized sParty_Kayla[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -3046,7 +3046,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Kayla[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Alexis[] = {
+static const struct TrainerMonCustomized sParty_Alexis[] = {
     {
     .iv = 0,
     .lvl = 41,
@@ -3059,7 +3059,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Alexis[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Jacki1[] = {
+static const struct TrainerMonCustomized sParty_Jacki1[] = {
     {
     .iv = 0,
     .lvl = 30,
@@ -3072,7 +3072,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Jacki1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Jacki2[] = {
+static const struct TrainerMonCustomized sParty_Jacki2[] = {
     {
     .iv = 10,
     .lvl = 34,
@@ -3085,7 +3085,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Jacki2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Jacki3[] = {
+static const struct TrainerMonCustomized sParty_Jacki3[] = {
     {
     .iv = 20,
     .lvl = 37,
@@ -3098,7 +3098,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Jacki3[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Jacki4[] = {
+static const struct TrainerMonCustomized sParty_Jacki4[] = {
     {
     .iv = 30,
     .lvl = 40,
@@ -3111,7 +3111,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Jacki4[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Jacki5[] = {
+static const struct TrainerMonCustomized sParty_Jacki5[] = {
     {
     .iv = 40,
     .lvl = 43,
@@ -3124,7 +3124,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Jacki5[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Walter1[] = {
+static const struct TrainerMonCustomized sParty_Walter1[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -3132,7 +3132,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Walter1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Micah[] = {
+static const struct TrainerMonCustomized sParty_Micah[] = {
     {
     .iv = 0,
     .lvl = 44,
@@ -3145,7 +3145,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Micah[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Thomas[] = {
+static const struct TrainerMonCustomized sParty_Thomas[] = {
     {
     .iv = 0,
     .lvl = 45,
@@ -3153,7 +3153,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Thomas[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Walter2[] = {
+static const struct TrainerMonCustomized sParty_Walter2[] = {
     {
     .iv = 10,
     .lvl = 34,
@@ -3612,7 +3612,7 @@ static const struct TrainerMonCustomized sParty_Juan1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Jerry1[] = {
+static const struct TrainerMonCustomized sParty_Jerry1[] = {
     {
     .iv = 10,
     .lvl = 9,
@@ -3620,7 +3620,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Jerry1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Ted[] = {
+static const struct TrainerMonCustomized sParty_Ted[] = {
     {
     .iv = 10,
     .lvl = 17,
@@ -3628,7 +3628,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Ted[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Paul[] = {
+static const struct TrainerMonCustomized sParty_Paul[] = {
     {
     .iv = 10,
     .lvl = 15,
@@ -3646,7 +3646,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Paul[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Jerry2[] = {
+static const struct TrainerMonCustomized sParty_Jerry2[] = {
     {
     .iv = 20,
     .lvl = 26,
@@ -3659,7 +3659,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Jerry2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Jerry3[] = {
+static const struct TrainerMonCustomized sParty_Jerry3[] = {
     {
     .iv = 30,
     .lvl = 29,
@@ -3672,7 +3672,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Jerry3[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Jerry4[] = {
+static const struct TrainerMonCustomized sParty_Jerry4[] = {
     {
     .iv = 40,
     .lvl = 32,
@@ -3685,7 +3685,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Jerry4[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Jerry5[] = {
+static const struct TrainerMonCustomized sParty_Jerry5[] = {
     {
     .iv = 50,
     .lvl = 34,
@@ -3703,7 +3703,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Jerry5[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Karen1[] = {
+static const struct TrainerMonCustomized sParty_Karen1[] = {
     {
     .iv = 10,
     .lvl = 9,
@@ -3711,7 +3711,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Karen1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Georgia[] = {
+static const struct TrainerMonCustomized sParty_Georgia[] = {
     {
     .iv = 10,
     .lvl = 16,
@@ -3724,7 +3724,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Georgia[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Karen2[] = {
+static const struct TrainerMonCustomized sParty_Karen2[] = {
     {
     .iv = 20,
     .lvl = 26,
@@ -3737,7 +3737,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Karen2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Karen3[] = {
+static const struct TrainerMonCustomized sParty_Karen3[] = {
     {
     .iv = 30,
     .lvl = 29,
@@ -3750,7 +3750,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Karen3[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Karen4[] = {
+static const struct TrainerMonCustomized sParty_Karen4[] = {
     {
     .iv = 40,
     .lvl = 32,
@@ -3763,7 +3763,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Karen4[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Karen5[] = {
+static const struct TrainerMonCustomized sParty_Karen5[] = {
     {
     .iv = 50,
     .lvl = 35,
@@ -4085,7 +4085,7 @@ static const struct TrainerMonCustomized sParty_Isabel5[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Timothy1[] = {
+static const struct TrainerMonCustomized sParty_Timothy1[] = {
     {
     .iv = 200,
     .lvl = 27,
@@ -4138,7 +4138,7 @@ static const struct TrainerMonCustomized sParty_Vicky[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Shelby1[] = {
+static const struct TrainerMonCustomized sParty_Shelby1[] = {
     {
     .iv = 200,
     .lvl = 21,
@@ -4151,7 +4151,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Shelby1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Shelby2[] = {
+static const struct TrainerMonCustomized sParty_Shelby2[] = {
     {
     .iv = 210,
     .lvl = 30,
@@ -4164,7 +4164,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Shelby2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Shelby3[] = {
+static const struct TrainerMonCustomized sParty_Shelby3[] = {
     {
     .iv = 220,
     .lvl = 33,
@@ -4177,7 +4177,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Shelby3[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Shelby4[] = {
+static const struct TrainerMonCustomized sParty_Shelby4[] = {
     {
     .iv = 230,
     .lvl = 36,
@@ -4190,7 +4190,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Shelby4[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Shelby5[] = {
+static const struct TrainerMonCustomized sParty_Shelby5[] = {
     {
     .iv = 240,
     .lvl = 39,
@@ -4203,7 +4203,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Shelby5[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Calvin1[] = {
+static const struct TrainerMonCustomized sParty_Calvin1[] = {
     {
     .iv = 0,
     .lvl = 5,
@@ -4211,7 +4211,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Calvin1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Billy[] = {
+static const struct TrainerMonCustomized sParty_Billy[] = {
     {
     .iv = 0,
     .lvl = 5,
@@ -4233,7 +4233,7 @@ static const struct TrainerMonCustomized sParty_Josh[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Tommy[] = {
+static const struct TrainerMonCustomized sParty_Tommy[] = {
     {
     .iv = 110,
     .lvl = 8,
@@ -4246,7 +4246,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Tommy[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Joey[] = {
+static const struct TrainerMonCustomized sParty_Joey[] = {
     {
     .iv = 0,
     .lvl = 9,
@@ -4299,7 +4299,7 @@ static const struct TrainerMonCustomized sParty_Katelynn[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Jaylen[] = {
+static const struct TrainerMonCustomized sParty_Jaylen[] = {
     {
     .iv = 0,
     .lvl = 19,
@@ -4307,7 +4307,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Jaylen[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Dillon[] = {
+static const struct TrainerMonCustomized sParty_Dillon[] = {
     {
     .iv = 0,
     .lvl = 19,
@@ -4315,7 +4315,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Dillon[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Calvin2[] = {
+static const struct TrainerMonCustomized sParty_Calvin2[] = {
     {
     .iv = 10,
     .lvl = 27,
@@ -4323,7 +4323,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Calvin2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Calvin3[] = {
+static const struct TrainerMonCustomized sParty_Calvin3[] = {
     {
     .iv = 20,
     .lvl = 28,
@@ -4336,7 +4336,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Calvin3[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Calvin4[] = {
+static const struct TrainerMonCustomized sParty_Calvin4[] = {
     {
     .iv = 30,
     .lvl = 31,
@@ -4354,7 +4354,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Calvin4[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Calvin5[] = {
+static const struct TrainerMonCustomized sParty_Calvin5[] = {
     {
     .iv = 40,
     .lvl = 34,
@@ -4372,7 +4372,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Calvin5[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Eddie[] = {
+static const struct TrainerMonCustomized sParty_Eddie[] = {
     {
     .iv = 0,
     .lvl = 14,
@@ -4385,7 +4385,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Eddie[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Allen[] = {
+static const struct TrainerMonCustomized sParty_Allen[] = {
     {
     .iv = 0,
     .lvl = 4,
@@ -4398,7 +4398,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Allen[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Timmy[] = {
+static const struct TrainerMonCustomized sParty_Timmy[] = {
     {
     .iv = 0,
     .lvl = 15,
@@ -4456,7 +4456,7 @@ static const struct TrainerMonCustomized sParty_Wallace[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Andrew[] = {
+static const struct TrainerMonCustomized sParty_Andrew[] = {
     {
     .iv = 0,
     .lvl = 5,
@@ -4474,7 +4474,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Andrew[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Ivan[] = {
+static const struct TrainerMonCustomized sParty_Ivan[] = {
     {
     .iv = 0,
     .lvl = 5,
@@ -4492,7 +4492,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Ivan[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Claude[] = {
+static const struct TrainerMonCustomized sParty_Claude[] = {
     {
     .iv = 0,
     .lvl = 16,
@@ -4510,7 +4510,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Claude[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Elliot1[] = {
+static const struct TrainerMonCustomized sParty_Elliot1[] = {
     {
     .iv = 0,
     .lvl = 10,
@@ -4528,7 +4528,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Elliot1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Ned[] = {
+static const struct TrainerMonCustomized sParty_Ned[] = {
     {
     .iv = 10,
     .lvl = 11,
@@ -4536,7 +4536,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Ned[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Dale[] = {
+static const struct TrainerMonCustomized sParty_Dale[] = {
     {
     .iv = 0,
     .lvl = 11,
@@ -4559,7 +4559,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Dale[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Nolan[] = {
+static const struct TrainerMonCustomized sParty_Nolan[] = {
     {
     .iv = 0,
     .lvl = 19,
@@ -4567,7 +4567,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Nolan[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Barny[] = {
+static const struct TrainerMonCustomized sParty_Barny[] = {
     {
     .iv = 0,
     .lvl = 25,
@@ -4580,7 +4580,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Barny[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Wade[] = {
+static const struct TrainerMonCustomized sParty_Wade[] = {
     {
     .iv = 0,
     .lvl = 16,
@@ -4588,7 +4588,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Wade[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Carter[] = {
+static const struct TrainerMonCustomized sParty_Carter[] = {
     {
     .iv = 10,
     .lvl = 25,
@@ -4601,7 +4601,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Carter[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Elliot2[] = {
+static const struct TrainerMonCustomized sParty_Elliot2[] = {
     {
     .iv = 10,
     .lvl = 24,
@@ -4619,7 +4619,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Elliot2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Elliot3[] = {
+static const struct TrainerMonCustomized sParty_Elliot3[] = {
     {
     .iv = 20,
     .lvl = 29,
@@ -4642,7 +4642,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Elliot3[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Elliot4[] = {
+static const struct TrainerMonCustomized sParty_Elliot4[] = {
     {
     .iv = 30,
     .lvl = 31,
@@ -4665,7 +4665,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Elliot4[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Elliot5[] = {
+static const struct TrainerMonCustomized sParty_Elliot5[] = {
     {
     .iv = 40,
     .lvl = 33,
@@ -4688,7 +4688,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Elliot5[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Ronald[] = {
+static const struct TrainerMonCustomized sParty_Ronald[] = {
     {
     .iv = 0,
     .lvl = 19,
@@ -4721,7 +4721,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Ronald[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Jacob[] = {
+static const struct TrainerMonCustomized sParty_Jacob[] = {
     {
     .iv = 20,
     .lvl = 6,
@@ -4739,7 +4739,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Jacob[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Anthony[] = {
+static const struct TrainerMonCustomized sParty_Anthony[] = {
     {
     .iv = 0,
     .lvl = 14,
@@ -4752,7 +4752,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Anthony[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Benjamin1[] = {
+static const struct TrainerMonCustomized sParty_Benjamin1[] = {
     {
     .iv = 0,
     .lvl = 16,
@@ -4760,7 +4760,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Benjamin1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Benjamin2[] = {
+static const struct TrainerMonCustomized sParty_Benjamin2[] = {
     {
     .iv = 10,
     .lvl = 30,
@@ -4768,7 +4768,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Benjamin2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Benjamin3[] = {
+static const struct TrainerMonCustomized sParty_Benjamin3[] = {
     {
     .iv = 20,
     .lvl = 33,
@@ -4776,7 +4776,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Benjamin3[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Benjamin4[] = {
+static const struct TrainerMonCustomized sParty_Benjamin4[] = {
     {
     .iv = 30,
     .lvl = 36,
@@ -4784,7 +4784,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Benjamin4[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Benjamin5[] = {
+static const struct TrainerMonCustomized sParty_Benjamin5[] = {
     {
     .iv = 40,
     .lvl = 39,
@@ -4792,7 +4792,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Benjamin5[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Abigail1[] = {
+static const struct TrainerMonCustomized sParty_Abigail1[] = {
     {
     .iv = 0,
     .lvl = 16,
@@ -4800,7 +4800,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Abigail1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Jasmine[] = {
+static const struct TrainerMonCustomized sParty_Jasmine[] = {
     {
     .iv = 80,
     .lvl = 14,
@@ -4818,7 +4818,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Jasmine[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Abigail2[] = {
+static const struct TrainerMonCustomized sParty_Abigail2[] = {
     {
     .iv = 10,
     .lvl = 28,
@@ -4826,7 +4826,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Abigail2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Abigail3[] = {
+static const struct TrainerMonCustomized sParty_Abigail3[] = {
     {
     .iv = 20,
     .lvl = 31,
@@ -4834,7 +4834,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Abigail3[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Abigail4[] = {
+static const struct TrainerMonCustomized sParty_Abigail4[] = {
     {
     .iv = 30,
     .lvl = 34,
@@ -4842,7 +4842,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Abigail4[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Abigail5[] = {
+static const struct TrainerMonCustomized sParty_Abigail5[] = {
     {
     .iv = 40,
     .lvl = 37,
@@ -4850,7 +4850,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Abigail5[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Dylan1[] = {
+static const struct TrainerMonCustomized sParty_Dylan1[] = {
     {
     .iv = 0,
     .lvl = 17,
@@ -4858,7 +4858,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Dylan1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Dylan2[] = {
+static const struct TrainerMonCustomized sParty_Dylan2[] = {
     {
     .iv = 10,
     .lvl = 28,
@@ -4866,7 +4866,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Dylan2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Dylan3[] = {
+static const struct TrainerMonCustomized sParty_Dylan3[] = {
     {
     .iv = 20,
     .lvl = 31,
@@ -4874,7 +4874,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Dylan3[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Dylan4[] = {
+static const struct TrainerMonCustomized sParty_Dylan4[] = {
     {
     .iv = 30,
     .lvl = 34,
@@ -4882,7 +4882,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Dylan4[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Dylan5[] = {
+static const struct TrainerMonCustomized sParty_Dylan5[] = {
     {
     .iv = 40,
     .lvl = 37,
@@ -4890,7 +4890,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Dylan5[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Maria1[] = {
+static const struct TrainerMonCustomized sParty_Maria1[] = {
     {
     .iv = 0,
     .lvl = 17,
@@ -4898,7 +4898,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Maria1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Maria2[] = {
+static const struct TrainerMonCustomized sParty_Maria2[] = {
     {
     .iv = 10,
     .lvl = 28,
@@ -4906,7 +4906,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Maria2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Maria3[] = {
+static const struct TrainerMonCustomized sParty_Maria3[] = {
     {
     .iv = 20,
     .lvl = 31,
@@ -4914,7 +4914,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Maria3[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Maria4[] = {
+static const struct TrainerMonCustomized sParty_Maria4[] = {
     {
     .iv = 30,
     .lvl = 34,
@@ -4922,7 +4922,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Maria4[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Maria5[] = {
+static const struct TrainerMonCustomized sParty_Maria5[] = {
     {
     .iv = 40,
     .lvl = 37,
@@ -4930,7 +4930,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Maria5[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Camden[] = {
+static const struct TrainerMonCustomized sParty_Camden[] = {
     {
     .iv = 0,
     .lvl = 33,
@@ -4943,7 +4943,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Camden[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Demetrius[] = {
+static const struct TrainerMonCustomized sParty_Demetrius[] = {
     {
     .iv = 0,
     .lvl = 25,
@@ -4956,7 +4956,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Demetrius[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Isaiah1[] = {
+static const struct TrainerMonCustomized sParty_Isaiah1[] = {
     {
     .iv = 0,
     .lvl = 35,
@@ -4964,7 +4964,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Isaiah1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Pablo1[] = {
+static const struct TrainerMonCustomized sParty_Pablo1[] = {
     {
     .iv = 0,
     .lvl = 33,
@@ -4977,7 +4977,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Pablo1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Chase[] = {
+static const struct TrainerMonCustomized sParty_Chase[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -4990,7 +4990,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Chase[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Isaiah2[] = {
+static const struct TrainerMonCustomized sParty_Isaiah2[] = {
     {
     .iv = 10,
     .lvl = 39,
@@ -4998,7 +4998,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Isaiah2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Isaiah3[] = {
+static const struct TrainerMonCustomized sParty_Isaiah3[] = {
     {
     .iv = 20,
     .lvl = 42,
@@ -5006,7 +5006,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Isaiah3[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Isaiah4[] = {
+static const struct TrainerMonCustomized sParty_Isaiah4[] = {
     {
     .iv = 30,
     .lvl = 45,
@@ -5014,7 +5014,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Isaiah4[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Isaiah5[] = {
+static const struct TrainerMonCustomized sParty_Isaiah5[] = {
     {
     .iv = 40,
     .lvl = 48,
@@ -5022,7 +5022,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Isaiah5[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Isobel[] = {
+static const struct TrainerMonCustomized sParty_Isobel[] = {
     {
     .iv = 0,
     .lvl = 34,
@@ -5030,7 +5030,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Isobel[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Donny[] = {
+static const struct TrainerMonCustomized sParty_Donny[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -5043,7 +5043,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Donny[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Talia[] = {
+static const struct TrainerMonCustomized sParty_Talia[] = {
     {
     .iv = 0,
     .lvl = 34,
@@ -5051,7 +5051,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Talia[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Katelyn1[] = {
+static const struct TrainerMonCustomized sParty_Katelyn1[] = {
     {
     .iv = 0,
     .lvl = 35,
@@ -5059,7 +5059,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Katelyn1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Allison[] = {
+static const struct TrainerMonCustomized sParty_Allison[] = {
     {
     .iv = 0,
     .lvl = 27,
@@ -5072,7 +5072,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Allison[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Katelyn2[] = {
+static const struct TrainerMonCustomized sParty_Katelyn2[] = {
     {
     .iv = 10,
     .lvl = 39,
@@ -5080,7 +5080,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Katelyn2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Katelyn3[] = {
+static const struct TrainerMonCustomized sParty_Katelyn3[] = {
     {
     .iv = 20,
     .lvl = 42,
@@ -5088,7 +5088,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Katelyn3[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Katelyn4[] = {
+static const struct TrainerMonCustomized sParty_Katelyn4[] = {
     {
     .iv = 30,
     .lvl = 45,
@@ -5096,7 +5096,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Katelyn4[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Katelyn5[] = {
+static const struct TrainerMonCustomized sParty_Katelyn5[] = {
     {
     .iv = 40,
     .lvl = 48,
@@ -5104,7 +5104,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Katelyn5[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Nicolas1[] = {
+static const struct TrainerMonCustomized sParty_Nicolas1[] = {
     {
     .iv = 100,
     .lvl = 37,
@@ -5117,7 +5117,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Nicolas1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Nicolas2[] = {
+static const struct TrainerMonCustomized sParty_Nicolas2[] = {
     {
     .iv = 110,
     .lvl = 41,
@@ -5130,7 +5130,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Nicolas2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Nicolas3[] = {
+static const struct TrainerMonCustomized sParty_Nicolas3[] = {
     {
     .iv = 120,
     .lvl = 44,
@@ -5143,7 +5143,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Nicolas3[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Nicolas4[] = {
+static const struct TrainerMonCustomized sParty_Nicolas4[] = {
     {
     .iv = 130,
     .lvl = 46,
@@ -5191,7 +5191,7 @@ static const struct TrainerMonCustomized sParty_Aaron[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Perry[] = {
+static const struct TrainerMonCustomized sParty_Perry[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -5199,7 +5199,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Perry[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Hugh[] = {
+static const struct TrainerMonCustomized sParty_Hugh[] = {
     {
     .iv = 0,
     .lvl = 25,
@@ -5212,7 +5212,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Hugh[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Phil[] = {
+static const struct TrainerMonCustomized sParty_Phil[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -5220,7 +5220,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Phil[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Jared[] = {
+static const struct TrainerMonCustomized sParty_Jared[] = {
     {
     .iv = 100,
     .lvl = 27,
@@ -5238,7 +5238,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Jared[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Humberto[] = {
+static const struct TrainerMonCustomized sParty_Humberto[] = {
     {
     .iv = 250,
     .lvl = 30,
@@ -5246,7 +5246,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Humberto[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Presley[] = {
+static const struct TrainerMonCustomized sParty_Presley[] = {
     {
     .iv = 0,
     .lvl = 33,
@@ -5259,7 +5259,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Presley[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Edwardo[] = {
+static const struct TrainerMonCustomized sParty_Edwardo[] = {
     {
     .iv = 150,
     .lvl = 29,
@@ -5272,7 +5272,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Edwardo[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Colin[] = {
+static const struct TrainerMonCustomized sParty_Colin[] = {
     {
     .iv = 0,
     .lvl = 28,
@@ -5285,7 +5285,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Colin[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Robert1[] = {
+static const struct TrainerMonCustomized sParty_Robert1[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -5293,7 +5293,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Robert1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Benny[] = {
+static const struct TrainerMonCustomized sParty_Benny[] = {
     {
     .iv = 0,
     .lvl = 36,
@@ -5311,7 +5311,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Benny[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Chester[] = {
+static const struct TrainerMonCustomized sParty_Chester[] = {
     {
     .iv = 0,
     .lvl = 25,
@@ -5324,7 +5324,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Chester[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Robert2[] = {
+static const struct TrainerMonCustomized sParty_Robert2[] = {
     {
     .iv = 10,
     .lvl = 32,
@@ -5337,7 +5337,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Robert2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Robert3[] = {
+static const struct TrainerMonCustomized sParty_Robert3[] = {
     {
     .iv = 20,
     .lvl = 35,
@@ -5350,7 +5350,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Robert3[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Robert4[] = {
+static const struct TrainerMonCustomized sParty_Robert4[] = {
     {
     .iv = 30,
     .lvl = 38,
@@ -5363,7 +5363,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Robert4[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Robert5[] = {
+static const struct TrainerMonCustomized sParty_Robert5[] = {
     {
     .iv = 40,
     .lvl = 41,
@@ -5376,7 +5376,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Robert5[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Alex[] = {
+static const struct TrainerMonCustomized sParty_Alex[] = {
     {
     .iv = 150,
     .lvl = 33,
@@ -5389,7 +5389,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Alex[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Beck[] = {
+static const struct TrainerMonCustomized sParty_Beck[] = {
     {
     .iv = 0,
     .lvl = 34,
@@ -5397,7 +5397,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Beck[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Yasu[] = {
+static const struct TrainerMonCustomized sParty_Yasu[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -5405,7 +5405,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Yasu[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Takashi[] = {
+static const struct TrainerMonCustomized sParty_Takashi[] = {
     {
     .iv = 0,
     .lvl = 25,
@@ -5435,7 +5435,7 @@ static const struct TrainerMonCustomized sParty_Dianne[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Jani[] = {
+static const struct TrainerMonCustomized sParty_Jani[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -5464,7 +5464,7 @@ static const struct TrainerMonCustomized sParty_Lao1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Lung[] = {
+static const struct TrainerMonCustomized sParty_Lung[] = {
     {
     .iv = 0,
     .lvl = 18,
@@ -5589,7 +5589,7 @@ static const struct TrainerMonCustomized sParty_Lao5[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Jocelyn[] = {
+static const struct TrainerMonCustomized sParty_Jocelyn[] = {
     {
     .iv = 127,
     .lvl = 13,
@@ -5597,7 +5597,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Jocelyn[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Laura[] = {
+static const struct TrainerMonCustomized sParty_Laura[] = {
     {
     .iv = 150,
     .lvl = 13,
@@ -5605,7 +5605,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Laura[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Cyndy1[] = {
+static const struct TrainerMonCustomized sParty_Cyndy1[] = {
     {
     .iv = 100,
     .lvl = 18,
@@ -5618,7 +5618,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Cyndy1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Cora[] = {
+static const struct TrainerMonCustomized sParty_Cora[] = {
     {
     .iv = 100,
     .lvl = 27,
@@ -5626,7 +5626,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Cora[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Paula[] = {
+static const struct TrainerMonCustomized sParty_Paula[] = {
     {
     .iv = 100,
     .lvl = 27,
@@ -5634,7 +5634,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Paula[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Cyndy2[] = {
+static const struct TrainerMonCustomized sParty_Cyndy2[] = {
     {
     .iv = 110,
     .lvl = 26,
@@ -5647,7 +5647,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Cyndy2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Cyndy3[] = {
+static const struct TrainerMonCustomized sParty_Cyndy3[] = {
     {
     .iv = 120,
     .lvl = 29,
@@ -5660,7 +5660,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Cyndy3[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Cyndy4[] = {
+static const struct TrainerMonCustomized sParty_Cyndy4[] = {
     {
     .iv = 130,
     .lvl = 32,
@@ -5673,7 +5673,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Cyndy4[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Cyndy5[] = {
+static const struct TrainerMonCustomized sParty_Cyndy5[] = {
     {
     .iv = 140,
     .lvl = 35,
@@ -5695,7 +5695,7 @@ static const struct TrainerMonCustomized sParty_Madeline1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Clarissa[] = {
+static const struct TrainerMonCustomized sParty_Clarissa[] = {
     {
     .iv = 0,
     .lvl = 28,
@@ -5765,7 +5765,7 @@ static const struct TrainerMonCustomized sParty_Madeline5[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Beverly[] = {
+static const struct TrainerMonCustomized sParty_Beverly[] = {
     {
     .iv = 0,
     .lvl = 25,
@@ -5778,7 +5778,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Beverly[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Imani[] = {
+static const struct TrainerMonCustomized sParty_Imani[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -5786,7 +5786,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Imani[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Kyla[] = {
+static const struct TrainerMonCustomized sParty_Kyla[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -5794,7 +5794,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Kyla[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Denise[] = {
+static const struct TrainerMonCustomized sParty_Denise[] = {
     {
     .iv = 0,
     .lvl = 25,
@@ -5807,7 +5807,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Denise[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Beth[] = {
+static const struct TrainerMonCustomized sParty_Beth[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -5815,7 +5815,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Beth[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Tara[] = {
+static const struct TrainerMonCustomized sParty_Tara[] = {
     {
     .iv = 0,
     .lvl = 25,
@@ -5828,7 +5828,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Tara[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Missy[] = {
+static const struct TrainerMonCustomized sParty_Missy[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -5836,7 +5836,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Missy[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Alice[] = {
+static const struct TrainerMonCustomized sParty_Alice[] = {
     {
     .iv = 0,
     .lvl = 24,
@@ -5854,7 +5854,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Alice[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Jenny1[] = {
+static const struct TrainerMonCustomized sParty_Jenny1[] = {
     {
     .iv = 0,
     .lvl = 34,
@@ -5862,7 +5862,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Jenny1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grace[] = {
+static const struct TrainerMonCustomized sParty_Grace[] = {
     {
     .iv = 0,
     .lvl = 34,
@@ -5870,7 +5870,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grace[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Tanya[] = {
+static const struct TrainerMonCustomized sParty_Tanya[] = {
     {
     .iv = 0,
     .lvl = 34,
@@ -5878,7 +5878,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Tanya[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Sharon[] = {
+static const struct TrainerMonCustomized sParty_Sharon[] = {
     {
     .iv = 0,
     .lvl = 34,
@@ -5886,7 +5886,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Sharon[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Nikki[] = {
+static const struct TrainerMonCustomized sParty_Nikki[] = {
     {
     .iv = 0,
     .lvl = 33,
@@ -5899,7 +5899,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Nikki[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Brenda[] = {
+static const struct TrainerMonCustomized sParty_Brenda[] = {
     {
     .iv = 0,
     .lvl = 34,
@@ -5907,7 +5907,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Brenda[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Katie[] = {
+static const struct TrainerMonCustomized sParty_Katie[] = {
     {
     .iv = 0,
     .lvl = 33,
@@ -5920,7 +5920,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Katie[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Susie[] = {
+static const struct TrainerMonCustomized sParty_Susie[] = {
     {
     .iv = 0,
     .lvl = 34,
@@ -5928,7 +5928,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Susie[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Kara[] = {
+static const struct TrainerMonCustomized sParty_Kara[] = {
     {
     .iv = 0,
     .lvl = 34,
@@ -5936,7 +5936,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Kara[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Dana[] = {
+static const struct TrainerMonCustomized sParty_Dana[] = {
     {
     .iv = 0,
     .lvl = 34,
@@ -5944,7 +5944,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Dana[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Sienna[] = {
+static const struct TrainerMonCustomized sParty_Sienna[] = {
     {
     .iv = 0,
     .lvl = 33,
@@ -5957,7 +5957,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Sienna[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Debra[] = {
+static const struct TrainerMonCustomized sParty_Debra[] = {
     {
     .iv = 0,
     .lvl = 34,
@@ -5965,7 +5965,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Debra[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Linda[] = {
+static const struct TrainerMonCustomized sParty_Linda[] = {
     {
     .iv = 0,
     .lvl = 33,
@@ -5978,7 +5978,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Linda[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Kaylee[] = {
+static const struct TrainerMonCustomized sParty_Kaylee[] = {
     {
     .iv = 0,
     .lvl = 34,
@@ -5991,7 +5991,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Kaylee[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Laurel[] = {
+static const struct TrainerMonCustomized sParty_Laurel[] = {
     {
     .iv = 0,
     .lvl = 33,
@@ -6004,7 +6004,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Laurel[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Carlee[] = {
+static const struct TrainerMonCustomized sParty_Carlee[] = {
     {
     .iv = 0,
     .lvl = 35,
@@ -6012,7 +6012,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Carlee[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Jenny2[] = {
+static const struct TrainerMonCustomized sParty_Jenny2[] = {
     {
     .iv = 0,
     .lvl = 38,
@@ -6020,7 +6020,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Jenny2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Jenny3[] = {
+static const struct TrainerMonCustomized sParty_Jenny3[] = {
     {
     .iv = 0,
     .lvl = 41,
@@ -6028,7 +6028,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Jenny3[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Jenny4[] = {
+static const struct TrainerMonCustomized sParty_Jenny4[] = {
     {
     .iv = 0,
     .lvl = 43,
@@ -6041,7 +6041,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Jenny4[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Jenny5[] = {
+static const struct TrainerMonCustomized sParty_Jenny5[] = {
     {
     .iv = 0,
     .lvl = 45,
@@ -6089,7 +6089,7 @@ static const struct TrainerMonCustomized sParty_Becky[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Carol[] = {
+static const struct TrainerMonCustomized sParty_Carol[] = {
     {
     .iv = 0,
     .lvl = 17,
@@ -6102,7 +6102,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Carol[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Nancy[] = {
+static const struct TrainerMonCustomized sParty_Nancy[] = {
     {
     .iv = 0,
     .lvl = 18,
@@ -6115,7 +6115,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Nancy[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Martha[] = {
+static const struct TrainerMonCustomized sParty_Martha[] = {
     {
     .iv = 0,
     .lvl = 23,
@@ -6128,7 +6128,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Martha[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Diana1[] = {
+static const struct TrainerMonCustomized sParty_Diana1[] = {
     {
     .iv = 0,
     .lvl = 19,
@@ -6155,7 +6155,7 @@ static const struct TrainerMonCustomized sParty_Cedric[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Irene[] = {
+static const struct TrainerMonCustomized sParty_Irene[] = {
     {
     .iv = 0,
     .lvl = 17,
@@ -6168,7 +6168,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Irene[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Diana2[] = {
+static const struct TrainerMonCustomized sParty_Diana2[] = {
     {
     .iv = 10,
     .lvl = 25,
@@ -6186,7 +6186,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Diana2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Diana3[] = {
+static const struct TrainerMonCustomized sParty_Diana3[] = {
     {
     .iv = 20,
     .lvl = 28,
@@ -6204,7 +6204,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Diana3[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Diana4[] = {
+static const struct TrainerMonCustomized sParty_Diana4[] = {
     {
     .iv = 30,
     .lvl = 31,
@@ -6222,7 +6222,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Diana4[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Diana5[] = {
+static const struct TrainerMonCustomized sParty_Diana5[] = {
     {
     .iv = 40,
     .lvl = 40,
@@ -6240,7 +6240,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Diana5[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_AmyAndLiv1[] = {
+static const struct TrainerMonCustomized sParty_AmyAndLiv1[] = {
     {
     .iv = 0,
     .lvl = 15,
@@ -6253,7 +6253,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_AmyAndLiv1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_AmyAndLiv2[] = {
+static const struct TrainerMonCustomized sParty_AmyAndLiv2[] = {
     {
     .iv = 10,
     .lvl = 27,
@@ -6266,7 +6266,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_AmyAndLiv2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_GinaAndMia1[] = {
+static const struct TrainerMonCustomized sParty_GinaAndMia1[] = {
     {
     .iv = 0,
     .lvl = 6,
@@ -6279,7 +6279,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GinaAndMia1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_MiuAndYuki[] = {
+static const struct TrainerMonCustomized sParty_MiuAndYuki[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -6292,7 +6292,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_MiuAndYuki[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_AmyAndLiv3[] = {
+static const struct TrainerMonCustomized sParty_AmyAndLiv3[] = {
     {
     .iv = 0,
     .lvl = 9,
@@ -6320,7 +6320,7 @@ static const struct TrainerMonCustomized sParty_GinaAndMia2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_AmyAndLiv4[] = {
+static const struct TrainerMonCustomized sParty_AmyAndLiv4[] = {
     {
     .iv = 20,
     .lvl = 30,
@@ -6363,7 +6363,7 @@ static const struct TrainerMonCustomized sParty_AmyAndLiv6[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Huey[] = {
+static const struct TrainerMonCustomized sParty_Huey[] = {
     {
     .iv = 10,
     .lvl = 12,
@@ -6376,7 +6376,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Huey[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Edmond[] = {
+static const struct TrainerMonCustomized sParty_Edmond[] = {
     {
     .iv = 0,
     .lvl = 13,
@@ -6384,7 +6384,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Edmond[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Ernest1[] = {
+static const struct TrainerMonCustomized sParty_Ernest1[] = {
     {
     .iv = 0,
     .lvl = 33,
@@ -6397,7 +6397,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Ernest1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Dwayne[] = {
+static const struct TrainerMonCustomized sParty_Dwayne[] = {
     {
     .iv = 0,
     .lvl = 11,
@@ -6415,7 +6415,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Dwayne[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Phillip[] = {
+static const struct TrainerMonCustomized sParty_Phillip[] = {
     {
     .iv = 0,
     .lvl = 44,
@@ -6428,7 +6428,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Phillip[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Leonard[] = {
+static const struct TrainerMonCustomized sParty_Leonard[] = {
     {
     .iv = 0,
     .lvl = 43,
@@ -6446,7 +6446,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Leonard[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Duncan[] = {
+static const struct TrainerMonCustomized sParty_Duncan[] = {
     {
     .iv = 0,
     .lvl = 25,
@@ -6459,7 +6459,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Duncan[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Ernest2[] = {
+static const struct TrainerMonCustomized sParty_Ernest2[] = {
     {
     .iv = 10,
     .lvl = 36,
@@ -6477,7 +6477,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Ernest2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Ernest3[] = {
+static const struct TrainerMonCustomized sParty_Ernest3[] = {
     {
     .iv = 20,
     .lvl = 39,
@@ -6495,7 +6495,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Ernest3[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Ernest4[] = {
+static const struct TrainerMonCustomized sParty_Ernest4[] = {
     {
     .iv = 30,
     .lvl = 42,
@@ -6513,7 +6513,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Ernest4[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Ernest5[] = {
+static const struct TrainerMonCustomized sParty_Ernest5[] = {
     {
     .iv = 40,
     .lvl = 45,
@@ -6531,7 +6531,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Ernest5[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Eli[] = {
+static const struct TrainerMonCustomized sParty_Eli[] = {
     {
     .iv = 100,
     .lvl = 23,
@@ -6556,7 +6556,7 @@ static const struct TrainerMonCustomized sParty_Annika[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Jazmyn[] = {
+static const struct TrainerMonCustomized sParty_Jazmyn[] = {
     {
     .iv = 0,
     .lvl = 27,
@@ -6582,7 +6582,7 @@ static const struct TrainerMonCustomized sParty_Kayley[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Auron[] = {
+static const struct TrainerMonCustomized sParty_Auron[] = {
     {
     .iv = 0,
     .lvl = 33,
@@ -6595,7 +6595,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Auron[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Kelvin[] = {
+static const struct TrainerMonCustomized sParty_Kelvin[] = {
     {
     .iv = 150,
     .lvl = 33,
@@ -6618,7 +6618,7 @@ static const struct TrainerMonCustomized sParty_Marley[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Reyna[] = {
+static const struct TrainerMonCustomized sParty_Reyna[] = {
     {
     .iv = 50,
     .lvl = 33,
@@ -6631,7 +6631,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Reyna[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Hudson[] = {
+static const struct TrainerMonCustomized sParty_Hudson[] = {
     {
     .iv = 0,
     .lvl = 34,
@@ -6639,7 +6639,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Hudson[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Conor[] = {
+static const struct TrainerMonCustomized sParty_Conor[] = {
     {
     .iv = 0,
     .lvl = 33,
@@ -6652,7 +6652,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Conor[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Edwin1[] = {
+static const struct TrainerMonCustomized sParty_Edwin1[] = {
     {
     .iv = 0,
     .lvl = 14,
@@ -6665,7 +6665,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Edwin1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Hector[] = {
+static const struct TrainerMonCustomized sParty_Hector[] = {
     {
     .iv = 0,
     .lvl = 18,
@@ -6678,7 +6678,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Hector[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_TabithaMossdeep[] = {
+static const struct TrainerMonCustomized sParty_TabithaMossdeep[] = {
     {
     .iv = 100,
     .lvl = 36,
@@ -6696,7 +6696,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_TabithaMossdeep[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Edwin2[] = {
+static const struct TrainerMonCustomized sParty_Edwin2[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -6709,7 +6709,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Edwin2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Edwin3[] = {
+static const struct TrainerMonCustomized sParty_Edwin3[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -6722,7 +6722,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Edwin3[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Edwin4[] = {
+static const struct TrainerMonCustomized sParty_Edwin4[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -6735,7 +6735,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Edwin4[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Edwin5[] = {
+static const struct TrainerMonCustomized sParty_Edwin5[] = {
     {
     .iv = 0,
     .lvl = 35,
@@ -6781,7 +6781,7 @@ static const struct TrainerMonCustomized sParty_WallyVR1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute103Mudkip[] = {
+static const struct TrainerMonCustomized sParty_BrendanRoute103Mudkip[] = {
     {
     .iv = 0,
     .lvl = 5,
@@ -6789,7 +6789,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute103Mudkip[]
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute110Mudkip[] = {
+static const struct TrainerMonCustomized sParty_BrendanRoute110Mudkip[] = {
     {
     .iv = 50,
     .lvl = 18,
@@ -6807,7 +6807,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute110Mudkip[]
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute119Mudkip[] = {
+static const struct TrainerMonCustomized sParty_BrendanRoute119Mudkip[] = {
     {
     .iv = 100,
     .lvl = 29,
@@ -6825,7 +6825,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute119Mudkip[]
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute103Treecko[] = {
+static const struct TrainerMonCustomized sParty_BrendanRoute103Treecko[] = {
     {
     .iv = 0,
     .lvl = 5,
@@ -6833,7 +6833,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute103Treecko[]
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute110Treecko[] = {
+static const struct TrainerMonCustomized sParty_BrendanRoute110Treecko[] = {
     {
     .iv = 50,
     .lvl = 18,
@@ -6851,7 +6851,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute110Treecko[]
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute119Treecko[] = {
+static const struct TrainerMonCustomized sParty_BrendanRoute119Treecko[] = {
     {
     .iv = 100,
     .lvl = 29,
@@ -6869,7 +6869,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute119Treecko[]
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute103Torchic[] = {
+static const struct TrainerMonCustomized sParty_BrendanRoute103Torchic[] = {
     {
     .iv = 0,
     .lvl = 5,
@@ -6877,7 +6877,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute103Torchic[]
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute110Torchic[] = {
+static const struct TrainerMonCustomized sParty_BrendanRoute110Torchic[] = {
     {
     .iv = 50,
     .lvl = 18,
@@ -6895,7 +6895,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute110Torchic[]
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute119Torchic[] = {
+static const struct TrainerMonCustomized sParty_BrendanRoute119Torchic[] = {
     {
     .iv = 100,
     .lvl = 29,
@@ -6913,7 +6913,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute119Torchic[]
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute103Mudkip[] = {
+static const struct TrainerMonCustomized sParty_MayRoute103Mudkip[] = {
     {
     .iv = 0,
     .lvl = 5,
@@ -6921,7 +6921,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute103Mudkip[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute110Mudkip[] = {
+static const struct TrainerMonCustomized sParty_MayRoute110Mudkip[] = {
     {
     .iv = 50,
     .lvl = 18,
@@ -6939,7 +6939,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute110Mudkip[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute119Mudkip[] = {
+static const struct TrainerMonCustomized sParty_MayRoute119Mudkip[] = {
     {
     .iv = 100,
     .lvl = 29,
@@ -6957,7 +6957,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute119Mudkip[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute103Treecko[] = {
+static const struct TrainerMonCustomized sParty_MayRoute103Treecko[] = {
     {
     .iv = 0,
     .lvl = 5,
@@ -6965,7 +6965,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute103Treecko[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute110Treecko[] = {
+static const struct TrainerMonCustomized sParty_MayRoute110Treecko[] = {
     {
     .iv = 50,
     .lvl = 18,
@@ -6983,7 +6983,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute110Treecko[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute119Treecko[] = {
+static const struct TrainerMonCustomized sParty_MayRoute119Treecko[] = {
     {
     .iv = 100,
     .lvl = 29,
@@ -7001,7 +7001,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute119Treecko[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute103Torchic[] = {
+static const struct TrainerMonCustomized sParty_MayRoute103Torchic[] = {
     {
     .iv = 0,
     .lvl = 5,
@@ -7009,7 +7009,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute103Torchic[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute110Torchic[] = {
+static const struct TrainerMonCustomized sParty_MayRoute110Torchic[] = {
     {
     .iv = 50,
     .lvl = 18,
@@ -7027,7 +7027,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute110Torchic[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute119Torchic[] = {
+static const struct TrainerMonCustomized sParty_MayRoute119Torchic[] = {
     {
     .iv = 100,
     .lvl = 29,
@@ -7045,7 +7045,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute119Torchic[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Isaac1[] = {
+static const struct TrainerMonCustomized sParty_Isaac1[] = {
     {
     .iv = 0,
     .lvl = 11,
@@ -7078,7 +7078,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Isaac1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Davis[] = {
+static const struct TrainerMonCustomized sParty_Davis[] = {
     {
     .iv = 0,
     .lvl = 27,
@@ -7101,7 +7101,7 @@ static const struct TrainerMonCustomized sParty_Mitchell[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Isaac2[] = {
+static const struct TrainerMonCustomized sParty_Isaac2[] = {
     {
     .iv = 10,
     .lvl = 22,
@@ -7134,7 +7134,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Isaac2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Isaac3[] = {
+static const struct TrainerMonCustomized sParty_Isaac3[] = {
     {
     .iv = 20,
     .lvl = 25,
@@ -7167,7 +7167,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Isaac3[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Isaac4[] = {
+static const struct TrainerMonCustomized sParty_Isaac4[] = {
     {
     .iv = 30,
     .lvl = 28,
@@ -7200,7 +7200,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Isaac4[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Isaac5[] = {
+static const struct TrainerMonCustomized sParty_Isaac5[] = {
     {
     .iv = 40,
     .lvl = 31,
@@ -7233,7 +7233,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Isaac5[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Lydia1[] = {
+static const struct TrainerMonCustomized sParty_Lydia1[] = {
     {
     .iv = 0,
     .lvl = 11,
@@ -7266,7 +7266,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Lydia1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Halle[] = {
+static const struct TrainerMonCustomized sParty_Halle[] = {
     {
     .iv = 0,
     .lvl = 43,
@@ -7279,7 +7279,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Halle[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Garrison[] = {
+static const struct TrainerMonCustomized sParty_Garrison[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -7287,7 +7287,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Garrison[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Lydia2[] = {
+static const struct TrainerMonCustomized sParty_Lydia2[] = {
     {
     .iv = 10,
     .lvl = 22,
@@ -7320,7 +7320,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Lydia2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Lydia3[] = {
+static const struct TrainerMonCustomized sParty_Lydia3[] = {
     {
     .iv = 20,
     .lvl = 25,
@@ -7353,7 +7353,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Lydia3[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Lydia4[] = {
+static const struct TrainerMonCustomized sParty_Lydia4[] = {
     {
     .iv = 30,
     .lvl = 28,
@@ -7386,7 +7386,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Lydia4[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Lydia5[] = {
+static const struct TrainerMonCustomized sParty_Lydia5[] = {
     {
     .iv = 40,
     .lvl = 31,
@@ -7419,7 +7419,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Lydia5[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Jackson1[] = {
+static const struct TrainerMonCustomized sParty_Jackson1[] = {
     {
     .iv = 50,
     .lvl = 27,
@@ -7427,7 +7427,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Jackson1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Lorenzo[] = {
+static const struct TrainerMonCustomized sParty_Lorenzo[] = {
     {
     .iv = 50,
     .lvl = 28,
@@ -7445,7 +7445,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Lorenzo[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Sebastian[] = {
+static const struct TrainerMonCustomized sParty_Sebastian[] = {
     {
     .iv = 50,
     .lvl = 39,
@@ -7453,7 +7453,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Sebastian[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Jackson2[] = {
+static const struct TrainerMonCustomized sParty_Jackson2[] = {
     {
     .iv = 60,
     .lvl = 31,
@@ -7461,7 +7461,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Jackson2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Jackson3[] = {
+static const struct TrainerMonCustomized sParty_Jackson3[] = {
     {
     .iv = 70,
     .lvl = 34,
@@ -7469,7 +7469,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Jackson3[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Jackson4[] = {
+static const struct TrainerMonCustomized sParty_Jackson4[] = {
     {
     .iv = 80,
     .lvl = 37,
@@ -7477,7 +7477,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Jackson4[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Jackson5[] = {
+static const struct TrainerMonCustomized sParty_Jackson5[] = {
     {
     .iv = 90,
     .lvl = 39,
@@ -7490,7 +7490,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Jackson5[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Catherine1[] = {
+static const struct TrainerMonCustomized sParty_Catherine1[] = {
     {
     .iv = 50,
     .lvl = 26,
@@ -7503,7 +7503,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Catherine1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Jenna[] = {
+static const struct TrainerMonCustomized sParty_Jenna[] = {
     {
     .iv = 50,
     .lvl = 28,
@@ -7521,7 +7521,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Jenna[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Sophia[] = {
+static const struct TrainerMonCustomized sParty_Sophia[] = {
     {
     .iv = 50,
     .lvl = 38,
@@ -7534,7 +7534,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Sophia[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Catherine2[] = {
+static const struct TrainerMonCustomized sParty_Catherine2[] = {
     {
     .iv = 60,
     .lvl = 30,
@@ -7547,7 +7547,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Catherine2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Catherine3[] = {
+static const struct TrainerMonCustomized sParty_Catherine3[] = {
     {
     .iv = 70,
     .lvl = 33,
@@ -7560,7 +7560,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Catherine3[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Catherine4[] = {
+static const struct TrainerMonCustomized sParty_Catherine4[] = {
     {
     .iv = 80,
     .lvl = 36,
@@ -7573,7 +7573,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Catherine4[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Catherine5[] = {
+static const struct TrainerMonCustomized sParty_Catherine5[] = {
     {
     .iv = 90,
     .lvl = 39,
@@ -7586,7 +7586,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Catherine5[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Julio[] = {
+static const struct TrainerMonCustomized sParty_Julio[] = {
     {
     .iv = 0,
     .lvl = 21,
@@ -7594,7 +7594,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Julio[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_GruntSeafloorCavern5[] = {
+static const struct TrainerMonCustomized sParty_GruntSeafloorCavern5[] = {
     {
     .iv = 50,
     .lvl = 35,
@@ -7607,7 +7607,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntSeafloorCavern5[] =
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_GruntUnused[] = {
+static const struct TrainerMonCustomized sParty_GruntUnused[] = {
     {
     .iv = 0,
     .lvl = 31,
@@ -7620,7 +7620,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntUnused[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_GruntMtPyre4[] = {
+static const struct TrainerMonCustomized sParty_GruntMtPyre4[] = {
     {
     .iv = 0,
     .lvl = 30,
@@ -7633,7 +7633,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntMtPyre4[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_GruntJaggedPass[] = {
+static const struct TrainerMonCustomized sParty_GruntJaggedPass[] = {
     {
     .iv = 50,
     .lvl = 22,
@@ -7646,7 +7646,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntJaggedPass[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Marc[] = {
+static const struct TrainerMonCustomized sParty_Marc[] = {
     {
     .iv = 120,
     .lvl = 8,
@@ -7659,7 +7659,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Marc[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Brenden[] = {
+static const struct TrainerMonCustomized sParty_Brenden[] = {
     {
     .iv = 100,
     .lvl = 13,
@@ -7667,7 +7667,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Brenden[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Lilith[] = {
+static const struct TrainerMonCustomized sParty_Lilith[] = {
     {
     .iv = 150,
     .lvl = 13,
@@ -7675,7 +7675,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Lilith[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Cristian[] = {
+static const struct TrainerMonCustomized sParty_Cristian[] = {
     {
     .iv = 200,
     .lvl = 13,
@@ -7683,7 +7683,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Cristian[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Sylvia[] = {
+static const struct TrainerMonCustomized sParty_Sylvia[] = {
     {
     .iv = 100,
     .lvl = 36,
@@ -7691,7 +7691,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Sylvia[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Leonardo[] = {
+static const struct TrainerMonCustomized sParty_Leonardo[] = {
     {
     .iv = 0,
     .lvl = 34,
@@ -7716,7 +7716,7 @@ static const struct TrainerMonCustomized sParty_Athena[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Harrison[] = {
+static const struct TrainerMonCustomized sParty_Harrison[] = {
     {
     .iv = 0,
     .lvl = 35,
@@ -7724,7 +7724,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Harrison[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_GruntMtChimney2[] = {
+static const struct TrainerMonCustomized sParty_GruntMtChimney2[] = {
     {
     .iv = 0,
     .lvl = 20,
@@ -7732,7 +7732,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntMtChimney2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Clarence[] = {
+static const struct TrainerMonCustomized sParty_Clarence[] = {
     {
     .iv = 0,
     .lvl = 34,
@@ -7740,7 +7740,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Clarence[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Terry[] = {
+static const struct TrainerMonCustomized sParty_Terry[] = {
     {
     .iv = 0,
     .lvl = 37,
@@ -7748,7 +7748,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Terry[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Nate[] = {
+static const struct TrainerMonCustomized sParty_Nate[] = {
     {
     .iv = 100,
     .lvl = 36,
@@ -7756,7 +7756,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Nate[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Kathleen[] = {
+static const struct TrainerMonCustomized sParty_Kathleen[] = {
     {
     .iv = 100,
     .lvl = 36,
@@ -7764,7 +7764,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Kathleen[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Clifford[] = {
+static const struct TrainerMonCustomized sParty_Clifford[] = {
     {
     .iv = 0,
     .lvl = 36,
@@ -7772,7 +7772,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Clifford[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Nicholas[] = {
+static const struct TrainerMonCustomized sParty_Nicholas[] = {
     {
     .iv = 0,
     .lvl = 36,
@@ -7780,7 +7780,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Nicholas[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_GruntSpaceCenter3[] = {
+static const struct TrainerMonCustomized sParty_GruntSpaceCenter3[] = {
     {
     .iv = 0,
     .lvl = 31,
@@ -7793,7 +7793,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntSpaceCenter3[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_GruntSpaceCenter4[] = {
+static const struct TrainerMonCustomized sParty_GruntSpaceCenter4[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -7801,7 +7801,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntSpaceCenter4[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_GruntSpaceCenter5[] = {
+static const struct TrainerMonCustomized sParty_GruntSpaceCenter5[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -7809,7 +7809,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntSpaceCenter5[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_GruntSpaceCenter6[] = {
+static const struct TrainerMonCustomized sParty_GruntSpaceCenter6[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -7817,7 +7817,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntSpaceCenter6[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_GruntSpaceCenter7[] = {
+static const struct TrainerMonCustomized sParty_GruntSpaceCenter7[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -7825,7 +7825,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntSpaceCenter7[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Macey[] = {
+static const struct TrainerMonCustomized sParty_Macey[] = {
     {
     .iv = 0,
     .lvl = 36,
@@ -7833,7 +7833,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Macey[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRustboroTreecko[] = {
+static const struct TrainerMonCustomized sParty_BrendanRustboroTreecko[] = {
     {
     .iv = 25,
     .lvl = 13,
@@ -7846,7 +7846,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRustboroTreecko[]
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRustboroMudkip[] = {
+static const struct TrainerMonCustomized sParty_BrendanRustboroMudkip[] = {
     {
     .iv = 25,
     .lvl = 13,
@@ -7859,7 +7859,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRustboroMudkip[]
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Paxton[] = {
+static const struct TrainerMonCustomized sParty_Paxton[] = {
     {
     .iv = 0,
     .lvl = 33,
@@ -7872,7 +7872,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Paxton[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Isabella[] = {
+static const struct TrainerMonCustomized sParty_Isabella[] = {
     {
     .iv = 0,
     .lvl = 34,
@@ -7880,7 +7880,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Isabella[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_GruntWeatherInst5[] = {
+static const struct TrainerMonCustomized sParty_GruntWeatherInst5[] = {
     {
     .iv = 0,
     .lvl = 27,
@@ -7893,7 +7893,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntWeatherInst5[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_TabithaMtChimney[] = {
+static const struct TrainerMonCustomized sParty_TabithaMtChimney[] = {
     {
     .iv = 50,
     .lvl = 18,
@@ -7916,7 +7916,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_TabithaMtChimney[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Jonathan[] = {
+static const struct TrainerMonCustomized sParty_Jonathan[] = {
     {
     .iv = 0,
     .lvl = 33,
@@ -7929,7 +7929,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Jonathan[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRustboroTorchic[] = {
+static const struct TrainerMonCustomized sParty_BrendanRustboroTorchic[] = {
     {
     .iv = 25,
     .lvl = 13,
@@ -7942,7 +7942,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRustboroTorchic[]
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_MayRustboroMudkip[] = {
+static const struct TrainerMonCustomized sParty_MayRustboroMudkip[] = {
     {
     .iv = 25,
     .lvl = 13,
@@ -7955,7 +7955,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_MayRustboroMudkip[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_MaxieMagmaHideout[] = {
+static const struct TrainerMonCustomized sParty_MaxieMagmaHideout[] = {
     {
     .iv = 150,
     .lvl = 37,
@@ -7973,7 +7973,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_MaxieMagmaHideout[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_MaxieMtChimney[] = {
+static const struct TrainerMonCustomized sParty_MaxieMtChimney[] = {
     {
     .iv = 150,
     .lvl = 24,
@@ -7991,7 +7991,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_MaxieMtChimney[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Tiana[] = {
+static const struct TrainerMonCustomized sParty_Tiana[] = {
     {
     .iv = 0,
     .lvl = 4,
@@ -8004,7 +8004,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Tiana[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Haley1[] = {
+static const struct TrainerMonCustomized sParty_Haley1[] = {
     {
     .iv = 0,
     .lvl = 6,
@@ -8017,7 +8017,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Haley1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Janice[] = {
+static const struct TrainerMonCustomized sParty_Janice[] = {
     {
     .iv = 0,
     .lvl = 9,
@@ -8025,7 +8025,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Janice[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Vivi[] = {
+static const struct TrainerMonCustomized sParty_Vivi[] = {
     {
     .iv = 100,
     .lvl = 15,
@@ -8043,7 +8043,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Vivi[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Haley2[] = {
+static const struct TrainerMonCustomized sParty_Haley2[] = {
     {
     .iv = 10,
     .lvl = 26,
@@ -8056,7 +8056,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Haley2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Haley3[] = {
+static const struct TrainerMonCustomized sParty_Haley3[] = {
     {
     .iv = 20,
     .lvl = 29,
@@ -8069,7 +8069,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Haley3[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Haley4[] = {
+static const struct TrainerMonCustomized sParty_Haley4[] = {
     {
     .iv = 30,
     .lvl = 32,
@@ -8082,7 +8082,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Haley4[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Haley5[] = {
+static const struct TrainerMonCustomized sParty_Haley5[] = {
     {
     .iv = 40,
     .lvl = 34,
@@ -8100,7 +8100,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Haley5[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Sally[] = {
+static const struct TrainerMonCustomized sParty_Sally[] = {
     {
     .iv = 0,
     .lvl = 16,
@@ -8108,7 +8108,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Sally[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Robin[] = {
+static const struct TrainerMonCustomized sParty_Robin[] = {
     {
     .iv = 0,
     .lvl = 14,
@@ -8126,7 +8126,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Robin[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Andrea[] = {
+static const struct TrainerMonCustomized sParty_Andrea[] = {
     {
     .iv = 100,
     .lvl = 40,
@@ -8134,7 +8134,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Andrea[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Crissy[] = {
+static const struct TrainerMonCustomized sParty_Crissy[] = {
     {
     .iv = 100,
     .lvl = 39,
@@ -8147,7 +8147,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Crissy[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Rick[] = {
+static const struct TrainerMonCustomized sParty_Rick[] = {
     {
     .iv = 0,
     .lvl = 4,
@@ -8160,7 +8160,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Rick[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Lyle[] = {
+static const struct TrainerMonCustomized sParty_Lyle[] = {
     {
     .iv = 0,
     .lvl = 3,
@@ -8183,7 +8183,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Lyle[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Jose[] = {
+static const struct TrainerMonCustomized sParty_Jose[] = {
     {
     .iv = 50,
     .lvl = 8,
@@ -8196,7 +8196,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Jose[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Doug[] = {
+static const struct TrainerMonCustomized sParty_Doug[] = {
     {
     .iv = 0,
     .lvl = 28,
@@ -8209,7 +8209,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Doug[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Greg[] = {
+static const struct TrainerMonCustomized sParty_Greg[] = {
     {
     .iv = 0,
     .lvl = 25,
@@ -8222,7 +8222,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Greg[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Kent[] = {
+static const struct TrainerMonCustomized sParty_Kent[] = {
     {
     .iv = 0,
     .lvl = 25,
@@ -8230,7 +8230,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Kent[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_James1[] = {
+static const struct TrainerMonCustomized sParty_James1[] = {
     {
     .iv = 0,
     .lvl = 6,
@@ -8243,7 +8243,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_James1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_James2[] = {
+static const struct TrainerMonCustomized sParty_James2[] = {
     {
     .iv = 10,
     .lvl = 27,
@@ -8251,7 +8251,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_James2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_James3[] = {
+static const struct TrainerMonCustomized sParty_James3[] = {
     {
     .iv = 20,
     .lvl = 29,
@@ -8264,7 +8264,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_James3[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_James4[] = {
+static const struct TrainerMonCustomized sParty_James4[] = {
     {
     .iv = 30,
     .lvl = 31,
@@ -8282,7 +8282,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_James4[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_James5[] = {
+static const struct TrainerMonCustomized sParty_James5[] = {
     {
     .iv = 40,
     .lvl = 33,
@@ -8305,7 +8305,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_James5[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Brice[] = {
+static const struct TrainerMonCustomized sParty_Brice[] = {
     {
     .iv = 0,
     .lvl = 17,
@@ -8318,7 +8318,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Brice[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Trent1[] = {
+static const struct TrainerMonCustomized sParty_Trent1[] = {
     {
     .iv = 0,
     .lvl = 16,
@@ -8336,7 +8336,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Trent1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Lenny[] = {
+static const struct TrainerMonCustomized sParty_Lenny[] = {
     {
     .iv = 0,
     .lvl = 18,
@@ -8349,7 +8349,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Lenny[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Lucas1[] = {
+static const struct TrainerMonCustomized sParty_Lucas1[] = {
     {
     .iv = 0,
     .lvl = 18,
@@ -8362,7 +8362,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Lucas1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Alan[] = {
+static const struct TrainerMonCustomized sParty_Alan[] = {
     {
     .iv = 0,
     .lvl = 22,
@@ -8380,7 +8380,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Alan[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Clark[] = {
+static const struct TrainerMonCustomized sParty_Clark[] = {
     {
     .iv = 0,
     .lvl = 8,
@@ -8388,7 +8388,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Clark[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Eric[] = {
+static const struct TrainerMonCustomized sParty_Eric[] = {
     {
     .iv = 0,
     .lvl = 20,
@@ -8425,7 +8425,7 @@ static const struct TrainerMonCustomized sParty_Mike1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Mike2[] = {
+static const struct TrainerMonCustomized sParty_Mike2[] = {
     {
     .iv = 0,
     .lvl = 16,
@@ -8443,7 +8443,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Mike2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Trent2[] = {
+static const struct TrainerMonCustomized sParty_Trent2[] = {
     {
     .iv = 10,
     .lvl = 24,
@@ -8466,7 +8466,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Trent2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Trent3[] = {
+static const struct TrainerMonCustomized sParty_Trent3[] = {
     {
     .iv = 20,
     .lvl = 27,
@@ -8489,7 +8489,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Trent3[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Trent4[] = {
+static const struct TrainerMonCustomized sParty_Trent4[] = {
     {
     .iv = 30,
     .lvl = 30,
@@ -8512,7 +8512,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Trent4[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Trent5[] = {
+static const struct TrainerMonCustomized sParty_Trent5[] = {
     {
     .iv = 40,
     .lvl = 33,
@@ -8535,7 +8535,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Trent5[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_DezAndLuke[] = {
+static const struct TrainerMonCustomized sParty_DezAndLuke[] = {
     {
     .iv = 0,
     .lvl = 31,
@@ -8548,7 +8548,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_DezAndLuke[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_LeaAndJed[] = {
+static const struct TrainerMonCustomized sParty_LeaAndJed[] = {
     {
     .iv = 0,
     .lvl = 45,
@@ -8561,7 +8561,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_LeaAndJed[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_KiraAndDan1[] = {
+static const struct TrainerMonCustomized sParty_KiraAndDan1[] = {
     {
     .iv = 0,
     .lvl = 25,
@@ -8574,7 +8574,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_KiraAndDan1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_KiraAndDan2[] = {
+static const struct TrainerMonCustomized sParty_KiraAndDan2[] = {
     {
     .iv = 10,
     .lvl = 30,
@@ -8587,7 +8587,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_KiraAndDan2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_KiraAndDan3[] = {
+static const struct TrainerMonCustomized sParty_KiraAndDan3[] = {
     {
     .iv = 20,
     .lvl = 33,
@@ -8600,7 +8600,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_KiraAndDan3[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_KiraAndDan4[] = {
+static const struct TrainerMonCustomized sParty_KiraAndDan4[] = {
     {
     .iv = 30,
     .lvl = 36,
@@ -8613,7 +8613,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_KiraAndDan4[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_KiraAndDan5[] = {
+static const struct TrainerMonCustomized sParty_KiraAndDan5[] = {
     {
     .iv = 40,
     .lvl = 39,
@@ -8626,7 +8626,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_KiraAndDan5[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Johanna[] = {
+static const struct TrainerMonCustomized sParty_Johanna[] = {
     {
     .iv = 0,
     .lvl = 13,
@@ -8712,7 +8712,7 @@ static const struct TrainerMonCustomized sParty_Riley[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Flint[] = {
+static const struct TrainerMonCustomized sParty_Flint[] = {
     {
     .iv = 150,
     .lvl = 29,
@@ -8725,7 +8725,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Flint[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Ashley[] = {
+static const struct TrainerMonCustomized sParty_Ashley[] = {
     {
     .iv = 100,
     .lvl = 27,
@@ -8743,7 +8743,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Ashley[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_WallyMauville[] = {
+static const struct TrainerMonCustomized sParty_WallyMauville[] = {
     {
     .iv = 30,
     .lvl = 16,
@@ -8883,7 +8883,7 @@ static const struct TrainerMonCustomized sParty_WallyVR5[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_BrendanLilycoveMudkip[] = {
+static const struct TrainerMonCustomized sParty_BrendanLilycoveMudkip[] = {
     {
     .iv = 150,
     .lvl = 31,
@@ -8906,7 +8906,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_BrendanLilycoveMudkip[]
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_BrendanLilycoveTreecko[] = {
+static const struct TrainerMonCustomized sParty_BrendanLilycoveTreecko[] = {
     {
     .iv = 150,
     .lvl = 31,
@@ -8929,7 +8929,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_BrendanLilycoveTreecko[]
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_BrendanLilycoveTorchic[] = {
+static const struct TrainerMonCustomized sParty_BrendanLilycoveTorchic[] = {
     {
     .iv = 150,
     .lvl = 31,
@@ -8952,7 +8952,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_BrendanLilycoveTorchic[]
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_MayLilycoveMudkip[] = {
+static const struct TrainerMonCustomized sParty_MayLilycoveMudkip[] = {
     {
     .iv = 150,
     .lvl = 31,
@@ -8975,7 +8975,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_MayLilycoveMudkip[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_MayLilycoveTreecko[] = {
+static const struct TrainerMonCustomized sParty_MayLilycoveTreecko[] = {
     {
     .iv = 150,
     .lvl = 31,
@@ -8998,7 +8998,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_MayLilycoveTreecko[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_MayLilycoveTorchic[] = {
+static const struct TrainerMonCustomized sParty_MayLilycoveTorchic[] = {
     {
     .iv = 150,
     .lvl = 31,
@@ -9021,7 +9021,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_MayLilycoveTorchic[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Jonah[] = {
+static const struct TrainerMonCustomized sParty_Jonah[] = {
     {
     .iv = 0,
     .lvl = 30,
@@ -9039,7 +9039,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Jonah[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Henry[] = {
+static const struct TrainerMonCustomized sParty_Henry[] = {
     {
     .iv = 0,
     .lvl = 31,
@@ -9052,7 +9052,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Henry[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Roger[] = {
+static const struct TrainerMonCustomized sParty_Roger[] = {
     {
     .iv = 0,
     .lvl = 15,
@@ -9070,7 +9070,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Roger[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Alexa[] = {
+static const struct TrainerMonCustomized sParty_Alexa[] = {
     {
     .iv = 100,
     .lvl = 34,
@@ -9083,7 +9083,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Alexa[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Ruben[] = {
+static const struct TrainerMonCustomized sParty_Ruben[] = {
     {
     .iv = 100,
     .lvl = 34,
@@ -9096,7 +9096,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Ruben[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Koji1[] = {
+static const struct TrainerMonCustomized sParty_Koji1[] = {
     {
     .iv = 0,
     .lvl = 34,
@@ -9104,7 +9104,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Koji1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Wayne[] = {
+static const struct TrainerMonCustomized sParty_Wayne[] = {
     {
     .iv = 0,
     .lvl = 31,
@@ -9122,7 +9122,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Wayne[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Aidan[] = {
+static const struct TrainerMonCustomized sParty_Aidan[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -9135,7 +9135,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Aidan[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Reed[] = {
+static const struct TrainerMonCustomized sParty_Reed[] = {
     {
     .iv = 0,
     .lvl = 33,
@@ -9148,7 +9148,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Reed[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Tisha[] = {
+static const struct TrainerMonCustomized sParty_Tisha[] = {
     {
     .iv = 0,
     .lvl = 34,
@@ -9156,7 +9156,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Tisha[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_ToriAndTia[] = {
+static const struct TrainerMonCustomized sParty_ToriAndTia[] = {
     {
     .iv = 0,
     .lvl = 19,
@@ -9289,7 +9289,7 @@ static const struct TrainerMonCustomized sParty_JohnAndJay5[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_ReliAndIan[] = {
+static const struct TrainerMonCustomized sParty_ReliAndIan[] = {
     {
     .iv = 0,
     .lvl = 35,
@@ -9302,7 +9302,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_ReliAndIan[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_LilaAndRoy1[] = {
+static const struct TrainerMonCustomized sParty_LilaAndRoy1[] = {
     {
     .iv = 0,
     .lvl = 34,
@@ -9315,7 +9315,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_LilaAndRoy1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_LilaAndRoy2[] = {
+static const struct TrainerMonCustomized sParty_LilaAndRoy2[] = {
     {
     .iv = 0,
     .lvl = 42,
@@ -9328,7 +9328,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_LilaAndRoy2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_LilaAndRoy3[] = {
+static const struct TrainerMonCustomized sParty_LilaAndRoy3[] = {
     {
     .iv = 0,
     .lvl = 45,
@@ -9341,7 +9341,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_LilaAndRoy3[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_LilaAndRoy4[] = {
+static const struct TrainerMonCustomized sParty_LilaAndRoy4[] = {
     {
     .iv = 0,
     .lvl = 48,
@@ -9354,7 +9354,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_LilaAndRoy4[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_LilaAndRoy5[] = {
+static const struct TrainerMonCustomized sParty_LilaAndRoy5[] = {
     {
     .iv = 0,
     .lvl = 51,
@@ -9367,7 +9367,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_LilaAndRoy5[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_LisaAndRay[] = {
+static const struct TrainerMonCustomized sParty_LisaAndRay[] = {
     {
     .iv = 0,
     .lvl = 27,
@@ -9380,7 +9380,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_LisaAndRay[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Chris[] = {
+static const struct TrainerMonCustomized sParty_Chris[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9433,7 +9433,7 @@ static const struct TrainerMonCustomized sParty_Sarah[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Darian[] = {
+static const struct TrainerMonCustomized sParty_Darian[] = {
     {
     .iv = 0,
     .lvl = 9,
@@ -9441,7 +9441,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Darian[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Hailey[] = {
+static const struct TrainerMonCustomized sParty_Hailey[] = {
     {
     .iv = 0,
     .lvl = 13,
@@ -9449,7 +9449,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Hailey[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Chandler[] = {
+static const struct TrainerMonCustomized sParty_Chandler[] = {
     {
     .iv = 0,
     .lvl = 12,
@@ -9477,7 +9477,7 @@ static const struct TrainerMonCustomized sParty_Kaleb[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Joseph[] = {
+static const struct TrainerMonCustomized sParty_Joseph[] = {
     {
     .iv = 0,
     .lvl = 14,
@@ -9490,7 +9490,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Joseph[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Alyssa[] = {
+static const struct TrainerMonCustomized sParty_Alyssa[] = {
     {
     .iv = 0,
     .lvl = 15,
@@ -9498,7 +9498,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Alyssa[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Marcos[] = {
+static const struct TrainerMonCustomized sParty_Marcos[] = {
     {
     .iv = 100,
     .lvl = 15,
@@ -9506,7 +9506,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Marcos[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Rhett[] = {
+static const struct TrainerMonCustomized sParty_Rhett[] = {
     {
     .iv = 100,
     .lvl = 15,
@@ -9514,7 +9514,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Rhett[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Tyron[] = {
+static const struct TrainerMonCustomized sParty_Tyron[] = {
     {
     .iv = 0,
     .lvl = 19,
@@ -9522,7 +9522,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Tyron[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Celina[] = {
+static const struct TrainerMonCustomized sParty_Celina[] = {
     {
     .iv = 0,
     .lvl = 18,
@@ -9530,7 +9530,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Celina[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Bianca[] = {
+static const struct TrainerMonCustomized sParty_Bianca[] = {
     {
     .iv = 0,
     .lvl = 18,
@@ -9538,7 +9538,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Bianca[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Hayden[] = {
+static const struct TrainerMonCustomized sParty_Hayden[] = {
     {
     .iv = 0,
     .lvl = 18,
@@ -9546,7 +9546,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Hayden[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Sophie[] = {
+static const struct TrainerMonCustomized sParty_Sophie[] = {
     {
     .iv = 0,
     .lvl = 17,
@@ -9559,7 +9559,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Sophie[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Coby[] = {
+static const struct TrainerMonCustomized sParty_Coby[] = {
     {
     .iv = 0,
     .lvl = 17,
@@ -9572,7 +9572,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Coby[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Lawrence[] = {
+static const struct TrainerMonCustomized sParty_Lawrence[] = {
     {
     .iv = 0,
     .lvl = 18,
@@ -9585,7 +9585,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Lawrence[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Wyatt[] = {
+static const struct TrainerMonCustomized sParty_Wyatt[] = {
     {
     .iv = 0,
     .lvl = 18,
@@ -9598,7 +9598,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Wyatt[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Angelina[] = {
+static const struct TrainerMonCustomized sParty_Angelina[] = {
     {
     .iv = 0,
     .lvl = 18,
@@ -9611,7 +9611,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Angelina[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Kai[] = {
+static const struct TrainerMonCustomized sParty_Kai[] = {
     {
     .iv = 0,
     .lvl = 19,
@@ -9619,7 +9619,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Kai[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Charlotte[] = {
+static const struct TrainerMonCustomized sParty_Charlotte[] = {
     {
     .iv = 0,
     .lvl = 19,
@@ -9627,7 +9627,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Charlotte[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Deandre[] = {
+static const struct TrainerMonCustomized sParty_Deandre[] = {
     {
     .iv = 0,
     .lvl = 14,
@@ -9645,7 +9645,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Deandre[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout1[] = {
+static const struct TrainerMonCustomized sParty_GruntMagmaHideout1[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9653,7 +9653,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout2[] = {
+static const struct TrainerMonCustomized sParty_GruntMagmaHideout2[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9661,7 +9661,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout3[] = {
+static const struct TrainerMonCustomized sParty_GruntMagmaHideout3[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9669,7 +9669,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout3[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout4[] = {
+static const struct TrainerMonCustomized sParty_GruntMagmaHideout4[] = {
     {
     .iv = 0,
     .lvl = 28,
@@ -9682,7 +9682,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout4[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout5[] = {
+static const struct TrainerMonCustomized sParty_GruntMagmaHideout5[] = {
     {
     .iv = 0,
     .lvl = 28,
@@ -9695,7 +9695,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout5[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout6[] = {
+static const struct TrainerMonCustomized sParty_GruntMagmaHideout6[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9703,7 +9703,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout6[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout7[] = {
+static const struct TrainerMonCustomized sParty_GruntMagmaHideout7[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9711,7 +9711,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout7[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout8[] = {
+static const struct TrainerMonCustomized sParty_GruntMagmaHideout8[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9719,7 +9719,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout8[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout9[] = {
+static const struct TrainerMonCustomized sParty_GruntMagmaHideout9[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9727,7 +9727,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout9[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout10[] = {
+static const struct TrainerMonCustomized sParty_GruntMagmaHideout10[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9735,7 +9735,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout10[] =
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout11[] = {
+static const struct TrainerMonCustomized sParty_GruntMagmaHideout11[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9743,7 +9743,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout11[] =
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout12[] = {
+static const struct TrainerMonCustomized sParty_GruntMagmaHideout12[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9751,7 +9751,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout12[] =
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout13[] = {
+static const struct TrainerMonCustomized sParty_GruntMagmaHideout13[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9759,7 +9759,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout13[] =
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout14[] = {
+static const struct TrainerMonCustomized sParty_GruntMagmaHideout14[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9767,7 +9767,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout14[] =
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout15[] = {
+static const struct TrainerMonCustomized sParty_GruntMagmaHideout15[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9775,7 +9775,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout15[] =
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout16[] = {
+static const struct TrainerMonCustomized sParty_GruntMagmaHideout16[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9783,7 +9783,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout16[] =
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_TabithaMagmaHideout[] = {
+static const struct TrainerMonCustomized sParty_TabithaMagmaHideout[] = {
     {
     .iv = 75,
     .lvl = 26,
@@ -9806,7 +9806,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_TabithaMagmaHideout[] =
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Darcy[] = {
+static const struct TrainerMonCustomized sParty_Darcy[] = {
     {
     .iv = 0,
     .lvl = 33,
@@ -9819,7 +9819,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Darcy[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_MaxieMossdeep[] = {
+static const struct TrainerMonCustomized sParty_MaxieMossdeep[] = {
     {
     .iv = 150,
     .lvl = 42,
@@ -9837,7 +9837,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_MaxieMossdeep[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Pete[] = {
+static const struct TrainerMonCustomized sParty_Pete[] = {
     {
     .iv = 0,
     .lvl = 15,
@@ -9845,7 +9845,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Pete[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Isabelle[] = {
+static const struct TrainerMonCustomized sParty_Isabelle[] = {
     {
     .iv = 0,
     .lvl = 15,
@@ -9853,7 +9853,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Isabelle[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Andres1[] = {
+static const struct TrainerMonCustomized sParty_Andres1[] = {
     {
     .iv = 50,
     .lvl = 25,
@@ -9866,7 +9866,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Andres1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Josue[] = {
+static const struct TrainerMonCustomized sParty_Josue[] = {
     {
     .iv = 50,
     .lvl = 25,
@@ -9879,7 +9879,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Josue[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Camron[] = {
+static const struct TrainerMonCustomized sParty_Camron[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -9887,7 +9887,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Camron[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Cory1[] = {
+static const struct TrainerMonCustomized sParty_Cory1[] = {
     {
     .iv = 0,
     .lvl = 24,
@@ -9905,7 +9905,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Cory1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Carolina[] = {
+static const struct TrainerMonCustomized sParty_Carolina[] = {
     {
     .iv = 50,
     .lvl = 24,
@@ -9923,7 +9923,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Carolina[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Elijah[] = {
+static const struct TrainerMonCustomized sParty_Elijah[] = {
     {
     .iv = 0,
     .lvl = 25,
@@ -9936,7 +9936,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Elijah[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Celia[] = {
+static const struct TrainerMonCustomized sParty_Celia[] = {
     {
     .iv = 0,
     .lvl = 22,
@@ -9949,7 +9949,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Celia[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Bryan[] = {
+static const struct TrainerMonCustomized sParty_Bryan[] = {
     {
     .iv = 0,
     .lvl = 22,
@@ -9962,7 +9962,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Bryan[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Branden[] = {
+static const struct TrainerMonCustomized sParty_Branden[] = {
     {
     .iv = 0,
     .lvl = 22,
@@ -9975,7 +9975,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Branden[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Bryant[] = {
+static const struct TrainerMonCustomized sParty_Bryant[] = {
     {
     .iv = 0,
     .lvl = 18,
@@ -9988,7 +9988,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Bryant[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Shayla[] = {
+static const struct TrainerMonCustomized sParty_Shayla[] = {
     {
     .iv = 0,
     .lvl = 18,
@@ -10001,7 +10001,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Shayla[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Kyra[] = {
+static const struct TrainerMonCustomized sParty_Kyra[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -10014,7 +10014,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Kyra[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Jaiden[] = {
+static const struct TrainerMonCustomized sParty_Jaiden[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -10027,7 +10027,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Jaiden[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Alix[] = {
+static const struct TrainerMonCustomized sParty_Alix[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -10040,7 +10040,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Alix[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Helene[] = {
+static const struct TrainerMonCustomized sParty_Helene[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -10053,7 +10053,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Helene[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Marlene[] = {
+static const struct TrainerMonCustomized sParty_Marlene[] = {
     {
     .iv = 0,
     .lvl = 18,
@@ -10066,7 +10066,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Marlene[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Devan[] = {
+static const struct TrainerMonCustomized sParty_Devan[] = {
     {
     .iv = 0,
     .lvl = 8,
@@ -10079,7 +10079,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Devan[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Johnson[] = {
+static const struct TrainerMonCustomized sParty_Johnson[] = {
     {
     .iv = 0,
     .lvl = 8,
@@ -10092,7 +10092,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Johnson[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Melina[] = {
+static const struct TrainerMonCustomized sParty_Melina[] = {
     {
     .iv = 0,
     .lvl = 17,
@@ -10100,7 +10100,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Melina[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Brandi[] = {
+static const struct TrainerMonCustomized sParty_Brandi[] = {
     {
     .iv = 0,
     .lvl = 17,
@@ -10108,7 +10108,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Brandi[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Aisha[] = {
+static const struct TrainerMonCustomized sParty_Aisha[] = {
     {
     .iv = 0,
     .lvl = 17,
@@ -10116,7 +10116,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Aisha[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Makayla[] = {
+static const struct TrainerMonCustomized sParty_Makayla[] = {
     {
     .iv = 0,
     .lvl = 33,
@@ -10129,7 +10129,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Makayla[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Fabian[] = {
+static const struct TrainerMonCustomized sParty_Fabian[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -10137,7 +10137,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Fabian[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Dayton[] = {
+static const struct TrainerMonCustomized sParty_Dayton[] = {
     {
     .iv = 0,
     .lvl = 25,
@@ -10150,7 +10150,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Dayton[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Rachel[] = {
+static const struct TrainerMonCustomized sParty_Rachel[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -10167,7 +10167,7 @@ static const struct TrainerMonCustomized sParty_Leonel[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Callie[] = {
+static const struct TrainerMonCustomized sParty_Callie[] = {
     {
     .iv = 0,
     .lvl = 28,
@@ -10180,7 +10180,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Callie[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Cale[] = {
+static const struct TrainerMonCustomized sParty_Cale[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -10193,7 +10193,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Cale[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Myles[] = {
+static const struct TrainerMonCustomized sParty_Myles[] = {
     {
     .iv = 10,
     .lvl = 25,
@@ -10226,7 +10226,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Myles[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Pat[] = {
+static const struct TrainerMonCustomized sParty_Pat[] = {
     {
     .iv = 10,
     .lvl = 25,
@@ -10259,7 +10259,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Pat[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Cristin1[] = {
+static const struct TrainerMonCustomized sParty_Cristin1[] = {
     {
     .iv = 100,
     .lvl = 29,
@@ -10272,7 +10272,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Cristin1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_MayRustboroTreecko[] = {
+static const struct TrainerMonCustomized sParty_MayRustboroTreecko[] = {
     {
     .iv = 25,
     .lvl = 13,
@@ -10285,7 +10285,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_MayRustboroTreecko[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_MayRustboroTorchic[] = {
+static const struct TrainerMonCustomized sParty_MayRustboroTorchic[] = {
     {
     .iv = 25,
     .lvl = 13,
@@ -11587,7 +11587,7 @@ static const struct TrainerMonCustomized sParty_Angelo[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Darius[] = {
+static const struct TrainerMonCustomized sParty_Darius[] = {
     {
     .iv = 200,
     .lvl = 30,
@@ -11640,7 +11640,7 @@ static const struct TrainerMonCustomized sParty_Steven[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Anabel[] = {
+static const struct TrainerMonCustomized sParty_Anabel[] = {
     {
     .iv = 0,
     .lvl = 5,
@@ -11648,7 +11648,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Anabel[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Tucker[] = {
+static const struct TrainerMonCustomized sParty_Tucker[] = {
     {
     .iv = 0,
     .lvl = 5,
@@ -11656,7 +11656,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Tucker[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Spenser[] = {
+static const struct TrainerMonCustomized sParty_Spenser[] = {
     {
     .iv = 0,
     .lvl = 5,
@@ -11664,7 +11664,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Spenser[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Greta[] = {
+static const struct TrainerMonCustomized sParty_Greta[] = {
     {
     .iv = 0,
     .lvl = 5,
@@ -11672,7 +11672,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Greta[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Noland[] = {
+static const struct TrainerMonCustomized sParty_Noland[] = {
     {
     .iv = 0,
     .lvl = 5,
@@ -11680,7 +11680,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Noland[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Lucy[] = {
+static const struct TrainerMonCustomized sParty_Lucy[] = {
     {
     .iv = 0,
     .lvl = 5,
@@ -11688,7 +11688,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Lucy[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Brandon[] = {
+static const struct TrainerMonCustomized sParty_Brandon[] = {
     {
     .iv = 0,
     .lvl = 5,
@@ -11696,7 +11696,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Brandon[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Andres2[] = {
+static const struct TrainerMonCustomized sParty_Andres2[] = {
     {
     .iv = 10,
     .lvl = 31,
@@ -11709,7 +11709,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Andres2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Andres3[] = {
+static const struct TrainerMonCustomized sParty_Andres3[] = {
     {
     .iv = 20,
     .lvl = 33,
@@ -11727,7 +11727,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Andres3[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Andres4[] = {
+static const struct TrainerMonCustomized sParty_Andres4[] = {
     {
     .iv = 30,
     .lvl = 35,
@@ -11745,7 +11745,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Andres4[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Andres5[] = {
+static const struct TrainerMonCustomized sParty_Andres5[] = {
     {
     .iv = 40,
     .lvl = 37,
@@ -11763,7 +11763,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Andres5[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Cory2[] = {
+static const struct TrainerMonCustomized sParty_Cory2[] = {
     {
     .iv = 10,
     .lvl = 30,
@@ -11781,7 +11781,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Cory2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Cory3[] = {
+static const struct TrainerMonCustomized sParty_Cory3[] = {
     {
     .iv = 20,
     .lvl = 32,
@@ -11799,7 +11799,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Cory3[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Cory4[] = {
+static const struct TrainerMonCustomized sParty_Cory4[] = {
     {
     .iv = 30,
     .lvl = 34,
@@ -11817,7 +11817,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Cory4[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Cory5[] = {
+static const struct TrainerMonCustomized sParty_Cory5[] = {
     {
     .iv = 40,
     .lvl = 36,
@@ -11835,7 +11835,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Cory5[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Pablo2[] = {
+static const struct TrainerMonCustomized sParty_Pablo2[] = {
     {
     .iv = 10,
     .lvl = 37,
@@ -11848,7 +11848,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Pablo2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Pablo3[] = {
+static const struct TrainerMonCustomized sParty_Pablo3[] = {
     {
     .iv = 20,
     .lvl = 39,
@@ -11866,7 +11866,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Pablo3[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Pablo4[] = {
+static const struct TrainerMonCustomized sParty_Pablo4[] = {
     {
     .iv = 30,
     .lvl = 41,
@@ -11884,7 +11884,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Pablo4[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Pablo5[] = {
+static const struct TrainerMonCustomized sParty_Pablo5[] = {
     {
     .iv = 40,
     .lvl = 43,
@@ -11902,7 +11902,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Pablo5[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Koji2[] = {
+static const struct TrainerMonCustomized sParty_Koji2[] = {
     {
     .iv = 10,
     .lvl = 37,
@@ -11915,7 +11915,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Koji2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Koji3[] = {
+static const struct TrainerMonCustomized sParty_Koji3[] = {
     {
     .iv = 20,
     .lvl = 39,
@@ -11933,7 +11933,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Koji3[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Koji4[] = {
+static const struct TrainerMonCustomized sParty_Koji4[] = {
     {
     .iv = 30,
     .lvl = 41,
@@ -11951,7 +11951,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Koji4[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Koji5[] = {
+static const struct TrainerMonCustomized sParty_Koji5[] = {
     {
     .iv = 40,
     .lvl = 43,
@@ -11969,7 +11969,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Koji5[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Cristin2[] = {
+static const struct TrainerMonCustomized sParty_Cristin2[] = {
     {
     .iv = 110,
     .lvl = 35,
@@ -11982,7 +11982,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Cristin2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Cristin3[] = {
+static const struct TrainerMonCustomized sParty_Cristin3[] = {
     {
     .iv = 120,
     .lvl = 37,
@@ -12000,7 +12000,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Cristin3[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Cristin4[] = {
+static const struct TrainerMonCustomized sParty_Cristin4[] = {
     {
     .iv = 130,
     .lvl = 39,
@@ -12018,7 +12018,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Cristin4[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Cristin5[] = {
+static const struct TrainerMonCustomized sParty_Cristin5[] = {
     {
     .iv = 140,
     .lvl = 41,
@@ -12036,7 +12036,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Cristin5[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Fernando2[] = {
+static const struct TrainerMonCustomized sParty_Fernando2[] = {
     {
     .iv = 10,
     .lvl = 35,
@@ -12054,7 +12054,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Fernando2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Fernando3[] = {
+static const struct TrainerMonCustomized sParty_Fernando3[] = {
     {
     .iv = 20,
     .lvl = 37,
@@ -12072,7 +12072,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Fernando3[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Fernando4[] = {
+static const struct TrainerMonCustomized sParty_Fernando4[] = {
     {
     .iv = 30,
     .lvl = 39,
@@ -12090,7 +12090,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Fernando4[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Fernando5[] = {
+static const struct TrainerMonCustomized sParty_Fernando5[] = {
     {
     .iv = 40,
     .lvl = 41,
@@ -12108,7 +12108,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Fernando5[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Sawyer2[] = {
+static const struct TrainerMonCustomized sParty_Sawyer2[] = {
     {
     .iv = 10,
     .lvl = 26,
@@ -12121,7 +12121,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Sawyer2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Sawyer3[] = {
+static const struct TrainerMonCustomized sParty_Sawyer3[] = {
     {
     .iv = 20,
     .lvl = 28,
@@ -12139,7 +12139,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Sawyer3[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Sawyer4[] = {
+static const struct TrainerMonCustomized sParty_Sawyer4[] = {
     {
     .iv = 30,
     .lvl = 30,
@@ -12157,7 +12157,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Sawyer4[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Sawyer5[] = {
+static const struct TrainerMonCustomized sParty_Sawyer5[] = {
     {
     .iv = 40,
     .lvl = 33,
@@ -12175,7 +12175,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Sawyer5[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Gabrielle2[] = {
+static const struct TrainerMonCustomized sParty_Gabrielle2[] = {
     {
     .iv = 10,
     .lvl = 31,
@@ -12208,7 +12208,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Gabrielle2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Gabrielle3[] = {
+static const struct TrainerMonCustomized sParty_Gabrielle3[] = {
     {
     .iv = 20,
     .lvl = 33,
@@ -12241,7 +12241,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Gabrielle3[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Gabrielle4[] = {
+static const struct TrainerMonCustomized sParty_Gabrielle4[] = {
     {
     .iv = 30,
     .lvl = 35,
@@ -12274,7 +12274,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Gabrielle4[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Gabrielle5[] = {
+static const struct TrainerMonCustomized sParty_Gabrielle5[] = {
     {
     .iv = 40,
     .lvl = 37,
@@ -12307,7 +12307,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Gabrielle5[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Thalia2[] = {
+static const struct TrainerMonCustomized sParty_Thalia2[] = {
     {
     .iv = 10,
     .lvl = 34,
@@ -12320,7 +12320,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Thalia2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Thalia3[] = {
+static const struct TrainerMonCustomized sParty_Thalia3[] = {
     {
     .iv = 20,
     .lvl = 36,
@@ -12338,7 +12338,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Thalia3[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Thalia4[] = {
+static const struct TrainerMonCustomized sParty_Thalia4[] = {
     {
     .iv = 30,
     .lvl = 38,
@@ -12356,7 +12356,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Thalia4[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Thalia5[] = {
+static const struct TrainerMonCustomized sParty_Thalia5[] = {
     {
     .iv = 40,
     .lvl = 40,
@@ -12374,7 +12374,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Thalia5[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Mariela[] = {
+static const struct TrainerMonCustomized sParty_Mariela[] = {
     {
     .iv = 0,
     .lvl = 41,
@@ -12382,7 +12382,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Mariela[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Alvaro[] = {
+static const struct TrainerMonCustomized sParty_Alvaro[] = {
     {
     .iv = 0,
     .lvl = 41,
@@ -12395,7 +12395,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Alvaro[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Everett[] = {
+static const struct TrainerMonCustomized sParty_Everett[] = {
     {
     .iv = 0,
     .lvl = 41,
@@ -12403,7 +12403,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Everett[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Red[] = {
+static const struct TrainerMonCustomized sParty_Red[] = {
     {
     .iv = 0,
     .lvl = 5,
@@ -12411,7 +12411,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Red[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Leaf[] = {
+static const struct TrainerMonCustomized sParty_Leaf[] = {
     {
     .iv = 0,
     .lvl = 5,
@@ -12419,7 +12419,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Leaf[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_BrendanLinkPlaceholder[] = {
+static const struct TrainerMonCustomized sParty_BrendanLinkPlaceholder[] = {
     {
     .iv = 0,
     .lvl = 5,
@@ -12427,7 +12427,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_BrendanLinkPlaceholder[]
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_MayLinkPlaceholder[] = {
+static const struct TrainerMonCustomized sParty_MayLinkPlaceholder[] = {
     {
     .iv = 0,
     .lvl = 5,
diff --git a/src/data/trainers.h b/src/data/trainers.h
index 88ffbc0bc3..c37e183c0c 100644
--- a/src/data/trainers.h
+++ b/src/data/trainers.h
@@ -10,7 +10,7 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0,
         .partySize = 0,
-        .party = {.NoItemDefaultMoves = NULL},
+        .party = {.EverythingCustomized = NULL},
     },
 
     [TRAINER_SAWYER_1] =
@@ -22,7 +22,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Sawyer1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Sawyer1),
     },
 
     [TRAINER_GRUNT_AQUA_HIDEOUT_1] =
@@ -34,7 +34,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntAquaHideout1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_GruntAquaHideout1),
     },
 
     [TRAINER_GRUNT_AQUA_HIDEOUT_2] =
@@ -46,7 +46,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntAquaHideout2),
+        .party = EVERYTHING_CUSTOMIZED(sParty_GruntAquaHideout2),
     },
 
     [TRAINER_GRUNT_AQUA_HIDEOUT_3] =
@@ -58,7 +58,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntAquaHideout3),
+        .party = EVERYTHING_CUSTOMIZED(sParty_GruntAquaHideout3),
     },
 
     [TRAINER_GRUNT_AQUA_HIDEOUT_4] =
@@ -70,7 +70,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntAquaHideout4),
+        .party = EVERYTHING_CUSTOMIZED(sParty_GruntAquaHideout4),
     },
 
     [TRAINER_GRUNT_SEAFLOOR_CAVERN_1] =
@@ -82,7 +82,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntSeafloorCavern1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_GruntSeafloorCavern1),
     },
 
     [TRAINER_GRUNT_SEAFLOOR_CAVERN_2] =
@@ -94,7 +94,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntSeafloorCavern2),
+        .party = EVERYTHING_CUSTOMIZED(sParty_GruntSeafloorCavern2),
     },
 
     [TRAINER_GRUNT_SEAFLOOR_CAVERN_3] =
@@ -106,7 +106,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntSeafloorCavern3),
+        .party = EVERYTHING_CUSTOMIZED(sParty_GruntSeafloorCavern3),
     },
 
     [TRAINER_GABRIELLE_1] =
@@ -118,7 +118,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Gabrielle1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Gabrielle1),
     },
 
     [TRAINER_GRUNT_PETALBURG_WOODS] =
@@ -130,7 +130,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntPetalburgWoods),
+        .party = EVERYTHING_CUSTOMIZED(sParty_GruntPetalburgWoods),
     },
 
     [TRAINER_MARCEL] =
@@ -142,7 +142,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 = NO_ITEM_DEFAULT_MOVES(sParty_Marcel),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Marcel),
     },
 
     [TRAINER_ALBERTO] =
@@ -154,7 +154,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Alberto),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Alberto),
     },
 
     [TRAINER_ED] =
@@ -166,7 +166,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Ed),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Ed),
     },
 
     [TRAINER_GRUNT_SEAFLOOR_CAVERN_4] =
@@ -178,7 +178,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntSeafloorCavern4),
+        .party = EVERYTHING_CUSTOMIZED(sParty_GruntSeafloorCavern4),
     },
 
     [TRAINER_DECLAN] =
@@ -190,7 +190,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Declan),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Declan),
     },
 
     [TRAINER_GRUNT_RUSTURF_TUNNEL] =
@@ -202,7 +202,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntRusturfTunnel),
+        .party = EVERYTHING_CUSTOMIZED(sParty_GruntRusturfTunnel),
     },
 
     [TRAINER_GRUNT_WEATHER_INST_1] =
@@ -214,7 +214,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntWeatherInst1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_GruntWeatherInst1),
     },
 
     [TRAINER_GRUNT_WEATHER_INST_2] =
@@ -226,7 +226,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntWeatherInst2),
+        .party = EVERYTHING_CUSTOMIZED(sParty_GruntWeatherInst2),
     },
 
     [TRAINER_GRUNT_WEATHER_INST_3] =
@@ -238,7 +238,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntWeatherInst3),
+        .party = EVERYTHING_CUSTOMIZED(sParty_GruntWeatherInst3),
     },
 
     [TRAINER_GRUNT_MUSEUM_1] =
@@ -250,7 +250,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMuseum1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_GruntMuseum1),
     },
 
     [TRAINER_GRUNT_MUSEUM_2] =
@@ -262,7 +262,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMuseum2),
+        .party = EVERYTHING_CUSTOMIZED(sParty_GruntMuseum2),
     },
 
     [TRAINER_GRUNT_SPACE_CENTER_1] =
@@ -274,7 +274,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntSpaceCenter1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_GruntSpaceCenter1),
     },
 
     [TRAINER_GRUNT_MT_PYRE_1] =
@@ -286,7 +286,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMtPyre1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_GruntMtPyre1),
     },
 
     [TRAINER_GRUNT_MT_PYRE_2] =
@@ -298,7 +298,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMtPyre2),
+        .party = EVERYTHING_CUSTOMIZED(sParty_GruntMtPyre2),
     },
 
     [TRAINER_GRUNT_MT_PYRE_3] =
@@ -310,7 +310,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMtPyre3),
+        .party = EVERYTHING_CUSTOMIZED(sParty_GruntMtPyre3),
     },
 
     [TRAINER_GRUNT_WEATHER_INST_4] =
@@ -322,7 +322,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntWeatherInst4),
+        .party = EVERYTHING_CUSTOMIZED(sParty_GruntWeatherInst4),
     },
 
     [TRAINER_GRUNT_AQUA_HIDEOUT_5] =
@@ -334,7 +334,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntAquaHideout5),
+        .party = EVERYTHING_CUSTOMIZED(sParty_GruntAquaHideout5),
     },
 
     [TRAINER_GRUNT_AQUA_HIDEOUT_6] =
@@ -346,7 +346,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntAquaHideout6),
+        .party = EVERYTHING_CUSTOMIZED(sParty_GruntAquaHideout6),
     },
 
     [TRAINER_FREDRICK] =
@@ -358,7 +358,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Fredrick),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Fredrick),
     },
 
     [TRAINER_MATT] =
@@ -370,7 +370,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 = NO_ITEM_DEFAULT_MOVES(sParty_Matt),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Matt),
     },
 
     [TRAINER_ZANDER] =
@@ -382,7 +382,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Zander),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Zander),
     },
 
     [TRAINER_SHELLY_WEATHER_INSTITUTE] =
@@ -394,7 +394,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_ShellyWeatherInstitute),
+        .party = EVERYTHING_CUSTOMIZED(sParty_ShellyWeatherInstitute),
     },
 
     [TRAINER_SHELLY_SEAFLOOR_CAVERN] =
@@ -406,7 +406,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_ShellySeafloorCavern),
+        .party = EVERYTHING_CUSTOMIZED(sParty_ShellySeafloorCavern),
     },
 
     [TRAINER_ARCHIE] =
@@ -418,7 +418,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 = NO_ITEM_DEFAULT_MOVES(sParty_Archie),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Archie),
     },
 
     [TRAINER_LEAH] =
@@ -430,7 +430,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Leah),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Leah),
     },
 
     [TRAINER_DAISY] =
@@ -442,7 +442,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Daisy),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Daisy),
     },
 
     [TRAINER_ROSE_1] =
@@ -454,7 +454,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Rose1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Rose1),
     },
 
     [TRAINER_FELIX] =
@@ -478,7 +478,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Violet),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Violet),
     },
 
     [TRAINER_ROSE_2] =
@@ -490,7 +490,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Rose2),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Rose2),
     },
 
     [TRAINER_ROSE_3] =
@@ -502,7 +502,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Rose3),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Rose3),
     },
 
     [TRAINER_ROSE_4] =
@@ -514,7 +514,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Rose4),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Rose4),
     },
 
     [TRAINER_ROSE_5] =
@@ -526,7 +526,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Rose5),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Rose5),
     },
 
     [TRAINER_DUSTY_1] =
@@ -622,7 +622,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_GabbyAndTy1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_GabbyAndTy1),
     },
 
     [TRAINER_GABBY_AND_TY_2] =
@@ -634,7 +634,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_GabbyAndTy2),
+        .party = EVERYTHING_CUSTOMIZED(sParty_GabbyAndTy2),
     },
 
     [TRAINER_GABBY_AND_TY_3] =
@@ -646,7 +646,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_GabbyAndTy3),
+        .party = EVERYTHING_CUSTOMIZED(sParty_GabbyAndTy3),
     },
 
     [TRAINER_GABBY_AND_TY_4] =
@@ -658,7 +658,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_GabbyAndTy4),
+        .party = EVERYTHING_CUSTOMIZED(sParty_GabbyAndTy4),
     },
 
     [TRAINER_GABBY_AND_TY_5] =
@@ -670,7 +670,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_GabbyAndTy5),
+        .party = EVERYTHING_CUSTOMIZED(sParty_GabbyAndTy5),
     },
 
     [TRAINER_GABBY_AND_TY_6] =
@@ -694,7 +694,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Lola1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Lola1),
     },
 
     [TRAINER_AUSTINA] =
@@ -706,7 +706,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Austina),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Austina),
     },
 
     [TRAINER_GWEN] =
@@ -718,7 +718,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Gwen),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Gwen),
     },
 
     [TRAINER_LOLA_2] =
@@ -730,7 +730,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Lola2),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Lola2),
     },
 
     [TRAINER_LOLA_3] =
@@ -742,7 +742,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Lola3),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Lola3),
     },
 
     [TRAINER_LOLA_4] =
@@ -754,7 +754,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Lola4),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Lola4),
     },
 
     [TRAINER_LOLA_5] =
@@ -766,7 +766,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Lola5),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Lola5),
     },
 
     [TRAINER_RICKY_1] =
@@ -790,7 +790,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Simon),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Simon),
     },
 
     [TRAINER_CHARLIE] =
@@ -802,7 +802,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Charlie),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Charlie),
     },
 
     [TRAINER_RICKY_2] =
@@ -922,7 +922,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 = NO_ITEM_DEFAULT_MOVES(sParty_Vincent),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Vincent),
     },
 
     [TRAINER_LEROY] =
@@ -934,7 +934,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 = NO_ITEM_DEFAULT_MOVES(sParty_Leroy),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Leroy),
     },
 
     [TRAINER_WILTON_1] =
@@ -946,7 +946,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 = NO_ITEM_DEFAULT_MOVES(sParty_Wilton1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Wilton1),
     },
 
     [TRAINER_EDGAR] =
@@ -958,7 +958,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 = NO_ITEM_DEFAULT_MOVES(sParty_Edgar),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Edgar),
     },
 
     [TRAINER_ALBERT] =
@@ -970,7 +970,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 = NO_ITEM_DEFAULT_MOVES(sParty_Albert),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Albert),
     },
 
     [TRAINER_SAMUEL] =
@@ -982,7 +982,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 = NO_ITEM_DEFAULT_MOVES(sParty_Samuel),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Samuel),
     },
 
     [TRAINER_VITO] =
@@ -994,7 +994,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 = NO_ITEM_DEFAULT_MOVES(sParty_Vito),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Vito),
     },
 
     [TRAINER_OWEN] =
@@ -1006,7 +1006,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 = NO_ITEM_DEFAULT_MOVES(sParty_Owen),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Owen),
     },
 
     [TRAINER_WILTON_2] =
@@ -1018,7 +1018,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 = NO_ITEM_DEFAULT_MOVES(sParty_Wilton2),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Wilton2),
     },
 
     [TRAINER_WILTON_3] =
@@ -1030,7 +1030,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 = NO_ITEM_DEFAULT_MOVES(sParty_Wilton3),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Wilton3),
     },
 
     [TRAINER_WILTON_4] =
@@ -1042,7 +1042,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 = NO_ITEM_DEFAULT_MOVES(sParty_Wilton4),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Wilton4),
     },
 
     [TRAINER_WILTON_5] =
@@ -1054,7 +1054,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 = NO_ITEM_DEFAULT_MOVES(sParty_Wilton5),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Wilton5),
     },
 
     [TRAINER_WARREN] =
@@ -1066,7 +1066,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 = NO_ITEM_DEFAULT_MOVES(sParty_Warren),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Warren),
     },
 
     [TRAINER_MARY] =
@@ -1126,7 +1126,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 = NO_ITEM_DEFAULT_MOVES(sParty_Keira),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Keira),
     },
 
     [TRAINER_BROOKE_1] =
@@ -1138,7 +1138,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 = NO_ITEM_DEFAULT_MOVES(sParty_Brooke1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Brooke1),
     },
 
     [TRAINER_JENNIFER] =
@@ -1150,7 +1150,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 = NO_ITEM_DEFAULT_MOVES(sParty_Jennifer),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Jennifer),
     },
 
     [TRAINER_HOPE] =
@@ -1162,7 +1162,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 = NO_ITEM_DEFAULT_MOVES(sParty_Hope),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Hope),
     },
 
     [TRAINER_SHANNON] =
@@ -1174,7 +1174,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 = NO_ITEM_DEFAULT_MOVES(sParty_Shannon),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Shannon),
     },
 
     [TRAINER_MICHELLE] =
@@ -1186,7 +1186,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 = NO_ITEM_DEFAULT_MOVES(sParty_Michelle),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Michelle),
     },
 
     [TRAINER_CAROLINE] =
@@ -1198,7 +1198,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 = NO_ITEM_DEFAULT_MOVES(sParty_Caroline),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Caroline),
     },
 
     [TRAINER_JULIE] =
@@ -1210,7 +1210,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 = NO_ITEM_DEFAULT_MOVES(sParty_Julie),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Julie),
     },
 
     [TRAINER_BROOKE_2] =
@@ -1222,7 +1222,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 = NO_ITEM_DEFAULT_MOVES(sParty_Brooke2),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Brooke2),
     },
 
     [TRAINER_BROOKE_3] =
@@ -1234,7 +1234,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 = NO_ITEM_DEFAULT_MOVES(sParty_Brooke3),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Brooke3),
     },
 
     [TRAINER_BROOKE_4] =
@@ -1246,7 +1246,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 = NO_ITEM_DEFAULT_MOVES(sParty_Brooke4),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Brooke4),
     },
 
     [TRAINER_BROOKE_5] =
@@ -1258,7 +1258,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 = NO_ITEM_DEFAULT_MOVES(sParty_Brooke5),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Brooke5),
     },
 
     [TRAINER_PATRICIA] =
@@ -1270,7 +1270,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Patricia),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Patricia),
     },
 
     [TRAINER_KINDRA] =
@@ -1282,7 +1282,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Kindra),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Kindra),
     },
 
     [TRAINER_TAMMY] =
@@ -1294,7 +1294,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Tammy),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Tammy),
     },
 
     [TRAINER_VALERIE_1] =
@@ -1306,7 +1306,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Valerie1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Valerie1),
     },
 
     [TRAINER_TASHA] =
@@ -1318,7 +1318,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Tasha),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Tasha),
     },
 
     [TRAINER_VALERIE_2] =
@@ -1330,7 +1330,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Valerie2),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Valerie2),
     },
 
     [TRAINER_VALERIE_3] =
@@ -1342,7 +1342,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Valerie3),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Valerie3),
     },
 
     [TRAINER_VALERIE_4] =
@@ -1354,7 +1354,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Valerie4),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Valerie4),
     },
 
     [TRAINER_VALERIE_5] =
@@ -1366,7 +1366,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Valerie5),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Valerie5),
     },
 
     [TRAINER_CINDY_1] =
@@ -1402,7 +1402,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntSpaceCenter2),
+        .party = EVERYTHING_CUSTOMIZED(sParty_GruntSpaceCenter2),
     },
 
     [TRAINER_CINDY_2] =
@@ -1498,7 +1498,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Melissa),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Melissa),
     },
 
     [TRAINER_SHEILA] =
@@ -1510,7 +1510,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Sheila),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Sheila),
     },
 
     [TRAINER_SHIRLEY] =
@@ -1522,7 +1522,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Shirley),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Shirley),
     },
 
     [TRAINER_JESSICA_1] =
@@ -1546,7 +1546,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Connie),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Connie),
     },
 
     [TRAINER_BRIDGET] =
@@ -1558,7 +1558,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Bridget),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Bridget),
     },
 
     [TRAINER_OLIVIA] =
@@ -1582,7 +1582,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Tiffany),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Tiffany),
     },
 
     [TRAINER_JESSICA_2] =
@@ -1654,7 +1654,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Mollie),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Mollie),
     },
 
     [TRAINER_GARRET] =
@@ -1726,7 +1726,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Steve1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Steve1),
     },
 
     [TRAINER_THALIA_1] =
@@ -1738,7 +1738,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Thalia1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Thalia1),
     },
 
     [TRAINER_MARK] =
@@ -1750,7 +1750,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Mark),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Mark),
     },
 
     [TRAINER_GRUNT_MT_CHIMNEY_1] =
@@ -1762,7 +1762,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMtChimney1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_GruntMtChimney1),
     },
 
     [TRAINER_STEVE_2] =
@@ -1774,7 +1774,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Steve2),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Steve2),
     },
 
     [TRAINER_STEVE_3] =
@@ -1786,7 +1786,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Steve3),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Steve3),
     },
 
     [TRAINER_STEVE_4] =
@@ -1798,7 +1798,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Steve4),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Steve4),
     },
 
     [TRAINER_STEVE_5] =
@@ -1810,7 +1810,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Steve5),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Steve5),
     },
 
     [TRAINER_LUIS] =
@@ -1822,7 +1822,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Luis),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Luis),
     },
 
     [TRAINER_DOMINIK] =
@@ -1834,7 +1834,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Dominik),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Dominik),
     },
 
     [TRAINER_DOUGLAS] =
@@ -1846,7 +1846,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Douglas),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Douglas),
     },
 
     [TRAINER_DARRIN] =
@@ -1858,7 +1858,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Darrin),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Darrin),
     },
 
     [TRAINER_TONY_1] =
@@ -1870,7 +1870,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Tony1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Tony1),
     },
 
     [TRAINER_JEROME] =
@@ -1882,7 +1882,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Jerome),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Jerome),
     },
 
     [TRAINER_MATTHEW] =
@@ -1894,7 +1894,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Matthew),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Matthew),
     },
 
     [TRAINER_DAVID] =
@@ -1906,7 +1906,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_David),
+        .party = EVERYTHING_CUSTOMIZED(sParty_David),
     },
 
     [TRAINER_SPENCER] =
@@ -1918,7 +1918,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Spencer),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Spencer),
     },
 
     [TRAINER_ROLAND] =
@@ -1930,7 +1930,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Roland),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Roland),
     },
 
     [TRAINER_NOLEN] =
@@ -1942,7 +1942,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Nolen),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Nolen),
     },
 
     [TRAINER_STAN] =
@@ -1954,7 +1954,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Stan),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Stan),
     },
 
     [TRAINER_BARRY] =
@@ -1966,7 +1966,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Barry),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Barry),
     },
 
     [TRAINER_DEAN] =
@@ -1978,7 +1978,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Dean),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Dean),
     },
 
     [TRAINER_RODNEY] =
@@ -1990,7 +1990,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Rodney),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Rodney),
     },
 
     [TRAINER_RICHARD] =
@@ -2002,7 +2002,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Richard),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Richard),
     },
 
     [TRAINER_HERMAN] =
@@ -2014,7 +2014,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Herman),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Herman),
     },
 
     [TRAINER_SANTIAGO] =
@@ -2026,7 +2026,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Santiago),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Santiago),
     },
 
     [TRAINER_GILBERT] =
@@ -2038,7 +2038,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Gilbert),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Gilbert),
     },
 
     [TRAINER_FRANKLIN] =
@@ -2050,7 +2050,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Franklin),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Franklin),
     },
 
     [TRAINER_KEVIN] =
@@ -2062,7 +2062,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Kevin),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Kevin),
     },
 
     [TRAINER_JACK] =
@@ -2074,7 +2074,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Jack),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Jack),
     },
 
     [TRAINER_DUDLEY] =
@@ -2086,7 +2086,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Dudley),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Dudley),
     },
 
     [TRAINER_CHAD] =
@@ -2098,7 +2098,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Chad),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Chad),
     },
 
     [TRAINER_TONY_2] =
@@ -2110,7 +2110,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Tony2),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Tony2),
     },
 
     [TRAINER_TONY_3] =
@@ -2122,7 +2122,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Tony3),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Tony3),
     },
 
     [TRAINER_TONY_4] =
@@ -2134,7 +2134,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Tony4),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Tony4),
     },
 
     [TRAINER_TONY_5] =
@@ -2146,7 +2146,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Tony5),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Tony5),
     },
 
     [TRAINER_TAKAO] =
@@ -2158,7 +2158,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Takao),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Takao),
     },
 
     [TRAINER_HITOSHI] =
@@ -2170,7 +2170,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Hitoshi),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Hitoshi),
     },
 
     [TRAINER_KIYO] =
@@ -2182,7 +2182,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Kiyo),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Kiyo),
     },
 
     [TRAINER_KOICHI] =
@@ -2194,7 +2194,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Koichi),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Koichi),
     },
 
     [TRAINER_NOB_1] =
@@ -2206,7 +2206,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Nob1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Nob1),
     },
 
     [TRAINER_NOB_2] =
@@ -2218,7 +2218,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Nob2),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Nob2),
     },
 
     [TRAINER_NOB_3] =
@@ -2230,7 +2230,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Nob3),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Nob3),
     },
 
     [TRAINER_NOB_4] =
@@ -2242,7 +2242,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Nob4),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Nob4),
     },
 
     [TRAINER_NOB_5] =
@@ -2266,7 +2266,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Yuji),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Yuji),
     },
 
     [TRAINER_DAISUKE] =
@@ -2278,7 +2278,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Daisuke),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Daisuke),
     },
 
     [TRAINER_ATSUSHI] =
@@ -2290,7 +2290,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Atsushi),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Atsushi),
     },
 
     [TRAINER_KIRK] =
@@ -2314,7 +2314,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntAquaHideout7),
+        .party = EVERYTHING_CUSTOMIZED(sParty_GruntAquaHideout7),
     },
 
     [TRAINER_GRUNT_AQUA_HIDEOUT_8] =
@@ -2326,7 +2326,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntAquaHideout8),
+        .party = EVERYTHING_CUSTOMIZED(sParty_GruntAquaHideout8),
     },
 
     [TRAINER_SHAWN] =
@@ -2338,7 +2338,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Shawn),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Shawn),
     },
 
     [TRAINER_FERNANDO_1] =
@@ -2350,7 +2350,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Fernando1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Fernando1),
     },
 
     [TRAINER_DALTON_1] =
@@ -2362,7 +2362,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Dalton1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Dalton1),
     },
 
     [TRAINER_DALTON_2] =
@@ -2374,7 +2374,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Dalton2),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Dalton2),
     },
 
     [TRAINER_DALTON_3] =
@@ -2386,7 +2386,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Dalton3),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Dalton3),
     },
 
     [TRAINER_DALTON_4] =
@@ -2398,7 +2398,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Dalton4),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Dalton4),
     },
 
     [TRAINER_DALTON_5] =
@@ -2410,7 +2410,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Dalton5),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Dalton5),
     },
 
     [TRAINER_COLE] =
@@ -2422,7 +2422,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Cole),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Cole),
     },
 
     [TRAINER_JEFF] =
@@ -2434,7 +2434,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Jeff),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Jeff),
     },
 
     [TRAINER_AXLE] =
@@ -2446,7 +2446,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Axle),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Axle),
     },
 
     [TRAINER_JACE] =
@@ -2458,7 +2458,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Jace),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Jace),
     },
 
     [TRAINER_KEEGAN] =
@@ -2470,7 +2470,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Keegan),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Keegan),
     },
 
     [TRAINER_BERNIE_1] =
@@ -2482,7 +2482,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Bernie1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Bernie1),
     },
 
     [TRAINER_BERNIE_2] =
@@ -2494,7 +2494,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Bernie2),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Bernie2),
     },
 
     [TRAINER_BERNIE_3] =
@@ -2506,7 +2506,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Bernie3),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Bernie3),
     },
 
     [TRAINER_BERNIE_4] =
@@ -2518,7 +2518,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Bernie4),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Bernie4),
     },
 
     [TRAINER_BERNIE_5] =
@@ -2530,7 +2530,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Bernie5),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Bernie5),
     },
 
     [TRAINER_DREW] =
@@ -2566,7 +2566,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Larry),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Larry),
     },
 
     [TRAINER_SHANE] =
@@ -2578,7 +2578,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Shane),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Shane),
     },
 
     [TRAINER_JUSTIN] =
@@ -2590,7 +2590,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Justin),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Justin),
     },
 
     [TRAINER_ETHAN_1] =
@@ -2602,7 +2602,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Ethan1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Ethan1),
     },
 
     [TRAINER_AUTUMN] =
@@ -2614,7 +2614,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Autumn),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Autumn),
     },
 
     [TRAINER_TRAVIS] =
@@ -2626,7 +2626,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Travis),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Travis),
     },
 
     [TRAINER_ETHAN_2] =
@@ -2638,7 +2638,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Ethan2),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Ethan2),
     },
 
     [TRAINER_ETHAN_3] =
@@ -2650,7 +2650,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Ethan3),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Ethan3),
     },
 
     [TRAINER_ETHAN_4] =
@@ -2662,7 +2662,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Ethan4),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Ethan4),
     },
 
     [TRAINER_ETHAN_5] =
@@ -2674,7 +2674,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Ethan5),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Ethan5),
     },
 
     [TRAINER_BRENT] =
@@ -2686,7 +2686,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Brent),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Brent),
     },
 
     [TRAINER_DONALD] =
@@ -2698,7 +2698,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Donald),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Donald),
     },
 
     [TRAINER_TAYLOR] =
@@ -2710,7 +2710,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Taylor),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Taylor),
     },
 
     [TRAINER_JEFFREY_1] =
@@ -2722,7 +2722,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Jeffrey1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Jeffrey1),
     },
 
     [TRAINER_DEREK] =
@@ -2734,7 +2734,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Derek),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Derek),
     },
 
     [TRAINER_JEFFREY_2] =
@@ -2746,7 +2746,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Jeffrey2),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Jeffrey2),
     },
 
     [TRAINER_JEFFREY_3] =
@@ -2758,7 +2758,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Jeffrey3),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Jeffrey3),
     },
 
     [TRAINER_JEFFREY_4] =
@@ -2770,7 +2770,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Jeffrey4),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Jeffrey4),
     },
 
     [TRAINER_JEFFREY_5] =
@@ -2806,7 +2806,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Preston),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Preston),
     },
 
     [TRAINER_VIRGIL] =
@@ -2818,7 +2818,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Virgil),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Virgil),
     },
 
     [TRAINER_BLAKE] =
@@ -2830,7 +2830,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Blake),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Blake),
     },
 
     [TRAINER_WILLIAM] =
@@ -2842,7 +2842,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_William),
+        .party = EVERYTHING_CUSTOMIZED(sParty_William),
     },
 
     [TRAINER_JOSHUA] =
@@ -2854,7 +2854,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Joshua),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Joshua),
     },
 
     [TRAINER_CAMERON_1] =
@@ -2866,7 +2866,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Cameron1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Cameron1),
     },
 
     [TRAINER_CAMERON_2] =
@@ -2878,7 +2878,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Cameron2),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Cameron2),
     },
 
     [TRAINER_CAMERON_3] =
@@ -2890,7 +2890,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Cameron3),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Cameron3),
     },
 
     [TRAINER_CAMERON_4] =
@@ -2902,7 +2902,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Cameron4),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Cameron4),
     },
 
     [TRAINER_CAMERON_5] =
@@ -2914,7 +2914,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Cameron5),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Cameron5),
     },
 
     [TRAINER_JACLYN] =
@@ -2938,7 +2938,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Hannah),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Hannah),
     },
 
     [TRAINER_SAMANTHA] =
@@ -2950,7 +2950,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Samantha),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Samantha),
     },
 
     [TRAINER_MAURA] =
@@ -2962,7 +2962,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Maura),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Maura),
     },
 
     [TRAINER_KAYLA] =
@@ -2974,7 +2974,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Kayla),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Kayla),
     },
 
     [TRAINER_ALEXIS] =
@@ -2986,7 +2986,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Alexis),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Alexis),
     },
 
     [TRAINER_JACKI_1] =
@@ -2998,7 +2998,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Jacki1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Jacki1),
     },
 
     [TRAINER_JACKI_2] =
@@ -3010,7 +3010,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Jacki2),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Jacki2),
     },
 
     [TRAINER_JACKI_3] =
@@ -3022,7 +3022,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Jacki3),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Jacki3),
     },
 
     [TRAINER_JACKI_4] =
@@ -3034,7 +3034,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Jacki4),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Jacki4),
     },
 
     [TRAINER_JACKI_5] =
@@ -3046,7 +3046,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Jacki5),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Jacki5),
     },
 
     [TRAINER_WALTER_1] =
@@ -3058,7 +3058,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Walter1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Walter1),
     },
 
     [TRAINER_MICAH] =
@@ -3070,7 +3070,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Micah),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Micah),
     },
 
     [TRAINER_THOMAS] =
@@ -3082,7 +3082,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Thomas),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Thomas),
     },
 
     [TRAINER_WALTER_2] =
@@ -3094,7 +3094,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Walter2),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Walter2),
     },
 
     [TRAINER_WALTER_3] =
@@ -3286,7 +3286,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Jerry1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Jerry1),
     },
 
     [TRAINER_TED] =
@@ -3298,7 +3298,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Ted),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Ted),
     },
 
     [TRAINER_PAUL] =
@@ -3310,7 +3310,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Paul),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Paul),
     },
 
     [TRAINER_JERRY_2] =
@@ -3322,7 +3322,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Jerry2),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Jerry2),
     },
 
     [TRAINER_JERRY_3] =
@@ -3334,7 +3334,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Jerry3),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Jerry3),
     },
 
     [TRAINER_JERRY_4] =
@@ -3346,7 +3346,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Jerry4),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Jerry4),
     },
 
     [TRAINER_JERRY_5] =
@@ -3358,7 +3358,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Jerry5),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Jerry5),
     },
 
     [TRAINER_KAREN_1] =
@@ -3370,7 +3370,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Karen1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Karen1),
     },
 
     [TRAINER_GEORGIA] =
@@ -3382,7 +3382,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Georgia),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Georgia),
     },
 
     [TRAINER_KAREN_2] =
@@ -3394,7 +3394,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Karen2),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Karen2),
     },
 
     [TRAINER_KAREN_3] =
@@ -3406,7 +3406,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Karen3),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Karen3),
     },
 
     [TRAINER_KAREN_4] =
@@ -3418,7 +3418,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Karen4),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Karen4),
     },
 
     [TRAINER_KAREN_5] =
@@ -3430,7 +3430,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Karen5),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Karen5),
     },
 
     [TRAINER_KATE_AND_JOY] =
@@ -3694,7 +3694,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Timothy1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Timothy1),
     },
 
     [TRAINER_TIMOTHY_2] =
@@ -3766,7 +3766,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Shelby1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Shelby1),
     },
 
     [TRAINER_SHELBY_2] =
@@ -3778,7 +3778,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Shelby2),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Shelby2),
     },
 
     [TRAINER_SHELBY_3] =
@@ -3790,7 +3790,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Shelby3),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Shelby3),
     },
 
     [TRAINER_SHELBY_4] =
@@ -3802,7 +3802,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Shelby4),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Shelby4),
     },
 
     [TRAINER_SHELBY_5] =
@@ -3814,7 +3814,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Shelby5),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Shelby5),
     },
 
     [TRAINER_CALVIN_1] =
@@ -3826,7 +3826,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Calvin1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Calvin1),
     },
 
     [TRAINER_BILLY] =
@@ -3838,7 +3838,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Billy),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Billy),
     },
 
     [TRAINER_JOSH] =
@@ -3862,7 +3862,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Tommy),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Tommy),
     },
 
     [TRAINER_JOEY] =
@@ -3874,7 +3874,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Joey),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Joey),
     },
 
     [TRAINER_BEN] =
@@ -3922,7 +3922,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Jaylen),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Jaylen),
     },
 
     [TRAINER_DILLON] =
@@ -3934,7 +3934,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Dillon),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Dillon),
     },
 
     [TRAINER_CALVIN_2] =
@@ -3946,7 +3946,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Calvin2),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Calvin2),
     },
 
     [TRAINER_CALVIN_3] =
@@ -3958,7 +3958,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Calvin3),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Calvin3),
     },
 
     [TRAINER_CALVIN_4] =
@@ -3970,7 +3970,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Calvin4),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Calvin4),
     },
 
     [TRAINER_CALVIN_5] =
@@ -3982,7 +3982,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Calvin5),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Calvin5),
     },
 
     [TRAINER_EDDIE] =
@@ -3994,7 +3994,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Eddie),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Eddie),
     },
 
     [TRAINER_ALLEN] =
@@ -4006,7 +4006,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Allen),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Allen),
     },
 
     [TRAINER_TIMMY] =
@@ -4018,7 +4018,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Timmy),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Timmy),
     },
 
     [TRAINER_WALLACE] =
@@ -4042,7 +4042,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Andrew),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Andrew),
     },
 
     [TRAINER_IVAN] =
@@ -4054,7 +4054,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Ivan),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Ivan),
     },
 
     [TRAINER_CLAUDE] =
@@ -4066,7 +4066,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Claude),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Claude),
     },
 
     [TRAINER_ELLIOT_1] =
@@ -4078,7 +4078,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Elliot1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Elliot1),
     },
 
     [TRAINER_NED] =
@@ -4090,7 +4090,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Ned),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Ned),
     },
 
     [TRAINER_DALE] =
@@ -4102,7 +4102,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Dale),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Dale),
     },
 
     [TRAINER_NOLAN] =
@@ -4114,7 +4114,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Nolan),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Nolan),
     },
 
     [TRAINER_BARNY] =
@@ -4126,7 +4126,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Barny),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Barny),
     },
 
     [TRAINER_WADE] =
@@ -4138,7 +4138,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Wade),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Wade),
     },
 
     [TRAINER_CARTER] =
@@ -4150,7 +4150,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Carter),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Carter),
     },
 
     [TRAINER_ELLIOT_2] =
@@ -4162,7 +4162,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Elliot2),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Elliot2),
     },
 
     [TRAINER_ELLIOT_3] =
@@ -4174,7 +4174,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Elliot3),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Elliot3),
     },
 
     [TRAINER_ELLIOT_4] =
@@ -4186,7 +4186,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Elliot4),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Elliot4),
     },
 
     [TRAINER_ELLIOT_5] =
@@ -4198,7 +4198,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Elliot5),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Elliot5),
     },
 
     [TRAINER_RONALD] =
@@ -4210,7 +4210,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Ronald),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Ronald),
     },
 
     [TRAINER_JACOB] =
@@ -4222,7 +4222,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Jacob),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Jacob),
     },
 
     [TRAINER_ANTHONY] =
@@ -4234,7 +4234,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Anthony),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Anthony),
     },
 
     [TRAINER_BENJAMIN_1] =
@@ -4246,7 +4246,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Benjamin1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Benjamin1),
     },
 
     [TRAINER_BENJAMIN_2] =
@@ -4258,7 +4258,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Benjamin2),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Benjamin2),
     },
 
     [TRAINER_BENJAMIN_3] =
@@ -4270,7 +4270,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Benjamin3),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Benjamin3),
     },
 
     [TRAINER_BENJAMIN_4] =
@@ -4282,7 +4282,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Benjamin4),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Benjamin4),
     },
 
     [TRAINER_BENJAMIN_5] =
@@ -4294,7 +4294,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Benjamin5),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Benjamin5),
     },
 
     [TRAINER_ABIGAIL_1] =
@@ -4306,7 +4306,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Abigail1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Abigail1),
     },
 
     [TRAINER_JASMINE] =
@@ -4318,7 +4318,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Jasmine),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Jasmine),
     },
 
     [TRAINER_ABIGAIL_2] =
@@ -4330,7 +4330,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Abigail2),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Abigail2),
     },
 
     [TRAINER_ABIGAIL_3] =
@@ -4342,7 +4342,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Abigail3),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Abigail3),
     },
 
     [TRAINER_ABIGAIL_4] =
@@ -4354,7 +4354,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Abigail4),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Abigail4),
     },
 
     [TRAINER_ABIGAIL_5] =
@@ -4366,7 +4366,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Abigail5),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Abigail5),
     },
 
     [TRAINER_DYLAN_1] =
@@ -4378,7 +4378,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Dylan1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Dylan1),
     },
 
     [TRAINER_DYLAN_2] =
@@ -4390,7 +4390,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Dylan2),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Dylan2),
     },
 
     [TRAINER_DYLAN_3] =
@@ -4402,7 +4402,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Dylan3),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Dylan3),
     },
 
     [TRAINER_DYLAN_4] =
@@ -4414,7 +4414,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Dylan4),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Dylan4),
     },
 
     [TRAINER_DYLAN_5] =
@@ -4426,7 +4426,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Dylan5),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Dylan5),
     },
 
     [TRAINER_MARIA_1] =
@@ -4438,7 +4438,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Maria1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Maria1),
     },
 
     [TRAINER_MARIA_2] =
@@ -4450,7 +4450,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Maria2),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Maria2),
     },
 
     [TRAINER_MARIA_3] =
@@ -4462,7 +4462,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Maria3),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Maria3),
     },
 
     [TRAINER_MARIA_4] =
@@ -4474,7 +4474,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Maria4),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Maria4),
     },
 
     [TRAINER_MARIA_5] =
@@ -4486,7 +4486,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Maria5),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Maria5),
     },
 
     [TRAINER_CAMDEN] =
@@ -4498,7 +4498,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Camden),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Camden),
     },
 
     [TRAINER_DEMETRIUS] =
@@ -4510,7 +4510,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Demetrius),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Demetrius),
     },
 
     [TRAINER_ISAIAH_1] =
@@ -4522,7 +4522,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Isaiah1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Isaiah1),
     },
 
     [TRAINER_PABLO_1] =
@@ -4534,7 +4534,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Pablo1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Pablo1),
     },
 
     [TRAINER_CHASE] =
@@ -4546,7 +4546,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Chase),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Chase),
     },
 
     [TRAINER_ISAIAH_2] =
@@ -4558,7 +4558,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Isaiah2),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Isaiah2),
     },
 
     [TRAINER_ISAIAH_3] =
@@ -4570,7 +4570,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Isaiah3),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Isaiah3),
     },
 
     [TRAINER_ISAIAH_4] =
@@ -4582,7 +4582,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Isaiah4),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Isaiah4),
     },
 
     [TRAINER_ISAIAH_5] =
@@ -4594,7 +4594,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Isaiah5),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Isaiah5),
     },
 
     [TRAINER_ISOBEL] =
@@ -4606,7 +4606,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Isobel),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Isobel),
     },
 
     [TRAINER_DONNY] =
@@ -4618,7 +4618,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Donny),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Donny),
     },
 
     [TRAINER_TALIA] =
@@ -4630,7 +4630,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Talia),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Talia),
     },
 
     [TRAINER_KATELYN_1] =
@@ -4642,7 +4642,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Katelyn1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Katelyn1),
     },
 
     [TRAINER_ALLISON] =
@@ -4654,7 +4654,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Allison),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Allison),
     },
 
     [TRAINER_KATELYN_2] =
@@ -4666,7 +4666,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Katelyn2),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Katelyn2),
     },
 
     [TRAINER_KATELYN_3] =
@@ -4678,7 +4678,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Katelyn3),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Katelyn3),
     },
 
     [TRAINER_KATELYN_4] =
@@ -4690,7 +4690,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Katelyn4),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Katelyn4),
     },
 
     [TRAINER_KATELYN_5] =
@@ -4702,7 +4702,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Katelyn5),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Katelyn5),
     },
 
     [TRAINER_NICOLAS_1] =
@@ -4714,7 +4714,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Nicolas1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Nicolas1),
     },
 
     [TRAINER_NICOLAS_2] =
@@ -4726,7 +4726,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Nicolas2),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Nicolas2),
     },
 
     [TRAINER_NICOLAS_3] =
@@ -4738,7 +4738,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Nicolas3),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Nicolas3),
     },
 
     [TRAINER_NICOLAS_4] =
@@ -4750,7 +4750,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Nicolas4),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Nicolas4),
     },
 
     [TRAINER_NICOLAS_5] =
@@ -4786,7 +4786,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Perry),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Perry),
     },
 
     [TRAINER_HUGH] =
@@ -4798,7 +4798,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Hugh),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Hugh),
     },
 
     [TRAINER_PHIL] =
@@ -4810,7 +4810,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Phil),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Phil),
     },
 
     [TRAINER_JARED] =
@@ -4822,7 +4822,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Jared),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Jared),
     },
 
     [TRAINER_HUMBERTO] =
@@ -4834,7 +4834,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Humberto),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Humberto),
     },
 
     [TRAINER_PRESLEY] =
@@ -4846,7 +4846,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Presley),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Presley),
     },
 
     [TRAINER_EDWARDO] =
@@ -4858,7 +4858,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Edwardo),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Edwardo),
     },
 
     [TRAINER_COLIN] =
@@ -4870,7 +4870,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Colin),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Colin),
     },
 
     [TRAINER_ROBERT_1] =
@@ -4882,7 +4882,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Robert1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Robert1),
     },
 
     [TRAINER_BENNY] =
@@ -4894,7 +4894,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Benny),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Benny),
     },
 
     [TRAINER_CHESTER] =
@@ -4906,7 +4906,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Chester),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Chester),
     },
 
     [TRAINER_ROBERT_2] =
@@ -4918,7 +4918,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Robert2),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Robert2),
     },
 
     [TRAINER_ROBERT_3] =
@@ -4930,7 +4930,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Robert3),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Robert3),
     },
 
     [TRAINER_ROBERT_4] =
@@ -4942,7 +4942,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Robert4),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Robert4),
     },
 
     [TRAINER_ROBERT_5] =
@@ -4954,7 +4954,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Robert5),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Robert5),
     },
 
     [TRAINER_ALEX] =
@@ -4966,7 +4966,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Alex),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Alex),
     },
 
     [TRAINER_BECK] =
@@ -4978,7 +4978,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Beck),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Beck),
     },
 
     [TRAINER_YASU] =
@@ -4990,7 +4990,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Yasu),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Yasu),
     },
 
     [TRAINER_TAKASHI] =
@@ -5002,7 +5002,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Takashi),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Takashi),
     },
 
     [TRAINER_DIANNE] =
@@ -5026,7 +5026,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = 0,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Jani),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Jani),
     },
 
     [TRAINER_LAO_1] =
@@ -5050,7 +5050,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = 0,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Lung),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Lung),
     },
 
     [TRAINER_LAO_2] =
@@ -5110,7 +5110,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Jocelyn),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Jocelyn),
     },
 
     [TRAINER_LAURA] =
@@ -5122,7 +5122,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Laura),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Laura),
     },
 
     [TRAINER_CYNDY_1] =
@@ -5134,7 +5134,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Cyndy1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Cyndy1),
     },
 
     [TRAINER_CORA] =
@@ -5146,7 +5146,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Cora),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Cora),
     },
 
     [TRAINER_PAULA] =
@@ -5158,7 +5158,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Paula),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Paula),
     },
 
     [TRAINER_CYNDY_2] =
@@ -5170,7 +5170,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Cyndy2),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Cyndy2),
     },
 
     [TRAINER_CYNDY_3] =
@@ -5182,7 +5182,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Cyndy3),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Cyndy3),
     },
 
     [TRAINER_CYNDY_4] =
@@ -5194,7 +5194,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Cyndy4),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Cyndy4),
     },
 
     [TRAINER_CYNDY_5] =
@@ -5206,7 +5206,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Cyndy5),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Cyndy5),
     },
 
     [TRAINER_MADELINE_1] =
@@ -5230,7 +5230,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Clarissa),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Clarissa),
     },
 
     [TRAINER_ANGELICA] =
@@ -5302,7 +5302,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Beverly),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Beverly),
     },
 
     [TRAINER_IMANI] =
@@ -5314,7 +5314,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Imani),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Imani),
     },
 
     [TRAINER_KYLA] =
@@ -5326,7 +5326,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Kyla),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Kyla),
     },
 
     [TRAINER_DENISE] =
@@ -5338,7 +5338,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Denise),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Denise),
     },
 
     [TRAINER_BETH] =
@@ -5350,7 +5350,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Beth),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Beth),
     },
 
     [TRAINER_TARA] =
@@ -5362,7 +5362,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Tara),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Tara),
     },
 
     [TRAINER_MISSY] =
@@ -5374,7 +5374,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Missy),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Missy),
     },
 
     [TRAINER_ALICE] =
@@ -5386,7 +5386,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Alice),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Alice),
     },
 
     [TRAINER_JENNY_1] =
@@ -5398,7 +5398,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Jenny1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Jenny1),
     },
 
     [TRAINER_GRACE] =
@@ -5410,7 +5410,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Grace),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Grace),
     },
 
     [TRAINER_TANYA] =
@@ -5422,7 +5422,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Tanya),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Tanya),
     },
 
     [TRAINER_SHARON] =
@@ -5434,7 +5434,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Sharon),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Sharon),
     },
 
     [TRAINER_NIKKI] =
@@ -5446,7 +5446,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Nikki),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Nikki),
     },
 
     [TRAINER_BRENDA] =
@@ -5458,7 +5458,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Brenda),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Brenda),
     },
 
     [TRAINER_KATIE] =
@@ -5470,7 +5470,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Katie),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Katie),
     },
 
     [TRAINER_SUSIE] =
@@ -5482,7 +5482,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Susie),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Susie),
     },
 
     [TRAINER_KARA] =
@@ -5494,7 +5494,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Kara),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Kara),
     },
 
     [TRAINER_DANA] =
@@ -5506,7 +5506,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Dana),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Dana),
     },
 
     [TRAINER_SIENNA] =
@@ -5518,7 +5518,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Sienna),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Sienna),
     },
 
     [TRAINER_DEBRA] =
@@ -5530,7 +5530,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Debra),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Debra),
     },
 
     [TRAINER_LINDA] =
@@ -5542,7 +5542,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Linda),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Linda),
     },
 
     [TRAINER_KAYLEE] =
@@ -5554,7 +5554,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Kaylee),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Kaylee),
     },
 
     [TRAINER_LAUREL] =
@@ -5566,7 +5566,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Laurel),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Laurel),
     },
 
     [TRAINER_CARLEE] =
@@ -5578,7 +5578,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Carlee),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Carlee),
     },
 
     [TRAINER_JENNY_2] =
@@ -5590,7 +5590,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Jenny2),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Jenny2),
     },
 
     [TRAINER_JENNY_3] =
@@ -5602,7 +5602,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Jenny3),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Jenny3),
     },
 
     [TRAINER_JENNY_4] =
@@ -5614,7 +5614,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Jenny4),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Jenny4),
     },
 
     [TRAINER_JENNY_5] =
@@ -5626,7 +5626,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Jenny5),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Jenny5),
     },
 
     [TRAINER_HEIDI] =
@@ -5662,7 +5662,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Carol),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Carol),
     },
 
     [TRAINER_NANCY] =
@@ -5674,7 +5674,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Nancy),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Nancy),
     },
 
     [TRAINER_MARTHA] =
@@ -5686,7 +5686,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Martha),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Martha),
     },
 
     [TRAINER_DIANA_1] =
@@ -5698,7 +5698,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Diana1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Diana1),
     },
 
     [TRAINER_CEDRIC] =
@@ -5722,7 +5722,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Irene),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Irene),
     },
 
     [TRAINER_DIANA_2] =
@@ -5734,7 +5734,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Diana2),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Diana2),
     },
 
     [TRAINER_DIANA_3] =
@@ -5746,7 +5746,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Diana3),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Diana3),
     },
 
     [TRAINER_DIANA_4] =
@@ -5758,7 +5758,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Diana4),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Diana4),
     },
 
     [TRAINER_DIANA_5] =
@@ -5770,7 +5770,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Diana5),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Diana5),
     },
 
     [TRAINER_AMY_AND_LIV_1] =
@@ -5782,7 +5782,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_AmyAndLiv1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_AmyAndLiv1),
     },
 
     [TRAINER_AMY_AND_LIV_2] =
@@ -5794,7 +5794,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_AmyAndLiv2),
+        .party = EVERYTHING_CUSTOMIZED(sParty_AmyAndLiv2),
     },
 
     [TRAINER_GINA_AND_MIA_1] =
@@ -5806,7 +5806,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_GinaAndMia1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_GinaAndMia1),
     },
 
     [TRAINER_MIU_AND_YUKI] =
@@ -5818,7 +5818,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_MiuAndYuki),
+        .party = EVERYTHING_CUSTOMIZED(sParty_MiuAndYuki),
     },
 
     [TRAINER_AMY_AND_LIV_3] =
@@ -5830,7 +5830,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_AmyAndLiv3),
+        .party = EVERYTHING_CUSTOMIZED(sParty_AmyAndLiv3),
     },
 
     [TRAINER_GINA_AND_MIA_2] =
@@ -5854,7 +5854,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_AmyAndLiv4),
+        .party = EVERYTHING_CUSTOMIZED(sParty_AmyAndLiv4),
     },
 
     [TRAINER_AMY_AND_LIV_5] =
@@ -5890,7 +5890,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Huey),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Huey),
     },
 
     [TRAINER_EDMOND] =
@@ -5902,7 +5902,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Edmond),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Edmond),
     },
 
     [TRAINER_ERNEST_1] =
@@ -5914,7 +5914,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Ernest1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Ernest1),
     },
 
     [TRAINER_DWAYNE] =
@@ -5926,7 +5926,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Dwayne),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Dwayne),
     },
 
     [TRAINER_PHILLIP] =
@@ -5938,7 +5938,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Phillip),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Phillip),
     },
 
     [TRAINER_LEONARD] =
@@ -5950,7 +5950,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Leonard),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Leonard),
     },
 
     [TRAINER_DUNCAN] =
@@ -5962,7 +5962,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Duncan),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Duncan),
     },
 
     [TRAINER_ERNEST_2] =
@@ -5974,7 +5974,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Ernest2),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Ernest2),
     },
 
     [TRAINER_ERNEST_3] =
@@ -5986,7 +5986,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Ernest3),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Ernest3),
     },
 
     [TRAINER_ERNEST_4] =
@@ -5998,7 +5998,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Ernest4),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Ernest4),
     },
 
     [TRAINER_ERNEST_5] =
@@ -6010,7 +6010,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Ernest5),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Ernest5),
     },
 
     [TRAINER_ELI] =
@@ -6022,7 +6022,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Eli),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Eli),
     },
 
     [TRAINER_ANNIKA] =
@@ -6046,7 +6046,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 = NO_ITEM_DEFAULT_MOVES(sParty_Jazmyn),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Jazmyn),
     },
 
     [TRAINER_JONAS] =
@@ -6082,7 +6082,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Auron),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Auron),
     },
 
     [TRAINER_KELVIN] =
@@ -6094,7 +6094,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Kelvin),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Kelvin),
     },
 
     [TRAINER_MARLEY] =
@@ -6118,7 +6118,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Reyna),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Reyna),
     },
 
     [TRAINER_HUDSON] =
@@ -6130,7 +6130,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Hudson),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Hudson),
     },
 
     [TRAINER_CONOR] =
@@ -6142,7 +6142,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Conor),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Conor),
     },
 
     [TRAINER_EDWIN_1] =
@@ -6154,7 +6154,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Edwin1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Edwin1),
     },
 
     [TRAINER_HECTOR] =
@@ -6166,7 +6166,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Hector),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Hector),
     },
 
     [TRAINER_TABITHA_MOSSDEEP] =
@@ -6178,7 +6178,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_TabithaMossdeep),
+        .party = EVERYTHING_CUSTOMIZED(sParty_TabithaMossdeep),
     },
 
     [TRAINER_EDWIN_2] =
@@ -6190,7 +6190,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Edwin2),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Edwin2),
     },
 
     [TRAINER_EDWIN_3] =
@@ -6202,7 +6202,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Edwin3),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Edwin3),
     },
 
     [TRAINER_EDWIN_4] =
@@ -6214,7 +6214,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Edwin4),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Edwin4),
     },
 
     [TRAINER_EDWIN_5] =
@@ -6226,7 +6226,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Edwin5),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Edwin5),
     },
 
     [TRAINER_WALLY_VR_1] =
@@ -6250,7 +6250,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_BrendanRoute103Mudkip),
+        .party = EVERYTHING_CUSTOMIZED(sParty_BrendanRoute103Mudkip),
     },
 
     [TRAINER_BRENDAN_ROUTE_110_MUDKIP] =
@@ -6262,7 +6262,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_BrendanRoute110Mudkip),
+        .party = EVERYTHING_CUSTOMIZED(sParty_BrendanRoute110Mudkip),
     },
 
     [TRAINER_BRENDAN_ROUTE_119_MUDKIP] =
@@ -6274,7 +6274,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_BrendanRoute119Mudkip),
+        .party = EVERYTHING_CUSTOMIZED(sParty_BrendanRoute119Mudkip),
     },
 
     [TRAINER_BRENDAN_ROUTE_103_TREECKO] =
@@ -6286,7 +6286,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 = NO_ITEM_DEFAULT_MOVES(sParty_BrendanRoute103Treecko),
+        .party = EVERYTHING_CUSTOMIZED(sParty_BrendanRoute103Treecko),
     },
 
     [TRAINER_BRENDAN_ROUTE_110_TREECKO] =
@@ -6298,7 +6298,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_BrendanRoute110Treecko),
+        .party = EVERYTHING_CUSTOMIZED(sParty_BrendanRoute110Treecko),
     },
 
     [TRAINER_BRENDAN_ROUTE_119_TREECKO] =
@@ -6310,7 +6310,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_BrendanRoute119Treecko),
+        .party = EVERYTHING_CUSTOMIZED(sParty_BrendanRoute119Treecko),
     },
 
     [TRAINER_BRENDAN_ROUTE_103_TORCHIC] =
@@ -6322,7 +6322,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_BrendanRoute103Torchic),
+        .party = EVERYTHING_CUSTOMIZED(sParty_BrendanRoute103Torchic),
     },
 
     [TRAINER_BRENDAN_ROUTE_110_TORCHIC] =
@@ -6334,7 +6334,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_BrendanRoute110Torchic),
+        .party = EVERYTHING_CUSTOMIZED(sParty_BrendanRoute110Torchic),
     },
 
     [TRAINER_BRENDAN_ROUTE_119_TORCHIC] =
@@ -6346,7 +6346,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_BrendanRoute119Torchic),
+        .party = EVERYTHING_CUSTOMIZED(sParty_BrendanRoute119Torchic),
     },
 
     [TRAINER_MAY_ROUTE_103_MUDKIP] =
@@ -6358,7 +6358,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_MayRoute103Mudkip),
+        .party = EVERYTHING_CUSTOMIZED(sParty_MayRoute103Mudkip),
     },
 
     [TRAINER_MAY_ROUTE_110_MUDKIP] =
@@ -6370,7 +6370,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_MayRoute110Mudkip),
+        .party = EVERYTHING_CUSTOMIZED(sParty_MayRoute110Mudkip),
     },
 
     [TRAINER_MAY_ROUTE_119_MUDKIP] =
@@ -6382,7 +6382,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_MayRoute119Mudkip),
+        .party = EVERYTHING_CUSTOMIZED(sParty_MayRoute119Mudkip),
     },
 
     [TRAINER_MAY_ROUTE_103_TREECKO] =
@@ -6394,7 +6394,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_MayRoute103Treecko),
+        .party = EVERYTHING_CUSTOMIZED(sParty_MayRoute103Treecko),
     },
 
     [TRAINER_MAY_ROUTE_110_TREECKO] =
@@ -6406,7 +6406,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_MayRoute110Treecko),
+        .party = EVERYTHING_CUSTOMIZED(sParty_MayRoute110Treecko),
     },
 
     [TRAINER_MAY_ROUTE_119_TREECKO] =
@@ -6418,7 +6418,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_MayRoute119Treecko),
+        .party = EVERYTHING_CUSTOMIZED(sParty_MayRoute119Treecko),
     },
 
     [TRAINER_MAY_ROUTE_103_TORCHIC] =
@@ -6430,7 +6430,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_MayRoute103Torchic),
+        .party = EVERYTHING_CUSTOMIZED(sParty_MayRoute103Torchic),
     },
 
     [TRAINER_MAY_ROUTE_110_TORCHIC] =
@@ -6442,7 +6442,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_MayRoute110Torchic),
+        .party = EVERYTHING_CUSTOMIZED(sParty_MayRoute110Torchic),
     },
 
     [TRAINER_MAY_ROUTE_119_TORCHIC] =
@@ -6454,7 +6454,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_MayRoute119Torchic),
+        .party = EVERYTHING_CUSTOMIZED(sParty_MayRoute119Torchic),
     },
 
     [TRAINER_ISAAC_1] =
@@ -6466,7 +6466,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Isaac1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Isaac1),
     },
 
     [TRAINER_DAVIS] =
@@ -6478,7 +6478,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Davis),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Davis),
     },
 
     [TRAINER_MITCHELL] =
@@ -6502,7 +6502,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Isaac2),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Isaac2),
     },
 
     [TRAINER_ISAAC_3] =
@@ -6514,7 +6514,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Isaac3),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Isaac3),
     },
 
     [TRAINER_ISAAC_4] =
@@ -6526,7 +6526,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Isaac4),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Isaac4),
     },
 
     [TRAINER_ISAAC_5] =
@@ -6538,7 +6538,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Isaac5),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Isaac5),
     },
 
     [TRAINER_LYDIA_1] =
@@ -6550,7 +6550,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Lydia1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Lydia1),
     },
 
     [TRAINER_HALLE] =
@@ -6562,7 +6562,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 = NO_ITEM_DEFAULT_MOVES(sParty_Halle),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Halle),
     },
 
     [TRAINER_GARRISON] =
@@ -6574,7 +6574,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Garrison),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Garrison),
     },
 
     [TRAINER_LYDIA_2] =
@@ -6586,7 +6586,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Lydia2),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Lydia2),
     },
 
     [TRAINER_LYDIA_3] =
@@ -6598,7 +6598,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Lydia3),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Lydia3),
     },
 
     [TRAINER_LYDIA_4] =
@@ -6610,7 +6610,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Lydia4),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Lydia4),
     },
 
     [TRAINER_LYDIA_5] =
@@ -6622,7 +6622,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Lydia5),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Lydia5),
     },
 
     [TRAINER_JACKSON_1] =
@@ -6634,7 +6634,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 = NO_ITEM_DEFAULT_MOVES(sParty_Jackson1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Jackson1),
     },
 
     [TRAINER_LORENZO] =
@@ -6646,7 +6646,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 = NO_ITEM_DEFAULT_MOVES(sParty_Lorenzo),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Lorenzo),
     },
 
     [TRAINER_SEBASTIAN] =
@@ -6658,7 +6658,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 = NO_ITEM_DEFAULT_MOVES(sParty_Sebastian),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Sebastian),
     },
 
     [TRAINER_JACKSON_2] =
@@ -6670,7 +6670,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 = NO_ITEM_DEFAULT_MOVES(sParty_Jackson2),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Jackson2),
     },
 
     [TRAINER_JACKSON_3] =
@@ -6682,7 +6682,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 = NO_ITEM_DEFAULT_MOVES(sParty_Jackson3),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Jackson3),
     },
 
     [TRAINER_JACKSON_4] =
@@ -6694,7 +6694,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 = NO_ITEM_DEFAULT_MOVES(sParty_Jackson4),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Jackson4),
     },
 
     [TRAINER_JACKSON_5] =
@@ -6706,7 +6706,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 = NO_ITEM_DEFAULT_MOVES(sParty_Jackson5),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Jackson5),
     },
 
     [TRAINER_CATHERINE_1] =
@@ -6718,7 +6718,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 = NO_ITEM_DEFAULT_MOVES(sParty_Catherine1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Catherine1),
     },
 
     [TRAINER_JENNA] =
@@ -6730,7 +6730,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 = NO_ITEM_DEFAULT_MOVES(sParty_Jenna),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Jenna),
     },
 
     [TRAINER_SOPHIA] =
@@ -6742,7 +6742,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 = NO_ITEM_DEFAULT_MOVES(sParty_Sophia),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Sophia),
     },
 
     [TRAINER_CATHERINE_2] =
@@ -6754,7 +6754,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 = NO_ITEM_DEFAULT_MOVES(sParty_Catherine2),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Catherine2),
     },
 
     [TRAINER_CATHERINE_3] =
@@ -6766,7 +6766,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 = NO_ITEM_DEFAULT_MOVES(sParty_Catherine3),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Catherine3),
     },
 
     [TRAINER_CATHERINE_4] =
@@ -6778,7 +6778,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 = NO_ITEM_DEFAULT_MOVES(sParty_Catherine4),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Catherine4),
     },
 
     [TRAINER_CATHERINE_5] =
@@ -6790,7 +6790,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 = NO_ITEM_DEFAULT_MOVES(sParty_Catherine5),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Catherine5),
     },
 
     [TRAINER_JULIO] =
@@ -6802,7 +6802,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Julio),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Julio),
     },
 
     [TRAINER_GRUNT_SEAFLOOR_CAVERN_5] =
@@ -6814,7 +6814,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntSeafloorCavern5),
+        .party = EVERYTHING_CUSTOMIZED(sParty_GruntSeafloorCavern5),
     },
 
     [TRAINER_GRUNT_UNUSED] =
@@ -6826,7 +6826,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntUnused),
+        .party = EVERYTHING_CUSTOMIZED(sParty_GruntUnused),
     },
 
     [TRAINER_GRUNT_MT_PYRE_4] =
@@ -6838,7 +6838,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMtPyre4),
+        .party = EVERYTHING_CUSTOMIZED(sParty_GruntMtPyre4),
     },
 
     [TRAINER_GRUNT_JAGGED_PASS] =
@@ -6850,7 +6850,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntJaggedPass),
+        .party = EVERYTHING_CUSTOMIZED(sParty_GruntJaggedPass),
     },
 
     [TRAINER_MARC] =
@@ -6862,7 +6862,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Marc),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Marc),
     },
 
     [TRAINER_BRENDEN] =
@@ -6874,7 +6874,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Brenden),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Brenden),
     },
 
     [TRAINER_LILITH] =
@@ -6886,7 +6886,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Lilith),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Lilith),
     },
 
     [TRAINER_CRISTIAN] =
@@ -6898,7 +6898,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Cristian),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Cristian),
     },
 
     [TRAINER_SYLVIA] =
@@ -6910,7 +6910,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Sylvia),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Sylvia),
     },
 
     [TRAINER_LEONARDO] =
@@ -6922,7 +6922,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Leonardo),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Leonardo),
     },
 
     [TRAINER_ATHENA] =
@@ -6946,7 +6946,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Harrison),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Harrison),
     },
 
     [TRAINER_GRUNT_MT_CHIMNEY_2] =
@@ -6958,7 +6958,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMtChimney2),
+        .party = EVERYTHING_CUSTOMIZED(sParty_GruntMtChimney2),
     },
 
     [TRAINER_CLARENCE] =
@@ -6970,7 +6970,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Clarence),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Clarence),
     },
 
     [TRAINER_TERRY] =
@@ -6982,7 +6982,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Terry),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Terry),
     },
 
     [TRAINER_NATE] =
@@ -6994,7 +6994,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Nate),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Nate),
     },
 
     [TRAINER_KATHLEEN] =
@@ -7006,7 +7006,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Kathleen),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Kathleen),
     },
 
     [TRAINER_CLIFFORD] =
@@ -7018,7 +7018,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Clifford),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Clifford),
     },
 
     [TRAINER_NICHOLAS] =
@@ -7030,7 +7030,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Nicholas),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Nicholas),
     },
 
     [TRAINER_GRUNT_SPACE_CENTER_3] =
@@ -7042,7 +7042,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntSpaceCenter3),
+        .party = EVERYTHING_CUSTOMIZED(sParty_GruntSpaceCenter3),
     },
 
     [TRAINER_GRUNT_SPACE_CENTER_4] =
@@ -7054,7 +7054,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntSpaceCenter4),
+        .party = EVERYTHING_CUSTOMIZED(sParty_GruntSpaceCenter4),
     },
 
     [TRAINER_GRUNT_SPACE_CENTER_5] =
@@ -7066,7 +7066,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntSpaceCenter5),
+        .party = EVERYTHING_CUSTOMIZED(sParty_GruntSpaceCenter5),
     },
 
     [TRAINER_GRUNT_SPACE_CENTER_6] =
@@ -7078,7 +7078,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntSpaceCenter6),
+        .party = EVERYTHING_CUSTOMIZED(sParty_GruntSpaceCenter6),
     },
 
     [TRAINER_GRUNT_SPACE_CENTER_7] =
@@ -7090,7 +7090,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntSpaceCenter7),
+        .party = EVERYTHING_CUSTOMIZED(sParty_GruntSpaceCenter7),
     },
 
     [TRAINER_MACEY] =
@@ -7102,7 +7102,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Macey),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Macey),
     },
 
     [TRAINER_BRENDAN_RUSTBORO_TREECKO] =
@@ -7114,7 +7114,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_BrendanRustboroTreecko),
+        .party = EVERYTHING_CUSTOMIZED(sParty_BrendanRustboroTreecko),
     },
 
     [TRAINER_BRENDAN_RUSTBORO_MUDKIP] =
@@ -7126,7 +7126,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_BrendanRustboroMudkip),
+        .party = EVERYTHING_CUSTOMIZED(sParty_BrendanRustboroMudkip),
     },
 
     [TRAINER_PAXTON] =
@@ -7138,7 +7138,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Paxton),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Paxton),
     },
 
     [TRAINER_ISABELLA] =
@@ -7150,7 +7150,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Isabella),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Isabella),
     },
 
     [TRAINER_GRUNT_WEATHER_INST_5] =
@@ -7162,7 +7162,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntWeatherInst5),
+        .party = EVERYTHING_CUSTOMIZED(sParty_GruntWeatherInst5),
     },
 
     [TRAINER_TABITHA_MT_CHIMNEY] =
@@ -7174,7 +7174,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_TabithaMtChimney),
+        .party = EVERYTHING_CUSTOMIZED(sParty_TabithaMtChimney),
     },
 
     [TRAINER_JONATHAN] =
@@ -7186,7 +7186,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 = NO_ITEM_DEFAULT_MOVES(sParty_Jonathan),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Jonathan),
     },
 
     [TRAINER_BRENDAN_RUSTBORO_TORCHIC] =
@@ -7198,7 +7198,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_BrendanRustboroTorchic),
+        .party = EVERYTHING_CUSTOMIZED(sParty_BrendanRustboroTorchic),
     },
 
     [TRAINER_MAY_RUSTBORO_MUDKIP] =
@@ -7210,7 +7210,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 = NO_ITEM_DEFAULT_MOVES(sParty_MayRustboroMudkip),
+        .party = EVERYTHING_CUSTOMIZED(sParty_MayRustboroMudkip),
     },
 
     [TRAINER_MAXIE_MAGMA_HIDEOUT] =
@@ -7222,7 +7222,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 = NO_ITEM_DEFAULT_MOVES(sParty_MaxieMagmaHideout),
+        .party = EVERYTHING_CUSTOMIZED(sParty_MaxieMagmaHideout),
     },
 
     [TRAINER_MAXIE_MT_CHIMNEY] =
@@ -7234,7 +7234,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 = NO_ITEM_DEFAULT_MOVES(sParty_MaxieMtChimney),
+        .party = EVERYTHING_CUSTOMIZED(sParty_MaxieMtChimney),
     },
 
     [TRAINER_TIANA] =
@@ -7246,7 +7246,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Tiana),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Tiana),
     },
 
     [TRAINER_HALEY_1] =
@@ -7258,7 +7258,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Haley1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Haley1),
     },
 
     [TRAINER_JANICE] =
@@ -7270,7 +7270,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Janice),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Janice),
     },
 
     [TRAINER_VIVI] =
@@ -7282,7 +7282,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Vivi),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Vivi),
     },
 
     [TRAINER_HALEY_2] =
@@ -7294,7 +7294,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Haley2),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Haley2),
     },
 
     [TRAINER_HALEY_3] =
@@ -7306,7 +7306,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Haley3),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Haley3),
     },
 
     [TRAINER_HALEY_4] =
@@ -7318,7 +7318,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Haley4),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Haley4),
     },
 
     [TRAINER_HALEY_5] =
@@ -7330,7 +7330,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Haley5),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Haley5),
     },
 
     [TRAINER_SALLY] =
@@ -7342,7 +7342,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Sally),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Sally),
     },
 
     [TRAINER_ROBIN] =
@@ -7354,7 +7354,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Robin),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Robin),
     },
 
     [TRAINER_ANDREA] =
@@ -7366,7 +7366,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Andrea),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Andrea),
     },
 
     [TRAINER_CRISSY] =
@@ -7378,7 +7378,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Crissy),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Crissy),
     },
 
     [TRAINER_RICK] =
@@ -7390,7 +7390,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Rick),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Rick),
     },
 
     [TRAINER_LYLE] =
@@ -7402,7 +7402,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Lyle),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Lyle),
     },
 
     [TRAINER_JOSE] =
@@ -7414,7 +7414,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Jose),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Jose),
     },
 
     [TRAINER_DOUG] =
@@ -7426,7 +7426,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Doug),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Doug),
     },
 
     [TRAINER_GREG] =
@@ -7438,7 +7438,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Greg),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Greg),
     },
 
     [TRAINER_KENT] =
@@ -7450,7 +7450,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Kent),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Kent),
     },
 
     [TRAINER_JAMES_1] =
@@ -7462,7 +7462,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_James1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_James1),
     },
 
     [TRAINER_JAMES_2] =
@@ -7474,7 +7474,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_James2),
+        .party = EVERYTHING_CUSTOMIZED(sParty_James2),
     },
 
     [TRAINER_JAMES_3] =
@@ -7486,7 +7486,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_James3),
+        .party = EVERYTHING_CUSTOMIZED(sParty_James3),
     },
 
     [TRAINER_JAMES_4] =
@@ -7498,7 +7498,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_James4),
+        .party = EVERYTHING_CUSTOMIZED(sParty_James4),
     },
 
     [TRAINER_JAMES_5] =
@@ -7510,7 +7510,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_James5),
+        .party = EVERYTHING_CUSTOMIZED(sParty_James5),
     },
 
     [TRAINER_BRICE] =
@@ -7522,7 +7522,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Brice),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Brice),
     },
 
     [TRAINER_TRENT_1] =
@@ -7534,7 +7534,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Trent1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Trent1),
     },
 
     [TRAINER_LENNY] =
@@ -7546,7 +7546,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Lenny),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Lenny),
     },
 
     [TRAINER_LUCAS_1] =
@@ -7558,7 +7558,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Lucas1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Lucas1),
     },
 
     [TRAINER_ALAN] =
@@ -7570,7 +7570,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Alan),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Alan),
     },
 
     [TRAINER_CLARK] =
@@ -7582,7 +7582,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Clark),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Clark),
     },
 
     [TRAINER_ERIC] =
@@ -7594,7 +7594,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Eric),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Eric),
     },
 
     [TRAINER_LUCAS_2] =
@@ -7630,7 +7630,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Mike2),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Mike2),
     },
 
     [TRAINER_TRENT_2] =
@@ -7642,7 +7642,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Trent2),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Trent2),
     },
 
     [TRAINER_TRENT_3] =
@@ -7654,7 +7654,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Trent3),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Trent3),
     },
 
     [TRAINER_TRENT_4] =
@@ -7666,7 +7666,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Trent4),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Trent4),
     },
 
     [TRAINER_TRENT_5] =
@@ -7678,7 +7678,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Trent5),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Trent5),
     },
 
     [TRAINER_DEZ_AND_LUKE] =
@@ -7690,7 +7690,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_DezAndLuke),
+        .party = EVERYTHING_CUSTOMIZED(sParty_DezAndLuke),
     },
 
     [TRAINER_LEA_AND_JED] =
@@ -7702,7 +7702,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_LeaAndJed),
+        .party = EVERYTHING_CUSTOMIZED(sParty_LeaAndJed),
     },
 
     [TRAINER_KIRA_AND_DAN_1] =
@@ -7714,7 +7714,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_KiraAndDan1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_KiraAndDan1),
     },
 
     [TRAINER_KIRA_AND_DAN_2] =
@@ -7726,7 +7726,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_KiraAndDan2),
+        .party = EVERYTHING_CUSTOMIZED(sParty_KiraAndDan2),
     },
 
     [TRAINER_KIRA_AND_DAN_3] =
@@ -7738,7 +7738,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_KiraAndDan3),
+        .party = EVERYTHING_CUSTOMIZED(sParty_KiraAndDan3),
     },
 
     [TRAINER_KIRA_AND_DAN_4] =
@@ -7750,7 +7750,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_KiraAndDan4),
+        .party = EVERYTHING_CUSTOMIZED(sParty_KiraAndDan4),
     },
 
     [TRAINER_KIRA_AND_DAN_5] =
@@ -7762,7 +7762,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_KiraAndDan5),
+        .party = EVERYTHING_CUSTOMIZED(sParty_KiraAndDan5),
     },
 
     [TRAINER_JOHANNA] =
@@ -7774,7 +7774,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Johanna),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Johanna),
     },
 
     [TRAINER_GERALD] =
@@ -7858,7 +7858,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Flint),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Flint),
     },
 
     [TRAINER_ASHLEY] =
@@ -7870,7 +7870,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Ashley),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Ashley),
     },
 
     [TRAINER_WALLY_MAUVILLE] =
@@ -7882,7 +7882,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_WallyMauville),
+        .party = EVERYTHING_CUSTOMIZED(sParty_WallyMauville),
     },
 
     [TRAINER_WALLY_VR_2] =
@@ -7942,7 +7942,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_BrendanLilycoveMudkip),
+        .party = EVERYTHING_CUSTOMIZED(sParty_BrendanLilycoveMudkip),
     },
 
     [TRAINER_BRENDAN_LILYCOVE_TREECKO] =
@@ -7954,7 +7954,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_BrendanLilycoveTreecko),
+        .party = EVERYTHING_CUSTOMIZED(sParty_BrendanLilycoveTreecko),
     },
 
     [TRAINER_BRENDAN_LILYCOVE_TORCHIC] =
@@ -7966,7 +7966,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_BrendanLilycoveTorchic),
+        .party = EVERYTHING_CUSTOMIZED(sParty_BrendanLilycoveTorchic),
     },
 
     [TRAINER_MAY_LILYCOVE_MUDKIP] =
@@ -7978,7 +7978,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_MayLilycoveMudkip),
+        .party = EVERYTHING_CUSTOMIZED(sParty_MayLilycoveMudkip),
     },
 
     [TRAINER_MAY_LILYCOVE_TREECKO] =
@@ -7990,7 +7990,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_MayLilycoveTreecko),
+        .party = EVERYTHING_CUSTOMIZED(sParty_MayLilycoveTreecko),
     },
 
     [TRAINER_MAY_LILYCOVE_TORCHIC] =
@@ -8002,7 +8002,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_MayLilycoveTorchic),
+        .party = EVERYTHING_CUSTOMIZED(sParty_MayLilycoveTorchic),
     },
 
     [TRAINER_JONAH] =
@@ -8014,7 +8014,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Jonah),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Jonah),
     },
 
     [TRAINER_HENRY] =
@@ -8026,7 +8026,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Henry),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Henry),
     },
 
     [TRAINER_ROGER] =
@@ -8038,7 +8038,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Roger),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Roger),
     },
 
     [TRAINER_ALEXA] =
@@ -8050,7 +8050,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 = NO_ITEM_DEFAULT_MOVES(sParty_Alexa),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Alexa),
     },
 
     [TRAINER_RUBEN] =
@@ -8062,7 +8062,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 = NO_ITEM_DEFAULT_MOVES(sParty_Ruben),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Ruben),
     },
 
     [TRAINER_KOJI_1] =
@@ -8074,7 +8074,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Koji1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Koji1),
     },
 
     [TRAINER_WAYNE] =
@@ -8086,7 +8086,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Wayne),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Wayne),
     },
 
     [TRAINER_AIDAN] =
@@ -8098,7 +8098,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Aidan),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Aidan),
     },
 
     [TRAINER_REED] =
@@ -8110,7 +8110,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Reed),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Reed),
     },
 
     [TRAINER_TISHA] =
@@ -8122,7 +8122,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Tisha),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Tisha),
     },
 
     [TRAINER_TORI_AND_TIA] =
@@ -8134,7 +8134,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_ToriAndTia),
+        .party = EVERYTHING_CUSTOMIZED(sParty_ToriAndTia),
     },
 
     [TRAINER_KIM_AND_IRIS] =
@@ -8242,7 +8242,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_ReliAndIan),
+        .party = EVERYTHING_CUSTOMIZED(sParty_ReliAndIan),
     },
 
     [TRAINER_LILA_AND_ROY_1] =
@@ -8254,7 +8254,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_LilaAndRoy1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_LilaAndRoy1),
     },
 
     [TRAINER_LILA_AND_ROY_2] =
@@ -8266,7 +8266,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_LilaAndRoy2),
+        .party = EVERYTHING_CUSTOMIZED(sParty_LilaAndRoy2),
     },
 
     [TRAINER_LILA_AND_ROY_3] =
@@ -8278,7 +8278,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_LilaAndRoy3),
+        .party = EVERYTHING_CUSTOMIZED(sParty_LilaAndRoy3),
     },
 
     [TRAINER_LILA_AND_ROY_4] =
@@ -8290,7 +8290,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_LilaAndRoy4),
+        .party = EVERYTHING_CUSTOMIZED(sParty_LilaAndRoy4),
     },
 
     [TRAINER_LILA_AND_ROY_5] =
@@ -8302,7 +8302,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_LilaAndRoy5),
+        .party = EVERYTHING_CUSTOMIZED(sParty_LilaAndRoy5),
     },
 
     [TRAINER_LISA_AND_RAY] =
@@ -8314,7 +8314,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_LisaAndRay),
+        .party = EVERYTHING_CUSTOMIZED(sParty_LisaAndRay),
     },
 
     [TRAINER_CHRIS] =
@@ -8326,7 +8326,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Chris),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Chris),
     },
 
     [TRAINER_DAWSON] =
@@ -8362,7 +8362,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Darian),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Darian),
     },
 
     [TRAINER_HAILEY] =
@@ -8374,7 +8374,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Hailey),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Hailey),
     },
 
     [TRAINER_CHANDLER] =
@@ -8386,7 +8386,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Chandler),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Chandler),
     },
 
     [TRAINER_KALEB] =
@@ -8410,7 +8410,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Joseph),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Joseph),
     },
 
     [TRAINER_ALYSSA] =
@@ -8422,7 +8422,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Alyssa),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Alyssa),
     },
 
     [TRAINER_MARCOS] =
@@ -8434,7 +8434,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Marcos),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Marcos),
     },
 
     [TRAINER_RHETT] =
@@ -8446,7 +8446,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Rhett),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Rhett),
     },
 
     [TRAINER_TYRON] =
@@ -8458,7 +8458,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Tyron),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Tyron),
     },
 
     [TRAINER_CELINA] =
@@ -8470,7 +8470,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Celina),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Celina),
     },
 
     [TRAINER_BIANCA] =
@@ -8482,7 +8482,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Bianca),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Bianca),
     },
 
     [TRAINER_HAYDEN] =
@@ -8494,7 +8494,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Hayden),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Hayden),
     },
 
     [TRAINER_SOPHIE] =
@@ -8506,7 +8506,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Sophie),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Sophie),
     },
 
     [TRAINER_COBY] =
@@ -8518,7 +8518,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Coby),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Coby),
     },
 
     [TRAINER_LAWRENCE] =
@@ -8530,7 +8530,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Lawrence),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Lawrence),
     },
 
     [TRAINER_WYATT] =
@@ -8542,7 +8542,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Wyatt),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Wyatt),
     },
 
     [TRAINER_ANGELINA] =
@@ -8554,7 +8554,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Angelina),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Angelina),
     },
 
     [TRAINER_KAI] =
@@ -8566,7 +8566,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Kai),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Kai),
     },
 
     [TRAINER_CHARLOTTE] =
@@ -8578,7 +8578,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Charlotte),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Charlotte),
     },
 
     [TRAINER_DEANDRE] =
@@ -8590,7 +8590,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Deandre),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Deandre),
     },
 
     [TRAINER_GRUNT_MAGMA_HIDEOUT_1] =
@@ -8602,7 +8602,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMagmaHideout1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_GruntMagmaHideout1),
     },
 
     [TRAINER_GRUNT_MAGMA_HIDEOUT_2] =
@@ -8614,7 +8614,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMagmaHideout2),
+        .party = EVERYTHING_CUSTOMIZED(sParty_GruntMagmaHideout2),
     },
 
     [TRAINER_GRUNT_MAGMA_HIDEOUT_3] =
@@ -8626,7 +8626,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMagmaHideout3),
+        .party = EVERYTHING_CUSTOMIZED(sParty_GruntMagmaHideout3),
     },
 
     [TRAINER_GRUNT_MAGMA_HIDEOUT_4] =
@@ -8638,7 +8638,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMagmaHideout4),
+        .party = EVERYTHING_CUSTOMIZED(sParty_GruntMagmaHideout4),
     },
 
     [TRAINER_GRUNT_MAGMA_HIDEOUT_5] =
@@ -8650,7 +8650,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMagmaHideout5),
+        .party = EVERYTHING_CUSTOMIZED(sParty_GruntMagmaHideout5),
     },
 
     [TRAINER_GRUNT_MAGMA_HIDEOUT_6] =
@@ -8662,7 +8662,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMagmaHideout6),
+        .party = EVERYTHING_CUSTOMIZED(sParty_GruntMagmaHideout6),
     },
 
     [TRAINER_GRUNT_MAGMA_HIDEOUT_7] =
@@ -8674,7 +8674,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMagmaHideout7),
+        .party = EVERYTHING_CUSTOMIZED(sParty_GruntMagmaHideout7),
     },
 
     [TRAINER_GRUNT_MAGMA_HIDEOUT_8] =
@@ -8686,7 +8686,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMagmaHideout8),
+        .party = EVERYTHING_CUSTOMIZED(sParty_GruntMagmaHideout8),
     },
 
     [TRAINER_GRUNT_MAGMA_HIDEOUT_9] =
@@ -8698,7 +8698,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMagmaHideout9),
+        .party = EVERYTHING_CUSTOMIZED(sParty_GruntMagmaHideout9),
     },
 
     [TRAINER_GRUNT_MAGMA_HIDEOUT_10] =
@@ -8710,7 +8710,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMagmaHideout10),
+        .party = EVERYTHING_CUSTOMIZED(sParty_GruntMagmaHideout10),
     },
 
     [TRAINER_GRUNT_MAGMA_HIDEOUT_11] =
@@ -8722,7 +8722,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMagmaHideout11),
+        .party = EVERYTHING_CUSTOMIZED(sParty_GruntMagmaHideout11),
     },
 
     [TRAINER_GRUNT_MAGMA_HIDEOUT_12] =
@@ -8734,7 +8734,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMagmaHideout12),
+        .party = EVERYTHING_CUSTOMIZED(sParty_GruntMagmaHideout12),
     },
 
     [TRAINER_GRUNT_MAGMA_HIDEOUT_13] =
@@ -8746,7 +8746,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMagmaHideout13),
+        .party = EVERYTHING_CUSTOMIZED(sParty_GruntMagmaHideout13),
     },
 
     [TRAINER_GRUNT_MAGMA_HIDEOUT_14] =
@@ -8758,7 +8758,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMagmaHideout14),
+        .party = EVERYTHING_CUSTOMIZED(sParty_GruntMagmaHideout14),
     },
 
     [TRAINER_GRUNT_MAGMA_HIDEOUT_15] =
@@ -8770,7 +8770,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMagmaHideout15),
+        .party = EVERYTHING_CUSTOMIZED(sParty_GruntMagmaHideout15),
     },
 
     [TRAINER_GRUNT_MAGMA_HIDEOUT_16] =
@@ -8782,7 +8782,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_GruntMagmaHideout16),
+        .party = EVERYTHING_CUSTOMIZED(sParty_GruntMagmaHideout16),
     },
 
     [TRAINER_TABITHA_MAGMA_HIDEOUT] =
@@ -8794,7 +8794,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_TabithaMagmaHideout),
+        .party = EVERYTHING_CUSTOMIZED(sParty_TabithaMagmaHideout),
     },
 
     [TRAINER_DARCY] =
@@ -8806,7 +8806,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 = NO_ITEM_DEFAULT_MOVES(sParty_Darcy),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Darcy),
     },
 
     [TRAINER_MAXIE_MOSSDEEP] =
@@ -8818,7 +8818,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_MaxieMossdeep),
+        .party = EVERYTHING_CUSTOMIZED(sParty_MaxieMossdeep),
     },
 
     [TRAINER_PETE] =
@@ -8830,7 +8830,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Pete),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Pete),
     },
 
     [TRAINER_ISABELLE] =
@@ -8842,7 +8842,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Isabelle),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Isabelle),
     },
 
     [TRAINER_ANDRES_1] =
@@ -8854,7 +8854,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Andres1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Andres1),
     },
 
     [TRAINER_JOSUE] =
@@ -8866,7 +8866,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Josue),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Josue),
     },
 
     [TRAINER_CAMRON] =
@@ -8878,7 +8878,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Camron),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Camron),
     },
 
     [TRAINER_CORY_1] =
@@ -8890,7 +8890,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Cory1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Cory1),
     },
 
     [TRAINER_CAROLINA] =
@@ -8902,7 +8902,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 = NO_ITEM_DEFAULT_MOVES(sParty_Carolina),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Carolina),
     },
 
     [TRAINER_ELIJAH] =
@@ -8914,7 +8914,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Elijah),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Elijah),
     },
 
     [TRAINER_CELIA] =
@@ -8926,7 +8926,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Celia),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Celia),
     },
 
     [TRAINER_BRYAN] =
@@ -8938,7 +8938,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Bryan),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Bryan),
     },
 
     [TRAINER_BRANDEN] =
@@ -8950,7 +8950,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Branden),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Branden),
     },
 
     [TRAINER_BRYANT] =
@@ -8962,7 +8962,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Bryant),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Bryant),
     },
 
     [TRAINER_SHAYLA] =
@@ -8974,7 +8974,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Shayla),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Shayla),
     },
 
     [TRAINER_KYRA] =
@@ -8986,7 +8986,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Kyra),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Kyra),
     },
 
     [TRAINER_JAIDEN] =
@@ -8998,7 +8998,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Jaiden),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Jaiden),
     },
 
     [TRAINER_ALIX] =
@@ -9010,7 +9010,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Alix),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Alix),
     },
 
     [TRAINER_HELENE] =
@@ -9022,7 +9022,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Helene),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Helene),
     },
 
     [TRAINER_MARLENE] =
@@ -9034,7 +9034,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Marlene),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Marlene),
     },
 
     [TRAINER_DEVAN] =
@@ -9046,7 +9046,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Devan),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Devan),
     },
 
     [TRAINER_JOHNSON] =
@@ -9058,7 +9058,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Johnson),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Johnson),
     },
 
     [TRAINER_MELINA] =
@@ -9070,7 +9070,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Melina),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Melina),
     },
 
     [TRAINER_BRANDI] =
@@ -9082,7 +9082,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Brandi),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Brandi),
     },
 
     [TRAINER_AISHA] =
@@ -9094,7 +9094,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Aisha),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Aisha),
     },
 
     [TRAINER_MAKAYLA] =
@@ -9106,7 +9106,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 = NO_ITEM_DEFAULT_MOVES(sParty_Makayla),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Makayla),
     },
 
     [TRAINER_FABIAN] =
@@ -9118,7 +9118,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Fabian),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Fabian),
     },
 
     [TRAINER_DAYTON] =
@@ -9130,7 +9130,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Dayton),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Dayton),
     },
 
     [TRAINER_RACHEL] =
@@ -9142,7 +9142,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Rachel),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Rachel),
     },
 
     [TRAINER_LEONEL] =
@@ -9166,7 +9166,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Callie),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Callie),
     },
 
     [TRAINER_CALE] =
@@ -9178,7 +9178,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Cale),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Cale),
     },
 
     [TRAINER_MYLES] =
@@ -9190,7 +9190,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Myles),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Myles),
     },
 
     [TRAINER_PAT] =
@@ -9202,7 +9202,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Pat),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Pat),
     },
 
     [TRAINER_CRISTIN_1] =
@@ -9214,7 +9214,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 = NO_ITEM_DEFAULT_MOVES(sParty_Cristin1),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Cristin1),
     },
 
     [TRAINER_MAY_RUSTBORO_TREECKO] =
@@ -9226,7 +9226,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_MayRustboroTreecko),
+        .party = EVERYTHING_CUSTOMIZED(sParty_MayRustboroTreecko),
     },
 
     [TRAINER_MAY_RUSTBORO_TORCHIC] =
@@ -9238,7 +9238,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_MayRustboroTorchic),
+        .party = EVERYTHING_CUSTOMIZED(sParty_MayRustboroTorchic),
     },
 
     [TRAINER_ROXANNE_2] =
@@ -9646,7 +9646,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Darius),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Darius),
     },
 
     [TRAINER_STEVEN] =
@@ -9670,7 +9670,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Anabel),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Anabel),
     },
 
     [TRAINER_TUCKER] =
@@ -9682,7 +9682,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Tucker),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Tucker),
     },
 
     [TRAINER_SPENSER] =
@@ -9694,7 +9694,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Spenser),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Spenser),
     },
 
     [TRAINER_GRETA] =
@@ -9706,7 +9706,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Greta),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Greta),
     },
 
     [TRAINER_NOLAND] =
@@ -9718,7 +9718,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Noland),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Noland),
     },
 
     [TRAINER_LUCY] =
@@ -9730,7 +9730,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Lucy),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Lucy),
     },
 
     [TRAINER_BRANDON] =
@@ -9742,7 +9742,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Brandon),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Brandon),
     },
 
     [TRAINER_ANDRES_2] =
@@ -9754,7 +9754,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Andres2),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Andres2),
     },
 
     [TRAINER_ANDRES_3] =
@@ -9766,7 +9766,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Andres3),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Andres3),
     },
 
     [TRAINER_ANDRES_4] =
@@ -9778,7 +9778,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Andres4),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Andres4),
     },
 
     [TRAINER_ANDRES_5] =
@@ -9790,7 +9790,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Andres5),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Andres5),
     },
 
     [TRAINER_CORY_2] =
@@ -9802,7 +9802,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Cory2),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Cory2),
     },
 
     [TRAINER_CORY_3] =
@@ -9814,7 +9814,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Cory3),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Cory3),
     },
 
     [TRAINER_CORY_4] =
@@ -9826,7 +9826,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Cory4),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Cory4),
     },
 
     [TRAINER_CORY_5] =
@@ -9838,7 +9838,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Cory5),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Cory5),
     },
 
     [TRAINER_PABLO_2] =
@@ -9850,7 +9850,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Pablo2),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Pablo2),
     },
 
     [TRAINER_PABLO_3] =
@@ -9862,7 +9862,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Pablo3),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Pablo3),
     },
 
     [TRAINER_PABLO_4] =
@@ -9874,7 +9874,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Pablo4),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Pablo4),
     },
 
     [TRAINER_PABLO_5] =
@@ -9886,7 +9886,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Pablo5),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Pablo5),
     },
 
     [TRAINER_KOJI_2] =
@@ -9898,7 +9898,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Koji2),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Koji2),
     },
 
     [TRAINER_KOJI_3] =
@@ -9910,7 +9910,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Koji3),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Koji3),
     },
 
     [TRAINER_KOJI_4] =
@@ -9922,7 +9922,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Koji4),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Koji4),
     },
 
     [TRAINER_KOJI_5] =
@@ -9934,7 +9934,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Koji5),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Koji5),
     },
 
     [TRAINER_CRISTIN_2] =
@@ -9946,7 +9946,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 = NO_ITEM_DEFAULT_MOVES(sParty_Cristin2),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Cristin2),
     },
 
     [TRAINER_CRISTIN_3] =
@@ -9958,7 +9958,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 = NO_ITEM_DEFAULT_MOVES(sParty_Cristin3),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Cristin3),
     },
 
     [TRAINER_CRISTIN_4] =
@@ -9970,7 +9970,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 = NO_ITEM_DEFAULT_MOVES(sParty_Cristin4),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Cristin4),
     },
 
     [TRAINER_CRISTIN_5] =
@@ -9982,7 +9982,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 = NO_ITEM_DEFAULT_MOVES(sParty_Cristin5),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Cristin5),
     },
 
     [TRAINER_FERNANDO_2] =
@@ -9994,7 +9994,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Fernando2),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Fernando2),
     },
 
     [TRAINER_FERNANDO_3] =
@@ -10006,7 +10006,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Fernando3),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Fernando3),
     },
 
     [TRAINER_FERNANDO_4] =
@@ -10018,7 +10018,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Fernando4),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Fernando4),
     },
 
     [TRAINER_FERNANDO_5] =
@@ -10030,7 +10030,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Fernando5),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Fernando5),
     },
 
     [TRAINER_SAWYER_2] =
@@ -10042,7 +10042,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Sawyer2),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Sawyer2),
     },
 
     [TRAINER_SAWYER_3] =
@@ -10054,7 +10054,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Sawyer3),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Sawyer3),
     },
 
     [TRAINER_SAWYER_4] =
@@ -10066,7 +10066,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Sawyer4),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Sawyer4),
     },
 
     [TRAINER_SAWYER_5] =
@@ -10078,7 +10078,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Sawyer5),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Sawyer5),
     },
 
     [TRAINER_GABRIELLE_2] =
@@ -10090,7 +10090,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Gabrielle2),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Gabrielle2),
     },
 
     [TRAINER_GABRIELLE_3] =
@@ -10102,7 +10102,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Gabrielle3),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Gabrielle3),
     },
 
     [TRAINER_GABRIELLE_4] =
@@ -10114,7 +10114,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Gabrielle4),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Gabrielle4),
     },
 
     [TRAINER_GABRIELLE_5] =
@@ -10126,7 +10126,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Gabrielle5),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Gabrielle5),
     },
 
     [TRAINER_THALIA_2] =
@@ -10138,7 +10138,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Thalia2),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Thalia2),
     },
 
     [TRAINER_THALIA_3] =
@@ -10150,7 +10150,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Thalia3),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Thalia3),
     },
 
     [TRAINER_THALIA_4] =
@@ -10162,7 +10162,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Thalia4),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Thalia4),
     },
 
     [TRAINER_THALIA_5] =
@@ -10174,7 +10174,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_FLAG_CHECK_BAD_MOVE,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Thalia5),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Thalia5),
     },
 
     [TRAINER_MARIELA] =
@@ -10186,7 +10186,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = 0,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Mariela),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Mariela),
     },
 
     [TRAINER_ALVARO] =
@@ -10198,7 +10198,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = 0,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Alvaro),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Alvaro),
     },
 
     [TRAINER_EVERETT] =
@@ -10210,7 +10210,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = 0,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Everett),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Everett),
     },
 
     [TRAINER_RED] =
@@ -10222,7 +10222,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = 0,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Red),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Red),
     },
 
     [TRAINER_LEAF] =
@@ -10234,7 +10234,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = 0,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_Leaf),
+        .party = EVERYTHING_CUSTOMIZED(sParty_Leaf),
     },
 
     [TRAINER_BRENDAN_PLACEHOLDER] =
@@ -10246,7 +10246,7 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = 0,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_BrendanLinkPlaceholder),
+        .party = EVERYTHING_CUSTOMIZED(sParty_BrendanLinkPlaceholder),
     },
 
     [TRAINER_MAY_PLACEHOLDER] =
@@ -10258,6 +10258,6 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = 0,
-        .party = NO_ITEM_DEFAULT_MOVES(sParty_MayLinkPlaceholder),
+        .party = EVERYTHING_CUSTOMIZED(sParty_MayLinkPlaceholder),
     },
 };
diff --git a/src/match_call.c b/src/match_call.c
index 6384e1da59..25e9493008 100644
--- a/src/match_call.c
+++ b/src/match_call.c
@@ -1799,10 +1799,7 @@ static void PopulateSpeciesFromTrainerParty(int matchCallId, u8 *destStr)
 
     switch (gTrainers[trainerId].partyFlags)
     {
-    case 0:
     default:
-        speciesName = gSpeciesNames[party.NoItemDefaultMoves[monId].species];
-        break;
     case F_TRAINER_PARTY_EVERYTHING_CUSTOMIZED:
         speciesName = gSpeciesNames[party.EverythingCustomized[monId].species];
         break;
diff --git a/test/trainer_control.c b/test/trainer_control.c
index 2a21dcdf61..6578e1ab8c 100644
--- a/test/trainer_control.c
+++ b/test/trainer_control.c
@@ -35,30 +35,12 @@ static const struct TrainerMonCustomized sTestParty1[] =
     },
 };
 
-static const struct TrainerMonNoItemDefaultMoves sTestParty2[] =
-{
-    {
-        .species = SPECIES_WOBBUFFET,
-        .lvl = 5,
-    },
-    {
-        .species = SPECIES_WOBBUFFET,
-        .lvl = 6,
-    }
-};
-
 static const struct Trainer sTestTrainer1 =
 {
     .trainerName = _("Test1"),
     .party = EVERYTHING_CUSTOMIZED(sTestParty1),
 };
 
-static const struct Trainer sTestTrainer2 =
-{
-    .trainerName = _("Test2"),
-    .party = NO_ITEM_DEFAULT_MOVES(sTestParty2),
-};
-
 TEST("CreateNPCTrainerPartyForTrainer generates customized Pokémon")
 {
     struct Pokemon *testParty = Alloc(6 * sizeof(struct Pokemon));
@@ -134,7 +116,7 @@ TEST("CreateNPCTrainerPartyForTrainer generates customized Pokémon")
 TEST("CreateNPCTrainerPartyForTrainer generates different personalities for different mons")
 {
     struct Pokemon *testParty = Alloc(6 * sizeof(struct Pokemon));
-    CreateNPCTrainerPartyFromTrainer(testParty, &sTestTrainer2, TRUE, BATTLE_TYPE_TRAINER);
+    CreateNPCTrainerPartyFromTrainer(testParty, &sTestTrainer1, TRUE, BATTLE_TYPE_TRAINER);
     EXPECT(testParty[0].box.personality != testParty[1].box.personality);
     Free(testParty);
 }