diff options
| author | yenatch <yenatch@gmail.com> | 2017-03-22 18:34:29 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2017-03-22 18:34:29 -0400 |
| commit | 7acbfe40778bfbd03b0e2d357efef9ee9b0a34e9 (patch) | |
| tree | 90c0b95146f3d768b536658eac6a63ff9adcaaec /src/clock.c | |
| parent | c0a27d5455014bfe54f7ea73e8a38ce0ed8da6da (diff) | |
| parent | e3c26e52ae6ab881ade913ca1fad2cd9629bbcb1 (diff) | |
Merge remote-tracking branch 'origin/master'
Conflicts:
Makefile
Diffstat (limited to 'src/clock.c')
| -rw-r--r-- | src/clock.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/clock.c b/src/clock.c index e660abdd3..fd9e6915a 100644 --- a/src/clock.c +++ b/src/clock.c @@ -1,11 +1,12 @@ #include "global.h" -#include "main.h" -#include "rtc.h" +#include "berry.h" #include "event_data.h" #include "lottery_corner.h" -#include "berry.h" +#include "main.h" #include "rom4.h" +#include "rtc.h" #include "wallclock.h" +#include "clock.h" extern void sub_80FA220(u16); extern void sub_80BE8C4(u16); |