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/start_menu.s | |
| parent | 3919b7130b2a8709562b012099947923a16af02d (diff) | |
| parent | ed9e0e20547e2c96833cddea67c6b423ef7af7ef (diff) | |
fix merge conflicts
Diffstat (limited to 'asm/start_menu.s')
| -rw-r--r-- | asm/start_menu.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/start_menu.s b/asm/start_menu.s index f71df1046..4f8544eea 100644 --- a/asm/start_menu.s +++ b/asm/start_menu.s @@ -1862,7 +1862,7 @@ _080A0710: bl PrintTextOnWindow movs r4, 0x11 ldrb r0, [r6] - ldr r2, =gUnknown_085EED26 + ldr r2, =gText_SavingPlayer str r4, [sp] mov r1, r8 str r1, [sp, 0x4] @@ -1887,7 +1887,7 @@ _080A0710: bl sub_819A024 movs r4, 0x21 ldrb r0, [r6] - ldr r2, =gUnknown_085EED2D + ldr r2, =gText_SavingBadges str r4, [sp] mov r1, r8 str r1, [sp, 0x4] @@ -1922,7 +1922,7 @@ _080A0710: bne _080A0802 movs r4, 0x31 ldrb r0, [r6] - ldr r2, =gUnknown_085EED34 + ldr r2, =gText_SavingPokedex str r4, [sp] mov r1, r8 str r1, [sp, 0x4] @@ -1952,7 +1952,7 @@ _080A0710: _080A0802: adds r4, 0x10 ldrb r0, [r6] - ldr r2, =gUnknown_085EED3C + ldr r2, =gText_SavingTime lsls r4, 24 lsrs r4, 24 str r4, [sp] |