Merge master into ObjEvent rename

This commit is contained in:
GriffinR
2019-11-25 20:00:04 -05:00
144 changed files with 8322 additions and 8521 deletions

View File

@@ -532,9 +532,9 @@
"BattleFrontier_BattlePikeLobby",
"BattleFrontier_BattlePikeCorridor",
"BattleFrontier_BattlePikeThreePathRoom",
"BattleFrontier_BattlePikeRandomRoom1",
"BattleFrontier_BattlePikeRandomRoom2",
"BattleFrontier_BattlePikeRandomRoom3",
"BattleFrontier_BattlePikeRoomNormal",
"BattleFrontier_BattlePikeRoomFinal",
"BattleFrontier_BattlePikeRoomWildMons",
"BattleFrontier_RankingHall",
"BattleFrontier_Lounge1",
"BattleFrontier_ExchangeServiceCorner",