summaryrefslogtreecommitdiff
path: root/maps/WhirlIslandNE.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/WhirlIslandNE.asm')
-rw-r--r--maps/WhirlIslandNE.asm31
1 files changed, 12 insertions, 19 deletions
diff --git a/maps/WhirlIslandNE.asm b/maps/WhirlIslandNE.asm
index b022a4c72..c13cd7a93 100644
--- a/maps/WhirlIslandNE.asm
+++ b/maps/WhirlIslandNE.asm
@@ -1,32 +1,25 @@
-const_value set 2
+ const_def 2 ; object constants
const WHIRLISLANDNE_POKE_BALL
WhirlIslandNE_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
WhirlIslandNEUltraBall:
itemball ULTRA_BALL
WhirlIslandNE_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 3
- warp_def 3, 13, 2, ROUTE_41
- warp_def 17, 3, 2, WHIRL_ISLAND_B1F
- warp_def 13, 11, 3, WHIRL_ISLAND_B1F
+ db 3 ; warp events
+ warp_event 3, 13, ROUTE_41, 2
+ warp_event 17, 3, WHIRL_ISLAND_B1F, 2
+ warp_event 13, 11, WHIRL_ISLAND_B1F, 3
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 1
- object_event 11, 11, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandNEUltraBall, EVENT_WHIRL_ISLAND_NE_ULTRA_BALL
+ db 1 ; object events
+ object_event 11, 11, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandNEUltraBall, EVENT_WHIRL_ISLAND_NE_ULTRA_BALL