diff options
72 files changed, 307 insertions, 305 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index b1d8fe132..416da56b2 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1493,22 +1493,22 @@ EventScript_ResetAllMapFlags:: @ 81A6481 setflag FLAG_HIDE_OAK_IN_HIS_LAB setflag FLAG_HIDE_OAK_IN_PALLET_TOWN setflag FLAG_HIDE_BILL_HUMAN_SEA_COTTAGE - setflag FLAG_0x092 + setflag FLAG_HIDE_PEWTER_CITY_RUNNING_SHOES_GUY setflag FLAG_HIDE_POKEHOUSE_FUJI setflag FLAG_HIDE_LIFT_KEY setflag FLAG_HIDE_SILPH_SCOPE setflag FLAG_HIDE_CERULEAN_RIVAL setflag FLAG_HIDE_SS_ANNE_RIVAL - setflag FLAG_0x0A1 + setflag FLAG_HIDE_VERMILION_CITY_OAKS_AIDE setflag FLAG_HIDE_SAFFRON_CIVILIANS setflag FLAG_HIDE_ROUTE_22_RIVAL setflag FLAG_HIDE_OAK_IN_CHAMP_ROOM - setflag FLAG_0x0A3 - setflag FLAG_0x0A4 + setflag FLAG_HIDE_CREDITS_RIVAL + setflag FLAG_HIDE_CREDITS_OAK setflag FLAG_HIDE_CINNABAR_BILL setflag FLAG_HIDE_CINNABAR_SEAGALLOP - setflag FLAG_0x0A2 - setflag FLAG_0x08C + setflag FLAG_HIDE_CINNABAR_POKECENTER_BILL + setflag FLAG_HIDE_LORELEI_IN_HER_HOUSE setflag FLAG_HIDE_SAFFRON_FAN_CLUB_BLACKBELT setflag FLAG_HIDE_SAFFRON_FAN_CLUB_ROCKER setflag FLAG_HIDE_SAFFRON_FAN_CLUB_WOMAN @@ -1519,31 +1519,31 @@ EventScript_ResetAllMapFlags:: @ 81A6481 setflag FLAG_HIDE_TWO_ISLAND_BEAUTY setflag FLAG_HIDE_TWO_ISLAND_SUPER_NERD setflag FLAG_HIDE_LOSTELLE_IN_HER_HOME - setflag FLAG_0x091 - setflag FLAG_0x097 - setflag FLAG_0x090 - setflag FLAG_0x094 - setflag FLAG_0x095 - setflag FLAG_0x096 - setflag FLAG_0x099 - setflag FLAG_0x0A5 - setflag FLAG_0x0A6 - setflag FLAG_0x0A7 - setflag FLAG_0x0A8 - setflag FLAG_0x0A9 - setflag FLAG_0x0AA - setflag FLAG_0x0AB - setflag FLAG_0x0AC - setflag FLAG_0x09D - setflag FLAG_0x09E - setflag FLAG_0x09F - setflag FLAG_0x0A0 - setflag FLAG_0x0AE + setflag FLAG_HIDE_THREE_ISLAND_LONE_BIKER + setflag FLAG_HIDE_FOUR_ISLAND_RIVAL + setflag FLAG_HIDE_DOTTED_HOLE_SCIENTIST + setflag FLAG_HIDE_RESORT_GORGEOUS_SELPHY + setflag FLAG_HIDE_RESORT_GORGEOUS_INSIDE_SELPHY + setflag FLAG_HIDE_SELPHYS_BUTLER + setflag FLAG_HIDE_DEOXYS + setflag FLAG_HIDE_LORELEI_HOUSE_MEOWTH_DOLL + setflag FLAG_HIDE_LORELEI_HOUSE_CHANSEY_DOLL + setflag FLAG_HIDE_LORELEIS_HOUSE_NIDORAN_F_DOLL + setflag FLAG_HIDE_LORELEI_HOUSE_JIGGLYPUFF_DOLL + setflag FLAG_HIDE_LORELEIS_HOUSE_NIDORAN_M_DOLL + setflag FLAG_HIDE_LORELEIS_HOUSE_FEAROW_DOLL + setflag FLAG_HIDE_LORELEIS_HOUSE_PIDGEOT_DOLL + setflag FLAG_HIDE_LORELEIS_HOUSE_LAPRAS_DOLL + setflag FLAG_HIDE_POSTGAME_GOSSIPERS + setflag FLAG_HIDE_FAME_CHECKER_ERIKA_JOURNALS + setflag FLAG_HIDE_FAME_CHECKER_KOGA_JOURNAL + setflag FLAG_HIDE_FAME_CHECKER_LT_SURGE_JOURNAL + setflag FLAG_HIDE_SAFFRON_CITY_POKECENTER_SABRINA_JOURNALS setvar VAR_0x4025, 500 end EventScript_1A651A:: @ 81A651A - clearflag FLAG_0x09D + clearflag FLAG_HIDE_POSTGAME_GOSSIPERS call EventScript_1A6551 special sub_81130A8 specialvar VAR_RESULT, IsNationalPokedexEnabled diff --git a/data/maps/BirthIsland_Exterior/map.json b/data/maps/BirthIsland_Exterior/map.json index a38e0223e..8e78364f6 100644 --- a/data/maps/BirthIsland_Exterior/map.json +++ b/data/maps/BirthIsland_Exterior/map.json @@ -24,7 +24,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "BirthIsland_Exterior_EventScript_165271", - "flag": "FLAG_0x09A" + "flag": "FLAG_HIDE_BIRTH_ISLAND_METEORITE" }, { "graphics_id": "MAP_OBJ_GFX_VAR_0", @@ -37,7 +37,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "FLAG_0x099" + "flag": "FLAG_HIDE_DEOXYS" } ], "warp_events": [ diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index b53955f53..99ab46150 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -20,14 +20,14 @@ BirthIsland_Exterior_MapScript1_165217:: @ 8165217 end EventScript_16523C:: @ 816523C - setflag FLAG_0x099 - setflag FLAG_0x09A + setflag FLAG_HIDE_DEOXYS + setflag FLAG_HIDE_BIRTH_ISLAND_METEORITE return EventScript_165243:: @ 8165243 checkflag FLAG_0x2F7 goto_if_eq EventScript_1A77A9 - clearflag FLAG_0x09A + clearflag FLAG_HIDE_BIRTH_ISLAND_METEORITE clearflag FLAG_0x848 return diff --git a/data/maps/CeladonCity_Condominiums_2F/map.json b/data/maps/CeladonCity_Condominiums_2F/map.json index de354af8b..9f80e8e96 100644 --- a/data/maps/CeladonCity_Condominiums_2F/map.json +++ b/data/maps/CeladonCity_Condominiums_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_RED_NORMAL", + "graphics_id": "0", "x": 6, "y": 6, "elevation": 0, @@ -24,10 +24,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeladonCity_Condominiums_2F_EventScript_1ACE9D", - "flag": "FLAG_0x09E" + "flag": "FLAG_HIDE_FAME_CHECKER_ERIKA_JOURNALS" }, { - "graphics_id": "MAP_OBJ_GFX_RED_NORMAL", + "graphics_id": "0", "x": 5, "y": 6, "elevation": 0, @@ -37,7 +37,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeladonCity_Condominiums_2F_EventScript_1ACE9D", - "flag": "FLAG_0x09E" + "flag": "FLAG_HIDE_FAME_CHECKER_ERIKA_JOURNALS" } ], "warp_events": [ diff --git a/data/maps/CeladonCity_DepartmentStore_2F/map.json b/data/maps/CeladonCity_DepartmentStore_2F/map.json index fae0949c0..f5333e88a 100644 --- a/data/maps/CeladonCity_DepartmentStore_2F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_2F/map.json @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeladonCity_DepartmentStore_2F_EventScript_1AD053", - "flag": "FLAG_0x09D" + "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" } ], "warp_events": [ diff --git a/data/maps/CeladonCity_Gym/scripts.inc b/data/maps/CeladonCity_Gym/scripts.inc index 9e9fb9543..148f14c26 100644 --- a/data/maps/CeladonCity_Gym/scripts.inc +++ b/data/maps/CeladonCity_Gym/scripts.inc @@ -19,7 +19,7 @@ EventScript_16D0A0:: @ 816D0A0 setvar VAR_0x8004, 5 setvar VAR_0x8005, 1 special SetFlavorTextFlagFromSpecialVars - clearflag FLAG_0x09E + clearflag FLAG_HIDE_FAME_CHECKER_ERIKA_JOURNALS setflag FLAG_0x4B3 setflag FLAG_BADGE04_GET setvar VAR_0x8008, 4 diff --git a/data/maps/CeruleanCave_B1F/map.json b/data/maps/CeruleanCave_B1F/map.json index 1f982d094..1713f66e9 100644 --- a/data/maps/CeruleanCave_B1F/map.json +++ b/data/maps/CeruleanCave_B1F/map.json @@ -50,7 +50,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeruleanCave_B1F_EventScript_1624F5", - "flag": "FLAG_0x081" + "flag": "FLAG_HIDE_MEWTWO" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", diff --git a/data/maps/CeruleanCave_B1F/scripts.inc b/data/maps/CeruleanCave_B1F/scripts.inc index c12eaff5a..a9e13651c 100644 --- a/data/maps/CeruleanCave_B1F/scripts.inc +++ b/data/maps/CeruleanCave_B1F/scripts.inc @@ -21,7 +21,7 @@ CeruleanCave_B1F_MapScript2_1624E7:: @ 81624E7 end EventScript_1624F1:: @ 81624F1 - clearflag FLAG_0x081 + clearflag FLAG_HIDE_MEWTWO return CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5 diff --git a/data/maps/CeruleanCity_PokemonCenter_1F/map.json b/data/maps/CeruleanCity_PokemonCenter_1F/map.json index 9b5b8fc4a..85e02720a 100644 --- a/data/maps/CeruleanCity_PokemonCenter_1F/map.json +++ b/data/maps/CeruleanCity_PokemonCenter_1F/map.json @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_RED_NORMAL", + "graphics_id": "0", "x": 2, "y": 1, "elevation": 0, @@ -89,10 +89,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeruleanCity_PokemonCenter_1F_EventScript_1ACE68", - "flag": "FLAG_0x09D" + "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" }, { - "graphics_id": "MAP_OBJ_GFX_RED_NORMAL", + "graphics_id": "0", "x": 3, "y": 1, "elevation": 0, @@ -102,7 +102,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeruleanCity_PokemonCenter_1F_EventScript_1ACE68", - "flag": "FLAG_0x09D" + "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" } ], "warp_events": [ diff --git a/data/maps/CinnabarIsland/scripts.inc b/data/maps/CinnabarIsland/scripts.inc index 407792e32..7f10405da 100644 --- a/data/maps/CinnabarIsland/scripts.inc +++ b/data/maps/CinnabarIsland/scripts.inc @@ -152,7 +152,7 @@ EventScript_167078:: @ 8167078 call_if 1, EventScript_1670B3 removeobject 3 setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 2 - clearflag FLAG_0x0A2 + clearflag FLAG_HIDE_CINNABAR_POKECENTER_BILL releaseall end diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/map.json b/data/maps/CinnabarIsland_PokemonCenter_1F/map.json index 2b0508a57..e45fcd735 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/map.json +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/map.json @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_RED_NORMAL", + "graphics_id": "0", "x": 2, "y": 1, "elevation": 0, @@ -76,10 +76,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CinnabarIsland_PokemonCenter_1F_EventScript_1AD0B9", - "flag": "FLAG_0x09D" + "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" }, { - "graphics_id": "MAP_OBJ_GFX_RED_NORMAL", + "graphics_id": "0", "x": 3, "y": 1, "elevation": 0, @@ -89,7 +89,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CinnabarIsland_PokemonCenter_1F_EventScript_1AD0B9", - "flag": "FLAG_0x09D" + "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" }, { "graphics_id": "MAP_OBJ_GFX_BILL", @@ -102,7 +102,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CinnabarIsland_PokemonCenter_1F_EventScript_16E90A", - "flag": "FLAG_0x0A2" + "flag": "FLAG_HIDE_CINNABAR_POKECENTER_BILL" } ], "warp_events": [ diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc index c2f649414..ae4c986bf 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc @@ -37,7 +37,7 @@ CinnabarIsland_PokemonCenter_1F_EventScript_16E90A:: @ 816E90A playbgm MUS_ANNAI, 1 savebgm MUS_ANNAI setflag FLAG_SPECIAL_FLAG_0x4001 - setflag FLAG_0x0A2 + setflag FLAG_HIDE_CINNABAR_POKECENTER_BILL delay 20 compare_var_to_value VAR_FACING, 1 call_if 1, EventScript_16E96F diff --git a/data/maps/FiveIsland_LostCave_Room10/map.json b/data/maps/FiveIsland_LostCave_Room10/map.json index 726f3b098..f6399440c 100644 --- a/data/maps/FiveIsland_LostCave_Room10/map.json +++ b/data/maps/FiveIsland_LostCave_Room10/map.json @@ -24,7 +24,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "FLAG_0x093" + "flag": "FLAG_HIDE_LOST_CAVE_SELPHY" }, { "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", diff --git a/data/maps/FiveIsland_LostCave_Room10/scripts.inc b/data/maps/FiveIsland_LostCave_Room10/scripts.inc index 7ec208bd9..212740c6b 100644 --- a/data/maps/FiveIsland_LostCave_Room10/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room10/scripts.inc @@ -38,8 +38,8 @@ EventScript_164C52:: @ 8164C52 end EventScript_164CA5:: @ 8164CA5 - setflag FLAG_0x093 - clearflag FLAG_0x094 + setflag FLAG_HIDE_LOST_CAVE_SELPHY + clearflag FLAG_HIDE_RESORT_GORGEOUS_SELPHY setvar VAR_MAP_SCENE_FIVE_ISLAND_LOST_CAVE_ROOM10, 1 setvar VAR_MAP_SCENE_FIVE_ISLAND_RESORT_GORGEOUS, 1 return diff --git a/data/maps/FiveIsland_Meadow/map.json b/data/maps/FiveIsland_Meadow/map.json index 4d38a76ef..7fde83f08 100644 --- a/data/maps/FiveIsland_Meadow/map.json +++ b/data/maps/FiveIsland_Meadow/map.json @@ -35,7 +35,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, "script": "FiveIsland_Meadow_EventScript_1689BB", - "flag": "FLAG_0x088" + "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_ROCKET_M", @@ -48,7 +48,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, "script": "FiveIsland_Meadow_EventScript_16898D", - "flag": "FLAG_0x088" + "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_ROCKET_M", @@ -61,7 +61,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, "script": "FiveIsland_Meadow_EventScript_1689A4", - "flag": "FLAG_0x088" + "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_CUT_TREE", diff --git a/data/maps/FiveIsland_PokemonCenter_1F/map.json b/data/maps/FiveIsland_PokemonCenter_1F/map.json index a7756e0dc..053a14a62 100644 --- a/data/maps/FiveIsland_PokemonCenter_1F/map.json +++ b/data/maps/FiveIsland_PokemonCenter_1F/map.json @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_RED_NORMAL", + "graphics_id": "0", "x": 2, "y": 1, "elevation": 0, @@ -63,10 +63,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FiveIsland_PokemonCenter_1F_EventScript_1ACF5F", - "flag": "FLAG_0x09D" + "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" }, { - "graphics_id": "MAP_OBJ_GFX_RED_NORMAL", + "graphics_id": "0", "x": 3, "y": 1, "elevation": 0, @@ -76,7 +76,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FiveIsland_PokemonCenter_1F_EventScript_1ACF5F", - "flag": "FLAG_0x09D" + "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" } ], "warp_events": [ diff --git a/data/maps/FiveIsland_ResortGorgeous/map.json b/data/maps/FiveIsland_ResortGorgeous/map.json index 3f7b471ae..1f5809857 100644 --- a/data/maps/FiveIsland_ResortGorgeous/map.json +++ b/data/maps/FiveIsland_ResortGorgeous/map.json @@ -121,7 +121,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "FLAG_0x094" + "flag": "FLAG_HIDE_RESORT_GORGEOUS_SELPHY" } ], "warp_events": [ diff --git a/data/maps/FiveIsland_ResortGorgeous/scripts.inc b/data/maps/FiveIsland_ResortGorgeous/scripts.inc index a37695954..a4d49de1b 100644 --- a/data/maps/FiveIsland_ResortGorgeous/scripts.inc +++ b/data/maps/FiveIsland_ResortGorgeous/scripts.inc @@ -29,7 +29,7 @@ EventScript_168808:: @ 8168808 closedoor 39, 8 waitdooranim removeobject 8 - clearflag FLAG_0x095 + clearflag FLAG_HIDE_RESORT_GORGEOUS_INSIDE_SELPHY setvar VAR_MAP_SCENE_FIVE_ISLAND_RESORT_GORGEOUS, 2 releaseall end diff --git a/data/maps/FiveIsland_ResortGorgeous_House/map.json b/data/maps/FiveIsland_ResortGorgeous_House/map.json index f19d24ea5..cb950d16f 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/map.json +++ b/data/maps/FiveIsland_ResortGorgeous_House/map.json @@ -24,7 +24,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FiveIsland_ResortGorgeous_House_EventScript_171EBE", - "flag": "FLAG_0x095" + "flag": "FLAG_HIDE_RESORT_GORGEOUS_INSIDE_SELPHY" }, { "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", @@ -37,7 +37,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FiveIsland_ResortGorgeous_House_EventScript_172062", - "flag": "FLAG_0x096" + "flag": "FLAG_HIDE_SELPHYS_BUTLER" } ], "warp_events": [ diff --git a/data/maps/FiveIsland_RocketWarehouse/map.json b/data/maps/FiveIsland_RocketWarehouse/map.json index e5b0bc9e9..d93933db6 100644 --- a/data/maps/FiveIsland_RocketWarehouse/map.json +++ b/data/maps/FiveIsland_RocketWarehouse/map.json @@ -24,7 +24,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, "script": "FiveIsland_RocketWarehouse_EventScript_163FE6", - "flag": "FLAG_0x088" + "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_ROCKET_M", @@ -37,7 +37,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, "script": "FiveIsland_RocketWarehouse_EventScript_163FFD", - "flag": "FLAG_0x088" + "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_ROCKET_F", @@ -50,7 +50,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, "script": "FiveIsland_RocketWarehouse_EventScript_164087", - "flag": "FLAG_0x088" + "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_ROCKET_M", @@ -63,7 +63,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, "script": "FiveIsland_RocketWarehouse_EventScript_164014", - "flag": "FLAG_0x088" + "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_ROCKET_F", @@ -76,7 +76,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, "script": "FiveIsland_RocketWarehouse_EventScript_164070", - "flag": "FLAG_0x088" + "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_SCIENTIST", diff --git a/data/maps/FiveIsland_RocketWarehouse/scripts.inc b/data/maps/FiveIsland_RocketWarehouse/scripts.inc index b090f94b7..bf6151c06 100644 --- a/data/maps/FiveIsland_RocketWarehouse/scripts.inc +++ b/data/maps/FiveIsland_RocketWarehouse/scripts.inc @@ -89,7 +89,7 @@ EventScript_16402F:: @ 816402F removeobject 2 removeobject 4 removeobject 3 - setflag FLAG_0x088 + setflag FLAG_HIDE_FIVE_ISLAND_ROCKETS fadescreen 0 setvar VAR_MAP_SCENE_ROCKET_WAREHOUSE, 1 setflag FLAG_0x2D5 diff --git a/data/maps/FourIsland/map.json b/data/maps/FourIsland/map.json index ceb92d8b5..211c2b37c 100644 --- a/data/maps/FourIsland/map.json +++ b/data/maps/FourIsland/map.json @@ -141,7 +141,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "FLAG_0x097" + "flag": "FLAG_HIDE_FOUR_ISLAND_RIVAL" }, { "graphics_id": "MAP_OBJ_GFX_FAT_MAN", diff --git a/data/maps/FourIsland/scripts.inc b/data/maps/FourIsland/scripts.inc index 8da7aef54..604008839 100644 --- a/data/maps/FourIsland/scripts.inc +++ b/data/maps/FourIsland/scripts.inc @@ -11,7 +11,7 @@ FourIsland_MapScript1_167CB9:: @ 8167CB9 end EventScript_167CCD:: @ 8167CCD - clearflag FLAG_0x097 + clearflag FLAG_HIDE_FOUR_ISLAND_RIVAL return EventScript_167CD1:: @ 8167CD1 diff --git a/data/maps/FourIsland_IcefallCave_Back/map.json b/data/maps/FourIsland_IcefallCave_Back/map.json index 446afbf11..12e4daece 100644 --- a/data/maps/FourIsland_IcefallCave_Back/map.json +++ b/data/maps/FourIsland_IcefallCave_Back/map.json @@ -24,7 +24,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "FLAG_0x08D" + "flag": "FLAG_HIDE_ICEFALL_CAVE_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_ROCKET_M", @@ -37,7 +37,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "FLAG_0x08D" + "flag": "FLAG_HIDE_ICEFALL_CAVE_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_LORELEI", @@ -50,7 +50,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FourIsland_IcefallCave_Back_EventScript_163F25", - "flag": "FLAG_0x08B" + "flag": "FLAG_HIDE_ICEFALL_CAVE_LORELEI" }, { "graphics_id": "MAP_OBJ_GFX_ROCKET_M", @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "FLAG_0x08D" + "flag": "FLAG_HIDE_ICEFALL_CAVE_ROCKETS" } ], "warp_events": [ diff --git a/data/maps/FourIsland_IcefallCave_Back/scripts.inc b/data/maps/FourIsland_IcefallCave_Back/scripts.inc index d14521586..d67ab3124 100644 --- a/data/maps/FourIsland_IcefallCave_Back/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_Back/scripts.inc @@ -8,7 +8,7 @@ FourIsland_IcefallCave_Back_MapScript1_163D88:: @ 8163D88 end EventScript_163D94:: @ 8163D94 - setflag FLAG_0x08B + setflag FLAG_HIDE_ICEFALL_CAVE_LORELEI return FourIsland_IcefallCave_Back_EventScript_163D98:: @ 8163D98 @@ -81,8 +81,8 @@ FourIsland_IcefallCave_Back_EventScript_163D98:: @ 8163D98 waitmovement 0 textcolor 1 msgbox gUnknown_817B457 - setflag FLAG_0x08E - clearflag FLAG_0x08C + setflag FLAG_HIDE_RUIN_VALLEY_SCIENTIST + clearflag FLAG_HIDE_LORELEI_IN_HER_HOUSE setvar VAR_MAP_SCENE_ICEFALL_CAVE_BACK, 1 releaseall end diff --git a/data/maps/FourIsland_LoreleisHouse/map.json b/data/maps/FourIsland_LoreleisHouse/map.json index 9873f36c8..b40738201 100644 --- a/data/maps/FourIsland_LoreleisHouse/map.json +++ b/data/maps/FourIsland_LoreleisHouse/map.json @@ -24,7 +24,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FourIsland_LoreleisHouse_EventScript_171C58", - "flag": "FLAG_0x08C" + "flag": "FLAG_HIDE_LORELEI_IN_HER_HOUSE" }, { "graphics_id": "MAP_OBJ_GFX_WIGGLYTUFF", @@ -115,7 +115,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FourIsland_LoreleisHouse_EventScript_171C8D", - "flag": "FLAG_0x0A5" + "flag": "FLAG_HIDE_LORELEI_HOUSE_MEOWTH_DOLL" }, { "graphics_id": "MAP_OBJ_GFX_CHANSEY", @@ -128,7 +128,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FourIsland_LoreleisHouse_EventScript_171C8D", - "flag": "FLAG_0x0A6" + "flag": "FLAG_HIDE_LORELEI_HOUSE_CHANSEY_DOLL" }, { "graphics_id": "MAP_OBJ_GFX_JIGGLYPUFF", @@ -141,7 +141,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FourIsland_LoreleisHouse_EventScript_171C8D", - "flag": "FLAG_0x0A8" + "flag": "FLAG_HIDE_LORELEI_HOUSE_JIGGLYPUFF_DOLL" }, { "graphics_id": "MAP_OBJ_GFX_NIDORAN_F", @@ -154,7 +154,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FourIsland_LoreleisHouse_EventScript_171C8D", - "flag": "FLAG_0x0A7" + "flag": "FLAG_HIDE_LORELEIS_HOUSE_NIDORAN_F_DOLL" }, { "graphics_id": "MAP_OBJ_GFX_NIDORAN_M", @@ -167,7 +167,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FourIsland_LoreleisHouse_EventScript_171C8D", - "flag": "FLAG_0x0A9" + "flag": "FLAG_HIDE_LORELEIS_HOUSE_NIDORAN_M_DOLL" }, { "graphics_id": "MAP_OBJ_GFX_PIDGEOT", @@ -180,7 +180,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FourIsland_LoreleisHouse_EventScript_171C8D", - "flag": "FLAG_0x0AB" + "flag": "FLAG_HIDE_LORELEIS_HOUSE_PIDGEOT_DOLL" }, { "graphics_id": "MAP_OBJ_GFX_FEAROW", @@ -193,7 +193,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FourIsland_LoreleisHouse_EventScript_171C8D", - "flag": "FLAG_0x0AA" + "flag": "FLAG_HIDE_LORELEIS_HOUSE_FEAROW_DOLL" }, { "graphics_id": "MAP_OBJ_GFX_LAPRAS_DOLL", @@ -206,7 +206,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FourIsland_LoreleisHouse_EventScript_171C8D", - "flag": "FLAG_0x0AC" + "flag": "FLAG_HIDE_LORELEIS_HOUSE_LAPRAS_DOLL" } ], "warp_events": [ diff --git a/data/maps/FuchsiaCity/map.json b/data/maps/FuchsiaCity/map.json index 7338abdfb..1fc276aa9 100644 --- a/data/maps/FuchsiaCity/map.json +++ b/data/maps/FuchsiaCity/map.json @@ -235,7 +235,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FuchsiaCity_EventScript_166DC1", - "flag": "FLAG_0x09D" + "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" } ], "warp_events": [ diff --git a/data/maps/FuchsiaCity_Building1/map.json b/data/maps/FuchsiaCity_Building1/map.json index 59c6d9153..b8d5a2e78 100644 --- a/data/maps/FuchsiaCity_Building1/map.json +++ b/data/maps/FuchsiaCity_Building1/map.json @@ -53,7 +53,7 @@ "flag": "FLAG_0x1B9" }, { - "graphics_id": "MAP_OBJ_GFX_RED_NORMAL", + "graphics_id": "0", "x": 4, "y": 1, "elevation": 0, @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FuchsiaCity_Building1_EventScript_1ACEB8", - "flag": "FLAG_0x09F" + "flag": "FLAG_HIDE_FAME_CHECKER_KOGA_JOURNAL" } ], "warp_events": [ diff --git a/data/maps/FuchsiaCity_Gym/scripts.inc b/data/maps/FuchsiaCity_Gym/scripts.inc index 9411a85e5..23d7606c9 100644 --- a/data/maps/FuchsiaCity_Gym/scripts.inc +++ b/data/maps/FuchsiaCity_Gym/scripts.inc @@ -16,7 +16,7 @@ EventScript_16D580:: @ 816D580 setvar VAR_0x8004, 6 setvar VAR_0x8005, 1 special SetFlavorTextFlagFromSpecialVars - clearflag FLAG_0x09F + clearflag FLAG_HIDE_FAME_CHECKER_KOGA_JOURNAL setflag FLAG_0x4B4 setflag FLAG_BADGE05_GET setvar VAR_0x8008, 5 diff --git a/data/maps/IndigoPlateau_Exterior/map.json b/data/maps/IndigoPlateau_Exterior/map.json index 359b6d592..9a4761ba7 100644 --- a/data/maps/IndigoPlateau_Exterior/map.json +++ b/data/maps/IndigoPlateau_Exterior/map.json @@ -30,7 +30,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "FLAG_0x0A3" + "flag": "FLAG_HIDE_CREDITS_RIVAL" }, { "graphics_id": "MAP_OBJ_GFX_PROF_OAK", @@ -43,7 +43,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "FLAG_0x0A4" + "flag": "FLAG_HIDE_CREDITS_OAK" } ], "warp_events": [ diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/map.json b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json index d7a85e461..f86588559 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/map.json +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json @@ -76,10 +76,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "IndigoPlateau_PokemonCenter_1F_EventScript_1ACFAE", - "flag": "FLAG_0x09D" + "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" }, { - "graphics_id": "MAP_OBJ_GFX_RED_NORMAL", + "graphics_id": "0", "x": 22, "y": 9, "elevation": 0, @@ -89,7 +89,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "IndigoPlateau_PokemonCenter_1F_EventScript_1AD06C", - "flag": "FLAG_0x09D" + "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" }, { "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", @@ -102,10 +102,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "IndigoPlateau_PokemonCenter_1F_EventScript_1AD087", - "flag": "FLAG_0x09D" + "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" }, { - "graphics_id": "MAP_OBJ_GFX_RED_NORMAL", + "graphics_id": "0", "x": 23, "y": 9, "elevation": 0, @@ -115,7 +115,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "IndigoPlateau_PokemonCenter_1F_EventScript_1AD06C", - "flag": "FLAG_0x09D" + "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" } ], "warp_events": [ diff --git a/data/maps/LavenderTown_PokemonCenter_1F/map.json b/data/maps/LavenderTown_PokemonCenter_1F/map.json index 53464f223..3c3062b4b 100644 --- a/data/maps/LavenderTown_PokemonCenter_1F/map.json +++ b/data/maps/LavenderTown_PokemonCenter_1F/map.json @@ -76,7 +76,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "LavenderTown_PokemonCenter_1F_EventScript_1AD0A0", - "flag": "FLAG_0x09D" + "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" } ], "warp_events": [ diff --git a/data/maps/MtEmber_Exterior/map.json b/data/maps/MtEmber_Exterior/map.json index 6e16750f2..8acda2333 100644 --- a/data/maps/MtEmber_Exterior/map.json +++ b/data/maps/MtEmber_Exterior/map.json @@ -37,7 +37,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtEmber_Exterior_EventScript_16397F", - "flag": "FLAG_0x089" + "flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_ROCKET_M", @@ -50,7 +50,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtEmber_Exterior_EventScript_1639F0", - "flag": "FLAG_0x089" + "flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_BATTLE_GIRL", diff --git a/data/maps/MtEmber_RubyPath_B5F/map.json b/data/maps/MtEmber_RubyPath_B5F/map.json index 4c0bcf6db..ce5dbc269 100644 --- a/data/maps/MtEmber_RubyPath_B5F/map.json +++ b/data/maps/MtEmber_RubyPath_B5F/map.json @@ -24,7 +24,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtEmber_RubyPath_B5F_EventScript_163C49", - "flag": "FLAG_0x08A" + "flag": "FLAG_HIDE_RUBY" } ], "warp_events": [ diff --git a/data/maps/MtMoon_B2F/map.json b/data/maps/MtMoon_B2F/map.json index 42b61fa39..2e65061ca 100644 --- a/data/maps/MtMoon_B2F/map.json +++ b/data/maps/MtMoon_B2F/map.json @@ -63,7 +63,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, "script": "MtMoon_B2F_EventScript_160829", - "flag": "FLAG_0x0AD" + "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_ROCKET_M", @@ -76,7 +76,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, "script": "MtMoon_B2F_EventScript_1607E4", - "flag": "FLAG_0x0AD" + "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_ROCKET_M", @@ -89,7 +89,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, "script": "MtMoon_B2F_EventScript_160812", - "flag": "FLAG_0x0AD" + "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_ROCKET_M", @@ -102,7 +102,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, "script": "MtMoon_B2F_EventScript_1607FB", - "flag": "FLAG_0x0AD" + "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", diff --git a/data/maps/NavelRock_Base/map.json b/data/maps/NavelRock_Base/map.json index d9d2c5a8e..0441624ed 100644 --- a/data/maps/NavelRock_Base/map.json +++ b/data/maps/NavelRock_Base/map.json @@ -24,7 +24,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "NavelRock_Base_EventScript_165134", - "flag": "FLAG_0x09B" + "flag": "FLAG_HIDE_LUGIA" } ], "warp_events": [ diff --git a/data/maps/NavelRock_Base/scripts.inc b/data/maps/NavelRock_Base/scripts.inc index 78c468022..9d8d892f2 100644 --- a/data/maps/NavelRock_Base/scripts.inc +++ b/data/maps/NavelRock_Base/scripts.inc @@ -11,13 +11,13 @@ NavelRock_Base_MapScript1_1650F2:: @ 81650F2 end EventScript_165105:: @ 8165105 - setflag FLAG_0x09B + setflag FLAG_HIDE_LUGIA return EventScript_165109:: @ 8165109 checkflag FLAG_0x2F5 goto_if_eq EventScript_1A77A9 - clearflag FLAG_0x09B + clearflag FLAG_HIDE_LUGIA return NavelRock_Base_MapScript2_165116:: @ 8165116 diff --git a/data/maps/NavelRock_Summit/map.json b/data/maps/NavelRock_Summit/map.json index 365e088a0..81407edc7 100644 --- a/data/maps/NavelRock_Summit/map.json +++ b/data/maps/NavelRock_Summit/map.json @@ -24,7 +24,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "FLAG_0x09C" + "flag": "FLAG_HIDE_HO_OH" } ], "warp_events": [ diff --git a/data/maps/NavelRock_Summit/scripts.inc b/data/maps/NavelRock_Summit/scripts.inc index d359d4d25..ad89031bb 100644 --- a/data/maps/NavelRock_Summit/scripts.inc +++ b/data/maps/NavelRock_Summit/scripts.inc @@ -12,7 +12,7 @@ NavelRock_Summit_MapScript1_164FAA:: @ 8164FAA EventScript_164FBD:: @ 8164FBD setvar VAR_0x4001, 1 - setflag FLAG_0x09C + setflag FLAG_HIDE_HO_OH return EventScript_164FC6:: @ 8164FC6 @@ -20,7 +20,7 @@ EventScript_164FC6:: @ 8164FC6 checkflag FLAG_0x2F6 goto_if_eq EventScript_1A77A9 setvar VAR_0x4001, 0 - clearflag FLAG_0x09C + clearflag FLAG_HIDE_HO_OH return NavelRock_Summit_MapScript2_164FDD:: @ 8164FDD diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json index 82a4ddf58..cefa0b75b 100644 --- a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json @@ -50,7 +50,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "OneIsland_KindleRoad_EmberSpa_EventScript_165380", - "flag": "FLAG_0x09D" + "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" }, { "graphics_id": "MAP_OBJ_GFX_OLD_WOMAN", diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc index 5b12958c8..12fe70105 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc @@ -301,7 +301,7 @@ EventScript_170FA5:: @ 8170FA5 special sub_810B82C setflag FLAG_0x844 setflag FLAG_HIDE_CERULEAN_CAVE_GUARD - setflag FLAG_0x08C + setflag FLAG_HIDE_LORELEI_IN_HER_HOUSE setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6 special InitRoamer release diff --git a/data/maps/PewterCity/map.json b/data/maps/PewterCity/map.json index 916ef1310..edcd60868 100644 --- a/data/maps/PewterCity/map.json +++ b/data/maps/PewterCity/map.json @@ -113,7 +113,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "PewterCity_EventScript_1662A9", - "flag": "FLAG_0x092" + "flag": "FLAG_HIDE_PEWTER_CITY_RUNNING_SHOES_GUY" } ], "warp_events": [ diff --git a/data/maps/PewterCity_Gym/scripts.inc b/data/maps/PewterCity_Gym/scripts.inc index 537f057f0..76be18cf1 100644 --- a/data/maps/PewterCity_Gym/scripts.inc +++ b/data/maps/PewterCity_Gym/scripts.inc @@ -20,7 +20,7 @@ EventScript_16A5C5:: @ 816A5C5 setflag FLAG_BADGE01_GET setvar VAR_MAP_SCENE_PEWTER_CITY, 1 setflag FLAG_HIDE_PEWTER_CITY_GYM_ESCORT - clearflag FLAG_0x092 + clearflag FLAG_HIDE_PEWTER_CITY_RUNNING_SHOES_GUY setvar VAR_0x8008, 1 call EventScript_1A6B18 goto EventScript_16A5F3 diff --git a/data/maps/PowerPlant/map.json b/data/maps/PowerPlant/map.json index 7c96c700d..6b8ceac8f 100644 --- a/data/maps/PowerPlant/map.json +++ b/data/maps/PowerPlant/map.json @@ -102,7 +102,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "PowerPlant_EventScript_16388D", - "flag": "FLAG_0x086" + "flag": "FLAG_HIDE_POWER_PLANT_VOLTORB_2" }, { "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", @@ -115,7 +115,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "PowerPlant_EventScript_16382F", - "flag": "FLAG_0x085" + "flag": "FLAG_HIDE_POWER_PLANT_VOLTORB_1" } ], "warp_events": [ diff --git a/data/maps/PowerPlant/scripts.inc b/data/maps/PowerPlant/scripts.inc index 16c78d971..c749b4227 100644 --- a/data/maps/PowerPlant/scripts.inc +++ b/data/maps/PowerPlant/scripts.inc @@ -30,11 +30,11 @@ EventScript_1637AC:: @ 81637AC return EventScript_1637B0:: @ 81637B0 - clearflag FLAG_0x085 + clearflag FLAG_HIDE_POWER_PLANT_VOLTORB_1 return EventScript_1637B4:: @ 81637B4 - clearflag FLAG_0x086 + clearflag FLAG_HIDE_POWER_PLANT_VOLTORB_2 return PowerPlant_EventScript_1637B8:: @ 81637B8 diff --git a/data/maps/RocketHideout_B1F/map.json b/data/maps/RocketHideout_B1F/map.json index fed09fca0..b15197871 100644 --- a/data/maps/RocketHideout_B1F/map.json +++ b/data/maps/RocketHideout_B1F/map.json @@ -24,7 +24,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, "script": "RocketHideout_B1F_EventScript_1611C5", - "flag": "FLAG_0x0AD" + "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_ROCKET_M", @@ -37,7 +37,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, "script": "RocketHideout_B1F_EventScript_1611AE", - "flag": "FLAG_0x0AD" + "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_ROCKET_M", @@ -50,7 +50,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, "script": "RocketHideout_B1F_EventScript_1611F3", - "flag": "FLAG_0x0AD" + "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_ROCKET_M", @@ -63,7 +63,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, "script": "RocketHideout_B1F_EventScript_1611DC", - "flag": "FLAG_0x0AD" + "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_ROCKET_M", @@ -76,7 +76,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, "script": "RocketHideout_B1F_EventScript_16120A", - "flag": "FLAG_0x0AD" + "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", diff --git a/data/maps/RocketHideout_B2F/map.json b/data/maps/RocketHideout_B2F/map.json index abb2a4869..a39f4dba8 100644 --- a/data/maps/RocketHideout_B2F/map.json +++ b/data/maps/RocketHideout_B2F/map.json @@ -24,7 +24,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, "script": "RocketHideout_B2F_EventScript_1612A2", - "flag": "FLAG_0x0AD" + "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", diff --git a/data/maps/RocketHideout_B3F/map.json b/data/maps/RocketHideout_B3F/map.json index fee71066d..6b8e2f8ef 100644 --- a/data/maps/RocketHideout_B3F/map.json +++ b/data/maps/RocketHideout_B3F/map.json @@ -24,7 +24,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, "script": "RocketHideout_B3F_EventScript_1612D1", - "flag": "FLAG_0x0AD" + "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_ROCKET_M", @@ -37,7 +37,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, "script": "RocketHideout_B3F_EventScript_1612BA", - "flag": "FLAG_0x0AD" + "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", diff --git a/data/maps/RocketHideout_B4F/map.json b/data/maps/RocketHideout_B4F/map.json index 8c4ad9b68..e8e428591 100644 --- a/data/maps/RocketHideout_B4F/map.json +++ b/data/maps/RocketHideout_B4F/map.json @@ -50,7 +50,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, "script": "RocketHideout_B4F_EventScript_161381", - "flag": "FLAG_0x0AD" + "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", @@ -76,7 +76,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 0, "script": "RocketHideout_B4F_EventScript_161418", - "flag": "FLAG_0x0AD" + "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_ROCKET_M", @@ -89,7 +89,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 0, "script": "RocketHideout_B4F_EventScript_1613CE", - "flag": "FLAG_0x0AD" + "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", diff --git a/data/maps/Route16/map.json b/data/maps/Route16/map.json index 8ba369942..6ad1a1eeb 100644 --- a/data/maps/Route16/map.json +++ b/data/maps/Route16/map.json @@ -152,7 +152,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route16_EventScript_168121", - "flag": "FLAG_0x080" + "flag": "FLAG_HIDE_ROUTE_16_SNORLAX" } ], "warp_events": [ diff --git a/data/maps/Route16/scripts.inc b/data/maps/Route16/scripts.inc index e5fd83934..ae5ecbeb7 100644 --- a/data/maps/Route16/scripts.inc +++ b/data/maps/Route16/scripts.inc @@ -48,7 +48,7 @@ Route16_EventScript_168121:: @ 8168121 playmoncry SPECIES_SNORLAX, 2 delay 40 waitmoncry - setflag FLAG_0x080 + setflag FLAG_HIDE_ROUTE_16_SNORLAX setflag FLAG_0x807 dowildbattle clearflag FLAG_0x807 diff --git a/data/maps/SSAnne_Exterior/map.json b/data/maps/SSAnne_Exterior/map.json index 56d68287b..207d4fc7c 100644 --- a/data/maps/SSAnne_Exterior/map.json +++ b/data/maps/SSAnne_Exterior/map.json @@ -24,7 +24,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "FLAG_0x087" + "flag": "FLAG_HIDE_SS_ANNE" } ], "warp_events": [ diff --git a/data/maps/SaffronCity/map.json b/data/maps/SaffronCity/map.json index a6b49f6b4..b70aa83c1 100644 --- a/data/maps/SaffronCity/map.json +++ b/data/maps/SaffronCity/map.json @@ -228,7 +228,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SaffronCity_EventScript_1AD03A", - "flag": "FLAG_0x09D" + "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" } ], "warp_events": [ diff --git a/data/maps/SaffronCity_Gym/scripts.inc b/data/maps/SaffronCity_Gym/scripts.inc index 7973c7748..1c0957a87 100644 --- a/data/maps/SaffronCity_Gym/scripts.inc +++ b/data/maps/SaffronCity_Gym/scripts.inc @@ -19,7 +19,7 @@ EventScript_16EE0A:: @ 816EE0A setvar VAR_0x8004, 7 setvar VAR_0x8005, 3 special SetFlavorTextFlagFromSpecialVars - clearflag FLAG_0x0AE + clearflag FLAG_HIDE_SAFFRON_CITY_POKECENTER_SABRINA_JOURNALS setflag FLAG_0x4B5 setflag FLAG_BADGE06_GET setvar VAR_0x8008, 6 diff --git a/data/maps/SaffronCity_PokemonCenter_1F/map.json b/data/maps/SaffronCity_PokemonCenter_1F/map.json index 0aacd178a..9fbefc7f3 100644 --- a/data/maps/SaffronCity_PokemonCenter_1F/map.json +++ b/data/maps/SaffronCity_PokemonCenter_1F/map.json @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_RED_NORMAL", + "graphics_id": "0", "x": 2, "y": 1, "elevation": 0, @@ -76,10 +76,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SaffronCity_PokemonCenter_1F_EventScript_1ACEEC", - "flag": "FLAG_0x0AE" + "flag": "FLAG_HIDE_SAFFRON_CITY_POKECENTER_SABRINA_JOURNALS" }, { - "graphics_id": "MAP_OBJ_GFX_RED_NORMAL", + "graphics_id": "0", "x": 3, "y": 1, "elevation": 0, @@ -89,7 +89,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SaffronCity_PokemonCenter_1F_EventScript_1ACEEC", - "flag": "FLAG_0x0AE" + "flag": "FLAG_HIDE_SAFFRON_CITY_POKECENTER_SABRINA_JOURNALS" } ], "warp_events": [ diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json index a87ec7f39..dbeccc674 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json @@ -118,7 +118,7 @@ "flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_BLACKBELT" }, { - "graphics_id": "MAP_OBJ_GFX_RED_NORMAL", + "graphics_id": "0", "x": 2, "y": 1, "elevation": 0, @@ -128,10 +128,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SaffronCity_PokemonTrainerFanClub_EventScript_1ACF7A", - "flag": "FLAG_0x09D" + "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" }, { - "graphics_id": "MAP_OBJ_GFX_RED_NORMAL", + "graphics_id": "0", "x": 3, "y": 1, "elevation": 0, @@ -141,7 +141,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SaffronCity_PokemonTrainerFanClub_EventScript_1ACF7A", - "flag": "FLAG_0x09D" + "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" } ], "warp_events": [ diff --git a/data/maps/SeafoamIslands_B4F/map.json b/data/maps/SeafoamIslands_B4F/map.json index fbe5eced0..a1220fc45 100644 --- a/data/maps/SeafoamIslands_B4F/map.json +++ b/data/maps/SeafoamIslands_B4F/map.json @@ -50,7 +50,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SeafoamIslands_B4F_EventScript_1631AC", - "flag": "FLAG_0x082" + "flag": "FLAG_HIDE_ARTICUNO" }, { "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", diff --git a/data/maps/SeafoamIslands_B4F/scripts.inc b/data/maps/SeafoamIslands_B4F/scripts.inc index 9a41408c3..2d597e6a0 100644 --- a/data/maps/SeafoamIslands_B4F/scripts.inc +++ b/data/maps/SeafoamIslands_B4F/scripts.inc @@ -46,7 +46,7 @@ EventScript_1630A9:: @ 81630A9 return EventScript_1630AD:: @ 81630AD - clearflag FLAG_0x082 + clearflag FLAG_HIDE_ARTICUNO return SeafoamIslands_B4F_MapScript3_1630B1:: @ 81630B1 diff --git a/data/maps/SevenIsland_PokemonCenter_1F/map.json b/data/maps/SevenIsland_PokemonCenter_1F/map.json index 20457a028..702c10d3b 100644 --- a/data/maps/SevenIsland_PokemonCenter_1F/map.json +++ b/data/maps/SevenIsland_PokemonCenter_1F/map.json @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_RED_NORMAL", + "graphics_id": "0", "x": 3, "y": 1, "elevation": 0, @@ -76,10 +76,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_PokemonCenter_1F_EventScript_1ACFD4", - "flag": "FLAG_0x09D" + "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" }, { - "graphics_id": "MAP_OBJ_GFX_RED_NORMAL", + "graphics_id": "0", "x": 2, "y": 1, "elevation": 0, @@ -89,7 +89,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_PokemonCenter_1F_EventScript_1ACFD4", - "flag": "FLAG_0x09D" + "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" } ], "warp_events": [ diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json index e05e304e9..0e1701718 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json @@ -24,7 +24,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SixIsland_DottedHole_SapphireRoom_EventScript_1641B5", - "flag": "FLAG_0x08F" + "flag": "FLAG_HIDE_SAPPHIRE" }, { "graphics_id": "MAP_OBJ_GFX_SCIENTIST", @@ -37,7 +37,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "FLAG_0x090" + "flag": "s" } ], "warp_events": [ diff --git a/data/maps/SixIsland_OutcastIsland/map.json b/data/maps/SixIsland_OutcastIsland/map.json index 17f40e789..e788715a7 100644 --- a/data/maps/SixIsland_OutcastIsland/map.json +++ b/data/maps/SixIsland_OutcastIsland/map.json @@ -30,7 +30,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, "script": "SixIsland_OutcastIsland_EventScript_168B16", - "flag": "FLAG_0x088" + "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_FISHER", diff --git a/data/maps/SixIsland_PokemonCenter_1F/map.json b/data/maps/SixIsland_PokemonCenter_1F/map.json index 67a35c1ee..eae20e595 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/map.json +++ b/data/maps/SixIsland_PokemonCenter_1F/map.json @@ -37,7 +37,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "FLAG_0x098" + "flag": "FLAG_HIDE_SIX_ISLAND_POKECENTER_RIVAL" }, { "graphics_id": "MAP_OBJ_GFX_HIKER", diff --git a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc index 769a5d86f..dd1293f79 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc @@ -11,7 +11,7 @@ SixIsland_PokemonCenter_1F_MapScript1_171D7A:: @ 8171D7A end EventScript_171D89:: @ 8171D89 - clearflag FLAG_0x098 + clearflag FLAG_HIDE_SIX_ISLAND_POKECENTER_RIVAL return SixIsland_PokemonCenter_1F_MapScript3_171D8D:: @ 8171D8D diff --git a/data/maps/SixIsland_RuinValley/map.json b/data/maps/SixIsland_RuinValley/map.json index 6ab143f1d..c6fa6519b 100644 --- a/data/maps/SixIsland_RuinValley/map.json +++ b/data/maps/SixIsland_RuinValley/map.json @@ -30,7 +30,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SixIsland_RuinValley_EventScript_168B6D", - "flag": "FLAG_0x08E" + "flag": "FLAG_HIDE_RUIN_VALLEY_SCIENTIST" }, { "graphics_id": "MAP_OBJ_GFX_HIKER", diff --git a/data/maps/ThreeIsland/map.json b/data/maps/ThreeIsland/map.json index fe7fe4243..e8fcd8e83 100644 --- a/data/maps/ThreeIsland/map.json +++ b/data/maps/ThreeIsland/map.json @@ -61,7 +61,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "ThreeIsland_EventScript_1677D8", - "flag": "FLAG_0x091" + "flag": "FLAG_HIDE_THREE_ISLAND_LONE_BIKER" }, { "graphics_id": "MAP_OBJ_GFX_BIKER", diff --git a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc index 629857b3e..e4ed31f53 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc +++ b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc @@ -87,7 +87,7 @@ EventScript_17145F:: @ 817145F fadedefaultbgm delay 60 msgbox gUnknown_81A270C - clearflag FLAG_0x091 + clearflag FLAG_HIDE_THREE_ISLAND_LONE_BIKER setvar VAR_MAP_SCENE_THREE_ISLAND, 2 setvar VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 1 releaseall diff --git a/data/maps/VermilionCity/map.json b/data/maps/VermilionCity/map.json index 6299cc2e3..8385eccec 100644 --- a/data/maps/VermilionCity/map.json +++ b/data/maps/VermilionCity/map.json @@ -126,7 +126,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "VermilionCity_EventScript_166C20", - "flag": "FLAG_0x0A1" + "flag": "FLAG_HIDE_VERMILION_CITY_OAKS_AIDE" } ], "warp_events": [ diff --git a/data/maps/VermilionCity/scripts.inc b/data/maps/VermilionCity/scripts.inc index c809fd7bd..0c8c8317b 100644 --- a/data/maps/VermilionCity/scripts.inc +++ b/data/maps/VermilionCity/scripts.inc @@ -27,7 +27,7 @@ VermilionCity_MapScript1_166906:: @ 8166906 end EventScript_166913:: @ 8166913 - setflag FLAG_0x0A1 + setflag FLAG_HIDE_VERMILION_CITY_OAKS_AIDE return VermilionCity_EventScript_166917:: @ 8166917 diff --git a/data/maps/VermilionCity_Gym/scripts.inc b/data/maps/VermilionCity_Gym/scripts.inc index 57bdfd280..222bfb9e1 100644 --- a/data/maps/VermilionCity_Gym/scripts.inc +++ b/data/maps/VermilionCity_Gym/scripts.inc @@ -224,7 +224,7 @@ EventScript_16B97C:: @ 816B97C special SetFlavorTextFlagFromSpecialVars checkflag FLAG_0x23B call_if 0, EventScript_16B9AB - clearflag FLAG_0x0A0 + clearflag FLAG_HIDE_FAME_CHECKER_LT_SURGE_JOURNAL setflag FLAG_0x4B2 setflag FLAG_BADGE03_GET setvar VAR_0x8008, 3 @@ -233,7 +233,7 @@ EventScript_16B97C:: @ 816B97C end EventScript_16B9AB:: @ 816B9AB - clearflag FLAG_0x0A1 + clearflag FLAG_HIDE_VERMILION_CITY_OAKS_AIDE return EventScript_16B9AF:: @ 816B9AF diff --git a/data/maps/VermilionCity_PokemonCenter_1F/map.json b/data/maps/VermilionCity_PokemonCenter_1F/map.json index 5fc06c707..aaf4bc861 100644 --- a/data/maps/VermilionCity_PokemonCenter_1F/map.json +++ b/data/maps/VermilionCity_PokemonCenter_1F/map.json @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_RED_NORMAL", + "graphics_id": "0", "x": 2, "y": 1, "elevation": 0, @@ -89,10 +89,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "VermilionCity_PokemonCenter_1F_EventScript_1ACE83", - "flag": "FLAG_0x0A0" + "flag": "FLAG_HIDE_FAME_CHECKER_LT_SURGE_JOURNAL" }, { - "graphics_id": "MAP_OBJ_GFX_RED_NORMAL", + "graphics_id": "0", "x": 3, "y": 1, "elevation": 0, @@ -102,7 +102,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "VermilionCity_PokemonCenter_1F_EventScript_1ACE83", - "flag": "FLAG_0x0A0" + "flag": "FLAG_HIDE_FAME_CHECKER_LT_SURGE_JOURNAL" } ], "warp_events": [ diff --git a/data/maps/ViridianCity_Gym/scripts.inc b/data/maps/ViridianCity_Gym/scripts.inc index b075c7e51..7af2d441f 100644 --- a/data/maps/ViridianCity_Gym/scripts.inc +++ b/data/maps/ViridianCity_Gym/scripts.inc @@ -20,7 +20,7 @@ EventScript_169F04:: @ 8169F04 setvar VAR_0x8004, 15 setvar VAR_0x8005, 3 special SetFlavorTextFlagFromSpecialVars - setflag FLAG_0x0AD + setflag FLAG_HIDE_MISC_KANTO_ROCKETS setflag FLAG_0x4B7 setflag FLAG_BADGE08_GET setvar VAR_MAP_SCENE_ROUTE22, 3 diff --git a/include/constants/flags.h b/include/constants/flags.h index 4578c4ac3..b39970090 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -45,141 +45,143 @@ #define FLAG_0x027 0x027 // Hide/show flags -#define FLAG_HIDE_BULBASAUR_BALL 0x028 -#define FLAG_HIDE_SQUIRTLE_BALL 0x029 -#define FLAG_HIDE_CHARMANDER_BALL 0x02A -#define FLAG_HIDE_OAK_IN_HIS_LAB 0x02B -#define FLAG_HIDE_OAK_IN_PALLET_TOWN 0x02C -#define FLAG_HIDE_RIVAL_IN_LAB 0x02D -#define FLAG_HIDE_PEWTER_CITY_GYM_ESCORT 0x02E -#define FLAG_HIDE_DOME_FOSSIL 0x02F -#define FLAG_HIDE_HELIX_FOSSIL 0x030 -#define FLAG_HIDE_NUGGET_BRIDGE_ROCKET 0x031 -#define FLAG_HIDE_BILL_CLEFAIRY 0x032 -#define FLAG_HIDE_BILL_HUMAN_SEA_COTTAGE 0x033 -#define FLAG_HIDE_TOWER_FUJI 0x034 -#define FLAG_HIDE_POKEHOUSE_FUJI 0x035 -#define FLAG_HIDE_LIFT_KEY 0x036 -#define FLAG_HIDE_SILPH_SCOPE 0x037 -#define FLAG_HIDE_HIDEOUT_GIOVANNI 0x038 -#define FLAG_HIDE_TOWN_MAP 0x039 -#define FLAG_HIDE_POKEDEX 0x03A -#define FLAG_HIDE_CERULEAN_ROCKET 0x03B -#define FLAG_HIDE_CERULEAN_RIVAL 0x03C -#define FLAG_HIDE_SS_ANNE_RIVAL 0x03D -#define FLAG_HIDE_SAFFRON_ROCKETS 0x03E -#define FLAG_HIDE_SAFFRON_CIVILIANS 0x03F -#define FLAG_HIDE_SEAFOAM_1F_BOULDER_1 0x040 -#define FLAG_HIDE_SEAFOAM_1F_BOULDER_2 0x041 -#define FLAG_HIDE_SEAFOAM_B1F_BOULDER_1 0x042 -#define FLAG_HIDE_SEAFOAM_B1F_BOULDER_2 0x043 -#define FLAG_HIDE_SEAFOAM_B2F_BOULDER_1 0x044 -#define FLAG_HIDE_SEAFOAM_B2F_BOULDER_2 0x045 -#define FLAG_HIDE_SEAFOAM_B3F_BOULDER_1 0x046 -#define FLAG_HIDE_SEAFOAM_B3F_BOULDER_2 0x047 -#define FLAG_HIDE_SEAFOAM_B3F_BOULDER_3 0x048 -#define FLAG_HIDE_SEAFOAM_B3F_BOULDER_4 0x049 -#define FLAG_HIDE_SEAFOAM_B3F_BOULDER_5 0x04A -#define FLAG_HIDE_SEAFOAM_B3F_BOULDER_6 0x04B -#define FLAG_HIDE_SEAFOAM_B4F_BOULDER_1 0x04C -#define FLAG_HIDE_SEAFOAM_B4F_BOULDER_2 0x04D -#define FLAG_HIDE_SILPH_RIVAL 0x04E -#define FLAG_HIDE_ROUTE_22_RIVAL 0x04F -#define FLAG_HIDE_PEWTER_MUSEUM_ESCORT 0x050 -#define FLAG_HIDE_TOWER_RIVAL 0x051 -#define FLAG_HIDE_MOLTRES 0x052 -#define FLAG_HIDE_SILPH_ROCKETS 0x053 -#define FLAG_HIDE_ROUTE_12_SNORLAX 0x054 -#define FLAG_HIDE_VIRIDIAN_GIOVANNI 0x055 -#define FLAG_HIDE_OLD_AMBER 0x056 -#define FLAG_HIDE_EEVEE_BALL 0x057 -#define FLAG_HIDE_VICTORY_ROAD_2F_BOULDER 0x058 -#define FLAG_HIDE_VICTORY_ROAD_3F_BOULDER 0x059 -#define FLAG_HIDE_OAK_IN_CHAMP_ROOM 0x05A -#define FLAG_HIDE_GAME_CORNER_ROCKET 0x05B -#define FLAG_HIDE_CERULEAN_CAVE_GUARD 0x05C -#define FLAG_HIDE_ZAPDOS 0x05D -#define FLAG_HIDE_TOWER_ROCKET_1 0x05E -#define FLAG_HIDE_CELADON_ROCKETS 0x05F -#define FLAG_HIDE_DOJO_HITMONLEE_BALL 0x060 -#define FLAG_HIDE_DOJO_HITMONCHAN_BALL 0x061 -#define FLAG_HIDE_CINNABAR_BILL 0x062 -#define FLAG_HIDE_UNION_ROOM_1 0x063 -#define FLAG_HIDE_UNION_ROOM_2 0x064 -#define FLAG_HIDE_UNION_ROOM_3 0x065 -#define FLAG_HIDE_UNION_ROOM_4 0x066 -#define FLAG_HIDE_UNION_ROOM_5 0x067 -#define FLAG_HIDE_UNION_ROOM_6 0x068 -#define FLAG_HIDE_UNION_ROOM_7 0x069 -#define FLAG_HIDE_UNION_ROOM_8 0x06A -#define FLAG_HIDE_CINNABAR_SEAGALLOP 0x06B -#define FLAG_HIDE_SAFFRON_FAN_CLUB_BLACKBELT 0x06C -#define FLAG_HIDE_SAFFRON_FAN_CLUB_ROCKER 0x06D -#define FLAG_HIDE_SAFFRON_FAN_CLUB_WOMAN 0x06E -#define FLAG_HIDE_SAFFRON_FAN_CLUB_BEAUTY 0x06F -#define FLAG_HIDE_MG_DELIVERYMEN 0x070 -#define FLAG_HIDE_ONE_ISLAND_BILL 0x071 -#define FLAG_HIDE_ONE_ISLAND_POKECENTER_BILL 0x072 -#define FLAG_HIDE_ONE_ISLAND_POKECENTER_CELIO 0x073 -#define FLAG_HIDE_TWO_ISLAND_GAME_CORNER_BIKER 0x074 -#define FLAG_HIDE_TWO_ISLAND_GAME_CORNER_LOSTELLE 0x075 -#define FLAG_HIDE_LOSTELLE_IN_HER_HOME 0x076 -#define FLAG_0x077 0x077 -#define FLAG_0x078 0x078 -#define FLAG_HIDE_THREE_ISLAND_BIKERS 0x079 -#define FLAG_HIDE_LOSTELLE_IN_BERRY_FOREST 0x07A -#define FLAG_HIDE_TWO_ISLAND_WOMAN 0x07B -#define FLAG_HIDE_TWO_ISLAND_BEAUTY 0x07C -#define FLAG_HIDE_TWO_ISLAND_SUPER_NERD 0x07D -#define FLAG_HIDE_THREE_ISLAND_ANTIBIKERS 0x07E -#define FLAG_0x07F 0x07F -#define FLAG_0x080 0x080 -#define FLAG_0x081 0x081 -#define FLAG_0x082 0x082 -#define FLAG_HIDE_TOWER_ROCKET_2 0x083 -#define FLAG_HIDE_TOWER_ROCKET_3 0x084 -#define FLAG_0x085 0x085 -#define FLAG_0x086 0x086 -#define FLAG_0x087 0x087 -#define FLAG_0x088 0x088 -#define FLAG_0x089 0x089 -#define FLAG_0x08A 0x08A -#define FLAG_0x08B 0x08B -#define FLAG_0x08C 0x08C -#define FLAG_0x08D 0x08D -#define FLAG_0x08E 0x08E -#define FLAG_0x08F 0x08F -#define FLAG_0x090 0x090 -#define FLAG_0x091 0x091 -#define FLAG_0x092 0x092 -#define FLAG_0x093 0x093 -#define FLAG_0x094 0x094 -#define FLAG_0x095 0x095 -#define FLAG_0x096 0x096 -#define FLAG_0x097 0x097 -#define FLAG_0x098 0x098 -#define FLAG_0x099 0x099 -#define FLAG_0x09A 0x09A -#define FLAG_0x09B 0x09B -#define FLAG_0x09C 0x09C -#define FLAG_0x09D 0x09D -#define FLAG_0x09E 0x09E -#define FLAG_0x09F 0x09F -#define FLAG_0x0A0 0x0A0 -#define FLAG_0x0A1 0x0A1 -#define FLAG_0x0A2 0x0A2 -#define FLAG_0x0A3 0x0A3 -#define FLAG_0x0A4 0x0A4 -#define FLAG_0x0A5 0x0A5 -#define FLAG_0x0A6 0x0A6 -#define FLAG_0x0A7 0x0A7 -#define FLAG_0x0A8 0x0A8 -#define FLAG_0x0A9 0x0A9 -#define FLAG_0x0AA 0x0AA -#define FLAG_0x0AB 0x0AB -#define FLAG_0x0AC 0x0AC -#define FLAG_0x0AD 0x0AD -#define FLAG_0x0AE 0x0AE +#define FLAG_HIDE_BULBASAUR_BALL 0x028 +#define FLAG_HIDE_SQUIRTLE_BALL 0x029 +#define FLAG_HIDE_CHARMANDER_BALL 0x02A +#define FLAG_HIDE_OAK_IN_HIS_LAB 0x02B +#define FLAG_HIDE_OAK_IN_PALLET_TOWN 0x02C +#define FLAG_HIDE_RIVAL_IN_LAB 0x02D +#define FLAG_HIDE_PEWTER_CITY_GYM_ESCORT 0x02E +#define FLAG_HIDE_DOME_FOSSIL 0x02F +#define FLAG_HIDE_HELIX_FOSSIL 0x030 +#define FLAG_HIDE_NUGGET_BRIDGE_ROCKET 0x031 +#define FLAG_HIDE_BILL_CLEFAIRY 0x032 +#define FLAG_HIDE_BILL_HUMAN_SEA_COTTAGE 0x033 +#define FLAG_HIDE_TOWER_FUJI 0x034 +#define FLAG_HIDE_POKEHOUSE_FUJI 0x035 +#define FLAG_HIDE_LIFT_KEY 0x036 +#define FLAG_HIDE_SILPH_SCOPE 0x037 +#define FLAG_HIDE_HIDEOUT_GIOVANNI 0x038 +#define FLAG_HIDE_TOWN_MAP 0x039 +#define FLAG_HIDE_POKEDEX 0x03A +#define FLAG_HIDE_CERULEAN_ROCKET 0x03B +#define FLAG_HIDE_CERULEAN_RIVAL 0x03C +#define FLAG_HIDE_SS_ANNE_RIVAL 0x03D +#define FLAG_HIDE_SAFFRON_ROCKETS 0x03E +#define FLAG_HIDE_SAFFRON_CIVILIANS 0x03F +#define FLAG_HIDE_SEAFOAM_1F_BOULDER_1 0x040 +#define FLAG_HIDE_SEAFOAM_1F_BOULDER_2 0x041 +#define FLAG_HIDE_SEAFOAM_B1F_BOULDER_1 0x042 +#define FLAG_HIDE_SEAFOAM_B1F_BOULDER_2 0x043 +#define FLAG_HIDE_SEAFOAM_B2F_BOULDER_1 0x044 +#define FLAG_HIDE_SEAFOAM_B2F_BOULDER_2 0x045 +#define FLAG_HIDE_SEAFOAM_B3F_BOULDER_1 0x046 +#define FLAG_HIDE_SEAFOAM_B3F_BOULDER_2 0x047 +#define FLAG_HIDE_SEAFOAM_B3F_BOULDER_3 0x048 +#define FLAG_HIDE_SEAFOAM_B3F_BOULDER_4 0x049 +#define FLAG_HIDE_SEAFOAM_B3F_BOULDER_5 0x04A +#define FLAG_HIDE_SEAFOAM_B3F_BOULDER_6 0x04B +#define FLAG_HIDE_SEAFOAM_B4F_BOULDER_1 0x04C +#define FLAG_HIDE_SEAFOAM_B4F_BOULDER_2 0x04D +#define FLAG_HIDE_SILPH_RIVAL 0x04E +#define FLAG_HIDE_ROUTE_22_RIVAL 0x04F +#define FLAG_HIDE_PEWTER_MUSEUM_ESCORT 0x050 +#define FLAG_HIDE_TOWER_RIVAL 0x051 +#define FLAG_HIDE_MOLTRES 0x052 +#define FLAG_HIDE_SILPH_ROCKETS 0x053 +#define FLAG_HIDE_ROUTE_12_SNORLAX 0x054 +#define FLAG_HIDE_VIRIDIAN_GIOVANNI 0x055 +#define FLAG_HIDE_OLD_AMBER 0x056 +#define FLAG_HIDE_EEVEE_BALL 0x057 +#define FLAG_HIDE_VICTORY_ROAD_2F_BOULDER 0x058 +#define FLAG_HIDE_VICTORY_ROAD_3F_BOULDER 0x059 +#define FLAG_HIDE_OAK_IN_CHAMP_ROOM 0x05A +#define FLAG_HIDE_GAME_CORNER_ROCKET 0x05B +#define FLAG_HIDE_CERULEAN_CAVE_GUARD 0x05C +#define FLAG_HIDE_ZAPDOS 0x05D +#define FLAG_HIDE_TOWER_ROCKET_1 0x05E +#define FLAG_HIDE_CELADON_ROCKETS 0x05F +#define FLAG_HIDE_DOJO_HITMONLEE_BALL 0x060 +#define FLAG_HIDE_DOJO_HITMONCHAN_BALL 0x061 +#define FLAG_HIDE_CINNABAR_BILL 0x062 +#define FLAG_HIDE_UNION_ROOM_1 0x063 +#define FLAG_HIDE_UNION_ROOM_2 0x064 +#define FLAG_HIDE_UNION_ROOM_3 0x065 +#define FLAG_HIDE_UNION_ROOM_4 0x066 +#define FLAG_HIDE_UNION_ROOM_5 0x067 +#define FLAG_HIDE_UNION_ROOM_6 0x068 +#define FLAG_HIDE_UNION_ROOM_7 0x069 +#define FLAG_HIDE_UNION_ROOM_8 0x06A +#define FLAG_HIDE_CINNABAR_SEAGALLOP 0x06B +#define FLAG_HIDE_SAFFRON_FAN_CLUB_BLACKBELT 0x06C +#define FLAG_HIDE_SAFFRON_FAN_CLUB_ROCKER 0x06D +#define FLAG_HIDE_SAFFRON_FAN_CLUB_WOMAN 0x06E +#define FLAG_HIDE_SAFFRON_FAN_CLUB_BEAUTY 0x06F +#define FLAG_HIDE_MG_DELIVERYMEN 0x070 +#define FLAG_HIDE_ONE_ISLAND_BILL 0x071 +#define FLAG_HIDE_ONE_ISLAND_POKECENTER_BILL 0x072 +#define FLAG_HIDE_ONE_ISLAND_POKECENTER_CELIO 0x073 +#define FLAG_HIDE_TWO_ISLAND_GAME_CORNER_BIKER 0x074 +#define FLAG_HIDE_TWO_ISLAND_GAME_CORNER_LOSTELLE 0x075 +#define FLAG_HIDE_LOSTELLE_IN_HER_HOME 0x076 +#define FLAG_0x077 0x077 +#define FLAG_0x078 0x078 +#define FLAG_HIDE_THREE_ISLAND_BIKERS 0x079 +#define FLAG_HIDE_LOSTELLE_IN_BERRY_FOREST 0x07A +#define FLAG_HIDE_TWO_ISLAND_WOMAN 0x07B +#define FLAG_HIDE_TWO_ISLAND_BEAUTY 0x07C +#define FLAG_HIDE_TWO_ISLAND_SUPER_NERD 0x07D +#define FLAG_HIDE_THREE_ISLAND_ANTIBIKERS 0x07E +#define FLAG_0x07F 0x07F +#define FLAG_HIDE_ROUTE_16_SNORLAX 0x080 +#define FLAG_HIDE_MEWTWO 0x081 +#define FLAG_HIDE_ARTICUNO 0x082 +#define FLAG_HIDE_TOWER_ROCKET_2 0x083 +#define FLAG_HIDE_TOWER_ROCKET_3 0x084 +#define FLAG_HIDE_POWER_PLANT_VOLTORB_1 0x085 +#define FLAG_HIDE_POWER_PLANT_VOLTORB_2 0x086 +#define FLAG_HIDE_SS_ANNE 0x087 +#define FLAG_HIDE_FIVE_ISLAND_ROCKETS 0x088 +#define FLAG_HIDE_MT_EMBER_EXTERIOR_ROCKETS 0x089 +#define FLAG_HIDE_RUBY 0x08A +#define FLAG_HIDE_ICEFALL_CAVE_LORELEI 0x08B +#define FLAG_HIDE_LORELEI_IN_HER_HOUSE 0x08C +#define FLAG_HIDE_ICEFALL_CAVE_ROCKETS 0x08D +#define FLAG_HIDE_RUIN_VALLEY_SCIENTIST 0x08E +#define FLAG_HIDE_SAPPHIRE 0x08F +#define FLAG_HIDE_DOTTED_HOLE_SCIENTIST 0x090 +#define FLAG_HIDE_THREE_ISLAND_LONE_BIKER 0x091 +#define FLAG_HIDE_PEWTER_CITY_RUNNING_SHOES_GUY 0x092 +#define FLAG_HIDE_LOST_CAVE_SELPHY 0x093 +#define FLAG_HIDE_RESORT_GORGEOUS_SELPHY 0x094 +#define FLAG_HIDE_RESORT_GORGEOUS_INSIDE_SELPHY 0x095 +#define FLAG_HIDE_SELPHYS_BUTLER 0x096 +#define FLAG_HIDE_FOUR_ISLAND_RIVAL 0x097 +#define FLAG_HIDE_SIX_ISLAND_POKECENTER_RIVAL 0x098 +#define FLAG_HIDE_DEOXYS 0x099 +#define FLAG_HIDE_BIRTH_ISLAND_METEORITE 0x09A +#define FLAG_HIDE_LUGIA 0x09B +#define FLAG_HIDE_HO_OH 0x09C +#define FLAG_HIDE_POSTGAME_GOSSIPERS 0x09D +#define FLAG_HIDE_FAME_CHECKER_ERIKA_JOURNALS 0x09E +#define FLAG_HIDE_FAME_CHECKER_KOGA_JOURNAL 0x09F +#define FLAG_HIDE_FAME_CHECKER_LT_SURGE_JOURNAL 0x0A0 +#define FLAG_HIDE_VERMILION_CITY_OAKS_AIDE 0x0A1 +#define FLAG_HIDE_CINNABAR_POKECENTER_BILL 0x0A2 +#define FLAG_HIDE_CREDITS_RIVAL 0x0A3 +#define FLAG_HIDE_CREDITS_OAK 0x0A4 +#define FLAG_HIDE_LORELEI_HOUSE_MEOWTH_DOLL 0x0A5 +#define FLAG_HIDE_LORELEI_HOUSE_CHANSEY_DOLL 0x0A6 +#define FLAG_HIDE_LORELEIS_HOUSE_NIDORAN_F_DOLL 0x0A7 +#define FLAG_HIDE_LORELEI_HOUSE_JIGGLYPUFF_DOLL 0x0A8 +#define FLAG_HIDE_LORELEIS_HOUSE_NIDORAN_M_DOLL 0x0A9 +#define FLAG_HIDE_LORELEIS_HOUSE_FEAROW_DOLL 0x0AA +#define FLAG_HIDE_LORELEIS_HOUSE_PIDGEOT_DOLL 0x0AB +#define FLAG_HIDE_LORELEIS_HOUSE_LAPRAS_DOLL 0x0AC +#define FLAG_HIDE_MISC_KANTO_ROCKETS 0x0AD +#define FLAG_HIDE_SAFFRON_CITY_POKECENTER_SABRINA_JOURNALS 0x0AE + +// Item ball hide/show flags #define FLAG_0x0AF 0x0AF #define FLAG_0x0B0 0x0B0 #define FLAG_0x0B1 0x0B1 |