diff options
| author | PikalaxALT <pikalax1@gmail.com> | 2017-09-20 23:02:17 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalax1@gmail.com> | 2017-09-20 23:02:17 -0400 |
| commit | 8d5250fdaad7b50abd05cdee2e0cedfef99cdcbc (patch) | |
| tree | 05d6a27744a82014df531be24531d81b4d5f82ed /asm/mail.s | |
| parent | 6f481cceb1b56c5d63ba045f7ca7f1ac7151332b (diff) | |
| parent | e7f91c65d9983ba9944bd7d09f8fe0cf245669d2 (diff) | |
Merge branch 'master' into lilycove_lady
Diffstat (limited to 'asm/mail.s')
| -rw-r--r-- | asm/mail.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/mail.s b/asm/mail.s index 77cbc4e83..5f76a5ef0 100644 --- a/asm/mail.s +++ b/asm/mail.s @@ -691,7 +691,7 @@ _08121A8A: ldrb r0, [r0] cmp r0, 0 bne _08121AF0 - ldr r1, =gUnknown_085EEA78 + ldr r1, =gText_FromSpace adds r0, r2, 0 bl StringCopy ldr r0, [r4] @@ -825,7 +825,7 @@ _08121BB8: cmp r6, r0 bcc _08121B60 _08121BCC: - ldr r1, =gUnknown_085EEA78 + ldr r1, =gText_FromSpace add r0, sp, 0xC bl StringCopy ldr r4, =gUnknown_0203A134 |