Merge master into fix-eventobj

This commit is contained in:
GriffinR
2020-01-15 16:11:20 -05:00
21 changed files with 135 additions and 134 deletions

View File

@@ -456,10 +456,10 @@
"SecretBase_YellowCave4",
"SecretBase_Tree4",
"SecretBase_Shrub4",
"BattleColosseum2P",
"BattleColosseum_2P",
"TradeCenter",
"RecordCorner",
"BattleColosseum4P",
"BattleColosseum_4P",
"ContestHall",
"UnknownLinkContestRoom_25_29",
"UnknownLinkContestRoom_25_30",