Merge branch 'master' into doc-cablecar

This commit is contained in:
GriffinR
2020-08-28 16:17:48 -04:00
committed by GitHub
1185 changed files with 10758 additions and 10803 deletions
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_ROUTE112_CABLE_CAR_STATION",
"name": "Route112_CableCarStation",
"layout": "LAYOUT_CABLE_CAR_STATION",
"music": "MUS_DOORO_X1",
"music": "MUS_ROUTE110",
"region_map_section": "MAPSEC_ROUTE_112",
"requires_flash": false,
"weather": "WEATHER_NONE",