diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-10-17 10:53:16 -0700 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-10-17 10:53:16 -0700 |
| commit | 46e006b94cf7a2e59652a083cdd01f0d5dc9a26f (patch) | |
| tree | d2d5315a6c8512aeda5ca5d435c3ef2a7d80688b /asm/overworld.s | |
| parent | 0ba52688584d8a35ec9c617b035c9dea71e2689f (diff) | |
| parent | d05339979e39580b162e618087136bb220a4f20d (diff) | |
Merge branch 'master' into quest_log
Diffstat (limited to 'asm/overworld.s')
| -rw-r--r-- | asm/overworld.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/overworld.s b/asm/overworld.s index 4ab22581a..0dd6bb4b9 100644 --- a/asm/overworld.s +++ b/asm/overworld.s @@ -421,7 +421,7 @@ _08054F40: ldr r0, [r6] adds r0, r1 adds r1, r5, 0 - bl sub_804C588 + bl ApplyNewEncryptionKeyToWord adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -4439,7 +4439,7 @@ _08056E60: thumb_func_start MoveSaveBlocks_ResetHeap_ MoveSaveBlocks_ResetHeap_: @ 8056E74 push {lr} - bl sub_804C0A4 + bl MoveSaveBlocks_ResetHeap pop {r0} bx r0 thumb_func_end MoveSaveBlocks_ResetHeap_ |