diff options
49 files changed, 49 insertions, 49 deletions
diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index 02ac130e2..269dbea5b 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -9,7 +9,7 @@ BirthIsland_Exterior_MapScript3_165213:: @ 8165213 end BirthIsland_Exterior_MapScript1_165217:: @ 8165217 - setworldmapflag 2242 + setworldmapflag FLAG_WORLD_MAP_BIRTH_ISLAND_EXTERIOR setvar VAR_0x4010, 150 setvar VAR_SECRET_BASE_MAP, 0 setvar VAR_ALTERING_CAVE_WILD_SET, 0 diff --git a/data/maps/CeladonCity/scripts.inc b/data/maps/CeladonCity/scripts.inc index 8e3ffe308..08c160cd9 100644 --- a/data/maps/CeladonCity/scripts.inc +++ b/data/maps/CeladonCity/scripts.inc @@ -3,7 +3,7 @@ CeladonCity_MapScripts:: @ 8166C8F .byte 0 CeladonCity_MapScript1_166C95:: @ 8166C95 - setworldmapflag 2198 + setworldmapflag FLAG_WORLD_MAP_CELADON_CITY end CeladonCity_EventScript_166C99:: @ 8166C99 diff --git a/data/maps/CeruleanCave_1F/scripts.inc b/data/maps/CeruleanCave_1F/scripts.inc index 6b4e93d9f..db76ddfd7 100644 --- a/data/maps/CeruleanCave_1F/scripts.inc +++ b/data/maps/CeruleanCave_1F/scripts.inc @@ -3,5 +3,5 @@ CeruleanCave_1F_MapScripts:: @ 81624B3 .byte 0 CeruleanCave_1F_MapScript1_1624B9:: @ 81624B9 - setworldmapflag 2227 + setworldmapflag FLAG_WORLD_MAP_CERULEAN_CAVE_1F end diff --git a/data/maps/CeruleanCity/scripts.inc b/data/maps/CeruleanCity/scripts.inc index 8677c23f0..dd13a913d 100644 --- a/data/maps/CeruleanCity/scripts.inc +++ b/data/maps/CeruleanCity/scripts.inc @@ -3,7 +3,7 @@ CeruleanCity_MapScripts:: @ 8166471 .byte 0 CeruleanCity_MapScript1_166477:: @ 8166477 - setworldmapflag 2195 + setworldmapflag FLAG_WORLD_MAP_CERULEAN_CITY checkflag FLAG_0x234 call_if 0, EventScript_166484 end diff --git a/data/maps/CinnabarIsland/scripts.inc b/data/maps/CinnabarIsland/scripts.inc index 314f97296..63d8e8f0f 100644 --- a/data/maps/CinnabarIsland/scripts.inc +++ b/data/maps/CinnabarIsland/scripts.inc @@ -4,7 +4,7 @@ CinnabarIsland_MapScripts:: @ 8166ED6 .byte 0 CinnabarIsland_MapScript1_166EE1:: @ 8166EE1 - setworldmapflag 2200 + setworldmapflag FLAG_WORLD_MAP_CINNABAR_ISLAND call EventScript_166F5E compare_var_to_value VAR_0x4071, 1 call_if 1, EventScript_166F24 diff --git a/data/maps/DiglettsCave_B1F/scripts.inc b/data/maps/DiglettsCave_B1F/scripts.inc index fd5e75f3d..28bd063ac 100644 --- a/data/maps/DiglettsCave_B1F/scripts.inc +++ b/data/maps/DiglettsCave_B1F/scripts.inc @@ -3,5 +3,5 @@ DiglettsCave_B1F_MapScripts:: @ 8160EF1 .byte 0 DiglettsCave_B1F_MapScript1_160EF7:: @ 8160EF7 - setworldmapflag 2217 + setworldmapflag FLAG_WORLD_MAP_DIGLETTS_CAVE_B1F end diff --git a/data/maps/FiveIsland/scripts.inc b/data/maps/FiveIsland/scripts.inc index 273749e3b..bfc0af50b 100644 --- a/data/maps/FiveIsland/scripts.inc +++ b/data/maps/FiveIsland/scripts.inc @@ -3,7 +3,7 @@ FiveIsland_MapScripts:: @ 8167E8E .byte 0 FiveIsland_MapScript1_167E94:: @ 8167E94 - setworldmapflag 2207 + setworldmapflag FLAG_WORLD_MAP_FIVE_ISLAND end FiveIsland_EventScript_167E98:: @ 8167E98 diff --git a/data/maps/FiveIsland_LostCave_Entrance/scripts.inc b/data/maps/FiveIsland_LostCave_Entrance/scripts.inc index 83b8eca06..e288ceff6 100644 --- a/data/maps/FiveIsland_LostCave_Entrance/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Entrance/scripts.inc @@ -3,5 +3,5 @@ FiveIsland_LostCave_Entrance_MapScripts:: @ 8164BEC .byte 0 FiveIsland_LostCave_Entrance_MapScript1_164BF2:: @ 8164BF2 - setworldmapflag 2236 + setworldmapflag FLAG_WORLD_MAP_FIVE_ISLAND_LOST_CAVE_ENTRANCE end diff --git a/data/maps/FiveIsland_RocketWarehouse/scripts.inc b/data/maps/FiveIsland_RocketWarehouse/scripts.inc index 34c141ec9..fc1753562 100644 --- a/data/maps/FiveIsland_RocketWarehouse/scripts.inc +++ b/data/maps/FiveIsland_RocketWarehouse/scripts.inc @@ -4,7 +4,7 @@ FiveIsland_RocketWarehouse_MapScripts:: @ 8163F2E .byte 0 FiveIsland_RocketWarehouse_MapScript2_163F39:: @ 8163F39 - setworldmapflag 2233 + setworldmapflag FLAG_WORLD_MAP_FIVE_ISLAND_ROCKET_WAREHOUSE end FiveIsland_RocketWarehouse_MapScript1_163F3D:: @ 8163F3D diff --git a/data/maps/FourIsland/scripts.inc b/data/maps/FourIsland/scripts.inc index 73c0d6175..887b9ca4e 100644 --- a/data/maps/FourIsland/scripts.inc +++ b/data/maps/FourIsland/scripts.inc @@ -4,7 +4,7 @@ FourIsland_MapScripts:: @ 8167CAE .byte 0 FourIsland_MapScript1_167CB9:: @ 8167CB9 - setworldmapflag 2206 + setworldmapflag FLAG_WORLD_MAP_FOUR_ISLAND compare_var_to_value VAR_0x4086, 0 call_if 1, EventScript_167CCD call EventScript_167CD1 diff --git a/data/maps/FourIsland_IcefallCave_Entrance/scripts.inc b/data/maps/FourIsland_IcefallCave_Entrance/scripts.inc index 1bef95ec1..a3c4ea616 100644 --- a/data/maps/FourIsland_IcefallCave_Entrance/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_Entrance/scripts.inc @@ -3,5 +3,5 @@ FourIsland_IcefallCave_Entrance_MapScripts:: @ 8163D3A .byte 0 FourIsland_IcefallCave_Entrance_MapScript1_163D40:: @ 8163D40 - setworldmapflag 2232 + setworldmapflag FLAG_WORLD_MAP_FOUR_ISLAND_ICEFALL_CAVE_ENTRANCE end diff --git a/data/maps/FuchsiaCity/scripts.inc b/data/maps/FuchsiaCity/scripts.inc index 2d0a6a32a..4a6245159 100644 --- a/data/maps/FuchsiaCity/scripts.inc +++ b/data/maps/FuchsiaCity/scripts.inc @@ -3,7 +3,7 @@ FuchsiaCity_MapScripts:: @ 8166D75 .byte 0 FuchsiaCity_MapScript1_166D7B:: @ 8166D7B - setworldmapflag 2199 + setworldmapflag FLAG_WORLD_MAP_FUCHSIA_CITY checkflag FLAG_0x272 call_if 1, EventScript_166D91 checkflag FLAG_0x272 diff --git a/data/maps/IndigoPlateau_Exterior/scripts.inc b/data/maps/IndigoPlateau_Exterior/scripts.inc index fd45d3fd4..656e7045c 100644 --- a/data/maps/IndigoPlateau_Exterior/scripts.inc +++ b/data/maps/IndigoPlateau_Exterior/scripts.inc @@ -4,7 +4,7 @@ IndigoPlateau_Exterior_MapScripts:: @ 816723B .byte 0 IndigoPlateau_Exterior_MapScript1_167246:: @ 8167246 - setworldmapflag 2201 + setworldmapflag FLAG_WORLD_MAP_INDIGO_PLATEAU_EXTERIOR compare_var_to_value VAR_0x4085, 1 call_if 1, EventScript_167255 end diff --git a/data/maps/MtEmber_Exterior/scripts.inc b/data/maps/MtEmber_Exterior/scripts.inc index d6c93ae72..020c334f6 100644 --- a/data/maps/MtEmber_Exterior/scripts.inc +++ b/data/maps/MtEmber_Exterior/scripts.inc @@ -4,7 +4,7 @@ MtEmber_Exterior_MapScripts:: @ 8163946 .byte 0 MtEmber_Exterior_MapScript1_163951:: @ 8163951 - setworldmapflag 2230 + setworldmapflag FLAG_WORLD_MAP_MT_EMBER_EXTERIOR compare_var_to_value VAR_0x407F, 2 call_if 1, EventScript_163960 end diff --git a/data/maps/MtMoon_1F/scripts.inc b/data/maps/MtMoon_1F/scripts.inc index 1c6af7902..3a8e8b5ce 100644 --- a/data/maps/MtMoon_1F/scripts.inc +++ b/data/maps/MtMoon_1F/scripts.inc @@ -3,7 +3,7 @@ MtMoon_1F_MapScripts:: @ 81605E4 .byte 0 MtMoon_1F_MapScript1_1605EA:: @ 81605EA - setworldmapflag 2213 + setworldmapflag FLAG_WORLD_MAP_MT_MOON_1F end MtMoon_1F_EventScript_1605EE:: @ 81605EE diff --git a/data/maps/NavelRock_Exterior/scripts.inc b/data/maps/NavelRock_Exterior/scripts.inc index 32b86d7d6..26ef2885c 100644 --- a/data/maps/NavelRock_Exterior/scripts.inc +++ b/data/maps/NavelRock_Exterior/scripts.inc @@ -3,5 +3,5 @@ NavelRock_Exterior_MapScripts:: @ 81646AE .byte 0 NavelRock_Exterior_MapScript1_1646B4:: @ 81646B4 - setworldmapflag 2229 + setworldmapflag FLAG_WORLD_MAP_NAVEL_ROCK_EXTERIOR end diff --git a/data/maps/OneIsland/scripts.inc b/data/maps/OneIsland/scripts.inc index f1d1fa7af..b0a4ac263 100644 --- a/data/maps/OneIsland/scripts.inc +++ b/data/maps/OneIsland/scripts.inc @@ -4,7 +4,7 @@ OneIsland_MapScripts:: @ 8167484 .byte 0 OneIsland_MapScript1_16748F:: @ 816748F - setworldmapflag 2203 + setworldmapflag FLAG_WORLD_MAP_ONE_ISLAND end OneIsland_MapScript2_167493:: @ 8167493 diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc index 1ea484a62..bafeced89 100644 --- a/data/maps/PalletTown/scripts.inc +++ b/data/maps/PalletTown/scripts.inc @@ -4,7 +4,7 @@ PalletTown_MapScripts:: @ 816545A .byte 0 PalletTown_MapScript1_165465:: @ 8165465 - setworldmapflag 2192 + setworldmapflag FLAG_WORLD_MAP_PALLET_TOWN checkflag FLAG_0x291 call_if 1, EventScript_165488 compare_var_to_value VAR_0x4070, 0 diff --git a/data/maps/PewterCity/scripts.inc b/data/maps/PewterCity/scripts.inc index e3afcec0f..ee311aab2 100644 --- a/data/maps/PewterCity/scripts.inc +++ b/data/maps/PewterCity/scripts.inc @@ -3,7 +3,7 @@ PewterCity_MapScripts:: @ 8165B8E .byte 0 PewterCity_MapScript1_165B94:: @ 8165B94 - setworldmapflag 2194 + setworldmapflag FLAG_WORLD_MAP_PEWTER_CITY setvar VAR_0x4061, 0 end diff --git a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc index a44edbd86..519278fff 100644 --- a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc +++ b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc @@ -27,7 +27,7 @@ EventScript_1625AC:: @ 81625AC return PokemonLeague_LoreleisRoom_MapScript3_1625B2:: @ 81625B2 - setworldmapflag 2223 + setworldmapflag FLAG_WORLD_MAP_POKEMON_LEAGUE_LORELEIS_ROOM end PokemonLeague_LoreleisRoom_MapScript4_1625B6:: @ 81625B6 diff --git a/data/maps/PokemonMansion_1F/scripts.inc b/data/maps/PokemonMansion_1F/scripts.inc index ddd356f46..9e3f50832 100644 --- a/data/maps/PokemonMansion_1F/scripts.inc +++ b/data/maps/PokemonMansion_1F/scripts.inc @@ -9,7 +9,7 @@ PokemonMansion_1F_MapScript1_162204:: @ 8162204 end PokemonMansion_1F_MapScript2_16220E:: @ 816220E - setworldmapflag 2221 + setworldmapflag FLAG_WORLD_MAP_POKEMON_MANSION_1F end PokemonMansion_1F_EventScript_162212:: @ 8162212 diff --git a/data/maps/PokemonTower_1F/scripts.inc b/data/maps/PokemonTower_1F/scripts.inc index 1e764e397..bbfee991c 100644 --- a/data/maps/PokemonTower_1F/scripts.inc +++ b/data/maps/PokemonTower_1F/scripts.inc @@ -3,7 +3,7 @@ PokemonTower_1F_MapScripts:: @ 8163235 .byte 0 PokemonTower_1F_MapScript1_16323B:: @ 816323B - setworldmapflag 2226 + setworldmapflag FLAG_WORLD_MAP_POKEMON_TOWER_1F end PokemonTower_1F_EventScript_16323F:: @ 816323F diff --git a/data/maps/PowerPlant/scripts.inc b/data/maps/PowerPlant/scripts.inc index 8f7f15d54..988c84fa0 100644 --- a/data/maps/PowerPlant/scripts.inc +++ b/data/maps/PowerPlant/scripts.inc @@ -16,7 +16,7 @@ EventScript_163779:: @ 8163779 return PowerPlant_MapScript2_16378D:: @ 816378D - setworldmapflag 2228 + setworldmapflag FLAG_WORLD_MAP_POWER_PLANT checkflag FLAG_0x2BF call_if 0, EventScript_1637AC checkflag FLAG_0x2D0 diff --git a/data/maps/RockTunnel_1F/scripts.inc b/data/maps/RockTunnel_1F/scripts.inc index 22ba4d7ac..ff8d3216b 100644 --- a/data/maps/RockTunnel_1F/scripts.inc +++ b/data/maps/RockTunnel_1F/scripts.inc @@ -3,7 +3,7 @@ RockTunnel_1F_MapScripts:: @ 8162DD6 .byte 0 RockTunnel_1F_MapScript1_162DDC:: @ 8162DDC - setworldmapflag 2224 + setworldmapflag FLAG_WORLD_MAP_ROCK_TUNNEL_1F end RockTunnel_1F_EventScript_162DE0:: @ 8162DE0 diff --git a/data/maps/RocketHideout_B1F/scripts.inc b/data/maps/RocketHideout_B1F/scripts.inc index a9a6d2c35..f7b2e0515 100644 --- a/data/maps/RocketHideout_B1F/scripts.inc +++ b/data/maps/RocketHideout_B1F/scripts.inc @@ -9,7 +9,7 @@ RocketHideout_B1F_MapScript1_1611A0:: @ 81611A0 end RocketHideout_B1F_MapScript2_1611AA:: @ 81611AA - setworldmapflag 2219 + setworldmapflag FLAG_WORLD_MAP_ROCKET_HIDEOUT_B1F end RocketHideout_B1F_EventScript_1611AE:: @ 81611AE diff --git a/data/maps/Route10_PokemonCenter_1F/scripts.inc b/data/maps/Route10_PokemonCenter_1F/scripts.inc index 663938fc7..44c859362 100644 --- a/data/maps/Route10_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route10_PokemonCenter_1F/scripts.inc @@ -4,7 +4,7 @@ Route10_PokemonCenter_1F_MapScripts:: @ 816FC2F .byte 0 Route10_PokemonCenter_1F_MapScript1_16FC3A:: @ 816FC3A - setworldmapflag 2211 + setworldmapflag FLAG_WORLD_MAP_ROUTE10_POKEMON_CENTER_1F setrespawn 13 end diff --git a/data/maps/Route4_PokemonCenter_1F/scripts.inc b/data/maps/Route4_PokemonCenter_1F/scripts.inc index e943780de..d4904e476 100644 --- a/data/maps/Route4_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route4_PokemonCenter_1F/scripts.inc @@ -4,7 +4,7 @@ Route4_PokemonCenter_1F_MapScripts:: @ 816F739 .byte 0 Route4_PokemonCenter_1F_MapScript1_16F744:: @ 816F744 - setworldmapflag 2210 + setworldmapflag FLAG_WORLD_MAP_ROUTE4_POKEMON_CENTER_1F setrespawn 12 end diff --git a/data/maps/SSAnne_Exterior/scripts.inc b/data/maps/SSAnne_Exterior/scripts.inc index e3064f061..3d7a41b35 100644 --- a/data/maps/SSAnne_Exterior/scripts.inc +++ b/data/maps/SSAnne_Exterior/scripts.inc @@ -4,7 +4,7 @@ SSAnne_Exterior_MapScripts:: @ 8160840 .byte 0 SSAnne_Exterior_MapScript1_16084B:: @ 816084B - setworldmapflag 2214 + setworldmapflag FLAG_WORLD_MAP_SSANNE_EXTERIOR end SSAnne_Exterior_MapScript2_16084F:: @ 816084F diff --git a/data/maps/SafariZone_Center/scripts.inc b/data/maps/SafariZone_Center/scripts.inc index 81a43a227..90ab60e6d 100644 --- a/data/maps/SafariZone_Center/scripts.inc +++ b/data/maps/SafariZone_Center/scripts.inc @@ -3,7 +3,7 @@ SafariZone_Center_MapScripts:: @ 8162357 .byte 0 SafariZone_Center_MapScript1_16235D:: @ 816235D - setworldmapflag 2222 + setworldmapflag FLAG_WORLD_MAP_SAFARI_ZONE_CENTER end SafariZone_Center_EventScript_162361:: @ 8162361 diff --git a/data/maps/SaffronCity_Duplicate/scripts.inc b/data/maps/SaffronCity_Duplicate/scripts.inc index cba838bed..fa5d031b3 100644 --- a/data/maps/SaffronCity_Duplicate/scripts.inc +++ b/data/maps/SaffronCity_Duplicate/scripts.inc @@ -3,7 +3,7 @@ SaffronCity_Duplicate_MapScripts:: @ 816735F .byte 0 SaffronCity_Duplicate_MapScript1_167365:: @ 8167365 - setworldmapflag 2202 + setworldmapflag FLAG_WORLD_MAP_SAFFRON_CITY_DUPLICATE checkflag FLAG_0x23C call_if 0, EventScript_167372 end diff --git a/data/maps/SeafoamIslands_1F/scripts.inc b/data/maps/SeafoamIslands_1F/scripts.inc index afb8a3e3e..336c75f9f 100644 --- a/data/maps/SeafoamIslands_1F/scripts.inc +++ b/data/maps/SeafoamIslands_1F/scripts.inc @@ -3,5 +3,5 @@ SeafoamIslands_1F_MapScripts:: @ 8162F43 .byte 0 SeafoamIslands_1F_MapScript1_162F49:: @ 8162F49 - setworldmapflag 2225 + setworldmapflag FLAG_WORLD_MAP_SEAFOAM_ISLANDS_1F end diff --git a/data/maps/SevenIsland/scripts.inc b/data/maps/SevenIsland/scripts.inc index 8517d7d2d..1c8b3c10b 100644 --- a/data/maps/SevenIsland/scripts.inc +++ b/data/maps/SevenIsland/scripts.inc @@ -3,7 +3,7 @@ SevenIsland_MapScripts:: @ 8167EB3 .byte 0 SevenIsland_MapScript1_167EB9:: @ 8167EB9 - setworldmapflag 2208 + setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND end SevenIsland_EventScript_167EBD:: @ 8167EBD diff --git a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/scripts.inc b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/scripts.inc index c1eda69bd..45637c673 100644 --- a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/scripts.inc +++ b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/scripts.inc @@ -3,7 +3,7 @@ SevenIsland_SeavaultCanyon_TanobyKey_MapScripts:: @ 8164DCC .byte 0 SevenIsland_SeavaultCanyon_TanobyKey_MapScript1_164DD2:: @ 8164DD2 - setworldmapflag 2241 + setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY checkflag 2121 call_if 1, EventScript_164E07 setvar VAR_0x4001, 0 diff --git a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/scripts.inc index e67f50d40..391a45a95 100644 --- a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/scripts.inc +++ b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/scripts.inc @@ -3,6 +3,6 @@ SevenIsland_TanobyRuins_MoneanChamber_MapScripts:: @ 8164CCF .byte 0 SevenIsland_TanobyRuins_MoneanChamber_MapScript1_164CD5:: @ 8164CD5 - setworldmapflag 2239 + setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER call EventScript_1A925E end diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc index 2f1ebc267..d763b76a9 100644 --- a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc @@ -39,7 +39,7 @@ EventScript_1648A3:: @ 81648A3 return SevenIsland_TrainerTower_Lobby_MapScript3_1648AD:: @ 81648AD - setworldmapflag 2234 + setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY getplayerxy VAR_0x400D, VAR_RESULT end diff --git a/data/maps/SilphCo_1F/scripts.inc b/data/maps/SilphCo_1F/scripts.inc index f9e44a12b..42a0e0d00 100644 --- a/data/maps/SilphCo_1F/scripts.inc +++ b/data/maps/SilphCo_1F/scripts.inc @@ -3,7 +3,7 @@ SilphCo_1F_MapScripts:: @ 8161625 .byte 0 SilphCo_1F_MapScript1_16162B:: @ 816162B - setworldmapflag 2220 + setworldmapflag FLAG_WORLD_MAP_SILPH_CO_1F end SilphCo_1F_EventScript_16162F:: @ 816162F diff --git a/data/maps/SixIsland/scripts.inc b/data/maps/SixIsland/scripts.inc index bac71a468..3b3392afb 100644 --- a/data/maps/SixIsland/scripts.inc +++ b/data/maps/SixIsland/scripts.inc @@ -3,7 +3,7 @@ SixIsland_MapScripts:: @ 8167ED8 .byte 0 SixIsland_MapScript1_167EDE:: @ 8167EDE - setworldmapflag 2209 + setworldmapflag FLAG_WORLD_MAP_SIX_ISLAND end SixIsland_EventScript_167EE2:: @ 8167EE2 diff --git a/data/maps/SixIsland_AlteringCave/scripts.inc b/data/maps/SixIsland_AlteringCave/scripts.inc index 7c53187c3..6733f94b3 100644 --- a/data/maps/SixIsland_AlteringCave/scripts.inc +++ b/data/maps/SixIsland_AlteringCave/scripts.inc @@ -3,5 +3,5 @@ SixIsland_AlteringCave_MapScripts:: @ 81646A4 .byte 0 SixIsland_AlteringCave_MapScript1_1646AA:: @ 81646AA - setworldmapflag 2238 + setworldmapflag FLAG_WORLD_MAP_SIX_ISLAND_ALTERING_CAVE end diff --git a/data/maps/SixIsland_DottedHole_1F/scripts.inc b/data/maps/SixIsland_DottedHole_1F/scripts.inc index bcb9a72ca..2d9e52209 100644 --- a/data/maps/SixIsland_DottedHole_1F/scripts.inc +++ b/data/maps/SixIsland_DottedHole_1F/scripts.inc @@ -3,7 +3,7 @@ SixIsland_DottedHole_1F_MapScripts:: @ 8164182 .byte 0 SixIsland_DottedHole_1F_MapScript1_164188:: @ 8164188 - setworldmapflag 2235 + setworldmapflag FLAG_WORLD_MAP_SIX_ISLAND_DOTTED_HOLE_1F end SixIsland_DottedHole_B1F_EventScript_16418C:: @ 816418C diff --git a/data/maps/SixIsland_PatternBush/scripts.inc b/data/maps/SixIsland_PatternBush/scripts.inc index fd72430ea..f7debc297 100644 --- a/data/maps/SixIsland_PatternBush/scripts.inc +++ b/data/maps/SixIsland_PatternBush/scripts.inc @@ -3,7 +3,7 @@ SixIsland_PatternBush_MapScripts:: @ 8164559 .byte 0 SixIsland_PatternBush_MapScript1_16455F:: @ 816455F - setworldmapflag 2237 + setworldmapflag FLAG_WORLD_MAP_SIX_ISLAND_PATTERN_BUSH getplayerxy VAR_0x4001, VAR_0x4002 compare_var_to_value VAR_0x4001, 50 call_if 4, EventScript_16457E diff --git a/data/maps/ThreeIsland/scripts.inc b/data/maps/ThreeIsland/scripts.inc index a142aa51f..cfb5507b8 100644 --- a/data/maps/ThreeIsland/scripts.inc +++ b/data/maps/ThreeIsland/scripts.inc @@ -3,7 +3,7 @@ ThreeIsland_MapScripts:: @ 81677AD .byte 0 ThreeIsland_MapScript1_1677B3:: @ 81677B3 - setworldmapflag 2205 + setworldmapflag FLAG_WORLD_MAP_THREE_ISLAND checkflag FLAG_0x2A3 call_if 1, EventScript_1677CB compare_var_to_value VAR_0x407B, 4 diff --git a/data/maps/ThreeIsland_BerryForest/scripts.inc b/data/maps/ThreeIsland_BerryForest/scripts.inc index bb6795580..5acd5a6d3 100644 --- a/data/maps/ThreeIsland_BerryForest/scripts.inc +++ b/data/maps/ThreeIsland_BerryForest/scripts.inc @@ -3,7 +3,7 @@ ThreeIsland_BerryForest_MapScripts:: @ 8163C71 .byte 0 ThreeIsland_BerryForest_MapScript1_163C77:: @ 8163C77 - setworldmapflag 2231 + setworldmapflag FLAG_WORLD_MAP_THREE_ISLAND_BERRY_FOREST setescapewarp MAP_THREE_ISLAND_BOND_BRIDGE, 255, 12, 6 end diff --git a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc index 053ff6433..60a51f456 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc +++ b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc @@ -3,7 +3,7 @@ ThreeIsland_DunsparceTunnel_MapScripts:: @ 8164D26 .byte 0 ThreeIsland_DunsparceTunnel_MapScript1_164D2C:: @ 8164D2C - setworldmapflag 2240 + setworldmapflag FLAG_WORLD_MAP_THREE_ISLAND_DUNSPARCE_TUNNEL specialvar VAR_RESULT, sub_806E25C copyvar VAR_0x8008, VAR_RESULT compare_var_to_value VAR_0x8008, 1 diff --git a/data/maps/TwoIsland/scripts.inc b/data/maps/TwoIsland/scripts.inc index 06ded8984..950cfbf84 100644 --- a/data/maps/TwoIsland/scripts.inc +++ b/data/maps/TwoIsland/scripts.inc @@ -3,7 +3,7 @@ TwoIsland_MapScripts:: @ 8167564 .byte 0 TwoIsland_MapScript1_16756A:: @ 816756A - setworldmapflag 2204 + setworldmapflag FLAG_WORLD_MAP_TWO_ISLAND setflag FLAG_0x2A2 call EventScript_167576 end diff --git a/data/maps/UndergroundPath_EastWestTunnel/scripts.inc b/data/maps/UndergroundPath_EastWestTunnel/scripts.inc index 887137dc9..9137a8ad1 100644 --- a/data/maps/UndergroundPath_EastWestTunnel/scripts.inc +++ b/data/maps/UndergroundPath_EastWestTunnel/scripts.inc @@ -3,5 +3,5 @@ UndergroundPath_EastWestTunnel_MapScripts:: @ 8160ED3 .byte 0 UndergroundPath_EastWestTunnel_MapScript1_160ED9:: @ 8160ED9 - setworldmapflag 2216 + setworldmapflag FLAG_WORLD_MAP_UNDERGROUND_PATH_EAST_WEST_TUNNEL end diff --git a/data/maps/UndergroundPath_NorthSouthTunnel/scripts.inc b/data/maps/UndergroundPath_NorthSouthTunnel/scripts.inc index ff3274fdf..408a60fee 100644 --- a/data/maps/UndergroundPath_NorthSouthTunnel/scripts.inc +++ b/data/maps/UndergroundPath_NorthSouthTunnel/scripts.inc @@ -3,5 +3,5 @@ UndergroundPath_NorthSouthTunnel_MapScripts:: @ 8160EB5 .byte 0 UndergroundPath_NorthSouthTunnel_MapScript1_160EBB:: @ 8160EBB - setworldmapflag 2215 + setworldmapflag FLAG_WORLD_MAP_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL end diff --git a/data/maps/VermilionCity/scripts.inc b/data/maps/VermilionCity/scripts.inc index 3bd6fb07c..8c0b7a1de 100644 --- a/data/maps/VermilionCity/scripts.inc +++ b/data/maps/VermilionCity/scripts.inc @@ -21,7 +21,7 @@ Movement_166903:: @ 8166903 step_end VermilionCity_MapScript1_166906:: @ 8166906 - setworldmapflag 2197 + setworldmapflag FLAG_WORLD_MAP_VERMILION_CITY checkflag FLAG_0x2F9 call_if 1, EventScript_166913 end diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index e5afd3e26..2849015d2 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -14,7 +14,7 @@ EventScript_160F1C:: @ 8160F1C return VictoryRoad_1F_MapScript2_160F2F:: @ 8160F2F - setworldmapflag 2218 + setworldmapflag FLAG_WORLD_MAP_VICTORY_ROAD_1F end VictoryRoad_1F_EventScript_160F33:: @ 8160F33 diff --git a/data/maps/ViridianForest/scripts.inc b/data/maps/ViridianForest/scripts.inc index ca8e1dce9..68c5da06a 100644 --- a/data/maps/ViridianForest/scripts.inc +++ b/data/maps/ViridianForest/scripts.inc @@ -3,7 +3,7 @@ ViridianForest_MapScripts:: @ 816051F .byte 0 ViridianForest_MapScript1_160525:: @ 8160525 - setworldmapflag 2212 + setworldmapflag FLAG_WORLD_MAP_VIRIDIAN_FOREST end ViridianForest_EventScript_160529:: @ 8160529 |