Merge pull request #11 from pret/master

merge with source repo

1 files changed, 56 insertions, 56 deletions

diff --git a/constants/version.inc b/constants/version.inc
index 271b46dd3..09df3503c 100644
--- a/constants/version.inc
+++ b/constants/version.inc
@@ -31,61 +31,61 @@
 	.endif
 
 	.ifdef SAPPHIRE
-	.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
+	.set TRAINER_PETALBURG_WOODS_GRUNT, TRAINER_GRUNT_9
+	.set TRAINER_RUSTURF_TUNNEL_GRUNT, TRAINER_GRUNT_15
+	.set TRAINER_MUSEUM_2F_GRUNT_1, TRAINER_GRUNT_19
+	.set TRAINER_MUSEUM_2F_GRUNT_2, TRAINER_GRUNT_20
+	.set TRAINER_514, TRAINER_HECTOR_1
+	.set TRAINER_MT_CHIMNEY_GRUNT_1, TRAINER_MATT_2
+	.set TRAINER_MT_CHIMNEY_GRUNT_2, TRAINER_GRUNT_13
+	.set TRAINER_HIDEOUT_1F_GRUNT, TRAINER_GRUNT_1
+	.set TRAINER_HIDEOUT_B1F_GRUNT_1, TRAINER_GRUNT_2
+	.set TRAINER_HIDEOUT_B1F_GRUNT_2, TRAINER_GRUNT_3
+	.set TRAINER_HIDEOUT_B1F_GRUNT_3, TRAINER_GRUNT_26
+	.set TRAINER_HIDEOUT_B2F_GRUNT_1, TRAINER_MATT_1
+	.set TRAINER_HIDEOUT_B2F_GRUNT_2, TRAINER_GRUNT_4
+	.set TRAINER_HIDEOUT_B2F_GRUNT_3, TRAINER_GRUNT_27
+	.set TRAINER_SEAFLOOR_CAVERN_GRUNT_1, TRAINER_GRUNT_5
+	.set TRAINER_SEAFLOOR_CAVERN_GRUNT_2, TRAINER_GRUNT_6
+	.set TRAINER_SEAFLOOR_CAVERN_GRUNT_3, TRAINER_SHELLY_2
+	.set TRAINER_SEAFLOOR_CAVERN_GRUNT_4, TRAINER_GRUNT_7
+	.set TRAINER_SEAFLOOR_CAVERN_GRUNT_5, TRAINER_ARCHIE_2
+	.set TRAINER_MT_CHIMNEY_GRUNT_3, TRAINER_ARCHIE_3
+	.set TRAINER_MT_PYRE_SUMMIT_GRUNT_1, TRAINER_GRUNT_22
+	.set TRAINER_MT_PYRE_SUMMIT_GRUNT_2, TRAINER_GRUNT_23
+	.set TRAINER_MT_PYRE_SUMMIT_GRUNT_3, TRAINER_GRUNT_24
+	.set TRAINER_WEATHER_INSTITUTE_GRUNT_1, TRAINER_GRUNT_16
+	.set TRAINER_WEATHER_INSTITUTE_GRUNT_2, TRAINER_GRUNT_25
+	.set TRAINER_WEATHER_INSTITUTE_GRUNT_3, TRAINER_GRUNT_17
+	.set TRAINER_WEATHER_INSTITUTE_GRUNT_4, TRAINER_GRUNT_18
+	.set TRAINER_WEATHER_INSTITUTE_GRUNT_5, TRAINER_SHELLY_1
 	.else
-	.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
+	.set TRAINER_PETALBURG_WOODS_GRUNT, TRAINER_GRUNT_36
+	.set TRAINER_RUSTURF_TUNNEL_GRUNT, TRAINER_GRUNT_42
+	.set TRAINER_MUSEUM_2F_GRUNT_1, TRAINER_GRUNT_46
+	.set TRAINER_MUSEUM_2F_GRUNT_2, TRAINER_GRUNT_47
+	.set TRAINER_514, TRAINER_HECTOR_2
+	.set TRAINER_MT_CHIMNEY_GRUNT_1, TRAINER_TABITHA_2
+	.set TRAINER_MT_CHIMNEY_GRUNT_2, TRAINER_GRUNT_40
+	.set TRAINER_HIDEOUT_1F_GRUNT, TRAINER_GRUNT_28
+	.set TRAINER_HIDEOUT_B1F_GRUNT_1, TRAINER_GRUNT_29
+	.set TRAINER_HIDEOUT_B1F_GRUNT_2, TRAINER_GRUNT_30
+	.set TRAINER_HIDEOUT_B1F_GRUNT_3, TRAINER_GRUNT_53
+	.set TRAINER_HIDEOUT_B2F_GRUNT_1, TRAINER_TABITHA_1
+	.set TRAINER_HIDEOUT_B2F_GRUNT_2, TRAINER_GRUNT_31
+	.set TRAINER_HIDEOUT_B2F_GRUNT_3, TRAINER_GRUNT_54
+	.set TRAINER_SEAFLOOR_CAVERN_GRUNT_1, TRAINER_GRUNT_32
+	.set TRAINER_SEAFLOOR_CAVERN_GRUNT_2, TRAINER_GRUNT_33
+	.set TRAINER_SEAFLOOR_CAVERN_GRUNT_3, TRAINER_COURTNEY_2
+	.set TRAINER_SEAFLOOR_CAVERN_GRUNT_4, TRAINER_GRUNT_34
+	.set TRAINER_SEAFLOOR_CAVERN_GRUNT_5, TRAINER_MAXIE_2
+	.set TRAINER_MT_CHIMNEY_GRUNT_3, TRAINER_MAXIE_3
+	.set TRAINER_MT_PYRE_SUMMIT_GRUNT_1, TRAINER_GRUNT_49
+	.set TRAINER_MT_PYRE_SUMMIT_GRUNT_2, TRAINER_GRUNT_50
+	.set TRAINER_MT_PYRE_SUMMIT_GRUNT_3, TRAINER_GRUNT_51
+	.set TRAINER_WEATHER_INSTITUTE_GRUNT_1, TRAINER_GRUNT_43
+	.set TRAINER_WEATHER_INSTITUTE_GRUNT_2, TRAINER_GRUNT_52
+	.set TRAINER_WEATHER_INSTITUTE_GRUNT_3, TRAINER_GRUNT_44
+	.set TRAINER_WEATHER_INSTITUTE_GRUNT_4, TRAINER_GRUNT_45
+	.set TRAINER_WEATHER_INSTITUTE_GRUNT_5, TRAINER_COURTNEY_1
 	.endif