Propagate giveitem macro

62 files changed, 124 insertions, 168 deletions

diff --git a/data/maps/CeladonCity_Condominiums_1F/scripts.inc b/data/maps/CeladonCity_Condominiums_1F/scripts.inc
index b38a82d01..88dd869b9 100644
--- a/data/maps/CeladonCity_Condominiums_1F/scripts.inc
+++ b/data/maps/CeladonCity_Condominiums_1F/scripts.inc
@@ -12,9 +12,7 @@ CeladonCity_Condominiums_1F_EventScript_16C321:: @ 816C321
 	goto_if 1, EventScript_16C36A
 	msgbox gUnknown_81960C9
 	setflag FLAG_0x2A6
-	setorcopyvar VAR_0x8000, 369
-	setorcopyvar VAR_0x8001, 1
-	callstd 0
+	giveitem ITEM_TEA
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_1A6BF9
 	msgbox gUnknown_8196109
diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc
index 1a7c21dde..f4ad8d3dc 100644
--- a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc
+++ b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc
@@ -26,7 +26,7 @@ EventScript_16C4A6:: @ 816C4A6
 	waitmessage
 	waitfanfare
 	getspeciesname 0, SPECIES_EEVEE
-	msgbox gUnknown_81A56A7, 5
+	msgbox gUnknown_81A56A7, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_16C514
 	call EventScript_1A8C27
@@ -41,7 +41,7 @@ EventScript_16C4DA:: @ 816C4DA
 	waitmessage
 	waitfanfare
 	getspeciesname 0, SPECIES_EEVEE
-	msgbox gUnknown_81A56A7, 5
+	msgbox gUnknown_81A56A7, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_16C509
 	call EventScript_1A8C33
diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc
index ea08bae0b..1128bcd80 100644
--- a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc
+++ b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc
@@ -40,7 +40,7 @@ EventScript_16BD38:: @ 816BD38
 	return
 
 EventScript_16BD3E:: @ 816BD3E
-	msgbox gUnknown_8195D22, 5
+	msgbox gUnknown_8195D22, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_16C00C
 	textcolor 3
@@ -191,9 +191,7 @@ EventScript_16BF7C:: @ 816BF7C
 	message Text_195DAD
 	waitmessage
 	waitfanfare
-	setorcopyvar VAR_0x8000, VAR_0x8009
-	setorcopyvar VAR_0x8001, 1
-	callstd 8
+	giveitem VAR_0x8009, 1, 8
 	call EventScript_1A6675
 	compare_var_to_value VAR_0x8008, 26
 	call_if 1, EventScript_16BFDE
diff --git a/data/maps/CeladonCity_GameCorner/scripts.inc b/data/maps/CeladonCity_GameCorner/scripts.inc
index 1e4761881..347c40273 100644
--- a/data/maps/CeladonCity_GameCorner/scripts.inc
+++ b/data/maps/CeladonCity_GameCorner/scripts.inc
@@ -269,7 +269,7 @@ EventScript_16C96A:: @ 816C96A
 EventScript_16C96C:: @ 816C96C
 	checkflag FLAG_0x243
 	goto_if 0, EventScript_16CAA0
-	msgbox gUnknown_8196F46, 5
+	msgbox gUnknown_8196F46, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_16C96A
 	setfieldeffectarg 0, 255
diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc
index 99fe24be1..925b4ad02 100644
--- a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc
+++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc
@@ -80,7 +80,7 @@ EventScript_16CC55:: @ 816CC55
 
 EventScript_16CC65:: @ 816CC65
 	getspeciesname 0, VAR_0x4001
-	msgbox gUnknown_819709D, 5
+	msgbox gUnknown_819709D, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_16CC10
 	checkcoins VAR_RESULT
@@ -175,7 +175,7 @@ EventScript_16CDB3:: @ 816CDB3
 	message Text_1A5DF1
 	waitmessage
 	waitfanfare
-	msgbox gUnknown_81A56A7, 5
+	msgbox gUnknown_81A56A7, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 1
 	goto_if 1, EventScript_16CD83
 	goto EventScript_16CC10
@@ -189,7 +189,7 @@ EventScript_16CDE0:: @ 816CDE0
 	message Text_1A5DF1
 	waitmessage
 	waitfanfare
-	msgbox gUnknown_81A56A7, 5
+	msgbox gUnknown_81A56A7, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_16CE12
 	call EventScript_1A8C33
@@ -271,7 +271,7 @@ EventScript_16CEF5:: @ 816CEF5
 	end
 
 EventScript_16CF09:: @ 816CF09
-	msgbox gUnknown_81970B2, 5
+	msgbox gUnknown_81970B2, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_16CC10
 	goto EventScript_16CF3F
@@ -279,7 +279,7 @@ EventScript_16CF09:: @ 816CF09
 
 EventScript_16CF22:: @ 816CF22
 	getitemname 0, VAR_0x4001
-	msgbox gUnknown_819709D, 5
+	msgbox gUnknown_819709D, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_16CC10
 	goto EventScript_16CF3F
@@ -295,9 +295,7 @@ EventScript_16CF3F:: @ 816CF3F
 	goto_if 1, EventScript_16CF79
 	takecoins VAR_0x4002
 	updatecoinsbox 0, 5
-	setorcopyvar VAR_0x8000, VAR_0x4001
-	setorcopyvar VAR_0x8001, 1
-	callstd 0
+	giveitem VAR_0x4001
 	goto EventScript_16CC10
 	end
 
diff --git a/data/maps/CeruleanCity/scripts.inc b/data/maps/CeruleanCity/scripts.inc
index 02da1e3a3..5d593cd60 100644
--- a/data/maps/CeruleanCity/scripts.inc
+++ b/data/maps/CeruleanCity/scripts.inc
@@ -64,9 +64,7 @@ EventScript_1664CC:: @ 81664CC
 	msgbox gUnknown_817ECD4
 	setvar VAR_0x4052, 1
 	setflag FLAG_0x29B
-	setorcopyvar VAR_0x8000, 363
-	setorcopyvar VAR_0x8001, 1
-	callstd 0
+	giveitem ITEM_FAME_CHECKER
 	msgbox gUnknown_817ED5D
 	closemessage
 	applymovement 8, Movement_1665FB
diff --git a/data/maps/CeruleanCity_House3/scripts.inc b/data/maps/CeruleanCity_House3/scripts.inc
index edc1c1aae..f6caa2b92 100644
--- a/data/maps/CeruleanCity_House3/scripts.inc
+++ b/data/maps/CeruleanCity_House3/scripts.inc
@@ -12,7 +12,7 @@ CeruleanCity_House3_EventScript_16A9B1:: @ 816A9B1
 	call EventScript_1A8CAD
 	checkflag FLAG_0x24A
 	goto_if 1, EventScript_16AA23
-	msgbox gUnknown_81A59FE, 5
+	msgbox gUnknown_81A59FE, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_16AA0B
 	call EventScript_1A8CBD
diff --git a/data/maps/CeruleanCity_House4/scripts.inc b/data/maps/CeruleanCity_House4/scripts.inc
index f572ed04f..a4c0b74e3 100644
--- a/data/maps/CeruleanCity_House4/scripts.inc
+++ b/data/maps/CeruleanCity_House4/scripts.inc
@@ -33,9 +33,7 @@ EventScript_16AD59:: @ 816AD59
 EventScript_16AD63:: @ 816AD63
 	call EventScript_16AE23
 	msgbox gUnknown_8192B43
-	setorcopyvar VAR_0x8000, VAR_0x8008
-	setorcopyvar VAR_0x8001, 1
-	callstd 0
+	giveitem VAR_0x8008
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_16AE45
 	release
@@ -44,9 +42,7 @@ EventScript_16AD63:: @ 816AD63
 EventScript_16AD89:: @ 816AD89
 	call EventScript_16AE23
 	msgbox gUnknown_8192C07
-	setorcopyvar VAR_0x8000, VAR_0x8008
-	setorcopyvar VAR_0x8001, 4
-	callstd 0
+	giveitem VAR_0x8008, 4
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_16AE45
 	release
@@ -62,9 +58,7 @@ EventScript_16ADAF:: @ 816ADAF
 EventScript_16ADC3:: @ 816ADC3
 	call EventScript_16AE23
 	msgbox gUnknown_8192D4B
-	setorcopyvar VAR_0x8000, VAR_0x8008
-	setorcopyvar VAR_0x8001, 1
-	callstd 0
+	giveitem VAR_0x8008
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_16AE45
 	release
@@ -73,9 +67,7 @@ EventScript_16ADC3:: @ 816ADC3
 EventScript_16ADE9:: @ 816ADE9
 	call EventScript_16AE23
 	msgbox gUnknown_8192DE3
-	setorcopyvar VAR_0x8000, VAR_0x8008
-	setorcopyvar VAR_0x8001, 4
-	callstd 0
+	giveitem VAR_0x8008, 4
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_16AE45
 	release
diff --git a/data/maps/CeruleanCity_House5/scripts.inc b/data/maps/CeruleanCity_House5/scripts.inc
index 762b36ec9..8bf244f7d 100644
--- a/data/maps/CeruleanCity_House5/scripts.inc
+++ b/data/maps/CeruleanCity_House5/scripts.inc
@@ -6,16 +6,14 @@ CeruleanCity_House5_EventScript_16AE50:: @ 816AE50
 	faceplayer
 	checkflag FLAG_0x2BB
 	goto_if 1, EventScript_16AEB7
-	msgbox gUnknown_8192F67, 5
+	msgbox gUnknown_8192F67, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_16AEAD
 	checkflag FLAG_0x847
 	goto_if 0, EventScript_16AEA3
 	msgbox gUnknown_8193003
 	setflag FLAG_0x2BB
-	setorcopyvar VAR_0x8000, 372
-	setorcopyvar VAR_0x8001, 1
-	callstd 0
+	giveitem ITEM_POWDER_JAR
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_1A6BF9
 	msgbox gUnknown_8193033
@@ -157,22 +155,20 @@ EventScript_16B048:: @ 816B048
 	end
 
 EventScript_16B055:: @ 816B055
-	msgbox gUnknown_819331E, 5
+	msgbox gUnknown_819331E, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_16AEC8
 	copyvar VAR_0x8004, VAR_0x8009
 	specialvar VAR_RESULT, sub_815EEB0
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_16B0CC
-	setorcopyvar VAR_0x8000, VAR_0x8008
-	setorcopyvar VAR_0x8001, 1
-	callstd 0
+	giveitem VAR_0x8008
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_16B0BF
 	copyvar VAR_0x8004, VAR_0x8009
 	special sub_815EF5C
 	special sub_815F070
-	msgbox gUnknown_819337A, 5
+	msgbox gUnknown_819337A, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 1
 	goto_if 1, EventScript_16AEC8
 	msgbox gUnknown_81933FB
diff --git a/data/maps/CinnabarIsland/scripts.inc b/data/maps/CinnabarIsland/scripts.inc
index eea34942a..328a34bcb 100644
--- a/data/maps/CinnabarIsland/scripts.inc
+++ b/data/maps/CinnabarIsland/scripts.inc
@@ -107,7 +107,7 @@ EventScript_166FCD:: @ 8166FCD
 	checkflag FLAG_0x002
 	call_if 1, EventScript_167053
 	msgbox gUnknown_8180C90
-	msgbox gUnknown_8180CAA, 5
+	msgbox gUnknown_8180CAA, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 1
 	goto_if 1, EventScript_167068
 	compare_var_to_value VAR_RESULT, 0
diff --git a/data/maps/CinnabarIsland_Gym/scripts.inc b/data/maps/CinnabarIsland_Gym/scripts.inc
index 916966683..6e4431f87 100644
--- a/data/maps/CinnabarIsland_Gym/scripts.inc
+++ b/data/maps/CinnabarIsland_Gym/scripts.inc
@@ -233,7 +233,7 @@ CinnabarIsland_Gym_EventScript_16DBF4:: @ 816DBF4
 
 EventScript_16DC00:: @ 816DC00
 	msgbox gUnknown_8199C9F
-	msgbox gUnknown_8199D5A, 5
+	msgbox gUnknown_8199D5A, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 1
 	goto_if 1, EventScript_16DC43
 	compare_var_to_value VAR_RESULT, 0
@@ -330,7 +330,7 @@ CinnabarIsland_Gym_EventScript_16DCE9:: @ 816DCE9
 
 EventScript_16DCF5:: @ 816DCF5
 	msgbox gUnknown_8199C9F
-	msgbox gUnknown_8199D79, 5
+	msgbox gUnknown_8199D79, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 1
 	goto_if 1, EventScript_16DD41
 	compare_var_to_value VAR_RESULT, 0
@@ -418,7 +418,7 @@ CinnabarIsland_Gym_EventScript_16DDC7:: @ 816DDC7
 
 EventScript_16DDD3:: @ 816DDD3
 	msgbox gUnknown_8199C9F
-	msgbox gUnknown_8199DA9, 5
+	msgbox gUnknown_8199DA9, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 1
 	goto_if 1, EventScript_16DE1F
 	compare_var_to_value VAR_RESULT, 0
@@ -497,7 +497,7 @@ CinnabarIsland_Gym_EventScript_16DE9E:: @ 816DE9E
 
 EventScript_16DEAA:: @ 816DEAA
 	msgbox gUnknown_8199C9F
-	msgbox gUnknown_8199DC6, 5
+	msgbox gUnknown_8199DC6, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 1
 	goto_if 1, EventScript_16DEF6
 	compare_var_to_value VAR_RESULT, 0
@@ -576,7 +576,7 @@ CinnabarIsland_Gym_EventScript_16DF75:: @ 816DF75
 
 EventScript_16DF81:: @ 816DF81
 	msgbox gUnknown_8199C9F
-	msgbox gUnknown_8199E00, 5
+	msgbox gUnknown_8199E00, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 1
 	goto_if 1, EventScript_16DFA8
 	compare_var_to_value VAR_RESULT, 0
@@ -655,7 +655,7 @@ CinnabarIsland_Gym_EventScript_16E04C:: @ 816E04C
 
 EventScript_16E058:: @ 816E058
 	msgbox gUnknown_8199C9F
-	msgbox gUnknown_8199E36, 5
+	msgbox gUnknown_8199E36, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 1
 	goto_if 1, EventScript_16E0A4
 	compare_var_to_value VAR_RESULT, 0
diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc
index cd9529936..0323e4fe4 100644
--- a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc
+++ b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc
@@ -29,7 +29,7 @@ CinnabarIsland_PokemonCenter_1F_EventScript_16E901:: @ 816E901
 CinnabarIsland_PokemonCenter_1F_EventScript_16E90A:: @ 816E90A
 	lock
 	faceplayer
-	msgbox gUnknown_819A725, 5
+	msgbox gUnknown_819A725, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_16E9A5
 	msgbox gUnknown_819A785
diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc
index e7e540df9..a615d299f 100644
--- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc
+++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc
@@ -8,7 +8,7 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E401:: @ 816E401
 	call EventScript_1A8CAD
 	checkflag FLAG_0x276
 	goto_if 1, EventScript_16E473
-	msgbox gUnknown_81A597B, 5
+	msgbox gUnknown_81A597B, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_16E45B
 	call EventScript_1A8CBD
@@ -171,7 +171,7 @@ EventScript_16E631:: @ 816E631
 EventScript_16E668:: @ 816E668
 	getspeciesname 0, SPECIES_OMANYTE
 	getitemname 1, ITEM_HELIX_FOSSIL
-	msgbox gUnknown_819A3D4, 5
+	msgbox gUnknown_819A3D4, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_16E722
 	msgbox gUnknown_819A45D
@@ -186,7 +186,7 @@ EventScript_16E668:: @ 816E668
 EventScript_16E6A6:: @ 816E6A6
 	getspeciesname 0, SPECIES_KABUTO
 	getitemname 1, ITEM_DOME_FOSSIL
-	msgbox gUnknown_819A3D4, 5
+	msgbox gUnknown_819A3D4, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_16E722
 	msgbox gUnknown_819A45D
@@ -201,7 +201,7 @@ EventScript_16E6A6:: @ 816E6A6
 EventScript_16E6E4:: @ 816E6E4
 	getspeciesname 0, SPECIES_AERODACTYL
 	getitemname 1, ITEM_OLD_AMBER
-	msgbox gUnknown_819A3D4, 5
+	msgbox gUnknown_819A3D4, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_16E722
 	msgbox gUnknown_819A45D
@@ -281,7 +281,7 @@ EventScript_16E827:: @ 816E827
 	waitmessage
 	waitfanfare
 	setvar VAR_0x406A, 0
-	msgbox gUnknown_81A56A7, 5
+	msgbox gUnknown_81A56A7, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_16E895
 	call EventScript_1A8C27
@@ -296,7 +296,7 @@ EventScript_16E85B:: @ 816E85B
 	waitmessage
 	waitfanfare
 	setvar VAR_0x406A, 0
-	msgbox gUnknown_81A56A7, 5
+	msgbox gUnknown_81A56A7, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_16E88A
 	call EventScript_1A8C33
diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc
index b7721a77a..9d6494e31 100644
--- a/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc
+++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc
@@ -12,7 +12,7 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E2C2:: @ 816E2C2
 	call EventScript_1A8CAD
 	checkflag FLAG_0x274
 	goto_if 1, EventScript_16E334
-	msgbox gUnknown_81A59FE, 5
+	msgbox gUnknown_81A59FE, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_16E31C
 	call EventScript_1A8CBD
@@ -52,7 +52,7 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E33E:: @ 816E33E
 	copyvar VAR_0x8009, VAR_RESULT
 	checkflag FLAG_0x275
 	goto_if 1, EventScript_16E3D4
-	msgbox gUnknown_81A5AD6, 5
+	msgbox gUnknown_81A5AD6, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_16E3BC
 	special sub_80BF8FC
diff --git a/data/maps/FiveIsland_MemorialPillar/scripts.inc b/data/maps/FiveIsland_MemorialPillar/scripts.inc
index 1435ba64b..ef3ff4ef5 100644
--- a/data/maps/FiveIsland_MemorialPillar/scripts.inc
+++ b/data/maps/FiveIsland_MemorialPillar/scripts.inc
@@ -26,9 +26,7 @@ EventScript_168A18:: @ 8168A18
 
 EventScript_168A22:: @ 8168A22
 	msgbox gUnknown_818B282
-	setorcopyvar VAR_0x8000, 330
-	setorcopyvar VAR_0x8001, 1
-	callstd 0
+	giveitem ITEM_TM42
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_168AFE
 	call EventScript_168AE8
@@ -53,7 +51,7 @@ FiveIsland_MemorialPillar_EventScript_168A48:: @ 8168A48
 	end
 
 EventScript_168A86:: @ 8168A86
-	msgbox gUnknown_818B105, 5
+	msgbox gUnknown_818B105, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 1
 	goto_if 1, EventScript_168A9B
 	releaseall
@@ -70,9 +68,7 @@ EventScript_168A9B:: @ 8168A9B
 	waitmovement 0
 	textcolor 0
 	msgbox gUnknown_818B171
-	setorcopyvar VAR_0x8000, 330
-	setorcopyvar VAR_0x8001, 1
-	callstd 0
+	giveitem ITEM_TM42
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_168AFE
 	call EventScript_168AE8
diff --git a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc
index 76f62155e..ccdc69d54 100644
--- a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc
+++ b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc
@@ -62,9 +62,7 @@ EventScript_171F34:: @ 8171F34
 	call_if 1, EventScript_17201A
 	moveobjectoffscreen 2
 	msgbox gUnknown_81A458E
-	setorcopyvar VAR_0x8000, VAR_0x403B
-	setorcopyvar VAR_0x8001, 1
-	callstd 0
+	giveitem VAR_0x403B
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_172025
 	setflag FLAG_0x002
diff --git a/data/maps/FiveIsland_RocketWarehouse/scripts.inc b/data/maps/FiveIsland_RocketWarehouse/scripts.inc
index ebb3c17e2..f59cc2838 100644
--- a/data/maps/FiveIsland_RocketWarehouse/scripts.inc
+++ b/data/maps/FiveIsland_RocketWarehouse/scripts.inc
@@ -59,9 +59,7 @@ EventScript_163FB7:: @ 8163FB7
 EventScript_163FCD:: @ 8163FCD
 	msgbox gUnknown_817BC6C
 	setflag FLAG_0x2DC
-	setorcopyvar VAR_0x8000, 374
-	setorcopyvar VAR_0x8001, 1
-	callstd 0
+	giveitem ITEM_SAPPHIRE
 	release
 	end
 
diff --git a/data/maps/FourIsland/scripts.inc b/data/maps/FourIsland/scripts.inc
index 95876c737..4c54e61a4 100644
--- a/data/maps/FourIsland/scripts.inc
+++ b/data/maps/FourIsland/scripts.inc
@@ -90,10 +90,10 @@ FourIsland_EventScript_167D55:: @ 8167D55
 	end
 
 EventScript_167D9B:: @ 8167D9B
-	msgbox gUnknown_81BF5E3, 5
+	msgbox gUnknown_81BF5E3, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 1
 	goto_if 1, EventScript_167DD1
-	msgbox gUnknown_81BF7B6, 5
+	msgbox gUnknown_81BF7B6, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 1
 	goto_if 1, EventScript_167DD1
 	msgbox gUnknown_81BF6CF
diff --git a/data/maps/FourIsland_PokemonDayCare/scripts.inc b/data/maps/FourIsland_PokemonDayCare/scripts.inc
index 0f9b98916..a968b6b9a 100644
--- a/data/maps/FourIsland_PokemonDayCare/scripts.inc
+++ b/data/maps/FourIsland_PokemonDayCare/scripts.inc
@@ -14,7 +14,7 @@ FourIsland_PokemonDayCare_EventScript_171940:: @ 8171940
 	goto_if 1, EventScript_171A52
 	compare_var_to_value VAR_RESULT, 3
 	goto_if 1, EventScript_171B86
-	msgbox gUnknown_81BF7E4, 5
+	msgbox gUnknown_81BF7E4, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 1
 	goto_if 1, EventScript_171993
 	msgbox gUnknown_81BF916
@@ -53,7 +53,7 @@ EventScript_1719F7:: @ 81719F7
 	end
 
 EventScript_171A01:: @ 8171A01
-	msgbox gUnknown_81BF89F, 5
+	msgbox gUnknown_81BF89F, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 1
 	goto_if 1, EventScript_171993
 	goto EventScript_1719F7
@@ -88,10 +88,10 @@ EventScript_171A52:: @ 8171A52
 	msgbox gUnknown_81BF988
 	setvar VAR_0x8004, 0
 	call EventScript_171A41
-	msgbox gUnknown_81BF89F, 5
+	msgbox gUnknown_81BF89F, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 1
 	goto_if 1, EventScript_171993
-	msgbox gUnknown_81BFAE8, 5
+	msgbox gUnknown_81BFAE8, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 1
 	goto_if 1, EventScript_171A90
 	goto EventScript_1719F7
@@ -115,7 +115,7 @@ EventScript_171A90:: @ 8171A90
 
 EventScript_171ACF:: @ 8171ACF
 	special GetDaycareCost
-	msgbox gUnknown_81BFA3B, 5
+	msgbox gUnknown_81BFA3B, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 1
 	goto_if 1, EventScript_171AEB
 	goto EventScript_1719F7
@@ -149,7 +149,7 @@ EventScript_171B05:: @ 8171B05
 	end
 
 EventScript_171B4E:: @ 8171B4E
-	msgbox gUnknown_81BF94F, 5
+	msgbox gUnknown_81BF94F, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 1
 	goto_if 1, EventScript_171A90
 	goto EventScript_1719F7
@@ -191,7 +191,7 @@ EventScript_171B86:: @ 8171B86
 	call EventScript_171A41
 	setvar VAR_0x8004, 1
 	call EventScript_171A41
-	msgbox gUnknown_81BFAE8, 5
+	msgbox gUnknown_81BFAE8, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 1
 	goto_if 1, EventScript_171A90
 	msgbox gUnknown_81BF976
diff --git a/data/maps/FuchsiaCity_Building1/scripts.inc b/data/maps/FuchsiaCity_Building1/scripts.inc
index b40aa2620..6092301c9 100644
--- a/data/maps/FuchsiaCity_Building1/scripts.inc
+++ b/data/maps/FuchsiaCity_Building1/scripts.inc
@@ -8,7 +8,7 @@ FuchsiaCity_Building1_EventScript_16D74C:: @ 816D74C
 	goto_if 1, EventScript_16D7FA
 	checkflag FLAG_0x189
 	goto_if 1, EventScript_16D780
-	msgbox gUnknown_8198DF9, 5
+	msgbox gUnknown_8198DF9, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 1
 	call_if 1, EventScript_16D7E8
 	compare_var_to_value VAR_RESULT, 0
diff --git a/data/maps/FuchsiaCity_House2/scripts.inc b/data/maps/FuchsiaCity_House2/scripts.inc
index 3fff1a500..ac6e74297 100644
--- a/data/maps/FuchsiaCity_House2/scripts.inc
+++ b/data/maps/FuchsiaCity_House2/scripts.inc
@@ -6,7 +6,7 @@ FuchsiaCity_House2_EventScript_16D817:: @ 816D817
 	faceplayer
 	checkflag FLAG_0x244
 	goto_if 1, EventScript_16D83F
-	msgbox gUnknown_819918E, 5
+	msgbox gUnknown_819918E, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 1
 	goto_if 1, EventScript_16D849
 	msgbox gUnknown_8199337
diff --git a/data/maps/FuchsiaCity_House3/scripts.inc b/data/maps/FuchsiaCity_House3/scripts.inc
index 0fafd5bd0..500a45ac8 100644
--- a/data/maps/FuchsiaCity_House3/scripts.inc
+++ b/data/maps/FuchsiaCity_House3/scripts.inc
@@ -4,7 +4,7 @@ FuchsiaCity_House3_MapScripts:: @ 816D894
 FuchsiaCity_House3_EventScript_16D895:: @ 816D895
 	lock
 	faceplayer
-	msgbox gUnknown_81993B9, 5
+	msgbox gUnknown_81993B9, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 1
 	goto_if 1, EventScript_16D8B0
 	goto EventScript_16D941
@@ -29,7 +29,7 @@ EventScript_16D8B0:: @ 816D8B0
 	compare_var_to_value VAR_0x8005, 4
 	goto_if 1, EventScript_16D8B0
 	special ScrSpecial_GetPokemonNicknameAndMoveName
-	msgbox gUnknown_8199485, 5
+	msgbox gUnknown_8199485, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 1
 	goto_if 1, EventScript_16D919
 	goto EventScript_16D941
diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc
index 1f721cc96..08267468a 100644
--- a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc
+++ b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc
@@ -37,7 +37,7 @@ EventScript_16D2F2:: @ 816D2F2
 EventScript_16D312:: @ 816D312
 	lockall
 	textcolor 0
-	msgbox gUnknown_8197E1A, 5
+	msgbox gUnknown_8197E1A, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_16D345
 	msgbox gUnknown_8197E48
@@ -101,7 +101,7 @@ EventScript_16D391:: @ 816D391
 	applymovement 255, Movement_1A75EB
 	waitmovement 0
 	showmoneybox 0, 0, 0
-	msgbox gUnknown_8197C87, 5
+	msgbox gUnknown_8197C87, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 1
 	goto_if 1, EventScript_16D3CA
 	msgbox gUnknown_8197DE9
@@ -203,7 +203,7 @@ Movement_16D4B3:: @ 816D4B3
 FuchsiaCity_SafariZone_Entrance_EventScript_16D4B7:: @ 816D4B7
 	lock
 	faceplayer
-	msgbox gUnknown_8197EB0, 5
+	msgbox gUnknown_8197EB0, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 1
 	goto_if 1, EventScript_16D4D6
 	msgbox gUnknown_819809E
diff --git a/data/maps/LavenderTown/scripts.inc b/data/maps/LavenderTown/scripts.inc
index c582a18ae..1329fe26b 100644
--- a/data/maps/LavenderTown/scripts.inc
+++ b/data/maps/LavenderTown/scripts.inc
@@ -11,7 +11,7 @@ LavenderTown_MapScript1_166871:: @ 8166871
 LavenderTown_EventScript_16687D:: @ 816687D
 	lock
 	faceplayer
-	msgbox gUnknown_817F52E, 5
+	msgbox gUnknown_817F52E, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 1
 	goto_if 1, EventScript_16689C
 	msgbox gUnknown_817F568
diff --git a/data/maps/LavenderTown_House2/scripts.inc b/data/maps/LavenderTown_House2/scripts.inc
index 9074d2612..9d293b3a3 100644
--- a/data/maps/LavenderTown_House2/scripts.inc
+++ b/data/maps/LavenderTown_House2/scripts.inc
@@ -4,7 +4,7 @@ LavenderTown_House2_MapScripts:: @ 816B265
 LavenderTown_House2_EventScript_16B266:: @ 816B266
 	lock
 	faceplayer
-	msgbox gUnknown_8193A4B, 5
+	msgbox gUnknown_8193A4B, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 1
 	goto_if 1, EventScript_16B287
 	compare_var_to_value VAR_RESULT, 0
@@ -38,7 +38,7 @@ EventScript_16B2B4:: @ 816B2B4
 	special TV_CopyNicknameToStringVar1AndEnsureTerminated
 	compare_var_to_value VAR_RESULT, 1
 	goto_if 1, EventScript_16B311
-	msgbox gUnknown_8193AD2, 5
+	msgbox gUnknown_8193AD2, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 1
 	goto_if 1, EventScript_16B31B
 	compare_var_to_value VAR_RESULT, 0
diff --git a/data/maps/MtMoon_B2F/scripts.inc b/data/maps/MtMoon_B2F/scripts.inc
index 8c5e073f5..71c14d647 100644
--- a/data/maps/MtMoon_B2F/scripts.inc
+++ b/data/maps/MtMoon_B2F/scripts.inc
@@ -56,7 +56,7 @@ EventScript_160711:: @ 8160711
 MtMoon_B2F_EventScript_16071B:: @ 816071B
 	lock
 	faceplayer
-	msgbox gUnknown_8172E77, 5
+	msgbox gUnknown_8172E77, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_1607DE
 	removeobject 1
@@ -89,7 +89,7 @@ Movement_16077A:: @ 816077A
 MtMoon_B2F_EventScript_16077F:: @ 816077F
 	lock
 	faceplayer
-	msgbox gUnknown_8172E94, 5
+	msgbox gUnknown_8172E94, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_1607DE
 	removeobject 2
diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc b/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc
index 0ef1ce25c..cf597a732 100644
--- a/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc
+++ b/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc
@@ -33,9 +33,7 @@ OneIsland_KindleRoad_EmberSpa_EventScript_165399:: @ 8165399
 	checkflag FLAG_0x2EF
 	goto_if 1, EventScript_1653C5
 	msgbox gUnknown_817D622
-	setorcopyvar VAR_0x8000, 344
-	setorcopyvar VAR_0x8001, 1
-	callstd 0
+	giveitem ITEM_HM06
 	setflag FLAG_0x2EF
 	msgbox gUnknown_817D6F3
 	release
diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc
index d34f6c7c4..15bfb7e4d 100644
--- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc
+++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc
@@ -329,14 +329,14 @@ EventScript_171044:: @ 8171044
 	delay 30
 	applymovement 3, Movement_1A75E1
 	waitmovement 0
-	msgbox gUnknown_81A19AA, 5
+	msgbox gUnknown_81A19AA, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_171099
 	goto EventScript_1710B2
 	end
 
 EventScript_171099:: @ 8171099
-	msgbox gUnknown_81A1A08, 5
+	msgbox gUnknown_81A1A08, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_171099
 	goto EventScript_1710B2
diff --git a/data/maps/PalletTown_GarysHouse/scripts.inc b/data/maps/PalletTown_GarysHouse/scripts.inc
index fc6e0fac6..fdfd8dee8 100644
--- a/data/maps/PalletTown_GarysHouse/scripts.inc
+++ b/data/maps/PalletTown_GarysHouse/scripts.inc
@@ -53,7 +53,7 @@ EventScript_168DB9:: @ 8168DB9
 	special sub_8112364
 	compare_var_to_value VAR_MIRAGE_RND_L, 500
 	goto_if 0, EventScript_168E46
-	msgbox gUnknown_818D7D3, 5
+	msgbox gUnknown_818D7D3, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_168E3C
 	msgbox gUnknown_818D8B2
diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc
index f147fd390..e095287b8 100644
--- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc
+++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc
@@ -1172,7 +1172,7 @@ EventScript_169BE1:: @ 8169BE1
 	end
 
 EventScript_169C14:: @ 8169C14
-	msgbox gUnknown_818E272, 5
+	msgbox gUnknown_818E272, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 1
 	goto_if 1, EventScript_169C74
 	compare_var_to_value VAR_RESULT, 0
@@ -1180,7 +1180,7 @@ EventScript_169C14:: @ 8169C14
 	end
 
 EventScript_169C33:: @ 8169C33
-	msgbox gUnknown_818E207, 5
+	msgbox gUnknown_818E207, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 1
 	goto_if 1, EventScript_169C74
 	compare_var_to_value VAR_RESULT, 0
@@ -1188,7 +1188,7 @@ EventScript_169C33:: @ 8169C33
 	end
 
 EventScript_169C52:: @ 8169C52
-	msgbox gUnknown_818E194, 5
+	msgbox gUnknown_818E194, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 1
 	goto_if 1, EventScript_169C74
 	compare_var_to_value VAR_RESULT, 0
@@ -1214,7 +1214,7 @@ EventScript_169C74:: @ 8169C74
 	waitmessage
 	playfanfare BGM_FRLG_ME_KEYITEM
 	waitfanfare
-	msgbox gUnknown_81A56A7, 5
+	msgbox gUnknown_81A56A7, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 1
 	goto_if 1, EventScript_169CCC
 	compare_var_to_value VAR_RESULT, 0
diff --git a/data/maps/PewterCity/scripts.inc b/data/maps/PewterCity/scripts.inc
index bdd501867..9c8e7bb8e 100644
--- a/data/maps/PewterCity/scripts.inc
+++ b/data/maps/PewterCity/scripts.inc
@@ -1031,7 +1031,7 @@ PewterCity_EventScript_166075:: @ 8166075
 PewterCity_EventScript_16607E:: @ 816607E
 	lock
 	faceplayer
-	msgbox gUnknown_817E53E, 5
+	msgbox gUnknown_817E53E, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 1
 	goto_if 1, EventScript_166136
 	msgbox gUnknown_817E589
@@ -1352,7 +1352,7 @@ PewterCity_EventScript_16622B:: @ 816622B
 PewterCity_EventScript_166244:: @ 8166244
 	lock
 	faceplayer
-	msgbox gUnknown_817E602, 5
+	msgbox gUnknown_817E602, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 1
 	goto_if 1, EventScript_166263
 	msgbox gUnknown_817E644
diff --git a/data/maps/PewterCity_Gym/scripts.inc b/data/maps/PewterCity_Gym/scripts.inc
index 730363a53..af2f707b3 100644
--- a/data/maps/PewterCity_Gym/scripts.inc
+++ b/data/maps/PewterCity_Gym/scripts.inc
@@ -53,7 +53,7 @@ PewterCity_Gym_EventScript_16A655:: @ 816A655
 	faceplayer
 	checkflag FLAG_0x4B0
 	goto_if 1, EventScript_16A67F
-	msgbox gUnknown_8191298, 5
+	msgbox gUnknown_8191298, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 1
 	goto_if 1, EventScript_16A689
 	compare_var_to_value VAR_RESULT, 0
diff --git a/data/maps/PewterCity_Museum_1F/scripts.inc b/data/maps/PewterCity_Museum_1F/scripts.inc
index ff718e206..f5f8d5887 100644
--- a/data/maps/PewterCity_Museum_1F/scripts.inc
+++ b/data/maps/PewterCity_Museum_1F/scripts.inc
@@ -15,7 +15,7 @@ PewterCity_Museum_1F_EventScript_16A31B:: @ 816A31B
 	end
 
 EventScript_16A348:: @ 816A348
-	msgbox gUnknown_8190550, 5
+	msgbox gUnknown_8190550, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 1
 	goto_if 1, EventScript_16A367
 	compare_var_to_value VAR_RESULT, 0
@@ -63,7 +63,7 @@ PewterCity_Museum_1F_EventScript_16A3BB:: @ 816A3BB
 EventScript_16A3D1:: @ 816A3D1
 	textcolor 0
 	showmoneybox 0, 0, 0
-	msgbox gUnknown_81904B5, 5
+	msgbox gUnknown_81904B5, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 1
 	goto_if 1, EventScript_16A402
 	msgbox gUnknown_81904F9
diff --git a/data/maps/RocketHideout_B4F/scripts.inc b/data/maps/RocketHideout_B4F/scripts.inc
index c382cb9b8..d492212dd 100644
--- a/data/maps/RocketHideout_B4F/scripts.inc
+++ b/data/maps/RocketHideout_B4F/scripts.inc
@@ -45,9 +45,7 @@ RocketHideout_B4F_EventScript_161363:: @ 8161363
 	lock
 	faceplayer
 	removeobject 2
-	setorcopyvar VAR_0x8000, 359
-	setorcopyvar VAR_0x8001, 1
-	callstd 0
+	giveitem ITEM_SILPH_SCOPE
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_1A6BF9
 	release
@@ -71,9 +69,7 @@ RocketHideout_B4F_EventScript_1613AD:: @ 81613AD
 	faceplayer
 	setflag FLAG_0x2A5
 	removeobject 4
-	setorcopyvar VAR_0x8000, 356
-	setorcopyvar VAR_0x8001, 1
-	callstd 0
+	giveitem ITEM_LIFT_KEY
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_1A6BF9
 	release
diff --git a/data/maps/Route10_PokemonCenter_1F/scripts.inc b/data/maps/Route10_PokemonCenter_1F/scripts.inc
index eccf94ec5..819902f19 100644
--- a/data/maps/Route10_PokemonCenter_1F/scripts.inc
+++ b/data/maps/Route10_PokemonCenter_1F/scripts.inc
@@ -33,7 +33,7 @@ Route10_PokemonCenter_1F_EventScript_16FC65:: @ 816FC65
 	call EventScript_16FCF1
 	checkflag FLAG_0x2FA
 	goto_if 1, EventScript_16FCE7
-	msgbox gUnknown_819E5FB, 5
+	msgbox gUnknown_819E5FB, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_1A7AD1
 	setvar VAR_0x8004, 0
diff --git a/data/maps/Route11_EastEntrance_2F/scripts.inc b/data/maps/Route11_EastEntrance_2F/scripts.inc
index 459c6dc84..f2d8e7f26 100644
--- a/data/maps/Route11_EastEntrance_2F/scripts.inc
+++ b/data/maps/Route11_EastEntrance_2F/scripts.inc
@@ -25,7 +25,7 @@ Route11_EastEntrance_2F_EventScript_16FD5C:: @ 816FD5C
 	call EventScript_1A8CAD
 	checkflag FLAG_0x251
 	goto_if 1, EventScript_16FDCE
-	msgbox gUnknown_81A597B, 5
+	msgbox gUnknown_81A597B, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_16FDB6
 	call EventScript_1A8CBD
@@ -62,7 +62,7 @@ Route11_EastEntrance_2F_EventScript_16FDD8:: @ 816FDD8
 	call EventScript_16FE64
 	checkflag FLAG_0x252
 	goto_if 1, EventScript_16FE5A
-	msgbox gUnknown_819E9E5, 5
+	msgbox gUnknown_819E9E5, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_1A7AD1
 	setvar VAR_0x8004, 0
diff --git a/data/maps/Route12/scripts.inc b/data/maps/Route12/scripts.inc
index 89be5b2df..64fb7b75f 100644
--- a/data/maps/Route12/scripts.inc
+++ b/data/maps/Route12/scripts.inc
@@ -20,7 +20,7 @@ Route12_EventScript_168014:: @ 8168014
 	compare_var_to_value VAR_RESULT, 2
 	goto_if 1, EventScript_1A7AE0
 	special sub_8112364
-	msgbox gUnknown_81853CC, 5
+	msgbox gUnknown_81853CC, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_16808D
 	call EventScript_1A924B
diff --git a/data/maps/Route12_FishingHouse/scripts.inc b/data/maps/Route12_FishingHouse/scripts.inc
index d7738d383..a01c88061 100644
--- a/data/maps/Route12_FishingHouse/scripts.inc
+++ b/data/maps/Route12_FishingHouse/scripts.inc
@@ -6,7 +6,7 @@ Route12_FishingHouse_EventScript_16FF0C:: @ 816FF0C
 	faceplayer
 	checkflag FLAG_0x255
 	goto_if 1, EventScript_16FF7F
-	msgbox gUnknown_819EFE0, 5
+	msgbox gUnknown_819EFE0, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 1
 	goto_if 1, EventScript_16FF34
 	msgbox gUnknown_819F1FA
@@ -89,9 +89,7 @@ EventScript_17001E:: @ 817001E
 EventScript_170031:: @ 8170031
 	setflag FLAG_0x29C
 	msgbox gUnknown_819F31B
-	setorcopyvar VAR_0x8000, 6
-	setorcopyvar VAR_0x8001, 1
-	callstd 0
+	giveitem ITEM_NET_BALL
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_17005D
 	msgbox gUnknown_819F395
diff --git a/data/maps/Route15_WestEntrance_2F/scripts.inc b/data/maps/Route15_WestEntrance_2F/scripts.inc
index 293349f28..4bab5d4ea 100644
--- a/data/maps/Route15_WestEntrance_2F/scripts.inc
+++ b/data/maps/Route15_WestEntrance_2F/scripts.inc
@@ -23,7 +23,7 @@ Route15_WestEntrance_2F_EventScript_1700B9:: @ 81700B9
 	call EventScript_170145
 	checkflag FLAG_0x256
 	goto_if 1, EventScript_17013B
-	msgbox gUnknown_819F5AB, 5
+	msgbox gUnknown_819F5AB, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_1A7AD1
 	setvar VAR_0x8004, 0
diff --git a/data/maps/Route16/scripts.inc b/data/maps/Route16/scripts.inc
index 42d8089fa..dba835410 100644
--- a/data/maps/Route16/scripts.inc
+++ b/data/maps/Route16/scripts.inc
@@ -39,7 +39,7 @@ Route16_EventScript_168121:: @ 8168121
 	compare_var_to_value VAR_RESULT, 2
 	goto_if 1, EventScript_1A7AE0
 	special sub_8112364
-	msgbox gUnknown_81853CC, 5
+	msgbox gUnknown_81853CC, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_168197
 	call EventScript_1A924B
diff --git a/data/maps/Route16_NorthEntrance_2F/scripts.inc b/data/maps/Route16_NorthEntrance_2F/scripts.inc
index 02d12c228..676358b5f 100644
--- a/data/maps/Route16_NorthEntrance_2F/scripts.inc
+++ b/data/maps/Route16_NorthEntrance_2F/scripts.inc
@@ -23,7 +23,7 @@ Route16_NorthEntrance_2F_EventScript_1702E3:: @ 81702E3
 	call EventScript_17036F
 	checkflag FLAG_0x2FD
 	goto_if 1, EventScript_170365
-	msgbox gUnknown_819FB0E, 5
+	msgbox gUnknown_819FB0E, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_1A7AD1
 	setvar VAR_0x8004, 0
diff --git a/data/maps/Route18_EastEntrance_2F/scripts.inc b/data/maps/Route18_EastEntrance_2F/scripts.inc
index 5d15da418..6b516576c 100644
--- a/data/maps/Route18_EastEntrance_2F/scripts.inc
+++ b/data/maps/Route18_EastEntrance_2F/scripts.inc
@@ -16,7 +16,7 @@ Route18_EastEntrance_2F_EventScript_17047E:: @ 817047E
 	call EventScript_1A8CAD
 	checkflag FLAG_0x257
 	goto_if 1, EventScript_1704F0
-	msgbox gUnknown_81A597B, 5
+	msgbox gUnknown_81A597B, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_1704D8
 	call EventScript_1A8CBD
diff --git a/data/maps/Route25_SeaCottage/scripts.inc b/data/maps/Route25_SeaCottage/scripts.inc
index 791fa829a..cffcdfd84 100644
--- a/data/maps/Route25_SeaCottage/scripts.inc
+++ b/data/maps/Route25_SeaCottage/scripts.inc
@@ -35,12 +35,12 @@ Route25_SeaCottage_EventScript_17054B:: @ 817054B
 	end
 
 EventScript_170580:: @ 8170580
-	msgbox gUnknown_819FDFA, 5
+	msgbox gUnknown_819FDFA, MSGBOX_YESNO
 	goto EventScript_17059C
 	end
 
 EventScript_17058E:: @ 817058E
-	msgbox gUnknown_819FEE6, 5
+	msgbox gUnknown_819FEE6, MSGBOX_YESNO
 	goto EventScript_17059C
 	end
 
diff --git a/data/maps/Route2_EastBuilding/scripts.inc b/data/maps/Route2_EastBuilding/scripts.inc
index 37bb5121c..21b6f9193 100644
--- a/data/maps/Route2_EastBuilding/scripts.inc
+++ b/data/maps/Route2_EastBuilding/scripts.inc
@@ -7,7 +7,7 @@ Route2_EastBuilding_EventScript_16F67F:: @ 816F67F
 	call EventScript_16F70B
 	checkflag FLAG_0x23B
 	goto_if 1, EventScript_16F701
-	msgbox gUnknown_819D64F, 5
+	msgbox gUnknown_819D64F, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_1A7AD1
 	setvar VAR_0x8004, 0
diff --git a/data/maps/Route2_House/scripts.inc b/data/maps/Route2_House/scripts.inc
index 00b0c27eb..8d064c68c 100644
--- a/data/maps/Route2_House/scripts.inc
+++ b/data/maps/Route2_House/scripts.inc
@@ -12,7 +12,7 @@ Route2_House_EventScript_16F602:: @ 816F602
 	call EventScript_1A8CAD
 	checkflag FLAG_0x248
 	goto_if 1, EventScript_16F674
-	msgbox gUnknown_81A597B, 5
+	msgbox gUnknown_81A597B, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_16F65C
 	call EventScript_1A8CBD
diff --git a/data/maps/Route4_PokemonCenter_1F/scripts.inc b/data/maps/Route4_PokemonCenter_1F/scripts.inc
index fb10bc0da..d2d305823 100644
--- a/data/maps/Route4_PokemonCenter_1F/scripts.inc
+++ b/data/maps/Route4_PokemonCenter_1F/scripts.inc
@@ -32,12 +32,12 @@ Route4_PokemonCenter_1F_EventScript_16F75F:: @ 816F75F
 	end
 
 EventScript_16F786:: @ 816F786
-	msgbox gUnknown_819DA9A, 5
+	msgbox gUnknown_819DA9A, MSGBOX_YESNO
 	goto EventScript_16F7A2
 	end
 
 EventScript_16F794:: @ 816F794
-	msgbox gUnknown_819DB34, 5
+	msgbox gUnknown_819DB34, MSGBOX_YESNO
 	goto EventScript_16F7A2
 	end
 
@@ -60,7 +60,7 @@ EventScript_16F7A2:: @ 816F7A2
 
 EventScript_16F7F6:: @ 816F7F6
 	call EventScript_16F86F
-	msgbox gUnknown_81A56A7, 5
+	msgbox gUnknown_81A56A7, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_16F861
 	call EventScript_1A8C27
@@ -75,7 +75,7 @@ EventScript_16F7F6:: @ 816F7F6
 
 EventScript_16F822:: @ 816F822
 	call EventScript_16F86F
-	msgbox gUnknown_81A56A7, 5
+	msgbox gUnknown_81A56A7, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_16F84B
 	fadescreen 1
diff --git a/data/maps/SSAnne_1F_Room6/scripts.inc b/data/maps/SSAnne_1F_Room6/scripts.inc
index a07797706..ac794e8c2 100644
--- a/data/maps/SSAnne_1F_Room6/scripts.inc
+++ b/data/maps/SSAnne_1F_Room6/scripts.inc
@@ -4,7 +4,7 @@ SSAnne_1F_Room6_MapScripts:: @ 8160DF2
 SSAnne_1F_Room6_EventScript_160DF3:: @ 8160DF3
 	lock
 	faceplayer
-	msgbox gUnknown_817445B, 5
+	msgbox gUnknown_817445B, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_160E18
 	closemessage
diff --git a/data/maps/SaffronCity_Dojo/scripts.inc b/data/maps/SaffronCity_Dojo/scripts.inc
index 98a87ccd0..120dcbb77 100644
--- a/data/maps/SaffronCity_Dojo/scripts.inc
+++ b/data/maps/SaffronCity_Dojo/scripts.inc
@@ -27,7 +27,7 @@ SaffronCity_Dojo_EventScript_16EC00:: @ 816EC00
 	applymovement 5, Movement_1A75E9
 	waitmovement 0
 	textcolor 0
-	msgbox gUnknown_819B44E, 5
+	msgbox gUnknown_819B44E, MSGBOX_YESNO
 	call EventScript_1A6675
 	compare_var_to_value VAR_RESULT, 1
 	goto_if 1, EventScript_16EC82
@@ -50,7 +50,7 @@ SaffronCity_Dojo_EventScript_16EC46:: @ 816EC46
 	applymovement 5, Movement_1A75E9
 	waitmovement 0
 	textcolor 0
-	msgbox gUnknown_819B49E, 5
+	msgbox gUnknown_819B49E, MSGBOX_YESNO
 	call EventScript_1A6675
 	compare_var_to_value VAR_RESULT, 1
 	goto_if 1, EventScript_16EC82
@@ -78,7 +78,7 @@ EventScript_16ECB5:: @ 816ECB5
 	waitmessage
 	waitfanfare
 	setflag FLAG_0x278
-	msgbox gUnknown_81A56A7, 5
+	msgbox gUnknown_81A56A7, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_16ED29
 	call EventScript_1A8C27
@@ -94,7 +94,7 @@ EventScript_16ECEC:: @ 816ECEC
 	waitmessage
 	waitfanfare
 	setflag FLAG_0x278
-	msgbox gUnknown_81A56A7, 5
+	msgbox gUnknown_81A56A7, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_16ED1E
 	call EventScript_1A8C33
diff --git a/data/maps/SevenIsland_House_Room1/scripts.inc b/data/maps/SevenIsland_House_Room1/scripts.inc
index e29885a47..d9f6f8526 100644
--- a/data/maps/SevenIsland_House_Room1/scripts.inc
+++ b/data/maps/SevenIsland_House_Room1/scripts.inc
@@ -91,13 +91,13 @@ EventScript_17097D:: @ 817097D
 EventScript_170987:: @ 8170987
 	special SavePlayerParty
 	special sub_80CAAAC
-	msgbox gUnknown_81A0598, 5
+	msgbox gUnknown_81A0598, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_170A11
 	call EventScript_170A1E
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_170A11
-	msgbox gUnknown_81A0788, 5
+	msgbox gUnknown_81A0788, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_170A11
 	special LoadPlayerParty
diff --git a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc
index ee65196e9..fb408420a 100644
--- a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc
+++ b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc
@@ -14,7 +14,7 @@ SevenIsland_SevaultCanyon_House_EventScript_172183:: @ 8172183
 	waitmovement 0
 	msgbox gUnknown_81A4D72
 	textcolor 3
-	msgbox gUnknown_81A4DAF, 5
+	msgbox gUnknown_81A4DAF, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_172225
 	msgbox gUnknown_81A4DD8
diff --git a/data/maps/SilphCo_7F/scripts.inc b/data/maps/SilphCo_7F/scripts.inc
index 687cbab3d..e302289a5 100644
--- a/data/maps/SilphCo_7F/scripts.inc
+++ b/data/maps/SilphCo_7F/scripts.inc
@@ -151,7 +151,7 @@ EventScript_161B12:: @ 8161B12
 	waitmessage
 	waitfanfare
 	getspeciesname 0, SPECIES_LAPRAS
-	msgbox gUnknown_81A56A7, 5
+	msgbox gUnknown_81A56A7, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_161B7E
 	call EventScript_1A8C27
@@ -168,7 +168,7 @@ EventScript_161B45:: @ 8161B45
 	waitmessage
 	waitfanfare
 	getspeciesname 0, SPECIES_LAPRAS
-	msgbox gUnknown_81A56A7, 5
+	msgbox gUnknown_81A56A7, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_161B73
 	call EventScript_1A8C33
diff --git a/data/maps/SixIsland_RuinValley/scripts.inc b/data/maps/SixIsland_RuinValley/scripts.inc
index 35bcd8f14..54e79c2b3 100644
--- a/data/maps/SixIsland_RuinValley/scripts.inc
+++ b/data/maps/SixIsland_RuinValley/scripts.inc
@@ -26,7 +26,7 @@ SixIsland_RuinValley_EventScript_168B94:: @ 8168B94
 	lockall
 	checkflag FLAG_0x2E3
 	goto_if 1, EventScript_168BC1
-	msgbox gUnknown_818BDC0, 5
+	msgbox gUnknown_818BDC0, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_168BCB
 	msgbox gUnknown_818BE11
diff --git a/data/maps/SixIsland_WaterPath_House1/scripts.inc b/data/maps/SixIsland_WaterPath_House1/scripts.inc
index cba2d131a..b57183eac 100644
--- a/data/maps/SixIsland_WaterPath_House1/scripts.inc
+++ b/data/maps/SixIsland_WaterPath_House1/scripts.inc
@@ -62,9 +62,7 @@ EventScript_17210E:: @ 817210E
 EventScript_172121:: @ 8172121
 	setflag FLAG_0x2D9
 	msgbox gUnknown_81A4A88
-	setorcopyvar VAR_0x8000, 8
-	setorcopyvar VAR_0x8001, 1
-	callstd 0
+	giveitem ITEM_NEST_BALL
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_17214D
 	msgbox gUnknown_81A4AD9
diff --git a/data/maps/ThreeIsland/scripts.inc b/data/maps/ThreeIsland/scripts.inc
index 9e24c556d..2761c612f 100644
--- a/data/maps/ThreeIsland/scripts.inc
+++ b/data/maps/ThreeIsland/scripts.inc
@@ -222,7 +222,7 @@ EventScript_167A59:: @ 8167A59
 	applymovement 5, Movement_167C57
 	waitmovement 0
 	playbgm BGM_FRLG_BOY_EYE, 0
-	msgbox gUnknown_81823ED, 5
+	msgbox gUnknown_81823ED, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_167C35
 	msgbox gUnknown_818247D
diff --git a/data/maps/ThreeIsland_BerryForest/scripts.inc b/data/maps/ThreeIsland_BerryForest/scripts.inc
index 14dc9cf1a..dfaa7a9b9 100644
--- a/data/maps/ThreeIsland_BerryForest/scripts.inc
+++ b/data/maps/ThreeIsland_BerryForest/scripts.inc
@@ -29,9 +29,7 @@ ThreeIsland_BerryForest_EventScript_163C83:: @ 8163C83
 	applymovement 1, Movement_1A75E1
 	waitmovement 0
 	msgbox gUnknown_817AEE1
-	setorcopyvar VAR_0x8000, 147
-	setorcopyvar VAR_0x8001, 1
-	callstd 0
+	giveitem ITEM_IAPAPA_BERRY
 	compare_var_to_value VAR_RESULT, 0
 	call_if 1, EventScript_163D19
 	special sub_80CA6DC
diff --git a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc
index 75b9813fd..9885f9059 100644
--- a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc
+++ b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc
@@ -38,9 +38,7 @@ ThreeIsland_DunsparceTunnel_EventScript_164D60:: @ 8164D60
 
 EventScript_164D90:: @ 8164D90
 	msgbox gUnknown_817D1C9
-	setorcopyvar VAR_0x8000, 110
-	setorcopyvar VAR_0x8001, 1
-	callstd 0
+	giveitem ITEM_NUGGET
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_164DB8
 	setflag FLAG_0x2E2
diff --git a/data/maps/TwoIsland_House/scripts.inc b/data/maps/TwoIsland_House/scripts.inc
index b99b3e099..8829fc845 100644
--- a/data/maps/TwoIsland_House/scripts.inc
+++ b/data/maps/TwoIsland_House/scripts.inc
@@ -45,7 +45,7 @@ EventScript_171696:: @ 8171696
 	end
 
 EventScript_1716A5:: @ 81716A5
-	msgbox gUnknown_81A2C63, 5
+	msgbox gUnknown_81A2C63, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_17179E
 	goto EventScript_1716BE
diff --git a/data/maps/UndergroundPath_NorthEntrance/scripts.inc b/data/maps/UndergroundPath_NorthEntrance/scripts.inc
index e3941e22b..00ab7bcf3 100644
--- a/data/maps/UndergroundPath_NorthEntrance/scripts.inc
+++ b/data/maps/UndergroundPath_NorthEntrance/scripts.inc
@@ -8,7 +8,7 @@ UndergroundPath_NorthEntrance_EventScript_160E39:: @ 8160E39
 	call EventScript_1A8CAD
 	checkflag FLAG_0x24B
 	goto_if 1, EventScript_160EAB
-	msgbox gUnknown_81A5AD6, 5
+	msgbox gUnknown_81A5AD6, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_160E93
 	call EventScript_1A8CBD
diff --git a/data/maps/VermilionCity_House1/scripts.inc b/data/maps/VermilionCity_House1/scripts.inc
index 95f89ea38..4c595b48c 100644
--- a/data/maps/VermilionCity_House1/scripts.inc
+++ b/data/maps/VermilionCity_House1/scripts.inc
@@ -6,7 +6,7 @@ VermilionCity_House1_EventScript_16B3A7:: @ 816B3A7
 	faceplayer
 	checkflag FLAG_0x240
 	goto_if 1, EventScript_16B3CF
-	msgbox gUnknown_8193EC1, 5
+	msgbox gUnknown_8193EC1, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 1
 	goto_if 1, EventScript_16B3D9
 	msgbox gUnknown_8194028
diff --git a/data/maps/VermilionCity_PokemonFanClub/scripts.inc b/data/maps/VermilionCity_PokemonFanClub/scripts.inc
index 2c750711d..f34d22d2b 100644
--- a/data/maps/VermilionCity_PokemonFanClub/scripts.inc
+++ b/data/maps/VermilionCity_PokemonFanClub/scripts.inc
@@ -6,7 +6,7 @@ VermilionCity_PokemonFanClub_EventScript_16B47F:: @ 816B47F
 	faceplayer
 	checkflag FLAG_0x241
 	goto_if 1, EventScript_16B4A7
-	msgbox gUnknown_819457E, 5
+	msgbox gUnknown_819457E, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 1
 	goto_if 1, EventScript_16B4B1
 	msgbox gUnknown_8194860
@@ -134,7 +134,7 @@ VermilionCity_House2_EventScript_16B5D7:: @ 816B5D7
 	call EventScript_1A8CAD
 	checkflag FLAG_0x24D
 	goto_if 1, EventScript_16B649
-	msgbox gUnknown_81949CB, 5
+	msgbox gUnknown_81949CB, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_16B631
 	call EventScript_1A8CBD
diff --git a/data/maps/ViridianCity/scripts.inc b/data/maps/ViridianCity/scripts.inc
index 860f50a4a..b41c6b929 100644
--- a/data/maps/ViridianCity/scripts.inc
+++ b/data/maps/ViridianCity/scripts.inc
@@ -118,7 +118,7 @@ ViridianCity_EventScript_1659F6:: @ 81659F6
 	end
 
 EventScript_165A23:: @ 8165A23
-	msgbox gUnknown_817E046, 5
+	msgbox gUnknown_817E046, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_165A40
 	msgbox gUnknown_817E0EA
@@ -165,7 +165,7 @@ EventScript_165A84:: @ 8165A84
 ViridianCity_EventScript_165A8F:: @ 8165A8F
 	lock
 	faceplayer
-	msgbox gUnknown_817DB98, 5
+	msgbox gUnknown_817DB98, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 1
 	goto_if 1, EventScript_165AB0
 	compare_var_to_value VAR_RESULT, 0
@@ -252,8 +252,6 @@ EventScript_165B4C:: @ 8165B4C
 	faceplayer
 	msgbox gUnknown_817DE9B
 	setvar VAR_0x4051, 2
-	setorcopyvar VAR_0x8000, 366
-	setorcopyvar VAR_0x8001, 1
-	callstd 0
+	giveitem ITEM_TEACHY_TV
 	msgbox gUnknown_817DEEB
 	return
diff --git a/data/maps/ViridianCity_House2/scripts.inc b/data/maps/ViridianCity_House2/scripts.inc
index b6ebea215..65ea77a5e 100644
--- a/data/maps/ViridianCity_House2/scripts.inc
+++ b/data/maps/ViridianCity_House2/scripts.inc
@@ -24,15 +24,15 @@ ViridianCity_House2_EventScript_16A094:: @ 816A094
 ViridianCity_House2_EventScript_16A0AB:: @ 816A0AB
 	lockall
 	msgbox gUnknown_818FC65
-	msgbox gUnknown_818FF19, 5
+	msgbox gUnknown_818FF19, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_16A11B
 	msgbox gUnknown_818FD23
-	msgbox gUnknown_818FF19, 5
+	msgbox gUnknown_818FF19, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_16A11B
 	msgbox gUnknown_818FDA8
-	msgbox gUnknown_818FF19, 5
+	msgbox gUnknown_818FF19, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_16A11B
 	msgbox gUnknown_818FE5C