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 18ecdbb68..d5c1be4ac 100644 --- a/maps/BrunosRoom.asm +++ b/maps/BrunosRoom.asm @@ -1,12 +1,12 @@ BrunosRoom_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x180993, $0000 dw UnknownScript_0x180997, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -21,7 +21,7 @@ UnknownScript_0x180997: end UnknownScript_0x180998: - checkevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED + checkevent EVENT_BRUNOS_ROOM_ENTRANCE_CLOSED iffalse UnknownScript_0x1809a2 changeblock $4, $e, $2a UnknownScript_0x1809a2: @@ -40,7 +40,7 @@ UnknownScript_0x1809ad: reloadmappart loadmovesprites dotrigger $1 - setevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED + setevent EVENT_BRUNOS_ROOM_ENTRANCE_CLOSED waitbutton end @@ -130,19 +130,19 @@ BrunosRoom_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $11, $4, 3, GROUP_KOGAS_ROOM, MAP_KOGAS_ROOM warp_def $11, $5, 4, GROUP_KOGAS_ROOM, MAP_KOGAS_ROOM warp_def $2, $4, 1, GROUP_KARENS_ROOM, MAP_KARENS_ROOM warp_def $2, $5, 2, GROUP_KARENS_ROOM, MAP_KARENS_ROOM - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 - person_event SPRITE_BRUNO, 11, 9, $6, $0, 255, 255, $b0, 0, BrunoScript_0x1809c5, -1 + person_event SPRITE_BRUNO, 11, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, BrunoScript_0x1809c5, -1 |