diff options
50 files changed, 668 insertions, 908 deletions
diff --git a/asm/macros/map.inc b/asm/macros/map.inc index aa54c9001..9a028b2e5 100644 --- a/asm/macros/map.inc +++ b/asm/macros/map.inc @@ -65,10 +65,6 @@ .endm .macro bg_hidden_item_event x, y, height, item, flag - bg_event \x, \y, \height, 7, \item, \flag, 0 - .endm - - .macro bg_hidden_item_event_new x, y, height, item, flag bg_event \x, \y, \height, 7, \item, ((\flag) - FLAG_HIDDEN_ITEMS_START), 0 .endm diff --git a/data/event_scripts.s b/data/event_scripts.s index 3ac08769d..46ba34db5 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1080,7 +1080,7 @@ EventScript_2715DE:: @ 82715DE 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_UNKNOWN_0x363 setflag FLAG_HIDE_RUSTBORO_CITY_AQUA_GRUNT setflag FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1 setflag FLAG_HIDE_RUSBORO_CITY_RIVAL @@ -1123,7 +1123,7 @@ EventScript_2715DE:: @ 82715DE 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_SLATEPORT_CITY_CONTEST_REPORTER setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_MAN @@ -1170,7 +1170,7 @@ EventScript_2715DE:: @ 82715DE setflag FLAG_HIDE_LITTLEROOT_TOWN_RIVAL setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCH setflag FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS - setflag FLAG_0x380 + setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380 setflag FLAG_HIDE_ROUTE_101_BIRCH setflag FLAG_HIDE_ROUTE_103_BIRCH setflag FLAG_HIDE_LILYCOVE_HARBOR_FERRY_SAILOR @@ -2251,7 +2251,7 @@ Route103_EventScript_2720AD:: @ 82720AD Route101_EventScript_27211A:: @ 827211A clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH - clearflag FLAG_0x380 + clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380 setflag FLAG_HIDE_ROUTE_101_BIRCH setflag FLAG_HIDE_ROUTE_103_BIRCH return @@ -2259,7 +2259,7 @@ Route101_EventScript_27211A:: @ 827211A Route101_EventScript_272127:: @ 8272127 clearflag FLAG_HIDE_ROUTE_101_BIRCH setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH - setflag FLAG_0x380 + setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380 setflag FLAG_HIDE_ROUTE_103_BIRCH return @@ -2267,7 +2267,7 @@ Route101_EventScript_272134:: @ 8272134 clearflag FLAG_HIDE_ROUTE_103_BIRCH setflag FLAG_HIDE_ROUTE_101_BIRCH setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH - setflag FLAG_0x380 + setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380 return LittlerootTown_ProfessorBirchsLab_EventScript_272141:: @ 8272141 diff --git a/data/maps/AbandonedShip_CaptainsOffice/scripts.inc b/data/maps/AbandonedShip_CaptainsOffice/scripts.inc index 08186cfe5..ee4b69f24 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/scripts.inc +++ b/data/maps/AbandonedShip_CaptainsOffice/scripts.inc @@ -4,7 +4,7 @@ AbandonedShip_CaptainsOffice_MapScripts:: @ 82387E1 AbandonedShip_CaptainsOffice_EventScript_2387E2:: @ 82387E2 lock faceplayer - checkflag FLAG_0x126 + checkflag FLAG_TRADED_SCANNER_TO_STERN goto_eq AbandonedShip_CaptainsOffice_EventScript_23881A checkitem ITEM_SCANNER, 1 compare VAR_RESULT, 1 diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/events.inc b/data/maps/AbandonedShip_HiddenFloorRooms/events.inc index 3c319309d..b2cf9b11b 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/events.inc +++ b/data/maps/AbandonedShip_HiddenFloorRooms/events.inc @@ -16,10 +16,10 @@ AbandonedShip_HiddenFloorRooms_MapWarps: @ 8536BA0 warp_def 36, 1, 3, 5, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS AbandonedShip_HiddenFloorRooms_MapBGEvents: @ 8536BE8 - bg_hidden_item_event_new 42, 10, 3, ITEM_ROOM_1_KEY, FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_1_KEY - bg_hidden_item_event_new 20, 5, 3, ITEM_ROOM_2_KEY, FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_2_KEY - bg_hidden_item_event_new 1, 12, 3, ITEM_ROOM_4_KEY, FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_4_KEY - bg_hidden_item_event_new 1, 2, 0, ITEM_ROOM_6_KEY, FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_6_KEY + bg_hidden_item_event 42, 10, 3, ITEM_ROOM_1_KEY, FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_1_KEY + bg_hidden_item_event 20, 5, 3, ITEM_ROOM_2_KEY, FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_2_KEY + bg_hidden_item_event 1, 12, 3, ITEM_ROOM_4_KEY, FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_4_KEY + bg_hidden_item_event 1, 2, 0, ITEM_ROOM_6_KEY, FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_6_KEY bg_event 8, 5, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3 bg_event 11, 3, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3 bg_event 10, 10, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3 diff --git a/data/maps/ArtisanCave_B1F/events.inc b/data/maps/ArtisanCave_B1F/events.inc index b89407259..9df844aa3 100644 --- a/data/maps/ArtisanCave_B1F/events.inc +++ b/data/maps/ArtisanCave_B1F/events.inc @@ -6,10 +6,10 @@ ArtisanCave_B1F_MapWarps: @ 8537720 warp_def 38, 5, 0, 1, MAP_ARTISAN_CAVE_1F ArtisanCave_B1F_MapBGEvents: @ 8537730 - bg_hidden_item_event_new 32, 29, 0, ITEM_ZINC, FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_ZINC - bg_hidden_item_event_new 27, 8, 0, ITEM_CALCIUM, FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_CALCIUM - bg_hidden_item_event_new 7, 5, 0, ITEM_PROTEIN, FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_PROTEIN - bg_hidden_item_event_new 19, 43, 0, ITEM_IRON, FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_IRON + bg_hidden_item_event 32, 29, 0, ITEM_ZINC, FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_ZINC + bg_hidden_item_event 27, 8, 0, ITEM_CALCIUM, FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_CALCIUM + bg_hidden_item_event 7, 5, 0, ITEM_PROTEIN, FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_PROTEIN + bg_hidden_item_event 19, 43, 0, ITEM_IRON, FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_IRON ArtisanCave_B1F_MapEvents:: @ 8537760 map_events ArtisanCave_B1F_EventObjects, ArtisanCave_B1F_MapWarps, 0x0, ArtisanCave_B1F_MapBGEvents diff --git a/data/maps/BattleFrontier_OutsideEast/events.inc b/data/maps/BattleFrontier_OutsideEast/events.inc index f6019129f..a16bca779 100644 --- a/data/maps/BattleFrontier_OutsideEast/events.inc +++ b/data/maps/BattleFrontier_OutsideEast/events.inc @@ -12,7 +12,7 @@ BattleFrontier_OutsideEast_EventObjects: @ 853BB10 object_event 11, EVENT_OBJ_GFX_TWIN, 0, 18, 40, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CCD, 0 object_event 12, EVENT_OBJ_GFX_MAN_1, 0, 17, 40, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CD6, 0 object_event 13, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 40, 56, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242C9F, 0 - object_event 14, EVENT_OBJ_GFX_SUDOWOODO, 0, 54, 62, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CEA, FLAG_0x34A + object_event 14, EVENT_OBJ_GFX_SUDOWOODO, 0, 54, 62, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CEA, FLAG_HIDE_BATTLE_FRONTIER_SUDOWOODO object_event 15, EVENT_OBJ_GFX_MANIAC, 0, 42, 34, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242D79, 0 object_event 16, EVENT_OBJ_GFX_GIRL_3, 0, 51, 53, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242D82, 0 object_event 17, EVENT_OBJ_GFX_PSYCHIC_M, 0, 62, 18, 0, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 2, 6, 0, 0, BattleFrontier_OutsideEast_EventScript_242D8B, 0 diff --git a/data/maps/BattleFrontier_OutsideEast/scripts.inc b/data/maps/BattleFrontier_OutsideEast/scripts.inc index 9bb278604..6ed4d94d6 100644 --- a/data/maps/BattleFrontier_OutsideEast/scripts.inc +++ b/data/maps/BattleFrontier_OutsideEast/scripts.inc @@ -23,7 +23,7 @@ BattleFrontier_OutsideEast_MapScript1_242C2D: @ 8242C2D end BattleFrontier_OutsideEast_EventScript_242C3F:: @ 8242C3F - clearflag FLAG_0x34A + clearflag FLAG_HIDE_BATTLE_FRONTIER_SUDOWOODO return BattleFrontier_OutsideEast_EventScript_242C43:: @ 8242C43 diff --git a/data/maps/FallarborTown/events.inc b/data/maps/FallarborTown/events.inc index 319517702..9b2f0a2de 100644 --- a/data/maps/FallarborTown/events.inc +++ b/data/maps/FallarborTown/events.inc @@ -19,7 +19,7 @@ FallarborTown_MapBGEvents: @ 8527C68 bg_event 10, 11, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_EventScript_1EB259 bg_event 17, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, FallarborTown_EventScript_271E6A bg_event 3, 7, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_EventScript_1EB262 - bg_hidden_item_event 2, 15, 3, ITEM_NUGGET, FLAG_TEMP_1C + bg_hidden_item_event 2, 15, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_FALLARBOR_TOWN_NUGGET FallarborTown_MapEvents:: @ 8527CC8 map_events FallarborTown_EventObjects, FallarborTown_MapWarps, 0x0, FallarborTown_MapBGEvents diff --git a/data/maps/GraniteCave_B2F/events.inc b/data/maps/GraniteCave_B2F/events.inc index 4e1f5ff45..08ac73a5a 100644 --- a/data/maps/GraniteCave_B2F/events.inc +++ b/data/maps/GraniteCave_B2F/events.inc @@ -17,8 +17,8 @@ GraniteCave_B2F_MapWarps: @ 853455C warp_def 29, 2, 3, 6, MAP_GRANITE_CAVE_B1F GraniteCave_B2F_MapBGEvents: @ 8534584 - bg_hidden_item_event_new 28, 6, 3, ITEM_EVERSTONE, FLAG_HIDDEN_ITEM_GRANITE_CAVE_B2F_EVERSTONE_1 - bg_hidden_item_event_new 15, 11, 3, ITEM_EVERSTONE, FLAG_HIDDEN_ITEM_GRANITE_CAVE_B2F_EVERSTONE_2 + bg_hidden_item_event 28, 6, 3, ITEM_EVERSTONE, FLAG_HIDDEN_ITEM_GRANITE_CAVE_B2F_EVERSTONE_1 + bg_hidden_item_event 15, 11, 3, ITEM_EVERSTONE, FLAG_HIDDEN_ITEM_GRANITE_CAVE_B2F_EVERSTONE_2 GraniteCave_B2F_MapEvents:: @ 853459C map_events GraniteCave_B2F_EventObjects, GraniteCave_B2F_MapWarps, 0x0, GraniteCave_B2F_MapBGEvents diff --git a/data/maps/JaggedPass/events.inc b/data/maps/JaggedPass/events.inc index f45d500a9..f9a82c89b 100644 --- a/data/maps/JaggedPass/events.inc +++ b/data/maps/JaggedPass/events.inc @@ -27,8 +27,8 @@ JaggedPass_MapCoordEvents: @ 8534BB4 coord_event 13, 15, 3, VAR_0x40C8, 1, JaggedPass_EventScript_2306BB JaggedPass_MapBGEvents: @ 8534C54 - bg_hidden_item_event_new 8, 10, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_JAGGED_PASS_FULL_HEAL - bg_hidden_item_event_new 7, 29, 3, ITEM_GREAT_BALL, FLAG_HIDDEN_ITEM_JAGGED_PASS_GREAT_BALL + bg_hidden_item_event 8, 10, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_JAGGED_PASS_FULL_HEAL + bg_hidden_item_event 7, 29, 3, ITEM_GREAT_BALL, FLAG_HIDDEN_ITEM_JAGGED_PASS_GREAT_BALL JaggedPass_MapEvents:: @ 8534C6C map_events JaggedPass_EventObjects, JaggedPass_MapWarps, JaggedPass_MapCoordEvents, JaggedPass_MapBGEvents diff --git a/data/maps/LavaridgeTown/events.inc b/data/maps/LavaridgeTown/events.inc index 98b3bc1bf..4822762ea 100644 --- a/data/maps/LavaridgeTown/events.inc +++ b/data/maps/LavaridgeTown/events.inc @@ -28,7 +28,7 @@ LavaridgeTown_MapBGEvents: @ 8527B6C bg_event 10, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_EventScript_271E73 bg_event 16, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_EventScript_271E6A bg_event 11, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_EventScript_271E73 - bg_hidden_item_event_new 4, 5, 3, ITEM_ICE_HEAL, FLAG_HIDDEN_ITEM_LAVARIDGE_TOWN_ICE_HEAL + bg_hidden_item_event 4, 5, 3, ITEM_ICE_HEAL, FLAG_HIDDEN_ITEM_LAVARIDGE_TOWN_ICE_HEAL LavaridgeTown_MapEvents:: @ 8527BCC map_events LavaridgeTown_EventObjects, LavaridgeTown_MapWarps, LavaridgeTown_MapCoordEvents, LavaridgeTown_MapBGEvents diff --git a/data/maps/LilycoveCity/events.inc b/data/maps/LilycoveCity/events.inc index 321b695ff..2c7f71d5c 100644 --- a/data/maps/LilycoveCity/events.inc +++ b/data/maps/LilycoveCity/events.inc @@ -49,9 +49,9 @@ LilycoveCity_MapBGEvents: @ 8526F68 bg_event 6, 30, 3, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D44 bg_event 36, 14, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D62 bg_event 34, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D74 - bg_hidden_item_event_new 36, 31, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_LILYCOVE_CITY_HEART_SCALE - bg_hidden_item_event_new 61, 7, 0, ITEM_PP_UP, FLAG_HIDDEN_ITEM_LILYCOVE_CITY_PP_UP - bg_hidden_item_event_new 64, 31, 0, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_LILYCOVE_CITY_POKE_BALL + bg_hidden_item_event 36, 31, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_LILYCOVE_CITY_HEART_SCALE + bg_hidden_item_event 61, 7, 0, ITEM_PP_UP, FLAG_HIDDEN_ITEM_LILYCOVE_CITY_PP_UP + bg_hidden_item_event 64, 31, 0, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_LILYCOVE_CITY_POKE_BALL LilycoveCity_MapEvents:: @ 8527004 map_events LilycoveCity_EventObjects, LilycoveCity_MapWarps, 0x0, LilycoveCity_MapBGEvents diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index 6c7ac9cd2..ae01e4632 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -500,7 +500,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA294:: @ 81FA294 end LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E:: @ 81FA29E - checkflag FLAG_0x380 + checkflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380 goto_if 0, LittlerootTown_ProfessorBirchsLab_EventScript_272141 compare VAR_0x40D3, 3 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_272141 diff --git a/data/maps/MtPyre_Exterior/events.inc b/data/maps/MtPyre_Exterior/events.inc index 520b8b3bc..75c9489e4 100644 --- a/data/maps/MtPyre_Exterior/events.inc +++ b/data/maps/MtPyre_Exterior/events.inc @@ -15,8 +15,8 @@ MtPyre_Exterior_MapCoordEvents: @ 8535124 coord_event 26, 21, 3, 0, 0, MtPyre_Exterior_EventScript_231FED MtPyre_Exterior_MapBGEvents: @ 8535174 - bg_hidden_item_event_new 9, 8, 0, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_MT_PYRE_EXTERIOR_ULTRA_BALL - bg_hidden_item_event_new 16, 22, 0, ITEM_MAX_ETHER, FLAG_HIDDEN_ITEM_MT_PYRE_EXTERIOR_MAX_ETHER + bg_hidden_item_event 9, 8, 0, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_MT_PYRE_EXTERIOR_ULTRA_BALL + bg_hidden_item_event 16, 22, 0, ITEM_MAX_ETHER, FLAG_HIDDEN_ITEM_MT_PYRE_EXTERIOR_MAX_ETHER MtPyre_Exterior_MapEvents:: @ 853518C map_events MtPyre_Exterior_EventObjects, MtPyre_Exterior_MapWarps, MtPyre_Exterior_MapCoordEvents, MtPyre_Exterior_MapBGEvents diff --git a/data/maps/MtPyre_Summit/events.inc b/data/maps/MtPyre_Summit/events.inc index 13c507b86..b112fbcfe 100644 --- a/data/maps/MtPyre_Summit/events.inc +++ b/data/maps/MtPyre_Summit/events.inc @@ -22,8 +22,8 @@ MtPyre_Summit_MapCoordEvents: @ 8535278 coord_event 24, 9, 3, VAR_0x40B9, 2, MtPyre_Summit_EventScript_232204 MtPyre_Summit_MapBGEvents: @ 85352D8 - bg_hidden_item_event_new 9, 25, 0, ITEM_ZINC, FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_ZINC - bg_hidden_item_event_new 37, 7, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_RARE_CANDY + bg_hidden_item_event 9, 25, 0, ITEM_ZINC, FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_ZINC + bg_hidden_item_event 37, 7, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_RARE_CANDY MtPyre_Summit_MapEvents:: @ 85352F0 map_events MtPyre_Summit_EventObjects, MtPyre_Summit_MapWarps, MtPyre_Summit_MapCoordEvents, MtPyre_Summit_MapBGEvents diff --git a/data/maps/NavelRock_Top/events.inc b/data/maps/NavelRock_Top/events.inc index ebb960a26..abd337cb2 100644 --- a/data/maps/NavelRock_Top/events.inc +++ b/data/maps/NavelRock_Top/events.inc @@ -8,7 +8,7 @@ NavelRock_Top_MapCoordEvents: @ 853DB94 coord_event 12, 10, 3, VAR_TEMP_1, 0, NavelRock_Top_EventScript_26916F NavelRock_Top_MapBGEvents: @ 853DBA4 - bg_hidden_item_event_new 12, 9, 3, ITEM_SACRED_ASH, FLAG_HIDDEN_ITEM_NAVEL_ROCK_TOP_SACRED_ASH + bg_hidden_item_event 12, 9, 3, ITEM_SACRED_ASH, FLAG_HIDDEN_ITEM_NAVEL_ROCK_TOP_SACRED_ASH NavelRock_Top_MapEvents:: @ 853DBB0 map_events NavelRock_Top_EventObjects, NavelRock_Top_MapWarps, NavelRock_Top_MapCoordEvents, NavelRock_Top_MapBGEvents diff --git a/data/maps/PetalburgCity/events.inc b/data/maps/PetalburgCity/events.inc index e1ac0d55c..10d85c939 100644 --- a/data/maps/PetalburgCity/events.inc +++ b/data/maps/PetalburgCity/events.inc @@ -35,7 +35,7 @@ PetalburgCity_MapBGEvents: @ 8526158 bg_event 22, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_EventScript_271E73 bg_event 27, 12, 0, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_EventScript_271E6A bg_event 8, 9, 0, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_EventScript_1DC491 - bg_hidden_item_event_new 11, 29, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_PETALBURG_CITY_RARE_CANDY + bg_hidden_item_event 11, 29, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_PETALBURG_CITY_RARE_CANDY PetalburgCity_MapEvents:: @ 85261B8 map_events PetalburgCity_EventObjects, PetalburgCity_MapWarps, PetalburgCity_MapCoordEvents, PetalburgCity_MapBGEvents diff --git a/data/maps/PetalburgWoods/events.inc b/data/maps/PetalburgWoods/events.inc index 9824f31f2..b64e38885 100644 --- a/data/maps/PetalburgWoods/events.inc +++ b/data/maps/PetalburgWoods/events.inc @@ -27,10 +27,10 @@ PetalburgWoods_MapCoordEvents: @ 853474C PetalburgWoods_MapBGEvents: @ 853476C bg_event 14, 32, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgWoods_EventScript_22E25B - bg_hidden_item_event_new 39, 35, 3, ITEM_POTION, FLAG_HIDDEN_ITEM_PETALBURG_WOODS_POTION - bg_hidden_item_event_new 26, 6, 3, ITEM_TINY_MUSHROOM, FLAG_HIDDEN_ITEM_PETALBURG_WOODS_TINY_MUSHROOM_1 - bg_hidden_item_event_new 40, 29, 3, ITEM_TINY_MUSHROOM, FLAG_HIDDEN_ITEM_PETALBURG_WOODS_TINY_MUSHROOM_2 - bg_hidden_item_event_new 4, 19, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_PETALBURG_WOODS_POKE_BALL + bg_hidden_item_event 39, 35, 3, ITEM_POTION, FLAG_HIDDEN_ITEM_PETALBURG_WOODS_POTION + bg_hidden_item_event 26, 6, 3, ITEM_TINY_MUSHROOM, FLAG_HIDDEN_ITEM_PETALBURG_WOODS_TINY_MUSHROOM_1 + bg_hidden_item_event 40, 29, 3, ITEM_TINY_MUSHROOM, FLAG_HIDDEN_ITEM_PETALBURG_WOODS_TINY_MUSHROOM_2 + bg_hidden_item_event 4, 19, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_PETALBURG_WOODS_POKE_BALL bg_event 11, 8, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgWoods_EventScript_22E264 PetalburgWoods_MapEvents:: @ 85347B4 diff --git a/data/maps/Route104/events.inc b/data/maps/Route104/events.inc index c247a56b8..889ef3595 100644 --- a/data/maps/Route104/events.inc +++ b/data/maps/Route104/events.inc @@ -53,11 +53,11 @@ Route104_MapBGEvents: @ 8528664 bg_event 23, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_1ED02A bg_event 7, 20, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_1ED033 bg_event 17, 23, 3, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_1ED03C - bg_hidden_item_event_new 7, 6, 3, ITEM_SUPER_POTION, FLAG_HIDDEN_ITEM_ROUTE_104_SUPER_POTION - bg_hidden_item_event_new 3, 9, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_ROUTE_104_POKE_BALL - bg_hidden_item_event_new 14, 55, 3, ITEM_POTION, FLAG_HIDDEN_ITEM_ROUTE_104_POTION - bg_hidden_item_event_new 16, 72, 3, ITEM_ANTIDOTE, FLAG_HIDDEN_ITEM_ROUTE_104_ANTIDOTE - bg_hidden_item_event_new 16, 64, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_104_HEART_SCALE + bg_hidden_item_event 7, 6, 3, ITEM_SUPER_POTION, FLAG_HIDDEN_ITEM_ROUTE_104_SUPER_POTION + bg_hidden_item_event 3, 9, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_ROUTE_104_POKE_BALL + bg_hidden_item_event 14, 55, 3, ITEM_POTION, FLAG_HIDDEN_ITEM_ROUTE_104_POTION + bg_hidden_item_event 16, 72, 3, ITEM_ANTIDOTE, FLAG_HIDDEN_ITEM_ROUTE_104_ANTIDOTE + bg_hidden_item_event 16, 64, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_104_HEART_SCALE Route104_MapEvents:: @ 85286DC map_events Route104_EventObjects, Route104_MapWarps, Route104_MapCoordEvents, Route104_MapBGEvents diff --git a/data/maps/Route105/events.inc b/data/maps/Route105/events.inc index edc4c48e4..e22aa668c 100644 --- a/data/maps/Route105/events.inc +++ b/data/maps/Route105/events.inc @@ -12,8 +12,8 @@ Route105_MapWarps: @ 85287B0 warp_def 9, 20, 0, 0, MAP_ISLAND_CAVE Route105_MapBGEvents: @ 85287B8 - bg_hidden_item_event_new 15, 68, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_105_HEART_SCALE - bg_hidden_item_event_new 5, 56, 3, ITEM_BIG_PEARL, FLAG_HIDDEN_ITEM_ROUTE_105_BIG_PEARL + bg_hidden_item_event 15, 68, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_105_HEART_SCALE + bg_hidden_item_event 5, 56, 3, ITEM_BIG_PEARL, FLAG_HIDDEN_ITEM_ROUTE_105_BIG_PEARL Route105_MapEvents:: @ 85287D0 map_events Route105_EventObjects, Route105_MapWarps, 0x0, Route105_MapBGEvents diff --git a/data/maps/Route106/events.inc b/data/maps/Route106/events.inc index f5954c94c..9ff0f41dd 100644 --- a/data/maps/Route106/events.inc +++ b/data/maps/Route106/events.inc @@ -9,9 +9,9 @@ Route106_MapWarps: @ 852885C warp_def 48, 16, 0, 0, MAP_GRANITE_CAVE_1F Route106_MapBGEvents: @ 8528864 - bg_hidden_item_event_new 41, 11, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_ROUTE_106_POKE_BALL - bg_hidden_item_event_new 53, 12, 0, ITEM_STARDUST, FLAG_HIDDEN_ITEM_ROUTE_106_STARDUST - bg_hidden_item_event_new 68, 15, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_106_HEART_SCALE + bg_hidden_item_event 41, 11, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_ROUTE_106_POKE_BALL + bg_hidden_item_event 53, 12, 0, ITEM_STARDUST, FLAG_HIDDEN_ITEM_ROUTE_106_STARDUST + bg_hidden_item_event 68, 15, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_106_HEART_SCALE bg_event 59, 13, 3, BG_EVENT_PLAYER_FACING_ANY, Route106_EventScript_1EE48A Route106_MapEvents:: @ 8528894 diff --git a/data/maps/Route108/events.inc b/data/maps/Route108/events.inc index df2a4e10e..094eb0bc7 100644 --- a/data/maps/Route108/events.inc +++ b/data/maps/Route108/events.inc @@ -11,7 +11,7 @@ Route108_MapWarps: @ 8528A0C warp_def 29, 6, 3, 0, MAP_ABANDONED_SHIP_DECK Route108_MapBGEvents: @ 8528A14 - bg_hidden_item_event_new 38, 14, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_ROUTE_108_RARE_CANDY + bg_hidden_item_event 38, 14, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_ROUTE_108_RARE_CANDY Route108_MapEvents:: @ 8528A20 map_events Route108_EventObjects, Route108_MapWarps, 0x0, Route108_MapBGEvents diff --git a/data/maps/Route109/events.inc b/data/maps/Route109/events.inc index 1d14ed541..322055874 100644 --- a/data/maps/Route109/events.inc +++ b/data/maps/Route109/events.inc @@ -30,12 +30,12 @@ Route109_MapWarps: @ 8528C74 Route109_MapBGEvents: @ 8528C7C bg_event 15, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route109_EventScript_1EEA2B bg_event 29, 10, 3, BG_EVENT_PLAYER_FACING_ANY, Route109_EventScript_1EEA34 - bg_hidden_item_event_new 16, 23, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_109_REVIVE - bg_hidden_item_event_new 33, 5, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_1 - bg_hidden_item_event_new 9, 10, 3, ITEM_GREAT_BALL, FLAG_HIDDEN_ITEM_ROUTE_109_GREAT_BALL - bg_hidden_item_event_new 28, 20, 3, ITEM_ETHER, FLAG_HIDDEN_ITEM_ROUTE_109_ETHER - bg_hidden_item_event_new 13, 16, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_2 - bg_hidden_item_event_new 8, 42, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_3 + bg_hidden_item_event 16, 23, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_109_REVIVE + bg_hidden_item_event 33, 5, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_1 + bg_hidden_item_event 9, 10, 3, ITEM_GREAT_BALL, FLAG_HIDDEN_ITEM_ROUTE_109_GREAT_BALL + bg_hidden_item_event 28, 20, 3, ITEM_ETHER, FLAG_HIDDEN_ITEM_ROUTE_109_ETHER + bg_hidden_item_event 13, 16, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_2 + bg_hidden_item_event 8, 42, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_3 Route109_MapEvents:: @ 8528CDC map_events Route109_EventObjects, Route109_MapWarps, 0x0, Route109_MapBGEvents diff --git a/data/maps/Route110/events.inc b/data/maps/Route110/events.inc index 0f7c2142f..221dd6f6c 100644 --- a/data/maps/Route110/events.inc +++ b/data/maps/Route110/events.inc @@ -68,10 +68,10 @@ Route110_MapBGEvents: @ 8529110 bg_event 37, 70, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF380 bg_event 8, 67, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF389 bg_event 32, 93, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF392 - bg_hidden_item_event_new 35, 39, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_110_REVIVE - bg_hidden_item_event_new 33, 45, 3, ITEM_GREAT_BALL, FLAG_HIDDEN_ITEM_ROUTE_110_GREAT_BALL - bg_hidden_item_event_new 4, 35, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_ROUTE_110_POKE_BALL - bg_hidden_item_event_new 37, 67, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_ROUTE_110_FULL_HEAL + bg_hidden_item_event 35, 39, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_110_REVIVE + bg_hidden_item_event 33, 45, 3, ITEM_GREAT_BALL, FLAG_HIDDEN_ITEM_ROUTE_110_GREAT_BALL + bg_hidden_item_event 4, 35, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_ROUTE_110_POKE_BALL + bg_hidden_item_event 37, 67, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_ROUTE_110_FULL_HEAL bg_event 13, 16, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF34A Route110_MapEvents:: @ 85291DC diff --git a/data/maps/Route110_TrickHouseEnd/events.inc b/data/maps/Route110_TrickHouseEnd/events.inc index 6a6de0794..1e371bbbe 100644 --- a/data/maps/Route110_TrickHouseEnd/events.inc +++ b/data/maps/Route110_TrickHouseEnd/events.inc @@ -9,7 +9,7 @@ Route110_TrickHouseEnd_MapCoordEvents: @ 853DF24 coord_event 2, 2, 3, VAR_TEMP_2, 0, Route110_TrickHouseEnd_EventScript_26B041 Route110_TrickHouseEnd_MapBGEvents: @ 853DF34 - bg_hidden_item_event_new 4, 5, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_TRICK_HOUSE_NUGGET + bg_hidden_item_event 4, 5, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_TRICK_HOUSE_NUGGET Route110_TrickHouseEnd_MapEvents:: @ 853DF40 map_events Route110_TrickHouseEnd_EventObjects, Route110_TrickHouseEnd_MapWarps, Route110_TrickHouseEnd_MapCoordEvents, Route110_TrickHouseEnd_MapBGEvents diff --git a/data/maps/Route111/events.inc b/data/maps/Route111/events.inc index 633858092..46e3b067b 100644 --- a/data/maps/Route111/events.inc +++ b/data/maps/Route111/events.inc @@ -100,13 +100,13 @@ Route111_MapBGEvents: @ 8529888 bg_event 25, 19, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F1177 bg_secret_base_event 35, 1, 0, SECRET_BASE_RED_CAVE2_3 bg_secret_base_event 35, 31, 0, SECRET_BASE_YELLOW_CAVE4_3 - bg_hidden_item_event_new 26, 70, 0, ITEM_STARDUST, FLAG_HIDDEN_ITEM_ROUTE_111_STARDUST + bg_hidden_item_event 26, 70, 0, ITEM_STARDUST, FLAG_HIDDEN_ITEM_ROUTE_111_STARDUST bg_secret_base_event 27, 27, 3, SECRET_BASE_RED_CAVE4_3 bg_event 7, 84, 3, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F1180 bg_secret_base_event 14, 19, 0, SECRET_BASE_TREE1_4 bg_secret_base_event 13, 19, 0, SECRET_BASE_TREE1_1 - bg_hidden_item_event_new 19, 55, 0, ITEM_PROTEIN, FLAG_HIDDEN_ITEM_ROUTE_111_PROTEIN - bg_hidden_item_event_new 35, 66, 0, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_ROUTE_111_RARE_CANDY + bg_hidden_item_event 19, 55, 0, ITEM_PROTEIN, FLAG_HIDDEN_ITEM_ROUTE_111_PROTEIN + bg_hidden_item_event 35, 66, 0, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_ROUTE_111_RARE_CANDY bg_event 24, 116, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F146C Route111_MapEvents:: @ 8529960 diff --git a/data/maps/Route113/events.inc b/data/maps/Route113/events.inc index 9d38010f9..b2481d6ed 100644 --- a/data/maps/Route113/events.inc +++ b/data/maps/Route113/events.inc @@ -48,9 +48,9 @@ Route113_MapBGEvents: @ 8529DF4 bg_event 58, 4, 3, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_1F21B7 bg_event 31, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_1F21AE bg_secret_base_event 49, 8, 3, SECRET_BASE_RED_CAVE1_3 - bg_hidden_item_event_new 66, 3, 3, ITEM_ETHER, FLAG_HIDDEN_ITEM_ROUTE_113_ETHER - bg_hidden_item_event_new 22, 5, 3, ITEM_TM32, FLAG_HIDDEN_ITEM_ROUTE_113_TM_32 - bg_hidden_item_event_new 73, 3, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_ROUTE_113_NUGGET + bg_hidden_item_event 66, 3, 3, ITEM_ETHER, FLAG_HIDDEN_ITEM_ROUTE_113_ETHER + bg_hidden_item_event 22, 5, 3, ITEM_TM32, FLAG_HIDDEN_ITEM_ROUTE_113_TM_32 + bg_hidden_item_event 73, 3, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_ROUTE_113_NUGGET Route113_MapEvents:: @ 8529E54 map_events Route113_EventObjects, Route113_MapWarps, Route113_MapCoordEvents, Route113_MapBGEvents diff --git a/data/maps/Route114/events.inc b/data/maps/Route114/events.inc index 817be07af..55ea12195 100644 --- a/data/maps/Route114/events.inc +++ b/data/maps/Route114/events.inc @@ -44,9 +44,9 @@ Route114_MapBGEvents: @ 852A118 bg_secret_base_event 11, 27, 0, SECRET_BASE_TREE3_2 bg_secret_base_event 12, 27, 0, SECRET_BASE_TREE4_2 bg_event 25, 38, 3, BG_EVENT_PLAYER_FACING_ANY, Route114_EventScript_1F2637 - bg_hidden_item_event_new 20, 57, 3, ITEM_CARBOS, FLAG_HIDDEN_ITEM_ROUTE_114_CARBOS + bg_hidden_item_event 20, 57, 3, ITEM_CARBOS, FLAG_HIDDEN_ITEM_ROUTE_114_CARBOS bg_secret_base_event 32, 57, 0, SECRET_BASE_BROWN_CAVE4_3 - bg_hidden_item_event_new 7, 30, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_113_REVIVE + bg_hidden_item_event 7, 30, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_113_REVIVE Route114_MapEvents:: @ 852A1A8 map_events Route114_EventObjects, Route114_MapWarps, 0x0, Route114_MapBGEvents diff --git a/data/maps/Route115/events.inc b/data/maps/Route115/events.inc index 8bd538d6a..18179deb1 100644 --- a/data/maps/Route115/events.inc +++ b/data/maps/Route115/events.inc @@ -42,7 +42,7 @@ Route115_MapBGEvents: @ 852A3FC bg_secret_base_event 8, 20, 0, SECRET_BASE_TREE3_3 bg_secret_base_event 25, 24, 0, SECRET_BASE_BROWN_CAVE3_3 bg_secret_base_event 20, 53, 0, SECRET_BASE_RED_CAVE3_1 - bg_hidden_item_event_new 15, 49, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_115_HEART_SCALE + bg_hidden_item_event 15, 49, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_115_HEART_SCALE Route115_MapEvents:: @ 852A4A4 map_events Route115_EventObjects, Route115_MapWarps, 0x0, Route115_MapBGEvents diff --git a/data/maps/Route116/events.inc b/data/maps/Route116/events.inc index 345ebb43b..37c54eb7e 100644 --- a/data/maps/Route116/events.inc +++ b/data/maps/Route116/events.inc @@ -48,8 +48,8 @@ Route116_MapBGEvents: @ 852A790 bg_event 29, 10, 0, BG_EVENT_PLAYER_FACING_ANY, Route116_EventScript_1F2D7B bg_secret_base_event 56, 6, 0, SECRET_BASE_BLUE_CAVE3_2 bg_secret_base_event 55, 15, 0, SECRET_BASE_BLUE_CAVE4_2 - bg_hidden_item_event_new 22, 9, 3, ITEM_SUPER_POTION, FLAG_HIDDEN_ITEM_ROUTE_116_SUPER_POTION - bg_hidden_item_event_new 70, 13, 3, ITEM_BLACK_GLASSES, FLAG_HIDDEN_ITEM_ROUTE_116_BLACK_GLASSES + bg_hidden_item_event 22, 9, 3, ITEM_SUPER_POTION, FLAG_HIDDEN_ITEM_ROUTE_116_SUPER_POTION + bg_hidden_item_event 70, 13, 3, ITEM_BLACK_GLASSES, FLAG_HIDDEN_ITEM_ROUTE_116_BLACK_GLASSES Route116_MapEvents:: @ 852A814 map_events Route116_EventObjects, Route116_MapWarps, Route116_MapCoordEvents, Route116_MapBGEvents diff --git a/data/maps/Route117/events.inc b/data/maps/Route117/events.inc index 0d0fcde1f..4cede4040 100644 --- a/data/maps/Route117/events.inc +++ b/data/maps/Route117/events.inc @@ -31,7 +31,7 @@ Route117_MapBGEvents: @ 852AA70 bg_event 16, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route117_EventScript_1F39B5 bg_event 49, 12, 0, BG_EVENT_PLAYER_FACING_ANY, Route117_EventScript_1F39BE bg_event 49, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route117_EventScript_1F39C7 - bg_hidden_item_event_new 3, 18, 3, ITEM_REPEL, FLAG_HIDDEN_ITEM_ROUTE_117_REPEL + bg_hidden_item_event 3, 18, 3, ITEM_REPEL, FLAG_HIDDEN_ITEM_ROUTE_117_REPEL Route117_MapEvents:: @ 852AAA0 map_events Route117_EventObjects, Route117_MapWarps, 0x0, Route117_MapBGEvents diff --git a/data/maps/Route118/events.inc b/data/maps/Route118/events.inc index 18bbbda02..fe131549f 100644 --- a/data/maps/Route118/events.inc +++ b/data/maps/Route118/events.inc @@ -38,8 +38,8 @@ Route118_MapBGEvents: @ 852ACEC bg_secret_base_event 29, 5, 0, SECRET_BASE_YELLOW_CAVE1_2 bg_secret_base_event 47, 5, 0, SECRET_BASE_TREE1_3 bg_secret_base_event 46, 5, 0, SECRET_BASE_TREE2_1 - bg_hidden_item_event_new 31, 13, 3, ITEM_IRON, FLAG_HIDDEN_ITEM_ROUTE_118_IRON - bg_hidden_item_event_new 12, 14, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_118_HEART_SCALE + bg_hidden_item_event 31, 13, 3, ITEM_IRON, FLAG_HIDDEN_ITEM_ROUTE_118_IRON + bg_hidden_item_event 12, 14, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_118_HEART_SCALE Route118_MapEvents:: @ 852AD58 map_events Route118_EventObjects, Route118_MapWarps, Route118_MapCoordEvents, Route118_MapBGEvents diff --git a/data/maps/Route119/events.inc b/data/maps/Route119/events.inc index 9175db4d0..3a7d1422b 100644 --- a/data/maps/Route119/events.inc +++ b/data/maps/Route119/events.inc @@ -83,15 +83,15 @@ Route119_MapBGEvents: @ 852B2F4 bg_secret_base_event 31, 73, 3, SECRET_BASE_SHRUB4_1 bg_secret_base_event 16, 81, 0, SECRET_BASE_BLUE_CAVE3_3 bg_secret_base_event 16, 28, 0, SECRET_BASE_BLUE_CAVE4_3 - bg_hidden_item_event_new 17, 82, 3, ITEM_CALCIUM, FLAG_HIDDEN_ITEM_ROUTE_119_CALCIUM - bg_hidden_item_event_new 38, 63, 3, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_ROUTE_119_ULTRA_BALL + bg_hidden_item_event 17, 82, 3, ITEM_CALCIUM, FLAG_HIDDEN_ITEM_ROUTE_119_CALCIUM + bg_hidden_item_event 38, 63, 3, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_ROUTE_119_ULTRA_BALL bg_secret_base_event 26, 81, 0, SECRET_BASE_RED_CAVE3_3 bg_secret_base_event 19, 76, 0, SECRET_BASE_TREE2_3 bg_secret_base_event 18, 76, 0, SECRET_BASE_TREE4_3 bg_secret_base_event 4, 15, 0, SECRET_BASE_SHRUB3_3 bg_secret_base_event 6, 2, 0, SECRET_BASE_SHRUB4_3 - bg_hidden_item_event_new 26, 120, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_ROUTE_119_FULL_HEAL - bg_hidden_item_event_new 20, 29, 3, ITEM_MAX_ETHER, FLAG_HIDDEN_ITEM_ROUTE_119_MAX_ETHER + bg_hidden_item_event 26, 120, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_ROUTE_119_FULL_HEAL + bg_hidden_item_event 20, 29, 3, ITEM_MAX_ETHER, FLAG_HIDDEN_ITEM_ROUTE_119_MAX_ETHER bg_event 28, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_EventScript_1F49E3 Route119_MapEvents:: @ 852B3E4 diff --git a/data/maps/Route120/events.inc b/data/maps/Route120/events.inc index 745ed169e..4400081f7 100644 --- a/data/maps/Route120/events.inc +++ b/data/maps/Route120/events.inc @@ -79,10 +79,10 @@ Route120_MapBGEvents: @ 852B958 bg_secret_base_event 18, 12, 0, SECRET_BASE_BLUE_CAVE2_3 bg_secret_base_event 38, 54, 0, SECRET_BASE_SHRUB1_3 bg_secret_base_event 31, 23, 0, SECRET_BASE_SHRUB2_3 - bg_hidden_item_event_new 9, 1, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_ROUTE_120_RARE_CANDY_1 - bg_hidden_item_event_new 31, 11, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_120_REVIVE - bg_hidden_item_event_new 0, 86, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_ROUTE_120_RARE_CANDY_2 - bg_hidden_item_event_new 24, 42, 3, ITEM_ZINC, FLAG_HIDDEN_ITEM_ROUTE_120_ZINC + bg_hidden_item_event 9, 1, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_ROUTE_120_RARE_CANDY_1 + bg_hidden_item_event 31, 11, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_120_REVIVE + bg_hidden_item_event 0, 86, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_ROUTE_120_RARE_CANDY_2 + bg_hidden_item_event 24, 42, 3, ITEM_ZINC, FLAG_HIDDEN_ITEM_ROUTE_120_ZINC bg_secret_base_event 5, 76, 0, SECRET_BASE_SHRUB1_4 Route120_MapEvents:: @ 852BA00 diff --git a/data/maps/Route121/events.inc b/data/maps/Route121/events.inc index b74ac78e6..4f27079a6 100644 --- a/data/maps/Route121/events.inc +++ b/data/maps/Route121/events.inc @@ -45,10 +45,10 @@ Route121_MapBGEvents: @ 852BD14 bg_secret_base_event 43, 7, 0, SECRET_BASE_TREE1_2 bg_secret_base_event 42, 7, 0, SECRET_BASE_TREE2_2 bg_event 39, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route121_EventScript_1F5E0F - bg_hidden_item_event_new 23, 10, 3, ITEM_HP_UP, FLAG_HIDDEN_ITEM_ROUTE_121_HP_UP - bg_hidden_item_event_new 58, 3, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_ROUTE_121_NUGGET - bg_hidden_item_event_new 72, 5, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_ROUTE_121_FULL_HEAL - bg_hidden_item_event_new 68, 8, 3, ITEM_MAX_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_121_MAX_REVIVE + bg_hidden_item_event 23, 10, 3, ITEM_HP_UP, FLAG_HIDDEN_ITEM_ROUTE_121_HP_UP + bg_hidden_item_event 58, 3, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_ROUTE_121_NUGGET + bg_hidden_item_event 72, 5, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_ROUTE_121_FULL_HEAL + bg_hidden_item_event 68, 8, 3, ITEM_MAX_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_121_MAX_REVIVE Route121_MapEvents:: @ 852BD8C map_events Route121_EventObjects, Route121_MapWarps, Route121_MapCoordEvents, Route121_MapBGEvents diff --git a/data/maps/Route123/events.inc b/data/maps/Route123/events.inc index 2db8fdb6c..d45ac0222 100644 --- a/data/maps/Route123/events.inc +++ b/data/maps/Route123/events.inc @@ -75,13 +75,13 @@ Route123_MapBGEvents: @ 852C32C bg_secret_base_event 47, 3, 0, SECRET_BASE_BLUE_CAVE1_2 bg_secret_base_event 49, 3, 0, SECRET_BASE_BLUE_CAVE2_2 bg_event 10, 12, 3, BG_EVENT_PLAYER_FACING_ANY, Route123_EventScript_1F61AA - bg_hidden_item_event_new 75, 1, 3, ITEM_SUPER_REPEL, FLAG_HIDDEN_ITEM_ROUTE_123_SUPER_REPEL + bg_hidden_item_event 75, 1, 3, ITEM_SUPER_REPEL, FLAG_HIDDEN_ITEM_ROUTE_123_SUPER_REPEL bg_event 20, 7, 3, BG_EVENT_PLAYER_FACING_ANY, Route123_EventScript_1F61BC bg_secret_base_event 57, 5, 0, SECRET_BASE_BLUE_CAVE1_3 - bg_hidden_item_event_new 12, 1, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_123_REVIVE - bg_hidden_item_event_new 91, 15, 3, ITEM_HYPER_POTION, FLAG_HIDDEN_ITEM_ROUTE_123_HYPER_POTION - bg_hidden_item_event_new 139, 15, 3, ITEM_PP_UP, FLAG_HIDDEN_ITEM_ROUTE_123_PP_UP - bg_hidden_item_event_new 138, 18, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_ROUTE_123_RARE_CANDY + bg_hidden_item_event 12, 1, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_123_REVIVE + bg_hidden_item_event 91, 15, 3, ITEM_HYPER_POTION, FLAG_HIDDEN_ITEM_ROUTE_123_HYPER_POTION + bg_hidden_item_event 139, 15, 3, ITEM_PP_UP, FLAG_HIDDEN_ITEM_ROUTE_123_PP_UP + bg_hidden_item_event 138, 18, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_ROUTE_123_RARE_CANDY Route123_MapEvents:: @ 852C3B0 map_events Route123_EventObjects, Route123_MapWarps, Route123_MapCoordEvents, Route123_MapBGEvents diff --git a/data/maps/Route128/events.inc b/data/maps/Route128/events.inc index c4f1f8fd0..792ff5ca3 100644 --- a/data/maps/Route128/events.inc +++ b/data/maps/Route128/events.inc @@ -11,9 +11,9 @@ Route128_EventObjects: @ 852C88C object_event 10, EVENT_OBJ_GFX_SWIMMER_M, 0, 101, 22, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 4, Route128_EventScript_1F6DC7, 0 Route128_MapBGEvents: @ 852C97C - bg_hidden_item_event_new 49, 9, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_1 - bg_hidden_item_event_new 57, 21, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_2 - bg_hidden_item_event_new 31, 33, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_3 + bg_hidden_item_event 49, 9, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_1 + bg_hidden_item_event 57, 21, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_2 + bg_hidden_item_event 31, 33, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_3 Route128_MapEvents:: @ 852C9A0 map_events Route128_EventObjects, 0x0, 0x0, Route128_MapBGEvents diff --git a/data/maps/SSTidalLowerDeck/events.inc b/data/maps/SSTidalLowerDeck/events.inc index 5deed0c75..65ced7c13 100644 --- a/data/maps/SSTidalLowerDeck/events.inc +++ b/data/maps/SSTidalLowerDeck/events.inc @@ -6,7 +6,7 @@ SSTidalLowerDeck_MapWarps: @ 853A2EC warp_def 15, 2, 3, 8, MAP_SS_TIDAL_CORRIDOR SSTidalLowerDeck_MapBGEvents: @ 853A2F4 - bg_hidden_item_event_new 0, 2, 0, ITEM_LEFTOVERS, FLAG_HIDDEN_ITEM_SS_TIDAL_LOWER_DECK_LEFTOVERS + bg_hidden_item_event 0, 2, 0, ITEM_LEFTOVERS, FLAG_HIDDEN_ITEM_SS_TIDAL_LOWER_DECK_LEFTOVERS SSTidalLowerDeck_MapEvents:: @ 853A300 map_events SSTidalLowerDeck_EventObjects, SSTidalLowerDeck_MapWarps, 0x0, SSTidalLowerDeck_MapBGEvents diff --git a/data/maps/SafariZone_Northeast/events.inc b/data/maps/SafariZone_Northeast/events.inc index aac73f791..dc0393b4d 100644 --- a/data/maps/SafariZone_Northeast/events.inc +++ b/data/maps/SafariZone_Northeast/events.inc @@ -10,8 +10,8 @@ SafariZone_Northeast_EventObjects: @ 853B968 object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2912E3, FLAG_ITEM_SAFARI_ZONE_NORTH_EAST_NUGGET SafariZone_Northeast_MapBGEvents: @ 853BA40 - bg_hidden_item_event_new 31, 35, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_SAFARI_ZONE_NORTH_EAST_RARE_CANDY - bg_hidden_item_event_new 21, 5, 3, ITEM_ZINC, FLAG_HIDDEN_ITEM_SAFARI_ZONE_NORTH_EAST_ZINC + bg_hidden_item_event 31, 35, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_SAFARI_ZONE_NORTH_EAST_RARE_CANDY + bg_hidden_item_event 21, 5, 3, ITEM_ZINC, FLAG_HIDDEN_ITEM_SAFARI_ZONE_NORTH_EAST_ZINC SafariZone_Northeast_MapEvents:: @ 853BA58 map_events SafariZone_Northeast_EventObjects, 0x0, 0x0, SafariZone_Northeast_MapBGEvents diff --git a/data/maps/SafariZone_Southeast/events.inc b/data/maps/SafariZone_Southeast/events.inc index 26a7ff8fb..badaaefd4 100644 --- a/data/maps/SafariZone_Southeast/events.inc +++ b/data/maps/SafariZone_Southeast/events.inc @@ -6,8 +6,8 @@ SafariZone_Southeast_EventObjects: @ 853BA6C object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 12, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D399, FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION SafariZone_Southeast_MapBGEvents: @ 853BAE4 - bg_hidden_item_event_new 19, 36, 3, ITEM_PP_UP, FLAG_HIDDEN_ITEM_SAFARI_ZONE_SOUTH_EAST_PP_UP - bg_hidden_item_event_new 32, 33, 0, ITEM_FULL_RESTORE, FLAG_HIDDEN_ITEM_SAFARI_ZONE_SOUTH_EAST_FULL_RESTORE + bg_hidden_item_event 19, 36, 3, ITEM_PP_UP, FLAG_HIDDEN_ITEM_SAFARI_ZONE_SOUTH_EAST_PP_UP + bg_hidden_item_event 32, 33, 0, ITEM_FULL_RESTORE, FLAG_HIDDEN_ITEM_SAFARI_ZONE_SOUTH_EAST_FULL_RESTORE SafariZone_Southeast_MapEvents:: @ 853BAFC map_events SafariZone_Southeast_EventObjects, 0x0, 0x0, SafariZone_Southeast_MapBGEvents diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc index da55b2fca..588a37636 100644 --- a/data/maps/SlateportCity/scripts.inc +++ b/data/maps/SlateportCity/scripts.inc @@ -15,7 +15,7 @@ SlateportCity_MapScript1_1DCC6C: @ 81DCC6C SlateportCity_EventScript_1DCC8D:: @ 81DCC8D setflag FLAG_VISITED_SLATEPORT_CITY setvar VAR_0x4086, 0 - setflag FLAG_0x323 + setflag FLAG_HIDE_SLATEPORT_CITY_CONTEST_REPORTER return SlateportCity_EventScript_1DCC99:: @ 81DCC99 diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc index 874f8436d..20e6b78ed 100644 --- a/data/maps/SlateportCity_Harbor/scripts.inc +++ b/data/maps/SlateportCity_Harbor/scripts.inc @@ -371,7 +371,7 @@ SlateportCity_Harbor_EventScript_20CD7B:: @ 820CD7B goto_eq SlateportCity_Harbor_EventScript_272054 takeitem ITEM_SCANNER, 1 msgbox SlateportCity_Harbor_Text_20D94A, 4 - setflag FLAG_0x126 + setflag FLAG_TRADED_SCANNER_TO_STERN goto SlateportCity_Harbor_EventScript_20CE11 end @@ -384,7 +384,7 @@ SlateportCity_Harbor_EventScript_20CDBB:: @ 820CDBB goto_eq SlateportCity_Harbor_EventScript_272054 takeitem ITEM_SCANNER, 1 msgbox SlateportCity_Harbor_Text_20D94A, 4 - setflag FLAG_0x126 + setflag FLAG_TRADED_SCANNER_TO_STERN goto SlateportCity_Harbor_EventScript_20CE11 end diff --git a/data/maps/Underwater1/events.inc b/data/maps/Underwater1/events.inc index da1688310..7d3866eb0 100644 --- a/data/maps/Underwater1/events.inc +++ b/data/maps/Underwater1/events.inc @@ -1,11 +1,11 @@ Underwater1_MapBGEvents: @ 852CEB4 - bg_hidden_item_event_new 42, 51, 0, ITEM_CARBOS, FLAG_HIDDEN_ITEM_UNDERWATER_1_CARBOS - bg_hidden_item_event_new 14, 40, 0, ITEM_GREEN_SHARD, FLAG_HIDDEN_ITEM_UNDERWATER_1_GREEN_SHARD - bg_hidden_item_event_new 66, 34, 3, ITEM_PEARL, FLAG_HIDDEN_ITEM_UNDERWATER_1_PEARL - bg_hidden_item_event_new 64, 54, 3, ITEM_BIG_PEARL, FLAG_HIDDEN_ITEM_UNDERWATER_1_BIG_PEARL - bg_hidden_item_event_new 70, 64, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_UNDERWATER_1_HEART_SCALE_1 - bg_hidden_item_event_new 42, 5, 3, ITEM_CALCIUM, FLAG_HIDDEN_ITEM_UNDERWATER_1_CALCIUM - bg_hidden_item_event_new 45, 36, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_UNDERWATER_1_HEART_SCALE_2 + bg_hidden_item_event 42, 51, 0, ITEM_CARBOS, FLAG_HIDDEN_ITEM_UNDERWATER_1_CARBOS + bg_hidden_item_event 14, 40, 0, ITEM_GREEN_SHARD, FLAG_HIDDEN_ITEM_UNDERWATER_1_GREEN_SHARD + bg_hidden_item_event 66, 34, 3, ITEM_PEARL, FLAG_HIDDEN_ITEM_UNDERWATER_1_PEARL + bg_hidden_item_event 64, 54, 3, ITEM_BIG_PEARL, FLAG_HIDDEN_ITEM_UNDERWATER_1_BIG_PEARL + bg_hidden_item_event 70, 64, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_UNDERWATER_1_HEART_SCALE_1 + bg_hidden_item_event 42, 5, 3, ITEM_CALCIUM, FLAG_HIDDEN_ITEM_UNDERWATER_1_CALCIUM + bg_hidden_item_event 45, 36, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_UNDERWATER_1_HEART_SCALE_2 Underwater1_MapEvents:: @ 852CF08 map_events 0x0, 0x0, 0x0, Underwater1_MapBGEvents diff --git a/data/maps/Underwater2/events.inc b/data/maps/Underwater2/events.inc index 912d47a4d..dd2421506 100644 --- a/data/maps/Underwater2/events.inc +++ b/data/maps/Underwater2/events.inc @@ -2,14 +2,14 @@ Underwater2_MapWarps: @ 852CF1C warp_def 45, 65, 0, 0, MAP_UNDERWATER_SOOTOPOLIS_CITY Underwater2_MapBGEvents: @ 852CF24 - bg_hidden_item_event_new 30, 17, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_UNDERWATER_2_HEART_SCALE - bg_hidden_item_event_new 41, 19, 3, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_UNDERWATER_2_ULTRA_BALL - bg_hidden_item_event_new 63, 19, 3, ITEM_STARDUST, FLAG_HIDDEN_ITEM_UNDERWATER_2_STARDUST - bg_hidden_item_event_new 10, 36, 3, ITEM_PEARL, FLAG_HIDDEN_ITEM_UNDERWATER_2_PEARL - bg_hidden_item_event_new 11, 39, 3, ITEM_IRON, FLAG_HIDDEN_ITEM_UNDERWATER_2_IRON - bg_hidden_item_event_new 12, 35, 3, ITEM_YELLOW_SHARD, FLAG_HIDDEN_ITEM_UNDERWATER_2_YELLOW_SHARD - bg_hidden_item_event_new 65, 60, 3, ITEM_BIG_PEARL, FLAG_HIDDEN_ITEM_UNDERWATER_2_BIG_PEARL - bg_hidden_item_event_new 9, 77, 3, ITEM_BLUE_SHARD, FLAG_HIDDEN_ITEM_UNDERWATER_2_BLUE_SHARD + bg_hidden_item_event 30, 17, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_UNDERWATER_2_HEART_SCALE + bg_hidden_item_event 41, 19, 3, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_UNDERWATER_2_ULTRA_BALL + bg_hidden_item_event 63, 19, 3, ITEM_STARDUST, FLAG_HIDDEN_ITEM_UNDERWATER_2_STARDUST + bg_hidden_item_event 10, 36, 3, ITEM_PEARL, FLAG_HIDDEN_ITEM_UNDERWATER_2_PEARL + bg_hidden_item_event 11, 39, 3, ITEM_IRON, FLAG_HIDDEN_ITEM_UNDERWATER_2_IRON + bg_hidden_item_event 12, 35, 3, ITEM_YELLOW_SHARD, FLAG_HIDDEN_ITEM_UNDERWATER_2_YELLOW_SHARD + bg_hidden_item_event 65, 60, 3, ITEM_BIG_PEARL, FLAG_HIDDEN_ITEM_UNDERWATER_2_BIG_PEARL + bg_hidden_item_event 9, 77, 3, ITEM_BLUE_SHARD, FLAG_HIDDEN_ITEM_UNDERWATER_2_BLUE_SHARD Underwater2_MapEvents:: @ 852CF84 map_events 0x0, Underwater2_MapWarps, 0x0, Underwater2_MapBGEvents diff --git a/data/maps/Underwater3/events.inc b/data/maps/Underwater3/events.inc index c328383d7..02ac86aa1 100644 --- a/data/maps/Underwater3/events.inc +++ b/data/maps/Underwater3/events.inc @@ -3,10 +3,10 @@ Underwater3_MapWarps: @ 852CF98 warp_def 67, 38, 0, 0, MAP_UNDERWATER_MARINE_CAVE Underwater3_MapBGEvents: @ 852CFA8 - bg_hidden_item_event_new 12, 42, 3, ITEM_STAR_PIECE, FLAG_HIDDEN_ITEM_UNDERWATER_3_STAR_PIECE - bg_hidden_item_event_new 50, 36, 3, ITEM_HP_UP, FLAG_HIDDEN_ITEM_UNDERWATER_3_HP_UP - bg_hidden_item_event_new 34, 72, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_UNDERWATER_3_HEART_SCALE - bg_hidden_item_event_new 72, 20, 3, ITEM_RED_SHARD, FLAG_HIDDEN_ITEM_UNDERWATER_3_RED_SHARD + bg_hidden_item_event 12, 42, 3, ITEM_STAR_PIECE, FLAG_HIDDEN_ITEM_UNDERWATER_3_STAR_PIECE + bg_hidden_item_event 50, 36, 3, ITEM_HP_UP, FLAG_HIDDEN_ITEM_UNDERWATER_3_HP_UP + bg_hidden_item_event 34, 72, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_UNDERWATER_3_HEART_SCALE + bg_hidden_item_event 72, 20, 3, ITEM_RED_SHARD, FLAG_HIDDEN_ITEM_UNDERWATER_3_RED_SHARD Underwater3_MapEvents:: @ 852CFD8 map_events 0x0, Underwater3_MapWarps, 0x0, Underwater3_MapBGEvents diff --git a/data/maps/Underwater4/events.inc b/data/maps/Underwater4/events.inc index 68585a955..5a08e82f9 100644 --- a/data/maps/Underwater4/events.inc +++ b/data/maps/Underwater4/events.inc @@ -2,8 +2,8 @@ Underwater4_MapWarps: @ 852CFEC warp_def 38, 26, 3, 0, MAP_UNDERWATER_SEAFLOOR_CAVERN Underwater4_MapBGEvents: @ 852CFF4 - bg_hidden_item_event_new 38, 19, 3, ITEM_PROTEIN, FLAG_HIDDEN_ITEM_UNDERWATER_4_PROTEIN - bg_hidden_item_event_new 69, 18, 3, ITEM_PEARL, FLAG_HIDDEN_ITEM_UNDERWATER_4_PEARL + bg_hidden_item_event 38, 19, 3, ITEM_PROTEIN, FLAG_HIDDEN_ITEM_UNDERWATER_4_PROTEIN + bg_hidden_item_event 69, 18, 3, ITEM_PEARL, FLAG_HIDDEN_ITEM_UNDERWATER_4_PEARL Underwater4_MapEvents:: @ 852D00C map_events 0x0, Underwater4_MapWarps, 0x0, Underwater4_MapBGEvents diff --git a/data/maps/VictoryRoad_1F/events.inc b/data/maps/VictoryRoad_1F/events.inc index b31abb4bb..05cafcc48 100644 --- a/data/maps/VictoryRoad_1F/events.inc +++ b/data/maps/VictoryRoad_1F/events.inc @@ -21,7 +21,7 @@ VictoryRoad_1F_MapCoordEvents: @ 8535F04 coord_event 3, 23, 4, VAR_0x40C3, 0, VictoryRoad_1F_EventScript_235DC8 VictoryRoad_1F_MapBGEvents: @ 8535F24 - bg_hidden_item_event_new 30, 39, 4, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_VICTORY_ROAD_1F_ULTRA_BALL + bg_hidden_item_event 30, 39, 4, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_VICTORY_ROAD_1F_ULTRA_BALL VictoryRoad_1F_MapEvents:: @ 8535F30 map_events VictoryRoad_1F_EventObjects, VictoryRoad_1F_MapWarps, VictoryRoad_1F_MapCoordEvents, VictoryRoad_1F_MapBGEvents diff --git a/data/maps/VictoryRoad_B2F/events.inc b/data/maps/VictoryRoad_B2F/events.inc index 10ee751dc..1ad4f3e50 100644 --- a/data/maps/VictoryRoad_B2F/events.inc +++ b/data/maps/VictoryRoad_B2F/events.inc @@ -14,8 +14,8 @@ VictoryRoad_B2F_MapWarps: @ 8536230 warp_def 5, 26, 3, 6, MAP_VICTORY_ROAD_B1F VictoryRoad_B2F_MapBGEvents: @ 8536250 - bg_hidden_item_event_new 28, 5, 3, ITEM_ELIXIR, FLAG_HIDDEN_ITEM_VICTORY_ROAD_B2F_ELIXIR - bg_hidden_item_event_new 37, 1, 3, ITEM_MAX_REPEL, FLAG_HIDDEN_ITEM_VICTORY_ROAD_B2F_MAX_REPEL + bg_hidden_item_event 28, 5, 3, ITEM_ELIXIR, FLAG_HIDDEN_ITEM_VICTORY_ROAD_B2F_ELIXIR + bg_hidden_item_event 37, 1, 3, ITEM_MAX_REPEL, FLAG_HIDDEN_ITEM_VICTORY_ROAD_B2F_MAX_REPEL VictoryRoad_B2F_MapEvents:: @ 8536268 map_events VictoryRoad_B2F_EventObjects, VictoryRoad_B2F_MapWarps, 0x0, VictoryRoad_B2F_MapBGEvents diff --git a/include/constants/flags.h b/include/constants/flags.h index f3c0f75ac..c21affd61 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -194,6 +194,8 @@ #define FLAG_DECORATION_12 0xB9 #define FLAG_DECORATION_13 0xBA #define FLAG_DECORATION_14 0xBB + +// scripts #define FLAG_0x0BC 0xBC #define FLAG_0x0BD 0xBD #define FLAG_0x0BE 0xBE @@ -302,7 +304,7 @@ // upper flags? #define FLAG_0x124 0x124 #define FLAG_0x125 0x125 -#define FLAG_0x126 0x126 +#define FLAG_TRADED_SCANNER_TO_STERN 0x126 #define FLAG_0x127 0x127 #define FLAG_0x128 0x128 #define FLAG_0x129 0x129 @@ -509,91 +511,11 @@ #define FLAG_0x1F1 0x1F1 #define FLAG_0x1F2 0x1F2 #define FLAG_0x1F3 0x1F3 - - - -#define FLAG_HIDDEN_ITEMS_START 0x1F4 #define FLAG_0x1F5 0x1F5 // trick house end room? -#define FLAG_0x1F6 0x1F6 -#define FLAG_0x1F7 0x1F7 -#define FLAG_0x1F8 0x1F8 -#define FLAG_0x1F9 0x1F9 -#define FLAG_0x1FA 0x1FA -#define FLAG_0x1FB 0x1FB -#define FLAG_0x1FC 0x1FC -#define FLAG_0x1FD 0x1FD -#define FLAG_0x1FE 0x1FE -#define FLAG_0x1FF 0x1FF -#define FLAG_0x200 0x200 -#define FLAG_0x201 0x201 -#define FLAG_0x202 0x202 -#define FLAG_0x203 0x203 -#define FLAG_0x204 0x204 -#define FLAG_0x205 0x205 -#define FLAG_0x206 0x206 -#define FLAG_0x207 0x207 -#define FLAG_0x208 0x208 -#define FLAG_0x209 0x209 -#define FLAG_0x20A 0x20A -#define FLAG_0x20B 0x20B -#define FLAG_0x20C 0x20C -#define FLAG_0x20D 0x20D -#define FLAG_0x20E 0x20E -#define FLAG_0x20F 0x20F -#define FLAG_0x210 0x210 -#define FLAG_0x211 0x211 -#define FLAG_0x212 0x212 - -#define FLAG_HIDDEN_ITEM_ROUTE_111_STARDUST (FLAG_HIDDEN_ITEMS_START + 0x02) -#define FLAG_HIDDEN_ITEM_ROUTE_111_PROTEIN (FLAG_HIDDEN_ITEMS_START + 0x38) -#define FLAG_HIDDEN_ITEM_ROUTE_111_RARE_CANDY (FLAG_HIDDEN_ITEMS_START + 0x39) - -#define FLAG_HIDDEN_ITEM_ROUTE_113_ETHER (FLAG_HIDDEN_ITEMS_START + 0x03) -#define FLAG_HIDDEN_ITEM_ROUTE_113_TM_32 (FLAG_HIDDEN_ITEMS_START + 0x1E) -#define FLAG_HIDDEN_ITEM_ROUTE_113_NUGGET (FLAG_HIDDEN_ITEMS_START + 0x62) - -#define FLAG_HIDDEN_ITEM_ROUTE_114_CARBOS (FLAG_HIDDEN_ITEMS_START + 0x04) -#define FLAG_HIDDEN_ITEM_ROUTE_113_REVIVE (FLAG_HIDDEN_ITEMS_START + 0x2A) - -#define FLAG_HIDDEN_ITEM_ROUTE_115_HEART_SCALE (FLAG_HIDDEN_ITEMS_START + 0x61) - -#define FLAG_HIDDEN_ITEM_ROUTE_116_SUPER_POTION (FLAG_HIDDEN_ITEMS_START + 0x2D) -#define FLAG_HIDDEN_ITEM_ROUTE_116_BLACK_GLASSES (FLAG_HIDDEN_ITEMS_START + 0x60) - -#define FLAG_HIDDEN_ITEM_ROUTE_117_REPEL (FLAG_HIDDEN_ITEMS_START + 0x48) - -#define FLAG_HIDDEN_ITEM_ROUTE_118_HEART_SCALE (FLAG_HIDDEN_ITEMS_START + 0x42) -#define FLAG_HIDDEN_ITEM_ROUTE_118_IRON (FLAG_HIDDEN_ITEMS_START + 0x43) - -#define FLAG_HIDDEN_ITEM_ROUTE_119_CALCIUM (FLAG_HIDDEN_ITEMS_START + 0x05) -#define FLAG_HIDDEN_ITEM_ROUTE_119_ULTRA_BALL (FLAG_HIDDEN_ITEMS_START + 0x06) -#define FLAG_HIDDEN_ITEM_ROUTE_119_FULL_HEAL (FLAG_HIDDEN_ITEMS_START + 0x44) -#define FLAG_HIDDEN_ITEM_ROUTE_119_MAX_ETHER (FLAG_HIDDEN_ITEMS_START + 0x57) - -#define FLAG_HIDDEN_ITEM_ROUTE_120_RARE_CANDY_1 (FLAG_HIDDEN_ITEMS_START + 0x47) -#define FLAG_HIDDEN_ITEM_ROUTE_120_REVIVE (FLAG_HIDDEN_ITEMS_START + 0x54) -#define FLAG_HIDDEN_ITEM_ROUTE_120_RARE_CANDY_2 (FLAG_HIDDEN_ITEMS_START + 0x45) -#define FLAG_HIDDEN_ITEM_ROUTE_120_ZINC (FLAG_HIDDEN_ITEMS_START + 0x46) - -#define FLAG_HIDDEN_ITEM_ROUTE_121_HP_UP (FLAG_HIDDEN_ITEMS_START + 0x27) -#define FLAG_HIDDEN_ITEM_ROUTE_121_NUGGET (FLAG_HIDDEN_ITEMS_START + 0x28) -#define FLAG_HIDDEN_ITEM_ROUTE_121_FULL_HEAL (FLAG_HIDDEN_ITEMS_START + 0x49) -#define FLAG_HIDDEN_ITEM_ROUTE_121_MAX_REVIVE (FLAG_HIDDEN_ITEMS_START + 0x64) - -#define FLAG_HIDDEN_ITEM_ROUTE_123_SUPER_REPEL (FLAG_HIDDEN_ITEMS_START + 0x07) -#define FLAG_HIDDEN_ITEM_ROUTE_123_REVIVE (FLAG_HIDDEN_ITEMS_START + 0x29) -#define FLAG_HIDDEN_ITEM_ROUTE_123_HYPER_POTION (FLAG_HIDDEN_ITEMS_START + 0x4A) -#define FLAG_HIDDEN_ITEM_ROUTE_123_PP_UP (FLAG_HIDDEN_ITEMS_START + 0x63) -#define FLAG_HIDDEN_ITEM_ROUTE_123_RARE_CANDY (FLAG_HIDDEN_ITEMS_START + 0x6E) - -#define FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_1 (FLAG_HIDDEN_ITEMS_START + 0x5C) -#define FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_2 (FLAG_HIDDEN_ITEMS_START + 0x5D) -#define FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_3 (FLAG_HIDDEN_ITEMS_START + 0x5E) - - - - +// Hidden Items -- sorted by location +#define FLAG_HIDDEN_ITEMS_START 0x1F4 +#define FLAG_HIDDEN_ITEM_TRICK_HOUSE_NUGGET (FLAG_HIDDEN_ITEMS_START + 0x01) #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) @@ -601,744 +523,586 @@ #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_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_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_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_UNDERWATER_4_PEARL (FLAG_HIDDEN_ITEMS_START + 0x1A) +#define FLAG_HIDDEN_ITEM_FALLARBOR_TOWN_NUGGET (FLAG_HIDDEN_ITEMS_START + 0x1C) #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) #define FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_2_KEY (FLAG_HIDDEN_ITEMS_START + 0x20) #define FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_4_KEY (FLAG_HIDDEN_ITEMS_START + 0x21) #define FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_6_KEY (FLAG_HIDDEN_ITEMS_START + 0x22) - #define FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_CALCIUM (FLAG_HIDDEN_ITEMS_START + 0x65) #define FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_ZINC (FLAG_HIDDEN_ITEMS_START + 0x66) #define FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_PROTEIN (FLAG_HIDDEN_ITEMS_START + 0x67) #define FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_IRON (FLAG_HIDDEN_ITEMS_START + 0x68) - #define FLAG_HIDDEN_ITEM_GRANITE_CAVE_B2F_EVERSTONE_1 (FLAG_HIDDEN_ITEMS_START + 0x30) #define FLAG_HIDDEN_ITEM_GRANITE_CAVE_B2F_EVERSTONE_2 (FLAG_HIDDEN_ITEMS_START + 0x31) - #define FLAG_HIDDEN_ITEM_JAGGED_PASS_GREAT_BALL (FLAG_HIDDEN_ITEMS_START + 0x4C) #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 + 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_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_VICTORY_ROAD_B2F_ELIXIR (FLAG_HIDDEN_ITEMS_START + 0x52) +#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_HIDDEN_ITEM_ROUTE_104_SUPER_POTION (FLAG_HIDDEN_ITEMS_START + 0x2C) -#define FLAG_HIDDEN_ITEM_ROUTE_104_POKE_BALL (FLAG_HIDDEN_ITEMS_START + 0x3E) -#define FLAG_HIDDEN_ITEM_ROUTE_104_POTION (FLAG_HIDDEN_ITEMS_START + 0x25) -#define FLAG_HIDDEN_ITEM_ROUTE_104_ANTIDOTE (FLAG_HIDDEN_ITEMS_START + 0x55) -#define FLAG_HIDDEN_ITEM_ROUTE_104_HEART_SCALE (FLAG_HIDDEN_ITEMS_START + 0x58) - +#define FLAG_HIDDEN_ITEM_ROUTE_104_POKE_BALL (FLAG_HIDDEN_ITEMS_START + 0x3E) +#define FLAG_HIDDEN_ITEM_ROUTE_104_POTION (FLAG_HIDDEN_ITEMS_START + 0x25) +#define FLAG_HIDDEN_ITEM_ROUTE_104_ANTIDOTE (FLAG_HIDDEN_ITEMS_START + 0x55) +#define FLAG_HIDDEN_ITEM_ROUTE_104_HEART_SCALE (FLAG_HIDDEN_ITEMS_START + 0x58) #define FLAG_HIDDEN_ITEM_ROUTE_105_HEART_SCALE (FLAG_HIDDEN_ITEMS_START + 0x59) -#define FLAG_HIDDEN_ITEM_ROUTE_105_BIG_PEARL (FLAG_HIDDEN_ITEMS_START + 0x6F) - -#define FLAG_HIDDEN_ITEM_ROUTE_106_POKE_BALL (FLAG_HIDDEN_ITEMS_START + 0x3F) -#define FLAG_HIDDEN_ITEM_ROUTE_106_STARDUST (FLAG_HIDDEN_ITEMS_START + 0x2E) +#define FLAG_HIDDEN_ITEM_ROUTE_105_BIG_PEARL (FLAG_HIDDEN_ITEMS_START + 0x6F) +#define FLAG_HIDDEN_ITEM_ROUTE_106_POKE_BALL (FLAG_HIDDEN_ITEMS_START + 0x3F) +#define FLAG_HIDDEN_ITEM_ROUTE_106_STARDUST (FLAG_HIDDEN_ITEMS_START + 0x2E) #define FLAG_HIDDEN_ITEM_ROUTE_106_HEART_SCALE (FLAG_HIDDEN_ITEMS_START + 0x2F) - #define FLAG_HIDDEN_ITEM_ROUTE_108_RARE_CANDY (FLAG_HIDDEN_ITEMS_START + 0x56) - -#define FLAG_HIDDEN_ITEM_ROUTE_109_REVIVE (FLAG_HIDDEN_ITEMS_START + 0x32) +#define FLAG_HIDDEN_ITEM_ROUTE_109_REVIVE (FLAG_HIDDEN_ITEMS_START + 0x32) #define FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_1 (FLAG_HIDDEN_ITEMS_START + 0x34) -#define FLAG_HIDDEN_ITEM_ROUTE_109_GREAT_BALL (FLAG_HIDDEN_ITEMS_START + 0x33) -#define FLAG_HIDDEN_ITEM_ROUTE_109_ETHER (FLAG_HIDDEN_ITEMS_START + 0x40) +#define FLAG_HIDDEN_ITEM_ROUTE_109_GREAT_BALL (FLAG_HIDDEN_ITEMS_START + 0x33) +#define FLAG_HIDDEN_ITEM_ROUTE_109_ETHER (FLAG_HIDDEN_ITEMS_START + 0x40) #define FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_2 (FLAG_HIDDEN_ITEMS_START + 0x5A) #define FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_3 (FLAG_HIDDEN_ITEMS_START + 0x5B) - -#define FLAG_HIDDEN_ITEM_ROUTE_110_REVIVE (FLAG_HIDDEN_ITEMS_START + 0x36) +#define FLAG_HIDDEN_ITEM_ROUTE_110_REVIVE (FLAG_HIDDEN_ITEMS_START + 0x36) #define FLAG_HIDDEN_ITEM_ROUTE_110_GREAT_BALL (FLAG_HIDDEN_ITEMS_START + 0x35) -#define FLAG_HIDDEN_ITEM_ROUTE_110_POKE_BALL (FLAG_HIDDEN_ITEMS_START + 0x41) -#define FLAG_HIDDEN_ITEM_ROUTE_110_FULL_HEAL (FLAG_HIDDEN_ITEMS_START + 0x37) - -#define FLAG_HIDDEN_ITEM_TRICK_HOUSE_NUGGET (FLAG_HIDDEN_ITEMS_START + 0x01) - - - -#define FLAG_0x217 0x217//23 -#define FLAG_0x218 0x218//24 -#define FLAG_0x219 0x219//25 -#define FLAG_0x21A 0x21A//26 -#define FLAG_0x21B 0x21B -#define FLAG_0x21C 0x21C -#define FLAG_0x21D 0x21D -#define FLAG_0x21E 0x21E -#define FLAG_0x21F 0x21F -#define FLAG_0x220 0x220 -#define FLAG_0x221 0x221 -#define FLAG_0x222 0x222 -#define FLAG_0x223 0x223 -#define FLAG_0x224 0x224 -#define FLAG_0x225 0x225 -#define FLAG_0x226 0x226 -#define FLAG_0x227 0x227 -#define FLAG_0x228 0x228 -#define FLAG_0x229 0x229 -#define FLAG_0x22A 0x22A -#define FLAG_0x22B 0x22B -#define FLAG_0x22C 0x22C -#define FLAG_0x22D 0x22D -#define FLAG_0x22E 0x22E -#define FLAG_0x22F 0x22F -#define FLAG_0x230 0x230 -#define FLAG_0x231 0x231 -#define FLAG_0x232 0x232 -#define FLAG_0x233 0x233 -#define FLAG_0x234 0x234 -#define FLAG_0x235 0x235 -#define FLAG_0x236 0x236 -#define FLAG_0x237 0x237 -#define FLAG_0x238 0x238 -#define FLAG_0x239 0x239 -#define FLAG_0x23A 0x23A -#define FLAG_0x23B 0x23B -#define FLAG_0x23C 0x23C -#define FLAG_0x23D 0x23D -#define FLAG_0x23E 0x23E -#define FLAG_0x23F 0x23F -#define FLAG_0x240 0x240 -#define FLAG_0x241 0x241 -#define FLAG_0x242 0x242 -#define FLAG_0x243 0x243 -#define FLAG_0x244 0x244 -#define FLAG_0x245 0x245 -#define FLAG_0x246 0x246 -#define FLAG_0x247 0x247 -#define FLAG_0x248 0x248 -#define FLAG_0x249 0x249 -#define FLAG_0x24A 0x24A -#define FLAG_0x24B 0x24B -#define FLAG_0x24C 0x24C -#define FLAG_0x24D 0x24D -#define FLAG_0x24E 0x24E -#define FLAG_0x24F 0x24F -#define FLAG_0x250 0x250 -#define FLAG_0x251 0x251 -#define FLAG_0x252 0x252 -#define FLAG_0x253 0x253 -#define FLAG_HIDDEN_ITEM_BLACK_GLASSES 0x254 -#define FLAG_0x255 0x255 -#define FLAG_0x256 0x256 -#define FLAG_0x257 0x257 -#define FLAG_0x258 0x258 -#define FLAG_0x259 0x259 -#define FLAG_0x25A 0x25A -#define FLAG_0x25B 0x25B -#define FLAG_0x25C 0x25C -#define FLAG_0x25D 0x25D -#define FLAG_0x25E 0x25E -#define FLAG_0x25F 0x25F -#define FLAG_0x260 0x260 -#define FLAG_0x261 0x261 -#define FLAG_0x262 0x262 -#define FLAG_0x263 0x263 -#define FLAG_0x264 0x264 -#define FLAG_0x265 0x265 -#define FLAG_0x266 0x266 -#define FLAG_0x267 0x267 -#define FLAG_0x268 0x268 -#define FLAG_0x269 0x269 -#define FLAG_0x26A 0x26A -#define FLAG_0x26B 0x26B -#define FLAG_0x26C 0x26C -#define FLAG_0x26D 0x26D -#define FLAG_0x26E 0x26E -#define FLAG_0x26F 0x26F -#define FLAG_0x270 0x270 -#define FLAG_0x271 0x271 -#define FLAG_0x272 0x272 -#define FLAG_0x273 0x273 -#define FLAG_0x274 0x274 -#define FLAG_0x275 0x275 -#define FLAG_0x276 0x276 -#define FLAG_0x277 0x277 -#define FLAG_0x278 0x278 -#define FLAG_0x279 0x279 -#define FLAG_0x27A 0x27A -#define FLAG_0x27B 0x27B -#define FLAG_0x27C 0x27C -#define FLAG_0x27D 0x27D -#define FLAG_0x27E 0x27E -#define FLAG_0x27F 0x27F -#define FLAG_0x280 0x280 -#define FLAG_0x281 0x281 -#define FLAG_0x282 0x282 -#define FLAG_0x283 0x283 -#define FLAG_0x284 0x284 -#define FLAG_0x285 0x285 -#define FLAG_0x286 0x286 -#define FLAG_0x287 0x287 -#define FLAG_0x288 0x288 -#define FLAG_0x289 0x289 -#define FLAG_0x28A 0x28A -#define FLAG_0x28B 0x28B -#define FLAG_0x28C 0x28C -#define FLAG_0x28D 0x28D -#define FLAG_0x28E 0x28E -#define FLAG_0x28F 0x28F -#define FLAG_0x290 0x290 -#define FLAG_0x291 0x291 -#define FLAG_0x292 0x292 -#define FLAG_0x293 0x293 -#define FLAG_0x294 0x294 -#define FLAG_0x295 0x295 -#define FLAG_0x296 0x296 -#define FLAG_0x297 0x297 -#define FLAG_0x298 0x298 -#define FLAG_0x299 0x299 -#define FLAG_0x29A 0x29A -#define FLAG_0x29B 0x29B -#define FLAG_0x29C 0x29C -#define FLAG_0x29D 0x29D -#define FLAG_0x29E 0x29E -#define FLAG_0x29F 0x29F -#define FLAG_0x2A0 0x2A0 -#define FLAG_0x2A1 0x2A1 -#define FLAG_0x2A2 0x2A2 -#define FLAG_0x2A3 0x2A3 -#define FLAG_0x2A4 0x2A4 -#define FLAG_0x2A5 0x2A5 -#define FLAG_0x2A6 0x2A6 -#define FLAG_0x2A7 0x2A7 -#define FLAG_0x2A8 0x2A8 -#define FLAG_0x2A9 0x2A9 -#define FLAG_0x2AA 0x2AA -#define FLAG_0x2AB 0x2AB -#define FLAG_0x2AC 0x2AC -#define FLAG_0x2AD 0x2AD -#define FLAG_0x2AE 0x2AE -#define FLAG_0x2AF 0x2AF -#define FLAG_0x2B0 0x2B0 -#define FLAG_0x2B1 0x2B1 -#define FLAG_0x2B2 0x2B2 -#define FLAG_0x2B3 0x2B3 -#define FLAG_0x2B4 0x2B4 -#define FLAG_0x2B5 0x2B5 -#define FLAG_0x2B6 0x2B6 -#define FLAG_0x2B7 0x2B7 -#define FLAG_0x2B8 0x2B8 -#define FLAG_0x2B9 0x2B9 -#define FLAG_0x2BA 0x2BA -#define FLAG_0x2BB 0x2BB -#define FLAG_HIDE_ROUTE_101_BIRCH_STARTERS_BAG 0x2BC -#define FLAG_HIDE_APPRENTICE 0x2BD -#define FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN 0x2BE -#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 -#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_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS 0x2CD -#define FLAG_HIDE_MEW 0x2CE -#define FLAG_HIDE_ROUTE_104_RIVAL 0x2CF -#define FLAG_HIDE_ROUTE_101_BIRCH_ZIGZAGOON_BATTLE 0x2D0 -#define FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH 0x2D1 -#define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM 0x2D2 -#define FLAG_HIDE_ROUTE_103_RIVAL 0x2D3 -#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_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_HIDE_ROUTE_104_MR_BRINEY 0x2E2 -#define FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY 0x2E3 -#define FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN 0x2E4 -#define FLAG_HIDE_ROUTE_108_MR_BRINEY 0x2E5 -#define FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT 0x2E6 -#define FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN 0x2E7 -#define FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT 0x2E8 -#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_HIDE_SLATEPORT_CITY_SCOTT 0x2ED -#define FLAG_HIDE_ROUTE_101_ZIGZAGOON 0x2EE -#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 -#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_HIDE_MAUVILLE_CITY_SCOTT 0x2FD -#define FLAG_HIDE_VERDANTURF_TOWN_SCOTT 0x2FE -#define FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT 0x2FF -#define FLAG_HIDE_ROUTE_111_VICTOR_WINSTRATE 0x300 -#define FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE 0x301 -#define FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE 0x302 -#define FLAG_HIDE_ROUTE_111_VICKY_WINSTRATE 0x303 -#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 -#define FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_2 0x309 -#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_HIDE_PETALBURG_GYM_GREETER 0x30D -#define FLAG_HIDE_MARINE_CAVE_KYOGRE 0x30E -#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_HIDE_ROUTE_119_SCOTT 0x312 -#define FLAG_HIDE_LILCOVE_MOTEL_SCOTT 0x313 -#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_HIDE_LITTLEROOT_TOWN_RIVAL 0x31A -#define FLAG_HIDE_LITTLEROOT_TOWN_BIRCH 0x31B -#define FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1 0x31C -#define FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1 0x31D -#define FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1 0x31E -#define FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3 0x31F -#define FLAG_HIDE_LUGIA 0x320 -#define FLAG_HIDE_HOOH 0x321 -#define FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER 0x322 -#define FLAG_0x323 0x323 -#define FLAG_HIDE_MAUVILLE_CITY_WALLY 0x324 -#define FLAG_HIDE_MAUVILLE_CITY_WALLYS_UNCLE 0x325 -#define FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY 0x326 -#define FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN 0x327 -#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_HIDE_ROUTE_116_DROPPED_GLASSES_MAN 0x32D -#define FLAG_HIDE_RUSBORO_CITY_RIVAL 0x32E -#define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_SWABLU_DOLL 0x32F -#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_HIDE_ROUTE_112_TEAM_MAGMA 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_HIDE_MOSSDEEP_CITY_TEAM_MAGMA 0x337 -#define FLAG_HIDE_PETALBURG_GYM_WALLYS_UNCLE 0x338 -#define FLAG_0x339 0x339 -#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 -#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_HIDE_ROUTE_128_STEVEN 0x342 -#define FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY 0x343 -#define FLAG_HIDE_BATTLE_FRONTIER_RECEPTION_GATE_SCOTT 0x344 -#define FLAG_HIDE_ROUTE_110_BIRCH 0x345 -#define FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CHIKORITA 0x346 -#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 -#define FLAG_HIDE_ROUTE_111_ROCK_SMASH_TIP_GUY 0x34B -#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_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_HIDE_ROUTE_119_RIVAL 0x353 -#define FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS 0x354 -#define FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_1 0x355 -#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_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 -#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_HIDE_PETALBURG_GYM_WALLY 0x362 -#define FLAG_0x363 0x363 -#define FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN 0x364 -#define FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY 0x365 -#define FLAG_HIDE_LANETTES_HOUSE_LANETTE 0x366 -#define FLAG_HIDE_FALLORBOR_POKEMON_CENTER_LANETTE 0x367 -#define FLAG_HIDE_TRICK_HOUSE_ENTRANCE_MAN 0x368 -#define FLAG_HIDE_LILYCOVE_CONTEST_HALL_POKEBLOCK_EXPERT 0x369 -#define FLAG_HIDE_DESERT_UNDERPASS_FOSSIL 0x36A -#define FLAG_HIDE_ROUTE_111_DESERT_RIVAL 0x36B -#define FLAG_HIDE_ROUTE_111_DESERT_FOSSIL 0x36C -#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_HIDE_BRINEYS_HOUSE_PEEKO 0x371 -#define FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA 0x372 -#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_HIDE_ROUTE_119_TEAM_AQUA 0x37A -#define FLAG_HIDE_ROUTE_116_MR_BRINEY 0x37B -#define FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS 0x37C -#define FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS 0x37D -#define FLAG_HIDE_ROUTE_116_TUNNELER 0x37E -#define FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_2 0x37F -#define FLAG_0x380 0x380 -#define FLAG_HIDE_ROUTE_101_BIRCH 0x381 -#define FLAG_HIDE_ROUTE_103_BIRCH 0x382 -#define FLAG_HIDE_TRICK_HOUSE_END_MAN 0x383 -#define FLAG_HIDE_ROUTE_110_TEAM_AQUA 0x384 -#define FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2 0x385 -#define FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2 0x386 -#define FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2 0x387 -#define FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3 0x388 -#define FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS 0x389 -#define FLAG_HIDE_ROUTE_104_WHITE_HERB_FLORIST 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_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 -#define FLAG_0x393 0x393 -#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_HIDE_ROUTE_110_RIVAL_1 0x397 -#define FLAG_HIDE_CHAMPIONS_ROOM_RIVAL 0x398 -#define FLAG_HIDE_CHAMPIONS_ROOM_BIRCH 0x399 -#define FLAG_HIDE_ROUTE_110_RIVAL_2 0x39A -#define FLAG_HIDE_ROUTE_119_RIVAL_ON_BIKE 0x39B -#define FLAG_HIDE_AQUA_HIDEOUT_GRUNTS 0x39C -#define FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS 0x39D -#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_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL 0x3A6 -#define FLAG_HIDE_REGIROCK 0x3A7 -#define FLAG_HIDE_REGICE 0x3A8 -#define FLAG_HIDE_REGISTEEL 0x3A9 -#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_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_HIDE_ROUTE_128_ARCHIE 0x3B0 -#define FLAG_HIDE_ROUTE_128_MAXIE 0x3B1 -#define FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS 0x3B2 -#define FLAG_HIDE_ROUTE_116_DEVON_EMPLOYEE 0x3B3 -#define FLAG_HIDE_SLATEPORT_CITY_TM_SALESMAN 0x3B4 -#define FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE 0x3B5 -#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 -#define FLAG_0x3BB 0x3BB -#define FLAG_0x3BC 0x3BC -#define FLAG_0x3BD 0x3BD -#define FLAG_0x3BE 0x3BE -#define FLAG_0x3BF 0x3BF -#define FLAG_HIDE_ROUTE_111_SECRET_POWER_MAN 0x3C0 -#define FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION 0x3C1 -#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_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_FAMILIAR_AQUA_GRUNT 0x3C5 -#define FLAG_HIDE_ROUTE_118_STEVEN 0x3C6 -#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_HIDE_ROUTE_120_KECLEON_1 0x3CA -#define FLAG_HIDE_LILYCOVE_CITY_RIVAL 0x3CB -#define FLAG_0x3CC 0x3CC -#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_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE 0x3D4 -#define FLAG_HIDE_ROUTE_120_KECLEON_BRIDGE 0x3D5 -#define FLAG_HIDE_ROUTE_120_KECLEON_2 0x3D6 -#define FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN 0x3D7 -#define FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_WOMAN 0x3D8 -#define FLAG_HIDE_ROUTE_120_KECLEON_3 0x3D9 -#define FLAG_HIDE_ROUTE_120_KECLEON_4 0x3DA -#define FLAG_HIDE_ROUTE_120_KECLEON_5 0x3DB -#define FLAG_HIDE_ROUTE_120_KECLEON_6 0x3DC -#define FLAG_HIDE_ROUTE_119_KECLEON_1 0x3DD -#define FLAG_HIDE_ROUTE_119_KECLEON_2 0x3DE -#define FLAG_HIDE_ROUTE_101_BOY 0x3DF -#define FLAG_HIDE_WEATHER_INSTITUTE_2F_AQUA_GRUNT_M 0x3E0 -#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_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_ITEM_ROUTE_102_POTION 0x3E8 -#define FLAG_ITEM_ROUTE_116_X_SPECIAL 0x3E9 -#define FLAG_ITEM_ROUTE_104_PP_UP 0x3EA -#define FLAG_ITEM_ROUTE_105_IRON 0x3EB -#define FLAG_ITEM_ROUTE_106_PROTEIN 0x3EC -#define FLAG_ITEM_ROUTE_109_PP_UP 0x3ED -#define FLAG_ITEM_ROUTE_109_RARE_CANDY 0x3EE -#define FLAG_ITEM_ROUTE_110_DIRE_HIT 0x3EF -#define FLAG_ITEM_ROUTE_111_TM_37 0x3F0 -#define FLAG_ITEM_ROUTE_111_STARDUST 0x3F1 -#define FLAG_ITEM_ROUTE_111_HP_UP 0x3F2 -#define FLAG_ITEM_ROUTE_112_NUGGET 0x3F3 -#define FLAG_ITEM_ROUTE_113_MAX_ETHER 0x3F4 -#define FLAG_ITEM_ROUTE_113_SUPER_REPEL 0x3F5 -#define FLAG_ITEM_ROUTE_114_RARE_CANDY 0x3F6 -#define FLAG_ITEM_ROUTE_114_PROTEIN 0x3F7 -#define FLAG_ITEM_ROUTE_115_SUPER_POTION 0x3F8 -#define FLAG_ITEM_ROUTE_115_TM_01 0x3F9 -#define FLAG_ITEM_ROUTE_115_IRON 0x3FA -#define FLAG_ITEM_ROUTE_116_ETHER 0x3FB -#define FLAG_ITEM_ROUTE_116_REPEL 0x3FC -#define FLAG_ITEM_ROUTE_116_HP_UP 0x3FD -#define FLAG_ITEM_ROUTE_117_GREAT_BALL 0x3FE -#define FLAG_ITEM_ROUTE_117_REVIVE 0x3FF -#define FLAG_ITEM_ROUTE_119_SUPER_REPEL 0x400 -#define FLAG_ITEM_ROUTE_119_ZINC 0x401 -#define FLAG_ITEM_ROUTE_119_ELIXIR_1 0x402 -#define FLAG_ITEM_ROUTE_119_LEAF_STONE 0x403 -#define FLAG_ITEM_ROUTE_119_RARE_CANDY 0x404 -#define FLAG_ITEM_ROUTE_119_HYPER_POTION_1 0x405 -#define FLAG_ITEM_ROUTE_120_NUGGET 0x406 -#define FLAG_ITEM_ROUTE_120_FULL_HEAL 0x407 -#define FLAG_ITEM_ROUTE_123_CALCIUM 0x408 -#define FLAG_0x409 0x409 -#define FLAG_ITEM_ROUTE_127_ZINC 0x40A -#define FLAG_ITEM_ROUTE_127_CARBOS 0x40B -#define FLAG_ITEM_ROUTE_132_RARE_CANDY 0x40C -#define FLAG_ITEM_ROUTE_133_BIG_PEARL 0x40D -#define FLAG_ITEM_ROUTE_133_STAR_PIECE 0x40E -#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_HIDDEN_ITEM_ROUTE_110_POKE_BALL (FLAG_HIDDEN_ITEMS_START + 0x41) +#define FLAG_HIDDEN_ITEM_ROUTE_110_FULL_HEAL (FLAG_HIDDEN_ITEMS_START + 0x37) +#define FLAG_HIDDEN_ITEM_ROUTE_111_STARDUST (FLAG_HIDDEN_ITEMS_START + 0x02) +#define FLAG_HIDDEN_ITEM_ROUTE_111_PROTEIN (FLAG_HIDDEN_ITEMS_START + 0x38) +#define FLAG_HIDDEN_ITEM_ROUTE_111_RARE_CANDY (FLAG_HIDDEN_ITEMS_START + 0x39) +#define FLAG_HIDDEN_ITEM_ROUTE_113_ETHER (FLAG_HIDDEN_ITEMS_START + 0x03) +#define FLAG_HIDDEN_ITEM_ROUTE_113_TM_32 (FLAG_HIDDEN_ITEMS_START + 0x1E) +#define FLAG_HIDDEN_ITEM_ROUTE_113_NUGGET (FLAG_HIDDEN_ITEMS_START + 0x62) +#define FLAG_HIDDEN_ITEM_ROUTE_114_CARBOS (FLAG_HIDDEN_ITEMS_START + 0x04) +#define FLAG_HIDDEN_ITEM_ROUTE_113_REVIVE (FLAG_HIDDEN_ITEMS_START + 0x2A) +#define FLAG_HIDDEN_ITEM_ROUTE_115_HEART_SCALE (FLAG_HIDDEN_ITEMS_START + 0x61) +#define FLAG_HIDDEN_ITEM_ROUTE_116_SUPER_POTION (FLAG_HIDDEN_ITEMS_START + 0x2D) +#define FLAG_HIDDEN_ITEM_ROUTE_116_BLACK_GLASSES (FLAG_HIDDEN_ITEMS_START + 0x60) +#define FLAG_HIDDEN_ITEM_ROUTE_117_REPEL (FLAG_HIDDEN_ITEMS_START + 0x48) +#define FLAG_HIDDEN_ITEM_ROUTE_118_HEART_SCALE (FLAG_HIDDEN_ITEMS_START + 0x42) +#define FLAG_HIDDEN_ITEM_ROUTE_118_IRON (FLAG_HIDDEN_ITEMS_START + 0x43) +#define FLAG_HIDDEN_ITEM_ROUTE_119_CALCIUM (FLAG_HIDDEN_ITEMS_START + 0x05) +#define FLAG_HIDDEN_ITEM_ROUTE_119_ULTRA_BALL (FLAG_HIDDEN_ITEMS_START + 0x06) +#define FLAG_HIDDEN_ITEM_ROUTE_119_FULL_HEAL (FLAG_HIDDEN_ITEMS_START + 0x44) +#define FLAG_HIDDEN_ITEM_ROUTE_119_MAX_ETHER (FLAG_HIDDEN_ITEMS_START + 0x57) +#define FLAG_HIDDEN_ITEM_ROUTE_120_RARE_CANDY_1 (FLAG_HIDDEN_ITEMS_START + 0x47) +#define FLAG_HIDDEN_ITEM_ROUTE_120_REVIVE (FLAG_HIDDEN_ITEMS_START + 0x54) +#define FLAG_HIDDEN_ITEM_ROUTE_120_RARE_CANDY_2 (FLAG_HIDDEN_ITEMS_START + 0x45) +#define FLAG_HIDDEN_ITEM_ROUTE_120_ZINC (FLAG_HIDDEN_ITEMS_START + 0x46) +#define FLAG_HIDDEN_ITEM_ROUTE_121_HP_UP (FLAG_HIDDEN_ITEMS_START + 0x27) +#define FLAG_HIDDEN_ITEM_ROUTE_121_NUGGET (FLAG_HIDDEN_ITEMS_START + 0x28) +#define FLAG_HIDDEN_ITEM_ROUTE_121_FULL_HEAL (FLAG_HIDDEN_ITEMS_START + 0x49) +#define FLAG_HIDDEN_ITEM_ROUTE_121_MAX_REVIVE (FLAG_HIDDEN_ITEMS_START + 0x64) +#define FLAG_HIDDEN_ITEM_ROUTE_123_SUPER_REPEL (FLAG_HIDDEN_ITEMS_START + 0x07) +#define FLAG_HIDDEN_ITEM_ROUTE_123_REVIVE (FLAG_HIDDEN_ITEMS_START + 0x29) +#define FLAG_HIDDEN_ITEM_ROUTE_123_HYPER_POTION (FLAG_HIDDEN_ITEMS_START + 0x4A) +#define FLAG_HIDDEN_ITEM_ROUTE_123_PP_UP (FLAG_HIDDEN_ITEMS_START + 0x63) +#define FLAG_HIDDEN_ITEM_ROUTE_123_RARE_CANDY (FLAG_HIDDEN_ITEMS_START + 0x6E) +#define FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_1 (FLAG_HIDDEN_ITEMS_START + 0x5C) +#define FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_2 (FLAG_HIDDEN_ITEMS_START + 0x5D) +#define FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_3 (FLAG_HIDDEN_ITEMS_START + 0x5E) -#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_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_ITEM_PETALBURG_WOODS_X_ATTACK 0x41F -#define FLAG_ITEM_PETALBURG_WOODS_GREAT_BALL 0x420 -#define FLAG_ITEM_ROUTE_104_POKE_BALL 0x421 -#define FLAG_ITEM_PETALBURG_WOODS_ETHER 0x422 -#define FLAG_ITEM_MAGMA_HIDEOUT_3F_3R_ECAPE_ROPE 0x423 -#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_1_ORANGE_MAIL 0x424 -#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_HARBOR_MAIL 0x425 -#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_WAVE_MAIL 0x426 -#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_SHADOW_MAIL 0x427 -#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_WOOD_MAIL 0x428 -#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_4_MECH_MAIL 0x429 -#define FLAG_ITEM_ROUTE_124_YELLOW_SHARD 0x42A -#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_6_GLITTER_MAIL 0x42B -#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_7_TROPIC_MAIL 0x42C -#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_8_BEAD_MAIL 0x42D -#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_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 +// Event Flags +#define FLAG_HIDE_ROUTE_101_BIRCH_STARTERS_BAG 0x2BC +#define FLAG_HIDE_APPRENTICE 0x2BD +#define FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN 0x2BE +#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 +#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_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS 0x2CD +#define FLAG_HIDE_MEW 0x2CE +#define FLAG_HIDE_ROUTE_104_RIVAL 0x2CF +#define FLAG_HIDE_ROUTE_101_BIRCH_ZIGZAGOON_BATTLE 0x2D0 +#define FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH 0x2D1 +#define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM 0x2D2 +#define FLAG_HIDE_ROUTE_103_RIVAL 0x2D3 +#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_UNUSED_0x2D9 0x2D9 +#define FLAG_HIDE_LILYCOVE_FAN_CLUB_INTERVIEWER 0x2DA +#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_HIDE_ROUTE_104_MR_BRINEY 0x2E2 +#define FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY 0x2E3 +#define FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN 0x2E4 +#define FLAG_HIDE_ROUTE_108_MR_BRINEY 0x2E5 +#define FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT 0x2E6 +#define FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN 0x2E7 +#define FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT 0x2E8 +#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_HIDE_SLATEPORT_CITY_SCOTT 0x2ED +#define FLAG_HIDE_ROUTE_101_ZIGZAGOON 0x2EE +#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 +#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_HIDE_MAUVILLE_CITY_SCOTT 0x2FD +#define FLAG_HIDE_VERDANTURF_TOWN_SCOTT 0x2FE +#define FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT 0x2FF +#define FLAG_HIDE_ROUTE_111_VICTOR_WINSTRATE 0x300 +#define FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE 0x301 +#define FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE 0x302 +#define FLAG_HIDE_ROUTE_111_VICKY_WINSTRATE 0x303 +#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 +#define FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_2 0x309 +#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_HIDE_PETALBURG_GYM_GREETER 0x30D +#define FLAG_HIDE_MARINE_CAVE_KYOGRE 0x30E +#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_HIDE_ROUTE_119_SCOTT 0x312 +#define FLAG_HIDE_LILCOVE_MOTEL_SCOTT 0x313 +#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_HIDE_LITTLEROOT_TOWN_RIVAL 0x31A +#define FLAG_HIDE_LITTLEROOT_TOWN_BIRCH 0x31B +#define FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1 0x31C +#define FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1 0x31D +#define FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1 0x31E +#define FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3 0x31F +#define FLAG_HIDE_LUGIA 0x320 +#define FLAG_HIDE_HOOH 0x321 +#define FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER 0x322 +#define FLAG_HIDE_SLATEPORT_CITY_CONTEST_REPORTER 0x323 +#define FLAG_HIDE_MAUVILLE_CITY_WALLY 0x324 +#define FLAG_HIDE_MAUVILLE_CITY_WALLYS_UNCLE 0x325 +#define FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY 0x326 +#define FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN 0x327 +#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_HIDE_ROUTE_116_DROPPED_GLASSES_MAN 0x32D +#define FLAG_HIDE_RUSBORO_CITY_RIVAL 0x32E +#define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_SWABLU_DOLL 0x32F +#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_HIDE_ROUTE_112_TEAM_MAGMA 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_HIDE_MOSSDEEP_CITY_TEAM_MAGMA 0x337 +#define FLAG_HIDE_PETALBURG_GYM_WALLYS_UNCLE 0x338 +#define FLAG_UNUSED_0x339 0x339 +#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 +#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_HIDE_ROUTE_128_STEVEN 0x342 +#define FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY 0x343 +#define FLAG_HIDE_BATTLE_FRONTIER_RECEPTION_GATE_SCOTT 0x344 +#define FLAG_HIDE_ROUTE_110_BIRCH 0x345 +#define FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CHIKORITA 0x346 +#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_HIDE_BATTLE_FRONTIER_SUDOWOODO 0x34A +#define FLAG_HIDE_ROUTE_111_ROCK_SMASH_TIP_GUY 0x34B +#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_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_HIDE_ROUTE_119_RIVAL 0x353 +#define FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS 0x354 +#define FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_1 0x355 +#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_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 +#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_HIDE_PETALBURG_GYM_WALLY 0x362 +#define FLAG_UNKNOWN_0x363 0x363 +#define FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN 0x364 +#define FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY 0x365 +#define FLAG_HIDE_LANETTES_HOUSE_LANETTE 0x366 +#define FLAG_HIDE_FALLORBOR_POKEMON_CENTER_LANETTE 0x367 +#define FLAG_HIDE_TRICK_HOUSE_ENTRANCE_MAN 0x368 +#define FLAG_HIDE_LILYCOVE_CONTEST_HALL_POKEBLOCK_EXPERT 0x369 +#define FLAG_HIDE_DESERT_UNDERPASS_FOSSIL 0x36A +#define FLAG_HIDE_ROUTE_111_DESERT_RIVAL 0x36B +#define FLAG_HIDE_ROUTE_111_DESERT_FOSSIL 0x36C +#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_HIDE_BRINEYS_HOUSE_PEEKO 0x371 +#define FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA 0x372 +#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_HIDE_ROUTE_119_TEAM_AQUA 0x37A +#define FLAG_HIDE_ROUTE_116_MR_BRINEY 0x37B +#define FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS 0x37C +#define FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS 0x37D +#define FLAG_HIDE_ROUTE_116_TUNNELER 0x37E +#define FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_2 0x37F +#define FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380 0x380 +#define FLAG_HIDE_ROUTE_101_BIRCH 0x381 +#define FLAG_HIDE_ROUTE_103_BIRCH 0x382 +#define FLAG_HIDE_TRICK_HOUSE_END_MAN 0x383 +#define FLAG_HIDE_ROUTE_110_TEAM_AQUA 0x384 +#define FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2 0x385 +#define FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2 0x386 +#define FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2 0x387 +#define FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3 0x388 +#define FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS 0x389 +#define FLAG_HIDE_ROUTE_104_WHITE_HERB_FLORIST 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_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 +#define FLAG_0x393 0x393 +#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_HIDE_ROUTE_110_RIVAL_1 0x397 +#define FLAG_HIDE_CHAMPIONS_ROOM_RIVAL 0x398 +#define FLAG_HIDE_CHAMPIONS_ROOM_BIRCH 0x399 +#define FLAG_HIDE_ROUTE_110_RIVAL_2 0x39A +#define FLAG_HIDE_ROUTE_119_RIVAL_ON_BIKE 0x39B +#define FLAG_HIDE_AQUA_HIDEOUT_GRUNTS 0x39C +#define FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS 0x39D +#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_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL 0x3A6 +#define FLAG_HIDE_REGIROCK 0x3A7 +#define FLAG_HIDE_REGICE 0x3A8 +#define FLAG_HIDE_REGISTEEL 0x3A9 +#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_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_HIDE_ROUTE_128_ARCHIE 0x3B0 +#define FLAG_HIDE_ROUTE_128_MAXIE 0x3B1 +#define FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS 0x3B2 +#define FLAG_HIDE_ROUTE_116_DEVON_EMPLOYEE 0x3B3 +#define FLAG_HIDE_SLATEPORT_CITY_TM_SALESMAN 0x3B4 +#define FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE 0x3B5 +#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 +#define FLAG_0x3BB 0x3BB +#define FLAG_0x3BC 0x3BC +#define FLAG_0x3BD 0x3BD +#define FLAG_0x3BE 0x3BE +#define FLAG_0x3BF 0x3BF +#define FLAG_HIDE_ROUTE_111_SECRET_POWER_MAN 0x3C0 +#define FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION 0x3C1 +#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_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_FAMILIAR_AQUA_GRUNT 0x3C5 +#define FLAG_HIDE_ROUTE_118_STEVEN 0x3C6 +#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_HIDE_ROUTE_120_KECLEON_1 0x3CA +#define FLAG_HIDE_LILYCOVE_CITY_RIVAL 0x3CB +#define FLAG_0x3CC 0x3CC +#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_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE 0x3D4 +#define FLAG_HIDE_ROUTE_120_KECLEON_BRIDGE 0x3D5 +#define FLAG_HIDE_ROUTE_120_KECLEON_2 0x3D6 +#define FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN 0x3D7 +#define FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_WOMAN 0x3D8 +#define FLAG_HIDE_ROUTE_120_KECLEON_3 0x3D9 +#define FLAG_HIDE_ROUTE_120_KECLEON_4 0x3DA +#define FLAG_HIDE_ROUTE_120_KECLEON_5 0x3DB +#define FLAG_HIDE_ROUTE_120_KECLEON_6 0x3DC +#define FLAG_HIDE_ROUTE_119_KECLEON_1 0x3DD +#define FLAG_HIDE_ROUTE_119_KECLEON_2 0x3DE +#define FLAG_HIDE_ROUTE_101_BOY 0x3DF +#define FLAG_HIDE_WEATHER_INSTITUTE_2F_AQUA_GRUNT_M 0x3E0 +#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_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 + +// Item Ball Flags +#define FLAG_ITEM_ROUTE_102_POTION 0x3E8 +#define FLAG_ITEM_ROUTE_116_X_SPECIAL 0x3E9 +#define FLAG_ITEM_ROUTE_104_PP_UP 0x3EA +#define FLAG_ITEM_ROUTE_105_IRON 0x3EB +#define FLAG_ITEM_ROUTE_106_PROTEIN 0x3EC +#define FLAG_ITEM_ROUTE_109_PP_UP 0x3ED +#define FLAG_ITEM_ROUTE_109_RARE_CANDY 0x3EE +#define FLAG_ITEM_ROUTE_110_DIRE_HIT 0x3EF +#define FLAG_ITEM_ROUTE_111_TM_37 0x3F0 +#define FLAG_ITEM_ROUTE_111_STARDUST 0x3F1 +#define FLAG_ITEM_ROUTE_111_HP_UP 0x3F2 +#define FLAG_ITEM_ROUTE_112_NUGGET 0x3F3 +#define FLAG_ITEM_ROUTE_113_MAX_ETHER 0x3F4 +#define FLAG_ITEM_ROUTE_113_SUPER_REPEL 0x3F5 +#define FLAG_ITEM_ROUTE_114_RARE_CANDY 0x3F6 +#define FLAG_ITEM_ROUTE_114_PROTEIN 0x3F7 +#define FLAG_ITEM_ROUTE_115_SUPER_POTION 0x3F8 +#define FLAG_ITEM_ROUTE_115_TM_01 0x3F9 +#define FLAG_ITEM_ROUTE_115_IRON 0x3FA +#define FLAG_ITEM_ROUTE_116_ETHER 0x3FB +#define FLAG_ITEM_ROUTE_116_REPEL 0x3FC +#define FLAG_ITEM_ROUTE_116_HP_UP 0x3FD +#define FLAG_ITEM_ROUTE_117_GREAT_BALL 0x3FE +#define FLAG_ITEM_ROUTE_117_REVIVE 0x3FF +#define FLAG_ITEM_ROUTE_119_SUPER_REPEL 0x400 +#define FLAG_ITEM_ROUTE_119_ZINC 0x401 +#define FLAG_ITEM_ROUTE_119_ELIXIR_1 0x402 +#define FLAG_ITEM_ROUTE_119_LEAF_STONE 0x403 +#define FLAG_ITEM_ROUTE_119_RARE_CANDY 0x404 +#define FLAG_ITEM_ROUTE_119_HYPER_POTION_1 0x405 +#define FLAG_ITEM_ROUTE_120_NUGGET 0x406 +#define FLAG_ITEM_ROUTE_120_FULL_HEAL 0x407 +#define FLAG_ITEM_ROUTE_123_CALCIUM 0x408 +#define FLAG_UNUSED_0x409 0x409 +#define FLAG_ITEM_ROUTE_127_ZINC 0x40A +#define FLAG_ITEM_ROUTE_127_CARBOS 0x40B +#define FLAG_ITEM_ROUTE_132_RARE_CANDY 0x40C +#define FLAG_ITEM_ROUTE_133_BIG_PEARL 0x40D +#define FLAG_ITEM_ROUTE_133_STAR_PIECE 0x40E +#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_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_ITEM_PETALBURG_WOODS_X_ATTACK 0x41F +#define FLAG_ITEM_PETALBURG_WOODS_GREAT_BALL 0x420 +#define FLAG_ITEM_ROUTE_104_POKE_BALL 0x421 +#define FLAG_ITEM_PETALBURG_WOODS_ETHER 0x422 +#define FLAG_ITEM_MAGMA_HIDEOUT_3F_3R_ECAPE_ROPE 0x423 +#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_1_ORANGE_MAIL 0x424 +#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_HARBOR_MAIL 0x425 +#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_WAVE_MAIL 0x426 +#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_SHADOW_MAIL 0x427 +#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_WOOD_MAIL 0x428 +#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_4_MECH_MAIL 0x429 +#define FLAG_ITEM_ROUTE_124_YELLOW_SHARD 0x42A +#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_6_GLITTER_MAIL 0x42B +#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_7_TROPIC_MAIL 0x42C +#define FLAG_ITEM_TRICK_HOUSE_PUZZLE_8_BEAD_MAIL 0x42D +#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_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_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_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 +#define FLAG_ITEM_ROUTE_124_RED_SHARD 0x444 +#define FLAG_ITEM_ROUTE_124_BLUE_SHARD 0x445 +#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 +#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_TM_13 0x44A +#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_REVIVE 0x44B +#define FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_STORAGE_KEY 0x44C +#define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_3_WATER_STONE 0x44D +#define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM_18 0x44E +#define FLAG_ITEM_ROUTE_121_CARBOS 0x44F +#define FLAG_ITEM_ROUTE_123_ULTRA_BALL 0x450 +#define FLAG_ITEM_ROUTE_126_GREEN_SHARD 0x451 +#define FLAG_ITEM_ROUTE_119_HYPER_POTION_2 0x452 +#define FLAG_ITEM_ROUTE_120_HYPER_POTION 0x453 +#define FLAG_ITEM_ROUTE_120_NEST_BALL 0x454 +#define FLAG_ITEM_ROUTE_123_ELIXIR 0x455 +#define FLAG_ITEM_NEW_MAUVILLE_THUNDER_STONE 0x456 +#define FLAG_ITEM_FIERY_PATH_FIRE_STONE 0x457 +#define FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_TM_07 0x458 +#define FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_NEVER_MELT_ICE 0x459 +#define FLAG_ITEM_ROUTE_103_GUARD_SPEC 0x45A +#define FLAG_ITEM_ROUTE_104_X_ACCURACY 0x45B +#define FLAG_ITEM_MAUVILLE_CITY_X_SPEED 0x45C +#define FLAG_ITEM_PETALBURD_WOODS_PARALYZE_HEAL 0x45D +#define FLAG_ITEM_ROUTE_115_GREAT_BALL 0x45E +#define FLAG_ITEM_SAFARI_ZONE_NORTH_CALCIUM 0x45F +#define FLAG_ITEM_MT_PYRE_3F_SUPER_REPEL 0x460 +#define FLAG_ITEM_ROUTE_118_HYPER_POTION 0x461 +#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_UNUSED_0x465 0x465 +#define FLAG_UNUSED_0x466 0x466 +#define FLAG_UNUSED_0x467 0x467 +#define FLAG_UNUSED_0x468 0x468 +#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_UNUSED_0x46D 0x46D +#define FLAG_ITEM_ROUTE_119_NUGGET 0x46E +#define FLAG_ITEM_ROUTE_104_POTION 0x46F +#define FLAG_UNUSED_0x470 0x470 +#define FLAG_ITEM_ROUTE_103_PP_UP 0x471 +#define FLAG_UNUSED_0x472 0x472 +#define FLAG_ITEM_ROUTE_108_STAR_PIECE 0x473 +#define FLAG_0x474 0x474 +#define FLAG_ITEM_ROUTE_110_ELIXIR 0x475 +#define FLAG_ITEM_ROUTE_111_ELIXIR 0x476 +#define FLAG_ITEM_ROUTE_113_HYPER_POTION 0x477 +#define FLAG_ITEM_ROUTE_115_HEAL_POWDER 0x478 +#define FLAG_UNUSED_0x479 0x479 +#define FLAG_ITEM_ROUTE_116_POTION 0x47A +#define FLAG_ITEM_ROUTE_119_ELIXIR_2 0x47B +#define FLAG_ITEM_ROUTE_120_REVIVE 0x47C +#define FLAG_ITEM_ROUTE_121_REVIVE 0x47D +#define FLAG_ITEM_ROUTE_121_ZINC 0x47E +#define FLAG_ITEM_MAGMA_HIDEOUT_1F_RARE_CANDY 0x47F +#define FLAG_ITEM_ROUTE_123_PP_UP 0x480 +#define FLAG_ITEM_ROUTE_123_REVIVAL_HERB 0x481 +#define FLAG_ITEM_ROUTE_125_BIG_PEARL 0x482 +#define FLAG_ITEM_ROUTE_127_RARE_CANDY 0x483 +#define FLAG_ITEM_ROUTE_132_PROTEIN 0x484 +#define FLAG_ITEM_ROUTE_133_MAX_REVIVE 0x485 +#define FLAG_ITEM_ROUTE_134_CARBOS 0x486 +#define FLAG_ITEM_ROUTE_134_STAR_PIECE 0x487 +#define FLAG_ITEM_ROUTE_114_ENERGY_POWDER 0x488 +#define FLAG_ITEM_ROUTE_115_PP_UP 0x489 +#define FLAG_ITEM_ARTISAN_CAVE_B1F_HP_UP 0x48A +#define FLAG_ITEM_ARTISAN_CAVE_1F_CARBOS 0x48B +#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_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_6_LUXURY_BALL 0x435 -#define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER 0x436 -#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_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 -#define FLAG_ITEM_ROUTE_124_RED_SHARD 0x444 -#define FLAG_ITEM_ROUTE_124_BLUE_SHARD 0x445 -#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 -#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_TM_13 0x44A -#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_REVIVE 0x44B -#define FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_STORAGE_KEY 0x44C -#define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_3_WATER_STONE 0x44D -#define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM_18 0x44E -#define FLAG_ITEM_ROUTE_121_CARBOS 0x44F -#define FLAG_ITEM_ROUTE_123_ULTRA_BALL 0x450 -#define FLAG_ITEM_ROUTE_126_GREEN_SHARD 0x451 -#define FLAG_ITEM_ROUTE_119_HYPER_POTION_2 0x452 -#define FLAG_ITEM_ROUTE_120_HYPER_POTION 0x453 -#define FLAG_ITEM_ROUTE_120_NEST_BALL 0x454 -#define FLAG_ITEM_ROUTE_123_ELIXIR 0x455 -#define FLAG_ITEM_NEW_MAUVILLE_THUNDER_STONE 0x456 -#define FLAG_ITEM_FIERY_PATH_FIRE_STONE 0x457 -#define FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_TM_07 0x458 -#define FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_NEVER_MELT_ICE 0x459 -#define FLAG_ITEM_ROUTE_103_GUARD_SPEC 0x45A -#define FLAG_ITEM_ROUTE_104_X_ACCURACY 0x45B -#define FLAG_ITEM_MAUVILLE_CITY_X_SPEED 0x45C -#define FLAG_ITEM_PETALBURD_WOODS_PARALYZE_HEAL 0x45D -#define FLAG_ITEM_ROUTE_115_GREAT_BALL 0x45E -#define FLAG_ITEM_SAFARI_ZONE_NORTH_CALCIUM 0x45F -#define FLAG_ITEM_MT_PYRE_3F_SUPER_REPEL 0x460 -#define FLAG_ITEM_ROUTE_118_HYPER_POTION 0x461 -#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_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_ITEM_ROUTE_119_NUGGET 0x46E -#define FLAG_ITEM_ROUTE_104_POTION 0x46F -#define FLAG_0x470 0x470 -#define FLAG_ITEM_ROUTE_103_PP_UP 0x471 -#define FLAG_0x472 0x472 -#define FLAG_ITEM_ROUTE_108_STAR_PIECE 0x473 -#define FLAG_0x474 0x474 -#define FLAG_ITEM_ROUTE_110_ELIXIR 0x475 -#define FLAG_ITEM_ROUTE_111_ELIXIR 0x476 -#define FLAG_ITEM_ROUTE_113_HYPER_POTION 0x477 -#define FLAG_ITEM_ROUTE_115_HEAL_POWDER 0x478 -#define FLAG_0x479 0x479 -#define FLAG_ITEM_ROUTE_116_POTION 0x47A -#define FLAG_ITEM_ROUTE_119_ELIXIR_2 0x47B -#define FLAG_ITEM_ROUTE_120_REVIVE 0x47C -#define FLAG_ITEM_ROUTE_121_REVIVE 0x47D -#define FLAG_ITEM_ROUTE_121_ZINC 0x47E -#define FLAG_ITEM_MAGMA_HIDEOUT_1F_RARE_CANDY 0x47F -#define FLAG_ITEM_ROUTE_123_PP_UP 0x480 -#define FLAG_ITEM_ROUTE_123_REVIVAL_HERB 0x481 -#define FLAG_ITEM_ROUTE_125_BIG_PEARL 0x482 -#define FLAG_ITEM_ROUTE_127_RARE_CANDY 0x483 -#define FLAG_ITEM_ROUTE_132_PROTEIN 0x484 -#define FLAG_ITEM_ROUTE_133_MAX_REVIVE 0x485 -#define FLAG_ITEM_ROUTE_134_CARBOS 0x486 -#define FLAG_ITEM_ROUTE_134_STAR_PIECE 0x487 -#define FLAG_ITEM_ROUTE_114_ENERGY_POWDER 0x488 -#define FLAG_ITEM_ROUTE_115_PP_UP 0x489 -#define FLAG_ITEM_ARTISAN_CAVE_B1F_HP_UP 0x48A -#define FLAG_ITEM_ARTISAN_CAVE_1F_CARBOS 0x48B -#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 diff --git a/src/field_specials.c b/src/field_specials.c index 37cc8fac5..a74bf40f6 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -1508,7 +1508,7 @@ static void sub_8139620(u8 taskId) bool8 FoundBlackGlasses(void) { - return FlagGet(FLAG_HIDDEN_ITEM_BLACK_GLASSES); + return FlagGet(FLAG_HIDDEN_ITEM_ROUTE_116_BLACK_GLASSES); } void SetRoute119Weather(void) |