Port some macro/script fixes from pokefirered

15 files changed, 254 insertions, 208 deletions

diff --git a/data/scripts/berry_blender.inc b/data/scripts/berry_blender.inc
index b699c8e04..a3dc2a8e2 100644
--- a/data/scripts/berry_blender.inc
+++ b/data/scripts/berry_blender.inc
@@ -263,7 +263,7 @@ BerryBlender_EventScript_Blender1NoSpareBerries: @ 8293C92
 
 BerryBlender_EventScript_Blender1GiveSpareBerry: @ 8293C9C
 	msgbox BerryBlender_Text_CanHaveOneOfMyBerries, MSGBOX_DEFAULT
-	giveitem_std ITEM_PECHA_BERRY
+	giveitem ITEM_PECHA_BERRY
 	setflag FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY
 	goto BerryBlender_EventScript_UseBerryBlender1
 	end
@@ -551,7 +551,7 @@ BerryBlender_EventScript_ExpertMNoSpareBerries: @ 8294028
 
 BerryBlender_EventScript_ExpertMGiveBerry: @ 8294032
 	msgbox BerryBlender_Text_DontHaveAnyBerriesHaveOne, MSGBOX_DEFAULT
-	giveitem_std ITEM_PECHA_BERRY
+	giveitem ITEM_PECHA_BERRY
 	setflag FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY
 	msgbox BerryBlender_Text_UseItToMakePokeblocksTogether, MSGBOX_DEFAULT
 	release
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index f27692448..ce299b864 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -41,7 +41,7 @@ CableClub_EventScript_DistributeEonTicket:: @ 8276B23
 	goto_if_eq CableClub_EventScript_AlreadyGotEonTicket
 	goto_if_set FLAG_SYS_HAS_EON_TICKET, CableClub_EventScript_AlreadyGotEonTicket
 	msgbox Mevent_Text_TheresATicketForYou, MSGBOX_DEFAULT
-	giveitem_std ITEM_EON_TICKET
+	giveitem ITEM_EON_TICKET
 	setflag FLAG_SYS_HAS_EON_TICKET
 	setvar VAR_DISTRIBUTE_EON_TICKET, 0
 	msgbox Mevent_Text_TryUsingItAtLilycovePort, MSGBOX_DEFAULT
@@ -383,7 +383,7 @@ CableClub_EventScript_EnterColosseum:: @ 8276FBD
 	waitdooranim
 	applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerEnterLinkRoom
 	waitmovement 0
-	hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY
+	hideobjectat EVENT_OBJ_ID_PLAYER, 0
 	closedoor 9, 1
 	waitdooranim
 	release
@@ -488,7 +488,7 @@ CableClub_EventScript_EnterTradeCenter:: @ 827713A
 	waitdooranim
 	applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerEnterLinkRoom
 	waitmovement 0
-	hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY
+	hideobjectat EVENT_OBJ_ID_PLAYER, 0
 	closedoor 9, 1
 	waitdooranim
 	release
@@ -563,7 +563,7 @@ CableClub_EventScript_EnterRecordCorner:: @ 827724C
 	waitdooranim
 	applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerEnterLinkRoom
 	waitmovement 0
-	hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY
+	hideobjectat EVENT_OBJ_ID_PLAYER, 0
 	closedoor 9, 1
 	waitdooranim
 	release
@@ -965,7 +965,7 @@ CableClub_EventScript_EnterUnionRoom:: @ 827759F
 	waitdooranim
 	applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerEnterLinkRoom
 	waitmovement 0
-	hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY
+	hideobjectat EVENT_OBJ_ID_PLAYER, 0
 	closedoor 5, 1
 	waitdooranim
 	special Script_ResetUnionRoomTrade
@@ -1296,7 +1296,7 @@ CableClub_EventScript_EnterWirelessLinkRoom:: @ 8277B3A
 	waitdooranim
 	applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerEnterLinkRoom
 	waitmovement 0
-	hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY
+	hideobjectat EVENT_OBJ_ID_PLAYER, 0
 	closedoor 9, 1
 	waitdooranim
 	release
@@ -1488,7 +1488,7 @@ MossdeepCity_GameCorner_1F_EventScript_EnterMinigameRoom:: @ 8277E0E
 	closemessage
 	applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerEnterMinigameRoom
 	waitmovement 0
-	hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY
+	hideobjectat EVENT_OBJ_ID_PLAYER, 0
 	release
 	waitstate
 	end
diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc
index cabf923b6..9775c40dc 100644
--- a/data/scripts/contest_hall.inc
+++ b/data/scripts/contest_hall.inc
@@ -15,7 +15,7 @@ LilycoveCity_ContestLobby_EventScript_ReceptionWelcome:: @ 8279CEA
 
 LilycoveCity_ContestLobby_EventScript_GivePokeblockCase:: @ 8279CF3
 	msgbox LilycoveCity_ContestLobby_Text_ReceptionDontHavePokeblockCase, MSGBOX_DEFAULT
-	giveitem_std ITEM_POKEBLOCK_CASE
+	giveitem ITEM_POKEBLOCK_CASE
 	setflag FLAG_RECEIVED_POKEBLOCK_CASE
 	msgbox LilycoveCity_ContestLobby_Text_NowThatWeveClearedThatUp, MSGBOX_DEFAULT
 	return
@@ -27,7 +27,7 @@ LilycoveCity_ContestLobby_EventScript_PickUpPrize:: @ 8279D13
 	end
 
 LilycoveCity_ContestLobby_EventScript_GiveLuxuryBallAtCounter:: @ 8279D2C
-	giveitem_std ITEM_LUXURY_BALL
+	giveitem ITEM_LUXURY_BALL
 	compare VAR_RESULT, FALSE
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_NoRoomForLuxuryBallAtCounter
 	setvar VAR_CONTEST_PRIZE_PICKUP, 0
@@ -1236,7 +1236,7 @@ ContestHall_EventScript_NoRoomForLuxuryBall:: @ 827ACA8
 	return
 
 ContestHall_EventScript_GiveLuxuryBall:: @ 827ACBD
-	giveitem_std ITEM_LUXURY_BALL
+	giveitem ITEM_LUXURY_BALL
 	compare VAR_RESULT, FALSE
 	goto_if_eq ContestHall_EventScript_NoRoomForLuxuryBall
 	lockall
diff --git a/data/scripts/item_ball_scripts.inc b/data/scripts/item_ball_scripts.inc
index 5e926afc0..2876e9e8c 100644
--- a/data/scripts/item_ball_scripts.inc
+++ b/data/scripts/item_ball_scripts.inc
@@ -1,659 +1,659 @@
 Route102_EventScript_ItemPotion:: @ 8290CD8
-	finditem_std ITEM_POTION
+	finditem ITEM_POTION
 	end
 
 Route103_EventScript_ItemGuardSpec:: @ 8290CE5
-	finditem_std ITEM_GUARD_SPEC
+	finditem ITEM_GUARD_SPEC
 	end
 
 Route103_EventScript_ItemPPUp:: @ 8290CF2
-	finditem_std ITEM_PP_UP
+	finditem ITEM_PP_UP
 	end
 
 Route104_EventScript_ItemPPUp:: @ 8290CFF
-	finditem_std ITEM_PP_UP
+	finditem ITEM_PP_UP
 	end
 
 Route104_EventScript_ItemPokeBall:: @ 8290D0C
-	finditem_std ITEM_POKE_BALL
+	finditem ITEM_POKE_BALL
 	end
 
 Route104_EventScript_ItemXAccuracy:: @ 8290D19
-	finditem_std ITEM_X_ACCURACY
+	finditem ITEM_X_ACCURACY
 	end
 
 Route104_EventScript_ItemPotion:: @ 8290D26
-	finditem_std ITEM_POTION
+	finditem ITEM_POTION
 	end
 
 Route105_EventScript_ItemIron:: @ 8290D33
-	finditem_std ITEM_IRON
+	finditem ITEM_IRON
 	end
 
 Route106_EventScript_ItemProtein:: @ 8290D40
-	finditem_std ITEM_PROTEIN
+	finditem ITEM_PROTEIN
 	end
 
 Route108_EventScript_ItemStarPiece:: @ 8290D4D
-	finditem_std ITEM_STAR_PIECE
+	finditem ITEM_STAR_PIECE
 	end
 
 Route109_EventScript_ItemPPUp:: @ 8290D5A
-	finditem_std ITEM_PP_UP
+	finditem ITEM_PP_UP
 	end
 
 Route109_EventScript_ItemPotion:: @ 8290D67
-	finditem_std ITEM_POTION
+	finditem ITEM_POTION
 	end
 
 Route110_EventScript_ItemRareCandy:: @ 8290D74
-	finditem_std ITEM_RARE_CANDY
+	finditem ITEM_RARE_CANDY
 	end
 
 Route110_EventScript_ItemDireHit:: @ 8290D81
-	finditem_std ITEM_DIRE_HIT
+	finditem ITEM_DIRE_HIT
 	end
 
 Route110_EventScript_ItemElixir:: @ 8290D8E
-	finditem_std ITEM_ELIXIR
+	finditem ITEM_ELIXIR
 	end
 
 Route111_EventScript_ItemTM37:: @ 8290D9B
-	finditem_std ITEM_TM37
+	finditem ITEM_TM37
 	end
 
 Route111_EventScript_ItemStardust:: @ 8290DA8
-	finditem_std ITEM_STARDUST
+	finditem ITEM_STARDUST
 	end
 
 Route111_EventScript_ItemHPUp:: @ 8290DB5
-	finditem_std ITEM_HP_UP
+	finditem ITEM_HP_UP
 	end
 
 Route111_EventScript_ItemElixir:: @ 8290DC2
-	finditem_std ITEM_ELIXIR
+	finditem ITEM_ELIXIR
 	end
 
 Route112_EventScript_ItemNugget:: @ 8290DCF
-	finditem_std ITEM_NUGGET
+	finditem ITEM_NUGGET
 	end
 
 Route113_EventScript_ItemMaxEther:: @ 8290DDC
-	finditem_std ITEM_MAX_ETHER
+	finditem ITEM_MAX_ETHER
 	end
 
 Route113_EventScript_ItemSuperRepel:: @ 8290DE9
-	finditem_std ITEM_SUPER_REPEL
+	finditem ITEM_SUPER_REPEL
 	end
 
 Route113_EventScript_ItemHyperPotion:: @ 8290DF6
-	finditem_std ITEM_HYPER_POTION
+	finditem ITEM_HYPER_POTION
 	end
 
 Route114_EventScript_ItemRareCandy:: @ 8290E03
-	finditem_std ITEM_RARE_CANDY
+	finditem ITEM_RARE_CANDY
 	end
 
 Route114_EventScript_ItemProtein:: @ 8290E10
-	finditem_std ITEM_PROTEIN
+	finditem ITEM_PROTEIN
 	end
 
 Route114_EventScript_ItemEnergyPowder:: @ 8290E1D
-	finditem_std ITEM_ENERGY_POWDER
+	finditem ITEM_ENERGY_POWDER
 	end
 
 Route115_EventScript_ItemSuperPotion:: @ 8290E2A
-	finditem_std ITEM_SUPER_POTION
+	finditem ITEM_SUPER_POTION
 	end
 
 Route115_EventScript_ItemTM01:: @ 8290E37
-	finditem_std ITEM_TM01
+	finditem ITEM_TM01
 	end
 
 Route115_EventScript_ItemIron:: @ 8290E44
-	finditem_std ITEM_IRON
+	finditem ITEM_IRON
 	end
 
 Route115_EventScript_ItemGreatBall:: @ 8290E51
-	finditem_std ITEM_GREAT_BALL
+	finditem ITEM_GREAT_BALL
 	end
 
 Route115_EventScript_ItemHealPowder:: @ 8290E5E
-	finditem_std ITEM_HEAL_POWDER
+	finditem ITEM_HEAL_POWDER
 	end
 
 Route115_EventScript_ItemPPUp:: @ 8290E6B
-	finditem_std ITEM_PP_UP
+	finditem ITEM_PP_UP
 	end
 
 Route116_EventScript_ItemXSpecial:: @ 8290E78
-	finditem_std ITEM_X_SPECIAL
+	finditem ITEM_X_SPECIAL
 	end
 
 Route116_EventScript_ItemEther:: @ 8290E85
-	finditem_std ITEM_ETHER
+	finditem ITEM_ETHER
 	end
 
 Route116_EventScript_ItemRepel:: @ 8290E92
-	finditem_std ITEM_REPEL
+	finditem ITEM_REPEL
 	end
 
 Route116_EventScript_ItemHPUp:: @ 8290E9F
-	finditem_std ITEM_HP_UP
+	finditem ITEM_HP_UP
 	end
 
 Route116_EventScript_ItemPotion:: @ 8290EAC
-	finditem_std ITEM_POTION
+	finditem ITEM_POTION
 	end
 
 Route117_EventScript_ItemGreatBall:: @ 8290EB9
-	finditem_std ITEM_GREAT_BALL
+	finditem ITEM_GREAT_BALL
 	end
 
 Route117_EventScript_ItemRevive:: @ 8290EC6
-	finditem_std ITEM_REVIVE
+	finditem ITEM_REVIVE
 	end
 
 Route118_EventScript_ItemHyperPotion:: @ 8290ED3
-	finditem_std ITEM_HYPER_POTION
+	finditem ITEM_HYPER_POTION
 	end
 
 Route119_EventScript_ItemSuperRepel:: @ 8290EE0
-	finditem_std ITEM_SUPER_REPEL
+	finditem ITEM_SUPER_REPEL
 	end
 
 Route119_EventScript_ItemZinc:: @ 8290EED
-	finditem_std ITEM_ZINC
+	finditem ITEM_ZINC
 	end
 
 Route119_EventScript_ItemElixir:: @ 8290EFA
-	finditem_std ITEM_ELIXIR
+	finditem ITEM_ELIXIR
 	end
 
 Route119_EventScript_ItemLeafStone:: @ 8290F07
-	finditem_std ITEM_LEAF_STONE
+	finditem ITEM_LEAF_STONE
 	end
 
 Route119_EventScript_ItemRareCandy:: @ 8290F14
-	finditem_std ITEM_RARE_CANDY
+	finditem ITEM_RARE_CANDY
 	end
 
 Route119_EventScript_ItemHyperPotion:: @ 8290F21
-	finditem_std ITEM_HYPER_POTION
+	finditem ITEM_HYPER_POTION
 	end
 
 Route119_EventScript_ItemHyperPotion2:: @ 8290F2E
-	finditem_std ITEM_HYPER_POTION
+	finditem ITEM_HYPER_POTION
 	end
 
 Route119_EventScript_ItemElixir2:: @ 8290F3B
-	finditem_std ITEM_ELIXIR
+	finditem ITEM_ELIXIR
 	end
 
 Route120_EventScript_ItemNugget:: @ 8290F48
-	finditem_std ITEM_NUGGET
+	finditem ITEM_NUGGET
 	end
 
 Route120_EventScript_ItemFullHeal:: @ 8290F55
-	finditem_std ITEM_FULL_HEAL
+	finditem ITEM_FULL_HEAL
 	end
 
 Route120_EventScript_ItemHyperPotion:: @ 8290F62
-	finditem_std ITEM_HYPER_POTION
+	finditem ITEM_HYPER_POTION
 	end
 
 Route120_EventScript_ItemNestBall:: @ 8290F6F
-	finditem_std ITEM_NEST_BALL
+	finditem ITEM_NEST_BALL
 	end
 
 Route120_EventScript_ItemRevive:: @ 8290F7C
-	finditem_std ITEM_REVIVE
+	finditem ITEM_REVIVE
 	end
 
 Route121_EventScript_ItemCarbos:: @ 8290F89
-	finditem_std ITEM_CARBOS
+	finditem ITEM_CARBOS
 	end
 
 Route121_EventScript_ItemRevive:: @ 8290F96
-	finditem_std ITEM_REVIVE
+	finditem ITEM_REVIVE
 	end
 
 Route121_EventScript_ItemZinc:: @ 8290FA3
-	finditem_std ITEM_ZINC
+	finditem ITEM_ZINC
 	end
 
 Route123_EventScript_ItemCalcium:: @ 8290FB0
-	finditem_std ITEM_CALCIUM
+	finditem ITEM_CALCIUM
 	end
 
 Route123_EventScript_ItemUltraBall:: @ 8290FBD
-	finditem_std ITEM_ULTRA_BALL
+	finditem ITEM_ULTRA_BALL
 	end
 
 Route123_EventScript_ItemElixir:: @ 8290FCA
-	finditem_std ITEM_ELIXIR
+	finditem ITEM_ELIXIR
 	end
 
 Route123_EventScript_ItemPPUp:: @ 8290FD7
-	finditem_std ITEM_PP_UP
+	finditem ITEM_PP_UP
 	end
 
 Route123_EventScript_ItemRevivalHerb:: @ 8290FE4
-	finditem_std ITEM_REVIVAL_HERB
+	finditem ITEM_REVIVAL_HERB
 	end
 
 Route124_EventScript_ItemRedShard:: @ 8290FF1
-	finditem_std ITEM_RED_SHARD
+	finditem ITEM_RED_SHARD
 	end
 
 Route124_EventScript_ItemBlueShard:: @ 8290FFE
-	finditem_std ITEM_BLUE_SHARD
+	finditem ITEM_BLUE_SHARD
 	end
 
 Route124_EventScript_ItemYellowShard:: @ 829100B
-	finditem_std ITEM_YELLOW_SHARD
+	finditem ITEM_YELLOW_SHARD
 	end
 
 Route125_EventScript_ItemBigPearl:: @ 8291018
-	finditem_std ITEM_BIG_PEARL
+	finditem ITEM_BIG_PEARL
 	end
 
 Route126_EventScript_ItemGreenShard:: @ 8291025
-	finditem_std ITEM_GREEN_SHARD
+	finditem ITEM_GREEN_SHARD
 	end
 
 Route127_EventScript_ItemZinc:: @ 8291032
-	finditem_std ITEM_ZINC
+	finditem ITEM_ZINC
 	end
 
 Route127_EventScript_ItemCarbos:: @ 829103F
-	finditem_std ITEM_CARBOS
+	finditem ITEM_CARBOS
 	end
 
 Route127_EventScript_ItemRareCandy:: @ 829104C
-	finditem_std ITEM_RARE_CANDY
+	finditem ITEM_RARE_CANDY
 	end
 
 Route132_EventScript_ItemRareCandy:: @ 8291059
-	finditem_std ITEM_RARE_CANDY
+	finditem ITEM_RARE_CANDY
 	end
 
 Route132_EventScript_ItemProtein:: @ 8291066
-	finditem_std ITEM_PROTEIN
+	finditem ITEM_PROTEIN
 	end
 
 Route133_EventScript_ItemBigPearl:: @ 8291073
-	finditem_std ITEM_BIG_PEARL
+	finditem ITEM_BIG_PEARL
 	end
 
 Route133_EventScript_ItemStarPiece:: @ 8291080
-	finditem_std ITEM_STAR_PIECE
+	finditem ITEM_STAR_PIECE
 	end
 
 Route133_EventScript_ItemMaxRevive:: @ 829108D
-	finditem_std ITEM_MAX_REVIVE
+	finditem ITEM_MAX_REVIVE
 	end
 
 Route134_EventScript_ItemCarbos:: @ 829109A
-	finditem_std ITEM_CARBOS
+	finditem ITEM_CARBOS
 	end
 
 Route134_EventScript_ItemStarPiece:: @ 82910A7
-	finditem_std ITEM_STAR_PIECE
+	finditem ITEM_STAR_PIECE
 	end
 
 PetalburgCity_EventScript_ItemMaxRevive:: @ 82910B4
-	finditem_std ITEM_MAX_REVIVE
+	finditem ITEM_MAX_REVIVE
 	end
 
 PetalburgCity_EventScript_ItemEther:: @ 82910C1
-	finditem_std ITEM_ETHER
+	finditem ITEM_ETHER
 	end
 
 MauvilleCity_EventScript_ItemXSpeed:: @ 82910CE
-	finditem_std ITEM_X_SPEED
+	finditem ITEM_X_SPEED
 	end
 
 RustboroCity_EventScript_ItemXDefend:: @ 82910DB
-	finditem_std ITEM_X_DEFEND
+	finditem ITEM_X_DEFEND
 	end
 
 LilycoveCity_EventScript_ItemMaxRepel:: @ 82910E8
-	finditem_std ITEM_MAX_REPEL
+	finditem ITEM_MAX_REPEL
 	end
 
 MossdeepCity_EventScript_ItemNetBall:: @ 82910F5
-	finditem_std ITEM_NET_BALL
+	finditem ITEM_NET_BALL
 	end
 
 PetalburgWoods_EventScript_ItemXAttack:: @ 8291102
-	finditem_std ITEM_X_ATTACK
+	finditem ITEM_X_ATTACK
 	end
 
 PetalburgWoods_EventScript_ItemGreatBall:: @ 829110F
-	finditem_std ITEM_GREAT_BALL
+	finditem ITEM_GREAT_BALL
 	end
 
 PetalburgWoods_EventScript_ItemEther:: @ 829111C
-	finditem_std ITEM_ETHER
+	finditem ITEM_ETHER
 	end
 
 PetalburgWoods_EventScript_ItemParalyzeHeal:: @ 8291129
-	finditem_std ITEM_PARALYZE_HEAL
+	finditem ITEM_PARALYZE_HEAL
 	end
 
 RusturfTunnel_EventScript_ItemPokeBall:: @ 8291136
-	finditem_std ITEM_POKE_BALL
+	finditem ITEM_POKE_BALL
 	end
 
 RusturfTunnel_EventScript_ItemMaxEther:: @ 8291143
-	finditem_std ITEM_MAX_ETHER
+	finditem ITEM_MAX_ETHER
 	end
 
 GraniteCave_1F_EventScript_ItemEscapeRope:: @ 8291150
-	finditem_std ITEM_ESCAPE_ROPE
+	finditem ITEM_ESCAPE_ROPE
 	end
 
 GraniteCave_B1F_EventScript_ItemPokeBall:: @ 829115D
-	finditem_std ITEM_POKE_BALL
+	finditem ITEM_POKE_BALL
 	end
 
 GraniteCave_B2F_EventScript_ItemRepel:: @ 829116A
-	finditem_std ITEM_REPEL
+	finditem ITEM_REPEL
 	end
 
 GraniteCave_B2F_EventScript_ItemRareCandy:: @ 8291177
-	finditem_std ITEM_RARE_CANDY
+	finditem ITEM_RARE_CANDY
 	end
 
 JaggedPass_EventScript_ItemBurnHeal:: @ 8291184
-	finditem_std ITEM_BURN_HEAL
+	finditem ITEM_BURN_HEAL
 	end
 
 FieryPath_EventScript_ItemFireStone:: @ 8291191
-	finditem_std ITEM_FIRE_STONE
+	finditem ITEM_FIRE_STONE
 	end
 
 FieryPath_EventScript_ItemTM06:: @ 829119E
-	finditem_std ITEM_TM06
+	finditem ITEM_TM06
 	end
 
 MeteorFalls_1F_1R_EventScript_ItemTM23:: @ 82911AB
-	finditem_std ITEM_TM23
+	finditem ITEM_TM23
 	end
 
 MeteorFalls_1F_1R_EventScript_ItemFullHeal:: @ 82911B8
-	finditem_std ITEM_FULL_HEAL
+	finditem ITEM_FULL_HEAL
 	end
 
 MeteorFalls_1F_1R_EventScript_ItemMoonStone:: @ 82911C5
-	finditem_std ITEM_MOON_STONE
+	finditem ITEM_MOON_STONE
 	end
 
 MeteorFalls_1F_1R_EventScript_ItemPPUP:: @ 82911D2
-	finditem_std ITEM_PP_UP
+	finditem ITEM_PP_UP
 	end
 
 MeteorFalls_B1F_2R_EventScript_ItemTM02:: @ 82911DF
-	finditem_std ITEM_TM02
+	finditem ITEM_TM02
 	end
 
 NewMauville_Inside_EventScript_ItemUltraRope:: @ 82911EC
-	finditem_std ITEM_ULTRA_BALL
+	finditem ITEM_ULTRA_BALL
 	end
 
 NewMauville_Inside_EventScript_ItemEscapeRope:: @ 82911F9
-	finditem_std ITEM_ESCAPE_ROPE
+	finditem ITEM_ESCAPE_ROPE
 	end
 
 NewMauville_Inside_EventScript_ItemThunderStone:: @ 8291206
-	finditem_std ITEM_THUNDER_STONE
+	finditem ITEM_THUNDER_STONE
 	end
 
 NewMauville_Inside_EventScript_ItemFullHeal:: @ 8291213
-	finditem_std ITEM_FULL_HEAL
+	finditem ITEM_FULL_HEAL
 	end
 
 NewMauville_Inside_EventScript_ItemParalyzeHeal:: @ 8291220
-	finditem_std ITEM_PARALYZE_HEAL
+	finditem ITEM_PARALYZE_HEAL
 	end
 
 AbandonedShip_Rooms_1F_EventScript_ItemHarborMail:: @ 829122D
-	finditem_std ITEM_HARBOR_MAIL
+	finditem ITEM_HARBOR_MAIL
 	end
 
 AbandonedShip_Rooms_B1F_EventScript_ItemEscapeRope:: @ 829123A
-	finditem_std ITEM_ESCAPE_ROPE
+	finditem ITEM_ESCAPE_ROPE
 	end
 
 AbandonedShip_Rooms2_B1F_EventScript_ItemDiveBall:: @ 8291247
-	finditem_std ITEM_DIVE_BALL
+	finditem ITEM_DIVE_BALL
 	end
 
 AbandonedShip_Room_B1F_EventScript_ItemTM13:: @ 8291254
-	finditem_std ITEM_TM13
+	finditem ITEM_TM13
 	end
 
 AbandonedShip_Rooms2_1F_EventScript_ItemRevive:: @ 8291261
-	finditem_std ITEM_REVIVE
+	finditem ITEM_REVIVE
 	end
 
 AbandonedShip_CaptainsOffice_EventScript_ItemStorageKey:: @ 829126E
-	finditem_std ITEM_STORAGE_KEY
+	finditem ITEM_STORAGE_KEY
 	end
 
 AbandonedShip_HiddenFloorRooms_EventScript_ItemLuxuryBall:: @ 829127B
-	finditem_std ITEM_LUXURY_BALL
+	finditem ITEM_LUXURY_BALL
 	end
 
 AbandonedShip_HiddenFloorRooms_EventScript_ItemScanner:: @ 8291288
-	finditem_std ITEM_SCANNER
+	finditem ITEM_SCANNER
 	end
 
 AbandonedShip_HiddenFloorRooms_EventScript_ItemWaterStone:: @ 8291295
-	finditem_std ITEM_WATER_STONE
+	finditem ITEM_WATER_STONE
 	end
 
 AbandonedShip_HiddenFloorRooms_EventScript_ItemTM18:: @ 82912A2
-	finditem_std ITEM_TM18
+	finditem ITEM_TM18
 	end
 
 ScorchedSlab_EventScript_ItemTM11:: @ 82912AF
-	finditem_std ITEM_TM11
+	finditem ITEM_TM11
 	end
 
 SafariZone_Northwest_EventScript_ItemTM22:: @ 82912BC
-	finditem_std ITEM_TM22
+	finditem ITEM_TM22
 	end
 
 SafariZone_North_EventScript_ItemCalcium:: @ 82912C9
-	finditem_std ITEM_CALCIUM
+	finditem ITEM_CALCIUM
 	end
 
 SafariZone_Southwest_EventScript_ItemMaxRevive:: @ 82912D6
-	finditem_std ITEM_MAX_REVIVE
+	finditem ITEM_MAX_REVIVE
 	end
 
 SafariZone_Northeast_EventScript_ItemNugget:: @ 82912E3
-	finditem_std ITEM_NUGGET
+	finditem ITEM_NUGGET
 	end
 
 SafariZone_Southeast_EventScript_ItemBigPearl:: @ 82912F0
-	finditem_std ITEM_BIG_PEARL
+	finditem ITEM_BIG_PEARL
 	end
 
 MtPyre_2F_EventScript_ItemUltraBall:: @ 82912FD
-	finditem_std ITEM_ULTRA_BALL
+	finditem ITEM_ULTRA_BALL
 	end
 
 MtPyre_3F_EventScript_ItemSuperRepel:: @ 829130A
-	finditem_std ITEM_SUPER_REPEL
+	finditem ITEM_SUPER_REPEL
 	end
 
 MtPyre_4F_EventScript_ItemSeaIncense:: @ 8291317
-	finditem_std ITEM_SEA_INCENSE
+	finditem ITEM_SEA_INCENSE
 	end
 
 MtPyre_5F_EventScript_ItemLaxIncense:: @ 8291324
-	finditem_std ITEM_LAX_INCENSE
+	finditem ITEM_LAX_INCENSE
 	end
 
 MtPyre_6F_EventScript_ItemTM30:: @ 8291331
-	finditem_std ITEM_TM30
+	finditem ITEM_TM30
 	end
 
 MtPyre_Exterior_EventScript_ItemMaxPotion:: @ 829133E
-	finditem_std ITEM_MAX_POTION
+	finditem ITEM_MAX_POTION
 	end
 
 MtPyre_Exterior_EventScript_ItemTM48:: @ 829134B
-	finditem_std ITEM_TM48
+	finditem ITEM_TM48
 	end
 
 AquaHideout_B1F_EventScript_ItemMasterBall:: @ 8291358
-	finditem_std ITEM_MASTER_BALL
+	finditem ITEM_MASTER_BALL
 	end
 
 AquaHideout_B1F_EventScript_ItemNugget:: @ 8291365
-	finditem_std ITEM_NUGGET
+	finditem ITEM_NUGGET
 	end
 
 AquaHideout_B1F_EventScript_ItemMaxElixir:: @ 8291372
-	finditem_std ITEM_MAX_ELIXIR
+	finditem ITEM_MAX_ELIXIR
 	end
 
 AquaHideout_B2F_EventScript_ItemNestBall:: @ 829137F
-	finditem_std ITEM_NEST_BALL
+	finditem ITEM_NEST_BALL
 	end
 
 AquaHideout_B2F_EventScript_ItemMasterBall:: @ 829138C
-	finditem_std ITEM_MASTER_BALL      // Unused
+	finditem ITEM_MASTER_BALL      // Unused
 	end
 
 Route119_EventScript_ItemNugget:: @ 8291399
-	finditem_std ITEM_NUGGET
+	finditem ITEM_NUGGET
 	end
 
 Route119_EventScript_ItemMaxElixir:: @ 82913A6
-	finditem_std ITEM_MAX_ELIXIR
+	finditem ITEM_MAX_ELIXIR
 	end
 
 Route119_EventScript_ItemNestBall:: @ 82913B3
-	finditem_std ITEM_NEST_BALL
+	finditem ITEM_NEST_BALL
 	end
 
 ShoalCave_LowTideEntranceRoom_EventScript_ItemBigPearl:: @ 82913C0
-	finditem_std ITEM_BIG_PEARL
+	finditem ITEM_BIG_PEARL
 	end
 
 ShoalCave_LowTideInnerRoom_EventScript_ItemRareCandy:: @ 82913CD
-	finditem_std ITEM_RARE_CANDY
+	finditem ITEM_RARE_CANDY
 	end
 
 ShoalCave_LowTideStairsRoom_EventScript_ItemIceHeal:: @ 82913DA
-	finditem_std ITEM_ICE_HEAL
+	finditem ITEM_ICE_HEAL
 	end
 
 ShoalCave_LowTideIceRoom_EventScript_ItemTM07:: @ 82913E7
-	finditem_std ITEM_TM07
+	finditem ITEM_TM07
 	end
 
 ShoalCave_LowTideIceRoom_EventScript_ItemNeverMeltIce:: @ 82913F4
-	finditem_std ITEM_NEVER_MELT_ICE
+	finditem ITEM_NEVER_MELT_ICE
 	end
 
 SeafloorCavern_Room9_EventScript_ItemTM26:: @ 8291401
-	finditem_std ITEM_TM26
+	finditem ITEM_TM26
 	end
 
 Route110_TrickHousePuzzle1_EventScript_ItemOrangeMail:: @ 829140E
-	finditem_std ITEM_ORANGE_MAIL
+	finditem ITEM_ORANGE_MAIL
 	end
 
 Route110_TrickHousePuzzle2_EventScript_ItemHarborMail:: @ 829141B
-	finditem_std ITEM_HARBOR_MAIL
+	finditem ITEM_HARBOR_MAIL
 	end
 
 Route110_TrickHousePuzzle2_EventScript_ItemWaveMail:: @ 8291428
-	finditem_std ITEM_WAVE_MAIL
+	finditem ITEM_WAVE_MAIL
 	end
 
 Route110_TrickHousePuzzle3_EventScript_ItemShadowMail:: @ 8291435
-	finditem_std ITEM_SHADOW_MAIL
+	finditem ITEM_SHADOW_MAIL
 	end
 
 Route110_TrickHousePuzzle3_EventScript_ItemWoodMail:: @ 8291442
-	finditem_std ITEM_WOOD_MAIL
+	finditem ITEM_WOOD_MAIL
 	end
 
 Route110_TrickHousePuzzle4_EventScript_ItemMechMail:: @ 829144F
-	finditem_std ITEM_MECH_MAIL
+	finditem ITEM_MECH_MAIL
 	end
 
 Route110_TrickHousePuzzle6_EventScript_ItemGlitterMail:: @ 829145C
-	finditem_std ITEM_GLITTER_MAIL
+	finditem ITEM_GLITTER_MAIL
 	end
 
 Route110_TrickHousePuzzle7_EventScript_ItemTropicMail:: @ 8291469
-	finditem_std ITEM_TROPIC_MAIL
+	finditem ITEM_TROPIC_MAIL
 	end
 
 Route110_TrickHousePuzzle8_EventScript_ItemBeadMail:: @ 8291476
-	finditem_std ITEM_BEAD_MAIL
+	finditem ITEM_BEAD_MAIL
 	end
 
 VictoryRoad_1F_EventScript_ItemMaxElixir:: @ 8291483
-	finditem_std ITEM_MAX_ELIXIR
+	finditem ITEM_MAX_ELIXIR
 	end
 
 VictoryRoad_1F_EventScript_ItemPPUp:: @ 8291490
-	finditem_std ITEM_PP_UP
+	finditem ITEM_PP_UP
 	end
 
 VictoryRoad_B1F_EventScript_ItemTM29:: @ 829149D
-	finditem_std ITEM_TM29
+	finditem ITEM_TM29
 	end
 
 VictoryRoad_B1F_EventScript_ItemFullRestore:: @ 82914AA
-	finditem_std ITEM_FULL_RESTORE
+	finditem ITEM_FULL_RESTORE
 	end
 
 VictoryRoad_B2F_EventScript_ItemFullHeal:: @ 82914B7
-	finditem_std ITEM_FULL_HEAL
+	finditem ITEM_FULL_HEAL
 	end
 
 ArtisanCave_B1F_EventScript_ItemHPUp:: @ 82914C4
-	finditem_std ITEM_HP_UP
+	finditem ITEM_HP_UP
 	end
 
 ArtisanCave_1F_EventScript_ItemCarbos:: @ 82914D1
-	finditem_std ITEM_CARBOS
+	finditem ITEM_CARBOS
 	end
 
 MagmaHideout_1F_EventScript_ItemRareCandy:: @ 82914DE
-	finditem_std ITEM_RARE_CANDY
+	finditem ITEM_RARE_CANDY
 	end
 
 MagmaHideout_2F_2R_EventScript_MaxElixir:: @ 82914EB
-	finditem_std ITEM_MAX_ELIXIR
+	finditem ITEM_MAX_ELIXIR
 	end
 
 MagmaHideout_2F_2R_EventScript_ItemFullRestore:: @ 82914F8
-	finditem_std ITEM_FULL_RESTORE
+	finditem ITEM_FULL_RESTORE
 	end
 
 MagmaHideout_3F_1R_EventScript_ItemNugget:: @ 8291505
-	finditem_std ITEM_NUGGET
+	finditem ITEM_NUGGET
 	end
 
 MagmaHideout_3F_2R_EventScript_ItemPPMax:: @ 8291512
-	finditem_std ITEM_PP_MAX
+	finditem ITEM_PP_MAX
 	end
 
 MagmaHideout_4F_EventScript_MaxRevive:: @ 829151F
-	finditem_std ITEM_MAX_REVIVE
+	finditem ITEM_MAX_REVIVE
 	end
 
 MagmaHideout_3F_3R_EventScript_ItemEscapeRope:: @ 829152C
-	finditem_std ITEM_ESCAPE_ROPE
+	finditem ITEM_ESCAPE_ROPE
 	end
diff --git a/data/scripts/lilycove_lady.inc b/data/scripts/lilycove_lady.inc
index c2ff593cf..bdd670031 100644
--- a/data/scripts/lilycove_lady.inc
+++ b/data/scripts/lilycove_lady.inc
@@ -129,7 +129,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_FavorLadyPrize:: @ 82A8510
     setvar VAR_0x8004, 0
     specialvar VAR_0x8004, FavorLadyGetPrize
     msgbox LilycoveCity_PokemonCenter_1F_Text_IllGiveYouThisInReturn, MSGBOX_DEFAULT
-    giveitem_std VAR_0x8004
+    giveitem VAR_0x8004
     compare VAR_RESULT, 0
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_NoRoomForFavorPrize
     compare VAR_RESULT, 1
@@ -297,7 +297,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_GivePrize:: @ 82A8724
     setvar VAR_0x8005, 0
     special BufferQuizPrizeItem
     special SetQuizLadyState_Complete
-    giveitem_std VAR_0x8005
+    giveitem VAR_0x8005
     compare VAR_RESULT, FALSE
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_NoSpaceForQuizPrize
     goto LilycoveCity_PokemonCenter_1F_EventScript_AskMakeQuiz
diff --git a/data/scripts/mevent_aurora_ticket.inc b/data/scripts/mevent_aurora_ticket.inc
index 177d69681..f26be068f 100644
--- a/data/scripts/mevent_aurora_ticket.inc
+++ b/data/scripts/mevent_aurora_ticket.inc
@@ -2,10 +2,8 @@ MysteryEventScript_AuroraTicket:: @ 867533C
 	setvaddress MysteryEventScript_AuroraTicket
 	lock
 	faceplayer
-	checkflag FLAG_RECEIVED_AURORA_TICKET
-	vgoto_if_eq AuroraTicket_Obtained
-	checkflag FLAG_BATTLED_DEOXYS
-	vgoto_if_eq AuroraTicket_Obtained
+	vgoto_if_set FLAG_RECEIVED_AURORA_TICKET, AuroraTicket_Obtained
+	vgoto_if_set FLAG_BATTLED_DEOXYS, AuroraTicket_Obtained
 	checkitem ITEM_AURORA_TICKET, 1
 	compare VAR_RESULT, TRUE
 	vgoto_if_eq AuroraTicket_Obtained
@@ -15,7 +13,7 @@ MysteryEventScript_AuroraTicket:: @ 867533C
 	checkitemspace ITEM_AURORA_TICKET, 1
 	compare VAR_RESULT, FALSE
 	vgoto_if_eq AuroraTicket_NoBagSpace
-	giveitem_std ITEM_AURORA_TICKET
+	giveitem ITEM_AURORA_TICKET
 	setflag FLAG_ENABLE_SHIP_BIRTH_ISLAND
 	setflag FLAG_RECEIVED_AURORA_TICKET
 	vmessage sText_AuroraTicketUseAtPort
diff --git a/data/scripts/mevent_battle_card.inc b/data/scripts/mevent_battle_card.inc
index 77f9a9b24..70462bdd9 100644
--- a/data/scripts/mevent_battle_card.inc
+++ b/data/scripts/mevent_battle_card.inc
@@ -1,7 +1,6 @@
 MysteryEventScript_BattleCard:: @ 867513C
 	setvaddress MysteryEventScript_BattleCard
-	checkflag FLAG_MYSTERY_EVENT_DONE
-	vgoto_if_eq MysteryEventScript_BattleCardInfo
+	vgoto_if_set FLAG_MYSTERY_EVENT_DONE, MysteryEventScript_BattleCardInfo
 	setorcopyvar VAR_RESULT, GET_CARD_BATTLES_WON
 	specialvar VAR_0x8008, GetMysteryEventCardVal
 	compare VAR_0x8008, REQUIRED_CARD_BATTLES
@@ -11,7 +10,7 @@ MysteryEventScript_BattleCard:: @ 867513C
 	vmessage sText_MysteryGiftBattleCountCard_WonPrize
 	waitmessage
 	waitbuttonpress
-	giveitem_std ITEM_POTION
+	giveitem ITEM_POTION
 	release
 	setflag FLAG_MYSTERY_EVENT_DONE
 	end
diff --git a/data/scripts/mevent_mystic_ticket.inc b/data/scripts/mevent_mystic_ticket.inc
index 9d532b043..8f938dc33 100644
--- a/data/scripts/mevent_mystic_ticket.inc
+++ b/data/scripts/mevent_mystic_ticket.inc
@@ -2,12 +2,9 @@ MysteryEventScript_MysticTicket:: @ 867550B
 	setvaddress MysteryEventScript_MysticTicket
 	lock
 	faceplayer
-	checkflag FLAG_RECEIVED_MYSTIC_TICKET
-	vgoto_if_eq MysticTicket_Obtained
-	checkflag FLAG_CAUGHT_LUGIA
-	vgoto_if_eq MysticTicket_Obtained
-	checkflag FLAG_CAUGHT_HO_OH
-	vgoto_if_eq MysticTicket_Obtained
+	vgoto_if_set FLAG_RECEIVED_MYSTIC_TICKET, MysticTicket_Obtained
+	vgoto_if_set FLAG_CAUGHT_LUGIA, MysticTicket_Obtained
+	vgoto_if_set FLAG_CAUGHT_HO_OH, MysticTicket_Obtained
 	checkitem ITEM_MYSTIC_TICKET, 1
 	compare VAR_RESULT, TRUE
 	vgoto_if_eq MysticTicket_Obtained
@@ -17,7 +14,7 @@ MysteryEventScript_MysticTicket:: @ 867550B
 	checkitemspace ITEM_MYSTIC_TICKET, 1
 	compare VAR_RESULT, FALSE
 	vgoto_if_eq MysticTicket_NoBagSpace
-	giveitem_std ITEM_MYSTIC_TICKET
+	giveitem ITEM_MYSTIC_TICKET
 	setflag FLAG_ENABLE_SHIP_NAVEL_ROCK
 	setflag FLAG_RECEIVED_MYSTIC_TICKET
 	vmessage sText_MysticTicketUseAtPort
diff --git a/data/scripts/mevent_old_sea_map.inc b/data/scripts/mevent_old_sea_map.inc
index 45c5f6728..0fb3c1002 100644
--- a/data/scripts/mevent_old_sea_map.inc
+++ b/data/scripts/mevent_old_sea_map.inc
@@ -2,10 +2,8 @@ MysteryEventScript_OldSeaMap:: @ 86757F4
 	setvaddress MysteryEventScript_OldSeaMap
 	lock
 	faceplayer
-	checkflag FLAG_RECEIVED_OLD_SEA_MAP
-	vgoto_if_eq OldSeaMap_Obtained
-	checkflag FLAG_CAUGHT_MEW
-	vgoto_if_eq OldSeaMap_Obtained
+	vgoto_if_set FLAG_RECEIVED_OLD_SEA_MAP, OldSeaMap_Obtained
+	vgoto_if_set FLAG_CAUGHT_MEW, OldSeaMap_Obtained
 	checkitem ITEM_OLD_SEA_MAP, 1
 	compare VAR_RESULT, TRUE
 	vgoto_if_eq OldSeaMap_Obtained
@@ -15,7 +13,7 @@ MysteryEventScript_OldSeaMap:: @ 86757F4
 	checkitemspace ITEM_OLD_SEA_MAP, 1
 	compare VAR_RESULT, FALSE
 	vgoto_if_eq OldSeaMap_NoBagSpace
-	giveitem_std ITEM_OLD_SEA_MAP
+	giveitem ITEM_OLD_SEA_MAP
 	setflag FLAG_ENABLE_SHIP_FARAWAY_ISLAND
 	setflag FLAG_RECEIVED_OLD_SEA_MAP
 	vmessage sText_MysteryGiftOldSeaMapUseAtPort
diff --git a/data/scripts/mevent_pichu.inc b/data/scripts/mevent_pichu.inc
index 4f5c739af..cc947e396 100644
--- a/data/scripts/mevent_pichu.inc
+++ b/data/scripts/mevent_pichu.inc
@@ -1,7 +1,6 @@
 MysteryEventScript_SurfPichu:: @ 8674D3D
 	setvaddress MysteryEventScript_SurfPichu
-	checkflag FLAG_MYSTERY_EVENT_DONE
-	vgoto_if_ne SurfPichu_GiveIfPossible
+	vgoto_if_unset FLAG_MYSTERY_EVENT_DONE, SurfPichu_GiveIfPossible
 	returnram
 
 SurfPichu_GiveIfPossible: @ 8674D4C
diff --git a/data/scripts/obtain_item.inc b/data/scripts/obtain_item.inc
index 77b795f60..3afd92588 100644
--- a/data/scripts/obtain_item.inc
+++ b/data/scripts/obtain_item.inc
@@ -1,5 +1,5 @@
 Std_ObtainItem:: @ 8271AD3
-	giveitem VAR_0x8000, VAR_0x8001
+	additem VAR_0x8000, VAR_0x8001
 	copyvar VAR_0x8007, VAR_RESULT
 	call EventScript_ObtainItemMessage
 	return
@@ -73,7 +73,7 @@ EventScript_PlayFanfareObtainedTMHM:: @ 8271BB3
 	return
 
 Std_ObtainDecoration:: @ 8271BB7
-	givedecoration VAR_0x8000
+	adddecoration VAR_0x8000
 	copyvar VAR_0x8007, VAR_RESULT
 	call EventScript_ObtainDecorationMessage
 	return
@@ -118,7 +118,7 @@ Std_FindItem:: @ 8271BFD
 
 EventScript_PickUpItem:: @ 8271C3A
 	removeobject VAR_LAST_TALKED
-	giveitem VAR_0x8004, VAR_0x8005
+	additem VAR_0x8004, VAR_0x8005
 	specialvar VAR_RESULT, BufferTMHMMoveName
 	copyvar VAR_0x8008, VAR_RESULT
 	compare VAR_0x8008, 1
@@ -156,7 +156,7 @@ EventScript_NoRoomToPickUpItem:: @ 8271CA1
 EventScript_HiddenItemScript:: @ 8271CB7
 	lockall
 	waitse
-	giveitem VAR_0x8005, 1
+	additem VAR_0x8005
 	copyvar VAR_0x8007, VAR_RESULT
 	bufferitemnameplural 1, VAR_0x8005, 1
 	checkitemtype VAR_0x8005
diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc
index 58618efe7..8f15fcd58 100644
--- a/data/scripts/players_house.inc
+++ b/data/scripts/players_house.inc
@@ -345,7 +345,7 @@ PlayersHouse_1F_EventScript_CheckGiveAmuletCoin:: @ 8292A43
 PlayersHouse_1F_EventScript_TryGiveAmuletCoin:: @ 8292A51
 	goto_if_set FLAG_RECEIVED_AMULET_COIN, PlayersHouse_1F_EventScript_MomHealsParty
 	msgbox PlayersHouse_1F_Text_GotDadsBadgeHeresSomethingFromMom, MSGBOX_DEFAULT
-	giveitem_std ITEM_AMULET_COIN
+	giveitem ITEM_AMULET_COIN
 	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	msgbox PlayersHouse_1F_Text_DontPushYourselfTooHard, MSGBOX_DEFAULT
@@ -448,7 +448,7 @@ PlayersHouse_1F_EventScript_GetSSTicketAndSeeLatiTV:: @ 8292AF2
 	compare VAR_0x8008, FEMALE
 	call_if_eq PlayersHouse_1F_EventScript_DadApproachPlayerFemale
 	msgbox PlayersHouse_1F_Text_TicketFromBrineyCameForYou, MSGBOX_DEFAULT
-	giveitem_std ITEM_SS_TICKET
+	giveitem ITEM_SS_TICKET
 	msgbox PlayersHouse_1F_Text_PortsInSlateportLilycove, MSGBOX_DEFAULT
 	closemessage
 	delay 20
diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc
index 7be69ec58..6684ec98b 100644
--- a/data/scripts/secret_power_tm.inc
+++ b/data/scripts/secret_power_tm.inc
@@ -44,7 +44,7 @@ Route111_EventScript_SecretPowerMan:: @ 82765FF
 	end
 
 Route111_EventScript_GiveSecretPower:: @ 827661E
-	giveitem_std ITEM_TM43
+	giveitem ITEM_TM43
 	compare VAR_RESULT, FALSE
 	goto_if_eq Route111_EventScript_NoRoomForSecretPower
 	msgbox Route111_Text_ExplainSecretPower, MSGBOX_DEFAULT
diff --git a/data/scripts/std_msgbox.inc b/data/scripts/std_msgbox.inc
new file mode 100644
index 000000000..1d82bb381
--- /dev/null
+++ b/data/scripts/std_msgbox.inc
@@ -0,0 +1,48 @@
+Std_MsgboxNPC: @ 8271315
+	lock
+	faceplayer
+	message 0x0
+	waitmessage
+	waitbuttonpress
+	release
+	return
+
+Std_MsgboxSign: @ 8271320
+	lockall
+	message 0x0
+	waitmessage
+	waitbuttonpress
+	releaseall
+	return
+
+Std_MsgboxDefault: @ 827132A
+	message 0x0
+	waitmessage
+	waitbuttonpress
+	return
+
+Std_MsgboxYesNo: @ 8271332
+	message 0x0
+	waitmessage
+	yesnobox 20, 8
+	return
+
+Std_MsgboxGetPoints: @ 827133C
+	message 0x0
+	playfanfare MUS_ME_POINTGET
+	waitfanfare
+	waitmessage
+	return
+
+Std_10: @ 8271347
+	pokenavcall 0x0
+	waitmessage
+	return
+
+EventScript_UnusedReturn: @ 827134E
+	return
+
+Common_EventScript_SaveGame:: @ 827134F
+	special SaveGame
+	waitstate
+	return
diff --git a/data/scripts/trainer_battle.inc b/data/scripts/trainer_battle.inc
index 0ba8bcda6..d609fcc93 100644
--- a/data/scripts/trainer_battle.inc
+++ b/data/scripts/trainer_battle.inc
@@ -130,3 +130,10 @@ EventScript_EndTrainerBattle:: @ 8271491
 	gotobeatenscript
 	releaseall
 	end
+
+Std_MsgboxAutoclose:: @ 8271494
+	message 0x0
+	waitmessage
+	waitbuttonpress
+	release
+	return