Merge pull request #39 from yenatch/opponent-constants

Use opponent constants in event scripts

1 files changed, 56 insertions, 56 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