diff options
Diffstat (limited to 'maps/SilverCaveItemRooms.asm')
| -rw-r--r-- | maps/SilverCaveItemRooms.asm | 31 |
1 files changed, 12 insertions, 19 deletions
diff --git a/maps/SilverCaveItemRooms.asm b/maps/SilverCaveItemRooms.asm index d218da44c..e2f48638d 100644 --- a/maps/SilverCaveItemRooms.asm +++ b/maps/SilverCaveItemRooms.asm @@ -1,13 +1,11 @@ -const_value set 2 + const_def 2 ; object constants const SILVERCAVEITEMROOMS_POKE_BALL1 const SILVERCAVEITEMROOMS_POKE_BALL2 SilverCaveItemRooms_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks SilverCaveItemRoomsMaxRevive: itemball MAX_REVIVE @@ -16,21 +14,16 @@ SilverCaveItemRoomsFullRestore: itemball FULL_RESTORE SilverCaveItemRooms_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 13, 3, 3, SILVER_CAVE_ROOM_2 - warp_def 7, 15, 4, SILVER_CAVE_ROOM_2 + db 2 ; warp events + warp_event 13, 3, SILVER_CAVE_ROOM_2, 3 + warp_event 7, 15, SILVER_CAVE_ROOM_2, 4 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 2 - object_event 6, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveItemRoomsMaxRevive, EVENT_SILVER_CAVE_ITEM_ROOMS_MAX_REVIVE - object_event 15, 11, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveItemRoomsFullRestore, EVENT_SILVER_CAVE_ITEM_ROOMS_FULL_RESTORE + db 2 ; 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 |