finish event object flags

1 files changed, 68 insertions, 68 deletions

diff --git a/data/event_scripts.s b/data/event_scripts.s
index e0494d6ea..3ac08769d 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -1071,9 +1071,9 @@ EventScript_27149D:: @ 827149D
 
 EventScript_2715DE:: @ 82715DE
 	setflag FLAG_LINK_CONTEST_POKE_BALL
-	setflag FLAG_0x301
-	setflag FLAG_0x302
-	setflag FLAG_0x303
+	setflag FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE
+	setflag FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE
+	setflag FLAG_HIDE_ROUTE_111_VICKY_WINSTRATE
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CYNDAQUIL
@@ -1086,15 +1086,15 @@ EventScript_2715DE:: @ 82715DE
 	setflag FLAG_HIDE_RUSBORO_CITY_RIVAL
 	setflag FLAG_HIDE_RUSTBORO_CITY_SCIENTIST
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN
-	setflag FLAG_0x2E3
-	setflag FLAG_0x371
-	setflag FLAG_0x2E2
+	setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY
+	setflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO
+	setflag FLAG_HIDE_ROUTE_104_MR_BRINEY
 	setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
-	setflag FLAG_0x2E5
+	setflag FLAG_HIDE_ROUTE_108_MR_BRINEY
 	setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
-	setflag FLAG_0x2E8
-	setflag FLAG_0x38A
-	setflag FLAG_0x345
+	setflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT
+	setflag FLAG_HIDE_ROUTE_104_WHITE_HERB_FLORIST
+	setflag FLAG_HIDE_ROUTE_110_BIRCH
 	setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_1
 	setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_2
 	setflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_1
@@ -1116,13 +1116,13 @@ EventScript_2715DE:: @ 82715DE
 	setflag FLAG_HIDE_FANCLUB_LITTLE_BOY
 	setflag FLAG_HIDE_FANCLUB_LADY
 	setflag FLAG_HIDE_LILYCOVE_FAN_CLUB_INTERVIEWER
-	setflag FLAG_0x31D
-	setflag FLAG_0x31E
-	setflag FLAG_0x31F
-	setflag FLAG_0x385
-	setflag FLAG_0x386
-	setflag FLAG_0x387
-	setflag FLAG_0x388
+	setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1
+	setflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1
+	setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3
+	setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2
+	setflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2
+	setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2
+	setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3
 	setflag FLAG_0x323
 	setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER
 	setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY
@@ -1146,16 +1146,16 @@ EventScript_2715DE:: @ 82715DE
 	setflag FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY
 	setflag FLAG_HIDE_SLATEPORT_CITY_CAPTAIN_STERN
 	setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_SUBMARINE_SHADOW
-	setflag FLAG_0x353
-	setflag FLAG_0x312
+	setflag FLAG_HIDE_ROUTE_119_RIVAL
+	setflag FLAG_HIDE_ROUTE_119_SCOTT
 	setflag FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN
 	setflag FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE
-	setflag FLAG_0x366
-	setflag FLAG_0x368
+	setflag FLAG_HIDE_LANETTES_HOUSE_LANETTE
+	setflag FLAG_HIDE_TRICK_HOUSE_ENTRANCE_MAN
 	setflag FLAG_HIDE_MT_CHIMNEY_TRAINERS
 	setflag FLAG_HIDE_MT_CHIMNEY_LAVA_COOKIE_LADY
 	setflag FLAG_HIDE_RUSTURF_TUNNEL_OLD_MAN
-	setflag FLAG_0x37B
+	setflag FLAG_HIDE_ROUTE_116_MR_BRINEY
 	setflag FLAG_HIDE_RUSTURF_TUNNEL_PEEKO
 	setflag FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT
 	setflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN
@@ -1163,16 +1163,16 @@ EventScript_2715DE:: @ 82715DE
 	setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_ARCHIE
 	setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_1
 	setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_2
-	setflag FLAG_SPRITEVIS_SLATEPORT_MUSEUM_POPULATION
+	setflag FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION
 	setflag FLAG_HIDE_BATTLE_TOWER_OPPONENT
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE
 	setflag FLAG_HIDE_LITTLE_ROOT_TOWN_PLAYERS_BEDROOM_MOM
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_RIVAL
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCH
-	setflag FLAG_0x37C
+	setflag FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS
 	setflag FLAG_0x380
-	setflag FLAG_0x381
-	setflag FLAG_0x382
+	setflag FLAG_HIDE_ROUTE_101_BIRCH
+	setflag FLAG_HIDE_ROUTE_103_BIRCH
 	setflag FLAG_HIDE_LILYCOVE_HARBOR_FERRY_SAILOR
 	setflag FLAG_HIDE_LILYCOVE_HARBOR_EON_TICKET_TAKER
 	setflag FLAG_HIDE_SOUTHERN_ISLAND_EON_STONE
@@ -1183,9 +1183,9 @@ EventScript_2715DE:: @ 82715DE
 	setflag FLAG_HIDE_MAUVILLE_CITY_SCOTT
 	setflag FLAG_HIDE_CHAMPIONS_ROOM_RIVAL
 	setflag FLAG_HIDE_CHAMPIONS_ROOM_BIRCH
-	setflag FLAG_0x39A
-	setflag FLAG_0x39B
-	setflag FLAG_0x2CF
+	setflag FLAG_HIDE_ROUTE_110_RIVAL_2
+	setflag FLAG_HIDE_ROUTE_119_RIVAL_ON_BIKE
+	setflag FLAG_HIDE_ROUTE_104_RIVAL
 	setflag FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS
 	setflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1
 	setflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_2
@@ -1193,11 +1193,11 @@ EventScript_2715DE:: @ 82715DE
 	setflag FLAG_HIDE_METEOR_FALLS_TEAM_AQUA
 	setflag FLAG_HIDE_DEWFORD_HALL_SLUDGE_BOMB_MAN
 	setflag FLAG_HIDE_FALLARBOR_HOUSE_1_PROF_COZMO
-	setflag FLAG_0x3E0
-	setflag FLAG_0x342
-	setflag FLAG_0x3B0
-	setflag FLAG_0x3B1
-	setflag FLAG_0x3B3
+	setflag FLAG_HIDE_WEATHER_INSTITUTE_2F_AQUA_GRUNT_M
+	setflag FLAG_HIDE_ROUTE_128_STEVEN
+	setflag FLAG_HIDE_ROUTE_128_ARCHIE
+	setflag FLAG_HIDE_ROUTE_128_MAXIE
+	setflag FLAG_HIDE_ROUTE_116_DEVON_EMPLOYEE
 	setflag FLAG_HIDE_SLATEPORT_CITY_TM_SALESMAN
 	setflag FLAG_HIDE_SLATEPORT_CITY_SCOTT
 	setflag FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY
@@ -1207,7 +1207,7 @@ EventScript_2715DE:: @ 82715DE
 	setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL
 	setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_INVISIBLE_NINJA_BOY
 	setflag FLAG_HIDE_OLDALE_TOWN_RIVAL
-	setflag FLAG_0x3DF
+	setflag FLAG_HIDE_ROUTE_101_BOY
 	setflag FLAG_HIDE_PETALBURG_CITY_SCOTT
 	setflag FLAG_HIDE_SOOTOPOLIS_CITY_RAYQUAZA
 	setflag FLAG_HIDE_SOOTOPOLIS_CITY_KYOGRE
@@ -1215,8 +1215,8 @@ EventScript_2715DE:: @ 82715DE
 	setflag FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS
 	setflag FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE
 	setflag FLAG_HIDE_SOOTOPOLIS_CITY_MAXIE
-	setflag FLAG_0x36C
-	setflag FLAG_0x36B
+	setflag FLAG_HIDE_ROUTE_111_DESERT_FOSSIL
+	setflag FLAG_HIDE_ROUTE_111_DESERT_RIVAL
 	setflag FLAG_HIDE_DESERT_UNDERPASS_FOSSIL
 	setflag FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA
 	setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA
@@ -1305,33 +1305,33 @@ EventScript_271862:: @ 8271862
 EverGrandeCity_HallOfFame_EventScript_271884:: @ 8271884
 	setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
 	setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
-	setflag FLAG_0x2E5
-	setflag FLAG_0x2E8
-	clearflag FLAG_0x2E6
-	clearflag FLAG_0x2E3
-	clearflag FLAG_0x371
+	setflag FLAG_HIDE_ROUTE_108_MR_BRINEY
+	setflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT
+	clearflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT
+	clearflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY
+	clearflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO
 	end
 
 EverGrandeCity_HallOfFame_EventScript_27189A:: @ 827189A
-	setflag FLAG_0x2E5
-	setflag FLAG_0x2E8
-	setflag FLAG_0x2E2
-	setflag FLAG_0x2E6
-	setflag FLAG_0x2E3
-	setflag FLAG_0x371
+	setflag FLAG_HIDE_ROUTE_108_MR_BRINEY
+	setflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT
+	setflag FLAG_HIDE_ROUTE_104_MR_BRINEY
+	setflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT
+	setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY
+	setflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO
 	clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
 	clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
 	end
 
 EverGrandeCity_HallOfFame_EventScript_2718B3:: @ 82718B3
-	setflag FLAG_0x2E2
-	setflag FLAG_0x2E6
-	setflag FLAG_0x2E3
-	setflag FLAG_0x371
+	setflag FLAG_HIDE_ROUTE_104_MR_BRINEY
+	setflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT
+	setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY
+	setflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO
 	setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
 	setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
-	clearflag FLAG_0x2E5
-	clearflag FLAG_0x2E8
+	clearflag FLAG_HIDE_ROUTE_108_MR_BRINEY
+	clearflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT
 	end
 
 EverGrandeCity_HallOfFame_EventScript_2718CC:: @ 82718CC
@@ -1355,11 +1355,11 @@ VerdanturfTown_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE
 	goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_27374E
 	checkflag FLAG_0x4F4
 	goto_eq OldaleTown_PokemonCenter_1F_EventScript_27374E
-	checkflag FLAG_0x2E6
+	checkflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT
 	goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_27190C
 	checkflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
 	goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_271912
-	checkflag FLAG_0x2E5
+	checkflag FLAG_HIDE_ROUTE_108_MR_BRINEY
 	goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_271918
 	return
 
@@ -2252,20 +2252,20 @@ Route103_EventScript_2720AD:: @ 82720AD
 Route101_EventScript_27211A:: @ 827211A
 	clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH
 	clearflag FLAG_0x380
-	setflag FLAG_0x381
-	setflag FLAG_0x382
+	setflag FLAG_HIDE_ROUTE_101_BIRCH
+	setflag FLAG_HIDE_ROUTE_103_BIRCH
 	return
 
 Route101_EventScript_272127:: @ 8272127
-	clearflag FLAG_0x381
+	clearflag FLAG_HIDE_ROUTE_101_BIRCH
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH
 	setflag FLAG_0x380
-	setflag FLAG_0x382
+	setflag FLAG_HIDE_ROUTE_103_BIRCH
 	return
 
 Route101_EventScript_272134:: @ 8272134
-	clearflag FLAG_0x382
-	setflag FLAG_0x381
+	clearflag FLAG_HIDE_ROUTE_103_BIRCH
+	setflag FLAG_HIDE_ROUTE_101_BIRCH
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH
 	setflag FLAG_0x380
 	return
@@ -2343,12 +2343,12 @@ SlateportCity_Harbor_Movement_2721F0: @ 82721F0
 PetalburgCity_Gym_EventScript_2721F8:: @ 82721F8
 	setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
 	setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
-	setflag FLAG_0x2E5
-	setflag FLAG_0x2E8
-	setflag FLAG_0x2E2
-	setflag FLAG_0x2E6
-	setflag FLAG_0x2E3
-	setflag FLAG_0x371
+	setflag FLAG_HIDE_ROUTE_108_MR_BRINEY
+	setflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT
+	setflag FLAG_HIDE_ROUTE_104_MR_BRINEY
+	setflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT
+	setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY
+	setflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO
 	setvar VAR_0x4096, 0
 	return