summaryrefslogtreecommitdiff
path: root/maps/WhirlIslandB2F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/WhirlIslandB2F.asm')
-rw-r--r--maps/WhirlIslandB2F.asm33
1 files changed, 14 insertions, 19 deletions
diff --git a/maps/WhirlIslandB2F.asm b/maps/WhirlIslandB2F.asm
index dcd88e768..87fd91dec 100644
--- a/maps/WhirlIslandB2F.asm
+++ b/maps/WhirlIslandB2F.asm
@@ -1,43 +1,38 @@
-WhirlIslandB2F_MapScriptHeader: ; 0x18c4b6
- ; trigger count
+WhirlIslandB2F_MapScriptHeader:
+.MapTriggers:
db 0
- ; callback count
+.MapCallbacks:
db 0
-; 0x18c4b8
-ItemFragment_0x18c4b8: ; 0x18c4b8
+ItemFragment_0x18c4b8:
db FULL_RESTORE, 1
-; 0x18c4ba
-ItemFragment_0x18c4ba: ; 0x18c4ba
+ItemFragment_0x18c4ba:
db MAX_REVIVE, 1
-; 0x18c4bc
-ItemFragment_0x18c4bc: ; 0x18c4bc
+ItemFragment_0x18c4bc:
db MAX_ELIXER, 1
-; 0x18c4be
-WhirlIslandB2F_MapEventHeader: ; 0x18c4be
+WhirlIslandB2F_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 4
warp_def $5, $b, 7, GROUP_WHIRL_ISLAND_B1F, MAP_WHIRL_ISLAND_B1F
warp_def $b, $7, 8, GROUP_WHIRL_ISLAND_B1F, MAP_WHIRL_ISLAND_B1F
warp_def $19, $7, 1, GROUP_WHIRL_ISLAND_LUGIA_CHAMBER, MAP_WHIRL_ISLAND_LUGIA_CHAMBER
warp_def $1f, $d, 5, GROUP_WHIRL_ISLAND_SW, MAP_WHIRL_ISLAND_SW
- ; xy triggers
+.XYTriggers:
db 0
- ; signposts
+.Signposts:
db 0
- ; people-events
+.PersonEvents:
db 3
- person_event SPRITE_POKE_BALL, 15, 14, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c4b8, $0696
- person_event SPRITE_POKE_BALL, 8, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c4ba, $0697
- person_event SPRITE_POKE_BALL, 16, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c4bc, $0698
-; 0x18c4ff
+ person_event SPRITE_POKE_BALL, 15, 14, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c4b8, EVENT_WHIRL_ISLAND_B2F_FULL_RESTORE
+ person_event SPRITE_POKE_BALL, 8, 10, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c4ba, EVENT_WHIRL_ISLAND_B2F_MAX_REVIVE
+ person_event SPRITE_POKE_BALL, 16, 9, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c4bc, EVENT_WHIRL_ISLAND_B2F_MAX_ELIXER