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/RockTunnel1F.asm | |
| parent | 89c47f21701caf32641573264d83ca16eb0aed91 (diff) | |
Use def_* macros for automatic map event counts
Resolves #742
Diffstat (limited to 'maps/RockTunnel1F.asm')
| -rw-r--r-- | maps/RockTunnel1F.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/RockTunnel1F.asm b/maps/RockTunnel1F.asm index aa5d81472..3dbcf926b 100644 --- a/maps/RockTunnel1F.asm +++ b/maps/RockTunnel1F.asm @@ -1,11 +1,11 @@ - object_const_def ; object_event constants + object_const_def const ROCKTUNNEL1F_POKE_BALL1 const ROCKTUNNEL1F_POKE_BALL2 RockTunnel1F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks RockTunnel1FElixer: itemball ELIXER @@ -22,7 +22,7 @@ RockTunnel1FHiddenXDefend: RockTunnel1F_MapEvents: db 0, 0 ; filler - db 6 ; warp events + def_warp_events warp_event 15, 3, ROUTE_9, 1 warp_event 11, 25, ROUTE_10_SOUTH, 1 warp_event 5, 3, ROCK_TUNNEL_B1F, 3 @@ -30,12 +30,12 @@ RockTunnel1F_MapEvents: warp_event 27, 3, ROCK_TUNNEL_B1F, 4 warp_event 27, 13, ROCK_TUNNEL_B1F, 1 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 24, 4, BGEVENT_ITEM, RockTunnel1FHiddenXAccuracy bg_event 21, 15, BGEVENT_ITEM, RockTunnel1FHiddenXDefend - db 2 ; object events + def_object_events object_event 4, 18, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnel1FElixer, EVENT_ROCK_TUNNEL_1F_ELIXER object_event 10, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnel1FTMSteelWing, EVENT_ROCK_TUNNEL_1F_TM_STEEL_WING |