diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-18 15:02:34 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-18 15:02:34 -0400 |
| commit | a7bca8aa92b7696047bcb3da8607ac7981647630 (patch) | |
| tree | 33966fc3c2cbec395c55df39a8a215be73716686 | |
| parent | e363b0e2bf9858fb4a211fdaf90eed22e9afa2f5 (diff) | |
Hidden item flags
427 files changed, 888 insertions, 885 deletions
diff --git a/data/maps/BirthIsland_Exterior/map.json b/data/maps/BirthIsland_Exterior/map.json index 5ee37131f..1917fd784 100644 --- a/data/maps/BirthIsland_Exterior/map.json +++ b/data/maps/BirthIsland_Exterior/map.json @@ -51,4 +51,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/BirthIsland_Harbor/map.json b/data/maps/BirthIsland_Harbor/map.json index cecda6ec5..55da4327c 100644 --- a/data/maps/BirthIsland_Harbor/map.json +++ b/data/maps/BirthIsland_Harbor/map.json @@ -51,4 +51,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/CeladonCity/map.json b/data/maps/CeladonCity/map.json index f1133090e..1909a3f3f 100644 --- a/data/maps/CeladonCity/map.json +++ b/data/maps/CeladonCity/map.json @@ -377,8 +377,8 @@ "y": 20, "elevation": 3, "item": "ITEM_PP_UP", - "flag": "47", + "flag": "HIDDEN_ITEM_CELADON_CITY_PP_UP", "unknown": 1 } ] -} +}
\ No newline at end of file diff --git a/data/maps/CeladonCity_Condominiums_1F/map.json b/data/maps/CeladonCity_Condominiums_1F/map.json index cb315ade8..890d86c0e 100644 --- a/data/maps/CeladonCity_Condominiums_1F/map.json +++ b/data/maps/CeladonCity_Condominiums_1F/map.json @@ -127,4 +127,4 @@ "script": "CeladonCity_Condominiums_1F_EventScript_16C3C7" } ] -} +}
\ No newline at end of file diff --git a/data/maps/CeladonCity_Condominiums_2F/map.json b/data/maps/CeladonCity_Condominiums_2F/map.json index e460de793..01e51d09f 100644 --- a/data/maps/CeladonCity_Condominiums_2F/map.json +++ b/data/maps/CeladonCity_Condominiums_2F/map.json @@ -87,4 +87,4 @@ "script": "CeladonCity_Condominiums_2F_EventScript_16C3D1" } ] -} +}
\ No newline at end of file diff --git a/data/maps/CeladonCity_Condominiums_3F/map.json b/data/maps/CeladonCity_Condominiums_3F/map.json index 4a405c3f1..fc18a3464 100644 --- a/data/maps/CeladonCity_Condominiums_3F/map.json +++ b/data/maps/CeladonCity_Condominiums_3F/map.json @@ -155,4 +155,4 @@ "script": "CeladonCity_Condominiums_3F_EventScript_16C447" } ] -} +}
\ No newline at end of file diff --git a/data/maps/CeladonCity_Condominiums_Roof/map.json b/data/maps/CeladonCity_Condominiums_Roof/map.json index 7680f5f68..d7c47fad4 100644 --- a/data/maps/CeladonCity_Condominiums_Roof/map.json +++ b/data/maps/CeladonCity_Condominiums_Roof/map.json @@ -53,4 +53,4 @@ "script": "CeladonCity_Condominiums_Roof_EventScript_16C45A" } ] -} +}
\ No newline at end of file diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json index aee589439..41f1ed584 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json @@ -87,4 +87,4 @@ "script": "CeladonCity_Condominiums_RoofRoom_EventScript_16C519" } ] -} +}
\ No newline at end of file diff --git a/data/maps/CeladonCity_DepartmentStore_1F/map.json b/data/maps/CeladonCity_DepartmentStore_1F/map.json index 412eb4008..e49a15735 100644 --- a/data/maps/CeladonCity_DepartmentStore_1F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_1F/map.json @@ -102,4 +102,4 @@ "script": "CeladonCity_DepartmentStore_1F_EventScript_16BAEB" } ] -} +}
\ No newline at end of file diff --git a/data/maps/CeladonCity_DepartmentStore_2F/map.json b/data/maps/CeladonCity_DepartmentStore_2F/map.json index 42d5c76f5..6deef2e85 100644 --- a/data/maps/CeladonCity_DepartmentStore_2F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_2F/map.json @@ -99,4 +99,4 @@ "script": "CeladonCity_DepartmentStore_2F_EventScript_16BB07" } ] -} +}
\ No newline at end of file diff --git a/data/maps/CeladonCity_DepartmentStore_3F/map.json b/data/maps/CeladonCity_DepartmentStore_3F/map.json index 21780d544..fceb58a45 100644 --- a/data/maps/CeladonCity_DepartmentStore_3F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_3F/map.json @@ -182,4 +182,4 @@ "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBE5" } ] -} +}
\ No newline at end of file diff --git a/data/maps/CeladonCity_DepartmentStore_4F/map.json b/data/maps/CeladonCity_DepartmentStore_4F/map.json index 8598fbae4..3bf575200 100644 --- a/data/maps/CeladonCity_DepartmentStore_4F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_4F/map.json @@ -86,4 +86,4 @@ "script": "CeladonCity_DepartmentStore_4F_EventScript_16BC01" } ] -} +}
\ No newline at end of file diff --git a/data/maps/CeladonCity_DepartmentStore_5F/map.json b/data/maps/CeladonCity_DepartmentStore_5F/map.json index 12e86270d..8304a8af7 100644 --- a/data/maps/CeladonCity_DepartmentStore_5F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_5F/map.json @@ -99,4 +99,4 @@ "script": "CeladonCity_DepartmentStore_5F_EventScript_16BC53" } ] -} +}
\ No newline at end of file diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/map.json b/data/maps/CeladonCity_DepartmentStore_Elevator/map.json index a2a7d1b48..f09b66581 100644 --- a/data/maps/CeladonCity_DepartmentStore_Elevator/map.json +++ b/data/maps/CeladonCity_DepartmentStore_Elevator/map.json @@ -46,4 +46,4 @@ "script": "CeladonCity_DepartmentStore_Elevator_EventScript_16C153" } ] -} +}
\ No newline at end of file diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/map.json b/data/maps/CeladonCity_DepartmentStore_Roof/map.json index fc4f32491..42018db0c 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/map.json +++ b/data/maps/CeladonCity_DepartmentStore_Roof/map.json @@ -80,4 +80,4 @@ "script": "CeladonCity_DepartmentStore_Roof_EventScript_16C034" } ] -} +}
\ No newline at end of file diff --git a/data/maps/CeladonCity_GameCorner/map.json b/data/maps/CeladonCity_GameCorner/map.json index 006c6ae0b..b24133e41 100644 --- a/data/maps/CeladonCity_GameCorner/map.json +++ b/data/maps/CeladonCity_GameCorner/map.json @@ -195,7 +195,7 @@ "y": 4, "elevation": 3, "item": "ITEM_NONE", - "flag": "51", + "flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_NONE", "unknown": 10 }, { @@ -204,7 +204,7 @@ "y": 8, "elevation": 3, "item": "ITEM_NONE", - "flag": "52", + "flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_NONE_2", "unknown": 10 }, { @@ -213,7 +213,7 @@ "y": 11, "elevation": 3, "item": "ITEM_NONE", - "flag": "53", + "flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_NONE_3", "unknown": 20 }, { @@ -222,7 +222,7 @@ "y": 12, "elevation": 3, "item": "ITEM_NONE", - "flag": "54", + "flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_NONE_4", "unknown": 10 }, { @@ -231,7 +231,7 @@ "y": 9, "elevation": 3, "item": "ITEM_NONE", - "flag": "55", + "flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_NONE_5", "unknown": 10 }, { @@ -240,7 +240,7 @@ "y": 5, "elevation": 3, "item": "ITEM_NONE", - "flag": "56", + "flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_NONE_6", "unknown": 20 }, { @@ -249,7 +249,7 @@ "y": 4, "elevation": 3, "item": "ITEM_NONE", - "flag": "57", + "flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_NONE_7", "unknown": 10 }, { @@ -258,7 +258,7 @@ "y": 3, "elevation": 3, "item": "ITEM_NONE", - "flag": "58", + "flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_NONE_8", "unknown": 10 }, { @@ -267,7 +267,7 @@ "y": 5, "elevation": 3, "item": "ITEM_NONE", - "flag": "59", + "flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_NONE_9", "unknown": 10 }, { @@ -276,7 +276,7 @@ "y": 5, "elevation": 3, "item": "ITEM_NONE", - "flag": "60", + "flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_NONE_10", "unknown": 40 }, { @@ -285,7 +285,7 @@ "y": 13, "elevation": 3, "item": "ITEM_NONE", - "flag": "61", + "flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_NONE_11", "unknown": 100 }, { @@ -294,7 +294,7 @@ "y": 12, "elevation": 3, "item": "ITEM_NONE", - "flag": "62", + "flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_NONE_12", "unknown": 10 }, { @@ -466,4 +466,4 @@ "script": "CeladonCity_GameCorner_EventScript_1B2867" } ] -} +}
\ No newline at end of file diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json index d4085c047..fb3db526e 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json @@ -104,4 +104,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/CeladonCity_Gym/map.json b/data/maps/CeladonCity_Gym/map.json index 15647d28f..34c4207ba 100644 --- a/data/maps/CeladonCity_Gym/map.json +++ b/data/maps/CeladonCity_Gym/map.json @@ -197,4 +197,4 @@ "script": "CeladonCity_Gym_EventScript_16D1CC" } ] -} +}
\ No newline at end of file diff --git a/data/maps/CeladonCity_Hotel/map.json b/data/maps/CeladonCity_Hotel/map.json index 0bb559faf..b2e232870 100644 --- a/data/maps/CeladonCity_Hotel/map.json +++ b/data/maps/CeladonCity_Hotel/map.json @@ -91,4 +91,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/CeladonCity_House1/map.json b/data/maps/CeladonCity_House1/map.json index 40d610292..0d1fff627 100644 --- a/data/maps/CeladonCity_House1/map.json +++ b/data/maps/CeladonCity_House1/map.json @@ -78,4 +78,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/CeladonCity_PokemonCenter_1F/map.json b/data/maps/CeladonCity_PokemonCenter_1F/map.json index 57eee5a1d..2a4d48e24 100644 --- a/data/maps/CeladonCity_PokemonCenter_1F/map.json +++ b/data/maps/CeladonCity_PokemonCenter_1F/map.json @@ -98,4 +98,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/CeladonCity_PokemonCenter_2F/map.json b/data/maps/CeladonCity_PokemonCenter_2F/map.json index faa029c1f..4bb3df167 100644 --- a/data/maps/CeladonCity_PokemonCenter_2F/map.json +++ b/data/maps/CeladonCity_PokemonCenter_2F/map.json @@ -91,4 +91,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/CeladonCity_Restaurant/map.json b/data/maps/CeladonCity_Restaurant/map.json index 1abb5c5ae..6786b4305 100644 --- a/data/maps/CeladonCity_Restaurant/map.json +++ b/data/maps/CeladonCity_Restaurant/map.json @@ -104,4 +104,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/CeruleanCave_1F/map.json b/data/maps/CeruleanCave_1F/map.json index 4479d1792..b82b31a03 100644 --- a/data/maps/CeruleanCave_1F/map.json +++ b/data/maps/CeruleanCave_1F/map.json @@ -196,9 +196,9 @@ "x": 12, "y": 2, "elevation": 3, - "item": "POCKET_KEY_ITEMS", - "flag": "39", + "item": "ITEM_ULTRA_BALL", + "flag": "HIDDEN_ITEM_CERULEAN_CAVE_1F_ULTRA_BALL", "unknown": 1 } ] -} +}
\ No newline at end of file diff --git a/data/maps/CeruleanCave_2F/map.json b/data/maps/CeruleanCave_2F/map.json index 73fd1877f..98a8186d6 100644 --- a/data/maps/CeruleanCave_2F/map.json +++ b/data/maps/CeruleanCave_2F/map.json @@ -229,4 +229,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/CeruleanCave_B1F/map.json b/data/maps/CeruleanCave_B1F/map.json index 8ad1ef685..ab95d405d 100644 --- a/data/maps/CeruleanCave_B1F/map.json +++ b/data/maps/CeruleanCave_B1F/map.json @@ -181,4 +181,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/CeruleanCity/map.json b/data/maps/CeruleanCity/map.json index 5d9ed18fa..e6d30aa20 100644 --- a/data/maps/CeruleanCity/map.json +++ b/data/maps/CeruleanCity/map.json @@ -373,7 +373,7 @@ "y": 7, "elevation": 3, "item": "ITEM_RARE_CANDY", - "flag": "49", + "flag": "HIDDEN_ITEM_CERULEAN_CITY_RARE_CANDY", "unknown": 1 }, { @@ -398,4 +398,4 @@ "script": "CeruleanCity_EventScript_16AC94" } ] -} +}
\ No newline at end of file diff --git a/data/maps/CeruleanCity_BikeShop/map.json b/data/maps/CeruleanCity_BikeShop/map.json index 0f56bc949..57b02b71d 100644 --- a/data/maps/CeruleanCity_BikeShop/map.json +++ b/data/maps/CeruleanCity_BikeShop/map.json @@ -135,4 +135,4 @@ "script": "CeruleanCity_BikeShop_EventScript_16AC94" } ] -} +}
\ No newline at end of file diff --git a/data/maps/CeruleanCity_Gym/map.json b/data/maps/CeruleanCity_Gym/map.json index ad41f1e70..0f43b54eb 100644 --- a/data/maps/CeruleanCity_Gym/map.json +++ b/data/maps/CeruleanCity_Gym/map.json @@ -106,4 +106,4 @@ "script": "CeruleanCity_Gym_EventScript_16AB9E" } ] -} +}
\ No newline at end of file diff --git a/data/maps/CeruleanCity_House1/map.json b/data/maps/CeruleanCity_House1/map.json index 51f0db0ca..26e01f417 100644 --- a/data/maps/CeruleanCity_House1/map.json +++ b/data/maps/CeruleanCity_House1/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/CeruleanCity_House2/map.json b/data/maps/CeruleanCity_House2/map.json index 6865c93a0..551b87257 100644 --- a/data/maps/CeruleanCity_House2/map.json +++ b/data/maps/CeruleanCity_House2/map.json @@ -80,4 +80,4 @@ "script": "CeruleanCity_House2_EventScript_16A99E" } ] -} +}
\ No newline at end of file diff --git a/data/maps/CeruleanCity_House3/map.json b/data/maps/CeruleanCity_House3/map.json index 829ae2084..273e623d5 100644 --- a/data/maps/CeruleanCity_House3/map.json +++ b/data/maps/CeruleanCity_House3/map.json @@ -65,4 +65,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/CeruleanCity_House4/map.json b/data/maps/CeruleanCity_House4/map.json index ee56f7d91..04c73657f 100644 --- a/data/maps/CeruleanCity_House4/map.json +++ b/data/maps/CeruleanCity_House4/map.json @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/CeruleanCity_House5/map.json b/data/maps/CeruleanCity_House5/map.json index 489ae791f..658aedf2f 100644 --- a/data/maps/CeruleanCity_House5/map.json +++ b/data/maps/CeruleanCity_House5/map.json @@ -46,4 +46,4 @@ "script": "CeruleanCity_House5_EventScript_16B0DA" } ] -} +}
\ No newline at end of file diff --git a/data/maps/CeruleanCity_Mart/map.json b/data/maps/CeruleanCity_Mart/map.json index e29ff56dd..3e20f3a40 100644 --- a/data/maps/CeruleanCity_Mart/map.json +++ b/data/maps/CeruleanCity_Mart/map.json @@ -78,4 +78,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/CeruleanCity_PokemonCenter_1F/map.json b/data/maps/CeruleanCity_PokemonCenter_1F/map.json index f80669fac..098b1faed 100644 --- a/data/maps/CeruleanCity_PokemonCenter_1F/map.json +++ b/data/maps/CeruleanCity_PokemonCenter_1F/map.json @@ -137,4 +137,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/CeruleanCity_PokemonCenter_2F/map.json b/data/maps/CeruleanCity_PokemonCenter_2F/map.json index 228bfa8a3..b669c0b7a 100644 --- a/data/maps/CeruleanCity_PokemonCenter_2F/map.json +++ b/data/maps/CeruleanCity_PokemonCenter_2F/map.json @@ -91,4 +91,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/CinnabarIsland/map.json b/data/maps/CinnabarIsland/map.json index 5e2726a36..0c04fed96 100644 --- a/data/maps/CinnabarIsland/map.json +++ b/data/maps/CinnabarIsland/map.json @@ -155,4 +155,4 @@ "script": "CinnabarIsland_EventScript_16721A" } ] -} +}
\ No newline at end of file diff --git a/data/maps/CinnabarIsland_Gym/map.json b/data/maps/CinnabarIsland_Gym/map.json index 83cc3ffc0..af11f23fb 100644 --- a/data/maps/CinnabarIsland_Gym/map.json +++ b/data/maps/CinnabarIsland_Gym/map.json @@ -262,4 +262,4 @@ "script": "CinnabarIsland_Gym_EventScript_1ACF07" } ] -} +}
\ No newline at end of file diff --git a/data/maps/CinnabarIsland_Mart/map.json b/data/maps/CinnabarIsland_Mart/map.json index 1d40fc33d..cf796d1e9 100644 --- a/data/maps/CinnabarIsland_Mart/map.json +++ b/data/maps/CinnabarIsland_Mart/map.json @@ -78,4 +78,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/map.json b/data/maps/CinnabarIsland_PokemonCenter_1F/map.json index e14c68123..a37e5bdca 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/map.json +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/map.json @@ -137,4 +137,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json index 258320b9b..f9356e182 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json +++ b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json @@ -91,4 +91,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json b/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json index 4c0d5d33a..e757c41c5 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json @@ -102,4 +102,4 @@ "script": "CinnabarIsland_PokemonLab_Entrance_EventScript_16E2AF" } ] -} +}
\ No newline at end of file diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json index c0bd22e9d..32d5faadb 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json @@ -51,4 +51,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json b/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json index a7af3e0c9..fc2c4192a 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json @@ -64,4 +64,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json index 42fc53a4c..86c99143c 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json @@ -66,4 +66,4 @@ "script": "CinnabarIsland_PokemonLab_ResearchRoom_EventScript_16E3EE" } ] -} +}
\ No newline at end of file diff --git a/data/maps/DiglettsCave_B1F/map.json b/data/maps/DiglettsCave_B1F/map.json index 0b5479841..9d963ccac 100644 --- a/data/maps/DiglettsCave_B1F/map.json +++ b/data/maps/DiglettsCave_B1F/map.json @@ -31,4 +31,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/DiglettsCave_NorthEntrance/map.json b/data/maps/DiglettsCave_NorthEntrance/map.json index 1ee6434d7..4218f0cb9 100644 --- a/data/maps/DiglettsCave_NorthEntrance/map.json +++ b/data/maps/DiglettsCave_NorthEntrance/map.json @@ -45,4 +45,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/DiglettsCave_SouthEntrance/map.json b/data/maps/DiglettsCave_SouthEntrance/map.json index c62cc1258..944bbef6c 100644 --- a/data/maps/DiglettsCave_SouthEntrance/map.json +++ b/data/maps/DiglettsCave_SouthEntrance/map.json @@ -45,4 +45,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/FiveIsland/map.json b/data/maps/FiveIsland/map.json index 5dd4a4ac4..a4f869715 100644 --- a/data/maps/FiveIsland/map.json +++ b/data/maps/FiveIsland/map.json @@ -104,4 +104,4 @@ "script": "FiveIsland_EventScript_167E98" } ] -} +}
\ No newline at end of file diff --git a/data/maps/FiveIsland_Harbor/map.json b/data/maps/FiveIsland_Harbor/map.json index 835b1ef31..ef9b8dffe 100644 --- a/data/maps/FiveIsland_Harbor/map.json +++ b/data/maps/FiveIsland_Harbor/map.json @@ -51,4 +51,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/FiveIsland_House1/map.json b/data/maps/FiveIsland_House1/map.json index 45ac73f0f..033537bbd 100644 --- a/data/maps/FiveIsland_House1/map.json +++ b/data/maps/FiveIsland_House1/map.json @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/FiveIsland_House2/map.json b/data/maps/FiveIsland_House2/map.json index d9b1ca36e..a64bf9a16 100644 --- a/data/maps/FiveIsland_House2/map.json +++ b/data/maps/FiveIsland_House2/map.json @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/FiveIsland_LostCave_Entrance/map.json b/data/maps/FiveIsland_LostCave_Entrance/map.json index 4d044b6de..059e89de5 100644 --- a/data/maps/FiveIsland_LostCave_Entrance/map.json +++ b/data/maps/FiveIsland_LostCave_Entrance/map.json @@ -31,4 +31,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/FiveIsland_LostCave_Room1/map.json b/data/maps/FiveIsland_LostCave_Room1/map.json index 46a9371be..1d8321319 100644 --- a/data/maps/FiveIsland_LostCave_Room1/map.json +++ b/data/maps/FiveIsland_LostCave_Room1/map.json @@ -66,4 +66,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/FiveIsland_LostCave_Room10/map.json b/data/maps/FiveIsland_LostCave_Room10/map.json index af59dbf68..82fcbdb73 100644 --- a/data/maps/FiveIsland_LostCave_Room10/map.json +++ b/data/maps/FiveIsland_LostCave_Room10/map.json @@ -51,4 +51,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/FiveIsland_LostCave_Room11/map.json b/data/maps/FiveIsland_LostCave_Room11/map.json index 1bb718599..3d20ed88f 100644 --- a/data/maps/FiveIsland_LostCave_Room11/map.json +++ b/data/maps/FiveIsland_LostCave_Room11/map.json @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/FiveIsland_LostCave_Room12/map.json b/data/maps/FiveIsland_LostCave_Room12/map.json index 19a4d07fb..c5e58f109 100644 --- a/data/maps/FiveIsland_LostCave_Room12/map.json +++ b/data/maps/FiveIsland_LostCave_Room12/map.json @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/FiveIsland_LostCave_Room13/map.json b/data/maps/FiveIsland_LostCave_Room13/map.json index 12c0a2295..8fe0d99c1 100644 --- a/data/maps/FiveIsland_LostCave_Room13/map.json +++ b/data/maps/FiveIsland_LostCave_Room13/map.json @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/FiveIsland_LostCave_Room14/map.json b/data/maps/FiveIsland_LostCave_Room14/map.json index 0d5204697..f47e71c9a 100644 --- a/data/maps/FiveIsland_LostCave_Room14/map.json +++ b/data/maps/FiveIsland_LostCave_Room14/map.json @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/FiveIsland_LostCave_Room2/map.json b/data/maps/FiveIsland_LostCave_Room2/map.json index 25a7996e6..58beef001 100644 --- a/data/maps/FiveIsland_LostCave_Room2/map.json +++ b/data/maps/FiveIsland_LostCave_Room2/map.json @@ -45,4 +45,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/FiveIsland_LostCave_Room3/map.json b/data/maps/FiveIsland_LostCave_Room3/map.json index 885c75d45..48c9e0788 100644 --- a/data/maps/FiveIsland_LostCave_Room3/map.json +++ b/data/maps/FiveIsland_LostCave_Room3/map.json @@ -45,4 +45,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/FiveIsland_LostCave_Room4/map.json b/data/maps/FiveIsland_LostCave_Room4/map.json index da9555287..ecfa7dba7 100644 --- a/data/maps/FiveIsland_LostCave_Room4/map.json +++ b/data/maps/FiveIsland_LostCave_Room4/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/FiveIsland_LostCave_Room5/map.json b/data/maps/FiveIsland_LostCave_Room5/map.json index ee295239d..e9c21699e 100644 --- a/data/maps/FiveIsland_LostCave_Room5/map.json +++ b/data/maps/FiveIsland_LostCave_Room5/map.json @@ -45,4 +45,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/FiveIsland_LostCave_Room6/map.json b/data/maps/FiveIsland_LostCave_Room6/map.json index cd6663ce8..62adb0db8 100644 --- a/data/maps/FiveIsland_LostCave_Room6/map.json +++ b/data/maps/FiveIsland_LostCave_Room6/map.json @@ -45,4 +45,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/FiveIsland_LostCave_Room7/map.json b/data/maps/FiveIsland_LostCave_Room7/map.json index 144f2099b..36aa26f2a 100644 --- a/data/maps/FiveIsland_LostCave_Room7/map.json +++ b/data/maps/FiveIsland_LostCave_Room7/map.json @@ -45,4 +45,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/FiveIsland_LostCave_Room8/map.json b/data/maps/FiveIsland_LostCave_Room8/map.json index 270a99c8f..3b3375d92 100644 --- a/data/maps/FiveIsland_LostCave_Room8/map.json +++ b/data/maps/FiveIsland_LostCave_Room8/map.json @@ -45,4 +45,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/FiveIsland_LostCave_Room9/map.json b/data/maps/FiveIsland_LostCave_Room9/map.json index ee2945b8d..001a2680e 100644 --- a/data/maps/FiveIsland_LostCave_Room9/map.json +++ b/data/maps/FiveIsland_LostCave_Room9/map.json @@ -45,4 +45,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/FiveIsland_Meadow/map.json b/data/maps/FiveIsland_Meadow/map.json index 2d374bd56..13208ecf8 100644 --- a/data/maps/FiveIsland_Meadow/map.json +++ b/data/maps/FiveIsland_Meadow/map.json @@ -135,4 +135,4 @@ "script": "FiveIsland_Meadow_EventScript_168942" } ] -} +}
\ No newline at end of file diff --git a/data/maps/FiveIsland_MemorialPillar/map.json b/data/maps/FiveIsland_MemorialPillar/map.json index 0f7ba8199..a5dc6eeda 100644 --- a/data/maps/FiveIsland_MemorialPillar/map.json +++ b/data/maps/FiveIsland_MemorialPillar/map.json @@ -101,7 +101,7 @@ "y": 52, "elevation": 3, "item": "ITEM_BIG_PEARL", - "flag": "170", + "flag": "HIDDEN_ITEM_FIVE_ISLAND_MEMORIAL_PILLAR_BIG_PEARL", "unknown": 1 }, { @@ -110,7 +110,7 @@ "y": 7, "elevation": 3, "item": "ITEM_RAZZ_BERRY", - "flag": "171", + "flag": "HIDDEN_ITEM_FIVE_ISLAND_MEMORIAL_PILLAR_RAZZ_BERRY", "unknown": 1 }, { @@ -119,7 +119,7 @@ "y": 22, "elevation": 3, "item": "ITEM_SITRUS_BERRY", - "flag": "172", + "flag": "HIDDEN_ITEM_FIVE_ISLAND_MEMORIAL_PILLAR_SITRUS_BERRY", "unknown": 1 }, { @@ -128,8 +128,8 @@ "y": 25, "elevation": 3, "item": "ITEM_BLUK_BERRY", - "flag": "173", + "flag": "HIDDEN_ITEM_FIVE_ISLAND_MEMORIAL_PILLAR_BLUK_BERRY", "unknown": 1 } ] -} +}
\ No newline at end of file diff --git a/data/maps/FiveIsland_PokemonCenter_1F/map.json b/data/maps/FiveIsland_PokemonCenter_1F/map.json index af0f12fde..f541cade9 100644 --- a/data/maps/FiveIsland_PokemonCenter_1F/map.json +++ b/data/maps/FiveIsland_PokemonCenter_1F/map.json @@ -97,4 +97,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/FiveIsland_PokemonCenter_2F/map.json b/data/maps/FiveIsland_PokemonCenter_2F/map.json index d1c083cb7..718947270 100644 --- a/data/maps/FiveIsland_PokemonCenter_2F/map.json +++ b/data/maps/FiveIsland_PokemonCenter_2F/map.json @@ -91,4 +91,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/FiveIsland_ResortGorgeous/map.json b/data/maps/FiveIsland_ResortGorgeous/map.json index b9f0c8179..c4f208247 100644 --- a/data/maps/FiveIsland_ResortGorgeous/map.json +++ b/data/maps/FiveIsland_ResortGorgeous/map.json @@ -148,7 +148,7 @@ "y": 7, "elevation": 3, "item": "ITEM_NEST_BALL", - "flag": "174", + "flag": "HIDDEN_ITEM_FIVE_ISLAND_RESORT_GORGEOUS_NEST_BALL", "unknown": 1 }, { @@ -157,7 +157,7 @@ "y": 11, "elevation": 3, "item": "ITEM_STARDUST", - "flag": "175", + "flag": "HIDDEN_ITEM_FIVE_ISLAND_RESORT_GORGEOUS_STARDUST", "unknown": 1 }, { @@ -166,7 +166,7 @@ "y": 12, "elevation": 3, "item": "ITEM_STAR_PIECE", - "flag": "176", + "flag": "HIDDEN_ITEM_FIVE_ISLAND_RESORT_GORGEOUS_STAR_PIECE", "unknown": 1 }, { @@ -175,7 +175,7 @@ "y": 5, "elevation": 3, "item": "ITEM_STARDUST", - "flag": "177", + "flag": "HIDDEN_ITEM_FIVE_ISLAND_RESORT_GORGEOUS_STARDUST_2", "unknown": 1 }, { @@ -186,4 +186,4 @@ "script": "FiveIsland_ResortGorgeous_EventScript_168844" } ] -} +}
\ No newline at end of file diff --git a/data/maps/FiveIsland_ResortGorgeous_House/map.json b/data/maps/FiveIsland_ResortGorgeous_House/map.json index 60c8196d3..f3c7b873c 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/map.json +++ b/data/maps/FiveIsland_ResortGorgeous_House/map.json @@ -66,4 +66,4 @@ "script": "FiveIsland_ResortGorgeous_House_EventScript_1ACF2C" } ] -} +}
\ No newline at end of file diff --git a/data/maps/FiveIsland_RocketWarehouse/map.json b/data/maps/FiveIsland_RocketWarehouse/map.json index c82cf9f50..dcb08c97f 100644 --- a/data/maps/FiveIsland_RocketWarehouse/map.json +++ b/data/maps/FiveIsland_RocketWarehouse/map.json @@ -203,7 +203,7 @@ "y": 2, "elevation": 0, "item": "ITEM_NEST_BALL", - "flag": "68", + "flag": "HIDDEN_ITEM_FIVE_ISLAND_ROCKET_WAREHOUSE_NEST_BALL", "unknown": 1 }, { @@ -212,7 +212,7 @@ "y": 16, "elevation": 0, "item": "ITEM_NET_BALL", - "flag": "69", + "flag": "HIDDEN_ITEM_FIVE_ISLAND_ROCKET_WAREHOUSE_NET_BALL", "unknown": 1 }, { @@ -363,4 +363,4 @@ "script": "FiveIsland_RocketWarehouse_EventScript_163F5A" } ] -} +}
\ No newline at end of file diff --git a/data/maps/FiveIsland_WaterLabyrinth/map.json b/data/maps/FiveIsland_WaterLabyrinth/map.json index 173c247da..526eedb62 100644 --- a/data/maps/FiveIsland_WaterLabyrinth/map.json +++ b/data/maps/FiveIsland_WaterLabyrinth/map.json @@ -54,4 +54,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/FourIsland/map.json b/data/maps/FourIsland/map.json index e920ba0af..c1b189acb 100644 --- a/data/maps/FourIsland/map.json +++ b/data/maps/FourIsland/map.json @@ -243,7 +243,7 @@ "y": 34, "elevation": 3, "item": "ITEM_PEARL", - "flag": "168", + "flag": "HIDDEN_ITEM_FOUR_ISLAND_PEARL", "unknown": 1 }, { @@ -251,8 +251,8 @@ "x": 6, "y": 21, "elevation": 3, - "item": "POCKET_KEY_ITEMS", - "flag": "169", + "item": "ITEM_ULTRA_BALL", + "flag": "HIDDEN_ITEM_FOUR_ISLAND_ULTRA_BALL", "unknown": 1 }, { @@ -263,4 +263,4 @@ "script": "FourIsland_EventScript_167E85" } ] -} +}
\ No newline at end of file diff --git a/data/maps/FourIsland_Harbor/map.json b/data/maps/FourIsland_Harbor/map.json index e7507d3fe..a4a67caaf 100644 --- a/data/maps/FourIsland_Harbor/map.json +++ b/data/maps/FourIsland_Harbor/map.json @@ -51,4 +51,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/FourIsland_House1/map.json b/data/maps/FourIsland_House1/map.json index a33509d0c..0b504f9d1 100644 --- a/data/maps/FourIsland_House1/map.json +++ b/data/maps/FourIsland_House1/map.json @@ -51,4 +51,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/FourIsland_House2/map.json b/data/maps/FourIsland_House2/map.json index bfb59deeb..593722b8c 100644 --- a/data/maps/FourIsland_House2/map.json +++ b/data/maps/FourIsland_House2/map.json @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/FourIsland_IcefallCave_1F/map.json b/data/maps/FourIsland_IcefallCave_1F/map.json index 9a9bb955a..670212bfa 100644 --- a/data/maps/FourIsland_IcefallCave_1F/map.json +++ b/data/maps/FourIsland_IcefallCave_1F/map.json @@ -86,4 +86,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/FourIsland_IcefallCave_B1F/map.json b/data/maps/FourIsland_IcefallCave_B1F/map.json index 709b24259..ae1b2864f 100644 --- a/data/maps/FourIsland_IcefallCave_B1F/map.json +++ b/data/maps/FourIsland_IcefallCave_B1F/map.json @@ -65,4 +65,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/FourIsland_IcefallCave_Back/map.json b/data/maps/FourIsland_IcefallCave_Back/map.json index b47ef6927..6300f1f6f 100644 --- a/data/maps/FourIsland_IcefallCave_Back/map.json +++ b/data/maps/FourIsland_IcefallCave_Back/map.json @@ -105,4 +105,4 @@ } ], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/FourIsland_IcefallCave_Entrance/map.json b/data/maps/FourIsland_IcefallCave_Entrance/map.json index 3315c36b5..e2338498a 100644 --- a/data/maps/FourIsland_IcefallCave_Entrance/map.json +++ b/data/maps/FourIsland_IcefallCave_Entrance/map.json @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/FourIsland_LoreleisHouse/map.json b/data/maps/FourIsland_LoreleisHouse/map.json index 45784f529..86eba43ef 100644 --- a/data/maps/FourIsland_LoreleisHouse/map.json +++ b/data/maps/FourIsland_LoreleisHouse/map.json @@ -220,4 +220,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/FourIsland_Mart/map.json b/data/maps/FourIsland_Mart/map.json index ca5cba0ec..5a7567099 100644 --- a/data/maps/FourIsland_Mart/map.json +++ b/data/maps/FourIsland_Mart/map.json @@ -64,4 +64,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/FourIsland_PokemonCenter_1F/map.json b/data/maps/FourIsland_PokemonCenter_1F/map.json index 45d65222d..bf55e36f6 100644 --- a/data/maps/FourIsland_PokemonCenter_1F/map.json +++ b/data/maps/FourIsland_PokemonCenter_1F/map.json @@ -99,4 +99,4 @@ "script": "FourIsland_PokemonCenter_1F_EventScript_1ACDD0" } ] -} +}
\ No newline at end of file diff --git a/data/maps/FourIsland_PokemonCenter_2F/map.json b/data/maps/FourIsland_PokemonCenter_2F/map.json index a118bf9bb..f05df9b0a 100644 --- a/data/maps/FourIsland_PokemonCenter_2F/map.json +++ b/data/maps/FourIsland_PokemonCenter_2F/map.json @@ -91,4 +91,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/FourIsland_PokemonDayCare/map.json b/data/maps/FourIsland_PokemonDayCare/map.json index 812097722..f67365e71 100644 --- a/data/maps/FourIsland_PokemonDayCare/map.json +++ b/data/maps/FourIsland_PokemonDayCare/map.json @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/FuchsiaCity/map.json b/data/maps/FuchsiaCity/map.json index deb0dc7c0..b72216603 100644 --- a/data/maps/FuchsiaCity/map.json +++ b/data/maps/FuchsiaCity/map.json @@ -402,8 +402,8 @@ "y": 26, "elevation": 3, "item": "ITEM_MAX_REVIVE", - "flag": "133", + "flag": "HIDDEN_ITEM_FUCHSIA_CITY_MAX_REVIVE", "unknown": 1 } ] -} +}
\ No newline at end of file diff --git a/data/maps/FuchsiaCity_Building1/map.json b/data/maps/FuchsiaCity_Building1/map.json index 2d567eaaf..019a5c4e3 100644 --- a/data/maps/FuchsiaCity_Building1/map.json +++ b/data/maps/FuchsiaCity_Building1/map.json @@ -120,4 +120,4 @@ "script": "FuchsiaCity_Building1_EventScript_16D80D" } ] -} +}
\ No newline at end of file diff --git a/data/maps/FuchsiaCity_Gym/map.json b/data/maps/FuchsiaCity_Gym/map.json index ff7e432c2..f9a625c17 100644 --- a/data/maps/FuchsiaCity_Gym/map.json +++ b/data/maps/FuchsiaCity_Gym/map.json @@ -158,4 +158,4 @@ "script": "FuchsiaCity_Gym_EventScript_16D6A7" } ] -} +}
\ No newline at end of file diff --git a/data/maps/FuchsiaCity_House1/map.json b/data/maps/FuchsiaCity_House1/map.json index 7f6e645b4..0b3d01184 100644 --- a/data/maps/FuchsiaCity_House1/map.json +++ b/data/maps/FuchsiaCity_House1/map.json @@ -78,4 +78,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/FuchsiaCity_House2/map.json b/data/maps/FuchsiaCity_House2/map.json index 5aeaa2b32..d73590786 100644 --- a/data/maps/FuchsiaCity_House2/map.json +++ b/data/maps/FuchsiaCity_House2/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/FuchsiaCity_House3/map.json b/data/maps/FuchsiaCity_House3/map.json index 2267848fc..152bc7c6f 100644 --- a/data/maps/FuchsiaCity_House3/map.json +++ b/data/maps/FuchsiaCity_House3/map.json @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/FuchsiaCity_Mart/map.json b/data/maps/FuchsiaCity_Mart/map.json index fcdd61d33..732cbbf6b 100644 --- a/data/maps/FuchsiaCity_Mart/map.json +++ b/data/maps/FuchsiaCity_Mart/map.json @@ -78,4 +78,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/FuchsiaCity_PokemonCenter_1F/map.json b/data/maps/FuchsiaCity_PokemonCenter_1F/map.json index 4b711686d..8302d5425 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_1F/map.json +++ b/data/maps/FuchsiaCity_PokemonCenter_1F/map.json @@ -98,4 +98,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json index 6b0547ad4..a3c24ea86 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json +++ b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json @@ -91,4 +91,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/map.json b/data/maps/FuchsiaCity_SafariZone_Entrance/map.json index bbfc3846f..ed0f7ecb9 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/map.json +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/map.json @@ -100,4 +100,4 @@ } ], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/FuchsiaCity_ZooBuilding/map.json b/data/maps/FuchsiaCity_ZooBuilding/map.json index 39114ccdb..66a12474b 100644 --- a/data/maps/FuchsiaCity_ZooBuilding/map.json +++ b/data/maps/FuchsiaCity_ZooBuilding/map.json @@ -91,4 +91,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/IndigoPlateau_Exterior/map.json b/data/maps/IndigoPlateau_Exterior/map.json index 90973993a..dc610feda 100644 --- a/data/maps/IndigoPlateau_Exterior/map.json +++ b/data/maps/IndigoPlateau_Exterior/map.json @@ -57,4 +57,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/map.json b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json index 3d9919ed1..c9525f8bd 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/map.json +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json @@ -143,4 +143,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json index 646c4d178..e48d39529 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json +++ b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json @@ -91,4 +91,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/LavenderTown/map.json b/data/maps/LavenderTown/map.json index a7c2dcd10..38a054989 100644 --- a/data/maps/LavenderTown/map.json +++ b/data/maps/LavenderTown/map.json @@ -144,4 +144,4 @@ "script": "LavenderTown_EventScript_1668CA" } ] -} +}
\ No newline at end of file diff --git a/data/maps/LavenderTown_House1/map.json b/data/maps/LavenderTown_House1/map.json index d733b6630..315c057a6 100644 --- a/data/maps/LavenderTown_House1/map.json +++ b/data/maps/LavenderTown_House1/map.json @@ -65,4 +65,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/LavenderTown_House2/map.json b/data/maps/LavenderTown_House2/map.json index aa17b7d39..b07e6069d 100644 --- a/data/maps/LavenderTown_House2/map.json +++ b/data/maps/LavenderTown_House2/map.json @@ -52,4 +52,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/LavenderTown_Mart/map.json b/data/maps/LavenderTown_Mart/map.json index b944ac24e..b8f7543de 100644 --- a/data/maps/LavenderTown_Mart/map.json +++ b/data/maps/LavenderTown_Mart/map.json @@ -91,4 +91,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/LavenderTown_PokemonCenter_1F/map.json b/data/maps/LavenderTown_PokemonCenter_1F/map.json index 4ef87ccf2..1e29aafa8 100644 --- a/data/maps/LavenderTown_PokemonCenter_1F/map.json +++ b/data/maps/LavenderTown_PokemonCenter_1F/map.json @@ -111,4 +111,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/LavenderTown_PokemonCenter_2F/map.json b/data/maps/LavenderTown_PokemonCenter_2F/map.json index 31112697f..fe23d2e7a 100644 --- a/data/maps/LavenderTown_PokemonCenter_2F/map.json +++ b/data/maps/LavenderTown_PokemonCenter_2F/map.json @@ -91,4 +91,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/map.json b/data/maps/LavenderTown_VolunteerPokemonHouse/map.json index 7a917e264..69db29dbc 100644 --- a/data/maps/LavenderTown_VolunteerPokemonHouse/map.json +++ b/data/maps/LavenderTown_VolunteerPokemonHouse/map.json @@ -139,4 +139,4 @@ "script": "LavenderTown_VolunteerPokemonHouse_EventScript_16B229" } ] -} +}
\ No newline at end of file diff --git a/data/maps/MtEmber_Exterior/map.json b/data/maps/MtEmber_Exterior/map.json index fa38fac93..d47e72eaf 100644 --- a/data/maps/MtEmber_Exterior/map.json +++ b/data/maps/MtEmber_Exterior/map.json @@ -354,7 +354,7 @@ "y": 17, "elevation": 0, "item": "ITEM_FIRE_STONE", - "flag": "158", + "flag": "HIDDEN_ITEM_MT_EMBER_EXTERIOR_FIRE_STONE", "unknown": 1 }, { @@ -362,9 +362,9 @@ "x": 8, "y": 30, "elevation": 3, - "item": "POCKET_KEY_ITEMS", - "flag": "162", + "item": "ITEM_ULTRA_BALL", + "flag": "HIDDEN_ITEM_MT_EMBER_EXTERIOR_ULTRA_BALL", "unknown": 1 } ] -} +}
\ No newline at end of file diff --git a/data/maps/MtEmber_RubyPath_1F/map.json b/data/maps/MtEmber_RubyPath_1F/map.json index af7c2032f..131b7c730 100644 --- a/data/maps/MtEmber_RubyPath_1F/map.json +++ b/data/maps/MtEmber_RubyPath_1F/map.json @@ -104,4 +104,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/MtEmber_RubyPath_B1F/map.json b/data/maps/MtEmber_RubyPath_B1F/map.json index 3a95580b2..f07680436 100644 --- a/data/maps/MtEmber_RubyPath_B1F/map.json +++ b/data/maps/MtEmber_RubyPath_B1F/map.json @@ -84,4 +84,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json b/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json index 78149246d..c4014a1df 100644 --- a/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json +++ b/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json @@ -45,4 +45,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/MtEmber_RubyPath_B2F/map.json b/data/maps/MtEmber_RubyPath_B2F/map.json index e296e9318..3669590b4 100644 --- a/data/maps/MtEmber_RubyPath_B2F/map.json +++ b/data/maps/MtEmber_RubyPath_B2F/map.json @@ -123,4 +123,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json b/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json index 42576cb8d..cff4242e4 100644 --- a/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json +++ b/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json @@ -58,4 +58,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/MtEmber_RubyPath_B3F/map.json b/data/maps/MtEmber_RubyPath_B3F/map.json index 5bc2edf77..dae0284dc 100644 --- a/data/maps/MtEmber_RubyPath_B3F/map.json +++ b/data/maps/MtEmber_RubyPath_B3F/map.json @@ -169,4 +169,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/MtEmber_RubyPath_B4F/map.json b/data/maps/MtEmber_RubyPath_B4F/map.json index 42d8ee7f2..fda9aaa01 100644 --- a/data/maps/MtEmber_RubyPath_B4F/map.json +++ b/data/maps/MtEmber_RubyPath_B4F/map.json @@ -214,4 +214,4 @@ "script": "MtEmber_RubyPath_B4F_EventScript_16392B" } ] -} +}
\ No newline at end of file diff --git a/data/maps/MtEmber_RubyPath_B5F/map.json b/data/maps/MtEmber_RubyPath_B5F/map.json index 637afcde5..4611b5aa7 100644 --- a/data/maps/MtEmber_RubyPath_B5F/map.json +++ b/data/maps/MtEmber_RubyPath_B5F/map.json @@ -46,4 +46,4 @@ "script": "MtEmber_RubyPath_B5F_EventScript_163BAB" } ] -} +}
\ No newline at end of file diff --git a/data/maps/MtEmber_Summit/map.json b/data/maps/MtEmber_Summit/map.json index 34eb9d6a7..25d6a7440 100644 --- a/data/maps/MtEmber_Summit/map.json +++ b/data/maps/MtEmber_Summit/map.json @@ -90,4 +90,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/MtEmber_SummitPath_1F/map.json b/data/maps/MtEmber_SummitPath_1F/map.json index 7b06ec6ba..f9da889ef 100644 --- a/data/maps/MtEmber_SummitPath_1F/map.json +++ b/data/maps/MtEmber_SummitPath_1F/map.json @@ -31,4 +31,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/MtEmber_SummitPath_2F/map.json b/data/maps/MtEmber_SummitPath_2F/map.json index 62da287fd..f1164247b 100644 --- a/data/maps/MtEmber_SummitPath_2F/map.json +++ b/data/maps/MtEmber_SummitPath_2F/map.json @@ -149,4 +149,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/MtEmber_SummitPath_3F/map.json b/data/maps/MtEmber_SummitPath_3F/map.json index 3e1d8dc50..7ba050cf8 100644 --- a/data/maps/MtEmber_SummitPath_3F/map.json +++ b/data/maps/MtEmber_SummitPath_3F/map.json @@ -31,4 +31,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/MtMoon_1F/map.json b/data/maps/MtMoon_1F/map.json index 135f731fc..9763ddb11 100644 --- a/data/maps/MtMoon_1F/map.json +++ b/data/maps/MtMoon_1F/map.json @@ -236,4 +236,4 @@ "script": "MtMoon_1F_EventScript_1605EE" } ] -} +}
\ No newline at end of file diff --git a/data/maps/MtMoon_B1F/map.json b/data/maps/MtMoon_B1F/map.json index efa18b859..1380e1626 100644 --- a/data/maps/MtMoon_B1F/map.json +++ b/data/maps/MtMoon_B1F/map.json @@ -79,7 +79,7 @@ "y": 2, "elevation": 0, "item": "ITEM_TINY_MUSHROOM", - "flag": "84", + "flag": "HIDDEN_ITEM_MT_MOON_B1F_TINY_MUSHROOM", "unknown": 1 }, { @@ -88,7 +88,7 @@ "y": 2, "elevation": 0, "item": "ITEM_TINY_MUSHROOM", - "flag": "85", + "flag": "HIDDEN_ITEM_MT_MOON_B1F_TINY_MUSHROOM_2", "unknown": 1 }, { @@ -97,7 +97,7 @@ "y": 34, "elevation": 0, "item": "ITEM_TINY_MUSHROOM", - "flag": "86", + "flag": "HIDDEN_ITEM_MT_MOON_B1F_TINY_MUSHROOM_3", "unknown": 1 }, { @@ -106,7 +106,7 @@ "y": 35, "elevation": 0, "item": "ITEM_BIG_MUSHROOM", - "flag": "87", + "flag": "HIDDEN_ITEM_MT_MOON_B1F_BIG_MUSHROOM", "unknown": 1 }, { @@ -115,7 +115,7 @@ "y": 12, "elevation": 0, "item": "ITEM_BIG_MUSHROOM", - "flag": "88", + "flag": "HIDDEN_ITEM_MT_MOON_B1F_BIG_MUSHROOM_2", "unknown": 1 }, { @@ -124,8 +124,8 @@ "y": 34, "elevation": 0, "item": "ITEM_BIG_MUSHROOM", - "flag": "89", + "flag": "HIDDEN_ITEM_MT_MOON_B1F_BIG_MUSHROOM_3", "unknown": 1 } ] -} +}
\ No newline at end of file diff --git a/data/maps/MtMoon_B2F/map.json b/data/maps/MtMoon_B2F/map.json index 7d5fd8368..fbcb05702 100644 --- a/data/maps/MtMoon_B2F/map.json +++ b/data/maps/MtMoon_B2F/map.json @@ -205,7 +205,7 @@ "y": 16, "elevation": 3, "item": "ITEM_MOON_STONE", - "flag": "2", + "flag": "HIDDEN_ITEM_MT_MOON_B2F_MOON_STONE", "unknown": 1 }, { @@ -214,8 +214,8 @@ "y": 11, "elevation": 3, "item": "ITEM_ETHER", - "flag": "3", + "flag": "HIDDEN_ITEM_MT_MOON_B2F_ETHER", "unknown": 1 } ] -} +}
\ No newline at end of file diff --git a/data/maps/NavelRock_1F/map.json b/data/maps/NavelRock_1F/map.json index 4f0bc37bc..d6417b85b 100644 --- a/data/maps/NavelRock_1F/map.json +++ b/data/maps/NavelRock_1F/map.json @@ -31,4 +31,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/NavelRock_B1F/map.json b/data/maps/NavelRock_B1F/map.json index 4807cf865..8f4bb64df 100644 --- a/data/maps/NavelRock_B1F/map.json +++ b/data/maps/NavelRock_B1F/map.json @@ -31,4 +31,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/NavelRock_Base/map.json b/data/maps/NavelRock_Base/map.json index aa97091ec..9fb6eed21 100644 --- a/data/maps/NavelRock_Base/map.json +++ b/data/maps/NavelRock_Base/map.json @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/NavelRock_BasePath_B10F/map.json b/data/maps/NavelRock_BasePath_B10F/map.json index 16c0363a8..5156eebae 100644 --- a/data/maps/NavelRock_BasePath_B10F/map.json +++ b/data/maps/NavelRock_BasePath_B10F/map.json @@ -31,4 +31,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/NavelRock_BasePath_B11F/map.json b/data/maps/NavelRock_BasePath_B11F/map.json index 9530b8ca8..ac251babb 100644 --- a/data/maps/NavelRock_BasePath_B11F/map.json +++ b/data/maps/NavelRock_BasePath_B11F/map.json @@ -31,4 +31,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/NavelRock_BasePath_B1F/map.json b/data/maps/NavelRock_BasePath_B1F/map.json index e2d8103eb..ec05a65df 100644 --- a/data/maps/NavelRock_BasePath_B1F/map.json +++ b/data/maps/NavelRock_BasePath_B1F/map.json @@ -31,4 +31,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/NavelRock_BasePath_B2F/map.json b/data/maps/NavelRock_BasePath_B2F/map.json index df3200d16..483b4918d 100644 --- a/data/maps/NavelRock_BasePath_B2F/map.json +++ b/data/maps/NavelRock_BasePath_B2F/map.json @@ -31,4 +31,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/NavelRock_BasePath_B3F/map.json b/data/maps/NavelRock_BasePath_B3F/map.json index 65e25b3ec..6817de8e5 100644 --- a/data/maps/NavelRock_BasePath_B3F/map.json +++ b/data/maps/NavelRock_BasePath_B3F/map.json @@ -31,4 +31,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/NavelRock_BasePath_B4F/map.json b/data/maps/NavelRock_BasePath_B4F/map.json index fd56529fb..db5a90cfa 100644 --- a/data/maps/NavelRock_BasePath_B4F/map.json +++ b/data/maps/NavelRock_BasePath_B4F/map.json @@ -31,4 +31,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/NavelRock_BasePath_B5F/map.json b/data/maps/NavelRock_BasePath_B5F/map.json index 2d6e8798c..52e540366 100644 --- a/data/maps/NavelRock_BasePath_B5F/map.json +++ b/data/maps/NavelRock_BasePath_B5F/map.json @@ -31,4 +31,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/NavelRock_BasePath_B6F/map.json b/data/maps/NavelRock_BasePath_B6F/map.json index 0f5e92ad9..030cade08 100644 --- a/data/maps/NavelRock_BasePath_B6F/map.json +++ b/data/maps/NavelRock_BasePath_B6F/map.json @@ -31,4 +31,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/NavelRock_BasePath_B7F/map.json b/data/maps/NavelRock_BasePath_B7F/map.json index 1c2897d91..a17f2b2ed 100644 --- a/data/maps/NavelRock_BasePath_B7F/map.json +++ b/data/maps/NavelRock_BasePath_B7F/map.json @@ -31,4 +31,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/NavelRock_BasePath_B8F/map.json b/data/maps/NavelRock_BasePath_B8F/map.json index 1f3445dee..e3ed5fe49 100644 --- a/data/maps/NavelRock_BasePath_B8F/map.json +++ b/data/maps/NavelRock_BasePath_B8F/map.json @@ -31,4 +31,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/NavelRock_BasePath_B9F/map.json b/data/maps/NavelRock_BasePath_B9F/map.json index 9c6a50590..62bb3b307 100644 --- a/data/maps/NavelRock_BasePath_B9F/map.json +++ b/data/maps/NavelRock_BasePath_B9F/map.json @@ -31,4 +31,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/NavelRock_Exterior/map.json b/data/maps/NavelRock_Exterior/map.json index adaa0e703..5b89ea26f 100644 --- a/data/maps/NavelRock_Exterior/map.json +++ b/data/maps/NavelRock_Exterior/map.json @@ -31,4 +31,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/NavelRock_Fork/map.json b/data/maps/NavelRock_Fork/map.json index c7b72356c..524bc975f 100644 --- a/data/maps/NavelRock_Fork/map.json +++ b/data/maps/NavelRock_Fork/map.json @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/NavelRock_Harbor/map.json b/data/maps/NavelRock_Harbor/map.json index dee041a54..699512d59 100644 --- a/data/maps/NavelRock_Harbor/map.json +++ b/data/maps/NavelRock_Harbor/map.json @@ -51,4 +51,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/NavelRock_Summit/map.json b/data/maps/NavelRock_Summit/map.json index 62a375525..61d23cbb1 100644 --- a/data/maps/NavelRock_Summit/map.json +++ b/data/maps/NavelRock_Summit/map.json @@ -54,8 +54,8 @@ "y": 11, "elevation": 3, "item": "ITEM_SACRED_ASH", - "flag": "160", + "flag": "HIDDEN_ITEM_NAVEL_ROCK_SUMMIT_SACRED_ASH", "unknown": 129 } ] -} +}
\ No newline at end of file diff --git a/data/maps/NavelRock_SummitPath_2F/map.json b/data/maps/NavelRock_SummitPath_2F/map.json index 7cdb412db..e94a7a7fe 100644 --- a/data/maps/NavelRock_SummitPath_2F/map.json +++ b/data/maps/NavelRock_SummitPath_2F/map.json @@ -31,4 +31,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/NavelRock_SummitPath_3F/map.json b/data/maps/NavelRock_SummitPath_3F/map.json index 3d8db3367..9507e7497 100644 --- a/data/maps/NavelRock_SummitPath_3F/map.json +++ b/data/maps/NavelRock_SummitPath_3F/map.json @@ -31,4 +31,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/NavelRock_SummitPath_4F/map.json b/data/maps/NavelRock_SummitPath_4F/map.json index d83e5c97f..1e409c463 100644 --- a/data/maps/NavelRock_SummitPath_4F/map.json +++ b/data/maps/NavelRock_SummitPath_4F/map.json @@ -31,4 +31,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/NavelRock_SummitPath_5F/map.json b/data/maps/NavelRock_SummitPath_5F/map.json index 4db860493..b4e65e36d 100644 --- a/data/maps/NavelRock_SummitPath_5F/map.json +++ b/data/maps/NavelRock_SummitPath_5F/map.json @@ -31,4 +31,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/OneIsland/map.json b/data/maps/OneIsland/map.json index 0bd30ba71..ff8b8077b 100644 --- a/data/maps/OneIsland/map.json +++ b/data/maps/OneIsland/map.json @@ -111,4 +111,4 @@ "script": "OneIsland_EventScript_16755B" } ] -} +}
\ No newline at end of file diff --git a/data/maps/OneIsland_Harbor/map.json b/data/maps/OneIsland_Harbor/map.json index 6a8cbe4b2..d0472673a 100644 --- a/data/maps/OneIsland_Harbor/map.json +++ b/data/maps/OneIsland_Harbor/map.json @@ -51,4 +51,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/OneIsland_House1/map.json b/data/maps/OneIsland_House1/map.json index 7367836f7..01a881eb5 100644 --- a/data/maps/OneIsland_House1/map.json +++ b/data/maps/OneIsland_House1/map.json @@ -51,4 +51,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/OneIsland_House2/map.json b/data/maps/OneIsland_House2/map.json index d88b79750..b78820671 100644 --- a/data/maps/OneIsland_House2/map.json +++ b/data/maps/OneIsland_House2/map.json @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/OneIsland_KindleRoad/map.json b/data/maps/OneIsland_KindleRoad/map.json index 74023f6d0..64a09154d 100644 --- a/data/maps/OneIsland_KindleRoad/map.json +++ b/data/maps/OneIsland_KindleRoad/map.json @@ -437,4 +437,4 @@ "script": "OneIsland_KindleRoad_EventScript_168759" } ] -} +}
\ No newline at end of file diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json index 71bbbe0dd..4e230dc1a 100644 --- a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json @@ -113,4 +113,4 @@ } ], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/OneIsland_PokemonCenter_1F/map.json b/data/maps/OneIsland_PokemonCenter_1F/map.json index 4c6527a0a..f3cee25e1 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/map.json +++ b/data/maps/OneIsland_PokemonCenter_1F/map.json @@ -211,4 +211,4 @@ "script": "OneIsland_PokemonCenter_1F_EventScript_171179" } ] -} +}
\ No newline at end of file diff --git a/data/maps/OneIsland_PokemonCenter_2F/map.json b/data/maps/OneIsland_PokemonCenter_2F/map.json index 616c96a7c..e3e9146b9 100644 --- a/data/maps/OneIsland_PokemonCenter_2F/map.json +++ b/data/maps/OneIsland_PokemonCenter_2F/map.json @@ -91,4 +91,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/OneIsland_TreasureBeach/map.json b/data/maps/OneIsland_TreasureBeach/map.json index b1e946ea0..46ef94989 100644 --- a/data/maps/OneIsland_TreasureBeach/map.json +++ b/data/maps/OneIsland_TreasureBeach/map.json @@ -55,7 +55,7 @@ "y": 20, "elevation": 3, "item": "ITEM_STARDUST", - "flag": "103", + "flag": "HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_STARDUST", "unknown": 1 }, { @@ -64,7 +64,7 @@ "y": 27, "elevation": 3, "item": "ITEM_STARDUST", - "flag": "104", + "flag": "HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_STARDUST_2", "unknown": 1 }, { @@ -73,7 +73,7 @@ "y": 31, "elevation": 3, "item": "ITEM_PEARL", - "flag": "105", + "flag": "HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_PEARL", "unknown": 1 }, { @@ -82,7 +82,7 @@ "y": 34, "elevation": 3, "item": "ITEM_PEARL", - "flag": "106", + "flag": "HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_PEARL_2", "unknown": 1 }, { @@ -90,8 +90,8 @@ "x": 15, "y": 22, "elevation": 3, - "item": "POCKET_KEY_ITEMS", - "flag": "107", + "item": "ITEM_ULTRA_BALL", + "flag": "HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_ULTRA_BALL", "unknown": 1 }, { @@ -99,8 +99,8 @@ "x": 16, "y": 33, "elevation": 3, - "item": "POCKET_KEY_ITEMS", - "flag": "108", + "item": "ITEM_ULTRA_BALL", + "flag": "HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_ULTRA_BALL_2", "unknown": 1 }, { @@ -109,7 +109,7 @@ "y": 29, "elevation": 3, "item": "ITEM_STAR_PIECE", - "flag": "109", + "flag": "HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_STAR_PIECE", "unknown": 1 }, { @@ -118,8 +118,8 @@ "y": 27, "elevation": 3, "item": "ITEM_BIG_PEARL", - "flag": "110", + "flag": "HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_BIG_PEARL", "unknown": 1 } ] -} +}
\ No newline at end of file diff --git a/data/maps/PalletTown/map.json b/data/maps/PalletTown/map.json index b47575c42..eb08ca7c6 100644 --- a/data/maps/PalletTown/map.json +++ b/data/maps/PalletTown/map.json @@ -153,4 +153,4 @@ "script": "PalletTown_EventScript_16586B" } ] -} +}
\ No newline at end of file diff --git a/data/maps/PalletTown_GarysHouse/map.json b/data/maps/PalletTown_GarysHouse/map.json index c5522db0b..991c681eb 100644 --- a/data/maps/PalletTown_GarysHouse/map.json +++ b/data/maps/PalletTown_GarysHouse/map.json @@ -87,4 +87,4 @@ "script": "PalletTown_GarysHouse_EventScript_168F75" } ] -} +}
\ No newline at end of file diff --git a/data/maps/PalletTown_PlayersHouse_1F/map.json b/data/maps/PalletTown_PlayersHouse_1F/map.json index ad29c0e04..ea512f07a 100644 --- a/data/maps/PalletTown_PlayersHouse_1F/map.json +++ b/data/maps/PalletTown_PlayersHouse_1F/map.json @@ -67,4 +67,4 @@ "script": "PalletTown_PlayersHouse_1F_EventScript_168C62" } ] -} +}
\ No newline at end of file diff --git a/data/maps/PalletTown_PlayersHouse_2F/map.json b/data/maps/PalletTown_PlayersHouse_2F/map.json index 61e354782..7fcddefca 100644 --- a/data/maps/PalletTown_PlayersHouse_2F/map.json +++ b/data/maps/PalletTown_PlayersHouse_2F/map.json @@ -46,4 +46,4 @@ "script": "PalletTown_PlayersHouse_2F_EventScript_168CDB" } ] -} +}
\ No newline at end of file diff --git a/data/maps/PalletTown_ProfessorOaksLab/map.json b/data/maps/PalletTown_ProfessorOaksLab/map.json index c7440708c..55bfdb7d1 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/map.json +++ b/data/maps/PalletTown_ProfessorOaksLab/map.json @@ -253,4 +253,4 @@ "script": "PalletTown_ProfessorOaksLab_EventScript_169E7A" } ] -} +}
\ No newline at end of file diff --git a/data/maps/PewterCity/map.json b/data/maps/PewterCity/map.json index d1d8f5b96..542618ea2 100644 --- a/data/maps/PewterCity/map.json +++ b/data/maps/PewterCity/map.json @@ -273,9 +273,9 @@ "x": 6, "y": 3, "elevation": 3, - "item": "POCKET_TM_CASE", - "flag": "112", + "item": "ITEM_POKE_BALL", + "flag": "HIDDEN_ITEM_PEWTER_CITY_POKE_BALL", "unknown": 1 } ] -} +}
\ No newline at end of file diff --git a/data/maps/PewterCity_Gym/map.json b/data/maps/PewterCity_Gym/map.json index 5893d6954..430ad3d5d 100644 --- a/data/maps/PewterCity_Gym/map.json +++ b/data/maps/PewterCity_Gym/map.json @@ -93,4 +93,4 @@ "script": "PewterCity_Gym_EventScript_16A6AF" } ] -} +}
\ No newline at end of file diff --git a/data/maps/PewterCity_House1/map.json b/data/maps/PewterCity_House1/map.json index d44ec63bf..981631c08 100644 --- a/data/maps/PewterCity_House1/map.json +++ b/data/maps/PewterCity_House1/map.json @@ -78,4 +78,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/PewterCity_House2/map.json b/data/maps/PewterCity_House2/map.json index 83aaf23bf..695af1a50 100644 --- a/data/maps/PewterCity_House2/map.json +++ b/data/maps/PewterCity_House2/map.json @@ -65,4 +65,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/PewterCity_Mart/map.json b/data/maps/PewterCity_Mart/map.json index 8b9c5e575..932a5e3ae 100644 --- a/data/maps/PewterCity_Mart/map.json +++ b/data/maps/PewterCity_Mart/map.json @@ -78,4 +78,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/PewterCity_Museum_1F/map.json b/data/maps/PewterCity_Museum_1F/map.json index 0f545ce75..3bdab782a 100644 --- a/data/maps/PewterCity_Museum_1F/map.json +++ b/data/maps/PewterCity_Museum_1F/map.json @@ -195,4 +195,4 @@ "script": "PewterCity_Museum_1F_EventScript_1ACE1C" } ] -} +}
\ No newline at end of file diff --git a/data/maps/PewterCity_Museum_2F/map.json b/data/maps/PewterCity_Museum_2F/map.json index 317926b39..fa3427f10 100644 --- a/data/maps/PewterCity_Museum_2F/map.json +++ b/data/maps/PewterCity_Museum_2F/map.json @@ -147,4 +147,4 @@ "script": "PewterCity_Museum_2F_EventScript_16A589" } ] -} +}
\ No newline at end of file diff --git a/data/maps/PewterCity_PokemonCenter_1F/map.json b/data/maps/PewterCity_PokemonCenter_1F/map.json index 6807511b1..71d709a80 100644 --- a/data/maps/PewterCity_PokemonCenter_1F/map.json +++ b/data/maps/PewterCity_PokemonCenter_1F/map.json @@ -137,4 +137,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/PewterCity_PokemonCenter_2F/map.json b/data/maps/PewterCity_PokemonCenter_2F/map.json index 37dd74cef..dea5d1210 100644 --- a/data/maps/PewterCity_PokemonCenter_2F/map.json +++ b/data/maps/PewterCity_PokemonCenter_2F/map.json @@ -91,4 +91,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/PokemonLeague_AgathasRoom/map.json b/data/maps/PokemonLeague_AgathasRoom/map.json index 16b98cfda..45fbbe9bb 100644 --- a/data/maps/PokemonLeague_AgathasRoom/map.json +++ b/data/maps/PokemonLeague_AgathasRoom/map.json @@ -45,4 +45,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/PokemonLeague_BrunosRoom/map.json b/data/maps/PokemonLeague_BrunosRoom/map.json index 05cc19dbe..2688a324a 100644 --- a/data/maps/PokemonLeague_BrunosRoom/map.json +++ b/data/maps/PokemonLeague_BrunosRoom/map.json @@ -45,4 +45,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/PokemonLeague_ChampionsRoom/map.json b/data/maps/PokemonLeague_ChampionsRoom/map.json index 90e243652..176909241 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/map.json +++ b/data/maps/PokemonLeague_ChampionsRoom/map.json @@ -58,4 +58,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/PokemonLeague_HallOfFame/map.json b/data/maps/PokemonLeague_HallOfFame/map.json index a2146d74b..095abb233 100644 --- a/data/maps/PokemonLeague_HallOfFame/map.json +++ b/data/maps/PokemonLeague_HallOfFame/map.json @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/PokemonLeague_LancesRoom/map.json b/data/maps/PokemonLeague_LancesRoom/map.json index 1d962ccba..32a1918c2 100644 --- a/data/maps/PokemonLeague_LancesRoom/map.json +++ b/data/maps/PokemonLeague_LancesRoom/map.json @@ -45,4 +45,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/PokemonLeague_LoreleisRoom/map.json b/data/maps/PokemonLeague_LoreleisRoom/map.json index 6435fd40f..f2d4dad69 100644 --- a/data/maps/PokemonLeague_LoreleisRoom/map.json +++ b/data/maps/PokemonLeague_LoreleisRoom/map.json @@ -45,4 +45,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/PokemonMansion_1F/map.json b/data/maps/PokemonMansion_1F/map.json index 8c28b8d4a..cb02dfc61 100644 --- a/data/maps/PokemonMansion_1F/map.json +++ b/data/maps/PokemonMansion_1F/map.json @@ -166,8 +166,8 @@ "y": 21, "elevation": 0, "item": "ITEM_MOON_STONE", - "flag": "31", + "flag": "HIDDEN_ITEM_POKEMON_MANSION_1F_MOON_STONE", "unknown": 1 } ] -} +}
\ No newline at end of file diff --git a/data/maps/PokemonMansion_2F/map.json b/data/maps/PokemonMansion_2F/map.json index 6a85dbb1e..93c40dd92 100644 --- a/data/maps/PokemonMansion_2F/map.json +++ b/data/maps/PokemonMansion_2F/map.json @@ -127,4 +127,4 @@ "script": "PokemonMansion_2F_EventScript_162278" } ] -} +}
\ No newline at end of file diff --git a/data/maps/PokemonMansion_3F/map.json b/data/maps/PokemonMansion_3F/map.json index c693a9d7a..3e617c6d5 100644 --- a/data/maps/PokemonMansion_3F/map.json +++ b/data/maps/PokemonMansion_3F/map.json @@ -146,8 +146,8 @@ "y": 13, "elevation": 3, "item": "ITEM_RARE_CANDY", - "flag": "32", + "flag": "HIDDEN_ITEM_POKEMON_MANSION_3F_RARE_CANDY", "unknown": 1 } ] -} +}
\ No newline at end of file diff --git a/data/maps/PokemonMansion_B1F/map.json b/data/maps/PokemonMansion_B1F/map.json index 15627f664..5109db394 100644 --- a/data/maps/PokemonMansion_B1F/map.json +++ b/data/maps/PokemonMansion_B1F/map.json @@ -130,8 +130,8 @@ "y": 5, "elevation": 3, "item": "ITEM_ELIXIR", - "flag": "33", + "flag": "HIDDEN_ITEM_POKEMON_MANSION_B1F_ELIXIR", "unknown": 1 } ] -} +}
\ No newline at end of file diff --git a/data/maps/PokemonTower_1F/map.json b/data/maps/PokemonTower_1F/map.json index ad49dce83..bf087bedd 100644 --- a/data/maps/PokemonTower_1F/map.json +++ b/data/maps/PokemonTower_1F/map.json @@ -111,4 +111,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/PokemonTower_2F/map.json b/data/maps/PokemonTower_2F/map.json index 9b23a2904..4c86d31dd 100644 --- a/data/maps/PokemonTower_2F/map.json +++ b/data/maps/PokemonTower_2F/map.json @@ -77,4 +77,4 @@ } ], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/PokemonTower_3F/map.json b/data/maps/PokemonTower_3F/map.json index dcba6c23f..d9e125e33 100644 --- a/data/maps/PokemonTower_3F/map.json +++ b/data/maps/PokemonTower_3F/map.json @@ -84,4 +84,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/PokemonTower_4F/map.json b/data/maps/PokemonTower_4F/map.json index b567872bf..339cb6c46 100644 --- a/data/maps/PokemonTower_4F/map.json +++ b/data/maps/PokemonTower_4F/map.json @@ -110,4 +110,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/PokemonTower_5F/map.json b/data/maps/PokemonTower_5F/map.json index f8fb23938..25729263f 100644 --- a/data/maps/PokemonTower_5F/map.json +++ b/data/maps/PokemonTower_5F/map.json @@ -283,8 +283,8 @@ "y": 3, "elevation": 3, "item": "ITEM_BIG_MUSHROOM", - "flag": "14", + "flag": "HIDDEN_ITEM_POKEMON_TOWER_5F_BIG_MUSHROOM", "unknown": 1 } ] -} +}
\ No newline at end of file diff --git a/data/maps/PokemonTower_6F/map.json b/data/maps/PokemonTower_6F/map.json index f97249088..adbc73860 100644 --- a/data/maps/PokemonTower_6F/map.json +++ b/data/maps/PokemonTower_6F/map.json @@ -116,4 +116,4 @@ } ], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/PokemonTower_7F/map.json b/data/maps/PokemonTower_7F/map.json index 3f2fd739d..13ef9abc3 100644 --- a/data/maps/PokemonTower_7F/map.json +++ b/data/maps/PokemonTower_7F/map.json @@ -83,8 +83,8 @@ "y": 4, "elevation": 3, "item": "ITEM_SOOTHE_BELL", - "flag": "159", + "flag": "HIDDEN_ITEM_POKEMON_TOWER_7F_SOOTHE_BELL", "unknown": 129 } ] -} +}
\ No newline at end of file diff --git a/data/maps/PowerPlant/map.json b/data/maps/PowerPlant/map.json index 8647b0ae1..2ee31defe 100644 --- a/data/maps/PowerPlant/map.json +++ b/data/maps/PowerPlant/map.json @@ -163,7 +163,7 @@ "y": 16, "elevation": 3, "item": "ITEM_MAX_ELIXIR", - "flag": "27", + "flag": "HIDDEN_ITEM_POWER_PLANT_MAX_ELIXIR", "unknown": 1 }, { @@ -172,8 +172,8 @@ "y": 12, "elevation": 3, "item": "ITEM_THUNDER_STONE", - "flag": "28", + "flag": "HIDDEN_ITEM_POWER_PLANT_THUNDER_STONE", "unknown": 1 } ] -} +}
\ No newline at end of file diff --git a/data/maps/RockTunnel_1F/map.json b/data/maps/RockTunnel_1F/map.json index 59abc79f0..e866935f8 100644 --- a/data/maps/RockTunnel_1F/map.json +++ b/data/maps/RockTunnel_1F/map.json @@ -198,4 +198,4 @@ "script": "RockTunnel_1F_EventScript_162DE0" } ] -} +}
\ No newline at end of file diff --git a/data/maps/RockTunnel_B1F/map.json b/data/maps/RockTunnel_B1F/map.json index 0d2d1696e..b6f3e192b 100644 --- a/data/maps/RockTunnel_B1F/map.json +++ b/data/maps/RockTunnel_B1F/map.json @@ -384,4 +384,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/RocketHideout_B1F/map.json b/data/maps/RocketHideout_B1F/map.json index 66aa5aad7..cead802a4 100644 --- a/data/maps/RocketHideout_B1F/map.json +++ b/data/maps/RocketHideout_B1F/map.json @@ -157,8 +157,8 @@ "y": 17, "elevation": 0, "item": "ITEM_PP_UP", - "flag": "11", + "flag": "HIDDEN_ITEM_ROCKET_HIDEOUT_B1F_PP_UP", "unknown": 1 } ] -} +}
\ No newline at end of file diff --git a/data/maps/RocketHideout_B2F/map.json b/data/maps/RocketHideout_B2F/map.json index eff2b29af..fe6d03018 100644 --- a/data/maps/RocketHideout_B2F/map.json +++ b/data/maps/RocketHideout_B2F/map.json @@ -118,4 +118,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/RocketHideout_B3F/map.json b/data/maps/RocketHideout_B3F/map.json index 77790c353..780be6be4 100644 --- a/data/maps/RocketHideout_B3F/map.json +++ b/data/maps/RocketHideout_B3F/map.json @@ -103,8 +103,8 @@ "y": 3, "elevation": 3, "item": "ITEM_NUGGET", - "flag": "12", + "flag": "HIDDEN_ITEM_ROCKET_HIDEOUT_B3F_NUGGET", "unknown": 1 } ] -} +}
\ No newline at end of file diff --git a/data/maps/RocketHideout_B4F/map.json b/data/maps/RocketHideout_B4F/map.json index 37df23d8f..2bd699335 100644 --- a/data/maps/RocketHideout_B4F/map.json +++ b/data/maps/RocketHideout_B4F/map.json @@ -162,7 +162,7 @@ "y": 6, "elevation": 3, "item": "ITEM_NEST_BALL", - "flag": "13", + "flag": "HIDDEN_ITEM_ROCKET_HIDEOUT_B4F_NEST_BALL", "unknown": 1 }, { @@ -171,8 +171,8 @@ "y": 6, "elevation": 3, "item": "ITEM_NET_BALL", - "flag": "134", + "flag": "HIDDEN_ITEM_ROCKET_HIDEOUT_B4F_NET_BALL", "unknown": 1 } ] -} +}
\ No newline at end of file diff --git a/data/maps/RocketHideout_Elevator/map.json b/data/maps/RocketHideout_Elevator/map.json index dd2191b6d..ac8655fb9 100644 --- a/data/maps/RocketHideout_Elevator/map.json +++ b/data/maps/RocketHideout_Elevator/map.json @@ -39,4 +39,4 @@ "script": "RocketHideout_Elevator_EventScript_1614D9" } ] -} +}
\ No newline at end of file diff --git a/data/maps/Route1/map.json b/data/maps/Route1/map.json index 9532ffe65..c3403e84e 100644 --- a/data/maps/Route1/map.json +++ b/data/maps/Route1/map.json @@ -62,4 +62,4 @@ "script": "Route1_EventScript_167F5B" } ] -} +}
\ No newline at end of file diff --git a/data/maps/Route10/map.json b/data/maps/Route10/map.json index d7ec8b3c9..1a15c19e3 100644 --- a/data/maps/Route10/map.json +++ b/data/maps/Route10/map.json @@ -221,7 +221,7 @@ "y": 19, "elevation": 0, "item": "ITEM_SUPER_POTION", - "flag": "9", + "flag": "HIDDEN_ITEM_ROUTE10_SUPER_POTION", "unknown": 1 }, { @@ -230,7 +230,7 @@ "y": 40, "elevation": 3, "item": "ITEM_MAX_ETHER", - "flag": "10", + "flag": "HIDDEN_ITEM_ROUTE10_MAX_ETHER", "unknown": 1 }, { @@ -239,7 +239,7 @@ "y": 26, "elevation": 3, "item": "ITEM_CHERI_BERRY", - "flag": "126", + "flag": "HIDDEN_ITEM_ROUTE10_CHERI_BERRY", "unknown": 1 }, { @@ -248,7 +248,7 @@ "y": 29, "elevation": 3, "item": "ITEM_PERSIM_BERRY", - "flag": "125", + "flag": "HIDDEN_ITEM_ROUTE10_PERSIM_BERRY", "unknown": 1 }, { @@ -257,8 +257,8 @@ "y": 57, "elevation": 3, "item": "ITEM_NANAB_BERRY", - "flag": "151", + "flag": "HIDDEN_ITEM_ROUTE10_NANAB_BERRY", "unknown": 1 } ] -} +}
\ No newline at end of file diff --git a/data/maps/Route10_PokemonCenter_1F/map.json b/data/maps/Route10_PokemonCenter_1F/map.json index ad6d1d426..2a70d5e28 100644 --- a/data/maps/Route10_PokemonCenter_1F/map.json +++ b/data/maps/Route10_PokemonCenter_1F/map.json @@ -111,4 +111,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/Route10_PokemonCenter_2F/map.json b/data/maps/Route10_PokemonCenter_2F/map.json index ccb14b3db..c7188145f 100644 --- a/data/maps/Route10_PokemonCenter_2F/map.json +++ b/data/maps/Route10_PokemonCenter_2F/map.json @@ -91,4 +91,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/Route11/map.json b/data/maps/Route11/map.json index 27e2a7d76..27147b6dd 100644 --- a/data/maps/Route11/map.json +++ b/data/maps/Route11/map.json @@ -232,8 +232,8 @@ "y": 5, "elevation": 0, "item": "ITEM_ESCAPE_ROPE", - "flag": "41", + "flag": "HIDDEN_ITEM_ROUTE11_ESCAPE_ROPE", "unknown": 1 } ] -} +}
\ No newline at end of file diff --git a/data/maps/Route11_EastEntrance_1F/map.json b/data/maps/Route11_EastEntrance_1F/map.json index 752346bbd..e0e0cf0e0 100644 --- a/data/maps/Route11_EastEntrance_1F/map.json +++ b/data/maps/Route11_EastEntrance_1F/map.json @@ -79,4 +79,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/Route11_EastEntrance_2F/map.json b/data/maps/Route11_EastEntrance_2F/map.json index 767612c7b..adc72d42d 100644 --- a/data/maps/Route11_EastEntrance_2F/map.json +++ b/data/maps/Route11_EastEntrance_2F/map.json @@ -66,4 +66,4 @@ "script": "Route11_EastEntrance_2F_EventScript_16FD53" } ] -} +}
\ No newline at end of file diff --git a/data/maps/Route12/map.json b/data/maps/Route12/map.json index b15dc4525..6b3b60d5e 100644 --- a/data/maps/Route12/map.json +++ b/data/maps/Route12/map.json @@ -264,7 +264,7 @@ "y": 57, "elevation": 3, "item": "ITEM_HYPER_POTION", - "flag": "42", + "flag": "HIDDEN_ITEM_ROUTE12_HYPER_POTION", "unknown": 1 }, { @@ -273,7 +273,7 @@ "y": 70, "elevation": 3, "item": "ITEM_LEFTOVERS", - "flag": "131", + "flag": "HIDDEN_ITEM_ROUTE12_LEFTOVERS", "unknown": 129 }, { @@ -282,8 +282,8 @@ "y": 116, "elevation": 3, "item": "ITEM_RARE_CANDY", - "flag": "130", + "flag": "HIDDEN_ITEM_ROUTE12_RARE_CANDY", "unknown": 1 } ] -} +}
\ No newline at end of file diff --git a/data/maps/Route12_FishingHouse/map.json b/data/maps/Route12_FishingHouse/map.json index 6706d8b02..8dc07a65c 100644 --- a/data/maps/Route12_FishingHouse/map.json +++ b/data/maps/Route12_FishingHouse/map.json @@ -60,4 +60,4 @@ "script": "Route12_FishingHouse_EventScript_170067" } ] -} +}
\ No newline at end of file diff --git a/data/maps/Route12_NorthEntrance_1F/map.json b/data/maps/Route12_NorthEntrance_1F/map.json index 7c4beb37a..ab29cd8bc 100644 --- a/data/maps/Route12_NorthEntrance_1F/map.json +++ b/data/maps/Route12_NorthEntrance_1F/map.json @@ -66,4 +66,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/Route12_NorthEntrance_2F/map.json b/data/maps/Route12_NorthEntrance_2F/map.json index 4b1ed933e..0df33bfc3 100644 --- a/data/maps/Route12_NorthEntrance_2F/map.json +++ b/data/maps/Route12_NorthEntrance_2F/map.json @@ -53,4 +53,4 @@ "script": "Route12_NorthEntrance_2F_EventScript_16FE81" } ] -} +}
\ No newline at end of file diff --git a/data/maps/Route13/map.json b/data/maps/Route13/map.json index 919048b8d..cfbd702fd 100644 --- a/data/maps/Route13/map.json +++ b/data/maps/Route13/map.json @@ -198,8 +198,8 @@ "y": 14, "elevation": 3, "item": "ITEM_PP_UP", - "flag": "15", + "flag": "HIDDEN_ITEM_ROUTE13_PP_UP", "unknown": 1 } ] -} +}
\ No newline at end of file diff --git a/data/maps/Route14/map.json b/data/maps/Route14/map.json index 38dc65678..062b5386f 100644 --- a/data/maps/Route14/map.json +++ b/data/maps/Route14/map.json @@ -236,7 +236,7 @@ "y": 20, "elevation": 3, "item": "ITEM_ZINC", - "flag": "149", + "flag": "HIDDEN_ITEM_ROUTE14_ZINC", "unknown": 1 }, { @@ -245,8 +245,8 @@ "y": 53, "elevation": 3, "item": "ITEM_PINAP_BERRY", - "flag": "157", + "flag": "HIDDEN_ITEM_ROUTE14_PINAP_BERRY", "unknown": 1 } ] -} +}
\ No newline at end of file diff --git a/data/maps/Route15/map.json b/data/maps/Route15/map.json index cdf6e21d1..5e7558237 100644 --- a/data/maps/Route15/map.json +++ b/data/maps/Route15/map.json @@ -233,4 +233,4 @@ "script": "Route15_EventScript_1680DC" } ] -} +}
\ No newline at end of file diff --git a/data/maps/Route15_WestEntrance_1F/map.json b/data/maps/Route15_WestEntrance_1F/map.json index 5d94699d2..73c625921 100644 --- a/data/maps/Route15_WestEntrance_1F/map.json +++ b/data/maps/Route15_WestEntrance_1F/map.json @@ -66,4 +66,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/Route15_WestEntrance_2F/map.json b/data/maps/Route15_WestEntrance_2F/map.json index aa86a9719..4c0a481ad 100644 --- a/data/maps/Route15_WestEntrance_2F/map.json +++ b/data/maps/Route15_WestEntrance_2F/map.json @@ -53,4 +53,4 @@ "script": "Route15_WestEntrance_2F_EventScript_1700B0" } ] -} +}
\ No newline at end of file diff --git a/data/maps/Route16/map.json b/data/maps/Route16/map.json index 528dd30b6..a653b6472 100644 --- a/data/maps/Route16/map.json +++ b/data/maps/Route16/map.json @@ -214,8 +214,8 @@ "y": 13, "elevation": 3, "item": "ITEM_LEFTOVERS", - "flag": "132", + "flag": "HIDDEN_ITEM_ROUTE16_LEFTOVERS", "unknown": 129 } ] -} +}
\ No newline at end of file diff --git a/data/maps/Route16_House/map.json b/data/maps/Route16_House/map.json index c848e5b76..fd3bf46fd 100644 --- a/data/maps/Route16_House/map.json +++ b/data/maps/Route16_House/map.json @@ -65,4 +65,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/Route16_NorthEntrance_1F/map.json b/data/maps/Route16_NorthEntrance_1F/map.json index 8ee9a145a..19ec265d8 100644 --- a/data/maps/Route16_NorthEntrance_1F/map.json +++ b/data/maps/Route16_NorthEntrance_1F/map.json @@ -179,4 +179,4 @@ } ], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/Route16_NorthEntrance_2F/map.json b/data/maps/Route16_NorthEntrance_2F/map.json index 22f87439e..2501f5c6a 100644 --- a/data/maps/Route16_NorthEntrance_2F/map.json +++ b/data/maps/Route16_NorthEntrance_2F/map.json @@ -79,4 +79,4 @@ "script": "Route16_NorthEntrance_2F_EventScript_1702DA" } ] -} +}
\ No newline at end of file diff --git a/data/maps/Route17/map.json b/data/maps/Route17/map.json index 104649674..bd13c470b 100644 --- a/data/maps/Route17/map.json +++ b/data/maps/Route17/map.json @@ -206,7 +206,7 @@ "y": 83, "elevation": 3, "item": "ITEM_RARE_CANDY", - "flag": "17", + "flag": "HIDDEN_ITEM_ROUTE17_RARE_CANDY", "unknown": 1 }, { @@ -215,7 +215,7 @@ "y": 53, "elevation": 3, "item": "ITEM_FULL_RESTORE", - "flag": "18", + "flag": "HIDDEN_ITEM_ROUTE17_FULL_RESTORE", "unknown": 1 }, { @@ -224,7 +224,7 @@ "y": 68, "elevation": 3, "item": "ITEM_PP_UP", - "flag": "19", + "flag": "HIDDEN_ITEM_ROUTE17_PP_UP", "unknown": 1 }, { @@ -233,7 +233,7 @@ "y": 125, "elevation": 3, "item": "ITEM_MAX_REVIVE", - "flag": "20", + "flag": "HIDDEN_ITEM_ROUTE17_MAX_REVIVE", "unknown": 1 }, { @@ -242,8 +242,8 @@ "y": 157, "elevation": 3, "item": "ITEM_MAX_ELIXIR", - "flag": "21", + "flag": "HIDDEN_ITEM_ROUTE17_MAX_ELIXIR", "unknown": 1 } ] -} +}
\ No newline at end of file diff --git a/data/maps/Route18/map.json b/data/maps/Route18/map.json index 48301e386..3b81f3b34 100644 --- a/data/maps/Route18/map.json +++ b/data/maps/Route18/map.json @@ -97,4 +97,4 @@ "script": "Route18_EventScript_16821F" } ] -} +}
\ No newline at end of file diff --git a/data/maps/Route18_EastEntrance_1F/map.json b/data/maps/Route18_EastEntrance_1F/map.json index 610a84f34..c38146e7f 100644 --- a/data/maps/Route18_EastEntrance_1F/map.json +++ b/data/maps/Route18_EastEntrance_1F/map.json @@ -152,4 +152,4 @@ } ], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/Route18_EastEntrance_2F/map.json b/data/maps/Route18_EastEntrance_2F/map.json index 3f981016e..5d3f71f77 100644 --- a/data/maps/Route18_EastEntrance_2F/map.json +++ b/data/maps/Route18_EastEntrance_2F/map.json @@ -53,4 +53,4 @@ "script": "Route18_EastEntrance_2F_EventScript_170475" } ] -} +}
\ No newline at end of file diff --git a/data/maps/Route19/map.json b/data/maps/Route19/map.json index 111cf1b71..ba08e60b1 100644 --- a/data/maps/Route19/map.json +++ b/data/maps/Route19/map.json @@ -192,4 +192,4 @@ "script": "Route19_EventScript_168232" } ] -} +}
\ No newline at end of file diff --git a/data/maps/Route2/map.json b/data/maps/Route2/map.json index 33ed43697..9c681bc53 100644 --- a/data/maps/Route2/map.json +++ b/data/maps/Route2/map.json @@ -205,4 +205,4 @@ "script": "Route2_EventScript_167F65" } ] -} +}
\ No newline at end of file diff --git a/data/maps/Route20/map.json b/data/maps/Route20/map.json index 8f1011ad4..8d3471c23 100644 --- a/data/maps/Route20/map.json +++ b/data/maps/Route20/map.json @@ -206,8 +206,8 @@ "y": 6, "elevation": 3, "item": "ITEM_STARDUST", - "flag": "153", + "flag": "HIDDEN_ITEM_ROUTE20_STARDUST", "unknown": 1 } ] -} +}
\ No newline at end of file diff --git a/data/maps/Route21_North/map.json b/data/maps/Route21_North/map.json index e52d7ff94..0169457fc 100644 --- a/data/maps/Route21_North/map.json +++ b/data/maps/Route21_North/map.json @@ -112,8 +112,8 @@ "y": 42, "elevation": 3, "item": "ITEM_PEARL", - "flag": "154", + "flag": "HIDDEN_ITEM_ROUTE21_NORTH_PEARL", "unknown": 1 } ] -} +}
\ No newline at end of file diff --git a/data/maps/Route21_South/map.json b/data/maps/Route21_South/map.json index e863fbdb9..ebb62c94e 100644 --- a/data/maps/Route21_South/map.json +++ b/data/maps/Route21_South/map.json @@ -93,4 +93,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/Route22/map.json b/data/maps/Route22/map.json index 5a5969bb3..5f25aea87 100644 --- a/data/maps/Route22/map.json +++ b/data/maps/Route22/map.json @@ -119,4 +119,4 @@ "script": "Route22_EventScript_1684E2" } ] -} +}
\ No newline at end of file diff --git a/data/maps/Route22_NorthEntrance/map.json b/data/maps/Route22_NorthEntrance/map.json index 71a4802f7..ac391ba74 100644 --- a/data/maps/Route22_NorthEntrance/map.json +++ b/data/maps/Route22_NorthEntrance/map.json @@ -69,4 +69,4 @@ } ], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/Route23/map.json b/data/maps/Route23/map.json index 42b705667..2f2572ce0 100644 --- a/data/maps/Route23/map.json +++ b/data/maps/Route23/map.json @@ -533,7 +533,7 @@ "y": 42, "elevation": 0, "item": "ITEM_FULL_RESTORE", - "flag": "34", + "flag": "HIDDEN_ITEM_ROUTE23_FULL_RESTORE", "unknown": 1 }, { @@ -541,8 +541,8 @@ "x": 20, "y": 72, "elevation": 0, - "item": "POCKET_KEY_ITEMS", - "flag": "35", + "item": "ITEM_ULTRA_BALL", + "flag": "HIDDEN_ITEM_ROUTE23_ULTRA_BALL", "unknown": 1 }, { @@ -551,7 +551,7 @@ "y": 101, "elevation": 3, "item": "ITEM_MAX_ETHER", - "flag": "36", + "flag": "HIDDEN_ITEM_ROUTE23_MAX_ETHER", "unknown": 1 }, { @@ -560,7 +560,7 @@ "y": 18, "elevation": 3, "item": "ITEM_LUM_BERRY", - "flag": "145", + "flag": "HIDDEN_ITEM_ROUTE23_LUM_BERRY", "unknown": 1 }, { @@ -569,7 +569,7 @@ "y": 29, "elevation": 3, "item": "ITEM_SITRUS_BERRY", - "flag": "146", + "flag": "HIDDEN_ITEM_ROUTE23_SITRUS_BERRY", "unknown": 1 }, { @@ -578,7 +578,7 @@ "y": 67, "elevation": 3, "item": "ITEM_ASPEAR_BERRY", - "flag": "147", + "flag": "HIDDEN_ITEM_ROUTE23_ASPEAR_BERRY", "unknown": 1 }, { @@ -587,7 +587,7 @@ "y": 128, "elevation": 3, "item": "ITEM_LEPPA_BERRY", - "flag": "148", + "flag": "HIDDEN_ITEM_ROUTE23_LEPPA_BERRY", "unknown": 1 }, { @@ -596,7 +596,7 @@ "y": 8, "elevation": 3, "item": "ITEM_MAX_ELIXIR", - "flag": "155", + "flag": "HIDDEN_ITEM_ROUTE23_MAX_ELIXIR", "unknown": 1 }, { @@ -607,4 +607,4 @@ "script": "Route23_EventScript_168616" } ] -} +}
\ No newline at end of file diff --git a/data/maps/Route24/map.json b/data/maps/Route24/map.json index f392b64bf..4cc26d6ba 100644 --- a/data/maps/Route24/map.json +++ b/data/maps/Route24/map.json @@ -157,8 +157,8 @@ "y": 4, "elevation": 3, "item": "ITEM_PECHA_BERRY", - "flag": "115", + "flag": "HIDDEN_ITEM_ROUTE24_PECHA_BERRY", "unknown": 1 } ] -} +}
\ No newline at end of file diff --git a/data/maps/Route25/map.json b/data/maps/Route25/map.json index 9e10ec246..7ecf2c451 100644 --- a/data/maps/Route25/map.json +++ b/data/maps/Route25/map.json @@ -213,7 +213,7 @@ "y": 2, "elevation": 3, "item": "ITEM_ELIXIR", - "flag": "4", + "flag": "HIDDEN_ITEM_ROUTE25_ELIXIR", "unknown": 1 }, { @@ -222,7 +222,7 @@ "y": 6, "elevation": 3, "item": "ITEM_ETHER", - "flag": "5", + "flag": "HIDDEN_ITEM_ROUTE25_ETHER", "unknown": 1 }, { @@ -231,7 +231,7 @@ "y": 8, "elevation": 3, "item": "ITEM_ORAN_BERRY", - "flag": "116", + "flag": "HIDDEN_ITEM_ROUTE25_ORAN_BERRY", "unknown": 1 }, { @@ -240,8 +240,8 @@ "y": 3, "elevation": 3, "item": "ITEM_BLUK_BERRY", - "flag": "117", + "flag": "HIDDEN_ITEM_ROUTE25_BLUK_BERRY", "unknown": 1 } ] -} +}
\ No newline at end of file diff --git a/data/maps/Route25_SeaCottage/map.json b/data/maps/Route25_SeaCottage/map.json index ec9a5c284..27c173150 100644 --- a/data/maps/Route25_SeaCottage/map.json +++ b/data/maps/Route25_SeaCottage/map.json @@ -73,4 +73,4 @@ "script": "Route25_SeaCottage_EventScript_1706DD" } ] -} +}
\ No newline at end of file diff --git a/data/maps/Route2_EastBuilding/map.json b/data/maps/Route2_EastBuilding/map.json index de3df77b1..8efa4df68 100644 --- a/data/maps/Route2_EastBuilding/map.json +++ b/data/maps/Route2_EastBuilding/map.json @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/Route2_House/map.json b/data/maps/Route2_House/map.json index 639be8eb0..6e8cf125b 100644 --- a/data/maps/Route2_House/map.json +++ b/data/maps/Route2_House/map.json @@ -65,4 +65,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/Route2_ViridianForest_NorthEntrance/map.json b/data/maps/Route2_ViridianForest_NorthEntrance/map.json index fab8a8b03..449b87f86 100644 --- a/data/maps/Route2_ViridianForest_NorthEntrance/map.json +++ b/data/maps/Route2_ViridianForest_NorthEntrance/map.json @@ -85,4 +85,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/Route2_ViridianForest_SouthEntrance/map.json b/data/maps/Route2_ViridianForest_SouthEntrance/map.json index 3f4e03f3e..d3656359b 100644 --- a/data/maps/Route2_ViridianForest_SouthEntrance/map.json +++ b/data/maps/Route2_ViridianForest_SouthEntrance/map.json @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/Route3/map.json b/data/maps/Route3/map.json index de3d20cc8..e74b8f502 100644 --- a/data/maps/Route3/map.json +++ b/data/maps/Route3/map.json @@ -158,8 +158,8 @@ "y": 9, "elevation": 3, "item": "ITEM_ORAN_BERRY", - "flag": "113", + "flag": "HIDDEN_ITEM_ROUTE3_ORAN_BERRY", "unknown": 1 } ] -} +}
\ No newline at end of file diff --git a/data/maps/Route4/map.json b/data/maps/Route4/map.json index 7f4958b26..40d63d2a7 100644 --- a/data/maps/Route4/map.json +++ b/data/maps/Route4/map.json @@ -160,8 +160,8 @@ "x": 43, "y": 2, "elevation": 3, - "item": "POCKET_POKE_BALLS", - "flag": "50", + "item": "ITEM_GREAT_BALL", + "flag": "HIDDEN_ITEM_ROUTE4_GREAT_BALL", "unknown": 1 }, { @@ -170,7 +170,7 @@ "y": 4, "elevation": 3, "item": "ITEM_PERSIM_BERRY", - "flag": "114", + "flag": "HIDDEN_ITEM_ROUTE4_PERSIM_BERRY", "unknown": 1 }, { @@ -179,8 +179,8 @@ "y": 17, "elevation": 3, "item": "ITEM_RAZZ_BERRY", - "flag": "156", + "flag": "HIDDEN_ITEM_ROUTE4_RAZZ_BERRY", "unknown": 1 } ] -} +}
\ No newline at end of file diff --git a/data/maps/Route4_PokemonCenter_1F/map.json b/data/maps/Route4_PokemonCenter_1F/map.json index f3401744c..706fe51ea 100644 --- a/data/maps/Route4_PokemonCenter_1F/map.json +++ b/data/maps/Route4_PokemonCenter_1F/map.json @@ -124,4 +124,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/Route4_PokemonCenter_2F/map.json b/data/maps/Route4_PokemonCenter_2F/map.json index c6f93c618..56c3665fd 100644 --- a/data/maps/Route4_PokemonCenter_2F/map.json +++ b/data/maps/Route4_PokemonCenter_2F/map.json @@ -91,4 +91,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/Route5/map.json b/data/maps/Route5/map.json index 8b047231e..58e7e1c7f 100644 --- a/data/maps/Route5/map.json +++ b/data/maps/Route5/map.json @@ -64,4 +64,4 @@ "script": "Route5_EventScript_167FA8" } ] -} +}
\ No newline at end of file diff --git a/data/maps/Route5_PokemonDayCare/map.json b/data/maps/Route5_PokemonDayCare/map.json index ca5aec3d2..b78b3603d 100644 --- a/data/maps/Route5_PokemonDayCare/map.json +++ b/data/maps/Route5_PokemonDayCare/map.json @@ -52,4 +52,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/Route5_SouthEntrance/map.json b/data/maps/Route5_SouthEntrance/map.json index 121e9f89b..eb53fe641 100644 --- a/data/maps/Route5_SouthEntrance/map.json +++ b/data/maps/Route5_SouthEntrance/map.json @@ -87,4 +87,4 @@ } ], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/Route6/map.json b/data/maps/Route6/map.json index 24a67ce53..538ee9843 100644 --- a/data/maps/Route6/map.json +++ b/data/maps/Route6/map.json @@ -141,7 +141,7 @@ "y": 5, "elevation": 3, "item": "ITEM_SITRUS_BERRY", - "flag": "118", + "flag": "HIDDEN_ITEM_ROUTE6_SITRUS_BERRY", "unknown": 1 }, { @@ -150,8 +150,8 @@ "y": 5, "elevation": 3, "item": "ITEM_RARE_CANDY", - "flag": "119", + "flag": "HIDDEN_ITEM_ROUTE6_RARE_CANDY", "unknown": 1 } ] -} +}
\ No newline at end of file diff --git a/data/maps/Route6_NorthEntrance/map.json b/data/maps/Route6_NorthEntrance/map.json index 2e0ac628d..0a7f3bd1b 100644 --- a/data/maps/Route6_NorthEntrance/map.json +++ b/data/maps/Route6_NorthEntrance/map.json @@ -87,4 +87,4 @@ } ], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/Route7/map.json b/data/maps/Route7/map.json index 72556b9fd..cf7052532 100644 --- a/data/maps/Route7/map.json +++ b/data/maps/Route7/map.json @@ -69,8 +69,8 @@ "y": 15, "elevation": 3, "item": "ITEM_WEPEAR_BERRY", - "flag": "152", + "flag": "HIDDEN_ITEM_ROUTE7_WEPEAR_BERRY", "unknown": 1 } ] -} +}
\ No newline at end of file diff --git a/data/maps/Route7_EastEntrance/map.json b/data/maps/Route7_EastEntrance/map.json index c8bea59f8..cdc9dd1bc 100644 --- a/data/maps/Route7_EastEntrance/map.json +++ b/data/maps/Route7_EastEntrance/map.json @@ -87,4 +87,4 @@ } ], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/Route8/map.json b/data/maps/Route8/map.json index 45b8cbec0..1f38e94c1 100644 --- a/data/maps/Route8/map.json +++ b/data/maps/Route8/map.json @@ -251,7 +251,7 @@ "y": 10, "elevation": 3, "item": "ITEM_RAWST_BERRY", - "flag": "127", + "flag": "HIDDEN_ITEM_ROUTE8_RAWST_BERRY", "unknown": 1 }, { @@ -260,7 +260,7 @@ "y": 11, "elevation": 3, "item": "ITEM_LUM_BERRY", - "flag": "128", + "flag": "HIDDEN_ITEM_ROUTE8_LUM_BERRY", "unknown": 1 }, { @@ -269,8 +269,8 @@ "y": 15, "elevation": 3, "item": "ITEM_LEPPA_BERRY", - "flag": "129", + "flag": "HIDDEN_ITEM_ROUTE8_LEPPA_BERRY", "unknown": 1 } ] -} +}
\ No newline at end of file diff --git a/data/maps/Route8_WestEntrance/map.json b/data/maps/Route8_WestEntrance/map.json index c90244197..1044b15fe 100644 --- a/data/maps/Route8_WestEntrance/map.json +++ b/data/maps/Route8_WestEntrance/map.json @@ -87,4 +87,4 @@ } ], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/Route9/map.json b/data/maps/Route9/map.json index fa56d8ed2..bae881d0e 100644 --- a/data/maps/Route9/map.json +++ b/data/maps/Route9/map.json @@ -197,7 +197,7 @@ "y": 7, "elevation": 0, "item": "ITEM_ETHER", - "flag": "6", + "flag": "HIDDEN_ITEM_ROUTE9_ETHER", "unknown": 1 }, { @@ -206,7 +206,7 @@ "y": 2, "elevation": 3, "item": "ITEM_RARE_CANDY", - "flag": "123", + "flag": "HIDDEN_ITEM_ROUTE9_RARE_CANDY", "unknown": 1 }, { @@ -215,8 +215,8 @@ "y": 2, "elevation": 3, "item": "ITEM_CHESTO_BERRY", - "flag": "150", + "flag": "HIDDEN_ITEM_ROUTE9_CHESTO_BERRY", "unknown": 1 } ] -} +}
\ No newline at end of file diff --git a/data/maps/SSAnne_1F_Corridor/map.json b/data/maps/SSAnne_1F_Corridor/map.json index b2ceb6810..a3883d665 100644 --- a/data/maps/SSAnne_1F_Corridor/map.json +++ b/data/maps/SSAnne_1F_Corridor/map.json @@ -135,4 +135,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SSAnne_1F_Room1/map.json b/data/maps/SSAnne_1F_Room1/map.json index 104a568ab..9c8c5397c 100644 --- a/data/maps/SSAnne_1F_Room1/map.json +++ b/data/maps/SSAnne_1F_Room1/map.json @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SSAnne_1F_Room2/map.json b/data/maps/SSAnne_1F_Room2/map.json index fcc3d6bf0..2be8f3169 100644 --- a/data/maps/SSAnne_1F_Room2/map.json +++ b/data/maps/SSAnne_1F_Room2/map.json @@ -77,4 +77,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SSAnne_1F_Room3/map.json b/data/maps/SSAnne_1F_Room3/map.json index 615f4c9b1..e101ebd61 100644 --- a/data/maps/SSAnne_1F_Room3/map.json +++ b/data/maps/SSAnne_1F_Room3/map.json @@ -64,4 +64,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SSAnne_1F_Room4/map.json b/data/maps/SSAnne_1F_Room4/map.json index c12b81c2d..781ba7e9f 100644 --- a/data/maps/SSAnne_1F_Room4/map.json +++ b/data/maps/SSAnne_1F_Room4/map.json @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SSAnne_1F_Room5/map.json b/data/maps/SSAnne_1F_Room5/map.json index 6e86a11e8..b6b3d45c2 100644 --- a/data/maps/SSAnne_1F_Room5/map.json +++ b/data/maps/SSAnne_1F_Room5/map.json @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SSAnne_1F_Room6/map.json b/data/maps/SSAnne_1F_Room6/map.json index c8e98e62a..0958ee63a 100644 --- a/data/maps/SSAnne_1F_Room6/map.json +++ b/data/maps/SSAnne_1F_Room6/map.json @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SSAnne_1F_Room7/map.json b/data/maps/SSAnne_1F_Room7/map.json index aa2732f36..43427731c 100644 --- a/data/maps/SSAnne_1F_Room7/map.json +++ b/data/maps/SSAnne_1F_Room7/map.json @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SSAnne_2F_Corridor/map.json b/data/maps/SSAnne_2F_Corridor/map.json index 36e4dfd79..07d05b0f8 100644 --- a/data/maps/SSAnne_2F_Corridor/map.json +++ b/data/maps/SSAnne_2F_Corridor/map.json @@ -135,4 +135,4 @@ } ], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SSAnne_2F_Room1/map.json b/data/maps/SSAnne_2F_Room1/map.json index 6b7950e26..0a29d2e24 100644 --- a/data/maps/SSAnne_2F_Room1/map.json +++ b/data/maps/SSAnne_2F_Room1/map.json @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SSAnne_2F_Room2/map.json b/data/maps/SSAnne_2F_Room2/map.json index 66f6c2e97..d082831a9 100644 --- a/data/maps/SSAnne_2F_Room2/map.json +++ b/data/maps/SSAnne_2F_Room2/map.json @@ -64,4 +64,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SSAnne_2F_Room3/map.json b/data/maps/SSAnne_2F_Room3/map.json index ed032b4b3..808435b86 100644 --- a/data/maps/SSAnne_2F_Room3/map.json +++ b/data/maps/SSAnne_2F_Room3/map.json @@ -51,4 +51,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SSAnne_2F_Room4/map.json b/data/maps/SSAnne_2F_Room4/map.json index 5fee6f393..708385992 100644 --- a/data/maps/SSAnne_2F_Room4/map.json +++ b/data/maps/SSAnne_2F_Room4/map.json @@ -64,4 +64,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SSAnne_2F_Room5/map.json b/data/maps/SSAnne_2F_Room5/map.json index c9f3fe809..3589a8609 100644 --- a/data/maps/SSAnne_2F_Room5/map.json +++ b/data/maps/SSAnne_2F_Room5/map.json @@ -51,4 +51,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SSAnne_2F_Room6/map.json b/data/maps/SSAnne_2F_Room6/map.json index 4f92d7599..d64176eef 100644 --- a/data/maps/SSAnne_2F_Room6/map.json +++ b/data/maps/SSAnne_2F_Room6/map.json @@ -51,4 +51,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SSAnne_3F_Corridor/map.json b/data/maps/SSAnne_3F_Corridor/map.json index 3318b3553..08d4c6720 100644 --- a/data/maps/SSAnne_3F_Corridor/map.json +++ b/data/maps/SSAnne_3F_Corridor/map.json @@ -52,4 +52,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SSAnne_B1F_Corridor/map.json b/data/maps/SSAnne_B1F_Corridor/map.json index 1ac031188..5d9312311 100644 --- a/data/maps/SSAnne_B1F_Corridor/map.json +++ b/data/maps/SSAnne_B1F_Corridor/map.json @@ -65,8 +65,8 @@ "y": 5, "elevation": 3, "item": "ITEM_HYPER_POTION", - "flag": "8", + "flag": "HIDDEN_ITEM_SSANNE_B1F_CORRIDOR_HYPER_POTION", "unknown": 1 } ] -} +}
\ No newline at end of file diff --git a/data/maps/SSAnne_B1F_Room1/map.json b/data/maps/SSAnne_B1F_Room1/map.json index 2db8e4478..6347a8072 100644 --- a/data/maps/SSAnne_B1F_Room1/map.json +++ b/data/maps/SSAnne_B1F_Room1/map.json @@ -51,4 +51,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SSAnne_B1F_Room2/map.json b/data/maps/SSAnne_B1F_Room2/map.json index 635c1aadc..6acf2e9be 100644 --- a/data/maps/SSAnne_B1F_Room2/map.json +++ b/data/maps/SSAnne_B1F_Room2/map.json @@ -51,4 +51,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SSAnne_B1F_Room3/map.json b/data/maps/SSAnne_B1F_Room3/map.json index caf5fb525..682ab95f6 100644 --- a/data/maps/SSAnne_B1F_Room3/map.json +++ b/data/maps/SSAnne_B1F_Room3/map.json @@ -51,4 +51,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SSAnne_B1F_Room4/map.json b/data/maps/SSAnne_B1F_Room4/map.json index fbbf0545e..e6ec2568f 100644 --- a/data/maps/SSAnne_B1F_Room4/map.json +++ b/data/maps/SSAnne_B1F_Room4/map.json @@ -51,4 +51,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SSAnne_B1F_Room5/map.json b/data/maps/SSAnne_B1F_Room5/map.json index f80ab4f82..1df4d2170 100644 --- a/data/maps/SSAnne_B1F_Room5/map.json +++ b/data/maps/SSAnne_B1F_Room5/map.json @@ -64,4 +64,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SSAnne_CaptainsOffice/map.json b/data/maps/SSAnne_CaptainsOffice/map.json index 664266e47..58039f4df 100644 --- a/data/maps/SSAnne_CaptainsOffice/map.json +++ b/data/maps/SSAnne_CaptainsOffice/map.json @@ -60,4 +60,4 @@ "script": "SSAnne_CaptainsOffice_EventScript_160BD2" } ] -} +}
\ No newline at end of file diff --git a/data/maps/SSAnne_Deck/map.json b/data/maps/SSAnne_Deck/map.json index bd1e16bf3..96330b043 100644 --- a/data/maps/SSAnne_Deck/map.json +++ b/data/maps/SSAnne_Deck/map.json @@ -97,4 +97,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SSAnne_Exterior/map.json b/data/maps/SSAnne_Exterior/map.json index b0a63e5c9..92ac49787 100644 --- a/data/maps/SSAnne_Exterior/map.json +++ b/data/maps/SSAnne_Exterior/map.json @@ -72,8 +72,8 @@ "y": 28, "elevation": 3, "item": "ITEM_LAVA_COOKIE", - "flag": "190", + "flag": "HIDDEN_ITEM_SSANNE_EXTERIOR_LAVA_COOKIE", "unknown": 1 } ] -} +}
\ No newline at end of file diff --git a/data/maps/SSAnne_Kitchen/map.json b/data/maps/SSAnne_Kitchen/map.json index 19e7eac4e..5614ae769 100644 --- a/data/maps/SSAnne_Kitchen/map.json +++ b/data/maps/SSAnne_Kitchen/map.json @@ -135,7 +135,7 @@ "y": 8, "elevation": 0, "item": "ITEM_CHESTO_BERRY", - "flag": "122", + "flag": "HIDDEN_ITEM_SSANNE_KITCHEN_CHESTO_BERRY", "unknown": 1 }, { @@ -144,7 +144,7 @@ "y": 4, "elevation": 0, "item": "ITEM_PECHA_BERRY", - "flag": "120", + "flag": "HIDDEN_ITEM_SSANNE_KITCHEN_PECHA_BERRY", "unknown": 1 }, { @@ -153,8 +153,8 @@ "y": 6, "elevation": 0, "item": "ITEM_CHERI_BERRY", - "flag": "121", + "flag": "HIDDEN_ITEM_SSANNE_KITCHEN_CHERI_BERRY", "unknown": 1 } ] -} +}
\ No newline at end of file diff --git a/data/maps/SafariZone_Building1/map.json b/data/maps/SafariZone_Building1/map.json index 3173c5dae..2d15dcd24 100644 --- a/data/maps/SafariZone_Building1/map.json +++ b/data/maps/SafariZone_Building1/map.json @@ -65,4 +65,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SafariZone_Building2/map.json b/data/maps/SafariZone_Building2/map.json index 2aade6512..c4d1721d5 100644 --- a/data/maps/SafariZone_Building2/map.json +++ b/data/maps/SafariZone_Building2/map.json @@ -78,4 +78,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SafariZone_Building3/map.json b/data/maps/SafariZone_Building3/map.json index fae8637ea..4aac8501d 100644 --- a/data/maps/SafariZone_Building3/map.json +++ b/data/maps/SafariZone_Building3/map.json @@ -91,4 +91,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SafariZone_Building4/map.json b/data/maps/SafariZone_Building4/map.json index a2ccec451..92cf6c44e 100644 --- a/data/maps/SafariZone_Building4/map.json +++ b/data/maps/SafariZone_Building4/map.json @@ -78,4 +78,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SafariZone_Center/map.json b/data/maps/SafariZone_Center/map.json index 6a21b2a3e..2dde1a875 100644 --- a/data/maps/SafariZone_Center/map.json +++ b/data/maps/SafariZone_Center/map.json @@ -142,7 +142,7 @@ "y": 15, "elevation": 3, "item": "ITEM_LEAF_STONE", - "flag": "22", + "flag": "HIDDEN_ITEM_SAFARI_ZONE_CENTER_LEAF_STONE", "unknown": 1 }, { @@ -153,4 +153,4 @@ "script": "SafariZone_Center_EventScript_162373" } ] -} +}
\ No newline at end of file diff --git a/data/maps/SafariZone_East/map.json b/data/maps/SafariZone_East/map.json index e9b4475cf..2a997af95 100644 --- a/data/maps/SafariZone_East/map.json +++ b/data/maps/SafariZone_East/map.json @@ -141,4 +141,4 @@ "script": "SafariZone_East_EventScript_162386" } ] -} +}
\ No newline at end of file diff --git a/data/maps/SafariZone_North/map.json b/data/maps/SafariZone_North/map.json index e02b44909..7a95dcb19 100644 --- a/data/maps/SafariZone_North/map.json +++ b/data/maps/SafariZone_North/map.json @@ -184,4 +184,4 @@ "script": "SafariZone_North_EventScript_162399" } ] -} +}
\ No newline at end of file diff --git a/data/maps/SafariZone_SecretHouse/map.json b/data/maps/SafariZone_SecretHouse/map.json index 7eff5e68f..39d7fc816 100644 --- a/data/maps/SafariZone_SecretHouse/map.json +++ b/data/maps/SafariZone_SecretHouse/map.json @@ -52,4 +52,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SafariZone_West/map.json b/data/maps/SafariZone_West/map.json index 4a9558841..58bf5c33e 100644 --- a/data/maps/SafariZone_West/map.json +++ b/data/maps/SafariZone_West/map.json @@ -181,8 +181,8 @@ "y": 11, "elevation": 3, "item": "ITEM_REVIVE", - "flag": "23", + "flag": "HIDDEN_ITEM_SAFARI_ZONE_WEST_REVIVE", "unknown": 1 } ] -} +}
\ No newline at end of file diff --git a/data/maps/SaffronCity/map.json b/data/maps/SaffronCity/map.json index 48eba64e0..0c1dc0ea5 100644 --- a/data/maps/SaffronCity/map.json +++ b/data/maps/SaffronCity/map.json @@ -404,4 +404,4 @@ "script": "SaffronCity_EventScript_16747A" } ] -} +}
\ No newline at end of file diff --git a/data/maps/SaffronCity_Classic/map.json b/data/maps/SaffronCity_Classic/map.json index 0a5614975..e6c6f5643 100644 --- a/data/maps/SaffronCity_Classic/map.json +++ b/data/maps/SaffronCity_Classic/map.json @@ -37,4 +37,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SaffronCity_Dojo/map.json b/data/maps/SaffronCity_Dojo/map.json index 1b3c2ff04..48c893479 100644 --- a/data/maps/SaffronCity_Dojo/map.json +++ b/data/maps/SaffronCity_Dojo/map.json @@ -178,4 +178,4 @@ "script": "SaffronCity_Dojo_EventScript_16ED3D" } ] -} +}
\ No newline at end of file diff --git a/data/maps/SaffronCity_Gym/map.json b/data/maps/SaffronCity_Gym/map.json index 24cd66c55..a8c721f04 100644 --- a/data/maps/SaffronCity_Gym/map.json +++ b/data/maps/SaffronCity_Gym/map.json @@ -381,4 +381,4 @@ "script": "SaffronCity_Gym_EventScript_16EF55" } ] -} +}
\ No newline at end of file diff --git a/data/maps/SaffronCity_House1_1F/map.json b/data/maps/SaffronCity_House1_1F/map.json index 287f760d8..6b9c69a05 100644 --- a/data/maps/SaffronCity_House1_1F/map.json +++ b/data/maps/SaffronCity_House1_1F/map.json @@ -85,4 +85,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SaffronCity_House1_2F/map.json b/data/maps/SaffronCity_House1_2F/map.json index fe34076ae..6134ee9ac 100644 --- a/data/maps/SaffronCity_House1_2F/map.json +++ b/data/maps/SaffronCity_House1_2F/map.json @@ -97,8 +97,8 @@ "y": 1, "elevation": 0, "item": "ITEM_NUGGET", - "flag": "26", + "flag": "HIDDEN_ITEM_SAFFRON_CITY_HOUSE1_2F_NUGGET", "unknown": 1 } ] -} +}
\ No newline at end of file diff --git a/data/maps/SaffronCity_House2/map.json b/data/maps/SaffronCity_House2/map.json index 0b87576cd..22d70803d 100644 --- a/data/maps/SaffronCity_House2/map.json +++ b/data/maps/SaffronCity_House2/map.json @@ -99,4 +99,4 @@ "script": "SaffronCity_House2_EventScript_16EF99" } ] -} +}
\ No newline at end of file diff --git a/data/maps/SaffronCity_House3/map.json b/data/maps/SaffronCity_House3/map.json index f4b227795..5865565ee 100644 --- a/data/maps/SaffronCity_House3/map.json +++ b/data/maps/SaffronCity_House3/map.json @@ -52,4 +52,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SaffronCity_Mart/map.json b/data/maps/SaffronCity_Mart/map.json index 1bfe45aca..7437ed2fa 100644 --- a/data/maps/SaffronCity_Mart/map.json +++ b/data/maps/SaffronCity_Mart/map.json @@ -78,4 +78,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SaffronCity_PokemonCenter_1F/map.json b/data/maps/SaffronCity_PokemonCenter_1F/map.json index 118936b0e..8bce419bb 100644 --- a/data/maps/SaffronCity_PokemonCenter_1F/map.json +++ b/data/maps/SaffronCity_PokemonCenter_1F/map.json @@ -124,4 +124,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SaffronCity_PokemonCenter_2F/map.json b/data/maps/SaffronCity_PokemonCenter_2F/map.json index 8fdf8ac26..2e406403d 100644 --- a/data/maps/SaffronCity_PokemonCenter_2F/map.json +++ b/data/maps/SaffronCity_PokemonCenter_2F/map.json @@ -91,4 +91,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json index e702db16e..55fcc3b5f 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json @@ -155,4 +155,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SeafoamIslands_1F/map.json b/data/maps/SeafoamIslands_1F/map.json index a40335f0d..bf09dc506 100644 --- a/data/maps/SeafoamIslands_1F/map.json +++ b/data/maps/SeafoamIslands_1F/map.json @@ -106,4 +106,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SeafoamIslands_B1F/map.json b/data/maps/SeafoamIslands_B1F/map.json index c1003895d..2d7faea28 100644 --- a/data/maps/SeafoamIslands_B1F/map.json +++ b/data/maps/SeafoamIslands_B1F/map.json @@ -147,4 +147,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SeafoamIslands_B2F/map.json b/data/maps/SeafoamIslands_B2F/map.json index fdc44c9a5..22399801b 100644 --- a/data/maps/SeafoamIslands_B2F/map.json +++ b/data/maps/SeafoamIslands_B2F/map.json @@ -134,4 +134,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SeafoamIslands_B3F/map.json b/data/maps/SeafoamIslands_B3F/map.json index 043dea721..f724f1719 100644 --- a/data/maps/SeafoamIslands_B3F/map.json +++ b/data/maps/SeafoamIslands_B3F/map.json @@ -165,8 +165,8 @@ "y": 12, "elevation": 0, "item": "ITEM_NUGGET", - "flag": "29", + "flag": "HIDDEN_ITEM_SEAFOAM_ISLANDS_B3F_NUGGET", "unknown": 1 } ] -} +}
\ No newline at end of file diff --git a/data/maps/SeafoamIslands_B4F/map.json b/data/maps/SeafoamIslands_B4F/map.json index 09da347d3..be793d7d9 100644 --- a/data/maps/SeafoamIslands_B4F/map.json +++ b/data/maps/SeafoamIslands_B4F/map.json @@ -132,7 +132,7 @@ "y": 8, "elevation": 0, "item": "ITEM_WATER_STONE", - "flag": "30", + "flag": "HIDDEN_ITEM_SEAFOAM_ISLANDS_B4F_WATER_STONE", "unknown": 1 }, { @@ -150,4 +150,4 @@ "script": "SeafoamIslands_B4F_EventScript_163223" } ] -} +}
\ No newline at end of file diff --git a/data/maps/SevenIsland/map.json b/data/maps/SevenIsland/map.json index a227a7121..8c159e6e0 100644 --- a/data/maps/SevenIsland/map.json +++ b/data/maps/SevenIsland/map.json @@ -104,4 +104,4 @@ "script": "SevenIsland_EventScript_167EBD" } ] -} +}
\ No newline at end of file diff --git a/data/maps/SevenIsland_Harbor/map.json b/data/maps/SevenIsland_Harbor/map.json index d33245efd..331934c56 100644 --- a/data/maps/SevenIsland_Harbor/map.json +++ b/data/maps/SevenIsland_Harbor/map.json @@ -51,4 +51,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SevenIsland_House_Room1/map.json b/data/maps/SevenIsland_House_Room1/map.json index d319db640..007474983 100644 --- a/data/maps/SevenIsland_House_Room1/map.json +++ b/data/maps/SevenIsland_House_Room1/map.json @@ -53,4 +53,4 @@ "script": "SevenIsland_House_Room1_EventScript_170A75" } ] -} +}
\ No newline at end of file diff --git a/data/maps/SevenIsland_House_Room2/map.json b/data/maps/SevenIsland_House_Room2/map.json index 131c2531f..b8e078390 100644 --- a/data/maps/SevenIsland_House_Room2/map.json +++ b/data/maps/SevenIsland_House_Room2/map.json @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SevenIsland_Mart/map.json b/data/maps/SevenIsland_Mart/map.json index 64f56ce7f..01a1d2862 100644 --- a/data/maps/SevenIsland_Mart/map.json +++ b/data/maps/SevenIsland_Mart/map.json @@ -77,4 +77,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SevenIsland_PokemonCenter_1F/map.json b/data/maps/SevenIsland_PokemonCenter_1F/map.json index cac3cd8f6..13d127677 100644 --- a/data/maps/SevenIsland_PokemonCenter_1F/map.json +++ b/data/maps/SevenIsland_PokemonCenter_1F/map.json @@ -110,4 +110,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SevenIsland_PokemonCenter_2F/map.json b/data/maps/SevenIsland_PokemonCenter_2F/map.json index 5952fb9b3..637becd02 100644 --- a/data/maps/SevenIsland_PokemonCenter_2F/map.json +++ b/data/maps/SevenIsland_PokemonCenter_2F/map.json @@ -91,4 +91,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/map.json b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/map.json index f6af3773a..a565aec38 100644 --- a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/map.json +++ b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/map.json @@ -180,4 +180,4 @@ } ], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SevenIsland_SevaultCanyon/map.json b/data/maps/SevenIsland_SevaultCanyon/map.json index 96721c128..167e850aa 100644 --- a/data/maps/SevenIsland_SevaultCanyon/map.json +++ b/data/maps/SevenIsland_SevaultCanyon/map.json @@ -309,7 +309,7 @@ "y": 66, "elevation": 3, "item": "ITEM_CHERI_BERRY", - "flag": "63", + "flag": "HIDDEN_ITEM_SEVEN_ISLAND_SEVAULT_CANYON_CHERI_BERRY", "unknown": 1 }, { @@ -320,4 +320,4 @@ "script": "SevenIsland_SevaultCanyon_EventScript_168BFE" } ] -} +}
\ No newline at end of file diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json index 32435d020..446b2641a 100644 --- a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json @@ -125,7 +125,7 @@ "y": 29, "elevation": 5, "item": "ITEM_RAWST_BERRY", - "flag": "188", + "flag": "HIDDEN_ITEM_SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE_RAWST_BERRY", "unknown": 1 }, { @@ -136,4 +136,4 @@ "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_168BF4" } ] -} +}
\ No newline at end of file diff --git a/data/maps/SevenIsland_SevaultCanyon_House/map.json b/data/maps/SevenIsland_SevaultCanyon_House/map.json index 3b38de1a7..15102c775 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_House/map.json @@ -64,4 +64,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SevenIsland_TanobyRuins/map.json b/data/maps/SevenIsland_TanobyRuins/map.json index 46cd52796..115d1944e 100644 --- a/data/maps/SevenIsland_TanobyRuins/map.json +++ b/data/maps/SevenIsland_TanobyRuins/map.json @@ -131,7 +131,7 @@ "y": 10, "elevation": 3, "item": "ITEM_HEART_SCALE", - "flag": "65", + "flag": "HIDDEN_ITEM_SEVEN_ISLAND_TANOBY_RUINS_HEART_SCALE", "unknown": 1 }, { @@ -140,7 +140,7 @@ "y": 9, "elevation": 3, "item": "ITEM_HEART_SCALE", - "flag": "66", + "flag": "HIDDEN_ITEM_SEVEN_ISLAND_TANOBY_RUINS_HEART_SCALE_2", "unknown": 1 }, { @@ -149,7 +149,7 @@ "y": 5, "elevation": 3, "item": "ITEM_HEART_SCALE", - "flag": "67", + "flag": "HIDDEN_ITEM_SEVEN_ISLAND_TANOBY_RUINS_HEART_SCALE_3", "unknown": 1 }, { @@ -158,8 +158,8 @@ "y": 2, "elevation": 3, "item": "ITEM_HEART_SCALE", - "flag": "64", + "flag": "HIDDEN_ITEM_SEVEN_ISLAND_TANOBY_RUINS_HEART_SCALE_4", "unknown": 1 } ] -} +}
\ No newline at end of file diff --git a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json index ddb7b332e..de6d85d1a 100644 --- a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json @@ -24,4 +24,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json index 72183cadb..bdeeea5f7 100644 --- a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json @@ -24,4 +24,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json index 9685ccfe6..d96f7d54a 100644 --- a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json @@ -24,4 +24,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json b/data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json index ba84889d5..06cd58de1 100644 --- a/data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json @@ -24,4 +24,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json index d21ec2792..94cb1892e 100644 --- a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json @@ -24,4 +24,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json index fd2e1317c..1fd2e625e 100644 --- a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json @@ -24,4 +24,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json index c53a81f80..498459518 100644 --- a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json @@ -24,4 +24,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SevenIsland_TrainerTower/map.json b/data/maps/SevenIsland_TrainerTower/map.json index fcf63e782..ddcb44498 100644 --- a/data/maps/SevenIsland_TrainerTower/map.json +++ b/data/maps/SevenIsland_TrainerTower/map.json @@ -63,7 +63,7 @@ "y": 27, "elevation": 3, "item": "ITEM_BIG_PEARL", - "flag": "185", + "flag": "HIDDEN_ITEM_SEVEN_ISLAND_TRAINER_TOWER_BIG_PEARL", "unknown": 1 }, { @@ -72,7 +72,7 @@ "y": 30, "elevation": 3, "item": "ITEM_PEARL", - "flag": "186", + "flag": "HIDDEN_ITEM_SEVEN_ISLAND_TRAINER_TOWER_PEARL", "unknown": 1 }, { @@ -81,7 +81,7 @@ "y": 32, "elevation": 3, "item": "ITEM_NANAB_BERRY", - "flag": "187", + "flag": "HIDDEN_ITEM_SEVEN_ISLAND_TRAINER_TOWER_NANAB_BERRY", "unknown": 1 }, { @@ -99,4 +99,4 @@ "script": "SevenIsland_TrainerTower_EventScript_168BEA" } ] -} +}
\ No newline at end of file diff --git a/data/maps/SevenIsland_TrainerTower_1F/map.json b/data/maps/SevenIsland_TrainerTower_1F/map.json index a830c85d0..125dc11f9 100644 --- a/data/maps/SevenIsland_TrainerTower_1F/map.json +++ b/data/maps/SevenIsland_TrainerTower_1F/map.json @@ -125,4 +125,4 @@ } ], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SevenIsland_TrainerTower_2F/map.json b/data/maps/SevenIsland_TrainerTower_2F/map.json index 6fdc50198..44851edad 100644 --- a/data/maps/SevenIsland_TrainerTower_2F/map.json +++ b/data/maps/SevenIsland_TrainerTower_2F/map.json @@ -132,4 +132,4 @@ } ], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SevenIsland_TrainerTower_3F/map.json b/data/maps/SevenIsland_TrainerTower_3F/map.json index d697f3adb..b9c4be645 100644 --- a/data/maps/SevenIsland_TrainerTower_3F/map.json +++ b/data/maps/SevenIsland_TrainerTower_3F/map.json @@ -132,4 +132,4 @@ } ], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SevenIsland_TrainerTower_4F/map.json b/data/maps/SevenIsland_TrainerTower_4F/map.json index f6b7336ee..4353cedbe 100644 --- a/data/maps/SevenIsland_TrainerTower_4F/map.json +++ b/data/maps/SevenIsland_TrainerTower_4F/map.json @@ -132,4 +132,4 @@ } ], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SevenIsland_TrainerTower_5F/map.json b/data/maps/SevenIsland_TrainerTower_5F/map.json index c5ce3d4c7..7d8e47dca 100644 --- a/data/maps/SevenIsland_TrainerTower_5F/map.json +++ b/data/maps/SevenIsland_TrainerTower_5F/map.json @@ -132,4 +132,4 @@ } ], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SevenIsland_TrainerTower_6F/map.json b/data/maps/SevenIsland_TrainerTower_6F/map.json index 5fc6fc1df..6e34e53e9 100644 --- a/data/maps/SevenIsland_TrainerTower_6F/map.json +++ b/data/maps/SevenIsland_TrainerTower_6F/map.json @@ -132,4 +132,4 @@ } ], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SevenIsland_TrainerTower_7F/map.json b/data/maps/SevenIsland_TrainerTower_7F/map.json index 2ede0ac79..4d21abe77 100644 --- a/data/maps/SevenIsland_TrainerTower_7F/map.json +++ b/data/maps/SevenIsland_TrainerTower_7F/map.json @@ -132,4 +132,4 @@ } ], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SevenIsland_TrainerTower_8F/map.json b/data/maps/SevenIsland_TrainerTower_8F/map.json index a04a282bf..6708cc4a0 100644 --- a/data/maps/SevenIsland_TrainerTower_8F/map.json +++ b/data/maps/SevenIsland_TrainerTower_8F/map.json @@ -132,4 +132,4 @@ } ], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SevenIsland_TrainerTower_Elevator/map.json b/data/maps/SevenIsland_TrainerTower_Elevator/map.json index fef686312..03514e3ef 100644 --- a/data/maps/SevenIsland_TrainerTower_Elevator/map.json +++ b/data/maps/SevenIsland_TrainerTower_Elevator/map.json @@ -32,4 +32,4 @@ "script": "SevenIsland_TrainerTower_Elevator_EventScript_164B03" } ] -} +}
\ No newline at end of file diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/map.json b/data/maps/SevenIsland_TrainerTower_Lobby/map.json index b690a29dd..6b81875f5 100644 --- a/data/maps/SevenIsland_TrainerTower_Lobby/map.json +++ b/data/maps/SevenIsland_TrainerTower_Lobby/map.json @@ -122,4 +122,4 @@ "script": "SevenIsland_TrainerTower_Lobby_EventScript_164AD8" } ] -} +}
\ No newline at end of file diff --git a/data/maps/SevenIsland_TrainerTower_Roof/map.json b/data/maps/SevenIsland_TrainerTower_Roof/map.json index ade5bc46c..ee8c20019 100644 --- a/data/maps/SevenIsland_TrainerTower_Roof/map.json +++ b/data/maps/SevenIsland_TrainerTower_Roof/map.json @@ -45,4 +45,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SilphCo_10F/map.json b/data/maps/SilphCo_10F/map.json index bc8c5fe00..726db90b5 100644 --- a/data/maps/SilphCo_10F/map.json +++ b/data/maps/SilphCo_10F/map.json @@ -172,7 +172,7 @@ "y": 9, "elevation": 0, "item": "ITEM_HP_UP", - "flag": "143", + "flag": "HIDDEN_ITEM_SILPH_CO_10F_HP_UP", "unknown": 1 }, { @@ -183,4 +183,4 @@ "script": "SilphCo_10F_EventScript_161DB7" } ] -} +}
\ No newline at end of file diff --git a/data/maps/SilphCo_11F/map.json b/data/maps/SilphCo_11F/map.json index 0bccc6bae..d15ba18f7 100644 --- a/data/maps/SilphCo_11F/map.json +++ b/data/maps/SilphCo_11F/map.json @@ -170,7 +170,7 @@ "y": 18, "elevation": 0, "item": "ITEM_REVIVE", - "flag": "144", + "flag": "HIDDEN_ITEM_SILPH_CO_11F_REVIVE", "unknown": 1 }, { @@ -181,4 +181,4 @@ "script": "SilphCo_11F_EventScript_161F37" } ] -} +}
\ No newline at end of file diff --git a/data/maps/SilphCo_1F/map.json b/data/maps/SilphCo_1F/map.json index d82ff755d..2554a9bb5 100644 --- a/data/maps/SilphCo_1F/map.json +++ b/data/maps/SilphCo_1F/map.json @@ -74,4 +74,4 @@ "script": "SilphCo_1F_EventScript_161638" } ] -} +}
\ No newline at end of file diff --git a/data/maps/SilphCo_2F/map.json b/data/maps/SilphCo_2F/map.json index 13c6b8584..43b73f393 100644 --- a/data/maps/SilphCo_2F/map.json +++ b/data/maps/SilphCo_2F/map.json @@ -193,8 +193,8 @@ "x": 11, "y": 21, "elevation": 0, - "item": "POCKET_KEY_ITEMS", - "flag": "135", + "item": "ITEM_ULTRA_BALL", + "flag": "HIDDEN_ITEM_SILPH_CO_2F_ULTRA_BALL", "unknown": 1 }, { @@ -205,4 +205,4 @@ "script": "SilphCo_2F_EventScript_161660" } ] -} +}
\ No newline at end of file diff --git a/data/maps/SilphCo_3F/map.json b/data/maps/SilphCo_3F/map.json index 99ef61e01..7aee73019 100644 --- a/data/maps/SilphCo_3F/map.json +++ b/data/maps/SilphCo_3F/map.json @@ -202,7 +202,7 @@ "y": 18, "elevation": 0, "item": "ITEM_PROTEIN", - "flag": "136", + "flag": "HIDDEN_ITEM_SILPH_CO_3F_PROTEIN", "unknown": 1 }, { @@ -213,4 +213,4 @@ "script": "SilphCo_3F_EventScript_1616FF" } ] -} +}
\ No newline at end of file diff --git a/data/maps/SilphCo_4F/map.json b/data/maps/SilphCo_4F/map.json index aed1bd4a5..8e7377b32 100644 --- a/data/maps/SilphCo_4F/map.json +++ b/data/maps/SilphCo_4F/map.json @@ -233,7 +233,7 @@ "y": 20, "elevation": 0, "item": "ITEM_IRON", - "flag": "137", + "flag": "HIDDEN_ITEM_SILPH_CO_4F_IRON", "unknown": 1 }, { @@ -244,4 +244,4 @@ "script": "SilphCo_4F_EventScript_161770" } ] -} +}
\ No newline at end of file diff --git a/data/maps/SilphCo_5F/map.json b/data/maps/SilphCo_5F/map.json index 5582db2ca..c6c950580 100644 --- a/data/maps/SilphCo_5F/map.json +++ b/data/maps/SilphCo_5F/map.json @@ -190,7 +190,7 @@ "y": 16, "elevation": 0, "item": "ITEM_ELIXIR", - "flag": "24", + "flag": "HIDDEN_ITEM_SILPH_CO_5F_ELIXIR", "unknown": 1 }, { @@ -304,7 +304,7 @@ "y": 9, "elevation": 0, "item": "ITEM_PP_UP", - "flag": "138", + "flag": "HIDDEN_ITEM_SILPH_CO_5F_PP_UP", "unknown": 1 }, { @@ -315,4 +315,4 @@ "script": "SilphCo_5F_EventScript_16181C" } ] -} +}
\ No newline at end of file diff --git a/data/maps/SilphCo_6F/map.json b/data/maps/SilphCo_6F/map.json index 2d057a7c2..14ee70111 100644 --- a/data/maps/SilphCo_6F/map.json +++ b/data/maps/SilphCo_6F/map.json @@ -217,7 +217,7 @@ "y": 8, "elevation": 0, "item": "ITEM_CARBOS", - "flag": "139", + "flag": "HIDDEN_ITEM_SILPH_CO_6F_CARBOS", "unknown": 1 }, { @@ -228,4 +228,4 @@ "script": "SilphCo_6F_EventScript_161936" } ] -} +}
\ No newline at end of file diff --git a/data/maps/SilphCo_7F/map.json b/data/maps/SilphCo_7F/map.json index e8298a7fa..b26b689e4 100644 --- a/data/maps/SilphCo_7F/map.json +++ b/data/maps/SilphCo_7F/map.json @@ -312,7 +312,7 @@ "y": 11, "elevation": 0, "item": "ITEM_ZINC", - "flag": "140", + "flag": "HIDDEN_ITEM_SILPH_CO_7F_ZINC", "unknown": 1 }, { @@ -323,4 +323,4 @@ "script": "SilphCo_7F_EventScript_161BFA" } ] -} +}
\ No newline at end of file diff --git a/data/maps/SilphCo_8F/map.json b/data/maps/SilphCo_8F/map.json index 437b935dd..b70ebfc2e 100644 --- a/data/maps/SilphCo_8F/map.json +++ b/data/maps/SilphCo_8F/map.json @@ -179,7 +179,7 @@ "y": 10, "elevation": 0, "item": "ITEM_NUGGET", - "flag": "141", + "flag": "HIDDEN_ITEM_SILPH_CO_8F_NUGGET", "unknown": 1 }, { @@ -190,4 +190,4 @@ "script": "SilphCo_8F_EventScript_161C90" } ] -} +}
\ No newline at end of file diff --git a/data/maps/SilphCo_9F/map.json b/data/maps/SilphCo_9F/map.json index 026b8d83c..f0ba67620 100644 --- a/data/maps/SilphCo_9F/map.json +++ b/data/maps/SilphCo_9F/map.json @@ -111,7 +111,7 @@ "y": 14, "elevation": 3, "item": "ITEM_MAX_POTION", - "flag": "25", + "flag": "HIDDEN_ITEM_SILPH_CO_9F_MAX_POTION", "unknown": 1 }, { @@ -232,7 +232,7 @@ "y": 8, "elevation": 0, "item": "ITEM_CALCIUM", - "flag": "142", + "flag": "HIDDEN_ITEM_SILPH_CO_9F_CALCIUM", "unknown": 1 }, { @@ -243,4 +243,4 @@ "script": "SilphCo_9F_EventScript_161D38" } ] -} +}
\ No newline at end of file diff --git a/data/maps/SilphCo_Elevator/map.json b/data/maps/SilphCo_Elevator/map.json index 815ed916e..7f6b42932 100644 --- a/data/maps/SilphCo_Elevator/map.json +++ b/data/maps/SilphCo_Elevator/map.json @@ -32,4 +32,4 @@ "script": "SilphCo_Elevator_EventScript_161F6F" } ] -} +}
\ No newline at end of file diff --git a/data/maps/SixIsland/map.json b/data/maps/SixIsland/map.json index a45d77e70..f023b1d8c 100644 --- a/data/maps/SixIsland/map.json +++ b/data/maps/SixIsland/map.json @@ -91,8 +91,8 @@ "y": 7, "elevation": 3, "item": "ITEM_LEPPA_BERRY", - "flag": "184", + "flag": "HIDDEN_ITEM_SIX_ISLAND_LEPPA_BERRY", "unknown": 1 } ] -} +}
\ No newline at end of file diff --git a/data/maps/SixIsland_AlteringCave/map.json b/data/maps/SixIsland_AlteringCave/map.json index b8141664e..9d5d42484 100644 --- a/data/maps/SixIsland_AlteringCave/map.json +++ b/data/maps/SixIsland_AlteringCave/map.json @@ -24,4 +24,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SixIsland_DottedHole_1F/map.json b/data/maps/SixIsland_DottedHole_1F/map.json index d83c3d58b..4b6334ef0 100644 --- a/data/maps/SixIsland_DottedHole_1F/map.json +++ b/data/maps/SixIsland_DottedHole_1F/map.json @@ -45,4 +45,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SixIsland_DottedHole_B1F/map.json b/data/maps/SixIsland_DottedHole_B1F/map.json index 449f0da2d..e4793f190 100644 --- a/data/maps/SixIsland_DottedHole_B1F/map.json +++ b/data/maps/SixIsland_DottedHole_B1F/map.json @@ -60,4 +60,4 @@ "script": "SixIsland_DottedHole_B1F_EventScript_16418C" } ] -} +}
\ No newline at end of file diff --git a/data/maps/SixIsland_DottedHole_B2F/map.json b/data/maps/SixIsland_DottedHole_B2F/map.json index 79cf28355..8ee6a23bc 100644 --- a/data/maps/SixIsland_DottedHole_B2F/map.json +++ b/data/maps/SixIsland_DottedHole_B2F/map.json @@ -60,4 +60,4 @@ "script": "SixIsland_DottedHole_B2F_EventScript_1641A7" } ] -} +}
\ No newline at end of file diff --git a/data/maps/SixIsland_DottedHole_B3F/map.json b/data/maps/SixIsland_DottedHole_B3F/map.json index 6c7af4456..ce49c9f4b 100644 --- a/data/maps/SixIsland_DottedHole_B3F/map.json +++ b/data/maps/SixIsland_DottedHole_B3F/map.json @@ -60,4 +60,4 @@ "script": "SixIsland_DottedHole_B3F_EventScript_16419E" } ] -} +}
\ No newline at end of file diff --git a/data/maps/SixIsland_DottedHole_B4F/map.json b/data/maps/SixIsland_DottedHole_B4F/map.json index 2490d48a7..8481b917f 100644 --- a/data/maps/SixIsland_DottedHole_B4F/map.json +++ b/data/maps/SixIsland_DottedHole_B4F/map.json @@ -60,4 +60,4 @@ "script": "SixIsland_DottedHole_B4F_EventScript_164195" } ] -} +}
\ No newline at end of file diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json index 0f78765b5..ebddf1f28 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json @@ -66,4 +66,4 @@ "script": "SixIsland_DottedHole_SapphireRoom_EventScript_16441F" } ] -} +}
\ No newline at end of file diff --git a/data/maps/SixIsland_GreenPath/map.json b/data/maps/SixIsland_GreenPath/map.json index bb106cb7f..8872d3047 100644 --- a/data/maps/SixIsland_GreenPath/map.json +++ b/data/maps/SixIsland_GreenPath/map.json @@ -89,9 +89,9 @@ "x": 12, "y": 9, "elevation": 3, - "item": "POCKET_KEY_ITEMS", - "flag": "180", + "item": "ITEM_ULTRA_BALL", + "flag": "HIDDEN_ITEM_SIX_ISLAND_GREEN_PATH_ULTRA_BALL", "unknown": 1 } ] -} +}
\ No newline at end of file diff --git a/data/maps/SixIsland_Harbor/map.json b/data/maps/SixIsland_Harbor/map.json index c86d93e32..ee61f3308 100644 --- a/data/maps/SixIsland_Harbor/map.json +++ b/data/maps/SixIsland_Harbor/map.json @@ -51,4 +51,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SixIsland_House/map.json b/data/maps/SixIsland_House/map.json index 1e82148ef..af01c01d3 100644 --- a/data/maps/SixIsland_House/map.json +++ b/data/maps/SixIsland_House/map.json @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SixIsland_Mart/map.json b/data/maps/SixIsland_Mart/map.json index 74cf54daa..5d47c4931 100644 --- a/data/maps/SixIsland_Mart/map.json +++ b/data/maps/SixIsland_Mart/map.json @@ -64,4 +64,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SixIsland_OutcastIsland/map.json b/data/maps/SixIsland_OutcastIsland/map.json index a643d0dcd..0808f30e5 100644 --- a/data/maps/SixIsland_OutcastIsland/map.json +++ b/data/maps/SixIsland_OutcastIsland/map.json @@ -128,7 +128,7 @@ "y": 23, "elevation": 3, "item": "ITEM_STAR_PIECE", - "flag": "178", + "flag": "HIDDEN_ITEM_SIX_ISLAND_OUTCAST_ISLAND_STAR_PIECE", "unknown": 1 }, { @@ -137,8 +137,8 @@ "y": 24, "elevation": 3, "item": "ITEM_NET_BALL", - "flag": "179", + "flag": "HIDDEN_ITEM_SIX_ISLAND_OUTCAST_ISLAND_NET_BALL", "unknown": 1 } ] -} +}
\ No newline at end of file diff --git a/data/maps/SixIsland_PatternBush/map.json b/data/maps/SixIsland_PatternBush/map.json index 52ce32061..f2f694136 100644 --- a/data/maps/SixIsland_PatternBush/map.json +++ b/data/maps/SixIsland_PatternBush/map.json @@ -216,4 +216,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SixIsland_PokemonCenter_1F/map.json b/data/maps/SixIsland_PokemonCenter_1F/map.json index 9b3a2b671..0f27ffcb3 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/map.json +++ b/data/maps/SixIsland_PokemonCenter_1F/map.json @@ -84,4 +84,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SixIsland_PokemonCenter_2F/map.json b/data/maps/SixIsland_PokemonCenter_2F/map.json index 2a0b353b1..42ef288ee 100644 --- a/data/maps/SixIsland_PokemonCenter_2F/map.json +++ b/data/maps/SixIsland_PokemonCenter_2F/map.json @@ -91,4 +91,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/SixIsland_RuinValley/map.json b/data/maps/SixIsland_RuinValley/map.json index eea1088f5..85e36f337 100644 --- a/data/maps/SixIsland_RuinValley/map.json +++ b/data/maps/SixIsland_RuinValley/map.json @@ -260,4 +260,4 @@ "script": "SixIsland_RuinValley_EventScript_168B94" } ] -} +}
\ No newline at end of file diff --git a/data/maps/SixIsland_WaterPath/map.json b/data/maps/SixIsland_WaterPath/map.json index dc5768d72..bc034c48e 100644 --- a/data/maps/SixIsland_WaterPath/map.json +++ b/data/maps/SixIsland_WaterPath/map.json @@ -178,7 +178,7 @@ "y": 76, "elevation": 3, "item": "ITEM_ASPEAR_BERRY", - "flag": "181", + "flag": "HIDDEN_ITEM_SIX_ISLAND_WATER_PATH_ASPEAR_BERRY", "unknown": 1 }, { @@ -187,7 +187,7 @@ "y": 8, "elevation": 3, "item": "ITEM_ORAN_BERRY", - "flag": "182", + "flag": "HIDDEN_ITEM_SIX_ISLAND_WATER_PATH_ORAN_BERRY", "unknown": 1 }, { @@ -196,7 +196,7 @@ "y": 63, "elevation": 3, "item": "ITEM_PINAP_BERRY", - "flag": "183", + "flag": "HIDDEN_ITEM_SIX_ISLAND_WATER_PATH_PINAP_BERRY", "unknown": 1 }, { @@ -207,4 +207,4 @@ "script": "SixIsland_WaterPath_EventScript_168B4A" } ] -} +}
\ No newline at end of file diff --git a/data/maps/SixIsland_WaterPath_House1/map.json b/data/maps/SixIsland_WaterPath_House1/map.json index 482b278be..ea55cbaa4 100644 --- a/data/maps/SixIsland_WaterPath_House1/map.json +++ b/data/maps/SixIsland_WaterPath_House1/map.json @@ -46,4 +46,4 @@ "script": "SixIsland_WaterPath_House1_EventScript_172157" } ] -} +}
\ No newline at end of file diff --git a/data/maps/SixIsland_WaterPath_House2/map.json b/data/maps/SixIsland_WaterPath_House2/map.json index dbe2dfc1e..148c00cf4 100644 --- a/data/maps/SixIsland_WaterPath_House2/map.json +++ b/data/maps/SixIsland_WaterPath_House2/map.json @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/ThreeIsland/map.json b/data/maps/ThreeIsland/map.json index 9c111147d..af751a6b6 100644 --- a/data/maps/ThreeIsland/map.json +++ b/data/maps/ThreeIsland/map.json @@ -364,8 +364,8 @@ "y": 13, "elevation": 3, "item": "ITEM_PP_UP", - "flag": "164", + "flag": "HIDDEN_ITEM_THREE_ISLAND_PP_UP", "unknown": 1 } ] -} +}
\ No newline at end of file diff --git a/data/maps/ThreeIsland_BerryForest/map.json b/data/maps/ThreeIsland_BerryForest/map.json index 04ccdb273..d02d48d19 100644 --- a/data/maps/ThreeIsland_BerryForest/map.json +++ b/data/maps/ThreeIsland_BerryForest/map.json @@ -241,7 +241,7 @@ "y": 25, "elevation": 3, "item": "ITEM_RAZZ_BERRY", - "flag": "90", + "flag": "HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_RAZZ_BERRY", "unknown": 1 }, { @@ -250,7 +250,7 @@ "y": 15, "elevation": 3, "item": "ITEM_BLUK_BERRY", - "flag": "91", + "flag": "HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_BLUK_BERRY", "unknown": 1 }, { @@ -259,7 +259,7 @@ "y": 24, "elevation": 3, "item": "ITEM_NANAB_BERRY", - "flag": "92", + "flag": "HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_NANAB_BERRY", "unknown": 1 }, { @@ -268,7 +268,7 @@ "y": 24, "elevation": 3, "item": "ITEM_WEPEAR_BERRY", - "flag": "93", + "flag": "HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_WEPEAR_BERRY", "unknown": 1 }, { @@ -277,7 +277,7 @@ "y": 18, "elevation": 3, "item": "ITEM_ORAN_BERRY", - "flag": "94", + "flag": "HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_ORAN_BERRY", "unknown": 1 }, { @@ -286,7 +286,7 @@ "y": 23, "elevation": 3, "item": "ITEM_CHERI_BERRY", - "flag": "95", + "flag": "HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_CHERI_BERRY", "unknown": 1 }, { @@ -295,7 +295,7 @@ "y": 5, "elevation": 3, "item": "ITEM_CHESTO_BERRY", - "flag": "96", + "flag": "HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_CHESTO_BERRY", "unknown": 1 }, { @@ -304,7 +304,7 @@ "y": 30, "elevation": 3, "item": "ITEM_PECHA_BERRY", - "flag": "97", + "flag": "HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_PECHA_BERRY", "unknown": 1 }, { @@ -313,7 +313,7 @@ "y": 5, "elevation": 3, "item": "ITEM_RAWST_BERRY", - "flag": "98", + "flag": "HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_RAWST_BERRY", "unknown": 1 }, { @@ -322,7 +322,7 @@ "y": 6, "elevation": 3, "item": "ITEM_ASPEAR_BERRY", - "flag": "99", + "flag": "HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_ASPEAR_BERRY", "unknown": 1 }, { @@ -331,7 +331,7 @@ "y": 32, "elevation": 3, "item": "ITEM_PERSIM_BERRY", - "flag": "100", + "flag": "HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_PERSIM_BERRY", "unknown": 1 }, { @@ -340,7 +340,7 @@ "y": 16, "elevation": 3, "item": "ITEM_PINAP_BERRY", - "flag": "101", + "flag": "HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_PINAP_BERRY", "unknown": 1 }, { @@ -349,8 +349,8 @@ "y": 5, "elevation": 3, "item": "ITEM_LUM_BERRY", - "flag": "102", + "flag": "HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_LUM_BERRY", "unknown": 1 } ] -} +}
\ No newline at end of file diff --git a/data/maps/ThreeIsland_BondBridge/map.json b/data/maps/ThreeIsland_BondBridge/map.json index 474a4063a..d11c8f68f 100644 --- a/data/maps/ThreeIsland_BondBridge/map.json +++ b/data/maps/ThreeIsland_BondBridge/map.json @@ -168,7 +168,7 @@ "y": 5, "elevation": 0, "item": "ITEM_MAX_REPEL", - "flag": "165", + "flag": "HIDDEN_ITEM_THREE_ISLAND_BOND_BRIDGE_MAX_REPEL", "unknown": 1 }, { @@ -177,7 +177,7 @@ "y": 12, "elevation": 3, "item": "ITEM_PEARL", - "flag": "166", + "flag": "HIDDEN_ITEM_THREE_ISLAND_BOND_BRIDGE_PEARL", "unknown": 1 }, { @@ -186,7 +186,7 @@ "y": 7, "elevation": 3, "item": "ITEM_STARDUST", - "flag": "167", + "flag": "HIDDEN_ITEM_THREE_ISLAND_BOND_BRIDGE_STARDUST", "unknown": 1 }, { @@ -197,4 +197,4 @@ "script": "ThreeIsland_BondBridge_EventScript_168780" } ] -} +}
\ No newline at end of file diff --git a/data/maps/ThreeIsland_DunsparceTunnel/map.json b/data/maps/ThreeIsland_DunsparceTunnel/map.json index c4616ad9c..ded30968d 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/map.json +++ b/data/maps/ThreeIsland_DunsparceTunnel/map.json @@ -51,8 +51,8 @@ "y": 3, "elevation": 0, "item": "ITEM_NUGGET", - "flag": "163", + "flag": "HIDDEN_ITEM_THREE_ISLAND_DUNSPARCE_TUNNEL_NUGGET", "unknown": 1 } ] -} +}
\ No newline at end of file diff --git a/data/maps/ThreeIsland_Harbor/map.json b/data/maps/ThreeIsland_Harbor/map.json index 58cee2b93..c1c653109 100644 --- a/data/maps/ThreeIsland_Harbor/map.json +++ b/data/maps/ThreeIsland_Harbor/map.json @@ -51,4 +51,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/ThreeIsland_House1/map.json b/data/maps/ThreeIsland_House1/map.json index dc2b5321f..da86b5764 100644 --- a/data/maps/ThreeIsland_House1/map.json +++ b/data/maps/ThreeIsland_House1/map.json @@ -46,4 +46,4 @@ "script": "ThreeIsland_House1_EventScript_171829" } ] -} +}
\ No newline at end of file diff --git a/data/maps/ThreeIsland_House2/map.json b/data/maps/ThreeIsland_House2/map.json index a596b88c0..dc37435e5 100644 --- a/data/maps/ThreeIsland_House2/map.json +++ b/data/maps/ThreeIsland_House2/map.json @@ -51,4 +51,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/ThreeIsland_House3/map.json b/data/maps/ThreeIsland_House3/map.json index 0ba900bc6..9fad038fb 100644 --- a/data/maps/ThreeIsland_House3/map.json +++ b/data/maps/ThreeIsland_House3/map.json @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/ThreeIsland_House4/map.json b/data/maps/ThreeIsland_House4/map.json index c1ceda273..9ffb81fd4 100644 --- a/data/maps/ThreeIsland_House4/map.json +++ b/data/maps/ThreeIsland_House4/map.json @@ -51,4 +51,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/ThreeIsland_House5/map.json b/data/maps/ThreeIsland_House5/map.json index b36be2276..13738ac5f 100644 --- a/data/maps/ThreeIsland_House5/map.json +++ b/data/maps/ThreeIsland_House5/map.json @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/ThreeIsland_Mart/map.json b/data/maps/ThreeIsland_Mart/map.json index 14e94407b..516ff2d92 100644 --- a/data/maps/ThreeIsland_Mart/map.json +++ b/data/maps/ThreeIsland_Mart/map.json @@ -77,4 +77,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/map.json b/data/maps/ThreeIsland_PokemonCenter_1F/map.json index b3e593a18..36d0db704 100644 --- a/data/maps/ThreeIsland_PokemonCenter_1F/map.json +++ b/data/maps/ThreeIsland_PokemonCenter_1F/map.json @@ -84,4 +84,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/ThreeIsland_PokemonCenter_2F/map.json b/data/maps/ThreeIsland_PokemonCenter_2F/map.json index 02fd95e39..1b088bf02 100644 --- a/data/maps/ThreeIsland_PokemonCenter_2F/map.json +++ b/data/maps/ThreeIsland_PokemonCenter_2F/map.json @@ -91,4 +91,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/ThreeIsland_Port/map.json b/data/maps/ThreeIsland_Port/map.json index bbc809fc1..08407c2dd 100644 --- a/data/maps/ThreeIsland_Port/map.json +++ b/data/maps/ThreeIsland_Port/map.json @@ -84,4 +84,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/TwoIsland/map.json b/data/maps/TwoIsland/map.json index ff7b3c601..8f9f15bc6 100644 --- a/data/maps/TwoIsland/map.json +++ b/data/maps/TwoIsland/map.json @@ -191,4 +191,4 @@ "script": "TwoIsland_EventScript_1677A4" } ] -} +}
\ No newline at end of file diff --git a/data/maps/TwoIsland_CapeBrink/map.json b/data/maps/TwoIsland_CapeBrink/map.json index 39a203e72..213b6e36d 100644 --- a/data/maps/TwoIsland_CapeBrink/map.json +++ b/data/maps/TwoIsland_CapeBrink/map.json @@ -36,7 +36,7 @@ "y": 28, "elevation": 3, "item": "ITEM_PP_MAX", - "flag": "161", + "flag": "HIDDEN_ITEM_TWO_ISLAND_CAPE_BRINK_PP_MAX", "unknown": 129 }, { @@ -45,8 +45,8 @@ "y": 13, "elevation": 3, "item": "ITEM_RARE_CANDY", - "flag": "111", + "flag": "HIDDEN_ITEM_TWO_ISLAND_CAPE_BRINK_RARE_CANDY", "unknown": 1 } ] -} +}
\ No newline at end of file diff --git a/data/maps/TwoIsland_CapeBrink_House/map.json b/data/maps/TwoIsland_CapeBrink_House/map.json index 75b7fb2eb..38af404e0 100644 --- a/data/maps/TwoIsland_CapeBrink_House/map.json +++ b/data/maps/TwoIsland_CapeBrink_House/map.json @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/TwoIsland_Harbor/map.json b/data/maps/TwoIsland_Harbor/map.json index 0fed41496..b98703259 100644 --- a/data/maps/TwoIsland_Harbor/map.json +++ b/data/maps/TwoIsland_Harbor/map.json @@ -51,4 +51,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/TwoIsland_House/map.json b/data/maps/TwoIsland_House/map.json index fe6e2a80c..398c81208 100644 --- a/data/maps/TwoIsland_House/map.json +++ b/data/maps/TwoIsland_House/map.json @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/TwoIsland_JoyfulGameCorner/map.json b/data/maps/TwoIsland_JoyfulGameCorner/map.json index 3b0ef6e54..6029225f5 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/map.json +++ b/data/maps/TwoIsland_JoyfulGameCorner/map.json @@ -92,4 +92,4 @@ "script": "TwoIsland_JoyfulGameCorner_EventScript_1BC2FC" } ] -} +}
\ No newline at end of file diff --git a/data/maps/TwoIsland_PokemonCenter_1F/map.json b/data/maps/TwoIsland_PokemonCenter_1F/map.json index 104e8fb2e..4c03034b7 100644 --- a/data/maps/TwoIsland_PokemonCenter_1F/map.json +++ b/data/maps/TwoIsland_PokemonCenter_1F/map.json @@ -71,4 +71,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/TwoIsland_PokemonCenter_2F/map.json b/data/maps/TwoIsland_PokemonCenter_2F/map.json index 89ef1c015..1ca9cae3a 100644 --- a/data/maps/TwoIsland_PokemonCenter_2F/map.json +++ b/data/maps/TwoIsland_PokemonCenter_2F/map.json @@ -91,4 +91,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/UndergroundPath_EastEntrance/map.json b/data/maps/UndergroundPath_EastEntrance/map.json index c6a7a20ef..042a2c4f4 100644 --- a/data/maps/UndergroundPath_EastEntrance/map.json +++ b/data/maps/UndergroundPath_EastEntrance/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/UndergroundPath_EastWestTunnel/map.json b/data/maps/UndergroundPath_EastWestTunnel/map.json index a1acbf716..d0a91ed5e 100644 --- a/data/maps/UndergroundPath_EastWestTunnel/map.json +++ b/data/maps/UndergroundPath_EastWestTunnel/map.json @@ -37,7 +37,7 @@ "y": 3, "elevation": 3, "item": "ITEM_POTION", - "flag": "77", + "flag": "HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_POTION", "unknown": 1 }, { @@ -46,7 +46,7 @@ "y": 5, "elevation": 3, "item": "ITEM_PARALYZE_HEAL", - "flag": "79", + "flag": "HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_PARALYZE_HEAL", "unknown": 1 }, { @@ -55,7 +55,7 @@ "y": 4, "elevation": 3, "item": "ITEM_AWAKENING", - "flag": "80", + "flag": "HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_AWAKENING", "unknown": 1 }, { @@ -64,7 +64,7 @@ "y": 3, "elevation": 3, "item": "ITEM_BURN_HEAL", - "flag": "81", + "flag": "HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_BURN_HEAL", "unknown": 1 }, { @@ -73,7 +73,7 @@ "y": 3, "elevation": 3, "item": "ITEM_ICE_HEAL", - "flag": "82", + "flag": "HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_ICE_HEAL", "unknown": 1 }, { @@ -82,7 +82,7 @@ "y": 2, "elevation": 3, "item": "ITEM_ETHER", - "flag": "83", + "flag": "HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_ETHER", "unknown": 1 }, { @@ -91,8 +91,8 @@ "y": 5, "elevation": 3, "item": "ITEM_ANTIDOTE", - "flag": "78", + "flag": "HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_ANTIDOTE", "unknown": 1 } ] -} +}
\ No newline at end of file diff --git a/data/maps/UndergroundPath_NorthEntrance/map.json b/data/maps/UndergroundPath_NorthEntrance/map.json index 3620937c7..2d86166a0 100644 --- a/data/maps/UndergroundPath_NorthEntrance/map.json +++ b/data/maps/UndergroundPath_NorthEntrance/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/UndergroundPath_NorthSouthTunnel/map.json b/data/maps/UndergroundPath_NorthSouthTunnel/map.json index 9d0408768..b55d82c2a 100644 --- a/data/maps/UndergroundPath_NorthSouthTunnel/map.json +++ b/data/maps/UndergroundPath_NorthSouthTunnel/map.json @@ -37,7 +37,7 @@ "y": 30, "elevation": 3, "item": "ITEM_POTION", - "flag": "70", + "flag": "HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_POTION", "unknown": 1 }, { @@ -46,7 +46,7 @@ "y": 6, "elevation": 3, "item": "ITEM_ANTIDOTE", - "flag": "71", + "flag": "HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_ANTIDOTE", "unknown": 1 }, { @@ -55,7 +55,7 @@ "y": 57, "elevation": 3, "item": "ITEM_BURN_HEAL", - "flag": "74", + "flag": "HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_BURN_HEAL", "unknown": 1 }, { @@ -64,7 +64,7 @@ "y": 24, "elevation": 3, "item": "ITEM_AWAKENING", - "flag": "73", + "flag": "HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_AWAKENING", "unknown": 1 }, { @@ -73,7 +73,7 @@ "y": 53, "elevation": 3, "item": "ITEM_ICE_HEAL", - "flag": "75", + "flag": "HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_ICE_HEAL", "unknown": 1 }, { @@ -82,7 +82,7 @@ "y": 15, "elevation": 3, "item": "ITEM_PARALYZE_HEAL", - "flag": "72", + "flag": "HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_PARALYZE_HEAL", "unknown": 1 }, { @@ -91,8 +91,8 @@ "y": 39, "elevation": 3, "item": "ITEM_ETHER", - "flag": "76", + "flag": "HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_ETHER", "unknown": 1 } ] -} +}
\ No newline at end of file diff --git a/data/maps/UndergroundPath_SouthEntrance/map.json b/data/maps/UndergroundPath_SouthEntrance/map.json index ef8888b06..ea33d80da 100644 --- a/data/maps/UndergroundPath_SouthEntrance/map.json +++ b/data/maps/UndergroundPath_SouthEntrance/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/UndergroundPath_WestEntrance/map.json b/data/maps/UndergroundPath_WestEntrance/map.json index 6791d7100..1f7964358 100644 --- a/data/maps/UndergroundPath_WestEntrance/map.json +++ b/data/maps/UndergroundPath_WestEntrance/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/UnknownMap_00_00/map.json b/data/maps/UnknownMap_00_00/map.json index ffebedc43..61012a76e 100644 --- a/data/maps/UnknownMap_00_00/map.json +++ b/data/maps/UnknownMap_00_00/map.json @@ -64,4 +64,4 @@ } ], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/UnknownMap_00_01/map.json b/data/maps/UnknownMap_00_01/map.json index 5d40fa820..275a6f6f1 100644 --- a/data/maps/UnknownMap_00_01/map.json +++ b/data/maps/UnknownMap_00_01/map.json @@ -64,4 +64,4 @@ } ], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/UnknownMap_00_02/map.json b/data/maps/UnknownMap_00_02/map.json index 742239cd3..a0738bc85 100644 --- a/data/maps/UnknownMap_00_02/map.json +++ b/data/maps/UnknownMap_00_02/map.json @@ -96,4 +96,4 @@ } ], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/UnknownMap_00_03/map.json b/data/maps/UnknownMap_00_03/map.json index 2f9141fe6..0c9080aed 100644 --- a/data/maps/UnknownMap_00_03/map.json +++ b/data/maps/UnknownMap_00_03/map.json @@ -82,4 +82,4 @@ } ], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/UnknownMap_00_04/map.json b/data/maps/UnknownMap_00_04/map.json index ed9be424f..cb94c6d15 100644 --- a/data/maps/UnknownMap_00_04/map.json +++ b/data/maps/UnknownMap_00_04/map.json @@ -142,4 +142,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/UnknownMap_03_50/map.json b/data/maps/UnknownMap_03_50/map.json index 25d12e137..73357c456 100644 --- a/data/maps/UnknownMap_03_50/map.json +++ b/data/maps/UnknownMap_03_50/map.json @@ -22,4 +22,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/UnknownMap_03_51/map.json b/data/maps/UnknownMap_03_51/map.json index 25c135de4..624398e90 100644 --- a/data/maps/UnknownMap_03_51/map.json +++ b/data/maps/UnknownMap_03_51/map.json @@ -22,4 +22,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/UnknownMap_03_52/map.json b/data/maps/UnknownMap_03_52/map.json index e38359999..3576e7fe9 100644 --- a/data/maps/UnknownMap_03_52/map.json +++ b/data/maps/UnknownMap_03_52/map.json @@ -16,4 +16,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/UnknownMap_03_53/map.json b/data/maps/UnknownMap_03_53/map.json index e3001e6be..1ba2dc8c7 100644 --- a/data/maps/UnknownMap_03_53/map.json +++ b/data/maps/UnknownMap_03_53/map.json @@ -16,4 +16,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/UnknownMap_18_01/map.json b/data/maps/UnknownMap_18_01/map.json index 7bb76e956..15fcec46b 100644 --- a/data/maps/UnknownMap_18_01/map.json +++ b/data/maps/UnknownMap_18_01/map.json @@ -16,4 +16,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/UnusedHouse_27_00/map.json b/data/maps/UnusedHouse_27_00/map.json index 60ba28d54..e3312a815 100644 --- a/data/maps/UnusedHouse_27_00/map.json +++ b/data/maps/UnusedHouse_27_00/map.json @@ -16,4 +16,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/UnusedHouse_29_00/map.json b/data/maps/UnusedHouse_29_00/map.json index db312a5a9..fb7f17580 100644 --- a/data/maps/UnusedHouse_29_00/map.json +++ b/data/maps/UnusedHouse_29_00/map.json @@ -16,4 +16,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/UnusedHouse_31_05/map.json b/data/maps/UnusedHouse_31_05/map.json index 0bd404adb..1c7279f8b 100644 --- a/data/maps/UnusedHouse_31_05/map.json +++ b/data/maps/UnusedHouse_31_05/map.json @@ -16,4 +16,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/VermilionCity/map.json b/data/maps/VermilionCity/map.json index 88387daef..e0658f73f 100644 --- a/data/maps/VermilionCity/map.json +++ b/data/maps/VermilionCity/map.json @@ -281,8 +281,8 @@ "y": 11, "elevation": 3, "item": "ITEM_MAX_ETHER", - "flag": "48", + "flag": "HIDDEN_ITEM_VERMILION_CITY_MAX_ETHER", "unknown": 1 } ] -} +}
\ No newline at end of file diff --git a/data/maps/VermilionCity_Gym/map.json b/data/maps/VermilionCity_Gym/map.json index dfb904da2..79e91ad9e 100644 --- a/data/maps/VermilionCity_Gym/map.json +++ b/data/maps/VermilionCity_Gym/map.json @@ -224,4 +224,4 @@ "script": "VermilionCity_Gym_EventScript_16B837" } ] -} +}
\ No newline at end of file diff --git a/data/maps/VermilionCity_House1/map.json b/data/maps/VermilionCity_House1/map.json index f83e884a9..aeebfb0d9 100644 --- a/data/maps/VermilionCity_House1/map.json +++ b/data/maps/VermilionCity_House1/map.json @@ -52,4 +52,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/VermilionCity_House2/map.json b/data/maps/VermilionCity_House2/map.json index 980e3eae8..b3b50c745 100644 --- a/data/maps/VermilionCity_House2/map.json +++ b/data/maps/VermilionCity_House2/map.json @@ -52,4 +52,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/VermilionCity_House3/map.json b/data/maps/VermilionCity_House3/map.json index 4ef4347b3..9c35c2a2c 100644 --- a/data/maps/VermilionCity_House3/map.json +++ b/data/maps/VermilionCity_House3/map.json @@ -99,4 +99,4 @@ "script": "VermilionCity_House3_EventScript_16BACF" } ] -} +}
\ No newline at end of file diff --git a/data/maps/VermilionCity_Mart/map.json b/data/maps/VermilionCity_Mart/map.json index 519227231..9fb12597a 100644 --- a/data/maps/VermilionCity_Mart/map.json +++ b/data/maps/VermilionCity_Mart/map.json @@ -78,4 +78,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/VermilionCity_PokemonCenter_1F/map.json b/data/maps/VermilionCity_PokemonCenter_1F/map.json index 750104631..965e0d4fc 100644 --- a/data/maps/VermilionCity_PokemonCenter_1F/map.json +++ b/data/maps/VermilionCity_PokemonCenter_1F/map.json @@ -137,4 +137,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/VermilionCity_PokemonCenter_2F/map.json b/data/maps/VermilionCity_PokemonCenter_2F/map.json index 7c0a45d41..a6f1426bf 100644 --- a/data/maps/VermilionCity_PokemonCenter_2F/map.json +++ b/data/maps/VermilionCity_PokemonCenter_2F/map.json @@ -91,4 +91,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/VermilionCity_PokemonFanClub/map.json b/data/maps/VermilionCity_PokemonFanClub/map.json index 4d5c86771..d9fbf115b 100644 --- a/data/maps/VermilionCity_PokemonFanClub/map.json +++ b/data/maps/VermilionCity_PokemonFanClub/map.json @@ -132,4 +132,4 @@ "script": "VermilionCity_PokemonFanClub_EventScript_16B5CD" } ] -} +}
\ No newline at end of file diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json index b1201e38a..84cfeb113 100644 --- a/data/maps/VictoryRoad_1F/map.json +++ b/data/maps/VictoryRoad_1F/map.json @@ -138,8 +138,8 @@ "x": 12, "y": 12, "elevation": 0, - "item": "POCKET_KEY_ITEMS", - "flag": "37", + "item": "ITEM_ULTRA_BALL", + "flag": "HIDDEN_ITEM_VICTORY_ROAD_1F_ULTRA_BALL", "unknown": 1 }, { @@ -148,8 +148,8 @@ "y": 1, "elevation": 0, "item": "ITEM_FULL_RESTORE", - "flag": "38", + "flag": "HIDDEN_ITEM_VICTORY_ROAD_1F_FULL_RESTORE", "unknown": 1 } ] -} +}
\ No newline at end of file diff --git a/data/maps/VictoryRoad_2F/map.json b/data/maps/VictoryRoad_2F/map.json index a477c4474..7d8cefd8f 100644 --- a/data/maps/VictoryRoad_2F/map.json +++ b/data/maps/VictoryRoad_2F/map.json @@ -269,4 +269,4 @@ } ], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/VictoryRoad_3F/map.json b/data/maps/VictoryRoad_3F/map.json index 609326d0f..55d14f254 100644 --- a/data/maps/VictoryRoad_3F/map.json +++ b/data/maps/VictoryRoad_3F/map.json @@ -219,4 +219,4 @@ } ], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/ViridianCity/map.json b/data/maps/ViridianCity/map.json index 394f58d7e..7b4c63df4 100644 --- a/data/maps/ViridianCity/map.json +++ b/data/maps/ViridianCity/map.json @@ -259,4 +259,4 @@ "script": "ViridianCity_EventScript_1659B8" } ] -} +}
\ No newline at end of file diff --git a/data/maps/ViridianCity_Gym/map.json b/data/maps/ViridianCity_Gym/map.json index f862217e0..f9ed56e13 100644 --- a/data/maps/ViridianCity_Gym/map.json +++ b/data/maps/ViridianCity_Gym/map.json @@ -189,8 +189,8 @@ "y": 2, "elevation": 3, "item": "ITEM_MACHO_BRACE", - "flag": "189", + "flag": "HIDDEN_ITEM_VIRIDIAN_CITY_GYM_MACHO_BRACE", "unknown": 129 } ] -} +}
\ No newline at end of file diff --git a/data/maps/ViridianCity_House1/map.json b/data/maps/ViridianCity_House1/map.json index 628b66dd0..257ce2fa0 100644 --- a/data/maps/ViridianCity_House1/map.json +++ b/data/maps/ViridianCity_House1/map.json @@ -86,4 +86,4 @@ "script": "ViridianCity_House1_EventScript_169EC0" } ] -} +}
\ No newline at end of file diff --git a/data/maps/ViridianCity_House2/map.json b/data/maps/ViridianCity_House2/map.json index 3b3bc76a0..1403acf3c 100644 --- a/data/maps/ViridianCity_House2/map.json +++ b/data/maps/ViridianCity_House2/map.json @@ -101,4 +101,4 @@ "script": "ViridianCity_House2_EventScript_1ACD65" } ] -} +}
\ No newline at end of file diff --git a/data/maps/ViridianCity_Mart/map.json b/data/maps/ViridianCity_Mart/map.json index 122ef65d3..eaa03c03d 100644 --- a/data/maps/ViridianCity_Mart/map.json +++ b/data/maps/ViridianCity_Mart/map.json @@ -78,4 +78,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/ViridianCity_PokemonCenter_1F/map.json b/data/maps/ViridianCity_PokemonCenter_1F/map.json index 0d2f95957..1b635056f 100644 --- a/data/maps/ViridianCity_PokemonCenter_1F/map.json +++ b/data/maps/ViridianCity_PokemonCenter_1F/map.json @@ -98,4 +98,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/ViridianCity_PokemonCenter_2F/map.json b/data/maps/ViridianCity_PokemonCenter_2F/map.json index 16c5033d1..9342094c9 100644 --- a/data/maps/ViridianCity_PokemonCenter_2F/map.json +++ b/data/maps/ViridianCity_PokemonCenter_2F/map.json @@ -91,4 +91,4 @@ ], "coord_events": [], "bg_events": [] -} +}
\ No newline at end of file diff --git a/data/maps/ViridianForest/map.json b/data/maps/ViridianForest/map.json index 89d9a9f03..62a5e3c4f 100644 --- a/data/maps/ViridianForest/map.json +++ b/data/maps/ViridianForest/map.json @@ -251,7 +251,7 @@ "y": 22, "elevation": 3, "item": "ITEM_POTION", - "flag": "0", + "flag": "HIDDEN_ITEM_VIRIDIAN_FOREST_POTION", "unknown": 1 }, { @@ -260,8 +260,8 @@ "y": 57, "elevation": 0, "item": "ITEM_ANTIDOTE", - "flag": "1", + "flag": "HIDDEN_ITEM_VIRIDIAN_FOREST_ANTIDOTE", "unknown": 1 } ] -} +}
\ No newline at end of file diff --git a/include/constants/flags.h b/include/constants/flags.h index b4d6c3b44..ed7a727e8 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -1004,197 +1004,200 @@ #define FLAG_0x3E7 0x3E7 #define FLAG_HIDDEN_ITEMS_START 1000 // 0x3E8 -#define FLAG_0x3E8 0x3E8 -#define FLAG_0x3E9 0x3E9 -#define FLAG_0x3EA 0x3EA -#define FLAG_0x3EB 0x3EB -#define FLAG_0x3EC 0x3EC -#define FLAG_0x3ED 0x3ED -#define FLAG_0x3EE 0x3EE -#define FLAG_0x3EF 0x3EF -#define FLAG_0x3F0 0x3F0 -#define FLAG_0x3F1 0x3F1 -#define FLAG_0x3F2 0x3F2 -#define FLAG_0x3F3 0x3F3 -#define FLAG_0x3F4 0x3F4 -#define FLAG_0x3F5 0x3F5 -#define FLAG_0x3F6 0x3F6 -#define FLAG_0x3F7 0x3F7 -#define FLAG_0x3F8 0x3F8 -#define FLAG_0x3F9 0x3F9 -#define FLAG_0x3FA 0x3FA -#define FLAG_0x3FB 0x3FB -#define FLAG_0x3FC 0x3FC -#define FLAG_0x3FD 0x3FD -#define FLAG_0x3FE 0x3FE -#define FLAG_0x3FF 0x3FF -#define FLAG_0x400 0x400 -#define FLAG_0x401 0x401 -#define FLAG_0x402 0x402 -#define FLAG_0x403 0x403 -#define FLAG_0x404 0x404 -#define FLAG_0x405 0x405 -#define FLAG_0x406 0x406 -#define FLAG_0x407 0x407 -#define FLAG_0x408 0x408 -#define FLAG_0x409 0x409 -#define FLAG_0x40A 0x40A -#define FLAG_0x40B 0x40B -#define FLAG_0x40C 0x40C -#define FLAG_0x40D 0x40D -#define FLAG_0x40E 0x40E -#define FLAG_0x40F 0x40F -#define FLAG_0x410 0x410 -#define FLAG_0x411 0x411 -#define FLAG_0x412 0x412 -#define FLAG_0x413 0x413 -#define FLAG_0x414 0x414 -#define FLAG_0x415 0x415 -#define FLAG_0x416 0x416 -#define FLAG_0x417 0x417 -#define FLAG_0x418 0x418 -#define FLAG_0x419 0x419 -#define FLAG_0x41A 0x41A -#define FLAG_0x41B 0x41B -#define FLAG_0x41C 0x41C -#define FLAG_0x41D 0x41D -#define FLAG_0x41E 0x41E -#define FLAG_0x41F 0x41F -#define FLAG_0x420 0x420 -#define FLAG_0x421 0x421 -#define FLAG_0x422 0x422 -#define FLAG_0x423 0x423 -#define FLAG_0x424 0x424 -#define FLAG_0x425 0x425 -#define FLAG_0x426 0x426 -#define FLAG_0x427 0x427 -#define FLAG_0x428 0x428 -#define FLAG_0x429 0x429 -#define FLAG_0x42A 0x42A -#define FLAG_0x42B 0x42B -#define FLAG_0x42C 0x42C -#define FLAG_0x42D 0x42D -#define FLAG_0x42E 0x42E -#define FLAG_0x42F 0x42F -#define FLAG_0x430 0x430 -#define FLAG_0x431 0x431 -#define FLAG_0x432 0x432 -#define FLAG_0x433 0x433 -#define FLAG_0x434 0x434 -#define FLAG_0x435 0x435 -#define FLAG_0x436 0x436 -#define FLAG_0x437 0x437 -#define FLAG_0x438 0x438 -#define FLAG_0x439 0x439 -#define FLAG_0x43A 0x43A -#define FLAG_0x43B 0x43B -#define FLAG_0x43C 0x43C -#define FLAG_0x43D 0x43D -#define FLAG_0x43E 0x43E -#define FLAG_0x43F 0x43F -#define FLAG_0x440 0x440 -#define FLAG_0x441 0x441 -#define FLAG_0x442 0x442 -#define FLAG_0x443 0x443 -#define FLAG_0x444 0x444 -#define FLAG_0x445 0x445 -#define FLAG_0x446 0x446 -#define FLAG_0x447 0x447 -#define FLAG_0x448 0x448 -#define FLAG_0x449 0x449 -#define FLAG_0x44A 0x44A -#define FLAG_0x44B 0x44B -#define FLAG_0x44C 0x44C -#define FLAG_0x44D 0x44D -#define FLAG_0x44E 0x44E -#define FLAG_0x44F 0x44F -#define FLAG_0x450 0x450 -#define FLAG_0x451 0x451 -#define FLAG_0x452 0x452 -#define FLAG_0x453 0x453 -#define FLAG_0x454 0x454 -#define FLAG_0x455 0x455 -#define FLAG_0x456 0x456 -#define FLAG_0x457 0x457 -#define FLAG_0x458 0x458 -#define FLAG_0x459 0x459 -#define FLAG_0x45A 0x45A -#define FLAG_0x45B 0x45B -#define FLAG_0x45C 0x45C -#define FLAG_0x45D 0x45D -#define FLAG_0x45E 0x45E -#define FLAG_0x45F 0x45F -#define FLAG_0x460 0x460 -#define FLAG_0x461 0x461 -#define FLAG_0x462 0x462 -#define FLAG_0x463 0x463 -#define FLAG_0x464 0x464 -#define FLAG_0x465 0x465 -#define FLAG_0x466 0x466 -#define FLAG_0x467 0x467 -#define FLAG_0x468 0x468 -#define FLAG_0x469 0x469 -#define FLAG_0x46A 0x46A -#define FLAG_0x46B 0x46B -#define FLAG_0x46C 0x46C -#define FLAG_0x46D 0x46D -#define FLAG_0x46E 0x46E -#define FLAG_0x46F 0x46F -#define FLAG_0x470 0x470 -#define FLAG_0x471 0x471 -#define FLAG_0x472 0x472 -#define FLAG_0x473 0x473 -#define FLAG_0x474 0x474 -#define FLAG_0x475 0x475 -#define FLAG_0x476 0x476 -#define FLAG_0x477 0x477 -#define FLAG_0x478 0x478 -#define FLAG_0x479 0x479 -#define FLAG_0x47A 0x47A -#define FLAG_0x47B 0x47B -#define FLAG_0x47C 0x47C -#define FLAG_0x47D 0x47D -#define FLAG_0x47E 0x47E -#define FLAG_0x47F 0x47F -#define FLAG_0x480 0x480 -#define FLAG_0x481 0x481 -#define FLAG_0x482 0x482 -#define FLAG_0x483 0x483 -#define FLAG_0x484 0x484 -#define FLAG_0x485 0x485 -#define FLAG_0x486 0x486 -#define FLAG_0x487 0x487 -#define FLAG_0x488 0x488 -#define FLAG_0x489 0x489 -#define FLAG_0x48A 0x48A -#define FLAG_0x48B 0x48B -#define FLAG_0x48C 0x48C -#define FLAG_0x48D 0x48D -#define FLAG_0x48E 0x48E -#define FLAG_0x48F 0x48F -#define FLAG_0x490 0x490 -#define FLAG_0x491 0x491 -#define FLAG_0x492 0x492 -#define FLAG_0x493 0x493 -#define FLAG_0x494 0x494 -#define FLAG_0x495 0x495 -#define FLAG_0x496 0x496 -#define FLAG_0x497 0x497 -#define FLAG_0x498 0x498 -#define FLAG_0x499 0x499 -#define FLAG_0x49A 0x49A -#define FLAG_0x49B 0x49B -#define FLAG_0x49C 0x49C -#define FLAG_0x49D 0x49D -#define FLAG_0x49E 0x49E -#define FLAG_0x49F 0x49F -#define FLAG_0x4A0 0x4A0 -#define FLAG_0x4A1 0x4A1 -#define FLAG_0x4A2 0x4A2 -#define FLAG_0x4A3 0x4A3 -#define FLAG_0x4A4 0x4A4 -#define FLAG_0x4A5 0x4A5 -#define FLAG_0x4A6 0x4A6 +#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_HOUSE1_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_NONE 51 +#define HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_NONE_2 52 +#define HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_NONE_3 53 +#define HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_NONE_4 54 +#define HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_NONE_5 55 +#define HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_NONE_6 56 +#define HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_NONE_7 57 +#define HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_NONE_8 58 +#define HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_NONE_9 59 +#define HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_NONE_10 60 +#define HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_NONE_11 61 +#define HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_NONE_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_0x4A7 0x4A7 #define FLAG_0x4A8 0x4A8 #define FLAG_0x4A9 0x4A9 diff --git a/src/renewable_hidden_items.c b/src/renewable_hidden_items.c index 8573ab392..8164471c8 100644 --- a/src/renewable_hidden_items.c +++ b/src/renewable_hidden_items.c @@ -31,7 +31,7 @@ const struct UnkStruct_8479D34 gUnknown_8479D34[] = { 0xFF }, .flags2 = { - FLAG_0x481 - FLAG_HIDDEN_ITEMS_START, + HIDDEN_ITEM_ROUTE20_STARDUST, 0xFF, 0xFF, 0xFF, @@ -65,7 +65,7 @@ const struct UnkStruct_8479D34 gUnknown_8479D34[] = { 0xFF }, .flags2 = { - FLAG_0x482 - FLAG_HIDDEN_ITEMS_START, + HIDDEN_ITEM_ROUTE21_NORTH_PEARL, 0xFF, 0xFF, 0xFF, @@ -89,7 +89,7 @@ const struct UnkStruct_8479D34 gUnknown_8479D34[] = { .mapGroup = MAP_GROUP(UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL), .mapNum = MAP_NUM(UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL), .flags1 = { - FLAG_0x434 - FLAG_HIDDEN_ITEMS_START, + HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_ETHER, 0xFF, 0xFF, 0xFF, @@ -99,12 +99,12 @@ const struct UnkStruct_8479D34 gUnknown_8479D34[] = { 0xFF }, .flags2 = { - FLAG_0x42E - FLAG_HIDDEN_ITEMS_START, - FLAG_0x42F - FLAG_HIDDEN_ITEMS_START, - FLAG_0x430 - FLAG_HIDDEN_ITEMS_START, - FLAG_0x431 - FLAG_HIDDEN_ITEMS_START, - FLAG_0x432 - FLAG_HIDDEN_ITEMS_START, - FLAG_0x433 - FLAG_HIDDEN_ITEMS_START, + 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 }, @@ -123,7 +123,7 @@ const struct UnkStruct_8479D34 gUnknown_8479D34[] = { .mapGroup = MAP_GROUP(UNDERGROUND_PATH_EAST_WEST_TUNNEL), .mapNum = MAP_NUM(UNDERGROUND_PATH_EAST_WEST_TUNNEL), .flags1 = { - FLAG_0x43B - FLAG_HIDDEN_ITEMS_START, + HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_ETHER, 0xFF, 0xFF, 0xFF, @@ -133,12 +133,12 @@ const struct UnkStruct_8479D34 gUnknown_8479D34[] = { 0xFF }, .flags2 = { - FLAG_0x435 - FLAG_HIDDEN_ITEMS_START, - FLAG_0x436 - FLAG_HIDDEN_ITEMS_START, - FLAG_0x437 - FLAG_HIDDEN_ITEMS_START, - FLAG_0x438 - FLAG_HIDDEN_ITEMS_START, - FLAG_0x439 - FLAG_HIDDEN_ITEMS_START, - FLAG_0x43A - FLAG_HIDDEN_ITEMS_START, + 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 }, @@ -157,10 +157,10 @@ const struct UnkStruct_8479D34 gUnknown_8479D34[] = { .mapGroup = MAP_GROUP(SEVEN_ISLAND_TANOBY_RUINS), .mapNum = MAP_NUM(SEVEN_ISLAND_TANOBY_RUINS), .flags1 = { - FLAG_0x428 - FLAG_HIDDEN_ITEMS_START, - FLAG_0x429 - FLAG_HIDDEN_ITEMS_START, - FLAG_0x42A - FLAG_HIDDEN_ITEMS_START, - FLAG_0x42B - FLAG_HIDDEN_ITEMS_START, + 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, @@ -191,19 +191,19 @@ const struct UnkStruct_8479D34 gUnknown_8479D34[] = { .mapGroup = MAP_GROUP(MT_MOON_B1F), .mapNum = MAP_NUM(MT_MOON_B1F), .flags1 = { - FLAG_0x43C - FLAG_HIDDEN_ITEMS_START, - FLAG_0x43D - FLAG_HIDDEN_ITEMS_START, - FLAG_0x43E - FLAG_HIDDEN_ITEMS_START, - FLAG_0x43F - FLAG_HIDDEN_ITEMS_START, - FLAG_0x440 - FLAG_HIDDEN_ITEMS_START, - FLAG_0x441 - FLAG_HIDDEN_ITEMS_START, + 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 }, .flags2 = { - FLAG_0x43C - FLAG_HIDDEN_ITEMS_START, - FLAG_0x43D - FLAG_HIDDEN_ITEMS_START, - FLAG_0x43E - FLAG_HIDDEN_ITEMS_START, + 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, @@ -225,31 +225,31 @@ const struct UnkStruct_8479D34 gUnknown_8479D34[] = { .mapGroup = MAP_GROUP(THREE_ISLAND_BERRY_FOREST), .mapNum = MAP_NUM(THREE_ISLAND_BERRY_FOREST), .flags1 = { - FLAG_0x443 - FLAG_HIDDEN_ITEMS_START, - FLAG_0x445 - FLAG_HIDDEN_ITEMS_START, - FLAG_0x446 - FLAG_HIDDEN_ITEMS_START, - FLAG_0x447 - FLAG_HIDDEN_ITEMS_START, - FLAG_0x44B - FLAG_HIDDEN_ITEMS_START, - FLAG_0x44C - FLAG_HIDDEN_ITEMS_START, - FLAG_0x44D - FLAG_HIDDEN_ITEMS_START, - FLAG_0x44E - FLAG_HIDDEN_ITEMS_START + 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 }, .flags2 = { - FLAG_0x443 - FLAG_HIDDEN_ITEMS_START, - FLAG_0x445 - FLAG_HIDDEN_ITEMS_START, - FLAG_0x446 - FLAG_HIDDEN_ITEMS_START, - FLAG_0x447 - FLAG_HIDDEN_ITEMS_START, - FLAG_0x44B - FLAG_HIDDEN_ITEMS_START, - FLAG_0x44C - FLAG_HIDDEN_ITEMS_START, - FLAG_0x44D - FLAG_HIDDEN_ITEMS_START, + 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 }, .flags3 = { - FLAG_0x442 - FLAG_HIDDEN_ITEMS_START, - FLAG_0x444 - FLAG_HIDDEN_ITEMS_START, - FLAG_0x448 - FLAG_HIDDEN_ITEMS_START, - FLAG_0x449 - FLAG_HIDDEN_ITEMS_START, - FLAG_0x44A - FLAG_HIDDEN_ITEMS_START, + 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 @@ -259,28 +259,28 @@ const struct UnkStruct_8479D34 gUnknown_8479D34[] = { .mapGroup = MAP_GROUP(ONE_ISLAND_TREASURE_BEACH), .mapNum = MAP_NUM(ONE_ISLAND_TREASURE_BEACH), .flags1 = { - FLAG_0x453 - FLAG_HIDDEN_ITEMS_START, - FLAG_0x454 - FLAG_HIDDEN_ITEMS_START, - FLAG_0x455 - FLAG_HIDDEN_ITEMS_START, - FLAG_0x456 - FLAG_HIDDEN_ITEMS_START, + 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 }, .flags2 = { - FLAG_0x44F - FLAG_HIDDEN_ITEMS_START, - FLAG_0x450 - FLAG_HIDDEN_ITEMS_START, - FLAG_0x451 - FLAG_HIDDEN_ITEMS_START, - FLAG_0x452 - FLAG_HIDDEN_ITEMS_START, - FLAG_0x453 - FLAG_HIDDEN_ITEMS_START, - FLAG_0x454 - FLAG_HIDDEN_ITEMS_START, + 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 }, .flags3 = { - FLAG_0x453 - FLAG_HIDDEN_ITEMS_START, - FLAG_0x454 - FLAG_HIDDEN_ITEMS_START, + HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_ULTRA_BALL, + HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_ULTRA_BALL_2, 0xFF, 0xFF, 0xFF, @@ -303,8 +303,8 @@ const struct UnkStruct_8479D34 gUnknown_8479D34[] = { 0xFF }, .flags2 = { - FLAG_0x48E - FLAG_HIDDEN_ITEMS_START, - FLAG_0x48F - FLAG_HIDDEN_ITEMS_START, + HIDDEN_ITEM_THREE_ISLAND_BOND_BRIDGE_PEARL, + HIDDEN_ITEM_THREE_ISLAND_BOND_BRIDGE_STARDUST, 0xFF, 0xFF, 0xFF, @@ -337,7 +337,7 @@ const struct UnkStruct_8479D34 gUnknown_8479D34[] = { 0xFF }, .flags2 = { - FLAG_0x490 - FLAG_HIDDEN_ITEMS_START, + HIDDEN_ITEM_FOUR_ISLAND_PEARL, 0xFF, 0xFF, 0xFF, @@ -347,7 +347,7 @@ const struct UnkStruct_8479D34 gUnknown_8479D34[] = { 0xFF }, .flags3 = { - FLAG_0x491 - FLAG_HIDDEN_ITEMS_START, + HIDDEN_ITEM_FOUR_ISLAND_ULTRA_BALL, 0xFF, 0xFF, 0xFF, @@ -361,7 +361,7 @@ const struct UnkStruct_8479D34 gUnknown_8479D34[] = { .mapGroup = MAP_GROUP(FIVE_ISLAND_MEMORIAL_PILLAR), .mapNum = MAP_NUM(FIVE_ISLAND_MEMORIAL_PILLAR), .flags1 = { - FLAG_0x492 - FLAG_HIDDEN_ITEMS_START, + HIDDEN_ITEM_FIVE_ISLAND_MEMORIAL_PILLAR_BIG_PEARL, 0xFF, 0xFF, 0xFF, @@ -395,8 +395,8 @@ const struct UnkStruct_8479D34 gUnknown_8479D34[] = { .mapGroup = MAP_GROUP(FIVE_ISLAND_RESORT_GORGEOUS), .mapNum = MAP_NUM(FIVE_ISLAND_RESORT_GORGEOUS), .flags1 = { - FLAG_0x496 - FLAG_HIDDEN_ITEMS_START, - FLAG_0x498 - FLAG_HIDDEN_ITEMS_START, + HIDDEN_ITEM_FIVE_ISLAND_RESORT_GORGEOUS_NEST_BALL, + HIDDEN_ITEM_FIVE_ISLAND_RESORT_GORGEOUS_STAR_PIECE, 0xFF, 0xFF, 0xFF, @@ -405,8 +405,8 @@ const struct UnkStruct_8479D34 gUnknown_8479D34[] = { 0xFF }, .flags2 = { - FLAG_0x497 - FLAG_HIDDEN_ITEMS_START, - FLAG_0x499 - FLAG_HIDDEN_ITEMS_START, + HIDDEN_ITEM_FIVE_ISLAND_RESORT_GORGEOUS_STARDUST, + HIDDEN_ITEM_FIVE_ISLAND_RESORT_GORGEOUS_STARDUST_2, 0xFF, 0xFF, 0xFF, @@ -429,8 +429,8 @@ const struct UnkStruct_8479D34 gUnknown_8479D34[] = { .mapGroup = MAP_GROUP(SIX_ISLAND_OUTCAST_ISLAND), .mapNum = MAP_NUM(SIX_ISLAND_OUTCAST_ISLAND), .flags1 = { - FLAG_0x49A - FLAG_HIDDEN_ITEMS_START, - FLAG_0x49B - FLAG_HIDDEN_ITEMS_START, + HIDDEN_ITEM_SIX_ISLAND_OUTCAST_ISLAND_STAR_PIECE, + HIDDEN_ITEM_SIX_ISLAND_OUTCAST_ISLAND_NET_BALL, 0xFF, 0xFF, 0xFF, @@ -483,7 +483,7 @@ const struct UnkStruct_8479D34 gUnknown_8479D34[] = { 0xFF }, .flags3 = { - FLAG_0x49C - FLAG_HIDDEN_ITEMS_START, + HIDDEN_ITEM_SIX_ISLAND_GREEN_PATH_ULTRA_BALL, 0xFF, 0xFF, 0xFF, @@ -497,7 +497,7 @@ const struct UnkStruct_8479D34 gUnknown_8479D34[] = { .mapGroup = MAP_GROUP(SEVEN_ISLAND_TRAINER_TOWER), .mapNum = MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER), .flags1 = { - FLAG_0x4A1 - FLAG_HIDDEN_ITEMS_START, + HIDDEN_ITEM_SEVEN_ISLAND_TRAINER_TOWER_BIG_PEARL, 0xFF, 0xFF, 0xFF, @@ -507,7 +507,7 @@ const struct UnkStruct_8479D34 gUnknown_8479D34[] = { 0xFF }, .flags2 = { - FLAG_0x4A2 - FLAG_HIDDEN_ITEMS_START, + HIDDEN_ITEM_SEVEN_ISLAND_TRAINER_TOWER_PEARL, 0xFF, 0xFF, 0xFF, |