diff options
Diffstat (limited to 'maps/WhirlIslandB2F.asm')
| -rw-r--r-- | maps/WhirlIslandB2F.asm | 45 |
1 files changed, 19 insertions, 26 deletions
diff --git a/maps/WhirlIslandB2F.asm b/maps/WhirlIslandB2F.asm index d589b7d05..acee9670a 100644 --- a/maps/WhirlIslandB2F.asm +++ b/maps/WhirlIslandB2F.asm @@ -1,14 +1,12 @@ -const_value set 2 + const_def 2 ; object constants const WHIRLISLANDB2F_POKE_BALL1 const WHIRLISLANDB2F_POKE_BALL2 const WHIRLISLANDB2F_POKE_BALL3 WhirlIslandB2F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks WhirlIslandB2FFullRestore: itemball FULL_RESTORE @@ -20,24 +18,19 @@ WhirlIslandB2FMaxElixer: itemball MAX_ELIXER WhirlIslandB2F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def 11, 5, 7, WHIRL_ISLAND_B1F - warp_def 7, 11, 8, WHIRL_ISLAND_B1F - warp_def 7, 25, 1, WHIRL_ISLAND_LUGIA_CHAMBER - warp_def 13, 31, 5, WHIRL_ISLAND_SW - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 3 - object_event 10, 11, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FFullRestore, EVENT_WHIRL_ISLAND_B2F_FULL_RESTORE - object_event 6, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FMaxRevive, EVENT_WHIRL_ISLAND_B2F_MAX_REVIVE - object_event 5, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FMaxElixer, EVENT_WHIRL_ISLAND_B2F_MAX_ELIXER + db 0, 0 ; filler + + db 4 ; warp events + warp_event 11, 5, WHIRL_ISLAND_B1F, 7 + warp_event 7, 11, WHIRL_ISLAND_B1F, 8 + warp_event 7, 25, WHIRL_ISLAND_LUGIA_CHAMBER, 1 + warp_event 13, 31, WHIRL_ISLAND_SW, 5 + + db 0 ; coord events + + db 0 ; bg events + + db 3 ; object events + object_event 10, 11, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FFullRestore, EVENT_WHIRL_ISLAND_B2F_FULL_RESTORE + object_event 6, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FMaxRevive, EVENT_WHIRL_ISLAND_B2F_MAX_REVIVE + object_event 5, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FMaxElixer, EVENT_WHIRL_ISLAND_B2F_MAX_ELIXER |