diff options
| author | U-User-PC\User <golemgalvanize@github.com> | 2017-10-03 15:54:19 -0400 |
|---|---|---|
| committer | U-User-PC\User <golemgalvanize@github.com> | 2017-10-03 15:54:19 -0400 |
| commit | 1ae3d9b57b0f4ad506a1bd7323e46d2fa768b6b7 (patch) | |
| tree | fca8b14b2e5e3a2390c1b890db2f56f6f8cff744 /asm/mail.s | |
| parent | 0a88d1042a80bcc703d05f1cf19527272424a03f (diff) | |
| parent | d32ec8bf7246468625ab68a2d62835d70b7ac98c (diff) | |
I hope this fixes merge conflicts
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 |