More script flags

17 files changed, 51 insertions, 37 deletions

diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s
index e5e712f7e..c2b7df784 100644
--- a/data-de/event_scripts.s
+++ b/data-de/event_scripts.s
@@ -1307,11 +1307,11 @@ EverGrandeCity_HallOfFame_EventScript_19FC13:: @ 819FC13
 	clearflag 860
 	clearflag 861
 	special sub_810FAA0
-	checkflag 291
+	checkflag FLAG_RECEIVED_SS_TICKET
 	call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC62
 	checkflag FLAG_LATIOS_OR_LATIAS_ROAMING
 	call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC70
-	checkflag 298
+	checkflag FLAG_RECEIVED_BELDUM
 	call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC5A
 	checkflag FLAG_RECEIVED_HM08
 	call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC5E
@@ -1808,7 +1808,7 @@ LavaridgeTown_Gym_1F_EventScript_1A00FB:: @ 81A00FB
 MauvilleCity_Gym_EventScript_1A00FB:: @ 81A00FB
 RustboroCity_Gym_EventScript_1A00FB:: @ 81A00FB
 	clearflag 781
-	setflag 296
+	setflag FLAG_PETALBURG_MART_EXPANDED_ITEMS
 	return
 
 DewfordTown_EventScript_1A0102:: @ 81A0102
diff --git a/data/event_scripts.s b/data/event_scripts.s
index b2414502f..c5c5e25c2 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -1301,11 +1301,11 @@ EverGrandeCity_HallOfFame_EventScript_19FC13:: @ 819FC13
 	clearflag 860
 	clearflag 861
 	special sub_810FAA0
-	checkflag 291
+	checkflag FLAG_RECEIVED_SS_TICKET
 	call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC62
 	checkflag FLAG_LATIOS_OR_LATIAS_ROAMING
 	call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC70
-	checkflag 298
+	checkflag FLAG_RECEIVED_BELDUM
 	call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC5A
 	checkflag FLAG_RECEIVED_HM08
 	call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC5E
@@ -1802,7 +1802,7 @@ LavaridgeTown_Gym_1F_EventScript_1A00FB:: @ 81A00FB
 MauvilleCity_Gym_EventScript_1A00FB:: @ 81A00FB
 RustboroCity_Gym_EventScript_1A00FB:: @ 81A00FB
 	clearflag 781
-	setflag 296
+	setflag FLAG_PETALBURG_MART_EXPANDED_ITEMS
 	return
 
 DewfordTown_EventScript_1A0102:: @ 81A0102
diff --git a/data/scripts/maps/AbandonedShip_CaptainsOffice.inc b/data/scripts/maps/AbandonedShip_CaptainsOffice.inc
index eb912028a..2bec8ac39 100644
--- a/data/scripts/maps/AbandonedShip_CaptainsOffice.inc
+++ b/data/scripts/maps/AbandonedShip_CaptainsOffice.inc
@@ -4,7 +4,7 @@ AbandonedShip_CaptainsOffice_MapScripts:: @ 815EAF4
 AbandonedShip_CaptainsOffice_EventScript_15EAF5:: @ 815EAF5
 	lock
 	faceplayer
-	checkflag 294
+	checkflag FLAG_EXCHANGED_SCANNER
 	goto_if_eq AbandonedShip_CaptainsOffice_EventScript_15EB2D
 	checkitem ITEM_SCANNER, 1
 	compare RESULT, 1
diff --git a/data/scripts/maps/DewfordTown_House2.inc b/data/scripts/maps/DewfordTown_House2.inc
index befe47404..29ae58a22 100644
--- a/data/scripts/maps/DewfordTown_House2.inc
+++ b/data/scripts/maps/DewfordTown_House2.inc
@@ -4,13 +4,13 @@ DewfordTown_House2_MapScripts:: @ 81535DB
 DewfordTown_House2_EventScript_1535DC:: @ 81535DC
 	lock
 	faceplayer
-	checkflag 289
+	checkflag FLAG_RECEIVED_SILK_SCARF
 	goto_if_eq DewfordTown_House2_EventScript_153615
 	msgbox DewfordTown_House2_Text_175EFE, 4
 	giveitem ITEM_SILK_SCARF
 	compare RESULT, 0
 	goto_if_eq DewfordTown_House2_EventScript_15360B
-	setflag 289
+	setflag FLAG_RECEIVED_SILK_SCARF
 	release
 	end
 
diff --git a/data/scripts/maps/FortreeCity.inc b/data/scripts/maps/FortreeCity.inc
index ae0f53f5e..dd947d0e5 100644
--- a/data/scripts/maps/FortreeCity.inc
+++ b/data/scripts/maps/FortreeCity.inc
@@ -18,7 +18,7 @@ FortreeCity_EventScript_14C955:: @ 814C955
 FortreeCity_EventScript_14C95E:: @ 814C95E
 	lock
 	faceplayer
-	checkflag 295
+	checkflag FLAG_KECLEON_FLED_FORTREE
 	goto_if_eq FortreeCity_EventScript_14C973
 	msgbox FortreeCity_Text_1675C2, 4
 	release
@@ -82,7 +82,7 @@ FortreeCity_EventScript_14C9E4:: @ 814C9E4
 	applymovement LAST_TALKED, FortreeCity_Movement_14CA13
 	waitmovement 0
 	removeobject LAST_TALKED
-	setflag 295
+	setflag FLAG_KECLEON_FLED_FORTREE
 	release
 	end
 
diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc
index 0b5886131..7ffffad78 100644
--- a/data/scripts/maps/LilycoveCity.inc
+++ b/data/scripts/maps/LilycoveCity.inc
@@ -422,6 +422,6 @@ LilycoveCity_EventScript_14CF6B:: @ 814CF6B
 	waitfieldeffect 30
 	savebgm 0
 	fadedefaultbgm
-	setflag 292
+	setflag FLAG_MET_RIVAL_LILYCOVE
 	release
 	end
diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc
index f0847e740..54e2bd042 100644
--- a/data/scripts/maps/LittlerootTown.inc
+++ b/data/scripts/maps/LittlerootTown.inc
@@ -22,7 +22,7 @@ LittlerootTown_MapScript1_14D514:: @ 814D514
 	end
 
 LittlerootTown_EventScript_14D563:: @ 814D563
-	setflag 301
+	setflag FLAG_RIVAL_LEFT_FOR_ROUTE103
 	return
 
 LittlerootTown_EventScript_14D567:: @ 814D567
diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc
index a58d16dd5..d65e943fd 100644
--- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc
+++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc
@@ -137,7 +137,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1529EB:: @ 81529EB
 	faceplayer
 	checkflag FLAG_DEFEATED_RIVAL_ROUTE103
 	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A21
-	checkflag 301
+	checkflag FLAG_RIVAL_LEFT_FOR_ROUTE103
 	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A17
 	compare 0x408d, 3
 	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A2B
diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc
index c0a403117..020c39eac 100644
--- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc
+++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc
@@ -30,7 +30,7 @@ LittlerootTown_MaysHouse_2F_EventScript_152A90:: @ 8152A90
 LittlerootTown_BrendansHouse_2F_EventScript_152A9D:: @ 8152A9D
 LittlerootTown_MaysHouse_2F_EventScript_152A9D:: @ 8152A9D
 	lockall
-	checkflag 292
+	checkflag FLAG_MET_RIVAL_LILYCOVE
 	goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BB5
 	checkplayergender
 	compare RESULT, 0
@@ -117,18 +117,18 @@ LittlerootTown_BrendansHouse_2F_EventScript_152BB5:: @ 8152BB5
 	call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152BDB
 	compare RESULT, 1
 	call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152BED
-	setflag 293
+	setflag FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE
 	releaseall
 	end
 
 LittlerootTown_BrendansHouse_2F_EventScript_152BDB:: @ 8152BDB
-	checkflag 293
+	checkflag FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE
 	goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BFF
 	msgbox LittlerootTown_BrendansHouse_2F_Text_1737AE, 4
 	return
 
 LittlerootTown_BrendansHouse_2F_EventScript_152BED:: @ 8152BED
-	checkflag 293
+	checkflag FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE
 	goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152C08
 	msgbox LittlerootTown_BrendansHouse_2F_Text_1738F2, 4
 	return
diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc
index ce24f2afd..5b2f281da 100644
--- a/data/scripts/maps/MossdeepCity_StevensHouse.inc
+++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc
@@ -41,7 +41,7 @@ MossdeepCity_StevensHouse_EventScript_15AA0B:: @ 815AA0B
 	msgbox MossdeepCity_StevensHouse_Text_18DA77, 4
 	giveitem ITEM_HM08
 	setflag FLAG_RECEIVED_HM08
-	setflag 302
+	setflag FLAG_OMIT_DIVE_FROM_STEVEN_LETTER
 	msgbox MossdeepCity_StevensHouse_Text_18DB22, 4
 	closemessage
 	delay 20
@@ -89,7 +89,7 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C
 	compare RESULT, 1
 	call_if 1, MossdeepCity_StevensHouse_EventScript_1A0678
 	setflag 968
-	setflag 298
+	setflag FLAG_RECEIVED_BELDUM
 	releaseall
 	end
 
@@ -113,7 +113,7 @@ MossdeepCity_StevensHouse_EventScript_15AAF9:: @ 815AAF9
 
 MossdeepCity_StevensHouse_EventScript_15AB02:: @ 815AB02
 	lockall
-	checkflag 302
+	checkflag FLAG_OMIT_DIVE_FROM_STEVEN_LETTER
 	goto_if_eq MossdeepCity_StevensHouse_EventScript_15AB16
 	msgbox MossdeepCity_StevensHouse_Text_18DF1A, 4
 	releaseall
diff --git a/data/scripts/maps/PacifidlogTown_House2.inc b/data/scripts/maps/PacifidlogTown_House2.inc
index e04a8caae..942f5626b 100644
--- a/data/scripts/maps/PacifidlogTown_House2.inc
+++ b/data/scripts/maps/PacifidlogTown_House2.inc
@@ -6,13 +6,13 @@ PacifidlogTown_House2_EventScript_154168:: @ 8154168
 	faceplayer
 	dodailyevents
 	call PacifidlogTown_House2_EventScript_1541B4
-	checkflag 299
+	checkflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK
 	goto_if_eq PacifidlogTown_House2_EventScript_154254
-	checkflag 300
+	checkflag FLAG_MET_FANCLUB_YOUNGER_BROTHER
 	call_if 1, PacifidlogTown_House2_EventScript_1541CE
-	checkflag 300
+	checkflag FLAG_MET_FANCLUB_YOUNGER_BROTHER
 	call_if 0, PacifidlogTown_House2_EventScript_1541D7
-	setflag 300
+	setflag FLAG_MET_FANCLUB_YOUNGER_BROTHER
 	specialvar RESULT, GetLeadMonFriendshipScore
 	compare RESULT, 4
 	goto_if 4, PacifidlogTown_House2_EventScript_1541EC
@@ -23,7 +23,7 @@ PacifidlogTown_House2_EventScript_154168:: @ 8154168
 	end
 
 PacifidlogTown_House2_EventScript_1541B4:: @ 81541B4
-	checkflag 299
+	checkflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK
 	goto_if 0, PacifidlogTown_House2_EventScript_1A14DC
 	specialvar RESULT, sub_810F908
 	compare RESULT, 0
@@ -40,7 +40,7 @@ PacifidlogTown_House2_EventScript_1541D7:: @ 81541D7
 	return
 
 PacifidlogTown_House2_EventScript_1541E8:: @ 81541E8
-	clearflag 299
+	clearflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK
 	return
 
 PacifidlogTown_House2_EventScript_1541EC:: @ 81541EC
@@ -48,7 +48,7 @@ PacifidlogTown_House2_EventScript_1541EC:: @ 81541EC
 	giveitem ITEM_TM27
 	compare RESULT, 0
 	goto_if_eq PacifidlogTown_House2_EventScript_1A029B
-	setflag 299
+	setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK
 	special sub_810F950
 	msgbox PacifidlogTown_House2_Text_179283, 4
 	release
@@ -64,7 +64,7 @@ PacifidlogTown_House2_EventScript_154225:: @ 8154225
 	giveitem ITEM_TM21
 	compare RESULT, 0
 	goto_if_eq PacifidlogTown_House2_EventScript_1A029B
-	setflag 299
+	setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK
 	special sub_810F950
 	msgbox PacifidlogTown_House2_Text_179283, 4
 	release
diff --git a/data/scripts/maps/PetalburgCity_Mart.inc b/data/scripts/maps/PetalburgCity_Mart.inc
index e4186eaae..66e247323 100644
--- a/data/scripts/maps/PetalburgCity_Mart.inc
+++ b/data/scripts/maps/PetalburgCity_Mart.inc
@@ -6,7 +6,7 @@ PetalburgCity_Mart_EventScript_1552B0:: @ 81552B0
 	faceplayer
 	message PetalburgCity_Mart_Text_1A0BE4
 	waitmessage
-	checkflag 296
+	checkflag FLAG_PETALBURG_MART_EXPANDED_ITEMS
 	goto_if_eq PetalburgCity_Mart_EventScript_1552EA
 	pokemart PetalburgCity_Mart_Items1
 	msgbox PetalburgCity_Mart_Text_1A0C02, 4
diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/scripts/maps/PetalburgWoods.inc
index 0b0c72f70..c38d4d559 100644
--- a/data/scripts/maps/PetalburgWoods.inc
+++ b/data/scripts/maps/PetalburgWoods.inc
@@ -241,13 +241,13 @@ PetalburgWoods_EventScript_15CED3:: @ 815CED3
 PetalburgWoods_EventScript_15CEDC:: @ 815CEDC
 	lock
 	faceplayer
-	checkflag 297
+	checkflag FLAG_RECEIVED_MIRACLE_SEED
 	goto_if_eq PetalburgWoods_EventScript_15CF0B
 	msgbox PetalburgWoods_Text_19549E, 4
 	giveitem ITEM_MIRACLE_SEED
 	compare RESULT, 0
 	goto_if_eq PetalburgWoods_EventScript_1A029B
-	setflag 297
+	setflag FLAG_RECEIVED_MIRACLE_SEED
 	release
 	end
 
diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc
index c6937170e..54f2d98a8 100644
--- a/data/scripts/maps/Route120.inc
+++ b/data/scripts/maps/Route120.inc
@@ -184,7 +184,7 @@ Route120_EventScript_15184A:: @ 815184A
 Route120_EventScript_151853:: @ 8151853
 	lock
 	faceplayer
-	checkflag 290
+	checkflag FLAG_NOT_READY_FOR_BATTLE_ROUTE120
 	goto_if_eq Route120_EventScript_151884
 	msgbox Route120_Text_171827, 5
 	compare RESULT, 0
@@ -194,7 +194,7 @@ Route120_EventScript_151853:: @ 8151853
 
 Route120_EventScript_151877:: @ 8151877
 	msgbox Route120_Text_17193D, 4
-	setflag 290
+	setflag FLAG_NOT_READY_FOR_BATTLE_ROUTE120
 	release
 	end
 
diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc
index 2486099ef..daa6b1e7c 100644
--- a/data/scripts/maps/SlateportCity_Harbor.inc
+++ b/data/scripts/maps/SlateportCity_Harbor.inc
@@ -340,7 +340,7 @@ SlateportCity_Harbor_EventScript_1562EA:: @ 81562EA
 	goto_if_eq SlateportCity_Harbor_EventScript_1A029B
 	removeitem ITEM_SCANNER, 1
 	msgbox SlateportCity_Harbor_Text_18046B, 4
-	setflag 294
+	setflag FLAG_EXCHANGED_SCANNER
 	goto SlateportCity_Harbor_EventScript_156380
 	end
 
@@ -353,7 +353,7 @@ SlateportCity_Harbor_EventScript_15632A:: @ 815632A
 	goto_if_eq SlateportCity_Harbor_EventScript_1A029B
 	removeitem ITEM_SCANNER, 1
 	msgbox SlateportCity_Harbor_Text_18046B, 4
-	setflag 294
+	setflag FLAG_EXCHANGED_SCANNER
 	goto SlateportCity_Harbor_EventScript_156380
 	end
 
diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc
index eab06c8ee..b27f98675 100644
--- a/data/scripts/players_house.inc
+++ b/data/scripts/players_house.inc
@@ -398,7 +398,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE
 	call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6E0B
 	playse 8
 	removeobject 0x8009
-	setflag 291
+	setflag FLAG_RECEIVED_SS_TICKET
 	setvar 0x4082, 4
 	setvar 0x408c, 4
 	releaseall
diff --git a/include/constants/flags.h b/include/constants/flags.h
index 0d2a3efbd..fe775c351 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -240,6 +240,20 @@
 #define FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE 0x11E
 #define FLAG_MET_DEVON_EMPLOYEE             0x11F
 #define FLAG_MET_RIVAL_RUSTBORO             0x120
+#define FLAG_RECEIVED_SILK_SCARF            0x121
+#define FLAG_NOT_READY_FOR_BATTLE_ROUTE120  0x122
+#define FLAG_RECEIVED_SS_TICKET             0x123
+#define FLAG_MET_RIVAL_LILYCOVE             0x124
+#define FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE 0x125
+#define FLAG_EXCHANGED_SCANNER              0x126
+#define FLAG_KECLEON_FLED_FORTREE           0x127
+#define FLAG_PETALBURG_MART_EXPANDED_ITEMS  0x128
+#define FLAG_RECEIVED_MIRACLE_SEED          0x129
+#define FLAG_RECEIVED_BELDUM                0x12A
+#define FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK  0x12B
+#define FLAG_MET_FANCLUB_YOUNGER_BROTHER    0x12C
+#define FLAG_RIVAL_LEFT_FOR_ROUTE103        0x12D
+#define FLAG_OMIT_DIVE_FROM_STEVEN_LETTER   0x12E
 
 #define TRAINER_FLAG_START 0x500