diff options
Diffstat (limited to 'maps/SilverCaveRoom2.asm')
| -rw-r--r-- | maps/SilverCaveRoom2.asm | 41 |
1 files changed, 17 insertions, 24 deletions
diff --git a/maps/SilverCaveRoom2.asm b/maps/SilverCaveRoom2.asm index f67098ed1..39c128e8b 100644 --- a/maps/SilverCaveRoom2.asm +++ b/maps/SilverCaveRoom2.asm @@ -1,50 +1,43 @@ -SilverCaveRoom2_MapScriptHeader: ; 0x18c5b0 - ; trigger count +SilverCaveRoom2_MapScriptHeader: +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 -; 0x18c5b2 -ItemFragment_0x18c5b2: ; 0x18c5b2 +ItemFragment_0x18c5b2: db CALCIUM, 1 -; 0x18c5b4 -ItemFragment_0x18c5b4: ; 0x18c5b4 +ItemFragment_0x18c5b4: db ULTRA_BALL, 1 -; 0x18c5b6 -ItemFragment_0x18c5b6: ; 0x18c5b6 +ItemFragment_0x18c5b6: db PP_UP, 1 -; 0x18c5b8 -MapSilverCaveRoom2SignpostItem0: ; 0x18c5b8 - dw $009c - db MAX_POTION +MapSilverCaveRoom2SignpostItem0: + dwb EVENT_SILVER_CAVE_ROOM_2_HIDDEN_MAX_POTION, MAX_POTION -; 0x18c5bb -SilverCaveRoom2_MapEventHeader: ; 0x18c5bb +SilverCaveRoom2_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $1f, $11, 2, GROUP_SILVER_CAVE_ROOM_1, MAP_SILVER_CAVE_ROOM_1 warp_def $5, $b, 1, GROUP_SILVER_CAVE_ROOM_3, MAP_SILVER_CAVE_ROOM_3 warp_def $15, $d, 1, GROUP_SILVER_CAVE_ITEM_ROOMS, MAP_SILVER_CAVE_ITEM_ROOMS warp_def $3, $17, 2, GROUP_SILVER_CAVE_ITEM_ROOMS, MAP_SILVER_CAVE_ITEM_ROOMS - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 - signpost 31, 14, $7, MapSilverCaveRoom2SignpostItem0 + signpost 31, 14, SIGNPOST_ITEM, MapSilverCaveRoom2SignpostItem0 - ; people-events +.PersonEvents: db 3 - person_event SPRITE_POKE_BALL, 14, 28, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c5b2, $07c2 - person_event SPRITE_POKE_BALL, 28, 26, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c5b4, $07c3 - person_event SPRITE_POKE_BALL, 24, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c5b6, $07c4 -; 0x18c601 + person_event SPRITE_POKE_BALL, 14, 28, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c5b2, EVENT_SILVER_CAVE_ROOM_2_CALCIUM + person_event SPRITE_POKE_BALL, 28, 26, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c5b4, EVENT_SILVER_CAVE_ROOM_2_ULTRA_BALL + person_event SPRITE_POKE_BALL, 24, 8, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c5b6, EVENT_SILVER_CAVE_ROOM_2_PP_UP |