summaryrefslogtreecommitdiff
path: root/maps/IcePathB2FMahoganySide.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/IcePathB2FMahoganySide.asm')
-rw-r--r--maps/IcePathB2FMahoganySide.asm24
1 files changed, 16 insertions, 8 deletions
diff --git a/maps/IcePathB2FMahoganySide.asm b/maps/IcePathB2FMahoganySide.asm
index 77a5ff29a..f17f21d12 100644
--- a/maps/IcePathB2FMahoganySide.asm
+++ b/maps/IcePathB2FMahoganySide.asm
@@ -1,3 +1,11 @@
+const_value set 2
+ const ICEPATHB2FMAHOGANYSIDE_BOULDER1
+ const ICEPATHB2FMAHOGANYSIDE_BOULDER2
+ const ICEPATHB2FMAHOGANYSIDE_BOULDER3
+ const ICEPATHB2FMAHOGANYSIDE_BOULDER4
+ const ICEPATHB2FMAHOGANYSIDE_POKE_BALL1
+ const ICEPATHB2FMAHOGANYSIDE_POKE_BALL2
+
IcePathB2FMahoganySide_MapScriptHeader:
.MapTriggers:
db 0
@@ -8,13 +16,13 @@ IcePathB2FMahoganySide_MapScriptHeader:
BoulderScript_0x7e5a3:
jumptext UnknownText_0x7e5ad
-ItemFragment_0x7e5a6:
- db FULL_HEAL, 1
+IcePathB2FMahoganySideFullHeal:
+ itemball FULL_HEAL
-ItemFragment_0x7e5a8:
- db MAX_POTION, 1
+IcePathB2FMahoganySideMaxPotion:
+ itemball MAX_POTION
-MapIcePathB2FMahoganySideSignpostItem0:
+IcePathB2FMahoganySideHiddenCarbos:
dwb EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_HIDDEN_CARBOS, CARBOS
@@ -41,7 +49,7 @@ IcePathB2FMahoganySide_MapEventHeader:
.Signposts:
db 1
- signpost 17, 0, SIGNPOST_ITEM, MapIcePathB2FMahoganySideSignpostItem0
+ signpost 17, 0, SIGNPOST_ITEM, IcePathB2FMahoganySideHiddenCarbos
.PersonEvents:
db 6
@@ -49,5 +57,5 @@ IcePathB2FMahoganySide_MapEventHeader:
person_event SPRITE_BOULDER, 7, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_2A
person_event SPRITE_BOULDER, 12, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_3A
person_event SPRITE_BOULDER, 13, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_4A
- person_event SPRITE_POKE_BALL, 9, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7e5a6, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_FULL_HEAL
- person_event SPRITE_POKE_BALL, 2, 0, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7e5a8, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_MAX_POTION
+ person_event SPRITE_POKE_BALL, 9, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, IcePathB2FMahoganySideFullHeal, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_FULL_HEAL
+ person_event SPRITE_POKE_BALL, 2, 0, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, IcePathB2FMahoganySideMaxPotion, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_MAX_POTION