diff --git a/generated/trainers.txt b/generated/trainers.txt index 8d1468e373..dcb820439e 100644 --- a/generated/trainers.txt +++ b/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 diff --git a/res/field/scripts/scripts_veilstone_city.s b/res/field/scripts/scripts_veilstone_city.s index db228bedc7..feb22e5f6c 100644 --- a/res/field/scripts/scripts_veilstone_city.s +++ b/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: diff --git a/res/trainers/data/dawn_veilstone_city_chimchar.json b/res/trainers/data/dawn_veilstone_city_chimchar.json index 5f610f19cb..9b38ea1e9e 100644 --- a/res/trainers/data/dawn_veilstone_city_chimchar.json +++ b/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 diff --git a/res/trainers/data/dawn_veilstone_city_piplup.json b/res/trainers/data/dawn_veilstone_city_piplup.json index 9b38ea1e9e..1c5059740b 100644 --- a/res/trainers/data/dawn_veilstone_city_piplup.json +++ b/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 diff --git a/res/trainers/data/dawn_veilstone_city_turtwig.json b/res/trainers/data/dawn_veilstone_city_turtwig.json index 1c5059740b..5f610f19cb 100644 --- a/res/trainers/data/dawn_veilstone_city_turtwig.json +++ b/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 diff --git a/res/trainers/data/lucas_veilstone_city_chimchar.json b/res/trainers/data/lucas_veilstone_city_chimchar.json index e4d0b21e24..5b34707452 100644 --- a/res/trainers/data/lucas_veilstone_city_chimchar.json +++ b/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 diff --git a/res/trainers/data/lucas_veilstone_city_piplup.json b/res/trainers/data/lucas_veilstone_city_piplup.json index 5b34707452..d074e283c0 100644 --- a/res/trainers/data/lucas_veilstone_city_piplup.json +++ b/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 diff --git a/res/trainers/data/lucas_veilstone_city_turtwig.json b/res/trainers/data/lucas_veilstone_city_turtwig.json index d074e283c0..e4d0b21e24 100644 --- a/res/trainers/data/lucas_veilstone_city_turtwig.json +++ b/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