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/secret_base.s | |
| parent | 3919b7130b2a8709562b012099947923a16af02d (diff) | |
| parent | ed9e0e20547e2c96833cddea67c6b423ef7af7ef (diff) | |
fix merge conflicts
Diffstat (limited to 'asm/secret_base.s')
| -rw-r--r-- | asm/secret_base.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/secret_base.s b/asm/secret_base.s index a0ee95c45..e514e88f1 100644 --- a/asm/secret_base.s +++ b/asm/secret_base.s @@ -1576,7 +1576,7 @@ sub_80E9780: @ 80E9780 ldrb r1, [r0] adds r0, r6, 0 bl ConvertInternationalString - ldr r1, =gUnknown_085EA72F + ldr r1, =gText_ApostropheSBase adds r0, r6, 0 bl StringAppend pop {r3} @@ -2204,7 +2204,7 @@ sub_80E9C9C: @ 80E9C9C b _080E9D1A .pool _080E9D10: - ldr r1, =gUnknown_085EA785 + ldr r1, =gText_NoRegistry ldr r2, =task_pc_turn_off adds r0, r6, 0 bl DisplayItemMessageOnField @@ -2583,7 +2583,7 @@ sub_80E9FFC: @ 80E9FFC ldrb r1, [r4, 0x8] bl sub_80E9780 ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EA737 + ldr r1, =gText_OkayToDeleteFromRegistry adds r0, r4, 0 bl StringExpandPlaceholders ldr r2, =sub_80EA06C @@ -2683,7 +2683,7 @@ sub_80EA120: @ 80EA120 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, =gUnknown_085EA762 + ldr r1, =gText_RegisteredDataDeleted ldr r2, =sub_80EA08C bl DisplayItemMessageOnField pop {r0} |