summaryrefslogtreecommitdiff
path: root/maps/CeladonDeptStore5F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/CeladonDeptStore5F.asm')
-rw-r--r--maps/CeladonDeptStore5F.asm20
1 files changed, 10 insertions, 10 deletions
diff --git a/maps/CeladonDeptStore5F.asm b/maps/CeladonDeptStore5F.asm
index eda2ec693..b0fa491b5 100644
--- a/maps/CeladonDeptStore5F.asm
+++ b/maps/CeladonDeptStore5F.asm
@@ -77,22 +77,22 @@ CeladonDeptStore5F_MapEventHeader:
.Warps:
db 3
- warp_def $0, $c, 1, CELADON_DEPT_STORE_4F
- warp_def $0, $f, 1, CELADON_DEPT_STORE_6F
- warp_def $0, $2, 1, CELADON_DEPT_STORE_ELEVATOR
+ warp_def 12, 0, 1, CELADON_DEPT_STORE_4F
+ warp_def 15, 0, 1, CELADON_DEPT_STORE_6F
+ warp_def 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR
.CoordEvents:
db 0
.BGEvents:
db 2
- bg_event 0, 14, BGEVENT_READ, CeladonDeptStore5FDirectory
- bg_event 0, 3, BGEVENT_READ, CeladonDeptStore5FElevatorButton
+ bg_event 14, 0, BGEVENT_READ, CeladonDeptStore5FDirectory
+ bg_event 3, 0, BGEVENT_READ, CeladonDeptStore5FElevatorButton
.ObjectEvents:
db 5
- object_event SPRITE_CLERK, 5, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x71004, -1
- object_event SPRITE_CLERK, 5, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x7100c, -1
- object_event SPRITE_GENTLEMAN, 5, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FGentlemanScript, -1
- object_event SPRITE_SAILOR, 4, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FSailorScript, -1
- object_event SPRITE_TEACHER, 7, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FTeacherScript, -1
+ object_event 7, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x71004, -1
+ object_event 8, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x7100c, -1
+ object_event 13, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FGentlemanScript, -1
+ object_event 3, 4, SPRITE_SAILOR, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FSailorScript, -1
+ object_event 1, 7, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FTeacherScript, -1