Merge branch 'master' into doc-tilesets

This commit is contained in:
GriffinR
2020-02-16 11:13:58 -05:00
committed by GitHub
249 changed files with 11504 additions and 11961 deletions
+11 -11
View File
@@ -178,17 +178,17 @@
],
"gMapGroup2": [
"NavelRock_Exterior",
"SevenIsland_TrainerTower_1F",
"SevenIsland_TrainerTower_2F",
"SevenIsland_TrainerTower_3F",
"SevenIsland_TrainerTower_4F",
"SevenIsland_TrainerTower_5F",
"SevenIsland_TrainerTower_6F",
"SevenIsland_TrainerTower_7F",
"SevenIsland_TrainerTower_8F",
"SevenIsland_TrainerTower_Roof",
"SevenIsland_TrainerTower_Lobby",
"SevenIsland_TrainerTower_Elevator",
"TrainerTower_1F",
"TrainerTower_2F",
"TrainerTower_3F",
"TrainerTower_4F",
"TrainerTower_5F",
"TrainerTower_6F",
"TrainerTower_7F",
"TrainerTower_8F",
"TrainerTower_Roof",
"TrainerTower_Lobby",
"TrainerTower_Elevator",
"FiveIsland_LostCave_Entrance",
"FiveIsland_LostCave_Room1",
"FiveIsland_LostCave_Room2",