summaryrefslogtreecommitdiff
path: root/maps/CeladonDeptStore5F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/CeladonDeptStore5F.asm')
-rw-r--r--maps/CeladonDeptStore5F.asm26
1 files changed, 13 insertions, 13 deletions
diff --git a/maps/CeladonDeptStore5F.asm b/maps/CeladonDeptStore5F.asm
index 67f8c85c8..e21fc4f39 100644
--- a/maps/CeladonDeptStore5F.asm
+++ b/maps/CeladonDeptStore5F.asm
@@ -1,8 +1,8 @@
CeladonDeptStore5F_MapScriptHeader:
- ; trigger count
+.MapTriggers:
db 0
- ; callback count
+.MapCallbacks:
db 0
ClerkScript_0x71004:
@@ -68,24 +68,24 @@ CeladonDeptStore5F_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 3
warp_def $0, $c, 1, GROUP_CELADON_DEPT_STORE_4F, MAP_CELADON_DEPT_STORE_4F
warp_def $0, $f, 1, GROUP_CELADON_DEPT_STORE_6F, MAP_CELADON_DEPT_STORE_6F
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, CeladonDeptStore5FDirectory
- signpost 0, 3, $0, CeladonDeptStore5FElevatorButton
+ signpost 0, 14, SIGNPOST_READ, CeladonDeptStore5FDirectory
+ signpost 0, 3, SIGNPOST_READ, CeladonDeptStore5FElevatorButton
- ; people-events
+.PersonEvents:
db 5
- person_event SPRITE_CLERK, 9, 11, $7, $0, 255, 255, $90, 0, ClerkScript_0x71004, $ffff
- person_event SPRITE_CLERK, 9, 12, $7, $0, 255, 255, $90, 0, ClerkScript_0x7100c, $ffff
- person_event SPRITE_GENTLEMAN, 9, 17, $2, $11, 255, 255, $80, 0, GentlemanScript_0x71014, $ffff
- person_event SPRITE_SAILOR, 8, 7, $2, $11, 255, 255, $90, 0, SailorScript_0x71017, $ffff
- person_event SPRITE_TEACHER, 11, 5, $9, $0, 255, 255, $a0, 0, TeacherScript_0x7101a, $ffff
+ person_event SPRITE_CLERK, 9, 11, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ClerkScript_0x71004, -1
+ person_event SPRITE_CLERK, 9, 12, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ClerkScript_0x7100c, -1
+ person_event SPRITE_GENTLEMAN, 9, 17, OW_DOWN | $2, $11, -1, -1, (PAL_OW_RED << 4) | $80, 0, GentlemanScript_0x71014, -1
+ person_event SPRITE_SAILOR, 8, 7, OW_DOWN | $2, $11, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SailorScript_0x71017, -1
+ person_event SPRITE_TEACHER, 11, 5, OW_LEFT | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TeacherScript_0x7101a, -1