merge

18 files changed, 23 insertions, 23 deletions

diff --git a/data/scripts/maps/AncientTomb.inc b/data/scripts/maps/AncientTomb.inc
index 7ba7540c4..bfc5b6a79 100644
--- a/data/scripts/maps/AncientTomb.inc
+++ b/data/scripts/maps/AncientTomb.inc
@@ -64,7 +64,7 @@ AncientTomb_EventScript_15F050:: @ 815F050
 	setwildbattle SPECIES_REGISTEEL, 40, ITEM_NONE
 	setflag 937
 	setflag 2145
-	special StartBattle_Regi
+	special ScrSpecial_StartRegiBattle
 	waitstate
 	clearflag 2145
 	release
diff --git a/data/scripts/maps/BattleTower_BattleRoom.inc b/data/scripts/maps/BattleTower_BattleRoom.inc
index 176d8e8e8..2f0fb97b9 100644
--- a/data/scripts/maps/BattleTower_BattleRoom.inc
+++ b/data/scripts/maps/BattleTower_BattleRoom.inc
@@ -20,7 +20,7 @@ BattleTower_BattleRoom_EventScript_1608FA:: @ 81608FA
 	msgbox 0x20234cc, 4
 	waittext
 	closebutton
-	special HealPlayerParty
+	special ScrSpecial_HealPlayerParty
 	setvar 0x8004, 0
 	setvar 0x8005, 0
 	special sub_813556C
@@ -56,7 +56,7 @@ BattleTower_BattleRoom_EventScript_160961:: @ 8160961
 	special sub_8135A14
 	fanfare 368
 	waitfanfare
-	special HealPlayerParty
+	special ScrSpecial_HealPlayerParty
 
 BattleTower_BattleRoom_EventScript_1609B2:: @ 81609B2
 	msgbox BattleTower_BattleRoom_Text_19AD09, 5
diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc
index 8cd3639a5..a1570ac13 100644
--- a/data/scripts/maps/BattleTower_Lobby.inc
+++ b/data/scripts/maps/BattleTower_Lobby.inc
@@ -242,7 +242,7 @@ BattleTower_Lobby_EventScript_160587:: @ 8160587
 	special LoadPlayerParty
 	closebutton
 	pause 2
-	call BattleTower_Lobby_EventScript_19F806
+	call S_DoSaveDialog
 	setvar 0x4000, 5
 	hidebox 0, 0, 15, 10
 	compare RESULT, 0
diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc
index 023892d36..5517a9c7e 100644
--- a/data/scripts/maps/CaveOfOrigin_B4F.inc
+++ b/data/scripts/maps/CaveOfOrigin_B4F.inc
@@ -62,7 +62,7 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7
 	pause 40
 	waitpokecry
 	setflag 2145
-	special StartBattle_GroudonKyogre
+	special ScrSpecial_StartGroudonKyogreBattle
 	waitstate
 	clearflag 2145
 	specialval RESULT, sub_810E300
diff --git a/data/scripts/maps/DesertRuins.inc b/data/scripts/maps/DesertRuins.inc
index df40fc126..97a22bae3 100644
--- a/data/scripts/maps/DesertRuins.inc
+++ b/data/scripts/maps/DesertRuins.inc
@@ -64,7 +64,7 @@ DesertRuins_EventScript_15CB85:: @ 815CB85
 	setwildbattle SPECIES_REGIROCK, 40, ITEM_NONE
 	setflag 935
 	setflag 2145
-	special StartBattle_Regi
+	special ScrSpecial_StartRegiBattle
 	waitstate
 	clearflag 2145
 	release
diff --git a/data/scripts/maps/IslandCave.inc b/data/scripts/maps/IslandCave.inc
index b16f386d8..2f8ba2121 100644
--- a/data/scripts/maps/IslandCave.inc
+++ b/data/scripts/maps/IslandCave.inc
@@ -31,7 +31,7 @@ IslandCave_MapScript1_15EF15:: @ 815EF15
 	setflag 2133
 	end
 
-gIslandCave_EventScript_OpenRegiiceChamber:: @ 815EF19
+S_OpenRegiceChamber:: @ 815EF19
 	setmaptile 7, 19, 554, 1
 	setmaptile 8, 19, 555, 1
 	setmaptile 9, 19, 556, 1
@@ -84,7 +84,7 @@ IslandCave_EventScript_15EF9D:: @ 815EF9D
 	setwildbattle SPECIES_REGICE, 40, ITEM_NONE
 	setflag 936
 	setflag 2145
-	special StartBattle_Regi
+	special ScrSpecial_StartRegiBattle
 	waitstate
 	clearflag 2145
 	release
diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc
index 3c8cc5bdf..6bdcf55e2 100644
--- a/data/scripts/maps/LilycoveCity_ContestLobby.inc
+++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc
@@ -330,7 +330,7 @@ LilycoveCity_ContestLobby_EventScript_158BC4:: @ 8158BC4
 	msgbox LilycoveCity_ContestLobby_Text_188521, 5
 	compare RESULT, 0
 	jumpeq LilycoveCity_ContestLobby_EventScript_158C35
-	call LilycoveCity_ContestLobby_EventScript_19F806
+	call S_DoSaveDialog
 	hidebox 0, 0, 15, 9
 	compare RESULT, 0
 	jumpeq LilycoveCity_ContestLobby_EventScript_158C35
diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc
index dcf74b77c..09d19c1c5 100644
--- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc
+++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc
@@ -29,7 +29,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD:: @ 81583DD
 	message LilycoveCity_CoveLilyMotel_2F_Text_18708F
 	waittext
 	call LilycoveCity_CoveLilyMotel_2F_EventScript_1A02C5
-	special sub_810D6A4
+	special ScrSpecial_ShowDiploma
 	waitstate
 	release
 	end
diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc
index f8ff8f9f3..aca6b16d4 100644
--- a/data/scripts/maps/LilycoveCity_Harbor.inc
+++ b/data/scripts/maps/LilycoveCity_Harbor.inc
@@ -135,7 +135,7 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE
 	callif 1, LilycoveCity_Harbor_EventScript_1599CE
 	pause 30
 	spriteinvisible 255, 0, 0
-	special HealPlayerParty
+	special ScrSpecial_HealPlayerParty
 	setvar 0x8004, 2
 	call LilycoveCity_Harbor_EventScript_1A040E
 	warp SouthernIsland_Exterior, 255, 13, 22
diff --git a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc
index 6adea2eb2..2786c930c 100644
--- a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc
+++ b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc
@@ -21,7 +21,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE
 	special sub_80FA148
 	compare RESULT, 1
 	jumpeq LilycoveCity_MoveDeletersHouse_EventScript_159B71
-	special sub_80F9F3C
+	special ScrSpecial_CountPokemonMoves
 	compare RESULT, 1
 	jumpeq LilycoveCity_MoveDeletersHouse_EventScript_159B64
 	msgbox LilycoveCity_MoveDeletersHouse_Text_18B6B0, 4
@@ -30,7 +30,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE
 	fadescreen 0
 	compare 0x8005, 4
 	jumpeq LilycoveCity_MoveDeletersHouse_EventScript_159ADE
-	special sub_80F9F84
+	special ScrSpecial_GetPokemonNicknameAndMoveName
 	msgbox LilycoveCity_MoveDeletersHouse_Text_18B6F2, 5
 	switch RESULT
 	case 1, LilycoveCity_MoveDeletersHouse_EventScript_159B53
@@ -47,7 +47,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_159B53:: @ 8159B53
 	end
 
 LilycoveCity_MoveDeletersHouse_EventScript_159B64:: @ 8159B64
-	special sub_80F9F84
+	special ScrSpecial_GetPokemonNicknameAndMoveName
 	msgbox LilycoveCity_MoveDeletersHouse_Text_18B6D0, 4
 	releaseall
 	end
diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc
index 14836f3e0..59669596a 100644
--- a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc
+++ b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc
@@ -103,7 +103,7 @@ MossdeepCity_GameCorner_1F_EventScript_15AD59:: @ 815AD59
 	compare RESULT, 0
 	callif 1, MossdeepCity_GameCorner_1F_EventScript_15ADE8
 	special LoadPlayerParty
-	call MossdeepCity_GameCorner_1F_EventScript_19F806
+	call S_DoSaveDialog
 	compare RESULT, 0
 	jumpeq MossdeepCity_GameCorner_1F_EventScript_15ADE8
 	hidebox 0, 0, 15, 10
diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc
index a5a013d5f..c7d1201fd 100644
--- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc
+++ b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc
@@ -29,7 +29,7 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E
 	compare RESULT, 2
 	callif 1, MossdeepCity_GameCorner_B1F_EventScript_15AEEE
 	closebutton
-	special HealPlayerParty
+	special ScrSpecial_HealPlayerParty
 	move 255, MossdeepCity_GameCorner_B1F_Movement_15AEFF
 	waitmove 0
 	special LoadPlayerParty
diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc
index dc5efe243..123b099fe 100644
--- a/data/scripts/maps/PetalburgCity.inc
+++ b/data/scripts/maps/PetalburgCity.inc
@@ -32,7 +32,7 @@ PetalburgCity_EventScript_14B747:: @ 814B747
 	move 255, PetalburgCity_Movement_14B7CC
 	waitmove 0
 	msgbox PetalburgCity_Text_16D361, 4
-	special StartBattle_WallyTutorial
+	special ScrSpecial_StartWallyTutorialBattle
 	waitstate
 	msgbox PetalburgCity_Text_16D3DE, 4
 	movecoords 2, PetalburgCity_Movement_1A083F, 0, 0
diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc
index 8462603a6..d945aadfc 100644
--- a/data/scripts/maps/Route101.inc
+++ b/data/scripts/maps/Route101.inc
@@ -224,12 +224,12 @@ Route101_EventScript_14EA7F:: @ 814EA7F
 	movesprite 255, 6, 13
 	move 255, Route101_Movement_1A083F
 	waitmove 0
-	special ChooseStarter
+	special ScrSpecial_ChooseStarter
 	waitstate
 	move 2, Route101_Movement_14EAD7
 	waitmove 0
 	msgbox Route101_Text_16D191, 4
-	special HealPlayerParty
+	special ScrSpecial_HealPlayerParty
 	setflag 720
 	clearflag 721
 	setflag 700
diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc
index d8c19d92c..a77feaa0f 100644
--- a/data/scripts/maps/Route110.inc
+++ b/data/scripts/maps/Route110.inc
@@ -25,7 +25,7 @@ Route110_MapScript2_14F933:: @ 814F933
 	.2byte 0
 
 Route110_EventScript_14F93D:: @ 814F93D
-	special BeginCyclingRoadChallenge
+	special ScrSpecial_BeginCyclingRoadChallenge
 	setvar 0x40a9, 2
 	return
 
diff --git a/data/scripts/maps/SkyPillar_Top.inc b/data/scripts/maps/SkyPillar_Top.inc
index 23db6a8ea..d659a23c1 100644
--- a/data/scripts/maps/SkyPillar_Top.inc
+++ b/data/scripts/maps/SkyPillar_Top.inc
@@ -21,7 +21,7 @@ SkyPillar_Top_EventScript_15F316:: @ 815F316
 	waitpokecry
 	setflag 773
 	setflag 2145
-	special StartBattle_Rayquaza
+	special ScrSpecial_StartRayquazaBattle
 	waitstate
 	clearflag 2145
 	release
diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc
index 48eb5c1df..e156f8948 100644
--- a/data/scripts/maps/SlateportCity.inc
+++ b/data/scripts/maps/SlateportCity.inc
@@ -69,7 +69,7 @@ SlateportCity_EventScript_14BAE0:: @ 814BAE0
 	specialval RESULT, LeadMonHasEffortRibbon
 	compare RESULT, 1
 	callif 1, SlateportCity_EventScript_14BB35
-	specialval RESULT, GetLeadMonEVCount
+	specialval RESULT, ScrSpecial_AreLeadMonEVsMaxedOut
 	compare RESULT, 0
 	callif 1, SlateportCity_EventScript_14BB2B
 	msgbox SlateportCity_Text_164691, 4
diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc
index 3adf3545f..e5eaadab5 100644
--- a/data/scripts/maps/SouthernIsland_Interior.inc
+++ b/data/scripts/maps/SouthernIsland_Interior.inc
@@ -67,7 +67,7 @@ SouthernIsland_Interior_EventScript_160BA7:: @ 8160BA7
 	setwildbattle SPECIES_LATIAS_OR_LATIOS, 50, ITEM_SOUL_DEW
 	setflag 911
 	setflag 2145
-	special StartBattle_SouthernIsland
+	special ScrSpecial_StartSouthernIslandBattle
 	waitstate
 	clearflag 2145
 	releaseall