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/SilverCaveItemRooms.asm | |
| parent | 89c47f21701caf32641573264d83ca16eb0aed91 (diff) | |
Use def_* macros for automatic map event counts
Resolves #742
Diffstat (limited to 'maps/SilverCaveItemRooms.asm')
| -rw-r--r-- | maps/SilverCaveItemRooms.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/SilverCaveItemRooms.asm b/maps/SilverCaveItemRooms.asm index eded4deee..dd9323f2a 100644 --- a/maps/SilverCaveItemRooms.asm +++ b/maps/SilverCaveItemRooms.asm @@ -1,11 +1,11 @@ - object_const_def ; object_event constants + object_const_def const SILVERCAVEITEMROOMS_POKE_BALL1 const SILVERCAVEITEMROOMS_POKE_BALL2 SilverCaveItemRooms_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks SilverCaveItemRoomsMaxRevive: itemball MAX_REVIVE @@ -16,14 +16,14 @@ SilverCaveItemRoomsFullRestore: SilverCaveItemRooms_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 13, 3, SILVER_CAVE_ROOM_2, 3 warp_event 7, 15, SILVER_CAVE_ROOM_2, 4 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 2 ; object events + def_object_events object_event 6, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveItemRoomsMaxRevive, EVENT_SILVER_CAVE_ITEM_ROOMS_MAX_REVIVE object_event 15, 11, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveItemRoomsFullRestore, EVENT_SILVER_CAVE_ITEM_ROOMS_FULL_RESTORE |