some ruby/sapphire event script differences

7 files changed, 76 insertions, 2 deletions

diff --git a/data/scripts/maps/AquaHideout_B2F.s b/data/scripts/maps/AquaHideout_B2F.s
index a0bf90151..330a9f5fa 100644
--- a/data/scripts/maps/AquaHideout_B2F.s
+++ b/data/scripts/maps/AquaHideout_B2F.s
@@ -13,7 +13,11 @@ MagmaHideout_B2F_EventScript_15D8BD:: @ 815D8BD
 	playsfx 21
 	move 0x8008, AquaHideout_B2F_Movement_1A0833
 	waitmove 0
+	.ifdef SAPPHIRE
+	move 0x8008, AquaHideout_B2F_Movement_1A0839
+	.else
 	move 0x8008, AquaHideout_B2F_Movement_1A0841
+	.endif
 	waitmove 0
 	setvar 0x4001, 1
 	releaseall
@@ -33,14 +37,22 @@ AquaHideout_B2F_EventScript_15D8FD:: @ 815D8FD
 	.else
 	setvar 0x8009, 3
 	.endif
+	.ifdef SAPPHIRE
+	move 0x8008, Movement_1A083F
+	.else
 	move 0x8008, AquaHideout_B2F_Movement_1A0843
+	.endif
 	waitmove 0
 	pause 20
 	move 0x8008, AquaHideout_B2F_Movement_1A0839
 	waitmove 0
 	msgbox AquaHideout_B2F_Text_197162, 4
 	closebutton
+	.ifdef SAPPHIRE
+	move 0x8008, Movement_1A083F
+	.else
 	move 0x8008, AquaHideout_B2F_Movement_1A0843
+	.endif
 	.ifdef SAPPHIRE
 	move 0x8009, AquaHideout_B2F_Movement_15D958
 	.else
diff --git a/data/scripts/maps/MeteorFalls_1F_1R.s b/data/scripts/maps/MeteorFalls_1F_1R.s
index 7574a9b4b..7966bc76d 100644
--- a/data/scripts/maps/MeteorFalls_1F_1R.s
+++ b/data/scripts/maps/MeteorFalls_1F_1R.s
@@ -53,7 +53,11 @@ MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C
 	disappear 6
 	move 7, MeteorFalls_1F_1R_Movement_15C628
 	waitmove 0
+	.ifdef SAPPHIRE
+	msgbox MeteorFalls_1F_1R_Text_1933EC, 4
+	.else
 	msgbox MeteorFalls_1F_1R_Text_193584, 4
+	.endif
 	closebutton
 	move 8, MeteorFalls_1F_1R_Movement_15C639
 	move 9, MeteorFalls_1F_1R_Movement_15C64A
diff --git a/data/scripts/maps/MtChimney.s b/data/scripts/maps/MtChimney.s
index 28de28857..eadd3395a 100644
--- a/data/scripts/maps/MtChimney.s
+++ b/data/scripts/maps/MtChimney.s
@@ -305,53 +305,103 @@ MtChimney_Movement_15D03E:: @ 815D03E
 	step_end
 
 MtChimney_EventScript_15D0F5:: @ 815D0F5
+	.ifdef SAPPHIRE
+	msgbox MtChimney_Text_1B36F1, 3
+	.else
 	msgbox MtChimney_Text_1B40EA, 3
+	.endif
 	end
 
 MtChimney_EventScript_15D0FE:: @ 815D0FE
+	.ifdef SAPPHIRE
+	msgbox MtChimney_Text_1B372E, 3
+	.else
 	msgbox MtChimney_Text_1B4128, 3
+	.endif
 	end
 
 MtChimney_EventScript_15D107:: @ 815D107
+	.ifdef SAPPHIRE
+	msgbox MtChimney_Text_1B3778, 3
+	.else
 	msgbox MtChimney_Text_1B416E, 3
+	.endif
 	end
 
 MtChimney_EventScript_15D110:: @ 815D110
+	.ifdef SAPPHIRE
+	trainerbattle 0, TRAINER_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
 	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
+	msgbox MtChimney_Text_1B338D, 6
+	.else
 	trainerbattle 0, TRAINER_MT_CHIMNEY_GRUNT_2, 0, MtChimney_Text_1B3C96, MtChimney_Text_1B3D1E
 	msgbox MtChimney_Text_1B3D3D, 6
+	.endif
 	end
 
 MtChimney_EventScript_15D13E:: @ 815D13E
+	.ifdef SAPPHIRE
+	msgbox MtChimney_Text_1B33EA, 3
+	.else
 	msgbox MtChimney_Text_1B3D9A, 3
+	.endif
 	end
 
 @ 815D147
+	.ifdef SAPPHIRE
+	msgbox MtChimney_Text_1B3427, 3
+	.else
 	msgbox MtChimney_Text_1B3DD6, 3
+	.endif
 	end
 
 MtChimney_EventScript_15D150:: @ 815D150
+	.ifdef SAPPHIRE
+	msgbox MtChimney_Text_1B3446, 3
+	.else
 	msgbox MtChimney_Text_1B3DF5, 3
+	.endif
 	end
 
 MtChimney_EventScript_15D159:: @ 815D159
+	.ifdef SAPPHIRE
+	msgbox MtChimney_Text_1B3470, 3
+	.else
 	msgbox MtChimney_Text_1B3E1F, 3
+	.endif
 	end
 
 MtChimney_EventScript_15D162:: @ 815D162
+	.ifdef SAPPHIRE
+	msgbox MtChimney_Text_1B34C6, 3
+	.else
 	msgbox MtChimney_Text_1B3E7A, 3
+	.endif
 	end
 
 MtChimney_EventScript_15D16B:: @ 815D16B
+	.ifdef SAPPHIRE
+	msgbox MtChimney_Text_1B3503, 3
+	.else
 	msgbox MtChimney_Text_1B3EBA, 3
+	.endif
 	end
 
 MtChimney_EventScript_15D174:: @ 815D174
+	.ifdef SAPPHIRE
+	msgbox MtChimney_Text_1B37B4, 3
+	.else
 	msgbox MtChimney_Text_1B41B0, 3
+	.endif
 	end
 
 MtChimney_EventScript_15D17D:: @ 815D17D
diff --git a/data/scripts/maps/Route128.s b/data/scripts/maps/Route128.s
index f7bd30618..f59d2fbbb 100644
--- a/data/scripts/maps/Route128.s
+++ b/data/scripts/maps/Route128.s
@@ -65,7 +65,11 @@ Route128_EventScript_15213F:: @ 815213F
 	move 3, Route128_Movement_15226D
 	move 255, Route128_Movement_1A0841
 	waitmove 0
+	.ifdef SAPPHIRE
+	msgbox Route128_Text_1721A2, 4
+	.else
 	msgbox Route128_Text_1722A1, 4
+	.endif
 	move 3, Route128_Movement_1A0845
 	waitmove 0
 	msgbox Route128_Text_1723BE, 4
diff --git a/data/scripts/maps/SlateportCity.s b/data/scripts/maps/SlateportCity.s
index 97b128da3..84dae5dfc 100644
--- a/data/scripts/maps/SlateportCity.s
+++ b/data/scripts/maps/SlateportCity.s
@@ -508,7 +508,7 @@ SlateportCity_EventScript_14BEBC:: @ 814BEBC
 	move 11, SlateportCity_Movement_1A0841
 	waitmove 0
 	msgbox SlateportCity_Text_1655E7, 4
-	playmusic 441, 0
+	playmusic BGM_EVIL_TEAM, 0
 	msgbox SlateportCity_Text_1656BC, 4
 	move 6, SlateportCity_Movement_1A083F
 	move 1, SlateportCity_Movement_1A083F
diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.s b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.s
index 28b098126..c9f5675d5 100644
--- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.s
+++ b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.s
@@ -62,7 +62,11 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6
 	msgbox SlateportCity_OceanicMuseum_2F_Text_17EF62, 4
 	move 2, SlateportCity_OceanicMuseum_2F_Movement_155EA6
 	waitmove 0
+	.ifdef SAPPHIRE
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17EFC9, 4
+	.else
 	msgbox SlateportCity_OceanicMuseum_2F_Text_17F17E, 4
+	.endif
 	closebutton
 	fadescreen 1
 	disappear 2
diff --git a/data/scripts/maps/SootopolisCity.s b/data/scripts/maps/SootopolisCity.s
index 1690b8104..3d9c2dc93 100644
--- a/data/scripts/maps/SootopolisCity.s
+++ b/data/scripts/maps/SootopolisCity.s
@@ -448,7 +448,7 @@ SootopolisCity_EventScript_14D498:: @ 814D498
 	checkflag 113
 	jumpeq SootopolisCity_EventScript_14D4AD
 	.ifdef SAPPHIRE
-	msgbox SootopolisCity_Text_169DA6, 2
+	msgbox SootopolisCity_Text_169DA6, 4
 	.else
 	msgbox SootopolisCity_Text_16A249, 4
 	.endif