diff options
Diffstat (limited to 'maps/BrunosRoom.asm')
| -rw-r--r-- | maps/BrunosRoom.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm index c1e09e6ee..8ac5547de 100644 --- a/maps/BrunosRoom.asm +++ b/maps/BrunosRoom.asm @@ -2,10 +2,10 @@ const_value set 2 const BRUNOSROOM_BRUNO BrunosRoom_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - maptrigger .LockDoor - maptrigger .DummyTrigger + scene_script .LockDoor + scene_script .DummyScene .MapCallbacks: db 1 @@ -15,7 +15,7 @@ BrunosRoom_MapScriptHeader: priorityjump .BrunosDoorLocksBehindYou end -.DummyTrigger: +.DummyScene: end .BrunosRoomDoors: @@ -37,7 +37,7 @@ BrunosRoom_MapScriptHeader: changeblock $4, $e, $2a reloadmappart closetext - dotrigger $1 + setscene $1 setevent EVENT_BRUNOS_ROOM_ENTRANCE_CLOSED waitsfx end @@ -135,12 +135,12 @@ BrunosRoom_MapEventHeader: warp_def $2, $4, 1, KARENS_ROOM warp_def $2, $5, 2, KARENS_ROOM -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 1 - person_event SPRITE_BRUNO, 7, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, BrunoScript_Battle, -1 + object_event SPRITE_BRUNO, 7, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BrunoScript_Battle, -1 |