diff options
Diffstat (limited to 'maps/IcePathB1F.asm')
| -rw-r--r-- | maps/IcePathB1F.asm | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm index 90f574d36..06a9d9ee8 100644 --- a/maps/IcePathB1F.asm +++ b/maps/IcePathB1F.asm @@ -1,8 +1,8 @@ IcePathB1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -34,22 +34,22 @@ StoneTable_0x7e4c7: UnknownScript_0x7e4d8: disappear 2 - clearevent EVENT_BOULDER_IN_ICE_PATH_1 + clearevent EVENT_BOULDER_IN_ICE_PATH_1A jump UnknownScript_0x7e4f8 UnknownScript_0x7e4e0: disappear 3 - clearevent EVENT_BOULDER_IN_ICE_PATH_2 + clearevent EVENT_BOULDER_IN_ICE_PATH_2A jump UnknownScript_0x7e4f8 UnknownScript_0x7e4e8: disappear 4 - clearevent EVENT_BOULDER_IN_ICE_PATH_3 + clearevent EVENT_BOULDER_IN_ICE_PATH_3A jump UnknownScript_0x7e4f8 UnknownScript_0x7e4f0: disappear 5 - clearevent EVENT_BOULDER_IN_ICE_PATH_4 + clearevent EVENT_BOULDER_IN_ICE_PATH_4A jump UnknownScript_0x7e4f8 UnknownScript_0x7e4f8: @@ -74,8 +74,7 @@ ItemFragment_0x7e50d: db IRON, 1 MapIcePathB1FSignpostItem0: - dw $0094 - db MAX_POTION + dwb EVENT_ICE_PATH_B1F_HIDDEN_MAX_POTION, MAX_POTION UnknownText_0x7e512: @@ -88,7 +87,7 @@ 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 @@ -99,17 +98,17 @@ IcePathB1F_MapEventHeader: 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, EVENT_709 - person_event SPRITE_BOULDER, 12, 11, $19, $0, 255, 255, $0, 0, IcePathB1FBoulder, EVENT_70A - person_event SPRITE_BOULDER, 13, 12, $19, $0, 255, 255, $0, 0, IcePathB1FBoulder, EVENT_70B - person_event SPRITE_BOULDER, 11, 21, $19, $0, 255, 255, $0, 0, IcePathB1FBoulder, EVENT_70C - person_event SPRITE_POKE_BALL, 39, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e50d, EVENT_68A + 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 |