diff options
Diffstat (limited to 'maps/CeladonDeptStore5F.asm')
| -rw-r--r-- | maps/CeladonDeptStore5F.asm | 51 |
1 files changed, 22 insertions, 29 deletions
diff --git a/maps/CeladonDeptStore5F.asm b/maps/CeladonDeptStore5F.asm index a14e8c7be..c276e1dad 100644 --- a/maps/CeladonDeptStore5F.asm +++ b/maps/CeladonDeptStore5F.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const CELADONDEPTSTORE5F_CLERK1 const CELADONDEPTSTORE5F_CLERK2 const CELADONDEPTSTORE5F_GENTLEMAN @@ -6,11 +6,9 @@ const_value set 2 const CELADONDEPTSTORE5F_TEACHER CeladonDeptStore5F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks ClerkScript_0x71004: faceplayer @@ -72,27 +70,22 @@ CeladonDeptStore5FDirectoryText: done CeladonDeptStore5F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 3 - 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 14, 0, BGEVENT_READ, CeladonDeptStore5FDirectory - bg_event 3, 0, BGEVENT_READ, CeladonDeptStore5FElevatorButton - -.ObjectEvents: - db 5 - 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 + db 0, 0 ; filler + + db 3 ; warp events + warp_event 12, 0, CELADON_DEPT_STORE_4F, 1 + warp_event 15, 0, CELADON_DEPT_STORE_6F, 1 + warp_event 2, 0, CELADON_DEPT_STORE_ELEVATOR, 1 + + db 0 ; coord events + + db 2 ; bg events + bg_event 14, 0, BGEVENT_READ, CeladonDeptStore5FDirectory + bg_event 3, 0, BGEVENT_READ, CeladonDeptStore5FElevatorButton + + db 5 ; object events + 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 |