summaryrefslogtreecommitdiff
path: root/maps/GoldenrodDeptStore1F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/GoldenrodDeptStore1F.asm')
-rw-r--r--maps/GoldenrodDeptStore1F.asm24
1 files changed, 12 insertions, 12 deletions
diff --git a/maps/GoldenrodDeptStore1F.asm b/maps/GoldenrodDeptStore1F.asm
index 0545b0641..06a9f823e 100644
--- a/maps/GoldenrodDeptStore1F.asm
+++ b/maps/GoldenrodDeptStore1F.asm
@@ -1,8 +1,8 @@
GoldenrodDeptStore1F_MapScriptHeader:
- ; trigger count
+.MapTriggers:
db 0
- ; callback count
+.MapCallbacks:
db 0
ReceptionistScript_0x55981:
@@ -76,24 +76,24 @@ GoldenrodDeptStore1F_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 4
warp_def $7, $7, 9, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY
warp_def $7, $8, 9, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY
warp_def $0, $f, 2, GROUP_GOLDENROD_DEPT_STORE_2F, MAP_GOLDENROD_DEPT_STORE_2F
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, GoldenrodDeptStore1FDirectory
- signpost 0, 3, $0, GoldenrodDeptStore1FElevatorButton
+ signpost 0, 14, SIGNPOST_READ, GoldenrodDeptStore1FDirectory
+ signpost 0, 3, SIGNPOST_READ, GoldenrodDeptStore1FElevatorButton
- ; people-events
+.PersonEvents:
db 4
- person_event SPRITE_RECEPTIONIST, 5, 14, $6, $0, 255, 255, $0, 0, ReceptionistScript_0x55981, $ffff
- person_event SPRITE_POKEFAN_F, 8, 9, $6, $0, 255, 255, $0, 0, PokefanFScript_0x55987, $ffff
- person_event SPRITE_BUG_CATCHER, 9, 9, $5, $1, 255, 255, $a0, 0, BugCatcherScript_0x5598a, $ffff
- person_event SPRITE_GENTLEMAN, 9, 15, $2, $11, 255, 255, $0, 0, GentlemanScript_0x55984, $ffff
+ person_event SPRITE_RECEPTIONIST, 5, 14, OW_UP | $2, $0, -1, -1, $0, 0, ReceptionistScript_0x55981, -1
+ person_event SPRITE_POKEFAN_F, 8, 9, OW_UP | $2, $0, -1, -1, $0, 0, PokefanFScript_0x55987, -1
+ person_event SPRITE_BUG_CATCHER, 9, 9, OW_UP | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, BugCatcherScript_0x5598a, -1
+ person_event SPRITE_GENTLEMAN, 9, 15, OW_DOWN | $2, $11, -1, -1, $0, 0, GentlemanScript_0x55984, -1