diff options
Diffstat (limited to 'maps/BattleTowerElevator.asm')
| -rw-r--r-- | maps/BattleTowerElevator.asm | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/maps/BattleTowerElevator.asm b/maps/BattleTowerElevator.asm index 2ae68654c..c2d51f5fc 100644 --- a/maps/BattleTowerElevator.asm +++ b/maps/BattleTowerElevator.asm @@ -2,21 +2,19 @@ const_value set 2 const BATTLETOWERELEVATOR_RECEPTIONIST BattleTowerElevator_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + scene_script .Scene0 + scene_script .Scene1 .MapCallbacks: db 0 -.Trigger0: +.Scene0: priorityjump .RideElevator - dotrigger $1 + setscene $1 -.Trigger1: +.Scene1: end .RideElevator: @@ -55,12 +53,12 @@ BattleTowerElevator_MapEventHeader: warp_def $3, $1, 1, BATTLE_TOWER_HALLWAY warp_def $3, $2, 1, BATTLE_TOWER_HALLWAY -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_RECEPTIONIST, 2, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MovementData_BattleTowerElevatorReceptionistWalksIn, -1 + object_event SPRITE_RECEPTIONIST, 2, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MovementData_BattleTowerElevatorReceptionistWalksIn, -1 |