more event flags

1 files changed, 94 insertions, 94 deletions

diff --git a/data/event_scripts.s b/data/event_scripts.s
index d9dc8e969..27cd4354a 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -1070,22 +1070,22 @@ EventScript_27149D:: @ 827149D
 	return
 
 EventScript_2715DE:: @ 82715DE
-	setflag FLAG_0x056
+	setflag FLAG_LINK_CONTEST_POKE_BALL
 	setflag FLAG_0x301
 	setflag FLAG_0x302
 	setflag FLAG_0x303
-	setflag FLAG_0x2D1
-	setflag FLAG_0x379
-	setflag FLAG_0x32B
-	setflag FLAG_0x32C
-	setflag FLAG_0x346
-	setflag FLAG_0x2D6
+	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
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_TOTODILE
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CHIKORITA
+	setflag FLAG_HIDE_PETALBURG_CITY_WALLY
 	setflag FLAG_0x363
-	setflag FLAG_0x2DB
-	setflag FLAG_0x2DC
-	setflag FLAG_0x32E
-	setflag FLAG_0x34C
-	setflag FLAG_0x364
+	setflag FLAG_HIDE_RUSTBORO_CITY_AQUA_GRUNT
+	setflag FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1
+	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
@@ -1102,15 +1102,15 @@ EventScript_2715DE:: @ 82715DE
 	setflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_3
 	setflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_4
 	setflag FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS
-	setflag FLAG_0x30D
-	setflag FLAG_0x338
-	setflag FLAG_0x2E9
-	setflag FLAG_0x2EA
-	setflag FLAG_0x2F8
-	setflag FLAG_0x2D2
-	setflag FLAG_0x2DE
-	setflag FLAG_0x351
-	setflag FLAG_0x32F
+	setflag FLAG_HIDE_PETALBURG_GYM_GREETER
+	setflag FLAG_HIDE_PETALBURG_GYM_WALLYS_UNCLE
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_BRENDAN
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_BRENDAN
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM
+	setflag FLAG_HIDE_PLAYERS_HOUSE_DAD
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_PICHU_DOLL
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_SWABLU_DOLL
 	setflag FLAG_HIDE_FANCLUB_OLD_LADY
 	setflag FLAG_HIDE_FANCLUB_BOY
 	setflag FLAG_HIDE_FANCLUB_LITTLE_BOY
@@ -1130,45 +1130,45 @@ EventScript_2715DE:: @ 82715DE
 	setflag FLAG_0x329
 	setflag FLAG_0x3D8
 	setflag FLAG_0x2FE
-	setflag FLAG_0x33E
-	setflag FLAG_0x362
+	setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE
+	setflag FLAG_HIDE_PETALBURG_GYM_WALLY
 	setflag FLAG_0x365
-	setflag FLAG_0x33C
-	setflag FLAG_0x33D
-	setflag FLAG_0x33F
-	setflag FLAG_0x35B
-	setflag FLAG_0x355
-	setflag FLAG_0x349
-	setflag FLAG_0x34D
-	setflag FLAG_0x34E
-	setflag FLAG_0x35C
+	setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_ARCHIE
+	setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAXIE
+	setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS
+	setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_1
+	setflag FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_1
+	setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_CAPTAIN_STERN
+	setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_AQUA_GRUNT
+	setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_ARCHIE
+	setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_SS_TIDAL
 	setflag FLAG_HIDE_LILYCOVE_HARBOR_SSTIDAL
-	setflag FLAG_0x343
-	setflag FLAG_0x348
-	setflag FLAG_0x350
+	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_0x3CD
 	setflag FLAG_0x330
 	setflag FLAG_0x366
 	setflag FLAG_0x368
-	setflag FLAG_0x36D
-	setflag FLAG_0x3E2
-	setflag FLAG_0x36F
+	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_0x370
-	setflag FLAG_0x36E
-	setflag FLAG_0x327
-	setflag FLAG_0x3D7
+	setflag FLAG_HIDE_RUSTURF_TUNNEL_PEEKO
+	setflag FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT
+	setflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN
+	setflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN
 	setflag FLAG_0x376
 	setflag FLAG_0x374
 	setflag FLAG_0x375
 	setflag FLAG_SPRITEVIS_SLATEPORT_MUSEUM_POPULATION
 	setflag FLAG_HIDE_BATTLE_TOWER_OPPONENT
-	setflag FLAG_0x2F0
-	setflag FLAG_0x2F5
-	setflag FLAG_0x31A
-	setflag FLAG_0x31B
+	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_0x380
 	setflag FLAG_0x381
@@ -1178,9 +1178,9 @@ EventScript_2715DE:: @ 82715DE
 	setflag FLAG_0x38E
 	setflag FLAG_0x38F
 	setflag FLAG_0x393
-	setflag FLAG_0x358
-	setflag FLAG_SPRITEVIS_MAUVILLE_CITY_WATTSON
-	setflag FLAG_0x2FD
+	setflag FLAG_HIDE_MT_PYRE_SUMMIT_MAXIE
+	setflag FLAG_HIDE_MAUVILLE_CITY_WATTSON
+	setflag FLAG_HIDE_MAUVILLE_CITY_SCOTT
 	setflag FLAG_HIDE_CHAMPIONS_ROOM_RIVAL
 	setflag FLAG_HIDE_CHAMPIONS_ROOM_BIRCH
 	setflag FLAG_0x39A
@@ -1189,8 +1189,8 @@ EventScript_2715DE:: @ 82715DE
 	setflag FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS
 	setflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1
 	setflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_2
-	setflag FLAG_0x3A6
-	setflag FLAG_0x3AA
+	setflag FLAG_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL
+	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
@@ -1198,17 +1198,17 @@ EventScript_2715DE:: @ 82715DE
 	setflag FLAG_0x3B0
 	setflag FLAG_0x3B1
 	setflag FLAG_0x3B3
-	setflag FLAG_0x3B4
-	setflag FLAG_0x2ED
+	setflag FLAG_HIDE_SLATEPORT_CITY_TM_SALESMAN
+	setflag FLAG_HIDE_SLATEPORT_CITY_SCOTT
 	setflag FLAG_0x35A
 	setflag FLAG_0x2EF
 	setflag FLAG_0x3B6
-	setflag FLAG_0x3C7
-	setflag FLAG_0x3C8
-	setflag FLAG_0x2D7
-	setflag FLAG_0x3D3
+	setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN
+	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_0x3E3
+	setflag FLAG_HIDE_PETALBURG_CITY_SCOTT
 	setflag FLAG_0x3E4
 	setflag FLAG_0x3E5
 	setflag FLAG_0x3E6
@@ -1218,17 +1218,17 @@ EventScript_2715DE:: @ 82715DE
 	setflag FLAG_0x36C
 	setflag FLAG_0x36B
 	setflag FLAG_HIDE_DESERT_UNDERPASS_FOSSIL
-	setflag FLAG_0x337
-	setflag FLAG_0x2F4
-	setflag FLAG_0x35E
-	setflag FLAG_0x35F
+	setflag FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA
+	setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA
+	setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA
+	setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_STEVEN
 	setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS
 	setflag FLAG_HIDE_DEOXYS
-	setflag FLAG_0x2EB
+	setflag FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION
 	setflag FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT
 	setflag FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT
-	setflag FLAG_0x357
-	setflag FLAG_0x050
+	setflag FLAG_HIDE_SKY_PILLAR_WALLACE
+	setflag FLAG_RAYQUAZA_ON_SKY_TOWER_SUMMIT
 	call EventScript_27149D
 	end
 
@@ -1242,22 +1242,22 @@ EverGrandeCity_HallOfFame_EventScript_2717C1:: @ 82717C1
 	call EverGrandeCity_HallOfFame_EventScript_2718CC
 	setflag FLAG_0x365
 	clearflag FLAG_0x3B6
-	clearflag FLAG_0x2D7
+	clearflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_INVISIBLE_NINJA_BOY
 	setvar VAR_0x40C6, 2
 	setflag FLAG_0x35A
 	clearflag FLAG_0x2EF
-	clearflag FLAG_0x35C
+	clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_SS_TIDAL
 	clearflag FLAG_HIDE_LILYCOVE_HARBOR_SSTIDAL
-	setflag FLAG_0x2CD
-	clearflag FLAG_0x2EB
+	setflag FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS
+	clearflag FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION
 	setflag FLAG_HIDE_LILYCOVE_CITY_RIVAL
 	special sub_813BA60
 	checkflag FLAG_0x123
 	call_if 0, EverGrandeCity_HallOfFame_EventScript_271843
 	checkflag FLAG_0x12A
 	call_if 0, EverGrandeCity_HallOfFame_EventScript_27183F
-	setflag FLAG_0x2F8
-	setflag FLAG_0x2D2
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM
 	compare VAR_0x40D3, 0
 	call_if 1, EverGrandeCity_HallOfFame_EventScript_271851
 	return
@@ -1275,13 +1275,13 @@ EverGrandeCity_HallOfFame_EventScript_271839:: @ 8271839
 	return
 
 EverGrandeCity_HallOfFame_EventScript_27183F:: @ 827183F
-	clearflag FLAG_0x3C8
+	clearflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL
 	return
 
 EverGrandeCity_HallOfFame_EventScript_271843:: @ 8271843
 	setvar VAR_0x4082, 3
 	setvar VAR_0x408C, 3
-	clearflag FLAG_0x2DE
+	clearflag FLAG_HIDE_PLAYERS_HOUSE_DAD
 	return
 
 EverGrandeCity_HallOfFame_EventScript_271851:: @ 8271851
@@ -1884,7 +1884,7 @@ DewfordTown_Gym_EventScript_271E84:: @ 8271E84
 LavaridgeTown_Gym_1F_EventScript_271E84:: @ 8271E84
 MauvilleCity_Gym_EventScript_271E84:: @ 8271E84
 RustboroCity_Gym_EventScript_271E84:: @ 8271E84
-	clearflag FLAG_0x30D
+	clearflag FLAG_HIDE_PETALBURG_GYM_GREETER
 	setflag FLAG_0x128
 	return
 
@@ -2250,7 +2250,7 @@ Route103_EventScript_2720AD:: @ 82720AD
 	return
 
 Route101_EventScript_27211A:: @ 827211A
-	clearflag FLAG_0x2D1
+	clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH
 	clearflag FLAG_0x380
 	setflag FLAG_0x381
 	setflag FLAG_0x382
@@ -2258,7 +2258,7 @@ Route101_EventScript_27211A:: @ 827211A
 
 Route101_EventScript_272127:: @ 8272127
 	clearflag FLAG_0x381
-	setflag FLAG_0x2D1
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH
 	setflag FLAG_0x380
 	setflag FLAG_0x382
 	return
@@ -2266,7 +2266,7 @@ Route101_EventScript_272127:: @ 8272127
 Route101_EventScript_272134:: @ 8272134
 	clearflag FLAG_0x382
 	setflag FLAG_0x381
-	setflag FLAG_0x2D1
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH
 	setflag FLAG_0x380
 	return
 
@@ -4536,7 +4536,7 @@ EventScript_275B5B:: @ 8275B5B
 	closemessage
 	playse SE_KAIDAN
 	setvar VAR_0x4097, 0
-	setflag FLAG_0x0AD
+	setflag FLAG_DECORATION_0
 	special sub_80E8E18
 	special sub_80E9068
 	setvar VAR_0x8004, 0
@@ -4577,14 +4577,14 @@ EventScript_275BB7:: @ 8275BB7
 	special sub_80E9744
 	compare VAR_RESULT, 0
 	goto_eq EventScript_275BDB
-	clearflag FLAG_0x0AD
+	clearflag FLAG_DECORATION_0
 	special sub_80E9068
 	setvar VAR_0x4089, 0
 	waitstate
 	end
 
 EventScript_275BDB:: @ 8275BDB
-	setflag FLAG_0x0AD
+	setflag FLAG_DECORATION_0
 	special sub_80E9068
 	setvar VAR_0x4089, 0
 	waitstate
@@ -4655,20 +4655,20 @@ EventScript_275CDE:: @ 8275CDE
 LittlerootTown_BrendansHouse_2F_EventScript_275CE1:: @ 8275CE1
 LittlerootTown_MaysHouse_2F_EventScript_275CE1:: @ 8275CE1
 SecretBase_RedCave1_EventScript_275CE1:: @ 8275CE1
-	setflag FLAG_0x0AE
-	setflag FLAG_0x0AF
-	setflag FLAG_0x0B0
-	setflag FLAG_0x0B1
-	setflag FLAG_0x0B2
-	setflag FLAG_0x0B3
-	setflag FLAG_0x0B4
-	setflag FLAG_0x0B5
-	setflag FLAG_0x0B6
-	setflag FLAG_0x0B7
-	setflag FLAG_0x0B8
-	setflag FLAG_0x0B9
-	setflag FLAG_0x0BA
-	setflag FLAG_0x0BB
+	setflag FLAG_DECORATION_1
+	setflag FLAG_DECORATION_2
+	setflag FLAG_DECORATION_3
+	setflag FLAG_DECORATION_4
+	setflag FLAG_DECORATION_5
+	setflag FLAG_DECORATION_6
+	setflag FLAG_DECORATION_7
+	setflag FLAG_DECORATION_8
+	setflag FLAG_DECORATION_9
+	setflag FLAG_DECORATION_10
+	setflag FLAG_DECORATION_11
+	setflag FLAG_DECORATION_12
+	setflag FLAG_DECORATION_13
+	setflag FLAG_DECORATION_14
 	return
 
 EventScript_275D0C:: @ 8275D0C