Finish off labelling flags

2019-01-02 21:12:43 +00:00
parent 2dd706ca54
commit 1e3da62d24
195 changed files with 2528 additions and 2516 deletions
@@ -20,7 +20,7 @@ FortreeCity_Gym_EventScript_2165C8:: @ 82165C8
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq FortreeCity_Gym_EventScript_21668D
-	goto_if_unset FLAG_0x0AA, FortreeCity_Gym_EventScript_216646
+	goto_if_unset FLAG_RECEIVED_TM40, FortreeCity_Gym_EventScript_216646
 	msgbox FortreeCity_Gym_Text_217071, MSGBOX_DEFAULT
 	release
 	end
@@ -30,7 +30,7 @@ FortreeCity_Gym_EventScript_2165FD:: @ 82165FD
 	waitmessage
 	call FortreeCity_Gym_EventScript_27207E
 	msgbox FortreeCity_Gym_Text_216F17, MSGBOX_DEFAULT
-	setflag FLAG_0x4F5
+	setflag FLAG_DEFEATED_FORTREE_GYM
 	setflag FLAG_BADGE06_GET
 	setvar VAR_0x8008, 6
 	call FortreeCity_Gym_EventScript_271F43
@@ -42,9 +42,9 @@ FortreeCity_Gym_EventScript_2165FD:: @ 82165FD
 	waitfanfare
 	closemessage
 	delay 30
-	setflag FLAG_0x1D7
+	setflag FLAG_ENABLE_WINONA_MATCH_CALL
 	setvar VAR_0x40F3, 0
-	setflag FLAG_0x08A
+	setflag FLAG_REGISTER_WINONA_POKENAV
 	release
 	end

@@ -53,7 +53,7 @@ FortreeCity_Gym_EventScript_216646:: @ 8216646
 	compare VAR_RESULT, 0
 	goto_if_eq FortreeCity_Gym_EventScript_272054
 	msgbox FortreeCity_Gym_Text_216FEC, MSGBOX_DEFAULT
-	setflag FLAG_0x0AA
+	setflag FLAG_RECEIVED_TM40
 	release
 	end

@@ -62,7 +62,7 @@ FortreeCity_Gym_EventScript_21666A:: @ 821666A
 	compare VAR_RESULT, 0
 	goto_if_eq FortreeCity_Gym_EventScript_27205E
 	msgbox FortreeCity_Gym_Text_216FEC, MSGBOX_DEFAULT
-	setflag FLAG_0x0AA
+	setflag FLAG_RECEIVED_TM40
 	return

 FortreeCity_Gym_EventScript_21668D:: @ 821668D
@@ -103,7 +103,7 @@ FortreeCity_Gym_EventScript_21671B:: @ 821671B
 FortreeCity_Gym_EventScript_216732:: @ 8216732
 	lock
 	faceplayer
-	goto_if_set FLAG_0x4F5, FortreeCity_Gym_EventScript_216747
+	goto_if_set FLAG_DEFEATED_FORTREE_GYM, FortreeCity_Gym_EventScript_216747
 	msgbox FortreeCity_Gym_Text_216785, MSGBOX_DEFAULT
 	release
 	end
@@ -318,4 +318,3 @@ FortreeCity_Gym_Text_217292: @ 8217292
 	.string "POKéMON with you?\p"
 	.string "Please return with two POKéMON\n"
 	.string "at the very least.$"
-