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/menu.s | |
| parent | 3919b7130b2a8709562b012099947923a16af02d (diff) | |
| parent | ed9e0e20547e2c96833cddea67c6b423ef7af7ef (diff) | |
fix merge conflicts
Diffstat (limited to 'asm/menu.s')
| -rwxr-xr-x | asm/menu.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/menu.s b/asm/menu.s index 553161d40..8bb9dc436 100755 --- a/asm/menu.s +++ b/asm/menu.s @@ -1250,7 +1250,7 @@ RedrawMenuCursor: @ 8198448 bl FillWindowPixelRect ldrb r0, [r5, 0x5] ldrb r1, [r5, 0x6] - ldr r2, =gUnknown_085EE498 + ldr r2, =gText_SelectorArrow3 ldrb r3, [r5] ldrb r4, [r5, 0x8] mov r6, r8 @@ -2139,7 +2139,7 @@ sub_8198AF8: @ 8198AF8 adds r2, r4, 0 adds r3, r5, 0 bl SetWindowBorderStyle - ldr r0, =gUnknown_085EE491 + ldr r0, =gText_YesNo str r0, [sp, 0xC] add r1, sp, 0xC ldrb r0, [r7] @@ -2877,7 +2877,7 @@ sub_8199060: @ 8199060 lsrs r3, 24 ldrb r0, [r5, 0x5] ldrb r1, [r5, 0x6] - ldr r2, =gUnknown_085EE498 + ldr r2, =gText_SelectorArrow3 str r3, [sp] movs r3, 0 str r3, [sp, 0x4] @@ -3668,7 +3668,7 @@ CreateYesNoMenu: @ 81996C0 adds r2, r4, 0 adds r3, r5, 0 bl SetWindowBorderStyle - ldr r0, =gUnknown_085EE491 + ldr r0, =gText_YesNo str r0, [sp] mov r1, sp mov r2, r8 |