Rename Grunts to use location-specific names

1 files changed, 53 insertions, 53 deletions

diff --git a/include/constants/opponents.h b/include/constants/opponents.h
index 9f74baf67..e8ecd970c 100644
--- a/include/constants/opponents.h
+++ b/include/constants/opponents.h
@@ -3,33 +3,33 @@
 
 #define TRAINER_NONE              0
 #define TRAINER_SAWYER_1          1
-#define TRAINER_GRUNT_1           2
-#define TRAINER_GRUNT_2           3
-#define TRAINER_GRUNT_3           4
-#define TRAINER_GRUNT_4           5
-#define TRAINER_GRUNT_5           6
-#define TRAINER_GRUNT_6           7
-#define TRAINER_GRUNT_7           8
+#define TRAINER_GRUNT_AQUA_HIDEOUT_1           2
+#define TRAINER_GRUNT_AQUA_HIDEOUT_2           3
+#define TRAINER_GRUNT_AQUA_HIDEOUT_3           4
+#define TRAINER_GRUNT_AQUA_HIDEOUT_4           5
+#define TRAINER_GRUNT_SEAFLOOR_CAVERN_1           6
+#define TRAINER_GRUNT_SEAFLOOR_CAVERN_2           7
+#define TRAINER_GRUNT_SEAFLOOR_CAVERN_3           8
 #define TRAINER_GABRIELLE_1       9
-#define TRAINER_GRUNT_8          10
+#define TRAINER_GRUNT_PETALBURG_WOODS          10
 #define TRAINER_MARCEL           11
 #define TRAINER_ALBERTO          12
 #define TRAINER_ED               13
-#define TRAINER_GRUNT_9          14
+#define TRAINER_GRUNT_SEAFLOOR_CAVERN_4          14
 #define TRAINER_DECLAN           15
-#define TRAINER_GRUNT_10         16
-#define TRAINER_GRUNT_11         17
-#define TRAINER_GRUNT_12         18
-#define TRAINER_GRUNT_13         19
-#define TRAINER_GRUNT_14         20
-#define TRAINER_GRUNT_15         21
-#define TRAINER_GRUNT_16         22
-#define TRAINER_GRUNT_17         23
-#define TRAINER_GRUNT_18         24
-#define TRAINER_GRUNT_19         25
-#define TRAINER_GRUNT_20         26
-#define TRAINER_GRUNT_21         27
-#define TRAINER_GRUNT_22         28
+#define TRAINER_GRUNT_RUSTURF_TUNNEL         16
+#define TRAINER_GRUNT_WEATHER_INST_1         17
+#define TRAINER_GRUNT_WEATHER_INST_2         18
+#define TRAINER_GRUNT_WEATHER_INST_3         19
+#define TRAINER_GRUNT_MUSEUM_1         20
+#define TRAINER_GRUNT_MUSEUM_2         21
+#define TRAINER_GRUNT_SPACE_CENTER_1         22
+#define TRAINER_GRUNT_MT_PYRE_1         23
+#define TRAINER_GRUNT_MT_PYRE_2         24
+#define TRAINER_GRUNT_MT_PYRE_3         25
+#define TRAINER_GRUNT_WEATHER_INST_4         26
+#define TRAINER_GRUNT_AQUA_HIDEOUT_5         27
+#define TRAINER_GRUNT_AQUA_HIDEOUT_6         28
 #define TRAINER_FREDRICK         29
 #define TRAINER_MATT             30
 #define TRAINER_ZANDER           31
@@ -117,7 +117,7 @@
 #define TRAINER_VALERIE_5       113
 #define TRAINER_CINDY_1         114
 #define TRAINER_DAPHNE          115
-#define TRAINER_GRUNT_23        116
+#define TRAINER_GRUNT_SPACE_CENTER_2        116
 #define TRAINER_CINDY_2         117
 #define TRAINER_BRIANNA         118
 #define TRAINER_NAOMI           119
@@ -147,7 +147,7 @@
 #define TRAINER_STEVE_1         143
 #define TRAINER_THALIA_1        144
 #define TRAINER_MARK            145
-#define TRAINER_GRUNT_24        146
+#define TRAINER_GRUNT_MT_CHIMNEY_1        146
 #define TRAINER_STEVE_2         147
 #define TRAINER_STEVE_3         148
 #define TRAINER_STEVE_4         149
@@ -193,8 +193,8 @@
 #define TRAINER_DAISUKE         189
 #define TRAINER_ATSUSHI         190
 #define TRAINER_KIRK            191
-#define TRAINER_GRUNT_25        192
-#define TRAINER_GRUNT_26        193
+#define TRAINER_GRUNT_AQUA_HIDEOUT_7        192
+#define TRAINER_GRUNT_AQUA_HIDEOUT_8        193
 #define TRAINER_SHAWN           194
 #define TRAINER_FERNANDO_1      195
 #define TRAINER_DALTON_1        196
@@ -568,10 +568,10 @@
 #define TRAINER_CATHERINE_4     564
 #define TRAINER_CATHERINE_5     565
 #define TRAINER_JULIO           566
-#define TRAINER_GRUNT_27        567
-#define TRAINER_GRUNT_28        568
-#define TRAINER_GRUNT_29        569
-#define TRAINER_GRUNT_30        570
+#define TRAINER_GRUNT_SEAFLOOR_CAVERN_5        567
+#define TRAINER_GRUNT_UNUSED        568
+#define TRAINER_GRUNT_MT_PYRE_4        569
+#define TRAINER_GRUNT_JAGGED_PASS        570
 #define TRAINER_MARC            571
 #define TRAINER_BRENDEN         572
 #define TRAINER_LILITH          573
@@ -580,24 +580,24 @@
 #define TRAINER_LEONARDO        576
 #define TRAINER_ATHENA          577
 #define TRAINER_HARRISON        578
-#define TRAINER_GRUNT_31        579
+#define TRAINER_GRUNT_MT_CHIMNEY_2        579
 #define TRAINER_CLARENCE        580
 #define TRAINER_TERRY           581
 #define TRAINER_NATE            582
 #define TRAINER_KATHLEEN        583
 #define TRAINER_CLIFFORD        584
 #define TRAINER_NICHOLAS        585
-#define TRAINER_GRUNT_32        586
-#define TRAINER_GRUNT_33        587
-#define TRAINER_GRUNT_34        588
-#define TRAINER_GRUNT_35        589
-#define TRAINER_GRUNT_36        590
+#define TRAINER_GRUNT_SPACE_CENTER_3        586
+#define TRAINER_GRUNT_SPACE_CENTER_4        587
+#define TRAINER_GRUNT_SPACE_CENTER_5        588
+#define TRAINER_GRUNT_SPACE_CENTER_6        589
+#define TRAINER_GRUNT_SPACE_CENTER_7        590
 #define TRAINER_MACEY           591
 #define TRAINER_BRENDAN_10      592
 #define TRAINER_BRENDAN_11      593
 #define TRAINER_PAXTON          594
 #define TRAINER_ISABELLA        595
-#define TRAINER_GRUNT_37        596
+#define TRAINER_GRUNT_WEATHER_INST_5        596
 #define TRAINER_TABITHA_2       597
 #define TRAINER_JONATHAN        598
 #define TRAINER_BRENDAN_12      599
@@ -717,22 +717,22 @@
 #define TRAINER_KAI             713
 #define TRAINER_CHARLOTTE       714
 #define TRAINER_DEANDRE         715
-#define TRAINER_GRUNT_38        716
-#define TRAINER_GRUNT_39        717
-#define TRAINER_GRUNT_40        718
-#define TRAINER_GRUNT_41        719
-#define TRAINER_GRUNT_42        720
-#define TRAINER_GRUNT_43        721
-#define TRAINER_GRUNT_44        722
-#define TRAINER_GRUNT_45        723
-#define TRAINER_GRUNT_46        724
-#define TRAINER_GRUNT_47        725
-#define TRAINER_GRUNT_48        726
-#define TRAINER_GRUNT_49        727
-#define TRAINER_GRUNT_50        728
-#define TRAINER_GRUNT_51        729
-#define TRAINER_GRUNT_52        730
-#define TRAINER_GRUNT_53        731
+#define TRAINER_GRUNT_MAGMA_HIDEOUT_1        716
+#define TRAINER_GRUNT_MAGMA_HIDEOUT_2        717
+#define TRAINER_GRUNT_MAGMA_HIDEOUT_3        718
+#define TRAINER_GRUNT_MAGMA_HIDEOUT_4        719
+#define TRAINER_GRUNT_MAGMA_HIDEOUT_5        720
+#define TRAINER_GRUNT_MAGMA_HIDEOUT_6        721
+#define TRAINER_GRUNT_MAGMA_HIDEOUT_7        722
+#define TRAINER_GRUNT_MAGMA_HIDEOUT_8        723
+#define TRAINER_GRUNT_MAGMA_HIDEOUT_9        724
+#define TRAINER_GRUNT_MAGMA_HIDEOUT_10        725
+#define TRAINER_GRUNT_MAGMA_HIDEOUT_11        726
+#define TRAINER_GRUNT_MAGMA_HIDEOUT_12        727
+#define TRAINER_GRUNT_MAGMA_HIDEOUT_13        728
+#define TRAINER_GRUNT_MAGMA_HIDEOUT_14        729
+#define TRAINER_GRUNT_MAGMA_HIDEOUT_15        730
+#define TRAINER_GRUNT_MAGMA_HIDEOUT_16        731
 #define TRAINER_TABITHA_3       732
 #define TRAINER_DARCY           733
 #define TRAINER_MAXIE_3         734