summaryrefslogtreecommitdiff
path: root/maps/IcePath1F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/IcePath1F.asm')
-rw-r--r--maps/IcePath1F.asm35
1 files changed, 15 insertions, 20 deletions
diff --git a/maps/IcePath1F.asm b/maps/IcePath1F.asm
index 7a320793c..c233edeba 100644
--- a/maps/IcePath1F.asm
+++ b/maps/IcePath1F.asm
@@ -1,43 +1,38 @@
-IcePath1F_MapScriptHeader: ; 0x7e470
- ; trigger count
+IcePath1F_MapScriptHeader:
+.MapTriggers:
db 0
- ; callback count
+.MapCallbacks:
db 0
-; 0x7e472
-ItemFragment_0x7e472: ; 0x7e472
- db HM_07, 1
-; 0x7e474
+ItemFragment_0x7e472:
+ db HM_WATERFALL, 1
-ItemFragment_0x7e474: ; 0x7e474
+ItemFragment_0x7e474:
db PP_UP, 1
-; 0x7e476
-ItemFragment_0x7e476: ; 0x7e476
+ItemFragment_0x7e476:
db PROTEIN, 1
-; 0x7e478
-IcePath1F_MapEventHeader: ; 0x7e478
+IcePath1F_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 4
warp_def $13, $4, 1, GROUP_ROUTE_44, MAP_ROUTE_44
warp_def $1b, $24, 7, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY
warp_def $5, $25, 1, GROUP_ICE_PATH_B1F, MAP_ICE_PATH_B1F
warp_def $d, $25, 7, GROUP_ICE_PATH_B1F, MAP_ICE_PATH_B1F
- ; xy triggers
+.XYTriggers:
db 0
- ; signposts
+.Signposts:
db 0
- ; people-events
+.PersonEvents:
db 3
- person_event SPRITE_POKE_BALL, 11, 35, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e472, $0688
- person_event SPRITE_POKE_BALL, 27, 36, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e474, $0689
- person_event SPRITE_POKE_BALL, 13, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e476, $07be
-; 0x7e4b9
+ person_event SPRITE_POKE_BALL, 11, 35, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e472, EVENT_GOT_HM07_WATERFALL
+ person_event SPRITE_POKE_BALL, 27, 36, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e474, EVENT_ICE_PATH_1F_PP_UP
+ person_event SPRITE_POKE_BALL, 13, 39, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e476, EVENT_ICE_PATH_1F_PROTEIN