summaryrefslogtreecommitdiff
path: root/src/wallclock.c
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2017-06-18 13:01:55 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2017-06-18 13:01:55 -0400
commit5d04fe94d9eed2980ac0b439b0e45af13c792037 (patch)
treebf9f0c1eaecbcf25e9de4ef6d5c99c16f132e5a4 /src/wallclock.c
parent02af81bc95367d4557189fda0f1dccccf16c852a (diff)
parent13ff901d46f1726d5c0680cf8593484e0e9bbc4d (diff)
Merge remote-tracking branch 'origin/master' into field_map_obj_data
Diffstat (limited to 'src/wallclock.c')
-rw-r--r--src/wallclock.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/wallclock.c b/src/wallclock.c
index d55d14edb..efc7dd42a 100644
--- a/src/wallclock.c
+++ b/src/wallclock.c
@@ -1,6 +1,5 @@
#include "global.h"
#include "wallclock.h"
-#include "asm.h"
#include "decompress.h"
#include "main.h"
#include "menu.h"
@@ -11,12 +10,12 @@
#include "strings2.h"
#include "task.h"
#include "trig.h"
+#include "unknown_task.h"
extern u16 gSpecialVar_0x8004;
extern u8 gMiscClock_Gfx[];
extern u8 gUnknown_08E95774[];
extern u8 gUnknown_08E954B0[];
-extern const struct MenuAction gMenuYesNoItems[];
extern u16 gMiscClockMale_Pal[];
extern u16 gMiscClockFemale_Pal[];