diff options
Diffstat (limited to 'maps/BattleTowerBattleRoom.asm')
| -rw-r--r-- | maps/BattleTowerBattleRoom.asm | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index 6a23dbcc1..22cbdef3f 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 Function_LoadOpponentTrainerAndPokemonsWithOTSprite + special Special_LoadOpponentTrainerAndPokemonWithOTSprite appear BATTLETOWERBATTLEROOM_YOUNGSTER warpsound waitsfx @@ -32,8 +32,8 @@ Script_BattleRoomLoop: ; 0x9f425 battletowertext BATTLETOWERTEXT_INTRO buttonsound closetext - special BattleTowerBattle ; calls predef startbattle - special FadeOutPalettes + special Special_BattleTowerBattle ; calls predef startbattle + 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 LoadMapPalettes + special Special_FadeOutPalettes + special Special_LoadMapPalettes pause 60 - special FadeInPalettes + special Special_FadeInPalettes special RestartMapMusic opentext writetext Text_NextUpOpponentNo @@ -68,25 +68,25 @@ 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 FadeOutPalettes + special Special_FadeOutPalettes special Reset Script_DontSaveAndEndTheSession: ; 0x9f4a3 writetext Text_CancelYourBattleRoomChallenge yesorno iffalse Script_ContinueAndBattleNextOpponent writebyte BATTLETOWERACTION_CHALLENGECANCELED - special BattleTowerAction + special Special_BattleTowerAction writebyte BATTLETOWERACTION_06 - special BattleTowerAction + special Special_BattleTowerAction closetext - special FadeOutPalettes + special Special_FadeOutPalettes warpfacing UP, BATTLE_TOWER_1F, 7, 7 opentext jump Script_BattleTowerHopeToServeYouAgain @@ -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 |