summaryrefslogtreecommitdiff
path: root/maps/MountMortar2FInside.asm
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2015-12-15 10:55:56 -0500
committerPikalaxALT <PikalaxALT@gmail.com>2015-12-15 10:55:56 -0500
commitbb2aba7da172f8ede8c3eb6f3602f62eff4d55be (patch)
treefad111d96257f01b40f56c58e2355fcbd7885d6f /maps/MountMortar2FInside.asm
parent6e257bc7cdab3249cc8fbdf4c808f0ebc442022e (diff)
No more ItemFragment
Diffstat (limited to 'maps/MountMortar2FInside.asm')
-rw-r--r--maps/MountMortar2FInside.asm36
1 files changed, 18 insertions, 18 deletions
diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm
index fe2e8b7c9..7e04d15c4 100644
--- a/maps/MountMortar2FInside.asm
+++ b/maps/MountMortar2FInside.asm
@@ -25,23 +25,23 @@ SupernerdHughScript:
closetext
end
-ItemFragment_0x7e0de:
- itemfragment MAX_POTION
+MountMortar2FInsideMaxPotion:
+ itemball MAX_POTION
-ItemFragment_0x7e0e0:
- itemfragment RARE_CANDY
+MountMortar2FInsideRareCandy:
+ itemball RARE_CANDY
-ItemFragment_0x7e0e2:
- itemfragment TM_DEFENSE_CURL
+MountMortar2FInsideTMDefenseCurl:
+ itemball TM_DEFENSE_CURL
-ItemFragment_0x7e0e4:
- itemfragment DRAGON_SCALE
+MountMortar2FInsideDragonScale:
+ itemball DRAGON_SCALE
-ItemFragment_0x7e0e6:
- itemfragment ELIXER
+MountMortar2FInsideElixer:
+ itemball ELIXER
-ItemFragment_0x7e0e8:
- itemfragment ESCAPE_ROPE
+MountMortar2FInsideEscapeRope:
+ itemball ESCAPE_ROPE
MapMountMortar2FInsideSignpostItem0:
dwb EVENT_MOUNT_MORTAR_2F_INSIDE_HIDDEN_FULL_RESTORE, FULL_RESTORE
@@ -85,10 +85,10 @@ MountMortar2FInside_MapEventHeader:
.PersonEvents:
db 7
- person_event SPRITE_POKE_BALL, 22, 28, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7e0de, EVENT_MOUNT_MORTAR_2F_INSIDE_MAX_POTION
- person_event SPRITE_POKE_BALL, 33, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7e0e0, EVENT_MOUNT_MORTAR_2F_INSIDE_RARE_CANDY
- person_event SPRITE_POKE_BALL, 17, 19, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7e0e2, EVENT_MOUNT_MORTAR_2F_INSIDE_TM_DEFENSE_CURL
- person_event SPRITE_POKE_BALL, 5, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7e0e4, EVENT_MOUNT_MORTAR_2F_INSIDE_DRAGON_SCALE
- person_event SPRITE_POKE_BALL, 11, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7e0e6, EVENT_MOUNT_MORTAR_2F_INSIDE_ELIXER
- person_event SPRITE_POKE_BALL, 5, 28, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7e0e8, EVENT_MOUNT_MORTAR_2F_INSIDE_ESCAPE_ROPE
+ person_event SPRITE_POKE_BALL, 22, 28, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar2FInsideMaxPotion, EVENT_MOUNT_MORTAR_2F_INSIDE_MAX_POTION
+ person_event SPRITE_POKE_BALL, 33, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar2FInsideRareCandy, EVENT_MOUNT_MORTAR_2F_INSIDE_RARE_CANDY
+ person_event SPRITE_POKE_BALL, 17, 19, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar2FInsideTMDefenseCurl, EVENT_MOUNT_MORTAR_2F_INSIDE_TM_DEFENSE_CURL
+ person_event SPRITE_POKE_BALL, 5, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar2FInsideDragonScale, EVENT_MOUNT_MORTAR_2F_INSIDE_DRAGON_SCALE
+ person_event SPRITE_POKE_BALL, 11, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar2FInsideElixer, EVENT_MOUNT_MORTAR_2F_INSIDE_ELIXER
+ person_event SPRITE_POKE_BALL, 5, 28, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar2FInsideEscapeRope, EVENT_MOUNT_MORTAR_2F_INSIDE_ESCAPE_ROPE
person_event SPRITE_SUPER_NERD, 26, 13, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 2, TrainerSupernerdHugh, -1