Merge master into ObjEvent rename

This commit is contained in:
GriffinR committed 2019-11-25 20:00:04 -05:00
commit f559fa3fe2
144 files changed
+8322 -8521

No files matched your search

+3 -3
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",