name more event flags

1 files changed, 77 insertions, 43 deletions

diff --git a/include/constants/flags.h b/include/constants/flags.h
index be0e3b85a..abf244ddb 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -547,6 +547,33 @@
 #define FLAG_0x211               0x211
 #define FLAG_0x212               0x212
 
+#define FLAG_HIDDEN_ITEM_UNDERWATER_1_CARBOS        (FLAG_HIDDEN_ITEMS_START + 0x08)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_1_GREEN_SHARD   (FLAG_HIDDEN_ITEMS_START + 0x09)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_1_PEARL         (FLAG_HIDDEN_ITEMS_START + 0x0A)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_1_BIG_PEARL     (FLAG_HIDDEN_ITEMS_START + 0x0B)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_1_HEART_SCALE_1 (FLAG_HIDDEN_ITEMS_START + 0x0D)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_1_CALCIUM       (FLAG_HIDDEN_ITEMS_START + 0x24)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_1_HEART_SCALE_2 (FLAG_HIDDEN_ITEMS_START + 0x26)
+
+#define FLAG_HIDDEN_ITEM_UNDERWATER_2_HEART_SCALE (FLAG_HIDDEN_ITEMS_START + 0x0E)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_2_ULTRA_BALL (FLAG_HIDDEN_ITEMS_START + 0x0F)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_2_STARDUST (FLAG_HIDDEN_ITEMS_START + 0x10)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_2_PEARL (FLAG_HIDDEN_ITEMS_START + 0x11)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_2_IRON (FLAG_HIDDEN_ITEMS_START + 0x13)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_2_YELLOW_SHARD (FLAG_HIDDEN_ITEMS_START + 0x12)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_2_BIG_PEARL (FLAG_HIDDEN_ITEMS_START + 0x14)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_2_BLUE_SHARD (FLAG_HIDDEN_ITEMS_START + 0x0C)
+
+#define FLAG_HIDDEN_ITEM_UNDERWATER_3_STAR_PIECE (FLAG_HIDDEN_ITEMS_START + 0x15)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_3_HP_UP (FLAG_HIDDEN_ITEMS_START + 0x16)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_3_HEART_SCALE (FLAG_HIDDEN_ITEMS_START + 0x17)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_3_RED_SHARD (FLAG_HIDDEN_ITEMS_START + 0x18)
+
+#define FLAG_HIDDEN_ITEM_UNDERWATER_4_PROTEIN (FLAG_HIDDEN_ITEMS_START + 0x19)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_4_PEARL (FLAG_HIDDEN_ITEMS_START + 0x1A)
+
+
+
 #define FLAG_HIDDEN_ITEM_LAVARIDGE_TOWN_ICE_HEAL (FLAG_HIDDEN_ITEMS_START + 0x00)
 
 #define FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_1_KEY (FLAG_HIDDEN_ITEMS_START + 0x1F)
@@ -584,12 +611,19 @@
 #define FLAG_HIDDEN_ITEM_PETALBURG_WOODS_TINY_MUSHROOM_2 (FLAG_HIDDEN_ITEMS_START + 0x3C)
 #define FLAG_HIDDEN_ITEM_PETALBURG_WOODS_POKE_BALL (FLAG_HIDDEN_ITEMS_START + 0x3D)
 
+#define FLAG_HIDDEN_ITEM_VICTORY_ROAD_B2F_ELIXIR (FLAG_HIDDEN_ITEMS_START + 0x52)
+#define FLAG_HIDDEN_ITEM_VICTORY_ROAD_B2F_MAX_REPEL (FLAG_HIDDEN_ITEMS_START + 0x53)
+
 #define FLAG_HIDDEN_ITEM_SAFARI_ZONE_NORTH_EAST_RARE_CANDY (FLAG_HIDDEN_ITEMS_START + 0x6A)
 #define FLAG_HIDDEN_ITEM_SAFARI_ZONE_NORTH_EAST_ZINC       (FLAG_HIDDEN_ITEMS_START + 0x6B)
 
 #define FLAG_HIDDEN_ITEM_SAFARI_ZONE_SOUTH_EAST_PP_UP        (FLAG_HIDDEN_ITEMS_START + 0x6C)
 #define FLAG_HIDDEN_ITEM_SAFARI_ZONE_SOUTH_EAST_FULL_RESTORE (FLAG_HIDDEN_ITEMS_START + 0x69)
 
+#define FLAG_HIDDEN_ITEM_SS_TIDAL_LOWER_DECK_LEFTOVERS (FLAG_HIDDEN_ITEMS_START + 0x23)
+
+#define FLAG_HIDDEN_ITEM_VICTORY_ROAD_1F_ULTRA_BALL (FLAG_HIDDEN_ITEMS_START + 0x51)
+
 #define FLAG_0x217               0x217//23
 #define FLAG_0x218               0x218//24
 #define FLAG_0x219               0x219//25
@@ -758,14 +792,14 @@
 #define FLAG_0x2BC               0x2BC
 #define FLAG_HIDE_APPRENTICE               0x2BD
 #define FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN               0x2BE
-#define FLAG_0x2BF               0x2BF
-#define FLAG_0x2C0               0x2C0
-#define FLAG_0x2C1               0x2C1
-#define FLAG_0x2C2               0x2C2
-#define FLAG_0x2C3               0x2C3
-#define FLAG_0x2C4               0x2C4
-#define FLAG_0x2C5               0x2C5
-#define FLAG_0x2C6               0x2C6
+#define FLAG_HIDE_UNION_ROOM_PLAYER_1               0x2BF
+#define FLAG_HIDE_UNION_ROOM_PLAYER_2               0x2C0
+#define FLAG_HIDE_UNION_ROOM_PLAYER_3               0x2C1
+#define FLAG_HIDE_UNION_ROOM_PLAYER_4               0x2C2
+#define FLAG_HIDE_UNION_ROOM_PLAYER_5               0x2C3
+#define FLAG_HIDE_UNION_ROOM_PLAYER_6               0x2C4
+#define FLAG_HIDE_UNION_ROOM_PLAYER_7               0x2C5
+#define FLAG_HIDE_UNION_ROOM_PLAYER_8               0x2C6
 #define FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_1               0x2C7
 #define FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_2               0x2C8
 #define FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_3               0x2C9
@@ -806,7 +840,7 @@
 #define FLAG_HIDE_LILYCOVE_HARBOR_EON_TICKET_TAKER               0x2EC
 #define FLAG_HIDE_SLATEPORT_CITY_SCOTT               0x2ED
 #define FLAG_0x2EE               0x2EE
-#define FLAG_0x2EF               0x2EF
+#define FLAG_HIDE_VICTORY_ROAD_EXIT_WALLY               0x2EF
 #define FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE               0x2F0
 #define FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_STEVEN               0x2F1
 #define FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1               0x2F2
@@ -821,7 +855,7 @@
 #define FLAG_HIDE_DEOXYS               0x2FB
 #define FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE               0x2FC
 #define FLAG_HIDE_MAUVILLE_CITY_SCOTT               0x2FD
-#define FLAG_0x2FE               0x2FE
+#define FLAG_HIDE_VERDANTURF_TOWN_SCOTT               0x2FE
 #define FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT               0x2FF
 #define FLAG_0x300               0x300
 #define FLAG_0x301               0x301
@@ -838,7 +872,7 @@
 #define FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS               0x30C
 #define FLAG_HIDE_PETALBURG_GYM_GREETER               0x30D
 #define FLAG_HIDE_MARINE_CAVE_KYOGRE               0x30E
-#define FLAG_0x30F               0x30F
+#define FLAG_HIDE_TERRA_CAVE_GROUDON               0x30F
 #define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_MOM               0x310
 #define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_MOM               0x311
 #define FLAG_0x312               0x312
@@ -861,17 +895,17 @@
 #define FLAG_0x323               0x323
 #define FLAG_HIDE_MAUVILLE_CITY_WALLY               0x324
 #define FLAG_HIDE_MAUVILLE_CITY_WALLYS_UNCLE               0x325
-#define FLAG_0x326               0x326
+#define FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY               0x326
 #define FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN               0x327
-#define FLAG_0x328               0x328
-#define FLAG_0x329               0x329
-#define FLAG_0x32A               0x32A
+#define FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_MAN               0x328
+#define FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLYS_UNCLE      0x329
+#define FLAG_HIDE_SS_TIDAL_CORRIDOR_SCOTT               0x32A
 #define FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CYNDAQUIL               0x32B
 #define FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_TOTODILE               0x32C
 #define FLAG_0x32D               0x32D
 #define FLAG_HIDE_RUSBORO_CITY_RIVAL               0x32E
 #define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_SWABLU_DOLL               0x32F
-#define FLAG_0x330               0x330
+#define FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE               0x330
 #define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL               0x331
 #define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL               0x332
 #define FLAG_0x333               0x333
@@ -881,8 +915,8 @@
 #define FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA               0x337
 #define FLAG_HIDE_PETALBURG_GYM_WALLYS_UNCLE               0x338
 #define FLAG_0x339               0x339
-#define FLAG_0x33A               0x33A
-#define FLAG_0x33B               0x33B
+#define FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE               0x33A
+#define FLAG_HIDE_SOOTOPOLIS_CITY_MAXIE               0x33B
 #define FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_ARCHIE               0x33C
 #define FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAXIE               0x33D
 #define FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE               0x33E
@@ -894,7 +928,7 @@
 #define FLAG_HIDE_BATTLE_FRONTIER_RECEPTION_GATE_SCOTT               0x344
 #define FLAG_0x345               0x345
 #define FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CHIKORITA               0x346
-#define FLAG_0x347               0x347
+#define FLAG_HIDE_SOOTOPOLIS_CITY_MAN_1               0x347
 #define FLAG_HIDE_SLATEPORT_CITY_CAPTAIN_STERN               0x348
 #define FLAG_HIDE_SLATEPORT_CITY_HARBOR_CAPTAIN_STERN               0x349
 #define FLAG_0x34A               0x34A
@@ -909,11 +943,11 @@
 #define FLAG_0x353               0x353
 #define FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS               0x354
 #define FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_1               0x355
-#define FLAG_0x356               0x356
+#define FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS               0x356
 #define FLAG_HIDE_SKY_PILLAR_WALLACE               0x357
 #define FLAG_HIDE_MT_PYRE_SUMMIT_MAXIE               0x358
 #define FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS               0x359
-#define FLAG_0x35A               0x35A
+#define FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY               0x35A
 #define FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_1               0x35B
 #define FLAG_HIDE_SLATEPORT_CITY_HARBOR_SS_TIDAL               0x35C
 #define FLAG_HIDE_LILYCOVE_HARBOR_SSTIDAL               0x35D
@@ -924,7 +958,7 @@
 #define FLAG_HIDE_PETALBURG_GYM_WALLY               0x362
 #define FLAG_0x363               0x363
 #define FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN               0x364
-#define FLAG_0x365               0x365
+#define FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY               0x365
 #define FLAG_0x366               0x366
 #define FLAG_HIDE_LANETTE               0x367
 #define FLAG_0x368               0x368
@@ -938,11 +972,11 @@
 #define FLAG_HIDE_RUSTURF_TUNNEL_PEEKO               0x370
 #define FLAG_0x371               0x371
 #define FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA               0x372
-#define FLAG_0x373               0x373
-#define FLAG_0x374               0x374
-#define FLAG_0x375               0x375
-#define FLAG_0x376               0x376
-#define FLAG_0x377               0x377
+#define FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS               0x373
+#define FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_1               0x374
+#define FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_2               0x375
+#define FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_ARCHIE               0x376
+#define FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_CAPTAIN_STERN               0x377
 #define FLAG_HIDE_BATTLE_TOWER_OPPONENT               0x378
 #define FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL               0x379
 #define FLAG_0x37A               0x37A
@@ -965,8 +999,8 @@
 #define FLAG_HIDE_FALLARBOR_AZURILL               0x38B
 #define FLAG_HIDE_LILYCOVE_HARBOR_FERRY_ATTENDANT               0x38C
 #define FLAG_HIDE_LILYCOVE_HARBOR_FERRY_SAILOR               0x38D
-#define FLAG_0x38E               0x38E
-#define FLAG_0x38F               0x38F
+#define FLAG_HIDE_SOUTHERN_ISLAND_EON_STONE               0x38E
+#define FLAG_HIDE_SOUTHERN_ISLAND_UNCHOSEN_EON_DUO_MON               0x38F
 #define FLAG_HIDE_MAUVILLE_CITY_WATTSON               0x390
 #define FLAG_HIDE_MAUVILLE_GYM_WATTSON               0x391
 #define FLAG_0x392               0x392
@@ -1005,8 +1039,8 @@
 #define FLAG_0x3B3               0x3B3
 #define FLAG_HIDE_SLATEPORT_CITY_TM_SALESMAN               0x3B4
 #define FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE               0x3B5
-#define FLAG_0x3B6               0x3B6
-#define FLAG_0x3B7               0x3B7
+#define FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY               0x3B6
+#define FLAG_HIDE_SS_TIDAL_ROOMS_SNATCH_GIVER               0x3B7
 #define FLAG_0x3B8               0x3B8
 #define FLAG_0x3B9               0x3B9
 #define FLAG_0x3BA               0x3BA
@@ -1020,7 +1054,7 @@
 #define FLAG_HIDE_LILYCOVE_DEPARTMENT_STORE_ROOFTOP_SALE_WOMAN               0x3C2
 #define FLAG_HIDE_MIRAGE_TOWER_ROOT_FOSSIL               0x3C3
 #define FLAG_HIDE_MIRAGE_TOWER_CLAW_FOSSIL               0x3C4
-#define FLAG_0x3C5               0x3C5
+#define FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_FAMILIAR_AQUA_GRUNT               0x3C5
 #define FLAG_0x3C6               0x3C6
 #define FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN               0x3C7
 #define FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL               0x3C8
@@ -1028,18 +1062,18 @@
 #define FLAG_0x3CA               0x3CA
 #define FLAG_HIDE_LILYCOVE_CITY_RIVAL               0x3CB
 #define FLAG_0x3CC               0x3CC
-#define FLAG_0x3CD               0x3CD
+#define FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN               0x3CD
 #define FLAG_HIDE_NEW_MAUVILLE_VOLTORB_1               0x3CE
 #define FLAG_HIDE_NEW_MAUVILLE_VOLTORB_2               0x3CF
 #define FLAG_HIDE_NEW_MAUVILLE_VOLTORB_3               0x3D0
 #define FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_1               0x3D1
 #define FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_2               0x3D2
 #define FLAG_HIDE_OLDALE_TOWN_RIVAL               0x3D3
-#define FLAG_0x3D4               0x3D4
+#define FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE               0x3D4
 #define FLAG_0x3D5               0x3D5
 #define FLAG_0x3D6               0x3D6
 #define FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN               0x3D7
-#define FLAG_0x3D8               0x3D8
+#define FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_WOMAN               0x3D8
 #define FLAG_0x3D9               0x3D9
 #define FLAG_0x3DA               0x3DA
 #define FLAG_0x3DB               0x3DB
@@ -1051,9 +1085,9 @@
 #define FLAG_HIDE_LILYCOVE_POKEMON_CENTER_LADY               0x3E1
 #define FLAG_HIDE_MT_CHIMNEY_LAVA_COOKIE_LADY               0x3E2
 #define FLAG_HIDE_PETALBURG_CITY_SCOTT               0x3E3
-#define FLAG_0x3E4               0x3E4
-#define FLAG_0x3E5               0x3E5
-#define FLAG_0x3E6               0x3E6
+#define FLAG_HIDE_SOOTOPOLIS_CITY_RAYQUAZA               0x3E4
+#define FLAG_HIDE_SOOTOPOLIS_CITY_KYOGRE               0x3E5
+#define FLAG_HIDE_SOOTOPOLIS_CITY_GROUDON               0x3E6
 #define FLAG_HIDE_RUSTBORO_CITY_POKEMON_SCHOOL_SCOTT               0x3E7
 #define FLAG_0x3E8               0x3E8
 #define FLAG_0x3E9               0x3E9
@@ -1141,11 +1175,11 @@
 #define FLAG_ITEM_SHOAL_CAVE_ENTRANCE_BIG_PEARL               0x439
 #define FLAG_ITEM_SHOAL_CAVE_INNER_ROOM_RARE_CANDY               0x43A
 #define FLAG_ITEM_SHOAL_CAVE_STAIRS_ROOM_ICE_HEAL               0x43B
-#define FLAG_0x43C               0x43C
-#define FLAG_0x43D               0x43D
-#define FLAG_0x43E               0x43E
-#define FLAG_0x43F               0x43F
-#define FLAG_0x440               0x440
+#define FLAG_ITEM_VICTORY_ROAD_1F_MAX_ELIXIR               0x43C
+#define FLAG_ITEM_VICTORY_ROAD_1F_PP_UP               0x43D
+#define FLAG_ITEM_VICTORY_ROAD_B1F_TM_29               0x43E
+#define FLAG_ITEM_VICTORY_ROAD_B1F_FULL_RESTORE               0x43F
+#define FLAG_ITEM_VICTORY_ROAD_B2F_FULL_HEAL               0x440
 #define FLAG_ITEM_MT_PYRE_6F_TM_30               0x441
 #define FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_TM_26               0x442
 #define FLAG_ITEM_FIERY_PATH_TM06              0x443