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
@@ -3,7 +3,7 @@ Route124_MapScripts:: @ 81F656C
.byte 0
Route124_OnTransition: @ 81F6572
call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather
call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAbnormalWeather
end
Route124_EventScript_HuntersHouseSign:: @ 81F657C