summaryrefslogtreecommitdiff
path: root/arm9/modules
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2020-06-11 09:00:55 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2020-06-11 09:00:55 -0400
commit7e447c68f5e11e2a0a96b4251e77f3fa7c9c3fc1 (patch)
tree82e6209f00ca5b47dfe2943c294a16bfd5cc7a4e /arm9/modules
parent6a1f6122b5422deebf218372cbd9b5684505d4ec (diff)
Name more funcs in pokemon.s
Diffstat (limited to 'arm9/modules')
-rw-r--r--arm9/modules/05/asm/module_05.s186
-rw-r--r--arm9/modules/06/asm/module_06.s98
-rw-r--r--arm9/modules/11/asm/module_11.s64
-rw-r--r--arm9/modules/14/asm/module_14.s114
-rw-r--r--arm9/modules/17/asm/module_17.s6
-rw-r--r--arm9/modules/27/asm/module_27.s4
-rw-r--r--arm9/modules/35/asm/module_35.s8
-rw-r--r--arm9/modules/62/asm/module_62.s14
-rw-r--r--arm9/modules/65/asm/module_65.s2
-rw-r--r--arm9/modules/67/asm/module_67.s2
-rw-r--r--arm9/modules/69/asm/module_69.s6
-rw-r--r--arm9/modules/70/asm/module_70.s4
-rw-r--r--arm9/modules/71/asm/module_71.s10
-rw-r--r--arm9/modules/76/asm/module_76.s6
-rw-r--r--arm9/modules/80/asm/module_80.s72
-rw-r--r--arm9/modules/81/asm/module_81.s18
-rw-r--r--arm9/modules/83/asm/module_83.s138
17 files changed, 376 insertions, 376 deletions
diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s
index 7a16d48c..d9571ef1 100644
--- a/arm9/modules/05/asm/module_05.s
+++ b/arm9/modules/05/asm/module_05.s
@@ -3290,7 +3290,7 @@ _021D8FF6:
bl FUN_0206B9B0
mov r1, #5
add r2, r5, #0
- bl FUN_020688E8
+ bl MonApplyFriendshipModEncrypted
add r4, r4, #1
cmp r4, r7
blt _021D8FF6
@@ -43049,7 +43049,7 @@ _021EC46E:
bl FUN_02023C7C
add r1, r7, #0
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0
beq _021EC48C
add r0, r4, #1
@@ -43081,7 +43081,7 @@ _021EC4AA:
bl FUN_02023C7C
add r1, r6, #0
add r2, r7, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0
bne _021EC4C6
add r0, r4, #0
@@ -43103,7 +43103,7 @@ MOD05_021EC4DC: ; 0x021EC4DC
push {r3, lr}
mov r1, #6
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
lsl r0, r0, #0x10
lsr r0, r0, #0x10
bl FUN_0206EA98
@@ -43211,13 +43211,13 @@ MOD05_021EC5B0: ; 0x021EC5B0
add r0, r6, #0
mov r1, #5
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0
bne _021EC600
add r0, r7, #0
mov r1, #5
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0
beq _021EC600
add r0, r5, #0
@@ -43289,7 +43289,7 @@ MOD05_021EC668: ; 0x021EC668
add r6, r1, #0
mov r0, #4
add r7, r2, #0
- bl FUN_020669C0
+ bl AllocMonZeroed
add r4, r0, #0
add r0, r6, #0
bl FUN_02023C7C
@@ -43304,7 +43304,7 @@ MOD05_021EC668: ; 0x021EC668
add r0, r5, #0
mov r1, #5
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
lsl r0, r0, #0x10
lsr r7, r0, #0x10
add r0, r5, #0
@@ -43329,7 +43329,7 @@ MOD05_021EC668: ; 0x021EC668
str r0, [sp, #8]
add r0, r4, #0
mov r1, #8
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r4, #0
bl MOD05_021EC604
_021EC6E0:
@@ -43342,13 +43342,13 @@ _021EC6E0:
add r2, r0, #0
add r0, r4, #0
mov r1, #0xa9
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_021EC6FA:
ldr r0, [sp]
add r1, r4, #0
bl FUN_0206B900
add r0, r5, #0
- bl FUN_020669A0
+ bl WipeBoxMonDataAndEncrypt
add r0, r6, #0
mov r1, #0
bl FUN_02023CA0
@@ -43384,7 +43384,7 @@ MOD05_021EC744: ; 0x021EC744
add r6, r0, #0
mov r0, #4
add r5, r1, #0
- bl FUN_020669C0
+ bl AllocMonZeroed
add r7, r0, #0
bl FUN_020690E4
add r4, r0, #0
@@ -43394,16 +43394,16 @@ MOD05_021EC744: ; 0x021EC744
add r0, r4, #0
mov r1, #8
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
str r0, [sp]
add r0, r0, r5
str r0, [sp]
add r0, r4, #0
mov r1, #8
add r2, sp, #0
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r4, #0
- bl FUN_020687C8
+ bl CalcBoxMonLevelEncrypted
add r4, r0, #0
add r0, r7, #0
bl FreeToHeap
@@ -43416,7 +43416,7 @@ MOD05_021EC78C: ; 0x021EC78C
add r5, r0, #0
bl FUN_02023C7C
add r6, r0, #0
- bl FUN_020687C8
+ bl CalcBoxMonLevelEncrypted
lsl r0, r0, #0x18
lsr r4, r0, #0x18
add r0, r5, #0
@@ -43525,7 +43525,7 @@ MOD05_021EC864: ; 0x021EC864
bl FUN_02023C7C
mov r1, #5
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0
beq _021EC888
add r0, r4, #0
@@ -43581,7 +43581,7 @@ _021EC8D8:
ldr r0, [r4]
mov r1, #5
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
str r0, [r5]
cmp r0, #0x84
bne _021EC8EC
@@ -43612,7 +43612,7 @@ _021EC90E:
add r0, sp, #4
ldr r0, [r0, r1]
mov r1, #6
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0xe5
bne _021EC938
bl rand_LC
@@ -43652,7 +43652,7 @@ _021EC960:
bl MOD05_021EC458
add r1, r5, #0
add r2, r1, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
bl GetNatureFromPersonality
mov r7, #0x96
add r6, r0, #0
@@ -43791,62 +43791,62 @@ _021ECA60: ; jump table
_021ECA6C:
mov r1, #0x46
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
strb r0, [r6]
add r0, r4, #0
mov r1, #0x46
add r2, r7, #0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
b _021ECAEE
_021ECA82:
mov r1, #0x47
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
strb r0, [r6]
add r0, r4, #0
mov r1, #0x47
add r2, r7, #0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
b _021ECAEE
_021ECA98:
mov r1, #0x48
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
strb r0, [r6]
add r0, r4, #0
mov r1, #0x48
add r2, r7, #0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
b _021ECAEE
_021ECAAE:
mov r1, #0x49
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
strb r0, [r6]
add r0, r4, #0
mov r1, #0x49
add r2, r7, #0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
b _021ECAEE
_021ECAC4:
mov r1, #0x4a
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
strb r0, [r6]
add r0, r4, #0
mov r1, #0x4a
add r2, r7, #0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
b _021ECAEE
_021ECADA:
mov r1, #0x4b
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
strb r0, [r6]
add r0, r4, #0
mov r1, #0x4b
add r2, r7, #0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_021ECAEE:
add r0, r5, #1
lsl r0, r0, #0x18
@@ -43965,13 +43965,13 @@ _021ECBC0:
ldr r0, [sp]
add r1, r6, #0
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
ldr r1, [sp, #0x20]
mov r2, #0
str r0, [r4, r1]
ldr r0, [sp, #4]
add r1, r6, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
ldr r1, [sp, #0x10]
str r0, [r1, #0x20]
add r0, r5, #1
@@ -44218,13 +44218,13 @@ _021ECDAE:
ldr r0, [sp]
mov r1, #6
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
lsl r0, r0, #0x10
lsr r4, r0, #0x10
ldr r0, [sp, #4]
mov r1, #6
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
lsl r0, r0, #0x10
lsr r2, r0, #0x10
mov r0, #6
@@ -44258,12 +44258,12 @@ MOD05_021ECDF4: ; 0x021ECDF4
ldr r0, [sp]
mov r1, #6
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r5, r0, #0
ldr r0, [sp, #4]
mov r1, #6
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r5, #0xec
beq _021ECE20
cmp r0, #0xec
@@ -44301,7 +44301,7 @@ _021ECE56:
ldr r0, [r7, r6]
mov r1, #5
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
lsl r1, r4, #1
add r2, sp, #0xc
strh r0, [r2, r1]
@@ -44424,16 +44424,16 @@ MOD05_021ECF14: ; 0x021ECF14
add r0, r5, #0
mov r1, #0x9a
add r2, sp, #0x14
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #0
mov r1, #9
add r2, sp, #0x10
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, sp, #0x10
add r0, r5, #0
mov r1, #0x9b
add r2, #2
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, sp, #0x30
ldrb r0, [r0, #8]
cmp r0, #0
@@ -44441,7 +44441,7 @@ MOD05_021ECF14: ; 0x021ECF14
add r0, r5, #0
mov r1, #0x97
add r2, sp, #0x38
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_021ECF7E:
add r2, sp, #0x10
mov r1, #1
@@ -44450,7 +44450,7 @@ _021ECF7E:
add r0, r5, #0
mov r1, #0x4c
add r2, #1
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, _021ED008 ; =0x000001EE
mov r1, #4
bl FUN_0200AA50
@@ -44458,7 +44458,7 @@ _021ECF7E:
add r0, r5, #0
mov r1, #0x76
add r2, r6, #0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r6, #0
bl FUN_02021A20
ldr r0, [sp, #0x40]
@@ -44477,15 +44477,15 @@ _021ECF7E:
add r0, r5, #0
mov r1, #0x90
add r2, r6, #0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #0
mov r1, #7
add r2, sp, #0x1c
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #0
mov r1, #0x9c
add r2, sp, #0x18
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r6, #0
bl FUN_02021A20
_021ECFEE:
@@ -44562,20 +44562,20 @@ _021ED05E:
add r0, r7, #0
mov r1, #0x9a
add r2, #2
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r7, #0
mov r1, #9
add r2, sp, #0x14
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, sp, #0x14
add r0, r7, #0
mov r1, #0x9b
add r2, #1
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r7, #0
mov r1, #0x70
add r2, sp, #0x30
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, _021ED0C8 ; =0x000001EE
mov r1, #4
bl FUN_0200AA50
@@ -44583,7 +44583,7 @@ _021ED05E:
add r0, r7, #0
mov r1, #0x76
add r2, r4, #0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r4, #0
bl FUN_02021A20
add sp, #0x18
@@ -44599,7 +44599,7 @@ MOD05_021ED0CC: ; 0x021ED0CC
mov r0, #4
str r1, [sp, #4]
add r7, r2, #0
- bl FUN_020669C0
+ bl AllocMonZeroed
add r1, sp, #0x10
add r4, r0, #0
add r0, r5, #0
@@ -44617,7 +44617,7 @@ MOD05_021ED0CC: ; 0x021ED0CC
bl MOD05_021EC458
mov r1, #0x70
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
lsl r0, r0, #0x18
lsr r0, r0, #0x18
str r0, [sp]
@@ -44664,7 +44664,7 @@ _021ED168:
add r0, r4, #0
mov r1, #0x4c
add r2, sp, #0x10
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [sp, #4]
add r1, r4, #0
bl FUN_0206B900
@@ -44765,18 +44765,18 @@ _021ED228:
ldr r0, [r5]
mov r1, #5
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
strh r0, [r4]
ldr r0, [r5]
mov r1, #7
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
ldr r1, [sp]
str r0, [r1]
mov r1, #0
ldr r0, [r5]
add r2, r1, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r1, r0, #0
ldrh r0, [r4]
bl FUN_02068A20
@@ -44956,7 +44956,7 @@ _021ED38E:
ldr r0, [r5]
mov r1, #0xab
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0
beq _021ED3AC
ldr r0, [sp]
@@ -45055,7 +45055,7 @@ _021ED472:
add r0, r4, #0
mov r1, #9
add r2, sp, #0x10
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
b _021ED484
_021ED47E:
add sp, #0x14
@@ -45120,7 +45120,7 @@ MOD05_021ED4E0: ; 0x021ED4E0
ldr r0, [sp]
mov r1, #5
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0
beq _021ED50E
ldr r2, [sp]
@@ -45135,7 +45135,7 @@ _021ED50E:
ldr r0, [sp, #4]
mov r1, #5
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0
beq _021ED526
ldr r2, [sp, #4]
@@ -45186,7 +45186,7 @@ MOD05_021ED52C: ; 0x021ED52C
add r0, r5, #0
mov r1, #0x6f
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
lsl r0, r0, #0x18
lsr r4, r0, #0x18
cmp r4, #2
@@ -45194,7 +45194,7 @@ MOD05_021ED52C: ; 0x021ED52C
add r0, r5, #0
mov r1, #5
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
lsl r0, r0, #0x10
lsr r0, r0, #0x10
cmp r0, #0x1d
@@ -45205,7 +45205,7 @@ _021ED5A4:
add r0, r5, #0
mov r1, #0x4d
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0
bne _021ED5B4
mov r4, #2
@@ -45311,7 +45311,7 @@ MOD05_021ED650: ; 0x021ED650
bl FUN_020219F4
str r0, [sp, #0x10]
add r0, r5, #0
- bl FUN_020669C0
+ bl AllocMonZeroed
add r6, r0, #0
add r0, r4, #0
mov r1, #5
@@ -45460,13 +45460,13 @@ _021ED7A2:
add r0, r6, #0
add r1, #0x36
add r2, r7, r2
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r1, r5, #0
add r2, sp, #0x30
add r0, r6, #0
add r1, #0x3a
add r2, r2, r5
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #1
lsl r0, r0, #0x18
lsr r5, r0, #0x18
@@ -45480,7 +45480,7 @@ _021ED7CE:
add r0, r6, #0
add r1, #0x46
add r2, r7, r5
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #1
lsl r0, r0, #0x18
lsr r5, r0, #0x18
@@ -45490,16 +45490,16 @@ _021ED7CE:
add r0, r6, #0
mov r1, #0xc
add r2, #1
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r6, #0
mov r1, #0x79
add r2, sp, #0x20
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, sp, #0x1c
add r0, r6, #0
mov r1, #0xb
add r2, #3
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, sp, #0x1c
mov r1, #0x78
add r0, sp, #0x18
@@ -45507,34 +45507,34 @@ _021ED7CE:
add r0, r6, #0
mov r1, #9
add r2, #2
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, sp, #0x20
add r0, r6, #0
mov r1, #0x99
add r2, #2
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, sp, #0x1c
add r0, r6, #0
mov r1, #0x6e
add r2, #1
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r2, [sp, #0x10]
add r0, r6, #0
mov r1, #0x90
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, sp, #0x18
add r0, r6, #0
mov r1, #0x9c
add r2, #3
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r6, #0
mov r1, #7
add r2, sp, #0x2c
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r6, #0
mov r1, #0x70
add r2, sp, #0x1c
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r4, #0
mov r1, #0x97
mov r2, #0
@@ -45562,21 +45562,21 @@ _021ED7CE:
add r0, r6, #0
mov r1, #0x97
add r2, sp, #0x24
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, sp, #0x18
add r0, r6, #0
mov r1, #0x91
add r2, #2
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, sp, #0x18
add r0, r6, #0
mov r1, #0x92
add r2, #1
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r6, #0
mov r1, #0x93
add r2, sp, #0x18
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r4, #0
mov r1, #0x98
mov r2, #0
@@ -45604,21 +45604,21 @@ _021ED7CE:
add r0, r6, #0
mov r1, #0x98
add r2, sp, #0x24
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, sp, #0x18
add r0, r6, #0
mov r1, #0x94
add r2, #2
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, sp, #0x18
add r0, r6, #0
mov r1, #0x95
add r2, #1
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r6, #0
mov r1, #0x96
add r2, sp, #0x18
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r6, #0
add r1, r4, #0
bl FUN_02069B88
@@ -45649,7 +45649,7 @@ MOD05_021ED940: ; 0x021ED940
add r0, r4, #0
mov r1, #0x4c
add r2, #3
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r4, #0
mov r1, #5
add r2, r5, #0
@@ -45662,21 +45662,21 @@ MOD05_021ED940: ; 0x021ED940
add r0, r4, #0
mov r1, #0x74
add r2, sp, #4
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, sp, #0
add r0, r4, #0
mov r1, #0x4d
add r2, #2
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, sp, #0
add r0, r4, #0
mov r1, #0x9a
add r2, #1
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r4, #0
mov r1, #0x9b
add r2, sp, #0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r4, #0
bl FUN_02066ED8
add sp, #0x1c
diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s
index 529aeb97..79604bc0 100644
--- a/arm9/modules/06/asm/module_06.s
+++ b/arm9/modules/06/asm/module_06.s
@@ -6555,7 +6555,7 @@ MOD06_0223C854: ; 0x0223C854
mov r0, #0xb
str r2, [sp, #0x18]
add r5, r3, #0
- bl FUN_020669C0
+ bl AllocMonZeroed
str r0, [sp, #0x1c]
bl ZeroMonData
ldrb r0, [r6, #0xd]
@@ -6607,7 +6607,7 @@ _0223C8D2:
cmp r4, #0
bne _0223C8E0
ldr r0, [sp, #0x44]
- bl FUN_02068854
+ bl GetMonNatureEncrypted
str r0, [sp, #0x20]
mov r7, #1
_0223C8E0:
@@ -6684,7 +6684,7 @@ MOD06_0223C968: ; 0x0223C968
str r1, [sp, #0xc]
str r2, [sp, #0x10]
add r5, r3, #0
- bl FUN_020669C0
+ bl AllocMonZeroed
add r4, r0, #0
bl ZeroMonData
add r0, r7, #0
@@ -6752,7 +6752,7 @@ _0223C9E4:
add r0, r4, #0
mov r1, #7
add r2, r5, #0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [sp, #0x10]
ldr r3, [sp, #0x2c]
add r1, r5, #0
@@ -6779,7 +6779,7 @@ _0223CA28:
add r0, r4, #0
mov r1, #7
add r2, r5, #0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [sp, #0x10]
ldr r3, [sp, #0x2c]
add r1, r5, #0
@@ -7586,7 +7586,7 @@ MOD06_0223D044: ; 0x0223D044
add r5, r1, #0
mov r0, #4
add r6, r2, #0
- bl FUN_020669C0
+ bl AllocMonZeroed
add r4, r0, #0
add r0, r5, #0
mov r1, #4
@@ -7626,15 +7626,15 @@ MOD06_0223D044: ; 0x0223D044
add r0, r4, #0
mov r1, #7
add r2, sp, #0x30
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r4, #0
mov r1, #0x9f
add r2, sp, #0x14
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r4, #0
mov r1, #0xa2
add r2, sp, #0x10
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [r6, #8]
add r1, r4, #0
bl FUN_0206B900
@@ -7839,7 +7839,7 @@ _0223D24E:
add r0, r6, #0
mov r1, #0x70
add r2, sp, #8
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_0223D25C:
ldr r0, [sp]
add r1, r6, #0
@@ -21463,7 +21463,7 @@ _02243FFA:
ldr r0, [sp, #4]
add r1, r6, #0
add r2, sp, #8
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r7, #1
lsl r0, r0, #0x18
lsr r7, r0, #0x18
@@ -21919,11 +21919,11 @@ MOD06_02244388: ; 0x02244388
strb r1, [r0, #1]
add r0, r5, #0
mov r1, #0x70
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #0
mov r1, #6
add r2, r6, #2
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r4, #0
str r6, [sp, #4]
add r7, r4, #0
@@ -21937,7 +21937,7 @@ _022443D4:
add r1, r4, #0
add r0, r5, #0
add r1, #0x36
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldrb r0, [r6, #0x1e]
add r2, sp, #8
add r2, #1
@@ -21950,7 +21950,7 @@ _022443D4:
add r1, r4, #0
add r0, r5, #0
add r1, #0x3e
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r1, r4, #0
add r0, r5, #0
add r1, #0x42
@@ -21962,7 +21962,7 @@ _022443D4:
add r0, r5, #0
add r1, #0x3a
add r2, sp, #8
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [sp, #4]
add r4, r4, #1
add r0, r0, #2
@@ -21975,7 +21975,7 @@ _022443D4:
str r0, [sp, #0xc]
add r0, r5, #0
add r2, sp, #0xc
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, sp, #8
ldrb r1, [r6, #0x18]
add r0, sp, #8
@@ -21983,7 +21983,7 @@ _022443D4:
strb r1, [r0, #1]
add r0, r5, #0
mov r1, #0xd
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, sp, #8
ldrb r1, [r6, #0x19]
add r0, sp, #8
@@ -21991,7 +21991,7 @@ _022443D4:
strb r1, [r0, #1]
add r0, r5, #0
mov r1, #0xe
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, sp, #8
ldrb r1, [r6, #0x1a]
add r0, sp, #8
@@ -21999,7 +21999,7 @@ _022443D4:
strb r1, [r0, #1]
add r0, r5, #0
mov r1, #0xf
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, sp, #8
ldrb r1, [r6, #0x1b]
add r0, sp, #8
@@ -22007,7 +22007,7 @@ _022443D4:
strb r1, [r0, #1]
add r0, r5, #0
mov r1, #0x10
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, sp, #8
ldrb r1, [r6, #0x1c]
add r0, sp, #8
@@ -22015,7 +22015,7 @@ _022443D4:
strb r1, [r0, #1]
add r0, r5, #0
mov r1, #0x11
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, sp, #8
ldrb r1, [r6, #0x1d]
add r0, sp, #8
@@ -22023,17 +22023,17 @@ _022443D4:
strb r1, [r0, #1]
add r0, r5, #0
mov r1, #0x12
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, r6, #0
add r0, r5, #0
mov r1, #0xa
add r2, #0x20
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, r6, #0
add r0, r5, #0
mov r1, #9
add r2, #0x21
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [r6, #0x14]
lsl r0, r0, #1
lsr r0, r0, #0x1f
@@ -22052,7 +22052,7 @@ _022443D4:
add r0, r5, #0
mov r1, #0x76
add r2, r7, #0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r7, #0
bl FUN_02021A20
add r0, r4, #0
@@ -22063,13 +22063,13 @@ _022444FC:
add r0, r5, #0
mov r1, #0x74
add r2, #0x22
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_02244508:
add r6, #0x1f
add r0, r5, #0
mov r1, #0xc
add r2, r6, #0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #0
bl FUN_02066ED8
add sp, #0x10
@@ -22137,7 +22137,7 @@ MOD06_02244558: ; 0x02244558
add r0, r0, #4
str r1, [r7, r0]
ldr r0, [r5, #4]
- bl FUN_020669C0
+ bl AllocMonZeroed
add r4, r0, #0
ldrb r1, [r5, #0xe]
ldr r0, [r7, #4]
@@ -22170,7 +22170,7 @@ _022445A6:
add r0, r4, #0
mov r1, #8
add r2, sp, #8
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r4, #0
bl FUN_02066ED8
_022445E8:
@@ -23177,7 +23177,7 @@ MOD06_02244D04: ; 0x02244D04
add r0, #0x5a
strh r1, [r0]
ldr r0, [sp, #0x20]
- bl FUN_020669C0
+ bl AllocMonZeroed
add r4, r0, #0
ldr r0, [sp]
mov r6, #0
@@ -30932,7 +30932,7 @@ _0224886C:
str r5, [r4, #0x10]
str r6, [r4, #0xc]
add r0, r5, #0
- bl FUN_020669C0
+ bl AllocMonZeroed
str r0, [r4, #4]
add r0, r5, #0
bl FUN_02023928
@@ -31114,7 +31114,7 @@ MOD06_022489D4: ; 0x022489D4
add r0, r5, #0
mov r1, #0x76
add r2, r7, #0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r7, #0
bl FUN_02021A20
mov r1, #1
@@ -31123,66 +31123,66 @@ MOD06_022489D4: ; 0x022489D4
add r0, r5, #0
mov r1, #0x4d
add r2, sp, #0x10
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #0
mov r1, #0x46
add r2, r4, #4
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, r4, #0
add r0, r5, #0
mov r1, #0x47
add r2, #8
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, r4, #0
add r0, r5, #0
mov r1, #0x48
add r2, #0xc
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, r4, #0
add r0, r5, #0
mov r1, #0x49
add r2, #0x10
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, r4, #0
add r0, r5, #0
mov r1, #0x4a
add r2, #0x14
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, r4, #0
add r0, r5, #0
mov r1, #0x4b
add r2, #0x18
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, r4, #0
add r0, r5, #0
mov r1, #0x13
add r2, #0x24
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, r4, #0
add r0, r5, #0
mov r1, #0x14
add r2, #0x28
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, r4, #0
add r0, r5, #0
mov r1, #0x15
add r2, #0x2c
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, r4, #0
add r0, r5, #0
mov r1, #0x16
add r2, #0x30
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, r4, #0
add r0, r5, #0
mov r1, #0x17
add r2, #0x34
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, r4, #0
add r0, r5, #0
mov r1, #6
add r2, #0x3c
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [sp, #0x28]
add r1, r6, #4
bl MOD06_022489AC
@@ -31190,19 +31190,19 @@ MOD06_022489D4: ; 0x022489D4
add r0, r5, #0
mov r1, #0x90
add r2, r6, #0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r6, #0
bl FUN_02021A20
add r2, r4, #0
add r0, r5, #0
mov r1, #0x9c
add r2, #0x40
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r4, #0x48
add r0, r5, #0
mov r1, #0xc
add r2, r4, #0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [sp, #0x2c]
bl FUN_02034824
add r3, r0, #0
diff --git a/arm9/modules/11/asm/module_11.s b/arm9/modules/11/asm/module_11.s
index 55c064d7..03c7c62e 100644
--- a/arm9/modules/11/asm/module_11.s
+++ b/arm9/modules/11/asm/module_11.s
@@ -2898,7 +2898,7 @@ _0222EE8C:
add r1, r7, #0
lsl r2, r2, #0x10
lsr r2, r2, #0x10
- bl FUN_020688E8
+ bl MonApplyFriendshipModEncrypted
ldr r0, [r4, #0x68]
add r5, r5, #1
bl FUN_0206B9AC
@@ -2920,7 +2920,7 @@ _0222EEBC:
add r1, r7, #0
lsl r2, r2, #0x10
lsr r2, r2, #0x10
- bl FUN_020688E8
+ bl MonApplyFriendshipModEncrypted
ldr r0, [r4, #0x70]
add r5, r5, #1
bl FUN_0206B9AC
@@ -5714,7 +5714,7 @@ _022303E4:
ldr r0, [sp, #0x18]
mov r1, #0x9f
add r2, sp, #0x20
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [sp, #0x10]
cmp r0, r5
beq _02230434
@@ -5776,7 +5776,7 @@ _02230478:
str r0, [sp, #0x20]
ldr r0, [sp, #0x18]
mov r1, #0x9f
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [sp, #0x10]
cmp r0, r5
beq _022304B8
@@ -5824,7 +5824,7 @@ _022304DC:
ldr r0, [sp, #0x18]
mov r1, #0x9f
add r2, sp, #0x20
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [sp, #0x10]
cmp r0, r5
beq _0223051C
@@ -5872,7 +5872,7 @@ _02230540:
ldr r0, [sp, #0x18]
mov r1, #0x9f
add r2, sp, #0x20
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [sp, #0x10]
cmp r0, r5
beq _02230580
@@ -5920,7 +5920,7 @@ _022305A4:
ldr r0, [sp, #0x18]
mov r1, #0x9f
add r2, sp, #0x20
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [sp, #0x10]
cmp r0, r5
beq _022305E4
@@ -6313,7 +6313,7 @@ _022308C4:
ldr r0, [sp, #0x18]
ldr r2, [sp, #0x20]
add r1, #0x3a
- bl FUN_02068018
+ bl AddMonPartyStatEncrypted
ldr r0, [sp, #0x10]
cmp r0, r5
beq _0223091C
@@ -6384,7 +6384,7 @@ _0223097E:
ldr r0, [sp, #0x18]
ldr r2, [sp, #0x20]
add r1, #0x3a
- bl FUN_02068018
+ bl AddMonPartyStatEncrypted
ldr r0, [sp, #0x10]
cmp r0, r5
beq _022309B4
@@ -6524,7 +6524,7 @@ _02230AC2:
ldr r0, [sp, #0x18]
ldr r2, [sp, #0x20]
mov r1, #0xa2
- bl FUN_02068018
+ bl AddMonPartyStatEncrypted
ldr r0, [sp, #0x38]
mov r1, #0x17
lsl r0, r0, #0x10
@@ -6692,7 +6692,7 @@ _02230C28:
ldr r0, [sp, #0x18]
ldr r2, [sp, #8]
mov r1, #9
- bl FUN_02068018
+ bl AddMonPartyStatEncrypted
ldr r0, [sp, #0x10]
cmp r0, r5
beq _02230C3E
@@ -7152,7 +7152,7 @@ _02230F4E:
add r0, r6, #0
mov r1, #0x70
add r2, sp, #0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_02230F58:
add r0, r5, #0
mov r1, #0
@@ -23939,7 +23939,7 @@ _022392AA:
add r0, r4, #0
mov r1, #6
add r2, r5, r2
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
b _022392EC
_022392C4:
cmp r5, #0x62
@@ -23954,7 +23954,7 @@ _022392C4:
add r0, r4, #0
mov r1, #6
add r2, r2, r3
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
b _022392EC
_022392E2:
add r1, r1, #1
@@ -24010,7 +24010,7 @@ _0223932E:
add r0, r4, #0
mov r1, #6
add r2, sp, #0xc
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_02239350:
ldr r0, [sp]
mov r1, #0
@@ -26914,7 +26914,7 @@ _0223AA0C:
add r0, r6, #0
mov r1, #8
add r2, sp, #0x48
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r6, [r4, #4]
ldr r0, [r4]
add r1, r7, #0
@@ -27099,9 +27099,9 @@ _0223AB58:
add r0, r6, #0
mov r1, #0
lsr r2, r2, #0x10
- bl FUN_020688E8
+ bl MonApplyFriendshipModEncrypted
add r0, r6, #0
- bl FUN_02066F04
+ bl CalcMonStatsMaybeEncrypted
ldr r1, [r4, #4]
ldr r0, _0223ABB0 ; =0x0000219C
b _0223ABBC
@@ -27897,7 +27897,7 @@ _0223B1F6:
add r0, r6, #0
add r1, #0x3e
add r2, sp, #0x4c
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r1, [r4, #0x40]
ldr r2, [r4, #0x44]
lsl r1, r1, #0x10
@@ -28183,7 +28183,7 @@ _0223B45A:
str r0, [sp, #0x18]
ldr r0, [sp, #0x14]
add r1, #0xd
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [sp, #0x10]
add r0, r0, #1
str r0, [sp, #0x10]
@@ -29102,7 +29102,7 @@ _0223BC38:
bne _0223BC62
ldr r2, [r5, #0x18]
mov r1, #0x77
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_0223BC62:
add r0, r5, #0
bl FUN_02077AC4
@@ -29210,7 +29210,7 @@ _0223BD3E:
add r0, r6, #0
add r1, #0x3a
add r2, sp, #0x2c
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r5, r5, #1
cmp r5, #4
blt _0223BD3E
@@ -31697,7 +31697,7 @@ _0223D148:
add r0, r7, #0
mov r1, #8
lsr r2, r2, #0x10
- bl FUN_020688E8
+ bl MonApplyFriendshipModEncrypted
pop {r3, r4, r5, r6, r7, pc}
_0223D18E:
add r0, r5, #0
@@ -31707,7 +31707,7 @@ _0223D18E:
add r0, r7, #0
mov r1, #6
lsr r2, r2, #0x10
- bl FUN_020688E8
+ bl MonApplyFriendshipModEncrypted
pop {r3, r4, r5, r6, r7, pc}
_0223D1A4:
add r0, r5, #0
@@ -31717,7 +31717,7 @@ _0223D1A4:
add r0, r7, #0
mov r1, #6
lsr r2, r2, #0x10
- bl FUN_020688E8
+ bl MonApplyFriendshipModEncrypted
_0223D1B8:
pop {r3, r4, r5, r6, r7, pc}
nop
@@ -64908,13 +64908,13 @@ _0224CEE2:
add r0, r7, #0
add r1, #0x36
add r2, r5, #0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r2, [sp, #8]
add r1, r4, #0
add r0, r7, #0
add r1, #0x3a
add r2, r2, r4
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_0224CF0C:
add r4, r4, #1
add r5, r5, #2
@@ -64932,16 +64932,16 @@ _0224CF14:
add r0, r7, #0
mov r1, #6
add r2, #0xc
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_0224CF30:
add r0, r7, #0
mov r1, #0xa2
add r2, r6, #2
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r7, #0
mov r1, #0x9f
add r2, r6, #4
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r2, #0x65
ldr r1, [sp, #4]
lsl r2, r2, #2
@@ -65066,7 +65066,7 @@ _0224D038:
add r0, r6, #0
mov r1, #0x9f
add r2, sp, #8
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_0224D042:
ldr r0, [sp, #4]
add r5, r5, #1
@@ -75135,7 +75135,7 @@ _02252196:
str r0, [sp, #0x14]
_022521A4:
mov r0, #5
- bl FUN_020669C0
+ bl AllocMonZeroed
add r6, r0, #0
mov r5, #0
_022521AE:
diff --git a/arm9/modules/14/asm/module_14.s b/arm9/modules/14/asm/module_14.s
index c0d531a8..ca22b626 100644
--- a/arm9/modules/14/asm/module_14.s
+++ b/arm9/modules/14/asm/module_14.s
@@ -3868,7 +3868,7 @@ _021D9488:
bl FUN_0206B5E4
mov r1, #0xab
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0
beq _021D94AE
mov r0, #0
@@ -4713,7 +4713,7 @@ _021D9B9E:
add r1, r6, #0
bl FUN_0206B9B0
add r4, r0, #0
- bl FUN_020669D4
+ bl TryDecryptMon
add r7, r0, #0
add r0, r4, #0
mov r1, #0xac
@@ -4731,7 +4731,7 @@ _021D9B9E:
_021D9BD2:
add r0, r4, #0
add r1, r7, #0
- bl FUN_02066A20
+ bl TryEncryptMon
cmp r5, #2
blt _021D9BE4
add sp, #8
@@ -5301,7 +5301,7 @@ _021DA042:
mov r1, #0xab
mov r2, #0
add r7, r0, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0
beq _021DA080
ldr r4, _021DA164 ; =0x021E6224
@@ -5455,12 +5455,12 @@ MOD14_021DA168: ; 0x021DA168
mov r1, #0
add r5, r0, #0
str r1, [sp, #4]
- bl FUN_02066A6C
+ bl TryDecryptBoxMon
str r0, [sp]
add r0, r5, #0
mov r1, #0xac
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0
bne _021DA1A8
mov r4, #0
@@ -5470,7 +5470,7 @@ _021DA18C:
add r0, r5, #0
add r1, #0x36
add r2, r7, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r6, r0
bne _021DA1A2
mov r0, #1
@@ -5483,7 +5483,7 @@ _021DA1A2:
_021DA1A8:
ldr r1, [sp]
add r0, r5, #0
- bl FUN_02066A94
+ bl TryEncryptBoxMon
ldr r0, [sp, #4]
add sp, #8
pop {r3, r4, r5, r6, r7, pc}
@@ -7576,7 +7576,7 @@ MOD14_021DB220: ; 0x021DB220
mov r1, #0x67
lsl r1, r1, #2
str r0, [r5, r1]
- bl FUN_020669BC
+ bl SizeOfStructPokemon
add r1, r0, #0
mov r0, #9
bl AllocFromHeap
@@ -8518,7 +8518,7 @@ _021DB998:
beq _021DB9C4
mov r1, #0xab
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0
beq _021DB9C4
mov r0, #1
@@ -8739,7 +8739,7 @@ _021DBB36:
mov r1, #0xab
mov r2, #0
str r0, [sp, #0x20]
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0
beq _021DBB86
ldr r0, [sp, #0x20]
@@ -9122,7 +9122,7 @@ MOD14_021DBE34: ; 0x021DBE34
push {r4, lr}
add r4, r0, #0
ldr r0, [r4, #0x14]
- bl FUN_020669A0
+ bl WipeBoxMonDataAndEncrypt
mov r0, #1
strb r0, [r4, #0x13]
add r0, r4, #0
@@ -9189,18 +9189,18 @@ MOD14_021DBEAC: ; 0x021DBEAC
add r0, r5, #0
add r6, r2, #0
add r4, #0x4c
- bl FUN_02066A6C
+ bl TryDecryptBoxMon
str r0, [sp]
str r5, [r7, #0x4c]
add r0, r5, #0
mov r1, #5
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
strh r0, [r4, #4]
add r0, r5, #0
mov r1, #6
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
strh r0, [r4, #6]
mov r0, #0x47
lsl r0, r0, #2
@@ -9212,7 +9212,7 @@ MOD14_021DBEAC: ; 0x021DBEAC
add r0, r5, #0
mov r1, #0xac
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
strb r0, [r4, #0xf]
ldrh r0, [r4, #4]
mov r1, #9
@@ -9221,26 +9221,26 @@ MOD14_021DBEAC: ; 0x021DBEAC
add r0, r5, #0
mov r1, #8
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r2, r0, #0
ldrh r1, [r4, #4]
add r0, r7, #0
- bl CalcMonLevelInternal
+ bl CalcLevelBySpeciesAndExp_PreloadedPersonal
strb r0, [r4, #0xa]
add r0, r5, #0
mov r1, #0xb
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
strb r0, [r4, #0xb]
add r0, r5, #0
mov r1, #0xb0
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
strb r0, [r4, #0xc]
add r0, r5, #0
mov r1, #0xb1
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
strb r0, [r4, #0xd]
ldrb r0, [r4, #0xf]
cmp r0, #0
@@ -9248,13 +9248,13 @@ MOD14_021DBEAC: ; 0x021DBEAC
add r0, r5, #0
mov r1, #0xaf
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0
beq _021DBF68
mov r1, #0
add r0, r5, #0
add r2, r1, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r2, r0, #0
ldrh r1, [r4, #4]
add r0, r7, #0
@@ -9268,7 +9268,7 @@ _021DBF6C:
ldr r2, [r4, #0x14]
add r0, r5, #0
mov r1, #0x76
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
ldrb r0, [r4, #0xf]
cmp r0, #0
bne _021DBF8C
@@ -9302,7 +9302,7 @@ _021DBFAA:
bl FUN_0200A8E0
_021DBFB8:
add r0, r5, #0
- bl FUN_0206885C
+ bl GetBoxMonNatureEncrypted
add r1, r0, #0
mov r0, #0x65
lsl r0, r0, #2
@@ -9312,7 +9312,7 @@ _021DBFB8:
add r0, r5, #0
mov r1, #0xa
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r1, r0, #0
mov r0, #0x66
lsl r0, r0, #2
@@ -9323,7 +9323,7 @@ _021DBFB8:
bl FreeMonPersonal
ldr r1, [sp]
add r0, r5, #0
- bl FUN_02066A94
+ bl TryEncryptBoxMon
pop {r3, r4, r5, r6, r7, pc}
thumb_func_start MOD14_021DBFF4
@@ -9371,7 +9371,7 @@ _021DC034:
mov r0, #0x1a
lsl r0, r0, #4
ldr r0, [r5, r0]
- bl FUN_020669D4
+ bl TryDecryptMon
add r6, r0, #0
mov r0, #0x1a
lsl r0, r0, #4
@@ -9489,7 +9489,7 @@ _021DC034:
lsl r0, r0, #4
ldr r0, [r5, r0]
add r1, r6, #0
- bl FUN_02066A20
+ bl TryEncryptMon
add r0, r7, #0
add r0, #0xa4
ldrb r0, [r0]
@@ -9557,7 +9557,7 @@ MOD14_021DC1AC: ; 0x021DC1AC
ldr r0, [r4, #0x4c]
mov r1, #0xb
add r2, sp, #0
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r4, #0
bl MOD14_021DC3CC
cmp r0, #0
@@ -9623,12 +9623,12 @@ _021DC24A:
ldr r0, [r4]
mov r1, #6
add r2, sp, #0x1c
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
_021DC254:
ldr r0, [r4]
mov r1, #5
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
ldr r1, _021DC274 ; =0x000001ED
cmp r0, r1
bne _021DC26A
@@ -10215,7 +10215,7 @@ MOD14_021DC58C: ; 0x021DC58C
ldr r0, [r5, #0x4c]
add r1, r4, #0
add r2, r6, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
pop {r4, r5, r6, pc}
_021DC5B2:
ldrb r0, [r5, #0x1f]
@@ -10224,7 +10224,7 @@ _021DC5B2:
ldr r0, [r5, #0x4c]
add r1, r4, #0
add r2, r6, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
pop {r4, r5, r6, pc}
_021DC5C4:
ldr r0, [r5, #0x4c]
@@ -10245,7 +10245,7 @@ MOD14_021DC5D0: ; 0x021DC5D0
ldr r0, [r5, #0x4c]
add r1, r4, #0
add r2, r6, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
pop {r4, r5, r6, pc}
_021DC5EC:
ldr r0, [r5, #8]
@@ -14333,7 +14333,7 @@ _021DE5FE:
mov r1, #0xab
mov r2, #0
str r0, [sp, #0x34]
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0
beq _021DE64E
add r0, r4, #0
@@ -14434,7 +14434,7 @@ _021DE6D0:
mov r1, #5
mov r2, #0
add r7, r0, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0
beq _021DE70A
ldr r1, _021DE724 ; =0x00005814
@@ -14908,7 +14908,7 @@ _021DEA70:
mov r1, #0xab
mov r2, #0
str r0, [sp, #0x20]
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0
beq _021DEB02
ldrb r1, [r5, #2]
@@ -15025,7 +15025,7 @@ _021DEB5C:
mov r1, #5
mov r2, #0
str r0, [sp, #0x2c]
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0
beq _021DEBA0
add r0, r4, #0
@@ -18859,7 +18859,7 @@ MOD14_021E0940: ; 0x021E0940
str r2, [sp, #8]
str r3, [sp, #0xc]
ldr r4, [sp, #0x64]
- bl FUN_02066A6C
+ bl TryDecryptBoxMon
lsl r0, r0, #0x18
lsr r0, r0, #0x18
str r0, [sp, #0x10]
@@ -18877,21 +18877,21 @@ MOD14_021E0940: ; 0x021E0940
add r0, r6, #0
mov r1, #5
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
lsl r0, r0, #0x10
lsr r0, r0, #0x10
str r0, [sp, #0x18]
add r0, r6, #0
mov r1, #0x4c
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
lsl r0, r0, #0x18
lsr r0, r0, #0x18
str r0, [sp, #0x14]
add r0, r6, #0
mov r1, #0x70
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
lsl r0, r0, #0x18
lsr r7, r0, #0x18
add r0, r6, #0
@@ -18905,12 +18905,12 @@ MOD14_021E0940: ; 0x021E0940
add r0, r6, #0
mov r1, #6
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
strh r0, [r4, #0x30]
add r0, r6, #0
mov r1, #0xb
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
strh r0, [r4, #0x2e]
add r0, r4, #4
bl FUN_020B1A24
@@ -18971,7 +18971,7 @@ _021E0A36:
bl MOD14_021E0B54
ldr r1, [sp, #0x10]
add r0, r6, #0
- bl FUN_02066A94
+ bl TryEncryptBoxMon
add sp, #0x44
pop {r4, r5, r6, r7, pc}
.align 2, 0
@@ -18987,19 +18987,19 @@ MOD14_021E0A60: ; 0x021E0A60
str r2, [sp, #8]
add r7, r3, #0
ldr r4, [sp, #0x70]
- bl FUN_02066A6C
+ bl TryDecryptBoxMon
str r0, [sp, #0x14]
add r0, r6, #0
mov r1, #0x4c
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
lsl r0, r0, #0x18
lsr r0, r0, #0x18
str r0, [sp, #0x10]
add r0, r6, #0
mov r1, #0x70
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
lsl r0, r0, #0x18
lsr r0, r0, #0x18
str r0, [sp, #0xc]
@@ -19023,12 +19023,12 @@ MOD14_021E0A60: ; 0x021E0A60
add r0, r6, #0
mov r1, #6
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
strh r0, [r4, #0x30]
add r0, r6, #0
mov r1, #0xb
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
strh r0, [r4, #0x2e]
add r0, r4, #4
bl FUN_020B1A24
@@ -19079,7 +19079,7 @@ _021E0B28:
bl MOD14_021E0B54
ldr r1, [sp, #0x14]
add r0, r6, #0
- bl FUN_02066A94
+ bl TryEncryptBoxMon
add sp, #0x40
pop {r3, r4, r5, r6, r7, pc}
nop
@@ -21819,26 +21819,26 @@ _021E204A:
bl FUN_0206B5E4
add r4, r4, #1
add r5, r0, #0
- bl FUN_02066A6C
+ bl TryDecryptBoxMon
lsl r0, r0, #0x18
lsr r0, r0, #0x18
str r0, [sp, #0x1c]
add r0, r5, #0
mov r1, #5
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r7, r0, #0
beq _021E20C8
add r0, r5, #0
mov r1, #0x4c
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0
bne _021E209A
add r0, r5, #0
mov r1, #0x70
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
lsl r0, r0, #0x10
lsr r1, r0, #0x10
add r0, r7, #0
@@ -21876,7 +21876,7 @@ _021E20AA:
_021E20C8:
ldr r1, [sp, #0x1c]
add r0, r5, #0
- bl FUN_02066A94
+ bl TryEncryptBoxMon
ldr r0, [sp, #0x24]
add r6, r6, #2
add r0, r0, #1
diff --git a/arm9/modules/17/asm/module_17.s b/arm9/modules/17/asm/module_17.s
index ab858387..a50461a7 100644
--- a/arm9/modules/17/asm/module_17.s
+++ b/arm9/modules/17/asm/module_17.s
@@ -13208,7 +13208,7 @@ MOD17_021DD6DC: ; 0x021DD6DC
lsl r0, r0, #2
str r1, [r4, r0]
ldr r0, [r5, #0x68]
- bl FUN_020669C0
+ bl AllocMonZeroed
mov r1, #0x8a
lsl r1, r1, #2
str r0, [r4, r1]
@@ -13278,7 +13278,7 @@ MOD17_021DD778: ; 0x021DD778
lsl r0, r0, #2
str r1, [r4, r0]
ldr r0, [r5, #0x68]
- bl FUN_020669C0
+ bl AllocMonZeroed
mov r1, #0x8a
lsl r1, r1, #2
str r0, [r4, r1]
@@ -14501,7 +14501,7 @@ MOD17_021DE0F4: ; 0x021DE0F4
add r3, r6, #0
bl FUN_0200ABB4
mov r0, #0xd
- bl FUN_020669C0
+ bl AllocMonZeroed
add r6, r0, #0
ldr r0, [r5, #4]
add r1, r6, #0
diff --git a/arm9/modules/27/asm/module_27.s b/arm9/modules/27/asm/module_27.s
index 6cfd48bd..8b3921cf 100644
--- a/arm9/modules/27/asm/module_27.s
+++ b/arm9/modules/27/asm/module_27.s
@@ -305,7 +305,7 @@ _02254A62:
add r1, r6, #0
bl FUN_0206B9B0
add r4, r0, #0
- bl FUN_020669D4
+ bl TryDecryptMon
add r7, r0, #0
add r0, r4, #0
bl FUN_0206B688
@@ -354,7 +354,7 @@ _02254ABE:
strb r0, [r5, #0x13]
add r0, r4, #0
add r1, r7, #0
- bl FUN_02066A20
+ bl TryEncryptMon
ldr r0, [sp]
add r6, r6, #1
ldr r0, [r0]
diff --git a/arm9/modules/35/asm/module_35.s b/arm9/modules/35/asm/module_35.s
index 727fced8..5ed3fbc9 100644
--- a/arm9/modules/35/asm/module_35.s
+++ b/arm9/modules/35/asm/module_35.s
@@ -330,7 +330,7 @@ _02254A7A:
str r0, [sp, #8]
bl FUN_02023C7C
add r4, r0, #0
- bl FUN_02066A6C
+ bl TryDecryptBoxMon
str r0, [sp, #0xc]
add r0, r4, #0
bl FUN_0206B688
@@ -338,12 +338,12 @@ _02254A7A:
add r0, r4, #0
mov r1, #5
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
strh r0, [r6, #0x1c]
add r0, r4, #0
mov r1, #0x70
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
strh r0, [r6, #0x20]
ldr r0, [sp, #8]
bl MOD05_021EC7B4
@@ -353,7 +353,7 @@ _02254A7A:
str r0, [r5, #0x14]
ldr r1, [sp, #0xc]
add r0, r4, #0
- bl FUN_02066A94
+ bl TryEncryptBoxMon
ldr r0, [sp]
add r7, r7, #1
ldrb r0, [r0]
diff --git a/arm9/modules/62/asm/module_62.s b/arm9/modules/62/asm/module_62.s
index 33be95e4..795c5fee 100644
--- a/arm9/modules/62/asm/module_62.s
+++ b/arm9/modules/62/asm/module_62.s
@@ -3004,7 +3004,7 @@ MOD62_0222EC54: ; 0x0222EC54
ldr r0, [r0, #4]
mov r1, #0xa1
add r2, sp, #0xc
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_0222EC80:
cmp r7, #0xff
beq _0222EC9A
@@ -3017,7 +3017,7 @@ _0222EC80:
add r0, r1, r0
ldr r0, [r0, #4]
mov r1, #0xa1
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_0222EC9A:
add r2, r5, #4
ldr r1, [r2, r6]
@@ -5753,7 +5753,7 @@ MOD62_0223021C: ; 0x0223021C
add r4, r0, #0
ldr r0, _02230268 ; =0x00000428
ldr r0, [r5, r0]
- bl FUN_02068854
+ bl GetMonNatureEncrypted
add r6, r0, #0
mov r0, #0x6a
lsl r0, r0, #2
@@ -6235,12 +6235,12 @@ _022305E2:
mov r1, #0xa1
ldr r0, [r4, r0]
add r2, sp, #0x18
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, _02230724 ; =0x00000428
mov r1, #0xaa
ldr r0, [r4, r0]
add r2, sp, #0x64
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r0, #0x35
add r1, sp, #0x58
bl MOD08_02228218
@@ -6531,7 +6531,7 @@ _02230860:
add r2, r0, #0
add r0, r5, #0
mov r1, #0xaa
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_022308A8:
mov r0, #0xf5
mov r1, #8
@@ -7091,7 +7091,7 @@ MOD62_02230D38: ; 0x02230D38
ldr r0, [r0, #4]
mov r1, #0xa1
add r2, sp, #0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_02230D5C:
mov r0, #0xff
str r0, [r4, r6]
diff --git a/arm9/modules/65/asm/module_65.s b/arm9/modules/65/asm/module_65.s
index 22b307e2..d35c73a5 100644
--- a/arm9/modules/65/asm/module_65.s
+++ b/arm9/modules/65/asm/module_65.s
@@ -3382,7 +3382,7 @@ MOD65_021D8F34: ; 0x021D8F34
strb r0, [r1]
ldr r0, [r4, #0x10]
ldr r0, [r0]
- bl FUN_02068854
+ bl GetMonNatureEncrypted
add r1, r4, #0
add r1, #0x36
strb r0, [r1]
diff --git a/arm9/modules/67/asm/module_67.s b/arm9/modules/67/asm/module_67.s
index 02c76f3d..a6e3fe59 100644
--- a/arm9/modules/67/asm/module_67.s
+++ b/arm9/modules/67/asm/module_67.s
@@ -3298,7 +3298,7 @@ MOD67_021D8F00: ; 0x021D8F00
str r3, [sp, #0xc]
mov r0, #0x2a
add r7, r1, #0
- bl FUN_020669C0
+ bl AllocMonZeroed
str r4, [sp]
mov r1, #0
str r1, [sp, #4]
diff --git a/arm9/modules/69/asm/module_69.s b/arm9/modules/69/asm/module_69.s
index f12e6191..a1a1e685 100644
--- a/arm9/modules/69/asm/module_69.s
+++ b/arm9/modules/69/asm/module_69.s
@@ -2360,7 +2360,7 @@ MOD69_0222E8FC: ; 0x0222E8FC
mov r1, #0
bl FUN_0200AC60
ldr r0, [r4, #0x24]
- bl FUN_020687C0
+ bl CalcMonLevelEncrypted
add r2, r0, #0
mov r0, #0
str r0, [sp]
@@ -4037,7 +4037,7 @@ MOD69_0222F6C4: ; 0x0222F6C4
add r5, r0, #0
add r0, r4, #0
add r6, r2, #0
- bl FUN_020669D4
+ bl TryDecryptMon
str r0, [sp]
add r0, r4, #0
mov r1, #0x79
@@ -4124,7 +4124,7 @@ _0222F778:
_0222F77A:
ldr r1, [sp]
add r0, r4, #0
- bl FUN_02066A20
+ bl TryEncryptMon
add r0, r5, #0
pop {r3, r4, r5, r6, r7, pc}
nop
diff --git a/arm9/modules/70/asm/module_70.s b/arm9/modules/70/asm/module_70.s
index 8138a765..5c0a4426 100644
--- a/arm9/modules/70/asm/module_70.s
+++ b/arm9/modules/70/asm/module_70.s
@@ -469,7 +469,7 @@ MOD70_021D77CC: ; 0x021D77CC
lsl r1, r1, #2
str r0, [r4, r1]
mov r0, #0x3d
- bl FUN_020669C0
+ bl AllocMonZeroed
mov r1, #0x66
lsl r1, r1, #2
str r0, [r4, r1]
@@ -1562,7 +1562,7 @@ _021D80F4:
ldr r0, [r7, r0]
ldr r2, [sp, #0x1c]
mov r1, #0x70
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r1, #0x66
lsl r1, r1, #2
ldr r1, [r7, r1]
diff --git a/arm9/modules/71/asm/module_71.s b/arm9/modules/71/asm/module_71.s
index aea60f8b..17e9259d 100644
--- a/arm9/modules/71/asm/module_71.s
+++ b/arm9/modules/71/asm/module_71.s
@@ -1343,7 +1343,7 @@ MOD71_0222E118: ; 0x0222E118
push {r3, r4, r5, r6, r7, lr}
add r5, r0, #0
add r4, r1, #0
- bl FUN_020669D4
+ bl TryDecryptMon
add r7, r0, #0
add r0, r5, #0
mov r1, #0x9a
@@ -1382,7 +1382,7 @@ MOD71_0222E118: ; 0x0222E118
add r6, r0, #0
add r0, r5, #0
add r1, r7, #0
- bl FUN_02066A20
+ bl TryEncryptMon
ldrh r0, [r4]
cmp r0, #0
beq _0222E18E
@@ -6320,10 +6320,10 @@ MOD71_022309E8: ; 0x022309E8
add r6, r2, #0
str r3, [sp, #0xc]
ldr r5, [sp, #0x28]
- bl FUN_020669C0
+ bl AllocMonZeroed
add r7, r0, #0
mov r0, #0x1a
- bl FUN_020669C0
+ bl AllocMonZeroed
add r4, r0, #0
ldr r0, [sp, #4]
add r1, r6, #0
@@ -6347,7 +6347,7 @@ MOD71_022309E8: ; 0x022309E8
add r0, r4, #0
mov r1, #9
add r2, sp, #0x10
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_02230A40:
bl FUN_02031190
bl FUN_0202DFA4
diff --git a/arm9/modules/76/asm/module_76.s b/arm9/modules/76/asm/module_76.s
index ba2092da..6a72146c 100644
--- a/arm9/modules/76/asm/module_76.s
+++ b/arm9/modules/76/asm/module_76.s
@@ -801,7 +801,7 @@ MOD76_021D7B2C: ; 0x021D7B2C
ldr r0, [r1]
ldrb r1, [r1, #0x17]
add r1, #0x36
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r0, #0
str r0, [sp]
ldr r1, [r4]
@@ -809,7 +809,7 @@ MOD76_021D7B2C: ; 0x021D7B2C
ldr r0, [r1]
ldrb r1, [r1, #0x17]
add r1, #0x3e
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r4, #0
bl MOD76_021D8514
mov r1, #0
@@ -820,7 +820,7 @@ MOD76_021D7B2C: ; 0x021D7B2C
ldr r0, [r1]
ldrb r1, [r1, #0x17]
add r1, #0x3a
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [r4]
mov r1, #0
strb r1, [r0, #0x16]
diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s
index ba3c09fe..afd040d2 100644
--- a/arm9/modules/80/asm/module_80.s
+++ b/arm9/modules/80/asm/module_80.s
@@ -4855,7 +4855,7 @@ MOD80_0222FBC0: ; 0x0222FBC0
ldr r0, [sp, #0x48]
ldr r2, [sp, #0x1c]
mov r1, #0x76
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
mov r2, #0
ldrsh r0, [r4, r2]
mov r1, #6
@@ -4866,7 +4866,7 @@ MOD80_0222FBC0: ; 0x0222FBC0
mov r0, #3
ldrsb r4, [r4, r0]
ldr r0, [sp, #0x48]
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
str r0, [sp, #0x30]
add r0, r5, #0
mov r1, #0x46
@@ -10777,7 +10777,7 @@ MOD80_02232BD4: ; 0x02232BD4
MOD80_02232C2C: ; 0x02232C2C
push {r4, lr}
add r4, r1, #0
- bl FUN_020687C8
+ bl CalcBoxMonLevelEncrypted
strb r0, [r4, #3]
pop {r4, pc}
thumb_func_end MOD80_02232C2C
@@ -10832,38 +10832,38 @@ MOD80_02232C88: ; 0x02232C88
add r7, r2, #0
add r6, r3, #0
ldr r4, [sp, #0x40]
- bl FUN_02066A6C
+ bl TryDecryptBoxMon
add r0, r5, #0
mov r1, #0xab
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
str r0, [sp, #0x1c]
add r0, r5, #0
mov r1, #5
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
strh r0, [r6]
add r0, r5, #0
mov r1, #0x70
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
str r0, [sp, #0x10]
add r0, r5, #0
mov r1, #0x4c
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
str r0, [sp, #0x14]
add r0, r5, #0
mov r1, #6
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
str r0, [sp, #0x18]
ldrh r0, [r6]
mov r1, #0x6f
mov r2, #0
strh r0, [r4]
add r0, r5, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r0, r0, #1
strb r0, [r4, #2]
ldr r0, [sp, #0x14]
@@ -10874,7 +10874,7 @@ MOD80_02232C88: ; 0x02232C88
_02232CF2:
add r0, r5, #0
mov r1, #1
- bl FUN_02066A94
+ bl TryEncryptBoxMon
ldr r0, [sp, #0x1c]
cmp r0, #0
beq _02232D60
@@ -11266,7 +11266,7 @@ MOD80_02233018: ; 0x02233018
push {r3, r4, r5, r6, r7, lr}
add r7, r0, #0
mov r4, #0
- bl FUN_02066A6C
+ bl TryDecryptBoxMon
ldr r5, _02233050 ; =0x02237220
str r0, [sp]
add r6, r4, #0
@@ -11274,7 +11274,7 @@ _02233028:
ldrh r1, [r5]
add r0, r7, #0
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r6, r6, #1
add r4, r4, r0
add r5, r5, #2
@@ -11282,7 +11282,7 @@ _02233028:
blt _02233028
ldr r1, [sp]
add r0, r7, #0
- bl FUN_02066A94
+ bl TryEncryptBoxMon
cmp r4, #0
beq _0223304C
mov r0, #1
@@ -11305,7 +11305,7 @@ MOD80_02233054: ; 0x02233054
_02233062:
mov r1, #0xab
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0
bne _02233072
mov r0, #0
@@ -11314,7 +11314,7 @@ _02233072:
add r0, r4, #0
mov r1, #0xac
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0
beq _02233084
mov r0, #2
@@ -11386,18 +11386,18 @@ MOD80_022330E4: ; 0x022330E4
mov r1, #5
mov r2, #0
add r5, r0, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r1, sp, #0
strh r0, [r1]
add r0, r5, #0
mov r1, #0x6f
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r1, r0, #1
add r0, sp, #0
strb r1, [r0, #2]
add r0, r5, #0
- bl FUN_020687C8
+ bl CalcBoxMonLevelEncrypted
add r1, sp, #0
strb r0, [r1, #3]
add r0, sp, #0
@@ -11418,7 +11418,7 @@ MOD80_0223311C: ; 0x0223311C
ldr r0, [r0]
mov r1, #5
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r1, sp, #0
strh r0, [r1, #6]
add r0, r5, #0
@@ -11426,14 +11426,14 @@ MOD80_0223311C: ; 0x0223311C
ldr r0, [r0]
mov r1, #0x6f
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r1, r0, #1
add r0, sp, #0
strb r1, [r0, #8]
add r0, r5, #0
add r0, #0xbc
ldr r0, [r0]
- bl FUN_020687C8
+ bl CalcBoxMonLevelEncrypted
add r1, sp, #0
strb r0, [r1, #9]
add r0, r4, #0
@@ -11459,13 +11459,13 @@ MOD80_0223311C: ; 0x0223311C
mov r1, #5
mov r2, #0
add r5, r0, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r1, sp, #0
strh r0, [r1]
add r0, r5, #0
mov r1, #0x6f
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r0, r0, #1
add r1, sp, #0
strb r0, [r1, #2]
@@ -13374,14 +13374,14 @@ MOD80_022340DC: ; 0x022340DC
ldr r0, [sp, #0xc]
ldr r2, [sp, #0x18]
mov r1, #0x76
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
ldr r0, [sp, #0xc]
mov r1, #0x6f
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r6, r0, #1
ldr r0, [sp, #0xc]
- bl FUN_020687C8
+ bl CalcBoxMonLevelEncrypted
str r0, [sp, #0x10]
add r0, r4, #0
mov r1, #0x64
@@ -13467,7 +13467,7 @@ _022341CA:
ldr r0, [sp, #0xc]
mov r1, #5
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
strh r0, [r7]
ldr r0, [sp, #0x10]
strb r6, [r7, #2]
@@ -13570,7 +13570,7 @@ MOD80_02234288: ; 0x02234288
bl MOD80_02232FAC
cmp r0, #0
beq _022342B0
- bl FUN_020669BC
+ bl SizeOfStructPokemon
add r2, r0, #0
add r0, r4, #0
add r0, #0xbc
@@ -15243,7 +15243,7 @@ _02234F38:
cmp r0, #0
beq _02234F9C
mov r0, #0x3e
- bl FUN_020669C0
+ bl AllocMonZeroed
add r5, r0, #0
ldr r0, [r4]
add r1, r5, #0
@@ -15289,7 +15289,7 @@ _02234FA4:
cmp r0, #0
beq _02235006
mov r0, #0x3e
- bl FUN_020669C0
+ bl AllocMonZeroed
add r5, r0, #0
ldr r0, [r4]
add r1, r5, #0
@@ -16064,7 +16064,7 @@ MOD80_02235534: ; 0x02235534
cmp r0, #0x12
beq _02235590
mov r0, #0x3e
- bl FUN_020669C0
+ bl AllocMonZeroed
add r1, r5, #0
add r2, r5, #0
add r4, r0, #0
@@ -16175,7 +16175,7 @@ _02235624:
add r0, r4, #0
mov r1, #9
add r2, sp, #0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [r5]
ldr r0, [r0]
bl MOD80_02235754
@@ -16258,7 +16258,7 @@ _022356D2:
add r0, r4, #0
mov r1, #9
add r2, sp, #0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [sp, #0x20]
cmp r0, #0x12
bne _02235706
@@ -17194,7 +17194,7 @@ MOD80_02235E08: ; 0x02235E08
push {r4, lr}
add r4, r0, #0
mov r0, #0x3e
- bl FUN_020669C0
+ bl AllocMonZeroed
mov r1, #1
lsl r1, r1, #0xc
str r0, [r4, r1]
@@ -17493,7 +17493,7 @@ _02236068:
bl MOD80_022361E8
add r7, r0, #0
mov r0, #0x3e
- bl FUN_020669C0
+ bl AllocMonZeroed
str r0, [sp, #0x20]
ldr r0, [r4]
ldr r1, [sp, #0x20]
diff --git a/arm9/modules/81/asm/module_81.s b/arm9/modules/81/asm/module_81.s
index f852db8d..e9a154d2 100644
--- a/arm9/modules/81/asm/module_81.s
+++ b/arm9/modules/81/asm/module_81.s
@@ -136,7 +136,7 @@ _02237F22:
mov r1, #5
ldr r0, [r0]
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
mov r1, #0x53
lsl r1, r1, #2
strh r0, [r4, r1]
@@ -144,7 +144,7 @@ _02237F22:
mov r1, #5
ldr r0, [r0, #4]
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
ldr r1, _02237FD8 ; =0x0000014E
strh r0, [r4, r1]
mov r0, #0
@@ -197,7 +197,7 @@ MOD81_02237FE8: ; 0x02237FE8
push {r3, lr}
mov r1, #5
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
mov r1, #0x1c
bl GetMonBaseStat
cmp r0, #0
@@ -999,7 +999,7 @@ _0223860E:
ldr r4, [r0, #4]
_02238610:
add r0, r4, #0
- bl FUN_02066A6C
+ bl TryDecryptBoxMon
str r0, [sp, #0x20]
add r0, sp, #0x34
add r1, r4, #0
@@ -1008,12 +1008,12 @@ _02238610:
mov r1, #0
add r0, r4, #0
add r2, r1, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
str r0, [sp, #0x1c]
add r0, r4, #0
mov r1, #5
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
lsl r0, r0, #0x10
ldr r1, [sp, #0x58]
lsr r0, r0, #0x10
@@ -1051,7 +1051,7 @@ _02238648:
bl FUN_02017E14
ldr r1, [sp, #0x20]
add r0, r4, #0
- bl FUN_02066A94
+ bl TryEncryptBoxMon
add r0, r7, #0
bl FreeToHeap
_02238690:
@@ -2514,7 +2514,7 @@ _02239138:
bl MOD81_02238818
mov r1, #0x4c
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0
bne _0223918A
ldr r0, [r4, #0x10]
@@ -9501,7 +9501,7 @@ _0223C8D6:
bl MOD81_02238820
mov r1, #0x4c
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0
bne _0223C902
ldr r0, [r4]
diff --git a/arm9/modules/83/asm/module_83.s b/arm9/modules/83/asm/module_83.s
index e63eedb4..be1e6bfa 100644
--- a/arm9/modules/83/asm/module_83.s
+++ b/arm9/modules/83/asm/module_83.s
@@ -21798,7 +21798,7 @@ MOD83_02237EDC: ; 0x02237EDC
add r1, r0, #0
lsl r0, r4, #0x10
lsr r0, r0, #0x10
- bl CalcMonLevel
+ bl CalcLevelBySpeciesAndExp
pop {r3, r4, r5, pc}
thumb_func_end MOD83_02237EDC
@@ -21809,7 +21809,7 @@ MOD83_02237F04: ; 0x02237F04
add r0, r1, #0
mov r1, #5
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
lsl r0, r0, #0x10
lsr r5, r0, #0x10
add r0, r4, #0
@@ -21864,9 +21864,9 @@ MOD83_02237F6C: ; 0x02237F6C
add r4, r1, #0
add r6, r0, #0
add r0, r4, #0
- bl FUN_020669A0
+ bl WipeBoxMonDataAndEncrypt
add r0, r4, #0
- bl FUN_02066A6C
+ bl TryDecryptBoxMon
mov r1, #0
str r0, [sp]
add r0, r6, #0
@@ -21876,7 +21876,7 @@ MOD83_02237F6C: ; 0x02237F6C
add r0, r4, #0
mov r1, #0
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0xb
mov r2, #0
@@ -21887,7 +21887,7 @@ MOD83_02237F6C: ; 0x02237F6C
add r0, r4, #0
mov r1, #5
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0xc
mov r2, #0
@@ -21903,7 +21903,7 @@ _02237FCE:
add r0, r4, #0
mov r1, #6
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #1
mov r2, #0
@@ -21912,7 +21912,7 @@ _02237FCE:
add r0, r4, #0
mov r1, #7
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x19
mov r2, #0
@@ -21921,13 +21921,13 @@ _02237FCE:
add r0, r4, #0
mov r1, #8
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
mov r0, #0x46
str r0, [sp, #8]
add r0, r4, #0
mov r1, #9
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
add r1, r4, #0
bl MOD83_02237F04
@@ -21935,7 +21935,7 @@ _02237FCE:
add r0, r4, #0
mov r1, #0xa
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #8
mov r2, #0
@@ -21944,7 +21944,7 @@ _02237FCE:
add r0, r4, #0
mov r1, #0xb
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #3
mov r2, #0
@@ -21953,7 +21953,7 @@ _02237FCE:
add r0, r4, #0
mov r1, #0xc
add r2, sp, #4
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x1a
mov r2, #0
@@ -21962,7 +21962,7 @@ _02237FCE:
add r0, r4, #0
mov r1, #0xd
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x1b
mov r2, #0
@@ -21971,7 +21971,7 @@ _02237FCE:
add r0, r4, #0
mov r1, #0xe
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x1c
mov r2, #0
@@ -21980,7 +21980,7 @@ _02237FCE:
add r0, r4, #0
mov r1, #0xf
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x1d
mov r2, #0
@@ -21989,7 +21989,7 @@ _02237FCE:
add r0, r4, #0
mov r1, #0x10
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x1e
mov r2, #0
@@ -21998,7 +21998,7 @@ _02237FCE:
add r0, r4, #0
mov r1, #0x11
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x1f
mov r2, #0
@@ -22007,7 +22007,7 @@ _02237FCE:
add r0, r4, #0
mov r1, #0x12
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x16
mov r2, #0
@@ -22016,7 +22016,7 @@ _02237FCE:
add r0, r4, #0
mov r1, #0x13
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x17
mov r2, #0
@@ -22025,7 +22025,7 @@ _02237FCE:
add r0, r4, #0
mov r1, #0x14
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x18
mov r2, #0
@@ -22034,7 +22034,7 @@ _02237FCE:
add r0, r4, #0
mov r1, #0x15
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x21
mov r2, #0
@@ -22043,7 +22043,7 @@ _02237FCE:
add r0, r4, #0
mov r1, #0x16
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x2f
mov r2, #0
@@ -22052,7 +22052,7 @@ _02237FCE:
add r0, r4, #0
mov r1, #0x17
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x30
mov r2, #0
@@ -22061,7 +22061,7 @@ _02237FCE:
add r0, r4, #0
mov r1, #0x18
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
mov r5, #0
add r7, r5, #0
_0223815E:
@@ -22075,7 +22075,7 @@ _0223815E:
add r0, r4, #0
add r1, #0x36
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x15
mov r2, #0
@@ -22090,18 +22090,18 @@ _0223815E:
add r0, r4, #0
add r1, #0x3e
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r1, r5, #0
add r0, r4, #0
add r1, #0x42
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r1, r5, #0
str r0, [sp, #8]
add r0, r4, #0
add r1, #0x3a
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r5, r5, #1
add r7, r7, #2
cmp r5, #4
@@ -22114,7 +22114,7 @@ _0223815E:
add r0, r4, #0
mov r1, #0x46
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x28
mov r2, #0
@@ -22123,7 +22123,7 @@ _0223815E:
add r0, r4, #0
mov r1, #0x47
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x29
mov r2, #0
@@ -22132,7 +22132,7 @@ _0223815E:
add r0, r4, #0
mov r1, #0x48
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x2a
mov r2, #0
@@ -22141,7 +22141,7 @@ _0223815E:
add r0, r4, #0
mov r1, #0x49
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x2b
mov r2, #0
@@ -22150,7 +22150,7 @@ _0223815E:
add r0, r4, #0
mov r1, #0x4a
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x2c
mov r2, #0
@@ -22159,7 +22159,7 @@ _0223815E:
add r0, r4, #0
mov r1, #0x4b
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x2d
mov r2, #0
@@ -22168,7 +22168,7 @@ _0223815E:
add r0, r4, #0
mov r1, #0x4c
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x32
mov r2, #0
@@ -22186,7 +22186,7 @@ _0223826C:
add r0, r4, #0
add r1, #0x4e
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r5, r5, #1
cmp r5, r7
blt _0223826C
@@ -22208,7 +22208,7 @@ _02238298:
add r0, r4, #0
add r1, #0x52
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r5, r5, #1
cmp r5, r7
blt _02238298
@@ -22230,7 +22230,7 @@ _022382C4:
add r0, r4, #0
add r1, #0x56
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r5, r5, #1
cmp r5, r7
blt _022382C4
@@ -22252,7 +22252,7 @@ _022382F0:
add r0, r4, #0
add r1, #0x5a
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r5, r5, #1
cmp r5, r7
blt _022382F0
@@ -22274,7 +22274,7 @@ _0223831C:
add r0, r4, #0
add r1, #0x5e
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r5, r5, #1
cmp r5, r7
blt _0223831C
@@ -22287,7 +22287,7 @@ _02238332:
add r0, r4, #0
mov r1, #0x62
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x44
mov r2, #0
@@ -22296,7 +22296,7 @@ _02238332:
add r0, r4, #0
mov r1, #0x63
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x45
mov r2, #0
@@ -22305,7 +22305,7 @@ _02238332:
add r0, r4, #0
mov r1, #0x64
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x46
mov r2, #0
@@ -22314,7 +22314,7 @@ _02238332:
add r0, r4, #0
mov r1, #0x65
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x47
mov r2, #0
@@ -22323,7 +22323,7 @@ _02238332:
add r0, r4, #0
mov r1, #0x66
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x48
mov r2, #0
@@ -22332,7 +22332,7 @@ _02238332:
add r0, r4, #0
mov r1, #0x67
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x49
mov r2, #0
@@ -22341,7 +22341,7 @@ _02238332:
add r0, r4, #0
mov r1, #0x68
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x4a
mov r2, #0
@@ -22350,7 +22350,7 @@ _02238332:
add r0, r4, #0
mov r1, #0x69
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x4b
mov r2, #0
@@ -22359,7 +22359,7 @@ _02238332:
add r0, r4, #0
mov r1, #0x6a
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x4c
mov r2, #0
@@ -22368,7 +22368,7 @@ _02238332:
add r0, r4, #0
mov r1, #0x6b
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x4d
mov r2, #0
@@ -22377,7 +22377,7 @@ _02238332:
add r0, r4, #0
mov r1, #0x6c
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x4e
mov r2, #0
@@ -22386,7 +22386,7 @@ _02238332:
add r0, r4, #0
mov r1, #0x6d
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x50
mov r2, #0
@@ -22395,18 +22395,18 @@ _02238332:
add r0, r4, #0
mov r1, #0x6e
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r4, #0
bl FUN_020689E8
str r0, [sp, #8]
add r0, r4, #0
mov r1, #0x6f
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r4, #0
mov r1, #5
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0xc9
bne _022384AE
mov r1, #0
@@ -22436,12 +22436,12 @@ _02238332:
add r0, r4, #0
mov r1, #0x70
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
_022384AE:
add r0, r4, #0
mov r1, #5
mov r2, #0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
ldr r1, _022385F0 ; =0x00000182
cmp r0, r1
bne _022384FE
@@ -22481,7 +22481,7 @@ _022384F4:
add r0, r4, #0
mov r1, #0x70
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
_022384FE:
add r0, r6, #0
mov r1, #2
@@ -22495,7 +22495,7 @@ _022384FE:
add r0, r4, #0
mov r1, #0x75
add r2, sp, #0xc
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #3
mov r2, #0
@@ -22509,7 +22509,7 @@ _022384FE:
add r0, r4, #0
mov r1, #0x4d
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
_0223853E:
add r0, r6, #0
mov r1, #0x25
@@ -22519,7 +22519,7 @@ _0223853E:
add r0, r4, #0
mov r1, #0x79
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #7
add r2, sp, #0x24
@@ -22532,7 +22532,7 @@ _0223853E:
add r0, r4, #0
mov r1, #0x8f
add r2, sp, #0xc
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x23
mov r2, #0
@@ -22541,7 +22541,7 @@ _0223853E:
add r0, r4, #0
mov r1, #0x98
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x22
mov r2, #0
@@ -22550,7 +22550,7 @@ _0223853E:
add r0, r4, #0
mov r1, #0x99
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x26
mov r2, #0
@@ -22559,7 +22559,7 @@ _0223853E:
add r0, r4, #0
mov r1, #0x9a
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x24
mov r2, #0
@@ -22568,7 +22568,7 @@ _0223853E:
add r0, r4, #0
mov r1, #0x9b
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r6, #0
mov r1, #0x31
mov r2, #0
@@ -22577,10 +22577,10 @@ _0223853E:
add r0, r4, #0
mov r1, #0x9c
add r2, sp, #8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
ldr r1, [sp]
add r0, r4, #0
- bl FUN_02066A94
+ bl TryEncryptBoxMon
add sp, #0x30
pop {r3, r4, r5, r6, r7, pc}
nop