summaryrefslogtreecommitdiff
path: root/maps/BattleTowerBattleRoom.asm
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2015-12-08 16:06:13 -0500
committerPikalaxALT <PikalaxALT@gmail.com>2015-12-08 16:06:13 -0500
commit5b7fc7b0fabec8461c9931cc31a15bf0b28cfe86 (patch)
tree535a2270f8b01f98f5d00db0a5c8c5dd17d66b11 /maps/BattleTowerBattleRoom.asm
parent0549e3413f61e1166441f1630f4d5f2be25e9974 (diff)
More battle tower shenanigans
Diffstat (limited to 'maps/BattleTowerBattleRoom.asm')
-rw-r--r--maps/BattleTowerBattleRoom.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm
index faa45fea2..a264f51d5 100644
--- a/maps/BattleTowerBattleRoom.asm
+++ b/maps/BattleTowerBattleRoom.asm
@@ -24,7 +24,7 @@ Script_BattleRoom: ; 0x9f421
applymovement PLAYER, MovementData_BattleTowerBattleRoomPlayerWalksIn
; beat all 7 opponents in a row
Script_BattleRoomLoop: ; 0x9f425
- writebyte $2
+ writebyte BATTLETOWERBATTLEROOM_YOUNGSTER
special Function_LoadOpponentTrainerAndPokemonsWithOTSprite
appear BATTLETOWERBATTLEROOM_YOUNGSTER
warpsound
@@ -71,9 +71,9 @@ Script_DontBattleNextOpponent: ; 0x9f483
iffalse Script_DontSaveAndEndTheSession
writebyte BATTLETOWERACTION_SAVELEVELGROUP ; save level group
special BattleTowerAction
- writebyte BATTLETOWERACTION_CHOOSEREWARD ; choose reward
+ writebyte BATTLETOWERACTION_SAVEOPTIONS ; choose reward
special BattleTowerAction
- writebyte BATTLETOWERACTION_03 ; quicksave
+ writebyte BATTLETOWERACTION_SAVE_AND_QUIT ; quicksave
special BattleTowerAction
playsound SFX_SAVE
waitsfx