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/WhirlIslandSW.asm | |
| parent | 6ca1857732502a60251e3738cbccc6d0067eaed2 (diff) | |
Use def_* macros for automatic map event counts
Diffstat (limited to 'maps/WhirlIslandSW.asm')
| -rw-r--r-- | maps/WhirlIslandSW.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/WhirlIslandSW.asm b/maps/WhirlIslandSW.asm index a3592bdb..c7ffcc58 100644 --- a/maps/WhirlIslandSW.asm +++ b/maps/WhirlIslandSW.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const WHIRLISLANDSW_POKE_BALL WhirlIslandSW_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks WhirlIslandSWGuardSpec: itemball GUARD_SPEC @@ -12,16 +12,16 @@ WhirlIslandSWGuardSpec: WhirlIslandSW_MapEvents: db 0, 0 ; filler - db 5 ; warp events + def_warp_events warp_event 5, 7, ROUTE_41, 3 warp_event 17, 3, WHIRL_ISLAND_B1F, 5 warp_event 3, 3, WHIRL_ISLAND_B1F, 4 warp_event 3, 15, WHIRL_ISLAND_NW, 3 warp_event 17, 15, WHIRL_ISLAND_B2F, 4 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 1 ; object events + def_object_events object_event 15, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandSWGuardSpec, EVENT_WHIRL_ISLAND_SW_GUARD_SPEC |