Merge pull request #658 from vblm12/trainer_data

Copy the Trainer struct from pokeemerald and regen the trainers.h files.

6 files changed, 3577 insertions, 3566 deletions

diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c
index 7b6004ce0..5a71733b8 100644
--- a/src/battle/battle_2.c
+++ b/src/battle/battle_2.c
@@ -1055,7 +1055,7 @@ u8 CreateNPCTrainerParty(struct Pokemon *party, u16 trainerNum)
             {
             case 0:
             {
-                const struct TrainerPartyMember0 *partyData = gTrainers[trainerNum].party;
+                const struct TrainerMonNoItemDefaultMoves *partyData = gTrainers[trainerNum].party.NoItemDefaultMoves;
 
                 for (j = 0; gSpeciesNames[partyData[i].species][j] != 0xFF; j++)
                     nameHash += gSpeciesNames[partyData[i].species][j];
@@ -1064,9 +1064,9 @@ u8 CreateNPCTrainerParty(struct Pokemon *party, u16 trainerNum)
                 CreateMon(&party[i], partyData[i].species, partyData[i].level, fixedIV, TRUE, personalityValue, 2, 0);
                 break;
             }
-            case 1:
+            case F_TRAINER_PARTY_CUSTOM_MOVESET:
             {
-                const struct TrainerPartyMember1 *partyData = gTrainers[trainerNum].party;
+                const struct TrainerMonNoItemCustomMoves *partyData = gTrainers[trainerNum].party.NoItemCustomMoves;
 
                 for (j = 0; gSpeciesNames[partyData[i].species][j] != 0xFF; j++)
                     nameHash += gSpeciesNames[partyData[i].species][j];
@@ -1081,9 +1081,9 @@ u8 CreateNPCTrainerParty(struct Pokemon *party, u16 trainerNum)
                 }
                 break;
             }
-            case 2:
+            case F_TRAINER_PARTY_HELD_ITEM:
             {
-                const struct TrainerPartyMember2 *partyData = gTrainers[trainerNum].party;
+                const struct TrainerMonItemDefaultMoves *partyData = gTrainers[trainerNum].party.ItemDefaultMoves;
 
                 for (j = 0; gSpeciesNames[partyData[i].species][j] != 0xFF; j++)
                     nameHash += gSpeciesNames[partyData[i].species][j];
@@ -1094,9 +1094,9 @@ u8 CreateNPCTrainerParty(struct Pokemon *party, u16 trainerNum)
                 SetMonData(&party[i], MON_DATA_HELD_ITEM, &partyData[i].heldItem);
                 break;
             }
-            case 3:
+            case F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM:
             {
-                const struct TrainerPartyMember3 *partyData = gTrainers[trainerNum].party;
+                const struct TrainerMonItemCustomMoves *partyData = gTrainers[trainerNum].party.ItemCustomMoves;
 
                 for (j = 0; gSpeciesNames[partyData[i].species][j] != 0xFF; j++)
                     nameHash += gSpeciesNames[partyData[i].species][j];
diff --git a/src/battle/battle_setup.c b/src/battle/battle_setup.c
index e8a3ef451..fc929eb4d 100644
--- a/src/battle/battle_setup.c
+++ b/src/battle/battle_setup.c
@@ -160,282 +160,282 @@ static const struct TrainerBattleParameter gTrainerBattleSpecs_4[] =
 const struct TrainerEyeTrainer gTrainerEyeTrainers[] =
 {
     {
-        {OPPONENT_ROSE_1, OPPONENT_ROSE_2, OPPONENT_ROSE_3, OPPONENT_ROSE_4, OPPONENT_ROSE_5},
+        {TRAINER_ROSE_1, TRAINER_ROSE_2, TRAINER_ROSE_3, TRAINER_ROSE_4, TRAINER_ROSE_5},
         MAP_GROUP(ROUTE118),
         MAP_NUM(ROUTE118),
     },
     {
-        {OPPONENT_DUSTY_1, OPPONENT_DUSTY_2, OPPONENT_DUSTY_3, OPPONENT_DUSTY_4, OPPONENT_DUSTY_5},
+        {TRAINER_DUSTY_1, TRAINER_DUSTY_2, TRAINER_DUSTY_3, TRAINER_DUSTY_4, TRAINER_DUSTY_5},
         MAP_GROUP(ROUTE111),
         MAP_NUM(ROUTE111),
     },
     {
-        {OPPONENT_LOLA_1, OPPONENT_LOLA_2, OPPONENT_LOLA_3, OPPONENT_LOLA_4, OPPONENT_LOLA_5},
+        {TRAINER_LOLA_1, TRAINER_LOLA_2, TRAINER_LOLA_3, TRAINER_LOLA_4, TRAINER_LOLA_5},
         MAP_GROUP(ROUTE109),
         MAP_NUM(ROUTE109),
     },
     {
-        {OPPONENT_RICKY_1, OPPONENT_RICKY_2, OPPONENT_RICKY_3, OPPONENT_RICKY_4, OPPONENT_RICKY_5},
+        {TRAINER_RICKY_1, TRAINER_RICKY_2, TRAINER_RICKY_3, TRAINER_RICKY_4, TRAINER_RICKY_5},
         MAP_GROUP(ROUTE109),
         MAP_NUM(ROUTE109),
     },
     {
-        {OPPONENT_RITA_AND_SAM_1, OPPONENT_RITA_AND_SAM_2, OPPONENT_RITA_AND_SAM_3, OPPONENT_RITA_AND_SAM_4, OPPONENT_RITA_AND_SAM_5},
+        {TRAINER_RITA_AND_SAM_1, TRAINER_RITA_AND_SAM_2, TRAINER_RITA_AND_SAM_3, TRAINER_RITA_AND_SAM_4, TRAINER_RITA_AND_SAM_5},
         MAP_GROUP(ROUTE124),
         MAP_NUM(ROUTE124),
     },
     {
-        {OPPONENT_BROOKE_1, OPPONENT_BROOKE_2, OPPONENT_BROOKE_3, OPPONENT_BROOKE_4, OPPONENT_BROOKE_5},
+        {TRAINER_BROOKE_1, TRAINER_BROOKE_2, TRAINER_BROOKE_3, TRAINER_BROOKE_4, TRAINER_BROOKE_5},
         MAP_GROUP(ROUTE111),
         MAP_NUM(ROUTE111),
     },
     {
-        {OPPONENT_WILTON_1, OPPONENT_WILTON_2, OPPONENT_WILTON_3, OPPONENT_WILTON_4, OPPONENT_WILTON_5},
+        {TRAINER_WILTON_1, TRAINER_WILTON_2, TRAINER_WILTON_3, TRAINER_WILTON_4, TRAINER_WILTON_5},
         MAP_GROUP(ROUTE111),
         MAP_NUM(ROUTE111),
     },
     {
-        {OPPONENT_VALERIE_1, OPPONENT_VALERIE_2, OPPONENT_VALERIE_3, OPPONENT_VALERIE_4, OPPONENT_VALERIE_5},
+        {TRAINER_VALERIE_1, TRAINER_VALERIE_2, TRAINER_VALERIE_3, TRAINER_VALERIE_4, TRAINER_VALERIE_5},
         MAP_GROUP(MT_PYRE_6F),
         MAP_NUM(MT_PYRE_6F),
     },
     {
-        {OPPONENT_CINDY_1, OPPONENT_CINDY_3, OPPONENT_CINDY_4, OPPONENT_CINDY_5, OPPONENT_CINDY_6},
+        {TRAINER_CINDY_1, TRAINER_CINDY_3, TRAINER_CINDY_4, TRAINER_CINDY_5, TRAINER_CINDY_6},
         MAP_GROUP(ROUTE104),
         MAP_NUM(ROUTE104),
     },
     {
-        {OPPONENT_JESSICA_1, OPPONENT_JESSICA_2, OPPONENT_JESSICA_3, OPPONENT_JESSICA_4, OPPONENT_JESSICA_5},
+        {TRAINER_JESSICA_1, TRAINER_JESSICA_2, TRAINER_JESSICA_3, TRAINER_JESSICA_4, TRAINER_JESSICA_5},
         MAP_GROUP(ROUTE121),
         MAP_NUM(ROUTE121),
     },
     {
-        {OPPONENT_WINSTON_1, OPPONENT_WINSTON_2, OPPONENT_WINSTON_3, OPPONENT_WINSTON_4, OPPONENT_WINSTON_5},
+        {TRAINER_WINSTON_1, TRAINER_WINSTON_2, TRAINER_WINSTON_3, TRAINER_WINSTON_4, TRAINER_WINSTON_5},
         MAP_GROUP(ROUTE104),
         MAP_NUM(ROUTE104),
     },
     {
-        {OPPONENT_STEVE_1, OPPONENT_STEVE_2, OPPONENT_STEVE_3, OPPONENT_STEVE_4, OPPONENT_STEVE_5},
+        {TRAINER_STEVE_1, TRAINER_STEVE_2, TRAINER_STEVE_3, TRAINER_STEVE_4, TRAINER_STEVE_5},
         MAP_GROUP(ROUTE114),
         MAP_NUM(ROUTE114),
     },
     {
-        {OPPONENT_TONY_1, OPPONENT_TONY_2, OPPONENT_TONY_3, OPPONENT_TONY_4, OPPONENT_TONY_5},
+        {TRAINER_TONY_1, TRAINER_TONY_2, TRAINER_TONY_3, TRAINER_TONY_4, TRAINER_TONY_5},
         MAP_GROUP(ROUTE107),
         MAP_NUM(ROUTE107),
     },
     {
-        {OPPONENT_NOB_1, OPPONENT_NOB_2, OPPONENT_NOB_3, OPPONENT_NOB_4, OPPONENT_NOB_5},
+        {TRAINER_NOB_1, TRAINER_NOB_2, TRAINER_NOB_3, TRAINER_NOB_4, TRAINER_NOB_5},
         MAP_GROUP(ROUTE115),
         MAP_NUM(ROUTE115),
     },
     {
-        {OPPONENT_DALTON_1, OPPONENT_DALTON_2, OPPONENT_DALTON_3, OPPONENT_DALTON_4, OPPONENT_DALTON_5},
+        {TRAINER_DALTON_1, TRAINER_DALTON_2, TRAINER_DALTON_3, TRAINER_DALTON_4, TRAINER_DALTON_5},
         MAP_GROUP(ROUTE118),
         MAP_NUM(ROUTE118),
     },
     {
-        {OPPONENT_BERNIE_1, OPPONENT_BERNIE_2, OPPONENT_BERNIE_3, OPPONENT_BERNIE_4, OPPONENT_BERNIE_5},
+        {TRAINER_BERNIE_1, TRAINER_BERNIE_2, TRAINER_BERNIE_3, TRAINER_BERNIE_4, TRAINER_BERNIE_5},
         MAP_GROUP(ROUTE114),
         MAP_NUM(ROUTE114),
     },
     {
-        {OPPONENT_ETHAN_1, OPPONENT_ETHAN_2, OPPONENT_ETHAN_3, OPPONENT_ETHAN_4, OPPONENT_ETHAN_5},
+        {TRAINER_ETHAN_1, TRAINER_ETHAN_2, TRAINER_ETHAN_3, TRAINER_ETHAN_4, TRAINER_ETHAN_5},
         MAP_GROUP(JAGGED_PASS),
         MAP_NUM(JAGGED_PASS),
     },
     {
-        {OPPONENT_JOHN_AND_JAY_1, OPPONENT_JOHN_AND_JAY_2, OPPONENT_JOHN_AND_JAY_3, OPPONENT_JOHN_AND_JAY_4, OPPONENT_JOHN_AND_JAY_5},
+        {TRAINER_JOHN_AND_JAY_1, TRAINER_JOHN_AND_JAY_2, TRAINER_JOHN_AND_JAY_3, TRAINER_JOHN_AND_JAY_4, TRAINER_JOHN_AND_JAY_5},
         MAP_GROUP(METEOR_FALLS_1F_2R),
         MAP_NUM(METEOR_FALLS_1F_2R),
     },
     {
-        {OPPONENT_BRANDON_1, OPPONENT_BRANDON_2, OPPONENT_BRANDON_3, OPPONENT_BRANDON_4, OPPONENT_BRANDON_5},
+        {TRAINER_BRANDON_1, TRAINER_BRANDON_2, TRAINER_BRANDON_3, TRAINER_BRANDON_4, TRAINER_BRANDON_5},
         MAP_GROUP(ROUTE120),
         MAP_NUM(ROUTE120),
     },
     {
-        {OPPONENT_CAMERON_1, OPPONENT_CAMERON_2, OPPONENT_CAMERON_3, OPPONENT_CAMERON_4, OPPONENT_CAMERON_5},
+        {TRAINER_CAMERON_1, TRAINER_CAMERON_2, TRAINER_CAMERON_3, TRAINER_CAMERON_4, TRAINER_CAMERON_5},
         MAP_GROUP(ROUTE123),
         MAP_NUM(ROUTE123),
     },
     {
-        {OPPONENT_JACKI_1, OPPONENT_JACKI_2, OPPONENT_JACKI_3, OPPONENT_JACKI_4, OPPONENT_JACKI_5},
+        {TRAINER_JACKI_1, TRAINER_JACKI_2, TRAINER_JACKI_3, TRAINER_JACKI_4, TRAINER_JACKI_5},
         MAP_GROUP(ROUTE123),
         MAP_NUM(ROUTE123),
     },
     {
-        {OPPONENT_WALTER_1, OPPONENT_WALTER_2, OPPONENT_WALTER_3, OPPONENT_WALTER_4, OPPONENT_WALTER_5},
+        {TRAINER_WALTER_1, TRAINER_WALTER_2, TRAINER_WALTER_3, TRAINER_WALTER_4, TRAINER_WALTER_5},
         MAP_GROUP(ROUTE121),
         MAP_NUM(ROUTE121),
     },
     {
-        {OPPONENT_KAREN_1, OPPONENT_KAREN_2, OPPONENT_KAREN_3, OPPONENT_KAREN_4, OPPONENT_KAREN_5},
+        {TRAINER_KAREN_1, TRAINER_KAREN_2, TRAINER_KAREN_3, TRAINER_KAREN_4, TRAINER_KAREN_5},
         MAP_GROUP(ROUTE116),
         MAP_NUM(ROUTE116),
     },
     {
-        {OPPONENT_JERRY_1, OPPONENT_JERRY_2, OPPONENT_JERRY_3, OPPONENT_JERRY_4, OPPONENT_JERRY_5},
+        {TRAINER_JERRY_1, TRAINER_JERRY_2, TRAINER_JERRY_3, TRAINER_JERRY_4, TRAINER_JERRY_5},
         MAP_GROUP(ROUTE116),
         MAP_NUM(ROUTE116),
     },
     {
-        {OPPONENT_ANNA_AND_MEG_1, OPPONENT_ANNA_AND_MEG_2, OPPONENT_ANNA_AND_MEG_3, OPPONENT_ANNA_AND_MEG_4, OPPONENT_ANNA_AND_MEG_5},
+        {TRAINER_ANNA_AND_MEG_1, TRAINER_ANNA_AND_MEG_2, TRAINER_ANNA_AND_MEG_3, TRAINER_ANNA_AND_MEG_4, TRAINER_ANNA_AND_MEG_5},
         MAP_GROUP(ROUTE117),
         MAP_NUM(ROUTE117),
     },
     {
-        {OPPONENT_ISABEL_1, OPPONENT_ISABEL_2, OPPONENT_ISABEL_3, OPPONENT_ISABEL_4, OPPONENT_ISABEL_5},
+        {TRAINER_ISABEL_1, TRAINER_ISABEL_2, TRAINER_ISABEL_3, TRAINER_ISABEL_4, TRAINER_ISABEL_5},
         MAP_GROUP(ROUTE110),
         MAP_NUM(ROUTE110),
     },
     {
-        {OPPONENT_MIGUEL_1, OPPONENT_MIGUEL_2, OPPONENT_MIGUEL_3, OPPONENT_MIGUEL_4, OPPONENT_MIGUEL_5},
+        {TRAINER_MIGUEL_1, TRAINER_MIGUEL_2, TRAINER_MIGUEL_3, TRAINER_MIGUEL_4, TRAINER_MIGUEL_5},
         MAP_GROUP(ROUTE103),
         MAP_NUM(ROUTE103),
     },
     {
-        {OPPONENT_TIMOTHY_1, OPPONENT_TIMOTHY_2, OPPONENT_TIMOTHY_3, OPPONENT_TIMOTHY_4, OPPONENT_TIMOTHY_5},
+        {TRAINER_TIMOTHY_1, TRAINER_TIMOTHY_2, TRAINER_TIMOTHY_3, TRAINER_TIMOTHY_4, TRAINER_TIMOTHY_5},
         MAP_GROUP(ROUTE115),
         MAP_NUM(ROUTE115),
     },
     {
-        {OPPONENT_SHELBY_1, OPPONENT_SHELBY_2, OPPONENT_SHELBY_3, OPPONENT_SHELBY_4, OPPONENT_SHELBY_5},
+        {TRAINER_SHELBY_1, TRAINER_SHELBY_2, TRAINER_SHELBY_3, TRAINER_SHELBY_4, TRAINER_SHELBY_5},
         MAP_GROUP(MT_CHIMNEY),
         MAP_NUM(MT_CHIMNEY),
     },
     {
-        {OPPONENT_CALVIN_1, OPPONENT_CALVIN_2, OPPONENT_CALVIN_3, OPPONENT_CALVIN_4, OPPONENT_CALVIN_5},
+        {TRAINER_CALVIN_1, TRAINER_CALVIN_2, TRAINER_CALVIN_3, TRAINER_CALVIN_4, TRAINER_CALVIN_5},
         MAP_GROUP(ROUTE102),
         MAP_NUM(ROUTE102),
     },
     {
-        {OPPONENT_ELLIOT_1, OPPONENT_ELLIOT_2, OPPONENT_ELLIOT_3, OPPONENT_ELLIOT_4, OPPONENT_ELLIOT_5},
+        {TRAINER_ELLIOT_1, TRAINER_ELLIOT_2, TRAINER_ELLIOT_3, TRAINER_ELLIOT_4, TRAINER_ELLIOT_5},
         MAP_GROUP(ROUTE106),
         MAP_NUM(ROUTE106),
     },
     {
-        {OPPONENT_ABIGAIL_1, OPPONENT_ABIGAIL_2, OPPONENT_ABIGAIL_3, OPPONENT_ABIGAIL_4, OPPONENT_ABIGAIL_5},
+        {TRAINER_ABIGAIL_1, TRAINER_ABIGAIL_2, TRAINER_ABIGAIL_3, TRAINER_ABIGAIL_4, TRAINER_ABIGAIL_5},
         MAP_GROUP(ROUTE110),
         MAP_NUM(ROUTE110),
     },
     {
-        {OPPONENT_BENJAMIN_1, OPPONENT_BENJAMIN_2, OPPONENT_BENJAMIN_3, OPPONENT_BENJAMIN_4, OPPONENT_BENJAMIN_5},
+        {TRAINER_BENJAMIN_1, TRAINER_BENJAMIN_2, TRAINER_BENJAMIN_3, TRAINER_BENJAMIN_4, TRAINER_BENJAMIN_5},
         MAP_GROUP(ROUTE110),
         MAP_NUM(ROUTE110),
     },
     {
-        {OPPONENT_ISAIAH_1, OPPONENT_ISAIAH_2, OPPONENT_ISAIAH_3, OPPONENT_ISAIAH_4, OPPONENT_ISAIAH_5},
+        {TRAINER_ISAIAH_1, TRAINER_ISAIAH_2, TRAINER_ISAIAH_3, TRAINER_ISAIAH_4, TRAINER_ISAIAH_5},
         MAP_GROUP(ROUTE128),
         MAP_NUM(ROUTE128),
     },
     {
-        {OPPONENT_KATELYN_1, OPPONENT_KATELYN_2, OPPONENT_KATELYN_3, OPPONENT_KATELYN_4, OPPONENT_KATELYN_5},
+        {TRAINER_KATELYN_1, TRAINER_KATELYN_2, TRAINER_KATELYN_3, TRAINER_KATELYN_4, TRAINER_KATELYN_5},
         MAP_GROUP(ROUTE128),
         MAP_NUM(ROUTE128),
     },
     {
-        {OPPONENT_MARIA_1, OPPONENT_MARIA_2, OPPONENT_MARIA_3, OPPONENT_MARIA_4, OPPONENT_MARIA_5},
+        {TRAINER_MARIA_1, TRAINER_MARIA_2, TRAINER_MARIA_3, TRAINER_MARIA_4, TRAINER_MARIA_5},
         MAP_GROUP(ROUTE117),
         MAP_NUM(ROUTE117),
     },
     {
-        {OPPONENT_DYLAN_1, OPPONENT_DYLAN_2, OPPONENT_DYLAN_3, OPPONENT_DYLAN_4, OPPONENT_DYLAN_5},
+        {TRAINER_DYLAN_1, TRAINER_DYLAN_2, TRAINER_DYLAN_3, TRAINER_DYLAN_4, TRAINER_DYLAN_5},
         MAP_GROUP(ROUTE117),
         MAP_NUM(ROUTE117),
     },
     {
-        {OPPONENT_NICOLAS_1, OPPONENT_NICOLAS_2, OPPONENT_NICOLAS_3, OPPONENT_NICOLAS_4, OPPONENT_NICOLAS_5},
+        {TRAINER_NICOLAS_1, TRAINER_NICOLAS_2, TRAINER_NICOLAS_3, TRAINER_NICOLAS_4, TRAINER_NICOLAS_5},
         MAP_GROUP(METEOR_FALLS_1F_2R),
         MAP_NUM(METEOR_FALLS_1F_2R),
     },
     {
-        {OPPONENT_ROBERT_1, OPPONENT_ROBERT_2, OPPONENT_ROBERT_3, OPPONENT_ROBERT_4, OPPONENT_ROBERT_5},
+        {TRAINER_ROBERT_1, TRAINER_ROBERT_2, TRAINER_ROBERT_3, TRAINER_ROBERT_4, TRAINER_ROBERT_5},
         MAP_GROUP(ROUTE120),
         MAP_NUM(ROUTE120),
     },
     {
-        {OPPONENT_LAO_1, OPPONENT_LAO_2, OPPONENT_LAO_3, OPPONENT_LAO_4, OPPONENT_LAO_5},
+        {TRAINER_LAO_1, TRAINER_LAO_2, TRAINER_LAO_3, TRAINER_LAO_4, TRAINER_LAO_5},
         MAP_GROUP(ROUTE113),
         MAP_NUM(ROUTE113),
     },
     {
-        {OPPONENT_CYNDY_1, OPPONENT_CYNDY_2, OPPONENT_CYNDY_3, OPPONENT_CYNDY_4, OPPONENT_CYNDY_5},
+        {TRAINER_CYNDY_1, TRAINER_CYNDY_2, TRAINER_CYNDY_3, TRAINER_CYNDY_4, TRAINER_CYNDY_5},
         MAP_GROUP(ROUTE115),
         MAP_NUM(ROUTE115),
     },
     {
-        {OPPONENT_MADELINE_1, OPPONENT_MADELINE_2, OPPONENT_MADELINE_3, OPPONENT_MADELINE_4, OPPONENT_MADELINE_5},
+        {TRAINER_MADELINE_1, TRAINER_MADELINE_2, TRAINER_MADELINE_3, TRAINER_MADELINE_4, TRAINER_MADELINE_5},
         MAP_GROUP(ROUTE113),
         MAP_NUM(ROUTE113),
     },
     {
-        {OPPONENT_JENNY_1, OPPONENT_JENNY_2, OPPONENT_JENNY_3, OPPONENT_JENNY_4, OPPONENT_JENNY_5},
+        {TRAINER_JENNY_1, TRAINER_JENNY_2, TRAINER_JENNY_3, TRAINER_JENNY_4, TRAINER_JENNY_5},
         MAP_GROUP(ROUTE124),
         MAP_NUM(ROUTE124),
     },
     {
-        {OPPONENT_DIANA_1, OPPONENT_DIANA_2, OPPONENT_DIANA_3, OPPONENT_DIANA_4, OPPONENT_DIANA_5},
+        {TRAINER_DIANA_1, TRAINER_DIANA_2, TRAINER_DIANA_3, TRAINER_DIANA_4, TRAINER_DIANA_5},
         MAP_GROUP(JAGGED_PASS),
         MAP_NUM(JAGGED_PASS),
     },
     {
-        {OPPONENT_AMY_AND_LIV_1, OPPONENT_AMY_AND_LIV_2, OPPONENT_AMY_AND_LIV_4, OPPONENT_AMY_AND_LIV_5, OPPONENT_AMY_AND_LIV_6},
+        {TRAINER_AMY_AND_LIV_1, TRAINER_AMY_AND_LIV_2, TRAINER_AMY_AND_LIV_4, TRAINER_AMY_AND_LIV_5, TRAINER_AMY_AND_LIV_6},
         MAP_GROUP(ROUTE103),
         MAP_NUM(ROUTE103),
     },
     {
-        {OPPONENT_ERNEST_1, OPPONENT_ERNEST_2, OPPONENT_ERNEST_3, OPPONENT_ERNEST_4, OPPONENT_ERNEST_5},
+        {TRAINER_ERNEST_1, TRAINER_ERNEST_2, TRAINER_ERNEST_3, TRAINER_ERNEST_4, TRAINER_ERNEST_5},
         MAP_GROUP(ROUTE125),
         MAP_NUM(ROUTE125),
     },
     {
-        {OPPONENT_EDWIN_1, OPPONENT_EDWIN_2, OPPONENT_EDWIN_3, OPPONENT_EDWIN_4, OPPONENT_EDWIN_5},
+        {TRAINER_EDWIN_1, TRAINER_EDWIN_2, TRAINER_EDWIN_3, TRAINER_EDWIN_4, TRAINER_EDWIN_5},
         MAP_GROUP(ROUTE110),
         MAP_NUM(ROUTE110),
     },
     {
-        {OPPONENT_LYDIA_1, OPPONENT_LYDIA_2, OPPONENT_LYDIA_3, OPPONENT_LYDIA_4, OPPONENT_LYDIA_5},
+        {TRAINER_LYDIA_1, TRAINER_LYDIA_2, TRAINER_LYDIA_3, TRAINER_LYDIA_4, TRAINER_LYDIA_5},
         MAP_GROUP(ROUTE117),
         MAP_NUM(ROUTE117),
     },
     {
-        {OPPONENT_ISAAC_1, OPPONENT_ISAAC_2, OPPONENT_ISAAC_3, OPPONENT_ISAAC_4, OPPONENT_ISAAC_5},
+        {TRAINER_ISAAC_1, TRAINER_ISAAC_2, TRAINER_ISAAC_3, TRAINER_ISAAC_4, TRAINER_ISAAC_5},
         MAP_GROUP(ROUTE117),
         MAP_NUM(ROUTE117),
     },
     {
-        {OPPONENT_CATHERINE_1, OPPONENT_CATHERINE_2, OPPONENT_CATHERINE_3, OPPONENT_CATHERINE_4, OPPONENT_CATHERINE_5},
+        {TRAINER_CATHERINE_1, TRAINER_CATHERINE_2, TRAINER_CATHERINE_3, TRAINER_CATHERINE_4, TRAINER_CATHERINE_5},
         MAP_GROUP(ROUTE119),
         MAP_NUM(ROUTE119),
     },
     {
-        {OPPONENT_JACKSON_1, OPPONENT_JACKSON_2, OPPONENT_JACKSON_3, OPPONENT_JACKSON_4, OPPONENT_JACKSON_5},
+        {TRAINER_JACKSON_1, TRAINER_JACKSON_2, TRAINER_JACKSON_3, TRAINER_JACKSON_4, TRAINER_JACKSON_5},
         MAP_GROUP(ROUTE119),
         MAP_NUM(ROUTE119),
     },
     {
-        {OPPONENT_HALEY_1, OPPONENT_HALEY_2, OPPONENT_HALEY_3, OPPONENT_HALEY_4, OPPONENT_HALEY_5},
+        {TRAINER_HALEY_1, TRAINER_HALEY_2, TRAINER_HALEY_3, TRAINER_HALEY_4, TRAINER_HALEY_5},
         MAP_GROUP(ROUTE104),
         MAP_NUM(ROUTE104),
     },
     {
-        {OPPONENT_JAMES_1, OPPONENT_JAMES_2, OPPONENT_JAMES_3, OPPONENT_JAMES_4, OPPONENT_JAMES_5},
+        {TRAINER_JAMES_1, TRAINER_JAMES_2, TRAINER_JAMES_3, TRAINER_JAMES_4, TRAINER_JAMES_5},
         MAP_GROUP(PETALBURG_WOODS),
         MAP_NUM(PETALBURG_WOODS),
     },
     {
-        {OPPONENT_TRENT_1, OPPONENT_TRENT_2, OPPONENT_TRENT_3, OPPONENT_TRENT_4, OPPONENT_TRENT_5},
+        {TRAINER_TRENT_1, TRAINER_TRENT_2, TRAINER_TRENT_3, TRAINER_TRENT_4, TRAINER_TRENT_5},
         MAP_GROUP(ROUTE112),
         MAP_NUM(ROUTE112),
     },
     {
-        {OPPONENT_LOIS_AND_HAL_1, OPPONENT_LOIS_AND_HAL_2, OPPONENT_LOIS_AND_HAL_3, OPPONENT_LOIS_AND_HAL_4, OPPONENT_LOIS_AND_HAL_5},
+        {TRAINER_LOIS_AND_HAL_1, TRAINER_LOIS_AND_HAL_2, TRAINER_LOIS_AND_HAL_3, TRAINER_LOIS_AND_HAL_4, TRAINER_LOIS_AND_HAL_5},
         MAP_GROUP(ABANDONED_SHIP_ROOMS2_1F),
         MAP_NUM(ABANDONED_SHIP_ROOMS2_1F),
     },
     {
-        {OPPONENT_WALLY_3, OPPONENT_WALLY_4, OPPONENT_WALLY_5, OPPONENT_WALLY_6, OPPONENT_NONE},
+        {TRAINER_WALLY_3, TRAINER_WALLY_4, TRAINER_WALLY_5, TRAINER_WALLY_6, TRAINER_NONE},
         MAP_GROUP(VICTORY_ROAD_1F),
         MAP_NUM(VICTORY_ROAD_1F),
     },
@@ -748,7 +748,6 @@ static u8 GetSumOfEnemyPartyLevel(u16 opponentId, u8 numMons)
     u8 i;
     u8 sum;
     u32 count = numMons;
-    const void *party;
 
     if (gTrainers[opponentId].partySize < count)
         count = gTrainers[opponentId].partySize;
@@ -758,24 +757,36 @@ static u8 GetSumOfEnemyPartyLevel(u16 opponentId, u8 numMons)
     switch (gTrainers[opponentId].partyFlags)
     {
     case 0:
-        party = gTrainers[opponentId].party;
-        for (i = 0; i < count; i++)
-            sum += ((struct TrainerPartyMember0 *)party)[i].level;
+        {
+            const struct TrainerMonNoItemDefaultMoves *party;
+            party = gTrainers[opponentId].party.NoItemDefaultMoves;
+            for (i = 0; i < count; i++)
+                sum += party[i].level;
+        }
         break;
-    case 1:
-        party = gTrainers[opponentId].party;
-        for (i = 0; i < count; i++)
-            sum += ((struct TrainerPartyMember1 *)party)[i].level;
+    case F_TRAINER_PARTY_CUSTOM_MOVESET:
+        {
+            const struct TrainerMonNoItemCustomMoves *party;
+            party = gTrainers[opponentId].party.NoItemCustomMoves;
+            for (i = 0; i < count; i++)
+                sum += party[i].level;
+        }
         break;
-    case 2:
-        party = gTrainers[opponentId].party;
-        for (i = 0; i < count; i++)
-            sum += ((struct TrainerPartyMember2 *)party)[i].level;
+    case F_TRAINER_PARTY_HELD_ITEM:
+        {
+            const struct TrainerMonItemDefaultMoves *party;
+            party = gTrainers[opponentId].party.ItemDefaultMoves;
+            for (i = 0; i < count; i++)
+                sum += party[i].level;
+        }
         break;
-    case 3:
-        party = gTrainers[opponentId].party;
-        for (i = 0; i < count; i++)
-            sum += ((struct TrainerPartyMember3 *)party)[i].level;
+    case F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM:
+        {
+            const struct TrainerMonItemCustomMoves *party;
+            party = gTrainers[opponentId].party.ItemCustomMoves;
+            for (i = 0; i < count; i++)
+                sum += party[i].level;
+        }
         break;
     }
 
@@ -809,13 +820,13 @@ static u8 GetTrainerBattleTransition(void)
 
     if (trainer[gTrainerBattleOpponent].trainerClass == TRAINER_CLASS_ELITE_FOUR)
     {
-        if (gTrainerBattleOpponent == OPPONENT_SIDNEY)
+        if (gTrainerBattleOpponent == TRAINER_SIDNEY)
             return B_TRANSITION_SYDNEY;
-        if (gTrainerBattleOpponent == OPPONENT_PHOEBE)
+        if (gTrainerBattleOpponent == TRAINER_PHOEBE)
             return B_TRANSITION_PHOEBE;
-        if (gTrainerBattleOpponent == OPPONENT_GLACIA)
+        if (gTrainerBattleOpponent == TRAINER_GLACIA)
             return B_TRANSITION_GLACIA;
-        if (gTrainerBattleOpponent == OPPONENT_DRAKE)
+        if (gTrainerBattleOpponent == TRAINER_DRAKE)
             return B_TRANSITION_DRAKE;
         return B_TRANSITION_STEVEN;
     }
diff --git a/src/data/trainer_parties.h b/src/data/trainer_parties.h
index ad6b052df..5bd2a0f99 100644
--- a/src/data/trainer_parties.h
+++ b/src/data/trainer_parties.h
@@ -1,4 +1,4 @@
-const struct TrainerPartyMember0 gTrainerParty_Archie1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Archie1[] = {
     {
 	.iv = 0,
 	.level = 17,
@@ -11,7 +11,7 @@ const struct TrainerPartyMember0 gTrainerParty_Archie1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt1[] = {
     {
 	.iv = 0,
 	.level = 32,
@@ -24,7 +24,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt2[] = {
     {
 	.iv = 0,
 	.level = 30,
@@ -47,7 +47,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt3[] = {
     {
 	.iv = 0,
 	.level = 32,
@@ -60,7 +60,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt4[] = {
     {
 	.iv = 0,
 	.level = 33,
@@ -68,7 +68,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt5[] = {
     {
 	.iv = 0,
 	.level = 37,
@@ -81,7 +81,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt6[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt6[] = {
     {
 	.iv = 0,
 	.level = 38,
@@ -89,7 +89,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt6[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt7[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt7[] = {
     {
 	.iv = 0,
 	.level = 36,
@@ -107,7 +107,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt7[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt8[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt8[] = {
     {
 	.iv = 0,
 	.level = 17,
@@ -115,7 +115,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt8[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt9[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt9[] = {
     {
 	.iv = 0,
 	.level = 9,
@@ -123,7 +123,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt9[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt10[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt10[] = {
     {
 	.iv = 0,
 	.level = 9,
@@ -136,7 +136,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt10[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt11[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt11[] = {
     {
 	.iv = 0,
 	.level = 16,
@@ -149,7 +149,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt11[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt12[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt12[] = {
     {
 	.iv = 0,
 	.level = 16,
@@ -162,7 +162,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt12[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt13[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt13[] = {
     {
 	.iv = 0,
 	.level = 20,
@@ -175,7 +175,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt13[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt14[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt14[] = {
     {
 	.iv = 0,
 	.level = 17,
@@ -188,7 +188,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt14[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt15[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt15[] = {
     {
 	.iv = 0,
 	.level = 11,
@@ -196,7 +196,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt15[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt16[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt16[] = {
     {
 	.iv = 0,
 	.level = 27,
@@ -209,7 +209,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt16[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt17[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt17[] = {
     {
 	.iv = 0,
 	.level = 27,
@@ -222,7 +222,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt17[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt18[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt18[] = {
     {
 	.iv = 0,
 	.level = 26,
@@ -240,7 +240,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt18[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt19[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt19[] = {
     {
 	.iv = 0,
 	.level = 15,
@@ -248,7 +248,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt19[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt20[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt20[] = {
     {
 	.iv = 0,
 	.level = 14,
@@ -261,7 +261,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt20[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt21[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt21[] = {
     {
 	.iv = 0,
 	.level = 17,
@@ -269,7 +269,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt21[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt22[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt22[] = {
     {
 	.iv = 0,
 	.level = 30,
@@ -287,7 +287,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt22[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt23[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt23[] = {
     {
 	.iv = 0,
 	.level = 31,
@@ -300,7 +300,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt23[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt24[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt24[] = {
     {
 	.iv = 0,
 	.level = 31,
@@ -313,7 +313,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt24[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt25[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt25[] = {
     {
 	.iv = 0,
 	.level = 28,
@@ -321,7 +321,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt25[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt26[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt26[] = {
     {
 	.iv = 0,
 	.level = 31,
@@ -339,7 +339,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt26[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt27[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt27[] = {
     {
 	.iv = 0,
 	.level = 33,
@@ -347,7 +347,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt27[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Anonymous1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous1[] = {
     {
 	.iv = 50,
 	.level = 30,
@@ -360,7 +360,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Matt1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Matt1[] = {
     {
 	.iv = 50,
 	.level = 32,
@@ -378,7 +378,7 @@ const struct TrainerPartyMember0 gTrainerParty_Matt1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Matt2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Matt2[] = {
     {
 	.iv = 50,
 	.level = 20,
@@ -396,7 +396,7 @@ const struct TrainerPartyMember0 gTrainerParty_Matt2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Shelly1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelly1[] = {
     {
 	.iv = 50,
 	.level = 28,
@@ -409,7 +409,7 @@ const struct TrainerPartyMember0 gTrainerParty_Shelly1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Shelly2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelly2[] = {
     {
 	.iv = 50,
 	.level = 38,
@@ -422,7 +422,7 @@ const struct TrainerPartyMember0 gTrainerParty_Shelly2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Archie2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Archie2[] = {
     {
 	.iv = 150,
 	.level = 41,
@@ -440,7 +440,7 @@ const struct TrainerPartyMember0 gTrainerParty_Archie2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Archie3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Archie3[] = {
     {
 	.iv = 150,
 	.level = 24,
@@ -458,7 +458,7 @@ const struct TrainerPartyMember0 gTrainerParty_Archie3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Daisy[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Daisy[] = {
     {
 	.iv = 0,
 	.level = 16,
@@ -466,7 +466,7 @@ const struct TrainerPartyMember0 gTrainerParty_Daisy[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Rose1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rose1[] = {
     {
 	.iv = 0,
 	.level = 16,
@@ -479,7 +479,7 @@ const struct TrainerPartyMember0 gTrainerParty_Rose1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Lily[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lily[] = {
     {
 	.iv = 0,
 	.level = 17,
@@ -492,7 +492,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lily[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Violet[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Violet[] = {
     {
 	.iv = 0,
 	.level = 25,
@@ -510,7 +510,7 @@ const struct TrainerPartyMember0 gTrainerParty_Violet[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Rose2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rose2[] = {
     {
 	.iv = 10,
 	.level = 26,
@@ -523,7 +523,7 @@ const struct TrainerPartyMember0 gTrainerParty_Rose2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Rose3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rose3[] = {
     {
 	.iv = 20,
 	.level = 28,
@@ -541,7 +541,7 @@ const struct TrainerPartyMember0 gTrainerParty_Rose3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Rose4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rose4[] = {
     {
 	.iv = 30,
 	.level = 31,
@@ -559,7 +559,7 @@ const struct TrainerPartyMember0 gTrainerParty_Rose4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Rose5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rose5[] = {
     {
 	.iv = 40,
 	.level = 34,
@@ -577,7 +577,7 @@ const struct TrainerPartyMember0 gTrainerParty_Rose5[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Dusty1[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Dusty1[] = {
     {
 	.iv = 50,
 	.level = 24,
@@ -586,7 +586,7 @@ const struct TrainerPartyMember1 gTrainerParty_Dusty1[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Chip[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Chip[] = {
     {
 	.iv = 50,
 	.level = 28,
@@ -607,7 +607,7 @@ const struct TrainerPartyMember1 gTrainerParty_Chip[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Foster[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Foster[] = {
     {
 	.iv = 50,
 	.level = 26,
@@ -622,7 +622,7 @@ const struct TrainerPartyMember1 gTrainerParty_Foster[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Dusty2[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Dusty2[] = {
     {
 	.iv = 60,
 	.level = 27,
@@ -631,7 +631,7 @@ const struct TrainerPartyMember1 gTrainerParty_Dusty2[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Dusty3[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Dusty3[] = {
     {
 	.iv = 70,
 	.level = 30,
@@ -640,7 +640,7 @@ const struct TrainerPartyMember1 gTrainerParty_Dusty3[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Dusty4[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Dusty4[] = {
     {
 	.iv = 80,
 	.level = 33,
@@ -649,7 +649,7 @@ const struct TrainerPartyMember1 gTrainerParty_Dusty4[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Dusty5[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Dusty5[] = {
     {
 	.iv = 90,
 	.level = 36,
@@ -658,7 +658,7 @@ const struct TrainerPartyMember1 gTrainerParty_Dusty5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_GabbyAndTy1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_GabbyAndTy1[] = {
     {
 	.iv = 50,
 	.level = 19,
@@ -671,7 +671,7 @@ const struct TrainerPartyMember0 gTrainerParty_GabbyAndTy1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_GabbyAndTy2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_GabbyAndTy2[] = {
     {
 	.iv = 100,
 	.level = 27,
@@ -684,7 +684,7 @@ const struct TrainerPartyMember0 gTrainerParty_GabbyAndTy2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_GabbyAndTy3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_GabbyAndTy3[] = {
     {
 	.iv = 150,
 	.level = 30,
@@ -697,7 +697,7 @@ const struct TrainerPartyMember0 gTrainerParty_GabbyAndTy3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_GabbyAndTy4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_GabbyAndTy4[] = {
     {
 	.iv = 200,
 	.level = 33,
@@ -710,7 +710,7 @@ const struct TrainerPartyMember0 gTrainerParty_GabbyAndTy4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_GabbyAndTy5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_GabbyAndTy5[] = {
     {
 	.iv = 250,
 	.level = 36,
@@ -723,7 +723,7 @@ const struct TrainerPartyMember0 gTrainerParty_GabbyAndTy5[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_GabbyAndTy6[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_GabbyAndTy6[] = {
     {
 	.iv = 250,
 	.level = 39,
@@ -738,7 +738,7 @@ const struct TrainerPartyMember1 gTrainerParty_GabbyAndTy6[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Lola1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lola1[] = {
     {
 	.iv = 0,
 	.level = 13,
@@ -751,7 +751,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lola1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Carmen[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Carmen[] = {
     {
 	.iv = 0,
 	.level = 27,
@@ -759,7 +759,7 @@ const struct TrainerPartyMember0 gTrainerParty_Carmen[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Gwen[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Gwen[] = {
     {
 	.iv = 0,
 	.level = 27,
@@ -767,7 +767,7 @@ const struct TrainerPartyMember0 gTrainerParty_Gwen[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Lola2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lola2[] = {
     {
 	.iv = 10,
 	.level = 26,
@@ -780,7 +780,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lola2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Lola3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lola3[] = {
     {
 	.iv = 20,
 	.level = 29,
@@ -793,7 +793,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lola3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Lola4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lola4[] = {
     {
 	.iv = 30,
 	.level = 32,
@@ -806,7 +806,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lola4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Lola5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lola5[] = {
     {
 	.iv = 40,
 	.level = 35,
@@ -819,7 +819,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lola5[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Ricky1[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Ricky1[] = {
     {
 	.iv = 0,
 	.level = 14,
@@ -828,7 +828,7 @@ const struct TrainerPartyMember1 gTrainerParty_Ricky1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Simon[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Simon[] = {
     {
 	.iv = 0,
 	.level = 12,
@@ -841,7 +841,7 @@ const struct TrainerPartyMember0 gTrainerParty_Simon[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Charlie[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Charlie[] = {
     {
 	.iv = 0,
 	.level = 27,
@@ -849,7 +849,7 @@ const struct TrainerPartyMember0 gTrainerParty_Charlie[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Ricky2[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Ricky2[] = {
     {
 	.iv = 10,
 	.level = 27,
@@ -858,7 +858,7 @@ const struct TrainerPartyMember1 gTrainerParty_Ricky2[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Ricky3[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Ricky3[] = {
     {
 	.iv = 20,
 	.level = 30,
@@ -867,7 +867,7 @@ const struct TrainerPartyMember1 gTrainerParty_Ricky3[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Ricky4[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Ricky4[] = {
     {
 	.iv = 30,
 	.level = 33,
@@ -876,7 +876,7 @@ const struct TrainerPartyMember1 gTrainerParty_Ricky4[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Ricky5[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Ricky5[] = {
     {
 	.iv = 40,
 	.level = 36,
@@ -885,7 +885,7 @@ const struct TrainerPartyMember1 gTrainerParty_Ricky5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Randall[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Randall[] = {
     {
 	.iv = 100,
 	.level = 27,
@@ -893,7 +893,7 @@ const struct TrainerPartyMember0 gTrainerParty_Randall[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Parker[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Parker[] = {
     {
 	.iv = 100,
 	.level = 27,
@@ -901,7 +901,7 @@ const struct TrainerPartyMember0 gTrainerParty_Parker[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_George[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_George[] = {
     {
 	.iv = 100,
 	.level = 27,
@@ -909,7 +909,7 @@ const struct TrainerPartyMember0 gTrainerParty_George[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Berke[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Berke[] = {
     {
 	.iv = 100,
 	.level = 27,
@@ -917,7 +917,7 @@ const struct TrainerPartyMember0 gTrainerParty_Berke[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Clyde[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Clyde[] = {
     {
 	.iv = 100,
 	.level = 29,
@@ -950,7 +950,7 @@ const struct TrainerPartyMember1 gTrainerParty_Clyde[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Vincent[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Vincent[] = {
     {
 	.iv = 100,
 	.level = 44,
@@ -968,7 +968,7 @@ const struct TrainerPartyMember0 gTrainerParty_Vincent[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Leroy[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Leroy[] = {
     {
 	.iv = 100,
 	.level = 46,
@@ -981,7 +981,7 @@ const struct TrainerPartyMember0 gTrainerParty_Leroy[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Wilton1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wilton1[] = {
     {
 	.iv = 100,
 	.level = 18,
@@ -999,7 +999,7 @@ const struct TrainerPartyMember0 gTrainerParty_Wilton1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Edgar[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edgar[] = {
     {
 	.iv = 100,
 	.level = 44,
@@ -1007,7 +1007,7 @@ const struct TrainerPartyMember0 gTrainerParty_Edgar[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Albert[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Albert[] = {
     {
 	.iv = 100,
 	.level = 43,
@@ -1020,7 +1020,7 @@ const struct TrainerPartyMember0 gTrainerParty_Albert[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Samuel[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Samuel[] = {
     {
 	.iv = 100,
 	.level = 42,
@@ -1038,7 +1038,7 @@ const struct TrainerPartyMember0 gTrainerParty_Samuel[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Vito[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Vito[] = {
     {
 	.iv = 100,
 	.level = 42,
@@ -1061,7 +1061,7 @@ const struct TrainerPartyMember0 gTrainerParty_Vito[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Owen[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Owen[] = {
     {
 	.iv = 100,
 	.level = 42,
@@ -1079,7 +1079,7 @@ const struct TrainerPartyMember0 gTrainerParty_Owen[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Wilton2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wilton2[] = {
     {
 	.iv = 110,
 	.level = 26,
@@ -1097,7 +1097,7 @@ const struct TrainerPartyMember0 gTrainerParty_Wilton2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Wilton3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wilton3[] = {
     {
 	.iv = 120,
 	.level = 29,
@@ -1115,7 +1115,7 @@ const struct TrainerPartyMember0 gTrainerParty_Wilton3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Wilton4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wilton4[] = {
     {
 	.iv = 130,
 	.level = 32,
@@ -1133,7 +1133,7 @@ const struct TrainerPartyMember0 gTrainerParty_Wilton4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Wilton5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wilton5[] = {
     {
 	.iv = 140,
 	.level = 35,
@@ -1151,7 +1151,7 @@ const struct TrainerPartyMember0 gTrainerParty_Wilton5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Warren[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Warren[] = {
     {
 	.iv = 100,
 	.level = 34,
@@ -1169,7 +1169,7 @@ const struct TrainerPartyMember0 gTrainerParty_Warren[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Mary[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Mary[] = {
     {
 	.iv = 100,
 	.level = 27,
@@ -1177,7 +1177,7 @@ const struct TrainerPartyMember0 gTrainerParty_Mary[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Lori[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lori[] = {
     {
 	.iv = 100,
 	.level = 27,
@@ -1185,7 +1185,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lori[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jody[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jody[] = {
     {
 	.iv = 100,
 	.level = 27,
@@ -1193,7 +1193,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jody[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Wendy[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Wendy[] = {
     {
 	.iv = 100,
 	.level = 31,
@@ -1214,7 +1214,7 @@ const struct TrainerPartyMember1 gTrainerParty_Wendy[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Elaine[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Elaine[] = {
     {
 	.iv = 100,
 	.level = 45,
@@ -1227,7 +1227,7 @@ const struct TrainerPartyMember0 gTrainerParty_Elaine[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Brooke1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brooke1[] = {
     {
 	.iv = 100,
 	.level = 18,
@@ -1245,7 +1245,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brooke1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jennifer[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jennifer[] = {
     {
 	.iv = 100,
 	.level = 31,
@@ -1253,7 +1253,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jennifer[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Hope[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hope[] = {
     {
 	.iv = 100,
 	.level = 44,
@@ -1261,7 +1261,7 @@ const struct TrainerPartyMember0 gTrainerParty_Hope[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Shannon[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shannon[] = {
     {
 	.iv = 100,
 	.level = 44,
@@ -1269,7 +1269,7 @@ const struct TrainerPartyMember0 gTrainerParty_Shannon[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Michelle[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Michelle[] = {
     {
 	.iv = 100,
 	.level = 42,
@@ -1287,7 +1287,7 @@ const struct TrainerPartyMember0 gTrainerParty_Michelle[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Caroline[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Caroline[] = {
     {
 	.iv = 100,
 	.level = 43,
@@ -1300,7 +1300,7 @@ const struct TrainerPartyMember0 gTrainerParty_Caroline[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Julie[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Julie[] = {
     {
 	.iv = 100,
 	.level = 43,
@@ -1313,7 +1313,7 @@ const struct TrainerPartyMember0 gTrainerParty_Julie[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Brooke2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brooke2[] = {
     {
 	.iv = 110,
 	.level = 26,
@@ -1331,7 +1331,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brooke2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Brooke3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brooke3[] = {
     {
 	.iv = 120,
 	.level = 29,
@@ -1349,7 +1349,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brooke3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Brooke4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brooke4[] = {
     {
 	.iv = 130,
 	.level = 32,
@@ -1367,7 +1367,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brooke4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Brooke5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brooke5[] = {
     {
 	.iv = 140,
 	.level = 34,
@@ -1385,7 +1385,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brooke5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Patricia[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Patricia[] = {
     {
 	.iv = 0,
 	.level = 42,
@@ -1393,7 +1393,7 @@ const struct TrainerPartyMember0 gTrainerParty_Patricia[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Kindra[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kindra[] = {
     {
 	.iv = 0,
 	.level = 31,
@@ -1406,7 +1406,7 @@ const struct TrainerPartyMember0 gTrainerParty_Kindra[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Tammy[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tammy[] = {
     {
 	.iv = 0,
 	.level = 30,
@@ -1419,7 +1419,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tammy[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Valerie1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Valerie1[] = {
     {
 	.iv = 0,
 	.level = 32,
@@ -1427,7 +1427,7 @@ const struct TrainerPartyMember0 gTrainerParty_Valerie1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Tasha[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tasha[] = {
     {
 	.iv = 0,
 	.level = 31,
@@ -1440,7 +1440,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tasha[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Valerie2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Valerie2[] = {
     {
 	.iv = 10,
 	.level = 35,
@@ -1448,7 +1448,7 @@ const struct TrainerPartyMember0 gTrainerParty_Valerie2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Valerie3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Valerie3[] = {
     {
 	.iv = 20,
 	.level = 37,
@@ -1461,7 +1461,7 @@ const struct TrainerPartyMember0 gTrainerParty_Valerie3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Valerie4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Valerie4[] = {
     {
 	.iv = 30,
 	.level = 40,
@@ -1474,7 +1474,7 @@ const struct TrainerPartyMember0 gTrainerParty_Valerie4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Valerie5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Valerie5[] = {
     {
 	.iv = 40,
 	.level = 42,
@@ -1492,7 +1492,7 @@ const struct TrainerPartyMember0 gTrainerParty_Valerie5[] = {
     }
 };
 
-const struct TrainerPartyMember2 gTrainerParty_Cindy1[] = {
+const struct TrainerMonItemDefaultMoves gTrainerParty_Cindy1[] = {
     {
 	.iv = 0,
 	.level = 7,
@@ -1501,7 +1501,7 @@ const struct TrainerPartyMember2 gTrainerParty_Cindy1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Anonymous2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous2[] = {
     {
 	.iv = 0,
 	.level = 18,
@@ -1509,7 +1509,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous2[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Brianna1[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Brianna1[] = {
     {
 	.iv = 0,
 	.level = 10,
@@ -1524,7 +1524,7 @@ const struct TrainerPartyMember1 gTrainerParty_Brianna1[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Cindy2[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Cindy2[] = {
     {
 	.iv = 0,
 	.level = 11,
@@ -1533,7 +1533,7 @@ const struct TrainerPartyMember1 gTrainerParty_Cindy2[] = {
     }
 };
 
-const struct TrainerPartyMember2 gTrainerParty_Brianna2[] = {
+const struct TrainerMonItemDefaultMoves gTrainerParty_Brianna2[] = {
     {
 	.iv = 100,
 	.level = 41,
@@ -1542,7 +1542,7 @@ const struct TrainerPartyMember2 gTrainerParty_Brianna2[] = {
     }
 };
 
-const struct TrainerPartyMember2 gTrainerParty_Anette[] = {
+const struct TrainerMonItemDefaultMoves gTrainerParty_Anette[] = {
     {
 	.iv = 100,
 	.level = 45,
@@ -1551,7 +1551,7 @@ const struct TrainerPartyMember2 gTrainerParty_Anette[] = {
     }
 };
 
-const struct TrainerPartyMember2 gTrainerParty_Cindy3[] = {
+const struct TrainerMonItemDefaultMoves gTrainerParty_Cindy3[] = {
     {
 	.iv = 10,
 	.level = 27,
@@ -1560,7 +1560,7 @@ const struct TrainerPartyMember2 gTrainerParty_Cindy3[] = {
     }
 };
 
-const struct TrainerPartyMember2 gTrainerParty_Cindy4[] = {
+const struct TrainerMonItemDefaultMoves gTrainerParty_Cindy4[] = {
     {
 	.iv = 20,
 	.level = 30,
@@ -1569,7 +1569,7 @@ const struct TrainerPartyMember2 gTrainerParty_Cindy4[] = {
     }
 };
 
-const struct TrainerPartyMember2 gTrainerParty_Cindy5[] = {
+const struct TrainerMonItemDefaultMoves gTrainerParty_Cindy5[] = {
     {
 	.iv = 30,
 	.level = 33,
@@ -1578,7 +1578,7 @@ const struct TrainerPartyMember2 gTrainerParty_Cindy5[] = {
     }
 };
 
-const struct TrainerPartyMember3 gTrainerParty_Cindy6[] = {
+const struct TrainerMonItemCustomMoves gTrainerParty_Cindy6[] = {
     {
 	.iv = 40,
 	.level = 36,
@@ -1588,7 +1588,7 @@ const struct TrainerPartyMember3 gTrainerParty_Cindy6[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Melissa[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Melissa[] = {
     {
 	.iv = 0,
 	.level = 22,
@@ -1596,7 +1596,7 @@ const struct TrainerPartyMember0 gTrainerParty_Melissa[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Sheila[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sheila[] = {
     {
 	.iv = 0,
 	.level = 22,
@@ -1604,7 +1604,7 @@ const struct TrainerPartyMember0 gTrainerParty_Sheila[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Shirley[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shirley[] = {
     {
 	.iv = 0,
 	.level = 22,
@@ -1612,7 +1612,7 @@ const struct TrainerPartyMember0 gTrainerParty_Shirley[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Jessica1[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Jessica1[] = {
     {
 	.iv = 0,
 	.level = 30,
@@ -1627,7 +1627,7 @@ const struct TrainerPartyMember1 gTrainerParty_Jessica1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Connie[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Connie[] = {
     {
 	.iv = 100,
 	.level = 40,
@@ -1640,7 +1640,7 @@ const struct TrainerPartyMember0 gTrainerParty_Connie[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Bridget[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bridget[] = {
     {
 	.iv = 100,
 	.level = 41,
@@ -1648,7 +1648,7 @@ const struct TrainerPartyMember0 gTrainerParty_Bridget[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Olivia[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Olivia[] = {
     {
 	.iv = 100,
 	.level = 41,
@@ -1657,7 +1657,7 @@ const struct TrainerPartyMember1 gTrainerParty_Olivia[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Tiffany[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tiffany[] = {
     {
 	.iv = 100,
 	.level = 39,
@@ -1675,7 +1675,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tiffany[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Jessica2[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Jessica2[] = {
     {
 	.iv = 10,
 	.level = 33,
@@ -1690,7 +1690,7 @@ const struct TrainerPartyMember1 gTrainerParty_Jessica2[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Jessica3[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Jessica3[] = {
     {
 	.iv = 20,
 	.level = 36,
@@ -1705,7 +1705,7 @@ const struct TrainerPartyMember1 gTrainerParty_Jessica3[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Jessica4[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Jessica4[] = {
     {
 	.iv = 30,
 	.level = 39,
@@ -1720,7 +1720,7 @@ const struct TrainerPartyMember1 gTrainerParty_Jessica4[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Jessica5[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Jessica5[] = {
     {
 	.iv = 40,
 	.level = 42,
@@ -1735,7 +1735,7 @@ const struct TrainerPartyMember1 gTrainerParty_Jessica5[] = {
     }
 };
 
-const struct TrainerPartyMember2 gTrainerParty_Winston1[] = {
+const struct TrainerMonItemDefaultMoves gTrainerParty_Winston1[] = {
     {
 	.iv = 0,
 	.level = 7,
@@ -1744,7 +1744,7 @@ const struct TrainerPartyMember2 gTrainerParty_Winston1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Anonymous3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous3[] = {
     {
 	.iv = 0,
 	.level = 18,
@@ -1752,7 +1752,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous3[] = {
     }
 };
 
-const struct TrainerPartyMember2 gTrainerParty_Garret[] = {
+const struct TrainerMonItemDefaultMoves gTrainerParty_Garret[] = {
     {
 	.iv = 0,
 	.level = 45,
@@ -1761,7 +1761,7 @@ const struct TrainerPartyMember2 gTrainerParty_Garret[] = {
     }
 };
 
-const struct TrainerPartyMember2 gTrainerParty_Winston2[] = {
+const struct TrainerMonItemDefaultMoves gTrainerParty_Winston2[] = {
     {
 	.iv = 0,
 	.level = 27,
@@ -1770,7 +1770,7 @@ const struct TrainerPartyMember2 gTrainerParty_Winston2[] = {
     }
 };
 
-const struct TrainerPartyMember2 gTrainerParty_Winston3[] = {
+const struct TrainerMonItemDefaultMoves gTrainerParty_Winston3[] = {
     {
 	.iv = 0,
 	.level = 30,
@@ -1779,7 +1779,7 @@ const struct TrainerPartyMember2 gTrainerParty_Winston3[] = {
     }
 };
 
-const struct TrainerPartyMember2 gTrainerParty_Winston4[] = {
+const struct TrainerMonItemDefaultMoves gTrainerParty_Winston4[] = {
     {
 	.iv = 0,
 	.level = 33,
@@ -1788,7 +1788,7 @@ const struct TrainerPartyMember2 gTrainerParty_Winston4[] = {
     }
 };
 
-const struct TrainerPartyMember3 gTrainerParty_Winston5[] = {
+const struct TrainerMonItemCustomMoves gTrainerParty_Winston5[] = {
     {
 	.iv = 0,
 	.level = 36,
@@ -1798,7 +1798,7 @@ const struct TrainerPartyMember3 gTrainerParty_Winston5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Steve1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Steve1[] = {
     {
 	.iv = 0,
 	.level = 20,
@@ -1806,7 +1806,7 @@ const struct TrainerPartyMember0 gTrainerParty_Steve1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Chris[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Chris[] = {
     {
 	.iv = 0,
 	.level = 23,
@@ -1814,7 +1814,7 @@ const struct TrainerPartyMember0 gTrainerParty_Chris[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Mark[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Mark[] = {
     {
 	.iv = 0,
 	.level = 32,
@@ -1822,7 +1822,7 @@ const struct TrainerPartyMember0 gTrainerParty_Mark[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Kenn[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kenn[] = {
     {
 	.iv = 0,
 	.level = 25,
@@ -1830,7 +1830,7 @@ const struct TrainerPartyMember0 gTrainerParty_Kenn[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Steve2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Steve2[] = {
     {
 	.iv = 10,
 	.level = 27,
@@ -1838,7 +1838,7 @@ const struct TrainerPartyMember0 gTrainerParty_Steve2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Steve3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Steve3[] = {
     {
 	.iv = 20,
 	.level = 29,
@@ -1851,7 +1851,7 @@ const struct TrainerPartyMember0 gTrainerParty_Steve3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Steve4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Steve4[] = {
     {
 	.iv = 30,
 	.level = 32,
@@ -1864,7 +1864,7 @@ const struct TrainerPartyMember0 gTrainerParty_Steve4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Steve5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Steve5[] = {
     {
 	.iv = 40,
 	.level = 35,
@@ -1877,7 +1877,7 @@ const struct TrainerPartyMember0 gTrainerParty_Steve5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Luis[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Luis[] = {
     {
 	.iv = 0,
 	.level = 27,
@@ -1885,7 +1885,7 @@ const struct TrainerPartyMember0 gTrainerParty_Luis[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Austin[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Austin[] = {
     {
 	.iv = 0,
 	.level = 25,
@@ -1903,7 +1903,7 @@ const struct TrainerPartyMember0 gTrainerParty_Austin[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Douglas[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Douglas[] = {
     {
 	.iv = 0,
 	.level = 26,
@@ -1916,7 +1916,7 @@ const struct TrainerPartyMember0 gTrainerParty_Douglas[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Darrin[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Darrin[] = {
     {
 	.iv = 0,
 	.level = 27,
@@ -1924,7 +1924,7 @@ const struct TrainerPartyMember0 gTrainerParty_Darrin[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Tony1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tony1[] = {
     {
 	.iv = 0,
 	.level = 27,
@@ -1932,7 +1932,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tony1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jerome[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jerome[] = {
     {
 	.iv = 0,
 	.level = 26,
@@ -1945,7 +1945,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jerome[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Matthew[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Matthew[] = {
     {
 	.iv = 0,
 	.level = 27,
@@ -1953,7 +1953,7 @@ const struct TrainerPartyMember0 gTrainerParty_Matthew[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_David[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_David[] = {
     {
 	.iv = 0,
 	.level = 26,
@@ -1966,7 +1966,7 @@ const struct TrainerPartyMember0 gTrainerParty_David[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Spencer[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Spencer[] = {
     {
 	.iv = 0,
 	.level = 33,
@@ -1984,7 +1984,7 @@ const struct TrainerPartyMember0 gTrainerParty_Spencer[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Roland[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Roland[] = {
     {
 	.iv = 0,
 	.level = 35,
@@ -1992,7 +1992,7 @@ const struct TrainerPartyMember0 gTrainerParty_Roland[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Cody[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cody[] = {
     {
 	.iv = 0,
 	.level = 34,
@@ -2005,7 +2005,7 @@ const struct TrainerPartyMember0 gTrainerParty_Cody[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Stan[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Stan[] = {
     {
 	.iv = 0,
 	.level = 35,
@@ -2013,7 +2013,7 @@ const struct TrainerPartyMember0 gTrainerParty_Stan[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Barry[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Barry[] = {
     {
 	.iv = 0,
 	.level = 35,
@@ -2021,7 +2021,7 @@ const struct TrainerPartyMember0 gTrainerParty_Barry[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Dean[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dean[] = {
     {
 	.iv = 0,
 	.level = 33,
@@ -2039,7 +2039,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dean[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Rodney[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rodney[] = {
     {
 	.iv = 0,
 	.level = 34,
@@ -2052,7 +2052,7 @@ const struct TrainerPartyMember0 gTrainerParty_Rodney[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Richard[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Richard[] = {
     {
 	.iv = 0,
 	.level = 35,
@@ -2060,7 +2060,7 @@ const struct TrainerPartyMember0 gTrainerParty_Richard[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Herman[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Herman[] = {
     {
 	.iv = 0,
 	.level = 34,
@@ -2073,7 +2073,7 @@ const struct TrainerPartyMember0 gTrainerParty_Herman[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Anonymous4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous4[] = {
     {
 	.iv = 0,
 	.level = 38,
@@ -2081,7 +2081,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Gilbert[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Gilbert[] = {
     {
 	.iv = 0,
 	.level = 35,
@@ -2089,7 +2089,7 @@ const struct TrainerPartyMember0 gTrainerParty_Gilbert[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Franklin[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Franklin[] = {
     {
 	.iv = 0,
 	.level = 34,
@@ -2102,7 +2102,7 @@ const struct TrainerPartyMember0 gTrainerParty_Franklin[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Danny[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Danny[] = {
     {
 	.iv = 0,
 	.level = 37,
@@ -2115,7 +2115,7 @@ const struct TrainerPartyMember0 gTrainerParty_Danny[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jack[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jack[] = {
     {
 	.iv = 0,
 	.level = 34,
@@ -2128,7 +2128,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jack[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Dudley[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dudley[] = {
     {
 	.iv = 0,
 	.level = 33,
@@ -2146,7 +2146,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dudley[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Chad[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Chad[] = {
     {
 	.iv = 0,
 	.level = 34,
@@ -2159,7 +2159,7 @@ const struct TrainerPartyMember0 gTrainerParty_Chad[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Tony2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tony2[] = {
     {
 	.iv = 10,
 	.level = 30,
@@ -2167,7 +2167,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tony2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Tony3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tony3[] = {
     {
 	.iv = 20,
 	.level = 33,
@@ -2175,7 +2175,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tony3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Tony4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tony4[] = {
     {
 	.iv = 30,
 	.level = 34,
@@ -2188,7 +2188,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tony4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Tony5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tony5[] = {
     {
 	.iv = 40,
 	.level = 37,
@@ -2201,7 +2201,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tony5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Hideki[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hideki[] = {
     {
 	.iv = 100,
 	.level = 14,
@@ -2209,7 +2209,7 @@ const struct TrainerPartyMember0 gTrainerParty_Hideki[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Hitoshi[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hitoshi[] = {
     {
 	.iv = 100,
 	.level = 34,
@@ -2222,7 +2222,7 @@ const struct TrainerPartyMember0 gTrainerParty_Hitoshi[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Kiyo[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kiyo[] = {
     {
 	.iv = 100,
 	.level = 33,
@@ -2240,7 +2240,7 @@ const struct TrainerPartyMember0 gTrainerParty_Kiyo[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Koichi[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Koichi[] = {
     {
 	.iv = 100,
 	.level = 26,
@@ -2253,7 +2253,7 @@ const struct TrainerPartyMember0 gTrainerParty_Koichi[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Nob1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nob1[] = {
     {
 	.iv = 100,
 	.level = 20,
@@ -2261,7 +2261,7 @@ const struct TrainerPartyMember0 gTrainerParty_Nob1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Nob2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nob2[] = {
     {
 	.iv = 110,
 	.level = 27,
@@ -2269,7 +2269,7 @@ const struct TrainerPartyMember0 gTrainerParty_Nob2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Nob3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nob3[] = {
     {
 	.iv = 120,
 	.level = 29,
@@ -2282,7 +2282,7 @@ const struct TrainerPartyMember0 gTrainerParty_Nob3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Nob4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nob4[] = {
     {
 	.iv = 130,
 	.level = 31,
@@ -2300,7 +2300,7 @@ const struct TrainerPartyMember0 gTrainerParty_Nob4[] = {
     }
 };
 
-const struct TrainerPartyMember2 gTrainerParty_Nob5[] = {
+const struct TrainerMonItemDefaultMoves gTrainerParty_Nob5[] = {
     {
 	.iv = 140,
 	.level = 33,
@@ -2327,7 +2327,7 @@ const struct TrainerPartyMember2 gTrainerParty_Nob5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Yuji[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Yuji[] = {
     {
 	.iv = 100,
 	.level = 26,
@@ -2340,7 +2340,7 @@ const struct TrainerPartyMember0 gTrainerParty_Yuji[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Daisuke[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Daisuke[] = {
     {
 	.iv = 100,
 	.level = 19,
@@ -2348,7 +2348,7 @@ const struct TrainerPartyMember0 gTrainerParty_Daisuke[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Atsushi[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Atsushi[] = {
     {
 	.iv = 100,
 	.level = 30,
@@ -2366,7 +2366,7 @@ const struct TrainerPartyMember0 gTrainerParty_Atsushi[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Kirk[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kirk[] = {
     {
 	.iv = 100,
 	.level = 18,
@@ -2379,7 +2379,7 @@ const struct TrainerPartyMember0 gTrainerParty_Kirk[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Scott[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Scott[] = {
     {
 	.iv = 100,
 	.level = 19,
@@ -2387,7 +2387,7 @@ const struct TrainerPartyMember0 gTrainerParty_Scott[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Harvey[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Harvey[] = {
     {
 	.iv = 100,
 	.level = 18,
@@ -2400,7 +2400,7 @@ const struct TrainerPartyMember0 gTrainerParty_Harvey[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Shawn[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shawn[] = {
     {
 	.iv = 100,
 	.level = 17,
@@ -2418,7 +2418,7 @@ const struct TrainerPartyMember0 gTrainerParty_Shawn[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Randy[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Randy[] = {
     {
 	.iv = 0,
 	.level = 13,
@@ -2436,7 +2436,7 @@ const struct TrainerPartyMember0 gTrainerParty_Randy[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Dalton1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dalton1[] = {
     {
 	.iv = 0,
 	.level = 15,
@@ -2454,7 +2454,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dalton1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Dalton2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dalton2[] = {
     {
 	.iv = 10,
 	.level = 25,
@@ -2472,7 +2472,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dalton2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Dalton3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dalton3[] = {
     {
 	.iv = 20,
 	.level = 28,
@@ -2490,7 +2490,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dalton3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Dalton4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dalton4[] = {
     {
 	.iv = 30,
 	.level = 31,
@@ -2508,7 +2508,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dalton4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Dalton5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dalton5[] = {
     {
 	.iv = 40,
 	.level = 34,
@@ -2526,7 +2526,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dalton5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Cole[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cole[] = {
     {
 	.iv = 100,
 	.level = 22,
@@ -2544,7 +2544,7 @@ const struct TrainerPartyMember0 gTrainerParty_Cole[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Flint[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Flint[] = {
     {
 	.iv = 100,
 	.level = 24,
@@ -2552,7 +2552,7 @@ const struct TrainerPartyMember0 gTrainerParty_Flint[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Axle[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Axle[] = {
     {
 	.iv = 100,
 	.level = 23,
@@ -2565,7 +2565,7 @@ const struct TrainerPartyMember0 gTrainerParty_Axle[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jake[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jake[] = {
     {
 	.iv = 100,
 	.level = 24,
@@ -2573,7 +2573,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jake[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Andy[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Andy[] = {
     {
 	.iv = 100,
 	.level = 23,
@@ -2586,7 +2586,7 @@ const struct TrainerPartyMember0 gTrainerParty_Andy[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Bernie1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bernie1[] = {
     {
 	.iv = 0,
 	.level = 19,
@@ -2599,7 +2599,7 @@ const struct TrainerPartyMember0 gTrainerParty_Bernie1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Bernie2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bernie2[] = {
     {
 	.iv = 10,
 	.level = 26,
@@ -2612,7 +2612,7 @@ const struct TrainerPartyMember0 gTrainerParty_Bernie2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Bernie3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bernie3[] = {
     {
 	.iv = 20,
 	.level = 29,
@@ -2625,7 +2625,7 @@ const struct TrainerPartyMember0 gTrainerParty_Bernie3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Bernie4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bernie4[] = {
     {
 	.iv = 30,
 	.level = 32,
@@ -2638,7 +2638,7 @@ const struct TrainerPartyMember0 gTrainerParty_Bernie4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Bernie5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bernie5[] = {
     {
 	.iv = 40,
 	.level = 35,
@@ -2651,7 +2651,7 @@ const struct TrainerPartyMember0 gTrainerParty_Bernie5[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Drew[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Drew[] = {
     {
 	.iv = 0,
 	.level = 24,
@@ -2660,7 +2660,7 @@ const struct TrainerPartyMember1 gTrainerParty_Drew[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Cliff[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Cliff[] = {
     {
 	.iv = 0,
 	.level = 22,
@@ -2681,7 +2681,7 @@ const struct TrainerPartyMember1 gTrainerParty_Cliff[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Larry[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Larry[] = {
     {
 	.iv = 0,
 	.level = 18,
@@ -2694,7 +2694,7 @@ const struct TrainerPartyMember0 gTrainerParty_Larry[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Shane[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shane[] = {
     {
 	.iv = 0,
 	.level = 19,
@@ -2707,7 +2707,7 @@ const struct TrainerPartyMember0 gTrainerParty_Shane[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Justin[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Justin[] = {
     {
 	.iv = 0,
 	.level = 24,
@@ -2715,7 +2715,7 @@ const struct TrainerPartyMember0 gTrainerParty_Justin[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Ethan1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ethan1[] = {
     {
 	.iv = 0,
 	.level = 21,
@@ -2728,7 +2728,7 @@ const struct TrainerPartyMember0 gTrainerParty_Ethan1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jeff[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jeff[] = {
     {
 	.iv = 0,
 	.level = 9,
@@ -2741,7 +2741,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jeff[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Travis[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Travis[] = {
     {
 	.iv = 0,
 	.level = 19,
@@ -2749,7 +2749,7 @@ const struct TrainerPartyMember0 gTrainerParty_Travis[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Ethan2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ethan2[] = {
     {
 	.iv = 10,
 	.level = 26,
@@ -2762,7 +2762,7 @@ const struct TrainerPartyMember0 gTrainerParty_Ethan2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Ethan3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ethan3[] = {
     {
 	.iv = 20,
 	.level = 29,
@@ -2775,7 +2775,7 @@ const struct TrainerPartyMember0 gTrainerParty_Ethan3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Ethan4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ethan4[] = {
     {
 	.iv = 30,
 	.level = 31,
@@ -2793,7 +2793,7 @@ const struct TrainerPartyMember0 gTrainerParty_Ethan4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Ethan5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ethan5[] = {
     {
 	.iv = 40,
 	.level = 34,
@@ -2811,7 +2811,7 @@ const struct TrainerPartyMember0 gTrainerParty_Ethan5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Brent[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brent[] = {
     {
 	.iv = 100,
 	.level = 27,
@@ -2819,7 +2819,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brent[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Donald[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Donald[] = {
     {
 	.iv = 100,
 	.level = 25,
@@ -2837,7 +2837,7 @@ const struct TrainerPartyMember0 gTrainerParty_Donald[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Taylor[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Taylor[] = {
     {
 	.iv = 100,
 	.level = 25,
@@ -2855,7 +2855,7 @@ const struct TrainerPartyMember0 gTrainerParty_Taylor[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Brandon1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brandon1[] = {
     {
 	.iv = 0,
 	.level = 28,
@@ -2873,7 +2873,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brandon1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Derek[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Derek[] = {
     {
 	.iv = 100,
 	.level = 15,
@@ -2891,7 +2891,7 @@ const struct TrainerPartyMember0 gTrainerParty_Derek[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Brandon2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brandon2[] = {
     {
 	.iv = 10,
 	.level = 31,
@@ -2909,7 +2909,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brandon2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Brandon3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brandon3[] = {
     {
 	.iv = 20,
 	.level = 34,
@@ -2927,7 +2927,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brandon3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Brandon4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brandon4[] = {
     {
 	.iv = 30,
 	.level = 36,
@@ -2950,7 +2950,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brandon4[] = {
     }
 };
 
-const struct TrainerPartyMember2 gTrainerParty_Brandon5[] = {
+const struct TrainerMonItemDefaultMoves gTrainerParty_Brandon5[] = {
     {
 	.iv = 40,
 	.level = 38,
@@ -2983,7 +2983,7 @@ const struct TrainerPartyMember2 gTrainerParty_Brandon5[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Edward[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Edward[] = {
     {
 	.iv = 0,
 	.level = 16,
@@ -2992,7 +2992,7 @@ const struct TrainerPartyMember1 gTrainerParty_Edward[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Preston[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Preston[] = {
     {
 	.iv = 100,
 	.level = 37,
@@ -3000,7 +3000,7 @@ const struct TrainerPartyMember0 gTrainerParty_Preston[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Virgil[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Virgil[] = {
     {
 	.iv = 100,
 	.level = 36,
@@ -3013,7 +3013,7 @@ const struct TrainerPartyMember0 gTrainerParty_Virgil[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Fritz[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Fritz[] = {
     {
 	.iv = 100,
 	.level = 35,
@@ -3031,7 +3031,7 @@ const struct TrainerPartyMember0 gTrainerParty_Fritz[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_William[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_William[] = {
     {
 	.iv = 0,
 	.level = 31,
@@ -3044,7 +3044,7 @@ const struct TrainerPartyMember0 gTrainerParty_William[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Joshua[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Joshua[] = {
     {
 	.iv = 0,
 	.level = 41,
@@ -3057,7 +3057,7 @@ const struct TrainerPartyMember0 gTrainerParty_Joshua[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Cameron1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cameron1[] = {
     {
 	.iv = 0,
 	.level = 31,
@@ -3070,7 +3070,7 @@ const struct TrainerPartyMember0 gTrainerParty_Cameron1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Cameron2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cameron2[] = {
     {
 	.iv = 10,
 	.level = 34,
@@ -3083,7 +3083,7 @@ const struct TrainerPartyMember0 gTrainerParty_Cameron2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Cameron3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cameron3[] = {
     {
 	.iv = 20,
 	.level = 37,
@@ -3096,7 +3096,7 @@ const struct TrainerPartyMember0 gTrainerParty_Cameron3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Cameron4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cameron4[] = {
     {
 	.iv = 30,
 	.level = 40,
@@ -3109,7 +3109,7 @@ const struct TrainerPartyMember0 gTrainerParty_Cameron4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Cameron5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cameron5[] = {
     {
 	.iv = 40,
 	.level = 43,
@@ -3122,7 +3122,7 @@ const struct TrainerPartyMember0 gTrainerParty_Cameron5[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Jaclyn[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Jaclyn[] = {
     {
 	.iv = 0,
 	.level = 16,
@@ -3131,7 +3131,7 @@ const struct TrainerPartyMember1 gTrainerParty_Jaclyn[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Hannah[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hannah[] = {
     {
 	.iv = 100,
 	.level = 36,
@@ -3144,7 +3144,7 @@ const struct TrainerPartyMember0 gTrainerParty_Hannah[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Samantha[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Samantha[] = {
     {
 	.iv = 100,
 	.level = 37,
@@ -3152,7 +3152,7 @@ const struct TrainerPartyMember0 gTrainerParty_Samantha[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Maura[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maura[] = {
     {
 	.iv = 100,
 	.level = 36,
@@ -3165,7 +3165,7 @@ const struct TrainerPartyMember0 gTrainerParty_Maura[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Kayla[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kayla[] = {
     {
 	.iv = 0,
 	.level = 32,
@@ -3173,7 +3173,7 @@ const struct TrainerPartyMember0 gTrainerParty_Kayla[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Alexis[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alexis[] = {
     {
 	.iv = 0,
 	.level = 40,
@@ -3191,7 +3191,7 @@ const struct TrainerPartyMember0 gTrainerParty_Alexis[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jacki1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jacki1[] = {
     {
 	.iv = 0,
 	.level = 31,
@@ -3204,7 +3204,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jacki1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jacki2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jacki2[] = {
     {
 	.iv = 10,
 	.level = 34,
@@ -3217,7 +3217,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jacki2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jacki3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jacki3[] = {
     {
 	.iv = 20,
 	.level = 37,
@@ -3230,7 +3230,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jacki3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jacki4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jacki4[] = {
     {
 	.iv = 30,
 	.level = 40,
@@ -3243,7 +3243,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jacki4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jacki5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jacki5[] = {
     {
 	.iv = 40,
 	.level = 43,
@@ -3256,7 +3256,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jacki5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Walter1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Walter1[] = {
     {
 	.iv = 0,
 	.level = 31,
@@ -3264,7 +3264,7 @@ const struct TrainerPartyMember0 gTrainerParty_Walter1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Tucker[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tucker[] = {
     {
 	.iv = 0,
 	.level = 44,
@@ -3277,7 +3277,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tucker[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Thomas[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Thomas[] = {
     {
 	.iv = 0,
 	.level = 45,
@@ -3285,7 +3285,7 @@ const struct TrainerPartyMember0 gTrainerParty_Thomas[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Walter2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Walter2[] = {
     {
 	.iv = 10,
 	.level = 34,
@@ -3293,7 +3293,7 @@ const struct TrainerPartyMember0 gTrainerParty_Walter2[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Walter3[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Walter3[] = {
     {
 	.iv = 20,
 	.level = 36,
@@ -3308,7 +3308,7 @@ const struct TrainerPartyMember1 gTrainerParty_Walter3[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Walter4[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Walter4[] = {
     {
 	.iv = 30,
 	.level = 39,
@@ -3323,7 +3323,7 @@ const struct TrainerPartyMember1 gTrainerParty_Walter4[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Walter5[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Walter5[] = {
     {
 	.iv = 40,
 	.level = 41,
@@ -3344,7 +3344,7 @@ const struct TrainerPartyMember1 gTrainerParty_Walter5[] = {
     }
 };
 
-const struct TrainerPartyMember3 gTrainerParty_Sidney[] = {
+const struct TrainerMonItemCustomMoves gTrainerParty_Sidney[] = {
     {
 	.iv = 250,
 	.level = 46,
@@ -3382,7 +3382,7 @@ const struct TrainerPartyMember3 gTrainerParty_Sidney[] = {
     }
 };
 
-const struct TrainerPartyMember3 gTrainerParty_Phoebe[] = {
+const struct TrainerMonItemCustomMoves gTrainerParty_Phoebe[] = {
     {
 	.iv = 250,
 	.level = 48,
@@ -3420,7 +3420,7 @@ const struct TrainerPartyMember3 gTrainerParty_Phoebe[] = {
     }
 };
 
-const struct TrainerPartyMember3 gTrainerParty_Glacia[] = {
+const struct TrainerMonItemCustomMoves gTrainerParty_Glacia[] = {
     {
 	.iv = 250,
 	.level = 50,
@@ -3458,7 +3458,7 @@ const struct TrainerPartyMember3 gTrainerParty_Glacia[] = {
     }
 };
 
-const struct TrainerPartyMember3 gTrainerParty_Drake[] = {
+const struct TrainerMonItemCustomMoves gTrainerParty_Drake[] = {
     {
 	.iv = 250,
 	.level = 52,
@@ -3496,7 +3496,7 @@ const struct TrainerPartyMember3 gTrainerParty_Drake[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Roxanne[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Roxanne[] = {
     {
 	.iv = 150,
 	.level = 14,
@@ -3511,7 +3511,7 @@ const struct TrainerPartyMember1 gTrainerParty_Roxanne[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Brawly[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Brawly[] = {
     {
 	.iv = 150,
 	.level = 17,
@@ -3526,7 +3526,7 @@ const struct TrainerPartyMember1 gTrainerParty_Brawly[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Wattson[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Wattson[] = {
     {
 	.iv = 200,
 	.level = 22,
@@ -3547,7 +3547,7 @@ const struct TrainerPartyMember1 gTrainerParty_Wattson[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Flannery[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Flannery[] = {
     {
 	.iv = 200,
 	.level = 26,
@@ -3568,7 +3568,7 @@ const struct TrainerPartyMember1 gTrainerParty_Flannery[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Norman[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Norman[] = {
     {
 	.iv = 200,
 	.level = 28,
@@ -3589,7 +3589,7 @@ const struct TrainerPartyMember1 gTrainerParty_Norman[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Winona[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Winona[] = {
     {
 	.iv = 200,
 	.level = 31,
@@ -3616,7 +3616,7 @@ const struct TrainerPartyMember1 gTrainerParty_Winona[] = {
     }
 };
 
-const struct TrainerPartyMember3 gTrainerParty_TateAndLiza[] = {
+const struct TrainerMonItemCustomMoves gTrainerParty_TateAndLiza[] = {
     {
 	.iv = 250,
 	.level = 42,
@@ -3633,7 +3633,7 @@ const struct TrainerPartyMember3 gTrainerParty_TateAndLiza[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Wallace[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Wallace[] = {
     {
 	.iv = 200,
 	.level = 40,
@@ -3666,7 +3666,7 @@ const struct TrainerPartyMember1 gTrainerParty_Wallace[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jerry1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jerry1[] = {
     {
 	.iv = 10,
 	.level = 10,
@@ -3674,7 +3674,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jerry1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Ted[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ted[] = {
     {
 	.iv = 10,
 	.level = 17,
@@ -3682,7 +3682,7 @@ const struct TrainerPartyMember0 gTrainerParty_Ted[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Paul[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Paul[] = {
     {
 	.iv = 10,
 	.level = 15,
@@ -3700,7 +3700,7 @@ const struct TrainerPartyMember0 gTrainerParty_Paul[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jerry2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jerry2[] = {
     {
 	.iv = 20,
 	.level = 26,
@@ -3713,7 +3713,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jerry2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jerry3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jerry3[] = {
     {
 	.iv = 30,
 	.level = 29,
@@ -3726,7 +3726,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jerry3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jerry4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jerry4[] = {
     {
 	.iv = 40,
 	.level = 32,
@@ -3739,7 +3739,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jerry4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jerry5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jerry5[] = {
     {
 	.iv = 50,
 	.level = 34,
@@ -3757,7 +3757,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jerry5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Karen1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Karen1[] = {
     {
 	.iv = 10,
 	.level = 9,
@@ -3770,7 +3770,7 @@ const struct TrainerPartyMember0 gTrainerParty_Karen1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Georgia[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Georgia[] = {
     {
 	.iv = 10,
 	.level = 16,
@@ -3783,7 +3783,7 @@ const struct TrainerPartyMember0 gTrainerParty_Georgia[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Karen2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Karen2[] = {
     {
 	.iv = 20,
 	.level = 26,
@@ -3796,7 +3796,7 @@ const struct TrainerPartyMember0 gTrainerParty_Karen2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Karen3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Karen3[] = {
     {
 	.iv = 30,
 	.level = 29,
@@ -3809,7 +3809,7 @@ const struct TrainerPartyMember0 gTrainerParty_Karen3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Karen4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Karen4[] = {
     {
 	.iv = 40,
 	.level = 32,
@@ -3822,7 +3822,7 @@ const struct TrainerPartyMember0 gTrainerParty_Karen4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Karen5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Karen5[] = {
     {
 	.iv = 50,
 	.level = 35,
@@ -3835,7 +3835,7 @@ const struct TrainerPartyMember0 gTrainerParty_Karen5[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_KateAndJoy[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_KateAndJoy[] = {
     {
 	.iv = 0,
 	.level = 30,
@@ -3850,7 +3850,7 @@ const struct TrainerPartyMember1 gTrainerParty_KateAndJoy[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_AnnaAndMeg1[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_AnnaAndMeg1[] = {
     {
 	.iv = 0,
 	.level = 16,
@@ -3865,7 +3865,7 @@ const struct TrainerPartyMember1 gTrainerParty_AnnaAndMeg1[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_AnnaAndMeg2[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_AnnaAndMeg2[] = {
     {
 	.iv = 10,
 	.level = 26,
@@ -3880,7 +3880,7 @@ const struct TrainerPartyMember1 gTrainerParty_AnnaAndMeg2[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_AnnaAndMeg3[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_AnnaAndMeg3[] = {
     {
 	.iv = 20,
 	.level = 29,
@@ -3895,7 +3895,7 @@ const struct TrainerPartyMember1 gTrainerParty_AnnaAndMeg3[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_AnnaAndMeg4[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_AnnaAndMeg4[] = {
     {
 	.iv = 30,
 	.level = 32,
@@ -3910,7 +3910,7 @@ const struct TrainerPartyMember1 gTrainerParty_AnnaAndMeg4[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_AnnaAndMeg5[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_AnnaAndMeg5[] = {
     {
 	.iv = 40,
 	.level = 35,
@@ -3925,7 +3925,7 @@ const struct TrainerPartyMember1 gTrainerParty_AnnaAndMeg5[] = {
     }
 };
 
-const struct TrainerPartyMember2 gTrainerParty_Victor[] = {
+const struct TrainerMonItemDefaultMoves gTrainerParty_Victor[] = {
     {
 	.iv = 25,
 	.level = 16,
@@ -3940,7 +3940,7 @@ const struct TrainerPartyMember2 gTrainerParty_Victor[] = {
     }
 };
 
-const struct TrainerPartyMember2 gTrainerParty_Miguel1[] = {
+const struct TrainerMonItemDefaultMoves gTrainerParty_Miguel1[] = {
     {
 	.iv = 0,
 	.level = 16,
@@ -3949,7 +3949,7 @@ const struct TrainerPartyMember2 gTrainerParty_Miguel1[] = {
     }
 };
 
-const struct TrainerPartyMember3 gTrainerParty_Colton[] = {
+const struct TrainerMonItemCustomMoves gTrainerParty_Colton[] = {
     {
 	.iv = 0,
 	.level = 22,
@@ -3994,7 +3994,7 @@ const struct TrainerPartyMember3 gTrainerParty_Colton[] = {
     }
 };
 
-const struct TrainerPartyMember2 gTrainerParty_Miguel2[] = {
+const struct TrainerMonItemDefaultMoves gTrainerParty_Miguel2[] = {
     {
 	.iv = 0,
 	.level = 27,
@@ -4003,7 +4003,7 @@ const struct TrainerPartyMember2 gTrainerParty_Miguel2[] = {
     }
 };
 
-const struct TrainerPartyMember2 gTrainerParty_Miguel3[] = {
+const struct TrainerMonItemDefaultMoves gTrainerParty_Miguel3[] = {
     {
 	.iv = 0,
 	.level = 30,
@@ -4012,7 +4012,7 @@ const struct TrainerPartyMember2 gTrainerParty_Miguel3[] = {
     }
 };
 
-const struct TrainerPartyMember2 gTrainerParty_Miguel4[] = {
+const struct TrainerMonItemDefaultMoves gTrainerParty_Miguel4[] = {
     {
 	.iv = 0,
 	.level = 33,
@@ -4021,7 +4021,7 @@ const struct TrainerPartyMember2 gTrainerParty_Miguel4[] = {
     }
 };
 
-const struct TrainerPartyMember2 gTrainerParty_Miguel5[] = {
+const struct TrainerMonItemDefaultMoves gTrainerParty_Miguel5[] = {
     {
 	.iv = 0,
 	.level = 36,
@@ -4030,7 +4030,7 @@ const struct TrainerPartyMember2 gTrainerParty_Miguel5[] = {
     }
 };
 
-const struct TrainerPartyMember2 gTrainerParty_Victoria[] = {
+const struct TrainerMonItemDefaultMoves gTrainerParty_Victoria[] = {
     {
 	.iv = 50,
 	.level = 17,
@@ -4039,7 +4039,7 @@ const struct TrainerPartyMember2 gTrainerParty_Victoria[] = {
     }
 };
 
-const struct TrainerPartyMember2 gTrainerParty_Vanessa[] = {
+const struct TrainerMonItemDefaultMoves gTrainerParty_Vanessa[] = {
     {
 	.iv = 0,
 	.level = 31,
@@ -4048,7 +4048,7 @@ const struct TrainerPartyMember2 gTrainerParty_Vanessa[] = {
     }
 };
 
-const struct TrainerPartyMember2 gTrainerParty_Marissa[] = {
+const struct TrainerMonItemDefaultMoves gTrainerParty_Marissa[] = {
     {
 	.iv = 100,
 	.level = 36,
@@ -4069,7 +4069,7 @@ const struct TrainerPartyMember2 gTrainerParty_Marissa[] = {
     }
 };
 
-const struct TrainerPartyMember2 gTrainerParty_Isabel1[] = {
+const struct TrainerMonItemDefaultMoves gTrainerParty_Isabel1[] = {
     {
 	.iv = 0,
 	.level = 15,
@@ -4084,7 +4084,7 @@ const struct TrainerPartyMember2 gTrainerParty_Isabel1[] = {
     }
 };
 
-const struct TrainerPartyMember2 gTrainerParty_Isabel2[] = {
+const struct TrainerMonItemDefaultMoves gTrainerParty_Isabel2[] = {
     {
 	.iv = 10,
 	.level = 26,
@@ -4099,7 +4099,7 @@ const struct TrainerPartyMember2 gTrainerParty_Isabel2[] = {
     }
 };
 
-const struct TrainerPartyMember2 gTrainerParty_Isabel3[] = {
+const struct TrainerMonItemDefaultMoves gTrainerParty_Isabel3[] = {
     {
 	.iv = 20,
 	.level = 29,
@@ -4114,7 +4114,7 @@ const struct TrainerPartyMember2 gTrainerParty_Isabel3[] = {
     }
 };
 
-const struct TrainerPartyMember2 gTrainerParty_Isabel4[] = {
+const struct TrainerMonItemDefaultMoves gTrainerParty_Isabel4[] = {
     {
 	.iv = 30,
 	.level = 32,
@@ -4129,7 +4129,7 @@ const struct TrainerPartyMember2 gTrainerParty_Isabel4[] = {
     }
 };
 
-const struct TrainerPartyMember2 gTrainerParty_Isabel5[] = {
+const struct TrainerMonItemDefaultMoves gTrainerParty_Isabel5[] = {
     {
 	.iv = 40,
 	.level = 35,
@@ -4144,7 +4144,7 @@ const struct TrainerPartyMember2 gTrainerParty_Isabel5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Timothy1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Timothy1[] = {
     {
 	.iv = 200,
 	.level = 28,
@@ -4152,7 +4152,7 @@ const struct TrainerPartyMember0 gTrainerParty_Timothy1[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Timothy2[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Timothy2[] = {
     {
 	.iv = 210,
 	.level = 31,
@@ -4161,7 +4161,7 @@ const struct TrainerPartyMember1 gTrainerParty_Timothy2[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Timothy3[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Timothy3[] = {
     {
 	.iv = 220,
 	.level = 34,
@@ -4170,7 +4170,7 @@ const struct TrainerPartyMember1 gTrainerParty_Timothy3[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Timothy4[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Timothy4[] = {
     {
 	.iv = 230,
 	.level = 37,
@@ -4179,7 +4179,7 @@ const struct TrainerPartyMember1 gTrainerParty_Timothy4[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Timothy5[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Timothy5[] = {
     {
 	.iv = 240,
 	.level = 40,
@@ -4188,7 +4188,7 @@ const struct TrainerPartyMember1 gTrainerParty_Timothy5[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Vicky[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Vicky[] = {
     {
 	.iv = 200,
 	.level = 18,
@@ -4197,7 +4197,7 @@ const struct TrainerPartyMember1 gTrainerParty_Vicky[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Shelby1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelby1[] = {
     {
 	.iv = 200,
 	.level = 22,
@@ -4210,7 +4210,7 @@ const struct TrainerPartyMember0 gTrainerParty_Shelby1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Shelby2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelby2[] = {
     {
 	.iv = 210,
 	.level = 30,
@@ -4223,7 +4223,7 @@ const struct TrainerPartyMember0 gTrainerParty_Shelby2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Shelby3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelby3[] = {
     {
 	.iv = 220,
 	.level = 33,
@@ -4236,7 +4236,7 @@ const struct TrainerPartyMember0 gTrainerParty_Shelby3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Shelby4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelby4[] = {
     {
 	.iv = 230,
 	.level = 36,
@@ -4249,7 +4249,7 @@ const struct TrainerPartyMember0 gTrainerParty_Shelby4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Shelby5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelby5[] = {
     {
 	.iv = 240,
 	.level = 39,
@@ -4262,7 +4262,7 @@ const struct TrainerPartyMember0 gTrainerParty_Shelby5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Calvin1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Calvin1[] = {
     {
 	.iv = 0,
 	.level = 5,
@@ -4270,7 +4270,7 @@ const struct TrainerPartyMember0 gTrainerParty_Calvin1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Billy[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Billy[] = {
     {
 	.iv = 0,
 	.level = 6,
@@ -4283,7 +4283,7 @@ const struct TrainerPartyMember0 gTrainerParty_Billy[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Josh[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Josh[] = {
     {
 	.iv = 100,
 	.level = 10,
@@ -4304,7 +4304,7 @@ const struct TrainerPartyMember1 gTrainerParty_Josh[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Tommy[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tommy[] = {
     {
 	.iv = 100,
 	.level = 11,
@@ -4312,7 +4312,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tommy[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Joey[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Joey[] = {
     {
 	.iv = 0,
 	.level = 8,
@@ -4325,7 +4325,7 @@ const struct TrainerPartyMember0 gTrainerParty_Joey[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Ben[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Ben[] = {
     {
 	.iv = 100,
 	.level = 19,
@@ -4334,7 +4334,7 @@ const struct TrainerPartyMember1 gTrainerParty_Ben[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Anonymous5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous5[] = {
     {
 	.iv = 0,
 	.level = 9,
@@ -4347,7 +4347,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Kevin[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kevin[] = {
     {
 	.iv = 0,
 	.level = 9,
@@ -4360,7 +4360,7 @@ const struct TrainerPartyMember0 gTrainerParty_Kevin[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Neal[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Neal[] = {
     {
 	.iv = 0,
 	.level = 18,
@@ -4373,7 +4373,7 @@ const struct TrainerPartyMember0 gTrainerParty_Neal[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Dillon[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dillon[] = {
     {
 	.iv = 0,
 	.level = 20,
@@ -4381,7 +4381,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dillon[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Calvin2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Calvin2[] = {
     {
 	.iv = 10,
 	.level = 27,
@@ -4389,7 +4389,7 @@ const struct TrainerPartyMember0 gTrainerParty_Calvin2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Calvin3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Calvin3[] = {
     {
 	.iv = 20,
 	.level = 28,
@@ -4402,7 +4402,7 @@ const struct TrainerPartyMember0 gTrainerParty_Calvin3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Calvin4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Calvin4[] = {
     {
 	.iv = 30,
 	.level = 31,
@@ -4415,7 +4415,7 @@ const struct TrainerPartyMember0 gTrainerParty_Calvin4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Calvin5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Calvin5[] = {
     {
 	.iv = 40,
 	.level = 34,
@@ -4433,7 +4433,7 @@ const struct TrainerPartyMember0 gTrainerParty_Calvin5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Eddie[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Eddie[] = {
     {
 	.iv = 0,
 	.level = 14,
@@ -4446,7 +4446,7 @@ const struct TrainerPartyMember0 gTrainerParty_Eddie[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Allen[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Allen[] = {
     {
 	.iv = 0,
 	.level = 5,
@@ -4459,7 +4459,7 @@ const struct TrainerPartyMember0 gTrainerParty_Allen[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Timmy[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Timmy[] = {
     {
 	.iv = 0,
 	.level = 12,
@@ -4477,7 +4477,7 @@ const struct TrainerPartyMember0 gTrainerParty_Timmy[] = {
     }
 };
 
-const struct TrainerPartyMember3 gTrainerParty_Steven[] = {
+const struct TrainerMonItemCustomMoves gTrainerParty_Steven[] = {
     {
 	.iv = 255,
 	.level = 57,
@@ -4522,7 +4522,7 @@ const struct TrainerPartyMember3 gTrainerParty_Steven[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Andrew[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Andrew[] = {
     {
 	.iv = 0,
 	.level = 5,
@@ -4540,7 +4540,7 @@ const struct TrainerPartyMember0 gTrainerParty_Andrew[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Ivan[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ivan[] = {
     {
 	.iv = 0,
 	.level = 6,
@@ -4558,7 +4558,7 @@ const struct TrainerPartyMember0 gTrainerParty_Ivan[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Claude[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Claude[] = {
     {
 	.iv = 0,
 	.level = 16,
@@ -4581,7 +4581,7 @@ const struct TrainerPartyMember0 gTrainerParty_Claude[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Elliot1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Elliot1[] = {
     {
 	.iv = 0,
 	.level = 11,
@@ -4599,7 +4599,7 @@ const struct TrainerPartyMember0 gTrainerParty_Elliot1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Ned[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ned[] = {
     {
 	.iv = 0,
 	.level = 12,
@@ -4607,7 +4607,7 @@ const struct TrainerPartyMember0 gTrainerParty_Ned[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Dale[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dale[] = {
     {
 	.iv = 0,
 	.level = 12,
@@ -4630,7 +4630,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dale[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Nolan[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nolan[] = {
     {
 	.iv = 0,
 	.level = 20,
@@ -4638,7 +4638,7 @@ const struct TrainerPartyMember0 gTrainerParty_Nolan[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Barny[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Barny[] = {
     {
 	.iv = 0,
 	.level = 26,
@@ -4651,7 +4651,7 @@ const struct TrainerPartyMember0 gTrainerParty_Barny[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Wade[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wade[] = {
     {
 	.iv = 0,
 	.level = 17,
@@ -4659,7 +4659,7 @@ const struct TrainerPartyMember0 gTrainerParty_Wade[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Carter[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Carter[] = {
     {
 	.iv = 0,
 	.level = 23,
@@ -4682,7 +4682,7 @@ const struct TrainerPartyMember0 gTrainerParty_Carter[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Elliot2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Elliot2[] = {
     {
 	.iv = 10,
 	.level = 24,
@@ -4700,7 +4700,7 @@ const struct TrainerPartyMember0 gTrainerParty_Elliot2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Elliot3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Elliot3[] = {
     {
 	.iv = 20,
 	.level = 29,
@@ -4723,7 +4723,7 @@ const struct TrainerPartyMember0 gTrainerParty_Elliot3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Elliot4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Elliot4[] = {
     {
 	.iv = 30,
 	.level = 31,
@@ -4746,7 +4746,7 @@ const struct TrainerPartyMember0 gTrainerParty_Elliot4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Elliot5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Elliot5[] = {
     {
 	.iv = 40,
 	.level = 33,
@@ -4769,7 +4769,7 @@ const struct TrainerPartyMember0 gTrainerParty_Elliot5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Ronald[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ronald[] = {
     {
 	.iv = 0,
 	.level = 34,
@@ -4802,7 +4802,7 @@ const struct TrainerPartyMember0 gTrainerParty_Ronald[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jacob[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jacob[] = {
     {
 	.iv = 0,
 	.level = 7,
@@ -4820,7 +4820,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jacob[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Anthony[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anthony[] = {
     {
 	.iv = 0,
 	.level = 16,
@@ -4833,7 +4833,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anthony[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Benjamin1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Benjamin1[] = {
     {
 	.iv = 0,
 	.level = 17,
@@ -4841,7 +4841,7 @@ const struct TrainerPartyMember0 gTrainerParty_Benjamin1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Benjamin2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Benjamin2[] = {
     {
 	.iv = 10,
 	.level = 28,
@@ -4849,7 +4849,7 @@ const struct TrainerPartyMember0 gTrainerParty_Benjamin2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Benjamin3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Benjamin3[] = {
     {
 	.iv = 20,
 	.level = 31,
@@ -4857,7 +4857,7 @@ const struct TrainerPartyMember0 gTrainerParty_Benjamin3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Benjamin4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Benjamin4[] = {
     {
 	.iv = 30,
 	.level = 34,
@@ -4865,7 +4865,7 @@ const struct TrainerPartyMember0 gTrainerParty_Benjamin4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Benjamin5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Benjamin5[] = {
     {
 	.iv = 40,
 	.level = 37,
@@ -4873,7 +4873,7 @@ const struct TrainerPartyMember0 gTrainerParty_Benjamin5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Abigail1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Abigail1[] = {
     {
 	.iv = 0,
 	.level = 17,
@@ -4881,7 +4881,7 @@ const struct TrainerPartyMember0 gTrainerParty_Abigail1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jasmine[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jasmine[] = {
     {
 	.iv = 80,
 	.level = 15,
@@ -4899,7 +4899,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jasmine[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Abigail2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Abigail2[] = {
     {
 	.iv = 10,
 	.level = 28,
@@ -4907,7 +4907,7 @@ const struct TrainerPartyMember0 gTrainerParty_Abigail2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Abigail3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Abigail3[] = {
     {
 	.iv = 20,
 	.level = 31,
@@ -4915,7 +4915,7 @@ const struct TrainerPartyMember0 gTrainerParty_Abigail3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Abigail4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Abigail4[] = {
     {
 	.iv = 30,
 	.level = 34,
@@ -4923,7 +4923,7 @@ const struct TrainerPartyMember0 gTrainerParty_Abigail4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Abigail5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Abigail5[] = {
     {
 	.iv = 40,
 	.level = 37,
@@ -4931,7 +4931,7 @@ const struct TrainerPartyMember0 gTrainerParty_Abigail5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Dylan1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dylan1[] = {
     {
 	.iv = 0,
 	.level = 18,
@@ -4939,7 +4939,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dylan1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Dylan2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dylan2[] = {
     {
 	.iv = 10,
 	.level = 28,
@@ -4947,7 +4947,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dylan2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Dylan3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dylan3[] = {
     {
 	.iv = 20,
 	.level = 31,
@@ -4955,7 +4955,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dylan3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Dylan4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dylan4[] = {
     {
 	.iv = 30,
 	.level = 34,
@@ -4963,7 +4963,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dylan4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Dylan5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dylan5[] = {
     {
 	.iv = 40,
 	.level = 37,
@@ -4971,7 +4971,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dylan5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Maria1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maria1[] = {
     {
 	.iv = 0,
 	.level = 18,
@@ -4979,7 +4979,7 @@ const struct TrainerPartyMember0 gTrainerParty_Maria1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Maria2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maria2[] = {
     {
 	.iv = 10,
 	.level = 28,
@@ -4987,7 +4987,7 @@ const struct TrainerPartyMember0 gTrainerParty_Maria2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Maria3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maria3[] = {
     {
 	.iv = 20,
 	.level = 31,
@@ -4995,7 +4995,7 @@ const struct TrainerPartyMember0 gTrainerParty_Maria3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Maria4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maria4[] = {
     {
 	.iv = 30,
 	.level = 34,
@@ -5003,7 +5003,7 @@ const struct TrainerPartyMember0 gTrainerParty_Maria4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Maria5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maria5[] = {
     {
 	.iv = 40,
 	.level = 37,
@@ -5011,7 +5011,7 @@ const struct TrainerPartyMember0 gTrainerParty_Maria5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Caleb[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Caleb[] = {
     {
 	.iv = 0,
 	.level = 33,
@@ -5034,7 +5034,7 @@ const struct TrainerPartyMember0 gTrainerParty_Caleb[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Anonymous6[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous6[] = {
     {
 	.iv = 0,
 	.level = 36,
@@ -5042,7 +5042,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous6[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Isaiah1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaiah1[] = {
     {
 	.iv = 0,
 	.level = 36,
@@ -5050,7 +5050,7 @@ const struct TrainerPartyMember0 gTrainerParty_Isaiah1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Anonymous7[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous7[] = {
     {
 	.iv = 0,
 	.level = 36,
@@ -5058,7 +5058,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous7[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Chase[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Chase[] = {
     {
 	.iv = 0,
 	.level = 27,
@@ -5071,7 +5071,7 @@ const struct TrainerPartyMember0 gTrainerParty_Chase[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Isaiah2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaiah2[] = {
     {
 	.iv = 10,
 	.level = 39,
@@ -5079,7 +5079,7 @@ const struct TrainerPartyMember0 gTrainerParty_Isaiah2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Isaiah3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaiah3[] = {
     {
 	.iv = 20,
 	.level = 42,
@@ -5087,7 +5087,7 @@ const struct TrainerPartyMember0 gTrainerParty_Isaiah3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Isaiah4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaiah4[] = {
     {
 	.iv = 30,
 	.level = 45,
@@ -5095,7 +5095,7 @@ const struct TrainerPartyMember0 gTrainerParty_Isaiah4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Isaiah5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaiah5[] = {
     {
 	.iv = 40,
 	.level = 48,
@@ -5103,7 +5103,7 @@ const struct TrainerPartyMember0 gTrainerParty_Isaiah5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Anonymous8[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous8[] = {
     {
 	.iv = 0,
 	.level = 26,
@@ -5121,7 +5121,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous8[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Connor[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Connor[] = {
     {
 	.iv = 0,
 	.level = 25,
@@ -5144,7 +5144,7 @@ const struct TrainerPartyMember0 gTrainerParty_Connor[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Anonymous9[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous9[] = {
     {
 	.iv = 0,
 	.level = 36,
@@ -5152,7 +5152,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous9[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Katelyn1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Katelyn1[] = {
     {
 	.iv = 0,
 	.level = 36,
@@ -5160,7 +5160,7 @@ const struct TrainerPartyMember0 gTrainerParty_Katelyn1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Allison[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Allison[] = {
     {
 	.iv = 0,
 	.level = 25,
@@ -5183,7 +5183,7 @@ const struct TrainerPartyMember0 gTrainerParty_Allison[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Katelyn2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Katelyn2[] = {
     {
 	.iv = 10,
 	.level = 39,
@@ -5191,7 +5191,7 @@ const struct TrainerPartyMember0 gTrainerParty_Katelyn2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Katelyn3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Katelyn3[] = {
     {
 	.iv = 20,
 	.level = 42,
@@ -5199,7 +5199,7 @@ const struct TrainerPartyMember0 gTrainerParty_Katelyn3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Katelyn4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Katelyn4[] = {
     {
 	.iv = 30,
 	.level = 45,
@@ -5207,7 +5207,7 @@ const struct TrainerPartyMember0 gTrainerParty_Katelyn4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Katelyn5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Katelyn5[] = {
     {
 	.iv = 40,
 	.level = 48,
@@ -5215,7 +5215,7 @@ const struct TrainerPartyMember0 gTrainerParty_Katelyn5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Nicolas1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nicolas1[] = {
     {
 	.iv = 100,
 	.level = 38,
@@ -5228,7 +5228,7 @@ const struct TrainerPartyMember0 gTrainerParty_Nicolas1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Nicolas2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nicolas2[] = {
     {
 	.iv = 110,
 	.level = 41,
@@ -5241,7 +5241,7 @@ const struct TrainerPartyMember0 gTrainerParty_Nicolas2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Nicolas3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nicolas3[] = {
     {
 	.iv = 120,
 	.level = 44,
@@ -5254,7 +5254,7 @@ const struct TrainerPartyMember0 gTrainerParty_Nicolas3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Nicolas4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nicolas4[] = {
     {
 	.iv = 130,
 	.level = 46,
@@ -5272,7 +5272,7 @@ const struct TrainerPartyMember0 gTrainerParty_Nicolas4[] = {
     }
 };
 
-const struct TrainerPartyMember2 gTrainerParty_Nicolas5[] = {
+const struct TrainerMonItemDefaultMoves gTrainerParty_Nicolas5[] = {
     {
 	.iv = 140,
 	.level = 49,
@@ -5293,7 +5293,7 @@ const struct TrainerPartyMember2 gTrainerParty_Nicolas5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Aaron[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Aaron[] = {
     {
 	.iv = 100,
 	.level = 35,
@@ -5301,7 +5301,7 @@ const struct TrainerPartyMember0 gTrainerParty_Aaron[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Perry[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Perry[] = {
     {
 	.iv = 0,
 	.level = 27,
@@ -5309,7 +5309,7 @@ const struct TrainerPartyMember0 gTrainerParty_Perry[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Hugh[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hugh[] = {
     {
 	.iv = 0,
 	.level = 27,
@@ -5317,7 +5317,7 @@ const struct TrainerPartyMember0 gTrainerParty_Hugh[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Phil[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Phil[] = {
     {
 	.iv = 0,
 	.level = 25,
@@ -5335,7 +5335,7 @@ const struct TrainerPartyMember0 gTrainerParty_Phil[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jared[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jared[] = {
     {
 	.iv = 100,
 	.level = 30,
@@ -5343,7 +5343,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jared[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Anonymous10[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous10[] = {
     {
 	.iv = 100,
 	.level = 29,
@@ -5366,7 +5366,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous10[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Tanner[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tanner[] = {
     {
 	.iv = 100,
 	.level = 30,
@@ -5384,7 +5384,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tanner[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Will[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Will[] = {
     {
 	.iv = 100,
 	.level = 28,
@@ -5402,7 +5402,7 @@ const struct TrainerPartyMember0 gTrainerParty_Will[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Colin[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Colin[] = {
     {
 	.iv = 0,
 	.level = 29,
@@ -5415,7 +5415,7 @@ const struct TrainerPartyMember0 gTrainerParty_Colin[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Robert1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Robert1[] = {
     {
 	.iv = 0,
 	.level = 30,
@@ -5423,7 +5423,7 @@ const struct TrainerPartyMember0 gTrainerParty_Robert1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Benny[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Benny[] = {
     {
 	.iv = 0,
 	.level = 36,
@@ -5441,7 +5441,7 @@ const struct TrainerPartyMember0 gTrainerParty_Benny[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Chester[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Chester[] = {
     {
 	.iv = 0,
 	.level = 26,
@@ -5454,7 +5454,7 @@ const struct TrainerPartyMember0 gTrainerParty_Chester[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Robert2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Robert2[] = {
     {
 	.iv = 10,
 	.level = 32,
@@ -5467,7 +5467,7 @@ const struct TrainerPartyMember0 gTrainerParty_Robert2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Robert3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Robert3[] = {
     {
 	.iv = 20,
 	.level = 35,
@@ -5480,7 +5480,7 @@ const struct TrainerPartyMember0 gTrainerParty_Robert3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Robert4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Robert4[] = {
     {
 	.iv = 30,
 	.level = 38,
@@ -5493,7 +5493,7 @@ const struct TrainerPartyMember0 gTrainerParty_Robert4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Robert5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Robert5[] = {
     {
 	.iv = 40,
 	.level = 41,
@@ -5506,7 +5506,7 @@ const struct TrainerPartyMember0 gTrainerParty_Robert5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Alex[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alex[] = {
     {
 	.iv = 0,
 	.level = 32,
@@ -5529,7 +5529,7 @@ const struct TrainerPartyMember0 gTrainerParty_Alex[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Beck[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Beck[] = {
     {
 	.iv = 0,
 	.level = 34,
@@ -5542,7 +5542,7 @@ const struct TrainerPartyMember0 gTrainerParty_Beck[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Yasu[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Yasu[] = {
     {
 	.iv = 0,
 	.level = 27,
@@ -5550,7 +5550,7 @@ const struct TrainerPartyMember0 gTrainerParty_Yasu[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Takashi[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Takashi[] = {
     {
 	.iv = 0,
 	.level = 25,
@@ -5568,7 +5568,7 @@ const struct TrainerPartyMember0 gTrainerParty_Takashi[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Makoto[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Makoto[] = {
     {
 	.iv = 0,
 	.level = 23,
@@ -5576,7 +5576,7 @@ const struct TrainerPartyMember0 gTrainerParty_Makoto[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Hideo1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hideo1[] = {
     {
 	.iv = 0,
 	.level = 20,
@@ -5599,7 +5599,7 @@ const struct TrainerPartyMember0 gTrainerParty_Hideo1[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Lao1[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Lao1[] = {
     {
 	.iv = 0,
 	.level = 17,
@@ -5626,7 +5626,7 @@ const struct TrainerPartyMember1 gTrainerParty_Lao1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Lung[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lung[] = {
     {
 	.iv = 0,
 	.level = 19,
@@ -5639,7 +5639,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lung[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Lao2[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Lao2[] = {
     {
 	.iv = 0,
 	.level = 24,
@@ -5666,7 +5666,7 @@ const struct TrainerPartyMember1 gTrainerParty_Lao2[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Lao3[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Lao3[] = {
     {
 	.iv = 20,
 	.level = 27,
@@ -5693,7 +5693,7 @@ const struct TrainerPartyMember1 gTrainerParty_Lao3[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Lao4[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Lao4[] = {
     {
 	.iv = 30,
 	.level = 30,
@@ -5720,7 +5720,7 @@ const struct TrainerPartyMember1 gTrainerParty_Lao4[] = {
     }
 };
 
-const struct TrainerPartyMember3 gTrainerParty_Lao5[] = {
+const struct TrainerMonItemCustomMoves gTrainerParty_Lao5[] = {
     {
 	.iv = 40,
 	.level = 33,
@@ -5751,7 +5751,7 @@ const struct TrainerPartyMember3 gTrainerParty_Lao5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Tessa[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tessa[] = {
     {
 	.iv = 100,
 	.level = 12,
@@ -5769,7 +5769,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tessa[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Laura[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Laura[] = {
     {
 	.iv = 100,
 	.level = 14,
@@ -5777,7 +5777,7 @@ const struct TrainerPartyMember0 gTrainerParty_Laura[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Cyndy1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cyndy1[] = {
     {
 	.iv = 100,
 	.level = 19,
@@ -5790,7 +5790,7 @@ const struct TrainerPartyMember0 gTrainerParty_Cyndy1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Cora[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cora[] = {
     {
 	.iv = 100,
 	.level = 27,
@@ -5798,7 +5798,7 @@ const struct TrainerPartyMember0 gTrainerParty_Cora[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jill[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jill[] = {
     {
 	.iv = 100,
 	.level = 27,
@@ -5806,7 +5806,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jill[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Cyndy2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cyndy2[] = {
     {
 	.iv = 110,
 	.level = 26,
@@ -5819,7 +5819,7 @@ const struct TrainerPartyMember0 gTrainerParty_Cyndy2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Cyndy3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cyndy3[] = {
     {
 	.iv = 120,
 	.level = 29,
@@ -5832,7 +5832,7 @@ const struct TrainerPartyMember0 gTrainerParty_Cyndy3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Cyndy4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cyndy4[] = {
     {
 	.iv = 130,
 	.level = 32,
@@ -5845,7 +5845,7 @@ const struct TrainerPartyMember0 gTrainerParty_Cyndy4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Cyndy5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cyndy5[] = {
     {
 	.iv = 140,
 	.level = 35,
@@ -5858,7 +5858,7 @@ const struct TrainerPartyMember0 gTrainerParty_Cyndy5[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Madeline1[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Madeline1[] = {
     {
 	.iv = 0,
 	.level = 20,
@@ -5867,7 +5867,7 @@ const struct TrainerPartyMember1 gTrainerParty_Madeline1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Clarissa[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Clarissa[] = {
     {
 	.iv = 0,
 	.level = 29,
@@ -5880,7 +5880,7 @@ const struct TrainerPartyMember0 gTrainerParty_Clarissa[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Angelica[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Angelica[] = {
     {
 	.iv = 0,
 	.level = 30,
@@ -5888,7 +5888,7 @@ const struct TrainerPartyMember0 gTrainerParty_Angelica[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Madeline2[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Madeline2[] = {
     {
 	.iv = 10,
 	.level = 27,
@@ -5897,7 +5897,7 @@ const struct TrainerPartyMember1 gTrainerParty_Madeline2[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Madeline3[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Madeline3[] = {
     {
 	.iv = 20,
 	.level = 30,
@@ -5906,7 +5906,7 @@ const struct TrainerPartyMember1 gTrainerParty_Madeline3[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Madeline4[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Madeline4[] = {
     {
 	.iv = 30,
 	.level = 32,
@@ -5921,7 +5921,7 @@ const struct TrainerPartyMember1 gTrainerParty_Madeline4[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Madeline5[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Madeline5[] = {
     {
 	.iv = 40,
 	.level = 35,
@@ -5936,7 +5936,7 @@ const struct TrainerPartyMember1 gTrainerParty_Madeline5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Beverly[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Beverly[] = {
     {
 	.iv = 0,
 	.level = 26,
@@ -5949,7 +5949,7 @@ const struct TrainerPartyMember0 gTrainerParty_Beverly[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Dawn[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dawn[] = {
     {
 	.iv = 0,
 	.level = 27,
@@ -5957,7 +5957,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dawn[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Nicole[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nicole[] = {
     {
 	.iv = 0,
 	.level = 27,
@@ -5965,7 +5965,7 @@ const struct TrainerPartyMember0 gTrainerParty_Nicole[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Denise[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Denise[] = {
     {
 	.iv = 0,
 	.level = 27,
@@ -5973,7 +5973,7 @@ const struct TrainerPartyMember0 gTrainerParty_Denise[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Beth[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Beth[] = {
     {
 	.iv = 0,
 	.level = 25,
@@ -5991,7 +5991,7 @@ const struct TrainerPartyMember0 gTrainerParty_Beth[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Tara[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tara[] = {
     {
 	.iv = 0,
 	.level = 26,
@@ -6004,7 +6004,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tara[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Missy[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Missy[] = {
     {
 	.iv = 0,
 	.level = 24,
@@ -6027,7 +6027,7 @@ const struct TrainerPartyMember0 gTrainerParty_Missy[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Alice[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alice[] = {
     {
 	.iv = 0,
 	.level = 25,
@@ -6045,7 +6045,7 @@ const struct TrainerPartyMember0 gTrainerParty_Alice[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jenny1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jenny1[] = {
     {
 	.iv = 0,
 	.level = 35,
@@ -6053,7 +6053,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jenny1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grace[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grace[] = {
     {
 	.iv = 0,
 	.level = 33,
@@ -6071,7 +6071,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grace[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Tanya[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tanya[] = {
     {
 	.iv = 0,
 	.level = 35,
@@ -6079,7 +6079,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tanya[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Sharon[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sharon[] = {
     {
 	.iv = 0,
 	.level = 34,
@@ -6092,7 +6092,7 @@ const struct TrainerPartyMember0 gTrainerParty_Sharon[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Nikki[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nikki[] = {
     {
 	.iv = 0,
 	.level = 32,
@@ -6110,7 +6110,7 @@ const struct TrainerPartyMember0 gTrainerParty_Nikki[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Brenda[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brenda[] = {
     {
 	.iv = 0,
 	.level = 35,
@@ -6118,7 +6118,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brenda[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Katie[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Katie[] = {
     {
 	.iv = 0,
 	.level = 33,
@@ -6136,7 +6136,7 @@ const struct TrainerPartyMember0 gTrainerParty_Katie[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Susie[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Susie[] = {
     {
 	.iv = 0,
 	.level = 33,
@@ -6154,7 +6154,7 @@ const struct TrainerPartyMember0 gTrainerParty_Susie[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Kara[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kara[] = {
     {
 	.iv = 0,
 	.level = 35,
@@ -6162,7 +6162,7 @@ const struct TrainerPartyMember0 gTrainerParty_Kara[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Dana[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dana[] = {
     {
 	.iv = 0,
 	.level = 33,
@@ -6180,7 +6180,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dana[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Erin[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Erin[] = {
     {
 	.iv = 0,
 	.level = 38,
@@ -6188,7 +6188,7 @@ const struct TrainerPartyMember0 gTrainerParty_Erin[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Debra[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Debra[] = {
     {
 	.iv = 0,
 	.level = 34,
@@ -6201,7 +6201,7 @@ const struct TrainerPartyMember0 gTrainerParty_Debra[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Linda[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Linda[] = {
     {
 	.iv = 0,
 	.level = 34,
@@ -6214,7 +6214,7 @@ const struct TrainerPartyMember0 gTrainerParty_Linda[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Kaylee[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kaylee[] = {
     {
 	.iv = 0,
 	.level = 34,
@@ -6227,7 +6227,7 @@ const struct TrainerPartyMember0 gTrainerParty_Kaylee[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Laurel[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Laurel[] = {
     {
 	.iv = 0,
 	.level = 33,
@@ -6245,7 +6245,7 @@ const struct TrainerPartyMember0 gTrainerParty_Laurel[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Darcy[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Darcy[] = {
     {
 	.iv = 0,
 	.level = 13,
@@ -6253,7 +6253,7 @@ const struct TrainerPartyMember0 gTrainerParty_Darcy[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jenny2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jenny2[] = {
     {
 	.iv = 0,
 	.level = 38,
@@ -6261,7 +6261,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jenny2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jenny3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jenny3[] = {
     {
 	.iv = 0,
 	.level = 41,
@@ -6269,7 +6269,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jenny3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jenny4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jenny4[] = {
     {
 	.iv = 0,
 	.level = 43,
@@ -6282,7 +6282,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jenny4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jenny5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jenny5[] = {
     {
 	.iv = 0,
 	.level = 45,
@@ -6300,7 +6300,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jenny5[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Heidi[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Heidi[] = {
     {
 	.iv = 0,
 	.level = 23,
@@ -6315,7 +6315,7 @@ const struct TrainerPartyMember1 gTrainerParty_Heidi[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Becky[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Becky[] = {
     {
 	.iv = 0,
 	.level = 24,
@@ -6324,7 +6324,7 @@ const struct TrainerPartyMember1 gTrainerParty_Becky[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Carol[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Carol[] = {
     {
 	.iv = 0,
 	.level = 18,
@@ -6337,7 +6337,7 @@ const struct TrainerPartyMember0 gTrainerParty_Carol[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Nancy[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nancy[] = {
     {
 	.iv = 0,
 	.level = 19,
@@ -6350,7 +6350,7 @@ const struct TrainerPartyMember0 gTrainerParty_Nancy[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Martha[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Martha[] = {
     {
 	.iv = 0,
 	.level = 23,
@@ -6363,7 +6363,7 @@ const struct TrainerPartyMember0 gTrainerParty_Martha[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Diana1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Diana1[] = {
     {
 	.iv = 0,
 	.level = 20,
@@ -6381,7 +6381,7 @@ const struct TrainerPartyMember0 gTrainerParty_Diana1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Nina[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nina[] = {
     {
 	.iv = 0,
 	.level = 9,
@@ -6394,7 +6394,7 @@ const struct TrainerPartyMember0 gTrainerParty_Nina[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Irene[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Irene[] = {
     {
 	.iv = 0,
 	.level = 18,
@@ -6407,7 +6407,7 @@ const struct TrainerPartyMember0 gTrainerParty_Irene[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Diana2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Diana2[] = {
     {
 	.iv = 10,
 	.level = 25,
@@ -6425,7 +6425,7 @@ const struct TrainerPartyMember0 gTrainerParty_Diana2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Diana3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Diana3[] = {
     {
 	.iv = 20,
 	.level = 28,
@@ -6443,7 +6443,7 @@ const struct TrainerPartyMember0 gTrainerParty_Diana3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Diana4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Diana4[] = {
     {
 	.iv = 30,
 	.level = 31,
@@ -6461,7 +6461,7 @@ const struct TrainerPartyMember0 gTrainerParty_Diana4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Diana5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Diana5[] = {
     {
 	.iv = 40,
 	.level = 40,
@@ -6479,7 +6479,7 @@ const struct TrainerPartyMember0 gTrainerParty_Diana5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_AmyAndLiv1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_AmyAndLiv1[] = {
     {
 	.iv = 0,
 	.level = 16,
@@ -6492,7 +6492,7 @@ const struct TrainerPartyMember0 gTrainerParty_AmyAndLiv1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_AmyAndLiv2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_AmyAndLiv2[] = {
     {
 	.iv = 10,
 	.level = 27,
@@ -6505,7 +6505,7 @@ const struct TrainerPartyMember0 gTrainerParty_AmyAndLiv2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_GinaAndMia1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_GinaAndMia1[] = {
     {
 	.iv = 0,
 	.level = 8,
@@ -6518,7 +6518,7 @@ const struct TrainerPartyMember0 gTrainerParty_GinaAndMia1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_MiuAndYuki[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_MiuAndYuki[] = {
     {
 	.iv = 0,
 	.level = 27,
@@ -6531,7 +6531,7 @@ const struct TrainerPartyMember0 gTrainerParty_MiuAndYuki[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_AmyAndLiv3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_AmyAndLiv3[] = {
     {
 	.iv = 0,
 	.level = 9,
@@ -6544,7 +6544,7 @@ const struct TrainerPartyMember0 gTrainerParty_AmyAndLiv3[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_GinaAndMia2[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_GinaAndMia2[] = {
     {
 	.iv = 0,
 	.level = 10,
@@ -6559,7 +6559,7 @@ const struct TrainerPartyMember1 gTrainerParty_GinaAndMia2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_AmyAndLiv4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_AmyAndLiv4[] = {
     {
 	.iv = 20,
 	.level = 30,
@@ -6572,7 +6572,7 @@ const struct TrainerPartyMember0 gTrainerParty_AmyAndLiv4[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_AmyAndLiv5[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_AmyAndLiv5[] = {
     {
 	.iv = 30,
 	.level = 33,
@@ -6587,7 +6587,7 @@ const struct TrainerPartyMember1 gTrainerParty_AmyAndLiv5[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_AmyAndLiv6[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_AmyAndLiv6[] = {
     {
 	.iv = 40,
 	.level = 36,
@@ -6602,7 +6602,7 @@ const struct TrainerPartyMember1 gTrainerParty_AmyAndLiv6[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Huey[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Huey[] = {
     {
 	.iv = 0,
 	.level = 14,
@@ -6610,7 +6610,7 @@ const struct TrainerPartyMember0 gTrainerParty_Huey[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Edmond[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edmond[] = {
     {
 	.iv = 0,
 	.level = 12,
@@ -6628,7 +6628,7 @@ const struct TrainerPartyMember0 gTrainerParty_Edmond[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Ernest1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ernest1[] = {
     {
 	.iv = 0,
 	.level = 33,
@@ -6646,7 +6646,7 @@ const struct TrainerPartyMember0 gTrainerParty_Ernest1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Dwayne[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dwayne[] = {
     {
 	.iv = 0,
 	.level = 11,
@@ -6664,7 +6664,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dwayne[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Phillip[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Phillip[] = {
     {
 	.iv = 0,
 	.level = 44,
@@ -6677,7 +6677,7 @@ const struct TrainerPartyMember0 gTrainerParty_Phillip[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Leonard[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Leonard[] = {
     {
 	.iv = 0,
 	.level = 43,
@@ -6695,7 +6695,7 @@ const struct TrainerPartyMember0 gTrainerParty_Leonard[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Duncan[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Duncan[] = {
     {
 	.iv = 0,
 	.level = 26,
@@ -6708,7 +6708,7 @@ const struct TrainerPartyMember0 gTrainerParty_Duncan[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Ernest2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ernest2[] = {
     {
 	.iv = 10,
 	.level = 36,
@@ -6726,7 +6726,7 @@ const struct TrainerPartyMember0 gTrainerParty_Ernest2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Ernest3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ernest3[] = {
     {
 	.iv = 20,
 	.level = 39,
@@ -6744,7 +6744,7 @@ const struct TrainerPartyMember0 gTrainerParty_Ernest3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Ernest4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ernest4[] = {
     {
 	.iv = 30,
 	.level = 42,
@@ -6762,7 +6762,7 @@ const struct TrainerPartyMember0 gTrainerParty_Ernest4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Ernest5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ernest5[] = {
     {
 	.iv = 40,
 	.level = 45,
@@ -6780,7 +6780,7 @@ const struct TrainerPartyMember0 gTrainerParty_Ernest5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Anonymous11[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous11[] = {
     {
 	.iv = 0,
 	.level = 22,
@@ -6793,7 +6793,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous11[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Anonymous12[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous12[] = {
     {
 	.iv = 0,
 	.level = 21,
@@ -6811,7 +6811,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous12[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Anonymous13[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous13[] = {
     {
 	.iv = 0,
 	.level = 23,
@@ -6819,7 +6819,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous13[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Sonny[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sonny[] = {
     {
 	.iv = 0,
 	.level = 35,
@@ -6827,7 +6827,7 @@ const struct TrainerPartyMember0 gTrainerParty_Sonny[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Donovan[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Donovan[] = {
     {
 	.iv = 0,
 	.level = 34,
@@ -6840,7 +6840,7 @@ const struct TrainerPartyMember0 gTrainerParty_Donovan[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Gerald[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Gerald[] = {
     {
 	.iv = 0,
 	.level = 33,
@@ -6858,7 +6858,7 @@ const struct TrainerPartyMember0 gTrainerParty_Gerald[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Kelvin[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kelvin[] = {
     {
 	.iv = 0,
 	.level = 34,
@@ -6871,7 +6871,7 @@ const struct TrainerPartyMember0 gTrainerParty_Kelvin[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Kody[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kody[] = {
     {
 	.iv = 0,
 	.level = 33,
@@ -6889,7 +6889,7 @@ const struct TrainerPartyMember0 gTrainerParty_Kody[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Tevin[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tevin[] = {
     {
 	.iv = 0,
 	.level = 35,
@@ -6897,7 +6897,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tevin[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Damon[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Damon[] = {
     {
 	.iv = 0,
 	.level = 34,
@@ -6910,7 +6910,7 @@ const struct TrainerPartyMember0 gTrainerParty_Damon[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Pablo[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Pablo[] = {
     {
 	.iv = 0,
 	.level = 35,
@@ -6918,7 +6918,7 @@ const struct TrainerPartyMember0 gTrainerParty_Pablo[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Edwin1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edwin1[] = {
     {
 	.iv = 0,
 	.level = 14,
@@ -6931,7 +6931,7 @@ const struct TrainerPartyMember0 gTrainerParty_Edwin1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Hector1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hector1[] = {
     {
 	.iv = 0,
 	.level = 20,
@@ -6939,7 +6939,7 @@ const struct TrainerPartyMember0 gTrainerParty_Hector1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Hector2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hector2[] = {
     {
 	.iv = 0,
 	.level = 20,
@@ -6947,7 +6947,7 @@ const struct TrainerPartyMember0 gTrainerParty_Hector2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Edwin2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edwin2[] = {
     {
 	.iv = 0,
 	.level = 26,
@@ -6960,7 +6960,7 @@ const struct TrainerPartyMember0 gTrainerParty_Edwin2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Edwin3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edwin3[] = {
     {
 	.iv = 0,
 	.level = 29,
@@ -6973,7 +6973,7 @@ const struct TrainerPartyMember0 gTrainerParty_Edwin3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Edwin4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edwin4[] = {
     {
 	.iv = 0,
 	.level = 32,
@@ -6986,7 +6986,7 @@ const struct TrainerPartyMember0 gTrainerParty_Edwin4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Edwin5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edwin5[] = {
     {
 	.iv = 0,
 	.level = 35,
@@ -6999,7 +6999,7 @@ const struct TrainerPartyMember0 gTrainerParty_Edwin5[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Wally1[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Wally1[] = {
     {
 	.iv = 150,
 	.level = 44,
@@ -7032,7 +7032,7 @@ const struct TrainerPartyMember1 gTrainerParty_Wally1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Brendan1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan1[] = {
     {
 	.iv = 0,
 	.level = 5,
@@ -7040,7 +7040,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brendan1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Brendan2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan2[] = {
     {
 	.iv = 50,
 	.level = 18,
@@ -7058,7 +7058,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brendan2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Brendan3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan3[] = {
     {
 	.iv = 100,
 	.level = 29,
@@ -7076,7 +7076,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brendan3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Brendan4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan4[] = {
     {
 	.iv = 0,
 	.level = 5,
@@ -7084,7 +7084,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brendan4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Brendan5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan5[] = {
     {
 	.iv = 50,
 	.level = 18,
@@ -7102,7 +7102,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brendan5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Brendan6[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan6[] = {
     {
 	.iv = 100,
 	.level = 29,
@@ -7120,7 +7120,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brendan6[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Brendan7[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan7[] = {
     {
 	.iv = 0,
 	.level = 5,
@@ -7128,7 +7128,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brendan7[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Brendan8[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan8[] = {
     {
 	.iv = 50,
 	.level = 18,
@@ -7146,7 +7146,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brendan8[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Brendan9[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan9[] = {
     {
 	.iv = 100,
 	.level = 29,
@@ -7164,7 +7164,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brendan9[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_May1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_May1[] = {
     {
 	.iv = 0,
 	.level = 5,
@@ -7172,7 +7172,7 @@ const struct TrainerPartyMember0 gTrainerParty_May1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_May2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_May2[] = {
     {
 	.iv = 50,
 	.level = 18,
@@ -7190,7 +7190,7 @@ const struct TrainerPartyMember0 gTrainerParty_May2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_May3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_May3[] = {
     {
 	.iv = 100,
 	.level = 29,
@@ -7208,7 +7208,7 @@ const struct TrainerPartyMember0 gTrainerParty_May3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_May4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_May4[] = {
     {
 	.iv = 0,
 	.level = 5,
@@ -7216,7 +7216,7 @@ const struct TrainerPartyMember0 gTrainerParty_May4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_May5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_May5[] = {
     {
 	.iv = 50,
 	.level = 18,
@@ -7234,7 +7234,7 @@ const struct TrainerPartyMember0 gTrainerParty_May5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_May6[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_May6[] = {
     {
 	.iv = 100,
 	.level = 29,
@@ -7252,7 +7252,7 @@ const struct TrainerPartyMember0 gTrainerParty_May6[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_May7[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_May7[] = {
     {
 	.iv = 0,
 	.level = 5,
@@ -7260,7 +7260,7 @@ const struct TrainerPartyMember0 gTrainerParty_May7[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_May8[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_May8[] = {
     {
 	.iv = 50,
 	.level = 18,
@@ -7278,7 +7278,7 @@ const struct TrainerPartyMember0 gTrainerParty_May8[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_May9[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_May9[] = {
     {
 	.iv = 100,
 	.level = 29,
@@ -7296,7 +7296,7 @@ const struct TrainerPartyMember0 gTrainerParty_May9[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Isaac1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaac1[] = {
     {
 	.iv = 0,
 	.level = 12,
@@ -7329,7 +7329,7 @@ const struct TrainerPartyMember0 gTrainerParty_Isaac1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Riley[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Riley[] = {
     {
 	.iv = 0,
 	.level = 15,
@@ -7347,7 +7347,7 @@ const struct TrainerPartyMember0 gTrainerParty_Riley[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Aidan[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Aidan[] = {
     {
 	.iv = 0,
 	.level = 13,
@@ -7360,7 +7360,7 @@ const struct TrainerPartyMember0 gTrainerParty_Aidan[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Isaac2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaac2[] = {
     {
 	.iv = 10,
 	.level = 22,
@@ -7393,7 +7393,7 @@ const struct TrainerPartyMember0 gTrainerParty_Isaac2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Isaac3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaac3[] = {
     {
 	.iv = 20,
 	.level = 25,
@@ -7426,7 +7426,7 @@ const struct TrainerPartyMember0 gTrainerParty_Isaac3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Isaac4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaac4[] = {
     {
 	.iv = 30,
 	.level = 28,
@@ -7459,7 +7459,7 @@ const struct TrainerPartyMember0 gTrainerParty_Isaac4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Isaac5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaac5[] = {
     {
 	.iv = 40,
 	.level = 31,
@@ -7492,7 +7492,7 @@ const struct TrainerPartyMember0 gTrainerParty_Isaac5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Lydia1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lydia1[] = {
     {
 	.iv = 0,
 	.level = 12,
@@ -7525,7 +7525,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lydia1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Alexia[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alexia[] = {
     {
 	.iv = 0,
 	.level = 13,
@@ -7538,7 +7538,7 @@ const struct TrainerPartyMember0 gTrainerParty_Alexia[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Danielle[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Danielle[] = {
     {
 	.iv = 0,
 	.level = 24,
@@ -7546,7 +7546,7 @@ const struct TrainerPartyMember0 gTrainerParty_Danielle[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Lydia2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lydia2[] = {
     {
 	.iv = 10,
 	.level = 22,
@@ -7579,7 +7579,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lydia2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Lydia3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lydia3[] = {
     {
 	.iv = 20,
 	.level = 25,
@@ -7612,7 +7612,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lydia3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Lydia4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lydia4[] = {
     {
 	.iv = 30,
 	.level = 28,
@@ -7645,7 +7645,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lydia4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Lydia5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lydia5[] = {
     {
 	.iv = 40,
 	.level = 31,
@@ -7678,7 +7678,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lydia5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jackson1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jackson1[] = {
     {
 	.iv = 50,
 	.level = 28,
@@ -7686,7 +7686,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jackson1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Carlos[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Carlos[] = {
     {
 	.iv = 50,
 	.level = 29,
@@ -7704,7 +7704,7 @@ const struct TrainerPartyMember0 gTrainerParty_Carlos[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Sebastian[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sebastian[] = {
     {
 	.iv = 50,
 	.level = 39,
@@ -7712,7 +7712,7 @@ const struct TrainerPartyMember0 gTrainerParty_Sebastian[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jackson2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jackson2[] = {
     {
 	.iv = 60,
 	.level = 31,
@@ -7720,7 +7720,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jackson2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jackson3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jackson3[] = {
     {
 	.iv = 70,
 	.level = 34,
@@ -7728,7 +7728,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jackson3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jackson4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jackson4[] = {
     {
 	.iv = 80,
 	.level = 37,
@@ -7736,7 +7736,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jackson4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jackson5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jackson5[] = {
     {
 	.iv = 90,
 	.level = 39,
@@ -7749,7 +7749,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jackson5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Catherine1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Catherine1[] = {
     {
 	.iv = 50,
 	.level = 27,
@@ -7762,7 +7762,7 @@ const struct TrainerPartyMember0 gTrainerParty_Catherine1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jenna[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jenna[] = {
     {
 	.iv = 50,
 	.level = 29,
@@ -7780,7 +7780,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jenna[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Sophia[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sophia[] = {
     {
 	.iv = 50,
 	.level = 38,
@@ -7793,7 +7793,7 @@ const struct TrainerPartyMember0 gTrainerParty_Sophia[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Catherine2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Catherine2[] = {
     {
 	.iv = 60,
 	.level = 30,
@@ -7806,7 +7806,7 @@ const struct TrainerPartyMember0 gTrainerParty_Catherine2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Catherine3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Catherine3[] = {
     {
 	.iv = 70,
 	.level = 33,
@@ -7819,7 +7819,7 @@ const struct TrainerPartyMember0 gTrainerParty_Catherine3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Catherine4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Catherine4[] = {
     {
 	.iv = 80,
 	.level = 36,
@@ -7832,7 +7832,7 @@ const struct TrainerPartyMember0 gTrainerParty_Catherine4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Catherine5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Catherine5[] = {
     {
 	.iv = 90,
 	.level = 39,
@@ -7845,7 +7845,7 @@ const struct TrainerPartyMember0 gTrainerParty_Catherine5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Maxie1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maxie1[] = {
     {
 	.iv = 0,
 	.level = 17,
@@ -7858,7 +7858,7 @@ const struct TrainerPartyMember0 gTrainerParty_Maxie1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt28[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt28[] = {
     {
 	.iv = 0,
 	.level = 32,
@@ -7871,7 +7871,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt28[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt29[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt29[] = {
     {
 	.iv = 0,
 	.level = 30,
@@ -7894,7 +7894,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt29[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt30[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt30[] = {
     {
 	.iv = 0,
 	.level = 32,
@@ -7907,7 +7907,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt30[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt31[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt31[] = {
     {
 	.iv = 0,
 	.level = 33,
@@ -7915,7 +7915,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt31[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt32[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt32[] = {
     {
 	.iv = 0,
 	.level = 37,
@@ -7928,7 +7928,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt32[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt33[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt33[] = {
     {
 	.iv = 0,
 	.level = 38,
@@ -7936,7 +7936,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt33[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt34[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt34[] = {
     {
 	.iv = 0,
 	.level = 36,
@@ -7954,7 +7954,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt34[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt35[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt35[] = {
     {
 	.iv = 0,
 	.level = 17,
@@ -7962,7 +7962,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt35[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt36[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt36[] = {
     {
 	.iv = 0,
 	.level = 9,
@@ -7970,7 +7970,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt36[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt37[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt37[] = {
     {
 	.iv = 0,
 	.level = 9,
@@ -7983,7 +7983,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt37[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt38[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt38[] = {
     {
 	.iv = 0,
 	.level = 16,
@@ -7996,7 +7996,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt38[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt39[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt39[] = {
     {
 	.iv = 0,
 	.level = 16,
@@ -8009,7 +8009,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt39[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt40[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt40[] = {
     {
 	.iv = 0,
 	.level = 20,
@@ -8022,7 +8022,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt40[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt41[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt41[] = {
     {
 	.iv = 0,
 	.level = 17,
@@ -8035,7 +8035,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt41[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt42[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt42[] = {
     {
 	.iv = 0,
 	.level = 11,
@@ -8043,7 +8043,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt42[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt43[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt43[] = {
     {
 	.iv = 0,
 	.level = 27,
@@ -8056,7 +8056,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt43[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt44[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt44[] = {
     {
 	.iv = 0,
 	.level = 27,
@@ -8069,7 +8069,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt44[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt45[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt45[] = {
     {
 	.iv = 0,
 	.level = 26,
@@ -8087,7 +8087,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt45[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt46[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt46[] = {
     {
 	.iv = 0,
 	.level = 15,
@@ -8095,7 +8095,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt46[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt47[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt47[] = {
     {
 	.iv = 0,
 	.level = 14,
@@ -8108,7 +8108,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt47[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt48[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt48[] = {
     {
 	.iv = 0,
 	.level = 17,
@@ -8116,7 +8116,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt48[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt49[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt49[] = {
     {
 	.iv = 0,
 	.level = 30,
@@ -8134,7 +8134,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt49[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt50[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt50[] = {
     {
 	.iv = 0,
 	.level = 31,
@@ -8147,7 +8147,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt50[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt51[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt51[] = {
     {
 	.iv = 0,
 	.level = 31,
@@ -8160,7 +8160,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt51[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt52[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt52[] = {
     {
 	.iv = 0,
 	.level = 28,
@@ -8168,7 +8168,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt52[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt53[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt53[] = {
     {
 	.iv = 0,
 	.level = 31,
@@ -8186,7 +8186,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt53[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt54[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt54[] = {
     {
 	.iv = 0,
 	.level = 33,
@@ -8194,7 +8194,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt54[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Anonymous14[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous14[] = {
     {
 	.iv = 50,
 	.level = 30,
@@ -8207,7 +8207,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous14[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Anonymous15[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous15[] = {
     {
 	.iv = 50,
 	.level = 30,
@@ -8220,7 +8220,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous15[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Tabitha1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tabitha1[] = {
     {
 	.iv = 50,
 	.level = 32,
@@ -8238,7 +8238,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tabitha1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Tabitha2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tabitha2[] = {
     {
 	.iv = 50,
 	.level = 20,
@@ -8256,7 +8256,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tabitha2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Anonymous16[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous16[] = {
     {
 	.iv = 50,
 	.level = 21,
@@ -8269,7 +8269,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous16[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Courtney1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Courtney1[] = {
     {
 	.iv = 50,
 	.level = 28,
@@ -8282,7 +8282,7 @@ const struct TrainerPartyMember0 gTrainerParty_Courtney1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Courtney2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Courtney2[] = {
     {
 	.iv = 50,
 	.level = 38,
@@ -8295,7 +8295,7 @@ const struct TrainerPartyMember0 gTrainerParty_Courtney2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Maxie2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maxie2[] = {
     {
 	.iv = 150,
 	.level = 41,
@@ -8313,7 +8313,7 @@ const struct TrainerPartyMember0 gTrainerParty_Maxie2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Maxie3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maxie3[] = {
     {
 	.iv = 150,
 	.level = 24,
@@ -8331,7 +8331,7 @@ const struct TrainerPartyMember0 gTrainerParty_Maxie3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Tiana[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tiana[] = {
     {
 	.iv = 0,
 	.level = 4,
@@ -8344,7 +8344,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tiana[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Haley1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Haley1[] = {
     {
 	.iv = 0,
 	.level = 7,
@@ -8357,7 +8357,7 @@ const struct TrainerPartyMember0 gTrainerParty_Haley1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Janice[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Janice[] = {
     {
 	.iv = 0,
 	.level = 10,
@@ -8365,7 +8365,7 @@ const struct TrainerPartyMember0 gTrainerParty_Janice[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Vivi[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Vivi[] = {
     {
 	.iv = 100,
 	.level = 15,
@@ -8383,7 +8383,7 @@ const struct TrainerPartyMember0 gTrainerParty_Vivi[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Haley2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Haley2[] = {
     {
 	.iv = 10,
 	.level = 26,
@@ -8396,7 +8396,7 @@ const struct TrainerPartyMember0 gTrainerParty_Haley2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Haley3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Haley3[] = {
     {
 	.iv = 20,
 	.level = 29,
@@ -8409,7 +8409,7 @@ const struct TrainerPartyMember0 gTrainerParty_Haley3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Haley4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Haley4[] = {
     {
 	.iv = 30,
 	.level = 32,
@@ -8422,7 +8422,7 @@ const struct TrainerPartyMember0 gTrainerParty_Haley4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Haley5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Haley5[] = {
     {
 	.iv = 40,
 	.level = 34,
@@ -8440,7 +8440,7 @@ const struct TrainerPartyMember0 gTrainerParty_Haley5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Sally[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sally[] = {
     {
 	.iv = 0,
 	.level = 16,
@@ -8448,7 +8448,7 @@ const struct TrainerPartyMember0 gTrainerParty_Sally[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Robin[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Robin[] = {
     {
 	.iv = 0,
 	.level = 14,
@@ -8466,7 +8466,7 @@ const struct TrainerPartyMember0 gTrainerParty_Robin[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Andrea[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Andrea[] = {
     {
 	.iv = 100,
 	.level = 41,
@@ -8474,7 +8474,7 @@ const struct TrainerPartyMember0 gTrainerParty_Andrea[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Crissy[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Crissy[] = {
     {
 	.iv = 100,
 	.level = 40,
@@ -8487,7 +8487,7 @@ const struct TrainerPartyMember0 gTrainerParty_Crissy[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Rick[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rick[] = {
     {
 	.iv = 0,
 	.level = 4,
@@ -8500,7 +8500,7 @@ const struct TrainerPartyMember0 gTrainerParty_Rick[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Lyle[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lyle[] = {
     {
 	.iv = 0,
 	.level = 3,
@@ -8533,7 +8533,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lyle[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jose[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jose[] = {
     {
 	.iv = 50,
 	.level = 8,
@@ -8551,7 +8551,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jose[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Doug[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Doug[] = {
     {
 	.iv = 0,
 	.level = 26,
@@ -8564,7 +8564,7 @@ const struct TrainerPartyMember0 gTrainerParty_Doug[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Greg[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Greg[] = {
     {
 	.iv = 0,
 	.level = 26,
@@ -8577,7 +8577,7 @@ const struct TrainerPartyMember0 gTrainerParty_Greg[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Kent[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kent[] = {
     {
 	.iv = 0,
 	.level = 26,
@@ -8585,7 +8585,7 @@ const struct TrainerPartyMember0 gTrainerParty_Kent[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_James1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_James1[] = {
     {
 	.iv = 0,
 	.level = 8,
@@ -8593,7 +8593,7 @@ const struct TrainerPartyMember0 gTrainerParty_James1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_James2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_James2[] = {
     {
 	.iv = 10,
 	.level = 27,
@@ -8601,7 +8601,7 @@ const struct TrainerPartyMember0 gTrainerParty_James2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_James3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_James3[] = {
     {
 	.iv = 20,
 	.level = 29,
@@ -8614,7 +8614,7 @@ const struct TrainerPartyMember0 gTrainerParty_James3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_James4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_James4[] = {
     {
 	.iv = 30,
 	.level = 31,
@@ -8632,7 +8632,7 @@ const struct TrainerPartyMember0 gTrainerParty_James4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_James5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_James5[] = {
     {
 	.iv = 40,
 	.level = 33,
@@ -8655,7 +8655,7 @@ const struct TrainerPartyMember0 gTrainerParty_James5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Brice[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brice[] = {
     {
 	.iv = 0,
 	.level = 18,
@@ -8668,7 +8668,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brice[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Trent1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Trent1[] = {
     {
 	.iv = 0,
 	.level = 16,
@@ -8691,7 +8691,7 @@ const struct TrainerPartyMember0 gTrainerParty_Trent1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Lenny[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lenny[] = {
     {
 	.iv = 0,
 	.level = 19,
@@ -8704,7 +8704,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lenny[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Lucas1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lucas1[] = {
     {
 	.iv = 0,
 	.level = 18,
@@ -8722,7 +8722,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lucas1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Alan[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alan[] = {
     {
 	.iv = 0,
 	.level = 22,
@@ -8740,7 +8740,7 @@ const struct TrainerPartyMember0 gTrainerParty_Alan[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Clark[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Clark[] = {
     {
 	.iv = 0,
 	.level = 8,
@@ -8758,7 +8758,7 @@ const struct TrainerPartyMember0 gTrainerParty_Clark[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Eric[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Eric[] = {
     {
 	.iv = 0,
 	.level = 21,
@@ -8771,7 +8771,7 @@ const struct TrainerPartyMember0 gTrainerParty_Eric[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Lucas2[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Lucas2[] = {
     {
 	.iv = 0,
 	.level = 9,
@@ -8780,7 +8780,7 @@ const struct TrainerPartyMember1 gTrainerParty_Lucas2[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Mike1[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Mike1[] = {
     {
 	.iv = 0,
 	.level = 10,
@@ -8795,7 +8795,7 @@ const struct TrainerPartyMember1 gTrainerParty_Mike1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Mike2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Mike2[] = {
     {
 	.iv = 0,
 	.level = 16,
@@ -8813,7 +8813,7 @@ const struct TrainerPartyMember0 gTrainerParty_Mike2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Trent2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Trent2[] = {
     {
 	.iv = 10,
 	.level = 24,
@@ -8836,7 +8836,7 @@ const struct TrainerPartyMember0 gTrainerParty_Trent2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Trent3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Trent3[] = {
     {
 	.iv = 20,
 	.level = 27,
@@ -8859,7 +8859,7 @@ const struct TrainerPartyMember0 gTrainerParty_Trent3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Trent4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Trent4[] = {
     {
 	.iv = 30,
 	.level = 30,
@@ -8882,7 +8882,7 @@ const struct TrainerPartyMember0 gTrainerParty_Trent4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Trent5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Trent5[] = {
     {
 	.iv = 40,
 	.level = 33,
@@ -8905,7 +8905,7 @@ const struct TrainerPartyMember0 gTrainerParty_Trent5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_DezAndLuke[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_DezAndLuke[] = {
     {
 	.iv = 0,
 	.level = 32,
@@ -8918,7 +8918,7 @@ const struct TrainerPartyMember0 gTrainerParty_DezAndLuke[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_LeaAndJed[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_LeaAndJed[] = {
     {
 	.iv = 0,
 	.level = 45,
@@ -8931,7 +8931,7 @@ const struct TrainerPartyMember0 gTrainerParty_LeaAndJed[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_LoisAndHal1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_LoisAndHal1[] = {
     {
 	.iv = 0,
 	.level = 27,
@@ -8944,7 +8944,7 @@ const struct TrainerPartyMember0 gTrainerParty_LoisAndHal1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_LoisAndHal2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_LoisAndHal2[] = {
     {
 	.iv = 10,
 	.level = 30,
@@ -8957,7 +8957,7 @@ const struct TrainerPartyMember0 gTrainerParty_LoisAndHal2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_LoisAndHal3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_LoisAndHal3[] = {
     {
 	.iv = 20,
 	.level = 33,
@@ -8970,7 +8970,7 @@ const struct TrainerPartyMember0 gTrainerParty_LoisAndHal3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_LoisAndHal4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_LoisAndHal4[] = {
     {
 	.iv = 30,
 	.level = 36,
@@ -8983,7 +8983,7 @@ const struct TrainerPartyMember0 gTrainerParty_LoisAndHal4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_LoisAndHal5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_LoisAndHal5[] = {
     {
 	.iv = 40,
 	.level = 39,
@@ -8996,7 +8996,7 @@ const struct TrainerPartyMember0 gTrainerParty_LoisAndHal5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Johanna[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Johanna[] = {
     {
 	.iv = 0,
 	.level = 13,
@@ -9004,7 +9004,7 @@ const struct TrainerPartyMember0 gTrainerParty_Johanna[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Zane[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Zane[] = {
     {
 	.iv = 100,
 	.level = 24,
@@ -9013,7 +9013,7 @@ const struct TrainerPartyMember1 gTrainerParty_Zane[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Vivian[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Vivian[] = {
     {
 	.iv = 100,
 	.level = 19,
@@ -9022,7 +9022,7 @@ const struct TrainerPartyMember1 gTrainerParty_Vivian[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Sadie[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Sadie[] = {
     {
 	.iv = 100,
 	.level = 24,
@@ -9031,7 +9031,7 @@ const struct TrainerPartyMember1 gTrainerParty_Sadie[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Hideo2[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Hideo2[] = {
     {
 	.iv = 0,
 	.level = 26,
@@ -9046,7 +9046,7 @@ const struct TrainerPartyMember1 gTrainerParty_Hideo2[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Keigo[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Keigo[] = {
     {
 	.iv = 0,
 	.level = 29,
@@ -9061,7 +9061,7 @@ const struct TrainerPartyMember1 gTrainerParty_Keigo[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Tsunao[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Tsunao[] = {
     {
 	.iv = 0,
 	.level = 28,
@@ -9082,7 +9082,7 @@ const struct TrainerPartyMember1 gTrainerParty_Tsunao[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Terrell[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Terrell[] = {
     {
 	.iv = 100,
 	.level = 29,
@@ -9095,7 +9095,7 @@ const struct TrainerPartyMember0 gTrainerParty_Terrell[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Kylee[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kylee[] = {
     {
 	.iv = 100,
 	.level = 30,
@@ -9103,7 +9103,7 @@ const struct TrainerPartyMember0 gTrainerParty_Kylee[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Wally2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wally2[] = {
     {
 	.iv = 30,
 	.level = 16,
@@ -9111,7 +9111,7 @@ const struct TrainerPartyMember0 gTrainerParty_Wally2[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Wally3[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Wally3[] = {
     {
 	.iv = 150,
 	.level = 47,
@@ -9144,7 +9144,7 @@ const struct TrainerPartyMember1 gTrainerParty_Wally3[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Wally4[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Wally4[] = {
     {
 	.iv = 150,
 	.level = 50,
@@ -9177,7 +9177,7 @@ const struct TrainerPartyMember1 gTrainerParty_Wally4[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Wally5[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Wally5[] = {
     {
 	.iv = 150,
 	.level = 53,
@@ -9210,7 +9210,7 @@ const struct TrainerPartyMember1 gTrainerParty_Wally5[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Wally6[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Wally6[] = {
     {
 	.iv = 150,
 	.level = 56,
@@ -9243,7 +9243,7 @@ const struct TrainerPartyMember1 gTrainerParty_Wally6[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Brendan10[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan10[] = {
     {
 	.iv = 150,
 	.level = 31,
@@ -9266,7 +9266,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brendan10[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Brendan11[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan11[] = {
     {
 	.iv = 150,
 	.level = 31,
@@ -9289,7 +9289,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brendan11[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Brendan12[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan12[] = {
     {
 	.iv = 150,
 	.level = 31,
@@ -9312,7 +9312,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brendan12[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_May10[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_May10[] = {
     {
 	.iv = 150,
 	.level = 31,
@@ -9335,7 +9335,7 @@ const struct TrainerPartyMember0 gTrainerParty_May10[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_May11[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_May11[] = {
     {
 	.iv = 150,
 	.level = 31,
@@ -9358,7 +9358,7 @@ const struct TrainerPartyMember0 gTrainerParty_May11[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_May12[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_May12[] = {
     {
 	.iv = 150,
 	.level = 31,
@@ -9381,7 +9381,7 @@ const struct TrainerPartyMember0 gTrainerParty_May12[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jonah[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jonah[] = {
     {
 	.iv = 0,
 	.level = 34,
@@ -9404,7 +9404,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jonah[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Henry[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Henry[] = {
     {
 	.iv = 0,
 	.level = 31,
@@ -9422,7 +9422,7 @@ const struct TrainerPartyMember0 gTrainerParty_Henry[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Roger[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Roger[] = {
     {
 	.iv = 0,
 	.level = 15,
@@ -9445,7 +9445,7 @@ const struct TrainerPartyMember0 gTrainerParty_Roger[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Alexa[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alexa[] = {
     {
 	.iv = 100,
 	.level = 35,
@@ -9458,7 +9458,7 @@ const struct TrainerPartyMember0 gTrainerParty_Alexa[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Ruben[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ruben[] = {
     {
 	.iv = 100,
 	.level = 34,
@@ -9476,7 +9476,7 @@ const struct TrainerPartyMember0 gTrainerParty_Ruben[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Koji[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Koji[] = {
     {
 	.iv = 100,
 	.level = 34,
@@ -9489,7 +9489,7 @@ const struct TrainerPartyMember0 gTrainerParty_Koji[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Wayne[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wayne[] = {
     {
 	.iv = 0,
 	.level = 30,
@@ -9512,7 +9512,7 @@ const struct TrainerPartyMember0 gTrainerParty_Wayne[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Byron[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Byron[] = {
     {
 	.iv = 0,
 	.level = 34,
@@ -9525,7 +9525,7 @@ const struct TrainerPartyMember0 gTrainerParty_Byron[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Reed[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Reed[] = {
     {
 	.iv = 0,
 	.level = 32,
@@ -9548,7 +9548,7 @@ const struct TrainerPartyMember0 gTrainerParty_Reed[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Tisha[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tisha[] = {
     {
 	.iv = 0,
 	.level = 33,
@@ -9566,7 +9566,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tisha[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_ToriAndTia[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_ToriAndTia[] = {
     {
 	.iv = 0,
 	.level = 20,
@@ -9579,7 +9579,7 @@ const struct TrainerPartyMember0 gTrainerParty_ToriAndTia[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_KimAndIris[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_KimAndIris[] = {
     {
 	.iv = 0,
 	.level = 34,
@@ -9594,7 +9594,7 @@ const struct TrainerPartyMember1 gTrainerParty_KimAndIris[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_TyraAndIvy[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_TyraAndIvy[] = {
     {
 	.iv = 0,
 	.level = 19,
@@ -9609,7 +9609,7 @@ const struct TrainerPartyMember1 gTrainerParty_TyraAndIvy[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_MelAndPaul[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_MelAndPaul[] = {
     {
 	.iv = 0,
 	.level = 27,
@@ -9624,7 +9624,7 @@ const struct TrainerPartyMember1 gTrainerParty_MelAndPaul[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_JohnAndJay1[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_JohnAndJay1[] = {
     {
 	.iv = 200,
 	.level = 40,
@@ -9639,7 +9639,7 @@ const struct TrainerPartyMember1 gTrainerParty_JohnAndJay1[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_JohnAndJay2[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_JohnAndJay2[] = {
     {
 	.iv = 210,
 	.level = 43,
@@ -9654,7 +9654,7 @@ const struct TrainerPartyMember1 gTrainerParty_JohnAndJay2[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_JohnAndJay3[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_JohnAndJay3[] = {
     {
 	.iv = 220,
 	.level = 46,
@@ -9669,7 +9669,7 @@ const struct TrainerPartyMember1 gTrainerParty_JohnAndJay3[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_JohnAndJay4[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_JohnAndJay4[] = {
     {
 	.iv = 230,
 	.level = 49,
@@ -9684,7 +9684,7 @@ const struct TrainerPartyMember1 gTrainerParty_JohnAndJay4[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_JohnAndJay5[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_JohnAndJay5[] = {
     {
 	.iv = 240,
 	.level = 52,
@@ -9699,7 +9699,7 @@ const struct TrainerPartyMember1 gTrainerParty_JohnAndJay5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_ReliAndIan[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_ReliAndIan[] = {
     {
 	.iv = 0,
 	.level = 36,
@@ -9712,7 +9712,7 @@ const struct TrainerPartyMember0 gTrainerParty_ReliAndIan[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_RitaAndSam1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_RitaAndSam1[] = {
     {
 	.iv = 0,
 	.level = 36,
@@ -9725,7 +9725,7 @@ const struct TrainerPartyMember0 gTrainerParty_RitaAndSam1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_RitaAndSam2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_RitaAndSam2[] = {
     {
 	.iv = 0,
 	.level = 42,
@@ -9738,7 +9738,7 @@ const struct TrainerPartyMember0 gTrainerParty_RitaAndSam2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_RitaAndSam3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_RitaAndSam3[] = {
     {
 	.iv = 0,
 	.level = 45,
@@ -9751,7 +9751,7 @@ const struct TrainerPartyMember0 gTrainerParty_RitaAndSam3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_RitaAndSam4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_RitaAndSam4[] = {
     {
 	.iv = 0,
 	.level = 48,
@@ -9764,7 +9764,7 @@ const struct TrainerPartyMember0 gTrainerParty_RitaAndSam4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_RitaAndSam5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_RitaAndSam5[] = {
     {
 	.iv = 0,
 	.level = 51,
@@ -9777,7 +9777,7 @@ const struct TrainerPartyMember0 gTrainerParty_RitaAndSam5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_LisaAndRay[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_LisaAndRay[] = {
     {
 	.iv = 0,
 	.level = 28,
@@ -9790,7 +9790,7 @@ const struct TrainerPartyMember0 gTrainerParty_LisaAndRay[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Eugene[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Eugene[] = {
     {
 	.iv = 0,
 	.level = 30,
diff --git a/src/data/trainers_de.h b/src/data/trainers_de.h
index c7a0e7744..46d64d8dc 100644
--- a/src/data/trainers_de.h
+++ b/src/data/trainers_de.h
@@ -1,5 +1,5 @@
 const struct Trainer gTrainers[] = {
-    [OPPONENT_NONE] =
+    [TRAINER_NONE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_1,
@@ -10,10 +10,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x0,
         .partySize = 0,
-        .party = NULL
+        .party = {.NoItemDefaultMoves = NULL }
     },
 
-    [OPPONENT_ARCHIE_1] =
+    [TRAINER_ARCHIE_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AQUA_LEADER,
@@ -24,10 +24,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Archie1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Archie1 }
     },
 
-    [OPPONENT_GRUNT_1] =
+    [TRAINER_GRUNT_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -38,10 +38,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt1 }
     },
 
-    [OPPONENT_GRUNT_2] =
+    [TRAINER_GRUNT_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -52,10 +52,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Grunt2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt2 }
     },
 
-    [OPPONENT_GRUNT_3] =
+    [TRAINER_GRUNT_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -66,10 +66,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt3 }
     },
 
-    [OPPONENT_GRUNT_4] =
+    [TRAINER_GRUNT_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -80,10 +80,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt4 }
     },
 
-    [OPPONENT_GRUNT_5] =
+    [TRAINER_GRUNT_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -94,10 +94,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt5 }
     },
 
-    [OPPONENT_GRUNT_6] =
+    [TRAINER_GRUNT_6] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -108,10 +108,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt6
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt6 }
     },
 
-    [OPPONENT_GRUNT_7] =
+    [TRAINER_GRUNT_7] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -122,10 +122,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Grunt7
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt7 }
     },
 
-    [OPPONENT_GRUNT_8] =
+    [TRAINER_GRUNT_8] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -136,10 +136,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt8
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt8 }
     },
 
-    [OPPONENT_GRUNT_9] =
+    [TRAINER_GRUNT_9] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -150,10 +150,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt9
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt9 }
     },
 
-    [OPPONENT_GRUNT_10] =
+    [TRAINER_GRUNT_10] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -164,10 +164,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt10
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt10 }
     },
 
-    [OPPONENT_GRUNT_11] =
+    [TRAINER_GRUNT_11] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -178,10 +178,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt11
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt11 }
     },
 
-    [OPPONENT_GRUNT_12] =
+    [TRAINER_GRUNT_12] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -192,10 +192,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt12
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt12 }
     },
 
-    [OPPONENT_GRUNT_13] =
+    [TRAINER_GRUNT_13] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -206,10 +206,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt13
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt13 }
     },
 
-    [OPPONENT_GRUNT_14] =
+    [TRAINER_GRUNT_14] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -220,10 +220,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt14
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt14 }
     },
 
-    [OPPONENT_GRUNT_15] =
+    [TRAINER_GRUNT_15] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -234,10 +234,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt15
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt15 }
     },
 
-    [OPPONENT_GRUNT_16] =
+    [TRAINER_GRUNT_16] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -248,10 +248,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt16
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt16 }
     },
 
-    [OPPONENT_GRUNT_17] =
+    [TRAINER_GRUNT_17] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -262,10 +262,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt17
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt17 }
     },
 
-    [OPPONENT_GRUNT_18] =
+    [TRAINER_GRUNT_18] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -276,10 +276,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Grunt18
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt18 }
     },
 
-    [OPPONENT_GRUNT_19] =
+    [TRAINER_GRUNT_19] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -290,10 +290,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt19
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt19 }
     },
 
-    [OPPONENT_GRUNT_20] =
+    [TRAINER_GRUNT_20] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -304,10 +304,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt20
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt20 }
     },
 
-    [OPPONENT_GRUNT_21] =
+    [TRAINER_GRUNT_21] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -318,10 +318,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt21
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt21 }
     },
 
-    [OPPONENT_GRUNT_22] =
+    [TRAINER_GRUNT_22] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -332,10 +332,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Grunt22
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt22 }
     },
 
-    [OPPONENT_GRUNT_23] =
+    [TRAINER_GRUNT_23] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -346,10 +346,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt23
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt23 }
     },
 
-    [OPPONENT_GRUNT_24] =
+    [TRAINER_GRUNT_24] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -360,10 +360,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt24
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt24 }
     },
 
-    [OPPONENT_GRUNT_25] =
+    [TRAINER_GRUNT_25] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -374,10 +374,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt25
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt25 }
     },
 
-    [OPPONENT_GRUNT_26] =
+    [TRAINER_GRUNT_26] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -388,10 +388,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Grunt26
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt26 }
     },
 
-    [OPPONENT_GRUNT_27] =
+    [TRAINER_GRUNT_27] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -402,10 +402,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt27
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt27 }
     },
 
-    [OPPONENT_ANONYMOUS_1] =
+    [TRAINER_ANONYMOUS_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AQUA_ADMIN,
@@ -416,10 +416,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Anonymous1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous1 }
     },
 
-    [OPPONENT_MATT_1] =
+    [TRAINER_MATT_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AQUA_ADMIN,
@@ -430,10 +430,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Matt1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Matt1 }
     },
 
-    [OPPONENT_MATT_2] =
+    [TRAINER_MATT_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AQUA_ADMIN,
@@ -444,10 +444,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0xb,
         .partySize = 3,
-        .party = gTrainerParty_Matt2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Matt2 }
     },
 
-    [OPPONENT_SHELLY_1] =
+    [TRAINER_SHELLY_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AQUA_ADMIN,
@@ -458,10 +458,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Shelly1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Shelly1 }
     },
 
-    [OPPONENT_SHELLY_2] =
+    [TRAINER_SHELLY_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AQUA_ADMIN,
@@ -472,10 +472,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Shelly2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Shelly2 }
     },
 
-    [OPPONENT_ARCHIE_2] =
+    [TRAINER_ARCHIE_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AQUA_LEADER,
@@ -486,10 +486,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Archie2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Archie2 }
     },
 
-    [OPPONENT_ARCHIE_3] =
+    [TRAINER_ARCHIE_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AQUA_LEADER,
@@ -500,10 +500,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Archie3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Archie3 }
     },
 
-    [OPPONENT_DAISY] =
+    [TRAINER_DAISY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AROMA_LADY,
@@ -514,10 +514,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Daisy
+        .party = {.NoItemDefaultMoves = gTrainerParty_Daisy }
     },
 
-    [OPPONENT_ROSE_1] =
+    [TRAINER_ROSE_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AROMA_LADY,
@@ -528,10 +528,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Rose1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Rose1 }
     },
 
-    [OPPONENT_LILY] =
+    [TRAINER_LILY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AROMA_LADY,
@@ -542,10 +542,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Lily
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lily }
     },
 
-    [OPPONENT_VIOLET] =
+    [TRAINER_VIOLET] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AROMA_LADY,
@@ -556,10 +556,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Violet
+        .party = {.NoItemDefaultMoves = gTrainerParty_Violet }
     },
 
-    [OPPONENT_ROSE_2] =
+    [TRAINER_ROSE_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AROMA_LADY,
@@ -570,10 +570,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Rose2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Rose2 }
     },
 
-    [OPPONENT_ROSE_3] =
+    [TRAINER_ROSE_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AROMA_LADY,
@@ -584,10 +584,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Rose3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Rose3 }
     },
 
-    [OPPONENT_ROSE_4] =
+    [TRAINER_ROSE_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AROMA_LADY,
@@ -598,10 +598,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Rose4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Rose4 }
     },
 
-    [OPPONENT_ROSE_5] =
+    [TRAINER_ROSE_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AROMA_LADY,
@@ -612,10 +612,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Rose5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Rose5 }
     },
 
-    [OPPONENT_DUSTY_1] =
+    [TRAINER_DUSTY_1] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_RUIN_MANIAC,
@@ -626,10 +626,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Dusty1
+        .party = {.NoItemCustomMoves = gTrainerParty_Dusty1 }
     },
 
-    [OPPONENT_CHIP] =
+    [TRAINER_CHIP] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_RUIN_MANIAC,
@@ -640,10 +640,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Chip
+        .party = {.NoItemCustomMoves = gTrainerParty_Chip }
     },
 
-    [OPPONENT_FOSTER] =
+    [TRAINER_FOSTER] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_RUIN_MANIAC,
@@ -654,10 +654,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Foster
+        .party = {.NoItemCustomMoves = gTrainerParty_Foster }
     },
 
-    [OPPONENT_DUSTY_2] =
+    [TRAINER_DUSTY_2] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_RUIN_MANIAC,
@@ -668,10 +668,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Dusty2
+        .party = {.NoItemCustomMoves = gTrainerParty_Dusty2 }
     },
 
-    [OPPONENT_DUSTY_3] =
+    [TRAINER_DUSTY_3] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_RUIN_MANIAC,
@@ -682,10 +682,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Dusty3
+        .party = {.NoItemCustomMoves = gTrainerParty_Dusty3 }
     },
 
-    [OPPONENT_DUSTY_4] =
+    [TRAINER_DUSTY_4] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_RUIN_MANIAC,
@@ -696,10 +696,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Dusty4
+        .party = {.NoItemCustomMoves = gTrainerParty_Dusty4 }
     },
 
-    [OPPONENT_DUSTY_5] =
+    [TRAINER_DUSTY_5] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_RUIN_MANIAC,
@@ -710,10 +710,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Dusty5
+        .party = {.NoItemCustomMoves = gTrainerParty_Dusty5 }
     },
 
-    [OPPONENT_GABBY_AND_TY_1] =
+    [TRAINER_GABBY_AND_TY_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_INTERVIEWER,
@@ -724,10 +724,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_GabbyAndTy1
+        .party = {.NoItemDefaultMoves = gTrainerParty_GabbyAndTy1 }
     },
 
-    [OPPONENT_GABBY_AND_TY_2] =
+    [TRAINER_GABBY_AND_TY_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_INTERVIEWER,
@@ -738,10 +738,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_GabbyAndTy2
+        .party = {.NoItemDefaultMoves = gTrainerParty_GabbyAndTy2 }
     },
 
-    [OPPONENT_GABBY_AND_TY_3] =
+    [TRAINER_GABBY_AND_TY_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_INTERVIEWER,
@@ -752,10 +752,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_GabbyAndTy3
+        .party = {.NoItemDefaultMoves = gTrainerParty_GabbyAndTy3 }
     },
 
-    [OPPONENT_GABBY_AND_TY_4] =
+    [TRAINER_GABBY_AND_TY_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_INTERVIEWER,
@@ -766,10 +766,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_GabbyAndTy4
+        .party = {.NoItemDefaultMoves = gTrainerParty_GabbyAndTy4 }
     },
 
-    [OPPONENT_GABBY_AND_TY_5] =
+    [TRAINER_GABBY_AND_TY_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_INTERVIEWER,
@@ -780,10 +780,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_GabbyAndTy5
+        .party = {.NoItemDefaultMoves = gTrainerParty_GabbyAndTy5 }
     },
 
-    [OPPONENT_GABBY_AND_TY_6] =
+    [TRAINER_GABBY_AND_TY_6] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_INTERVIEWER,
@@ -794,10 +794,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_GabbyAndTy6
+        .party = {.NoItemCustomMoves = gTrainerParty_GabbyAndTy6 }
     },
 
-    [OPPONENT_LOLA_1] =
+    [TRAINER_LOLA_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TUBER_F,
@@ -808,10 +808,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Lola1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lola1 }
     },
 
-    [OPPONENT_CARMEN] =
+    [TRAINER_CARMEN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TUBER_F,
@@ -822,10 +822,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Carmen
+        .party = {.NoItemDefaultMoves = gTrainerParty_Carmen }
     },
 
-    [OPPONENT_GWEN] =
+    [TRAINER_GWEN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TUBER_F,
@@ -836,10 +836,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Gwen
+        .party = {.NoItemDefaultMoves = gTrainerParty_Gwen }
     },
 
-    [OPPONENT_LOLA_2] =
+    [TRAINER_LOLA_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TUBER_F,
@@ -850,10 +850,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Lola2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lola2 }
     },
 
-    [OPPONENT_LOLA_3] =
+    [TRAINER_LOLA_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TUBER_F,
@@ -864,10 +864,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Lola3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lola3 }
     },
 
-    [OPPONENT_LOLA_4] =
+    [TRAINER_LOLA_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TUBER_F,
@@ -878,10 +878,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Lola4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lola4 }
     },
 
-    [OPPONENT_LOLA_5] =
+    [TRAINER_LOLA_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TUBER_F,
@@ -892,10 +892,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Lola5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lola5 }
     },
 
-    [OPPONENT_RICKY_1] =
+    [TRAINER_RICKY_1] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_TUBER_M,
@@ -906,10 +906,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Ricky1
+        .party = {.NoItemCustomMoves = gTrainerParty_Ricky1 }
     },
 
-    [OPPONENT_SIMON] =
+    [TRAINER_SIMON] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TUBER_M,
@@ -920,10 +920,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Simon
+        .party = {.NoItemDefaultMoves = gTrainerParty_Simon }
     },
 
-    [OPPONENT_CHARLIE] =
+    [TRAINER_CHARLIE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TUBER_M,
@@ -934,10 +934,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Charlie
+        .party = {.NoItemDefaultMoves = gTrainerParty_Charlie }
     },
 
-    [OPPONENT_RICKY_2] =
+    [TRAINER_RICKY_2] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_TUBER_M,
@@ -948,10 +948,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Ricky2
+        .party = {.NoItemCustomMoves = gTrainerParty_Ricky2 }
     },
 
-    [OPPONENT_RICKY_3] =
+    [TRAINER_RICKY_3] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_TUBER_M,
@@ -962,10 +962,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Ricky3
+        .party = {.NoItemCustomMoves = gTrainerParty_Ricky3 }
     },
 
-    [OPPONENT_RICKY_4] =
+    [TRAINER_RICKY_4] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_TUBER_M,
@@ -976,10 +976,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Ricky4
+        .party = {.NoItemCustomMoves = gTrainerParty_Ricky4 }
     },
 
-    [OPPONENT_RICKY_5] =
+    [TRAINER_RICKY_5] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_TUBER_M,
@@ -990,10 +990,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Ricky5
+        .party = {.NoItemCustomMoves = gTrainerParty_Ricky5 }
     },
 
-    [OPPONENT_RANDALL] =
+    [TRAINER_RANDALL] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1004,10 +1004,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Randall
+        .party = {.NoItemDefaultMoves = gTrainerParty_Randall }
     },
 
-    [OPPONENT_PARKER] =
+    [TRAINER_PARKER] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1018,10 +1018,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Parker
+        .party = {.NoItemDefaultMoves = gTrainerParty_Parker }
     },
 
-    [OPPONENT_GEORGE] =
+    [TRAINER_GEORGE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1032,10 +1032,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_George
+        .party = {.NoItemDefaultMoves = gTrainerParty_George }
     },
 
-    [OPPONENT_BERKE] =
+    [TRAINER_BERKE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1046,10 +1046,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Berke
+        .party = {.NoItemDefaultMoves = gTrainerParty_Berke }
     },
 
-    [OPPONENT_CLYDE] =
+    [TRAINER_CLYDE] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1060,10 +1060,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 5,
-        .party = gTrainerParty_Clyde
+        .party = {.NoItemCustomMoves = gTrainerParty_Clyde }
     },
 
-    [OPPONENT_VINCENT] =
+    [TRAINER_VINCENT] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1074,10 +1074,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Vincent
+        .party = {.NoItemDefaultMoves = gTrainerParty_Vincent }
     },
 
-    [OPPONENT_LEROY] =
+    [TRAINER_LEROY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1088,10 +1088,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Leroy
+        .party = {.NoItemDefaultMoves = gTrainerParty_Leroy }
     },
 
-    [OPPONENT_WILTON_1] =
+    [TRAINER_WILTON_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1102,10 +1102,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Wilton1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Wilton1 }
     },
 
-    [OPPONENT_EDGAR] =
+    [TRAINER_EDGAR] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1116,10 +1116,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Edgar
+        .party = {.NoItemDefaultMoves = gTrainerParty_Edgar }
     },
 
-    [OPPONENT_ALBERT] =
+    [TRAINER_ALBERT] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1130,10 +1130,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Albert
+        .party = {.NoItemDefaultMoves = gTrainerParty_Albert }
     },
 
-    [OPPONENT_SAMUEL] =
+    [TRAINER_SAMUEL] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1144,10 +1144,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Samuel
+        .party = {.NoItemDefaultMoves = gTrainerParty_Samuel }
     },
 
-    [OPPONENT_VITO] =
+    [TRAINER_VITO] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1158,10 +1158,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 4,
-        .party = gTrainerParty_Vito
+        .party = {.NoItemDefaultMoves = gTrainerParty_Vito }
     },
 
-    [OPPONENT_OWEN] =
+    [TRAINER_OWEN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1172,10 +1172,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Owen
+        .party = {.NoItemDefaultMoves = gTrainerParty_Owen }
     },
 
-    [OPPONENT_WILTON_2] =
+    [TRAINER_WILTON_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1186,10 +1186,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Wilton2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Wilton2 }
     },
 
-    [OPPONENT_WILTON_3] =
+    [TRAINER_WILTON_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1200,10 +1200,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Wilton3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Wilton3 }
     },
 
-    [OPPONENT_WILTON_4] =
+    [TRAINER_WILTON_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1214,10 +1214,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Wilton4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Wilton4 }
     },
 
-    [OPPONENT_WILTON_5] =
+    [TRAINER_WILTON_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1228,10 +1228,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Wilton5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Wilton5 }
     },
 
-    [OPPONENT_WARREN] =
+    [TRAINER_WARREN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1242,10 +1242,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Warren
+        .party = {.NoItemDefaultMoves = gTrainerParty_Warren }
     },
 
-    [OPPONENT_MARY] =
+    [TRAINER_MARY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1256,10 +1256,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Mary
+        .party = {.NoItemDefaultMoves = gTrainerParty_Mary }
     },
 
-    [OPPONENT_LORI] =
+    [TRAINER_LORI] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1270,10 +1270,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Lori
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lori }
     },
 
-    [OPPONENT_JODY] =
+    [TRAINER_JODY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1284,10 +1284,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0xb,
         .partySize = 1,
-        .party = gTrainerParty_Jody
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jody }
     },
 
-    [OPPONENT_WENDY] =
+    [TRAINER_WENDY] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1298,10 +1298,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0xb,
         .partySize = 3,
-        .party = gTrainerParty_Wendy
+        .party = {.NoItemCustomMoves = gTrainerParty_Wendy }
     },
 
-    [OPPONENT_ELAINE] =
+    [TRAINER_ELAINE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1312,10 +1312,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0xb,
         .partySize = 2,
-        .party = gTrainerParty_Elaine
+        .party = {.NoItemDefaultMoves = gTrainerParty_Elaine }
     },
 
-    [OPPONENT_BROOKE_1] =
+    [TRAINER_BROOKE_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1326,10 +1326,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Brooke1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brooke1 }
     },
 
-    [OPPONENT_JENNIFER] =
+    [TRAINER_JENNIFER] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1340,10 +1340,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Jennifer
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jennifer }
     },
 
-    [OPPONENT_HOPE] =
+    [TRAINER_HOPE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1354,10 +1354,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Hope
+        .party = {.NoItemDefaultMoves = gTrainerParty_Hope }
     },
 
-    [OPPONENT_SHANNON] =
+    [TRAINER_SHANNON] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1368,10 +1368,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Shannon
+        .party = {.NoItemDefaultMoves = gTrainerParty_Shannon }
     },
 
-    [OPPONENT_MICHELLE] =
+    [TRAINER_MICHELLE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1382,10 +1382,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Michelle
+        .party = {.NoItemDefaultMoves = gTrainerParty_Michelle }
     },
 
-    [OPPONENT_CAROLINE] =
+    [TRAINER_CAROLINE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1396,10 +1396,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Caroline
+        .party = {.NoItemDefaultMoves = gTrainerParty_Caroline }
     },
 
-    [OPPONENT_JULIE] =
+    [TRAINER_JULIE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1410,10 +1410,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Julie
+        .party = {.NoItemDefaultMoves = gTrainerParty_Julie }
     },
 
-    [OPPONENT_BROOKE_2] =
+    [TRAINER_BROOKE_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1424,10 +1424,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Brooke2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brooke2 }
     },
 
-    [OPPONENT_BROOKE_3] =
+    [TRAINER_BROOKE_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1438,10 +1438,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Brooke3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brooke3 }
     },
 
-    [OPPONENT_BROOKE_4] =
+    [TRAINER_BROOKE_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1452,10 +1452,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Brooke4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brooke4 }
     },
 
-    [OPPONENT_BROOKE_5] =
+    [TRAINER_BROOKE_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1466,10 +1466,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Brooke5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brooke5 }
     },
 
-    [OPPONENT_PATRICIA] =
+    [TRAINER_PATRICIA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HEX_MANIAC,
@@ -1480,10 +1480,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Patricia
+        .party = {.NoItemDefaultMoves = gTrainerParty_Patricia }
     },
 
-    [OPPONENT_KINDRA] =
+    [TRAINER_KINDRA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HEX_MANIAC,
@@ -1494,10 +1494,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Kindra
+        .party = {.NoItemDefaultMoves = gTrainerParty_Kindra }
     },
 
-    [OPPONENT_TAMMY] =
+    [TRAINER_TAMMY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HEX_MANIAC,
@@ -1508,10 +1508,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Tammy
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tammy }
     },
 
-    [OPPONENT_VALERIE_1] =
+    [TRAINER_VALERIE_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HEX_MANIAC,
@@ -1522,10 +1522,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Valerie1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Valerie1 }
     },
 
-    [OPPONENT_TASHA] =
+    [TRAINER_TASHA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HEX_MANIAC,
@@ -1536,10 +1536,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Tasha
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tasha }
     },
 
-    [OPPONENT_VALERIE_2] =
+    [TRAINER_VALERIE_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HEX_MANIAC,
@@ -1550,10 +1550,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Valerie2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Valerie2 }
     },
 
-    [OPPONENT_VALERIE_3] =
+    [TRAINER_VALERIE_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HEX_MANIAC,
@@ -1564,10 +1564,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Valerie3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Valerie3 }
     },
 
-    [OPPONENT_VALERIE_4] =
+    [TRAINER_VALERIE_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HEX_MANIAC,
@@ -1578,10 +1578,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Valerie4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Valerie4 }
     },
 
-    [OPPONENT_VALERIE_5] =
+    [TRAINER_VALERIE_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HEX_MANIAC,
@@ -1592,10 +1592,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Valerie5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Valerie5 }
     },
 
-    [OPPONENT_CINDY_1] =
+    [TRAINER_CINDY_1] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_LADY,
@@ -1606,10 +1606,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Cindy1
+        .party = {.ItemDefaultMoves = gTrainerParty_Cindy1 }
     },
 
-    [OPPONENT_ANONYMOUS_2] =
+    [TRAINER_ANONYMOUS_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_LADY,
@@ -1620,10 +1620,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Anonymous2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous2 }
     },
 
-    [OPPONENT_BRIANNA_1] =
+    [TRAINER_BRIANNA_1] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_LADY,
@@ -1634,10 +1634,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Brianna1
+        .party = {.NoItemCustomMoves = gTrainerParty_Brianna1 }
     },
 
-    [OPPONENT_CINDY_2] =
+    [TRAINER_CINDY_2] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_LADY,
@@ -1648,10 +1648,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Cindy2
+        .party = {.NoItemCustomMoves = gTrainerParty_Cindy2 }
     },
 
-    [OPPONENT_BRIANNA_2] =
+    [TRAINER_BRIANNA_2] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_LADY,
@@ -1662,10 +1662,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Brianna2
+        .party = {.ItemDefaultMoves = gTrainerParty_Brianna2 }
     },
 
-    [OPPONENT_ANETTE] =
+    [TRAINER_ANETTE] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_LADY,
@@ -1676,10 +1676,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Anette
+        .party = {.ItemDefaultMoves = gTrainerParty_Anette }
     },
 
-    [OPPONENT_CINDY_3] =
+    [TRAINER_CINDY_3] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_LADY,
@@ -1690,10 +1690,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Cindy3
+        .party = {.ItemDefaultMoves = gTrainerParty_Cindy3 }
     },
 
-    [OPPONENT_CINDY_4] =
+    [TRAINER_CINDY_4] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_LADY,
@@ -1704,10 +1704,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Cindy4
+        .party = {.ItemDefaultMoves = gTrainerParty_Cindy4 }
     },
 
-    [OPPONENT_CINDY_5] =
+    [TRAINER_CINDY_5] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_LADY,
@@ -1718,10 +1718,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Cindy5
+        .party = {.ItemDefaultMoves = gTrainerParty_Cindy5 }
     },
 
-    [OPPONENT_CINDY_6] =
+    [TRAINER_CINDY_6] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_LADY,
@@ -1732,10 +1732,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Cindy6
+        .party = {.ItemCustomMoves = gTrainerParty_Cindy6 }
     },
 
-    [OPPONENT_MELISSA] =
+    [TRAINER_MELISSA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1746,10 +1746,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Melissa
+        .party = {.NoItemDefaultMoves = gTrainerParty_Melissa }
     },
 
-    [OPPONENT_SHEILA] =
+    [TRAINER_SHEILA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1760,10 +1760,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Sheila
+        .party = {.NoItemDefaultMoves = gTrainerParty_Sheila }
     },
 
-    [OPPONENT_SHIRLEY] =
+    [TRAINER_SHIRLEY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1774,10 +1774,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Shirley
+        .party = {.NoItemDefaultMoves = gTrainerParty_Shirley }
     },
 
-    [OPPONENT_JESSICA_1] =
+    [TRAINER_JESSICA_1] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1788,10 +1788,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jessica1
+        .party = {.NoItemCustomMoves = gTrainerParty_Jessica1 }
     },
 
-    [OPPONENT_CONNIE] =
+    [TRAINER_CONNIE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1802,10 +1802,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Connie
+        .party = {.NoItemDefaultMoves = gTrainerParty_Connie }
     },
 
-    [OPPONENT_BRIDGET] =
+    [TRAINER_BRIDGET] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1816,10 +1816,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Bridget
+        .party = {.NoItemDefaultMoves = gTrainerParty_Bridget }
     },
 
-    [OPPONENT_OLIVIA] =
+    [TRAINER_OLIVIA] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1830,10 +1830,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Olivia
+        .party = {.NoItemCustomMoves = gTrainerParty_Olivia }
     },
 
-    [OPPONENT_TIFFANY] =
+    [TRAINER_TIFFANY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1844,10 +1844,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Tiffany
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tiffany }
     },
 
-    [OPPONENT_JESSICA_2] =
+    [TRAINER_JESSICA_2] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1858,10 +1858,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jessica2
+        .party = {.NoItemCustomMoves = gTrainerParty_Jessica2 }
     },
 
-    [OPPONENT_JESSICA_3] =
+    [TRAINER_JESSICA_3] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1872,10 +1872,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jessica3
+        .party = {.NoItemCustomMoves = gTrainerParty_Jessica3 }
     },
 
-    [OPPONENT_JESSICA_4] =
+    [TRAINER_JESSICA_4] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1886,10 +1886,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jessica4
+        .party = {.NoItemCustomMoves = gTrainerParty_Jessica4 }
     },
 
-    [OPPONENT_JESSICA_5] =
+    [TRAINER_JESSICA_5] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1900,10 +1900,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jessica5
+        .party = {.NoItemCustomMoves = gTrainerParty_Jessica5 }
     },
 
-    [OPPONENT_WINSTON_1] =
+    [TRAINER_WINSTON_1] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_RICH_BOY,
@@ -1914,10 +1914,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Winston1
+        .party = {.ItemDefaultMoves = gTrainerParty_Winston1 }
     },
 
-    [OPPONENT_ANONYMOUS_3] =
+    [TRAINER_ANONYMOUS_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_RICH_BOY,
@@ -1928,10 +1928,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Anonymous3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous3 }
     },
 
-    [OPPONENT_GARRET] =
+    [TRAINER_GARRET] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_RICH_BOY,
@@ -1942,10 +1942,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Garret
+        .party = {.ItemDefaultMoves = gTrainerParty_Garret }
     },
 
-    [OPPONENT_WINSTON_2] =
+    [TRAINER_WINSTON_2] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_RICH_BOY,
@@ -1956,10 +1956,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Winston2
+        .party = {.ItemDefaultMoves = gTrainerParty_Winston2 }
     },
 
-    [OPPONENT_WINSTON_3] =
+    [TRAINER_WINSTON_3] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_RICH_BOY,
@@ -1970,10 +1970,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Winston3
+        .party = {.ItemDefaultMoves = gTrainerParty_Winston3 }
     },
 
-    [OPPONENT_WINSTON_4] =
+    [TRAINER_WINSTON_4] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_RICH_BOY,
@@ -1984,10 +1984,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Winston4
+        .party = {.ItemDefaultMoves = gTrainerParty_Winston4 }
     },
 
-    [OPPONENT_WINSTON_5] =
+    [TRAINER_WINSTON_5] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_RICH_BOY,
@@ -1998,10 +1998,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Winston5
+        .party = {.ItemCustomMoves = gTrainerParty_Winston5 }
     },
 
-    [OPPONENT_STEVE_1] =
+    [TRAINER_STEVE_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMANIAC,
@@ -2012,10 +2012,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Steve1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Steve1 }
     },
 
-    [OPPONENT_CHRIS] =
+    [TRAINER_CHRIS] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMANIAC,
@@ -2026,10 +2026,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Chris
+        .party = {.NoItemDefaultMoves = gTrainerParty_Chris }
     },
 
-    [OPPONENT_MARK] =
+    [TRAINER_MARK] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMANIAC,
@@ -2040,10 +2040,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Mark
+        .party = {.NoItemDefaultMoves = gTrainerParty_Mark }
     },
 
-    [OPPONENT_KENN] =
+    [TRAINER_KENN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMANIAC,
@@ -2054,10 +2054,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Kenn
+        .party = {.NoItemDefaultMoves = gTrainerParty_Kenn }
     },
 
-    [OPPONENT_STEVE_2] =
+    [TRAINER_STEVE_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMANIAC,
@@ -2068,10 +2068,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Steve2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Steve2 }
     },
 
-    [OPPONENT_STEVE_3] =
+    [TRAINER_STEVE_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMANIAC,
@@ -2082,10 +2082,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Steve3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Steve3 }
     },
 
-    [OPPONENT_STEVE_4] =
+    [TRAINER_STEVE_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMANIAC,
@@ -2096,10 +2096,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Steve4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Steve4 }
     },
 
-    [OPPONENT_STEVE_5] =
+    [TRAINER_STEVE_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMANIAC,
@@ -2110,10 +2110,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Steve5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Steve5 }
     },
 
-    [OPPONENT_LUIS] =
+    [TRAINER_LUIS] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2124,10 +2124,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Luis
+        .party = {.NoItemDefaultMoves = gTrainerParty_Luis }
     },
 
-    [OPPONENT_AUSTIN] =
+    [TRAINER_AUSTIN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2138,10 +2138,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Austin
+        .party = {.NoItemDefaultMoves = gTrainerParty_Austin }
     },
 
-    [OPPONENT_DOUGLAS] =
+    [TRAINER_DOUGLAS] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2152,10 +2152,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Douglas
+        .party = {.NoItemDefaultMoves = gTrainerParty_Douglas }
     },
 
-    [OPPONENT_DARRIN] =
+    [TRAINER_DARRIN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2166,10 +2166,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Darrin
+        .party = {.NoItemDefaultMoves = gTrainerParty_Darrin }
     },
 
-    [OPPONENT_TONY_1] =
+    [TRAINER_TONY_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2180,10 +2180,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Tony1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tony1 }
     },
 
-    [OPPONENT_JEROME] =
+    [TRAINER_JEROME] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2194,10 +2194,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jerome
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jerome }
     },
 
-    [OPPONENT_MATTHEW] =
+    [TRAINER_MATTHEW] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2208,10 +2208,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Matthew
+        .party = {.NoItemDefaultMoves = gTrainerParty_Matthew }
     },
 
-    [OPPONENT_DAVID] =
+    [TRAINER_DAVID] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2222,10 +2222,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_David
+        .party = {.NoItemDefaultMoves = gTrainerParty_David }
     },
 
-    [OPPONENT_SPENCER] =
+    [TRAINER_SPENCER] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2236,10 +2236,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Spencer
+        .party = {.NoItemDefaultMoves = gTrainerParty_Spencer }
     },
 
-    [OPPONENT_ROLAND] =
+    [TRAINER_ROLAND] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2250,10 +2250,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Roland
+        .party = {.NoItemDefaultMoves = gTrainerParty_Roland }
     },
 
-    [OPPONENT_CODY] =
+    [TRAINER_CODY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2264,10 +2264,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Cody
+        .party = {.NoItemDefaultMoves = gTrainerParty_Cody }
     },
 
-    [OPPONENT_STAN] =
+    [TRAINER_STAN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2278,10 +2278,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Stan
+        .party = {.NoItemDefaultMoves = gTrainerParty_Stan }
     },
 
-    [OPPONENT_BARRY] =
+    [TRAINER_BARRY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2292,10 +2292,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Barry
+        .party = {.NoItemDefaultMoves = gTrainerParty_Barry }
     },
 
-    [OPPONENT_DEAN] =
+    [TRAINER_DEAN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2306,10 +2306,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Dean
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dean }
     },
 
-    [OPPONENT_RODNEY] =
+    [TRAINER_RODNEY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2320,10 +2320,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Rodney
+        .party = {.NoItemDefaultMoves = gTrainerParty_Rodney }
     },
 
-    [OPPONENT_RICHARD] =
+    [TRAINER_RICHARD] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2334,10 +2334,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Richard
+        .party = {.NoItemDefaultMoves = gTrainerParty_Richard }
     },
 
-    [OPPONENT_HERMAN] =
+    [TRAINER_HERMAN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2348,10 +2348,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Herman
+        .party = {.NoItemDefaultMoves = gTrainerParty_Herman }
     },
 
-    [OPPONENT_ANONYMOUS_4] =
+    [TRAINER_ANONYMOUS_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2362,10 +2362,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Anonymous4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous4 }
     },
 
-    [OPPONENT_GILBERT] =
+    [TRAINER_GILBERT] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2376,10 +2376,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Gilbert
+        .party = {.NoItemDefaultMoves = gTrainerParty_Gilbert }
     },
 
-    [OPPONENT_FRANKLIN] =
+    [TRAINER_FRANKLIN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2390,10 +2390,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Franklin
+        .party = {.NoItemDefaultMoves = gTrainerParty_Franklin }
     },
 
-    [OPPONENT_DANNY] =
+    [TRAINER_DANNY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2404,10 +2404,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Danny
+        .party = {.NoItemDefaultMoves = gTrainerParty_Danny }
     },
 
-    [OPPONENT_JACK] =
+    [TRAINER_JACK] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2418,10 +2418,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jack
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jack }
     },
 
-    [OPPONENT_DUDLEY] =
+    [TRAINER_DUDLEY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2432,10 +2432,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Dudley
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dudley }
     },
 
-    [OPPONENT_CHAD] =
+    [TRAINER_CHAD] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2446,10 +2446,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Chad
+        .party = {.NoItemDefaultMoves = gTrainerParty_Chad }
     },
 
-    [OPPONENT_TONY_2] =
+    [TRAINER_TONY_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2460,10 +2460,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Tony2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tony2 }
     },
 
-    [OPPONENT_TONY_3] =
+    [TRAINER_TONY_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2474,10 +2474,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Tony3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tony3 }
     },
 
-    [OPPONENT_TONY_4] =
+    [TRAINER_TONY_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2488,10 +2488,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Tony4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tony4 }
     },
 
-    [OPPONENT_TONY_5] =
+    [TRAINER_TONY_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2502,10 +2502,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Tony5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tony5 }
     },
 
-    [OPPONENT_HIDEKI] =
+    [TRAINER_HIDEKI] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2516,10 +2516,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Hideki
+        .party = {.NoItemDefaultMoves = gTrainerParty_Hideki }
     },
 
-    [OPPONENT_HITOSHI] =
+    [TRAINER_HITOSHI] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2530,10 +2530,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Hitoshi
+        .party = {.NoItemDefaultMoves = gTrainerParty_Hitoshi }
     },
 
-    [OPPONENT_KIYO] =
+    [TRAINER_KIYO] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2544,10 +2544,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Kiyo
+        .party = {.NoItemDefaultMoves = gTrainerParty_Kiyo }
     },
 
-    [OPPONENT_KOICHI] =
+    [TRAINER_KOICHI] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2558,10 +2558,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Koichi
+        .party = {.NoItemDefaultMoves = gTrainerParty_Koichi }
     },
 
-    [OPPONENT_NOB_1] =
+    [TRAINER_NOB_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2572,10 +2572,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Nob1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Nob1 }
     },
 
-    [OPPONENT_NOB_2] =
+    [TRAINER_NOB_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2586,10 +2586,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Nob2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Nob2 }
     },
 
-    [OPPONENT_NOB_3] =
+    [TRAINER_NOB_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2600,10 +2600,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Nob3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Nob3 }
     },
 
-    [OPPONENT_NOB_4] =
+    [TRAINER_NOB_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2614,10 +2614,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Nob4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Nob4 }
     },
 
-    [OPPONENT_NOB_5] =
+    [TRAINER_NOB_5] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2628,10 +2628,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Nob5
+        .party = {.ItemDefaultMoves = gTrainerParty_Nob5 }
     },
 
-    [OPPONENT_YUJI] =
+    [TRAINER_YUJI] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2642,10 +2642,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Yuji
+        .party = {.NoItemDefaultMoves = gTrainerParty_Yuji }
     },
 
-    [OPPONENT_DAISUKE] =
+    [TRAINER_DAISUKE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2656,10 +2656,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Daisuke
+        .party = {.NoItemDefaultMoves = gTrainerParty_Daisuke }
     },
 
-    [OPPONENT_ATSUSHI] =
+    [TRAINER_ATSUSHI] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2670,10 +2670,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Atsushi
+        .party = {.NoItemDefaultMoves = gTrainerParty_Atsushi }
     },
 
-    [OPPONENT_KIRK] =
+    [TRAINER_KIRK] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_GUITARIST,
@@ -2684,10 +2684,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Kirk
+        .party = {.NoItemDefaultMoves = gTrainerParty_Kirk }
     },
 
-    [OPPONENT_SCOTT] =
+    [TRAINER_SCOTT] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_GUITARIST,
@@ -2698,10 +2698,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Scott
+        .party = {.NoItemDefaultMoves = gTrainerParty_Scott }
     },
 
-    [OPPONENT_HARVEY] =
+    [TRAINER_HARVEY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_GUITARIST,
@@ -2712,10 +2712,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Harvey
+        .party = {.NoItemDefaultMoves = gTrainerParty_Harvey }
     },
 
-    [OPPONENT_SHAWN] =
+    [TRAINER_SHAWN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_GUITARIST,
@@ -2726,10 +2726,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Shawn
+        .party = {.NoItemDefaultMoves = gTrainerParty_Shawn }
     },
 
-    [OPPONENT_RANDY] =
+    [TRAINER_RANDY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_GUITARIST,
@@ -2740,10 +2740,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Randy
+        .party = {.NoItemDefaultMoves = gTrainerParty_Randy }
     },
 
-    [OPPONENT_DALTON_1] =
+    [TRAINER_DALTON_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_GUITARIST,
@@ -2754,10 +2754,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Dalton1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dalton1 }
     },
 
-    [OPPONENT_DALTON_2] =
+    [TRAINER_DALTON_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_GUITARIST,
@@ -2768,10 +2768,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Dalton2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dalton2 }
     },
 
-    [OPPONENT_DALTON_3] =
+    [TRAINER_DALTON_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_GUITARIST,
@@ -2782,10 +2782,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Dalton3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dalton3 }
     },
 
-    [OPPONENT_DALTON_4] =
+    [TRAINER_DALTON_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_GUITARIST,
@@ -2796,10 +2796,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Dalton4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dalton4 }
     },
 
-    [OPPONENT_DALTON_5] =
+    [TRAINER_DALTON_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_GUITARIST,
@@ -2810,10 +2810,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Dalton5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dalton5 }
     },
 
-    [OPPONENT_COLE] =
+    [TRAINER_COLE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_KINDLER,
@@ -2824,10 +2824,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Cole
+        .party = {.NoItemDefaultMoves = gTrainerParty_Cole }
     },
 
-    [OPPONENT_FLINT] =
+    [TRAINER_FLINT] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_KINDLER,
@@ -2838,10 +2838,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Flint
+        .party = {.NoItemDefaultMoves = gTrainerParty_Flint }
     },
 
-    [OPPONENT_AXLE] =
+    [TRAINER_AXLE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_KINDLER,
@@ -2852,10 +2852,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Axle
+        .party = {.NoItemDefaultMoves = gTrainerParty_Axle }
     },
 
-    [OPPONENT_JAKE] =
+    [TRAINER_JAKE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_KINDLER,
@@ -2866,10 +2866,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Jake
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jake }
     },
 
-    [OPPONENT_ANDY] =
+    [TRAINER_ANDY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_KINDLER,
@@ -2880,10 +2880,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Andy
+        .party = {.NoItemDefaultMoves = gTrainerParty_Andy }
     },
 
-    [OPPONENT_BERNIE_1] =
+    [TRAINER_BERNIE_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_KINDLER,
@@ -2894,10 +2894,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Bernie1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Bernie1 }
     },
 
-    [OPPONENT_BERNIE_2] =
+    [TRAINER_BERNIE_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_KINDLER,
@@ -2908,10 +2908,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Bernie2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Bernie2 }
     },
 
-    [OPPONENT_BERNIE_3] =
+    [TRAINER_BERNIE_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_KINDLER,
@@ -2922,10 +2922,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Bernie3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Bernie3 }
     },
 
-    [OPPONENT_BERNIE_4] =
+    [TRAINER_BERNIE_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_KINDLER,
@@ -2936,10 +2936,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Bernie4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Bernie4 }
     },
 
-    [OPPONENT_BERNIE_5] =
+    [TRAINER_BERNIE_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_KINDLER,
@@ -2950,10 +2950,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Bernie5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Bernie5 }
     },
 
-    [OPPONENT_DREW] =
+    [TRAINER_DREW] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_CAMPER,
@@ -2964,10 +2964,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Drew
+        .party = {.NoItemCustomMoves = gTrainerParty_Drew }
     },
 
-    [OPPONENT_CLIFF] =
+    [TRAINER_CLIFF] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_CAMPER,
@@ -2978,10 +2978,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Cliff
+        .party = {.NoItemCustomMoves = gTrainerParty_Cliff }
     },
 
-    [OPPONENT_LARRY] =
+    [TRAINER_LARRY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_CAMPER,
@@ -2992,10 +2992,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Larry
+        .party = {.NoItemDefaultMoves = gTrainerParty_Larry }
     },
 
-    [OPPONENT_SHANE] =
+    [TRAINER_SHANE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_CAMPER,
@@ -3006,10 +3006,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Shane
+        .party = {.NoItemDefaultMoves = gTrainerParty_Shane }
     },
 
-    [OPPONENT_JUSTIN] =
+    [TRAINER_JUSTIN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_CAMPER,
@@ -3020,10 +3020,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Justin
+        .party = {.NoItemDefaultMoves = gTrainerParty_Justin }
     },
 
-    [OPPONENT_ETHAN_1] =
+    [TRAINER_ETHAN_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_CAMPER,
@@ -3034,10 +3034,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Ethan1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Ethan1 }
     },
 
-    [OPPONENT_JEFF] =
+    [TRAINER_JEFF] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_CAMPER,
@@ -3048,10 +3048,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jeff
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jeff }
     },
 
-    [OPPONENT_TRAVIS] =
+    [TRAINER_TRAVIS] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_CAMPER,
@@ -3062,10 +3062,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Travis
+        .party = {.NoItemDefaultMoves = gTrainerParty_Travis }
     },
 
-    [OPPONENT_ETHAN_2] =
+    [TRAINER_ETHAN_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_CAMPER,
@@ -3076,10 +3076,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Ethan2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Ethan2 }
     },
 
-    [OPPONENT_ETHAN_3] =
+    [TRAINER_ETHAN_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_CAMPER,
@@ -3090,10 +3090,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Ethan3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Ethan3 }
     },
 
-    [OPPONENT_ETHAN_4] =
+    [TRAINER_ETHAN_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_CAMPER,
@@ -3104,10 +3104,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Ethan4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Ethan4 }
     },
 
-    [OPPONENT_ETHAN_5] =
+    [TRAINER_ETHAN_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_CAMPER,
@@ -3118,10 +3118,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Ethan5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Ethan5 }
     },
 
-    [OPPONENT_BRENT] =
+    [TRAINER_BRENT] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_MANIAC,
@@ -3132,10 +3132,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Brent
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brent }
     },
 
-    [OPPONENT_DONALD] =
+    [TRAINER_DONALD] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_MANIAC,
@@ -3146,10 +3146,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Donald
+        .party = {.NoItemDefaultMoves = gTrainerParty_Donald }
     },
 
-    [OPPONENT_TAYLOR] =
+    [TRAINER_TAYLOR] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_MANIAC,
@@ -3160,10 +3160,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Taylor
+        .party = {.NoItemDefaultMoves = gTrainerParty_Taylor }
     },
 
-    [OPPONENT_BRANDON_1] =
+    [TRAINER_BRANDON_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_MANIAC,
@@ -3174,10 +3174,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Brandon1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brandon1 }
     },
 
-    [OPPONENT_DEREK] =
+    [TRAINER_DEREK] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_MANIAC,
@@ -3188,10 +3188,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Derek
+        .party = {.NoItemDefaultMoves = gTrainerParty_Derek }
     },
 
-    [OPPONENT_BRANDON_2] =
+    [TRAINER_BRANDON_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_MANIAC,
@@ -3202,10 +3202,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Brandon2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brandon2 }
     },
 
-    [OPPONENT_BRANDON_3] =
+    [TRAINER_BRANDON_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_MANIAC,
@@ -3216,10 +3216,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Brandon3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brandon3 }
     },
 
-    [OPPONENT_BRANDON_4] =
+    [TRAINER_BRANDON_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_MANIAC,
@@ -3230,10 +3230,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Brandon4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brandon4 }
     },
 
-    [OPPONENT_BRANDON_5] =
+    [TRAINER_BRANDON_5] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_BUG_MANIAC,
@@ -3244,10 +3244,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 5,
-        .party = gTrainerParty_Brandon5
+        .party = {.ItemDefaultMoves = gTrainerParty_Brandon5 }
     },
 
-    [OPPONENT_EDWARD] =
+    [TRAINER_EDWARD] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3258,10 +3258,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Edward
+        .party = {.NoItemCustomMoves = gTrainerParty_Edward }
     },
 
-    [OPPONENT_PRESTON] =
+    [TRAINER_PRESTON] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3272,10 +3272,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Preston
+        .party = {.NoItemDefaultMoves = gTrainerParty_Preston }
     },
 
-    [OPPONENT_VIRGIL] =
+    [TRAINER_VIRGIL] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3286,10 +3286,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Virgil
+        .party = {.NoItemDefaultMoves = gTrainerParty_Virgil }
     },
 
-    [OPPONENT_FRITZ] =
+    [TRAINER_FRITZ] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3300,10 +3300,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Fritz
+        .party = {.NoItemDefaultMoves = gTrainerParty_Fritz }
     },
 
-    [OPPONENT_WILLIAM] =
+    [TRAINER_WILLIAM] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3314,10 +3314,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_William
+        .party = {.NoItemDefaultMoves = gTrainerParty_William }
     },
 
-    [OPPONENT_JOSHUA] =
+    [TRAINER_JOSHUA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3328,10 +3328,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Joshua
+        .party = {.NoItemDefaultMoves = gTrainerParty_Joshua }
     },
 
-    [OPPONENT_CAMERON_1] =
+    [TRAINER_CAMERON_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3342,10 +3342,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Cameron1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Cameron1 }
     },
 
-    [OPPONENT_CAMERON_2] =
+    [TRAINER_CAMERON_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3356,10 +3356,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Cameron2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Cameron2 }
     },
 
-    [OPPONENT_CAMERON_3] =
+    [TRAINER_CAMERON_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3370,10 +3370,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Cameron3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Cameron3 }
     },
 
-    [OPPONENT_CAMERON_4] =
+    [TRAINER_CAMERON_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3384,10 +3384,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Cameron4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Cameron4 }
     },
 
-    [OPPONENT_CAMERON_5] =
+    [TRAINER_CAMERON_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3398,10 +3398,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Cameron5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Cameron5 }
     },
 
-    [OPPONENT_JACLYN] =
+    [TRAINER_JACLYN] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3412,10 +3412,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Jaclyn
+        .party = {.NoItemCustomMoves = gTrainerParty_Jaclyn }
     },
 
-    [OPPONENT_HANNAH] =
+    [TRAINER_HANNAH] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3426,10 +3426,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Hannah
+        .party = {.NoItemDefaultMoves = gTrainerParty_Hannah }
     },
 
-    [OPPONENT_SAMANTHA] =
+    [TRAINER_SAMANTHA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3440,10 +3440,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Samantha
+        .party = {.NoItemDefaultMoves = gTrainerParty_Samantha }
     },
 
-    [OPPONENT_MAURA] =
+    [TRAINER_MAURA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3454,10 +3454,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Maura
+        .party = {.NoItemDefaultMoves = gTrainerParty_Maura }
     },
 
-    [OPPONENT_KAYLA] =
+    [TRAINER_KAYLA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3468,10 +3468,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Kayla
+        .party = {.NoItemDefaultMoves = gTrainerParty_Kayla }
     },
 
-    [OPPONENT_ALEXIS] =
+    [TRAINER_ALEXIS] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3482,10 +3482,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Alexis
+        .party = {.NoItemDefaultMoves = gTrainerParty_Alexis }
     },
 
-    [OPPONENT_JACKI_1] =
+    [TRAINER_JACKI_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3496,10 +3496,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jacki1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jacki1 }
     },
 
-    [OPPONENT_JACKI_2] =
+    [TRAINER_JACKI_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3510,10 +3510,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jacki2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jacki2 }
     },
 
-    [OPPONENT_JACKI_3] =
+    [TRAINER_JACKI_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3524,10 +3524,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jacki3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jacki3 }
     },
 
-    [OPPONENT_JACKI_4] =
+    [TRAINER_JACKI_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3538,10 +3538,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jacki4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jacki4 }
     },
 
-    [OPPONENT_JACKI_5] =
+    [TRAINER_JACKI_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3552,10 +3552,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jacki5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jacki5 }
     },
 
-    [OPPONENT_WALTER_1] =
+    [TRAINER_WALTER_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_GENTLEMAN,
@@ -3566,10 +3566,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Walter1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Walter1 }
     },
 
-    [OPPONENT_TUCKER] =
+    [TRAINER_TUCKER] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_GENTLEMAN,
@@ -3580,10 +3580,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Tucker
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tucker }
     },
 
-    [OPPONENT_THOMAS] =
+    [TRAINER_THOMAS] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_GENTLEMAN,
@@ -3594,10 +3594,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Thomas
+        .party = {.NoItemDefaultMoves = gTrainerParty_Thomas }
     },
 
-    [OPPONENT_WALTER_2] =
+    [TRAINER_WALTER_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_GENTLEMAN,
@@ -3608,10 +3608,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Walter2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Walter2 }
     },
 
-    [OPPONENT_WALTER_3] =
+    [TRAINER_WALTER_3] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_GENTLEMAN,
@@ -3622,10 +3622,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Walter3
+        .party = {.NoItemCustomMoves = gTrainerParty_Walter3 }
     },
 
-    [OPPONENT_WALTER_4] =
+    [TRAINER_WALTER_4] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_GENTLEMAN,
@@ -3636,10 +3636,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Walter4
+        .party = {.NoItemCustomMoves = gTrainerParty_Walter4 }
     },
 
-    [OPPONENT_WALTER_5] =
+    [TRAINER_WALTER_5] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_GENTLEMAN,
@@ -3650,10 +3650,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Walter5
+        .party = {.NoItemCustomMoves = gTrainerParty_Walter5 }
     },
 
-    [OPPONENT_SIDNEY] =
+    [TRAINER_SIDNEY] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_ELITE_FOUR,
@@ -3664,10 +3664,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 5,
-        .party = gTrainerParty_Sidney
+        .party = {.ItemCustomMoves = gTrainerParty_Sidney }
     },
 
-    [OPPONENT_PHOEBE] =
+    [TRAINER_PHOEBE] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_ELITE_FOUR,
@@ -3678,10 +3678,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 5,
-        .party = gTrainerParty_Phoebe
+        .party = {.ItemCustomMoves = gTrainerParty_Phoebe }
     },
 
-    [OPPONENT_GLACIA] =
+    [TRAINER_GLACIA] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_ELITE_FOUR,
@@ -3692,10 +3692,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 5,
-        .party = gTrainerParty_Glacia
+        .party = {.ItemCustomMoves = gTrainerParty_Glacia }
     },
 
-    [OPPONENT_DRAKE] =
+    [TRAINER_DRAKE] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_ELITE_FOUR,
@@ -3706,10 +3706,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 5,
-        .party = gTrainerParty_Drake
+        .party = {.ItemCustomMoves = gTrainerParty_Drake }
     },
 
-    [OPPONENT_ROXANNE] =
+    [TRAINER_ROXANNE] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_LEADER,
@@ -3720,10 +3720,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Roxanne
+        .party = {.NoItemCustomMoves = gTrainerParty_Roxanne }
     },
 
-    [OPPONENT_BRAWLY] =
+    [TRAINER_BRAWLY] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_LEADER,
@@ -3734,10 +3734,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Brawly
+        .party = {.NoItemCustomMoves = gTrainerParty_Brawly }
     },
 
-    [OPPONENT_WATTSON] =
+    [TRAINER_WATTSON] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_LEADER,
@@ -3748,10 +3748,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Wattson
+        .party = {.NoItemCustomMoves = gTrainerParty_Wattson }
     },
 
-    [OPPONENT_FLANNERY] =
+    [TRAINER_FLANNERY] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_LEADER,
@@ -3762,10 +3762,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Flannery
+        .party = {.NoItemCustomMoves = gTrainerParty_Flannery }
     },
 
-    [OPPONENT_NORMAN] =
+    [TRAINER_NORMAN] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_LEADER,
@@ -3776,10 +3776,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Norman
+        .party = {.NoItemCustomMoves = gTrainerParty_Norman }
     },
 
-    [OPPONENT_WINONA] =
+    [TRAINER_WINONA] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_LEADER,
@@ -3790,10 +3790,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 4,
-        .party = gTrainerParty_Winona
+        .party = {.NoItemCustomMoves = gTrainerParty_Winona }
     },
 
-    [OPPONENT_TATE_AND_LIZA] =
+    [TRAINER_TATE_AND_LIZA] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_LEADER,
@@ -3804,10 +3804,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_TateAndLiza
+        .party = {.ItemCustomMoves = gTrainerParty_TateAndLiza }
     },
 
-    [OPPONENT_WALLACE] =
+    [TRAINER_WALLACE] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_LEADER,
@@ -3818,10 +3818,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 5,
-        .party = gTrainerParty_Wallace
+        .party = {.NoItemCustomMoves = gTrainerParty_Wallace }
     },
 
-    [OPPONENT_JERRY_1] =
+    [TRAINER_JERRY_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3832,10 +3832,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Jerry1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jerry1 }
     },
 
-    [OPPONENT_TED] =
+    [TRAINER_TED] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3846,10 +3846,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Ted
+        .party = {.NoItemDefaultMoves = gTrainerParty_Ted }
     },
 
-    [OPPONENT_PAUL] =
+    [TRAINER_PAUL] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3860,10 +3860,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Paul
+        .party = {.NoItemDefaultMoves = gTrainerParty_Paul }
     },
 
-    [OPPONENT_JERRY_2] =
+    [TRAINER_JERRY_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3874,10 +3874,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jerry2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jerry2 }
     },
 
-    [OPPONENT_JERRY_3] =
+    [TRAINER_JERRY_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3888,10 +3888,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jerry3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jerry3 }
     },
 
-    [OPPONENT_JERRY_4] =
+    [TRAINER_JERRY_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3902,10 +3902,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jerry4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jerry4 }
     },
 
-    [OPPONENT_JERRY_5] =
+    [TRAINER_JERRY_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3916,10 +3916,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Jerry5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jerry5 }
     },
 
-    [OPPONENT_KAREN_1] =
+    [TRAINER_KAREN_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3930,10 +3930,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Karen1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Karen1 }
     },
 
-    [OPPONENT_GEORGIA] =
+    [TRAINER_GEORGIA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3944,10 +3944,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Georgia
+        .party = {.NoItemDefaultMoves = gTrainerParty_Georgia }
     },
 
-    [OPPONENT_KAREN_2] =
+    [TRAINER_KAREN_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3958,10 +3958,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Karen2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Karen2 }
     },
 
-    [OPPONENT_KAREN_3] =
+    [TRAINER_KAREN_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3972,10 +3972,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Karen3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Karen3 }
     },
 
-    [OPPONENT_KAREN_4] =
+    [TRAINER_KAREN_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3986,10 +3986,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Karen4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Karen4 }
     },
 
-    [OPPONENT_KAREN_5] =
+    [TRAINER_KAREN_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -4000,10 +4000,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Karen5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Karen5 }
     },
 
-    [OPPONENT_KATE_AND_JOY] =
+    [TRAINER_KATE_AND_JOY] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_SR_AND_JR,
@@ -4014,10 +4014,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_KateAndJoy
+        .party = {.NoItemCustomMoves = gTrainerParty_KateAndJoy }
     },
 
-    [OPPONENT_ANNA_AND_MEG_1] =
+    [TRAINER_ANNA_AND_MEG_1] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_SR_AND_JR,
@@ -4028,10 +4028,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_AnnaAndMeg1
+        .party = {.NoItemCustomMoves = gTrainerParty_AnnaAndMeg1 }
     },
 
-    [OPPONENT_ANNA_AND_MEG_2] =
+    [TRAINER_ANNA_AND_MEG_2] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_SR_AND_JR,
@@ -4042,10 +4042,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_AnnaAndMeg2
+        .party = {.NoItemCustomMoves = gTrainerParty_AnnaAndMeg2 }
     },
 
-    [OPPONENT_ANNA_AND_MEG_3] =
+    [TRAINER_ANNA_AND_MEG_3] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_SR_AND_JR,
@@ -4056,10 +4056,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_AnnaAndMeg3
+        .party = {.NoItemCustomMoves = gTrainerParty_AnnaAndMeg3 }
     },
 
-    [OPPONENT_ANNA_AND_MEG_4] =
+    [TRAINER_ANNA_AND_MEG_4] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_SR_AND_JR,
@@ -4070,10 +4070,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_AnnaAndMeg4
+        .party = {.NoItemCustomMoves = gTrainerParty_AnnaAndMeg4 }
     },
 
-    [OPPONENT_ANNA_AND_MEG_5] =
+    [TRAINER_ANNA_AND_MEG_5] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_SR_AND_JR,
@@ -4084,10 +4084,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_AnnaAndMeg5
+        .party = {.NoItemCustomMoves = gTrainerParty_AnnaAndMeg5 }
     },
 
-    [OPPONENT_VICTOR] =
+    [TRAINER_VICTOR] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_WINSTRATE,
@@ -4098,10 +4098,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Victor
+        .party = {.ItemDefaultMoves = gTrainerParty_Victor }
     },
 
-    [OPPONENT_MIGUEL_1] =
+    [TRAINER_MIGUEL_1] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4112,10 +4112,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Miguel1
+        .party = {.ItemDefaultMoves = gTrainerParty_Miguel1 }
     },
 
-    [OPPONENT_COLTON] =
+    [TRAINER_COLTON] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4126,10 +4126,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 6,
-        .party = gTrainerParty_Colton
+        .party = {.ItemCustomMoves = gTrainerParty_Colton }
     },
 
-    [OPPONENT_MIGUEL_2] =
+    [TRAINER_MIGUEL_2] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4140,10 +4140,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Miguel2
+        .party = {.ItemDefaultMoves = gTrainerParty_Miguel2 }
     },
 
-    [OPPONENT_MIGUEL_3] =
+    [TRAINER_MIGUEL_3] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4154,10 +4154,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Miguel3
+        .party = {.ItemDefaultMoves = gTrainerParty_Miguel3 }
     },
 
-    [OPPONENT_MIGUEL_4] =
+    [TRAINER_MIGUEL_4] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4168,10 +4168,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Miguel4
+        .party = {.ItemDefaultMoves = gTrainerParty_Miguel4 }
     },
 
-    [OPPONENT_MIGUEL_5] =
+    [TRAINER_MIGUEL_5] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4182,10 +4182,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Miguel5
+        .party = {.ItemDefaultMoves = gTrainerParty_Miguel5 }
     },
 
-    [OPPONENT_VICTORIA] =
+    [TRAINER_VICTORIA] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_WINSTRATE,
@@ -4196,10 +4196,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x3,
         .partySize = 1,
-        .party = gTrainerParty_Victoria
+        .party = {.ItemDefaultMoves = gTrainerParty_Victoria }
     },
 
-    [OPPONENT_VANESSA] =
+    [TRAINER_VANESSA] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4210,10 +4210,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Vanessa
+        .party = {.ItemDefaultMoves = gTrainerParty_Vanessa }
     },
 
-    [OPPONENT_MARISSA] =
+    [TRAINER_MARISSA] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4224,10 +4224,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Marissa
+        .party = {.ItemDefaultMoves = gTrainerParty_Marissa }
     },
 
-    [OPPONENT_ISABEL_1] =
+    [TRAINER_ISABEL_1] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4238,10 +4238,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Isabel1
+        .party = {.ItemDefaultMoves = gTrainerParty_Isabel1 }
     },
 
-    [OPPONENT_ISABEL_2] =
+    [TRAINER_ISABEL_2] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4252,10 +4252,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Isabel2
+        .party = {.ItemDefaultMoves = gTrainerParty_Isabel2 }
     },
 
-    [OPPONENT_ISABEL_3] =
+    [TRAINER_ISABEL_3] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4266,10 +4266,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Isabel3
+        .party = {.ItemDefaultMoves = gTrainerParty_Isabel3 }
     },
 
-    [OPPONENT_ISABEL_4] =
+    [TRAINER_ISABEL_4] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4280,10 +4280,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Isabel4
+        .party = {.ItemDefaultMoves = gTrainerParty_Isabel4 }
     },
 
-    [OPPONENT_ISABEL_5] =
+    [TRAINER_ISABEL_5] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4294,10 +4294,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Isabel5
+        .party = {.ItemDefaultMoves = gTrainerParty_Isabel5 }
     },
 
-    [OPPONENT_TIMOTHY_1] =
+    [TRAINER_TIMOTHY_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_EXPERT,
@@ -4308,10 +4308,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Timothy1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Timothy1 }
     },
 
-    [OPPONENT_TIMOTHY_2] =
+    [TRAINER_TIMOTHY_2] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_EXPERT,
@@ -4322,10 +4322,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Timothy2
+        .party = {.NoItemCustomMoves = gTrainerParty_Timothy2 }
     },
 
-    [OPPONENT_TIMOTHY_3] =
+    [TRAINER_TIMOTHY_3] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_EXPERT,
@@ -4336,10 +4336,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Timothy3
+        .party = {.NoItemCustomMoves = gTrainerParty_Timothy3 }
     },
 
-    [OPPONENT_TIMOTHY_4] =
+    [TRAINER_TIMOTHY_4] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_EXPERT,
@@ -4350,10 +4350,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Timothy4
+        .party = {.NoItemCustomMoves = gTrainerParty_Timothy4 }
     },
 
-    [OPPONENT_TIMOTHY_5] =
+    [TRAINER_TIMOTHY_5] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_EXPERT,
@@ -4364,10 +4364,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Timothy5
+        .party = {.NoItemCustomMoves = gTrainerParty_Timothy5 }
     },
 
-    [OPPONENT_VICKY] =
+    [TRAINER_VICKY] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_WINSTRATE,
@@ -4378,10 +4378,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Vicky
+        .party = {.NoItemCustomMoves = gTrainerParty_Vicky }
     },
 
-    [OPPONENT_SHELBY_1] =
+    [TRAINER_SHELBY_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_EXPERT,
@@ -4392,10 +4392,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Shelby1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Shelby1 }
     },
 
-    [OPPONENT_SHELBY_2] =
+    [TRAINER_SHELBY_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_EXPERT,
@@ -4406,10 +4406,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Shelby2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Shelby2 }
     },
 
-    [OPPONENT_SHELBY_3] =
+    [TRAINER_SHELBY_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_EXPERT,
@@ -4420,10 +4420,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Shelby3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Shelby3 }
     },
 
-    [OPPONENT_SHELBY_4] =
+    [TRAINER_SHELBY_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_EXPERT,
@@ -4434,10 +4434,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Shelby4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Shelby4 }
     },
 
-    [OPPONENT_SHELBY_5] =
+    [TRAINER_SHELBY_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_EXPERT,
@@ -4448,10 +4448,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Shelby5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Shelby5 }
     },
 
-    [OPPONENT_CALVIN_1] =
+    [TRAINER_CALVIN_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4462,10 +4462,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Calvin1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Calvin1 }
     },
 
-    [OPPONENT_BILLY] =
+    [TRAINER_BILLY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4476,10 +4476,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Billy
+        .party = {.NoItemDefaultMoves = gTrainerParty_Billy }
     },
 
-    [OPPONENT_JOSH] =
+    [TRAINER_JOSH] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4490,10 +4490,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Josh
+        .party = {.NoItemCustomMoves = gTrainerParty_Josh }
     },
 
-    [OPPONENT_TOMMY] =
+    [TRAINER_TOMMY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4504,10 +4504,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Tommy
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tommy }
     },
 
-    [OPPONENT_JOEY] =
+    [TRAINER_JOEY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4518,10 +4518,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Joey
+        .party = {.NoItemDefaultMoves = gTrainerParty_Joey }
     },
 
-    [OPPONENT_BEN] =
+    [TRAINER_BEN] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4532,10 +4532,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Ben
+        .party = {.NoItemCustomMoves = gTrainerParty_Ben }
     },
 
-    [OPPONENT_ANONYMOUS_5] =
+    [TRAINER_ANONYMOUS_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4546,10 +4546,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Anonymous5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous5 }
     },
 
-    [OPPONENT_KEVIN] =
+    [TRAINER_KEVIN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4560,10 +4560,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Kevin
+        .party = {.NoItemDefaultMoves = gTrainerParty_Kevin }
     },
 
-    [OPPONENT_NEAL] =
+    [TRAINER_NEAL] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4574,10 +4574,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Neal
+        .party = {.NoItemDefaultMoves = gTrainerParty_Neal }
     },
 
-    [OPPONENT_DILLON] =
+    [TRAINER_DILLON] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4588,10 +4588,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Dillon
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dillon }
     },
 
-    [OPPONENT_CALVIN_2] =
+    [TRAINER_CALVIN_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4602,10 +4602,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Calvin2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Calvin2 }
     },
 
-    [OPPONENT_CALVIN_3] =
+    [TRAINER_CALVIN_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4616,10 +4616,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Calvin3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Calvin3 }
     },
 
-    [OPPONENT_CALVIN_4] =
+    [TRAINER_CALVIN_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4630,10 +4630,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Calvin4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Calvin4 }
     },
 
-    [OPPONENT_CALVIN_5] =
+    [TRAINER_CALVIN_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4644,10 +4644,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Calvin5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Calvin5 }
     },
 
-    [OPPONENT_EDDIE] =
+    [TRAINER_EDDIE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4658,10 +4658,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Eddie
+        .party = {.NoItemDefaultMoves = gTrainerParty_Eddie }
     },
 
-    [OPPONENT_ALLEN] =
+    [TRAINER_ALLEN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4672,10 +4672,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Allen
+        .party = {.NoItemDefaultMoves = gTrainerParty_Allen }
     },
 
-    [OPPONENT_TIMMY] =
+    [TRAINER_TIMMY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4686,10 +4686,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Timmy
+        .party = {.NoItemDefaultMoves = gTrainerParty_Timmy }
     },
 
-    [OPPONENT_STEVEN] =
+    [TRAINER_STEVEN] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_CHAMPION,
@@ -4700,10 +4700,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 6,
-        .party = gTrainerParty_Steven
+        .party = {.ItemCustomMoves = gTrainerParty_Steven }
     },
 
-    [OPPONENT_ANDREW] =
+    [TRAINER_ANDREW] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4714,10 +4714,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Andrew
+        .party = {.NoItemDefaultMoves = gTrainerParty_Andrew }
     },
 
-    [OPPONENT_IVAN] =
+    [TRAINER_IVAN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4728,10 +4728,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Ivan
+        .party = {.NoItemDefaultMoves = gTrainerParty_Ivan }
     },
 
-    [OPPONENT_CLAUDE] =
+    [TRAINER_CLAUDE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4742,10 +4742,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Claude
+        .party = {.NoItemDefaultMoves = gTrainerParty_Claude }
     },
 
-    [OPPONENT_ELLIOT_1] =
+    [TRAINER_ELLIOT_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4756,10 +4756,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Elliot1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Elliot1 }
     },
 
-    [OPPONENT_NED] =
+    [TRAINER_NED] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4770,10 +4770,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Ned
+        .party = {.NoItemDefaultMoves = gTrainerParty_Ned }
     },
 
-    [OPPONENT_DALE] =
+    [TRAINER_DALE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4784,10 +4784,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Dale
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dale }
     },
 
-    [OPPONENT_NOLAN] =
+    [TRAINER_NOLAN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4798,10 +4798,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Nolan
+        .party = {.NoItemDefaultMoves = gTrainerParty_Nolan }
     },
 
-    [OPPONENT_BARNY] =
+    [TRAINER_BARNY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4812,10 +4812,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Barny
+        .party = {.NoItemDefaultMoves = gTrainerParty_Barny }
     },
 
-    [OPPONENT_WADE] =
+    [TRAINER_WADE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4826,10 +4826,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Wade
+        .party = {.NoItemDefaultMoves = gTrainerParty_Wade }
     },
 
-    [OPPONENT_CARTER] =
+    [TRAINER_CARTER] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4840,10 +4840,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Carter
+        .party = {.NoItemDefaultMoves = gTrainerParty_Carter }
     },
 
-    [OPPONENT_ELLIOT_2] =
+    [TRAINER_ELLIOT_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4854,10 +4854,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Elliot2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Elliot2 }
     },
 
-    [OPPONENT_ELLIOT_3] =
+    [TRAINER_ELLIOT_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4868,10 +4868,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Elliot3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Elliot3 }
     },
 
-    [OPPONENT_ELLIOT_4] =
+    [TRAINER_ELLIOT_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4882,10 +4882,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Elliot4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Elliot4 }
     },
 
-    [OPPONENT_ELLIOT_5] =
+    [TRAINER_ELLIOT_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4896,10 +4896,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x3,
         .partySize = 4,
-        .party = gTrainerParty_Elliot5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Elliot5 }
     },
 
-    [OPPONENT_RONALD] =
+    [TRAINER_RONALD] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4910,10 +4910,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 6,
-        .party = gTrainerParty_Ronald
+        .party = {.NoItemDefaultMoves = gTrainerParty_Ronald }
     },
 
-    [OPPONENT_JACOB] =
+    [TRAINER_JACOB] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -4924,10 +4924,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Jacob
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jacob }
     },
 
-    [OPPONENT_ANTHONY] =
+    [TRAINER_ANTHONY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -4938,10 +4938,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Anthony
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anthony }
     },
 
-    [OPPONENT_BENJAMIN_1] =
+    [TRAINER_BENJAMIN_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -4952,10 +4952,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Benjamin1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Benjamin1 }
     },
 
-    [OPPONENT_BENJAMIN_2] =
+    [TRAINER_BENJAMIN_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -4966,10 +4966,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Benjamin2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Benjamin2 }
     },
 
-    [OPPONENT_BENJAMIN_3] =
+    [TRAINER_BENJAMIN_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -4980,10 +4980,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Benjamin3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Benjamin3 }
     },
 
-    [OPPONENT_BENJAMIN_4] =
+    [TRAINER_BENJAMIN_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -4994,10 +4994,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Benjamin4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Benjamin4 }
     },
 
-    [OPPONENT_BENJAMIN_5] =
+    [TRAINER_BENJAMIN_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5008,10 +5008,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Benjamin5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Benjamin5 }
     },
 
-    [OPPONENT_ABIGAIL_1] =
+    [TRAINER_ABIGAIL_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5022,10 +5022,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Abigail1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Abigail1 }
     },
 
-    [OPPONENT_JASMINE] =
+    [TRAINER_JASMINE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5036,10 +5036,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Jasmine
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jasmine }
     },
 
-    [OPPONENT_ABIGAIL_2] =
+    [TRAINER_ABIGAIL_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5050,10 +5050,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Abigail2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Abigail2 }
     },
 
-    [OPPONENT_ABIGAIL_3] =
+    [TRAINER_ABIGAIL_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5064,10 +5064,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Abigail3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Abigail3 }
     },
 
-    [OPPONENT_ABIGAIL_4] =
+    [TRAINER_ABIGAIL_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5078,10 +5078,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Abigail4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Abigail4 }
     },
 
-    [OPPONENT_ABIGAIL_5] =
+    [TRAINER_ABIGAIL_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5092,10 +5092,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Abigail5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Abigail5 }
     },
 
-    [OPPONENT_DYLAN_1] =
+    [TRAINER_DYLAN_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5106,10 +5106,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Dylan1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dylan1 }
     },
 
-    [OPPONENT_DYLAN_2] =
+    [TRAINER_DYLAN_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5120,10 +5120,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Dylan2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dylan2 }
     },
 
-    [OPPONENT_DYLAN_3] =
+    [TRAINER_DYLAN_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5134,10 +5134,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Dylan3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dylan3 }
     },
 
-    [OPPONENT_DYLAN_4] =
+    [TRAINER_DYLAN_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5148,10 +5148,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Dylan4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dylan4 }
     },
 
-    [OPPONENT_DYLAN_5] =
+    [TRAINER_DYLAN_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5162,10 +5162,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Dylan5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dylan5 }
     },
 
-    [OPPONENT_MARIA_1] =
+    [TRAINER_MARIA_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5176,10 +5176,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Maria1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Maria1 }
     },
 
-    [OPPONENT_MARIA_2] =
+    [TRAINER_MARIA_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5190,10 +5190,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Maria2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Maria2 }
     },
 
-    [OPPONENT_MARIA_3] =
+    [TRAINER_MARIA_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5204,10 +5204,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Maria3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Maria3 }
     },
 
-    [OPPONENT_MARIA_4] =
+    [TRAINER_MARIA_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5218,10 +5218,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Maria4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Maria4 }
     },
 
-    [OPPONENT_MARIA_5] =
+    [TRAINER_MARIA_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5232,10 +5232,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Maria5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Maria5 }
     },
 
-    [OPPONENT_CALEB] =
+    [TRAINER_CALEB] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5246,10 +5246,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Caleb
+        .party = {.NoItemDefaultMoves = gTrainerParty_Caleb }
     },
 
-    [OPPONENT_ANONYMOUS_6] =
+    [TRAINER_ANONYMOUS_6] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5260,10 +5260,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Anonymous6
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous6 }
     },
 
-    [OPPONENT_ISAIAH_1] =
+    [TRAINER_ISAIAH_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5274,10 +5274,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Isaiah1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Isaiah1 }
     },
 
-    [OPPONENT_ANONYMOUS_7] =
+    [TRAINER_ANONYMOUS_7] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5288,10 +5288,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Anonymous7
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous7 }
     },
 
-    [OPPONENT_CHASE] =
+    [TRAINER_CHASE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5302,10 +5302,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Chase
+        .party = {.NoItemDefaultMoves = gTrainerParty_Chase }
     },
 
-    [OPPONENT_ISAIAH_2] =
+    [TRAINER_ISAIAH_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5316,10 +5316,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Isaiah2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Isaiah2 }
     },
 
-    [OPPONENT_ISAIAH_3] =
+    [TRAINER_ISAIAH_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5330,10 +5330,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Isaiah3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Isaiah3 }
     },
 
-    [OPPONENT_ISAIAH_4] =
+    [TRAINER_ISAIAH_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5344,10 +5344,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Isaiah4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Isaiah4 }
     },
 
-    [OPPONENT_ISAIAH_5] =
+    [TRAINER_ISAIAH_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5358,10 +5358,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Isaiah5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Isaiah5 }
     },
 
-    [OPPONENT_ANONYMOUS_8] =
+    [TRAINER_ANONYMOUS_8] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5372,10 +5372,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Anonymous8
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous8 }
     },
 
-    [OPPONENT_CONNOR] =
+    [TRAINER_CONNOR] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5386,10 +5386,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Connor
+        .party = {.NoItemDefaultMoves = gTrainerParty_Connor }
     },
 
-    [OPPONENT_ANONYMOUS_9] =
+    [TRAINER_ANONYMOUS_9] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5400,10 +5400,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Anonymous9
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous9 }
     },
 
-    [OPPONENT_KATELYN_1] =
+    [TRAINER_KATELYN_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5414,10 +5414,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Katelyn1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Katelyn1 }
     },
 
-    [OPPONENT_ALLISON] =
+    [TRAINER_ALLISON] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5428,10 +5428,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Allison
+        .party = {.NoItemDefaultMoves = gTrainerParty_Allison }
     },
 
-    [OPPONENT_KATELYN_2] =
+    [TRAINER_KATELYN_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5442,10 +5442,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Katelyn2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Katelyn2 }
     },
 
-    [OPPONENT_KATELYN_3] =
+    [TRAINER_KATELYN_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5456,10 +5456,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Katelyn3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Katelyn3 }
     },
 
-    [OPPONENT_KATELYN_4] =
+    [TRAINER_KATELYN_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5470,10 +5470,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Katelyn4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Katelyn4 }
     },
 
-    [OPPONENT_KATELYN_5] =
+    [TRAINER_KATELYN_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5484,10 +5484,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Katelyn5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Katelyn5 }
     },
 
-    [OPPONENT_NICOLAS_1] =
+    [TRAINER_NICOLAS_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_DRAGON_TAMER,
@@ -5498,10 +5498,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Nicolas1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Nicolas1 }
     },
 
-    [OPPONENT_NICOLAS_2] =
+    [TRAINER_NICOLAS_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_DRAGON_TAMER,
@@ -5512,10 +5512,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Nicolas2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Nicolas2 }
     },
 
-    [OPPONENT_NICOLAS_3] =
+    [TRAINER_NICOLAS_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_DRAGON_TAMER,
@@ -5526,10 +5526,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Nicolas3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Nicolas3 }
     },
 
-    [OPPONENT_NICOLAS_4] =
+    [TRAINER_NICOLAS_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_DRAGON_TAMER,
@@ -5540,10 +5540,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Nicolas4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Nicolas4 }
     },
 
-    [OPPONENT_NICOLAS_5] =
+    [TRAINER_NICOLAS_5] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_DRAGON_TAMER,
@@ -5554,10 +5554,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Nicolas5
+        .party = {.ItemDefaultMoves = gTrainerParty_Nicolas5 }
     },
 
-    [OPPONENT_AARON] =
+    [TRAINER_AARON] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_DRAGON_TAMER,
@@ -5568,10 +5568,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Aaron
+        .party = {.NoItemDefaultMoves = gTrainerParty_Aaron }
     },
 
-    [OPPONENT_PERRY] =
+    [TRAINER_PERRY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5582,10 +5582,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Perry
+        .party = {.NoItemDefaultMoves = gTrainerParty_Perry }
     },
 
-    [OPPONENT_HUGH] =
+    [TRAINER_HUGH] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5596,10 +5596,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Hugh
+        .party = {.NoItemDefaultMoves = gTrainerParty_Hugh }
     },
 
-    [OPPONENT_PHIL] =
+    [TRAINER_PHIL] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5610,10 +5610,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Phil
+        .party = {.NoItemDefaultMoves = gTrainerParty_Phil }
     },
 
-    [OPPONENT_JARED] =
+    [TRAINER_JARED] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5624,10 +5624,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Jared
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jared }
     },
 
-    [OPPONENT_ANONYMOUS_10] =
+    [TRAINER_ANONYMOUS_10] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5638,10 +5638,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Anonymous10
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous10 }
     },
 
-    [OPPONENT_TANNER] =
+    [TRAINER_TANNER] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5652,10 +5652,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Tanner
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tanner }
     },
 
-    [OPPONENT_WILL] =
+    [TRAINER_WILL] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5666,10 +5666,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Will
+        .party = {.NoItemDefaultMoves = gTrainerParty_Will }
     },
 
-    [OPPONENT_COLIN] =
+    [TRAINER_COLIN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5680,10 +5680,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Colin
+        .party = {.NoItemDefaultMoves = gTrainerParty_Colin }
     },
 
-    [OPPONENT_ROBERT_1] =
+    [TRAINER_ROBERT_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5694,10 +5694,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Robert1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Robert1 }
     },
 
-    [OPPONENT_BENNY] =
+    [TRAINER_BENNY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5708,10 +5708,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Benny
+        .party = {.NoItemDefaultMoves = gTrainerParty_Benny }
     },
 
-    [OPPONENT_CHESTER] =
+    [TRAINER_CHESTER] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5722,10 +5722,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Chester
+        .party = {.NoItemDefaultMoves = gTrainerParty_Chester }
     },
 
-    [OPPONENT_ROBERT_2] =
+    [TRAINER_ROBERT_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5736,10 +5736,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Robert2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Robert2 }
     },
 
-    [OPPONENT_ROBERT_3] =
+    [TRAINER_ROBERT_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5750,10 +5750,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Robert3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Robert3 }
     },
 
-    [OPPONENT_ROBERT_4] =
+    [TRAINER_ROBERT_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5764,10 +5764,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Robert4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Robert4 }
     },
 
-    [OPPONENT_ROBERT_5] =
+    [TRAINER_ROBERT_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5778,10 +5778,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Robert5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Robert5 }
     },
 
-    [OPPONENT_ALEX] =
+    [TRAINER_ALEX] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5792,10 +5792,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Alex
+        .party = {.NoItemDefaultMoves = gTrainerParty_Alex }
     },
 
-    [OPPONENT_BECK] =
+    [TRAINER_BECK] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5806,10 +5806,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Beck
+        .party = {.NoItemDefaultMoves = gTrainerParty_Beck }
     },
 
-    [OPPONENT_YASU] =
+    [TRAINER_YASU] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -5820,10 +5820,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x3,
         .partySize = 1,
-        .party = gTrainerParty_Yasu
+        .party = {.NoItemDefaultMoves = gTrainerParty_Yasu }
     },
 
-    [OPPONENT_TAKASHI] =
+    [TRAINER_TAKASHI] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -5834,10 +5834,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x3,
         .partySize = 3,
-        .party = gTrainerParty_Takashi
+        .party = {.NoItemDefaultMoves = gTrainerParty_Takashi }
     },
 
-    [OPPONENT_MAKOTO] =
+    [TRAINER_MAKOTO] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -5848,10 +5848,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x0,
         .partySize = 1,
-        .party = gTrainerParty_Makoto
+        .party = {.NoItemDefaultMoves = gTrainerParty_Makoto }
     },
 
-    [OPPONENT_HIDEO_1] =
+    [TRAINER_HIDEO_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -5862,10 +5862,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x0,
         .partySize = 4,
-        .party = gTrainerParty_Hideo1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Hideo1 }
     },
 
-    [OPPONENT_LAO_1] =
+    [TRAINER_LAO_1] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -5876,10 +5876,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x0,
         .partySize = 4,
-        .party = gTrainerParty_Lao1
+        .party = {.NoItemCustomMoves = gTrainerParty_Lao1 }
     },
 
-    [OPPONENT_LUNG] =
+    [TRAINER_LUNG] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -5890,10 +5890,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x0,
         .partySize = 2,
-        .party = gTrainerParty_Lung
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lung }
     },
 
-    [OPPONENT_LAO_2] =
+    [TRAINER_LAO_2] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -5904,10 +5904,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x0,
         .partySize = 4,
-        .party = gTrainerParty_Lao2
+        .party = {.NoItemCustomMoves = gTrainerParty_Lao2 }
     },
 
-    [OPPONENT_LAO_3] =
+    [TRAINER_LAO_3] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -5918,10 +5918,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x0,
         .partySize = 4,
-        .party = gTrainerParty_Lao3
+        .party = {.NoItemCustomMoves = gTrainerParty_Lao3 }
     },
 
-    [OPPONENT_LAO_4] =
+    [TRAINER_LAO_4] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -5932,10 +5932,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x0,
         .partySize = 4,
-        .party = gTrainerParty_Lao4
+        .party = {.NoItemCustomMoves = gTrainerParty_Lao4 }
     },
 
-    [OPPONENT_LAO_5] =
+    [TRAINER_LAO_5] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -5946,10 +5946,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x0,
         .partySize = 4,
-        .party = gTrainerParty_Lao5
+        .party = {.ItemCustomMoves = gTrainerParty_Lao5 }
     },
 
-    [OPPONENT_TESSA] =
+    [TRAINER_TESSA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -5960,10 +5960,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Tessa
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tessa }
     },
 
-    [OPPONENT_LAURA] =
+    [TRAINER_LAURA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -5974,10 +5974,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Laura
+        .party = {.NoItemDefaultMoves = gTrainerParty_Laura }
     },
 
-    [OPPONENT_CYNDY_1] =
+    [TRAINER_CYNDY_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -5988,10 +5988,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Cyndy1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Cyndy1 }
     },
 
-    [OPPONENT_CORA] =
+    [TRAINER_CORA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -6002,10 +6002,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Cora
+        .party = {.NoItemDefaultMoves = gTrainerParty_Cora }
     },
 
-    [OPPONENT_JILL] =
+    [TRAINER_JILL] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -6016,10 +6016,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Jill
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jill }
     },
 
-    [OPPONENT_CYNDY_2] =
+    [TRAINER_CYNDY_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -6030,10 +6030,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Cyndy2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Cyndy2 }
     },
 
-    [OPPONENT_CYNDY_3] =
+    [TRAINER_CYNDY_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -6044,10 +6044,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Cyndy3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Cyndy3 }
     },
 
-    [OPPONENT_CYNDY_4] =
+    [TRAINER_CYNDY_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -6058,10 +6058,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Cyndy4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Cyndy4 }
     },
 
-    [OPPONENT_CYNDY_5] =
+    [TRAINER_CYNDY_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -6072,10 +6072,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Cyndy5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Cyndy5 }
     },
 
-    [OPPONENT_MADELINE_1] =
+    [TRAINER_MADELINE_1] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_PARASOL_LADY,
@@ -6086,10 +6086,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Madeline1
+        .party = {.NoItemCustomMoves = gTrainerParty_Madeline1 }
     },
 
-    [OPPONENT_CLARISSA] =
+    [TRAINER_CLARISSA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PARASOL_LADY,
@@ -6100,10 +6100,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Clarissa
+        .party = {.NoItemDefaultMoves = gTrainerParty_Clarissa }
     },
 
-    [OPPONENT_ANGELICA] =
+    [TRAINER_ANGELICA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PARASOL_LADY,
@@ -6114,10 +6114,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Angelica
+        .party = {.NoItemDefaultMoves = gTrainerParty_Angelica }
     },
 
-    [OPPONENT_MADELINE_2] =
+    [TRAINER_MADELINE_2] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_PARASOL_LADY,
@@ -6128,10 +6128,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Madeline2
+        .party = {.NoItemCustomMoves = gTrainerParty_Madeline2 }
     },
 
-    [OPPONENT_MADELINE_3] =
+    [TRAINER_MADELINE_3] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_PARASOL_LADY,
@@ -6142,10 +6142,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Madeline3
+        .party = {.NoItemCustomMoves = gTrainerParty_Madeline3 }
     },
 
-    [OPPONENT_MADELINE_4] =
+    [TRAINER_MADELINE_4] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_PARASOL_LADY,
@@ -6156,10 +6156,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Madeline4
+        .party = {.NoItemCustomMoves = gTrainerParty_Madeline4 }
     },
 
-    [OPPONENT_MADELINE_5] =
+    [TRAINER_MADELINE_5] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_PARASOL_LADY,
@@ -6170,10 +6170,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Madeline5
+        .party = {.NoItemCustomMoves = gTrainerParty_Madeline5 }
     },
 
-    [OPPONENT_BEVERLY] =
+    [TRAINER_BEVERLY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6184,10 +6184,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Beverly
+        .party = {.NoItemDefaultMoves = gTrainerParty_Beverly }
     },
 
-    [OPPONENT_DAWN] =
+    [TRAINER_DAWN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6198,10 +6198,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Dawn
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dawn }
     },
 
-    [OPPONENT_NICOLE] =
+    [TRAINER_NICOLE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6212,10 +6212,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Nicole
+        .party = {.NoItemDefaultMoves = gTrainerParty_Nicole }
     },
 
-    [OPPONENT_DENISE] =
+    [TRAINER_DENISE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6226,10 +6226,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Denise
+        .party = {.NoItemDefaultMoves = gTrainerParty_Denise }
     },
 
-    [OPPONENT_BETH] =
+    [TRAINER_BETH] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6240,10 +6240,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Beth
+        .party = {.NoItemDefaultMoves = gTrainerParty_Beth }
     },
 
-    [OPPONENT_TARA] =
+    [TRAINER_TARA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6254,10 +6254,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Tara
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tara }
     },
 
-    [OPPONENT_MISSY] =
+    [TRAINER_MISSY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6268,10 +6268,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Missy
+        .party = {.NoItemDefaultMoves = gTrainerParty_Missy }
     },
 
-    [OPPONENT_ALICE] =
+    [TRAINER_ALICE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6282,10 +6282,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Alice
+        .party = {.NoItemDefaultMoves = gTrainerParty_Alice }
     },
 
-    [OPPONENT_JENNY_1] =
+    [TRAINER_JENNY_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6296,10 +6296,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Jenny1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jenny1 }
     },
 
-    [OPPONENT_GRACE] =
+    [TRAINER_GRACE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6310,10 +6310,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Grace
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grace }
     },
 
-    [OPPONENT_TANYA] =
+    [TRAINER_TANYA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6324,10 +6324,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Tanya
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tanya }
     },
 
-    [OPPONENT_SHARON] =
+    [TRAINER_SHARON] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6338,10 +6338,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Sharon
+        .party = {.NoItemDefaultMoves = gTrainerParty_Sharon }
     },
 
-    [OPPONENT_NIKKI] =
+    [TRAINER_NIKKI] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6352,10 +6352,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Nikki
+        .party = {.NoItemDefaultMoves = gTrainerParty_Nikki }
     },
 
-    [OPPONENT_BRENDA] =
+    [TRAINER_BRENDA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6366,10 +6366,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Brenda
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brenda }
     },
 
-    [OPPONENT_KATIE] =
+    [TRAINER_KATIE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6380,10 +6380,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Katie
+        .party = {.NoItemDefaultMoves = gTrainerParty_Katie }
     },
 
-    [OPPONENT_SUSIE] =
+    [TRAINER_SUSIE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6394,10 +6394,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Susie
+        .party = {.NoItemDefaultMoves = gTrainerParty_Susie }
     },
 
-    [OPPONENT_KARA] =
+    [TRAINER_KARA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6408,10 +6408,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Kara
+        .party = {.NoItemDefaultMoves = gTrainerParty_Kara }
     },
 
-    [OPPONENT_DANA] =
+    [TRAINER_DANA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6422,10 +6422,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Dana
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dana }
     },
 
-    [OPPONENT_ERIN] =
+    [TRAINER_ERIN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6436,10 +6436,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Erin
+        .party = {.NoItemDefaultMoves = gTrainerParty_Erin }
     },
 
-    [OPPONENT_DEBRA] =
+    [TRAINER_DEBRA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6450,10 +6450,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Debra
+        .party = {.NoItemDefaultMoves = gTrainerParty_Debra }
     },
 
-    [OPPONENT_LINDA] =
+    [TRAINER_LINDA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6464,10 +6464,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Linda
+        .party = {.NoItemDefaultMoves = gTrainerParty_Linda }
     },
 
-    [OPPONENT_KAYLEE] =
+    [TRAINER_KAYLEE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6478,10 +6478,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Kaylee
+        .party = {.NoItemDefaultMoves = gTrainerParty_Kaylee }
     },
 
-    [OPPONENT_LAUREL] =
+    [TRAINER_LAUREL] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6492,10 +6492,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Laurel
+        .party = {.NoItemDefaultMoves = gTrainerParty_Laurel }
     },
 
-    [OPPONENT_DARCY] =
+    [TRAINER_DARCY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6506,10 +6506,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Darcy
+        .party = {.NoItemDefaultMoves = gTrainerParty_Darcy }
     },
 
-    [OPPONENT_JENNY_2] =
+    [TRAINER_JENNY_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6520,10 +6520,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Jenny2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jenny2 }
     },
 
-    [OPPONENT_JENNY_3] =
+    [TRAINER_JENNY_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6534,10 +6534,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Jenny3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jenny3 }
     },
 
-    [OPPONENT_JENNY_4] =
+    [TRAINER_JENNY_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6548,10 +6548,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jenny4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jenny4 }
     },
 
-    [OPPONENT_JENNY_5] =
+    [TRAINER_JENNY_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6562,10 +6562,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Jenny5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jenny5 }
     },
 
-    [OPPONENT_HEIDI] =
+    [TRAINER_HEIDI] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6576,10 +6576,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Heidi
+        .party = {.NoItemCustomMoves = gTrainerParty_Heidi }
     },
 
-    [OPPONENT_BECKY] =
+    [TRAINER_BECKY] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6590,10 +6590,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Becky
+        .party = {.NoItemCustomMoves = gTrainerParty_Becky }
     },
 
-    [OPPONENT_CAROL] =
+    [TRAINER_CAROL] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6604,10 +6604,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Carol
+        .party = {.NoItemDefaultMoves = gTrainerParty_Carol }
     },
 
-    [OPPONENT_NANCY] =
+    [TRAINER_NANCY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6618,10 +6618,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Nancy
+        .party = {.NoItemDefaultMoves = gTrainerParty_Nancy }
     },
 
-    [OPPONENT_MARTHA] =
+    [TRAINER_MARTHA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6632,10 +6632,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Martha
+        .party = {.NoItemDefaultMoves = gTrainerParty_Martha }
     },
 
-    [OPPONENT_DIANA_1] =
+    [TRAINER_DIANA_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6646,10 +6646,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Diana1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Diana1 }
     },
 
-    [OPPONENT_NINA] =
+    [TRAINER_NINA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6660,10 +6660,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Nina
+        .party = {.NoItemDefaultMoves = gTrainerParty_Nina }
     },
 
-    [OPPONENT_IRENE] =
+    [TRAINER_IRENE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6674,10 +6674,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Irene
+        .party = {.NoItemDefaultMoves = gTrainerParty_Irene }
     },
 
-    [OPPONENT_DIANA_2] =
+    [TRAINER_DIANA_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6688,10 +6688,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Diana2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Diana2 }
     },
 
-    [OPPONENT_DIANA_3] =
+    [TRAINER_DIANA_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6702,10 +6702,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Diana3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Diana3 }
     },
 
-    [OPPONENT_DIANA_4] =
+    [TRAINER_DIANA_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6716,10 +6716,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Diana4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Diana4 }
     },
 
-    [OPPONENT_DIANA_5] =
+    [TRAINER_DIANA_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6730,10 +6730,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Diana5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Diana5 }
     },
 
-    [OPPONENT_AMY_AND_LIV_1] =
+    [TRAINER_AMY_AND_LIV_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TWINS,
@@ -6744,10 +6744,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_AmyAndLiv1
+        .party = {.NoItemDefaultMoves = gTrainerParty_AmyAndLiv1 }
     },
 
-    [OPPONENT_AMY_AND_LIV_2] =
+    [TRAINER_AMY_AND_LIV_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TWINS,
@@ -6758,10 +6758,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_AmyAndLiv2
+        .party = {.NoItemDefaultMoves = gTrainerParty_AmyAndLiv2 }
     },
 
-    [OPPONENT_GINA_AND_MIA_1] =
+    [TRAINER_GINA_AND_MIA_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TWINS,
@@ -6772,10 +6772,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_GinaAndMia1
+        .party = {.NoItemDefaultMoves = gTrainerParty_GinaAndMia1 }
     },
 
-    [OPPONENT_MIU_AND_YUKI] =
+    [TRAINER_MIU_AND_YUKI] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TWINS,
@@ -6786,10 +6786,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_MiuAndYuki
+        .party = {.NoItemDefaultMoves = gTrainerParty_MiuAndYuki }
     },
 
-    [OPPONENT_AMY_AND_LIV_3] =
+    [TRAINER_AMY_AND_LIV_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TWINS,
@@ -6800,10 +6800,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_AmyAndLiv3
+        .party = {.NoItemDefaultMoves = gTrainerParty_AmyAndLiv3 }
     },
 
-    [OPPONENT_GINA_AND_MIA_2] =
+    [TRAINER_GINA_AND_MIA_2] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_TWINS,
@@ -6814,10 +6814,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_GinaAndMia2
+        .party = {.NoItemCustomMoves = gTrainerParty_GinaAndMia2 }
     },
 
-    [OPPONENT_AMY_AND_LIV_4] =
+    [TRAINER_AMY_AND_LIV_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TWINS,
@@ -6828,10 +6828,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_AmyAndLiv4
+        .party = {.NoItemDefaultMoves = gTrainerParty_AmyAndLiv4 }
     },
 
-    [OPPONENT_AMY_AND_LIV_5] =
+    [TRAINER_AMY_AND_LIV_5] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_TWINS,
@@ -6842,10 +6842,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_AmyAndLiv5
+        .party = {.NoItemCustomMoves = gTrainerParty_AmyAndLiv5 }
     },
 
-    [OPPONENT_AMY_AND_LIV_6] =
+    [TRAINER_AMY_AND_LIV_6] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_TWINS,
@@ -6856,10 +6856,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_AmyAndLiv6
+        .party = {.NoItemCustomMoves = gTrainerParty_AmyAndLiv6 }
     },
 
-    [OPPONENT_HUEY] =
+    [TRAINER_HUEY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SAILOR,
@@ -6870,10 +6870,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Huey
+        .party = {.NoItemDefaultMoves = gTrainerParty_Huey }
     },
 
-    [OPPONENT_EDMOND] =
+    [TRAINER_EDMOND] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SAILOR,
@@ -6884,10 +6884,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Edmond
+        .party = {.NoItemDefaultMoves = gTrainerParty_Edmond }
     },
 
-    [OPPONENT_ERNEST_1] =
+    [TRAINER_ERNEST_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SAILOR,
@@ -6898,10 +6898,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Ernest1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Ernest1 }
     },
 
-    [OPPONENT_DWAYNE] =
+    [TRAINER_DWAYNE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SAILOR,
@@ -6912,10 +6912,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Dwayne
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dwayne }
     },
 
-    [OPPONENT_PHILLIP] =
+    [TRAINER_PHILLIP] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SAILOR,
@@ -6926,10 +6926,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Phillip
+        .party = {.NoItemDefaultMoves = gTrainerParty_Phillip }
     },
 
-    [OPPONENT_LEONARD] =
+    [TRAINER_LEONARD] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SAILOR,
@@ -6940,10 +6940,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Leonard
+        .party = {.NoItemDefaultMoves = gTrainerParty_Leonard }
     },
 
-    [OPPONENT_DUNCAN] =
+    [TRAINER_DUNCAN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SAILOR,
@@ -6954,10 +6954,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Duncan
+        .party = {.NoItemDefaultMoves = gTrainerParty_Duncan }
     },
 
-    [OPPONENT_ERNEST_2] =
+    [TRAINER_ERNEST_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SAILOR,
@@ -6968,10 +6968,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Ernest2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Ernest2 }
     },
 
-    [OPPONENT_ERNEST_3] =
+    [TRAINER_ERNEST_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SAILOR,
@@ -6982,10 +6982,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Ernest3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Ernest3 }
     },
 
-    [OPPONENT_ERNEST_4] =
+    [TRAINER_ERNEST_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SAILOR,
@@ -6996,10 +6996,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Ernest4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Ernest4 }
     },
 
-    [OPPONENT_ERNEST_5] =
+    [TRAINER_ERNEST_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SAILOR,
@@ -7010,10 +7010,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Ernest5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Ernest5 }
     },
 
-    [OPPONENT_ANONYMOUS_11] =
+    [TRAINER_ANONYMOUS_11] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BOARDER,
@@ -7024,10 +7024,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Anonymous11
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous11 }
     },
 
-    [OPPONENT_ANONYMOUS_12] =
+    [TRAINER_ANONYMOUS_12] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BOARDER,
@@ -7038,10 +7038,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Anonymous12
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous12 }
     },
 
-    [OPPONENT_ANONYMOUS_13] =
+    [TRAINER_ANONYMOUS_13] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BOARDER,
@@ -7052,10 +7052,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Anonymous13
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous13 }
     },
 
-    [OPPONENT_SONNY] =
+    [TRAINER_SONNY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BOARDER,
@@ -7066,10 +7066,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Sonny
+        .party = {.NoItemDefaultMoves = gTrainerParty_Sonny }
     },
 
-    [OPPONENT_DONOVAN] =
+    [TRAINER_DONOVAN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BOARDER,
@@ -7080,10 +7080,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Donovan
+        .party = {.NoItemDefaultMoves = gTrainerParty_Donovan }
     },
 
-    [OPPONENT_GERALD] =
+    [TRAINER_GERALD] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BOARDER,
@@ -7094,10 +7094,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Gerald
+        .party = {.NoItemDefaultMoves = gTrainerParty_Gerald }
     },
 
-    [OPPONENT_KELVIN] =
+    [TRAINER_KELVIN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BOARDER,
@@ -7108,10 +7108,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Kelvin
+        .party = {.NoItemDefaultMoves = gTrainerParty_Kelvin }
     },
 
-    [OPPONENT_KODY] =
+    [TRAINER_KODY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BOARDER,
@@ -7122,10 +7122,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Kody
+        .party = {.NoItemDefaultMoves = gTrainerParty_Kody }
     },
 
-    [OPPONENT_TEVIN] =
+    [TRAINER_TEVIN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BOARDER,
@@ -7136,10 +7136,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Tevin
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tevin }
     },
 
-    [OPPONENT_DAMON] =
+    [TRAINER_DAMON] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BOARDER,
@@ -7150,10 +7150,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Damon
+        .party = {.NoItemDefaultMoves = gTrainerParty_Damon }
     },
 
-    [OPPONENT_PABLO] =
+    [TRAINER_PABLO] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BOARDER,
@@ -7164,10 +7164,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Pablo
+        .party = {.NoItemDefaultMoves = gTrainerParty_Pablo }
     },
 
-    [OPPONENT_EDWIN_1] =
+    [TRAINER_EDWIN_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COLLECTOR,
@@ -7178,10 +7178,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Edwin1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Edwin1 }
     },
 
-    [OPPONENT_HECTOR_1] =
+    [TRAINER_HECTOR_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COLLECTOR,
@@ -7192,10 +7192,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Hector1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Hector1 }
     },
 
-    [OPPONENT_HECTOR_2] =
+    [TRAINER_HECTOR_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COLLECTOR,
@@ -7206,10 +7206,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Hector2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Hector2 }
     },
 
-    [OPPONENT_EDWIN_2] =
+    [TRAINER_EDWIN_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COLLECTOR,
@@ -7220,10 +7220,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Edwin2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Edwin2 }
     },
 
-    [OPPONENT_EDWIN_3] =
+    [TRAINER_EDWIN_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COLLECTOR,
@@ -7234,10 +7234,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Edwin3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Edwin3 }
     },
 
-    [OPPONENT_EDWIN_4] =
+    [TRAINER_EDWIN_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COLLECTOR,
@@ -7248,10 +7248,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Edwin4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Edwin4 }
     },
 
-    [OPPONENT_EDWIN_5] =
+    [TRAINER_EDWIN_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COLLECTOR,
@@ -7262,10 +7262,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Edwin5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Edwin5 }
     },
 
-    [OPPONENT_WALLY_1] =
+    [TRAINER_WALLY_1] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7276,10 +7276,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 5,
-        .party = gTrainerParty_Wally1
+        .party = {.NoItemCustomMoves = gTrainerParty_Wally1 }
     },
 
-    [OPPONENT_BRENDAN_1] =
+    [TRAINER_BRENDAN_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7290,10 +7290,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Brendan1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan1 }
     },
 
-    [OPPONENT_BRENDAN_2] =
+    [TRAINER_BRENDAN_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7304,10 +7304,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Brendan2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan2 }
     },
 
-    [OPPONENT_BRENDAN_3] =
+    [TRAINER_BRENDAN_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7318,10 +7318,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Brendan3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan3 }
     },
 
-    [OPPONENT_BRENDAN_4] =
+    [TRAINER_BRENDAN_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7332,10 +7332,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0xb,
         .partySize = 1,
-        .party = gTrainerParty_Brendan4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan4 }
     },
 
-    [OPPONENT_BRENDAN_5] =
+    [TRAINER_BRENDAN_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7346,10 +7346,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Brendan5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan5 }
     },
 
-    [OPPONENT_BRENDAN_6] =
+    [TRAINER_BRENDAN_6] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7360,10 +7360,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Brendan6
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan6 }
     },
 
-    [OPPONENT_BRENDAN_7] =
+    [TRAINER_BRENDAN_7] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7374,10 +7374,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Brendan7
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan7 }
     },
 
-    [OPPONENT_BRENDAN_8] =
+    [TRAINER_BRENDAN_8] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7388,10 +7388,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Brendan8
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan8 }
     },
 
-    [OPPONENT_BRENDAN_9] =
+    [TRAINER_BRENDAN_9] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7402,10 +7402,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Brendan9
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan9 }
     },
 
-    [OPPONENT_MAY_1] =
+    [TRAINER_MAY_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7416,10 +7416,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_May1
+        .party = {.NoItemDefaultMoves = gTrainerParty_May1 }
     },
 
-    [OPPONENT_MAY_2] =
+    [TRAINER_MAY_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7430,10 +7430,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_May2
+        .party = {.NoItemDefaultMoves = gTrainerParty_May2 }
     },
 
-    [OPPONENT_MAY_3] =
+    [TRAINER_MAY_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7444,10 +7444,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_May3
+        .party = {.NoItemDefaultMoves = gTrainerParty_May3 }
     },
 
-    [OPPONENT_MAY_4] =
+    [TRAINER_MAY_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7458,10 +7458,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_May4
+        .party = {.NoItemDefaultMoves = gTrainerParty_May4 }
     },
 
-    [OPPONENT_MAY_5] =
+    [TRAINER_MAY_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7472,10 +7472,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_May5
+        .party = {.NoItemDefaultMoves = gTrainerParty_May5 }
     },
 
-    [OPPONENT_MAY_6] =
+    [TRAINER_MAY_6] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7486,10 +7486,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_May6
+        .party = {.NoItemDefaultMoves = gTrainerParty_May6 }
     },
 
-    [OPPONENT_MAY_7] =
+    [TRAINER_MAY_7] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7500,10 +7500,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_May7
+        .party = {.NoItemDefaultMoves = gTrainerParty_May7 }
     },
 
-    [OPPONENT_MAY_8] =
+    [TRAINER_MAY_8] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7514,10 +7514,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_May8
+        .party = {.NoItemDefaultMoves = gTrainerParty_May8 }
     },
 
-    [OPPONENT_MAY_9] =
+    [TRAINER_MAY_9] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7528,10 +7528,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_May9
+        .party = {.NoItemDefaultMoves = gTrainerParty_May9 }
     },
 
-    [OPPONENT_ISAAC_1] =
+    [TRAINER_ISAAC_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7542,10 +7542,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 6,
-        .party = gTrainerParty_Isaac1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Isaac1 }
     },
 
-    [OPPONENT_RILEY] =
+    [TRAINER_RILEY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7556,10 +7556,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Riley
+        .party = {.NoItemDefaultMoves = gTrainerParty_Riley }
     },
 
-    [OPPONENT_AIDAN] =
+    [TRAINER_AIDAN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7570,10 +7570,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Aidan
+        .party = {.NoItemDefaultMoves = gTrainerParty_Aidan }
     },
 
-    [OPPONENT_ISAAC_2] =
+    [TRAINER_ISAAC_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7584,10 +7584,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 6,
-        .party = gTrainerParty_Isaac2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Isaac2 }
     },
 
-    [OPPONENT_ISAAC_3] =
+    [TRAINER_ISAAC_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7598,10 +7598,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 6,
-        .party = gTrainerParty_Isaac3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Isaac3 }
     },
 
-    [OPPONENT_ISAAC_4] =
+    [TRAINER_ISAAC_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7612,10 +7612,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 6,
-        .party = gTrainerParty_Isaac4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Isaac4 }
     },
 
-    [OPPONENT_ISAAC_5] =
+    [TRAINER_ISAAC_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7626,10 +7626,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 6,
-        .party = gTrainerParty_Isaac5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Isaac5 }
     },
 
-    [OPPONENT_LYDIA_1] =
+    [TRAINER_LYDIA_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7640,10 +7640,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 6,
-        .party = gTrainerParty_Lydia1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lydia1 }
     },
 
-    [OPPONENT_ALEXIA] =
+    [TRAINER_ALEXIA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7654,10 +7654,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Alexia
+        .party = {.NoItemDefaultMoves = gTrainerParty_Alexia }
     },
 
-    [OPPONENT_DANIELLE] =
+    [TRAINER_DANIELLE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7668,10 +7668,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Danielle
+        .party = {.NoItemDefaultMoves = gTrainerParty_Danielle }
     },
 
-    [OPPONENT_LYDIA_2] =
+    [TRAINER_LYDIA_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7682,10 +7682,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 6,
-        .party = gTrainerParty_Lydia2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lydia2 }
     },
 
-    [OPPONENT_LYDIA_3] =
+    [TRAINER_LYDIA_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7696,10 +7696,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 6,
-        .party = gTrainerParty_Lydia3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lydia3 }
     },
 
-    [OPPONENT_LYDIA_4] =
+    [TRAINER_LYDIA_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7710,10 +7710,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 6,
-        .party = gTrainerParty_Lydia4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lydia4 }
     },
 
-    [OPPONENT_LYDIA_5] =
+    [TRAINER_LYDIA_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7724,10 +7724,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 6,
-        .party = gTrainerParty_Lydia5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lydia5 }
     },
 
-    [OPPONENT_JACKSON_1] =
+    [TRAINER_JACKSON_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7738,10 +7738,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Jackson1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jackson1 }
     },
 
-    [OPPONENT_CARLOS] =
+    [TRAINER_CARLOS] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7752,10 +7752,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Carlos
+        .party = {.NoItemDefaultMoves = gTrainerParty_Carlos }
     },
 
-    [OPPONENT_SEBASTIAN] =
+    [TRAINER_SEBASTIAN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7766,10 +7766,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Sebastian
+        .party = {.NoItemDefaultMoves = gTrainerParty_Sebastian }
     },
 
-    [OPPONENT_JACKSON_2] =
+    [TRAINER_JACKSON_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7780,10 +7780,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0xb,
         .partySize = 1,
-        .party = gTrainerParty_Jackson2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jackson2 }
     },
 
-    [OPPONENT_JACKSON_3] =
+    [TRAINER_JACKSON_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7794,10 +7794,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Jackson3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jackson3 }
     },
 
-    [OPPONENT_JACKSON_4] =
+    [TRAINER_JACKSON_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7808,10 +7808,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0xb,
         .partySize = 1,
-        .party = gTrainerParty_Jackson4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jackson4 }
     },
 
-    [OPPONENT_JACKSON_5] =
+    [TRAINER_JACKSON_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7822,10 +7822,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Jackson5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jackson5 }
     },
 
-    [OPPONENT_CATHERINE_1] =
+    [TRAINER_CATHERINE_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7836,10 +7836,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0xb,
         .partySize = 2,
-        .party = gTrainerParty_Catherine1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Catherine1 }
     },
 
-    [OPPONENT_JENNA] =
+    [TRAINER_JENNA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7850,10 +7850,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0xb,
         .partySize = 3,
-        .party = gTrainerParty_Jenna
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jenna }
     },
 
-    [OPPONENT_SOPHIA] =
+    [TRAINER_SOPHIA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7864,10 +7864,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Sophia
+        .party = {.NoItemDefaultMoves = gTrainerParty_Sophia }
     },
 
-    [OPPONENT_CATHERINE_2] =
+    [TRAINER_CATHERINE_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7878,10 +7878,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0xb,
         .partySize = 2,
-        .party = gTrainerParty_Catherine2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Catherine2 }
     },
 
-    [OPPONENT_CATHERINE_3] =
+    [TRAINER_CATHERINE_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7892,10 +7892,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Catherine3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Catherine3 }
     },
 
-    [OPPONENT_CATHERINE_4] =
+    [TRAINER_CATHERINE_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7906,10 +7906,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0xb,
         .partySize = 2,
-        .party = gTrainerParty_Catherine4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Catherine4 }
     },
 
-    [OPPONENT_CATHERINE_5] =
+    [TRAINER_CATHERINE_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7920,10 +7920,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Catherine5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Catherine5 }
     },
 
-    [OPPONENT_MAXIE_1] =
+    [TRAINER_MAXIE_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_MAGMA_LEADER,
@@ -7934,10 +7934,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Maxie1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Maxie1 }
     },
 
-    [OPPONENT_GRUNT_28] =
+    [TRAINER_GRUNT_28] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -7948,10 +7948,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt28
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt28 }
     },
 
-    [OPPONENT_GRUNT_29] =
+    [TRAINER_GRUNT_29] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -7962,10 +7962,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Grunt29
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt29 }
     },
 
-    [OPPONENT_GRUNT_30] =
+    [TRAINER_GRUNT_30] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -7976,10 +7976,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt30
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt30 }
     },
 
-    [OPPONENT_GRUNT_31] =
+    [TRAINER_GRUNT_31] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -7990,10 +7990,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt31
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt31 }
     },
 
-    [OPPONENT_GRUNT_32] =
+    [TRAINER_GRUNT_32] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8004,10 +8004,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt32
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt32 }
     },
 
-    [OPPONENT_GRUNT_33] =
+    [TRAINER_GRUNT_33] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8018,10 +8018,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt33
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt33 }
     },
 
-    [OPPONENT_GRUNT_34] =
+    [TRAINER_GRUNT_34] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8032,10 +8032,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Grunt34
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt34 }
     },
 
-    [OPPONENT_GRUNT_35] =
+    [TRAINER_GRUNT_35] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8046,10 +8046,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt35
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt35 }
     },
 
-    [OPPONENT_GRUNT_36] =
+    [TRAINER_GRUNT_36] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8060,10 +8060,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt36
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt36 }
     },
 
-    [OPPONENT_GRUNT_37] =
+    [TRAINER_GRUNT_37] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8074,10 +8074,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt37
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt37 }
     },
 
-    [OPPONENT_GRUNT_38] =
+    [TRAINER_GRUNT_38] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8088,10 +8088,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt38
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt38 }
     },
 
-    [OPPONENT_GRUNT_39] =
+    [TRAINER_GRUNT_39] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8102,10 +8102,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt39
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt39 }
     },
 
-    [OPPONENT_GRUNT_40] =
+    [TRAINER_GRUNT_40] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8116,10 +8116,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt40
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt40 }
     },
 
-    [OPPONENT_GRUNT_41] =
+    [TRAINER_GRUNT_41] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8130,10 +8130,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt41
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt41 }
     },
 
-    [OPPONENT_GRUNT_42] =
+    [TRAINER_GRUNT_42] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8144,10 +8144,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt42
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt42 }
     },
 
-    [OPPONENT_GRUNT_43] =
+    [TRAINER_GRUNT_43] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8158,10 +8158,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt43
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt43 }
     },
 
-    [OPPONENT_GRUNT_44] =
+    [TRAINER_GRUNT_44] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8172,10 +8172,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt44
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt44 }
     },
 
-    [OPPONENT_GRUNT_45] =
+    [TRAINER_GRUNT_45] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8186,10 +8186,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Grunt45
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt45 }
     },
 
-    [OPPONENT_GRUNT_46] =
+    [TRAINER_GRUNT_46] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8200,10 +8200,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt46
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt46 }
     },
 
-    [OPPONENT_GRUNT_47] =
+    [TRAINER_GRUNT_47] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8214,10 +8214,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt47
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt47 }
     },
 
-    [OPPONENT_GRUNT_48] =
+    [TRAINER_GRUNT_48] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8228,10 +8228,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt48
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt48 }
     },
 
-    [OPPONENT_GRUNT_49] =
+    [TRAINER_GRUNT_49] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8242,10 +8242,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Grunt49
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt49 }
     },
 
-    [OPPONENT_GRUNT_50] =
+    [TRAINER_GRUNT_50] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8256,10 +8256,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt50
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt50 }
     },
 
-    [OPPONENT_GRUNT_51] =
+    [TRAINER_GRUNT_51] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8270,10 +8270,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt51
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt51 }
     },
 
-    [OPPONENT_GRUNT_52] =
+    [TRAINER_GRUNT_52] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8284,10 +8284,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt52
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt52 }
     },
 
-    [OPPONENT_GRUNT_53] =
+    [TRAINER_GRUNT_53] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8298,10 +8298,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Grunt53
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt53 }
     },
 
-    [OPPONENT_GRUNT_54] =
+    [TRAINER_GRUNT_54] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8312,10 +8312,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt54
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt54 }
     },
 
-    [OPPONENT_ANONYMOUS_14] =
+    [TRAINER_ANONYMOUS_14] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_MAGMA_ADMIN,
@@ -8326,10 +8326,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Anonymous14
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous14 }
     },
 
-    [OPPONENT_ANONYMOUS_15] =
+    [TRAINER_ANONYMOUS_15] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_MAGMA_ADMIN,
@@ -8340,10 +8340,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Anonymous15
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous15 }
     },
 
-    [OPPONENT_TABITHA_1] =
+    [TRAINER_TABITHA_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_MAGMA_ADMIN,
@@ -8354,10 +8354,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0xb,
         .partySize = 3,
-        .party = gTrainerParty_Tabitha1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tabitha1 }
     },
 
-    [OPPONENT_TABITHA_2] =
+    [TRAINER_TABITHA_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_MAGMA_ADMIN,
@@ -8368,10 +8368,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Tabitha2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tabitha2 }
     },
 
-    [OPPONENT_ANONYMOUS_16] =
+    [TRAINER_ANONYMOUS_16] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_MAGMA_ADMIN,
@@ -8382,10 +8382,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0xb,
         .partySize = 2,
-        .party = gTrainerParty_Anonymous16
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous16 }
     },
 
-    [OPPONENT_COURTNEY_1] =
+    [TRAINER_COURTNEY_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_MAGMA_ADMIN,
@@ -8396,10 +8396,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Courtney1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Courtney1 }
     },
 
-    [OPPONENT_COURTNEY_2] =
+    [TRAINER_COURTNEY_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_MAGMA_ADMIN,
@@ -8410,10 +8410,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0xb,
         .partySize = 2,
-        .party = gTrainerParty_Courtney2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Courtney2 }
     },
 
-    [OPPONENT_MAXIE_2] =
+    [TRAINER_MAXIE_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_MAGMA_LEADER,
@@ -8424,10 +8424,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Maxie2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Maxie2 }
     },
 
-    [OPPONENT_MAXIE_3] =
+    [TRAINER_MAXIE_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_MAGMA_LEADER,
@@ -8438,10 +8438,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Maxie3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Maxie3 }
     },
 
-    [OPPONENT_TIANA] =
+    [TRAINER_TIANA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_LASS,
@@ -8452,10 +8452,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Tiana
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tiana }
     },
 
-    [OPPONENT_HALEY_1] =
+    [TRAINER_HALEY_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_LASS,
@@ -8466,10 +8466,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Haley1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Haley1 }
     },
 
-    [OPPONENT_JANICE] =
+    [TRAINER_JANICE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_LASS,
@@ -8480,10 +8480,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Janice
+        .party = {.NoItemDefaultMoves = gTrainerParty_Janice }
     },
 
-    [OPPONENT_VIVI] =
+    [TRAINER_VIVI] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_WINSTRATE,
@@ -8494,10 +8494,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Vivi
+        .party = {.NoItemDefaultMoves = gTrainerParty_Vivi }
     },
 
-    [OPPONENT_HALEY_2] =
+    [TRAINER_HALEY_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_LASS,
@@ -8508,10 +8508,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Haley2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Haley2 }
     },
 
-    [OPPONENT_HALEY_3] =
+    [TRAINER_HALEY_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_LASS,
@@ -8522,10 +8522,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Haley3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Haley3 }
     },
 
-    [OPPONENT_HALEY_4] =
+    [TRAINER_HALEY_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_LASS,
@@ -8536,10 +8536,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Haley4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Haley4 }
     },
 
-    [OPPONENT_HALEY_5] =
+    [TRAINER_HALEY_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_LASS,
@@ -8550,10 +8550,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Haley5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Haley5 }
     },
 
-    [OPPONENT_SALLY] =
+    [TRAINER_SALLY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_LASS,
@@ -8564,10 +8564,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Sally
+        .party = {.NoItemDefaultMoves = gTrainerParty_Sally }
     },
 
-    [OPPONENT_ROBIN] =
+    [TRAINER_ROBIN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_LASS,
@@ -8578,10 +8578,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Robin
+        .party = {.NoItemDefaultMoves = gTrainerParty_Robin }
     },
 
-    [OPPONENT_ANDREA] =
+    [TRAINER_ANDREA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_LASS,
@@ -8592,10 +8592,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Andrea
+        .party = {.NoItemDefaultMoves = gTrainerParty_Andrea }
     },
 
-    [OPPONENT_CRISSY] =
+    [TRAINER_CRISSY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_LASS,
@@ -8606,10 +8606,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Crissy
+        .party = {.NoItemDefaultMoves = gTrainerParty_Crissy }
     },
 
-    [OPPONENT_RICK] =
+    [TRAINER_RICK] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8620,10 +8620,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Rick
+        .party = {.NoItemDefaultMoves = gTrainerParty_Rick }
     },
 
-    [OPPONENT_LYLE] =
+    [TRAINER_LYLE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8634,10 +8634,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 6,
-        .party = gTrainerParty_Lyle
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lyle }
     },
 
-    [OPPONENT_JOSE] =
+    [TRAINER_JOSE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8648,10 +8648,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Jose
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jose }
     },
 
-    [OPPONENT_DOUG] =
+    [TRAINER_DOUG] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8662,10 +8662,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Doug
+        .party = {.NoItemDefaultMoves = gTrainerParty_Doug }
     },
 
-    [OPPONENT_GREG] =
+    [TRAINER_GREG] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8676,10 +8676,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Greg
+        .party = {.NoItemDefaultMoves = gTrainerParty_Greg }
     },
 
-    [OPPONENT_KENT] =
+    [TRAINER_KENT] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8690,10 +8690,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Kent
+        .party = {.NoItemDefaultMoves = gTrainerParty_Kent }
     },
 
-    [OPPONENT_JAMES_1] =
+    [TRAINER_JAMES_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8704,10 +8704,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_James1
+        .party = {.NoItemDefaultMoves = gTrainerParty_James1 }
     },
 
-    [OPPONENT_JAMES_2] =
+    [TRAINER_JAMES_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8718,10 +8718,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_James2
+        .party = {.NoItemDefaultMoves = gTrainerParty_James2 }
     },
 
-    [OPPONENT_JAMES_3] =
+    [TRAINER_JAMES_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8732,10 +8732,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_James3
+        .party = {.NoItemDefaultMoves = gTrainerParty_James3 }
     },
 
-    [OPPONENT_JAMES_4] =
+    [TRAINER_JAMES_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8746,10 +8746,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_James4
+        .party = {.NoItemDefaultMoves = gTrainerParty_James4 }
     },
 
-    [OPPONENT_JAMES_5] =
+    [TRAINER_JAMES_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8760,10 +8760,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_James5
+        .party = {.NoItemDefaultMoves = gTrainerParty_James5 }
     },
 
-    [OPPONENT_BRICE] =
+    [TRAINER_BRICE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HIKER,
@@ -8774,10 +8774,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Brice
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brice }
     },
 
-    [OPPONENT_TRENT_1] =
+    [TRAINER_TRENT_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HIKER,
@@ -8788,10 +8788,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Trent1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Trent1 }
     },
 
-    [OPPONENT_LENNY] =
+    [TRAINER_LENNY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HIKER,
@@ -8802,10 +8802,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Lenny
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lenny }
     },
 
-    [OPPONENT_LUCAS_1] =
+    [TRAINER_LUCAS_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HIKER,
@@ -8816,10 +8816,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Lucas1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lucas1 }
     },
 
-    [OPPONENT_ALAN] =
+    [TRAINER_ALAN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HIKER,
@@ -8830,10 +8830,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Alan
+        .party = {.NoItemDefaultMoves = gTrainerParty_Alan }
     },
 
-    [OPPONENT_CLARK] =
+    [TRAINER_CLARK] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HIKER,
@@ -8844,10 +8844,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Clark
+        .party = {.NoItemDefaultMoves = gTrainerParty_Clark }
     },
 
-    [OPPONENT_ERIC] =
+    [TRAINER_ERIC] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HIKER,
@@ -8858,10 +8858,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Eric
+        .party = {.NoItemDefaultMoves = gTrainerParty_Eric }
     },
 
-    [OPPONENT_LUCAS_2] =
+    [TRAINER_LUCAS_2] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_HIKER,
@@ -8872,10 +8872,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Lucas2
+        .party = {.NoItemCustomMoves = gTrainerParty_Lucas2 }
     },
 
-    [OPPONENT_MIKE_1] =
+    [TRAINER_MIKE_1] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_HIKER,
@@ -8886,10 +8886,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Mike1
+        .party = {.NoItemCustomMoves = gTrainerParty_Mike1 }
     },
 
-    [OPPONENT_MIKE_2] =
+    [TRAINER_MIKE_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HIKER,
@@ -8900,10 +8900,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Mike2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Mike2 }
     },
 
-    [OPPONENT_TRENT_2] =
+    [TRAINER_TRENT_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HIKER,
@@ -8914,10 +8914,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Trent2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Trent2 }
     },
 
-    [OPPONENT_TRENT_3] =
+    [TRAINER_TRENT_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HIKER,
@@ -8928,10 +8928,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Trent3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Trent3 }
     },
 
-    [OPPONENT_TRENT_4] =
+    [TRAINER_TRENT_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HIKER,
@@ -8942,10 +8942,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Trent4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Trent4 }
     },
 
-    [OPPONENT_TRENT_5] =
+    [TRAINER_TRENT_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HIKER,
@@ -8956,10 +8956,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Trent5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Trent5 }
     },
 
-    [OPPONENT_DEZ_AND_LUKE] =
+    [TRAINER_DEZ_AND_LUKE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
@@ -8970,10 +8970,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_DezAndLuke
+        .party = {.NoItemDefaultMoves = gTrainerParty_DezAndLuke }
     },
 
-    [OPPONENT_LEA_AND_JED] =
+    [TRAINER_LEA_AND_JED] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
@@ -8984,10 +8984,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_LeaAndJed
+        .party = {.NoItemDefaultMoves = gTrainerParty_LeaAndJed }
     },
 
-    [OPPONENT_LOIS_AND_HAL_1] =
+    [TRAINER_LOIS_AND_HAL_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
@@ -8998,10 +8998,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_LoisAndHal1
+        .party = {.NoItemDefaultMoves = gTrainerParty_LoisAndHal1 }
     },
 
-    [OPPONENT_LOIS_AND_HAL_2] =
+    [TRAINER_LOIS_AND_HAL_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
@@ -9012,10 +9012,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_LoisAndHal2
+        .party = {.NoItemDefaultMoves = gTrainerParty_LoisAndHal2 }
     },
 
-    [OPPONENT_LOIS_AND_HAL_3] =
+    [TRAINER_LOIS_AND_HAL_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
@@ -9026,10 +9026,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_LoisAndHal3
+        .party = {.NoItemDefaultMoves = gTrainerParty_LoisAndHal3 }
     },
 
-    [OPPONENT_LOIS_AND_HAL_4] =
+    [TRAINER_LOIS_AND_HAL_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
@@ -9040,10 +9040,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_LoisAndHal4
+        .party = {.NoItemDefaultMoves = gTrainerParty_LoisAndHal4 }
     },
 
-    [OPPONENT_LOIS_AND_HAL_5] =
+    [TRAINER_LOIS_AND_HAL_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
@@ -9054,10 +9054,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_LoisAndHal5
+        .party = {.NoItemDefaultMoves = gTrainerParty_LoisAndHal5 }
     },
 
-    [OPPONENT_JOHANNA] =
+    [TRAINER_JOHANNA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BEAUTY,
@@ -9068,10 +9068,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Johanna
+        .party = {.NoItemDefaultMoves = gTrainerParty_Johanna }
     },
 
-    [OPPONENT_ZANE] =
+    [TRAINER_ZANE] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -9082,10 +9082,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Zane
+        .party = {.NoItemCustomMoves = gTrainerParty_Zane }
     },
 
-    [OPPONENT_VIVIAN] =
+    [TRAINER_VIVIAN] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -9096,10 +9096,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Vivian
+        .party = {.NoItemCustomMoves = gTrainerParty_Vivian }
     },
 
-    [OPPONENT_SADIE] =
+    [TRAINER_SADIE] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -9110,10 +9110,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Sadie
+        .party = {.NoItemCustomMoves = gTrainerParty_Sadie }
     },
 
-    [OPPONENT_HIDEO_2] =
+    [TRAINER_HIDEO_2] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -9124,10 +9124,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x3,
         .partySize = 2,
-        .party = gTrainerParty_Hideo2
+        .party = {.NoItemCustomMoves = gTrainerParty_Hideo2 }
     },
 
-    [OPPONENT_KEIGO] =
+    [TRAINER_KEIGO] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -9138,10 +9138,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x3,
         .partySize = 2,
-        .party = gTrainerParty_Keigo
+        .party = {.NoItemCustomMoves = gTrainerParty_Keigo }
     },
 
-    [OPPONENT_TSUNAO] =
+    [TRAINER_TSUNAO] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -9152,10 +9152,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x3,
         .partySize = 3,
-        .party = gTrainerParty_Tsunao
+        .party = {.NoItemCustomMoves = gTrainerParty_Tsunao }
     },
 
-    [OPPONENT_TERRELL] =
+    [TRAINER_TERRELL] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_CAMPER,
@@ -9166,10 +9166,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Terrell
+        .party = {.NoItemDefaultMoves = gTrainerParty_Terrell }
     },
 
-    [OPPONENT_KYLEE] =
+    [TRAINER_KYLEE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PICNICKER,
@@ -9180,10 +9180,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Kylee
+        .party = {.NoItemDefaultMoves = gTrainerParty_Kylee }
     },
 
-    [OPPONENT_WALLY_2] =
+    [TRAINER_WALLY_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9194,10 +9194,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Wally2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Wally2 }
     },
 
-    [OPPONENT_WALLY_3] =
+    [TRAINER_WALLY_3] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9208,10 +9208,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 5,
-        .party = gTrainerParty_Wally3
+        .party = {.NoItemCustomMoves = gTrainerParty_Wally3 }
     },
 
-    [OPPONENT_WALLY_4] =
+    [TRAINER_WALLY_4] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9222,10 +9222,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 5,
-        .party = gTrainerParty_Wally4
+        .party = {.NoItemCustomMoves = gTrainerParty_Wally4 }
     },
 
-    [OPPONENT_WALLY_5] =
+    [TRAINER_WALLY_5] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9236,10 +9236,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 5,
-        .party = gTrainerParty_Wally5
+        .party = {.NoItemCustomMoves = gTrainerParty_Wally5 }
     },
 
-    [OPPONENT_WALLY_6] =
+    [TRAINER_WALLY_6] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9250,10 +9250,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 5,
-        .party = gTrainerParty_Wally6
+        .party = {.NoItemCustomMoves = gTrainerParty_Wally6 }
     },
 
-    [OPPONENT_BRENDAN_10] =
+    [TRAINER_BRENDAN_10] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9264,10 +9264,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 4,
-        .party = gTrainerParty_Brendan10
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan10 }
     },
 
-    [OPPONENT_BRENDAN_11] =
+    [TRAINER_BRENDAN_11] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9278,10 +9278,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 4,
-        .party = gTrainerParty_Brendan11
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan11 }
     },
 
-    [OPPONENT_BRENDAN_12] =
+    [TRAINER_BRENDAN_12] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9292,10 +9292,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 4,
-        .party = gTrainerParty_Brendan12
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan12 }
     },
 
-    [OPPONENT_MAY_10] =
+    [TRAINER_MAY_10] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9306,10 +9306,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 4,
-        .party = gTrainerParty_May10
+        .party = {.NoItemDefaultMoves = gTrainerParty_May10 }
     },
 
-    [OPPONENT_MAY_11] =
+    [TRAINER_MAY_11] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9320,10 +9320,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 4,
-        .party = gTrainerParty_May11
+        .party = {.NoItemDefaultMoves = gTrainerParty_May11 }
     },
 
-    [OPPONENT_MAY_12] =
+    [TRAINER_MAY_12] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9334,10 +9334,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 4,
-        .party = gTrainerParty_May12
+        .party = {.NoItemDefaultMoves = gTrainerParty_May12 }
     },
 
-    [OPPONENT_JONAH] =
+    [TRAINER_JONAH] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -9348,10 +9348,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Jonah
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jonah }
     },
 
-    [OPPONENT_HENRY] =
+    [TRAINER_HENRY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -9362,10 +9362,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Henry
+        .party = {.NoItemDefaultMoves = gTrainerParty_Henry }
     },
 
-    [OPPONENT_ROGER] =
+    [TRAINER_ROGER] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -9376,10 +9376,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Roger
+        .party = {.NoItemDefaultMoves = gTrainerParty_Roger }
     },
 
-    [OPPONENT_ALEXA] =
+    [TRAINER_ALEXA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -9390,10 +9390,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Alexa
+        .party = {.NoItemDefaultMoves = gTrainerParty_Alexa }
     },
 
-    [OPPONENT_RUBEN] =
+    [TRAINER_RUBEN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -9404,10 +9404,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Ruben
+        .party = {.NoItemDefaultMoves = gTrainerParty_Ruben }
     },
 
-    [OPPONENT_KOJI] =
+    [TRAINER_KOJI] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -9418,10 +9418,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Koji
+        .party = {.NoItemDefaultMoves = gTrainerParty_Koji }
     },
 
-    [OPPONENT_WAYNE] =
+    [TRAINER_WAYNE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -9432,10 +9432,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Wayne
+        .party = {.NoItemDefaultMoves = gTrainerParty_Wayne }
     },
 
-    [OPPONENT_BYRON] =
+    [TRAINER_BYRON] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -9446,10 +9446,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Byron
+        .party = {.NoItemDefaultMoves = gTrainerParty_Byron }
     },
 
-    [OPPONENT_REED] =
+    [TRAINER_REED] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -9460,10 +9460,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Reed
+        .party = {.NoItemDefaultMoves = gTrainerParty_Reed }
     },
 
-    [OPPONENT_TISHA] =
+    [TRAINER_TISHA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -9474,10 +9474,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Tisha
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tisha }
     },
 
-    [OPPONENT_TORI_AND_TIA] =
+    [TRAINER_TORI_AND_TIA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TWINS,
@@ -9488,10 +9488,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_ToriAndTia
+        .party = {.NoItemDefaultMoves = gTrainerParty_ToriAndTia }
     },
 
-    [OPPONENT_KIM_AND_IRIS] =
+    [TRAINER_KIM_AND_IRIS] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_SR_AND_JR,
@@ -9502,10 +9502,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_KimAndIris
+        .party = {.NoItemCustomMoves = gTrainerParty_KimAndIris }
     },
 
-    [OPPONENT_TYRA_AND_IVY] =
+    [TRAINER_TYRA_AND_IVY] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_SR_AND_JR,
@@ -9516,10 +9516,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_TyraAndIvy
+        .party = {.NoItemCustomMoves = gTrainerParty_TyraAndIvy }
     },
 
-    [OPPONENT_MEL_AND_PAUL] =
+    [TRAINER_MEL_AND_PAUL] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
@@ -9530,10 +9530,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_MelAndPaul
+        .party = {.NoItemCustomMoves = gTrainerParty_MelAndPaul }
     },
 
-    [OPPONENT_JOHN_AND_JAY_1] =
+    [TRAINER_JOHN_AND_JAY_1] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_OLD_COUPLE,
@@ -9544,10 +9544,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_JohnAndJay1
+        .party = {.NoItemCustomMoves = gTrainerParty_JohnAndJay1 }
     },
 
-    [OPPONENT_JOHN_AND_JAY_2] =
+    [TRAINER_JOHN_AND_JAY_2] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_OLD_COUPLE,
@@ -9558,10 +9558,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_JohnAndJay2
+        .party = {.NoItemCustomMoves = gTrainerParty_JohnAndJay2 }
     },
 
-    [OPPONENT_JOHN_AND_JAY_3] =
+    [TRAINER_JOHN_AND_JAY_3] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_OLD_COUPLE,
@@ -9572,10 +9572,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_JohnAndJay3
+        .party = {.NoItemCustomMoves = gTrainerParty_JohnAndJay3 }
     },
 
-    [OPPONENT_JOHN_AND_JAY_4] =
+    [TRAINER_JOHN_AND_JAY_4] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_OLD_COUPLE,
@@ -9586,10 +9586,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0xb,
         .partySize = 2,
-        .party = gTrainerParty_JohnAndJay4
+        .party = {.NoItemCustomMoves = gTrainerParty_JohnAndJay4 }
     },
 
-    [OPPONENT_JOHN_AND_JAY_5] =
+    [TRAINER_JOHN_AND_JAY_5] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_OLD_COUPLE,
@@ -9600,10 +9600,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_JohnAndJay5
+        .party = {.NoItemCustomMoves = gTrainerParty_JohnAndJay5 }
     },
 
-    [OPPONENT_RELI_AND_IAN] =
+    [TRAINER_RELI_AND_IAN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SIS_AND_BRO,
@@ -9614,10 +9614,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_ReliAndIan
+        .party = {.NoItemDefaultMoves = gTrainerParty_ReliAndIan }
     },
 
-    [OPPONENT_RITA_AND_SAM_1] =
+    [TRAINER_RITA_AND_SAM_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SIS_AND_BRO,
@@ -9628,10 +9628,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_RitaAndSam1
+        .party = {.NoItemDefaultMoves = gTrainerParty_RitaAndSam1 }
     },
 
-    [OPPONENT_RITA_AND_SAM_2] =
+    [TRAINER_RITA_AND_SAM_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SIS_AND_BRO,
@@ -9642,10 +9642,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_RitaAndSam2
+        .party = {.NoItemDefaultMoves = gTrainerParty_RitaAndSam2 }
     },
 
-    [OPPONENT_RITA_AND_SAM_3] =
+    [TRAINER_RITA_AND_SAM_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SIS_AND_BRO,
@@ -9656,10 +9656,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_RitaAndSam3
+        .party = {.NoItemDefaultMoves = gTrainerParty_RitaAndSam3 }
     },
 
-    [OPPONENT_RITA_AND_SAM_4] =
+    [TRAINER_RITA_AND_SAM_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SIS_AND_BRO,
@@ -9670,10 +9670,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_RitaAndSam4
+        .party = {.NoItemDefaultMoves = gTrainerParty_RitaAndSam4 }
     },
 
-    [OPPONENT_RITA_AND_SAM_5] =
+    [TRAINER_RITA_AND_SAM_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SIS_AND_BRO,
@@ -9684,10 +9684,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_RitaAndSam5
+        .party = {.NoItemDefaultMoves = gTrainerParty_RitaAndSam5 }
     },
 
-    [OPPONENT_LISA_AND_RAY] =
+    [TRAINER_LISA_AND_RAY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SIS_AND_BRO,
@@ -9698,10 +9698,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_LisaAndRay
+        .party = {.NoItemDefaultMoves = gTrainerParty_LisaAndRay }
     },
 
-    [OPPONENT_EUGENE] =
+    [TRAINER_EUGENE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -9712,6 +9712,6 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Eugene
-    }
+        .party = {.NoItemDefaultMoves = gTrainerParty_Eugene }
+    },
 };
diff --git a/src/data/trainers_en.h b/src/data/trainers_en.h
index fbcdd5a4e..621945db8 100644
--- a/src/data/trainers_en.h
+++ b/src/data/trainers_en.h
@@ -1,5 +1,5 @@
 const struct Trainer gTrainers[] = {
-    [OPPONENT_NONE] =
+    [TRAINER_NONE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_1,
@@ -10,10 +10,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x0,
         .partySize = 0,
-        .party = NULL
+        .party = {.NoItemDefaultMoves = NULL }
     },
 
-    [OPPONENT_ARCHIE_1] =
+    [TRAINER_ARCHIE_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AQUA_LEADER,
@@ -24,10 +24,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Archie1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Archie1 }
     },
 
-    [OPPONENT_GRUNT_1] =
+    [TRAINER_GRUNT_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -38,10 +38,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt1 }
     },
 
-    [OPPONENT_GRUNT_2] =
+    [TRAINER_GRUNT_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -52,10 +52,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Grunt2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt2 }
     },
 
-    [OPPONENT_GRUNT_3] =
+    [TRAINER_GRUNT_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -66,10 +66,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt3 }
     },
 
-    [OPPONENT_GRUNT_4] =
+    [TRAINER_GRUNT_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -80,10 +80,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt4 }
     },
 
-    [OPPONENT_GRUNT_5] =
+    [TRAINER_GRUNT_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -94,10 +94,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt5 }
     },
 
-    [OPPONENT_GRUNT_6] =
+    [TRAINER_GRUNT_6] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -108,10 +108,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt6
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt6 }
     },
 
-    [OPPONENT_GRUNT_7] =
+    [TRAINER_GRUNT_7] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -122,10 +122,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Grunt7
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt7 }
     },
 
-    [OPPONENT_GRUNT_8] =
+    [TRAINER_GRUNT_8] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -136,10 +136,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt8
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt8 }
     },
 
-    [OPPONENT_GRUNT_9] =
+    [TRAINER_GRUNT_9] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -150,10 +150,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt9
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt9 }
     },
 
-    [OPPONENT_GRUNT_10] =
+    [TRAINER_GRUNT_10] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -164,10 +164,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt10
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt10 }
     },
 
-    [OPPONENT_GRUNT_11] =
+    [TRAINER_GRUNT_11] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -178,10 +178,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt11
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt11 }
     },
 
-    [OPPONENT_GRUNT_12] =
+    [TRAINER_GRUNT_12] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -192,10 +192,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt12
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt12 }
     },
 
-    [OPPONENT_GRUNT_13] =
+    [TRAINER_GRUNT_13] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -206,10 +206,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt13
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt13 }
     },
 
-    [OPPONENT_GRUNT_14] =
+    [TRAINER_GRUNT_14] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -220,10 +220,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt14
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt14 }
     },
 
-    [OPPONENT_GRUNT_15] =
+    [TRAINER_GRUNT_15] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -234,10 +234,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt15
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt15 }
     },
 
-    [OPPONENT_GRUNT_16] =
+    [TRAINER_GRUNT_16] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -248,10 +248,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt16
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt16 }
     },
 
-    [OPPONENT_GRUNT_17] =
+    [TRAINER_GRUNT_17] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -262,10 +262,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt17
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt17 }
     },
 
-    [OPPONENT_GRUNT_18] =
+    [TRAINER_GRUNT_18] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -276,10 +276,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Grunt18
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt18 }
     },
 
-    [OPPONENT_GRUNT_19] =
+    [TRAINER_GRUNT_19] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -290,10 +290,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt19
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt19 }
     },
 
-    [OPPONENT_GRUNT_20] =
+    [TRAINER_GRUNT_20] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -304,10 +304,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt20
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt20 }
     },
 
-    [OPPONENT_GRUNT_21] =
+    [TRAINER_GRUNT_21] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -318,10 +318,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt21
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt21 }
     },
 
-    [OPPONENT_GRUNT_22] =
+    [TRAINER_GRUNT_22] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -332,10 +332,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Grunt22
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt22 }
     },
 
-    [OPPONENT_GRUNT_23] =
+    [TRAINER_GRUNT_23] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -346,10 +346,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt23
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt23 }
     },
 
-    [OPPONENT_GRUNT_24] =
+    [TRAINER_GRUNT_24] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -360,10 +360,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt24
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt24 }
     },
 
-    [OPPONENT_GRUNT_25] =
+    [TRAINER_GRUNT_25] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -374,10 +374,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt25
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt25 }
     },
 
-    [OPPONENT_GRUNT_26] =
+    [TRAINER_GRUNT_26] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -388,10 +388,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Grunt26
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt26 }
     },
 
-    [OPPONENT_GRUNT_27] =
+    [TRAINER_GRUNT_27] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -402,10 +402,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt27
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt27 }
     },
 
-    [OPPONENT_ANONYMOUS_1] =
+    [TRAINER_ANONYMOUS_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AQUA_ADMIN,
@@ -416,10 +416,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Anonymous1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous1 }
     },
 
-    [OPPONENT_MATT_1] =
+    [TRAINER_MATT_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AQUA_ADMIN,
@@ -430,10 +430,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Matt1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Matt1 }
     },
 
-    [OPPONENT_MATT_2] =
+    [TRAINER_MATT_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AQUA_ADMIN,
@@ -444,10 +444,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0xb,
         .partySize = 3,
-        .party = gTrainerParty_Matt2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Matt2 }
     },
 
-    [OPPONENT_SHELLY_1] =
+    [TRAINER_SHELLY_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AQUA_ADMIN,
@@ -458,10 +458,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Shelly1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Shelly1 }
     },
 
-    [OPPONENT_SHELLY_2] =
+    [TRAINER_SHELLY_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AQUA_ADMIN,
@@ -472,10 +472,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Shelly2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Shelly2 }
     },
 
-    [OPPONENT_ARCHIE_2] =
+    [TRAINER_ARCHIE_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AQUA_LEADER,
@@ -486,10 +486,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Archie2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Archie2 }
     },
 
-    [OPPONENT_ARCHIE_3] =
+    [TRAINER_ARCHIE_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AQUA_LEADER,
@@ -500,10 +500,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Archie3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Archie3 }
     },
 
-    [OPPONENT_DAISY] =
+    [TRAINER_DAISY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AROMA_LADY,
@@ -514,10 +514,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Daisy
+        .party = {.NoItemDefaultMoves = gTrainerParty_Daisy }
     },
 
-    [OPPONENT_ROSE_1] =
+    [TRAINER_ROSE_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AROMA_LADY,
@@ -528,10 +528,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Rose1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Rose1 }
     },
 
-    [OPPONENT_LILY] =
+    [TRAINER_LILY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AROMA_LADY,
@@ -542,10 +542,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Lily
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lily }
     },
 
-    [OPPONENT_VIOLET] =
+    [TRAINER_VIOLET] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AROMA_LADY,
@@ -556,10 +556,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Violet
+        .party = {.NoItemDefaultMoves = gTrainerParty_Violet }
     },
 
-    [OPPONENT_ROSE_2] =
+    [TRAINER_ROSE_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AROMA_LADY,
@@ -570,10 +570,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Rose2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Rose2 }
     },
 
-    [OPPONENT_ROSE_3] =
+    [TRAINER_ROSE_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AROMA_LADY,
@@ -584,10 +584,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Rose3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Rose3 }
     },
 
-    [OPPONENT_ROSE_4] =
+    [TRAINER_ROSE_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AROMA_LADY,
@@ -598,10 +598,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Rose4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Rose4 }
     },
 
-    [OPPONENT_ROSE_5] =
+    [TRAINER_ROSE_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AROMA_LADY,
@@ -612,10 +612,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Rose5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Rose5 }
     },
 
-    [OPPONENT_DUSTY_1] =
+    [TRAINER_DUSTY_1] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_RUIN_MANIAC,
@@ -626,10 +626,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Dusty1
+        .party = {.NoItemCustomMoves = gTrainerParty_Dusty1 }
     },
 
-    [OPPONENT_CHIP] =
+    [TRAINER_CHIP] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_RUIN_MANIAC,
@@ -640,10 +640,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Chip
+        .party = {.NoItemCustomMoves = gTrainerParty_Chip }
     },
 
-    [OPPONENT_FOSTER] =
+    [TRAINER_FOSTER] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_RUIN_MANIAC,
@@ -654,10 +654,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Foster
+        .party = {.NoItemCustomMoves = gTrainerParty_Foster }
     },
 
-    [OPPONENT_DUSTY_2] =
+    [TRAINER_DUSTY_2] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_RUIN_MANIAC,
@@ -668,10 +668,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Dusty2
+        .party = {.NoItemCustomMoves = gTrainerParty_Dusty2 }
     },
 
-    [OPPONENT_DUSTY_3] =
+    [TRAINER_DUSTY_3] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_RUIN_MANIAC,
@@ -682,10 +682,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Dusty3
+        .party = {.NoItemCustomMoves = gTrainerParty_Dusty3 }
     },
 
-    [OPPONENT_DUSTY_4] =
+    [TRAINER_DUSTY_4] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_RUIN_MANIAC,
@@ -696,10 +696,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Dusty4
+        .party = {.NoItemCustomMoves = gTrainerParty_Dusty4 }
     },
 
-    [OPPONENT_DUSTY_5] =
+    [TRAINER_DUSTY_5] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_RUIN_MANIAC,
@@ -710,10 +710,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Dusty5
+        .party = {.NoItemCustomMoves = gTrainerParty_Dusty5 }
     },
 
-    [OPPONENT_GABBY_AND_TY_1] =
+    [TRAINER_GABBY_AND_TY_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_INTERVIEWER,
@@ -724,10 +724,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_GabbyAndTy1
+        .party = {.NoItemDefaultMoves = gTrainerParty_GabbyAndTy1 }
     },
 
-    [OPPONENT_GABBY_AND_TY_2] =
+    [TRAINER_GABBY_AND_TY_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_INTERVIEWER,
@@ -738,10 +738,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_GabbyAndTy2
+        .party = {.NoItemDefaultMoves = gTrainerParty_GabbyAndTy2 }
     },
 
-    [OPPONENT_GABBY_AND_TY_3] =
+    [TRAINER_GABBY_AND_TY_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_INTERVIEWER,
@@ -752,10 +752,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_GabbyAndTy3
+        .party = {.NoItemDefaultMoves = gTrainerParty_GabbyAndTy3 }
     },
 
-    [OPPONENT_GABBY_AND_TY_4] =
+    [TRAINER_GABBY_AND_TY_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_INTERVIEWER,
@@ -766,10 +766,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_GabbyAndTy4
+        .party = {.NoItemDefaultMoves = gTrainerParty_GabbyAndTy4 }
     },
 
-    [OPPONENT_GABBY_AND_TY_5] =
+    [TRAINER_GABBY_AND_TY_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_INTERVIEWER,
@@ -780,10 +780,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_GabbyAndTy5
+        .party = {.NoItemDefaultMoves = gTrainerParty_GabbyAndTy5 }
     },
 
-    [OPPONENT_GABBY_AND_TY_6] =
+    [TRAINER_GABBY_AND_TY_6] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_INTERVIEWER,
@@ -794,10 +794,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_GabbyAndTy6
+        .party = {.NoItemCustomMoves = gTrainerParty_GabbyAndTy6 }
     },
 
-    [OPPONENT_LOLA_1] =
+    [TRAINER_LOLA_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TUBER_F,
@@ -808,10 +808,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Lola1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lola1 }
     },
 
-    [OPPONENT_CARMEN] =
+    [TRAINER_CARMEN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TUBER_F,
@@ -822,10 +822,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Carmen
+        .party = {.NoItemDefaultMoves = gTrainerParty_Carmen }
     },
 
-    [OPPONENT_GWEN] =
+    [TRAINER_GWEN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TUBER_F,
@@ -836,10 +836,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Gwen
+        .party = {.NoItemDefaultMoves = gTrainerParty_Gwen }
     },
 
-    [OPPONENT_LOLA_2] =
+    [TRAINER_LOLA_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TUBER_F,
@@ -850,10 +850,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Lola2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lola2 }
     },
 
-    [OPPONENT_LOLA_3] =
+    [TRAINER_LOLA_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TUBER_F,
@@ -864,10 +864,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Lola3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lola3 }
     },
 
-    [OPPONENT_LOLA_4] =
+    [TRAINER_LOLA_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TUBER_F,
@@ -878,10 +878,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Lola4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lola4 }
     },
 
-    [OPPONENT_LOLA_5] =
+    [TRAINER_LOLA_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TUBER_F,
@@ -892,10 +892,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Lola5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lola5 }
     },
 
-    [OPPONENT_RICKY_1] =
+    [TRAINER_RICKY_1] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_TUBER_M,
@@ -906,10 +906,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Ricky1
+        .party = {.NoItemCustomMoves = gTrainerParty_Ricky1 }
     },
 
-    [OPPONENT_SIMON] =
+    [TRAINER_SIMON] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TUBER_M,
@@ -920,10 +920,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Simon
+        .party = {.NoItemDefaultMoves = gTrainerParty_Simon }
     },
 
-    [OPPONENT_CHARLIE] =
+    [TRAINER_CHARLIE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TUBER_M,
@@ -934,10 +934,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Charlie
+        .party = {.NoItemDefaultMoves = gTrainerParty_Charlie }
     },
 
-    [OPPONENT_RICKY_2] =
+    [TRAINER_RICKY_2] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_TUBER_M,
@@ -948,10 +948,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Ricky2
+        .party = {.NoItemCustomMoves = gTrainerParty_Ricky2 }
     },
 
-    [OPPONENT_RICKY_3] =
+    [TRAINER_RICKY_3] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_TUBER_M,
@@ -962,10 +962,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Ricky3
+        .party = {.NoItemCustomMoves = gTrainerParty_Ricky3 }
     },
 
-    [OPPONENT_RICKY_4] =
+    [TRAINER_RICKY_4] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_TUBER_M,
@@ -976,10 +976,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Ricky4
+        .party = {.NoItemCustomMoves = gTrainerParty_Ricky4 }
     },
 
-    [OPPONENT_RICKY_5] =
+    [TRAINER_RICKY_5] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_TUBER_M,
@@ -990,10 +990,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Ricky5
+        .party = {.NoItemCustomMoves = gTrainerParty_Ricky5 }
     },
 
-    [OPPONENT_RANDALL] =
+    [TRAINER_RANDALL] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1004,10 +1004,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Randall
+        .party = {.NoItemDefaultMoves = gTrainerParty_Randall }
     },
 
-    [OPPONENT_PARKER] =
+    [TRAINER_PARKER] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1018,10 +1018,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Parker
+        .party = {.NoItemDefaultMoves = gTrainerParty_Parker }
     },
 
-    [OPPONENT_GEORGE] =
+    [TRAINER_GEORGE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1032,10 +1032,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_George
+        .party = {.NoItemDefaultMoves = gTrainerParty_George }
     },
 
-    [OPPONENT_BERKE] =
+    [TRAINER_BERKE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1046,10 +1046,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Berke
+        .party = {.NoItemDefaultMoves = gTrainerParty_Berke }
     },
 
-    [OPPONENT_CLYDE] =
+    [TRAINER_CLYDE] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1060,10 +1060,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 5,
-        .party = gTrainerParty_Clyde
+        .party = {.NoItemCustomMoves = gTrainerParty_Clyde }
     },
 
-    [OPPONENT_VINCENT] =
+    [TRAINER_VINCENT] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1074,10 +1074,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Vincent
+        .party = {.NoItemDefaultMoves = gTrainerParty_Vincent }
     },
 
-    [OPPONENT_LEROY] =
+    [TRAINER_LEROY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1088,10 +1088,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Leroy
+        .party = {.NoItemDefaultMoves = gTrainerParty_Leroy }
     },
 
-    [OPPONENT_WILTON_1] =
+    [TRAINER_WILTON_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1102,10 +1102,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Wilton1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Wilton1 }
     },
 
-    [OPPONENT_EDGAR] =
+    [TRAINER_EDGAR] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1116,10 +1116,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Edgar
+        .party = {.NoItemDefaultMoves = gTrainerParty_Edgar }
     },
 
-    [OPPONENT_ALBERT] =
+    [TRAINER_ALBERT] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1130,10 +1130,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Albert
+        .party = {.NoItemDefaultMoves = gTrainerParty_Albert }
     },
 
-    [OPPONENT_SAMUEL] =
+    [TRAINER_SAMUEL] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1144,10 +1144,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Samuel
+        .party = {.NoItemDefaultMoves = gTrainerParty_Samuel }
     },
 
-    [OPPONENT_VITO] =
+    [TRAINER_VITO] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1158,10 +1158,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 4,
-        .party = gTrainerParty_Vito
+        .party = {.NoItemDefaultMoves = gTrainerParty_Vito }
     },
 
-    [OPPONENT_OWEN] =
+    [TRAINER_OWEN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1172,10 +1172,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Owen
+        .party = {.NoItemDefaultMoves = gTrainerParty_Owen }
     },
 
-    [OPPONENT_WILTON_2] =
+    [TRAINER_WILTON_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1186,10 +1186,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Wilton2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Wilton2 }
     },
 
-    [OPPONENT_WILTON_3] =
+    [TRAINER_WILTON_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1200,10 +1200,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Wilton3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Wilton3 }
     },
 
-    [OPPONENT_WILTON_4] =
+    [TRAINER_WILTON_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1214,10 +1214,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Wilton4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Wilton4 }
     },
 
-    [OPPONENT_WILTON_5] =
+    [TRAINER_WILTON_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1228,10 +1228,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Wilton5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Wilton5 }
     },
 
-    [OPPONENT_WARREN] =
+    [TRAINER_WARREN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1242,10 +1242,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Warren
+        .party = {.NoItemDefaultMoves = gTrainerParty_Warren }
     },
 
-    [OPPONENT_MARY] =
+    [TRAINER_MARY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1256,10 +1256,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Mary
+        .party = {.NoItemDefaultMoves = gTrainerParty_Mary }
     },
 
-    [OPPONENT_LORI] =
+    [TRAINER_LORI] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1270,10 +1270,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Lori
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lori }
     },
 
-    [OPPONENT_JODY] =
+    [TRAINER_JODY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1284,10 +1284,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0xb,
         .partySize = 1,
-        .party = gTrainerParty_Jody
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jody }
     },
 
-    [OPPONENT_WENDY] =
+    [TRAINER_WENDY] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1298,10 +1298,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0xb,
         .partySize = 3,
-        .party = gTrainerParty_Wendy
+        .party = {.NoItemCustomMoves = gTrainerParty_Wendy }
     },
 
-    [OPPONENT_ELAINE] =
+    [TRAINER_ELAINE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1312,10 +1312,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0xb,
         .partySize = 2,
-        .party = gTrainerParty_Elaine
+        .party = {.NoItemDefaultMoves = gTrainerParty_Elaine }
     },
 
-    [OPPONENT_BROOKE_1] =
+    [TRAINER_BROOKE_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1326,10 +1326,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Brooke1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brooke1 }
     },
 
-    [OPPONENT_JENNIFER] =
+    [TRAINER_JENNIFER] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1340,10 +1340,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Jennifer
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jennifer }
     },
 
-    [OPPONENT_HOPE] =
+    [TRAINER_HOPE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1354,10 +1354,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Hope
+        .party = {.NoItemDefaultMoves = gTrainerParty_Hope }
     },
 
-    [OPPONENT_SHANNON] =
+    [TRAINER_SHANNON] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1368,10 +1368,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Shannon
+        .party = {.NoItemDefaultMoves = gTrainerParty_Shannon }
     },
 
-    [OPPONENT_MICHELLE] =
+    [TRAINER_MICHELLE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1382,10 +1382,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Michelle
+        .party = {.NoItemDefaultMoves = gTrainerParty_Michelle }
     },
 
-    [OPPONENT_CAROLINE] =
+    [TRAINER_CAROLINE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1396,10 +1396,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Caroline
+        .party = {.NoItemDefaultMoves = gTrainerParty_Caroline }
     },
 
-    [OPPONENT_JULIE] =
+    [TRAINER_JULIE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1410,10 +1410,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Julie
+        .party = {.NoItemDefaultMoves = gTrainerParty_Julie }
     },
 
-    [OPPONENT_BROOKE_2] =
+    [TRAINER_BROOKE_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1424,10 +1424,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Brooke2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brooke2 }
     },
 
-    [OPPONENT_BROOKE_3] =
+    [TRAINER_BROOKE_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1438,10 +1438,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Brooke3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brooke3 }
     },
 
-    [OPPONENT_BROOKE_4] =
+    [TRAINER_BROOKE_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1452,10 +1452,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Brooke4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brooke4 }
     },
 
-    [OPPONENT_BROOKE_5] =
+    [TRAINER_BROOKE_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1466,10 +1466,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Brooke5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brooke5 }
     },
 
-    [OPPONENT_PATRICIA] =
+    [TRAINER_PATRICIA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HEX_MANIAC,
@@ -1480,10 +1480,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Patricia
+        .party = {.NoItemDefaultMoves = gTrainerParty_Patricia }
     },
 
-    [OPPONENT_KINDRA] =
+    [TRAINER_KINDRA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HEX_MANIAC,
@@ -1494,10 +1494,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Kindra
+        .party = {.NoItemDefaultMoves = gTrainerParty_Kindra }
     },
 
-    [OPPONENT_TAMMY] =
+    [TRAINER_TAMMY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HEX_MANIAC,
@@ -1508,10 +1508,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Tammy
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tammy }
     },
 
-    [OPPONENT_VALERIE_1] =
+    [TRAINER_VALERIE_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HEX_MANIAC,
@@ -1522,10 +1522,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Valerie1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Valerie1 }
     },
 
-    [OPPONENT_TASHA] =
+    [TRAINER_TASHA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HEX_MANIAC,
@@ -1536,10 +1536,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Tasha
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tasha }
     },
 
-    [OPPONENT_VALERIE_2] =
+    [TRAINER_VALERIE_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HEX_MANIAC,
@@ -1550,10 +1550,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Valerie2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Valerie2 }
     },
 
-    [OPPONENT_VALERIE_3] =
+    [TRAINER_VALERIE_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HEX_MANIAC,
@@ -1564,10 +1564,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Valerie3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Valerie3 }
     },
 
-    [OPPONENT_VALERIE_4] =
+    [TRAINER_VALERIE_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HEX_MANIAC,
@@ -1578,10 +1578,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Valerie4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Valerie4 }
     },
 
-    [OPPONENT_VALERIE_5] =
+    [TRAINER_VALERIE_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HEX_MANIAC,
@@ -1592,10 +1592,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Valerie5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Valerie5 }
     },
 
-    [OPPONENT_CINDY_1] =
+    [TRAINER_CINDY_1] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_LADY,
@@ -1606,10 +1606,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Cindy1
+        .party = {.ItemDefaultMoves = gTrainerParty_Cindy1 }
     },
 
-    [OPPONENT_ANONYMOUS_2] =
+    [TRAINER_ANONYMOUS_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_LADY,
@@ -1620,10 +1620,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Anonymous2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous2 }
     },
 
-    [OPPONENT_BRIANNA_1] =
+    [TRAINER_BRIANNA_1] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_LADY,
@@ -1634,10 +1634,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Brianna1
+        .party = {.NoItemCustomMoves = gTrainerParty_Brianna1 }
     },
 
-    [OPPONENT_CINDY_2] =
+    [TRAINER_CINDY_2] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_LADY,
@@ -1648,10 +1648,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Cindy2
+        .party = {.NoItemCustomMoves = gTrainerParty_Cindy2 }
     },
 
-    [OPPONENT_BRIANNA_2] =
+    [TRAINER_BRIANNA_2] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_LADY,
@@ -1662,10 +1662,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Brianna2
+        .party = {.ItemDefaultMoves = gTrainerParty_Brianna2 }
     },
 
-    [OPPONENT_ANETTE] =
+    [TRAINER_ANETTE] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_LADY,
@@ -1676,10 +1676,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Anette
+        .party = {.ItemDefaultMoves = gTrainerParty_Anette }
     },
 
-    [OPPONENT_CINDY_3] =
+    [TRAINER_CINDY_3] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_LADY,
@@ -1690,10 +1690,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Cindy3
+        .party = {.ItemDefaultMoves = gTrainerParty_Cindy3 }
     },
 
-    [OPPONENT_CINDY_4] =
+    [TRAINER_CINDY_4] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_LADY,
@@ -1704,10 +1704,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Cindy4
+        .party = {.ItemDefaultMoves = gTrainerParty_Cindy4 }
     },
 
-    [OPPONENT_CINDY_5] =
+    [TRAINER_CINDY_5] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_LADY,
@@ -1718,10 +1718,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Cindy5
+        .party = {.ItemDefaultMoves = gTrainerParty_Cindy5 }
     },
 
-    [OPPONENT_CINDY_6] =
+    [TRAINER_CINDY_6] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_LADY,
@@ -1732,10 +1732,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Cindy6
+        .party = {.ItemCustomMoves = gTrainerParty_Cindy6 }
     },
 
-    [OPPONENT_MELISSA] =
+    [TRAINER_MELISSA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1746,10 +1746,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Melissa
+        .party = {.NoItemDefaultMoves = gTrainerParty_Melissa }
     },
 
-    [OPPONENT_SHEILA] =
+    [TRAINER_SHEILA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1760,10 +1760,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Sheila
+        .party = {.NoItemDefaultMoves = gTrainerParty_Sheila }
     },
 
-    [OPPONENT_SHIRLEY] =
+    [TRAINER_SHIRLEY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1774,10 +1774,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Shirley
+        .party = {.NoItemDefaultMoves = gTrainerParty_Shirley }
     },
 
-    [OPPONENT_JESSICA_1] =
+    [TRAINER_JESSICA_1] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1788,10 +1788,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jessica1
+        .party = {.NoItemCustomMoves = gTrainerParty_Jessica1 }
     },
 
-    [OPPONENT_CONNIE] =
+    [TRAINER_CONNIE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1802,10 +1802,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Connie
+        .party = {.NoItemDefaultMoves = gTrainerParty_Connie }
     },
 
-    [OPPONENT_BRIDGET] =
+    [TRAINER_BRIDGET] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1816,10 +1816,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Bridget
+        .party = {.NoItemDefaultMoves = gTrainerParty_Bridget }
     },
 
-    [OPPONENT_OLIVIA] =
+    [TRAINER_OLIVIA] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1830,10 +1830,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Olivia
+        .party = {.NoItemCustomMoves = gTrainerParty_Olivia }
     },
 
-    [OPPONENT_TIFFANY] =
+    [TRAINER_TIFFANY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1844,10 +1844,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Tiffany
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tiffany }
     },
 
-    [OPPONENT_JESSICA_2] =
+    [TRAINER_JESSICA_2] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1858,10 +1858,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jessica2
+        .party = {.NoItemCustomMoves = gTrainerParty_Jessica2 }
     },
 
-    [OPPONENT_JESSICA_3] =
+    [TRAINER_JESSICA_3] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1872,10 +1872,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jessica3
+        .party = {.NoItemCustomMoves = gTrainerParty_Jessica3 }
     },
 
-    [OPPONENT_JESSICA_4] =
+    [TRAINER_JESSICA_4] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1886,10 +1886,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jessica4
+        .party = {.NoItemCustomMoves = gTrainerParty_Jessica4 }
     },
 
-    [OPPONENT_JESSICA_5] =
+    [TRAINER_JESSICA_5] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1900,10 +1900,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jessica5
+        .party = {.NoItemCustomMoves = gTrainerParty_Jessica5 }
     },
 
-    [OPPONENT_WINSTON_1] =
+    [TRAINER_WINSTON_1] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_RICH_BOY,
@@ -1914,10 +1914,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Winston1
+        .party = {.ItemDefaultMoves = gTrainerParty_Winston1 }
     },
 
-    [OPPONENT_ANONYMOUS_3] =
+    [TRAINER_ANONYMOUS_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_RICH_BOY,
@@ -1928,10 +1928,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Anonymous3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous3 }
     },
 
-    [OPPONENT_GARRET] =
+    [TRAINER_GARRET] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_RICH_BOY,
@@ -1942,10 +1942,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Garret
+        .party = {.ItemDefaultMoves = gTrainerParty_Garret }
     },
 
-    [OPPONENT_WINSTON_2] =
+    [TRAINER_WINSTON_2] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_RICH_BOY,
@@ -1956,10 +1956,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Winston2
+        .party = {.ItemDefaultMoves = gTrainerParty_Winston2 }
     },
 
-    [OPPONENT_WINSTON_3] =
+    [TRAINER_WINSTON_3] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_RICH_BOY,
@@ -1970,10 +1970,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Winston3
+        .party = {.ItemDefaultMoves = gTrainerParty_Winston3 }
     },
 
-    [OPPONENT_WINSTON_4] =
+    [TRAINER_WINSTON_4] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_RICH_BOY,
@@ -1984,10 +1984,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Winston4
+        .party = {.ItemDefaultMoves = gTrainerParty_Winston4 }
     },
 
-    [OPPONENT_WINSTON_5] =
+    [TRAINER_WINSTON_5] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_RICH_BOY,
@@ -1998,10 +1998,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Winston5
+        .party = {.ItemCustomMoves = gTrainerParty_Winston5 }
     },
 
-    [OPPONENT_STEVE_1] =
+    [TRAINER_STEVE_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMANIAC,
@@ -2012,10 +2012,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Steve1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Steve1 }
     },
 
-    [OPPONENT_CHRIS] =
+    [TRAINER_CHRIS] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMANIAC,
@@ -2026,10 +2026,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Chris
+        .party = {.NoItemDefaultMoves = gTrainerParty_Chris }
     },
 
-    [OPPONENT_MARK] =
+    [TRAINER_MARK] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMANIAC,
@@ -2040,10 +2040,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Mark
+        .party = {.NoItemDefaultMoves = gTrainerParty_Mark }
     },
 
-    [OPPONENT_KENN] =
+    [TRAINER_KENN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMANIAC,
@@ -2054,10 +2054,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Kenn
+        .party = {.NoItemDefaultMoves = gTrainerParty_Kenn }
     },
 
-    [OPPONENT_STEVE_2] =
+    [TRAINER_STEVE_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMANIAC,
@@ -2068,10 +2068,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Steve2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Steve2 }
     },
 
-    [OPPONENT_STEVE_3] =
+    [TRAINER_STEVE_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMANIAC,
@@ -2082,10 +2082,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Steve3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Steve3 }
     },
 
-    [OPPONENT_STEVE_4] =
+    [TRAINER_STEVE_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMANIAC,
@@ -2096,10 +2096,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Steve4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Steve4 }
     },
 
-    [OPPONENT_STEVE_5] =
+    [TRAINER_STEVE_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMANIAC,
@@ -2110,10 +2110,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Steve5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Steve5 }
     },
 
-    [OPPONENT_LUIS] =
+    [TRAINER_LUIS] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2124,10 +2124,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Luis
+        .party = {.NoItemDefaultMoves = gTrainerParty_Luis }
     },
 
-    [OPPONENT_AUSTIN] =
+    [TRAINER_AUSTIN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2138,10 +2138,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Austin
+        .party = {.NoItemDefaultMoves = gTrainerParty_Austin }
     },
 
-    [OPPONENT_DOUGLAS] =
+    [TRAINER_DOUGLAS] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2152,10 +2152,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Douglas
+        .party = {.NoItemDefaultMoves = gTrainerParty_Douglas }
     },
 
-    [OPPONENT_DARRIN] =
+    [TRAINER_DARRIN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2166,10 +2166,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Darrin
+        .party = {.NoItemDefaultMoves = gTrainerParty_Darrin }
     },
 
-    [OPPONENT_TONY_1] =
+    [TRAINER_TONY_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2180,10 +2180,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Tony1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tony1 }
     },
 
-    [OPPONENT_JEROME] =
+    [TRAINER_JEROME] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2194,10 +2194,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jerome
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jerome }
     },
 
-    [OPPONENT_MATTHEW] =
+    [TRAINER_MATTHEW] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2208,10 +2208,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Matthew
+        .party = {.NoItemDefaultMoves = gTrainerParty_Matthew }
     },
 
-    [OPPONENT_DAVID] =
+    [TRAINER_DAVID] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2222,10 +2222,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_David
+        .party = {.NoItemDefaultMoves = gTrainerParty_David }
     },
 
-    [OPPONENT_SPENCER] =
+    [TRAINER_SPENCER] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2236,10 +2236,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Spencer
+        .party = {.NoItemDefaultMoves = gTrainerParty_Spencer }
     },
 
-    [OPPONENT_ROLAND] =
+    [TRAINER_ROLAND] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2250,10 +2250,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Roland
+        .party = {.NoItemDefaultMoves = gTrainerParty_Roland }
     },
 
-    [OPPONENT_CODY] =
+    [TRAINER_CODY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2264,10 +2264,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Cody
+        .party = {.NoItemDefaultMoves = gTrainerParty_Cody }
     },
 
-    [OPPONENT_STAN] =
+    [TRAINER_STAN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2278,10 +2278,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Stan
+        .party = {.NoItemDefaultMoves = gTrainerParty_Stan }
     },
 
-    [OPPONENT_BARRY] =
+    [TRAINER_BARRY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2292,10 +2292,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Barry
+        .party = {.NoItemDefaultMoves = gTrainerParty_Barry }
     },
 
-    [OPPONENT_DEAN] =
+    [TRAINER_DEAN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2306,10 +2306,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Dean
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dean }
     },
 
-    [OPPONENT_RODNEY] =
+    [TRAINER_RODNEY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2320,10 +2320,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Rodney
+        .party = {.NoItemDefaultMoves = gTrainerParty_Rodney }
     },
 
-    [OPPONENT_RICHARD] =
+    [TRAINER_RICHARD] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2334,10 +2334,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Richard
+        .party = {.NoItemDefaultMoves = gTrainerParty_Richard }
     },
 
-    [OPPONENT_HERMAN] =
+    [TRAINER_HERMAN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2348,10 +2348,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Herman
+        .party = {.NoItemDefaultMoves = gTrainerParty_Herman }
     },
 
-    [OPPONENT_ANONYMOUS_4] =
+    [TRAINER_ANONYMOUS_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2362,10 +2362,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Anonymous4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous4 }
     },
 
-    [OPPONENT_GILBERT] =
+    [TRAINER_GILBERT] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2376,10 +2376,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Gilbert
+        .party = {.NoItemDefaultMoves = gTrainerParty_Gilbert }
     },
 
-    [OPPONENT_FRANKLIN] =
+    [TRAINER_FRANKLIN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2390,10 +2390,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Franklin
+        .party = {.NoItemDefaultMoves = gTrainerParty_Franklin }
     },
 
-    [OPPONENT_DANNY] =
+    [TRAINER_DANNY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2404,10 +2404,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Danny
+        .party = {.NoItemDefaultMoves = gTrainerParty_Danny }
     },
 
-    [OPPONENT_JACK] =
+    [TRAINER_JACK] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2418,10 +2418,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jack
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jack }
     },
 
-    [OPPONENT_DUDLEY] =
+    [TRAINER_DUDLEY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2432,10 +2432,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Dudley
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dudley }
     },
 
-    [OPPONENT_CHAD] =
+    [TRAINER_CHAD] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2446,10 +2446,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Chad
+        .party = {.NoItemDefaultMoves = gTrainerParty_Chad }
     },
 
-    [OPPONENT_TONY_2] =
+    [TRAINER_TONY_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2460,10 +2460,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Tony2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tony2 }
     },
 
-    [OPPONENT_TONY_3] =
+    [TRAINER_TONY_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2474,10 +2474,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Tony3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tony3 }
     },
 
-    [OPPONENT_TONY_4] =
+    [TRAINER_TONY_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2488,10 +2488,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Tony4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tony4 }
     },
 
-    [OPPONENT_TONY_5] =
+    [TRAINER_TONY_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2502,10 +2502,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Tony5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tony5 }
     },
 
-    [OPPONENT_HIDEKI] =
+    [TRAINER_HIDEKI] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2516,10 +2516,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Hideki
+        .party = {.NoItemDefaultMoves = gTrainerParty_Hideki }
     },
 
-    [OPPONENT_HITOSHI] =
+    [TRAINER_HITOSHI] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2530,10 +2530,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Hitoshi
+        .party = {.NoItemDefaultMoves = gTrainerParty_Hitoshi }
     },
 
-    [OPPONENT_KIYO] =
+    [TRAINER_KIYO] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2544,10 +2544,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Kiyo
+        .party = {.NoItemDefaultMoves = gTrainerParty_Kiyo }
     },
 
-    [OPPONENT_KOICHI] =
+    [TRAINER_KOICHI] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2558,10 +2558,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Koichi
+        .party = {.NoItemDefaultMoves = gTrainerParty_Koichi }
     },
 
-    [OPPONENT_NOB_1] =
+    [TRAINER_NOB_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2572,10 +2572,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Nob1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Nob1 }
     },
 
-    [OPPONENT_NOB_2] =
+    [TRAINER_NOB_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2586,10 +2586,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Nob2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Nob2 }
     },
 
-    [OPPONENT_NOB_3] =
+    [TRAINER_NOB_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2600,10 +2600,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Nob3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Nob3 }
     },
 
-    [OPPONENT_NOB_4] =
+    [TRAINER_NOB_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2614,10 +2614,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Nob4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Nob4 }
     },
 
-    [OPPONENT_NOB_5] =
+    [TRAINER_NOB_5] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2628,10 +2628,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Nob5
+        .party = {.ItemDefaultMoves = gTrainerParty_Nob5 }
     },
 
-    [OPPONENT_YUJI] =
+    [TRAINER_YUJI] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2642,10 +2642,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Yuji
+        .party = {.NoItemDefaultMoves = gTrainerParty_Yuji }
     },
 
-    [OPPONENT_DAISUKE] =
+    [TRAINER_DAISUKE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2656,10 +2656,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Daisuke
+        .party = {.NoItemDefaultMoves = gTrainerParty_Daisuke }
     },
 
-    [OPPONENT_ATSUSHI] =
+    [TRAINER_ATSUSHI] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2670,10 +2670,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Atsushi
+        .party = {.NoItemDefaultMoves = gTrainerParty_Atsushi }
     },
 
-    [OPPONENT_KIRK] =
+    [TRAINER_KIRK] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_GUITARIST,
@@ -2684,10 +2684,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Kirk
+        .party = {.NoItemDefaultMoves = gTrainerParty_Kirk }
     },
 
-    [OPPONENT_SCOTT] =
+    [TRAINER_SCOTT] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_GUITARIST,
@@ -2698,10 +2698,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Scott
+        .party = {.NoItemDefaultMoves = gTrainerParty_Scott }
     },
 
-    [OPPONENT_HARVEY] =
+    [TRAINER_HARVEY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_GUITARIST,
@@ -2712,10 +2712,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Harvey
+        .party = {.NoItemDefaultMoves = gTrainerParty_Harvey }
     },
 
-    [OPPONENT_SHAWN] =
+    [TRAINER_SHAWN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_GUITARIST,
@@ -2726,10 +2726,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Shawn
+        .party = {.NoItemDefaultMoves = gTrainerParty_Shawn }
     },
 
-    [OPPONENT_RANDY] =
+    [TRAINER_RANDY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_GUITARIST,
@@ -2740,10 +2740,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Randy
+        .party = {.NoItemDefaultMoves = gTrainerParty_Randy }
     },
 
-    [OPPONENT_DALTON_1] =
+    [TRAINER_DALTON_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_GUITARIST,
@@ -2754,10 +2754,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Dalton1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dalton1 }
     },
 
-    [OPPONENT_DALTON_2] =
+    [TRAINER_DALTON_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_GUITARIST,
@@ -2768,10 +2768,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Dalton2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dalton2 }
     },
 
-    [OPPONENT_DALTON_3] =
+    [TRAINER_DALTON_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_GUITARIST,
@@ -2782,10 +2782,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Dalton3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dalton3 }
     },
 
-    [OPPONENT_DALTON_4] =
+    [TRAINER_DALTON_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_GUITARIST,
@@ -2796,10 +2796,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Dalton4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dalton4 }
     },
 
-    [OPPONENT_DALTON_5] =
+    [TRAINER_DALTON_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_GUITARIST,
@@ -2810,10 +2810,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Dalton5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dalton5 }
     },
 
-    [OPPONENT_COLE] =
+    [TRAINER_COLE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_KINDLER,
@@ -2824,10 +2824,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Cole
+        .party = {.NoItemDefaultMoves = gTrainerParty_Cole }
     },
 
-    [OPPONENT_FLINT] =
+    [TRAINER_FLINT] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_KINDLER,
@@ -2838,10 +2838,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Flint
+        .party = {.NoItemDefaultMoves = gTrainerParty_Flint }
     },
 
-    [OPPONENT_AXLE] =
+    [TRAINER_AXLE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_KINDLER,
@@ -2852,10 +2852,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Axle
+        .party = {.NoItemDefaultMoves = gTrainerParty_Axle }
     },
 
-    [OPPONENT_JAKE] =
+    [TRAINER_JAKE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_KINDLER,
@@ -2866,10 +2866,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Jake
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jake }
     },
 
-    [OPPONENT_ANDY] =
+    [TRAINER_ANDY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_KINDLER,
@@ -2880,10 +2880,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Andy
+        .party = {.NoItemDefaultMoves = gTrainerParty_Andy }
     },
 
-    [OPPONENT_BERNIE_1] =
+    [TRAINER_BERNIE_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_KINDLER,
@@ -2894,10 +2894,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Bernie1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Bernie1 }
     },
 
-    [OPPONENT_BERNIE_2] =
+    [TRAINER_BERNIE_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_KINDLER,
@@ -2908,10 +2908,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Bernie2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Bernie2 }
     },
 
-    [OPPONENT_BERNIE_3] =
+    [TRAINER_BERNIE_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_KINDLER,
@@ -2922,10 +2922,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Bernie3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Bernie3 }
     },
 
-    [OPPONENT_BERNIE_4] =
+    [TRAINER_BERNIE_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_KINDLER,
@@ -2936,10 +2936,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Bernie4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Bernie4 }
     },
 
-    [OPPONENT_BERNIE_5] =
+    [TRAINER_BERNIE_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_KINDLER,
@@ -2950,10 +2950,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Bernie5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Bernie5 }
     },
 
-    [OPPONENT_DREW] =
+    [TRAINER_DREW] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_CAMPER,
@@ -2964,10 +2964,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Drew
+        .party = {.NoItemCustomMoves = gTrainerParty_Drew }
     },
 
-    [OPPONENT_CLIFF] =
+    [TRAINER_CLIFF] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_CAMPER,
@@ -2978,10 +2978,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Cliff
+        .party = {.NoItemCustomMoves = gTrainerParty_Cliff }
     },
 
-    [OPPONENT_LARRY] =
+    [TRAINER_LARRY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_CAMPER,
@@ -2992,10 +2992,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Larry
+        .party = {.NoItemDefaultMoves = gTrainerParty_Larry }
     },
 
-    [OPPONENT_SHANE] =
+    [TRAINER_SHANE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_CAMPER,
@@ -3006,10 +3006,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Shane
+        .party = {.NoItemDefaultMoves = gTrainerParty_Shane }
     },
 
-    [OPPONENT_JUSTIN] =
+    [TRAINER_JUSTIN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_CAMPER,
@@ -3020,10 +3020,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Justin
+        .party = {.NoItemDefaultMoves = gTrainerParty_Justin }
     },
 
-    [OPPONENT_ETHAN_1] =
+    [TRAINER_ETHAN_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_CAMPER,
@@ -3034,10 +3034,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Ethan1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Ethan1 }
     },
 
-    [OPPONENT_JEFF] =
+    [TRAINER_JEFF] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_CAMPER,
@@ -3048,10 +3048,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jeff
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jeff }
     },
 
-    [OPPONENT_TRAVIS] =
+    [TRAINER_TRAVIS] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_CAMPER,
@@ -3062,10 +3062,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Travis
+        .party = {.NoItemDefaultMoves = gTrainerParty_Travis }
     },
 
-    [OPPONENT_ETHAN_2] =
+    [TRAINER_ETHAN_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_CAMPER,
@@ -3076,10 +3076,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Ethan2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Ethan2 }
     },
 
-    [OPPONENT_ETHAN_3] =
+    [TRAINER_ETHAN_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_CAMPER,
@@ -3090,10 +3090,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Ethan3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Ethan3 }
     },
 
-    [OPPONENT_ETHAN_4] =
+    [TRAINER_ETHAN_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_CAMPER,
@@ -3104,10 +3104,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Ethan4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Ethan4 }
     },
 
-    [OPPONENT_ETHAN_5] =
+    [TRAINER_ETHAN_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_CAMPER,
@@ -3118,10 +3118,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Ethan5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Ethan5 }
     },
 
-    [OPPONENT_BRENT] =
+    [TRAINER_BRENT] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_MANIAC,
@@ -3132,10 +3132,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Brent
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brent }
     },
 
-    [OPPONENT_DONALD] =
+    [TRAINER_DONALD] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_MANIAC,
@@ -3146,10 +3146,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Donald
+        .party = {.NoItemDefaultMoves = gTrainerParty_Donald }
     },
 
-    [OPPONENT_TAYLOR] =
+    [TRAINER_TAYLOR] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_MANIAC,
@@ -3160,10 +3160,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Taylor
+        .party = {.NoItemDefaultMoves = gTrainerParty_Taylor }
     },
 
-    [OPPONENT_BRANDON_1] =
+    [TRAINER_BRANDON_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_MANIAC,
@@ -3174,10 +3174,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Brandon1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brandon1 }
     },
 
-    [OPPONENT_DEREK] =
+    [TRAINER_DEREK] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_MANIAC,
@@ -3188,10 +3188,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Derek
+        .party = {.NoItemDefaultMoves = gTrainerParty_Derek }
     },
 
-    [OPPONENT_BRANDON_2] =
+    [TRAINER_BRANDON_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_MANIAC,
@@ -3202,10 +3202,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Brandon2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brandon2 }
     },
 
-    [OPPONENT_BRANDON_3] =
+    [TRAINER_BRANDON_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_MANIAC,
@@ -3216,10 +3216,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Brandon3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brandon3 }
     },
 
-    [OPPONENT_BRANDON_4] =
+    [TRAINER_BRANDON_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_MANIAC,
@@ -3230,10 +3230,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Brandon4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brandon4 }
     },
 
-    [OPPONENT_BRANDON_5] =
+    [TRAINER_BRANDON_5] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_BUG_MANIAC,
@@ -3244,10 +3244,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 5,
-        .party = gTrainerParty_Brandon5
+        .party = {.ItemDefaultMoves = gTrainerParty_Brandon5 }
     },
 
-    [OPPONENT_EDWARD] =
+    [TRAINER_EDWARD] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3258,10 +3258,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Edward
+        .party = {.NoItemCustomMoves = gTrainerParty_Edward }
     },
 
-    [OPPONENT_PRESTON] =
+    [TRAINER_PRESTON] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3272,10 +3272,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Preston
+        .party = {.NoItemDefaultMoves = gTrainerParty_Preston }
     },
 
-    [OPPONENT_VIRGIL] =
+    [TRAINER_VIRGIL] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3286,10 +3286,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Virgil
+        .party = {.NoItemDefaultMoves = gTrainerParty_Virgil }
     },
 
-    [OPPONENT_FRITZ] =
+    [TRAINER_FRITZ] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3300,10 +3300,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Fritz
+        .party = {.NoItemDefaultMoves = gTrainerParty_Fritz }
     },
 
-    [OPPONENT_WILLIAM] =
+    [TRAINER_WILLIAM] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3314,10 +3314,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_William
+        .party = {.NoItemDefaultMoves = gTrainerParty_William }
     },
 
-    [OPPONENT_JOSHUA] =
+    [TRAINER_JOSHUA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3328,10 +3328,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Joshua
+        .party = {.NoItemDefaultMoves = gTrainerParty_Joshua }
     },
 
-    [OPPONENT_CAMERON_1] =
+    [TRAINER_CAMERON_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3342,10 +3342,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Cameron1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Cameron1 }
     },
 
-    [OPPONENT_CAMERON_2] =
+    [TRAINER_CAMERON_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3356,10 +3356,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Cameron2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Cameron2 }
     },
 
-    [OPPONENT_CAMERON_3] =
+    [TRAINER_CAMERON_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3370,10 +3370,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Cameron3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Cameron3 }
     },
 
-    [OPPONENT_CAMERON_4] =
+    [TRAINER_CAMERON_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3384,10 +3384,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Cameron4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Cameron4 }
     },
 
-    [OPPONENT_CAMERON_5] =
+    [TRAINER_CAMERON_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3398,10 +3398,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Cameron5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Cameron5 }
     },
 
-    [OPPONENT_JACLYN] =
+    [TRAINER_JACLYN] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3412,10 +3412,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Jaclyn
+        .party = {.NoItemCustomMoves = gTrainerParty_Jaclyn }
     },
 
-    [OPPONENT_HANNAH] =
+    [TRAINER_HANNAH] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3426,10 +3426,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Hannah
+        .party = {.NoItemDefaultMoves = gTrainerParty_Hannah }
     },
 
-    [OPPONENT_SAMANTHA] =
+    [TRAINER_SAMANTHA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3440,10 +3440,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Samantha
+        .party = {.NoItemDefaultMoves = gTrainerParty_Samantha }
     },
 
-    [OPPONENT_MAURA] =
+    [TRAINER_MAURA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3454,10 +3454,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Maura
+        .party = {.NoItemDefaultMoves = gTrainerParty_Maura }
     },
 
-    [OPPONENT_KAYLA] =
+    [TRAINER_KAYLA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3468,10 +3468,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Kayla
+        .party = {.NoItemDefaultMoves = gTrainerParty_Kayla }
     },
 
-    [OPPONENT_ALEXIS] =
+    [TRAINER_ALEXIS] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3482,10 +3482,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Alexis
+        .party = {.NoItemDefaultMoves = gTrainerParty_Alexis }
     },
 
-    [OPPONENT_JACKI_1] =
+    [TRAINER_JACKI_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3496,10 +3496,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jacki1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jacki1 }
     },
 
-    [OPPONENT_JACKI_2] =
+    [TRAINER_JACKI_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3510,10 +3510,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jacki2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jacki2 }
     },
 
-    [OPPONENT_JACKI_3] =
+    [TRAINER_JACKI_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3524,10 +3524,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jacki3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jacki3 }
     },
 
-    [OPPONENT_JACKI_4] =
+    [TRAINER_JACKI_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3538,10 +3538,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jacki4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jacki4 }
     },
 
-    [OPPONENT_JACKI_5] =
+    [TRAINER_JACKI_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3552,10 +3552,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jacki5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jacki5 }
     },
 
-    [OPPONENT_WALTER_1] =
+    [TRAINER_WALTER_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_GENTLEMAN,
@@ -3566,10 +3566,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Walter1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Walter1 }
     },
 
-    [OPPONENT_TUCKER] =
+    [TRAINER_TUCKER] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_GENTLEMAN,
@@ -3580,10 +3580,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Tucker
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tucker }
     },
 
-    [OPPONENT_THOMAS] =
+    [TRAINER_THOMAS] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_GENTLEMAN,
@@ -3594,10 +3594,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Thomas
+        .party = {.NoItemDefaultMoves = gTrainerParty_Thomas }
     },
 
-    [OPPONENT_WALTER_2] =
+    [TRAINER_WALTER_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_GENTLEMAN,
@@ -3608,10 +3608,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Walter2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Walter2 }
     },
 
-    [OPPONENT_WALTER_3] =
+    [TRAINER_WALTER_3] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_GENTLEMAN,
@@ -3622,10 +3622,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Walter3
+        .party = {.NoItemCustomMoves = gTrainerParty_Walter3 }
     },
 
-    [OPPONENT_WALTER_4] =
+    [TRAINER_WALTER_4] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_GENTLEMAN,
@@ -3636,10 +3636,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Walter4
+        .party = {.NoItemCustomMoves = gTrainerParty_Walter4 }
     },
 
-    [OPPONENT_WALTER_5] =
+    [TRAINER_WALTER_5] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_GENTLEMAN,
@@ -3650,10 +3650,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Walter5
+        .party = {.NoItemCustomMoves = gTrainerParty_Walter5 }
     },
 
-    [OPPONENT_SIDNEY] =
+    [TRAINER_SIDNEY] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_ELITE_FOUR,
@@ -3664,10 +3664,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 5,
-        .party = gTrainerParty_Sidney
+        .party = {.ItemCustomMoves = gTrainerParty_Sidney }
     },
 
-    [OPPONENT_PHOEBE] =
+    [TRAINER_PHOEBE] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_ELITE_FOUR,
@@ -3678,10 +3678,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 5,
-        .party = gTrainerParty_Phoebe
+        .party = {.ItemCustomMoves = gTrainerParty_Phoebe }
     },
 
-    [OPPONENT_GLACIA] =
+    [TRAINER_GLACIA] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_ELITE_FOUR,
@@ -3692,10 +3692,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 5,
-        .party = gTrainerParty_Glacia
+        .party = {.ItemCustomMoves = gTrainerParty_Glacia }
     },
 
-    [OPPONENT_DRAKE] =
+    [TRAINER_DRAKE] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_ELITE_FOUR,
@@ -3706,10 +3706,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 5,
-        .party = gTrainerParty_Drake
+        .party = {.ItemCustomMoves = gTrainerParty_Drake }
     },
 
-    [OPPONENT_ROXANNE] =
+    [TRAINER_ROXANNE] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_LEADER,
@@ -3720,10 +3720,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Roxanne
+        .party = {.NoItemCustomMoves = gTrainerParty_Roxanne }
     },
 
-    [OPPONENT_BRAWLY] =
+    [TRAINER_BRAWLY] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_LEADER,
@@ -3734,10 +3734,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Brawly
+        .party = {.NoItemCustomMoves = gTrainerParty_Brawly }
     },
 
-    [OPPONENT_WATTSON] =
+    [TRAINER_WATTSON] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_LEADER,
@@ -3748,10 +3748,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Wattson
+        .party = {.NoItemCustomMoves = gTrainerParty_Wattson }
     },
 
-    [OPPONENT_FLANNERY] =
+    [TRAINER_FLANNERY] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_LEADER,
@@ -3762,10 +3762,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Flannery
+        .party = {.NoItemCustomMoves = gTrainerParty_Flannery }
     },
 
-    [OPPONENT_NORMAN] =
+    [TRAINER_NORMAN] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_LEADER,
@@ -3776,10 +3776,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Norman
+        .party = {.NoItemCustomMoves = gTrainerParty_Norman }
     },
 
-    [OPPONENT_WINONA] =
+    [TRAINER_WINONA] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_LEADER,
@@ -3790,10 +3790,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 4,
-        .party = gTrainerParty_Winona
+        .party = {.NoItemCustomMoves = gTrainerParty_Winona }
     },
 
-    [OPPONENT_TATE_AND_LIZA] =
+    [TRAINER_TATE_AND_LIZA] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_LEADER,
@@ -3804,10 +3804,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_TateAndLiza
+        .party = {.ItemCustomMoves = gTrainerParty_TateAndLiza }
     },
 
-    [OPPONENT_WALLACE] =
+    [TRAINER_WALLACE] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_LEADER,
@@ -3818,10 +3818,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 5,
-        .party = gTrainerParty_Wallace
+        .party = {.NoItemCustomMoves = gTrainerParty_Wallace }
     },
 
-    [OPPONENT_JERRY_1] =
+    [TRAINER_JERRY_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3832,10 +3832,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Jerry1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jerry1 }
     },
 
-    [OPPONENT_TED] =
+    [TRAINER_TED] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3846,10 +3846,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Ted
+        .party = {.NoItemDefaultMoves = gTrainerParty_Ted }
     },
 
-    [OPPONENT_PAUL] =
+    [TRAINER_PAUL] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3860,10 +3860,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Paul
+        .party = {.NoItemDefaultMoves = gTrainerParty_Paul }
     },
 
-    [OPPONENT_JERRY_2] =
+    [TRAINER_JERRY_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3874,10 +3874,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jerry2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jerry2 }
     },
 
-    [OPPONENT_JERRY_3] =
+    [TRAINER_JERRY_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3888,10 +3888,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jerry3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jerry3 }
     },
 
-    [OPPONENT_JERRY_4] =
+    [TRAINER_JERRY_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3902,10 +3902,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jerry4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jerry4 }
     },
 
-    [OPPONENT_JERRY_5] =
+    [TRAINER_JERRY_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3916,10 +3916,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Jerry5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jerry5 }
     },
 
-    [OPPONENT_KAREN_1] =
+    [TRAINER_KAREN_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3930,10 +3930,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Karen1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Karen1 }
     },
 
-    [OPPONENT_GEORGIA] =
+    [TRAINER_GEORGIA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3944,10 +3944,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Georgia
+        .party = {.NoItemDefaultMoves = gTrainerParty_Georgia }
     },
 
-    [OPPONENT_KAREN_2] =
+    [TRAINER_KAREN_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3958,10 +3958,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Karen2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Karen2 }
     },
 
-    [OPPONENT_KAREN_3] =
+    [TRAINER_KAREN_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3972,10 +3972,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Karen3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Karen3 }
     },
 
-    [OPPONENT_KAREN_4] =
+    [TRAINER_KAREN_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3986,10 +3986,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Karen4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Karen4 }
     },
 
-    [OPPONENT_KAREN_5] =
+    [TRAINER_KAREN_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -4000,10 +4000,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Karen5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Karen5 }
     },
 
-    [OPPONENT_KATE_AND_JOY] =
+    [TRAINER_KATE_AND_JOY] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_SR_AND_JR,
@@ -4014,10 +4014,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_KateAndJoy
+        .party = {.NoItemCustomMoves = gTrainerParty_KateAndJoy }
     },
 
-    [OPPONENT_ANNA_AND_MEG_1] =
+    [TRAINER_ANNA_AND_MEG_1] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_SR_AND_JR,
@@ -4028,10 +4028,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_AnnaAndMeg1
+        .party = {.NoItemCustomMoves = gTrainerParty_AnnaAndMeg1 }
     },
 
-    [OPPONENT_ANNA_AND_MEG_2] =
+    [TRAINER_ANNA_AND_MEG_2] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_SR_AND_JR,
@@ -4042,10 +4042,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_AnnaAndMeg2
+        .party = {.NoItemCustomMoves = gTrainerParty_AnnaAndMeg2 }
     },
 
-    [OPPONENT_ANNA_AND_MEG_3] =
+    [TRAINER_ANNA_AND_MEG_3] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_SR_AND_JR,
@@ -4056,10 +4056,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_AnnaAndMeg3
+        .party = {.NoItemCustomMoves = gTrainerParty_AnnaAndMeg3 }
     },
 
-    [OPPONENT_ANNA_AND_MEG_4] =
+    [TRAINER_ANNA_AND_MEG_4] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_SR_AND_JR,
@@ -4070,10 +4070,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_AnnaAndMeg4
+        .party = {.NoItemCustomMoves = gTrainerParty_AnnaAndMeg4 }
     },
 
-    [OPPONENT_ANNA_AND_MEG_5] =
+    [TRAINER_ANNA_AND_MEG_5] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_SR_AND_JR,
@@ -4084,10 +4084,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_AnnaAndMeg5
+        .party = {.NoItemCustomMoves = gTrainerParty_AnnaAndMeg5 }
     },
 
-    [OPPONENT_VICTOR] =
+    [TRAINER_VICTOR] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_WINSTRATE,
@@ -4098,10 +4098,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Victor
+        .party = {.ItemDefaultMoves = gTrainerParty_Victor }
     },
 
-    [OPPONENT_MIGUEL_1] =
+    [TRAINER_MIGUEL_1] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4112,10 +4112,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Miguel1
+        .party = {.ItemDefaultMoves = gTrainerParty_Miguel1 }
     },
 
-    [OPPONENT_COLTON] =
+    [TRAINER_COLTON] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4126,10 +4126,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 6,
-        .party = gTrainerParty_Colton
+        .party = {.ItemCustomMoves = gTrainerParty_Colton }
     },
 
-    [OPPONENT_MIGUEL_2] =
+    [TRAINER_MIGUEL_2] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4140,10 +4140,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Miguel2
+        .party = {.ItemDefaultMoves = gTrainerParty_Miguel2 }
     },
 
-    [OPPONENT_MIGUEL_3] =
+    [TRAINER_MIGUEL_3] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4154,10 +4154,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Miguel3
+        .party = {.ItemDefaultMoves = gTrainerParty_Miguel3 }
     },
 
-    [OPPONENT_MIGUEL_4] =
+    [TRAINER_MIGUEL_4] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4168,10 +4168,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Miguel4
+        .party = {.ItemDefaultMoves = gTrainerParty_Miguel4 }
     },
 
-    [OPPONENT_MIGUEL_5] =
+    [TRAINER_MIGUEL_5] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4182,10 +4182,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Miguel5
+        .party = {.ItemDefaultMoves = gTrainerParty_Miguel5 }
     },
 
-    [OPPONENT_VICTORIA] =
+    [TRAINER_VICTORIA] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_WINSTRATE,
@@ -4196,10 +4196,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x3,
         .partySize = 1,
-        .party = gTrainerParty_Victoria
+        .party = {.ItemDefaultMoves = gTrainerParty_Victoria }
     },
 
-    [OPPONENT_VANESSA] =
+    [TRAINER_VANESSA] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4210,10 +4210,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Vanessa
+        .party = {.ItemDefaultMoves = gTrainerParty_Vanessa }
     },
 
-    [OPPONENT_MARISSA] =
+    [TRAINER_MARISSA] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4224,10 +4224,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Marissa
+        .party = {.ItemDefaultMoves = gTrainerParty_Marissa }
     },
 
-    [OPPONENT_ISABEL_1] =
+    [TRAINER_ISABEL_1] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4238,10 +4238,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Isabel1
+        .party = {.ItemDefaultMoves = gTrainerParty_Isabel1 }
     },
 
-    [OPPONENT_ISABEL_2] =
+    [TRAINER_ISABEL_2] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4252,10 +4252,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Isabel2
+        .party = {.ItemDefaultMoves = gTrainerParty_Isabel2 }
     },
 
-    [OPPONENT_ISABEL_3] =
+    [TRAINER_ISABEL_3] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4266,10 +4266,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Isabel3
+        .party = {.ItemDefaultMoves = gTrainerParty_Isabel3 }
     },
 
-    [OPPONENT_ISABEL_4] =
+    [TRAINER_ISABEL_4] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4280,10 +4280,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Isabel4
+        .party = {.ItemDefaultMoves = gTrainerParty_Isabel4 }
     },
 
-    [OPPONENT_ISABEL_5] =
+    [TRAINER_ISABEL_5] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4294,10 +4294,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Isabel5
+        .party = {.ItemDefaultMoves = gTrainerParty_Isabel5 }
     },
 
-    [OPPONENT_TIMOTHY_1] =
+    [TRAINER_TIMOTHY_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_EXPERT,
@@ -4308,10 +4308,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Timothy1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Timothy1 }
     },
 
-    [OPPONENT_TIMOTHY_2] =
+    [TRAINER_TIMOTHY_2] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_EXPERT,
@@ -4322,10 +4322,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Timothy2
+        .party = {.NoItemCustomMoves = gTrainerParty_Timothy2 }
     },
 
-    [OPPONENT_TIMOTHY_3] =
+    [TRAINER_TIMOTHY_3] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_EXPERT,
@@ -4336,10 +4336,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Timothy3
+        .party = {.NoItemCustomMoves = gTrainerParty_Timothy3 }
     },
 
-    [OPPONENT_TIMOTHY_4] =
+    [TRAINER_TIMOTHY_4] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_EXPERT,
@@ -4350,10 +4350,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Timothy4
+        .party = {.NoItemCustomMoves = gTrainerParty_Timothy4 }
     },
 
-    [OPPONENT_TIMOTHY_5] =
+    [TRAINER_TIMOTHY_5] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_EXPERT,
@@ -4364,10 +4364,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Timothy5
+        .party = {.NoItemCustomMoves = gTrainerParty_Timothy5 }
     },
 
-    [OPPONENT_VICKY] =
+    [TRAINER_VICKY] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_WINSTRATE,
@@ -4378,10 +4378,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Vicky
+        .party = {.NoItemCustomMoves = gTrainerParty_Vicky }
     },
 
-    [OPPONENT_SHELBY_1] =
+    [TRAINER_SHELBY_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_EXPERT,
@@ -4392,10 +4392,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Shelby1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Shelby1 }
     },
 
-    [OPPONENT_SHELBY_2] =
+    [TRAINER_SHELBY_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_EXPERT,
@@ -4406,10 +4406,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Shelby2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Shelby2 }
     },
 
-    [OPPONENT_SHELBY_3] =
+    [TRAINER_SHELBY_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_EXPERT,
@@ -4420,10 +4420,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Shelby3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Shelby3 }
     },
 
-    [OPPONENT_SHELBY_4] =
+    [TRAINER_SHELBY_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_EXPERT,
@@ -4434,10 +4434,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Shelby4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Shelby4 }
     },
 
-    [OPPONENT_SHELBY_5] =
+    [TRAINER_SHELBY_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_EXPERT,
@@ -4448,10 +4448,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Shelby5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Shelby5 }
     },
 
-    [OPPONENT_CALVIN_1] =
+    [TRAINER_CALVIN_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4462,10 +4462,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Calvin1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Calvin1 }
     },
 
-    [OPPONENT_BILLY] =
+    [TRAINER_BILLY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4476,10 +4476,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Billy
+        .party = {.NoItemDefaultMoves = gTrainerParty_Billy }
     },
 
-    [OPPONENT_JOSH] =
+    [TRAINER_JOSH] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4490,10 +4490,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Josh
+        .party = {.NoItemCustomMoves = gTrainerParty_Josh }
     },
 
-    [OPPONENT_TOMMY] =
+    [TRAINER_TOMMY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4504,10 +4504,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Tommy
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tommy }
     },
 
-    [OPPONENT_JOEY] =
+    [TRAINER_JOEY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4518,10 +4518,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Joey
+        .party = {.NoItemDefaultMoves = gTrainerParty_Joey }
     },
 
-    [OPPONENT_BEN] =
+    [TRAINER_BEN] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4532,10 +4532,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Ben
+        .party = {.NoItemCustomMoves = gTrainerParty_Ben }
     },
 
-    [OPPONENT_ANONYMOUS_5] =
+    [TRAINER_ANONYMOUS_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4546,10 +4546,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Anonymous5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous5 }
     },
 
-    [OPPONENT_KEVIN] =
+    [TRAINER_KEVIN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4560,10 +4560,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Kevin
+        .party = {.NoItemDefaultMoves = gTrainerParty_Kevin }
     },
 
-    [OPPONENT_NEAL] =
+    [TRAINER_NEAL] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4574,10 +4574,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Neal
+        .party = {.NoItemDefaultMoves = gTrainerParty_Neal }
     },
 
-    [OPPONENT_DILLON] =
+    [TRAINER_DILLON] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4588,10 +4588,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Dillon
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dillon }
     },
 
-    [OPPONENT_CALVIN_2] =
+    [TRAINER_CALVIN_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4602,10 +4602,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Calvin2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Calvin2 }
     },
 
-    [OPPONENT_CALVIN_3] =
+    [TRAINER_CALVIN_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4616,10 +4616,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Calvin3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Calvin3 }
     },
 
-    [OPPONENT_CALVIN_4] =
+    [TRAINER_CALVIN_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4630,10 +4630,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Calvin4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Calvin4 }
     },
 
-    [OPPONENT_CALVIN_5] =
+    [TRAINER_CALVIN_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4644,10 +4644,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Calvin5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Calvin5 }
     },
 
-    [OPPONENT_EDDIE] =
+    [TRAINER_EDDIE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4658,10 +4658,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Eddie
+        .party = {.NoItemDefaultMoves = gTrainerParty_Eddie }
     },
 
-    [OPPONENT_ALLEN] =
+    [TRAINER_ALLEN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4672,10 +4672,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Allen
+        .party = {.NoItemDefaultMoves = gTrainerParty_Allen }
     },
 
-    [OPPONENT_TIMMY] =
+    [TRAINER_TIMMY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4686,10 +4686,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Timmy
+        .party = {.NoItemDefaultMoves = gTrainerParty_Timmy }
     },
 
-    [OPPONENT_STEVEN] =
+    [TRAINER_STEVEN] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_CHAMPION,
@@ -4700,10 +4700,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 6,
-        .party = gTrainerParty_Steven
+        .party = {.ItemCustomMoves = gTrainerParty_Steven }
     },
 
-    [OPPONENT_ANDREW] =
+    [TRAINER_ANDREW] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4714,10 +4714,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Andrew
+        .party = {.NoItemDefaultMoves = gTrainerParty_Andrew }
     },
 
-    [OPPONENT_IVAN] =
+    [TRAINER_IVAN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4728,10 +4728,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Ivan
+        .party = {.NoItemDefaultMoves = gTrainerParty_Ivan }
     },
 
-    [OPPONENT_CLAUDE] =
+    [TRAINER_CLAUDE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4742,10 +4742,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Claude
+        .party = {.NoItemDefaultMoves = gTrainerParty_Claude }
     },
 
-    [OPPONENT_ELLIOT_1] =
+    [TRAINER_ELLIOT_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4756,10 +4756,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Elliot1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Elliot1 }
     },
 
-    [OPPONENT_NED] =
+    [TRAINER_NED] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4770,10 +4770,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Ned
+        .party = {.NoItemDefaultMoves = gTrainerParty_Ned }
     },
 
-    [OPPONENT_DALE] =
+    [TRAINER_DALE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4784,10 +4784,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Dale
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dale }
     },
 
-    [OPPONENT_NOLAN] =
+    [TRAINER_NOLAN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4798,10 +4798,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Nolan
+        .party = {.NoItemDefaultMoves = gTrainerParty_Nolan }
     },
 
-    [OPPONENT_BARNY] =
+    [TRAINER_BARNY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4812,10 +4812,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Barny
+        .party = {.NoItemDefaultMoves = gTrainerParty_Barny }
     },
 
-    [OPPONENT_WADE] =
+    [TRAINER_WADE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4826,10 +4826,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Wade
+        .party = {.NoItemDefaultMoves = gTrainerParty_Wade }
     },
 
-    [OPPONENT_CARTER] =
+    [TRAINER_CARTER] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4840,10 +4840,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Carter
+        .party = {.NoItemDefaultMoves = gTrainerParty_Carter }
     },
 
-    [OPPONENT_ELLIOT_2] =
+    [TRAINER_ELLIOT_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4854,10 +4854,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Elliot2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Elliot2 }
     },
 
-    [OPPONENT_ELLIOT_3] =
+    [TRAINER_ELLIOT_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4868,10 +4868,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Elliot3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Elliot3 }
     },
 
-    [OPPONENT_ELLIOT_4] =
+    [TRAINER_ELLIOT_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4882,10 +4882,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Elliot4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Elliot4 }
     },
 
-    [OPPONENT_ELLIOT_5] =
+    [TRAINER_ELLIOT_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4896,10 +4896,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x3,
         .partySize = 4,
-        .party = gTrainerParty_Elliot5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Elliot5 }
     },
 
-    [OPPONENT_RONALD] =
+    [TRAINER_RONALD] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4910,10 +4910,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 6,
-        .party = gTrainerParty_Ronald
+        .party = {.NoItemDefaultMoves = gTrainerParty_Ronald }
     },
 
-    [OPPONENT_JACOB] =
+    [TRAINER_JACOB] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -4924,10 +4924,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Jacob
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jacob }
     },
 
-    [OPPONENT_ANTHONY] =
+    [TRAINER_ANTHONY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -4938,10 +4938,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Anthony
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anthony }
     },
 
-    [OPPONENT_BENJAMIN_1] =
+    [TRAINER_BENJAMIN_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -4952,10 +4952,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Benjamin1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Benjamin1 }
     },
 
-    [OPPONENT_BENJAMIN_2] =
+    [TRAINER_BENJAMIN_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -4966,10 +4966,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Benjamin2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Benjamin2 }
     },
 
-    [OPPONENT_BENJAMIN_3] =
+    [TRAINER_BENJAMIN_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -4980,10 +4980,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Benjamin3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Benjamin3 }
     },
 
-    [OPPONENT_BENJAMIN_4] =
+    [TRAINER_BENJAMIN_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -4994,10 +4994,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Benjamin4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Benjamin4 }
     },
 
-    [OPPONENT_BENJAMIN_5] =
+    [TRAINER_BENJAMIN_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5008,10 +5008,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Benjamin5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Benjamin5 }
     },
 
-    [OPPONENT_ABIGAIL_1] =
+    [TRAINER_ABIGAIL_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5022,10 +5022,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Abigail1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Abigail1 }
     },
 
-    [OPPONENT_JASMINE] =
+    [TRAINER_JASMINE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5036,10 +5036,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Jasmine
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jasmine }
     },
 
-    [OPPONENT_ABIGAIL_2] =
+    [TRAINER_ABIGAIL_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5050,10 +5050,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Abigail2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Abigail2 }
     },
 
-    [OPPONENT_ABIGAIL_3] =
+    [TRAINER_ABIGAIL_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5064,10 +5064,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Abigail3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Abigail3 }
     },
 
-    [OPPONENT_ABIGAIL_4] =
+    [TRAINER_ABIGAIL_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5078,10 +5078,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Abigail4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Abigail4 }
     },
 
-    [OPPONENT_ABIGAIL_5] =
+    [TRAINER_ABIGAIL_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5092,10 +5092,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Abigail5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Abigail5 }
     },
 
-    [OPPONENT_DYLAN_1] =
+    [TRAINER_DYLAN_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5106,10 +5106,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Dylan1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dylan1 }
     },
 
-    [OPPONENT_DYLAN_2] =
+    [TRAINER_DYLAN_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5120,10 +5120,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Dylan2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dylan2 }
     },
 
-    [OPPONENT_DYLAN_3] =
+    [TRAINER_DYLAN_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5134,10 +5134,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Dylan3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dylan3 }
     },
 
-    [OPPONENT_DYLAN_4] =
+    [TRAINER_DYLAN_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5148,10 +5148,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Dylan4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dylan4 }
     },
 
-    [OPPONENT_DYLAN_5] =
+    [TRAINER_DYLAN_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5162,10 +5162,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Dylan5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dylan5 }
     },
 
-    [OPPONENT_MARIA_1] =
+    [TRAINER_MARIA_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5176,10 +5176,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Maria1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Maria1 }
     },
 
-    [OPPONENT_MARIA_2] =
+    [TRAINER_MARIA_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5190,10 +5190,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Maria2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Maria2 }
     },
 
-    [OPPONENT_MARIA_3] =
+    [TRAINER_MARIA_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5204,10 +5204,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Maria3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Maria3 }
     },
 
-    [OPPONENT_MARIA_4] =
+    [TRAINER_MARIA_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5218,10 +5218,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Maria4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Maria4 }
     },
 
-    [OPPONENT_MARIA_5] =
+    [TRAINER_MARIA_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5232,10 +5232,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Maria5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Maria5 }
     },
 
-    [OPPONENT_CALEB] =
+    [TRAINER_CALEB] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5246,10 +5246,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Caleb
+        .party = {.NoItemDefaultMoves = gTrainerParty_Caleb }
     },
 
-    [OPPONENT_ANONYMOUS_6] =
+    [TRAINER_ANONYMOUS_6] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5260,10 +5260,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Anonymous6
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous6 }
     },
 
-    [OPPONENT_ISAIAH_1] =
+    [TRAINER_ISAIAH_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5274,10 +5274,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Isaiah1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Isaiah1 }
     },
 
-    [OPPONENT_ANONYMOUS_7] =
+    [TRAINER_ANONYMOUS_7] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5288,10 +5288,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Anonymous7
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous7 }
     },
 
-    [OPPONENT_CHASE] =
+    [TRAINER_CHASE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5302,10 +5302,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Chase
+        .party = {.NoItemDefaultMoves = gTrainerParty_Chase }
     },
 
-    [OPPONENT_ISAIAH_2] =
+    [TRAINER_ISAIAH_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5316,10 +5316,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Isaiah2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Isaiah2 }
     },
 
-    [OPPONENT_ISAIAH_3] =
+    [TRAINER_ISAIAH_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5330,10 +5330,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Isaiah3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Isaiah3 }
     },
 
-    [OPPONENT_ISAIAH_4] =
+    [TRAINER_ISAIAH_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5344,10 +5344,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Isaiah4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Isaiah4 }
     },
 
-    [OPPONENT_ISAIAH_5] =
+    [TRAINER_ISAIAH_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5358,10 +5358,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Isaiah5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Isaiah5 }
     },
 
-    [OPPONENT_ANONYMOUS_8] =
+    [TRAINER_ANONYMOUS_8] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5372,10 +5372,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Anonymous8
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous8 }
     },
 
-    [OPPONENT_CONNOR] =
+    [TRAINER_CONNOR] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5386,10 +5386,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Connor
+        .party = {.NoItemDefaultMoves = gTrainerParty_Connor }
     },
 
-    [OPPONENT_ANONYMOUS_9] =
+    [TRAINER_ANONYMOUS_9] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5400,10 +5400,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Anonymous9
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous9 }
     },
 
-    [OPPONENT_KATELYN_1] =
+    [TRAINER_KATELYN_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5414,10 +5414,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Katelyn1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Katelyn1 }
     },
 
-    [OPPONENT_ALLISON] =
+    [TRAINER_ALLISON] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5428,10 +5428,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Allison
+        .party = {.NoItemDefaultMoves = gTrainerParty_Allison }
     },
 
-    [OPPONENT_KATELYN_2] =
+    [TRAINER_KATELYN_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5442,10 +5442,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Katelyn2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Katelyn2 }
     },
 
-    [OPPONENT_KATELYN_3] =
+    [TRAINER_KATELYN_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5456,10 +5456,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Katelyn3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Katelyn3 }
     },
 
-    [OPPONENT_KATELYN_4] =
+    [TRAINER_KATELYN_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5470,10 +5470,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Katelyn4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Katelyn4 }
     },
 
-    [OPPONENT_KATELYN_5] =
+    [TRAINER_KATELYN_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5484,10 +5484,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Katelyn5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Katelyn5 }
     },
 
-    [OPPONENT_NICOLAS_1] =
+    [TRAINER_NICOLAS_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_DRAGON_TAMER,
@@ -5498,10 +5498,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Nicolas1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Nicolas1 }
     },
 
-    [OPPONENT_NICOLAS_2] =
+    [TRAINER_NICOLAS_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_DRAGON_TAMER,
@@ -5512,10 +5512,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Nicolas2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Nicolas2 }
     },
 
-    [OPPONENT_NICOLAS_3] =
+    [TRAINER_NICOLAS_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_DRAGON_TAMER,
@@ -5526,10 +5526,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Nicolas3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Nicolas3 }
     },
 
-    [OPPONENT_NICOLAS_4] =
+    [TRAINER_NICOLAS_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_DRAGON_TAMER,
@@ -5540,10 +5540,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Nicolas4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Nicolas4 }
     },
 
-    [OPPONENT_NICOLAS_5] =
+    [TRAINER_NICOLAS_5] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_DRAGON_TAMER,
@@ -5554,10 +5554,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Nicolas5
+        .party = {.ItemDefaultMoves = gTrainerParty_Nicolas5 }
     },
 
-    [OPPONENT_AARON] =
+    [TRAINER_AARON] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_DRAGON_TAMER,
@@ -5568,10 +5568,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Aaron
+        .party = {.NoItemDefaultMoves = gTrainerParty_Aaron }
     },
 
-    [OPPONENT_PERRY] =
+    [TRAINER_PERRY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5582,10 +5582,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Perry
+        .party = {.NoItemDefaultMoves = gTrainerParty_Perry }
     },
 
-    [OPPONENT_HUGH] =
+    [TRAINER_HUGH] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5596,10 +5596,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Hugh
+        .party = {.NoItemDefaultMoves = gTrainerParty_Hugh }
     },
 
-    [OPPONENT_PHIL] =
+    [TRAINER_PHIL] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5610,10 +5610,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Phil
+        .party = {.NoItemDefaultMoves = gTrainerParty_Phil }
     },
 
-    [OPPONENT_JARED] =
+    [TRAINER_JARED] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5624,10 +5624,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Jared
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jared }
     },
 
-    [OPPONENT_ANONYMOUS_10] =
+    [TRAINER_ANONYMOUS_10] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5638,10 +5638,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Anonymous10
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous10 }
     },
 
-    [OPPONENT_TANNER] =
+    [TRAINER_TANNER] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5652,10 +5652,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Tanner
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tanner }
     },
 
-    [OPPONENT_WILL] =
+    [TRAINER_WILL] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5666,10 +5666,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Will
+        .party = {.NoItemDefaultMoves = gTrainerParty_Will }
     },
 
-    [OPPONENT_COLIN] =
+    [TRAINER_COLIN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5680,10 +5680,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Colin
+        .party = {.NoItemDefaultMoves = gTrainerParty_Colin }
     },
 
-    [OPPONENT_ROBERT_1] =
+    [TRAINER_ROBERT_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5694,10 +5694,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Robert1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Robert1 }
     },
 
-    [OPPONENT_BENNY] =
+    [TRAINER_BENNY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5708,10 +5708,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Benny
+        .party = {.NoItemDefaultMoves = gTrainerParty_Benny }
     },
 
-    [OPPONENT_CHESTER] =
+    [TRAINER_CHESTER] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5722,10 +5722,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Chester
+        .party = {.NoItemDefaultMoves = gTrainerParty_Chester }
     },
 
-    [OPPONENT_ROBERT_2] =
+    [TRAINER_ROBERT_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5736,10 +5736,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Robert2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Robert2 }
     },
 
-    [OPPONENT_ROBERT_3] =
+    [TRAINER_ROBERT_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5750,10 +5750,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Robert3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Robert3 }
     },
 
-    [OPPONENT_ROBERT_4] =
+    [TRAINER_ROBERT_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5764,10 +5764,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Robert4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Robert4 }
     },
 
-    [OPPONENT_ROBERT_5] =
+    [TRAINER_ROBERT_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5778,10 +5778,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Robert5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Robert5 }
     },
 
-    [OPPONENT_ALEX] =
+    [TRAINER_ALEX] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5792,10 +5792,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Alex
+        .party = {.NoItemDefaultMoves = gTrainerParty_Alex }
     },
 
-    [OPPONENT_BECK] =
+    [TRAINER_BECK] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5806,10 +5806,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Beck
+        .party = {.NoItemDefaultMoves = gTrainerParty_Beck }
     },
 
-    [OPPONENT_YASU] =
+    [TRAINER_YASU] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -5820,10 +5820,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x3,
         .partySize = 1,
-        .party = gTrainerParty_Yasu
+        .party = {.NoItemDefaultMoves = gTrainerParty_Yasu }
     },
 
-    [OPPONENT_TAKASHI] =
+    [TRAINER_TAKASHI] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -5834,10 +5834,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x3,
         .partySize = 3,
-        .party = gTrainerParty_Takashi
+        .party = {.NoItemDefaultMoves = gTrainerParty_Takashi }
     },
 
-    [OPPONENT_MAKOTO] =
+    [TRAINER_MAKOTO] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -5848,10 +5848,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x0,
         .partySize = 1,
-        .party = gTrainerParty_Makoto
+        .party = {.NoItemDefaultMoves = gTrainerParty_Makoto }
     },
 
-    [OPPONENT_HIDEO_1] =
+    [TRAINER_HIDEO_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -5862,10 +5862,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x0,
         .partySize = 4,
-        .party = gTrainerParty_Hideo1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Hideo1 }
     },
 
-    [OPPONENT_LAO_1] =
+    [TRAINER_LAO_1] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -5876,10 +5876,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x0,
         .partySize = 4,
-        .party = gTrainerParty_Lao1
+        .party = {.NoItemCustomMoves = gTrainerParty_Lao1 }
     },
 
-    [OPPONENT_LUNG] =
+    [TRAINER_LUNG] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -5890,10 +5890,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x0,
         .partySize = 2,
-        .party = gTrainerParty_Lung
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lung }
     },
 
-    [OPPONENT_LAO_2] =
+    [TRAINER_LAO_2] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -5904,10 +5904,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x0,
         .partySize = 4,
-        .party = gTrainerParty_Lao2
+        .party = {.NoItemCustomMoves = gTrainerParty_Lao2 }
     },
 
-    [OPPONENT_LAO_3] =
+    [TRAINER_LAO_3] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -5918,10 +5918,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x0,
         .partySize = 4,
-        .party = gTrainerParty_Lao3
+        .party = {.NoItemCustomMoves = gTrainerParty_Lao3 }
     },
 
-    [OPPONENT_LAO_4] =
+    [TRAINER_LAO_4] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -5932,10 +5932,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x0,
         .partySize = 4,
-        .party = gTrainerParty_Lao4
+        .party = {.NoItemCustomMoves = gTrainerParty_Lao4 }
     },
 
-    [OPPONENT_LAO_5] =
+    [TRAINER_LAO_5] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -5946,10 +5946,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x0,
         .partySize = 4,
-        .party = gTrainerParty_Lao5
+        .party = {.ItemCustomMoves = gTrainerParty_Lao5 }
     },
 
-    [OPPONENT_TESSA] =
+    [TRAINER_TESSA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -5960,10 +5960,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Tessa
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tessa }
     },
 
-    [OPPONENT_LAURA] =
+    [TRAINER_LAURA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -5974,10 +5974,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Laura
+        .party = {.NoItemDefaultMoves = gTrainerParty_Laura }
     },
 
-    [OPPONENT_CYNDY_1] =
+    [TRAINER_CYNDY_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -5988,10 +5988,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Cyndy1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Cyndy1 }
     },
 
-    [OPPONENT_CORA] =
+    [TRAINER_CORA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -6002,10 +6002,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Cora
+        .party = {.NoItemDefaultMoves = gTrainerParty_Cora }
     },
 
-    [OPPONENT_JILL] =
+    [TRAINER_JILL] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -6016,10 +6016,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Jill
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jill }
     },
 
-    [OPPONENT_CYNDY_2] =
+    [TRAINER_CYNDY_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -6030,10 +6030,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Cyndy2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Cyndy2 }
     },
 
-    [OPPONENT_CYNDY_3] =
+    [TRAINER_CYNDY_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -6044,10 +6044,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Cyndy3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Cyndy3 }
     },
 
-    [OPPONENT_CYNDY_4] =
+    [TRAINER_CYNDY_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -6058,10 +6058,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Cyndy4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Cyndy4 }
     },
 
-    [OPPONENT_CYNDY_5] =
+    [TRAINER_CYNDY_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -6072,10 +6072,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Cyndy5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Cyndy5 }
     },
 
-    [OPPONENT_MADELINE_1] =
+    [TRAINER_MADELINE_1] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_PARASOL_LADY,
@@ -6086,10 +6086,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Madeline1
+        .party = {.NoItemCustomMoves = gTrainerParty_Madeline1 }
     },
 
-    [OPPONENT_CLARISSA] =
+    [TRAINER_CLARISSA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PARASOL_LADY,
@@ -6100,10 +6100,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Clarissa
+        .party = {.NoItemDefaultMoves = gTrainerParty_Clarissa }
     },
 
-    [OPPONENT_ANGELICA] =
+    [TRAINER_ANGELICA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PARASOL_LADY,
@@ -6114,10 +6114,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Angelica
+        .party = {.NoItemDefaultMoves = gTrainerParty_Angelica }
     },
 
-    [OPPONENT_MADELINE_2] =
+    [TRAINER_MADELINE_2] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_PARASOL_LADY,
@@ -6128,10 +6128,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Madeline2
+        .party = {.NoItemCustomMoves = gTrainerParty_Madeline2 }
     },
 
-    [OPPONENT_MADELINE_3] =
+    [TRAINER_MADELINE_3] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_PARASOL_LADY,
@@ -6142,10 +6142,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Madeline3
+        .party = {.NoItemCustomMoves = gTrainerParty_Madeline3 }
     },
 
-    [OPPONENT_MADELINE_4] =
+    [TRAINER_MADELINE_4] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_PARASOL_LADY,
@@ -6156,10 +6156,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Madeline4
+        .party = {.NoItemCustomMoves = gTrainerParty_Madeline4 }
     },
 
-    [OPPONENT_MADELINE_5] =
+    [TRAINER_MADELINE_5] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_PARASOL_LADY,
@@ -6170,10 +6170,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Madeline5
+        .party = {.NoItemCustomMoves = gTrainerParty_Madeline5 }
     },
 
-    [OPPONENT_BEVERLY] =
+    [TRAINER_BEVERLY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6184,10 +6184,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Beverly
+        .party = {.NoItemDefaultMoves = gTrainerParty_Beverly }
     },
 
-    [OPPONENT_DAWN] =
+    [TRAINER_DAWN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6198,10 +6198,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Dawn
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dawn }
     },
 
-    [OPPONENT_NICOLE] =
+    [TRAINER_NICOLE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6212,10 +6212,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Nicole
+        .party = {.NoItemDefaultMoves = gTrainerParty_Nicole }
     },
 
-    [OPPONENT_DENISE] =
+    [TRAINER_DENISE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6226,10 +6226,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Denise
+        .party = {.NoItemDefaultMoves = gTrainerParty_Denise }
     },
 
-    [OPPONENT_BETH] =
+    [TRAINER_BETH] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6240,10 +6240,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Beth
+        .party = {.NoItemDefaultMoves = gTrainerParty_Beth }
     },
 
-    [OPPONENT_TARA] =
+    [TRAINER_TARA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6254,10 +6254,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Tara
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tara }
     },
 
-    [OPPONENT_MISSY] =
+    [TRAINER_MISSY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6268,10 +6268,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Missy
+        .party = {.NoItemDefaultMoves = gTrainerParty_Missy }
     },
 
-    [OPPONENT_ALICE] =
+    [TRAINER_ALICE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6282,10 +6282,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Alice
+        .party = {.NoItemDefaultMoves = gTrainerParty_Alice }
     },
 
-    [OPPONENT_JENNY_1] =
+    [TRAINER_JENNY_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6296,10 +6296,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Jenny1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jenny1 }
     },
 
-    [OPPONENT_GRACE] =
+    [TRAINER_GRACE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6310,10 +6310,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Grace
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grace }
     },
 
-    [OPPONENT_TANYA] =
+    [TRAINER_TANYA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6324,10 +6324,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Tanya
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tanya }
     },
 
-    [OPPONENT_SHARON] =
+    [TRAINER_SHARON] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6338,10 +6338,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Sharon
+        .party = {.NoItemDefaultMoves = gTrainerParty_Sharon }
     },
 
-    [OPPONENT_NIKKI] =
+    [TRAINER_NIKKI] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6352,10 +6352,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Nikki
+        .party = {.NoItemDefaultMoves = gTrainerParty_Nikki }
     },
 
-    [OPPONENT_BRENDA] =
+    [TRAINER_BRENDA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6366,10 +6366,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Brenda
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brenda }
     },
 
-    [OPPONENT_KATIE] =
+    [TRAINER_KATIE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6380,10 +6380,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Katie
+        .party = {.NoItemDefaultMoves = gTrainerParty_Katie }
     },
 
-    [OPPONENT_SUSIE] =
+    [TRAINER_SUSIE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6394,10 +6394,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Susie
+        .party = {.NoItemDefaultMoves = gTrainerParty_Susie }
     },
 
-    [OPPONENT_KARA] =
+    [TRAINER_KARA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6408,10 +6408,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Kara
+        .party = {.NoItemDefaultMoves = gTrainerParty_Kara }
     },
 
-    [OPPONENT_DANA] =
+    [TRAINER_DANA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6422,10 +6422,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Dana
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dana }
     },
 
-    [OPPONENT_ERIN] =
+    [TRAINER_ERIN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6436,10 +6436,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Erin
+        .party = {.NoItemDefaultMoves = gTrainerParty_Erin }
     },
 
-    [OPPONENT_DEBRA] =
+    [TRAINER_DEBRA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6450,10 +6450,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Debra
+        .party = {.NoItemDefaultMoves = gTrainerParty_Debra }
     },
 
-    [OPPONENT_LINDA] =
+    [TRAINER_LINDA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6464,10 +6464,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Linda
+        .party = {.NoItemDefaultMoves = gTrainerParty_Linda }
     },
 
-    [OPPONENT_KAYLEE] =
+    [TRAINER_KAYLEE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6478,10 +6478,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Kaylee
+        .party = {.NoItemDefaultMoves = gTrainerParty_Kaylee }
     },
 
-    [OPPONENT_LAUREL] =
+    [TRAINER_LAUREL] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6492,10 +6492,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Laurel
+        .party = {.NoItemDefaultMoves = gTrainerParty_Laurel }
     },
 
-    [OPPONENT_DARCY] =
+    [TRAINER_DARCY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6506,10 +6506,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Darcy
+        .party = {.NoItemDefaultMoves = gTrainerParty_Darcy }
     },
 
-    [OPPONENT_JENNY_2] =
+    [TRAINER_JENNY_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6520,10 +6520,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Jenny2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jenny2 }
     },
 
-    [OPPONENT_JENNY_3] =
+    [TRAINER_JENNY_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6534,10 +6534,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Jenny3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jenny3 }
     },
 
-    [OPPONENT_JENNY_4] =
+    [TRAINER_JENNY_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6548,10 +6548,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jenny4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jenny4 }
     },
 
-    [OPPONENT_JENNY_5] =
+    [TRAINER_JENNY_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6562,10 +6562,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Jenny5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jenny5 }
     },
 
-    [OPPONENT_HEIDI] =
+    [TRAINER_HEIDI] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6576,10 +6576,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Heidi
+        .party = {.NoItemCustomMoves = gTrainerParty_Heidi }
     },
 
-    [OPPONENT_BECKY] =
+    [TRAINER_BECKY] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6590,10 +6590,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Becky
+        .party = {.NoItemCustomMoves = gTrainerParty_Becky }
     },
 
-    [OPPONENT_CAROL] =
+    [TRAINER_CAROL] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6604,10 +6604,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Carol
+        .party = {.NoItemDefaultMoves = gTrainerParty_Carol }
     },
 
-    [OPPONENT_NANCY] =
+    [TRAINER_NANCY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6618,10 +6618,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Nancy
+        .party = {.NoItemDefaultMoves = gTrainerParty_Nancy }
     },
 
-    [OPPONENT_MARTHA] =
+    [TRAINER_MARTHA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6632,10 +6632,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Martha
+        .party = {.NoItemDefaultMoves = gTrainerParty_Martha }
     },
 
-    [OPPONENT_DIANA_1] =
+    [TRAINER_DIANA_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6646,10 +6646,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Diana1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Diana1 }
     },
 
-    [OPPONENT_NINA] =
+    [TRAINER_NINA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6660,10 +6660,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Nina
+        .party = {.NoItemDefaultMoves = gTrainerParty_Nina }
     },
 
-    [OPPONENT_IRENE] =
+    [TRAINER_IRENE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6674,10 +6674,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Irene
+        .party = {.NoItemDefaultMoves = gTrainerParty_Irene }
     },
 
-    [OPPONENT_DIANA_2] =
+    [TRAINER_DIANA_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6688,10 +6688,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Diana2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Diana2 }
     },
 
-    [OPPONENT_DIANA_3] =
+    [TRAINER_DIANA_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6702,10 +6702,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Diana3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Diana3 }
     },
 
-    [OPPONENT_DIANA_4] =
+    [TRAINER_DIANA_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6716,10 +6716,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Diana4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Diana4 }
     },
 
-    [OPPONENT_DIANA_5] =
+    [TRAINER_DIANA_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6730,10 +6730,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Diana5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Diana5 }
     },
 
-    [OPPONENT_AMY_AND_LIV_1] =
+    [TRAINER_AMY_AND_LIV_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TWINS,
@@ -6744,10 +6744,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_AmyAndLiv1
+        .party = {.NoItemDefaultMoves = gTrainerParty_AmyAndLiv1 }
     },
 
-    [OPPONENT_AMY_AND_LIV_2] =
+    [TRAINER_AMY_AND_LIV_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TWINS,
@@ -6758,10 +6758,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_AmyAndLiv2
+        .party = {.NoItemDefaultMoves = gTrainerParty_AmyAndLiv2 }
     },
 
-    [OPPONENT_GINA_AND_MIA_1] =
+    [TRAINER_GINA_AND_MIA_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TWINS,
@@ -6772,10 +6772,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_GinaAndMia1
+        .party = {.NoItemDefaultMoves = gTrainerParty_GinaAndMia1 }
     },
 
-    [OPPONENT_MIU_AND_YUKI] =
+    [TRAINER_MIU_AND_YUKI] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TWINS,
@@ -6786,10 +6786,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_MiuAndYuki
+        .party = {.NoItemDefaultMoves = gTrainerParty_MiuAndYuki }
     },
 
-    [OPPONENT_AMY_AND_LIV_3] =
+    [TRAINER_AMY_AND_LIV_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TWINS,
@@ -6800,10 +6800,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_AmyAndLiv3
+        .party = {.NoItemDefaultMoves = gTrainerParty_AmyAndLiv3 }
     },
 
-    [OPPONENT_GINA_AND_MIA_2] =
+    [TRAINER_GINA_AND_MIA_2] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_TWINS,
@@ -6814,10 +6814,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_GinaAndMia2
+        .party = {.NoItemCustomMoves = gTrainerParty_GinaAndMia2 }
     },
 
-    [OPPONENT_AMY_AND_LIV_4] =
+    [TRAINER_AMY_AND_LIV_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TWINS,
@@ -6828,10 +6828,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_AmyAndLiv4
+        .party = {.NoItemDefaultMoves = gTrainerParty_AmyAndLiv4 }
     },
 
-    [OPPONENT_AMY_AND_LIV_5] =
+    [TRAINER_AMY_AND_LIV_5] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_TWINS,
@@ -6842,10 +6842,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_AmyAndLiv5
+        .party = {.NoItemCustomMoves = gTrainerParty_AmyAndLiv5 }
     },
 
-    [OPPONENT_AMY_AND_LIV_6] =
+    [TRAINER_AMY_AND_LIV_6] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_TWINS,
@@ -6856,10 +6856,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_AmyAndLiv6
+        .party = {.NoItemCustomMoves = gTrainerParty_AmyAndLiv6 }
     },
 
-    [OPPONENT_HUEY] =
+    [TRAINER_HUEY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SAILOR,
@@ -6870,10 +6870,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Huey
+        .party = {.NoItemDefaultMoves = gTrainerParty_Huey }
     },
 
-    [OPPONENT_EDMOND] =
+    [TRAINER_EDMOND] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SAILOR,
@@ -6884,10 +6884,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Edmond
+        .party = {.NoItemDefaultMoves = gTrainerParty_Edmond }
     },
 
-    [OPPONENT_ERNEST_1] =
+    [TRAINER_ERNEST_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SAILOR,
@@ -6898,10 +6898,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Ernest1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Ernest1 }
     },
 
-    [OPPONENT_DWAYNE] =
+    [TRAINER_DWAYNE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SAILOR,
@@ -6912,10 +6912,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Dwayne
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dwayne }
     },
 
-    [OPPONENT_PHILLIP] =
+    [TRAINER_PHILLIP] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SAILOR,
@@ -6926,10 +6926,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Phillip
+        .party = {.NoItemDefaultMoves = gTrainerParty_Phillip }
     },
 
-    [OPPONENT_LEONARD] =
+    [TRAINER_LEONARD] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SAILOR,
@@ -6940,10 +6940,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Leonard
+        .party = {.NoItemDefaultMoves = gTrainerParty_Leonard }
     },
 
-    [OPPONENT_DUNCAN] =
+    [TRAINER_DUNCAN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SAILOR,
@@ -6954,10 +6954,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Duncan
+        .party = {.NoItemDefaultMoves = gTrainerParty_Duncan }
     },
 
-    [OPPONENT_ERNEST_2] =
+    [TRAINER_ERNEST_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SAILOR,
@@ -6968,10 +6968,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Ernest2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Ernest2 }
     },
 
-    [OPPONENT_ERNEST_3] =
+    [TRAINER_ERNEST_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SAILOR,
@@ -6982,10 +6982,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Ernest3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Ernest3 }
     },
 
-    [OPPONENT_ERNEST_4] =
+    [TRAINER_ERNEST_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SAILOR,
@@ -6996,10 +6996,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Ernest4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Ernest4 }
     },
 
-    [OPPONENT_ERNEST_5] =
+    [TRAINER_ERNEST_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SAILOR,
@@ -7010,10 +7010,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Ernest5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Ernest5 }
     },
 
-    [OPPONENT_ANONYMOUS_11] =
+    [TRAINER_ANONYMOUS_11] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BOARDER,
@@ -7024,10 +7024,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Anonymous11
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous11 }
     },
 
-    [OPPONENT_ANONYMOUS_12] =
+    [TRAINER_ANONYMOUS_12] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BOARDER,
@@ -7038,10 +7038,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Anonymous12
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous12 }
     },
 
-    [OPPONENT_ANONYMOUS_13] =
+    [TRAINER_ANONYMOUS_13] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BOARDER,
@@ -7052,10 +7052,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Anonymous13
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous13 }
     },
 
-    [OPPONENT_SONNY] =
+    [TRAINER_SONNY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BOARDER,
@@ -7066,10 +7066,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Sonny
+        .party = {.NoItemDefaultMoves = gTrainerParty_Sonny }
     },
 
-    [OPPONENT_DONOVAN] =
+    [TRAINER_DONOVAN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BOARDER,
@@ -7080,10 +7080,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Donovan
+        .party = {.NoItemDefaultMoves = gTrainerParty_Donovan }
     },
 
-    [OPPONENT_GERALD] =
+    [TRAINER_GERALD] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BOARDER,
@@ -7094,10 +7094,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Gerald
+        .party = {.NoItemDefaultMoves = gTrainerParty_Gerald }
     },
 
-    [OPPONENT_KELVIN] =
+    [TRAINER_KELVIN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BOARDER,
@@ -7108,10 +7108,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Kelvin
+        .party = {.NoItemDefaultMoves = gTrainerParty_Kelvin }
     },
 
-    [OPPONENT_KODY] =
+    [TRAINER_KODY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BOARDER,
@@ -7122,10 +7122,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Kody
+        .party = {.NoItemDefaultMoves = gTrainerParty_Kody }
     },
 
-    [OPPONENT_TEVIN] =
+    [TRAINER_TEVIN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BOARDER,
@@ -7136,10 +7136,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Tevin
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tevin }
     },
 
-    [OPPONENT_DAMON] =
+    [TRAINER_DAMON] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BOARDER,
@@ -7150,10 +7150,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Damon
+        .party = {.NoItemDefaultMoves = gTrainerParty_Damon }
     },
 
-    [OPPONENT_PABLO] =
+    [TRAINER_PABLO] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BOARDER,
@@ -7164,10 +7164,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Pablo
+        .party = {.NoItemDefaultMoves = gTrainerParty_Pablo }
     },
 
-    [OPPONENT_EDWIN_1] =
+    [TRAINER_EDWIN_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COLLECTOR,
@@ -7178,10 +7178,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Edwin1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Edwin1 }
     },
 
-    [OPPONENT_HECTOR_1] =
+    [TRAINER_HECTOR_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COLLECTOR,
@@ -7192,10 +7192,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Hector1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Hector1 }
     },
 
-    [OPPONENT_HECTOR_2] =
+    [TRAINER_HECTOR_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COLLECTOR,
@@ -7206,10 +7206,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Hector2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Hector2 }
     },
 
-    [OPPONENT_EDWIN_2] =
+    [TRAINER_EDWIN_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COLLECTOR,
@@ -7220,10 +7220,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Edwin2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Edwin2 }
     },
 
-    [OPPONENT_EDWIN_3] =
+    [TRAINER_EDWIN_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COLLECTOR,
@@ -7234,10 +7234,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Edwin3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Edwin3 }
     },
 
-    [OPPONENT_EDWIN_4] =
+    [TRAINER_EDWIN_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COLLECTOR,
@@ -7248,10 +7248,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Edwin4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Edwin4 }
     },
 
-    [OPPONENT_EDWIN_5] =
+    [TRAINER_EDWIN_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COLLECTOR,
@@ -7262,10 +7262,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Edwin5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Edwin5 }
     },
 
-    [OPPONENT_WALLY_1] =
+    [TRAINER_WALLY_1] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7276,10 +7276,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 5,
-        .party = gTrainerParty_Wally1
+        .party = {.NoItemCustomMoves = gTrainerParty_Wally1 }
     },
 
-    [OPPONENT_BRENDAN_1] =
+    [TRAINER_BRENDAN_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7290,10 +7290,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Brendan1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan1 }
     },
 
-    [OPPONENT_BRENDAN_2] =
+    [TRAINER_BRENDAN_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7304,10 +7304,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Brendan2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan2 }
     },
 
-    [OPPONENT_BRENDAN_3] =
+    [TRAINER_BRENDAN_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7318,10 +7318,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Brendan3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan3 }
     },
 
-    [OPPONENT_BRENDAN_4] =
+    [TRAINER_BRENDAN_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7332,10 +7332,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0xb,
         .partySize = 1,
-        .party = gTrainerParty_Brendan4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan4 }
     },
 
-    [OPPONENT_BRENDAN_5] =
+    [TRAINER_BRENDAN_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7346,10 +7346,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Brendan5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan5 }
     },
 
-    [OPPONENT_BRENDAN_6] =
+    [TRAINER_BRENDAN_6] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7360,10 +7360,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Brendan6
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan6 }
     },
 
-    [OPPONENT_BRENDAN_7] =
+    [TRAINER_BRENDAN_7] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7374,10 +7374,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Brendan7
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan7 }
     },
 
-    [OPPONENT_BRENDAN_8] =
+    [TRAINER_BRENDAN_8] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7388,10 +7388,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Brendan8
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan8 }
     },
 
-    [OPPONENT_BRENDAN_9] =
+    [TRAINER_BRENDAN_9] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7402,10 +7402,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Brendan9
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan9 }
     },
 
-    [OPPONENT_MAY_1] =
+    [TRAINER_MAY_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7416,10 +7416,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_May1
+        .party = {.NoItemDefaultMoves = gTrainerParty_May1 }
     },
 
-    [OPPONENT_MAY_2] =
+    [TRAINER_MAY_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7430,10 +7430,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_May2
+        .party = {.NoItemDefaultMoves = gTrainerParty_May2 }
     },
 
-    [OPPONENT_MAY_3] =
+    [TRAINER_MAY_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7444,10 +7444,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_May3
+        .party = {.NoItemDefaultMoves = gTrainerParty_May3 }
     },
 
-    [OPPONENT_MAY_4] =
+    [TRAINER_MAY_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7458,10 +7458,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_May4
+        .party = {.NoItemDefaultMoves = gTrainerParty_May4 }
     },
 
-    [OPPONENT_MAY_5] =
+    [TRAINER_MAY_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7472,10 +7472,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_May5
+        .party = {.NoItemDefaultMoves = gTrainerParty_May5 }
     },
 
-    [OPPONENT_MAY_6] =
+    [TRAINER_MAY_6] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7486,10 +7486,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_May6
+        .party = {.NoItemDefaultMoves = gTrainerParty_May6 }
     },
 
-    [OPPONENT_MAY_7] =
+    [TRAINER_MAY_7] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7500,10 +7500,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_May7
+        .party = {.NoItemDefaultMoves = gTrainerParty_May7 }
     },
 
-    [OPPONENT_MAY_8] =
+    [TRAINER_MAY_8] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7514,10 +7514,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_May8
+        .party = {.NoItemDefaultMoves = gTrainerParty_May8 }
     },
 
-    [OPPONENT_MAY_9] =
+    [TRAINER_MAY_9] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7528,10 +7528,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_May9
+        .party = {.NoItemDefaultMoves = gTrainerParty_May9 }
     },
 
-    [OPPONENT_ISAAC_1] =
+    [TRAINER_ISAAC_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7542,10 +7542,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 6,
-        .party = gTrainerParty_Isaac1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Isaac1 }
     },
 
-    [OPPONENT_RILEY] =
+    [TRAINER_RILEY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7556,10 +7556,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Riley
+        .party = {.NoItemDefaultMoves = gTrainerParty_Riley }
     },
 
-    [OPPONENT_AIDAN] =
+    [TRAINER_AIDAN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7570,10 +7570,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Aidan
+        .party = {.NoItemDefaultMoves = gTrainerParty_Aidan }
     },
 
-    [OPPONENT_ISAAC_2] =
+    [TRAINER_ISAAC_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7584,10 +7584,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 6,
-        .party = gTrainerParty_Isaac2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Isaac2 }
     },
 
-    [OPPONENT_ISAAC_3] =
+    [TRAINER_ISAAC_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7598,10 +7598,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 6,
-        .party = gTrainerParty_Isaac3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Isaac3 }
     },
 
-    [OPPONENT_ISAAC_4] =
+    [TRAINER_ISAAC_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7612,10 +7612,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 6,
-        .party = gTrainerParty_Isaac4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Isaac4 }
     },
 
-    [OPPONENT_ISAAC_5] =
+    [TRAINER_ISAAC_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7626,10 +7626,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 6,
-        .party = gTrainerParty_Isaac5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Isaac5 }
     },
 
-    [OPPONENT_LYDIA_1] =
+    [TRAINER_LYDIA_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7640,10 +7640,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 6,
-        .party = gTrainerParty_Lydia1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lydia1 }
     },
 
-    [OPPONENT_ALEXIA] =
+    [TRAINER_ALEXIA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7654,10 +7654,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Alexia
+        .party = {.NoItemDefaultMoves = gTrainerParty_Alexia }
     },
 
-    [OPPONENT_DANIELLE] =
+    [TRAINER_DANIELLE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7668,10 +7668,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Danielle
+        .party = {.NoItemDefaultMoves = gTrainerParty_Danielle }
     },
 
-    [OPPONENT_LYDIA_2] =
+    [TRAINER_LYDIA_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7682,10 +7682,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 6,
-        .party = gTrainerParty_Lydia2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lydia2 }
     },
 
-    [OPPONENT_LYDIA_3] =
+    [TRAINER_LYDIA_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7696,10 +7696,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 6,
-        .party = gTrainerParty_Lydia3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lydia3 }
     },
 
-    [OPPONENT_LYDIA_4] =
+    [TRAINER_LYDIA_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7710,10 +7710,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 6,
-        .party = gTrainerParty_Lydia4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lydia4 }
     },
 
-    [OPPONENT_LYDIA_5] =
+    [TRAINER_LYDIA_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7724,10 +7724,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 6,
-        .party = gTrainerParty_Lydia5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lydia5 }
     },
 
-    [OPPONENT_JACKSON_1] =
+    [TRAINER_JACKSON_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7738,10 +7738,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Jackson1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jackson1 }
     },
 
-    [OPPONENT_CARLOS] =
+    [TRAINER_CARLOS] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7752,10 +7752,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Carlos
+        .party = {.NoItemDefaultMoves = gTrainerParty_Carlos }
     },
 
-    [OPPONENT_SEBASTIAN] =
+    [TRAINER_SEBASTIAN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7766,10 +7766,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Sebastian
+        .party = {.NoItemDefaultMoves = gTrainerParty_Sebastian }
     },
 
-    [OPPONENT_JACKSON_2] =
+    [TRAINER_JACKSON_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7780,10 +7780,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0xb,
         .partySize = 1,
-        .party = gTrainerParty_Jackson2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jackson2 }
     },
 
-    [OPPONENT_JACKSON_3] =
+    [TRAINER_JACKSON_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7794,10 +7794,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Jackson3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jackson3 }
     },
 
-    [OPPONENT_JACKSON_4] =
+    [TRAINER_JACKSON_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7808,10 +7808,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0xb,
         .partySize = 1,
-        .party = gTrainerParty_Jackson4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jackson4 }
     },
 
-    [OPPONENT_JACKSON_5] =
+    [TRAINER_JACKSON_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7822,10 +7822,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Jackson5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jackson5 }
     },
 
-    [OPPONENT_CATHERINE_1] =
+    [TRAINER_CATHERINE_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7836,10 +7836,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0xb,
         .partySize = 2,
-        .party = gTrainerParty_Catherine1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Catherine1 }
     },
 
-    [OPPONENT_JENNA] =
+    [TRAINER_JENNA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7850,10 +7850,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0xb,
         .partySize = 3,
-        .party = gTrainerParty_Jenna
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jenna }
     },
 
-    [OPPONENT_SOPHIA] =
+    [TRAINER_SOPHIA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7864,10 +7864,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Sophia
+        .party = {.NoItemDefaultMoves = gTrainerParty_Sophia }
     },
 
-    [OPPONENT_CATHERINE_2] =
+    [TRAINER_CATHERINE_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7878,10 +7878,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0xb,
         .partySize = 2,
-        .party = gTrainerParty_Catherine2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Catherine2 }
     },
 
-    [OPPONENT_CATHERINE_3] =
+    [TRAINER_CATHERINE_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7892,10 +7892,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Catherine3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Catherine3 }
     },
 
-    [OPPONENT_CATHERINE_4] =
+    [TRAINER_CATHERINE_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7906,10 +7906,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0xb,
         .partySize = 2,
-        .party = gTrainerParty_Catherine4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Catherine4 }
     },
 
-    [OPPONENT_CATHERINE_5] =
+    [TRAINER_CATHERINE_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7920,10 +7920,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Catherine5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Catherine5 }
     },
 
-    [OPPONENT_MAXIE_1] =
+    [TRAINER_MAXIE_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_MAGMA_LEADER,
@@ -7934,10 +7934,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Maxie1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Maxie1 }
     },
 
-    [OPPONENT_GRUNT_28] =
+    [TRAINER_GRUNT_28] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -7948,10 +7948,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt28
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt28 }
     },
 
-    [OPPONENT_GRUNT_29] =
+    [TRAINER_GRUNT_29] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -7962,10 +7962,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Grunt29
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt29 }
     },
 
-    [OPPONENT_GRUNT_30] =
+    [TRAINER_GRUNT_30] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -7976,10 +7976,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt30
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt30 }
     },
 
-    [OPPONENT_GRUNT_31] =
+    [TRAINER_GRUNT_31] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -7990,10 +7990,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt31
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt31 }
     },
 
-    [OPPONENT_GRUNT_32] =
+    [TRAINER_GRUNT_32] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8004,10 +8004,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt32
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt32 }
     },
 
-    [OPPONENT_GRUNT_33] =
+    [TRAINER_GRUNT_33] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8018,10 +8018,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt33
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt33 }
     },
 
-    [OPPONENT_GRUNT_34] =
+    [TRAINER_GRUNT_34] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8032,10 +8032,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Grunt34
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt34 }
     },
 
-    [OPPONENT_GRUNT_35] =
+    [TRAINER_GRUNT_35] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8046,10 +8046,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt35
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt35 }
     },
 
-    [OPPONENT_GRUNT_36] =
+    [TRAINER_GRUNT_36] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8060,10 +8060,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt36
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt36 }
     },
 
-    [OPPONENT_GRUNT_37] =
+    [TRAINER_GRUNT_37] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8074,10 +8074,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt37
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt37 }
     },
 
-    [OPPONENT_GRUNT_38] =
+    [TRAINER_GRUNT_38] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8088,10 +8088,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt38
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt38 }
     },
 
-    [OPPONENT_GRUNT_39] =
+    [TRAINER_GRUNT_39] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8102,10 +8102,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt39
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt39 }
     },
 
-    [OPPONENT_GRUNT_40] =
+    [TRAINER_GRUNT_40] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8116,10 +8116,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt40
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt40 }
     },
 
-    [OPPONENT_GRUNT_41] =
+    [TRAINER_GRUNT_41] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8130,10 +8130,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt41
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt41 }
     },
 
-    [OPPONENT_GRUNT_42] =
+    [TRAINER_GRUNT_42] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8144,10 +8144,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt42
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt42 }
     },
 
-    [OPPONENT_GRUNT_43] =
+    [TRAINER_GRUNT_43] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8158,10 +8158,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt43
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt43 }
     },
 
-    [OPPONENT_GRUNT_44] =
+    [TRAINER_GRUNT_44] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8172,10 +8172,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt44
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt44 }
     },
 
-    [OPPONENT_GRUNT_45] =
+    [TRAINER_GRUNT_45] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8186,10 +8186,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Grunt45
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt45 }
     },
 
-    [OPPONENT_GRUNT_46] =
+    [TRAINER_GRUNT_46] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8200,10 +8200,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt46
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt46 }
     },
 
-    [OPPONENT_GRUNT_47] =
+    [TRAINER_GRUNT_47] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8214,10 +8214,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt47
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt47 }
     },
 
-    [OPPONENT_GRUNT_48] =
+    [TRAINER_GRUNT_48] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8228,10 +8228,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt48
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt48 }
     },
 
-    [OPPONENT_GRUNT_49] =
+    [TRAINER_GRUNT_49] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8242,10 +8242,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Grunt49
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt49 }
     },
 
-    [OPPONENT_GRUNT_50] =
+    [TRAINER_GRUNT_50] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8256,10 +8256,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt50
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt50 }
     },
 
-    [OPPONENT_GRUNT_51] =
+    [TRAINER_GRUNT_51] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8270,10 +8270,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt51
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt51 }
     },
 
-    [OPPONENT_GRUNT_52] =
+    [TRAINER_GRUNT_52] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8284,10 +8284,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt52
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt52 }
     },
 
-    [OPPONENT_GRUNT_53] =
+    [TRAINER_GRUNT_53] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8298,10 +8298,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Grunt53
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt53 }
     },
 
-    [OPPONENT_GRUNT_54] =
+    [TRAINER_GRUNT_54] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8312,10 +8312,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt54
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt54 }
     },
 
-    [OPPONENT_ANONYMOUS_14] =
+    [TRAINER_ANONYMOUS_14] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_MAGMA_ADMIN,
@@ -8326,10 +8326,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Anonymous14
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous14 }
     },
 
-    [OPPONENT_ANONYMOUS_15] =
+    [TRAINER_ANONYMOUS_15] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_MAGMA_ADMIN,
@@ -8340,10 +8340,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Anonymous15
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous15 }
     },
 
-    [OPPONENT_TABITHA_1] =
+    [TRAINER_TABITHA_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_MAGMA_ADMIN,
@@ -8354,10 +8354,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0xb,
         .partySize = 3,
-        .party = gTrainerParty_Tabitha1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tabitha1 }
     },
 
-    [OPPONENT_TABITHA_2] =
+    [TRAINER_TABITHA_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_MAGMA_ADMIN,
@@ -8368,10 +8368,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Tabitha2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tabitha2 }
     },
 
-    [OPPONENT_ANONYMOUS_16] =
+    [TRAINER_ANONYMOUS_16] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_MAGMA_ADMIN,
@@ -8382,10 +8382,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0xb,
         .partySize = 2,
-        .party = gTrainerParty_Anonymous16
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous16 }
     },
 
-    [OPPONENT_COURTNEY_1] =
+    [TRAINER_COURTNEY_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_MAGMA_ADMIN,
@@ -8396,10 +8396,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Courtney1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Courtney1 }
     },
 
-    [OPPONENT_COURTNEY_2] =
+    [TRAINER_COURTNEY_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_MAGMA_ADMIN,
@@ -8410,10 +8410,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0xb,
         .partySize = 2,
-        .party = gTrainerParty_Courtney2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Courtney2 }
     },
 
-    [OPPONENT_MAXIE_2] =
+    [TRAINER_MAXIE_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_MAGMA_LEADER,
@@ -8424,10 +8424,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Maxie2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Maxie2 }
     },
 
-    [OPPONENT_MAXIE_3] =
+    [TRAINER_MAXIE_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_MAGMA_LEADER,
@@ -8438,10 +8438,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Maxie3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Maxie3 }
     },
 
-    [OPPONENT_TIANA] =
+    [TRAINER_TIANA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_LASS,
@@ -8452,10 +8452,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Tiana
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tiana }
     },
 
-    [OPPONENT_HALEY_1] =
+    [TRAINER_HALEY_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_LASS,
@@ -8466,10 +8466,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Haley1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Haley1 }
     },
 
-    [OPPONENT_JANICE] =
+    [TRAINER_JANICE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_LASS,
@@ -8480,10 +8480,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Janice
+        .party = {.NoItemDefaultMoves = gTrainerParty_Janice }
     },
 
-    [OPPONENT_VIVI] =
+    [TRAINER_VIVI] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_WINSTRATE,
@@ -8494,10 +8494,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Vivi
+        .party = {.NoItemDefaultMoves = gTrainerParty_Vivi }
     },
 
-    [OPPONENT_HALEY_2] =
+    [TRAINER_HALEY_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_LASS,
@@ -8508,10 +8508,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Haley2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Haley2 }
     },
 
-    [OPPONENT_HALEY_3] =
+    [TRAINER_HALEY_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_LASS,
@@ -8522,10 +8522,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Haley3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Haley3 }
     },
 
-    [OPPONENT_HALEY_4] =
+    [TRAINER_HALEY_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_LASS,
@@ -8536,10 +8536,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Haley4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Haley4 }
     },
 
-    [OPPONENT_HALEY_5] =
+    [TRAINER_HALEY_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_LASS,
@@ -8550,10 +8550,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Haley5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Haley5 }
     },
 
-    [OPPONENT_SALLY] =
+    [TRAINER_SALLY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_LASS,
@@ -8564,10 +8564,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Sally
+        .party = {.NoItemDefaultMoves = gTrainerParty_Sally }
     },
 
-    [OPPONENT_ROBIN] =
+    [TRAINER_ROBIN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_LASS,
@@ -8578,10 +8578,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Robin
+        .party = {.NoItemDefaultMoves = gTrainerParty_Robin }
     },
 
-    [OPPONENT_ANDREA] =
+    [TRAINER_ANDREA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_LASS,
@@ -8592,10 +8592,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Andrea
+        .party = {.NoItemDefaultMoves = gTrainerParty_Andrea }
     },
 
-    [OPPONENT_CRISSY] =
+    [TRAINER_CRISSY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_LASS,
@@ -8606,10 +8606,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Crissy
+        .party = {.NoItemDefaultMoves = gTrainerParty_Crissy }
     },
 
-    [OPPONENT_RICK] =
+    [TRAINER_RICK] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8620,10 +8620,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Rick
+        .party = {.NoItemDefaultMoves = gTrainerParty_Rick }
     },
 
-    [OPPONENT_LYLE] =
+    [TRAINER_LYLE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8634,10 +8634,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 6,
-        .party = gTrainerParty_Lyle
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lyle }
     },
 
-    [OPPONENT_JOSE] =
+    [TRAINER_JOSE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8648,10 +8648,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Jose
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jose }
     },
 
-    [OPPONENT_DOUG] =
+    [TRAINER_DOUG] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8662,10 +8662,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Doug
+        .party = {.NoItemDefaultMoves = gTrainerParty_Doug }
     },
 
-    [OPPONENT_GREG] =
+    [TRAINER_GREG] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8676,10 +8676,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Greg
+        .party = {.NoItemDefaultMoves = gTrainerParty_Greg }
     },
 
-    [OPPONENT_KENT] =
+    [TRAINER_KENT] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8690,10 +8690,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Kent
+        .party = {.NoItemDefaultMoves = gTrainerParty_Kent }
     },
 
-    [OPPONENT_JAMES_1] =
+    [TRAINER_JAMES_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8704,10 +8704,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_James1
+        .party = {.NoItemDefaultMoves = gTrainerParty_James1 }
     },
 
-    [OPPONENT_JAMES_2] =
+    [TRAINER_JAMES_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8718,10 +8718,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_James2
+        .party = {.NoItemDefaultMoves = gTrainerParty_James2 }
     },
 
-    [OPPONENT_JAMES_3] =
+    [TRAINER_JAMES_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8732,10 +8732,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_James3
+        .party = {.NoItemDefaultMoves = gTrainerParty_James3 }
     },
 
-    [OPPONENT_JAMES_4] =
+    [TRAINER_JAMES_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8746,10 +8746,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_James4
+        .party = {.NoItemDefaultMoves = gTrainerParty_James4 }
     },
 
-    [OPPONENT_JAMES_5] =
+    [TRAINER_JAMES_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8760,10 +8760,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_James5
+        .party = {.NoItemDefaultMoves = gTrainerParty_James5 }
     },
 
-    [OPPONENT_BRICE] =
+    [TRAINER_BRICE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HIKER,
@@ -8774,10 +8774,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Brice
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brice }
     },
 
-    [OPPONENT_TRENT_1] =
+    [TRAINER_TRENT_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HIKER,
@@ -8788,10 +8788,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Trent1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Trent1 }
     },
 
-    [OPPONENT_LENNY] =
+    [TRAINER_LENNY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HIKER,
@@ -8802,10 +8802,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Lenny
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lenny }
     },
 
-    [OPPONENT_LUCAS_1] =
+    [TRAINER_LUCAS_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HIKER,
@@ -8816,10 +8816,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Lucas1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lucas1 }
     },
 
-    [OPPONENT_ALAN] =
+    [TRAINER_ALAN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HIKER,
@@ -8830,10 +8830,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Alan
+        .party = {.NoItemDefaultMoves = gTrainerParty_Alan }
     },
 
-    [OPPONENT_CLARK] =
+    [TRAINER_CLARK] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HIKER,
@@ -8844,10 +8844,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Clark
+        .party = {.NoItemDefaultMoves = gTrainerParty_Clark }
     },
 
-    [OPPONENT_ERIC] =
+    [TRAINER_ERIC] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HIKER,
@@ -8858,10 +8858,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Eric
+        .party = {.NoItemDefaultMoves = gTrainerParty_Eric }
     },
 
-    [OPPONENT_LUCAS_2] =
+    [TRAINER_LUCAS_2] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_HIKER,
@@ -8872,10 +8872,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Lucas2
+        .party = {.NoItemCustomMoves = gTrainerParty_Lucas2 }
     },
 
-    [OPPONENT_MIKE_1] =
+    [TRAINER_MIKE_1] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_HIKER,
@@ -8886,10 +8886,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Mike1
+        .party = {.NoItemCustomMoves = gTrainerParty_Mike1 }
     },
 
-    [OPPONENT_MIKE_2] =
+    [TRAINER_MIKE_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HIKER,
@@ -8900,10 +8900,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Mike2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Mike2 }
     },
 
-    [OPPONENT_TRENT_2] =
+    [TRAINER_TRENT_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HIKER,
@@ -8914,10 +8914,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Trent2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Trent2 }
     },
 
-    [OPPONENT_TRENT_3] =
+    [TRAINER_TRENT_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HIKER,
@@ -8928,10 +8928,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Trent3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Trent3 }
     },
 
-    [OPPONENT_TRENT_4] =
+    [TRAINER_TRENT_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HIKER,
@@ -8942,10 +8942,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Trent4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Trent4 }
     },
 
-    [OPPONENT_TRENT_5] =
+    [TRAINER_TRENT_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HIKER,
@@ -8956,10 +8956,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Trent5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Trent5 }
     },
 
-    [OPPONENT_DEZ_AND_LUKE] =
+    [TRAINER_DEZ_AND_LUKE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
@@ -8970,10 +8970,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_DezAndLuke
+        .party = {.NoItemDefaultMoves = gTrainerParty_DezAndLuke }
     },
 
-    [OPPONENT_LEA_AND_JED] =
+    [TRAINER_LEA_AND_JED] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
@@ -8984,10 +8984,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_LeaAndJed
+        .party = {.NoItemDefaultMoves = gTrainerParty_LeaAndJed }
     },
 
-    [OPPONENT_LOIS_AND_HAL_1] =
+    [TRAINER_LOIS_AND_HAL_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
@@ -8998,10 +8998,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_LoisAndHal1
+        .party = {.NoItemDefaultMoves = gTrainerParty_LoisAndHal1 }
     },
 
-    [OPPONENT_LOIS_AND_HAL_2] =
+    [TRAINER_LOIS_AND_HAL_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
@@ -9012,10 +9012,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_LoisAndHal2
+        .party = {.NoItemDefaultMoves = gTrainerParty_LoisAndHal2 }
     },
 
-    [OPPONENT_LOIS_AND_HAL_3] =
+    [TRAINER_LOIS_AND_HAL_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
@@ -9026,10 +9026,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_LoisAndHal3
+        .party = {.NoItemDefaultMoves = gTrainerParty_LoisAndHal3 }
     },
 
-    [OPPONENT_LOIS_AND_HAL_4] =
+    [TRAINER_LOIS_AND_HAL_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
@@ -9040,10 +9040,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_LoisAndHal4
+        .party = {.NoItemDefaultMoves = gTrainerParty_LoisAndHal4 }
     },
 
-    [OPPONENT_LOIS_AND_HAL_5] =
+    [TRAINER_LOIS_AND_HAL_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
@@ -9054,10 +9054,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_LoisAndHal5
+        .party = {.NoItemDefaultMoves = gTrainerParty_LoisAndHal5 }
     },
 
-    [OPPONENT_JOHANNA] =
+    [TRAINER_JOHANNA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BEAUTY,
@@ -9068,10 +9068,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Johanna
+        .party = {.NoItemDefaultMoves = gTrainerParty_Johanna }
     },
 
-    [OPPONENT_ZANE] =
+    [TRAINER_ZANE] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -9082,10 +9082,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Zane
+        .party = {.NoItemCustomMoves = gTrainerParty_Zane }
     },
 
-    [OPPONENT_VIVIAN] =
+    [TRAINER_VIVIAN] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -9096,10 +9096,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Vivian
+        .party = {.NoItemCustomMoves = gTrainerParty_Vivian }
     },
 
-    [OPPONENT_SADIE] =
+    [TRAINER_SADIE] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -9110,10 +9110,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Sadie
+        .party = {.NoItemCustomMoves = gTrainerParty_Sadie }
     },
 
-    [OPPONENT_HIDEO_2] =
+    [TRAINER_HIDEO_2] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -9124,10 +9124,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x3,
         .partySize = 2,
-        .party = gTrainerParty_Hideo2
+        .party = {.NoItemCustomMoves = gTrainerParty_Hideo2 }
     },
 
-    [OPPONENT_KEIGO] =
+    [TRAINER_KEIGO] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -9138,10 +9138,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x3,
         .partySize = 2,
-        .party = gTrainerParty_Keigo
+        .party = {.NoItemCustomMoves = gTrainerParty_Keigo }
     },
 
-    [OPPONENT_TSUNAO] =
+    [TRAINER_TSUNAO] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -9152,10 +9152,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x3,
         .partySize = 3,
-        .party = gTrainerParty_Tsunao
+        .party = {.NoItemCustomMoves = gTrainerParty_Tsunao }
     },
 
-    [OPPONENT_TERRELL] =
+    [TRAINER_TERRELL] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_CAMPER,
@@ -9166,10 +9166,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Terrell
+        .party = {.NoItemDefaultMoves = gTrainerParty_Terrell }
     },
 
-    [OPPONENT_KYLEE] =
+    [TRAINER_KYLEE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PICNICKER,
@@ -9180,10 +9180,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Kylee
+        .party = {.NoItemDefaultMoves = gTrainerParty_Kylee }
     },
 
-    [OPPONENT_WALLY_2] =
+    [TRAINER_WALLY_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9194,10 +9194,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Wally2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Wally2 }
     },
 
-    [OPPONENT_WALLY_3] =
+    [TRAINER_WALLY_3] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9208,10 +9208,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 5,
-        .party = gTrainerParty_Wally3
+        .party = {.NoItemCustomMoves = gTrainerParty_Wally3 }
     },
 
-    [OPPONENT_WALLY_4] =
+    [TRAINER_WALLY_4] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9222,10 +9222,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 5,
-        .party = gTrainerParty_Wally4
+        .party = {.NoItemCustomMoves = gTrainerParty_Wally4 }
     },
 
-    [OPPONENT_WALLY_5] =
+    [TRAINER_WALLY_5] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9236,10 +9236,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 5,
-        .party = gTrainerParty_Wally5
+        .party = {.NoItemCustomMoves = gTrainerParty_Wally5 }
     },
 
-    [OPPONENT_WALLY_6] =
+    [TRAINER_WALLY_6] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9250,10 +9250,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 5,
-        .party = gTrainerParty_Wally6
+        .party = {.NoItemCustomMoves = gTrainerParty_Wally6 }
     },
 
-    [OPPONENT_BRENDAN_10] =
+    [TRAINER_BRENDAN_10] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9264,10 +9264,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 4,
-        .party = gTrainerParty_Brendan10
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan10 }
     },
 
-    [OPPONENT_BRENDAN_11] =
+    [TRAINER_BRENDAN_11] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9278,10 +9278,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 4,
-        .party = gTrainerParty_Brendan11
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan11 }
     },
 
-    [OPPONENT_BRENDAN_12] =
+    [TRAINER_BRENDAN_12] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9292,10 +9292,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 4,
-        .party = gTrainerParty_Brendan12
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan12 }
     },
 
-    [OPPONENT_MAY_10] =
+    [TRAINER_MAY_10] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9306,10 +9306,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 4,
-        .party = gTrainerParty_May10
+        .party = {.NoItemDefaultMoves = gTrainerParty_May10 }
     },
 
-    [OPPONENT_MAY_11] =
+    [TRAINER_MAY_11] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9320,10 +9320,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 4,
-        .party = gTrainerParty_May11
+        .party = {.NoItemDefaultMoves = gTrainerParty_May11 }
     },
 
-    [OPPONENT_MAY_12] =
+    [TRAINER_MAY_12] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9334,10 +9334,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 4,
-        .party = gTrainerParty_May12
+        .party = {.NoItemDefaultMoves = gTrainerParty_May12 }
     },
 
-    [OPPONENT_JONAH] =
+    [TRAINER_JONAH] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -9348,10 +9348,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Jonah
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jonah }
     },
 
-    [OPPONENT_HENRY] =
+    [TRAINER_HENRY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -9362,10 +9362,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Henry
+        .party = {.NoItemDefaultMoves = gTrainerParty_Henry }
     },
 
-    [OPPONENT_ROGER] =
+    [TRAINER_ROGER] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -9376,10 +9376,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Roger
+        .party = {.NoItemDefaultMoves = gTrainerParty_Roger }
     },
 
-    [OPPONENT_ALEXA] =
+    [TRAINER_ALEXA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -9390,10 +9390,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Alexa
+        .party = {.NoItemDefaultMoves = gTrainerParty_Alexa }
     },
 
-    [OPPONENT_RUBEN] =
+    [TRAINER_RUBEN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -9404,10 +9404,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Ruben
+        .party = {.NoItemDefaultMoves = gTrainerParty_Ruben }
     },
 
-    [OPPONENT_KOJI] =
+    [TRAINER_KOJI] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -9418,10 +9418,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Koji
+        .party = {.NoItemDefaultMoves = gTrainerParty_Koji }
     },
 
-    [OPPONENT_WAYNE] =
+    [TRAINER_WAYNE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -9432,10 +9432,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Wayne
+        .party = {.NoItemDefaultMoves = gTrainerParty_Wayne }
     },
 
-    [OPPONENT_BYRON] =
+    [TRAINER_BYRON] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -9446,10 +9446,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Byron
+        .party = {.NoItemDefaultMoves = gTrainerParty_Byron }
     },
 
-    [OPPONENT_REED] =
+    [TRAINER_REED] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -9460,10 +9460,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Reed
+        .party = {.NoItemDefaultMoves = gTrainerParty_Reed }
     },
 
-    [OPPONENT_TISHA] =
+    [TRAINER_TISHA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -9474,10 +9474,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Tisha
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tisha }
     },
 
-    [OPPONENT_TORI_AND_TIA] =
+    [TRAINER_TORI_AND_TIA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TWINS,
@@ -9488,10 +9488,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_ToriAndTia
+        .party = {.NoItemDefaultMoves = gTrainerParty_ToriAndTia }
     },
 
-    [OPPONENT_KIM_AND_IRIS] =
+    [TRAINER_KIM_AND_IRIS] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_SR_AND_JR,
@@ -9502,10 +9502,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_KimAndIris
+        .party = {.NoItemCustomMoves = gTrainerParty_KimAndIris }
     },
 
-    [OPPONENT_TYRA_AND_IVY] =
+    [TRAINER_TYRA_AND_IVY] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_SR_AND_JR,
@@ -9516,10 +9516,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_TyraAndIvy
+        .party = {.NoItemCustomMoves = gTrainerParty_TyraAndIvy }
     },
 
-    [OPPONENT_MEL_AND_PAUL] =
+    [TRAINER_MEL_AND_PAUL] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
@@ -9530,10 +9530,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_MelAndPaul
+        .party = {.NoItemCustomMoves = gTrainerParty_MelAndPaul }
     },
 
-    [OPPONENT_JOHN_AND_JAY_1] =
+    [TRAINER_JOHN_AND_JAY_1] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_OLD_COUPLE,
@@ -9544,10 +9544,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_JohnAndJay1
+        .party = {.NoItemCustomMoves = gTrainerParty_JohnAndJay1 }
     },
 
-    [OPPONENT_JOHN_AND_JAY_2] =
+    [TRAINER_JOHN_AND_JAY_2] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_OLD_COUPLE,
@@ -9558,10 +9558,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_JohnAndJay2
+        .party = {.NoItemCustomMoves = gTrainerParty_JohnAndJay2 }
     },
 
-    [OPPONENT_JOHN_AND_JAY_3] =
+    [TRAINER_JOHN_AND_JAY_3] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_OLD_COUPLE,
@@ -9572,10 +9572,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_JohnAndJay3
+        .party = {.NoItemCustomMoves = gTrainerParty_JohnAndJay3 }
     },
 
-    [OPPONENT_JOHN_AND_JAY_4] =
+    [TRAINER_JOHN_AND_JAY_4] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_OLD_COUPLE,
@@ -9586,10 +9586,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0xb,
         .partySize = 2,
-        .party = gTrainerParty_JohnAndJay4
+        .party = {.NoItemCustomMoves = gTrainerParty_JohnAndJay4 }
     },
 
-    [OPPONENT_JOHN_AND_JAY_5] =
+    [TRAINER_JOHN_AND_JAY_5] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_OLD_COUPLE,
@@ -9600,10 +9600,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_JohnAndJay5
+        .party = {.NoItemCustomMoves = gTrainerParty_JohnAndJay5 }
     },
 
-    [OPPONENT_RELI_AND_IAN] =
+    [TRAINER_RELI_AND_IAN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SIS_AND_BRO,
@@ -9614,10 +9614,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_ReliAndIan
+        .party = {.NoItemDefaultMoves = gTrainerParty_ReliAndIan }
     },
 
-    [OPPONENT_RITA_AND_SAM_1] =
+    [TRAINER_RITA_AND_SAM_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SIS_AND_BRO,
@@ -9628,10 +9628,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_RitaAndSam1
+        .party = {.NoItemDefaultMoves = gTrainerParty_RitaAndSam1 }
     },
 
-    [OPPONENT_RITA_AND_SAM_2] =
+    [TRAINER_RITA_AND_SAM_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SIS_AND_BRO,
@@ -9642,10 +9642,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_RitaAndSam2
+        .party = {.NoItemDefaultMoves = gTrainerParty_RitaAndSam2 }
     },
 
-    [OPPONENT_RITA_AND_SAM_3] =
+    [TRAINER_RITA_AND_SAM_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SIS_AND_BRO,
@@ -9656,10 +9656,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_RitaAndSam3
+        .party = {.NoItemDefaultMoves = gTrainerParty_RitaAndSam3 }
     },
 
-    [OPPONENT_RITA_AND_SAM_4] =
+    [TRAINER_RITA_AND_SAM_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SIS_AND_BRO,
@@ -9670,10 +9670,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_RitaAndSam4
+        .party = {.NoItemDefaultMoves = gTrainerParty_RitaAndSam4 }
     },
 
-    [OPPONENT_RITA_AND_SAM_5] =
+    [TRAINER_RITA_AND_SAM_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SIS_AND_BRO,
@@ -9684,10 +9684,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_RitaAndSam5
+        .party = {.NoItemDefaultMoves = gTrainerParty_RitaAndSam5 }
     },
 
-    [OPPONENT_LISA_AND_RAY] =
+    [TRAINER_LISA_AND_RAY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SIS_AND_BRO,
@@ -9698,10 +9698,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_LisaAndRay
+        .party = {.NoItemDefaultMoves = gTrainerParty_LisaAndRay }
     },
 
-    [OPPONENT_EUGENE] =
+    [TRAINER_EUGENE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -9712,6 +9712,6 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Eugene
+        .party = {.NoItemDefaultMoves = gTrainerParty_Eugene }
     },
 };
diff --git a/src/debug/taya_debug_window.c b/src/debug/taya_debug_window.c
index c5f6fc0ec..6b30fe5fe 100644
--- a/src/debug/taya_debug_window.c
+++ b/src/debug/taya_debug_window.c
@@ -707,19 +707,19 @@ bool8 TayaDebugMenu_Trainer(void)
     for (i = 0; i < ARRAY_COUNT(gTrainerEyeTrainers); i++)
         SetTrainerFlag(gTrainerEyeTrainers[i].opponentIDs[0]);
 
-    SetTrainerFlag(OPPONENT_ROXANNE);
-    SetTrainerFlag(OPPONENT_BRAWLY);
-    SetTrainerFlag(OPPONENT_WATTSON);
-    SetTrainerFlag(OPPONENT_FLANNERY);
-    SetTrainerFlag(OPPONENT_NORMAN);
-    SetTrainerFlag(OPPONENT_WINONA);
-    SetTrainerFlag(OPPONENT_TATE_AND_LIZA);
-    SetTrainerFlag(OPPONENT_WALLACE);
-    SetTrainerFlag(OPPONENT_SIDNEY);
-    SetTrainerFlag(OPPONENT_PHOEBE);
-    SetTrainerFlag(OPPONENT_GLACIA);
-    SetTrainerFlag(OPPONENT_DRAKE);
-    SetTrainerFlag(OPPONENT_STEVEN);
+    SetTrainerFlag(TRAINER_ROXANNE);
+    SetTrainerFlag(TRAINER_BRAWLY);
+    SetTrainerFlag(TRAINER_WATTSON);
+    SetTrainerFlag(TRAINER_FLANNERY);
+    SetTrainerFlag(TRAINER_NORMAN);
+    SetTrainerFlag(TRAINER_WINONA);
+    SetTrainerFlag(TRAINER_TATE_AND_LIZA);
+    SetTrainerFlag(TRAINER_WALLACE);
+    SetTrainerFlag(TRAINER_SIDNEY);
+    SetTrainerFlag(TRAINER_PHOEBE);
+    SetTrainerFlag(TRAINER_GLACIA);
+    SetTrainerFlag(TRAINER_DRAKE);
+    SetTrainerFlag(TRAINER_STEVEN);
     CloseMenu();
     return TRUE;
 }