Trainer dump pass 2; flag refactoring

6 files changed, 11 insertions, 11 deletions

diff --git a/data/maps/CinnabarIsland_Gym/scripts.inc b/data/maps/CinnabarIsland_Gym/scripts.inc
index 20c00f117..26af36303 100644
--- a/data/maps/CinnabarIsland_Gym/scripts.inc
+++ b/data/maps/CinnabarIsland_Gym/scripts.inc
@@ -68,7 +68,7 @@ EventScript_16DA06:: @ 816DA06
 	setvar VAR_0x8005, 1
 	special SetFlavorTextFlagFromSpecialVars
 	setflag FLAG_0x4B6
-	setflag FLAG_UNK826
+	setflag FLAG_0x826
 	setrespawn SPAWN_CINNABAR_ISLAND
 	setvar VAR_0x4071, 1
 	clearflag FLAG_0x062
@@ -208,7 +208,7 @@ EventScript_16DBC0:: @ 816DBC0
 
 CinnabarIsland_Gym_EventScript_16DBCA:: @ 816DBCA
 	lockall
-	checkflag FLAG_UNK826
+	checkflag FLAG_0x826
 	goto_if_eq EventScript_16DBDE
 	msgbox gUnknown_8199C29
 	releaseall
diff --git a/data/maps/FuchsiaCity_Gym/scripts.inc b/data/maps/FuchsiaCity_Gym/scripts.inc
index 6b57f6377..930ccd463 100644
--- a/data/maps/FuchsiaCity_Gym/scripts.inc
+++ b/data/maps/FuchsiaCity_Gym/scripts.inc
@@ -18,7 +18,7 @@ EventScript_16D580:: @ 816D580
 	special SetFlavorTextFlagFromSpecialVars
 	clearflag FLAG_0x09F
 	setflag FLAG_0x4B4
-	setflag FLAG_UNK824
+	setflag FLAG_0x824
 	setvar VAR_0x8008, 5
 	call EventScript_1A6B18
 	goto EventScript_16D5A6
@@ -90,7 +90,7 @@ EventScript_16D69D:: @ 816D69D
 
 FuchsiaCity_Gym_EventScript_16D6A7:: @ 816D6A7
 	lockall
-	checkflag FLAG_UNK824
+	checkflag FLAG_0x824
 	goto_if_eq EventScript_16D6BB
 	msgbox gUnknown_8198B4B
 	releaseall
diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc
index ed53b8518..61e8eaf2d 100644
--- a/data/maps/PalletTown/scripts.inc
+++ b/data/maps/PalletTown/scripts.inc
@@ -50,7 +50,7 @@ EventScript_1654D8:: @ 81654D8
 	addobject 3
 	applymovement 3, Movement_1655AF
 	waitmovement 0
-	checkflag FLAG_SYS_RIBBON_GET
+	checkflag FLAG_0x89B
 	goto_if 0, EventScript_1655A1
 	msgbox gUnknown_817D8BF
 	setvar VAR_0x8004, 0
diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc
index 64bec30b1..cd6747720 100644
--- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc
+++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc
@@ -974,7 +974,7 @@ EventScript_1699CE:: @ 81699CE
 	closemessage
 	compare_var_to_value VAR_0x8009, 60
 	goto_if 0, EventScript_1699F9
-	checkflag FLAG_SYS_RIBBON_GET
+	checkflag FLAG_0x89B
 	goto_if 0, EventScript_1699F9
 	delay 30
 	msgbox gUnknown_818EDF5
diff --git a/data/maps/PewterCity_Gym/scripts.inc b/data/maps/PewterCity_Gym/scripts.inc
index 5990bf1e3..74aed695d 100644
--- a/data/maps/PewterCity_Gym/scripts.inc
+++ b/data/maps/PewterCity_Gym/scripts.inc
@@ -17,7 +17,7 @@ EventScript_16A5C5:: @ 816A5C5
 	setvar VAR_0x8005, 1
 	special SetFlavorTextFlagFromSpecialVars
 	setflag FLAG_0x4B0
-	setflag FLAG_UNK820
+	setflag FLAG_0x820
 	setvar VAR_0x406C, 1
 	setflag FLAG_0x02E
 	clearflag FLAG_0x092
@@ -82,7 +82,7 @@ EventScript_16A6A5:: @ 816A6A5
 
 PewterCity_Gym_EventScript_16A6AF:: @ 816A6AF
 	lockall
-	checkflag FLAG_UNK820
+	checkflag FLAG_0x820
 	goto_if_eq EventScript_16A6C3
 	msgbox gUnknown_819146E
 	releaseall
diff --git a/data/maps/ViridianCity/scripts.inc b/data/maps/ViridianCity/scripts.inc
index 5434fa1fa..2830c8f98 100644
--- a/data/maps/ViridianCity/scripts.inc
+++ b/data/maps/ViridianCity/scripts.inc
@@ -37,11 +37,11 @@ EventScript_165931:: @ 8165931
 	goto_if 0, EventScript_1A77A9
 	checkflag FLAG_0x823
 	goto_if 0, EventScript_1A77A9
-	checkflag FLAG_UNK824
+	checkflag FLAG_0x824
 	goto_if 0, EventScript_1A77A9
 	checkflag FLAG_0x825
 	goto_if 0, EventScript_1A77A9
-	checkflag FLAG_UNK826
+	checkflag FLAG_0x826
 	goto_if 0, EventScript_1A77A9
 	setvar VAR_0x405A, 1
 	return
@@ -107,7 +107,7 @@ EventScript_1659EC:: @ 81659EC
 ViridianCity_EventScript_1659F6:: @ 81659F6
 	lock
 	faceplayer
-	checkflag FLAG_UNK820
+	checkflag FLAG_0x820
 	goto_if_eq EventScript_165A23
 	compare_var_to_value VAR_0x4051, 2
 	goto_if 4, EventScript_165A4A