Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove Special_ prefix from special routines (close #478)

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

64
maps/BattleTower1F.asm
View File

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