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

Consolidate Special function names

Browse Source
This commit is contained in:
xCrystal
2018-01-02 17:13:57 +01:00
parent 7c0e903c48
commit f1ea15bbfe
92 changed files with 278 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
maps/BattleTowerBattleRoom.asm
View File

@@ -33,7 +33,7 @@ Script_BattleRoomLoop: ; 0x9f425
buttonsound
closetext
special BattleTowerBattle ; calls predef startbattle
special FadeOutPalettes
special 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 FadeOutPalettes
special Special_FadeOutPalettes
special LoadMapPalettes
pause 60
special FadeInPalettes
special Special_FadeInPalettes
special RestartMapMusic
opentext
writetext Text_NextUpOpponentNo
@@ -75,7 +75,7 @@ Script_DontBattleNextOpponent: ; 0x9f483
special BattleTowerAction
playsound SFX_SAVE
waitsfx
special FadeOutPalettes
special Special_FadeOutPalettes
special Reset
Script_DontSaveAndEndTheSession: ; 0x9f4a3
writetext Text_CancelYourBattleRoomChallenge
@@ -86,7 +86,7 @@ Script_DontSaveAndEndTheSession: ; 0x9f4a3
writebyte BATTLETOWERACTION_06
special BattleTowerAction
closetext
special FadeOutPalettes
special Special_FadeOutPalettes
warpfacing UP, BATTLE_TOWER_1F, $7, $7
opentext
jump Script_BattleTowerHopeToServeYouAgain