Sync obtain item

9 files changed, 19 insertions, 19 deletions

diff --git a/data/maps/CeladonCity_Condominiums_1F/scripts.inc b/data/maps/CeladonCity_Condominiums_1F/scripts.inc
index 2842caec7..41912748b 100644
--- a/data/maps/CeladonCity_Condominiums_1F/scripts.inc
+++ b/data/maps/CeladonCity_Condominiums_1F/scripts.inc
@@ -10,8 +10,8 @@ CeladonCity_Condominiums_1F_EventScript_16C321:: @ 816C321
 	msgbox gUnknown_81960C9
 	setflag FLAG_GOT_TEA
 	giveitem ITEM_TEA
-	compare VAR_RESULT, 0
-	goto_if_eq EventScript_1A6BF9
+	compare VAR_RESULT, FALSE
+	goto_if_eq EventScript_BagIsFull
 	msgbox gUnknown_8196109
 	release
 	end
diff --git a/data/maps/CeruleanCity_House5/scripts.inc b/data/maps/CeruleanCity_House5/scripts.inc
index b4c8b16be..51243d31f 100644
--- a/data/maps/CeruleanCity_House5/scripts.inc
+++ b/data/maps/CeruleanCity_House5/scripts.inc
@@ -12,8 +12,8 @@ CeruleanCity_House5_EventScript_16AE50:: @ 816AE50
 	msgbox gUnknown_8193003
 	setflag FLAG_GOT_POWDER_JAR
 	giveitem ITEM_POWDER_JAR
-	compare VAR_RESULT, 0
-	goto_if_eq EventScript_1A6BF9
+	compare VAR_RESULT, FALSE
+	goto_if_eq EventScript_BagIsFull
 	msgbox gUnknown_8193033
 	release
 	end
diff --git a/data/maps/PalletTown_PlayersHouse_1F/scripts.inc b/data/maps/PalletTown_PlayersHouse_1F/scripts.inc
index 9ac19e6ff..6dc0a1a47 100644
--- a/data/maps/PalletTown_PlayersHouse_1F/scripts.inc
+++ b/data/maps/PalletTown_PlayersHouse_1F/scripts.inc
@@ -27,7 +27,7 @@ EventScript_168C41:: @ 8168C41
 EventScript_168C4A:: @ 8168C4A
 	msgbox gUnknown_818D3D1
 	closemessage
-	call EventScript_FadeOut_Heal_FadeIn
+	call EventScript_OutOfCenterPartyHeal
 	msgbox gUnknown_818D3F8
 	release
 	end
diff --git a/data/maps/RocketHideout_B4F/scripts.inc b/data/maps/RocketHideout_B4F/scripts.inc
index d5fb798c5..4f75320b3 100644
--- a/data/maps/RocketHideout_B4F/scripts.inc
+++ b/data/maps/RocketHideout_B4F/scripts.inc
@@ -40,8 +40,8 @@ RocketHideout_B4F_EventScript_161363:: @ 8161363
 	faceplayer
 	removeobject 2
 	giveitem ITEM_SILPH_SCOPE
-	compare VAR_RESULT, 0
-	goto_if_eq EventScript_1A6BF9
+	compare VAR_RESULT, FALSE
+	goto_if_eq EventScript_BagIsFull
 	release
 	end
 
@@ -64,8 +64,8 @@ RocketHideout_B4F_EventScript_1613AD:: @ 81613AD
 	setflag FLAG_CAN_USE_ROCKET_HIDEOUT_LIFT
 	removeobject 4
 	giveitem ITEM_LIFT_KEY
-	compare VAR_RESULT, 0
-	goto_if_eq EventScript_1A6BF9
+	compare VAR_RESULT, FALSE
+	goto_if_eq EventScript_BagIsFull
 	release
 	end
 
diff --git a/data/maps/Route1/scripts.inc b/data/maps/Route1/scripts.inc
index 6f163cc22..8d5617e3f 100644
--- a/data/maps/Route1/scripts.inc
+++ b/data/maps/Route1/scripts.inc
@@ -9,7 +9,7 @@ Route1_EventScript_167EFE:: @ 8167EFE
 	textcolor 3
 	checkitemspace ITEM_POTION, 1
 	compare VAR_RESULT, FALSE
-	goto_if_eq EventScript_1A6BF9
+	goto_if_eq EventScript_BagIsFull
 	getitemname 1, ITEM_POTION
 	playfanfare MUS_FANFA1
 	message Text_ObtainedTheX
diff --git a/data/maps/SSAnne_1F_Room6/scripts.inc b/data/maps/SSAnne_1F_Room6/scripts.inc
index f356fa305..42c69fb3b 100644
--- a/data/maps/SSAnne_1F_Room6/scripts.inc
+++ b/data/maps/SSAnne_1F_Room6/scripts.inc
@@ -8,7 +8,7 @@ SSAnne_1F_Room6_EventScript_160DF3:: @ 8160DF3
 	compare VAR_RESULT, NO
 	goto_if_eq EventScript_160E18
 	closemessage
-	call EventScript_FadeOut_Heal_FadeIn
+	call EventScript_OutOfCenterPartyHeal
 	msgbox gUnknown_8174490
 	release
 	end
diff --git a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc
index 3e495c6cd..975444645 100644
--- a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc
+++ b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc
@@ -27,7 +27,7 @@ SevenIsland_SevaultCanyon_House_EventScript_172183:: @ 8172183
 	waitmovement 0
 	fadedefaultbgm
 	delay 30
-	call EventScript_FadeOut_Heal_FadeIn
+	call EventScript_OutOfCenterPartyHeal
 	msgbox gUnknown_81A4DF5
 	setflag FLAG_TEMP_2
 	release
diff --git a/data/maps/SilphCo_9F/scripts.inc b/data/maps/SilphCo_9F/scripts.inc
index 87df12d97..7f4258b5d 100644
--- a/data/maps/SilphCo_9F/scripts.inc
+++ b/data/maps/SilphCo_9F/scripts.inc
@@ -16,7 +16,7 @@ SilphCo_9F_EventScript_161D09:: @ 8161D09
 	goto_if_ge EventScript_161D2E
 	msgbox gUnknown_8176B54
 	closemessage
-	call EventScript_FadeOut_Heal_FadeIn
+	call EventScript_OutOfCenterPartyHeal
 	msgbox gUnknown_8176B81
 	release
 	end
diff --git a/data/maps/VermilionCity/scripts.inc b/data/maps/VermilionCity/scripts.inc
index aebeb69b7..7767bbb2b 100644
--- a/data/maps/VermilionCity/scripts.inc
+++ b/data/maps/VermilionCity/scripts.inc
@@ -57,19 +57,19 @@ VermilionCity_EventScript_166941:: @ 8166941
 	end
 
 EventScript_166958:: @ 8166958
-	goto_if_unset FLAG_SYS_GOT_MYSTIC_TICKET, EventScript_1A77B0
+	goto_if_unset FLAG_SYS_GOT_MYSTIC_TICKET, EventScript_SetResultFalse
 	checkitem ITEM_MYSTIC_TICKET, 1
 	compare VAR_RESULT, FALSE
-	goto_if_eq EventScript_1A77B0
-	goto EventScript_1A77AA
+	goto_if_eq EventScript_SetResultFalse
+	goto EventScript_SetResultTrue
 	end
 
 EventScript_166977:: @ 8166977
-	goto_if_unset FLAG_SYS_GOT_AURORA_TICKET, EventScript_1A77B0
+	goto_if_unset FLAG_SYS_GOT_AURORA_TICKET, EventScript_SetResultFalse
 	checkitem ITEM_AURORA_TICKET, 1
 	compare VAR_RESULT, FALSE
-	goto_if_eq EventScript_1A77B0
-	goto EventScript_1A77AA
+	goto_if_eq EventScript_SetResultFalse
+	goto EventScript_SetResultTrue
 	end
 
 EventScript_166996:: @ 8166996