Merge master into ObjEvent rename and prune accidental inclusions

This commit is contained in:
GriffinR
2020-01-08 05:43:06 -05:00
parent 68cdd7b1cb
commit ef67f2d33b
85 changed files with 4548 additions and 4729 deletions

View File

@@ -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",