More Sapphire diffs.

5 files changed, 125 insertions, 4 deletions

diff --git a/data/scripts/maps/CaveOfOrigin_B4F.s b/data/scripts/maps/CaveOfOrigin_B4F.s
index b0c638df0..b9f83fe67 100644
--- a/data/scripts/maps/CaveOfOrigin_B4F.s
+++ b/data/scripts/maps/CaveOfOrigin_B4F.s
@@ -27,7 +27,11 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7
 	lockall
 	move 255, CaveOfOrigin_B4F_Movement_1A0841
 	waitmove 0
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B4F03, 4
+	.else
 	msgbox CaveOfOrigin_B4F_Text_1B4FE4, 4
+	.endif
 	closebutton
 	setweather 0
 	doweather
@@ -78,7 +82,11 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7
 	end
 
 CaveOfOrigin_B4F_EventScript_15DE73:: @ 815DE73
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B4F29, 4
+	.else
 	msgbox CaveOfOrigin_B4F_Text_1B5009, 4
+	.endif
 	closebutton
 	return
 
diff --git a/data/scripts/maps/MtPyre_Summit.s b/data/scripts/maps/MtPyre_Summit.s
index 41ffa235a..96d31be8e 100644
--- a/data/scripts/maps/MtPyre_Summit.s
+++ b/data/scripts/maps/MtPyre_Summit.s
@@ -36,7 +36,11 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1
 	callif 1, MtPyre_Summit_EventScript_15D59E
 	compare 0x8008, 2
 	callif 1, MtPyre_Summit_EventScript_15D59F
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B52B0, 4
+	.else
 	msgbox MtPyre_Summit_Text_1B5EEC, 4
+	.endif
 	closebutton
 	fadescreen 1
 	disappear 2
@@ -54,7 +58,11 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1
 	callif 1, MtPyre_Summit_EventScript_15D5BF
 	compare 0x8008, 2
 	callif 1, MtPyre_Summit_EventScript_15D5CA
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B53AB, 4
+	.else
 	msgbox MtPyre_Summit_Text_1B5FE6, 4
+	.endif
 	giveitem ITEM_RED_OR_BLUE_ORB
 	setflag 212
 	releaseall
@@ -130,7 +138,11 @@ MtPyre_Summit_Movement_15D5EC:: @ 815D5EC
 MtPyre_Summit_EventScript_15D5EF:: @ 815D5EF
 	lock
 	faceplayer
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B586F, 5
+	.else
 	msgbox MtPyre_Summit_Text_1B64B3, 5
+	.endif
 	compare RESULT, 1
 	callif 1, MtPyre_Summit_EventScript_15D611
 	compare RESULT, 0
@@ -139,11 +151,19 @@ MtPyre_Summit_EventScript_15D5EF:: @ 815D5EF
 	end
 
 MtPyre_Summit_EventScript_15D611:: @ 815D611
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B5992, 4
+	.else
 	msgbox MtPyre_Summit_Text_1B65D6, 4
+	.endif
 	return
 
 MtPyre_Summit_EventScript_15D61A:: @ 815D61A
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B5BD7, 4
+	.else
 	msgbox MtPyre_Summit_Text_1B6823, 4
+	.endif
 	return
 
 MtPyre_Summit_EventScript_15D623:: @ 815D623
@@ -155,12 +175,20 @@ MtPyre_Summit_EventScript_15D623:: @ 815D623
 	jumpeq MtPyre_Summit_EventScript_15D64A
 	checkflag 129
 	jumpeq MtPyre_Summit_EventScript_15D6BA
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B54BE, 4
+	.else
 	msgbox MtPyre_Summit_Text_1B60F9, 4
+	.endif
 	release
 	end
 
 MtPyre_Summit_EventScript_15D64A:: @ 815D64A
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B5647, 5
+	.else
 	msgbox MtPyre_Summit_Text_1B6283, 5
+	.endif
 	compare RESULT, 1
 	jumpeq MtPyre_Summit_EventScript_15D669
 	compare RESULT, 0
@@ -177,13 +205,21 @@ MtPyre_Summit_EventScript_15D669:: @ 815D669
 	move LAST_TALKED, MtPyre_Summit_Movement_1A0839
 	waitmove 0
 	pause 10
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B5762, 4
+	.else
 	msgbox MtPyre_Summit_Text_1B639C, 4
+	.endif
 	setflag 259
 	release
 	end
 
 MtPyre_Summit_EventScript_15D69B:: @ 815D69B
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B56AB, 5
+	.else
 	msgbox MtPyre_Summit_Text_1B62E7, 5
+	.endif
 	compare RESULT, 1
 	jumpeq MtPyre_Summit_EventScript_15D669
 	compare RESULT, 0
@@ -191,12 +227,20 @@ MtPyre_Summit_EventScript_15D69B:: @ 815D69B
 	end
 
 MtPyre_Summit_EventScript_15D6BA:: @ 815D6BA
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B5540, 4
+	.else
 	msgbox MtPyre_Summit_Text_1B617B, 4
+	.endif
 	release
 	end
 
 MtPyre_Summit_EventScript_15D6C4:: @ 815D6C4
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B57BE, 4
+	.else
 	msgbox MtPyre_Summit_Text_1B63F8, 4
+	.endif
 	release
 	end
 
@@ -230,7 +274,11 @@ MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2
 	callif 1, MtPyre_Summit_EventScript_15D769
 	compare 0x8008, 2
 	callif 1, MtPyre_Summit_EventScript_15D774
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B5BFC, 4
+	.else
 	msgbox MtPyre_Summit_Text_1B6848, 4
+	.endif
 	closebutton
 	compare 0x8008, 0
 	callif 1, MtPyre_Summit_EventScript_15D77F
diff --git a/data/scripts/maps/Route115.s b/data/scripts/maps/Route115.s
index 5cc79447a..0bdf8b16f 100644
--- a/data/scripts/maps/Route115.s
+++ b/data/scripts/maps/Route115.s
@@ -58,7 +58,12 @@ Route115_EventScript_150A03:: @ 8150A03
 	end
 
 Route115_EventScript_150A1A:: @ 8150A1A
+.ifdef SAPPHIRE
+	trainerbattle 0, TRAINER_514, 0, UnknownString_81BCE47, UnknownString_81BCE7D
+	msgbox UnknownString_81BCEA4, 6
+.else
 	trainerbattle 0, TRAINER_514, 0, Route115_Text_1BCEE0, Route115_Text_1BCF16
 	msgbox Route115_Text_1BCF3D, 6
+.endc
 	end
 
diff --git a/data/scripts/maps/SeafloorCavern_Room9.s b/data/scripts/maps/SeafloorCavern_Room9.s
index 2308cbbf5..a052c7989 100644
--- a/data/scripts/maps/SeafloorCavern_Room9.s
+++ b/data/scripts/maps/SeafloorCavern_Room9.s
@@ -22,27 +22,55 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA
 	waitmove 0
 	move 255, SeafloorCavern_Room9_Movement_15DD68
 	waitmove 0
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B41B8, 4
+	.else
 	msgbox SeafloorCavern_Room9_Text_1B4850, 4
+	.endif
 	closebutton
 	reappear 0x8004
 	move 255, SeafloorCavern_Room9_Movement_1A083F
 	waitmove 0
 	move 0x8004, SeafloorCavern_Room9_Movement_15DD36
 	waitmove 0
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B41D5, 4
+	.else
 	msgbox SeafloorCavern_Room9_Text_1B486C, 4
+	.endif
 	move 0x8004, SeafloorCavern_Room9_Movement_1A0841
 	waitmove 0
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B4201, 4
+	.else
 	msgbox SeafloorCavern_Room9_Text_1B4897, 4
+	.endif
 	move 0x8004, SeafloorCavern_Room9_Movement_1A0839
 	waitmove 0
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B4289, 4
+	.else
 	msgbox SeafloorCavern_Room9_Text_1B491F, 4
+	.endif
+	.ifdef SAPPHIRE
+	trainerbattle 3, TRAINER_SEAFLOOR_CAVERN_GRUNT_5, 0, UnknownString_81B4319
+	.else
 	trainerbattle 3, TRAINER_SEAFLOOR_CAVERN_GRUNT_5, 0, SeafloorCavern_Room9_Text_1B49AE
+	.endif
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B432C, 4
+	.else
 	msgbox SeafloorCavern_Room9_Text_1B49C1, 4
+	.endif
 	setweather 0
 	doweather
 	special 332
 	waitstate
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B43C4, 4
+	.else
 	msgbox SeafloorCavern_Room9_Text_1B4A5A, 4
+	.endif
 	special 284
 	waitstate
 	.ifdef SAPPHIRE
@@ -93,21 +121,37 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA
 	setvar 0x8005, 3
 	setvar 0x8006, 4
 	setvar 0x8007, 5
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B43F2, 4
+	.else
 	msgbox SeafloorCavern_Room9_Text_1B4A89, 4
+	.endif
 	playsfx 2
 	move 255, SeafloorCavern_Room9_Movement_1A083F
 	waitmove 0
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B4443, 4
+	.else
 	msgbox SeafloorCavern_Room9_Text_1B4ADB, 4
+	.endif
 	closebutton
 	move 0x8004, SeafloorCavern_Room9_Movement_15DD41
 	waitmove 0
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B447A, 4
+	.else
 	msgbox SeafloorCavern_Room9_Text_1B4B11, 4
+	.endif
 	closebutton
 	playsfx 3
 	pause 20
 	move 0x8004, SeafloorCavern_Room9_Movement_1A0845
 	waitmove 0
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B45C6, 4
+	.else
 	msgbox SeafloorCavern_Room9_Text_1B4C79, 4
+	.endif
 	closebutton
 	reappear 0x8005
 	reappear 0x8006
@@ -118,19 +162,35 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA
 	waitmove 0
 	move 0x8004, SeafloorCavern_Room9_Movement_1A083F
 	waitmove 0
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B464D, 4
+	.else
 	msgbox SeafloorCavern_Room9_Text_1B4D02, 4
+	.endif
 	playsfx 21
 	move 0x8004, SeafloorCavern_Room9_Movement_1A0833
 	waitmove 0
 	move 0x8004, SeafloorCavern_Room9_Movement_1A0835
 	waitmove 0
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B4723, 4
+	.else
 	msgbox SeafloorCavern_Room9_Text_1B4DD3, 4
+	.endif
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B4786, 4
+	.else
 	msgbox SeafloorCavern_Room9_Text_1B4E37, 4
+	.endif
 	closebutton
 	move 0x8005, SeafloorCavern_Room9_Movement_15DD60
 	move 0x8004, SeafloorCavern_Room9_Movement_15DD46
 	waitmove 0
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B4818, 4
+	.else
 	msgbox SeafloorCavern_Room9_Text_1B4ECA, 4
+	.endif
 	setvar 0x407b, 1
 	clearflag 855
 	clearflag 856
diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.s b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.s
index 10dcb66d8..0646a9d95 100644
--- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.s
+++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.s
@@ -3,12 +3,12 @@ SlateportCity_OceanicMuseum_1F_MapScripts:: @ 8155ACA
 	.byte 0
 
 SlateportCity_OceanicMuseum_1F_MapScript1_155AD0:: @ 8155AD0
-	.ifndef SAPPHIRE
-	setvar 0x4010, 120
-	setvar 0x4011, 119
-	.else
+	.ifdef SAPPHIRE
 	setvar 0x4010, 118
 	setvar 0x4011, 117
+	.else
+	setvar 0x4010, 120
+	setvar 0x4011, 119
 	.endif
 	end