diff --git a/test/battle/trainer_control.c b/test/battle/trainer_control.c
index 2a115c35d9..89a5c905a9 100644
--- a/test/battle/trainer_control.c
+++ b/test/battle/trainer_control.c
@@ -12,7 +12,7 @@
 #include "constants/trainers.h"
 #include "constants/battle.h"
 
-#define NUM_TEST_TRAINERS 7
+#define NUM_TEST_TRAINERS 9
 
 static const struct Trainer sTestTrainers[DIFFICULTY_COUNT][NUM_TEST_TRAINERS] =
 {
@@ -35,6 +35,7 @@ enum DifficultyLevel GetTrainerDifficultyLevelTest(u16 trainerId)
 TEST("CreateNPCTrainerPartyForTrainer generates customized Pokémon")
 {
     struct Pokemon *testParty = Alloc(6 * sizeof(struct Pokemon));
+    u32 currTrainer = 0;
     u8 nickBuffer[20];
     CreateNPCTrainerPartyFromTrainer(testParty, &sTestTrainers[GetTrainerDifficultyLevelTest(currTrainer)][currTrainer], TRUE, BATTLE_TYPE_TRAINER);
     EXPECT(IsMonShiny(&testParty[0]));
@@ -224,7 +225,8 @@ TEST("Difficulty changes which party if used for NPCs if defined for the difficu
 TEST("Trainer Party Pool generates a party from the trainer pool")
 {
     struct Pokemon *testParty = Alloc(6 * sizeof(struct Pokemon));
-    CreateNPCTrainerPartyFromTrainer(testParty, &sTestTrainers[1], TRUE, BATTLE_TYPE_TRAINER);
+    u32 currTrainer = 3;
+    CreateNPCTrainerPartyFromTrainer(testParty, &sTestTrainers[GetTrainerDifficultyLevelTest(currTrainer)][currTrainer], TRUE, BATTLE_TYPE_TRAINER);
     EXPECT(GetMonData(&testParty[0], MON_DATA_SPECIES) == SPECIES_EEVEE);
     Free(testParty);
 }
@@ -232,7 +234,8 @@ TEST("Trainer Party Pool generates a party from the trainer pool")
 TEST("Trainer Party Pool picks a random lead and a random ace if tags exist in the pool")
 {
     struct Pokemon *testParty = Alloc(6 * sizeof(struct Pokemon));
-    CreateNPCTrainerPartyFromTrainer(testParty, &sTestTrainers[2], TRUE, BATTLE_TYPE_TRAINER);
+    u32 currTrainer = 4;
+    CreateNPCTrainerPartyFromTrainer(testParty, &sTestTrainers[GetTrainerDifficultyLevelTest(currTrainer)][currTrainer], TRUE, BATTLE_TYPE_TRAINER);
     EXPECT(GetMonData(&testParty[0], MON_DATA_SPECIES) == SPECIES_ARON);    //  Lead
     EXPECT(GetMonData(&testParty[1], MON_DATA_SPECIES) == SPECIES_WYNAUT);  //  Not Lead or Ace
     EXPECT(GetMonData(&testParty[2], MON_DATA_SPECIES) == SPECIES_EEVEE);   //  Ace
@@ -242,7 +245,8 @@ TEST("Trainer Party Pool picks a random lead and a random ace if tags exist in t
 TEST("Trainer Party Pool picks according to custom rules")
 {
     struct Pokemon *testParty = Alloc(6 * sizeof(struct Pokemon));
-    CreateNPCTrainerPartyFromTrainer(testParty, &sTestTrainers[3], TRUE, BATTLE_TYPE_TRAINER | BATTLE_TYPE_DOUBLE);
+    u32 currTrainer = 5;
+    CreateNPCTrainerPartyFromTrainer(testParty, &sTestTrainers[GetTrainerDifficultyLevelTest(currTrainer)][currTrainer], TRUE, BATTLE_TYPE_TRAINER | BATTLE_TYPE_DOUBLE);
     EXPECT(GetMonData(&testParty[0], MON_DATA_SPECIES) == SPECIES_TORKOAL);    //  Lead + Weather Setter
     EXPECT(GetMonData(&testParty[1], MON_DATA_SPECIES) == SPECIES_BULBASAUR);  //  Lead + Weather Abuser
     EXPECT(GetMonData(&testParty[2], MON_DATA_SPECIES) == SPECIES_EEVEE);      //  Anything else
@@ -252,7 +256,8 @@ TEST("Trainer Party Pool picks according to custom rules")
 TEST("Trainer Party Pool uses standard party creation if pool is illegal")
 {
     struct Pokemon *testParty = Alloc(6 * sizeof(struct Pokemon));
-    CreateNPCTrainerPartyFromTrainer(testParty, &sTestTrainers[4], TRUE, BATTLE_TYPE_TRAINER);
+    u32 currTrainer = 6;
+    CreateNPCTrainerPartyFromTrainer(testParty, &sTestTrainers[GetTrainerDifficultyLevelTest(currTrainer)][currTrainer], TRUE, BATTLE_TYPE_TRAINER);
     EXPECT(GetMonData(&testParty[0], MON_DATA_SPECIES) == SPECIES_WYNAUT);
     EXPECT(GetMonData(&testParty[1], MON_DATA_SPECIES) == SPECIES_WOBBUFFET);
     Free(testParty);
@@ -261,7 +266,8 @@ TEST("Trainer Party Pool uses standard party creation if pool is illegal")
 TEST("Trainer Party Pool can be pruned before picking")
 {
     struct Pokemon *testParty = Alloc(6 * sizeof(struct Pokemon));
-    CreateNPCTrainerPartyFromTrainer(testParty, &sTestTrainers[5], TRUE, BATTLE_TYPE_TRAINER);
+    u32 currTrainer = 7;
+    CreateNPCTrainerPartyFromTrainer(testParty, &sTestTrainers[GetTrainerDifficultyLevelTest(currTrainer)][currTrainer], TRUE, BATTLE_TYPE_TRAINER);
     EXPECT(GetMonData(&testParty[0], MON_DATA_SPECIES) == SPECIES_EEVEE);
     EXPECT(GetMonData(&testParty[1], MON_DATA_SPECIES) == SPECIES_WYNAUT);
     Free(testParty);
@@ -270,7 +276,8 @@ TEST("Trainer Party Pool can be pruned before picking")
 TEST("Trainer Party Pool can choose which functions to use for picking mons")
 {
     struct Pokemon *testParty = Alloc(6 * sizeof(struct Pokemon));
-    CreateNPCTrainerPartyFromTrainer(testParty, &sTestTrainers[6], TRUE, BATTLE_TYPE_TRAINER);
+    u32 currTrainer = 8;
+    CreateNPCTrainerPartyFromTrainer(testParty, &sTestTrainers[GetTrainerDifficultyLevelTest(currTrainer)][currTrainer], TRUE, BATTLE_TYPE_TRAINER);
     EXPECT(GetMonData(&testParty[0], MON_DATA_SPECIES) == SPECIES_WYNAUT);
     EXPECT(GetMonData(&testParty[1], MON_DATA_SPECIES) == SPECIES_WOBBUFFET);
     Free(testParty);
diff --git a/test/battle/trainer_control.h b/test/battle/trainer_control.h
index 32c15c9a19..1fbeff9b62 100644
--- a/test/battle/trainer_control.h
+++ b/test/battle/trainer_control.h
@@ -120,7 +120,7 @@
     },
 #line 45
 #line 52
-    [DIFFICULTY_HARD][1] =
+    [DIFFICULTY_NORMAL][2] =
     {
 #line 46
         .trainerName = _("Test2"),
@@ -138,12 +138,12 @@
         {
             {
 #line 54
-            .species = SPECIES_YVELTAL,
+            .species = SPECIES_MEWTWO,
             .gender = TRAINER_MON_RANDOM_GENDER,
 #line 56
             .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31),
 #line 55
-            .lvl = 99,
+            .lvl = 50,
             .nature = NATURE_HARDY,
             .dynamaxLevel = MAX_DYNAMAX_LEVEL,
             },
@@ -151,7 +151,7 @@
     },
 #line 57
 #line 64
-    [DIFFICULTY_NORMAL][2] =
+    [DIFFICULTY_EASY][2] =
     {
 #line 58
         .trainerName = _("Test2"),
@@ -169,12 +169,12 @@
         {
             {
 #line 66
-            .species = SPECIES_MEWTWO,
+            .species = SPECIES_METAPOD,
             .gender = TRAINER_MON_RANDOM_GENDER,
 #line 68
             .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31),
 #line 67
-            .lvl = 50,
+            .lvl = 1,
             .nature = NATURE_HARDY,
             .dynamaxLevel = MAX_DYNAMAX_LEVEL,
             },
@@ -182,7 +182,7 @@
     },
 #line 69
 #line 76
-    [DIFFICULTY_EASY][2] =
+    [DIFFICULTY_HARD][2] =
     {
 #line 70
         .trainerName = _("Test2"),
@@ -200,23 +200,22 @@
         {
             {
 #line 78
-            .species = SPECIES_METAPOD,
+            .species = SPECIES_ARCEUS,
             .gender = TRAINER_MON_RANDOM_GENDER,
 #line 80
             .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31),
 #line 79
-            .lvl = 1,
+            .lvl = 99,
             .nature = NATURE_HARDY,
             .dynamaxLevel = MAX_DYNAMAX_LEVEL,
             },
         },
     },
 #line 81
-#line 88
-    [DIFFICULTY_HARD][2] =
+    [DIFFICULTY_NORMAL][3] =
     {
 #line 82
-        .trainerName = _("Test2"),
+        .trainerName = _("Test3"),
 #line 83
         .trainerClass = TRAINER_CLASS_PKMN_TRAINER_1,
 #line 84
@@ -226,207 +225,229 @@
             TRAINER_ENCOUNTER_MUSIC_MALE,
 #line 87
         .doubleBattle = FALSE,
-        .partySize = 1,
-        .party = (const struct TrainerMon[])
-        {
-            {
-#line 90
-            .species = SPECIES_ARCEUS,
-            .gender = TRAINER_MON_RANDOM_GENDER,
-#line 92
-            .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31),
-#line 91
-            .lvl = 99,
-            .nature = NATURE_HARDY,
-            .dynamaxLevel = MAX_DYNAMAX_LEVEL,
-            },
-        },
-    },
-#line 93
-    [DIFFICULTY_NORMAL][3] =
-    {
-#line 94
-        .trainerName = _("Test3"),
-#line 95
-        .trainerClass = TRAINER_CLASS_PKMN_TRAINER_1,
-#line 96
-        .trainerPic = TRAINER_PIC_RED,
-        .encounterMusic_gender = 
-#line 98
-            TRAINER_ENCOUNTER_MUSIC_MALE,
-#line 99
-        .doubleBattle = FALSE,
-#line 100
+#line 88
         .partySize = 1,
         .poolSize = 4,
         .party = (const struct TrainerMon[])
         {
             {
-#line 102
+#line 90
             .species = SPECIES_WYNAUT,
             .gender = TRAINER_MON_RANDOM_GENDER,
-#line 103
+#line 91
             .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31),
-#line 103
+#line 91
             .lvl = 100,
             .nature = NATURE_HARDY,
             .dynamaxLevel = MAX_DYNAMAX_LEVEL,
             },
             {
-#line 104
+#line 92
             .species = SPECIES_WOBBUFFET,
             .gender = TRAINER_MON_RANDOM_GENDER,
-#line 105
+#line 93
             .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31),
-#line 105
+#line 93
             .lvl = 100,
             .nature = NATURE_HARDY,
             .dynamaxLevel = MAX_DYNAMAX_LEVEL,
             },
             {
-#line 106
+#line 94
             .species = SPECIES_EEVEE,
             .gender = TRAINER_MON_RANDOM_GENDER,
-#line 107
+#line 95
             .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31),
-#line 107
+#line 95
             .lvl = 100,
             .nature = NATURE_HARDY,
             .dynamaxLevel = MAX_DYNAMAX_LEVEL,
             },
             {
-#line 108
+#line 96
             .species = SPECIES_MEW,
             .gender = TRAINER_MON_RANDOM_GENDER,
-#line 109
+#line 97
             .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31),
-#line 109
+#line 97
             .lvl = 100,
             .nature = NATURE_HARDY,
             .dynamaxLevel = MAX_DYNAMAX_LEVEL,
             },
         },
     },
-#line 110
+#line 98
     [DIFFICULTY_NORMAL][4] =
     {
-#line 111
+#line 99
         .trainerName = _("Test4"),
-#line 112
+#line 100
         .trainerClass = TRAINER_CLASS_PKMN_TRAINER_1,
-#line 113
+#line 101
         .trainerPic = TRAINER_PIC_RED,
         .encounterMusic_gender = 
-#line 115
+#line 103
             TRAINER_ENCOUNTER_MUSIC_MALE,
-#line 116
+#line 104
         .doubleBattle = FALSE,
-#line 117
+#line 105
         .partySize = 3,
         .poolSize = 6,
         .party = (const struct TrainerMon[])
         {
             {
-#line 119
+#line 107
             .species = SPECIES_WYNAUT,
             .gender = TRAINER_MON_RANDOM_GENDER,
-#line 120
+#line 108
             .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31),
-#line 120
+#line 108
             .lvl = 100,
             .nature = NATURE_HARDY,
             .dynamaxLevel = MAX_DYNAMAX_LEVEL,
             },
             {
-#line 121
+#line 109
             .species = SPECIES_WOBBUFFET,
             .gender = TRAINER_MON_RANDOM_GENDER,
-#line 123
+#line 111
             .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31),
-#line 123
+#line 111
             .lvl = 100,
             .nature = NATURE_HARDY,
             .dynamaxLevel = MAX_DYNAMAX_LEVEL,
-#line 122
+#line 110
             .tags = MON_POOL_TAG_LEAD,
             },
             {
-#line 124
+#line 112
             .species = SPECIES_EEVEE,
             .gender = TRAINER_MON_RANDOM_GENDER,
-#line 126
+#line 114
             .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31),
-#line 126
+#line 114
             .lvl = 100,
             .nature = NATURE_HARDY,
             .dynamaxLevel = MAX_DYNAMAX_LEVEL,
-#line 125
+#line 113
             .tags = MON_POOL_TAG_ACE,
             },
             {
-#line 127
+#line 115
             .species = SPECIES_MEW,
             .gender = TRAINER_MON_RANDOM_GENDER,
-#line 128
+#line 116
             .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31),
-#line 128
+#line 116
             .lvl = 100,
             .nature = NATURE_HARDY,
             .dynamaxLevel = MAX_DYNAMAX_LEVEL,
             },
             {
-#line 129
+#line 117
             .species = SPECIES_ODDISH,
             .gender = TRAINER_MON_RANDOM_GENDER,
-#line 131
+#line 119
             .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31),
-#line 131
+#line 119
             .lvl = 100,
             .nature = NATURE_HARDY,
             .dynamaxLevel = MAX_DYNAMAX_LEVEL,
-#line 130
+#line 118
             .tags = MON_POOL_TAG_ACE,
             },
             {
-#line 132
+#line 120
             .species = SPECIES_ARON,
             .gender = TRAINER_MON_RANDOM_GENDER,
-#line 134
+#line 122
             .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31),
-#line 134
+#line 122
             .lvl = 100,
             .nature = NATURE_HARDY,
             .dynamaxLevel = MAX_DYNAMAX_LEVEL,
-#line 133
+#line 121
             .tags = MON_POOL_TAG_LEAD,
             },
         },
     },
-#line 135
+#line 123
     [DIFFICULTY_NORMAL][5] =
     {
-#line 136
+#line 124
         .trainerName = _("Test5"),
-#line 137
+#line 125
         .trainerClass = TRAINER_CLASS_PKMN_TRAINER_1,
-#line 138
+#line 126
         .trainerPic = TRAINER_PIC_RED,
         .encounterMusic_gender = 
-#line 140
+#line 128
             TRAINER_ENCOUNTER_MUSIC_MALE,
-#line 141
+#line 129
         .doubleBattle = TRUE,
-#line 143
+#line 131
         .poolRuleIndex = POOL_RULESET_WEATHER_DOUBLES,
-#line 142
+#line 130
         .partySize = 3,
         .poolSize = 10,
         .party = (const struct TrainerMon[])
         {
             {
-#line 145
+#line 133
             .species = SPECIES_WYNAUT,
             .gender = TRAINER_MON_RANDOM_GENDER,
+#line 135
+            .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31),
+#line 135
+            .lvl = 100,
+            .nature = NATURE_HARDY,
+            .dynamaxLevel = MAX_DYNAMAX_LEVEL,
+#line 134
+            .tags = MON_POOL_TAG_LEAD,
+            },
+            {
+#line 136
+            .species = SPECIES_WOBBUFFET,
+            .gender = TRAINER_MON_RANDOM_GENDER,
+#line 138
+            .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31),
+#line 138
+            .lvl = 100,
+            .nature = NATURE_HARDY,
+            .dynamaxLevel = MAX_DYNAMAX_LEVEL,
+#line 137
+            .tags = MON_POOL_TAG_LEAD,
+            },
+            {
+#line 139
+            .species = SPECIES_VULPIX,
+            .gender = TRAINER_MON_RANDOM_GENDER,
+#line 141
+            .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31),
+#line 141
+            .lvl = 100,
+            .nature = NATURE_HARDY,
+            .dynamaxLevel = MAX_DYNAMAX_LEVEL,
+#line 140
+            .tags = MON_POOL_TAG_LEAD | MON_POOL_TAG_WEATHER_SETTER,
+            },
+            {
+#line 142
+            .species = SPECIES_BULBASAUR,
+            .gender = TRAINER_MON_RANDOM_GENDER,
+#line 144
+            .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31),
+#line 144
+            .lvl = 100,
+            .nature = NATURE_HARDY,
+            .dynamaxLevel = MAX_DYNAMAX_LEVEL,
+#line 143
+            .tags = MON_POOL_TAG_LEAD | MON_POOL_TAG_WEATHER_ABUSER,
+            },
+            {
+#line 145
+            .species = SPECIES_TORKOAL,
+            .gender = TRAINER_MON_RANDOM_GENDER,
 #line 147
             .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31),
 #line 147
@@ -434,11 +455,11 @@
             .nature = NATURE_HARDY,
             .dynamaxLevel = MAX_DYNAMAX_LEVEL,
 #line 146
-            .tags = MON_POOL_TAG_LEAD,
+            .tags = MON_POOL_TAG_LEAD | MON_POOL_TAG_WEATHER_SETTER,
             },
             {
 #line 148
-            .species = SPECIES_WOBBUFFET,
+            .species = SPECIES_CHERRIM,
             .gender = TRAINER_MON_RANDOM_GENDER,
 #line 150
             .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31),
@@ -447,11 +468,11 @@
             .nature = NATURE_HARDY,
             .dynamaxLevel = MAX_DYNAMAX_LEVEL,
 #line 149
-            .tags = MON_POOL_TAG_LEAD,
+            .tags = MON_POOL_TAG_LEAD | MON_POOL_TAG_WEATHER_ABUSER,
             },
             {
 #line 151
-            .species = SPECIES_VULPIX,
+            .species = SPECIES_MEW,
             .gender = TRAINER_MON_RANDOM_GENDER,
 #line 153
             .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31),
@@ -460,11 +481,11 @@
             .nature = NATURE_HARDY,
             .dynamaxLevel = MAX_DYNAMAX_LEVEL,
 #line 152
-            .tags = MON_POOL_TAG_LEAD | MON_POOL_TAG_WEATHER_SETTER,
+            .tags = MON_POOL_TAG_LEAD,
             },
             {
 #line 154
-            .species = SPECIES_BULBASAUR,
+            .species = SPECIES_ARON,
             .gender = TRAINER_MON_RANDOM_GENDER,
 #line 156
             .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31),
@@ -473,264 +494,212 @@
             .nature = NATURE_HARDY,
             .dynamaxLevel = MAX_DYNAMAX_LEVEL,
 #line 155
-            .tags = MON_POOL_TAG_LEAD | MON_POOL_TAG_WEATHER_ABUSER,
+            .tags = MON_POOL_TAG_LEAD,
             },
             {
 #line 157
-            .species = SPECIES_TORKOAL,
-            .gender = TRAINER_MON_RANDOM_GENDER,
-#line 159
-            .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31),
-#line 159
-            .lvl = 100,
-            .nature = NATURE_HARDY,
-            .dynamaxLevel = MAX_DYNAMAX_LEVEL,
-#line 158
-            .tags = MON_POOL_TAG_LEAD | MON_POOL_TAG_WEATHER_SETTER,
-            },
-            {
-#line 160
-            .species = SPECIES_CHERRIM,
-            .gender = TRAINER_MON_RANDOM_GENDER,
-#line 162
-            .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31),
-#line 162
-            .lvl = 100,
-            .nature = NATURE_HARDY,
-            .dynamaxLevel = MAX_DYNAMAX_LEVEL,
-#line 161
-            .tags = MON_POOL_TAG_LEAD | MON_POOL_TAG_WEATHER_ABUSER,
-            },
-            {
-#line 163
-            .species = SPECIES_MEW,
-            .gender = TRAINER_MON_RANDOM_GENDER,
-#line 165
-            .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31),
-#line 165
-            .lvl = 100,
-            .nature = NATURE_HARDY,
-            .dynamaxLevel = MAX_DYNAMAX_LEVEL,
-#line 164
-            .tags = MON_POOL_TAG_LEAD,
-            },
-            {
-#line 166
-            .species = SPECIES_ARON,
-            .gender = TRAINER_MON_RANDOM_GENDER,
-#line 168
-            .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31),
-#line 168
-            .lvl = 100,
-            .nature = NATURE_HARDY,
-            .dynamaxLevel = MAX_DYNAMAX_LEVEL,
-#line 167
-            .tags = MON_POOL_TAG_LEAD,
-            },
-            {
-#line 169
             .species = SPECIES_ODDISH,
             .gender = TRAINER_MON_RANDOM_GENDER,
-#line 170
+#line 158
             .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31),
-#line 170
+#line 158
             .lvl = 100,
             .nature = NATURE_HARDY,
             .dynamaxLevel = MAX_DYNAMAX_LEVEL,
             },
             {
-#line 171
+#line 159
             .species = SPECIES_EEVEE,
             .gender = TRAINER_MON_RANDOM_GENDER,
-#line 172
+#line 160
             .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31),
-#line 172
+#line 160
             .lvl = 100,
             .nature = NATURE_HARDY,
             .dynamaxLevel = MAX_DYNAMAX_LEVEL,
             },
         },
     },
-#line 173
+#line 161
     [DIFFICULTY_NORMAL][6] =
     {
-#line 174
+#line 162
         .trainerName = _("Test6"),
-#line 175
+#line 163
         .trainerClass = TRAINER_CLASS_PKMN_TRAINER_1,
+#line 164
+        .trainerPic = TRAINER_PIC_RED,
+        .encounterMusic_gender = 
+#line 166
+            TRAINER_ENCOUNTER_MUSIC_MALE,
+#line 167
+        .doubleBattle = FALSE,
+#line 169
+        .poolRuleIndex = POOL_RULESET_BASIC,
+#line 168
+        .partySize = 2,
+        .poolSize = 3,
+        .party = (const struct TrainerMon[])
+        {
+            {
+#line 171
+            .species = SPECIES_WYNAUT,
+            .gender = TRAINER_MON_RANDOM_GENDER,
+#line 173
+            .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31),
+#line 173
+            .lvl = 100,
+            .nature = NATURE_HARDY,
+            .dynamaxLevel = MAX_DYNAMAX_LEVEL,
+#line 172
+            .tags = MON_POOL_TAG_LEAD,
+            },
+            {
+#line 174
+            .species = SPECIES_WOBBUFFET,
+            .gender = TRAINER_MON_RANDOM_GENDER,
 #line 176
-        .trainerPic = TRAINER_PIC_RED,
-        .encounterMusic_gender = 
-#line 178
-            TRAINER_ENCOUNTER_MUSIC_MALE,
+            .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31),
+#line 176
+            .lvl = 100,
+            .nature = NATURE_HARDY,
+            .dynamaxLevel = MAX_DYNAMAX_LEVEL,
+#line 175
+            .tags = MON_POOL_TAG_LEAD,
+            },
+            {
+#line 177
+            .species = SPECIES_EEVEE,
+            .gender = TRAINER_MON_RANDOM_GENDER,
 #line 179
-        .doubleBattle = FALSE,
-#line 181
-        .poolRuleIndex = POOL_RULESET_BASIC,
+            .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31),
+#line 179
+            .lvl = 100,
+            .nature = NATURE_HARDY,
+            .dynamaxLevel = MAX_DYNAMAX_LEVEL,
+#line 178
+            .tags = MON_POOL_TAG_LEAD,
+            },
+        },
+    },
 #line 180
-        .partySize = 2,
-        .poolSize = 3,
-        .party = (const struct TrainerMon[])
-        {
-            {
+    [DIFFICULTY_NORMAL][7] =
+    {
+#line 181
+        .trainerName = _("Test1"),
+#line 182
+        .trainerClass = TRAINER_CLASS_PKMN_TRAINER_1,
 #line 183
-            .species = SPECIES_WYNAUT,
-            .gender = TRAINER_MON_RANDOM_GENDER,
+        .trainerPic = TRAINER_PIC_RED,
+        .encounterMusic_gender = 
 #line 185
-            .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31),
-#line 185
-            .lvl = 100,
-            .nature = NATURE_HARDY,
-            .dynamaxLevel = MAX_DYNAMAX_LEVEL,
-#line 184
-            .tags = MON_POOL_TAG_LEAD,
-            },
-            {
+            TRAINER_ENCOUNTER_MUSIC_MALE,
 #line 186
-            .species = SPECIES_WOBBUFFET,
-            .gender = TRAINER_MON_RANDOM_GENDER,
+        .doubleBattle = FALSE,
 #line 188
-            .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31),
-#line 188
-            .lvl = 100,
-            .nature = NATURE_HARDY,
-            .dynamaxLevel = MAX_DYNAMAX_LEVEL,
-#line 187
-            .tags = MON_POOL_TAG_LEAD,
-            },
-            {
+        .poolRuleIndex = POOL_RULESET_BASIC,
 #line 189
-            .species = SPECIES_EEVEE,
-            .gender = TRAINER_MON_RANDOM_GENDER,
-#line 191
-            .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31),
-#line 191
-            .lvl = 100,
-            .nature = NATURE_HARDY,
-            .dynamaxLevel = MAX_DYNAMAX_LEVEL,
-#line 190
-            .tags = MON_POOL_TAG_LEAD,
-            },
-        },
-    },
-#line 192
-    [DIFFICULTY_NORMAL][7] =
-    {
-#line 193
-        .trainerName = _("Test1"),
-#line 194
-        .trainerClass = TRAINER_CLASS_PKMN_TRAINER_1,
-#line 195
-        .trainerPic = TRAINER_PIC_RED,
-        .encounterMusic_gender = 
-#line 197
-            TRAINER_ENCOUNTER_MUSIC_MALE,
-#line 198
-        .doubleBattle = FALSE,
-#line 200
-        .poolRuleIndex = POOL_RULESET_BASIC,
-#line 201
         .poolPruneIndex = POOL_PRUNE_TEST,
-#line 199
+#line 187
         .partySize = 2,
         .poolSize = 3,
         .party = (const struct TrainerMon[])
         {
             {
-#line 203
+#line 191
             .species = SPECIES_WYNAUT,
             .gender = TRAINER_MON_RANDOM_GENDER,
-#line 204
+#line 192
             .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31),
-#line 204
+#line 192
             .lvl = 100,
             .nature = NATURE_HARDY,
             .dynamaxLevel = MAX_DYNAMAX_LEVEL,
             },
             {
-#line 205
+#line 193
             .species = SPECIES_WOBBUFFET,
             .gender = TRAINER_MON_RANDOM_GENDER,
-#line 207
+#line 195
             .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31),
-#line 207
+#line 195
             .lvl = 100,
             .nature = NATURE_HARDY,
             .dynamaxLevel = MAX_DYNAMAX_LEVEL,
-#line 206
+#line 194
             .tags = MON_POOL_TAG_LEAD,
             },
             {
-#line 208
+#line 196
             .species = SPECIES_EEVEE,
             .gender = TRAINER_MON_RANDOM_GENDER,
-#line 209
+#line 197
             .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31),
-#line 209
+#line 197
             .lvl = 100,
             .nature = NATURE_HARDY,
             .dynamaxLevel = MAX_DYNAMAX_LEVEL,
             },
         },
     },
-#line 210
-    [DIFFICULTY_NORMAL][7] =
+#line 198
+    [DIFFICULTY_NORMAL][8] =
     {
-#line 211
+#line 199
         .trainerName = _("Test1"),
-#line 212
+#line 200
         .trainerClass = TRAINER_CLASS_PKMN_TRAINER_1,
-#line 213
+#line 201
         .trainerPic = TRAINER_PIC_RED,
         .encounterMusic_gender = 
-#line 215
+#line 203
             TRAINER_ENCOUNTER_MUSIC_MALE,
-#line 216
+#line 204
         .doubleBattle = FALSE,
-#line 218
+#line 206
         .poolRuleIndex = POOL_RULESET_BASIC,
-#line 219
+#line 207
         .poolPickIndex = POOL_PICK_LOWEST,
-#line 217
+#line 205
         .partySize = 2,
         .poolSize = 3,
         .party = (const struct TrainerMon[])
         {
             {
-#line 221
+#line 209
             .species = SPECIES_WYNAUT,
             .gender = TRAINER_MON_RANDOM_GENDER,
-#line 223
+#line 211
             .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31),
-#line 223
+#line 211
             .lvl = 100,
             .nature = NATURE_HARDY,
             .dynamaxLevel = MAX_DYNAMAX_LEVEL,
-#line 222
+#line 210
             .tags = MON_POOL_TAG_ACE,
             },
             {
-#line 224
+#line 212
             .species = SPECIES_WOBBUFFET,
             .gender = TRAINER_MON_RANDOM_GENDER,
-#line 225
+#line 213
             .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31),
-#line 225
+#line 213
             .lvl = 100,
             .nature = NATURE_HARDY,
             .dynamaxLevel = MAX_DYNAMAX_LEVEL,
             },
             {
-#line 226
+#line 214
             .species = SPECIES_EEVEE,
             .gender = TRAINER_MON_RANDOM_GENDER,
-#line 228
+#line 216
             .iv = TRAINER_PARTY_IVS(31, 31, 31, 31, 31, 31),
-#line 228
+#line 216
             .lvl = 100,
             .nature = NATURE_HARDY,
             .dynamaxLevel = MAX_DYNAMAX_LEVEL,
-#line 227
+#line 215
             .tags = MON_POOL_TAG_LEAD,
             },
         },
diff --git a/test/battle/trainer_control.party b/test/battle/trainer_control.party
index 6ab88bbd72..b4ba68c6b1 100644
--- a/test/battle/trainer_control.party
+++ b/test/battle/trainer_control.party
@@ -42,18 +42,6 @@ Difficulty: Normal
 Mewtwo
 Level: 5
 
-=== 1 ===
-Name: Test2
-Class: Pkmn Trainer 1
-Pic: Red
-Gender: Male
-Music: Male
-Double Battle: No
-Difficulty: HARD
-
-Yveltal
-Level: 99
-
 === 2 ===
 Name: Test2
 Class: Pkmn Trainer 1
@@ -207,7 +195,7 @@ Tags: Lead
 
 Eevee
 
-=== 7 ===
+=== 8 ===
 Name: Test1
 Class: Pkmn Trainer 1
 Pic: Red