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/CeladonDeptStore1F.asm | |
| parent | 89c47f21701caf32641573264d83ca16eb0aed91 (diff) | |
Use def_* macros for automatic map event counts
Resolves #742
Diffstat (limited to 'maps/CeladonDeptStore1F.asm')
| -rw-r--r-- | maps/CeladonDeptStore1F.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/CeladonDeptStore1F.asm b/maps/CeladonDeptStore1F.asm index d7fa08c93..92a592f77 100644 --- a/maps/CeladonDeptStore1F.asm +++ b/maps/CeladonDeptStore1F.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const CELADONDEPTSTORE1F_RECEPTIONIST const CELADONDEPTSTORE1F_GENTLEMAN const CELADONDEPTSTORE1F_TEACHER CeladonDeptStore1F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks CeladonDeptStore1FReceptionistScript: jumptextfaceplayer CeladonDeptStore1FReceptionistText @@ -74,19 +74,19 @@ CeladonDeptStore1FDirectoryText: CeladonDeptStore1F_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events warp_event 7, 7, CELADON_CITY, 1 warp_event 8, 7, CELADON_CITY, 1 warp_event 15, 0, CELADON_DEPT_STORE_2F, 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, CeladonDeptStore1FDirectory bg_event 3, 0, BGEVENT_READ, CeladonDeptStore1FElevatorButton - db 3 ; object events + def_object_events object_event 10, 1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore1FReceptionistScript, -1 object_event 11, 4, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore1FGentlemanScript, -1 object_event 5, 3, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore1FTeacherScript, -1 |