summaryrefslogtreecommitdiff
path: root/maps/RuinsOfAlphHoOhItemRoom.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/RuinsOfAlphHoOhItemRoom.asm')
-rw-r--r--maps/RuinsOfAlphHoOhItemRoom.asm51
1 files changed, 22 insertions, 29 deletions
diff --git a/maps/RuinsOfAlphHoOhItemRoom.asm b/maps/RuinsOfAlphHoOhItemRoom.asm
index e8ad02a27..1c70076f6 100644
--- a/maps/RuinsOfAlphHoOhItemRoom.asm
+++ b/maps/RuinsOfAlphHoOhItemRoom.asm
@@ -1,15 +1,13 @@
-const_value set 2
+ const_def 2 ; object constants
const RUINSOFALPHHOOHITEMROOM_POKE_BALL1
const RUINSOFALPHHOOHITEMROOM_POKE_BALL2
const RUINSOFALPHHOOHITEMROOM_POKE_BALL3
const RUINSOFALPHHOOHITEMROOM_POKE_BALL4
RuinsOfAlphHoOhItemRoom_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
RuinsOfAlphHoOhItemRoomGoldBerry:
itemball GOLD_BERRY
@@ -33,27 +31,22 @@ UnknownText_0x59923:
done
RuinsOfAlphHoOhItemRoom_MapEvents:
- ; filler
- db 0, 0
-
-.Warps:
- db 4
- warp_def 3, 9, 5, RUINS_OF_ALPH_HO_OH_CHAMBER
- warp_def 4, 9, 5, RUINS_OF_ALPH_HO_OH_CHAMBER
- warp_def 3, 1, 1, RUINS_OF_ALPH_HO_OH_WORD_ROOM
- warp_def 4, 1, 2, RUINS_OF_ALPH_HO_OH_WORD_ROOM
-
-.CoordEvents:
- db 0
-
-.BGEvents:
- db 2
- bg_event 2, 1, BGEVENT_READ, MapRuinsOfAlphHoOhItemRoomSignpost1Script
- bg_event 5, 1, BGEVENT_READ, MapRuinsOfAlphHoOhItemRoomSignpost1Script
-
-.ObjectEvents:
- db 4
- object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomGoldBerry, EVENT_PICKED_UP_GOLD_BERRY_FROM_HO_OH_ITEM_ROOM
- object_event 5, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomMysteryberry, EVENT_PICKED_UP_MYSTERYBERRY_FROM_HO_OH_ITEM_ROOM
- object_event 2, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomRevivalHerb, EVENT_PICKED_UP_REVIVAL_HERB_FROM_HO_OH_ITEM_ROOM
- object_event 5, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomCharcoal, EVENT_PICKED_UP_CHARCOAL_FROM_HO_OH_ITEM_ROOM
+ db 0, 0 ; filler
+
+ db 4 ; warp events
+ warp_event 3, 9, RUINS_OF_ALPH_HO_OH_CHAMBER, 5
+ warp_event 4, 9, RUINS_OF_ALPH_HO_OH_CHAMBER, 5
+ warp_event 3, 1, RUINS_OF_ALPH_HO_OH_WORD_ROOM, 1
+ warp_event 4, 1, RUINS_OF_ALPH_HO_OH_WORD_ROOM, 2
+
+ db 0 ; coord events
+
+ db 2 ; bg events
+ bg_event 2, 1, BGEVENT_READ, MapRuinsOfAlphHoOhItemRoomSignpost1Script
+ bg_event 5, 1, BGEVENT_READ, MapRuinsOfAlphHoOhItemRoomSignpost1Script
+
+ db 4 ; object events
+ object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomGoldBerry, EVENT_PICKED_UP_GOLD_BERRY_FROM_HO_OH_ITEM_ROOM
+ object_event 5, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomMysteryberry, EVENT_PICKED_UP_MYSTERYBERRY_FROM_HO_OH_ITEM_ROOM
+ object_event 2, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomRevivalHerb, EVENT_PICKED_UP_REVIVAL_HERB_FROM_HO_OH_ITEM_ROOM
+ object_event 5, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomCharcoal, EVENT_PICKED_UP_CHARCOAL_FROM_HO_OH_ITEM_ROOM