shithub: pokecrystal

Download patch

ref: 0c4bf512d08d3779d1185dd08b3f21041f2b6044
parent: 7f68db68ad384c5cfb5d01cf74f5bc5cd7c5050e
author: PikalaxALT <PikalaxALT@gmail.com>
date: Wed Dec 9 06:57:08 EST 2015 

itemfragment


--- a/macros/map.asm
+++ b/macros/map.asm
@@ -170,3 +170,11 @@
 	db \1, \2
 	map \3
 ENDM
+
+itemfragment: MACRO
+if _NARG == 2
+	db \1, \2
+else
+	db \1, 1
+endc
+endm
--- a/maps/BurnedTower1F.asm
+++ b/maps/BurnedTower1F.asm
@@ -144,7 +144,7 @@
 	
 
 ItemFragment_0x185ccb:
-	db HP_UP, 1
+	itemfragment HP_UP
 
 MovementData_0x185ccd:
 	step_left
--- a/maps/BurnedTowerB1F.asm
+++ b/maps/BurnedTowerB1F.asm
@@ -124,7 +124,7 @@
 	end
 
 ItemFragment_0x186231:
-	db TM_ENDURE, 1
+	itemfragment TM_ENDURE
 
 BurnedTowerB1FBoulder:
 	jumpstd strengthboulder
--- a/maps/DarkCaveBlackthornEntrance.asm
+++ b/maps/DarkCaveBlackthornEntrance.asm
@@ -28,10 +28,10 @@
 	end
 
 ItemFragment_0x18c73b:
-	db REVIVE, 1
+	itemfragment REVIVE
 
 ItemFragment_0x18c73d:
-	db TM_SNORE, 1
+	itemfragment TM_SNORE
 
 UnknownText_0x18c73f:
 	text "Whoa! You startled"
--- a/maps/DarkCaveVioletEntrance.asm
+++ b/maps/DarkCaveVioletEntrance.asm
@@ -16,16 +16,16 @@
 	db 0
 
 ItemFragment_0x18c68e:
-	db POTION, 1
+	itemfragment POTION
 
 ItemFragment_0x18c690:
-	db FULL_HEAL, 1
+	itemfragment FULL_HEAL
 
 ItemFragment_0x18c692:
-	db HYPER_POTION, 1
+	itemfragment HYPER_POTION
 
 ItemFragment_0x18c694:
-	db DIRE_HIT, 1
+	itemfragment DIRE_HIT
 
 DarkCaveVioletEntranceRock:
 	jumpstd smashrock
--- a/maps/DragonsDenB1F.asm
+++ b/maps/DragonsDenB1F.asm
@@ -179,10 +179,10 @@
 	jumptext UnknownText_0x18cc2e
 
 ItemFragment_0x18c9a1:
-	db CALCIUM, 1
+	itemfragment CALCIUM
 
 ItemFragment_0x18c9a3:
-	db MAX_ELIXER, 1
+	itemfragment MAX_ELIXER
 
 MapDragonsDenB1FSignpostItem1:
 	dwb EVENT_DRAGONS_DEN_B1F_HIDDEN_REVIVE, REVIVE
--- a/maps/FightingDojo.asm
+++ b/maps/FightingDojo.asm
@@ -19,7 +19,7 @@
 	jumptext UnknownText_0x189be0
 
 ItemFragment_0x189b6a:
-	db FOCUS_BAND, 1
+	itemfragment FOCUS_BAND
 
 UnknownText_0x189b6c:
 	text "Hello!"
--- a/maps/GoldenrodDeptStoreB1F.asm
+++ b/maps/GoldenrodDeptStoreB1F.asm
@@ -68,16 +68,16 @@
 	end
 
 ItemFragment_0x7d7c3:
-	db ETHER, 1
+	itemfragment ETHER
 
 ItemFragment_0x7d7c5:
-	db AMULET_COIN, 1
+	itemfragment AMULET_COIN
 
 ItemFragment_0x7d7c7:
-	db BURN_HEAL, 1
+	itemfragment BURN_HEAL
 
 ItemFragment_0x7d7c9:
-	db ULTRA_BALL, 1
+	itemfragment ULTRA_BALL
 
 UnknownText_0x7d7cb:
 	text "Hey, kid! You're"
--- a/maps/IcePath1F.asm
+++ b/maps/IcePath1F.asm
@@ -11,13 +11,13 @@
 	db 0
 
 ItemFragment_0x7e472:
-	db HM_WATERFALL, 1
+	itemfragment HM_WATERFALL
 
 ItemFragment_0x7e474:
-	db PP_UP, 1
+	itemfragment PP_UP
 
 ItemFragment_0x7e476:
-	db PROTEIN, 1
+	itemfragment PROTEIN
 
 IcePath1F_MapEventHeader:
 	; filler
--- a/maps/IcePathB1F.asm
+++ b/maps/IcePathB1F.asm
@@ -78,7 +78,7 @@
 	jumpstd strengthboulder
 
 ItemFragment_0x7e50d:
-	db IRON, 1
+	itemfragment IRON
 
 MapIcePathB1FSignpostItem0:
 	dwb EVENT_ICE_PATH_B1F_HIDDEN_MAX_POTION, MAX_POTION
--- a/maps/IcePathB2FBlackthornSide.asm
+++ b/maps/IcePathB2FBlackthornSide.asm
@@ -9,7 +9,7 @@
 	db 0
 
 ItemFragment_0x7e646:
-	db TM_REST, 1
+	itemfragment TM_REST
 
 MapIcePathB2FBlackthornSideSignpostItem0:
 	dwb EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_HIDDEN_ICE_HEAL, ICE_HEAL
--- a/maps/IcePathB2FMahoganySide.asm
+++ b/maps/IcePathB2FMahoganySide.asm
@@ -17,10 +17,10 @@
 	jumptext UnknownText_0x7e5ad
 
 ItemFragment_0x7e5a6:
-	db FULL_HEAL, 1
+	itemfragment FULL_HEAL
 
 ItemFragment_0x7e5a8:
-	db MAX_POTION, 1
+	itemfragment MAX_POTION
 
 MapIcePathB2FMahoganySideSignpostItem0:
 	dwb EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_HIDDEN_CARBOS, CARBOS
--- a/maps/IcePathB3F.asm
+++ b/maps/IcePathB3F.asm
@@ -10,7 +10,7 @@
 	db 0
 
 ItemFragment_0x7e66f:
-	db NEVERMELTICE, 1
+	itemfragment NEVERMELTICE
 
 IcePathB3FRock:
 	jumpstd smashrock
--- a/maps/IlexForest.asm
+++ b/maps/IlexForest.asm
@@ -405,16 +405,16 @@
 	jumptextfaceplayer Text_IlexForestLass
 
 ItemFragment_0x6ee10:
-	db REVIVE, 1
+	itemfragment REVIVE
 
 ItemFragment_0x6ee12:
-	db X_ATTACK, 1
+	itemfragment X_ATTACK
 
 ItemFragment_0x6ee14:
-	db ANTIDOTE, 1
+	itemfragment ANTIDOTE
 
 ItemFragment_0x6ee16:
-	db ETHER, 1
+	itemfragment ETHER
 
 MapIlexForestSignpostItem1:
 	dwb EVENT_ILEX_FOREST_HIDDEN_ETHER, ETHER
--- a/maps/LakeofRage.asm
+++ b/maps/LakeofRage.asm
@@ -231,10 +231,10 @@
 	end
 
 ItemFragment_0x70148:
-	db ELIXER, 1
+	itemfragment ELIXER
 
 ItemFragment_0x7014a:
-	db TM_DETECT, 1
+	itemfragment TM_DETECT
 
 MapLakeofRageSignpostItem2:
 	dwb EVENT_LAKE_OF_RAGE_HIDDEN_FULL_RESTORE, FULL_RESTORE
--- a/maps/MountMortar1FInside.asm
+++ b/maps/MountMortar1FInside.asm
@@ -43,25 +43,25 @@
 	jumpstd strengthboulder
 
 ItemFragment_0x7de7c:
-	db ESCAPE_ROPE, 1
+	itemfragment ESCAPE_ROPE
 
 ItemFragment_0x7de7e:
-	db MAX_REVIVE, 1
+	itemfragment MAX_REVIVE
 
 ItemFragment_0x7de80:
-	db HYPER_POTION, 1
+	itemfragment HYPER_POTION
 
 ItemFragment_0x7de82:
-	db MAX_POTION, 1
+	itemfragment MAX_POTION
 
 ItemFragment_0x7de84:
-	db NUGGET, 1
+	itemfragment NUGGET
 
 ItemFragment_0x7de86:
-	db IRON, 1
+	itemfragment IRON
 
 ItemFragment_0x7de88:
-	db ULTRA_BALL, 1
+	itemfragment ULTRA_BALL
 
 MapMountMortar1FInsideSignpostItem0:
 	dwb EVENT_MOUNT_MORTAR_1F_INSIDE_HIDDEN_MAX_REPEL, MAX_REPEL
--- a/maps/MountMortar1FOutside.asm
+++ b/maps/MountMortar1FOutside.asm
@@ -10,10 +10,10 @@
 	db 0
 
 ItemFragment_0x7ddf6:
-	db ETHER, 1
+	itemfragment ETHER
 
 ItemFragment_0x7ddf8:
-	db REVIVE, 1
+	itemfragment REVIVE
 
 MapMountMortar1FOutsideSignpostItem0:
 	dwb EVENT_MOUNT_MORTAR_1F_OUTSIDE_HIDDEN_HYPER_POTION, HYPER_POTION
--- a/maps/MountMortar2FInside.asm
+++ b/maps/MountMortar2FInside.asm
@@ -26,22 +26,22 @@
 	end
 
 ItemFragment_0x7e0de:
-	db MAX_POTION, 1
+	itemfragment MAX_POTION
 
 ItemFragment_0x7e0e0:
-	db RARE_CANDY, 1
+	itemfragment RARE_CANDY
 
 ItemFragment_0x7e0e2:
-	db TM_DEFENSE_CURL, 1
+	itemfragment TM_DEFENSE_CURL
 
 ItemFragment_0x7e0e4:
-	db DRAGON_SCALE, 1
+	itemfragment DRAGON_SCALE
 
 ItemFragment_0x7e0e6:
-	db ELIXER, 1
+	itemfragment ELIXER
 
 ItemFragment_0x7e0e8:
-	db ESCAPE_ROPE, 1
+	itemfragment ESCAPE_ROPE
 
 MapMountMortar2FInsideSignpostItem0:
 	dwb EVENT_MOUNT_MORTAR_2F_INSIDE_HIDDEN_FULL_RESTORE, FULL_RESTORE
--- a/maps/MountMortarB1F.asm
+++ b/maps/MountMortarB1F.asm
@@ -57,19 +57,19 @@
 	jumpstd strengthboulder
 
 ItemFragment_0x7e240:
-	db HYPER_POTION, 1
+	itemfragment HYPER_POTION
 
 ItemFragment_0x7e242:
-	db CARBOS, 1
+	itemfragment CARBOS
 
 ItemFragment_0x7e244:
-	db FULL_RESTORE, 1
+	itemfragment FULL_RESTORE
 
 ItemFragment_0x7e246:
-	db MAX_ETHER, 1
+	itemfragment MAX_ETHER
 
 ItemFragment_0x7e248:
-	db PP_UP, 1
+	itemfragment PP_UP
 
 MapMountMortarB1FSignpostItem0:
 	dwb EVENT_MOUNT_MORTAR_B1F_HIDDEN_MAX_REVIVE, MAX_REVIVE
--- a/maps/NationalPark.asm
+++ b/maps/NationalPark.asm
@@ -299,10 +299,10 @@
 	jumptext UnknownText_0x5c7c6
 
 ItemFragment_0x5c1cc:
-	db PARLYZ_HEAL, 1
+	itemfragment PARLYZ_HEAL
 
 ItemFragment_0x5c1ce:
-	db TM_DIG, 1
+	itemfragment TM_DIG
 
 MapNationalParkSignpostItem2:
 	dwb EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL, FULL_HEAL
--- a/maps/NationalParkBugContest.asm
+++ b/maps/NationalParkBugContest.asm
@@ -109,10 +109,10 @@
 	jumptext UnknownText_0x5cc1d
 
 ItemFragment_0x5c945:
-	db PARLYZ_HEAL, 1
+	itemfragment PARLYZ_HEAL
 
 ItemFragment_0x5c947:
-	db TM_DIG, 1
+	itemfragment TM_DIG
 
 MapNationalParkBugContestSignpostItem2:
 	dwb EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL, FULL_HEAL
--- a/maps/OlivineLighthouse3F.asm
+++ b/maps/OlivineLighthouse3F.asm
@@ -45,7 +45,7 @@
 	end
 
 ItemFragment_0x5b279:
-	db ETHER, 1
+	itemfragment ETHER
 
 Bird_keeperTheoSeenText:
 	text "Why are you here?"
--- a/maps/OlivineLighthouse5F.asm
+++ b/maps/OlivineLighthouse5F.asm
@@ -35,13 +35,13 @@
 	end
 
 ItemFragment_0x609aa:
-	db RARE_CANDY, 1
+	itemfragment RARE_CANDY
 
 ItemFragment_0x609ac:
-	db SUPER_REPEL, 1
+	itemfragment SUPER_REPEL
 
 ItemFragment_0x609ae:
-	db TM_SWAGGER, 1
+	itemfragment TM_SWAGGER
 
 MapOlivineLighthouse5FSignpostItem0:
 	dwb EVENT_OLIVINE_LIGHTHOUSE_5F_HIDDEN_HYPER_POTION, HYPER_POTION
--- a/maps/OlivineLighthouse6F.asm
+++ b/maps/OlivineLighthouse6F.asm
@@ -128,7 +128,7 @@
 	end
 
 ItemFragment_0x60c66:
-	db SUPER_POTION, 1
+	itemfragment SUPER_POTION
 
 MovementData_0x60c68:
 	slow_step_up
--- a/maps/RadioTower5F.asm
+++ b/maps/RadioTower5F.asm
@@ -144,7 +144,7 @@
 	jumptextfaceplayer BenText
 
 ItemFragment_0x600fe:
-	db ULTRA_BALL, 1
+	itemfragment ULTRA_BALL
 
 MapRadioTower5FSignpost0Script:
 	jumptext SignpostRadioTower5FOffice
--- a/maps/RockTunnel1F.asm
+++ b/maps/RockTunnel1F.asm
@@ -10,10 +10,10 @@
 	db 0
 
 ItemFragment_0x743b5:
-	db ELIXER, 1
+	itemfragment ELIXER
 
 ItemFragment_0x743b7:
-	db TM_STEEL_WING, 1
+	itemfragment TM_STEEL_WING
 
 MapRockTunnel1FSignpostItem0:
 	dwb EVENT_ROCK_TUNNEL_1F_HIDDEN_X_ACCURACY, X_ACCURACY
--- a/maps/RockTunnelB1F.asm
+++ b/maps/RockTunnelB1F.asm
@@ -11,13 +11,13 @@
 	db 0
 
 ItemFragment_0x74409:
-	db IRON, 1
+	itemfragment IRON
 
 ItemFragment_0x7440b:
-	db PP_UP, 1
+	itemfragment PP_UP
 
 ItemFragment_0x7440d:
-	db REVIVE, 1
+	itemfragment REVIVE
 
 MapRockTunnelB1FSignpostItem0:
 	dwb EVENT_ROCK_TUNNEL_B1F_HIDDEN_MAX_POTION, MAX_POTION
--- a/maps/Route12.asm
+++ b/maps/Route12.asm
@@ -64,10 +64,10 @@
 	jumptext UnknownText_0x1a72c1
 
 ItemFragment_0x1a700b:
-	db CALCIUM, 1
+	itemfragment CALCIUM
 
 ItemFragment_0x1a700d:
-	db NUGGET, 1
+	itemfragment NUGGET
 
 MapRoute12SignpostItem2:
 	dwb EVENT_ROUTE_12_HIDDEN_ELIXER, ELIXER
--- a/maps/Route15.asm
+++ b/maps/Route15.asm
@@ -84,7 +84,7 @@
 	jumptext UnknownText_0x1aa8e3
 
 ItemFragment_0x1aa5e4:
-	db PP_UP, 1
+	itemfragment PP_UP
 
 TeacherColetteSeenText:
 	text "Have you forgotten"
--- a/maps/Route2.asm
+++ b/maps/Route2.asm
@@ -55,16 +55,16 @@
 	jumptext UnknownText_0x1ac49f
 
 ItemFragment_0x1ac2fe:
-	db DIRE_HIT, 1
+	itemfragment DIRE_HIT
 
 ItemFragment_0x1ac300:
-	db MAX_POTION, 1
+	itemfragment MAX_POTION
 
 ItemFragment_0x1ac302:
-	db CARBOS, 1
+	itemfragment CARBOS
 
 ItemFragment_0x1ac304:
-	db ELIXER, 1
+	itemfragment ELIXER
 
 FruitTreeScript_0x1ac306:
 	fruittree FRUITTREE_ROUTE_2
--- a/maps/Route25.asm
+++ b/maps/Route25.asm
@@ -190,7 +190,7 @@
 	jumptext UnknownText_0x19f567
 
 ItemFragment_0x19efe3:
-	db PROTEIN, 1
+	itemfragment PROTEIN
 
 MapRoute25SignpostItem1:
 	dwb EVENT_ROUTE_25_HIDDEN_POTION, POTION
--- a/maps/Route26.asm
+++ b/maps/Route26.asm
@@ -252,7 +252,7 @@
 	fruittree FRUITTREE_ROUTE_26
 
 ItemFragment_0x1a4ec4:
-	db MAX_ELIXER, 1
+	itemfragment MAX_ELIXER
 
 CooltrainermJakeSeenText:
 	text "I'm making my"
--- a/maps/Route27.asm
+++ b/maps/Route27.asm
@@ -304,10 +304,10 @@
 	jumptext UnknownText_0x1a0e7f
 
 ItemFragment_0x1a0a62:
-	db TM_SOLARBEAM, 1
+	itemfragment TM_SOLARBEAM
 
 ItemFragment_0x1a0a64:
-	db RARE_CANDY, 1
+	itemfragment RARE_CANDY
 
 MovementData_0x1a0a66:
 	step_left
--- a/maps/Route29.asm
+++ b/maps/Route29.asm
@@ -217,7 +217,7 @@
 	fruittree FRUITTREE_ROUTE_29
 
 ItemFragment_0x1a108b:
-	db POTION, 1
+	itemfragment POTION
 
 MovementData_0x1a108d:
 	step_up
--- a/maps/Route30.asm
+++ b/maps/Route30.asm
@@ -239,7 +239,7 @@
 	jumptext UnknownText_0x1a1b66
 
 ItemFragment_0x1a17f5:
-	db ANTIDOTE, 1
+	itemfragment ANTIDOTE
 
 FruitTreeScript_0x1a17f7:
 	fruittree FRUITTREE_ROUTE_30_1
--- a/maps/Route31.asm
+++ b/maps/Route31.asm
@@ -264,10 +264,10 @@
 	fruittree FRUITTREE_ROUTE_31
 
 ItemFragment_0x1a55fb:
-	db POTION, 1
+	itemfragment POTION
 
 ItemFragment_0x1a55fd:
-	db POKE_BALL, 1
+	itemfragment POKE_BALL
 
 UnknownText_0x1a55ff:
 	text "DARK CAVE…"
--- a/maps/Route32.asm
+++ b/maps/Route32.asm
@@ -493,10 +493,10 @@
 	end
 
 ItemFragment_0x190773:
-	db GREAT_BALL, 1
+	itemfragment GREAT_BALL
 
 ItemFragment_0x190775:
-	db REPEL, 1
+	itemfragment REPEL
 
 Route32Sign:
 	jumptext Route32SignText
--- a/maps/Route34.asm
+++ b/maps/Route34.asm
@@ -488,7 +488,7 @@
 	jumptext UnknownText_0x78a52
 
 ItemFragment_0x7832b:
-	db NUGGET, 1
+	itemfragment NUGGET
 
 MapRoute34SignpostItem3:
 	dwb EVENT_ROUTE_34_HIDDEN_RARE_CANDY, RARE_CANDY
--- a/maps/Route35.asm
+++ b/maps/Route35.asm
@@ -271,7 +271,7 @@
 	jumptext UnknownText_0x19cf94
 
 ItemFragment_0x19ca7c:
-	db TM_ROLLOUT, 1
+	itemfragment TM_ROLLOUT
 
 FruitTreeScript_0x19ca7e:
 	fruittree FRUITTREE_ROUTE_35
--- a/maps/Route4.asm
+++ b/maps/Route4.asm
@@ -48,7 +48,7 @@
 	jumptext UnknownText_0x1ae384
 
 ItemFragment_0x1ae20f:
-	db HP_UP, 1
+	itemfragment HP_UP
 
 MapRoute4SignpostItem1:
 	dwb EVENT_ROUTE_4_HIDDEN_ULTRA_BALL, ULTRA_BALL
--- a/maps/Route42.asm
+++ b/maps/Route42.asm
@@ -199,10 +199,10 @@
 	jumptext UnknownText_0x1a95a1
 
 ItemFragment_0x1a9349:
-	db ULTRA_BALL, 1
+	itemfragment ULTRA_BALL
 
 ItemFragment_0x1a934b:
-	db SUPER_POTION, 1
+	itemfragment SUPER_POTION
 
 FruitTreeScript_0x1a934d:
 	fruittree FRUITTREE_ROUTE_42_1
--- a/maps/Route43.asm
+++ b/maps/Route43.asm
@@ -325,7 +325,7 @@
 	fruittree FRUITTREE_ROUTE_43
 
 ItemFragment_0x19d268:
-	db MAX_ETHER, 1
+	itemfragment MAX_ETHER
 
 PokemaniacBenSeenText:
 	text "I love #MON!"
--- a/maps/Route44.asm
+++ b/maps/Route44.asm
@@ -309,13 +309,13 @@
 	fruittree FRUITTREE_ROUTE_44
 
 ItemFragment_0x19da42:
-	db MAX_REVIVE, 1
+	itemfragment MAX_REVIVE
 
 ItemFragment_0x19da44:
-	db ULTRA_BALL, 1
+	itemfragment ULTRA_BALL
 
 ItemFragment_0x19da46:
-	db MAX_REPEL, 1
+	itemfragment MAX_REPEL
 
 MapRoute44SignpostItem2:
 	dwb EVENT_ROUTE_44_HIDDEN_ELIXER, ELIXER
--- a/maps/Route45.asm
+++ b/maps/Route45.asm
@@ -300,16 +300,16 @@
 	fruittree FRUITTREE_ROUTE_45
 
 ItemFragment_0x19e296:
-	db NUGGET, 1
+	itemfragment NUGGET
 
 ItemFragment_0x19e298:
-	db REVIVE, 1
+	itemfragment REVIVE
 
 ItemFragment_0x19e29a:
-	db ELIXER, 1
+	itemfragment ELIXER
 
 ItemFragment_0x19e29c:
-	db MAX_POTION, 1
+	itemfragment MAX_POTION
 
 MapRoute45SignpostItem1:
 	dwb EVENT_ROUTE_45_HIDDEN_PP_UP, PP_UP
--- a/maps/Route46.asm
+++ b/maps/Route46.asm
@@ -162,7 +162,7 @@
 	jumptext UnknownText_0x1a99be
 
 ItemFragment_0x1a978d:
-	db X_SPEED, 1
+	itemfragment X_SPEED
 
 FruitTreeScript_0x1a978f:
 	fruittree FRUITTREE_ROUTE_46_1
--- a/maps/RuinsofAlphAerodactylItemRoom.asm
+++ b/maps/RuinsofAlphAerodactylItemRoom.asm
@@ -12,16 +12,16 @@
 	db 0
 
 ItemFragment_0x59ab6:
-	db GOLD_BERRY, 1
+	itemfragment GOLD_BERRY
 
 ItemFragment_0x59ab8:
-	db MOON_STONE, 1
+	itemfragment MOON_STONE
 
 ItemFragment_0x59aba:
-	db HEAL_POWDER, 1
+	itemfragment HEAL_POWDER
 
 ItemFragment_0x59abc:
-	db ENERGY_ROOT, 1
+	itemfragment ENERGY_ROOT
 
 MapRuinsofAlphAerodactylItemRoomSignpost1Script:
 	jumptext UnknownText_0x59ac1
--- a/maps/RuinsofAlphHoOhItemRoom.asm
+++ b/maps/RuinsofAlphHoOhItemRoom.asm
@@ -12,16 +12,16 @@
 	db 0
 
 ItemFragment_0x59918:
-	db GOLD_BERRY, 1
+	itemfragment GOLD_BERRY
 
 ItemFragment_0x5991a:
-	db MYSTERYBERRY, 1
+	itemfragment MYSTERYBERRY
 
 ItemFragment_0x5991c:
-	db REVIVAL_HERB, 1
+	itemfragment REVIVAL_HERB
 
 ItemFragment_0x5991e:
-	db CHARCOAL, 1
+	itemfragment CHARCOAL
 
 MapRuinsofAlphHoOhItemRoomSignpost1Script:
 	jumptext UnknownText_0x59923
--- a/maps/RuinsofAlphKabutoItemRoom.asm
+++ b/maps/RuinsofAlphKabutoItemRoom.asm
@@ -12,16 +12,16 @@
 	db 0
 
 ItemFragment_0x599a2:
-	db BERRY, 1
+	itemfragment BERRY
 
 ItemFragment_0x599a4:
-	db PSNCUREBERRY, 1
+	itemfragment PSNCUREBERRY
 
 ItemFragment_0x599a6:
-	db HEAL_POWDER, 1
+	itemfragment HEAL_POWDER
 
 ItemFragment_0x599a8:
-	db ENERGYPOWDER, 1
+	itemfragment ENERGYPOWDER
 
 MapRuinsofAlphKabutoItemRoomSignpost1Script:
 	jumptext UnknownText_0x599ad
--- a/maps/RuinsofAlphOmanyteItemRoom.asm
+++ b/maps/RuinsofAlphOmanyteItemRoom.asm
@@ -12,16 +12,16 @@
 	db 0
 
 ItemFragment_0x59a2c:
-	db MYSTERYBERRY, 1
+	itemfragment MYSTERYBERRY
 
 ItemFragment_0x59a2e:
-	db MYSTIC_WATER, 1
+	itemfragment MYSTIC_WATER
 
 ItemFragment_0x59a30:
-	db STARDUST, 1
+	itemfragment STARDUST
 
 ItemFragment_0x59a32:
-	db STAR_PIECE, 1
+	itemfragment STAR_PIECE
 
 MapRuinsofAlphOmanyteItemRoomSignpost1Script:
 	jumptext UnknownText_0x59a37
--- a/maps/SilverCaveItemRooms.asm
+++ b/maps/SilverCaveItemRooms.asm
@@ -10,10 +10,10 @@
 	db 0
 
 ItemFragment_0x18c65e:
-	db MAX_REVIVE, 1
+	itemfragment MAX_REVIVE
 
 ItemFragment_0x18c660:
-	db FULL_RESTORE, 1
+	itemfragment FULL_RESTORE
 
 SilverCaveItemRooms_MapEventHeader:
 	; filler
--- a/maps/SilverCaveRoom1.asm
+++ b/maps/SilverCaveRoom1.asm
@@ -12,16 +12,16 @@
 	db 0
 
 ItemFragment_0x18c554:
-	db MAX_ELIXER, 1
+	itemfragment MAX_ELIXER
 
 ItemFragment_0x18c556:
-	db PROTEIN, 1
+	itemfragment PROTEIN
 
 ItemFragment_0x18c558:
-	db ESCAPE_ROPE, 1
+	itemfragment ESCAPE_ROPE
 
 ItemFragment_0x18c55a:
-	db ULTRA_BALL, 1
+	itemfragment ULTRA_BALL
 
 MapSilverCaveRoom1SignpostItem0:
 	dwb EVENT_SILVER_CAVE_ROOM_1_HIDDEN_DIRE_HIT, DIRE_HIT
--- a/maps/SilverCaveRoom2.asm
+++ b/maps/SilverCaveRoom2.asm
@@ -11,13 +11,13 @@
 	db 0
 
 ItemFragment_0x18c5b2:
-	db CALCIUM, 1
+	itemfragment CALCIUM
 
 ItemFragment_0x18c5b4:
-	db ULTRA_BALL, 1
+	itemfragment ULTRA_BALL
 
 ItemFragment_0x18c5b6:
-	db PP_UP, 1
+	itemfragment PP_UP
 
 MapSilverCaveRoom2SignpostItem0:
 	dwb EVENT_SILVER_CAVE_ROOM_2_HIDDEN_MAX_POTION, MAX_POTION
--- a/maps/SlowpokeWellB1F.asm
+++ b/maps/SlowpokeWellB1F.asm
@@ -124,7 +124,7 @@
 	jumpstd strengthboulder
 
 ItemFragment_0x5a6a3:
-	db SUPER_POTION, 1
+	itemfragment SUPER_POTION
 
 KurtSlowpokeWellVictoryMovementData:
 	step_left
--- a/maps/SlowpokeWellB2F.asm
+++ b/maps/SlowpokeWellB2F.asm
@@ -30,7 +30,7 @@
 	end
 
 ItemFragment_0x5ad28:
-	db TM_RAIN_DANCE, 1
+	itemfragment TM_RAIN_DANCE
 
 UnknownText_0x5ad2a:
 	text "I'm waiting to see"
--- a/maps/SproutTower1F.asm
+++ b/maps/SproutTower1F.asm
@@ -37,7 +37,7 @@
 	end
 
 ItemFragment_0x18451e:
-	db PARLYZ_HEAL, 1
+	itemfragment PARLYZ_HEAL
 
 MapSproutTower1FSignpost1Script:
 	jumptext UnknownText_0x1846d6
--- a/maps/SproutTower2F.asm
+++ b/maps/SproutTower2F.asm
@@ -36,7 +36,7 @@
 	jumptext UnknownText_0x1848c8
 
 ItemFragment_0x1847a7:
-	db X_ACCURACY, 1
+	itemfragment X_ACCURACY
 
 SageNicoSeenText:
 	text "However hard we"
--- a/maps/SproutTower3F.asm
+++ b/maps/SproutTower3F.asm
@@ -134,10 +134,10 @@
 	jumptext UnknownText_0x184f61
 
 ItemFragment_0x184a19:
-	db POTION, 1
+	itemfragment POTION
 
 ItemFragment_0x184a1b:
-	db ESCAPE_ROPE, 1
+	itemfragment ESCAPE_ROPE
 
 MovementData_0x184a1d:
 	step_up
--- a/maps/TeamRocketBaseB1F.asm
+++ b/maps/TeamRocketBaseB1F.asm
@@ -536,13 +536,13 @@
 	end
 
 ItemFragment_0x6cac4:
-	db HYPER_POTION, 1
+	itemfragment HYPER_POTION
 
 ItemFragment_0x6cac6:
-	db NUGGET, 1
+	itemfragment NUGGET
 
 ItemFragment_0x6cac8:
-	db GUARD_SPEC, 1
+	itemfragment GUARD_SPEC
 
 MapTeamRocketBaseB1FSignpostItem8:
 	dwb EVENT_TEAM_ROCKET_BASE_B1F_HIDDEN_REVIVE, REVIVE
--- a/maps/TeamRocketBaseB2F.asm
+++ b/maps/TeamRocketBaseB2F.asm
@@ -360,7 +360,7 @@
 	end
 
 ItemFragment_0x6d20d:
-	db TM_THIEF, 1
+	itemfragment TM_THIEF
 
 MapTeamRocketBaseB2FSignpostItem22:
 	dwb EVENT_TEAM_ROCKET_BASE_B2F_HIDDEN_FULL_HEAL, FULL_HEAL
--- a/maps/TeamRocketBaseB3F.asm
+++ b/maps/TeamRocketBaseB3F.asm
@@ -211,19 +211,19 @@
 	jumpstd teamrocketoath
 
 ItemFragment_0x6e120:
-	db PROTEIN, 1
+	itemfragment PROTEIN
 
 ItemFragment_0x6e122:
-	db X_SPECIAL, 1
+	itemfragment X_SPECIAL
 
 ItemFragment_0x6e124:
-	db FULL_HEAL, 1
+	itemfragment FULL_HEAL
 
 ItemFragment_0x6e126:
-	db ICE_HEAL, 1
+	itemfragment ICE_HEAL
 
 ItemFragment_0x6e128:
-	db ULTRA_BALL, 1
+	itemfragment ULTRA_BALL
 
 MovementData_0x6e12a:
 	step_right
--- a/maps/TinTower3F.asm
+++ b/maps/TinTower3F.asm
@@ -9,7 +9,7 @@
 	db 0
 
 ItemFragment_0x185a37:
-	db FULL_HEAL, 1
+	itemfragment FULL_HEAL
 
 TinTower3F_MapEventHeader:
 	; filler
--- a/maps/TinTower4F.asm
+++ b/maps/TinTower4F.asm
@@ -11,13 +11,13 @@
 	db 0
 
 ItemFragment_0x185a58:
-	db ULTRA_BALL, 1
+	itemfragment ULTRA_BALL
 
 ItemFragment_0x185a5a:
-	db PP_UP, 1
+	itemfragment PP_UP
 
 ItemFragment_0x185a5c:
-	db ESCAPE_ROPE, 1
+	itemfragment ESCAPE_ROPE
 
 MapTinTower4FSignpostItem0:
 	dwb EVENT_TIN_TOWER_4F_HIDDEN_MAX_POTION, MAX_POTION
--- a/maps/TinTower5F.asm
+++ b/maps/TinTower5F.asm
@@ -9,7 +9,7 @@
 	db 0
 
 ItemFragment_0x185aa9:
-	db RARE_CANDY, 1
+	itemfragment RARE_CANDY
 
 MapTinTower5FSignpostItem0:
 	dwb EVENT_TIN_TOWER_5F_HIDDEN_FULL_RESTORE, FULL_RESTORE
--- a/maps/TinTower6F.asm
+++ b/maps/TinTower6F.asm
@@ -9,7 +9,7 @@
 	db 0
 
 ItemFragment_0x185ae4:
-	db MAX_POTION, 1
+	itemfragment MAX_POTION
 
 TinTower6F_MapEventHeader:
 	; filler
--- a/maps/TinTower7F.asm
+++ b/maps/TinTower7F.asm
@@ -9,7 +9,7 @@
 	db 0
 
 ItemFragment_0x185b05:
-	db MAX_REVIVE, 1
+	itemfragment MAX_REVIVE
 
 TinTower7F_MapEventHeader:
 	; filler
--- a/maps/TinTower8F.asm
+++ b/maps/TinTower8F.asm
@@ -11,13 +11,13 @@
 	db 0
 
 ItemFragment_0x185b35:
-	db NUGGET, 1
+	itemfragment NUGGET
 
 ItemFragment_0x185b37:
-	db MAX_ELIXER, 1
+	itemfragment MAX_ELIXER
 
 ItemFragment_0x185b39:
-	db FULL_RESTORE, 1
+	itemfragment FULL_RESTORE
 
 TinTower8F_MapEventHeader:
 	; filler
--- a/maps/TinTower9F.asm
+++ b/maps/TinTower9F.asm
@@ -9,7 +9,7 @@
 	db 0
 
 ItemFragment_0x185b88:
-	db HP_UP, 1
+	itemfragment HP_UP
 
 UnknownText_0x185b8a:
 	text "HO-OH: Shaoooh!"
--- a/maps/TohjoFalls.asm
+++ b/maps/TohjoFalls.asm
@@ -9,7 +9,7 @@
 	db 0
 
 ItemFragment_0x18db02:
-	db MOON_STONE, 1
+	itemfragment MOON_STONE
 
 TohjoFalls_MapEventHeader:
 	; filler
--- a/maps/UndergroundPathSwitchRoomEntrances.asm
+++ b/maps/UndergroundPathSwitchRoomEntrances.asm
@@ -624,10 +624,10 @@
 	end
 
 ItemFragment_0x7ce7d:
-	db SMOKE_BALL, 1
+	itemfragment SMOKE_BALL
 
 ItemFragment_0x7ce7f:
-	db FULL_HEAL, 1
+	itemfragment FULL_HEAL
 
 MapUndergroundPathSwitchRoomEntrancesSignpostItem4:
 	dwb EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_HIDDEN_MAX_POTION, MAX_POTION
--- a/maps/UndergroundWarehouse.asm
+++ b/maps/UndergroundWarehouse.asm
@@ -92,13 +92,13 @@
 	end
 
 ItemFragment_0x7d9e4:
-	db MAX_ETHER, 1
+	itemfragment MAX_ETHER
 
 ItemFragment_0x7d9e6:
-	db TM_SLEEP_TALK, 1
+	itemfragment TM_SLEEP_TALK
 
 ItemFragment_0x7d9e8:
-	db ULTRA_BALL, 1
+	itemfragment ULTRA_BALL
 
 GruntM24SeenText:
 	text "How did you get"
--- a/maps/UnionCave1F.asm
+++ b/maps/UnionCave1F.asm
@@ -72,16 +72,16 @@
 	end
 
 ItemFragment_0x59c00:
-	db GREAT_BALL, 1
+	itemfragment GREAT_BALL
 
 ItemFragment_0x59c02:
-	db X_ATTACK, 1
+	itemfragment X_ATTACK
 
 ItemFragment_0x59c04:
-	db POTION, 1
+	itemfragment POTION
 
 ItemFragment_0x59c06:
-	db AWAKENING, 1
+	itemfragment AWAKENING
 
 UnknownScript_0x59c08:
 	jumptext UnknownText_0x59f29
--- a/maps/UnionCaveB1F.asm
+++ b/maps/UnionCaveB1F.asm
@@ -59,10 +59,10 @@
 	end
 
 ItemFragment_0x5a016:
-	db TM_SWIFT, 1
+	itemfragment TM_SWIFT
 
 ItemFragment_0x5a018:
-	db X_DEFEND, 1
+	itemfragment X_DEFEND
 
 UnionCaveB1FBoulder:
 	jumpstd strengthboulder
--- a/maps/UnionCaveB2F.asm
+++ b/maps/UnionCaveB2F.asm
@@ -74,10 +74,10 @@
 	end
 
 ItemFragment_0x5a36a:
-	db ELIXER, 1
+	itemfragment ELIXER
 
 ItemFragment_0x5a36c:
-	db HYPER_POTION, 1
+	itemfragment HYPER_POTION
 
 CooltrainermNickSeenText:
 	text "There are two"
--- a/maps/VictoryRoad.asm
+++ b/maps/VictoryRoad.asm
@@ -99,19 +99,19 @@
 	end
 
 ItemFragment_0x74529:
-	db TM_EARTHQUAKE, 1
+	itemfragment TM_EARTHQUAKE
 
 ItemFragment_0x7452b:
-	db MAX_REVIVE, 1
+	itemfragment MAX_REVIVE
 
 ItemFragment_0x7452d:
-	db FULL_RESTORE, 1
+	itemfragment FULL_RESTORE
 
 ItemFragment_0x7452f:
-	db FULL_HEAL, 1
+	itemfragment FULL_HEAL
 
 ItemFragment_0x74531:
-	db HP_UP, 1
+	itemfragment HP_UP
 
 MapVictoryRoadSignpostItem0:
 	dwb EVENT_VICTORY_ROAD_HIDDEN_MAX_POTION, MAX_POTION
--- a/maps/VioletCity.asm
+++ b/maps/VioletCity.asm
@@ -91,10 +91,10 @@
 	jumpstd martsign
 
 ItemFragment_0x1a8421:
-	db PP_UP, 1
+	itemfragment PP_UP
 
 ItemFragment_0x1a8423:
-	db RARE_CANDY, 1
+	itemfragment RARE_CANDY
 
 FruitTreeScript_0x1a8425:
 	fruittree FRUITTREE_VIOLET_CITY
--- a/maps/WarehouseEntrance.asm
+++ b/maps/WarehouseEntrance.asm
@@ -408,7 +408,7 @@
 	end
 
 ItemFragment_0x7c306:
-	db COIN_CASE, 1
+	itemfragment COIN_CASE
 
 MapWarehouseEntranceSignpost1Script:
 	jumptext UnknownText_0x7c91a
--- a/maps/WhirlIslandB1F.asm
+++ b/maps/WhirlIslandB1F.asm
@@ -14,19 +14,19 @@
 	db 0
 
 ItemFragment_0x18c410:
-	db FULL_RESTORE, 1
+	itemfragment FULL_RESTORE
 
 ItemFragment_0x18c412:
-	db CARBOS, 1
+	itemfragment CARBOS
 
 ItemFragment_0x18c414:
-	db CALCIUM, 1
+	itemfragment CALCIUM
 
 ItemFragment_0x18c416:
-	db NUGGET, 1
+	itemfragment NUGGET
 
 ItemFragment_0x18c418:
-	db ESCAPE_ROPE, 1
+	itemfragment ESCAPE_ROPE
 
 WhirlIslandB1FBoulder:
 	jumpstd strengthboulder
--- a/maps/WhirlIslandB2F.asm
+++ b/maps/WhirlIslandB2F.asm
@@ -11,13 +11,13 @@
 	db 0
 
 ItemFragment_0x18c4b8:
-	db FULL_RESTORE, 1
+	itemfragment FULL_RESTORE
 
 ItemFragment_0x18c4ba:
-	db MAX_REVIVE, 1
+	itemfragment MAX_REVIVE
 
 ItemFragment_0x18c4bc:
-	db MAX_ELIXER, 1
+	itemfragment MAX_ELIXER
 
 WhirlIslandB2F_MapEventHeader:
 	; filler
--- a/maps/WhirlIslandNE.asm
+++ b/maps/WhirlIslandNE.asm
@@ -9,7 +9,7 @@
 	db 0
 
 ItemFragment_0x18c396:
-	db ULTRA_BALL, 1
+	itemfragment ULTRA_BALL
 
 WhirlIslandNE_MapEventHeader:
 	; filler
--- a/maps/WhirlIslandSW.asm
+++ b/maps/WhirlIslandSW.asm
@@ -9,7 +9,7 @@
 	db 0
 
 ItemFragment_0x18c3bc:
-	db ULTRA_BALL, 1
+	itemfragment ULTRA_BALL
 
 WhirlIslandSW_MapEventHeader:
 	; filler