more event flags

2018-10-18 15:28:59 -04:00
parent d1b7f32b0a
commit c27043bd3c
139 changed files with 1070 additions and 1047 deletions
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -87,13 +87,13 @@
 #define FLAG_0x04D               0x4D
 #define FLAG_0x04E               0x4E
 #define FLAG_0x04F               0x4F
-#define FLAG_0x050               0x50
+#define FLAG_RAYQUAZA_ON_SKY_TOWER_SUMMIT               0x50
 #define FLAG_0x051               0x51
 #define FLAG_0x052               0x52
 #define FLAG_LEGENDARIES_IN_SOOTOPOLIS 0x53
 #define FLAG_0x054               0x54
 #define FLAG_0x055               0x55
-#define FLAG_0x056               0x56
+#define FLAG_LINK_CONTEST_POKE_BALL               0x56
 #define FLAG_0x057               0x57
 #define FLAG_0x058               0x58
 #define FLAG_0x059               0x59
@@ -180,21 +180,22 @@
 #define FLAG_0x0AA               0xAA
 #define FLAG_0x0AB               0xAB
 #define FLAG_0x0AC               0xAC
-#define FLAG_0x0AD               0xAD
-#define FLAG_0x0AE               0xAE
-#define FLAG_0x0AF               0xAF
-#define FLAG_0x0B0               0xB0
-#define FLAG_0x0B1               0xB1
-#define FLAG_0x0B2               0xB2
-#define FLAG_0x0B3               0xB3
-#define FLAG_0x0B4               0xB4
-#define FLAG_0x0B5               0xB5
-#define FLAG_0x0B6               0xB6
-#define FLAG_0x0B7               0xB7
-#define FLAG_0x0B8               0xB8
-#define FLAG_0x0B9               0xB9
-#define FLAG_0x0BA               0xBA
-#define FLAG_0x0BB               0xBB
+
+#define FLAG_DECORATION_0               0xAD
+#define FLAG_DECORATION_1               0xAE
+#define FLAG_DECORATION_2               0xAF
+#define FLAG_DECORATION_3               0xB0
+#define FLAG_DECORATION_4               0xB1
+#define FLAG_DECORATION_5               0xB2
+#define FLAG_DECORATION_6               0xB3
+#define FLAG_DECORATION_7               0xB4
+#define FLAG_DECORATION_8               0xB5
+#define FLAG_DECORATION_9               0xB6
+#define FLAG_DECORATION_10               0xB7
+#define FLAG_DECORATION_11               0xB8
+#define FLAG_DECORATION_12               0xB9
+#define FLAG_DECORATION_13               0xBA
+#define FLAG_DECORATION_14               0xBB
 #define FLAG_0x0BC               0xBC
 #define FLAG_0x0BD               0xBD
 #define FLAG_0x0BE               0xBE
@@ -565,8 +566,29 @@
 #define FLAG_HIDDEN_ITEM_JAGGED_PASS_FULL_HEAL  (FLAG_HIDDEN_ITEMS_START + 0x4D)

 #define FLAG_HIDDEN_ITEM_LILYCOVE_CITY_HEART_SCALE (FLAG_HIDDEN_ITEMS_START + 0x1B)
-#define FLAG_HIDDEN_ITEM_LILYCOVE_CITY_PP_UP       (FLAG_HIDDEN_ITEMS_START + 0x1B)
-#define FLAG_HIDDEN_ITEM_LILYCOVE_CITY_POKE_BALL   (FLAG_HIDDEN_ITEMS_START + 0x1B)
+#define FLAG_HIDDEN_ITEM_LILYCOVE_CITY_PP_UP       (FLAG_HIDDEN_ITEMS_START + 0x2B)
+#define FLAG_HIDDEN_ITEM_LILYCOVE_CITY_POKE_BALL   (FLAG_HIDDEN_ITEMS_START + 0x4B)
+
+#define FLAG_HIDDEN_ITEM_MT_PYRE_EXTERIOR_ULTRA_BALL (FLAG_HIDDEN_ITEMS_START + 0x1D)
+#define FLAG_HIDDEN_ITEM_MT_PYRE_EXTERIOR_MAX_ETHER  (FLAG_HIDDEN_ITEMS_START + 0x4E)
+
+#define FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_ZINC       (FLAG_HIDDEN_ITEMS_START + 0x4F)
+#define FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_RARE_CANDY (FLAG_HIDDEN_ITEMS_START + 0x50)
+
+#define FLAG_HIDDEN_ITEM_NAVEL_ROCK_TOP_SACRED_ASH (FLAG_HIDDEN_ITEMS_START + 0x6D)
+
+#define FLAG_HIDDEN_ITEM_PETALBURG_CITY_RARE_CANDY (FLAG_HIDDEN_ITEMS_START + 0x5F)
+
+#define FLAG_HIDDEN_ITEM_PETALBURG_WOODS_POTION (FLAG_HIDDEN_ITEMS_START + 0x3A)
+#define FLAG_HIDDEN_ITEM_PETALBURG_WOODS_TINY_MUSHROOM_1 (FLAG_HIDDEN_ITEMS_START + 0x3B)
+#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_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_0x217               0x217//23
 #define FLAG_0x218               0x218//24
@@ -750,27 +772,27 @@
 #define FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_4               0x2CA
 #define FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_5               0x2CB
 #define FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_6               0x2CC
-#define FLAG_0x2CD               0x2CD
+#define FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS               0x2CD
 #define FLAG_HIDE_MEW               0x2CE
 #define FLAG_0x2CF               0x2CF
 #define FLAG_0x2D0               0x2D0
-#define FLAG_0x2D1               0x2D1
-#define FLAG_0x2D2               0x2D2
+#define FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH               0x2D1
+#define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM               0x2D2
 #define FLAG_0x2D3               0x2D3
-#define FLAG_0x2D4               0x2D4
-#define FLAG_0x2D5               0x2D5
-#define FLAG_0x2D6               0x2D6
-#define FLAG_0x2D7               0x2D7
-#define FLAG_0x2D8               0x2D8
+#define FLAG_HIDE_PETALBURG_WOODS_DEVON_EMPLOYEE               0x2D4
+#define FLAG_HIDE_PETALBURG_WOODS_AQUA_GRUNT               0x2D5
+#define FLAG_HIDE_PETALBURG_CITY_WALLY               0x2D6
+#define FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_INVISIBLE_NINJA_BOY               0x2D7
+#define FLAG_HIDE_PETALBURG_CITY_WALLYS_AUNT               0x2D8
 #define FLAG_0x2D9               0x2D9
 #define FLAG_HIDE_LILYCOVE_FAN_CLUB_INTERVIEWER               0x2DA
-#define FLAG_0x2DB               0x2DB
-#define FLAG_0x2DC               0x2DC
-#define FLAG_0x2DD               0x2DD
-#define FLAG_0x2DE               0x2DE
-#define FLAG_0x2DF               0x2DF
-#define FLAG_0x2E0               0x2E0
-#define FLAG_0x2E1               0x2E1
+#define FLAG_HIDE_RUSTBORO_CITY_AQUA_GRUNT               0x2DB
+#define FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1               0x2DC
+#define FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_2               0x2DD
+#define FLAG_HIDE_PLAYERS_HOUSE_DAD               0x2DE
+#define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_SIBLING               0x2DF
+#define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_SIBLING               0x2E0
+#define FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_INVISIBLE_NINJA_BOY               0x2E1
 #define FLAG_0x2E2               0x2E2
 #define FLAG_0x2E3               0x2E3
 #define FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN               0x2E4
@@ -778,35 +800,35 @@
 #define FLAG_0x2E6               0x2E6
 #define FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN               0x2E7
 #define FLAG_0x2E8               0x2E8
-#define FLAG_0x2E9               0x2E9
-#define FLAG_0x2EA               0x2EA
-#define FLAG_0x2EB               0x2EB
+#define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_BRENDAN               0x2E9
+#define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_BRENDAN               0x2EA
+#define FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION               0x2EB
 #define FLAG_HIDE_LILYCOVE_HARBOR_EON_TICKET_TAKER               0x2EC
-#define FLAG_0x2ED               0x2ED
+#define FLAG_HIDE_SLATEPORT_CITY_SCOTT               0x2ED
 #define FLAG_0x2EE               0x2EE
 #define FLAG_0x2EF               0x2EF
-#define FLAG_0x2F0               0x2F0
-#define FLAG_0x2F1               0x2F1
-#define FLAG_0x2F2               0x2F2
-#define FLAG_0x2F3               0x2F3
-#define FLAG_0x2F4               0x2F4
-#define FLAG_0x2F5               0x2F5
-#define FLAG_0x2F6               0x2F6
-#define FLAG_0x2F7               0x2F7
-#define FLAG_0x2F8               0x2F8
-#define FLAG_0x2F9               0x2F9
-#define FLAG_0x2FA               0x2FA
+#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
+#define FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2               0x2F3
+#define FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA               0x2F4
+#define FLAG_HIDE_LITTLE_ROOT_TOWN_PLAYERS_BEDROOM_MOM               0x2F5
+#define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_MOM               0x2F6
+#define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MOM               0x2F7
+#define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM               0x2F8
+#define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_TRUCK               0x2F9
+#define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_TRUCK               0x2FA
 #define FLAG_HIDE_DEOXYS               0x2FB
 #define FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE               0x2FC
-#define FLAG_0x2FD               0x2FD
+#define FLAG_HIDE_MAUVILLE_CITY_SCOTT               0x2FD
 #define FLAG_0x2FE               0x2FE
 #define FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT               0x2FF
 #define FLAG_0x300               0x300
 #define FLAG_0x301               0x301
 #define FLAG_0x302               0x302
 #define FLAG_0x303               0x303
-#define FLAG_0x304               0x304
-#define FLAG_0x305               0x305
+#define FLAG_HIDE_PETALYBURG_GYM_NORMAN               0x304
+#define FLAG_HIDE_SKY_PILLAR_TOP_RAYQUAZA_2               0x305
 #define FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_1               0x306
 #define FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR               0x307
 #define FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_1               0x308
@@ -814,115 +836,115 @@
 #define FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_3               0x30A
 #define FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_4               0x30B
 #define FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS               0x30C
-#define FLAG_0x30D               0x30D
-#define FLAG_0x30E               0x30E
+#define FLAG_HIDE_PETALBURG_GYM_GREETER               0x30D
+#define FLAG_HIDE_MARINE_CAVE_KYOGRE               0x30E
 #define FLAG_0x30F               0x30F
-#define FLAG_0x310               0x310
-#define FLAG_0x311               0x311
+#define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_MOM               0x310
+#define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_MOM               0x311
 #define FLAG_0x312               0x312
 #define FLAG_HIDE_LILCOVE_MOTEL_SCOTT               0x313
-#define FLAG_0x314               0x314
+#define FLAG_HIDE_MOSSDEEP_CITY_SCOTT               0x314
 #define FLAG_HIDE_FANCLUB_OLD_LADY               0x315
 #define FLAG_HIDE_FANCLUB_BOY               0x316
 #define FLAG_HIDE_FANCLUB_LITTLE_BOY               0x317
 #define FLAG_HIDE_FANCLUB_LADY               0x318
 #define FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT               0x319
-#define FLAG_0x31A               0x31A
-#define FLAG_0x31B               0x31B
+#define FLAG_HIDE_LITTLEROOT_TOWN_RIVAL               0x31A
+#define FLAG_HIDE_LITTLEROOT_TOWN_BIRCH               0x31B
 #define FLAG_0x31C               0x31C
 #define FLAG_0x31D               0x31D
 #define FLAG_0x31E               0x31E
 #define FLAG_0x31F               0x31F
-#define FLAG_0x320               0x320
-#define FLAG_0x321               0x321
+#define FLAG_HIDE_LUGIA               0x320
+#define FLAG_HIDE_HOOH               0x321
 #define FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER               0x322
 #define FLAG_0x323               0x323
-#define FLAG_0x324               0x324
-#define FLAG_0x325               0x325
+#define FLAG_HIDE_MAUVILLE_CITY_WALLY               0x324
+#define FLAG_HIDE_MAUVILLE_CITY_WALLYS_UNCLE               0x325
 #define FLAG_0x326               0x326
-#define FLAG_0x327               0x327
+#define FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN               0x327
 #define FLAG_0x328               0x328
 #define FLAG_0x329               0x329
 #define FLAG_0x32A               0x32A
-#define FLAG_0x32B               0x32B
-#define FLAG_0x32C               0x32C
+#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_0x32E               0x32E
-#define FLAG_0x32F               0x32F
+#define FLAG_HIDE_RUSBORO_CITY_RIVAL               0x32E
+#define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_SWABLU_DOLL               0x32F
 #define FLAG_0x330               0x330
-#define FLAG_0x331               0x331
-#define FLAG_0x332               0x332
+#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
 #define FLAG_HIDE_CAVE_OF_ORIGIN_B1F_WALLACE               0x334
 #define FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_1_BLOCKING_ENTRANCE               0x335
 #define FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_2_BLOCKING_ENTRANCE               0x336
-#define FLAG_0x337               0x337
-#define FLAG_0x338               0x338
+#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_0x33C               0x33C
-#define FLAG_0x33D               0x33D
-#define FLAG_0x33E               0x33E
-#define FLAG_0x33F               0x33F
+#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
+#define FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS               0x33F
 #define FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS               0x340
 #define FLAG_HIDE_GRANITE_CAVE_STEVEN               0x341
 #define FLAG_0x342               0x342
-#define FLAG_0x343               0x343
+#define FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY               0x343
 #define FLAG_HIDE_BATTLE_FRONTIER_RECEPTION_GATE_SCOTT               0x344
 #define FLAG_0x345               0x345
-#define FLAG_0x346               0x346
+#define FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CHIKORITA               0x346
 #define FLAG_0x347               0x347
-#define FLAG_0x348               0x348
-#define FLAG_0x349               0x349
+#define FLAG_HIDE_SLATEPORT_CITY_CAPTAIN_STERN               0x348
+#define FLAG_HIDE_SLATEPORT_CITY_HARBOR_CAPTAIN_STERN               0x349
 #define FLAG_0x34A               0x34A
 #define FLAG_0x34B               0x34B
-#define FLAG_0x34C               0x34C
-#define FLAG_0x34D               0x34D
-#define FLAG_0x34E               0x34E
+#define FLAG_HIDE_RUSTBORO_CITY_SCIENTIST               0x34C
+#define FLAG_HIDE_SLATEPORT_CITY_HARBOR_AQUA_GRUNT               0x34D
+#define FLAG_HIDE_SLATEPORT_CITY_HARBOR_ARCHIE               0x34E
 #define FLAG_HIDE_JAGGED_PASS_MAGMA_GUARD               0x34F
-#define FLAG_0x350               0x350
-#define FLAG_0x351               0x351
-#define FLAG_0x352               0x352
+#define FLAG_HIDE_SLATEPORT_CITY_HARBOR_SUBMARINE_SHADOW               0x350
+#define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_PICHU_DOLL               0x351
+#define FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_2               0x352
 #define FLAG_0x353               0x353
 #define FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS               0x354
-#define FLAG_0x355               0x355
+#define FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_1               0x355
 #define FLAG_0x356               0x356
-#define FLAG_0x357               0x357
-#define FLAG_0x358               0x358
-#define FLAG_0x359               0x359
+#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_0x35B               0x35B
-#define FLAG_0x35C               0x35C
+#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
-#define FLAG_0x35E               0x35E
-#define FLAG_0x35F               0x35F
+#define FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA               0x35E
+#define FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_STEVEN               0x35F
 #define FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_1               0x360
 #define FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_2               0x361
-#define FLAG_0x362               0x362
+#define FLAG_HIDE_PETALBURG_GYM_WALLY               0x362
 #define FLAG_0x363               0x363
-#define FLAG_0x364               0x364
+#define FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN               0x364
 #define FLAG_0x365               0x365
 #define FLAG_0x366               0x366
 #define FLAG_HIDE_LANETTE               0x367
 #define FLAG_0x368               0x368
-#define FLAG_LILYCOVE_CONTEST_HALL_POKEBLOCK_EXPERT               0x369
+#define FLAG_HIDE_LILYCOVE_CONTEST_HALL_POKEBLOCK_EXPERT               0x369
 #define FLAG_HIDE_DESERT_UNDERPASS_FOSSIL               0x36A
 #define FLAG_0x36B               0x36B
 #define FLAG_0x36C               0x36C
-#define FLAG_0x36D               0x36D
-#define FLAG_0x36E               0x36E
-#define FLAG_0x36F               0x36F
-#define FLAG_0x370               0x370
+#define FLAG_HIDE_MT_CHIMNEY_TRAINERS               0x36D
+#define FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT               0x36E
+#define FLAG_HIDE_RUSTURF_TUNNEL_OLD_MAN               0x36F
+#define FLAG_HIDE_RUSTURF_TUNNEL_PEEKO               0x370
 #define FLAG_0x371               0x371
-#define FLAG_0x372               0x372
+#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_BATTLE_TOWER_OPPONENT               0x378
-#define FLAG_0x379               0x379
+#define FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL               0x379
 #define FLAG_0x37A               0x37A
 #define FLAG_0x37B               0x37B
 #define FLAG_0x37C               0x37C
@@ -938,19 +960,19 @@
 #define FLAG_0x386               0x386
 #define FLAG_0x387               0x387
 #define FLAG_0x388               0x388
-#define FLAG_0x389               0x389
+#define FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS               0x389
 #define FLAG_0x38A               0x38A
 #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_SPRITEVIS_MAUVILLE_CITY_WATTSON               0x390
-#define FLAG_SPRITEVIS_MAUVILLE_GYM_WATTSON               0x391
+#define FLAG_HIDE_MAUVILLE_CITY_WATTSON               0x390
+#define FLAG_HIDE_MAUVILLE_GYM_WATTSON               0x391
 #define FLAG_0x392               0x392
 #define FLAG_0x393               0x393
-#define FLAG_0x394               0x394
-#define FLAG_0x395               0x395
+#define FLAG_HIDE_MT_PYRE_SUMMIT_ARCHIE               0x394
+#define FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA               0x395
 #define FLAG_HIDE_BATTLE_TOWER_REPORTER               0x396
 #define FLAG_0x397               0x397
 #define FLAG_HIDE_CHAMPIONS_ROOM_RIVAL               0x398
@@ -959,30 +981,30 @@
 #define FLAG_0x39B               0x39B
 #define FLAG_HIDE_AQUA_HIDEOUT_GRUNTS               0x39C
 #define FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS               0x39D
-#define FLAG_0x39E               0x39E
-#define FLAG_0x39F               0x39F
+#define FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA               0x39E
+#define FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA               0x39F
 #define FLAG_HIDE_FALLARBOR_HOUSE_1_PROF_COZMO               0x3A0
 #define FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1               0x3A1
 #define FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_2               0x3A2
 #define FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1               0x3A3
 #define FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2               0x3A4
 #define FLAG_HIDE_FORTREE_CITY_HOUSE_4_WINGULL               0x3A5
-#define FLAG_0x3A6               0x3A6
+#define FLAG_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL              0x3A6
 #define FLAG_HIDE_REGIROCK               0x3A7
 #define FLAG_HIDE_REGICE               0x3A8
 #define FLAG_HIDE_REGISTEEL               0x3A9
-#define FLAG_0x3AA               0x3AA
-#define FLAG_0x3AB               0x3AB
+#define FLAG_HIDE_METEOR_FALLS_TEAM_AQUA               0x3AA
+#define FLAG_HIDE_METEOR_FALLS_TEAM_MAGMA               0x3AB
 #define FLAG_HIDE_DEWFORD_HALL_SLUDGE_BOMB_MAN               0x3AC
-#define FLAG_0x3AD               0x3AD
-#define FLAG_0x3AE               0x3AE
+#define FLAG_HIDE_SEAFLOOR_CAVERN_ENTRANCE_AQUA_GRUNT               0x3AD
+#define FLAG_HIDE_METEOR_FALLS_1F_1R_COZMO               0x3AE
 #define FLAG_HIDE_AQUA_HIDEOUT_B2F_SUBMARINE_SHADOW               0x3AF
 #define FLAG_0x3B0               0x3B0
 #define FLAG_0x3B1               0x3B1
-#define FLAG_0x3B2               0x3B2
+#define FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS               0x3B2
 #define FLAG_0x3B3               0x3B3
-#define FLAG_0x3B4               0x3B4
-#define FLAG_0x3B5               0x3B5
+#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_0x3B8               0x3B8
@@ -996,27 +1018,27 @@
 #define FLAG_0x3C0               0x3C0
 #define FLAG_SPRITEVIS_SLATEPORT_MUSEUM_POPULATION               0x3C1
 #define FLAG_HIDE_LILYCOVE_DEPARTMENT_STORE_ROOFTOP_SALE_WOMAN               0x3C2
-#define FLAG_0x3C3               0x3C3
-#define FLAG_0x3C4               0x3C4
+#define FLAG_HIDE_MIRAGE_TOWER_ROOT_FOSSIL               0x3C3
+#define FLAG_HIDE_MIRAGE_TOWER_CLAW_FOSSIL               0x3C4
 #define FLAG_0x3C5               0x3C5
 #define FLAG_0x3C6               0x3C6
-#define FLAG_0x3C7               0x3C7
-#define FLAG_0x3C8               0x3C8
+#define FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN               0x3C7
+#define FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL               0x3C8
 #define FLAG_HIDE_FORTREE_CITY_KECLEON               0x3C9
 #define FLAG_0x3CA               0x3CA
 #define FLAG_HIDE_LILYCOVE_CITY_RIVAL               0x3CB
 #define FLAG_0x3CC               0x3CC
 #define FLAG_0x3CD               0x3CD
-#define FLAG_0x3CE               0x3CE
-#define FLAG_0x3CF               0x3CF
-#define FLAG_0x3D0               0x3D0
+#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_0x3D3               0x3D3
+#define FLAG_HIDE_OLDALE_TOWN_RIVAL               0x3D3
 #define FLAG_0x3D4               0x3D4
 #define FLAG_0x3D5               0x3D5
 #define FLAG_0x3D6               0x3D6
-#define FLAG_0x3D7               0x3D7
+#define FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN               0x3D7
 #define FLAG_0x3D8               0x3D8
 #define FLAG_0x3D9               0x3D9
 #define FLAG_0x3DA               0x3DA
@@ -1027,12 +1049,12 @@
 #define FLAG_0x3DF               0x3DF
 #define FLAG_0x3E0               0x3E0
 #define FLAG_HIDE_LILYCOVE_POKEMON_CENTER_LADY               0x3E1
-#define FLAG_0x3E2               0x3E2
-#define FLAG_0x3E3               0x3E3
+#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_0x3E7               0x3E7
+#define FLAG_HIDE_RUSTBORO_CITY_POKEMON_SCHOOL_SCOTT               0x3E7
 #define FLAG_0x3E8               0x3E8
 #define FLAG_0x3E9               0x3E9
 #define FLAG_0x3EA               0x3EA
@@ -1072,27 +1094,28 @@
 #define FLAG_0x40C               0x40C
 #define FLAG_0x40D               0x40D
 #define FLAG_0x40E               0x40E
-#define FLAG_0x40F               0x40F
-#define FLAG_0x410               0x410
-#define FLAG_0x411               0x411
-#define FLAG_HIDDEN_ITEM_LILYCOVE_CITY_MAX_REPEL               0x412
-#define FLAG_0x413               0x413
-#define FLAG_0x414               0x414
-#define FLAG_0x415               0x415
-#define FLAG_0x416               0x416
-#define FLAG_0x417               0x417
-#define FLAG_0x418               0x418
-#define FLAG_0x419               0x419
+#define FLAG_ITEM_PETALBURG_CITY_MAX_REVIVE               0x40F
+#define FLAG_ITEM_PETALBURG_CITY_ETHER               0x410
+#define FLAG_ITEM_RUSTBORO_CITY_X_DEFEND               0x411
+#define FLAG_ITEM_LILYCOVE_CITY_MAX_REPEL               0x412
+#define FLAG_ITEM_MOSSDEEP_CITY_NET_BALL               0x413
+
+#define FLAG_ITEM_METEOR_FALLS_1F_1R_TM_23               0x414
+#define FLAG_ITEM_METEOR_FALLS_1F_1R_FULL_HEAL               0x415
+#define FLAG_ITEM_METEOR_FALLS_1F_1R_MOON_STONE               0x416
+#define FLAG_ITEM_METEOR_FALLS_1F_1R_PP_UP               0x417
+#define FLAG_ITEM_RUSTURF_TUNNEL_POKE_BALL               0x418
+#define FLAG_ITEM_RUSTURF_TUNNEL_MAX_ETHER               0x419
 #define FLAG_ITEM_GRANITE_CAVE_1F_ESCAPE_ROPE               0x41A
 #define FLAG_ITEM_GRANITE_CAVE_B1F_POKE_BALL               0x41B
-#define FLAG_0x41C               0x41C
+#define FLAG_ITEM_MT_PYRE_5F_LAX_INCENSE               0x41C
 #define FLAG_ITEM_GRANITE_CAVE_B2F_REPEL               0x41D
 #define FLAG_ITEM_GRANITE_CAVE_B2F_RARE_CANDY               0x41E
-#define FLAG_0x41F               0x41F
-#define FLAG_0x420               0x420
+#define FLAG_ITEM_PETALBURG_WOODS_X_ATTACK               0x41F
+#define FLAG_ITEM_PETALBURG_WOODS_GREAT_BALL               0x420
 #define FLAG_0x421               0x421
-#define FLAG_0x422               0x422
-#define FLAG_0x423               0x423
+#define FLAG_ITEM_PETALBURG_WOODS_ETHER               0x422
+#define FLAG_ITEM_MAGMA_HIDEOUT_3F_3R_ECAPE_ROPE               0x423
 #define FLAG_0x424               0x424
 #define FLAG_0x425               0x425
 #define FLAG_0x426               0x426
@@ -1106,29 +1129,29 @@
 #define FLAG_ITEM_JAGGED_PASS_BURN_HEAL               0x42E
 #define FLAG_ITEM_AQUA_HIDEOUT_B1F_MAX_ELIXIR               0x42F
 #define FLAG_ITEM_AQUA_HIDEOUT_B2F_NEST_BALL               0x430
-#define FLAG_0x431               0x431
-#define FLAG_0x432               0x432
-#define FLAG_0x433               0x433
-#define FLAG_0x434               0x434
+#define FLAG_ITEM_MT_PYRE_EXTERIOR_MAX_POTION               0x431
+#define FLAG_ITEM_MT_PYRE_EXTERIOR_TM_48               0x432
+#define FLAG_ITEM_NEW_MAUVILLE_ULTRA_BALL               0x433
+#define FLAG_ITEM_NEW_MAUVILLE_ESCAPE_ROPE               0x434

 #define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_6_LUXURY_BALL               0x435
 #define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER               0x436
-#define FLAG_0x437               0x437
-#define FLAG_0x438               0x438
-#define FLAG_0x439               0x439
-#define FLAG_0x43A               0x43A
-#define FLAG_0x43B               0x43B
+#define FLAG_ITEM_SCORCHED_SLAB_TM_11               0x437
+#define FLAG_ITEM_METEOR_FALLS_B1F_2R_TM_02               0x438
+#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_0x441               0x441
-#define FLAG_0x442               0x442
+#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
 #define FLAG_0x444               0x444
 #define FLAG_0x445               0x445
-#define FLAG_0x446               0x446
+#define FLAG_ITEM_SAFARI_ZONE_NORTH_WEST_TM_22               0x446
 #define FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_HARBOR_MAIL               0x447
 #define FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_ESCAPE_ROPE               0x448
 #define FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_DIVE_BALL               0x449
@@ -1144,28 +1167,28 @@
 #define FLAG_0x453               0x453
 #define FLAG_0x454               0x454
 #define FLAG_0x455               0x455
-#define FLAG_0x456               0x456
+#define FLAG_ITEM_NEW_MAUVILLE_THUNDER_STONE               0x456
 #define FLAG_ITEM_FIERY_PATH_FIRE_STONE               0x457
-#define FLAG_0x458               0x458
-#define FLAG_0x459               0x459
+#define FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_TM_07               0x458
+#define FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_NEVER_MELT_ICE               0x459
 #define FLAG_0x45A               0x45A
 #define FLAG_0x45B               0x45B
-#define FLAG_0x45C               0x45C
-#define FLAG_0x45D               0x45D
+#define FLAG_ITEM_MAUVILLE_CITY_X_SPEED               0x45C
+#define FLAG_ITEM_PETALBURD_WOODS_PARALYZE_HEAL               0x45D
 #define FLAG_0x45E               0x45E
-#define FLAG_0x45F               0x45F
-#define FLAG_0x460               0x460
+#define FLAG_ITEM_SAFARI_ZONE_NORTH_CALCIUM               0x45F
+#define FLAG_ITEM_MT_PYRE_3F_SUPER_REPEL               0x460
 #define FLAG_0x461               0x461
-#define FLAG_0x462               0x462
-#define FLAG_0x463               0x463
+#define FLAG_ITEM_NEW_MAUVILLE_FULL_HEAL               0x462
+#define FLAG_ITEM_NEW_MAUVILLE_PARALYZE_HEAL               0x463
 #define FLAG_ITEM_AQUA_HIDEOUT_B1F_MASTER_BALL               0x464
 #define FLAG_0x465               0x465
 #define FLAG_0x466               0x466
 #define FLAG_0x467               0x467
 #define FLAG_0x468               0x468
-#define FLAG_0x469               0x469
-#define FLAG_0x46A               0x46A
-#define FLAG_0x46B               0x46B
+#define FLAG_ITEM_MT_PYRE_2F_ULTRA_BALL               0x469
+#define FLAG_ITEM_MT_PYRE_4F_SEA_INCENSE               0x46A
+#define FLAG_ITEM_SAFARI_ZONE_SOUTH_WEST_MAX_REVIVE               0x46B
 #define FLAG_ITEM_AQUA_HIDEOUT_B1F_NUGGET               0x46C
 #define FLAG_0x46D               0x46D
 #define FLAG_0x46E               0x46E
@@ -1185,7 +1208,7 @@
 #define FLAG_0x47C               0x47C
 #define FLAG_0x47D               0x47D
 #define FLAG_0x47E               0x47E
-#define FLAG_0x47F               0x47F
+#define FLAG_ITEM_MAGMA_HIDEOUT_1F_RARE_CANDY               0x47F
 #define FLAG_0x480               0x480
 #define FLAG_0x481               0x481
 #define FLAG_0x482               0x482
@@ -1198,13 +1221,13 @@
 #define FLAG_0x489               0x489
 #define FLAG_ITEM_ARTISAN_CAVE_B1F_HP_UP               0x48A
 #define FLAG_ITEM_ARTISAN_CAVE_1F_CARBOS               0x48B
-#define FLAG_0x48C               0x48C
-#define FLAG_0x48D               0x48D
-#define FLAG_0x48E               0x48E
-#define FLAG_0x48F               0x48F
-#define FLAG_0x490               0x490
-#define FLAG_0x491               0x491
-#define FLAG_0x492               0x492
+#define FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_MAX_ELIXIR               0x48C
+#define FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_FULL_RESTORE               0x48D
+#define FLAG_ITEM_MAGMA_HIDEOUT_3F_1R_NUGGET               0x48E
+#define FLAG_ITEM_MAGMA_HIDEOUT_3F_2R_PP_MAX               0x48F
+#define FLAG_ITEM_MAGMA_HIDEOUT_4F_MAX_REVIVE               0x490
+#define FLAG_ITEM_SAFARI_ZONE_NORTH_EAST_NUGGET               0x491
+#define FLAG_ITEM_SAFARI_ZONE_SOUTH_EAST_BIG_PEARL               0x492
 #define FLAG_0x493               0x493
 #define FLAG_0x494               0x494
 #define FLAG_0x495               0x495