diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-02-19 08:47:50 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-02-19 08:47:50 -0500 |
| commit | 9d44bc0bda9294c4d4cb3744efe9c2d96278c3bd (patch) | |
| tree | 6ac0ef8acbace05710da0052b4decaf4146d5d3f /data/maps | |
| parent | 9397d6d23ad460f7019d4a12da035f53a450d237 (diff) | |
| parent | 71fec599bbe144af8d4a16e98ec32454fd10a4a8 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered into pokemon_jump
Diffstat (limited to 'data/maps')
468 files changed, 3890 insertions, 3040 deletions
diff --git a/data/maps/BattleColosseum_2P/map.json b/data/maps/BattleColosseum_2P/map.json index bd1e8ca3e..d9d80e7e9 100644 --- a/data/maps/BattleColosseum_2P/map.json +++ b/data/maps/BattleColosseum_2P/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_SPECIAL_AREA", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_8", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, + "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 53bdf260b..c36a5beca 100644 --- a/data/maps/BattleColosseum_4P/map.json +++ b/data/maps/BattleColosseum_4P/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_SPECIAL_AREA", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_8", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, + "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 79a032876..5f8c86d9c 100644 --- a/data/maps/BirthIsland_Exterior/map.json +++ b/data/maps/BirthIsland_Exterior/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_BIRTH_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_3", - "unknown_18": 0, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_ROUTE", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 bab2d1b5e..dfc063ad9 100644 --- a/data/maps/BirthIsland_Harbor/map.json +++ b/data/maps/BirthIsland_Harbor/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_BIRTH_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 706d9fa35..7753d987f 100644 --- a/data/maps/CeladonCity/map.json +++ b/data/maps/CeladonCity/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_1", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_TOWN", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 bcb4f815c..264fd2aa6 100644 --- a/data/maps/CeladonCity_Condominiums_1F/map.json +++ b/data/maps/CeladonCity_Condominiums_1F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 10e5eb1c6..f2d2e8de6 100644 --- a/data/maps/CeladonCity_Condominiums_2F/map.json +++ b/data/maps/CeladonCity_Condominiums_2F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 4a1fb023c..89d78d255 100644 --- a/data/maps/CeladonCity_Condominiums_3F/map.json +++ b/data/maps/CeladonCity_Condominiums_3F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 c929b62fc..428acdf99 100644 --- a/data/maps/CeladonCity_Condominiums_Roof/map.json +++ b/data/maps/CeladonCity_Condominiums_Roof/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 d229e7fdd..4b7c69e3a 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 d4e20b168..beb73045e 100644 --- a/data/maps/CeladonCity_DepartmentStore_1F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_1F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 4, - "elevator_flag": 1, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": true, + "floor_number": 1, + "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 e4e6f2f29..31cf48f57 100644 --- a/data/maps/CeladonCity_DepartmentStore_2F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_2F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 4, - "elevator_flag": 2, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": true, + "floor_number": 2, + "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 37132845e..4948847ef 100644 --- a/data/maps/CeladonCity_DepartmentStore_3F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_3F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 4, - "elevator_flag": 3, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": true, + "floor_number": 3, + "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 d1130b058..298d207c2 100644 --- a/data/maps/CeladonCity_DepartmentStore_4F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_4F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 4, - "elevator_flag": 4, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": true, + "floor_number": 4, + "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 b90f5f8e9..b2b31ef7f 100644 --- a/data/maps/CeladonCity_DepartmentStore_5F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_5F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 4, - "elevator_flag": 5, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": true, + "floor_number": 5, + "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 5fe6f9885..2a1af1699 100644 --- a/data/maps/CeladonCity_DepartmentStore_Elevator/map.json +++ b/data/maps/CeladonCity_DepartmentStore_Elevator/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 17077ebbd..861954bd3 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/map.json +++ b/data/maps/CeladonCity_DepartmentStore_Roof/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 4, - "elevator_flag": 127, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": true, + "floor_number": 127, + "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 79ba87c7f..1733a8f35 100644 --- a/data/maps/CeladonCity_GameCorner/map.json +++ b/data/maps/CeladonCity_GameCorner/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 99a1a54d4..9dcaf101a 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 f0a86b8e5..ac88b5869 100644 --- a/data/maps/CeladonCity_Gym/map.json +++ b/data/maps/CeladonCity_Gym/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_1", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, + "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 80b4df1cd..964db9cab 100644 --- a/data/maps/CeladonCity_Hotel/map.json +++ b/data/maps/CeladonCity_Hotel/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 0fccecd67..37231d091 100644 --- a/data/maps/CeladonCity_House1/map.json +++ b/data/maps/CeladonCity_House1/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 c37be2dc6..58df64cf8 100644 --- a/data/maps/CeladonCity_PokemonCenter_1F/map.json +++ b/data/maps/CeladonCity_PokemonCenter_1F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 7a4c45752..88dab9bec 100644 --- a/data/maps/CeladonCity_PokemonCenter_2F/map.json +++ b/data/maps/CeladonCity_PokemonCenter_2F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 dafc84778..b84bbabd6 100644 --- a/data/maps/CeladonCity_Restaurant/map.json +++ b/data/maps/CeladonCity_Restaurant/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 eb95b5c79..beadaeab9 100644 --- a/data/maps/CeruleanCave_1F/map.json +++ b/data/maps/CeruleanCave_1F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_CERULEAN_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 2ce780fdd..1390abd3d 100644 --- a/data/maps/CeruleanCave_2F/map.json +++ b/data/maps/CeruleanCave_2F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_CERULEAN_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 0df4d1d5f..7dccb782c 100644 --- a/data/maps/CeruleanCave_B1F/map.json +++ b/data/maps/CeruleanCave_B1F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_CERULEAN_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 ca6baa21d..087f39320 100644 --- a/data/maps/CeruleanCity/map.json +++ b/data/maps/CeruleanCity/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_1", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_TOWN", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 8f9d6b910..4bf7375b8 100644 --- a/data/maps/CeruleanCity_BikeShop/map.json +++ b/data/maps/CeruleanCity_BikeShop/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 c0ab52b0b..afe882548 100644 --- a/data/maps/CeruleanCity_Gym/map.json +++ b/data/maps/CeruleanCity_Gym/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_1", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, + "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 55ba65768..0b1d03a40 100644 --- a/data/maps/CeruleanCity_House1/map.json +++ b/data/maps/CeruleanCity_House1/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 221a6f398..69d20876a 100644 --- a/data/maps/CeruleanCity_House2/map.json +++ b/data/maps/CeruleanCity_House2/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 084221bb7..33095af54 100644 --- a/data/maps/CeruleanCity_House3/map.json +++ b/data/maps/CeruleanCity_House3/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 97740781c..9c5a61b63 100644 --- a/data/maps/CeruleanCity_House4/map.json +++ b/data/maps/CeruleanCity_House4/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 d637a7345..eae14c1e4 100644 --- a/data/maps/CeruleanCity_House5/map.json +++ b/data/maps/CeruleanCity_House5/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 61c6c717f..e247e3cd4 100644 --- a/data/maps/CeruleanCity_Mart/map.json +++ b/data/maps/CeruleanCity_Mart/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 d98a66f1d..dac0de4b5 100644 --- a/data/maps/CeruleanCity_PokemonCenter_1F/map.json +++ b/data/maps/CeruleanCity_PokemonCenter_1F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 1ba1ae547..7eb69e6a4 100644 --- a/data/maps/CeruleanCity_PokemonCenter_2F/map.json +++ b/data/maps/CeruleanCity_PokemonCenter_2F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 823a4ce95..0c8fe0ac6 100644 --- a/data/maps/CinnabarIsland/map.json +++ b/data/maps/CinnabarIsland/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_1", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_TOWN", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 05ba07431..1afa900b9 100644 --- a/data/maps/CinnabarIsland_Gym/map.json +++ b/data/maps/CinnabarIsland_Gym/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_1", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, + "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 7970cf732..a02302367 100644 --- a/data/maps/CinnabarIsland_Mart/map.json +++ b/data/maps/CinnabarIsland_Mart/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 5cc12ab94..06ecc5419 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/map.json +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 8ba56684a..c4bcde4e4 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json +++ b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 20aa48378..4f446c65e 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 2189361a9..cefc5bcc4 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 5761ffe0c..68d681613 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 1464d0db7..54015fcc3 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 0b5479841..13cdfac0a 100644 --- a/data/maps/DiglettsCave_B1F/map.json +++ b/data/maps/DiglettsCave_B1F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_DIGLETTS_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 fa87e6f8a..4427d4d17 100644 --- a/data/maps/DiglettsCave_NorthEntrance/map.json +++ b/data/maps/DiglettsCave_NorthEntrance/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_DIGLETTS_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 64f78c4bc..591a998e3 100644 --- a/data/maps/DiglettsCave_SouthEntrance/map.json +++ b/data/maps/DiglettsCave_SouthEntrance/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_DIGLETTS_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 04fec1512..46eb15806 100644 --- a/data/maps/FiveIsland/map.json +++ b/data/maps/FiveIsland/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_FIVE_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_1", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_TOWN", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 0e528b645..bfbcfd8f6 100644 --- a/data/maps/FiveIsland_Harbor/map.json +++ b/data/maps/FiveIsland_Harbor/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_FIVE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 d458cf042..8e8e974ba 100644 --- a/data/maps/FiveIsland_House1/map.json +++ b/data/maps/FiveIsland_House1/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_FIVE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 4b12a73c5..a97c387d8 100644 --- a/data/maps/FiveIsland_House2/map.json +++ b/data/maps/FiveIsland_House2/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_FIVE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 4d044b6de..b257237bd 100644 --- a/data/maps/FiveIsland_LostCave_Entrance/map.json +++ b/data/maps/FiveIsland_LostCave_Entrance/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 22da4145b..fa79e4245 100644 --- a/data/maps/FiveIsland_LostCave_Room1/map.json +++ b/data/maps/FiveIsland_LostCave_Room1/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 2cf3514e1..f1c963b0e 100644 --- a/data/maps/FiveIsland_LostCave_Room10/map.json +++ b/data/maps/FiveIsland_LostCave_Room10/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 c06c279eb..50ecf922f 100644 --- a/data/maps/FiveIsland_LostCave_Room11/map.json +++ b/data/maps/FiveIsland_LostCave_Room11/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 0131d8a66..5a8fef3d2 100644 --- a/data/maps/FiveIsland_LostCave_Room12/map.json +++ b/data/maps/FiveIsland_LostCave_Room12/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 02f11435c..fc2dd61bf 100644 --- a/data/maps/FiveIsland_LostCave_Room13/map.json +++ b/data/maps/FiveIsland_LostCave_Room13/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 bc0d6f5cd..84cddd2ea 100644 --- a/data/maps/FiveIsland_LostCave_Room14/map.json +++ b/data/maps/FiveIsland_LostCave_Room14/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 25a7996e6..eaeabf81b 100644 --- a/data/maps/FiveIsland_LostCave_Room2/map.json +++ b/data/maps/FiveIsland_LostCave_Room2/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 885c75d45..bcd56fec5 100644 --- a/data/maps/FiveIsland_LostCave_Room3/map.json +++ b/data/maps/FiveIsland_LostCave_Room3/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 ac63bc97c..2035f850e 100644 --- a/data/maps/FiveIsland_LostCave_Room4/map.json +++ b/data/maps/FiveIsland_LostCave_Room4/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 ee295239d..94a33e0be 100644 --- a/data/maps/FiveIsland_LostCave_Room5/map.json +++ b/data/maps/FiveIsland_LostCave_Room5/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 cd6663ce8..1941530d6 100644 --- a/data/maps/FiveIsland_LostCave_Room6/map.json +++ b/data/maps/FiveIsland_LostCave_Room6/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 144f2099b..459c54736 100644 --- a/data/maps/FiveIsland_LostCave_Room7/map.json +++ b/data/maps/FiveIsland_LostCave_Room7/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 270a99c8f..d0c0c0d87 100644 --- a/data/maps/FiveIsland_LostCave_Room8/map.json +++ b/data/maps/FiveIsland_LostCave_Room8/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 ee2945b8d..1669d671e 100644 --- a/data/maps/FiveIsland_LostCave_Room9/map.json +++ b/data/maps/FiveIsland_LostCave_Room9/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 4c7e900d3..ea727f86d 100644 --- a/data/maps/FiveIsland_Meadow/map.json +++ b/data/maps/FiveIsland_Meadow/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_FIVE_ISLE_MEADOW", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_ROUTE", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 7390a3997..68694d602 100644 --- a/data/maps/FiveIsland_MemorialPillar/map.json +++ b/data/maps/FiveIsland_MemorialPillar/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_MEMORIAL_PILLAR", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_ROUTE", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 9e48279b1..31986b11c 100644 --- a/data/maps/FiveIsland_PokemonCenter_1F/map.json +++ b/data/maps/FiveIsland_PokemonCenter_1F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_FIVE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 804ba796f..975a71c51 100644 --- a/data/maps/FiveIsland_PokemonCenter_2F/map.json +++ b/data/maps/FiveIsland_PokemonCenter_2F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_FIVE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 41929c967..868b8cda7 100644 --- a/data/maps/FiveIsland_ResortGorgeous/map.json +++ b/data/maps/FiveIsland_ResortGorgeous/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_RESORT_GORGEOUS", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_ROUTE", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 473b522b8..4ab961ce8 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/map.json +++ b/data/maps/FiveIsland_ResortGorgeous_House/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_RESORT_GORGEOUS", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 58ca4c535..96ff51d8c 100644 --- a/data/maps/FiveIsland_RocketWarehouse/map.json +++ b/data/maps/FiveIsland_RocketWarehouse/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROCKET_WAREHOUSE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 5, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_3", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": true, + "allow_running": false, + "show_map_name": true, + "floor_number": 0, + "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 899a7e92e..78bfa06b4 100644 --- a/data/maps/FiveIsland_WaterLabyrinth/map.json +++ b/data/maps/FiveIsland_WaterLabyrinth/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_WATER_LABYRINTH", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_ROUTE", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 0a8842419..9a31449a1 100644 --- a/data/maps/FourIsland/map.json +++ b/data/maps/FourIsland/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_1", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_TOWN", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 b0188aedd..0c7760b98 100644 --- a/data/maps/FourIsland_Harbor/map.json +++ b/data/maps/FourIsland_Harbor/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 902c65f23..55889c185 100644 --- a/data/maps/FourIsland_House1/map.json +++ b/data/maps/FourIsland_House1/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 330c8ea8a..b9ec87bc0 100644 --- a/data/maps/FourIsland_House2/map.json +++ b/data/maps/FourIsland_House2/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 5928013dc..7ecb022f9 100644 --- a/data/maps/FourIsland_IcefallCave_1F/map.json +++ b/data/maps/FourIsland_IcefallCave_1F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ICEFALL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 dd1d81a2d..c07a00e61 100644 --- a/data/maps/FourIsland_IcefallCave_B1F/map.json +++ b/data/maps/FourIsland_IcefallCave_B1F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ICEFALL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 32ca627ba..f542cbfd9 100644 --- a/data/maps/FourIsland_IcefallCave_Back/map.json +++ b/data/maps/FourIsland_IcefallCave_Back/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ICEFALL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 3315c36b5..0dfe89452 100644 --- a/data/maps/FourIsland_IcefallCave_Entrance/map.json +++ b/data/maps/FourIsland_IcefallCave_Entrance/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ICEFALL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 eb022af3b..0b447056c 100644 --- a/data/maps/FourIsland_LoreleisHouse/map.json +++ b/data/maps/FourIsland_LoreleisHouse/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 c5e589e61..901bcf22d 100644 --- a/data/maps/FourIsland_Mart/map.json +++ b/data/maps/FourIsland_Mart/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 b3427d8b1..f5a0751ae 100644 --- a/data/maps/FourIsland_PokemonCenter_1F/map.json +++ b/data/maps/FourIsland_PokemonCenter_1F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 2e201dafc..9818ab609 100644 --- a/data/maps/FourIsland_PokemonCenter_2F/map.json +++ b/data/maps/FourIsland_PokemonCenter_2F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 38520cc63..3d380f53c 100644 --- a/data/maps/FourIsland_PokemonDayCare/map.json +++ b/data/maps/FourIsland_PokemonDayCare/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 710940882..5aeab97b9 100644 --- a/data/maps/FuchsiaCity/map.json +++ b/data/maps/FuchsiaCity/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_1", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_TOWN", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 9054b5df0..c07403503 100644 --- a/data/maps/FuchsiaCity_Gym/map.json +++ b/data/maps/FuchsiaCity_Gym/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_1", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, + "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 dea412ed2..a45861216 100644 --- a/data/maps/FuchsiaCity_House1/map.json +++ b/data/maps/FuchsiaCity_House1/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 ff4c45b1c..b90a8e3cc 100644 --- a/data/maps/FuchsiaCity_House2/map.json +++ b/data/maps/FuchsiaCity_House2/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 688224b15..8454ca7de 100644 --- a/data/maps/FuchsiaCity_House3/map.json +++ b/data/maps/FuchsiaCity_House3/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 43a38c753..6b8a28db2 100644 --- a/data/maps/FuchsiaCity_Mart/map.json +++ b/data/maps/FuchsiaCity_Mart/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 9cc66692f..7df358659 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_1F/map.json +++ b/data/maps/FuchsiaCity_PokemonCenter_1F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 b1ba15c2f..c2a20fb9e 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json +++ b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 04d51dae8..d10098769 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/map.json +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 be1abfced..fc65b8308 100644 --- a/data/maps/FuchsiaCity_SafariZone_Office/map.json +++ b/data/maps/FuchsiaCity_SafariZone_Office/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 00f33363c..f6333f402 100644 --- a/data/maps/FuchsiaCity_WardensHouse/map.json +++ b/data/maps/FuchsiaCity_WardensHouse/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 c5bb07e8d..70c8e240c 100644 --- a/data/maps/IndigoPlateau_Exterior/map.json +++ b/data/maps/IndigoPlateau_Exterior/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_INDIGO_PLATEAU", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_1", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_TOWN", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 e862a372e..ff5e1b0ca 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/map.json +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_INDIGO_PLATEAU", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_1", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, + "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 1fb14c475..6eeb47d03 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json +++ b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_INDIGO_PLATEAU", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_1", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, + "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 f689e96d5..c3e98f4e9 100644 --- a/data/maps/LavenderTown/map.json +++ b/data/maps/LavenderTown/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_LAVENDER_TOWN", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_1", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_TOWN", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 d065e65d6..23f767cad 100644 --- a/data/maps/LavenderTown_House1/map.json +++ b/data/maps/LavenderTown_House1/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_LAVENDER_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 3c08f68a8..0318b07a8 100644 --- a/data/maps/LavenderTown_House2/map.json +++ b/data/maps/LavenderTown_House2/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_LAVENDER_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 f2603b3ad..44e4fdb2f 100644 --- a/data/maps/LavenderTown_Mart/map.json +++ b/data/maps/LavenderTown_Mart/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_LAVENDER_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 1889732e1..955d6f37c 100644 --- a/data/maps/LavenderTown_PokemonCenter_1F/map.json +++ b/data/maps/LavenderTown_PokemonCenter_1F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_LAVENDER_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 07faa3edd..0605f499a 100644 --- a/data/maps/LavenderTown_PokemonCenter_2F/map.json +++ b/data/maps/LavenderTown_PokemonCenter_2F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_LAVENDER_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 0a210a361..e292b44e4 100644 --- a/data/maps/LavenderTown_VolunteerPokemonHouse/map.json +++ b/data/maps/LavenderTown_VolunteerPokemonHouse/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_LAVENDER_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 62681bf5c..fcdf6edb2 100644 --- a/data/maps/MtEmber_Exterior/map.json +++ b/data/maps/MtEmber_Exterior/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_ROUTE", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 ef0279300..e0f972558 100644 --- a/data/maps/MtEmber_RubyPath_1F/map.json +++ b/data/maps/MtEmber_RubyPath_1F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 0ad52b863..46362d54e 100644 --- a/data/maps/MtEmber_RubyPath_B1F/map.json +++ b/data/maps/MtEmber_RubyPath_B1F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 0b5d948c5..11ec64838 100644 --- a/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json +++ b/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 a0ef82ad6..29d74a5a6 100644 --- a/data/maps/MtEmber_RubyPath_B2F/map.json +++ b/data/maps/MtEmber_RubyPath_B2F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 e3c5ef182..47e9c1c87 100644 --- a/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json +++ b/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 386b21e43..698499402 100644 --- a/data/maps/MtEmber_RubyPath_B3F/map.json +++ b/data/maps/MtEmber_RubyPath_B3F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 23b6556f6..c10c21ff9 100644 --- a/data/maps/MtEmber_RubyPath_B4F/map.json +++ b/data/maps/MtEmber_RubyPath_B4F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 e6279a72b..2d0964a1d 100644 --- a/data/maps/MtEmber_RubyPath_B5F/map.json +++ b/data/maps/MtEmber_RubyPath_B5F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 438ad09d0..3545b5ba2 100644 --- a/data/maps/MtEmber_Summit/map.json +++ b/data/maps/MtEmber_Summit/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 7b06ec6ba..77c89d7f2 100644 --- a/data/maps/MtEmber_SummitPath_1F/map.json +++ b/data/maps/MtEmber_SummitPath_1F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 50f1e424d..02496f3e9 100644 --- a/data/maps/MtEmber_SummitPath_2F/map.json +++ b/data/maps/MtEmber_SummitPath_2F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 3e1d8dc50..330bc6fe5 100644 --- a/data/maps/MtEmber_SummitPath_3F/map.json +++ b/data/maps/MtEmber_SummitPath_3F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 b12af5aae..f5b829469 100644 --- a/data/maps/MtMoon_1F/map.json +++ b/data/maps/MtMoon_1F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_MT_MOON", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 8bb52bddf..e330d5510 100644 --- a/data/maps/MtMoon_B1F/map.json +++ b/data/maps/MtMoon_B1F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_MT_MOON", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 f3c51828c..f0a3ba3a9 100644 --- a/data/maps/MtMoon_B2F/map.json +++ b/data/maps/MtMoon_B2F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_MT_MOON", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 4f0bc37bc..703240141 100644 --- a/data/maps/NavelRock_1F/map.json +++ b/data/maps/NavelRock_1F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 0, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 4807cf865..b1a6deada 100644 --- a/data/maps/NavelRock_B1F/map.json +++ b/data/maps/NavelRock_B1F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 0, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 c655f9252..98d1145fc 100644 --- a/data/maps/NavelRock_Base/map.json +++ b/data/maps/NavelRock_Base/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 0, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 16c0363a8..716ae04db 100644 --- a/data/maps/NavelRock_BasePath_B10F/map.json +++ b/data/maps/NavelRock_BasePath_B10F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 0, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 9530b8ca8..1b92ca1fc 100644 --- a/data/maps/NavelRock_BasePath_B11F/map.json +++ b/data/maps/NavelRock_BasePath_B11F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 0, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 e2d8103eb..624f800ee 100644 --- a/data/maps/NavelRock_BasePath_B1F/map.json +++ b/data/maps/NavelRock_BasePath_B1F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 0, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 df3200d16..b6af50439 100644 --- a/data/maps/NavelRock_BasePath_B2F/map.json +++ b/data/maps/NavelRock_BasePath_B2F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 0, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 65e25b3ec..22cc90c60 100644 --- a/data/maps/NavelRock_BasePath_B3F/map.json +++ b/data/maps/NavelRock_BasePath_B3F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 0, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 fd56529fb..33c4d41be 100644 --- a/data/maps/NavelRock_BasePath_B4F/map.json +++ b/data/maps/NavelRock_BasePath_B4F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 0, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 2d6e8798c..26cf212c6 100644 --- a/data/maps/NavelRock_BasePath_B5F/map.json +++ b/data/maps/NavelRock_BasePath_B5F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 0, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 0f5e92ad9..0d3ffdf8f 100644 --- a/data/maps/NavelRock_BasePath_B6F/map.json +++ b/data/maps/NavelRock_BasePath_B6F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 0, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 1c2897d91..acfc1da43 100644 --- a/data/maps/NavelRock_BasePath_B7F/map.json +++ b/data/maps/NavelRock_BasePath_B7F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 0, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 1f3445dee..4756a0655 100644 --- a/data/maps/NavelRock_BasePath_B8F/map.json +++ b/data/maps/NavelRock_BasePath_B8F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 0, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 9c6a50590..d033dd887 100644 --- a/data/maps/NavelRock_BasePath_B9F/map.json +++ b/data/maps/NavelRock_BasePath_B9F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 0, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 adaa0e703..9b10f6d8c 100644 --- a/data/maps/NavelRock_Exterior/map.json +++ b/data/maps/NavelRock_Exterior/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_ROUTE", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 c7b72356c..ec9fec5df 100644 --- a/data/maps/NavelRock_Fork/map.json +++ b/data/maps/NavelRock_Fork/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 0, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 752411223..796f67e5f 100644 --- a/data/maps/NavelRock_Harbor/map.json +++ b/data/maps/NavelRock_Harbor/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 ef624c9c0..3c2f599d5 100644 --- a/data/maps/NavelRock_Summit/map.json +++ b/data/maps/NavelRock_Summit/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_SHADE", - "map_type": "MAP_TYPE_4", - "unknown_18": 0, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 7cdb412db..d103d5f70 100644 --- a/data/maps/NavelRock_SummitPath_2F/map.json +++ b/data/maps/NavelRock_SummitPath_2F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 0, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 3d8db3367..3a122a2d2 100644 --- a/data/maps/NavelRock_SummitPath_3F/map.json +++ b/data/maps/NavelRock_SummitPath_3F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 0, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 d83e5c97f..fa74a2c92 100644 --- a/data/maps/NavelRock_SummitPath_4F/map.json +++ b/data/maps/NavelRock_SummitPath_4F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 0, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 4db860493..25d3ba773 100644 --- a/data/maps/NavelRock_SummitPath_5F/map.json +++ b/data/maps/NavelRock_SummitPath_5F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 0, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 638eb4ff8..06d8b7c6d 100644 --- a/data/maps/OneIsland/map.json +++ b/data/maps/OneIsland/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ONE_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_1", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_TOWN", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 2db30c3c5..a505aa5d0 100644 --- a/data/maps/OneIsland_Harbor/map.json +++ b/data/maps/OneIsland_Harbor/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ONE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 c7a147ca9..8ef48b424 100644 --- a/data/maps/OneIsland_House1/map.json +++ b/data/maps/OneIsland_House1/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ONE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 2da693dce..bb9b1da3f 100644 --- a/data/maps/OneIsland_House2/map.json +++ b/data/maps/OneIsland_House2/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ONE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 719fae823..01e5b92e7 100644 --- a/data/maps/OneIsland_KindleRoad/map.json +++ b/data/maps/OneIsland_KindleRoad/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_KINDLE_ROAD", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_ROUTE", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 32531ae9c..0a50424cb 100644 --- a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_EMBER_SPA", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 0, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 2328175c2..07d68dfc1 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/map.json +++ b/data/maps/OneIsland_PokemonCenter_1F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ONE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 13ed2a385..5b20f3609 100644 --- a/data/maps/OneIsland_PokemonCenter_2F/map.json +++ b/data/maps/OneIsland_PokemonCenter_2F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ONE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 46ddb26a6..2198e9b44 100644 --- a/data/maps/OneIsland_TreasureBeach/map.json +++ b/data/maps/OneIsland_TreasureBeach/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_TREASURE_BEACH", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_ROUTE", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 543751968..58924be03 100644 --- a/data/maps/PalletTown/map.json +++ b/data/maps/PalletTown/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_PALLET_TOWN", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_1", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_TOWN", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 51c7404ea..6b44f7eb3 100644 --- a/data/maps/PalletTown_GarysHouse/map.json +++ b/data/maps/PalletTown_GarysHouse/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_PALLET_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 e9e2158f4..414766d99 100644 --- a/data/maps/PalletTown_PlayersHouse_1F/map.json +++ b/data/maps/PalletTown_PlayersHouse_1F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_PALLET_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 61e354782..67befec6c 100644 --- a/data/maps/PalletTown_PlayersHouse_2F/map.json +++ b/data/maps/PalletTown_PlayersHouse_2F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_PALLET_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 cda4b6407..31e6014cb 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/map.json +++ b/data/maps/PalletTown_ProfessorOaksLab/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_PALLET_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 7222993be..fb235f0c5 100644 --- a/data/maps/PewterCity/map.json +++ b/data/maps/PewterCity/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_1", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_TOWN", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 04870110f..45c972196 100644 --- a/data/maps/PewterCity_Gym/map.json +++ b/data/maps/PewterCity_Gym/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_1", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, + "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 d1ec624c9..ca16f11a1 100644 --- a/data/maps/PewterCity_House1/map.json +++ b/data/maps/PewterCity_House1/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 88ce44057..27fb0810c 100644 --- a/data/maps/PewterCity_House2/map.json +++ b/data/maps/PewterCity_House2/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 f062c5bea..77983d9f3 100644 --- a/data/maps/PewterCity_Mart/map.json +++ b/data/maps/PewterCity_Mart/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 26df37224..ced7102e2 100644 --- a/data/maps/PewterCity_Museum_1F/map.json +++ b/data/maps/PewterCity_Museum_1F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 0139c1133..c7e1c8d8d 100644 --- a/data/maps/PewterCity_Museum_2F/map.json +++ b/data/maps/PewterCity_Museum_2F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 9de4e5b69..e4858844c 100644 --- a/data/maps/PewterCity_PokemonCenter_1F/map.json +++ b/data/maps/PewterCity_PokemonCenter_1F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 35c9e0f0e..445b86eb3 100644 --- a/data/maps/PewterCity_PokemonCenter_2F/map.json +++ b/data/maps/PewterCity_PokemonCenter_2F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 f71b81bf0..68dd0db42 100644 --- a/data/maps/PokemonLeague_AgathasRoom/map.json +++ b/data/maps/PokemonLeague_AgathasRoom/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_POKEMON_LEAGUE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_6", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, + "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 a84a63e19..6153f4808 100644 --- a/data/maps/PokemonLeague_BrunosRoom/map.json +++ b/data/maps/PokemonLeague_BrunosRoom/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_POKEMON_LEAGUE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_5", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, + "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 e0e261c1e..f8e9422c3 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/map.json +++ b/data/maps/PokemonLeague_ChampionsRoom/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_POKEMON_LEAGUE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 3775d94cb..16c9d05ec 100644 --- a/data/maps/PokemonLeague_HallOfFame/map.json +++ b/data/maps/PokemonLeague_HallOfFame/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_POKEMON_LEAGUE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 47f3651e5..332ed15b8 100644 --- a/data/maps/PokemonLeague_LancesRoom/map.json +++ b/data/maps/PokemonLeague_LancesRoom/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_POKEMON_LEAGUE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_7", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, + "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 f33c2a35b..d308c7975 100644 --- a/data/maps/PokemonLeague_LoreleisRoom/map.json +++ b/data/maps/PokemonLeague_LoreleisRoom/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_POKEMON_LEAGUE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_4", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, + "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 6ea519092..da4e01f1e 100644 --- a/data/maps/PokemonMansion_1F/map.json +++ b/data/maps/PokemonMansion_1F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_POKEMON_MANSION", "requires_flash": false, "weather": "WEATHER_SHADE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_3", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, + "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 a3a9c556e..3701da351 100644 --- a/data/maps/PokemonMansion_2F/map.json +++ b/data/maps/PokemonMansion_2F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_POKEMON_MANSION", "requires_flash": false, "weather": "WEATHER_SHADE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_3", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, + "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 9c0423004..e3d599d9f 100644 --- a/data/maps/PokemonMansion_3F/map.json +++ b/data/maps/PokemonMansion_3F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_POKEMON_MANSION", "requires_flash": false, "weather": "WEATHER_SHADE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_3", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, + "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 eea10cb2c..c4a876461 100644 --- a/data/maps/PokemonMansion_B1F/map.json +++ b/data/maps/PokemonMansion_B1F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_POKEMON_MANSION", "requires_flash": false, "weather": "WEATHER_SHADE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_3", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, + "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 8824c0f00..0b6d23cd3 100644 --- a/data/maps/PokemonTower_1F/map.json +++ b/data/maps/PokemonTower_1F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_POKEMON_TOWER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 5, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_2", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": true, + "allow_running": false, + "show_map_name": true, + "floor_number": 0, + "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 d25fb4c30..0d9b51490 100644 --- a/data/maps/PokemonTower_2F/map.json +++ b/data/maps/PokemonTower_2F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_POKEMON_TOWER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 5, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_2", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": true, + "allow_running": false, + "show_map_name": true, + "floor_number": 0, + "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 0952ea0e2..8f234e935 100644 --- a/data/maps/PokemonTower_3F/map.json +++ b/data/maps/PokemonTower_3F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_POKEMON_TOWER", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 5, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_2", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": true, + "allow_running": false, + "show_map_name": true, + "floor_number": 0, + "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 4e0a22b9f..47ee6cc43 100644 --- a/data/maps/PokemonTower_4F/map.json +++ b/data/maps/PokemonTower_4F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_POKEMON_TOWER", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 5, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_2", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": true, + "allow_running": false, + "show_map_name": true, + "floor_number": 0, + "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 08166799d..a1f0fc109 100644 --- a/data/maps/PokemonTower_5F/map.json +++ b/data/maps/PokemonTower_5F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_POKEMON_TOWER", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 5, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_2", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": true, + "allow_running": false, + "show_map_name": true, + "floor_number": 0, + "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 9a2ff3756..7ef95333a 100644 --- a/data/maps/PokemonTower_6F/map.json +++ b/data/maps/PokemonTower_6F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_POKEMON_TOWER", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 5, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_2", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": true, + "allow_running": false, + "show_map_name": true, + "floor_number": 0, + "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 9524a236b..e01c53116 100644 --- a/data/maps/PokemonTower_7F/map.json +++ b/data/maps/PokemonTower_7F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_POKEMON_TOWER", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 5, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_2", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": true, + "allow_running": false, + "show_map_name": true, + "floor_number": 0, + "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 d7baadb41..18099fc15 100644 --- a/data/maps/PowerPlant/map.json +++ b/data/maps/PowerPlant/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_POWER_PLANT", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_3", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, + "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 3cc89f9f0..761c204ce 100644 --- a/data/maps/Prototype_SeviiIsle_6/map.json +++ b/data/maps/Prototype_SeviiIsle_6/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_SEVII_ISLE_6", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_ROUTE", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 67a37d7e7..856883c02 100644 --- a/data/maps/Prototype_SeviiIsle_7/map.json +++ b/data/maps/Prototype_SeviiIsle_7/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_SEVII_ISLE_7", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_ROUTE", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 0ed21e3f2..dd05d6d35 100644 --- a/data/maps/Prototype_SeviiIsle_8/map.json +++ b/data/maps/Prototype_SeviiIsle_8/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_SEVII_ISLE_8", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_ROUTE", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 1fa4c73c4..b03f3866c 100644 --- a/data/maps/Prototype_SeviiIsle_9/map.json +++ b/data/maps/Prototype_SeviiIsle_9/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_SEVII_ISLE_9", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_ROUTE", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 8587ec56a..0a1f10925 100644 --- a/data/maps/RecordCenter/map.json +++ b/data/maps/RecordCenter/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_SPECIAL_AREA", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 6dd117e8a..6bb68f578 100644 --- a/data/maps/RockTunnel_1F/map.json +++ b/data/maps/RockTunnel_1F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROCK_TUNNEL", "requires_flash": true, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 b680bf4a1..bebd68148 100644 --- a/data/maps/RockTunnel_B1F/map.json +++ b/data/maps/RockTunnel_B1F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROCK_TUNNEL", "requires_flash": true, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 4314d758f..b80daf9d5 100644 --- a/data/maps/RocketHideout_B1F/map.json +++ b/data/maps/RocketHideout_B1F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROCKET_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 7, - "elevator_flag": -1, - "battle_scene": "BATTLE_SCENE_3", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": -1, + "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 2c353b5c1..5daefa002 100644 --- a/data/maps/RocketHideout_B2F/map.json +++ b/data/maps/RocketHideout_B2F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROCKET_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 7, - "elevator_flag": -2, - "battle_scene": "BATTLE_SCENE_3", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": -2, + "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 a4c1a7c72..984757f1e 100644 --- a/data/maps/RocketHideout_B3F/map.json +++ b/data/maps/RocketHideout_B3F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROCKET_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 7, - "elevator_flag": -3, - "battle_scene": "BATTLE_SCENE_3", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": -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 da6f7f569..bd38e3b71 100644 --- a/data/maps/RocketHideout_B4F/map.json +++ b/data/maps/RocketHideout_B4F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROCKET_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 7, - "elevator_flag": -4, - "battle_scene": "BATTLE_SCENE_3", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": -4, + "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 307ef90df..8e2d35889 100644 --- a/data/maps/RocketHideout_Elevator/map.json +++ b/data/maps/RocketHideout_Elevator/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROCKET_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_3", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, + "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 1a2426066..d8af63766 100644 --- a/data/maps/Route1/map.json +++ b/data/maps/Route1/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_1", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_ROUTE", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 fef96485a..df387492a 100644 --- a/data/maps/Route10/map.json +++ b/data/maps/Route10/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_10", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_ROUTE", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_LAVENDER_TOWN", @@ -34,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "Route10_EventScript_1A9FE5", + "script": "Route10_EventScript_Carol", "flag": "0" }, { @@ -47,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route10_EventScript_1AA09F", + "script": "Route10_EventScript_Clark", "flag": "0" }, { @@ -60,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "Route10_EventScript_1AA061", + "script": "Route10_EventScript_Herman", "flag": "0" }, { @@ -73,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "Route10_EventScript_1AA0DD", + "script": "Route10_EventScript_Trent", "flag": "0" }, { @@ -86,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "Route10_EventScript_1AA023", + "script": "Route10_EventScript_Mark", "flag": "0" }, { @@ -99,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "Route10_EventScript_1A9FA7", + "script": "Route10_EventScript_Heidi", "flag": "0" }, { @@ -199,21 +201,21 @@ "x": 15, "y": 59, "elevation": 0, - "script": "Route10_EventScript_167FE4" + "script": "Route10_EventScript_SouthRockTunnelSign" }, { "type": "bg_event_type_0", "x": 6, "y": 42, "elevation": 0, - "script": "Route10_EventScript_167FED" + "script": "Route10_EventScript_PowerPlantSign" }, { "type": "bg_event_type_0", "x": 7, "y": 21, "elevation": 0, - "script": "Route10_EventScript_167FDB" + "script": "Route10_EventScript_NorthRockTunnelSign" }, { "type": "hidden_item", diff --git a/data/maps/Route10/scripts.inc b/data/maps/Route10/scripts.inc index 7fb5d64cd..93694dc8a 100644 --- a/data/maps/Route10/scripts.inc +++ b/data/maps/Route10/scripts.inc @@ -1,17 +1,17 @@ Route10_MapScripts:: @ 8167FD9 .byte 0 -Route10_EventScript_167FDA:: @ 8167FDA +Route10_EventScript_Unused:: @ 8167FDA end -Route10_EventScript_167FDB:: @ 8167FDB - msgbox gUnknown_8184EC5, MSGBOX_SIGN +Route10_EventScript_NorthRockTunnelSign:: @ 8167FDB + msgbox Route10_Text_RockTunnelDetourToLavender, MSGBOX_SIGN end -Route10_EventScript_167FE4:: @ 8167FE4 - msgbox gUnknown_8184EE9, MSGBOX_SIGN +Route10_EventScript_SouthRockTunnelSign:: @ 8167FE4 + msgbox Route10_Text_RockTunnel, MSGBOX_SIGN end -Route10_EventScript_167FED:: @ 8167FED - msgbox gUnknown_8184EF5, MSGBOX_SIGN +Route10_EventScript_PowerPlantSign:: @ 8167FED + msgbox Route10_Text_PowerPlant, MSGBOX_SIGN end diff --git a/data/maps/Route10/text.inc b/data/maps/Route10/text.inc index af45c8923..5a2d48efb 100644 --- a/data/maps/Route10/text.inc +++ b/data/maps/Route10/text.inc @@ -1,86 +1,86 @@ -Text_184B8A:: @ 8184B8A +Route10_Text_MarkIntro:: @ 8184B8A .string "Wow, you came all the way here?\n" .string "Maybe you're a POKéMANIAC, too?\l" .string "Want to see my collection?$" -Text_184BE5:: @ 8184BE5 +Route10_Text_MarkDefeat:: @ 8184BE5 .string "Humph.\n" .string "I'm not angry!$" -Text_184BFB:: @ 8184BFB +Route10_Text_MarkPostBattle:: @ 8184BFB .string "I have more rare POKéMON at home!$" -Text_184C1D:: @ 8184C1D +Route10_Text_ClarkIntro:: @ 8184C1D .string "Ha-hahah-ah-ha!$" -Text_184C2D:: @ 8184C2D +Route10_Text_ClarkDefeat:: @ 8184C2D .string "Ha-haha!\n" .string "Not laughing!\l" .string "Ha-hay fever! Haha-ha-choo!$" -Text_184C60:: @ 8184C60 +Route10_Text_ClarkPostBattle:: @ 8184C60 .string "Haha-ha-choo!\n" .string "Ha-choo!\l" .string "Snort! Snivel!$" -Text_184C86:: @ 8184C86 +Route10_Text_HermanIntro:: @ 8184C86 .string "Hi, kid!\n" .string "Want to see my POKéMON?$" -Text_184CA7:: @ 8184CA7 +Route10_Text_HermanDefeat:: @ 8184CA7 .string "Oh, no!\n" .string "My POKéMON!$" -Text_184CBB:: @ 8184CBB +Route10_Text_HermanPostBattle:: @ 8184CBB .string "I don't like you.\n" .string "I don't like anyone better than me!$" -Text_184CF1:: @ 8184CF1 +Route10_Text_HeidiIntro:: @ 8184CF1 .string "I've been out at a POKéMON GYM\n" .string "a few times.\p" .string "…But I always lose.$" -Text_184D31:: @ 8184D31 +Route10_Text_HeidiDefeat:: @ 8184D31 .string "Ohh!\n" .string "After all my training!$" -Text_184D4D:: @ 8184D4D +Route10_Text_HeidiPostBattle:: @ 8184D4D .string "I noticed some POKéMANIACS\n" .string "prowling around.\p" .string "Can you imagine? Them?\n" .string "Up here in the mountains?$" -Text_184DAA:: @ 8184DAA +Route10_Text_TrentIntro:: @ 8184DAA .string "Ah!\n" .string "This mountain air is delicious!$" -Text_184DCE:: @ 8184DCE +Route10_Text_TrentDefeat:: @ 8184DCE .string "That cleared my head!$" -Text_184DE4:: @ 8184DE4 +Route10_Text_TrentPostBattle:: @ 8184DE4 .string "I feel bloated on mountain air!$" -Text_184E04:: @ 8184E04 +Route10_Text_CarolIntro:: @ 8184E04 .string "I'm feeling a bit faint.\n" .string "I haven't hiked in some time.$" -Text_184E3B:: @ 8184E3B +Route10_Text_CarolDefeat:: @ 8184E3B .string "I'm too tired.\n" .string "I wasn't up for it.$" -Text_184E5E:: @ 8184E5E +Route10_Text_CarolPostBattle:: @ 8184E5E .string "The POKéMON here in the mountains\n" .string "are so chunky…\p" .string "I wish there were pink POKéMON\n" .string "with a floral pattern!$" -gUnknown_8184EC5:: @ 8184EC5 +Route10_Text_RockTunnelDetourToLavender:: @ 8184EC5 .string "ROCK TUNNEL\n" .string "Detour to LAVENDER TOWN$" -gUnknown_8184EE9:: @ 8184EE9 +Route10_Text_RockTunnel:: @ 8184EE9 .string "ROCK TUNNEL$" -gUnknown_8184EF5:: @ 8184EF5 +Route10_Text_PowerPlant:: @ 8184EF5 .string "POWER PLANT$" diff --git a/data/maps/Route10_PokemonCenter_1F/map.json b/data/maps/Route10_PokemonCenter_1F/map.json index dc1543ef0..3003e5115 100644 --- a/data/maps/Route10_PokemonCenter_1F/map.json +++ b/data/maps/Route10_PokemonCenter_1F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_10", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { @@ -23,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route10_PokemonCenter_1F_EventScript_16FC41", + "script": "Route10_PokemonCenter_1F_EventScript_Nurse", "flag": "0" }, { @@ -36,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route10_PokemonCenter_1F_EventScript_16FC53", + "script": "Route10_PokemonCenter_1F_EventScript_Gentleman", "flag": "0" }, { @@ -49,7 +51,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route10_PokemonCenter_1F_EventScript_16FC4A", + "script": "Route10_PokemonCenter_1F_EventScript_FatMan", "flag": "0" }, { @@ -62,7 +64,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route10_PokemonCenter_1F_EventScript_16FC5C", + "script": "Route10_PokemonCenter_1F_EventScript_Youngster", "flag": "0" }, { @@ -75,7 +77,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route10_PokemonCenter_1F_EventScript_16FC65", + "script": "Route10_PokemonCenter_1F_EventScript_Aide", "flag": "0" } ], diff --git a/data/maps/Route10_PokemonCenter_1F/scripts.inc b/data/maps/Route10_PokemonCenter_1F/scripts.inc index 56e0b448e..a4d477a4b 100644 --- a/data/maps/Route10_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route10_PokemonCenter_1F/scripts.inc @@ -1,3 +1,5 @@ +.equ REQUIRED_OWNED_MONS, 20 + Route10_PokemonCenter_1F_MapScripts:: @ 816FC2F map_script MAP_SCRIPT_ON_TRANSITION, Route10_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume @@ -8,55 +10,55 @@ Route10_PokemonCenter_1F_OnTransition:: @ 816FC3A setrespawn SPAWN_ROUTE10 end -Route10_PokemonCenter_1F_EventScript_16FC41:: @ 816FC41 +Route10_PokemonCenter_1F_EventScript_Nurse:: @ 816FC41 lock faceplayer call EventScript_PkmnCenterNurse release end -Route10_PokemonCenter_1F_EventScript_16FC4A:: @ 816FC4A - msgbox gUnknown_819E59D, MSGBOX_NPC +Route10_PokemonCenter_1F_EventScript_FatMan:: @ 816FC4A + msgbox Route10_PokemonCenter_1F_Text_NuggetUselessSoldFor5000, MSGBOX_NPC end -Route10_PokemonCenter_1F_EventScript_16FC53:: @ 816FC53 - msgbox gUnknown_819E523, MSGBOX_NPC +Route10_PokemonCenter_1F_EventScript_Gentleman:: @ 816FC53 + msgbox Route10_PokemonCenter_1F_Text_EveryTypeStrongerThanOthers, MSGBOX_NPC end -Route10_PokemonCenter_1F_EventScript_16FC5C:: @ 816FC5C - msgbox gUnknown_819E5D2, MSGBOX_NPC +Route10_PokemonCenter_1F_EventScript_Youngster:: @ 816FC5C + msgbox Route10_PokemonCenter_1F_Text_HeardGhostsHauntLavender, MSGBOX_NPC end -Route10_PokemonCenter_1F_EventScript_16FC65:: @ 816FC65 +Route10_PokemonCenter_1F_EventScript_Aide:: @ 816FC65 lock faceplayer - call EventScript_16FCF1 - goto_if_set FLAG_GOT_EVERSTONE_FROM_OAKS_AIDE, EventScript_16FCE7 - msgbox gUnknown_819E5FB, MSGBOX_YESNO + call Route10_PokemonCenter_1F_EventScript_GetAideRequestInfo + goto_if_set FLAG_GOT_EVERSTONE_FROM_OAKS_AIDE, Route10_PokemonCenter_1F_EventScript_AlreadyGotEverstone + msgbox Route10_PokemonCenter_1F_Text_GiveEverstoneIfCaught20Mons, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq Aide_EventScript_DeclineCheckMons setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount getnumberstring 2, VAR_0x8006 - call EventScript_16FCF1 - compare VAR_0x8006, 20 + call Route10_PokemonCenter_1F_EventScript_GetAideRequestInfo + compare VAR_0x8006, REQUIRED_OWNED_MONS goto_if_lt Aide_EventScript_HaventCaughtEnough - msgbox gUnknown_819E733 + msgbox Route10_PokemonCenter_1F_Text_GreatHereYouGo checkitemspace ITEM_EVERSTONE, 1 compare VAR_RESULT, FALSE goto_if_eq Aide_EventScript_NoRoomForItem - giveitem_msg gUnknown_819E786, ITEM_EVERSTONE + giveitem_msg Route10_PokemonCenter_1F_Text_ReceivedEverstoneFromAide, ITEM_EVERSTONE setflag FLAG_GOT_EVERSTONE_FROM_OAKS_AIDE - msgbox gUnknown_819E7AF + msgbox Route10_PokemonCenter_1F_Text_ExplainEverstone release end -EventScript_16FCE7:: @ 816FCE7 - msgbox gUnknown_819E7AF +Route10_PokemonCenter_1F_EventScript_AlreadyGotEverstone:: @ 816FCE7 + msgbox Route10_PokemonCenter_1F_Text_ExplainEverstone release end -EventScript_16FCF1:: @ 816FCF1 - getnumberstring 0, 20 +Route10_PokemonCenter_1F_EventScript_GetAideRequestInfo:: @ 816FCF1 + getnumberstring 0, REQUIRED_OWNED_MONS getitemname 1, ITEM_EVERSTONE return diff --git a/data/maps/Route10_PokemonCenter_1F/text.inc b/data/maps/Route10_PokemonCenter_1F/text.inc index 3360854fe..7c63407ae 100644 --- a/data/maps/Route10_PokemonCenter_1F/text.inc +++ b/data/maps/Route10_PokemonCenter_1F/text.inc @@ -1,18 +1,18 @@ -gUnknown_819E523:: @ 819E523 +Route10_PokemonCenter_1F_Text_EveryTypeStrongerThanOthers:: @ 819E523 .string "The types of POKéMON match up\n" .string "differently with each other.\p" .string "Every type is stronger than some\n" .string "types and weaker than others.$" -gUnknown_819E59D:: @ 819E59D +Route10_PokemonCenter_1F_Text_NuggetUselessSoldFor5000:: @ 819E59D .string "A NUGGET is totally useless.\n" .string "So I sold it for ¥5000.$" -gUnknown_819E5D2:: @ 819E5D2 +Route10_PokemonCenter_1F_Text_HeardGhostsHauntLavender:: @ 819E5D2 .string "I heard that ghosts haunt\n" .string "LAVENDER TOWN.$" -gUnknown_819E5FB:: @ 819E5FB +Route10_PokemonCenter_1F_Text_GiveEverstoneIfCaught20Mons:: @ 819E5FB .string "Oh… {PLAYER}!\n" .string "I've been looking for you!\p" .string "It's me, one of the ever-present\n" @@ -26,17 +26,17 @@ gUnknown_819E5FB:: @ 819E5FB .string "Have you gathered data on at least\n" .string "twenty kinds of POKéMON?$" -gUnknown_819E733:: @ 819E733 +Route10_PokemonCenter_1F_Text_GreatHereYouGo:: @ 819E733 .string "Great! You have caught or owned\n" .string "{STR_VAR_3} kinds of POKéMON!\p" .string "Congratulations!\n" .string "Here you go!$" -gUnknown_819E786:: @ 819E786 +Route10_PokemonCenter_1F_Text_ReceivedEverstoneFromAide:: @ 819E786 .string "{PLAYER} received the EVERSTONE\n" .string "from the AIDE.$" -gUnknown_819E7AF:: @ 819E7AF +Route10_PokemonCenter_1F_Text_ExplainEverstone:: @ 819E7AF .string "Making POKéMON evolve certainly\n" .string "can add to the POKéDEX.\p" .string "However, at times, you may not\n" diff --git a/data/maps/Route10_PokemonCenter_2F/map.json b/data/maps/Route10_PokemonCenter_2F/map.json index 41c497474..f9aae8494 100644 --- a/data/maps/Route10_PokemonCenter_2F/map.json +++ b/data/maps/Route10_PokemonCenter_2F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_10", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 7cdaa105b..b77d1d7d3 100644 --- a/data/maps/Route11/map.json +++ b/data/maps/Route11/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_11", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_ROUTE", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_VERMILION_CITY", @@ -34,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "Route11_EventScript_1A9B0D", + "script": "Route11_EventScript_Eddie", "flag": "0" }, { @@ -47,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route11_EventScript_1A9C81", + "script": "Route11_EventScript_Hugo", "flag": "0" }, { @@ -60,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "Route11_EventScript_1A9B4B", + "script": "Route11_EventScript_Dillon", "flag": "0" }, { @@ -73,7 +75,7 @@ "movement_range_y": 4, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route11_EventScript_1A9BC7", + "script": "Route11_EventScript_Dave", "flag": "0" }, { @@ -86,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route11_EventScript_1A9CBF", + "script": "Route11_EventScript_Jasper", "flag": "0" }, { @@ -99,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route11_EventScript_1A9D3B", + "script": "Route11_EventScript_Darian", "flag": "0" }, { @@ -112,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "Route11_EventScript_1A9C05", + "script": "Route11_EventScript_Braxton", "flag": "0" }, { @@ -125,7 +127,7 @@ "movement_range_y": 4, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route11_EventScript_1A9B89", + "script": "Route11_EventScript_Yasu", "flag": "0" }, { @@ -138,7 +140,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route11_EventScript_1A9CFD", + "script": "Route11_EventScript_Dirk", "flag": "0" }, { @@ -151,7 +153,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 6, - "script": "Route11_EventScript_1A9C43", + "script": "Route11_EventScript_Bernie", "flag": "0" }, { @@ -224,7 +226,7 @@ "x": 3, "y": 7, "elevation": 3, - "script": "Route11_EventScript_167FF7" + "script": "Route11_EventScript_DiglettsCaveSign" }, { "type": "hidden_item", diff --git a/data/maps/Route11/scripts.inc b/data/maps/Route11/scripts.inc index 11f052030..821b8256f 100644 --- a/data/maps/Route11/scripts.inc +++ b/data/maps/Route11/scripts.inc @@ -1,6 +1,6 @@ Route11_MapScripts:: @ 8167FF6 .byte 0 -Route11_EventScript_167FF7:: @ 8167FF7 - msgbox gUnknown_8185308, MSGBOX_SIGN +Route11_EventScript_DiglettsCaveSign:: @ 8167FF7 + msgbox Route11_Text_DiglettsCave, MSGBOX_SIGN end diff --git a/data/maps/Route11/text.inc b/data/maps/Route11/text.inc index 19515d010..2f7c7fc6d 100644 --- a/data/maps/Route11/text.inc +++ b/data/maps/Route11/text.inc @@ -1,113 +1,113 @@ -Text_184F01:: @ 8184F01 +Route11_Text_HugoIntro:: @ 8184F01 .string "Win, lose, or draw!$" -Text_184F15:: @ 8184F15 +Route11_Text_HugoDefeat:: @ 8184F15 .string "Atcha!\n" .string "Didn't go my way!$" -Text_184F2E:: @ 8184F2E +Route11_Text_HugoPostBattle:: @ 8184F2E .string "POKéMON is life!\n" .string "And to live is to play games!$" -Text_184F5D:: @ 8184F5D +Route11_Text_JasperIntro:: @ 8184F5D .string "Competition!\n" .string "I can't get enough!$" -Text_184F7E:: @ 8184F7E +Route11_Text_JasperDefeat:: @ 8184F7E .string "I had a chance!$" -Text_184F8E:: @ 8184F8E +Route11_Text_JasperPostBattle:: @ 8184F8E .string "You can't be a coward in the world\n" .string "of POKéMON!$" -Text_184FBD:: @ 8184FBD +Route11_Text_EddieIntro:: @ 8184FBD .string "Let's go, but don't cheat!$" -Text_184FD8:: @ 8184FD8 +Route11_Text_EddieDefeat:: @ 8184FD8 .string "Huh?\n" .string "That's not right!$" -Text_184FEF:: @ 8184FEF +Route11_Text_EddiePostBattle:: @ 8184FEF .string "I did my best.\n" .string "I have no regrets.$" -Text_185011:: @ 8185011 +Route11_Text_BraxtonIntro:: @ 8185011 .string "Careful!\n" .string "I'm laying down some cables!$" -Text_185037:: @ 8185037 +Route11_Text_BraxtonDefeat:: @ 8185037 .string "That was electric!$" -Text_18504A:: @ 818504A +Route11_Text_BraxtonPostBattle:: @ 818504A .string "Spread the word to save energy!$" -Text_18506A:: @ 818506A +Route11_Text_DillonIntro:: @ 818506A .string "I just became a TRAINER.\n" .string "But, I think I can win.$" -Text_18509B:: @ 818509B +Route11_Text_DillonDefeat:: @ 818509B .string "My POKéMON couldn't win…\n" .string "Haven't they grown enough?$" -Text_1850CF:: @ 81850CF +Route11_Text_DillonPostBattle:: @ 81850CF .string "What now?\n" .string "Leave me alone!$" -Text_1850E9:: @ 81850E9 +Route11_Text_DirkIntro:: @ 81850E9 .string "Fwahaha!\n" .string "I have never lost!$" -Text_185105:: @ 8185105 +Route11_Text_DirkDefeat:: @ 8185105 .string "My first loss!$" -Text_185114:: @ 8185114 +Route11_Text_DirkPostBattle:: @ 8185114 .string "You were just lucky, that's all.$" -Text_185135:: @ 8185135 +Route11_Text_DarianIntro:: @ 8185135 .string "I have never won before…$" -Text_18514E:: @ 818514E +Route11_Text_DarianDefeat:: @ 818514E .string "I saw this coming…$" -Text_185161:: @ 8185161 +Route11_Text_DarianPostBattle:: @ 8185161 .string "I was unlucky, as always.$" -Text_18517B:: @ 818517B +Route11_Text_YasuIntro:: @ 818517B .string "I'm the best in my class.\n" .string "I train every morning.$" -Text_1851AC:: @ 81851AC +Route11_Text_YasuDefeat:: @ 81851AC .string "Darn!\n" .string "My POKéMON need to be stronger!$" -Text_1851D2:: @ 81851D2 +Route11_Text_YasuPostBattle:: @ 81851D2 .string "There's a fat POKéMON that comes\n" .string "down from the mountains.\p" .string "I bet it'd be strong if you can\n" .string "catch it.$" -Text_185236:: @ 8185236 +Route11_Text_BernieIntro:: @ 8185236 .string "Watch out for live wires!$" -Text_185250:: @ 8185250 +Route11_Text_BernieDefeat:: @ 8185250 .string "Whoa!\n" .string "You spark plug!$" -Text_185266:: @ 8185266 +Route11_Text_BerniePostBattle:: @ 8185266 .string "Well, better get back to work.$" -Text_185285:: @ 8185285 +Route11_Text_DaveIntro:: @ 8185285 .string "I raised my POKéMON carefully.\n" .string "They should be ready by now!$" -Text_1852C1:: @ 81852C1 +Route11_Text_DaveDefeat:: @ 81852C1 .string "Bye-bye!\n" .string "Thank you, and good-bye!$" -Text_1852E3:: @ 81852E3 +Route11_Text_DavePostBattle:: @ 81852E3 .string "Tch…\n" .string "I better go find stronger ones!$" -gUnknown_8185308:: @ 8185308 +Route11_Text_DiglettsCave:: @ 8185308 .string "DIGLETT'S CAVE$" diff --git a/data/maps/Route11_EastEntrance_1F/map.json b/data/maps/Route11_EastEntrance_1F/map.json index 21d3b454f..9b8a3e36a 100644 --- a/data/maps/Route11_EastEntrance_1F/map.json +++ b/data/maps/Route11_EastEntrance_1F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_11", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 1, - "unknown_19": 2, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": false, + "floor_number": 0, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { @@ -23,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route11_EastEntrance_1F_EventScript_16FD22", + "script": "Route11_EastEntrance_1F_EventScript_TopGuard", "flag": "0" }, { @@ -36,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route11_EastEntrance_1F_EventScript_16FD2B", + "script": "Route11_EastEntrance_1F_EventScript_BottomGuard", "flag": "0" } ], diff --git a/data/maps/Route11_EastEntrance_1F/scripts.inc b/data/maps/Route11_EastEntrance_1F/scripts.inc index 0a2f2cb75..e8097b62a 100644 --- a/data/maps/Route11_EastEntrance_1F/scripts.inc +++ b/data/maps/Route11_EastEntrance_1F/scripts.inc @@ -1,10 +1,10 @@ Route11_EastEntrance_1F_MapScripts:: @ 816FD21 .byte 0 -Route11_EastEntrance_1F_EventScript_16FD22:: @ 816FD22 - msgbox gUnknown_819E8A6, MSGBOX_NPC +Route11_EastEntrance_1F_EventScript_TopGuard:: @ 816FD22 + msgbox Route11_EastEntrance_1F_Text_ManInLavenderRatesNames, MSGBOX_NPC end -Route11_EastEntrance_1F_EventScript_16FD2B:: @ 816FD2B - msgbox gUnknown_819E97B, MSGBOX_NPC +Route11_EastEntrance_1F_EventScript_BottomGuard:: @ 816FD2B + msgbox Route11_EastEntrance_1F_Text_RockTunnelToReachLavender, MSGBOX_NPC end diff --git a/data/maps/Route11_EastEntrance_1F/text.inc b/data/maps/Route11_EastEntrance_1F/text.inc index 335e7e3e9..de5965bcf 100644 --- a/data/maps/Route11_EastEntrance_1F/text.inc +++ b/data/maps/Route11_EastEntrance_1F/text.inc @@ -1,8 +1,9 @@ -Text_19E890:: @ 819E890 +@ Unclear where this is originally from +Route11_EastEntrance_1F_Text_BagIsFull:: @ 819E890 .string "{PLAYER}{KUN}の バッグ\n" .string "いっぱい みたい だね$" -gUnknown_819E8A6:: @ 819E8A6 +Route11_EastEntrance_1F_Text_ManInLavenderRatesNames:: @ 819E8A6 .string "Don't you think it's hard to think\n" .string "up good names for POKéMON?\p" .string "Especially if you've caught a\n" @@ -12,7 +13,7 @@ gUnknown_819E8A6:: @ 819E8A6 .string "He can even help you rename your\n" .string "POKéMON, too.$" -gUnknown_819E97B:: @ 819E97B +Route11_EastEntrance_1F_Text_RockTunnelToReachLavender:: @ 819E97B .string "If you're aiming to reach LAVENDER\n" .string "TOWN, take ROCK TUNNEL.\p" .string "You can get to ROCK TUNNEL from\n" diff --git a/data/maps/Route11_EastEntrance_2F/map.json b/data/maps/Route11_EastEntrance_2F/map.json index d7c8f1f5b..6a38e9aad 100644 --- a/data/maps/Route11_EastEntrance_2F/map.json +++ b/data/maps/Route11_EastEntrance_2F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_11", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { @@ -23,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route11_EastEntrance_2F_EventScript_16FD5C", + "script": "Route11_EastEntrance_2F_EventScript_Turner", "flag": "0" }, { @@ -36,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route11_EastEntrance_2F_EventScript_16FDD8", + "script": "Route11_EastEntrance_2F_EventScript_Aide", "flag": "0" } ], @@ -56,14 +58,14 @@ "x": 4, "y": 1, "elevation": 0, - "script": "Route11_EastEntrance_2F_EventScript_16FD35" + "script": "Route11_EastEntrance_2F_EventScript_LeftBinoculars" }, { "type": "bg_event_type_0", "x": 8, "y": 1, "elevation": 0, - "script": "Route11_EastEntrance_2F_EventScript_16FD53" + "script": "Route11_EastEntrance_2F_EventScript_RightBinoculars" } ] } diff --git a/data/maps/Route11_EastEntrance_2F/scripts.inc b/data/maps/Route11_EastEntrance_2F/scripts.inc index 91a6d20bd..b8b6be3e7 100644 --- a/data/maps/Route11_EastEntrance_2F/scripts.inc +++ b/data/maps/Route11_EastEntrance_2F/scripts.inc @@ -1,89 +1,91 @@ +.equ REQUIRED_CAUGHT_MONS, 30 + Route11_EastEntrance_2F_MapScripts:: @ 816FD34 .byte 0 -Route11_EastEntrance_2F_EventScript_16FD35:: @ 816FD35 +Route11_EastEntrance_2F_EventScript_LeftBinoculars:: @ 816FD35 lockall - goto_if_set FLAG_WOKE_UP_ROUTE_12_SNORLAX, EventScript_16FD49 - msgbox gUnknown_819EC8A + goto_if_set FLAG_WOKE_UP_ROUTE_12_SNORLAX, Route11_EastEntrance_2F_EventScript_LeftBinocularsSnorlaxGone + msgbox Route11_EastEntrance_2F_Text_BigMonAsleepOnRoad releaseall end -EventScript_16FD49:: @ 816FD49 - msgbox gUnknown_819ECD9 +Route11_EastEntrance_2F_EventScript_LeftBinocularsSnorlaxGone:: @ 816FD49 + msgbox Route11_EastEntrance_2F_Text_WhatABreathtakingView releaseall end -Route11_EastEntrance_2F_EventScript_16FD53:: @ 816FD53 - msgbox gUnknown_819ED1F, MSGBOX_SIGN +Route11_EastEntrance_2F_EventScript_RightBinoculars:: @ 816FD53 + msgbox Route11_EastEntrance_2F_Text_RockTunnelGoodRouteToLavender, MSGBOX_SIGN end -Route11_EastEntrance_2F_EventScript_16FD5C:: @ 816FD5C +Route11_EastEntrance_2F_EventScript_Turner:: @ 816FD5C lock faceplayer setvar VAR_0x8008, INGAME_TRADE_NIDORINOA call EventScript_GetInGameTradeSpeciesInfo - goto_if_set FLAG_DID_NINA_TRADE, EventScript_16FDCE + goto_if_set FLAG_DID_NINA_TRADE, Route11_EastEntrance_2F_EventScript_AlreadyTraded msgbox Trade_Text_LookingForMonWannaTradeForMon, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_16FDB6 + goto_if_eq Route11_EastEntrance_2F_EventScript_DeclineTrade call EventScript_ChooseMonForInGameTrade compare VAR_0x8004, PARTY_SIZE - goto_if_ge EventScript_16FDB6 + goto_if_ge Route11_EastEntrance_2F_EventScript_DeclineTrade call EventScript_GetInGameTradeSpecies compare VAR_RESULT, VAR_0x8009 - goto_if_ne EventScript_16FDC0 + goto_if_ne Route11_EastEntrance_2F_EventScript_NotRequestedMon call EventScript_DoInGameTrade msgbox Trade_Text_HeyThanks setflag FLAG_DID_NINA_TRADE release end -EventScript_16FDB6:: @ 816FDB6 +Route11_EastEntrance_2F_EventScript_DeclineTrade:: @ 816FDB6 msgbox Trade_Text_AwwOhWell release end -EventScript_16FDC0:: @ 816FDC0 +Route11_EastEntrance_2F_EventScript_NotRequestedMon:: @ 816FDC0 getspeciesname 0, VAR_0x8009 msgbox Trade_Text_WhatThatsNoMon release end -EventScript_16FDCE:: @ 816FDCE +Route11_EastEntrance_2F_EventScript_AlreadyTraded:: @ 816FDCE msgbox Trade_Text_IsntMyOldMonGreat release end -Route11_EastEntrance_2F_EventScript_16FDD8:: @ 816FDD8 +Route11_EastEntrance_2F_EventScript_Aide:: @ 816FDD8 lock faceplayer - call EventScript_16FE64 - goto_if_set FLAG_GOT_ITEMFINDER, EventScript_16FE5A - msgbox gUnknown_819E9E5, MSGBOX_YESNO + call Route11_EastEntrance_2F_EventScript_GetAideRequestInfo + goto_if_set FLAG_GOT_ITEMFINDER, Route11_EastEntrance_2F_EventScript_AlreadyGotItemfinder + msgbox Route11_EastEntrance_2F_Text_GiveItemfinderIfCaught30, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq Aide_EventScript_DeclineCheckMons setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount getnumberstring 2, VAR_0x8006 - call EventScript_16FE64 - compare VAR_0x8006, 30 + call Route11_EastEntrance_2F_EventScript_GetAideRequestInfo + compare VAR_0x8006, REQUIRED_CAUGHT_MONS goto_if_lt Aide_EventScript_HaventCaughtEnough - msgbox gUnknown_819EAE4 + msgbox Route11_EastEntrance_2F_Text_GreatHereYouGo checkitemspace ITEM_ITEMFINDER, 1 compare VAR_RESULT, FALSE goto_if_eq Aide_EventScript_NoRoomForItem - giveitem_msg gUnknown_819EB37, ITEM_ITEMFINDER + giveitem_msg Route11_EastEntrance_2F_Text_ReceivedItemfinderFromAide, ITEM_ITEMFINDER setflag FLAG_GOT_ITEMFINDER - msgbox gUnknown_819EB59 + msgbox Route11_EastEntrance_2F_Text_ExplainItemfinder release end -EventScript_16FE5A:: @ 816FE5A - msgbox gUnknown_819EB59 +Route11_EastEntrance_2F_EventScript_AlreadyGotItemfinder:: @ 816FE5A + msgbox Route11_EastEntrance_2F_Text_ExplainItemfinder release end -EventScript_16FE64:: @ 816FE64 - getnumberstring 0, 30 +Route11_EastEntrance_2F_EventScript_GetAideRequestInfo:: @ 816FE64 + getnumberstring 0, REQUIRED_CAUGHT_MONS getitemname 1, ITEM_ITEMFINDER return diff --git a/data/maps/Route11_EastEntrance_2F/text.inc b/data/maps/Route11_EastEntrance_2F/text.inc index aa693a495..66e871199 100644 --- a/data/maps/Route11_EastEntrance_2F/text.inc +++ b/data/maps/Route11_EastEntrance_2F/text.inc @@ -1,4 +1,4 @@ -gUnknown_819E9E5:: @ 819E9E5 +Route11_EastEntrance_2F_Text_GiveItemfinderIfCaught30:: @ 819E9E5 .string "Hi! Remember me?\n" .string "I'm one of PROF. OAK's AIDES.\p" .string "If your POKéDEX has complete data\n" @@ -10,17 +10,17 @@ gUnknown_819E9E5:: @ 819E9E5 .string "Have you gathered data on at least\n" .string "{STR_VAR_1} kinds of POKéMON?$" -gUnknown_819EAE4:: @ 819EAE4 +Route11_EastEntrance_2F_Text_GreatHereYouGo:: @ 819EAE4 .string "Great! You have caught or owned\n" .string "{STR_VAR_3} kinds of POKéMON!\p" .string "Congratulations!\n" .string "Here you go!$" -gUnknown_819EB37:: @ 819EB37 +Route11_EastEntrance_2F_Text_ReceivedItemfinderFromAide:: @ 819EB37 .string "{PLAYER} received the {STR_VAR_2}\n" .string "from the AIDE.$" -gUnknown_819EB59:: @ 819EB59 +Route11_EastEntrance_2F_Text_ExplainItemfinder:: @ 819EB59 .string "There are items on the ground that\n" .string "may be hidden from view.\p" .string "Use the ITEMFINDER to detect any\n" @@ -32,17 +32,17 @@ gUnknown_819EB59:: @ 819EB59 .string "Use it to get your bearings, then\n" .string "search the suspect area by hand.$" -gUnknown_819EC8A:: @ 819EC8A +Route11_EastEntrance_2F_Text_BigMonAsleepOnRoad:: @ 819EC8A .string "Let's see what the binoculars have\n" .string "to show…\p" .string "A big POKéMON is asleep on a road!$" -gUnknown_819ECD9:: @ 819ECD9 +Route11_EastEntrance_2F_Text_WhatABreathtakingView:: @ 819ECD9 .string "Let's see what the binoculars have\n" .string "to show…\p" .string "What a breathtaking view!$" -gUnknown_819ED1F:: @ 819ED1F +Route11_EastEntrance_2F_Text_RockTunnelGoodRouteToLavender:: @ 819ED1F .string "Let's see what the binoculars have\n" .string "to show…\p" .string "To get to LAVENDER TOWN from\n" diff --git a/data/maps/Route12/map.json b/data/maps/Route12/map.json index 09e49160b..656116cc2 100644 --- a/data/maps/Route12/map.json +++ b/data/maps/Route12/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_12", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_ROUTE", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_LAVENDER_TOWN", @@ -39,7 +41,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route12_EventScript_1AA451", + "script": "Route12_EventScript_Ned", "flag": "0" }, { @@ -52,7 +54,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route12_EventScript_1AA48F", + "script": "Route12_EventScript_Chip", "flag": "0" }, { @@ -65,7 +67,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "Route12_EventScript_1AA4CD", + "script": "Route12_EventScript_Hank", "flag": "0" }, { @@ -78,7 +80,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route12_EventScript_1AA50B", + "script": "Route12_EventScript_Elliot", "flag": "0" }, { @@ -104,7 +106,7 @@ "movement_range_y": 4, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route12_EventScript_1AA587", + "script": "Route12_EventScript_Luca", "flag": "0" }, { @@ -117,7 +119,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route12_EventScript_1AA5C5", + "script": "Route12_EventScript_Justin", "flag": "0" }, { @@ -130,7 +132,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route12_EventScript_1AA549", + "script": "Route12_EventScript_Andrew", "flag": "0" }, { @@ -182,7 +184,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 0, - "script": "Route12_EventScript_1AA649", + "script": "Route12_EventScript_Gia", "flag": "0" }, { @@ -195,7 +197,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 0, - "script": "Route12_EventScript_1AA603", + "script": "Route12_EventScript_Jes", "flag": "0" }, { diff --git a/data/maps/Route12/text.inc b/data/maps/Route12/text.inc index 06371bf5c..9c984cc47 100644 --- a/data/maps/Route12/text.inc +++ b/data/maps/Route12/text.inc @@ -17,87 +17,87 @@ Text_WantToUsePokeFlute:: @ 81853CC Text_PlayedPokeFlute:: @ 81853E8 .string "{PLAYER} played the POKé FLUTE.$" -Text_185402:: @ 8185402 +Route12_Text_NedIntro:: @ 8185402 .string "Yeah!\n" .string "I got a bite here!$" -Text_18541B:: @ 818541B +Route12_Text_NedDefeat:: @ 818541B .string "Tch!\n" .string "Just a small fry…$" -Text_185432:: @ 8185432 +Route12_Text_NedPostBattle:: @ 8185432 .string "Hang on!\n" .string "My line's snagged!$" -Text_18544E:: @ 818544E +Route12_Text_ChipIntro:: @ 818544E .string "Be patient.\n" .string "Fishing is a waiting game.$" -Text_185475:: @ 8185475 +Route12_Text_ChipDefeat:: @ 8185475 .string "That one got away!$" -Text_185488:: @ 8185488 +Route12_Text_ChipPostBattle:: @ 8185488 .string "With a better ROD, I could catch\n" .string "better POKéMON…$" -Text_1854B9:: @ 81854B9 +Route12_Text_JustinIntro:: @ 81854B9 .string "I'm searching for a MOON STONE.\n" .string "Have you found one?$" -Text_1854ED:: @ 81854ED +Route12_Text_JustinDefeat:: @ 81854ED .string "Oww!$" -Text_1854F2:: @ 81854F2 +Route12_Text_JustinPostBattle:: @ 81854F2 .string "I could have made my POKéMON\n" .string "evolve with a MOON STONE.\p" .string "I would have won then, I bet.$" -Text_185547:: @ 8185547 +Route12_Text_LucaIntro:: @ 8185547 .string "Electricity is my specialty.\p" .string "I don't know a thing about POKéMON\n" .string "of the sea, though.$" -Text_18559B:: @ 818559B +Route12_Text_LucaDefeat:: @ 818559B .string "Unplugged!$" -Text_1855A6:: @ 81855A6 +Route12_Text_LucaPostBattle:: @ 81855A6 .string "Water conducts electricity, so you\n" .string "should zap sea POKéMON.$" -Text_1855E1:: @ 81855E1 +Route12_Text_HankIntro:: @ 81855E1 .string "The FISHING FOOL versus POKéMON\n" .string "KID!$" -Text_185606:: @ 8185606 +Route12_Text_HankDefeat:: @ 8185606 .string "Touch too much!$" -Text_185616:: @ 8185616 +Route12_Text_HankPostBattle:: @ 8185616 .string "I guess you get to be good at\n" .string "what you like.\p" .string "Well, you beat me at POKéMON,\n" .string "but you can't top me at fishing.$" -Text_185682:: @ 8185682 +Route12_Text_ElliotIntro:: @ 8185682 .string "I love fishing, don't get me wrong.\p" .string "But it'd be best if I also had more\n" .string "work.$" -Text_1856D0:: @ 81856D0 +Route12_Text_ElliotDefeat:: @ 81856D0 .string "It's not easy…$" -Text_1856DF:: @ 81856DF +Route12_Text_ElliotPostBattle:: @ 81856DF .string "It's all right.\n" .string "Losing doesn't bug me anymore.$" -Text_18570E:: @ 818570E +Route12_Text_AndrewIntro:: @ 818570E .string "What's catching?\p" .string "You never know what you could\n" .string "catch!$" -Text_185744:: @ 8185744 +Route12_Text_AndrewDefeat:: @ 8185744 .string "Lost it!$" -Text_18574D:: @ 818574D +Route12_Text_AndrewPostBattle:: @ 818574D .string "What, MAGIKARP?\p" .string "I catch them all the time, sure.\n" .string "But, boy are they wimpy.$" @@ -109,3 +109,36 @@ Route12_Text_RouteSign:: @ 8185797 Route12_Text_SportfishingArea:: @ 81857B3 .string "SPORTFISHING AREA$" +Route12_Text_JesIntro:: @ 81857C5 + .string "JES: If I win, I'm going to\n" + .string "propose to GIA.$" + +Route12_Text_JesDefeat:: @ 81857F1 + .string "JES: Oh, please, why couldn't you\n" + .string "let us win?$" + +Route12_Text_JesPostBattle:: @ 818581F + .string "JES: Oh, GIA, forgive me,\n" + .string "my love!$" + +Route12_Text_JesNotEnoughMons:: @ 8185842 + .string "JES: GIA and I, we'll be\n" + .string "together forever.\p" + .string "We won't battle unless you have\n" + .string "two POKéMON of your own.$" + +Route12_Text_GiaIntro:: @ 81858A6 + .string "GIA: Hey, JES…\p" + .string "If we win, I'll marry you!$" + +Route12_Text_GiaDefeat:: @ 81858D0 + .string "GIA: Oh, but why?$" + +Route12_Text_GiaPostBattle:: @ 81858E2 + .string "GIA: JES, you silly!\n" + .string "You ruined this!$" + +Route12_Text_GiaNotEnoughMons:: @ 8185908 + .string "GIA: I can't bear to battle\n" + .string "without my JES!\p" + .string "Don't you have one more POKéMON?$" diff --git a/data/maps/Route12_FishingHouse/map.json b/data/maps/Route12_FishingHouse/map.json index fabd77a97..feab7038d 100644 --- a/data/maps/Route12_FishingHouse/map.json +++ b/data/maps/Route12_FishingHouse/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_12", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { @@ -23,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route12_FishingHouse_EventScript_16FF0C", + "script": "Route12_FishingHouse_EventScript_FishingGuruBrother", "flag": "0" } ], @@ -57,7 +59,7 @@ "x": 9, "y": 1, "elevation": 0, - "script": "Route12_FishingHouse_EventScript_170067" + "script": "Route12_FishingHouse_EventScript_MagikarpRecordSign" } ] } diff --git a/data/maps/Route12_FishingHouse/scripts.inc b/data/maps/Route12_FishingHouse/scripts.inc index e1cd920d7..4b8386a86 100644 --- a/data/maps/Route12_FishingHouse/scripts.inc +++ b/data/maps/Route12_FishingHouse/scripts.inc @@ -1,110 +1,110 @@ Route12_FishingHouse_MapScripts:: @ 816FF0B .byte 0 -Route12_FishingHouse_EventScript_16FF0C:: @ 816FF0C +Route12_FishingHouse_EventScript_FishingGuruBrother:: @ 816FF0C lock faceplayer - goto_if_set FLAG_GOT_SUPER_ROD, EventScript_16FF7F - msgbox gUnknown_819EFE0, MSGBOX_YESNO + goto_if_set FLAG_GOT_SUPER_ROD, Route12_FishingHouse_EventScript_CheckMagikarpRecord + msgbox Route12_FishingHouse_Text_DoYouLikeToFish, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq EventScript_16FF34 - msgbox gUnknown_819F1FA + goto_if_eq Route12_FishingHouse_EventScript_GiveSuperRod + msgbox Route12_FishingHouse_Text_OhThatsDisappointing release end -EventScript_16FF34:: @ 816FF34 +Route12_FishingHouse_EventScript_GiveSuperRod:: @ 816FF34 checkitemspace ITEM_SUPER_ROD, 1 compare VAR_RESULT, FALSE - goto_if_eq EventScript_16FF75 + goto_if_eq Route12_FishingHouse_EventScript_NoRoomForSuperRod additem ITEM_SUPER_ROD - msgbox gUnknown_819F05B - msgreceiveditem gUnknown_819F0B2, ITEM_SUPER_ROD + msgbox Route12_FishingHouse_Text_TakeThisAndFish + msgreceiveditem Route12_FishingHouse_Text_ReceivedSuperRod, ITEM_SUPER_ROD setflag FLAG_GOT_SUPER_ROD - msgbox gUnknown_819F0EB + msgbox Route12_FishingHouse_Text_IfYouCatchBigMagikarpShowMe release end -EventScript_16FF75:: @ 816FF75 - msgbox gUnknown_819F494 +Route12_FishingHouse_EventScript_NoRoomForSuperRod:: @ 816FF75 + msgbox Route12_FishingHouse_Text_NoRoomForGift release end -EventScript_16FF7F:: @ 816FF7F +Route12_FishingHouse_EventScript_CheckMagikarpRecord:: @ 816FF7F goto_if_questlog EventScript_ReleaseEnd special sub_8112364 setvar VAR_0x8004, SPECIES_MAGIKARP specialvar VAR_RESULT, Special_PlayerPartyContainsSpecies - compare VAR_RESULT, 0 - goto_if_eq EventScript_16FFF5 + compare VAR_RESULT, FALSE + goto_if_eq Route12_FishingHouse_EventScript_NoMagikarpInParty special GetMagikarpSizeRecordInfo - msgbox gUnknown_819F2DB + msgbox Route12_FishingHouse_Text_OhMagikarpAllowMeToSee special Special_ChooseMonFromParty waitstate copyvar VAR_RESULT, VAR_0x8004 - compare VAR_RESULT, 6 - goto_if_ge EventScript_16FFFF + compare VAR_RESULT, PARTY_SIZE + goto_if_ge Route12_FishingHouse_EventScript_CancelShowMon special CompareMagikarpSize compare VAR_RESULT, 1 - goto_if_eq EventScript_170001 + goto_if_eq Route12_FishingHouse_EventScript_NotMagikarp compare VAR_RESULT, 2 - goto_if_eq EventScript_17000B + goto_if_eq Route12_FishingHouse_EventScript_NotRecordMagikarp compare VAR_RESULT, 3 - goto_if_eq EventScript_170031 + goto_if_eq Route12_FishingHouse_EventScript_NewRecordMagikarp compare VAR_RESULT, 4 - goto_if_eq EventScript_17001E + goto_if_eq Route12_FishingHouse_EventScript_TieRecordMagikarp release end -EventScript_16FFF5:: @ 816FFF5 - msgbox gUnknown_819F217 +Route12_FishingHouse_EventScript_NoMagikarpInParty:: @ 816FFF5 + msgbox Route12_FishingHouse_Text_TryFishingBringMeMagikarp release end -EventScript_16FFFF:: @ 816FFFF +Route12_FishingHouse_EventScript_CancelShowMon:: @ 816FFFF release end -EventScript_170001:: @ 8170001 - msgbox gUnknown_819F468 +Route12_FishingHouse_EventScript_NotMagikarp:: @ 8170001 + msgbox Route12_FishingHouse_Text_DoesntLookLikeMagikarp release end -EventScript_17000B:: @ 817000B - goto_if_unset FLAG_GOT_RECORD_SETTING_MAGIKARP, EventScript_170031 - msgbox gUnknown_819F40A +Route12_FishingHouse_EventScript_NotRecordMagikarp:: @ 817000B + goto_if_unset FLAG_GOT_RECORD_SETTING_MAGIKARP, Route12_FishingHouse_EventScript_NewRecordMagikarp + msgbox Route12_FishingHouse_Text_HmmXInchesDoesntMeasureUp release end -EventScript_17001E:: @ 817001E - goto_if_unset FLAG_GOT_RECORD_SETTING_MAGIKARP, EventScript_170031 - msgbox gUnknown_819F3CB +Route12_FishingHouse_EventScript_TieRecordMagikarp:: @ 817001E + goto_if_unset FLAG_GOT_RECORD_SETTING_MAGIKARP, Route12_FishingHouse_EventScript_NewRecordMagikarp + msgbox Route12_FishingHouse_Text_HuhXInchesSameSizeAsLast release end -EventScript_170031:: @ 8170031 +Route12_FishingHouse_EventScript_NewRecordMagikarp:: @ 8170031 setflag FLAG_GOT_RECORD_SETTING_MAGIKARP - msgbox gUnknown_819F31B + msgbox Route12_FishingHouse_Text_WhoaXInchesTakeThis giveitem ITEM_NET_BALL - compare VAR_RESULT, 0 - goto_if_eq EventScript_17005D - msgbox gUnknown_819F395 + compare VAR_RESULT, FALSE + goto_if_eq Route12_FishingHouse_EventScript_NoRoomForNetBall + msgbox Route12_FishingHouse_Text_LookForwardToGreaterRecords release end -EventScript_17005D:: @ 817005D - msgbox gUnknown_819F494 +Route12_FishingHouse_EventScript_NoRoomForNetBall:: @ 817005D + msgbox Route12_FishingHouse_Text_NoRoomForGift release end -Route12_FishingHouse_EventScript_170067:: @ 8170067 +Route12_FishingHouse_EventScript_MagikarpRecordSign:: @ 8170067 lockall - goto_if_set FLAG_GOT_RECORD_SETTING_MAGIKARP, EventScript_17007B - msgbox gUnknown_819F50C + goto_if_set FLAG_GOT_RECORD_SETTING_MAGIKARP, Route12_FishingHouse_EventScript_MagikarpRecordSignRecordSet + msgbox Route12_FishingHouse_Text_BlankChartOfSomeSort releaseall end -EventScript_17007B:: @ 817007B +Route12_FishingHouse_EventScript_MagikarpRecordSignRecordSet:: @ 817007B special GetMagikarpSizeRecordInfo - msgbox gUnknown_819F4CF + msgbox Route12_FishingHouse_Text_MostGiganticMagikarpXInches releaseall end diff --git a/data/maps/Route12_FishingHouse/text.inc b/data/maps/Route12_FishingHouse/text.inc index 4f1f3f1fd..efe9b62a6 100644 --- a/data/maps/Route12_FishingHouse/text.inc +++ b/data/maps/Route12_FishingHouse/text.inc @@ -1,20 +1,20 @@ -gUnknown_819EFE0:: @ 819EFE0 +Route12_FishingHouse_Text_DoYouLikeToFish:: @ 819EFE0 .string "I'm the FISHING GURU's younger\n" .string "brother.\p" .string "I simply looove fishing!\n" .string "I can't bear to go without.\p" .string "Tell me, do you like to fish?$" -gUnknown_819F05B:: @ 819F05B +Route12_FishingHouse_Text_TakeThisAndFish:: @ 819F05B .string "Grand! I like your style.\n" .string "I think we can be friends.\p" .string "Take this and fish, young friend!$" -gUnknown_819F0B2:: @ 819F0B2 +Route12_FishingHouse_Text_ReceivedSuperRod:: @ 819F0B2 .string "{PLAYER} received a SUPER ROD from\n" .string "the FISHING GURU's brother.$" -gUnknown_819F0EB:: @ 819F0EB +Route12_FishingHouse_Text_IfYouCatchBigMagikarpShowMe:: @ 819F0EB .string "Fishing is a way of life!\n" .string "It is like the finest poetry.\p" .string "From the seas to rivers, go out\n" @@ -25,11 +25,11 @@ gUnknown_819F0EB:: @ 819F0EB .string "As much as I love to fish, I also\n" .string "love seeing gigantic MAGIKARP.$" -gUnknown_819F1FA:: @ 819F1FA +Route12_FishingHouse_Text_OhThatsDisappointing:: @ 819F1FA .string "Oh…\n" .string "That's so disappointing…$" -gUnknown_819F217:: @ 819F217 +Route12_FishingHouse_Text_TryFishingBringMeMagikarp:: @ 819F217 .string "Hello there, {PLAYER}!\n" .string "Have you been fishing?\p" .string "Try fishing with the SUPER ROD in\n" @@ -39,12 +39,12 @@ gUnknown_819F217:: @ 819F217 .string "Oh, and don't forget to bring me\n" .string "gigantic MAGIKARP.$" -gUnknown_819F2DB:: @ 819F2DB +Route12_FishingHouse_Text_OhMagikarpAllowMeToSee:: @ 819F2DB .string "Oh? {PLAYER}?\n" .string "Why, if it isn't a MAGIKARP!\p" .string "Allow me to see it, quick!$" -gUnknown_819F31B:: @ 819F31B +Route12_FishingHouse_Text_WhoaXInchesTakeThis:: @ 819F31B .string "… … …Whoa!\n" .string "{STR_VAR_2} inches!\p" .string "You have a rare appreciation for\n" @@ -52,37 +52,37 @@ gUnknown_819F31B:: @ 819F31B .string "You must take this.\n" .string "I insist!$" -gUnknown_819F395:: @ 819F395 +Route12_FishingHouse_Text_LookForwardToGreaterRecords:: @ 819F395 .string "I'll look forward to seeing greater\n" .string "records from you!$" -gUnknown_819F3CB:: @ 819F3CB +Route12_FishingHouse_Text_HuhXInchesSameSizeAsLast:: @ 819F3CB .string "Huh?\n" .string "{STR_VAR_2} inches?\p" .string "This is the same size as the one\n" .string "I saw before.$" -gUnknown_819F40A:: @ 819F40A +Route12_FishingHouse_Text_HmmXInchesDoesntMeasureUp:: @ 819F40A .string "Hmm…\n" .string "This one is {STR_VAR_2} inches long.\p" .string "It doesn't measure up to the\n" .string "{STR_VAR_3}-inch one you brought before.$" -gUnknown_819F468:: @ 819F468 +Route12_FishingHouse_Text_DoesntLookLikeMagikarp:: @ 819F468 .string "Uh… That doesn't look much like\n" .string "a MAGIKARP.$" -gUnknown_819F494:: @ 819F494 +Route12_FishingHouse_Text_NoRoomForGift:: @ 819F494 .string "Oh, no!\p" .string "I had a gift for you, but you have\n" .string "no room for it.$" -gUnknown_819F4CF:: @ 819F4CF +Route12_FishingHouse_Text_MostGiganticMagikarpXInches:: @ 819F4CF .string "The most gigantic MAGIKARP\n" .string "I have ever witnessed…\p" .string "{STR_VAR_3} inches!$" -gUnknown_819F50C:: @ 819F50C +Route12_FishingHouse_Text_BlankChartOfSomeSort:: @ 819F50C .string "It's a blank chart of some sort.\p" .string "It has spaces for writing in\n" .string "records of some kind.$" diff --git a/data/maps/Route12_NorthEntrance_1F/map.json b/data/maps/Route12_NorthEntrance_1F/map.json index d06875648..cbbd3261b 100644 --- a/data/maps/Route12_NorthEntrance_1F/map.json +++ b/data/maps/Route12_NorthEntrance_1F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_12", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 1, - "unknown_19": 2, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": false, + "floor_number": 0, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { @@ -23,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route12_NorthEntrance_1F_EventScript_16FE6E", + "script": "Route12_NorthEntrance_1F_EventScript_Guard", "flag": "0" } ], diff --git a/data/maps/Route12_NorthEntrance_1F/scripts.inc b/data/maps/Route12_NorthEntrance_1F/scripts.inc index 990d5f793..a2aa84b00 100644 --- a/data/maps/Route12_NorthEntrance_1F/scripts.inc +++ b/data/maps/Route12_NorthEntrance_1F/scripts.inc @@ -1,6 +1,6 @@ Route12_NorthEntrance_1F_MapScripts:: @ 816FE6D .byte 0 -Route12_NorthEntrance_1F_EventScript_16FE6E:: @ 816FE6E - msgbox gUnknown_819EDA7, MSGBOX_NPC +Route12_NorthEntrance_1F_EventScript_Guard:: @ 816FE6E + msgbox Route12_NorthEntrance_1F_Text_LookoutSpotUpstairs, MSGBOX_NPC end diff --git a/data/maps/Route12_NorthEntrance_1F/text.inc b/data/maps/Route12_NorthEntrance_1F/text.inc index 32f34428f..34dc041f8 100644 --- a/data/maps/Route12_NorthEntrance_1F/text.inc +++ b/data/maps/Route12_NorthEntrance_1F/text.inc @@ -1,4 +1,4 @@ -gUnknown_819EDA7:: @ 819EDA7 +Route12_NorthEntrance_1F_Text_LookoutSpotUpstairs:: @ 819EDA7 .string "There's a lookout spot upstairs.\n" .string "The view is magnificent.$" diff --git a/data/maps/Route12_NorthEntrance_2F/map.json b/data/maps/Route12_NorthEntrance_2F/map.json index f2cf37890..ff83df1b3 100644 --- a/data/maps/Route12_NorthEntrance_2F/map.json +++ b/data/maps/Route12_NorthEntrance_2F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_12", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { @@ -23,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route12_NorthEntrance_2F_EventScript_16FE8A", + "script": "Route12_NorthEntrance_2F_EventScript_Lass", "flag": "0" } ], @@ -43,14 +45,14 @@ "x": 4, "y": 1, "elevation": 0, - "script": "Route12_NorthEntrance_2F_EventScript_16FE78" + "script": "Route12_NorthEntrance_2F_EventScript_LeftBinoculars" }, { "type": "bg_event_type_0", "x": 8, "y": 1, "elevation": 0, - "script": "Route12_NorthEntrance_2F_EventScript_16FE81" + "script": "Route12_NorthEntrance_2F_EventScript_RightBinoculars" } ] } diff --git a/data/maps/Route12_NorthEntrance_2F/scripts.inc b/data/maps/Route12_NorthEntrance_2F/scripts.inc index b9fee6dda..a85398238 100644 --- a/data/maps/Route12_NorthEntrance_2F/scripts.inc +++ b/data/maps/Route12_NorthEntrance_2F/scripts.inc @@ -1,46 +1,46 @@ Route12_NorthEntrance_2F_MapScripts:: @ 816FE77 .byte 0 -Route12_NorthEntrance_2F_EventScript_16FE78:: @ 816FE78 - msgbox gUnknown_819EF5D, MSGBOX_SIGN +Route12_NorthEntrance_2F_EventScript_LeftBinoculars:: @ 816FE78 + msgbox Route12_NorthEntrance_2F_Text_TheresManFishing, MSGBOX_SIGN end -Route12_NorthEntrance_2F_EventScript_16FE81:: @ 816FE81 - msgbox gUnknown_819EFA0, MSGBOX_SIGN +Route12_NorthEntrance_2F_EventScript_RightBinoculars:: @ 816FE81 + msgbox Route12_NorthEntrance_2F_Text_ItsPokemonTower, MSGBOX_SIGN end -Route12_NorthEntrance_2F_EventScript_16FE8A:: @ 816FE8A +Route12_NorthEntrance_2F_EventScript_Lass:: @ 816FE8A lock faceplayer - goto_if_set FLAG_GOT_TM27, EventScript_16FF01 + goto_if_set FLAG_GOT_TM27, Route12_NorthEntrance_2F_EventScript_ExplainTM27 checkplayergender compare VAR_RESULT, MALE - call_if_eq EventScript_16FEE5 + call_if_eq Route12_NorthEntrance_2F_EventScript_TakeTMMale compare VAR_RESULT, FEMALE - call_if_eq EventScript_16FEEE + call_if_eq Route12_NorthEntrance_2F_EventScript_TakeTMFemale checkitemspace ITEM_TM27, 1 compare VAR_RESULT, FALSE - goto_if_eq EventScript_16FEF7 - giveitem_msg gUnknown_819EE9F, ITEM_TM27 - msgbox gUnknown_819EEC6 + goto_if_eq Route12_NorthEntrance_2F_EventScript_NoRoomForTM27 + giveitem_msg Route12_NorthEntrance_2F_Text_ReceivedTM27FromLittleGirl, ITEM_TM27 + msgbox Route12_NorthEntrance_2F_Text_ExplainTM27 setflag FLAG_GOT_TM27 release end -EventScript_16FEE5:: @ 816FEE5 - msgbox gUnknown_819EDE1 +Route12_NorthEntrance_2F_EventScript_TakeTMMale:: @ 816FEE5 + msgbox Route12_NorthEntrance_2F_Text_TakeTMDontNeedAnymoreMale return -EventScript_16FEEE:: @ 816FEEE - msgbox gUnknown_819EE40 +Route12_NorthEntrance_2F_EventScript_TakeTMFemale:: @ 816FEEE + msgbox Route12_NorthEntrance_2F_Text_TakeTMDontNeedAnymoreFemale return -EventScript_16FEF7:: @ 816FEF7 - msgbox gUnknown_819EF3F +Route12_NorthEntrance_2F_EventScript_NoRoomForTM27:: @ 816FEF7 + msgbox Route12_NorthEntrance_2F_Text_DontHaveRoomForThis release end -EventScript_16FF01:: @ 816FF01 - msgbox gUnknown_819EEC6 +Route12_NorthEntrance_2F_EventScript_ExplainTM27:: @ 816FF01 + msgbox Route12_NorthEntrance_2F_Text_ExplainTM27 release end diff --git a/data/maps/Route12_NorthEntrance_2F/text.inc b/data/maps/Route12_NorthEntrance_2F/text.inc index df2ac596b..6e525d6e4 100644 --- a/data/maps/Route12_NorthEntrance_2F/text.inc +++ b/data/maps/Route12_NorthEntrance_2F/text.inc @@ -1,34 +1,35 @@ -gUnknown_819EDE1:: @ 819EDE1 +@ Male and female text identical, differ (presumably) in JP +Route12_NorthEntrance_2F_Text_TakeTMDontNeedAnymoreMale:: @ 819EDE1 .string "My POKéMON's ashes are stored in\n" .string "POKéMON TOWER.\p" .string "You can have this TM.\n" .string "I don't need it anymore…$" -gUnknown_819EE40:: @ 819EE40 +Route12_NorthEntrance_2F_Text_TakeTMDontNeedAnymoreFemale:: @ 819EE40 .string "My POKéMON's ashes are stored in\n" .string "POKéMON TOWER.\p" .string "You can have this TM.\n" .string "I don't need it anymore…$" -gUnknown_819EE9F:: @ 819EE9F +Route12_NorthEntrance_2F_Text_ReceivedTM27FromLittleGirl:: @ 819EE9F .string "{PLAYER} received TM27\n" .string "from the little girl.$" -gUnknown_819EEC6:: @ 819EEC6 +Route12_NorthEntrance_2F_Text_ExplainTM27:: @ 819EEC6 .string "TM27 is a move called RETURN…\p" .string "If you treat your POKéMON good,\n" .string "it will return your love by working\l" .string "its hardest in battle.$" -gUnknown_819EF3F:: @ 819EF3F +Route12_NorthEntrance_2F_Text_DontHaveRoomForThis:: @ 819EF3F .string "You don't have room for this.$" -gUnknown_819EF5D:: @ 819EF5D +Route12_NorthEntrance_2F_Text_TheresManFishing:: @ 819EF5D .string "Let's see what the binoculars have\n" .string "to show…\p" .string "There's a man fishing!$" -gUnknown_819EFA0:: @ 819EFA0 +Route12_NorthEntrance_2F_Text_ItsPokemonTower:: @ 819EFA0 .string "Let's see what the binoculars have\n" .string "to show…\p" .string "It's POKéMON TOWER!$" diff --git a/data/maps/Route13/map.json b/data/maps/Route13/map.json index 2e9f47d52..8386e6996 100644 --- a/data/maps/Route13/map.json +++ b/data/maps/Route13/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_13", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_ROUTE", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_ROUTE12", @@ -34,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route13_EventScript_1AA803", + "script": "Route13_EventScript_Alma", "flag": "0" }, { @@ -47,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route13_EventScript_1AA749", + "script": "Route13_EventScript_Sebastian", "flag": "0" }, { @@ -60,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route13_EventScript_1AA841", + "script": "Route13_EventScript_Susie", "flag": "0" }, { @@ -73,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route13_EventScript_1AA70B", + "script": "Route13_EventScript_Sheila", "flag": "0" }, { @@ -86,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route13_EventScript_1AA6CD", + "script": "Route13_EventScript_Lola", "flag": "0" }, { @@ -99,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route13_EventScript_1AA87F", + "script": "Route13_EventScript_Valerie", "flag": "0" }, { @@ -112,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route13_EventScript_1AA8BD", + "script": "Route13_EventScript_Gwen", "flag": "0" }, { @@ -125,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route13_EventScript_1AA7C5", + "script": "Route13_EventScript_Robert", "flag": "0" }, { @@ -138,7 +140,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route13_EventScript_1AA787", + "script": "Route13_EventScript_Perry", "flag": "0" }, { @@ -151,7 +153,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route13_EventScript_1AA68F", + "script": "Route13_EventScript_Jared", "flag": "0" }, { @@ -176,21 +178,21 @@ "x": 41, "y": 12, "elevation": 0, - "script": "Route13_EventScript_1680C8" + "script": "Route13_EventScript_RouteSign" }, { "type": "bg_event_type_0", "x": 37, "y": 6, "elevation": 0, - "script": "Route13_EventScript_1680BF" + "script": "Route13_EventScript_TrainerTips2" }, { "type": "bg_event_type_0", "x": 21, "y": 14, "elevation": 0, - "script": "Route13_EventScript_1680B6" + "script": "Route13_EventScript_TrainerTips1" }, { "type": "hidden_item", diff --git a/data/maps/Route13/scripts.inc b/data/maps/Route13/scripts.inc index 6524d5dd6..9cedaa23f 100644 --- a/data/maps/Route13/scripts.inc +++ b/data/maps/Route13/scripts.inc @@ -1,14 +1,14 @@ Route13_MapScripts:: @ 81680B5 .byte 0 -Route13_EventScript_1680B6:: @ 81680B6 - msgbox gUnknown_8185DB7, MSGBOX_SIGN +Route13_EventScript_TrainerTips1:: @ 81680B6 + msgbox Route13_Text_LookToLeftOfThatPost, MSGBOX_SIGN end -Route13_EventScript_1680BF:: @ 81680BF - msgbox gUnknown_8185DEF, MSGBOX_SIGN +Route13_EventScript_TrainerTips2:: @ 81680BF + msgbox Route13_Text_SelectToSwitchItems, MSGBOX_SIGN end -Route13_EventScript_1680C8:: @ 81680C8 - msgbox gUnknown_8185E2C, MSGBOX_SIGN +Route13_EventScript_RouteSign:: @ 81680C8 + msgbox Route13_Text_RouteSign, MSGBOX_SIGN end diff --git a/data/maps/Route13/text.inc b/data/maps/Route13/text.inc index 1b570d424..edf58209c 100644 --- a/data/maps/Route13/text.inc +++ b/data/maps/Route13/text.inc @@ -1,162 +1,128 @@ -Text_1857C5:: @ 81857C5 - .string "JES: If I win, I'm going to\n" - .string "propose to GIA.$" - -Text_1857F1:: @ 81857F1 - .string "JES: Oh, please, why couldn't you\n" - .string "let us win?$" - -Text_18581F:: @ 818581F - .string "JES: Oh, GIA, forgive me,\n" - .string "my love!$" - -Text_185842:: @ 8185842 - .string "JES: GIA and I, we'll be\n" - .string "together forever.\p" - .string "We won't battle unless you have\n" - .string "two POKéMON of your own.$" - -Text_1858A6:: @ 81858A6 - .string "GIA: Hey, JES…\p" - .string "If we win, I'll marry you!$" - -Text_1858D0:: @ 81858D0 - .string "GIA: Oh, but why?$" - -Text_1858E2:: @ 81858E2 - .string "GIA: JES, you silly!\n" - .string "You ruined this!$" - -Text_185908:: @ 8185908 - .string "GIA: I can't bear to battle\n" - .string "without my JES!\p" - .string "Don't you have one more POKéMON?$" - -Text_185955:: @ 8185955 +Route13_Text_SebastianIntro:: @ 8185955 .string "My bird POKéMON want to battle\n" .string "with you!$" -Text_18597E:: @ 818597E +Route13_Text_SebastianDefeat:: @ 818597E .string "My PIDGEY and PIDGEOTTO combo\n" .string "lost?$" -Text_1859A2:: @ 81859A2 +Route13_Text_SebastianPostBattle:: @ 81859A2 .string "My POKéMON look happy even though\n" .string "they lost.$" -Text_1859CF:: @ 81859CF +Route13_Text_SusieIntro:: @ 81859CF .string "I'm told I'm good for a kid.$" -Text_1859EC:: @ 81859EC +Route13_Text_SusieDefeat:: @ 81859EC .string "Ohh!\n" .string "I lost!$" -Text_1859F9:: @ 81859F9 +Route13_Text_SusiePostBattle:: @ 81859F9 .string "I want to become a good TRAINER.\n" .string "I'll train hard, just watch.$" -Text_185A37:: @ 8185A37 +Route13_Text_ValerieIntro:: @ 8185A37 .string "Wow!\n" .string "Your BADGES are too cool!$" -Text_185A56:: @ 8185A56 +Route13_Text_ValerieDefeat:: @ 8185A56 .string "Not enough!$" -Text_185A62:: @ 8185A62 +Route13_Text_ValeriePostBattle:: @ 8185A62 .string "You got those BADGES from GYM\n" .string "LEADERS. I know!$" -Text_185A91:: @ 8185A91 +Route13_Text_GwenIntro:: @ 8185A91 .string "My cute POKéMON wish to make your\n" .string "acquaintance.$" -Text_185AC1:: @ 8185AC1 +Route13_Text_GwenDefeat:: @ 8185AC1 .string "Good going!\n" .string "You totally won!$" -Text_185ADE:: @ 8185ADE +Route13_Text_GwenPostBattle:: @ 8185ADE .string "You have to make POKéMON battle\n" .string "to toughen them up.$" -Text_185B12:: @ 8185B12 +Route13_Text_AlmaIntro:: @ 8185B12 .string "I found CARBOS in a cave once\n" .string "while I was spelunking.$" -Text_185B48:: @ 8185B48 +Route13_Text_AlmaDefeat:: @ 8185B48 .string "Oh, too bad!\n" .string "I just messed up!$" -Text_185B67:: @ 8185B67 +Route13_Text_AlmaPostBattle:: @ 8185B67 .string "CARBOS boosted the SPEED of my\n" .string "POKéMON.$" -Text_185B8F:: @ 8185B8F +Route13_Text_PerryIntro:: @ 8185B8F .string "I'm not going to lose.\n" .string "Not when the wind's blowing my way!$" -Text_185BCA:: @ 8185BCA +Route13_Text_PerryDefeat:: @ 8185BCA .string "The wind turned!$" -Text_185BDB:: @ 8185BDB +Route13_Text_PerryPostBattle:: @ 8185BDB .string "I'm beat.\n" .string "I guess I'll FLY home.$" -Text_185BFC:: @ 8185BFC +Route13_Text_LolaIntro:: @ 8185BFC .string "Sure, I'll play with you, sweetie.$" -Text_185C1F:: @ 8185C1F +Route13_Text_LolaDefeat:: @ 8185C1F .string "Oh!\n" .string "You little beast!$" -Text_185C35:: @ 8185C35 +Route13_Text_LolaPostBattle:: @ 8185C35 .string "I wonder which is stronger, male or\n" .string "female POKéMON?$" -Text_185C69:: @ 8185C69 +Route13_Text_SheilaIntro:: @ 8185C69 .string "Do you want to battle some\n" .string "POKéMON with me?$" -Text_185C95:: @ 8185C95 +Route13_Text_SheilaDefeat:: @ 8185C95 .string "It's over already?$" -Text_185CA8:: @ 8185CA8 +Route13_Text_SheilaPostBattle:: @ 8185CA8 .string "I don't know anything about\n" .string "POKéMON actually.\p" .string "The ones I use… I picked them\n" .string "for their looks!$" -Text_185D05:: @ 8185D05 +Route13_Text_JaredIntro:: @ 8185D05 .string "What're you lookin' at?$" -Text_185D1D:: @ 8185D1D +Route13_Text_JaredDefeat:: @ 8185D1D .string "Dang!\n" .string "Stripped gears!$" -Text_185D33:: @ 8185D33 +Route13_Text_JaredPostBattle:: @ 8185D33 .string "Get lost!$" -Text_185D3D:: @ 8185D3D +Route13_Text_RobertIntro:: @ 8185D3D .string "I always go with bird POKéMON.\n" .string "I've dedicated myself to them.$" -Text_185D7B:: @ 8185D7B +Route13_Text_RobertDefeat:: @ 8185D7B .string "Out of power!$" -Text_185D89:: @ 8185D89 +Route13_Text_RobertPostBattle:: @ 8185D89 .string "I wish I could fly like PIDGEY and\n" .string "PIDGEOTTO…$" -gUnknown_8185DB7:: @ 8185DB7 +Route13_Text_LookToLeftOfThatPost:: @ 8185DB7 .string "TRAINER TIPS\p" .string "Look, look!\n" .string "Look to the left of that post!$" -gUnknown_8185DEF:: @ 8185DEF +Route13_Text_SelectToSwitchItems:: @ 8185DEF .string "TRAINER TIPS\p" .string "Use SELECT to switch items in the\n" .string "ITEMS window.$" -gUnknown_8185E2C:: @ 8185E2C +Route13_Text_RouteSign:: @ 8185E2C .string "ROUTE 13\n" .string "North to SILENCE BRIDGE$" diff --git a/data/maps/Route14/map.json b/data/maps/Route14/map.json index cf88cbf8a..13259af36 100644 --- a/data/maps/Route14/map.json +++ b/data/maps/Route14/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_14", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_ROUTE", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_ROUTE15", @@ -34,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "Route14_EventScript_1AA9B5", + "script": "Route14_EventScript_Gerald", "flag": "0" }, { @@ -47,7 +49,7 @@ "movement_range_y": 2, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route14_EventScript_1AA9F3", + "script": "Route14_EventScript_Donald", "flag": "0" }, { @@ -60,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "Route14_EventScript_1AAAEB", + "script": "Route14_EventScript_Beck", "flag": "0" }, { @@ -73,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route14_EventScript_1AAB29", + "script": "Route14_EventScript_Marlon", "flag": "0" }, { @@ -86,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "Route14_EventScript_1AA977", + "script": "Route14_EventScript_Isaac", "flag": "0" }, { @@ -99,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "Route14_EventScript_1AA8FB", + "script": "Route14_EventScript_Malik", "flag": "0" }, { @@ -112,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route14_EventScript_1AAAAD", + "script": "Route14_EventScript_Mitch", "flag": "0" }, { @@ -125,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route14_EventScript_1AAA6F", + "script": "Route14_EventScript_Carter", "flag": "0" }, { @@ -138,7 +140,7 @@ "movement_range_y": 6, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route14_EventScript_1AA939", + "script": "Route14_EventScript_Lukas", "flag": "0" }, { @@ -151,7 +153,7 @@ "movement_range_y": 2, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route14_EventScript_1AAA31", + "script": "Route14_EventScript_Benny", "flag": "0" }, { @@ -203,7 +205,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route14_EventScript_1AABAD", + "script": "Route14_EventScript_Jan", "flag": "0" }, { @@ -216,7 +218,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route14_EventScript_1AAB67", + "script": "Route14_EventScript_Kiri", "flag": "0" } ], @@ -228,7 +230,7 @@ "x": 17, "y": 12, "elevation": 0, - "script": "Route14_EventScript_1680D2" + "script": "Route14_EventScript_RouteSign" }, { "type": "hidden_item", diff --git a/data/maps/Route14/scripts.inc b/data/maps/Route14/scripts.inc index 551940250..46e3774ee 100644 --- a/data/maps/Route14/scripts.inc +++ b/data/maps/Route14/scripts.inc @@ -1,6 +1,6 @@ Route14_MapScripts:: @ 81680D1 .byte 0 -Route14_EventScript_1680D2:: @ 81680D2 - msgbox gUnknown_8186399, MSGBOX_SIGN +Route14_EventScript_RouteSign:: @ 81680D2 + msgbox Route14_Text_RouteSign, MSGBOX_SIGN end diff --git a/data/maps/Route14/text.inc b/data/maps/Route14/text.inc index 37008ab3b..320c250ee 100644 --- a/data/maps/Route14/text.inc +++ b/data/maps/Route14/text.inc @@ -1,126 +1,156 @@ -Text_185E4D:: @ 8185E4D +Route14_Text_CarterIntro:: @ 8185E4D .string "You need to use TMs to teach good\n" .string "moves to POKéMON.$" -Text_185E81:: @ 8185E81 +Route14_Text_CarterDefeat:: @ 8185E81 .string "Not good enough quite yet.$" -Text_185E9C:: @ 8185E9C +Route14_Text_CarterPostBattle:: @ 8185E9C .string "You have some HMs, right? POKéMON\n" .string "can't forget those moves easily.$" -Text_185EDF:: @ 8185EDF +Route14_Text_MitchIntro:: @ 8185EDF .string "My bird POKéMON should be ready\n" .string "for battle.$" -Text_185F0B:: @ 8185F0B +Route14_Text_MitchDefeat:: @ 8185F0B .string "Not ready yet!$" -Text_185F1A:: @ 8185F1A +Route14_Text_MitchPostBattle:: @ 8185F1A .string "My bird POKéMON need to learn\n" .string "better moves.$" -Text_185F46:: @ 8185F46 +Route14_Text_BeckIntro:: @ 8185F46 .string "They have TMs on sale at the\n" .string "CELADON DEPT. STORE.\p" .string "TMs aren't really rare, but not\n" .string "many people have HMs.$" -Text_185FAE:: @ 8185FAE +Route14_Text_BeckDefeat:: @ 8185FAE .string "Aww, bummer!$" -Text_185FBB:: @ 8185FBB +Route14_Text_BeckPostBattle:: @ 8185FBB .string "Try teaching POKéMON a move that's\n" .string "the same type as it.\p" .string "That apparently boosts the power\n" .string "of the move.$" -Text_186021:: @ 8186021 +Route14_Text_MarlonIntro:: @ 8186021 .string "Have you taught your bird POKéMON\n" .string "how to FLY?\p" .string "You'll be able to soar with it into\n" .string "the sky!$" -Text_18607C:: @ 818607C +Route14_Text_MarlonDefeat:: @ 818607C .string "Shot down in flames!$" -Text_186091:: @ 8186091 +Route14_Text_MarlonPostBattle:: @ 8186091 .string "Bird POKéMON are my one true love.\n" .string "I don't want to raise anything else.$" -Text_1860D9:: @ 81860D9 +Route14_Text_DonaldIntro:: @ 81860D9 .string "Have you heard the legend of the\n" .string "winged mirages?$" -Text_18610A:: @ 818610A +Route14_Text_DonaldDefeat:: @ 818610A .string "Why?\n" .string "Why'd I lose?$" -Text_18611D:: @ 818611D +Route14_Text_DonaldPostBattle:: @ 818611D .string "Well, the winged mirages are the\n" .string "legendary bird POKéMON.\p" .string "There are three of them: ARTICUNO,\n" .string "ZAPDOS, and MOLTRES.$" -Text_18618E:: @ 818618E +Route14_Text_BennyIntro:: @ 818618E .string "I'm not into it, but okay.\n" .string "Let's go!$" -Text_1861B3:: @ 81861B3 +Route14_Text_BennyDefeat:: @ 81861B3 .string "I knew it!$" -Text_1861BE:: @ 81861BE +Route14_Text_BennyPostBattle:: @ 81861BE .string "Winning, losing… It's insignificant\n" .string "under this huge sky.$" -Text_1861F7:: @ 81861F7 +Route14_Text_LukasIntro:: @ 81861F7 .string "C'mon, c'mon.\n" .string "Let's go, let's go, let's go!$" -Text_186223:: @ 8186223 +Route14_Text_LukasDefeat:: @ 8186223 .string "Arrg!\n" .string "Lost! Get lost!$" -Text_186239:: @ 8186239 +Route14_Text_LukasPostBattle:: @ 8186239 .string "What, what, what?\n" .string "What do you want still?$" -Text_186263:: @ 8186263 +Route14_Text_IsaacIntro:: @ 8186263 .string "I need to burn some time.\n" .string "Shut up and battle.$" -Text_186291:: @ 8186291 +Route14_Text_IsaacDefeat:: @ 8186291 .string "What?\n" .string "You!?$" -Text_18629D:: @ 818629D +Route14_Text_IsaacPostBattle:: @ 818629D .string "Raising POKéMON is a drag, man.$" -Text_1862BD:: @ 81862BD +Route14_Text_GeraldIntro:: @ 81862BD .string "We ride out here because of the\n" .string "wide-open spaces.$" -Text_1862EF:: @ 81862EF +Route14_Text_GeraldDefeat:: @ 81862EF .string "Wipeout!$" -Text_1862F8:: @ 81862F8 +Route14_Text_GeraldPostBattle:: @ 81862F8 .string "It's cool you made your POKéMON so\n" .string "strong.\p" .string "Might is right!\n" .string "And you know it!$" -Text_186344:: @ 8186344 +Route14_Text_MalikIntro:: @ 8186344 .string "POKéMON battle?\n" .string "Cool! Rumble!$" -Text_186362:: @ 8186362 +Route14_Text_MalikDefeat:: @ 8186362 .string "Blown away!$" -Text_18636E:: @ 818636E +Route14_Text_MalikPostBattle:: @ 818636E .string "You know who'd win, you and me\n" .string "one-on-one!$" -gUnknown_8186399:: @ 8186399 +Route14_Text_RouteSign:: @ 8186399 .string "ROUTE 14\n" .string "West to FUCHSIA CITY$" +Route14_Text_KiriIntro:: @ 81863B7 + .string "KIRI: JAN, let's try really,\n" + .string "really hard together.$" + +Route14_Text_KiriDefeat:: @ 81863EA + .string "KIRI: Whimper…\n" + .string "We lost, didn't we?$" + +Route14_Text_KiriPostBattle:: @ 818640D + .string "KIRI: Did we lose because of me?$" + +Route14_Text_KiriNotEnoughMons:: @ 818642E + .string "KIRI: We can battle if you have\n" + .string "two POKéMON.$" + +Route14_Text_JanIntro:: @ 818645B + .string "JAN: KIRI, here we go!\n" + .string "We have to try hard!$" + +Route14_Text_JanDefeat:: @ 8186487 + .string "JAN: Eeeeh!\n" + .string "No fair!$" + +Route14_Text_JanPostBattle:: @ 818649C + .string "JAN: KIRI, don't cry!\n" + .string "We'll just try harder next time.$" + +Route14_Text_JanNotEnoughMons:: @ 81864D3 + .string "JAN: You want to battle?\n" + .string "You don't have enough POKéMON.$" diff --git a/data/maps/Route15/map.json b/data/maps/Route15/map.json index 12670bc16..bc368ca01 100644 --- a/data/maps/Route15/map.json +++ b/data/maps/Route15/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_15", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_ROUTE", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_FUCHSIA_CITY", diff --git a/data/maps/Route15/text.inc b/data/maps/Route15/text.inc index 34e3a0c60..33c60e7dc 100644 --- a/data/maps/Route15/text.inc +++ b/data/maps/Route15/text.inc @@ -1,34 +1,3 @@ -Text_1863B7:: @ 81863B7 - .string "KIRI: JAN, let's try really,\n" - .string "really hard together.$" - -Text_1863EA:: @ 81863EA - .string "KIRI: Whimper…\n" - .string "We lost, didn't we?$" - -Text_18640D:: @ 818640D - .string "KIRI: Did we lose because of me?$" - -Text_18642E:: @ 818642E - .string "KIRI: We can battle if you have\n" - .string "two POKéMON.$" - -Text_18645B:: @ 818645B - .string "JAN: KIRI, here we go!\n" - .string "We have to try hard!$" - -Text_186487:: @ 8186487 - .string "JAN: Eeeeh!\n" - .string "No fair!$" - -Text_18649C:: @ 818649C - .string "JAN: KIRI, don't cry!\n" - .string "We'll just try harder next time.$" - -Text_1864D3:: @ 81864D3 - .string "JAN: You want to battle?\n" - .string "You don't have enough POKéMON.$" - Text_18650B:: @ 818650B .string "I just got some POKéMON in trades.\n" .string "Can I try them out on you?$" @@ -151,3 +120,35 @@ gUnknown_8186A77:: @ 8186A77 .string "ROUTE 15\n" .string "West to FUCHSIA CITY$" +Text_186A95:: @ 8186A95 + .string "MYA: You're perfect.\n" + .string "Help me train my little brother?$" + +Text_186ACB:: @ 8186ACB + .string "MYA: RON, you have to focus!\n" + .string "Concentrate on what you're doing!$" + +Text_186B0A:: @ 8186B0A + .string "MYA: Okay, we'll turn it up.\n" + .string "I'll add to our training menu!$" + +Text_186B46:: @ 8186B46 + .string "MYA: Do you want to challenge us?\n" + .string "You'll need two POKéMON, though.$" + +Text_186B89:: @ 8186B89 + .string "RON: My sister gets scary when we\n" + .string "lose.$" + +Text_186BB1:: @ 8186BB1 + .string "RON: Oh, no, no…\n" + .string "Sis, I'm sorry!$" + +Text_186BD2:: @ 8186BD2 + .string "RON: Oh, bleah…\n" + .string "I wish I had a nice sister…$" + +Text_186BFE:: @ 8186BFE + .string "RON: Did you want to battle with\n" + .string "my sister and me?\p" + .string "You need two POKéMON, then.$" diff --git a/data/maps/Route15_WestEntrance_1F/map.json b/data/maps/Route15_WestEntrance_1F/map.json index a9d8b8244..0959512a2 100644 --- a/data/maps/Route15_WestEntrance_1F/map.json +++ b/data/maps/Route15_WestEntrance_1F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_15", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 1, - "unknown_19": 2, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": false, + "floor_number": 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 8a4510422..1d21cd2b1 100644 --- a/data/maps/Route15_WestEntrance_2F/map.json +++ b/data/maps/Route15_WestEntrance_2F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_15", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 bd32e6900..0dd47cbc6 100644 --- a/data/maps/Route16/map.json +++ b/data/maps/Route16/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_16", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_ROUTE", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_ROUTE17", diff --git a/data/maps/Route16/text.inc b/data/maps/Route16/text.inc index 289b80db9..5131934b1 100644 --- a/data/maps/Route16/text.inc +++ b/data/maps/Route16/text.inc @@ -1,36 +1,3 @@ -Text_186A95:: @ 8186A95 - .string "MYA: You're perfect.\n" - .string "Help me train my little brother?$" - -Text_186ACB:: @ 8186ACB - .string "MYA: RON, you have to focus!\n" - .string "Concentrate on what you're doing!$" - -Text_186B0A:: @ 8186B0A - .string "MYA: Okay, we'll turn it up.\n" - .string "I'll add to our training menu!$" - -Text_186B46:: @ 8186B46 - .string "MYA: Do you want to challenge us?\n" - .string "You'll need two POKéMON, though.$" - -Text_186B89:: @ 8186B89 - .string "RON: My sister gets scary when we\n" - .string "lose.$" - -Text_186BB1:: @ 8186BB1 - .string "RON: Oh, no, no…\n" - .string "Sis, I'm sorry!$" - -Text_186BD2:: @ 8186BD2 - .string "RON: Oh, bleah…\n" - .string "I wish I had a nice sister…$" - -Text_186BFE:: @ 8186BFE - .string "RON: Did you want to battle with\n" - .string "my sister and me?\p" - .string "You need two POKéMON, then.$" - Text_186C4D:: @ 8186C4D .string "What do you want?$" @@ -111,3 +78,36 @@ Route16_Text_RouteSign:: @ 8186F98 .string "ROUTE 16\n" .string "CELADON CITY - FUCHSIA CITY$" +Text_186FBD:: @ 8186FBD + .string "JED: Our love knows no bounds.\n" + .string "We're in love and we show it!$" + +Text_186FFA:: @ 8186FFA + .string "JED: Oh, no!\n" + .string "My love has seen me as a loser!$" + +Text_187027:: @ 8187027 + .string "JED: Listen, LEA.\n" + .string "You need to focus less on me.$" + +Text_187057:: @ 8187057 + .string "JED: You have just one POKéMON?\n" + .string "Is there no love in your heart?$" + +Text_187097:: @ 8187097 + .string "LEA: Sometimes, the intensity of\n" + .string "our love scares me.$" + +Text_1870CC:: @ 81870CC + .string "LEA: Ohh! But JED looks cool\n" + .string "even in a loss!$" + +Text_1870F9:: @ 81870F9 + .string "LEA: Ehehe, I'm sorry.\n" + .string "JED is so cool.$" + +Text_187120:: @ 8187120 + .string "LEA: Oh, you don't have two\n" + .string "POKéMON with you?\p" + .string "Doesn't it feel lonely for you or\n" + .string "your POKéMON?$" diff --git a/data/maps/Route16_House/map.json b/data/maps/Route16_House/map.json index 60c5f6598..dc0d416f4 100644 --- a/data/maps/Route16_House/map.json +++ b/data/maps/Route16_House/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_16", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 af13722a7..b9425a4a6 100644 --- a/data/maps/Route16_NorthEntrance_1F/map.json +++ b/data/maps/Route16_NorthEntrance_1F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_16", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 1, - "unknown_19": 2, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": false, + "floor_number": 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 4dddd5b6d..551fb5e7a 100644 --- a/data/maps/Route16_NorthEntrance_2F/map.json +++ b/data/maps/Route16_NorthEntrance_2F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_16", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 57006827d..1afe3a6bf 100644 --- a/data/maps/Route17/map.json +++ b/data/maps/Route17/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_17", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_ROUTE", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_ROUTE16", diff --git a/data/maps/Route17/text.inc b/data/maps/Route17/text.inc index 6627d5cd0..eff5f0726 100644 --- a/data/maps/Route17/text.inc +++ b/data/maps/Route17/text.inc @@ -1,37 +1,3 @@ -Text_186FBD:: @ 8186FBD - .string "JED: Our love knows no bounds.\n" - .string "We're in love and we show it!$" - -Text_186FFA:: @ 8186FFA - .string "JED: Oh, no!\n" - .string "My love has seen me as a loser!$" - -Text_187027:: @ 8187027 - .string "JED: Listen, LEA.\n" - .string "You need to focus less on me.$" - -Text_187057:: @ 8187057 - .string "JED: You have just one POKéMON?\n" - .string "Is there no love in your heart?$" - -Text_187097:: @ 8187097 - .string "LEA: Sometimes, the intensity of\n" - .string "our love scares me.$" - -Text_1870CC:: @ 81870CC - .string "LEA: Ohh! But JED looks cool\n" - .string "even in a loss!$" - -Text_1870F9:: @ 81870F9 - .string "LEA: Ehehe, I'm sorry.\n" - .string "JED is so cool.$" - -Text_187120:: @ 8187120 - .string "LEA: Oh, you don't have two\n" - .string "POKéMON with you?\p" - .string "Doesn't it feel lonely for you or\n" - .string "your POKéMON?$" - Text_18717E:: @ 818717E .string "There's no getting rich quick in\n" .string "battling kids.$" diff --git a/data/maps/Route18/map.json b/data/maps/Route18/map.json index 5e89b3f8c..6dd7673de 100644 --- a/data/maps/Route18/map.json +++ b/data/maps/Route18/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_18", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_ROUTE", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 673241e1b..741c391f7 100644 --- a/data/maps/Route18_EastEntrance_1F/map.json +++ b/data/maps/Route18_EastEntrance_1F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_18", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 1, - "unknown_19": 2, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": false, + "floor_number": 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 1865cfa7f..052fe0215 100644 --- a/data/maps/Route18_EastEntrance_2F/map.json +++ b/data/maps/Route18_EastEntrance_2F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_18", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 308f98b54..abb670524 100644 --- a/data/maps/Route19/map.json +++ b/data/maps/Route19/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_19", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_ROUTE", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_FUCHSIA_CITY", diff --git a/data/maps/Route19/text.inc b/data/maps/Route19/text.inc index a76ff89d7..7d399f364 100644 --- a/data/maps/Route19/text.inc +++ b/data/maps/Route19/text.inc @@ -117,3 +117,38 @@ gUnknown_8187C06:: @ 8187C06 .string "SEA ROUTE 19\n" .string "FUCHSIA CITY - SEAFOAM ISLANDS$" +Text_187C32:: @ 8187C32 + .string "LIA: I'm looking after my brother.\n" + .string "He just became a TRAINER.$" + +Text_187C6F:: @ 8187C6F + .string "LIA: That's no way to treat my\n" + .string "little brother!$" + +Text_187C9E:: @ 8187C9E + .string "LIA: Do you have a younger\n" + .string "brother?\p" + .string "I hope you're teaching him all\n" + .string "sorts of things.$" + +Text_187CF2:: @ 8187CF2 + .string "LIA: I want to battle together\n" + .string "with my little brother.\p" + .string "Don't you have two POKéMON?$" + +Text_187D45:: @ 8187D45 + .string "LUC: My big sis taught me how\n" + .string "to swim and train POKéMON.$" + +Text_187D7E:: @ 8187D7E + .string "LUC: Oh, wow!\n" + .string "Someone tougher than my big sis!$" + +Text_187DAD:: @ 8187DAD + .string "LUC: My big sis is strong and nice.\n" + .string "I think she's awesome!$" + +Text_187DE8:: @ 8187DE8 + .string "LUC: I don't want to if I can't\n" + .string "battle you with my big sis.\p" + .string "Don't you have two POKéMON?$" diff --git a/data/maps/Route2/map.json b/data/maps/Route2/map.json index 86be51055..008be4a9f 100644 --- a/data/maps/Route2/map.json +++ b/data/maps/Route2/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_2", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_ROUTE", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 3ce14e08d..e97d95544 100644 --- a/data/maps/Route20/map.json +++ b/data/maps/Route20/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_20", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_ROUTE", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_CINNABAR_ISLAND", diff --git a/data/maps/Route20/text.inc b/data/maps/Route20/text.inc index 070575cc7..3abceaeba 100644 --- a/data/maps/Route20/text.inc +++ b/data/maps/Route20/text.inc @@ -1,39 +1,3 @@ -Text_187C32:: @ 8187C32 - .string "LIA: I'm looking after my brother.\n" - .string "He just became a TRAINER.$" - -Text_187C6F:: @ 8187C6F - .string "LIA: That's no way to treat my\n" - .string "little brother!$" - -Text_187C9E:: @ 8187C9E - .string "LIA: Do you have a younger\n" - .string "brother?\p" - .string "I hope you're teaching him all\n" - .string "sorts of things.$" - -Text_187CF2:: @ 8187CF2 - .string "LIA: I want to battle together\n" - .string "with my little brother.\p" - .string "Don't you have two POKéMON?$" - -Text_187D45:: @ 8187D45 - .string "LUC: My big sis taught me how\n" - .string "to swim and train POKéMON.$" - -Text_187D7E:: @ 8187D7E - .string "LUC: Oh, wow!\n" - .string "Someone tougher than my big sis!$" - -Text_187DAD:: @ 8187DAD - .string "LUC: My big sis is strong and nice.\n" - .string "I think she's awesome!$" - -Text_187DE8:: @ 8187DE8 - .string "LUC: I don't want to if I can't\n" - .string "battle you with my big sis.\p" - .string "Don't you have two POKéMON?$" - Text_187E40:: @ 8187E40 .string "The water is shallow here.\n" .string "There are many people swimming.$" @@ -149,3 +113,8 @@ Text_18827B:: @ 818827B gUnknown_81882D1:: @ 81882D1 .string "SEAFOAM ISLANDS$" +Text_1882E1:: @ 81882E1 + .string "Strong TRAINERS and WATER POKéMON\n" + .string "are common sights in these parts.\p" + .string "They say that MISTY of the\n" + .string "CERULEAN GYM trains here.$" diff --git a/data/maps/Route21_North/map.json b/data/maps/Route21_North/map.json index 2bc8bcad8..06767be42 100644 --- a/data/maps/Route21_North/map.json +++ b/data/maps/Route21_North/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_21", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_ROUTE", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_PALLET_TOWN", diff --git a/data/maps/Route21_North/text.inc b/data/maps/Route21_North/text.inc index e8fc3223a..ad1ec12d3 100644 --- a/data/maps/Route21_North/text.inc +++ b/data/maps/Route21_North/text.inc @@ -1,9 +1,3 @@ -Text_1882E1:: @ 81882E1 - .string "Strong TRAINERS and WATER POKéMON\n" - .string "are common sights in these parts.\p" - .string "They say that MISTY of the\n" - .string "CERULEAN GYM trains here.$" - Text_18835A:: @ 818835A .string "You want to know if the fish are\n" .string "biting?$" diff --git a/data/maps/Route21_South/map.json b/data/maps/Route21_South/map.json index 90da7a10b..ef022d513 100644 --- a/data/maps/Route21_South/map.json +++ b/data/maps/Route21_South/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_21", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_ROUTE", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 e8695121f..41aedc6e0 100644 --- a/data/maps/Route22/map.json +++ b/data/maps/Route22/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_22", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_ROUTE", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 f8f624106..20414c25f 100644 --- a/data/maps/Route22_NorthEntrance/map.json +++ b/data/maps/Route22_NorthEntrance/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_22", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 36bee2780..145f20cf3 100644 --- a/data/maps/Route23/map.json +++ b/data/maps/Route23/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_23", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_ROUTE", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 d87b68895..5fa15ddb3 100644 --- a/data/maps/Route24/map.json +++ b/data/maps/Route24/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_24", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_ROUTE", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 d49d76361..88d68ca07 100644 --- a/data/maps/Route25/map.json +++ b/data/maps/Route25/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_25", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_ROUTE", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 01cf8021f..8e4ac79c6 100644 --- a/data/maps/Route25_SeaCottage/map.json +++ b/data/maps/Route25_SeaCottage/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_25", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 e966962c6..613f1d207 100644 --- a/data/maps/Route2_EastBuilding/map.json +++ b/data/maps/Route2_EastBuilding/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_2", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 1, - "unknown_19": 2, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": false, + "floor_number": 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 8f9785c33..fdf66afb1 100644 --- a/data/maps/Route2_House/map.json +++ b/data/maps/Route2_House/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_2", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 7f4225d23..478b3045e 100644 --- a/data/maps/Route2_ViridianForest_NorthEntrance/map.json +++ b/data/maps/Route2_ViridianForest_NorthEntrance/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_2", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 1, - "unknown_19": 2, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": false, + "floor_number": 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 4e0ad0164..17e756798 100644 --- a/data/maps/Route2_ViridianForest_SouthEntrance/map.json +++ b/data/maps/Route2_ViridianForest_SouthEntrance/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_2", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 1, - "unknown_19": 2, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": false, + "floor_number": 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 f2ad40c5e..7651e395a 100644 --- a/data/maps/Route3/map.json +++ b/data/maps/Route3/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_3", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_ROUTE", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_ROUTE4", @@ -34,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route3_EventScript_167F78", + "script": "Route3_EventScript_Youngster", "flag": "0" }, { @@ -47,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route3_EventScript_1A957B", + "script": "Route3_EventScript_Robin", "flag": "0" }, { @@ -60,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "Route3_EventScript_1A94C1", + "script": "Route3_EventScript_James", "flag": "0" }, { @@ -73,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "Route3_EventScript_1A953D", + "script": "Route3_EventScript_Sally", "flag": "0" }, { @@ -86,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "Route3_EventScript_1A9483", + "script": "Route3_EventScript_Greg", "flag": "0" }, { @@ -99,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "Route3_EventScript_1A9407", + "script": "Route3_EventScript_Calvin", "flag": "0" }, { @@ -112,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "Route3_EventScript_1A94FF", + "script": "Route3_EventScript_Janice", "flag": "0" }, { @@ -125,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route3_EventScript_1A9445", + "script": "Route3_EventScript_Colton", "flag": "0" }, { @@ -138,7 +140,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "Route3_EventScript_1A93C9", + "script": "Route3_EventScript_Ben", "flag": "0" } ], @@ -150,7 +152,7 @@ "x": 72, "y": 11, "elevation": 0, - "script": "Route3_EventScript_167F81" + "script": "Route3_EventScript_RouteSign" }, { "type": "hidden_item", diff --git a/data/maps/Route3/scripts.inc b/data/maps/Route3/scripts.inc index bc44936d0..c8e3c1a58 100644 --- a/data/maps/Route3/scripts.inc +++ b/data/maps/Route3/scripts.inc @@ -1,10 +1,10 @@ Route3_MapScripts:: @ 8167F77 .byte 0 -Route3_EventScript_167F78:: @ 8167F78 - msgbox gUnknown_8183491, MSGBOX_NPC +Route3_EventScript_Youngster:: @ 8167F78 + msgbox Route3_Text_TunnelFromCeruleanTiring, MSGBOX_NPC end -Route3_EventScript_167F81:: @ 8167F81 - msgbox gUnknown_81838C0, MSGBOX_SIGN +Route3_EventScript_RouteSign:: @ 8167F81 + msgbox Route3_Text_RouteSign, MSGBOX_SIGN end diff --git a/data/maps/Route3/text.inc b/data/maps/Route3/text.inc index 32aa96e19..6e5ad9c69 100644 --- a/data/maps/Route3/text.inc +++ b/data/maps/Route3/text.inc @@ -1,104 +1,104 @@ -gUnknown_8183491:: @ 8183491 +Route3_Text_TunnelFromCeruleanTiring:: @ 8183491 .string "Whew… I better take a rest…\n" .string "Groan…\p" .string "That tunnel from CERULEAN takes a\n" .string "lot out of you!$" -Text_1834E6:: @ 81834E6 +Route3_Text_ColtonIntro:: @ 81834E6 .string "Hey!\n" .string "I saw you in VIRIDIAN FOREST!$" -Text_183509:: @ 8183509 +Route3_Text_ColtonDefeat:: @ 8183509 .string "You beat me again!$" -Text_18351C:: @ 818351C +Route3_Text_ColtonPostBattle:: @ 818351C .string "There are other kinds of POKéMON\n" .string "than the ones you find in forests.$" -Text_183560:: @ 8183560 +Route3_Text_BenIntro:: @ 8183560 .string "Hi!\n" .string "I like shorts!\p" .string "They're delightfully comfy and\n" .string "easy to wear!$" -Text_1835A0:: @ 81835A0 +Route3_Text_BenDefeat:: @ 81835A0 .string "I don't believe it!$" -Text_1835B4:: @ 81835B4 +Route3_Text_BenPostBattle:: @ 81835B4 .string "Are you using a POKéMON CENTER's\n" .string "PC for storing your POKéMON?\p" .string "Each BOX can hold up to\n" .string "30 POKéMON.$" -Text_183616:: @ 8183616 +Route3_Text_JaniceIntro:: @ 8183616 .string "Excuse me!\n" .string "You looked at me, didn't you?$" -Text_18363F:: @ 818363F +Route3_Text_JaniceDefeat:: @ 818363F .string "You're mean!$" -Text_18364C:: @ 818364C +Route3_Text_JanicePostBattle:: @ 818364C .string "You shouldn't be staring if you\n" .string "don't want to battle!$" -Text_183682:: @ 8183682 +Route3_Text_GregIntro:: @ 8183682 .string "Are you a TRAINER?\n" .string "Let's get with it right away!$" -Text_1836B3:: @ 81836B3 +Route3_Text_GregDefeat:: @ 81836B3 .string "If I had new POKéMON, I would've\n" .string "won!$" -Text_1836D9:: @ 81836D9 +Route3_Text_GregPostBattle:: @ 81836D9 .string "If a POKéMON BOX on the PC gets\n" .string "full, just switch to another BOX.$" -Text_18371B:: @ 818371B +Route3_Text_SallyIntro:: @ 818371B .string "That look you gave me…\n" .string "It's so intriguing!$" -Text_183746:: @ 8183746 +Route3_Text_SallyDefeat:: @ 8183746 .string "Be nice!$" -Text_18374F:: @ 818374F +Route3_Text_SallyPostBattle:: @ 818374F .string "You can avoid battles by not\n" .string "letting TRAINERS see you.$" -Text_183786:: @ 8183786 +Route3_Text_CalvinIntro:: @ 8183786 .string "Hey! You're not wearing shorts!\n" .string "What's wrong with you?$" -Text_1837BD:: @ 81837BD +Route3_Text_CalvinDefeat:: @ 81837BD .string "Lost!\n" .string "Lost! Lost!$" -Text_1837CF:: @ 81837CF +Route3_Text_CalvinPostBattle:: @ 81837CF .string "I always wear shorts, even in\n" .string "winter. That's my policy.$" -Text_183807:: @ 8183807 +Route3_Text_JamesIntro:: @ 8183807 .string "I'll battle you with the POKéMON\n" .string "I just caught.$" -Text_183837:: @ 8183837 +Route3_Text_JamesDefeat:: @ 8183837 .string "Done like dinner!$" -Text_183849:: @ 8183849 +Route3_Text_JamesPostBattle:: @ 8183849 .string "Trained POKéMON are stronger than\n" .string "the wild ones.$" -Text_18387A:: @ 818387A +Route3_Text_RobinIntro:: @ 818387A .string "Eek!\n" .string "Did you touch me?$" -Text_183891:: @ 8183891 +Route3_Text_RobinDefeat:: @ 8183891 .string "That's it?$" -Text_18389C:: @ 818389C +Route3_Text_RobinPostBattle:: @ 818389C .string "ROUTE 4 is at the foot of\n" .string "MT. MOON.$" -gUnknown_81838C0:: @ 81838C0 +Route3_Text_RouteSign:: @ 81838C0 .string "ROUTE 3\n" .string "MT. MOON AHEAD$" diff --git a/data/maps/Route4/map.json b/data/maps/Route4/map.json index b992a7d89..13edbec1b 100644 --- a/data/maps/Route4/map.json +++ b/data/maps/Route4/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_4", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_ROUTE", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_ROUTE3", @@ -34,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route4_EventScript_167F8C", + "script": "Route4_EventScript_Woman", "flag": "0" }, { @@ -47,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "Route4_EventScript_1A95B9", + "script": "Route4_EventScript_Crissy", "flag": "0" }, { @@ -73,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route4_EventScript_1ACDEA", + "script": "Route4_EventScript_Boy", "flag": "0" }, { @@ -146,14 +148,14 @@ "x": 18, "y": 7, "elevation": 0, - "script": "Route4_EventScript_167F95" + "script": "Route4_EventScript_MtMoonSign" }, { "type": "bg_event_type_0", "x": 34, "y": 7, "elevation": 0, - "script": "Route4_EventScript_167F9E" + "script": "Route4_EventScript_RouteSign" }, { "type": "hidden_item", diff --git a/data/maps/Route4/scripts.inc b/data/maps/Route4/scripts.inc index 9055722eb..c6c7e6bbd 100644 --- a/data/maps/Route4/scripts.inc +++ b/data/maps/Route4/scripts.inc @@ -1,17 +1,17 @@ Route4_MapScripts:: @ 8167F8A .byte 0 -Route4_EventScript_167F8B:: @ 8167F8B +Route4_EventScript_Unused:: @ 8167F8B end -Route4_EventScript_167F8C:: @ 8167F8C - msgbox gUnknown_81838D7, MSGBOX_NPC +Route4_EventScript_Woman:: @ 8167F8C + msgbox Route4_Text_TrippedOverGeodude, MSGBOX_NPC end -Route4_EventScript_167F95:: @ 8167F95 - msgbox gUnknown_818399B, MSGBOX_SIGN +Route4_EventScript_MtMoonSign:: @ 8167F95 + msgbox Route4_Text_MtMoonEntrance, MSGBOX_SIGN end -Route4_EventScript_167F9E:: @ 8167F9E - msgbox gUnknown_81839B4, MSGBOX_SIGN +Route4_EventScript_RouteSign:: @ 8167F9E + msgbox Route4_Text_RouteSign, MSGBOX_SIGN end diff --git a/data/maps/Route4/text.inc b/data/maps/Route4/text.inc index 49648cde0..a6bd24787 100644 --- a/data/maps/Route4/text.inc +++ b/data/maps/Route4/text.inc @@ -1,24 +1,79 @@ -gUnknown_81838D7:: @ 81838D7 +Route4_Text_TrippedOverGeodude:: @ 81838D7 .string "Ouch! I tripped over a rocky\n" .string "POKéMON, GEODUDE!$" -Text_183906:: @ 8183906 +Route4_Text_CrissyIntro:: @ 8183906 .string "I came to MT. MOON in search of\n" .string "mushroom POKéMON.$" -Text_183938:: @ 8183938 +Route4_Text_CrissyDefeat:: @ 8183938 .string "After all I did to catch them!$" -Text_183957:: @ 8183957 +Route4_Text_CrissyPostBattle:: @ 8183957 .string "There might not be any more\n" .string "mushrooms here.\p" .string "I think I got them all.$" -gUnknown_818399B:: @ 818399B +Route4_Text_MtMoonEntrance:: @ 818399B .string "MT. MOON\n" .string "Tunnel Entrance$" -gUnknown_81839B4:: @ 81839B4 +Route4_Text_RouteSign:: @ 81839B4 .string "ROUTE 4\n" .string "MT. MOON - CERULEAN CITY$" +Text_MegaPunchTeach:: @ 81839D5 + .string "A punch of roaring ferocity!\p" + .string "Packed with destructive power!\p" + .string "When the chips are down,\n" + .string "MEGA PUNCH is the ultimate attack!\l" + .string "You agree, yes?\p" + .string "Now!\n" + .string "Let me teach it to your POKéMON!$" + +Text_MegaPunchDeclined:: @ 8183A83 + .string "You'll be back when you understand\n" + .string "the worth of MEGA PUNCH.$" + +Text_MegaPunchWhichMon:: @ 8183ABF + .string "Fine!\n" + .string "Which POKéMON will learn it?$" + +Text_MegaPunchTaught:: @ 8183AE2 + .string "Now, we are comrades in the way of\n" + .string "punching!\p" + .string "You should go before you're seen\n" + .string "by the misguided fool who trains\l" + .string "only his silly kicking over there.$" + +Text_MegaKickTeach:: @ 8183B74 + .string "A kick of brutal ferocity!\p" + .string "Packed with destructive power!\p" + .string "When you get right down to it,\n" + .string "MEGA KICK is the ultimate attack!\l" + .string "Don't you agree?\p" + .string "Okay!\n" + .string "I'll teach it to your POKéMON!$" + +Text_MegaKickDeclined:: @ 8183C25 + .string "You'll come crawling back when you\n" + .string "realize the value of MEGA KICK.$" + +Text_MegaKickWhichMon:: @ 8183C68 + .string "All right!\n" + .string "Which POKéMON wants to learn it?$" + +Text_MegaKickTaught:: @ 8183C94 + .string "Now, we are soul mates in the way\n" + .string "of kicking!\p" + .string "You should run before you're seen\n" + .string "by the deluded nitwit who trains\l" + .string "only simple punching over there.$" + +Route4_Text_PeopleLikeAndRespectBrock:: @ 8183D26 + .string "Oh, wow, that's the BOULDERBADGE!\n" + .string "You got it from BROCK, didn't you?\p" + .string "BROCK is cool. He's not just tough.\n" + .string "People like and respect him.\p" + .string "I want to become a GYM LEADER\n" + .string "like him.$" diff --git a/data/maps/Route4_PokemonCenter_1F/map.json b/data/maps/Route4_PokemonCenter_1F/map.json index 29c7c514c..5797e4600 100644 --- a/data/maps/Route4_PokemonCenter_1F/map.json +++ b/data/maps/Route4_PokemonCenter_1F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_4", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { @@ -23,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route4_PokemonCenter_1F_EventScript_16F8BB", + "script": "Route4_PokemonCenter_1F_EventScript_Nurse", "flag": "0" }, { @@ -36,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route4_PokemonCenter_1F_EventScript_16F75F", + "script": "Route4_PokemonCenter_1F_EventScript_MagikarpSalesman", "flag": "0" }, { @@ -49,7 +51,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route4_PokemonCenter_1F_EventScript_16F754", + "script": "Route4_PokemonCenter_1F_EventScript_Gentleman", "flag": "0" }, { @@ -62,7 +64,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route4_PokemonCenter_1F_EventScript_16F74B", + "script": "Route4_PokemonCenter_1F_EventScript_Boy", "flag": "0" }, { @@ -75,7 +77,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route4_PokemonCenter_1F_EventScript_16F8C4", + "script": "Route4_PokemonCenter_1F_EventScript_Youngster", "flag": "0" }, { @@ -88,7 +90,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route4_PokemonCenter_1F_EventScript_16F8CD", + "script": "Route4_PokemonCenter_1F_EventScript_Newspaper", "flag": "0" } ], diff --git a/data/maps/Route4_PokemonCenter_1F/scripts.inc b/data/maps/Route4_PokemonCenter_1F/scripts.inc index ca2c5f611..420e18d1a 100644 --- a/data/maps/Route4_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route4_PokemonCenter_1F/scripts.inc @@ -1,3 +1,5 @@ +.equ MAGIKARP_PRICE, 500 + Route4_PokemonCenter_1F_MapScripts:: @ 816F739 map_script MAP_SCRIPT_ON_TRANSITION, Route4_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume @@ -8,149 +10,149 @@ Route4_PokemonCenter_1F_OnTransition:: @ 816F744 setrespawn SPAWN_ROUTE4 end -Route4_PokemonCenter_1F_EventScript_16F74B:: @ 816F74B - msgbox gUnknown_819D9D4, MSGBOX_NPC +Route4_PokemonCenter_1F_EventScript_Boy:: @ 816F74B + msgbox Route4_PokemonCenter_1F_Text_CanHaveSixMonsWithYou, MSGBOX_NPC end -Route4_PokemonCenter_1F_EventScript_16F754:: @ 816F754 +Route4_PokemonCenter_1F_EventScript_Gentleman:: @ 816F754 lock - msgbox gUnknown_819DA3A + msgbox Route4_PokemonCenter_1F_Text_TeamRocketAttacksCerulean release end -Route4_PokemonCenter_1F_EventScript_16F75F:: @ 816F75F +Route4_PokemonCenter_1F_EventScript_MagikarpSalesman:: @ 816F75F lock faceplayer - goto_if_set FLAG_BOUGHT_MAGIKARP, EventScript_16F8A2 + goto_if_set FLAG_BOUGHT_MAGIKARP, Route4_PokemonCenter_1F_EventScript_AlreadyBoughtMagikarp showmoneybox 0, 0, 0 checkplayergender compare VAR_RESULT, MALE - goto_if_eq EventScript_16F786 + goto_if_eq Route4_PokemonCenter_1F_EventScript_AskBuyMagikarpMale compare VAR_RESULT, FEMALE - goto_if_eq EventScript_16F794 + goto_if_eq Route4_PokemonCenter_1F_EventScript_AskBuyMagikarpFemale end -EventScript_16F786:: @ 816F786 - msgbox gUnknown_819DA9A, MSGBOX_YESNO - goto EventScript_16F7A2 +Route4_PokemonCenter_1F_EventScript_AskBuyMagikarpMale:: @ 816F786 + msgbox Route4_PokemonCenter_1F_Text_LaddieBuyMagikarpForJust500, MSGBOX_YESNO + goto Route4_PokemonCenter_1F_EventScript_TryBuyMagikarp end -EventScript_16F794:: @ 816F794 - msgbox gUnknown_819DB34, MSGBOX_YESNO - goto EventScript_16F7A2 +Route4_PokemonCenter_1F_EventScript_AskBuyMagikarpFemale:: @ 816F794 + msgbox Route4_PokemonCenter_1F_Text_SweetieBuyMagikarpForJust500, MSGBOX_YESNO + goto Route4_PokemonCenter_1F_EventScript_TryBuyMagikarp end -EventScript_16F7A2:: @ 816F7A2 +Route4_PokemonCenter_1F_EventScript_TryBuyMagikarp:: @ 816F7A2 compare VAR_RESULT, NO - goto_if_eq EventScript_16F888 - checkmoney 500, 0 + goto_if_eq Route4_PokemonCenter_1F_EventScript_DeclineMagikarp + checkmoney MAGIKARP_PRICE, 0 compare VAR_RESULT, FALSE - goto_if_eq EventScript_16F895 + goto_if_eq Route4_PokemonCenter_1F_EventScript_NotEnoughMoney textcolor 3 - setvar VAR_TEMP_1, 129 + setvar VAR_TEMP_1, SPECIES_MAGIKARP givemon SPECIES_MAGIKARP, 5, ITEM_NONE compare VAR_RESULT, 0 - goto_if_eq EventScript_16F7F6 + goto_if_eq Route4_PokemonCenter_1F_EventScript_BuyMagikarpParty compare VAR_RESULT, 1 - goto_if_eq EventScript_16F822 + goto_if_eq Route4_PokemonCenter_1F_EventScript_BuyMagikarpPC compare VAR_RESULT, 2 - goto_if_eq EventScript_16F8AC + goto_if_eq Route4_PokemonCenter_1F_EventScript_NoRoomForMagikarp end -EventScript_16F7F6:: @ 816F7F6 - call EventScript_16F86F +Route4_PokemonCenter_1F_EventScript_BuyMagikarpParty:: @ 816F7F6 + call Route4_PokemonCenter_1F_EventScript_PayForMagikarp msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_16F861 + goto_if_eq Route4_PokemonCenter_1F_EventScript_EndPurchaseMagikarp call EventScript_GetGiftMonPartySlot fadescreen FADE_TO_BLACK hidemoneybox 0, 0 special ChangePokemonNickname waitstate - goto EventScript_16F86A + goto Route4_PokemonCenter_1F_EventScript_BoughtMagikarp end -EventScript_16F822:: @ 816F822 - call EventScript_16F86F +Route4_PokemonCenter_1F_EventScript_BuyMagikarpPC:: @ 816F822 + call Route4_PokemonCenter_1F_EventScript_PayForMagikarp msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_16F84B + goto_if_eq Route4_PokemonCenter_1F_EventScript_TransferMagikarpCloseMoneyBox fadescreen FADE_TO_BLACK hidemoneybox 0, 0 special ChangeBoxPokemonNickname waitstate lock faceplayer - goto EventScript_16F856 + goto Route4_PokemonCenter_1F_EventScript_TransferMagikarp end -EventScript_16F84B:: @ 816F84B +Route4_PokemonCenter_1F_EventScript_TransferMagikarpCloseMoneyBox:: @ 816F84B call EventScript_TransferredToPC - goto EventScript_16F861 + goto Route4_PokemonCenter_1F_EventScript_EndPurchaseMagikarp end -EventScript_16F856:: @ 816F856 +Route4_PokemonCenter_1F_EventScript_TransferMagikarp:: @ 816F856 call EventScript_TransferredToPC - goto EventScript_16F86A + goto Route4_PokemonCenter_1F_EventScript_BoughtMagikarp end -EventScript_16F861:: @ 816F861 +Route4_PokemonCenter_1F_EventScript_EndPurchaseMagikarp:: @ 816F861 hidemoneybox 0, 0 - goto EventScript_16F86A + goto Route4_PokemonCenter_1F_EventScript_BoughtMagikarp end -EventScript_16F86A:: @ 816F86A +Route4_PokemonCenter_1F_EventScript_BoughtMagikarp:: @ 816F86A setflag FLAG_BOUGHT_MAGIKARP release end -EventScript_16F86F:: @ 816F86F - removemoney 500, 0 +Route4_PokemonCenter_1F_EventScript_PayForMagikarp:: @ 816F86F + removemoney MAGIKARP_PRICE, 0 updatemoneybox 0, 0, 0 playfanfare MUS_FANFA1 - message Text_19DBD3 + message Route4_PokemonCenter_1F_Text_PaidOutrageouslyForMagikarp waitmessage waitfanfare getspeciesname 0, SPECIES_MAGIKARP return -EventScript_16F888:: @ 816F888 - msgbox gUnknown_819DC07 +Route4_PokemonCenter_1F_EventScript_DeclineMagikarp:: @ 816F888 + msgbox Route4_PokemonCenter_1F_Text_OnlyDoingThisAsFavorToYou hidemoneybox 0, 0 release end -EventScript_16F895:: @ 816F895 - msgbox gUnknown_819DC78 +Route4_PokemonCenter_1F_EventScript_NotEnoughMoney:: @ 816F895 + msgbox Route4_PokemonCenter_1F_Text_YoullNeedMoreMoney hidemoneybox 0, 0 release end -EventScript_16F8A2:: @ 816F8A2 - msgbox gUnknown_819DC9A +Route4_PokemonCenter_1F_EventScript_AlreadyBoughtMagikarp:: @ 816F8A2 + msgbox Route4_PokemonCenter_1F_Text_IDontGiveRefunds release end -EventScript_16F8AC:: @ 816F8AC +Route4_PokemonCenter_1F_EventScript_NoRoomForMagikarp:: @ 816F8AC textcolor 0 - msgbox gUnknown_819DC3E + msgbox Route4_PokemonCenter_1F_Text_NoRoomForMorePokemon hidemoneybox 0, 0 release end -Route4_PokemonCenter_1F_EventScript_16F8BB:: @ 816F8BB +Route4_PokemonCenter_1F_EventScript_Nurse:: @ 816F8BB lock faceplayer call EventScript_PkmnCenterNurse release end -Route4_PokemonCenter_1F_EventScript_16F8C4:: @ 816F8C4 - msgbox gUnknown_819DCDB, MSGBOX_NPC +Route4_PokemonCenter_1F_EventScript_Youngster:: @ 816F8C4 + msgbox Route4_PokemonCenter_1F_Text_ShouldStoreMonsUsingPC, MSGBOX_NPC end -Route4_PokemonCenter_1F_EventScript_16F8CD:: @ 816F8CD +Route4_PokemonCenter_1F_EventScript_Newspaper:: @ 816F8CD lock - msgbox gUnknown_819DD54 + msgbox Route4_PokemonCenter_1F_Text_ItsANewspaper release end diff --git a/data/maps/Route4_PokemonCenter_1F/text.inc b/data/maps/Route4_PokemonCenter_1F/text.inc index f357b7f76..df65ae33a 100644 --- a/data/maps/Route4_PokemonCenter_1F/text.inc +++ b/data/maps/Route4_PokemonCenter_1F/text.inc @@ -1,54 +1,54 @@ -gUnknown_819D9D4:: @ 819D9D4 +Route4_PokemonCenter_1F_Text_CanHaveSixMonsWithYou:: @ 819D9D4 .string "Okay, set six POKé BALLS in my\n" .string "belt…\p" .string "Yeah, that'll do it. At most, you\n" .string "can have six POKéMON with you.$" -gUnknown_819DA3A:: @ 819DA3A +Route4_PokemonCenter_1F_Text_TeamRocketAttacksCerulean:: @ 819DA3A .string "TEAM ROCKET attacks CERULEAN\n" .string "citizens…\p" .string "Not a day goes by without TEAM\n" .string "ROCKET being in the news.$" -gUnknown_819DA9A:: @ 819DA9A +Route4_PokemonCenter_1F_Text_LaddieBuyMagikarpForJust500:: @ 819DA9A .string "MAN: Hello there, laddie!\n" .string "Have I got a deal just for you!\p" .string "I'll let you have a secret POKéMON\n" .string "- a MAGIKARP - for just ¥500!\p" .string "So, you'll buy it, am I right?$" -gUnknown_819DB34:: @ 819DB34 +Route4_PokemonCenter_1F_Text_SweetieBuyMagikarpForJust500:: @ 819DB34 .string "MAN: Hello there, sweetie pie!\n" .string "Have I got a deal just for you!\p" .string "I'll let you have a secret POKéMON\n" .string "- a MAGIKARP - for just ¥500!\p" .string "So, you'll buy it, am I right?$" -Text_19DBD3:: @ 819DBD3 +Route4_PokemonCenter_1F_Text_PaidOutrageouslyForMagikarp:: @ 819DBD3 .string "{PLAYER} paid an outrageous ¥500\n" .string "and bought the MAGIKARP…$" -gUnknown_819DC07:: @ 819DC07 +Route4_PokemonCenter_1F_Text_OnlyDoingThisAsFavorToYou:: @ 819DC07 .string "No? You say no? I'm only doing this\n" .string "as a favor to you!$" -gUnknown_819DC3E:: @ 819DC3E +Route4_PokemonCenter_1F_Text_NoRoomForMorePokemon:: @ 819DC3E .string "There's no more room for any more\n" .string "POKéMON, it looks like.$" -gUnknown_819DC78:: @ 819DC78 +Route4_PokemonCenter_1F_Text_YoullNeedMoreMoney:: @ 819DC78 .string "You'll need more money than that!$" -gUnknown_819DC9A:: @ 819DC9A +Route4_PokemonCenter_1F_Text_IDontGiveRefunds:: @ 819DC9A .string "MAN: Well, I don't give refunds.\n" .string "You knew what you were getting!$" -gUnknown_819DCDB:: @ 819DCDB +Route4_PokemonCenter_1F_Text_ShouldStoreMonsUsingPC:: @ 819DCDB .string "Sometimes, you'll have too many\n" .string "POKéMON with you to add any more.\p" .string "In that case, you should just\n" .string "store some using any PC.$" -gUnknown_819DD54:: @ 819DD54 +Route4_PokemonCenter_1F_Text_ItsANewspaper:: @ 819DD54 .string "It's a newspaper.$" diff --git a/data/maps/Route4_PokemonCenter_2F/map.json b/data/maps/Route4_PokemonCenter_2F/map.json index e53504770..a71194174 100644 --- a/data/maps/Route4_PokemonCenter_2F/map.json +++ b/data/maps/Route4_PokemonCenter_2F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_4", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 28b739341..08ec22387 100644 --- a/data/maps/Route5/map.json +++ b/data/maps/Route5/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_5", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_ROUTE", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_CERULEAN_CITY", @@ -61,7 +63,7 @@ "x": 32, "y": 32, "elevation": 0, - "script": "Route5_EventScript_167FA8" + "script": "Route5_EventScript_UndergroundPathSign" } ] } diff --git a/data/maps/Route5/scripts.inc b/data/maps/Route5/scripts.inc index 3e1b507d2..cc5b0d1d2 100644 --- a/data/maps/Route5/scripts.inc +++ b/data/maps/Route5/scripts.inc @@ -1,6 +1,6 @@ Route5_MapScripts:: @ 8167FA7 .byte 0 -Route5_EventScript_167FA8:: @ 8167FA8 - msgbox gUnknown_8183DD4, MSGBOX_SIGN +Route5_EventScript_UndergroundPathSign:: @ 8167FA8 + msgbox Route5_Text_UndergroundPathSign, MSGBOX_SIGN end diff --git a/data/maps/Route5/text.inc b/data/maps/Route5/text.inc index 0a3e80874..1aab5cc6b 100644 --- a/data/maps/Route5/text.inc +++ b/data/maps/Route5/text.inc @@ -1,60 +1,4 @@ -Text_MegaPunchTeach:: @ 81839D5 - .string "A punch of roaring ferocity!\p" - .string "Packed with destructive power!\p" - .string "When the chips are down,\n" - .string "MEGA PUNCH is the ultimate attack!\l" - .string "You agree, yes?\p" - .string "Now!\n" - .string "Let me teach it to your POKéMON!$" - -Text_MegaPunchDeclined:: @ 8183A83 - .string "You'll be back when you understand\n" - .string "the worth of MEGA PUNCH.$" - -Text_MegaPunchWhichMon:: @ 8183ABF - .string "Fine!\n" - .string "Which POKéMON will learn it?$" - -Text_MegaPunchTaught:: @ 8183AE2 - .string "Now, we are comrades in the way of\n" - .string "punching!\p" - .string "You should go before you're seen\n" - .string "by the misguided fool who trains\l" - .string "only his silly kicking over there.$" - -Text_MegaKickTeach:: @ 8183B74 - .string "A kick of brutal ferocity!\p" - .string "Packed with destructive power!\p" - .string "When you get right down to it,\n" - .string "MEGA KICK is the ultimate attack!\l" - .string "Don't you agree?\p" - .string "Okay!\n" - .string "I'll teach it to your POKéMON!$" - -Text_MegaKickDeclined:: @ 8183C25 - .string "You'll come crawling back when you\n" - .string "realize the value of MEGA KICK.$" - -Text_MegaKickWhichMon:: @ 8183C68 - .string "All right!\n" - .string "Which POKéMON wants to learn it?$" - -Text_MegaKickTaught:: @ 8183C94 - .string "Now, we are soul mates in the way\n" - .string "of kicking!\p" - .string "You should run before you're seen\n" - .string "by the deluded nitwit who trains\l" - .string "only simple punching over there.$" - -Text_183D26:: @ 8183D26 - .string "Oh, wow, that's the BOULDERBADGE!\n" - .string "You got it from BROCK, didn't you?\p" - .string "BROCK is cool. He's not just tough.\n" - .string "People like and respect him.\p" - .string "I want to become a GYM LEADER\n" - .string "like him.$" - -gUnknown_8183DD4:: @ 8183DD4 +Route5_Text_UndergroundPathSign:: @ 8183DD4 .string "UNDERGROUND PATH\n" .string "CERULEAN CITY - VERMILION CITY$" diff --git a/data/maps/Route5_PokemonDayCare/map.json b/data/maps/Route5_PokemonDayCare/map.json index 52cbb04ea..826c71624 100644 --- a/data/maps/Route5_PokemonDayCare/map.json +++ b/data/maps/Route5_PokemonDayCare/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_5", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 e75bbbf85..5896d1664 100644 --- a/data/maps/Route5_SouthEntrance/map.json +++ b/data/maps/Route5_SouthEntrance/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_5", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 1, - "unknown_19": 2, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": false, + "floor_number": 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 a6016c5fa..4ff0dc898 100644 --- a/data/maps/Route6/map.json +++ b/data/maps/Route6/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_6", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_ROUTE", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_SAFFRON_CITY_CONNECTION", @@ -34,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "Route6_EventScript_1A9999", + "script": "Route6_EventScript_Keigo", "flag": "0" }, { @@ -47,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 0, - "script": "Route6_EventScript_1A9A15", + "script": "Route6_EventScript_Ricky", "flag": "0" }, { @@ -60,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 0, - "script": "Route6_EventScript_1A9A91", + "script": "Route6_EventScript_Nancy", "flag": "0" }, { @@ -73,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route6_EventScript_1A99D7", + "script": "Route6_EventScript_Elijah", "flag": "0" }, { @@ -86,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route6_EventScript_1A9ACF", + "script": "Route6_EventScript_Isabelle", "flag": "0" }, { @@ -99,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route6_EventScript_1A9A53", + "script": "Route6_EventScript_Jeff", "flag": "0" } ], @@ -133,7 +135,7 @@ "x": 21, "y": 15, "elevation": 0, - "script": "Route6_EventScript_167FB2" + "script": "Route6_EventScript_UndergroundPathSign" }, { "type": "hidden_item", diff --git a/data/maps/Route6/scripts.inc b/data/maps/Route6/scripts.inc index 00b3efb56..575c05fe6 100644 --- a/data/maps/Route6/scripts.inc +++ b/data/maps/Route6/scripts.inc @@ -1,6 +1,6 @@ Route6_MapScripts:: @ 8167FB1 .byte 0 -Route6_EventScript_167FB2:: @ 8167FB2 - msgbox gUnknown_8184067, MSGBOX_SIGN +Route6_EventScript_UndergroundPathSign:: @ 8167FB2 + msgbox Route6_Text_UndergroundPathSign, MSGBOX_SIGN end diff --git a/data/maps/Route6/text.inc b/data/maps/Route6/text.inc index b8ae84e32..0242ceee8 100644 --- a/data/maps/Route6/text.inc +++ b/data/maps/Route6/text.inc @@ -1,73 +1,73 @@ -Text_183E04:: @ 8183E04 +Route6_Text_RickyIntro:: @ 8183E04 .string "Who's there?\n" .string "Quit listening in on us!$" -Text_183E2A:: @ 8183E2A +Route6_Text_RickyDefeat:: @ 8183E2A .string "I just can't win!$" -Text_183E3C:: @ 8183E3C +Route6_Text_RickyPostBattle:: @ 8183E3C .string "Whisper…\n" .string "Whisper…$" -Text_183E4E:: @ 8183E4E +Route6_Text_NancyIntro:: @ 8183E4E .string "Excuse me!\n" .string "This is a private conversation!$" -Text_183E79:: @ 8183E79 +Route6_Text_NancyDefeat:: @ 8183E79 .string "Ugh!\n" .string "I hate losing.$" -Text_183E8D:: @ 8183E8D +Route6_Text_NancyPostBattle:: @ 8183E8D .string "Whisper…\n" .string "Whisper…$" -Text_183E9F:: @ 8183E9F +Route6_Text_KeigoIntro:: @ 8183E9F .string "There aren't many bugs out here.$" -Text_183EC0:: @ 8183EC0 +Route6_Text_KeigoDefeat:: @ 8183EC0 .string "No!\n" .string "You're kidding!$" -Text_183ED4:: @ 8183ED4 +Route6_Text_KeigoPostBattle:: @ 8183ED4 .string "I like bugs, so I'm going back to\n" .string "VIRIDIAN FOREST.$" -Text_183F07:: @ 8183F07 +Route6_Text_JeffIntro:: @ 8183F07 .string "Huh?\n" .string "You want to talk to me?$" -Text_183F24:: @ 8183F24 +Route6_Text_JeffDefeat:: @ 8183F24 .string "This stinks…\n" .string "I couldn't beat your challenge…$" -Text_183F51:: @ 8183F51 +Route6_Text_JeffPostBattle:: @ 8183F51 .string "I should bring more POKéMON with\n" .string "me. I'll feel safer that way.$" -Text_183F90:: @ 8183F90 +Route6_Text_IsabelleIntro:: @ 8183F90 .string "Me?\n" .string "Well, okay. I'll play!$" -Text_183FAB:: @ 8183FAB +Route6_Text_IsabelleDefeat:: @ 8183FAB .string "Things just didn't work…$" -Text_183FC4:: @ 8183FC4 +Route6_Text_IsabellePostBattle:: @ 8183FC4 .string "I want to get stronger.\n" .string "What's your secret?$" -Text_183FF0:: @ 8183FF0 +Route6_Text_ElijahIntro:: @ 8183FF0 .string "I've never seen you around.\n" .string "Are you good?$" -Text_18401A:: @ 818401A +Route6_Text_ElijahDefeat:: @ 818401A .string "You're too good!$" -Text_18402B:: @ 818402B +Route6_Text_ElijahPostBattle:: @ 818402B .string "Are my POKéMON weak?\n" .string "Or, am I just bad?\l" .string "Which do you think?$" -gUnknown_8184067:: @ 8184067 +Route6_Text_UndergroundPathSign:: @ 8184067 .string "UNDERGROUND PATH\n" .string "CERULEAN CITY - VERMILION CITY$" diff --git a/data/maps/Route6_NorthEntrance/map.json b/data/maps/Route6_NorthEntrance/map.json index d44503ee4..40dd5c985 100644 --- a/data/maps/Route6_NorthEntrance/map.json +++ b/data/maps/Route6_NorthEntrance/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_6", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 1, - "unknown_19": 2, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": false, + "floor_number": 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 2c5a9717c..e935d2d28 100644 --- a/data/maps/Route7/map.json +++ b/data/maps/Route7/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_7", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_ROUTE", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_CELADON_CITY", @@ -61,7 +63,7 @@ "x": 5, "y": 14, "elevation": 0, - "script": "Route7_EventScript_167FBC" + "script": "Route7_EventScript_UndergroundPathSign" }, { "type": "hidden_item", diff --git a/data/maps/Route7/scripts.inc b/data/maps/Route7/scripts.inc index 52d0f5f36..299d6bad8 100644 --- a/data/maps/Route7/scripts.inc +++ b/data/maps/Route7/scripts.inc @@ -1,6 +1,6 @@ Route7_MapScripts:: @ 8167FBB .byte 0 -Route7_EventScript_167FBC:: @ 8167FBC - msgbox gUnknown_8184097, MSGBOX_SIGN +Route7_EventScript_UndergroundPathSign:: @ 8167FBC + msgbox Route7_Text_UndergroundPathSign, MSGBOX_SIGN end diff --git a/data/maps/Route7/text.inc b/data/maps/Route7/text.inc index 3f1cdda5b..4a58cc14b 100644 --- a/data/maps/Route7/text.inc +++ b/data/maps/Route7/text.inc @@ -1,4 +1,4 @@ -gUnknown_8184097:: @ 8184097 +Route7_Text_UndergroundPathSign:: @ 8184097 .string "UNDERGROUND PATH\n" .string "CELADON CITY - LAVENDER TOWN$" diff --git a/data/maps/Route7_EastEntrance/map.json b/data/maps/Route7_EastEntrance/map.json index fbb8a163d..a311c8eee 100644 --- a/data/maps/Route7_EastEntrance/map.json +++ b/data/maps/Route7_EastEntrance/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_7", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 1, - "unknown_19": 2, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": false, + "floor_number": 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 f16933a2e..144ae1d3f 100644 --- a/data/maps/Route8/map.json +++ b/data/maps/Route8/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_8", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_ROUTE", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_SAFFRON_CITY_CONNECTION", @@ -34,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 6, - "script": "Route8_EventScript_1AA1D5", + "script": "Route8_EventScript_Julia", "flag": "0" }, { @@ -47,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route8_EventScript_1AA30B", + "script": "Route8_EventScript_Rich", "flag": "0" }, { @@ -60,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "Route8_EventScript_1AA251", + "script": "Route8_EventScript_Glenn", "flag": "0" }, { @@ -73,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route8_EventScript_1AA11B", + "script": "Route8_EventScript_Paige", "flag": "0" }, { @@ -86,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 6, - "script": "Route8_EventScript_1AA28F", + "script": "Route8_EventScript_Leslie", "flag": "0" }, { @@ -99,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route8_EventScript_1AA159", + "script": "Route8_EventScript_Andrea", "flag": "0" }, { @@ -112,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 6, - "script": "Route8_EventScript_1AA197", + "script": "Route8_EventScript_Megan", "flag": "0" }, { @@ -125,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route8_EventScript_1AA2CD", + "script": "Route8_EventScript_Stan", "flag": "0" }, { @@ -138,7 +140,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "Route8_EventScript_1AA213", + "script": "Route8_EventScript_Aidan", "flag": "0" }, { @@ -177,7 +179,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route8_EventScript_1AA349", + "script": "Route8_EventScript_Eli", "flag": "0" }, { @@ -190,7 +192,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route8_EventScript_1AA38F", + "script": "Route8_EventScript_Anne", "flag": "0" }, { @@ -203,7 +205,7 @@ "movement_range_y": 2, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route8_EventScript_1AA3D5", + "script": "Route8_EventScript_Ricardo", "flag": "0" }, { @@ -216,7 +218,7 @@ "movement_range_y": 5, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route8_EventScript_1AA413", + "script": "Route8_EventScript_Jaren", "flag": "0" } ], @@ -243,7 +245,7 @@ "x": 16, "y": 5, "elevation": 0, - "script": "Route8_EventScript_167FC6" + "script": "Route8_EventScript_UndergroundPathSign" }, { "type": "hidden_item", diff --git a/data/maps/Route8/scripts.inc b/data/maps/Route8/scripts.inc index c0f7475f3..93e0aa38a 100644 --- a/data/maps/Route8/scripts.inc +++ b/data/maps/Route8/scripts.inc @@ -1,6 +1,6 @@ Route8_MapScripts:: @ 8167FC5 .byte 0 -Route8_EventScript_167FC6:: @ 8167FC6 - msgbox gUnknown_8184576, MSGBOX_SIGN +Route8_EventScript_UndergroundPathSign:: @ 8167FC6 + msgbox Route8_Text_UndergroundPathSign, MSGBOX_SIGN end diff --git a/data/maps/Route8/text.inc b/data/maps/Route8/text.inc index 83f725c6a..c9891575c 100644 --- a/data/maps/Route8/text.inc +++ b/data/maps/Route8/text.inc @@ -1,110 +1,162 @@ -Text_1840C5:: @ 81840C5 +Route8_Text_AidanIntro:: @ 81840C5 .string "You look good at POKéMON, but how\n" .string "is your chemistry grade?$" -Text_184100:: @ 8184100 +Route8_Text_AidanDefeat:: @ 8184100 .string "Ow!\n" .string "Meltdown!$" -Text_18410E:: @ 818410E +Route8_Text_AidanPostBattle:: @ 818410E .string "I am better at school than this!$" -Text_18412F:: @ 818412F +Route8_Text_StanIntro:: @ 818412F .string "All right!\n" .string "Let's play a game!$" -Text_18414D:: @ 818414D +Route8_Text_StanDefeat:: @ 818414D .string "Drat!\n" .string "Came up short!$" -Text_184162:: @ 8184162 +Route8_Text_StanPostBattle:: @ 8184162 .string "Things didn't work today.$" -Text_18417C:: @ 818417C +Route8_Text_GlennIntro:: @ 818417C .string "You should be informed.\n" .string "You need strategy to win at this!$" -Text_1841B6:: @ 81841B6 +Route8_Text_GlennDefeat:: @ 81841B6 .string "It's not logical!$" -Text_1841C8:: @ 81841C8 +Route8_Text_GlennPostBattle:: @ 81841C8 .string "Go with GRIMER first…and…\n" .string "…and…then…$" -Text_1841ED:: @ 81841ED +Route8_Text_PaigeIntro:: @ 81841ED .string "I like NIDORAN, so I collect them!$" -Text_184210:: @ 8184210 +Route8_Text_PaigeDefeat:: @ 8184210 .string "Why?\n" .string "Why??$" -Text_18421B:: @ 818421B +Route8_Text_PaigePostBattle:: @ 818421B .string "When POKéMON grow up, they get\n" .string "ugly! They shouldn't evolve.$" -Text_184257:: @ 8184257 +Route8_Text_LeslieIntro:: @ 8184257 .string "School is fun, but so are POKéMON.$" -Text_18427A:: @ 818427A +Route8_Text_LeslieDefeat:: @ 818427A .string "You made it clear to me that\n" .string "I should stick with school.$" -Text_1842B3:: @ 81842B3 +Route8_Text_LesliePostBattle:: @ 81842B3 .string "I was planning on getting some\n" .string "fresh air for a change, but…\p" .string "We're stuck here because of the\n" .string "gates at SAFFRON.$" -Text_184321:: @ 8184321 +Route8_Text_AndreaIntro:: @ 8184321 .string "MEOWTH is so cute, meow, meow,\n" .string "meow!$" -Text_184346:: @ 8184346 +Route8_Text_AndreaDefeat:: @ 8184346 .string "Meeeeyow!$" -Text_184350:: @ 8184350 +Route8_Text_AndreaPostBattle:: @ 8184350 .string "I think PIDGEY and RATTATA are\n" .string "cute, too!$" -Text_18437A:: @ 818437A +Route8_Text_MeganIntro:: @ 818437A .string "We must look silly standing here\n" .string "like this.$" -Text_1843A6:: @ 81843A6 +Route8_Text_MeganDefeat:: @ 81843A6 .string "Look what you did to my poor, cute\n" .string "POKéMON!$" -Text_1843D2:: @ 81843D2 +Route8_Text_MeganPostBattle:: @ 81843D2 .string "SAFFRON's gatekeeper won't let us\n" .string "go through.\p" .string "I know he's doing his job, but I\n" .string "think he's mean.$" -Text_184432:: @ 8184432 +Route8_Text_RichIntro:: @ 8184432 .string "I'm a rambling, gaming dude!$" -Text_18444F:: @ 818444F +Route8_Text_RichDefeat:: @ 818444F .string "Missed the big chance!$" -Text_184466:: @ 8184466 +Route8_Text_RichPostBattle:: @ 8184466 .string "Playing games and POKéMON are like\n" .string "eating peanuts! I just can't stop!$" -Text_1844AC:: @ 81844AC +Route8_Text_JuliaIntro:: @ 81844AC .string "What's a cute, round, and fluffy\n" .string "POKéMON?$" -Text_1844D6:: @ 81844D6 +Route8_Text_JuliaDefeat:: @ 81844D6 .string "Stop!\p" .string "Don't be so mean to my CLEFAIRY!$" -Text_1844FD:: @ 81844FD +Route8_Text_JuliaPostBattle:: @ 81844FD .string "I read that CLEFAIRY evolves when\n" .string "it's exposed to a MOON STONE.\p" .string "I read that in a POKéMON JOURNAL.\n" .string "I wonder if it's true?$" -gUnknown_8184576:: @ 8184576 +Route8_Text_UndergroundPathSign:: @ 8184576 .string "UNDERGROUND PATH\n" .string "CELADON CITY - LAVENDER TOWN$" +Route8_Text_EliIntro:: @ 81845A4 + .string "ELI: Twin power is fantastic.\n" + .string "Did you know?$" + +Route8_Text_EliDefeat:: @ 81845D0 + .string "ELI: But…\n" + .string "We used our twin power…$" + +Route8_Text_EliPostBattle:: @ 81845F2 + .string "ELI: I caught my POKéMON with\n" + .string "ANNE!$" + +Route8_Text_EliNotEnoughMons:: @ 8184616 + .string "ELI: We can't battle if you don't\n" + .string "have two POKéMON.$" + +Route8_Text_AnneIntro:: @ 818464A + .string "ANNE: We'll shock you with our twin\n" + .string "power!$" + +Route8_Text_AnneDefeat:: @ 8184675 + .string "ANNE: Our twin power…$" + +Route8_Text_AnnePostBattle:: @ 818468B + .string "ANNE: I'm raising POKéMON with\n" + .string "ELI.$" + +Route8_Text_AnneNotEnoughMons:: @ 81846AF + .string "ANNE: Hi, hi! Let's battle!\n" + .string "But bring two POKéMON.$" + +Route8_Text_RicardoIntro:: @ 81846E2 + .string "My bike's acting up, man.$" + +Route8_Text_RicardoDefeat:: @ 81846FC + .string "Aww, man.\n" + .string "I'm not into this.$" + +Route8_Text_RicardoPostBattle:: @ 8184719 + .string "I got grass caught up in my\n" + .string "spokes, man.$" + +Route8_Text_JarenIntro:: @ 8184742 + .string "Clear the way, or I'll run you\n" + .string "down!$" + +Route8_Text_JarenDefeat:: @ 8184767 + .string "You for real, kid?$" + +Route8_Text_JarenPostBattle:: @ 818477A + .string "Don't think you're all special and\n" + .string "all just because of this.$" diff --git a/data/maps/Route8_WestEntrance/map.json b/data/maps/Route8_WestEntrance/map.json index 3becdcbc2..fc6c97792 100644 --- a/data/maps/Route8_WestEntrance/map.json +++ b/data/maps/Route8_WestEntrance/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_8", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 1, - "unknown_19": 2, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": false, + "floor_number": 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 24e5c3c4f..123be8d5a 100644 --- a/data/maps/Route9/map.json +++ b/data/maps/Route9/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_9", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_ROUTE", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": [ { "map": "MAP_CERULEAN_CITY", @@ -34,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route9_EventScript_1A9E71", + "script": "Route9_EventScript_Alicia", "flag": "0" }, { @@ -47,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "Route9_EventScript_1A9F69", + "script": "Route9_EventScript_Jeremy", "flag": "0" }, { @@ -60,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route9_EventScript_1A9EED", + "script": "Route9_EventScript_Alan", "flag": "0" }, { @@ -73,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route9_EventScript_1A9DF5", + "script": "Route9_EventScript_Chris", "flag": "0" }, { @@ -86,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "Route9_EventScript_1A9D79", + "script": "Route9_EventScript_Brent", "flag": "0" }, { @@ -99,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route9_EventScript_1A9DB7", + "script": "Route9_EventScript_Conner", "flag": "0" }, { @@ -112,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route9_EventScript_1A9F2B", + "script": "Route9_EventScript_Brice", "flag": "0" }, { @@ -125,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "Route9_EventScript_1A9EAF", + "script": "Route9_EventScript_Caitlin", "flag": "0" }, { @@ -138,7 +140,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "Route9_EventScript_1A9E33", + "script": "Route9_EventScript_Drew", "flag": "0" }, { @@ -189,7 +191,7 @@ "x": 29, "y": 7, "elevation": 0, - "script": "Route9_EventScript_167FD0" + "script": "Route9_EventScript_RouteSign" }, { "type": "hidden_item", diff --git a/data/maps/Route9/scripts.inc b/data/maps/Route9/scripts.inc index 1b48cd68e..bd4be2115 100644 --- a/data/maps/Route9/scripts.inc +++ b/data/maps/Route9/scripts.inc @@ -1,6 +1,6 @@ Route9_MapScripts:: @ 8167FCF .byte 0 -Route9_EventScript_167FD0:: @ 8167FD0 - msgbox gUnknown_8184B66, MSGBOX_SIGN +Route9_EventScript_RouteSign:: @ 8167FD0 + msgbox Route9_Text_RouteSign, MSGBOX_SIGN end diff --git a/data/maps/Route9/text.inc b/data/maps/Route9/text.inc index 3a4506533..2f3762a87 100644 --- a/data/maps/Route9/text.inc +++ b/data/maps/Route9/text.inc @@ -1,159 +1,106 @@ -Text_1845A4:: @ 81845A4 - .string "ELI: Twin power is fantastic.\n" - .string "Did you know?$" - -Text_1845D0:: @ 81845D0 - .string "ELI: But…\n" - .string "We used our twin power…$" - -Text_1845F2:: @ 81845F2 - .string "ELI: I caught my POKéMON with\n" - .string "ANNE!$" - -Text_184616:: @ 8184616 - .string "ELI: We can't battle if you don't\n" - .string "have two POKéMON.$" - -Text_18464A:: @ 818464A - .string "ANNE: We'll shock you with our twin\n" - .string "power!$" - -Text_184675:: @ 8184675 - .string "ANNE: Our twin power…$" - -Text_18468B:: @ 818468B - .string "ANNE: I'm raising POKéMON with\n" - .string "ELI.$" - -Text_1846AF:: @ 81846AF - .string "ANNE: Hi, hi! Let's battle!\n" - .string "But bring two POKéMON.$" - -Text_1846E2:: @ 81846E2 - .string "My bike's acting up, man.$" - -Text_1846FC:: @ 81846FC - .string "Aww, man.\n" - .string "I'm not into this.$" - -Text_184719:: @ 8184719 - .string "I got grass caught up in my\n" - .string "spokes, man.$" - -Text_184742:: @ 8184742 - .string "Clear the way, or I'll run you\n" - .string "down!$" - -Text_184767:: @ 8184767 - .string "You for real, kid?$" - -Text_18477A:: @ 818477A - .string "Don't think you're all special and\n" - .string "all just because of this.$" - -Text_1847B7:: @ 81847B7 +Route9_Text_AliciaIntro:: @ 81847B7 .string "You have POKéMON with you!\n" .string "You're mine!$" -Text_1847DF:: @ 81847DF +Route9_Text_AliciaDefeat:: @ 81847DF .string "You deceived me…$" -Text_1847F0:: @ 81847F0 +Route9_Text_AliciaPostBattle:: @ 81847F0 .string "The tunnel coming up is pitch-black\n" .string "inside.\p" .string "You'll need FLASH to get through\n" .string "there.$" -Text_184844:: @ 8184844 +Route9_Text_ChrisIntro:: @ 8184844 .string "Who's that walking there with those\n" .string "good-looking POKéMON?$" -Text_18487E:: @ 818487E +Route9_Text_ChrisDefeat:: @ 818487E .string "Out like a light!$" -Text_184890:: @ 8184890 +Route9_Text_ChrisPostBattle:: @ 8184890 .string "Keep walking!$" -Text_18489E:: @ 818489E +Route9_Text_DrewIntro:: @ 818489E .string "I'm taking the ROCK TUNNEL to\n" .string "go to LAVENDER…$" -Text_1848CC:: @ 81848CC +Route9_Text_DrewDefeat:: @ 81848CC .string "Can't measure up…$" -Text_1848DE:: @ 81848DE +Route9_Text_DrewPostBattle:: @ 81848DE .string "Are you off to ROCK TUNNEL, too?$" -Text_1848FF:: @ 81848FF +Route9_Text_CaitlinIntro:: @ 81848FF .string "Don't you dare patronize me!$" -Text_18491C:: @ 818491C +Route9_Text_CaitlinDefeat:: @ 818491C .string "No!\n" .string "You're too much.$" -Text_184931:: @ 8184931 +Route9_Text_CaitlinPostBattle:: @ 8184931 .string "You're obviously talented.\n" .string "Good luck to you!$" -Text_18495E:: @ 818495E +Route9_Text_JeremyIntro:: @ 818495E .string "Bwahaha!\n" .string "Great! I was bored, eh!$" -Text_18497F:: @ 818497F +Route9_Text_JeremyDefeat:: @ 818497F .string "Keep it coming, eh!\p" .string "Oh wait.\n" .string "I'm out of POKéMON!$" -Text_1849B0:: @ 81849B0 +Route9_Text_JeremyPostBattle:: @ 81849B0 .string "You sure had guts standing up to\n" .string "me there, eh?$" -Text_1849DF:: @ 81849DF +Route9_Text_BriceIntro:: @ 81849DF .string "Hahaha!\n" .string "Aren't you a little toughie!$" -Text_184A04:: @ 8184A04 +Route9_Text_BriceDefeat:: @ 8184A04 .string "What's that?$" -Text_184A11:: @ 8184A11 +Route9_Text_BricePostBattle:: @ 8184A11 .string "Hahaha!\n" .string "Kids should be tough!$" -Text_184A2F:: @ 8184A2F +Route9_Text_BrentIntro:: @ 8184A2F .string "I got up early every day to raise\n" .string "my POKéMON from cocoons!$" -Text_184A6A:: @ 8184A6A +Route9_Text_BrentDefeat:: @ 8184A6A .string "WHAT?\p" .string "What a total waste of time!$" -Text_184A8C:: @ 8184A8C +Route9_Text_BrentPostBattle:: @ 8184A8C .string "I have to collect more than bugs\n" .string "to get stronger…$" -Text_184ABE:: @ 8184ABE +Route9_Text_AlanIntro:: @ 8184ABE .string "Hahahaha!\n" .string "Bring it on!$" -Text_184AD5:: @ 8184AD5 +Route9_Text_AlanDefeat:: @ 8184AD5 .string "Hahahaha!\n" .string "You beat me fair!$" -Text_184AF1:: @ 8184AF1 +Route9_Text_AlanPostBattle:: @ 8184AF1 .string "Hahahaha!\n" .string "Us hearty guys always laugh!$" -Text_184B18:: @ 8184B18 +Route9_Text_ConnerIntro:: @ 8184B18 .string "Go, my super BUG POKéMON!$" -Text_184B32:: @ 8184B32 +Route9_Text_ConnerDefeat:: @ 8184B32 .string "My bugs…$" -Text_184B3B:: @ 8184B3B +Route9_Text_ConnerPostBattle:: @ 8184B3B .string "If you don't like BUG POKéMON,\n" .string "you bug me!$" -gUnknown_8184B66:: @ 8184B66 +Route9_Text_RouteSign:: @ 8184B66 .string "ROUTE 9\n" .string "CERULEAN CITY - ROCK TUNNEL$" diff --git a/data/maps/SSAnne_1F_Corridor/map.json b/data/maps/SSAnne_1F_Corridor/map.json index eab4e822a..87d778a25 100644 --- a/data/maps/SSAnne_1F_Corridor/map.json +++ b/data/maps/SSAnne_1F_Corridor/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 42c95079b..d018cc7a4 100644 --- a/data/maps/SSAnne_1F_Room1/map.json +++ b/data/maps/SSAnne_1F_Room1/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 8a779f450..765612f48 100644 --- a/data/maps/SSAnne_1F_Room2/map.json +++ b/data/maps/SSAnne_1F_Room2/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 d610ee30a..e518ae50e 100644 --- a/data/maps/SSAnne_1F_Room3/map.json +++ b/data/maps/SSAnne_1F_Room3/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 262a1a089..c11aa16b5 100644 --- a/data/maps/SSAnne_1F_Room4/map.json +++ b/data/maps/SSAnne_1F_Room4/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 6cdd3d088..51935aea2 100644 --- a/data/maps/SSAnne_1F_Room5/map.json +++ b/data/maps/SSAnne_1F_Room5/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 b9b25ff45..d6f0a1b44 100644 --- a/data/maps/SSAnne_1F_Room6/map.json +++ b/data/maps/SSAnne_1F_Room6/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 98496a947..315d49099 100644 --- a/data/maps/SSAnne_1F_Room7/map.json +++ b/data/maps/SSAnne_1F_Room7/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 e3b506027..bb2df92ce 100644 --- a/data/maps/SSAnne_2F_Corridor/map.json +++ b/data/maps/SSAnne_2F_Corridor/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 20e221a85..6fbbde902 100644 --- a/data/maps/SSAnne_2F_Room1/map.json +++ b/data/maps/SSAnne_2F_Room1/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 df5cf4bc8..1692afc23 100644 --- a/data/maps/SSAnne_2F_Room2/map.json +++ b/data/maps/SSAnne_2F_Room2/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 8dbb1e408..05ac70a4f 100644 --- a/data/maps/SSAnne_2F_Room3/map.json +++ b/data/maps/SSAnne_2F_Room3/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 dca8226dd..116380880 100644 --- a/data/maps/SSAnne_2F_Room4/map.json +++ b/data/maps/SSAnne_2F_Room4/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 0821d13bd..ca0c68072 100644 --- a/data/maps/SSAnne_2F_Room5/map.json +++ b/data/maps/SSAnne_2F_Room5/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 56b6e6201..fe00765ab 100644 --- a/data/maps/SSAnne_2F_Room6/map.json +++ b/data/maps/SSAnne_2F_Room6/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 7c11905f1..fa9ad902a 100644 --- a/data/maps/SSAnne_3F_Corridor/map.json +++ b/data/maps/SSAnne_3F_Corridor/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 c50752f50..86fe58592 100644 --- a/data/maps/SSAnne_B1F_Corridor/map.json +++ b/data/maps/SSAnne_B1F_Corridor/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 4608e6c9a..25286e3cc 100644 --- a/data/maps/SSAnne_B1F_Room1/map.json +++ b/data/maps/SSAnne_B1F_Room1/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 31c7d6eb7..bac380ea3 100644 --- a/data/maps/SSAnne_B1F_Room2/map.json +++ b/data/maps/SSAnne_B1F_Room2/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 70237229c..e4fecec84 100644 --- a/data/maps/SSAnne_B1F_Room3/map.json +++ b/data/maps/SSAnne_B1F_Room3/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 8222e4dbc..b72b8f2dd 100644 --- a/data/maps/SSAnne_B1F_Room4/map.json +++ b/data/maps/SSAnne_B1F_Room4/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 5ed5383ea..9f258f534 100644 --- a/data/maps/SSAnne_B1F_Room5/map.json +++ b/data/maps/SSAnne_B1F_Room5/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 0f79b1014..a87171f61 100644 --- a/data/maps/SSAnne_CaptainsOffice/map.json +++ b/data/maps/SSAnne_CaptainsOffice/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 617a770b3..be784748a 100644 --- a/data/maps/SSAnne_Deck/map.json +++ b/data/maps/SSAnne_Deck/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 12c466510..c37b2ac5c 100644 --- a/data/maps/SSAnne_Exterior/map.json +++ b/data/maps/SSAnne_Exterior/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 579f9e9b0..d97f89317 100644 --- a/data/maps/SSAnne_Kitchen/map.json +++ b/data/maps/SSAnne_Kitchen/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 4dfdda04d..cc2bd0e60 100644 --- a/data/maps/SafariZone_Center/map.json +++ b/data/maps/SafariZone_Center/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_ROUTE", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 fc4cbf67c..fd3453ef3 100644 --- a/data/maps/SafariZone_Center_RestHouse/map.json +++ b/data/maps/SafariZone_Center_RestHouse/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 5ba1d08dc..a7d35c6fa 100644 --- a/data/maps/SafariZone_East/map.json +++ b/data/maps/SafariZone_East/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_ROUTE", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 d491771d0..12e13fbaa 100644 --- a/data/maps/SafariZone_East_RestHouse/map.json +++ b/data/maps/SafariZone_East_RestHouse/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 79b4a1d2f..a4a73f8e2 100644 --- a/data/maps/SafariZone_North/map.json +++ b/data/maps/SafariZone_North/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_ROUTE", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 48fc58755..98ac35b33 100644 --- a/data/maps/SafariZone_North_RestHouse/map.json +++ b/data/maps/SafariZone_North_RestHouse/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 df02367a4..cac992d41 100644 --- a/data/maps/SafariZone_SecretHouse/map.json +++ b/data/maps/SafariZone_SecretHouse/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 cee77b0b3..451f7e96d 100644 --- a/data/maps/SafariZone_West/map.json +++ b/data/maps/SafariZone_West/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_ROUTE", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 a387fe992..4119d0714 100644 --- a/data/maps/SafariZone_West_RestHouse/map.json +++ b/data/maps/SafariZone_West_RestHouse/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 83dc3497f..bfd629e91 100644 --- a/data/maps/SaffronCity/map.json +++ b/data/maps/SaffronCity/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_1", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_TOWN", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 718007c43..30bcffa06 100644 --- a/data/maps/SaffronCity_Connection/map.json +++ b/data/maps/SaffronCity_Connection/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_1", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_TOWN", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 bb33e6ea3..9ae377f7c 100644 --- a/data/maps/SaffronCity_CopycatsHouse_1F/map.json +++ b/data/maps/SaffronCity_CopycatsHouse_1F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 ab920aa73..9460fd5ca 100644 --- a/data/maps/SaffronCity_CopycatsHouse_2F/map.json +++ b/data/maps/SaffronCity_CopycatsHouse_2F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 699ead653..8f747efd5 100644 --- a/data/maps/SaffronCity_Dojo/map.json +++ b/data/maps/SaffronCity_Dojo/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 0ebd439e5..24dd19564 100644 --- a/data/maps/SaffronCity_Gym/map.json +++ b/data/maps/SaffronCity_Gym/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 1, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_1", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": true, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, + "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 48b569e5e..df8e80208 100644 --- a/data/maps/SaffronCity_House/map.json +++ b/data/maps/SaffronCity_House/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 ddce0c6d9..31374c459 100644 --- a/data/maps/SaffronCity_Mart/map.json +++ b/data/maps/SaffronCity_Mart/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 f1d121850..62047365a 100644 --- a/data/maps/SaffronCity_MrPsychicsHouse/map.json +++ b/data/maps/SaffronCity_MrPsychicsHouse/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 1d28ff69a..0744a0812 100644 --- a/data/maps/SaffronCity_PokemonCenter_1F/map.json +++ b/data/maps/SaffronCity_PokemonCenter_1F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 62b084caf..aeb3b40b6 100644 --- a/data/maps/SaffronCity_PokemonCenter_2F/map.json +++ b/data/maps/SaffronCity_PokemonCenter_2F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 f8f892dca..764ae5897 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 9006cac0a..fd9c6ca25 100644 --- a/data/maps/SeafoamIslands_1F/map.json +++ b/data/maps/SeafoamIslands_1F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_SEAFOAM_ISLANDS", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 ed0f29ae1..528d46ae9 100644 --- a/data/maps/SeafoamIslands_B1F/map.json +++ b/data/maps/SeafoamIslands_B1F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_SEAFOAM_ISLANDS", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 3e6f5f257..5c7219195 100644 --- a/data/maps/SeafoamIslands_B2F/map.json +++ b/data/maps/SeafoamIslands_B2F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_SEAFOAM_ISLANDS", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 e5c9cc7d1..02f2224ff 100644 --- a/data/maps/SeafoamIslands_B3F/map.json +++ b/data/maps/SeafoamIslands_B3F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_SEAFOAM_ISLANDS", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 22a8851ac..eae9e0c51 100644 --- a/data/maps/SeafoamIslands_B4F/map.json +++ b/data/maps/SeafoamIslands_B4F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_SEAFOAM_ISLANDS", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 8eab1efa3..065d2935d 100644 --- a/data/maps/SevenIsland/map.json +++ b/data/maps/SevenIsland/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_1", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_TOWN", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 aad741634..2a82fa1c1 100644 --- a/data/maps/SevenIsland_Harbor/map.json +++ b/data/maps/SevenIsland_Harbor/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 690fa63d8..1251e6366 100644 --- a/data/maps/SevenIsland_House_Room1/map.json +++ b/data/maps/SevenIsland_House_Room1/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_1", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, + "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 678716dcc..6309618e5 100644 --- a/data/maps/SevenIsland_House_Room2/map.json +++ b/data/maps/SevenIsland_House_Room2/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_1", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, + "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 b505a4a93..8d1fcf724 100644 --- a/data/maps/SevenIsland_Mart/map.json +++ b/data/maps/SevenIsland_Mart/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 e620814b4..e1bb2ec18 100644 --- a/data/maps/SevenIsland_PokemonCenter_1F/map.json +++ b/data/maps/SevenIsland_PokemonCenter_1F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 0d08ea5d1..e4249d7d5 100644 --- a/data/maps/SevenIsland_PokemonCenter_2F/map.json +++ b/data/maps/SevenIsland_PokemonCenter_2F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 ccd0c8ddd..b051ac85d 100644 --- a/data/maps/SevenIsland_SevaultCanyon/map.json +++ b/data/maps/SevenIsland_SevaultCanyon/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_SEVAULT_CANYON", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_ROUTE", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 0bf40fca3..f235bf795 100644 --- a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_CANYON_ENTRANCE", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_ROUTE", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 864ce7c59..d58fdc0ce 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_House/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_SEVAULT_CANYON", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 6c16bf0c0..fee7f725a 100644 --- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_TANOBY_KEY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_2", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, + "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 3f50db9fe..9955ca74f 100644 --- a/data/maps/SevenIsland_TanobyRuins/map.json +++ b/data/maps/SevenIsland_TanobyRuins/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_TANOBY_RUINS", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_ROUTE", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 ddb7b332e..6e8b55f18 100644 --- a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_DILFORD_CHAMBER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_2", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, + "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 72183cadb..36ae546ee 100644 --- a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_LIPTOO_CHAMBER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_2", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, + "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 9685ccfe6..e7fc05f59 100644 --- a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_MONEAN_CHAMBER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_2", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, + "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 ba84889d5..c974e67a5 100644 --- a/data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_RIXY_CHAMBER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_2", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, + "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 d21ec2792..0a604bfdd 100644 --- a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_SCUFIB_CHAMBER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_2", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, + "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 fd2e1317c..c201caaf8 100644 --- a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_VIAPOIS_CHAMBER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_2", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, + "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 c53a81f80..e85de29ad 100644 --- a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_WEEPTH_CHAMBER", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_2", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, + "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 31a250297..be28ff7b0 100644 --- a/data/maps/SevenIsland_TrainerTower/map.json +++ b/data/maps/SevenIsland_TrainerTower/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_TRAINER_TOWER", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_ROUTE", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 bebe3f71e..df2883596 100644 --- a/data/maps/SilphCo_10F/map.json +++ b/data/maps/SilphCo_10F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 7, - "elevator_flag": 10, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 10, + "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 19b187c08..ad4efd4f0 100644 --- a/data/maps/SilphCo_11F/map.json +++ b/data/maps/SilphCo_11F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 7, - "elevator_flag": 11, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 11, + "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 b4e329490..68748ef13 100644 --- a/data/maps/SilphCo_1F/map.json +++ b/data/maps/SilphCo_1F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 7, - "elevator_flag": 1, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 1, + "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 89439ba8a..249c2faea 100644 --- a/data/maps/SilphCo_2F/map.json +++ b/data/maps/SilphCo_2F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 7, - "elevator_flag": 2, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 2, + "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 42a1e6b72..9a0439095 100644 --- a/data/maps/SilphCo_3F/map.json +++ b/data/maps/SilphCo_3F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 7, - "elevator_flag": 3, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 3, + "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 6473f3c5d..63bdff97e 100644 --- a/data/maps/SilphCo_4F/map.json +++ b/data/maps/SilphCo_4F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 7, - "elevator_flag": 4, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 4, + "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 834d3c9eb..c1890a062 100644 --- a/data/maps/SilphCo_5F/map.json +++ b/data/maps/SilphCo_5F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 7, - "elevator_flag": 5, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 5, + "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 f5e701cf2..5c27ff76a 100644 --- a/data/maps/SilphCo_6F/map.json +++ b/data/maps/SilphCo_6F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 7, - "elevator_flag": 6, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 6, + "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 994088fb0..ef3630954 100644 --- a/data/maps/SilphCo_7F/map.json +++ b/data/maps/SilphCo_7F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 7, - "elevator_flag": 7, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 7, + "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 badb0553e..db566d2dd 100644 --- a/data/maps/SilphCo_8F/map.json +++ b/data/maps/SilphCo_8F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 7, - "elevator_flag": 8, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 8, + "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 92a229699..f8bbd2b69 100644 --- a/data/maps/SilphCo_9F/map.json +++ b/data/maps/SilphCo_9F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 7, - "elevator_flag": 9, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 9, + "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 857d5c209..446e891f2 100644 --- a/data/maps/SilphCo_Elevator/map.json +++ b/data/maps/SilphCo_Elevator/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 9df09bc51..e26f7bf49 100644 --- a/data/maps/SixIsland/map.json +++ b/data/maps/SixIsland/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_SIX_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_1", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_TOWN", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 b8141664e..124496895 100644 --- a/data/maps/SixIsland_AlteringCave/map.json +++ b/data/maps/SixIsland_AlteringCave/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ALTERING_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 d83c3d58b..f581ee319 100644 --- a/data/maps/SixIsland_DottedHole_1F/map.json +++ b/data/maps/SixIsland_DottedHole_1F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_DOTTED_HOLE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 9d264d645..5f4ded240 100644 --- a/data/maps/SixIsland_DottedHole_B1F/map.json +++ b/data/maps/SixIsland_DottedHole_B1F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_DOTTED_HOLE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 0dd58ba70..3106f7d83 100644 --- a/data/maps/SixIsland_DottedHole_B2F/map.json +++ b/data/maps/SixIsland_DottedHole_B2F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_DOTTED_HOLE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 df77a280c..300c46114 100644 --- a/data/maps/SixIsland_DottedHole_B3F/map.json +++ b/data/maps/SixIsland_DottedHole_B3F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_DOTTED_HOLE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 56e07628d..95e9c10b4 100644 --- a/data/maps/SixIsland_DottedHole_B4F/map.json +++ b/data/maps/SixIsland_DottedHole_B4F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_DOTTED_HOLE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 0acc6464e..19782a330 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_DOTTED_HOLE", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 40ddb539d..35d4cfb3f 100644 --- a/data/maps/SixIsland_GreenPath/map.json +++ b/data/maps/SixIsland_GreenPath/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_GREEN_PATH", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_ROUTE", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 8b6059fb2..feb7ada29 100644 --- a/data/maps/SixIsland_Harbor/map.json +++ b/data/maps/SixIsland_Harbor/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_SIX_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 ec39e8197..67f1d4f31 100644 --- a/data/maps/SixIsland_House/map.json +++ b/data/maps/SixIsland_House/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_SIX_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 54f2ec17c..b366a1d17 100644 --- a/data/maps/SixIsland_Mart/map.json +++ b/data/maps/SixIsland_Mart/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_SIX_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 e8a0aff0b..3498c7f3f 100644 --- a/data/maps/SixIsland_OutcastIsland/map.json +++ b/data/maps/SixIsland_OutcastIsland/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_OUTCAST_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_ROUTE", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 ada89bce9..8354730a5 100644 --- a/data/maps/SixIsland_PatternBush/map.json +++ b/data/maps/SixIsland_PatternBush/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_PATTERN_BUSH", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_ROUTE", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 f3154e3fc..2d14e64af 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/map.json +++ b/data/maps/SixIsland_PokemonCenter_1F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_SIX_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 f8088db9a..ce44fdfd2 100644 --- a/data/maps/SixIsland_PokemonCenter_2F/map.json +++ b/data/maps/SixIsland_PokemonCenter_2F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_SIX_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 5e35f5a91..5020e7380 100644 --- a/data/maps/SixIsland_RuinValley/map.json +++ b/data/maps/SixIsland_RuinValley/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_RUIN_VALLEY", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_ROUTE", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 edd2ac240..befdd7949 100644 --- a/data/maps/SixIsland_WaterPath/map.json +++ b/data/maps/SixIsland_WaterPath/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_WATER_PATH", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_ROUTE", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 1405f0707..c65f54deb 100644 --- a/data/maps/SixIsland_WaterPath_House1/map.json +++ b/data/maps/SixIsland_WaterPath_House1/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_WATER_PATH", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 91221239f..e53676524 100644 --- a/data/maps/SixIsland_WaterPath_House2/map.json +++ b/data/maps/SixIsland_WaterPath_House2/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_WATER_PATH", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 2e758df5e..f9ed4394b 100644 --- a/data/maps/ThreeIsland/map.json +++ b/data/maps/ThreeIsland/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_1", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_TOWN", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 d3ba4d3c3..ce8a868ef 100644 --- a/data/maps/ThreeIsland_BerryForest/map.json +++ b/data/maps/ThreeIsland_BerryForest/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_BERRY_FOREST", "requires_flash": false, "weather": "WEATHER_SHADE", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_ROUTE", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 993732967..fa674ecd9 100644 --- a/data/maps/ThreeIsland_BondBridge/map.json +++ b/data/maps/ThreeIsland_BondBridge/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_BOND_BRIDGE", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_ROUTE", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 84f116348..3570c9e17 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/map.json +++ b/data/maps/ThreeIsland_DunsparceTunnel/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_THREE_ISLE_PATH", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 e609a4011..7bd2aa8e5 100644 --- a/data/maps/ThreeIsland_Harbor/map.json +++ b/data/maps/ThreeIsland_Harbor/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_THREE_ISLE_PORT", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 dfe2a6c9a..7d7384735 100644 --- a/data/maps/ThreeIsland_House1/map.json +++ b/data/maps/ThreeIsland_House1/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 41d291f8e..2ba098fd0 100644 --- a/data/maps/ThreeIsland_House2/map.json +++ b/data/maps/ThreeIsland_House2/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 b4adfbb86..0de23d4a8 100644 --- a/data/maps/ThreeIsland_House3/map.json +++ b/data/maps/ThreeIsland_House3/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 dfd8bb1d9..6a45fb357 100644 --- a/data/maps/ThreeIsland_House4/map.json +++ b/data/maps/ThreeIsland_House4/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 2e50fa9da..a774260f0 100644 --- a/data/maps/ThreeIsland_House5/map.json +++ b/data/maps/ThreeIsland_House5/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 6d66f0fe2..7a89a37b1 100644 --- a/data/maps/ThreeIsland_Mart/map.json +++ b/data/maps/ThreeIsland_Mart/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 ede9d59ab..070879098 100644 --- a/data/maps/ThreeIsland_PokemonCenter_1F/map.json +++ b/data/maps/ThreeIsland_PokemonCenter_1F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 84cea2d4f..4941fe37a 100644 --- a/data/maps/ThreeIsland_PokemonCenter_2F/map.json +++ b/data/maps/ThreeIsland_PokemonCenter_2F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 47aff8ea7..10469dc61 100644 --- a/data/maps/ThreeIsland_Port/map.json +++ b/data/maps/ThreeIsland_Port/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_THREE_ISLE_PORT", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_ROUTE", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 2ffdfab5c..f4c54c987 100644 --- a/data/maps/TradeCenter/map.json +++ b/data/maps/TradeCenter/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_SPECIAL_AREA", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 925dbdd69..20d83f19f 100644 --- a/data/maps/TrainerTower_1F/map.json +++ b/data/maps/TrainerTower_1F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 2, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": false, + "floor_number": 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 e2e2f4c97..9d60b2650 100644 --- a/data/maps/TrainerTower_2F/map.json +++ b/data/maps/TrainerTower_2F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 2, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": false, + "floor_number": 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 8db22b61d..a53c516b8 100644 --- a/data/maps/TrainerTower_3F/map.json +++ b/data/maps/TrainerTower_3F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 2, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": false, + "floor_number": 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 32c868e91..04378d0a4 100644 --- a/data/maps/TrainerTower_4F/map.json +++ b/data/maps/TrainerTower_4F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 2, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": false, + "floor_number": 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 7a32b597c..569eaf978 100644 --- a/data/maps/TrainerTower_5F/map.json +++ b/data/maps/TrainerTower_5F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 2, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": false, + "floor_number": 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 05491cf05..128bb457a 100644 --- a/data/maps/TrainerTower_6F/map.json +++ b/data/maps/TrainerTower_6F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 2, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": false, + "floor_number": 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 76f2a53f4..62e1bbe84 100644 --- a/data/maps/TrainerTower_7F/map.json +++ b/data/maps/TrainerTower_7F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 2, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": false, + "floor_number": 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 26cabfb06..125751b98 100644 --- a/data/maps/TrainerTower_8F/map.json +++ b/data/maps/TrainerTower_8F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 2, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": false, + "floor_number": 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 7d004c2df..ce626e2cf 100644 --- a/data/maps/TrainerTower_Elevator/map.json +++ b/data/maps/TrainerTower_Elevator/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 2, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": false, + "floor_number": 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 23e8456c0..da2cdb07f 100644 --- a/data/maps/TrainerTower_Lobby/map.json +++ b/data/maps/TrainerTower_Lobby/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 2, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": false, + "floor_number": 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 c9a98a144..985f2f186 100644 --- a/data/maps/TrainerTower_Roof/map.json +++ b/data/maps/TrainerTower_Roof/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 2, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": false, + "floor_number": 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 556aa49da..20dd0f53e 100644 --- a/data/maps/TwoIsland/map.json +++ b/data/maps/TwoIsland/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_TWO_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_1", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_TOWN", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 a6a957d2c..34a6766de 100644 --- a/data/maps/TwoIsland_CapeBrink/map.json +++ b/data/maps/TwoIsland_CapeBrink/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_CAPE_BRINK", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_ROUTE", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 71a48a62b..5de5be5fa 100644 --- a/data/maps/TwoIsland_CapeBrink_House/map.json +++ b/data/maps/TwoIsland_CapeBrink_House/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_CAPE_BRINK", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 e4a7a2084..694c644f3 100644 --- a/data/maps/TwoIsland_Harbor/map.json +++ b/data/maps/TwoIsland_Harbor/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_TWO_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 83f302e66..da5033107 100644 --- a/data/maps/TwoIsland_House/map.json +++ b/data/maps/TwoIsland_House/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_TWO_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 21435179e..f8c3e8446 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/map.json +++ b/data/maps/TwoIsland_JoyfulGameCorner/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_TWO_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 d8abc60f9..96da34e0b 100644 --- a/data/maps/TwoIsland_PokemonCenter_1F/map.json +++ b/data/maps/TwoIsland_PokemonCenter_1F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_TWO_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 86ef55e25..726bcfe11 100644 --- a/data/maps/TwoIsland_PokemonCenter_2F/map.json +++ b/data/maps/TwoIsland_PokemonCenter_2F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_TWO_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 8a82619c0..eee3d31bf 100644 --- a/data/maps/UndergroundPath_EastEntrance/map.json +++ b/data/maps/UndergroundPath_EastEntrance/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_UNDERGROUND_PATH_2", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 6a4f5d9b4..7f53b384e 100644 --- a/data/maps/UndergroundPath_EastWestTunnel/map.json +++ b/data/maps/UndergroundPath_EastWestTunnel/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_UNDERGROUND_PATH_2", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 d5fbc5df9..6052b6192 100644 --- a/data/maps/UndergroundPath_NorthEntrance/map.json +++ b/data/maps/UndergroundPath_NorthEntrance/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_UNDERGROUND_PATH", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 0f0482504..35b7477b5 100644 --- a/data/maps/UndergroundPath_NorthSouthTunnel/map.json +++ b/data/maps/UndergroundPath_NorthSouthTunnel/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_UNDERGROUND_PATH", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 604e544cd..ec8a01a32 100644 --- a/data/maps/UndergroundPath_SouthEntrance/map.json +++ b/data/maps/UndergroundPath_SouthEntrance/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_UNDERGROUND_PATH", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 8e8d2f662..6fae45cf2 100644 --- a/data/maps/UndergroundPath_WestEntrance/map.json +++ b/data/maps/UndergroundPath_WestEntrance/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_UNDERGROUND_PATH_2", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 7427f28c3..f46654c7b 100644 --- a/data/maps/UnionRoom/map.json +++ b/data/maps/UnionRoom/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_SPECIAL_AREA", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_8", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, + "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 7bb76e956..a00f28f90 100644 --- a/data/maps/UnknownMap_18_01/map.json +++ b/data/maps/UnknownMap_18_01/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_6", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 60ba28d54..6d93604e4 100644 --- a/data/maps/UnusedHouse_27_00/map.json +++ b/data/maps/UnusedHouse_27_00/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_19", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 db312a5a9..50dfe3d62 100644 --- a/data/maps/UnusedHouse_29_00/map.json +++ b/data/maps/UnusedHouse_29_00/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_23", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 0bd404adb..21ec7325d 100644 --- a/data/maps/UnusedHouse_31_05/map.json +++ b/data/maps/UnusedHouse_31_05/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 0a5fe287a..faf8f70f5 100644 --- a/data/maps/VermilionCity/map.json +++ b/data/maps/VermilionCity/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_1", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_TOWN", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 628d88070..4b0325bc1 100644 --- a/data/maps/VermilionCity_Gym/map.json +++ b/data/maps/VermilionCity_Gym/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_1", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, + "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 008e98610..6ec3be3f9 100644 --- a/data/maps/VermilionCity_House1/map.json +++ b/data/maps/VermilionCity_House1/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 3c40bf806..c22ef4744 100644 --- a/data/maps/VermilionCity_House2/map.json +++ b/data/maps/VermilionCity_House2/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 2f715b1e3..fdbb6bd3e 100644 --- a/data/maps/VermilionCity_House3/map.json +++ b/data/maps/VermilionCity_House3/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 3ef4658f1..dfff61410 100644 --- a/data/maps/VermilionCity_Mart/map.json +++ b/data/maps/VermilionCity_Mart/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 b9837fca2..595761c4f 100644 --- a/data/maps/VermilionCity_PokemonCenter_1F/map.json +++ b/data/maps/VermilionCity_PokemonCenter_1F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 ff7c1be19..00e7ce529 100644 --- a/data/maps/VermilionCity_PokemonCenter_2F/map.json +++ b/data/maps/VermilionCity_PokemonCenter_2F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 c669797e7..521e0c99f 100644 --- a/data/maps/VermilionCity_PokemonFanClub/map.json +++ b/data/maps/VermilionCity_PokemonFanClub/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 9f5ddc540..21d57ae5e 100644 --- a/data/maps/VictoryRoad_1F/map.json +++ b/data/maps/VictoryRoad_1F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_KANTO_VICTORY_ROAD", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 33024c025..764f448aa 100644 --- a/data/maps/VictoryRoad_2F/map.json +++ b/data/maps/VictoryRoad_2F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_KANTO_VICTORY_ROAD", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 ffde167e7..a5985e5fc 100644 --- a/data/maps/VictoryRoad_3F/map.json +++ b/data/maps/VictoryRoad_3F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_KANTO_VICTORY_ROAD", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_4", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 a83f47f5a..d9895c6b0 100644 --- a/data/maps/ViridianCity/map.json +++ b/data/maps/ViridianCity/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_VIRIDIAN_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_1", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_TOWN", + "allow_cycling": true, + "allow_escaping": false, + "allow_running": true, + "show_map_name": true, + "floor_number": 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 b4c9a93e4..f1188d2c0 100644 --- a/data/maps/ViridianCity_Gym/map.json +++ b/data/maps/ViridianCity_Gym/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_VIRIDIAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_1", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, + "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 167069bc6..29f185b71 100644 --- a/data/maps/ViridianCity_House1/map.json +++ b/data/maps/ViridianCity_House1/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_VIRIDIAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 dc80606ec..b5e65bbad 100644 --- a/data/maps/ViridianCity_House2/map.json +++ b/data/maps/ViridianCity_House2/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_VIRIDIAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 5a4ae7bc0..7b3de99b6 100644 --- a/data/maps/ViridianCity_Mart/map.json +++ b/data/maps/ViridianCity_Mart/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_VIRIDIAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 c531d4b59..780087d1b 100644 --- a/data/maps/ViridianCity_PokemonCenter_1F/map.json +++ b/data/maps/ViridianCity_PokemonCenter_1F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_VIRIDIAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 a552725f9..967493db5 100644 --- a/data/maps/ViridianCity_PokemonCenter_2F/map.json +++ b/data/maps/ViridianCity_PokemonCenter_2F/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_VIRIDIAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_INDOOR", + "allow_cycling": false, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 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 97f28ced9..8a92127ae 100644 --- a/data/maps/ViridianForest/map.json +++ b/data/maps/ViridianForest/map.json @@ -6,11 +6,13 @@ "region_map_section": "MAPSEC_VIRIDIAN_FOREST", "requires_flash": false, "weather": "WEATHER_SHADE", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 7, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", + "map_type": "MAP_TYPE_ROUTE", + "allow_cycling": true, + "allow_escaping": true, + "allow_running": true, + "show_map_name": true, + "floor_number": 0, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { |