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/SilverCaveRoom2.asm | |
| parent | 89c47f21701caf32641573264d83ca16eb0aed91 (diff) | |
Use def_* macros for automatic map event counts
Resolves #742
Diffstat (limited to 'maps/SilverCaveRoom2.asm')
| -rw-r--r-- | maps/SilverCaveRoom2.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/SilverCaveRoom2.asm b/maps/SilverCaveRoom2.asm index a56b9e4b8..07a2c2cb4 100644 --- a/maps/SilverCaveRoom2.asm +++ b/maps/SilverCaveRoom2.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const SILVERCAVEROOM2_POKE_BALL1 const SILVERCAVEROOM2_POKE_BALL2 const SILVERCAVEROOM2_POKE_BALL3 SilverCaveRoom2_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks SilverCaveRoom2Calcium: itemball CALCIUM @@ -23,18 +23,18 @@ SilverCaveRoom2HiddenMaxPotion: SilverCaveRoom2_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events warp_event 17, 31, SILVER_CAVE_ROOM_1, 2 warp_event 11, 5, SILVER_CAVE_ROOM_3, 1 warp_event 13, 21, SILVER_CAVE_ITEM_ROOMS, 1 warp_event 23, 3, SILVER_CAVE_ITEM_ROOMS, 2 - db 0 ; coord events + def_coord_events - db 1 ; bg events + def_bg_events bg_event 14, 31, BGEVENT_ITEM, SilverCaveRoom2HiddenMaxPotion - db 3 ; object events + def_object_events object_event 24, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2Calcium, EVENT_SILVER_CAVE_ROOM_2_CALCIUM object_event 22, 24, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2UltraBall, EVENT_SILVER_CAVE_ROOM_2_ULTRA_BALL object_event 4, 20, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2PPUp, EVENT_SILVER_CAVE_ROOM_2_PP_UP |