From ec3e86f1d2f78bb9fece0956e246862cea3c07b9 Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.richards@comcast.net>
Date: Wed, 20 Nov 2019 22:55:44 -0500
Subject: Standardize Event Object to Object Event

---
 data/maps/map_groups.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'data/maps/map_groups.json')

diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json
index 4035bc3f3..f9c614a9b 100644
--- a/data/maps/map_groups.json
+++ b/data/maps/map_groups.json
@@ -688,4 +688,4 @@
     "BattleFrontier_OutsideWest",
     "BattleFrontier_OutsideEast"
   ]
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3


From ef67f2d33b45348d76d722f250cdbcc8485be264 Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.g.richards@gmail.com>
Date: Wed, 8 Jan 2020 05:43:06 -0500
Subject: Merge master into ObjEvent rename and prune accidental inclusions

---
 data/maps/map_groups.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'data/maps/map_groups.json')

diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json
index ce5b15480..bd8c84625 100644
--- a/data/maps/map_groups.json
+++ b/data/maps/map_groups.json
@@ -510,9 +510,9 @@
     "SafariZone_Northeast",
     "SafariZone_Southeast",
     "BattleFrontier_OutsideEast",
+    "BattleFrontier_BattleTowerMultiPartnerRoom",
+    "BattleFrontier_BattleTowerMultiCorridor",
     "BattleFrontier_BattleTowerMultiBattleRoom",
-    "BattleFrontier_BattleTowerCorridor2",
-    "BattleFrontier_BattleTowerBattleRoom2",
     "BattleFrontier_BattleDomeLobby",
     "BattleFrontier_BattleDomeCorridor",
     "BattleFrontier_BattleDomePreBattleRoom",
-- 
cgit v1.2.3