7 files changed, 42 insertions, 42 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s
index 1f92add45..dd95e39e3 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -714,44 +714,10 @@ UnknownString_819C21F: @ 819C21F
 	.include "data/scripts/std_msgbox.inc"
 	.include "data/scripts/trainer_battle.inc"
 	.include "data/scripts/new_game.inc"
-
-EverGrandeCity_HallOfFame_EventScript_19FC13:: @ 819FC13
-	clearflag FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE
-	call EverGrandeCity_HallOfFame_EventScript_19FD09
-	setflag FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD
-	clearflag FLAG_HIDE_BRINEY_AND_PEEKO_SS_TIDAL
-	clearflag FLAG_HIDE_STEVENS_LETTER
-	setvar VAR_STEVENS_HOUSE_STATE, 1
-	clearflag FLAG_HIDE_WALLY_DEFEATED_VICTORY_ROAD
-	clearflag FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR
-	clearflag FLAG_HIDE_SS_TIDAL_LILYCOVE_HARBOR
-	special sub_810FAA0
-	call_if_unset FLAG_RECEIVED_SS_TICKET, EverGrandeCity_HallOfFame_EventScript_19FC62
-	call_if_unset FLAG_LATIOS_OR_LATIAS_ROAMING, EverGrandeCity_HallOfFame_EventScript_19FC70
-	call_if_unset FLAG_RECEIVED_BELDUM, EverGrandeCity_HallOfFame_EventScript_19FC5A
-	call_if_unset FLAG_RECEIVED_HM08, EverGrandeCity_HallOfFame_EventScript_19FC5E
-	return
-
-EverGrandeCity_HallOfFame_EventScript_19FC5A:: @ 819FC5A
-	clearflag FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE
-	return
-
-EverGrandeCity_HallOfFame_EventScript_19FC5E:: @ 819FC5E
-	clearflag FLAG_ITEM_MOSSDEEP_STEVENS_HOUSE_1
-	return
-
-EverGrandeCity_HallOfFame_EventScript_19FC62:: @ 819FC62
-	setvar VAR_LITTLEROOT_HOUSES_STATE, 3
-	setvar VAR_LITTLEROOT_HOUSES_STATE_2, 3
-	clearflag FLAG_HIDE_NORMAN_LITTLEROOT
-	return
-
-EverGrandeCity_HallOfFame_EventScript_19FC70:: @ 819FC70
-	setflag FLAG_SYS_TV_LATI
-	return
+	.include "data/scripts/hall_of_fame.inc"
 
 S_WhiteOut:: @ 819FC74
-	call EverGrandeCity_HallOfFame_EventScript_19FD09
+	call EverGrandeCity_HallOfFame_EventScript_ResetEliteFour
 	call EventScript_19FC84
 	goto gUnknown_0819FC9F
 	end
@@ -804,7 +770,7 @@ EventScript_19FCF0:
 	clearflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109
 	end
 
-EverGrandeCity_HallOfFame_EventScript_19FD09:: @ 819FD09
+EverGrandeCity_HallOfFame_EventScript_ResetEliteFour:: @ 819FD09
 	clearflag FLAG_DEFEATED_ELITE_4_SYDNEY
 	clearflag FLAG_DEFEATED_ELITE_4_PHOEBE
 	clearflag FLAG_DEFEATED_ELITE_4_GLACIA
diff --git a/data/maps/EverGrandeCity_HallOfFame/scripts.inc b/data/maps/EverGrandeCity_HallOfFame/scripts.inc
index 13079c5bd..9884edb27 100644
--- a/data/maps/EverGrandeCity_HallOfFame/scripts.inc
+++ b/data/maps/EverGrandeCity_HallOfFame/scripts.inc
@@ -42,7 +42,7 @@ EverGrandeCity_HallOfFame_EventScript_15BBA8:: @ 815BBA8
 	waitfieldeffect FLDEFF_HALL_OF_FAME_RECORD
 	delay 40
 	setvar VAR_TEMP_1, 1
-	call EverGrandeCity_HallOfFame_EventScript_19FC13
+	call EverGrandeCity_HallOfFame_EventScript_SetGameClearFlags
 	checkplayergender
 	compare VAR_RESULT, 0
 	goto_if_eq EverGrandeCity_HallOfFame_EventScript_15BC41
diff --git a/data/maps/MossdeepCity_StevensHouse/map.json b/data/maps/MossdeepCity_StevensHouse/map.json
index 1f3be9321..b65c63d3d 100644
--- a/data/maps/MossdeepCity_StevensHouse/map.json
+++ b/data/maps/MossdeepCity_StevensHouse/map.json
@@ -48,7 +48,7 @@
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "MossdeepCity_StevensHouse_EventScript_15AB20",
-      "flag": "FLAG_ITEM_MOSSDEEP_STEVENS_HOUSE_1"
+      "flag": "FLAG_ITEM_MOSSDEEP_STEVENS_HOUSE_HM08"
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1",
diff --git a/data/scripts/debug.inc b/data/scripts/debug.inc
index c8f795d56..c683c90e0 100644
--- a/data/scripts/debug.inc
+++ b/data/scripts/debug.inc
@@ -2,7 +2,7 @@
 
 DebugScript_081C1CFE:: @ 81C1CFE
 	setflag FLAG_SYS_GAME_CLEAR
-	call EverGrandeCity_HallOfFame_EventScript_19FC13
+	call EverGrandeCity_HallOfFame_EventScript_SetGameClearFlags
 	end
 
 DebugScript_081C1D07:: @ 81C1D07
diff --git a/data/scripts/hall_of_fame.inc b/data/scripts/hall_of_fame.inc
new file mode 100644
index 000000000..21ea702d4
--- /dev/null
+++ b/data/scripts/hall_of_fame.inc
@@ -0,0 +1,34 @@
+EverGrandeCity_HallOfFame_EventScript_SetGameClearFlags:: @ 819FC13
+	clearflag FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE
+	call EverGrandeCity_HallOfFame_EventScript_ResetEliteFour
+	setflag FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD
+	clearflag FLAG_HIDE_BRINEY_AND_PEEKO_SS_TIDAL
+	clearflag FLAG_HIDE_STEVENS_LETTER
+	setvar VAR_STEVENS_HOUSE_STATE, 1
+	clearflag FLAG_HIDE_WALLY_DEFEATED_VICTORY_ROAD
+	clearflag FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR
+	clearflag FLAG_HIDE_SS_TIDAL_LILYCOVE_HARBOR
+	special UpdateTrainerFanClubGameClear
+	call_if_unset FLAG_RECEIVED_SS_TICKET, EverGrandeCity_HallOfFame_EventScript_ReadyReceiveSSTicketEvent
+	call_if_unset FLAG_LATIOS_OR_LATIAS_ROAMING, EverGrandeCity_HallOfFame_EventScript_ReadyLatiTVEvent
+	call_if_unset FLAG_RECEIVED_BELDUM, EverGrandeCity_HallOfFame_EventScript_ShowStevensBeldum
+	call_if_unset FLAG_RECEIVED_HM08, EverGrandeCity_HallOfFame_EventScript_ShowHM08
+	return
+
+EverGrandeCity_HallOfFame_EventScript_ShowStevensBeldum:: @ 819FC5A
+	clearflag FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE
+	return
+
+EverGrandeCity_HallOfFame_EventScript_ShowHM08:: @ 819FC5E
+	clearflag FLAG_ITEM_MOSSDEEP_STEVENS_HOUSE_HM08
+	return
+
+EverGrandeCity_HallOfFame_EventScript_ReadyReceiveSSTicketEvent:: @ 819FC62
+	setvar VAR_LITTLEROOT_HOUSES_STATE, 3
+	setvar VAR_LITTLEROOT_HOUSES_STATE_2, 3
+	clearflag FLAG_HIDE_NORMAN_LITTLEROOT
+	return
+
+EverGrandeCity_HallOfFame_EventScript_ReadyLatiTVEvent:: @ 819FC70
+	setflag FLAG_SYS_TV_LATI
+	return
diff --git a/data/scripts/new_game.inc b/data/scripts/new_game.inc
index 99eceb741..f27b43107 100644
--- a/data/scripts/new_game.inc
+++ b/data/scripts/new_game.inc
@@ -209,7 +209,7 @@ EventScript_ResetAllMapFlags:: @ 819FA81
 	setflag FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD
 	setflag FLAG_HIDE_BRINEY_AND_PEEKO_SS_TIDAL
 	setflag FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE
-	setflag FLAG_ITEM_MOSSDEEP_STEVENS_HOUSE_1
+	setflag FLAG_ITEM_MOSSDEEP_STEVENS_HOUSE_HM08
 	setflag FLAG_HIDE_STEVENS_LETTER
 	setflag FLAG_HIDE_RIVAL_OLDALE_TOWN
 	setflag FLAG_HIDE_WALLY_DEFEATED_VICTORY_ROAD
diff --git a/data/specials.inc b/data/specials.inc
index 07187eb47..1427c284e 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -177,7 +177,7 @@ gSpecials::
 	def_special sub_810FA74
 	def_special UpdateMovedLilycoveFanClubMembers
 	def_special sub_810FF48
-	def_special sub_810FAA0
+	def_special UpdateTrainerFanClubGameClear
 	def_special sub_810FF60
 	def_special ScrSpecial_RockSmashWildEncounter
 	def_special GabbyAndTyGetBattleNum