summaryrefslogtreecommitdiff
path: root/maps/KarensRoom.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/KarensRoom.asm')
-rw-r--r--maps/KarensRoom.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm
index e26e802dc..3e0f761e8 100644
--- a/maps/KarensRoom.asm
+++ b/maps/KarensRoom.asm
@@ -1,12 +1,12 @@
KarensRoom_MapScriptHeader:
- ; trigger count
+.MapTriggers:
db 2
; triggers
dw UnknownScript_0x180bbc, $0000
dw UnknownScript_0x180bc0, $0000
- ; callback count
+.MapCallbacks:
db 1
; callbacks
@@ -138,19 +138,19 @@ KarensRoom_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 4
warp_def $11, $4, 3, GROUP_BRUNOS_ROOM, MAP_BRUNOS_ROOM
warp_def $11, $5, 4, GROUP_BRUNOS_ROOM, MAP_BRUNOS_ROOM
warp_def $2, $4, 1, GROUP_LANCES_ROOM, MAP_LANCES_ROOM
warp_def $2, $5, 2, GROUP_LANCES_ROOM, MAP_LANCES_ROOM
- ; xy triggers
+.XYTriggers:
db 0
- ; signposts
+.Signposts:
db 0
- ; people-events
+.PersonEvents:
db 1
- person_event SPRITE_KAREN, 11, 9, $6, $0, 255, 255, $80, 0, KarenScript_0x180bee, -1
+ person_event SPRITE_KAREN, 11, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, KarenScript_0x180bee, -1