ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-21 11:43:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

through c2_080111BC

Browse Source
This commit is contained in:
PikalaxALT 2017-11-24 21:11:32 -05:00
parent b210d5f86b
commit 4a81b595c3
2 changed files with 18 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
asm/wallclock.s
View File

@ -5,57 +5,6 @@
.text
thumb_func_start sub_8134EA4
sub_8134EA4: @ 8134EA4
push {r4,lr}
sub sp, 0x4
lsls r0, 24
lsrs r0, 24
ldr r1, =gTasks
lsls r4, r0, 2
adds r4, r0
lsls r4, 3
adds r4, r1
movs r1, 0xC
ldrsh r0, [r4, r1]
movs r2, 0xE
ldrsh r1, [r4, r2]
bl RtcInitLocalTimeOffset
movs r0, 0x1
negs r0, r0
movs r1, 0
str r1, [sp]
movs r2, 0
movs r3, 0x10
bl BeginNormalPaletteFade
ldr r0, =c2_080111BC
str r0, [r4]
add sp, 0x4
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_8134EA4
thumb_func_start c2_080111BC
c2_080111BC: @ 8134EE8
push {lr}
ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
cmp r0, 0
bne _08134F02
bl FreeAllWindowBuffers
ldr r0, =gMain
ldr r0, [r0, 0x8]
bl SetMainCallback2
_08134F02:
pop {r0}
bx r0
.pool
thumb_func_end c2_080111BC
thumb_func_start sub_8134F10
sub_8134F10: @ 8134F10
push {lr}

19
src/wallclock.c
View File

@ -28,7 +28,8 @@ static void sub_8134CB8(u8 taskId);
static void sub_8134CE8(u8 taskId);
static void sub_8134DC4(u8 taskId);
static void c3_80BF560(u8 taskId);
void sub_8134EA4(u8 taskId);
static void sub_8134EA4(u8 taskId);
static void c2_080111BC(u8 taskId);
void sub_8134F10(u8 taskId);
u16 sub_8134FFC(u16 a0, u8 a1, u8 a2);
void sub_813504C(u8 taskId, u8 a1);
@ -747,3 +748,19 @@ static void c3_80BF560(u8 taskId)
break;
}
}
static void sub_8134EA4(u8 taskId)
{
RtcInitLocalTimeOffset(gTasks[taskId].data[2], gTasks[taskId].data[3]);
BeginNormalPaletteFade(-1, 0, 0, 16, 0);
gTasks[taskId].func = c2_080111BC;
}
static void c2_080111BC(u8 taskId)
{
if (!gPaletteFade.active)
{
FreeAllWindowBuffers();
SetMainCallback2(gMain.savedCallback);
}
}