Merge branch 'master' into battle

2019-09-25 13:49:16 -04:00
parent 2599dac8ac 6539884c88
commit 0e217e22d8
67 changed files with 3363 additions and 3782 deletions
@@ -17,5 +17,6 @@ bool8 sub_807AA70(void);
 void SetWeatherScreenFadeOut(void);
 void sub_807B070(void);
 u8 GetCurrentWeather(void);
+void FieldWeather_StartFadingOutCreditsMap(u8, u8, u32);

 #endif // GUARD_WEATHER_H