diff options
Diffstat (limited to 'maps/BattleTowerHallway.asm')
| -rw-r--r-- | maps/BattleTowerHallway.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm index cc65fcbfd..dc60a0440 100644 --- a/maps/BattleTowerHallway.asm +++ b/maps/BattleTowerHallway.asm @@ -2,18 +2,18 @@ const_value set 2 const BATTLETOWERHALLWAY_RECEPTIONIST BattleTowerHallway_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - maptrigger .Trigger0 - maptrigger .Trigger1 + scene_script .Scene0 + scene_script .Scene1 .MapCallbacks: db 0 -.Trigger0: +.Scene0: priorityjump .ChooseBattleRoom - dotrigger $1 -.Trigger1: + setscene $1 +.Scene1: end .ChooseBattleRoom: @@ -68,7 +68,7 @@ BattleTowerHallway_MapScriptHeader: jump .EnterBattleRoom .EnterBattleRoom: ; 0x9f61f - faceperson PLAYER, BATTLETOWERHALLWAY_RECEPTIONIST + faceobject PLAYER, BATTLETOWERHALLWAY_RECEPTIONIST opentext writetext Text_PleaseStepThisWay waitbutton @@ -91,12 +91,12 @@ BattleTowerHallway_MapEventHeader: warp_def $0, $d, 1, BATTLE_TOWER_BATTLE_ROOM warp_def $0, $f, 1, BATTLE_TOWER_BATTLE_ROOM -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_RECEPTIONIST, 2, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BattleTowerHallway_MapEventHeader, -1 + object_event SPRITE_RECEPTIONIST, 2, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTowerHallway_MapEventHeader, -1 |