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/TinTower8F.asm | |
| parent | 89c47f21701caf32641573264d83ca16eb0aed91 (diff) | |
Use def_* macros for automatic map event counts
Resolves #742
Diffstat (limited to 'maps/TinTower8F.asm')
| -rw-r--r-- | maps/TinTower8F.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/TinTower8F.asm b/maps/TinTower8F.asm index 5cb76ca3d..fa82d7804 100644 --- a/maps/TinTower8F.asm +++ b/maps/TinTower8F.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const TINTOWER8F_POKE_BALL1 const TINTOWER8F_POKE_BALL2 const TINTOWER8F_POKE_BALL3 TinTower8F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks TinTower8FNugget: itemball NUGGET @@ -20,7 +20,7 @@ TinTower8FFullRestore: TinTower8F_MapEvents: db 0, 0 ; filler - db 6 ; warp events + def_warp_events warp_event 2, 5, TIN_TOWER_7F, 2 warp_event 2, 11, TIN_TOWER_9F, 1 warp_event 16, 7, TIN_TOWER_9F, 2 @@ -28,11 +28,11 @@ TinTower8F_MapEvents: warp_event 14, 15, TIN_TOWER_9F, 6 warp_event 6, 9, TIN_TOWER_9F, 7 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 3 ; object events + def_object_events object_event 7, 13, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FNugget, EVENT_TIN_TOWER_8F_NUGGET object_event 11, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FMaxElixer, EVENT_TIN_TOWER_8F_MAX_ELIXER object_event 3, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FFullRestore, EVENT_TIN_TOWER_8F_FULL_RESTORE |