diff options
Diffstat (limited to 'data')
68 files changed, 108 insertions, 108 deletions
diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc index 9043b3cef..d682f3d7a 100644 --- a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc @@ -72,7 +72,7 @@ EventScript_16C1F3:: @ 816C1F3 EventScript_16C246:: @ 816C246 setvar VAR_0x8006, 4 - setdynamicwarp MAP_CELADONCITY_DEPARTMENTSTORE_1F, 255, 6, 1 + setdynamicwarp MAP_CELADON_CITY_DEPARTMENTSTORE_1F, 255, 6, 1 compare_var_to_value VAR_0x403A, 4 goto_if 1, EventScript_16C30E call EventScript_16C313 @@ -82,7 +82,7 @@ EventScript_16C246:: @ 816C246 EventScript_16C26E:: @ 816C26E setvar VAR_0x8006, 5 - setdynamicwarp MAP_CELADONCITY_DEPARTMENTSTORE_2F, 255, 6, 1 + setdynamicwarp MAP_CELADON_CITY_DEPARTMENTSTORE_2F, 255, 6, 1 compare_var_to_value VAR_0x403A, 5 goto_if 1, EventScript_16C30E call EventScript_16C313 @@ -92,7 +92,7 @@ EventScript_16C26E:: @ 816C26E EventScript_16C296:: @ 816C296 setvar VAR_0x8006, 6 - setdynamicwarp MAP_CELADONCITY_DEPARTMENTSTORE_3F, 255, 6, 1 + setdynamicwarp MAP_CELADON_CITY_DEPARTMENTSTORE_3F, 255, 6, 1 compare_var_to_value VAR_0x403A, 6 goto_if 1, EventScript_16C30E call EventScript_16C313 @@ -102,7 +102,7 @@ EventScript_16C296:: @ 816C296 EventScript_16C2BE:: @ 816C2BE setvar VAR_0x8006, 7 - setdynamicwarp MAP_CELADONCITY_DEPARTMENTSTORE_4F, 255, 6, 1 + setdynamicwarp MAP_CELADON_CITY_DEPARTMENTSTORE_4F, 255, 6, 1 compare_var_to_value VAR_0x403A, 7 goto_if 1, EventScript_16C30E call EventScript_16C313 @@ -112,7 +112,7 @@ EventScript_16C2BE:: @ 816C2BE EventScript_16C2E6:: @ 816C2E6 setvar VAR_0x8006, 8 - setdynamicwarp MAP_CELADONCITY_DEPARTMENTSTORE_5F, 255, 6, 1 + setdynamicwarp MAP_CELADON_CITY_DEPARTMENTSTORE_5F, 255, 6, 1 compare_var_to_value VAR_0x403A, 8 goto_if 1, EventScript_16C30E call EventScript_16C313 diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc index 554dd6943..3c15dfb23 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc @@ -53,7 +53,7 @@ CinnabarIsland_PokemonCenter_1F_EventScript_16E90A:: @ 816E90A removeobject 7 setvar VAR_0x408A, 1 clearflag FLAG_0x062 - warp MAP_CINNABARISLAND, 255, 14, 11 + warp MAP_CINNABAR_ISLAND, 255, 14, 11 waitstate release end diff --git a/data/maps/FiveIsland/connections.inc b/data/maps/FiveIsland/connections.inc index ef2c82e8c..358b5e899 100644 --- a/data/maps/FiveIsland/connections.inc +++ b/data/maps/FiveIsland/connections.inc @@ -1,6 +1,6 @@ FiveIsland_MapConnectionsList: @ 8352988 - connection up, -48, MAP_FIVEISLAND_WATERLABYRINTH - connection right, 0, MAP_FIVEISLAND_MEADOW + connection up, -48, MAP_FIVE_ISLAND_WATERLABYRINTH + connection right, 0, MAP_FIVE_ISLAND_MEADOW FiveIsland_MapConnections:: @ 83529A0 .4byte 2 diff --git a/data/maps/FiveIsland_LostCave_Room10/scripts.inc b/data/maps/FiveIsland_LostCave_Room10/scripts.inc index 4cc0d7204..f44edc660 100644 --- a/data/maps/FiveIsland_LostCave_Room10/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room10/scripts.inc @@ -34,7 +34,7 @@ EventScript_164C52:: @ 8164C52 callstd 4 closemessage call EventScript_164CA5 - warp MAP_FIVEISLAND_RESORTGORGEOUS, 255, 39, 10 + warp MAP_FIVE_ISLAND_RESORTGORGEOUS, 255, 39, 10 waitstate releaseall end diff --git a/data/maps/FiveIsland_Meadow/connections.inc b/data/maps/FiveIsland_Meadow/connections.inc index 87bded6c7..e6a63a6e1 100644 --- a/data/maps/FiveIsland_Meadow/connections.inc +++ b/data/maps/FiveIsland_Meadow/connections.inc @@ -1,6 +1,6 @@ FiveIsland_Meadow_MapConnectionsList: @ 8352DDC - connection left, 0, MAP_FIVEISLAND - connection right, 20, MAP_FIVEISLAND_MEMORIALPILLAR + connection left, 0, MAP_FIVE_ISLAND + connection right, 20, MAP_FIVE_ISLAND_MEMORIALPILLAR FiveIsland_Meadow_MapConnections:: @ 8352DF4 .4byte 2 diff --git a/data/maps/FiveIsland_MemorialPillar/connections.inc b/data/maps/FiveIsland_MemorialPillar/connections.inc index adc49a1af..24624b004 100644 --- a/data/maps/FiveIsland_MemorialPillar/connections.inc +++ b/data/maps/FiveIsland_MemorialPillar/connections.inc @@ -1,5 +1,5 @@ FiveIsland_MemorialPillar_MapConnectionsList: @ 8352DFC - connection left, -20, MAP_FIVEISLAND_MEADOW + connection left, -20, MAP_FIVE_ISLAND_MEADOW FiveIsland_MemorialPillar_MapConnections:: @ 8352E08 .4byte 1 diff --git a/data/maps/FiveIsland_ResortGorgeous/connections.inc b/data/maps/FiveIsland_ResortGorgeous/connections.inc index 97d3b0007..a7f2f02dc 100644 --- a/data/maps/FiveIsland_ResortGorgeous/connections.inc +++ b/data/maps/FiveIsland_ResortGorgeous/connections.inc @@ -1,5 +1,5 @@ FiveIsland_ResortGorgeous_MapConnectionsList: @ 8352DA8 - connection down, -48, MAP_FIVEISLAND_WATERLABYRINTH + connection down, -48, MAP_FIVE_ISLAND_WATERLABYRINTH FiveIsland_ResortGorgeous_MapConnections:: @ 8352DB4 .4byte 1 diff --git a/data/maps/FiveIsland_WaterLabyrinth/connections.inc b/data/maps/FiveIsland_WaterLabyrinth/connections.inc index 69a0b4a6d..8c0351ad5 100644 --- a/data/maps/FiveIsland_WaterLabyrinth/connections.inc +++ b/data/maps/FiveIsland_WaterLabyrinth/connections.inc @@ -1,6 +1,6 @@ FiveIsland_WaterLabyrinth_MapConnectionsList: @ 8352DBC - connection up, 48, MAP_FIVEISLAND_RESORTGORGEOUS - connection down, 48, MAP_FIVEISLAND + connection up, 48, MAP_FIVE_ISLAND_RESORTGORGEOUS + connection down, 48, MAP_FIVE_ISLAND FiveIsland_WaterLabyrinth_MapConnections:: @ 8352DD4 .4byte 2 diff --git a/data/maps/FourIsland_IcefallCave_1F/scripts.inc b/data/maps/FourIsland_IcefallCave_1F/scripts.inc index a2b992a6d..0698ff061 100644 --- a/data/maps/FourIsland_IcefallCave_1F/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_1F/scripts.inc @@ -23,7 +23,7 @@ EventScript_163D65:: @ 8163D65 waitmovement 0 playse SE_FU_ZAKU delay 60 - warphole MAP_FOURISLAND_ICEFALLCAVE_B1F + warphole MAP_FOUR_ISLAND_ICEFALLCAVE_B1F waitstate releaseall end diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc index 58d68162b..157b1dbdb 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc @@ -59,7 +59,7 @@ EventScript_16D345:: @ 816D345 closemessage applymovement 255, Movement_16D365 waitmovement 0 - warp MAP_SAFARIZONE_CENTER, 255, 26, 30 + warp MAP_SAFARI_ZONE_CENTER, 255, 26, 30 waitstate end @@ -144,7 +144,7 @@ EventScript_16D3CA:: @ 816D3CA call_if 1, EventScript_16D457 special sub_80A0EC4 setvar VAR_0x406E, 2 - warp MAP_SAFARIZONE_CENTER, 255, 26, 30 + warp MAP_SAFARI_ZONE_CENTER, 255, 26, 30 waitstate end diff --git a/data/maps/OneIsland/connections.inc b/data/maps/OneIsland/connections.inc index 0b3fa21bf..edc8a5047 100644 --- a/data/maps/OneIsland/connections.inc +++ b/data/maps/OneIsland/connections.inc @@ -1,6 +1,6 @@ OneIsland_MapConnectionsList: @ 8352934 - connection down, 0, MAP_ONEISLAND_TREASUREBEACH - connection right, -120, MAP_ONEISLAND_KINDLEROAD + connection down, 0, MAP_ONE_ISLAND_TREASUREBEACH + connection right, -120, MAP_ONE_ISLAND_KINDLEROAD OneIsland_MapConnections:: @ 835294C .4byte 2 diff --git a/data/maps/OneIsland/scripts.inc b/data/maps/OneIsland/scripts.inc index d400fce9e..2735d7481 100644 --- a/data/maps/OneIsland/scripts.inc +++ b/data/maps/OneIsland/scripts.inc @@ -31,7 +31,7 @@ EventScript_16749D:: @ 816749D waitdooranim removeobject 1 setvar VAR_0x4075, 3 - warp MAP_ONEISLAND_POKEMONCENTER_1F, 255, 9, 9 + warp MAP_ONE_ISLAND_POKEMONCENTER_1F, 255, 9, 9 waitstate releaseall end diff --git a/data/maps/OneIsland_Harbor/scripts.inc b/data/maps/OneIsland_Harbor/scripts.inc index 50526fc0d..60a82c17e 100644 --- a/data/maps/OneIsland_Harbor/scripts.inc +++ b/data/maps/OneIsland_Harbor/scripts.inc @@ -21,7 +21,7 @@ EventScript_17139C:: @ 817139C applymovement 255, Movement_1713B9 waitmovement 0 setvar VAR_0x4075, 2 - warp MAP_ONEISLAND, 255, 12, 18 + warp MAP_ONE_ISLAND, 255, 12, 18 waitstate releaseall end diff --git a/data/maps/OneIsland_KindleRoad/connections.inc b/data/maps/OneIsland_KindleRoad/connections.inc index a71c8d6cd..c4f7e4073 100644 --- a/data/maps/OneIsland_KindleRoad/connections.inc +++ b/data/maps/OneIsland_KindleRoad/connections.inc @@ -1,5 +1,5 @@ OneIsland_KindleRoad_MapConnectionsList: @ 8352D1C - connection left, 120, MAP_ONEISLAND + connection left, 120, MAP_ONE_ISLAND OneIsland_KindleRoad_MapConnections:: @ 8352D28 .4byte 1 diff --git a/data/maps/OneIsland_TreasureBeach/connections.inc b/data/maps/OneIsland_TreasureBeach/connections.inc index 6ebdc935b..606768f6d 100644 --- a/data/maps/OneIsland_TreasureBeach/connections.inc +++ b/data/maps/OneIsland_TreasureBeach/connections.inc @@ -1,5 +1,5 @@ OneIsland_TreasureBeach_MapConnectionsList: @ 8352D30 - connection up, 0, MAP_ONEISLAND + connection up, 0, MAP_ONE_ISLAND OneIsland_TreasureBeach_MapConnections:: @ 8352D3C .4byte 1 diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc index e482f1fb4..31b4208ec 100644 --- a/data/maps/PalletTown/scripts.inc +++ b/data/maps/PalletTown/scripts.inc @@ -79,7 +79,7 @@ EventScript_1654D8:: @ 81654D8 setvar VAR_0x4055, 7 setvar VAR_0x4050, 3 setflag FLAG_0x02C - warp MAP_PALLETTOWN_PROFESSOROAKSLAB, 255, 6, 12 + warp MAP_PALLET_TOWN_PROFESSOROAKSLAB, 255, 6, 12 waitstate releaseall end @@ -230,7 +230,7 @@ EventScript_165605:: @ 8165605 setvar VAR_0x4050, 1 setflag FLAG_0x02C setflag FLAG_SPECIAL_FLAG_0x4001 - warp MAP_PALLETTOWN_PROFESSOROAKSLAB, 255, 6, 12 + warp MAP_PALLET_TOWN_PROFESSOROAKSLAB, 255, 6, 12 waitstate releaseall end diff --git a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc index 367584edb..81d3ae0fa 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc +++ b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc @@ -110,7 +110,7 @@ EventScript_162B76:: @ 8162B76 applymovement 255, Movement_162D12 waitmovement 0 setvar VAR_0x4001, 1 - warp MAP_POKEMONLEAGUE_HALLOFFAME, 255, 5, 12 + warp MAP_POKEMON_LEAGUE_HALL_OF_FAME, 255, 5, 12 waitstate releaseall end diff --git a/data/maps/PokemonTower_7F/scripts.inc b/data/maps/PokemonTower_7F/scripts.inc index cd3cec22d..963251b49 100644 --- a/data/maps/PokemonTower_7F/scripts.inc +++ b/data/maps/PokemonTower_7F/scripts.inc @@ -13,7 +13,7 @@ PokemonTower_7F_EventScript_16355A:: @ 816355A loadword 0, gUnknown_817A529 callstd 4 closemessage - warp MAP_LAVENDERTOWN_VOLUNTEERPOKEMONHOUSE, 255, 4, 7 + warp MAP_LAVENDER_TOWN_VOLUNTEERPOKEMONHOUSE, 255, 4, 7 waitstate release end diff --git a/data/maps/RocketHideout_Elevator/scripts.inc b/data/maps/RocketHideout_Elevator/scripts.inc index eaa62ba75..9b504ac68 100644 --- a/data/maps/RocketHideout_Elevator/scripts.inc +++ b/data/maps/RocketHideout_Elevator/scripts.inc @@ -60,7 +60,7 @@ EventScript_161554:: @ 8161554 EventScript_161591:: @ 8161591 setvar VAR_0x8006, 3 - setdynamicwarp MAP_ROCKETHIDEOUT_B1F, 255, 24, 25 + setdynamicwarp MAP_ROCKET_HIDEOUT_B1F, 255, 24, 25 compare_var_to_value VAR_0x403A, 3 goto_if 1, EventScript_161609 call EventScript_16160E @@ -72,7 +72,7 @@ EventScript_1615B8:: @ 81615B8 EventScript_1615B9:: @ 81615B9 setvar VAR_0x8006, 2 - setdynamicwarp MAP_ROCKETHIDEOUT_B2F, 255, 28, 16 + setdynamicwarp MAP_ROCKET_HIDEOUT_B2F, 255, 28, 16 compare_var_to_value VAR_0x403A, 2 goto_if 1, EventScript_161609 call EventScript_16160E @@ -84,7 +84,7 @@ EventScript_1615E0:: @ 81615E0 EventScript_1615E1:: @ 81615E1 setvar VAR_0x8006, 0 - setdynamicwarp MAP_ROCKETHIDEOUT_B4F, 255, 20, 23 + setdynamicwarp MAP_ROCKET_HIDEOUT_B4F, 255, 20, 23 compare_var_to_value VAR_0x403A, 0 goto_if 1, EventScript_161609 call EventScript_16160E diff --git a/data/maps/Route1/connections.inc b/data/maps/Route1/connections.inc index d266874a8..76b5b6814 100644 --- a/data/maps/Route1/connections.inc +++ b/data/maps/Route1/connections.inc @@ -1,6 +1,6 @@ Route1_MapConnectionsList: @ 83529DC - connection up, -12, MAP_VIRIDIANCITY - connection down, 0, MAP_PALLETTOWN + connection up, -12, MAP_VIRIDIAN_CITY + connection down, 0, MAP_PALLET_TOWN Route1_MapConnections:: @ 83529F4 .4byte 2 diff --git a/data/maps/Route10/connections.inc b/data/maps/Route10/connections.inc index 3b6a576d2..bd7b4787f 100644 --- a/data/maps/Route10/connections.inc +++ b/data/maps/Route10/connections.inc @@ -1,5 +1,5 @@ Route10_MapConnectionsList: @ 8352AFC - connection down, 0, MAP_LAVENDERTOWN + connection down, 0, MAP_LAVENDER_TOWN connection left, 0, MAP_ROUTE9 Route10_MapConnections:: @ 8352B14 diff --git a/data/maps/Route11/connections.inc b/data/maps/Route11/connections.inc index 3302f7844..d250bb844 100644 --- a/data/maps/Route11/connections.inc +++ b/data/maps/Route11/connections.inc @@ -1,5 +1,5 @@ Route11_MapConnectionsList: @ 8352B1C - connection left, -10, MAP_VERMILIONCITY + connection left, -10, MAP_VERMILION_CITY connection right, -60, MAP_ROUTE12 Route11_MapConnections:: @ 8352B34 diff --git a/data/maps/Route12/connections.inc b/data/maps/Route12/connections.inc index b33041939..ec99ba53b 100644 --- a/data/maps/Route12/connections.inc +++ b/data/maps/Route12/connections.inc @@ -1,5 +1,5 @@ Route12_MapConnectionsList: @ 8352B3C - connection up, 0, MAP_LAVENDERTOWN + connection up, 0, MAP_LAVENDER_TOWN connection down, -48, MAP_ROUTE13 connection left, 60, MAP_ROUTE11 diff --git a/data/maps/Route15/connections.inc b/data/maps/Route15/connections.inc index dfd4ba536..3706a64ed 100644 --- a/data/maps/Route15/connections.inc +++ b/data/maps/Route15/connections.inc @@ -1,5 +1,5 @@ Route15_MapConnectionsList: @ 8352BA8 - connection left, -10, MAP_FUCHSIACITY + connection left, -10, MAP_FUCHSIA_CITY connection right, -40, MAP_ROUTE14 Route15_MapConnections:: @ 8352BC0 diff --git a/data/maps/Route16/connections.inc b/data/maps/Route16/connections.inc index 5d1dc6f62..c48d0b461 100644 --- a/data/maps/Route16/connections.inc +++ b/data/maps/Route16/connections.inc @@ -1,6 +1,6 @@ Route16_MapConnectionsList: @ 8352BC8 connection down, 0, MAP_ROUTE17 - connection right, -10, MAP_CELADONCITY + connection right, -10, MAP_CELADON_CITY Route16_MapConnections:: @ 8352BE0 .4byte 2 diff --git a/data/maps/Route18/connections.inc b/data/maps/Route18/connections.inc index 93004416c..dd721edac 100644 --- a/data/maps/Route18/connections.inc +++ b/data/maps/Route18/connections.inc @@ -1,6 +1,6 @@ Route18_MapConnectionsList: @ 8352C08 connection up, 0, MAP_ROUTE17 - connection right, -10, MAP_FUCHSIACITY + connection right, -10, MAP_FUCHSIA_CITY Route18_MapConnections:: @ 8352C20 .4byte 2 diff --git a/data/maps/Route19/connections.inc b/data/maps/Route19/connections.inc index e41f1f3be..c93520d52 100644 --- a/data/maps/Route19/connections.inc +++ b/data/maps/Route19/connections.inc @@ -1,5 +1,5 @@ Route19_MapConnectionsList: @ 8352C28 - connection up, -12, MAP_FUCHSIACITY + connection up, -12, MAP_FUCHSIA_CITY connection left, 40, MAP_ROUTE20 Route19_MapConnections:: @ 8352C40 diff --git a/data/maps/Route2/connections.inc b/data/maps/Route2/connections.inc index 43b34821a..d37b77d96 100644 --- a/data/maps/Route2/connections.inc +++ b/data/maps/Route2/connections.inc @@ -1,6 +1,6 @@ Route2_MapConnectionsList: @ 83529FC - connection up, -12, MAP_PEWTERCITY - connection down, -12, MAP_VIRIDIANCITY + connection up, -12, MAP_PEWTER_CITY + connection down, -12, MAP_VIRIDIAN_CITY Route2_MapConnections:: @ 8352A14 .4byte 2 diff --git a/data/maps/Route20/connections.inc b/data/maps/Route20/connections.inc index 68e80a6df..36d679ff9 100644 --- a/data/maps/Route20/connections.inc +++ b/data/maps/Route20/connections.inc @@ -1,5 +1,5 @@ Route20_MapConnectionsList: @ 8352C48 - connection left, 0, MAP_CINNABARISLAND + connection left, 0, MAP_CINNABAR_ISLAND connection right, -40, MAP_ROUTE19 Route20_MapConnections:: @ 8352C60 diff --git a/data/maps/Route21_North/connections.inc b/data/maps/Route21_North/connections.inc index ab2268115..b272c4b9a 100644 --- a/data/maps/Route21_North/connections.inc +++ b/data/maps/Route21_North/connections.inc @@ -1,5 +1,5 @@ Route21_North_MapConnectionsList: @ 8352C68 - connection up, 0, MAP_PALLETTOWN + connection up, 0, MAP_PALLET_TOWN connection down, 0, MAP_ROUTE21_SOUTH Route21_North_MapConnections:: @ 8352C80 diff --git a/data/maps/Route21_South/connections.inc b/data/maps/Route21_South/connections.inc index 0342cf8db..13204e356 100644 --- a/data/maps/Route21_South/connections.inc +++ b/data/maps/Route21_South/connections.inc @@ -1,6 +1,6 @@ Route21_South_MapConnectionsList: @ 8352C88 connection up, 0, MAP_ROUTE21_NORTH - connection down, 0, MAP_CINNABARISLAND + connection down, 0, MAP_CINNABAR_ISLAND Route21_South_MapConnections:: @ 8352CA0 .4byte 2 diff --git a/data/maps/Route22/connections.inc b/data/maps/Route22/connections.inc index f7818efd5..f9c5a939b 100644 --- a/data/maps/Route22/connections.inc +++ b/data/maps/Route22/connections.inc @@ -1,6 +1,6 @@ Route22_MapConnectionsList: @ 8352CA8 connection up, 0, MAP_ROUTE23 - connection right, -10, MAP_VIRIDIANCITY + connection right, -10, MAP_VIRIDIAN_CITY Route22_MapConnections:: @ 8352CC0 .4byte 2 diff --git a/data/maps/Route23/connections.inc b/data/maps/Route23/connections.inc index 74319d6ef..9b052d1c7 100644 --- a/data/maps/Route23/connections.inc +++ b/data/maps/Route23/connections.inc @@ -1,5 +1,5 @@ Route23_MapConnectionsList: @ 8352CC8 - connection up, 0, MAP_INDIGOPLATEAU_EXTERIOR + connection up, 0, MAP_INDIGO_PLATEAU_EXTERIOR connection down, 0, MAP_ROUTE22 Route23_MapConnections:: @ 8352CE0 diff --git a/data/maps/Route24/connections.inc b/data/maps/Route24/connections.inc index 316966465..a255e904a 100644 --- a/data/maps/Route24/connections.inc +++ b/data/maps/Route24/connections.inc @@ -1,5 +1,5 @@ Route24_MapConnectionsList: @ 8352CE8 - connection down, -12, MAP_CERULEANCITY + connection down, -12, MAP_CERULEAN_CITY connection right, 0, MAP_ROUTE25 Route24_MapConnections:: @ 8352D00 diff --git a/data/maps/Route3/connections.inc b/data/maps/Route3/connections.inc index b1e352125..77fc58c67 100644 --- a/data/maps/Route3/connections.inc +++ b/data/maps/Route3/connections.inc @@ -1,6 +1,6 @@ Route3_MapConnectionsList: @ 8352A1C connection up, 60, MAP_ROUTE4 - connection left, -10, MAP_PEWTERCITY + connection left, -10, MAP_PEWTER_CITY Route3_MapConnections:: @ 8352A34 .4byte 2 diff --git a/data/maps/Route4/connections.inc b/data/maps/Route4/connections.inc index 3e735e3b3..7886e6c30 100644 --- a/data/maps/Route4/connections.inc +++ b/data/maps/Route4/connections.inc @@ -1,6 +1,6 @@ Route4_MapConnectionsList: @ 8352A3C connection down, -60, MAP_ROUTE3 - connection right, -10, MAP_CERULEANCITY + connection right, -10, MAP_CERULEAN_CITY Route4_MapConnections:: @ 8352A54 .4byte 2 diff --git a/data/maps/Route5/connections.inc b/data/maps/Route5/connections.inc index edf2fbc65..bf4730e02 100644 --- a/data/maps/Route5/connections.inc +++ b/data/maps/Route5/connections.inc @@ -1,6 +1,6 @@ Route5_MapConnectionsList: @ 8352A5C - connection up, 0, MAP_CERULEANCITY - connection down, 0, MAP_SAFFRONCITY + connection up, 0, MAP_CERULEAN_CITY + connection down, 0, MAP_SAFFRON_CITY Route5_MapConnections:: @ 8352A74 .4byte 2 diff --git a/data/maps/Route6/connections.inc b/data/maps/Route6/connections.inc index f4b3500bc..7f0a3d191 100644 --- a/data/maps/Route6/connections.inc +++ b/data/maps/Route6/connections.inc @@ -1,6 +1,6 @@ Route6_MapConnectionsList: @ 8352A7C - connection up, 0, MAP_SAFFRONCITY - connection down, -12, MAP_VERMILIONCITY + connection up, 0, MAP_SAFFRON_CITY + connection down, -12, MAP_VERMILION_CITY Route6_MapConnections:: @ 8352A94 .4byte 2 diff --git a/data/maps/Route7/connections.inc b/data/maps/Route7/connections.inc index 63d59a73a..dec257fa1 100644 --- a/data/maps/Route7/connections.inc +++ b/data/maps/Route7/connections.inc @@ -1,6 +1,6 @@ Route7_MapConnectionsList: @ 8352A9C - connection left, -10, MAP_CELADONCITY - connection right, -10, MAP_SAFFRONCITY + connection left, -10, MAP_CELADON_CITY + connection right, -10, MAP_SAFFRON_CITY Route7_MapConnections:: @ 8352AB4 .4byte 2 diff --git a/data/maps/Route8/connections.inc b/data/maps/Route8/connections.inc index 38d2746fe..864cc0831 100644 --- a/data/maps/Route8/connections.inc +++ b/data/maps/Route8/connections.inc @@ -1,6 +1,6 @@ Route8_MapConnectionsList: @ 8352ABC - connection left, -10, MAP_SAFFRONCITY - connection right, 0, MAP_LAVENDERTOWN + connection left, -10, MAP_SAFFRON_CITY + connection right, 0, MAP_LAVENDER_TOWN Route8_MapConnections:: @ 8352AD4 .4byte 2 diff --git a/data/maps/Route9/connections.inc b/data/maps/Route9/connections.inc index fb8906ece..6e4cb62e2 100644 --- a/data/maps/Route9/connections.inc +++ b/data/maps/Route9/connections.inc @@ -1,5 +1,5 @@ Route9_MapConnectionsList: @ 8352ADC - connection left, -10, MAP_CERULEANCITY + connection left, -10, MAP_CERULEAN_CITY connection right, 0, MAP_ROUTE10 Route9_MapConnections:: @ 8352AF4 diff --git a/data/maps/SSAnne_1F_Room11/scripts.inc b/data/maps/SSAnne_1F_Room11/scripts.inc index 4fe45988b..35696cb68 100644 --- a/data/maps/SSAnne_1F_Room11/scripts.inc +++ b/data/maps/SSAnne_1F_Room11/scripts.inc @@ -12,11 +12,11 @@ SSAnne_1F_Room11_MapScript1_16455F:: @ 816455F end EventScript_16457E:: @ 816457E - setescapewarp MAP_SIXISLAND_GREENPATH, 255, 64, 10 + setescapewarp MAP_SIX_ISLAND_GREENPATH, 255, 64, 10 return EventScript_164587:: @ 8164587 - setescapewarp MAP_SIXISLAND_GREENPATH, 255, 45, 10 + setescapewarp MAP_SIX_ISLAND_GREENPATH, 255, 45, 10 return SSAnne_1F_Room11_EventScript_164590:: @ 8164590 diff --git a/data/maps/SSAnne_Exterior/scripts.inc b/data/maps/SSAnne_Exterior/scripts.inc index 1bcec87a2..6a4e14a50 100644 --- a/data/maps/SSAnne_Exterior/scripts.inc +++ b/data/maps/SSAnne_Exterior/scripts.inc @@ -27,7 +27,7 @@ SSAnne_Exterior_160859:: @ 8160859 waitmovement 0 setvar VAR_0x407E, 2 setvar VAR_0x4053, 0 - warp MAP_VERMILIONCITY, 255, 23, 34 + warp MAP_VERMILION_CITY, 255, 23, 34 waitstate releaseall end diff --git a/data/maps/SeafoamIslands_B3F/scripts.inc b/data/maps/SeafoamIslands_B3F/scripts.inc index 1469509eb..ee619cb70 100644 --- a/data/maps/SeafoamIslands_B3F/scripts.inc +++ b/data/maps/SeafoamIslands_B3F/scripts.inc @@ -25,7 +25,7 @@ EventScript_162F90:: @ 8162F90 return EventScript_162F94:: @ 8162F94 - setmaplayoutindex LAYOUT_UNUSEDLAYOUT_833B6EC + setmaplayoutindex LAYOUT_UNUSED_LAYOUT_833B6EC return SeafoamIslands_B3F_MapScript2_162F98:: @ 8162F98 @@ -47,7 +47,7 @@ EventScript_162FA2:: @ 8162FA2 compare_var_to_value VAR_0x8008, 24 call_if 4, EventScript_163001 setvar VAR_0x4063, 1 - warp MAP_SEAFOAMISLANDS_B4F, 255, 27, 21 + warp MAP_SEAFOAM_ISLANDS_B4F, 255, 27, 21 waitstate releaseall end diff --git a/data/maps/SeafoamIslands_B4F/scripts.inc b/data/maps/SeafoamIslands_B4F/scripts.inc index a202650ee..47d6deec2 100644 --- a/data/maps/SeafoamIslands_B4F/scripts.inc +++ b/data/maps/SeafoamIslands_B4F/scripts.inc @@ -42,7 +42,7 @@ EventScript_1630A5:: @ 81630A5 return EventScript_1630A9:: @ 81630A9 - setmaplayoutindex LAYOUT_UNUSEDLAYOUT_833BE30 + setmaplayoutindex LAYOUT_UNUSED_LAYOUT_833BE30 return EventScript_1630AD:: @ 81630AD diff --git a/data/maps/SevenIsland/connections.inc b/data/maps/SevenIsland/connections.inc index 307457174..37634bef6 100644 --- a/data/maps/SevenIsland/connections.inc +++ b/data/maps/SevenIsland/connections.inc @@ -1,6 +1,6 @@ SevenIsland_MapConnectionsList: @ 83529A8 - connection up, -48, MAP_SEVENISLAND_TRAINERTOWER - connection down, 0, MAP_SEVENISLAND_SEVAULTCANYON_ENTRANCE + connection up, -48, MAP_SEVEN_ISLAND_TRAINERTOWER + connection down, 0, MAP_SEVEN_ISLAND_SEVAULTCANYON_ENTRANCE SevenIsland_MapConnections:: @ 83529C0 .4byte 2 diff --git a/data/maps/SevenIsland_House_Room1/scripts.inc b/data/maps/SevenIsland_House_Room1/scripts.inc index 4838fb2cf..6b7b8acd4 100644 --- a/data/maps/SevenIsland_House_Room1/scripts.inc +++ b/data/maps/SevenIsland_House_Room1/scripts.inc @@ -15,7 +15,7 @@ EventScript_1708AF:: @ 81708AF setvar VAR_0x4001, 1 setobjectxyperm 1, 4, 2 setobjectmovementtype 1, 8 - setmaplayoutindex LAYOUT_UNUSEDLAYOUT_8338B4C + setmaplayoutindex LAYOUT_UNUSED_LAYOUT_8338B4C return EventScript_1708C3:: @ 81708C3 @@ -122,7 +122,7 @@ EventScript_170987:: @ 8170987 call_if 1, EventScript_170A3F compare_var_to_value VAR_FACING, 3 call_if 1, EventScript_170A51 - warp MAP_SEVENISLAND_HOUSE_ROOM2, 255, 3, 1 + warp MAP_SEVEN_ISLAND_HOUSE_ROOM2, 255, 3, 1 waitstate release end diff --git a/data/maps/SevenIsland_House_Room2/scripts.inc b/data/maps/SevenIsland_House_Room2/scripts.inc index 13d5e0170..0d10a3bec 100644 --- a/data/maps/SevenIsland_House_Room2/scripts.inc +++ b/data/maps/SevenIsland_House_Room2/scripts.inc @@ -35,7 +35,7 @@ EventScript_170A97:: @ 8170A97 waitmovement 0 special LoadPlayerParty setvar VAR_0x4001, 1 - warp MAP_SEVENISLAND_HOUSE_ROOM1, 255, 4, 1 + warp MAP_SEVEN_ISLAND_HOUSE_ROOM1, 255, 4, 1 waitstate releaseall end diff --git a/data/maps/SevenIsland_SevaultCanyon/connections.inc b/data/maps/SevenIsland_SevaultCanyon/connections.inc index a1f25bbdc..a721d7165 100644 --- a/data/maps/SevenIsland_SevaultCanyon/connections.inc +++ b/data/maps/SevenIsland_SevaultCanyon/connections.inc @@ -1,6 +1,6 @@ SevenIsland_SevaultCanyon_MapConnectionsList: @ 8352EB8 - connection down, -48, MAP_SEVENISLAND_TANOBYRUINS - connection left, -20, MAP_SEVENISLAND_SEVAULTCANYON_ENTRANCE + connection down, -48, MAP_SEVEN_ISLAND_TANOBYRUINS + connection left, -20, MAP_SEVEN_ISLAND_SEVAULTCANYON_ENTRANCE SevenIsland_SevaultCanyon_MapConnections:: @ 8352ED0 .4byte 2 diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/connections.inc b/data/maps/SevenIsland_SevaultCanyon_Entrance/connections.inc index c4f3ade75..f2f113fcd 100644 --- a/data/maps/SevenIsland_SevaultCanyon_Entrance/connections.inc +++ b/data/maps/SevenIsland_SevaultCanyon_Entrance/connections.inc @@ -1,6 +1,6 @@ SevenIsland_SevaultCanyon_Entrance_MapConnectionsList: @ 8352E98 - connection up, 0, MAP_SEVENISLAND - connection right, 20, MAP_SEVENISLAND_SEVAULTCANYON + connection up, 0, MAP_SEVEN_ISLAND + connection right, 20, MAP_SEVEN_ISLAND_SEVAULTCANYON SevenIsland_SevaultCanyon_Entrance_MapConnections:: @ 8352EB0 .4byte 2 diff --git a/data/maps/SevenIsland_TanobyRuins/connections.inc b/data/maps/SevenIsland_TanobyRuins/connections.inc index 12dd24cdf..988852ae9 100644 --- a/data/maps/SevenIsland_TanobyRuins/connections.inc +++ b/data/maps/SevenIsland_TanobyRuins/connections.inc @@ -1,5 +1,5 @@ SevenIsland_TanobyRuins_MapConnectionsList: @ 8352ED8 - connection up, 48, MAP_SEVENISLAND_SEVAULTCANYON + connection up, 48, MAP_SEVEN_ISLAND_SEVAULTCANYON SevenIsland_TanobyRuins_MapConnections:: @ 8352EE4 .4byte 1 diff --git a/data/maps/SevenIsland_TrainerTower/connections.inc b/data/maps/SevenIsland_TrainerTower/connections.inc index d6a8c579c..4c55ced6e 100644 --- a/data/maps/SevenIsland_TrainerTower/connections.inc +++ b/data/maps/SevenIsland_TrainerTower/connections.inc @@ -1,5 +1,5 @@ SevenIsland_TrainerTower_MapConnectionsList: @ 8352E84 - connection down, 48, MAP_SEVENISLAND + connection down, 48, MAP_SEVEN_ISLAND SevenIsland_TrainerTower_MapConnections:: @ 8352E90 .4byte 1 diff --git a/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc b/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc index b26dec885..725b043e5 100644 --- a/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc @@ -45,7 +45,7 @@ EventScript_164B5E:: @ 8164B5E EventScript_164B90:: @ 8164B90 setvar VAR_0x8006, 3 - setdynamicwarp MAP_SEVENISLAND_TRAINERTOWER_LOBBY, 255, 17, 8 + setdynamicwarp MAP_SEVEN_ISLAND_TRAINERTOWER_LOBBY, 255, 17, 8 compare_var_to_value VAR_0x403A, 3 goto_if 1, EventScript_164BD3 call EventScript_164BD8 @@ -54,7 +54,7 @@ EventScript_164B90:: @ 8164B90 delay 25 applymovement 255, Movement_164BE5 waitmovement 0 - warp MAP_SEVENISLAND_TRAINERTOWER_LOBBY, 255, 17, 8 + warp MAP_SEVEN_ISLAND_TRAINERTOWER_LOBBY, 255, 17, 8 waitstate releaseall end diff --git a/data/maps/SilphCo_Elevator/scripts.inc b/data/maps/SilphCo_Elevator/scripts.inc index 2f2760c5f..118d5efd4 100644 --- a/data/maps/SilphCo_Elevator/scripts.inc +++ b/data/maps/SilphCo_Elevator/scripts.inc @@ -45,7 +45,7 @@ SilphCo_Elevator_EventScript_161F6F:: @ 8161F6F EventScript_16202F:: @ 816202F setvar VAR_0x8006, 4 - setdynamicwarp MAP_SILPHCO_1F, 255, 22, 3 + setdynamicwarp MAP_SILPH_CO_1F, 255, 22, 3 compare_var_to_value VAR_0x403A, 4 goto_if 1, EventScript_1621E7 call EventScript_1621EC @@ -57,7 +57,7 @@ EventScript_162056:: @ 8162056 EventScript_162057:: @ 8162057 setvar VAR_0x8006, 5 - setdynamicwarp MAP_SILPHCO_2F, 255, 22, 3 + setdynamicwarp MAP_SILPH_CO_2F, 255, 22, 3 compare_var_to_value VAR_0x403A, 5 goto_if 1, EventScript_1621E7 call EventScript_1621EC @@ -69,7 +69,7 @@ EventScript_16207E:: @ 816207E EventScript_16207F:: @ 816207F setvar VAR_0x8006, 6 - setdynamicwarp MAP_SILPHCO_3F, 255, 22, 3 + setdynamicwarp MAP_SILPH_CO_3F, 255, 22, 3 compare_var_to_value VAR_0x403A, 6 goto_if 1, EventScript_1621E7 call EventScript_1621EC @@ -81,7 +81,7 @@ EventScript_1620A6:: @ 81620A6 EventScript_1620A7:: @ 81620A7 setvar VAR_0x8006, 7 - setdynamicwarp MAP_SILPHCO_4F, 255, 22, 3 + setdynamicwarp MAP_SILPH_CO_4F, 255, 22, 3 compare_var_to_value VAR_0x403A, 7 goto_if 1, EventScript_1621E7 call EventScript_1621EC @@ -93,7 +93,7 @@ EventScript_1620CE:: @ 81620CE EventScript_1620CF:: @ 81620CF setvar VAR_0x8006, 8 - setdynamicwarp MAP_SILPHCO_5F, 255, 22, 3 + setdynamicwarp MAP_SILPH_CO_5F, 255, 22, 3 compare_var_to_value VAR_0x403A, 8 goto_if 1, EventScript_1621E7 call EventScript_1621EC @@ -105,7 +105,7 @@ EventScript_1620F6:: @ 81620F6 EventScript_1620F7:: @ 81620F7 setvar VAR_0x8006, 9 - setdynamicwarp MAP_SILPHCO_6F, 255, 20, 3 + setdynamicwarp MAP_SILPH_CO_6F, 255, 20, 3 compare_var_to_value VAR_0x403A, 9 goto_if 1, EventScript_1621E7 call EventScript_1621EC @@ -117,7 +117,7 @@ EventScript_16211E:: @ 816211E EventScript_16211F:: @ 816211F setvar VAR_0x8006, 10 - setdynamicwarp MAP_SILPHCO_7F, 255, 23, 3 + setdynamicwarp MAP_SILPH_CO_7F, 255, 23, 3 compare_var_to_value VAR_0x403A, 10 goto_if 1, EventScript_1621E7 call EventScript_1621EC @@ -129,7 +129,7 @@ EventScript_162146:: @ 8162146 EventScript_162147:: @ 8162147 setvar VAR_0x8006, 11 - setdynamicwarp MAP_SILPHCO_8F, 255, 22, 3 + setdynamicwarp MAP_SILPH_CO_8F, 255, 22, 3 compare_var_to_value VAR_0x403A, 11 goto_if 1, EventScript_1621E7 call EventScript_1621EC @@ -141,7 +141,7 @@ EventScript_16216E:: @ 816216E EventScript_16216F:: @ 816216F setvar VAR_0x8006, 12 - setdynamicwarp MAP_SILPHCO_9F, 255, 24, 3 + setdynamicwarp MAP_SILPH_CO_9F, 255, 24, 3 compare_var_to_value VAR_0x403A, 12 goto_if 1, EventScript_1621E7 call EventScript_1621EC @@ -153,7 +153,7 @@ EventScript_162196:: @ 8162196 EventScript_162197:: @ 8162197 setvar VAR_0x8006, 13 - setdynamicwarp MAP_SILPHCO_10F, 255, 13, 3 + setdynamicwarp MAP_SILPH_CO_10F, 255, 13, 3 compare_var_to_value VAR_0x403A, 13 goto_if 1, EventScript_1621E7 call EventScript_1621EC @@ -165,7 +165,7 @@ EventScript_1621BE:: @ 81621BE EventScript_1621BF:: @ 81621BF setvar VAR_0x8006, 14 - setdynamicwarp MAP_SILPHCO_11F, 255, 13, 3 + setdynamicwarp MAP_SILPH_CO_11F, 255, 13, 3 compare_var_to_value VAR_0x403A, 14 goto_if 1, EventScript_1621E7 call EventScript_1621EC diff --git a/data/maps/SixIsland/connections.inc b/data/maps/SixIsland/connections.inc index 771221d95..712c8e2cf 100644 --- a/data/maps/SixIsland/connections.inc +++ b/data/maps/SixIsland/connections.inc @@ -1,5 +1,5 @@ SixIsland_MapConnectionsList: @ 83529C8 - connection right, -40, MAP_SIXISLAND_WATERPATH + connection right, -40, MAP_SIX_ISLAND_WATERPATH SixIsland_MapConnections:: @ 83529D4 .4byte 1 diff --git a/data/maps/SixIsland_GreenPath/connections.inc b/data/maps/SixIsland_GreenPath/connections.inc index ce5b74baa..d79db04f9 100644 --- a/data/maps/SixIsland_GreenPath/connections.inc +++ b/data/maps/SixIsland_GreenPath/connections.inc @@ -1,6 +1,6 @@ SixIsland_GreenPath_MapConnectionsList: @ 8352E24 - connection up, 0, MAP_SIXISLAND_OUTCASTISLAND - connection right, 0, MAP_SIXISLAND_WATERPATH + connection up, 0, MAP_SIX_ISLAND_OUTCASTISLAND + connection right, 0, MAP_SIX_ISLAND_WATERPATH SixIsland_GreenPath_MapConnections:: @ 8352E3C .4byte 2 diff --git a/data/maps/SixIsland_OutcastIsland/connections.inc b/data/maps/SixIsland_OutcastIsland/connections.inc index d5159adec..90a67ec97 100644 --- a/data/maps/SixIsland_OutcastIsland/connections.inc +++ b/data/maps/SixIsland_OutcastIsland/connections.inc @@ -1,5 +1,5 @@ SixIsland_OutcastIsland_MapConnectionsList: @ 8352E10 - connection down, 0, MAP_SIXISLAND_GREENPATH + connection down, 0, MAP_SIX_ISLAND_GREENPATH SixIsland_OutcastIsland_MapConnections:: @ 8352E1C .4byte 1 diff --git a/data/maps/SixIsland_RuinValley/connections.inc b/data/maps/SixIsland_RuinValley/connections.inc index 6755f6439..0ac741f5e 100644 --- a/data/maps/SixIsland_RuinValley/connections.inc +++ b/data/maps/SixIsland_RuinValley/connections.inc @@ -1,5 +1,5 @@ SixIsland_RuinValley_MapConnectionsList: @ 8352E70 - connection right, -80, MAP_SIXISLAND_WATERPATH + connection right, -80, MAP_SIX_ISLAND_WATERPATH SixIsland_RuinValley_MapConnections:: @ 8352E7C .4byte 1 diff --git a/data/maps/SixIsland_WaterPath/connections.inc b/data/maps/SixIsland_WaterPath/connections.inc index ab01a61ee..d6849fbb2 100644 --- a/data/maps/SixIsland_WaterPath/connections.inc +++ b/data/maps/SixIsland_WaterPath/connections.inc @@ -1,7 +1,7 @@ SixIsland_WaterPath_MapConnectionsList: @ 8352E44 - connection left, 0, MAP_SIXISLAND_GREENPATH - connection left, 40, MAP_SIXISLAND - connection left, 80, MAP_SIXISLAND_RUINVALLEY + connection left, 0, MAP_SIX_ISLAND_GREENPATH + connection left, 40, MAP_SIX_ISLAND + connection left, 80, MAP_SIX_ISLAND_RUINVALLEY SixIsland_WaterPath_MapConnections:: @ 8352E68 .4byte 3 diff --git a/data/maps/ThreeIsland/connections.inc b/data/maps/ThreeIsland/connections.inc index 1d79c0e6a..2f2d49e94 100644 --- a/data/maps/ThreeIsland/connections.inc +++ b/data/maps/ThreeIsland/connections.inc @@ -1,6 +1,6 @@ ThreeIsland_MapConnectionsList: @ 8352968 - connection down, 0, MAP_THREEISLAND_PORT - connection left, 0, MAP_THREEISLAND_BONDBRIDGE + connection down, 0, MAP_THREE_ISLAND_PORT + connection left, 0, MAP_THREE_ISLAND_BONDBRIDGE ThreeIsland_MapConnections:: @ 8352980 .4byte 2 diff --git a/data/maps/ThreeIsland_BerryForest/scripts.inc b/data/maps/ThreeIsland_BerryForest/scripts.inc index d6cbbdedf..84eb22b43 100644 --- a/data/maps/ThreeIsland_BerryForest/scripts.inc +++ b/data/maps/ThreeIsland_BerryForest/scripts.inc @@ -4,7 +4,7 @@ ThreeIsland_BerryForest_MapScripts:: @ 8163C71 ThreeIsland_BerryForest_MapScript1_163C77:: @ 8163C77 setworldmapflag 2231 - setescapewarp MAP_THREEISLAND_BONDBRIDGE, 255, 12, 6 + setescapewarp MAP_THREE_ISLAND_BONDBRIDGE, 255, 12, 6 end ThreeIsland_BerryForest_EventScript_163C83:: @ 8163C83 @@ -45,7 +45,7 @@ ThreeIsland_BerryForest_EventScript_163C83:: @ 8163C83 setflag FLAG_0x07A setvar VAR_0x4079, 2 clearflag FLAG_0x075 - warp MAP_TWOISLAND_JOYFULGAMECORNER, 255, 6, 6 + warp MAP_TWO_ISLAND_JOYFULGAMECORNER, 255, 6, 6 waitstate release end diff --git a/data/maps/ThreeIsland_BondBridge/connections.inc b/data/maps/ThreeIsland_BondBridge/connections.inc index 113123ac1..ccbb788ec 100644 --- a/data/maps/ThreeIsland_BondBridge/connections.inc +++ b/data/maps/ThreeIsland_BondBridge/connections.inc @@ -1,5 +1,5 @@ ThreeIsland_BondBridge_MapConnectionsList: @ 8352D58 - connection right, 0, MAP_THREEISLAND + connection right, 0, MAP_THREE_ISLAND ThreeIsland_BondBridge_MapConnections:: @ 8352D64 .4byte 1 diff --git a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc index d90dbfd44..dcc142a8d 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc +++ b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc @@ -13,7 +13,7 @@ ThreeIsland_DunsparceTunnel_MapScript1_164D2C:: @ 8164D2C end EventScript_164D50:: @ 8164D50 - setmaplayoutindex LAYOUT_UNUSEDLAYOUT_83453C0 + setmaplayoutindex LAYOUT_UNUSED_LAYOUT_83453C0 return EventScript_164D54:: @ 8164D54 diff --git a/data/maps/ThreeIsland_Port/connections.inc b/data/maps/ThreeIsland_Port/connections.inc index 013d046fb..0c166e50d 100644 --- a/data/maps/ThreeIsland_Port/connections.inc +++ b/data/maps/ThreeIsland_Port/connections.inc @@ -1,5 +1,5 @@ ThreeIsland_Port_MapConnectionsList: @ 8352D6C - connection up, 0, MAP_THREEISLAND + connection up, 0, MAP_THREE_ISLAND ThreeIsland_Port_MapConnections:: @ 8352D78 .4byte 1 diff --git a/data/maps/TwoIsland/connections.inc b/data/maps/TwoIsland/connections.inc index fa4754db1..3cd53b58f 100644 --- a/data/maps/TwoIsland/connections.inc +++ b/data/maps/TwoIsland/connections.inc @@ -1,5 +1,5 @@ TwoIsland_MapConnectionsList: @ 8352954 - connection up, 24, MAP_TWOISLAND_CAPEBRINK + connection up, 24, MAP_TWO_ISLAND_CAPEBRINK TwoIsland_MapConnections:: @ 8352960 .4byte 1 diff --git a/data/maps/TwoIsland_CapeBrink/connections.inc b/data/maps/TwoIsland_CapeBrink/connections.inc index f1fc32b1b..0257526a9 100644 --- a/data/maps/TwoIsland_CapeBrink/connections.inc +++ b/data/maps/TwoIsland_CapeBrink/connections.inc @@ -1,5 +1,5 @@ TwoIsland_CapeBrink_MapConnectionsList: @ 8352D44 - connection down, -24, MAP_TWOISLAND + connection down, -24, MAP_TWO_ISLAND TwoIsland_CapeBrink_MapConnections:: @ 8352D50 .4byte 1 diff --git a/data/maps/UnknownMap_03_50/connections.inc b/data/maps/UnknownMap_03_50/connections.inc index 272c4d026..e975befbc 100644 --- a/data/maps/UnknownMap_03_50/connections.inc +++ b/data/maps/UnknownMap_03_50/connections.inc @@ -1,5 +1,5 @@ UnknownMap_03_50_MapConnectionsList: @ 8352D80 - connection up, 0, MAP_THREEISLAND + connection up, 0, MAP_THREE_ISLAND UnknownMap_03_50_MapConnections:: @ 8352D8C .4byte 1 diff --git a/data/maps/UnknownMap_03_51/connections.inc b/data/maps/UnknownMap_03_51/connections.inc index 034c0c42b..a742682c4 100644 --- a/data/maps/UnknownMap_03_51/connections.inc +++ b/data/maps/UnknownMap_03_51/connections.inc @@ -1,5 +1,5 @@ UnknownMap_03_51_MapConnectionsList: @ 8352D94 - connection up, 0, MAP_THREEISLAND + connection up, 0, MAP_THREE_ISLAND UnknownMap_03_51_MapConnections:: @ 8352DA0 .4byte 1 |