diff options
Diffstat (limited to 'maps/SilverCaveRoom2.asm')
| -rw-r--r-- | maps/SilverCaveRoom2.asm | 39 |
1 files changed, 16 insertions, 23 deletions
diff --git a/maps/SilverCaveRoom2.asm b/maps/SilverCaveRoom2.asm index eb6b9fd69..7a7f9250d 100644 --- a/maps/SilverCaveRoom2.asm +++ b/maps/SilverCaveRoom2.asm @@ -1,14 +1,12 @@ -const_value set 2 + const_def 2 ; object constants const SILVERCAVEROOM2_POKE_BALL1 const SILVERCAVEROOM2_POKE_BALL2 const SILVERCAVEROOM2_POKE_BALL3 SilverCaveRoom2_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks SilverCaveRoom2Calcium: itemball CALCIUM @@ -20,28 +18,23 @@ SilverCaveRoom2PPUp: itemball PP_UP SilverCaveRoom2HiddenMaxPotion: - hiddenitem EVENT_SILVER_CAVE_ROOM_2_HIDDEN_MAX_POTION, MAX_POTION + hiddenitem MAX_POTION, EVENT_SILVER_CAVE_ROOM_2_HIDDEN_MAX_POTION SilverCaveRoom2_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 17, 31, 2, SILVER_CAVE_ROOM_1 - warp_def 11, 5, 1, SILVER_CAVE_ROOM_3 - warp_def 13, 21, 1, SILVER_CAVE_ITEM_ROOMS - warp_def 23, 3, 2, SILVER_CAVE_ITEM_ROOMS + db 4 ; 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 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 + db 1 ; bg events bg_event 14, 31, BGEVENT_ITEM, SilverCaveRoom2HiddenMaxPotion -.ObjectEvents: - db 3 - object_event 24, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2Calcium, EVENT_SILVER_CAVE_ROOM_2_CALCIUM - object_event 22, 24, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2UltraBall, EVENT_SILVER_CAVE_ROOM_2_ULTRA_BALL - object_event 4, 20, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2PPUp, EVENT_SILVER_CAVE_ROOM_2_PP_UP + db 3 ; 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 |