diff options
Diffstat (limited to 'maps/WhirlIslandSW.asm')
| -rw-r--r-- | maps/WhirlIslandSW.asm | 43 |
1 files changed, 18 insertions, 25 deletions
diff --git a/maps/WhirlIslandSW.asm b/maps/WhirlIslandSW.asm index b80b00b6a..66c3fff23 100644 --- a/maps/WhirlIslandSW.asm +++ b/maps/WhirlIslandSW.asm @@ -1,34 +1,27 @@ -const_value set 2 + const_def 2 ; object constants const WHIRLISLANDSW_POKE_BALL WhirlIslandSW_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks WhirlIslandSWUltraBall: itemball ULTRA_BALL WhirlIslandSW_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 5 - warp_def 5, 7, 3, ROUTE_41 - warp_def 17, 3, 5, WHIRL_ISLAND_B1F - warp_def 3, 3, 4, WHIRL_ISLAND_B1F - warp_def 3, 15, 3, WHIRL_ISLAND_NW - warp_def 17, 15, 4, WHIRL_ISLAND_B2F - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 1 - object_event 15, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandSWUltraBall, EVENT_WHIRL_ISLAND_SW_ULTRA_BALL + db 0, 0 ; filler + + db 5 ; warp events + warp_event 5, 7, ROUTE_41, 3 + warp_event 17, 3, WHIRL_ISLAND_B1F, 5 + warp_event 3, 3, WHIRL_ISLAND_B1F, 4 + warp_event 3, 15, WHIRL_ISLAND_NW, 3 + warp_event 17, 15, WHIRL_ISLAND_B2F, 4 + + db 0 ; coord events + + db 0 ; bg events + + db 1 ; object events + object_event 15, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandSWUltraBall, EVENT_WHIRL_ISLAND_SW_ULTRA_BALL |