diff options
154 files changed, 806 insertions, 803 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index 7a91fc01e..b1d8fe132 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1490,35 +1490,35 @@ Text_1A644F:: @ 81A644F .string "once. Is that okay?$" EventScript_ResetAllMapFlags:: @ 81A6481 - setflag FLAG_0x02B - setflag FLAG_0x02C - setflag FLAG_0x033 + 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_0x035 - setflag FLAG_0x036 - setflag FLAG_0x037 - setflag FLAG_0x03C - setflag FLAG_0x03D + 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_0x03F - setflag FLAG_0x04F - setflag FLAG_0x05A + 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_0x062 - setflag FLAG_0x06B + setflag FLAG_HIDE_CINNABAR_BILL + setflag FLAG_HIDE_CINNABAR_SEAGALLOP setflag FLAG_0x0A2 setflag FLAG_0x08C - setflag FLAG_0x06C - setflag FLAG_0x06D - setflag FLAG_0x06E - setflag FLAG_0x06F - setflag FLAG_0x075 - setflag FLAG_0x074 - setflag FLAG_0x07B - setflag FLAG_0x07C - setflag FLAG_0x07D - setflag FLAG_0x076 + setflag FLAG_HIDE_SAFFRON_FAN_CLUB_BLACKBELT + setflag FLAG_HIDE_SAFFRON_FAN_CLUB_ROCKER + setflag FLAG_HIDE_SAFFRON_FAN_CLUB_WOMAN + setflag FLAG_HIDE_SAFFRON_FAN_CLUB_BEAUTY + setflag FLAG_HIDE_TWO_ISLAND_GAME_CORNER_LOSTELLE + setflag FLAG_HIDE_TWO_ISLAND_GAME_CORNER_BIKER + setflag FLAG_HIDE_TWO_ISLAND_WOMAN + 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 @@ -2454,13 +2454,13 @@ EventScript_1A7506:: @ 81A7506 playse SE_DOOR call EventScript_1A7538 special DrawWholeMapView - setflag FLAG_0x004 + setflag FLAG_TEMP_4 return EventScript_1A751F:: @ 81A751F applymovement 255, Movement_1A75F3 waitmovement 0 - setflag FLAG_0x002 + setflag FLAG_TEMP_2 playse SE_KI_GASYAN call EventScript_1A759C special DrawWholeMapView @@ -2488,7 +2488,7 @@ EventScript_1A7563:: @ 81A7563 setmetatile 6, 4, 654, 1 setmetatile 6, 5, 662, 0 special DrawWholeMapView - setflag FLAG_0x004 + setflag FLAG_TEMP_4 return EventScript_1A7589:: @ 81A7589 @@ -8512,11 +8512,11 @@ EventScript_1BB1BA:: @ 81BB1BA specialvar VAR_RESULT, ValidateReceivedWonderCard compare_var_to_value VAR_RESULT, 0 goto_if 1, EventScript_1BB1CE - clearflag FLAG_0x070 + clearflag FLAG_HIDE_MG_DELIVERYMEN return EventScript_1BB1CE:: @ 81BB1CE - setflag FLAG_0x070 + setflag FLAG_HIDE_MG_DELIVERYMEN return CeruleanCity_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2 @@ -14537,7 +14537,7 @@ TwoIsland_CapeBrink_House_EventScript_1C4DEC:: @ 81C4DEC faceplayer checkflag FLAG_0x2E1 goto_if 1, EventScript_1C4EA1 - checkflag FLAG_0x002 + checkflag FLAG_TEMP_2 goto_if 1, EventScript_1C4E97 getfirstpartymonname 0 msgbox Text_1A46C6 @@ -14585,7 +14585,7 @@ EventScript_1C4EAB:: @ 81C4EAB compare_var_to_value VAR_RESULT, 1 goto_if 1, EventScript_1C4ECD msgbox Text_1A4865 - setflag FLAG_0x002 + setflag FLAG_TEMP_2 release end @@ -14696,26 +14696,26 @@ SevenIsland_TrainerTower_8F_MapScript2_1C4F62:: @ 81C4F62 goto_if 1, EventScript_1C4FC5 compare_var_to_value VAR_0x8000, 2 goto_if 1, EventScript_1C5019 - setflag FLAG_0x002 - setflag FLAG_0x003 - setflag FLAG_0x004 - setflag FLAG_0x005 + setflag FLAG_TEMP_2 + setflag FLAG_TEMP_3 + setflag FLAG_TEMP_4 + setflag FLAG_TEMP_5 setvar VAR_0x400E, 1 setvar VAR_0x400F, 1 end EventScript_1C4FA7:: @ 81C4FA7 - setflag FLAG_0x002 - setflag FLAG_0x004 - setflag FLAG_0x005 + setflag FLAG_TEMP_2 + setflag FLAG_TEMP_4 + setflag FLAG_TEMP_5 setvar VAR_0x400F, 1 setobjectxyperm 3, 15, 13 setobjectmovementtype 3, 9 goto EventScript_1C5042 EventScript_1C4FC5:: @ 81C4FC5 - setflag FLAG_0x003 - setflag FLAG_0x004 + setflag FLAG_TEMP_3 + setflag FLAG_TEMP_4 setvar VAR_0x400E, 1 setvar VAR_0x8004, 5 special sub_815D9E8 @@ -14735,7 +14735,7 @@ EventScript_1C4FFE:: @ 81C4FFE goto EventScript_1C5042 EventScript_1C5019:: @ 81C5019 - setflag FLAG_0x005 + setflag FLAG_TEMP_5 setvar VAR_0x400F, 1 setobjectxyperm 2, 10, 10 setobjectmovementtype 2, 8 @@ -14744,7 +14744,7 @@ EventScript_1C5019:: @ 81C5019 setobjectxyperm 4, 10, 16 setobjectmovementtype 4, 7 EventScript_1C5042: - setflag FLAG_0x006 + setflag FLAG_TEMP_6 end SevenIsland_TrainerTower_1F_MapScript3_1C5046:: @ 81C5046 diff --git a/data/maps/CeladonCity/map.json b/data/maps/CeladonCity/map.json index e9094aea3..33fb3eba7 100644 --- a/data/maps/CeladonCity/map.json +++ b/data/maps/CeladonCity/map.json @@ -35,7 +35,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeladonCity_EventScript_166CFA", - "flag": "FLAG_0x05F" + "flag": "FLAG_HIDE_CELADON_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_FAT_MAN", @@ -126,7 +126,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeladonCity_EventScript_166D03", - "flag": "FLAG_0x05F" + "flag": "FLAG_HIDE_CELADON_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", @@ -152,7 +152,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeladonCity_EventScript_1BDF13", - "flag": "FLAG_0x014" + "flag": "FLAG_TEMP_14" }, { "graphics_id": "MAP_OBJ_GFX_CUT_TREE", @@ -165,7 +165,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeladonCity_EventScript_1BDF13", - "flag": "FLAG_0x013" + "flag": "FLAG_TEMP_13" }, { "graphics_id": "MAP_OBJ_GFX_BOY", @@ -217,7 +217,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeladonCity_EventScript_166D15", - "flag": "FLAG_0x05F" + "flag": "FLAG_HIDE_CELADON_ROCKETS" } ], "warp_events": [ diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json index a34d04891..b66f7bc8a 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json @@ -37,7 +37,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeladonCity_Condominiums_RoofRoom_EventScript_16C46D", - "flag": "FLAG_0x057" + "flag": "FLAG_HIDE_EEVEE_BALL" } ], "warp_events": [ diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc index 6f104041e..3f92e7018 100644 --- a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc @@ -4,7 +4,7 @@ CeladonCity_DepartmentStore_Elevator_MapScripts:: @ 816C152 CeladonCity_DepartmentStore_Elevator_EventScript_16C153:: @ 816C153 lockall setvar VAR_0x8004, 3 - checkflag FLAG_0x002 + checkflag FLAG_TEMP_2 call_if 0, EventScript_1A7AB9 copyvar VAR_0x8005, VAR_0x403A special sub_80CB580 @@ -119,5 +119,5 @@ EventScript_16C313:: @ 816C313 waitse special sub_80CB498 waitstate - setflag FLAG_0x002 + setflag FLAG_TEMP_2 return diff --git a/data/maps/CeladonCity_GameCorner/map.json b/data/maps/CeladonCity_GameCorner/map.json index d92c4256b..2574f82e4 100644 --- a/data/maps/CeladonCity_GameCorner/map.json +++ b/data/maps/CeladonCity_GameCorner/map.json @@ -154,7 +154,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 0, "script": "CeladonCity_GameCorner_EventScript_16CAF5", - "flag": "FLAG_0x05B" + "flag": "FLAG_HIDE_GAME_CORNER_ROCKET" } ], "warp_events": [ diff --git a/data/maps/CeladonCity_Gym/map.json b/data/maps/CeladonCity_Gym/map.json index 46942cd80..098fc8124 100644 --- a/data/maps/CeladonCity_Gym/map.json +++ b/data/maps/CeladonCity_Gym/map.json @@ -128,7 +128,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeladonCity_Gym_EventScript_1BDF13", - "flag": "FLAG_0x012" + "flag": "FLAG_TEMP_12" }, { "graphics_id": "MAP_OBJ_GFX_CUT_TREE", @@ -141,7 +141,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeladonCity_Gym_EventScript_1BDF13", - "flag": "FLAG_0x013" + "flag": "FLAG_TEMP_13" }, { "graphics_id": "MAP_OBJ_GFX_CUT_TREE", @@ -154,7 +154,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeladonCity_Gym_EventScript_1BDF13", - "flag": "FLAG_0x014" + "flag": "FLAG_TEMP_14" } ], "warp_events": [ diff --git a/data/maps/CeladonCity_PokemonCenter_2F/map.json b/data/maps/CeladonCity_PokemonCenter_2F/map.json index 99a137100..e5bc26a2a 100644 --- a/data/maps/CeladonCity_PokemonCenter_2F/map.json +++ b/data/maps/CeladonCity_PokemonCenter_2F/map.json @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeladonCity_PokemonCenter_2F_EventScript_1BB1D2", - "flag": "FLAG_0x070" + "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], "warp_events": [ diff --git a/data/maps/CeruleanCave_1F/map.json b/data/maps/CeruleanCave_1F/map.json index f09b09fbc..95a103e82 100644 --- a/data/maps/CeruleanCave_1F/map.json +++ b/data/maps/CeruleanCave_1F/map.json @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeruleanCave_1F_EventScript_1BE00C", - "flag": "FLAG_0x012" + "flag": "FLAG_TEMP_12" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -76,7 +76,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeruleanCave_1F_EventScript_1BE00C", - "flag": "FLAG_0x013" + "flag": "FLAG_TEMP_13" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -89,7 +89,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeruleanCave_1F_EventScript_1BE00C", - "flag": "FLAG_0x014" + "flag": "FLAG_TEMP_14" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -102,7 +102,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeruleanCave_1F_EventScript_1BE00C", - "flag": "FLAG_0x015" + "flag": "FLAG_TEMP_15" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -115,7 +115,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeruleanCave_1F_EventScript_1BE00C", - "flag": "FLAG_0x016" + "flag": "FLAG_TEMP_16" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -128,7 +128,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeruleanCave_1F_EventScript_1BE00C", - "flag": "FLAG_0x017" + "flag": "FLAG_TEMP_17" } ], "warp_events": [ diff --git a/data/maps/CeruleanCave_2F/map.json b/data/maps/CeruleanCave_2F/map.json index bcff9dba4..7266ada75 100644 --- a/data/maps/CeruleanCave_2F/map.json +++ b/data/maps/CeruleanCave_2F/map.json @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeruleanCave_2F_EventScript_1BE00C", - "flag": "FLAG_0x012" + "flag": "FLAG_TEMP_12" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -76,7 +76,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeruleanCave_2F_EventScript_1BE00C", - "flag": "FLAG_0x013" + "flag": "FLAG_TEMP_13" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -89,7 +89,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeruleanCave_2F_EventScript_1BE00C", - "flag": "FLAG_0x014" + "flag": "FLAG_TEMP_14" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -102,7 +102,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeruleanCave_2F_EventScript_1BE00C", - "flag": "FLAG_0x015" + "flag": "FLAG_TEMP_15" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -115,7 +115,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeruleanCave_2F_EventScript_1BE00C", - "flag": "FLAG_0x016" + "flag": "FLAG_TEMP_16" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -128,7 +128,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeruleanCave_2F_EventScript_1BE00C", - "flag": "FLAG_0x017" + "flag": "FLAG_TEMP_17" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -141,7 +141,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeruleanCave_2F_EventScript_1BE00C", - "flag": "FLAG_0x018" + "flag": "FLAG_TEMP_18" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -154,7 +154,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeruleanCave_2F_EventScript_1BE00C", - "flag": "FLAG_0x019" + "flag": "FLAG_TEMP_19" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -167,7 +167,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeruleanCave_2F_EventScript_1BE00C", - "flag": "FLAG_0x01A" + "flag": "FLAG_TEMP_1A" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -180,7 +180,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeruleanCave_2F_EventScript_1BE00C", - "flag": "FLAG_0x01B" + "flag": "FLAG_TEMP_1B" } ], "warp_events": [ diff --git a/data/maps/CeruleanCave_B1F/map.json b/data/maps/CeruleanCave_B1F/map.json index 3f9c44aa4..1f982d094 100644 --- a/data/maps/CeruleanCave_B1F/map.json +++ b/data/maps/CeruleanCave_B1F/map.json @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeruleanCave_B1F_EventScript_1BE00C", - "flag": "FLAG_0x012" + "flag": "FLAG_TEMP_12" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -76,7 +76,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeruleanCave_B1F_EventScript_1BE00C", - "flag": "FLAG_0x013" + "flag": "FLAG_TEMP_13" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -89,7 +89,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeruleanCave_B1F_EventScript_1BE00C", - "flag": "FLAG_0x014" + "flag": "FLAG_TEMP_14" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -102,7 +102,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeruleanCave_B1F_EventScript_1BE00C", - "flag": "FLAG_0x015" + "flag": "FLAG_TEMP_15" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -115,7 +115,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeruleanCave_B1F_EventScript_1BE00C", - "flag": "FLAG_0x016" + "flag": "FLAG_TEMP_16" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -128,7 +128,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeruleanCave_B1F_EventScript_1BE00C", - "flag": "FLAG_0x017" + "flag": "FLAG_TEMP_17" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -141,7 +141,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeruleanCave_B1F_EventScript_1BE00C", - "flag": "FLAG_0x018" + "flag": "FLAG_TEMP_18" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -154,7 +154,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeruleanCave_B1F_EventScript_1BE00C", - "flag": "FLAG_0x019" + "flag": "FLAG_TEMP_19" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -167,7 +167,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeruleanCave_B1F_EventScript_1BE00C", - "flag": "FLAG_0x01A" + "flag": "FLAG_TEMP_1A" } ], "warp_events": [ diff --git a/data/maps/CeruleanCity/map.json b/data/maps/CeruleanCity/map.json index 4fc523b06..29b7f849c 100644 --- a/data/maps/CeruleanCity/map.json +++ b/data/maps/CeruleanCity/map.json @@ -58,7 +58,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeruleanCity_EventScript_166603", - "flag": "FLAG_0x03B" + "flag": "FLAG_HIDE_CERULEAN_ROCKET" }, { "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY", @@ -136,7 +136,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "FLAG_0x03C" + "flag": "FLAG_HIDE_CERULEAN_RIVAL" }, { "graphics_id": "MAP_OBJ_GFX_CUT_TREE", @@ -149,7 +149,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeruleanCity_EventScript_1BDF13", - "flag": "FLAG_0x013" + "flag": "FLAG_TEMP_13" }, { "graphics_id": "65375", @@ -188,7 +188,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeruleanCity_EventScript_16672F", - "flag": "FLAG_0x05C" + "flag": "FLAG_HIDE_CERULEAN_CAVE_GUARD" } ], "warp_events": [ diff --git a/data/maps/CeruleanCity_PokemonCenter_2F/map.json b/data/maps/CeruleanCity_PokemonCenter_2F/map.json index 88d26ac52..a5f191ced 100644 --- a/data/maps/CeruleanCity_PokemonCenter_2F/map.json +++ b/data/maps/CeruleanCity_PokemonCenter_2F/map.json @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeruleanCity_PokemonCenter_2F_EventScript_1BB1D2", - "flag": "FLAG_0x070" + "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], "warp_events": [ diff --git a/data/maps/CinnabarIsland/map.json b/data/maps/CinnabarIsland/map.json index 28cba0247..f5ab2fb9f 100644 --- a/data/maps/CinnabarIsland/map.json +++ b/data/maps/CinnabarIsland/map.json @@ -61,7 +61,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "FLAG_0x062" + "flag": "FLAG_HIDE_CINNABAR_BILL" }, { "graphics_id": "MAP_OBJ_GFX_SEAGALLOP", @@ -74,7 +74,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "FLAG_0x06B" + "flag": "FLAG_HIDE_CINNABAR_SEAGALLOP" } ], "warp_events": [ diff --git a/data/maps/CinnabarIsland/scripts.inc b/data/maps/CinnabarIsland/scripts.inc index daecdc3aa..407792e32 100644 --- a/data/maps/CinnabarIsland/scripts.inc +++ b/data/maps/CinnabarIsland/scripts.inc @@ -16,7 +16,7 @@ CinnabarIsland_MapScript1_166EE1:: @ 8166EE1 EventScript_166F0B:: @ 8166F0B savebgm MUS_ANNAI - setflag FLAG_0x002 + setflag FLAG_TEMP_2 setobjectxyperm 3, 15, 12 setobjectmovementtype 3, 9 setobjectxyperm 4, 30, 12 @@ -26,7 +26,7 @@ EventScript_166F24:: @ 8166F24 getplayerxy VAR_0x8004, VAR_0x8005 compare_var_to_value VAR_0x8004, 18 goto_if 4, EventScript_166F4A - setflag FLAG_0x002 + setflag FLAG_TEMP_2 setobjectxyperm 3, 18, 12 setobjectmovementtype 3, 7 setobjectxyperm 4, 30, 12 @@ -76,8 +76,8 @@ EventScript_166FA0:: @ 8166FA0 waitmovement 0 removeobject 3 setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 4 - setflag FLAG_0x075 - clearflag FLAG_0x076 + setflag FLAG_HIDE_TWO_ISLAND_GAME_CORNER_LOSTELLE + clearflag FLAG_HIDE_LOSTELLE_IN_HER_HOME releaseall end @@ -93,18 +93,18 @@ Movement_166FC6:: @ 8166FC6 EventScript_166FCD:: @ 8166FCD lockall textcolor 0 - checkflag FLAG_0x002 + checkflag FLAG_TEMP_2 call_if 0, EventScript_167032 - checkflag FLAG_0x002 + checkflag FLAG_TEMP_2 call_if 1, EventScript_16703D playse SE_PIN applymovement 3, Movement_1A75DB waitmovement 0 applymovement 3, Movement_1A75DD waitmovement 0 - checkflag FLAG_0x002 + checkflag FLAG_TEMP_2 call_if 0, EventScript_167048 - checkflag FLAG_0x002 + checkflag FLAG_TEMP_2 call_if 1, EventScript_167053 msgbox gUnknown_8180C90 msgbox gUnknown_8180CAA, MSGBOX_YESNO @@ -146,9 +146,9 @@ EventScript_167068:: @ 8167068 EventScript_167078:: @ 8167078 msgbox gUnknown_8180DF8 closemessage - checkflag FLAG_0x002 + checkflag FLAG_TEMP_2 call_if 0, EventScript_1670A0 - checkflag FLAG_0x002 + checkflag FLAG_TEMP_2 call_if 1, EventScript_1670B3 removeobject 3 setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 2 @@ -201,23 +201,23 @@ Movement_1670E2:: @ 81670E2 step_end EventScript_1670E6:: @ 81670E6 - checkflag FLAG_0x002 + checkflag FLAG_TEMP_2 call_if 1, EventScript_167142 addobject 4 - checkflag FLAG_0x002 + checkflag FLAG_TEMP_2 call_if 0, EventScript_167154 - checkflag FLAG_0x002 + checkflag FLAG_TEMP_2 call_if 1, EventScript_167166 msgbox gUnknown_8180EAD closemessage - checkflag FLAG_0x002 + checkflag FLAG_TEMP_2 call_if 0, EventScript_167171 - checkflag FLAG_0x002 + checkflag FLAG_TEMP_2 call_if 1, EventScript_167183 setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 2 removeobject 3 delay 40 - setflag FLAG_0x06B + setflag FLAG_HIDE_CINNABAR_SEAGALLOP setvar VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 1 setvar VAR_0x8004, 8 setvar VAR_0x8006, 1 diff --git a/data/maps/CinnabarIsland_Gym/scripts.inc b/data/maps/CinnabarIsland_Gym/scripts.inc index 0e8ccef23..6840b58c3 100644 --- a/data/maps/CinnabarIsland_Gym/scripts.inc +++ b/data/maps/CinnabarIsland_Gym/scripts.inc @@ -71,7 +71,7 @@ EventScript_16DA06:: @ 816DA06 setflag FLAG_BADGE07_GET setrespawn SPAWN_CINNABAR_ISLAND setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 1 - clearflag FLAG_0x062 + clearflag FLAG_HIDE_CINNABAR_BILL setvar VAR_0x8008, 7 call EventScript_1A6B18 goto EventScript_16DA34 diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc index eb9744435..c2f649414 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc @@ -47,7 +47,7 @@ CinnabarIsland_PokemonCenter_1F_EventScript_16E90A:: @ 816E90A call_if 1, EventScript_16E993 removeobject 7 setvar VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1 - clearflag FLAG_0x062 + clearflag FLAG_HIDE_CINNABAR_BILL warp MAP_CINNABAR_ISLAND, 255, 14, 11 waitstate release diff --git a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json index 3a302e10a..527b4a67d 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json +++ b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CinnabarIsland_PokemonCenter_2F_EventScript_1BB1D2", - "flag": "FLAG_0x070" + "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], "warp_events": [ diff --git a/data/maps/FiveIsland_Meadow/map.json b/data/maps/FiveIsland_Meadow/map.json index e755aa014..4d38a76ef 100644 --- a/data/maps/FiveIsland_Meadow/map.json +++ b/data/maps/FiveIsland_Meadow/map.json @@ -74,7 +74,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FiveIsland_Meadow_EventScript_1BDF13", - "flag": "FLAG_0x012" + "flag": "FLAG_TEMP_12" }, { "graphics_id": "MAP_OBJ_GFX_CUT_TREE", @@ -87,7 +87,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FiveIsland_Meadow_EventScript_1BDF13", - "flag": "FLAG_0x013" + "flag": "FLAG_TEMP_13" }, { "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", diff --git a/data/maps/FiveIsland_PokemonCenter_2F/map.json b/data/maps/FiveIsland_PokemonCenter_2F/map.json index f667fd526..8a64b44fa 100644 --- a/data/maps/FiveIsland_PokemonCenter_2F/map.json +++ b/data/maps/FiveIsland_PokemonCenter_2F/map.json @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FiveIsland_PokemonCenter_2F_EventScript_1BB1D2", - "flag": "FLAG_0x070" + "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], "warp_events": [ diff --git a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc index a4dc96f91..4f9abcadd 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc +++ b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc @@ -8,7 +8,7 @@ FiveIsland_ResortGorgeous_House_EventScript_171EBE:: @ 8171EBE special sub_8112364 lock faceplayer - checkflag FLAG_0x002 + checkflag FLAG_TEMP_2 goto_if_eq EventScript_172043 compare_var_to_value VAR_STORAGE_UNKNOWN, 65535 goto_if_eq EventScript_171F0B @@ -65,7 +65,7 @@ EventScript_171F34:: @ 8171F34 giveitem VAR_0x403B compare_var_to_value VAR_RESULT, 0 goto_if_eq EventScript_172025 - setflag FLAG_0x002 + setflag FLAG_TEMP_2 setvar VAR_STORAGE_UNKNOWN, 0 release end @@ -103,7 +103,7 @@ EventScript_172025:: @ 8172025 msgbox gUnknown_81A45E8 textcolor 1 msgbox gUnknown_81A461B - setflag FLAG_0x002 + setflag FLAG_TEMP_2 setvar VAR_STORAGE_UNKNOWN, 0 release end diff --git a/data/maps/FourIsland/map.json b/data/maps/FourIsland/map.json index a8052de3f..ceb92d8b5 100644 --- a/data/maps/FourIsland/map.json +++ b/data/maps/FourIsland/map.json @@ -102,7 +102,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FourIsland_EventScript_1BE00C", - "flag": "FLAG_0x012" + "flag": "FLAG_TEMP_12" }, { "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", diff --git a/data/maps/FourIsland_PokemonCenter_2F/map.json b/data/maps/FourIsland_PokemonCenter_2F/map.json index 3a6edfa3a..dbb6bb145 100644 --- a/data/maps/FourIsland_PokemonCenter_2F/map.json +++ b/data/maps/FourIsland_PokemonCenter_2F/map.json @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FourIsland_PokemonCenter_2F_EventScript_1BB1D2", - "flag": "FLAG_0x070" + "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], "warp_events": [ diff --git a/data/maps/FuchsiaCity/map.json b/data/maps/FuchsiaCity/map.json index 9d03cc645..7338abdfb 100644 --- a/data/maps/FuchsiaCity/map.json +++ b/data/maps/FuchsiaCity/map.json @@ -170,7 +170,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FuchsiaCity_EventScript_1BDF13", - "flag": "FLAG_0x012" + "flag": "FLAG_TEMP_12" }, { "graphics_id": "MAP_OBJ_GFX_CUT_TREE", @@ -183,7 +183,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FuchsiaCity_EventScript_1BDF13", - "flag": "FLAG_0x013" + "flag": "FLAG_TEMP_13" }, { "graphics_id": "MAP_OBJ_GFX_CUT_TREE", @@ -196,7 +196,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FuchsiaCity_EventScript_1BDF13", - "flag": "FLAG_0x014" + "flag": "FLAG_TEMP_14" }, { "graphics_id": "MAP_OBJ_GFX_CUT_TREE", @@ -209,7 +209,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FuchsiaCity_EventScript_1BDF13", - "flag": "FLAG_0x015" + "flag": "FLAG_TEMP_15" }, { "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", diff --git a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json index f90456e9a..c54ed2085 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json +++ b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FuchsiaCity_PokemonCenter_2F_EventScript_1BB1D2", - "flag": "FLAG_0x070" + "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], "warp_events": [ diff --git a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json index 12e7e671c..7da5e0706 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json +++ b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "IndigoPlateau_PokemonCenter_2F_EventScript_1BB1D2", - "flag": "FLAG_0x070" + "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], "warp_events": [ diff --git a/data/maps/LavenderTown/scripts.inc b/data/maps/LavenderTown/scripts.inc index 642332965..ca7aa5a63 100644 --- a/data/maps/LavenderTown/scripts.inc +++ b/data/maps/LavenderTown/scripts.inc @@ -5,7 +5,7 @@ LavenderTown_MapScripts:: @ 816686B LavenderTown_MapScript1_166871:: @ 8166871 setworldmapflag FLAG_WORLD_MAP_LAVENDER_TOWN setvar VAR_MAP_SCENE_S_S_ANNE_2F_CORRIDOR, 1 - setflag FLAG_0x03D + setflag FLAG_HIDE_SS_ANNE_RIVAL end LavenderTown_EventScript_16687D:: @ 816687D diff --git a/data/maps/LavenderTown_PokemonCenter_2F/map.json b/data/maps/LavenderTown_PokemonCenter_2F/map.json index 50043e367..c99020e41 100644 --- a/data/maps/LavenderTown_PokemonCenter_2F/map.json +++ b/data/maps/LavenderTown_PokemonCenter_2F/map.json @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "LavenderTown_PokemonCenter_2F_EventScript_1BB1D2", - "flag": "FLAG_0x070" + "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], "warp_events": [ diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/map.json b/data/maps/LavenderTown_VolunteerPokemonHouse/map.json index b3432a395..617fae94b 100644 --- a/data/maps/LavenderTown_VolunteerPokemonHouse/map.json +++ b/data/maps/LavenderTown_VolunteerPokemonHouse/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_3", + "graphics_id": "MAP_OBJ_GFX_MR_FUJI", "x": 3, "y": 3, "elevation": 3, @@ -24,7 +24,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "LavenderTown_VolunteerPokemonHouse_EventScript_16B14A", - "flag": "FLAG_0x035" + "flag": "FLAG_HIDE_POKEHOUSE_FUJI" }, { "graphics_id": "MAP_OBJ_GFX_NIDORINO", diff --git a/data/maps/MtEmber_Exterior/map.json b/data/maps/MtEmber_Exterior/map.json index a33310783..6e16750f2 100644 --- a/data/maps/MtEmber_Exterior/map.json +++ b/data/maps/MtEmber_Exterior/map.json @@ -102,7 +102,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtEmber_Exterior_EventScript_1BE00C", - "flag": "FLAG_0x012" + "flag": "FLAG_TEMP_12" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -115,7 +115,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtEmber_Exterior_EventScript_1BE00C", - "flag": "FLAG_0x013" + "flag": "FLAG_TEMP_13" }, { "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", @@ -167,7 +167,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtEmber_Exterior_EventScript_1BE00C", - "flag": "FLAG_0x014" + "flag": "FLAG_TEMP_14" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -180,7 +180,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtEmber_Exterior_EventScript_1BE00C", - "flag": "FLAG_0x015" + "flag": "FLAG_TEMP_15" }, { "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", @@ -219,7 +219,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtEmber_Exterior_EventScript_1BE00C", - "flag": "FLAG_0x016" + "flag": "FLAG_TEMP_16" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -232,7 +232,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtEmber_Exterior_EventScript_1BE00C", - "flag": "FLAG_0x017" + "flag": "FLAG_TEMP_17" }, { "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", diff --git a/data/maps/MtEmber_RubyPath_1F/map.json b/data/maps/MtEmber_RubyPath_1F/map.json index 262c014b0..6abd98bf7 100644 --- a/data/maps/MtEmber_RubyPath_1F/map.json +++ b/data/maps/MtEmber_RubyPath_1F/map.json @@ -24,7 +24,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtEmber_RubyPath_1F_EventScript_1BE00C", - "flag": "FLAG_0x012" + "flag": "FLAG_TEMP_12" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -37,7 +37,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtEmber_RubyPath_1F_EventScript_1BE00C", - "flag": "FLAG_0x013" + "flag": "FLAG_TEMP_13" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -50,7 +50,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtEmber_RubyPath_1F_EventScript_1BE00C", - "flag": "FLAG_0x014" + "flag": "FLAG_TEMP_14" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtEmber_RubyPath_1F_EventScript_1BE00C", - "flag": "FLAG_0x015" + "flag": "FLAG_TEMP_15" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -76,7 +76,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtEmber_RubyPath_1F_EventScript_1BE00C", - "flag": "FLAG_0x016" + "flag": "FLAG_TEMP_16" } ], "warp_events": [ diff --git a/data/maps/MtEmber_RubyPath_B1F/map.json b/data/maps/MtEmber_RubyPath_B1F/map.json index d72e33df6..fa402af9b 100644 --- a/data/maps/MtEmber_RubyPath_B1F/map.json +++ b/data/maps/MtEmber_RubyPath_B1F/map.json @@ -24,7 +24,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtEmber_RubyPath_B1F_EventScript_1BE00C", - "flag": "FLAG_0x012" + "flag": "FLAG_TEMP_12" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -37,7 +37,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtEmber_RubyPath_B1F_EventScript_1BE00C", - "flag": "FLAG_0x013" + "flag": "FLAG_TEMP_13" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -50,7 +50,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtEmber_RubyPath_B1F_EventScript_1BE00C", - "flag": "FLAG_0x014" + "flag": "FLAG_TEMP_14" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtEmber_RubyPath_B1F_EventScript_1BE00C", - "flag": "FLAG_0x015" + "flag": "FLAG_TEMP_15" } ], "warp_events": [ diff --git a/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json b/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json index c18a21287..827013757 100644 --- a/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json +++ b/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json @@ -24,7 +24,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtEmber_RubyPath_B1F_Stairs_EventScript_1BE00C", - "flag": "FLAG_0x012" + "flag": "FLAG_TEMP_12" } ], "warp_events": [ diff --git a/data/maps/MtEmber_RubyPath_B2F/map.json b/data/maps/MtEmber_RubyPath_B2F/map.json index 50b4acd25..f2e7702e0 100644 --- a/data/maps/MtEmber_RubyPath_B2F/map.json +++ b/data/maps/MtEmber_RubyPath_B2F/map.json @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtEmber_RubyPath_B2F_EventScript_1BE00C", - "flag": "FLAG_0x012" + "flag": "FLAG_TEMP_12" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -76,7 +76,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtEmber_RubyPath_B2F_EventScript_1BE00C", - "flag": "FLAG_0x013" + "flag": "FLAG_TEMP_13" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -89,7 +89,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtEmber_RubyPath_B2F_EventScript_1BE00C", - "flag": "FLAG_0x014" + "flag": "FLAG_TEMP_14" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -102,7 +102,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtEmber_RubyPath_B2F_EventScript_1BE00C", - "flag": "FLAG_0x015" + "flag": "FLAG_TEMP_15" } ], "warp_events": [ diff --git a/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json b/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json index ec9ca1c93..78628172b 100644 --- a/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json +++ b/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json @@ -24,7 +24,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtEmber_RubyPath_B2F_Stairs_EventScript_1BE00C", - "flag": "FLAG_0x012" + "flag": "FLAG_TEMP_12" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -37,7 +37,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtEmber_RubyPath_B2F_Stairs_EventScript_1BE00C", - "flag": "FLAG_0x013" + "flag": "FLAG_TEMP_13" } ], "warp_events": [ diff --git a/data/maps/MtEmber_RubyPath_B3F/map.json b/data/maps/MtEmber_RubyPath_B3F/map.json index e208baa96..4eacf9440 100644 --- a/data/maps/MtEmber_RubyPath_B3F/map.json +++ b/data/maps/MtEmber_RubyPath_B3F/map.json @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtEmber_RubyPath_B3F_EventScript_1BE00C", - "flag": "FLAG_0x012" + "flag": "FLAG_TEMP_12" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -76,7 +76,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtEmber_RubyPath_B3F_EventScript_1BE00C", - "flag": "FLAG_0x013" + "flag": "FLAG_TEMP_13" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -89,7 +89,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtEmber_RubyPath_B3F_EventScript_1BE00C", - "flag": "FLAG_0x014" + "flag": "FLAG_TEMP_14" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -102,7 +102,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtEmber_RubyPath_B3F_EventScript_1BE00C", - "flag": "FLAG_0x015" + "flag": "FLAG_TEMP_15" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -115,7 +115,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtEmber_RubyPath_B3F_EventScript_1BE00C", - "flag": "FLAG_0x016" + "flag": "FLAG_TEMP_16" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -128,7 +128,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtEmber_RubyPath_B3F_EventScript_1BE00C", - "flag": "FLAG_0x017" + "flag": "FLAG_TEMP_17" }, { "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", diff --git a/data/maps/MtEmber_Summit/map.json b/data/maps/MtEmber_Summit/map.json index a43849161..b038efc4a 100644 --- a/data/maps/MtEmber_Summit/map.json +++ b/data/maps/MtEmber_Summit/map.json @@ -24,7 +24,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtEmber_Summit_EventScript_163B33", - "flag": "FLAG_0x052" + "flag": "FLAG_HIDE_MOLTRES" }, { "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", diff --git a/data/maps/MtEmber_Summit/scripts.inc b/data/maps/MtEmber_Summit/scripts.inc index 05472f91c..d1330d5ce 100644 --- a/data/maps/MtEmber_Summit/scripts.inc +++ b/data/maps/MtEmber_Summit/scripts.inc @@ -21,7 +21,7 @@ MtEmber_Summit_MapScript1_163B25:: @ 8163B25 end EventScript_163B2F:: @ 8163B2F - clearflag FLAG_0x052 + clearflag FLAG_HIDE_MOLTRES return MtEmber_Summit_EventScript_163B33:: @ 8163B33 diff --git a/data/maps/MtEmber_SummitPath_2F/map.json b/data/maps/MtEmber_SummitPath_2F/map.json index f17f76a12..7a395c4f4 100644 --- a/data/maps/MtEmber_SummitPath_2F/map.json +++ b/data/maps/MtEmber_SummitPath_2F/map.json @@ -24,7 +24,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtEmber_SummitPath_2F_EventScript_1BE00C", - "flag": "FLAG_0x012" + "flag": "FLAG_TEMP_12" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -37,7 +37,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtEmber_SummitPath_2F_EventScript_1BE00C", - "flag": "FLAG_0x013" + "flag": "FLAG_TEMP_13" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -50,7 +50,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtEmber_SummitPath_2F_EventScript_1BE00C", - "flag": "FLAG_0x014" + "flag": "FLAG_TEMP_14" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtEmber_SummitPath_2F_EventScript_1BE00C", - "flag": "FLAG_0x015" + "flag": "FLAG_TEMP_15" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -76,7 +76,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtEmber_SummitPath_2F_EventScript_1BE00C", - "flag": "FLAG_0x016" + "flag": "FLAG_TEMP_16" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -89,7 +89,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtEmber_SummitPath_2F_EventScript_1BE00C", - "flag": "FLAG_0x017" + "flag": "FLAG_TEMP_17" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -102,7 +102,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtEmber_SummitPath_2F_EventScript_1BE00C", - "flag": "FLAG_0x018" + "flag": "FLAG_TEMP_18" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -115,7 +115,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtEmber_SummitPath_2F_EventScript_1BE00C", - "flag": "FLAG_0x019" + "flag": "FLAG_TEMP_19" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -128,7 +128,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtEmber_SummitPath_2F_EventScript_1BE00C", - "flag": "FLAG_0x01A" + "flag": "FLAG_TEMP_1A" } ], "warp_events": [ diff --git a/data/maps/MtMoon_B2F/map.json b/data/maps/MtMoon_B2F/map.json index 4a66006bd..42b61fa39 100644 --- a/data/maps/MtMoon_B2F/map.json +++ b/data/maps/MtMoon_B2F/map.json @@ -24,7 +24,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtMoon_B2F_EventScript_16071B", - "flag": "FLAG_0x02F" + "flag": "FLAG_HIDE_DOME_FOSSIL" }, { "graphics_id": "MAP_OBJ_GFX_FOSSIL", @@ -37,7 +37,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtMoon_B2F_EventScript_16077F", - "flag": "FLAG_0x030" + "flag": "FLAG_HIDE_HELIX_FOSSIL" }, { "graphics_id": "MAP_OBJ_GFX_SCIENTIST", diff --git a/data/maps/MtMoon_B2F/scripts.inc b/data/maps/MtMoon_B2F/scripts.inc index 1fb1a3251..848023024 100644 --- a/data/maps/MtMoon_B2F/scripts.inc +++ b/data/maps/MtMoon_B2F/scripts.inc @@ -8,8 +8,8 @@ MtMoon_B2F_MapScript1_16069F:: @ 816069F end EventScript_1606A9:: @ 81606A9 - clearflag FLAG_0x02F - clearflag FLAG_0x030 + clearflag FLAG_HIDE_DOME_FOSSIL + clearflag FLAG_HIDE_HELIX_FOSSIL return MtMoon_B2F_EventScript_1606B0:: @ 81606B0 diff --git a/data/maps/OneIsland/map.json b/data/maps/OneIsland/map.json index ee2444858..fb1e43775 100644 --- a/data/maps/OneIsland/map.json +++ b/data/maps/OneIsland/map.json @@ -35,7 +35,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "FLAG_0x071" + "flag": "FLAG_HIDE_ONE_ISLAND_BILL" }, { "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", diff --git a/data/maps/OneIsland_KindleRoad/map.json b/data/maps/OneIsland_KindleRoad/map.json index 97c7a6a3b..2e2a99881 100644 --- a/data/maps/OneIsland_KindleRoad/map.json +++ b/data/maps/OneIsland_KindleRoad/map.json @@ -199,7 +199,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "OneIsland_KindleRoad_EventScript_1BE00C", - "flag": "FLAG_0x013" + "flag": "FLAG_TEMP_13" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -212,7 +212,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "OneIsland_KindleRoad_EventScript_1BE00C", - "flag": "FLAG_0x015" + "flag": "FLAG_TEMP_15" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -225,7 +225,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "OneIsland_KindleRoad_EventScript_1BE00C", - "flag": "FLAG_0x016" + "flag": "FLAG_TEMP_16" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -238,7 +238,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "OneIsland_KindleRoad_EventScript_1BE00C", - "flag": "FLAG_0x017" + "flag": "FLAG_TEMP_17" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -251,7 +251,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "OneIsland_KindleRoad_EventScript_1BE00C", - "flag": "FLAG_0x018" + "flag": "FLAG_TEMP_18" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -264,7 +264,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "OneIsland_KindleRoad_EventScript_1BE00C", - "flag": "FLAG_0x019" + "flag": "FLAG_TEMP_19" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -277,7 +277,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "OneIsland_KindleRoad_EventScript_1BE00C", - "flag": "FLAG_0x01A" + "flag": "FLAG_TEMP_1A" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -290,7 +290,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "OneIsland_KindleRoad_EventScript_1BE00C", - "flag": "FLAG_0x01B" + "flag": "FLAG_TEMP_1B" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -303,7 +303,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "OneIsland_KindleRoad_EventScript_1BE00C", - "flag": "FLAG_0x01C" + "flag": "FLAG_TEMP_1C" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -316,7 +316,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "OneIsland_KindleRoad_EventScript_1BE00C", - "flag": "FLAG_0x01D" + "flag": "FLAG_TEMP_1D" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -329,7 +329,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "OneIsland_KindleRoad_EventScript_1BE00C", - "flag": "FLAG_0x01E" + "flag": "FLAG_TEMP_1E" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -342,7 +342,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "OneIsland_KindleRoad_EventScript_1BE00C", - "flag": "FLAG_0x01F" + "flag": "FLAG_TEMP_1F" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -355,7 +355,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "OneIsland_KindleRoad_EventScript_1BE00C", - "flag": "FLAG_0x011" + "flag": "FLAG_TEMP_11" }, { "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", diff --git a/data/maps/OneIsland_PokemonCenter_1F/map.json b/data/maps/OneIsland_PokemonCenter_1F/map.json index ae54dc6e2..b5575d3fd 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/map.json +++ b/data/maps/OneIsland_PokemonCenter_1F/map.json @@ -37,7 +37,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "OneIsland_PokemonCenter_1F_EventScript_170E9D", - "flag": "FLAG_0x072" + "flag": "FLAG_HIDE_ONE_ISLAND_POKECENTER_BILL" }, { "graphics_id": "MAP_OBJ_GFX_CELIO", @@ -50,7 +50,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "OneIsland_PokemonCenter_1F_EventScript_170EC5", - "flag": "FLAG_0x073" + "flag": "FLAG_HIDE_ONE_ISLAND_POKECENTER_CELIO" }, { "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY", diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc index 6604b9ea3..5b12958c8 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc @@ -146,7 +146,7 @@ EventScript_170E46:: @ 8170E46 return EventScript_170E58:: @ 8170E58 - setflag FLAG_0x039 + setflag FLAG_HIDE_TOWN_MAP setvar VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 additem ITEM_TOWN_MAP, 1 giveitemfanfaremsg gUnknown_81A1218, ITEM_TOWN_MAP, 1, MUS_FAN5 @@ -300,7 +300,7 @@ EventScript_170FA5:: @ 8170FA5 msgbox gUnknown_81A1D7D special sub_810B82C setflag FLAG_0x844 - setflag FLAG_0x05C + setflag FLAG_HIDE_CERULEAN_CAVE_GUARD setflag FLAG_0x08C setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6 special InitRoamer @@ -514,9 +514,9 @@ EventScript_1711DA:: @ 81711DA applymovement 2, Movement_17132D waitmovement 0 playse SE_KAIDAN - setflag FLAG_0x072 + setflag FLAG_HIDE_ONE_ISLAND_POKECENTER_BILL setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 3 - clearflag FLAG_0x062 + clearflag FLAG_HIDE_CINNABAR_BILL setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 3 setvar VAR_0x8004, 1 setvar VAR_0x8006, 8 diff --git a/data/maps/OneIsland_PokemonCenter_2F/map.json b/data/maps/OneIsland_PokemonCenter_2F/map.json index 32111a11c..aacfae373 100644 --- a/data/maps/OneIsland_PokemonCenter_2F/map.json +++ b/data/maps/OneIsland_PokemonCenter_2F/map.json @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "OneIsland_PokemonCenter_2F_EventScript_1BB1D2", - "flag": "FLAG_0x070" + "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], "warp_events": [ diff --git a/data/maps/PalletTown/map.json b/data/maps/PalletTown/map.json index 6854282b5..344d30be7 100644 --- a/data/maps/PalletTown/map.json +++ b/data/maps/PalletTown/map.json @@ -61,7 +61,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "FLAG_0x02C" + "flag": "FLAG_HIDE_OAK_IN_PALLET_TOWN" } ], "warp_events": [ diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc index eb3a85f4c..ac977d53a 100644 --- a/data/maps/PalletTown/scripts.inc +++ b/data/maps/PalletTown/scripts.inc @@ -76,7 +76,7 @@ EventScript_1654D8:: @ 81654D8 waitdooranim setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 7 setvar VAR_MAP_SCENE_PALLET_TOWN_OAK, 3 - setflag FLAG_0x02C + setflag FLAG_HIDE_OAK_IN_PALLET_TOWN warp MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB, 255, 6, 12 waitstate releaseall @@ -221,9 +221,9 @@ EventScript_165605:: @ 8165605 closedoor 16, 13 waitdooranim setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1 - clearflag FLAG_0x02B + clearflag FLAG_HIDE_OAK_IN_HIS_LAB setvar VAR_MAP_SCENE_PALLET_TOWN_OAK, 1 - setflag FLAG_0x02C + setflag FLAG_HIDE_OAK_IN_PALLET_TOWN setflag FLAG_SPECIAL_FLAG_0x4001 warp MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB, 255, 6, 12 waitstate @@ -382,7 +382,7 @@ PalletTown_EventScript_16575C:: @ 816575C goto_if_eq EventScript_165815 compare_var_to_value VAR_0x4002, 1 goto_if_eq EventScript_1658C2 - checkflag FLAG_0x002 + checkflag FLAG_TEMP_2 goto_if_eq EventScript_165801 msgbox gUnknown_81B1C8B applymovement 1, Movement_1A75E1 @@ -399,7 +399,7 @@ PalletTown_EventScript_16575C:: @ 816575C compare_var_to_value VAR_FACING, 4 call_if 5, EventScript_1657E2 moveobjectoffscreen 1 - setflag FLAG_0x002 + setflag FLAG_TEMP_2 release end diff --git a/data/maps/PalletTown_GarysHouse/map.json b/data/maps/PalletTown_GarysHouse/map.json index 4516e4910..c2c15b1b8 100644 --- a/data/maps/PalletTown_GarysHouse/map.json +++ b/data/maps/PalletTown_GarysHouse/map.json @@ -37,7 +37,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "PalletTown_GarysHouse_EventScript_168F63", - "flag": "FLAG_0x039" + "flag": "FLAG_HIDE_TOWN_MAP" } ], "warp_events": [ diff --git a/data/maps/PalletTown_ProfessorOaksLab/map.json b/data/maps/PalletTown_ProfessorOaksLab/map.json index f6b80642a..9ff650466 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/map.json +++ b/data/maps/PalletTown_ProfessorOaksLab/map.json @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "PalletTown_ProfessorOaksLab_EventScript_169595", - "flag": "FLAG_0x02B" + "flag": "FLAG_HIDE_OAK_IN_HIS_LAB" }, { "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", @@ -76,7 +76,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "PalletTown_ProfessorOaksLab_EventScript_169BAB", - "flag": "FLAG_0x028" + "flag": "FLAG_HIDE_BULBASAUR_BALL" }, { "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", @@ -89,7 +89,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "PalletTown_ProfessorOaksLab_EventScript_169D78", - "flag": "FLAG_0x029" + "flag": "FLAG_HIDE_SQUIRTLE_BALL" }, { "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", @@ -102,7 +102,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "PalletTown_ProfessorOaksLab_EventScript_169DAE", - "flag": "FLAG_0x02A" + "flag": "FLAG_HIDE_CHARMANDER_BALL" }, { "graphics_id": "MAP_OBJ_GFX_BLUE", @@ -115,7 +115,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "PalletTown_ProfessorOaksLab_EventScript_16955F", - "flag": "FLAG_0x02D" + "flag": "FLAG_HIDE_RIVAL_IN_LAB" }, { "graphics_id": "MAP_OBJ_GFX_POKEDEX", @@ -128,7 +128,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "PalletTown_ProfessorOaksLab_EventScript_169E5F", - "flag": "FLAG_0x03A" + "flag": "FLAG_HIDE_POKEDEX" }, { "graphics_id": "MAP_OBJ_GFX_POKEDEX", @@ -141,7 +141,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "PalletTown_ProfessorOaksLab_EventScript_169E5F", - "flag": "FLAG_0x03A" + "flag": "FLAG_HIDE_POKEDEX" } ], "warp_events": [ diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index bb31dba40..59596e6d8 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -57,7 +57,7 @@ EventScript_169002:: @ 8169002 removeobject 4 setobjectxyperm 4, 6, 3 setobjectmovementtype 4, 8 - clearflag FLAG_0x02B + clearflag FLAG_HIDE_OAK_IN_HIS_LAB applymovement 255, Movement_1692B7 waitmovement 0 goto EventScript_169035 @@ -219,7 +219,7 @@ EventScript_16923E:: @ 816923E removeobject 4 setobjectxyperm 4, 6, 3 setobjectmovementtype 4, 8 - clearflag FLAG_0x02B + clearflag FLAG_HIDE_OAK_IN_HIS_LAB applymovement 255, Movement_1692B7 waitmovement 0 applymovement 8, Movement_1A75E9 @@ -595,7 +595,7 @@ EventScript_16958B:: @ 816958B PalletTown_ProfessorOaksLab_EventScript_169595:: @ 8169595 lock faceplayer - checkflag FLAG_0x002 + checkflag FLAG_TEMP_2 goto_if_eq EventScript_169600 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 9 goto_if_eq EventScript_169903 @@ -871,7 +871,7 @@ EventScript_169913:: @ 8169913 closemessage delay 70 msgbox gUnknown_81A72AD - setflag FLAG_0x002 + setflag FLAG_TEMP_2 release end diff --git a/data/maps/PewterCity/map.json b/data/maps/PewterCity/map.json index 57b359ab5..916ef1310 100644 --- a/data/maps/PewterCity/map.json +++ b/data/maps/PewterCity/map.json @@ -48,7 +48,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "PewterCity_EventScript_16607E", - "flag": "FLAG_0x050" + "flag": "FLAG_HIDE_PEWTER_MUSEUM_ESCORT" }, { "graphics_id": "MAP_OBJ_GFX_FAT_MAN", @@ -87,7 +87,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "PewterCity_EventScript_165B9D", - "flag": "FLAG_0x02E" + "flag": "FLAG_HIDE_PEWTER_CITY_GYM_ESCORT" }, { "graphics_id": "MAP_OBJ_GFX_CUT_TREE", @@ -100,7 +100,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "PewterCity_EventScript_1BDF13", - "flag": "FLAG_0x012" + "flag": "FLAG_TEMP_12" }, { "graphics_id": "MAP_OBJ_GFX_SCIENTIST", diff --git a/data/maps/PewterCity/scripts.inc b/data/maps/PewterCity/scripts.inc index 41069ec3f..3fdd7d438 100644 --- a/data/maps/PewterCity/scripts.inc +++ b/data/maps/PewterCity/scripts.inc @@ -21,7 +21,7 @@ PewterCity_EventScript_165B9D:: @ 8165B9D waitmovement 0 fadedefaultbgm removeobject 5 - clearflag FLAG_0x02E + clearflag FLAG_HIDE_PEWTER_CITY_GYM_ESCORT release end @@ -457,7 +457,7 @@ EventScript_165DBE:: @ 8165DBE waitmovement 0 fadedefaultbgm removeobject 5 - clearflag FLAG_0x02E + clearflag FLAG_HIDE_PEWTER_CITY_GYM_ESCORT releaseall end @@ -1053,7 +1053,7 @@ PewterCity_EventScript_16607E:: @ 816607E waitmovement 0 fadedefaultbgm removeobject 2 - clearflag FLAG_0x050 + clearflag FLAG_HIDE_PEWTER_MUSEUM_ESCORT release end diff --git a/data/maps/PewterCity_Gym/scripts.inc b/data/maps/PewterCity_Gym/scripts.inc index aadf6ed98..537f057f0 100644 --- a/data/maps/PewterCity_Gym/scripts.inc +++ b/data/maps/PewterCity_Gym/scripts.inc @@ -19,7 +19,7 @@ EventScript_16A5C5:: @ 816A5C5 setflag FLAG_0x4B0 setflag FLAG_BADGE01_GET setvar VAR_MAP_SCENE_PEWTER_CITY, 1 - setflag FLAG_0x02E + setflag FLAG_HIDE_PEWTER_CITY_GYM_ESCORT clearflag FLAG_0x092 setvar VAR_0x8008, 1 call EventScript_1A6B18 diff --git a/data/maps/PewterCity_Museum_1F/map.json b/data/maps/PewterCity_Museum_1F/map.json index 848da7bbb..7dcbbe776 100644 --- a/data/maps/PewterCity_Museum_1F/map.json +++ b/data/maps/PewterCity_Museum_1F/map.json @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "PewterCity_Museum_1F_EventScript_16A509", - "flag": "FLAG_0x056" + "flag": "FLAG_HIDE_OLD_AMBER" }, { "graphics_id": "MAP_OBJ_GFX_SCIENTIST", diff --git a/data/maps/PewterCity_PokemonCenter_2F/map.json b/data/maps/PewterCity_PokemonCenter_2F/map.json index c624918c8..32a9afe45 100644 --- a/data/maps/PewterCity_PokemonCenter_2F/map.json +++ b/data/maps/PewterCity_PokemonCenter_2F/map.json @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "PewterCity_PokemonCenter_2F_EventScript_1BB1D2", - "flag": "FLAG_0x070" + "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], "warp_events": [ diff --git a/data/maps/PokemonLeague_AgathasRoom/scripts.inc b/data/maps/PokemonLeague_AgathasRoom/scripts.inc index b7a6b4751..6ec5c04b7 100644 --- a/data/maps/PokemonLeague_AgathasRoom/scripts.inc +++ b/data/maps/PokemonLeague_AgathasRoom/scripts.inc @@ -65,13 +65,13 @@ PokemonLeague_AgathasRoom_EventScript_162877:: @ 8162877 call_if 0, EventScript_1628E9 checkflag FLAG_SYS_GAME_CLEAR call_if 1, EventScript_1628F2 - setflag FLAG_0x003 - setflag FLAG_0x005 + setflag FLAG_TEMP_3 + setflag FLAG_TEMP_5 checkflag FLAG_0x844 call_if 0, EventScript_1628FB checkflag FLAG_0x844 call_if 1, EventScript_162906 - clearflag FLAG_0x005 + clearflag FLAG_TEMP_5 goto EventScript_16291B EventScript_1628E8:: @ 81628E8 diff --git a/data/maps/PokemonLeague_BrunosRoom/scripts.inc b/data/maps/PokemonLeague_BrunosRoom/scripts.inc index ae1e84901..26128d007 100644 --- a/data/maps/PokemonLeague_BrunosRoom/scripts.inc +++ b/data/maps/PokemonLeague_BrunosRoom/scripts.inc @@ -62,13 +62,13 @@ PokemonLeague_BrunosRoom_EventScript_1626EC:: @ 81626EC call_if 0, EventScript_162751 checkflag FLAG_SYS_GAME_CLEAR call_if 1, EventScript_16275A - setflag FLAG_0x003 - setflag FLAG_0x005 + setflag FLAG_TEMP_3 + setflag FLAG_TEMP_5 checkflag FLAG_0x844 call_if 0, EventScript_162763 checkflag FLAG_0x844 call_if 1, EventScript_16276E - clearflag FLAG_0x005 + clearflag FLAG_TEMP_5 goto EventScript_1627B0 EventScript_162750:: @ 8162750 diff --git a/data/maps/PokemonLeague_ChampionsRoom/map.json b/data/maps/PokemonLeague_ChampionsRoom/map.json index c98a22470..2154adc3a 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/map.json +++ b/data/maps/PokemonLeague_ChampionsRoom/map.json @@ -37,7 +37,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "FLAG_0x05A" + "flag": "FLAG_HIDE_OAK_IN_CHAMP_ROOM" } ], "warp_events": [ diff --git a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc index 67b68616d..31549e6ec 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc +++ b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc @@ -55,7 +55,7 @@ PokemonLeague_ChampionsRoom_MapScript3_162B6C:: @ 8162B6C EventScript_162B76:: @ 8162B76 lockall textcolor 0 - setflag FLAG_0x002 + setflag FLAG_TEMP_2 applymovement 255, Movement_162D07 waitmovement 0 delay 20 @@ -66,17 +66,17 @@ EventScript_162B76:: @ 8162B76 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 goto_if_eq EventScript_162C68 - setflag FLAG_0x003 - setflag FLAG_0x005 + setflag FLAG_TEMP_3 + setflag FLAG_TEMP_5 savebgm MUS_WIN_GYM checkflag FLAG_0x844 call_if 0, EventScript_162C6F checkflag FLAG_0x844 call_if 1, EventScript_162C91 - setflag FLAG_0x004 - clearflag FLAG_0x005 + setflag FLAG_TEMP_4 + clearflag FLAG_TEMP_5 setflag FLAG_0x4BC - setflag FLAG_0x004 + setflag FLAG_TEMP_4 msgbox gUnknown_8178F2F playbgm MUS_SLOWMASARA, 0 addobject 2 diff --git a/data/maps/PokemonLeague_LancesRoom/scripts.inc b/data/maps/PokemonLeague_LancesRoom/scripts.inc index 295bf1b80..b331a8639 100644 --- a/data/maps/PokemonLeague_LancesRoom/scripts.inc +++ b/data/maps/PokemonLeague_LancesRoom/scripts.inc @@ -41,7 +41,7 @@ EventScript_162987:: @ 8162987 lockall applymovement 255, Movement_1629F1 waitmovement 0 - setflag FLAG_0x002 + setflag FLAG_TEMP_2 call EventScript_1629A8 playse SE_KI_GASYAN special DrawWholeMapView @@ -116,13 +116,13 @@ PokemonLeague_LancesRoom_EventScript_162A14:: @ 8162A14 call_if 0, EventScript_162A79 checkflag FLAG_SYS_GAME_CLEAR call_if 1, EventScript_162A82 - setflag FLAG_0x003 - setflag FLAG_0x005 + setflag FLAG_TEMP_3 + setflag FLAG_TEMP_5 checkflag FLAG_0x844 call_if 0, EventScript_162A8B checkflag FLAG_0x844 call_if 1, EventScript_162A96 - clearflag FLAG_0x005 + clearflag FLAG_TEMP_5 goto EventScript_162AAB EventScript_162A78:: @ 8162A78 diff --git a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc index 5356038e3..201b03fd2 100644 --- a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc +++ b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc @@ -67,13 +67,13 @@ PokemonLeague_LoreleisRoom_EventScript_1625DC:: @ 81625DC call_if 0, EventScript_162641 checkflag FLAG_0x844 call_if 1, EventScript_16264A - setflag FLAG_0x003 - setflag FLAG_0x005 + setflag FLAG_TEMP_3 + setflag FLAG_TEMP_5 checkflag FLAG_0x844 call_if 0, EventScript_162653 checkflag FLAG_0x844 call_if 1, EventScript_16265E - clearflag FLAG_0x005 + clearflag FLAG_TEMP_5 goto EventScript_162673 EventScript_162640:: @ 8162640 diff --git a/data/maps/PokemonTower_2F/map.json b/data/maps/PokemonTower_2F/map.json index 6b79803c0..a155ee492 100644 --- a/data/maps/PokemonTower_2F/map.json +++ b/data/maps/PokemonTower_2F/map.json @@ -24,7 +24,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "FLAG_0x051" + "flag": "FLAG_HIDE_TOWER_RIVAL" }, { "graphics_id": "MAP_OBJ_GFX_CHANNELER", diff --git a/data/maps/PokemonTower_7F/map.json b/data/maps/PokemonTower_7F/map.json index e6183274c..6e404c614 100644 --- a/data/maps/PokemonTower_7F/map.json +++ b/data/maps/PokemonTower_7F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_3", + "graphics_id": "MAP_OBJ_GFX_MR_FUJI", "x": 11, "y": 4, "elevation": 3, @@ -24,7 +24,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "PokemonTower_7F_EventScript_16355A", - "flag": "FLAG_0x034" + "flag": "FLAG_HIDE_TOWER_FUJI" }, { "graphics_id": "MAP_OBJ_GFX_ROCKET_M", @@ -37,7 +37,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, "script": "PokemonTower_7F_EventScript_163586", - "flag": "FLAG_0x05E" + "flag": "FLAG_HIDE_TOWER_ROCKET_1" }, { "graphics_id": "MAP_OBJ_GFX_ROCKET_M", @@ -50,7 +50,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, "script": "PokemonTower_7F_EventScript_16363D", - "flag": "FLAG_0x083" + "flag": "FLAG_HIDE_TOWER_ROCKET_2" }, { "graphics_id": "MAP_OBJ_GFX_ROCKET_M", @@ -63,7 +63,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, "script": "PokemonTower_7F_EventScript_1636D6", - "flag": "FLAG_0x084" + "flag": "FLAG_HIDE_TOWER_ROCKET_3" } ], "warp_events": [ diff --git a/data/maps/PokemonTower_7F/scripts.inc b/data/maps/PokemonTower_7F/scripts.inc index 396b408af..0947eedc5 100644 --- a/data/maps/PokemonTower_7F/scripts.inc +++ b/data/maps/PokemonTower_7F/scripts.inc @@ -7,8 +7,8 @@ PokemonTower_7F_EventScript_16355A:: @ 816355A setvar VAR_0x8004, 14 setvar VAR_0x8005, 2 special UpdatePickStateFromSpecialVar8005 - setflag FLAG_0x034 - clearflag FLAG_0x035 + setflag FLAG_HIDE_TOWER_FUJI + clearflag FLAG_HIDE_POKEHOUSE_FUJI setflag FLAG_0x23C msgbox gUnknown_817A529 closemessage diff --git a/data/maps/PowerPlant/map.json b/data/maps/PowerPlant/map.json index 1f9ab99eb..7c96c700d 100644 --- a/data/maps/PowerPlant/map.json +++ b/data/maps/PowerPlant/map.json @@ -89,7 +89,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "PowerPlant_EventScript_1637B8", - "flag": "FLAG_0x05D" + "flag": "FLAG_HIDE_ZAPDOS" }, { "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", diff --git a/data/maps/PowerPlant/scripts.inc b/data/maps/PowerPlant/scripts.inc index b70dc0f22..16c78d971 100644 --- a/data/maps/PowerPlant/scripts.inc +++ b/data/maps/PowerPlant/scripts.inc @@ -26,7 +26,7 @@ PowerPlant_MapScript2_16378D:: @ 816378D end EventScript_1637AC:: @ 81637AC - clearflag FLAG_0x05D + clearflag FLAG_HIDE_ZAPDOS return EventScript_1637B0:: @ 81637B0 diff --git a/data/maps/RockTunnel_B1F/map.json b/data/maps/RockTunnel_B1F/map.json index 709936b91..b6b6d424d 100644 --- a/data/maps/RockTunnel_B1F/map.json +++ b/data/maps/RockTunnel_B1F/map.json @@ -167,7 +167,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "RockTunnel_B1F_EventScript_1BE00C", - "flag": "FLAG_0x012" + "flag": "FLAG_TEMP_12" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -180,7 +180,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "RockTunnel_B1F_EventScript_1BE00C", - "flag": "FLAG_0x013" + "flag": "FLAG_TEMP_13" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -193,7 +193,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "RockTunnel_B1F_EventScript_1BE00C", - "flag": "FLAG_0x014" + "flag": "FLAG_TEMP_14" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -206,7 +206,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "RockTunnel_B1F_EventScript_1BE00C", - "flag": "FLAG_0x015" + "flag": "FLAG_TEMP_15" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -219,7 +219,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "RockTunnel_B1F_EventScript_1BE00C", - "flag": "FLAG_0x016" + "flag": "FLAG_TEMP_16" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -232,7 +232,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "RockTunnel_B1F_EventScript_1BE00C", - "flag": "FLAG_0x017" + "flag": "FLAG_TEMP_17" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -245,7 +245,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "RockTunnel_B1F_EventScript_1BE00C", - "flag": "FLAG_0x018" + "flag": "FLAG_TEMP_18" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -258,7 +258,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "RockTunnel_B1F_EventScript_1BE00C", - "flag": "FLAG_0x019" + "flag": "FLAG_TEMP_19" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -271,7 +271,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "RockTunnel_B1F_EventScript_1BE00C", - "flag": "FLAG_0x01A" + "flag": "FLAG_TEMP_1A" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -284,7 +284,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "RockTunnel_B1F_EventScript_1BE00C", - "flag": "FLAG_0x01B" + "flag": "FLAG_TEMP_1B" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -297,7 +297,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "RockTunnel_B1F_EventScript_1BE00C", - "flag": "FLAG_0x01C" + "flag": "FLAG_TEMP_1C" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -310,7 +310,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "RockTunnel_B1F_EventScript_1BE00C", - "flag": "FLAG_0x01D" + "flag": "FLAG_TEMP_1D" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -323,7 +323,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "RockTunnel_B1F_EventScript_1BE00C", - "flag": "FLAG_0x01E" + "flag": "FLAG_TEMP_1E" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -336,7 +336,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "RockTunnel_B1F_EventScript_1BE00C", - "flag": "FLAG_0x01F" + "flag": "FLAG_TEMP_1F" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -349,7 +349,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "RockTunnel_B1F_EventScript_1BE00C", - "flag": "FLAG_0x011" + "flag": "FLAG_TEMP_11" } ], "warp_events": [ diff --git a/data/maps/RocketHideout_B4F/map.json b/data/maps/RocketHideout_B4F/map.json index f41c5a420..8c4ad9b68 100644 --- a/data/maps/RocketHideout_B4F/map.json +++ b/data/maps/RocketHideout_B4F/map.json @@ -24,7 +24,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "RocketHideout_B4F_EventScript_161317", - "flag": "FLAG_0x038" + "flag": "FLAG_HIDE_HIDEOUT_GIOVANNI" }, { "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", @@ -37,7 +37,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "RocketHideout_B4F_EventScript_161363", - "flag": "FLAG_0x037" + "flag": "FLAG_HIDE_SILPH_SCOPE" }, { "graphics_id": "MAP_OBJ_GFX_ROCKET_M", @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "RocketHideout_B4F_EventScript_1613AD", - "flag": "FLAG_0x036" + "flag": "FLAG_HIDE_LIFT_KEY" }, { "graphics_id": "MAP_OBJ_GFX_ROCKET_M", diff --git a/data/maps/RocketHideout_B4F/scripts.inc b/data/maps/RocketHideout_B4F/scripts.inc index f5092c97c..38a680528 100644 --- a/data/maps/RocketHideout_B4F/scripts.inc +++ b/data/maps/RocketHideout_B4F/scripts.inc @@ -32,8 +32,8 @@ RocketHideout_B4F_EventScript_161317:: @ 8161317 closemessage removeobject 1 addobject 2 - clearflag FLAG_0x037 - setflag FLAG_0x05F + clearflag FLAG_HIDE_SILPH_SCOPE + setflag FLAG_HIDE_CELADON_ROCKETS setvar VAR_0x8004, 15 setvar VAR_0x8005, 2 special UpdatePickStateFromSpecialVar8005 @@ -60,7 +60,7 @@ RocketHideout_B4F_EventScript_161381:: @ 8161381 EventScript_16139D:: @ 816139D msgbox gUnknown_81754BD addobject 4 - clearflag FLAG_0x036 + clearflag FLAG_HIDE_LIFT_KEY release end diff --git a/data/maps/RocketHideout_Elevator/scripts.inc b/data/maps/RocketHideout_Elevator/scripts.inc index 884335234..0cf3b5b0b 100644 --- a/data/maps/RocketHideout_Elevator/scripts.inc +++ b/data/maps/RocketHideout_Elevator/scripts.inc @@ -6,7 +6,7 @@ RocketHideout_Elevator_EventScript_1614D9:: @ 81614D9 checkflag FLAG_0x2A5 goto_if 0, EventScript_16161B setvar VAR_0x8004, 2 - checkflag FLAG_0x002 + checkflag FLAG_TEMP_2 call_if 0, EventScript_1A7AB9 copyvar VAR_0x8005, VAR_0x403A special sub_80CB580 @@ -97,7 +97,7 @@ EventScript_16160E:: @ 816160E waitse special sub_80CB498 waitstate - setflag FLAG_0x002 + setflag FLAG_TEMP_2 return EventScript_16161B:: @ 816161B diff --git a/data/maps/Route10/map.json b/data/maps/Route10/map.json index ff05d885e..99698a4f3 100644 --- a/data/maps/Route10/map.json +++ b/data/maps/Route10/map.json @@ -113,7 +113,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route10_EventScript_1BDF13", - "flag": "FLAG_0x012" + "flag": "FLAG_TEMP_12" }, { "graphics_id": "MAP_OBJ_GFX_CUT_TREE", @@ -126,7 +126,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route10_EventScript_1BDF13", - "flag": "FLAG_0x013" + "flag": "FLAG_TEMP_13" }, { "graphics_id": "MAP_OBJ_GFX_CUT_TREE", @@ -139,7 +139,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route10_EventScript_1BDF13", - "flag": "FLAG_0x014" + "flag": "FLAG_TEMP_14" }, { "graphics_id": "MAP_OBJ_GFX_CUT_TREE", @@ -152,7 +152,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route10_EventScript_1BDF13", - "flag": "FLAG_0x015" + "flag": "FLAG_TEMP_15" } ], "warp_events": [ diff --git a/data/maps/Route10_PokemonCenter_2F/map.json b/data/maps/Route10_PokemonCenter_2F/map.json index a8e42604f..ba0d61e30 100644 --- a/data/maps/Route10_PokemonCenter_2F/map.json +++ b/data/maps/Route10_PokemonCenter_2F/map.json @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route10_PokemonCenter_2F_EventScript_1BB1D2", - "flag": "FLAG_0x070" + "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], "warp_events": [ diff --git a/data/maps/Route12/map.json b/data/maps/Route12/map.json index 9488352bc..00e154310 100644 --- a/data/maps/Route12/map.json +++ b/data/maps/Route12/map.json @@ -92,7 +92,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route12_EventScript_168014", - "flag": "FLAG_0x054" + "flag": "FLAG_HIDE_ROUTE_12_SNORLAX" }, { "graphics_id": "MAP_OBJ_GFX_ROCKER", @@ -144,7 +144,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route12_EventScript_1BDF13", - "flag": "FLAG_0x012" + "flag": "FLAG_TEMP_12" }, { "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", @@ -209,7 +209,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route12_EventScript_1BDF13", - "flag": "FLAG_0x013" + "flag": "FLAG_TEMP_13" } ], "warp_events": [ diff --git a/data/maps/Route12/scripts.inc b/data/maps/Route12/scripts.inc index 81be7952e..6d13a35f5 100644 --- a/data/maps/Route12/scripts.inc +++ b/data/maps/Route12/scripts.inc @@ -29,7 +29,7 @@ Route12_EventScript_168014:: @ 8168014 playmoncry SPECIES_SNORLAX, 2 delay 40 waitmoncry - setflag FLAG_0x054 + setflag FLAG_HIDE_ROUTE_12_SNORLAX setflag FLAG_0x807 setflag FLAG_0x253 dowildbattle diff --git a/data/maps/Route13/map.json b/data/maps/Route13/map.json index 215ad80ee..abf55d492 100644 --- a/data/maps/Route13/map.json +++ b/data/maps/Route13/map.json @@ -165,7 +165,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route13_EventScript_1BDF13", - "flag": "FLAG_0x012" + "flag": "FLAG_TEMP_12" } ], "warp_events": [], diff --git a/data/maps/Route14/map.json b/data/maps/Route14/map.json index 4537ad1d9..96f3048c8 100644 --- a/data/maps/Route14/map.json +++ b/data/maps/Route14/map.json @@ -165,7 +165,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route14_EventScript_1BDF13", - "flag": "FLAG_0x012" + "flag": "FLAG_TEMP_12" }, { "graphics_id": "MAP_OBJ_GFX_CUT_TREE", @@ -178,7 +178,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route14_EventScript_1BDF13", - "flag": "FLAG_0x013" + "flag": "FLAG_TEMP_13" }, { "graphics_id": "MAP_OBJ_GFX_CUT_TREE", @@ -191,7 +191,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route14_EventScript_1BDF13", - "flag": "FLAG_0x014" + "flag": "FLAG_TEMP_14" }, { "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", diff --git a/data/maps/Route16/map.json b/data/maps/Route16/map.json index 36e3a4fa0..8ba369942 100644 --- a/data/maps/Route16/map.json +++ b/data/maps/Route16/map.json @@ -113,7 +113,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route16_EventScript_1BDF13", - "flag": "FLAG_0x012" + "flag": "FLAG_TEMP_12" }, { "graphics_id": "MAP_OBJ_GFX_BEAUTY", diff --git a/data/maps/Route2/map.json b/data/maps/Route2/map.json index 4d68aacb4..8aca651aa 100644 --- a/data/maps/Route2/map.json +++ b/data/maps/Route2/map.json @@ -35,7 +35,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route2_EventScript_1BDF13", - "flag": "FLAG_0x014" + "flag": "FLAG_TEMP_14" }, { "graphics_id": "MAP_OBJ_GFX_CUT_TREE", @@ -48,7 +48,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route2_EventScript_1BDF13", - "flag": "FLAG_0x013" + "flag": "FLAG_TEMP_13" }, { "graphics_id": "MAP_OBJ_GFX_CUT_TREE", @@ -61,7 +61,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route2_EventScript_1BDF13", - "flag": "FLAG_0x015" + "flag": "FLAG_TEMP_15" }, { "graphics_id": "MAP_OBJ_GFX_CUT_TREE", @@ -74,7 +74,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route2_EventScript_1BDF13", - "flag": "FLAG_0x016" + "flag": "FLAG_TEMP_16" }, { "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", diff --git a/data/maps/Route20/scripts.inc b/data/maps/Route20/scripts.inc index d99bebdd7..f0f304435 100644 --- a/data/maps/Route20/scripts.inc +++ b/data/maps/Route20/scripts.inc @@ -10,23 +10,23 @@ Route20_MapScript1_168241:: @ 8168241 end EventScript_168254:: @ 8168254 - clearflag FLAG_0x040 - clearflag FLAG_0x041 - setflag FLAG_0x042 - setflag FLAG_0x043 - setflag FLAG_0x044 - setflag FLAG_0x045 - setflag FLAG_0x046 - setflag FLAG_0x047 + clearflag FLAG_HIDE_SEAFOAM_1F_BOULDER_1 + clearflag FLAG_HIDE_SEAFOAM_1F_BOULDER_2 + setflag FLAG_HIDE_SEAFOAM_B1F_BOULDER_1 + setflag FLAG_HIDE_SEAFOAM_B1F_BOULDER_2 + setflag FLAG_HIDE_SEAFOAM_B2F_BOULDER_1 + setflag FLAG_HIDE_SEAFOAM_B2F_BOULDER_2 + setflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_1 + setflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_2 return EventScript_16826D:: @ 816826D - clearflag FLAG_0x048 - clearflag FLAG_0x049 - clearflag FLAG_0x04A - clearflag FLAG_0x04B - setflag FLAG_0x04C - setflag FLAG_0x04D + clearflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_3 + clearflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_4 + clearflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_5 + clearflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_6 + setflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_1 + setflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_2 return Route20_EventScript_168280:: @ 8168280 diff --git a/data/maps/Route22/map.json b/data/maps/Route22/map.json index aef0d0936..1b3e558b4 100644 --- a/data/maps/Route22/map.json +++ b/data/maps/Route22/map.json @@ -35,7 +35,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "FLAG_0x04F" + "flag": "FLAG_HIDE_ROUTE_22_RIVAL" } ], "warp_events": [ diff --git a/data/maps/Route23/scripts.inc b/data/maps/Route23/scripts.inc index 9d94968bc..ed827114c 100644 --- a/data/maps/Route23/scripts.inc +++ b/data/maps/Route23/scripts.inc @@ -3,8 +3,8 @@ Route23_MapScripts:: @ 81684EB .byte 0 Route23_MapScript1_1684F1:: @ 81684F1 - clearflag FLAG_0x059 - setflag FLAG_0x058 + clearflag FLAG_HIDE_VICTORY_ROAD_3F_BOULDER + setflag FLAG_HIDE_VICTORY_ROAD_2F_BOULDER setvar VAR_MAP_SCENE_VICTORY_ROAD_1F, 0 setvar VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1, 0 setvar VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2, 0 diff --git a/data/maps/Route24/map.json b/data/maps/Route24/map.json index effe42476..5b541fbbc 100644 --- a/data/maps/Route24/map.json +++ b/data/maps/Route24/map.json @@ -35,7 +35,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route24_EventScript_168620", - "flag": "FLAG_0x031" + "flag": "FLAG_HIDE_NUGGET_BRIDGE_ROCKET" }, { "graphics_id": "MAP_OBJ_GFX_CAMPER", diff --git a/data/maps/Route25/map.json b/data/maps/Route25/map.json index 23f1cda54..72a66aded 100644 --- a/data/maps/Route25/map.json +++ b/data/maps/Route25/map.json @@ -160,7 +160,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route25_EventScript_1BDF13", - "flag": "FLAG_0x012" + "flag": "FLAG_TEMP_12" }, { "graphics_id": "MAP_OBJ_GFX_BEAUTY", diff --git a/data/maps/Route25_SeaCottage/map.json b/data/maps/Route25_SeaCottage/map.json index fc102e8e5..ac63be354 100644 --- a/data/maps/Route25_SeaCottage/map.json +++ b/data/maps/Route25_SeaCottage/map.json @@ -24,7 +24,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route25_SeaCottage_EventScript_17054B", - "flag": "FLAG_0x033" + "flag": "FLAG_HIDE_BILL_HUMAN_SEA_COTTAGE" }, { "graphics_id": "MAP_OBJ_GFX_CLEFAIRY", @@ -37,7 +37,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route25_SeaCottage_EventScript_17054B", - "flag": "FLAG_0x032" + "flag": "FLAG_HIDE_BILL_CLEFAIRY" } ], "warp_events": [ diff --git a/data/maps/Route25_SeaCottage/scripts.inc b/data/maps/Route25_SeaCottage/scripts.inc index d613b42a5..fb6df4c12 100644 --- a/data/maps/Route25_SeaCottage/scripts.inc +++ b/data/maps/Route25_SeaCottage/scripts.inc @@ -10,18 +10,18 @@ Route25_SeaCottage_MapScript1_170529:: @ 8170529 end EventScript_17053C:: @ 817053C - clearflag FLAG_0x032 + clearflag FLAG_HIDE_BILL_CLEFAIRY setobjectxyperm 1, 3, 3 return EventScript_170547:: @ 8170547 - setflag FLAG_0x003 + setflag FLAG_TEMP_3 return Route25_SeaCottage_EventScript_17054B:: @ 817054B lock faceplayer - checkflag FLAG_0x003 + checkflag FLAG_TEMP_3 goto_if_eq EventScript_1706C8 checkflag FLAG_0x234 goto_if_eq EventScript_170640 @@ -66,7 +66,7 @@ EventScript_17059C:: @ 817059C playse SE_C_MAKU_D closedoor 10, 3 waitdooranim - setflag FLAG_0x002 + setflag FLAG_TEMP_2 release end @@ -116,7 +116,7 @@ EventScript_17064A:: @ 817064A additem ITEM_SS_TICKET, 1 giveitemfanfaremsg gUnknown_81A028E, ITEM_SS_TICKET, 1, MUS_FAN5 setflag FLAG_0x235 - setflag FLAG_0x031 + setflag FLAG_HIDE_NUGGET_BRIDGE_ROCKET setflag FLAG_0x234 setflag FLAG_SYS_NOT_SOMEONES_PC goto EventScript_170640 @@ -159,9 +159,9 @@ Movement_1706DB:: @ 81706DB Route25_SeaCottage_EventScript_1706DD:: @ 81706DD lockall - checkflag FLAG_0x003 + checkflag FLAG_TEMP_3 goto_if_eq EventScript_1707CA - checkflag FLAG_0x002 + checkflag FLAG_TEMP_2 goto_if_eq EventScript_1706FA msgbox gUnknown_81A0402 releaseall @@ -171,7 +171,7 @@ EventScript_1706FA:: @ 81706FA fadeoutbgm 0 msgbox gUnknown_81A042D closemessage - clearflag FLAG_0x002 + clearflag FLAG_TEMP_2 setflag FLAG_0x233 special SpawnScriptFieldObject applymovement 127, Movement_1707BE @@ -203,7 +203,7 @@ EventScript_1706FA:: @ 81706FA waitdooranim fadeinbgm 0 addobject 1 - clearflag FLAG_0x033 + clearflag FLAG_HIDE_BILL_HUMAN_SEA_COTTAGE delay 50 playfanfare MUS_FANFA1 applymovement 1, Movement_170888 diff --git a/data/maps/Route4_PokemonCenter_2F/map.json b/data/maps/Route4_PokemonCenter_2F/map.json index a7ebc2c26..a4189df66 100644 --- a/data/maps/Route4_PokemonCenter_2F/map.json +++ b/data/maps/Route4_PokemonCenter_2F/map.json @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route4_PokemonCenter_2F_EventScript_1BB1D2", - "flag": "FLAG_0x070" + "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], "warp_events": [ diff --git a/data/maps/Route8/map.json b/data/maps/Route8/map.json index 500a3abd4..5f7952d0f 100644 --- a/data/maps/Route8/map.json +++ b/data/maps/Route8/map.json @@ -152,7 +152,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route8_EventScript_1BDF13", - "flag": "FLAG_0x012" + "flag": "FLAG_TEMP_12" }, { "graphics_id": "MAP_OBJ_GFX_CUT_TREE", @@ -165,7 +165,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route8_EventScript_1BDF13", - "flag": "FLAG_0x013" + "flag": "FLAG_TEMP_13" }, { "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", diff --git a/data/maps/Route9/map.json b/data/maps/Route9/map.json index 9a49d9314..128766a3f 100644 --- a/data/maps/Route9/map.json +++ b/data/maps/Route9/map.json @@ -152,7 +152,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route9_EventScript_1BDF13", - "flag": "FLAG_0x012" + "flag": "FLAG_TEMP_12" }, { "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", diff --git a/data/maps/SSAnne_2F_Corridor/map.json b/data/maps/SSAnne_2F_Corridor/map.json index f763d00f9..b45106629 100644 --- a/data/maps/SSAnne_2F_Corridor/map.json +++ b/data/maps/SSAnne_2F_Corridor/map.json @@ -24,7 +24,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "FLAG_0x03D" + "flag": "FLAG_HIDE_SS_ANNE_RIVAL" }, { "graphics_id": "MAP_OBJ_GFX_SAILOR", diff --git a/data/maps/SaffronCity/map.json b/data/maps/SaffronCity/map.json index 9eb079d11..a6b49f6b4 100644 --- a/data/maps/SaffronCity/map.json +++ b/data/maps/SaffronCity/map.json @@ -46,7 +46,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SaffronCity_EventScript_16737A", - "flag": "FLAG_0x03E" + "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_ROCKET_M", @@ -59,7 +59,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SaffronCity_EventScript_167383", - "flag": "FLAG_0x03E" + "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_ROCKET_M", @@ -72,7 +72,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SaffronCity_EventScript_16738C", - "flag": "FLAG_0x03E" + "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_ROCKET_M", @@ -85,7 +85,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SaffronCity_EventScript_167395", - "flag": "FLAG_0x03E" + "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_ROCKET_M", @@ -98,7 +98,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SaffronCity_EventScript_16739E", - "flag": "FLAG_0x03E" + "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_ROCKET_M", @@ -111,7 +111,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SaffronCity_EventScript_1673B9", - "flag": "FLAG_0x03E" + "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_ROCKET_M", @@ -124,7 +124,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SaffronCity_EventScript_1673B0", - "flag": "FLAG_0x03E" + "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_ROCKET_M", @@ -137,7 +137,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SaffronCity_EventScript_1673A7", - "flag": "FLAG_0x03E" + "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", @@ -150,7 +150,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SaffronCity_EventScript_1673EC", - "flag": "FLAG_0x03F" + "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" }, { "graphics_id": "MAP_OBJ_GFX_WORKER_M", @@ -163,7 +163,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SaffronCity_EventScript_1673E3", - "flag": "FLAG_0x03F" + "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" }, { "graphics_id": "MAP_OBJ_GFX_MAN", @@ -176,7 +176,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SaffronCity_EventScript_16741A", - "flag": "FLAG_0x03F" + "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" }, { "graphics_id": "MAP_OBJ_GFX_BOY", @@ -189,7 +189,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SaffronCity_EventScript_1673FE", - "flag": "FLAG_0x03F" + "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" }, { "graphics_id": "MAP_OBJ_GFX_PIDGEOT", @@ -202,7 +202,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SaffronCity_EventScript_167407", - "flag": "FLAG_0x03F" + "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" }, { "graphics_id": "MAP_OBJ_GFX_LASS", @@ -215,7 +215,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SaffronCity_EventScript_1673F5", - "flag": "FLAG_0x03F" + "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" }, { "graphics_id": "MAP_OBJ_GFX_BATTLE_GIRL", diff --git a/data/maps/SaffronCity_Dojo/map.json b/data/maps/SaffronCity_Dojo/map.json index 5830f52e9..91bf8e662 100644 --- a/data/maps/SaffronCity_Dojo/map.json +++ b/data/maps/SaffronCity_Dojo/map.json @@ -89,7 +89,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SaffronCity_Dojo_EventScript_16EC00", - "flag": "FLAG_0x060" + "flag": "FLAG_HIDE_DOJO_HITMONLEE_BALL" }, { "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", @@ -102,7 +102,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SaffronCity_Dojo_EventScript_16EC46", - "flag": "FLAG_0x061" + "flag": "FLAG_HIDE_DOJO_HITMONCHAN_BALL" } ], "warp_events": [ diff --git a/data/maps/SaffronCity_PokemonCenter_2F/map.json b/data/maps/SaffronCity_PokemonCenter_2F/map.json index a093c38f1..dd7076a54 100644 --- a/data/maps/SaffronCity_PokemonCenter_2F/map.json +++ b/data/maps/SaffronCity_PokemonCenter_2F/map.json @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SaffronCity_PokemonCenter_2F_EventScript_1BB1D2", - "flag": "FLAG_0x070" + "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], "warp_events": [ diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json index 07a8cfa61..a87ec7f39 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json @@ -76,7 +76,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F45D", - "flag": "FLAG_0x06E" + "flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_WOMAN" }, { "graphics_id": "MAP_OBJ_GFX_ROCKER", @@ -89,7 +89,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F4BF", - "flag": "FLAG_0x06D" + "flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_ROCKER" }, { "graphics_id": "MAP_OBJ_GFX_BEAUTY", @@ -102,7 +102,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F521", - "flag": "FLAG_0x06F" + "flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_BEAUTY" }, { "graphics_id": "MAP_OBJ_GFX_BLACKBELT", @@ -115,7 +115,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F583", - "flag": "FLAG_0x06C" + "flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_BLACKBELT" }, { "graphics_id": "MAP_OBJ_GFX_RED_NORMAL", diff --git a/data/maps/SeafoamIslands_1F/map.json b/data/maps/SeafoamIslands_1F/map.json index 96bc7f42a..15aec6bd0 100644 --- a/data/maps/SeafoamIslands_1F/map.json +++ b/data/maps/SeafoamIslands_1F/map.json @@ -24,7 +24,7 @@ "trainer_type": 66, "trainer_sight_or_berry_tree_id": 0, "script": "SeafoamIslands_1F_EventScript_1BE11D", - "flag": "FLAG_0x040" + "flag": "FLAG_HIDE_SEAFOAM_1F_BOULDER_1" }, { "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", @@ -37,7 +37,7 @@ "trainer_type": 67, "trainer_sight_or_berry_tree_id": 0, "script": "SeafoamIslands_1F_EventScript_1BE11D", - "flag": "FLAG_0x041" + "flag": "FLAG_HIDE_SEAFOAM_1F_BOULDER_2" }, { "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", diff --git a/data/maps/SeafoamIslands_B1F/map.json b/data/maps/SeafoamIslands_B1F/map.json index 1cbfd79ec..4d4d60c97 100644 --- a/data/maps/SeafoamIslands_B1F/map.json +++ b/data/maps/SeafoamIslands_B1F/map.json @@ -24,7 +24,7 @@ "trainer_type": 68, "trainer_sight_or_berry_tree_id": 0, "script": "SeafoamIslands_B1F_EventScript_1BE11D", - "flag": "FLAG_0x042" + "flag": "FLAG_HIDE_SEAFOAM_B1F_BOULDER_1" }, { "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", @@ -37,7 +37,7 @@ "trainer_type": 69, "trainer_sight_or_berry_tree_id": 0, "script": "SeafoamIslands_B1F_EventScript_1BE11D", - "flag": "FLAG_0x043" + "flag": "FLAG_HIDE_SEAFOAM_B1F_BOULDER_2" }, { "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", diff --git a/data/maps/SeafoamIslands_B2F/map.json b/data/maps/SeafoamIslands_B2F/map.json index af9c18c1d..337484bf5 100644 --- a/data/maps/SeafoamIslands_B2F/map.json +++ b/data/maps/SeafoamIslands_B2F/map.json @@ -24,7 +24,7 @@ "trainer_type": 70, "trainer_sight_or_berry_tree_id": 0, "script": "SeafoamIslands_B2F_EventScript_1BE11D", - "flag": "FLAG_0x044" + "flag": "FLAG_HIDE_SEAFOAM_B2F_BOULDER_1" }, { "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", @@ -37,7 +37,7 @@ "trainer_type": 71, "trainer_sight_or_berry_tree_id": 0, "script": "SeafoamIslands_B2F_EventScript_1BE11D", - "flag": "FLAG_0x045" + "flag": "FLAG_HIDE_SEAFOAM_B2F_BOULDER_2" }, { "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", diff --git a/data/maps/SeafoamIslands_B3F/map.json b/data/maps/SeafoamIslands_B3F/map.json index 82b9e86f0..a4e068fd6 100644 --- a/data/maps/SeafoamIslands_B3F/map.json +++ b/data/maps/SeafoamIslands_B3F/map.json @@ -24,7 +24,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "FLAG_0x046" + "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_1" }, { "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", @@ -37,7 +37,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "FLAG_0x047" + "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_2" }, { "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", @@ -50,7 +50,7 @@ "trainer_type": 77, "trainer_sight_or_berry_tree_id": 0, "script": "SeafoamIslands_B3F_EventScript_1BE11D", - "flag": "FLAG_0x04A" + "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_5" }, { "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SeafoamIslands_B3F_EventScript_1BE11D", - "flag": "FLAG_0x04B" + "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_6" }, { "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", @@ -76,7 +76,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SeafoamIslands_B3F_EventScript_1BE11D", - "flag": "FLAG_0x049" + "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_4" }, { "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", @@ -89,7 +89,7 @@ "trainer_type": 76, "trainer_sight_or_berry_tree_id": 0, "script": "SeafoamIslands_B3F_EventScript_1BE11D", - "flag": "FLAG_0x048" + "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_3" } ], "warp_events": [ diff --git a/data/maps/SeafoamIslands_B3F/scripts.inc b/data/maps/SeafoamIslands_B3F/scripts.inc index e54e7ceb7..bc906077b 100644 --- a/data/maps/SeafoamIslands_B3F/scripts.inc +++ b/data/maps/SeafoamIslands_B3F/scripts.inc @@ -12,9 +12,9 @@ SeafoamIslands_B3F_MapScript1_162F5A:: @ 8162F5A EventScript_162F6D:: @ 8162F6D setvar VAR_0x4002, 0 - checkflag FLAG_0x046 + checkflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_1 call_if 0, EventScript_162FF0 - checkflag FLAG_0x047 + checkflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_2 call_if 0, EventScript_162FF0 compare_var_to_value VAR_0x4002, 2 call_if 1, EventScript_162F90 @@ -35,9 +35,9 @@ SeafoamIslands_B3F_MapScript2_162F98:: @ 8162F98 EventScript_162FA2:: @ 8162FA2 lockall setvar VAR_0x4002, 0 - checkflag FLAG_0x046 + checkflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_1 call_if 0, EventScript_162FF0 - checkflag FLAG_0x047 + checkflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_2 call_if 0, EventScript_162FF0 compare_var_to_value VAR_0x4002, 2 goto_if_eq EventScript_16300C diff --git a/data/maps/SeafoamIslands_B4F/map.json b/data/maps/SeafoamIslands_B4F/map.json index 3425a67d9..fbe5eced0 100644 --- a/data/maps/SeafoamIslands_B4F/map.json +++ b/data/maps/SeafoamIslands_B4F/map.json @@ -24,7 +24,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "FLAG_0x04C" + "flag": "FLAG_HIDE_SEAFOAM_B4F_BOULDER_1" }, { "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", @@ -37,7 +37,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "FLAG_0x04D" + "flag": "FLAG_HIDE_SEAFOAM_B4F_BOULDER_2" }, { "graphics_id": "MAP_OBJ_GFX_ARTICUNO", diff --git a/data/maps/SeafoamIslands_B4F/scripts.inc b/data/maps/SeafoamIslands_B4F/scripts.inc index c0bcc1196..9a41408c3 100644 --- a/data/maps/SeafoamIslands_B4F/scripts.inc +++ b/data/maps/SeafoamIslands_B4F/scripts.inc @@ -29,9 +29,9 @@ SeafoamIslands_B4F_MapScript1_163066:: @ 8163066 EventScript_163082:: @ 8163082 setvar VAR_0x4002, 0 - checkflag FLAG_0x04C + checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_1 call_if 0, EventScript_163169 - checkflag FLAG_0x04D + checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_2 call_if 0, EventScript_163169 compare_var_to_value VAR_0x4002, 2 call_if 1, EventScript_1630A5 @@ -51,9 +51,9 @@ EventScript_1630AD:: @ 81630AD SeafoamIslands_B4F_MapScript3_1630B1:: @ 81630B1 setvar VAR_0x4002, 0 - checkflag FLAG_0x04C + checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_1 call_if 0, EventScript_163169 - checkflag FLAG_0x04D + checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_2 call_if 0, EventScript_163169 compare_var_to_value VAR_0x4002, 2 goto_if_eq EventScript_1630D4 @@ -95,9 +95,9 @@ Movement_16311D:: @ 816311D EventScript_163121:: @ 8163121 lockall setvar VAR_0x4002, 0 - checkflag FLAG_0x04C + checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_1 call_if 0, EventScript_163169 - checkflag FLAG_0x04D + checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_2 call_if 0, EventScript_163169 compare_var_to_value VAR_0x4002, 2 goto_if_eq EventScript_163185 diff --git a/data/maps/SevenIsland_PokemonCenter_2F/map.json b/data/maps/SevenIsland_PokemonCenter_2F/map.json index 55aeabf03..9817d6ff1 100644 --- a/data/maps/SevenIsland_PokemonCenter_2F/map.json +++ b/data/maps/SevenIsland_PokemonCenter_2F/map.json @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_PokemonCenter_2F_EventScript_1BB1D2", - "flag": "FLAG_0x070" + "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], "warp_events": [ diff --git a/data/maps/SevenIsland_SevaultCanyon/map.json b/data/maps/SevenIsland_SevaultCanyon/map.json index ca6441141..ba0ce481c 100644 --- a/data/maps/SevenIsland_SevaultCanyon/map.json +++ b/data/maps/SevenIsland_SevaultCanyon/map.json @@ -139,7 +139,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_SevaultCanyon_EventScript_1BE00C", - "flag": "FLAG_0x012" + "flag": "FLAG_TEMP_12" }, { "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", @@ -165,7 +165,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_SevaultCanyon_EventScript_1BE00C", - "flag": "FLAG_0x013" + "flag": "FLAG_TEMP_13" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -178,7 +178,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_SevaultCanyon_EventScript_1BE00C", - "flag": "FLAG_0x015" + "flag": "FLAG_TEMP_15" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -191,7 +191,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_SevaultCanyon_EventScript_1BE00C", - "flag": "FLAG_0x016" + "flag": "FLAG_TEMP_16" }, { "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", @@ -204,7 +204,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_SevaultCanyon_EventScript_1BE00C", - "flag": "FLAG_0x017" + "flag": "FLAG_TEMP_17" }, { "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", @@ -230,7 +230,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_SevaultCanyon_EventScript_1BE00C", - "flag": "FLAG_0x01B" + "flag": "FLAG_TEMP_1B" }, { "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", diff --git a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc index ed5f0d95d..82bdfc411 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc @@ -3,7 +3,7 @@ SevenIsland_SevaultCanyon_House_MapScripts:: @ 8172182 SevenIsland_SevaultCanyon_House_EventScript_172183:: @ 8172183 lock - checkflag FLAG_0x002 + checkflag FLAG_TEMP_2 goto_if_eq EventScript_172211 playbgm MUS_P_SCHOOL, 0 applymovement 1, Movement_172231 @@ -30,7 +30,7 @@ SevenIsland_SevaultCanyon_House_EventScript_172183:: @ 8172183 delay 30 call EventScript_1A6C26 msgbox gUnknown_81A4DF5 - setflag FLAG_0x002 + setflag FLAG_TEMP_2 release end diff --git a/data/maps/SevenIsland_TrainerTower_1F/map.json b/data/maps/SevenIsland_TrainerTower_1F/map.json index 727e5af6e..8340ada47 100644 --- a/data/maps/SevenIsland_TrainerTower_1F/map.json +++ b/data/maps/SevenIsland_TrainerTower_1F/map.json @@ -24,7 +24,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "FLAG_0x006" + "flag": "FLAG_TEMP_6" }, { "graphics_id": "MAP_OBJ_GFX_VAR_0", @@ -37,7 +37,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_1F_EventScript_1646C8", - "flag": "FLAG_0x002" + "flag": "FLAG_TEMP_2" }, { "graphics_id": "MAP_OBJ_GFX_VAR_1", @@ -50,7 +50,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_1F_EventScript_1646CE", - "flag": "FLAG_0x003" + "flag": "FLAG_TEMP_3" }, { "graphics_id": "MAP_OBJ_GFX_VAR_2", @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_1F_EventScript_1646D4", - "flag": "FLAG_0x004" + "flag": "FLAG_TEMP_4" }, { "graphics_id": "MAP_OBJ_GFX_VAR_3", @@ -76,7 +76,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_1F_EventScript_1646DA", - "flag": "FLAG_0x005" + "flag": "FLAG_TEMP_5" } ], "warp_events": [ diff --git a/data/maps/SevenIsland_TrainerTower_2F/map.json b/data/maps/SevenIsland_TrainerTower_2F/map.json index e36264bbe..3cab31165 100644 --- a/data/maps/SevenIsland_TrainerTower_2F/map.json +++ b/data/maps/SevenIsland_TrainerTower_2F/map.json @@ -24,7 +24,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_2F_EventScript_1646E0", - "flag": "FLAG_0x006" + "flag": "FLAG_TEMP_6" }, { "graphics_id": "MAP_OBJ_GFX_VAR_0", @@ -37,7 +37,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_2F_EventScript_1646C8", - "flag": "FLAG_0x002" + "flag": "FLAG_TEMP_2" }, { "graphics_id": "MAP_OBJ_GFX_VAR_1", @@ -50,7 +50,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_2F_EventScript_1646CE", - "flag": "FLAG_0x003" + "flag": "FLAG_TEMP_3" }, { "graphics_id": "MAP_OBJ_GFX_VAR_2", @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_2F_EventScript_1646D4", - "flag": "FLAG_0x004" + "flag": "FLAG_TEMP_4" }, { "graphics_id": "MAP_OBJ_GFX_VAR_3", @@ -76,7 +76,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_2F_EventScript_1646DA", - "flag": "FLAG_0x005" + "flag": "FLAG_TEMP_5" } ], "warp_events": [ diff --git a/data/maps/SevenIsland_TrainerTower_3F/map.json b/data/maps/SevenIsland_TrainerTower_3F/map.json index 4fa7b638e..32b53f781 100644 --- a/data/maps/SevenIsland_TrainerTower_3F/map.json +++ b/data/maps/SevenIsland_TrainerTower_3F/map.json @@ -24,7 +24,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_3F_EventScript_1646E0", - "flag": "FLAG_0x006" + "flag": "FLAG_TEMP_6" }, { "graphics_id": "MAP_OBJ_GFX_VAR_0", @@ -37,7 +37,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_3F_EventScript_1646C8", - "flag": "FLAG_0x002" + "flag": "FLAG_TEMP_2" }, { "graphics_id": "MAP_OBJ_GFX_VAR_1", @@ -50,7 +50,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_3F_EventScript_1646CE", - "flag": "FLAG_0x003" + "flag": "FLAG_TEMP_3" }, { "graphics_id": "MAP_OBJ_GFX_VAR_2", @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_3F_EventScript_1646D4", - "flag": "FLAG_0x004" + "flag": "FLAG_TEMP_4" }, { "graphics_id": "MAP_OBJ_GFX_VAR_3", @@ -76,7 +76,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_3F_EventScript_1646DA", - "flag": "FLAG_0x005" + "flag": "FLAG_TEMP_5" } ], "warp_events": [ diff --git a/data/maps/SevenIsland_TrainerTower_4F/map.json b/data/maps/SevenIsland_TrainerTower_4F/map.json index 76436506e..cfb7f97c7 100644 --- a/data/maps/SevenIsland_TrainerTower_4F/map.json +++ b/data/maps/SevenIsland_TrainerTower_4F/map.json @@ -24,7 +24,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_4F_EventScript_1646E0", - "flag": "FLAG_0x006" + "flag": "FLAG_TEMP_6" }, { "graphics_id": "MAP_OBJ_GFX_VAR_0", @@ -37,7 +37,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_4F_EventScript_1646C8", - "flag": "FLAG_0x002" + "flag": "FLAG_TEMP_2" }, { "graphics_id": "MAP_OBJ_GFX_VAR_1", @@ -50,7 +50,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_4F_EventScript_1646CE", - "flag": "FLAG_0x003" + "flag": "FLAG_TEMP_3" }, { "graphics_id": "MAP_OBJ_GFX_VAR_2", @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_4F_EventScript_1646D4", - "flag": "FLAG_0x004" + "flag": "FLAG_TEMP_4" }, { "graphics_id": "MAP_OBJ_GFX_VAR_3", @@ -76,7 +76,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_4F_EventScript_1646DA", - "flag": "FLAG_0x005" + "flag": "FLAG_TEMP_5" } ], "warp_events": [ diff --git a/data/maps/SevenIsland_TrainerTower_5F/map.json b/data/maps/SevenIsland_TrainerTower_5F/map.json index ed02f71d1..7aae856d4 100644 --- a/data/maps/SevenIsland_TrainerTower_5F/map.json +++ b/data/maps/SevenIsland_TrainerTower_5F/map.json @@ -24,7 +24,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_5F_EventScript_1646E0", - "flag": "FLAG_0x006" + "flag": "FLAG_TEMP_6" }, { "graphics_id": "MAP_OBJ_GFX_VAR_0", @@ -37,7 +37,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_5F_EventScript_1646C8", - "flag": "FLAG_0x002" + "flag": "FLAG_TEMP_2" }, { "graphics_id": "MAP_OBJ_GFX_VAR_1", @@ -50,7 +50,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_5F_EventScript_1646CE", - "flag": "FLAG_0x003" + "flag": "FLAG_TEMP_3" }, { "graphics_id": "MAP_OBJ_GFX_VAR_2", @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_5F_EventScript_1646D4", - "flag": "FLAG_0x004" + "flag": "FLAG_TEMP_4" }, { "graphics_id": "MAP_OBJ_GFX_VAR_3", @@ -76,7 +76,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_5F_EventScript_1646DA", - "flag": "FLAG_0x005" + "flag": "FLAG_TEMP_5" } ], "warp_events": [ diff --git a/data/maps/SevenIsland_TrainerTower_6F/map.json b/data/maps/SevenIsland_TrainerTower_6F/map.json index c3bb44867..6c9ab9fa5 100644 --- a/data/maps/SevenIsland_TrainerTower_6F/map.json +++ b/data/maps/SevenIsland_TrainerTower_6F/map.json @@ -24,7 +24,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_6F_EventScript_1646E0", - "flag": "FLAG_0x006" + "flag": "FLAG_TEMP_6" }, { "graphics_id": "MAP_OBJ_GFX_VAR_0", @@ -37,7 +37,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_6F_EventScript_1646C8", - "flag": "FLAG_0x002" + "flag": "FLAG_TEMP_2" }, { "graphics_id": "MAP_OBJ_GFX_VAR_1", @@ -50,7 +50,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_6F_EventScript_1646CE", - "flag": "FLAG_0x003" + "flag": "FLAG_TEMP_3" }, { "graphics_id": "MAP_OBJ_GFX_VAR_2", @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_6F_EventScript_1646D4", - "flag": "FLAG_0x004" + "flag": "FLAG_TEMP_4" }, { "graphics_id": "MAP_OBJ_GFX_VAR_3", @@ -76,7 +76,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_6F_EventScript_1646DA", - "flag": "FLAG_0x005" + "flag": "FLAG_TEMP_5" } ], "warp_events": [ diff --git a/data/maps/SevenIsland_TrainerTower_7F/map.json b/data/maps/SevenIsland_TrainerTower_7F/map.json index 749911494..e3984966b 100644 --- a/data/maps/SevenIsland_TrainerTower_7F/map.json +++ b/data/maps/SevenIsland_TrainerTower_7F/map.json @@ -24,7 +24,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_7F_EventScript_1646E0", - "flag": "FLAG_0x006" + "flag": "FLAG_TEMP_6" }, { "graphics_id": "MAP_OBJ_GFX_VAR_0", @@ -37,7 +37,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_7F_EventScript_1646C8", - "flag": "FLAG_0x002" + "flag": "FLAG_TEMP_2" }, { "graphics_id": "MAP_OBJ_GFX_VAR_1", @@ -50,7 +50,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_7F_EventScript_1646CE", - "flag": "FLAG_0x003" + "flag": "FLAG_TEMP_3" }, { "graphics_id": "MAP_OBJ_GFX_VAR_2", @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_7F_EventScript_1646D4", - "flag": "FLAG_0x004" + "flag": "FLAG_TEMP_4" }, { "graphics_id": "MAP_OBJ_GFX_VAR_3", @@ -76,7 +76,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_7F_EventScript_1646DA", - "flag": "FLAG_0x005" + "flag": "FLAG_TEMP_5" } ], "warp_events": [ diff --git a/data/maps/SevenIsland_TrainerTower_8F/map.json b/data/maps/SevenIsland_TrainerTower_8F/map.json index 64563e4cc..c83e9128b 100644 --- a/data/maps/SevenIsland_TrainerTower_8F/map.json +++ b/data/maps/SevenIsland_TrainerTower_8F/map.json @@ -24,7 +24,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_8F_EventScript_1646E0", - "flag": "FLAG_0x006" + "flag": "FLAG_TEMP_6" }, { "graphics_id": "MAP_OBJ_GFX_VAR_0", @@ -37,7 +37,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_8F_EventScript_1646C8", - "flag": "FLAG_0x002" + "flag": "FLAG_TEMP_2" }, { "graphics_id": "MAP_OBJ_GFX_VAR_1", @@ -50,7 +50,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_8F_EventScript_1646CE", - "flag": "FLAG_0x003" + "flag": "FLAG_TEMP_3" }, { "graphics_id": "MAP_OBJ_GFX_VAR_2", @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_8F_EventScript_1646D4", - "flag": "FLAG_0x004" + "flag": "FLAG_TEMP_4" }, { "graphics_id": "MAP_OBJ_GFX_VAR_3", @@ -76,7 +76,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_8F_EventScript_1646DA", - "flag": "FLAG_0x005" + "flag": "FLAG_TEMP_5" } ], "warp_events": [ diff --git a/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc b/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc index de508c706..0a82a7f24 100644 --- a/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc @@ -6,7 +6,7 @@ SevenIsland_TrainerTower_Elevator_MapScripts:: @ 8164AF8 SevenIsland_TrainerTower_Elevator_EventScript_164B03:: @ 8164B03 lockall setvar VAR_0x8004, 6 - checkflag FLAG_0x002 + checkflag FLAG_TEMP_2 call_if 0, EventScript_1A7AB9 copyvar VAR_0x8005, VAR_0x403A special sub_80CB580 @@ -68,7 +68,7 @@ EventScript_164BD8:: @ 8164BD8 waitse special sub_80CB498 waitstate - setflag FLAG_0x002 + setflag FLAG_TEMP_2 return Movement_164BE5:: @ 8164BE5 diff --git a/data/maps/SevenIsland_TrainerTower_Roof/map.json b/data/maps/SevenIsland_TrainerTower_Roof/map.json index 473ffbb68..4fb265a15 100644 --- a/data/maps/SevenIsland_TrainerTower_Roof/map.json +++ b/data/maps/SevenIsland_TrainerTower_Roof/map.json @@ -24,7 +24,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_Roof_EventScript_1646E0", - "flag": "FLAG_0x006" + "flag": "FLAG_TEMP_6" } ], "warp_events": [ diff --git a/data/maps/SilphCo_10F/map.json b/data/maps/SilphCo_10F/map.json index 61e37007b..734a1281b 100644 --- a/data/maps/SilphCo_10F/map.json +++ b/data/maps/SilphCo_10F/map.json @@ -24,7 +24,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, "script": "SilphCo_10F_EventScript_161DC0", - "flag": "FLAG_0x053" + "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_WORKER_F", @@ -50,7 +50,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, "script": "SilphCo_10F_EventScript_161DD7", - "flag": "FLAG_0x053" + "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", diff --git a/data/maps/SilphCo_11F/map.json b/data/maps/SilphCo_11F/map.json index 5ee4065e9..0533712db 100644 --- a/data/maps/SilphCo_11F/map.json +++ b/data/maps/SilphCo_11F/map.json @@ -50,7 +50,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "FLAG_0x053" + "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_ROCKET_M", @@ -63,7 +63,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, "script": "SilphCo_11F_EventScript_161F40", - "flag": "FLAG_0x053" + "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", @@ -89,7 +89,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, "script": "SilphCo_11F_EventScript_161F57", - "flag": "FLAG_0x053" + "flag": "FLAG_HIDE_SILPH_ROCKETS" } ], "warp_events": [ diff --git a/data/maps/SilphCo_11F/scripts.inc b/data/maps/SilphCo_11F/scripts.inc index 47b720f5c..f29d06787 100644 --- a/data/maps/SilphCo_11F/scripts.inc +++ b/data/maps/SilphCo_11F/scripts.inc @@ -86,8 +86,8 @@ EventScript_161EA0:: @ 8161EA0 removeobject 6 fadescreen 0 setvar VAR_MAP_SCENE_SILPH_CO_11F, 1 - setflag FLAG_0x03E - clearflag FLAG_0x03F + setflag FLAG_HIDE_SAFFRON_ROCKETS + clearflag FLAG_HIDE_SAFFRON_CIVILIANS releaseall end diff --git a/data/maps/SilphCo_1F/map.json b/data/maps/SilphCo_1F/map.json index b054dfe80..1adffa9bf 100644 --- a/data/maps/SilphCo_1F/map.json +++ b/data/maps/SilphCo_1F/map.json @@ -24,7 +24,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SilphCo_1F_EventScript_16162F", - "flag": "FLAG_0x03F" + "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" } ], "warp_events": [ diff --git a/data/maps/SilphCo_2F/map.json b/data/maps/SilphCo_2F/map.json index d6c62a776..8859599c9 100644 --- a/data/maps/SilphCo_2F/map.json +++ b/data/maps/SilphCo_2F/map.json @@ -24,7 +24,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, "script": "SilphCo_2F_EventScript_1616AE", - "flag": "FLAG_0x053" + "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_SCIENTIST", @@ -37,7 +37,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, "script": "SilphCo_2F_EventScript_161680", - "flag": "FLAG_0x053" + "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_ROCKET_M", @@ -50,7 +50,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, "script": "SilphCo_2F_EventScript_161697", - "flag": "FLAG_0x053" + "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_SCIENTIST", @@ -63,7 +63,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 0, "script": "SilphCo_2F_EventScript_161669", - "flag": "FLAG_0x053" + "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_WOMAN_2", diff --git a/data/maps/SilphCo_3F/map.json b/data/maps/SilphCo_3F/map.json index b1e95071d..248c96651 100644 --- a/data/maps/SilphCo_3F/map.json +++ b/data/maps/SilphCo_3F/map.json @@ -24,7 +24,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, "script": "SilphCo_3F_EventScript_16171F", - "flag": "FLAG_0x053" + "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_WORKER_M", @@ -50,7 +50,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 0, "script": "SilphCo_3F_EventScript_161708", - "flag": "FLAG_0x053" + "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", diff --git a/data/maps/SilphCo_4F/map.json b/data/maps/SilphCo_4F/map.json index 65150b0ef..3fbca5be2 100644 --- a/data/maps/SilphCo_4F/map.json +++ b/data/maps/SilphCo_4F/map.json @@ -24,7 +24,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, "script": "SilphCo_4F_EventScript_1617A7", - "flag": "FLAG_0x053" + "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_ROCKET_M", @@ -37,7 +37,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, "script": "SilphCo_4F_EventScript_161790", - "flag": "FLAG_0x053" + "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_SCIENTIST", @@ -50,7 +50,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, "script": "SilphCo_4F_EventScript_161779", - "flag": "FLAG_0x053" + "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_WORKER_M", diff --git a/data/maps/SilphCo_5F/map.json b/data/maps/SilphCo_5F/map.json index 33808bb0b..01fcc8406 100644 --- a/data/maps/SilphCo_5F/map.json +++ b/data/maps/SilphCo_5F/map.json @@ -24,7 +24,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, "script": "SilphCo_5F_EventScript_161853", - "flag": "FLAG_0x053" + "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_ROCKER", @@ -37,7 +37,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, "script": "SilphCo_5F_EventScript_16186A", - "flag": "FLAG_0x053" + "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_WORKER_M", @@ -63,7 +63,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, "script": "SilphCo_5F_EventScript_161825", - "flag": "FLAG_0x053" + "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_ROCKET_M", @@ -76,7 +76,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, "script": "SilphCo_5F_EventScript_16183C", - "flag": "FLAG_0x053" + "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", diff --git a/data/maps/SilphCo_6F/map.json b/data/maps/SilphCo_6F/map.json index f9f43b61e..01467b3b9 100644 --- a/data/maps/SilphCo_6F/map.json +++ b/data/maps/SilphCo_6F/map.json @@ -24,7 +24,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, "script": "SilphCo_6F_EventScript_161956", - "flag": "FLAG_0x053" + "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_WORKER_M", @@ -102,7 +102,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, "script": "SilphCo_6F_EventScript_16193F", - "flag": "FLAG_0x053" + "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", @@ -141,7 +141,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, "script": "SilphCo_6F_EventScript_16196D", - "flag": "FLAG_0x053" + "flag": "FLAG_HIDE_SILPH_ROCKETS" } ], "warp_events": [ diff --git a/data/maps/SilphCo_7F/map.json b/data/maps/SilphCo_7F/map.json index 7b92929e3..fd9e05ed6 100644 --- a/data/maps/SilphCo_7F/map.json +++ b/data/maps/SilphCo_7F/map.json @@ -24,7 +24,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "FLAG_0x04E" + "flag": "FLAG_HIDE_SILPH_RIVAL" }, { "graphics_id": "MAP_OBJ_GFX_WORKER_M", @@ -50,7 +50,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, "script": "SilphCo_7F_EventScript_161C1A", - "flag": "FLAG_0x053" + "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_ROCKET_M", @@ -63,7 +63,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, "script": "SilphCo_7F_EventScript_161C31", - "flag": "FLAG_0x053" + "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_ROCKET_M", @@ -76,7 +76,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, "script": "SilphCo_7F_EventScript_161C48", - "flag": "FLAG_0x053" + "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_WORKER_F", @@ -128,7 +128,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, "script": "SilphCo_7F_EventScript_161C03", - "flag": "FLAG_0x053" + "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", diff --git a/data/maps/SilphCo_8F/map.json b/data/maps/SilphCo_8F/map.json index 2f06fce10..3c7962e3a 100644 --- a/data/maps/SilphCo_8F/map.json +++ b/data/maps/SilphCo_8F/map.json @@ -24,7 +24,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, "script": "SilphCo_8F_EventScript_161CB0", - "flag": "FLAG_0x053" + "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_ROCKET_M", @@ -37,7 +37,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, "script": "SilphCo_8F_EventScript_161CC7", - "flag": "FLAG_0x053" + "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_SCIENTIST", @@ -50,7 +50,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, "script": "SilphCo_8F_EventScript_161C99", - "flag": "FLAG_0x053" + "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_WORKER_M", diff --git a/data/maps/SilphCo_9F/map.json b/data/maps/SilphCo_9F/map.json index fa79b9017..0a7043cbe 100644 --- a/data/maps/SilphCo_9F/map.json +++ b/data/maps/SilphCo_9F/map.json @@ -24,7 +24,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, "script": "SilphCo_9F_EventScript_161D41", - "flag": "FLAG_0x053" + "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_ROCKET_M", @@ -37,7 +37,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, "script": "SilphCo_9F_EventScript_161D6F", - "flag": "FLAG_0x053" + "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { "graphics_id": "MAP_OBJ_GFX_WOMAN_2", @@ -63,7 +63,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, "script": "SilphCo_9F_EventScript_161D58", - "flag": "FLAG_0x053" + "flag": "FLAG_HIDE_SILPH_ROCKETS" } ], "warp_events": [ diff --git a/data/maps/SilphCo_Elevator/scripts.inc b/data/maps/SilphCo_Elevator/scripts.inc index d36334429..f20ffa8c0 100644 --- a/data/maps/SilphCo_Elevator/scripts.inc +++ b/data/maps/SilphCo_Elevator/scripts.inc @@ -4,7 +4,7 @@ SilphCo_Elevator_MapScripts:: @ 8161F6E SilphCo_Elevator_EventScript_161F6F:: @ 8161F6F lockall setvar VAR_0x8004, 1 - checkflag FLAG_0x002 + checkflag FLAG_TEMP_2 call_if 0, EventScript_1A7AB9 copyvar VAR_0x8005, VAR_0x403A special sub_80CB580 @@ -173,5 +173,5 @@ EventScript_1621EC:: @ 81621EC waitse special sub_80CB498 waitstate - setflag FLAG_0x002 + setflag FLAG_TEMP_2 return diff --git a/data/maps/SixIsland_PokemonCenter_2F/map.json b/data/maps/SixIsland_PokemonCenter_2F/map.json index 3adcd4e33..bf48ee91c 100644 --- a/data/maps/SixIsland_PokemonCenter_2F/map.json +++ b/data/maps/SixIsland_PokemonCenter_2F/map.json @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SixIsland_PokemonCenter_2F_EventScript_1BB1D2", - "flag": "FLAG_0x070" + "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], "warp_events": [ diff --git a/data/maps/ThreeIsland/map.json b/data/maps/ThreeIsland/map.json index 674f2260f..fe7fe4243 100644 --- a/data/maps/ThreeIsland/map.json +++ b/data/maps/ThreeIsland/map.json @@ -35,7 +35,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "ThreeIsland_EventScript_1677E5", - "flag": "FLAG_0x07E" + "flag": "FLAG_HIDE_THREE_ISLAND_ANTIBIKERS" }, { "graphics_id": "MAP_OBJ_GFX_MAN", @@ -48,7 +48,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "ThreeIsland_EventScript_167989", - "flag": "FLAG_0x07E" + "flag": "FLAG_HIDE_THREE_ISLAND_ANTIBIKERS" }, { "graphics_id": "MAP_OBJ_GFX_BIKER", @@ -74,7 +74,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "ThreeIsland_EventScript_1677D8", - "flag": "FLAG_0x079" + "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" }, { "graphics_id": "MAP_OBJ_GFX_BIKER", @@ -87,7 +87,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "ThreeIsland_EventScript_1677D8", - "flag": "FLAG_0x079" + "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" }, { "graphics_id": "MAP_OBJ_GFX_BIKER", @@ -100,7 +100,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "ThreeIsland_EventScript_1677D8", - "flag": "FLAG_0x079" + "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" }, { "graphics_id": "MAP_OBJ_GFX_BIKER", @@ -113,7 +113,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "ThreeIsland_EventScript_1677D8", - "flag": "FLAG_0x079" + "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" }, { "graphics_id": "MAP_OBJ_GFX_BIKER", @@ -126,7 +126,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "ThreeIsland_EventScript_1677D8", - "flag": "FLAG_0x079" + "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" }, { "graphics_id": "MAP_OBJ_GFX_CUT_TREE", @@ -139,7 +139,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "ThreeIsland_EventScript_1BDF13", - "flag": "FLAG_0x012" + "flag": "FLAG_TEMP_12" }, { "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", @@ -204,7 +204,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "ThreeIsland_EventScript_167CA5", - "flag": "FLAG_0x079" + "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" } ], "warp_events": [ diff --git a/data/maps/ThreeIsland/scripts.inc b/data/maps/ThreeIsland/scripts.inc index 78d532795..eaa84fb15 100644 --- a/data/maps/ThreeIsland/scripts.inc +++ b/data/maps/ThreeIsland/scripts.inc @@ -11,7 +11,7 @@ ThreeIsland_MapScript1_1677B3:: @ 81677B3 end EventScript_1677CB:: @ 81677CB - setflag FLAG_0x07E + setflag FLAG_HIDE_THREE_ISLAND_ANTIBIKERS return EventScript_1677CF:: @ 81677CF diff --git a/data/maps/ThreeIsland_BerryForest/map.json b/data/maps/ThreeIsland_BerryForest/map.json index bedd0a8b5..9eb128545 100644 --- a/data/maps/ThreeIsland_BerryForest/map.json +++ b/data/maps/ThreeIsland_BerryForest/map.json @@ -24,7 +24,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "ThreeIsland_BerryForest_EventScript_163C83", - "flag": "FLAG_0x07A" + "flag": "FLAG_HIDE_LOSTELLE_IN_BERRY_FOREST" }, { "graphics_id": "MAP_OBJ_GFX_CUT_TREE", @@ -37,7 +37,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "ThreeIsland_BerryForest_EventScript_1BDF13", - "flag": "FLAG_0x012" + "flag": "FLAG_TEMP_12" }, { "graphics_id": "MAP_OBJ_GFX_CUT_TREE", @@ -50,7 +50,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "ThreeIsland_BerryForest_EventScript_1BDF13", - "flag": "FLAG_0x013" + "flag": "FLAG_TEMP_13" }, { "graphics_id": "MAP_OBJ_GFX_CUT_TREE", @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "ThreeIsland_BerryForest_EventScript_1BDF13", - "flag": "FLAG_0x014" + "flag": "FLAG_TEMP_14" }, { "graphics_id": "MAP_OBJ_GFX_CUT_TREE", @@ -76,7 +76,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "ThreeIsland_BerryForest_EventScript_1BDF13", - "flag": "FLAG_0x015" + "flag": "FLAG_TEMP_15" }, { "graphics_id": "MAP_OBJ_GFX_CUT_TREE", @@ -89,7 +89,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "ThreeIsland_BerryForest_EventScript_1BDF13", - "flag": "FLAG_0x016" + "flag": "FLAG_TEMP_16" }, { "graphics_id": "MAP_OBJ_GFX_CUT_TREE", @@ -102,7 +102,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "ThreeIsland_BerryForest_EventScript_1BDF13", - "flag": "FLAG_0x017" + "flag": "FLAG_TEMP_17" }, { "graphics_id": "MAP_OBJ_GFX_CUT_TREE", @@ -115,7 +115,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "ThreeIsland_BerryForest_EventScript_1BDF13", - "flag": "FLAG_0x018" + "flag": "FLAG_TEMP_18" }, { "graphics_id": "MAP_OBJ_GFX_CUT_TREE", @@ -128,7 +128,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "ThreeIsland_BerryForest_EventScript_1BDF13", - "flag": "FLAG_0x019" + "flag": "FLAG_TEMP_19" }, { "graphics_id": "MAP_OBJ_GFX_CUT_TREE", @@ -141,7 +141,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "ThreeIsland_BerryForest_EventScript_1BDF13", - "flag": "FLAG_0x01A" + "flag": "FLAG_TEMP_1A" }, { "graphics_id": "MAP_OBJ_GFX_CUT_TREE", @@ -154,7 +154,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "ThreeIsland_BerryForest_EventScript_1BDF13", - "flag": "FLAG_0x01B" + "flag": "FLAG_TEMP_1B" }, { "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", diff --git a/data/maps/ThreeIsland_BerryForest/scripts.inc b/data/maps/ThreeIsland_BerryForest/scripts.inc index ec85582ef..b57c94f1d 100644 --- a/data/maps/ThreeIsland_BerryForest/scripts.inc +++ b/data/maps/ThreeIsland_BerryForest/scripts.inc @@ -36,9 +36,9 @@ ThreeIsland_BerryForest_EventScript_163C83:: @ 8163C83 msgbox gUnknown_817AF3B closemessage setflag FLAG_0x2A3 - setflag FLAG_0x07A + setflag FLAG_HIDE_LOSTELLE_IN_BERRY_FOREST setvar VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 2 - clearflag FLAG_0x075 + clearflag FLAG_HIDE_TWO_ISLAND_GAME_CORNER_LOSTELLE warp MAP_TWO_ISLAND_JOYFUL_GAME_CORNER, 255, 6, 6 waitstate release diff --git a/data/maps/ThreeIsland_BondBridge/map.json b/data/maps/ThreeIsland_BondBridge/map.json index 087c7807f..82b3ba10e 100644 --- a/data/maps/ThreeIsland_BondBridge/map.json +++ b/data/maps/ThreeIsland_BondBridge/map.json @@ -121,7 +121,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "ThreeIsland_BondBridge_EventScript_1BDF13", - "flag": "FLAG_0x012" + "flag": "FLAG_TEMP_12" }, { "graphics_id": "MAP_OBJ_GFX_CUT_TREE", @@ -134,7 +134,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "ThreeIsland_BondBridge_EventScript_1BDF13", - "flag": "FLAG_0x013" + "flag": "FLAG_TEMP_13" } ], "warp_events": [ diff --git a/data/maps/ThreeIsland_House1/map.json b/data/maps/ThreeIsland_House1/map.json index 45b59e396..e21901499 100644 --- a/data/maps/ThreeIsland_House1/map.json +++ b/data/maps/ThreeIsland_House1/map.json @@ -24,7 +24,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "ThreeIsland_House1_EventScript_17181A", - "flag": "FLAG_0x076" + "flag": "FLAG_HIDE_LOSTELLE_IN_HER_HOME" } ], "warp_events": [ diff --git a/data/maps/ThreeIsland_PokemonCenter_2F/map.json b/data/maps/ThreeIsland_PokemonCenter_2F/map.json index e2392fb7d..bb174d2f2 100644 --- a/data/maps/ThreeIsland_PokemonCenter_2F/map.json +++ b/data/maps/ThreeIsland_PokemonCenter_2F/map.json @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "ThreeIsland_PokemonCenter_2F_EventScript_1BB1D2", - "flag": "FLAG_0x070" + "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], "warp_events": [ diff --git a/data/maps/ThreeIsland_Port/map.json b/data/maps/ThreeIsland_Port/map.json index e33cf3e1f..e49bb1224 100644 --- a/data/maps/ThreeIsland_Port/map.json +++ b/data/maps/ThreeIsland_Port/map.json @@ -43,7 +43,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "ThreeIsland_Port_EventScript_1687CC", - "flag": "FLAG_0x079" + "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" }, { "graphics_id": "MAP_OBJ_GFX_BIKER", @@ -56,7 +56,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "ThreeIsland_Port_EventScript_1687D5", - "flag": "FLAG_0x079" + "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" } ], "warp_events": [ diff --git a/data/maps/TwoIsland/map.json b/data/maps/TwoIsland/map.json index ce882f5ed..ebbabf5c1 100644 --- a/data/maps/TwoIsland/map.json +++ b/data/maps/TwoIsland/map.json @@ -43,7 +43,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "TwoIsland_EventScript_167755", - "flag": "FLAG_0x07B" + "flag": "FLAG_HIDE_TWO_ISLAND_WOMAN" }, { "graphics_id": "MAP_OBJ_GFX_BEAUTY", @@ -56,7 +56,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "TwoIsland_EventScript_16775E", - "flag": "FLAG_0x07C" + "flag": "FLAG_HIDE_TWO_ISLAND_BEAUTY" }, { "graphics_id": "MAP_OBJ_GFX_SAILOR", @@ -82,7 +82,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "TwoIsland_EventScript_167777", - "flag": "FLAG_0x07D" + "flag": "FLAG_HIDE_TWO_ISLAND_SUPER_NERD" }, { "graphics_id": "MAP_OBJ_GFX_CUT_TREE", @@ -95,7 +95,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "TwoIsland_EventScript_1BDF13", - "flag": "FLAG_0x012" + "flag": "FLAG_TEMP_12" }, { "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", diff --git a/data/maps/TwoIsland/scripts.inc b/data/maps/TwoIsland/scripts.inc index 9ccc7f1f5..5e7753ea9 100644 --- a/data/maps/TwoIsland/scripts.inc +++ b/data/maps/TwoIsland/scripts.inc @@ -54,17 +54,17 @@ EventScript_1675EE:: @ 81675EE EventScript_1675F4:: @ 81675F4 setvar VAR_MAP_SCENE_TWO_ISLAND, 2 - clearflag FLAG_0x07B + clearflag FLAG_HIDE_TWO_ISLAND_WOMAN return EventScript_1675FD:: @ 81675FD setvar VAR_MAP_SCENE_TWO_ISLAND, 3 - clearflag FLAG_0x07C + clearflag FLAG_HIDE_TWO_ISLAND_BEAUTY return EventScript_167606:: @ 8167606 setvar VAR_MAP_SCENE_TWO_ISLAND, 4 - clearflag FLAG_0x07D + clearflag FLAG_HIDE_TWO_ISLAND_SUPER_NERD return TwoIsland_EventScript_16760F:: @ 816760F diff --git a/data/maps/TwoIsland_House/scripts.inc b/data/maps/TwoIsland_House/scripts.inc index 0f940dd39..87c9a8583 100644 --- a/data/maps/TwoIsland_House/scripts.inc +++ b/data/maps/TwoIsland_House/scripts.inc @@ -8,13 +8,13 @@ TwoIsland_House_EventScript_171619:: @ 8171619 special sub_8112364 lock faceplayer - clearflag FLAG_0x002 - clearflag FLAG_0x003 - clearflag FLAG_0x004 - checkflag FLAG_0x001 + clearflag FLAG_TEMP_2 + clearflag FLAG_TEMP_3 + clearflag FLAG_TEMP_4 + checkflag FLAG_TEMP_1 goto_if_eq EventScript_17164F msgbox gUnknown_81A2B88 - setflag FLAG_0x001 + setflag FLAG_TEMP_1 goto EventScript_17164F end @@ -25,21 +25,21 @@ EventScript_17164F:: @ 817164F checkitem ITEM_TINY_MUSHROOM, 2 compare_var_to_value VAR_RESULT, 1 call_if 1, EventScript_1717AC - checkflag FLAG_0x002 + checkflag FLAG_TEMP_2 goto_if_eq EventScript_171687 - checkflag FLAG_0x003 + checkflag FLAG_TEMP_3 goto_if_eq EventScript_171696 goto EventScript_17179E end EventScript_171687:: @ 8171687 - checkflag FLAG_0x003 + checkflag FLAG_TEMP_3 call_if 1, EventScript_1717B0 goto EventScript_1716A5 end EventScript_171696:: @ 8171696 - checkflag FLAG_0x002 + checkflag FLAG_TEMP_2 call_if 1, EventScript_1717B0 goto EventScript_1716A5 end @@ -71,11 +71,11 @@ EventScript_1716F4:: @ 81716F4 waitstate compare_var_to_value VAR_0x8004, 0 goto_if_eq EventScript_1716BE - checkflag FLAG_0x004 + checkflag FLAG_TEMP_4 goto_if_eq EventScript_17175B - checkflag FLAG_0x002 + checkflag FLAG_TEMP_2 goto_if_eq EventScript_171727 - checkflag FLAG_0x003 + checkflag FLAG_TEMP_3 goto_if_eq EventScript_171741 end @@ -120,13 +120,13 @@ EventScript_17179E:: @ 817179E end EventScript_1717A8:: @ 81717A8 - setflag FLAG_0x002 + setflag FLAG_TEMP_2 return EventScript_1717AC:: @ 81717AC - setflag FLAG_0x003 + setflag FLAG_TEMP_3 return EventScript_1717B0:: @ 81717B0 - setflag FLAG_0x004 + setflag FLAG_TEMP_4 return diff --git a/data/maps/TwoIsland_JoyfulGameCorner/map.json b/data/maps/TwoIsland_JoyfulGameCorner/map.json index 7f49f334a..fd3c9fac2 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/map.json +++ b/data/maps/TwoIsland_JoyfulGameCorner/map.json @@ -37,7 +37,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "FLAG_0x074" + "flag": "FLAG_HIDE_TWO_ISLAND_GAME_CORNER_BIKER" }, { "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", @@ -50,7 +50,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "TwoIsland_JoyfulGameCorner_EventScript_17160C", - "flag": "FLAG_0x075" + "flag": "FLAG_HIDE_TWO_ISLAND_GAME_CORNER_LOSTELLE" }, { "graphics_id": "MAP_OBJ_GFX_MAN", diff --git a/data/maps/TwoIsland_PokemonCenter_2F/map.json b/data/maps/TwoIsland_PokemonCenter_2F/map.json index f42e4f729..43f5eb4ad 100644 --- a/data/maps/TwoIsland_PokemonCenter_2F/map.json +++ b/data/maps/TwoIsland_PokemonCenter_2F/map.json @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "TwoIsland_PokemonCenter_2F_EventScript_1BB1D2", - "flag": "FLAG_0x070" + "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], "warp_events": [ diff --git a/data/maps/UnknownMap_00_04/map.json b/data/maps/UnknownMap_00_04/map.json index 770988fc8..3c0340f01 100644 --- a/data/maps/UnknownMap_00_04/map.json +++ b/data/maps/UnknownMap_00_04/map.json @@ -37,7 +37,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "UnknownMap_00_04_EventScript_1604DA", - "flag": "FLAG_0x066" + "flag": "FLAG_HIDE_UNION_ROOM_4" }, { "graphics_id": "MAP_OBJ_GFX_VAR_7", @@ -50,7 +50,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "UnknownMap_00_04_EventScript_160502", - "flag": "FLAG_0x06A" + "flag": "FLAG_HIDE_UNION_ROOM_8" }, { "graphics_id": "MAP_OBJ_GFX_VAR_6", @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "UnknownMap_00_04_EventScript_1604F8", - "flag": "FLAG_0x069" + "flag": "FLAG_HIDE_UNION_ROOM_7" }, { "graphics_id": "MAP_OBJ_GFX_VAR_5", @@ -76,7 +76,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "UnknownMap_00_04_EventScript_1604EE", - "flag": "FLAG_0x068" + "flag": "FLAG_HIDE_UNION_ROOM_6" }, { "graphics_id": "MAP_OBJ_GFX_VAR_4", @@ -89,7 +89,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "UnknownMap_00_04_EventScript_1604E4", - "flag": "FLAG_0x067" + "flag": "FLAG_HIDE_UNION_ROOM_5" }, { "graphics_id": "MAP_OBJ_GFX_VAR_2", @@ -102,7 +102,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "UnknownMap_00_04_EventScript_1604D0", - "flag": "FLAG_0x065" + "flag": "FLAG_HIDE_UNION_ROOM_3" }, { "graphics_id": "MAP_OBJ_GFX_VAR_1", @@ -115,7 +115,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "UnknownMap_00_04_EventScript_1604C6", - "flag": "FLAG_0x064" + "flag": "FLAG_HIDE_UNION_ROOM_2" }, { "graphics_id": "MAP_OBJ_GFX_VAR_0", @@ -128,7 +128,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "UnknownMap_00_04_EventScript_1604BC", - "flag": "FLAG_0x063" + "flag": "FLAG_HIDE_UNION_ROOM_1" } ], "warp_events": [ diff --git a/data/maps/UnknownMap_00_04/scripts.inc b/data/maps/UnknownMap_00_04/scripts.inc index 94056b155..0358b7d8a 100644 --- a/data/maps/UnknownMap_00_04/scripts.inc +++ b/data/maps/UnknownMap_00_04/scripts.inc @@ -4,14 +4,14 @@ UnknownMap_00_04_MapScripts:: @ 816047C .byte 0 UnknownMap_00_04_MapScript1_160487:: @ 8160487 - setflag FLAG_0x063 - setflag FLAG_0x064 - setflag FLAG_0x065 - setflag FLAG_0x066 - setflag FLAG_0x067 - setflag FLAG_0x068 - setflag FLAG_0x069 - setflag FLAG_0x06A + setflag FLAG_HIDE_UNION_ROOM_1 + setflag FLAG_HIDE_UNION_ROOM_2 + setflag FLAG_HIDE_UNION_ROOM_3 + setflag FLAG_HIDE_UNION_ROOM_4 + setflag FLAG_HIDE_UNION_ROOM_5 + setflag FLAG_HIDE_UNION_ROOM_6 + setflag FLAG_HIDE_UNION_ROOM_7 + setflag FLAG_HIDE_UNION_ROOM_8 removeobject 9 removeobject 8 removeobject 7 diff --git a/data/maps/VermilionCity/map.json b/data/maps/VermilionCity/map.json index 41805e39f..6299cc2e3 100644 --- a/data/maps/VermilionCity/map.json +++ b/data/maps/VermilionCity/map.json @@ -113,7 +113,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "VermilionCity_EventScript_1BDF13", - "flag": "FLAG_0x012" + "flag": "FLAG_TEMP_12" }, { "graphics_id": "MAP_OBJ_GFX_SCIENTIST", diff --git a/data/maps/VermilionCity_Gym/scripts.inc b/data/maps/VermilionCity_Gym/scripts.inc index 4ea4afc22..57bdfd280 100644 --- a/data/maps/VermilionCity_Gym/scripts.inc +++ b/data/maps/VermilionCity_Gym/scripts.inc @@ -4,7 +4,7 @@ VermilionCity_Gym_MapScripts:: @ 816B69E .byte 0 VermilionCity_Gym_MapScript1_16B6A9:: @ 816B6A9 - checkflag FLAG_0x001 + checkflag FLAG_TEMP_1 call_if 1, EventScript_16B6BC checkflag FLAG_0x264 call_if 1, EventScript_16B717 @@ -147,7 +147,7 @@ EventScript_16B843:: @ 816B843 copyvar VAR_0x8005, VAR_0x4001 checkflag FLAG_0x264 goto_if_eq EventScript_16B8E5 - checkflag FLAG_0x001 + checkflag FLAG_TEMP_1 goto_if_eq EventScript_16B89E compare_var_to_var VAR_0x8004, VAR_0x8008 goto_if_eq EventScript_16B885 @@ -161,7 +161,7 @@ EventScript_16B885:: @ 816B885 waitse call EventScript_16B6BC special DrawWholeMapView - setflag FLAG_0x001 + setflag FLAG_TEMP_1 releaseall end @@ -169,7 +169,7 @@ EventScript_16B89E:: @ 816B89E compare_var_to_var VAR_0x8005, VAR_0x8008 goto_if_eq EventScript_16B8CB msgbox gUnknown_819536C - clearflag FLAG_0x001 + clearflag FLAG_TEMP_1 special sub_80CADEC copyvar VAR_0x4000, VAR_0x8004 copyvar VAR_0x4001, VAR_0x8005 diff --git a/data/maps/VermilionCity_PokemonCenter_2F/map.json b/data/maps/VermilionCity_PokemonCenter_2F/map.json index 0b2a3a580..789cc891a 100644 --- a/data/maps/VermilionCity_PokemonCenter_2F/map.json +++ b/data/maps/VermilionCity_PokemonCenter_2F/map.json @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "VermilionCity_PokemonCenter_2F_EventScript_1BB1D2", - "flag": "FLAG_0x070" + "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], "warp_events": [ diff --git a/data/maps/VermilionCity_PokemonFanClub/scripts.inc b/data/maps/VermilionCity_PokemonFanClub/scripts.inc index 691cc9963..b0bffc017 100644 --- a/data/maps/VermilionCity_PokemonFanClub/scripts.inc +++ b/data/maps/VermilionCity_PokemonFanClub/scripts.inc @@ -55,13 +55,13 @@ EventScript_16B511:: @ 816B511 VermilionCity_PokemonFanClub_EventScript_16B528:: @ 816B528 lock faceplayer - checkflag FLAG_0x003 + checkflag FLAG_TEMP_3 goto_if_eq EventScript_16B54B msgbox gUnknown_81944CC closemessage applymovement 5, Movement_1A75E5 waitmovement 0 - setflag FLAG_0x002 + setflag FLAG_TEMP_2 release end @@ -70,20 +70,20 @@ EventScript_16B54B:: @ 816B54B closemessage applymovement 5, Movement_1A75E5 waitmovement 0 - clearflag FLAG_0x003 + clearflag FLAG_TEMP_3 release end VermilionCity_PokemonFanClub_EventScript_16B563:: @ 816B563 lock faceplayer - checkflag FLAG_0x002 + checkflag FLAG_TEMP_2 goto_if_eq EventScript_16B586 msgbox gUnknown_819446F closemessage applymovement 6, Movement_1A75E5 waitmovement 0 - setflag FLAG_0x003 + setflag FLAG_TEMP_3 release end @@ -92,7 +92,7 @@ EventScript_16B586:: @ 816B586 closemessage applymovement 6, Movement_1A75E5 waitmovement 0 - clearflag FLAG_0x002 + clearflag FLAG_TEMP_2 release end diff --git a/data/maps/VictoryRoad_2F/map.json b/data/maps/VictoryRoad_2F/map.json index ec7650c44..1917174e5 100644 --- a/data/maps/VictoryRoad_2F/map.json +++ b/data/maps/VictoryRoad_2F/map.json @@ -167,7 +167,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "VictoryRoad_2F_EventScript_1BE11D", - "flag": "FLAG_0x058" + "flag": "FLAG_HIDE_VICTORY_ROAD_2F_BOULDER" }, { "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", diff --git a/data/maps/VictoryRoad_3F/map.json b/data/maps/VictoryRoad_3F/map.json index bf95bfae9..97b9f117e 100644 --- a/data/maps/VictoryRoad_3F/map.json +++ b/data/maps/VictoryRoad_3F/map.json @@ -115,7 +115,7 @@ "trainer_type": 88, "trainer_sight_or_berry_tree_id": 0, "script": "VictoryRoad_3F_EventScript_1BE11D", - "flag": "FLAG_0x059" + "flag": "FLAG_HIDE_VICTORY_ROAD_3F_BOULDER" }, { "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", diff --git a/data/maps/ViridianCity/map.json b/data/maps/ViridianCity/map.json index 469bdb963..6c52616d8 100644 --- a/data/maps/ViridianCity/map.json +++ b/data/maps/ViridianCity/map.json @@ -53,7 +53,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "ViridianCity_EventScript_1BDF13", - "flag": "FLAG_0x011" + "flag": "FLAG_TEMP_11" }, { "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", @@ -131,7 +131,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "ViridianCity_EventScript_1BDF13", - "flag": "FLAG_0x012" + "flag": "FLAG_TEMP_12" }, { "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", diff --git a/data/maps/ViridianCity_Gym/map.json b/data/maps/ViridianCity_Gym/map.json index e1cdba88a..5f500d229 100644 --- a/data/maps/ViridianCity_Gym/map.json +++ b/data/maps/ViridianCity_Gym/map.json @@ -115,7 +115,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "ViridianCity_Gym_EventScript_169ECA", - "flag": "FLAG_0x055" + "flag": "FLAG_HIDE_VIRIDIAN_GIOVANNI" }, { "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", diff --git a/data/maps/ViridianCity_PokemonCenter_2F/map.json b/data/maps/ViridianCity_PokemonCenter_2F/map.json index 5e1824f85..3711140e9 100644 --- a/data/maps/ViridianCity_PokemonCenter_2F/map.json +++ b/data/maps/ViridianCity_PokemonCenter_2F/map.json @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "ViridianCity_PokemonCenter_2F_EventScript_1BB1D2", - "flag": "FLAG_0x070" + "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], "warp_events": [ diff --git a/include/constants/flags.h b/include/constants/flags.h index 3cf229ffb..4578c4ac3 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -3,261 +3,264 @@ // TODO: Get correct names and numbers -#define FLAG_0x001 0x1 -#define FLAG_0x002 0x2 -#define FLAG_0x003 0x3 -#define FLAG_0x004 0x4 -#define FLAG_0x005 0x5 -#define FLAG_0x006 0x6 -#define FLAG_0x007 0x7 -#define FLAG_0x008 0x8 -#define FLAG_0x009 0x9 -#define FLAG_0x00A 0xA -#define FLAG_0x00B 0xB -#define FLAG_0x00C 0xC -#define FLAG_0x00D 0xD -#define FLAG_0x00E 0xE -#define FLAG_0x00F 0xF -#define FLAG_0x010 0x10 -#define FLAG_0x011 0x11 -#define FLAG_0x012 0x12 -#define FLAG_0x013 0x13 -#define FLAG_0x014 0x14 -#define FLAG_0x015 0x15 -#define FLAG_0x016 0x16 -#define FLAG_0x017 0x17 -#define FLAG_0x018 0x18 -#define FLAG_0x019 0x19 -#define FLAG_0x01A 0x1A -#define FLAG_0x01B 0x1B -#define FLAG_0x01C 0x1C -#define FLAG_0x01D 0x1D -#define FLAG_0x01E 0x1E -#define FLAG_0x01F 0x1F -#define FLAG_0x020 0x20 -#define FLAG_0x021 0x21 -#define FLAG_0x022 0x22 -#define FLAG_0x023 0x23 -#define FLAG_0x024 0x24 -#define FLAG_0x025 0x25 -#define FLAG_0x026 0x26 -#define FLAG_0x027 0x27 -#define FLAG_0x028 0x28 -#define FLAG_0x029 0x29 -#define FLAG_0x02A 0x2A -#define FLAG_0x02B 0x2B -#define FLAG_0x02C 0x2C -#define FLAG_0x02D 0x2D -#define FLAG_0x02E 0x2E -#define FLAG_0x02F 0x2F -#define FLAG_0x030 0x30 -#define FLAG_0x031 0x31 -#define FLAG_0x032 0x32 -#define FLAG_0x033 0x33 -#define FLAG_0x034 0x34 -#define FLAG_0x035 0x35 -#define FLAG_0x036 0x36 -#define FLAG_0x037 0x37 -#define FLAG_0x038 0x38 -#define FLAG_0x039 0x39 -#define FLAG_0x03A 0x3A -#define FLAG_0x03B 0x3B -#define FLAG_0x03C 0x3C -#define FLAG_0x03D 0x3D -#define FLAG_0x03E 0x3E -#define FLAG_0x03F 0x3F -#define FLAG_0x040 0x40 -#define FLAG_0x041 0x41 -#define FLAG_0x042 0x42 -#define FLAG_0x043 0x43 -#define FLAG_0x044 0x44 -#define FLAG_0x045 0x45 -#define FLAG_0x046 0x46 -#define FLAG_0x047 0x47 -#define FLAG_0x048 0x48 -#define FLAG_0x049 0x49 -#define FLAG_0x04A 0x4A -#define FLAG_0x04B 0x4B -#define FLAG_0x04C 0x4C -#define FLAG_0x04D 0x4D -#define FLAG_0x04E 0x4E -#define FLAG_0x04F 0x4F -#define FLAG_0x050 0x50 -#define FLAG_0x051 0x51 -#define FLAG_0x052 0x52 -#define FLAG_0x053 0x53 -#define FLAG_0x054 0x54 -#define FLAG_0x055 0x55 -#define FLAG_0x056 0x56 -#define FLAG_0x057 0x57 -#define FLAG_0x058 0x58 -#define FLAG_0x059 0x59 -#define FLAG_0x05A 0x5A -#define FLAG_0x05B 0x5B -#define FLAG_0x05C 0x5C -#define FLAG_0x05D 0x5D -#define FLAG_0x05E 0x5E -#define FLAG_0x05F 0x5F -#define FLAG_0x060 0x60 -#define FLAG_0x061 0x61 -#define FLAG_0x062 0x62 -#define FLAG_0x063 0x63 -#define FLAG_0x064 0x64 -#define FLAG_0x065 0x65 -#define FLAG_0x066 0x66 -#define FLAG_0x067 0x67 -#define FLAG_0x068 0x68 -#define FLAG_0x069 0x69 -#define FLAG_0x06A 0x6A -#define FLAG_0x06B 0x6B -#define FLAG_0x06C 0x6C -#define FLAG_0x06D 0x6D -#define FLAG_0x06E 0x6E -#define FLAG_0x06F 0x6F -#define FLAG_0x070 0x70 -#define FLAG_0x071 0x71 -#define FLAG_0x072 0x72 -#define FLAG_0x073 0x73 -#define FLAG_0x074 0x74 -#define FLAG_0x075 0x75 -#define FLAG_0x076 0x76 -#define FLAG_0x077 0x77 -#define FLAG_0x078 0x78 -#define FLAG_0x079 0x79 -#define FLAG_0x07A 0x7A -#define FLAG_0x07B 0x7B -#define FLAG_0x07C 0x7C -#define FLAG_0x07D 0x7D -#define FLAG_0x07E 0x7E -#define FLAG_0x07F 0x7F -#define FLAG_0x080 0x80 -#define FLAG_0x081 0x81 -#define FLAG_0x082 0x82 -#define FLAG_0x083 0x83 -#define FLAG_0x084 0x84 -#define FLAG_0x085 0x85 -#define FLAG_0x086 0x86 -#define FLAG_0x087 0x87 -#define FLAG_0x088 0x88 -#define FLAG_0x089 0x89 -#define FLAG_0x08A 0x8A -#define FLAG_0x08B 0x8B -#define FLAG_0x08C 0x8C -#define FLAG_0x08D 0x8D -#define FLAG_0x08E 0x8E -#define FLAG_0x08F 0x8F -#define FLAG_0x090 0x90 -#define FLAG_0x091 0x91 -#define FLAG_0x092 0x92 -#define FLAG_0x093 0x93 -#define FLAG_0x094 0x94 -#define FLAG_0x095 0x95 -#define FLAG_0x096 0x96 -#define FLAG_0x097 0x97 -#define FLAG_0x098 0x98 -#define FLAG_0x099 0x99 -#define FLAG_0x09A 0x9A -#define FLAG_0x09B 0x9B -#define FLAG_0x09C 0x9C -#define FLAG_0x09D 0x9D -#define FLAG_0x09E 0x9E -#define FLAG_0x09F 0x9F -#define FLAG_0x0A0 0xA0 -#define FLAG_0x0A1 0xA1 -#define FLAG_0x0A2 0xA2 -#define FLAG_0x0A3 0xA3 -#define FLAG_0x0A4 0xA4 -#define FLAG_0x0A5 0xA5 -#define FLAG_0x0A6 0xA6 -#define FLAG_0x0A7 0xA7 -#define FLAG_0x0A8 0xA8 -#define FLAG_0x0A9 0xA9 -#define FLAG_0x0AA 0xAA -#define FLAG_0x0AB 0xAB -#define FLAG_0x0AC 0xAC -#define FLAG_0x0AD 0xAD -#define FLAG_0x0AE 0xAE -#define FLAG_0x0AF 0xAF -#define FLAG_0x0B0 0xB0 -#define FLAG_0x0B1 0xB1 -#define FLAG_0x0B2 0xB2 -#define FLAG_0x0B3 0xB3 -#define FLAG_0x0B4 0xB4 -#define FLAG_0x0B5 0xB5 -#define FLAG_0x0B6 0xB6 -#define FLAG_0x0B7 0xB7 -#define FLAG_0x0B8 0xB8 -#define FLAG_0x0B9 0xB9 -#define FLAG_0x0BA 0xBA -#define FLAG_0x0BB 0xBB -#define FLAG_0x0BC 0xBC -#define FLAG_0x0BD 0xBD -#define FLAG_0x0BE 0xBE -#define FLAG_0x0BF 0xBF -#define FLAG_0x0C0 0xC0 -#define FLAG_0x0C1 0xC1 -#define FLAG_0x0C2 0xC2 -#define FLAG_0x0C3 0xC3 -#define FLAG_0x0C4 0xC4 -#define FLAG_0x0C5 0xC5 -#define FLAG_0x0C6 0xC6 -#define FLAG_0x0C7 0xC7 -#define FLAG_0x0C8 0xC8 -#define FLAG_0x0C9 0xC9 -#define FLAG_0x0CA 0xCA -#define FLAG_0x0CB 0xCB -#define FLAG_0x0CC 0xCC -#define FLAG_0x0CD 0xCD -#define FLAG_0x0CE 0xCE -#define FLAG_0x0CF 0xCF -#define FLAG_0x0D0 0xD0 -#define FLAG_0x0D1 0xD1 -#define FLAG_0x0D2 0xD2 -#define FLAG_0x0D3 0xD3 -#define FLAG_0x0D4 0xD4 -#define FLAG_0x0D5 0xD5 -#define FLAG_0x0D6 0xD6 -#define FLAG_0x0D7 0xD7 -#define FLAG_0x0D8 0xD8 -#define FLAG_0x0D9 0xD9 -#define FLAG_0x0DA 0xDA -#define FLAG_0x0DB 0xDB -#define FLAG_0x0DC 0xDC -#define FLAG_0x0DD 0xDD -#define FLAG_0x0DE 0xDE -#define FLAG_0x0DF 0xDF -#define FLAG_0x0E0 0xE0 -#define FLAG_0x0E1 0xE1 -#define FLAG_0x0E2 0xE2 -#define FLAG_0x0E3 0xE3 -#define FLAG_0x0E4 0xE4 -#define FLAG_0x0E5 0xE5 -#define FLAG_0x0E6 0xE6 -#define FLAG_0x0E7 0xE7 -#define FLAG_0x0E8 0xE8 -#define FLAG_0x0E9 0xE9 -#define FLAG_0x0EA 0xEA -#define FLAG_0x0EB 0xEB -#define FLAG_0x0EC 0xEC -#define FLAG_0x0ED 0xED -#define FLAG_0x0EE 0xEE -#define FLAG_0x0EF 0xEF -#define FLAG_0x0F0 0xF0 -#define FLAG_0x0F1 0xF1 -#define FLAG_0x0F2 0xF2 -#define FLAG_0x0F3 0xF3 -#define FLAG_0x0F4 0xF4 -#define FLAG_0x0F5 0xF5 -#define FLAG_0x0F6 0xF6 -#define FLAG_0x0F7 0xF7 -#define FLAG_0x0F8 0xF8 -#define FLAG_0x0F9 0xF9 -#define FLAG_0x0FA 0xFA -#define FLAG_0x0FB 0xFB -#define FLAG_0x0FC 0xFC -#define FLAG_0x0FD 0xFD -#define FLAG_0x0FE 0xFE -#define FLAG_0x0FF 0xFF +#define FLAG_TEMP_1 0x001 +#define FLAG_TEMP_2 0x002 +#define FLAG_TEMP_3 0x003 +#define FLAG_TEMP_4 0x004 +#define FLAG_TEMP_5 0x005 +#define FLAG_TEMP_6 0x006 +#define FLAG_TEMP_7 0x007 +#define FLAG_TEMP_8 0x008 +#define FLAG_TEMP_9 0x009 +#define FLAG_TEMP_A 0x00A +#define FLAG_TEMP_B 0x00B +#define FLAG_TEMP_C 0x00C +#define FLAG_TEMP_D 0x00D +#define FLAG_TEMP_E 0x00E +#define FLAG_TEMP_F 0x00F +#define FLAG_TEMP_10 0x010 +#define FLAG_TEMP_11 0x011 +#define FLAG_TEMP_12 0x012 +#define FLAG_TEMP_13 0x013 +#define FLAG_TEMP_14 0x014 +#define FLAG_TEMP_15 0x015 +#define FLAG_TEMP_16 0x016 +#define FLAG_TEMP_17 0x017 +#define FLAG_TEMP_18 0x018 +#define FLAG_TEMP_19 0x019 +#define FLAG_TEMP_1A 0x01A +#define FLAG_TEMP_1B 0x01B +#define FLAG_TEMP_1C 0x01C +#define FLAG_TEMP_1D 0x01D +#define FLAG_TEMP_1E 0x01E +#define FLAG_TEMP_1F 0x01F + +#define FLAG_0x020 0x020 +#define FLAG_0x021 0x021 +#define FLAG_0x022 0x022 +#define FLAG_0x023 0x023 +#define FLAG_0x024 0x024 +#define FLAG_0x025 0x025 +#define FLAG_0x026 0x026 +#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_0x0AF 0x0AF +#define FLAG_0x0B0 0x0B0 +#define FLAG_0x0B1 0x0B1 +#define FLAG_0x0B2 0x0B2 +#define FLAG_0x0B3 0x0B3 +#define FLAG_0x0B4 0x0B4 +#define FLAG_0x0B5 0x0B5 +#define FLAG_0x0B6 0x0B6 +#define FLAG_0x0B7 0x0B7 +#define FLAG_0x0B8 0x0B8 +#define FLAG_0x0B9 0x0B9 +#define FLAG_0x0BA 0x0BA +#define FLAG_0x0BB 0x0BB +#define FLAG_0x0BC 0x0BC +#define FLAG_0x0BD 0x0BD +#define FLAG_0x0BE 0x0BE +#define FLAG_0x0BF 0x0BF +#define FLAG_0x0C0 0x0C0 +#define FLAG_0x0C1 0x0C1 +#define FLAG_0x0C2 0x0C2 +#define FLAG_0x0C3 0x0C3 +#define FLAG_0x0C4 0x0C4 +#define FLAG_0x0C5 0x0C5 +#define FLAG_0x0C6 0x0C6 +#define FLAG_0x0C7 0x0C7 +#define FLAG_0x0C8 0x0C8 +#define FLAG_0x0C9 0x0C9 +#define FLAG_0x0CA 0x0CA +#define FLAG_0x0CB 0x0CB +#define FLAG_0x0CC 0x0CC +#define FLAG_0x0CD 0x0CD +#define FLAG_0x0CE 0x0CE +#define FLAG_0x0CF 0x0CF +#define FLAG_0x0D0 0x0D0 +#define FLAG_0x0D1 0x0D1 +#define FLAG_0x0D2 0x0D2 +#define FLAG_0x0D3 0x0D3 +#define FLAG_0x0D4 0x0D4 +#define FLAG_0x0D5 0x0D5 +#define FLAG_0x0D6 0x0D6 +#define FLAG_0x0D7 0x0D7 +#define FLAG_0x0D8 0x0D8 +#define FLAG_0x0D9 0x0D9 +#define FLAG_0x0DA 0x0DA +#define FLAG_0x0DB 0x0DB +#define FLAG_0x0DC 0x0DC +#define FLAG_0x0DD 0x0DD +#define FLAG_0x0DE 0x0DE +#define FLAG_0x0DF 0x0DF +#define FLAG_0x0E0 0x0E0 +#define FLAG_0x0E1 0x0E1 +#define FLAG_0x0E2 0x0E2 +#define FLAG_0x0E3 0x0E3 +#define FLAG_0x0E4 0x0E4 +#define FLAG_0x0E5 0x0E5 +#define FLAG_0x0E6 0x0E6 +#define FLAG_0x0E7 0x0E7 +#define FLAG_0x0E8 0x0E8 +#define FLAG_0x0E9 0x0E9 +#define FLAG_0x0EA 0x0EA +#define FLAG_0x0EB 0x0EB +#define FLAG_0x0EC 0x0EC +#define FLAG_0x0ED 0x0ED +#define FLAG_0x0EE 0x0EE +#define FLAG_0x0EF 0x0EF +#define FLAG_0x0F0 0x0F0 +#define FLAG_0x0F1 0x0F1 +#define FLAG_0x0F2 0x0F2 +#define FLAG_0x0F3 0x0F3 +#define FLAG_0x0F4 0x0F4 +#define FLAG_0x0F5 0x0F5 +#define FLAG_0x0F6 0x0F6 +#define FLAG_0x0F7 0x0F7 +#define FLAG_0x0F8 0x0F8 +#define FLAG_0x0F9 0x0F9 +#define FLAG_0x0FA 0x0FA +#define FLAG_0x0FB 0x0FB +#define FLAG_0x0FC 0x0FC +#define FLAG_0x0FD 0x0FD +#define FLAG_0x0FE 0x0FE +#define FLAG_0x0FF 0x0FF #define FLAG_0x100 0x100 #define FLAG_0x101 0x101 #define FLAG_0x102 0x102 diff --git a/include/constants/map_objects.h b/include/constants/map_objects.h index b6154da17..39c8871e1 100644 --- a/include/constants/map_objects.h +++ b/include/constants/map_objects.h @@ -79,7 +79,7 @@ #define MAP_OBJ_GFX_AGATHA 75 #define MAP_OBJ_GFX_DAISY 76 #define MAP_OBJ_GFX_LORELEI 77 -#define MAP_OBJ_GFX_OLD_MAN_3 78 +#define MAP_OBJ_GFX_MR_FUJI 78 #define MAP_OBJ_GFX_BRUNO 79 #define MAP_OBJ_GFX_BROCK 80 #define MAP_OBJ_GFX_MISTY 81 diff --git a/src/quest_log.c b/src/quest_log.c index 477437f3d..1ff5a1de5 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -2509,10 +2509,10 @@ static void sub_81130BC(struct Var4038Struct * varPtr) sub_8113524(varPtr); sub_8113390(varPtr); VarSet(VAR_0x4039, gSaveBlock2Ptr->playTimeHours); - FlagClear(FLAG_0x06C); - FlagClear(FLAG_0x06D); - FlagClear(FLAG_0x06E); - FlagClear(FLAG_0x06F); + FlagClear(FLAG_HIDE_SAFFRON_FAN_CLUB_BLACKBELT); + FlagClear(FLAG_HIDE_SAFFRON_FAN_CLUB_ROCKER); + FlagClear(FLAG_HIDE_SAFFRON_FAN_CLUB_WOMAN); + FlagClear(FLAG_HIDE_SAFFRON_FAN_CLUB_BEAUTY); VarSet(VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 1); } } |