diff options
Diffstat (limited to 'maps/SilverCaveRoom1.asm')
| -rw-r--r-- | maps/SilverCaveRoom1.asm | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/maps/SilverCaveRoom1.asm b/maps/SilverCaveRoom1.asm index 5bd516f5b..28cc88f41 100644 --- a/maps/SilverCaveRoom1.asm +++ b/maps/SilverCaveRoom1.asm @@ -1,8 +1,8 @@ SilverCaveRoom1_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ItemFragment_0x18c554: @@ -18,35 +18,33 @@ 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: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $21, $9, 2, GROUP_SILVER_CAVE_OUTSIDE, MAP_SILVER_CAVE_OUTSIDE warp_def $1, $f, 1, GROUP_SILVER_CAVE_ROOM_2, MAP_SILVER_CAVE_ROOM_2 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 23, 16, $7, MapSilverCaveRoom1SignpostItem0 - signpost 12, 17, $7, MapSilverCaveRoom1SignpostItem1 + signpost 23, 16, SIGNPOST_ITEM, MapSilverCaveRoom1SignpostItem0 + signpost 12, 17, SIGNPOST_ITEM, MapSilverCaveRoom1SignpostItem1 - ; people-events +.PersonEvents: db 4 - person_event SPRITE_POKE_BALL, 13, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c554, EVENT_699 - person_event SPRITE_POKE_BALL, 33, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c556, EVENT_69A - person_event SPRITE_POKE_BALL, 34, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c558, EVENT_69B - person_event SPRITE_POKE_BALL, 22, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c55a, EVENT_7C1 + person_event SPRITE_POKE_BALL, 13, 8, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c554, EVENT_SILVER_CAVE_ROOM_1_MAX_ELIXER + person_event SPRITE_POKE_BALL, 33, 19, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c556, EVENT_SILVER_CAVE_ROOM_1_PROTEIN + person_event SPRITE_POKE_BALL, 34, 9, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c558, EVENT_SILVER_CAVE_ROOM_1_ESCAPE_ROPE + person_event SPRITE_POKE_BALL, 22, 11, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c55a, EVENT_SILVER_CAVE_ROOM_1_ULTRA_BALL |