Merge master into ObjEvent rename and prune accidental inclusions

1 files changed, 49 insertions, 88 deletions

diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json
index a82fc2d54..223455f69 100644
--- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json
+++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json
@@ -1,7 +1,7 @@
 {
   "id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM",
   "name": "BattleFrontier_BattleTowerMultiBattleRoom",
-  "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM",
+  "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM",
   "music": "MUS_SATTOWER",
   "region_map_section": "MAPSEC_BATTLE_FRONTIER",
   "requires_flash": false,
@@ -9,127 +9,88 @@
   "map_type": "MAP_TYPE_INDOOR",
   "allow_bike": false,
   "allow_escape_rope": false,
-  "allow_running": true,
+  "allow_running": false,
   "show_map_name": false,
-  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "battle_scene": "MAP_BATTLE_SCENE_FRONTIER",
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJ_EVENT_GFX_TEALA",
-      "x": 11,
-      "y": 2,
-      "elevation": 3,
-      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
-      "movement_range_x": 1,
-      "movement_range_y": 1,
-      "trainer_type": "0",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A",
-      "flag": "0"
-    },
-    {
       "graphics_id": "OBJ_EVENT_GFX_VAR_0",
-      "x": 2,
-      "y": 10,
+      "x": 5,
+      "y": 1,
       "elevation": 3,
-      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
-      "movement_range_x": 1,
-      "movement_range_y": 1,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29",
-      "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_1"
+      "script": "0x0",
+      "flag": "FLAG_HIDE_BATTLE_TOWER_OPPONENT"
     },
     {
-      "graphics_id": "OBJ_EVENT_GFX_VAR_1",
-      "x": 17,
-      "y": 11,
+      "graphics_id": "OBJ_EVENT_GFX_TEALA",
+      "x": 1,
+      "y": 4,
       "elevation": 3,
-      "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT",
-      "movement_range_x": 1,
-      "movement_range_y": 1,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FFB",
-      "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_2"
+      "script": "0x0",
+      "flag": "0"
     },
     {
-      "graphics_id": "OBJ_EVENT_GFX_VAR_2",
-      "x": 6,
-      "y": 9,
+      "graphics_id": "OBJ_EVENT_GFX_TEALA",
+      "x": 1,
+      "y": 5,
       "elevation": 3,
-      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
-      "movement_range_x": 1,
-      "movement_range_y": 1,
+      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244008",
-      "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_3"
+      "script": "0x0",
+      "flag": "0"
     },
     {
-      "graphics_id": "OBJ_EVENT_GFX_VAR_3",
-      "x": 8,
-      "y": 13,
+      "graphics_id": "OBJ_EVENT_GFX_VAR_1",
+      "x": 4,
+      "y": 1,
       "elevation": 3,
-      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
-      "movement_range_x": 1,
-      "movement_range_y": 1,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244015",
-      "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_4"
+      "script": "0x0",
+      "flag": "FLAG_HIDE_BATTLE_TOWER_OPPONENT"
     },
     {
-      "graphics_id": "OBJ_EVENT_GFX_VAR_4",
-      "x": 10,
-      "y": 11,
+      "graphics_id": "OBJ_EVENT_GFX_VAR_F",
+      "x": 4,
+      "y": 8,
       "elevation": 3,
       "movement_type": "MOVEMENT_TYPE_FACE_UP",
-      "movement_range_x": 1,
-      "movement_range_y": 1,
-      "trainer_type": "0",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244022",
-      "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_5"
-    },
-    {
-      "graphics_id": "OBJ_EVENT_GFX_VAR_5",
-      "x": 13,
-      "y": 10,
-      "elevation": 3,
-      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
-      "movement_range_x": 1,
-      "movement_range_y": 1,
-      "trainer_type": "0",
-      "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24402F",
-      "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_6"
-    },
-    {
-      "graphics_id": "OBJ_EVENT_GFX_VAR_6",
-      "x": 15,
-      "y": 13,
-      "elevation": 3,
-      "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT",
-      "movement_range_x": 1,
-      "movement_range_y": 1,
+      "movement_range_x": 0,
+      "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24403C",
-      "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_1"
+      "script": "0x0",
+      "flag": "0"
     },
     {
-      "graphics_id": "OBJ_EVENT_GFX_VAR_7",
-      "x": 4,
-      "y": 12,
+      "graphics_id": "OBJ_EVENT_GFX_VAR_E",
+      "x": 5,
+      "y": 8,
       "elevation": 3,
-      "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
-      "movement_range_x": 1,
-      "movement_range_y": 1,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244049",
-      "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_2"
+      "script": "0x0",
+      "flag": "0"
     }
   ],
   "warp_events": [],