Merge branch 'master' into record_mixing

2018-02-11 20:12:40 -05:00
parent bc063b45d0 14a76793e5
commit 590c4b500b
6672 changed files with 937954 additions and 212286 deletions
@@ -10,5 +10,6 @@ void pal_fill_black(void);
 bool8 sub_80ABDFC(void);
 void sub_80AF168(void);
 void sub_80AF2B4(u8 taskId);
+void UpdateWeatherPerDay(u16 days);

 #endif //GUARD_FIELD_SCREEN_H