Two additional script macros

43 files changed, 196 insertions, 390 deletions

diff --git a/asm/macros/event.inc b/asm/macros/event.inc
index 83ae4f493..98910b1cc 100644
--- a/asm/macros/event.inc
+++ b/asm/macros/event.inc
@@ -1441,3 +1441,14 @@
 	setorcopyvar 0x8002, \fanfare
 	callstd 9
 	.endm
+
+	.macro famechecker person, index
+	setvar VAR_0x8004, \person
+	setvar VAR_0x8005, \index
+	special SetFlavorTextFlagFromSpecialVars
+	.endm
+
+	.macro set_gym_trainers gym
+	setvar VAR_0x8008, \gym
+	call EventScript_1A6B18
+	.endm
diff --git a/data/event_scripts.s b/data/event_scripts.s
index b3ffff452..f0aab14b1 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -13,6 +13,7 @@
 #include "constants/field_effects.h"
 #include "constants/trainers.h"
 #include "constants/map_objects.h"
+#include "constants/fame_checker.h"
 	.include "asm/macros.inc"
 	.include "asm/macros/event.inc"
 
@@ -1565,11 +1566,11 @@ gUnknown_81A654B:: @ 81A654B
 	end
 
 EventScript_1A6551:: @ 81A6551
-	clearflag FLAG_0x4B8
-	clearflag FLAG_0x4B9
-	clearflag FLAG_0x4BA
-	clearflag FLAG_0x4BB
-	clearflag FLAG_0x4BC
+	clearflag FLAG_DEFEATED_LORELEI
+	clearflag FLAG_DEFEATED_BRUNO
+	clearflag FLAG_DEFEATED_AGATHA
+	clearflag FLAG_DEFEATED_LANCE
+	clearflag FLAG_DEFEATED_RIVAL
 	cleartrainerflag TRAINER_CHAMPION_TERRY
 	cleartrainerflag TRAINER_CHAMPION_TERRY_2
 	cleartrainerflag TRAINER_CHAMPION_TERRY_3
@@ -4090,9 +4091,9 @@ gUnknown_81A8D97:: @ 81A8D97
 	textcolor 1
 	msgbox Text_1A5E89
 	call EventScript_1A65CE
-	checkflag FLAG_0x4B0
+	checkflag FLAG_DEFEATED_BROCK
 	call_if 0, EventScript_1A8DC6
-	checkflag FLAG_0x4B0
+	checkflag FLAG_DEFEATED_BROCK
 	call_if 1, EventScript_1A8DCF
 	applymovement VAR_LAST_TALKED, Movement_1A666C
 	waitmovement 0
@@ -7659,12 +7660,8 @@ Text_1ACD45:: @ 81ACD45
 ViridianCity_House2_EventScript_1ACD65:: @ 81ACD65
 	lock
 	faceplayer
-	setvar VAR_0x8004, 0
-	setvar VAR_0x8005, 3
-	special SetFlavorTextFlagFromSpecialVars
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 3
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_OAK, 3
+	famechecker FAMECHECKER_DAISY, 3
 	textcolor 3
 	msgbox gUnknown_81B1AB9
 	release
@@ -7673,12 +7670,8 @@ ViridianCity_House2_EventScript_1ACD65:: @ 81ACD65
 EventScript_1ACD8D:: @ 81ACD8D
 	lock
 	faceplayer
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 1
-	special SetFlavorTextFlagFromSpecialVars
-	setvar VAR_0x8004, 0
-	setvar VAR_0x8005, 4
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_DAISY, 1
+	famechecker FAMECHECKER_OAK, 4
 	textcolor 3
 	msgbox gUnknown_81B1AB9
 	release
@@ -7687,9 +7680,7 @@ EventScript_1ACD8D:: @ 81ACD8D
 EventScript_1ACDB5:: @ 81ACDB5
 	lock
 	faceplayer
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 4
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_DAISY, 4
 	textcolor 3
 	msgbox gUnknown_81B1AB9
 	release
@@ -7697,9 +7688,7 @@ EventScript_1ACDB5:: @ 81ACDB5
 
 FourIsland_PokemonCenter_1F_EventScript_1ACDD0:: @ 81ACDD0
 	lockall
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 5
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_DAISY, 5
 	textcolor 3
 	msgbox gUnknown_81B1B3D
 	releaseall
@@ -7708,9 +7697,7 @@ FourIsland_PokemonCenter_1F_EventScript_1ACDD0:: @ 81ACDD0
 Route4_EventScript_1ACDEA:: @ 81ACDEA
 	lock
 	faceplayer
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 3
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_BROCK, 3
 	msgbox Text_183D26
 	release
 	end
@@ -7718,18 +7705,14 @@ Route4_EventScript_1ACDEA:: @ 81ACDEA
 MtMoon_1F_EventScript_1ACE03:: @ 81ACE03
 	lock
 	faceplayer
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 4
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_BROCK, 4
 	msgbox Text_172B00
 	release
 	end
 
 PewterCity_Museum_1F_EventScript_1ACE1C:: @ 81ACE1C
 	lockall
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 5
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_BROCK, 5
 	textcolor 3
 	msgbox gUnknown_81B146A
 	releaseall
@@ -7738,9 +7721,7 @@ PewterCity_Museum_1F_EventScript_1ACE1C:: @ 81ACE1C
 Route20_EventScript_1ACE36:: @ 81ACE36
 	lock
 	faceplayer
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 3
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_MISTY, 3
 	msgbox Text_1882E1
 	release
 	end
@@ -7748,9 +7729,7 @@ Route20_EventScript_1ACE36:: @ 81ACE36
 Route25_EventScript_1ACE4F:: @ 81ACE4F
 	lock
 	faceplayer
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 4
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_MISTY, 4
 	msgbox Text_189569
 	release
 	end
@@ -7758,9 +7737,7 @@ Route25_EventScript_1ACE4F:: @ 81ACE4F
 CeruleanCity_PokemonCenter_1F_EventScript_1ACE68:: @ 81ACE68
 	lock
 	faceplayer
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 5
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_MISTY, 5
 	textcolor 3
 	msgbox gUnknown_81B14E8
 	release
@@ -7768,9 +7745,7 @@ CeruleanCity_PokemonCenter_1F_EventScript_1ACE68:: @ 81ACE68
 
 VermilionCity_PokemonCenter_1F_EventScript_1ACE83:: @ 81ACE83
 	lockall
-	setvar VAR_0x8004, 4
-	setvar VAR_0x8005, 5
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_LTSURGE, 5
 	textcolor 3
 	msgbox gUnknown_81B1558
 	releaseall
@@ -7779,9 +7754,7 @@ VermilionCity_PokemonCenter_1F_EventScript_1ACE83:: @ 81ACE83
 CeladonCity_Condominiums_2F_EventScript_1ACE9D:: @ 81ACE9D
 	lock
 	faceplayer
-	setvar VAR_0x8004, 5
-	setvar VAR_0x8005, 5
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_ERIKA, 5
 	textcolor 3
 	msgbox gUnknown_81B161B
 	release
@@ -7790,9 +7763,7 @@ CeladonCity_Condominiums_2F_EventScript_1ACE9D:: @ 81ACE9D
 FuchsiaCity_Building1_EventScript_1ACEB8:: @ 81ACEB8
 	lock
 	faceplayer
-	setvar VAR_0x8004, 6
-	setvar VAR_0x8005, 4
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_KOGA, 4
 	textcolor 3
 	msgbox gUnknown_81B16A8
 	release
@@ -7801,9 +7772,7 @@ FuchsiaCity_Building1_EventScript_1ACEB8:: @ 81ACEB8
 SafariZone_Building3_EventScript_1ACED3:: @ 81ACED3
 	lock
 	faceplayer
-	setvar VAR_0x8004, 6
-	setvar VAR_0x8005, 5
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_KOGA, 5
 	msgbox Text_177C47
 	release
 	end
@@ -7811,9 +7780,7 @@ SafariZone_Building3_EventScript_1ACED3:: @ 81ACED3
 SaffronCity_PokemonCenter_1F_EventScript_1ACEEC:: @ 81ACEEC
 	lock
 	faceplayer
-	setvar VAR_0x8004, 7
-	setvar VAR_0x8005, 4
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_SABRINA, 4
 	textcolor 3
 	msgbox gUnknown_81B1753
 	release
@@ -7821,21 +7788,15 @@ SaffronCity_PokemonCenter_1F_EventScript_1ACEEC:: @ 81ACEEC
 
 CinnabarIsland_Gym_EventScript_1ACF07:: @ 81ACF07
 	lockall
-	setvar VAR_0x8004, 8
-	setvar VAR_0x8005, 4
-	special SetFlavorTextFlagFromSpecialVars
-	setvar VAR_0x8004, 14
-	setvar VAR_0x8005, 4
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_BLAINE, 4
+	famechecker FAMECHECKER_MRFUJI, 4
 	msgbox Text_199E8A
 	releaseall
 	end
 
 FiveIsland_ResortGorgeous_House_EventScript_1ACF2C:: @ 81ACF2C
 	lockall
-	setvar VAR_0x8004, 8
-	setvar VAR_0x8005, 5
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_BLAINE, 5
 	textcolor 3
 	msgbox gUnknown_81B17E9
 	releaseall
@@ -7844,9 +7805,7 @@ FiveIsland_ResortGorgeous_House_EventScript_1ACF2C:: @ 81ACF2C
 FourIsland_Mart_EventScript_1ACF46:: @ 81ACF46
 	lock
 	faceplayer
-	setvar VAR_0x8004, 9
-	setvar VAR_0x8005, 2
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_LORELEI, 2
 	msgbox Text_1A3A60
 	release
 	end
@@ -7854,9 +7813,7 @@ FourIsland_Mart_EventScript_1ACF46:: @ 81ACF46
 FiveIsland_PokemonCenter_1F_EventScript_1ACF5F:: @ 81ACF5F
 	lock
 	faceplayer
-	setvar VAR_0x8004, 9
-	setvar VAR_0x8005, 3
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_LORELEI, 3
 	textcolor 3
 	msgbox gUnknown_81B187F
 	release
@@ -7865,9 +7822,7 @@ FiveIsland_PokemonCenter_1F_EventScript_1ACF5F:: @ 81ACF5F
 SaffronCity_PokemonTrainerFanClub_EventScript_1ACF7A:: @ 81ACF7A
 	lock
 	faceplayer
-	setvar VAR_0x8004, 10
-	setvar VAR_0x8005, 2
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_BRUNO, 2
 	textcolor 3
 	msgbox gUnknown_81B1913
 	release
@@ -7876,9 +7831,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_1ACF7A:: @ 81ACF7A
 SevenIsland_SevaultCanyon_EventScript_1ACF95:: @ 81ACF95
 	lock
 	faceplayer
-	setvar VAR_0x8004, 10
-	setvar VAR_0x8005, 5
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_BRUNO, 5
 	msgbox Text_18CF4D
 	release
 	end
@@ -7886,12 +7839,8 @@ SevenIsland_SevaultCanyon_EventScript_1ACF95:: @ 81ACF95
 IndigoPlateau_PokemonCenter_1F_EventScript_1ACFAE:: @ 81ACFAE
 	lock
 	faceplayer
-	setvar VAR_0x8004, 11
-	setvar VAR_0x8005, 1
-	special SetFlavorTextFlagFromSpecialVars
-	setvar VAR_0x8004, 11
-	setvar VAR_0x8005, 2
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_AGATHA, 1
+	famechecker FAMECHECKER_AGATHA, 2
 	msgbox Text_19A9E7
 	release
 	end
@@ -7899,9 +7848,7 @@ IndigoPlateau_PokemonCenter_1F_EventScript_1ACFAE:: @ 81ACFAE
 SevenIsland_PokemonCenter_1F_EventScript_1ACFD4:: @ 81ACFD4
 	lock
 	faceplayer
-	setvar VAR_0x8004, 11
-	setvar VAR_0x8005, 3
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_AGATHA, 3
 	textcolor 3
 	msgbox gUnknown_81B19A8
 	release
@@ -7910,9 +7857,7 @@ SevenIsland_PokemonCenter_1F_EventScript_1ACFD4:: @ 81ACFD4
 SixIsland_Mart_EventScript_1ACFEF:: @ 81ACFEF
 	lock
 	faceplayer
-	setvar VAR_0x8004, 11
-	setvar VAR_0x8005, 5
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_AGATHA, 5
 	msgbox Text_1A41CA
 	release
 	end
@@ -7920,9 +7865,7 @@ SixIsland_Mart_EventScript_1ACFEF:: @ 81ACFEF
 EventScript_1AD008:: @ 81AD008
 	lock
 	faceplayer
-	setvar VAR_0x8004, 12
-	setvar VAR_0x8005, 0
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_LANCE, 0
 	msgbox gFameCheckerFlavorText_Lance0
 	release
 	end
@@ -7930,9 +7873,7 @@ EventScript_1AD008:: @ 81AD008
 EventScript_1AD021:: @ 81AD021
 	lock
 	faceplayer
-	setvar VAR_0x8004, 12
-	setvar VAR_0x8005, 1
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_LANCE, 1
 	msgbox Text_181569
 	release
 	end
@@ -7940,9 +7881,7 @@ EventScript_1AD021:: @ 81AD021
 SaffronCity_EventScript_1AD03A:: @ 81AD03A
 	lock
 	faceplayer
-	setvar VAR_0x8004, 12
-	setvar VAR_0x8005, 2
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_LANCE, 2
 	msgbox Text_181569
 	release
 	end
@@ -7950,9 +7889,7 @@ SaffronCity_EventScript_1AD03A:: @ 81AD03A
 CeladonCity_DepartmentStore_2F_EventScript_1AD053:: @ 81AD053
 	lock
 	faceplayer
-	setvar VAR_0x8004, 12
-	setvar VAR_0x8005, 3
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_LANCE, 3
 	msgbox Text_19566B
 	release
 	end
@@ -7960,9 +7897,7 @@ CeladonCity_DepartmentStore_2F_EventScript_1AD053:: @ 81AD053
 IndigoPlateau_PokemonCenter_1F_EventScript_1AD06C:: @ 81AD06C
 	lock
 	faceplayer
-	setvar VAR_0x8004, 12
-	setvar VAR_0x8005, 4
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_LANCE, 4
 	textcolor 3
 	msgbox gUnknown_81B1A31
 	release
@@ -7971,9 +7906,7 @@ IndigoPlateau_PokemonCenter_1F_EventScript_1AD06C:: @ 81AD06C
 IndigoPlateau_PokemonCenter_1F_EventScript_1AD087:: @ 81AD087
 	lock
 	faceplayer
-	setvar VAR_0x8004, 12
-	setvar VAR_0x8005, 5
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_LANCE, 5
 	msgbox Text_19AB16
 	release
 	end
@@ -7981,9 +7914,7 @@ IndigoPlateau_PokemonCenter_1F_EventScript_1AD087:: @ 81AD087
 LavenderTown_PokemonCenter_1F_EventScript_1AD0A0:: @ 81AD0A0
 	lock
 	faceplayer
-	setvar VAR_0x8004, 14
-	setvar VAR_0x8005, 3
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_MRFUJI, 3
 	msgbox Text_19358E
 	release
 	end
@@ -7991,9 +7922,7 @@ LavenderTown_PokemonCenter_1F_EventScript_1AD0A0:: @ 81AD0A0
 CinnabarIsland_PokemonCenter_1F_EventScript_1AD0B9:: @ 81AD0B9
 	lock
 	faceplayer
-	setvar VAR_0x8004, 14
-	setvar VAR_0x8005, 5
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_MRFUJI, 5
 	textcolor 3
 	msgbox gUnknown_81B1BD1
 	release
@@ -8002,18 +7931,15 @@ CinnabarIsland_PokemonCenter_1F_EventScript_1AD0B9:: @ 81AD0B9
 SilphCo_5F_EventScript_1AD0D4:: @ 81AD0D4
 	lock
 	faceplayer
-	setvar VAR_0x8004, 15
-	setvar VAR_0x8005, 1
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_GIOVANNI, 1
 	msgbox Text_175E99
 	release
 	end
+
 SilphCo_8F_EventScript_1AD0ED:: @ 81AD0ED
 	lock
 	faceplayer
-	setvar VAR_0x8004, 15
-	setvar VAR_0x8005, 2
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_GIOVANNI, 2
 	msgbox Text_176ACB
 	release
 	end
diff --git a/data/maps/CeladonCity/scripts.inc b/data/maps/CeladonCity/scripts.inc
index 9f7dc58c2..b5e32115f 100644
--- a/data/maps/CeladonCity/scripts.inc
+++ b/data/maps/CeladonCity/scripts.inc
@@ -77,9 +77,7 @@ CeladonCity_EventScript_166D27:: @ 8166D27
 
 CeladonCity_EventScript_166D30:: @ 8166D30
 	lockall
-	setvar VAR_0x8004, 5
-	setvar VAR_0x8005, 0
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_ERIKA, 0
 	msgbox gUnknown_81801A2
 	releaseall
 	end
diff --git a/data/maps/CeladonCity_Condominiums_1F/scripts.inc b/data/maps/CeladonCity_Condominiums_1F/scripts.inc
index 506ed96a0..dccd69945 100644
--- a/data/maps/CeladonCity_Condominiums_1F/scripts.inc
+++ b/data/maps/CeladonCity_Condominiums_1F/scripts.inc
@@ -25,9 +25,7 @@ EventScript_16C36A:: @ 816C36A
 	end
 
 EventScript_16C374:: @ 816C374
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 4
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_DAISY, 4
 	setflag FLAG_0x2F8
 	msgbox gUnknown_8196188
 	release
diff --git a/data/maps/CeladonCity_GameCorner/scripts.inc b/data/maps/CeladonCity_GameCorner/scripts.inc
index 340d648bb..3fa97339a 100644
--- a/data/maps/CeladonCity_GameCorner/scripts.inc
+++ b/data/maps/CeladonCity_GameCorner/scripts.inc
@@ -167,7 +167,7 @@ EventScript_16C849:: @ 816C849
 CeladonCity_GameCorner_EventScript_16C857:: @ 816C857
 	lock
 	faceplayer
-	checkflag FLAG_0x4B3
+	checkflag FLAG_DEFEATED_ERIKA
 	goto_if_eq EventScript_16C870
 	msgbox gUnknown_8196BAD
 	goto EventScript_16C7CA
diff --git a/data/maps/CeladonCity_Gym/scripts.inc b/data/maps/CeladonCity_Gym/scripts.inc
index 7c3e23424..914dce9a5 100644
--- a/data/maps/CeladonCity_Gym/scripts.inc
+++ b/data/maps/CeladonCity_Gym/scripts.inc
@@ -8,22 +8,17 @@ CeladonCity_Gym_EventScript_16D061:: @ 816D061
 	trainerbattle 1, TRAINER_LEADER_ERIKA, 0, Text_197114, Text_197260, EventScript_16D0A0
 	checkflag FLAG_0x293
 	goto_if 0, EventScript_16D0C6
-	setvar VAR_0x8004, 5
-	setvar VAR_0x8005, 4
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_ERIKA, 4
 	msgbox gUnknown_81972B8
 	release
 	end
 
 EventScript_16D0A0:: @ 816D0A0
-	setvar VAR_0x8004, 5
-	setvar VAR_0x8005, 1
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_ERIKA, 1
 	clearflag FLAG_HIDE_FAME_CHECKER_ERIKA_JOURNALS
-	setflag FLAG_0x4B3
+	setflag FLAG_DEFEATED_ERIKA
 	setflag FLAG_BADGE04_GET
-	setvar VAR_0x8008, 4
-	call EventScript_1A6B18
+	set_gym_trainers 4
 	goto EventScript_16D0C6
 	end
 
@@ -51,9 +46,7 @@ CeladonCity_Gym_EventScript_16D111:: @ 816D111
 
 CeladonCity_Gym_EventScript_16D128:: @ 816D128
 	trainerbattle 0, TRAINER_LASS_LISA, 0, Text_1976C5, Text_1976FF
-	setvar VAR_0x8004, 5
-	setvar VAR_0x8005, 2
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_ERIKA, 2
 	msgbox gUnknown_8197708, 6
 	end
 
@@ -69,9 +62,7 @@ CeladonCity_Gym_EventScript_16D163:: @ 816D163
 
 CeladonCity_Gym_EventScript_16D17A:: @ 816D17A
 	trainerbattle 0, TRAINER_BEAUTY_TAMIA, 0, Text_19760B, Text_197660
-	setvar VAR_0x8004, 5
-	setvar VAR_0x8005, 3
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_ERIKA, 3
 	msgbox gUnknown_8197664, 6
 	end
 
diff --git a/data/maps/CeruleanCity/scripts.inc b/data/maps/CeruleanCity/scripts.inc
index 8ae7552fe..acfda58cb 100644
--- a/data/maps/CeruleanCity/scripts.inc
+++ b/data/maps/CeruleanCity/scripts.inc
@@ -49,9 +49,7 @@ EventScript_1664CC:: @ 81664CC
 	call_if 1, EventScript_16658D
 	compare_var_to_value VAR_STARTER_MON, 0
 	call_if 1, EventScript_166598
-	setvar VAR_0x8004, 13
-	setvar VAR_0x8005, 0
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_BILL, 0
 	msgbox gUnknown_817EB95
 	closemessage
 	playbgm MUS_RIVAL2, 0
@@ -375,9 +373,7 @@ CeruleanCity_EventScript_16684A:: @ 816684A
 
 CeruleanCity_EventScript_166853:: @ 8166853
 	lockall
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 0
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_MISTY, 0
 	msgbox gUnknown_817F4EF
 	releaseall
 	end
diff --git a/data/maps/CeruleanCity_Gym/scripts.inc b/data/maps/CeruleanCity_Gym/scripts.inc
index f91e86b0f..69c282a1c 100644
--- a/data/maps/CeruleanCity_Gym/scripts.inc
+++ b/data/maps/CeruleanCity_Gym/scripts.inc
@@ -13,14 +13,11 @@ CeruleanCity_Gym_EventScript_16AAA1:: @ 816AAA1
 	end
 
 EventScript_16AAD3:: @ 816AAD3
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 1
-	special SetFlavorTextFlagFromSpecialVars
-	setflag FLAG_0x4B1
+	famechecker FAMECHECKER_MISTY, 1
+	setflag FLAG_DEFEATED_MISTY
 	setflag FLAG_BADGE02_GET
 	setrespawn SPAWN_CERULEAN_CITY
-	setvar VAR_0x8008, 2
-	call EventScript_1A6B18
+	set_gym_trainers 2
 	goto EventScript_16AAF9
 	end
 
@@ -48,16 +45,14 @@ CeruleanCity_Gym_EventScript_16AB44:: @ 816AB44
 
 CeruleanCity_Gym_EventScript_16AB5B:: @ 816AB5B
 	trainerbattle 0, TRAINER_SWIMMER_MALE_LUIS, 0, Text_192524, Text_192547
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 2
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_MISTY, 2
 	msgbox gUnknown_8192556, 6
 	end
 
 CeruleanCity_Gym_EventScript_16AB7F:: @ 816AB7F
 	lock
 	faceplayer
-	checkflag FLAG_0x4B1
+	checkflag FLAG_DEFEATED_MISTY
 	goto_if_eq EventScript_16AB94
 	msgbox gUnknown_81925AC
 	release
diff --git a/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc b/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc
index dcace7aee..6a67f0fe1 100644
--- a/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc
@@ -25,9 +25,7 @@ CeruleanCity_PokemonCenter_1F_EventScript_16AA4E:: @ 816AA4E
 CeruleanCity_PokemonCenter_1F_EventScript_16AA57:: @ 816AA57
 	lock
 	faceplayer
-	setvar VAR_0x8004, 13
-	setvar VAR_0x8005, 1
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_BILL, 1
 	msgbox gUnknown_8192116
 	release
 	end
diff --git a/data/maps/CinnabarIsland/scripts.inc b/data/maps/CinnabarIsland/scripts.inc
index 0493fecbb..b2e7e48ae 100644
--- a/data/maps/CinnabarIsland/scripts.inc
+++ b/data/maps/CinnabarIsland/scripts.inc
@@ -343,9 +343,7 @@ Movement_1671ED:: @ 81671ED
 CinnabarIsland_EventScript_1671EF:: @ 81671EF
 	lock
 	faceplayer
-	setvar VAR_0x8004, 8
-	setvar VAR_0x8005, 3
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_BLAINE, 3
 	msgbox gUnknown_8180B34
 	release
 	end
@@ -364,9 +362,7 @@ CinnabarIsland_EventScript_16721A:: @ 816721A
 
 CinnabarIsland_EventScript_167223:: @ 8167223
 	lockall
-	setvar VAR_0x8004, 8
-	setvar VAR_0x8005, 0
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_BLAINE, 0
 	msgbox gUnknown_8180C4A
 	releaseall
 	end
diff --git a/data/maps/CinnabarIsland_Gym/scripts.inc b/data/maps/CinnabarIsland_Gym/scripts.inc
index 6840b58c3..abe9ab6c7 100644
--- a/data/maps/CinnabarIsland_Gym/scripts.inc
+++ b/data/maps/CinnabarIsland_Gym/scripts.inc
@@ -3,7 +3,7 @@ CinnabarIsland_Gym_MapScripts:: @ 816D94B
 	.byte 0
 
 CinnabarIsland_Gym_MapScript1_16D951:: @ 816D951
-	checkflag FLAG_0x4B6
+	checkflag FLAG_DEFEATED_BLAINE
 	goto_if_eq EventScript_16D991
 	checkflag FLAG_0x265
 	call_if 1, EventScript_16D9B0
@@ -64,16 +64,13 @@ CinnabarIsland_Gym_EventScript_16D9D4:: @ 816D9D4
 	end
 
 EventScript_16DA06:: @ 816DA06
-	setvar VAR_0x8004, 8
-	setvar VAR_0x8005, 1
-	special SetFlavorTextFlagFromSpecialVars
-	setflag FLAG_0x4B6
+	famechecker FAMECHECKER_BLAINE, 1
+	setflag FLAG_DEFEATED_BLAINE
 	setflag FLAG_BADGE07_GET
 	setrespawn SPAWN_CINNABAR_ISLAND
 	setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 1
 	clearflag FLAG_HIDE_CINNABAR_BILL
-	setvar VAR_0x8008, 7
-	call EventScript_1A6B18
+	set_gym_trainers 7
 	goto EventScript_16DA34
 	end
 
@@ -116,9 +113,7 @@ EventScript_16DABC:: @ 816DABC
 
 CinnabarIsland_Gym_EventScript_16DAC2:: @ 816DAC2
 	trainerbattle 2, TRAINER_SUPER_NERD_DEREK, 0, Text_1999B7, Text_1999DB, EventScript_16DAEA
-	setvar VAR_0x8004, 8
-	setvar VAR_0x8005, 2
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_BLAINE, 2
 	msgbox gUnknown_81999DF, 6
 	end
 
@@ -195,7 +190,7 @@ EventScript_16DBA5:: @ 816DBA5
 CinnabarIsland_Gym_EventScript_16DBAB:: @ 816DBAB
 	lock
 	faceplayer
-	checkflag FLAG_0x4B6
+	checkflag FLAG_DEFEATED_BLAINE
 	goto_if_eq EventScript_16DBC0
 	msgbox gUnknown_8199B81
 	release
diff --git a/data/maps/FiveIsland_RocketWarehouse/scripts.inc b/data/maps/FiveIsland_RocketWarehouse/scripts.inc
index bf6151c06..d7bc829a7 100644
--- a/data/maps/FiveIsland_RocketWarehouse/scripts.inc
+++ b/data/maps/FiveIsland_RocketWarehouse/scripts.inc
@@ -50,9 +50,7 @@ FiveIsland_RocketWarehouse_EventScript_163F93:: @ 8163F93
 	end
 
 EventScript_163FB7:: @ 8163FB7
-	setvar VAR_0x8004, 15
-	setvar VAR_0x8005, 5
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_GIOVANNI, 5
 	msgbox gUnknown_817BCD7, 6
 	end
 
diff --git a/data/maps/FiveIsland_WaterLabyrinth/scripts.inc b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc
index b3b6243ab..79e133c7b 100644
--- a/data/maps/FiveIsland_WaterLabyrinth/scripts.inc
+++ b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc
@@ -21,9 +21,7 @@ FiveIsland_WaterLabyrinth_EventScript_16884E:: @ 816884E
 	end
 
 EventScript_168895:: @ 8168895
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 2
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_DAISY, 2
 	msgbox gUnknown_818AA0C
 	release
 	end
diff --git a/data/maps/FourIsland/scripts.inc b/data/maps/FourIsland/scripts.inc
index 604008839..8256c4765 100644
--- a/data/maps/FourIsland/scripts.inc
+++ b/data/maps/FourIsland/scripts.inc
@@ -149,9 +149,7 @@ FourIsland_EventScript_167E2E:: @ 8167E2E
 	end
 
 EventScript_167E43:: @ 8167E43
-	setvar VAR_0x8004, 9
-	setvar VAR_0x8005, 5
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_LORELEI, 5
 	msgbox gUnknown_8182A75
 	release
 	end
@@ -159,9 +157,7 @@ EventScript_167E43:: @ 8167E43
 FourIsland_EventScript_167E5A:: @ 8167E5A
 	lock
 	faceplayer
-	setvar VAR_0x8004, 9
-	setvar VAR_0x8005, 4
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_LORELEI, 4
 	msgbox gUnknown_8182CE3
 	release
 	end
diff --git a/data/maps/FuchsiaCity/scripts.inc b/data/maps/FuchsiaCity/scripts.inc
index c857c2f19..78ed21f61 100644
--- a/data/maps/FuchsiaCity/scripts.inc
+++ b/data/maps/FuchsiaCity/scripts.inc
@@ -37,9 +37,7 @@ FuchsiaCity_EventScript_166DB8:: @ 8166DB8
 FuchsiaCity_EventScript_166DC1:: @ 8166DC1
 	lock
 	faceplayer
-	setvar VAR_0x8004, 6
-	setvar VAR_0x8005, 3
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_KOGA, 3
 	msgbox gUnknown_8180ABD
 	release
 	end
@@ -66,9 +64,7 @@ EventScript_166DFE:: @ 8166DFE
 
 FuchsiaCity_EventScript_166E07:: @ 8166E07
 	lockall
-	setvar VAR_0x8004, 6
-	setvar VAR_0x8005, 0
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_KOGA, 0
 	msgbox gUnknown_8180768
 	releaseall
 	end
diff --git a/data/maps/FuchsiaCity_Gym/scripts.inc b/data/maps/FuchsiaCity_Gym/scripts.inc
index 23d7606c9..08fcea455 100644
--- a/data/maps/FuchsiaCity_Gym/scripts.inc
+++ b/data/maps/FuchsiaCity_Gym/scripts.inc
@@ -13,14 +13,11 @@ FuchsiaCity_Gym_EventScript_16D54E:: @ 816D54E
 	end
 
 EventScript_16D580:: @ 816D580
-	setvar VAR_0x8004, 6
-	setvar VAR_0x8005, 1
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_KOGA, 1
 	clearflag FLAG_HIDE_FAME_CHECKER_KOGA_JOURNAL
-	setflag FLAG_0x4B4
+	setflag FLAG_DEFEATED_KOGA
 	setflag FLAG_BADGE05_GET
-	setvar VAR_0x8008, 5
-	call EventScript_1A6B18
+	set_gym_trainers 5
 	goto EventScript_16D5A6
 	end
 
@@ -53,9 +50,7 @@ FuchsiaCity_Gym_EventScript_16D608:: @ 816D608
 
 FuchsiaCity_Gym_EventScript_16D61F:: @ 816D61F
 	trainerbattle 0, TRAINER_JUGGLER_KIRK, 0, Text_19871E, Text_198779
-	setvar VAR_0x8004, 6
-	setvar VAR_0x8005, 2
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_KOGA, 2
 	msgbox gUnknown_8198787, 6
 	end
 
@@ -77,7 +72,7 @@ FuchsiaCity_Gym_EventScript_16D671:: @ 816D671
 FuchsiaCity_Gym_EventScript_16D688:: @ 816D688
 	lock
 	faceplayer
-	checkflag FLAG_0x4B4
+	checkflag FLAG_DEFEATED_KOGA
 	goto_if_eq EventScript_16D69D
 	msgbox gUnknown_8198A5E
 	release
diff --git a/data/maps/FuchsiaCity_House1/scripts.inc b/data/maps/FuchsiaCity_House1/scripts.inc
index 9ff2ecb93..32be06c57 100644
--- a/data/maps/FuchsiaCity_House1/scripts.inc
+++ b/data/maps/FuchsiaCity_House1/scripts.inc
@@ -8,9 +8,7 @@ FuchsiaCity_House1_EventScript_16D6C6:: @ 816D6C6
 FuchsiaCity_House1_EventScript_16D6CF:: @ 816D6CF
 	lock
 	faceplayer
-	setvar VAR_0x8004, 13 @ FAMECHECKER_BILL
-	setvar VAR_0x8005, 2
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_BILL, 2
 	msgbox gUnknown_8198C1F
 	release
 	end
diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc b/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc
index 6229bf246..61cc643a3 100644
--- a/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc
+++ b/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc
@@ -30,9 +30,7 @@ EventScript_16B1A0:: @ 816B1A0
 LavenderTown_VolunteerPokemonHouse_EventScript_16B1AA:: @ 816B1AA
 	lock
 	faceplayer
-	setvar VAR_0x8004, 14
-	setvar VAR_0x8005, 0
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_MRFUJI, 0
 	msgbox gUnknown_8193652
 	release
 	end
@@ -77,9 +75,7 @@ LavenderTown_VolunteerPokemonHouse_EventScript_16B1FE:: @ 816B1FE
 
 LavenderTown_VolunteerPokemonHouse_EventScript_16B211:: @ 816B211
 	lockall
-	setvar VAR_0x8004, 14
-	setvar VAR_0x8005, 2
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_MRFUJI, 2
 	msgbox gUnknown_81938A0
 	releaseall
 	end
diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc b/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc
index fbb4fb622..11020d99e 100644
--- a/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc
+++ b/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc
@@ -20,9 +20,7 @@ OneIsland_KindleRoad_EmberSpa_EventScript_165377:: @ 8165377
 OneIsland_KindleRoad_EmberSpa_EventScript_165380:: @ 8165380
 	lock
 	faceplayer
-	setvar VAR_0x8004, 10
-	setvar VAR_0x8005, 3
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_BRUNO, 3
 	msgbox gUnknown_817D550
 	release
 	end
diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc
index 12fe70105..32f26b119 100644
--- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc
+++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc
@@ -239,25 +239,19 @@ EventScript_170F35:: @ 8170F35
 	goto_if_eq EventScript_170F6D
 	compare_var_to_value VAR_RESULT, 1
 	goto_if_eq EventScript_170F84
-	setvar VAR_0x8004, 13
-	setvar VAR_0x8005, 5
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_BILL, 5
 	msgbox gUnknown_81A2076
 	release
 	end
 
 EventScript_170F6D:: @ 8170F6D
-	setvar VAR_0x8004, 13
-	setvar VAR_0x8005, 3
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_BILL, 3
 	msgbox gUnknown_81A1EF3
 	release
 	end
 
 EventScript_170F84:: @ 8170F84
-	setvar VAR_0x8004, 13
-	setvar VAR_0x8005, 4
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_BILL, 4
 	msgbox gUnknown_81A1F7C
 	release
 	end
diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc
index ac977d53a..18e045d1e 100644
--- a/data/maps/PalletTown/scripts.inc
+++ b/data/maps/PalletTown/scripts.inc
@@ -450,9 +450,7 @@ PalletTown_EventScript_16582F:: @ 816582F
 
 PalletTown_EventScript_165838:: @ 8165838
 	lockall
-	setvar VAR_0x8004, 0
-	setvar VAR_0x8005, 0
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_OAK, 0
 	msgbox gUnknown_817D866
 	releaseall
 	end
diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc
index 59596e6d8..78e2bb404 100644
--- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc
+++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc
@@ -713,9 +713,7 @@ EventScript_16961E:: @ 816961E
 	additem ITEM_POKE_BALL, 5
 	giveitemfanfaremsg gUnknown_818E6B3, ITEM_POKE_BALL, 5
 	msgbox gUnknown_818E6D0
-	setvar VAR_0x8004, 0
-	setvar VAR_0x8005, 1
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_OAK, 1
 	msgbox gUnknown_818E784
 	msgbox gUnknown_818DEC8
 	compare_var_to_value VAR_FACING, 2
@@ -1353,9 +1351,7 @@ PalletTown_ProfessorOaksLab_EventScript_169DEE:: @ 8169DEE
 	end
 
 EventScript_169E03:: @ 8169E03
-	setvar VAR_0x8004, 0
-	setvar VAR_0x8005, 5
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_OAK, 5
 	msgbox gUnknown_818ED15
 	release
 	end
@@ -1370,9 +1366,7 @@ PalletTown_ProfessorOaksLab_EventScript_169E1A:: @ 8169E1A
 	end
 
 EventScript_169E2F:: @ 8169E2F
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 0
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_DAISY, 0
 	msgbox gUnknown_818EC0B
 	release
 	end
@@ -1380,9 +1374,7 @@ EventScript_169E2F:: @ 8169E2F
 PalletTown_ProfessorOaksLab_EventScript_169E46:: @ 8169E46
 	lock
 	faceplayer
-	setvar VAR_0x8004, 0
-	setvar VAR_0x8005, 2
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_OAK, 2
 	msgbox gUnknown_818ED81
 	release
 	end
diff --git a/data/maps/PewterCity/scripts.inc b/data/maps/PewterCity/scripts.inc
index 3fdd7d438..6d61fd0a1 100644
--- a/data/maps/PewterCity/scripts.inc
+++ b/data/maps/PewterCity/scripts.inc
@@ -1342,9 +1342,7 @@ Movement_16621C:: @ 816621C
 PewterCity_EventScript_16622B:: @ 816622B
 	lock
 	faceplayer
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 2
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_BROCK, 2
 	msgbox gUnknown_817E49F
 	release
 	end
@@ -1378,9 +1376,7 @@ PewterCity_EventScript_16627F:: @ 816627F
 
 PewterCity_EventScript_166288:: @ 8166288
 	lockall
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_BROCK, 0
 	msgbox gUnknown_817E7DE
 	releaseall
 	end
diff --git a/data/maps/PewterCity_Gym/scripts.inc b/data/maps/PewterCity_Gym/scripts.inc
index 76be18cf1..4886b7bcf 100644
--- a/data/maps/PewterCity_Gym/scripts.inc
+++ b/data/maps/PewterCity_Gym/scripts.inc
@@ -13,16 +13,13 @@ PewterCity_Gym_EventScript_16A593:: @ 816A593
 	end
 
 EventScript_16A5C5:: @ 816A5C5
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 1
-	special SetFlavorTextFlagFromSpecialVars
-	setflag FLAG_0x4B0
+	famechecker FAMECHECKER_BROCK, 1
+	setflag FLAG_DEFEATED_BROCK
 	setflag FLAG_BADGE01_GET
 	setvar VAR_MAP_SCENE_PEWTER_CITY, 1
 	setflag FLAG_HIDE_PEWTER_CITY_GYM_ESCORT
 	clearflag FLAG_HIDE_PEWTER_CITY_RUNNING_SHOES_GUY
-	setvar VAR_0x8008, 1
-	call EventScript_1A6B18
+	set_gym_trainers 1
 	goto EventScript_16A5F3
 	end
 
@@ -51,7 +48,7 @@ PewterCity_Gym_EventScript_16A63E:: @ 816A63E
 PewterCity_Gym_EventScript_16A655:: @ 816A655
 	lock
 	faceplayer
-	checkflag FLAG_0x4B0
+	checkflag FLAG_DEFEATED_BROCK
 	goto_if_eq EventScript_16A67F
 	msgbox gUnknown_8191298, MSGBOX_YESNO
 	compare_var_to_value VAR_RESULT, 1
diff --git a/data/maps/PokemonLeague_AgathasRoom/scripts.inc b/data/maps/PokemonLeague_AgathasRoom/scripts.inc
index 6ec5c04b7..cc1ffbcea 100644
--- a/data/maps/PokemonLeague_AgathasRoom/scripts.inc
+++ b/data/maps/PokemonLeague_AgathasRoom/scripts.inc
@@ -11,7 +11,7 @@ PokemonLeague_AgathasRoom_MapScript1_162825:: @ 8162825
 	end
 
 PokemonLeague_AgathasRoom_MapScript2_162830:: @ 8162830
-	checkflag FLAG_0x4BA
+	checkflag FLAG_DEFEATED_AGATHA
 	call_if 1, EventScript_16284B
 	compare_var_to_value VAR_MAP_SCENE_POKEMON_LEAGUE, 3
 	call_if 1, EventScript_162845
@@ -50,17 +50,11 @@ PokemonLeague_AgathasRoom_EventScript_162877:: @ 8162877
 	setvar VAR_0x8004, 11
 	setvar VAR_0x8005, 2
 	special UpdatePickStateFromSpecialVar8005
-	checkflag FLAG_0x4BA
+	checkflag FLAG_DEFEATED_AGATHA
 	goto_if_eq EventScript_162911
-	setvar VAR_0x8004, 11
-	setvar VAR_0x8005, 0
-	special SetFlavorTextFlagFromSpecialVars
-	setvar VAR_0x8004, 11
-	setvar VAR_0x8005, 4
-	special SetFlavorTextFlagFromSpecialVars
-	setvar VAR_0x8004, 0
-	setvar VAR_0x8005, 4
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_AGATHA, 0
+	famechecker FAMECHECKER_AGATHA, 4
+	famechecker FAMECHECKER_OAK, 4
 	checkflag FLAG_SYS_GAME_CLEAR
 	call_if 0, EventScript_1628E9
 	checkflag FLAG_SYS_GAME_CLEAR
@@ -99,7 +93,7 @@ EventScript_162911:: @ 8162911
 	end
 
 EventScript_16291B:: @ 816291B
-	setflag FLAG_0x4BA
+	setflag FLAG_DEFEATED_AGATHA
 	call EventScript_1A7506
 	msgbox gUnknown_8178700
 	release
diff --git a/data/maps/PokemonLeague_BrunosRoom/scripts.inc b/data/maps/PokemonLeague_BrunosRoom/scripts.inc
index 26128d007..2070f85ee 100644
--- a/data/maps/PokemonLeague_BrunosRoom/scripts.inc
+++ b/data/maps/PokemonLeague_BrunosRoom/scripts.inc
@@ -11,7 +11,7 @@ PokemonLeague_BrunosRoom_MapScript1_16269A:: @ 816269A
 	end
 
 PokemonLeague_BrunosRoom_MapScript2_1626A5:: @ 81626A5
-	checkflag FLAG_0x4B9
+	checkflag FLAG_DEFEATED_BRUNO
 	call_if 1, EventScript_1626C0
 	compare_var_to_value VAR_MAP_SCENE_POKEMON_LEAGUE, 2
 	call_if 1, EventScript_1626BA
@@ -50,14 +50,10 @@ PokemonLeague_BrunosRoom_EventScript_1626EC:: @ 81626EC
 	setvar VAR_0x8004, 10
 	setvar VAR_0x8005, 2
 	special UpdatePickStateFromSpecialVar8005
-	checkflag FLAG_0x4B9
+	checkflag FLAG_DEFEATED_BRUNO
 	goto_if_eq EventScript_162779
-	setvar VAR_0x8004, 10
-	setvar VAR_0x8005, 0
-	special SetFlavorTextFlagFromSpecialVars
-	setvar VAR_0x8004, 10
-	setvar VAR_0x8005, 1
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_BRUNO, 0
+	famechecker FAMECHECKER_BRUNO, 1
 	checkflag FLAG_SYS_GAME_CLEAR
 	call_if 0, EventScript_162751
 	checkflag FLAG_SYS_GAME_CLEAR
@@ -105,7 +101,7 @@ EventScript_162779:: @ 8162779
 	end
 
 EventScript_1627B0:: @ 81627B0
-	setflag FLAG_0x4B9
+	setflag FLAG_DEFEATED_BRUNO
 	call EventScript_1A7506
 	msgbox gUnknown_8178420
 	closemessage
diff --git a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc
index 31549e6ec..fe3de6e9f 100644
--- a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc
+++ b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc
@@ -75,7 +75,7 @@ EventScript_162B76:: @ 8162B76
 	call_if 1, EventScript_162C91
 	setflag FLAG_TEMP_4
 	clearflag FLAG_TEMP_5
-	setflag FLAG_0x4BC
+	setflag FLAG_DEFEATED_RIVAL
 	setflag FLAG_TEMP_4
 	msgbox gUnknown_8178F2F
 	playbgm MUS_SLOWMASARA, 0
diff --git a/data/maps/PokemonLeague_LancesRoom/scripts.inc b/data/maps/PokemonLeague_LancesRoom/scripts.inc
index b331a8639..2fbd53c66 100644
--- a/data/maps/PokemonLeague_LancesRoom/scripts.inc
+++ b/data/maps/PokemonLeague_LancesRoom/scripts.inc
@@ -13,7 +13,7 @@ PokemonLeague_LancesRoom_MapScript1_162942:: @ 8162942
 PokemonLeague_LancesRoom_MapScript2_16294D:: @ 816294D
 	compare_var_to_value VAR_MAP_SCENE_POKEMON_LEAGUE, 4
 	call_if 1, EventScript_162962
-	checkflag FLAG_0x4BB
+	checkflag FLAG_DEFEATED_LANCE
 	call_if 1, EventScript_162968
 	end
 
@@ -104,14 +104,10 @@ PokemonLeague_LancesRoom_EventScript_162A14:: @ 8162A14
 	setvar VAR_0x8004, 12
 	setvar VAR_0x8005, 2
 	special UpdatePickStateFromSpecialVar8005
-	checkflag FLAG_0x4BB
+	checkflag FLAG_DEFEATED_LANCE
 	goto_if_eq EventScript_162AA1
-	setvar VAR_0x8004, 12
-	setvar VAR_0x8005, 0
-	special SetFlavorTextFlagFromSpecialVars
-	setvar VAR_0x8004, 12
-	setvar VAR_0x8005, 1
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_LANCE, 0
+	famechecker FAMECHECKER_LANCE, 1
 	checkflag FLAG_SYS_GAME_CLEAR
 	call_if 0, EventScript_162A79
 	checkflag FLAG_SYS_GAME_CLEAR
@@ -152,7 +148,7 @@ EventScript_162AA1:: @ 8162AA1
 EventScript_162AAB:: @ 8162AAB
 	setvar VAR_0x8004, 0
 	special sub_8113530
-	setflag FLAG_0x4BB
+	setflag FLAG_DEFEATED_LANCE
 	call EventScript_1A7563
 	msgbox gUnknown_8178A52
 	closemessage
diff --git a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc
index 201b03fd2..d487bc033 100644
--- a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc
+++ b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc
@@ -12,7 +12,7 @@ PokemonLeague_LoreleisRoom_MapScript1_162586:: @ 8162586
 	end
 
 PokemonLeague_LoreleisRoom_MapScript2_162591:: @ 8162591
-	checkflag FLAG_0x4B8
+	checkflag FLAG_DEFEATED_LORELEI
 	call_if 1, EventScript_1625AC
 	compare_var_to_value VAR_MAP_SCENE_POKEMON_LEAGUE, 1
 	call_if 1, EventScript_1625A6
@@ -55,14 +55,10 @@ PokemonLeague_LoreleisRoom_EventScript_1625DC:: @ 81625DC
 	setvar VAR_0x8004, 9
 	setvar VAR_0x8005, 2
 	special UpdatePickStateFromSpecialVar8005
-	checkflag FLAG_0x4B8
+	checkflag FLAG_DEFEATED_LORELEI
 	goto_if_eq EventScript_162669
-	setvar VAR_0x8004, 9
-	setvar VAR_0x8005, 0
-	special SetFlavorTextFlagFromSpecialVars
-	setvar VAR_0x8004, 9
-	setvar VAR_0x8005, 1
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_LORELEI, 0
+	famechecker FAMECHECKER_LORELEI, 1
 	checkflag FLAG_0x844
 	call_if 0, EventScript_162641
 	checkflag FLAG_0x844
@@ -101,7 +97,7 @@ EventScript_162669:: @ 8162669
 	end
 
 EventScript_162673:: @ 8162673
-	setflag FLAG_0x4B8
+	setflag FLAG_DEFEATED_LORELEI
 	call EventScript_1A7506
 	msgbox gUnknown_81781B0
 	release
diff --git a/data/maps/PokemonTower_7F/scripts.inc b/data/maps/PokemonTower_7F/scripts.inc
index 0947eedc5..56f1eab0a 100644
--- a/data/maps/PokemonTower_7F/scripts.inc
+++ b/data/maps/PokemonTower_7F/scripts.inc
@@ -110,9 +110,7 @@ PokemonTower_7F_EventScript_16363D:: @ 816363D
 	end
 
 EventScript_163658:: @ 8163658
-	setvar VAR_0x8004, 14
-	setvar VAR_0x8005, 1
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_MRFUJI, 1
 	msgbox gUnknown_817A477
 	closemessage
 	getplayerxy VAR_0x8004, VAR_0x8005
diff --git a/data/maps/RocketHideout_B4F/scripts.inc b/data/maps/RocketHideout_B4F/scripts.inc
index 38a680528..ee0d3894b 100644
--- a/data/maps/RocketHideout_B4F/scripts.inc
+++ b/data/maps/RocketHideout_B4F/scripts.inc
@@ -19,9 +19,7 @@ EventScript_161311:: @ 8161311
 RocketHideout_B4F_EventScript_161317:: @ 8161317
 	lock
 	faceplayer
-	setvar VAR_0x8004, 15
-	setvar VAR_0x8005, 0
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_GIOVANNI, 0
 	message Text_175226
 	waitmessage
 	playbgm MUS_ROCKET, 0
diff --git a/data/maps/SaffronCity/scripts.inc b/data/maps/SaffronCity/scripts.inc
index 9d591eec0..287a76a6c 100644
--- a/data/maps/SaffronCity/scripts.inc
+++ b/data/maps/SaffronCity/scripts.inc
@@ -96,9 +96,7 @@ SaffronCity_EventScript_16742C:: @ 816742C
 
 SaffronCity_EventScript_167435:: @ 8167435
 	lockall
-	setvar VAR_0x8004, 7
-	setvar VAR_0x8005, 0
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_SABRINA, 0
 	msgbox gUnknown_8181362
 	releaseall
 	end
diff --git a/data/maps/SaffronCity_Gym/scripts.inc b/data/maps/SaffronCity_Gym/scripts.inc
index 1c0957a87..2cfd1bad7 100644
--- a/data/maps/SaffronCity_Gym/scripts.inc
+++ b/data/maps/SaffronCity_Gym/scripts.inc
@@ -13,17 +13,12 @@ SaffronCity_Gym_EventScript_16EDD8:: @ 816EDD8
 	end
 
 EventScript_16EE0A:: @ 816EE0A
-	setvar VAR_0x8004, 7
-	setvar VAR_0x8005, 2
-	special SetFlavorTextFlagFromSpecialVars
-	setvar VAR_0x8004, 7
-	setvar VAR_0x8005, 3
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_SABRINA, 2
+	famechecker FAMECHECKER_SABRINA, 3
 	clearflag FLAG_HIDE_SAFFRON_CITY_POKECENTER_SABRINA_JOURNALS
-	setflag FLAG_0x4B5
+	setflag FLAG_DEFEATED_SABRINA
 	setflag FLAG_BADGE06_GET
-	setvar VAR_0x8008, 6
-	call EventScript_1A6B18
+	set_gym_trainers 6
 	goto EventScript_16EE3D
 	end
 
@@ -51,9 +46,7 @@ SaffronCity_Gym_EventScript_16EE88:: @ 816EE88
 
 SaffronCity_Gym_EventScript_16EE9F:: @ 816EE9F
 	trainerbattle 0, TRAINER_PSYCHIC_TYRON, 0, Text_19BA45, Text_19BA9E
-	setvar VAR_0x8004, 7
-	setvar VAR_0x8005, 5
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_SABRINA, 5
 	msgbox gUnknown_819BAB4, 6
 	end
 
@@ -85,7 +78,7 @@ SaffronCity_Gym_EventScript_16EF1F:: @ 816EF1F
 SaffronCity_Gym_EventScript_16EF36:: @ 816EF36
 	lock
 	faceplayer
-	checkflag FLAG_0x4B5
+	checkflag FLAG_DEFEATED_SABRINA
 	goto_if_eq EventScript_16EF4B
 	msgbox gUnknown_819BCF6
 	release
diff --git a/data/maps/ThreeIsland_House2/scripts.inc b/data/maps/ThreeIsland_House2/scripts.inc
index 297f6e3dc..6c45d3f2f 100644
--- a/data/maps/ThreeIsland_House2/scripts.inc
+++ b/data/maps/ThreeIsland_House2/scripts.inc
@@ -4,9 +4,7 @@ ThreeIsland_House2_MapScripts:: @ 81718DF
 ThreeIsland_House2_EventScript_1718E0:: @ 81718E0
 	lock
 	faceplayer
-	setvar VAR_0x8004, 7
-	setvar VAR_0x8005, 1
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_SABRINA, 1
 	msgbox gUnknown_81A32CA
 	release
 	end
diff --git a/data/maps/TwoIsland/scripts.inc b/data/maps/TwoIsland/scripts.inc
index 5e7753ea9..dffb46302 100644
--- a/data/maps/TwoIsland/scripts.inc
+++ b/data/maps/TwoIsland/scripts.inc
@@ -209,9 +209,7 @@ TwoIsland_EventScript_167755:: @ 8167755
 TwoIsland_EventScript_16775E:: @ 816775E
 	lock
 	faceplayer
-	setvar VAR_0x8004, 10
-	setvar VAR_0x8005, 4
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_BRUNO, 4
 	msgbox gUnknown_8181E47
 	release
 	end
diff --git a/data/maps/VermilionCity/scripts.inc b/data/maps/VermilionCity/scripts.inc
index 0c8c8317b..9580639e2 100644
--- a/data/maps/VermilionCity/scripts.inc
+++ b/data/maps/VermilionCity/scripts.inc
@@ -277,9 +277,7 @@ VermilionCity_EventScript_166C65:: @ 8166C65
 
 VermilionCity_EventScript_166C6E:: @ 8166C6E
 	lockall
-	setvar VAR_0x8004, 4
-	setvar VAR_0x8005, 0
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_LTSURGE, 0
 	msgbox gUnknown_817F9CC
 	releaseall
 	end
diff --git a/data/maps/VermilionCity_Gym/scripts.inc b/data/maps/VermilionCity_Gym/scripts.inc
index 222bfb9e1..104353741 100644
--- a/data/maps/VermilionCity_Gym/scripts.inc
+++ b/data/maps/VermilionCity_Gym/scripts.inc
@@ -219,16 +219,13 @@ VermilionCity_Gym_EventScript_16B94A:: @ 816B94A
 	end
 
 EventScript_16B97C:: @ 816B97C
-	setvar VAR_0x8004, 4
-	setvar VAR_0x8005, 1
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_LTSURGE, 1
 	checkflag FLAG_0x23B
 	call_if 0, EventScript_16B9AB
 	clearflag FLAG_HIDE_FAME_CHECKER_LT_SURGE_JOURNAL
-	setflag FLAG_0x4B2
+	setflag FLAG_DEFEATED_LT_SURGE
 	setflag FLAG_BADGE03_GET
-	setvar VAR_0x8008, 3
-	call EventScript_1A6B18
+	set_gym_trainers 3
 	goto EventScript_16B9AF
 	end
 
@@ -255,9 +252,7 @@ EventScript_16B9F0:: @ 816B9F0
 
 VermilionCity_Gym_EventScript_16B9FA:: @ 816B9FA
 	trainerbattle 0, TRAINER_SAILOR_DWAYNE, 0, Text_194FBD, Text_194FF1
-	setvar VAR_0x8004, 4
-	setvar VAR_0x8005, 4
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_LTSURGE, 4
 	msgbox gUnknown_8195004, 6
 	end
 
@@ -268,23 +263,19 @@ VermilionCity_Gym_EventScript_16BA1E:: @ 816BA1E
 
 VermilionCity_Gym_EventScript_16BA35:: @ 816BA35
 	trainerbattle 2, TRAINER_GENTLEMAN_TUCKER, 0, Text_194E57, Text_194EA5, EventScript_16BA5D
-	setvar VAR_0x8004, 4
-	setvar VAR_0x8005, 3
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_LTSURGE, 3
 	msgbox gUnknown_8194EBD, 6
 	end
 
 EventScript_16BA5D:: @ 816BA5D
-	setvar VAR_0x8004, 4
-	setvar VAR_0x8005, 2
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_LTSURGE, 2
 	release
 	end
 
 VermilionCity_Gym_EventScript_16BA6C:: @ 816BA6C
 	lock
 	faceplayer
-	checkflag FLAG_0x4B2
+	checkflag FLAG_DEFEATED_LT_SURGE
 	goto_if_eq EventScript_16BA81
 	msgbox gUnknown_81950B4
 	release
diff --git a/data/maps/VermilionCity_PokemonFanClub/scripts.inc b/data/maps/VermilionCity_PokemonFanClub/scripts.inc
index b0bffc017..1a4e7be91 100644
--- a/data/maps/VermilionCity_PokemonFanClub/scripts.inc
+++ b/data/maps/VermilionCity_PokemonFanClub/scripts.inc
@@ -45,9 +45,7 @@ VermilionCity_PokemonFanClub_EventScript_16B4FC:: @ 816B4FC
 	end
 
 EventScript_16B511:: @ 816B511
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 1
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_DAISY, 1
 	msgbox gUnknown_8194960
 	release
 	end
diff --git a/data/maps/ViridianCity_Gym/scripts.inc b/data/maps/ViridianCity_Gym/scripts.inc
index 7af2d441f..3bbbd2b97 100644
--- a/data/maps/ViridianCity_Gym/scripts.inc
+++ b/data/maps/ViridianCity_Gym/scripts.inc
@@ -17,15 +17,12 @@ ViridianCity_Gym_EventScript_169ECA:: @ 8169ECA
 	end
 
 EventScript_169F04:: @ 8169F04
-	setvar VAR_0x8004, 15
-	setvar VAR_0x8005, 3
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_GIOVANNI, 3
 	setflag FLAG_HIDE_MISC_KANTO_ROCKETS
-	setflag FLAG_0x4B7
+	setflag FLAG_DEFEATED_LEADER_GIOVANNI
 	setflag FLAG_BADGE08_GET
 	setvar VAR_MAP_SCENE_ROUTE22, 3
-	setvar VAR_0x8008, 8
-	call EventScript_1A6B18
+	set_gym_trainers 8
 	goto EventScript_169F2F
 	end
 
@@ -89,16 +86,14 @@ ViridianCity_Gym_EventScript_16A01B:: @ 816A01B
 ViridianCity_Gym_EventScript_16A032:: @ 816A032
 	lock
 	faceplayer
-	checkflag FLAG_0x4B7
+	checkflag FLAG_DEFEATED_LEADER_GIOVANNI
 	goto_if_eq EventScript_16A047
 	msgbox gUnknown_818FA81
 	release
 	end
 
 EventScript_16A047:: @ 816A047
-	setvar VAR_0x8004, 15
-	setvar VAR_0x8005, 4
-	special SetFlavorTextFlagFromSpecialVars
+	famechecker FAMECHECKER_GIOVANNI, 4
 	msgbox gUnknown_818FB56
 	release
 	end
diff --git a/include/constants/fame_checker.h b/include/constants/fame_checker.h
new file mode 100644
index 000000000..d9c44413d
--- /dev/null
+++ b/include/constants/fame_checker.h
@@ -0,0 +1,22 @@
+#ifndef GUARD_CONSTANTS_FAME_CHECKER_H
+#define GUARD_CONSTANTS_FAME_CHECKER_H
+
+#define FAMECHECKER_OAK          0
+#define FAMECHECKER_DAISY        1
+#define FAMECHECKER_BROCK        2
+#define FAMECHECKER_MISTY        3
+#define FAMECHECKER_LTSURGE      4
+#define FAMECHECKER_ERIKA        5
+#define FAMECHECKER_KOGA         6
+#define FAMECHECKER_SABRINA      7
+#define FAMECHECKER_BLAINE       8
+#define FAMECHECKER_LORELEI      9
+#define FAMECHECKER_BRUNO       10
+#define FAMECHECKER_AGATHA      11
+#define FAMECHECKER_LANCE       12
+#define FAMECHECKER_BILL        13
+#define FAMECHECKER_MRFUJI      14
+#define FAMECHECKER_GIOVANNI    15
+#define NUM_FAMECHECKER_PERSONS 16
+
+#endif //GUARD_CONSTANTS_FAME_CHECKER_H
diff --git a/include/constants/flags.h b/include/constants/flags.h
index f87e641d6..c08193c53 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -1223,19 +1223,19 @@
 #define FLAG_0x4AF               0x4AF
 
 // Boss clear flags
-#define FLAG_0x4B0               0x4B0
-#define FLAG_0x4B1               0x4B1
-#define FLAG_0x4B2               0x4B2
-#define FLAG_0x4B3               0x4B3
-#define FLAG_0x4B4               0x4B4
-#define FLAG_0x4B5               0x4B5
-#define FLAG_0x4B6               0x4B6
-#define FLAG_0x4B7               0x4B7
-#define FLAG_0x4B8               0x4B8
-#define FLAG_0x4B9               0x4B9
-#define FLAG_0x4BA               0x4BA
-#define FLAG_0x4BB               0x4BB
-#define FLAG_0x4BC               0x4BC
+#define FLAG_DEFEATED_BROCK           0x4B0
+#define FLAG_DEFEATED_MISTY           0x4B1
+#define FLAG_DEFEATED_LT_SURGE        0x4B2
+#define FLAG_DEFEATED_ERIKA           0x4B3
+#define FLAG_DEFEATED_KOGA            0x4B4
+#define FLAG_DEFEATED_SABRINA         0x4B5
+#define FLAG_DEFEATED_BLAINE          0x4B6
+#define FLAG_DEFEATED_LEADER_GIOVANNI 0x4B7
+#define FLAG_DEFEATED_LORELEI         0x4B8
+#define FLAG_DEFEATED_BRUNO           0x4B9
+#define FLAG_DEFEATED_AGATHA          0x4BA
+#define FLAG_DEFEATED_LANCE           0x4BB
+#define FLAG_DEFEATED_RIVAL           0x4BC
 
 // Unused?
 #define FLAG_0x4BD               0x4BD
diff --git a/include/fame_checker.h b/include/fame_checker.h
index 257431d8b..67b1e0e9c 100644
--- a/include/fame_checker.h
+++ b/include/fame_checker.h
@@ -2,26 +2,7 @@
 #define GUARD_FAME_CHECKER_H
 
 #include "main.h"
-
-enum {
-    FAMECHECKER_OAK,
-    FAMECHECKER_DAISY,
-    FAMECHECKER_BROCK,
-    FAMECHECKER_MISTY,
-    FAMECHECKER_LTSURGE,
-    FAMECHECKER_ERIKA,
-    FAMECHECKER_KOGA,
-    FAMECHECKER_SABRINA,
-    FAMECHECKER_BLAINE,
-    FAMECHECKER_LORELEI,
-    FAMECHECKER_BRUNO,
-    FAMECHECKER_AGATHA,
-    FAMECHECKER_LANCE,
-    FAMECHECKER_BILL,
-    FAMECHECKER_MRFUJI,
-    FAMECHECKER_GIOVANNI,
-    NUM_FAMECHECKER_PERSONS
-};
+#include "constants/fame_checker.h"
 
 enum {
     FCPICKSTATE_NO_DRAW,
diff --git a/src/help_system_812B1E0.c b/src/help_system_812B1E0.c
index 964995d6c..08f54b22e 100644
--- a/src/help_system_812B1E0.c
+++ b/src/help_system_812B1E0.c
@@ -1125,7 +1125,7 @@ static void sub_812B614(struct HelpSystemListMenu * a0, struct ListMenuItem * a1
 
 static bool8 sub_812B754(void)
 {
-    if (FlagGet(FLAG_0x4B0) == TRUE && gUnknown_3005E9C[1] == 2)
+    if (FlagGet(FLAG_DEFEATED_BROCK) == TRUE && gUnknown_3005E9C[1] == 2)
         return TRUE;
     return FALSE;
 }