Merge pull request #225 from GriffinRichards/doc-questlog

Document some quest log

54 files changed, 141 insertions, 259 deletions

diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc
index 2b13d4440..d58a16b85 100644
--- a/data/maps/BirthIsland_Exterior/scripts.inc
+++ b/data/maps/BirthIsland_Exterior/scripts.inc
@@ -42,9 +42,7 @@ BirthIsland_Exterior_EventScript_TryRemoveDeoxys:: @ 816525D
 BirthIsland_Exterior_EventScript_Triangle:: @ 8165271
 	lock
 	faceplayer
-	special sub_8110AB4
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if_questlog EventScript_ReleaseEnd
 	special sub_8112364
 	special DoDeoxysRockInteraction
 	waitstate
diff --git a/data/maps/CeladonCity_Condominiums_3F/scripts.inc b/data/maps/CeladonCity_Condominiums_3F/scripts.inc
index dfa1836f0..d7bb14293 100644
--- a/data/maps/CeladonCity_Condominiums_3F/scripts.inc
+++ b/data/maps/CeladonCity_Condominiums_3F/scripts.inc
@@ -31,9 +31,7 @@ EventScript_16C418:: @ 816C418
 	message Text_1963CD
 	waitmessage
 	delay 60
-	special sub_8110AB4
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if_questlog EventScript_ReleaseEnd
 	special Special_ShowDiploma
 	waitstate
 	release
diff --git a/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc
index 3289f08b3..24d4771b2 100644
--- a/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc
+++ b/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc
@@ -14,9 +14,7 @@ CeladonCity_DepartmentStore_2F_EventScript_16BB07:: @ 816BB07
 	end
 
 CeladonCity_DepartmentStore_2F_EventScript_16BB10:: @ 816BB10
-	special sub_8110AB4
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if_questlog EventScript_ReleaseEnd
 	lock
 	faceplayer
 	message Text_MayIHelpYou
@@ -42,9 +40,7 @@ Items_16BB38:: @ 816BB38
 	end
 
 CeladonCity_DepartmentStore_2F_EventScript_16BB4E:: @ 816BB4E
-	special sub_8110AB4
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if_questlog EventScript_ReleaseEnd
 	lock
 	faceplayer
 	message Text_MayIHelpYou
diff --git a/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc
index 233bfefc9..f04968b1e 100644
--- a/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc
+++ b/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc
@@ -14,9 +14,7 @@ CeladonCity_DepartmentStore_4F_EventScript_16BC01:: @ 816BC01
 	end
 
 CeladonCity_DepartmentStore_4F_EventScript_16BC0A:: @ 816BC0A
-	special sub_8110AB4
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if_questlog EventScript_ReleaseEnd
 	lock
 	faceplayer
 	message Text_MayIHelpYou
diff --git a/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc
index 5163273c5..9056d2b2d 100644
--- a/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc
+++ b/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc
@@ -14,9 +14,7 @@ CeladonCity_DepartmentStore_5F_EventScript_16BC53:: @ 816BC53
 	end
 
 CeladonCity_DepartmentStore_5F_EventScript_16BC5C:: @ 816BC5C
-	special sub_8110AB4
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if_questlog EventScript_ReleaseEnd
 	lock
 	faceplayer
 	message Text_MayIHelpYou
@@ -40,9 +38,7 @@ Items_16BC84:: @ 816BC84
 	end
 
 CeladonCity_DepartmentStore_5F_EventScript_16BC96:: @ 816BC96
-	special sub_8110AB4
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if_questlog EventScript_ReleaseEnd
 	lock
 	faceplayer
 	message Text_MayIHelpYou
diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc
index 6b19ebe66..48f682567 100644
--- a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc
+++ b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc
@@ -2,9 +2,7 @@ CeladonCity_DepartmentStore_Roof_MapScripts:: @ 816BCCC
 	.byte 0
 
 CeladonCity_DepartmentStore_Roof_EventScript_16BCCD:: @ 816BCCD
-	special sub_8110AB4
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if_questlog EventScript_ReleaseEnd
 	special sub_8112364
 	lock
 	faceplayer
diff --git a/data/maps/CeladonCity_GameCorner/scripts.inc b/data/maps/CeladonCity_GameCorner/scripts.inc
index 064e939e4..20b2ba04c 100644
--- a/data/maps/CeladonCity_GameCorner/scripts.inc
+++ b/data/maps/CeladonCity_GameCorner/scripts.inc
@@ -19,9 +19,7 @@ CeladonCity_GameCorner_EventScript_16C684:: @ 816C684
 	end
 
 CeladonCity_GameCorner_EventScript_16C68D:: @ 816C68D
-	special sub_8110AB4
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if_questlog EventScript_ReleaseEnd
 	lock
 	faceplayer
 	showmoneybox 0, 0, 0
diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc
index f14f92430..c9eb1eec6 100644
--- a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc
+++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc
@@ -13,9 +13,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_16CB88:: @ 816CB88
 	lock
 	faceplayer
 	goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16CD99
-	special sub_8110AB4
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if_questlog EventScript_ReleaseEnd
 	showcoinsbox 0, 0
 	msgbox gUnknown_8197057
 	goto EventScript_16CBB2
@@ -250,9 +248,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_16CE1D:: @ 816CE1D
 	lock
 	faceplayer
 	goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16CD99
-	special sub_8110AB4
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if_questlog EventScript_ReleaseEnd
 	showcoinsbox 0, 0
 	msgbox gUnknown_8197057
 	goto EventScript_16CE47
@@ -347,9 +343,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_16CF88:: @ 816CF88
 	lock
 	faceplayer
 	goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16CD99
-	special sub_8110AB4
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if_questlog EventScript_ReleaseEnd
 	showcoinsbox 0, 0
 	msgbox gUnknown_8197057
 	goto EventScript_16CFB2
diff --git a/data/maps/CeruleanCave_B1F/scripts.inc b/data/maps/CeruleanCave_B1F/scripts.inc
index 874bfce06..8fcf7cbf1 100644
--- a/data/maps/CeruleanCave_B1F/scripts.inc
+++ b/data/maps/CeruleanCave_B1F/scripts.inc
@@ -23,9 +23,7 @@ EventScript_1624F1:: @ 81624F1
 	return
 
 CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5
-	special sub_8110AB4
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if_questlog EventScript_ReleaseEnd
 	special sub_8112364
 	lock
 	faceplayer
diff --git a/data/maps/CeruleanCity_House4/scripts.inc b/data/maps/CeruleanCity_House4/scripts.inc
index 3fb71aeae..3d96fd67c 100644
--- a/data/maps/CeruleanCity_House4/scripts.inc
+++ b/data/maps/CeruleanCity_House4/scripts.inc
@@ -2,9 +2,7 @@ CeruleanCity_House4_MapScripts:: @ 816ACEE
 	.byte 0
 
 CeruleanCity_House4_EventScript_WonderNewsBerryMan:: @ 816ACEF
-	special sub_8110AB4
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if_questlog EventScript_ReleaseEnd
 	special sub_8112364
 	lock
 	specialvar VAR_0x8004, Special_GetMENewsJisanItemAndState
diff --git a/data/maps/CeruleanCity_House5/scripts.inc b/data/maps/CeruleanCity_House5/scripts.inc
index 5f4378c7e..04615b895 100644
--- a/data/maps/CeruleanCity_House5/scripts.inc
+++ b/data/maps/CeruleanCity_House5/scripts.inc
@@ -174,9 +174,7 @@ CeruleanCity_House5_EventScript_NotEnoughBerryPowder:: @ 816B0CC
 
 CeruleanCity_House5_EventScript_BerryCrushRankings:: @ 816B0DA
 	lockall
-	special sub_8110AB4
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if_questlog EventScript_ReleaseEnd
 	special ShowBerryCrushRankings
 	waitstate
 	releaseall
diff --git a/data/maps/CeruleanCity_Mart/scripts.inc b/data/maps/CeruleanCity_Mart/scripts.inc
index fb4cb7f7c..1ff7b2c47 100644
--- a/data/maps/CeruleanCity_Mart/scripts.inc
+++ b/data/maps/CeruleanCity_Mart/scripts.inc
@@ -10,9 +10,7 @@ CeruleanCity_Mart_EventScript_Woman:: @ 816ACA7
 	end
 
 CeruleanCity_Mart_EventScript_Clerk:: @ 816ACB0
-	special sub_8110AB4
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if_questlog EventScript_ReleaseEnd
 	lock
 	faceplayer
 	message Text_MayIHelpYou
diff --git a/data/maps/CinnabarIsland_Mart/scripts.inc b/data/maps/CinnabarIsland_Mart/scripts.inc
index 5d512a32b..f5ecf68d8 100644
--- a/data/maps/CinnabarIsland_Mart/scripts.inc
+++ b/data/maps/CinnabarIsland_Mart/scripts.inc
@@ -10,9 +10,7 @@ CinnabarIsland_Mart_EventScript_16EA19:: @ 816EA19
 	end
 
 CinnabarIsland_Mart_EventScript_16EA22:: @ 816EA22
-	special sub_8110AB4
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if_questlog EventScript_ReleaseEnd
 	lock
 	faceplayer
 	message Text_MayIHelpYou
diff --git a/data/maps/FiveIsland_LostCave_Room10/scripts.inc b/data/maps/FiveIsland_LostCave_Room10/scripts.inc
index 3b3dffc4d..8610c7c2d 100644
--- a/data/maps/FiveIsland_LostCave_Room10/scripts.inc
+++ b/data/maps/FiveIsland_LostCave_Room10/scripts.inc
@@ -24,9 +24,7 @@ EventScript_164C52:: @ 8164C52
 	applymovement 1, Movement_164CC8
 	waitmovement 0
 	msgbox gUnknown_817D062
-	special sub_8110AB4
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_164CB6
+	goto_if_questlog EventScript_164CB6
 	trainerbattle_no_intro TRAINER_LADY_SELPHY, Text_17D086
 	msgbox gUnknown_817D0B2
 	closemessage
diff --git a/data/maps/FiveIsland_MemorialPillar/scripts.inc b/data/maps/FiveIsland_MemorialPillar/scripts.inc
index b193e830e..98de6167e 100644
--- a/data/maps/FiveIsland_MemorialPillar/scripts.inc
+++ b/data/maps/FiveIsland_MemorialPillar/scripts.inc
@@ -32,9 +32,7 @@ EventScript_168A22:: @ 8168A22
 	end
 
 FiveIsland_MemorialPillar_EventScript_168A48:: @ 8168A48
-	special sub_8110AB4
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if_questlog EventScript_ReleaseEnd
 	special sub_8112364
 	lockall
 	goto_if_set FLAG_GOT_TM42_AT_MEMORIAL_PILLAR, EventScript_168B0B
diff --git a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc
index 946508db5..50fe74879 100644
--- a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc
+++ b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc
@@ -2,9 +2,7 @@ FiveIsland_ResortGorgeous_House_MapScripts:: @ 8171EBD
 	.byte 0
 
 FiveIsland_ResortGorgeous_House_EventScript_171EBE:: @ 8171EBE
-	special sub_8110AB4
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if_questlog EventScript_ReleaseEnd
 	special sub_8112364
 	lock
 	faceplayer
diff --git a/data/maps/FiveIsland_WaterLabyrinth/scripts.inc b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc
index 605b05065..ed82fc5eb 100644
--- a/data/maps/FiveIsland_WaterLabyrinth/scripts.inc
+++ b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc
@@ -2,9 +2,7 @@ FiveIsland_WaterLabyrinth_MapScripts:: @ 816884D
 	.byte 0
 
 FiveIsland_WaterLabyrinth_EventScript_16884E:: @ 816884E
-	special sub_8110AB4
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if_questlog EventScript_ReleaseEnd
 	special sub_8112364
 	lock
 	faceplayer
diff --git a/data/maps/FourIsland/scripts.inc b/data/maps/FourIsland/scripts.inc
index 8f84b1e6c..576e16390 100644
--- a/data/maps/FourIsland/scripts.inc
+++ b/data/maps/FourIsland/scripts.inc
@@ -70,9 +70,7 @@ Movement_167D52:: @ 8167D52
 	step_end
 
 FourIsland_EventScript_167D55:: @ 8167D55
-	special sub_8110AB4
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if_questlog EventScript_ReleaseEnd
 	special sub_8112364
 	lock
 	faceplayer
diff --git a/data/maps/FourIsland_Mart/scripts.inc b/data/maps/FourIsland_Mart/scripts.inc
index 0d0d1c6df..5f85eaae4 100644
--- a/data/maps/FourIsland_Mart/scripts.inc
+++ b/data/maps/FourIsland_Mart/scripts.inc
@@ -2,9 +2,7 @@ FourIsland_Mart_MapScripts:: @ 8171CAD
 	.byte 0
 
 FourIsland_Mart_EventScript_171CAE:: @ 8171CAE
-	special sub_8110AB4
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if_questlog EventScript_ReleaseEnd
 	lock
 	faceplayer
 	message Text_MayIHelpYou
diff --git a/data/maps/FourIsland_PokemonDayCare/scripts.inc b/data/maps/FourIsland_PokemonDayCare/scripts.inc
index f3b695231..d158be282 100644
--- a/data/maps/FourIsland_PokemonDayCare/scripts.inc
+++ b/data/maps/FourIsland_PokemonDayCare/scripts.inc
@@ -2,9 +2,7 @@ FourIsland_PokemonDayCare_MapScripts:: @ 817193F
 	.byte 0
 
 FourIsland_PokemonDayCare_EventScript_171940:: @ 8171940
-	special sub_8110AB4
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if_questlog EventScript_ReleaseEnd
 	lock
 	faceplayer
 	specialvar VAR_RESULT, GetDaycareState
diff --git a/data/maps/FuchsiaCity_Mart/scripts.inc b/data/maps/FuchsiaCity_Mart/scripts.inc
index 7d2df7e8f..631be4033 100644
--- a/data/maps/FuchsiaCity_Mart/scripts.inc
+++ b/data/maps/FuchsiaCity_Mart/scripts.inc
@@ -10,9 +10,7 @@ FuchsiaCity_Mart_EventScript_16D4EA:: @ 816D4EA
 	end
 
 FuchsiaCity_Mart_EventScript_16D4F3:: @ 816D4F3
-	special sub_8110AB4
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if_questlog EventScript_ReleaseEnd
 	lock
 	faceplayer
 	message Text_MayIHelpYou
diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc
index d1496398b..67a3e4f6a 100644
--- a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc
+++ b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc
@@ -41,9 +41,7 @@ IndigoPlateau_PokemonCenter_1F_EventScript_16EAC3:: @ 816EAC3
 	end
 
 IndigoPlateau_PokemonCenter_1F_EventScript_16EACC:: @ 816EACC
-	special sub_8110AB4
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if_questlog EventScript_ReleaseEnd
 	lock
 	faceplayer
 	message Text_MayIHelpYou
diff --git a/data/maps/LavenderTown_Mart/scripts.inc b/data/maps/LavenderTown_Mart/scripts.inc
index 1007b34cf..bd81b99a8 100644
--- a/data/maps/LavenderTown_Mart/scripts.inc
+++ b/data/maps/LavenderTown_Mart/scripts.inc
@@ -14,9 +14,7 @@ LavenderTown_Mart_EventScript_16B362:: @ 816B362
 	end
 
 LavenderTown_Mart_EventScript_16B36B:: @ 816B36B
-	special sub_8110AB4
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if_questlog EventScript_ReleaseEnd
 	lock
 	faceplayer
 	message Text_MayIHelpYou
diff --git a/data/maps/MtEmber_Summit/scripts.inc b/data/maps/MtEmber_Summit/scripts.inc
index 76261b037..e7e926ec1 100644
--- a/data/maps/MtEmber_Summit/scripts.inc
+++ b/data/maps/MtEmber_Summit/scripts.inc
@@ -23,9 +23,7 @@ EventScript_163B2F:: @ 8163B2F
 	return
 
 MtEmber_Summit_EventScript_163B33:: @ 8163B33
-	special sub_8110AB4
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if_questlog EventScript_ReleaseEnd
 	special sub_8112364
 	lock
 	faceplayer
diff --git a/data/maps/NavelRock_Base/scripts.inc b/data/maps/NavelRock_Base/scripts.inc
index 4a844fe12..46bc6f2ee 100644
--- a/data/maps/NavelRock_Base/scripts.inc
+++ b/data/maps/NavelRock_Base/scripts.inc
@@ -29,9 +29,7 @@ NavelRock_Base_EventScript_TryRemoveLugia:: @ 8165120
 	return
 
 NavelRock_Base_EventScript_Lugia:: @ 8165134
-	special sub_8110AB4
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if_questlog EventScript_ReleaseEnd
 	special sub_8112364
 	lock
 	faceplayer
diff --git a/data/maps/NavelRock_Summit/scripts.inc b/data/maps/NavelRock_Summit/scripts.inc
index 97eb64ff2..b151bbbfe 100644
--- a/data/maps/NavelRock_Summit/scripts.inc
+++ b/data/maps/NavelRock_Summit/scripts.inc
@@ -32,9 +32,7 @@ NavelRock_Summit_EventScript_TryRemoveHoOh:: @ 8164FE7
 	return
 
 NavelRock_Summit_EventScript_HoOh:: @ 8164FFB
-	special sub_8110AB4
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if_questlog EventScript_ReleaseEnd
 	special sub_8112364
 	lockall
 	setvar VAR_TEMP_1, 1
diff --git a/data/maps/PalletTown_GarysHouse/scripts.inc b/data/maps/PalletTown_GarysHouse/scripts.inc
index 80cb0a484..c6222ad7b 100644
--- a/data/maps/PalletTown_GarysHouse/scripts.inc
+++ b/data/maps/PalletTown_GarysHouse/scripts.inc
@@ -44,9 +44,7 @@ EventScript_168DAF:: @ 8168DAF
 	end
 
 EventScript_168DB9:: @ 8168DB9
-	special sub_8110AB4
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if_questlog EventScript_ReleaseEnd
 	special sub_8112364
 	compare VAR_MASSAGE_COOLDOWN_STEP_COUNTER, 500
 	goto_if_lt EventScript_168E46
diff --git a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc
index 0c623394d..7e8c8ee73 100644
--- a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc
+++ b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc
@@ -31,9 +31,7 @@ PalletTown_PlayersHouse_2F_EventScript_168CDB:: @ 8168CDB
 
 gUnknown_8168CE4:: @ 8168CE4
 PalletTown_PlayersHouse_2F_EventScript_168CE4:: @ 8168CE4
-	special sub_8110AB4
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if_questlog EventScript_ReleaseEnd
 	lockall
 	setvar VAR_0x8004, 32
 	special Special_SetSomeVariable
diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc
index 0b5008f79..c8f00bfbe 100644
--- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc
+++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc
@@ -978,9 +978,7 @@ EventScript_1699F9:: @ 81699F9
 	end
 
 EventScript_1699FB:: @ 81699FB
-	special sub_8110AB4
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if_questlog EventScript_ReleaseEnd
 	special sub_8112364
 	goto_if_set FLAG_OAK_SKIP_22_RIVAL_CHECK, EventScript_169A6E
 	goto_if_set FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL, EventScript_169A78
diff --git a/data/maps/PewterCity_Mart/scripts.inc b/data/maps/PewterCity_Mart/scripts.inc
index 1735013a5..963417631 100644
--- a/data/maps/PewterCity_Mart/scripts.inc
+++ b/data/maps/PewterCity_Mart/scripts.inc
@@ -10,9 +10,7 @@ PewterCity_Mart_EventScript_Boy:: @ 816A6D7
 	end
 
 PewterCity_Mart_EventScript_Clerk:: @ 816A6E0
-	special sub_8110AB4
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if_questlog EventScript_ReleaseEnd
 	lock
 	faceplayer
 	message Text_MayIHelpYou
diff --git a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc
index a0f5b8379..bf0283a1f 100644
--- a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc
+++ b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc
@@ -55,9 +55,7 @@ EventScript_162B76:: @ 8162B76
 	delay 20
 	call_if_unset FLAG_SYS_GAME_CLEAR, EventScript_162CB3
 	call_if_set FLAG_SYS_GAME_CLEAR, EventScript_162CBC
-	special sub_8110AB4
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_162C68
+	goto_if_questlog EventScript_162C68
 	setflag FLAG_TEMP_3
 	setflag FLAG_TEMP_5
 	savebgm MUS_WIN_GYM
diff --git a/data/maps/PokemonLeague_LancesRoom/scripts.inc b/data/maps/PokemonLeague_LancesRoom/scripts.inc
index 8c6b9924e..56619200c 100644
--- a/data/maps/PokemonLeague_LancesRoom/scripts.inc
+++ b/data/maps/PokemonLeague_LancesRoom/scripts.inc
@@ -139,7 +139,7 @@ EventScript_162AA1:: @ 8162AA1
 
 EventScript_162AAB:: @ 8162AAB
 	setvar VAR_0x8004, 0
-	special sub_8113530
+	special Special_TryGainNewFanFromCounter
 	setflag FLAG_DEFEATED_LANCE
 	call EventScript_1A7563
 	msgbox gUnknown_8178A52
diff --git a/data/maps/PokemonTower_6F/scripts.inc b/data/maps/PokemonTower_6F/scripts.inc
index 8f4500615..4cd13a1f1 100644
--- a/data/maps/PokemonTower_6F/scripts.inc
+++ b/data/maps/PokemonTower_6F/scripts.inc
@@ -5,9 +5,7 @@ PokemonTower_6F_EventScript_1634B8:: @ 81634B8
 	lockall
 	textcolor 2
 	msgbox gUnknown_817A2F8
-	special sub_8110AB4
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if_questlog EventScript_ReleaseEnd
 	setwildbattle SPECIES_MAROWAK, 30, ITEM_NONE
 	special ScrSpecial_StartMarowakBattle
 	waitstate
diff --git a/data/maps/PowerPlant/scripts.inc b/data/maps/PowerPlant/scripts.inc
index bc6e108f8..f21a5fa26 100644
--- a/data/maps/PowerPlant/scripts.inc
+++ b/data/maps/PowerPlant/scripts.inc
@@ -34,9 +34,7 @@ EventScript_1637B4:: @ 81637B4
 	return
 
 PowerPlant_EventScript_1637B8:: @ 81637B8
-	special sub_8110AB4
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if_questlog EventScript_ReleaseEnd
 	special sub_8112364
 	lock
 	faceplayer
@@ -75,9 +73,7 @@ EventScript_163824:: @ 8163824
 	end
 
 PowerPlant_EventScript_16382F:: @ 816382F
-	special sub_8110AB4
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if_questlog EventScript_ReleaseEnd
 	lock
 	faceplayer
 	setwildbattle SPECIES_ELECTRODE, 34, ITEM_NONE
@@ -106,9 +102,7 @@ EventScript_163884:: @ 8163884
 	end
 
 PowerPlant_EventScript_16388D:: @ 816388D
-	special sub_8110AB4
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if_questlog EventScript_ReleaseEnd
 	lock
 	faceplayer
 	setwildbattle SPECIES_ELECTRODE, 34, ITEM_NONE
diff --git a/data/maps/Route12/scripts.inc b/data/maps/Route12/scripts.inc
index 80a037a65..8b80dccee 100644
--- a/data/maps/Route12/scripts.inc
+++ b/data/maps/Route12/scripts.inc
@@ -14,9 +14,7 @@ Route12_EventScript_168014:: @ 8168014
 	lock
 	faceplayer
 	goto_if_unset FLAG_GOT_POKE_FLUTE, EventScript_168099
-	special sub_8110AB4
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if_questlog EventScript_ReleaseEnd
 	special sub_8112364
 	msgbox gUnknown_81853CC, MSGBOX_YESNO
 	compare VAR_RESULT, NO
diff --git a/data/maps/Route12_FishingHouse/scripts.inc b/data/maps/Route12_FishingHouse/scripts.inc
index 792f9c883..e1cd920d7 100644
--- a/data/maps/Route12_FishingHouse/scripts.inc
+++ b/data/maps/Route12_FishingHouse/scripts.inc
@@ -30,9 +30,7 @@ EventScript_16FF75:: @ 816FF75
 	end
 
 EventScript_16FF7F:: @ 816FF7F
-	special sub_8110AB4
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if_questlog EventScript_ReleaseEnd
 	special sub_8112364
 	setvar VAR_0x8004, SPECIES_MAGIKARP
 	specialvar VAR_RESULT, Special_PlayerPartyContainsSpecies
diff --git a/data/maps/Route16/scripts.inc b/data/maps/Route16/scripts.inc
index eb866388b..ec6e7270b 100644
--- a/data/maps/Route16/scripts.inc
+++ b/data/maps/Route16/scripts.inc
@@ -33,9 +33,7 @@ Route16_EventScript_168121:: @ 8168121
 	lock
 	faceplayer
 	goto_if_unset FLAG_GOT_POKE_FLUTE, EventScript_1681A3
-	special sub_8110AB4
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if_questlog EventScript_ReleaseEnd
 	special sub_8112364
 	msgbox gUnknown_81853CC, MSGBOX_YESNO
 	compare VAR_RESULT, NO
diff --git a/data/maps/SaffronCity_House1_2F/scripts.inc b/data/maps/SaffronCity_House1_2F/scripts.inc
index f7efeddb1..17714d816 100644
--- a/data/maps/SaffronCity_House1_2F/scripts.inc
+++ b/data/maps/SaffronCity_House1_2F/scripts.inc
@@ -18,9 +18,7 @@ SaffronCity_House1_2F_EventScript_16EB70:: @ 816EB70
 	end
 
 SaffronCity_House1_2F_EventScript_16EB7B:: @ 816EB7B
-	special sub_8110AB4
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if_questlog EventScript_ReleaseEnd
 	special sub_8112364
 	lock
 	faceplayer
diff --git a/data/maps/SaffronCity_Mart/scripts.inc b/data/maps/SaffronCity_Mart/scripts.inc
index 78452151b..5361c07a8 100644
--- a/data/maps/SaffronCity_Mart/scripts.inc
+++ b/data/maps/SaffronCity_Mart/scripts.inc
@@ -10,9 +10,7 @@ SaffronCity_Mart_EventScript_16EFAC:: @ 816EFAC
 	end
 
 SaffronCity_Mart_EventScript_16EFB5:: @ 816EFB5
-	special sub_8110AB4
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if_questlog EventScript_ReleaseEnd
 	lock
 	faceplayer
 	message Text_MayIHelpYou
diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc
index ad839b0ad..ffb4678b2 100644
--- a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc
+++ b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc
@@ -78,38 +78,38 @@ SaffronCity_PokemonTrainerFanClub_OnTransition:: @ 816F144
 	end
 
 EventScript_16F15B:: @ 816F15B
-	special UpdateMovedSaffronFanClubMembers
-	setvar VAR_0x8004, 0
-	specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
-	compare VAR_RESULT, 0
+	special Special_TryLoseFansFromPlayTime
+	setvar VAR_0x8004, FANCLUB_MEMBER1
+	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
+	compare VAR_RESULT, FALSE
 	call_if_eq EventScript_16F207
-	setvar VAR_0x8004, 1
-	specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
-	compare VAR_RESULT, 0
+	setvar VAR_0x8004, FANCLUB_MEMBER2
+	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
+	compare VAR_RESULT, FALSE
 	call_if_eq EventScript_16F213
-	setvar VAR_0x8004, 2
-	specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
-	compare VAR_RESULT, 0
+	setvar VAR_0x8004, FANCLUB_MEMBER3
+	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
+	compare VAR_RESULT, FALSE
 	call_if_eq EventScript_16F21F
-	setvar VAR_0x8004, 3
-	specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
-	compare VAR_RESULT, 0
+	setvar VAR_0x8004, FANCLUB_MEMBER4
+	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
+	compare VAR_RESULT, FALSE
 	call_if_eq EventScript_16F22B
-	setvar VAR_0x8004, 4
-	specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
-	compare VAR_RESULT, 0
+	setvar VAR_0x8004, FANCLUB_MEMBER5
+	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
+	compare VAR_RESULT, FALSE
 	call_if_eq EventScript_16F237
-	setvar VAR_0x8004, 5
-	specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
-	compare VAR_RESULT, 0
+	setvar VAR_0x8004, FANCLUB_MEMBER6
+	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
+	compare VAR_RESULT, FALSE
 	call_if_eq EventScript_16F243
-	setvar VAR_0x8004, 6
-	specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
-	compare VAR_RESULT, 0
+	setvar VAR_0x8004, FANCLUB_MEMBER7
+	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
+	compare VAR_RESULT, FALSE
 	call_if_eq EventScript_16F24F
-	setvar VAR_0x8004, 7
-	specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
-	compare VAR_RESULT, 0
+	setvar VAR_0x8004, FANCLUB_MEMBER8
+	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
+	compare VAR_RESULT, FALSE
 	call_if_eq EventScript_16F25B
 	end
 
@@ -164,22 +164,22 @@ EventScript_16F267:: @ 816F267
 SaffronCity_PokemonTrainerFanClub_EventScript_16F281:: @ 816F281
 	lock
 	faceplayer
-	setvar VAR_0x8004, 0
-	special BufferStreakTrainerText
+	setvar VAR_0x8004, FANCLUB_MEMBER1
+	special Special_BufferFanClubTrainerName
 	compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0
 	goto_if_eq EventScript_16F2EE
-	specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
-	compare VAR_RESULT, 1
+	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
+	compare VAR_RESULT, TRUE
 	goto_if_eq EventScript_16F2C0
-	specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
-	compare VAR_RESULT, 7
+	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
+	compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
 	goto_if_eq EventScript_16F2E4
 	msgbox gUnknown_819C420
 	release
 	end
 
 EventScript_16F2C0:: @ 816F2C0
-	specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
+	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, 1
 	goto_if_eq EventScript_16F2DA
 	msgbox gUnknown_819C390
@@ -204,22 +204,22 @@ EventScript_16F2EE:: @ 816F2EE
 SaffronCity_PokemonTrainerFanClub_EventScript_16F2F8:: @ 816F2F8
 	lock
 	faceplayer
-	setvar VAR_0x8004, 3
-	special BufferStreakTrainerText
+	setvar VAR_0x8004, FANCLUB_MEMBER4
+	special Special_BufferFanClubTrainerName
 	compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0
 	goto_if_eq EventScript_16F365
-	specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
-	compare VAR_RESULT, 1
+	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
+	compare VAR_RESULT, TRUE
 	goto_if_eq EventScript_16F337
-	specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
-	compare VAR_RESULT, 7
+	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
+	compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
 	goto_if_eq EventScript_16F35B
 	msgbox gUnknown_819CBD3
 	release
 	end
 
 EventScript_16F337:: @ 816F337
-	specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
+	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, 1
 	goto_if_eq EventScript_16F351
 	msgbox gUnknown_819CB32
@@ -244,22 +244,22 @@ EventScript_16F365:: @ 816F365
 SaffronCity_PokemonTrainerFanClub_EventScript_16F36F:: @ 816F36F
 	lock
 	faceplayer
-	setvar VAR_0x8004, 1
-	special BufferStreakTrainerText
+	setvar VAR_0x8004, FANCLUB_MEMBER2
+	special Special_BufferFanClubTrainerName
 	compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0
 	goto_if_eq EventScript_16F3DC
-	specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
-	compare VAR_RESULT, 1
+	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
+	compare VAR_RESULT, TRUE
 	goto_if_eq EventScript_16F3AE
-	specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
-	compare VAR_RESULT, 7
+	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
+	compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
 	goto_if_eq EventScript_16F3D2
 	msgbox gUnknown_819C6BA
 	release
 	end
 
 EventScript_16F3AE:: @ 816F3AE
-	specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
+	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, 1
 	goto_if_eq EventScript_16F3C8
 	msgbox gUnknown_819C5A9
@@ -284,22 +284,22 @@ EventScript_16F3DC:: @ 816F3DC
 SaffronCity_PokemonTrainerFanClub_EventScript_16F3E6:: @ 816F3E6
 	lock
 	faceplayer
-	setvar VAR_0x8004, 2
-	special BufferStreakTrainerText
+	setvar VAR_0x8004, FANCLUB_MEMBER3
+	special Special_BufferFanClubTrainerName
 	compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0
 	goto_if_eq EventScript_16F453
-	specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
-	compare VAR_RESULT, 1
+	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
+	compare VAR_RESULT, TRUE
 	goto_if_eq EventScript_16F425
-	specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
-	compare VAR_RESULT, 7
+	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
+	compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
 	goto_if_eq EventScript_16F449
 	msgbox gUnknown_819C986
 	release
 	end
 
 EventScript_16F425:: @ 816F425
-	specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
+	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, 1
 	goto_if_eq EventScript_16F43F
 	msgbox gUnknown_819C81E
@@ -324,20 +324,20 @@ EventScript_16F453:: @ 816F453
 SaffronCity_PokemonTrainerFanClub_EventScript_16F45D:: @ 816F45D
 	lock
 	faceplayer
-	setvar VAR_0x8004, 5
-	special BufferStreakTrainerText
-	specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
-	compare VAR_RESULT, 1
+	setvar VAR_0x8004, FANCLUB_MEMBER6
+	special Special_BufferFanClubTrainerName
+	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
+	compare VAR_RESULT, TRUE
 	goto_if_eq EventScript_16F491
-	specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
-	compare VAR_RESULT, 7
+	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
+	compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
 	goto_if_eq EventScript_16F4B5
 	msgbox gUnknown_819D01F
 	release
 	end
 
 EventScript_16F491:: @ 816F491
-	specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
+	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, 1
 	goto_if_eq EventScript_16F4AB
 	msgbox gUnknown_819CEDF
@@ -357,20 +357,20 @@ EventScript_16F4B5:: @ 816F4B5
 SaffronCity_PokemonTrainerFanClub_EventScript_16F4BF:: @ 816F4BF
 	lock
 	faceplayer
-	setvar VAR_0x8004, 4
-	special BufferStreakTrainerText
-	specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
-	compare VAR_RESULT, 1
+	setvar VAR_0x8004, FANCLUB_MEMBER5
+	special Special_BufferFanClubTrainerName
+	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
+	compare VAR_RESULT, TRUE
 	goto_if_eq EventScript_16F4F3
-	specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
-	compare VAR_RESULT, 7
+	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
+	compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
 	goto_if_eq EventScript_16F517
 	msgbox gUnknown_819CDDA
 	release
 	end
 
 EventScript_16F4F3:: @ 816F4F3
-	specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
+	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, 1
 	goto_if_eq EventScript_16F50D
 	msgbox gUnknown_819CCF3
@@ -390,20 +390,20 @@ EventScript_16F517:: @ 816F517
 SaffronCity_PokemonTrainerFanClub_EventScript_16F521:: @ 816F521
 	lock
 	faceplayer
-	setvar VAR_0x8004, 6
-	special BufferStreakTrainerText
-	specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
-	compare VAR_RESULT, 1
+	setvar VAR_0x8004, FANCLUB_MEMBER7
+	special Special_BufferFanClubTrainerName
+	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
+	compare VAR_RESULT, TRUE
 	goto_if_eq EventScript_16F555
-	specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
-	compare VAR_RESULT, 7
+	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
+	compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
 	goto_if_eq EventScript_16F579
 	msgbox gUnknown_819D1AE
 	release
 	end
 
 EventScript_16F555:: @ 816F555
-	specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
+	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, 1
 	goto_if_eq EventScript_16F56F
 	msgbox gUnknown_819D0E3
@@ -423,20 +423,20 @@ EventScript_16F579:: @ 816F579
 SaffronCity_PokemonTrainerFanClub_EventScript_16F583:: @ 816F583
 	lock
 	faceplayer
-	setvar VAR_0x8004, 7
-	special BufferStreakTrainerText
-	specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
-	compare VAR_RESULT, 1
+	setvar VAR_0x8004, FANCLUB_MEMBER8
+	special Special_BufferFanClubTrainerName
+	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
+	compare VAR_RESULT, TRUE
 	goto_if_eq EventScript_16F5B7
-	specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
-	compare VAR_RESULT, 7
+	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
+	compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
 	goto_if_eq EventScript_16F5DB
 	msgbox gUnknown_819D3D2
 	release
 	end
 
 EventScript_16F5B7:: @ 816F5B7
-	specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
+	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, 1
 	goto_if_eq EventScript_16F5D1
 	msgbox gUnknown_819D2B4
diff --git a/data/maps/SeafoamIslands_B4F/scripts.inc b/data/maps/SeafoamIslands_B4F/scripts.inc
index c18472399..1882fb3a3 100644
--- a/data/maps/SeafoamIslands_B4F/scripts.inc
+++ b/data/maps/SeafoamIslands_B4F/scripts.inc
@@ -153,9 +153,7 @@ Movement_1631AA:: @ 81631AA
 	step_end
 
 SeafoamIslands_B4F_EventScript_1631AC:: @ 81631AC
-	special sub_8110AB4
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if_questlog EventScript_ReleaseEnd
 	special sub_8112364
 	lock
 	faceplayer
diff --git a/data/maps/SevenIsland_Mart/scripts.inc b/data/maps/SevenIsland_Mart/scripts.inc
index 0fc710d8a..2757fba07 100644
--- a/data/maps/SevenIsland_Mart/scripts.inc
+++ b/data/maps/SevenIsland_Mart/scripts.inc
@@ -2,9 +2,7 @@ SevenIsland_Mart_MapScripts:: @ 8170B30
 	.byte 0
 
 SevenIsland_Mart_EventScript_170B31:: @ 8170B31
-	special sub_8110AB4
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if_questlog EventScript_ReleaseEnd
 	lock
 	faceplayer
 	message Text_MayIHelpYou
diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc
index 713400e2a..0558b5a8b 100644
--- a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc
+++ b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc
@@ -124,9 +124,7 @@ EventScript_164990:: @ 8164990
 	end
 
 SevenIsland_TrainerTower_Lobby_EventScript_164992:: @ 8164992
-	special sub_8110AB4
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if_questlog EventScript_ReleaseEnd
 	lock
 	faceplayer
 	message Text_MayIHelpYou
diff --git a/data/maps/SixIsland_Mart/scripts.inc b/data/maps/SixIsland_Mart/scripts.inc
index 1edcae092..777948764 100644
--- a/data/maps/SixIsland_Mart/scripts.inc
+++ b/data/maps/SixIsland_Mart/scripts.inc
@@ -2,9 +2,7 @@ SixIsland_Mart_MapScripts:: @ 8171E65
 	.byte 0
 
 SixIsland_Mart_EventScript_171E66:: @ 8171E66
-	special sub_8110AB4
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if_questlog EventScript_ReleaseEnd
 	lock
 	faceplayer
 	message Text_MayIHelpYou
diff --git a/data/maps/SixIsland_WaterPath_House1/scripts.inc b/data/maps/SixIsland_WaterPath_House1/scripts.inc
index e8784d75c..a8efb4608 100644
--- a/data/maps/SixIsland_WaterPath_House1/scripts.inc
+++ b/data/maps/SixIsland_WaterPath_House1/scripts.inc
@@ -4,9 +4,7 @@ SixIsland_WaterPath_House1_MapScripts:: @ 817206C
 SixIsland_WaterPath_House1_EventScript_17206D:: @ 817206D
 	lock
 	faceplayer
-	special sub_8110AB4
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if_questlog EventScript_ReleaseEnd
 	special sub_8112364
 	setvar VAR_0x8004, SPECIES_HERACROSS
 	specialvar VAR_RESULT, Special_PlayerPartyContainsSpecies
diff --git a/data/maps/ThreeIsland_BerryForest/scripts.inc b/data/maps/ThreeIsland_BerryForest/scripts.inc
index 9ac90a4c4..cf1693258 100644
--- a/data/maps/ThreeIsland_BerryForest/scripts.inc
+++ b/data/maps/ThreeIsland_BerryForest/scripts.inc
@@ -17,9 +17,7 @@ ThreeIsland_BerryForest_EventScript_163C83:: @ 8163C83
 	applymovement 1, Movement_163D22
 	waitmovement 0
 	msgbox gUnknown_817AE8E
-	special sub_8110AB4
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if_questlog EventScript_ReleaseEnd
 	waitse
 	playmoncry SPECIES_HYPNO, 2
 	waitmoncry
diff --git a/data/maps/ThreeIsland_Mart/scripts.inc b/data/maps/ThreeIsland_Mart/scripts.inc
index 074d78cd9..02afb8eb4 100644
--- a/data/maps/ThreeIsland_Mart/scripts.inc
+++ b/data/maps/ThreeIsland_Mart/scripts.inc
@@ -2,9 +2,7 @@ ThreeIsland_Mart_MapScripts:: @ 817188C
 	.byte 0
 
 ThreeIsland_Mart_EventScript_17188D:: @ 817188D
-	special sub_8110AB4
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if_questlog EventScript_ReleaseEnd
 	lock
 	faceplayer
 	message Text_MayIHelpYou
diff --git a/data/maps/TwoIsland/scripts.inc b/data/maps/TwoIsland/scripts.inc
index 59c4ca6f9..acfb2c38b 100644
--- a/data/maps/TwoIsland/scripts.inc
+++ b/data/maps/TwoIsland/scripts.inc
@@ -58,9 +58,7 @@ EventScript_167606:: @ 8167606
 	return
 
 TwoIsland_EventScript_16760F:: @ 816760F
-	special sub_8110AB4
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if_questlog EventScript_ReleaseEnd
 	lock
 	faceplayer
 	compare VAR_MAP_SCENE_TWO_ISLAND, 4
diff --git a/data/maps/TwoIsland_House/scripts.inc b/data/maps/TwoIsland_House/scripts.inc
index f6268567d..9177de9cb 100644
--- a/data/maps/TwoIsland_House/scripts.inc
+++ b/data/maps/TwoIsland_House/scripts.inc
@@ -2,9 +2,7 @@ TwoIsland_House_MapScripts:: @ 8171618
 	.byte 0
 
 TwoIsland_House_EventScript_171619:: @ 8171619
-	special sub_8110AB4
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if_questlog EventScript_ReleaseEnd
 	special sub_8112364
 	lock
 	faceplayer
diff --git a/data/maps/VermilionCity/scripts.inc b/data/maps/VermilionCity/scripts.inc
index 7767bbb2b..ad6a36007 100644
--- a/data/maps/VermilionCity/scripts.inc
+++ b/data/maps/VermilionCity/scripts.inc
@@ -83,9 +83,7 @@ EventScript_166996:: @ 8166996
 	end
 
 EventScript_1669BB:: @ 81669BB
-	special sub_8110AB4
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if_questlog EventScript_ReleaseEnd
 	special sub_8112364
 	call EventScript_166958
 	compare VAR_RESULT, 1
diff --git a/data/maps/VermilionCity_Gym/scripts.inc b/data/maps/VermilionCity_Gym/scripts.inc
index baf3d82df..0d95d76f8 100644
--- a/data/maps/VermilionCity_Gym/scripts.inc
+++ b/data/maps/VermilionCity_Gym/scripts.inc
@@ -136,9 +136,7 @@ VermilionCity_Gym_EventScript_16B837:: @ 816B837
 	end
 
 EventScript_16B843:: @ 816B843
-	special sub_8110AB4
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if_questlog EventScript_ReleaseEnd
 	special sub_8112364
 	copyvar VAR_0x8004, VAR_TEMP_0
 	copyvar VAR_0x8005, VAR_TEMP_1
diff --git a/data/maps/VermilionCity_Mart/scripts.inc b/data/maps/VermilionCity_Mart/scripts.inc
index ccb50f313..3af796ada 100644
--- a/data/maps/VermilionCity_Mart/scripts.inc
+++ b/data/maps/VermilionCity_Mart/scripts.inc
@@ -10,9 +10,7 @@ VermilionCity_Mart_EventScript_16B65D:: @ 816B65D
 	end
 
 VermilionCity_Mart_EventScript_16B666:: @ 816B666
-	special sub_8110AB4
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if_questlog EventScript_ReleaseEnd
 	lock
 	faceplayer
 	message Text_MayIHelpYou
diff --git a/data/maps/ViridianCity/scripts.inc b/data/maps/ViridianCity/scripts.inc
index cbd813d03..c317a92eb 100644
--- a/data/maps/ViridianCity/scripts.inc
+++ b/data/maps/ViridianCity/scripts.inc
@@ -140,9 +140,7 @@ EventScript_165A5B:: @ 8165A5B
 
 EventScript_165A65:: @ 8165A65
 	msgbox gUnknown_817DE9B
-	special sub_8110AB4
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if_questlog EventScript_ReleaseEnd
 	special sub_8112364
 	special ScrSpecial_StartOldManTutorialBattle
 	waitstate
@@ -235,9 +233,7 @@ ViridianCity_EventScript_165B2E:: @ 8165B2E
 EventScript_165B4C:: @ 8165B4C
 	msgbox gUnknown_817DD4E
 	closemessage
-	special sub_8110AB4
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if_questlog EventScript_ReleaseEnd
 	special sub_8112364
 	special ScrSpecial_StartOldManTutorialBattle
 	waitstate
diff --git a/data/maps/ViridianCity_Mart/scripts.inc b/data/maps/ViridianCity_Mart/scripts.inc
index fb77b7924..1f66937cf 100644
--- a/data/maps/ViridianCity_Mart/scripts.inc
+++ b/data/maps/ViridianCity_Mart/scripts.inc
@@ -54,9 +54,7 @@ ViridianCity_Mart_EventScript_16A268:: @ 816A268
 	faceplayer
 	compare VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1
 	goto_if_eq EventScript_16A2A4
-	special sub_8110AB4
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_1A7AE0
+	goto_if_questlog EventScript_ReleaseEnd
 	message Text_MayIHelpYou
 	waitmessage
 	pokemart Items_16A298