summaryrefslogtreecommitdiff
path: root/maps/GoldenrodDeptStore3F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/GoldenrodDeptStore3F.asm')
-rw-r--r--maps/GoldenrodDeptStore3F.asm22
1 files changed, 11 insertions, 11 deletions
diff --git a/maps/GoldenrodDeptStore3F.asm b/maps/GoldenrodDeptStore3F.asm
index 77a01a9c6..b21371879 100644
--- a/maps/GoldenrodDeptStore3F.asm
+++ b/maps/GoldenrodDeptStore3F.asm
@@ -1,8 +1,8 @@
GoldenrodDeptStore3F_MapScriptHeader:
- ; trigger count
+.MapTriggers:
db 0
- ; callback count
+.MapCallbacks:
db 0
ClerkScript_0x55db8:
@@ -55,22 +55,22 @@ GoldenrodDeptStore3F_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 3
warp_def $0, $c, 1, GROUP_GOLDENROD_DEPT_STORE_2F, MAP_GOLDENROD_DEPT_STORE_2F
warp_def $0, $f, 2, GROUP_GOLDENROD_DEPT_STORE_4F, MAP_GOLDENROD_DEPT_STORE_4F
warp_def $0, $2, 1, GROUP_GOLDENROD_DEPT_STORE_ELEVATOR, MAP_GOLDENROD_DEPT_STORE_ELEVATOR
- ; xy triggers
+.XYTriggers:
db 0
- ; signposts
+.Signposts:
db 2
- signpost 0, 14, $0, GoldenrodDeptStore3FDirectory
- signpost 0, 3, $0, GoldenrodDeptStore3FElevatorButton
+ signpost 0, 14, SIGNPOST_READ, GoldenrodDeptStore3FDirectory
+ signpost 0, 3, SIGNPOST_READ, GoldenrodDeptStore3FElevatorButton
- ; people-events
+.PersonEvents:
db 3
- person_event SPRITE_CLERK, 5, 10, $6, $0, 255, 255, $0, 0, ClerkScript_0x55db8, $ffff
- person_event SPRITE_SUPER_NERD, 9, 16, $a, $10, 255, 255, $80, 0, SuperNerdScript_0x55dc0, $ffff
- person_event SPRITE_ROCKER, 9, 6, $4, $10, 255, 255, $0, 0, RockerScript_0x55dc3, $ffff
+ person_event SPRITE_CLERK, 5, 10, OW_UP | $2, $0, -1, -1, $0, 0, ClerkScript_0x55db8, -1
+ person_event SPRITE_SUPER_NERD, 9, 16, OW_LEFT | $2, $10, -1, -1, (PAL_OW_RED << 4) | $80, 0, SuperNerdScript_0x55dc0, -1
+ person_event SPRITE_ROCKER, 9, 6, OW_UP | $0, $10, -1, -1, $0, 0, RockerScript_0x55dc3, -1