diff options
Diffstat (limited to 'maps/RuinsOfAlphOmanyteItemRoom.asm')
| -rw-r--r-- | maps/RuinsOfAlphOmanyteItemRoom.asm | 51 |
1 files changed, 22 insertions, 29 deletions
diff --git a/maps/RuinsOfAlphOmanyteItemRoom.asm b/maps/RuinsOfAlphOmanyteItemRoom.asm index 3f4570b2b..4013ed19d 100644 --- a/maps/RuinsOfAlphOmanyteItemRoom.asm +++ b/maps/RuinsOfAlphOmanyteItemRoom.asm @@ -1,15 +1,13 @@ -const_value set 2 + const_def 2 ; object constants const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL1 const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL2 const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL3 const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL4 RuinsOfAlphOmanyteItemRoom_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks RuinsOfAlphOmanyteItemRoomMysteryberry: itemball MYSTERYBERRY @@ -33,27 +31,22 @@ UnknownText_0x59a37: done RuinsOfAlphOmanyteItemRoom_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def 3, 9, 5, RUINS_OF_ALPH_OMANYTE_CHAMBER - warp_def 4, 9, 5, RUINS_OF_ALPH_OMANYTE_CHAMBER - warp_def 3, 1, 1, RUINS_OF_ALPH_OMANYTE_WORD_ROOM - warp_def 4, 1, 2, RUINS_OF_ALPH_OMANYTE_WORD_ROOM - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 2, 1, BGEVENT_READ, MapRuinsOfAlphOmanyteItemRoomSignpost1Script - bg_event 5, 1, BGEVENT_READ, MapRuinsOfAlphOmanyteItemRoomSignpost1Script - -.ObjectEvents: - db 4 - object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomMysteryberry, EVENT_PICKED_UP_MYSTERYBERRY_FROM_OMANYTE_ITEM_ROOM - object_event 5, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomMysticWater, EVENT_PICKED_UP_MYSTIC_WATER_FROM_OMANYTE_ITEM_ROOM - object_event 2, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomStardust, EVENT_PICKED_UP_STARDUST_FROM_OMANYTE_ITEM_ROOM - object_event 5, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomStarPiece, EVENT_PICKED_UP_STAR_PIECE_FROM_OMANYTE_ITEM_ROOM + db 0, 0 ; filler + + db 4 ; warp events + warp_event 3, 9, RUINS_OF_ALPH_OMANYTE_CHAMBER, 5 + warp_event 4, 9, RUINS_OF_ALPH_OMANYTE_CHAMBER, 5 + warp_event 3, 1, RUINS_OF_ALPH_OMANYTE_WORD_ROOM, 1 + warp_event 4, 1, RUINS_OF_ALPH_OMANYTE_WORD_ROOM, 2 + + db 0 ; coord events + + db 2 ; bg events + bg_event 2, 1, BGEVENT_READ, MapRuinsOfAlphOmanyteItemRoomSignpost1Script + bg_event 5, 1, BGEVENT_READ, MapRuinsOfAlphOmanyteItemRoomSignpost1Script + + db 4 ; object events + object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomMysteryberry, EVENT_PICKED_UP_MYSTERYBERRY_FROM_OMANYTE_ITEM_ROOM + object_event 5, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomMysticWater, EVENT_PICKED_UP_MYSTIC_WATER_FROM_OMANYTE_ITEM_ROOM + object_event 2, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomStardust, EVENT_PICKED_UP_STARDUST_FROM_OMANYTE_ITEM_ROOM + object_event 5, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomStarPiece, EVENT_PICKED_UP_STAR_PIECE_FROM_OMANYTE_ITEM_ROOM |