diff options
Diffstat (limited to 'data')
28 files changed, 28 insertions, 28 deletions
diff --git a/data/maps/AlteringCave/map.json b/data/maps/AlteringCave/map.json index 848eb95c1..2addfddb7 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 50bd57f0b..ddb06e994 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 ea124d9ef..4df765428 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 814025895..5c6400509 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 6b5cd0089..bfea2e738 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 1ae004107..b2ebb08c6 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 50f60b52e..255e69a8e 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 fb2d15145..3fbf7ee63 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 a82e03610..9f8650c27 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 58e81b709..ce7f0c267 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 a1fcef804..4a0f0630c 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 204a2a2cf..2964e533f 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 f48063d8a..a1cbac77b 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 d5f7ea8fe..7065aa090 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 348739b31..9f4618afb 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 3aa128fa0..6aca30847 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 0ed44f0fc..257c2ba6f 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 983df45df..dbe05a525 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 b98f08d4e..951f9a468 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 728b8a7aa..960735377 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 e91dfa8d1..6c7957832 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 c906c4ceb..03cc3ab7b 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 24d1b5a32..7142677f5 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 2d16e798c..606b46ba6 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 2e984b379..9612a2dcc 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 e448e6a9a..27f8b6b81 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 |