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
@@ -6,7 +6,7 @@ RustboroCity_Gym_EventScript_212F31:: @ 8212F31
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq RustboroCity_Gym_EventScript_212FC8
-	goto_if_unset FLAG_0x0A5, RustboroCity_Gym_EventScript_212FA4
+	goto_if_unset FLAG_RECEIVED_TM39, RustboroCity_Gym_EventScript_212FA4
 	msgbox RustboroCity_Gym_Text_2139A7, MSGBOX_DEFAULT
 	release
 	end
@@ -16,7 +16,7 @@ RustboroCity_Gym_EventScript_212F66:: @ 8212F66
 	waitmessage
 	call RustboroCity_Gym_EventScript_27207E
 	msgbox RustboroCity_Gym_Text_213816, MSGBOX_DEFAULT
-	setflag FLAG_0x4F0
+	setflag FLAG_DEFEATED_RUSTBORO_GYM
 	setflag FLAG_BADGE01_GET
 	setvar VAR_0x405A, 1
 	addvar VAR_0x4085, 1
@@ -31,7 +31,7 @@ RustboroCity_Gym_EventScript_212FA4:: @ 8212FA4
 	giveitem_std ITEM_TM39
 	compare VAR_RESULT, 0
 	goto_if_eq RustboroCity_Gym_EventScript_272054
-	setflag FLAG_0x0A5
+	setflag FLAG_RECEIVED_TM39
 	msgbox RustboroCity_Gym_Text_2138B1, MSGBOX_DEFAULT
 	release
 	end
@@ -59,7 +59,7 @@ RustboroCity_Gym_EventScript_213011:: @ 8213011
 RustboroCity_Gym_EventScript_213028:: @ 8213028
 	lock
 	faceplayer
-	goto_if_set FLAG_0x4F0, RustboroCity_Gym_EventScript_21303D
+	goto_if_set FLAG_DEFEATED_RUSTBORO_GYM, RustboroCity_Gym_EventScript_21303D
 	msgbox RustboroCity_Gym_Text_21309D, MSGBOX_DEFAULT
 	release
 	end
@@ -101,8 +101,8 @@ RustboroCity_Gym_EventScript_21307B:: @ 821307B
 	waitfanfare
 	closemessage
 	delay 30
-	setflag FLAG_0x1D3
-	clearflag FLAG_0x080
+	setflag FLAG_ENABLE_ROXANNE_MATCH_CALL
+	clearflag FLAG_ENABLE_ROXANNE_FIRST_CALL
 	releaseall
 	end