diff options
Diffstat (limited to 'maps/WhirlIslandB1F.asm')
| -rw-r--r-- | maps/WhirlIslandB1F.asm | 50 |
1 files changed, 29 insertions, 21 deletions
diff --git a/maps/WhirlIslandB1F.asm b/maps/WhirlIslandB1F.asm index e1de0b780..e425c80ca 100644 --- a/maps/WhirlIslandB1F.asm +++ b/maps/WhirlIslandB1F.asm @@ -1,3 +1,11 @@ +const_value set 2 + const WHIRLISLANDB1F_POKE_BALL1 + const WHIRLISLANDB1F_POKE_BALL2 + const WHIRLISLANDB1F_POKE_BALL3 + const WHIRLISLANDB1F_POKE_BALL4 + const WHIRLISLANDB1F_POKE_BALL5 + const WHIRLISLANDB1F_BOULDER + WhirlIslandB1F_MapScriptHeader: .MapTriggers: db 0 @@ -5,33 +13,33 @@ WhirlIslandB1F_MapScriptHeader: .MapCallbacks: db 0 -ItemFragment_0x18c410: - db FULL_RESTORE, 1 +WhirlIslandB1FFullRestore: + itemball FULL_RESTORE -ItemFragment_0x18c412: - db CARBOS, 1 +WhirlIslandB1FCarbos: + itemball CARBOS -ItemFragment_0x18c414: - db CALCIUM, 1 +WhirlIslandB1FCalcium: + itemball CALCIUM -ItemFragment_0x18c416: - db NUGGET, 1 +WhirlIslandB1FNugget: + itemball NUGGET -ItemFragment_0x18c418: - db ESCAPE_ROPE, 1 +WhirlIslandB1FEscapeRope: + itemball ESCAPE_ROPE WhirlIslandB1FBoulder: jumpstd strengthboulder -MapWhirlIslandB1FSignpostItem0: +WhirlIslandB1FHiddenRareCandy: dwb EVENT_WHIRL_ISLAND_B1F_HIDDEN_RARE_CANDY, RARE_CANDY -MapWhirlIslandB1FSignpostItem1: +WhirlIslandB1FHiddenUltraBall: dwb EVENT_WHIRL_ISLAND_B1F_HIDDEN_ULTRA_BALL, ULTRA_BALL -MapWhirlIslandB1FSignpostItem2: +WhirlIslandB1FHiddenFullRestore: dwb EVENT_WHIRL_ISLAND_B1F_HIDDEN_FULL_RESTORE, FULL_RESTORE @@ -56,15 +64,15 @@ WhirlIslandB1F_MapEventHeader: .Signposts: db 3 - signpost 4, 30, SIGNPOST_ITEM, MapWhirlIslandB1FSignpostItem0 - signpost 18, 36, SIGNPOST_ITEM, MapWhirlIslandB1FSignpostItem1 - signpost 23, 2, SIGNPOST_ITEM, MapWhirlIslandB1FSignpostItem2 + signpost 4, 30, SIGNPOST_ITEM, WhirlIslandB1FHiddenRareCandy + signpost 18, 36, SIGNPOST_ITEM, WhirlIslandB1FHiddenUltraBall + signpost 23, 2, SIGNPOST_ITEM, WhirlIslandB1FHiddenFullRestore .PersonEvents: db 6 - person_event SPRITE_POKE_BALL, 13, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c410, EVENT_WHIRL_ISLAND_B1F_FULL_RESTORE - person_event SPRITE_POKE_BALL, 18, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c412, EVENT_WHIRL_ISLAND_B1F_CARBOS - person_event SPRITE_POKE_BALL, 23, 33, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c414, EVENT_WHIRL_ISLAND_B1F_CALCIUM - person_event SPRITE_POKE_BALL, 8, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c416, EVENT_WHIRL_ISLAND_B1F_NUGGET - person_event SPRITE_POKE_BALL, 26, 19, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c418, EVENT_WHIRL_ISLAND_B1F_ESCAPE_ROPE + person_event SPRITE_POKE_BALL, 13, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, WhirlIslandB1FFullRestore, EVENT_WHIRL_ISLAND_B1F_FULL_RESTORE + person_event SPRITE_POKE_BALL, 18, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, WhirlIslandB1FCarbos, EVENT_WHIRL_ISLAND_B1F_CARBOS + person_event SPRITE_POKE_BALL, 23, 33, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, WhirlIslandB1FCalcium, EVENT_WHIRL_ISLAND_B1F_CALCIUM + person_event SPRITE_POKE_BALL, 8, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, WhirlIslandB1FNugget, EVENT_WHIRL_ISLAND_B1F_NUGGET + person_event SPRITE_POKE_BALL, 26, 19, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, WhirlIslandB1FEscapeRope, EVENT_WHIRL_ISLAND_B1F_ESCAPE_ROPE person_event SPRITE_BOULDER, 26, 23, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, WhirlIslandB1FBoulder, -1 |