diff --git a/data/event_scripts.s b/data/event_scripts.s
index 6668f0d1f9..42c5aa1ad0 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -1161,7 +1161,7 @@ EventScript_2715DE:: @ 82715DE
 	setflag FLAG_0x376
 	setflag FLAG_0x374
 	setflag FLAG_0x375
-	setflag FLAG_0x3C1
+	setflag FLAG_SPRITEVIS_SLATEPORT_MUSEUM_POPULATION
 	setflag FLAG_0x378
 	setflag FLAG_0x2F0
 	setflag FLAG_0x2F5
@@ -1177,7 +1177,7 @@ EventScript_2715DE:: @ 82715DE
 	setflag FLAG_0x38F
 	setflag FLAG_0x393
 	setflag FLAG_0x358
-	setflag FLAG_0x390
+	setflag FLAG_SPRITEVIS_MAUVILLE_CITY_WATTSON
 	setflag FLAG_0x2FD
 	setflag FLAG_0x398
 	setflag FLAG_0x399
diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc
index af30c70573..40578a9073 100644
--- a/data/scripts/maps/MauvilleCity.inc
+++ b/data/scripts/maps/MauvilleCity.inc
@@ -5,17 +5,17 @@ MauvilleCity_MapScripts:: @ 81DF385
 MauvilleCity_MapScript1_1DF38B: @ 81DF38B
 	setflag FLAG_VISITED_MAUVILLE_CITY
 	clearflag FLAG_0x09D
-	clearflag FLAG_0x3C1
+	clearflag FLAG_SPRITEVIS_SLATEPORT_MUSEUM_POPULATION
 	setflag FLAG_SYS_TV_START
 	clearflag FLAG_0x063
 	setvar VAR_0x4093, 0
-	checkflag FLAG_0x0D1
+	checkflag FLAG_GOT_TM24_FROM_WATTSON
 	call_if 1, MauvilleCity_EventScript_1DF3A9
 	end
 
 MauvilleCity_EventScript_1DF3A9:: @ 81DF3A9
-	clearflag FLAG_0x391
-	setflag FLAG_0x390
+	clearflag FLAG_SPRITEVIS_MAUVILLE_GYM_WATTSON
+	setflag FLAG_SPRITEVIS_MAUVILLE_CITY_WATTSON
 	setflag FLAG_WATTSON_REMATCH_AVAILABLE
 	return
 
@@ -424,15 +424,15 @@ MauvilleCity_Movement_1DF72F: @ 81DF72F
 MauvilleCity_EventScript_1DF73A:: @ 81DF73A
 	lock
 	faceplayer
-	checkflag FLAG_0x0D1
+	checkflag FLAG_GOT_TM24_FROM_WATTSON
 	goto_eq MauvilleCity_EventScript_1DF7B0
 	compare VAR_0x40BA, 2
 	goto_eq MauvilleCity_EventScript_1DF784
-	checkflag FLAG_0x0D0
+	checkflag FLAG_GOT_BASEMENT_KEY_FROM_WATTSON
 	goto_eq MauvilleCity_EventScript_1DF77A
 	msgbox MauvilleCity_Text_1DFFE4, 4
 	giveitem_std ITEM_BASEMENT_KEY
-	setflag FLAG_0x0D0
+	setflag FLAG_GOT_BASEMENT_KEY_FROM_WATTSON
 	msgbox MauvilleCity_Text_1E0154, 4
 	release
 	end
@@ -447,7 +447,7 @@ MauvilleCity_EventScript_1DF784:: @ 81DF784
 	giveitem_std ITEM_TM24
 	compare VAR_RESULT, 0
 	goto_eq MauvilleCity_EventScript_272054
-	setflag FLAG_0x0D1
+	setflag FLAG_GOT_TM24_FROM_WATTSON
 	msgbox MauvilleCity_Text_1E02AA, 4
 	release
 	end
diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc
index 627ae904c7..2751e345e8 100644
--- a/data/scripts/maps/PetalburgCity_Gym.inc
+++ b/data/scripts/maps/PetalburgCity_Gym.inc
@@ -423,8 +423,8 @@ PetalburgCity_Gym_EventScript_204E3B:: @ 8204E3B
 	setflag FLAG_BADGE05_GET
 	special sub_813B9A0
 	call PetalburgCity_Gym_EventScript_2721F8
-	setflag FLAG_0x391
-	clearflag FLAG_0x390
+	setflag FLAG_SPRITEVIS_MAUVILLE_GYM_WATTSON
+	clearflag FLAG_SPRITEVIS_MAUVILLE_CITY_WATTSON
 	setvar VAR_0x8008, 5
 	call PetalburgCity_Gym_EventScript_271F43
 	clearflag FLAG_0x3AC
diff --git a/include/constants/flags.h b/include/constants/flags.h
index 2e40a8eba1..7f52018a18 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -208,8 +208,8 @@
 #define FLAG_0x0CD               0xCD
 #define FLAG_0x0CE               0xCE
 #define FLAG_0x0CF               0xCF
-#define FLAG_0x0D0               0xD0
-#define FLAG_0x0D1               0xD1
+#define FLAG_GOT_BASEMENT_KEY_FROM_WATTSON               0xD0
+#define FLAG_GOT_TM24_FROM_WATTSON               0xD1
 #define FLAG_0x0D2               0xD2
 #define FLAG_0x0D3               0xD3
 #define FLAG_0x0D4               0xD4
@@ -912,8 +912,8 @@
 #define FLAG_0x38D               0x38D
 #define FLAG_0x38E               0x38E
 #define FLAG_0x38F               0x38F
-#define FLAG_0x390               0x390
-#define FLAG_0x391               0x391
+#define FLAG_SPRITEVIS_MAUVILLE_CITY_WATTSON               0x390
+#define FLAG_SPRITEVIS_MAUVILLE_GYM_WATTSON               0x391
 #define FLAG_0x392               0x392
 #define FLAG_0x393               0x393
 #define FLAG_0x394               0x394
@@ -961,7 +961,7 @@
 #define FLAG_0x3BE               0x3BE
 #define FLAG_0x3BF               0x3BF
 #define FLAG_0x3C0               0x3C0
-#define FLAG_0x3C1               0x3C1
+#define FLAG_SPRITEVIS_SLATEPORT_MUSEUM_POPULATION               0x3C1
 #define FLAG_0x3C2               0x3C2
 #define FLAG_0x3C3               0x3C3
 #define FLAG_0x3C4               0x3C4