Sync event macros

9 files changed, 443 insertions, 443 deletions

diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc
index 1a72316bc..c47cb9bee 100644
--- a/data/scripts/berry_tree.inc
+++ b/data/scripts/berry_tree.inc
@@ -45,7 +45,7 @@ BerryTree_EventScript_1A1577:: @ 81A1577
 	waitstate
 	compare VAR_ITEM_ID, 0
 	goto_if_eq BerryTree_EventScript_1A1593
-	takeitem VAR_ITEM_ID, 1
+	removeitem VAR_ITEM_ID, 1
 	call S_PlantBerryTree
 BerryTree_EventScript_1A1593:: @ 81A1593
 	release
diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc
index 2a63d97f8..2f5634b8e 100644
--- a/data/scripts/contest_hall.inc
+++ b/data/scripts/contest_hall.inc
@@ -41,7 +41,7 @@ FallarborTown_ContestLobby_EventScript_1A4EF6:: @ 81A4EF6
 FallarborTown_ContestLobby_EventScript_1A4F13:: @ 81A4F13
 	goto_if_set FLAG_RECEIVED_CONTEST_PASS, FallarborTown_ContestLobby_EventScript_1A4F44
 	msgbox FallarborTown_ContestLobby_Text_1A6583, 4
-	giveitem_std ITEM_CONTEST_PASS
+	giveitem ITEM_CONTEST_PASS
 	setflag FLAG_RECEIVED_CONTEST_PASS
 	setflag FLAG_TEMP_1
 	msgbox FallarborTown_ContestLobby_Text_1A5E98, 4
@@ -60,7 +60,7 @@ FallarborTown_ContestLobby_EventScript_1A4F4E:: @ 81A4F4E
 	end
 
 FallarborTown_ContestLobby_EventScript_1A4F67:: @ 81A4F67
-	giveitem_std ITEM_LUXURY_BALL
+	giveitem ITEM_LUXURY_BALL
 	compare VAR_RESULT, 0
 	goto_if_eq FallarborTown_ContestLobby_EventScript_1A4F86
 	setvar VAR_CONTEST_PRIZE_PICKUP, 0
@@ -1131,7 +1131,7 @@ LinkContestRoom1_EventScript_1A5D2D:: @ 81A5D2D
 	return
 
 LinkContestRoom1_EventScript_1A5D3B:: @ 81A5D3B
-	giveitem_std ITEM_LUXURY_BALL
+	giveitem ITEM_LUXURY_BALL
 	compare VAR_RESULT, 0
 	goto_if_eq LinkContestRoom1_EventScript_1A5D2D
 	msgbox LinkContestRoom1_Text_1A6DF1, 3
diff --git a/data/scripts/debug.inc b/data/scripts/debug.inc
index c11e78a8d..c8f795d56 100644
--- a/data/scripts/debug.inc
+++ b/data/scripts/debug.inc
@@ -9,7 +9,7 @@ DebugScript_081C1D07:: @ 81C1D07
 	checkitem ITEM_COIN_CASE, 1
 	compare VAR_RESULT, 1
 	goto_if_eq DebugScript_081C1D1D
-	giveitem ITEM_COIN_CASE, 1
+	additem ITEM_COIN_CASE, 1
 	end
 
 DebugScript_081C1D1D:: @ 81C1D1D
@@ -26,7 +26,7 @@ DebugScript_081C1D24:: @ 81C1D24
 	end
 
 DebugScript_081C1D2A:: @ 81C1D2A
-	giveitem ITEM_SS_TICKET, 1
+	additem ITEM_SS_TICKET, 1
 	goto DebugScript_081C1CFE
 
 DebugScript_081C1D34:: @ 81C1D34
@@ -43,411 +43,411 @@ DebugScript_081C1D45:: @ 81C1D45
 	end
 
 DebugScript_081C1D46:: @ 81C1D46
-	giveitem ITEM_POTION, 99
-	giveitem ITEM_ANTIDOTE, 99
-	giveitem ITEM_BURN_HEAL, 99
-	giveitem ITEM_ICE_HEAL, 99
-	giveitem ITEM_AWAKENING, 99
-	giveitem ITEM_PARALYZE_HEAL, 99
-	giveitem ITEM_FULL_RESTORE, 99
-	giveitem ITEM_MAX_POTION, 99
-	giveitem ITEM_HYPER_POTION, 99
-	giveitem ITEM_SUPER_POTION, 99
-	giveitem ITEM_FULL_HEAL, 99
-	giveitem ITEM_REVIVE, 99
-	giveitem ITEM_MAX_REVIVE, 99
-	giveitem ITEM_FRESH_WATER, 99
-	giveitem ITEM_SODA_POP, 99
-	giveitem ITEM_LEMONADE, 99
-	giveitem ITEM_MOOMOO_MILK, 99
-	giveitem ITEM_ENERGY_POWDER, 99
-	giveitem ITEM_ENERGY_ROOT, 99
-	giveitem ITEM_HEAL_POWDER, 99
-	giveitem ITEM_ORANGE_MAIL, 92
-	giveitem ITEM_RETRO_MAIL, 94
-	giveitem ITEM_POTION, 89
-	giveitem ITEM_MASTER_BALL, 99
-	giveitem ITEM_ULTRA_BALL, 99
-	giveitem ITEM_GREAT_BALL, 99
-	giveitem ITEM_POKE_BALL, 99
-	giveitem ITEM_NET_BALL, 99
-	giveitem ITEM_DIVE_BALL, 99
-	giveitem ITEM_NEST_BALL, 99
-	giveitem ITEM_REPEAT_BALL, 99
-	giveitem ITEM_TIMER_BALL, 99
-	giveitem ITEM_LUXURY_BALL, 99
-	giveitem ITEM_PREMIER_BALL, 99
-	giveitem ITEM_MASTER_BALL, 99
-	giveitem ITEM_MASTER_BALL, 99
-	giveitem ITEM_MASTER_BALL, 99
-	giveitem ITEM_MASTER_BALL, 99
-	giveitem ITEM_MASTER_BALL, 99
-	giveitem ITEM_MASTER_BALL, 99
-	giveitem ITEM_MASTER_BALL, 99
-	giveitem ITEM_MASTER_BALL, 99
-	giveitem ITEM_MASTER_BALL, 99
-	giveitem ITEM_GREAT_BALL, 79
-	giveitem ITEM_ULTRA_BALL, 84
-	giveitem ITEM_POKE_BALL, 89
-	giveitem ITEM_MASTER_BALL, 74
-	giveitem ITEM_TM01_FOCUS_PUNCH, 99
-	giveitem ITEM_TM02_DRAGON_CLAW, 99
-	giveitem ITEM_TM03_WATER_PULSE, 99
-	giveitem ITEM_TM04_CALM_MIND, 99
-	giveitem ITEM_TM05_ROAR, 99
-	giveitem ITEM_TM06_TOXIC, 99
-	giveitem ITEM_TM07_HAIL, 99
-	giveitem ITEM_TM08_BULK_UP, 99
-	giveitem ITEM_TM09_BULLET_SEED, 99
-	giveitem ITEM_TM10_HIDDEN_POWER, 99
-	giveitem ITEM_TM11_SUNNY_DAY, 99
-	giveitem ITEM_TM12_TAUNT, 99
-	giveitem ITEM_TM13_ICE_BEAM, 99
-	giveitem ITEM_TM14_BLIZZARD, 99
-	giveitem ITEM_TM15_HYPER_BEAM, 99
-	giveitem ITEM_TM16_LIGHT_SCREEN, 99
-	giveitem ITEM_TM17_PROTECT, 99
-	giveitem ITEM_TM18_RAIN_DANCE, 99
-	giveitem ITEM_TM19_GIGA_DRAIN, 99
-	giveitem ITEM_TM20_SAFEGUARD, 99
-	giveitem ITEM_TM21_FRUSTRATION, 99
-	giveitem ITEM_TM22_SOLARBEAM, 99
-	giveitem ITEM_TM23_IRON_TAIL, 99
-	giveitem ITEM_TM24_THUNDERBOLT, 99
-	giveitem ITEM_TM25_THUNDER, 99
-	giveitem ITEM_TM26_EARTHQUAKE, 99
-	giveitem ITEM_TM27_RETURN, 99
-	giveitem ITEM_TM28_DIG, 99
-	giveitem ITEM_TM29_PSYCHIC, 99
-	giveitem ITEM_TM30_SHADOW_BALL, 99
-	giveitem ITEM_TM31_BRICK_BREAK, 99
-	giveitem ITEM_TM32_DOUBLE_TEAM, 99
-	giveitem ITEM_TM33_REFLECT, 99
-	giveitem ITEM_TM34_SHOCK_WAVE, 99
-	giveitem ITEM_TM35_FLAMETHROWER, 99
-	giveitem ITEM_TM36_SLUDGE_BOMB, 99
-	giveitem ITEM_TM37_SANDSTORM, 99
-	giveitem ITEM_TM38_FIRE_BLAST, 99
-	giveitem ITEM_TM39_ROCK_TOMB, 99
-	giveitem ITEM_TM40_AERIAL_ACE, 99
-	giveitem ITEM_TM41_TORMENT, 99
-	giveitem ITEM_TM42_FACADE, 99
-	giveitem ITEM_TM43_SECRET_POWER, 99
-	giveitem ITEM_TM44_REST, 99
-	giveitem ITEM_TM45_ATTRACT, 99
-	giveitem ITEM_TM46_THIEF, 99
-	giveitem ITEM_TM47_STEEL_WING, 99
-	giveitem ITEM_TM48_SKILL_SWAP, 99
-	giveitem ITEM_TM49_SNATCH, 99
-	giveitem ITEM_TM50_OVERHEAT, 99
-	giveitem ITEM_CHERI_BERRY, 200
-	giveitem ITEM_CHERI_BERRY, 200
-	giveitem ITEM_CHERI_BERRY, 200
-	giveitem ITEM_CHERI_BERRY, 200
-	giveitem ITEM_CHERI_BERRY, 199
-	giveitem ITEM_CHESTO_BERRY, 200
-	giveitem ITEM_CHESTO_BERRY, 200
-	giveitem ITEM_CHESTO_BERRY, 200
-	giveitem ITEM_CHESTO_BERRY, 200
-	giveitem ITEM_CHESTO_BERRY, 199
-	giveitem ITEM_PECHA_BERRY, 200
-	giveitem ITEM_PECHA_BERRY, 200
-	giveitem ITEM_PECHA_BERRY, 200
-	giveitem ITEM_PECHA_BERRY, 200
-	giveitem ITEM_PECHA_BERRY, 199
-	giveitem ITEM_RAWST_BERRY, 200
-	giveitem ITEM_RAWST_BERRY, 200
-	giveitem ITEM_RAWST_BERRY, 200
-	giveitem ITEM_RAWST_BERRY, 200
-	giveitem ITEM_RAWST_BERRY, 199
-	giveitem ITEM_ASPEAR_BERRY, 200
-	giveitem ITEM_ASPEAR_BERRY, 200
-	giveitem ITEM_ASPEAR_BERRY, 200
-	giveitem ITEM_ASPEAR_BERRY, 200
-	giveitem ITEM_ASPEAR_BERRY, 199
-	giveitem ITEM_LEPPA_BERRY, 200
-	giveitem ITEM_LEPPA_BERRY, 200
-	giveitem ITEM_LEPPA_BERRY, 200
-	giveitem ITEM_LEPPA_BERRY, 200
-	giveitem ITEM_LEPPA_BERRY, 199
-	giveitem ITEM_ORAN_BERRY, 200
-	giveitem ITEM_ORAN_BERRY, 200
-	giveitem ITEM_ORAN_BERRY, 200
-	giveitem ITEM_ORAN_BERRY, 200
-	giveitem ITEM_ORAN_BERRY, 199
-	giveitem ITEM_PERSIM_BERRY, 200
-	giveitem ITEM_PERSIM_BERRY, 200
-	giveitem ITEM_PERSIM_BERRY, 200
-	giveitem ITEM_PERSIM_BERRY, 200
-	giveitem ITEM_PERSIM_BERRY, 199
-	giveitem ITEM_LUM_BERRY, 200
-	giveitem ITEM_LUM_BERRY, 200
-	giveitem ITEM_LUM_BERRY, 200
-	giveitem ITEM_LUM_BERRY, 200
-	giveitem ITEM_LUM_BERRY, 199
-	giveitem ITEM_SITRUS_BERRY, 200
-	giveitem ITEM_SITRUS_BERRY, 200
-	giveitem ITEM_SITRUS_BERRY, 200
-	giveitem ITEM_SITRUS_BERRY, 200
-	giveitem ITEM_SITRUS_BERRY, 199
-	giveitem ITEM_FIGY_BERRY, 200
-	giveitem ITEM_FIGY_BERRY, 200
-	giveitem ITEM_FIGY_BERRY, 200
-	giveitem ITEM_FIGY_BERRY, 200
-	giveitem ITEM_FIGY_BERRY, 199
-	giveitem ITEM_WIKI_BERRY, 200
-	giveitem ITEM_WIKI_BERRY, 200
-	giveitem ITEM_WIKI_BERRY, 200
-	giveitem ITEM_WIKI_BERRY, 200
-	giveitem ITEM_WIKI_BERRY, 199
-	giveitem ITEM_MAGO_BERRY, 200
-	giveitem ITEM_MAGO_BERRY, 200
-	giveitem ITEM_MAGO_BERRY, 200
-	giveitem ITEM_MAGO_BERRY, 200
-	giveitem ITEM_MAGO_BERRY, 199
-	giveitem ITEM_AGUAV_BERRY, 200
-	giveitem ITEM_AGUAV_BERRY, 200
-	giveitem ITEM_AGUAV_BERRY, 200
-	giveitem ITEM_AGUAV_BERRY, 200
-	giveitem ITEM_AGUAV_BERRY, 199
-	giveitem ITEM_IAPAPA_BERRY, 200
-	giveitem ITEM_IAPAPA_BERRY, 200
-	giveitem ITEM_IAPAPA_BERRY, 200
-	giveitem ITEM_IAPAPA_BERRY, 200
-	giveitem ITEM_IAPAPA_BERRY, 199
-	giveitem ITEM_RAZZ_BERRY, 200
-	giveitem ITEM_RAZZ_BERRY, 200
-	giveitem ITEM_RAZZ_BERRY, 200
-	giveitem ITEM_RAZZ_BERRY, 200
-	giveitem ITEM_RAZZ_BERRY, 199
-	giveitem ITEM_BLUK_BERRY, 200
-	giveitem ITEM_BLUK_BERRY, 200
-	giveitem ITEM_BLUK_BERRY, 200
-	giveitem ITEM_BLUK_BERRY, 200
-	giveitem ITEM_BLUK_BERRY, 199
-	giveitem ITEM_NANAB_BERRY, 200
-	giveitem ITEM_NANAB_BERRY, 200
-	giveitem ITEM_NANAB_BERRY, 200
-	giveitem ITEM_NANAB_BERRY, 200
-	giveitem ITEM_NANAB_BERRY, 199
-	giveitem ITEM_WEPEAR_BERRY, 200
-	giveitem ITEM_WEPEAR_BERRY, 200
-	giveitem ITEM_WEPEAR_BERRY, 200
-	giveitem ITEM_WEPEAR_BERRY, 200
-	giveitem ITEM_WEPEAR_BERRY, 199
-	giveitem ITEM_PINAP_BERRY, 200
-	giveitem ITEM_PINAP_BERRY, 200
-	giveitem ITEM_PINAP_BERRY, 200
-	giveitem ITEM_PINAP_BERRY, 200
-	giveitem ITEM_PINAP_BERRY, 199
-	giveitem ITEM_POMEG_BERRY, 200
-	giveitem ITEM_POMEG_BERRY, 200
-	giveitem ITEM_POMEG_BERRY, 200
-	giveitem ITEM_POMEG_BERRY, 200
-	giveitem ITEM_POMEG_BERRY, 199
-	giveitem ITEM_KELPSY_BERRY, 200
-	giveitem ITEM_KELPSY_BERRY, 200
-	giveitem ITEM_KELPSY_BERRY, 200
-	giveitem ITEM_KELPSY_BERRY, 200
-	giveitem ITEM_KELPSY_BERRY, 199
-	giveitem ITEM_QUALOT_BERRY, 200
-	giveitem ITEM_QUALOT_BERRY, 200
-	giveitem ITEM_QUALOT_BERRY, 200
-	giveitem ITEM_QUALOT_BERRY, 200
-	giveitem ITEM_QUALOT_BERRY, 199
-	giveitem ITEM_HONDEW_BERRY, 200
-	giveitem ITEM_HONDEW_BERRY, 200
-	giveitem ITEM_HONDEW_BERRY, 200
-	giveitem ITEM_HONDEW_BERRY, 200
-	giveitem ITEM_HONDEW_BERRY, 199
-	giveitem ITEM_GREPA_BERRY, 200
-	giveitem ITEM_GREPA_BERRY, 200
-	giveitem ITEM_GREPA_BERRY, 200
-	giveitem ITEM_GREPA_BERRY, 200
-	giveitem ITEM_GREPA_BERRY, 199
-	giveitem ITEM_TAMATO_BERRY, 200
-	giveitem ITEM_TAMATO_BERRY, 200
-	giveitem ITEM_TAMATO_BERRY, 200
-	giveitem ITEM_TAMATO_BERRY, 200
-	giveitem ITEM_TAMATO_BERRY, 199
-	giveitem ITEM_CORNN_BERRY, 200
-	giveitem ITEM_CORNN_BERRY, 200
-	giveitem ITEM_CORNN_BERRY, 200
-	giveitem ITEM_CORNN_BERRY, 200
-	giveitem ITEM_CORNN_BERRY, 199
-	giveitem ITEM_MAGOST_BERRY, 999
-	giveitem ITEM_RABUTA_BERRY, 999
-	giveitem ITEM_NOMEL_BERRY, 999
-	giveitem ITEM_SPELON_BERRY, 999
-	giveitem ITEM_PAMTRE_BERRY, 999
-	giveitem ITEM_WATMEL_BERRY, 999
-	giveitem ITEM_DURIN_BERRY, 999
-	giveitem ITEM_BELUE_BERRY, 999
-	giveitem ITEM_LIECHI_BERRY, 999
-	giveitem ITEM_GANLON_BERRY, 999
-	giveitem ITEM_SALAC_BERRY, 999
-	giveitem ITEM_PETAYA_BERRY, 999
-	giveitem ITEM_APICOT_BERRY, 999
-	giveitem ITEM_LANSAT_BERRY, 999
-	giveitem ITEM_STARF_BERRY, 999
-	giveitem ITEM_ENIGMA_BERRY, 999
+	additem ITEM_POTION, 99
+	additem ITEM_ANTIDOTE, 99
+	additem ITEM_BURN_HEAL, 99
+	additem ITEM_ICE_HEAL, 99
+	additem ITEM_AWAKENING, 99
+	additem ITEM_PARALYZE_HEAL, 99
+	additem ITEM_FULL_RESTORE, 99
+	additem ITEM_MAX_POTION, 99
+	additem ITEM_HYPER_POTION, 99
+	additem ITEM_SUPER_POTION, 99
+	additem ITEM_FULL_HEAL, 99
+	additem ITEM_REVIVE, 99
+	additem ITEM_MAX_REVIVE, 99
+	additem ITEM_FRESH_WATER, 99
+	additem ITEM_SODA_POP, 99
+	additem ITEM_LEMONADE, 99
+	additem ITEM_MOOMOO_MILK, 99
+	additem ITEM_ENERGY_POWDER, 99
+	additem ITEM_ENERGY_ROOT, 99
+	additem ITEM_HEAL_POWDER, 99
+	additem ITEM_ORANGE_MAIL, 92
+	additem ITEM_RETRO_MAIL, 94
+	additem ITEM_POTION, 89
+	additem ITEM_MASTER_BALL, 99
+	additem ITEM_ULTRA_BALL, 99
+	additem ITEM_GREAT_BALL, 99
+	additem ITEM_POKE_BALL, 99
+	additem ITEM_NET_BALL, 99
+	additem ITEM_DIVE_BALL, 99
+	additem ITEM_NEST_BALL, 99
+	additem ITEM_REPEAT_BALL, 99
+	additem ITEM_TIMER_BALL, 99
+	additem ITEM_LUXURY_BALL, 99
+	additem ITEM_PREMIER_BALL, 99
+	additem ITEM_MASTER_BALL, 99
+	additem ITEM_MASTER_BALL, 99
+	additem ITEM_MASTER_BALL, 99
+	additem ITEM_MASTER_BALL, 99
+	additem ITEM_MASTER_BALL, 99
+	additem ITEM_MASTER_BALL, 99
+	additem ITEM_MASTER_BALL, 99
+	additem ITEM_MASTER_BALL, 99
+	additem ITEM_MASTER_BALL, 99
+	additem ITEM_GREAT_BALL, 79
+	additem ITEM_ULTRA_BALL, 84
+	additem ITEM_POKE_BALL, 89
+	additem ITEM_MASTER_BALL, 74
+	additem ITEM_TM01_FOCUS_PUNCH, 99
+	additem ITEM_TM02_DRAGON_CLAW, 99
+	additem ITEM_TM03_WATER_PULSE, 99
+	additem ITEM_TM04_CALM_MIND, 99
+	additem ITEM_TM05_ROAR, 99
+	additem ITEM_TM06_TOXIC, 99
+	additem ITEM_TM07_HAIL, 99
+	additem ITEM_TM08_BULK_UP, 99
+	additem ITEM_TM09_BULLET_SEED, 99
+	additem ITEM_TM10_HIDDEN_POWER, 99
+	additem ITEM_TM11_SUNNY_DAY, 99
+	additem ITEM_TM12_TAUNT, 99
+	additem ITEM_TM13_ICE_BEAM, 99
+	additem ITEM_TM14_BLIZZARD, 99
+	additem ITEM_TM15_HYPER_BEAM, 99
+	additem ITEM_TM16_LIGHT_SCREEN, 99
+	additem ITEM_TM17_PROTECT, 99
+	additem ITEM_TM18_RAIN_DANCE, 99
+	additem ITEM_TM19_GIGA_DRAIN, 99
+	additem ITEM_TM20_SAFEGUARD, 99
+	additem ITEM_TM21_FRUSTRATION, 99
+	additem ITEM_TM22_SOLARBEAM, 99
+	additem ITEM_TM23_IRON_TAIL, 99
+	additem ITEM_TM24_THUNDERBOLT, 99
+	additem ITEM_TM25_THUNDER, 99
+	additem ITEM_TM26_EARTHQUAKE, 99
+	additem ITEM_TM27_RETURN, 99
+	additem ITEM_TM28_DIG, 99
+	additem ITEM_TM29_PSYCHIC, 99
+	additem ITEM_TM30_SHADOW_BALL, 99
+	additem ITEM_TM31_BRICK_BREAK, 99
+	additem ITEM_TM32_DOUBLE_TEAM, 99
+	additem ITEM_TM33_REFLECT, 99
+	additem ITEM_TM34_SHOCK_WAVE, 99
+	additem ITEM_TM35_FLAMETHROWER, 99
+	additem ITEM_TM36_SLUDGE_BOMB, 99
+	additem ITEM_TM37_SANDSTORM, 99
+	additem ITEM_TM38_FIRE_BLAST, 99
+	additem ITEM_TM39_ROCK_TOMB, 99
+	additem ITEM_TM40_AERIAL_ACE, 99
+	additem ITEM_TM41_TORMENT, 99
+	additem ITEM_TM42_FACADE, 99
+	additem ITEM_TM43_SECRET_POWER, 99
+	additem ITEM_TM44_REST, 99
+	additem ITEM_TM45_ATTRACT, 99
+	additem ITEM_TM46_THIEF, 99
+	additem ITEM_TM47_STEEL_WING, 99
+	additem ITEM_TM48_SKILL_SWAP, 99
+	additem ITEM_TM49_SNATCH, 99
+	additem ITEM_TM50_OVERHEAT, 99
+	additem ITEM_CHERI_BERRY, 200
+	additem ITEM_CHERI_BERRY, 200
+	additem ITEM_CHERI_BERRY, 200
+	additem ITEM_CHERI_BERRY, 200
+	additem ITEM_CHERI_BERRY, 199
+	additem ITEM_CHESTO_BERRY, 200
+	additem ITEM_CHESTO_BERRY, 200
+	additem ITEM_CHESTO_BERRY, 200
+	additem ITEM_CHESTO_BERRY, 200
+	additem ITEM_CHESTO_BERRY, 199
+	additem ITEM_PECHA_BERRY, 200
+	additem ITEM_PECHA_BERRY, 200
+	additem ITEM_PECHA_BERRY, 200
+	additem ITEM_PECHA_BERRY, 200
+	additem ITEM_PECHA_BERRY, 199
+	additem ITEM_RAWST_BERRY, 200
+	additem ITEM_RAWST_BERRY, 200
+	additem ITEM_RAWST_BERRY, 200
+	additem ITEM_RAWST_BERRY, 200
+	additem ITEM_RAWST_BERRY, 199
+	additem ITEM_ASPEAR_BERRY, 200
+	additem ITEM_ASPEAR_BERRY, 200
+	additem ITEM_ASPEAR_BERRY, 200
+	additem ITEM_ASPEAR_BERRY, 200
+	additem ITEM_ASPEAR_BERRY, 199
+	additem ITEM_LEPPA_BERRY, 200
+	additem ITEM_LEPPA_BERRY, 200
+	additem ITEM_LEPPA_BERRY, 200
+	additem ITEM_LEPPA_BERRY, 200
+	additem ITEM_LEPPA_BERRY, 199
+	additem ITEM_ORAN_BERRY, 200
+	additem ITEM_ORAN_BERRY, 200
+	additem ITEM_ORAN_BERRY, 200
+	additem ITEM_ORAN_BERRY, 200
+	additem ITEM_ORAN_BERRY, 199
+	additem ITEM_PERSIM_BERRY, 200
+	additem ITEM_PERSIM_BERRY, 200
+	additem ITEM_PERSIM_BERRY, 200
+	additem ITEM_PERSIM_BERRY, 200
+	additem ITEM_PERSIM_BERRY, 199
+	additem ITEM_LUM_BERRY, 200
+	additem ITEM_LUM_BERRY, 200
+	additem ITEM_LUM_BERRY, 200
+	additem ITEM_LUM_BERRY, 200
+	additem ITEM_LUM_BERRY, 199
+	additem ITEM_SITRUS_BERRY, 200
+	additem ITEM_SITRUS_BERRY, 200
+	additem ITEM_SITRUS_BERRY, 200
+	additem ITEM_SITRUS_BERRY, 200
+	additem ITEM_SITRUS_BERRY, 199
+	additem ITEM_FIGY_BERRY, 200
+	additem ITEM_FIGY_BERRY, 200
+	additem ITEM_FIGY_BERRY, 200
+	additem ITEM_FIGY_BERRY, 200
+	additem ITEM_FIGY_BERRY, 199
+	additem ITEM_WIKI_BERRY, 200
+	additem ITEM_WIKI_BERRY, 200
+	additem ITEM_WIKI_BERRY, 200
+	additem ITEM_WIKI_BERRY, 200
+	additem ITEM_WIKI_BERRY, 199
+	additem ITEM_MAGO_BERRY, 200
+	additem ITEM_MAGO_BERRY, 200
+	additem ITEM_MAGO_BERRY, 200
+	additem ITEM_MAGO_BERRY, 200
+	additem ITEM_MAGO_BERRY, 199
+	additem ITEM_AGUAV_BERRY, 200
+	additem ITEM_AGUAV_BERRY, 200
+	additem ITEM_AGUAV_BERRY, 200
+	additem ITEM_AGUAV_BERRY, 200
+	additem ITEM_AGUAV_BERRY, 199
+	additem ITEM_IAPAPA_BERRY, 200
+	additem ITEM_IAPAPA_BERRY, 200
+	additem ITEM_IAPAPA_BERRY, 200
+	additem ITEM_IAPAPA_BERRY, 200
+	additem ITEM_IAPAPA_BERRY, 199
+	additem ITEM_RAZZ_BERRY, 200
+	additem ITEM_RAZZ_BERRY, 200
+	additem ITEM_RAZZ_BERRY, 200
+	additem ITEM_RAZZ_BERRY, 200
+	additem ITEM_RAZZ_BERRY, 199
+	additem ITEM_BLUK_BERRY, 200
+	additem ITEM_BLUK_BERRY, 200
+	additem ITEM_BLUK_BERRY, 200
+	additem ITEM_BLUK_BERRY, 200
+	additem ITEM_BLUK_BERRY, 199
+	additem ITEM_NANAB_BERRY, 200
+	additem ITEM_NANAB_BERRY, 200
+	additem ITEM_NANAB_BERRY, 200
+	additem ITEM_NANAB_BERRY, 200
+	additem ITEM_NANAB_BERRY, 199
+	additem ITEM_WEPEAR_BERRY, 200
+	additem ITEM_WEPEAR_BERRY, 200
+	additem ITEM_WEPEAR_BERRY, 200
+	additem ITEM_WEPEAR_BERRY, 200
+	additem ITEM_WEPEAR_BERRY, 199
+	additem ITEM_PINAP_BERRY, 200
+	additem ITEM_PINAP_BERRY, 200
+	additem ITEM_PINAP_BERRY, 200
+	additem ITEM_PINAP_BERRY, 200
+	additem ITEM_PINAP_BERRY, 199
+	additem ITEM_POMEG_BERRY, 200
+	additem ITEM_POMEG_BERRY, 200
+	additem ITEM_POMEG_BERRY, 200
+	additem ITEM_POMEG_BERRY, 200
+	additem ITEM_POMEG_BERRY, 199
+	additem ITEM_KELPSY_BERRY, 200
+	additem ITEM_KELPSY_BERRY, 200
+	additem ITEM_KELPSY_BERRY, 200
+	additem ITEM_KELPSY_BERRY, 200
+	additem ITEM_KELPSY_BERRY, 199
+	additem ITEM_QUALOT_BERRY, 200
+	additem ITEM_QUALOT_BERRY, 200
+	additem ITEM_QUALOT_BERRY, 200
+	additem ITEM_QUALOT_BERRY, 200
+	additem ITEM_QUALOT_BERRY, 199
+	additem ITEM_HONDEW_BERRY, 200
+	additem ITEM_HONDEW_BERRY, 200
+	additem ITEM_HONDEW_BERRY, 200
+	additem ITEM_HONDEW_BERRY, 200
+	additem ITEM_HONDEW_BERRY, 199
+	additem ITEM_GREPA_BERRY, 200
+	additem ITEM_GREPA_BERRY, 200
+	additem ITEM_GREPA_BERRY, 200
+	additem ITEM_GREPA_BERRY, 200
+	additem ITEM_GREPA_BERRY, 199
+	additem ITEM_TAMATO_BERRY, 200
+	additem ITEM_TAMATO_BERRY, 200
+	additem ITEM_TAMATO_BERRY, 200
+	additem ITEM_TAMATO_BERRY, 200
+	additem ITEM_TAMATO_BERRY, 199
+	additem ITEM_CORNN_BERRY, 200
+	additem ITEM_CORNN_BERRY, 200
+	additem ITEM_CORNN_BERRY, 200
+	additem ITEM_CORNN_BERRY, 200
+	additem ITEM_CORNN_BERRY, 199
+	additem ITEM_MAGOST_BERRY, 999
+	additem ITEM_RABUTA_BERRY, 999
+	additem ITEM_NOMEL_BERRY, 999
+	additem ITEM_SPELON_BERRY, 999
+	additem ITEM_PAMTRE_BERRY, 999
+	additem ITEM_WATMEL_BERRY, 999
+	additem ITEM_DURIN_BERRY, 999
+	additem ITEM_BELUE_BERRY, 999
+	additem ITEM_LIECHI_BERRY, 999
+	additem ITEM_GANLON_BERRY, 999
+	additem ITEM_SALAC_BERRY, 999
+	additem ITEM_PETAYA_BERRY, 999
+	additem ITEM_APICOT_BERRY, 999
+	additem ITEM_LANSAT_BERRY, 999
+	additem ITEM_STARF_BERRY, 999
+	additem ITEM_ENIGMA_BERRY, 999
 	end
 
 DebugScript_081C221F:: @ 81C221F
-	givedecoration DECOR_SMALL_DESK
-	givedecoration DECOR_SMALL_DESK
-	givedecoration DECOR_SMALL_DESK
-	givedecoration DECOR_SMALL_DESK
-	givedecoration DECOR_SMALL_DESK
-	givedecoration DECOR_SMALL_DESK
-	givedecoration DECOR_SMALL_DESK
-	givedecoration DECOR_SMALL_DESK
-	givedecoration DECOR_SMALL_DESK
-	givedecoration DECOR_SMALL_DESK
-	givedecoration DECOR_SMALL_CHAIR
-	givedecoration DECOR_SMALL_CHAIR
-	givedecoration DECOR_SMALL_CHAIR
-	givedecoration DECOR_SMALL_CHAIR
-	givedecoration DECOR_SMALL_CHAIR
-	givedecoration DECOR_SMALL_CHAIR
-	givedecoration DECOR_SMALL_CHAIR
-	givedecoration DECOR_SMALL_CHAIR
-	givedecoration DECOR_SMALL_CHAIR
-	givedecoration DECOR_SMALL_CHAIR
-	givedecoration DECOR_RED_PLANT
-	givedecoration DECOR_RED_PLANT
-	givedecoration DECOR_RED_PLANT
-	givedecoration DECOR_RED_PLANT
-	givedecoration DECOR_RED_PLANT
-	givedecoration DECOR_RED_PLANT
-	givedecoration DECOR_RED_PLANT
-	givedecoration DECOR_RED_PLANT
-	givedecoration DECOR_RED_PLANT
-	givedecoration DECOR_RED_PLANT
-	givedecoration DECOR_RED_BRICK
-	givedecoration DECOR_RED_BRICK
-	givedecoration DECOR_RED_BRICK
-	givedecoration DECOR_RED_BRICK
-	givedecoration DECOR_RED_BRICK
-	givedecoration DECOR_RED_BRICK
-	givedecoration DECOR_RED_BRICK
-	givedecoration DECOR_RED_BRICK
-	givedecoration DECOR_RED_BRICK
-	givedecoration DECOR_RED_BRICK
-	givedecoration DECOR_RED_BRICK
-	givedecoration DECOR_RED_BRICK
-	givedecoration DECOR_RED_BRICK
-	givedecoration DECOR_RED_BRICK
-	givedecoration DECOR_RED_BRICK
-	givedecoration DECOR_RED_BRICK
-	givedecoration DECOR_RED_BRICK
-	givedecoration DECOR_RED_BRICK
-	givedecoration DECOR_RED_BRICK
-	givedecoration DECOR_RED_BRICK
-	givedecoration DECOR_RED_BRICK
-	givedecoration DECOR_RED_BRICK
-	givedecoration DECOR_RED_BRICK
-	givedecoration DECOR_RED_BRICK
-	givedecoration DECOR_RED_BRICK
-	givedecoration DECOR_RED_BRICK
-	givedecoration DECOR_RED_BRICK
-	givedecoration DECOR_RED_BRICK
-	givedecoration DECOR_RED_BRICK
-	givedecoration DECOR_RED_BRICK
-	givedecoration DECOR_JUMP_MAT
-	givedecoration DECOR_JUMP_MAT
-	givedecoration DECOR_JUMP_MAT
-	givedecoration DECOR_JUMP_MAT
-	givedecoration DECOR_JUMP_MAT
-	givedecoration DECOR_JUMP_MAT
-	givedecoration DECOR_JUMP_MAT
-	givedecoration DECOR_JUMP_MAT
-	givedecoration DECOR_JUMP_MAT
-	givedecoration DECOR_JUMP_MAT
-	givedecoration DECOR_JUMP_MAT
-	givedecoration DECOR_JUMP_MAT
-	givedecoration DECOR_JUMP_MAT
-	givedecoration DECOR_JUMP_MAT
-	givedecoration DECOR_JUMP_MAT
-	givedecoration DECOR_JUMP_MAT
-	givedecoration DECOR_JUMP_MAT
-	givedecoration DECOR_JUMP_MAT
-	givedecoration DECOR_JUMP_MAT
-	givedecoration DECOR_JUMP_MAT
-	givedecoration DECOR_JUMP_MAT
-	givedecoration DECOR_JUMP_MAT
-	givedecoration DECOR_JUMP_MAT
-	givedecoration DECOR_JUMP_MAT
-	givedecoration DECOR_JUMP_MAT
-	givedecoration DECOR_JUMP_MAT
-	givedecoration DECOR_JUMP_MAT
-	givedecoration DECOR_JUMP_MAT
-	givedecoration DECOR_JUMP_MAT
-	givedecoration DECOR_JUMP_MAT
-	givedecoration DECOR_BALL_POSTER
-	givedecoration DECOR_BALL_POSTER
-	givedecoration DECOR_BALL_POSTER
-	givedecoration DECOR_BALL_POSTER
-	givedecoration DECOR_BALL_POSTER
-	givedecoration DECOR_BALL_POSTER
-	givedecoration DECOR_BALL_POSTER
-	givedecoration DECOR_BALL_POSTER
-	givedecoration DECOR_BALL_POSTER
-	givedecoration DECOR_BALL_POSTER
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_KISS_CUSHION
-	givedecoration DECOR_KISS_CUSHION
-	givedecoration DECOR_KISS_CUSHION
-	givedecoration DECOR_KISS_CUSHION
-	givedecoration DECOR_KISS_CUSHION
-	givedecoration DECOR_KISS_CUSHION
-	givedecoration DECOR_KISS_CUSHION
-	givedecoration DECOR_KISS_CUSHION
-	givedecoration DECOR_KISS_CUSHION
-	givedecoration DECOR_KISS_CUSHION
+	adddecoration DECOR_SMALL_DESK
+	adddecoration DECOR_SMALL_DESK
+	adddecoration DECOR_SMALL_DESK
+	adddecoration DECOR_SMALL_DESK
+	adddecoration DECOR_SMALL_DESK
+	adddecoration DECOR_SMALL_DESK
+	adddecoration DECOR_SMALL_DESK
+	adddecoration DECOR_SMALL_DESK
+	adddecoration DECOR_SMALL_DESK
+	adddecoration DECOR_SMALL_DESK
+	adddecoration DECOR_SMALL_CHAIR
+	adddecoration DECOR_SMALL_CHAIR
+	adddecoration DECOR_SMALL_CHAIR
+	adddecoration DECOR_SMALL_CHAIR
+	adddecoration DECOR_SMALL_CHAIR
+	adddecoration DECOR_SMALL_CHAIR
+	adddecoration DECOR_SMALL_CHAIR
+	adddecoration DECOR_SMALL_CHAIR
+	adddecoration DECOR_SMALL_CHAIR
+	adddecoration DECOR_SMALL_CHAIR
+	adddecoration DECOR_RED_PLANT
+	adddecoration DECOR_RED_PLANT
+	adddecoration DECOR_RED_PLANT
+	adddecoration DECOR_RED_PLANT
+	adddecoration DECOR_RED_PLANT
+	adddecoration DECOR_RED_PLANT
+	adddecoration DECOR_RED_PLANT
+	adddecoration DECOR_RED_PLANT
+	adddecoration DECOR_RED_PLANT
+	adddecoration DECOR_RED_PLANT
+	adddecoration DECOR_RED_BRICK
+	adddecoration DECOR_RED_BRICK
+	adddecoration DECOR_RED_BRICK
+	adddecoration DECOR_RED_BRICK
+	adddecoration DECOR_RED_BRICK
+	adddecoration DECOR_RED_BRICK
+	adddecoration DECOR_RED_BRICK
+	adddecoration DECOR_RED_BRICK
+	adddecoration DECOR_RED_BRICK
+	adddecoration DECOR_RED_BRICK
+	adddecoration DECOR_RED_BRICK
+	adddecoration DECOR_RED_BRICK
+	adddecoration DECOR_RED_BRICK
+	adddecoration DECOR_RED_BRICK
+	adddecoration DECOR_RED_BRICK
+	adddecoration DECOR_RED_BRICK
+	adddecoration DECOR_RED_BRICK
+	adddecoration DECOR_RED_BRICK
+	adddecoration DECOR_RED_BRICK
+	adddecoration DECOR_RED_BRICK
+	adddecoration DECOR_RED_BRICK
+	adddecoration DECOR_RED_BRICK
+	adddecoration DECOR_RED_BRICK
+	adddecoration DECOR_RED_BRICK
+	adddecoration DECOR_RED_BRICK
+	adddecoration DECOR_RED_BRICK
+	adddecoration DECOR_RED_BRICK
+	adddecoration DECOR_RED_BRICK
+	adddecoration DECOR_RED_BRICK
+	adddecoration DECOR_RED_BRICK
+	adddecoration DECOR_JUMP_MAT
+	adddecoration DECOR_JUMP_MAT
+	adddecoration DECOR_JUMP_MAT
+	adddecoration DECOR_JUMP_MAT
+	adddecoration DECOR_JUMP_MAT
+	adddecoration DECOR_JUMP_MAT
+	adddecoration DECOR_JUMP_MAT
+	adddecoration DECOR_JUMP_MAT
+	adddecoration DECOR_JUMP_MAT
+	adddecoration DECOR_JUMP_MAT
+	adddecoration DECOR_JUMP_MAT
+	adddecoration DECOR_JUMP_MAT
+	adddecoration DECOR_JUMP_MAT
+	adddecoration DECOR_JUMP_MAT
+	adddecoration DECOR_JUMP_MAT
+	adddecoration DECOR_JUMP_MAT
+	adddecoration DECOR_JUMP_MAT
+	adddecoration DECOR_JUMP_MAT
+	adddecoration DECOR_JUMP_MAT
+	adddecoration DECOR_JUMP_MAT
+	adddecoration DECOR_JUMP_MAT
+	adddecoration DECOR_JUMP_MAT
+	adddecoration DECOR_JUMP_MAT
+	adddecoration DECOR_JUMP_MAT
+	adddecoration DECOR_JUMP_MAT
+	adddecoration DECOR_JUMP_MAT
+	adddecoration DECOR_JUMP_MAT
+	adddecoration DECOR_JUMP_MAT
+	adddecoration DECOR_JUMP_MAT
+	adddecoration DECOR_JUMP_MAT
+	adddecoration DECOR_BALL_POSTER
+	adddecoration DECOR_BALL_POSTER
+	adddecoration DECOR_BALL_POSTER
+	adddecoration DECOR_BALL_POSTER
+	adddecoration DECOR_BALL_POSTER
+	adddecoration DECOR_BALL_POSTER
+	adddecoration DECOR_BALL_POSTER
+	adddecoration DECOR_BALL_POSTER
+	adddecoration DECOR_BALL_POSTER
+	adddecoration DECOR_BALL_POSTER
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_KISS_CUSHION
+	adddecoration DECOR_KISS_CUSHION
+	adddecoration DECOR_KISS_CUSHION
+	adddecoration DECOR_KISS_CUSHION
+	adddecoration DECOR_KISS_CUSHION
+	adddecoration DECOR_KISS_CUSHION
+	adddecoration DECOR_KISS_CUSHION
+	adddecoration DECOR_KISS_CUSHION
+	adddecoration DECOR_KISS_CUSHION
+	adddecoration DECOR_KISS_CUSHION
 	end
 
 DebugScript_081C23E2:: @ 81C23E2
-	givecoins 9999
+	addcoins 9999
 	end
 
 DebugScript_081C23E6:: @ 81C23E6
@@ -458,7 +458,7 @@ DebugScript_081C23E6:: @ 81C23E6
 	end
 
 DebugScript_081C23F6:: @ 81C23F6
-	takemoney 999999, 0x00
+	removemoney 999999, 0
 	end
 
 DebugScript_081C23FD:: @ 81C23FD
@@ -476,15 +476,15 @@ DebugScript_081C23FD:: @ 81C23FD
 	end
 
 DebugScript_081C2436:: @ 81C2436
-	givemon SPECIES_BARBOACH, 99, 0, 0, 0, 0
+	givemon SPECIES_BARBOACH, 99, ITEM_NONE
 DebugScript_081C2445:
-	givemon SPECIES_BARBOACH, 99, 0, 0, 0, 0
+	givemon SPECIES_BARBOACH, 99, ITEM_NONE
 DebugScript_081C2454:
-	givemon SPECIES_BARBOACH, 99, 0, 0, 0, 0
+	givemon SPECIES_BARBOACH, 99, ITEM_NONE
 DebugScript_081C2463:
-	givemon SPECIES_BARBOACH, 99, 0, 0, 0, 0
+	givemon SPECIES_BARBOACH, 99, ITEM_NONE
 DebugScript_081C2472:
-	givemon SPECIES_BARBOACH, 99, 0, 0, 0, 0
+	givemon SPECIES_BARBOACH, 99, ITEM_NONE
 	end
 
 DebugScript_081C2482:: @ 81C2482
@@ -502,15 +502,15 @@ DebugScript_081C2482:: @ 81C2482
 	end
 
 DebugScript_081C24BB:: @ 81C24BB
-	givemon SPECIES_SHROOMISH, 99, 0, 0, 0, 0
+	givemon SPECIES_SHROOMISH, 99, ITEM_NONE
 DebugScript_081C24CA:
-	givemon SPECIES_SHROOMISH, 99, 0, 0, 0, 0
+	givemon SPECIES_SHROOMISH, 99, ITEM_NONE
 DebugScript_081C24D9:
-	givemon SPECIES_SHROOMISH, 99, 0, 0, 0, 0
+	givemon SPECIES_SHROOMISH, 99, ITEM_NONE
 DebugScript_081C24E8:
-	givemon SPECIES_SHROOMISH, 99, 0, 0, 0, 0
+	givemon SPECIES_SHROOMISH, 99, ITEM_NONE
 DebugScript_081C24F7:
-	givemon SPECIES_SHROOMISH, 99, 0, 0, 0, 0
+	givemon SPECIES_SHROOMISH, 99, ITEM_NONE
 	end
 
 DebugScript_081C2507:: @ 81C2507
diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc
index f8d57f084..b2d0e598b 100644
--- a/data/scripts/gabby_and_ty.inc
+++ b/data/scripts/gabby_and_ty.inc
@@ -124,61 +124,61 @@ Route111_EventScript_1AE41E:: @ 81AE41E
 	return
 
 Route111_EventScript_1AE422:: @ 81AE422
-	trainerbattle 6, TRAINER_GABBY_AND_TY_1, 0, Route111_Text_1ABED8, Route111_Text_1ABFD3, Route111_Text_1AC5CA, Route111_EventScript_1AE5A2
+	trainerbattle_double TRAINER_GABBY_AND_TY_1, Route111_Text_1ABED8, Route111_Text_1ABFD3, Route111_Text_1AC5CA, Route111_EventScript_1AE5A2
 	msgbox Route111_Text_1AC59E, 4
 	release
 	end
 
 Route111_EventScript_1AE442:: @ 81AE442
-	trainerbattle 6, TRAINER_GABBY_AND_TY_1, 0, Route111_Text_1AC73B, Route111_Text_1AC892, Route111_Text_1AC820, Route111_EventScript_1AE5A2
+	trainerbattle_double TRAINER_GABBY_AND_TY_1, Route111_Text_1AC73B, Route111_Text_1AC892, Route111_Text_1AC820, Route111_EventScript_1AE5A2
 	msgbox Route111_Text_1AC7E4, 4
 	release
 	end
 
 Route118_EventScript_1AE462:: @ 81AE462
-	trainerbattle 6, TRAINER_GABBY_AND_TY_2, 0, Route118_Text_1ABF50, Route118_Text_1AC6F8, Route118_Text_1AC5CA, Route118_EventScript_1AE60F
+	trainerbattle_double TRAINER_GABBY_AND_TY_2, Route118_Text_1ABF50, Route118_Text_1AC6F8, Route118_Text_1AC5CA, Route118_EventScript_1AE60F
 	msgbox Route118_Text_1AC59E, 4
 	release
 	end
 
 Route118_EventScript_1AE482:: @ 81AE482
-	trainerbattle 6, TRAINER_GABBY_AND_TY_2, 0, Route118_Text_1AC790, Route118_Text_1AC8D7, Route118_Text_1AC820, Route118_EventScript_1AE60F
+	trainerbattle_double TRAINER_GABBY_AND_TY_2, Route118_Text_1AC790, Route118_Text_1AC8D7, Route118_Text_1AC820, Route118_EventScript_1AE60F
 	msgbox Route118_Text_1AC7E4, 4
 	release
 	end
 
 Route120_EventScript_1AE4A2:: @ 81AE4A2
-	trainerbattle 6, TRAINER_GABBY_AND_TY_3, 0, Route120_Text_1ABF50, Route120_Text_1AC6F8, Route120_Text_1AC5CA, Route120_EventScript_1AE60F
+	trainerbattle_double TRAINER_GABBY_AND_TY_3, Route120_Text_1ABF50, Route120_Text_1AC6F8, Route120_Text_1AC5CA, Route120_EventScript_1AE60F
 	msgbox Route120_Text_1AC59E, 4
 	release
 	end
 
 Route120_EventScript_1AE4C2:: @ 81AE4C2
-	trainerbattle 6, TRAINER_GABBY_AND_TY_3, 0, Route120_Text_1AC790, Route120_Text_1AC8D7, Route120_Text_1AC820, Route120_EventScript_1AE60F
+	trainerbattle_double TRAINER_GABBY_AND_TY_3, Route120_Text_1AC790, Route120_Text_1AC8D7, Route120_Text_1AC820, Route120_EventScript_1AE60F
 	msgbox Route120_Text_1AC7E4, 4
 	release
 	end
 
 Route111_EventScript_1AE4E2:: @ 81AE4E2
-	trainerbattle 6, TRAINER_GABBY_AND_TY_4, 0, Route111_Text_1ABF50, Route111_Text_1AC6F8, Route111_Text_1AC5CA, Route111_EventScript_1AE60F
+	trainerbattle_double TRAINER_GABBY_AND_TY_4, Route111_Text_1ABF50, Route111_Text_1AC6F8, Route111_Text_1AC5CA, Route111_EventScript_1AE60F
 	msgbox Route111_Text_1AC59E, 4
 	release
 	end
 
 Route111_EventScript_1AE502:: @ 81AE502
-	trainerbattle 6, TRAINER_GABBY_AND_TY_4, 0, Route111_Text_1AC790, Route111_Text_1AC8D7, Route111_Text_1AC820, Route111_EventScript_1AE60F
+	trainerbattle_double TRAINER_GABBY_AND_TY_4, Route111_Text_1AC790, Route111_Text_1AC8D7, Route111_Text_1AC820, Route111_EventScript_1AE60F
 	msgbox Route111_Text_1AC7E4, 4
 	release
 	end
 
 Route118_EventScript_1AE522:: @ 81AE522
-	trainerbattle 6, TRAINER_GABBY_AND_TY_5, 0, Route118_Text_1ABF50, Route118_Text_1AC6F8, Route118_Text_1AC5CA, Route118_EventScript_1AE60F
+	trainerbattle_double TRAINER_GABBY_AND_TY_5, Route118_Text_1ABF50, Route118_Text_1AC6F8, Route118_Text_1AC5CA, Route118_EventScript_1AE60F
 	msgbox Route118_Text_1AC59E, 4
 	release
 	end
 
 Route118_EventScript_1AE542:: @ 81AE542
-	trainerbattle 6, TRAINER_GABBY_AND_TY_5, 0, Route118_Text_1AC790, Route118_Text_1AC8D7, Route118_Text_1AC820, Route118_EventScript_1AE60F
+	trainerbattle_double TRAINER_GABBY_AND_TY_5, Route118_Text_1AC790, Route118_Text_1AC8D7, Route118_Text_1AC820, Route118_EventScript_1AE60F
 	msgbox Route118_Text_1AC7E4, 4
 	release
 	end
@@ -186,7 +186,7 @@ Route118_EventScript_1AE542:: @ 81AE542
 Route111_EventScript_1AE562:: @ 81AE562
 Route118_EventScript_1AE562:: @ 81AE562
 Route120_EventScript_1AE562:: @ 81AE562
-	trainerbattle 6, TRAINER_GABBY_AND_TY_6, 0, Route111_Text_1ABF50, Route111_Text_1AC6F8, Route111_Text_1AC5CA, Route111_EventScript_1AE60F
+	trainerbattle_double TRAINER_GABBY_AND_TY_6, Route111_Text_1ABF50, Route111_Text_1AC6F8, Route111_Text_1AC5CA, Route111_EventScript_1AE60F
 	msgbox Route111_Text_1AC59E, 4
 	release
 	end
@@ -194,7 +194,7 @@ Route120_EventScript_1AE562:: @ 81AE562
 Route111_EventScript_1AE582:: @ 81AE582
 Route118_EventScript_1AE582:: @ 81AE582
 Route120_EventScript_1AE582:: @ 81AE582
-	trainerbattle 6, TRAINER_GABBY_AND_TY_6, 0, Route111_Text_1AC790, Route111_Text_1AC8D7, Route111_Text_1AC820, Route111_EventScript_1AE60F
+	trainerbattle_double TRAINER_GABBY_AND_TY_6, Route111_Text_1AC790, Route111_Text_1AC8D7, Route111_Text_1AC820, Route111_EventScript_1AE60F
 	msgbox Route111_Text_1AC7E4, 4
 	release
 	end
diff --git a/data/scripts/magma_chimney.inc b/data/scripts/magma_chimney.inc
index ff31d8b97..92a4c055a 100644
--- a/data/scripts/magma_chimney.inc
+++ b/data/scripts/magma_chimney.inc
@@ -46,9 +46,9 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB
 	msgbox MtChimney_Text_1B38B3, 4
 	.endif
 	.ifdef SAPPHIRE
-	trainerbattle 3, TRAINER_MT_CHIMNEY_GRUNT_3, 0, MtChimney_Text_1B3099
+	trainerbattle_no_intro TRAINER_MT_CHIMNEY_GRUNT_3, MtChimney_Text_1B3099
 	.else
-	trainerbattle 3, TRAINER_MT_CHIMNEY_GRUNT_3, 0, MtChimney_Text_1B3A68
+	trainerbattle_no_intro TRAINER_MT_CHIMNEY_GRUNT_3, MtChimney_Text_1B3A68
 	.endif
 	.ifdef SAPPHIRE
 	msgbox MtChimney_Text_1B30C2, 4
diff --git a/data/scripts/magma_summit.inc b/data/scripts/magma_summit.inc
index 0992a62c0..766b1625e 100644
--- a/data/scripts/magma_summit.inc
+++ b/data/scripts/magma_summit.inc
@@ -1,29 +1,29 @@
 MtPyre_Summit_EventScript_1B2DA9:: @ 81B2DA9
 	.ifdef SAPPHIRE
-	trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_1, 0, UnknownString_81B50C3, UnknownString_81B50F5
+	trainerbattle_single TRAINER_MT_PYRE_SUMMIT_GRUNT_1, UnknownString_81B50C3, UnknownString_81B50F5
 	msgbox UnknownString_81B5131, 6
 	.else
-	trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_1, 0, MtPyre_Summit_Text_1B5CFD, MtPyre_Summit_Text_1B5D30
+	trainerbattle_single TRAINER_MT_PYRE_SUMMIT_GRUNT_1, MtPyre_Summit_Text_1B5CFD, MtPyre_Summit_Text_1B5D30
 	msgbox MtPyre_Summit_Text_1B5D6D, 6
 	.endif
 	end
 
 MtPyre_Summit_EventScript_1B2DC0:: @ 81B2DC0
 	.ifdef SAPPHIRE
-	trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_2, 0, UnknownString_81B5166, UnknownString_81B519F
+	trainerbattle_single TRAINER_MT_PYRE_SUMMIT_GRUNT_2, UnknownString_81B5166, UnknownString_81B519F
 	msgbox UnknownString_81B51B5, 6
 	.else
-	trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_2, 0, MtPyre_Summit_Text_1B5DA2, MtPyre_Summit_Text_1B5DDB
+	trainerbattle_single TRAINER_MT_PYRE_SUMMIT_GRUNT_2, MtPyre_Summit_Text_1B5DA2, MtPyre_Summit_Text_1B5DDB
 	msgbox MtPyre_Summit_Text_1B5DF1, 6
 	.endif
 	end
 
 MtPyre_Summit_EventScript_1B2DD7:: @ 81B2DD7
 	.ifdef SAPPHIRE
-	trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_3, 0, UnknownString_81B51EB, UnknownString_81B5224
+	trainerbattle_single TRAINER_MT_PYRE_SUMMIT_GRUNT_3, UnknownString_81B51EB, UnknownString_81B5224
 	msgbox UnknownString_81B5248, 6
 	.else
-	trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_3, 0, MtPyre_Summit_Text_1B5E27, MtPyre_Summit_Text_1B5E60
+	trainerbattle_single TRAINER_MT_PYRE_SUMMIT_GRUNT_3, MtPyre_Summit_Text_1B5E27, MtPyre_Summit_Text_1B5E60
 	msgbox MtPyre_Summit_Text_1B5E84, 6
 	.endif
 	end
diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc
index a4de5d113..ab21dbba0 100644
--- a/data/scripts/players_house.inc
+++ b/data/scripts/players_house.inc
@@ -273,7 +273,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6C33:: @ 81B6C33
 LittlerootTown_BrendansHouse_1F_EventScript_1B6C3D:: @ 81B6C3D
 	goto_if_set FLAG_RECEIVED_AMULET_COIN, LittlerootTown_BrendansHouse_1F_EventScript_1B6C72
 	msgbox LittlerootTown_BrendansHouse_1F_Text_172782, 4
-	giveitem_std ITEM_AMULET_COIN
+	giveitem ITEM_AMULET_COIN
 	compare VAR_RESULT, 0
 	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1A029B
 	msgbox LittlerootTown_BrendansHouse_1F_Text_1727CD, 4
@@ -379,7 +379,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE
 	compare VAR_0x8008, 1
 	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6DD8
 	msgbox LittlerootTown_BrendansHouse_1F_Text_17298B, 4
-	giveitem_std ITEM_SS_TICKET
+	giveitem ITEM_SS_TICKET
 	msgbox LittlerootTown_BrendansHouse_1F_Text_172A7D, 4
 	closemessage
 	compare VAR_0x8008, 0
diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc
index 95525b4c9..f05821107 100644
--- a/data/scripts/pokeblocks.inc
+++ b/data/scripts/pokeblocks.inc
@@ -75,7 +75,7 @@ FallarborTown_ContestLobby_EventScript_1B76EF:: @ 81B76EF
 
 FallarborTown_ContestLobby_EventScript_1B770E:: @ 81B770E
 	msgbox FallarborTown_ContestLobby_Text_1B6FF0, 4
-	dodailyevents
+	dotimebasedevents
 	goto_if_set FLAG_DAILY_RECEIVED_BERRY_FALLARBOR, FallarborTown_ContestLobby_EventScript_1B774F
 	goto FallarborTown_ContestLobby_EventScript_1B7759
 	end
@@ -105,7 +105,7 @@ FallarborTown_ContestLobby_EventScript_1B774F:: @ 81B774F
 
 FallarborTown_ContestLobby_EventScript_1B7759:: @ 81B7759
 	msgbox FallarborTown_ContestLobby_Text_1B704A, 4
-	giveitem_std ITEM_PECHA_BERRY
+	giveitem ITEM_PECHA_BERRY
 	setflag FLAG_DAILY_RECEIVED_BERRY_FALLARBOR
 	goto FallarborTown_ContestLobby_EventScript_1B76EF
 	end
@@ -160,7 +160,7 @@ FallarborTown_ContestLobby_EventScript_1B77DC:: @ 81B77DC
 	end
 
 FallarborTown_ContestLobby_EventScript_1B77E6:: @ 81B77E6
-	dodailyevents
+	dotimebasedevents
 	goto_if_set FLAG_DAILY_RECEIVED_BERRY_FALLARBOR, FallarborTown_ContestLobby_EventScript_1B77F6
 	goto FallarborTown_ContestLobby_EventScript_1B7800
 	end
@@ -172,7 +172,7 @@ FallarborTown_ContestLobby_EventScript_1B77F6:: @ 81B77F6
 
 FallarborTown_ContestLobby_EventScript_1B7800:: @ 81B7800
 	msgbox FallarborTown_ContestLobby_Text_1B74B4, 4
-	giveitem_std ITEM_PECHA_BERRY
+	giveitem ITEM_PECHA_BERRY
 	setflag FLAG_DAILY_RECEIVED_BERRY_FALLARBOR
 	msgbox FallarborTown_ContestLobby_Text_1B753A, 4
 	release
diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc
index 22f998d14..fab2bfbff 100644
--- a/data/scripts/secret_power_tm.inc
+++ b/data/scripts/secret_power_tm.inc
@@ -9,7 +9,7 @@ Route111_EventScript_1A3858:: @ 81A3858
 	end
 
 Route111_EventScript_1A3877:: @ 81A3877
-	giveitem_std ITEM_TM43_SECRET_POWER
+	giveitem ITEM_TM43_SECRET_POWER
 	compare VAR_RESULT, 0
 	goto_if_eq Route111_EventScript_1A38D9
 	msgbox Route111_Text_1A35C5, 4