Remove Special_ prefix from special routines (close #478)

This commit is contained in:
Rangi
2018-01-24 11:17:05 -05:00
parent 132fe46925
commit d719d318e8
163 changed files with 758 additions and 758 deletions

View File

@@ -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