Merge branch 'master' into daycare

29 files changed, 388 insertions, 344 deletions

diff --git a/data/scripts/bard.inc b/data/scripts/bard.inc
deleted file mode 100644
index 3f25b100f..000000000
--- a/data/scripts/bard.inc
+++ /dev/null
@@ -1,67 +0,0 @@
-MauvilleCity_PokemonCenter_1F_EventScript_1AE744:: @ 81AE744
-	special sub_80F7B14
-	switch RESULT
-	case 0, MauvilleCity_PokemonCenter_1F_EventScript_1AE784
-	case 1, MauvilleCity_PokemonCenter_1F_EventScript_1AE845
-	case 2, MauvilleCity_PokemonCenter_1F_EventScript_1AEBAB
-	case 3, MauvilleCity_PokemonCenter_1F_EventScript_1B0816
-	case 4, MauvilleCity_PokemonCenter_1F_EventScript_1B09EB
-	end
-
-MauvilleCity_PokemonCenter_1F_EventScript_1AE784:: @ 81AE784
-	lock
-	faceplayer
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1B0A91, 5
-	compare RESULT, 1
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE7A5
-	compare RESULT, 0
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE7C8
-	end
-
-MauvilleCity_PokemonCenter_1F_EventScript_1AE7A5:: @ 81AE7A5
-	setvar 0x8004, 0
-	special sub_80F7C54
-	pause 60
-	special sub_80F7B2C
-	compare RESULT, 0
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE7D2
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1B0AED, 4
-	release
-	end
-
-MauvilleCity_PokemonCenter_1F_EventScript_1AE7C8:: @ 81AE7C8
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1B0AC3, 4
-	release
-	end
-
-MauvilleCity_PokemonCenter_1F_EventScript_1AE7D2:: @ 81AE7D2
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1B0B2C, 5
-	compare RESULT, 1
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE7F1
-	compare RESULT, 0
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE83B
-	end
-
-MauvilleCity_PokemonCenter_1F_EventScript_1AE7F1:: @ 81AE7F1
-	setvar 0x8004, 6
-	call MauvilleCity_PokemonCenter_1F_EventScript_1A00F3
-	lock
-	faceplayer
-	compare RESULT, 0
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE83B
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1B0BD0, 4
-	setvar 0x8004, 1
-	special sub_80F7C54
-	pause 60
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1B0BFA, 5
-	compare RESULT, 0
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE7F1
-	special sub_80F7B40
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1B0C23, 4
-	release
-	end
-
-MauvilleCity_PokemonCenter_1F_EventScript_1AE83B:: @ 81AE83B
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1B0BA6, 4
-	release
-	end
diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc
index 1bbe7d355..f4707d8cb 100644
--- a/data/scripts/berry_tree.inc
+++ b/data/scripts/berry_tree.inc
@@ -1,4 +1,4 @@
-BerryTreeScript:: @ 81A14DD
+S_BerryTree:: @ 81A14DD
 	special FieldObjectInteractionGetBerryTreeData
 	switch 0x8004
 	case 255, Route102_EventScript_1A1533
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index 4a919c597..6507677e0 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -191,7 +191,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3EBC:: @ 81A3EBC
 	case 127, OldaleTown_PokemonCenter_2F_EventScript_1A4319
 
 OldaleTown_PokemonCenter_2F_EventScript_1A3EF2:: @ 81A3EF2
-	call OldaleTown_PokemonCenter_2F_EventScript_19F806
+	call S_DoSaveDialog
 	compare RESULT, 0
 	jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A4319
 	call OldaleTown_PokemonCenter_2F_EventScript_1A3FEF
@@ -215,7 +215,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3EF2:: @ 81A3EF2
 	jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A42F5
 
 OldaleTown_PokemonCenter_2F_EventScript_1A3F5E:: @ 81A3F5E
-	special HealPlayerParty
+	special ScrSpecial_HealPlayerParty
 	special SavePlayerParty
 	special LoadPlayerBag
 	copyvar 0x4087, 0x8004
@@ -361,7 +361,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A40FA:: @ 81A40FA
 	call OldaleTown_PokemonCenter_2F_EventScript_1A41BB
 	compare RESULT, 0
 	jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A4319
-	call OldaleTown_PokemonCenter_2F_EventScript_19F806
+	call S_DoSaveDialog
 	compare RESULT, 0
 	jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A4319
 	message OldaleTown_PokemonCenter_2F_Text_1A490C
@@ -455,7 +455,7 @@ VerdanturfTown_PokemonCenter_2F_EventScript_1A41FB:: @ 81A41FB
 	jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A4229
 
 OldaleTown_PokemonCenter_2F_EventScript_1A4229:: @ 81A4229
-	call OldaleTown_PokemonCenter_2F_EventScript_19F806
+	call S_DoSaveDialog
 	compare RESULT, 0
 	jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A4319
 	message OldaleTown_PokemonCenter_2F_Text_1A490C
diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc
index b5b3d4670..dcc4b44e7 100644
--- a/data/scripts/day_care.inc
+++ b/data/scripts/day_care.inc
@@ -282,7 +282,7 @@ Route117_PokemonDayCare_EventScript_1B2558:: @ 81B2558
 	release
 	end
 
-Event_EggHatch:: @ 81B25BC
+S_EggHatch:: @ 81B25BC
 	lockall
 	msgbox UnknownString_81B2C68, 4
 	special EggHatch
diff --git a/data/scripts/giddy.inc b/data/scripts/giddy.inc
deleted file mode 100644
index 263589fe9..000000000
--- a/data/scripts/giddy.inc
+++ /dev/null
@@ -1,51 +0,0 @@
-MauvilleCity_PokemonCenter_1F_EventScript_1B09EB:: @ 81B09EB
-	lock
-	faceplayer
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1B092A, 5
-	compare RESULT, 1
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A0C
-	compare RESULT, 0
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A6F
-	end
-
-MauvilleCity_PokemonCenter_1F_EventScript_1B0A0C:: @ 81B0A0C
-	special sub_80F7CC8
-	compare RESULT, 1
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A4E
-	compare RESULT, 0
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A79
-	end
-
-MauvilleCity_PokemonCenter_1F_EventScript_1B0A26:: @ 81B0A26
-	special sub_80F7CC8
-	compare RESULT, 1
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A40
-	compare RESULT, 0
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A79
-	end
-
-MauvilleCity_PokemonCenter_1F_EventScript_1B0A40:: @ 81B0A40
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1B0998, 4
-	jump MauvilleCity_PokemonCenter_1F_EventScript_1B0A4E
-	end
-
-MauvilleCity_PokemonCenter_1F_EventScript_1B0A4E:: @ 81B0A4E
-	special sub_80F7CF4
-	special ShowFieldMessageStringVar4
-	waittext
-	yesnobox 20, 8
-	compare RESULT, 1
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A26
-	compare RESULT, 0
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A26
-	end
-
-MauvilleCity_PokemonCenter_1F_EventScript_1B0A6F:: @ 81B0A6F
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1B097C, 4
-	release
-	end
-
-MauvilleCity_PokemonCenter_1F_EventScript_1B0A79:: @ 81B0A79
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1B09B0, 4
-	release
-	end
diff --git a/data/scripts/hipster.inc b/data/scripts/hipster.inc
deleted file mode 100644
index 3e24e4868..000000000
--- a/data/scripts/hipster.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-MauvilleCity_PokemonCenter_1F_EventScript_1AE845:: @ 81AE845
-	lock
-	faceplayer
-	setflag 2054
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1B0C5B, 4
-	special sub_80F7C70
-	compare RESULT, 0
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE86A
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1B0CA7, 4
-	release
-	end
-
-MauvilleCity_PokemonCenter_1F_EventScript_1AE86A:: @ 81AE86A
-	special sub_80F7C90
-	compare RESULT, 1
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE882
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1B0D11, 4
-	release
-	end
-
-MauvilleCity_PokemonCenter_1F_EventScript_1AE882:: @ 81AE882
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1B0D75, 4
-	special sub_80F7C84
-	release
-	end
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
diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc
new file mode 100644
index 000000000..997b5a31c
--- /dev/null
+++ b/data/scripts/mauville_man.inc
@@ -0,0 +1,357 @@
+@ From mauville_old_man.h
+@ TODO: Put these in a header
+
+MAUVILLE_MAN_BARD        = 0
+MAUVILLE_MAN_HIPSTER     = 1
+MAUVILLE_MAN_TRADER      = 2
+MAUVILLE_MAN_STORYTELLER = 3
+MAUVILLE_MAN_GIDDY       = 4
+
+MauvilleCity_PokemonCenter_1F_EventScript_1AE744:: @ 81AE744
+	special ScrSpecial_GetCurrentMauvilleMan
+	switch RESULT
+	case MAUVILLE_MAN_BARD,        SpeakToBard
+	case MAUVILLE_MAN_HIPSTER,     SpeakToHipster
+	case MAUVILLE_MAN_TRADER,      SpeakToTrader
+	case MAUVILLE_MAN_STORYTELLER, SpeakToStoryteller
+	case MAUVILLE_MAN_GIDDY,       SpeakToGiddy
+	end
+
+
+@-------------------------------------------------------------------------------
+@ Bard
+@-------------------------------------------------------------------------------
+
+SpeakToBard:
+	lock
+	faceplayer
+	msgbox gTextBard_HiImTheBard, MSGBOX_YESNO
+	compare RESULT, YES
+	jumpeq yes_hear_song
+	compare RESULT, NO
+	jumpeq dont_hear_song
+	end
+
+yes_hear_song:
+	setvar 0x8004, 0
+	@ Give the player ear rape
+	special ScrSpecial_PlayBardSong
+	pause 60
+	special ScrSpecial_HasBardSongBeenChanged
+	compare RESULT, FALSE
+	@ Prompt new lyrics only if song hasn't been changed
+	jumpeq prompt_write_lyrics
+	msgbox gTextBard_OhWhatAMovingSong, 4
+	release
+	end
+
+dont_hear_song:
+	msgbox gTextBard_OhYouveLeftMe, 4
+	release
+	end
+
+prompt_write_lyrics:
+	msgbox gTextBard_SoHowDoYouLikeMySong, MSGBOX_YESNO
+	compare RESULT, YES
+	jumpeq write_lyrics
+	compare RESULT, NO
+	jumpeq dont_write_lyrics
+	end
+
+write_lyrics:
+	setvar 0x8004, 6
+	call MauvilleCity_PokemonCenter_1F_EventScript_1A00F3
+	lock
+	faceplayer
+	compare RESULT, NO
+	jumpeq dont_write_lyrics
+	msgbox gTextBard_ThankYouKindly, 4
+	setvar 0x8004, 1
+	@ Give the player ear rape again
+	special ScrSpecial_PlayBardSong
+	pause 60
+	msgbox gTextBard_WasThatHowYouWanted, MSGBOX_YESNO
+	compare RESULT, NO
+	jumpeq write_lyrics		@ Keep looping until player responds YES
+	special ScrSpecial_SaveBardSongLyrics
+	msgbox gTextBard_OkayThatsIt, 4
+	release
+	end
+
+dont_write_lyrics:
+	msgbox gTextBard_OhYouveLeftMe2, 4
+	release
+	end
+
+
+@-------------------------------------------------------------------------------
+@ Hipster
+@-------------------------------------------------------------------------------
+
+SpeakToHipster:
+	lock
+	faceplayer
+	setflag 2054
+	msgbox gTextHipster_TheyCallMeTheHipster, 4
+	special ScrSpecial_GetHipsterSpokenFlag
+	compare RESULT, FALSE
+	jumpeq hipster_first_time
+	msgbox gTextHipster_TaughtYouAlready, 4
+	release
+	end
+
+hipster_first_time:
+	special ScrSpecial_HipsterTeachWord
+	compare RESULT, TRUE		@ TRUE if player learned a new word
+	jumpeq teach_new_word
+	msgbox gTextHipster_YouAlreadyKnowALot, 4
+	release
+	end
+
+teach_new_word:
+	msgbox gTextHipster_HaveYouHeardAbout, 4
+	special ScrSpecial_SetHipsterSpokenFlag
+	release
+	end
+
+
+@-------------------------------------------------------------------------------
+@ Trader
+@-------------------------------------------------------------------------------
+
+	.include "data/text/trader.inc"
+
+SpeakToTrader:
+	lock
+	faceplayer
+	msgbox gTextTrader_Introduction, MSGBOX_YESNO
+	compare RESULT, NO
+	jumpeq dont_want_to_trade
+	special ScrSpecial_GetTraderTradedFlag
+	compare RESULT, TRUE
+	jumpeq already_traded
+	message gTextTrader_MenuPrompt
+	waittext
+	jump do_trader_menu_get
+	end
+
+dont_want_to_trade:
+	msgbox gTextTrader_FeelUnwanted1, 2
+	end
+
+already_traded:
+	msgbox gTextTrader_TradedAlready, 2
+	end
+
+do_trader_menu_get:
+	special ScrSpecial_TraderMenuGetDecoration
+	waitstate
+	compare 0x8004, 0
+	jumpeq cancelled_get_menu
+	compare 0x8004, 65535
+	jumpeq rare_item_cant_trade_away
+	msgbox gTextTrader_ItemOnceBelongedTo, MSGBOX_YESNO
+	compare RESULT, NO
+	jumpeq dont_want_item
+	special ScrSpecial_DoesPlayerHaveNoDecorations
+	compare RESULT, TRUE
+	jumpeq player_has_no_decorations
+	jump do_trader_menu_give
+	end
+
+cancelled_get_menu:
+	msgbox gTextTrader_DontWantAnything, 2
+	end
+
+rare_item_cant_trade_away:
+	message gTextTrader_ICantTradeThatOneAway
+	waittext
+	jump do_trader_menu_get
+	end
+
+dont_want_item:
+	message gTextTrader_MenuPrompt
+	waittext
+	jump do_trader_menu_get
+	end
+
+player_has_no_decorations:
+	msgbox gTextTrader_YouDontHaveDecorations, 2
+	end
+
+do_trader_menu_give:
+	msgbox gTextTrader_PickDecorationYoullTrade, 4
+	special ScrSpecial_TraderMenuGiveDecoration
+	waitstate
+	compare 0x8006, 0
+	jumpeq cancelled_give_menu
+	compare 0x8006, 65535
+	jumpeq decoration_is_in_use
+	special ScrSpecial_IsDecorationFull
+	compare RESULT, 1
+	jumpeq decorations_full
+	msgbox gTextTrader_SoWellTrade, MSGBOX_YESNO
+	compare RESULT, NO
+	jumpeq do_trader_menu_give
+	special ScrSpecial_TraderDoDecorationTrade
+	msgbox gTextTrader_ThenWellTrade, 2
+	end
+
+cancelled_give_menu:
+	msgbox gTextTrader_FeelUnwanted2, 2
+	end
+
+decoration_is_in_use:
+	msgbox gTextTrader_InUseYouCantTradeIt, 4
+	jump do_trader_menu_give
+	end
+
+decorations_full:
+	msgbox gTextTrader_NoRoomForThis, 2
+	end
+
+
+@-------------------------------------------------------------------------------
+@ Storyteller
+@-------------------------------------------------------------------------------
+
+	.include "data/text/storyteller.inc"
+
+SpeakToStoryteller:
+	setvar 0x8008, 0
+	setvar 0x8009, 0
+	setvar 0x800a, 0
+	setvar 0x800b, 0
+	lock
+	faceplayer
+	msgbox gTextStoryteller_Introduction, MSGBOX_YESNO
+	compare RESULT, NO
+	jumpeq dont_hear_story
+	specialval RESULT, ScrSpecial_StorytellerGetFreeStorySlot
+	compare RESULT, 0		@ If slot is 0, then the list is empty
+	jumpeq no_stories_recorded
+choose_story:
+	message gTextStoryteller_WhichTale
+	waittext
+	special ScrSpecial_StorytellerStoryListMenu
+	waitstate
+	compare RESULT, FALSE
+	jumpeq cancel_story_menu
+	setvar 0x8008, 1
+	special ScrSpecial_StorytellerDisplayStory
+	waittext
+	waitbutton
+	specialval RESULT, ScrSpecial_StorytellerUpdateStat
+	compare RESULT, FALSE
+	jumpeq no_stat_update
+	jump stat_update
+cancel_story_menu:
+	compare 0x8008, 0
+	jumpeq dont_hear_story
+	jump yes_hear_story
+no_stat_update:
+	msgbox gTextStoryteller_CouldThereBeOtherTrainers, 4
+	msgbox gTextStoryteller_HearAnotherLegendaryTale, MSGBOX_YESNO
+	compare RESULT, YES
+	jumpeq choose_story
+yes_hear_story:
+	specialval RESULT, ScrSpecial_HasStorytellerAlreadyRecorded
+	compare RESULT, TRUE
+	jumpeq cant_record_story		@ already recorded story
+	specialval RESULT, ScrSpecial_StorytellerGetFreeStorySlot
+	compare RESULT, 4
+	jumpeq cant_record_story		@ story list is full
+	jump prompt_record_story
+no_stories_recorded:
+	msgbox gTextStoryteller_ButIKnowOfNoLegendaryTrainers, 4
+prompt_record_story:
+	msgbox gTextStoryteller_HaveYouAnyTales, MSGBOX_YESNO
+	compare RESULT, NO
+	jumpeq dont_hear_story
+	specialval RESULT, ScrSpecial_StorytellerInitializeRandomStat
+	compare RESULT, TRUE
+	jumpeq stat_update
+	msgbox gTextStoryteller_ImNotSatisfied, 4
+	closebutton
+	release
+	end
+
+stat_update:
+	msgbox gTextStoryteller_BirthOfANewLegend, 4
+	closebutton
+	release
+	end
+
+dont_hear_story:
+	msgbox gTextStoryteller_OhIFeelStifled, 4
+	closebutton
+	release
+	end
+
+cant_record_story:
+	msgbox gTextStoryteller_WishMorePeopleWould, 4
+	closebutton
+	release
+	end
+
+
+@-------------------------------------------------------------------------------
+@ Giddy
+@-------------------------------------------------------------------------------
+
+	.include "data/text/giddy.inc"
+
+SpeakToGiddy:
+	lock
+	faceplayer
+	msgbox gTextGiddy_Introduction, MSGBOX_YESNO
+	compare RESULT, YES
+	jumpeq yes_hear_giddy
+	compare RESULT, NO
+	jumpeq dont_hear_giddy
+	end
+
+yes_hear_giddy:
+	special ScrSpecial_GiddyShouldTellAnotherTale
+	compare RESULT, TRUE
+	jumpeq tell_giddy_tale
+	compare RESULT, FALSE
+	jumpeq bye_bye
+	end
+
+tell_another_giddy_tale:
+	special ScrSpecial_GiddyShouldTellAnotherTale
+	compare RESULT, TRUE
+	jumpeq also_i_was_thinking
+	compare RESULT, FALSE
+	jumpeq bye_bye
+	end
+
+also_i_was_thinking:
+	msgbox gTextGiddy_AlsoIWasThinking, 4
+	jump tell_giddy_tale
+	end
+
+tell_giddy_tale:
+	special ScrSpecial_GenerateGiddyLine
+	special ShowFieldMessageStringVar4
+	waittext
+	yesnobox 20, 8
+	compare RESULT, 1
+	jumpeq tell_another_giddy_tale
+	compare RESULT, 0
+	jumpeq tell_another_giddy_tale
+	end
+
+dont_hear_giddy:
+	msgbox gTextGiddy_YouveDeflatedMe, 4
+	release
+	end
+
+bye_bye:
+	msgbox gTextGiddy_ByeBye, 4
+	release
+	end
+
+	.include "data/text/bard.inc"
+	.include "data/text/hipster.inc"
diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc
index ca4b2bdb9..e9f379b24 100644
--- a/data/scripts/players_house.inc
+++ b/data/scripts/players_house.inc
@@ -107,7 +107,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1B6A61:: @ 81B6A61
 LittlerootTown_BrendansHouse_2F_EventScript_1B6A91:: @ 81B6A91
 	inccounter GAME_STAT_CHECKED_CLOCK
 	fadescreen 1
-	special sub_810D6B8
+	special ScrSpecial_ViewWallClock
 	waitstate
 	releaseall
 	end
diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc
index e1add8734..852acd292 100644
--- a/data/scripts/pokeblocks.inc
+++ b/data/scripts/pokeblocks.inc
@@ -235,7 +235,7 @@ FallarborTown_ContestLobby_EventScript_1B7897:: @ 81B7897
 	end
 
 FallarborTown_ContestLobby_EventScript_1B78A1:: @ 81B78A1
-	call FallarborTown_ContestLobby_EventScript_19F806
+	call S_DoSaveDialog
 	compare RESULT, 0
 	jumpeq FallarborTown_ContestLobby_EventScript_1B7936
 	message FallarborTown_ContestLobby_Text_1B7304
diff --git a/data/scripts/storyteller.inc b/data/scripts/storyteller.inc
deleted file mode 100644
index eba94e698..000000000
--- a/data/scripts/storyteller.inc
+++ /dev/null
@@ -1,82 +0,0 @@
-MauvilleCity_PokemonCenter_1F_EventScript_1B0816:: @ 81B0816
-	setvar 0x8008, 0
-	setvar 0x8009, 0
-	setvar 0x800a, 0
-	setvar 0x800b, 0
-	lock
-	faceplayer
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1AECC6, 5
-	compare RESULT, 0
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0914
-	specialval RESULT, sub_80F889C
-	compare RESULT, 0
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B08D3
-
-MauvilleCity_PokemonCenter_1F_EventScript_1B084F:: @ 81B084F
-	message MauvilleCity_PokemonCenter_1F_Text_1AED35
-	waittext
-	special sub_80F8874
-	waitstate
-	compare RESULT, 0
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0883
-	setvar 0x8008, 1
-	special sub_80F8888
-	waittext
-	waitbutton
-	specialval RESULT, sub_80F88AC
-	compare RESULT, 0
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0893
-	jump MauvilleCity_PokemonCenter_1F_EventScript_1B0909
-
-MauvilleCity_PokemonCenter_1F_EventScript_1B0883:: @ 81B0883
-	compare 0x8008, 0
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0914
-	jump MauvilleCity_PokemonCenter_1F_EventScript_1B08AE
-
-MauvilleCity_PokemonCenter_1F_EventScript_1B0893:: @ 81B0893
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1AEE50, 4
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1AEF0A, 5
-	compare RESULT, 1
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B084F
-
-MauvilleCity_PokemonCenter_1F_EventScript_1B08AE:: @ 81B08AE
-	specialval RESULT, sub_80F88E0
-	compare RESULT, 1
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B091F
-	specialval RESULT, sub_80F889C
-	compare RESULT, 4
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B091F
-	jump MauvilleCity_PokemonCenter_1F_EventScript_1B08DB
-
-MauvilleCity_PokemonCenter_1F_EventScript_1B08D3:: @ 81B08D3
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1AED70, 4
-
-MauvilleCity_PokemonCenter_1F_EventScript_1B08DB:: @ 81B08DB
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1AEEB4, 5
-	compare RESULT, 0
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0914
-	specialval RESULT, sub_80F88FC
-	compare RESULT, 1
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0909
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1AEF49, 4
-	closebutton
-	release
-	end
-
-MauvilleCity_PokemonCenter_1F_EventScript_1B0909:: @ 81B0909
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1AEDE8, 4
-	closebutton
-	release
-	end
-
-MauvilleCity_PokemonCenter_1F_EventScript_1B0914:: @ 81B0914
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1AED1D, 4
-	closebutton
-	release
-	end
-
-MauvilleCity_PokemonCenter_1F_EventScript_1B091F:: @ 81B091F
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1AEFA5, 4
-	closebutton
-	release
-	end
diff --git a/data/scripts/trader.inc b/data/scripts/trader.inc
deleted file mode 100644
index b52c8a2dc..000000000
--- a/data/scripts/trader.inc
+++ /dev/null
@@ -1,88 +0,0 @@
-MauvilleCity_PokemonCenter_1F_EventScript_1AEBAB:: @ 81AEBAB
-	lock
-	faceplayer
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1AE88F, 5
-	compare RESULT, 0
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEBDA
-	special sub_8109C44
-	compare RESULT, 1
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEBE3
-	message MauvilleCity_PokemonCenter_1F_Text_1AE910
-	waittext
-	jump MauvilleCity_PokemonCenter_1F_EventScript_1AEBEC
-	end
-
-MauvilleCity_PokemonCenter_1F_EventScript_1AEBDA:: @ 81AEBDA
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1AE8C6, 2
-	end
-
-MauvilleCity_PokemonCenter_1F_EventScript_1AEBE3:: @ 81AEBE3
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1AE8DF, 2
-	end
-
-MauvilleCity_PokemonCenter_1F_EventScript_1AEBEC:: @ 81AEBEC
-	special sub_8109E34
-	waitstate
-	compare 0x8004, 0
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEC2D
-	compare 0x8004, 65535
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEC36
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1AE97C, 5
-	compare RESULT, 0
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEC42
-	special sub_8109C58
-	compare RESULT, 1
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEC4E
-	jump MauvilleCity_PokemonCenter_1F_EventScript_1AEC57
-	end
-
-MauvilleCity_PokemonCenter_1F_EventScript_1AEC2D:: @ 81AEC2D
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1AE950, 2
-	end
-
-MauvilleCity_PokemonCenter_1F_EventScript_1AEC36:: @ 81AEC36
-	message MauvilleCity_PokemonCenter_1F_Text_1AEB31
-	waittext
-	jump MauvilleCity_PokemonCenter_1F_EventScript_1AEBEC
-	end
-
-MauvilleCity_PokemonCenter_1F_EventScript_1AEC42:: @ 81AEC42
-	message MauvilleCity_PokemonCenter_1F_Text_1AE910
-	waittext
-	jump MauvilleCity_PokemonCenter_1F_EventScript_1AEBEC
-	end
-
-MauvilleCity_PokemonCenter_1F_EventScript_1AEC4E:: @ 81AEC4E
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1AE9B6, 2
-	end
-
-MauvilleCity_PokemonCenter_1F_EventScript_1AEC57:: @ 81AEC57
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1AE9F8, 4
-	special sub_8109CF0
-	waitstate
-	compare 0x8006, 0
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AECA6
-	compare 0x8006, 65535
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AECAF
-	special sub_8109C90
-	compare RESULT, 1
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AECBD
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1AEA9B, 5
-	compare RESULT, 0
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEC57
-	special sub_8109DE0
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1AEAFB, 2
-	end
-
-MauvilleCity_PokemonCenter_1F_EventScript_1AECA6:: @ 81AECA6
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1AEA2B, 2
-	end
-
-MauvilleCity_PokemonCenter_1F_EventScript_1AECAF:: @ 81AECAF
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1AEAC3, 4
-	jump MauvilleCity_PokemonCenter_1F_EventScript_1AEC57
-	end
-
-MauvilleCity_PokemonCenter_1F_EventScript_1AECBD:: @ 81AECBD
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1AEA57, 2
-	end