diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-24 09:49:26 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-24 09:57:16 -0400 |
| commit | dcb24bc72428a60e37c1dfa7a93dc46bff7bd5ed (patch) | |
| tree | 4788cafe99972e5b4f6528affb925c9d7eb24134 /maps/CeladonDeptStore4F.asm | |
| parent | 89c47f21701caf32641573264d83ca16eb0aed91 (diff) | |
Use def_* macros for automatic map event counts
Resolves #742
Diffstat (limited to 'maps/CeladonDeptStore4F.asm')
| -rw-r--r-- | maps/CeladonDeptStore4F.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/CeladonDeptStore4F.asm b/maps/CeladonDeptStore4F.asm index 645ce8287..def1bf72d 100644 --- a/maps/CeladonDeptStore4F.asm +++ b/maps/CeladonDeptStore4F.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const CELADONDEPTSTORE4F_CLERK const CELADONDEPTSTORE4F_SUPER_NERD const CELADONDEPTSTORE4F_YOUNGSTER CeladonDeptStore4F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks CeladonDeptStore4FClerkScript: faceplayer @@ -51,18 +51,18 @@ CeladonDeptStore4FDirectoryText: CeladonDeptStore4F_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events warp_event 12, 0, CELADON_DEPT_STORE_5F, 1 warp_event 15, 0, CELADON_DEPT_STORE_3F, 2 warp_event 2, 0, CELADON_DEPT_STORE_ELEVATOR, 1 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 14, 0, BGEVENT_READ, CeladonDeptStore4FDirectory bg_event 3, 0, BGEVENT_READ, CeladonDeptStore4FElevatorButton - db 3 ; object events + def_object_events object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore4FClerkScript, -1 object_event 7, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore4FSuperNerdScript, -1 object_event 8, 2, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore4FYoungsterScript, -1 |