summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2017-11-24 21:17:50 -0500
committerPikalaxALT <pikalaxalt@gmail.com>2017-11-24 21:17:50 -0500
commit046e5ebf6963bbe5cc3b668c1511f1e1597a6da9 (patch)
tree6b01bafd8d4fa7aaae1073350ae8f325bd620451 /src
parent4a81b595c358b0c136e262057765565dd38a168e (diff)
through sub_8134FB0
Diffstat (limited to 'src')
-rw-r--r--src/wallclock.c36
1 files changed, 35 insertions, 1 deletions
diff --git a/src/wallclock.c b/src/wallclock.c
index b14037c43..af343d1fc 100644
--- a/src/wallclock.c
+++ b/src/wallclock.c
@@ -30,7 +30,10 @@ static void sub_8134DC4(u8 taskId);
static void c3_80BF560(u8 taskId);
static void sub_8134EA4(u8 taskId);
static void c2_080111BC(u8 taskId);
-void sub_8134F10(u8 taskId);
+static void sub_8134F10(u8 taskId);
+static void sub_8134F40(u8 taskId);
+static void sub_8134F78(u8 taskId);
+static void sub_8134FB0(u8 taskId);
u16 sub_8134FFC(u16 a0, u8 a1, u8 a2);
void sub_813504C(u8 taskId, u8 a1);
void sub_8135130(u8 taskId);
@@ -764,3 +767,34 @@ static void c2_080111BC(u8 taskId)
SetMainCallback2(gMain.savedCallback);
}
}
+
+static void sub_8134F10(u8 taskId)
+{
+ if (!gPaletteFade.active)
+ {
+ gTasks[taskId].func = sub_8134F40;
+ }
+}
+
+static void sub_8134F40(u8 taskId)
+{
+ sub_8135130(taskId);
+ if (gMain.newKeys & (A_BUTTON | B_BUTTON))
+ {
+ gTasks[taskId].func = sub_8134F78;
+ }
+}
+
+static void sub_8134F78(u8 taskId)
+{
+ BeginNormalPaletteFade(-1, 0, 0, 16, 0);
+ gTasks[taskId].func = sub_8134FB0;
+}
+
+static void sub_8134FB0(u8 taskId)
+{
+ if (!gPaletteFade.active)
+ {
+ SetMainCallback2(gMain.savedCallback);
+ }
+}