Merge master into ObjEvent rename

This commit is contained in:
GriffinR
2019-12-06 21:37:17 -05:00
167 changed files with 3292 additions and 1686 deletions
+2 -2
View File
@@ -13,11 +13,11 @@ MtPyre_Exterior_EventScript_CheckEnterFromSummit:: @ 8231FD8
return
MtPyre_Exterior_EventScript_EnterFromSummit:: @ 8231FE9
setweather WEATHER_FOG_1
setweather WEATHER_FOG_HORIZONTAL
return
MtPyre_Exterior_EventScript_FogTrigger:: @ 8231FED
setweather WEATHER_FOG_1
setweather WEATHER_FOG_HORIZONTAL
doweather
end