diff options
| author | JaceCearK1 <JaceCearK1@users.noreply.github.com> | 2017-07-01 21:04:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-01 21:04:18 +0200 |
| commit | 0dd804a99e5455a0eac8ff6ed87d9de16c7380b7 (patch) | |
| tree | 7b3567978b63ee6548a7b945e075ea8ba37bef51 /asm/reset_rtc_screen.s | |
| parent | f1344efd2aff92292f58f7323bd9297a38fe9b02 (diff) | |
| parent | 8d82578d3a101b06f9d2ced31738021007c4e533 (diff) | |
Merge pull request #1 from pret/master
Update fork to match main fork.
Diffstat (limited to 'asm/reset_rtc_screen.s')
| -rw-r--r-- | asm/reset_rtc_screen.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/reset_rtc_screen.s b/asm/reset_rtc_screen.s index 082ebf465..2fbc559c8 100644 --- a/asm/reset_rtc_screen.s +++ b/asm/reset_rtc_screen.s @@ -655,7 +655,7 @@ Task_ResetRtc_1: @ 806A958 lsls r0, r4, 1 adds r0, r4 lsls r0, 2 - ldr r1, _0806A9A0 @ =gUnknown_08376414 + ldr r1, _0806A9A0 @ =gUnknown_08376420 - 0xC adds r2, r0, r1 ldr r1, _0806A9A4 @ =gMain ldrh r3, [r1, 0x2E] @@ -675,7 +675,7 @@ Task_ResetRtc_1: @ 806A958 b _0806A9CC .align 2, 0 _0806A99C: .4byte gTasks + 0x8 -_0806A9A0: .4byte gUnknown_08376414 +_0806A9A0: .4byte gUnknown_08376420 - 0xC _0806A9A4: .4byte gMain _0806A9A8: .4byte Task_ResetRtc_2 _0806A9AC: @@ -1225,7 +1225,7 @@ _0806AE08: ldr r0, _0806AE54 @ =0x00004040 ldrh r1, [r4] bl VarSet - bl sub_80691A0 + bl DisableResetRTC ldr r0, _0806AE58 @ =gSystemText_ClockResetDataSave bl ResetRtcScreen_ShowMessage movs r0, 0x4 @@ -1238,7 +1238,7 @@ _0806AE54: .4byte 0x00004040 _0806AE58: .4byte gSystemText_ClockResetDataSave _0806AE5C: movs r0, 0 - bl sub_8125D44 + bl TrySavingData lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 |