summaryrefslogtreecommitdiff
path: root/maps
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2018-01-24 11:17:05 -0500
committerRangi <remy.oukaour+rangi42@gmail.com>2018-01-24 11:17:05 -0500
commitd719d318e8b2de51e818485423ac878d20dd295a (patch)
treed351a653914ee5dab13947b21a16552719c2a8c9 /maps
parent132fe4692581891802c38420bdd4744d58bf78d5 (diff)
Remove Special_ prefix from special routines (close #478)
Diffstat (limited to 'maps')
-rw-r--r--maps/AzaleaTown.asm4
-rw-r--r--maps/BattleTower1F.asm64
-rw-r--r--maps/BattleTowerBattleRoom.asm38
-rw-r--r--maps/BattleTowerElevator.asm2
-rw-r--r--maps/BillsHouse.asm12
-rw-r--r--maps/BluesHouse.asm8
-rw-r--r--maps/BurnedTower1F.asm4
-rw-r--r--maps/BurnedTowerB1F.asm2
-rw-r--r--maps/CeladonDeptStore6F.asm2
-rw-r--r--maps/CeladonGameCorner.asm8
-rw-r--r--maps/CeladonGameCornerPrizeRoom.asm10
-rw-r--r--maps/CeladonMansion3F.asm4
-rw-r--r--maps/CeladonPokecenter1F.asm4
-rw-r--r--maps/CeruleanPokecenter1F.asm2
-rw-r--r--maps/CherrygroveCity.asm2
-rw-r--r--maps/CianwoodCity.asm2
-rw-r--r--maps/CianwoodPhotoStudio.asm2
-rw-r--r--maps/Colosseum.asm4
-rw-r--r--maps/CopycatsHouse2F.asm10
-rw-r--r--maps/DayCare.asm6
-rw-r--r--maps/DragonShrine.asm4
-rw-r--r--maps/DragonsDenB1F.asm2
-rw-r--r--maps/EcruteakGym.asm2
-rw-r--r--maps/EcruteakPokecenter1F.asm2
-rw-r--r--maps/ElmsLab.asm14
-rw-r--r--maps/FastShip1F.asm4
-rw-r--r--maps/FastShipCabins_SE_SSE_CaptainsCabin.asm4
-rw-r--r--maps/FastShipCabins_SW_SSW_NW.asm8
-rw-r--r--maps/FuchsiaGym.asm10
-rw-r--r--maps/FuchsiaPokecenter1F.asm4
-rw-r--r--maps/GoldenrodCity.asm10
-rw-r--r--maps/GoldenrodDeptStore5F.asm6
-rw-r--r--maps/GoldenrodDeptStore6F.asm2
-rw-r--r--maps/GoldenrodGameCorner.asm16
-rw-r--r--maps/GoldenrodHappinessRater.asm2
-rw-r--r--maps/GoldenrodMagnetTrainStation.asm2
-rw-r--r--maps/GoldenrodNameRater.asm2
-rw-r--r--maps/GoldenrodPokecenter1F.asm4
-rw-r--r--maps/GoldenrodUnderground.asm26
-rw-r--r--maps/GoldenrodUndergroundSwitchRoomEntrances.asm4
-rw-r--r--maps/HallOfFame.asm2
-rw-r--r--maps/IlexForest.asm6
-rw-r--r--maps/IndigoPlateauPokecenter1F.asm6
-rw-r--r--maps/KurtsHouse.asm6
-rw-r--r--maps/LakeOfRage.asm2
-rw-r--r--maps/LakeOfRageMagikarpHouse.asm4
-rw-r--r--maps/LancesRoom.asm6
-rw-r--r--maps/LavenderNameRater.asm2
-rw-r--r--maps/MahoganyTown.asm4
-rw-r--r--maps/ManiasHouse.asm4
-rw-r--r--maps/MobileBattleRoom.asm18
-rw-r--r--maps/MobileTradeRoomMobile.asm4
-rw-r--r--maps/MountMoon.asm2
-rw-r--r--maps/MoveDeletersHouse.asm2
-rw-r--r--maps/MrPokemonsHouse.asm6
-rw-r--r--maps/OaksLab.asm2
-rw-r--r--maps/OlivineCity.asm8
-rw-r--r--maps/OlivineLighthouse6F.asm14
-rw-r--r--maps/OlivinePort.asm2
-rw-r--r--maps/PlayersHouse1F.asm8
-rw-r--r--maps/PlayersHouse2F.asm6
-rw-r--r--maps/PokeSeersHouse.asm2
-rw-r--r--maps/Pokecenter2F.asm104
-rw-r--r--maps/RadioTower1F.asm8
-rw-r--r--maps/RadioTower2F.asm12
-rw-r--r--maps/RadioTower5F.asm4
-rw-r--r--maps/Route24.asm6
-rw-r--r--maps/Route26HealHouse.asm6
-rw-r--r--maps/Route27SandstormHouse.asm2
-rw-r--r--maps/Route34.asm6
-rw-r--r--maps/Route35NationalParkGate.asm14
-rw-r--r--maps/Route36.asm4
-rw-r--r--maps/Route36NationalParkGate.asm18
-rw-r--r--maps/Route39Barn.asm2
-rw-r--r--maps/Route39Farmhouse.asm4
-rw-r--r--maps/Route40.asm2
-rw-r--r--maps/Route45.asm4
-rw-r--r--maps/RuinsOfAlphAerodactylChamber.asm6
-rw-r--r--maps/RuinsOfAlphHoOhChamber.asm8
-rw-r--r--maps/RuinsOfAlphKabutoChamber.asm6
-rw-r--r--maps/RuinsOfAlphOmanyteChamber.asm8
-rw-r--r--maps/RuinsOfAlphResearchCenter.asm2
-rw-r--r--maps/SaffronMagnetTrainStation.asm2
-rw-r--r--maps/SaffronPokecenter1F.asm2
-rw-r--r--maps/SilverCaveRoom3.asm8
-rw-r--r--maps/SlowpokeWellB1F.asm6
-rw-r--r--maps/SproutTower3F.asm6
-rw-r--r--maps/TeamRocketBaseB1F.asm12
-rw-r--r--maps/TeamRocketBaseB2F.asm10
-rw-r--r--maps/TeamRocketBaseB3F.asm2
-rw-r--r--maps/TimeCapsule.asm4
-rw-r--r--maps/TinTower1F.asm12
-rw-r--r--maps/TradeCenter.asm4
-rw-r--r--maps/TrainerHouseB1F.asm4
-rw-r--r--maps/VermilionCity.asm2
-rw-r--r--maps/VermilionPort.asm2
-rw-r--r--maps/VictoryRoad.asm4
97 files changed, 370 insertions, 370 deletions
diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm
index 83a29e7ad..b3a3fc61d 100644
--- a/maps/AzaleaTown.asm
+++ b/maps/AzaleaTown.asm
@@ -40,7 +40,7 @@ AzaleaTownRivalBattleScene1:
moveobject AZALEATOWN_SILVER, 11, 11
spriteface PLAYER, RIGHT
showemote EMOTE_SHOCK, PLAYER, 15
- special Special_FadeOutMusic
+ special FadeOutMusic
pause 15
appear AZALEATOWN_SILVER
applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleApproachMovement1
@@ -50,7 +50,7 @@ AzaleaTownRivalBattleScene1:
AzaleaTownRivalBattleScene2:
spriteface PLAYER, RIGHT
showemote EMOTE_SHOCK, PLAYER, 15
- special Special_FadeOutMusic
+ special FadeOutMusic
pause 15
appear AZALEATOWN_SILVER
applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleApproachMovement2
diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm
index b7113f347..79b75ee08 100644
--- a/maps/BattleTower1F.asm
+++ b/maps/BattleTower1F.asm
@@ -16,10 +16,10 @@ BattleTower1F_MapScripts:
.Scene0:
writebyte BATTLETOWERACTION_CHECKSAVEFILEISYOURS
- special Special_BattleTowerAction
+ special BattleTowerAction
iffalse .SkipEverything
writebyte BATTLETOWERACTION_GET_CHALLENGE_STATE ; copybytetovar sBattleTowerChallengeState
- special Special_BattleTowerAction
+ special BattleTowerAction
if_equal $0, .SkipEverything
if_equal $2, .priorityjump1
if_equal $3, .SkipEverything
@@ -34,9 +34,9 @@ BattleTower1F_MapScripts:
.priorityjump1
priorityjump BattleTower_LeftWithoutSaving
writebyte BATTLETOWERACTION_CHALLENGECANCELED
- special Special_BattleTowerAction
+ special BattleTowerAction
writebyte BATTLETOWERACTION_06
- special Special_BattleTowerAction
+ special BattleTowerAction
.SkipEverything:
setscene 1
.Scene1:
@@ -55,54 +55,54 @@ UnknownScript_0x9e3e0:
ReceptionistScript_0x9e3e2:
writebyte BATTLETOWERACTION_GET_CHALLENGE_STATE ; copybytetovar sBattleTowerChallengeState
- special Special_BattleTowerAction
+ special BattleTowerAction
if_equal $3, Script_BeatenAllTrainers2 ; maps/BattleTowerBattleRoom.asm
opentext
writetext Text_BattleTowerWelcomesYou
buttonsound
writebyte BATTLETOWERACTION_CHECK_EXPLANATION_READ ; if new save file: bit 1, [sBattleTowerSaveFileFlags]
- special Special_BattleTowerAction
+ special BattleTowerAction
if_not_equal $0, Script_Menu_ChallengeExplanationCancel
jump Script_BattleTowerIntroductionYesNo
Script_Menu_ChallengeExplanationCancel: ; 0x9e3fc
writetext Text_WantToGoIntoABattleRoom
writebyte TRUE
- special Special_Menu_ChallengeExplanationCancel
+ special Menu_ChallengeExplanationCancel
if_equal 1, Script_ChooseChallenge
if_equal 2, Script_BattleTowerExplanation
jump Script_BattleTowerHopeToServeYouAgain
Script_ChooseChallenge: ; 0x9e40f
writebyte BATTLETOWERACTION_RESETDATA ; ResetBattleTowerTrainerSRAM
- special Special_BattleTowerAction
- special Special_CheckForBattleTowerRules
+ special BattleTowerAction
+ special CheckForBattleTowerRules
if_not_equal FALSE, Script_WaitButton
writetext Text_SaveBeforeEnteringBattleRoom
yesorno
iffalse Script_Menu_ChallengeExplanationCancel
setscene 0
- special Special_TryQuickSave
+ special TryQuickSave
iffalse Script_Menu_ChallengeExplanationCancel
setscene 1
writebyte BATTLETOWERACTION_SET_EXPLANATION_READ ; set 1, [sBattleTowerSaveFileFlags]
- special Special_BattleTowerAction
- special Special_BattleTowerRoomMenu
+ special BattleTowerAction
+ special BattleTowerRoomMenu
if_equal $a, Script_Menu_ChallengeExplanationCancel
if_not_equal $0, Script_MobileError
writebyte BATTLETOWERACTION_11
- special Special_BattleTowerAction
+ special BattleTowerAction
writetext Text_RightThisWayToYourBattleRoom
waitbutton
closetext
writebyte BATTLETOWERACTION_CHOOSEREWARD
- special Special_BattleTowerAction
+ special BattleTowerAction
jump Script_WalkToBattleTowerElevator
Script_ResumeBattleTowerChallenge:
closetext
writebyte BATTLETOWERACTION_LOADLEVELGROUP ; load choice of level group
- special Special_BattleTowerAction
+ special BattleTowerAction
Script_WalkToBattleTowerElevator:
musicfadeout MUSIC_NONE, 8
setmapscene BATTLE_TOWER_BATTLE_ROOM, 0
@@ -111,7 +111,7 @@ Script_WalkToBattleTowerElevator:
follow BATTLETOWER1F_RECEPTIONIST, PLAYER
applymovement BATTLETOWER1F_RECEPTIONIST, MovementData_BattleTower1FWalkToElevator
writebyte BATTLETOWERACTION_0A
- special Special_BattleTowerAction
+ special BattleTowerAction
warpsound
disappear BATTLETOWER1F_RECEPTIONIST
stopfollow
@@ -121,15 +121,15 @@ Script_WalkToBattleTowerElevator:
Script_GivePlayerHisPrize: ; 0x9e47a
writebyte BATTLETOWERACTION_1C
- special Special_BattleTowerAction
+ special BattleTowerAction
writebyte BATTLETOWERACTION_GIVEREWARD
- special Special_BattleTowerAction
+ special BattleTowerAction
if_equal POTION, Script_YourPackIsStuffedFull
itemtotext USE_SCRIPT_VAR, MEM_BUFFER_1
giveitem ITEM_FROM_MEM, 5
writetext Text_PlayerGotFive
writebyte BATTLETOWERACTION_1D
- special Special_BattleTowerAction
+ special BattleTowerAction
closetext
end
@@ -147,7 +147,7 @@ Script_BattleTowerExplanation: ; 0x9e4a5
writetext Text_BattleTowerIntroduction_2
Script_BattleTowerSkipExplanation:
writebyte BATTLETOWERACTION_SET_EXPLANATION_READ
- special Special_BattleTowerAction
+ special BattleTowerAction
jump Script_Menu_ChallengeExplanationCancel
Script_BattleTowerHopeToServeYouAgain:
@@ -157,7 +157,7 @@ Script_BattleTowerHopeToServeYouAgain:
end
UnreferencedScript_0x9e4b6:
- special Special_BattleTowerMobileError
+ special BattleTowerMobileError
closetext
end
@@ -170,11 +170,11 @@ UnreferencedScript_0x9e4be:
writetext Text_SaveBeforeEnteringBattleRoom
yesorno
iffalse Script_Menu_ChallengeExplanationCancel
- special Special_TryQuickSave
+ special TryQuickSave
iffalse Script_Menu_ChallengeExplanationCancel
writebyte BATTLETOWERACTION_SET_EXPLANATION_READ
- special Special_BattleTowerAction
- special Special_Function1700ba
+ special BattleTowerAction
+ special Function1700ba
if_equal $a, Script_Menu_ChallengeExplanationCancel
if_not_equal $0, Script_MobileError
writetext Text_ReceivedAListOfLeadersOnTheHonorRoll
@@ -187,15 +187,15 @@ UnreferencedScript_0x9e4be:
UnreferencedScript_0x9e4ea:
writebyte BATTLETOWERACTION_LEVEL_CHECK
- special Special_BattleTowerAction
+ special BattleTowerAction
if_not_equal $0, Script_APkmnLevelExceeds
writebyte BATTLETOWERACTION_UBERS_CHECK
- special Special_BattleTowerAction
+ special BattleTowerAction
if_not_equal $0, Script_MayNotEnterABattleRoomUnderL70
- special Special_CheckForBattleTowerRules
+ special CheckForBattleTowerRules
if_not_equal FALSE, Script_WaitButton
writebyte BATTLETOWERACTION_05
- special Special_BattleTowerAction
+ special BattleTowerAction
if_equal $0, .zero
writetext Text_CantBeRegistered_PreviousRecordDeleted
jump continue
@@ -209,13 +209,13 @@ continue:
yesorno
iffalse Script_Menu_ChallengeExplanationCancel
setscene 0
- special Special_TryQuickSave
+ special TryQuickSave
iffalse Script_Menu_ChallengeExplanationCancel
setscene 1
writebyte BATTLETOWERACTION_06
- special Special_BattleTowerAction
+ special BattleTowerAction
writebyte BATTLETOWERACTION_12
- special Special_BattleTowerAction
+ special BattleTowerAction
writetext Text_RightThisWayToYourBattleRoom
waitbutton
jump Script_ResumeBattleTowerChallenge
@@ -236,7 +236,7 @@ Script_MayNotEnterABattleRoomUnderL70: ; 0x9e549
jump Script_Menu_ChallengeExplanationCancel
Script_MobileError:
- special Special_BattleTowerMobileError
+ special BattleTowerMobileError
closetext
end
diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm
index dd8e08e0f..849eac967 100644
--- a/maps/BattleTowerBattleRoom.asm
+++ b/maps/BattleTowerBattleRoom.asm
@@ -23,7 +23,7 @@ Script_BattleRoom: ; 0x9f421
; beat all 7 opponents in a row
Script_BattleRoomLoop: ; 0x9f425
writebyte BATTLETOWERBATTLEROOM_YOUNGSTER
- special Special_LoadOpponentTrainerAndPokemonWithOTSprite
+ special LoadOpponentTrainerAndPokemonWithOTSprite
appear BATTLETOWERBATTLEROOM_YOUNGSTER
warpsound
waitsfx
@@ -32,8 +32,8 @@ Script_BattleRoomLoop: ; 0x9f425
battletowertext BATTLETOWERTEXT_INTRO
buttonsound
closetext
- special Special_BattleTowerBattle ; calls predef startbattle
- special Special_FadeOutPalettes
+ special BattleTowerBattle ; calls predef startbattle
+ special FadeOutPalettes
reloadmap
if_not_equal $0, Script_FailedBattleTowerChallenge
copybytetovar wNrOfBeatenBattleTowerTrainers ; wcf64
@@ -48,10 +48,10 @@ Script_BattleRoomLoop: ; 0x9f425
waitbutton
closetext
playmusic MUSIC_HEAL
- special Special_FadeOutPalettes
- special Special_LoadMapPalettes
+ special FadeOutPalettes
+ special LoadMapPalettes
pause 60
- special Special_FadeInPalettes
+ special FadeInPalettes
special RestartMapMusic
opentext
writetext Text_NextUpOpponentNo
@@ -68,35 +68,35 @@ Script_DontBattleNextOpponent: ; 0x9f483
yesorno
iffalse Script_DontSaveAndEndTheSession
writebyte BATTLETOWERACTION_SAVELEVELGROUP ; save level group
- special Special_BattleTowerAction
+ special BattleTowerAction
writebyte BATTLETOWERACTION_SAVEOPTIONS ; choose reward
- special Special_BattleTowerAction
+ special BattleTowerAction
writebyte BATTLETOWERACTION_SAVE_AND_QUIT ; quicksave
- special Special_BattleTowerAction
+ special BattleTowerAction
playsound SFX_SAVE
waitsfx
- special Special_FadeOutPalettes
+ special FadeOutPalettes
special Reset
Script_DontSaveAndEndTheSession: ; 0x9f4a3
writetext Text_CancelYourBattleRoomChallenge
yesorno
iffalse Script_ContinueAndBattleNextOpponent
writebyte BATTLETOWERACTION_CHALLENGECANCELED
- special Special_BattleTowerAction
+ special BattleTowerAction
writebyte BATTLETOWERACTION_06
- special Special_BattleTowerAction
+ special BattleTowerAction
closetext
- special Special_FadeOutPalettes
+ special FadeOutPalettes
warpfacing UP, BATTLE_TOWER_1F, 7, 7
opentext
jump Script_BattleTowerHopeToServeYouAgain
Script_FailedBattleTowerChallenge:
pause 60
- special Special_BattleTowerFade
+ special BattleTowerFade
warpfacing UP, BATTLE_TOWER_1F, 7, 7
writebyte BATTLETOWERACTION_CHALLENGECANCELED
- special Special_BattleTowerAction
+ special BattleTowerAction
opentext
writetext Text_ThanksForVisiting
waitbutton
@@ -105,7 +105,7 @@ Script_FailedBattleTowerChallenge:
Script_BeatenAllTrainers: ; 0x9f4d9
pause 60
- special Special_BattleTowerFade
+ special BattleTowerFade
warpfacing UP, BATTLE_TOWER_1F, 7, 7
Script_BeatenAllTrainers2:
opentext
@@ -114,7 +114,7 @@ Script_BeatenAllTrainers2:
UnreferencedScript_0x9f4eb:
writebyte BATTLETOWERACTION_CHALLENGECANCELED
- special Special_BattleTowerAction
+ special BattleTowerAction
opentext
writetext Text_TooMuchTimeElapsedNoRegister
waitbutton
@@ -123,9 +123,9 @@ UnreferencedScript_0x9f4eb:
UnreferencedScript_0x9f4f7:
writebyte BATTLETOWERACTION_CHALLENGECANCELED
- special Special_BattleTowerAction
+ special BattleTowerAction
writebyte BATTLETOWERACTION_06
- special Special_BattleTowerAction
+ special BattleTowerAction
opentext
writetext Text_ThanksForVisiting
writetext Text_WeHopeToServeYouAgain
diff --git a/maps/BattleTowerElevator.asm b/maps/BattleTowerElevator.asm
index f9f32dfae..a10ad1552 100644
--- a/maps/BattleTowerElevator.asm
+++ b/maps/BattleTowerElevator.asm
@@ -22,7 +22,7 @@ BattleTowerElevator_MapScripts:
applymovement BATTLETOWERELEVATOR_RECEPTIONIST, MovementData_BattleTowerElevatorReceptionistWalksIn
applymovement PLAYER, MovementData_BattleTowerElevatorPlayerWalksIn
writebyte BATTLETOWERACTION_0A
- special Special_BattleTowerAction
+ special BattleTowerAction
playsound SFX_ELEVATOR
earthquake 60
waitsfx
diff --git a/maps/BillsHouse.asm b/maps/BillsHouse.asm
index 9c64ff04b..a13156484 100644
--- a/maps/BillsHouse.asm
+++ b/maps/BillsHouse.asm
@@ -37,7 +37,7 @@ BillsGrandpa:
yesorno
iffalse .SaidNo
scall .ExcitedToSee
- special Special_BillsGrandfather
+ special BillsGrandfather
iffalse .SaidNo
if_not_equal LICKITUNG, .WrongPokemon
scall .CorrectPokemon
@@ -51,7 +51,7 @@ BillsGrandpa:
yesorno
iffalse .SaidNo
scall .ExcitedToSee
- special Special_BillsGrandfather
+ special BillsGrandfather
iffalse .SaidNo
if_not_equal ODDISH, .WrongPokemon
scall .CorrectPokemon
@@ -65,7 +65,7 @@ BillsGrandpa:
yesorno
iffalse .SaidNo
scall .ExcitedToSee
- special Special_BillsGrandfather
+ special BillsGrandfather
iffalse .SaidNo
if_not_equal STARYU, .WrongPokemon
scall .CorrectPokemon
@@ -81,7 +81,7 @@ BillsGrandpa:
yesorno
iffalse .SaidNo
scall .ExcitedToSee
- special Special_BillsGrandfather
+ special BillsGrandfather
iffalse .SaidNo
if_not_equal GROWLITHE, .WrongPokemon
scall .CorrectPokemon
@@ -95,7 +95,7 @@ BillsGrandpa:
yesorno
iffalse .SaidNo
scall .ExcitedToSee
- special Special_BillsGrandfather
+ special BillsGrandfather
iffalse .SaidNo
if_not_equal VULPIX, .WrongPokemon
scall .CorrectPokemon
@@ -109,7 +109,7 @@ BillsGrandpa:
yesorno
iffalse .SaidNo
scall .ExcitedToSee
- special Special_BillsGrandfather
+ special BillsGrandfather
iffalse .SaidNo
if_not_equal PICHU, .WrongPokemon
scall .CorrectPokemon
diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm
index 33510e154..3c4889c0c 100644
--- a/maps/BluesHouse.asm
+++ b/maps/BluesHouse.asm
@@ -26,21 +26,21 @@ DaisyScript:
iffalse .Refused
writetext DaisyWhichMonText
waitbutton
- special Special_DaisysGrooming
+ special DaisysGrooming
if_equal $0, .Refused
if_equal $1, .CantGroomEgg
setflag ENGINE_DAISYS_GROOMING
writetext DaisyAlrightText
waitbutton
closetext
- special Special_FadeOutPalettes
+ special FadeOutPalettes
playmusic MUSIC_HEAL
pause 60
- special Special_FadeInPalettes
+ special FadeInPalettes
special RestartMapMusic
opentext
writetext GroomedMonLooksContentText
- special Special_PlayCurMonCry
+ special PlayCurMonCry
buttonsound
writetext DaisyAllDoneText
waitbutton
diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm
index 71b3c1caa..25f517e00 100644
--- a/maps/BurnedTower1F.asm
+++ b/maps/BurnedTower1F.asm
@@ -51,7 +51,7 @@ BurnedTower1F_MapScripts:
BurnedTowerRivalBattleScript:
showemote EMOTE_SHOCK, BURNEDTOWER1F_SILVER, 15
- special Special_FadeOutMusic
+ special FadeOutMusic
pause 15
spriteface BURNEDTOWER1F_SILVER, RIGHT
pause 15
@@ -100,7 +100,7 @@ BurnedTowerRivalBattleScript:
closetext
setscene 2
setevent EVENT_RIVAL_BURNED_TOWER
- special Special_FadeOutMusic
+ special FadeOutMusic
pause 15
earthquake 50
showemote EMOTE_SHOCK, PLAYER, 15
diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm
index 3ad1d60f4..484c6f1cd 100644
--- a/maps/BurnedTowerB1F.asm
+++ b/maps/BurnedTowerB1F.asm
@@ -83,7 +83,7 @@ ReleaseTheBeasts:
special RestartMapMusic
setscene 1
setevent EVENT_RELEASED_THE_BEASTS
- special Special_InitRoamMons
+ special InitRoamMons
setmapscene ECRUTEAK_GYM, 1
setmapscene CIANWOOD_CITY, 1
clearevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm
index 188f977bb..87d380a6a 100644
--- a/maps/CeladonDeptStore6F.asm
+++ b/maps/CeladonDeptStore6F.asm
@@ -24,7 +24,7 @@ CeladonDeptStore6FVendingMachine:
opentext
writetext CeladonVendingText
.Start:
- special Special_PlaceMoneyTopRight
+ special PlaceMoneyTopRight
loadmenuheader .MenuHeader
verticalmenu
closewindow
diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm
index 5d3382f53..090ce4571 100644
--- a/maps/CeladonGameCorner.asm
+++ b/maps/CeladonGameCorner.asm
@@ -115,20 +115,20 @@ CeladonGameCornerLuckySlotMachineScript:
if_equal 0, CeladonGameCornerSlotMachineScript
refreshscreen
writebyte FALSE
- special Special_SlotMachine
+ special SlotMachine
closetext
end
CeladonGameCornerSlotMachineScript:
refreshscreen
writebyte TRUE
- special Special_SlotMachine
+ special SlotMachine
closetext
end
CeladonGameCornerCardFlipScript:
refreshscreen
- special Special_CardFlip
+ special CardFlip
closetext
end
@@ -139,7 +139,7 @@ MapCeladonGameCornerSignpost9Script:
opentext
writetext UnknownText_0x72567
waitbutton
- special Special_CardFlip
+ special CardFlip
closetext
end
diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm
index b8d3ce032..a4f2d85ee 100644
--- a/maps/CeladonGameCornerPrizeRoom.asm
+++ b/maps/CeladonGameCornerPrizeRoom.asm
@@ -24,7 +24,7 @@ CeladonGameCornerPrizeRoomTMVendor:
iffalse CeladonPrizeRoom_NoCoinCase
writetext CeladonPrizeRoom_AskWhichPrizeText
CeladonPrizeRoom_tmcounterloop:
- special Special_DisplayCoinCaseBalance
+ special DisplayCoinCaseBalance
loadmenuheader CeladonPrizeRoom_TMMenuHeader
verticalmenu
closewindow
@@ -125,7 +125,7 @@ CeladonGameCornerPrizeRoomPokemonVendor:
iffalse CeladonPrizeRoom_NoCoinCase
.loop
writetext CeladonPrizeRoom_AskWhichPrizeText
- special Special_DisplayCoinCaseBalance
+ special DisplayCoinCaseBalance
loadmenuheader .MenuHeader
verticalmenu
closewindow
@@ -147,7 +147,7 @@ CeladonGameCornerPrizeRoomPokemonVendor:
writetext CeladonPrizeRoom_HereYouGoText
waitbutton
writebyte PIKACHU
- special Special_GameCornerPrizeMonCheckDex
+ special GameCornerPrizeMonCheckDex
givepoke PIKACHU, 25
takecoins 2222
jump .loop
@@ -165,7 +165,7 @@ CeladonGameCornerPrizeRoomPokemonVendor:
writetext CeladonPrizeRoom_HereYouGoText
waitbutton
writebyte PORYGON
- special Special_GameCornerPrizeMonCheckDex
+ special GameCornerPrizeMonCheckDex
givepoke PORYGON, 15
takecoins 5555
jump .loop
@@ -183,7 +183,7 @@ CeladonGameCornerPrizeRoomPokemonVendor:
writetext CeladonPrizeRoom_HereYouGoText
waitbutton
writebyte LARVITAR
- special Special_GameCornerPrizeMonCheckDex
+ special GameCornerPrizeMonCheckDex
givepoke LARVITAR, 40
takecoins 8888
jump .loop
diff --git a/maps/CeladonMansion3F.asm b/maps/CeladonMansion3F.asm
index bb6bb2f3f..418948dc8 100644
--- a/maps/CeladonMansion3F.asm
+++ b/maps/CeladonMansion3F.asm
@@ -28,7 +28,7 @@ UnknownScript_0x7167e:
waitsfx
writetext UnknownText_0x71760
buttonsound
- special Special_Diploma
+ special Diploma
writetext UnknownText_0x71763
waitbutton
closetext
@@ -49,7 +49,7 @@ UnknownScript_0x716a4:
writetext UnknownText_0x717d8
yesorno
iffalse UnknownScript_0x716b0
- special Special_PrintDiploma
+ special PrintDiploma
closetext
end
diff --git a/maps/CeladonPokecenter1F.asm b/maps/CeladonPokecenter1F.asm
index cfe31f624..06bf79f64 100644
--- a/maps/CeladonPokecenter1F.asm
+++ b/maps/CeladonPokecenter1F.asm
@@ -30,9 +30,9 @@ CeladonEusine:
writetext CeladonEusineText1
buttonsound
writebyte SUICUNE
- special Special_MonCheck
+ special MonCheck
iffalse .NoSuicune
- special Special_BeastsCheck
+ special BeastsCheck
iftrue .HoOh
writetext NoBeastsText
waitbutton
diff --git a/maps/CeruleanPokecenter1F.asm b/maps/CeruleanPokecenter1F.asm
index 2efd5f743..914db5053 100644
--- a/maps/CeruleanPokecenter1F.asm
+++ b/maps/CeruleanPokecenter1F.asm
@@ -14,7 +14,7 @@ NurseScript_0x18820f:
jumpstd pokecenternurse
SuperNerdScript_0x188212:
- special Special_Mobile_DummyReturnFalse
+ special Mobile_DummyReturnFalse
iftrue .mobile
jumptextfaceplayer UnknownText_0x188221
diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm
index ac3db17b6..eaa21864b 100644
--- a/maps/CherrygroveCity.asm
+++ b/maps/CherrygroveCity.asm
@@ -105,7 +105,7 @@ CherrygroveSilverSceneSouth:
CherrygroveSilverSceneNorth:
spriteface PLAYER, RIGHT
showemote EMOTE_SHOCK, PLAYER, 15
- special Special_FadeOutMusic
+ special FadeOutMusic
pause 15
appear CHERRYGROVECITY_SILVER
applymovement CHERRYGROVECITY_SILVER, CherrygroveCity_RivalWalksToYou
diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm
index 82be11a81..82e4e459d 100644
--- a/maps/CianwoodCity.asm
+++ b/maps/CianwoodCity.asm
@@ -76,7 +76,7 @@ CianwoodCitySuicuneAndEusine:
applymovement CIANWOODCITY_EUSINE, MovementData_0x1a00ec
disappear CIANWOODCITY_EUSINE
pause 20
- special Special_FadeOutMusic
+ special FadeOutMusic
playmapmusic
pause 10
.Done:
diff --git a/maps/CianwoodPhotoStudio.asm b/maps/CianwoodPhotoStudio.asm
index bbf2eb3d9..52645b5d8 100644
--- a/maps/CianwoodPhotoStudio.asm
+++ b/maps/CianwoodPhotoStudio.asm
@@ -16,7 +16,7 @@ FishingGuruScript_0x9e0e0:
iffalse UnknownScript_0x9e0f3
writetext UnknownText_0x9e142
waitbutton
- special Special_PhotoStudio
+ special PhotoStudio
waitbutton
closetext
end
diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm
index 024729400..5c2450fc5 100644
--- a/maps/Colosseum.asm
+++ b/maps/Colosseum.asm
@@ -25,7 +25,7 @@ Colosseum_MapScripts:
end
.SetWhichChris:
- special Special_CableClubCheckWhichChris
+ special CableClubCheckWhichChris
iffalse .Chris2
disappear COLOSSEUM_CHRIS2
appear COLOSSEUM_CHRIS1
@@ -46,7 +46,7 @@ Colosseum_MapScripts:
end
MapColosseumSignpost1Script:
- special Special_Colosseum
+ special Colosseum
newloadmap MAPSETUP_LINKRETURN
end
diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm
index 74f6af110..0fda95f11 100644
--- a/maps/CopycatsHouse2F.asm
+++ b/maps/CopycatsHouse2F.asm
@@ -46,7 +46,7 @@ Copycat:
faceplayer
variablesprite SPRITE_COPYCAT, SPRITE_KRIS
.Default_Merge_1:
- special Special_LoadUsedSpritesGFX
+ special LoadUsedSpritesGFX
checkevent EVENT_RETURNED_MACHINE_PART
iftrue .TalkAboutLostItem
opentext
@@ -70,7 +70,7 @@ Copycat:
.Default_Merge_3a:
faceplayer
variablesprite SPRITE_COPYCAT, SPRITE_LASS
- special Special_LoadUsedSpritesGFX
+ special LoadUsedSpritesGFX
opentext
writetext CopycatText_QuickMimicking
waitbutton
@@ -99,7 +99,7 @@ Copycat:
.Default_Merge_3b:
faceplayer
variablesprite SPRITE_COPYCAT, SPRITE_LASS
- special Special_LoadUsedSpritesGFX
+ special LoadUsedSpritesGFX
opentext
writetext CopycatText_Worried
waitbutton
@@ -142,7 +142,7 @@ Copycat:
faceplayer
variablesprite SPRITE_COPYCAT, SPRITE_KRIS
.GotPass_Merge_1:
- special Special_LoadUsedSpritesGFX
+ special LoadUsedSpritesGFX
opentext
checkflag ENGINE_PLAYER_IS_FEMALE
iftrue .GotPass_Female_2
@@ -164,7 +164,7 @@ Copycat:
.GotPass_Merge_3:
faceplayer
variablesprite SPRITE_COPYCAT, SPRITE_LASS
- special Special_LoadUsedSpritesGFX
+ special LoadUsedSpritesGFX
opentext
writetext CopycatText_ItsAScream
waitbutton
diff --git a/maps/DayCare.asm b/maps/DayCare.asm
index 93461c3a8..c3499990b 100644
--- a/maps/DayCare.asm
+++ b/maps/DayCare.asm
@@ -32,7 +32,7 @@ DayCareManScript_Inside:
closetext
checkcode VAR_PARTYCOUNT
if_equal PARTY_LENGTH, .PartyFull
- special Special_GiveOddEgg
+ special GiveOddEgg
opentext
writetext DayCareText_GotOddEgg
playsound SFX_KEY_ITEM
@@ -51,7 +51,7 @@ DayCareManScript_Inside:
end
.AlreadyHaveOddEgg:
- special Special_DayCareMan
+ special DayCareMan
waitbutton
closetext
end
@@ -61,7 +61,7 @@ DayCareLadyScript:
opentext
checkflag ENGINE_DAY_CARE_MAN_HAS_EGG
iftrue .HusbandWasLookingForYou
- special Special_DayCareLady
+ special DayCareLady
waitbutton
closetext
end
diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm
index 1a524cb3a..90758584a 100644
--- a/maps/DragonShrine.asm
+++ b/maps/DragonShrine.asm
@@ -134,7 +134,7 @@ DragonShrine_MapScripts:
writetext DragonShrineClairYouPassedText
waitbutton
closetext
- special Special_FadeOutMusic
+ special FadeOutMusic
applymovement DRAGONSHRINE_CLAIR, DragonShrineClairBigStepLeftMovement
opentext
writetext DragonShrineClairThatCantBeText
@@ -217,7 +217,7 @@ DragonShrineElder1Script:
waitsfx
givepoke DRATINI, 15
checkevent EVENT_ANSWERED_DRAGON_MASTER_QUIZ_WRONG
- special Special_Dratini
+ special Dratini
setevent EVENT_GOT_DRATINI
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_7
writetext DragonShrineSymbolicDragonText
diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm
index 9572a706f..c0c871c99 100644
--- a/maps/DragonsDenB1F.asm
+++ b/maps/DragonsDenB1F.asm
@@ -76,7 +76,7 @@ DragonsDenB1F_ClairScene:
closetext
.FinishClair:
applymovement DRAGONSDENB1F_CLAIR, MovementDragonsDen_ClairWalksAway
- special Special_FadeOutMusic
+ special FadeOutMusic
pause 30
special RestartMapMusic
disappear DRAGONSDENB1F_CLAIR
diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm
index 30a7f5f35..8304cc907 100644
--- a/maps/EcruteakGym.asm
+++ b/maps/EcruteakGym.asm
@@ -91,7 +91,7 @@ EcruteakGymClosed:
follow PLAYER, ECRUTEAKGYM_GRAMPS
applymovement PLAYER, MovementData_0x99e5f
stopfollow
- special Special_FadeOutPalettes
+ special FadeOutPalettes
playsound SFX_ENTER_DOOR
waitsfx
warp ECRUTEAK_CITY, 6, 27
diff --git a/maps/EcruteakPokecenter1F.asm b/maps/EcruteakPokecenter1F.asm
index 409181ddc..8fd1436dd 100644
--- a/maps/EcruteakPokecenter1F.asm
+++ b/maps/EcruteakPokecenter1F.asm
@@ -61,7 +61,7 @@ EcruteakPokecenter1FNurseScript:
jumpstd pokecenternurse
EcruteakPokecenter1FPokefanMScript:
- special Special_Mobile_DummyReturnFalse
+ special Mobile_DummyReturnFalse
iftrue .mobile
jumptextfaceplayer EcruteakPokecenter1FPokefanMText
diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm
index 7002bd707..a0ab0c442 100644
--- a/maps/ElmsLab.asm
+++ b/maps/ElmsLab.asm
@@ -108,10 +108,10 @@ ElmCheckEverstone:
checkevent EVENT_TOLD_ELM_ABOUT_TOGEPI_OVER_THE_PHONE
iffalse ElmCheckTogepiEgg
writebyte TOGEPI
- special Special_FindPartyMonThatSpeciesYourTrainerID
+ special FindPartyMonThatSpeciesYourTrainerID
iftrue ShowElmTogepiScript
writebyte TOGETIC
- special Special_FindPartyMonThatSpeciesYourTrainerID
+ special FindPartyMonThatSpeciesYourTrainerID
iftrue ShowElmTogepiScript
writetext UnknownText_0x79a40
waitbutton
@@ -120,10 +120,10 @@ ElmCheckEverstone:
ElmEggHatchedScript:
writebyte TOGEPI
- special Special_FindPartyMonThatSpeciesYourTrainerID
+ special FindPartyMonThatSpeciesYourTrainerID
iftrue ShowElmTogepiScript
writebyte TOGETIC
- special Special_FindPartyMonThatSpeciesYourTrainerID
+ special FindPartyMonThatSpeciesYourTrainerID
iftrue ShowElmTogepiScript
jump ElmCheckGotEggAgain
@@ -308,11 +308,11 @@ ElmsLabHealingMachine:
end
ElmsLabHealingMachine_HealParty:
- special Special_StubbedTrainerRankings_Healings
+ special StubbedTrainerRankings_Healings
special HealParty
playmusic MUSIC_NONE
writebyte HEALMACHINE_ELMS_LAB
- special Special_HealMachineAnim
+ special HealMachineAnim
pause 30
special RestartMapMusic
closetext
@@ -556,7 +556,7 @@ CopScript:
opentext
writetext ElmsLabOfficerText1
buttonsound
- special Special_NameRival
+ special NameRival
writetext ElmsLabOfficerText2
waitbutton
closetext
diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm
index 6dfb2350d..9da566ee7 100644
--- a/maps/FastShip1F.asm
+++ b/maps/FastShip1F.asm
@@ -68,7 +68,7 @@ SailorScript_0x75160:
closetext
scall .LetThePlayerOut
playsound SFX_EXIT_BUILDING
- special Special_FadeOutPalettes
+ special FadeOutPalettes
waitsfx
setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY
setmapscene VERMILION_PORT, 1
@@ -81,7 +81,7 @@ SailorScript_0x75160:
closetext
scall .LetThePlayerOut
playsound SFX_EXIT_BUILDING
- special Special_FadeOutPalettes
+ special FadeOutPalettes
waitsfx
setevent EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY
setmapscene OLIVINE_PORT, 1
diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
index c6997603c..d53c76d5c 100644
--- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
+++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
@@ -48,7 +48,7 @@ SSAquaGranddaughterBefore:
writetext SSAquaGranddaughterHasToFindGrandpaText
waitbutton
closetext
- special Special_FadeBlackQuickly
+ special FadeBlackQuickly
special ReloadSpritesNoPalettes
disappear FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN2
applymovement PLAYER, MovementData_0x76004
@@ -56,7 +56,7 @@ SSAquaGranddaughterBefore:
appear FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1
spriteface PLAYER, UP
spriteface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, UP
- special Special_FadeInQuickly
+ special FadeInQuickly
spriteface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, DOWN
showemote EMOTE_SHOCK, FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, 15
applymovement FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, MovementData_0x7600c
diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm
index c979ec074..76496baac 100644
--- a/maps/FastShipCabins_SW_SSW_NW.asm
+++ b/maps/FastShipCabins_SW_SSW_NW.asm
@@ -49,7 +49,7 @@ TrainerGuitaristClyde:
.Script:
end_if_just_battled
- special Special_Mobile_DummyReturnFalse
+ special Mobile_DummyReturnFalse
iftrue .mobile
opentext
writetext UnknownText_0x75d65
@@ -69,14 +69,14 @@ FastShipBed:
writetext FastShipBedText1
waitbutton
closetext
- special Special_FadeBlackQuickly
+ special FadeBlackQuickly
special ReloadSpritesNoPalettes
- special Special_StubbedTrainerRankings_Healings
+ special StubbedTrainerRankings_Healings
special HealParty
playmusic MUSIC_HEAL
pause 60
special RestartMapMusic
- special Special_FadeInQuickly
+ special FadeInQuickly
opentext
writetext FastShipBedText2
waitbutton
diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm
index a691d1d50..90ffab8c8 100644
--- a/maps/FuchsiaGym.asm
+++ b/maps/FuchsiaGym.asm
@@ -35,7 +35,7 @@ FuchsiaGymJanineScript:
variablesprite SPRITE_FUCHSIA_GYM_2, SPRITE_LASS
variablesprite SPRITE_FUCHSIA_GYM_3, SPRITE_LASS
variablesprite SPRITE_FUCHSIA_GYM_4, SPRITE_YOUNGSTER
- special Special_LoadUsedSpritesGFX
+ special LoadUsedSpritesGFX
opentext
writetext Text_ReceivedSoulBadge
playsound SFX_GET_BADGE
@@ -65,7 +65,7 @@ LassAliceScript:
applymovement FUCHSIAGYM_FUCHSIA_GYM_1, Movement_NinjaSpin
faceplayer
variablesprite SPRITE_FUCHSIA_GYM_1, SPRITE_LASS
- special Special_LoadUsedSpritesGFX
+ special LoadUsedSpritesGFX
.AliceUnmasked:
faceplayer
opentext
@@ -99,7 +99,7 @@ LassLindaScript:
applymovement FUCHSIAGYM_FUCHSIA_GYM_2, Movement_NinjaSpin
faceplayer
variablesprite SPRITE_FUCHSIA_GYM_2, SPRITE_LASS
- special Special_LoadUsedSpritesGFX
+ special LoadUsedSpritesGFX
.LindaUnmasked:
faceplayer
opentext
@@ -133,7 +133,7 @@ PicnickerCindyScript:
applymovement FUCHSIAGYM_FUCHSIA_GYM_3, Movement_NinjaSpin
faceplayer
variablesprite SPRITE_FUCHSIA_GYM_3, SPRITE_LASS
- special Special_LoadUsedSpritesGFX
+ special LoadUsedSpritesGFX
.CindyUnmasked:
faceplayer
opentext
@@ -167,7 +167,7 @@ CamperBarryScript:
applymovement FUCHSIAGYM_FUCHSIA_GYM_4, Movement_NinjaSpin
faceplayer
variablesprite SPRITE_FUCHSIA_GYM_4, SPRITE_YOUNGSTER
- special Special_LoadUsedSpritesGFX
+ special LoadUsedSpritesGFX
.BarryUnmasked:
faceplayer
opentext
diff --git a/maps/FuchsiaPokecenter1F.asm b/maps/FuchsiaPokecenter1F.asm
index 9bc8775a6..c74e93c52 100644
--- a/maps/FuchsiaPokecenter1F.asm
+++ b/maps/FuchsiaPokecenter1F.asm
@@ -33,7 +33,7 @@ JanineImpersonatorScript_0x196462:
applymovement FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR, MovementData_0x196486
faceplayer
variablesprite SPRITE_JANINE_IMPERSONATOR, SPRITE_JANINE
- special Special_LoadUsedSpritesGFX
+ special LoadUsedSpritesGFX
opentext
writetext UnknownText_0x19654e
waitbutton
@@ -41,7 +41,7 @@ JanineImpersonatorScript_0x196462:
applymovement FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR, MovementData_0x196486
faceplayer
variablesprite SPRITE_JANINE_IMPERSONATOR, SPRITE_LASS
- special Special_LoadUsedSpritesGFX
+ special LoadUsedSpritesGFX
end
MovementData_0x196486:
diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm
index 85b4308f0..5eda492f3 100644
--- a/maps/GoldenrodCity.asm
+++ b/maps/GoldenrodCity.asm
@@ -58,7 +58,7 @@ MoveTutorScript:
writetext UnknownText_0x199042
yesorno
iffalse .Refused
- special Special_DisplayCoinCaseBalance
+ special DisplayCoinCaseBalance
writetext UnknownText_0x199090
yesorno
iffalse .Refused2
@@ -76,21 +76,21 @@ MoveTutorScript:
.Flamethrower:
writebyte MOVETUTOR_FLAMETHROWER
writetext UnknownText_0x1991cf
- special Special_MoveTutor
+ special MoveTutor
if_equal FALSE, .TeachMove
jump .Incompatible
.Thunderbolt:
writebyte MOVETUTOR_THUNDERBOLT
writetext UnknownText_0x1991cf
- special Special_MoveTutor
+ special MoveTutor
if_equal FALSE, .TeachMove
jump .Incompatible
.IceBeam:
writebyte MOVETUTOR_ICE_BEAM
writetext UnknownText_0x1991cf
- special Special_MoveTutor
+ special MoveTutor
if_equal FALSE, .TeachMove
jump .Incompatible
@@ -126,7 +126,7 @@ MoveTutorScript:
takecoins 4000
waitsfx
playsound SFX_TRANSACTION
- special Special_DisplayCoinCaseBalance
+ special DisplayCoinCaseBalance
writetext UnknownText_0x19918b
waitbutton
closetext
diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm
index dbea8e55c..73fef5157 100644
--- a/maps/GoldenrodDeptStore5F.asm
+++ b/maps/GoldenrodDeptStore5F.asm
@@ -65,7 +65,7 @@ ReceptionistScript_0x560ce:
if_not_equal SUNDAY, .EventIsOver
checkflag ENGINE_GOLDENROD_DEPT_STORE_TM27_RETURN
iftrue .EventIsOver
- special Special_GetFirstPokemonHappiness
+ special GetFirstPokemonHappiness
writetext UnknownText_0x56143
buttonsound
if_greater_than 150 - 1, .VeryHappy
@@ -106,12 +106,12 @@ ReceptionistScript_0x560ce:
Carrie:
faceplayer
opentext
- special Special_GameboyCheck
+ special GameboyCheck
if_not_equal GBCHECK_CGB, .NotGBC ; This is a dummy check from Gold/Silver
writetext UnknownText_0x56241
waitbutton
closetext
- special Special_UnlockMysteryGift
+ special UnlockMysteryGift
end
.NotGBC:
diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm
index 49cd09ebd..e9f9447ce 100644
--- a/maps/GoldenrodDeptStore6F.asm
+++ b/maps/GoldenrodDeptStore6F.asm
@@ -13,7 +13,7 @@ GoldenrodVendingMachine:
opentext
writetext GoldenrodVendingText
.Start:
- special Special_PlaceMoneyTopRight
+ special PlaceMoneyTopRight
loadmenuheader .MenuHeader
verticalmenu
closewindow
diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm
index cc04df7fb..30ba8c64a 100644
--- a/maps/GoldenrodGameCorner.asm
+++ b/maps/GoldenrodGameCorner.asm
@@ -60,7 +60,7 @@ GoldenrodGmeCornerTMVendorScript:
iffalse GoldenrodGameCornerPrizeVendor_NoCoinCaseScript
writetext GoldenrodGameCornerPrizeVendorWhichPrizeText
GoldenrodGmeCornerTMVendor_LoopScript: ; 056c36
- special Special_DisplayCoinCaseBalance
+ special DisplayCoinCaseBalance
loadmenuheader GoldenrodGameCornerTMVendorMenuHeader
verticalmenu
closewindow
@@ -161,7 +161,7 @@ GoldenrodGameCornerPrizeMonVendorScript:
iffalse GoldenrodGameCornerPrizeVendor_NoCoinCaseScript
.loop
writetext GoldenrodGameCornerPrizeVendorWhichPrizeText
- special Special_DisplayCoinCaseBalance
+ special DisplayCoinCaseBalance
loadmenuheader .MenuHeader
verticalmenu
closewindow
@@ -183,7 +183,7 @@ GoldenrodGameCornerPrizeMonVendorScript:
writetext GoldenrodGameCornerPrizeVendorHereYouGoText
waitbutton
writebyte ABRA
- special Special_GameCornerPrizeMonCheckDex
+ special GameCornerPrizeMonCheckDex
givepoke ABRA, 5
takecoins 100
jump .loop
@@ -201,7 +201,7 @@ GoldenrodGameCornerPrizeMonVendorScript:
writetext GoldenrodGameCornerPrizeVendorHereYouGoText
waitbutton
writebyte CUBONE
- special Special_GameCornerPrizeMonCheckDex
+ special GameCornerPrizeMonCheckDex
givepoke CUBONE, 15
takecoins 800
jump .loop
@@ -219,7 +219,7 @@ GoldenrodGameCornerPrizeMonVendorScript:
writetext GoldenrodGameCornerPrizeVendorHereYouGoText
waitbutton
writebyte WOBBUFFET
- special Special_GameCornerPrizeMonCheckDex
+ special GameCornerPrizeMonCheckDex
givepoke WOBBUFFET, 15
takecoins 1500
jump .loop
@@ -297,20 +297,20 @@ GoldenrodGameCornerSlotsMachineScript:
if_equal 0, GoldenrodGameCornerLuckySlotsMachineScript
refreshscreen
writebyte FALSE
- special Special_SlotMachine
+ special SlotMachine
closetext
end
GoldenrodGameCornerLuckySlotsMachineScript:
refreshscreen
writebyte TRUE
- special Special_SlotMachine
+ special SlotMachine
closetext
end
GoldenrodGameCornerCardFlipMachineScript:
refreshscreen
- special Special_CardFlip
+ special CardFlip
closetext
end
diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm
index 4fa8506dc..da8d67668 100644
--- a/maps/GoldenrodHappinessRater.asm
+++ b/maps/GoldenrodHappinessRater.asm
@@ -13,7 +13,7 @@ GoldenrodHappinessRater_MapScripts:
TeacherScript_0x54953:
faceplayer
opentext
- special Special_GetFirstPokemonHappiness
+ special GetFirstPokemonHappiness
writetext UnknownText_0x549a3
buttonsound
if_greater_than 250 - 1, UnknownScript_0x54973
diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm
index c0f749413..1fd37876a 100644
--- a/maps/GoldenrodMagnetTrainStation.asm
+++ b/maps/GoldenrodMagnetTrainStation.asm
@@ -35,7 +35,7 @@ OfficerScript_0x550ec:
applymovement GOLDENRODMAGNETTRAINSTATION_OFFICER, MovementData_0x55146
applymovement PLAYER, MovementData_0x5514f
writebyte FALSE
- special Special_MagnetTrain
+ special MagnetTrain
warpcheck
newloadmap MAPSETUP_TRAIN
applymovement PLAYER, .MovementBoardTheTrain
diff --git a/maps/GoldenrodNameRater.asm b/maps/GoldenrodNameRater.asm
index d90aed911..ebee5d6a5 100644
--- a/maps/GoldenrodNameRater.asm
+++ b/maps/GoldenrodNameRater.asm
@@ -11,7 +11,7 @@ GoldenrodNameRater_MapScripts:
GoldenrodNameRater:
faceplayer
opentext
- special Special_NameRater
+ special NameRater
waitbutton
closetext
end
diff --git a/maps/GoldenrodPokecenter1F.asm b/maps/GoldenrodPokecenter1F.asm
index 9402f8743..bb0a19be3 100644
--- a/maps/GoldenrodPokecenter1F.asm
+++ b/maps/GoldenrodPokecenter1F.asm
@@ -17,7 +17,7 @@ NurseScript_0x60f91:
GoldenrodPokecenter1F_GSBallSceneLeft:
writebyte BATTLETOWERACTION_CHECKMOBILEEVENT
- special Special_BattleTowerAction
+ special BattleTowerAction
if_equal MOBILE_EVENT_OBJECT_GS_BALL, .gsball
end
@@ -49,7 +49,7 @@ GoldenrodPokecenter1F_GSBallSceneLeft:
GoldenrodPokecenter1F_GSBallSceneRight:
writebyte BATTLETOWERACTION_CHECKMOBILEEVENT
- special Special_BattleTowerAction
+ special BattleTowerAction
if_equal MOBILE_EVENT_OBJECT_GS_BALL, .gsball
end
diff --git a/maps/GoldenrodUnderground.asm b/maps/GoldenrodUnderground.asm
index 72ace6fa3..b856c61c4 100644
--- a/maps/GoldenrodUnderground.asm
+++ b/maps/GoldenrodUnderground.asm
@@ -192,7 +192,7 @@ OlderHaircutBrotherScript:
.DoHaircut:
checkflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT
iftrue .AlreadyGotHaircut
- special Special_PlaceMoneyTopRight
+ special PlaceMoneyTopRight
writetext UnknownText_0x7c5f9
yesorno
iffalse .Refused
@@ -200,7 +200,7 @@ OlderHaircutBrotherScript:
if_equal HAVE_LESS, .NotEnoughMoney
writetext UnknownText_0x7c69a
buttonsound
- special Special_YoungerHaircutBrother
+ special YoungerHaircutBrother
if_equal $0, .Refused
if_equal $1, .Refused
setflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT
@@ -228,14 +228,14 @@ OlderHaircutBrotherScript:
.then
takemoney YOUR_MONEY, 500
- special Special_PlaceMoneyTopRight
+ special PlaceMoneyTopRight
writetext UnknownText_0x7c6b8
waitbutton
closetext
- special Special_FadeOutPalettes
+ special FadeOutPalettes
playmusic MUSIC_HEAL
pause 60
- special Special_FadeInPalettes
+ special FadeInPalettes
special RestartMapMusic
opentext
writetext UnknownText_0x7c6d8
@@ -275,7 +275,7 @@ YoungerHaircutBrotherScript:
.DoHaircut:
checkflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT
iftrue .AlreadyGotHaircut
- special Special_PlaceMoneyTopRight
+ special PlaceMoneyTopRight
writetext UnknownText_0x7c75c
yesorno
iffalse .Refused
@@ -283,7 +283,7 @@ YoungerHaircutBrotherScript:
if_equal HAVE_LESS, .NotEnoughMoney
writetext UnknownText_0x7c7f1
buttonsound
- special Special_OlderHaircutBrother
+ special OlderHaircutBrother
if_equal $0, .Refused
if_equal $1, .Refused
setflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT
@@ -311,14 +311,14 @@ YoungerHaircutBrotherScript:
.then
takemoney YOUR_MONEY, 300
- special Special_PlaceMoneyTopRight
+ special PlaceMoneyTopRight
writetext UnknownText_0x7c80e
waitbutton
closetext
- special Special_FadeOutPalettes
+ special FadeOutPalettes
playmusic MUSIC_HEAL
pause 60
- special Special_FadeInPalettes
+ special FadeInPalettes
special RestartMapMusic
opentext
writetext UnknownText_0x7c82a
@@ -349,21 +349,21 @@ YoungerHaircutBrotherScript:
UnknownScript_0x7c2bb:
writetext HaircutBrosText_SlightlyHappier
- special Special_PlayCurMonCry
+ special PlayCurMonCry
waitbutton
closetext
end
UnknownScript_0x7c2c4:
writetext HaircutBrosText_Happier
- special Special_PlayCurMonCry
+ special PlayCurMonCry
waitbutton
closetext
end
UnknownScript_0x7c2cd:
writetext HaircutBrosText_MuchHappier
- special Special_PlayCurMonCry
+ special PlayCurMonCry
waitbutton
closetext
end
diff --git a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
index 561ee9df0..e5bbf74cb 100644
--- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
+++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
@@ -121,7 +121,7 @@ TeacherScript_0x7ca7d:
UndergroundSilverScene1:
spriteface PLAYER, RIGHT
showemote EMOTE_SHOCK, PLAYER, 15
- special Special_FadeOutMusic
+ special FadeOutMusic
pause 15
playsound SFX_EXIT_BUILDING
appear GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER
@@ -140,7 +140,7 @@ UndergroundSilverScene1:
UndergroundSilverScene2:
spriteface PLAYER, RIGHT
showemote EMOTE_SHOCK, PLAYER, 15
- special Special_FadeOutMusic
+ special FadeOutMusic
pause 15
playsound SFX_EXIT_BUILDING
appear GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER
diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm
index 3f5f6ee10..2a7e034d5 100644
--- a/maps/HallOfFame.asm
+++ b/maps/HallOfFame.asm
@@ -31,7 +31,7 @@ HallOfFame_MapScripts:
setscene 1
pause 15
writebyte HEALMACHINE_HALL_OF_FAME
- special Special_HealMachineAnim
+ special HealMachineAnim
setevent EVENT_BEAT_ELITE_FOUR
setevent EVENT_TELEPORT_GUY
setevent EVENT_RIVAL_SPROUT_TOWER
diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm
index e5eff3a32..16fd0bbf0 100644
--- a/maps/IlexForest.asm
+++ b/maps/IlexForest.asm
@@ -459,18 +459,18 @@ MapIlexForestSignpost4Script:
closetext
pause 20
showemote EMOTE_SHOCK, PLAYER, 20
- special Special_FadeOutMusic
+ special FadeOutMusic
applymovement PLAYER, MovementData_0x6ef58
pause 30
spriteface PLAYER, DOWN
pause 20
clearflag ENGINE_FOREST_IS_RESTLESS
- special Special_CelebiShrineEvent
+ special CelebiShrineEvent
loadwildmon CELEBI, 30
startbattle
reloadmapafterbattle
pause 20
- special Special_CheckCaughtCelebi
+ special CheckCaughtCelebi
iffalse .DidntCatchCelebi
appear ILEXFOREST_KURT
applymovement ILEXFOREST_KURT, MovementData_0x6ef4e
diff --git a/maps/IndigoPlateauPokecenter1F.asm b/maps/IndigoPlateauPokecenter1F.asm
index 17a4d0663..feb517914 100644
--- a/maps/IndigoPlateauPokecenter1F.asm
+++ b/maps/IndigoPlateauPokecenter1F.asm
@@ -58,7 +58,7 @@ PlateauRivalBattle1:
appear INDIGOPLATEAUPOKECENTER1F_SILVER
spriteface PLAYER, DOWN
showemote EMOTE_SHOCK, PLAYER, 15
- special Special_FadeOutMusic
+ special FadeOutMusic
pause 15
applymovement INDIGOPLATEAUPOKECENTER1F_SILVER, PlateauRivalMovement1
playmusic MUSIC_RIVAL_ENCOUNTER
@@ -79,7 +79,7 @@ PlateauRivalBattle2:
appear INDIGOPLATEAUPOKECENTER1F_SILVER
spriteface PLAYER, DOWN
showemote EMOTE_SHOCK, PLAYER, 15
- special Special_FadeOutMusic
+ special FadeOutMusic
pause 15
applymovement INDIGOPLATEAUPOKECENTER1F_SILVER, PlateauRivalMovement2
playmusic MUSIC_RIVAL_ENCOUNTER
@@ -158,7 +158,7 @@ TeleportGuyScript:
waitbutton
closetext
playsound SFX_WARP_TO
- special Special_FadeOutPalettes
+ special FadeOutPalettes
waitsfx
warp NEW_BARK_TOWN, 13, 6
end
diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm
index 7e7399aa6..c8894a715 100644
--- a/maps/KurtsHouse.asm
+++ b/maps/KurtsHouse.asm
@@ -44,7 +44,7 @@ KurtScript_0x18e178:
writetext UnknownText_0x18e473
waitbutton
closetext
- special Special_FadeOutMusic
+ special FadeOutMusic
setevent EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET
checkcode VAR_FACING
if_equal UP, .RunAround
@@ -131,7 +131,7 @@ KurtScript_0x18e178:
writetext UnknownText_0x18e736
buttonsound
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3
- special Special_SelectApricornForKurt
+ special SelectApricornForKurt
if_equal FALSE, .Cancel
if_equal BLU_APRICORN, .Blu
if_equal YLW_APRICORN, .Ylw
@@ -291,7 +291,7 @@ KurtScript_0x18e178:
setevent EVENT_FOREST_IS_RESTLESS
clearevent EVENT_CAN_GIVE_GS_BALL_TO_KURT
clearevent EVENT_GAVE_GS_BALL_TO_KURT
- special Special_FadeOutMusic
+ special FadeOutMusic
pause 20
showemote EMOTE_SHOCK, KURTSHOUSE_KURT1, 30
checkcode VAR_FACING
diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm
index f8e525971..9ffc9e05c 100644
--- a/maps/LakeOfRage.asm
+++ b/maps/LakeOfRage.asm
@@ -141,7 +141,7 @@ MapLakeOfRageSignpost1Script:
UnknownScript_0x700b8:
buttonsound
- special Special_MagikarpHouseSign
+ special MagikarpHouseSign
closetext
end
diff --git a/maps/LakeOfRageMagikarpHouse.asm b/maps/LakeOfRageMagikarpHouse.asm
index a197dd0e8..b921d38b0 100644
--- a/maps/LakeOfRageMagikarpHouse.asm
+++ b/maps/LakeOfRageMagikarpHouse.asm
@@ -40,11 +40,11 @@ UnknownScript_0x19a6d7:
UnknownScript_0x19a6e0:
writebyte MAGIKARP
- special Special_FindPartyMonThatSpecies
+ special FindPartyMonThatSpecies
iffalse UnknownScript_0x19a6d7
writetext UnknownText_0x19a93e
waitbutton
- special Special_CheckMagikarpLength
+ special CheckMagikarpLength
if_equal MAGIKARPLENGTH_NOT_MAGIKARP, UnknownScript_0x19a71c
if_equal MAGIKARPLENGTH_REFUSED, UnknownScript_0x19a722
if_equal MAGIKARPLENGTH_TOO_SHORT, UnknownScript_0x19a716
diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm
index a3336251b..a040b0b49 100644
--- a/maps/LancesRoom.asm
+++ b/maps/LancesRoom.asm
@@ -44,12 +44,12 @@ LancesRoom_MapScripts:
end
Script_ApproachLanceFromLeft:
- special Special_FadeOutMusic
+ special FadeOutMusic
applymovement PLAYER, MovementData_ApproachLanceFromLeft
jump LanceScript_0x180e7b
Script_ApproachLanceFromRight:
- special Special_FadeOutMusic
+ special FadeOutMusic
applymovement PLAYER, MovementData_ApproachLanceFromRight
LanceScript_0x180e7b:
spriteface LANCESROOM_LANCE, LEFT
@@ -125,7 +125,7 @@ LanceScript_0x180e7b:
pause 30
closetext
applymovement LANCESROOM_MARY, LancesRoomMovementData_MaryRunsBackAndForth
- special Special_FadeOutPalettes
+ special FadeOutPalettes
pause 15
warpfacing UP, HALL_OF_FAME, 4, 13
end
diff --git a/maps/LavenderNameRater.asm b/maps/LavenderNameRater.asm
index 544c51d5b..ecb4fb5c0 100644
--- a/maps/LavenderNameRater.asm
+++ b/maps/LavenderNameRater.asm
@@ -15,7 +15,7 @@ LavenderNameRater_MapScripts:
LavenderNameRater:
faceplayer
opentext
- special Special_NameRater
+ special NameRater
waitbutton
closetext
end
diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm
index d53aabce0..959f6970e 100644
--- a/maps/MahoganyTown.asm
+++ b/maps/MahoganyTown.asm
@@ -53,7 +53,7 @@ UnknownScript_0x190039:
UnknownScript_0x190040:
opentext
writetext UnknownText_0x1900b0
- special Special_PlaceMoneyTopRight
+ special PlaceMoneyTopRight
yesorno
iffalse UnknownScript_0x190072
checkmoney YOUR_MONEY, 300
@@ -63,7 +63,7 @@ UnknownScript_0x190040:
waitsfx
playsound SFX_TRANSACTION
takemoney YOUR_MONEY, 300
- special Special_PlaceMoneyTopRight
+ special PlaceMoneyTopRight
writetext UnknownText_0x19014a
waitbutton
closetext
diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm
index b3ec5a564..456b30446 100644
--- a/maps/ManiasHouse.asm
+++ b/maps/ManiasHouse.asm
@@ -18,7 +18,7 @@ ManiaScript:
writetext ManiaText_AskLookAfterShuckle
yesorno
iffalse .refusetotakeshuckie
- special Special_GiveShuckle
+ special GiveShuckle
iffalse .partyfull
writetext ManiaText_TakeCareOfShuckle
buttonsound
@@ -54,7 +54,7 @@ ManiaScript:
writetext ManiaText_CanIHaveMyMonBack
yesorno
iffalse .refused
- special Special_ReturnShuckle
+ special ReturnShuckle
if_equal SHUCKIE_WRONG_MON, .wrong
if_equal SHUCKIE_REFUSED, .refused
if_equal SHUCKIE_HAPPY, .superhappy
diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm
index d65ae1006..391d05bf4 100644
--- a/maps/MobileBattleRoom.asm
+++ b/maps/MobileBattleRoom.asm
@@ -21,9 +21,9 @@ MobileBattleRoom_MapScripts:
MapMobileBattleRoomSignpost0Script:
refreshscreen
- special Special_Function1037c2
+ special Function1037c2
if_equal $1, .one
- special Special_Function1037eb
+ special Function1037eb
iffalse .false
if_equal $1, .one_
if_equal $2, .two_
@@ -33,24 +33,24 @@ MapMobileBattleRoomSignpost0Script:
writetext MobileBattleRoom_HealText
pause 20
closetext
- special Special_FadeOutPalettes
+ special FadeOutPalettes
playmusic MUSIC_HEAL
- special Special_LoadMapPalettes
+ special LoadMapPalettes
pause 60
- special Special_FadeInPalettes
+ special FadeInPalettes
special RestartMapMusic
refreshscreen
.two_
- special Special_StubbedTrainerRankings_Healings
+ special StubbedTrainerRankings_Healings
special HealParty
- special Special_Function10383c
+ special Function10383c
iftrue .false
.one
- special Special_Function10387b
+ special Function10387b
writetext MobileBattleRoom_EstablishingCommsText
waitbutton
reloadmappart
- special Special_Function101225
+ special Function101225
.false
closetext
end
diff --git a/maps/MobileTradeRoomMobile.asm b/maps/MobileTradeRoomMobile.asm
index 53713c9de..1cf28cb5c 100644
--- a/maps/MobileTradeRoomMobile.asm
+++ b/maps/MobileTradeRoomMobile.asm
@@ -21,11 +21,11 @@ MobileTradeRoomMobile_MapScripts:
MapMobileTradeRoomMobileSignpost0Script:
refreshscreen
- special Special_Function1037c2
+ special Function1037c2
writetext MobileTradeRoomMobile_EstablishingCommsText
waitbutton
reloadmappart
- special Special_Function101231
+ special Function101231
closetext
end
diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm
index 38e5d436d..f9ac4492d 100644
--- a/maps/MountMoon.asm
+++ b/maps/MountMoon.asm
@@ -20,7 +20,7 @@ MountMoon_MapScripts:
.RivalBattle:
spriteface PLAYER, RIGHT
showemote EMOTE_SHOCK, PLAYER, 15
- special Special_FadeOutMusic
+ special FadeOutMusic
pause 15
applymovement MOUNTMOON_SILVER, MountMoonSilverMovementBefore
playmusic MUSIC_RIVAL_ENCOUNTER
diff --git a/maps/MoveDeletersHouse.asm b/maps/MoveDeletersHouse.asm
index 0635be308..5baa81fd9 100644
--- a/maps/MoveDeletersHouse.asm
+++ b/maps/MoveDeletersHouse.asm
@@ -11,7 +11,7 @@ MoveDeletersHouse_MapScripts:
MoveDeleter:
faceplayer
opentext
- special Special_MoveDeletion
+ special MoveDeletion
waitbutton
closetext
end
diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm
index be806d610..4e73195b2 100644
--- a/maps/MrPokemonsHouse.asm
+++ b/maps/MrPokemonsHouse.asm
@@ -110,13 +110,13 @@ MrPokemonsHouse_OakScript:
writetext MrPokemonsHouse_MrPokemonHealText
waitbutton
closetext
- special Special_FadeBlackQuickly
+ special FadeBlackQuickly
special ReloadSpritesNoPalettes
playmusic MUSIC_HEAL
- special Special_StubbedTrainerRankings_Healings
+ special StubbedTrainerRankings_Healings
special HealParty
pause 60
- special Special_FadeInQuickly
+ special FadeInQuickly
special RestartMapMusic
opentext
writetext MrPokemonText_ImDependingOnYou
diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm
index d78641c28..cbfb0d1c1 100644
--- a/maps/OaksLab.asm
+++ b/maps/OaksLab.asm
@@ -33,7 +33,7 @@ Oak:
.CheckPokedex:
writetext OakLabDexCheckText
waitbutton
- special Special_ProfOaksPCBoot
+ special ProfOaksPCBoot
writetext OakLabGoodbyeText
waitbutton
closetext
diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm
index e2fd0c4c7..923ed4bb4 100644
--- a/maps/OlivineCity.asm
+++ b/maps/OlivineCity.asm
@@ -27,7 +27,7 @@ OlivineCity_MapScripts:
UnknownScript_0x1a8833:
spriteface PLAYER, LEFT
showemote EMOTE_SHOCK, PLAYER, 15
- special Special_FadeOutMusic
+ special FadeOutMusic
pause 15
playsound SFX_ENTER_DOOR
appear OLIVINECITY_OLIVINE_RIVAL
@@ -45,13 +45,13 @@ UnknownScript_0x1a8833:
disappear OLIVINECITY_OLIVINE_RIVAL
special RestartMapMusic
variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_SWIMMER_GUY
- special Special_LoadUsedSpritesGFX
+ special LoadUsedSpritesGFX
end
UnknownScript_0x1a886b:
spriteface PLAYER, LEFT
showemote EMOTE_SHOCK, PLAYER, 15
- special Special_FadeOutMusic
+ special FadeOutMusic
pause 15
playsound SFX_ENTER_DOOR
appear OLIVINECITY_OLIVINE_RIVAL
@@ -69,7 +69,7 @@ UnknownScript_0x1a886b:
setscene 1
special RestartMapMusic
variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_SWIMMER_GUY
- special Special_LoadUsedSpritesGFX
+ special LoadUsedSpritesGFX
end
OlivineCitySailor1Script:
diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm
index d036dc56f..a54d22916 100644
--- a/maps/OlivineLighthouse6F.asm
+++ b/maps/OlivineLighthouse6F.asm
@@ -47,9 +47,9 @@ UnknownScript_0x60bab:
closetext
special RestartMapMusic
cry AMPHAROS
- special Special_FadeOutPalettes
+ special FadeOutPalettes
pause 10
- special Special_FadeInPalettes
+ special FadeInPalettes
opentext
writetext UnknownText_0x60f3d
waitbutton
@@ -109,7 +109,7 @@ MonsterScript_0x60c3a:
iftrue UnknownScript_0x60c51
writetext UnknownText_0x60f03
writebyte AMPHAROS
- special Special_PlaySlowCry
+ special PlaySlowCry
buttonsound
writetext UnknownText_0x60f19
waitbutton
@@ -121,10 +121,10 @@ UnknownScript_0x60c51:
cry AMPHAROS
waitbutton
closetext
- special Special_FadeOutPalettes
- special Special_FadeInPalettes
- special Special_FadeOutPalettes
- special Special_FadeInPalettes
+ special FadeOutPalettes
+ special FadeInPalettes
+ special FadeOutPalettes
+ special FadeInPalettes
end
OlivineLighthouse6FSuperPotion:
diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm
index ababf8f71..132a0dcc7 100644
--- a/maps/OlivinePort.asm
+++ b/maps/OlivinePort.asm
@@ -46,7 +46,7 @@ SailorScript_0x748c0:
waitsfx
applymovement PLAYER, MovementData_0x74a30
playsound SFX_EXIT_BUILDING
- special Special_FadeOutPalettes
+ special FadeOutPalettes
waitsfx
checkevent EVENT_FAST_SHIP_FIRST_TIME
iffalse UnknownScript_0x7490a
diff --git a/maps/PlayersHouse1F.asm b/maps/PlayersHouse1F.asm
index a049ace56..0e5d9a73f 100644
--- a/maps/PlayersHouse1F.asm
+++ b/maps/PlayersHouse1F.asm
@@ -48,18 +48,18 @@ UnknownScript_0x7a4f6:
clearevent EVENT_PLAYERS_HOUSE_MOM_2
writetext UnknownText_0x7a6bd
buttonsound
- special Special_SetDayOfWeek
+ special SetDayOfWeek
UnknownScript_0x7a519:
writetext UnknownText_0x7a742
yesorno
iffalse UnknownScript_0x7a52a
- special Special_InitialSetDSTFlag
+ special InitialSetDSTFlag
yesorno
iffalse UnknownScript_0x7a519
jump UnknownScript_0x7a531
UnknownScript_0x7a52a:
- special Special_InitialClearDSTFlag
+ special InitialClearDSTFlag
yesorno
iffalse UnknownScript_0x7a519
UnknownScript_0x7a531:
@@ -147,7 +147,7 @@ UnknownScript_0x7a5b5:
setevent EVENT_FIRST_TIME_BANKING_WITH_MOM
UnknownScript_0x7a5b8:
setevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST
- special Special_BankOfMom
+ special BankOfMom
waitbutton
closetext
end
diff --git a/maps/PlayersHouse2F.asm b/maps/PlayersHouse2F.asm
index 72b2989b6..109b541fc 100644
--- a/maps/PlayersHouse2F.asm
+++ b/maps/PlayersHouse2F.asm
@@ -18,7 +18,7 @@ PlayersHouse2F_MapScripts:
end
.InitializeRoom:
- special Special_ToggleDecorationsVisibility
+ special ToggleDecorationsVisibility
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_8
checkevent EVENT_INITIALIZED_EVENTS
iftrue .SkipInitialization
@@ -29,7 +29,7 @@ PlayersHouse2F_MapScripts:
return
.SetSpawn:
- special Special_ToggleMaptileDecorations
+ special ToggleMaptileDecorations
return
db 0, 0, 0 ; filler
@@ -87,7 +87,7 @@ PlayersHouseBookshelfScript:
PlayersHousePCScript:
opentext
- special Special_PlayersHousePC
+ special PlayersHousePC
iftrue .Warp
closetext
end
diff --git a/maps/PokeSeersHouse.asm b/maps/PokeSeersHouse.asm
index 89dfe05ba..1aa5e643c 100644
--- a/maps/PokeSeersHouse.asm
+++ b/maps/PokeSeersHouse.asm
@@ -11,7 +11,7 @@ PokeSeersHouse_MapScripts:
SeerScript:
faceplayer
opentext
- special Special_PokeSeer
+ special PokeSeer
waitbutton
closetext
end
diff --git a/maps/Pokecenter2F.asm b/maps/Pokecenter2F.asm
index a9a71f8ca..3eea56cc0 100644
--- a/maps/Pokecenter2F.asm
+++ b/maps/Pokecenter2F.asm
@@ -18,7 +18,7 @@ Pokecenter2F_MapScripts:
db 0
.Scene0:
- special Special_CheckMysteryGift
+ special CheckMysteryGift
if_equal $0, .Scene0Done
clearevent EVENT_MYSTERY_GIFT_DELIVERY_GUY
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
@@ -76,28 +76,28 @@ LinkReceptionistScript_Trade:
writetext Text_TradeReceptionistIntro
yesorno
iffalse .Cancel
- special Special_Mobile_DummyReturnFalse ; always returns false
+ special Mobile_DummyReturnFalse ; always returns false
iffalse .NoMobile
writetext Text_TradeReceptionistMobile
- special Special_AskMobileOrCable
+ special AskMobileOrCable
iffalse .Cancel
if_equal $1, .Mobile
.NoMobile:
- special Special_SetBitsForLinkTradeRequest
+ special SetBitsForLinkTradeRequest
writetext Text_PleaseWait
- special Special_WaitForLinkedFriend
+ special WaitForLinkedFriend
iffalse .FriendNotReady
writetext Text_MustSaveGame
yesorno
iffalse .DidNotSave
- special Special_TryQuickSave
+ special TryQuickSave
iffalse .DidNotSave
writetext Text_PleaseWait
- special Special_CheckLinkTimeout
+ special CheckLinkTimeout
iffalse .LinkTimedOut
copybytetovar wOtherPlayerLinkMode
iffalse .LinkedToFirstGen
- special Special_CheckBothSelectedSameRoom
+ special CheckBothSelectedSameRoom
iffalse .IncompatibleRooms
writetext Text_PleaseComeIn2
waitbutton
@@ -107,21 +107,21 @@ LinkReceptionistScript_Trade:
end
.FriendNotReady:
- special Special_WaitForOtherPlayerToExit
+ special WaitForOtherPlayerToExit
writetext Text_FriendNotReady
closetext
end
.LinkedToFirstGen:
- special Special_FailedLinkToPast
+ special FailedLinkToPast
writetext Text_CantLinkToThePast
- special Special_CloseLink
+ special CloseLink
closetext
end
.IncompatibleRooms:
writetext Text_IncompatibleRooms
- special Special_CloseLink
+ special CloseLink
closetext
end
@@ -132,7 +132,7 @@ LinkReceptionistScript_Trade:
.DidNotSave:
writetext Text_PleaseComeAgain
.AbortLink:
- special Special_WaitForOtherPlayerToExit
+ special WaitForOtherPlayerToExit
.Cancel:
closetext
end
@@ -151,9 +151,9 @@ LinkReceptionistScript_Trade:
writetext Text_MustSaveGame
yesorno
iffalse .Mobile_DidNotSave
- special Special_TryQuickSave
+ special TryQuickSave
iffalse .Mobile_DidNotSave
- special Special_Function1011f1
+ special Function1011f1
writetext Text_PleaseComeIn2
waitbutton
closetext
@@ -178,28 +178,28 @@ LinkReceptionistScript_Battle:
writetext Text_BattleReceptionistIntro
yesorno
iffalse .Cancel
- special Special_Mobile_DummyReturnFalse ; always returns false
+ special Mobile_DummyReturnFalse ; always returns false
iffalse .NoMobile
writetext Text_BattleReceptionistMobile
- special Special_AskMobileOrCable
+ special AskMobileOrCable
iffalse .Cancel
if_equal $1, .Mobile
.NoMobile:
- special Special_SetBitsForBattleRequest
+ special SetBitsForBattleRequest
writetext Text_PleaseWait
- special Special_WaitForLinkedFriend
+ special WaitForLinkedFriend
iffalse .FriendNotReady
writetext Text_MustSaveGame
yesorno
iffalse .DidNotSave
- special Special_TryQuickSave
+ special TryQuickSave
iffalse .DidNotSave
writetext Text_PleaseWait
- special Special_CheckLinkTimeout
+ special CheckLinkTimeout
iffalse .LinkTimedOut
copybytetovar wOtherPlayerLinkMode
iffalse .LinkedToFirstGen
- special Special_CheckBothSelectedSameRoom
+ special CheckBothSelectedSameRoom
iffalse .IncompatibleRooms
writetext Text_PleaseComeIn2
waitbutton
@@ -209,21 +209,21 @@ LinkReceptionistScript_Battle:
end
.FriendNotReady:
- special Special_WaitForOtherPlayerToExit
+ special WaitForOtherPlayerToExit
writetext Text_FriendNotReady
closetext
end
.LinkedToFirstGen:
- special Special_FailedLinkToPast
+ special FailedLinkToPast
writetext Text_CantLinkToThePast
- special Special_CloseLink
+ special CloseLink
closetext
end
.IncompatibleRooms:
writetext Text_IncompatibleRooms
- special Special_CloseLink
+ special CloseLink
closetext
end
@@ -234,7 +234,7 @@ LinkReceptionistScript_Battle:
.DidNotSave:
writetext Text_PleaseComeAgain
.AbortLink:
- special Special_WaitForOtherPlayerToExit
+ special WaitForOtherPlayerToExit
.Cancel:
closetext
end
@@ -255,9 +255,9 @@ LinkReceptionistScript_Battle:
writetext Text_MustSaveGame
yesorno
iffalse .Mobile_DidNotSave
- special Special_Function103780
+ special Function103780
iffalse .Mobile_DidNotSave
- special Special_Function1011f1
+ special Function1011f1
writetext Text_PleaseComeIn2
waitbutton
closetext
@@ -271,7 +271,7 @@ LinkReceptionistScript_Battle:
end
.SelectThreeMons:
- special Special_Mobile_SelectThreeMons
+ special Mobile_SelectThreeMons
iffalse .Mobile_DidNotSelect
if_equal $1, .Mobile_OK
if_equal $2, .Mobile_OK
@@ -303,37 +303,37 @@ LinkReceptionistScript_TimeCapsule:
iftrue Script_TimeCapsuleClosed
checkflag ENGINE_TIME_CAPSULE
iftrue Script_TimeCapsuleClosed
- special Special_SetBitsForTimeCapsuleRequest
+ special SetBitsForTimeCapsuleRequest
faceplayer
opentext
writetext Text_TimeCapsuleReceptionistIntro
yesorno
iffalse .Cancel
- special Special_CheckTimeCapsuleCompatibility
+ special CheckTimeCapsuleCompatibility
if_equal $1, .MonTooNew
if_equal $2, .MonMoveTooNew
if_equal $3, .MonHasMail
writetext Text_PleaseWait
- special Special_WaitForLinkedFriend
+ special WaitForLinkedFriend
iffalse .FriendNotReady
writetext Text_MustSaveGame
yesorno
iffalse .DidNotSave
- special Special_TryQuickSave
+ special TryQuickSave
iffalse .DidNotSave
writetext Text_PleaseWait
- special Special_CheckLinkTimeout
+ special CheckLinkTimeout
iffalse .LinkTimedOut
copybytetovar wOtherPlayerLinkMode
iffalse .OK
- special Special_CheckBothSelectedSameRoom
+ special CheckBothSelectedSameRoom
writetext Text_IncompatibleRooms
- special Special_CloseLink
+ special CloseLink
closetext
end
.OK:
- special Special_EnterTimeCapsule
+ special EnterTimeCapsule
writetext Text_PleaseComeIn2
waitbutton
closetext
@@ -342,7 +342,7 @@ LinkReceptionistScript_TimeCapsule:
end
.FriendNotReady:
- special Special_WaitForOtherPlayerToExit
+ special WaitForOtherPlayerToExit
writetext Text_FriendNotReady
closetext
end
@@ -354,7 +354,7 @@ LinkReceptionistScript_TimeCapsule:
.DidNotSave:
writetext Text_PleaseComeAgain
.Cancel:
- special Special_WaitForOtherPlayerToExit
+ special WaitForOtherPlayerToExit
closetext
end
@@ -374,14 +374,14 @@ LinkReceptionistScript_TimeCapsule:
end
Script_LeftCableTradeCenter:
- special Special_WaitForOtherPlayerToExit
+ special WaitForOtherPlayerToExit
scall Script_WalkOutOfLinkTradeRoom
setscene 0
setmapscene TRADE_CENTER, 0
end
Script_LeftMobileTradeRoom:
- special Special_Function101220
+ special Function101220
scall Script_WalkOutOfMobileTradeRoom
setscene 0
setmapscene MOBILE_TRADE_ROOM_MOBILE, 0
@@ -394,14 +394,14 @@ Script_WalkOutOfMobileTradeRoom:
end
Script_LeftCableColosseum:
- special Special_WaitForOtherPlayerToExit
+ special WaitForOtherPlayerToExit
scall Script_WalkOutOfLinkBattleRoom
setscene 0
setmapscene COLOSSEUM, 0
end
Script_LeftMobileBattleRoom:
- special Special_Function101220
+ special Function101220
scall Script_WalkOutOfMobileBattleRoom
setscene 0
setmapscene MOBILE_BATTLE_ROOM, 0
@@ -436,7 +436,7 @@ Pokecenter2F_CheckGender:
playsound SFX_TINGLE
applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight
writebyte (PAL_NPC_RED << 4)
- special Special_SetPlayerPalette
+ special SetPlayerPalette
applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft
setflag ENGINE_KRIS_IN_CABLE_CLUB
special ReplaceKrisSprite
@@ -463,7 +463,7 @@ Script_WalkOutOfLinkTradeRoom:
playsound SFX_TINGLE
applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight
writebyte (PAL_NPC_BLUE << 4)
- special Special_SetPlayerPalette
+ special SetPlayerPalette
applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft
special ReplaceKrisSprite
applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesTwoStepsDown_2
@@ -485,7 +485,7 @@ Script_WalkOutOfLinkBattleRoom:
playsound SFX_TINGLE
applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight
writebyte (PAL_NPC_BLUE << 4)
- special Special_SetPlayerPalette
+ special SetPlayerPalette
applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft
special ReplaceKrisSprite
applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesTwoStepsDown_2
@@ -544,7 +544,7 @@ TimeCapsuleScript_CheckPlayerGender:
playsound SFX_TINGLE
applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight
writebyte (PAL_NPC_RED << 4)
- special Special_SetPlayerPalette
+ special SetPlayerPalette
applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingDown
faceobject PLAYER, POKECENTER2F_TIME_CAPSULE_RECEPTIONIST
setflag ENGINE_KRIS_IN_CABLE_CLUB
@@ -558,7 +558,7 @@ TimeCapsuleScript_CheckPlayerGender:
end
Script_LeftTimeCapsule:
- special Special_WaitForOtherPlayerToExit
+ special WaitForOtherPlayerToExit
checkflag ENGINE_KRIS_IN_CABLE_CLUB
iftrue .Female
applymovement POKECENTER2F_TIME_CAPSULE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsLeftLooksRight
@@ -573,7 +573,7 @@ Script_LeftTimeCapsule:
playsound SFX_TINGLE
applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight
writebyte (PAL_NPC_BLUE << 4)
- special Special_SetPlayerPalette
+ special SetPlayerPalette
applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft
special ReplaceKrisSprite
applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesOneStepDown
@@ -585,7 +585,7 @@ Script_LeftTimeCapsule:
MapPokecenter2FSignpost0Script:
refreshscreen
- special Special_DisplayLinkRecord
+ special DisplayLinkRecord
closetext
end
@@ -600,7 +600,7 @@ OfficerScript_0x192c9a:
writetext Text_MysteryGiftDeliveryGuy_HereYouGo
buttonsound
waitsfx
- special Special_GetMysteryGiftItem
+ special GetMysteryGiftItem
iffalse .BagIsFull
itemnotify
setevent EVENT_MYSTERY_GIFT_DELIVERY_GUY
diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm
index eb1561801..64fba2b58 100644
--- a/maps/RadioTower1F.asm
+++ b/maps/RadioTower1F.asm
@@ -34,11 +34,11 @@ GentlemanScript_0x5cd3d:
opentext
writetext UnknownText_0x5ceba
buttonsound
- special Special_CheckLuckyNumberShowFlag
+ special CheckLuckyNumberShowFlag
iffalse .skip
- special Special_ResetLuckyNumberShowFlag
+ special ResetLuckyNumberShowFlag
.skip
- special Special_PrintTodaysLuckyNumber
+ special PrintTodaysLuckyNumber
checkflag ENGINE_LUCKY_NUMBER_SHOW
iftrue .GameOver
writetext UnknownText_0x5cf3a
@@ -53,7 +53,7 @@ GentlemanScript_0x5cd3d:
playsound SFX_DEX_FANFARE_20_49
waitsfx
buttonsound
- special Special_CheckForLuckyNumberWinners
+ special CheckForLuckyNumberWinners
closetext
applymovement RADIOTOWER1F_GENTLEMAN, MovementData_0x5ce74
opentext
diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm
index 605b019aa..2c7c074c1 100644
--- a/maps/RadioTower2F.asm
+++ b/maps/RadioTower2F.asm
@@ -117,7 +117,7 @@ Buena:
if_equal 30, UnknownScript_0x5d87f
playmusic MUSIC_BUENAS_PASSWORD
writetext UnknownText_0x5de35
- special Special_AskRememberPassword
+ special AskRememberPassword
iffalse UnknownScript_0x5d81e
writetext UnknownText_0x5de84
waitbutton
@@ -134,7 +134,7 @@ UnknownScript_0x5d7be:
closetext
spriteface RADIOTOWER2F_BUENA, DOWN
refreshscreen
- special Special_BuenasPassword
+ special BuenasPassword
closetext
iffalse UnknownScript_0x5d845
opentext
@@ -153,7 +153,7 @@ UnknownScript_0x5d7be:
writetext UnknownText_0x5e054
waitbutton
closetext
- special Special_FadeOutMusic
+ special FadeOutMusic
pause 20
special RestartMapMusic
checkcode VAR_BLUECARDBALANCE
@@ -182,7 +182,7 @@ UnknownScript_0x5d81e:
waitbutton
closetext
spriteface RADIOTOWER2F_BUENA, RIGHT
- special Special_FadeOutMusic
+ special FadeOutMusic
pause 20
special RestartMapMusic
end
@@ -213,7 +213,7 @@ UnknownScript_0x5d845:
waitbutton
closetext
spriteface RADIOTOWER2F_BUENA, RIGHT
- special Special_FadeOutMusic
+ special FadeOutMusic
pause 20
special RestartMapMusic
end
@@ -316,7 +316,7 @@ ReceptionistScript_0x5d8ff:
iffalse UnknownScript_0x5d90f
writetext UnknownText_0x5e392
buttonsound
- special Special_BuenaPrize
+ special BuenaPrize
closetext
end
diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm
index 5d452c157..bbea39793 100644
--- a/maps/RadioTower5F.asm
+++ b/maps/RadioTower5F.asm
@@ -95,12 +95,12 @@ RadioTower5FRocketBossScene:
writetext RadioTower5FRocketBossAfterText
waitbutton
closetext
- special Special_FadeBlackQuickly
+ special FadeBlackQuickly
special ReloadSpritesNoPalettes
disappear RADIOTOWER5F_ROCKET
disappear RADIOTOWER5F_ROCKET_GIRL
pause 15
- special Special_FadeInQuickly
+ special FadeInQuickly
setevent EVENT_BEAT_ROCKET_EXECUTIVEM_1
setevent EVENT_CLEARED_RADIO_TOWER
clearflag ENGINE_ROCKETS_IN_RADIO_TOWER
diff --git a/maps/Route24.asm b/maps/Route24.asm
index afb4a514e..de6c3821a 100644
--- a/maps/Route24.asm
+++ b/maps/Route24.asm
@@ -24,15 +24,15 @@ RocketScript_0x1adbfa:
opentext
writetext UnknownText_0x1addc0
buttonsound
- special Special_FadeOutMusic
+ special FadeOutMusic
writetext UnknownText_0x1adee1
waitbutton
closetext
- special Special_FadeBlackQuickly
+ special FadeBlackQuickly
special ReloadSpritesNoPalettes
disappear ROUTE24_ROCKET
pause 25
- special Special_FadeInQuickly
+ special FadeInQuickly
playmapmusic
end
diff --git a/maps/Route26HealHouse.asm b/maps/Route26HealHouse.asm
index e24f7dcc3..83fe7c738 100644
--- a/maps/Route26HealHouse.asm
+++ b/maps/Route26HealHouse.asm
@@ -14,13 +14,13 @@ TeacherScript_0x7b125:
writetext UnknownText_0x7b14d
waitbutton
closetext
- special Special_FadeBlackQuickly
+ special FadeBlackQuickly
special ReloadSpritesNoPalettes
- special Special_StubbedTrainerRankings_Healings
+ special StubbedTrainerRankings_Healings
playmusic MUSIC_HEAL
special HealParty
pause 60
- special Special_FadeInQuickly
+ special FadeInQuickly
special RestartMapMusic
opentext
writetext UnknownText_0x7b18b
diff --git a/maps/Route27SandstormHouse.asm b/maps/Route27SandstormHouse.asm
index 629af1536..c5d0615d1 100644
--- a/maps/Route27SandstormHouse.asm
+++ b/maps/Route27SandstormHouse.asm
@@ -13,7 +13,7 @@ SandstormHouseWoman:
opentext
checkevent EVENT_GOT_TM37_SANDSTORM
iftrue .AlreadyGotItem
- special Special_GetFirstPokemonHappiness
+ special GetFirstPokemonHappiness
writetext SandstormHouseWomanText1
buttonsound
if_greater_than 150 - 1, .Loyal
diff --git a/maps/Route34.asm b/maps/Route34.asm
index aeb532ae9..8fadf3c99 100644
--- a/maps/Route34.asm
+++ b/maps/Route34.asm
@@ -56,7 +56,7 @@ Route34_MapScripts:
DayCareManScript_Outside:
faceplayer
opentext
- special Special_DayCareManOutside
+ special DayCareManOutside
waitbutton
closetext
if_equal TRUE, .end_fail
@@ -77,13 +77,13 @@ DayCareManScript_Outside:
DayCareMon1Script:
opentext
- special Special_DayCareMon1
+ special DayCareMon1
closetext
end
DayCareMon2Script:
opentext
- special Special_DayCareMon2
+ special DayCareMon2
closetext
end
diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm
index 754591060..e5e590930 100644
--- a/maps/Route35NationalParkGate.asm
+++ b/maps/Route35NationalParkGate.asm
@@ -74,7 +74,7 @@ Route35NationalParkGate_MapScripts:
closetext
scall Route35NationalParkGate_EnterContest
playsound SFX_ENTER_DOOR
- special Special_FadeOutPalettes
+ special FadeOutPalettes
waitsfx
warpfacing UP, NATIONAL_PARK_BUG_CONTEST, 10, 47
end
@@ -95,7 +95,7 @@ OfficerScript_0x6a204:
iffalse Route35NationalParkGate_DeclinedToParticipate
checkcode VAR_PARTYCOUNT
if_greater_than 1, Route35NationalParkGate_LeaveTheRestBehind
- special Special_ContestDropOffMons
+ special ContestDropOffMons
clearevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER
Route35NationalParkGate_OkayToProceed:
setflag ENGINE_BUG_CONTEST_TIMER
@@ -108,12 +108,12 @@ Route35NationalParkGate_OkayToProceed:
writetext UnknownText_0x6a3e2
waitbutton
closetext
- special Special_GiveParkBalls
+ special GiveParkBalls
scall Route35NationalParkGate_EnterContest
playsound SFX_ENTER_DOOR
- special Special_FadeOutPalettes
+ special FadeOutPalettes
waitsfx
- special Special_SelectRandomBugContestContestants
+ special SelectRandomBugContestContestants
warpfacing UP, NATIONAL_PARK_BUG_CONTEST, 10, 47
end
@@ -134,12 +134,12 @@ Route35NationalParkGate_LeaveTheRestBehind:
if_equal 0, Route35NationalParkGate_NoRoomInBox
Route35NationalParkGate_LessThanFullParty: ; 6a27d
- special Special_CheckFirstMonIsEgg
+ special CheckFirstMonIsEgg
if_equal TRUE, Route35NationalParkGate_FirstMonIsEgg
writetext UnknownText_0x6a4c6
yesorno
iffalse Route35NationalParkGate_DeclinedToLeaveMonsBehind
- special Special_ContestDropOffMons
+ special ContestDropOffMons
iftrue Route35NationalParkGate_FirstMonIsFainted
setevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER
writetext UnknownText_0x6a537
diff --git a/maps/Route36.asm b/maps/Route36.asm
index cb3cedfed..e0a5d0558 100644
--- a/maps/Route36.asm
+++ b/maps/Route36.asm
@@ -94,8 +94,8 @@ DidntCatchSudowoodo:
applymovement ROUTE36_WEIRD_TREE, WeirdTreeMovement_Flee
disappear ROUTE36_WEIRD_TREE
variablesprite SPRITE_WEIRD_TREE, SPRITE_TWIN
- special Special_LoadUsedSpritesGFX
- special Special_RefreshSprites
+ special LoadUsedSpritesGFX
+ special RefreshSprites
end
Route36FloriaScript:
diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm
index 537cdedd7..a9d3f72d7 100644
--- a/maps/Route36NationalParkGate.asm
+++ b/maps/Route36NationalParkGate.asm
@@ -75,14 +75,14 @@ Route36NationalParkGate_MapScripts:
writetext UnknownText_0x6b2c5
waitbutton
closetext
- special Special_FadeBlackQuickly
+ special FadeBlackQuickly
special ReloadSpritesNoPalettes
scall .CopyContestants
disappear ROUTE36NATIONALPARKGATE_OFFICER1
appear ROUTE36NATIONALPARKGATE_OFFICER2
applymovement PLAYER, MovementData_0x6add1
pause 15
- special Special_FadeInQuickly
+ special FadeInQuickly
jumpstd bugcontestresults
.GoBackToContest:
@@ -91,7 +91,7 @@ Route36NationalParkGate_MapScripts:
closetext
spriteface PLAYER, LEFT
playsound SFX_EXIT_BUILDING
- special Special_FadeOutPalettes
+ special FadeOutPalettes
waitsfx
warpfacing LEFT, NATIONAL_PARK_BUG_CONTEST, 33, 18
end
@@ -156,7 +156,7 @@ Route36OfficerScriptContest:
iffalse .DecidedNotToJoinContest
checkcode VAR_PARTYCOUNT
if_greater_than 1, .LeaveMonsWithOfficer
- special Special_ContestDropOffMons
+ special ContestDropOffMons
clearevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER
.ResumeStartingContest:
setflag ENGINE_BUG_CONTEST_TIMER
@@ -171,12 +171,12 @@ Route36OfficerScriptContest:
waitbutton
closetext
setflag ENGINE_BUG_CONTEST_TIMER
- special Special_GiveParkBalls
+ special GiveParkBalls
spriteface PLAYER, LEFT
playsound SFX_EXIT_BUILDING
- special Special_FadeOutPalettes
+ special FadeOutPalettes
waitsfx
- special Special_SelectRandomBugContestContestants
+ special SelectRandomBugContestContestants
warpfacing LEFT, NATIONAL_PARK_BUG_CONTEST, 33, 18
end
@@ -186,12 +186,12 @@ Route36OfficerScriptContest:
checkcode VAR_BOXSPACE
if_equal 0, .BoxFull
.ContinueLeavingMons:
- special Special_CheckFirstMonIsEgg
+ special CheckFirstMonIsEgg
if_equal TRUE, .FirstMonIsEgg
writetext UnknownText_0x6afb0
yesorno
iffalse .RefusedToLeaveMons
- special Special_ContestDropOffMons
+ special ContestDropOffMons
iftrue .FirstMonIsFainted
setevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER
writetext UnknownText_0x6b021
diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm
index 682b2dea1..a8e54a7ef 100644
--- a/maps/Route39Barn.asm
+++ b/maps/Route39Barn.asm
@@ -52,7 +52,7 @@ MooMoo:
iftrue .HappyCow
writetext Text_WeakMoo
writebyte MILTANK
- special Special_PlaySlowCry
+ special PlaySlowCry
buttonsound
writetext Text_ItsCryIsWeak
checkevent EVENT_TALKED_TO_FARMER_ABOUT_MOOMOO
diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm
index 9f46263de..b7c3117cf 100644
--- a/maps/Route39Farmhouse.asm
+++ b/maps/Route39Farmhouse.asm
@@ -24,7 +24,7 @@ FarmerMScript_SellMilk:
checkitem MOOMOO_MILK
iftrue FarmerMScript_Milking
writetext FarmerMText_BuyMilk
- special Special_PlaceMoneyTopRight
+ special PlaceMoneyTopRight
yesorno
iffalse FarmerMScript_NoSale
checkmoney YOUR_MONEY, 500
@@ -32,7 +32,7 @@ FarmerMScript_SellMilk:
giveitem MOOMOO_MILK
iffalse FarmerMScript_NoRoom
takemoney YOUR_MONEY, 500
- special Special_PlaceMoneyTopRight
+ special PlaceMoneyTopRight
waitsfx
playsound SFX_TRANSACTION
writetext FarmerMText_GotMilk
diff --git a/maps/Route40.asm b/maps/Route40.asm
index 6f1c2fef5..05b6f8f36 100644
--- a/maps/Route40.asm
+++ b/maps/Route40.asm
@@ -79,7 +79,7 @@ Route40Lass1Script:
jumptextfaceplayer Route40Lass1Text
PokefanMScript_0x1a61c7:
- special Special_Mobile_DummyReturnFalse
+ special Mobile_DummyReturnFalse
iftrue .mobile
jumptextfaceplayer UnknownText_0x1a646a
diff --git a/maps/Route45.asm b/maps/Route45.asm
index 728fcdb03..8c696973d 100644
--- a/maps/Route45.asm
+++ b/maps/Route45.asm
@@ -31,7 +31,7 @@ TrainerBlackbeltKenji:
iftrue UnknownScript_0x19e0e4
checkevent EVENT_KENJI_ASKED_FOR_PHONE_NUMBER
iftrue UnknownScript_0x19e0cd
- special Special_SampleKenjiBreakCountdown
+ special SampleKenjiBreakCountdown
writetext UnknownText_0x19e5e2
waitbutton
setevent EVENT_KENJI_ASKED_FOR_PHONE_NUMBER
@@ -61,7 +61,7 @@ UnknownScript_0x19e0e4:
verbosegiveitem PP_UP
iffalse UnknownScript_0x19e118
clearevent EVENT_KENJI_ON_BREAK
- special Special_SampleKenjiBreakCountdown
+ special SampleKenjiBreakCountdown
jump UnknownScript_0x19e127
UnknownScript_0x19e10c:
diff --git a/maps/RuinsOfAlphAerodactylChamber.asm b/maps/RuinsOfAlphAerodactylChamber.asm
index 583dcc8ff..1e244cecc 100644
--- a/maps/RuinsOfAlphAerodactylChamber.asm
+++ b/maps/RuinsOfAlphAerodactylChamber.asm
@@ -50,7 +50,7 @@ RuinsOfAlphAerodactylChamber_MapScripts:
MapRuinsOfAlphAerodactylChamberSignpost2Script:
refreshscreen
writebyte UNOWNPUZZLE_AERODACTYL
- special Special_UnownPuzzle
+ special UnownPuzzle
closetext
iftrue UnknownScript_0x58df7
end
@@ -84,7 +84,7 @@ MapRuinsOfAlphAerodactylChamberSignpost4Script:
opentext
writetext UnknownText_0x58e4f
writebyte UNOWNWORDS_LIGHT
- special Special_DisplayUnownWords
+ special DisplayUnownWords
closetext
end
@@ -94,7 +94,7 @@ MapRuinsOfAlphAerodactylChamberSignpost5Script:
opentext
writetext UnknownText_0x58e81
writebyte UNOWNWORDS_LIGHT
- special Special_DisplayUnownWords
+ special DisplayUnownWords
closetext
end
diff --git a/maps/RuinsOfAlphHoOhChamber.asm b/maps/RuinsOfAlphHoOhChamber.asm
index fd1f21ea0..46c340c9f 100644
--- a/maps/RuinsOfAlphHoOhChamber.asm
+++ b/maps/RuinsOfAlphHoOhChamber.asm
@@ -9,7 +9,7 @@ RuinsOfAlphHoOhChamber_MapScripts:
callback MAPCALLBACK_TILES, .HiddenDoors
.CheckWall:
- special Special_HoOhChamber
+ special HoOhChamber
checkevent EVENT_WALL_OPENED_IN_HO_OH_CHAMBER
iftrue .OpenWall
end
@@ -51,7 +51,7 @@ RuinsOfAlphHoOhChamber_MapScripts:
MapRuinsOfAlphHoOhChamberSignpost2Script:
refreshscreen
writebyte UNOWNPUZZLE_HO_OH
- special Special_UnownPuzzle
+ special UnownPuzzle
closetext
iftrue UnknownScript_0x585ba
end
@@ -85,7 +85,7 @@ MapRuinsOfAlphHoOhChamberSignpost4Script:
opentext
writetext UnknownText_0x58612
writebyte UNOWNWORDS_HO_OH
- special Special_DisplayUnownWords
+ special DisplayUnownWords
closetext
end
@@ -95,7 +95,7 @@ MapRuinsOfAlphHoOhChamberSignpost5Script:
opentext
writetext UnknownText_0x58644
writebyte UNOWNWORDS_HO_OH
- special Special_DisplayUnownWords
+ special DisplayUnownWords
closetext
end
diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm
index 96f7af16e..66110d261 100644
--- a/maps/RuinsOfAlphKabutoChamber.asm
+++ b/maps/RuinsOfAlphKabutoChamber.asm
@@ -57,7 +57,7 @@ RuinsOfAlphKabutoChamberReceptionistScript:
MapRuinsOfAlphKabutoChamberSignpost2Script:
refreshscreen
writebyte UNOWNPUZZLE_KABUTO
- special Special_UnownPuzzle
+ special UnownPuzzle
closetext
iftrue UnknownScript_0x58778
end
@@ -122,7 +122,7 @@ MapRuinsOfAlphKabutoChamberSignpost4Script:
opentext
writetext UnknownText_0x58aa7
writebyte UNOWNWORDS_ESCAPE
- special Special_DisplayUnownWords
+ special DisplayUnownWords
closetext
end
@@ -132,7 +132,7 @@ MapRuinsOfAlphKabutoChamberSignpost5Script:
opentext
writetext UnknownText_0x58ad9
writebyte UNOWNWORDS_ESCAPE
- special Special_DisplayUnownWords
+ special DisplayUnownWords
closetext
end
diff --git a/maps/RuinsOfAlphOmanyteChamber.asm b/maps/RuinsOfAlphOmanyteChamber.asm
index 6d1892f9e..b99ba1825 100644
--- a/maps/RuinsOfAlphOmanyteChamber.asm
+++ b/maps/RuinsOfAlphOmanyteChamber.asm
@@ -9,7 +9,7 @@ RuinsOfAlphOmanyteChamber_MapScripts:
callback MAPCALLBACK_TILES, .HiddenDoors
.CheckWall:
- special Special_OmanyteChamber
+ special OmanyteChamber
checkevent EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER
iftrue .OpenWall
end
@@ -51,7 +51,7 @@ RuinsOfAlphOmanyteChamber_MapScripts:
MapRuinsOfAlphOmanyteChamberSignpost2Script:
refreshscreen
writebyte UNOWNPUZZLE_OMANYTE
- special Special_UnownPuzzle
+ special UnownPuzzle
closetext
iftrue UnknownScript_0x58c36
end
@@ -85,7 +85,7 @@ MapRuinsOfAlphOmanyteChamberSignpost4Script:
opentext
writetext UnknownText_0x58c8e
writebyte UNOWNWORDS_WATER
- special Special_DisplayUnownWords
+ special DisplayUnownWords
closetext
end
@@ -95,7 +95,7 @@ MapRuinsOfAlphOmanyteChamberSignpost5Script:
opentext
writetext UnknownText_0x58cc0
writebyte UNOWNWORDS_WATER
- special Special_DisplayUnownWords
+ special DisplayUnownWords
closetext
end
diff --git a/maps/RuinsOfAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm
index 1595ce59a..184e5349c 100644
--- a/maps/RuinsOfAlphResearchCenter.asm
+++ b/maps/RuinsOfAlphResearchCenter.asm
@@ -165,7 +165,7 @@ UnknownScript_0x5925a:
UnknownScript_0x59260:
writetext UnknownText_0x5982d
waitbutton
- special Special_UnownPrinter
+ special UnownPrinter
closetext
end
diff --git a/maps/SaffronMagnetTrainStation.asm b/maps/SaffronMagnetTrainStation.asm
index 0d69d2017..ad5b4a8bd 100644
--- a/maps/SaffronMagnetTrainStation.asm
+++ b/maps/SaffronMagnetTrainStation.asm
@@ -37,7 +37,7 @@ OfficerScript_0x18a81e:
applymovement SAFFRONMAGNETTRAINSTATION_OFFICER, MovementData_0x18a88f
applymovement PLAYER, MovementData_0x18a898
writebyte TRUE
- special Special_MagnetTrain
+ special MagnetTrain
warpcheck
newloadmap MAPSETUP_TRAIN
applymovement PLAYER, .MovementBoardTheTrain
diff --git a/maps/SaffronPokecenter1F.asm b/maps/SaffronPokecenter1F.asm
index d53fdb684..453ac6df5 100644
--- a/maps/SaffronPokecenter1F.asm
+++ b/maps/SaffronPokecenter1F.asm
@@ -15,7 +15,7 @@ NurseScript_0x18a47d:
jumpstd pokecenternurse
TeacherScript_0x18a480:
- special Special_Mobile_DummyReturnFalse
+ special Mobile_DummyReturnFalse
iftrue .mobile
jumptextfaceplayer UnknownText_0x18a4a3
diff --git a/maps/SilverCaveRoom3.asm b/maps/SilverCaveRoom3.asm
index 705ca0cc1..7d8c5897f 100644
--- a/maps/SilverCaveRoom3.asm
+++ b/maps/SilverCaveRoom3.asm
@@ -9,7 +9,7 @@ SilverCaveRoom3_MapScripts:
db 0
Red:
- special Special_FadeOutMusic
+ special FadeOutMusic
faceplayer
opentext
writetext .Text1
@@ -20,16 +20,16 @@ Red:
startbattle
dontrestartmapmusic
reloadmapafterbattle
- special Special_FadeOutMusic
+ special FadeOutMusic
opentext
writetext .Text3
waitbutton
closetext
- special Special_FadeBlackQuickly
+ special FadeBlackQuickly
special ReloadSpritesNoPalettes
disappear SILVERCAVEROOM3_RED
pause 15
- special Special_FadeInQuickly
+ special FadeInQuickly
pause 30
special HealParty
refreshscreen
diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm
index 7c2490b45..d2c32b671 100644
--- a/maps/SlowpokeWellB1F.asm
+++ b/maps/SlowpokeWellB1F.asm
@@ -38,14 +38,14 @@ TrainerGruntM1:
writetext TrainerGruntM1WhenTalkText
waitbutton
closetext
- special Special_FadeBlackQuickly
+ special FadeBlackQuickly
special ReloadSpritesNoPalettes
disappear SLOWPOKEWELLB1F_ROCKET1
disappear SLOWPOKEWELLB1F_ROCKET2
disappear SLOWPOKEWELLB1F_ROCKET3
disappear SLOWPOKEWELLB1F_ROCKET_GIRL
pause 15
- special Special_FadeInQuickly
+ special FadeInQuickly
disappear SLOWPOKEWELLB1F_KURT
moveobject SLOWPOKEWELLB1F_KURT, 11, 6
appear SLOWPOKEWELLB1F_KURT
@@ -67,7 +67,7 @@ TrainerGruntM1:
clearevent EVENT_AZALEA_TOWN_SLOWPOKES
clearevent EVENT_KURTS_HOUSE_SLOWPOKE
clearevent EVENT_KURTS_HOUSE_KURT_1
- special Special_FadeOutPalettes
+ special FadeOutPalettes
special HealParty
pause 15
warp KURTS_HOUSE, 3, 3
diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm
index e160dd872..9e2896992 100644
--- a/maps/SproutTower3F.asm
+++ b/maps/SproutTower3F.asm
@@ -25,7 +25,7 @@ SproutTower3F_MapScripts:
UnknownScript_0x184947:
spriteface PLAYER, UP
showemote EMOTE_SHOCK, PLAYER, 15
- special Special_FadeOutMusic
+ special FadeOutMusic
playsound SFX_TACKLE
playsound SFX_ELEVATOR
earthquake 79
@@ -54,11 +54,11 @@ UnknownScript_0x184947:
pause 15
closetext
playsound SFX_WARP_TO
- special Special_FadeBlackQuickly
+ special FadeBlackQuickly
special ReloadSpritesNoPalettes
disappear SPROUTTOWER3F_SILVER
waitsfx
- special Special_FadeInQuickly
+ special FadeInQuickly
setscene 1
special RestartMapMusic
end
diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm
index f4705a131..67efc752c 100644
--- a/maps/TeamRocketBaseB1F.asm
+++ b/maps/TeamRocketBaseB1F.asm
@@ -448,9 +448,9 @@ ExplodingTrap22:
end
VoltorbExplodingTrap:
- special Special_FadeOutPalettes
+ special FadeOutPalettes
cry VOLTORB
- special Special_FadeInPalettes
+ special FadeInPalettes
setlasttalked -1
writecode VAR_BATTLETYPE, BATTLETYPE_TRAP
loadwildmon VOLTORB, 23
@@ -458,9 +458,9 @@ VoltorbExplodingTrap:
end
GeodudeExplodingTrap:
- special Special_FadeOutPalettes
+ special FadeOutPalettes
cry GEODUDE
- special Special_FadeInPalettes
+ special FadeInPalettes
setlasttalked -1
writecode VAR_BATTLETYPE, BATTLETYPE_TRAP
loadwildmon GEODUDE, 21
@@ -468,9 +468,9 @@ GeodudeExplodingTrap:
end
KoffingExplodingTrap:
- special Special_FadeOutPalettes
+ special FadeOutPalettes
cry KOFFING
- special Special_FadeInPalettes
+ special FadeInPalettes
setlasttalked -1
writecode VAR_BATTLETYPE, BATTLETYPE_TRAP
loadwildmon KOFFING, 21
diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm
index f29337812..bf5a6248f 100644
--- a/maps/TeamRocketBaseB2F.asm
+++ b/maps/TeamRocketBaseB2F.asm
@@ -109,7 +109,7 @@ UnknownScript_0x6cfac:
writetext UnknownText_0x6d4c6
waitbutton
closetext
- special Special_FadeBlackQuickly
+ special FadeBlackQuickly
special ReloadSpritesNoPalettes
disappear TEAMROCKETBASEB2F_ROCKET1
disappear TEAMROCKETBASEB2F_ROCKET_GIRL
@@ -117,7 +117,7 @@ UnknownScript_0x6cfac:
disappear TEAMROCKETBASEB2F_ROCKET3
disappear TEAMROCKETBASEB2F_ROCKET4
pause 15
- special Special_FadeInQuickly
+ special FadeInQuickly
setscene 2
clearevent EVENT_TEAM_ROCKET_BASE_B2F_LANCE
spriteface TEAMROCKETBASEB2F_LANCE, DOWN
@@ -166,11 +166,11 @@ LanceHealsCommon:
writetext LanceHealsText1
waitbutton
closetext
- special Special_FadeOutPalettes
- special Special_StubbedTrainerRankings_Healings
+ special FadeOutPalettes
+ special StubbedTrainerRankings_Healings
playsound SFX_FULL_HEAL
special HealParty
- special Special_FadeInPalettes
+ special FadeInPalettes
opentext
writetext LanceHealsText2
waitbutton
diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm
index 7b64414a6..80f4b30e4 100644
--- a/maps/TeamRocketBaseB3F.asm
+++ b/maps/TeamRocketBaseB3F.asm
@@ -66,7 +66,7 @@ LanceGetPasswordScript:
RocketBaseRival:
spriteface PLAYER, LEFT
showemote EMOTE_SHOCK, PLAYER, 15
- special Special_FadeOutMusic
+ special FadeOutMusic
appear TEAMROCKETBASEB3F_SILVER
applymovement TEAMROCKETBASEB3F_SILVER, RocketBaseRivalEnterMovement
spriteface PLAYER, LEFT
diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm
index 3b6a4971f..c0366f94d 100644
--- a/maps/TimeCapsule.asm
+++ b/maps/TimeCapsule.asm
@@ -20,7 +20,7 @@ TimeCapsule_MapScripts:
end
.SetWhichChris:
- special Special_CableClubCheckWhichChris
+ special CableClubCheckWhichChris
iffalse .Chris2
disappear TIMECAPSULE_CHRIS2
appear TIMECAPSULE_CHRIS1
@@ -37,7 +37,7 @@ TimeCapsule_MapScripts:
end
MapTimeCapsuleSignpost1Script:
- special Special_TimeCapsule
+ special TimeCapsule
newloadmap MAPSETUP_LINKRETURN
end
diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm
index cd20d59b2..ac6ca8863 100644
--- a/maps/TinTower1F.asm
+++ b/maps/TinTower1F.asm
@@ -33,7 +33,7 @@ TinTower1F_MapScripts:
iftrue .GotRainbowWing
checkevent EVENT_BEAT_ELITE_FOUR
iffalse .FaceBeasts
- special Special_BeastsCheck
+ special BeastsCheck
iffalse .FaceBeasts
clearevent EVENT_TIN_TOWER_1F_WISE_TRIO_2
setevent EVENT_TIN_TOWER_1F_WISE_TRIO_1
@@ -49,7 +49,7 @@ TinTower1F_MapScripts:
iftrue .FoughtSuicune
appear TINTOWER1F_SUICUNE
writebyte RAIKOU
- special Special_MonCheck
+ special MonCheck
iftrue .NoRaikou
appear TINTOWER1F_RAIKOU
jump .CheckEntei
@@ -58,7 +58,7 @@ TinTower1F_MapScripts:
disappear TINTOWER1F_RAIKOU
.CheckEntei:
writebyte ENTEI
- special Special_MonCheck
+ special MonCheck
iftrue .NoEntei
appear TINTOWER1F_ENTEI
jump .BeastsDone
@@ -87,7 +87,7 @@ TinTower1F_MapScripts:
applymovement PLAYER, TinTowerPlayerMovement1
pause 15
writebyte RAIKOU
- special Special_MonCheck
+ special MonCheck
iftrue .Next1 ; if player caught Raikou, he doesn't appear in Tin Tower
applymovement TINTOWER1F_RAIKOU, TinTowerRaikouMovement1
spriteface PLAYER, LEFT
@@ -100,7 +100,7 @@ TinTower1F_MapScripts:
waitsfx
.Next1:
writebyte ENTEI
- special Special_MonCheck
+ special MonCheck
iftrue .Next2 ; if player caught Entei, he doesn't appear in Tin Tower
applymovement TINTOWER1F_ENTEI, TinTowerEnteiMovement1
spriteface PLAYER, RIGHT
@@ -164,7 +164,7 @@ TinTower1F_MapScripts:
playsound SFX_EXIT_BUILDING
disappear TINTOWER1F_EUSINE
waitsfx
- special Special_FadeOutMusic
+ special FadeOutMusic
pause 20
playmapmusic
end
diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm
index 3479bd180..168abe1e7 100644
--- a/maps/TradeCenter.asm
+++ b/maps/TradeCenter.asm
@@ -20,7 +20,7 @@ TradeCenter_MapScripts:
end
.SetWhichChris:
- special Special_CableClubCheckWhichChris
+ special CableClubCheckWhichChris
iffalse .Chris2
disappear TRADECENTER_CHRIS2
appear TRADECENTER_CHRIS1
@@ -37,7 +37,7 @@ TradeCenter_MapScripts:
end
MapTradeCenterSignpost1Script:
- special Special_TradeCenter
+ special TradeCenter
newloadmap MAPSETUP_LINKRETURN
end
diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm
index bb6fd4316..3de28611b 100644
--- a/maps/TrainerHouseB1F.asm
+++ b/maps/TrainerHouseB1F.asm
@@ -20,7 +20,7 @@ TrainerHouseReceptionistScript:
iftrue .FoughtTooManyTimes
writetext TrainerHouseB1FIntroText
buttonsound
- special Special_TrainerHouse
+ special TrainerHouse
iffalse .GetCal3Name
trainertotext CAL, CAL2, MEM_BUFFER_0
jump .GotName
@@ -42,7 +42,7 @@ TrainerHouseReceptionistScript:
writetext TrainerHouseB1FCalBeforeText
waitbutton
closetext
- special Special_TrainerHouse
+ special TrainerHouse
iffalse .NoSpecialBattle
winlosstext TrainerHouseB1FCalBeatenText, 0
setlasttalked TRAINERHOUSEB1F_CHRIS
diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm
index 978ac943d..92d0ca5e2 100644
--- a/maps/VermilionCity.asm
+++ b/maps/VermilionCity.asm
@@ -42,7 +42,7 @@ VermilionCitySuperNerdScript:
VermilionSnorlax:
opentext
- special Special_SnorlaxAwake
+ special SnorlaxAwake
iftrue UnknownScript_0x1aa9ab
writetext UnknownText_0x1aab64
waitbutton
diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm
index fa5bb186a..f7f956f43 100644
--- a/maps/VermilionPort.asm
+++ b/maps/VermilionPort.asm
@@ -52,7 +52,7 @@ SailorScript_0x74dc4:
waitsfx
applymovement PLAYER, MovementData_0x74ef1
playsound SFX_EXIT_BUILDING
- special Special_FadeOutPalettes
+ special FadeOutPalettes
waitsfx
setevent EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
clearevent EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm
index 7bc86ec04..44250c783 100644
--- a/maps/VictoryRoad.asm
+++ b/maps/VictoryRoad.asm
@@ -25,7 +25,7 @@ UnknownScript_0x74492:
moveobject VICTORYROAD_SILVER, 18, 11
spriteface PLAYER, DOWN
showemote EMOTE_SHOCK, PLAYER, 15
- special Special_FadeOutMusic
+ special FadeOutMusic
pause 15
appear VICTORYROAD_SILVER
applymovement VICTORYROAD_SILVER, MovementData_0x74539
@@ -39,7 +39,7 @@ UnknownScript_0x74492:
UnknownScript_0x744b5:
spriteface PLAYER, DOWN
showemote EMOTE_SHOCK, PLAYER, 15
- special Special_FadeOutMusic
+ special FadeOutMusic
pause 15
appear VICTORYROAD_SILVER
applymovement VICTORYROAD_SILVER, MovementData_0x74542