diff options
Diffstat (limited to 'maps/BattleTower1F.asm')
| -rw-r--r-- | maps/BattleTower1F.asm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm index 8fd6f9f97..16fe01c99 100644 --- a/maps/BattleTower1F.asm +++ b/maps/BattleTower1F.asm @@ -7,8 +7,8 @@ BattleTower1F_MapScripts: db 2 ; scene scripts - scene_script .Scene0 - scene_script .Scene1 + scene_script .Scene0 ; SCENE_BATTLETOWER1F_0 + scene_script .Scene1 ; SCENE_BATTLETOWER1F_1 db 0 ; callbacks @@ -36,7 +36,7 @@ BattleTower1F_MapScripts: writebyte BATTLETOWERACTION_06 special BattleTowerAction .SkipEverything: - setscene 1 + setscene SCENE_BATTLETOWER1F_1 .Scene1: end @@ -79,10 +79,10 @@ Script_ChooseChallenge: ; 0x9e40f writetext Text_SaveBeforeEnteringBattleRoom yesorno iffalse Script_Menu_ChallengeExplanationCancel - setscene 0 + setscene SCENE_BATTLETOWER1F_0 special TryQuickSave iffalse Script_Menu_ChallengeExplanationCancel - setscene 1 + setscene SCENE_BATTLETOWER1F_1 writebyte BATTLETOWERACTION_SET_EXPLANATION_READ ; set 1, [sBattleTowerSaveFileFlags] special BattleTowerAction special BattleTowerRoomMenu @@ -103,9 +103,9 @@ Script_ResumeBattleTowerChallenge: special BattleTowerAction Script_WalkToBattleTowerElevator: musicfadeout MUSIC_NONE, 8 - setmapscene BATTLE_TOWER_BATTLE_ROOM, 0 - setmapscene BATTLE_TOWER_ELEVATOR, 0 - setmapscene BATTLE_TOWER_HALLWAY, 0 + setmapscene BATTLE_TOWER_BATTLE_ROOM, SCENE_BATTLETOWERBATTLEROOM_0 + setmapscene BATTLE_TOWER_ELEVATOR, SCENE_BATTLETOWERELEVATOR_0 + setmapscene BATTLE_TOWER_HALLWAY, SCENE_BATTLETOWERHALLWAY_0 follow BATTLETOWER1F_RECEPTIONIST, PLAYER applymovement BATTLETOWER1F_RECEPTIONIST, MovementData_BattleTower1FWalkToElevator writebyte BATTLETOWERACTION_0A @@ -206,10 +206,10 @@ continue: writetext Text_SaveBeforeReentry yesorno iffalse Script_Menu_ChallengeExplanationCancel - setscene 0 + setscene SCENE_BATTLETOWER1F_0 special TryQuickSave iffalse Script_Menu_ChallengeExplanationCancel - setscene 1 + setscene SCENE_BATTLETOWER1F_1 writebyte BATTLETOWERACTION_06 special BattleTowerAction writebyte BATTLETOWERACTION_12 |