some ruby/sapphire event script differences

13 files changed, 111 insertions, 36 deletions

diff --git a/data/event_scripts.s b/data/event_scripts.s
index 94c1fd0cf..666d94efb 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -2752,6 +2752,7 @@ VerdanturfTown_Movement_1A083D:: @ 81A083D
 	step_4e
 	step_end
 
+Movement_1A083F:: @ 81A083F
 DewfordTown_Hall_Movement_1A083F:: @ 81A083F
 EverGrandeCity_ChampionsRoom_Movement_1A083F:: @ 81A083F
 EverGrandeCity_HallOfFame_Movement_1A083F:: @ 81A083F
diff --git a/data/scripts/magma_chimney.s b/data/scripts/magma_chimney.s
index 4a8e1647f..522e3887f 100644
--- a/data/scripts/magma_chimney.s
+++ b/data/scripts/magma_chimney.s
@@ -14,7 +14,7 @@ MtChimney_EventScript_1B2C95:: @ 81B2C95
 
 MtChimney_EventScript_1B2CB9:: @ 81B2CB9
 	.ifdef SAPPHIRE
-	msgbox UnknownString_81B350B, 4
+	msgbox MtChimney_Text_1B350B, 4
 	.else
 	msgbox MtChimney_Text_1B3EC1, 4
 	.endif
@@ -22,7 +22,7 @@ MtChimney_EventScript_1B2CB9:: @ 81B2CB9
 
 MtChimney_EventScript_1B2CC2:: @ 81B2CC2
 	.ifdef SAPPHIRE
-	msgbox UnknownString_81B3598, 4
+	msgbox MtChimney_Text_1B3598, 4
 	.else
 	msgbox MtChimney_Text_1B3F8C, 4
 	.endif
@@ -31,7 +31,7 @@ MtChimney_EventScript_1B2CC2:: @ 81B2CC2
 MtChimney_EventScript_1B2CCB:: @ 81B2CCB
 	lockall
 	.ifdef SAPPHIRE
-	msgbox UnknownString_81B2DEE, 4
+	msgbox MtChimney_Text_1B2DEE, 4
 	.else
 	msgbox MtChimney_Text_1B37BB, 4
 	.endif
@@ -43,17 +43,17 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB
 	move 2, MtChimney_Movement_1A0835
 	waitmove 0
 	.ifdef SAPPHIRE
-	msgbox UnknownString_81B2ED9, 4
+	msgbox MtChimney_Text_1B2ED9, 4
 	.else
 	msgbox MtChimney_Text_1B38B3, 4
 	.endif
 	.ifdef SAPPHIRE
-	trainerbattle 3, TRAINER_MT_CHIMNEY_GRUNT_3, 0, UnknownString_81B3099
+	trainerbattle 3, TRAINER_MT_CHIMNEY_GRUNT_3, 0, MtChimney_Text_1B3099
 	.else
 	trainerbattle 3, TRAINER_MT_CHIMNEY_GRUNT_3, 0, MtChimney_Text_1B3A68
 	.endif
 	.ifdef SAPPHIRE
-	msgbox UnknownString_81B30C2, 4
+	msgbox MtChimney_Text_1B30C2, 4
 	.else
 	msgbox MtChimney_Text_1B3A90, 4
 	.endif
@@ -74,7 +74,7 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB
 	move 255, MtChimney_Movement_1A083F
 	waitmove 0
 	.ifdef SAPPHIRE
-	msgbox UnknownString_81B3608, 4
+	msgbox MtChimney_Text_1B3608, 4
 	.else
 	msgbox MtChimney_Text_1B3FFE, 4
 	.endif
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
diff --git a/data/text/aqua_chimney.s b/data/text/aqua_chimney.s
index bc30be36c..2c8d94a0b 100644
--- a/data/text/aqua_chimney.s
+++ b/data/text/aqua_chimney.s
@@ -1,4 +1,4 @@
-UnknownString_81B2DEE: @ 81B2DEE
+MtChimney_Text_1B2DEE:: @ 81B2DEE
 	.string "The power contained in the\n"
 	.string "METEORITE...\p"
 	.string "By amplifying its power with this\n"
@@ -8,7 +8,7 @@ UnknownString_81B2DEE: @ 81B2DEE
 	.string "crater will fill with rainwater, giving\l"
 	.string "WATER POKéMON a place to live.$"
 
-UnknownString_81B2ED9: @ 81B2ED9
+MtChimney_Text_1B2ED9:: @ 81B2ED9
 	.string "ARCHIE: You again...\p"
 	.string "Now listen.\n"
 	.string "All life depends on the sea.\p"
@@ -26,11 +26,11 @@ UnknownString_81B2ED9: @ 81B2ED9
 	.string "I, ARCHIE, will show you the\n"
 	.string "consequences of meddling!$"
 
-UnknownString_81B3099: @ 81B3099
+MtChimney_Text_1B3099:: @ 81B3099
 	.string "What?!\p"
 	.string "I, ARCHIE, was caught off guard?!$"
 
-UnknownString_81B30C2: @ 81B30C2
+MtChimney_Text_1B30C2:: @ 81B30C2
 	.string "ARCHIE: Ah, whatever.\n"
 	.string "I will give up our plans for MT.\l"
 	.string "CHIMNEY for the time being...\p"
@@ -38,70 +38,70 @@ UnknownString_81B30C2: @ 81B30C2
 	.string "TEAM AQUA will prevail!\p"
 	.string "Don’t you ever forget that!$"
 
-UnknownString_81B3168: @ 81B3168
+MtChimney_Text_1B3168:: @ 81B3168
 	.string "Hehehe!\p"
 	.string "So you’ve come all the way here!\p"
 	.string "But you’re too late!\n"
 	.string "I’ve already delivered the METEORITE\l"
 	.string "from METEOR FALLS to the BOSS!$"
 
-UnknownString_81B31EA: @ 81B31EA
+MtChimney_Text_1B31EA:: @ 81B31EA
 	.string "Hehehe...\n"
 	.string "So I lost...\p"
 	.string "I’m sure glad I never took you on back\n"
 	.string "at METEOR FALLS.$"
 
-UnknownString_81B3239: @ 81B3239
+MtChimney_Text_1B3239:: @ 81B3239
 	.string "Hehehe!\p"
 	.string "You might have beaten me, but you don’t\n"
 	.string "stand a chance against the BOSS!\p"
 	.string "If you get lost now, you won’t have to\n"
 	.string "face a sound whipping!$"
 
-UnknownString_81B32C8: @ 81B32C8
+MtChimney_Text_1B32C8:: @ 81B32C8
 	.string "We of TEAM AQUA are working hard for\n"
 	.string "everyone’s sake.\p"
 	.string "Like, if there’s more water around,\n"
 	.string "WATER POKéMON will be happy, and it’ll\l"
 	.string "give people more fun places to swim!$"
 
-UnknownString_81B336E: @ 81B336E
+MtChimney_Text_1B336E:: @ 81B336E
 	.string "Hunh?\n"
 	.string "What do you mean I lost?$"
 
-UnknownString_81B338D: @ 81B338D
+MtChimney_Text_1B338D:: @ 81B338D
 	.string "Our BOSS says, “It will make everyone\n"
 	.string "happy.”\p"
 	.string "But why does everyone keep getting\n"
 	.string "in our way?$"
 
-UnknownString_81B33EA: @ 81B33EA
+MtChimney_Text_1B33EA:: @ 81B33EA
 	.string "That annoying TEAM MAGMA...\n"
 	.string "They always mess with our plans!$"
 
-UnknownString_81B3427: @ 81B3427
+MtChimney_Text_1B3427:: @ 81B3427
 	.string "METEORITES pack amazing power!$"
 
-UnknownString_81B3446: @ 81B3446
+MtChimney_Text_1B3446:: @ 81B3446
 	.string "Go! Stomp TEAM MAGMA!\n"
 	.string "And expand the sea!$"
 
-UnknownString_81B3470: @ 81B3470
+MtChimney_Text_1B3470:: @ 81B3470
 	.string "Stay out of our way, okay?\p"
 	.string "We’re trying to enlarge the sea for\n"
 	.string "the good of everybody!$"
 
-UnknownString_81B34C6: @ 81B34C6
+MtChimney_Text_1B34C6:: @ 81B34C6
 	.string "Yeah!\n"
 	.string "Hose them down!$"
 
-UnknownString_81B34DC: @ 81B34DC
+MtChimney_Text_1B34DC:: @ 81B34DC
 	.string "We’re going to keep expanding the sea!$"
 
-UnknownString_81B3503: @ 81B3503
+MtChimney_Text_1B3503:: @ 81B3503
 	.string "Bushaa!$"
 
-UnknownString_81B350B: @ 81B350B
+MtChimney_Text_1B350B:: @ 81B350B
 	.string "MAXIE: Oh, {PLAYER}{KUN}!\p"
 	.string "Please, you must stop TEAM AQUA\n"
 	.string "for me!\p"
@@ -109,14 +109,14 @@ UnknownString_81B350B: @ 81B350B
 	.string "inactive by using the stolen\l"
 	.string "METEORITE’s power!$"
 
-UnknownString_81B3598: @ 81B3598
+MtChimney_Text_1B3598:: @ 81B3598
 	.string "MAXIE: {PLAYER}{KUN}!\p"
 	.string "Please, you’ve got to stop TEAM AQUA\n"
 	.string "for me!\p"
 	.string "Dealing with these three thugs is\n"
 	.string "a lot, even for me!$"
 
-UnknownString_81B3608: @ 81B3608
+MtChimney_Text_1B3608:: @ 81B3608
 	.string "MAXIE: {PLAYER}{KUN}! Thank you!\p"
 	.string "With your help, we thwarted TEAM\n"
 	.string "AQUA’s destructive plan!\p"
@@ -126,17 +126,17 @@ UnknownString_81B3608: @ 81B3608
 	.string "our pursuit of TEAM AQUA.\p"
 	.string "{PLAYER}{KUN}, we shall meet again!$"
 
-UnknownString_81B36F1: @ 81B36F1
+MtChimney_Text_1B36F1:: @ 81B36F1
 	.string "Darn... TEAM AQUA outnumbers us!\n"
 	.string "We can’t keep up with them!$"
 
-UnknownString_81B372E: @ 81B372E
+MtChimney_Text_1B372E:: @ 81B372E
 	.string "If they expand the sea, there’ll be less\n"
 	.string "habitats for POKéMON and people!$"
 
-UnknownString_81B3778: @ 81B3778
+MtChimney_Text_1B3778:: @ 81B3778
 	.string "TEAM AQUA wants to expand the sea...\n"
 	.string "How’s that for insane?$"
 
-UnknownString_81B37B4: @ 81B37B4
+MtChimney_Text_1B37B4:: @ 81B37B4
 	.string "Bufoh!$"
diff --git a/data/text/maps/MeteorFalls_1F_1R.s b/data/text/maps/MeteorFalls_1F_1R.s
index 788d692c4..9a52b6833 100644
--- a/data/text/maps/MeteorFalls_1F_1R.s
+++ b/data/text/maps/MeteorFalls_1F_1R.s
@@ -25,7 +25,7 @@ MeteorFalls_1F_1R_Text_193320:: @ 8193320
 	.string "Hehehe! Be seeing you, you TEAM\n"
 	.string "{GOOD_TEAM} dingbats!$"
 
-UnknownString_81933EC: @ 81933EC
+MeteorFalls_1F_1R_Text_1933EC:: @ 81933EC
 	.string "And you are?\p"
 	.string "... ... ... ... ... ... ... ...\n"
 	.string "... ... ... ... ... ... ... ...\p"
diff --git a/data/text/maps/Route128.s b/data/text/maps/Route128.s
index e2410358b..c20f32770 100644
--- a/data/text/maps/Route128.s
+++ b/data/text/maps/Route128.s
@@ -37,7 +37,7 @@ Route128_Text_172181:: @ 8172181
 	.string "STEVEN: {PLAYER}{KUN}!\n"
 	.string "What is happening?$"
 
-UnknownString_81721A2: @ 81721A2
+Route128_Text_1721A2:: @ 81721A2
 	.string "This is terrible...\p"
 	.string "If this doesn’t stop, all HOENN...\n"
 	.string "No, the whole world will drown.\p"
diff --git a/data/text/maps/SlateportCity_OceanicMuseum_2F.s b/data/text/maps/SlateportCity_OceanicMuseum_2F.s
index e1f087543..6644f780b 100644
--- a/data/text/maps/SlateportCity_OceanicMuseum_2F.s
+++ b/data/text/maps/SlateportCity_OceanicMuseum_2F.s
@@ -46,7 +46,7 @@ SlateportCity_OceanicMuseum_2F_Text_17EF62:: @ 817EF62
 	.string "long to snatch some parts, and you\l"
 	.string "simps are held up by a mere child?$"
 
-UnknownString_817EFC9: @ 817EFC9
+SlateportCity_OceanicMuseum_2F_Text_17EFC9:: @ 817EFC9
 	.string "I am TEAM AQUA’s ARCHIE.\p"
 	.string "Tell me, why do you meddle in the\n"
 	.string "noble affairs of TEAM AQUA?\p"