summaryrefslogtreecommitdiff
path: root/maps/RockTunnelB1F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/RockTunnelB1F.asm')
-rw-r--r--maps/RockTunnelB1F.asm41
1 files changed, 17 insertions, 24 deletions
diff --git a/maps/RockTunnelB1F.asm b/maps/RockTunnelB1F.asm
index d6b3ea8c3..74b1aac1a 100644
--- a/maps/RockTunnelB1F.asm
+++ b/maps/RockTunnelB1F.asm
@@ -1,50 +1,43 @@
-RockTunnelB1F_MapScriptHeader: ; 0x74407
- ; trigger count
+RockTunnelB1F_MapScriptHeader:
+.MapTriggers:
db 0
- ; callback count
+.MapCallbacks:
db 0
-; 0x74409
-ItemFragment_0x74409: ; 0x74409
+ItemFragment_0x74409:
db IRON, 1
-; 0x7440b
-ItemFragment_0x7440b: ; 0x7440b
+ItemFragment_0x7440b:
db PP_UP, 1
-; 0x7440d
-ItemFragment_0x7440d: ; 0x7440d
+ItemFragment_0x7440d:
db REVIVE, 1
-; 0x7440f
-MapRockTunnelB1FSignpostItem0: ; 0x7440f
- dw $00e9
- db MAX_POTION
+MapRockTunnelB1FSignpostItem0:
+ dwb EVENT_ROCK_TUNNEL_B1F_HIDDEN_MAX_POTION, MAX_POTION
-; 0x74412
-RockTunnelB1F_MapEventHeader: ; 0x74412
+RockTunnelB1F_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 4
warp_def $3, $3, 6, GROUP_ROCK_TUNNEL_1F, MAP_ROCK_TUNNEL_1F
warp_def $9, $11, 4, GROUP_ROCK_TUNNEL_1F, MAP_ROCK_TUNNEL_1F
warp_def $3, $17, 3, GROUP_ROCK_TUNNEL_1F, MAP_ROCK_TUNNEL_1F
warp_def $17, $19, 5, GROUP_ROCK_TUNNEL_1F, MAP_ROCK_TUNNEL_1F
- ; xy triggers
+.XYTriggers:
db 0
- ; signposts
+.Signposts:
db 1
- signpost 14, 4, $7, MapRockTunnelB1FSignpostItem0
+ signpost 14, 4, SIGNPOST_ITEM, MapRockTunnelB1FSignpostItem0
- ; people-events
+.PersonEvents:
db 3
- person_event SPRITE_POKE_BALL, 29, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x74409, $0780
- person_event SPRITE_POKE_BALL, 21, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x7440b, $0781
- person_event SPRITE_POKE_BALL, 6, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x7440d, $0782
-; 0x74458
+ person_event SPRITE_POKE_BALL, 29, 11, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x74409, EVENT_ROCK_TUNNEL_B1F_IRON
+ person_event SPRITE_POKE_BALL, 21, 10, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7440b, EVENT_ROCK_TUNNEL_B1F_PP_UP
+ person_event SPRITE_POKE_BALL, 6, 19, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7440d, EVENT_ROCK_TUNNEL_B1F_REVIVE