4 files changed, 184 insertions, 178 deletions
diff --git a/asm/macros/event.inc b/asm/macros/event.inc
index 9db57daf1..96971b583 100644
--- a/asm/macros/event.inc
+++ b/asm/macros/event.inc
@@ -1665,10 +1665,16 @@
 	callstd \type
 	.endm
 
-	.macro giveitem_std item:req, amount=1, function=0
+	.macro giveitem_std item:req, amount=1
 	setorcopyvar VAR_0x8000, \item
 	setorcopyvar VAR_0x8001, \amount
-	callstd \function
+	callstd STD_OBTAIN_ITEM
+	.endm
+
+	.macro finditem_std item:req, amount=1
+	setorcopyvar VAR_0x8000, \item
+	setorcopyvar VAR_0x8001, \amount
+	callstd STD_FIND_ITEM
 	.endm
 
 	.macro givedecoration_std decoration:req
diff --git a/data/event_scripts.s b/data/event_scripts.s
index c7e21e77c..c24ea1222 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -86,16 +86,16 @@ gSpecialVars:: @ 81DBA0C
 	.include "data/specials.inc"
 
 gStdScripts:: @ 81DC2A0
-	.4byte Std_ObtainItem
-	.4byte Std_FindItem
-	.4byte Std_MsgboxNPC
-	.4byte Std_MsgboxSign
-	.4byte Std_MsgboxDefault
-	.4byte Std_MsgboxYesNo
-	.4byte Std_MsgboxAutoclose
-	.4byte Std_ObtainDecoration
-	.4byte Std_RegisteredInMatchCall
-	.4byte Std_MsgboxGetPoints
+	.4byte Std_ObtainItem              @ STD_OBTAIN_ITEM
+	.4byte Std_FindItem                @ STD_FIND_ITEM
+	.4byte Std_MsgboxNPC               @ MSGBOX_NPC
+	.4byte Std_MsgboxSign              @ MSGBOX_SIGN
+	.4byte Std_MsgboxDefault           @ MSGBOX_DEFAULT
+	.4byte Std_MsgboxYesNo             @ MSGBOX_YESNO
+	.4byte Std_MsgboxAutoclose         @ MSGBOX_AUTOCLOSE
+	.4byte Std_ObtainDecoration        @ STD_OBTAIN_DECORATION
+	.4byte Std_RegisteredInMatchCall   @ STD_REGISTER_MATCH_CALL
+	.4byte Std_MsgboxGetPoints         @ MSGBOX_GETPOINTS
 	.4byte Std_10
 gStdScripts_End:: @ 81DC2CC
 
diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc
index cd552bc1d..b5598e60d 100644
--- a/data/maps/MossdeepCity_StevensHouse/scripts.inc
+++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc
@@ -149,7 +149,7 @@ MossdeepCity_StevensHouse_EventScript_Letter:: @ 822291B
 
 @ Unused, leftover from RS
 MossdeepCity_StevensHouse_EventScript_DiveItemBall:: @ 8222926
-	giveitem_std ITEM_HM08, 1, 1
+	finditem_std ITEM_HM08
 	setflag FLAG_RECEIVED_HM08
 	end
 
diff --git a/data/scripts/item_ball_scripts.inc b/data/scripts/item_ball_scripts.inc
index 045fbb5a7..5e926afc0 100644
--- a/data/scripts/item_ball_scripts.inc
+++ b/data/scripts/item_ball_scripts.inc
@@ -1,659 +1,659 @@
 Route102_EventScript_ItemPotion:: @ 8290CD8
-	giveitem_std ITEM_POTION, 1, 1
+	finditem_std ITEM_POTION
 	end
 
 Route103_EventScript_ItemGuardSpec:: @ 8290CE5
-	giveitem_std ITEM_GUARD_SPEC, 1, 1
+	finditem_std ITEM_GUARD_SPEC
 	end
 
 Route103_EventScript_ItemPPUp:: @ 8290CF2
-	giveitem_std ITEM_PP_UP, 1, 1
+	finditem_std ITEM_PP_UP
 	end
 
 Route104_EventScript_ItemPPUp:: @ 8290CFF
-	giveitem_std ITEM_PP_UP, 1, 1
+	finditem_std ITEM_PP_UP
 	end
 
 Route104_EventScript_ItemPokeBall:: @ 8290D0C
-	giveitem_std ITEM_POKE_BALL, 1, 1
+	finditem_std ITEM_POKE_BALL
 	end
 
 Route104_EventScript_ItemXAccuracy:: @ 8290D19
-	giveitem_std ITEM_X_ACCURACY, 1, 1
+	finditem_std ITEM_X_ACCURACY
 	end
 
 Route104_EventScript_ItemPotion:: @ 8290D26
-	giveitem_std ITEM_POTION, 1, 1
+	finditem_std ITEM_POTION
 	end
 
 Route105_EventScript_ItemIron:: @ 8290D33
-	giveitem_std ITEM_IRON, 1, 1
+	finditem_std ITEM_IRON
 	end
 
 Route106_EventScript_ItemProtein:: @ 8290D40
-	giveitem_std ITEM_PROTEIN, 1, 1
+	finditem_std ITEM_PROTEIN
 	end
 
 Route108_EventScript_ItemStarPiece:: @ 8290D4D
-	giveitem_std ITEM_STAR_PIECE, 1, 1
+	finditem_std ITEM_STAR_PIECE
 	end
 
 Route109_EventScript_ItemPPUp:: @ 8290D5A
-	giveitem_std ITEM_PP_UP, 1, 1
+	finditem_std ITEM_PP_UP
 	end
 
 Route109_EventScript_ItemPotion:: @ 8290D67
-	giveitem_std ITEM_POTION, 1, 1
+	finditem_std ITEM_POTION
 	end
 
 Route110_EventScript_ItemRareCandy:: @ 8290D74
-	giveitem_std ITEM_RARE_CANDY, 1, 1
+	finditem_std ITEM_RARE_CANDY
 	end
 
 Route110_EventScript_ItemDireHit:: @ 8290D81
-	giveitem_std ITEM_DIRE_HIT, 1, 1
+	finditem_std ITEM_DIRE_HIT
 	end
 
 Route110_EventScript_ItemElixir:: @ 8290D8E
-	giveitem_std ITEM_ELIXIR, 1, 1
+	finditem_std ITEM_ELIXIR
 	end
 
 Route111_EventScript_ItemTM37:: @ 8290D9B
-	giveitem_std ITEM_TM37, 1, 1
+	finditem_std ITEM_TM37
 	end
 
 Route111_EventScript_ItemStardust:: @ 8290DA8
-	giveitem_std ITEM_STARDUST, 1, 1
+	finditem_std ITEM_STARDUST
 	end
 
 Route111_EventScript_ItemHPUp:: @ 8290DB5
-	giveitem_std ITEM_HP_UP, 1, 1
+	finditem_std ITEM_HP_UP
 	end
 
 Route111_EventScript_ItemElixir:: @ 8290DC2
-	giveitem_std ITEM_ELIXIR, 1, 1
+	finditem_std ITEM_ELIXIR
 	end
 
 Route112_EventScript_ItemNugget:: @ 8290DCF
-	giveitem_std ITEM_NUGGET, 1, 1
+	finditem_std ITEM_NUGGET
 	end
 
 Route113_EventScript_ItemMaxEther:: @ 8290DDC
-	giveitem_std ITEM_MAX_ETHER, 1, 1
+	finditem_std ITEM_MAX_ETHER
 	end
 
 Route113_EventScript_ItemSuperRepel:: @ 8290DE9
-	giveitem_std ITEM_SUPER_REPEL, 1, 1
+	finditem_std ITEM_SUPER_REPEL
 	end
 
 Route113_EventScript_ItemHyperPotion:: @ 8290DF6
-	giveitem_std ITEM_HYPER_POTION, 1, 1
+	finditem_std ITEM_HYPER_POTION
 	end
 
 Route114_EventScript_ItemRareCandy:: @ 8290E03
-	giveitem_std ITEM_RARE_CANDY, 1, 1
+	finditem_std ITEM_RARE_CANDY
 	end
 
 Route114_EventScript_ItemProtein:: @ 8290E10
-	giveitem_std ITEM_PROTEIN, 1, 1
+	finditem_std ITEM_PROTEIN
 	end
 
 Route114_EventScript_ItemEnergyPowder:: @ 8290E1D
-	giveitem_std ITEM_ENERGY_POWDER, 1, 1
+	finditem_std ITEM_ENERGY_POWDER
 	end
 
 Route115_EventScript_ItemSuperPotion:: @ 8290E2A
-	giveitem_std ITEM_SUPER_POTION, 1, 1
+	finditem_std ITEM_SUPER_POTION
 	end
 
 Route115_EventScript_ItemTM01:: @ 8290E37
-	giveitem_std ITEM_TM01, 1, 1
+	finditem_std ITEM_TM01
 	end
 
 Route115_EventScript_ItemIron:: @ 8290E44
-	giveitem_std ITEM_IRON, 1, 1
+	finditem_std ITEM_IRON
 	end
 
 Route115_EventScript_ItemGreatBall:: @ 8290E51
-	giveitem_std ITEM_GREAT_BALL, 1, 1
+	finditem_std ITEM_GREAT_BALL
 	end
 
 Route115_EventScript_ItemHealPowder:: @ 8290E5E
-	giveitem_std ITEM_HEAL_POWDER, 1, 1
+	finditem_std ITEM_HEAL_POWDER
 	end
 
 Route115_EventScript_ItemPPUp:: @ 8290E6B
-	giveitem_std ITEM_PP_UP, 1, 1
+	finditem_std ITEM_PP_UP
 	end
 
 Route116_EventScript_ItemXSpecial:: @ 8290E78
-	giveitem_std ITEM_X_SPECIAL, 1, 1
+	finditem_std ITEM_X_SPECIAL
 	end
 
 Route116_EventScript_ItemEther:: @ 8290E85
-	giveitem_std ITEM_ETHER, 1, 1
+	finditem_std ITEM_ETHER
 	end
 
 Route116_EventScript_ItemRepel:: @ 8290E92
-	giveitem_std ITEM_REPEL, 1, 1
+	finditem_std ITEM_REPEL
 	end
 
 Route116_EventScript_ItemHPUp:: @ 8290E9F
-	giveitem_std ITEM_HP_UP, 1, 1
+	finditem_std ITEM_HP_UP
 	end
 
 Route116_EventScript_ItemPotion:: @ 8290EAC
-	giveitem_std ITEM_POTION, 1, 1
+	finditem_std ITEM_POTION
 	end
 
 Route117_EventScript_ItemGreatBall:: @ 8290EB9
-	giveitem_std ITEM_GREAT_BALL, 1, 1
+	finditem_std ITEM_GREAT_BALL
 	end
 
 Route117_EventScript_ItemRevive:: @ 8290EC6
-	giveitem_std ITEM_REVIVE, 1, 1
+	finditem_std ITEM_REVIVE
 	end
 
 Route118_EventScript_ItemHyperPotion:: @ 8290ED3
-	giveitem_std ITEM_HYPER_POTION, 1, 1
+	finditem_std ITEM_HYPER_POTION
 	end
 
 Route119_EventScript_ItemSuperRepel:: @ 8290EE0
-	giveitem_std ITEM_SUPER_REPEL, 1, 1
+	finditem_std ITEM_SUPER_REPEL
 	end
 
 Route119_EventScript_ItemZinc:: @ 8290EED
-	giveitem_std ITEM_ZINC, 1, 1
+	finditem_std ITEM_ZINC
 	end
 
 Route119_EventScript_ItemElixir:: @ 8290EFA
-	giveitem_std ITEM_ELIXIR, 1, 1
+	finditem_std ITEM_ELIXIR
 	end
 
 Route119_EventScript_ItemLeafStone:: @ 8290F07
-	giveitem_std ITEM_LEAF_STONE, 1, 1
+	finditem_std ITEM_LEAF_STONE
 	end
 
 Route119_EventScript_ItemRareCandy:: @ 8290F14
-	giveitem_std ITEM_RARE_CANDY, 1, 1
+	finditem_std ITEM_RARE_CANDY
 	end
 
 Route119_EventScript_ItemHyperPotion:: @ 8290F21
-	giveitem_std ITEM_HYPER_POTION, 1, 1
+	finditem_std ITEM_HYPER_POTION
 	end
 
 Route119_EventScript_ItemHyperPotion2:: @ 8290F2E
-	giveitem_std ITEM_HYPER_POTION, 1, 1
+	finditem_std ITEM_HYPER_POTION
 	end
 
 Route119_EventScript_ItemElixir2:: @ 8290F3B
-	giveitem_std ITEM_ELIXIR, 1, 1
+	finditem_std ITEM_ELIXIR
 	end
 
 Route120_EventScript_ItemNugget:: @ 8290F48
-	giveitem_std ITEM_NUGGET, 1, 1
+	finditem_std ITEM_NUGGET
 	end
 
 Route120_EventScript_ItemFullHeal:: @ 8290F55
-	giveitem_std ITEM_FULL_HEAL, 1, 1
+	finditem_std ITEM_FULL_HEAL
 	end
 
 Route120_EventScript_ItemHyperPotion:: @ 8290F62
-	giveitem_std ITEM_HYPER_POTION, 1, 1
+	finditem_std ITEM_HYPER_POTION
 	end
 
 Route120_EventScript_ItemNestBall:: @ 8290F6F
-	giveitem_std ITEM_NEST_BALL, 1, 1
+	finditem_std ITEM_NEST_BALL
 	end
 
 Route120_EventScript_ItemRevive:: @ 8290F7C
-	giveitem_std ITEM_REVIVE, 1, 1
+	finditem_std ITEM_REVIVE
 	end
 
 Route121_EventScript_ItemCarbos:: @ 8290F89
-	giveitem_std ITEM_CARBOS, 1, 1
+	finditem_std ITEM_CARBOS
 	end
 
 Route121_EventScript_ItemRevive:: @ 8290F96
-	giveitem_std ITEM_REVIVE, 1, 1
+	finditem_std ITEM_REVIVE
 	end
 
 Route121_EventScript_ItemZinc:: @ 8290FA3
-	giveitem_std ITEM_ZINC, 1, 1
+	finditem_std ITEM_ZINC
 	end
 
 Route123_EventScript_ItemCalcium:: @ 8290FB0
-	giveitem_std ITEM_CALCIUM, 1, 1
+	finditem_std ITEM_CALCIUM
 	end
 
 Route123_EventScript_ItemUltraBall:: @ 8290FBD
-	giveitem_std ITEM_ULTRA_BALL, 1, 1
+	finditem_std ITEM_ULTRA_BALL
 	end
 
 Route123_EventScript_ItemElixir:: @ 8290FCA
-	giveitem_std ITEM_ELIXIR, 1, 1
+	finditem_std ITEM_ELIXIR
 	end
 
 Route123_EventScript_ItemPPUp:: @ 8290FD7
-	giveitem_std ITEM_PP_UP, 1, 1
+	finditem_std ITEM_PP_UP
 	end
 
 Route123_EventScript_ItemRevivalHerb:: @ 8290FE4
-	giveitem_std ITEM_REVIVAL_HERB, 1, 1
+	finditem_std ITEM_REVIVAL_HERB
 	end
 
 Route124_EventScript_ItemRedShard:: @ 8290FF1
-	giveitem_std ITEM_RED_SHARD, 1, 1
+	finditem_std ITEM_RED_SHARD
 	end
 
 Route124_EventScript_ItemBlueShard:: @ 8290FFE
-	giveitem_std ITEM_BLUE_SHARD, 1, 1
+	finditem_std ITEM_BLUE_SHARD
 	end
 
 Route124_EventScript_ItemYellowShard:: @ 829100B
-	giveitem_std ITEM_YELLOW_SHARD, 1, 1
+	finditem_std ITEM_YELLOW_SHARD
 	end
 
 Route125_EventScript_ItemBigPearl:: @ 8291018
-	giveitem_std ITEM_BIG_PEARL, 1, 1
+	finditem_std ITEM_BIG_PEARL
 	end
 
 Route126_EventScript_ItemGreenShard:: @ 8291025
-	giveitem_std ITEM_GREEN_SHARD, 1, 1
+	finditem_std ITEM_GREEN_SHARD
 	end
 
 Route127_EventScript_ItemZinc:: @ 8291032
-	giveitem_std ITEM_ZINC, 1, 1
+	finditem_std ITEM_ZINC
 	end
 
 Route127_EventScript_ItemCarbos:: @ 829103F
-	giveitem_std ITEM_CARBOS, 1, 1
+	finditem_std ITEM_CARBOS
 	end
 
 Route127_EventScript_ItemRareCandy:: @ 829104C
-	giveitem_std ITEM_RARE_CANDY, 1, 1
+	finditem_std ITEM_RARE_CANDY
 	end
 
 Route132_EventScript_ItemRareCandy:: @ 8291059
-	giveitem_std ITEM_RARE_CANDY, 1, 1
+	finditem_std ITEM_RARE_CANDY
 	end
 
 Route132_EventScript_ItemProtein:: @ 8291066
-	giveitem_std ITEM_PROTEIN, 1, 1
+	finditem_std ITEM_PROTEIN
 	end
 
 Route133_EventScript_ItemBigPearl:: @ 8291073
-	giveitem_std ITEM_BIG_PEARL, 1, 1
+	finditem_std ITEM_BIG_PEARL
 	end
 
 Route133_EventScript_ItemStarPiece:: @ 8291080
-	giveitem_std ITEM_STAR_PIECE, 1, 1
+	finditem_std ITEM_STAR_PIECE
 	end
 
 Route133_EventScript_ItemMaxRevive:: @ 829108D
-	giveitem_std ITEM_MAX_REVIVE, 1, 1
+	finditem_std ITEM_MAX_REVIVE
 	end
 
 Route134_EventScript_ItemCarbos:: @ 829109A
-	giveitem_std ITEM_CARBOS, 1, 1
+	finditem_std ITEM_CARBOS
 	end
 
 Route134_EventScript_ItemStarPiece:: @ 82910A7
-	giveitem_std ITEM_STAR_PIECE, 1, 1
+	finditem_std ITEM_STAR_PIECE
 	end
 
 PetalburgCity_EventScript_ItemMaxRevive:: @ 82910B4
-	giveitem_std ITEM_MAX_REVIVE, 1, 1
+	finditem_std ITEM_MAX_REVIVE
 	end
 
 PetalburgCity_EventScript_ItemEther:: @ 82910C1
-	giveitem_std ITEM_ETHER, 1, 1
+	finditem_std ITEM_ETHER
 	end
 
 MauvilleCity_EventScript_ItemXSpeed:: @ 82910CE
-	giveitem_std ITEM_X_SPEED, 1, 1
+	finditem_std ITEM_X_SPEED
 	end
 
 RustboroCity_EventScript_ItemXDefend:: @ 82910DB
-	giveitem_std ITEM_X_DEFEND, 1, 1
+	finditem_std ITEM_X_DEFEND
 	end
 
 LilycoveCity_EventScript_ItemMaxRepel:: @ 82910E8
-	giveitem_std ITEM_MAX_REPEL, 1, 1
+	finditem_std ITEM_MAX_REPEL
 	end
 
 MossdeepCity_EventScript_ItemNetBall:: @ 82910F5
-	giveitem_std ITEM_NET_BALL, 1, 1
+	finditem_std ITEM_NET_BALL
 	end
 
 PetalburgWoods_EventScript_ItemXAttack:: @ 8291102
-	giveitem_std ITEM_X_ATTACK, 1, 1
+	finditem_std ITEM_X_ATTACK
 	end
 
 PetalburgWoods_EventScript_ItemGreatBall:: @ 829110F
-	giveitem_std ITEM_GREAT_BALL, 1, 1
+	finditem_std ITEM_GREAT_BALL
 	end
 
 PetalburgWoods_EventScript_ItemEther:: @ 829111C
-	giveitem_std ITEM_ETHER, 1, 1
+	finditem_std ITEM_ETHER
 	end
 
 PetalburgWoods_EventScript_ItemParalyzeHeal:: @ 8291129
-	giveitem_std ITEM_PARALYZE_HEAL, 1, 1
+	finditem_std ITEM_PARALYZE_HEAL
 	end
 
 RusturfTunnel_EventScript_ItemPokeBall:: @ 8291136
-	giveitem_std ITEM_POKE_BALL, 1, 1
+	finditem_std ITEM_POKE_BALL
 	end
 
 RusturfTunnel_EventScript_ItemMaxEther:: @ 8291143
-	giveitem_std ITEM_MAX_ETHER, 1, 1
+	finditem_std ITEM_MAX_ETHER
 	end
 
 GraniteCave_1F_EventScript_ItemEscapeRope:: @ 8291150
-	giveitem_std ITEM_ESCAPE_ROPE, 1, 1
+	finditem_std ITEM_ESCAPE_ROPE
 	end
 
 GraniteCave_B1F_EventScript_ItemPokeBall:: @ 829115D
-	giveitem_std ITEM_POKE_BALL, 1, 1
+	finditem_std ITEM_POKE_BALL
 	end
 
 GraniteCave_B2F_EventScript_ItemRepel:: @ 829116A
-	giveitem_std ITEM_REPEL, 1, 1
+	finditem_std ITEM_REPEL
 	end
 
 GraniteCave_B2F_EventScript_ItemRareCandy:: @ 8291177
-	giveitem_std ITEM_RARE_CANDY, 1, 1
+	finditem_std ITEM_RARE_CANDY
 	end
 
 JaggedPass_EventScript_ItemBurnHeal:: @ 8291184
-	giveitem_std ITEM_BURN_HEAL, 1, 1
+	finditem_std ITEM_BURN_HEAL
 	end
 
 FieryPath_EventScript_ItemFireStone:: @ 8291191
-	giveitem_std ITEM_FIRE_STONE, 1, 1
+	finditem_std ITEM_FIRE_STONE
 	end
 
 FieryPath_EventScript_ItemTM06:: @ 829119E
-	giveitem_std ITEM_TM06, 1, 1
+	finditem_std ITEM_TM06
 	end
 
 MeteorFalls_1F_1R_EventScript_ItemTM23:: @ 82911AB
-	giveitem_std ITEM_TM23, 1, 1
+	finditem_std ITEM_TM23
 	end
 
 MeteorFalls_1F_1R_EventScript_ItemFullHeal:: @ 82911B8
-	giveitem_std ITEM_FULL_HEAL, 1, 1
+	finditem_std ITEM_FULL_HEAL
 	end
 
 MeteorFalls_1F_1R_EventScript_ItemMoonStone:: @ 82911C5
-	giveitem_std ITEM_MOON_STONE, 1, 1
+	finditem_std ITEM_MOON_STONE
 	end
 
 MeteorFalls_1F_1R_EventScript_ItemPPUP:: @ 82911D2
-	giveitem_std ITEM_PP_UP, 1, 1
+	finditem_std ITEM_PP_UP
 	end
 
 MeteorFalls_B1F_2R_EventScript_ItemTM02:: @ 82911DF
-	giveitem_std ITEM_TM02, 1, 1
+	finditem_std ITEM_TM02
 	end
 
 NewMauville_Inside_EventScript_ItemUltraRope:: @ 82911EC
-	giveitem_std ITEM_ULTRA_BALL, 1, 1
+	finditem_std ITEM_ULTRA_BALL
 	end
 
 NewMauville_Inside_EventScript_ItemEscapeRope:: @ 82911F9
-	giveitem_std ITEM_ESCAPE_ROPE, 1, 1
+	finditem_std ITEM_ESCAPE_ROPE
 	end
 
 NewMauville_Inside_EventScript_ItemThunderStone:: @ 8291206
-	giveitem_std ITEM_THUNDER_STONE, 1, 1
+	finditem_std ITEM_THUNDER_STONE
 	end
 
 NewMauville_Inside_EventScript_ItemFullHeal:: @ 8291213
-	giveitem_std ITEM_FULL_HEAL, 1, 1
+	finditem_std ITEM_FULL_HEAL
 	end
 
 NewMauville_Inside_EventScript_ItemParalyzeHeal:: @ 8291220
-	giveitem_std ITEM_PARALYZE_HEAL, 1, 1
+	finditem_std ITEM_PARALYZE_HEAL
 	end
 
 AbandonedShip_Rooms_1F_EventScript_ItemHarborMail:: @ 829122D
-	giveitem_std ITEM_HARBOR_MAIL, 1, 1
+	finditem_std ITEM_HARBOR_MAIL
 	end
 
 AbandonedShip_Rooms_B1F_EventScript_ItemEscapeRope:: @ 829123A
-	giveitem_std ITEM_ESCAPE_ROPE, 1, 1
+	finditem_std ITEM_ESCAPE_ROPE
 	end
 
 AbandonedShip_Rooms2_B1F_EventScript_ItemDiveBall:: @ 8291247
-	giveitem_std ITEM_DIVE_BALL, 1, 1
+	finditem_std ITEM_DIVE_BALL
 	end
 
 AbandonedShip_Room_B1F_EventScript_ItemTM13:: @ 8291254
-	giveitem_std ITEM_TM13, 1, 1
+	finditem_std ITEM_TM13
 	end
 
 AbandonedShip_Rooms2_1F_EventScript_ItemRevive:: @ 8291261
-	giveitem_std ITEM_REVIVE, 1, 1
+	finditem_std ITEM_REVIVE
 	end
 
 AbandonedShip_CaptainsOffice_EventScript_ItemStorageKey:: @ 829126E
-	giveitem_std ITEM_STORAGE_KEY, 1, 1
+	finditem_std ITEM_STORAGE_KEY
 	end
 
 AbandonedShip_HiddenFloorRooms_EventScript_ItemLuxuryBall:: @ 829127B
-	giveitem_std ITEM_LUXURY_BALL, 1, 1
+	finditem_std ITEM_LUXURY_BALL
 	end
 
 AbandonedShip_HiddenFloorRooms_EventScript_ItemScanner:: @ 8291288
-	giveitem_std ITEM_SCANNER, 1, 1
+	finditem_std ITEM_SCANNER
 	end
 
 AbandonedShip_HiddenFloorRooms_EventScript_ItemWaterStone:: @ 8291295
-	giveitem_std ITEM_WATER_STONE, 1, 1
+	finditem_std ITEM_WATER_STONE
 	end
 
 AbandonedShip_HiddenFloorRooms_EventScript_ItemTM18:: @ 82912A2
-	giveitem_std ITEM_TM18, 1, 1
+	finditem_std ITEM_TM18
 	end
 
 ScorchedSlab_EventScript_ItemTM11:: @ 82912AF
-	giveitem_std ITEM_TM11, 1, 1
+	finditem_std ITEM_TM11
 	end
 
 SafariZone_Northwest_EventScript_ItemTM22:: @ 82912BC
-	giveitem_std ITEM_TM22, 1, 1
+	finditem_std ITEM_TM22
 	end
 
 SafariZone_North_EventScript_ItemCalcium:: @ 82912C9
-	giveitem_std ITEM_CALCIUM, 1, 1
+	finditem_std ITEM_CALCIUM
 	end
 
 SafariZone_Southwest_EventScript_ItemMaxRevive:: @ 82912D6
-	giveitem_std ITEM_MAX_REVIVE, 1, 1
+	finditem_std ITEM_MAX_REVIVE
 	end
 
 SafariZone_Northeast_EventScript_ItemNugget:: @ 82912E3
-	giveitem_std ITEM_NUGGET, 1, 1
+	finditem_std ITEM_NUGGET
 	end
 
 SafariZone_Southeast_EventScript_ItemBigPearl:: @ 82912F0
-	giveitem_std ITEM_BIG_PEARL, 1, 1
+	finditem_std ITEM_BIG_PEARL
 	end
 
 MtPyre_2F_EventScript_ItemUltraBall:: @ 82912FD
-	giveitem_std ITEM_ULTRA_BALL, 1, 1
+	finditem_std ITEM_ULTRA_BALL
 	end
 
 MtPyre_3F_EventScript_ItemSuperRepel:: @ 829130A
-	giveitem_std ITEM_SUPER_REPEL, 1, 1
+	finditem_std ITEM_SUPER_REPEL
 	end
 
 MtPyre_4F_EventScript_ItemSeaIncense:: @ 8291317
-	giveitem_std ITEM_SEA_INCENSE, 1, 1
+	finditem_std ITEM_SEA_INCENSE
 	end
 
 MtPyre_5F_EventScript_ItemLaxIncense:: @ 8291324
-	giveitem_std ITEM_LAX_INCENSE, 1, 1
+	finditem_std ITEM_LAX_INCENSE
 	end
 
 MtPyre_6F_EventScript_ItemTM30:: @ 8291331
-	giveitem_std ITEM_TM30, 1, 1
+	finditem_std ITEM_TM30
 	end
 
 MtPyre_Exterior_EventScript_ItemMaxPotion:: @ 829133E
-	giveitem_std ITEM_MAX_POTION, 1, 1
+	finditem_std ITEM_MAX_POTION
 	end
 
 MtPyre_Exterior_EventScript_ItemTM48:: @ 829134B
-	giveitem_std ITEM_TM48, 1, 1
+	finditem_std ITEM_TM48
 	end
 
 AquaHideout_B1F_EventScript_ItemMasterBall:: @ 8291358
-	giveitem_std ITEM_MASTER_BALL, 1, 1
+	finditem_std ITEM_MASTER_BALL
 	end
 
 AquaHideout_B1F_EventScript_ItemNugget:: @ 8291365
-	giveitem_std ITEM_NUGGET, 1, 1
+	finditem_std ITEM_NUGGET
 	end
 
 AquaHideout_B1F_EventScript_ItemMaxElixir:: @ 8291372
-	giveitem_std ITEM_MAX_ELIXIR, 1, 1
+	finditem_std ITEM_MAX_ELIXIR
 	end
 
 AquaHideout_B2F_EventScript_ItemNestBall:: @ 829137F
-	giveitem_std ITEM_NEST_BALL, 1, 1
+	finditem_std ITEM_NEST_BALL
 	end
 
 AquaHideout_B2F_EventScript_ItemMasterBall:: @ 829138C
-	giveitem_std ITEM_MASTER_BALL, 1, 1      // Unused
+	finditem_std ITEM_MASTER_BALL      // Unused
 	end
 
 Route119_EventScript_ItemNugget:: @ 8291399
-	giveitem_std ITEM_NUGGET, 1, 1
+	finditem_std ITEM_NUGGET
 	end
 
 Route119_EventScript_ItemMaxElixir:: @ 82913A6
-	giveitem_std ITEM_MAX_ELIXIR, 1, 1
+	finditem_std ITEM_MAX_ELIXIR
 	end
 
 Route119_EventScript_ItemNestBall:: @ 82913B3
-	giveitem_std ITEM_NEST_BALL, 1, 1
+	finditem_std ITEM_NEST_BALL
 	end
 
 ShoalCave_LowTideEntranceRoom_EventScript_ItemBigPearl:: @ 82913C0
-	giveitem_std ITEM_BIG_PEARL, 1, 1
+	finditem_std ITEM_BIG_PEARL
 	end
 
 ShoalCave_LowTideInnerRoom_EventScript_ItemRareCandy:: @ 82913CD
-	giveitem_std ITEM_RARE_CANDY, 1, 1
+	finditem_std ITEM_RARE_CANDY
 	end
 
 ShoalCave_LowTideStairsRoom_EventScript_ItemIceHeal:: @ 82913DA
-	giveitem_std ITEM_ICE_HEAL, 1, 1
+	finditem_std ITEM_ICE_HEAL
 	end
 
 ShoalCave_LowTideIceRoom_EventScript_ItemTM07:: @ 82913E7
-	giveitem_std ITEM_TM07, 1, 1
+	finditem_std ITEM_TM07
 	end
 
 ShoalCave_LowTideIceRoom_EventScript_ItemNeverMeltIce:: @ 82913F4
-	giveitem_std ITEM_NEVER_MELT_ICE, 1, 1
+	finditem_std ITEM_NEVER_MELT_ICE
 	end
 
 SeafloorCavern_Room9_EventScript_ItemTM26:: @ 8291401
-	giveitem_std ITEM_TM26, 1, 1
+	finditem_std ITEM_TM26
 	end
 
 Route110_TrickHousePuzzle1_EventScript_ItemOrangeMail:: @ 829140E
-	giveitem_std ITEM_ORANGE_MAIL, 1, 1
+	finditem_std ITEM_ORANGE_MAIL
 	end
 
 Route110_TrickHousePuzzle2_EventScript_ItemHarborMail:: @ 829141B
-	giveitem_std ITEM_HARBOR_MAIL, 1, 1
+	finditem_std ITEM_HARBOR_MAIL
 	end
 
 Route110_TrickHousePuzzle2_EventScript_ItemWaveMail:: @ 8291428
-	giveitem_std ITEM_WAVE_MAIL, 1, 1
+	finditem_std ITEM_WAVE_MAIL
 	end
 
 Route110_TrickHousePuzzle3_EventScript_ItemShadowMail:: @ 8291435
-	giveitem_std ITEM_SHADOW_MAIL, 1, 1
+	finditem_std ITEM_SHADOW_MAIL
 	end
 
 Route110_TrickHousePuzzle3_EventScript_ItemWoodMail:: @ 8291442
-	giveitem_std ITEM_WOOD_MAIL, 1, 1
+	finditem_std ITEM_WOOD_MAIL
 	end
 
 Route110_TrickHousePuzzle4_EventScript_ItemMechMail:: @ 829144F
-	giveitem_std ITEM_MECH_MAIL, 1, 1
+	finditem_std ITEM_MECH_MAIL
 	end
 
 Route110_TrickHousePuzzle6_EventScript_ItemGlitterMail:: @ 829145C
-	giveitem_std ITEM_GLITTER_MAIL, 1, 1
+	finditem_std ITEM_GLITTER_MAIL
 	end
 
 Route110_TrickHousePuzzle7_EventScript_ItemTropicMail:: @ 8291469
-	giveitem_std ITEM_TROPIC_MAIL, 1, 1
+	finditem_std ITEM_TROPIC_MAIL
 	end
 
 Route110_TrickHousePuzzle8_EventScript_ItemBeadMail:: @ 8291476
-	giveitem_std ITEM_BEAD_MAIL, 1, 1
+	finditem_std ITEM_BEAD_MAIL
 	end
 
 VictoryRoad_1F_EventScript_ItemMaxElixir:: @ 8291483
-	giveitem_std ITEM_MAX_ELIXIR, 1, 1
+	finditem_std ITEM_MAX_ELIXIR
 	end
 
 VictoryRoad_1F_EventScript_ItemPPUp:: @ 8291490
-	giveitem_std ITEM_PP_UP, 1, 1
+	finditem_std ITEM_PP_UP
 	end
 
 VictoryRoad_B1F_EventScript_ItemTM29:: @ 829149D
-	giveitem_std ITEM_TM29, 1, 1
+	finditem_std ITEM_TM29
 	end
 
 VictoryRoad_B1F_EventScript_ItemFullRestore:: @ 82914AA
-	giveitem_std ITEM_FULL_RESTORE, 1, 1
+	finditem_std ITEM_FULL_RESTORE
 	end
 
 VictoryRoad_B2F_EventScript_ItemFullHeal:: @ 82914B7
-	giveitem_std ITEM_FULL_HEAL, 1, 1
+	finditem_std ITEM_FULL_HEAL
 	end
 
 ArtisanCave_B1F_EventScript_ItemHPUp:: @ 82914C4
-	giveitem_std ITEM_HP_UP, 1, 1
+	finditem_std ITEM_HP_UP
 	end
 
 ArtisanCave_1F_EventScript_ItemCarbos:: @ 82914D1
-	giveitem_std ITEM_CARBOS, 1, 1
+	finditem_std ITEM_CARBOS
 	end
 
 MagmaHideout_1F_EventScript_ItemRareCandy:: @ 82914DE
-	giveitem_std ITEM_RARE_CANDY, 1, 1
+	finditem_std ITEM_RARE_CANDY
 	end
 
 MagmaHideout_2F_2R_EventScript_MaxElixir:: @ 82914EB
-	giveitem_std ITEM_MAX_ELIXIR, 1, 1
+	finditem_std ITEM_MAX_ELIXIR
 	end
 
 MagmaHideout_2F_2R_EventScript_ItemFullRestore:: @ 82914F8
-	giveitem_std ITEM_FULL_RESTORE, 1, 1
+	finditem_std ITEM_FULL_RESTORE
 	end
 
 MagmaHideout_3F_1R_EventScript_ItemNugget:: @ 8291505
-	giveitem_std ITEM_NUGGET, 1, 1
+	finditem_std ITEM_NUGGET
 	end
 
 MagmaHideout_3F_2R_EventScript_ItemPPMax:: @ 8291512
-	giveitem_std ITEM_PP_MAX, 1, 1
+	finditem_std ITEM_PP_MAX
 	end
 
 MagmaHideout_4F_EventScript_MaxRevive:: @ 829151F
-	giveitem_std ITEM_MAX_REVIVE, 1, 1
+	finditem_std ITEM_MAX_REVIVE
 	end
 
 MagmaHideout_3F_3R_EventScript_ItemEscapeRope:: @ 829152C
-	giveitem_std ITEM_ESCAPE_ROPE, 1, 1
+	finditem_std ITEM_ESCAPE_ROPE
 	end