summaryrefslogtreecommitdiff
path: root/maps/OaksLab.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/OaksLab.asm')
-rw-r--r--maps/OaksLab.asm54
1 files changed, 27 insertions, 27 deletions
diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm
index 2552601cb..7f78384a9 100644
--- a/maps/OaksLab.asm
+++ b/maps/OaksLab.asm
@@ -1,8 +1,8 @@
OaksLab_MapScriptHeader:
- ; trigger count
+.MapTriggers:
db 0
- ; callback count
+.MapCallbacks:
db 0
UnknownScript_0x19b3c7:
@@ -254,36 +254,36 @@ OaksLab_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 2
warp_def $b, $4, 3, GROUP_PALLET_TOWN, MAP_PALLET_TOWN
warp_def $b, $5, 3, GROUP_PALLET_TOWN, MAP_PALLET_TOWN
- ; xy triggers
+.XYTriggers:
db 0
- ; signposts
+.Signposts:
db 16
- signpost 1, 6, $0, OaksLabBookshelf
- signpost 1, 7, $0, OaksLabBookshelf
- signpost 1, 8, $0, OaksLabBookshelf
- signpost 1, 9, $0, OaksLabBookshelf
- signpost 7, 0, $0, OaksLabBookshelf
- signpost 7, 1, $0, OaksLabBookshelf
- signpost 7, 2, $0, OaksLabBookshelf
- signpost 7, 3, $0, OaksLabBookshelf
- signpost 7, 6, $0, OaksLabBookshelf
- signpost 7, 7, $0, OaksLabBookshelf
- signpost 7, 8, $0, OaksLabBookshelf
- signpost 7, 9, $0, OaksLabBookshelf
- signpost 0, 4, $0, OaksLabPoster1
- signpost 0, 5, $0, OaksLabPoster2
- signpost 3, 9, $0, OaksLabTrashcan
- signpost 1, 0, $0, OaksLabPC
-
- ; people-events
+ signpost 1, 6, SIGNPOST_READ, OaksLabBookshelf
+ signpost 1, 7, SIGNPOST_READ, OaksLabBookshelf
+ signpost 1, 8, SIGNPOST_READ, OaksLabBookshelf
+ signpost 1, 9, SIGNPOST_READ, OaksLabBookshelf
+ signpost 7, 0, SIGNPOST_READ, OaksLabBookshelf
+ signpost 7, 1, SIGNPOST_READ, OaksLabBookshelf
+ signpost 7, 2, SIGNPOST_READ, OaksLabBookshelf
+ signpost 7, 3, SIGNPOST_READ, OaksLabBookshelf
+ signpost 7, 6, SIGNPOST_READ, OaksLabBookshelf
+ signpost 7, 7, SIGNPOST_READ, OaksLabBookshelf
+ signpost 7, 8, SIGNPOST_READ, OaksLabBookshelf
+ signpost 7, 9, SIGNPOST_READ, OaksLabBookshelf
+ signpost 0, 4, SIGNPOST_READ, OaksLabPoster1
+ signpost 0, 5, SIGNPOST_READ, OaksLabPoster2
+ signpost 3, 9, SIGNPOST_READ, OaksLabTrashcan
+ signpost 1, 0, SIGNPOST_READ, OaksLabPC
+
+.PersonEvents:
db 4
- person_event SPRITE_OAK, 6, 8, $6, $0, 255, 255, $0, 0, Oak, -1
- person_event SPRITE_SCIENTIST, 12, 5, $5, $1, 255, 255, $90, 0, ScientistScript_0x19b40f, -1
- person_event SPRITE_SCIENTIST, 13, 12, $4, $10, 255, 255, $90, 0, ScientistScript_0x19b412, -1
- person_event SPRITE_SCIENTIST, 8, 5, $2, $11, 255, 255, $90, 0, ScientistScript_0x19b415, -1
+ person_event SPRITE_OAK, 6, 8, OW_UP | $2, $0, -1, -1, $0, 0, Oak, -1
+ person_event SPRITE_SCIENTIST, 12, 5, OW_UP | $1, $1, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ScientistScript_0x19b40f, -1
+ person_event SPRITE_SCIENTIST, 13, 12, OW_UP | $0, $10, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ScientistScript_0x19b412, -1
+ person_event SPRITE_SCIENTIST, 8, 5, OW_DOWN | $2, $11, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ScientistScript_0x19b415, -1