diff options
Diffstat (limited to 'maps/WhirlIslandB1F.asm')
| -rw-r--r-- | maps/WhirlIslandB1F.asm | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/maps/WhirlIslandB1F.asm b/maps/WhirlIslandB1F.asm index be315317c..011b0ac8f 100644 --- a/maps/WhirlIslandB1F.asm +++ b/maps/WhirlIslandB1F.asm @@ -49,30 +49,30 @@ WhirlIslandB1F_MapEventHeader: .Warps: db 9 - warp_def $5, $5, 2, WHIRL_ISLAND_NW - warp_def $3, $23, 2, WHIRL_ISLAND_NE - warp_def $9, $1d, 3, WHIRL_ISLAND_NE - warp_def $1f, $9, 3, WHIRL_ISLAND_SW - warp_def $1f, $17, 2, WHIRL_ISLAND_SW - warp_def $1d, $1f, 2, WHIRL_ISLAND_SE - warp_def $15, $19, 1, WHIRL_ISLAND_B2F - warp_def $1b, $d, 2, WHIRL_ISLAND_B2F - warp_def $15, $11, 1, WHIRL_ISLAND_CAVE + warp_def 5, 5, 2, WHIRL_ISLAND_NW + warp_def 35, 3, 2, WHIRL_ISLAND_NE + warp_def 29, 9, 3, WHIRL_ISLAND_NE + warp_def 9, 31, 3, WHIRL_ISLAND_SW + warp_def 23, 31, 2, WHIRL_ISLAND_SW + warp_def 31, 29, 2, WHIRL_ISLAND_SE + warp_def 25, 21, 1, WHIRL_ISLAND_B2F + warp_def 13, 27, 2, WHIRL_ISLAND_B2F + warp_def 17, 21, 1, WHIRL_ISLAND_CAVE .CoordEvents: db 0 .BGEvents: db 3 - bg_event 4, 30, BGEVENT_ITEM, WhirlIslandB1FHiddenRareCandy - bg_event 18, 36, BGEVENT_ITEM, WhirlIslandB1FHiddenUltraBall - bg_event 23, 2, BGEVENT_ITEM, WhirlIslandB1FHiddenFullRestore + bg_event 30, 4, BGEVENT_ITEM, WhirlIslandB1FHiddenRareCandy + bg_event 36, 18, BGEVENT_ITEM, WhirlIslandB1FHiddenUltraBall + bg_event 2, 23, BGEVENT_ITEM, WhirlIslandB1FHiddenFullRestore .ObjectEvents: db 6 - object_event SPRITE_POKE_BALL, 13, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FFullRestore, EVENT_WHIRL_ISLAND_B1F_FULL_RESTORE - object_event SPRITE_POKE_BALL, 18, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FCarbos, EVENT_WHIRL_ISLAND_B1F_CARBOS - object_event SPRITE_POKE_BALL, 23, 33, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FCalcium, EVENT_WHIRL_ISLAND_B1F_CALCIUM - object_event SPRITE_POKE_BALL, 8, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FNugget, EVENT_WHIRL_ISLAND_B1F_NUGGET - object_event SPRITE_POKE_BALL, 26, 19, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FEscapeRope, EVENT_WHIRL_ISLAND_B1F_ESCAPE_ROPE - object_event SPRITE_BOULDER, 26, 23, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WhirlIslandB1FBoulder, -1 + object_event 7, 13, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FFullRestore, EVENT_WHIRL_ISLAND_B1F_FULL_RESTORE + object_event 2, 18, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FCarbos, EVENT_WHIRL_ISLAND_B1F_CARBOS + object_event 33, 23, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FCalcium, EVENT_WHIRL_ISLAND_B1F_CALCIUM + object_event 17, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FNugget, EVENT_WHIRL_ISLAND_B1F_NUGGET + object_event 19, 26, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FEscapeRope, EVENT_WHIRL_ISLAND_B1F_ESCAPE_ROPE + object_event 23, 26, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WhirlIslandB1FBoulder, -1 |