Merge pull request #311 from cbt6/trainer-names

Fix some trainer names
pret · Nov 25, 2024 · dd0b5ed · dd0b5ed
2 parents bf91edc + 410e9c5
commit dd0b5ed
Show file tree

Hide file tree

Showing 13 changed files with 25 additions and 25 deletions.
diff --git a/res/field/scripts/scripts_battleground.s b/res/field/scripts/scripts_battleground.s
@@ -428,23 +428,23 @@ _06E8:
     Return
 
 _06F0:
-    SetVar 0x4005, trainer_trainer_cheryl_battleground
+    SetVar 0x4005, trainer_cheryl_battleground
     Return
 
 _06F8:
-    SetVar 0x4005, trainer_trainer_riley_battleground
+    SetVar 0x4005, trainer_riley_battleground
     Return
 
 _0700:
-    SetVar 0x4005, trainer_trainer_marley_battleground
+    SetVar 0x4005, trainer_marley_battleground
     Return
 
 _0708:
-    SetVar 0x4005, trainer_trainer_buck_battleground
+    SetVar 0x4005, trainer_buck_battleground
     Return
 
 _0710:
-    SetVar 0x4005, trainer_trainer_mira_battleground
+    SetVar 0x4005, trainer_mira_battleground
     Return
 
 _0718:

diff --git a/res/trainers/meson.build b/res/trainers/meson.build
@@ -607,11 +607,11 @@ trainer_data_files = [
     'trainer_unknown_605.json',
     'trainer_veteran_harlan.json',
     'trainer_rival_spear_pillar_piplup.json',
-    'trainer_trainer_cheryl_cheryl.json',
-    'trainer_trainer_riley_riley.json',
-    'trainer_trainer_marley_marley.json',
-    'trainer_trainer_buck_buck.json',
-    'trainer_trainer_mira_mira.json',
+    'trainer_cheryl_eterna_forest.json',
+    'trainer_riley_iron_island.json',
+    'trainer_marley_victory_road.json',
+    'trainer_buck_stark_mountain.json',
+    'trainer_mira_wayward_cave.json',
     'trainer_lucas_jubilife_city_chimchar.json',
     'trainer_lucas_jubilife_city_piplup.json',
     'trainer_lucas_jubilife_city_turtwig.json',
@@ -860,11 +860,11 @@ trainer_data_files = [
     'trainer_leader_roark_rematch.json',
     'trainer_leader_wake_rematch.json',
     'trainer_leader_fantina_rematch.json',
-    'trainer_trainer_riley_battleground.json',
-    'trainer_trainer_buck_battleground.json',
-    'trainer_trainer_marley_battleground.json',
-    'trainer_trainer_mira_battleground.json',
-    'trainer_trainer_cheryl_battleground.json',
+    'trainer_riley_battleground.json',
+    'trainer_buck_battleground.json',
+    'trainer_marley_battleground.json',
+    'trainer_mira_battleground.json',
+    'trainer_cheryl_battleground.json',
     'trainer_elite_four_aaron_rematch.json',
     'trainer_elite_four_bertha_rematch.json',
     'trainer_elite_four_flint_rematch.json',

diff --git a/...rs/trainer_trainer_buck_battleground.json → res/trainers/trainer_buck_battleground.json b/...rs/trainer_trainer_buck_battleground.json → res/trainers/trainer_buck_battleground.json
diff --git a/res/trainers/trainer_trainer_buck_buck.json → ...trainers/trainer_buck_stark_mountain.json b/res/trainers/trainer_trainer_buck_buck.json → ...trainers/trainer_buck_stark_mountain.json
diff --git a/.../trainer_trainer_cheryl_battleground.json → ...trainers/trainer_cheryl_battleground.json b/.../trainer_trainer_cheryl_battleground.json → ...trainers/trainer_cheryl_battleground.json
diff --git a/...ainers/trainer_trainer_cheryl_cheryl.json → ...rainers/trainer_cheryl_eterna_forest.json b/...ainers/trainer_trainer_cheryl_cheryl.json → ...rainers/trainer_cheryl_eterna_forest.json
diff --git a/.../trainer_trainer_marley_battleground.json → ...trainers/trainer_marley_battleground.json b/.../trainer_trainer_marley_battleground.json → ...trainers/trainer_marley_battleground.json
diff --git a/...ainers/trainer_trainer_marley_marley.json → ...trainers/trainer_marley_victory_road.json b/...ainers/trainer_trainer_marley_marley.json → ...trainers/trainer_marley_victory_road.json
diff --git a/...rs/trainer_trainer_mira_battleground.json → res/trainers/trainer_mira_battleground.json b/...rs/trainer_trainer_mira_battleground.json → res/trainers/trainer_mira_battleground.json
diff --git a/res/trainers/trainer_trainer_mira_mira.json → res/trainers/trainer_mira_wayward_cave.json b/res/trainers/trainer_trainer_mira_mira.json → res/trainers/trainer_mira_wayward_cave.json
diff --git a/...s/trainer_trainer_riley_battleground.json → res/trainers/trainer_riley_battleground.json b/...s/trainer_trainer_riley_battleground.json → res/trainers/trainer_riley_battleground.json
diff --git a/...trainers/trainer_trainer_riley_riley.json → res/trainers/trainer_riley_iron_island.json b/...trainers/trainer_trainer_riley_riley.json → res/trainers/trainer_riley_iron_island.json
diff --git a/res/trainers/trainers.order b/res/trainers/trainers.order
@@ -606,11 +606,11 @@ trainer_swimmer_lydia
 trainer_unknown_605
 trainer_veteran_harlan
 trainer_rival_spear_pillar_piplup
-trainer_trainer_cheryl_cheryl
-trainer_trainer_riley_riley
-trainer_trainer_marley_marley
-trainer_trainer_buck_buck
-trainer_trainer_mira_mira
+trainer_cheryl_eterna_forest
+trainer_riley_iron_island
+trainer_marley_victory_road
+trainer_buck_stark_mountain
+trainer_mira_wayward_cave
 trainer_lucas_jubilife_city_chimchar
 trainer_lucas_jubilife_city_piplup
 trainer_lucas_jubilife_city_turtwig
@@ -859,11 +859,11 @@ trainer_leader_gardenia_rematch
 trainer_leader_roark_rematch
 trainer_leader_wake_rematch
 trainer_leader_fantina_rematch
-trainer_trainer_riley_battleground
-trainer_trainer_buck_battleground
-trainer_trainer_marley_battleground
-trainer_trainer_mira_battleground
-trainer_trainer_cheryl_battleground
+trainer_riley_battleground
+trainer_buck_battleground
+trainer_marley_battleground
+trainer_mira_battleground
+trainer_cheryl_battleground
 trainer_elite_four_aaron_rematch
 trainer_elite_four_bertha_rematch
 trainer_elite_four_flint_rematch