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
@@ -76,7 +76,7 @@ Route120_EventScript_SetWeather:: @ 81F54D8
return
Route120_EventScript_SetCloudyWeather:: @ 81F54FF
setweather WEATHER_CLOUDS
setweather WEATHER_SUNNY_CLOUDS
return
Route120_EventScript_SetSunnyWeather:: @ 81F5503
@@ -92,7 +92,7 @@ Route120_EventScript_TrySetRainyWeather:: @ 81F5507
end
Route120_EventScript_SetRainyWeather:: @ 81F5523
setweather WEATHER_RAIN_LIGHT
setweather WEATHER_RAIN
return
Route120_EventScript_BerryBeauty:: @ 81F5527