summaryrefslogtreecommitdiff
path: root/maps/IcePathB1F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/IcePathB1F.asm')
-rw-r--r--maps/IcePathB1F.asm79
1 files changed, 32 insertions, 47 deletions
diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm
index 27cf68ba2..06a9d9ee8 100644
--- a/maps/IcePathB1F.asm
+++ b/maps/IcePathB1F.asm
@@ -1,26 +1,23 @@
-IcePathB1F_MapScriptHeader: ; 0x7e4b9
- ; trigger count
+IcePathB1F_MapScriptHeader:
+.MapTriggers:
db 0
- ; callback count
+.MapCallbacks:
db 1
; callbacks
dbw 3, UnknownScript_0x7e4be
-; 0x7e4be
-UnknownScript_0x7e4be: ; 0x7e4be
+UnknownScript_0x7e4be:
writecmdqueue CmdQueue_0x7e4c2
return
-; 0x7e4c2
-CmdQueue_0x7e4c2: ; 0x7e4c2
+CmdQueue_0x7e4c2:
dbw 2, StoneTable_0x7e4c7 ; check if any stones are sitting on a warp
db 0, 0 ; filler
-; 0x7e4c7
-StoneTable_0x7e4c7: ; 0x7e4c7
+StoneTable_0x7e4c7:
db 3, 2 ; warp, person
dw UnknownScript_0x7e4d8
@@ -34,33 +31,28 @@ StoneTable_0x7e4c7: ; 0x7e4c7
dw UnknownScript_0x7e4f0
db $ff ; end
-; 0x7e4d8
-UnknownScript_0x7e4d8: ; 0x7e4d8
+UnknownScript_0x7e4d8:
disappear 2
- clearevent EVENT_BOULDER_IN_ICE_PATH_1
+ clearevent EVENT_BOULDER_IN_ICE_PATH_1A
jump UnknownScript_0x7e4f8
-; 0x7e4e0
-UnknownScript_0x7e4e0: ; 0x7e4e0
+UnknownScript_0x7e4e0:
disappear 3
- clearevent EVENT_BOULDER_IN_ICE_PATH_2
+ clearevent EVENT_BOULDER_IN_ICE_PATH_2A
jump UnknownScript_0x7e4f8
-; 0x7e4e8
-UnknownScript_0x7e4e8: ; 0x7e4e8
+UnknownScript_0x7e4e8:
disappear 4
- clearevent EVENT_BOULDER_IN_ICE_PATH_3
+ clearevent EVENT_BOULDER_IN_ICE_PATH_3A
jump UnknownScript_0x7e4f8
-; 0x7e4f0
-UnknownScript_0x7e4f0: ; 0x7e4f0
+UnknownScript_0x7e4f0:
disappear 5
- clearevent EVENT_BOULDER_IN_ICE_PATH_4
+ clearevent EVENT_BOULDER_IN_ICE_PATH_4A
jump UnknownScript_0x7e4f8
-; 0x7e4f8
-UnknownScript_0x7e4f8: ; 0x7e4f8
+UnknownScript_0x7e4f8:
pause 30
scall UnknownScript_0x7e504
loadfont
@@ -68,41 +60,34 @@ UnknownScript_0x7e4f8: ; 0x7e4f8
closetext
loadmovesprites
end
-; 0x7e504
-UnknownScript_0x7e504: ; 0x7e504
+UnknownScript_0x7e504:
playsound SFX_STRENGTH
earthquake 80
end
-; 0x7e50a
-IcePathB1FBoulder: ; 0x7e50a
+IcePathB1FBoulder:
jumpstd strengthboulder
-; 0x7e50d
-ItemFragment_0x7e50d: ; 0x7e50d
+ItemFragment_0x7e50d:
db IRON, 1
-; 0x7e50f
-MapIcePathB1FSignpostItem0: ; 0x7e50f
- dw $0094
- db MAX_POTION
-; 0x7e512
+MapIcePathB1FSignpostItem0:
+ dwb EVENT_ICE_PATH_B1F_HIDDEN_MAX_POTION, MAX_POTION
-UnknownText_0x7e512: ; 0x7e512
+UnknownText_0x7e512:
text "The boulder fell"
line "through."
done
-; 0x7e52d
-IcePathB1F_MapEventHeader: ; 0x7e52d
+IcePathB1F_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 8
warp_def $f, $3, 3, GROUP_ICE_PATH_1F, MAP_ICE_PATH_1F
warp_def $3, $11, 1, GROUP_ICE_PATH_B2F_MAHOGANY_SIDE, MAP_ICE_PATH_B2F_MAHOGANY_SIDE
@@ -113,17 +98,17 @@ IcePathB1F_MapEventHeader: ; 0x7e52d
warp_def $19, $5, 4, GROUP_ICE_PATH_1F, MAP_ICE_PATH_1F
warp_def $1b, $b, 1, GROUP_ICE_PATH_B2F_BLACKTHORN_SIDE, MAP_ICE_PATH_B2F_BLACKTHORN_SIDE
- ; xy triggers
+.XYTriggers:
db 0
- ; signposts
+.Signposts:
db 1
- signpost 30, 17, $7, MapIcePathB1FSignpostItem0
+ signpost 30, 17, SIGNPOST_ITEM, MapIcePathB1FSignpostItem0
- ; people-events
+.PersonEvents:
db 5
- person_event SPRITE_BOULDER, 11, 15, $19, $0, 255, 255, $0, 0, IcePathB1FBoulder, $0709
- person_event SPRITE_BOULDER, 12, 11, $19, $0, 255, 255, $0, 0, IcePathB1FBoulder, $070a
- person_event SPRITE_BOULDER, 13, 12, $19, $0, 255, 255, $0, 0, IcePathB1FBoulder, $070b
- person_event SPRITE_BOULDER, 11, 21, $19, $0, 255, 255, $0, 0, IcePathB1FBoulder, $070c
- person_event SPRITE_POKE_BALL, 39, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e50d, $068a
+ person_event SPRITE_BOULDER, 11, 15, OW_LEFT | $11, $0, -1, -1, $0, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_1
+ person_event SPRITE_BOULDER, 12, 11, OW_LEFT | $11, $0, -1, -1, $0, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_2
+ person_event SPRITE_BOULDER, 13, 12, OW_LEFT | $11, $0, -1, -1, $0, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_3
+ person_event SPRITE_BOULDER, 11, 21, OW_LEFT | $11, $0, -1, -1, $0, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_4
+ person_event SPRITE_POKE_BALL, 39, 9, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e50d, EVENT_ICE_PATH_B1F_IRON