pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

Finish consistent Special function names

Browse Source
This commit is contained in:
xCrystal
2018-01-02 17:47:58 +01:00
parent f1ea15bbfe
commit b4a49351c1
47 changed files with 207 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
maps/BattleTowerBattleRoom.asm
View File

@@ -23,7 +23,7 @@ Script_BattleRoom: ; 0x9f421
; beat all 7 opponents in a row
Script_BattleRoomLoop: ; 0x9f425
writebyte BATTLETOWERBATTLEROOM_YOUNGSTER
special Function_LoadOpponentTrainerAndPokemonsWithOTSprite
special Special_LoadOpponentTrainerAndPokemonWithOTSprite
appear BATTLETOWERBATTLEROOM_YOUNGSTER
warpsound
waitsfx
@@ -32,7 +32,7 @@ Script_BattleRoomLoop: ; 0x9f425
battletowertext 1
buttonsound
closetext
special BattleTowerBattle ; calls predef startbattle
special Special_BattleTowerBattle ; calls predef startbattle
special Special_FadeOutPalettes
reloadmap
if_not_equal $0, Script_FailedBattleTowerChallenge
@@ -49,7 +49,7 @@ Script_BattleRoomLoop: ; 0x9f425
closetext
playmusic MUSIC_HEAL
special Special_FadeOutPalettes
special LoadMapPalettes
special Special_LoadMapPalettes
pause 60
special Special_FadeInPalettes
special RestartMapMusic
@@ -68,11 +68,11 @@ Script_DontBattleNextOpponent: ; 0x9f483
yesorno
iffalse Script_DontSaveAndEndTheSession
writebyte BATTLETOWERACTION_SAVELEVELGROUP ; save level group
special BattleTowerAction
special Special_BattleTowerAction
writebyte BATTLETOWERACTION_SAVEOPTIONS ; choose reward
special BattleTowerAction
special Special_BattleTowerAction
writebyte BATTLETOWERACTION_SAVE_AND_QUIT ; quicksave
special BattleTowerAction
special Special_BattleTowerAction
playsound SFX_SAVE
waitsfx
special Special_FadeOutPalettes
@@ -82,9 +82,9 @@ Script_DontSaveAndEndTheSession: ; 0x9f4a3
yesorno
iffalse Script_ContinueAndBattleNextOpponent
writebyte BATTLETOWERACTION_CHALLENGECANCELED
special BattleTowerAction
special Special_BattleTowerAction
writebyte BATTLETOWERACTION_06
special BattleTowerAction
special Special_BattleTowerAction
closetext
special Special_FadeOutPalettes
warpfacing UP, BATTLE_TOWER_1F, $7, $7
@@ -96,7 +96,7 @@ Script_FailedBattleTowerChallenge:
special Special_BattleTowerFade
warpfacing UP, BATTLE_TOWER_1F, $7, $7
writebyte BATTLETOWERACTION_CHALLENGECANCELED
special BattleTowerAction
special Special_BattleTowerAction
opentext
writetext Text_ThanksForVisiting
waitbutton
@@ -114,7 +114,7 @@ Script_BeatenAllTrainers2:
UnreferencedScript_0x9f4eb:
writebyte BATTLETOWERACTION_CHALLENGECANCELED
special BattleTowerAction
special Special_BattleTowerAction
opentext
writetext Text_TooMuchTimeElapsedNoRegister
waitbutton
@@ -123,9 +123,9 @@ UnreferencedScript_0x9f4eb:
UnreferencedScript_0x9f4f7:
writebyte BATTLETOWERACTION_CHALLENGECANCELED
special BattleTowerAction
special Special_BattleTowerAction
writebyte BATTLETOWERACTION_06
special BattleTowerAction
special Special_BattleTowerAction
opentext
writetext Text_ThanksForVisiting
writetext Text_WeHopeToServeYouAgain