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/rom4.s | |
| parent | eff1ad330031633b2a28f2b9e8bc8f5e5258826a (diff) | |
| parent | 18c6b8efc21a509121ab4d6f5b9c8523689d27a2 (diff) | |
Merge branch 'master' into field_poison
Diffstat (limited to 'asm/rom4.s')
| -rw-r--r-- | asm/rom4.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/rom4.s b/asm/rom4.s index 8b7dec1ae..ea03b8a8d 100644 --- a/asm/rom4.s +++ b/asm/rom4.s @@ -238,8 +238,8 @@ _08084854: .pool thumb_func_end sav12_xor_set - thumb_func_start ApplyNewEncyprtionKeyToGameStats -ApplyNewEncyprtionKeyToGameStats: @ 8084864 + thumb_func_start ApplyNewEncryptionKeyToGameStats +ApplyNewEncryptionKeyToGameStats: @ 8084864 push {r4-r6,lr} adds r5, r0, 0 movs r4, 0 @@ -251,7 +251,7 @@ _0808486C: ldr r0, [r6] adds r0, r1 adds r1, r5, 0 - bl ApplyNewEncyprtionKeyToWord + bl ApplyNewEncryptionKeyToWord adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -261,7 +261,7 @@ _0808486C: pop {r0} bx r0 .pool - thumb_func_end ApplyNewEncyprtionKeyToGameStats + thumb_func_end ApplyNewEncryptionKeyToGameStats thumb_func_start CopyFieldObjectTemplatesToSav1 @ void CopyFieldObjectTemplatesToSav1() |