diff options
| author | paul <nintendo6496@googlemail.com> | 2018-10-11 18:56:58 +0200 |
|---|---|---|
| committer | paul <nintendo6496@googlemail.com> | 2018-10-11 18:56:58 +0200 |
| commit | 50fcc3a1e96a1e35576d2d0769aec251a40805dd (patch) | |
| tree | f100b156dfa1eb6fe773d90004d79bb246e9dcbf /asm/mail_data.s | |
| parent | acdd8cab26671a975b4f155b84b24388df9d84bc (diff) | |
| parent | bd88c803793a6e5c8f5d2ac1a852c912e980ef1d (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'asm/mail_data.s')
| -rw-r--r-- | asm/mail_data.s | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/asm/mail_data.s b/asm/mail_data.s index 5f577039b..421aaf452 100644 --- a/asm/mail_data.s +++ b/asm/mail_data.s @@ -301,11 +301,11 @@ _08097E36: mov r0, r8 movs r1, 0x40 mov r2, r9 - bl sub_804037C + bl SetMonData mov r0, r8 movs r1, 0xC mov r2, sp - bl sub_804037C + bl SetMonData mov r1, r9 ldrb r0, [r1] b _08097EEE @@ -413,7 +413,7 @@ GiveMailToMon2: @ 8097F44 adds r0, r6, 0 movs r1, 0x40 adds r2, r4, 0 - bl sub_804037C + bl SetMonData mov r0, sp strb r5, [r0] mov r1, sp @@ -422,7 +422,7 @@ GiveMailToMon2: @ 8097F44 adds r0, r6, 0 movs r1, 0xC mov r2, sp - bl sub_804037C + bl SetMonData ldrb r0, [r4] b _08097FAA .align 2, 0 @@ -476,11 +476,11 @@ TakeMailFromMon: @ 8097FB8 strb r1, [r0, 0x1] adds r0, r4, 0 movs r1, 0x40 - bl sub_804037C + bl SetMonData adds r0, r4, 0 movs r1, 0xC mov r2, sp - bl sub_804037C + bl SetMonData _08098008: add sp, 0x8 pop {r4} @@ -577,11 +577,11 @@ _08098060: adds r0, r5, 0 movs r1, 0x40 mov r2, r9 - bl sub_804037C + bl SetMonData adds r0, r5, 0 movs r1, 0xC mov r2, sp - bl sub_804037C + bl SetMonData adds r0, r7, 0 b _080980E8 .align 2, 0 |