summaryrefslogtreecommitdiff
path: root/maps/CeladonDeptStore1F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/CeladonDeptStore1F.asm')
-rw-r--r--maps/CeladonDeptStore1F.asm22
1 files changed, 11 insertions, 11 deletions
diff --git a/maps/CeladonDeptStore1F.asm b/maps/CeladonDeptStore1F.asm
index 0d3d1a31f..fb3b38222 100644
--- a/maps/CeladonDeptStore1F.asm
+++ b/maps/CeladonDeptStore1F.asm
@@ -1,8 +1,8 @@
CeladonDeptStore1F_MapScriptHeader:
- ; trigger count
+.MapTriggers:
db 0
- ; callback count
+.MapCallbacks:
db 0
ReceptionistScript_0x709e0:
@@ -72,23 +72,23 @@ CeladonDeptStore1F_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 4
warp_def $7, $7, 1, GROUP_CELADON_CITY, MAP_CELADON_CITY
warp_def $7, $8, 1, GROUP_CELADON_CITY, MAP_CELADON_CITY
warp_def $0, $f, 2, GROUP_CELADON_DEPT_STORE_2F, MAP_CELADON_DEPT_STORE_2F
warp_def $0, $2, 1, GROUP_CELADON_DEPT_STORE_ELEVATOR, MAP_CELADON_DEPT_STORE_ELEVATOR
- ; xy triggers
+.XYTriggers:
db 0
- ; signposts
+.Signposts:
db 2
- signpost 0, 14, $0, CeladonDeptStore1FDirectory
- signpost 0, 3, $0, CeladonDeptStore1FElevatorButton
+ signpost 0, 14, SIGNPOST_READ, CeladonDeptStore1FDirectory
+ signpost 0, 3, SIGNPOST_READ, CeladonDeptStore1FElevatorButton
- ; people-events
+.PersonEvents:
db 3
- person_event SPRITE_RECEPTIONIST, 5, 14, $6, $0, 255, 255, $80, 0, ReceptionistScript_0x709e0, $ffff
- person_event SPRITE_GENTLEMAN, 8, 15, $2, $11, 255, 255, $0, 0, GentlemanScript_0x709e3, $ffff
- person_event SPRITE_TEACHER, 7, 9, $5, $1, 255, 255, $a0, 0, TeacherScript_0x709e6, $ffff
+ person_event SPRITE_RECEPTIONIST, 5, 14, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ReceptionistScript_0x709e0, -1
+ person_event SPRITE_GENTLEMAN, 8, 15, OW_DOWN | $2, $11, -1, -1, $0, 0, GentlemanScript_0x709e3, -1
+ person_event SPRITE_TEACHER, 7, 9, OW_UP | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TeacherScript_0x709e6, -1