diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-26 16:29:43 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-26 16:29:43 -0400 |
| commit | d24f1c71149b59c50dba57e500f30b223a54a25f (patch) | |
| tree | 140ad8c04b396af2e0d55f3218bfb3e428391f42 /maps/IcePathB2FMahoganySide.asm | |
| parent | 6ca1857732502a60251e3738cbccc6d0067eaed2 (diff) | |
Use def_* macros for automatic map event counts
Diffstat (limited to 'maps/IcePathB2FMahoganySide.asm')
| -rw-r--r-- | maps/IcePathB2FMahoganySide.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/IcePathB2FMahoganySide.asm b/maps/IcePathB2FMahoganySide.asm index c9a60a18..28a9eee0 100644 --- a/maps/IcePathB2FMahoganySide.asm +++ b/maps/IcePathB2FMahoganySide.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const ICEPATHB2FMAHOGANYSIDE_BOULDER1 const ICEPATHB2FMAHOGANYSIDE_BOULDER2 const ICEPATHB2FMAHOGANYSIDE_BOULDER3 @@ -7,9 +7,9 @@ const ICEPATHB2FMAHOGANYSIDE_POKE_BALL2 IcePathB2FMahoganySide_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks IcePathB2FMahoganySideBoulder: jumptext IcePathB2FMahoganySideBoulderText @@ -31,7 +31,7 @@ IcePathB2FMahoganySideBoulderText: IcePathB2FMahoganySide_MapEvents: db 0, 0 ; filler - db 6 ; warp events + def_warp_events warp_event 17, 1, ICE_PATH_B1F, 2 warp_event 9, 11, ICE_PATH_B3F, 1 warp_event 11, 4, ICE_PATH_B1F, 3 @@ -39,12 +39,12 @@ IcePathB2FMahoganySide_MapEvents: warp_event 4, 12, ICE_PATH_B1F, 5 warp_event 12, 12, ICE_PATH_B1F, 6 - db 0 ; coord events + def_coord_events - db 1 ; bg events + def_bg_events bg_event 0, 17, BGEVENT_ITEM, IcePathB2FMahoganySideHiddenCarbos - db 6 ; object events + def_object_events object_event 11, 3, SPRITE_BOULDER, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_1A object_event 4, 7, SPRITE_BOULDER, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_2A object_event 3, 12, SPRITE_BOULDER, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_3A |