summaryrefslogtreecommitdiff
path: root/maps/SilverCaveRoom1.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/SilverCaveRoom1.asm')
-rw-r--r--maps/SilverCaveRoom1.asm18
1 files changed, 8 insertions, 10 deletions
diff --git a/maps/SilverCaveRoom1.asm b/maps/SilverCaveRoom1.asm
index a47c3ecff..b63ae780e 100644
--- a/maps/SilverCaveRoom1.asm
+++ b/maps/SilverCaveRoom1.asm
@@ -18,13 +18,11 @@ ItemFragment_0x18c55a:
db ULTRA_BALL, 1
MapSilverCaveRoom1SignpostItem0:
- dw $009a
- db DIRE_HIT
+ dwb EVENT_SILVER_CAVE_ROOM_1_HIDDEN_DIRE_HIT, DIRE_HIT
MapSilverCaveRoom1SignpostItem1:
- dw $009b
- db ULTRA_BALL
+ dwb EVENT_SILVER_CAVE_ROOM_1_HIDDEN_ULTRA_BALL, ULTRA_BALL
SilverCaveRoom1_MapEventHeader:
@@ -41,12 +39,12 @@ SilverCaveRoom1_MapEventHeader:
; signposts
db 2
- signpost 23, 16, SIGNPOST_ITEMIFSET, MapSilverCaveRoom1SignpostItem0
- signpost 12, 17, SIGNPOST_ITEMIFSET, MapSilverCaveRoom1SignpostItem1
+ signpost 23, 16, SIGNPOST_ITEM, MapSilverCaveRoom1SignpostItem0
+ signpost 12, 17, SIGNPOST_ITEM, MapSilverCaveRoom1SignpostItem1
; people-events
db 4
- person_event SPRITE_POKE_BALL, 13, 8, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c554, EVENT_699
- person_event SPRITE_POKE_BALL, 33, 19, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c556, EVENT_69A
- person_event SPRITE_POKE_BALL, 34, 9, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c558, EVENT_69B
- person_event SPRITE_POKE_BALL, 22, 11, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c55a, EVENT_7C1
+ person_event SPRITE_POKE_BALL, 13, 8, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c554, EVENT_SILVER_CAVE_ROOM_1_MAX_ELIXER
+ person_event SPRITE_POKE_BALL, 33, 19, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c556, EVENT_SILVER_CAVE_ROOM_1_PROTEIN
+ person_event SPRITE_POKE_BALL, 34, 9, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c558, EVENT_SILVER_CAVE_ROOM_1_ESCAPE_ROPE
+ person_event SPRITE_POKE_BALL, 22, 11, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c55a, EVENT_SILVER_CAVE_ROOM_1_ULTRA_BALL