diff options
Diffstat (limited to 'maps/CeladonDeptStore2F.asm')
| -rw-r--r-- | maps/CeladonDeptStore2F.asm | 49 |
1 files changed, 21 insertions, 28 deletions
diff --git a/maps/CeladonDeptStore2F.asm b/maps/CeladonDeptStore2F.asm index eb9bb8dbc..39b452fe7 100644 --- a/maps/CeladonDeptStore2F.asm +++ b/maps/CeladonDeptStore2F.asm @@ -1,15 +1,13 @@ -const_value set 2 + const_def 2 ; object constants const CELADONDEPTSTORE2F_CLERK1 const CELADONDEPTSTORE2F_CLERK2 const CELADONDEPTSTORE2F_POKEFAN_M const CELADONDEPTSTORE2F_YOUNGSTER CeladonDeptStore2F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks ClerkScript_0x70bad: faceplayer @@ -69,26 +67,21 @@ CeladonDeptStore2FDirectoryText: done CeladonDeptStore2F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def 12, 0, 1, CELADON_DEPT_STORE_3F - warp_def 15, 0, 3, CELADON_DEPT_STORE_1F - warp_def 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 14, 0, BGEVENT_READ, CeladonDeptStore2FDirectory - bg_event 3, 0, BGEVENT_READ, CeladonDeptStore2FElevatorButton - -.ObjectEvents: - db 4 - object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70bad, -1 - object_event 14, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70bb5, -1 - object_event 5, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore2FPokefanMScript, -1 - object_event 6, 2, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore2FYoungsterScript, -1 + db 0, 0 ; filler + + db 3 ; warp events + warp_event 12, 0, CELADON_DEPT_STORE_3F, 1 + warp_event 15, 0, CELADON_DEPT_STORE_1F, 3 + warp_event 2, 0, CELADON_DEPT_STORE_ELEVATOR, 1 + + db 0 ; coord events + + db 2 ; bg events + bg_event 14, 0, BGEVENT_READ, CeladonDeptStore2FDirectory + bg_event 3, 0, BGEVENT_READ, CeladonDeptStore2FElevatorButton + + db 4 ; object events + object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70bad, -1 + object_event 14, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70bb5, -1 + object_event 5, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore2FPokefanMScript, -1 + object_event 6, 2, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore2FYoungsterScript, -1 |