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/CianwoodGym.asm | |
| parent | 89c47f21701caf32641573264d83ca16eb0aed91 (diff) | |
Use def_* macros for automatic map event counts
Resolves #742
Diffstat (limited to 'maps/CianwoodGym.asm')
| -rw-r--r-- | maps/CianwoodGym.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm index 84401c78e..55cc84c99 100644 --- a/maps/CianwoodGym.asm +++ b/maps/CianwoodGym.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const CIANWOODGYM_CHUCK const CIANWOODGYM_BLACK_BELT1 const CIANWOODGYM_BLACK_BELT2 @@ -10,9 +10,9 @@ const CIANWOODGYM_BOULDER4 CianwoodGym_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks CianwoodGymChuckScript: faceplayer @@ -306,17 +306,17 @@ BlackbeltLungAfterText: CianwoodGym_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 4, 17, CIANWOOD_CITY, 2 warp_event 5, 17, CIANWOOD_CITY, 2 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 3, 15, BGEVENT_READ, CianwoodGymStatue bg_event 6, 15, BGEVENT_READ, CianwoodGymStatue - db 9 ; object events + def_object_events object_event 4, 1, SPRITE_CHUCK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CianwoodGymChuckScript, -1 object_event 2, 12, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBlackbeltYoshi, -1 object_event 7, 12, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBlackbeltLao, -1 |