fix map and layout constants

Missingmew · May 10, 2019 · 4b98d7d · 4b98d7d
1 parent 2536b96
commit 4b98d7d
Show file tree

Hide file tree

Showing 71 changed files with 807 additions and 807 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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