diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2018-05-19 12:32:44 +0200 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-05-19 12:32:44 +0200 |
commit | e44f35c7b7fb49a55073c5b40257a4b8052cd5a0 (patch) | |
tree | ad35f76e058386824229a64290a1ef15a9f120c2 /include/field_screen.h | |
parent | 0c1f85f2002e911f64a3b188fa30d8f465c0fc7e (diff) | |
parent | db898d0e4854c70a356d037919ea48aed1f62816 (diff) |
fix record mixing merge conflicts
Diffstat (limited to 'include/field_screen.h')
-rw-r--r-- | include/field_screen.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/field_screen.h b/include/field_screen.h index 2eea5b505..d9a2bb5fa 100644 --- a/include/field_screen.h +++ b/include/field_screen.h @@ -9,6 +9,7 @@ void pal_fill_black(void); bool8 IsWeatherNotFadingIn(void); void sub_80AF168(void); +void sub_80AF2B4(u8 taskId); void UpdateWeatherPerDay(u16 days); void sub_80AC3D0(void); void sub_80AC3E4(void); |