Use opponent constants in version differences.

17 files changed, 93 insertions, 93 deletions

diff --git a/constants/version.s b/constants/version.s
index 2d79b5aeb..33d2804fc 100644
--- a/constants/version.s
+++ b/constants/version.s
@@ -25,61 +25,61 @@
 	.endif
 
 	.ifdef SAPPHIRE
-	.set TRAINER_PETALBURG_WOODS_GRUNT, 10
-	.set TRAINER_RUSTURF_TUNNEL_GRUNT, 16
-	.set TRAINER_MUSEUM_2F_GRUNT_1, 20
-	.set TRAINER_MUSEUM_2F_GRUNT_2, 21
-	.set TRAINER_514, 513
-	.set TRAINER_MT_CHIMNEY_GRUNT_1, 31
-	.set TRAINER_MT_CHIMNEY_GRUNT_2, 14
-	.set TRAINER_HIDEOUT_1F_GRUNT, 2
-	.set TRAINER_HIDEOUT_B1F_GRUNT_1, 3
-	.set TRAINER_HIDEOUT_B1F_GRUNT_2, 4
-	.set TRAINER_HIDEOUT_B1F_GRUNT_3, 27
-	.set TRAINER_HIDEOUT_B2F_GRUNT_1, 30
-	.set TRAINER_HIDEOUT_B2F_GRUNT_2, 5
-	.set TRAINER_HIDEOUT_B2F_GRUNT_3, 28
-	.set TRAINER_SEAFLOOR_CAVERN_GRUNT_1, 6
-	.set TRAINER_SEAFLOOR_CAVERN_GRUNT_2, 7
-	.set TRAINER_SEAFLOOR_CAVERN_GRUNT_3, 33
-	.set TRAINER_SEAFLOOR_CAVERN_GRUNT_4, 8
-	.set TRAINER_SEAFLOOR_CAVERN_GRUNT_5, 34
-	.set TRAINER_MT_CHIMNEY_GRUNT_3, 35
-	.set TRAINER_MT_PYRE_SUMMIT_GRUNT_1, 23
-	.set TRAINER_MT_PYRE_SUMMIT_GRUNT_2, 24
-	.set TRAINER_MT_PYRE_SUMMIT_GRUNT_3, 25
-	.set TRAINER_WEATHER_INSTITUTE_GRUNT_1, 17
-	.set TRAINER_WEATHER_INSTITUTE_GRUNT_2, 26
-	.set TRAINER_WEATHER_INSTITUTE_GRUNT_3, 18
-	.set TRAINER_WEATHER_INSTITUTE_GRUNT_4, 19
-	.set TRAINER_WEATHER_INSTITUTE_GRUNT_5, 32
+	.set OPPONENT_PETALBURG_WOODS_GRUNT, OPPONENT_GRUNT_9
+	.set OPPONENT_RUSTURF_TUNNEL_GRUNT, OPPONENT_GRUNT_15
+	.set OPPONENT_MUSEUM_2F_GRUNT_1, OPPONENT_GRUNT_19
+	.set OPPONENT_MUSEUM_2F_GRUNT_2, OPPONENT_GRUNT_20
+	.set OPPONENT_514, OPPONENT_HECTOR_1
+	.set OPPONENT_MT_CHIMNEY_GRUNT_1, OPPONENT_MATT_2
+	.set OPPONENT_MT_CHIMNEY_GRUNT_2, OPPONENT_GRUNT_13
+	.set OPPONENT_HIDEOUT_1F_GRUNT, OPPONENT_GRUNT_1
+	.set OPPONENT_HIDEOUT_B1F_GRUNT_1, OPPONENT_GRUNT_2
+	.set OPPONENT_HIDEOUT_B1F_GRUNT_2, OPPONENT_GRUNT_3
+	.set OPPONENT_HIDEOUT_B1F_GRUNT_3, OPPONENT_GRUNT_26
+	.set OPPONENT_HIDEOUT_B2F_GRUNT_1, OPPONENT_MATT_1
+	.set OPPONENT_HIDEOUT_B2F_GRUNT_2, OPPONENT_GRUNT_4
+	.set OPPONENT_HIDEOUT_B2F_GRUNT_3, OPPONENT_GRUNT_27
+	.set OPPONENT_SEAFLOOR_CAVERN_GRUNT_1, OPPONENT_GRUNT_5
+	.set OPPONENT_SEAFLOOR_CAVERN_GRUNT_2, OPPONENT_GRUNT_6
+	.set OPPONENT_SEAFLOOR_CAVERN_GRUNT_3, OPPONENT_SHELLY_2
+	.set OPPONENT_SEAFLOOR_CAVERN_GRUNT_4, OPPONENT_GRUNT_7
+	.set OPPONENT_SEAFLOOR_CAVERN_GRUNT_5, OPPONENT_ARCHIE_2
+	.set OPPONENT_MT_CHIMNEY_GRUNT_3, OPPONENT_ARCHIE_3
+	.set OPPONENT_MT_PYRE_SUMMIT_GRUNT_1, OPPONENT_GRUNT_22
+	.set OPPONENT_MT_PYRE_SUMMIT_GRUNT_2, OPPONENT_GRUNT_23
+	.set OPPONENT_MT_PYRE_SUMMIT_GRUNT_3, OPPONENT_GRUNT_24
+	.set OPPONENT_WEATHER_INSTITUTE_GRUNT_1, OPPONENT_GRUNT_16
+	.set OPPONENT_WEATHER_INSTITUTE_GRUNT_2, OPPONENT_GRUNT_25
+	.set OPPONENT_WEATHER_INSTITUTE_GRUNT_3, OPPONENT_GRUNT_17
+	.set OPPONENT_WEATHER_INSTITUTE_GRUNT_4, OPPONENT_GRUNT_18
+	.set OPPONENT_WEATHER_INSTITUTE_GRUNT_5, OPPONENT_SHELLY_1
 	.else
-	.set TRAINER_PETALBURG_WOODS_GRUNT, 575
-	.set TRAINER_RUSTURF_TUNNEL_GRUNT, 581
-	.set TRAINER_MUSEUM_2F_GRUNT_1, 585
-	.set TRAINER_MUSEUM_2F_GRUNT_2, 586
-	.set TRAINER_514, 514
-	.set TRAINER_MT_CHIMNEY_GRUNT_1, 597
-	.set TRAINER_MT_CHIMNEY_GRUNT_2, 579
-	.set TRAINER_HIDEOUT_1F_GRUNT, 567
-	.set TRAINER_HIDEOUT_B1F_GRUNT_1, 568
-	.set TRAINER_HIDEOUT_B1F_GRUNT_2, 569
-	.set TRAINER_HIDEOUT_B1F_GRUNT_3, 592
-	.set TRAINER_HIDEOUT_B2F_GRUNT_1, 596
-	.set TRAINER_HIDEOUT_B2F_GRUNT_2, 570
-	.set TRAINER_HIDEOUT_B2F_GRUNT_3, 593
-	.set TRAINER_SEAFLOOR_CAVERN_GRUNT_1, 571
-	.set TRAINER_SEAFLOOR_CAVERN_GRUNT_2, 572
-	.set TRAINER_SEAFLOOR_CAVERN_GRUNT_3, 600
-	.set TRAINER_SEAFLOOR_CAVERN_GRUNT_4, 573
-	.set TRAINER_SEAFLOOR_CAVERN_GRUNT_5, 601
-	.set TRAINER_MT_CHIMNEY_GRUNT_3, 602
-	.set TRAINER_MT_PYRE_SUMMIT_GRUNT_1, 588
-	.set TRAINER_MT_PYRE_SUMMIT_GRUNT_2, 589
-	.set TRAINER_MT_PYRE_SUMMIT_GRUNT_3, 590
-	.set TRAINER_WEATHER_INSTITUTE_GRUNT_1, 582
-	.set TRAINER_WEATHER_INSTITUTE_GRUNT_2, 591
-	.set TRAINER_WEATHER_INSTITUTE_GRUNT_3, 583
-	.set TRAINER_WEATHER_INSTITUTE_GRUNT_4, 584
-	.set TRAINER_WEATHER_INSTITUTE_GRUNT_5, 599
+	.set OPPONENT_PETALBURG_WOODS_GRUNT, OPPONENT_GRUNT_36
+	.set OPPONENT_RUSTURF_TUNNEL_GRUNT, OPPONENT_GRUNT_42
+	.set OPPONENT_MUSEUM_2F_GRUNT_1, OPPONENT_GRUNT_46
+	.set OPPONENT_MUSEUM_2F_GRUNT_2, OPPONENT_GRUNT_47
+	.set OPPONENT_514, OPPONENT_HECTOR_2
+	.set OPPONENT_MT_CHIMNEY_GRUNT_1, OPPONENT_TABITHA_2
+	.set OPPONENT_MT_CHIMNEY_GRUNT_2, OPPONENT_GRUNT_40
+	.set OPPONENT_HIDEOUT_1F_GRUNT, OPPONENT_GRUNT_28
+	.set OPPONENT_HIDEOUT_B1F_GRUNT_1, OPPONENT_GRUNT_29
+	.set OPPONENT_HIDEOUT_B1F_GRUNT_2, OPPONENT_GRUNT_30
+	.set OPPONENT_HIDEOUT_B1F_GRUNT_3, OPPONENT_GRUNT_53
+	.set OPPONENT_HIDEOUT_B2F_GRUNT_1, OPPONENT_TABITHA_1
+	.set OPPONENT_HIDEOUT_B2F_GRUNT_2, OPPONENT_GRUNT_31
+	.set OPPONENT_HIDEOUT_B2F_GRUNT_3, OPPONENT_GRUNT_54
+	.set OPPONENT_SEAFLOOR_CAVERN_GRUNT_1, OPPONENT_GRUNT_32
+	.set OPPONENT_SEAFLOOR_CAVERN_GRUNT_2, OPPONENT_GRUNT_33
+	.set OPPONENT_SEAFLOOR_CAVERN_GRUNT_3, OPPONENT_COURTNEY_2
+	.set OPPONENT_SEAFLOOR_CAVERN_GRUNT_4, OPPONENT_GRUNT_34
+	.set OPPONENT_SEAFLOOR_CAVERN_GRUNT_5, OPPONENT_MAXIE_2
+	.set OPPONENT_MT_CHIMNEY_GRUNT_3, OPPONENT_MAXIE_3
+	.set OPPONENT_MT_PYRE_SUMMIT_GRUNT_1, OPPONENT_GRUNT_49
+	.set OPPONENT_MT_PYRE_SUMMIT_GRUNT_2, OPPONENT_GRUNT_50
+	.set OPPONENT_MT_PYRE_SUMMIT_GRUNT_3, OPPONENT_GRUNT_51
+	.set OPPONENT_WEATHER_INSTITUTE_GRUNT_1, OPPONENT_GRUNT_43
+	.set OPPONENT_WEATHER_INSTITUTE_GRUNT_2, OPPONENT_GRUNT_52
+	.set OPPONENT_WEATHER_INSTITUTE_GRUNT_3, OPPONENT_GRUNT_44
+	.set OPPONENT_WEATHER_INSTITUTE_GRUNT_4, OPPONENT_GRUNT_45
+	.set OPPONENT_WEATHER_INSTITUTE_GRUNT_5, OPPONENT_COURTNEY_1
 	.endif
diff --git a/data/scripts/magma_chimney.s b/data/scripts/magma_chimney.s
index 522e3887f..a2f4f67b7 100644
--- a/data/scripts/magma_chimney.s
+++ b/data/scripts/magma_chimney.s
@@ -48,9 +48,9 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB
 	msgbox MtChimney_Text_1B38B3, 4
 	.endif
 	.ifdef SAPPHIRE
-	trainerbattle 3, TRAINER_MT_CHIMNEY_GRUNT_3, 0, MtChimney_Text_1B3099
+	trainerbattle 3, OPPONENT_MT_CHIMNEY_GRUNT_3, 0, MtChimney_Text_1B3099
 	.else
-	trainerbattle 3, TRAINER_MT_CHIMNEY_GRUNT_3, 0, MtChimney_Text_1B3A68
+	trainerbattle 3, OPPONENT_MT_CHIMNEY_GRUNT_3, 0, MtChimney_Text_1B3A68
 	.endif
 	.ifdef SAPPHIRE
 	msgbox MtChimney_Text_1B30C2, 4
diff --git a/data/scripts/magma_summit.s b/data/scripts/magma_summit.s
index 0992a62c0..ac71b038f 100644
--- a/data/scripts/magma_summit.s
+++ b/data/scripts/magma_summit.s
@@ -1,29 +1,29 @@
 MtPyre_Summit_EventScript_1B2DA9:: @ 81B2DA9
 	.ifdef SAPPHIRE
-	trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_1, 0, UnknownString_81B50C3, UnknownString_81B50F5
+	trainerbattle 0, OPPONENT_MT_PYRE_SUMMIT_GRUNT_1, 0, UnknownString_81B50C3, UnknownString_81B50F5
 	msgbox UnknownString_81B5131, 6
 	.else
-	trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_1, 0, MtPyre_Summit_Text_1B5CFD, MtPyre_Summit_Text_1B5D30
+	trainerbattle 0, OPPONENT_MT_PYRE_SUMMIT_GRUNT_1, 0, MtPyre_Summit_Text_1B5CFD, MtPyre_Summit_Text_1B5D30
 	msgbox MtPyre_Summit_Text_1B5D6D, 6
 	.endif
 	end
 
 MtPyre_Summit_EventScript_1B2DC0:: @ 81B2DC0
 	.ifdef SAPPHIRE
-	trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_2, 0, UnknownString_81B5166, UnknownString_81B519F
+	trainerbattle 0, OPPONENT_MT_PYRE_SUMMIT_GRUNT_2, 0, UnknownString_81B5166, UnknownString_81B519F
 	msgbox UnknownString_81B51B5, 6
 	.else
-	trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_2, 0, MtPyre_Summit_Text_1B5DA2, MtPyre_Summit_Text_1B5DDB
+	trainerbattle 0, OPPONENT_MT_PYRE_SUMMIT_GRUNT_2, 0, MtPyre_Summit_Text_1B5DA2, MtPyre_Summit_Text_1B5DDB
 	msgbox MtPyre_Summit_Text_1B5DF1, 6
 	.endif
 	end
 
 MtPyre_Summit_EventScript_1B2DD7:: @ 81B2DD7
 	.ifdef SAPPHIRE
-	trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_3, 0, UnknownString_81B51EB, UnknownString_81B5224
+	trainerbattle 0, OPPONENT_MT_PYRE_SUMMIT_GRUNT_3, 0, UnknownString_81B51EB, UnknownString_81B5224
 	msgbox UnknownString_81B5248, 6
 	.else
-	trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_3, 0, MtPyre_Summit_Text_1B5E27, MtPyre_Summit_Text_1B5E60
+	trainerbattle 0, OPPONENT_MT_PYRE_SUMMIT_GRUNT_3, 0, MtPyre_Summit_Text_1B5E27, MtPyre_Summit_Text_1B5E60
 	msgbox MtPyre_Summit_Text_1B5E84, 6
 	.endif
 	end
diff --git a/data/scripts/maps/AquaHideout_1F.s b/data/scripts/maps/AquaHideout_1F.s
index f24e7031e..cc1ad33b1 100644
--- a/data/scripts/maps/AquaHideout_1F.s
+++ b/data/scripts/maps/AquaHideout_1F.s
@@ -38,7 +38,7 @@ AquaHideout_1F_EventScript_15D802:: @ 815D802
 
 AquaHideout_1F_EventScript_15D80C:: @ 815D80C
 MagmaHideout_1F_EventScript_15D80C:: @ 815D80C
-	trainerbattle 2, TRAINER_HIDEOUT_1F_GRUNT, 0, AquaHideout_1F_Text_196E01, AquaHideout_1F_Text_196E28, AquaHideout_1F_EventScript_15D827
+	trainerbattle 2, OPPONENT_HIDEOUT_1F_GRUNT, 0, AquaHideout_1F_Text_196E01, AquaHideout_1F_Text_196E28, AquaHideout_1F_EventScript_15D827
 	msgbox AquaHideout_1F_Text_196E3D, 6
 	end
 
diff --git a/data/scripts/maps/AquaHideout_B1F.s b/data/scripts/maps/AquaHideout_B1F.s
index 51b782a26..969d590e3 100644
--- a/data/scripts/maps/AquaHideout_B1F.s
+++ b/data/scripts/maps/AquaHideout_B1F.s
@@ -18,7 +18,7 @@ AquaHideout_B1F_MapScript1_15D84A:: @ 815D84A
 
 AquaHideout_B1F_EventScript_15D850:: @ 815D850
 MagmaHideout_B1F_EventScript_15D850:: @ 815D850
-	trainerbattle 2, TRAINER_HIDEOUT_B1F_GRUNT_1, 0, AquaHideout_B1F_Text_196E6F, AquaHideout_B1F_Text_196EB6, AquaHideout_B1F_EventScript_15D86B
+	trainerbattle 2, OPPONENT_HIDEOUT_B1F_GRUNT_1, 0, AquaHideout_B1F_Text_196E6F, AquaHideout_B1F_Text_196EB6, AquaHideout_B1F_EventScript_15D86B
 	msgbox AquaHideout_B1F_Text_196ECC, 6
 	end
 
@@ -29,7 +29,7 @@ AquaHideout_B1F_EventScript_15D86B:: @ 815D86B
 
 AquaHideout_B1F_EventScript_15D875:: @ 815D875
 MagmaHideout_B1F_EventScript_15D875:: @ 815D875
-	trainerbattle 2, TRAINER_HIDEOUT_B1F_GRUNT_2, 0, AquaHideout_B1F_Text_196F39, AquaHideout_B1F_Text_196F9B, AquaHideout_B1F_EventScript_15D890
+	trainerbattle 2, OPPONENT_HIDEOUT_B1F_GRUNT_2, 0, AquaHideout_B1F_Text_196F39, AquaHideout_B1F_Text_196F9B, AquaHideout_B1F_EventScript_15D890
 	msgbox AquaHideout_B1F_Text_196FB5, 6
 	end
 
@@ -40,6 +40,6 @@ AquaHideout_B1F_EventScript_15D890:: @ 815D890
 
 AquaHideout_B1F_EventScript_15D89A:: @ 815D89A
 MagmaHideout_B1F_EventScript_15D89A:: @ 815D89A
-	trainerbattle 0, TRAINER_HIDEOUT_B1F_GRUNT_3, 0, AquaHideout_B1F_Text_196FFD, AquaHideout_B1F_Text_197040
+	trainerbattle 0, OPPONENT_HIDEOUT_B1F_GRUNT_3, 0, AquaHideout_B1F_Text_196FFD, AquaHideout_B1F_Text_197040
 	msgbox AquaHideout_B1F_Text_197056, 6
 	end
diff --git a/data/scripts/maps/AquaHideout_B2F.s b/data/scripts/maps/AquaHideout_B2F.s
index 479dad430..845b755b7 100644
--- a/data/scripts/maps/AquaHideout_B2F.s
+++ b/data/scripts/maps/AquaHideout_B2F.s
@@ -25,7 +25,7 @@ MagmaHideout_B2F_EventScript_15D8BD:: @ 815D8BD
 
 AquaHideout_B2F_EventScript_15D8E1:: @ 815D8E1
 MagmaHideout_B2F_EventScript_15D8E1:: @ 815D8E1
-	trainerbattle 2, TRAINER_HIDEOUT_B2F_GRUNT_1, 0, AquaHideout_B2F_Text_197093, AquaHideout_B2F_Text_197145, AquaHideout_B2F_EventScript_15D8FD
+	trainerbattle 2, OPPONENT_HIDEOUT_B2F_GRUNT_1, 0, AquaHideout_B2F_Text_197093, AquaHideout_B2F_Text_197145, AquaHideout_B2F_EventScript_15D8FD
 	msgbox AquaHideout_B2F_Text_1971AE, 4
 	release
 	end
@@ -85,7 +85,7 @@ AquaHideout_B2F_Movement_15D95D:: @ 815D95D
 
 AquaHideout_B2F_EventScript_15D962:: @ 815D962
 MagmaHideout_B2F_EventScript_15D962:: @ 815D962
-	trainerbattle 2, TRAINER_HIDEOUT_B2F_GRUNT_2, 0, AquaHideout_B2F_Text_197270, AquaHideout_B2F_Text_1972AC, AquaHideout_B2F_EventScript_15D97D
+	trainerbattle 2, OPPONENT_HIDEOUT_B2F_GRUNT_2, 0, AquaHideout_B2F_Text_197270, AquaHideout_B2F_Text_1972AC, AquaHideout_B2F_EventScript_15D97D
 	msgbox AquaHideout_B2F_Text_1972D2, 6
 	end
 
@@ -96,6 +96,6 @@ AquaHideout_B2F_EventScript_15D97D:: @ 815D97D
 
 AquaHideout_B2F_EventScript_15D987:: @ 815D987
 MagmaHideout_B2F_EventScript_15D987:: @ 815D987
-	trainerbattle 0, TRAINER_HIDEOUT_B2F_GRUNT_3, 0, AquaHideout_B2F_Text_1972EF, AquaHideout_B2F_Text_197390
+	trainerbattle 0, OPPONENT_HIDEOUT_B2F_GRUNT_3, 0, AquaHideout_B2F_Text_1972EF, AquaHideout_B2F_Text_197390
 	msgbox AquaHideout_B2F_Text_1973C0, 6
 	end
diff --git a/data/scripts/maps/MtChimney.s b/data/scripts/maps/MtChimney.s
index 4c6f90d9d..01065d315 100644
--- a/data/scripts/maps/MtChimney.s
+++ b/data/scripts/maps/MtChimney.s
@@ -330,20 +330,20 @@ MtChimney_EventScript_15D107:: @ 815D107
 
 MtChimney_EventScript_15D110:: @ 815D110
 	.ifdef SAPPHIRE
-	trainerbattle 0, TRAINER_MT_CHIMNEY_GRUNT_1, 0, MtChimney_Text_1B3168, MtChimney_Text_1B31EA
+	trainerbattle 0, OPPONENT_MT_CHIMNEY_GRUNT_1, 0, MtChimney_Text_1B3168, MtChimney_Text_1B31EA
 	msgbox MtChimney_Text_1B3239, 6
 	.else
-	trainerbattle 0, TRAINER_MT_CHIMNEY_GRUNT_1, 0, MtChimney_Text_1B3B36, MtChimney_Text_1B3BB8
+	trainerbattle 0, OPPONENT_MT_CHIMNEY_GRUNT_1, 0, MtChimney_Text_1B3B36, MtChimney_Text_1B3BB8
 	msgbox MtChimney_Text_1B3C07, 6
 	.endif
 	end
 
 MtChimney_EventScript_15D127:: @ 815D127
 	.ifdef SAPPHIRE
-	trainerbattle 0, TRAINER_MT_CHIMNEY_GRUNT_2, 0, MtChimney_Text_1B32C8, MtChimney_Text_1B336E
+	trainerbattle 0, OPPONENT_MT_CHIMNEY_GRUNT_2, 0, MtChimney_Text_1B32C8, MtChimney_Text_1B336E
 	msgbox MtChimney_Text_1B338D, 6
 	.else
-	trainerbattle 0, TRAINER_MT_CHIMNEY_GRUNT_2, 0, MtChimney_Text_1B3C96, MtChimney_Text_1B3D1E
+	trainerbattle 0, OPPONENT_MT_CHIMNEY_GRUNT_2, 0, MtChimney_Text_1B3C96, MtChimney_Text_1B3D1E
 	msgbox MtChimney_Text_1B3D3D, 6
 	.endif
 	end
diff --git a/data/scripts/maps/PetalburgWoods.s b/data/scripts/maps/PetalburgWoods.s
index 754dcff39..82b84af10 100644
--- a/data/scripts/maps/PetalburgWoods.s
+++ b/data/scripts/maps/PetalburgWoods.s
@@ -30,7 +30,7 @@ PetalburgWoods_EventScript_15CCA8:: @ 815CCA8
 	move 3, PetalburgWoods_Movement_15CEC8
 	waitmove 0
 	msgbox PetalburgWoods_Text_194EE8, 4
-	trainerbattle 3, TRAINER_PETALBURG_WOODS_GRUNT, 0, PetalburgWoods_Text_194F83
+	trainerbattle 3, OPPONENT_PETALBURG_WOODS_GRUNT, 0, PetalburgWoods_Text_194F83
 	move 3, PetalburgWoods_Movement_15CEB3
 	waitmove 0
 	call PetalburgWoods_EventScript_15CDFA
@@ -65,7 +65,7 @@ PetalburgWoods_EventScript_15CD42:: @ 815CD42
 	move 255, PetalburgWoods_Movement_1A0841
 	waitmove 0
 	msgbox PetalburgWoods_Text_194EE8, 4
-	trainerbattle 3, TRAINER_PETALBURG_WOODS_GRUNT, 0, PetalburgWoods_Text_194F83
+	trainerbattle 3, OPPONENT_PETALBURG_WOODS_GRUNT, 0, PetalburgWoods_Text_194F83
 	move 3, PetalburgWoods_Movement_15CEB3
 	waitmove 0
 	call PetalburgWoods_EventScript_15CDFA
diff --git a/data/scripts/maps/Route115.s b/data/scripts/maps/Route115.s
index 187e9b86f..f6a51ddac 100644
--- a/data/scripts/maps/Route115.s
+++ b/data/scripts/maps/Route115.s
@@ -59,10 +59,10 @@ Route115_EventScript_150A03:: @ 8150A03
 
 Route115_EventScript_150A1A:: @ 8150A1A
 .ifdef SAPPHIRE
-	trainerbattle 0, TRAINER_514, 0, UnknownString_81BCE47, UnknownString_81BCE7D
+	trainerbattle 0, OPPONENT_514, 0, UnknownString_81BCE47, UnknownString_81BCE7D
 	msgbox UnknownString_81BCEA4, 6
 .else
-	trainerbattle 0, TRAINER_514, 0, Route115_Text_1BCEE0, Route115_Text_1BCF16
+	trainerbattle 0, OPPONENT_514, 0, Route115_Text_1BCEE0, Route115_Text_1BCF16
 	msgbox Route115_Text_1BCF3D, 6
 .endc
 	end
diff --git a/data/scripts/maps/Route119_WeatherInstitute_1F.s b/data/scripts/maps/Route119_WeatherInstitute_1F.s
index 64bc09057..36314a59f 100644
--- a/data/scripts/maps/Route119_WeatherInstitute_1F.s
+++ b/data/scripts/maps/Route119_WeatherInstitute_1F.s
@@ -45,11 +45,11 @@ Route119_WeatherInstitute_1F_EventScript_163C83:: @ 8163C83
 	end
 
 Route119_WeatherInstitute_1F_EventScript_163C94:: @ 8163C94
-	trainerbattle 0, TRAINER_WEATHER_INSTITUTE_GRUNT_1, 0, Route119_WeatherInstitute_1F_Text_19EB8A, Route119_WeatherInstitute_1F_Text_19EBEE
+	trainerbattle 0, OPPONENT_WEATHER_INSTITUTE_GRUNT_1, 0, Route119_WeatherInstitute_1F_Text_19EB8A, Route119_WeatherInstitute_1F_Text_19EBEE
 	msgbox Route119_WeatherInstitute_1F_Text_19EC0E, 6
 	end
 
 Route119_WeatherInstitute_1F_EventScript_163CAB:: @ 8163CAB
-	trainerbattle 0, TRAINER_WEATHER_INSTITUTE_GRUNT_2, 0, Route119_WeatherInstitute_1F_Text_19EC6B, Route119_WeatherInstitute_1F_Text_19EC89
+	trainerbattle 0, OPPONENT_WEATHER_INSTITUTE_GRUNT_2, 0, Route119_WeatherInstitute_1F_Text_19EC6B, Route119_WeatherInstitute_1F_Text_19EC89
 	msgbox Route119_WeatherInstitute_1F_Text_19EC97, 6
 	end
diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.s b/data/scripts/maps/Route119_WeatherInstitute_2F.s
index 30a98313c..37f8e9ec6 100644
--- a/data/scripts/maps/Route119_WeatherInstitute_2F.s
+++ b/data/scripts/maps/Route119_WeatherInstitute_2F.s
@@ -21,17 +21,17 @@ Route119_WeatherInstitute_2F_EventScript_163CF0:: @ 8163CF0
 	return
 
 Route119_WeatherInstitute_2F_EventScript_163CFC:: @ 8163CFC
-	trainerbattle 0, TRAINER_WEATHER_INSTITUTE_GRUNT_3, 0, Route119_WeatherInstitute_2F_Text_19EEAF, Route119_WeatherInstitute_2F_Text_19EF1B
+	trainerbattle 0, OPPONENT_WEATHER_INSTITUTE_GRUNT_3, 0, Route119_WeatherInstitute_2F_Text_19EEAF, Route119_WeatherInstitute_2F_Text_19EF1B
 	msgbox Route119_WeatherInstitute_2F_Text_19EF3E, 6
 	end
 
 Route119_WeatherInstitute_2F_EventScript_163D13:: @ 8163D13
-	trainerbattle 0, TRAINER_WEATHER_INSTITUTE_GRUNT_4, 0, Route119_WeatherInstitute_2F_Text_19EFA3, Route119_WeatherInstitute_2F_Text_19EFDD
+	trainerbattle 0, OPPONENT_WEATHER_INSTITUTE_GRUNT_4, 0, Route119_WeatherInstitute_2F_Text_19EFA3, Route119_WeatherInstitute_2F_Text_19EFDD
 	msgbox Route119_WeatherInstitute_2F_Text_19EFE9, 6
 	end
 
 Route119_WeatherInstitute_2F_EventScript_163D2A:: @ 8163D2A
-	trainerbattle 2, TRAINER_WEATHER_INSTITUTE_GRUNT_5, 0, Route119_WeatherInstitute_2F_Text_19F042, Route119_WeatherInstitute_2F_Text_19F0F4, Route119_WeatherInstitute_2F_EventScript_163D45
+	trainerbattle 2, OPPONENT_WEATHER_INSTITUTE_GRUNT_5, 0, Route119_WeatherInstitute_2F_Text_19F042, Route119_WeatherInstitute_2F_Text_19F0F4, Route119_WeatherInstitute_2F_EventScript_163D45
 	msgbox Route119_WeatherInstitute_2F_Text_19F11B, 6
 	end
 
diff --git a/data/scripts/maps/RusturfTunnel.s b/data/scripts/maps/RusturfTunnel.s
index bba1933b8..989f1657b 100644
--- a/data/scripts/maps/RusturfTunnel.s
+++ b/data/scripts/maps/RusturfTunnel.s
@@ -311,7 +311,7 @@ RusturfTunnel_EventScript_15C9EA:: @ 815C9EA
 	faceplayer
 	playmusic BGM_EVIL_TEAM, 0
 	msgbox RusturfTunnel_Text_19419B, 4
-	trainerbattle 3, TRAINER_RUSTURF_TUNNEL_GRUNT, 0, RusturfTunnel_Text_194243
+	trainerbattle 3, OPPONENT_RUSTURF_TUNNEL_GRUNT, 0, RusturfTunnel_Text_194243
 	msgbox RusturfTunnel_Text_194274, 4
 	giveitem ITEM_DEVON_GOODS
 	closebutton
diff --git a/data/scripts/maps/SeafloorCavern_Room1.s b/data/scripts/maps/SeafloorCavern_Room1.s
index cd1513ec1..6478efac1 100644
--- a/data/scripts/maps/SeafloorCavern_Room1.s
+++ b/data/scripts/maps/SeafloorCavern_Room1.s
@@ -7,11 +7,11 @@ SeafloorCavern_Room1_MapScript1_15DA67:: @ 815DA67
 	end
 
 SeafloorCavern_Room1_EventScript_15DA6D:: @ 815DA6D
-	trainerbattle 0, TRAINER_SEAFLOOR_CAVERN_GRUNT_1, 0, SeafloorCavern_Room1_Text_1974BA, SeafloorCavern_Room1_Text_1974EA
+	trainerbattle 0, OPPONENT_SEAFLOOR_CAVERN_GRUNT_1, 0, SeafloorCavern_Room1_Text_1974BA, SeafloorCavern_Room1_Text_1974EA
 	msgbox SeafloorCavern_Room1_Text_1974FF, 6
 	end
 
 SeafloorCavern_Room1_EventScript_15DA84:: @ 815DA84
-	trainerbattle 0, TRAINER_SEAFLOOR_CAVERN_GRUNT_2, 0, SeafloorCavern_Room1_Text_19753C, SeafloorCavern_Room1_Text_197573
+	trainerbattle 0, OPPONENT_SEAFLOOR_CAVERN_GRUNT_2, 0, SeafloorCavern_Room1_Text_19753C, SeafloorCavern_Room1_Text_197573
 	msgbox SeafloorCavern_Room1_Text_197589, 6
 	end
diff --git a/data/scripts/maps/SeafloorCavern_Room3.s b/data/scripts/maps/SeafloorCavern_Room3.s
index 57f2bc20a..2ff8c4b26 100644
--- a/data/scripts/maps/SeafloorCavern_Room3.s
+++ b/data/scripts/maps/SeafloorCavern_Room3.s
@@ -7,6 +7,6 @@ SeafloorCavern_Room3_MapScript1_15DAA2:: @ 815DAA2
 	end
 
 SeafloorCavern_Room3_EventScript_15DAA8:: @ 815DAA8
-	trainerbattle 0, TRAINER_SEAFLOOR_CAVERN_GRUNT_3, 0, SeafloorCavern_Room3_Text_1975DC, SeafloorCavern_Room3_Text_1976F3
+	trainerbattle 0, OPPONENT_SEAFLOOR_CAVERN_GRUNT_3, 0, SeafloorCavern_Room3_Text_1975DC, SeafloorCavern_Room3_Text_1976F3
 	msgbox SeafloorCavern_Room3_Text_197704, 6
 	end
diff --git a/data/scripts/maps/SeafloorCavern_Room4.s b/data/scripts/maps/SeafloorCavern_Room4.s
index 8f53d948c..cbed797c0 100644
--- a/data/scripts/maps/SeafloorCavern_Room4.s
+++ b/data/scripts/maps/SeafloorCavern_Room4.s
@@ -7,6 +7,6 @@ SeafloorCavern_Room4_MapScript1_15DAC5:: @ 815DAC5
 	end
 
 SeafloorCavern_Room4_EventScript_15DACB:: @ 815DACB
-	trainerbattle 0, TRAINER_SEAFLOOR_CAVERN_GRUNT_4, 0, SeafloorCavern_Room4_Text_1977B9, SeafloorCavern_Room4_Text_1977E2
+	trainerbattle 0, OPPONENT_SEAFLOOR_CAVERN_GRUNT_4, 0, SeafloorCavern_Room4_Text_1977B9, SeafloorCavern_Room4_Text_1977E2
 	msgbox SeafloorCavern_Room4_Text_1977ED, 6
 	end
diff --git a/data/scripts/maps/SeafloorCavern_Room9.s b/data/scripts/maps/SeafloorCavern_Room9.s
index 31672110d..ff8592f7d 100644
--- a/data/scripts/maps/SeafloorCavern_Room9.s
+++ b/data/scripts/maps/SeafloorCavern_Room9.s
@@ -53,9 +53,9 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA
 	msgbox SeafloorCavern_Room9_Text_1B491F, 4
 	.endif
 	.ifdef SAPPHIRE
-	trainerbattle 3, TRAINER_SEAFLOOR_CAVERN_GRUNT_5, 0, UnknownString_81B4319
+	trainerbattle 3, OPPONENT_SEAFLOOR_CAVERN_GRUNT_5, 0, UnknownString_81B4319
 	.else
-	trainerbattle 3, TRAINER_SEAFLOOR_CAVERN_GRUNT_5, 0, SeafloorCavern_Room9_Text_1B49AE
+	trainerbattle 3, OPPONENT_SEAFLOOR_CAVERN_GRUNT_5, 0, SeafloorCavern_Room9_Text_1B49AE
 	.endif
 	.ifdef SAPPHIRE
 	msgbox UnknownString_81B432C, 4
diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.s b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.s
index 0a88d83e6..57bfbbd03 100644
--- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.s
+++ b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.s
@@ -37,7 +37,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6
 	callif 1, SlateportCity_OceanicMuseum_2F_EventScript_155E78
 	compare FACING, 3
 	callif 1, SlateportCity_OceanicMuseum_2F_EventScript_155E83
-	trainerbattle 3, TRAINER_MUSEUM_2F_GRUNT_1, 0, SlateportCity_OceanicMuseum_2F_Text_17EE4E
+	trainerbattle 3, OPPONENT_MUSEUM_2F_GRUNT_1, 0, SlateportCity_OceanicMuseum_2F_Text_17EE4E
 	msgbox SlateportCity_OceanicMuseum_2F_Text_17EE66, 4
 	closebutton
 	move 4, SlateportCity_OceanicMuseum_2F_Movement_155EBF
@@ -46,7 +46,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6
 	waitmove 0
 	msgbox SlateportCity_OceanicMuseum_2F_Text_17EEA5, 4
 	playmusicbattle 0
-	trainerbattle 3, TRAINER_MUSEUM_2F_GRUNT_2, 0, SlateportCity_OceanicMuseum_2F_Text_17EED6
+	trainerbattle 3, OPPONENT_MUSEUM_2F_GRUNT_2, 0, SlateportCity_OceanicMuseum_2F_Text_17EED6
 	move 3, SlateportCity_OceanicMuseum_2F_Movement_155EBF
 	waitmove 0
 	move 3, SlateportCity_OceanicMuseum_2F_Movement_1A0845