From 2b2bf84502ed0100b305f8514813f710b9eded8c Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 25 Oct 2022 14:45:53 -0400 Subject: [PATCH] Use actual flag values for hidden items --- asm/macros/map.inc | 2 +- data/maps/CeladonCity/map.json | 2 +- data/maps/CeladonCity_GameCorner/map.json | 24 +- data/maps/CeruleanCave_1F/map.json | 2 +- data/maps/CeruleanCity/map.json | 2 +- data/maps/FiveIsland_MemorialPillar/map.json | 8 +- data/maps/FiveIsland_ResortGorgeous/map.json | 8 +- data/maps/FiveIsland_RocketWarehouse/map.json | 4 +- data/maps/FourIsland/map.json | 4 +- data/maps/FuchsiaCity/map.json | 2 +- data/maps/MtEmber_Exterior/map.json | 4 +- data/maps/MtMoon_B1F/map.json | 12 +- data/maps/MtMoon_B2F/map.json | 4 +- data/maps/NavelRock_Summit/map.json | 2 +- data/maps/OneIsland_TreasureBeach/map.json | 16 +- data/maps/PewterCity/map.json | 2 +- data/maps/PokemonMansion_1F/map.json | 2 +- data/maps/PokemonMansion_3F/map.json | 2 +- data/maps/PokemonMansion_B1F/map.json | 2 +- data/maps/PokemonTower_5F/map.json | 2 +- data/maps/PokemonTower_7F/map.json | 2 +- data/maps/PowerPlant/map.json | 4 +- data/maps/RocketHideout_B1F/map.json | 2 +- data/maps/RocketHideout_B3F/map.json | 2 +- data/maps/RocketHideout_B4F/map.json | 4 +- data/maps/Route10/map.json | 10 +- data/maps/Route11/map.json | 2 +- data/maps/Route12/map.json | 6 +- data/maps/Route13/map.json | 2 +- data/maps/Route14/map.json | 4 +- data/maps/Route16/map.json | 2 +- data/maps/Route17/map.json | 10 +- data/maps/Route20/map.json | 2 +- data/maps/Route21_North/map.json | 2 +- data/maps/Route23/map.json | 16 +- data/maps/Route24/map.json | 2 +- data/maps/Route25/map.json | 8 +- data/maps/Route3/map.json | 2 +- data/maps/Route4/map.json | 6 +- data/maps/Route6/map.json | 4 +- data/maps/Route7/map.json | 2 +- data/maps/Route8/map.json | 6 +- data/maps/Route9/map.json | 6 +- data/maps/SSAnne_B1F_Corridor/map.json | 2 +- data/maps/SSAnne_Exterior/map.json | 2 +- data/maps/SSAnne_Kitchen/map.json | 6 +- data/maps/SafariZone_Center/map.json | 2 +- data/maps/SafariZone_West/map.json | 2 +- .../SaffronCity_CopycatsHouse_2F/map.json | 2 +- data/maps/SeafoamIslands_B3F/map.json | 2 +- data/maps/SeafoamIslands_B4F/map.json | 2 +- data/maps/SevenIsland_SevaultCanyon/map.json | 2 +- .../map.json | 2 +- data/maps/SevenIsland_TanobyRuins/map.json | 8 +- data/maps/SevenIsland_TrainerTower/map.json | 6 +- data/maps/SilphCo_10F/map.json | 2 +- data/maps/SilphCo_11F/map.json | 2 +- data/maps/SilphCo_2F/map.json | 2 +- data/maps/SilphCo_3F/map.json | 2 +- data/maps/SilphCo_4F/map.json | 2 +- data/maps/SilphCo_5F/map.json | 4 +- data/maps/SilphCo_6F/map.json | 2 +- data/maps/SilphCo_7F/map.json | 2 +- data/maps/SilphCo_8F/map.json | 2 +- data/maps/SilphCo_9F/map.json | 4 +- data/maps/SixIsland/map.json | 2 +- data/maps/SixIsland_GreenPath/map.json | 2 +- data/maps/SixIsland_OutcastIsland/map.json | 4 +- data/maps/SixIsland_WaterPath/map.json | 6 +- data/maps/ThreeIsland/map.json | 2 +- data/maps/ThreeIsland_BerryForest/map.json | 26 +- data/maps/ThreeIsland_BondBridge/map.json | 6 +- .../maps/ThreeIsland_DunsparceTunnel/map.json | 2 +- data/maps/TwoIsland_CapeBrink/map.json | 4 +- .../UndergroundPath_EastWestTunnel/map.json | 14 +- .../UndergroundPath_NorthSouthTunnel/map.json | 14 +- data/maps/VermilionCity/map.json | 2 +- data/maps/VictoryRoad_1F/map.json | 4 +- data/maps/ViridianCity_Gym/map.json | 2 +- data/maps/ViridianForest/map.json | 4 +- include/constants/flags.h | 403 +++++----- src/renewable_hidden_items.c | 752 +++++++++--------- 82 files changed, 764 insertions(+), 759 deletions(-) diff --git a/asm/macros/map.inc b/asm/macros/map.inc index 2057a7362..ceaa383b4 100644 --- a/asm/macros/map.inc +++ b/asm/macros/map.inc @@ -101,7 +101,7 @@ @ Defines a background hidden item event for map data .macro bg_hidden_item_event x:req, y:req, elevation:req, item:req, flag:req, quantity:req, underfoot:req - bg_event \x, \y, \elevation, BG_EVENT_HIDDEN_ITEM, \item, \flag, \quantity | (\underfoot << 7) + bg_event \x, \y, \elevation, BG_EVENT_HIDDEN_ITEM, \item, ((\flag) - FLAG_HIDDEN_ITEMS_START), \quantity | (\underfoot << 7) .endm @ Defines a background secret base event for map data. diff --git a/data/maps/CeladonCity/map.json b/data/maps/CeladonCity/map.json index a6a2a5935..ec34003c3 100644 --- a/data/maps/CeladonCity/map.json +++ b/data/maps/CeladonCity/map.json @@ -396,7 +396,7 @@ "y": 20, "elevation": 3, "item": "ITEM_PP_UP", - "flag": "HIDDEN_ITEM_CELADON_CITY_PP_UP", + "flag": "FLAG_HIDDEN_ITEM_CELADON_CITY_PP_UP", "quantity": 1, "underfoot": false } diff --git a/data/maps/CeladonCity_GameCorner/map.json b/data/maps/CeladonCity_GameCorner/map.json index f17531201..51809f37c 100644 --- a/data/maps/CeladonCity_GameCorner/map.json +++ b/data/maps/CeladonCity_GameCorner/map.json @@ -208,7 +208,7 @@ "y": 4, "elevation": 3, "item": "ITEM_NONE", - "flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS", + "flag": "FLAG_HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS", "quantity": 10, "underfoot": false }, @@ -218,7 +218,7 @@ "y": 8, "elevation": 3, "item": "ITEM_NONE", - "flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_2", + "flag": "FLAG_HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_2", "quantity": 10, "underfoot": false }, @@ -228,7 +228,7 @@ "y": 11, "elevation": 3, "item": "ITEM_NONE", - "flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_3", + "flag": "FLAG_HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_3", "quantity": 20, "underfoot": false }, @@ -238,7 +238,7 @@ "y": 12, "elevation": 3, "item": "ITEM_NONE", - "flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_4", + "flag": "FLAG_HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_4", "quantity": 10, "underfoot": false }, @@ -248,7 +248,7 @@ "y": 9, "elevation": 3, "item": "ITEM_NONE", - "flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_5", + "flag": "FLAG_HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_5", "quantity": 10, "underfoot": false }, @@ -258,7 +258,7 @@ "y": 5, "elevation": 3, "item": "ITEM_NONE", - "flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_6", + "flag": "FLAG_HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_6", "quantity": 20, "underfoot": false }, @@ -268,7 +268,7 @@ "y": 4, "elevation": 3, "item": "ITEM_NONE", - "flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_7", + "flag": "FLAG_HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_7", "quantity": 10, "underfoot": false }, @@ -278,7 +278,7 @@ "y": 3, "elevation": 3, "item": "ITEM_NONE", - "flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_8", + "flag": "FLAG_HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_8", "quantity": 10, "underfoot": false }, @@ -288,7 +288,7 @@ "y": 5, "elevation": 3, "item": "ITEM_NONE", - "flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_9", + "flag": "FLAG_HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_9", "quantity": 10, "underfoot": false }, @@ -298,7 +298,7 @@ "y": 5, "elevation": 3, "item": "ITEM_NONE", - "flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_10", + "flag": "FLAG_HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_10", "quantity": 40, "underfoot": false }, @@ -308,7 +308,7 @@ "y": 13, "elevation": 3, "item": "ITEM_NONE", - "flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_11", + "flag": "FLAG_HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_11", "quantity": 100, "underfoot": false }, @@ -318,7 +318,7 @@ "y": 12, "elevation": 3, "item": "ITEM_NONE", - "flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_12", + "flag": "FLAG_HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_12", "quantity": 10, "underfoot": false }, diff --git a/data/maps/CeruleanCave_1F/map.json b/data/maps/CeruleanCave_1F/map.json index de5b0a516..2ac897d93 100644 --- a/data/maps/CeruleanCave_1F/map.json +++ b/data/maps/CeruleanCave_1F/map.json @@ -208,7 +208,7 @@ "y": 2, "elevation": 3, "item": "ITEM_ULTRA_BALL", - "flag": "HIDDEN_ITEM_CERULEAN_CAVE_1F_ULTRA_BALL", + "flag": "FLAG_HIDDEN_ITEM_CERULEAN_CAVE_1F_ULTRA_BALL", "quantity": 1, "underfoot": false } diff --git a/data/maps/CeruleanCity/map.json b/data/maps/CeruleanCity/map.json index 836696f94..5e534008d 100644 --- a/data/maps/CeruleanCity/map.json +++ b/data/maps/CeruleanCity/map.json @@ -385,7 +385,7 @@ "y": 7, "elevation": 3, "item": "ITEM_RARE_CANDY", - "flag": "HIDDEN_ITEM_CERULEAN_CITY_RARE_CANDY", + "flag": "FLAG_HIDDEN_ITEM_CERULEAN_CITY_RARE_CANDY", "quantity": 1, "underfoot": false }, diff --git a/data/maps/FiveIsland_MemorialPillar/map.json b/data/maps/FiveIsland_MemorialPillar/map.json index 184aec2ca..73c15634a 100644 --- a/data/maps/FiveIsland_MemorialPillar/map.json +++ b/data/maps/FiveIsland_MemorialPillar/map.json @@ -109,7 +109,7 @@ "y": 52, "elevation": 3, "item": "ITEM_BIG_PEARL", - "flag": "HIDDEN_ITEM_FIVE_ISLAND_MEMORIAL_PILLAR_BIG_PEARL", + "flag": "FLAG_HIDDEN_ITEM_FIVE_ISLAND_MEMORIAL_PILLAR_BIG_PEARL", "quantity": 1, "underfoot": false }, @@ -119,7 +119,7 @@ "y": 7, "elevation": 3, "item": "ITEM_RAZZ_BERRY", - "flag": "HIDDEN_ITEM_FIVE_ISLAND_MEMORIAL_PILLAR_RAZZ_BERRY", + "flag": "FLAG_HIDDEN_ITEM_FIVE_ISLAND_MEMORIAL_PILLAR_RAZZ_BERRY", "quantity": 1, "underfoot": false }, @@ -129,7 +129,7 @@ "y": 22, "elevation": 3, "item": "ITEM_SITRUS_BERRY", - "flag": "HIDDEN_ITEM_FIVE_ISLAND_MEMORIAL_PILLAR_SITRUS_BERRY", + "flag": "FLAG_HIDDEN_ITEM_FIVE_ISLAND_MEMORIAL_PILLAR_SITRUS_BERRY", "quantity": 1, "underfoot": false }, @@ -139,7 +139,7 @@ "y": 25, "elevation": 3, "item": "ITEM_BLUK_BERRY", - "flag": "HIDDEN_ITEM_FIVE_ISLAND_MEMORIAL_PILLAR_BLUK_BERRY", + "flag": "FLAG_HIDDEN_ITEM_FIVE_ISLAND_MEMORIAL_PILLAR_BLUK_BERRY", "quantity": 1, "underfoot": false } diff --git a/data/maps/FiveIsland_ResortGorgeous/map.json b/data/maps/FiveIsland_ResortGorgeous/map.json index a23843293..80ddcafab 100644 --- a/data/maps/FiveIsland_ResortGorgeous/map.json +++ b/data/maps/FiveIsland_ResortGorgeous/map.json @@ -158,7 +158,7 @@ "y": 7, "elevation": 3, "item": "ITEM_NEST_BALL", - "flag": "HIDDEN_ITEM_FIVE_ISLAND_RESORT_GORGEOUS_NEST_BALL", + "flag": "FLAG_HIDDEN_ITEM_FIVE_ISLAND_RESORT_GORGEOUS_NEST_BALL", "quantity": 1, "underfoot": false }, @@ -168,7 +168,7 @@ "y": 11, "elevation": 3, "item": "ITEM_STARDUST", - "flag": "HIDDEN_ITEM_FIVE_ISLAND_RESORT_GORGEOUS_STARDUST", + "flag": "FLAG_HIDDEN_ITEM_FIVE_ISLAND_RESORT_GORGEOUS_STARDUST", "quantity": 1, "underfoot": false }, @@ -178,7 +178,7 @@ "y": 12, "elevation": 3, "item": "ITEM_STAR_PIECE", - "flag": "HIDDEN_ITEM_FIVE_ISLAND_RESORT_GORGEOUS_STAR_PIECE", + "flag": "FLAG_HIDDEN_ITEM_FIVE_ISLAND_RESORT_GORGEOUS_STAR_PIECE", "quantity": 1, "underfoot": false }, @@ -188,7 +188,7 @@ "y": 5, "elevation": 3, "item": "ITEM_STARDUST", - "flag": "HIDDEN_ITEM_FIVE_ISLAND_RESORT_GORGEOUS_STARDUST_2", + "flag": "FLAG_HIDDEN_ITEM_FIVE_ISLAND_RESORT_GORGEOUS_STARDUST_2", "quantity": 1, "underfoot": false }, diff --git a/data/maps/FiveIsland_RocketWarehouse/map.json b/data/maps/FiveIsland_RocketWarehouse/map.json index 81c2fc436..63a27af82 100644 --- a/data/maps/FiveIsland_RocketWarehouse/map.json +++ b/data/maps/FiveIsland_RocketWarehouse/map.json @@ -217,7 +217,7 @@ "y": 2, "elevation": 0, "item": "ITEM_NEST_BALL", - "flag": "HIDDEN_ITEM_FIVE_ISLAND_ROCKET_WAREHOUSE_NEST_BALL", + "flag": "FLAG_HIDDEN_ITEM_FIVE_ISLAND_ROCKET_WAREHOUSE_NEST_BALL", "quantity": 1, "underfoot": false }, @@ -227,7 +227,7 @@ "y": 16, "elevation": 0, "item": "ITEM_NET_BALL", - "flag": "HIDDEN_ITEM_FIVE_ISLAND_ROCKET_WAREHOUSE_NET_BALL", + "flag": "FLAG_HIDDEN_ITEM_FIVE_ISLAND_ROCKET_WAREHOUSE_NET_BALL", "quantity": 1, "underfoot": false }, diff --git a/data/maps/FourIsland/map.json b/data/maps/FourIsland/map.json index f986e9868..b347b7606 100644 --- a/data/maps/FourIsland/map.json +++ b/data/maps/FourIsland/map.json @@ -258,7 +258,7 @@ "y": 34, "elevation": 3, "item": "ITEM_PEARL", - "flag": "HIDDEN_ITEM_FOUR_ISLAND_PEARL", + "flag": "FLAG_HIDDEN_ITEM_FOUR_ISLAND_PEARL", "quantity": 1, "underfoot": false }, @@ -268,7 +268,7 @@ "y": 21, "elevation": 3, "item": "ITEM_ULTRA_BALL", - "flag": "HIDDEN_ITEM_FOUR_ISLAND_ULTRA_BALL", + "flag": "FLAG_HIDDEN_ITEM_FOUR_ISLAND_ULTRA_BALL", "quantity": 1, "underfoot": false }, diff --git a/data/maps/FuchsiaCity/map.json b/data/maps/FuchsiaCity/map.json index 38e9352c6..834806202 100644 --- a/data/maps/FuchsiaCity/map.json +++ b/data/maps/FuchsiaCity/map.json @@ -431,7 +431,7 @@ "y": 26, "elevation": 3, "item": "ITEM_MAX_REVIVE", - "flag": "HIDDEN_ITEM_FUCHSIA_CITY_MAX_REVIVE", + "flag": "FLAG_HIDDEN_ITEM_FUCHSIA_CITY_MAX_REVIVE", "quantity": 1, "underfoot": false } diff --git a/data/maps/MtEmber_Exterior/map.json b/data/maps/MtEmber_Exterior/map.json index c2e580138..a755bbd0b 100644 --- a/data/maps/MtEmber_Exterior/map.json +++ b/data/maps/MtEmber_Exterior/map.json @@ -376,7 +376,7 @@ "y": 17, "elevation": 0, "item": "ITEM_FIRE_STONE", - "flag": "HIDDEN_ITEM_MT_EMBER_EXTERIOR_FIRE_STONE", + "flag": "FLAG_HIDDEN_ITEM_MT_EMBER_EXTERIOR_FIRE_STONE", "quantity": 1, "underfoot": false }, @@ -386,7 +386,7 @@ "y": 30, "elevation": 3, "item": "ITEM_ULTRA_BALL", - "flag": "HIDDEN_ITEM_MT_EMBER_EXTERIOR_ULTRA_BALL", + "flag": "FLAG_HIDDEN_ITEM_MT_EMBER_EXTERIOR_ULTRA_BALL", "quantity": 1, "underfoot": false } diff --git a/data/maps/MtMoon_B1F/map.json b/data/maps/MtMoon_B1F/map.json index 81281c549..96472b9c2 100644 --- a/data/maps/MtMoon_B1F/map.json +++ b/data/maps/MtMoon_B1F/map.json @@ -81,7 +81,7 @@ "y": 2, "elevation": 0, "item": "ITEM_TINY_MUSHROOM", - "flag": "HIDDEN_ITEM_MT_MOON_B1F_TINY_MUSHROOM", + "flag": "FLAG_HIDDEN_ITEM_MT_MOON_B1F_TINY_MUSHROOM", "quantity": 1, "underfoot": false }, @@ -91,7 +91,7 @@ "y": 2, "elevation": 0, "item": "ITEM_TINY_MUSHROOM", - "flag": "HIDDEN_ITEM_MT_MOON_B1F_TINY_MUSHROOM_2", + "flag": "FLAG_HIDDEN_ITEM_MT_MOON_B1F_TINY_MUSHROOM_2", "quantity": 1, "underfoot": false }, @@ -101,7 +101,7 @@ "y": 34, "elevation": 0, "item": "ITEM_TINY_MUSHROOM", - "flag": "HIDDEN_ITEM_MT_MOON_B1F_TINY_MUSHROOM_3", + "flag": "FLAG_HIDDEN_ITEM_MT_MOON_B1F_TINY_MUSHROOM_3", "quantity": 1, "underfoot": false }, @@ -111,7 +111,7 @@ "y": 35, "elevation": 0, "item": "ITEM_BIG_MUSHROOM", - "flag": "HIDDEN_ITEM_MT_MOON_B1F_BIG_MUSHROOM", + "flag": "FLAG_HIDDEN_ITEM_MT_MOON_B1F_BIG_MUSHROOM", "quantity": 1, "underfoot": false }, @@ -121,7 +121,7 @@ "y": 12, "elevation": 0, "item": "ITEM_BIG_MUSHROOM", - "flag": "HIDDEN_ITEM_MT_MOON_B1F_BIG_MUSHROOM_2", + "flag": "FLAG_HIDDEN_ITEM_MT_MOON_B1F_BIG_MUSHROOM_2", "quantity": 1, "underfoot": false }, @@ -131,7 +131,7 @@ "y": 34, "elevation": 0, "item": "ITEM_BIG_MUSHROOM", - "flag": "HIDDEN_ITEM_MT_MOON_B1F_BIG_MUSHROOM_3", + "flag": "FLAG_HIDDEN_ITEM_MT_MOON_B1F_BIG_MUSHROOM_3", "quantity": 1, "underfoot": false } diff --git a/data/maps/MtMoon_B2F/map.json b/data/maps/MtMoon_B2F/map.json index 0ce444496..259a6ed50 100644 --- a/data/maps/MtMoon_B2F/map.json +++ b/data/maps/MtMoon_B2F/map.json @@ -218,7 +218,7 @@ "y": 16, "elevation": 3, "item": "ITEM_MOON_STONE", - "flag": "HIDDEN_ITEM_MT_MOON_B2F_MOON_STONE", + "flag": "FLAG_HIDDEN_ITEM_MT_MOON_B2F_MOON_STONE", "quantity": 1, "underfoot": false }, @@ -228,7 +228,7 @@ "y": 11, "elevation": 3, "item": "ITEM_ETHER", - "flag": "HIDDEN_ITEM_MT_MOON_B2F_ETHER", + "flag": "FLAG_HIDDEN_ITEM_MT_MOON_B2F_ETHER", "quantity": 1, "underfoot": false } diff --git a/data/maps/NavelRock_Summit/map.json b/data/maps/NavelRock_Summit/map.json index c7ea83f07..64eb420c5 100644 --- a/data/maps/NavelRock_Summit/map.json +++ b/data/maps/NavelRock_Summit/map.json @@ -57,7 +57,7 @@ "y": 11, "elevation": 3, "item": "ITEM_SACRED_ASH", - "flag": "HIDDEN_ITEM_NAVEL_ROCK_SUMMIT_SACRED_ASH", + "flag": "FLAG_HIDDEN_ITEM_NAVEL_ROCK_SUMMIT_SACRED_ASH", "quantity": 1, "underfoot": true } diff --git a/data/maps/OneIsland_TreasureBeach/map.json b/data/maps/OneIsland_TreasureBeach/map.json index d940dbe08..040861ce5 100644 --- a/data/maps/OneIsland_TreasureBeach/map.json +++ b/data/maps/OneIsland_TreasureBeach/map.json @@ -59,7 +59,7 @@ "y": 20, "elevation": 3, "item": "ITEM_STARDUST", - "flag": "HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_STARDUST", + "flag": "FLAG_HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_STARDUST", "quantity": 1, "underfoot": false }, @@ -69,7 +69,7 @@ "y": 27, "elevation": 3, "item": "ITEM_STARDUST", - "flag": "HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_STARDUST_2", + "flag": "FLAG_HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_STARDUST_2", "quantity": 1, "underfoot": false }, @@ -79,7 +79,7 @@ "y": 31, "elevation": 3, "item": "ITEM_PEARL", - "flag": "HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_PEARL", + "flag": "FLAG_HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_PEARL", "quantity": 1, "underfoot": false }, @@ -89,7 +89,7 @@ "y": 34, "elevation": 3, "item": "ITEM_PEARL", - "flag": "HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_PEARL_2", + "flag": "FLAG_HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_PEARL_2", "quantity": 1, "underfoot": false }, @@ -99,7 +99,7 @@ "y": 22, "elevation": 3, "item": "ITEM_ULTRA_BALL", - "flag": "HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_ULTRA_BALL", + "flag": "FLAG_HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_ULTRA_BALL", "quantity": 1, "underfoot": false }, @@ -109,7 +109,7 @@ "y": 33, "elevation": 3, "item": "ITEM_ULTRA_BALL", - "flag": "HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_ULTRA_BALL_2", + "flag": "FLAG_HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_ULTRA_BALL_2", "quantity": 1, "underfoot": false }, @@ -119,7 +119,7 @@ "y": 29, "elevation": 3, "item": "ITEM_STAR_PIECE", - "flag": "HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_STAR_PIECE", + "flag": "FLAG_HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_STAR_PIECE", "quantity": 1, "underfoot": false }, @@ -129,7 +129,7 @@ "y": 27, "elevation": 3, "item": "ITEM_BIG_PEARL", - "flag": "HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_BIG_PEARL", + "flag": "FLAG_HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_BIG_PEARL", "quantity": 1, "underfoot": false } diff --git a/data/maps/PewterCity/map.json b/data/maps/PewterCity/map.json index b39ee8b85..ddc3481ca 100644 --- a/data/maps/PewterCity/map.json +++ b/data/maps/PewterCity/map.json @@ -288,7 +288,7 @@ "y": 3, "elevation": 3, "item": "ITEM_POKE_BALL", - "flag": "HIDDEN_ITEM_PEWTER_CITY_POKE_BALL", + "flag": "FLAG_HIDDEN_ITEM_PEWTER_CITY_POKE_BALL", "quantity": 1, "underfoot": false } diff --git a/data/maps/PokemonMansion_1F/map.json b/data/maps/PokemonMansion_1F/map.json index f517febf3..346a767b0 100644 --- a/data/maps/PokemonMansion_1F/map.json +++ b/data/maps/PokemonMansion_1F/map.json @@ -174,7 +174,7 @@ "y": 21, "elevation": 0, "item": "ITEM_MOON_STONE", - "flag": "HIDDEN_ITEM_POKEMON_MANSION_1F_MOON_STONE", + "flag": "FLAG_HIDDEN_ITEM_POKEMON_MANSION_1F_MOON_STONE", "quantity": 1, "underfoot": false } diff --git a/data/maps/PokemonMansion_3F/map.json b/data/maps/PokemonMansion_3F/map.json index 66816e89f..13c7ea294 100644 --- a/data/maps/PokemonMansion_3F/map.json +++ b/data/maps/PokemonMansion_3F/map.json @@ -154,7 +154,7 @@ "y": 13, "elevation": 3, "item": "ITEM_RARE_CANDY", - "flag": "HIDDEN_ITEM_POKEMON_MANSION_3F_RARE_CANDY", + "flag": "FLAG_HIDDEN_ITEM_POKEMON_MANSION_3F_RARE_CANDY", "quantity": 1, "underfoot": false } diff --git a/data/maps/PokemonMansion_B1F/map.json b/data/maps/PokemonMansion_B1F/map.json index 75fe3af53..b68160cf6 100644 --- a/data/maps/PokemonMansion_B1F/map.json +++ b/data/maps/PokemonMansion_B1F/map.json @@ -141,7 +141,7 @@ "y": 5, "elevation": 3, "item": "ITEM_ELIXIR", - "flag": "HIDDEN_ITEM_POKEMON_MANSION_B1F_ELIXIR", + "flag": "FLAG_HIDDEN_ITEM_POKEMON_MANSION_B1F_ELIXIR", "quantity": 1, "underfoot": false } diff --git a/data/maps/PokemonTower_5F/map.json b/data/maps/PokemonTower_5F/map.json index b4feeb07c..72fb7dee8 100644 --- a/data/maps/PokemonTower_5F/map.json +++ b/data/maps/PokemonTower_5F/map.json @@ -292,7 +292,7 @@ "y": 3, "elevation": 3, "item": "ITEM_BIG_MUSHROOM", - "flag": "HIDDEN_ITEM_POKEMON_TOWER_5F_BIG_MUSHROOM", + "flag": "FLAG_HIDDEN_ITEM_POKEMON_TOWER_5F_BIG_MUSHROOM", "quantity": 1, "underfoot": false } diff --git a/data/maps/PokemonTower_7F/map.json b/data/maps/PokemonTower_7F/map.json index f5289a31e..75a293e4b 100644 --- a/data/maps/PokemonTower_7F/map.json +++ b/data/maps/PokemonTower_7F/map.json @@ -89,7 +89,7 @@ "y": 4, "elevation": 3, "item": "ITEM_SOOTHE_BELL", - "flag": "HIDDEN_ITEM_POKEMON_TOWER_7F_SOOTHE_BELL", + "flag": "FLAG_HIDDEN_ITEM_POKEMON_TOWER_7F_SOOTHE_BELL", "quantity": 1, "underfoot": true } diff --git a/data/maps/PowerPlant/map.json b/data/maps/PowerPlant/map.json index d0c40dcd5..38950b3a4 100644 --- a/data/maps/PowerPlant/map.json +++ b/data/maps/PowerPlant/map.json @@ -173,7 +173,7 @@ "y": 16, "elevation": 3, "item": "ITEM_MAX_ELIXIR", - "flag": "HIDDEN_ITEM_POWER_PLANT_MAX_ELIXIR", + "flag": "FLAG_HIDDEN_ITEM_POWER_PLANT_MAX_ELIXIR", "quantity": 1, "underfoot": false }, @@ -183,7 +183,7 @@ "y": 12, "elevation": 3, "item": "ITEM_THUNDER_STONE", - "flag": "HIDDEN_ITEM_POWER_PLANT_THUNDER_STONE", + "flag": "FLAG_HIDDEN_ITEM_POWER_PLANT_THUNDER_STONE", "quantity": 1, "underfoot": false } diff --git a/data/maps/RocketHideout_B1F/map.json b/data/maps/RocketHideout_B1F/map.json index a387f96e2..86b907054 100644 --- a/data/maps/RocketHideout_B1F/map.json +++ b/data/maps/RocketHideout_B1F/map.json @@ -166,7 +166,7 @@ "y": 17, "elevation": 0, "item": "ITEM_PP_UP", - "flag": "HIDDEN_ITEM_ROCKET_HIDEOUT_B1F_PP_UP", + "flag": "FLAG_HIDDEN_ITEM_ROCKET_HIDEOUT_B1F_PP_UP", "quantity": 1, "underfoot": false } diff --git a/data/maps/RocketHideout_B3F/map.json b/data/maps/RocketHideout_B3F/map.json index af785dae4..a606996ed 100644 --- a/data/maps/RocketHideout_B3F/map.json +++ b/data/maps/RocketHideout_B3F/map.json @@ -110,7 +110,7 @@ "y": 3, "elevation": 3, "item": "ITEM_NUGGET", - "flag": "HIDDEN_ITEM_ROCKET_HIDEOUT_B3F_NUGGET", + "flag": "FLAG_HIDDEN_ITEM_ROCKET_HIDEOUT_B3F_NUGGET", "quantity": 1, "underfoot": false } diff --git a/data/maps/RocketHideout_B4F/map.json b/data/maps/RocketHideout_B4F/map.json index 4bfdfca24..8ad0ad4e7 100644 --- a/data/maps/RocketHideout_B4F/map.json +++ b/data/maps/RocketHideout_B4F/map.json @@ -173,7 +173,7 @@ "y": 6, "elevation": 3, "item": "ITEM_NEST_BALL", - "flag": "HIDDEN_ITEM_ROCKET_HIDEOUT_B4F_NEST_BALL", + "flag": "FLAG_HIDDEN_ITEM_ROCKET_HIDEOUT_B4F_NEST_BALL", "quantity": 1, "underfoot": false }, @@ -183,7 +183,7 @@ "y": 6, "elevation": 3, "item": "ITEM_NET_BALL", - "flag": "HIDDEN_ITEM_ROCKET_HIDEOUT_B4F_NET_BALL", + "flag": "FLAG_HIDDEN_ITEM_ROCKET_HIDEOUT_B4F_NET_BALL", "quantity": 1, "underfoot": false } diff --git a/data/maps/Route10/map.json b/data/maps/Route10/map.json index ff5cce9b0..97d85418f 100644 --- a/data/maps/Route10/map.json +++ b/data/maps/Route10/map.json @@ -236,7 +236,7 @@ "y": 19, "elevation": 0, "item": "ITEM_SUPER_POTION", - "flag": "HIDDEN_ITEM_ROUTE10_SUPER_POTION", + "flag": "FLAG_HIDDEN_ITEM_ROUTE10_SUPER_POTION", "quantity": 1, "underfoot": false }, @@ -246,7 +246,7 @@ "y": 40, "elevation": 3, "item": "ITEM_MAX_ETHER", - "flag": "HIDDEN_ITEM_ROUTE10_MAX_ETHER", + "flag": "FLAG_HIDDEN_ITEM_ROUTE10_MAX_ETHER", "quantity": 1, "underfoot": false }, @@ -256,7 +256,7 @@ "y": 26, "elevation": 3, "item": "ITEM_CHERI_BERRY", - "flag": "HIDDEN_ITEM_ROUTE10_CHERI_BERRY", + "flag": "FLAG_HIDDEN_ITEM_ROUTE10_CHERI_BERRY", "quantity": 1, "underfoot": false }, @@ -266,7 +266,7 @@ "y": 29, "elevation": 3, "item": "ITEM_PERSIM_BERRY", - "flag": "HIDDEN_ITEM_ROUTE10_PERSIM_BERRY", + "flag": "FLAG_HIDDEN_ITEM_ROUTE10_PERSIM_BERRY", "quantity": 1, "underfoot": false }, @@ -276,7 +276,7 @@ "y": 57, "elevation": 3, "item": "ITEM_NANAB_BERRY", - "flag": "HIDDEN_ITEM_ROUTE10_NANAB_BERRY", + "flag": "FLAG_HIDDEN_ITEM_ROUTE10_NANAB_BERRY", "quantity": 1, "underfoot": false } diff --git a/data/maps/Route11/map.json b/data/maps/Route11/map.json index 24ee24b14..8bceede43 100644 --- a/data/maps/Route11/map.json +++ b/data/maps/Route11/map.json @@ -248,7 +248,7 @@ "y": 5, "elevation": 0, "item": "ITEM_ESCAPE_ROPE", - "flag": "HIDDEN_ITEM_ROUTE11_ESCAPE_ROPE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE11_ESCAPE_ROPE", "quantity": 1, "underfoot": false } diff --git a/data/maps/Route12/map.json b/data/maps/Route12/map.json index 54d24b715..ec90e4440 100644 --- a/data/maps/Route12/map.json +++ b/data/maps/Route12/map.json @@ -282,7 +282,7 @@ "y": 57, "elevation": 3, "item": "ITEM_HYPER_POTION", - "flag": "HIDDEN_ITEM_ROUTE12_HYPER_POTION", + "flag": "FLAG_HIDDEN_ITEM_ROUTE12_HYPER_POTION", "quantity": 1, "underfoot": false }, @@ -292,7 +292,7 @@ "y": 70, "elevation": 3, "item": "ITEM_LEFTOVERS", - "flag": "HIDDEN_ITEM_ROUTE12_LEFTOVERS", + "flag": "FLAG_HIDDEN_ITEM_ROUTE12_LEFTOVERS", "quantity": 1, "underfoot": true }, @@ -302,7 +302,7 @@ "y": 116, "elevation": 3, "item": "ITEM_RARE_CANDY", - "flag": "HIDDEN_ITEM_ROUTE12_RARE_CANDY", + "flag": "FLAG_HIDDEN_ITEM_ROUTE12_RARE_CANDY", "quantity": 1, "underfoot": false } diff --git a/data/maps/Route13/map.json b/data/maps/Route13/map.json index b2c0fd745..e24ec68d2 100644 --- a/data/maps/Route13/map.json +++ b/data/maps/Route13/map.json @@ -214,7 +214,7 @@ "y": 14, "elevation": 3, "item": "ITEM_PP_UP", - "flag": "HIDDEN_ITEM_ROUTE13_PP_UP", + "flag": "FLAG_HIDDEN_ITEM_ROUTE13_PP_UP", "quantity": 1, "underfoot": false } diff --git a/data/maps/Route14/map.json b/data/maps/Route14/map.json index 2aea43623..c3b58cf4b 100644 --- a/data/maps/Route14/map.json +++ b/data/maps/Route14/map.json @@ -254,7 +254,7 @@ "y": 20, "elevation": 3, "item": "ITEM_ZINC", - "flag": "HIDDEN_ITEM_ROUTE14_ZINC", + "flag": "FLAG_HIDDEN_ITEM_ROUTE14_ZINC", "quantity": 1, "underfoot": false }, @@ -264,7 +264,7 @@ "y": 53, "elevation": 3, "item": "ITEM_PINAP_BERRY", - "flag": "HIDDEN_ITEM_ROUTE14_PINAP_BERRY", + "flag": "FLAG_HIDDEN_ITEM_ROUTE14_PINAP_BERRY", "quantity": 1, "underfoot": false } diff --git a/data/maps/Route16/map.json b/data/maps/Route16/map.json index af1c20d8b..97a8592cb 100644 --- a/data/maps/Route16/map.json +++ b/data/maps/Route16/map.json @@ -228,7 +228,7 @@ "y": 13, "elevation": 3, "item": "ITEM_LEFTOVERS", - "flag": "HIDDEN_ITEM_ROUTE16_LEFTOVERS", + "flag": "FLAG_HIDDEN_ITEM_ROUTE16_LEFTOVERS", "quantity": 1, "underfoot": true } diff --git a/data/maps/Route17/map.json b/data/maps/Route17/map.json index 22a4c7ba1..5aeda1cda 100644 --- a/data/maps/Route17/map.json +++ b/data/maps/Route17/map.json @@ -224,7 +224,7 @@ "y": 83, "elevation": 3, "item": "ITEM_RARE_CANDY", - "flag": "HIDDEN_ITEM_ROUTE17_RARE_CANDY", + "flag": "FLAG_HIDDEN_ITEM_ROUTE17_RARE_CANDY", "quantity": 1, "underfoot": false }, @@ -234,7 +234,7 @@ "y": 53, "elevation": 3, "item": "ITEM_FULL_RESTORE", - "flag": "HIDDEN_ITEM_ROUTE17_FULL_RESTORE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE17_FULL_RESTORE", "quantity": 1, "underfoot": false }, @@ -244,7 +244,7 @@ "y": 68, "elevation": 3, "item": "ITEM_PP_UP", - "flag": "HIDDEN_ITEM_ROUTE17_PP_UP", + "flag": "FLAG_HIDDEN_ITEM_ROUTE17_PP_UP", "quantity": 1, "underfoot": false }, @@ -254,7 +254,7 @@ "y": 125, "elevation": 3, "item": "ITEM_MAX_REVIVE", - "flag": "HIDDEN_ITEM_ROUTE17_MAX_REVIVE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE17_MAX_REVIVE", "quantity": 1, "underfoot": false }, @@ -264,7 +264,7 @@ "y": 157, "elevation": 3, "item": "ITEM_MAX_ELIXIR", - "flag": "HIDDEN_ITEM_ROUTE17_MAX_ELIXIR", + "flag": "FLAG_HIDDEN_ITEM_ROUTE17_MAX_ELIXIR", "quantity": 1, "underfoot": false } diff --git a/data/maps/Route20/map.json b/data/maps/Route20/map.json index 2900cf4ac..5499ee68a 100644 --- a/data/maps/Route20/map.json +++ b/data/maps/Route20/map.json @@ -221,7 +221,7 @@ "y": 6, "elevation": 3, "item": "ITEM_STARDUST", - "flag": "HIDDEN_ITEM_ROUTE20_STARDUST", + "flag": "FLAG_HIDDEN_ITEM_ROUTE20_STARDUST", "quantity": 1, "underfoot": false } diff --git a/data/maps/Route21_North/map.json b/data/maps/Route21_North/map.json index 0126f8d90..3a9bbe242 100644 --- a/data/maps/Route21_North/map.json +++ b/data/maps/Route21_North/map.json @@ -114,7 +114,7 @@ "y": 42, "elevation": 3, "item": "ITEM_PEARL", - "flag": "HIDDEN_ITEM_ROUTE21_NORTH_PEARL", + "flag": "FLAG_HIDDEN_ITEM_ROUTE21_NORTH_PEARL", "quantity": 1, "underfoot": false } diff --git a/data/maps/Route23/map.json b/data/maps/Route23/map.json index 86044c923..7cbf5ed4e 100644 --- a/data/maps/Route23/map.json +++ b/data/maps/Route23/map.json @@ -542,7 +542,7 @@ "y": 42, "elevation": 0, "item": "ITEM_FULL_RESTORE", - "flag": "HIDDEN_ITEM_ROUTE23_FULL_RESTORE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE23_FULL_RESTORE", "quantity": 1, "underfoot": false }, @@ -552,7 +552,7 @@ "y": 72, "elevation": 0, "item": "ITEM_ULTRA_BALL", - "flag": "HIDDEN_ITEM_ROUTE23_ULTRA_BALL", + "flag": "FLAG_HIDDEN_ITEM_ROUTE23_ULTRA_BALL", "quantity": 1, "underfoot": false }, @@ -562,7 +562,7 @@ "y": 101, "elevation": 3, "item": "ITEM_MAX_ETHER", - "flag": "HIDDEN_ITEM_ROUTE23_MAX_ETHER", + "flag": "FLAG_HIDDEN_ITEM_ROUTE23_MAX_ETHER", "quantity": 1, "underfoot": false }, @@ -572,7 +572,7 @@ "y": 18, "elevation": 3, "item": "ITEM_LUM_BERRY", - "flag": "HIDDEN_ITEM_ROUTE23_LUM_BERRY", + "flag": "FLAG_HIDDEN_ITEM_ROUTE23_LUM_BERRY", "quantity": 1, "underfoot": false }, @@ -582,7 +582,7 @@ "y": 29, "elevation": 3, "item": "ITEM_SITRUS_BERRY", - "flag": "HIDDEN_ITEM_ROUTE23_SITRUS_BERRY", + "flag": "FLAG_HIDDEN_ITEM_ROUTE23_SITRUS_BERRY", "quantity": 1, "underfoot": false }, @@ -592,7 +592,7 @@ "y": 67, "elevation": 3, "item": "ITEM_ASPEAR_BERRY", - "flag": "HIDDEN_ITEM_ROUTE23_ASPEAR_BERRY", + "flag": "FLAG_HIDDEN_ITEM_ROUTE23_ASPEAR_BERRY", "quantity": 1, "underfoot": false }, @@ -602,7 +602,7 @@ "y": 128, "elevation": 3, "item": "ITEM_LEPPA_BERRY", - "flag": "HIDDEN_ITEM_ROUTE23_LEPPA_BERRY", + "flag": "FLAG_HIDDEN_ITEM_ROUTE23_LEPPA_BERRY", "quantity": 1, "underfoot": false }, @@ -612,7 +612,7 @@ "y": 8, "elevation": 3, "item": "ITEM_MAX_ELIXIR", - "flag": "HIDDEN_ITEM_ROUTE23_MAX_ELIXIR", + "flag": "FLAG_HIDDEN_ITEM_ROUTE23_MAX_ELIXIR", "quantity": 1, "underfoot": false }, diff --git a/data/maps/Route24/map.json b/data/maps/Route24/map.json index 9335104bc..0e8fd736f 100644 --- a/data/maps/Route24/map.json +++ b/data/maps/Route24/map.json @@ -167,7 +167,7 @@ "y": 4, "elevation": 3, "item": "ITEM_PECHA_BERRY", - "flag": "HIDDEN_ITEM_ROUTE24_PECHA_BERRY", + "flag": "FLAG_HIDDEN_ITEM_ROUTE24_PECHA_BERRY", "quantity": 1, "underfoot": false } diff --git a/data/maps/Route25/map.json b/data/maps/Route25/map.json index 9ebeb1841..ab2cdf6cb 100644 --- a/data/maps/Route25/map.json +++ b/data/maps/Route25/map.json @@ -229,7 +229,7 @@ "y": 2, "elevation": 3, "item": "ITEM_ELIXIR", - "flag": "HIDDEN_ITEM_ROUTE25_ELIXIR", + "flag": "FLAG_HIDDEN_ITEM_ROUTE25_ELIXIR", "quantity": 1, "underfoot": false }, @@ -239,7 +239,7 @@ "y": 6, "elevation": 3, "item": "ITEM_ETHER", - "flag": "HIDDEN_ITEM_ROUTE25_ETHER", + "flag": "FLAG_HIDDEN_ITEM_ROUTE25_ETHER", "quantity": 1, "underfoot": false }, @@ -249,7 +249,7 @@ "y": 8, "elevation": 3, "item": "ITEM_ORAN_BERRY", - "flag": "HIDDEN_ITEM_ROUTE25_ORAN_BERRY", + "flag": "FLAG_HIDDEN_ITEM_ROUTE25_ORAN_BERRY", "quantity": 1, "underfoot": false }, @@ -259,7 +259,7 @@ "y": 3, "elevation": 3, "item": "ITEM_BLUK_BERRY", - "flag": "HIDDEN_ITEM_ROUTE25_BLUK_BERRY", + "flag": "FLAG_HIDDEN_ITEM_ROUTE25_BLUK_BERRY", "quantity": 1, "underfoot": false } diff --git a/data/maps/Route3/map.json b/data/maps/Route3/map.json index 9fbd3634c..bc5d1449a 100644 --- a/data/maps/Route3/map.json +++ b/data/maps/Route3/map.json @@ -170,7 +170,7 @@ "y": 9, "elevation": 3, "item": "ITEM_ORAN_BERRY", - "flag": "HIDDEN_ITEM_ROUTE3_ORAN_BERRY", + "flag": "FLAG_HIDDEN_ITEM_ROUTE3_ORAN_BERRY", "quantity": 1, "underfoot": false } diff --git a/data/maps/Route4/map.json b/data/maps/Route4/map.json index 5bd534dfa..3273015c1 100644 --- a/data/maps/Route4/map.json +++ b/data/maps/Route4/map.json @@ -166,7 +166,7 @@ "y": 2, "elevation": 3, "item": "ITEM_GREAT_BALL", - "flag": "HIDDEN_ITEM_ROUTE4_GREAT_BALL", + "flag": "FLAG_HIDDEN_ITEM_ROUTE4_GREAT_BALL", "quantity": 1, "underfoot": false }, @@ -176,7 +176,7 @@ "y": 4, "elevation": 3, "item": "ITEM_PERSIM_BERRY", - "flag": "HIDDEN_ITEM_ROUTE4_PERSIM_BERRY", + "flag": "FLAG_HIDDEN_ITEM_ROUTE4_PERSIM_BERRY", "quantity": 1, "underfoot": false }, @@ -186,7 +186,7 @@ "y": 17, "elevation": 3, "item": "ITEM_RAZZ_BERRY", - "flag": "HIDDEN_ITEM_ROUTE4_RAZZ_BERRY", + "flag": "FLAG_HIDDEN_ITEM_ROUTE4_RAZZ_BERRY", "quantity": 1, "underfoot": false } diff --git a/data/maps/Route6/map.json b/data/maps/Route6/map.json index a8a7754c7..4a146846a 100644 --- a/data/maps/Route6/map.json +++ b/data/maps/Route6/map.json @@ -150,7 +150,7 @@ "y": 5, "elevation": 3, "item": "ITEM_SITRUS_BERRY", - "flag": "HIDDEN_ITEM_ROUTE6_SITRUS_BERRY", + "flag": "FLAG_HIDDEN_ITEM_ROUTE6_SITRUS_BERRY", "quantity": 1, "underfoot": false }, @@ -160,7 +160,7 @@ "y": 5, "elevation": 3, "item": "ITEM_RARE_CANDY", - "flag": "HIDDEN_ITEM_ROUTE6_RARE_CANDY", + "flag": "FLAG_HIDDEN_ITEM_ROUTE6_RARE_CANDY", "quantity": 1, "underfoot": false } diff --git a/data/maps/Route7/map.json b/data/maps/Route7/map.json index b6227e677..255dbe841 100644 --- a/data/maps/Route7/map.json +++ b/data/maps/Route7/map.json @@ -67,7 +67,7 @@ "y": 15, "elevation": 3, "item": "ITEM_WEPEAR_BERRY", - "flag": "HIDDEN_ITEM_ROUTE7_WEPEAR_BERRY", + "flag": "FLAG_HIDDEN_ITEM_ROUTE7_WEPEAR_BERRY", "quantity": 1, "underfoot": false } diff --git a/data/maps/Route8/map.json b/data/maps/Route8/map.json index 7741c79f8..53c017e41 100644 --- a/data/maps/Route8/map.json +++ b/data/maps/Route8/map.json @@ -269,7 +269,7 @@ "y": 10, "elevation": 3, "item": "ITEM_RAWST_BERRY", - "flag": "HIDDEN_ITEM_ROUTE8_RAWST_BERRY", + "flag": "FLAG_HIDDEN_ITEM_ROUTE8_RAWST_BERRY", "quantity": 1, "underfoot": false }, @@ -279,7 +279,7 @@ "y": 11, "elevation": 3, "item": "ITEM_LUM_BERRY", - "flag": "HIDDEN_ITEM_ROUTE8_LUM_BERRY", + "flag": "FLAG_HIDDEN_ITEM_ROUTE8_LUM_BERRY", "quantity": 1, "underfoot": false }, @@ -289,7 +289,7 @@ "y": 15, "elevation": 3, "item": "ITEM_LEPPA_BERRY", - "flag": "HIDDEN_ITEM_ROUTE8_LEPPA_BERRY", + "flag": "FLAG_HIDDEN_ITEM_ROUTE8_LEPPA_BERRY", "quantity": 1, "underfoot": false } diff --git a/data/maps/Route9/map.json b/data/maps/Route9/map.json index 1523fc0c4..a60f193b4 100644 --- a/data/maps/Route9/map.json +++ b/data/maps/Route9/map.json @@ -212,7 +212,7 @@ "y": 7, "elevation": 0, "item": "ITEM_ETHER", - "flag": "HIDDEN_ITEM_ROUTE9_ETHER", + "flag": "FLAG_HIDDEN_ITEM_ROUTE9_ETHER", "quantity": 1, "underfoot": false }, @@ -222,7 +222,7 @@ "y": 2, "elevation": 3, "item": "ITEM_RARE_CANDY", - "flag": "HIDDEN_ITEM_ROUTE9_RARE_CANDY", + "flag": "FLAG_HIDDEN_ITEM_ROUTE9_RARE_CANDY", "quantity": 1, "underfoot": false }, @@ -232,7 +232,7 @@ "y": 2, "elevation": 3, "item": "ITEM_CHESTO_BERRY", - "flag": "HIDDEN_ITEM_ROUTE9_CHESTO_BERRY", + "flag": "FLAG_HIDDEN_ITEM_ROUTE9_CHESTO_BERRY", "quantity": 1, "underfoot": false } diff --git a/data/maps/SSAnne_B1F_Corridor/map.json b/data/maps/SSAnne_B1F_Corridor/map.json index 858673bc5..fa64ecb13 100644 --- a/data/maps/SSAnne_B1F_Corridor/map.json +++ b/data/maps/SSAnne_B1F_Corridor/map.json @@ -67,7 +67,7 @@ "y": 5, "elevation": 3, "item": "ITEM_HYPER_POTION", - "flag": "HIDDEN_ITEM_SSANNE_B1F_CORRIDOR_HYPER_POTION", + "flag": "FLAG_HIDDEN_ITEM_SSANNE_B1F_CORRIDOR_HYPER_POTION", "quantity": 1, "underfoot": false } diff --git a/data/maps/SSAnne_Exterior/map.json b/data/maps/SSAnne_Exterior/map.json index 211b244e4..c8b563471 100644 --- a/data/maps/SSAnne_Exterior/map.json +++ b/data/maps/SSAnne_Exterior/map.json @@ -75,7 +75,7 @@ "y": 28, "elevation": 3, "item": "ITEM_LAVA_COOKIE", - "flag": "HIDDEN_ITEM_SSANNE_EXTERIOR_LAVA_COOKIE", + "flag": "FLAG_HIDDEN_ITEM_SSANNE_EXTERIOR_LAVA_COOKIE", "quantity": 1, "underfoot": false } diff --git a/data/maps/SSAnne_Kitchen/map.json b/data/maps/SSAnne_Kitchen/map.json index af1f147ac..1566589d7 100644 --- a/data/maps/SSAnne_Kitchen/map.json +++ b/data/maps/SSAnne_Kitchen/map.json @@ -145,7 +145,7 @@ "y": 8, "elevation": 0, "item": "ITEM_CHESTO_BERRY", - "flag": "HIDDEN_ITEM_SSANNE_KITCHEN_CHESTO_BERRY", + "flag": "FLAG_HIDDEN_ITEM_SSANNE_KITCHEN_CHESTO_BERRY", "quantity": 1, "underfoot": false }, @@ -155,7 +155,7 @@ "y": 4, "elevation": 0, "item": "ITEM_PECHA_BERRY", - "flag": "HIDDEN_ITEM_SSANNE_KITCHEN_PECHA_BERRY", + "flag": "FLAG_HIDDEN_ITEM_SSANNE_KITCHEN_PECHA_BERRY", "quantity": 1, "underfoot": false }, @@ -165,7 +165,7 @@ "y": 6, "elevation": 0, "item": "ITEM_CHERI_BERRY", - "flag": "HIDDEN_ITEM_SSANNE_KITCHEN_CHERI_BERRY", + "flag": "FLAG_HIDDEN_ITEM_SSANNE_KITCHEN_CHERI_BERRY", "quantity": 1, "underfoot": false } diff --git a/data/maps/SafariZone_Center/map.json b/data/maps/SafariZone_Center/map.json index 1eaad1f23..29a2be415 100644 --- a/data/maps/SafariZone_Center/map.json +++ b/data/maps/SafariZone_Center/map.json @@ -147,7 +147,7 @@ "y": 15, "elevation": 3, "item": "ITEM_LEAF_STONE", - "flag": "HIDDEN_ITEM_SAFARI_ZONE_CENTER_LEAF_STONE", + "flag": "FLAG_HIDDEN_ITEM_SAFARI_ZONE_CENTER_LEAF_STONE", "quantity": 1, "underfoot": false }, diff --git a/data/maps/SafariZone_West/map.json b/data/maps/SafariZone_West/map.json index ccbf3d8b6..0933c13fb 100644 --- a/data/maps/SafariZone_West/map.json +++ b/data/maps/SafariZone_West/map.json @@ -191,7 +191,7 @@ "y": 11, "elevation": 3, "item": "ITEM_REVIVE", - "flag": "HIDDEN_ITEM_SAFARI_ZONE_WEST_REVIVE", + "flag": "FLAG_HIDDEN_ITEM_SAFARI_ZONE_WEST_REVIVE", "quantity": 1, "underfoot": false } diff --git a/data/maps/SaffronCity_CopycatsHouse_2F/map.json b/data/maps/SaffronCity_CopycatsHouse_2F/map.json index 9a6be7486..63bc01336 100644 --- a/data/maps/SaffronCity_CopycatsHouse_2F/map.json +++ b/data/maps/SaffronCity_CopycatsHouse_2F/map.json @@ -105,7 +105,7 @@ "y": 1, "elevation": 0, "item": "ITEM_NUGGET", - "flag": "HIDDEN_ITEM_SAFFRON_CITY_COPYCATS_HOUSE_2F_NUGGET", + "flag": "FLAG_HIDDEN_ITEM_SAFFRON_CITY_COPYCATS_HOUSE_2F_NUGGET", "quantity": 1, "underfoot": false } diff --git a/data/maps/SeafoamIslands_B3F/map.json b/data/maps/SeafoamIslands_B3F/map.json index 6f53158a4..e56351aa4 100644 --- a/data/maps/SeafoamIslands_B3F/map.json +++ b/data/maps/SeafoamIslands_B3F/map.json @@ -173,7 +173,7 @@ "y": 12, "elevation": 0, "item": "ITEM_NUGGET", - "flag": "HIDDEN_ITEM_SEAFOAM_ISLANDS_B3F_NUGGET", + "flag": "FLAG_HIDDEN_ITEM_SEAFOAM_ISLANDS_B3F_NUGGET", "quantity": 1, "underfoot": false } diff --git a/data/maps/SeafoamIslands_B4F/map.json b/data/maps/SeafoamIslands_B4F/map.json index 41f9a7597..f015454d5 100644 --- a/data/maps/SeafoamIslands_B4F/map.json +++ b/data/maps/SeafoamIslands_B4F/map.json @@ -138,7 +138,7 @@ "y": 8, "elevation": 0, "item": "ITEM_WATER_STONE", - "flag": "HIDDEN_ITEM_SEAFOAM_ISLANDS_B4F_WATER_STONE", + "flag": "FLAG_HIDDEN_ITEM_SEAFOAM_ISLANDS_B4F_WATER_STONE", "quantity": 1, "underfoot": false }, diff --git a/data/maps/SevenIsland_SevaultCanyon/map.json b/data/maps/SevenIsland_SevaultCanyon/map.json index 2c8f76642..d0d1a0dca 100644 --- a/data/maps/SevenIsland_SevaultCanyon/map.json +++ b/data/maps/SevenIsland_SevaultCanyon/map.json @@ -331,7 +331,7 @@ "y": 66, "elevation": 3, "item": "ITEM_CHERI_BERRY", - "flag": "HIDDEN_ITEM_SEVEN_ISLAND_SEVAULT_CANYON_CHERI_BERRY", + "flag": "FLAG_HIDDEN_ITEM_SEVEN_ISLAND_SEVAULT_CANYON_CHERI_BERRY", "quantity": 1, "underfoot": false }, diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json index b86e59a1d..45e036fe0 100644 --- a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json @@ -128,7 +128,7 @@ "y": 29, "elevation": 5, "item": "ITEM_RAWST_BERRY", - "flag": "HIDDEN_ITEM_SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE_RAWST_BERRY", + "flag": "FLAG_HIDDEN_ITEM_SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE_RAWST_BERRY", "quantity": 1, "underfoot": false }, diff --git a/data/maps/SevenIsland_TanobyRuins/map.json b/data/maps/SevenIsland_TanobyRuins/map.json index ff476137c..05002e689 100644 --- a/data/maps/SevenIsland_TanobyRuins/map.json +++ b/data/maps/SevenIsland_TanobyRuins/map.json @@ -137,7 +137,7 @@ "y": 10, "elevation": 3, "item": "ITEM_HEART_SCALE", - "flag": "HIDDEN_ITEM_SEVEN_ISLAND_TANOBY_RUINS_HEART_SCALE", + "flag": "FLAG_HIDDEN_ITEM_SEVEN_ISLAND_TANOBY_RUINS_HEART_SCALE", "quantity": 1, "underfoot": false }, @@ -147,7 +147,7 @@ "y": 9, "elevation": 3, "item": "ITEM_HEART_SCALE", - "flag": "HIDDEN_ITEM_SEVEN_ISLAND_TANOBY_RUINS_HEART_SCALE_2", + "flag": "FLAG_HIDDEN_ITEM_SEVEN_ISLAND_TANOBY_RUINS_HEART_SCALE_2", "quantity": 1, "underfoot": false }, @@ -157,7 +157,7 @@ "y": 5, "elevation": 3, "item": "ITEM_HEART_SCALE", - "flag": "HIDDEN_ITEM_SEVEN_ISLAND_TANOBY_RUINS_HEART_SCALE_3", + "flag": "FLAG_HIDDEN_ITEM_SEVEN_ISLAND_TANOBY_RUINS_HEART_SCALE_3", "quantity": 1, "underfoot": false }, @@ -167,7 +167,7 @@ "y": 2, "elevation": 3, "item": "ITEM_HEART_SCALE", - "flag": "HIDDEN_ITEM_SEVEN_ISLAND_TANOBY_RUINS_HEART_SCALE_4", + "flag": "FLAG_HIDDEN_ITEM_SEVEN_ISLAND_TANOBY_RUINS_HEART_SCALE_4", "quantity": 1, "underfoot": false } diff --git a/data/maps/SevenIsland_TrainerTower/map.json b/data/maps/SevenIsland_TrainerTower/map.json index 079f8ce1b..a47439424 100644 --- a/data/maps/SevenIsland_TrainerTower/map.json +++ b/data/maps/SevenIsland_TrainerTower/map.json @@ -67,7 +67,7 @@ "y": 27, "elevation": 3, "item": "ITEM_BIG_PEARL", - "flag": "HIDDEN_ITEM_SEVEN_ISLAND_TRAINER_TOWER_BIG_PEARL", + "flag": "FLAG_HIDDEN_ITEM_SEVEN_ISLAND_TRAINER_TOWER_BIG_PEARL", "quantity": 1, "underfoot": false }, @@ -77,7 +77,7 @@ "y": 30, "elevation": 3, "item": "ITEM_PEARL", - "flag": "HIDDEN_ITEM_SEVEN_ISLAND_TRAINER_TOWER_PEARL", + "flag": "FLAG_HIDDEN_ITEM_SEVEN_ISLAND_TRAINER_TOWER_PEARL", "quantity": 1, "underfoot": false }, @@ -87,7 +87,7 @@ "y": 32, "elevation": 3, "item": "ITEM_NANAB_BERRY", - "flag": "HIDDEN_ITEM_SEVEN_ISLAND_TRAINER_TOWER_NANAB_BERRY", + "flag": "FLAG_HIDDEN_ITEM_SEVEN_ISLAND_TRAINER_TOWER_NANAB_BERRY", "quantity": 1, "underfoot": false }, diff --git a/data/maps/SilphCo_10F/map.json b/data/maps/SilphCo_10F/map.json index 0ba516fdb..ed9e17aa9 100644 --- a/data/maps/SilphCo_10F/map.json +++ b/data/maps/SilphCo_10F/map.json @@ -184,7 +184,7 @@ "y": 9, "elevation": 0, "item": "ITEM_HP_UP", - "flag": "HIDDEN_ITEM_SILPH_CO_10F_HP_UP", + "flag": "FLAG_HIDDEN_ITEM_SILPH_CO_10F_HP_UP", "quantity": 1, "underfoot": false }, diff --git a/data/maps/SilphCo_11F/map.json b/data/maps/SilphCo_11F/map.json index eb5c24042..118dd5d32 100644 --- a/data/maps/SilphCo_11F/map.json +++ b/data/maps/SilphCo_11F/map.json @@ -182,7 +182,7 @@ "y": 18, "elevation": 0, "item": "ITEM_REVIVE", - "flag": "HIDDEN_ITEM_SILPH_CO_11F_REVIVE", + "flag": "FLAG_HIDDEN_ITEM_SILPH_CO_11F_REVIVE", "quantity": 1, "underfoot": false }, diff --git a/data/maps/SilphCo_2F/map.json b/data/maps/SilphCo_2F/map.json index 91a37c98f..f22ab8826 100644 --- a/data/maps/SilphCo_2F/map.json +++ b/data/maps/SilphCo_2F/map.json @@ -209,7 +209,7 @@ "y": 21, "elevation": 0, "item": "ITEM_ULTRA_BALL", - "flag": "HIDDEN_ITEM_SILPH_CO_2F_ULTRA_BALL", + "flag": "FLAG_HIDDEN_ITEM_SILPH_CO_2F_ULTRA_BALL", "quantity": 1, "underfoot": false }, diff --git a/data/maps/SilphCo_3F/map.json b/data/maps/SilphCo_3F/map.json index 9e0bfe88a..b5c5c6f61 100644 --- a/data/maps/SilphCo_3F/map.json +++ b/data/maps/SilphCo_3F/map.json @@ -216,7 +216,7 @@ "y": 18, "elevation": 0, "item": "ITEM_PROTEIN", - "flag": "HIDDEN_ITEM_SILPH_CO_3F_PROTEIN", + "flag": "FLAG_HIDDEN_ITEM_SILPH_CO_3F_PROTEIN", "quantity": 1, "underfoot": false }, diff --git a/data/maps/SilphCo_4F/map.json b/data/maps/SilphCo_4F/map.json index 15b95fb8b..89258bab9 100644 --- a/data/maps/SilphCo_4F/map.json +++ b/data/maps/SilphCo_4F/map.json @@ -251,7 +251,7 @@ "y": 20, "elevation": 0, "item": "ITEM_IRON", - "flag": "HIDDEN_ITEM_SILPH_CO_4F_IRON", + "flag": "FLAG_HIDDEN_ITEM_SILPH_CO_4F_IRON", "quantity": 1, "underfoot": false }, diff --git a/data/maps/SilphCo_5F/map.json b/data/maps/SilphCo_5F/map.json index a134b7d4b..5d6c07664 100644 --- a/data/maps/SilphCo_5F/map.json +++ b/data/maps/SilphCo_5F/map.json @@ -201,7 +201,7 @@ "y": 16, "elevation": 0, "item": "ITEM_ELIXIR", - "flag": "HIDDEN_ITEM_SILPH_CO_5F_ELIXIR", + "flag": "FLAG_HIDDEN_ITEM_SILPH_CO_5F_ELIXIR", "quantity": 1, "underfoot": false }, @@ -331,7 +331,7 @@ "y": 9, "elevation": 0, "item": "ITEM_PP_UP", - "flag": "HIDDEN_ITEM_SILPH_CO_5F_PP_UP", + "flag": "FLAG_HIDDEN_ITEM_SILPH_CO_5F_PP_UP", "quantity": 1, "underfoot": false }, diff --git a/data/maps/SilphCo_6F/map.json b/data/maps/SilphCo_6F/map.json index 29b033bdb..7fd6ee981 100644 --- a/data/maps/SilphCo_6F/map.json +++ b/data/maps/SilphCo_6F/map.json @@ -233,7 +233,7 @@ "y": 8, "elevation": 0, "item": "ITEM_CARBOS", - "flag": "HIDDEN_ITEM_SILPH_CO_6F_CARBOS", + "flag": "FLAG_HIDDEN_ITEM_SILPH_CO_6F_CARBOS", "quantity": 1, "underfoot": false }, diff --git a/data/maps/SilphCo_7F/map.json b/data/maps/SilphCo_7F/map.json index b5072b37f..e1739bc2d 100644 --- a/data/maps/SilphCo_7F/map.json +++ b/data/maps/SilphCo_7F/map.json @@ -337,7 +337,7 @@ "y": 11, "elevation": 0, "item": "ITEM_ZINC", - "flag": "HIDDEN_ITEM_SILPH_CO_7F_ZINC", + "flag": "FLAG_HIDDEN_ITEM_SILPH_CO_7F_ZINC", "quantity": 1, "underfoot": false }, diff --git a/data/maps/SilphCo_8F/map.json b/data/maps/SilphCo_8F/map.json index 49ee7a3e4..9e5363959 100644 --- a/data/maps/SilphCo_8F/map.json +++ b/data/maps/SilphCo_8F/map.json @@ -191,7 +191,7 @@ "y": 10, "elevation": 0, "item": "ITEM_NUGGET", - "flag": "HIDDEN_ITEM_SILPH_CO_8F_NUGGET", + "flag": "FLAG_HIDDEN_ITEM_SILPH_CO_8F_NUGGET", "quantity": 1, "underfoot": false }, diff --git a/data/maps/SilphCo_9F/map.json b/data/maps/SilphCo_9F/map.json index bf2ab5433..5f108ad82 100644 --- a/data/maps/SilphCo_9F/map.json +++ b/data/maps/SilphCo_9F/map.json @@ -117,7 +117,7 @@ "y": 14, "elevation": 3, "item": "ITEM_MAX_POTION", - "flag": "HIDDEN_ITEM_SILPH_CO_9F_MAX_POTION", + "flag": "FLAG_HIDDEN_ITEM_SILPH_CO_9F_MAX_POTION", "quantity": 1, "underfoot": false }, @@ -255,7 +255,7 @@ "y": 8, "elevation": 0, "item": "ITEM_CALCIUM", - "flag": "HIDDEN_ITEM_SILPH_CO_9F_CALCIUM", + "flag": "FLAG_HIDDEN_ITEM_SILPH_CO_9F_CALCIUM", "quantity": 1, "underfoot": false }, diff --git a/data/maps/SixIsland/map.json b/data/maps/SixIsland/map.json index 87e66d7e4..e5ebdb14f 100644 --- a/data/maps/SixIsland/map.json +++ b/data/maps/SixIsland/map.json @@ -96,7 +96,7 @@ "y": 7, "elevation": 3, "item": "ITEM_LEPPA_BERRY", - "flag": "HIDDEN_ITEM_SIX_ISLAND_LEPPA_BERRY", + "flag": "FLAG_HIDDEN_ITEM_SIX_ISLAND_LEPPA_BERRY", "quantity": 1, "underfoot": false } diff --git a/data/maps/SixIsland_GreenPath/map.json b/data/maps/SixIsland_GreenPath/map.json index ed2e62719..5d01d6956 100644 --- a/data/maps/SixIsland_GreenPath/map.json +++ b/data/maps/SixIsland_GreenPath/map.json @@ -95,7 +95,7 @@ "y": 9, "elevation": 3, "item": "ITEM_ULTRA_BALL", - "flag": "HIDDEN_ITEM_SIX_ISLAND_GREEN_PATH_ULTRA_BALL", + "flag": "FLAG_HIDDEN_ITEM_SIX_ISLAND_GREEN_PATH_ULTRA_BALL", "quantity": 1, "underfoot": false } diff --git a/data/maps/SixIsland_OutcastIsland/map.json b/data/maps/SixIsland_OutcastIsland/map.json index 69fec4d9b..4a0178f54 100644 --- a/data/maps/SixIsland_OutcastIsland/map.json +++ b/data/maps/SixIsland_OutcastIsland/map.json @@ -137,7 +137,7 @@ "y": 23, "elevation": 3, "item": "ITEM_STAR_PIECE", - "flag": "HIDDEN_ITEM_SIX_ISLAND_OUTCAST_ISLAND_STAR_PIECE", + "flag": "FLAG_HIDDEN_ITEM_SIX_ISLAND_OUTCAST_ISLAND_STAR_PIECE", "quantity": 1, "underfoot": false }, @@ -147,7 +147,7 @@ "y": 24, "elevation": 3, "item": "ITEM_NET_BALL", - "flag": "HIDDEN_ITEM_SIX_ISLAND_OUTCAST_ISLAND_NET_BALL", + "flag": "FLAG_HIDDEN_ITEM_SIX_ISLAND_OUTCAST_ISLAND_NET_BALL", "quantity": 1, "underfoot": false } diff --git a/data/maps/SixIsland_WaterPath/map.json b/data/maps/SixIsland_WaterPath/map.json index 0ff0b08f6..1ee07dfbb 100644 --- a/data/maps/SixIsland_WaterPath/map.json +++ b/data/maps/SixIsland_WaterPath/map.json @@ -190,7 +190,7 @@ "y": 76, "elevation": 3, "item": "ITEM_ASPEAR_BERRY", - "flag": "HIDDEN_ITEM_SIX_ISLAND_WATER_PATH_ASPEAR_BERRY", + "flag": "FLAG_HIDDEN_ITEM_SIX_ISLAND_WATER_PATH_ASPEAR_BERRY", "quantity": 1, "underfoot": false }, @@ -200,7 +200,7 @@ "y": 8, "elevation": 3, "item": "ITEM_ORAN_BERRY", - "flag": "HIDDEN_ITEM_SIX_ISLAND_WATER_PATH_ORAN_BERRY", + "flag": "FLAG_HIDDEN_ITEM_SIX_ISLAND_WATER_PATH_ORAN_BERRY", "quantity": 1, "underfoot": false }, @@ -210,7 +210,7 @@ "y": 63, "elevation": 3, "item": "ITEM_PINAP_BERRY", - "flag": "HIDDEN_ITEM_SIX_ISLAND_WATER_PATH_PINAP_BERRY", + "flag": "FLAG_HIDDEN_ITEM_SIX_ISLAND_WATER_PATH_PINAP_BERRY", "quantity": 1, "underfoot": false }, diff --git a/data/maps/ThreeIsland/map.json b/data/maps/ThreeIsland/map.json index 450c66f3c..69d733605 100644 --- a/data/maps/ThreeIsland/map.json +++ b/data/maps/ThreeIsland/map.json @@ -381,7 +381,7 @@ "y": 13, "elevation": 3, "item": "ITEM_PP_UP", - "flag": "HIDDEN_ITEM_THREE_ISLAND_PP_UP", + "flag": "FLAG_HIDDEN_ITEM_THREE_ISLAND_PP_UP", "quantity": 1, "underfoot": false } diff --git a/data/maps/ThreeIsland_BerryForest/map.json b/data/maps/ThreeIsland_BerryForest/map.json index 53d69e452..18151e232 100644 --- a/data/maps/ThreeIsland_BerryForest/map.json +++ b/data/maps/ThreeIsland_BerryForest/map.json @@ -259,7 +259,7 @@ "y": 25, "elevation": 3, "item": "ITEM_RAZZ_BERRY", - "flag": "HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_RAZZ_BERRY", + "flag": "FLAG_HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_RAZZ_BERRY", "quantity": 1, "underfoot": false }, @@ -269,7 +269,7 @@ "y": 15, "elevation": 3, "item": "ITEM_BLUK_BERRY", - "flag": "HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_BLUK_BERRY", + "flag": "FLAG_HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_BLUK_BERRY", "quantity": 1, "underfoot": false }, @@ -279,7 +279,7 @@ "y": 24, "elevation": 3, "item": "ITEM_NANAB_BERRY", - "flag": "HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_NANAB_BERRY", + "flag": "FLAG_HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_NANAB_BERRY", "quantity": 1, "underfoot": false }, @@ -289,7 +289,7 @@ "y": 24, "elevation": 3, "item": "ITEM_WEPEAR_BERRY", - "flag": "HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_WEPEAR_BERRY", + "flag": "FLAG_HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_WEPEAR_BERRY", "quantity": 1, "underfoot": false }, @@ -299,7 +299,7 @@ "y": 18, "elevation": 3, "item": "ITEM_ORAN_BERRY", - "flag": "HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_ORAN_BERRY", + "flag": "FLAG_HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_ORAN_BERRY", "quantity": 1, "underfoot": false }, @@ -309,7 +309,7 @@ "y": 23, "elevation": 3, "item": "ITEM_CHERI_BERRY", - "flag": "HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_CHERI_BERRY", + "flag": "FLAG_HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_CHERI_BERRY", "quantity": 1, "underfoot": false }, @@ -319,7 +319,7 @@ "y": 5, "elevation": 3, "item": "ITEM_CHESTO_BERRY", - "flag": "HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_CHESTO_BERRY", + "flag": "FLAG_HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_CHESTO_BERRY", "quantity": 1, "underfoot": false }, @@ -329,7 +329,7 @@ "y": 30, "elevation": 3, "item": "ITEM_PECHA_BERRY", - "flag": "HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_PECHA_BERRY", + "flag": "FLAG_HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_PECHA_BERRY", "quantity": 1, "underfoot": false }, @@ -339,7 +339,7 @@ "y": 5, "elevation": 3, "item": "ITEM_RAWST_BERRY", - "flag": "HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_RAWST_BERRY", + "flag": "FLAG_HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_RAWST_BERRY", "quantity": 1, "underfoot": false }, @@ -349,7 +349,7 @@ "y": 6, "elevation": 3, "item": "ITEM_ASPEAR_BERRY", - "flag": "HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_ASPEAR_BERRY", + "flag": "FLAG_HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_ASPEAR_BERRY", "quantity": 1, "underfoot": false }, @@ -359,7 +359,7 @@ "y": 32, "elevation": 3, "item": "ITEM_PERSIM_BERRY", - "flag": "HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_PERSIM_BERRY", + "flag": "FLAG_HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_PERSIM_BERRY", "quantity": 1, "underfoot": false }, @@ -369,7 +369,7 @@ "y": 16, "elevation": 3, "item": "ITEM_PINAP_BERRY", - "flag": "HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_PINAP_BERRY", + "flag": "FLAG_HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_PINAP_BERRY", "quantity": 1, "underfoot": false }, @@ -379,7 +379,7 @@ "y": 5, "elevation": 3, "item": "ITEM_LUM_BERRY", - "flag": "HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_LUM_BERRY", + "flag": "FLAG_HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_LUM_BERRY", "quantity": 1, "underfoot": false } diff --git a/data/maps/ThreeIsland_BondBridge/map.json b/data/maps/ThreeIsland_BondBridge/map.json index 65bcf0c7e..787fac702 100644 --- a/data/maps/ThreeIsland_BondBridge/map.json +++ b/data/maps/ThreeIsland_BondBridge/map.json @@ -180,7 +180,7 @@ "y": 5, "elevation": 0, "item": "ITEM_MAX_REPEL", - "flag": "HIDDEN_ITEM_THREE_ISLAND_BOND_BRIDGE_MAX_REPEL", + "flag": "FLAG_HIDDEN_ITEM_THREE_ISLAND_BOND_BRIDGE_MAX_REPEL", "quantity": 1, "underfoot": false }, @@ -190,7 +190,7 @@ "y": 12, "elevation": 3, "item": "ITEM_PEARL", - "flag": "HIDDEN_ITEM_THREE_ISLAND_BOND_BRIDGE_PEARL", + "flag": "FLAG_HIDDEN_ITEM_THREE_ISLAND_BOND_BRIDGE_PEARL", "quantity": 1, "underfoot": false }, @@ -200,7 +200,7 @@ "y": 7, "elevation": 3, "item": "ITEM_STARDUST", - "flag": "HIDDEN_ITEM_THREE_ISLAND_BOND_BRIDGE_STARDUST", + "flag": "FLAG_HIDDEN_ITEM_THREE_ISLAND_BOND_BRIDGE_STARDUST", "quantity": 1, "underfoot": false }, diff --git a/data/maps/ThreeIsland_DunsparceTunnel/map.json b/data/maps/ThreeIsland_DunsparceTunnel/map.json index d04bd68b5..6b40c01eb 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/map.json +++ b/data/maps/ThreeIsland_DunsparceTunnel/map.json @@ -54,7 +54,7 @@ "y": 3, "elevation": 0, "item": "ITEM_NUGGET", - "flag": "HIDDEN_ITEM_THREE_ISLAND_DUNSPARCE_TUNNEL_NUGGET", + "flag": "FLAG_HIDDEN_ITEM_THREE_ISLAND_DUNSPARCE_TUNNEL_NUGGET", "quantity": 1, "underfoot": false } diff --git a/data/maps/TwoIsland_CapeBrink/map.json b/data/maps/TwoIsland_CapeBrink/map.json index 85e333654..ce109de65 100644 --- a/data/maps/TwoIsland_CapeBrink/map.json +++ b/data/maps/TwoIsland_CapeBrink/map.json @@ -38,7 +38,7 @@ "y": 28, "elevation": 3, "item": "ITEM_PP_MAX", - "flag": "HIDDEN_ITEM_TWO_ISLAND_CAPE_BRINK_PP_MAX", + "flag": "FLAG_HIDDEN_ITEM_TWO_ISLAND_CAPE_BRINK_PP_MAX", "quantity": 1, "underfoot": true }, @@ -48,7 +48,7 @@ "y": 13, "elevation": 3, "item": "ITEM_RARE_CANDY", - "flag": "HIDDEN_ITEM_TWO_ISLAND_CAPE_BRINK_RARE_CANDY", + "flag": "FLAG_HIDDEN_ITEM_TWO_ISLAND_CAPE_BRINK_RARE_CANDY", "quantity": 1, "underfoot": false } diff --git a/data/maps/UndergroundPath_EastWestTunnel/map.json b/data/maps/UndergroundPath_EastWestTunnel/map.json index 174cbc920..30ca49913 100644 --- a/data/maps/UndergroundPath_EastWestTunnel/map.json +++ b/data/maps/UndergroundPath_EastWestTunnel/map.json @@ -39,7 +39,7 @@ "y": 3, "elevation": 3, "item": "ITEM_POTION", - "flag": "HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_POTION", + "flag": "FLAG_HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_POTION", "quantity": 1, "underfoot": false }, @@ -49,7 +49,7 @@ "y": 5, "elevation": 3, "item": "ITEM_PARALYZE_HEAL", - "flag": "HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_PARALYZE_HEAL", + "flag": "FLAG_HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_PARALYZE_HEAL", "quantity": 1, "underfoot": false }, @@ -59,7 +59,7 @@ "y": 4, "elevation": 3, "item": "ITEM_AWAKENING", - "flag": "HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_AWAKENING", + "flag": "FLAG_HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_AWAKENING", "quantity": 1, "underfoot": false }, @@ -69,7 +69,7 @@ "y": 3, "elevation": 3, "item": "ITEM_BURN_HEAL", - "flag": "HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_BURN_HEAL", + "flag": "FLAG_HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_BURN_HEAL", "quantity": 1, "underfoot": false }, @@ -79,7 +79,7 @@ "y": 3, "elevation": 3, "item": "ITEM_ICE_HEAL", - "flag": "HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_ICE_HEAL", + "flag": "FLAG_HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_ICE_HEAL", "quantity": 1, "underfoot": false }, @@ -89,7 +89,7 @@ "y": 2, "elevation": 3, "item": "ITEM_ETHER", - "flag": "HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_ETHER", + "flag": "FLAG_HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_ETHER", "quantity": 1, "underfoot": false }, @@ -99,7 +99,7 @@ "y": 5, "elevation": 3, "item": "ITEM_ANTIDOTE", - "flag": "HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_ANTIDOTE", + "flag": "FLAG_HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_ANTIDOTE", "quantity": 1, "underfoot": false } diff --git a/data/maps/UndergroundPath_NorthSouthTunnel/map.json b/data/maps/UndergroundPath_NorthSouthTunnel/map.json index 321e1071a..95b3decab 100644 --- a/data/maps/UndergroundPath_NorthSouthTunnel/map.json +++ b/data/maps/UndergroundPath_NorthSouthTunnel/map.json @@ -39,7 +39,7 @@ "y": 30, "elevation": 3, "item": "ITEM_POTION", - "flag": "HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_POTION", + "flag": "FLAG_HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_POTION", "quantity": 1, "underfoot": false }, @@ -49,7 +49,7 @@ "y": 6, "elevation": 3, "item": "ITEM_ANTIDOTE", - "flag": "HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_ANTIDOTE", + "flag": "FLAG_HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_ANTIDOTE", "quantity": 1, "underfoot": false }, @@ -59,7 +59,7 @@ "y": 57, "elevation": 3, "item": "ITEM_BURN_HEAL", - "flag": "HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_BURN_HEAL", + "flag": "FLAG_HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_BURN_HEAL", "quantity": 1, "underfoot": false }, @@ -69,7 +69,7 @@ "y": 24, "elevation": 3, "item": "ITEM_AWAKENING", - "flag": "HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_AWAKENING", + "flag": "FLAG_HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_AWAKENING", "quantity": 1, "underfoot": false }, @@ -79,7 +79,7 @@ "y": 53, "elevation": 3, "item": "ITEM_ICE_HEAL", - "flag": "HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_ICE_HEAL", + "flag": "FLAG_HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_ICE_HEAL", "quantity": 1, "underfoot": false }, @@ -89,7 +89,7 @@ "y": 15, "elevation": 3, "item": "ITEM_PARALYZE_HEAL", - "flag": "HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_PARALYZE_HEAL", + "flag": "FLAG_HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_PARALYZE_HEAL", "quantity": 1, "underfoot": false }, @@ -99,7 +99,7 @@ "y": 39, "elevation": 3, "item": "ITEM_ETHER", - "flag": "HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_ETHER", + "flag": "FLAG_HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_ETHER", "quantity": 1, "underfoot": false } diff --git a/data/maps/VermilionCity/map.json b/data/maps/VermilionCity/map.json index 3df3a72b7..cda186af7 100644 --- a/data/maps/VermilionCity/map.json +++ b/data/maps/VermilionCity/map.json @@ -296,7 +296,7 @@ "y": 11, "elevation": 3, "item": "ITEM_MAX_ETHER", - "flag": "HIDDEN_ITEM_VERMILION_CITY_MAX_ETHER", + "flag": "FLAG_HIDDEN_ITEM_VERMILION_CITY_MAX_ETHER", "quantity": 1, "underfoot": false } diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json index 634e03995..069f4213a 100644 --- a/data/maps/VictoryRoad_1F/map.json +++ b/data/maps/VictoryRoad_1F/map.json @@ -148,7 +148,7 @@ "y": 12, "elevation": 0, "item": "ITEM_ULTRA_BALL", - "flag": "HIDDEN_ITEM_VICTORY_ROAD_1F_ULTRA_BALL", + "flag": "FLAG_HIDDEN_ITEM_VICTORY_ROAD_1F_ULTRA_BALL", "quantity": 1, "underfoot": false }, @@ -158,7 +158,7 @@ "y": 1, "elevation": 0, "item": "ITEM_FULL_RESTORE", - "flag": "HIDDEN_ITEM_VICTORY_ROAD_1F_FULL_RESTORE", + "flag": "FLAG_HIDDEN_ITEM_VICTORY_ROAD_1F_FULL_RESTORE", "quantity": 1, "underfoot": false } diff --git a/data/maps/ViridianCity_Gym/map.json b/data/maps/ViridianCity_Gym/map.json index 083b0cf07..12b470ba7 100644 --- a/data/maps/ViridianCity_Gym/map.json +++ b/data/maps/ViridianCity_Gym/map.json @@ -203,7 +203,7 @@ "y": 2, "elevation": 3, "item": "ITEM_MACHO_BRACE", - "flag": "HIDDEN_ITEM_VIRIDIAN_CITY_GYM_MACHO_BRACE", + "flag": "FLAG_HIDDEN_ITEM_VIRIDIAN_CITY_GYM_MACHO_BRACE", "quantity": 1, "underfoot": true } diff --git a/data/maps/ViridianForest/map.json b/data/maps/ViridianForest/map.json index ef89e4b3f..2d42aab09 100644 --- a/data/maps/ViridianForest/map.json +++ b/data/maps/ViridianForest/map.json @@ -270,7 +270,7 @@ "y": 22, "elevation": 3, "item": "ITEM_POTION", - "flag": "HIDDEN_ITEM_VIRIDIAN_FOREST_POTION", + "flag": "FLAG_HIDDEN_ITEM_VIRIDIAN_FOREST_POTION", "quantity": 1, "underfoot": false }, @@ -280,7 +280,7 @@ "y": 57, "elevation": 0, "item": "ITEM_ANTIDOTE", - "flag": "HIDDEN_ITEM_VIRIDIAN_FOREST_ANTIDOTE", + "flag": "FLAG_HIDDEN_ITEM_VIRIDIAN_FOREST_ANTIDOTE", "quantity": 1, "underfoot": false } diff --git a/include/constants/flags.h b/include/constants/flags.h index 3234d5385..e4c13dce6 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -1018,210 +1018,209 @@ #define FLAG_MYSTERY_GIFT_15 0x3E7 #define FLAG_HIDDEN_ITEMS_START 1000 // 0x3E8 -#define FLAG_HIDDEN_ITEM(map, item) (FLAG_HIDDEN_ITEMS_START + HIDDEN_ITEM_##map##_##item) -#define HIDDEN_ITEM_VIRIDIAN_FOREST_POTION 0 -#define HIDDEN_ITEM_VIRIDIAN_FOREST_ANTIDOTE 1 -#define HIDDEN_ITEM_MT_MOON_B2F_MOON_STONE 2 -#define HIDDEN_ITEM_MT_MOON_B2F_ETHER 3 -#define HIDDEN_ITEM_ROUTE25_ELIXIR 4 -#define HIDDEN_ITEM_ROUTE25_ETHER 5 -#define HIDDEN_ITEM_ROUTE9_ETHER 6 -#define HIDDEN_ITEM_UNUSED_0x07 7 -#define HIDDEN_ITEM_SSANNE_B1F_CORRIDOR_HYPER_POTION 8 -#define HIDDEN_ITEM_ROUTE10_SUPER_POTION 9 -#define HIDDEN_ITEM_ROUTE10_MAX_ETHER 10 -#define HIDDEN_ITEM_ROCKET_HIDEOUT_B1F_PP_UP 11 -#define HIDDEN_ITEM_ROCKET_HIDEOUT_B3F_NUGGET 12 -#define HIDDEN_ITEM_ROCKET_HIDEOUT_B4F_NEST_BALL 13 -#define HIDDEN_ITEM_POKEMON_TOWER_5F_BIG_MUSHROOM 14 -#define HIDDEN_ITEM_ROUTE13_PP_UP 15 -#define HIDDEN_ITEM_UNUSED_0x10 16 -#define HIDDEN_ITEM_ROUTE17_RARE_CANDY 17 -#define HIDDEN_ITEM_ROUTE17_FULL_RESTORE 18 -#define HIDDEN_ITEM_ROUTE17_PP_UP 19 -#define HIDDEN_ITEM_ROUTE17_MAX_REVIVE 20 -#define HIDDEN_ITEM_ROUTE17_MAX_ELIXIR 21 -#define HIDDEN_ITEM_SAFARI_ZONE_CENTER_LEAF_STONE 22 -#define HIDDEN_ITEM_SAFARI_ZONE_WEST_REVIVE 23 -#define HIDDEN_ITEM_SILPH_CO_5F_ELIXIR 24 -#define HIDDEN_ITEM_SILPH_CO_9F_MAX_POTION 25 -#define HIDDEN_ITEM_SAFFRON_CITY_COPYCATS_HOUSE_2F_NUGGET 26 -#define HIDDEN_ITEM_POWER_PLANT_MAX_ELIXIR 27 -#define HIDDEN_ITEM_POWER_PLANT_THUNDER_STONE 28 -#define HIDDEN_ITEM_SEAFOAM_ISLANDS_B3F_NUGGET 29 -#define HIDDEN_ITEM_SEAFOAM_ISLANDS_B4F_WATER_STONE 30 -#define HIDDEN_ITEM_POKEMON_MANSION_1F_MOON_STONE 31 -#define HIDDEN_ITEM_POKEMON_MANSION_3F_RARE_CANDY 32 -#define HIDDEN_ITEM_POKEMON_MANSION_B1F_ELIXIR 33 -#define HIDDEN_ITEM_ROUTE23_FULL_RESTORE 34 -#define HIDDEN_ITEM_ROUTE23_ULTRA_BALL 35 -#define HIDDEN_ITEM_ROUTE23_MAX_ETHER 36 -#define HIDDEN_ITEM_VICTORY_ROAD_1F_ULTRA_BALL 37 -#define HIDDEN_ITEM_VICTORY_ROAD_1F_FULL_RESTORE 38 -#define HIDDEN_ITEM_CERULEAN_CAVE_1F_ULTRA_BALL 39 -#define HIDDEN_ITEM_UNUSED_0x28 40 -#define HIDDEN_ITEM_ROUTE11_ESCAPE_ROPE 41 -#define HIDDEN_ITEM_ROUTE12_HYPER_POTION 42 -#define HIDDEN_ITEM_UNUSED_0x2B 43 -#define HIDDEN_ITEM_UNUSED_0x2C 44 -#define HIDDEN_ITEM_UNUSED_0x2D 45 -#define HIDDEN_ITEM_UNUSED_0x2E 46 -#define HIDDEN_ITEM_CELADON_CITY_PP_UP 47 -#define HIDDEN_ITEM_VERMILION_CITY_MAX_ETHER 48 -#define HIDDEN_ITEM_CERULEAN_CITY_RARE_CANDY 49 -#define HIDDEN_ITEM_ROUTE4_GREAT_BALL 50 -#define HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS 51 -#define HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_2 52 -#define HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_3 53 -#define HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_4 54 -#define HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_5 55 -#define HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_6 56 -#define HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_7 57 -#define HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_8 58 -#define HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_9 59 -#define HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_10 60 -#define HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_11 61 -#define HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_12 62 -#define HIDDEN_ITEM_SEVEN_ISLAND_SEVAULT_CANYON_CHERI_BERRY 63 -#define HIDDEN_ITEM_SEVEN_ISLAND_TANOBY_RUINS_HEART_SCALE_4 64 -#define HIDDEN_ITEM_SEVEN_ISLAND_TANOBY_RUINS_HEART_SCALE 65 -#define HIDDEN_ITEM_SEVEN_ISLAND_TANOBY_RUINS_HEART_SCALE_2 66 -#define HIDDEN_ITEM_SEVEN_ISLAND_TANOBY_RUINS_HEART_SCALE_3 67 -#define HIDDEN_ITEM_FIVE_ISLAND_ROCKET_WAREHOUSE_NEST_BALL 68 -#define HIDDEN_ITEM_FIVE_ISLAND_ROCKET_WAREHOUSE_NET_BALL 69 -#define HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_POTION 70 -#define HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_ANTIDOTE 71 -#define HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_PARALYZE_HEAL 72 -#define HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_AWAKENING 73 -#define HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_BURN_HEAL 74 -#define HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_ICE_HEAL 75 -#define HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_ETHER 76 -#define HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_POTION 77 -#define HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_ANTIDOTE 78 -#define HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_PARALYZE_HEAL 79 -#define HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_AWAKENING 80 -#define HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_BURN_HEAL 81 -#define HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_ICE_HEAL 82 -#define HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_ETHER 83 -#define HIDDEN_ITEM_MT_MOON_B1F_TINY_MUSHROOM 84 -#define HIDDEN_ITEM_MT_MOON_B1F_TINY_MUSHROOM_2 85 -#define HIDDEN_ITEM_MT_MOON_B1F_TINY_MUSHROOM_3 86 -#define HIDDEN_ITEM_MT_MOON_B1F_BIG_MUSHROOM 87 -#define HIDDEN_ITEM_MT_MOON_B1F_BIG_MUSHROOM_2 88 -#define HIDDEN_ITEM_MT_MOON_B1F_BIG_MUSHROOM_3 89 -#define HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_RAZZ_BERRY 90 -#define HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_BLUK_BERRY 91 -#define HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_NANAB_BERRY 92 -#define HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_WEPEAR_BERRY 93 -#define HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_ORAN_BERRY 94 -#define HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_CHERI_BERRY 95 -#define HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_CHESTO_BERRY 96 -#define HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_PECHA_BERRY 97 -#define HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_RAWST_BERRY 98 -#define HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_ASPEAR_BERRY 99 -#define HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_PERSIM_BERRY 100 -#define HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_PINAP_BERRY 101 -#define HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_LUM_BERRY 102 -#define HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_STARDUST 103 -#define HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_STARDUST_2 104 -#define HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_PEARL 105 -#define HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_PEARL_2 106 -#define HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_ULTRA_BALL 107 -#define HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_ULTRA_BALL_2 108 -#define HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_STAR_PIECE 109 -#define HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_BIG_PEARL 110 -#define HIDDEN_ITEM_TWO_ISLAND_CAPE_BRINK_RARE_CANDY 111 -#define HIDDEN_ITEM_PEWTER_CITY_POKE_BALL 112 -#define HIDDEN_ITEM_ROUTE3_ORAN_BERRY 113 -#define HIDDEN_ITEM_ROUTE4_PERSIM_BERRY 114 -#define HIDDEN_ITEM_ROUTE24_PECHA_BERRY 115 -#define HIDDEN_ITEM_ROUTE25_ORAN_BERRY 116 -#define HIDDEN_ITEM_ROUTE25_BLUK_BERRY 117 -#define HIDDEN_ITEM_ROUTE6_SITRUS_BERRY 118 -#define HIDDEN_ITEM_ROUTE6_RARE_CANDY 119 -#define HIDDEN_ITEM_SSANNE_KITCHEN_PECHA_BERRY 120 -#define HIDDEN_ITEM_SSANNE_KITCHEN_CHERI_BERRY 121 -#define HIDDEN_ITEM_SSANNE_KITCHEN_CHESTO_BERRY 122 -#define HIDDEN_ITEM_ROUTE9_RARE_CANDY 123 -#define HIDDEN_ITEM_UNUSED_0x7C 124 -#define HIDDEN_ITEM_ROUTE10_PERSIM_BERRY 125 -#define HIDDEN_ITEM_ROUTE10_CHERI_BERRY 126 -#define HIDDEN_ITEM_ROUTE8_RAWST_BERRY 127 -#define HIDDEN_ITEM_ROUTE8_LUM_BERRY 128 -#define HIDDEN_ITEM_ROUTE8_LEPPA_BERRY 129 -#define HIDDEN_ITEM_ROUTE12_RARE_CANDY 130 -#define HIDDEN_ITEM_ROUTE12_LEFTOVERS 131 -#define HIDDEN_ITEM_ROUTE16_LEFTOVERS 132 -#define HIDDEN_ITEM_FUCHSIA_CITY_MAX_REVIVE 133 -#define HIDDEN_ITEM_ROCKET_HIDEOUT_B4F_NET_BALL 134 -#define HIDDEN_ITEM_SILPH_CO_2F_ULTRA_BALL 135 -#define HIDDEN_ITEM_SILPH_CO_3F_PROTEIN 136 -#define HIDDEN_ITEM_SILPH_CO_4F_IRON 137 -#define HIDDEN_ITEM_SILPH_CO_5F_PP_UP 138 -#define HIDDEN_ITEM_SILPH_CO_6F_CARBOS 139 -#define HIDDEN_ITEM_SILPH_CO_7F_ZINC 140 -#define HIDDEN_ITEM_SILPH_CO_8F_NUGGET 141 -#define HIDDEN_ITEM_SILPH_CO_9F_CALCIUM 142 -#define HIDDEN_ITEM_SILPH_CO_10F_HP_UP 143 -#define HIDDEN_ITEM_SILPH_CO_11F_REVIVE 144 -#define HIDDEN_ITEM_ROUTE23_LUM_BERRY 145 -#define HIDDEN_ITEM_ROUTE23_SITRUS_BERRY 146 -#define HIDDEN_ITEM_ROUTE23_ASPEAR_BERRY 147 -#define HIDDEN_ITEM_ROUTE23_LEPPA_BERRY 148 -#define HIDDEN_ITEM_ROUTE14_ZINC 149 -#define HIDDEN_ITEM_ROUTE9_CHESTO_BERRY 150 -#define HIDDEN_ITEM_ROUTE10_NANAB_BERRY 151 -#define HIDDEN_ITEM_ROUTE7_WEPEAR_BERRY 152 -#define HIDDEN_ITEM_ROUTE20_STARDUST 153 -#define HIDDEN_ITEM_ROUTE21_NORTH_PEARL 154 -#define HIDDEN_ITEM_ROUTE23_MAX_ELIXIR 155 -#define HIDDEN_ITEM_ROUTE4_RAZZ_BERRY 156 -#define HIDDEN_ITEM_ROUTE14_PINAP_BERRY 157 -#define HIDDEN_ITEM_MT_EMBER_EXTERIOR_FIRE_STONE 158 -#define HIDDEN_ITEM_POKEMON_TOWER_7F_SOOTHE_BELL 159 -#define HIDDEN_ITEM_NAVEL_ROCK_SUMMIT_SACRED_ASH 160 -#define HIDDEN_ITEM_TWO_ISLAND_CAPE_BRINK_PP_MAX 161 -#define HIDDEN_ITEM_MT_EMBER_EXTERIOR_ULTRA_BALL 162 -#define HIDDEN_ITEM_THREE_ISLAND_DUNSPARCE_TUNNEL_NUGGET 163 -#define HIDDEN_ITEM_THREE_ISLAND_PP_UP 164 -#define HIDDEN_ITEM_THREE_ISLAND_BOND_BRIDGE_MAX_REPEL 165 -#define HIDDEN_ITEM_THREE_ISLAND_BOND_BRIDGE_PEARL 166 -#define HIDDEN_ITEM_THREE_ISLAND_BOND_BRIDGE_STARDUST 167 -#define HIDDEN_ITEM_FOUR_ISLAND_PEARL 168 -#define HIDDEN_ITEM_FOUR_ISLAND_ULTRA_BALL 169 -#define HIDDEN_ITEM_FIVE_ISLAND_MEMORIAL_PILLAR_BIG_PEARL 170 -#define HIDDEN_ITEM_FIVE_ISLAND_MEMORIAL_PILLAR_RAZZ_BERRY 171 -#define HIDDEN_ITEM_FIVE_ISLAND_MEMORIAL_PILLAR_SITRUS_BERRY 172 -#define HIDDEN_ITEM_FIVE_ISLAND_MEMORIAL_PILLAR_BLUK_BERRY 173 -#define HIDDEN_ITEM_FIVE_ISLAND_RESORT_GORGEOUS_NEST_BALL 174 -#define HIDDEN_ITEM_FIVE_ISLAND_RESORT_GORGEOUS_STARDUST 175 -#define HIDDEN_ITEM_FIVE_ISLAND_RESORT_GORGEOUS_STAR_PIECE 176 -#define HIDDEN_ITEM_FIVE_ISLAND_RESORT_GORGEOUS_STARDUST_2 177 -#define HIDDEN_ITEM_SIX_ISLAND_OUTCAST_ISLAND_STAR_PIECE 178 -#define HIDDEN_ITEM_SIX_ISLAND_OUTCAST_ISLAND_NET_BALL 179 -#define HIDDEN_ITEM_SIX_ISLAND_GREEN_PATH_ULTRA_BALL 180 -#define HIDDEN_ITEM_SIX_ISLAND_WATER_PATH_ASPEAR_BERRY 181 -#define HIDDEN_ITEM_SIX_ISLAND_WATER_PATH_ORAN_BERRY 182 -#define HIDDEN_ITEM_SIX_ISLAND_WATER_PATH_PINAP_BERRY 183 -#define HIDDEN_ITEM_SIX_ISLAND_LEPPA_BERRY 184 -#define HIDDEN_ITEM_SEVEN_ISLAND_TRAINER_TOWER_BIG_PEARL 185 -#define HIDDEN_ITEM_SEVEN_ISLAND_TRAINER_TOWER_PEARL 186 -#define HIDDEN_ITEM_SEVEN_ISLAND_TRAINER_TOWER_NANAB_BERRY 187 -#define HIDDEN_ITEM_SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE_RAWST_BERRY 188 -#define HIDDEN_ITEM_VIRIDIAN_CITY_GYM_MACHO_BRACE 189 -#define HIDDEN_ITEM_SSANNE_EXTERIOR_LAVA_COOKIE 190 +#define FLAG_HIDDEN_ITEM_VIRIDIAN_FOREST_POTION (FLAG_HIDDEN_ITEMS_START + 0) +#define FLAG_HIDDEN_ITEM_VIRIDIAN_FOREST_ANTIDOTE (FLAG_HIDDEN_ITEMS_START + 1) +#define FLAG_HIDDEN_ITEM_MT_MOON_B2F_MOON_STONE (FLAG_HIDDEN_ITEMS_START + 2) +#define FLAG_HIDDEN_ITEM_MT_MOON_B2F_ETHER (FLAG_HIDDEN_ITEMS_START + 3) +#define FLAG_HIDDEN_ITEM_ROUTE25_ELIXIR (FLAG_HIDDEN_ITEMS_START + 4) +#define FLAG_HIDDEN_ITEM_ROUTE25_ETHER (FLAG_HIDDEN_ITEMS_START + 5) +#define FLAG_HIDDEN_ITEM_ROUTE9_ETHER (FLAG_HIDDEN_ITEMS_START + 6) +#define FLAG_HIDDEN_ITEM_UNUSED_0x07 (FLAG_HIDDEN_ITEMS_START + 7) +#define FLAG_HIDDEN_ITEM_SSANNE_B1F_CORRIDOR_HYPER_POTION (FLAG_HIDDEN_ITEMS_START + 8) +#define FLAG_HIDDEN_ITEM_ROUTE10_SUPER_POTION (FLAG_HIDDEN_ITEMS_START + 9) +#define FLAG_HIDDEN_ITEM_ROUTE10_MAX_ETHER (FLAG_HIDDEN_ITEMS_START + 10) +#define FLAG_HIDDEN_ITEM_ROCKET_HIDEOUT_B1F_PP_UP (FLAG_HIDDEN_ITEMS_START + 11) +#define FLAG_HIDDEN_ITEM_ROCKET_HIDEOUT_B3F_NUGGET (FLAG_HIDDEN_ITEMS_START + 12) +#define FLAG_HIDDEN_ITEM_ROCKET_HIDEOUT_B4F_NEST_BALL (FLAG_HIDDEN_ITEMS_START + 13) +#define FLAG_HIDDEN_ITEM_POKEMON_TOWER_5F_BIG_MUSHROOM (FLAG_HIDDEN_ITEMS_START + 14) +#define FLAG_HIDDEN_ITEM_ROUTE13_PP_UP (FLAG_HIDDEN_ITEMS_START + 15) +#define FLAG_HIDDEN_ITEM_UNUSED_0x10 (FLAG_HIDDEN_ITEMS_START + 16) +#define FLAG_HIDDEN_ITEM_ROUTE17_RARE_CANDY (FLAG_HIDDEN_ITEMS_START + 17) +#define FLAG_HIDDEN_ITEM_ROUTE17_FULL_RESTORE (FLAG_HIDDEN_ITEMS_START + 18) +#define FLAG_HIDDEN_ITEM_ROUTE17_PP_UP (FLAG_HIDDEN_ITEMS_START + 19) +#define FLAG_HIDDEN_ITEM_ROUTE17_MAX_REVIVE (FLAG_HIDDEN_ITEMS_START + 20) +#define FLAG_HIDDEN_ITEM_ROUTE17_MAX_ELIXIR (FLAG_HIDDEN_ITEMS_START + 21) +#define FLAG_HIDDEN_ITEM_SAFARI_ZONE_CENTER_LEAF_STONE (FLAG_HIDDEN_ITEMS_START + 22) +#define FLAG_HIDDEN_ITEM_SAFARI_ZONE_WEST_REVIVE (FLAG_HIDDEN_ITEMS_START + 23) +#define FLAG_HIDDEN_ITEM_SILPH_CO_5F_ELIXIR (FLAG_HIDDEN_ITEMS_START + 24) +#define FLAG_HIDDEN_ITEM_SILPH_CO_9F_MAX_POTION (FLAG_HIDDEN_ITEMS_START + 25) +#define FLAG_HIDDEN_ITEM_SAFFRON_CITY_COPYCATS_HOUSE_2F_NUGGET (FLAG_HIDDEN_ITEMS_START + 26) +#define FLAG_HIDDEN_ITEM_POWER_PLANT_MAX_ELIXIR (FLAG_HIDDEN_ITEMS_START + 27) +#define FLAG_HIDDEN_ITEM_POWER_PLANT_THUNDER_STONE (FLAG_HIDDEN_ITEMS_START + 28) +#define FLAG_HIDDEN_ITEM_SEAFOAM_ISLANDS_B3F_NUGGET (FLAG_HIDDEN_ITEMS_START + 29) +#define FLAG_HIDDEN_ITEM_SEAFOAM_ISLANDS_B4F_WATER_STONE (FLAG_HIDDEN_ITEMS_START + 30) +#define FLAG_HIDDEN_ITEM_POKEMON_MANSION_1F_MOON_STONE (FLAG_HIDDEN_ITEMS_START + 31) +#define FLAG_HIDDEN_ITEM_POKEMON_MANSION_3F_RARE_CANDY (FLAG_HIDDEN_ITEMS_START + 32) +#define FLAG_HIDDEN_ITEM_POKEMON_MANSION_B1F_ELIXIR (FLAG_HIDDEN_ITEMS_START + 33) +#define FLAG_HIDDEN_ITEM_ROUTE23_FULL_RESTORE (FLAG_HIDDEN_ITEMS_START + 34) +#define FLAG_HIDDEN_ITEM_ROUTE23_ULTRA_BALL (FLAG_HIDDEN_ITEMS_START + 35) +#define FLAG_HIDDEN_ITEM_ROUTE23_MAX_ETHER (FLAG_HIDDEN_ITEMS_START + 36) +#define FLAG_HIDDEN_ITEM_VICTORY_ROAD_1F_ULTRA_BALL (FLAG_HIDDEN_ITEMS_START + 37) +#define FLAG_HIDDEN_ITEM_VICTORY_ROAD_1F_FULL_RESTORE (FLAG_HIDDEN_ITEMS_START + 38) +#define FLAG_HIDDEN_ITEM_CERULEAN_CAVE_1F_ULTRA_BALL (FLAG_HIDDEN_ITEMS_START + 39) +#define FLAG_HIDDEN_ITEM_UNUSED_0x28 (FLAG_HIDDEN_ITEMS_START + 40) +#define FLAG_HIDDEN_ITEM_ROUTE11_ESCAPE_ROPE (FLAG_HIDDEN_ITEMS_START + 41) +#define FLAG_HIDDEN_ITEM_ROUTE12_HYPER_POTION (FLAG_HIDDEN_ITEMS_START + 42) +#define FLAG_HIDDEN_ITEM_UNUSED_0x2B (FLAG_HIDDEN_ITEMS_START + 43) +#define FLAG_HIDDEN_ITEM_UNUSED_0x2C (FLAG_HIDDEN_ITEMS_START + 44) +#define FLAG_HIDDEN_ITEM_UNUSED_0x2D (FLAG_HIDDEN_ITEMS_START + 45) +#define FLAG_HIDDEN_ITEM_UNUSED_0x2E (FLAG_HIDDEN_ITEMS_START + 46) +#define FLAG_HIDDEN_ITEM_CELADON_CITY_PP_UP (FLAG_HIDDEN_ITEMS_START + 47) +#define FLAG_HIDDEN_ITEM_VERMILION_CITY_MAX_ETHER (FLAG_HIDDEN_ITEMS_START + 48) +#define FLAG_HIDDEN_ITEM_CERULEAN_CITY_RARE_CANDY (FLAG_HIDDEN_ITEMS_START + 49) +#define FLAG_HIDDEN_ITEM_ROUTE4_GREAT_BALL (FLAG_HIDDEN_ITEMS_START + 50) +#define FLAG_HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS (FLAG_HIDDEN_ITEMS_START + 51) +#define FLAG_HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_2 (FLAG_HIDDEN_ITEMS_START + 52) +#define FLAG_HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_3 (FLAG_HIDDEN_ITEMS_START + 53) +#define FLAG_HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_4 (FLAG_HIDDEN_ITEMS_START + 54) +#define FLAG_HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_5 (FLAG_HIDDEN_ITEMS_START + 55) +#define FLAG_HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_6 (FLAG_HIDDEN_ITEMS_START + 56) +#define FLAG_HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_7 (FLAG_HIDDEN_ITEMS_START + 57) +#define FLAG_HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_8 (FLAG_HIDDEN_ITEMS_START + 58) +#define FLAG_HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_9 (FLAG_HIDDEN_ITEMS_START + 59) +#define FLAG_HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_10 (FLAG_HIDDEN_ITEMS_START + 60) +#define FLAG_HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_11 (FLAG_HIDDEN_ITEMS_START + 61) +#define FLAG_HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_12 (FLAG_HIDDEN_ITEMS_START + 62) +#define FLAG_HIDDEN_ITEM_SEVEN_ISLAND_SEVAULT_CANYON_CHERI_BERRY (FLAG_HIDDEN_ITEMS_START + 63) +#define FLAG_HIDDEN_ITEM_SEVEN_ISLAND_TANOBY_RUINS_HEART_SCALE_4 (FLAG_HIDDEN_ITEMS_START + 64) +#define FLAG_HIDDEN_ITEM_SEVEN_ISLAND_TANOBY_RUINS_HEART_SCALE (FLAG_HIDDEN_ITEMS_START + 65) +#define FLAG_HIDDEN_ITEM_SEVEN_ISLAND_TANOBY_RUINS_HEART_SCALE_2 (FLAG_HIDDEN_ITEMS_START + 66) +#define FLAG_HIDDEN_ITEM_SEVEN_ISLAND_TANOBY_RUINS_HEART_SCALE_3 (FLAG_HIDDEN_ITEMS_START + 67) +#define FLAG_HIDDEN_ITEM_FIVE_ISLAND_ROCKET_WAREHOUSE_NEST_BALL (FLAG_HIDDEN_ITEMS_START + 68) +#define FLAG_HIDDEN_ITEM_FIVE_ISLAND_ROCKET_WAREHOUSE_NET_BALL (FLAG_HIDDEN_ITEMS_START + 69) +#define FLAG_HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_POTION (FLAG_HIDDEN_ITEMS_START + 70) +#define FLAG_HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_ANTIDOTE (FLAG_HIDDEN_ITEMS_START + 71) +#define FLAG_HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_PARALYZE_HEAL (FLAG_HIDDEN_ITEMS_START + 72) +#define FLAG_HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_AWAKENING (FLAG_HIDDEN_ITEMS_START + 73) +#define FLAG_HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_BURN_HEAL (FLAG_HIDDEN_ITEMS_START + 74) +#define FLAG_HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_ICE_HEAL (FLAG_HIDDEN_ITEMS_START + 75) +#define FLAG_HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_ETHER (FLAG_HIDDEN_ITEMS_START + 76) +#define FLAG_HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_POTION (FLAG_HIDDEN_ITEMS_START + 77) +#define FLAG_HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_ANTIDOTE (FLAG_HIDDEN_ITEMS_START + 78) +#define FLAG_HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_PARALYZE_HEAL (FLAG_HIDDEN_ITEMS_START + 79) +#define FLAG_HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_AWAKENING (FLAG_HIDDEN_ITEMS_START + 80) +#define FLAG_HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_BURN_HEAL (FLAG_HIDDEN_ITEMS_START + 81) +#define FLAG_HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_ICE_HEAL (FLAG_HIDDEN_ITEMS_START + 82) +#define FLAG_HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_ETHER (FLAG_HIDDEN_ITEMS_START + 83) +#define FLAG_HIDDEN_ITEM_MT_MOON_B1F_TINY_MUSHROOM (FLAG_HIDDEN_ITEMS_START + 84) +#define FLAG_HIDDEN_ITEM_MT_MOON_B1F_TINY_MUSHROOM_2 (FLAG_HIDDEN_ITEMS_START + 85) +#define FLAG_HIDDEN_ITEM_MT_MOON_B1F_TINY_MUSHROOM_3 (FLAG_HIDDEN_ITEMS_START + 86) +#define FLAG_HIDDEN_ITEM_MT_MOON_B1F_BIG_MUSHROOM (FLAG_HIDDEN_ITEMS_START + 87) +#define FLAG_HIDDEN_ITEM_MT_MOON_B1F_BIG_MUSHROOM_2 (FLAG_HIDDEN_ITEMS_START + 88) +#define FLAG_HIDDEN_ITEM_MT_MOON_B1F_BIG_MUSHROOM_3 (FLAG_HIDDEN_ITEMS_START + 89) +#define FLAG_HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_RAZZ_BERRY (FLAG_HIDDEN_ITEMS_START + 90) +#define FLAG_HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_BLUK_BERRY (FLAG_HIDDEN_ITEMS_START + 91) +#define FLAG_HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_NANAB_BERRY (FLAG_HIDDEN_ITEMS_START + 92) +#define FLAG_HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_WEPEAR_BERRY (FLAG_HIDDEN_ITEMS_START + 93) +#define FLAG_HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_ORAN_BERRY (FLAG_HIDDEN_ITEMS_START + 94) +#define FLAG_HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_CHERI_BERRY (FLAG_HIDDEN_ITEMS_START + 95) +#define FLAG_HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_CHESTO_BERRY (FLAG_HIDDEN_ITEMS_START + 96) +#define FLAG_HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_PECHA_BERRY (FLAG_HIDDEN_ITEMS_START + 97) +#define FLAG_HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_RAWST_BERRY (FLAG_HIDDEN_ITEMS_START + 98) +#define FLAG_HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_ASPEAR_BERRY (FLAG_HIDDEN_ITEMS_START + 99) +#define FLAG_HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_PERSIM_BERRY (FLAG_HIDDEN_ITEMS_START + 100) +#define FLAG_HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_PINAP_BERRY (FLAG_HIDDEN_ITEMS_START + 101) +#define FLAG_HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_LUM_BERRY (FLAG_HIDDEN_ITEMS_START + 102) +#define FLAG_HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_STARDUST (FLAG_HIDDEN_ITEMS_START + 103) +#define FLAG_HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_STARDUST_2 (FLAG_HIDDEN_ITEMS_START + 104) +#define FLAG_HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_PEARL (FLAG_HIDDEN_ITEMS_START + 105) +#define FLAG_HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_PEARL_2 (FLAG_HIDDEN_ITEMS_START + 106) +#define FLAG_HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_ULTRA_BALL (FLAG_HIDDEN_ITEMS_START + 107) +#define FLAG_HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_ULTRA_BALL_2 (FLAG_HIDDEN_ITEMS_START + 108) +#define FLAG_HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_STAR_PIECE (FLAG_HIDDEN_ITEMS_START + 109) +#define FLAG_HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_BIG_PEARL (FLAG_HIDDEN_ITEMS_START + 110) +#define FLAG_HIDDEN_ITEM_TWO_ISLAND_CAPE_BRINK_RARE_CANDY (FLAG_HIDDEN_ITEMS_START + 111) +#define FLAG_HIDDEN_ITEM_PEWTER_CITY_POKE_BALL (FLAG_HIDDEN_ITEMS_START + 112) +#define FLAG_HIDDEN_ITEM_ROUTE3_ORAN_BERRY (FLAG_HIDDEN_ITEMS_START + 113) +#define FLAG_HIDDEN_ITEM_ROUTE4_PERSIM_BERRY (FLAG_HIDDEN_ITEMS_START + 114) +#define FLAG_HIDDEN_ITEM_ROUTE24_PECHA_BERRY (FLAG_HIDDEN_ITEMS_START + 115) +#define FLAG_HIDDEN_ITEM_ROUTE25_ORAN_BERRY (FLAG_HIDDEN_ITEMS_START + 116) +#define FLAG_HIDDEN_ITEM_ROUTE25_BLUK_BERRY (FLAG_HIDDEN_ITEMS_START + 117) +#define FLAG_HIDDEN_ITEM_ROUTE6_SITRUS_BERRY (FLAG_HIDDEN_ITEMS_START + 118) +#define FLAG_HIDDEN_ITEM_ROUTE6_RARE_CANDY (FLAG_HIDDEN_ITEMS_START + 119) +#define FLAG_HIDDEN_ITEM_SSANNE_KITCHEN_PECHA_BERRY (FLAG_HIDDEN_ITEMS_START + 120) +#define FLAG_HIDDEN_ITEM_SSANNE_KITCHEN_CHERI_BERRY (FLAG_HIDDEN_ITEMS_START + 121) +#define FLAG_HIDDEN_ITEM_SSANNE_KITCHEN_CHESTO_BERRY (FLAG_HIDDEN_ITEMS_START + 122) +#define FLAG_HIDDEN_ITEM_ROUTE9_RARE_CANDY (FLAG_HIDDEN_ITEMS_START + 123) +#define FLAG_HIDDEN_ITEM_UNUSED_0x7C (FLAG_HIDDEN_ITEMS_START + 124) +#define FLAG_HIDDEN_ITEM_ROUTE10_PERSIM_BERRY (FLAG_HIDDEN_ITEMS_START + 125) +#define FLAG_HIDDEN_ITEM_ROUTE10_CHERI_BERRY (FLAG_HIDDEN_ITEMS_START + 126) +#define FLAG_HIDDEN_ITEM_ROUTE8_RAWST_BERRY (FLAG_HIDDEN_ITEMS_START + 127) +#define FLAG_HIDDEN_ITEM_ROUTE8_LUM_BERRY (FLAG_HIDDEN_ITEMS_START + 128) +#define FLAG_HIDDEN_ITEM_ROUTE8_LEPPA_BERRY (FLAG_HIDDEN_ITEMS_START + 129) +#define FLAG_HIDDEN_ITEM_ROUTE12_RARE_CANDY (FLAG_HIDDEN_ITEMS_START + 130) +#define FLAG_HIDDEN_ITEM_ROUTE12_LEFTOVERS (FLAG_HIDDEN_ITEMS_START + 131) +#define FLAG_HIDDEN_ITEM_ROUTE16_LEFTOVERS (FLAG_HIDDEN_ITEMS_START + 132) +#define FLAG_HIDDEN_ITEM_FUCHSIA_CITY_MAX_REVIVE (FLAG_HIDDEN_ITEMS_START + 133) +#define FLAG_HIDDEN_ITEM_ROCKET_HIDEOUT_B4F_NET_BALL (FLAG_HIDDEN_ITEMS_START + 134) +#define FLAG_HIDDEN_ITEM_SILPH_CO_2F_ULTRA_BALL (FLAG_HIDDEN_ITEMS_START + 135) +#define FLAG_HIDDEN_ITEM_SILPH_CO_3F_PROTEIN (FLAG_HIDDEN_ITEMS_START + 136) +#define FLAG_HIDDEN_ITEM_SILPH_CO_4F_IRON (FLAG_HIDDEN_ITEMS_START + 137) +#define FLAG_HIDDEN_ITEM_SILPH_CO_5F_PP_UP (FLAG_HIDDEN_ITEMS_START + 138) +#define FLAG_HIDDEN_ITEM_SILPH_CO_6F_CARBOS (FLAG_HIDDEN_ITEMS_START + 139) +#define FLAG_HIDDEN_ITEM_SILPH_CO_7F_ZINC (FLAG_HIDDEN_ITEMS_START + 140) +#define FLAG_HIDDEN_ITEM_SILPH_CO_8F_NUGGET (FLAG_HIDDEN_ITEMS_START + 141) +#define FLAG_HIDDEN_ITEM_SILPH_CO_9F_CALCIUM (FLAG_HIDDEN_ITEMS_START + 142) +#define FLAG_HIDDEN_ITEM_SILPH_CO_10F_HP_UP (FLAG_HIDDEN_ITEMS_START + 143) +#define FLAG_HIDDEN_ITEM_SILPH_CO_11F_REVIVE (FLAG_HIDDEN_ITEMS_START + 144) +#define FLAG_HIDDEN_ITEM_ROUTE23_LUM_BERRY (FLAG_HIDDEN_ITEMS_START + 145) +#define FLAG_HIDDEN_ITEM_ROUTE23_SITRUS_BERRY (FLAG_HIDDEN_ITEMS_START + 146) +#define FLAG_HIDDEN_ITEM_ROUTE23_ASPEAR_BERRY (FLAG_HIDDEN_ITEMS_START + 147) +#define FLAG_HIDDEN_ITEM_ROUTE23_LEPPA_BERRY (FLAG_HIDDEN_ITEMS_START + 148) +#define FLAG_HIDDEN_ITEM_ROUTE14_ZINC (FLAG_HIDDEN_ITEMS_START + 149) +#define FLAG_HIDDEN_ITEM_ROUTE9_CHESTO_BERRY (FLAG_HIDDEN_ITEMS_START + 150) +#define FLAG_HIDDEN_ITEM_ROUTE10_NANAB_BERRY (FLAG_HIDDEN_ITEMS_START + 151) +#define FLAG_HIDDEN_ITEM_ROUTE7_WEPEAR_BERRY (FLAG_HIDDEN_ITEMS_START + 152) +#define FLAG_HIDDEN_ITEM_ROUTE20_STARDUST (FLAG_HIDDEN_ITEMS_START + 153) +#define FLAG_HIDDEN_ITEM_ROUTE21_NORTH_PEARL (FLAG_HIDDEN_ITEMS_START + 154) +#define FLAG_HIDDEN_ITEM_ROUTE23_MAX_ELIXIR (FLAG_HIDDEN_ITEMS_START + 155) +#define FLAG_HIDDEN_ITEM_ROUTE4_RAZZ_BERRY (FLAG_HIDDEN_ITEMS_START + 156) +#define FLAG_HIDDEN_ITEM_ROUTE14_PINAP_BERRY (FLAG_HIDDEN_ITEMS_START + 157) +#define FLAG_HIDDEN_ITEM_MT_EMBER_EXTERIOR_FIRE_STONE (FLAG_HIDDEN_ITEMS_START + 158) +#define FLAG_HIDDEN_ITEM_POKEMON_TOWER_7F_SOOTHE_BELL (FLAG_HIDDEN_ITEMS_START + 159) +#define FLAG_HIDDEN_ITEM_NAVEL_ROCK_SUMMIT_SACRED_ASH (FLAG_HIDDEN_ITEMS_START + 160) +#define FLAG_HIDDEN_ITEM_TWO_ISLAND_CAPE_BRINK_PP_MAX (FLAG_HIDDEN_ITEMS_START + 161) +#define FLAG_HIDDEN_ITEM_MT_EMBER_EXTERIOR_ULTRA_BALL (FLAG_HIDDEN_ITEMS_START + 162) +#define FLAG_HIDDEN_ITEM_THREE_ISLAND_DUNSPARCE_TUNNEL_NUGGET (FLAG_HIDDEN_ITEMS_START + 163) +#define FLAG_HIDDEN_ITEM_THREE_ISLAND_PP_UP (FLAG_HIDDEN_ITEMS_START + 164) +#define FLAG_HIDDEN_ITEM_THREE_ISLAND_BOND_BRIDGE_MAX_REPEL (FLAG_HIDDEN_ITEMS_START + 165) +#define FLAG_HIDDEN_ITEM_THREE_ISLAND_BOND_BRIDGE_PEARL (FLAG_HIDDEN_ITEMS_START + 166) +#define FLAG_HIDDEN_ITEM_THREE_ISLAND_BOND_BRIDGE_STARDUST (FLAG_HIDDEN_ITEMS_START + 167) +#define FLAG_HIDDEN_ITEM_FOUR_ISLAND_PEARL (FLAG_HIDDEN_ITEMS_START + 168) +#define FLAG_HIDDEN_ITEM_FOUR_ISLAND_ULTRA_BALL (FLAG_HIDDEN_ITEMS_START + 169) +#define FLAG_HIDDEN_ITEM_FIVE_ISLAND_MEMORIAL_PILLAR_BIG_PEARL (FLAG_HIDDEN_ITEMS_START + 170) +#define FLAG_HIDDEN_ITEM_FIVE_ISLAND_MEMORIAL_PILLAR_RAZZ_BERRY (FLAG_HIDDEN_ITEMS_START + 171) +#define FLAG_HIDDEN_ITEM_FIVE_ISLAND_MEMORIAL_PILLAR_SITRUS_BERRY (FLAG_HIDDEN_ITEMS_START + 172) +#define FLAG_HIDDEN_ITEM_FIVE_ISLAND_MEMORIAL_PILLAR_BLUK_BERRY (FLAG_HIDDEN_ITEMS_START + 173) +#define FLAG_HIDDEN_ITEM_FIVE_ISLAND_RESORT_GORGEOUS_NEST_BALL (FLAG_HIDDEN_ITEMS_START + 174) +#define FLAG_HIDDEN_ITEM_FIVE_ISLAND_RESORT_GORGEOUS_STARDUST (FLAG_HIDDEN_ITEMS_START + 175) +#define FLAG_HIDDEN_ITEM_FIVE_ISLAND_RESORT_GORGEOUS_STAR_PIECE (FLAG_HIDDEN_ITEMS_START + 176) +#define FLAG_HIDDEN_ITEM_FIVE_ISLAND_RESORT_GORGEOUS_STARDUST_2 (FLAG_HIDDEN_ITEMS_START + 177) +#define FLAG_HIDDEN_ITEM_SIX_ISLAND_OUTCAST_ISLAND_STAR_PIECE (FLAG_HIDDEN_ITEMS_START + 178) +#define FLAG_HIDDEN_ITEM_SIX_ISLAND_OUTCAST_ISLAND_NET_BALL (FLAG_HIDDEN_ITEMS_START + 179) +#define FLAG_HIDDEN_ITEM_SIX_ISLAND_GREEN_PATH_ULTRA_BALL (FLAG_HIDDEN_ITEMS_START + 180) +#define FLAG_HIDDEN_ITEM_SIX_ISLAND_WATER_PATH_ASPEAR_BERRY (FLAG_HIDDEN_ITEMS_START + 181) +#define FLAG_HIDDEN_ITEM_SIX_ISLAND_WATER_PATH_ORAN_BERRY (FLAG_HIDDEN_ITEMS_START + 182) +#define FLAG_HIDDEN_ITEM_SIX_ISLAND_WATER_PATH_PINAP_BERRY (FLAG_HIDDEN_ITEMS_START + 183) +#define FLAG_HIDDEN_ITEM_SIX_ISLAND_LEPPA_BERRY (FLAG_HIDDEN_ITEMS_START + 184) +#define FLAG_HIDDEN_ITEM_SEVEN_ISLAND_TRAINER_TOWER_BIG_PEARL (FLAG_HIDDEN_ITEMS_START + 185) +#define FLAG_HIDDEN_ITEM_SEVEN_ISLAND_TRAINER_TOWER_PEARL (FLAG_HIDDEN_ITEMS_START + 186) +#define FLAG_HIDDEN_ITEM_SEVEN_ISLAND_TRAINER_TOWER_NANAB_BERRY (FLAG_HIDDEN_ITEMS_START + 187) +#define FLAG_HIDDEN_ITEM_SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE_RAWST_BERRY (FLAG_HIDDEN_ITEMS_START + 188) +#define FLAG_HIDDEN_ITEM_VIRIDIAN_CITY_GYM_MACHO_BRACE (FLAG_HIDDEN_ITEMS_START + 189) +#define FLAG_HIDDEN_ITEM_SSANNE_EXTERIOR_LAVA_COOKIE (FLAG_HIDDEN_ITEMS_START + 190) -// Unused? -#define FLAG_0x4A7 0x4A7 -#define FLAG_0x4A8 0x4A8 -#define FLAG_0x4A9 0x4A9 -#define FLAG_0x4AA 0x4AA -#define FLAG_0x4AB 0x4AB -#define FLAG_0x4AC 0x4AC -#define FLAG_0x4AD 0x4AD -#define FLAG_0x4AE 0x4AE -#define FLAG_0x4AF 0x4AF +// Unused hidden item flags +#define FLAG_UNUSED_0x4A7 0x4A7 // Unused Flag +#define FLAG_UNUSED_0x4A8 0x4A8 // Unused Flag +#define FLAG_UNUSED_0x4A9 0x4A9 // Unused Flag +#define FLAG_UNUSED_0x4AA 0x4AA // Unused Flag +#define FLAG_UNUSED_0x4AB 0x4AB // Unused Flag +#define FLAG_UNUSED_0x4AC 0x4AC // Unused Flag +#define FLAG_UNUSED_0x4AD 0x4AD // Unused Flag +#define FLAG_UNUSED_0x4AE 0x4AE // Unused Flag +#define FLAG_UNUSED_0x4AF 0x4AF // Unused Flag // Boss clear flags, 1200 #define FLAG_DEFEATED_BROCK 0x4B0 diff --git a/src/renewable_hidden_items.c b/src/renewable_hidden_items.c index 19eec3c29..e13829e93 100644 --- a/src/renewable_hidden_items.c +++ b/src/renewable_hidden_items.c @@ -3,527 +3,532 @@ #include "random.h" #include "constants/maps.h" +#define MAX_HIDDEN_ITEMS_PER_GROUP 8 + struct RenewableHiddenItemData { s8 mapGroup; s8 mapNum; u8 filler[2]; - u8 rare[8]; // 10% - u8 uncommon[8]; // 30% - u8 common[8]; // 60% + u8 rare[MAX_HIDDEN_ITEMS_PER_GROUP]; // 10% + u8 uncommon[MAX_HIDDEN_ITEMS_PER_GROUP]; // 30% + u8 common[MAX_HIDDEN_ITEMS_PER_GROUP]; // 60% }; static void SampleRenewableItemFlags(void); +#define HIDDEN_ID(flag)(flag - FLAG_HIDDEN_ITEMS_START) +#define NO_ITEM 0xFF + static const struct RenewableHiddenItemData sRenewableHiddenItems[] = { { .mapGroup = MAP_GROUP(ROUTE20), .mapNum = MAP_NUM(ROUTE20), .rare = { - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM }, .uncommon = { - HIDDEN_ITEM_ROUTE20_STARDUST, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF + HIDDEN_ID(FLAG_HIDDEN_ITEM_ROUTE20_STARDUST), + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM }, .common = { - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM } }, { .mapGroup = MAP_GROUP(ROUTE21_NORTH), .mapNum = MAP_NUM(ROUTE21_NORTH), .rare = { - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM }, .uncommon = { - HIDDEN_ITEM_ROUTE21_NORTH_PEARL, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF + HIDDEN_ID(FLAG_HIDDEN_ITEM_ROUTE21_NORTH_PEARL), + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM }, .common = { - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM } }, { .mapGroup = MAP_GROUP(UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL), .mapNum = MAP_NUM(UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL), .rare = { - HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_ETHER, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF + HIDDEN_ID(FLAG_HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_ETHER), + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM }, .uncommon = { - HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_POTION, - HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_ANTIDOTE, - HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_PARALYZE_HEAL, - HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_AWAKENING, - HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_BURN_HEAL, - HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_ICE_HEAL, - 0xFF, - 0xFF + HIDDEN_ID(FLAG_HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_POTION), + HIDDEN_ID(FLAG_HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_ANTIDOTE), + HIDDEN_ID(FLAG_HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_PARALYZE_HEAL), + HIDDEN_ID(FLAG_HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_AWAKENING), + HIDDEN_ID(FLAG_HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_BURN_HEAL), + HIDDEN_ID(FLAG_HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_ICE_HEAL), + NO_ITEM, + NO_ITEM }, .common = { - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM } }, { .mapGroup = MAP_GROUP(UNDERGROUND_PATH_EAST_WEST_TUNNEL), .mapNum = MAP_NUM(UNDERGROUND_PATH_EAST_WEST_TUNNEL), .rare = { - HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_ETHER, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF + HIDDEN_ID(FLAG_HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_ETHER), + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM }, .uncommon = { - HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_POTION, - HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_ANTIDOTE, - HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_PARALYZE_HEAL, - HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_AWAKENING, - HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_BURN_HEAL, - HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_ICE_HEAL, - 0xFF, - 0xFF + HIDDEN_ID(FLAG_HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_POTION), + HIDDEN_ID(FLAG_HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_ANTIDOTE), + HIDDEN_ID(FLAG_HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_PARALYZE_HEAL), + HIDDEN_ID(FLAG_HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_AWAKENING), + HIDDEN_ID(FLAG_HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_BURN_HEAL), + HIDDEN_ID(FLAG_HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_ICE_HEAL), + NO_ITEM, + NO_ITEM }, .common = { - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM } }, { .mapGroup = MAP_GROUP(SEVEN_ISLAND_TANOBY_RUINS), .mapNum = MAP_NUM(SEVEN_ISLAND_TANOBY_RUINS), .rare = { - HIDDEN_ITEM_SEVEN_ISLAND_TANOBY_RUINS_HEART_SCALE_4, - HIDDEN_ITEM_SEVEN_ISLAND_TANOBY_RUINS_HEART_SCALE, - HIDDEN_ITEM_SEVEN_ISLAND_TANOBY_RUINS_HEART_SCALE_2, - HIDDEN_ITEM_SEVEN_ISLAND_TANOBY_RUINS_HEART_SCALE_3, - 0xFF, - 0xFF, - 0xFF, - 0xFF + HIDDEN_ID(FLAG_HIDDEN_ITEM_SEVEN_ISLAND_TANOBY_RUINS_HEART_SCALE_4), + HIDDEN_ID(FLAG_HIDDEN_ITEM_SEVEN_ISLAND_TANOBY_RUINS_HEART_SCALE), + HIDDEN_ID(FLAG_HIDDEN_ITEM_SEVEN_ISLAND_TANOBY_RUINS_HEART_SCALE_2), + HIDDEN_ID(FLAG_HIDDEN_ITEM_SEVEN_ISLAND_TANOBY_RUINS_HEART_SCALE_3), + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM }, .uncommon = { - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM }, .common = { - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM } }, { .mapGroup = MAP_GROUP(MT_MOON_B1F), .mapNum = MAP_NUM(MT_MOON_B1F), .rare = { - HIDDEN_ITEM_MT_MOON_B1F_TINY_MUSHROOM, - HIDDEN_ITEM_MT_MOON_B1F_TINY_MUSHROOM_2, - HIDDEN_ITEM_MT_MOON_B1F_TINY_MUSHROOM_3, - HIDDEN_ITEM_MT_MOON_B1F_BIG_MUSHROOM, - HIDDEN_ITEM_MT_MOON_B1F_BIG_MUSHROOM_2, - HIDDEN_ITEM_MT_MOON_B1F_BIG_MUSHROOM_3, - 0xFF, - 0xFF + HIDDEN_ID(FLAG_HIDDEN_ITEM_MT_MOON_B1F_TINY_MUSHROOM), + HIDDEN_ID(FLAG_HIDDEN_ITEM_MT_MOON_B1F_TINY_MUSHROOM_2), + HIDDEN_ID(FLAG_HIDDEN_ITEM_MT_MOON_B1F_TINY_MUSHROOM_3), + HIDDEN_ID(FLAG_HIDDEN_ITEM_MT_MOON_B1F_BIG_MUSHROOM), + HIDDEN_ID(FLAG_HIDDEN_ITEM_MT_MOON_B1F_BIG_MUSHROOM_2), + HIDDEN_ID(FLAG_HIDDEN_ITEM_MT_MOON_B1F_BIG_MUSHROOM_3), + NO_ITEM, + NO_ITEM }, .uncommon = { - HIDDEN_ITEM_MT_MOON_B1F_TINY_MUSHROOM, - HIDDEN_ITEM_MT_MOON_B1F_TINY_MUSHROOM_2, - HIDDEN_ITEM_MT_MOON_B1F_TINY_MUSHROOM_3, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF + HIDDEN_ID(FLAG_HIDDEN_ITEM_MT_MOON_B1F_TINY_MUSHROOM), + HIDDEN_ID(FLAG_HIDDEN_ITEM_MT_MOON_B1F_TINY_MUSHROOM_2), + HIDDEN_ID(FLAG_HIDDEN_ITEM_MT_MOON_B1F_TINY_MUSHROOM_3), + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM }, .common = { - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM } }, { .mapGroup = MAP_GROUP(THREE_ISLAND_BERRY_FOREST), .mapNum = MAP_NUM(THREE_ISLAND_BERRY_FOREST), .rare = { - HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_BLUK_BERRY, - HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_WEPEAR_BERRY, - HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_ORAN_BERRY, - HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_CHERI_BERRY, - HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_ASPEAR_BERRY, - HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_PERSIM_BERRY, - HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_PINAP_BERRY, - HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_LUM_BERRY + HIDDEN_ID(FLAG_HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_BLUK_BERRY), + HIDDEN_ID(FLAG_HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_WEPEAR_BERRY), + HIDDEN_ID(FLAG_HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_ORAN_BERRY), + HIDDEN_ID(FLAG_HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_CHERI_BERRY), + HIDDEN_ID(FLAG_HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_ASPEAR_BERRY), + HIDDEN_ID(FLAG_HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_PERSIM_BERRY), + HIDDEN_ID(FLAG_HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_PINAP_BERRY), + HIDDEN_ID(FLAG_HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_LUM_BERRY), }, .uncommon = { - HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_BLUK_BERRY, - HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_WEPEAR_BERRY, - HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_ORAN_BERRY, - HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_CHERI_BERRY, - HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_ASPEAR_BERRY, - HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_PERSIM_BERRY, - HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_PINAP_BERRY, - 0xFF + HIDDEN_ID(FLAG_HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_BLUK_BERRY), + HIDDEN_ID(FLAG_HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_WEPEAR_BERRY), + HIDDEN_ID(FLAG_HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_ORAN_BERRY), + HIDDEN_ID(FLAG_HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_CHERI_BERRY), + HIDDEN_ID(FLAG_HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_ASPEAR_BERRY), + HIDDEN_ID(FLAG_HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_PERSIM_BERRY), + HIDDEN_ID(FLAG_HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_PINAP_BERRY), + NO_ITEM }, .common = { - HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_RAZZ_BERRY, - HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_NANAB_BERRY, - HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_CHESTO_BERRY, - HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_PECHA_BERRY, - HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_RAWST_BERRY, - 0xFF, - 0xFF, - 0xFF + HIDDEN_ID(FLAG_HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_RAZZ_BERRY), + HIDDEN_ID(FLAG_HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_NANAB_BERRY), + HIDDEN_ID(FLAG_HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_CHESTO_BERRY), + HIDDEN_ID(FLAG_HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_PECHA_BERRY), + HIDDEN_ID(FLAG_HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_RAWST_BERRY), + NO_ITEM, + NO_ITEM, + NO_ITEM } }, { .mapGroup = MAP_GROUP(ONE_ISLAND_TREASURE_BEACH), .mapNum = MAP_NUM(ONE_ISLAND_TREASURE_BEACH), .rare = { - HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_ULTRA_BALL, - HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_ULTRA_BALL_2, - HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_STAR_PIECE, - HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_BIG_PEARL, - 0xFF, - 0xFF, - 0xFF, - 0xFF + HIDDEN_ID(FLAG_HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_ULTRA_BALL), + HIDDEN_ID(FLAG_HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_ULTRA_BALL_2), + HIDDEN_ID(FLAG_HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_STAR_PIECE), + HIDDEN_ID(FLAG_HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_BIG_PEARL), + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM }, .uncommon = { - HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_STARDUST, - HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_STARDUST_2, - HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_PEARL, - HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_PEARL_2, - HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_ULTRA_BALL, - HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_ULTRA_BALL_2, - 0xFF, - 0xFF + HIDDEN_ID(FLAG_HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_STARDUST), + HIDDEN_ID(FLAG_HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_STARDUST_2), + HIDDEN_ID(FLAG_HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_PEARL), + HIDDEN_ID(FLAG_HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_PEARL_2), + HIDDEN_ID(FLAG_HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_ULTRA_BALL), + HIDDEN_ID(FLAG_HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_ULTRA_BALL_2), + NO_ITEM, + NO_ITEM }, .common = { - HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_ULTRA_BALL, - HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_ULTRA_BALL_2, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF + HIDDEN_ID(FLAG_HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_ULTRA_BALL), + HIDDEN_ID(FLAG_HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_ULTRA_BALL_2), + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM } }, { .mapGroup = MAP_GROUP(THREE_ISLAND_BOND_BRIDGE), .mapNum = MAP_NUM(THREE_ISLAND_BOND_BRIDGE), .rare = { - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM }, .uncommon = { - HIDDEN_ITEM_THREE_ISLAND_BOND_BRIDGE_PEARL, - HIDDEN_ITEM_THREE_ISLAND_BOND_BRIDGE_STARDUST, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF + HIDDEN_ID(FLAG_HIDDEN_ITEM_THREE_ISLAND_BOND_BRIDGE_PEARL), + HIDDEN_ID(FLAG_HIDDEN_ITEM_THREE_ISLAND_BOND_BRIDGE_STARDUST), + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM }, .common = { - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM } }, { .mapGroup = MAP_GROUP(FOUR_ISLAND), .mapNum = MAP_NUM(FOUR_ISLAND), .rare = { - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM }, .uncommon = { - HIDDEN_ITEM_FOUR_ISLAND_PEARL, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF + HIDDEN_ID(FLAG_HIDDEN_ITEM_FOUR_ISLAND_PEARL), + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM }, .common = { - HIDDEN_ITEM_FOUR_ISLAND_ULTRA_BALL, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF + HIDDEN_ID(FLAG_HIDDEN_ITEM_FOUR_ISLAND_ULTRA_BALL), + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM } }, { .mapGroup = MAP_GROUP(FIVE_ISLAND_MEMORIAL_PILLAR), .mapNum = MAP_NUM(FIVE_ISLAND_MEMORIAL_PILLAR), .rare = { - HIDDEN_ITEM_FIVE_ISLAND_MEMORIAL_PILLAR_BIG_PEARL, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF + HIDDEN_ID(FLAG_HIDDEN_ITEM_FIVE_ISLAND_MEMORIAL_PILLAR_BIG_PEARL), + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM }, .uncommon = { - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM }, .common = { - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM } }, { .mapGroup = MAP_GROUP(FIVE_ISLAND_RESORT_GORGEOUS), .mapNum = MAP_NUM(FIVE_ISLAND_RESORT_GORGEOUS), .rare = { - HIDDEN_ITEM_FIVE_ISLAND_RESORT_GORGEOUS_NEST_BALL, - HIDDEN_ITEM_FIVE_ISLAND_RESORT_GORGEOUS_STAR_PIECE, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF + HIDDEN_ID(FLAG_HIDDEN_ITEM_FIVE_ISLAND_RESORT_GORGEOUS_NEST_BALL), + HIDDEN_ID(FLAG_HIDDEN_ITEM_FIVE_ISLAND_RESORT_GORGEOUS_STAR_PIECE), + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM }, .uncommon = { - HIDDEN_ITEM_FIVE_ISLAND_RESORT_GORGEOUS_STARDUST, - HIDDEN_ITEM_FIVE_ISLAND_RESORT_GORGEOUS_STARDUST_2, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF + HIDDEN_ID(FLAG_HIDDEN_ITEM_FIVE_ISLAND_RESORT_GORGEOUS_STARDUST), + HIDDEN_ID(FLAG_HIDDEN_ITEM_FIVE_ISLAND_RESORT_GORGEOUS_STARDUST_2), + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM }, .common = { - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM } }, { .mapGroup = MAP_GROUP(SIX_ISLAND_OUTCAST_ISLAND), .mapNum = MAP_NUM(SIX_ISLAND_OUTCAST_ISLAND), .rare = { - HIDDEN_ITEM_SIX_ISLAND_OUTCAST_ISLAND_STAR_PIECE, - HIDDEN_ITEM_SIX_ISLAND_OUTCAST_ISLAND_NET_BALL, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF + HIDDEN_ID(FLAG_HIDDEN_ITEM_SIX_ISLAND_OUTCAST_ISLAND_STAR_PIECE), + HIDDEN_ID(FLAG_HIDDEN_ITEM_SIX_ISLAND_OUTCAST_ISLAND_NET_BALL), + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM }, .uncommon = { - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM }, .common = { - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM } }, { .mapGroup = MAP_GROUP(SIX_ISLAND_GREEN_PATH), .mapNum = MAP_NUM(SIX_ISLAND_GREEN_PATH), .rare = { - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM }, .uncommon = { - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM }, .common = { - HIDDEN_ITEM_SIX_ISLAND_GREEN_PATH_ULTRA_BALL, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF + HIDDEN_ID(FLAG_HIDDEN_ITEM_SIX_ISLAND_GREEN_PATH_ULTRA_BALL), + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM } }, { .mapGroup = MAP_GROUP(SEVEN_ISLAND_TRAINER_TOWER), .mapNum = MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER), .rare = { - HIDDEN_ITEM_SEVEN_ISLAND_TRAINER_TOWER_BIG_PEARL, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF + HIDDEN_ID(FLAG_HIDDEN_ITEM_SEVEN_ISLAND_TRAINER_TOWER_BIG_PEARL), + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM }, .uncommon = { - HIDDEN_ITEM_SEVEN_ISLAND_TRAINER_TOWER_PEARL, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF + HIDDEN_ID(FLAG_HIDDEN_ITEM_SEVEN_ISLAND_TRAINER_TOWER_PEARL), + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM }, .common = { - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM, + NO_ITEM } }, }; @@ -532,18 +537,18 @@ void SetAllRenewableItemFlags(void) { u8 i, j; - for (i = 0; i < 15; i++) + for (i = 0; i < ARRAY_COUNT(sRenewableHiddenItems); i++) { const u8 * rare = sRenewableHiddenItems[i].rare; const u8 * uncommon = sRenewableHiddenItems[i].uncommon; const u8 * common = sRenewableHiddenItems[i].common; - for (j = 0; j < 8; j++) + for (j = 0; j < MAX_HIDDEN_ITEMS_PER_GROUP; j++) { - if (rare[j] != 0xFF) + if (rare[j] != NO_ITEM) FlagSet(FLAG_HIDDEN_ITEMS_START + rare[j]); - if (uncommon[j] != 0xFF) + if (uncommon[j] != NO_ITEM) FlagSet(FLAG_HIDDEN_ITEMS_START + uncommon[j]); - if (common[j] != 0xFF) + if (common[j] != NO_ITEM) FlagSet(FLAG_HIDDEN_ITEMS_START + common[j]); } } @@ -562,9 +567,10 @@ void TryRegenerateRenewableHiddenItems(void) { u8 i; u8 found_map = 0xFF; - for (i = 0; i < 15; i++) + for (i = 0; i < ARRAY_COUNT(sRenewableHiddenItems); i++) { - if (sRenewableHiddenItems[i].mapGroup == gSaveBlock1Ptr->location.mapGroup && sRenewableHiddenItems[i].mapNum == gSaveBlock1Ptr->location.mapNum) + if (sRenewableHiddenItems[i].mapGroup == gSaveBlock1Ptr->location.mapGroup + && sRenewableHiddenItems[i].mapNum == gSaveBlock1Ptr->location.mapNum) found_map = i; } @@ -584,7 +590,7 @@ static void SampleRenewableItemFlags(void) const u8 * flags; u16 rval; - for (i = 0; i < 15; i++) + for (i = 0; i < ARRAY_COUNT(sRenewableHiddenItems); i++) { rval = Random() % 100; if (rval >= 90) @@ -593,9 +599,9 @@ static void SampleRenewableItemFlags(void) flags = sRenewableHiddenItems[i].uncommon; else flags = sRenewableHiddenItems[i].common; - for (j = 0; j < 8; j++) + for (j = 0; j < MAX_HIDDEN_ITEMS_PER_GROUP; j++) { - if (flags[j] != 0xFF) + if (flags[j] != NO_ITEM) FlagClear(FLAG_HIDDEN_ITEMS_START + flags[j]); } }