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
@@ -156,7 +156,7 @@
"x": 21,
"y": 12,
"elevation": 3,
"weather": "COORD_EVENT_WEATHER_ASH"
"weather": "COORD_EVENT_WEATHER_VOLCANIC_ASH"
},
{
"type": "weather",
+1 -1
View File
@@ -26,7 +26,7 @@ JaggedPass_OnTransition: @ 823068B
end
JaggedPass_EventScript_SetWeatherAsh:: @ 8230697
setweather WEATHER_ASH
setweather WEATHER_VOLCANIC_ASH
doweather
return