summaryrefslogtreecommitdiff
path: root/maps/WhirlIslandSW.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/WhirlIslandSW.asm')
-rw-r--r--maps/WhirlIslandSW.asm23
1 files changed, 10 insertions, 13 deletions
diff --git a/maps/WhirlIslandSW.asm b/maps/WhirlIslandSW.asm
index 3ec1fac03..d93bf14ea 100644
--- a/maps/WhirlIslandSW.asm
+++ b/maps/WhirlIslandSW.asm
@@ -1,20 +1,18 @@
-WhirlIslandSW_MapScriptHeader: ; 0x18c3ba
- ; trigger count
+WhirlIslandSW_MapScriptHeader:
+.MapTriggers:
db 0
- ; callback count
+.MapCallbacks:
db 0
-; 0x18c3bc
-ItemFragment_0x18c3bc: ; 0x18c3bc
+ItemFragment_0x18c3bc:
db ULTRA_BALL, 1
-; 0x18c3be
-WhirlIslandSW_MapEventHeader: ; 0x18c3be
+WhirlIslandSW_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 5
warp_def $7, $5, 3, GROUP_ROUTE_41, MAP_ROUTE_41
warp_def $3, $11, 5, GROUP_WHIRL_ISLAND_B1F, MAP_WHIRL_ISLAND_B1F
@@ -22,13 +20,12 @@ WhirlIslandSW_MapEventHeader: ; 0x18c3be
warp_def $f, $3, 3, GROUP_WHIRL_ISLAND_NW, MAP_WHIRL_ISLAND_NW
warp_def $f, $11, 4, GROUP_WHIRL_ISLAND_B2F, MAP_WHIRL_ISLAND_B2F
- ; xy triggers
+.XYTriggers:
db 0
- ; signposts
+.Signposts:
db 0
- ; people-events
+.PersonEvents:
db 1
- person_event SPRITE_POKE_BALL, 6, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c3bc, $0690
-; 0x18c3ea
+ person_event SPRITE_POKE_BALL, 6, 19, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c3bc, EVENT_WHIRL_ISLAND_SW_ULTRA_BALL