Copy the Trainer struct from pokeemerald.

Also regenerate trainers*.h

1 files changed, 693 insertions, 693 deletions

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,