Merge master into ObjEvent rename

This commit is contained in:
GriffinR committed 2019-12-06 21:37:33 -05:00
commit b93101bbeb
167 files changed
+3292 -1686

No files matched your search

+1 -1
View File
@@ -5,7 +5,7 @@
"music": "MUS_DAN01",
"region_map_section": "MAPSEC_MARINE_CAVE",
"requires_flash": false,
"weather": "WEATHER_FOG_1",
"weather": "WEATHER_FOG_HORIZONTAL",
"map_type": "MAP_TYPE_UNDERGROUND",
"allow_bike": false,
"allow_escape_rope": true,