Merge pull request #13 from yenatch/master

Version differences in event scripts.

27 files changed, 212 insertions, 45 deletions

diff --git a/constants/bgm.s b/constants/bgm.s
new file mode 100644
index 000000000..474840749
--- /dev/null
+++ b/constants/bgm.s
@@ -0,0 +1,10 @@
+	.set BGM_AQUA, 419
+	.set BGM_MAGMA, 441
+
+	.ifdef SAPPHIRE
+	.set BGM_EVIL_TEAM, BGM_AQUA
+	.set BGM_GOOD_TEAM, BGM_MAGMA
+	.else
+	.set BGM_EVIL_TEAM, BGM_MAGMA
+	.set BGM_GOOD_TEAM, BGM_AQUA
+	.endc
diff --git a/constants/constants.s b/constants/constants.s
index 8e6dd101f..6817e251a 100644
--- a/constants/constants.s
+++ b/constants/constants.s
@@ -17,3 +17,5 @@
 	.include "constants/battle_tower_constants.s"
 	.include "constants/opponent_constants.s"
 	.include "constants/variables.s"
+	.include "constants/bgm.s"
+	.include "constants/version.s"
diff --git a/constants/version.s b/constants/version.s
new file mode 100644
index 000000000..e130dab56
--- /dev/null
+++ b/constants/version.s
@@ -0,0 +1,69 @@
+	.ifdef SAPPHIRE
+	.set ITEM_RED_OR_BLUE_ORB, ITEM_BLUE_ORB
+	.else
+	.set ITEM_RED_OR_BLUE_ORB, ITEM_RED_ORB
+	.endif
+
+	.ifdef SAPPHIRE
+	.set SPECIES_GROUDON_OR_KYOGRE, SPECIES_KYOGRE
+	.else
+	.set SPECIES_GROUDON_OR_KYOGRE, SPECIES_GROUDON
+	.endif
+
+	.ifdef SAPPHIRE
+	.set SPECIES_LATIAS_OR_LATIOS, SPECIES_LATIOS
+	.else
+	.set SPECIES_LATIAS_OR_LATIOS, SPECIES_LATIAS
+	.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_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
+	.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_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
+	.endif
diff --git a/data/event_scripts.s b/data/event_scripts.s
index fa904ef1c..460241acb 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -579,7 +579,11 @@ Route110_TrickHouseEntrance_EventScript_161518:: @ 8161518
 	move 1, Route110_TrickHouseEntrance_Movement_1A0839
 	waitmove 0
 	msgbox Route110_TrickHouseEntrance_Text_19C128, 4
+	.ifdef SAPPHIRE
+	givedecoration 32
+	.else
 	givedecoration 31
+	.endif
 	compare RESULT, 1
 	jumpeq Route110_TrickHouseEntrance_EventScript_161551
 	compare RESULT, 0
diff --git a/data/maps/scripts/AquaHideout_1F.s b/data/maps/scripts/AquaHideout_1F.s
index a7e74e22e..5a7b04fda 100644
--- a/data/maps/scripts/AquaHideout_1F.s
+++ b/data/maps/scripts/AquaHideout_1F.s
@@ -38,7 +38,7 @@ AquaHideout_1F_EventScript_15D802:: @ 815D802
 
 AquaHideout_1F_EventScript_15D80C:: @ 815D80C
 MagmaHideout_1F_EventScript_15D80C:: @ 815D80C
-	trainerbattle 2, 567, 0, AquaHideout_1F_Text_196E01, AquaHideout_1F_Text_196E28, AquaHideout_1F_EventScript_15D827
+	trainerbattle 2, TRAINER_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/maps/scripts/AquaHideout_B1F.s b/data/maps/scripts/AquaHideout_B1F.s
index 9e0d7652d..fe37ddda3 100644
--- a/data/maps/scripts/AquaHideout_B1F.s
+++ b/data/maps/scripts/AquaHideout_B1F.s
@@ -18,7 +18,7 @@ AquaHideout_B1F_MapScript1_15D84A:: @ 815D84A
 
 AquaHideout_B1F_EventScript_15D850:: @ 815D850
 MagmaHideout_B1F_EventScript_15D850:: @ 815D850
-	trainerbattle 2, 568, 0, AquaHideout_B1F_Text_196E6F, AquaHideout_B1F_Text_196EB6, AquaHideout_B1F_EventScript_15D86B
+	trainerbattle 2, TRAINER_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, 569, 0, AquaHideout_B1F_Text_196F39, AquaHideout_B1F_Text_196F9B, AquaHideout_B1F_EventScript_15D890
+	trainerbattle 2, TRAINER_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,7 +40,7 @@ AquaHideout_B1F_EventScript_15D890:: @ 815D890
 
 AquaHideout_B1F_EventScript_15D89A:: @ 815D89A
 MagmaHideout_B1F_EventScript_15D89A:: @ 815D89A
-	trainerbattle 0, 592, 0, AquaHideout_B1F_Text_196FFD, AquaHideout_B1F_Text_197040
+	trainerbattle 0, TRAINER_HIDEOUT_B1F_GRUNT_3, 0, AquaHideout_B1F_Text_196FFD, AquaHideout_B1F_Text_197040
 	msgbox AquaHideout_B1F_Text_197056, 6
 	end
 
diff --git a/data/maps/scripts/AquaHideout_B2F.s b/data/maps/scripts/AquaHideout_B2F.s
index 40cce160b..a0bf90151 100644
--- a/data/maps/scripts/AquaHideout_B2F.s
+++ b/data/maps/scripts/AquaHideout_B2F.s
@@ -21,14 +21,18 @@ MagmaHideout_B2F_EventScript_15D8BD:: @ 815D8BD
 
 AquaHideout_B2F_EventScript_15D8E1:: @ 815D8E1
 MagmaHideout_B2F_EventScript_15D8E1:: @ 815D8E1
-	trainerbattle 2, 596, 0, AquaHideout_B2F_Text_197093, AquaHideout_B2F_Text_197145, AquaHideout_B2F_EventScript_15D8FD
+	trainerbattle 2, TRAINER_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
 
 AquaHideout_B2F_EventScript_15D8FD:: @ 815D8FD
 	setvar 0x8008, 1
+	.ifdef SAPPHIRE
+	setvar 0x8009, 4
+	.else
 	setvar 0x8009, 3
+	.endif
 	move 0x8008, AquaHideout_B2F_Movement_1A0843
 	waitmove 0
 	pause 20
@@ -37,7 +41,11 @@ AquaHideout_B2F_EventScript_15D8FD:: @ 815D8FD
 	msgbox AquaHideout_B2F_Text_197162, 4
 	closebutton
 	move 0x8008, AquaHideout_B2F_Movement_1A0843
+	.ifdef SAPPHIRE
+	move 0x8009, AquaHideout_B2F_Movement_15D958
+	.else
 	move 0x8009, AquaHideout_B2F_Movement_15D95D
+	.endif
 	waitmove 0
 	disappear 0x8009
 	pause 20
@@ -49,7 +57,12 @@ AquaHideout_B2F_EventScript_15D8FD:: @ 815D8FD
 	release
 	end
 
-	.incbin "baserom.gba", 0x15d958, 0x5
+AquaHideout_B2F_Movement_15D958:: @ 815D958
+	step_left
+	step_left
+	step_left
+	step_left
+	step_end
 
 AquaHideout_B2F_Movement_15D95D:: @ 815D95D
 	step_right
@@ -60,7 +73,7 @@ AquaHideout_B2F_Movement_15D95D:: @ 815D95D
 
 AquaHideout_B2F_EventScript_15D962:: @ 815D962
 MagmaHideout_B2F_EventScript_15D962:: @ 815D962
-	trainerbattle 2, 570, 0, AquaHideout_B2F_Text_197270, AquaHideout_B2F_Text_1972AC, AquaHideout_B2F_EventScript_15D97D
+	trainerbattle 2, TRAINER_HIDEOUT_B2F_GRUNT_2, 0, AquaHideout_B2F_Text_197270, AquaHideout_B2F_Text_1972AC, AquaHideout_B2F_EventScript_15D97D
 	msgbox AquaHideout_B2F_Text_1972D2, 6
 	end
 
@@ -71,7 +84,7 @@ AquaHideout_B2F_EventScript_15D97D:: @ 815D97D
 
 AquaHideout_B2F_EventScript_15D987:: @ 815D987
 MagmaHideout_B2F_EventScript_15D987:: @ 815D987
-	trainerbattle 0, 593, 0, AquaHideout_B2F_Text_1972EF, AquaHideout_B2F_Text_197390
+	trainerbattle 0, TRAINER_HIDEOUT_B2F_GRUNT_3, 0, AquaHideout_B2F_Text_1972EF, AquaHideout_B2F_Text_197390
 	msgbox AquaHideout_B2F_Text_1973C0, 6
 	end
 
diff --git a/data/maps/scripts/CaveOfOrigin_B4F.s b/data/maps/scripts/CaveOfOrigin_B4F.s
index 3acf5ae1a..b0c638df0 100644
--- a/data/maps/scripts/CaveOfOrigin_B4F.s
+++ b/data/maps/scripts/CaveOfOrigin_B4F.s
@@ -13,7 +13,11 @@ CaveOfOrigin_B4F_EventScript_15DDC1:: @ 815DDC1
 	return
 
 CaveOfOrigin_B4F_MapScript1_15DDC5:: @ 815DDC5
+	.ifdef SAPPHIRE
+	setmapfooter 163
+	.else
 	setmapfooter 313
+	.endif
 	call CaveOfOrigin_B4F_EventScript_1A01B5
 	checkflag 113
 	callif 1, CaveOfOrigin_B4F_EventScript_1A04E3
@@ -35,7 +39,11 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7
 	setanimation 2, 0
 	doanimation 54
 	checkanimation 54
+	.ifdef SAPPHIRE
+	setvar RESULT, 3
+	.else
 	setvar RESULT, 2
+	.endif
 	playsfx 107
 	special 281
 	waitstate
@@ -44,9 +52,9 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7
 	move 1, CaveOfOrigin_B4F_Movement_15DE7D
 	waitmove 0
 	pause 60
-	setwildbattle SPECIES_GROUDON, 45, ITEM_NONE
+	setwildbattle SPECIES_GROUDON_OR_KYOGRE, 45, ITEM_NONE
 	checksound
-	pokecry SPECIES_GROUDON, 2
+	pokecry SPECIES_GROUDON_OR_KYOGRE, 2
 	pause 40
 	waitpokecry
 	setflag 2145
diff --git a/data/maps/scripts/MtChimney.s b/data/maps/scripts/MtChimney.s
index 09ba8313c..8c7db64be 100644
--- a/data/maps/scripts/MtChimney.s
+++ b/data/maps/scripts/MtChimney.s
@@ -116,12 +116,12 @@ MtChimney_EventScript_15D107:: @ 815D107
 	end
 
 MtChimney_EventScript_15D110:: @ 815D110
-	trainerbattle 0, 597, 0, MtChimney_Text_1B3B36, MtChimney_Text_1B3BB8
+	trainerbattle 0, TRAINER_MT_CHIMNEY_GRUNT_1, 0, MtChimney_Text_1B3B36, MtChimney_Text_1B3BB8
 	msgbox MtChimney_Text_1B3C07, 6
 	end
 
 MtChimney_EventScript_15D127:: @ 815D127
-	trainerbattle 0, 579, 0, MtChimney_Text_1B3C96, MtChimney_Text_1B3D1E
+	trainerbattle 0, TRAINER_MT_CHIMNEY_GRUNT_2, 0, MtChimney_Text_1B3C96, MtChimney_Text_1B3D1E
 	msgbox MtChimney_Text_1B3D3D, 6
 	end
 
diff --git a/data/maps/scripts/MtPyre_Summit.s b/data/maps/scripts/MtPyre_Summit.s
index 4967a4c00..41ffa235a 100644
--- a/data/maps/scripts/MtPyre_Summit.s
+++ b/data/maps/scripts/MtPyre_Summit.s
@@ -55,7 +55,7 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1
 	compare 0x8008, 2
 	callif 1, MtPyre_Summit_EventScript_15D5CA
 	msgbox MtPyre_Summit_Text_1B5FE6, 4
-	giveitem ITEM_RED_ORB
+	giveitem ITEM_RED_OR_BLUE_ORB
 	setflag 212
 	releaseall
 	end
@@ -168,7 +168,7 @@ MtPyre_Summit_EventScript_15D64A:: @ 815D64A
 	end
 
 MtPyre_Summit_EventScript_15D669:: @ 815D669
-	setvar 0x8004, 276
+	setvar 0x8004, ITEM_RED_OR_BLUE_ORB
 	call MtPyre_Summit_EventScript_1A067F
 	closebutton
 	move LAST_TALKED, MtPyre_Summit_Movement_1A0841
diff --git a/data/maps/scripts/PetalburgWoods.s b/data/maps/scripts/PetalburgWoods.s
index 1a7419ff7..4642642a4 100644
--- a/data/maps/scripts/PetalburgWoods.s
+++ b/data/maps/scripts/PetalburgWoods.s
@@ -13,7 +13,7 @@ PetalburgWoods_EventScript_15CCA8:: @ 815CCA8
 	waitmove 0
 	msgbox PetalburgWoods_Text_194D92, 4
 	closebutton
-	playmusic 441, 0
+	playmusic BGM_EVIL_TEAM, 0
 	move 3, PetalburgWoods_Movement_15CEC3
 	waitmove 0
 	msgbox PetalburgWoods_Text_194DED, 4
@@ -30,7 +30,7 @@ PetalburgWoods_EventScript_15CCA8:: @ 815CCA8
 	move 3, PetalburgWoods_Movement_15CEC8
 	waitmove 0
 	msgbox PetalburgWoods_Text_194EE8, 4
-	trainerbattle 3, 575, 0, PetalburgWoods_Text_194F83
+	trainerbattle 3, TRAINER_PETALBURG_WOODS_GRUNT, 0, PetalburgWoods_Text_194F83
 	move 3, PetalburgWoods_Movement_15CEB3
 	waitmove 0
 	call PetalburgWoods_EventScript_15CDFA
@@ -48,7 +48,7 @@ PetalburgWoods_EventScript_15CD42:: @ 815CD42
 	waitmove 0
 	msgbox PetalburgWoods_Text_194D92, 4
 	closebutton
-	playmusic 441, 0
+	playmusic BGM_EVIL_TEAM, 0
 	move 3, PetalburgWoods_Movement_15CEC3
 	waitmove 0
 	msgbox PetalburgWoods_Text_194DED, 4
@@ -65,7 +65,7 @@ PetalburgWoods_EventScript_15CD42:: @ 815CD42
 	move 255, PetalburgWoods_Movement_1A0841
 	waitmove 0
 	msgbox PetalburgWoods_Text_194EE8, 4
-	trainerbattle 3, 575, 0, PetalburgWoods_Text_194F83
+	trainerbattle 3, TRAINER_PETALBURG_WOODS_GRUNT, 0, PetalburgWoods_Text_194F83
 	move 3, PetalburgWoods_Movement_15CEB3
 	waitmove 0
 	call PetalburgWoods_EventScript_15CDFA
diff --git a/data/maps/scripts/Route110_TrickHouseEnd.s b/data/maps/scripts/Route110_TrickHouseEnd.s
index 34b0cc62d..4b335af91 100644
--- a/data/maps/scripts/Route110_TrickHouseEnd.s
+++ b/data/maps/scripts/Route110_TrickHouseEnd.s
@@ -166,7 +166,11 @@ Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF
 	pause 30
 	msgbox Route110_TrickHouseEnd_Text_19C691, 4
 	setvar 0x40c1, 0
+	.ifdef SAPPHIRE
+	givedecoration 32
+	.else
 	givedecoration 31
+	.endc
 	compare RESULT, 0
 	callif 1, Route110_TrickHouseEnd_EventScript_161C61
 	msgbox Route110_TrickHouseEnd_Text_19C85C, 4
diff --git a/data/maps/scripts/Route114_LanettesHouse.s b/data/maps/scripts/Route114_LanettesHouse.s
index 66658dadd..16cc31033 100644
--- a/data/maps/scripts/Route114_LanettesHouse.s
+++ b/data/maps/scripts/Route114_LanettesHouse.s
@@ -13,7 +13,11 @@ Route114_LanettesHouse_EventScript_15C262:: @ 815C262
 	jumpeq Route114_LanettesHouse_EventScript_15C28F
 	setflag 2123
 	msgbox Route114_LanettesHouse_Text_192A0D, 4
+	.ifdef SAPPHIRE
+	givedecoration 99
+	.else
 	givedecoration 100
+	.endif
 	compare RESULT, 0
 	jumpeq Route114_LanettesHouse_EventScript_1A02AE
 	setflag 131
diff --git a/data/maps/scripts/Route115.s b/data/maps/scripts/Route115.s
index 23e90d7d9..5cc79447a 100644
--- a/data/maps/scripts/Route115.s
+++ b/data/maps/scripts/Route115.s
@@ -58,7 +58,7 @@ Route115_EventScript_150A03:: @ 8150A03
 	end
 
 Route115_EventScript_150A1A:: @ 8150A1A
-	trainerbattle 0, 514, 0, Route115_Text_1BCEE0, Route115_Text_1BCF16
+	trainerbattle 0, TRAINER_514, 0, Route115_Text_1BCEE0, Route115_Text_1BCF16
 	msgbox Route115_Text_1BCF3D, 6
 	end
 
diff --git a/data/maps/scripts/Route119_WeatherInstitute_1F.s b/data/maps/scripts/Route119_WeatherInstitute_1F.s
index 1497580fd..f280086f6 100644
--- a/data/maps/scripts/Route119_WeatherInstitute_1F.s
+++ b/data/maps/scripts/Route119_WeatherInstitute_1F.s
@@ -45,12 +45,12 @@ Route119_WeatherInstitute_1F_EventScript_163C83:: @ 8163C83
 	end
 
 Route119_WeatherInstitute_1F_EventScript_163C94:: @ 8163C94
-	trainerbattle 0, 582, 0, Route119_WeatherInstitute_1F_Text_19EB8A, Route119_WeatherInstitute_1F_Text_19EBEE
+	trainerbattle 0, TRAINER_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, 591, 0, Route119_WeatherInstitute_1F_Text_19EC6B, Route119_WeatherInstitute_1F_Text_19EC89
+	trainerbattle 0, TRAINER_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/maps/scripts/Route119_WeatherInstitute_2F.s b/data/maps/scripts/Route119_WeatherInstitute_2F.s
index 9236afc47..deee98d09 100644
--- a/data/maps/scripts/Route119_WeatherInstitute_2F.s
+++ b/data/maps/scripts/Route119_WeatherInstitute_2F.s
@@ -21,17 +21,17 @@ Route119_WeatherInstitute_2F_EventScript_163CF0:: @ 8163CF0
 	return
 
 Route119_WeatherInstitute_2F_EventScript_163CFC:: @ 8163CFC
-	trainerbattle 0, 583, 0, Route119_WeatherInstitute_2F_Text_19EEAF, Route119_WeatherInstitute_2F_Text_19EF1B
+	trainerbattle 0, TRAINER_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, 584, 0, Route119_WeatherInstitute_2F_Text_19EFA3, Route119_WeatherInstitute_2F_Text_19EFDD
+	trainerbattle 0, TRAINER_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, 599, 0, Route119_WeatherInstitute_2F_Text_19F042, Route119_WeatherInstitute_2F_Text_19F0F4, Route119_WeatherInstitute_2F_EventScript_163D45
+	trainerbattle 2, TRAINER_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/maps/scripts/RusturfTunnel.s b/data/maps/scripts/RusturfTunnel.s
index 0eaaf4da5..cd920e333 100644
--- a/data/maps/scripts/RusturfTunnel.s
+++ b/data/maps/scripts/RusturfTunnel.s
@@ -292,9 +292,9 @@ RusturfTunnel_EventScript_15C9D7:: @ 815C9D7
 RusturfTunnel_EventScript_15C9EA:: @ 815C9EA
 	lock
 	faceplayer
-	playmusic 441, 0
+	playmusic BGM_EVIL_TEAM, 0
 	msgbox RusturfTunnel_Text_19419B, 4
-	trainerbattle 3, 581, 0, RusturfTunnel_Text_194243
+	trainerbattle 3, TRAINER_RUSTURF_TUNNEL_GRUNT, 0, RusturfTunnel_Text_194243
 	msgbox RusturfTunnel_Text_194274, 4
 	giveitem ITEM_DEVON_GOODS
 	closebutton
diff --git a/data/maps/scripts/SeafloorCavern_Room1.s b/data/maps/scripts/SeafloorCavern_Room1.s
index 4c79505b9..4cc0ea0cd 100644
--- a/data/maps/scripts/SeafloorCavern_Room1.s
+++ b/data/maps/scripts/SeafloorCavern_Room1.s
@@ -7,12 +7,12 @@ SeafloorCavern_Room1_MapScript1_15DA67:: @ 815DA67
 	end
 
 SeafloorCavern_Room1_EventScript_15DA6D:: @ 815DA6D
-	trainerbattle 0, 571, 0, SeafloorCavern_Room1_Text_1974BA, SeafloorCavern_Room1_Text_1974EA
+	trainerbattle 0, TRAINER_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, 572, 0, SeafloorCavern_Room1_Text_19753C, SeafloorCavern_Room1_Text_197573
+	trainerbattle 0, TRAINER_SEAFLOOR_CAVERN_GRUNT_2, 0, SeafloorCavern_Room1_Text_19753C, SeafloorCavern_Room1_Text_197573
 	msgbox SeafloorCavern_Room1_Text_197589, 6
 	end
 
diff --git a/data/maps/scripts/SeafloorCavern_Room3.s b/data/maps/scripts/SeafloorCavern_Room3.s
index 4a32842e2..6d836adc7 100644
--- a/data/maps/scripts/SeafloorCavern_Room3.s
+++ b/data/maps/scripts/SeafloorCavern_Room3.s
@@ -7,7 +7,7 @@ SeafloorCavern_Room3_MapScript1_15DAA2:: @ 815DAA2
 	end
 
 SeafloorCavern_Room3_EventScript_15DAA8:: @ 815DAA8
-	trainerbattle 0, 600, 0, SeafloorCavern_Room3_Text_1975DC, SeafloorCavern_Room3_Text_1976F3
+	trainerbattle 0, TRAINER_SEAFLOOR_CAVERN_GRUNT_3, 0, SeafloorCavern_Room3_Text_1975DC, SeafloorCavern_Room3_Text_1976F3
 	msgbox SeafloorCavern_Room3_Text_197704, 6
 	end
 
diff --git a/data/maps/scripts/SeafloorCavern_Room4.s b/data/maps/scripts/SeafloorCavern_Room4.s
index 577ac0701..1e79317c7 100644
--- a/data/maps/scripts/SeafloorCavern_Room4.s
+++ b/data/maps/scripts/SeafloorCavern_Room4.s
@@ -7,7 +7,7 @@ SeafloorCavern_Room4_MapScript1_15DAC5:: @ 815DAC5
 	end
 
 SeafloorCavern_Room4_EventScript_15DACB:: @ 815DACB
-	trainerbattle 0, 573, 0, SeafloorCavern_Room4_Text_1977B9, SeafloorCavern_Room4_Text_1977E2
+	trainerbattle 0, TRAINER_SEAFLOOR_CAVERN_GRUNT_4, 0, SeafloorCavern_Room4_Text_1977B9, SeafloorCavern_Room4_Text_1977E2
 	msgbox SeafloorCavern_Room4_Text_1977ED, 6
 	end
 
diff --git a/data/maps/scripts/SeafloorCavern_Room9.s b/data/maps/scripts/SeafloorCavern_Room9.s
index f0a38cfc1..2308cbbf5 100644
--- a/data/maps/scripts/SeafloorCavern_Room9.s
+++ b/data/maps/scripts/SeafloorCavern_Room9.s
@@ -5,7 +5,11 @@ SeafloorCavern_Room9_MapScripts:: @ 815DAE6
 SeafloorCavern_Room9_MapScript1_15DAEC:: @ 815DAEC
 	call SeafloorCavern_Room9_EventScript_1A0196
 	call SeafloorCavern_Room9_EventScript_1A01B5
+	.ifdef SAPPHIRE
+	setmapfooter 157
+	.else
 	setmapfooter 327
+	.endif
 	end
 
 SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA
@@ -32,7 +36,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA
 	move 0x8004, SeafloorCavern_Room9_Movement_1A0839
 	waitmove 0
 	msgbox SeafloorCavern_Room9_Text_1B491F, 4
-	trainerbattle 3, 601, 0, SeafloorCavern_Room9_Text_1B49AE
+	trainerbattle 3, TRAINER_SEAFLOOR_CAVERN_GRUNT_5, 0, SeafloorCavern_Room9_Text_1B49AE
 	msgbox SeafloorCavern_Room9_Text_1B49C1, 4
 	setweather 0
 	doweather
@@ -41,14 +45,22 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA
 	msgbox SeafloorCavern_Room9_Text_1B4A5A, 4
 	special 284
 	waitstate
+	.ifdef SAPPHIRE
+	setvar RESULT, 1
+	.else
 	setvar RESULT, 0
+	.endif
 	playsfx 209
 	setanimation 0, 16
 	setanimation 1, 42
 	setanimation 2, 0
 	doanimation 54
 	checkanimation 54
+	.ifdef SAPPHIRE
+	setvar RESULT, 0
+	.else
 	setvar RESULT, 1
+	.endif
 	fanfare 388
 	playsfx 107
 	special 281
diff --git a/data/maps/scripts/SlateportCity_Harbor.s b/data/maps/scripts/SlateportCity_Harbor.s
index 5d753d8d2..8bdccdbb9 100644
--- a/data/maps/scripts/SlateportCity_Harbor.s
+++ b/data/maps/scripts/SlateportCity_Harbor.s
@@ -16,7 +16,7 @@ SlateportCity_Harbor_EventScript_155F85:: @ 8155F85
 	return
 
 SlateportCity_Harbor_EventScript_155F89:: @ 8155F89
-	playmusicbattle 441
+	playmusicbattle BGM_EVIL_TEAM
 	movespriteperm 4, 12, 13
 	spritebehave 4, 9
 	setflag 905
diff --git a/data/maps/scripts/SlateportCity_OceanicMuseum_1F.s b/data/maps/scripts/SlateportCity_OceanicMuseum_1F.s
index fd31c7a98..10dcb66d8 100644
--- a/data/maps/scripts/SlateportCity_OceanicMuseum_1F.s
+++ b/data/maps/scripts/SlateportCity_OceanicMuseum_1F.s
@@ -3,8 +3,13 @@ SlateportCity_OceanicMuseum_1F_MapScripts:: @ 8155ACA
 	.byte 0
 
 SlateportCity_OceanicMuseum_1F_MapScript1_155AD0:: @ 8155AD0
+	.ifndef SAPPHIRE
 	setvar 0x4010, 120
 	setvar 0x4011, 119
+	.else
+	setvar 0x4010, 118
+	setvar 0x4011, 117
+	.endif
 	end
 
 SlateportCity_OceanicMuseum_1F_EventScript_155ADB:: @ 8155ADB
diff --git a/data/maps/scripts/SlateportCity_OceanicMuseum_2F.s b/data/maps/scripts/SlateportCity_OceanicMuseum_2F.s
index de08120f5..28b098126 100644
--- a/data/maps/scripts/SlateportCity_OceanicMuseum_2F.s
+++ b/data/maps/scripts/SlateportCity_OceanicMuseum_2F.s
@@ -11,7 +11,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6
 	faceplayer
 	msgbox SlateportCity_OceanicMuseum_2F_Text_17ECFD, 4
 	closebutton
-	playmusic 441, 1
+	playmusic BGM_EVIL_TEAM, 1
 	reappear 3
 	move 3, SlateportCity_OceanicMuseum_2F_Movement_155EB4
 	waitmove 0
@@ -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, 585, 0, SlateportCity_OceanicMuseum_2F_Text_17EE4E
+	trainerbattle 3, TRAINER_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, 586, 0, SlateportCity_OceanicMuseum_2F_Text_17EED6
+	trainerbattle 3, TRAINER_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
diff --git a/data/maps/scripts/SootopolisCity.s b/data/maps/scripts/SootopolisCity.s
index cae602888..1690b8104 100644
--- a/data/maps/scripts/SootopolisCity.s
+++ b/data/maps/scripts/SootopolisCity.s
@@ -223,18 +223,30 @@ SootopolisCity_EventScript_14D308:: @ 814D308
 	waitmove 0
 	move 10, SootopolisCity_Movement_14D413
 	waitmove 0
+	.ifdef SAPPHIRE
+	msgbox SootopolisCity_Text_169988, 4
+	.else
 	msgbox SootopolisCity_Text_169E0F, 4
+	.endif
 	closebutton
 	move 10, SootopolisCity_Movement_14D417
 	move 255, SootopolisCity_Movement_14D440
 	waitmove 10
+	.ifdef SAPPHIRE
+	msgbox SootopolisCity_Text_1699FD, 4
+	.else
 	msgbox SootopolisCity_Text_169E82, 4
+	.endif
 	playsfx 21
 	move 5, SootopolisCity_Movement_1A0833
 	waitmove 0
 	move 5, SootopolisCity_Movement_1A0835
 	waitmove 0
+	.ifdef SAPPHIRE
+	msgbox SootopolisCity_Text_169AB7, 4
+	.else
 	msgbox SootopolisCity_Text_169F3C, 4
+	.endif
 	closebutton
 	pause 30
 	move 5, SootopolisCity_Movement_14D46A
@@ -247,7 +259,11 @@ SootopolisCity_EventScript_14D308:: @ 814D308
 	pause 30
 	move 10, SootopolisCity_Movement_1A0845
 	waitmove 0
+	.ifdef SAPPHIRE
+	msgbox SootopolisCity_Text_169AE7, 4
+	.else
 	msgbox SootopolisCity_Text_169F6B, 4
+	.endif
 	closebutton
 	pause 30
 	move 5, SootopolisCity_Movement_14D47C
@@ -256,10 +272,18 @@ SootopolisCity_EventScript_14D308:: @ 814D308
 	waitmove 0
 	move 5, SootopolisCity_Movement_1A083F
 	waitmove 0
+	.ifdef SAPPHIRE
+	msgbox SootopolisCity_Text_169BC7, 4
+	.else
 	msgbox SootopolisCity_Text_16A06C, 4
+	.endif
 	move 255, SootopolisCity_Movement_1A083F
 	waitmove 0
+	.ifdef SAPPHIRE
+	msgbox SootopolisCity_Text_169C99, 4
+	.else
 	msgbox SootopolisCity_Text_16A13E, 4
+	.endif
 	moveoffscreen 5
 	spritebehave 5, 9
 	moveoffscreen 10
@@ -411,7 +435,11 @@ SootopolisCity_Movement_14D47C:: @ 814D47C
 	step_end
 
 SootopolisCity_EventScript_14D48F:: @ 814D48F
+	.ifdef SAPPHIRE
+	msgbox SootopolisCity_Text_169D37, 2
+	.else
 	msgbox SootopolisCity_Text_16A1DB, 2
+	.endif
 	end
 
 SootopolisCity_EventScript_14D498:: @ 814D498
@@ -419,7 +447,11 @@ SootopolisCity_EventScript_14D498:: @ 814D498
 	faceplayer
 	checkflag 113
 	jumpeq SootopolisCity_EventScript_14D4AD
+	.ifdef SAPPHIRE
+	msgbox SootopolisCity_Text_169DA6, 2
+	.else
 	msgbox SootopolisCity_Text_16A249, 4
+	.endif
 	release
 	end
 
diff --git a/data/maps/scripts/SouthernIsland_Interior.s b/data/maps/scripts/SouthernIsland_Interior.s
index cc6fdf139..63e5b78a9 100644
--- a/data/maps/scripts/SouthernIsland_Interior.s
+++ b/data/maps/scripts/SouthernIsland_Interior.s
@@ -13,7 +13,11 @@ SouthernIsland_Interior_EventScript_160B68:: @ 8160B68
 	return
 
 SouthernIsland_Interior_MapScript1_160B6C:: @ 8160B6C
+	.ifdef SAPPHIRE
+	setvar 0x4011, 188
+	.else
 	setvar 0x4011, 187
+	.endif
 	call SouthernIsland_Interior_EventScript_160B77
 	end
 
@@ -50,7 +54,7 @@ SouthernIsland_Interior_EventScript_160BA7:: @ 8160BA7
 	waitmove 0
 	pause 50
 	checksound
-	pokecry SPECIES_LATIAS, 0
+	pokecry SPECIES_LATIAS_OR_LATIOS, 0
 	pause 30
 	waitpokecry
 	reappear 2
@@ -60,7 +64,7 @@ SouthernIsland_Interior_EventScript_160BA7:: @ 8160BA7
 	waitmove 0
 	pause 50
 	special 276
-	setwildbattle SPECIES_LATIAS, 50, ITEM_SOUL_DEW
+	setwildbattle SPECIES_LATIAS_OR_LATIOS, 50, ITEM_SOUL_DEW
 	setflag 911
 	setflag 2145
 	special 323
diff --git a/data/maps/text/SootopolisCity.s b/data/maps/text/SootopolisCity.s
index 7d1b9baf3..3c2575b99 100644
--- a/data/maps/text/SootopolisCity.s
+++ b/data/maps/text/SootopolisCity.s
@@ -35,13 +35,13 @@ SootopolisCity_Text_1698A0:: @ 81698A0
 	.string "But that’s what makes the sky above\n"
 	.string "SOOTOPOLIS the most beautiful.$"
 
-UnknownString_8169988: @ 8169988
+SootopolisCity_Text_169988:: @ 8169988
 	.string "STEVEN: {PLAYER}{KUN}, you came, too?\n"
 	.string "In this terrible rainstorm, yet...\p"
 	.string "Oh, yes, can you hear out what my\n"
 	.string "friend has to say?$"
 
-UnknownString_81699FD: @ 81699FD
+SootopolisCity_Text_1699FD:: @ 81699FD
 	.string "My name is WALLACE.\n"
 	.string "I’m this town’s GYM LEADER.\p"
 	.string "I’ve also been entrusted with the\n"
@@ -49,12 +49,12 @@ UnknownString_81699FD: @ 81699FD
 	.string "This downpour is caused by a power\n"
 	.string "emanating from the CAVE OF ORIGIN.$"
 
-UnknownString_8169AB7: @ 8169AB7
+SootopolisCity_Text_169AB7:: @ 8169AB7
 	.string "That... That is the BLUE ORB.\p"
 	.string "I see.\n"
 	.string "Follow me.$"
 
-UnknownString_8169AE7: @ 8169AE7
+SootopolisCity_Text_169AE7:: @ 8169AE7
 	.string "STEVEN: This rain...\p"
 	.string "People and POKéMON need water to live...\p"
 	.string "But why does this rain fill us with\n"
@@ -64,7 +64,7 @@ UnknownString_8169AE7: @ 8169AE7
 	.string "over HOENN...\p"
 	.string "If that were to happen...$"
 
-UnknownString_8169BC7: @ 8169BC7
+SootopolisCity_Text_169BC7:: @ 8169BC7
 	.string "WALLACE: The CAVE OF ORIGIN is ahead.\p"
 	.string "No one from SOOTOPOLIS is permitted\n"
 	.string "to enter the CAVE OF ORIGIN.\p"
@@ -73,20 +73,20 @@ UnknownString_8169BC7: @ 8169BC7
 	.string "You must go regardless of what awaits\n"
 	.string "you inside the CAVE...$"
 
-UnknownString_8169C99: @ 8169C99
+SootopolisCity_Text_169C99:: @ 8169C99
 	.string "STEVEN: {PLAYER}{KUN}, I never expected you\n"
 	.string "to be holding the BLUE ORB.\p"
 	.string "You’ll be okay. With your POKéMON,\n"
 	.string "you’ll get things done no matter what.\p"
 	.string "I’m convinced of it!$"
 
-UnknownString_8169D37: @ 8169D37
+SootopolisCity_Text_169D37:: @ 8169D37
 	.string "WALLACE: You must go together with\n"
 	.string "your BLUE ORB.\p"
 	.string "You must go regardless of what awaits\n"
 	.string "you inside the CAVE...$"
 
-UnknownString_8169DA6: @ 8169DA6
+SootopolisCity_Text_169DA6:: @ 8169DA6
 	.string "STEVEN: You’ll be okay. With your\n"
 	.string "POKéMON, you’ll get things done\l"
 	.string "whatever happens.\p"