Merge master into ObjEvent rename

2019-12-06 21:37:17 -05:00
parent 1b30f0c973 47ea65b96e
commit b93101bbeb
167 changed files with 3292 additions and 1686 deletions
@@ -5,7 +5,7 @@
  "music": "MUS_TOZAN",
  "region_map_section": "MAPSEC_MT_CHIMNEY",
  "requires_flash": false,
-  "weather": "WEATHER_ASH",
+  "weather": "WEATHER_VOLCANIC_ASH",
  "map_type": "MAP_TYPE_ROUTE",
  "allow_bike": true,
  "allow_escape_rope": false,