diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-03-10 23:13:27 -0400 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2020-04-28 19:59:08 -0500 |
| commit | b1d26e10a829a2a1526754b88167485df7e2511f (patch) | |
| tree | c7bc3138a1f0a131a713457e4905ebc71c10b677 | |
| parent | 724ffe14ee2be59a34dc6a397f6579cc0d820cff (diff) | |
Sync map header property names with pokefirered
527 files changed, 1053 insertions, 1053 deletions
diff --git a/asm/macros/map.inc b/asm/macros/map.inc index c98364ccc..b520eb216 100644 --- a/asm/macros/map.inc +++ b/asm/macros/map.inc @@ -102,6 +102,6 @@ .space 2 .endm - .macro map_header_flags allow_bike:req, allow_escape_rope:req, allow_run:req, show_map_name:req - .byte ((\show_map_name & 1) << 3) | ((\allow_run & 1) << 2) | ((\allow_escape_rope & 1) << 1) | \allow_bike + .macro map_header_flags allow_cycling:req, allow_escaping:req, allow_running:req, show_map_name:req + .byte ((\show_map_name & 1) << 3) | ((\allow_running & 1) << 2) | ((\allow_escaping & 1) << 1) | \allow_cycling .endm diff --git a/data/maps/AbandonedShip_CaptainsOffice/map.json b/data/maps/AbandonedShip_CaptainsOffice/map.json index 52615f6f3..ec11915d2 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/map.json +++ b/data/maps/AbandonedShip_CaptainsOffice/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SHADE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/AbandonedShip_Corridors_1F/map.json b/data/maps/AbandonedShip_Corridors_1F/map.json index 305d14fe3..7769efd04 100644 --- a/data/maps/AbandonedShip_Corridors_1F/map.json +++ b/data/maps/AbandonedShip_Corridors_1F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SHADE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/AbandonedShip_Corridors_B1F/map.json b/data/maps/AbandonedShip_Corridors_B1F/map.json index ff45d9830..e8c38fffe 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/map.json +++ b/data/maps/AbandonedShip_Corridors_B1F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SHADE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/AbandonedShip_Deck/map.json b/data/maps/AbandonedShip_Deck/map.json index 8e8529716..781dfa193 100644 --- a/data/maps/AbandonedShip_Deck/map.json +++ b/data/maps/AbandonedShip_Deck/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/map.json b/data/maps/AbandonedShip_HiddenFloorCorridors/map.json index 87d802c59..22c63c092 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/map.json +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SHADE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/map.json b/data/maps/AbandonedShip_HiddenFloorRooms/map.json index 00e128fb4..e8514b989 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/map.json +++ b/data/maps/AbandonedShip_HiddenFloorRooms/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SHADE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/AbandonedShip_Room_B1F/map.json b/data/maps/AbandonedShip_Room_B1F/map.json index 912f954f7..def6adb0a 100644 --- a/data/maps/AbandonedShip_Room_B1F/map.json +++ b/data/maps/AbandonedShip_Room_B1F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SHADE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/AbandonedShip_Rooms2_1F/map.json b/data/maps/AbandonedShip_Rooms2_1F/map.json index 4c35de804..0dddc27c4 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/map.json +++ b/data/maps/AbandonedShip_Rooms2_1F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SHADE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/AbandonedShip_Rooms2_B1F/map.json b/data/maps/AbandonedShip_Rooms2_B1F/map.json index 6dbcc98e4..98ed038d0 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/map.json +++ b/data/maps/AbandonedShip_Rooms2_B1F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SHADE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/AbandonedShip_Rooms_1F/map.json b/data/maps/AbandonedShip_Rooms_1F/map.json index 06fb770fe..c87bf800f 100644 --- a/data/maps/AbandonedShip_Rooms_1F/map.json +++ b/data/maps/AbandonedShip_Rooms_1F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SHADE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/AbandonedShip_Rooms_B1F/map.json b/data/maps/AbandonedShip_Rooms_B1F/map.json index bd07334b3..72a91f6a3 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/map.json +++ b/data/maps/AbandonedShip_Rooms_B1F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SHADE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/AbandonedShip_Underwater1/map.json b/data/maps/AbandonedShip_Underwater1/map.json index cc8a1cddc..5b2273528 100644 --- a/data/maps/AbandonedShip_Underwater1/map.json +++ b/data/maps/AbandonedShip_Underwater1/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_UNDERWATER_BUBBLES", "map_type": "MAP_TYPE_UNDERWATER", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/AbandonedShip_Underwater2/map.json b/data/maps/AbandonedShip_Underwater2/map.json index 5327e3aa1..5032eb4fc 100644 --- a/data/maps/AbandonedShip_Underwater2/map.json +++ b/data/maps/AbandonedShip_Underwater2/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_UNDERWATER_BUBBLES", "map_type": "MAP_TYPE_UNDERWATER", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/AlteringCave/map.json b/data/maps/AlteringCave/map.json index d466df7ca..df36f588d 100644 --- a/data/maps/AlteringCave/map.json +++ b/data/maps/AlteringCave/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/AncientTomb/map.json b/data/maps/AncientTomb/map.json index 62c2f7a3e..a3e5a9e63 100644 --- a/data/maps/AncientTomb/map.json +++ b/data/maps/AncientTomb/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/AquaHideout_1F/map.json b/data/maps/AquaHideout_1F/map.json index 1f34d5d50..d4e7b0080 100644 --- a/data/maps/AquaHideout_1F/map.json +++ b/data/maps/AquaHideout_1F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_AQUA", diff --git a/data/maps/AquaHideout_B1F/map.json b/data/maps/AquaHideout_B1F/map.json index bd47bd552..e75348fb5 100644 --- a/data/maps/AquaHideout_B1F/map.json +++ b/data/maps/AquaHideout_B1F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_AQUA", diff --git a/data/maps/AquaHideout_B2F/map.json b/data/maps/AquaHideout_B2F/map.json index e9d99d90b..a0eedea12 100644 --- a/data/maps/AquaHideout_B2F/map.json +++ b/data/maps/AquaHideout_B2F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_AQUA", diff --git a/data/maps/AquaHideout_UnusedRubyMap1/map.json b/data/maps/AquaHideout_UnusedRubyMap1/map.json index ac21b7f2d..b641e80d1 100644 --- a/data/maps/AquaHideout_UnusedRubyMap1/map.json +++ b/data/maps/AquaHideout_UnusedRubyMap1/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_MAGMA", diff --git a/data/maps/AquaHideout_UnusedRubyMap2/map.json b/data/maps/AquaHideout_UnusedRubyMap2/map.json index 26dde7f5b..6690e5259 100644 --- a/data/maps/AquaHideout_UnusedRubyMap2/map.json +++ b/data/maps/AquaHideout_UnusedRubyMap2/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_MAGMA", diff --git a/data/maps/AquaHideout_UnusedRubyMap3/map.json b/data/maps/AquaHideout_UnusedRubyMap3/map.json index 26ed361ae..d1a9d6843 100644 --- a/data/maps/AquaHideout_UnusedRubyMap3/map.json +++ b/data/maps/AquaHideout_UnusedRubyMap3/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_MAGMA", diff --git a/data/maps/ArtisanCave_1F/map.json b/data/maps/ArtisanCave_1F/map.json index 855721fda..5dc474f49 100644 --- a/data/maps/ArtisanCave_1F/map.json +++ b/data/maps/ArtisanCave_1F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/ArtisanCave_B1F/map.json b/data/maps/ArtisanCave_B1F/map.json index f2147b789..f9267d402 100644 --- a/data/maps/ArtisanCave_B1F/map.json +++ b/data/maps/ArtisanCave_B1F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/BattleColosseum_2P/map.json b/data/maps/BattleColosseum_2P/map.json index 38890914e..d84f058c5 100644 --- a/data/maps/BattleColosseum_2P/map.json +++ b/data/maps/BattleColosseum_2P/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", diff --git a/data/maps/BattleColosseum_4P/map.json b/data/maps/BattleColosseum_4P/map.json index 6bb9950b0..4a7e250be 100644 --- a/data/maps/BattleColosseum_4P/map.json +++ b/data/maps/BattleColosseum_4P/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/map.json b/data/maps/BattleFrontier_BattleArenaBattleRoom/map.json index b6c43b167..534ec7645 100644 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/map.json +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/map.json b/data/maps/BattleFrontier_BattleArenaCorridor/map.json index 311fb807f..ae1828e4b 100644 --- a/data/maps/BattleFrontier_BattleArenaCorridor/map.json +++ b/data/maps/BattleFrontier_BattleArenaCorridor/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/BattleFrontier_BattleArenaLobby/map.json b/data/maps/BattleFrontier_BattleArenaLobby/map.json index 3ab0d21f3..42bdc46c6 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/map.json +++ b/data/maps/BattleFrontier_BattleArenaLobby/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/map.json b/data/maps/BattleFrontier_BattleDomeBattleRoom/map.json index 5690e9eb9..463570401 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/map.json +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/map.json b/data/maps/BattleFrontier_BattleDomeCorridor/map.json index 987ea14df..a088eddcc 100644 --- a/data/maps/BattleFrontier_BattleDomeCorridor/map.json +++ b/data/maps/BattleFrontier_BattleDomeCorridor/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/BattleFrontier_BattleDomeLobby/map.json b/data/maps/BattleFrontier_BattleDomeLobby/map.json index cdd79b899..094b09450 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/map.json +++ b/data/maps/BattleFrontier_BattleDomeLobby/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/map.json b/data/maps/BattleFrontier_BattleDomePreBattleRoom/map.json index 35eea5787..3d4c8acd1 100644 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/map.json +++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/map.json b/data/maps/BattleFrontier_BattleFactoryBattleRoom/map.json index 2bfd0fe45..1ab1e707e 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/map.json +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/map.json b/data/maps/BattleFrontier_BattleFactoryLobby/map.json index bd0b12ff3..26e87cdfa 100644 --- a/data/maps/BattleFrontier_BattleFactoryLobby/map.json +++ b/data/maps/BattleFrontier_BattleFactoryLobby/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.json b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.json index 900e54d77..68b199483 100644 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.json +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/map.json b/data/maps/BattleFrontier_BattlePalaceBattleRoom/map.json index ca356ecb7..240cd5a8d 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/map.json +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/map.json b/data/maps/BattleFrontier_BattlePalaceCorridor/map.json index ac4319ee8..4c75216a8 100644 --- a/data/maps/BattleFrontier_BattlePalaceCorridor/map.json +++ b/data/maps/BattleFrontier_BattlePalaceCorridor/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/map.json b/data/maps/BattleFrontier_BattlePalaceLobby/map.json index fcfc6893c..6856a02bf 100644 --- a/data/maps/BattleFrontier_BattlePalaceLobby/map.json +++ b/data/maps/BattleFrontier_BattlePalaceLobby/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/map.json b/data/maps/BattleFrontier_BattlePikeCorridor/map.json index e2fd0e106..ed0862a42 100644 --- a/data/maps/BattleFrontier_BattlePikeCorridor/map.json +++ b/data/maps/BattleFrontier_BattlePikeCorridor/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": true, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/BattleFrontier_BattlePikeLobby/map.json b/data/maps/BattleFrontier_BattlePikeLobby/map.json index ac039b624..0b93ada24 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/map.json +++ b/data/maps/BattleFrontier_BattlePikeLobby/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/BattleFrontier_BattlePikeRoomFinal/map.json b/data/maps/BattleFrontier_BattlePikeRoomFinal/map.json index 3b44e85fe..2e4c3cf27 100644 --- a/data/maps/BattleFrontier_BattlePikeRoomFinal/map.json +++ b/data/maps/BattleFrontier_BattlePikeRoomFinal/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": true, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/BattleFrontier_BattlePikeRoomNormal/map.json b/data/maps/BattleFrontier_BattlePikeRoomNormal/map.json index ca7fc8159..e65823941 100644 --- a/data/maps/BattleFrontier_BattlePikeRoomNormal/map.json +++ b/data/maps/BattleFrontier_BattlePikeRoomNormal/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": true, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/BattleFrontier_BattlePikeRoomWildMons/map.json b/data/maps/BattleFrontier_BattlePikeRoomWildMons/map.json index e68e29b89..433bff630 100644 --- a/data/maps/BattleFrontier_BattlePikeRoomWildMons/map.json +++ b/data/maps/BattleFrontier_BattlePikeRoomWildMons/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": true, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json b/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json index 7fd2e1c88..9ec070037 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": true, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/BattleFrontier_BattlePyramidFloor/map.json b/data/maps/BattleFrontier_BattlePyramidFloor/map.json index 159cb784a..be0394d86 100644 --- a/data/maps/BattleFrontier_BattlePyramidFloor/map.json +++ b/data/maps/BattleFrontier_BattlePyramidFloor/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": true, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/map.json b/data/maps/BattleFrontier_BattlePyramidLobby/map.json index f2cbede37..de6e58809 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/map.json +++ b/data/maps/BattleFrontier_BattlePyramidLobby/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/BattleFrontier_BattlePyramidTop/map.json b/data/maps/BattleFrontier_BattlePyramidTop/map.json index df3702538..4e8d0df9a 100644 --- a/data/maps/BattleFrontier_BattlePyramidTop/map.json +++ b/data/maps/BattleFrontier_BattlePyramidTop/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": true, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/map.json b/data/maps/BattleFrontier_BattleTowerBattleRoom/map.json index b58ed2b8c..c3462a2a4 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/map.json +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/map.json b/data/maps/BattleFrontier_BattleTowerCorridor/map.json index 329e5a2e4..b0ab6383d 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor/map.json +++ b/data/maps/BattleFrontier_BattleTowerCorridor/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/BattleFrontier_BattleTowerElevator/map.json b/data/maps/BattleFrontier_BattleTowerElevator/map.json index f9baf201f..1aa19433e 100644 --- a/data/maps/BattleFrontier_BattleTowerElevator/map.json +++ b/data/maps/BattleFrontier_BattleTowerElevator/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/BattleFrontier_BattleTowerLobby/map.json b/data/maps/BattleFrontier_BattleTowerLobby/map.json index 2be4721b7..1d2a840a6 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/map.json +++ b/data/maps/BattleFrontier_BattleTowerLobby/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json index 223455f69..15c6e0d65 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", diff --git a/data/maps/BattleFrontier_BattleTowerMultiCorridor/map.json b/data/maps/BattleFrontier_BattleTowerMultiCorridor/map.json index ffc92b00a..e7b4d8bbc 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiCorridor/map.json +++ b/data/maps/BattleFrontier_BattleTowerMultiCorridor/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/map.json b/data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/map.json index 89f7be300..e51368685 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/map.json +++ b/data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": true, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", @@ -135,4 +135,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattleFrontier_ExchangeServiceCorner/map.json b/data/maps/BattleFrontier_ExchangeServiceCorner/map.json index 00be52caf..32cbcd364 100644 --- a/data/maps/BattleFrontier_ExchangeServiceCorner/map.json +++ b/data/maps/BattleFrontier_ExchangeServiceCorner/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/BattleFrontier_Lounge1/map.json b/data/maps/BattleFrontier_Lounge1/map.json index 16153573b..fa38639ee 100644 --- a/data/maps/BattleFrontier_Lounge1/map.json +++ b/data/maps/BattleFrontier_Lounge1/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/BattleFrontier_Lounge2/map.json b/data/maps/BattleFrontier_Lounge2/map.json index 75c01f4b4..32a031804 100644 --- a/data/maps/BattleFrontier_Lounge2/map.json +++ b/data/maps/BattleFrontier_Lounge2/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/BattleFrontier_Lounge3/map.json b/data/maps/BattleFrontier_Lounge3/map.json index e0a6755fd..f241a6c3e 100644 --- a/data/maps/BattleFrontier_Lounge3/map.json +++ b/data/maps/BattleFrontier_Lounge3/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/BattleFrontier_Lounge4/map.json b/data/maps/BattleFrontier_Lounge4/map.json index c43d69f06..81916e2f9 100644 --- a/data/maps/BattleFrontier_Lounge4/map.json +++ b/data/maps/BattleFrontier_Lounge4/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/BattleFrontier_Lounge5/map.json b/data/maps/BattleFrontier_Lounge5/map.json index 97cf8df43..b7e507509 100644 --- a/data/maps/BattleFrontier_Lounge5/map.json +++ b/data/maps/BattleFrontier_Lounge5/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/BattleFrontier_Lounge6/map.json b/data/maps/BattleFrontier_Lounge6/map.json index 0ba285fbd..d57e5152b 100644 --- a/data/maps/BattleFrontier_Lounge6/map.json +++ b/data/maps/BattleFrontier_Lounge6/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/BattleFrontier_Lounge7/map.json b/data/maps/BattleFrontier_Lounge7/map.json index 4b265f59a..e1e044094 100644 --- a/data/maps/BattleFrontier_Lounge7/map.json +++ b/data/maps/BattleFrontier_Lounge7/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/BattleFrontier_Lounge8/map.json b/data/maps/BattleFrontier_Lounge8/map.json index aa974f1d1..a4459995d 100644 --- a/data/maps/BattleFrontier_Lounge8/map.json +++ b/data/maps/BattleFrontier_Lounge8/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/BattleFrontier_Lounge9/map.json b/data/maps/BattleFrontier_Lounge9/map.json index f5bf1ef18..aec491366 100644 --- a/data/maps/BattleFrontier_Lounge9/map.json +++ b/data/maps/BattleFrontier_Lounge9/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/BattleFrontier_Mart/map.json b/data/maps/BattleFrontier_Mart/map.json index c561316b3..83a28d509 100644 --- a/data/maps/BattleFrontier_Mart/map.json +++ b/data/maps/BattleFrontier_Mart/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/BattleFrontier_OutsideEast/map.json b/data/maps/BattleFrontier_OutsideEast/map.json index 5f1517188..7be257ee9 100644 --- a/data/maps/BattleFrontier_OutsideEast/map.json +++ b/data/maps/BattleFrontier_OutsideEast/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_ROUTE", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/BattleFrontier_OutsideWest/map.json b/data/maps/BattleFrontier_OutsideWest/map.json index ba7ea615a..c526bbfc9 100644 --- a/data/maps/BattleFrontier_OutsideWest/map.json +++ b/data/maps/BattleFrontier_OutsideWest/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_ROUTE", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/map.json b/data/maps/BattleFrontier_PokemonCenter_1F/map.json index 7e90fc9df..d9950b740 100644 --- a/data/maps/BattleFrontier_PokemonCenter_1F/map.json +++ b/data/maps/BattleFrontier_PokemonCenter_1F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/map.json b/data/maps/BattleFrontier_PokemonCenter_2F/map.json index d36bcce73..63d3630a4 100644 --- a/data/maps/BattleFrontier_PokemonCenter_2F/map.json +++ b/data/maps/BattleFrontier_PokemonCenter_2F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/BattleFrontier_RankingHall/map.json b/data/maps/BattleFrontier_RankingHall/map.json index c2205cd51..2f2f27d13 100644 --- a/data/maps/BattleFrontier_RankingHall/map.json +++ b/data/maps/BattleFrontier_RankingHall/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/BattleFrontier_ReceptionGate/map.json b/data/maps/BattleFrontier_ReceptionGate/map.json index ab82eec3e..10266a40e 100644 --- a/data/maps/BattleFrontier_ReceptionGate/map.json +++ b/data/maps/BattleFrontier_ReceptionGate/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/BattleFrontier_ScottsHouse/map.json b/data/maps/BattleFrontier_ScottsHouse/map.json index c1314f0ce..f9568c66a 100644 --- a/data/maps/BattleFrontier_ScottsHouse/map.json +++ b/data/maps/BattleFrontier_ScottsHouse/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/BattlePyramidSquare01/map.json b/data/maps/BattlePyramidSquare01/map.json index e96b67b57..0a28339aa 100644 --- a/data/maps/BattlePyramidSquare01/map.json +++ b/data/maps/BattlePyramidSquare01/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_GYM", diff --git a/data/maps/BattlePyramidSquare02/map.json b/data/maps/BattlePyramidSquare02/map.json index b7ead588f..fa464fc25 100644 --- a/data/maps/BattlePyramidSquare02/map.json +++ b/data/maps/BattlePyramidSquare02/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_GYM", diff --git a/data/maps/BattlePyramidSquare03/map.json b/data/maps/BattlePyramidSquare03/map.json index f4bdf3a6c..7affd19b2 100644 --- a/data/maps/BattlePyramidSquare03/map.json +++ b/data/maps/BattlePyramidSquare03/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_GYM", diff --git a/data/maps/BattlePyramidSquare04/map.json b/data/maps/BattlePyramidSquare04/map.json index 5c33ba43a..28a3ff46d 100644 --- a/data/maps/BattlePyramidSquare04/map.json +++ b/data/maps/BattlePyramidSquare04/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_GYM", diff --git a/data/maps/BattlePyramidSquare05/map.json b/data/maps/BattlePyramidSquare05/map.json index c2568930e..ad2999bc3 100644 --- a/data/maps/BattlePyramidSquare05/map.json +++ b/data/maps/BattlePyramidSquare05/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_GYM", diff --git a/data/maps/BattlePyramidSquare06/map.json b/data/maps/BattlePyramidSquare06/map.json index 885754bf4..7758af0bb 100644 --- a/data/maps/BattlePyramidSquare06/map.json +++ b/data/maps/BattlePyramidSquare06/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_GYM", diff --git a/data/maps/BattlePyramidSquare07/map.json b/data/maps/BattlePyramidSquare07/map.json index 47366507e..71239e378 100644 --- a/data/maps/BattlePyramidSquare07/map.json +++ b/data/maps/BattlePyramidSquare07/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_GYM", diff --git a/data/maps/BattlePyramidSquare08/map.json b/data/maps/BattlePyramidSquare08/map.json index 12fbcb2ed..179b98158 100644 --- a/data/maps/BattlePyramidSquare08/map.json +++ b/data/maps/BattlePyramidSquare08/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_GYM", diff --git a/data/maps/BattlePyramidSquare09/map.json b/data/maps/BattlePyramidSquare09/map.json index 6d21aea94..9523705af 100644 --- a/data/maps/BattlePyramidSquare09/map.json +++ b/data/maps/BattlePyramidSquare09/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_GYM", diff --git a/data/maps/BattlePyramidSquare10/map.json b/data/maps/BattlePyramidSquare10/map.json index 0bf2b034a..f276de8a9 100644 --- a/data/maps/BattlePyramidSquare10/map.json +++ b/data/maps/BattlePyramidSquare10/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_GYM", diff --git a/data/maps/BattlePyramidSquare11/map.json b/data/maps/BattlePyramidSquare11/map.json index dd52e9889..86e4cbe91 100644 --- a/data/maps/BattlePyramidSquare11/map.json +++ b/data/maps/BattlePyramidSquare11/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_GYM", diff --git a/data/maps/BattlePyramidSquare12/map.json b/data/maps/BattlePyramidSquare12/map.json index 0095f1a6f..1ca53830c 100644 --- a/data/maps/BattlePyramidSquare12/map.json +++ b/data/maps/BattlePyramidSquare12/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_GYM", diff --git a/data/maps/BattlePyramidSquare13/map.json b/data/maps/BattlePyramidSquare13/map.json index 7a5df9386..0457060af 100644 --- a/data/maps/BattlePyramidSquare13/map.json +++ b/data/maps/BattlePyramidSquare13/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_GYM", diff --git a/data/maps/BattlePyramidSquare14/map.json b/data/maps/BattlePyramidSquare14/map.json index b78f0d3a7..7c2655537 100644 --- a/data/maps/BattlePyramidSquare14/map.json +++ b/data/maps/BattlePyramidSquare14/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_GYM", diff --git a/data/maps/BattlePyramidSquare15/map.json b/data/maps/BattlePyramidSquare15/map.json index 0dd07fdf5..7b569fe0a 100644 --- a/data/maps/BattlePyramidSquare15/map.json +++ b/data/maps/BattlePyramidSquare15/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_GYM", diff --git a/data/maps/BattlePyramidSquare16/map.json b/data/maps/BattlePyramidSquare16/map.json index 9f8532eb5..962a3809b 100644 --- a/data/maps/BattlePyramidSquare16/map.json +++ b/data/maps/BattlePyramidSquare16/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_GYM", diff --git a/data/maps/BirthIsland_Exterior/map.json b/data/maps/BirthIsland_Exterior/map.json index d52f5f038..c05a31bbd 100644 --- a/data/maps/BirthIsland_Exterior/map.json +++ b/data/maps/BirthIsland_Exterior/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/BirthIsland_Harbor/map.json b/data/maps/BirthIsland_Harbor/map.json index d86867fd7..3a3f133cf 100644 --- a/data/maps/BirthIsland_Harbor/map.json +++ b/data/maps/BirthIsland_Harbor/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/CaveOfOrigin_1F/map.json b/data/maps/CaveOfOrigin_1F/map.json index 91f2b7ccd..36af5ca31 100644 --- a/data/maps/CaveOfOrigin_1F/map.json +++ b/data/maps/CaveOfOrigin_1F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/CaveOfOrigin_B1F/map.json b/data/maps/CaveOfOrigin_B1F/map.json index 3338a548b..8e5f4bc19 100644 --- a/data/maps/CaveOfOrigin_B1F/map.json +++ b/data/maps/CaveOfOrigin_B1F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": false, - "allow_escape_rope": true, + "allow_cycling": false, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/CaveOfOrigin_Entrance/map.json b/data/maps/CaveOfOrigin_Entrance/map.json index 2dea41998..78a8e58e0 100644 --- a/data/maps/CaveOfOrigin_Entrance/map.json +++ b/data/maps/CaveOfOrigin_Entrance/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.json b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.json index effba642d..f27b15b85 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.json +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.json @@ -7,8 +7,8 @@ "requires_flash": true, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.json b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.json index f979db343..5a377947c 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.json +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.json @@ -7,8 +7,8 @@ "requires_flash": true, "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.json b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.json index d4f5f63f1..85f82b886 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.json +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.json @@ -7,8 +7,8 @@ "requires_flash": true, "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/ContestHall/map.json b/data/maps/ContestHall/map.json index 61cf464e1..2967415f2 100644 --- a/data/maps/ContestHall/map.json +++ b/data/maps/ContestHall/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/ContestHallBeauty/map.json b/data/maps/ContestHallBeauty/map.json index a521bb6af..f0cb9168f 100644 --- a/data/maps/ContestHallBeauty/map.json +++ b/data/maps/ContestHallBeauty/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/ContestHallCool/map.json b/data/maps/ContestHallCool/map.json index 4e9678ec6..4d1aa639e 100644 --- a/data/maps/ContestHallCool/map.json +++ b/data/maps/ContestHallCool/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/ContestHallCute/map.json b/data/maps/ContestHallCute/map.json index 0bde21948..4b81a3192 100644 --- a/data/maps/ContestHallCute/map.json +++ b/data/maps/ContestHallCute/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/ContestHallSmart/map.json b/data/maps/ContestHallSmart/map.json index 4f5e6f407..42d16f911 100644 --- a/data/maps/ContestHallSmart/map.json +++ b/data/maps/ContestHallSmart/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/ContestHallTough/map.json b/data/maps/ContestHallTough/map.json index 1142738da..4e460cd98 100644 --- a/data/maps/ContestHallTough/map.json +++ b/data/maps/ContestHallTough/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/DesertRuins/map.json b/data/maps/DesertRuins/map.json index 4b8042e24..45b77605a 100644 --- a/data/maps/DesertRuins/map.json +++ b/data/maps/DesertRuins/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/DesertUnderpass/map.json b/data/maps/DesertUnderpass/map.json index f23e3e311..ec95017d1 100644 --- a/data/maps/DesertUnderpass/map.json +++ b/data/maps/DesertUnderpass/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/DewfordTown/map.json b/data/maps/DewfordTown/map.json index 240bc37fe..6d314fc26 100644 --- a/data/maps/DewfordTown/map.json +++ b/data/maps/DewfordTown/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_TOWN", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/DewfordTown_Gym/map.json b/data/maps/DewfordTown_Gym/map.json index 869072bcb..79125474f 100644 --- a/data/maps/DewfordTown_Gym/map.json +++ b/data/maps/DewfordTown_Gym/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_GYM", diff --git a/data/maps/DewfordTown_Hall/map.json b/data/maps/DewfordTown_Hall/map.json index f01815023..2e7cce0cb 100644 --- a/data/maps/DewfordTown_Hall/map.json +++ b/data/maps/DewfordTown_Hall/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/DewfordTown_House1/map.json b/data/maps/DewfordTown_House1/map.json index a77835ecf..fb8c91e82 100644 --- a/data/maps/DewfordTown_House1/map.json +++ b/data/maps/DewfordTown_House1/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/DewfordTown_House2/map.json b/data/maps/DewfordTown_House2/map.json index 0d589c357..6aa5a6949 100644 --- a/data/maps/DewfordTown_House2/map.json +++ b/data/maps/DewfordTown_House2/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/DewfordTown_PokemonCenter_1F/map.json b/data/maps/DewfordTown_PokemonCenter_1F/map.json index 4ea6e6248..dc7f86837 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/map.json +++ b/data/maps/DewfordTown_PokemonCenter_1F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/DewfordTown_PokemonCenter_2F/map.json b/data/maps/DewfordTown_PokemonCenter_2F/map.json index e72885ecb..b3ae61643 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/map.json +++ b/data/maps/DewfordTown_PokemonCenter_2F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/EverGrandeCity/map.json b/data/maps/EverGrandeCity/map.json index 2758236ec..5f67720e6 100644 --- a/data/maps/EverGrandeCity/map.json +++ b/data/maps/EverGrandeCity/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_CITY", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/EverGrandeCity_ChampionsRoom/map.json b/data/maps/EverGrandeCity_ChampionsRoom/map.json index fbfc6a902..2d8454699 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/map.json +++ b/data/maps/EverGrandeCity_ChampionsRoom/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/EverGrandeCity_DrakesRoom/map.json b/data/maps/EverGrandeCity_DrakesRoom/map.json index 62bd432e0..6c07621cf 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/map.json +++ b/data/maps/EverGrandeCity_DrakesRoom/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_DRAKE", diff --git a/data/maps/EverGrandeCity_GlaciasRoom/map.json b/data/maps/EverGrandeCity_GlaciasRoom/map.json index 44f2010da..82e3f6a5a 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/map.json +++ b/data/maps/EverGrandeCity_GlaciasRoom/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_GLACIA", diff --git a/data/maps/EverGrandeCity_Hall1/map.json b/data/maps/EverGrandeCity_Hall1/map.json index 862ccf4bb..692e7ff7c 100644 --- a/data/maps/EverGrandeCity_Hall1/map.json +++ b/data/maps/EverGrandeCity_Hall1/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/EverGrandeCity_Hall2/map.json b/data/maps/EverGrandeCity_Hall2/map.json index 06403ed9c..ea1203725 100644 --- a/data/maps/EverGrandeCity_Hall2/map.json +++ b/data/maps/EverGrandeCity_Hall2/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/EverGrandeCity_Hall3/map.json b/data/maps/EverGrandeCity_Hall3/map.json index 4c4ebfca5..327b28399 100644 --- a/data/maps/EverGrandeCity_Hall3/map.json +++ b/data/maps/EverGrandeCity_Hall3/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/EverGrandeCity_Hall4/map.json b/data/maps/EverGrandeCity_Hall4/map.json index 297170f8f..ff91999e0 100644 --- a/data/maps/EverGrandeCity_Hall4/map.json +++ b/data/maps/EverGrandeCity_Hall4/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/EverGrandeCity_Hall5/map.json b/data/maps/EverGrandeCity_Hall5/map.json index 4d67b6b3e..562e11565 100644 --- a/data/maps/EverGrandeCity_Hall5/map.json +++ b/data/maps/EverGrandeCity_Hall5/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/EverGrandeCity_HallOfFame/map.json b/data/maps/EverGrandeCity_HallOfFame/map.json index 393a7b96b..4889525d1 100644 --- a/data/maps/EverGrandeCity_HallOfFame/map.json +++ b/data/maps/EverGrandeCity_HallOfFame/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/EverGrandeCity_PhoebesRoom/map.json b/data/maps/EverGrandeCity_PhoebesRoom/map.json index 72981147c..f6ad10404 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/map.json +++ b/data/maps/EverGrandeCity_PhoebesRoom/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_PHOEBE", diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/map.json b/data/maps/EverGrandeCity_PokemonCenter_1F/map.json index 83d8f7a94..bc87f05bf 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/map.json +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/map.json b/data/maps/EverGrandeCity_PokemonCenter_2F/map.json index cb5df65b2..73190981d 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/map.json +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/map.json b/data/maps/EverGrandeCity_PokemonLeague_1F/map.json index a258ebd38..74c2ff0a7 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/map.json +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/map.json b/data/maps/EverGrandeCity_PokemonLeague_2F/map.json index ad042dd65..abe39dfc6 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_2F/map.json +++ b/data/maps/EverGrandeCity_PokemonLeague_2F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/EverGrandeCity_SidneysRoom/map.json b/data/maps/EverGrandeCity_SidneysRoom/map.json index e1d878f75..bed9cac19 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/map.json +++ b/data/maps/EverGrandeCity_SidneysRoom/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_SIDNEY", diff --git a/data/maps/FallarborTown/map.json b/data/maps/FallarborTown/map.json index 191b23200..1d0bea4c7 100644 --- a/data/maps/FallarborTown/map.json +++ b/data/maps/FallarborTown/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_TOWN", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/map.json b/data/maps/FallarborTown_BattleTentBattleRoom/map.json index be922e946..1ceb28a1f 100644 --- a/data/maps/FallarborTown_BattleTentBattleRoom/map.json +++ b/data/maps/FallarborTown_BattleTentBattleRoom/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/FallarborTown_BattleTentCorridor/map.json b/data/maps/FallarborTown_BattleTentCorridor/map.json index fd315091d..f81b247d2 100644 --- a/data/maps/FallarborTown_BattleTentCorridor/map.json +++ b/data/maps/FallarborTown_BattleTentCorridor/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/FallarborTown_BattleTentLobby/map.json b/data/maps/FallarborTown_BattleTentLobby/map.json index d0a1855f8..4d5714d94 100644 --- a/data/maps/FallarborTown_BattleTentLobby/map.json +++ b/data/maps/FallarborTown_BattleTentLobby/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/FallarborTown_CozmosHouse/map.json b/data/maps/FallarborTown_CozmosHouse/map.json index 77187255a..bec2ec3e0 100644 --- a/data/maps/FallarborTown_CozmosHouse/map.json +++ b/data/maps/FallarborTown_CozmosHouse/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/FallarborTown_Mart/map.json b/data/maps/FallarborTown_Mart/map.json index bf72fa1d9..4b8770740 100644 --- a/data/maps/FallarborTown_Mart/map.json +++ b/data/maps/FallarborTown_Mart/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/FallarborTown_MoveRelearnersHouse/map.json b/data/maps/FallarborTown_MoveRelearnersHouse/map.json index 12b0f13ef..ad56c71c3 100644 --- a/data/maps/FallarborTown_MoveRelearnersHouse/map.json +++ b/data/maps/FallarborTown_MoveRelearnersHouse/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/FallarborTown_PokemonCenter_1F/map.json b/data/maps/FallarborTown_PokemonCenter_1F/map.json index 00ab6142b..59e4511ca 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/map.json +++ b/data/maps/FallarborTown_PokemonCenter_1F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/FallarborTown_PokemonCenter_2F/map.json b/data/maps/FallarborTown_PokemonCenter_2F/map.json index 668a7cb2d..224666745 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/map.json +++ b/data/maps/FallarborTown_PokemonCenter_2F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/FarawayIsland_Entrance/map.json b/data/maps/FarawayIsland_Entrance/map.json index 9ce127385..ddc5ccc08 100644 --- a/data/maps/FarawayIsland_Entrance/map.json +++ b/data/maps/FarawayIsland_Entrance/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/FarawayIsland_Interior/map.json b/data/maps/FarawayIsland_Interior/map.json index fce5bf34e..81b8c394f 100644 --- a/data/maps/FarawayIsland_Interior/map.json +++ b/data/maps/FarawayIsland_Interior/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SHADE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/FieryPath/map.json b/data/maps/FieryPath/map.json index 4760caebc..1f034696b 100644 --- a/data/maps/FieryPath/map.json +++ b/data/maps/FieryPath/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/FortreeCity/map.json b/data/maps/FortreeCity/map.json index 991f0930f..7ca6ce483 100644 --- a/data/maps/FortreeCity/map.json +++ b/data/maps/FortreeCity/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_CITY", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/FortreeCity_DecorationShop/map.json b/data/maps/FortreeCity_DecorationShop/map.json index 3511822fd..56578caf3 100644 --- a/data/maps/FortreeCity_DecorationShop/map.json +++ b/data/maps/FortreeCity_DecorationShop/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/FortreeCity_Gym/map.json b/data/maps/FortreeCity_Gym/map.json index 6fc0ff6a9..50abf65ea 100644 --- a/data/maps/FortreeCity_Gym/map.json +++ b/data/maps/FortreeCity_Gym/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_GYM", diff --git a/data/maps/FortreeCity_House1/map.json b/data/maps/FortreeCity_House1/map.json index 44bbb2d3d..7defbd912 100644 --- a/data/maps/FortreeCity_House1/map.json +++ b/data/maps/FortreeCity_House1/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/FortreeCity_House2/map.json b/data/maps/FortreeCity_House2/map.json index 21fb09b52..2ec2b39d0 100644 --- a/data/maps/FortreeCity_House2/map.json +++ b/data/maps/FortreeCity_House2/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/FortreeCity_House3/map.json b/data/maps/FortreeCity_House3/map.json index 71b8eef43..039859005 100644 --- a/data/maps/FortreeCity_House3/map.json +++ b/data/maps/FortreeCity_House3/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/FortreeCity_House4/map.json b/data/maps/FortreeCity_House4/map.json index 7eda47251..4ca8617b2 100644 --- a/data/maps/FortreeCity_House4/map.json +++ b/data/maps/FortreeCity_House4/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/FortreeCity_House5/map.json b/data/maps/FortreeCity_House5/map.json index 8b6b64bbc..2757fa458 100644 --- a/data/maps/FortreeCity_House5/map.json +++ b/data/maps/FortreeCity_House5/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/FortreeCity_Mart/map.json b/data/maps/FortreeCity_Mart/map.json index 4c3f311b1..0c43a8b5b 100644 --- a/data/maps/FortreeCity_Mart/map.json +++ b/data/maps/FortreeCity_Mart/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/FortreeCity_PokemonCenter_1F/map.json b/data/maps/FortreeCity_PokemonCenter_1F/map.json index 045f4f82b..81583367e 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/map.json +++ b/data/maps/FortreeCity_PokemonCenter_1F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/FortreeCity_PokemonCenter_2F/map.json b/data/maps/FortreeCity_PokemonCenter_2F/map.json index 12db0e367..435ca3991 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/map.json +++ b/data/maps/FortreeCity_PokemonCenter_2F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/GraniteCave_1F/map.json b/data/maps/GraniteCave_1F/map.json index e5eec44c6..d25c6a387 100644 --- a/data/maps/GraniteCave_1F/map.json +++ b/data/maps/GraniteCave_1F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/GraniteCave_B1F/map.json b/data/maps/GraniteCave_B1F/map.json index 83469027d..13e943e8a 100644 --- a/data/maps/GraniteCave_B1F/map.json +++ b/data/maps/GraniteCave_B1F/map.json @@ -7,8 +7,8 @@ "requires_flash": true, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/GraniteCave_B2F/map.json b/data/maps/GraniteCave_B2F/map.json index 6aca4b1e0..8609f8116 100644 --- a/data/maps/GraniteCave_B2F/map.json +++ b/data/maps/GraniteCave_B2F/map.json @@ -7,8 +7,8 @@ "requires_flash": true, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/GraniteCave_StevensRoom/map.json b/data/maps/GraniteCave_StevensRoom/map.json index c471a8f55..48de500a3 100644 --- a/data/maps/GraniteCave_StevensRoom/map.json +++ b/data/maps/GraniteCave_StevensRoom/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/InsideOfTruck/map.json b/data/maps/InsideOfTruck/map.json index 25c361ee6..48d15d853 100644 --- a/data/maps/InsideOfTruck/map.json +++ b/data/maps/InsideOfTruck/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/IslandCave/map.json b/data/maps/IslandCave/map.json index 861b7d04a..80720bf8e 100644 --- a/data/maps/IslandCave/map.json +++ b/data/maps/IslandCave/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/JaggedPass/map.json b/data/maps/JaggedPass/map.json index ff3b05780..2678bfad9 100644 --- a/data/maps/JaggedPass/map.json +++ b/data/maps/JaggedPass/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_ROUTE", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/LavaridgeTown/map.json b/data/maps/LavaridgeTown/map.json index 428809e76..fad7bdfe5 100644 --- a/data/maps/LavaridgeTown/map.json +++ b/data/maps/LavaridgeTown/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_TOWN", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/LavaridgeTown_Gym_1F/map.json b/data/maps/LavaridgeTown_Gym_1F/map.json index 07cb25fa5..28ca271fd 100644 --- a/data/maps/LavaridgeTown_Gym_1F/map.json +++ b/data/maps/LavaridgeTown_Gym_1F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_GYM", diff --git a/data/maps/LavaridgeTown_Gym_B1F/map.json b/data/maps/LavaridgeTown_Gym_B1F/map.json index 86e245ea6..3cb342c14 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/map.json +++ b/data/maps/LavaridgeTown_Gym_B1F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_GYM", diff --git a/data/maps/LavaridgeTown_HerbShop/map.json b/data/maps/LavaridgeTown_HerbShop/map.json index bf0abf521..970e428b8 100644 --- a/data/maps/LavaridgeTown_HerbShop/map.json +++ b/data/maps/LavaridgeTown_HerbShop/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/LavaridgeTown_House/map.json b/data/maps/LavaridgeTown_House/map.json index d40f639fd..385a03a33 100644 --- a/data/maps/LavaridgeTown_House/map.json +++ b/data/maps/LavaridgeTown_House/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/LavaridgeTown_Mart/map.json b/data/maps/LavaridgeTown_Mart/map.json index 929220a5b..230f537f9 100644 --- a/data/maps/LavaridgeTown_Mart/map.json +++ b/data/maps/LavaridgeTown_Mart/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/map.json b/data/maps/LavaridgeTown_PokemonCenter_1F/map.json index c8cd0d985..4dfa197a6 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/map.json +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/map.json b/data/maps/LavaridgeTown_PokemonCenter_2F/map.json index 53493ecf5..111958653 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/map.json +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/LilycoveCity/map.json b/data/maps/LilycoveCity/map.json index 5713bcce4..d6e561aed 100644 --- a/data/maps/LilycoveCity/map.json +++ b/data/maps/LilycoveCity/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_CITY", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/LilycoveCity_ContestHall/map.json b/data/maps/LilycoveCity_ContestHall/map.json index 8f2060acb..ff49237ec 100644 --- a/data/maps/LilycoveCity_ContestHall/map.json +++ b/data/maps/LilycoveCity_ContestHall/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/LilycoveCity_ContestLobby/map.json b/data/maps/LilycoveCity_ContestLobby/map.json index c26e002a3..18052fcd4 100644 --- a/data/maps/LilycoveCity_ContestLobby/map.json +++ b/data/maps/LilycoveCity_ContestLobby/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json b/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json index 46c75669a..75e1fc7cd 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json b/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json index 217d7164b..96cc14050 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/map.json b/data/maps/LilycoveCity_DepartmentStoreElevator/map.json index 6d9c85a8b..f7abdf22c 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/map.json +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json b/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json index d2577184f..6747672c8 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/map.json b/data/maps/LilycoveCity_DepartmentStore_1F/map.json index 4787b811d..adcc88b35 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_1F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/map.json b/data/maps/LilycoveCity_DepartmentStore_2F/map.json index ac1dda145..89c722f68 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_2F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/map.json b/data/maps/LilycoveCity_DepartmentStore_3F/map.json index 55f543df6..80653b159 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_3F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/map.json b/data/maps/LilycoveCity_DepartmentStore_4F/map.json index 4575903a1..9b1ffe21e 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_4F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/map.json b/data/maps/LilycoveCity_DepartmentStore_5F/map.json index fd352ea6d..57384679a 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_5F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/LilycoveCity_Harbor/map.json b/data/maps/LilycoveCity_Harbor/map.json index a64da745a..b1b5df00b 100644 --- a/data/maps/LilycoveCity_Harbor/map.json +++ b/data/maps/LilycoveCity_Harbor/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/LilycoveCity_House1/map.json b/data/maps/LilycoveCity_House1/map.json index 678ec2ec5..e444eb949 100644 --- a/data/maps/LilycoveCity_House1/map.json +++ b/data/maps/LilycoveCity_House1/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/LilycoveCity_House2/map.json b/data/maps/LilycoveCity_House2/map.json index 78690ae81..bc8358dfe 100644 --- a/data/maps/LilycoveCity_House2/map.json +++ b/data/maps/LilycoveCity_House2/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/LilycoveCity_House3/map.json b/data/maps/LilycoveCity_House3/map.json index 9149d6595..d0df946a4 100644 --- a/data/maps/LilycoveCity_House3/map.json +++ b/data/maps/LilycoveCity_House3/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/LilycoveCity_House4/map.json b/data/maps/LilycoveCity_House4/map.json index 94f97588a..1833c7373 100644 --- a/data/maps/LilycoveCity_House4/map.json +++ b/data/maps/LilycoveCity_House4/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json b/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json index 339f2c9c5..a5399e12d 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json b/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json index 20330b12f..bdd9bb255 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/map.json b/data/maps/LilycoveCity_MoveDeletersHouse/map.json index d2a1d1320..e58380acd 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/map.json +++ b/data/maps/LilycoveCity_MoveDeletersHouse/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/map.json b/data/maps/LilycoveCity_PokemonCenter_1F/map.json index 413c1ffd6..1ad40d566 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/map.json +++ b/data/maps/LilycoveCity_PokemonCenter_1F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/map.json b/data/maps/LilycoveCity_PokemonCenter_2F/map.json index e1c94bef2..b74eb36c0 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/map.json +++ b/data/maps/LilycoveCity_PokemonCenter_2F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json b/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json index 961d34831..9322c637b 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/LilycoveCity_UnusedMart/map.json b/data/maps/LilycoveCity_UnusedMart/map.json index afa6c739c..65c9b2295 100644 --- a/data/maps/LilycoveCity_UnusedMart/map.json +++ b/data/maps/LilycoveCity_UnusedMart/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/LittlerootTown/map.json b/data/maps/LittlerootTown/map.json index 236ded915..b3b70499e 100644 --- a/data/maps/LittlerootTown/map.json +++ b/data/maps/LittlerootTown/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_TOWN", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/map.json b/data/maps/LittlerootTown_BrendansHouse_1F/map.json index f0e881ec1..8d429af9d 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/map.json +++ b/data/maps/LittlerootTown_BrendansHouse_1F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/map.json b/data/maps/LittlerootTown_BrendansHouse_2F/map.json index 34ab79982..94de0fb8c 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/map.json +++ b/data/maps/LittlerootTown_BrendansHouse_2F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/LittlerootTown_MaysHouse_1F/map.json b/data/maps/LittlerootTown_MaysHouse_1F/map.json index 16b1eac73..6ade34ccd 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/map.json +++ b/data/maps/LittlerootTown_MaysHouse_1F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/LittlerootTown_MaysHouse_2F/map.json b/data/maps/LittlerootTown_MaysHouse_2F/map.json index 7366f9241..f4f5e660a 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/map.json +++ b/data/maps/LittlerootTown_MaysHouse_2F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/map.json b/data/maps/LittlerootTown_ProfessorBirchsLab/map.json index 0454c170a..2be02f56c 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/map.json +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/MagmaHideout_1F/map.json b/data/maps/MagmaHideout_1F/map.json index 98436b4da..527216b85 100644 --- a/data/maps/MagmaHideout_1F/map.json +++ b/data/maps/MagmaHideout_1F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/MagmaHideout_2F_1R/map.json b/data/maps/MagmaHideout_2F_1R/map.json index c30fcf317..b25446eba 100644 --- a/data/maps/MagmaHideout_2F_1R/map.json +++ b/data/maps/MagmaHideout_2F_1R/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/MagmaHideout_2F_2R/map.json b/data/maps/MagmaHideout_2F_2R/map.json index 164da412f..4eb7e7f6d 100644 --- a/data/maps/MagmaHideout_2F_2R/map.json +++ b/data/maps/MagmaHideout_2F_2R/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/MagmaHideout_2F_3R/map.json b/data/maps/MagmaHideout_2F_3R/map.json index af9dbd731..fbed23781 100644 --- a/data/maps/MagmaHideout_2F_3R/map.json +++ b/data/maps/MagmaHideout_2F_3R/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/MagmaHideout_3F_1R/map.json b/data/maps/MagmaHideout_3F_1R/map.json index 600e194ad..bcd70a4a0 100644 --- a/data/maps/MagmaHideout_3F_1R/map.json +++ b/data/maps/MagmaHideout_3F_1R/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/MagmaHideout_3F_2R/map.json b/data/maps/MagmaHideout_3F_2R/map.json index c5ed02b66..2d959465a 100644 --- a/data/maps/MagmaHideout_3F_2R/map.json +++ b/data/maps/MagmaHideout_3F_2R/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/MagmaHideout_3F_3R/map.json b/data/maps/MagmaHideout_3F_3R/map.json index 49d176ade..d10b6d01a 100644 --- a/data/maps/MagmaHideout_3F_3R/map.json +++ b/data/maps/MagmaHideout_3F_3R/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/MagmaHideout_4F/map.json b/data/maps/MagmaHideout_4F/map.json index 93d78e243..3dcc070d1 100644 --- a/data/maps/MagmaHideout_4F/map.json +++ b/data/maps/MagmaHideout_4F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/MarineCave_End/map.json b/data/maps/MarineCave_End/map.json index aaf7e6f81..e710d3ba3 100644 --- a/data/maps/MarineCave_End/map.json +++ b/data/maps/MarineCave_End/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": false, - "allow_escape_rope": true, + "allow_cycling": false, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/MarineCave_Entrance/map.json b/data/maps/MarineCave_Entrance/map.json index 4ae306651..541ccddc6 100644 --- a/data/maps/MarineCave_Entrance/map.json +++ b/data/maps/MarineCave_Entrance/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": false, - "allow_escape_rope": true, + "allow_cycling": false, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/MauvilleCity/map.json b/data/maps/MauvilleCity/map.json index 713c0553a..4c4f30a30 100644 --- a/data/maps/MauvilleCity/map.json +++ b/data/maps/MauvilleCity/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_CITY", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/MauvilleCity_BikeShop/map.json b/data/maps/MauvilleCity_BikeShop/map.json index 5f31275d0..883db0e4f 100644 --- a/data/maps/MauvilleCity_BikeShop/map.json +++ b/data/maps/MauvilleCity_BikeShop/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/MauvilleCity_GameCorner/map.json b/data/maps/MauvilleCity_GameCorner/map.json index 416ed44b5..f73c84632 100644 --- a/data/maps/MauvilleCity_GameCorner/map.json +++ b/data/maps/MauvilleCity_GameCorner/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/MauvilleCity_Gym/map.json b/data/maps/MauvilleCity_Gym/map.json index 56372cd73..a70360eb1 100644 --- a/data/maps/MauvilleCity_Gym/map.json +++ b/data/maps/MauvilleCity_Gym/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_GYM", diff --git a/data/maps/MauvilleCity_House1/map.json b/data/maps/MauvilleCity_House1/map.json index 96fdc1896..ec0c60228 100644 --- a/data/maps/MauvilleCity_House1/map.json +++ b/data/maps/MauvilleCity_House1/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/MauvilleCity_House2/map.json b/data/maps/MauvilleCity_House2/map.json index 1cac7e6e0..deb3a64b8 100644 --- a/data/maps/MauvilleCity_House2/map.json +++ b/data/maps/MauvilleCity_House2/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/MauvilleCity_Mart/map.json b/data/maps/MauvilleCity_Mart/map.json index d0f64ef00..c11e36429 100644 --- a/data/maps/MauvilleCity_Mart/map.json +++ b/data/maps/MauvilleCity_Mart/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/map.json b/data/maps/MauvilleCity_PokemonCenter_1F/map.json index a017b14b2..cdd8472f1 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/map.json +++ b/data/maps/MauvilleCity_PokemonCenter_1F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/map.json b/data/maps/MauvilleCity_PokemonCenter_2F/map.json index 7ea0ab81b..4990f755b 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/map.json +++ b/data/maps/MauvilleCity_PokemonCenter_2F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/MeteorFalls_1F_1R/map.json b/data/maps/MeteorFalls_1F_1R/map.json index 955933868..c9b9aad19 100644 --- a/data/maps/MeteorFalls_1F_1R/map.json +++ b/data/maps/MeteorFalls_1F_1R/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/MeteorFalls_1F_2R/map.json b/data/maps/MeteorFalls_1F_2R/map.json index 49843aa4a..a0cbbc821 100644 --- a/data/maps/MeteorFalls_1F_2R/map.json +++ b/data/maps/MeteorFalls_1F_2R/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/MeteorFalls_B1F_1R/map.json b/data/maps/MeteorFalls_B1F_1R/map.json index a58929a28..2db212dfa 100644 --- a/data/maps/MeteorFalls_B1F_1R/map.json +++ b/data/maps/MeteorFalls_B1F_1R/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/MeteorFalls_B1F_2R/map.json b/data/maps/MeteorFalls_B1F_2R/map.json index e874f1452..d3c7227b5 100644 --- a/data/maps/MeteorFalls_B1F_2R/map.json +++ b/data/maps/MeteorFalls_B1F_2R/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/MeteorFalls_StevensCave/map.json b/data/maps/MeteorFalls_StevensCave/map.json index 703d8d281..af104aac3 100644 --- a/data/maps/MeteorFalls_StevensCave/map.json +++ b/data/maps/MeteorFalls_StevensCave/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/MirageTower_1F/map.json b/data/maps/MirageTower_1F/map.json index 3ec89b5ae..91e15cc39 100644 --- a/data/maps/MirageTower_1F/map.json +++ b/data/maps/MirageTower_1F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/MirageTower_2F/map.json b/data/maps/MirageTower_2F/map.json index d49f2418a..5e9769db6 100644 --- a/data/maps/MirageTower_2F/map.json +++ b/data/maps/MirageTower_2F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/MirageTower_3F/map.json b/data/maps/MirageTower_3F/map.json index 3ed25e6c4..a7d764c51 100644 --- a/data/maps/MirageTower_3F/map.json +++ b/data/maps/MirageTower_3F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/MirageTower_4F/map.json b/data/maps/MirageTower_4F/map.json index 057495497..ec4427177 100644 --- a/data/maps/MirageTower_4F/map.json +++ b/data/maps/MirageTower_4F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/MossdeepCity/map.json b/data/maps/MossdeepCity/map.json index 7456a454a..7e2d13ed0 100644 --- a/data/maps/MossdeepCity/map.json +++ b/data/maps/MossdeepCity/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_CITY", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/MossdeepCity_GameCorner_1F/map.json b/data/maps/MossdeepCity_GameCorner_1F/map.json index dbc1180e1..9bd8f474f 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/map.json +++ b/data/maps/MossdeepCity_GameCorner_1F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/MossdeepCity_GameCorner_B1F/map.json b/data/maps/MossdeepCity_GameCorner_B1F/map.json index c1c046c38..fc0eb65a2 100644 --- a/data/maps/MossdeepCity_GameCorner_B1F/map.json +++ b/data/maps/MossdeepCity_GameCorner_B1F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/MossdeepCity_Gym/map.json b/data/maps/MossdeepCity_Gym/map.json index 3e57e496b..19f8a2103 100644 --- a/data/maps/MossdeepCity_Gym/map.json +++ b/data/maps/MossdeepCity_Gym/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_GYM", diff --git a/data/maps/MossdeepCity_House1/map.json b/data/maps/MossdeepCity_House1/map.json index 01a896163..44e0de4be 100644 --- a/data/maps/MossdeepCity_House1/map.json +++ b/data/maps/MossdeepCity_House1/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/MossdeepCity_House2/map.json b/data/maps/MossdeepCity_House2/map.json index 37007f0eb..5621fa7e7 100644 --- a/data/maps/MossdeepCity_House2/map.json +++ b/data/maps/MossdeepCity_House2/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/MossdeepCity_House3/map.json b/data/maps/MossdeepCity_House3/map.json index 233f543cc..60f87b042 100644 --- a/data/maps/MossdeepCity_House3/map.json +++ b/data/maps/MossdeepCity_House3/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/MossdeepCity_House4/map.json b/data/maps/MossdeepCity_House4/map.json index 028be796f..0cae63b35 100644 --- a/data/maps/MossdeepCity_House4/map.json +++ b/data/maps/MossdeepCity_House4/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/MossdeepCity_Mart/map.json b/data/maps/MossdeepCity_Mart/map.json index 25cc618ee..c185cec10 100644 --- a/data/maps/MossdeepCity_Mart/map.json +++ b/data/maps/MossdeepCity_Mart/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/map.json b/data/maps/MossdeepCity_PokemonCenter_1F/map.json index b198aeeb4..8ff353d62 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/map.json +++ b/data/maps/MossdeepCity_PokemonCenter_1F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/map.json b/data/maps/MossdeepCity_PokemonCenter_2F/map.json index b6cf6280b..9bc286228 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/map.json +++ b/data/maps/MossdeepCity_PokemonCenter_2F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/map.json b/data/maps/MossdeepCity_SpaceCenter_1F/map.json index b67d21f0e..8ca96a353 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/map.json +++ b/data/maps/MossdeepCity_SpaceCenter_1F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/map.json b/data/maps/MossdeepCity_SpaceCenter_2F/map.json index d0aae6927..f090b7884 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/map.json +++ b/data/maps/MossdeepCity_SpaceCenter_2F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/MossdeepCity_StevensHouse/map.json b/data/maps/MossdeepCity_StevensHouse/map.json index 56734b17e..6ed4fb9ef 100644 --- a/data/maps/MossdeepCity_StevensHouse/map.json +++ b/data/maps/MossdeepCity_StevensHouse/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/MtChimney/map.json b/data/maps/MtChimney/map.json index 9a6b3b8f5..fe11d5a29 100644 --- a/data/maps/MtChimney/map.json +++ b/data/maps/MtChimney/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_VOLCANIC_ASH", "map_type": "MAP_TYPE_ROUTE", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/MtChimney_CableCarStation/map.json b/data/maps/MtChimney_CableCarStation/map.json index 1894d41e5..88e573044 100644 --- a/data/maps/MtChimney_CableCarStation/map.json +++ b/data/maps/MtChimney_CableCarStation/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/MtPyre_1F/map.json b/data/maps/MtPyre_1F/map.json index 52f07f630..ba90907e9 100644 --- a/data/maps/MtPyre_1F/map.json +++ b/data/maps/MtPyre_1F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/MtPyre_2F/map.json b/data/maps/MtPyre_2F/map.json index 124719bbb..c723f7bf2 100644 --- a/data/maps/MtPyre_2F/map.json +++ b/data/maps/MtPyre_2F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/MtPyre_3F/map.json b/data/maps/MtPyre_3F/map.json index 67fdeddc1..075fe8dc6 100644 --- a/data/maps/MtPyre_3F/map.json +++ b/data/maps/MtPyre_3F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/MtPyre_4F/map.json b/data/maps/MtPyre_4F/map.json index 7db90d71b..a42f9d43e 100644 --- a/data/maps/MtPyre_4F/map.json +++ b/data/maps/MtPyre_4F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/MtPyre_5F/map.json b/data/maps/MtPyre_5F/map.json index f1cfedcb0..15e3a5575 100644 --- a/data/maps/MtPyre_5F/map.json +++ b/data/maps/MtPyre_5F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/MtPyre_6F/map.json b/data/maps/MtPyre_6F/map.json index c67582a8c..458627997 100644 --- a/data/maps/MtPyre_6F/map.json +++ b/data/maps/MtPyre_6F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/MtPyre_Exterior/map.json b/data/maps/MtPyre_Exterior/map.json index ff4c5b8fa..26677e301 100644 --- a/data/maps/MtPyre_Exterior/map.json +++ b/data/maps/MtPyre_Exterior/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_ROUTE", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/MtPyre_Summit/map.json b/data/maps/MtPyre_Summit/map.json index 87de8a4a8..0faae8436 100644 --- a/data/maps/MtPyre_Summit/map.json +++ b/data/maps/MtPyre_Summit/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_ROUTE", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/NavelRock_B1F/map.json b/data/maps/NavelRock_B1F/map.json index 0629b65ec..f7d969e21 100644 --- a/data/maps/NavelRock_B1F/map.json +++ b/data/maps/NavelRock_B1F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/NavelRock_Bottom/map.json b/data/maps/NavelRock_Bottom/map.json index 513b27ba0..c7bbc9b71 100644 --- a/data/maps/NavelRock_Bottom/map.json +++ b/data/maps/NavelRock_Bottom/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/NavelRock_Down01/map.json b/data/maps/NavelRock_Down01/map.json index 8c9072586..1c47e450e 100644 --- a/data/maps/NavelRock_Down01/map.json +++ b/data/maps/NavelRock_Down01/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/NavelRock_Down02/map.json b/data/maps/NavelRock_Down02/map.json index bcc420ad5..aaae333c3 100644 --- a/data/maps/NavelRock_Down02/map.json +++ b/data/maps/NavelRock_Down02/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/NavelRock_Down03/map.json b/data/maps/NavelRock_Down03/map.json index 36e0cce99..60acdc668 100644 --- a/data/maps/NavelRock_Down03/map.json +++ b/data/maps/NavelRock_Down03/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/NavelRock_Down04/map.json b/data/maps/NavelRock_Down04/map.json index b2a56b1b0..edfc400e7 100644 --- a/data/maps/NavelRock_Down04/map.json +++ b/data/maps/NavelRock_Down04/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/NavelRock_Down05/map.json b/data/maps/NavelRock_Down05/map.json index ebe78128f..f4d31fdff 100644 --- a/data/maps/NavelRock_Down05/map.json +++ b/data/maps/NavelRock_Down05/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/NavelRock_Down06/map.json b/data/maps/NavelRock_Down06/map.json index 5361dd4a3..ef20800f3 100644 --- a/data/maps/NavelRock_Down06/map.json +++ b/data/maps/NavelRock_Down06/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/NavelRock_Down07/map.json b/data/maps/NavelRock_Down07/map.json index 9c8cabe06..0019d726f 100644 --- a/data/maps/NavelRock_Down07/map.json +++ b/data/maps/NavelRock_Down07/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/NavelRock_Down08/map.json b/data/maps/NavelRock_Down08/map.json index 97bdf8831..17d50c0ed 100644 --- a/data/maps/NavelRock_Down08/map.json +++ b/data/maps/NavelRock_Down08/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/NavelRock_Down09/map.json b/data/maps/NavelRock_Down09/map.json index 3b01299f4..49713ffc3 100644 --- a/data/maps/NavelRock_Down09/map.json +++ b/data/maps/NavelRock_Down09/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/NavelRock_Down10/map.json b/data/maps/NavelRock_Down10/map.json index b7690246e..d736db5d9 100644 --- a/data/maps/NavelRock_Down10/map.json +++ b/data/maps/NavelRock_Down10/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/NavelRock_Down11/map.json b/data/maps/NavelRock_Down11/map.json index ffb1172a2..ac45da8a2 100644 --- a/data/maps/NavelRock_Down11/map.json +++ b/data/maps/NavelRock_Down11/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/NavelRock_Entrance/map.json b/data/maps/NavelRock_Entrance/map.json index bf47c8416..66d462f5f 100644 --- a/data/maps/NavelRock_Entrance/map.json +++ b/data/maps/NavelRock_Entrance/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/NavelRock_Exterior/map.json b/data/maps/NavelRock_Exterior/map.json index 43670a24f..8527705c1 100644 --- a/data/maps/NavelRock_Exterior/map.json +++ b/data/maps/NavelRock_Exterior/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/NavelRock_Fork/map.json b/data/maps/NavelRock_Fork/map.json index 6d2e1ff2d..a5301bd6b 100644 --- a/data/maps/NavelRock_Fork/map.json +++ b/data/maps/NavelRock_Fork/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/NavelRock_Harbor/map.json b/data/maps/NavelRock_Harbor/map.json index 950a473e5..9d70807d9 100644 --- a/data/maps/NavelRock_Harbor/map.json +++ b/data/maps/NavelRock_Harbor/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/NavelRock_Top/map.json b/data/maps/NavelRock_Top/map.json index 79bbf50c2..c7df16291 100644 --- a/data/maps/NavelRock_Top/map.json +++ b/data/maps/NavelRock_Top/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SHADE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/NavelRock_Up1/map.json b/data/maps/NavelRock_Up1/map.json index fb3c340f3..01dfcaffa 100644 --- a/data/maps/NavelRock_Up1/map.json +++ b/data/maps/NavelRock_Up1/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/NavelRock_Up2/map.json b/data/maps/NavelRock_Up2/map.json index c02625a61..0233edb78 100644 --- a/data/maps/NavelRock_Up2/map.json +++ b/data/maps/NavelRock_Up2/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/NavelRock_Up3/map.json b/data/maps/NavelRock_Up3/map.json index 8b6cf3a10..c12438fc9 100644 --- a/data/maps/NavelRock_Up3/map.json +++ b/data/maps/NavelRock_Up3/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/NavelRock_Up4/map.json b/data/maps/NavelRock_Up4/map.json index 045ace694..4cdcba842 100644 --- a/data/maps/NavelRock_Up4/map.json +++ b/data/maps/NavelRock_Up4/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/NewMauville_Entrance/map.json b/data/maps/NewMauville_Entrance/map.json index c12d086c1..71650200b 100644 --- a/data/maps/NewMauville_Entrance/map.json +++ b/data/maps/NewMauville_Entrance/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/NewMauville_Inside/map.json b/data/maps/NewMauville_Inside/map.json index 296ee07db..41ca6c255 100644 --- a/data/maps/NewMauville_Inside/map.json +++ b/data/maps/NewMauville_Inside/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/OldaleTown/map.json b/data/maps/OldaleTown/map.json index 226ae0c72..d7944a0d4 100644 --- a/data/maps/OldaleTown/map.json +++ b/data/maps/OldaleTown/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_TOWN", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/OldaleTown_House1/map.json b/data/maps/OldaleTown_House1/map.json index 6d9be59bd..48c5dd366 100644 --- a/data/maps/OldaleTown_House1/map.json +++ b/data/maps/OldaleTown_House1/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/OldaleTown_House2/map.json b/data/maps/OldaleTown_House2/map.json index 1fe1f898e..f01792fac 100644 --- a/data/maps/OldaleTown_House2/map.json +++ b/data/maps/OldaleTown_House2/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/OldaleTown_Mart/map.json b/data/maps/OldaleTown_Mart/map.json index c3444f580..5a8cd1ae3 100644 --- a/data/maps/OldaleTown_Mart/map.json +++ b/data/maps/OldaleTown_Mart/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/OldaleTown_PokemonCenter_1F/map.json b/data/maps/OldaleTown_PokemonCenter_1F/map.json index 5322efa63..f02ad63c7 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/map.json +++ b/data/maps/OldaleTown_PokemonCenter_1F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/OldaleTown_PokemonCenter_2F/map.json b/data/maps/OldaleTown_PokemonCenter_2F/map.json index 2fd9bdcd8..cb4e3fb27 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/map.json +++ b/data/maps/OldaleTown_PokemonCenter_2F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/PacifidlogTown/map.json b/data/maps/PacifidlogTown/map.json index 4a50baf23..0dfa6e4ea 100644 --- a/data/maps/PacifidlogTown/map.json +++ b/data/maps/PacifidlogTown/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_TOWN", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/PacifidlogTown_House1/map.json b/data/maps/PacifidlogTown_House1/map.json index 91c0cd406..a1752f72f 100644 --- a/data/maps/PacifidlogTown_House1/map.json +++ b/data/maps/PacifidlogTown_House1/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/PacifidlogTown_House2/map.json b/data/maps/PacifidlogTown_House2/map.json index 597776ec9..7c9864ea3 100644 --- a/data/maps/PacifidlogTown_House2/map.json +++ b/data/maps/PacifidlogTown_House2/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/PacifidlogTown_House3/map.json b/data/maps/PacifidlogTown_House3/map.json index 76e6a3fcc..6018398e9 100644 --- a/data/maps/PacifidlogTown_House3/map.json +++ b/data/maps/PacifidlogTown_House3/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/PacifidlogTown_House4/map.json b/data/maps/PacifidlogTown_House4/map.json index 577f7bc5e..b48290c04 100644 --- a/data/maps/PacifidlogTown_House4/map.json +++ b/data/maps/PacifidlogTown_House4/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/PacifidlogTown_House5/map.json b/data/maps/PacifidlogTown_House5/map.json index 85d5bc2b7..d7846ea91 100644 --- a/data/maps/PacifidlogTown_House5/map.json +++ b/data/maps/PacifidlogTown_House5/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/map.json b/data/maps/PacifidlogTown_PokemonCenter_1F/map.json index faa76da50..9bb540622 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/map.json +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/map.json b/data/maps/PacifidlogTown_PokemonCenter_2F/map.json index 19e5e0930..0bf581f49 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/map.json +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/PetalburgCity/map.json b/data/maps/PetalburgCity/map.json index cad421008..42c8565be 100644 --- a/data/maps/PetalburgCity/map.json +++ b/data/maps/PetalburgCity/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_CITY", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/PetalburgCity_Gym/map.json b/data/maps/PetalburgCity_Gym/map.json index 4791eab6b..55f132465 100644 --- a/data/maps/PetalburgCity_Gym/map.json +++ b/data/maps/PetalburgCity_Gym/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_GYM", diff --git a/data/maps/PetalburgCity_House1/map.json b/data/maps/PetalburgCity_House1/map.json index d163af603..82a6dfcfe 100644 --- a/data/maps/PetalburgCity_House1/map.json +++ b/data/maps/PetalburgCity_House1/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/PetalburgCity_House2/map.json b/data/maps/PetalburgCity_House2/map.json index 175ee2a85..ede56df0a 100644 --- a/data/maps/PetalburgCity_House2/map.json +++ b/data/maps/PetalburgCity_House2/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/PetalburgCity_Mart/map.json b/data/maps/PetalburgCity_Mart/map.json index f2b464c1f..311e59316 100644 --- a/data/maps/PetalburgCity_Mart/map.json +++ b/data/maps/PetalburgCity_Mart/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/map.json b/data/maps/PetalburgCity_PokemonCenter_1F/map.json index abf6a7b52..f9bb40f4d 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/map.json +++ b/data/maps/PetalburgCity_PokemonCenter_1F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/map.json b/data/maps/PetalburgCity_PokemonCenter_2F/map.json index fbd072681..601e19b29 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/map.json +++ b/data/maps/PetalburgCity_PokemonCenter_2F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/PetalburgCity_WallysHouse/map.json b/data/maps/PetalburgCity_WallysHouse/map.json index 765dae779..43ee0677b 100644 --- a/data/maps/PetalburgCity_WallysHouse/map.json +++ b/data/maps/PetalburgCity_WallysHouse/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/PetalburgWoods/map.json b/data/maps/PetalburgWoods/map.json index e01920825..9746b80e4 100644 --- a/data/maps/PetalburgWoods/map.json +++ b/data/maps/PetalburgWoods/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SHADE", "map_type": "MAP_TYPE_ROUTE", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/RecordCorner/map.json b/data/maps/RecordCorner/map.json index 96dadce00..0d5da85d5 100644 --- a/data/maps/RecordCorner/map.json +++ b/data/maps/RecordCorner/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route101/map.json b/data/maps/Route101/map.json index 3fb137830..fabe852f9 100644 --- a/data/maps/Route101/map.json +++ b/data/maps/Route101/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_ROUTE", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route102/map.json b/data/maps/Route102/map.json index 017368f20..78b6c6cd8 100644 --- a/data/maps/Route102/map.json +++ b/data/maps/Route102/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_ROUTE", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route103/map.json b/data/maps/Route103/map.json index 16ae2069e..bdfbe455a 100644 --- a/data/maps/Route103/map.json +++ b/data/maps/Route103/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_ROUTE", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route104/map.json b/data/maps/Route104/map.json index 7020232de..21f5e24c0 100644 --- a/data/maps/Route104/map.json +++ b/data/maps/Route104/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_ROUTE", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route104_MrBrineysHouse/map.json b/data/maps/Route104_MrBrineysHouse/map.json index 0963336e5..b416d8020 100644 --- a/data/maps/Route104_MrBrineysHouse/map.json +++ b/data/maps/Route104_MrBrineysHouse/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route104_PrettyPetalFlowerShop/map.json b/data/maps/Route104_PrettyPetalFlowerShop/map.json index e3b954dd7..b6c3fdcc8 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/map.json +++ b/data/maps/Route104_PrettyPetalFlowerShop/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route104_Prototype/map.json b/data/maps/Route104_Prototype/map.json index 2e77358b6..d1210f4f1 100644 --- a/data/maps/Route104_Prototype/map.json +++ b/data/maps/Route104_Prototype/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_ROUTE", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json b/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json index e450403ab..e65913f30 100644 --- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json +++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route105/map.json b/data/maps/Route105/map.json index ab51fcb46..820ccd7df 100644 --- a/data/maps/Route105/map.json +++ b/data/maps/Route105/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_ROUTE", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route106/map.json b/data/maps/Route106/map.json index bc036ac00..7303bc8e4 100644 --- a/data/maps/Route106/map.json +++ b/data/maps/Route106/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_ROUTE", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route107/map.json b/data/maps/Route107/map.json index 9f18d74a8..623273d85 100644 --- a/data/maps/Route107/map.json +++ b/data/maps/Route107/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_ROUTE", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route108/map.json b/data/maps/Route108/map.json index 66e231a4c..523762a02 100644 --- a/data/maps/Route108/map.json +++ b/data/maps/Route108/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_ROUTE", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route109/map.json b/data/maps/Route109/map.json index 12faafa21..c9c73e33b 100644 --- a/data/maps/Route109/map.json +++ b/data/maps/Route109/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_ROUTE", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route109_SeashoreHouse/map.json b/data/maps/Route109_SeashoreHouse/map.json index 1816463aa..30bf17095 100644 --- a/data/maps/Route109_SeashoreHouse/map.json +++ b/data/maps/Route109_SeashoreHouse/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route110/map.json b/data/maps/Route110/map.json index 48cf4946e..5a2e77238 100644 --- a/data/maps/Route110/map.json +++ b/data/maps/Route110/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_ROUTE", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json index a0b616ddc..4bba7fc99 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json index 8a10822bd..6308c36d4 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route110_TrickHouseCorridor/map.json b/data/maps/Route110_TrickHouseCorridor/map.json index 75ef7519a..fb9c25c08 100644 --- a/data/maps/Route110_TrickHouseCorridor/map.json +++ b/data/maps/Route110_TrickHouseCorridor/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route110_TrickHouseEnd/map.json b/data/maps/Route110_TrickHouseEnd/map.json index 859a3f143..4a270e795 100644 --- a/data/maps/Route110_TrickHouseEnd/map.json +++ b/data/maps/Route110_TrickHouseEnd/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route110_TrickHouseEntrance/map.json b/data/maps/Route110_TrickHouseEntrance/map.json index 9c2ed8771..a483821c9 100644 --- a/data/maps/Route110_TrickHouseEntrance/map.json +++ b/data/maps/Route110_TrickHouseEntrance/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route110_TrickHousePuzzle1/map.json b/data/maps/Route110_TrickHousePuzzle1/map.json index b4401fb64..78b38930a 100644 --- a/data/maps/Route110_TrickHousePuzzle1/map.json +++ b/data/maps/Route110_TrickHousePuzzle1/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route110_TrickHousePuzzle2/map.json b/data/maps/Route110_TrickHousePuzzle2/map.json index 12564c224..9bb361c44 100644 --- a/data/maps/Route110_TrickHousePuzzle2/map.json +++ b/data/maps/Route110_TrickHousePuzzle2/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route110_TrickHousePuzzle3/map.json b/data/maps/Route110_TrickHousePuzzle3/map.json index eda856ebf..b65a039d7 100644 --- a/data/maps/Route110_TrickHousePuzzle3/map.json +++ b/data/maps/Route110_TrickHousePuzzle3/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route110_TrickHousePuzzle4/map.json b/data/maps/Route110_TrickHousePuzzle4/map.json index c9184d01c..6fba4d92d 100644 --- a/data/maps/Route110_TrickHousePuzzle4/map.json +++ b/data/maps/Route110_TrickHousePuzzle4/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route110_TrickHousePuzzle5/map.json b/data/maps/Route110_TrickHousePuzzle5/map.json index 143c42b9c..80cc3d70d 100644 --- a/data/maps/Route110_TrickHousePuzzle5/map.json +++ b/data/maps/Route110_TrickHousePuzzle5/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route110_TrickHousePuzzle6/map.json b/data/maps/Route110_TrickHousePuzzle6/map.json index ce8877c4a..69f4e0da7 100644 --- a/data/maps/Route110_TrickHousePuzzle6/map.json +++ b/data/maps/Route110_TrickHousePuzzle6/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route110_TrickHousePuzzle7/map.json b/data/maps/Route110_TrickHousePuzzle7/map.json index 1c7d37c31..991426510 100644 --- a/data/maps/Route110_TrickHousePuzzle7/map.json +++ b/data/maps/Route110_TrickHousePuzzle7/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route110_TrickHousePuzzle8/map.json b/data/maps/Route110_TrickHousePuzzle8/map.json index 587007721..450c0e251 100644 --- a/data/maps/Route110_TrickHousePuzzle8/map.json +++ b/data/maps/Route110_TrickHousePuzzle8/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route111/map.json b/data/maps/Route111/map.json index 3e3cbd2c0..04f8c845a 100644 --- a/data/maps/Route111/map.json +++ b/data/maps/Route111/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_ROUTE", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route111_OldLadysRestStop/map.json b/data/maps/Route111_OldLadysRestStop/map.json index dc305fbaa..d9a054c16 100644 --- a/data/maps/Route111_OldLadysRestStop/map.json +++ b/data/maps/Route111_OldLadysRestStop/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route111_WinstrateFamilysHouse/map.json b/data/maps/Route111_WinstrateFamilysHouse/map.json index fccf0eed4..dffc04e5f 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/map.json +++ b/data/maps/Route111_WinstrateFamilysHouse/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route112/map.json b/data/maps/Route112/map.json index b711e1b78..9e7e8af11 100644 --- a/data/maps/Route112/map.json +++ b/data/maps/Route112/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_ROUTE", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route112_CableCarStation/map.json b/data/maps/Route112_CableCarStation/map.json index 50dd8ba41..1968494f4 100644 --- a/data/maps/Route112_CableCarStation/map.json +++ b/data/maps/Route112_CableCarStation/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route113/map.json b/data/maps/Route113/map.json index cddfe125c..7419f4711 100644 --- a/data/maps/Route113/map.json +++ b/data/maps/Route113/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_ROUTE", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route113_GlassWorkshop/map.json b/data/maps/Route113_GlassWorkshop/map.json index bd7bb4828..2bcece86a 100644 --- a/data/maps/Route113_GlassWorkshop/map.json +++ b/data/maps/Route113_GlassWorkshop/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route114/map.json b/data/maps/Route114/map.json index 4e79def6d..63b545fea 100644 --- a/data/maps/Route114/map.json +++ b/data/maps/Route114/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_ROUTE", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route114_FossilManiacsHouse/map.json b/data/maps/Route114_FossilManiacsHouse/map.json index df373a686..e74c328e0 100644 --- a/data/maps/Route114_FossilManiacsHouse/map.json +++ b/data/maps/Route114_FossilManiacsHouse/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route114_FossilManiacsTunnel/map.json b/data/maps/Route114_FossilManiacsTunnel/map.json index 6993dc911..6c765058c 100644 --- a/data/maps/Route114_FossilManiacsTunnel/map.json +++ b/data/maps/Route114_FossilManiacsTunnel/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route114_LanettesHouse/map.json b/data/maps/Route114_LanettesHouse/map.json index e51ec9c45..aa802e89a 100644 --- a/data/maps/Route114_LanettesHouse/map.json +++ b/data/maps/Route114_LanettesHouse/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route115/map.json b/data/maps/Route115/map.json index 48d8f2b22..996d2ef2f 100644 --- a/data/maps/Route115/map.json +++ b/data/maps/Route115/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_ROUTE", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route116/map.json b/data/maps/Route116/map.json index 1888cc9f6..00e208274 100644 --- a/data/maps/Route116/map.json +++ b/data/maps/Route116/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_ROUTE", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route116_TunnelersRestHouse/map.json b/data/maps/Route116_TunnelersRestHouse/map.json index fc24704dc..f5810132e 100644 --- a/data/maps/Route116_TunnelersRestHouse/map.json +++ b/data/maps/Route116_TunnelersRestHouse/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route117/map.json b/data/maps/Route117/map.json index 390e7e9e5..b43c79adf 100644 --- a/data/maps/Route117/map.json +++ b/data/maps/Route117/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_ROUTE", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route117_PokemonDayCare/map.json b/data/maps/Route117_PokemonDayCare/map.json index 7fb5ce207..2aba212b7 100644 --- a/data/maps/Route117_PokemonDayCare/map.json +++ b/data/maps/Route117_PokemonDayCare/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route118/map.json b/data/maps/Route118/map.json index 790348a62..f335f788f 100644 --- a/data/maps/Route118/map.json +++ b/data/maps/Route118/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_ROUTE", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route119/map.json b/data/maps/Route119/map.json index 34fb6e700..b9247a25a 100644 --- a/data/maps/Route119/map.json +++ b/data/maps/Route119/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_ROUTE", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route119_House/map.json b/data/maps/Route119_House/map.json index b50c98d17..879d006c2 100644 --- a/data/maps/Route119_House/map.json +++ b/data/maps/Route119_House/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route119_WeatherInstitute_1F/map.json b/data/maps/Route119_WeatherInstitute_1F/map.json index 570d803d2..8c3a0e196 100644 --- a/data/maps/Route119_WeatherInstitute_1F/map.json +++ b/data/maps/Route119_WeatherInstitute_1F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route119_WeatherInstitute_2F/map.json b/data/maps/Route119_WeatherInstitute_2F/map.json index fce896243..fcc1e0023 100644 --- a/data/maps/Route119_WeatherInstitute_2F/map.json +++ b/data/maps/Route119_WeatherInstitute_2F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route120/map.json b/data/maps/Route120/map.json index 35fc402cf..1bdb3663e 100644 --- a/data/maps/Route120/map.json +++ b/data/maps/Route120/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_ROUTE", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route121/map.json b/data/maps/Route121/map.json index b9febf9e4..caf140de5 100644 --- a/data/maps/Route121/map.json +++ b/data/maps/Route121/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_ROUTE", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route121_SafariZoneEntrance/map.json b/data/maps/Route121_SafariZoneEntrance/map.json index 2365dae6c..5a8be08ab 100644 --- a/data/maps/Route121_SafariZoneEntrance/map.json +++ b/data/maps/Route121_SafariZoneEntrance/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route122/map.json b/data/maps/Route122/map.json index e9d2984a2..39481f9d7 100644 --- a/data/maps/Route122/map.json +++ b/data/maps/Route122/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_ROUTE", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route123/map.json b/data/maps/Route123/map.json index d0ae2b242..496e7bcc7 100644 --- a/data/maps/Route123/map.json +++ b/data/maps/Route123/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_ROUTE", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route123_BerryMastersHouse/map.json b/data/maps/Route123_BerryMastersHouse/map.json index 58e2d33b2..260c64b59 100644 --- a/data/maps/Route123_BerryMastersHouse/map.json +++ b/data/maps/Route123_BerryMastersHouse/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route124/map.json b/data/maps/Route124/map.json index abefc1639..c21dcdfc9 100644 --- a/data/maps/Route124/map.json +++ b/data/maps/Route124/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_OCEAN_ROUTE", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/map.json b/data/maps/Route124_DivingTreasureHuntersHouse/map.json index 6e2288b33..58de1af84 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/map.json +++ b/data/maps/Route124_DivingTreasureHuntersHouse/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route125/map.json b/data/maps/Route125/map.json index 9ef86eb8e..a434e15f0 100644 --- a/data/maps/Route125/map.json +++ b/data/maps/Route125/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_OCEAN_ROUTE", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route126/map.json b/data/maps/Route126/map.json index ddb00439e..4cacd56e6 100644 --- a/data/maps/Route126/map.json +++ b/data/maps/Route126/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_OCEAN_ROUTE", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route127/map.json b/data/maps/Route127/map.json index 1afc922cc..3e36c879d 100644 --- a/data/maps/Route127/map.json +++ b/data/maps/Route127/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_OCEAN_ROUTE", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route128/map.json b/data/maps/Route128/map.json index b5f84e9a8..c5f7f811c 100644 --- a/data/maps/Route128/map.json +++ b/data/maps/Route128/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_OCEAN_ROUTE", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route129/map.json b/data/maps/Route129/map.json index ac47e1918..5d0fd295d 100644 --- a/data/maps/Route129/map.json +++ b/data/maps/Route129/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_OCEAN_ROUTE", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route130/map.json b/data/maps/Route130/map.json index 7a29521a3..a10f65068 100644 --- a/data/maps/Route130/map.json +++ b/data/maps/Route130/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_OCEAN_ROUTE", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route131/map.json b/data/maps/Route131/map.json index e70aee2bc..c258b801d 100644 --- a/data/maps/Route131/map.json +++ b/data/maps/Route131/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_OCEAN_ROUTE", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route132/map.json b/data/maps/Route132/map.json index c42ff83a3..1566652c0 100644 --- a/data/maps/Route132/map.json +++ b/data/maps/Route132/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_OCEAN_ROUTE", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route133/map.json b/data/maps/Route133/map.json index a2b4ed493..fde18e851 100644 --- a/data/maps/Route133/map.json +++ b/data/maps/Route133/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_OCEAN_ROUTE", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Route134/map.json b/data/maps/Route134/map.json index 58537a53c..8c5992805 100644 --- a/data/maps/Route134/map.json +++ b/data/maps/Route134/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_OCEAN_ROUTE", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/RustboroCity/map.json b/data/maps/RustboroCity/map.json index a4dfa5b2d..a704f60f6 100644 --- a/data/maps/RustboroCity/map.json +++ b/data/maps/RustboroCity/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_CITY", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/RustboroCity_CuttersHouse/map.json b/data/maps/RustboroCity_CuttersHouse/map.json index dc7f1df54..736de2d7c 100644 --- a/data/maps/RustboroCity_CuttersHouse/map.json +++ b/data/maps/RustboroCity_CuttersHouse/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/RustboroCity_DevonCorp_1F/map.json b/data/maps/RustboroCity_DevonCorp_1F/map.json index e790910fb..7bc5ea45b 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/map.json +++ b/data/maps/RustboroCity_DevonCorp_1F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/RustboroCity_DevonCorp_2F/map.json b/data/maps/RustboroCity_DevonCorp_2F/map.json index 46079c612..a250c9844 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/map.json +++ b/data/maps/RustboroCity_DevonCorp_2F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/RustboroCity_DevonCorp_3F/map.json b/data/maps/RustboroCity_DevonCorp_3F/map.json index aacaaaa9c..5e5bd6610 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/map.json +++ b/data/maps/RustboroCity_DevonCorp_3F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/RustboroCity_Flat1_1F/map.json b/data/maps/RustboroCity_Flat1_1F/map.json index d2a90e13c..dab8613cf 100644 --- a/data/maps/RustboroCity_Flat1_1F/map.json +++ b/data/maps/RustboroCity_Flat1_1F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/RustboroCity_Flat1_2F/map.json b/data/maps/RustboroCity_Flat1_2F/map.json index 1f0798121..52ca97e16 100644 --- a/data/maps/RustboroCity_Flat1_2F/map.json +++ b/data/maps/RustboroCity_Flat1_2F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/RustboroCity_Flat2_1F/map.json b/data/maps/RustboroCity_Flat2_1F/map.json index b52cf5e15..f49bed472 100644 --- a/data/maps/RustboroCity_Flat2_1F/map.json +++ b/data/maps/RustboroCity_Flat2_1F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/RustboroCity_Flat2_2F/map.json b/data/maps/RustboroCity_Flat2_2F/map.json index 356e12148..57916cae3 100644 --- a/data/maps/RustboroCity_Flat2_2F/map.json +++ b/data/maps/RustboroCity_Flat2_2F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/RustboroCity_Flat2_3F/map.json b/data/maps/RustboroCity_Flat2_3F/map.json index 58a875377..772c99312 100644 --- a/data/maps/RustboroCity_Flat2_3F/map.json +++ b/data/maps/RustboroCity_Flat2_3F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/RustboroCity_Gym/map.json b/data/maps/RustboroCity_Gym/map.json index ae6d66051..8f8adaa9e 100644 --- a/data/maps/RustboroCity_Gym/map.json +++ b/data/maps/RustboroCity_Gym/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_GYM", diff --git a/data/maps/RustboroCity_House1/map.json b/data/maps/RustboroCity_House1/map.json index 230ba1ec2..ac4c4185b 100644 --- a/data/maps/RustboroCity_House1/map.json +++ b/data/maps/RustboroCity_House1/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/RustboroCity_House2/map.json b/data/maps/RustboroCity_House2/map.json index 8aef39d6c..39bddfa23 100644 --- a/data/maps/RustboroCity_House2/map.json +++ b/data/maps/RustboroCity_House2/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/RustboroCity_House3/map.json b/data/maps/RustboroCity_House3/map.json index 80203105b..cde1909d5 100644 --- a/data/maps/RustboroCity_House3/map.json +++ b/data/maps/RustboroCity_House3/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/RustboroCity_Mart/map.json b/data/maps/RustboroCity_Mart/map.json index a6d9af528..9492add17 100644 --- a/data/maps/RustboroCity_Mart/map.json +++ b/data/maps/RustboroCity_Mart/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/RustboroCity_PokemonCenter_1F/map.json b/data/maps/RustboroCity_PokemonCenter_1F/map.json index 8b2aa2568..3be7ca20e 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/map.json +++ b/data/maps/RustboroCity_PokemonCenter_1F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/RustboroCity_PokemonCenter_2F/map.json b/data/maps/RustboroCity_PokemonCenter_2F/map.json index 3ce00d2e5..8ecd09cce 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/map.json +++ b/data/maps/RustboroCity_PokemonCenter_2F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/RustboroCity_PokemonSchool/map.json b/data/maps/RustboroCity_PokemonSchool/map.json index 7f383a7db..fde40502c 100644 --- a/data/maps/RustboroCity_PokemonSchool/map.json +++ b/data/maps/RustboroCity_PokemonSchool/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/RusturfTunnel/map.json b/data/maps/RusturfTunnel/map.json index a2f56a8b2..ee9b400f7 100644 --- a/data/maps/RusturfTunnel/map.json +++ b/data/maps/RusturfTunnel/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/SSTidalCorridor/map.json b/data/maps/SSTidalCorridor/map.json index 9cad6a32e..bd9e9d656 100644 --- a/data/maps/SSTidalCorridor/map.json +++ b/data/maps/SSTidalCorridor/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/SSTidalLowerDeck/map.json b/data/maps/SSTidalLowerDeck/map.json index 12268a861..b9c14dc64 100644 --- a/data/maps/SSTidalLowerDeck/map.json +++ b/data/maps/SSTidalLowerDeck/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/SSTidalRooms/map.json b/data/maps/SSTidalRooms/map.json index 3f7ac0f56..33042e22d 100644 --- a/data/maps/SSTidalRooms/map.json +++ b/data/maps/SSTidalRooms/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/SafariZone_North/map.json b/data/maps/SafariZone_North/map.json index 6ba1538d0..2ef3097de 100644 --- a/data/maps/SafariZone_North/map.json +++ b/data/maps/SafariZone_North/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_ROUTE", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/SafariZone_Northeast/map.json b/data/maps/SafariZone_Northeast/map.json index 7df896e9e..728c3ea2f 100644 --- a/data/maps/SafariZone_Northeast/map.json +++ b/data/maps/SafariZone_Northeast/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_ROUTE", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/SafariZone_Northwest/map.json b/data/maps/SafariZone_Northwest/map.json index de5d7cbe1..c20bb7370 100644 --- a/data/maps/SafariZone_Northwest/map.json +++ b/data/maps/SafariZone_Northwest/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_ROUTE", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/SafariZone_RestHouse/map.json b/data/maps/SafariZone_RestHouse/map.json index 50f860eca..4ce02cad3 100644 --- a/data/maps/SafariZone_RestHouse/map.json +++ b/data/maps/SafariZone_RestHouse/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/SafariZone_South/map.json b/data/maps/SafariZone_South/map.json index 3ff301da6..ccd26ca51 100644 --- a/data/maps/SafariZone_South/map.json +++ b/data/maps/SafariZone_South/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_ROUTE", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/SafariZone_Southeast/map.json b/data/maps/SafariZone_Southeast/map.json index 9cbc9544f..571bcd585 100644 --- a/data/maps/SafariZone_Southeast/map.json +++ b/data/maps/SafariZone_Southeast/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_ROUTE", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/SafariZone_Southwest/map.json b/data/maps/SafariZone_Southwest/map.json index 3fc289025..8fc65cbd1 100644 --- a/data/maps/SafariZone_Southwest/map.json +++ b/data/maps/SafariZone_Southwest/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_ROUTE", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/ScorchedSlab/map.json b/data/maps/ScorchedSlab/map.json index c59022fd2..d51e123d6 100644 --- a/data/maps/ScorchedSlab/map.json +++ b/data/maps/ScorchedSlab/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/SeafloorCavern_Entrance/map.json b/data/maps/SeafloorCavern_Entrance/map.json index 532145a66..00ecc79c8 100644 --- a/data/maps/SeafloorCavern_Entrance/map.json +++ b/data/maps/SeafloorCavern_Entrance/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/SeafloorCavern_Room1/map.json b/data/maps/SeafloorCavern_Room1/map.json index 674834269..3ec70fc23 100644 --- a/data/maps/SeafloorCavern_Room1/map.json +++ b/data/maps/SeafloorCavern_Room1/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/SeafloorCavern_Room2/map.json b/data/maps/SeafloorCavern_Room2/map.json index d2bd710c9..6595a9134 100644 --- a/data/maps/SeafloorCavern_Room2/map.json +++ b/data/maps/SeafloorCavern_Room2/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/SeafloorCavern_Room3/map.json b/data/maps/SeafloorCavern_Room3/map.json index 60584d452..2002fa60d 100644 --- a/data/maps/SeafloorCavern_Room3/map.json +++ b/data/maps/SeafloorCavern_Room3/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/SeafloorCavern_Room4/map.json b/data/maps/SeafloorCavern_Room4/map.json index 310d5d0aa..dfdf19fbd 100644 --- a/data/maps/SeafloorCavern_Room4/map.json +++ b/data/maps/SeafloorCavern_Room4/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/SeafloorCavern_Room5/map.json b/data/maps/SeafloorCavern_Room5/map.json index b8aae3ad5..c15063dd8 100644 --- a/data/maps/SeafloorCavern_Room5/map.json +++ b/data/maps/SeafloorCavern_Room5/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/SeafloorCavern_Room6/map.json b/data/maps/SeafloorCavern_Room6/map.json index 0fbb31e71..eb4c7f9d9 100644 --- a/data/maps/SeafloorCavern_Room6/map.json +++ b/data/maps/SeafloorCavern_Room6/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/SeafloorCavern_Room7/map.json b/data/maps/SeafloorCavern_Room7/map.json index b7b8cf217..0f135d36a 100644 --- a/data/maps/SeafloorCavern_Room7/map.json +++ b/data/maps/SeafloorCavern_Room7/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/SeafloorCavern_Room8/map.json b/data/maps/SeafloorCavern_Room8/map.json index 737b2d438..522504b5b 100644 --- a/data/maps/SeafloorCavern_Room8/map.json +++ b/data/maps/SeafloorCavern_Room8/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/SeafloorCavern_Room9/map.json b/data/maps/SeafloorCavern_Room9/map.json index 210ef6e0d..1c1af7551 100644 --- a/data/maps/SeafloorCavern_Room9/map.json +++ b/data/maps/SeafloorCavern_Room9/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": false, - "allow_escape_rope": true, + "allow_cycling": false, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/SealedChamber_InnerRoom/map.json b/data/maps/SealedChamber_InnerRoom/map.json index 4b78bdae0..febf5defa 100644 --- a/data/maps/SealedChamber_InnerRoom/map.json +++ b/data/maps/SealedChamber_InnerRoom/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/SealedChamber_OuterRoom/map.json b/data/maps/SealedChamber_OuterRoom/map.json index d8e8f45b6..88694940b 100644 --- a/data/maps/SealedChamber_OuterRoom/map.json +++ b/data/maps/SealedChamber_OuterRoom/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/SecretBase_BlueCave1/map.json b/data/maps/SecretBase_BlueCave1/map.json index c9acb1165..c97e611b0 100644 --- a/data/maps/SecretBase_BlueCave1/map.json +++ b/data/maps/SecretBase_BlueCave1/map.json @@ -8,8 +8,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_SECRET_BASE", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", diff --git a/data/maps/SecretBase_BlueCave2/map.json b/data/maps/SecretBase_BlueCave2/map.json index 5f68519cb..e4b21ab3e 100644 --- a/data/maps/SecretBase_BlueCave2/map.json +++ b/data/maps/SecretBase_BlueCave2/map.json @@ -8,8 +8,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_SECRET_BASE", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", diff --git a/data/maps/SecretBase_BlueCave3/map.json b/data/maps/SecretBase_BlueCave3/map.json index 6139d2ccf..8a00a0f1a 100644 --- a/data/maps/SecretBase_BlueCave3/map.json +++ b/data/maps/SecretBase_BlueCave3/map.json @@ -8,8 +8,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_SECRET_BASE", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", diff --git a/data/maps/SecretBase_BlueCave4/map.json b/data/maps/SecretBase_BlueCave4/map.json index 56bf17c4f..b89651f4a 100644 --- a/data/maps/SecretBase_BlueCave4/map.json +++ b/data/maps/SecretBase_BlueCave4/map.json @@ -8,8 +8,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_SECRET_BASE", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", diff --git a/data/maps/SecretBase_BrownCave1/map.json b/data/maps/SecretBase_BrownCave1/map.json index 787a0727c..6a0ea79e0 100644 --- a/data/maps/SecretBase_BrownCave1/map.json +++ b/data/maps/SecretBase_BrownCave1/map.json @@ -8,8 +8,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_SECRET_BASE", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", diff --git a/data/maps/SecretBase_BrownCave2/map.json b/data/maps/SecretBase_BrownCave2/map.json index 9901de136..d986f76c6 100644 --- a/data/maps/SecretBase_BrownCave2/map.json +++ b/data/maps/SecretBase_BrownCave2/map.json @@ -8,8 +8,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_SECRET_BASE", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", diff --git a/data/maps/SecretBase_BrownCave3/map.json b/data/maps/SecretBase_BrownCave3/map.json index 0d0fead22..9e685b785 100644 --- a/data/maps/SecretBase_BrownCave3/map.json +++ b/data/maps/SecretBase_BrownCave3/map.json @@ -8,8 +8,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_SECRET_BASE", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", diff --git a/data/maps/SecretBase_BrownCave4/map.json b/data/maps/SecretBase_BrownCave4/map.json index 182adcb29..a14abb30d 100644 --- a/data/maps/SecretBase_BrownCave4/map.json +++ b/data/maps/SecretBase_BrownCave4/map.json @@ -8,8 +8,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_SECRET_BASE", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", diff --git a/data/maps/SecretBase_RedCave1/map.json b/data/maps/SecretBase_RedCave1/map.json index 943495040..895d1be7e 100644 --- a/data/maps/SecretBase_RedCave1/map.json +++ b/data/maps/SecretBase_RedCave1/map.json @@ -8,8 +8,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_SECRET_BASE", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", diff --git a/data/maps/SecretBase_RedCave2/map.json b/data/maps/SecretBase_RedCave2/map.json index fd1fc6d6c..d2bc71788 100644 --- a/data/maps/SecretBase_RedCave2/map.json +++ b/data/maps/SecretBase_RedCave2/map.json @@ -8,8 +8,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_SECRET_BASE", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", diff --git a/data/maps/SecretBase_RedCave3/map.json b/data/maps/SecretBase_RedCave3/map.json index 5ec00b438..da694edeb 100644 --- a/data/maps/SecretBase_RedCave3/map.json +++ b/data/maps/SecretBase_RedCave3/map.json @@ -8,8 +8,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_SECRET_BASE", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", diff --git a/data/maps/SecretBase_RedCave4/map.json b/data/maps/SecretBase_RedCave4/map.json index eebddf75d..708709e0c 100644 --- a/data/maps/SecretBase_RedCave4/map.json +++ b/data/maps/SecretBase_RedCave4/map.json @@ -8,8 +8,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_SECRET_BASE", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", diff --git a/data/maps/SecretBase_Shrub1/map.json b/data/maps/SecretBase_Shrub1/map.json index b476f4b9c..6e59c824e 100644 --- a/data/maps/SecretBase_Shrub1/map.json +++ b/data/maps/SecretBase_Shrub1/map.json @@ -8,8 +8,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_SECRET_BASE", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", diff --git a/data/maps/SecretBase_Shrub2/map.json b/data/maps/SecretBase_Shrub2/map.json index fd7235b00..80b6a66c1 100644 --- a/data/maps/SecretBase_Shrub2/map.json +++ b/data/maps/SecretBase_Shrub2/map.json @@ -8,8 +8,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_SECRET_BASE", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", diff --git a/data/maps/SecretBase_Shrub3/map.json b/data/maps/SecretBase_Shrub3/map.json index b3d0a72e6..2b77d5226 100644 --- a/data/maps/SecretBase_Shrub3/map.json +++ b/data/maps/SecretBase_Shrub3/map.json @@ -8,8 +8,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_SECRET_BASE", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", diff --git a/data/maps/SecretBase_Shrub4/map.json b/data/maps/SecretBase_Shrub4/map.json index cd50b84ce..aca190dfa 100644 --- a/data/maps/SecretBase_Shrub4/map.json +++ b/data/maps/SecretBase_Shrub4/map.json @@ -8,8 +8,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_SECRET_BASE", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", diff --git a/data/maps/SecretBase_Tree1/map.json b/data/maps/SecretBase_Tree1/map.json index f37b0c5e9..928d3b16d 100644 --- a/data/maps/SecretBase_Tree1/map.json +++ b/data/maps/SecretBase_Tree1/map.json @@ -8,8 +8,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_SECRET_BASE", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", diff --git a/data/maps/SecretBase_Tree2/map.json b/data/maps/SecretBase_Tree2/map.json index 14fc7658e..3ba3c3d86 100644 --- a/data/maps/SecretBase_Tree2/map.json +++ b/data/maps/SecretBase_Tree2/map.json @@ -8,8 +8,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_SECRET_BASE", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", diff --git a/data/maps/SecretBase_Tree3/map.json b/data/maps/SecretBase_Tree3/map.json index 24951d864..3c4e3c7bb 100644 --- a/data/maps/SecretBase_Tree3/map.json +++ b/data/maps/SecretBase_Tree3/map.json @@ -8,8 +8,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_SECRET_BASE", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", diff --git a/data/maps/SecretBase_Tree4/map.json b/data/maps/SecretBase_Tree4/map.json index 1c35f9249..a73776567 100644 --- a/data/maps/SecretBase_Tree4/map.json +++ b/data/maps/SecretBase_Tree4/map.json @@ -8,8 +8,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_SECRET_BASE", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", diff --git a/data/maps/SecretBase_YellowCave1/map.json b/data/maps/SecretBase_YellowCave1/map.json index 10f137141..8046cfc92 100644 --- a/data/maps/SecretBase_YellowCave1/map.json +++ b/data/maps/SecretBase_YellowCave1/map.json @@ -8,8 +8,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_SECRET_BASE", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", diff --git a/data/maps/SecretBase_YellowCave2/map.json b/data/maps/SecretBase_YellowCave2/map.json index 7653c0443..b79a0db7a 100644 --- a/data/maps/SecretBase_YellowCave2/map.json +++ b/data/maps/SecretBase_YellowCave2/map.json @@ -8,8 +8,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_SECRET_BASE", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", diff --git a/data/maps/SecretBase_YellowCave3/map.json b/data/maps/SecretBase_YellowCave3/map.json index d0e2dd658..82563a898 100644 --- a/data/maps/SecretBase_YellowCave3/map.json +++ b/data/maps/SecretBase_YellowCave3/map.json @@ -8,8 +8,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_SECRET_BASE", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", diff --git a/data/maps/SecretBase_YellowCave4/map.json b/data/maps/SecretBase_YellowCave4/map.json index 868a638a1..c7de60960 100644 --- a/data/maps/SecretBase_YellowCave4/map.json +++ b/data/maps/SecretBase_YellowCave4/map.json @@ -8,8 +8,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_SECRET_BASE", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/map.json b/data/maps/ShoalCave_HighTideEntranceRoom/map.json index 5da56ae2a..8dec3b1e2 100644 --- a/data/maps/ShoalCave_HighTideEntranceRoom/map.json +++ b/data/maps/ShoalCave_HighTideEntranceRoom/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/ShoalCave_HighTideInnerRoom/map.json b/data/maps/ShoalCave_HighTideInnerRoom/map.json index 43bafd0bf..280397a93 100644 --- a/data/maps/ShoalCave_HighTideInnerRoom/map.json +++ b/data/maps/ShoalCave_HighTideInnerRoom/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/map.json b/data/maps/ShoalCave_LowTideEntranceRoom/map.json index 0d434e298..45184c772 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/map.json +++ b/data/maps/ShoalCave_LowTideEntranceRoom/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/ShoalCave_LowTideIceRoom/map.json b/data/maps/ShoalCave_LowTideIceRoom/map.json index 9bd02803c..7eff5cebc 100644 --- a/data/maps/ShoalCave_LowTideIceRoom/map.json +++ b/data/maps/ShoalCave_LowTideIceRoom/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/ShoalCave_LowTideInnerRoom/map.json b/data/maps/ShoalCave_LowTideInnerRoom/map.json index 7ea708ed9..b1ffac447 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/map.json +++ b/data/maps/ShoalCave_LowTideInnerRoom/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/ShoalCave_LowTideLowerRoom/map.json b/data/maps/ShoalCave_LowTideLowerRoom/map.json index 43b88c8cc..2ee0d75b0 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/map.json +++ b/data/maps/ShoalCave_LowTideLowerRoom/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/ShoalCave_LowTideStairsRoom/map.json b/data/maps/ShoalCave_LowTideStairsRoom/map.json index 98093ccda..521ab9e54 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/map.json +++ b/data/maps/ShoalCave_LowTideStairsRoom/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/SkyPillar_1F/map.json b/data/maps/SkyPillar_1F/map.json index 82dbd2934..17528b619 100644 --- a/data/maps/SkyPillar_1F/map.json +++ b/data/maps/SkyPillar_1F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/SkyPillar_2F/map.json b/data/maps/SkyPillar_2F/map.json index 9eb0a0406..1430f9dc7 100644 --- a/data/maps/SkyPillar_2F/map.json +++ b/data/maps/SkyPillar_2F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/SkyPillar_3F/map.json b/data/maps/SkyPillar_3F/map.json index 09d4c4e43..ddec299b5 100644 --- a/data/maps/SkyPillar_3F/map.json +++ b/data/maps/SkyPillar_3F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/SkyPillar_4F/map.json b/data/maps/SkyPillar_4F/map.json index 4cbc4bca4..9c12a2071 100644 --- a/data/maps/SkyPillar_4F/map.json +++ b/data/maps/SkyPillar_4F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/SkyPillar_5F/map.json b/data/maps/SkyPillar_5F/map.json index 1ad291768..2638cb92c 100644 --- a/data/maps/SkyPillar_5F/map.json +++ b/data/maps/SkyPillar_5F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/SkyPillar_Entrance/map.json b/data/maps/SkyPillar_Entrance/map.json index a829a62d1..709f0af8d 100644 --- a/data/maps/SkyPillar_Entrance/map.json +++ b/data/maps/SkyPillar_Entrance/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/SkyPillar_Outside/map.json b/data/maps/SkyPillar_Outside/map.json index 59f58f9b5..29e72f18c 100644 --- a/data/maps/SkyPillar_Outside/map.json +++ b/data/maps/SkyPillar_Outside/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_ROUTE", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/SkyPillar_Top/map.json b/data/maps/SkyPillar_Top/map.json index cc8d7e4b2..bdb04709b 100644 --- a/data/maps/SkyPillar_Top/map.json +++ b/data/maps/SkyPillar_Top/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_ROUTE", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/SlateportCity/map.json b/data/maps/SlateportCity/map.json index 51c632196..7b636e12d 100644 --- a/data/maps/SlateportCity/map.json +++ b/data/maps/SlateportCity/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_CITY", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/map.json b/data/maps/SlateportCity_BattleTentBattleRoom/map.json index b4c0723a2..9dca110af 100644 --- a/data/maps/SlateportCity_BattleTentBattleRoom/map.json +++ b/data/maps/SlateportCity_BattleTentBattleRoom/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/SlateportCity_BattleTentCorridor/map.json b/data/maps/SlateportCity_BattleTentCorridor/map.json index b5264bd8d..4343f104a 100644 --- a/data/maps/SlateportCity_BattleTentCorridor/map.json +++ b/data/maps/SlateportCity_BattleTentCorridor/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/SlateportCity_BattleTentLobby/map.json b/data/maps/SlateportCity_BattleTentLobby/map.json index 5a1c7cdb7..dc3a3b79d 100644 --- a/data/maps/SlateportCity_BattleTentLobby/map.json +++ b/data/maps/SlateportCity_BattleTentLobby/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/SlateportCity_Harbor/map.json b/data/maps/SlateportCity_Harbor/map.json index e177aa524..df3145305 100644 --- a/data/maps/SlateportCity_Harbor/map.json +++ b/data/maps/SlateportCity_Harbor/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/SlateportCity_House/map.json b/data/maps/SlateportCity_House/map.json index 49fbaf776..367534fec 100644 --- a/data/maps/SlateportCity_House/map.json +++ b/data/maps/SlateportCity_House/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/SlateportCity_Mart/map.json b/data/maps/SlateportCity_Mart/map.json index cefd90a06..2573fc6f9 100644 --- a/data/maps/SlateportCity_Mart/map.json +++ b/data/maps/SlateportCity_Mart/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/SlateportCity_NameRatersHouse/map.json b/data/maps/SlateportCity_NameRatersHouse/map.json index f9f722ea1..21308fc9a 100644 --- a/data/maps/SlateportCity_NameRatersHouse/map.json +++ b/data/maps/SlateportCity_NameRatersHouse/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/map.json b/data/maps/SlateportCity_OceanicMuseum_1F/map.json index 5d202f586..6dbcf5b4b 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/map.json +++ b/data/maps/SlateportCity_OceanicMuseum_1F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/map.json b/data/maps/SlateportCity_OceanicMuseum_2F/map.json index 84dafc211..34e1a9152 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/map.json +++ b/data/maps/SlateportCity_OceanicMuseum_2F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/SlateportCity_PokemonCenter_1F/map.json b/data/maps/SlateportCity_PokemonCenter_1F/map.json index 61afb6086..488dacbb3 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/map.json +++ b/data/maps/SlateportCity_PokemonCenter_1F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/SlateportCity_PokemonCenter_2F/map.json b/data/maps/SlateportCity_PokemonCenter_2F/map.json index 76e9e5119..fcf9ec0a0 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/map.json +++ b/data/maps/SlateportCity_PokemonCenter_2F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/SlateportCity_PokemonFanClub/map.json b/data/maps/SlateportCity_PokemonFanClub/map.json index 80ec71120..94838ebb0 100644 --- a/data/maps/SlateportCity_PokemonFanClub/map.json +++ b/data/maps/SlateportCity_PokemonFanClub/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/SlateportCity_SternsShipyard_1F/map.json b/data/maps/SlateportCity_SternsShipyard_1F/map.json index 67cf579a8..15ffa80c1 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/map.json +++ b/data/maps/SlateportCity_SternsShipyard_1F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/SlateportCity_SternsShipyard_2F/map.json b/data/maps/SlateportCity_SternsShipyard_2F/map.json index d348d6710..b71964fcd 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/map.json +++ b/data/maps/SlateportCity_SternsShipyard_2F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/SootopolisCity/map.json b/data/maps/SootopolisCity/map.json index 8ba0f2935..1f6414841 100644 --- a/data/maps/SootopolisCity/map.json +++ b/data/maps/SootopolisCity/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_CITY", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/SootopolisCity_Gym_1F/map.json b/data/maps/SootopolisCity_Gym_1F/map.json index 348980c33..f0aa75683 100644 --- a/data/maps/SootopolisCity_Gym_1F/map.json +++ b/data/maps/SootopolisCity_Gym_1F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_GYM", diff --git a/data/maps/SootopolisCity_Gym_B1F/map.json b/data/maps/SootopolisCity_Gym_B1F/map.json index d054900c9..92223b930 100644 --- a/data/maps/SootopolisCity_Gym_B1F/map.json +++ b/data/maps/SootopolisCity_Gym_B1F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_GYM", diff --git a/data/maps/SootopolisCity_House1/map.json b/data/maps/SootopolisCity_House1/map.json index c89d6f0ac..3b74de516 100644 --- a/data/maps/SootopolisCity_House1/map.json +++ b/data/maps/SootopolisCity_House1/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/SootopolisCity_House2/map.json b/data/maps/SootopolisCity_House2/map.json index ce984afdd..2de24946b 100644 --- a/data/maps/SootopolisCity_House2/map.json +++ b/data/maps/SootopolisCity_House2/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/SootopolisCity_House3/map.json b/data/maps/SootopolisCity_House3/map.json index d7e83db4a..68fdf1e51 100644 --- a/data/maps/SootopolisCity_House3/map.json +++ b/data/maps/SootopolisCity_House3/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/SootopolisCity_House4/map.json b/data/maps/SootopolisCity_House4/map.json index 07ef5e1c1..435f0e61a 100644 --- a/data/maps/SootopolisCity_House4/map.json +++ b/data/maps/SootopolisCity_House4/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/SootopolisCity_House5/map.json b/data/maps/SootopolisCity_House5/map.json index d3fc71139..43ee40497 100644 --- a/data/maps/SootopolisCity_House5/map.json +++ b/data/maps/SootopolisCity_House5/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/SootopolisCity_House6/map.json b/data/maps/SootopolisCity_House6/map.json index 3e9e1d4f8..146eed3e9 100644 --- a/data/maps/SootopolisCity_House6/map.json +++ b/data/maps/SootopolisCity_House6/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/SootopolisCity_House7/map.json b/data/maps/SootopolisCity_House7/map.json index bc29c4582..4e3b27cf7 100644 --- a/data/maps/SootopolisCity_House7/map.json +++ b/data/maps/SootopolisCity_House7/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/map.json b/data/maps/SootopolisCity_LotadAndSeedotHouse/map.json index 1d0c3d2c2..ab4f338fe 100644 --- a/data/maps/SootopolisCity_LotadAndSeedotHouse/map.json +++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/SootopolisCity_Mart/map.json b/data/maps/SootopolisCity_Mart/map.json index 5889a6b38..c90688fd3 100644 --- a/data/maps/SootopolisCity_Mart/map.json +++ b/data/maps/SootopolisCity_Mart/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json b/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json index 32b496a49..33206ebf4 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.json b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.json index 417491579..ee999cb14 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.json +++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/map.json b/data/maps/SootopolisCity_PokemonCenter_1F/map.json index 8cd7bb421..0a7b1bc03 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/map.json +++ b/data/maps/SootopolisCity_PokemonCenter_1F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/map.json b/data/maps/SootopolisCity_PokemonCenter_2F/map.json index f8a60dee5..c64ddc8cf 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/map.json +++ b/data/maps/SootopolisCity_PokemonCenter_2F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/SouthernIsland_Exterior/map.json b/data/maps/SouthernIsland_Exterior/map.json index 7be0fe2d0..c9b2d8712 100644 --- a/data/maps/SouthernIsland_Exterior/map.json +++ b/data/maps/SouthernIsland_Exterior/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_ROUTE", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/SouthernIsland_Interior/map.json b/data/maps/SouthernIsland_Interior/map.json index 1fe53d807..a63cf0656 100644 --- a/data/maps/SouthernIsland_Interior/map.json +++ b/data/maps/SouthernIsland_Interior/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SHADE", "map_type": "MAP_TYPE_ROUTE", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/TerraCave_End/map.json b/data/maps/TerraCave_End/map.json index 69c6d9991..2ec80f0f1 100644 --- a/data/maps/TerraCave_End/map.json +++ b/data/maps/TerraCave_End/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": false, - "allow_escape_rope": true, + "allow_cycling": false, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/TerraCave_Entrance/map.json b/data/maps/TerraCave_Entrance/map.json index f741c7040..9a9650487 100644 --- a/data/maps/TerraCave_Entrance/map.json +++ b/data/maps/TerraCave_Entrance/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/TradeCenter/map.json b/data/maps/TradeCenter/map.json index f77f7e8ee..732bada74 100644 --- a/data/maps/TradeCenter/map.json +++ b/data/maps/TradeCenter/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/TrainerHill_1F/map.json b/data/maps/TrainerHill_1F/map.json index 9dd32783c..30f80b810 100644 --- a/data/maps/TrainerHill_1F/map.json +++ b/data/maps/TrainerHill_1F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": true, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/TrainerHill_2F/map.json b/data/maps/TrainerHill_2F/map.json index 4c4dbb5f6..e94948c33 100644 --- a/data/maps/TrainerHill_2F/map.json +++ b/data/maps/TrainerHill_2F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": true, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/TrainerHill_3F/map.json b/data/maps/TrainerHill_3F/map.json index c3225ef6e..6e3ef9c51 100644 --- a/data/maps/TrainerHill_3F/map.json +++ b/data/maps/TrainerHill_3F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": true, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/TrainerHill_4F/map.json b/data/maps/TrainerHill_4F/map.json index fd208e012..2b62322e9 100644 --- a/data/maps/TrainerHill_4F/map.json +++ b/data/maps/TrainerHill_4F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": true, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/TrainerHill_Elevator/map.json b/data/maps/TrainerHill_Elevator/map.json index 4bad78219..26b0a1026 100644 --- a/data/maps/TrainerHill_Elevator/map.json +++ b/data/maps/TrainerHill_Elevator/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/TrainerHill_Entrance/map.json b/data/maps/TrainerHill_Entrance/map.json index a7fe36b20..097a2b755 100644 --- a/data/maps/TrainerHill_Entrance/map.json +++ b/data/maps/TrainerHill_Entrance/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": true, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/TrainerHill_Roof/map.json b/data/maps/TrainerHill_Roof/map.json index 716f35d9d..a889afa31 100644 --- a/data/maps/TrainerHill_Roof/map.json +++ b/data/maps/TrainerHill_Roof/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": true, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Underwater1/map.json b/data/maps/Underwater1/map.json index c56a74b68..cc77e951d 100644 --- a/data/maps/Underwater1/map.json +++ b/data/maps/Underwater1/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_UNDERWATER_BUBBLES", "map_type": "MAP_TYPE_UNDERWATER", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Underwater2/map.json b/data/maps/Underwater2/map.json index aeebd4df7..f402f8ea8 100644 --- a/data/maps/Underwater2/map.json +++ b/data/maps/Underwater2/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_UNDERWATER_BUBBLES", "map_type": "MAP_TYPE_UNDERWATER", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Underwater3/map.json b/data/maps/Underwater3/map.json index 6d6f35666..69af7637f 100644 --- a/data/maps/Underwater3/map.json +++ b/data/maps/Underwater3/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_UNDERWATER_BUBBLES", "map_type": "MAP_TYPE_UNDERWATER", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Underwater4/map.json b/data/maps/Underwater4/map.json index bbe09e5d9..156923302 100644 --- a/data/maps/Underwater4/map.json +++ b/data/maps/Underwater4/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_UNDERWATER_BUBBLES", "map_type": "MAP_TYPE_UNDERWATER", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Underwater5/map.json b/data/maps/Underwater5/map.json index a74808675..c50b8be53 100644 --- a/data/maps/Underwater5/map.json +++ b/data/maps/Underwater5/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_UNDERWATER_BUBBLES", "map_type": "MAP_TYPE_UNDERWATER", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Underwater6/map.json b/data/maps/Underwater6/map.json index 4647edaf8..971f2755c 100644 --- a/data/maps/Underwater6/map.json +++ b/data/maps/Underwater6/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_UNDERWATER_BUBBLES", "map_type": "MAP_TYPE_UNDERWATER", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Underwater7/map.json b/data/maps/Underwater7/map.json index 3801c2c86..cf33280fe 100644 --- a/data/maps/Underwater7/map.json +++ b/data/maps/Underwater7/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_UNDERWATER_BUBBLES", "map_type": "MAP_TYPE_UNDERWATER", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Underwater_MarineCave/map.json b/data/maps/Underwater_MarineCave/map.json index b4b15bc98..c12531e48 100644 --- a/data/maps/Underwater_MarineCave/map.json +++ b/data/maps/Underwater_MarineCave/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_UNDERWATER_BUBBLES", "map_type": "MAP_TYPE_UNDERWATER", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Underwater_Route134/map.json b/data/maps/Underwater_Route134/map.json index 54e11075b..dd5117aa4 100644 --- a/data/maps/Underwater_Route134/map.json +++ b/data/maps/Underwater_Route134/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_UNDERWATER_BUBBLES", "map_type": "MAP_TYPE_UNDERWATER", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Underwater_SeafloorCavern/map.json b/data/maps/Underwater_SeafloorCavern/map.json index d03bf9948..12be3b891 100644 --- a/data/maps/Underwater_SeafloorCavern/map.json +++ b/data/maps/Underwater_SeafloorCavern/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_UNDERWATER_BUBBLES", "map_type": "MAP_TYPE_UNDERWATER", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Underwater_SealedChamber/map.json b/data/maps/Underwater_SealedChamber/map.json index 624a763c9..98bbcc850 100644 --- a/data/maps/Underwater_SealedChamber/map.json +++ b/data/maps/Underwater_SealedChamber/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_UNDERWATER_BUBBLES", "map_type": "MAP_TYPE_UNDERWATER", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/Underwater_SootopolisCity/map.json b/data/maps/Underwater_SootopolisCity/map.json index b2b6b2804..cc2d66ff2 100644 --- a/data/maps/Underwater_SootopolisCity/map.json +++ b/data/maps/Underwater_SootopolisCity/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_UNDERWATER_BUBBLES", "map_type": "MAP_TYPE_UNDERWATER", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/UnionRoom/map.json b/data/maps/UnionRoom/map.json index ca2283267..e2d89299b 100644 --- a/data/maps/UnionRoom/map.json +++ b/data/maps/UnionRoom/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", diff --git a/data/maps/UnknownLinkContestRoom_25_29/map.json b/data/maps/UnknownLinkContestRoom_25_29/map.json index c767b7ebf..cf6077259 100644 --- a/data/maps/UnknownLinkContestRoom_25_29/map.json +++ b/data/maps/UnknownLinkContestRoom_25_29/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/UnknownLinkContestRoom_25_30/map.json b/data/maps/UnknownLinkContestRoom_25_30/map.json index 837148655..c51109ee9 100644 --- a/data/maps/UnknownLinkContestRoom_25_30/map.json +++ b/data/maps/UnknownLinkContestRoom_25_30/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/UnknownLinkContestRoom_25_31/map.json b/data/maps/UnknownLinkContestRoom_25_31/map.json index b70b755b3..27b550382 100644 --- a/data/maps/UnknownLinkContestRoom_25_31/map.json +++ b/data/maps/UnknownLinkContestRoom_25_31/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/UnknownLinkContestRoom_25_32/map.json b/data/maps/UnknownLinkContestRoom_25_32/map.json index d870cb7ea..0c20ee1f8 100644 --- a/data/maps/UnknownLinkContestRoom_25_32/map.json +++ b/data/maps/UnknownLinkContestRoom_25_32/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/UnknownLinkContestRoom_25_33/map.json b/data/maps/UnknownLinkContestRoom_25_33/map.json index 1db8019c9..aee753f22 100644 --- a/data/maps/UnknownLinkContestRoom_25_33/map.json +++ b/data/maps/UnknownLinkContestRoom_25_33/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/UnknownLinkContestRoom_25_34/map.json b/data/maps/UnknownLinkContestRoom_25_34/map.json index d9c30d003..ebd07e9fa 100644 --- a/data/maps/UnknownLinkContestRoom_25_34/map.json +++ b/data/maps/UnknownLinkContestRoom_25_34/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/VerdanturfTown/map.json b/data/maps/VerdanturfTown/map.json index b6c5af9f1..cafd66f64 100644 --- a/data/maps/VerdanturfTown/map.json +++ b/data/maps/VerdanturfTown/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_TOWN", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/map.json b/data/maps/VerdanturfTown_BattleTentBattleRoom/map.json index 4737004ed..b25c86511 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/map.json +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/map.json b/data/maps/VerdanturfTown_BattleTentCorridor/map.json index ea26e7dda..9a04ddbc0 100644 --- a/data/maps/VerdanturfTown_BattleTentCorridor/map.json +++ b/data/maps/VerdanturfTown_BattleTentCorridor/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/VerdanturfTown_BattleTentLobby/map.json b/data/maps/VerdanturfTown_BattleTentLobby/map.json index f04eac473..1a2b1177e 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/map.json +++ b/data/maps/VerdanturfTown_BattleTentLobby/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json b/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json index 092493624..1e57f9d33 100644 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/VerdanturfTown_House/map.json b/data/maps/VerdanturfTown_House/map.json index 554d5012d..5e959faf8 100644 --- a/data/maps/VerdanturfTown_House/map.json +++ b/data/maps/VerdanturfTown_House/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/VerdanturfTown_Mart/map.json b/data/maps/VerdanturfTown_Mart/map.json index 58832dbb2..bba4cfcd8 100644 --- a/data/maps/VerdanturfTown_Mart/map.json +++ b/data/maps/VerdanturfTown_Mart/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/map.json b/data/maps/VerdanturfTown_PokemonCenter_1F/map.json index aa809fc1e..9ceedc19b 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/map.json +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/map.json b/data/maps/VerdanturfTown_PokemonCenter_2F/map.json index c8c835265..647c642c1 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/map.json +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/VerdanturfTown_WandasHouse/map.json b/data/maps/VerdanturfTown_WandasHouse/map.json index fd9dd90b2..049be02a0 100644 --- a/data/maps/VerdanturfTown_WandasHouse/map.json +++ b/data/maps/VerdanturfTown_WandasHouse/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, + "allow_cycling": false, + "allow_escaping": false, "allow_running": false, "show_map_name": false, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json index f11a88e8c..261e4701e 100644 --- a/data/maps/VictoryRoad_1F/map.json +++ b/data/maps/VictoryRoad_1F/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/VictoryRoad_B1F/map.json b/data/maps/VictoryRoad_B1F/map.json index db92808fd..7f39ef789 100644 --- a/data/maps/VictoryRoad_B1F/map.json +++ b/data/maps/VictoryRoad_B1F/map.json @@ -7,8 +7,8 @@ "requires_flash": true, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/data/maps/VictoryRoad_B2F/map.json b/data/maps/VictoryRoad_B2F/map.json index ed87a231c..e5bba2bd5 100644 --- a/data/maps/VictoryRoad_B2F/map.json +++ b/data/maps/VictoryRoad_B2F/map.json @@ -7,8 +7,8 @@ "requires_flash": true, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_UNDERGROUND", - "allow_bike": true, - "allow_escape_rope": true, + "allow_cycling": true, + "allow_escaping": true, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 2e451a368..837d5da00 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -144,9 +144,9 @@ struct MapHeader }; // Flags for gMapHeader.flags, as defined in the map_header_flags macro -#define MAP_ALLOW_BIKE (1 << 0) -#define MAP_ALLOW_ESCAPE_ROPE (1 << 1) -#define MAP_ALLOW_RUN (1 << 2) +#define MAP_ALLOW_CYCLING (1 << 0) +#define MAP_ALLOW_ESCAPING (1 << 1) // Escape Rope and Dig +#define MAP_ALLOW_RUNNING (1 << 2) #define MAP_SHOW_MAP_NAME (1 << 3) #define UNUSED_MAP_FLAGS (1 << 4 | 1 << 5 | 1 << 6 | 1 << 7) diff --git a/include/item_use.h b/include/item_use.h index 0cb76e7d4..f577f8d46 100644 --- a/include/item_use.h +++ b/include/item_use.h @@ -31,7 +31,7 @@ void ItemUseInBattle_PPRecovery(u8); void ItemUseInBattle_Escape(u8); void ItemUseInBattle_EnigmaBerry(u8); void Task_UseDigEscapeRopeOnField(u8 taskId); -u8 CanUseEscapeRopeOnCurrMap(void); +u8 CanUseDigOrEscapeRopeOnCurMap(void); u8 CheckIfItemIsTMHMOrEvolutionStone(u16 itemId); #endif // GUARD_ITEM_USE_H diff --git a/src/bike.c b/src/bike.c index e66d6b6e1..cd24d2487 100644 --- a/src/bike.c +++ b/src/bike.c @@ -1056,7 +1056,7 @@ void Bike_HandleBumpySlopeJump(void) bool32 IsRunningDisallowed(u8 metatile) { - if (!(gMapHeader.flags & MAP_ALLOW_RUN) || IsRunningDisallowedByMetatile(metatile) == TRUE) + if (!(gMapHeader.flags & MAP_ALLOW_RUNNING) || IsRunningDisallowedByMetatile(metatile) == TRUE) return TRUE; else return FALSE; diff --git a/src/fldeff_dig.c b/src/fldeff_dig.c index 7f10e126e..ee5caa0df 100644 --- a/src/fldeff_dig.c +++ b/src/fldeff_dig.c @@ -16,7 +16,7 @@ static void sub_8135780(void); // text bool8 SetUpFieldMove_Dig(void) { - if (CanUseEscapeRopeOnCurrMap() == TRUE) + if (CanUseDigOrEscapeRopeOnCurMap() == TRUE) { gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu; gPostMenuFieldCallback = hm2_dig; diff --git a/src/item_use.c b/src/item_use.c index 73d6f6ffe..d359dbcef 100755 --- a/src/item_use.c +++ b/src/item_use.c @@ -911,9 +911,9 @@ static void ItemUseOnFieldCB_EscapeRope(u8 taskId) DisplayItemMessageOnField(taskId, gStringVar4, Task_UseDigEscapeRopeOnField); } -bool8 CanUseEscapeRopeOnCurrMap(void) +bool8 CanUseDigOrEscapeRopeOnCurMap(void) { - if (gMapHeader.flags & MAP_ALLOW_ESCAPE_ROPE) + if (gMapHeader.flags & MAP_ALLOW_ESCAPING) return TRUE; else return FALSE; @@ -921,7 +921,7 @@ bool8 CanUseEscapeRopeOnCurrMap(void) void ItemUseOutOfBattle_EscapeRope(u8 taskId) { - if (CanUseEscapeRopeOnCurrMap() == TRUE) + if (CanUseDigOrEscapeRopeOnCurMap() == TRUE) { sItemUseOnFieldCB = ItemUseOnFieldCB_EscapeRope; SetUpItemUseOnFieldCallback(taskId); diff --git a/src/overworld.c b/src/overworld.c index ec43a3e80..72bc38693 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -978,7 +978,7 @@ static u16 GetCenterScreenMetatileBehavior(void) bool32 Overworld_IsBikingAllowed(void) { - if (!(gMapHeader.flags & MAP_ALLOW_BIKE)) + if (!(gMapHeader.flags & MAP_ALLOW_CYCLING)) return FALSE; else return TRUE; diff --git a/src/region_map.c b/src/region_map.c index 8a15ca30d..500e9e383 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -1004,7 +1004,7 @@ static void InitMapBasedOnPlayerLocation(void) break; case MAP_TYPE_UNDERGROUND: case MAP_TYPE_UNUSED_2: - if (gMapHeader.flags & MAP_ALLOW_ESCAPE_ROPE) + if (gMapHeader.flags & MAP_ALLOW_ESCAPING) { mapHeader = Overworld_GetMapHeaderByGroupAndId(gSaveBlock1Ptr->escapeWarp.mapGroup, gSaveBlock1Ptr->escapeWarp.mapNum); gRegionMap->mapSecId = mapHeader->regionMapSectionId; diff --git a/tools/mapjson/mapjson.cpp b/tools/mapjson/mapjson.cpp index baa93233b..55335e382 100644 --- a/tools/mapjson/mapjson.cpp +++ b/tools/mapjson/mapjson.cpp @@ -108,9 +108,9 @@ string generate_map_header_text(Json map_data, Json layouts_data, string version text << "\t.byte " << map_data["show_map_name"].bool_value() << "\n"; else if (version == "emerald") text << "\tmap_header_flags " - << "allow_bike=" << map_data["allow_bike"].bool_value() << ", " - << "allow_escape_rope=" << map_data["allow_escape_rope"].bool_value() << ", " - << "allow_run=" << map_data["allow_running"].bool_value() << ", " + << "allow_cycling=" << map_data["allow_cycling"].bool_value() << ", " + << "allow_escaping=" << map_data["allow_escaping"].bool_value() << ", " + << "allow_running=" << map_data["allow_running"].bool_value() << ", " << "show_map_name=" << map_data["show_map_name"].bool_value() << "\n"; text << "\t.byte " << map_data["battle_scene"].string_value() << "\n\n"; |