diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-27 20:07:33 -0500 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-27 20:07:33 -0500 |
commit | 1ac177723de817a85533adc3e984425d3ab86e00 (patch) | |
tree | 3f5ce54362ad9a8c75e21c52f78ce3b4bcd460f2 /asm/record_mixing.s | |
parent | eff1ad330031633b2a28f2b9e8bc8f5e5258826a (diff) | |
parent | 18c6b8efc21a509121ab4d6f5b9c8523689d27a2 (diff) |
Merge branch 'master' into field_poison
Diffstat (limited to 'asm/record_mixing.s')
-rw-r--r-- | asm/record_mixing.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/record_mixing.s b/asm/record_mixing.s index 35e0557ee..e7d7c8a38 100644 --- a/asm/record_mixing.s +++ b/asm/record_mixing.s @@ -993,7 +993,7 @@ _080E75AC: movs r0, 0xC8 muls r0, r2 adds r1, r0 - ldr r0, =gUnknown_020228C4 + ldr r0, =gBlockSendBuffer movs r2, 0xC8 bl memcpy b _080E75FC |