itemfragment

macros/map.asm

@@ -170,3 +170,11 @@ elevfloor: MACRO
 	db \1, \2
 	map \3
 ENDM
+
+itemfragment: MACRO
+if _NARG == 2
+	db \1, \2
+else
+	db \1, 1
+endc
+endm

maps/BurnedTower1F.asm

@@ -144,7 +144,7 @@ MapBurnedTower1FSignpostItem1:
 	
 
 ItemFragment_0x185ccb:
-	db HP_UP, 1
+	itemfragment HP_UP
 
 MovementData_0x185ccd:
 	step_left

maps/BurnedTowerB1F.asm

@@ -124,7 +124,7 @@ UnknownScript_0x18622a:
 	end
 
 ItemFragment_0x186231:
-	db TM_ENDURE, 1
+	itemfragment TM_ENDURE
 
 BurnedTowerB1FBoulder:
 	jumpstd strengthboulder

maps/DarkCaveBlackthornEntrance.asm

@@ -28,10 +28,10 @@ UnknownScript_0x18c739:
 	end
 
 ItemFragment_0x18c73b:
-	db REVIVE, 1
+	itemfragment REVIVE
 
 ItemFragment_0x18c73d:
-	db TM_SNORE, 1
+	itemfragment TM_SNORE
 
 UnknownText_0x18c73f:
 	text "Whoa! You startled"

maps/DarkCaveVioletEntrance.asm

@@ -16,16 +16,16 @@ DarkCaveVioletEntrance_MapScriptHeader:
 	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

maps/DragonsDenB1F.asm

@@ -179,10 +179,10 @@ MapDragonsDenB1FSignpost0Script:
 	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

maps/FightingDojo.asm

@@ -19,7 +19,7 @@ MapFightingDojoSignpost1Script:
 	jumptext UnknownText_0x189be0
 
 ItemFragment_0x189b6a:
-	db FOCUS_BAND, 1
+	itemfragment FOCUS_BAND
 
 UnknownText_0x189b6c:
 	text "Hello!"

maps/GoldenrodDeptStoreB1F.asm

@@ -68,16 +68,16 @@ MachopScript_0x7d7b9:
 	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"

maps/IcePath1F.asm

@@ -11,13 +11,13 @@ IcePath1F_MapScriptHeader:
 	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

maps/IcePathB1F.asm

@@ -78,7 +78,7 @@ IcePathB1FBoulder:
 	jumpstd strengthboulder
 
 ItemFragment_0x7e50d:
-	db IRON, 1
+	itemfragment IRON
 
 MapIcePathB1FSignpostItem0:
 	dwb EVENT_ICE_PATH_B1F_HIDDEN_MAX_POTION, MAX_POTION

maps/IcePathB2FBlackthornSide.asm

@@ -9,7 +9,7 @@ IcePathB2FBlackthornSide_MapScriptHeader:
 	db 0
 
 ItemFragment_0x7e646:
-	db TM_REST, 1
+	itemfragment TM_REST
 
 MapIcePathB2FBlackthornSideSignpostItem0:
 	dwb EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_HIDDEN_ICE_HEAL, ICE_HEAL

maps/IcePathB2FMahoganySide.asm

@@ -17,10 +17,10 @@ BoulderScript_0x7e5a3:
 	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

maps/IcePathB3F.asm

@@ -10,7 +10,7 @@ IcePathB3F_MapScriptHeader:
 	db 0
 
 ItemFragment_0x7e66f:
-	db NEVERMELTICE, 1
+	itemfragment NEVERMELTICE
 
 IcePathB3FRock:
 	jumpstd smashrock

maps/IlexForest.asm

@@ -405,16 +405,16 @@ IlexForestLassScript:
 	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

maps/LakeofRage.asm

@@ -231,10 +231,10 @@ WesleyNotWednesdayScript:
 	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

maps/MountMortar1FInside.asm

@@ -43,25 +43,25 @@ MountMortar1FBoulder:
 	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

maps/MountMortar1FOutside.asm

@@ -10,10 +10,10 @@ MountMortar1FOutside_MapScriptHeader:
 	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

maps/MountMortar2FInside.asm

@@ -26,22 +26,22 @@ SupernerdHughScript:
 	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

maps/MountMortarB1F.asm

@@ -57,19 +57,19 @@ MountMortarB1FBoulder:
 	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

maps/NationalPark.asm

@@ -299,10 +299,10 @@ MapNationalParkSignpost3Script:
 	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