Merge pull request #968 from GriffinRichards/doc-regionmap

Document some pokenav and region map

28 files changed, 28 insertions, 28 deletions

diff --git a/data/maps/AlteringCave/map.json b/data/maps/AlteringCave/map.json
index 0c28b77b8..d466df7ca 100644
--- a/data/maps/AlteringCave/map.json
+++ b/data/maps/AlteringCave/map.json
@@ -3,7 +3,7 @@
   "name": "AlteringCave",
   "layout": "LAYOUT_ALTERING_CAVE",
   "music": "MUS_RG_NANADUNGEON",
-  "region_map_section": "MAPSEC_ALTERING_CAVE_2",
+  "region_map_section": "MAPSEC_ALTERING_CAVE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_UNDERGROUND",
diff --git a/data/maps/BirthIsland_Exterior/map.json b/data/maps/BirthIsland_Exterior/map.json
index 7ebcca911..d52f5f038 100644
--- a/data/maps/BirthIsland_Exterior/map.json
+++ b/data/maps/BirthIsland_Exterior/map.json
@@ -3,7 +3,7 @@
   "name": "BirthIsland_Exterior",
   "layout": "LAYOUT_BIRTH_ISLAND_EXTERIOR",
   "music": "MUS_NONE",
-  "region_map_section": "MAPSEC_BIRTH_ISLAND_2",
+  "region_map_section": "MAPSEC_BIRTH_ISLAND",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_INDOOR",
diff --git a/data/maps/BirthIsland_Harbor/map.json b/data/maps/BirthIsland_Harbor/map.json
index f6dec3c92..d86867fd7 100644
--- a/data/maps/BirthIsland_Harbor/map.json
+++ b/data/maps/BirthIsland_Harbor/map.json
@@ -3,7 +3,7 @@
   "name": "BirthIsland_Harbor",
   "layout": "LAYOUT_ISLAND_HARBOR",
   "music": "MUS_NONE",
-  "region_map_section": "MAPSEC_BIRTH_ISLAND_2",
+  "region_map_section": "MAPSEC_BIRTH_ISLAND",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_INDOOR",
diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc
index 95be20f75..333bffc37 100644
--- a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc
@@ -4,7 +4,7 @@ EverGrandeCity_PokemonCenter_1F_MapScripts:: @ 8229A34
 	.byte 0
 
 EverGrandeCity_PokemonCenter_1F_OnTransition: @ 8229A3F
-	setrespawn HEAL_LOCATION_EVER_GRANDE_CITY_1
+	setrespawn HEAL_LOCATION_EVER_GRANDE_CITY
 	call_if_unset FLAG_MET_SCOTT_IN_EVERGRANDE, EverGrandeCity_PokemonCenter_1F_EventScript_TryShowScott
 	end
 
diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc
index 72c069243..c69c28d8b 100644
--- a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc
+++ b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc
@@ -4,7 +4,7 @@ EverGrandeCity_PokemonLeague_1F_MapScripts:: @ 82295D2
 	.byte 0
 
 EverGrandeCity_PokemonLeague_1F_OnTransition: @ 82295DD
-	setrespawn HEAL_LOCATION_EVER_GRANDE_CITY_2
+	setrespawn HEAL_LOCATION_EVER_GRANDE_CITY_POKEMON_LEAGUE
 	setflag FLAG_LANDMARK_POKEMON_LEAGUE
 	call_if_unset FLAG_ENTERED_ELITE_FOUR, EverGrandeCity_PokemonLeague_1F_EventScript_GuardsBlockDoor
 	end
diff --git a/data/maps/NavelRock_B1F/map.json b/data/maps/NavelRock_B1F/map.json
index f2354522f..0629b65ec 100644
--- a/data/maps/NavelRock_B1F/map.json
+++ b/data/maps/NavelRock_B1F/map.json
@@ -3,7 +3,7 @@
   "name": "NavelRock_B1F",
   "layout": "LAYOUT_NAVEL_ROCK_B1F",
   "music": "MUS_RG_NANADUNGEON",
-  "region_map_section": "MAPSEC_NAVEL_ROCK2",
+  "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_UNDERGROUND",
diff --git a/data/maps/NavelRock_Bottom/map.json b/data/maps/NavelRock_Bottom/map.json
index 2d4a89bdb..513b27ba0 100644
--- a/data/maps/NavelRock_Bottom/map.json
+++ b/data/maps/NavelRock_Bottom/map.json
@@ -3,7 +3,7 @@
   "name": "NavelRock_Bottom",
   "layout": "LAYOUT_NAVEL_ROCK_BOTTOM",
   "music": "MUS_RG_NANADUNGEON",
-  "region_map_section": "MAPSEC_NAVEL_ROCK2",
+  "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_UNDERGROUND",
diff --git a/data/maps/NavelRock_Down01/map.json b/data/maps/NavelRock_Down01/map.json
index ef8effb57..8c9072586 100644
--- a/data/maps/NavelRock_Down01/map.json
+++ b/data/maps/NavelRock_Down01/map.json
@@ -3,7 +3,7 @@
   "name": "NavelRock_Down01",
   "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1",
   "music": "MUS_RG_NANADUNGEON",
-  "region_map_section": "MAPSEC_NAVEL_ROCK2",
+  "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_UNDERGROUND",
diff --git a/data/maps/NavelRock_Down02/map.json b/data/maps/NavelRock_Down02/map.json
index 5b9715dc8..bcc420ad5 100644
--- a/data/maps/NavelRock_Down02/map.json
+++ b/data/maps/NavelRock_Down02/map.json
@@ -3,7 +3,7 @@
   "name": "NavelRock_Down02",
   "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2",
   "music": "MUS_RG_NANADUNGEON",
-  "region_map_section": "MAPSEC_NAVEL_ROCK2",
+  "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_UNDERGROUND",
diff --git a/data/maps/NavelRock_Down03/map.json b/data/maps/NavelRock_Down03/map.json
index 9d8140955..36e0cce99 100644
--- a/data/maps/NavelRock_Down03/map.json
+++ b/data/maps/NavelRock_Down03/map.json
@@ -3,7 +3,7 @@
   "name": "NavelRock_Down03",
   "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1",
   "music": "MUS_RG_NANADUNGEON",
-  "region_map_section": "MAPSEC_NAVEL_ROCK2",
+  "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_UNDERGROUND",
diff --git a/data/maps/NavelRock_Down04/map.json b/data/maps/NavelRock_Down04/map.json
index b3ff4f678..b2a56b1b0 100644
--- a/data/maps/NavelRock_Down04/map.json
+++ b/data/maps/NavelRock_Down04/map.json
@@ -3,7 +3,7 @@
   "name": "NavelRock_Down04",
   "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2",
   "music": "MUS_RG_NANADUNGEON",
-  "region_map_section": "MAPSEC_NAVEL_ROCK2",
+  "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_UNDERGROUND",
diff --git a/data/maps/NavelRock_Down05/map.json b/data/maps/NavelRock_Down05/map.json
index d477fcf82..ebe78128f 100644
--- a/data/maps/NavelRock_Down05/map.json
+++ b/data/maps/NavelRock_Down05/map.json
@@ -3,7 +3,7 @@
   "name": "NavelRock_Down05",
   "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1",
   "music": "MUS_RG_NANADUNGEON",
-  "region_map_section": "MAPSEC_NAVEL_ROCK2",
+  "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_UNDERGROUND",
diff --git a/data/maps/NavelRock_Down06/map.json b/data/maps/NavelRock_Down06/map.json
index 91356a495..5361dd4a3 100644
--- a/data/maps/NavelRock_Down06/map.json
+++ b/data/maps/NavelRock_Down06/map.json
@@ -3,7 +3,7 @@
   "name": "NavelRock_Down06",
   "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2",
   "music": "MUS_RG_NANADUNGEON",
-  "region_map_section": "MAPSEC_NAVEL_ROCK2",
+  "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_UNDERGROUND",
diff --git a/data/maps/NavelRock_Down07/map.json b/data/maps/NavelRock_Down07/map.json
index 4fc93ba1b..9c8cabe06 100644
--- a/data/maps/NavelRock_Down07/map.json
+++ b/data/maps/NavelRock_Down07/map.json
@@ -3,7 +3,7 @@
   "name": "NavelRock_Down07",
   "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1",
   "music": "MUS_RG_NANADUNGEON",
-  "region_map_section": "MAPSEC_NAVEL_ROCK2",
+  "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_UNDERGROUND",
diff --git a/data/maps/NavelRock_Down08/map.json b/data/maps/NavelRock_Down08/map.json
index 2572c991a..97bdf8831 100644
--- a/data/maps/NavelRock_Down08/map.json
+++ b/data/maps/NavelRock_Down08/map.json
@@ -3,7 +3,7 @@
   "name": "NavelRock_Down08",
   "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2",
   "music": "MUS_RG_NANADUNGEON",
-  "region_map_section": "MAPSEC_NAVEL_ROCK2",
+  "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_UNDERGROUND",
diff --git a/data/maps/NavelRock_Down09/map.json b/data/maps/NavelRock_Down09/map.json
index 23d33233c..3b01299f4 100644
--- a/data/maps/NavelRock_Down09/map.json
+++ b/data/maps/NavelRock_Down09/map.json
@@ -3,7 +3,7 @@
   "name": "NavelRock_Down09",
   "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1",
   "music": "MUS_RG_NANADUNGEON",
-  "region_map_section": "MAPSEC_NAVEL_ROCK2",
+  "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_UNDERGROUND",
diff --git a/data/maps/NavelRock_Down10/map.json b/data/maps/NavelRock_Down10/map.json
index 88d0f679a..b7690246e 100644
--- a/data/maps/NavelRock_Down10/map.json
+++ b/data/maps/NavelRock_Down10/map.json
@@ -3,7 +3,7 @@
   "name": "NavelRock_Down10",
   "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2",
   "music": "MUS_RG_NANADUNGEON",
-  "region_map_section": "MAPSEC_NAVEL_ROCK2",
+  "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_UNDERGROUND",
diff --git a/data/maps/NavelRock_Down11/map.json b/data/maps/NavelRock_Down11/map.json
index 2de0d5771..ffb1172a2 100644
--- a/data/maps/NavelRock_Down11/map.json
+++ b/data/maps/NavelRock_Down11/map.json
@@ -3,7 +3,7 @@
   "name": "NavelRock_Down11",
   "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1",
   "music": "MUS_RG_NANADUNGEON",
-  "region_map_section": "MAPSEC_NAVEL_ROCK2",
+  "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_UNDERGROUND",
diff --git a/data/maps/NavelRock_Entrance/map.json b/data/maps/NavelRock_Entrance/map.json
index 50c075fe9..bf47c8416 100644
--- a/data/maps/NavelRock_Entrance/map.json
+++ b/data/maps/NavelRock_Entrance/map.json
@@ -3,7 +3,7 @@
   "name": "NavelRock_Entrance",
   "layout": "LAYOUT_NAVEL_ROCK_ENTRANCE",
   "music": "MUS_RG_NANADUNGEON",
-  "region_map_section": "MAPSEC_NAVEL_ROCK2",
+  "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_UNDERGROUND",
diff --git a/data/maps/NavelRock_Exterior/map.json b/data/maps/NavelRock_Exterior/map.json
index c65aa2062..43670a24f 100644
--- a/data/maps/NavelRock_Exterior/map.json
+++ b/data/maps/NavelRock_Exterior/map.json
@@ -3,7 +3,7 @@
   "name": "NavelRock_Exterior",
   "layout": "LAYOUT_NAVEL_ROCK_EXTERIOR",
   "music": "MUS_RG_NANASHIMA",
-  "region_map_section": "MAPSEC_NAVEL_ROCK2",
+  "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_INDOOR",
diff --git a/data/maps/NavelRock_Fork/map.json b/data/maps/NavelRock_Fork/map.json
index 08404c872..6d2e1ff2d 100644
--- a/data/maps/NavelRock_Fork/map.json
+++ b/data/maps/NavelRock_Fork/map.json
@@ -3,7 +3,7 @@
   "name": "NavelRock_Fork",
   "layout": "LAYOUT_NAVEL_ROCK_FORK",
   "music": "MUS_RG_NANADUNGEON",
-  "region_map_section": "MAPSEC_NAVEL_ROCK2",
+  "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_UNDERGROUND",
diff --git a/data/maps/NavelRock_Harbor/map.json b/data/maps/NavelRock_Harbor/map.json
index a30f1c386..950a473e5 100644
--- a/data/maps/NavelRock_Harbor/map.json
+++ b/data/maps/NavelRock_Harbor/map.json
@@ -3,7 +3,7 @@
   "name": "NavelRock_Harbor",
   "layout": "LAYOUT_ISLAND_HARBOR",
   "music": "MUS_RG_NANASHIMA",
-  "region_map_section": "MAPSEC_NAVEL_ROCK2",
+  "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_INDOOR",
diff --git a/data/maps/NavelRock_Top/map.json b/data/maps/NavelRock_Top/map.json
index f0e1bb8f8..79bbf50c2 100644
--- a/data/maps/NavelRock_Top/map.json
+++ b/data/maps/NavelRock_Top/map.json
@@ -3,7 +3,7 @@
   "name": "NavelRock_Top",
   "layout": "LAYOUT_NAVEL_ROCK_TOP",
   "music": "MUS_RG_NANADUNGEON",
-  "region_map_section": "MAPSEC_NAVEL_ROCK2",
+  "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
   "weather": "WEATHER_SHADE",
   "map_type": "MAP_TYPE_UNDERGROUND",
diff --git a/data/maps/NavelRock_Up1/map.json b/data/maps/NavelRock_Up1/map.json
index 2ad457e36..fb3c340f3 100644
--- a/data/maps/NavelRock_Up1/map.json
+++ b/data/maps/NavelRock_Up1/map.json
@@ -3,7 +3,7 @@
   "name": "NavelRock_Up1",
   "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1",
   "music": "MUS_RG_NANADUNGEON",
-  "region_map_section": "MAPSEC_NAVEL_ROCK2",
+  "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_UNDERGROUND",
diff --git a/data/maps/NavelRock_Up2/map.json b/data/maps/NavelRock_Up2/map.json
index a3f108da1..c02625a61 100644
--- a/data/maps/NavelRock_Up2/map.json
+++ b/data/maps/NavelRock_Up2/map.json
@@ -3,7 +3,7 @@
   "name": "NavelRock_Up2",
   "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2",
   "music": "MUS_RG_NANADUNGEON",
-  "region_map_section": "MAPSEC_NAVEL_ROCK2",
+  "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_UNDERGROUND",
diff --git a/data/maps/NavelRock_Up3/map.json b/data/maps/NavelRock_Up3/map.json
index 6f8b62608..8b6cf3a10 100644
--- a/data/maps/NavelRock_Up3/map.json
+++ b/data/maps/NavelRock_Up3/map.json
@@ -3,7 +3,7 @@
   "name": "NavelRock_Up3",
   "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1",
   "music": "MUS_RG_NANADUNGEON",
-  "region_map_section": "MAPSEC_NAVEL_ROCK2",
+  "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_UNDERGROUND",
diff --git a/data/maps/NavelRock_Up4/map.json b/data/maps/NavelRock_Up4/map.json
index 8d3a5b0d2..045ace694 100644
--- a/data/maps/NavelRock_Up4/map.json
+++ b/data/maps/NavelRock_Up4/map.json
@@ -3,7 +3,7 @@
   "name": "NavelRock_Up4",
   "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2",
   "music": "MUS_RG_NANADUNGEON",
-  "region_map_section": "MAPSEC_NAVEL_ROCK2",
+  "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_UNDERGROUND",
diff --git a/data/scripts/abnormal_weather.inc b/data/scripts/abnormal_weather.inc
index 88da0405f..16f8af41f 100644
--- a/data/scripts/abnormal_weather.inc
+++ b/data/scripts/abnormal_weather.inc
@@ -172,7 +172,7 @@ AbnormalWeather_StartGroudonWeather:: @ 8273D1B
 
 AbnormalWeather_EventScript_EndEventAndCleanup_1:: @ 8273D1F
 	lockall
-	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_KYOGRE_LOCATIONS_START
+	compare VAR_ABNORMAL_WEATHER_LOCATION, MARINE_CAVE_LOCATIONS_START
 	goto_if_ge AbnormalWeather_EventScript_ShowRainEndedMessage
 	goto AbnormalWeather_EventScript_ShowSunEndedMessage
 	end