Use FLAG_ prefix for all flags

2 files changed, 25 insertions, 25 deletions

diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s
index 5c84fd673..c7e05f008 100644
--- a/data-de/event_scripts.s
+++ b/data-de/event_scripts.s
@@ -1332,7 +1332,7 @@ EverGrandeCity_HallOfFame_EventScript_19FC62:: @ 819FC62
 	return
 
 EverGrandeCity_HallOfFame_EventScript_19FC70:: @ 819FC70
-	setflag SYS_TV_LATI
+	setflag FLAG_SYS_TV_LATI
 	return
 
 S_WhiteOut:: @ 819FC74
@@ -1723,9 +1723,9 @@ EventScript_1A0070:
 
 EventScript_1A0085:
 	playse 2
-	checkflag SYS_PC_LANETTE
+	checkflag FLAG_SYS_PC_LANETTE
 	call_if 0, EventScript_1A00AC
-	checkflag SYS_PC_LANETTE
+	checkflag FLAG_SYS_PC_LANETTE
 	call_if 1, EventScript_1A00B5
 	msgbox UnknownString_81A0A35, 4
 	special ShowPokemonStorageSystem
@@ -1749,7 +1749,7 @@ EventScript_1A00BE:
 	end
 
 EventScript_1A00CB:
-	checkflag SYS_GAME_CLEAR
+	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if 0, EventScript_1A00BE
 	playse 2
 	special AccessHallOfFamePC
@@ -2366,9 +2366,9 @@ MagmaHideout_B1F_EventScript_1A04FD:: @ 81A04FD
 	delay 40
 	waitpokecry
 	setflag FLAG_HIDE_ELECTRODE_1_HIDEOUT
-	setflag SYS_CTRL_OBJ_DELETE
+	setflag FLAG_SYS_CTRL_OBJ_DELETE
 	dowildbattle
-	clearflag SYS_CTRL_OBJ_DELETE
+	clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	release
 	end
 
@@ -2382,9 +2382,9 @@ MagmaHideout_B1F_EventScript_1A051B:: @ 81A051B
 	delay 40
 	waitpokecry
 	setflag FLAG_HIDE_ELECTRODE_2_HIDEOUT
-	setflag SYS_CTRL_OBJ_DELETE
+	setflag FLAG_SYS_CTRL_OBJ_DELETE
 	dowildbattle
-	clearflag SYS_CTRL_OBJ_DELETE
+	clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	release
 	end
 
@@ -2479,9 +2479,9 @@ Route119_EventScript_1A05C3:: @ 81A05C3
 	call_if 1, Route119_EventScript_1A065A
 	compare 0x8004, 7
 	call_if 1, Route119_EventScript_1A065E
-	setflag SYS_CTRL_OBJ_DELETE
+	setflag FLAG_SYS_CTRL_OBJ_DELETE
 	dowildbattle
-	clearflag SYS_CTRL_OBJ_DELETE
+	clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	release
 	end
 
@@ -3964,7 +3964,7 @@ SecretBase_YellowCave4_EventScript_1A2FC0:: @ 81A2FC0
 	end
 
 SecretBase_RedCave1_EventScript_1A3032:: @ 81A3032
-	checkflag SYS_GAME_CLEAR
+	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if 0, SecretBase_RedCave1_EventScript_1A3086
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A30A5
@@ -3999,7 +3999,7 @@ SecretBase_RedCave1_EventScript_1A30A5:: @ 81A30A5
 	end
 
 SecretBase_RedCave1_EventScript_1A30AE:: @ 81A30AE
-	checkflag SYS_GAME_CLEAR
+	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if 0, SecretBase_RedCave1_EventScript_1A3102
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A3121
@@ -4034,7 +4034,7 @@ SecretBase_RedCave1_EventScript_1A3121:: @ 81A3121
 	end
 
 SecretBase_RedCave1_EventScript_1A312A:: @ 81A312A
-	checkflag SYS_GAME_CLEAR
+	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if 0, SecretBase_RedCave1_EventScript_1A317E
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A319D
@@ -4069,7 +4069,7 @@ SecretBase_RedCave1_EventScript_1A319D:: @ 81A319D
 	end
 
 SecretBase_RedCave1_EventScript_1A31A6:: @ 81A31A6
-	checkflag SYS_GAME_CLEAR
+	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if 0, SecretBase_RedCave1_EventScript_1A31FA
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A3219
@@ -4104,7 +4104,7 @@ SecretBase_RedCave1_EventScript_1A3219:: @ 81A3219
 	end
 
 SecretBase_RedCave1_EventScript_1A3222:: @ 81A3222
-	checkflag SYS_GAME_CLEAR
+	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if 0, SecretBase_RedCave1_EventScript_1A3276
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A3295
@@ -4139,7 +4139,7 @@ SecretBase_RedCave1_EventScript_1A3295:: @ 81A3295
 	end
 
 SecretBase_RedCave1_EventScript_1A329E:: @ 81A329E
-	checkflag SYS_GAME_CLEAR
+	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if 0, SecretBase_RedCave1_EventScript_1A32F2
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A3311
@@ -4174,7 +4174,7 @@ SecretBase_RedCave1_EventScript_1A3311:: @ 81A3311
 	end
 
 SecretBase_RedCave1_EventScript_1A331A:: @ 81A331A
-	checkflag SYS_GAME_CLEAR
+	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if 0, SecretBase_RedCave1_EventScript_1A336E
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A338D
@@ -4209,7 +4209,7 @@ SecretBase_RedCave1_EventScript_1A338D:: @ 81A338D
 	end
 
 SecretBase_RedCave1_EventScript_1A3396:: @ 81A3396
-	checkflag SYS_GAME_CLEAR
+	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if 0, SecretBase_RedCave1_EventScript_1A33EA
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A3409
@@ -4244,7 +4244,7 @@ SecretBase_RedCave1_EventScript_1A3409:: @ 81A3409
 	end
 
 SecretBase_RedCave1_EventScript_1A3412:: @ 81A3412
-	checkflag SYS_GAME_CLEAR
+	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if 0, SecretBase_RedCave1_EventScript_1A3466
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A3485
@@ -4279,7 +4279,7 @@ SecretBase_RedCave1_EventScript_1A3485:: @ 81A3485
 	end
 
 SecretBase_RedCave1_EventScript_1A348E:: @ 81A348E
-	checkflag SYS_GAME_CLEAR
+	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if 0, SecretBase_RedCave1_EventScript_1A34E2
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A3501
diff --git a/data-de/field_move_scripts.inc b/data-de/field_move_scripts.inc
index b33765564..559eaf0ab 100644
--- a/data-de/field_move_scripts.inc
+++ b/data-de/field_move_scripts.inc
@@ -1,6 +1,6 @@
 S_CuttableTree:: @ 81B0DCC
 	lockall
-	checkflag BADGE01_GET
+	checkflag FLAG_BADGE01_GET
 	goto_if 0, CannotUseCut
 	checkpokemove MOVE_CUT
 	compare RESULT, 6
@@ -61,7 +61,7 @@ CannotUseCutText: @ 81B0E8E
 
 S_BreakableRock:: @ 81B0EB7
 	lockall
-	checkflag BADGE03_GET
+	checkflag FLAG_BADGE03_GET
 	goto_if 0, CannotUseRockSmash
 	checkpokemove MOVE_ROCK_SMASH
 	compare RESULT, 6
@@ -128,9 +128,9 @@ CannotUseRockSmashText: @ 81B0F90
 
 S_PushableBoulder:: @ 81B0FCB
 	lockall
-	checkflag BADGE04_GET
+	checkflag FLAG_BADGE04_GET
 	goto_if 0, CannotUseStrength
-	checkflag SYS_USE_STRENGTH
+	checkflag FLAG_SYS_USE_STRENGTH
 	goto_if_eq AlreadyUsedStrength
 	checkpokemove 70
 	compare RESULT, 6
@@ -153,7 +153,7 @@ S_UseStrength:: @ 81B100E
 	end
 
 UsedStrength: @ 81B1019
-	setflag SYS_USE_STRENGTH
+	setflag FLAG_SYS_USE_STRENGTH
 	msgbox UsedStrengthText, 3
 	releaseall
 	end