summaryrefslogtreecommitdiff
path: root/maps/DarkCaveVioletEntrance.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/DarkCaveVioletEntrance.asm')
-rw-r--r--maps/DarkCaveVioletEntrance.asm38
1 files changed, 24 insertions, 14 deletions
diff --git a/maps/DarkCaveVioletEntrance.asm b/maps/DarkCaveVioletEntrance.asm
index c8629f558..615a98c94 100644
--- a/maps/DarkCaveVioletEntrance.asm
+++ b/maps/DarkCaveVioletEntrance.asm
@@ -1,3 +1,13 @@
+const_value set 2
+ const DARKCAVEVIOLETENTRANCE_POKE_BALL1
+ const DARKCAVEVIOLETENTRANCE_ROCK1
+ const DARKCAVEVIOLETENTRANCE_ROCK2
+ const DARKCAVEVIOLETENTRANCE_ROCK3
+ const DARKCAVEVIOLETENTRANCE_ROCK4
+ const DARKCAVEVIOLETENTRANCE_POKE_BALL2
+ const DARKCAVEVIOLETENTRANCE_POKE_BALL3
+ const DARKCAVEVIOLETENTRANCE_POKE_BALL4
+
DarkCaveVioletEntrance_MapScriptHeader:
.MapTriggers:
db 0
@@ -5,22 +15,22 @@ DarkCaveVioletEntrance_MapScriptHeader:
.MapCallbacks:
db 0
-ItemFragment_0x18c68e:
- db POTION, 1
+DarkCaveVioletEntrancePotion:
+ itemball POTION
-ItemFragment_0x18c690:
- db FULL_HEAL, 1
+DarkCaveVioletEntranceFullHeal:
+ itemball FULL_HEAL
-ItemFragment_0x18c692:
- db HYPER_POTION, 1
+DarkCaveVioletEntranceHyperPotion:
+ itemball HYPER_POTION
-ItemFragment_0x18c694:
- db DIRE_HIT, 1
+DarkCaveVioletEntranceDireHit:
+ itemball DIRE_HIT
DarkCaveVioletEntranceRock:
jumpstd smashrock
-MapDarkCaveVioletEntranceSignpostItem0:
+DarkCaveVioletEntranceHiddenElixer:
dwb EVENT_DARK_CAVE_VIOLET_ENTRANCE_HIDDEN_ELIXER, ELIXER
@@ -39,15 +49,15 @@ DarkCaveVioletEntrance_MapEventHeader:
.Signposts:
db 1
- signpost 3, 26, SIGNPOST_ITEM, MapDarkCaveVioletEntranceSignpostItem0
+ signpost 3, 26, SIGNPOST_ITEM, DarkCaveVioletEntranceHiddenElixer
.PersonEvents:
db 8
- person_event SPRITE_POKE_BALL, 8, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c68e, EVENT_DARK_CAVE_VIOLET_ENTRANCE_POTION
+ person_event SPRITE_POKE_BALL, 8, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, DarkCaveVioletEntrancePotion, EVENT_DARK_CAVE_VIOLET_ENTRANCE_POTION
person_event SPRITE_ROCK, 14, 16, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1
person_event SPRITE_ROCK, 6, 27, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1
person_event SPRITE_ROCK, 14, 7, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1
person_event SPRITE_ROCK, 31, 36, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1
- person_event SPRITE_POKE_BALL, 22, 36, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c690, EVENT_DARK_CAVE_VIOLET_ENTRANCE_FULL_HEAL
- person_event SPRITE_POKE_BALL, 9, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c692, EVENT_DARK_CAVE_VIOLET_ENTRANCE_HYPER_POTION
- person_event SPRITE_POKE_BALL, 28, 30, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c694, EVENT_DARK_CAVE_VIOLET_ENTRANCE_DIRE_HIT
+ person_event SPRITE_POKE_BALL, 22, 36, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, DarkCaveVioletEntranceFullHeal, EVENT_DARK_CAVE_VIOLET_ENTRANCE_FULL_HEAL
+ person_event SPRITE_POKE_BALL, 9, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, DarkCaveVioletEntranceHyperPotion, EVENT_DARK_CAVE_VIOLET_ENTRANCE_HYPER_POTION
+ person_event SPRITE_POKE_BALL, 28, 30, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, DarkCaveVioletEntranceDireHit, EVENT_DARK_CAVE_VIOLET_ENTRANCE_DIRE_HIT