diff options
Diffstat (limited to 'maps/IcePathB1F.asm')
| -rw-r--r-- | maps/IcePathB1F.asm | 51 |
1 files changed, 25 insertions, 26 deletions
diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm index 80d341b03..510e4e458 100644 --- a/maps/IcePathB1F.asm +++ b/maps/IcePathB1F.asm @@ -1,3 +1,10 @@ +const_value set 2 + const ICEPATHB1F_BOULDER1 + const ICEPATHB1F_BOULDER2 + const ICEPATHB1F_BOULDER3 + const ICEPATHB1F_BOULDER4 + const ICEPATHB1F_POKE_BALL + IcePathB1F_MapScriptHeader: .MapTriggers: db 0 @@ -18,47 +25,39 @@ IcePathB1F_MapScriptHeader: db 0, 0 ; filler .StoneTable: - db 3, 2 ; warp, person - dw .Boulder1 - - db 4, 3 ; warp, person - dw .Boulder2 - - db 5, 4 ; warp, person - dw .Boulder3 - - db 6, 5 ; warp, person - dw .Boulder4 - - db -1 ; end + stonetable 3, ICEPATHB1F_BOULDER1, .Boulder1 + stonetable 4, ICEPATHB1F_BOULDER2, .Boulder2 + stonetable 5, ICEPATHB1F_BOULDER3, .Boulder3 + stonetable 6, ICEPATHB1F_BOULDER4, .Boulder4 + db -1 .Boulder1: - disappear 2 + disappear ICEPATHB1F_BOULDER1 clearevent EVENT_BOULDER_IN_ICE_PATH_1A jump .FinishBoulder .Boulder2: - disappear 3 + disappear ICEPATHB1F_BOULDER2 clearevent EVENT_BOULDER_IN_ICE_PATH_2A jump .FinishBoulder .Boulder3: - disappear 4 + disappear ICEPATHB1F_BOULDER3 clearevent EVENT_BOULDER_IN_ICE_PATH_3A jump .FinishBoulder .Boulder4: - disappear 5 + disappear ICEPATHB1F_BOULDER4 clearevent EVENT_BOULDER_IN_ICE_PATH_4A jump .FinishBoulder .FinishBoulder: pause 30 scall .BoulderFallsThrough - loadfont - writetext UnknownText_0x7e512 + opentext + writetext IcePathBoulderFellThroughText + waitbutton closetext - loadmovesprites end .BoulderFallsThrough: @@ -70,14 +69,14 @@ IcePathB1F_MapScriptHeader: IcePathB1FBoulder: jumpstd strengthboulder -ItemFragment_0x7e50d: - db IRON, 1 +IcePathB1FIron: + itemball IRON -MapIcePathB1FSignpostItem0: +IcePathB1FHiddenMaxPotion: dwb EVENT_ICE_PATH_B1F_HIDDEN_MAX_POTION, MAX_POTION -UnknownText_0x7e512: +IcePathBoulderFellThroughText: text "The boulder fell" line "through." done @@ -103,7 +102,7 @@ IcePathB1F_MapEventHeader: .Signposts: db 1 - signpost 30, 17, SIGNPOST_ITEM, MapIcePathB1FSignpostItem0 + signpost 30, 17, SIGNPOST_ITEM, IcePathB1FHiddenMaxPotion .PersonEvents: db 5 @@ -111,4 +110,4 @@ IcePathB1F_MapEventHeader: person_event SPRITE_BOULDER, 8, 7, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_2 person_event SPRITE_BOULDER, 9, 8, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_3 person_event SPRITE_BOULDER, 7, 17, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_4 - person_event SPRITE_POKE_BALL, 35, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7e50d, EVENT_ICE_PATH_B1F_IRON + person_event SPRITE_POKE_BALL, 35, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, IcePathB1FIron, EVENT_ICE_PATH_B1F_IRON |