summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
authorProjectRevoTPP <projectrevotpp@hotmail.com>2017-11-27 15:20:10 -0500
committerProjectRevoTPP <projectrevotpp@hotmail.com>2017-11-27 15:20:10 -0500
commite6bcfee6680bd29c15ef5084665a05e5a2ae5a4e (patch)
tree22f8178dbe8242a82ffa50b5bf3bbc93fc34dd9f /asm
parent9644f4498296040f8fba68ccd8fcc75758dbed2c (diff)
Encyprtion
Diffstat (limited to 'asm')
-rw-r--r--asm/link.s8
-rw-r--r--asm/rom4.s8
2 files changed, 8 insertions, 8 deletions
diff --git a/asm/link.s b/asm/link.s
index d2dc05630..b291bf5a9 100644
--- a/asm/link.s
+++ b/asm/link.s
@@ -52672,8 +52672,8 @@ SetBerryPowder: @ 802467C
.pool
thumb_func_end SetBerryPowder
- thumb_func_start ApplyNewEncyprtionKeyToBerryPowder
-ApplyNewEncyprtionKeyToBerryPowder: @ 8024690
+ thumb_func_start ApplyNewEncryptionKeyToBerryPowder
+ApplyNewEncryptionKeyToBerryPowder: @ 8024690
push {lr}
adds r1, r0, 0
ldr r0, =gSaveBlock2Ptr
@@ -52681,11 +52681,11 @@ ApplyNewEncyprtionKeyToBerryPowder: @ 8024690
movs r2, 0xFA
lsls r2, 1
adds r0, r2
- bl ApplyNewEncyprtionKeyToWord
+ bl ApplyNewEncryptionKeyToWord
pop {r0}
bx r0
.pool
- thumb_func_end ApplyNewEncyprtionKeyToBerryPowder
+ thumb_func_end ApplyNewEncryptionKeyToBerryPowder
thumb_func_start sub_80246AC
sub_80246AC: @ 80246AC
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()