diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-21 10:50:15 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-21 10:50:15 +0200 |
| commit | 9ee9a20152694f456841eb890b986d42f3c50e26 (patch) | |
| tree | 2998678c0f3db391b080318633bc506248542ecb /asm/wallclock.s | |
| parent | 3919b7130b2a8709562b012099947923a16af02d (diff) | |
| parent | ed9e0e20547e2c96833cddea67c6b423ef7af7ef (diff) | |
fix merge conflicts
Diffstat (limited to 'asm/wallclock.s')
| -rw-r--r-- | asm/wallclock.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/wallclock.s b/asm/wallclock.s index 0d6f05a23..f8cc87fe8 100644 --- a/asm/wallclock.s +++ b/asm/wallclock.s @@ -353,7 +353,7 @@ Cb2_StartWallClock: @ 81349F4 movs r0, 0x5A strh r0, [r1, 0x30] bl sub_813498C - ldr r2, =gUnknown_085EFAE0 + ldr r2, =gText_Confirm3 movs r0, 0x1 str r0, [sp] mov r1, r8 @@ -500,7 +500,7 @@ _08134BA4: ldrh r0, [r0, 0xC] strh r0, [r1, 0x30] bl sub_813498C - ldr r2, =gUnknown_085EFAE8 + ldr r2, =gText_Cancel4 movs r0, 0x1 str r0, [sp] mov r1, r9 @@ -683,7 +683,7 @@ sub_8134DC4: @ 8134DC4 adds r2, r5, 0 movs r3, 0xD bl SetWindowBorderStyle - ldr r2, =gUnknown_085EFAC6 + ldr r2, =gText_IsThisTheCorrectTime movs r0, 0x1 str r0, [sp] movs r0, 0 |