Fix Dawn/Lucas Trainer Identifiers (#907)

generated/trainers.txt

@@ -619,12 +619,12 @@ TRAINER_DAWN_JUBILIFE_CITY_PIPLUP
 TRAINER_DAWN_JUBILIFE_CITY_TURTWIG
 TRAINER_RIVAL_SPEAR_PILLAR_TURTWIG
 TRAINER_RIVAL_SPEAR_PILLAR_CHIMCHAR
+TRAINER_LUCAS_VEILSTONE_CITY_TURTWIG
 TRAINER_LUCAS_VEILSTONE_CITY_CHIMCHAR
 TRAINER_LUCAS_VEILSTONE_CITY_PIPLUP
-TRAINER_LUCAS_VEILSTONE_CITY_TURTWIG
+TRAINER_DAWN_VEILSTONE_CITY_TURTWIG
 TRAINER_DAWN_VEILSTONE_CITY_CHIMCHAR
 TRAINER_DAWN_VEILSTONE_CITY_PIPLUP
-TRAINER_DAWN_VEILSTONE_CITY_TURTWIG
 TRAINER_AROMA_LADY_ELIZABETH_REMATCH_1
 TRAINER_AROMA_LADY_ELIZABETH_REMATCH_2
 TRAINER_AROMA_LADY_ELIZABETH_REMATCH_3

res/field/scripts/scripts_veilstone_city.s

@@ -627,20 +627,20 @@ VeilstoneCity_SetPlayerCounterpartPartnerTeam:
 
 VeilstoneCity_SetDawnPartnerTeam:
     GetPlayerStarterSpecies VAR_RESULT
-    SetVar VAR_0x8004, TRAINER_DAWN_VEILSTONE_CITY_PIPLUP
-    GoToIfEq VAR_RESULT, SPECIES_CHIMCHAR, _099D
-    SetVar VAR_0x8004, TRAINER_DAWN_VEILSTONE_CITY_TURTWIG
-    GoToIfEq VAR_RESULT, SPECIES_PIPLUP, _099D
     SetVar VAR_0x8004, TRAINER_DAWN_VEILSTONE_CITY_CHIMCHAR
+    GoToIfEq VAR_RESULT, SPECIES_CHIMCHAR, _099D
+    SetVar VAR_0x8004, TRAINER_DAWN_VEILSTONE_CITY_PIPLUP
+    GoToIfEq VAR_RESULT, SPECIES_PIPLUP, _099D
+    SetVar VAR_0x8004, TRAINER_DAWN_VEILSTONE_CITY_TURTWIG
     Return
 
 VeilstoneCity_SetLucasPartnerTeam:
     GetPlayerStarterSpecies VAR_RESULT
-    SetVar VAR_0x8004, TRAINER_LUCAS_VEILSTONE_CITY_PIPLUP
-    GoToIfEq VAR_RESULT, SPECIES_CHIMCHAR, _099D
-    SetVar VAR_0x8004, TRAINER_LUCAS_VEILSTONE_CITY_TURTWIG
-    GoToIfEq VAR_RESULT, SPECIES_PIPLUP, _099D
     SetVar VAR_0x8004, TRAINER_LUCAS_VEILSTONE_CITY_CHIMCHAR
+    GoToIfEq VAR_RESULT, SPECIES_CHIMCHAR, _099D
+    SetVar VAR_0x8004, TRAINER_LUCAS_VEILSTONE_CITY_PIPLUP
+    GoToIfEq VAR_RESULT, SPECIES_PIPLUP, _099D
+    SetVar VAR_0x8004, TRAINER_LUCAS_VEILSTONE_CITY_TURTWIG
     Return
 
 _099D:

res/trainers/data/dawn_veilstone_city_chimchar.json

@@ -38,15 +38,15 @@
             "ball_seal": 0
         },
         {
-            "species": "SPECIES_PRINPLUP",
+            "species": "SPECIES_GROTLE",
             "form": 0,
             "level": 27,
             "item": null,
             "moves": [
-                "MOVE_BUBBLE_BEAM",
-                "MOVE_METAL_CLAW",
-                "MOVE_PECK",
-                "MOVE_GROWL"
+                "MOVE_RAZOR_LEAF",
+                "MOVE_MEGA_DRAIN",
+                "MOVE_BITE",
+                "MOVE_CURSE"
             ],
             "power": 60,
             "ball_seal": 0

res/trainers/data/dawn_veilstone_city_piplup.json

@@ -38,15 +38,15 @@
             "ball_seal": 0
         },
         {
-            "species": "SPECIES_GROTLE",
+            "species": "SPECIES_MONFERNO",
             "form": 0,
             "level": 27,
             "item": null,
             "moves": [
-                "MOVE_RAZOR_LEAF",
-                "MOVE_MEGA_DRAIN",
-                "MOVE_BITE",
-                "MOVE_CURSE"
+                "MOVE_FLAME_WHEEL",
+                "MOVE_MACH_PUNCH",
+                "MOVE_FURY_SWIPES",
+                "MOVE_TORMENT"
             ],
             "power": 60,
             "ball_seal": 0

res/trainers/data/dawn_veilstone_city_turtwig.json

@@ -38,15 +38,15 @@
             "ball_seal": 0
         },
         {
-            "species": "SPECIES_MONFERNO",
+            "species": "SPECIES_PRINPLUP",
             "form": 0,
             "level": 27,
             "item": null,
             "moves": [
-                "MOVE_FLAME_WHEEL",
-                "MOVE_MACH_PUNCH",
-                "MOVE_FURY_SWIPES",
-                "MOVE_TORMENT"
+                "MOVE_BUBBLE_BEAM",
+                "MOVE_METAL_CLAW",
+                "MOVE_PECK",
+                "MOVE_GROWL"
             ],
             "power": 60,
             "ball_seal": 0

res/trainers/data/lucas_veilstone_city_chimchar.json

@@ -38,15 +38,15 @@
             "ball_seal": 0
         },
         {
-            "species": "SPECIES_PRINPLUP",
+            "species": "SPECIES_GROTLE",
             "form": 0,
             "level": 27,
             "item": null,
             "moves": [
-                "MOVE_BUBBLE_BEAM",
-                "MOVE_METAL_CLAW",
-                "MOVE_PECK",
-                "MOVE_GROWL"
+                "MOVE_RAZOR_LEAF",
+                "MOVE_MEGA_DRAIN",
+                "MOVE_BITE",
+                "MOVE_CURSE"
             ],
             "power": 60,
             "ball_seal": 0

res/trainers/data/lucas_veilstone_city_piplup.json

@@ -38,15 +38,15 @@
             "ball_seal": 0
         },
         {
-            "species": "SPECIES_GROTLE",
+            "species": "SPECIES_MONFERNO",
             "form": 0,
             "level": 27,
             "item": null,
             "moves": [
-                "MOVE_RAZOR_LEAF",
-                "MOVE_MEGA_DRAIN",
-                "MOVE_BITE",
-                "MOVE_CURSE"
+                "MOVE_FLAME_WHEEL",
+                "MOVE_MACH_PUNCH",
+                "MOVE_FURY_SWIPES",
+                "MOVE_TORMENT"
             ],
             "power": 60,
             "ball_seal": 0

res/trainers/data/lucas_veilstone_city_turtwig.json

@@ -38,15 +38,15 @@
             "ball_seal": 0
         },
         {
-            "species": "SPECIES_MONFERNO",
+            "species": "SPECIES_PRINPLUP",
             "form": 0,
             "level": 27,
             "item": null,
             "moves": [
-                "MOVE_FLAME_WHEEL",
-                "MOVE_MACH_PUNCH",
-                "MOVE_FURY_SWIPES",
-                "MOVE_TORMENT"
+                "MOVE_BUBBLE_BEAM",
+                "MOVE_METAL_CLAW",
+                "MOVE_PECK",
+                "MOVE_GROWL"
             ],
             "power": 60,
             "ball_seal": 0