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
@@ -3,7 +3,7 @@ Route126_MapScripts:: @ 81F68C6
 	.byte 0

 Route126_OnTransition: @ 81F68CC
-	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather
+	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAbnormalWeather
 	end

 Route126_EventScript_Barry:: @ 81F68D6