diff options
432 files changed, 873 insertions, 897 deletions
diff --git a/data/maps.s b/data/maps.s index a0ff008cd..1bf2350bb 100644 --- a/data/maps.s +++ b/data/maps.s @@ -1,5 +1,4 @@ #include "constants/layouts.h" -@#include "constants/map_types.h" #include "constants/maps.h" #include "constants/region_map.h" #include "constants/songs.h" diff --git a/data/maps/BattleColosseum_2P/map.json b/data/maps/BattleColosseum_2P/map.json index b455a7799..d9d80e7e9 100644 --- a/data/maps/BattleColosseum_2P/map.json +++ b/data/maps/BattleColosseum_2P/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SPECIAL_AREA", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_8", + "battle_scene": "MAP_BATTLE_SCENE_LINK", "connections": null, "object_events": [ { diff --git a/data/maps/BattleColosseum_4P/map.json b/data/maps/BattleColosseum_4P/map.json index 34ddd8d58..c36a5beca 100644 --- a/data/maps/BattleColosseum_4P/map.json +++ b/data/maps/BattleColosseum_4P/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SPECIAL_AREA", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_8", + "battle_scene": "MAP_BATTLE_SCENE_LINK", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/BirthIsland_Exterior/map.json b/data/maps/BirthIsland_Exterior/map.json index 427d71e79..5f8c86d9c 100644 --- a/data/maps/BirthIsland_Exterior/map.json +++ b/data/maps/BirthIsland_Exterior/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_BIRTH_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/BirthIsland_Harbor/map.json b/data/maps/BirthIsland_Harbor/map.json index 8370d0264..dfc063ad9 100644 --- a/data/maps/BirthIsland_Harbor/map.json +++ b/data/maps/BirthIsland_Harbor/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_BIRTH_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CeladonCity/map.json b/data/maps/CeladonCity/map.json index f3b316694..7753d987f 100644 --- a/data/maps/CeladonCity/map.json +++ b/data/maps/CeladonCity/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_1", + "map_type": "MAP_TYPE_TOWN", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_ROUTE16", diff --git a/data/maps/CeladonCity_Condominiums_1F/map.json b/data/maps/CeladonCity_Condominiums_1F/map.json index 1fbea392b..264fd2aa6 100644 --- a/data/maps/CeladonCity_Condominiums_1F/map.json +++ b/data/maps/CeladonCity_Condominiums_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CeladonCity_Condominiums_2F/map.json b/data/maps/CeladonCity_Condominiums_2F/map.json index eb8df96d2..f2d2e8de6 100644 --- a/data/maps/CeladonCity_Condominiums_2F/map.json +++ b/data/maps/CeladonCity_Condominiums_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CeladonCity_Condominiums_3F/map.json b/data/maps/CeladonCity_Condominiums_3F/map.json index b78a2117f..89d78d255 100644 --- a/data/maps/CeladonCity_Condominiums_3F/map.json +++ b/data/maps/CeladonCity_Condominiums_3F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CeladonCity_Condominiums_Roof/map.json b/data/maps/CeladonCity_Condominiums_Roof/map.json index 080f59ed4..428acdf99 100644 --- a/data/maps/CeladonCity_Condominiums_Roof/map.json +++ b/data/maps/CeladonCity_Condominiums_Roof/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json index fd4f99898..4b7c69e3a 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CeladonCity_DepartmentStore_1F/map.json b/data/maps/CeladonCity_DepartmentStore_1F/map.json index f619c66dd..beb73045e 100644 --- a/data/maps/CeladonCity_DepartmentStore_1F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": true, "floor_number": 1, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CeladonCity_DepartmentStore_2F/map.json b/data/maps/CeladonCity_DepartmentStore_2F/map.json index 3de080f17..31cf48f57 100644 --- a/data/maps/CeladonCity_DepartmentStore_2F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": true, "floor_number": 2, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CeladonCity_DepartmentStore_3F/map.json b/data/maps/CeladonCity_DepartmentStore_3F/map.json index 47d39bf09..4948847ef 100644 --- a/data/maps/CeladonCity_DepartmentStore_3F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_3F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": true, "floor_number": 3, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CeladonCity_DepartmentStore_4F/map.json b/data/maps/CeladonCity_DepartmentStore_4F/map.json index 671d5b450..298d207c2 100644 --- a/data/maps/CeladonCity_DepartmentStore_4F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_4F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": true, "floor_number": 4, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CeladonCity_DepartmentStore_5F/map.json b/data/maps/CeladonCity_DepartmentStore_5F/map.json index 3390b6818..b2b31ef7f 100644 --- a/data/maps/CeladonCity_DepartmentStore_5F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_5F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": true, "floor_number": 5, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/map.json b/data/maps/CeladonCity_DepartmentStore_Elevator/map.json index 7da40ec98..2a1af1699 100644 --- a/data/maps/CeladonCity_DepartmentStore_Elevator/map.json +++ b/data/maps/CeladonCity_DepartmentStore_Elevator/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/map.json b/data/maps/CeladonCity_DepartmentStore_Roof/map.json index ecadef2cc..861954bd3 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/map.json +++ b/data/maps/CeladonCity_DepartmentStore_Roof/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": true, "floor_number": 127, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CeladonCity_GameCorner/map.json b/data/maps/CeladonCity_GameCorner/map.json index 01b5b7422..1733a8f35 100644 --- a/data/maps/CeladonCity_GameCorner/map.json +++ b/data/maps/CeladonCity_GameCorner/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json index 606306978..9dcaf101a 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CeladonCity_Gym/map.json b/data/maps/CeladonCity_Gym/map.json index 0007c4847..ac88b5869 100644 --- a/data/maps/CeladonCity_Gym/map.json +++ b/data/maps/CeladonCity_Gym/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_1", + "battle_scene": "MAP_BATTLE_SCENE_GYM", "connections": null, "object_events": [ { diff --git a/data/maps/CeladonCity_Hotel/map.json b/data/maps/CeladonCity_Hotel/map.json index ac08487df..964db9cab 100644 --- a/data/maps/CeladonCity_Hotel/map.json +++ b/data/maps/CeladonCity_Hotel/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CeladonCity_House1/map.json b/data/maps/CeladonCity_House1/map.json index 48e444cdb..37231d091 100644 --- a/data/maps/CeladonCity_House1/map.json +++ b/data/maps/CeladonCity_House1/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CeladonCity_PokemonCenter_1F/map.json b/data/maps/CeladonCity_PokemonCenter_1F/map.json index 225667b40..58df64cf8 100644 --- a/data/maps/CeladonCity_PokemonCenter_1F/map.json +++ b/data/maps/CeladonCity_PokemonCenter_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CeladonCity_PokemonCenter_2F/map.json b/data/maps/CeladonCity_PokemonCenter_2F/map.json index 7daf9fb09..88dab9bec 100644 --- a/data/maps/CeladonCity_PokemonCenter_2F/map.json +++ b/data/maps/CeladonCity_PokemonCenter_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CeladonCity_Restaurant/map.json b/data/maps/CeladonCity_Restaurant/map.json index 50603778c..b84bbabd6 100644 --- a/data/maps/CeladonCity_Restaurant/map.json +++ b/data/maps/CeladonCity_Restaurant/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CeruleanCave_1F/map.json b/data/maps/CeruleanCave_1F/map.json index af27c9466..beadaeab9 100644 --- a/data/maps/CeruleanCave_1F/map.json +++ b/data/maps/CeruleanCave_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CERULEAN_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CeruleanCave_2F/map.json b/data/maps/CeruleanCave_2F/map.json index 7c3881be1..1390abd3d 100644 --- a/data/maps/CeruleanCave_2F/map.json +++ b/data/maps/CeruleanCave_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CERULEAN_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CeruleanCave_B1F/map.json b/data/maps/CeruleanCave_B1F/map.json index 8838be07b..7dccb782c 100644 --- a/data/maps/CeruleanCave_B1F/map.json +++ b/data/maps/CeruleanCave_B1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CERULEAN_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CeruleanCity/map.json b/data/maps/CeruleanCity/map.json index 0e6d47f3a..087f39320 100644 --- a/data/maps/CeruleanCity/map.json +++ b/data/maps/CeruleanCity/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_1", + "map_type": "MAP_TYPE_TOWN", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_ROUTE24", diff --git a/data/maps/CeruleanCity_BikeShop/map.json b/data/maps/CeruleanCity_BikeShop/map.json index f280880cc..4bf7375b8 100644 --- a/data/maps/CeruleanCity_BikeShop/map.json +++ b/data/maps/CeruleanCity_BikeShop/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CeruleanCity_Gym/map.json b/data/maps/CeruleanCity_Gym/map.json index 1c4ad61a3..afe882548 100644 --- a/data/maps/CeruleanCity_Gym/map.json +++ b/data/maps/CeruleanCity_Gym/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_1", + "battle_scene": "MAP_BATTLE_SCENE_GYM", "connections": null, "object_events": [ { diff --git a/data/maps/CeruleanCity_House1/map.json b/data/maps/CeruleanCity_House1/map.json index 1f67451f0..0b1d03a40 100644 --- a/data/maps/CeruleanCity_House1/map.json +++ b/data/maps/CeruleanCity_House1/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CeruleanCity_House2/map.json b/data/maps/CeruleanCity_House2/map.json index d2a4fb8a3..69d20876a 100644 --- a/data/maps/CeruleanCity_House2/map.json +++ b/data/maps/CeruleanCity_House2/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CeruleanCity_House3/map.json b/data/maps/CeruleanCity_House3/map.json index 1eb28225c..33095af54 100644 --- a/data/maps/CeruleanCity_House3/map.json +++ b/data/maps/CeruleanCity_House3/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CeruleanCity_House4/map.json b/data/maps/CeruleanCity_House4/map.json index 28de36729..9c5a61b63 100644 --- a/data/maps/CeruleanCity_House4/map.json +++ b/data/maps/CeruleanCity_House4/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CeruleanCity_House5/map.json b/data/maps/CeruleanCity_House5/map.json index 6b50087a7..eae14c1e4 100644 --- a/data/maps/CeruleanCity_House5/map.json +++ b/data/maps/CeruleanCity_House5/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CeruleanCity_Mart/map.json b/data/maps/CeruleanCity_Mart/map.json index bfa3baa0e..e247e3cd4 100644 --- a/data/maps/CeruleanCity_Mart/map.json +++ b/data/maps/CeruleanCity_Mart/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CeruleanCity_PokemonCenter_1F/map.json b/data/maps/CeruleanCity_PokemonCenter_1F/map.json index 7a4947b16..dac0de4b5 100644 --- a/data/maps/CeruleanCity_PokemonCenter_1F/map.json +++ b/data/maps/CeruleanCity_PokemonCenter_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CeruleanCity_PokemonCenter_2F/map.json b/data/maps/CeruleanCity_PokemonCenter_2F/map.json index b3e088f33..7eb69e6a4 100644 --- a/data/maps/CeruleanCity_PokemonCenter_2F/map.json +++ b/data/maps/CeruleanCity_PokemonCenter_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CinnabarIsland/map.json b/data/maps/CinnabarIsland/map.json index 3b784648a..0c8fe0ac6 100644 --- a/data/maps/CinnabarIsland/map.json +++ b/data/maps/CinnabarIsland/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_1", + "map_type": "MAP_TYPE_TOWN", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_ROUTE21_SOUTH", diff --git a/data/maps/CinnabarIsland_Gym/map.json b/data/maps/CinnabarIsland_Gym/map.json index 4dd966550..1afa900b9 100644 --- a/data/maps/CinnabarIsland_Gym/map.json +++ b/data/maps/CinnabarIsland_Gym/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_1", + "battle_scene": "MAP_BATTLE_SCENE_GYM", "connections": null, "object_events": [ { diff --git a/data/maps/CinnabarIsland_Mart/map.json b/data/maps/CinnabarIsland_Mart/map.json index 590d50409..a02302367 100644 --- a/data/maps/CinnabarIsland_Mart/map.json +++ b/data/maps/CinnabarIsland_Mart/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/map.json b/data/maps/CinnabarIsland_PokemonCenter_1F/map.json index 472e9e0c5..06ecc5419 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/map.json +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json index ae1dc7b64..c4bcde4e4 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json +++ b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json b/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json index 85954ed9a..4f446c65e 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json index 9b9cb49db..cefc5bcc4 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json b/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json index 43a233c11..68d681613 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json index 097039140..54015fcc3 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/DiglettsCave_B1F/map.json b/data/maps/DiglettsCave_B1F/map.json index abb8e4d0e..13cdfac0a 100644 --- a/data/maps/DiglettsCave_B1F/map.json +++ b/data/maps/DiglettsCave_B1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_DIGLETTS_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/DiglettsCave_NorthEntrance/map.json b/data/maps/DiglettsCave_NorthEntrance/map.json index a30676d5b..4427d4d17 100644 --- a/data/maps/DiglettsCave_NorthEntrance/map.json +++ b/data/maps/DiglettsCave_NorthEntrance/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_DIGLETTS_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/DiglettsCave_SouthEntrance/map.json b/data/maps/DiglettsCave_SouthEntrance/map.json index a78a6f951..591a998e3 100644 --- a/data/maps/DiglettsCave_SouthEntrance/map.json +++ b/data/maps/DiglettsCave_SouthEntrance/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_DIGLETTS_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FiveIsland/map.json b/data/maps/FiveIsland/map.json index 7f4c53c1f..46eb15806 100644 --- a/data/maps/FiveIsland/map.json +++ b/data/maps/FiveIsland/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_FIVE_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_1", + "map_type": "MAP_TYPE_TOWN", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_FIVE_ISLAND_WATER_LABYRINTH", diff --git a/data/maps/FiveIsland_Harbor/map.json b/data/maps/FiveIsland_Harbor/map.json index 6d3444755..bfbcfd8f6 100644 --- a/data/maps/FiveIsland_Harbor/map.json +++ b/data/maps/FiveIsland_Harbor/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_FIVE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FiveIsland_House1/map.json b/data/maps/FiveIsland_House1/map.json index 82fc173f3..8e8e974ba 100644 --- a/data/maps/FiveIsland_House1/map.json +++ b/data/maps/FiveIsland_House1/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_FIVE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FiveIsland_House2/map.json b/data/maps/FiveIsland_House2/map.json index 97342c187..a97c387d8 100644 --- a/data/maps/FiveIsland_House2/map.json +++ b/data/maps/FiveIsland_House2/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_FIVE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FiveIsland_LostCave_Entrance/map.json b/data/maps/FiveIsland_LostCave_Entrance/map.json index 69e844f7c..b257237bd 100644 --- a/data/maps/FiveIsland_LostCave_Entrance/map.json +++ b/data/maps/FiveIsland_LostCave_Entrance/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/FiveIsland_LostCave_Room1/map.json b/data/maps/FiveIsland_LostCave_Room1/map.json index 3d68d5f6d..fa79e4245 100644 --- a/data/maps/FiveIsland_LostCave_Room1/map.json +++ b/data/maps/FiveIsland_LostCave_Room1/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FiveIsland_LostCave_Room10/map.json b/data/maps/FiveIsland_LostCave_Room10/map.json index fc14e997b..f1c963b0e 100644 --- a/data/maps/FiveIsland_LostCave_Room10/map.json +++ b/data/maps/FiveIsland_LostCave_Room10/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FiveIsland_LostCave_Room11/map.json b/data/maps/FiveIsland_LostCave_Room11/map.json index be166f1c6..50ecf922f 100644 --- a/data/maps/FiveIsland_LostCave_Room11/map.json +++ b/data/maps/FiveIsland_LostCave_Room11/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FiveIsland_LostCave_Room12/map.json b/data/maps/FiveIsland_LostCave_Room12/map.json index 90367bcb0..5a8fef3d2 100644 --- a/data/maps/FiveIsland_LostCave_Room12/map.json +++ b/data/maps/FiveIsland_LostCave_Room12/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FiveIsland_LostCave_Room13/map.json b/data/maps/FiveIsland_LostCave_Room13/map.json index a0200e532..fc2dd61bf 100644 --- a/data/maps/FiveIsland_LostCave_Room13/map.json +++ b/data/maps/FiveIsland_LostCave_Room13/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FiveIsland_LostCave_Room14/map.json b/data/maps/FiveIsland_LostCave_Room14/map.json index 0c4d6edb7..84cddd2ea 100644 --- a/data/maps/FiveIsland_LostCave_Room14/map.json +++ b/data/maps/FiveIsland_LostCave_Room14/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FiveIsland_LostCave_Room2/map.json b/data/maps/FiveIsland_LostCave_Room2/map.json index 2f4bef72e..eaeabf81b 100644 --- a/data/maps/FiveIsland_LostCave_Room2/map.json +++ b/data/maps/FiveIsland_LostCave_Room2/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/FiveIsland_LostCave_Room3/map.json b/data/maps/FiveIsland_LostCave_Room3/map.json index bb571ceb6..bcd56fec5 100644 --- a/data/maps/FiveIsland_LostCave_Room3/map.json +++ b/data/maps/FiveIsland_LostCave_Room3/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/FiveIsland_LostCave_Room4/map.json b/data/maps/FiveIsland_LostCave_Room4/map.json index 3740070aa..2035f850e 100644 --- a/data/maps/FiveIsland_LostCave_Room4/map.json +++ b/data/maps/FiveIsland_LostCave_Room4/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FiveIsland_LostCave_Room5/map.json b/data/maps/FiveIsland_LostCave_Room5/map.json index 40ee7ecdd..94a33e0be 100644 --- a/data/maps/FiveIsland_LostCave_Room5/map.json +++ b/data/maps/FiveIsland_LostCave_Room5/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/FiveIsland_LostCave_Room6/map.json b/data/maps/FiveIsland_LostCave_Room6/map.json index d9742e151..1941530d6 100644 --- a/data/maps/FiveIsland_LostCave_Room6/map.json +++ b/data/maps/FiveIsland_LostCave_Room6/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/FiveIsland_LostCave_Room7/map.json b/data/maps/FiveIsland_LostCave_Room7/map.json index f28f2c022..459c54736 100644 --- a/data/maps/FiveIsland_LostCave_Room7/map.json +++ b/data/maps/FiveIsland_LostCave_Room7/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/FiveIsland_LostCave_Room8/map.json b/data/maps/FiveIsland_LostCave_Room8/map.json index 836ec128a..d0c0c0d87 100644 --- a/data/maps/FiveIsland_LostCave_Room8/map.json +++ b/data/maps/FiveIsland_LostCave_Room8/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/FiveIsland_LostCave_Room9/map.json b/data/maps/FiveIsland_LostCave_Room9/map.json index 3624b9a74..1669d671e 100644 --- a/data/maps/FiveIsland_LostCave_Room9/map.json +++ b/data/maps/FiveIsland_LostCave_Room9/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/FiveIsland_Meadow/map.json b/data/maps/FiveIsland_Meadow/map.json index d757c2961..ea727f86d 100644 --- a/data/maps/FiveIsland_Meadow/map.json +++ b/data/maps/FiveIsland_Meadow/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_FIVE_ISLE_MEADOW", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_FIVE_ISLAND", diff --git a/data/maps/FiveIsland_MemorialPillar/map.json b/data/maps/FiveIsland_MemorialPillar/map.json index d53bbb174..68694d602 100644 --- a/data/maps/FiveIsland_MemorialPillar/map.json +++ b/data/maps/FiveIsland_MemorialPillar/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_MEMORIAL_PILLAR", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_FIVE_ISLAND_MEADOW", diff --git a/data/maps/FiveIsland_PokemonCenter_1F/map.json b/data/maps/FiveIsland_PokemonCenter_1F/map.json index baea9f6b7..31986b11c 100644 --- a/data/maps/FiveIsland_PokemonCenter_1F/map.json +++ b/data/maps/FiveIsland_PokemonCenter_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_FIVE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FiveIsland_PokemonCenter_2F/map.json b/data/maps/FiveIsland_PokemonCenter_2F/map.json index 257e2ced0..975a71c51 100644 --- a/data/maps/FiveIsland_PokemonCenter_2F/map.json +++ b/data/maps/FiveIsland_PokemonCenter_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_FIVE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FiveIsland_ResortGorgeous/map.json b/data/maps/FiveIsland_ResortGorgeous/map.json index e408f0916..868b8cda7 100644 --- a/data/maps/FiveIsland_ResortGorgeous/map.json +++ b/data/maps/FiveIsland_ResortGorgeous/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_RESORT_GORGEOUS", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_FIVE_ISLAND_WATER_LABYRINTH", diff --git a/data/maps/FiveIsland_ResortGorgeous_House/map.json b/data/maps/FiveIsland_ResortGorgeous_House/map.json index 5ab4ff749..4ab961ce8 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/map.json +++ b/data/maps/FiveIsland_ResortGorgeous_House/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_RESORT_GORGEOUS", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FiveIsland_RocketWarehouse/map.json b/data/maps/FiveIsland_RocketWarehouse/map.json index ee97d08a9..96ff51d8c 100644 --- a/data/maps/FiveIsland_RocketWarehouse/map.json +++ b/data/maps/FiveIsland_RocketWarehouse/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROCKET_WAREHOUSE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": true, "allow_running": false, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_3", + "battle_scene": "MAP_BATTLE_SCENE_INDOOR_2", "connections": null, "object_events": [ { diff --git a/data/maps/FiveIsland_WaterLabyrinth/map.json b/data/maps/FiveIsland_WaterLabyrinth/map.json index 2e0aa3389..78bfa06b4 100644 --- a/data/maps/FiveIsland_WaterLabyrinth/map.json +++ b/data/maps/FiveIsland_WaterLabyrinth/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_WATER_LABYRINTH", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_FIVE_ISLAND_RESORT_GORGEOUS", diff --git a/data/maps/FourIsland/map.json b/data/maps/FourIsland/map.json index 304aec2ec..9a31449a1 100644 --- a/data/maps/FourIsland/map.json +++ b/data/maps/FourIsland/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_1", + "map_type": "MAP_TYPE_TOWN", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FourIsland_Harbor/map.json b/data/maps/FourIsland_Harbor/map.json index c7639dba4..0c7760b98 100644 --- a/data/maps/FourIsland_Harbor/map.json +++ b/data/maps/FourIsland_Harbor/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FourIsland_House1/map.json b/data/maps/FourIsland_House1/map.json index ddd2526d6..55889c185 100644 --- a/data/maps/FourIsland_House1/map.json +++ b/data/maps/FourIsland_House1/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FourIsland_House2/map.json b/data/maps/FourIsland_House2/map.json index 966ed42cc..b9ec87bc0 100644 --- a/data/maps/FourIsland_House2/map.json +++ b/data/maps/FourIsland_House2/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FourIsland_IcefallCave_1F/map.json b/data/maps/FourIsland_IcefallCave_1F/map.json index f74cf52f7..7ecb022f9 100644 --- a/data/maps/FourIsland_IcefallCave_1F/map.json +++ b/data/maps/FourIsland_IcefallCave_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ICEFALL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FourIsland_IcefallCave_B1F/map.json b/data/maps/FourIsland_IcefallCave_B1F/map.json index 7f5b9d9bc..c07a00e61 100644 --- a/data/maps/FourIsland_IcefallCave_B1F/map.json +++ b/data/maps/FourIsland_IcefallCave_B1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ICEFALL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FourIsland_IcefallCave_Back/map.json b/data/maps/FourIsland_IcefallCave_Back/map.json index 5abbcad40..f542cbfd9 100644 --- a/data/maps/FourIsland_IcefallCave_Back/map.json +++ b/data/maps/FourIsland_IcefallCave_Back/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ICEFALL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FourIsland_IcefallCave_Entrance/map.json b/data/maps/FourIsland_IcefallCave_Entrance/map.json index 73ccda724..0dfe89452 100644 --- a/data/maps/FourIsland_IcefallCave_Entrance/map.json +++ b/data/maps/FourIsland_IcefallCave_Entrance/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ICEFALL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/FourIsland_LoreleisHouse/map.json b/data/maps/FourIsland_LoreleisHouse/map.json index ad3d1506e..0b447056c 100644 --- a/data/maps/FourIsland_LoreleisHouse/map.json +++ b/data/maps/FourIsland_LoreleisHouse/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FourIsland_Mart/map.json b/data/maps/FourIsland_Mart/map.json index dceda6844..901bcf22d 100644 --- a/data/maps/FourIsland_Mart/map.json +++ b/data/maps/FourIsland_Mart/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FourIsland_PokemonCenter_1F/map.json b/data/maps/FourIsland_PokemonCenter_1F/map.json index 14e23287a..f5a0751ae 100644 --- a/data/maps/FourIsland_PokemonCenter_1F/map.json +++ b/data/maps/FourIsland_PokemonCenter_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FourIsland_PokemonCenter_2F/map.json b/data/maps/FourIsland_PokemonCenter_2F/map.json index d42af0c96..9818ab609 100644 --- a/data/maps/FourIsland_PokemonCenter_2F/map.json +++ b/data/maps/FourIsland_PokemonCenter_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FourIsland_PokemonDayCare/map.json b/data/maps/FourIsland_PokemonDayCare/map.json index 32106a6f8..3d380f53c 100644 --- a/data/maps/FourIsland_PokemonDayCare/map.json +++ b/data/maps/FourIsland_PokemonDayCare/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FuchsiaCity/map.json b/data/maps/FuchsiaCity/map.json index 435aa27ce..5aeab97b9 100644 --- a/data/maps/FuchsiaCity/map.json +++ b/data/maps/FuchsiaCity/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_1", + "map_type": "MAP_TYPE_TOWN", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_ROUTE19", diff --git a/data/maps/FuchsiaCity_Gym/map.json b/data/maps/FuchsiaCity_Gym/map.json index 24b366dc3..c07403503 100644 --- a/data/maps/FuchsiaCity_Gym/map.json +++ b/data/maps/FuchsiaCity_Gym/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_1", + "battle_scene": "MAP_BATTLE_SCENE_GYM", "connections": null, "object_events": [ { diff --git a/data/maps/FuchsiaCity_House1/map.json b/data/maps/FuchsiaCity_House1/map.json index b2f6b3821..a45861216 100644 --- a/data/maps/FuchsiaCity_House1/map.json +++ b/data/maps/FuchsiaCity_House1/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FuchsiaCity_House2/map.json b/data/maps/FuchsiaCity_House2/map.json index 5cade9de3..b90a8e3cc 100644 --- a/data/maps/FuchsiaCity_House2/map.json +++ b/data/maps/FuchsiaCity_House2/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FuchsiaCity_House3/map.json b/data/maps/FuchsiaCity_House3/map.json index 5232ad52c..8454ca7de 100644 --- a/data/maps/FuchsiaCity_House3/map.json +++ b/data/maps/FuchsiaCity_House3/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FuchsiaCity_Mart/map.json b/data/maps/FuchsiaCity_Mart/map.json index 0f8ad923c..6b8a28db2 100644 --- a/data/maps/FuchsiaCity_Mart/map.json +++ b/data/maps/FuchsiaCity_Mart/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FuchsiaCity_PokemonCenter_1F/map.json b/data/maps/FuchsiaCity_PokemonCenter_1F/map.json index 669197f62..7df358659 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_1F/map.json +++ b/data/maps/FuchsiaCity_PokemonCenter_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json index 03f2ffdc9..c2a20fb9e 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json +++ b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/map.json b/data/maps/FuchsiaCity_SafariZone_Entrance/map.json index 81bbbe0de..d10098769 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/map.json +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FuchsiaCity_SafariZone_Office/map.json b/data/maps/FuchsiaCity_SafariZone_Office/map.json index a6b87f83f..fc65b8308 100644 --- a/data/maps/FuchsiaCity_SafariZone_Office/map.json +++ b/data/maps/FuchsiaCity_SafariZone_Office/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/FuchsiaCity_WardensHouse/map.json b/data/maps/FuchsiaCity_WardensHouse/map.json index 5d7a336a3..f6333f402 100644 --- a/data/maps/FuchsiaCity_WardensHouse/map.json +++ b/data/maps/FuchsiaCity_WardensHouse/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/IndigoPlateau_Exterior/map.json b/data/maps/IndigoPlateau_Exterior/map.json index b04bf44f8..70c8e240c 100644 --- a/data/maps/IndigoPlateau_Exterior/map.json +++ b/data/maps/IndigoPlateau_Exterior/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_INDIGO_PLATEAU", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_1", + "map_type": "MAP_TYPE_TOWN", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_ROUTE23", diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/map.json b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json index b80e849dc..ff5e1b0ca 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/map.json +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_INDIGO_PLATEAU", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_1", + "battle_scene": "MAP_BATTLE_SCENE_GYM", "connections": null, "object_events": [ { diff --git a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json index c921f749a..6eeb47d03 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json +++ b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_INDIGO_PLATEAU", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_1", + "battle_scene": "MAP_BATTLE_SCENE_GYM", "connections": null, "object_events": [ { diff --git a/data/maps/LavenderTown/map.json b/data/maps/LavenderTown/map.json index 5487e46a6..c3e98f4e9 100644 --- a/data/maps/LavenderTown/map.json +++ b/data/maps/LavenderTown/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_LAVENDER_TOWN", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_1", + "map_type": "MAP_TYPE_TOWN", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_ROUTE10", diff --git a/data/maps/LavenderTown_House1/map.json b/data/maps/LavenderTown_House1/map.json index 8d08e5c62..23f767cad 100644 --- a/data/maps/LavenderTown_House1/map.json +++ b/data/maps/LavenderTown_House1/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_LAVENDER_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/LavenderTown_House2/map.json b/data/maps/LavenderTown_House2/map.json index 5dd921222..0318b07a8 100644 --- a/data/maps/LavenderTown_House2/map.json +++ b/data/maps/LavenderTown_House2/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_LAVENDER_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/LavenderTown_Mart/map.json b/data/maps/LavenderTown_Mart/map.json index 2f3d07c1f..44e4fdb2f 100644 --- a/data/maps/LavenderTown_Mart/map.json +++ b/data/maps/LavenderTown_Mart/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_LAVENDER_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/LavenderTown_PokemonCenter_1F/map.json b/data/maps/LavenderTown_PokemonCenter_1F/map.json index 93709d792..955d6f37c 100644 --- a/data/maps/LavenderTown_PokemonCenter_1F/map.json +++ b/data/maps/LavenderTown_PokemonCenter_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_LAVENDER_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/LavenderTown_PokemonCenter_2F/map.json b/data/maps/LavenderTown_PokemonCenter_2F/map.json index e7f72076f..0605f499a 100644 --- a/data/maps/LavenderTown_PokemonCenter_2F/map.json +++ b/data/maps/LavenderTown_PokemonCenter_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_LAVENDER_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/map.json b/data/maps/LavenderTown_VolunteerPokemonHouse/map.json index 6c609ded5..e292b44e4 100644 --- a/data/maps/LavenderTown_VolunteerPokemonHouse/map.json +++ b/data/maps/LavenderTown_VolunteerPokemonHouse/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_LAVENDER_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/MtEmber_Exterior/map.json b/data/maps/MtEmber_Exterior/map.json index 897bee57b..fcdf6edb2 100644 --- a/data/maps/MtEmber_Exterior/map.json +++ b/data/maps/MtEmber_Exterior/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/MtEmber_RubyPath_1F/map.json b/data/maps/MtEmber_RubyPath_1F/map.json index 9e7dd93d0..e0f972558 100644 --- a/data/maps/MtEmber_RubyPath_1F/map.json +++ b/data/maps/MtEmber_RubyPath_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/MtEmber_RubyPath_B1F/map.json b/data/maps/MtEmber_RubyPath_B1F/map.json index 083ccb2cb..46362d54e 100644 --- a/data/maps/MtEmber_RubyPath_B1F/map.json +++ b/data/maps/MtEmber_RubyPath_B1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json b/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json index a7ad6ecd7..11ec64838 100644 --- a/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json +++ b/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/MtEmber_RubyPath_B2F/map.json b/data/maps/MtEmber_RubyPath_B2F/map.json index 5f8c95c07..29d74a5a6 100644 --- a/data/maps/MtEmber_RubyPath_B2F/map.json +++ b/data/maps/MtEmber_RubyPath_B2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json b/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json index f09272f7a..47e9c1c87 100644 --- a/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json +++ b/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/MtEmber_RubyPath_B3F/map.json b/data/maps/MtEmber_RubyPath_B3F/map.json index 47c4ce93c..698499402 100644 --- a/data/maps/MtEmber_RubyPath_B3F/map.json +++ b/data/maps/MtEmber_RubyPath_B3F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/MtEmber_RubyPath_B4F/map.json b/data/maps/MtEmber_RubyPath_B4F/map.json index 0c25880d9..c10c21ff9 100644 --- a/data/maps/MtEmber_RubyPath_B4F/map.json +++ b/data/maps/MtEmber_RubyPath_B4F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/MtEmber_RubyPath_B5F/map.json b/data/maps/MtEmber_RubyPath_B5F/map.json index e29b372b7..2d0964a1d 100644 --- a/data/maps/MtEmber_RubyPath_B5F/map.json +++ b/data/maps/MtEmber_RubyPath_B5F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/MtEmber_Summit/map.json b/data/maps/MtEmber_Summit/map.json index ab7db2ca2..3545b5ba2 100644 --- a/data/maps/MtEmber_Summit/map.json +++ b/data/maps/MtEmber_Summit/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/MtEmber_SummitPath_1F/map.json b/data/maps/MtEmber_SummitPath_1F/map.json index 0beb133b9..77c89d7f2 100644 --- a/data/maps/MtEmber_SummitPath_1F/map.json +++ b/data/maps/MtEmber_SummitPath_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/MtEmber_SummitPath_2F/map.json b/data/maps/MtEmber_SummitPath_2F/map.json index e6da5a57d..02496f3e9 100644 --- a/data/maps/MtEmber_SummitPath_2F/map.json +++ b/data/maps/MtEmber_SummitPath_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/MtEmber_SummitPath_3F/map.json b/data/maps/MtEmber_SummitPath_3F/map.json index c16b28dbf..330bc6fe5 100644 --- a/data/maps/MtEmber_SummitPath_3F/map.json +++ b/data/maps/MtEmber_SummitPath_3F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/MtMoon_1F/map.json b/data/maps/MtMoon_1F/map.json index 85f7fbb78..f5b829469 100644 --- a/data/maps/MtMoon_1F/map.json +++ b/data/maps/MtMoon_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_MT_MOON", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/MtMoon_B1F/map.json b/data/maps/MtMoon_B1F/map.json index f83691f36..e330d5510 100644 --- a/data/maps/MtMoon_B1F/map.json +++ b/data/maps/MtMoon_B1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_MT_MOON", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/MtMoon_B2F/map.json b/data/maps/MtMoon_B2F/map.json index 04f9e3ba7..f0a3ba3a9 100644 --- a/data/maps/MtMoon_B2F/map.json +++ b/data/maps/MtMoon_B2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_MT_MOON", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/NavelRock_1F/map.json b/data/maps/NavelRock_1F/map.json index a6dfadacf..703240141 100644 --- a/data/maps/NavelRock_1F/map.json +++ b/data/maps/NavelRock_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/NavelRock_B1F/map.json b/data/maps/NavelRock_B1F/map.json index ea5fe3e91..b1a6deada 100644 --- a/data/maps/NavelRock_B1F/map.json +++ b/data/maps/NavelRock_B1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/NavelRock_Base/map.json b/data/maps/NavelRock_Base/map.json index 9fdc7d85c..98d1145fc 100644 --- a/data/maps/NavelRock_Base/map.json +++ b/data/maps/NavelRock_Base/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/NavelRock_BasePath_B10F/map.json b/data/maps/NavelRock_BasePath_B10F/map.json index 878c75c14..716ae04db 100644 --- a/data/maps/NavelRock_BasePath_B10F/map.json +++ b/data/maps/NavelRock_BasePath_B10F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/NavelRock_BasePath_B11F/map.json b/data/maps/NavelRock_BasePath_B11F/map.json index 523512c66..1b92ca1fc 100644 --- a/data/maps/NavelRock_BasePath_B11F/map.json +++ b/data/maps/NavelRock_BasePath_B11F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/NavelRock_BasePath_B1F/map.json b/data/maps/NavelRock_BasePath_B1F/map.json index 5d3300afd..624f800ee 100644 --- a/data/maps/NavelRock_BasePath_B1F/map.json +++ b/data/maps/NavelRock_BasePath_B1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/NavelRock_BasePath_B2F/map.json b/data/maps/NavelRock_BasePath_B2F/map.json index 170ba3f54..b6af50439 100644 --- a/data/maps/NavelRock_BasePath_B2F/map.json +++ b/data/maps/NavelRock_BasePath_B2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/NavelRock_BasePath_B3F/map.json b/data/maps/NavelRock_BasePath_B3F/map.json index a63972f29..22cc90c60 100644 --- a/data/maps/NavelRock_BasePath_B3F/map.json +++ b/data/maps/NavelRock_BasePath_B3F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/NavelRock_BasePath_B4F/map.json b/data/maps/NavelRock_BasePath_B4F/map.json index 8d8154d98..33c4d41be 100644 --- a/data/maps/NavelRock_BasePath_B4F/map.json +++ b/data/maps/NavelRock_BasePath_B4F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/NavelRock_BasePath_B5F/map.json b/data/maps/NavelRock_BasePath_B5F/map.json index 2b1ecc69c..26cf212c6 100644 --- a/data/maps/NavelRock_BasePath_B5F/map.json +++ b/data/maps/NavelRock_BasePath_B5F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/NavelRock_BasePath_B6F/map.json b/data/maps/NavelRock_BasePath_B6F/map.json index a8c91baac..0d3ffdf8f 100644 --- a/data/maps/NavelRock_BasePath_B6F/map.json +++ b/data/maps/NavelRock_BasePath_B6F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/NavelRock_BasePath_B7F/map.json b/data/maps/NavelRock_BasePath_B7F/map.json index 92cc0db51..acfc1da43 100644 --- a/data/maps/NavelRock_BasePath_B7F/map.json +++ b/data/maps/NavelRock_BasePath_B7F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/NavelRock_BasePath_B8F/map.json b/data/maps/NavelRock_BasePath_B8F/map.json index 2e7411dc1..4756a0655 100644 --- a/data/maps/NavelRock_BasePath_B8F/map.json +++ b/data/maps/NavelRock_BasePath_B8F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/NavelRock_BasePath_B9F/map.json b/data/maps/NavelRock_BasePath_B9F/map.json index 509fa31a8..d033dd887 100644 --- a/data/maps/NavelRock_BasePath_B9F/map.json +++ b/data/maps/NavelRock_BasePath_B9F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/NavelRock_Exterior/map.json b/data/maps/NavelRock_Exterior/map.json index e289a9c2d..9b10f6d8c 100644 --- a/data/maps/NavelRock_Exterior/map.json +++ b/data/maps/NavelRock_Exterior/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/NavelRock_Fork/map.json b/data/maps/NavelRock_Fork/map.json index 8debab71d..ec9fec5df 100644 --- a/data/maps/NavelRock_Fork/map.json +++ b/data/maps/NavelRock_Fork/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/NavelRock_Harbor/map.json b/data/maps/NavelRock_Harbor/map.json index 8977a044e..796f67e5f 100644 --- a/data/maps/NavelRock_Harbor/map.json +++ b/data/maps/NavelRock_Harbor/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/NavelRock_Summit/map.json b/data/maps/NavelRock_Summit/map.json index f0c8f6e96..3c2f599d5 100644 --- a/data/maps/NavelRock_Summit/map.json +++ b/data/maps/NavelRock_Summit/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_SHADE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/NavelRock_SummitPath_2F/map.json b/data/maps/NavelRock_SummitPath_2F/map.json index aaa04a93b..d103d5f70 100644 --- a/data/maps/NavelRock_SummitPath_2F/map.json +++ b/data/maps/NavelRock_SummitPath_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/NavelRock_SummitPath_3F/map.json b/data/maps/NavelRock_SummitPath_3F/map.json index 82ac96c65..3a122a2d2 100644 --- a/data/maps/NavelRock_SummitPath_3F/map.json +++ b/data/maps/NavelRock_SummitPath_3F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/NavelRock_SummitPath_4F/map.json b/data/maps/NavelRock_SummitPath_4F/map.json index c6de6d430..fa74a2c92 100644 --- a/data/maps/NavelRock_SummitPath_4F/map.json +++ b/data/maps/NavelRock_SummitPath_4F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/NavelRock_SummitPath_5F/map.json b/data/maps/NavelRock_SummitPath_5F/map.json index b4ddeeb85..25d3ba773 100644 --- a/data/maps/NavelRock_SummitPath_5F/map.json +++ b/data/maps/NavelRock_SummitPath_5F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/OneIsland/map.json b/data/maps/OneIsland/map.json index e734062aa..06d8b7c6d 100644 --- a/data/maps/OneIsland/map.json +++ b/data/maps/OneIsland/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ONE_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_1", + "map_type": "MAP_TYPE_TOWN", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_ONE_ISLAND_TREASURE_BEACH", diff --git a/data/maps/OneIsland_Harbor/map.json b/data/maps/OneIsland_Harbor/map.json index f426bcddb..a505aa5d0 100644 --- a/data/maps/OneIsland_Harbor/map.json +++ b/data/maps/OneIsland_Harbor/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ONE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/OneIsland_House1/map.json b/data/maps/OneIsland_House1/map.json index 21a84244c..8ef48b424 100644 --- a/data/maps/OneIsland_House1/map.json +++ b/data/maps/OneIsland_House1/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ONE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/OneIsland_House2/map.json b/data/maps/OneIsland_House2/map.json index 6c7622320..bb9b1da3f 100644 --- a/data/maps/OneIsland_House2/map.json +++ b/data/maps/OneIsland_House2/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ONE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/OneIsland_KindleRoad/map.json b/data/maps/OneIsland_KindleRoad/map.json index 6c5261d87..01e5b92e7 100644 --- a/data/maps/OneIsland_KindleRoad/map.json +++ b/data/maps/OneIsland_KindleRoad/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_KINDLE_ROAD", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_ONE_ISLAND", diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json index 56330cc18..0a50424cb 100644 --- a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_EMBER_SPA", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/OneIsland_PokemonCenter_1F/map.json b/data/maps/OneIsland_PokemonCenter_1F/map.json index 6844a64f7..07d68dfc1 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/map.json +++ b/data/maps/OneIsland_PokemonCenter_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ONE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/OneIsland_PokemonCenter_2F/map.json b/data/maps/OneIsland_PokemonCenter_2F/map.json index 34076f9c7..5b20f3609 100644 --- a/data/maps/OneIsland_PokemonCenter_2F/map.json +++ b/data/maps/OneIsland_PokemonCenter_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ONE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/OneIsland_TreasureBeach/map.json b/data/maps/OneIsland_TreasureBeach/map.json index b8bb2753d..2198e9b44 100644 --- a/data/maps/OneIsland_TreasureBeach/map.json +++ b/data/maps/OneIsland_TreasureBeach/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_TREASURE_BEACH", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_ONE_ISLAND", diff --git a/data/maps/PalletTown/map.json b/data/maps/PalletTown/map.json index ebb3452ed..58924be03 100644 --- a/data/maps/PalletTown/map.json +++ b/data/maps/PalletTown/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_PALLET_TOWN", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_1", + "map_type": "MAP_TYPE_TOWN", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_ROUTE1", diff --git a/data/maps/PalletTown_GarysHouse/map.json b/data/maps/PalletTown_GarysHouse/map.json index 70912d327..6b44f7eb3 100644 --- a/data/maps/PalletTown_GarysHouse/map.json +++ b/data/maps/PalletTown_GarysHouse/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_PALLET_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/PalletTown_PlayersHouse_1F/map.json b/data/maps/PalletTown_PlayersHouse_1F/map.json index 2bf43f757..414766d99 100644 --- a/data/maps/PalletTown_PlayersHouse_1F/map.json +++ b/data/maps/PalletTown_PlayersHouse_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_PALLET_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/PalletTown_PlayersHouse_2F/map.json b/data/maps/PalletTown_PlayersHouse_2F/map.json index 913e5edbb..67befec6c 100644 --- a/data/maps/PalletTown_PlayersHouse_2F/map.json +++ b/data/maps/PalletTown_PlayersHouse_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_PALLET_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/PalletTown_ProfessorOaksLab/map.json b/data/maps/PalletTown_ProfessorOaksLab/map.json index 2740a0b4a..31e6014cb 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/map.json +++ b/data/maps/PalletTown_ProfessorOaksLab/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_PALLET_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/PewterCity/map.json b/data/maps/PewterCity/map.json index 5a2876338..fb235f0c5 100644 --- a/data/maps/PewterCity/map.json +++ b/data/maps/PewterCity/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_1", + "map_type": "MAP_TYPE_TOWN", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_ROUTE2", diff --git a/data/maps/PewterCity_Gym/map.json b/data/maps/PewterCity_Gym/map.json index 7bf1745d3..45c972196 100644 --- a/data/maps/PewterCity_Gym/map.json +++ b/data/maps/PewterCity_Gym/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_1", + "battle_scene": "MAP_BATTLE_SCENE_GYM", "connections": null, "object_events": [ { diff --git a/data/maps/PewterCity_House1/map.json b/data/maps/PewterCity_House1/map.json index 6018bd0de..ca16f11a1 100644 --- a/data/maps/PewterCity_House1/map.json +++ b/data/maps/PewterCity_House1/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/PewterCity_House2/map.json b/data/maps/PewterCity_House2/map.json index 4f94f6112..27fb0810c 100644 --- a/data/maps/PewterCity_House2/map.json +++ b/data/maps/PewterCity_House2/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/PewterCity_Mart/map.json b/data/maps/PewterCity_Mart/map.json index 97d42e276..77983d9f3 100644 --- a/data/maps/PewterCity_Mart/map.json +++ b/data/maps/PewterCity_Mart/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/PewterCity_Museum_1F/map.json b/data/maps/PewterCity_Museum_1F/map.json index 951aab31e..ced7102e2 100644 --- a/data/maps/PewterCity_Museum_1F/map.json +++ b/data/maps/PewterCity_Museum_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/PewterCity_Museum_2F/map.json b/data/maps/PewterCity_Museum_2F/map.json index 540c5507c..c7e1c8d8d 100644 --- a/data/maps/PewterCity_Museum_2F/map.json +++ b/data/maps/PewterCity_Museum_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/PewterCity_PokemonCenter_1F/map.json b/data/maps/PewterCity_PokemonCenter_1F/map.json index 70b06a013..e4858844c 100644 --- a/data/maps/PewterCity_PokemonCenter_1F/map.json +++ b/data/maps/PewterCity_PokemonCenter_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/PewterCity_PokemonCenter_2F/map.json b/data/maps/PewterCity_PokemonCenter_2F/map.json index db2170831..445b86eb3 100644 --- a/data/maps/PewterCity_PokemonCenter_2F/map.json +++ b/data/maps/PewterCity_PokemonCenter_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/PokemonLeague_AgathasRoom/map.json b/data/maps/PokemonLeague_AgathasRoom/map.json index 4ad8d6f26..68dd0db42 100644 --- a/data/maps/PokemonLeague_AgathasRoom/map.json +++ b/data/maps/PokemonLeague_AgathasRoom/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_POKEMON_LEAGUE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_6", + "battle_scene": "MAP_BATTLE_SCENE_AGATHA", "connections": null, "object_events": [ { diff --git a/data/maps/PokemonLeague_BrunosRoom/map.json b/data/maps/PokemonLeague_BrunosRoom/map.json index 2f96b33d3..6153f4808 100644 --- a/data/maps/PokemonLeague_BrunosRoom/map.json +++ b/data/maps/PokemonLeague_BrunosRoom/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_POKEMON_LEAGUE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_5", + "battle_scene": "MAP_BATTLE_SCENE_BRUNO", "connections": null, "object_events": [ { diff --git a/data/maps/PokemonLeague_ChampionsRoom/map.json b/data/maps/PokemonLeague_ChampionsRoom/map.json index 944b3570a..f8e9422c3 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/map.json +++ b/data/maps/PokemonLeague_ChampionsRoom/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_POKEMON_LEAGUE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/PokemonLeague_HallOfFame/map.json b/data/maps/PokemonLeague_HallOfFame/map.json index 0fc1e3d99..16c9d05ec 100644 --- a/data/maps/PokemonLeague_HallOfFame/map.json +++ b/data/maps/PokemonLeague_HallOfFame/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_POKEMON_LEAGUE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/PokemonLeague_LancesRoom/map.json b/data/maps/PokemonLeague_LancesRoom/map.json index 9629713b3..332ed15b8 100644 --- a/data/maps/PokemonLeague_LancesRoom/map.json +++ b/data/maps/PokemonLeague_LancesRoom/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_POKEMON_LEAGUE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_7", + "battle_scene": "MAP_BATTLE_SCENE_LANCE", "connections": null, "object_events": [ { diff --git a/data/maps/PokemonLeague_LoreleisRoom/map.json b/data/maps/PokemonLeague_LoreleisRoom/map.json index 462583db1..d308c7975 100644 --- a/data/maps/PokemonLeague_LoreleisRoom/map.json +++ b/data/maps/PokemonLeague_LoreleisRoom/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_POKEMON_LEAGUE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_4", + "battle_scene": "MAP_BATTLE_SCENE_LORELEI", "connections": null, "object_events": [ { diff --git a/data/maps/PokemonMansion_1F/map.json b/data/maps/PokemonMansion_1F/map.json index ddb5037b1..da4e01f1e 100644 --- a/data/maps/PokemonMansion_1F/map.json +++ b/data/maps/PokemonMansion_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_POKEMON_MANSION", "requires_flash": false, "weather": "WEATHER_SHADE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_3", + "battle_scene": "MAP_BATTLE_SCENE_INDOOR_2", "connections": null, "object_events": [ { diff --git a/data/maps/PokemonMansion_2F/map.json b/data/maps/PokemonMansion_2F/map.json index b95531ca0..3701da351 100644 --- a/data/maps/PokemonMansion_2F/map.json +++ b/data/maps/PokemonMansion_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_POKEMON_MANSION", "requires_flash": false, "weather": "WEATHER_SHADE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_3", + "battle_scene": "MAP_BATTLE_SCENE_INDOOR_2", "connections": null, "object_events": [ { diff --git a/data/maps/PokemonMansion_3F/map.json b/data/maps/PokemonMansion_3F/map.json index ce8a30fa6..e3d599d9f 100644 --- a/data/maps/PokemonMansion_3F/map.json +++ b/data/maps/PokemonMansion_3F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_POKEMON_MANSION", "requires_flash": false, "weather": "WEATHER_SHADE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_3", + "battle_scene": "MAP_BATTLE_SCENE_INDOOR_2", "connections": null, "object_events": [ { diff --git a/data/maps/PokemonMansion_B1F/map.json b/data/maps/PokemonMansion_B1F/map.json index dd9a03404..c4a876461 100644 --- a/data/maps/PokemonMansion_B1F/map.json +++ b/data/maps/PokemonMansion_B1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_POKEMON_MANSION", "requires_flash": false, "weather": "WEATHER_SHADE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_3", + "battle_scene": "MAP_BATTLE_SCENE_INDOOR_2", "connections": null, "object_events": [ { diff --git a/data/maps/PokemonTower_1F/map.json b/data/maps/PokemonTower_1F/map.json index 5b062c2e3..0b6d23cd3 100644 --- a/data/maps/PokemonTower_1F/map.json +++ b/data/maps/PokemonTower_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_POKEMON_TOWER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": true, "allow_running": false, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_2", + "battle_scene": "MAP_BATTLE_SCENE_INDOOR_1", "connections": null, "object_events": [ { diff --git a/data/maps/PokemonTower_2F/map.json b/data/maps/PokemonTower_2F/map.json index 927497f78..0d9b51490 100644 --- a/data/maps/PokemonTower_2F/map.json +++ b/data/maps/PokemonTower_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_POKEMON_TOWER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": true, "allow_running": false, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_2", + "battle_scene": "MAP_BATTLE_SCENE_INDOOR_1", "connections": null, "object_events": [ { diff --git a/data/maps/PokemonTower_3F/map.json b/data/maps/PokemonTower_3F/map.json index 738c33892..8f234e935 100644 --- a/data/maps/PokemonTower_3F/map.json +++ b/data/maps/PokemonTower_3F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_POKEMON_TOWER", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": true, "allow_running": false, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_2", + "battle_scene": "MAP_BATTLE_SCENE_INDOOR_1", "connections": null, "object_events": [ { diff --git a/data/maps/PokemonTower_4F/map.json b/data/maps/PokemonTower_4F/map.json index 45fd8df10..47ee6cc43 100644 --- a/data/maps/PokemonTower_4F/map.json +++ b/data/maps/PokemonTower_4F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_POKEMON_TOWER", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": true, "allow_running": false, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_2", + "battle_scene": "MAP_BATTLE_SCENE_INDOOR_1", "connections": null, "object_events": [ { diff --git a/data/maps/PokemonTower_5F/map.json b/data/maps/PokemonTower_5F/map.json index 1d3fb711e..a1f0fc109 100644 --- a/data/maps/PokemonTower_5F/map.json +++ b/data/maps/PokemonTower_5F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_POKEMON_TOWER", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": true, "allow_running": false, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_2", + "battle_scene": "MAP_BATTLE_SCENE_INDOOR_1", "connections": null, "object_events": [ { diff --git a/data/maps/PokemonTower_6F/map.json b/data/maps/PokemonTower_6F/map.json index ec7a085a1..7ef95333a 100644 --- a/data/maps/PokemonTower_6F/map.json +++ b/data/maps/PokemonTower_6F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_POKEMON_TOWER", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": true, "allow_running": false, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_2", + "battle_scene": "MAP_BATTLE_SCENE_INDOOR_1", "connections": null, "object_events": [ { diff --git a/data/maps/PokemonTower_7F/map.json b/data/maps/PokemonTower_7F/map.json index 33a616f96..e01c53116 100644 --- a/data/maps/PokemonTower_7F/map.json +++ b/data/maps/PokemonTower_7F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_POKEMON_TOWER", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": true, "allow_running": false, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_2", + "battle_scene": "MAP_BATTLE_SCENE_INDOOR_1", "connections": null, "object_events": [ { diff --git a/data/maps/PowerPlant/map.json b/data/maps/PowerPlant/map.json index 8deaf33ff..18099fc15 100644 --- a/data/maps/PowerPlant/map.json +++ b/data/maps/PowerPlant/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_POWER_PLANT", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_3", + "battle_scene": "MAP_BATTLE_SCENE_INDOOR_2", "connections": null, "object_events": [ { diff --git a/data/maps/Prototype_SeviiIsle_6/map.json b/data/maps/Prototype_SeviiIsle_6/map.json index a2679346e..761c204ce 100644 --- a/data/maps/Prototype_SeviiIsle_6/map.json +++ b/data/maps/Prototype_SeviiIsle_6/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SEVII_ISLE_6", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_THREE_ISLAND", diff --git a/data/maps/Prototype_SeviiIsle_7/map.json b/data/maps/Prototype_SeviiIsle_7/map.json index 8a9e59a11..856883c02 100644 --- a/data/maps/Prototype_SeviiIsle_7/map.json +++ b/data/maps/Prototype_SeviiIsle_7/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SEVII_ISLE_7", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_THREE_ISLAND", diff --git a/data/maps/Prototype_SeviiIsle_8/map.json b/data/maps/Prototype_SeviiIsle_8/map.json index 0c19f8b14..dd05d6d35 100644 --- a/data/maps/Prototype_SeviiIsle_8/map.json +++ b/data/maps/Prototype_SeviiIsle_8/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SEVII_ISLE_8", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [], diff --git a/data/maps/Prototype_SeviiIsle_9/map.json b/data/maps/Prototype_SeviiIsle_9/map.json index 1c24e70f2..b03f3866c 100644 --- a/data/maps/Prototype_SeviiIsle_9/map.json +++ b/data/maps/Prototype_SeviiIsle_9/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SEVII_ISLE_9", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [], diff --git a/data/maps/RecordCenter/map.json b/data/maps/RecordCenter/map.json index 974b56f41..0a1f10925 100644 --- a/data/maps/RecordCenter/map.json +++ b/data/maps/RecordCenter/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SPECIAL_AREA", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/RockTunnel_1F/map.json b/data/maps/RockTunnel_1F/map.json index af58ddebf..6bb68f578 100644 --- a/data/maps/RockTunnel_1F/map.json +++ b/data/maps/RockTunnel_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROCK_TUNNEL", "requires_flash": true, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/RockTunnel_B1F/map.json b/data/maps/RockTunnel_B1F/map.json index 99106f92c..bebd68148 100644 --- a/data/maps/RockTunnel_B1F/map.json +++ b/data/maps/RockTunnel_B1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROCK_TUNNEL", "requires_flash": true, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/RocketHideout_B1F/map.json b/data/maps/RocketHideout_B1F/map.json index 8e0c1406f..b80daf9d5 100644 --- a/data/maps/RocketHideout_B1F/map.json +++ b/data/maps/RocketHideout_B1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROCKET_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": -1, - "battle_scene": "BATTLE_SCENE_3", + "battle_scene": "MAP_BATTLE_SCENE_INDOOR_2", "connections": null, "object_events": [ { diff --git a/data/maps/RocketHideout_B2F/map.json b/data/maps/RocketHideout_B2F/map.json index 1855f54f9..5daefa002 100644 --- a/data/maps/RocketHideout_B2F/map.json +++ b/data/maps/RocketHideout_B2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROCKET_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": -2, - "battle_scene": "BATTLE_SCENE_3", + "battle_scene": "MAP_BATTLE_SCENE_INDOOR_2", "connections": null, "object_events": [ { diff --git a/data/maps/RocketHideout_B3F/map.json b/data/maps/RocketHideout_B3F/map.json index 9ade4ac35..984757f1e 100644 --- a/data/maps/RocketHideout_B3F/map.json +++ b/data/maps/RocketHideout_B3F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROCKET_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": -3, - "battle_scene": "BATTLE_SCENE_3", + "battle_scene": "MAP_BATTLE_SCENE_INDOOR_2", "connections": null, "object_events": [ { diff --git a/data/maps/RocketHideout_B4F/map.json b/data/maps/RocketHideout_B4F/map.json index 3e4f05f9c..bd38e3b71 100644 --- a/data/maps/RocketHideout_B4F/map.json +++ b/data/maps/RocketHideout_B4F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROCKET_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": -4, - "battle_scene": "BATTLE_SCENE_3", + "battle_scene": "MAP_BATTLE_SCENE_INDOOR_2", "connections": null, "object_events": [ { diff --git a/data/maps/RocketHideout_Elevator/map.json b/data/maps/RocketHideout_Elevator/map.json index 45a57249d..8e2d35889 100644 --- a/data/maps/RocketHideout_Elevator/map.json +++ b/data/maps/RocketHideout_Elevator/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROCKET_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_3", + "battle_scene": "MAP_BATTLE_SCENE_INDOOR_2", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/Route1/map.json b/data/maps/Route1/map.json index 9b6547be6..d8af63766 100644 --- a/data/maps/Route1/map.json +++ b/data/maps/Route1/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_1", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_VIRIDIAN_CITY", diff --git a/data/maps/Route10/map.json b/data/maps/Route10/map.json index 1c49d6240..655b754f8 100644 --- a/data/maps/Route10/map.json +++ b/data/maps/Route10/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_10", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_LAVENDER_TOWN", diff --git a/data/maps/Route10_PokemonCenter_1F/map.json b/data/maps/Route10_PokemonCenter_1F/map.json index a9baaa56d..3d4a72c7f 100644 --- a/data/maps/Route10_PokemonCenter_1F/map.json +++ b/data/maps/Route10_PokemonCenter_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_10", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/Route10_PokemonCenter_2F/map.json b/data/maps/Route10_PokemonCenter_2F/map.json index 93dafeade..f9aae8494 100644 --- a/data/maps/Route10_PokemonCenter_2F/map.json +++ b/data/maps/Route10_PokemonCenter_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_10", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/Route11/map.json b/data/maps/Route11/map.json index b3720463a..2dfa99d41 100644 --- a/data/maps/Route11/map.json +++ b/data/maps/Route11/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_11", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_VERMILION_CITY", diff --git a/data/maps/Route11_EastEntrance_1F/map.json b/data/maps/Route11_EastEntrance_1F/map.json index 0bf683d84..558e82fa9 100644 --- a/data/maps/Route11_EastEntrance_1F/map.json +++ b/data/maps/Route11_EastEntrance_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_11", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/Route11_EastEntrance_2F/map.json b/data/maps/Route11_EastEntrance_2F/map.json index bd50c4d9e..bae5a824f 100644 --- a/data/maps/Route11_EastEntrance_2F/map.json +++ b/data/maps/Route11_EastEntrance_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_11", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/Route12/map.json b/data/maps/Route12/map.json index 11790e23a..d11f613bf 100644 --- a/data/maps/Route12/map.json +++ b/data/maps/Route12/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_12", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_LAVENDER_TOWN", diff --git a/data/maps/Route12_FishingHouse/map.json b/data/maps/Route12_FishingHouse/map.json index 2e792d586..f0497dcdd 100644 --- a/data/maps/Route12_FishingHouse/map.json +++ b/data/maps/Route12_FishingHouse/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_12", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/Route12_NorthEntrance_1F/map.json b/data/maps/Route12_NorthEntrance_1F/map.json index cb4996f5d..d357e4dc3 100644 --- a/data/maps/Route12_NorthEntrance_1F/map.json +++ b/data/maps/Route12_NorthEntrance_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_12", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/Route12_NorthEntrance_2F/map.json b/data/maps/Route12_NorthEntrance_2F/map.json index 379bb5db0..69fe7cc80 100644 --- a/data/maps/Route12_NorthEntrance_2F/map.json +++ b/data/maps/Route12_NorthEntrance_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_12", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/Route13/map.json b/data/maps/Route13/map.json index 52480bd5f..9a8df1757 100644 --- a/data/maps/Route13/map.json +++ b/data/maps/Route13/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_13", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_ROUTE12", diff --git a/data/maps/Route14/map.json b/data/maps/Route14/map.json index 1e127e4bb..a6e07e6bb 100644 --- a/data/maps/Route14/map.json +++ b/data/maps/Route14/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_14", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_ROUTE15", diff --git a/data/maps/Route15/map.json b/data/maps/Route15/map.json index ad47154d5..bc368ca01 100644 --- a/data/maps/Route15/map.json +++ b/data/maps/Route15/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_15", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_FUCHSIA_CITY", diff --git a/data/maps/Route15_WestEntrance_1F/map.json b/data/maps/Route15_WestEntrance_1F/map.json index 24d75ca24..0959512a2 100644 --- a/data/maps/Route15_WestEntrance_1F/map.json +++ b/data/maps/Route15_WestEntrance_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_15", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/Route15_WestEntrance_2F/map.json b/data/maps/Route15_WestEntrance_2F/map.json index c1df344e2..1d21cd2b1 100644 --- a/data/maps/Route15_WestEntrance_2F/map.json +++ b/data/maps/Route15_WestEntrance_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_15", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/Route16/map.json b/data/maps/Route16/map.json index b6bb53b8f..0dd47cbc6 100644 --- a/data/maps/Route16/map.json +++ b/data/maps/Route16/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_16", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_ROUTE17", diff --git a/data/maps/Route16_House/map.json b/data/maps/Route16_House/map.json index c22a6d47a..dc0d416f4 100644 --- a/data/maps/Route16_House/map.json +++ b/data/maps/Route16_House/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_16", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/Route16_NorthEntrance_1F/map.json b/data/maps/Route16_NorthEntrance_1F/map.json index 25c134dd3..b9425a4a6 100644 --- a/data/maps/Route16_NorthEntrance_1F/map.json +++ b/data/maps/Route16_NorthEntrance_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_16", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/Route16_NorthEntrance_2F/map.json b/data/maps/Route16_NorthEntrance_2F/map.json index f19dac4f4..551fb5e7a 100644 --- a/data/maps/Route16_NorthEntrance_2F/map.json +++ b/data/maps/Route16_NorthEntrance_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_16", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/Route17/map.json b/data/maps/Route17/map.json index 4c9f1cb04..1afe3a6bf 100644 --- a/data/maps/Route17/map.json +++ b/data/maps/Route17/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_17", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_ROUTE16", diff --git a/data/maps/Route18/map.json b/data/maps/Route18/map.json index d9bd47f15..6dd7673de 100644 --- a/data/maps/Route18/map.json +++ b/data/maps/Route18/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_18", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_ROUTE17", diff --git a/data/maps/Route18_EastEntrance_1F/map.json b/data/maps/Route18_EastEntrance_1F/map.json index 6721a4be1..741c391f7 100644 --- a/data/maps/Route18_EastEntrance_1F/map.json +++ b/data/maps/Route18_EastEntrance_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_18", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/Route18_EastEntrance_2F/map.json b/data/maps/Route18_EastEntrance_2F/map.json index c341cd912..052fe0215 100644 --- a/data/maps/Route18_EastEntrance_2F/map.json +++ b/data/maps/Route18_EastEntrance_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_18", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/Route19/map.json b/data/maps/Route19/map.json index 04cf3bbba..abb670524 100644 --- a/data/maps/Route19/map.json +++ b/data/maps/Route19/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_19", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_FUCHSIA_CITY", diff --git a/data/maps/Route2/map.json b/data/maps/Route2/map.json index c32aed08e..008be4a9f 100644 --- a/data/maps/Route2/map.json +++ b/data/maps/Route2/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_2", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_PEWTER_CITY", diff --git a/data/maps/Route20/map.json b/data/maps/Route20/map.json index 872b24302..e97d95544 100644 --- a/data/maps/Route20/map.json +++ b/data/maps/Route20/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_20", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_CINNABAR_ISLAND", diff --git a/data/maps/Route21_North/map.json b/data/maps/Route21_North/map.json index 0335c2f51..06767be42 100644 --- a/data/maps/Route21_North/map.json +++ b/data/maps/Route21_North/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_21", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_PALLET_TOWN", diff --git a/data/maps/Route21_South/map.json b/data/maps/Route21_South/map.json index e7af08d21..ef022d513 100644 --- a/data/maps/Route21_South/map.json +++ b/data/maps/Route21_South/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_21", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_ROUTE21_NORTH", diff --git a/data/maps/Route22/map.json b/data/maps/Route22/map.json index 298c43f2a..41aedc6e0 100644 --- a/data/maps/Route22/map.json +++ b/data/maps/Route22/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_22", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_ROUTE23", diff --git a/data/maps/Route22_NorthEntrance/map.json b/data/maps/Route22_NorthEntrance/map.json index 58cef00c2..20414c25f 100644 --- a/data/maps/Route22_NorthEntrance/map.json +++ b/data/maps/Route22_NorthEntrance/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_22", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/Route23/map.json b/data/maps/Route23/map.json index e61cf6357..145f20cf3 100644 --- a/data/maps/Route23/map.json +++ b/data/maps/Route23/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_23", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_INDIGO_PLATEAU_EXTERIOR", diff --git a/data/maps/Route24/map.json b/data/maps/Route24/map.json index 391b2b2c1..5fa15ddb3 100644 --- a/data/maps/Route24/map.json +++ b/data/maps/Route24/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_24", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_CERULEAN_CITY", diff --git a/data/maps/Route25/map.json b/data/maps/Route25/map.json index 9e819f255..88d68ca07 100644 --- a/data/maps/Route25/map.json +++ b/data/maps/Route25/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_25", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_ROUTE24", diff --git a/data/maps/Route25_SeaCottage/map.json b/data/maps/Route25_SeaCottage/map.json index d5ae39619..8e4ac79c6 100644 --- a/data/maps/Route25_SeaCottage/map.json +++ b/data/maps/Route25_SeaCottage/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_25", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/Route2_EastBuilding/map.json b/data/maps/Route2_EastBuilding/map.json index 8d7f7a60c..613f1d207 100644 --- a/data/maps/Route2_EastBuilding/map.json +++ b/data/maps/Route2_EastBuilding/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_2", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/Route2_House/map.json b/data/maps/Route2_House/map.json index 51202139e..fdf66afb1 100644 --- a/data/maps/Route2_House/map.json +++ b/data/maps/Route2_House/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_2", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/Route2_ViridianForest_NorthEntrance/map.json b/data/maps/Route2_ViridianForest_NorthEntrance/map.json index 208b70876..478b3045e 100644 --- a/data/maps/Route2_ViridianForest_NorthEntrance/map.json +++ b/data/maps/Route2_ViridianForest_NorthEntrance/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_2", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/Route2_ViridianForest_SouthEntrance/map.json b/data/maps/Route2_ViridianForest_SouthEntrance/map.json index 4b9d09d58..17e756798 100644 --- a/data/maps/Route2_ViridianForest_SouthEntrance/map.json +++ b/data/maps/Route2_ViridianForest_SouthEntrance/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_2", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/Route3/map.json b/data/maps/Route3/map.json index 22f5835c4..af0de6644 100644 --- a/data/maps/Route3/map.json +++ b/data/maps/Route3/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_3", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_ROUTE4", diff --git a/data/maps/Route4/map.json b/data/maps/Route4/map.json index 4a2562932..7fcf32a5d 100644 --- a/data/maps/Route4/map.json +++ b/data/maps/Route4/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_4", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_ROUTE3", diff --git a/data/maps/Route4_PokemonCenter_1F/map.json b/data/maps/Route4_PokemonCenter_1F/map.json index 6667c65e6..1ce7fbebb 100644 --- a/data/maps/Route4_PokemonCenter_1F/map.json +++ b/data/maps/Route4_PokemonCenter_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_4", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/Route4_PokemonCenter_2F/map.json b/data/maps/Route4_PokemonCenter_2F/map.json index 6cb694eb1..a71194174 100644 --- a/data/maps/Route4_PokemonCenter_2F/map.json +++ b/data/maps/Route4_PokemonCenter_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_4", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/Route5/map.json b/data/maps/Route5/map.json index c33b3b0e2..825ae6068 100644 --- a/data/maps/Route5/map.json +++ b/data/maps/Route5/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_5", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_CERULEAN_CITY", diff --git a/data/maps/Route5_PokemonDayCare/map.json b/data/maps/Route5_PokemonDayCare/map.json index 8d425132e..826c71624 100644 --- a/data/maps/Route5_PokemonDayCare/map.json +++ b/data/maps/Route5_PokemonDayCare/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_5", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/Route5_SouthEntrance/map.json b/data/maps/Route5_SouthEntrance/map.json index 6a121c300..5896d1664 100644 --- a/data/maps/Route5_SouthEntrance/map.json +++ b/data/maps/Route5_SouthEntrance/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_5", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/Route6/map.json b/data/maps/Route6/map.json index 994d86064..e6c4c7cf2 100644 --- a/data/maps/Route6/map.json +++ b/data/maps/Route6/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_6", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_SAFFRON_CITY_CONNECTION", diff --git a/data/maps/Route6_NorthEntrance/map.json b/data/maps/Route6_NorthEntrance/map.json index b5f0fa618..40dd5c985 100644 --- a/data/maps/Route6_NorthEntrance/map.json +++ b/data/maps/Route6_NorthEntrance/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_6", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/Route7/map.json b/data/maps/Route7/map.json index 5c4d7a22f..d75cae2e4 100644 --- a/data/maps/Route7/map.json +++ b/data/maps/Route7/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_7", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_CELADON_CITY", diff --git a/data/maps/Route7_EastEntrance/map.json b/data/maps/Route7_EastEntrance/map.json index 153d408c0..a311c8eee 100644 --- a/data/maps/Route7_EastEntrance/map.json +++ b/data/maps/Route7_EastEntrance/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_7", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/Route8/map.json b/data/maps/Route8/map.json index 3299bfab6..22663b469 100644 --- a/data/maps/Route8/map.json +++ b/data/maps/Route8/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_8", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_SAFFRON_CITY_CONNECTION", diff --git a/data/maps/Route8_WestEntrance/map.json b/data/maps/Route8_WestEntrance/map.json index 0440e1eda..fc6c97792 100644 --- a/data/maps/Route8_WestEntrance/map.json +++ b/data/maps/Route8_WestEntrance/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_8", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/Route9/map.json b/data/maps/Route9/map.json index 296e10f4c..e67441c39 100644 --- a/data/maps/Route9/map.json +++ b/data/maps/Route9/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_9", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_CERULEAN_CITY", diff --git a/data/maps/SSAnne_1F_Corridor/map.json b/data/maps/SSAnne_1F_Corridor/map.json index 10420902e..87d778a25 100644 --- a/data/maps/SSAnne_1F_Corridor/map.json +++ b/data/maps/SSAnne_1F_Corridor/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SSAnne_1F_Room1/map.json b/data/maps/SSAnne_1F_Room1/map.json index d9658a88e..d018cc7a4 100644 --- a/data/maps/SSAnne_1F_Room1/map.json +++ b/data/maps/SSAnne_1F_Room1/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SSAnne_1F_Room2/map.json b/data/maps/SSAnne_1F_Room2/map.json index 6fcb0ceef..765612f48 100644 --- a/data/maps/SSAnne_1F_Room2/map.json +++ b/data/maps/SSAnne_1F_Room2/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SSAnne_1F_Room3/map.json b/data/maps/SSAnne_1F_Room3/map.json index 4642048b3..e518ae50e 100644 --- a/data/maps/SSAnne_1F_Room3/map.json +++ b/data/maps/SSAnne_1F_Room3/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SSAnne_1F_Room4/map.json b/data/maps/SSAnne_1F_Room4/map.json index e77125c34..c11aa16b5 100644 --- a/data/maps/SSAnne_1F_Room4/map.json +++ b/data/maps/SSAnne_1F_Room4/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SSAnne_1F_Room5/map.json b/data/maps/SSAnne_1F_Room5/map.json index 590d8de8f..51935aea2 100644 --- a/data/maps/SSAnne_1F_Room5/map.json +++ b/data/maps/SSAnne_1F_Room5/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SSAnne_1F_Room6/map.json b/data/maps/SSAnne_1F_Room6/map.json index 5bc9adb03..d6f0a1b44 100644 --- a/data/maps/SSAnne_1F_Room6/map.json +++ b/data/maps/SSAnne_1F_Room6/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SSAnne_1F_Room7/map.json b/data/maps/SSAnne_1F_Room7/map.json index ee0ab8b1f..315d49099 100644 --- a/data/maps/SSAnne_1F_Room7/map.json +++ b/data/maps/SSAnne_1F_Room7/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SSAnne_2F_Corridor/map.json b/data/maps/SSAnne_2F_Corridor/map.json index 1e5dda37c..bb2df92ce 100644 --- a/data/maps/SSAnne_2F_Corridor/map.json +++ b/data/maps/SSAnne_2F_Corridor/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SSAnne_2F_Room1/map.json b/data/maps/SSAnne_2F_Room1/map.json index 070d56bb3..6fbbde902 100644 --- a/data/maps/SSAnne_2F_Room1/map.json +++ b/data/maps/SSAnne_2F_Room1/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SSAnne_2F_Room2/map.json b/data/maps/SSAnne_2F_Room2/map.json index 4f8ad260c..1692afc23 100644 --- a/data/maps/SSAnne_2F_Room2/map.json +++ b/data/maps/SSAnne_2F_Room2/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SSAnne_2F_Room3/map.json b/data/maps/SSAnne_2F_Room3/map.json index 781065b46..05ac70a4f 100644 --- a/data/maps/SSAnne_2F_Room3/map.json +++ b/data/maps/SSAnne_2F_Room3/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SSAnne_2F_Room4/map.json b/data/maps/SSAnne_2F_Room4/map.json index b085d84e2..116380880 100644 --- a/data/maps/SSAnne_2F_Room4/map.json +++ b/data/maps/SSAnne_2F_Room4/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SSAnne_2F_Room5/map.json b/data/maps/SSAnne_2F_Room5/map.json index ce08f94fa..ca0c68072 100644 --- a/data/maps/SSAnne_2F_Room5/map.json +++ b/data/maps/SSAnne_2F_Room5/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SSAnne_2F_Room6/map.json b/data/maps/SSAnne_2F_Room6/map.json index 9adc38ef4..fe00765ab 100644 --- a/data/maps/SSAnne_2F_Room6/map.json +++ b/data/maps/SSAnne_2F_Room6/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SSAnne_3F_Corridor/map.json b/data/maps/SSAnne_3F_Corridor/map.json index be49ce689..fa9ad902a 100644 --- a/data/maps/SSAnne_3F_Corridor/map.json +++ b/data/maps/SSAnne_3F_Corridor/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SSAnne_B1F_Corridor/map.json b/data/maps/SSAnne_B1F_Corridor/map.json index 5a536d185..86fe58592 100644 --- a/data/maps/SSAnne_B1F_Corridor/map.json +++ b/data/maps/SSAnne_B1F_Corridor/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/SSAnne_B1F_Room1/map.json b/data/maps/SSAnne_B1F_Room1/map.json index 556fa324d..25286e3cc 100644 --- a/data/maps/SSAnne_B1F_Room1/map.json +++ b/data/maps/SSAnne_B1F_Room1/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SSAnne_B1F_Room2/map.json b/data/maps/SSAnne_B1F_Room2/map.json index af9c3af68..bac380ea3 100644 --- a/data/maps/SSAnne_B1F_Room2/map.json +++ b/data/maps/SSAnne_B1F_Room2/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SSAnne_B1F_Room3/map.json b/data/maps/SSAnne_B1F_Room3/map.json index 63d7e5b3c..e4fecec84 100644 --- a/data/maps/SSAnne_B1F_Room3/map.json +++ b/data/maps/SSAnne_B1F_Room3/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SSAnne_B1F_Room4/map.json b/data/maps/SSAnne_B1F_Room4/map.json index 9a8ddec21..b72b8f2dd 100644 --- a/data/maps/SSAnne_B1F_Room4/map.json +++ b/data/maps/SSAnne_B1F_Room4/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SSAnne_B1F_Room5/map.json b/data/maps/SSAnne_B1F_Room5/map.json index 035e29ceb..9f258f534 100644 --- a/data/maps/SSAnne_B1F_Room5/map.json +++ b/data/maps/SSAnne_B1F_Room5/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SSAnne_CaptainsOffice/map.json b/data/maps/SSAnne_CaptainsOffice/map.json index b56604054..a87171f61 100644 --- a/data/maps/SSAnne_CaptainsOffice/map.json +++ b/data/maps/SSAnne_CaptainsOffice/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SSAnne_Deck/map.json b/data/maps/SSAnne_Deck/map.json index 6055a5da7..be784748a 100644 --- a/data/maps/SSAnne_Deck/map.json +++ b/data/maps/SSAnne_Deck/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SSAnne_Exterior/map.json b/data/maps/SSAnne_Exterior/map.json index 5f7384d5f..c37b2ac5c 100644 --- a/data/maps/SSAnne_Exterior/map.json +++ b/data/maps/SSAnne_Exterior/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SSAnne_Kitchen/map.json b/data/maps/SSAnne_Kitchen/map.json index 0d89a72ee..d97f89317 100644 --- a/data/maps/SSAnne_Kitchen/map.json +++ b/data/maps/SSAnne_Kitchen/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SafariZone_Center/map.json b/data/maps/SafariZone_Center/map.json index d14c2509d..cc2bd0e60 100644 --- a/data/maps/SafariZone_Center/map.json +++ b/data/maps/SafariZone_Center/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SafariZone_Center_RestHouse/map.json b/data/maps/SafariZone_Center_RestHouse/map.json index db3584eb8..fd3453ef3 100644 --- a/data/maps/SafariZone_Center_RestHouse/map.json +++ b/data/maps/SafariZone_Center_RestHouse/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SafariZone_East/map.json b/data/maps/SafariZone_East/map.json index 250d5baf5..a7d35c6fa 100644 --- a/data/maps/SafariZone_East/map.json +++ b/data/maps/SafariZone_East/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SafariZone_East_RestHouse/map.json b/data/maps/SafariZone_East_RestHouse/map.json index 61e33bbe7..12e13fbaa 100644 --- a/data/maps/SafariZone_East_RestHouse/map.json +++ b/data/maps/SafariZone_East_RestHouse/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SafariZone_North/map.json b/data/maps/SafariZone_North/map.json index eb1b47a60..a4a73f8e2 100644 --- a/data/maps/SafariZone_North/map.json +++ b/data/maps/SafariZone_North/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SafariZone_North_RestHouse/map.json b/data/maps/SafariZone_North_RestHouse/map.json index d8a96baae..98ac35b33 100644 --- a/data/maps/SafariZone_North_RestHouse/map.json +++ b/data/maps/SafariZone_North_RestHouse/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SafariZone_SecretHouse/map.json b/data/maps/SafariZone_SecretHouse/map.json index 2cd3e44ed..cac992d41 100644 --- a/data/maps/SafariZone_SecretHouse/map.json +++ b/data/maps/SafariZone_SecretHouse/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SafariZone_West/map.json b/data/maps/SafariZone_West/map.json index 4caefe6f3..451f7e96d 100644 --- a/data/maps/SafariZone_West/map.json +++ b/data/maps/SafariZone_West/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SafariZone_West_RestHouse/map.json b/data/maps/SafariZone_West_RestHouse/map.json index dd1a2b682..4119d0714 100644 --- a/data/maps/SafariZone_West_RestHouse/map.json +++ b/data/maps/SafariZone_West_RestHouse/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SaffronCity/map.json b/data/maps/SaffronCity/map.json index baba42302..bfd629e91 100644 --- a/data/maps/SaffronCity/map.json +++ b/data/maps/SaffronCity/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_1", + "map_type": "MAP_TYPE_TOWN", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_ROUTE5", diff --git a/data/maps/SaffronCity_Connection/map.json b/data/maps/SaffronCity_Connection/map.json index 410ddef6e..30bcffa06 100644 --- a/data/maps/SaffronCity_Connection/map.json +++ b/data/maps/SaffronCity_Connection/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_1", + "map_type": "MAP_TYPE_TOWN", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_ROUTE5", diff --git a/data/maps/SaffronCity_CopycatsHouse_1F/map.json b/data/maps/SaffronCity_CopycatsHouse_1F/map.json index 0a0075957..9ae377f7c 100644 --- a/data/maps/SaffronCity_CopycatsHouse_1F/map.json +++ b/data/maps/SaffronCity_CopycatsHouse_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SaffronCity_CopycatsHouse_2F/map.json b/data/maps/SaffronCity_CopycatsHouse_2F/map.json index f4c37be81..9460fd5ca 100644 --- a/data/maps/SaffronCity_CopycatsHouse_2F/map.json +++ b/data/maps/SaffronCity_CopycatsHouse_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SaffronCity_Dojo/map.json b/data/maps/SaffronCity_Dojo/map.json index e4bebf06e..8f747efd5 100644 --- a/data/maps/SaffronCity_Dojo/map.json +++ b/data/maps/SaffronCity_Dojo/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SaffronCity_Gym/map.json b/data/maps/SaffronCity_Gym/map.json index a4f2f9c3e..24dd19564 100644 --- a/data/maps/SaffronCity_Gym/map.json +++ b/data/maps/SaffronCity_Gym/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": true, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_1", + "battle_scene": "MAP_BATTLE_SCENE_GYM", "connections": null, "object_events": [ { diff --git a/data/maps/SaffronCity_House/map.json b/data/maps/SaffronCity_House/map.json index c53825599..df8e80208 100644 --- a/data/maps/SaffronCity_House/map.json +++ b/data/maps/SaffronCity_House/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SaffronCity_Mart/map.json b/data/maps/SaffronCity_Mart/map.json index 7c4012ba0..31374c459 100644 --- a/data/maps/SaffronCity_Mart/map.json +++ b/data/maps/SaffronCity_Mart/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SaffronCity_MrPsychicsHouse/map.json b/data/maps/SaffronCity_MrPsychicsHouse/map.json index f32e7942c..62047365a 100644 --- a/data/maps/SaffronCity_MrPsychicsHouse/map.json +++ b/data/maps/SaffronCity_MrPsychicsHouse/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SaffronCity_PokemonCenter_1F/map.json b/data/maps/SaffronCity_PokemonCenter_1F/map.json index 61abbdbf5..0744a0812 100644 --- a/data/maps/SaffronCity_PokemonCenter_1F/map.json +++ b/data/maps/SaffronCity_PokemonCenter_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SaffronCity_PokemonCenter_2F/map.json b/data/maps/SaffronCity_PokemonCenter_2F/map.json index c44c6a11c..aeb3b40b6 100644 --- a/data/maps/SaffronCity_PokemonCenter_2F/map.json +++ b/data/maps/SaffronCity_PokemonCenter_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json index 65ce3b01c..764ae5897 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SeafoamIslands_1F/map.json b/data/maps/SeafoamIslands_1F/map.json index 4311b6a02..fd9c6ca25 100644 --- a/data/maps/SeafoamIslands_1F/map.json +++ b/data/maps/SeafoamIslands_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SEAFOAM_ISLANDS", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SeafoamIslands_B1F/map.json b/data/maps/SeafoamIslands_B1F/map.json index 60241ed55..528d46ae9 100644 --- a/data/maps/SeafoamIslands_B1F/map.json +++ b/data/maps/SeafoamIslands_B1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SEAFOAM_ISLANDS", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SeafoamIslands_B2F/map.json b/data/maps/SeafoamIslands_B2F/map.json index 3ac153ccf..5c7219195 100644 --- a/data/maps/SeafoamIslands_B2F/map.json +++ b/data/maps/SeafoamIslands_B2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SEAFOAM_ISLANDS", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SeafoamIslands_B3F/map.json b/data/maps/SeafoamIslands_B3F/map.json index 76960ee96..02f2224ff 100644 --- a/data/maps/SeafoamIslands_B3F/map.json +++ b/data/maps/SeafoamIslands_B3F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SEAFOAM_ISLANDS", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SeafoamIslands_B4F/map.json b/data/maps/SeafoamIslands_B4F/map.json index 4d5ada91d..eae9e0c51 100644 --- a/data/maps/SeafoamIslands_B4F/map.json +++ b/data/maps/SeafoamIslands_B4F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SEAFOAM_ISLANDS", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SevenIsland/map.json b/data/maps/SevenIsland/map.json index 69799a0f9..065d2935d 100644 --- a/data/maps/SevenIsland/map.json +++ b/data/maps/SevenIsland/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_1", + "map_type": "MAP_TYPE_TOWN", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_SEVEN_ISLAND_TRAINER_TOWER", diff --git a/data/maps/SevenIsland_Harbor/map.json b/data/maps/SevenIsland_Harbor/map.json index a621849d0..2a82fa1c1 100644 --- a/data/maps/SevenIsland_Harbor/map.json +++ b/data/maps/SevenIsland_Harbor/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SevenIsland_House_Room1/map.json b/data/maps/SevenIsland_House_Room1/map.json index 7a276372d..1251e6366 100644 --- a/data/maps/SevenIsland_House_Room1/map.json +++ b/data/maps/SevenIsland_House_Room1/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_1", + "battle_scene": "MAP_BATTLE_SCENE_GYM", "connections": null, "object_events": [ { diff --git a/data/maps/SevenIsland_House_Room2/map.json b/data/maps/SevenIsland_House_Room2/map.json index a451fdc41..6309618e5 100644 --- a/data/maps/SevenIsland_House_Room2/map.json +++ b/data/maps/SevenIsland_House_Room2/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_1", + "battle_scene": "MAP_BATTLE_SCENE_GYM", "connections": null, "object_events": [ { diff --git a/data/maps/SevenIsland_Mart/map.json b/data/maps/SevenIsland_Mart/map.json index de825eb58..8d1fcf724 100644 --- a/data/maps/SevenIsland_Mart/map.json +++ b/data/maps/SevenIsland_Mart/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SevenIsland_PokemonCenter_1F/map.json b/data/maps/SevenIsland_PokemonCenter_1F/map.json index 11baa4ab9..e1bb2ec18 100644 --- a/data/maps/SevenIsland_PokemonCenter_1F/map.json +++ b/data/maps/SevenIsland_PokemonCenter_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SevenIsland_PokemonCenter_2F/map.json b/data/maps/SevenIsland_PokemonCenter_2F/map.json index 437ddcf8f..e4249d7d5 100644 --- a/data/maps/SevenIsland_PokemonCenter_2F/map.json +++ b/data/maps/SevenIsland_PokemonCenter_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SevenIsland_SevaultCanyon/map.json b/data/maps/SevenIsland_SevaultCanyon/map.json index 810bb0ec1..b051ac85d 100644 --- a/data/maps/SevenIsland_SevaultCanyon/map.json +++ b/data/maps/SevenIsland_SevaultCanyon/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SEVAULT_CANYON", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_SEVEN_ISLAND_TANOBY_RUINS", diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json index 4e592643a..f235bf795 100644 --- a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CANYON_ENTRANCE", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_SEVEN_ISLAND", diff --git a/data/maps/SevenIsland_SevaultCanyon_House/map.json b/data/maps/SevenIsland_SevaultCanyon_House/map.json index 8cf0554f6..d58fdc0ce 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_House/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SEVAULT_CANYON", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json index d37ba83c3..fee7f725a 100644 --- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_TANOBY_KEY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_2", + "battle_scene": "MAP_BATTLE_SCENE_INDOOR_1", "connections": null, "object_events": [ { diff --git a/data/maps/SevenIsland_TanobyRuins/map.json b/data/maps/SevenIsland_TanobyRuins/map.json index 2bce9a89a..9955ca74f 100644 --- a/data/maps/SevenIsland_TanobyRuins/map.json +++ b/data/maps/SevenIsland_TanobyRuins/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_TANOBY_RUINS", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_SEVEN_ISLAND_SEVAULT_CANYON", diff --git a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json index 1a1a927e2..6e8b55f18 100644 --- a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_DILFORD_CHAMBER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_2", + "battle_scene": "MAP_BATTLE_SCENE_INDOOR_1", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json index 6f4d729b4..36ae546ee 100644 --- a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_LIPTOO_CHAMBER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_2", + "battle_scene": "MAP_BATTLE_SCENE_INDOOR_1", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json index ddae2e9fb..e7fc05f59 100644 --- a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_MONEAN_CHAMBER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_2", + "battle_scene": "MAP_BATTLE_SCENE_INDOOR_1", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json b/data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json index 5166e20e5..c974e67a5 100644 --- a/data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_RIXY_CHAMBER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_2", + "battle_scene": "MAP_BATTLE_SCENE_INDOOR_1", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json index 5a594dbd4..0a604bfdd 100644 --- a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SCUFIB_CHAMBER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_2", + "battle_scene": "MAP_BATTLE_SCENE_INDOOR_1", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json index 4aed32594..c201caaf8 100644 --- a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_VIAPOIS_CHAMBER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_2", + "battle_scene": "MAP_BATTLE_SCENE_INDOOR_1", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json index df8a6a08c..e85de29ad 100644 --- a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_WEEPTH_CHAMBER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_2", + "battle_scene": "MAP_BATTLE_SCENE_INDOOR_1", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/SevenIsland_TrainerTower/map.json b/data/maps/SevenIsland_TrainerTower/map.json index d10dab17d..be28ff7b0 100644 --- a/data/maps/SevenIsland_TrainerTower/map.json +++ b/data/maps/SevenIsland_TrainerTower/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_TRAINER_TOWER", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_SEVEN_ISLAND", diff --git a/data/maps/SilphCo_10F/map.json b/data/maps/SilphCo_10F/map.json index 5ccfb6bea..df2883596 100644 --- a/data/maps/SilphCo_10F/map.json +++ b/data/maps/SilphCo_10F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 10, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SilphCo_11F/map.json b/data/maps/SilphCo_11F/map.json index 94de14328..ad4efd4f0 100644 --- a/data/maps/SilphCo_11F/map.json +++ b/data/maps/SilphCo_11F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 11, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SilphCo_1F/map.json b/data/maps/SilphCo_1F/map.json index 000226509..68748ef13 100644 --- a/data/maps/SilphCo_1F/map.json +++ b/data/maps/SilphCo_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 1, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SilphCo_2F/map.json b/data/maps/SilphCo_2F/map.json index 745731e31..249c2faea 100644 --- a/data/maps/SilphCo_2F/map.json +++ b/data/maps/SilphCo_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 2, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SilphCo_3F/map.json b/data/maps/SilphCo_3F/map.json index efd2812ff..9a0439095 100644 --- a/data/maps/SilphCo_3F/map.json +++ b/data/maps/SilphCo_3F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 3, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SilphCo_4F/map.json b/data/maps/SilphCo_4F/map.json index 27ee89266..63bdff97e 100644 --- a/data/maps/SilphCo_4F/map.json +++ b/data/maps/SilphCo_4F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 4, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SilphCo_5F/map.json b/data/maps/SilphCo_5F/map.json index f7bfa7c40..c1890a062 100644 --- a/data/maps/SilphCo_5F/map.json +++ b/data/maps/SilphCo_5F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 5, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SilphCo_6F/map.json b/data/maps/SilphCo_6F/map.json index 02795de6f..5c27ff76a 100644 --- a/data/maps/SilphCo_6F/map.json +++ b/data/maps/SilphCo_6F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 6, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SilphCo_7F/map.json b/data/maps/SilphCo_7F/map.json index 8f568f0c8..ef3630954 100644 --- a/data/maps/SilphCo_7F/map.json +++ b/data/maps/SilphCo_7F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 7, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SilphCo_8F/map.json b/data/maps/SilphCo_8F/map.json index c38706dab..db566d2dd 100644 --- a/data/maps/SilphCo_8F/map.json +++ b/data/maps/SilphCo_8F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 8, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SilphCo_9F/map.json b/data/maps/SilphCo_9F/map.json index b4692e8f6..f8bbd2b69 100644 --- a/data/maps/SilphCo_9F/map.json +++ b/data/maps/SilphCo_9F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 9, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SilphCo_Elevator/map.json b/data/maps/SilphCo_Elevator/map.json index 85e2a425b..446e891f2 100644 --- a/data/maps/SilphCo_Elevator/map.json +++ b/data/maps/SilphCo_Elevator/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/SixIsland/map.json b/data/maps/SixIsland/map.json index 7749f8336..e26f7bf49 100644 --- a/data/maps/SixIsland/map.json +++ b/data/maps/SixIsland/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SIX_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_1", + "map_type": "MAP_TYPE_TOWN", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_SIX_ISLAND_WATER_PATH", diff --git a/data/maps/SixIsland_AlteringCave/map.json b/data/maps/SixIsland_AlteringCave/map.json index 28deb6f2f..124496895 100644 --- a/data/maps/SixIsland_AlteringCave/map.json +++ b/data/maps/SixIsland_AlteringCave/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ALTERING_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/SixIsland_DottedHole_1F/map.json b/data/maps/SixIsland_DottedHole_1F/map.json index fcdf5e6dc..f581ee319 100644 --- a/data/maps/SixIsland_DottedHole_1F/map.json +++ b/data/maps/SixIsland_DottedHole_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_DOTTED_HOLE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/SixIsland_DottedHole_B1F/map.json b/data/maps/SixIsland_DottedHole_B1F/map.json index 59d223c75..5f4ded240 100644 --- a/data/maps/SixIsland_DottedHole_B1F/map.json +++ b/data/maps/SixIsland_DottedHole_B1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_DOTTED_HOLE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/SixIsland_DottedHole_B2F/map.json b/data/maps/SixIsland_DottedHole_B2F/map.json index 8a10c52ab..3106f7d83 100644 --- a/data/maps/SixIsland_DottedHole_B2F/map.json +++ b/data/maps/SixIsland_DottedHole_B2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_DOTTED_HOLE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/SixIsland_DottedHole_B3F/map.json b/data/maps/SixIsland_DottedHole_B3F/map.json index fc9d57a70..300c46114 100644 --- a/data/maps/SixIsland_DottedHole_B3F/map.json +++ b/data/maps/SixIsland_DottedHole_B3F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_DOTTED_HOLE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/SixIsland_DottedHole_B4F/map.json b/data/maps/SixIsland_DottedHole_B4F/map.json index a34ef53c1..95e9c10b4 100644 --- a/data/maps/SixIsland_DottedHole_B4F/map.json +++ b/data/maps/SixIsland_DottedHole_B4F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_DOTTED_HOLE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json index 89f3d458c..19782a330 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_DOTTED_HOLE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SixIsland_GreenPath/map.json b/data/maps/SixIsland_GreenPath/map.json index 420587041..35d4cfb3f 100644 --- a/data/maps/SixIsland_GreenPath/map.json +++ b/data/maps/SixIsland_GreenPath/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_GREEN_PATH", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_SIX_ISLAND_OUTCAST_ISLAND", diff --git a/data/maps/SixIsland_Harbor/map.json b/data/maps/SixIsland_Harbor/map.json index 6b503e36b..feb7ada29 100644 --- a/data/maps/SixIsland_Harbor/map.json +++ b/data/maps/SixIsland_Harbor/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SIX_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SixIsland_House/map.json b/data/maps/SixIsland_House/map.json index c9d6d9b6f..67f1d4f31 100644 --- a/data/maps/SixIsland_House/map.json +++ b/data/maps/SixIsland_House/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SIX_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SixIsland_Mart/map.json b/data/maps/SixIsland_Mart/map.json index d498e595d..b366a1d17 100644 --- a/data/maps/SixIsland_Mart/map.json +++ b/data/maps/SixIsland_Mart/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SIX_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SixIsland_OutcastIsland/map.json b/data/maps/SixIsland_OutcastIsland/map.json index 5b5e29b24..3498c7f3f 100644 --- a/data/maps/SixIsland_OutcastIsland/map.json +++ b/data/maps/SixIsland_OutcastIsland/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_OUTCAST_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_SIX_ISLAND_GREEN_PATH", diff --git a/data/maps/SixIsland_PatternBush/map.json b/data/maps/SixIsland_PatternBush/map.json index 519bdc193..8354730a5 100644 --- a/data/maps/SixIsland_PatternBush/map.json +++ b/data/maps/SixIsland_PatternBush/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_PATTERN_BUSH", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SixIsland_PokemonCenter_1F/map.json b/data/maps/SixIsland_PokemonCenter_1F/map.json index f787e9432..2d14e64af 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/map.json +++ b/data/maps/SixIsland_PokemonCenter_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SIX_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SixIsland_PokemonCenter_2F/map.json b/data/maps/SixIsland_PokemonCenter_2F/map.json index 1e5661335..ce44fdfd2 100644 --- a/data/maps/SixIsland_PokemonCenter_2F/map.json +++ b/data/maps/SixIsland_PokemonCenter_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SIX_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SixIsland_RuinValley/map.json b/data/maps/SixIsland_RuinValley/map.json index 35a1378b6..5020e7380 100644 --- a/data/maps/SixIsland_RuinValley/map.json +++ b/data/maps/SixIsland_RuinValley/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_RUIN_VALLEY", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_SIX_ISLAND_WATER_PATH", diff --git a/data/maps/SixIsland_WaterPath/map.json b/data/maps/SixIsland_WaterPath/map.json index 581749333..befdd7949 100644 --- a/data/maps/SixIsland_WaterPath/map.json +++ b/data/maps/SixIsland_WaterPath/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_WATER_PATH", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_SIX_ISLAND_GREEN_PATH", diff --git a/data/maps/SixIsland_WaterPath_House1/map.json b/data/maps/SixIsland_WaterPath_House1/map.json index 6ba5981d2..c65f54deb 100644 --- a/data/maps/SixIsland_WaterPath_House1/map.json +++ b/data/maps/SixIsland_WaterPath_House1/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_WATER_PATH", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/SixIsland_WaterPath_House2/map.json b/data/maps/SixIsland_WaterPath_House2/map.json index ddff9b49d..e53676524 100644 --- a/data/maps/SixIsland_WaterPath_House2/map.json +++ b/data/maps/SixIsland_WaterPath_House2/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_WATER_PATH", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/ThreeIsland/map.json b/data/maps/ThreeIsland/map.json index ac029a606..f9ed4394b 100644 --- a/data/maps/ThreeIsland/map.json +++ b/data/maps/ThreeIsland/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_1", + "map_type": "MAP_TYPE_TOWN", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_THREE_ISLAND_PORT", diff --git a/data/maps/ThreeIsland_BerryForest/map.json b/data/maps/ThreeIsland_BerryForest/map.json index 6176a650a..ce8a868ef 100644 --- a/data/maps/ThreeIsland_BerryForest/map.json +++ b/data/maps/ThreeIsland_BerryForest/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_BERRY_FOREST", "requires_flash": false, "weather": "WEATHER_SHADE", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/ThreeIsland_BondBridge/map.json b/data/maps/ThreeIsland_BondBridge/map.json index 8b8a3b264..fa674ecd9 100644 --- a/data/maps/ThreeIsland_BondBridge/map.json +++ b/data/maps/ThreeIsland_BondBridge/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_BOND_BRIDGE", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_THREE_ISLAND", diff --git a/data/maps/ThreeIsland_DunsparceTunnel/map.json b/data/maps/ThreeIsland_DunsparceTunnel/map.json index f7688e70e..3570c9e17 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/map.json +++ b/data/maps/ThreeIsland_DunsparceTunnel/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_THREE_ISLE_PATH", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/ThreeIsland_Harbor/map.json b/data/maps/ThreeIsland_Harbor/map.json index f00099f9e..7bd2aa8e5 100644 --- a/data/maps/ThreeIsland_Harbor/map.json +++ b/data/maps/ThreeIsland_Harbor/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_THREE_ISLE_PORT", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/ThreeIsland_House1/map.json b/data/maps/ThreeIsland_House1/map.json index 26f360ef0..7d7384735 100644 --- a/data/maps/ThreeIsland_House1/map.json +++ b/data/maps/ThreeIsland_House1/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/ThreeIsland_House2/map.json b/data/maps/ThreeIsland_House2/map.json index 185d1f8ae..2ba098fd0 100644 --- a/data/maps/ThreeIsland_House2/map.json +++ b/data/maps/ThreeIsland_House2/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/ThreeIsland_House3/map.json b/data/maps/ThreeIsland_House3/map.json index 5268aff53..0de23d4a8 100644 --- a/data/maps/ThreeIsland_House3/map.json +++ b/data/maps/ThreeIsland_House3/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/ThreeIsland_House4/map.json b/data/maps/ThreeIsland_House4/map.json index 2dbe3ffd8..6a45fb357 100644 --- a/data/maps/ThreeIsland_House4/map.json +++ b/data/maps/ThreeIsland_House4/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/ThreeIsland_House5/map.json b/data/maps/ThreeIsland_House5/map.json index 526d71de0..a774260f0 100644 --- a/data/maps/ThreeIsland_House5/map.json +++ b/data/maps/ThreeIsland_House5/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/ThreeIsland_Mart/map.json b/data/maps/ThreeIsland_Mart/map.json index 00cff653c..7a89a37b1 100644 --- a/data/maps/ThreeIsland_Mart/map.json +++ b/data/maps/ThreeIsland_Mart/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/map.json b/data/maps/ThreeIsland_PokemonCenter_1F/map.json index 7808db5e3..070879098 100644 --- a/data/maps/ThreeIsland_PokemonCenter_1F/map.json +++ b/data/maps/ThreeIsland_PokemonCenter_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/ThreeIsland_PokemonCenter_2F/map.json b/data/maps/ThreeIsland_PokemonCenter_2F/map.json index 2bab8005d..4941fe37a 100644 --- a/data/maps/ThreeIsland_PokemonCenter_2F/map.json +++ b/data/maps/ThreeIsland_PokemonCenter_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/ThreeIsland_Port/map.json b/data/maps/ThreeIsland_Port/map.json index 87b83b24d..10469dc61 100644 --- a/data/maps/ThreeIsland_Port/map.json +++ b/data/maps/ThreeIsland_Port/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_THREE_ISLE_PORT", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_THREE_ISLAND", diff --git a/data/maps/TradeCenter/map.json b/data/maps/TradeCenter/map.json index 65d27cd22..f4c54c987 100644 --- a/data/maps/TradeCenter/map.json +++ b/data/maps/TradeCenter/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SPECIAL_AREA", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/TrainerTower_1F/map.json b/data/maps/TrainerTower_1F/map.json index 05e050043..20d83f19f 100644 --- a/data/maps/TrainerTower_1F/map.json +++ b/data/maps/TrainerTower_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/TrainerTower_2F/map.json b/data/maps/TrainerTower_2F/map.json index f845b3eb7..9d60b2650 100644 --- a/data/maps/TrainerTower_2F/map.json +++ b/data/maps/TrainerTower_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/TrainerTower_3F/map.json b/data/maps/TrainerTower_3F/map.json index 1cced00ea..a53c516b8 100644 --- a/data/maps/TrainerTower_3F/map.json +++ b/data/maps/TrainerTower_3F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/TrainerTower_4F/map.json b/data/maps/TrainerTower_4F/map.json index a1b103c38..04378d0a4 100644 --- a/data/maps/TrainerTower_4F/map.json +++ b/data/maps/TrainerTower_4F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/TrainerTower_5F/map.json b/data/maps/TrainerTower_5F/map.json index 1def8933f..569eaf978 100644 --- a/data/maps/TrainerTower_5F/map.json +++ b/data/maps/TrainerTower_5F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/TrainerTower_6F/map.json b/data/maps/TrainerTower_6F/map.json index cb8924b0e..128bb457a 100644 --- a/data/maps/TrainerTower_6F/map.json +++ b/data/maps/TrainerTower_6F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/TrainerTower_7F/map.json b/data/maps/TrainerTower_7F/map.json index 3ad071b09..62e1bbe84 100644 --- a/data/maps/TrainerTower_7F/map.json +++ b/data/maps/TrainerTower_7F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/TrainerTower_8F/map.json b/data/maps/TrainerTower_8F/map.json index e65b193a4..125751b98 100644 --- a/data/maps/TrainerTower_8F/map.json +++ b/data/maps/TrainerTower_8F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/TrainerTower_Elevator/map.json b/data/maps/TrainerTower_Elevator/map.json index 9e9b8d732..ce626e2cf 100644 --- a/data/maps/TrainerTower_Elevator/map.json +++ b/data/maps/TrainerTower_Elevator/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/TrainerTower_Lobby/map.json b/data/maps/TrainerTower_Lobby/map.json index d00dcf2eb..da2cdb07f 100644 --- a/data/maps/TrainerTower_Lobby/map.json +++ b/data/maps/TrainerTower_Lobby/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/TrainerTower_Roof/map.json b/data/maps/TrainerTower_Roof/map.json index 207b70b2d..985f2f186 100644 --- a/data/maps/TrainerTower_Roof/map.json +++ b/data/maps/TrainerTower_Roof/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/TwoIsland/map.json b/data/maps/TwoIsland/map.json index 48381765e..20dd0f53e 100644 --- a/data/maps/TwoIsland/map.json +++ b/data/maps/TwoIsland/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_TWO_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_1", + "map_type": "MAP_TYPE_TOWN", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_TWO_ISLAND_CAPE_BRINK", diff --git a/data/maps/TwoIsland_CapeBrink/map.json b/data/maps/TwoIsland_CapeBrink/map.json index 3b569844d..34a6766de 100644 --- a/data/maps/TwoIsland_CapeBrink/map.json +++ b/data/maps/TwoIsland_CapeBrink/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CAPE_BRINK", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_TWO_ISLAND", diff --git a/data/maps/TwoIsland_CapeBrink_House/map.json b/data/maps/TwoIsland_CapeBrink_House/map.json index 42dc8e157..5de5be5fa 100644 --- a/data/maps/TwoIsland_CapeBrink_House/map.json +++ b/data/maps/TwoIsland_CapeBrink_House/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_CAPE_BRINK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/TwoIsland_Harbor/map.json b/data/maps/TwoIsland_Harbor/map.json index 38c9d8d64..694c644f3 100644 --- a/data/maps/TwoIsland_Harbor/map.json +++ b/data/maps/TwoIsland_Harbor/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_TWO_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/TwoIsland_House/map.json b/data/maps/TwoIsland_House/map.json index 978b1e9dd..da5033107 100644 --- a/data/maps/TwoIsland_House/map.json +++ b/data/maps/TwoIsland_House/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_TWO_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/TwoIsland_JoyfulGameCorner/map.json b/data/maps/TwoIsland_JoyfulGameCorner/map.json index 25454f56a..f8c3e8446 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/map.json +++ b/data/maps/TwoIsland_JoyfulGameCorner/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_TWO_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/TwoIsland_PokemonCenter_1F/map.json b/data/maps/TwoIsland_PokemonCenter_1F/map.json index 88c5f0b28..96da34e0b 100644 --- a/data/maps/TwoIsland_PokemonCenter_1F/map.json +++ b/data/maps/TwoIsland_PokemonCenter_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_TWO_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/TwoIsland_PokemonCenter_2F/map.json b/data/maps/TwoIsland_PokemonCenter_2F/map.json index bb8e12fbc..726bcfe11 100644 --- a/data/maps/TwoIsland_PokemonCenter_2F/map.json +++ b/data/maps/TwoIsland_PokemonCenter_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_TWO_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/UndergroundPath_EastEntrance/map.json b/data/maps/UndergroundPath_EastEntrance/map.json index 87ef73ace..eee3d31bf 100644 --- a/data/maps/UndergroundPath_EastEntrance/map.json +++ b/data/maps/UndergroundPath_EastEntrance/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_UNDERGROUND_PATH_2", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/UndergroundPath_EastWestTunnel/map.json b/data/maps/UndergroundPath_EastWestTunnel/map.json index a994ce48d..7f53b384e 100644 --- a/data/maps/UndergroundPath_EastWestTunnel/map.json +++ b/data/maps/UndergroundPath_EastWestTunnel/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_UNDERGROUND_PATH_2", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/UndergroundPath_NorthEntrance/map.json b/data/maps/UndergroundPath_NorthEntrance/map.json index e87fb79bf..6052b6192 100644 --- a/data/maps/UndergroundPath_NorthEntrance/map.json +++ b/data/maps/UndergroundPath_NorthEntrance/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_UNDERGROUND_PATH", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/UndergroundPath_NorthSouthTunnel/map.json b/data/maps/UndergroundPath_NorthSouthTunnel/map.json index 6299fa510..35b7477b5 100644 --- a/data/maps/UndergroundPath_NorthSouthTunnel/map.json +++ b/data/maps/UndergroundPath_NorthSouthTunnel/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_UNDERGROUND_PATH", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [ diff --git a/data/maps/UndergroundPath_SouthEntrance/map.json b/data/maps/UndergroundPath_SouthEntrance/map.json index ae41077ef..ec8a01a32 100644 --- a/data/maps/UndergroundPath_SouthEntrance/map.json +++ b/data/maps/UndergroundPath_SouthEntrance/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_UNDERGROUND_PATH", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/UndergroundPath_WestEntrance/map.json b/data/maps/UndergroundPath_WestEntrance/map.json index 419281f0c..6fae45cf2 100644 --- a/data/maps/UndergroundPath_WestEntrance/map.json +++ b/data/maps/UndergroundPath_WestEntrance/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_UNDERGROUND_PATH_2", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/UnionRoom/map.json b/data/maps/UnionRoom/map.json index 2ceb57c4b..f46654c7b 100644 --- a/data/maps/UnionRoom/map.json +++ b/data/maps/UnionRoom/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SPECIAL_AREA", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_8", + "battle_scene": "MAP_BATTLE_SCENE_LINK", "connections": null, "object_events": [ { diff --git a/data/maps/UnknownMap_18_01/map.json b/data/maps/UnknownMap_18_01/map.json index bf2b727ce..a00f28f90 100644 --- a/data/maps/UnknownMap_18_01/map.json +++ b/data/maps/UnknownMap_18_01/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_6", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [], diff --git a/data/maps/UnusedHouse_27_00/map.json b/data/maps/UnusedHouse_27_00/map.json index e7eb73138..6d93604e4 100644 --- a/data/maps/UnusedHouse_27_00/map.json +++ b/data/maps/UnusedHouse_27_00/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_19", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [], diff --git a/data/maps/UnusedHouse_29_00/map.json b/data/maps/UnusedHouse_29_00/map.json index 9d08c5548..50dfe3d62 100644 --- a/data/maps/UnusedHouse_29_00/map.json +++ b/data/maps/UnusedHouse_29_00/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_23", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [], diff --git a/data/maps/UnusedHouse_31_05/map.json b/data/maps/UnusedHouse_31_05/map.json index 71e855268..21ec7325d 100644 --- a/data/maps/UnusedHouse_31_05/map.json +++ b/data/maps/UnusedHouse_31_05/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [], "warp_events": [], diff --git a/data/maps/VermilionCity/map.json b/data/maps/VermilionCity/map.json index b8b323176..faf8f70f5 100644 --- a/data/maps/VermilionCity/map.json +++ b/data/maps/VermilionCity/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_1", + "map_type": "MAP_TYPE_TOWN", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_ROUTE6", diff --git a/data/maps/VermilionCity_Gym/map.json b/data/maps/VermilionCity_Gym/map.json index f5d6d8f34..4b0325bc1 100644 --- a/data/maps/VermilionCity_Gym/map.json +++ b/data/maps/VermilionCity_Gym/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_1", + "battle_scene": "MAP_BATTLE_SCENE_GYM", "connections": null, "object_events": [ { diff --git a/data/maps/VermilionCity_House1/map.json b/data/maps/VermilionCity_House1/map.json index d5e1e69c8..6ec3be3f9 100644 --- a/data/maps/VermilionCity_House1/map.json +++ b/data/maps/VermilionCity_House1/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/VermilionCity_House2/map.json b/data/maps/VermilionCity_House2/map.json index 0011bdbb0..c22ef4744 100644 --- a/data/maps/VermilionCity_House2/map.json +++ b/data/maps/VermilionCity_House2/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/VermilionCity_House3/map.json b/data/maps/VermilionCity_House3/map.json index b71efa6ef..fdbb6bd3e 100644 --- a/data/maps/VermilionCity_House3/map.json +++ b/data/maps/VermilionCity_House3/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/VermilionCity_Mart/map.json b/data/maps/VermilionCity_Mart/map.json index 48a60d494..dfff61410 100644 --- a/data/maps/VermilionCity_Mart/map.json +++ b/data/maps/VermilionCity_Mart/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/VermilionCity_PokemonCenter_1F/map.json b/data/maps/VermilionCity_PokemonCenter_1F/map.json index 3f503dbe3..595761c4f 100644 --- a/data/maps/VermilionCity_PokemonCenter_1F/map.json +++ b/data/maps/VermilionCity_PokemonCenter_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/VermilionCity_PokemonCenter_2F/map.json b/data/maps/VermilionCity_PokemonCenter_2F/map.json index bfc1daf2c..00e7ce529 100644 --- a/data/maps/VermilionCity_PokemonCenter_2F/map.json +++ b/data/maps/VermilionCity_PokemonCenter_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/VermilionCity_PokemonFanClub/map.json b/data/maps/VermilionCity_PokemonFanClub/map.json index 2859f4135..521e0c99f 100644 --- a/data/maps/VermilionCity_PokemonFanClub/map.json +++ b/data/maps/VermilionCity_PokemonFanClub/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json index 3c41fe580..21d57ae5e 100644 --- a/data/maps/VictoryRoad_1F/map.json +++ b/data/maps/VictoryRoad_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_KANTO_VICTORY_ROAD", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/VictoryRoad_2F/map.json b/data/maps/VictoryRoad_2F/map.json index 2731bc8f4..764f448aa 100644 --- a/data/maps/VictoryRoad_2F/map.json +++ b/data/maps/VictoryRoad_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_KANTO_VICTORY_ROAD", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/VictoryRoad_3F/map.json b/data/maps/VictoryRoad_3F/map.json index 906797fc5..a5985e5fc 100644 --- a/data/maps/VictoryRoad_3F/map.json +++ b/data/maps/VictoryRoad_3F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_KANTO_VICTORY_ROAD", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", + "map_type": "MAP_TYPE_UNDERGROUND", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/ViridianCity/map.json b/data/maps/ViridianCity/map.json index d747d1e95..d9895c6b0 100644 --- a/data/maps/ViridianCity/map.json +++ b/data/maps/ViridianCity/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_VIRIDIAN_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_1", + "map_type": "MAP_TYPE_TOWN", "allow_cycling": true, "allow_escaping": false, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_ROUTE2", diff --git a/data/maps/ViridianCity_Gym/map.json b/data/maps/ViridianCity_Gym/map.json index 95c15e143..f1188d2c0 100644 --- a/data/maps/ViridianCity_Gym/map.json +++ b/data/maps/ViridianCity_Gym/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_VIRIDIAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_1", + "battle_scene": "MAP_BATTLE_SCENE_GYM", "connections": null, "object_events": [ { diff --git a/data/maps/ViridianCity_House1/map.json b/data/maps/ViridianCity_House1/map.json index c73f46675..29f185b71 100644 --- a/data/maps/ViridianCity_House1/map.json +++ b/data/maps/ViridianCity_House1/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_VIRIDIAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/ViridianCity_House2/map.json b/data/maps/ViridianCity_House2/map.json index fbce33a88..b5e65bbad 100644 --- a/data/maps/ViridianCity_House2/map.json +++ b/data/maps/ViridianCity_House2/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_VIRIDIAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/ViridianCity_Mart/map.json b/data/maps/ViridianCity_Mart/map.json index e8cafbabc..7b3de99b6 100644 --- a/data/maps/ViridianCity_Mart/map.json +++ b/data/maps/ViridianCity_Mart/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_VIRIDIAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/ViridianCity_PokemonCenter_1F/map.json b/data/maps/ViridianCity_PokemonCenter_1F/map.json index 62956275e..780087d1b 100644 --- a/data/maps/ViridianCity_PokemonCenter_1F/map.json +++ b/data/maps/ViridianCity_PokemonCenter_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_VIRIDIAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/ViridianCity_PokemonCenter_2F/map.json b/data/maps/ViridianCity_PokemonCenter_2F/map.json index 6bef278a3..967493db5 100644 --- a/data/maps/ViridianCity_PokemonCenter_2F/map.json +++ b/data/maps/ViridianCity_PokemonCenter_2F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_VIRIDIAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/data/maps/ViridianForest/map.json b/data/maps/ViridianForest/map.json index ed5441d89..8a92127ae 100644 --- a/data/maps/ViridianForest/map.json +++ b/data/maps/ViridianForest/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_VIRIDIAN_FOREST", "requires_flash": false, "weather": "WEATHER_SHADE", - "map_type": "MAP_TYPE_3", + "map_type": "MAP_TYPE_ROUTE", "allow_cycling": true, "allow_escaping": true, "allow_running": true, "show_map_name": true, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { diff --git a/include/constants/map_types.h b/include/constants/map_types.h deleted file mode 100644 index 96ea73702..000000000 --- a/include/constants/map_types.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef GUARD_CONSTANTS_MAP_TYPES_H -#define GUARD_CONSTANTS_MAP_TYPES_H - -#define MAP_TYPE_0 0 -#define MAP_TYPE_TOWN 1 -#define MAP_TYPE_CITY 2 -#define MAP_TYPE_ROUTE 3 -#define MAP_TYPE_UNDERGROUND 4 -#define MAP_TYPE_UNDERWATER 5 -#define MAP_TYPE_OCEAN_ROUTE 6 -#define MAP_TYPE_7 7 -#define MAP_TYPE_INDOOR 8 -#define MAP_TYPE_SECRET_BASE 9 - -#endif // GUARD_CONSTANTS_MAP_TYPES_H diff --git a/include/constants/maps.h b/include/constants/maps.h index db8ee451c..b1d7588f1 100644 --- a/include/constants/maps.h +++ b/include/constants/maps.h @@ -11,33 +11,25 @@ #define MAP(map) MAP_GROUP(map), MAP_NUM(map) -// temporary map constants -#define BATTLE_SCENE_0 0 -#define BATTLE_SCENE_1 1 -#define BATTLE_SCENE_2 2 -#define BATTLE_SCENE_3 3 -#define BATTLE_SCENE_4 4 -#define BATTLE_SCENE_5 5 -#define BATTLE_SCENE_6 6 -#define BATTLE_SCENE_7 7 -#define BATTLE_SCENE_8 8 -#define BATTLE_SCENE_9 9 -#define BATTLE_SCENE_10 10 -#define BATTLE_SCENE_11 11 -#define BATTLE_SCENE_12 12 -#define BATTLE_SCENE_13 13 -#define BATTLE_SCENE_14 14 -#define BATTLE_SCENE_15 15 +#define MAP_BATTLE_SCENE_NORMAL 0 +#define MAP_BATTLE_SCENE_GYM 1 +#define MAP_BATTLE_SCENE_INDOOR_1 2 // Pokemon Tower, Tanoby ruins +#define MAP_BATTLE_SCENE_INDOOR_2 3 // Pokemon Mansion, Power Plant, Rocket Hideout/Warehouse +#define MAP_BATTLE_SCENE_LORELEI 4 +#define MAP_BATTLE_SCENE_BRUNO 5 +#define MAP_BATTLE_SCENE_AGATHA 6 +#define MAP_BATTLE_SCENE_LANCE 7 +#define MAP_BATTLE_SCENE_LINK 8 -#define MAP_TYPE_0 0 -#define MAP_TYPE_1 1 -#define MAP_TYPE_2 2 -#define MAP_TYPE_3 3 -#define MAP_TYPE_4 4 -#define MAP_TYPE_5 5 -#define MAP_TYPE_6 6 -#define MAP_TYPE_7 7 -#define MAP_TYPE_8 8 -#define MAP_TYPE_9 9 +#define MAP_TYPE_NONE 0 +#define MAP_TYPE_TOWN 1 +#define MAP_TYPE_CITY 2 // Unused. RSE use this map type to distinguish Town and City. FRLG make no distinction +#define MAP_TYPE_ROUTE 3 +#define MAP_TYPE_UNDERGROUND 4 +#define MAP_TYPE_UNDERWATER 5 // Unused +#define MAP_TYPE_OCEAN_ROUTE 6 // Unused +#define MAP_TYPE_UNKNOWN 7 // Unused +#define MAP_TYPE_INDOOR 8 +#define MAP_TYPE_SECRET_BASE 9 // Unused #endif // GUARD_CONSTANTS_MAPS_H diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 527e32bcc..4875a63f2 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -48,7 +48,7 @@ #include "constants/abilities.h" #include "constants/pokemon.h" #include "constants/trainers.h" -#include "constants/map_types.h" +#include "constants/maps.h" #define DEFENDER_IS_PROTECTED ((gProtectStructs[gBattlerTarget].protected) && (gBattleMoves[gCurrentMove].flags & FLAG_PROTECT_AFFECTED)) diff --git a/src/battle_setup.c b/src/battle_setup.c index ae6aaf8be..73e7acc1a 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -37,7 +37,7 @@ #include "constants/pokemon.h" #include "constants/trainers.h" #include "constants/trainer_classes.h" -#include "constants/map_types.h" +#include "constants/maps.h" enum { diff --git a/src/fldeff_rocksmash.c b/src/fldeff_rocksmash.c index 2cca37f7a..00f17a16d 100644 --- a/src/fldeff_rocksmash.c +++ b/src/fldeff_rocksmash.c @@ -16,7 +16,7 @@ #include "event_object_movement.h" #include "constants/songs.h" #include "constants/object_events.h" -#include "constants/map_types.h" +#include "constants/maps.h" static void task08_080C9820(u8 taskId); static void sub_80C98FC(u8 taskId); diff --git a/src/item_use.c b/src/item_use.c index 57771754a..022be5b2b 100644 --- a/src/item_use.c +++ b/src/item_use.c @@ -42,7 +42,7 @@ #include "constants/maps.h" #include "constants/moves.h" #include "constants/songs.h" -#include "constants/map_types.h" +#include "constants/maps.h" static EWRAM_DATA void (*sItemUseOnFieldCB)(u8 taskId) = NULL; |