diff options
Diffstat (limited to 'maps/BrunosRoom.asm')
| -rw-r--r-- | maps/BrunosRoom.asm | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm index ba1e8c3c8..c1e09e6ee 100644 --- a/maps/BrunosRoom.asm +++ b/maps/BrunosRoom.asm @@ -4,23 +4,18 @@ const_value set 2 BrunosRoom_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw .Trigger0, 0 - dw .Trigger1, 0 + maptrigger .LockDoor + maptrigger .DummyTrigger .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_TILES, .BrunosRoomDoors -.Trigger0: +.LockDoor: priorityjump .BrunosDoorLocksBehindYou end -.Trigger1: +.DummyTrigger: end .BrunosRoomDoors: @@ -148,4 +143,4 @@ BrunosRoom_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_BRUNO, 7, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, BrunoScript_Battle, -1 + person_event SPRITE_BRUNO, 7, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, BrunoScript_Battle, -1 |