summaryrefslogtreecommitdiff
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
parent6a1f6122b5422deebf218372cbd9b5684505d4ec (diff)
Name more funcs in pokemon.s
-rw-r--r--arm9/asm/pokemon.s628
-rw-r--r--arm9/asm/scrcmd.s4
-rw-r--r--arm9/asm/scrcmd_12.s22
-rw-r--r--arm9/asm/scrcmd_13.s4
-rw-r--r--arm9/asm/scrcmd_18.s14
-rw-r--r--arm9/asm/scrcmd_5.s6
-rw-r--r--arm9/asm/unk_0200AA80.s8
-rw-r--r--arm9/asm/unk_02023C40.s10
-rw-r--r--arm9/asm/unk_02026CD0.s8
-rw-r--r--arm9/asm/unk_0202B034.s4
-rw-r--r--arm9/asm/unk_020377F0.s2
-rw-r--r--arm9/asm/unk_020476CC.s8
-rw-r--r--arm9/asm/unk_0204A01C.s14
-rw-r--r--arm9/asm/unk_0204B9EC.s4
-rw-r--r--arm9/asm/unk_0204BE14.s2
-rw-r--r--arm9/asm/unk_020603B0.s2
-rw-r--r--arm9/asm/unk_020606B0.s4
-rw-r--r--arm9/asm/unk_02060CCC.s2
-rw-r--r--arm9/asm/unk_0206ABC4.s6
-rw-r--r--arm9/asm/unk_0206B16C.s20
-rw-r--r--arm9/asm/unk_0206B688.s20
-rw-r--r--arm9/asm/unk_0206C700.s40
-rw-r--r--arm9/asm/unk_0206F3FC.s6
-rw-r--r--arm9/asm/unk_02073DA8.s4
-rw-r--r--arm9/asm/unk_0207550C.s8
-rw-r--r--arm9/asm/unk_020772F0.s6
-rw-r--r--arm9/asm/unk_02079C70.s14
-rw-r--r--arm9/asm/unk_0207D5BC.s2
-rw-r--r--arm9/asm/unk_0207FD00.s72
-rw-r--r--arm9/asm/unk_02080C38.s6
-rw-r--r--arm9/asm/unk_020828BC.s18
-rw-r--r--arm9/asm/unk_020834D0.s8
-rw-r--r--arm9/asm/unk_020842DC.s32
-rw-r--r--arm9/asm/unk_020854E0.s10
-rw-r--r--arm9/asm/unk_020859C0.s6
-rw-r--r--arm9/asm/unk_02086084.s6
-rw-r--r--arm9/asm/unk_02086414.s4
-rw-r--r--arm9/asm/unk_02087D00.s6
-rw-r--r--arm9/global.inc38
-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
-rw-r--r--include/pokemon.h17
57 files changed, 925 insertions, 922 deletions
diff --git a/arm9/asm/pokemon.s b/arm9/asm/pokemon.s
index f58ad635..87c532fe 100644
--- a/arm9/asm/pokemon.s
+++ b/arm9/asm/pokemon.s
@@ -12,18 +12,18 @@ UNK_020F7ECC: ; 0x020F7ECC
.short 0x002D, 0x005F
.short 0x0014, 0x0050
- .global UNK_020F7ED4
-UNK_020F7ED4: ; 0x020F7ED4
- .byte 0x05, 0x03, 0x02
- .byte 0x05, 0x03, 0x02
- .byte 0x01, 0x01, 0x00
- .byte 0x03, 0x02, 0x01
- .byte 0x01, 0x01, 0x00
- .byte 0x01, 0x01, 0x01
- .byte 0xFF, 0xFF, 0xFF
- .byte 0xFB, 0xFB, 0xF6
- .byte 0xFB, 0xFB, 0xF6
- .byte 0x03, 0x02, 0x01
+ .global sFriendshipModTable
+sFriendshipModTable: ; 0x020F7ED4
+ .byte 5, 3, 2
+ .byte 5, 3, 2
+ .byte 1, 1, 0
+ .byte 3, 2, 1
+ .byte 1, 1, 0
+ .byte 1, 1, 1
+ .byte -1, -1, -1
+ .byte -5, -5, -10
+ .byte -5, -5, -10
+ .byte 3, 2, 1
.global sLegendaryMonsList
sLegendaryMonsList: ; 0x020F7EF2
@@ -74,8 +74,8 @@ UNK_020F7F16: ; 0x020F7F16
.byte 0, -1, 0, 1, 0
.byte 0, 0, 0, 0, 0
- .global UNK_020F7F93
-UNK_020F7F93: ; 0x020F7F93
+ .global sNatureStatMods
+sNatureStatMods: ; 0x020F7F93
.byte 0, 0, 0, 0, 0
.byte 1, -1, 0, 0, 0
.byte 1, 0, -1, 0, 0
@@ -104,8 +104,8 @@ UNK_020F7F93: ; 0x020F7F93
.section .data
- .global UNK_02105FC8
-UNK_02105FC8: ; 0x02105FC8
+ .global __local_str_poketool_personal_pms_narc
+__local_str_poketool_personal_pms_narc: ; 0x02105FC8
.asciz "poketool/personal/pms.narc"
.section .bss
@@ -128,16 +128,16 @@ ZeroMonData: ; 0x02066978
ldrh r2, [r4, #0x6]
add r0, #0x8
mov r1, #0x80
- bl EncryptMon
+ bl MonEncryptSegment
add r0, r4, #0x0
ldr r2, [r4, #0x0]
add r0, #0x88
mov r1, #0x64
- bl EncryptMon
+ bl MonEncryptSegment
pop {r4, pc}
- thumb_func_start FUN_020669A0
-FUN_020669A0: ; 0x020669A0
+ thumb_func_start WipeBoxMonDataAndEncrypt
+WipeBoxMonDataAndEncrypt: ; 0x020669A0
push {r4, lr}
add r4, r0, #0x0
mov r0, #0x0
@@ -148,16 +148,16 @@ FUN_020669A0: ; 0x020669A0
ldrh r2, [r4, #0x6]
add r0, #0x8
mov r1, #0x80
- bl EncryptMon
+ bl MonEncryptSegment
pop {r4, pc}
- thumb_func_start FUN_020669BC
-FUN_020669BC: ; 0x020669BC
+ thumb_func_start SizeOfStructPokemon
+SizeOfStructPokemon: ; 0x020669BC
mov r0, #0xec
bx lr
- thumb_func_start FUN_020669C0
-FUN_020669C0: ; 0x020669C0
+ thumb_func_start AllocMonZeroed
+AllocMonZeroed: ; 0x020669C0
push {r4, lr}
mov r1, #0xec
bl AllocFromHeap
@@ -167,8 +167,8 @@ FUN_020669C0: ; 0x020669C0
pop {r4, pc}
.balign 4
- thumb_func_start FUN_020669D4
-FUN_020669D4: ; 0x020669D4
+ thumb_func_start TryDecryptMon
+TryDecryptMon: ; 0x020669D4
push {r3-r5, lr}
add r5, r0, #0x0
ldrh r0, [r5, #0x4]
@@ -196,19 +196,19 @@ _020669EE:
ldr r2, [r5, #0x0]
add r0, #0x88
mov r1, #0x64
- bl DecryptMon
+ bl MonDecryptSegment
add r0, r5, #0x0
ldrh r2, [r5, #0x6]
add r0, #0x8
mov r1, #0x80
- bl DecryptMon
+ bl MonDecryptSegment
_02066A1A:
add r0, r4, #0x0
pop {r3-r5, pc}
.balign 4
- thumb_func_start FUN_02066A20
-FUN_02066A20: ; 0x02066A20
+ thumb_func_start TryEncryptMon
+TryEncryptMon: ; 0x02066A20
push {r3-r5, lr}
add r5, r0, #0x0
ldrh r2, [r5, #0x4]
@@ -231,23 +231,23 @@ FUN_02066A20: ; 0x02066A20
ldr r2, [r5, #0x0]
add r0, #0x88
mov r1, #0x64
- bl EncryptMon
+ bl MonEncryptSegment
add r0, r5, #0x0
add r0, #0x8
mov r1, #0x80
- bl FUN_0206A3F8
+ bl CalcMonChecksum
strh r0, [r5, #0x6]
add r0, r5, #0x0
ldrh r2, [r5, #0x6]
add r0, #0x8
mov r1, #0x80
- bl EncryptMon
+ bl MonEncryptSegment
_02066A68:
add r0, r4, #0x0
pop {r3-r5, pc}
- thumb_func_start FUN_02066A6C
-FUN_02066A6C: ; 0x02066A6C
+ thumb_func_start TryDecryptBoxMon
+TryDecryptBoxMon: ; 0x02066A6C
push {r4, lr}
add r2, r0, #0x0
ldrh r1, [r2, #0x4]
@@ -263,14 +263,14 @@ FUN_02066A6C: ; 0x02066A6C
add r0, #0x8
mov r1, #0x80
mov r4, #0x1
- bl DecryptMon
+ bl MonDecryptSegment
_02066A8E:
add r0, r4, #0x0
pop {r4, pc}
.balign 4
- thumb_func_start FUN_02066A94
-FUN_02066A94: ; 0x02066A94
+ thumb_func_start TryEncryptBoxMon
+TryEncryptBoxMon: ; 0x02066A94
push {r3-r5, lr}
add r5, r0, #0x0
ldrh r2, [r5, #0x4]
@@ -288,13 +288,13 @@ FUN_02066A94: ; 0x02066A94
add r0, #0x8
mov r1, #0x80
mov r4, #0x1
- bl FUN_0206A3F8
+ bl CalcMonChecksum
strh r0, [r5, #0x6]
add r0, r5, #0x0
ldrh r2, [r5, #0x6]
add r0, #0x8
mov r1, #0x80
- bl EncryptMon
+ bl MonEncryptSegment
_02066AC8:
add r0, r4, #0x0
pop {r3-r5, pc}
@@ -325,23 +325,23 @@ CreateMon: ; 0x02066ACC
add r0, #0x88
mov r1, #0x64
mov r2, #0x0
- bl EncryptMon
+ bl MonEncryptSegment
add r0, r5, #0x0
ldr r2, [r5, #0x0]
add r0, #0x88
mov r1, #0x64
- bl EncryptMon
+ bl MonEncryptSegment
add r0, r5, #0x0
mov r1, #0xa0
add r2, sp, #0x48
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r0, #0x0
bl FUN_020256BC
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0xa9
add r2, r4, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r4, #0x0
bl FreeToHeap
mov r0, #0x0
@@ -349,7 +349,7 @@ CreateMon: ; 0x02066ACC
add r0, r5, #0x0
mov r1, #0xa1
add r2, sp, #0x10
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r0, #0x0
add r1, sp, #0x14
mov r2, #0x18
@@ -357,7 +357,7 @@ CreateMon: ; 0x02066ACC
add r0, r5, #0x0
mov r1, #0xaa
add r2, sp, #0x14
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #0x0
bl FUN_02066ED8
add sp, #0x2c
@@ -372,9 +372,9 @@ CreateBoxMon: ; 0x02066B64
push {r4-r7, lr}
sub sp, #0xc
add r5, r0, #0x0
- bl FUN_020669A0
+ bl WipeBoxMonDataAndEncrypt
add r0, r5, #0x0
- bl FUN_02066A6C
+ bl TryDecryptBoxMon
str r0, [sp, #0x0]
ldr r0, [sp, #0x30]
cmp r0, #0x0
@@ -389,7 +389,7 @@ _02066B8E:
add r0, r5, #0x0
mov r1, #0x0
add r2, sp, #0x34
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
ldr r0, [sp, #0x38]
cmp r0, #0x2
bne _02066BD6
@@ -429,19 +429,19 @@ _02066BDE:
add r0, r5, #0x0
mov r1, #0x7
add r2, sp, #0x3c
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
ldr r2, _02066D88 ; =gGameLanguage
add r0, r5, #0x0
mov r1, #0xc
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r5, #0x0
mov r1, #0x5
add r2, sp, #0x24
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r5, #0x0
mov r1, #0xb2
mov r2, #0x0
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
ldr r0, [sp, #0x24]
ldr r1, [sp, #0x28]
bl GetMonExpByLevel
@@ -449,7 +449,7 @@ _02066BDE:
add r0, r5, #0x0
mov r1, #0x8
add r2, sp, #0x8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
ldr r0, [sp, #0x24]
mov r1, #0x14
bl GetMonBaseStat
@@ -457,48 +457,48 @@ _02066BDE:
add r0, r5, #0x0
mov r1, #0x9
add r2, sp, #0x8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r5, #0x0
mov r1, #0x9b
add r2, sp, #0x28
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
ldr r2, _02066D8C ; =gGameVersion
add r0, r5, #0x0
mov r1, #0x79
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
mov r0, #0x4
str r0, [sp, #0x8]
add r0, r5, #0x0
mov r1, #0x9a
add r2, sp, #0x8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
ldr r0, [sp, #0x2c]
cmp r0, #0x20
bge _02066C94
add r0, r5, #0x0
mov r1, #0x46
add r2, sp, #0x2c
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r5, #0x0
mov r1, #0x47
add r2, sp, #0x2c
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r5, #0x0
mov r1, #0x48
add r2, sp, #0x2c
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r5, #0x0
mov r1, #0x49
add r2, sp, #0x2c
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r5, #0x0
mov r1, #0x4a
add r2, sp, #0x2c
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r5, #0x0
mov r1, #0x4b
add r2, sp, #0x2c
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
b _02066D18
_02066C94:
bl rand_LC
@@ -509,7 +509,7 @@ _02066C94:
add r0, r5, #0x0
mov r1, #0x46
add r2, sp, #0x4
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
mov r0, #0x3e
ldr r1, [sp, #0x8]
lsl r0, r0, #0x4
@@ -519,7 +519,7 @@ _02066C94:
add r0, r5, #0x0
mov r1, #0x47
add r2, sp, #0x4
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
mov r0, #0x1f
ldr r1, [sp, #0x8]
lsl r0, r0, #0xa
@@ -529,7 +529,7 @@ _02066C94:
add r0, r5, #0x0
mov r1, #0x48
add r2, sp, #0x4
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
bl rand_LC
mov r1, #0x1f
str r0, [sp, #0x8]
@@ -538,7 +538,7 @@ _02066C94:
add r0, r5, #0x0
mov r1, #0x49
add r2, sp, #0x4
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
mov r0, #0x3e
ldr r1, [sp, #0x8]
lsl r0, r0, #0x4
@@ -548,7 +548,7 @@ _02066C94:
add r0, r5, #0x0
mov r1, #0x4a
add r2, sp, #0x4
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
mov r0, #0x1f
ldr r1, [sp, #0x8]
lsl r0, r0, #0xa
@@ -558,7 +558,7 @@ _02066C94:
add r0, r5, #0x0
mov r1, #0x4b
add r2, sp, #0x4
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
_02066D18:
ldr r0, [sp, #0x24]
mov r1, #0x18
@@ -577,19 +577,19 @@ _02066D18:
add r0, r5, #0x0
mov r1, #0xa
add r2, sp, #0x4
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
b _02066D5A
_02066D44:
add r0, r5, #0x0
mov r1, #0xa
add r2, sp, #0x8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
b _02066D5A
_02066D50:
add r0, r5, #0x0
mov r1, #0xa
add r2, sp, #0x8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
_02066D5A:
add r0, r5, #0x0
bl FUN_020689E8
@@ -597,12 +597,12 @@ _02066D5A:
add r0, r5, #0x0
mov r1, #0x6f
add r2, sp, #0x8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r5, #0x0
bl FUN_020695F4
ldr r1, [sp, #0x0]
add r0, r5, #0x0
- bl FUN_02066A94
+ bl TryEncryptBoxMon
add sp, #0xc
pop {r4-r7}
pop {r3}
@@ -769,7 +769,7 @@ FUN_02066EA4: ; 0x02066EA4
add r0, r4, #0x0
mov r1, #0xae
add r2, sp, #0x24
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r4, #0x0
bl FUN_02066ED8
add sp, #0x10
@@ -782,28 +782,28 @@ FUN_02066EA4: ; 0x02066EA4
FUN_02066ED8: ; 0x02066ED8
push {r3-r5, lr}
add r5, r0, #0x0
- bl FUN_020669D4
+ bl TryDecryptMon
add r4, r0, #0x0
add r0, r5, #0x0
- bl FUN_020687C0
+ bl CalcMonLevelEncrypted
str r0, [sp, #0x0]
add r0, r5, #0x0
mov r1, #0xa0
add r2, sp, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #0x0
- bl FUN_02066F04
+ bl CalcMonStatsMaybeEncrypted
add r0, r5, #0x0
add r1, r4, #0x0
- bl FUN_02066A20
+ bl TryEncryptMon
pop {r3-r5, pc}
- thumb_func_start FUN_02066F04
-FUN_02066F04: ; 0x02066F04
+ thumb_func_start CalcMonStatsMaybeEncrypted
+CalcMonStatsMaybeEncrypted: ; 0x02066F04
push {r3-r7, lr}
sub sp, #0x58
add r5, r0, #0x0
- bl FUN_020669D4
+ bl TryDecryptMon
str r0, [sp, #0x0]
add r0, r5, #0x0
mov r1, #0xa0
@@ -897,7 +897,7 @@ FUN_02066F04: ; 0x02066F04
ldr r1, [sp, #0x38]
add r0, r7, #0x0
add r2, r6, #0x0
- bl LoadMonBaseStats_HandleUnownOrArceus
+ bl LoadMonBaseStats_HandleAlternateForme
mov r0, #0x49
lsl r0, r0, #0x2
cmp r7, r0
@@ -926,7 +926,7 @@ _0206701E:
add r0, r5, #0x0
mov r1, #0xa3
add r2, sp, #0x50
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [sp, #0x14]
asr r0, r0, #0x1
lsr r1, r0, #0x1e
@@ -944,17 +944,17 @@ _0206701E:
add r0, r0, #0x5
str r0, [sp, #0x4c]
add r0, r5, #0x0
- bl FUN_02068854
+ bl GetMonNatureEncrypted
ldr r1, [sp, #0x4c]
mov r2, #0x1
lsl r1, r1, #0x10
lsr r1, r1, #0x10
- bl FUN_02068894
+ bl ApplyNatureModToStat
str r0, [sp, #0x4c]
add r0, r5, #0x0
mov r1, #0xa4
add r2, sp, #0x4c
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [sp, #0x10]
asr r0, r0, #0x1
lsr r1, r0, #0x1e
@@ -972,17 +972,17 @@ _0206701E:
add r0, r0, #0x5
str r0, [sp, #0x48]
add r0, r5, #0x0
- bl FUN_02068854
+ bl GetMonNatureEncrypted
ldr r1, [sp, #0x48]
mov r2, #0x2
lsl r1, r1, #0x10
lsr r1, r1, #0x10
- bl FUN_02068894
+ bl ApplyNatureModToStat
str r0, [sp, #0x48]
add r0, r5, #0x0
mov r1, #0xa5
add r2, sp, #0x48
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [sp, #0xc]
asr r0, r0, #0x1
lsr r1, r0, #0x1e
@@ -1000,17 +1000,17 @@ _0206701E:
add r0, r0, #0x5
str r0, [sp, #0x44]
add r0, r5, #0x0
- bl FUN_02068854
+ bl GetMonNatureEncrypted
ldr r1, [sp, #0x44]
mov r2, #0x3
lsl r1, r1, #0x10
lsr r1, r1, #0x10
- bl FUN_02068894
+ bl ApplyNatureModToStat
str r0, [sp, #0x44]
add r0, r5, #0x0
mov r1, #0xa6
add r2, sp, #0x44
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [sp, #0x8]
asr r0, r0, #0x1
lsr r1, r0, #0x1e
@@ -1028,17 +1028,17 @@ _0206701E:
add r0, r0, #0x5
str r0, [sp, #0x40]
add r0, r5, #0x0
- bl FUN_02068854
+ bl GetMonNatureEncrypted
ldr r1, [sp, #0x40]
mov r2, #0x4
lsl r1, r1, #0x10
lsr r1, r1, #0x10
- bl FUN_02068894
+ bl ApplyNatureModToStat
str r0, [sp, #0x40]
add r0, r5, #0x0
mov r1, #0xa7
add r2, sp, #0x40
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [sp, #0x4]
asr r0, r0, #0x1
lsr r1, r0, #0x1e
@@ -1056,17 +1056,17 @@ _0206701E:
add r0, r0, #0x5
str r0, [sp, #0x3c]
add r0, r5, #0x0
- bl FUN_02068854
+ bl GetMonNatureEncrypted
ldr r1, [sp, #0x3c]
mov r2, #0x5
lsl r1, r1, #0x10
lsr r1, r1, #0x10
- bl FUN_02068894
+ bl ApplyNatureModToStat
str r0, [sp, #0x3c]
add r0, r5, #0x0
mov r1, #0xa8
add r2, sp, #0x3c
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r6, #0x0
bl FreeToHeap
ldr r1, [sp, #0x54]
@@ -1103,11 +1103,11 @@ _020671A0:
add r0, r5, #0x0
mov r1, #0xa2
add r2, sp, #0x54
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_020671B0:
ldr r1, [sp, #0x0]
add r0, r5, #0x0
- bl FUN_02066A20
+ bl TryEncryptMon
add sp, #0x58
pop {r3-r7, pc}
@@ -1125,16 +1125,16 @@ GetMonDataEncrypted: ; 0x020671BC
ldr r2, [r5, #0x0]
add r0, #0x88
mov r1, #0x64
- bl DecryptMon
+ bl MonDecryptSegment
add r0, r5, #0x0
ldrh r2, [r5, #0x6]
add r0, #0x8
mov r1, #0x80
- bl DecryptMon
+ bl MonDecryptSegment
add r0, r5, #0x0
add r0, #0x8
mov r1, #0x80
- bl FUN_0206A3F8
+ bl CalcMonChecksum
ldrh r1, [r5, #0x6]
cmp r0, r1
beq _02067204
@@ -1160,12 +1160,12 @@ _02067204:
ldr r2, [r5, #0x0]
add r0, #0x88
mov r1, #0x64
- bl EncryptMon
+ bl MonEncryptSegment
add r0, r5, #0x0
ldrh r2, [r5, #0x6]
add r0, #0x8
mov r1, #0x80
- bl EncryptMon
+ bl MonEncryptSegment
_02067230:
add r0, r4, #0x0
pop {r4-r6, pc}
@@ -1252,8 +1252,8 @@ _020672B6:
bl GetBoxMonData
pop {r3, pc}
- thumb_func_start FUN_020672BC
-FUN_020672BC: ; 0x020672BC
+ thumb_func_start GetBoxMonDataEncrypted
+GetBoxMonDataEncrypted: ; 0x020672BC
push {r4-r6, lr}
add r5, r0, #0x0
ldrh r0, [r5, #0x4]
@@ -1266,11 +1266,11 @@ FUN_020672BC: ; 0x020672BC
add r0, r5, #0x0
add r0, #0x8
mov r1, #0x80
- bl DecryptMon
+ bl MonDecryptSegment
add r0, r5, #0x0
add r0, #0x8
mov r1, #0x80
- bl FUN_0206A3F8
+ bl CalcMonChecksum
ldrh r1, [r5, #0x6]
cmp r0, r1
beq _020672F8
@@ -1296,7 +1296,7 @@ _020672F8:
add r0, r5, #0x0
add r0, #0x8
mov r1, #0x80
- bl EncryptMon
+ bl MonEncryptSegment
_02067318:
add r0, r4, #0x0
pop {r4-r6, pc}
@@ -1589,7 +1589,7 @@ _0206753C:
_02067540:
ldrh r0, [r5, #0x0]
ldr r1, [r5, #0x8]
- bl CalcMonLevel
+ bl CalcLevelBySpeciesAndExp
add r4, r0, #0x0
b _0206781A
_0206754C:
@@ -2022,8 +2022,8 @@ _02067824: .word SPECIES_MANAPHY_EGG
_02067828: .word 0x0000FFFF
_0206782C: .word SPECIES_ARCEUS
- thumb_func_start SetBoxMonDataEncrypted
-SetBoxMonDataEncrypted: ; 0x02067830
+ thumb_func_start SetMonDataEncrypted
+SetMonDataEncrypted: ; 0x02067830
push {r4-r6, lr}
add r5, r0, #0x0
ldrh r0, [r5, #0x4]
@@ -2036,16 +2036,16 @@ SetBoxMonDataEncrypted: ; 0x02067830
ldr r2, [r5, #0x0]
add r0, #0x88
mov r1, #0x64
- bl DecryptMon
+ bl MonDecryptSegment
add r0, r5, #0x0
ldrh r2, [r5, #0x6]
add r0, #0x8
mov r1, #0x80
- bl DecryptMon
+ bl MonDecryptSegment
add r0, r5, #0x0
add r0, #0x8
mov r1, #0x80
- bl FUN_0206A3F8
+ bl CalcMonChecksum
ldrh r1, [r5, #0x6]
cmp r0, r1
beq _02067886
@@ -2061,7 +2061,7 @@ _02067870:
add r0, r5, #0x0
add r0, #0x8
mov r1, #0x80
- bl EncryptMon
+ bl MonEncryptSegment
pop {r4-r6, pc}
_02067886:
add r0, r5, #0x0
@@ -2076,17 +2076,17 @@ _02067886:
ldr r2, [r5, #0x0]
add r0, #0x88
mov r1, #0x64
- bl EncryptMon
+ bl MonEncryptSegment
add r0, r5, #0x0
add r0, #0x8
mov r1, #0x80
- bl FUN_0206A3F8
+ bl CalcMonChecksum
strh r0, [r5, #0x6]
add r0, r5, #0x0
ldrh r2, [r5, #0x6]
add r0, #0x8
mov r1, #0x80
- bl EncryptMon
+ bl MonEncryptSegment
_020678BC:
pop {r4-r6, pc}
.balign 4
@@ -2185,8 +2185,8 @@ _02067958:
bl SetBoxMonData
pop {r3, pc}
- thumb_func_start FUN_02067960
-FUN_02067960: ; 0x02067960
+ thumb_func_start SetBoxMonDataEncrypted
+SetBoxMonDataEncrypted: ; 0x02067960
push {r4-r6, lr}
add r5, r0, #0x0
ldrh r0, [r5, #0x4]
@@ -2199,11 +2199,11 @@ FUN_02067960: ; 0x02067960
add r0, r5, #0x0
add r0, #0x8
mov r1, #0x80
- bl DecryptMon
+ bl MonDecryptSegment
add r0, r5, #0x0
add r0, #0x8
mov r1, #0x80
- bl FUN_0206A3F8
+ bl CalcMonChecksum
ldrh r1, [r5, #0x6]
cmp r0, r1
beq _020679AA
@@ -2219,7 +2219,7 @@ _02067994:
add r0, r5, #0x0
add r0, #0x8
mov r1, #0x80
- bl EncryptMon
+ bl MonEncryptSegment
pop {r4-r6, pc}
_020679AA:
add r0, r5, #0x0
@@ -2233,13 +2233,13 @@ _020679AA:
add r0, r5, #0x0
add r0, #0x8
mov r1, #0x80
- bl FUN_0206A3F8
+ bl CalcMonChecksum
strh r0, [r5, #0x6]
add r0, r5, #0x0
ldrh r2, [r5, #0x6]
add r0, #0x8
mov r1, #0x80
- bl EncryptMon
+ bl MonEncryptSegment
_020679D4:
pop {r4-r6, pc}
.balign 4
@@ -3097,8 +3097,8 @@ _0206800C: .word 0xC1FFFFFF
_02068010: .word 0xBFFFFFFF
_02068014: .word 0x7FFFFFFF
- thumb_func_start FUN_02068018
-FUN_02068018: ; 0x02068018
+ thumb_func_start AddMonPartyStatEncrypted
+AddMonPartyStatEncrypted: ; 0x02068018
push {r4-r6, lr}
add r5, r0, #0x0
ldrh r0, [r5, #0x4]
@@ -3111,16 +3111,16 @@ FUN_02068018: ; 0x02068018
ldr r2, [r5, #0x0]
add r0, #0x88
mov r1, #0x64
- bl DecryptMon
+ bl MonDecryptSegment
add r0, r5, #0x0
ldrh r2, [r5, #0x6]
add r0, #0x8
mov r1, #0x80
- bl DecryptMon
+ bl MonDecryptSegment
add r0, r5, #0x0
add r0, #0x8
mov r1, #0x80
- bl FUN_0206A3F8
+ bl CalcMonChecksum
ldrh r1, [r5, #0x6]
cmp r0, r1
beq _02068066
@@ -3132,13 +3132,13 @@ _02068058:
add r0, r5, #0x0
add r0, #0x8
mov r1, #0x80
- bl EncryptMon
+ bl MonEncryptSegment
pop {r4-r6, pc}
_02068066:
add r0, r5, #0x0
add r1, r4, #0x0
add r2, r6, #0x0
- bl FUN_020680A0
+ bl AddMonPartyStat
ldrh r0, [r5, #0x4]
lsl r0, r0, #0x1f
lsr r0, r0, #0x1f
@@ -3147,23 +3147,23 @@ _02068066:
ldr r2, [r5, #0x0]
add r0, #0x88
mov r1, #0x64
- bl EncryptMon
+ bl MonEncryptSegment
add r0, r5, #0x0
add r0, #0x8
mov r1, #0x80
- bl FUN_0206A3F8
+ bl CalcMonChecksum
strh r0, [r5, #0x6]
add r0, r5, #0x0
ldrh r2, [r5, #0x6]
add r0, #0x8
mov r1, #0x80
- bl EncryptMon
+ bl MonEncryptSegment
_0206809C:
pop {r4-r6, pc}
.balign 4
- thumb_func_start FUN_020680A0
-FUN_020680A0: ; 0x020680A0
+ thumb_func_start AddMonPartyStat
+AddMonPartyStat: ; 0x020680A0
push {r3, lr}
add r3, r1, #0x0
sub r3, #0x9f
@@ -3784,7 +3784,7 @@ AllocAndLoadMonPersonal: ; 0x0206851C
add r4, r0, #0x0
add r0, r5, #0x0
add r1, r4, #0x0
- bl FUN_0206A370
+ bl LoadMonPersonal
add r0, r4, #0x0
pop {r3-r5, pc}
.balign 4
@@ -4008,7 +4008,7 @@ GetMonBaseStat: ; 0x02068678
FUN_02068698: ; 0x02068698
push {r3-r7, lr}
add r5, r0, #0x0
- bl FUN_020669D4
+ bl TryDecryptMon
str r0, [sp, #0x0]
add r0, r5, #0x0
mov r1, #0x5
@@ -4037,7 +4037,7 @@ FUN_02068698: ; 0x02068698
add r7, r0, #0x0
ldr r1, [sp, #0x0]
add r0, r5, #0x0
- bl FUN_02066A20
+ bl TryEncryptMon
sub r1, r7, r4
mov r0, #0x64
mul r0, r1
@@ -4047,31 +4047,31 @@ FUN_02068698: ; 0x02068698
lsr r0, r0, #0x18
pop {r3-r7, pc}
- thumb_func_start FUN_020686F8
-FUN_020686F8: ; 0x020686F8
- ldr r3, _020686FC ; =FUN_02068700
+ thumb_func_start CalcMonExpToNextLevelEncrypted
+CalcMonExpToNextLevelEncrypted: ; 0x020686F8
+ ldr r3, _020686FC ; =CalcBoxMonExpToNextLevelEncrypted
bx r3
.balign 4
-_020686FC: .word FUN_02068700
+_020686FC: .word CalcBoxMonExpToNextLevelEncrypted
- thumb_func_start FUN_02068700
-FUN_02068700: ; 0x02068700
+ thumb_func_start CalcBoxMonExpToNextLevelEncrypted
+CalcBoxMonExpToNextLevelEncrypted: ; 0x02068700
push {r4-r6, lr}
mov r1, #0x5
mov r2, #0x0
add r4, r0, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
lsl r0, r0, #0x10
lsr r6, r0, #0x10
add r0, r4, #0x0
- bl FUN_020687C8
+ bl CalcBoxMonLevelEncrypted
add r0, r0, #0x1
lsl r0, r0, #0x10
lsr r5, r0, #0x10
add r0, r4, #0x0
mov r1, #0x8
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r4, r0, #0x0
add r0, r6, #0x0
add r1, r5, #0x0
@@ -4152,41 +4152,41 @@ _0206879E:
add r0, r5, #0x0
pop {r4-r6, pc}
- thumb_func_start FUN_020687C0
-FUN_020687C0: ; 0x020687C0
- ldr r3, _020687C4 ; =FUN_020687C8
+ thumb_func_start CalcMonLevelEncrypted
+CalcMonLevelEncrypted: ; 0x020687C0
+ ldr r3, _020687C4 ; =CalcBoxMonLevelEncrypted
bx r3
.balign 4
-_020687C4: .word FUN_020687C8
+_020687C4: .word CalcBoxMonLevelEncrypted
- thumb_func_start FUN_020687C8
-FUN_020687C8: ; 0x020687C8
+ thumb_func_start CalcBoxMonLevelEncrypted
+CalcBoxMonLevelEncrypted: ; 0x020687C8
push {r3-r7, lr}
add r5, r0, #0x0
- bl FUN_02066A6C
+ bl TryDecryptBoxMon
add r6, r0, #0x0
add r0, r5, #0x0
mov r1, #0x5
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x8
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r7, r0, #0x0
add r0, r5, #0x0
add r1, r6, #0x0
- bl FUN_02066A94
+ bl TryEncryptBoxMon
lsl r0, r4, #0x10
lsr r0, r0, #0x10
add r1, r7, #0x0
- bl CalcMonLevel
+ bl CalcLevelBySpeciesAndExp
pop {r3-r7, pc}
.balign 4
- thumb_func_start CalcMonLevel
-CalcMonLevel: ; 0x02068800
+ thumb_func_start CalcLevelBySpeciesAndExp
+CalcLevelBySpeciesAndExp: ; 0x02068800
push {r4-r6, lr}
add r4, r1, #0x0
add r5, r0, #0x0
@@ -4195,7 +4195,7 @@ CalcMonLevel: ; 0x02068800
add r6, r0, #0x0
add r1, r5, #0x0
add r2, r4, #0x0
- bl CalcMonLevelInternal
+ bl CalcLevelBySpeciesAndExp_PreloadedPersonal
add r4, r0, #0x0
add r0, r6, #0x0
bl FreeMonPersonal
@@ -4203,8 +4203,8 @@ CalcMonLevel: ; 0x02068800
pop {r4-r6, pc}
.balign 4
- thumb_func_start CalcMonLevelInternal
-CalcMonLevelInternal: ; 0x02068824
+ thumb_func_start CalcLevelBySpeciesAndExp_PreloadedPersonal
+CalcLevelBySpeciesAndExp_PreloadedPersonal: ; 0x02068824
push {r4, lr}
mov r1, #0x15
add r4, r2, #0x0
@@ -4228,27 +4228,27 @@ _02068846:
_0206884C: .word UNK_021C5AC0
_02068850: .word UNK_021C5AC0 + 4
- thumb_func_start FUN_02068854
-FUN_02068854: ; 0x02068854
- ldr r3, _02068858 ; =FUN_0206885C
+ thumb_func_start GetMonNatureEncrypted
+GetMonNatureEncrypted: ; 0x02068854
+ ldr r3, _02068858 ; =GetBoxMonNatureEncrypted
bx r3
.balign 4
-_02068858: .word FUN_0206885C
+_02068858: .word GetBoxMonNatureEncrypted
- thumb_func_start FUN_0206885C
-FUN_0206885C: ; 0x0206885C
+ thumb_func_start GetBoxMonNatureEncrypted
+GetBoxMonNatureEncrypted: ; 0x0206885C
push {r4-r6, lr}
add r5, r0, #0x0
- bl FUN_02066A6C
+ bl TryDecryptBoxMon
mov r1, #0x0
add r4, r0, #0x0
add r0, r5, #0x0
add r2, r1, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r6, r0, #0x0
add r0, r5, #0x0
add r1, r4, #0x0
- bl FUN_02066A94
+ bl TryEncryptBoxMon
add r0, r6, #0x0
bl GetNatureFromPersonality
pop {r4-r6, pc}
@@ -4264,8 +4264,8 @@ GetNatureFromPersonality: ; 0x02068884
pop {r3, pc}
.balign 4
- thumb_func_start FUN_02068894
-FUN_02068894: ; 0x02068894
+ thumb_func_start ApplyNatureModToStat
+ApplyNatureModToStat: ; 0x02068894
push {r3, lr}
cmp r2, #0x1
blo _0206889E
@@ -4277,7 +4277,7 @@ _0206889E:
_020688A2:
lsl r3, r0, #0x2
add r3, r0, r3
- ldr r0, _020688E4 ; =UNK_020F7F93
+ ldr r0, _020688E4 ; =sNatureStatMods
sub r2, r2, #0x1
add r0, r0, r3
ldrsb r2, [r2, r0]
@@ -4287,21 +4287,21 @@ _020688A2:
beq _020688CE
cmp r2, #0x1
bne _020688E0
- mov r0, #0x6e
+ mov r0, #110
mul r0, r1
lsl r0, r0, #0x10
lsr r0, r0, #0x10
- mov r1, #0x64
+ mov r1, #100
bl _s32_div_f
lsl r0, r0, #0x10
lsr r1, r0, #0x10
b _020688E0
_020688CE:
- mov r0, #0x5a
+ mov r0, #90
mul r0, r1
lsl r0, r0, #0x10
lsr r0, r0, #0x10
- mov r1, #0x64
+ mov r1, #100
bl _s32_div_f
lsl r0, r0, #0x10
lsr r1, r0, #0x10
@@ -4309,10 +4309,10 @@ _020688E0:
add r0, r1, #0x0
pop {r3, pc}
.balign 4
-_020688E4: .word UNK_020F7F93
+_020688E4: .word sNatureStatMods
- thumb_func_start FUN_020688E8
-FUN_020688E8: ; 0x020688E8
+ thumb_func_start MonApplyFriendshipModEncrypted
+MonApplyFriendshipModEncrypted: ; 0x020688E8
push {r3-r7, lr}
sub sp, #0x8
add r6, r1, #0x0
@@ -4369,7 +4369,7 @@ _0206894E:
_02068958:
lsl r0, r6, #0x1
add r1, r6, r0
- ldr r0, _020689DC ; =UNK_020F7ED4
+ ldr r0, _020689DC ; =sFriendshipModTable
add r0, r0, r1
ldrsb r4, [r4, r0]
cmp r4, #0x0
@@ -4429,13 +4429,13 @@ _020689CA:
add r0, r5, #0x0
mov r1, #0x9
add r2, sp, #0x4
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_020689D4:
add sp, #0x8
pop {r3-r7, pc}
.balign 4
_020689D8: .word SPECIES_EGG
-_020689DC: .word UNK_020F7ED4
+_020689DC: .word sFriendshipModTable
thumb_func_start FUN_020689E0
FUN_020689E0: ; 0x020689E0
@@ -4448,22 +4448,22 @@ _020689E4: .word FUN_020689E8
FUN_020689E8: ; 0x020689E8
push {r3-r7, lr}
add r5, r0, #0x0
- bl FUN_02066A6C
+ bl TryDecryptBoxMon
add r6, r0, #0x0
add r0, r5, #0x0
mov r1, #0x5
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
lsl r0, r0, #0x10
mov r1, #0x0
lsr r4, r0, #0x10
add r0, r5, #0x0
add r2, r1, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r7, r0, #0x0
add r0, r5, #0x0
add r1, r6, #0x0
- bl FUN_02066A94
+ bl TryEncryptBoxMon
add r0, r4, #0x0
add r1, r7, #0x0
bl FUN_02068A20
@@ -4539,12 +4539,12 @@ FUN_02068A88: ; 0x02068A88
mov r1, #0x7
mov r2, #0x0
add r5, r0, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
mov r1, #0x0
add r4, r0, #0x0
add r0, r5, #0x0
add r2, r1, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r1, r0, #0x0
add r0, r4, #0x0
bl FUN_02068AAC
@@ -4662,12 +4662,12 @@ FUN_02068B70: ; 0x02068B70
str r0, [sp, #0xc]
add r0, r5, #0x0
str r2, [sp, #0x10]
- bl FUN_02066A6C
+ bl TryDecryptBoxMon
str r0, [sp, #0x18]
add r0, r5, #0x0
mov r1, #0xad
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
lsl r0, r0, #0x10
lsr r4, r0, #0x10
add r0, r5, #0x0
@@ -4679,7 +4679,7 @@ FUN_02068B70: ; 0x02068B70
add r7, r0, #0x0
add r0, r5, #0x0
add r2, r1, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r6, r0, #0x0
ldr r0, _02068BF8 ; =SPECIES_EGG
cmp r4, r0
@@ -4687,7 +4687,7 @@ FUN_02068B70: ; 0x02068B70
add r0, r5, #0x0
mov r1, #0x5
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
ldr r1, _02068BFC ; =0x000001EA
cmp r0, r1
bne _02068BC6
@@ -4700,7 +4700,7 @@ _02068BCA:
add r0, r5, #0x0
mov r1, #0x70
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
lsl r0, r0, #0x18
lsr r0, r0, #0x18
_02068BD8:
@@ -4714,7 +4714,7 @@ _02068BD8:
bl FUN_02068C00
ldr r1, [sp, #0x18]
add r0, r5, #0x0
- bl FUN_02066A94
+ bl TryEncryptBoxMon
add sp, #0x1c
pop {r4-r7, pc}
nop
@@ -5040,7 +5040,7 @@ FUN_02068E1C: ; 0x02068E1C
mov r1, #0xad
mov r2, #0x0
add r5, r0, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
lsl r0, r0, #0x10
lsr r4, r0, #0x10
add r0, r5, #0x0
@@ -5049,7 +5049,7 @@ FUN_02068E1C: ; 0x02068E1C
str r0, [sp, #0x4]
add r0, r5, #0x0
add r2, r1, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r6, r0, #0x0
ldr r0, _02068E80 ; =SPECIES_EGG
cmp r4, r0
@@ -5057,7 +5057,7 @@ FUN_02068E1C: ; 0x02068E1C
add r0, r5, #0x0
mov r1, #0x5
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
ldr r1, _02068E84 ; =0x000001EA
cmp r0, r1
bne _02068E5E
@@ -5070,7 +5070,7 @@ _02068E62:
add r0, r5, #0x0
mov r1, #0x70
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
lsl r0, r0, #0x18
lsr r3, r0, #0x18
_02068E70:
@@ -5434,7 +5434,7 @@ FUN_020690D4: ; 0x020690D4
push {r3, lr}
mov r1, #0x70
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
lsl r0, r0, #0x18
lsr r0, r0, #0x18
pop {r3, pc}
@@ -5479,7 +5479,7 @@ FUN_020690E8: ; 0x020690E8
add r0, r4, #0x0
mov r1, #0x8
add r2, sp, #0x4
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_02069138:
add r0, sp, #0x0
ldrb r1, [r0, #0x0]
@@ -5497,7 +5497,7 @@ _02069146:
add r0, r4, #0x0
mov r1, #0xa0
add r2, sp, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add sp, #0x8
mov r0, #0x1
pop {r3-r5, pc}
@@ -6045,7 +6045,7 @@ ReadFromPersonalPmsNarc: ; 0x02069558
_0206956E:
add r0, sp, #0x4
bl FS_InitFile
- ldr r1, _020695A4 ; =UNK_02105FC8
+ ldr r1, _020695A4 ; =__local_str_poketool_personal_pms_narc
add r0, sp, #0x4
bl FS_OpenFile
add r0, sp, #0x4
@@ -6064,7 +6064,7 @@ _0206956E:
pop {r3-r4, pc}
nop
_020695A0: .word SPECIES_EGG
-_020695A4: .word UNK_02105FC8
+_020695A4: .word __local_str_poketool_personal_pms_narc
thumb_func_start GetEggSpecies
GetEggSpecies: ; 0x020695A8
@@ -6122,21 +6122,21 @@ FUN_020695F4: ; 0x020695F4
bl AllocFromHeap
str r0, [sp, #0x0]
add r0, r5, #0x0
- bl FUN_02066A6C
+ bl TryDecryptBoxMon
str r0, [sp, #0x4]
add r0, r5, #0x0
mov r1, #0x5
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
lsl r0, r0, #0x10
lsr r4, r0, #0x10
add r0, r5, #0x0
mov r1, #0x70
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r7, r0, #0x0
add r0, r5, #0x0
- bl FUN_020687C8
+ bl CalcBoxMonLevelEncrypted
lsl r0, r0, #0x18
lsr r6, r0, #0x18
ldr r2, [sp, #0x0]
@@ -6181,7 +6181,7 @@ _0206967C:
bl FreeToHeap
ldr r1, [sp, #0x4]
add r0, r5, #0x0
- bl FUN_02066A94
+ bl TryEncryptBoxMon
add sp, #0x8
pop {r3-r7, pc}
nop
@@ -6205,7 +6205,7 @@ FUN_020696A8: ; 0x020696A8
ldr r1, _02069700 ; =0x0000FFFF
add r6, r0, #0x0
str r1, [sp, #0x4]
- bl FUN_02066A6C
+ bl TryDecryptBoxMon
mov r4, #0x0
str r0, [sp, #0x0]
add r7, r4, #0x0
@@ -6214,7 +6214,7 @@ _020696BE:
add r0, r6, #0x0
add r1, #0x36
add r2, r7, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
lsl r0, r0, #0x10
lsr r0, r0, #0x10
bne _020696E0
@@ -6238,7 +6238,7 @@ _020696EA:
_020696F0:
ldr r1, [sp, #0x0]
add r0, r6, #0x0
- bl FUN_02066A94
+ bl TryEncryptBoxMon
ldr r0, [sp, #0x4]
add sp, #0x8
pop {r3-r7, pc}
@@ -6261,7 +6261,7 @@ FUN_02069718: ; 0x02069718
sub sp, #0x20
add r5, r0, #0x0
str r1, [sp, #0x0]
- bl FUN_02066A6C
+ bl TryDecryptBoxMon
str r0, [sp, #0xc]
add r0, sp, #0x18
mov r4, #0x0
@@ -6273,20 +6273,20 @@ _02069730:
add r0, r5, #0x0
add r1, #0x37
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
ldr r1, [sp, #0x4]
mov r2, #0x0
strh r0, [r1, #0x0]
add r1, r4, #0x0
add r0, r5, #0x0
add r1, #0x3b
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r1, r4, #0x0
strb r0, [r7, #0x0]
add r0, r5, #0x0
add r1, #0x3f
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
strb r0, [r6, #0x0]
ldr r0, [sp, #0x4]
add r4, r4, #0x1
@@ -6315,17 +6315,17 @@ _0206978A:
ldr r2, [sp, #0x8]
add r0, r5, #0x0
add r1, #0x36
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r1, r4, #0x0
add r0, r5, #0x0
add r1, #0x3a
add r2, r7, #0x0
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r1, r4, #0x0
add r0, r5, #0x0
add r1, #0x3e
add r2, r6, #0x0
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
ldr r0, [sp, #0x8]
add r4, r4, #0x1
add r0, r0, #0x2
@@ -6336,7 +6336,7 @@ _0206978A:
blt _0206978A
ldr r1, [sp, #0xc]
add r0, r5, #0x0
- bl FUN_02066A94
+ bl TryEncryptBoxMon
add sp, #0x20
pop {r3-r7, pc}
.balign 4
@@ -6357,12 +6357,12 @@ FUN_020697D4: ; 0x020697D4
add r1, #0x36
add r2, sp, #0x14
add r5, r0, #0x0
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r1, r4, #0x0
add r0, r5, #0x0
add r1, #0x3e
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
lsl r0, r0, #0x18
lsr r1, r0, #0x18
add r0, sp, #0x10
@@ -6374,7 +6374,7 @@ FUN_020697D4: ; 0x020697D4
add r0, r5, #0x0
add r1, r4, #0x0
add r2, sp, #0x0
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
pop {r3-r5}
pop {r3}
add sp, #0x10
@@ -6495,42 +6495,42 @@ FUN_020698E8: ; 0x020698E8
add r1, #0x36
mov r2, #0x0
add r5, r0, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r1, sp, #0x0
strh r0, [r1, #0x4]
add r1, r4, #0x0
add r0, r5, #0x0
add r1, #0x3a
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r1, sp, #0x0
strb r0, [r1, #0x2]
add r1, r4, #0x0
add r0, r5, #0x0
add r1, #0x3e
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r1, sp, #0x0
strb r0, [r1, #0x0]
add r1, r6, #0x0
add r0, r5, #0x0
add r1, #0x36
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r1, sp, #0x0
strh r0, [r1, #0x6]
add r1, r6, #0x0
add r0, r5, #0x0
add r1, #0x3a
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r1, sp, #0x0
strb r0, [r1, #0x3]
add r1, r6, #0x0
add r0, r5, #0x0
add r1, #0x3e
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r1, sp, #0x0
strb r0, [r1, #0x1]
add r1, r4, #0x0
@@ -6538,35 +6538,35 @@ FUN_020698E8: ; 0x020698E8
add r0, r5, #0x0
add r1, #0x36
add r2, #0x2
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r1, r4, #0x0
add r2, sp, #0x0
add r0, r5, #0x0
add r1, #0x3a
add r2, #0x3
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r4, #0x3e
add r2, sp, #0x0
add r0, r5, #0x0
add r1, r4, #0x0
add r2, #0x1
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r1, r6, #0x0
add r0, r5, #0x0
add r1, #0x36
add r2, sp, #0x4
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r1, r6, #0x0
add r2, sp, #0x0
add r0, r5, #0x0
add r1, #0x3a
add r2, #0x2
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r6, #0x3e
add r0, r5, #0x0
add r1, r6, #0x0
add r2, sp, #0x0
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add sp, #0x8
pop {r4-r6, pc}
.balign 4
@@ -6604,18 +6604,18 @@ _020699B2:
add r0, r5, #0x0
add r1, #0x36
add r2, #0x2
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r1, r4, #0x0
add r2, sp, #0x0
add r0, r5, #0x0
add r1, #0x3a
add r2, #0x1
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r1, r4, #0x0
add r0, r5, #0x0
add r1, #0x3e
add r2, sp, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r4, r4, #0x1
cmp r4, #0x3
blo _020699B2
@@ -6629,16 +6629,16 @@ _02069A0A:
add r0, r5, #0x0
mov r1, #0x39
add r2, #0x2
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, sp, #0x0
add r0, r5, #0x0
mov r1, #0x3d
add r2, #0x1
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #0x0
mov r1, #0x41
add r2, sp, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
pop {r3-r7, pc}
thumb_func_start FUN_02069A38
@@ -6696,28 +6696,28 @@ _02069A8E:
add r0, r4, #0x0
mov r1, #0x9f
add r2, sp, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r4, #0x0
mov r1, #0xa2
add r2, sp, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r4, #0x0
mov r1, #0xa3
add r2, sp, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r0, #0x0
bl FUN_020256BC
add r5, r0, #0x0
add r0, r4, #0x0
mov r1, #0xa9
add r2, r5, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #0x0
bl FreeToHeap
add r0, r4, #0x0
mov r1, #0xa1
add r2, sp, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r0, #0x0
add r1, sp, #0x4
mov r2, #0x18
@@ -6725,7 +6725,7 @@ _02069A8E:
add r0, r4, #0x0
mov r1, #0xaa
add r2, sp, #0x4
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r4, #0x0
bl FUN_02066ED8
add sp, #0x1c
@@ -6872,7 +6872,7 @@ FUN_02069BD0: ; 0x02069BD0
add r4, r1, #0x0
mov r1, #0x0
add r2, r1, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r1, r4, #0x0
bl FUN_02069BE4
pop {r4, pc}
@@ -7008,7 +7008,7 @@ _02069CD0:
strb r0, [r1, #0x0]
add r0, r4, #0x0
mov r1, #0x99
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_02069CF2:
pop {r3-r7, pc}
@@ -7115,7 +7115,7 @@ _02069DB0:
add r0, r7, #0x0
mov r1, #0x99
add r2, sp, #0x8
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_02069DBA:
ldr r0, [sp, #0x4]
add r6, r6, #0x1
@@ -7179,7 +7179,7 @@ _02069DEC:
add r0, r6, #0x0
mov r1, #0x99
add r2, sp, #0x4
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_02069E40:
ldr r0, [sp, #0x0]
cmp r4, r0
@@ -7197,7 +7197,7 @@ _02069E40:
add r0, r6, #0x0
mov r1, #0x99
add r2, sp, #0x4
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r4, r4, #0x1
_02069E6A:
add r4, r4, #0x1
@@ -7219,7 +7219,7 @@ FUN_02069E7C: ; 0x02069E7C
push {r3, lr}
mov r1, #0x99
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
mov r1, #0xf
tst r0, r1
beq _02069E90
@@ -7241,7 +7241,7 @@ FUN_02069E9C: ; 0x02069E9C
push {r3, lr}
mov r1, #0x99
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
lsl r0, r0, #0x18
lsr r1, r0, #0x18
mov r0, #0xf
@@ -7274,17 +7274,17 @@ FUN_02069ECC: ; 0x02069ECC
add r5, r0, #0x0
mov r1, #0x5
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0xa
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r6, r0, #0x0
add r0, r5, #0x0
mov r1, #0x6
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
ldr r1, _02069F20 ; =SPECIES_ARCEUS
cmp r4, r1
bne _02069F1C
@@ -7302,7 +7302,7 @@ FUN_02069ECC: ; 0x02069ECC
add r0, r5, #0x0
mov r1, #0x70
add r2, sp, #0x0
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
_02069F1C:
add sp, #0x4
pop {r3-r6, pc}
@@ -7471,13 +7471,13 @@ FUN_0206A014: ; 0x0206A014
add r0, r5, #0x0
mov r1, #0xa2
add r2, sp, #0x8
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r0, #0x0
str r0, [sp, #0x8]
add r0, r5, #0x0
mov r1, #0x9f
add r2, sp, #0x8
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_0206A050:
add sp, #0xc
pop {r3-r6, pc}
@@ -7495,15 +7495,15 @@ FUN_0206A054: ; 0x0206A054
ldr r2, _0206A090 ; =gGameVersion
add r0, r4, #0x0
mov r1, #0x79
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r4, #0x0
mov r1, #0x9a
add r2, sp, #0x18
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r4, #0x0
mov r1, #0x9d
add r2, sp, #0x20
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add sp, #0x4
pop {r3-r4}
pop {r3}
@@ -7560,7 +7560,7 @@ FUN_0206A094: ; 0x0206A094
add r0, r5, #0x0
mov r1, #0x6
add r2, #0x2
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add sp, #0x8
pop {r3-r7, pc}
_0206A104:
@@ -7577,13 +7577,13 @@ _0206A104:
add r0, r5, #0x0
mov r1, #0x6
add r2, #0x2
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add sp, #0x8
pop {r3-r7, pc}
_0206A126:
add r0, r5, #0x0
mov r1, #0x6
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_0206A12E:
add sp, #0x8
pop {r3-r7, pc}
@@ -7605,13 +7605,13 @@ FUN_0206A144: ; 0x0206A144
mov r1, #0xad
mov r2, #0x0
add r5, r0, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
lsl r0, r0, #0x10
lsr r4, r0, #0x10
add r0, r5, #0x0
mov r1, #0x70
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r1, r0, #0x0
add r0, r4, #0x0
add r2, r6, #0x0
@@ -7682,17 +7682,17 @@ FUN_0206A1CC: ; 0x0206A1CC
push {r3-r7, lr}
sub sp, #0x8
add r5, r0, #0x0
- bl FUN_02066A6C
+ bl TryDecryptBoxMon
add r7, r0, #0x0
add r0, r5, #0x0
mov r1, #0x5
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
mov r1, #0x0
add r4, r0, #0x0
add r0, r5, #0x0
add r2, r1, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r6, r0, #0x0
add r0, r4, #0x0
mov r1, #0x18
@@ -7710,23 +7710,23 @@ FUN_0206A1CC: ; 0x0206A1CC
add r0, r5, #0x0
mov r1, #0xa
add r2, sp, #0x0
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
b _0206A230
_0206A21A:
add r0, r5, #0x0
mov r1, #0xa
add r2, sp, #0x4
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
b _0206A230
_0206A226:
add r0, r5, #0x0
mov r1, #0xa
add r2, sp, #0x4
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
_0206A230:
add r0, r5, #0x0
add r1, r7, #0x0
- bl FUN_02066A94
+ bl TryEncryptBoxMon
add sp, #0x8
pop {r3-r7, pc}
@@ -7737,7 +7737,7 @@ FUN_0206A23C: ; 0x0206A23C
add r5, r0, #0x0
mov r0, #0x0
str r1, [sp, #0x0]
- bl FUN_020669C0
+ bl AllocMonZeroed
str r0, [sp, #0x4]
ldr r1, [sp, #0x4]
add r0, r5, #0x0
@@ -7787,17 +7787,17 @@ FUN_0206A23C: ; 0x0206A23C
ldrh r2, [r2, #0x6]
add r0, #0x8
mov r1, #0x80
- bl DecryptMon
+ bl MonDecryptSegment
add r0, r5, #0x0
ldr r2, [r5, #0x0]
add r0, #0x88
mov r1, #0x64
- bl DecryptMon
+ bl MonDecryptSegment
add r0, r5, #0x0
ldrh r2, [r5, #0x6]
add r0, #0x8
mov r1, #0x80
- bl DecryptMon
+ bl MonDecryptSegment
ldr r0, [sp, #0x0]
str r0, [r5, #0x0]
ldr r2, [sp, #0xc]
@@ -7854,25 +7854,25 @@ _0206A32E:
add r0, r5, #0x0
add r0, #0x8
mov r1, #0x80
- bl FUN_0206A3F8
+ bl CalcMonChecksum
strh r0, [r5, #0x6]
add r0, r5, #0x0
ldrh r2, [r5, #0x6]
add r0, #0x8
mov r1, #0x80
- bl EncryptMon
+ bl MonEncryptSegment
add r0, r5, #0x0
ldr r2, [r5, #0x0]
add r0, #0x88
mov r1, #0x64
- bl EncryptMon
+ bl MonEncryptSegment
ldr r0, [sp, #0x4]
bl FreeToHeap
add sp, #0x1c
pop {r4-r7, pc}
- thumb_func_start FUN_0206A370
-FUN_0206A370: ; 0x0206A370
+ thumb_func_start LoadMonPersonal
+LoadMonPersonal: ; 0x0206A370
ldr r3, _0206A37C ; =ReadWholeNarcMemberByIdPair
add r2, r0, #0x0
add r0, r1, #0x0
@@ -7881,8 +7881,8 @@ FUN_0206A370: ; 0x0206A370
nop
_0206A37C: .word ReadWholeNarcMemberByIdPair
- thumb_func_start LoadMonBaseStats_HandleUnownOrArceus
-LoadMonBaseStats_HandleUnownOrArceus: ; 0x0206A380
+ thumb_func_start LoadMonBaseStats_HandleAlternateForme
+LoadMonBaseStats_HandleAlternateForme: ; 0x0206A380
push {r4, lr}
add r4, r2, #0x0
bl ResolveMonForme
@@ -7902,8 +7902,8 @@ LoadMonEvolutionTable: ; 0x0206A394
nop
_0206A3A0: .word ReadWholeNarcMemberByIdPair
- thumb_func_start EncryptMon
-EncryptMon: ; 0x0206A3A4
+ thumb_func_start MonEncryptSegment
+MonEncryptSegment: ; 0x0206A3A4
push {r0-r3}
push {r3-r7, lr}
add r5, r0, #0x0
@@ -7928,12 +7928,12 @@ _0206A3C6:
bx r3
.balign 4
- thumb_func_start DecryptMon
-DecryptMon: ; 0x0206A3D0
- ldr r3, _0206A3D4 ; =EncryptMon
+ thumb_func_start MonDecryptSegment
+MonDecryptSegment: ; 0x0206A3D0
+ ldr r3, _0206A3D4 ; =MonEncryptSegment
bx r3
.balign 4
-_0206A3D4: .word EncryptMon
+_0206A3D4: .word MonEncryptSegment
thumb_func_start MonEncryptionLCRNG
MonEncryptionLCRNG: ; 0x0206A3D8
@@ -7952,8 +7952,8 @@ MonEncryptionLCRNG: ; 0x0206A3D8
_0206A3F0: .word 0x41C64E6D
_0206A3F4: .word 0x00006073
- thumb_func_start FUN_0206A3F8
-FUN_0206A3F8: ; 0x0206A3F8
+ thumb_func_start CalcMonChecksum
+CalcMonChecksum: ; 0x0206A3F8
push {r3-r4}
mov r3, #0x0
add r2, r3, #0x0
@@ -8881,7 +8881,7 @@ FUN_0206A9AC: ; 0x0206A9AC
add r0, r5, #0x0
mov r1, #0x7
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
str r0, [sp, #0x4]
add r0, r4, #0x0
bl FUN_020239CC
@@ -8889,7 +8889,7 @@ FUN_0206A9AC: ; 0x0206A9AC
add r0, r5, #0x0
mov r1, #0x9c
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
str r0, [sp, #0xc]
add r0, r4, #0x0
add r1, r6, #0x0
@@ -8903,7 +8903,7 @@ FUN_0206A9AC: ; 0x0206A9AC
mov r1, #0x90
add r2, r6, #0x0
mov r4, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
ldr r1, [sp, #0x0]
ldr r0, [sp, #0x4]
cmp r1, r0
@@ -8995,12 +8995,12 @@ FUN_0206AA84: ; 0x0206AA84
add r0, r4, #0x0
mov r1, #0xa1
add r2, sp, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, sp, #0x0
add r0, r4, #0x0
mov r1, #0xaa
add r2, #0x1
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add sp, #0x1c
pop {r3-r4, pc}
@@ -9009,7 +9009,7 @@ FUN_0206AAB4: ; 0x0206AAB4
push {r3-r7, lr}
sub sp, #0x8
add r5, r0, #0x0
- bl FUN_02066A6C
+ bl TryDecryptBoxMon
mov r4, #0x0
str r0, [sp, #0x0]
add r7, r4, #0x0
@@ -9019,27 +9019,27 @@ _0206AAC6:
add r0, r5, #0x0
add r1, #0x36
add r2, r7, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0x0
beq _0206AAF0
add r1, r4, #0x0
add r0, r5, #0x0
add r1, #0x42
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r1, r4, #0x0
strb r0, [r6, #0x0]
add r0, r5, #0x0
add r1, #0x3a
add r2, sp, #0x4
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
_0206AAF0:
add r4, r4, #0x1
cmp r4, #0x4
blt _0206AAC6
ldr r1, [sp, #0x0]
add r0, r5, #0x0
- bl FUN_02066A94
+ bl TryEncryptBoxMon
add sp, #0x8
pop {r3-r7, pc}
.balign 4
diff --git a/arm9/asm/scrcmd.s b/arm9/asm/scrcmd.s
index f3f565d9..85fd0953 100644
--- a/arm9/asm/scrcmd.s
+++ b/arm9/asm/scrcmd.s
@@ -10474,7 +10474,7 @@ FUN_0203ED2C: ; 0x0203ED2C
bl FUN_02024DA0
add r6, r0, #0x0
mov r0, #0x20
- bl FUN_020669C0
+ bl AllocMonZeroed
add r4, r0, #0x0
bl ZeroMonData
mov r0, #0x0
@@ -10727,7 +10727,7 @@ _0203EF18:
add r0, r4, #0x0
mov r1, #0x70
add r2, sp, #0x4
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r4, #0x0
bl FUN_02066ED8
add r0, r7, #0x0
diff --git a/arm9/asm/scrcmd_12.s b/arm9/asm/scrcmd_12.s
index 308f2afa..1e322258 100644
--- a/arm9/asm/scrcmd_12.s
+++ b/arm9/asm/scrcmd_12.s
@@ -396,7 +396,7 @@ _02042FE8:
add r0, r4, #0x0
mov r1, #0x6f
add r2, sp, #0x30
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r4, #0x0
mov r1, #0x4b
mov r2, #0x0
@@ -445,7 +445,7 @@ _02042FE8:
add r0, r4, #0x0
mov r1, #0x46
add r2, sp, #0x34
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r0, #0x3e
lsl r0, r0, #0x4
and r0, r6
@@ -454,7 +454,7 @@ _02042FE8:
add r0, r4, #0x0
mov r1, #0x47
add r2, sp, #0x34
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r0, #0x1f
lsl r0, r0, #0xa
and r0, r6
@@ -463,7 +463,7 @@ _02042FE8:
add r0, r4, #0x0
mov r1, #0x48
add r2, sp, #0x34
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
bl rand_LC
add r6, r0, #0x0
mov r0, #0x1f
@@ -472,7 +472,7 @@ _02042FE8:
add r0, r4, #0x0
mov r1, #0x49
add r2, sp, #0x34
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r0, #0x3e
lsl r0, r0, #0x4
and r0, r6
@@ -481,7 +481,7 @@ _02042FE8:
add r0, r4, #0x0
mov r1, #0x4a
add r2, sp, #0x34
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r0, #0x1f
lsl r0, r0, #0xa
and r0, r6
@@ -490,7 +490,7 @@ _02042FE8:
add r0, r4, #0x0
mov r1, #0x4b
add r2, sp, #0x34
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_020430DA:
ldr r0, [sp, #0x4]
ldr r0, [r0, #0xc]
@@ -621,7 +621,7 @@ _020431D4:
bl FUN_020239CC
str r0, [sp, #0x28]
mov r0, #0x20
- bl FUN_020669C0
+ bl AllocMonZeroed
add r7, r0, #0x0
add r0, r4, #0x0
add r1, r7, #0x0
@@ -629,15 +629,15 @@ _020431D4:
add r0, r7, #0x0
mov r1, #0x90
add r2, r5, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r7, #0x0
mov r1, #0x7
add r2, sp, #0x2c
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r7, #0x0
mov r1, #0x9c
add r2, sp, #0x28
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #0x0
add r4, r7, #0x0
bl FUN_02021A20
diff --git a/arm9/asm/scrcmd_13.s b/arm9/asm/scrcmd_13.s
index 276ad62e..46e1fbda 100644
--- a/arm9/asm/scrcmd_13.s
+++ b/arm9/asm/scrcmd_13.s
@@ -53,7 +53,7 @@ FUN_020438D0: ; 0x020438D0
bl FUN_02022528
add r6, r0, #0x0
mov r0, #0x20
- bl FUN_020669C0
+ bl AllocMonZeroed
add r5, r0, #0x0
add r0, r4, #0x0
bl ScriptReadHalfword
@@ -95,7 +95,7 @@ FUN_02043918: ; 0x02043918
bl FUN_02022510
str r0, [sp, #0x8]
mov r0, #0x20
- bl FUN_020669C0
+ bl AllocMonZeroed
add r4, r0, #0x0
add r0, r6, #0x0
add r0, #0x80
diff --git a/arm9/asm/scrcmd_18.s b/arm9/asm/scrcmd_18.s
index 13d8bece..f52aaf69 100644
--- a/arm9/asm/scrcmd_18.s
+++ b/arm9/asm/scrcmd_18.s
@@ -193,7 +193,7 @@ FUN_02044414: ; 0x02044414
cmp r0, #0x6
bhs _02044494
mov r0, #0xb
- bl FUN_020669C0
+ bl AllocMonZeroed
add r4, r0, #0x0
bl ZeroMonData
mov r0, #0x1
@@ -609,7 +609,7 @@ _020447D2:
pop {r4-r6, pc}
_020447F2:
add r0, r5, #0x0
- bl FUN_02068854
+ bl GetMonNatureEncrypted
strh r0, [r4, #0x0]
mov r0, #0x0
pop {r4-r6, pc}
@@ -659,7 +659,7 @@ _02044848:
cmp r0, #0x0
bne _02044874
add r0, r4, #0x0
- bl FUN_02068854
+ bl GetMonNatureEncrypted
ldr r1, [sp, #0x0]
cmp r1, r0
bne _02044874
@@ -804,7 +804,7 @@ _02044994:
add r0, r5, #0x0
mov r1, #0x9
add r2, sp, #0x4
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r0, #0x0
add sp, #0x8
pop {r3-r7, pc}
@@ -853,7 +853,7 @@ _020449FA:
add r0, r5, #0x0
mov r1, #0x9
add r2, sp, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r0, #0x0
add sp, #0x4
pop {r3-r6, pc}
@@ -1484,7 +1484,7 @@ FUN_02044F20: ; 0x02044F20
strh r2, [r1, #0x0]
mov r1, #0x6
add r2, sp, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r0, #0x0
pop {r3-r5, pc}
@@ -1777,7 +1777,7 @@ FUN_02045170: ; 0x02045170
add r1, r0, #0x0
add r0, r5, #0x0
add r2, sp, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r0, #0x0
add sp, #0x4
pop {r3-r6, pc}
diff --git a/arm9/asm/scrcmd_5.s b/arm9/asm/scrcmd_5.s
index b449fd86..bb367973 100644
--- a/arm9/asm/scrcmd_5.s
+++ b/arm9/asm/scrcmd_5.s
@@ -132,19 +132,19 @@ _02041290:
mov r1, #0x5
mov r2, #0x0
add r4, r0, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0x0
beq _020412E0
add r0, r4, #0x0
mov r1, #0x4c
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0x0
bne _020412E0
add r0, r4, #0x0
mov r1, #0x7
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
lsl r0, r0, #0x10
lsr r1, r0, #0x10
lsl r1, r1, #0x10
diff --git a/arm9/asm/unk_0200AA80.s b/arm9/asm/unk_0200AA80.s
index 351b8eab..8141cd9b 100644
--- a/arm9/asm/unk_0200AA80.s
+++ b/arm9/asm/unk_0200AA80.s
@@ -285,7 +285,7 @@ FUN_0200AC60: ; 0x0200AC60
add r0, r7, #0x0
mov r1, #0x5
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r1, r0, #0x0
ldr r2, [r5, #0xc]
add r0, r4, #0x0
@@ -309,7 +309,7 @@ FUN_0200ACA4: ; 0x0200ACA4
add r0, r2, #0x0
mov r1, #0x5
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r2, r0, #0x0
add r0, r5, #0x0
add r1, r4, #0x0
@@ -350,7 +350,7 @@ FUN_0200ACF8: ; 0x0200ACF8
add r4, r1, #0x0
ldr r2, [r5, #0xc]
mov r1, #0x76
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
ldr r2, [r5, #0xc]
add r0, r5, #0x0
add r1, r4, #0x0
@@ -367,7 +367,7 @@ FUN_0200AD18: ; 0x0200AD18
add r4, r1, #0x0
ldr r2, [r5, #0xc]
mov r1, #0x90
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
ldr r2, [r5, #0xc]
add r0, r5, #0x0
add r1, r4, #0x0
diff --git a/arm9/asm/unk_02023C40.s b/arm9/asm/unk_02023C40.s
index 04275173..a08c743c 100644
--- a/arm9/asm/unk_02023C40.s
+++ b/arm9/asm/unk_02023C40.s
@@ -26,10 +26,10 @@ FUN_02023C48: ; 0x02023C48
lsl r2, r2, #0x4
bl memset
add r0, r4, #0x0
- bl FUN_020669A0
+ bl WipeBoxMonDataAndEncrypt
add r0, r4, #0x0
add r0, #0xec
- bl FUN_020669A0
+ bl WipeBoxMonDataAndEncrypt
mov r0, #0x76
mov r1, #0x0
lsl r0, r0, #0x2
@@ -120,13 +120,13 @@ FUN_02023CC8: ; 0x02023CC8
add r5, r0, #0x0
mov r1, #0xc
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r5, #0xec
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0xc
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r4, r0
beq _02023CEA
mov r0, #0x1
@@ -187,7 +187,7 @@ _02023D38: .word 0x0000FFFF
FUN_02023D3C: ; 0x02023D3C
push {r4, lr}
add r4, r0, #0x0
- bl FUN_020669A0
+ bl WipeBoxMonDataAndEncrypt
add r0, r4, #0x0
mov r1, #0x0
add r0, #0xe8
diff --git a/arm9/asm/unk_02026CD0.s b/arm9/asm/unk_02026CD0.s
index dd0001ea..98d65c78 100644
--- a/arm9/asm/unk_02026CD0.s
+++ b/arm9/asm/unk_02026CD0.s
@@ -2125,12 +2125,12 @@ _02027B9C:
add r0, r4, #0x0
mov r1, #0x74
add r2, #0x12
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r5, #0x3b
add r0, r4, #0x0
mov r1, #0x70
add r2, r5, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add sp, #0x10
pop {r3-r5, pc}
nop
@@ -2300,12 +2300,12 @@ FUN_02027CB8: ; 0x02027CB8
add r0, r4, #0x0
mov r1, #0x74
add r2, #0xa
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r5, #0x33
add r0, r4, #0x0
mov r1, #0x70
add r2, r5, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add sp, #0x10
pop {r3-r5, pc}
.balign 4
diff --git a/arm9/asm/unk_0202B034.s b/arm9/asm/unk_0202B034.s
index 88a0df53..a72a3829 100644
--- a/arm9/asm/unk_0202B034.s
+++ b/arm9/asm/unk_0202B034.s
@@ -79,7 +79,7 @@ _0202B0BA:
add r1, r7, #0x0
bl FUN_0206B9B0
add r4, r0, #0x0
- bl FUN_020669D4
+ bl TryDecryptMon
str r0, [sp, #0xc]
add r0, r4, #0x0
mov r1, #0x4c
@@ -162,7 +162,7 @@ _0202B17C:
_0202B17E:
ldr r1, [sp, #0xc]
add r0, r4, #0x0
- bl FUN_02066A20
+ bl TryEncryptMon
ldr r0, [sp, #0x10]
add r7, r7, #0x1
cmp r7, r0
diff --git a/arm9/asm/unk_020377F0.s b/arm9/asm/unk_020377F0.s
index 5c30449f..1b513296 100644
--- a/arm9/asm/unk_020377F0.s
+++ b/arm9/asm/unk_020377F0.s
@@ -1910,7 +1910,7 @@ _02038590:
ldr r2, [r4, #0xc]
mov r1, #0x75
add r2, #0x1c
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
pop {r3-r5, pc}
_020385A8:
ldr r0, [r5, #0xc]
diff --git a/arm9/asm/unk_020476CC.s b/arm9/asm/unk_020476CC.s
index 073183fe..73e71a23 100644
--- a/arm9/asm/unk_020476CC.s
+++ b/arm9/asm/unk_020476CC.s
@@ -250,7 +250,7 @@ FUN_02047814: ; 0x02047814
add r3, r6, #0x0
bl FUN_0206ED38
add r0, r6, #0x0
- bl FUN_020669C0
+ bl AllocMonZeroed
add r6, r0, #0x0
ldr r0, [r5, #0xc]
bl FUN_020462AC
@@ -646,7 +646,7 @@ FUN_02047BC0: ; 0x02047BC0
mov r2, #0x0
bl FUN_02047A44
mov r0, #0xb
- bl FUN_020669C0
+ bl AllocMonZeroed
add r5, r0, #0x0
ldr r0, [sp, #0x14]
bl FUN_0206B9AC
@@ -682,7 +682,7 @@ _02047C40:
add r0, r5, #0x0
mov r1, #0x8
add r2, sp, #0x18
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #0x0
bl FUN_02066ED8
_02047C82:
@@ -844,7 +844,7 @@ _02047DC2:
b _02047E14
_02047DD8:
mov r0, #0xb
- bl FUN_020669C0
+ bl AllocMonZeroed
str r0, [sp, #0x8]
ldr r0, [r5, #0x4]
add r1, r4, #0x0
diff --git a/arm9/asm/unk_0204A01C.s b/arm9/asm/unk_0204A01C.s
index f9bf1b3c..83324f37 100644
--- a/arm9/asm/unk_0204A01C.s
+++ b/arm9/asm/unk_0204A01C.s
@@ -43,7 +43,7 @@ FUN_0204A048: ; 0x0204A048
bl FUN_0206BB1C
str r0, [sp, #0x18]
add r0, r5, #0x0
- bl FUN_020669C0
+ bl AllocMonZeroed
add r4, r0, #0x0
bl ZeroMonData
mov r0, #0x0
@@ -70,7 +70,7 @@ FUN_0204A048: ; 0x0204A048
add r2, sp, #0x1c
str r0, [sp, #0x1c]
add r0, r4, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [sp, #0x18]
add r1, r4, #0x0
bl FUN_0206B900
@@ -100,7 +100,7 @@ FUN_0204A0C8: ; 0x0204A0C8
bl FUN_0206BB1C
add r6, r0, #0x0
mov r0, #0x20
- bl FUN_020669C0
+ bl AllocMonZeroed
add r4, r0, #0x0
bl ZeroMonData
ldr r0, [sp, #0x20]
@@ -320,7 +320,7 @@ _0204A272:
add r0, r4, #0x0
mov r1, #0x19
add r2, sp, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_0204A292:
add r5, r5, #0x1
cmp r5, r6
@@ -370,7 +370,7 @@ _0204A2EA:
add r0, r5, #0x0
mov r1, #0xa2
add r2, sp, #0xc
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [sp, #0xc]
cmp r0, #0x1
bne _0204A306
@@ -378,7 +378,7 @@ _0204A2EA:
add r0, r5, #0x0
mov r1, #0x7
add r6, r6, #0x1
- bl FUN_020688E8
+ bl MonApplyFriendshipModEncrypted
_0204A306:
add r7, r7, #0x1
_0204A308:
@@ -426,7 +426,7 @@ FUN_0204A32C: ; 0x0204A32C
add r0, r4, #0x0
mov r1, #0x9f
add r2, sp, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add sp, #0x4
mov r0, #0x1
pop {r3-r4, pc}
diff --git a/arm9/asm/unk_0204B9EC.s b/arm9/asm/unk_0204B9EC.s
index 5889e176..2d779ce3 100644
--- a/arm9/asm/unk_0204B9EC.s
+++ b/arm9/asm/unk_0204B9EC.s
@@ -180,7 +180,7 @@ FUN_0204BB20: ; 0x0204BB20
bl FUN_02022528
str r0, [sp, #0x4]
mov r0, #0x4
- bl FUN_020669C0
+ bl AllocMonZeroed
ldr r5, [sp, #0x0]
add r4, r0, #0x0
mov r6, #0x0
@@ -473,7 +473,7 @@ FUN_0204BD40: ; 0x0204BD40
add r5, r0, #0x0
mov r0, #0x20
add r6, r1, #0x0
- bl FUN_020669C0
+ bl AllocMonZeroed
add r4, r0, #0x0
ldr r0, [r5, #0xc]
bl FUN_02022528
diff --git a/arm9/asm/unk_0204BE14.s b/arm9/asm/unk_0204BE14.s
index 794977f1..afb3bc59 100644
--- a/arm9/asm/unk_0204BE14.s
+++ b/arm9/asm/unk_0204BE14.s
@@ -497,7 +497,7 @@ _0204C138:
add r0, r6, #0x0
mov r1, #0x5
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r1, r5, r4
add r1, #0xb6
strh r0, [r1, #0x0]
diff --git a/arm9/asm/unk_020603B0.s b/arm9/asm/unk_020603B0.s
index b644f6b3..53b84d9a 100644
--- a/arm9/asm/unk_020603B0.s
+++ b/arm9/asm/unk_020603B0.s
@@ -215,7 +215,7 @@ _020604D0:
bl FUN_020238F4
str r0, [sp, #0x18]
mov r0, #0x4
- bl FUN_020669C0
+ bl AllocMonZeroed
str r0, [sp, #0x1c]
bl ZeroMonData
ldr r0, [sp, #0x18]
diff --git a/arm9/asm/unk_020606B0.s b/arm9/asm/unk_020606B0.s
index 6a271d62..013e445c 100644
--- a/arm9/asm/unk_020606B0.s
+++ b/arm9/asm/unk_020606B0.s
@@ -140,10 +140,10 @@ FUN_02060790: ; 0x02060790
str r5, [r4, #0x0]
ldr r0, [sp, #0x0]
str r6, [r4, #0x8]
- bl FUN_020669C0
+ bl AllocMonZeroed
str r0, [r4, #0x24]
ldr r0, [sp, #0x0]
- bl FUN_020669C0
+ bl AllocMonZeroed
str r0, [r4, #0x28]
ldr r1, _020607D0 ; =FUN_020606D0
add r0, r7, #0x0
diff --git a/arm9/asm/unk_02060CCC.s b/arm9/asm/unk_02060CCC.s
index f655ecb9..3018895c 100644
--- a/arm9/asm/unk_02060CCC.s
+++ b/arm9/asm/unk_02060CCC.s
@@ -479,7 +479,7 @@ FUN_02060F3C: ; 0x02060F3C
mov r0, #0x0
strb r0, [r4, #0x1f]
add r0, r5, #0x0
- bl FUN_02068854
+ bl GetMonNatureEncrypted
strb r0, [r4, #0x1e]
add r0, r4, #0x6
str r0, [sp, #0x0]
diff --git a/arm9/asm/unk_0206ABC4.s b/arm9/asm/unk_0206ABC4.s
index 456b97f6..07a7a4b6 100644
--- a/arm9/asm/unk_0206ABC4.s
+++ b/arm9/asm/unk_0206ABC4.s
@@ -340,7 +340,7 @@ FUN_0206AE0C: ; 0x0206AE0C
bl AllocFromHeap
str r0, [sp, #0x4c]
add r0, r5, #0x0
- bl FUN_020669C0
+ bl AllocMonZeroed
str r0, [sp, #0x40]
add r0, r4, r6
ldr r0, [r0, #0x18]
@@ -622,7 +622,7 @@ _0206B030:
ldr r0, [sp, #0x40]
mov r1, #0x6
add r2, r7, #0x6
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [sp, #0x34]
ldr r1, [sp, #0x40]
ldr r0, [r0, #0x4]
@@ -709,7 +709,7 @@ _0206B0DA:
ldr r0, [sp, #0x40]
mov r1, #0x6
add r2, r2, #0x6
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r7, [sp, #0x3c]
mov r6, #0x0
_0206B120:
diff --git a/arm9/asm/unk_0206B16C.s b/arm9/asm/unk_0206B16C.s
index 2dd1244b..51d7739d 100644
--- a/arm9/asm/unk_0206B16C.s
+++ b/arm9/asm/unk_0206B16C.s
@@ -28,7 +28,7 @@ _0206B188:
add r5, r6, #0x0
_0206B18C:
add r0, r5, #0x0
- bl FUN_020669A0
+ bl WipeBoxMonDataAndEncrypt
add r4, r4, #0x1
add r5, #0x88
cmp r4, #0x1e
@@ -149,7 +149,7 @@ _0206B270:
add r0, r5, #0x0
add r1, r6, #0x0
add r2, r7, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0x0
bne _0206B2A0
mov r0, #0x88
@@ -241,7 +241,7 @@ _0206B308:
mov r0, #0x88
mul r0, r2
add r0, r1, r0
- bl FUN_020669A0
+ bl WipeBoxMonDataAndEncrypt
bl FUN_02022830
pop {r3, pc}
_0206B32A:
@@ -274,7 +274,7 @@ _0206B350:
add r0, r5, #0x0
add r1, r7, #0x0
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0x0
bne _0206B364
add sp, #0x8
@@ -327,7 +327,7 @@ _0206B3A2:
add r0, r1, r0
mov r1, #0xab
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0x0
bne _0206B3C6
ldr r0, [sp, #0x0]
@@ -371,7 +371,7 @@ _0206B3F6:
add r0, r5, #0x0
add r1, r7, #0x0
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0x0
beq _0206B406
add r6, r6, #0x1
@@ -521,7 +521,7 @@ _0206B504:
add r0, r5, #0x0
add r1, r7, #0x0
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0x0
beq _0206B514
add r4, r4, #0x1
@@ -560,13 +560,13 @@ _0206B548:
add r0, r5, #0x0
add r1, r7, #0x0
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0x0
beq _0206B566
add r0, r5, #0x0
mov r1, #0x4c
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0x0
bne _0206B566
add r4, r4, #0x1
@@ -635,7 +635,7 @@ _0206B5C4:
add r0, r1, r0
ldr r2, [sp, #0x18]
add r1, r7, #0x0
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
bl FUN_02022830
pop {r3-r7, pc}
.balign 4
diff --git a/arm9/asm/unk_0206B688.s b/arm9/asm/unk_0206B688.s
index 77aac714..2e4a392b 100644
--- a/arm9/asm/unk_0206B688.s
+++ b/arm9/asm/unk_0206B688.s
@@ -46,17 +46,17 @@ UNK_020F8074: ; 0x020F8074
FUN_0206B688: ; 0x0206B688
push {r3-r7, lr}
add r5, r0, #0x0
- bl FUN_02066A6C
+ bl TryDecryptBoxMon
add r7, r0, #0x0
add r0, r5, #0x0
mov r1, #0x5
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x4c
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r6, r0, #0x0
add r0, r5, #0x0
bl FUN_0206B754
@@ -67,7 +67,7 @@ FUN_0206B688: ; 0x0206B688
add r4, r0, #0x0
add r0, r5, #0x0
add r1, r7, #0x0
- bl FUN_02066A94
+ bl TryEncryptBoxMon
add r0, r4, #0x0
pop {r3-r7, pc}
@@ -158,7 +158,7 @@ FUN_0206B754: ; 0x0206B754
mov r1, #0xad
mov r2, #0x0
add r4, r0, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
ldr r2, _0206B7B8 ; =0x0000019D
cmp r0, r2
bhi _0206B784
@@ -201,7 +201,7 @@ _0206B7A4:
add r0, r4, #0x0
mov r1, #0x70
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
lsl r0, r0, #0x10
lsr r0, r0, #0x10
pop {r4, pc}
@@ -289,7 +289,7 @@ _0206B838: .word UNK_020F8074
FUN_0206B83C: ; 0x0206B83C
push {r3-r7, lr}
add r5, r0, #0x0
- bl FUN_02066A6C
+ bl TryDecryptBoxMon
add r4, r0, #0x0
add r0, r5, #0x0
bl FUN_0206B754
@@ -297,16 +297,16 @@ FUN_0206B83C: ; 0x0206B83C
add r0, r5, #0x0
mov r1, #0x5
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
add r7, r0, #0x0
add r0, r5, #0x0
mov r1, #0x4c
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
str r0, [sp, #0x0]
add r0, r5, #0x0
add r1, r4, #0x0
- bl FUN_02066A94
+ bl TryEncryptBoxMon
ldr r2, [sp, #0x0]
add r0, r7, #0x0
add r1, r6, #0x0
diff --git a/arm9/asm/unk_0206C700.s b/arm9/asm/unk_0206C700.s
index 31ad48cb..218f8052 100644
--- a/arm9/asm/unk_0206C700.s
+++ b/arm9/asm/unk_0206C700.s
@@ -1040,7 +1040,7 @@ _0206CF7E:
ldr r0, [r4, #0x28]
mov r1, #0x5
add r2, #0x62
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [r4, #0x28]
bl FUN_0206A1C4
ldr r0, [r4, #0x28]
@@ -1117,7 +1117,7 @@ _0206CFFA:
ldr r0, [r4, #0x28]
mov r1, #0xb2
mov r2, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_0206D05E:
add r0, r4, #0x0
add r0, #0x64
@@ -1736,7 +1736,7 @@ _0206D560:
ldr r0, [r4, #0x28]
add r2, #0x66
add r1, #0x3e
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r1, r4, #0x0
add r2, r4, #0x0
add r1, #0x6c
@@ -2092,7 +2092,7 @@ _0206D86C:
b _0206D9AE
_0206D86E:
ldr r0, [r4, #0x5c]
- bl FUN_020669C0
+ bl AllocMonZeroed
add r5, r0, #0x0
ldr r0, [r4, #0x28]
add r1, r5, #0x0
@@ -2103,30 +2103,30 @@ _0206D86E:
add r0, r5, #0x0
mov r1, #0x5
add r2, sp, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r0, #0x4
str r0, [sp, #0x0]
add r0, r5, #0x0
mov r1, #0x9a
add r2, sp, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r0, #0x0
str r0, [sp, #0x0]
add r0, r5, #0x0
mov r1, #0x6
add r2, sp, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #0x0
mov r1, #0xb
add r2, sp, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r1, #0x19
str r1, [sp, #0x4]
add r6, sp, #0x0
_0206D8BA:
add r0, r5, #0x0
add r2, r6, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [sp, #0x4]
add r1, r0, #0x1
str r1, [sp, #0x4]
@@ -2138,7 +2138,7 @@ _0206D8BA:
_0206D8D2:
add r0, r5, #0x0
add r2, r6, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [sp, #0x4]
add r1, r0, #0x1
str r1, [sp, #0x4]
@@ -2150,7 +2150,7 @@ _0206D8D2:
_0206D8EA:
add r0, r5, #0x0
add r2, r6, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [sp, #0x4]
add r1, r0, #0x1
str r1, [sp, #0x4]
@@ -2159,28 +2159,28 @@ _0206D8EA:
add r0, r5, #0x0
mov r1, #0xb2
mov r2, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #0x0
mov r1, #0x4d
add r2, sp, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #0x0
mov r1, #0x9f
add r2, sp, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, [r4, #0x5c]
bl FUN_020256BC
add r6, r0, #0x0
add r0, r5, #0x0
mov r1, #0xa9
add r2, r6, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r6, #0x0
bl FreeToHeap
add r0, r5, #0x0
mov r1, #0xa1
add r2, sp, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r0, #0x0
add r1, sp, #0x8
mov r2, #0x18
@@ -2188,7 +2188,7 @@ _0206D8EA:
add r0, r5, #0x0
mov r1, #0xaa
add r2, sp, #0x8
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #0x0
bl FUN_0206A1C4
add r0, r5, #0x0
@@ -2225,7 +2225,7 @@ _0206D9A0:
ldr r0, [r4, #0x28]
mov r1, #0x6
add r2, sp, #0x4
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_0206D9AE:
add sp, #0x20
pop {r4-r6, pc}
@@ -2572,7 +2572,7 @@ FUN_0206DC80: ; 0x0206DC80
bl FUN_020073A0
str r0, [r4, #0x1c]
ldr r0, [r4, #0x5c]
- bl FUN_020669C0
+ bl AllocMonZeroed
add r5, r0, #0x0
ldr r0, [r4, #0x28]
add r1, r5, #0x0
@@ -2581,7 +2581,7 @@ FUN_0206DC80: ; 0x0206DC80
add r0, r5, #0x0
mov r1, #0x5
add r2, #0x62
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #0x0
bl FUN_02066ED8
add r0, sp, #0x10
diff --git a/arm9/asm/unk_0206F3FC.s b/arm9/asm/unk_0206F3FC.s
index 7f255340..3eb8ae5e 100644
--- a/arm9/asm/unk_0206F3FC.s
+++ b/arm9/asm/unk_0206F3FC.s
@@ -5249,7 +5249,7 @@ _02071D14:
add r2, sp, #0x0
str r1, [sp, #0x0]
mov r1, #0xa2
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r0, #0x1
pop {r3-r7, pc}
_02071D30:
@@ -5670,7 +5670,7 @@ FUN_02072080: ; 0x02072080
add r0, r5, #0x0
mov r1, #0x6
add r2, sp, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #0x0
bl FUN_02069EC4
ldr r1, _020720D8 ; =0x00000B25
@@ -5713,7 +5713,7 @@ FUN_020720E0: ; 0x020720E0
add r0, r5, #0x0
mov r1, #0x6
add r2, sp, #0x1c
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #0x0
bl FUN_02069EC4
ldr r1, _02072138 ; =0x00000B25
diff --git a/arm9/asm/unk_02073DA8.s b/arm9/asm/unk_02073DA8.s
index ef8b86b1..9afd1e10 100644
--- a/arm9/asm/unk_02073DA8.s
+++ b/arm9/asm/unk_02073DA8.s
@@ -244,7 +244,7 @@ _02073F66:
add r6, r0, #0x0
mov r1, #0x6
add r2, sp, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r6, #0x0
bl FUN_02069EC4
ldr r2, _02074058 ; =0x0000069C
@@ -631,7 +631,7 @@ FUN_020742A8: ; 0x020742A8
add r5, r0, #0x0
mov r1, #0x6
add r2, sp, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #0x0
bl FUN_02069EC4
ldr r1, _02074330 ; =0x00000B25
diff --git a/arm9/asm/unk_0207550C.s b/arm9/asm/unk_0207550C.s
index a69191eb..7186cf11 100644
--- a/arm9/asm/unk_0207550C.s
+++ b/arm9/asm/unk_0207550C.s
@@ -3080,14 +3080,14 @@ FUN_02076F2C: ; 0x02076F2C
str r0, [sp, #0x0]
add r0, r4, #0x0
add r2, sp, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r0, #0x0
add r1, r6, #0x0
str r0, [sp, #0x0]
add r0, r4, #0x0
add r1, #0x3e
add r2, sp, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, _02076FAC ; =0x000005A4
mov r1, #0x0
ldr r0, [r5, r0]
@@ -3098,7 +3098,7 @@ FUN_02076F2C: ; 0x02076F2C
add r0, r4, #0x0
add r1, r6, #0x0
add r2, sp, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r0, _02076FAC ; =0x000005A4
ldr r1, [r5, r0]
ldrh r0, [r1, #0x24]
@@ -3121,7 +3121,7 @@ _02076F98:
add r2, r0, #0x0
add r0, r4, #0x0
mov r1, #0x4
- bl FUN_020688E8
+ bl MonApplyFriendshipModEncrypted
_02076FA8:
add sp, #0x4
pop {r3-r6, pc}
diff --git a/arm9/asm/unk_020772F0.s b/arm9/asm/unk_020772F0.s
index 9cb86502..8ec0552a 100644
--- a/arm9/asm/unk_020772F0.s
+++ b/arm9/asm/unk_020772F0.s
@@ -1071,7 +1071,7 @@ FUN_02077894: ; 0x02077894
cmp r0, #0x1
bne _020778DE
mov r0, #0x12
- bl FUN_020669C0
+ bl AllocMonZeroed
mov r3, #0xa
str r3, [sp, #0x0]
str r3, [sp, #0x4]
@@ -1642,7 +1642,7 @@ _02077D88:
cmp r0, #0x1
bne _02077DCE
mov r0, #0x12
- bl FUN_020669C0
+ bl AllocMonZeroed
mov r3, #0xa
str r3, [sp, #0x0]
str r3, [sp, #0x4]
@@ -1822,7 +1822,7 @@ _02077F04:
beq _02077F50
_02077F1A:
mov r0, #0x12
- bl FUN_020669C0
+ bl AllocMonZeroed
mov r3, #0x0
str r3, [sp, #0x0]
str r3, [sp, #0x4]
diff --git a/arm9/asm/unk_02079C70.s b/arm9/asm/unk_02079C70.s
index 3175f5f9..53166d77 100644
--- a/arm9/asm/unk_02079C70.s
+++ b/arm9/asm/unk_02079C70.s
@@ -1532,7 +1532,7 @@ _0207A896:
bl FUN_0207B628
add r6, r0, #0x0
mov r0, #0x13
- bl FUN_020669C0
+ bl AllocMonZeroed
add r4, r0, #0x0
add r0, r6, #0x0
add r1, r4, #0x0
@@ -1821,7 +1821,7 @@ FUN_0207AAE0: ; 0x0207AAE0
mov r0, #0x13
add r6, r1, #0x0
add r7, r2, #0x0
- bl FUN_020669C0
+ bl AllocMonZeroed
add r4, r0, #0x0
add r0, r6, #0x0
add r1, r4, #0x0
@@ -1843,7 +1843,7 @@ FUN_0207AB0C: ; 0x0207AB0C
add r7, r0, #0x0
add r0, r6, #0x0
add r5, r2, #0x0
- bl FUN_020669D4
+ bl TryDecryptMon
str r0, [sp, #0x4]
add r0, r6, #0x0
mov r1, #0x5
@@ -2071,7 +2071,7 @@ _0207ACB2:
add r1, #0x32
strb r0, [r1, #0x0]
add r0, r6, #0x0
- bl FUN_02068854
+ bl GetMonNatureEncrypted
add r1, r5, #0x0
add r1, #0x33
strb r0, [r1, #0x0]
@@ -2308,7 +2308,7 @@ _0207AF04:
blo _0207AECC
ldr r1, [sp, #0x4]
add r0, r6, #0x0
- bl FUN_02066A20
+ bl TryEncryptMon
add sp, #0x8
pop {r3-r7, pc}
nop
@@ -3227,13 +3227,13 @@ _0207B5EC:
add r0, r6, r7
mov r1, #0x5
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0x0
beq _0207B5D0
add r0, r6, r7
mov r1, #0x4c
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0x0
beq _0207B622
add r0, r5, #0x0
diff --git a/arm9/asm/unk_0207D5BC.s b/arm9/asm/unk_0207D5BC.s
index 839b275b..43537521 100644
--- a/arm9/asm/unk_0207D5BC.s
+++ b/arm9/asm/unk_0207D5BC.s
@@ -1536,7 +1536,7 @@ FUN_0207E190: ; 0x0207E190
cmp r1, #0x2
bne _0207E1E8
mov r0, #0x13
- bl FUN_020669C0
+ bl AllocMonZeroed
add r4, r0, #0x0
add r0, r6, #0x0
add r1, r4, #0x0
diff --git a/arm9/asm/unk_0207FD00.s b/arm9/asm/unk_0207FD00.s
index 1baeda16..9e78553d 100644
--- a/arm9/asm/unk_0207FD00.s
+++ b/arm9/asm/unk_0207FD00.s
@@ -472,7 +472,7 @@ FUN_020800E0: ; 0x020800E0
push {r3-r5, lr}
add r5, r0, #0x0
ldr r0, [r5, #0xc]
- bl FUN_02068854
+ bl GetMonNatureEncrypted
add r4, r0, #0x0
cmp r4, #0x18
bgt _02080106
@@ -1484,7 +1484,7 @@ _020808E4:
add r0, r4, #0x0
mov r1, #0x4c
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0x0
bne _0208090C
add r0, r4, #0x0
@@ -1514,7 +1514,7 @@ _0208091E:
_0208092A:
mov r1, #0x4c
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0x0
bne _02080958
add r0, r4, #0x0
@@ -1575,7 +1575,7 @@ _020809B0:
add r0, r4, #0x0
mov r1, #0x4c
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0x0
bne _020809E2
add r0, r4, #0x0
@@ -1601,7 +1601,7 @@ _020809F6:
add r0, r4, #0x0
mov r1, #0x4c
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0x0
bne _02080A1E
add r0, r4, #0x0
@@ -1629,7 +1629,7 @@ _02080A30:
_02080A38:
mov r1, #0x4c
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
cmp r0, #0x0
beq _02080AE0
mov r0, #0x1
@@ -1657,39 +1657,39 @@ _02080A66:
add r0, r4, #0x0
mov r1, #0x98
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
str r0, [sp, #0x0]
add r0, r4, #0x0
mov r1, #0x97
add r2, sp, #0x0
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r4, #0x0
mov r1, #0x94
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
str r0, [sp, #0x0]
add r0, r4, #0x0
mov r1, #0x91
add r2, sp, #0x0
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r4, #0x0
mov r1, #0x95
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
str r0, [sp, #0x0]
add r0, r4, #0x0
mov r1, #0x92
add r2, sp, #0x0
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r4, #0x0
mov r1, #0x96
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
str r0, [sp, #0x0]
add r0, r4, #0x0
mov r1, #0x93
add r2, sp, #0x0
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
_02080ACC:
add r0, r4, #0x0
add r1, r5, #0x0
@@ -1723,15 +1723,15 @@ FUN_02080AE4: ; 0x02080AE4
add r0, r5, #0x0
mov r1, #0x7
add r2, sp, #0x4
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r5, #0x0
mov r1, #0x9c
add r2, sp, #0x0
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r5, #0x0
mov r1, #0x90
add r2, r4, #0x0
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r4, #0x0
bl FUN_02021A20
add sp, #0x8
@@ -1751,19 +1751,19 @@ FUN_02080B30: ; 0x02080B30
bne _02080B76
add r0, r5, #0x0
mov r1, #0x97
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r5, #0x0
mov r1, #0x91
add r2, sp, #0x0
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r5, #0x0
mov r1, #0x92
add r2, sp, #0x4
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r5, #0x0
mov r1, #0x93
add r2, sp, #0x8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add sp, #0x10
pop {r3-r5}
pop {r3}
@@ -1772,19 +1772,19 @@ FUN_02080B30: ; 0x02080B30
_02080B76:
add r0, r5, #0x0
mov r1, #0x98
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r5, #0x0
mov r1, #0x94
add r2, sp, #0x0
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r5, #0x0
mov r1, #0x95
add r2, sp, #0x4
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r5, #0x0
mov r1, #0x96
add r2, sp, #0x8
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add sp, #0x10
pop {r3-r5}
pop {r3}
@@ -1803,36 +1803,36 @@ FUN_02080BA8: ; 0x02080BA8
add r2, sp, #0x0
bne _02080BE0
mov r1, #0x97
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r4, #0x0
mov r1, #0x91
add r2, sp, #0x0
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r4, #0x0
mov r1, #0x92
add r2, sp, #0x0
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r4, #0x0
mov r1, #0x93
add r2, sp, #0x0
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add sp, #0x4
pop {r3-r4, pc}
_02080BE0:
mov r1, #0x98
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r4, #0x0
mov r1, #0x94
add r2, sp, #0x0
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r4, #0x0
mov r1, #0x95
add r2, sp, #0x0
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add r0, r4, #0x0
mov r1, #0x96
add r2, sp, #0x0
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add sp, #0x4
pop {r3-r4, pc}
@@ -1843,12 +1843,12 @@ FUN_02080C08: ; 0x02080C08
add r4, r0, #0x0
mov r1, #0xa0
mov r2, #0x0
- bl FUN_020672BC
+ bl GetBoxMonDataEncrypted
str r0, [sp, #0x0]
add r0, r4, #0x0
mov r1, #0x9b
add r2, sp, #0x0
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
add sp, #0x4
pop {r3-r4, pc}
.balign 4
@@ -1860,5 +1860,5 @@ FUN_02080C28: ; 0x02080C28
str r1, [sp, #0x0]
mov r1, #0x6e
add r2, sp, #0x0
- bl FUN_02067960
+ bl SetBoxMonDataEncrypted
pop {r3, pc}
diff --git a/arm9/asm/unk_02080C38.s b/arm9/asm/unk_02080C38.s
index 1cce712f..f40af68a 100644
--- a/arm9/asm/unk_02080C38.s
+++ b/arm9/asm/unk_02080C38.s
@@ -907,7 +907,7 @@ _020812B6:
add r5, r4, #0x0
_020812F2:
mov r0, #0x14
- bl FUN_020669C0
+ bl AllocMonZeroed
add r7, r7, #0x1
stmia r5!, {r0}
cmp r7, #0x4
@@ -3599,7 +3599,7 @@ _020826DE:
add r1, r6, #0x0
ldr r0, [r4, r0]
add r2, sp, #0x8
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_020826EA:
ldr r0, _02082848 ; =0x0000198C
ldr r0, [r4, r0]
@@ -3748,7 +3748,7 @@ _02082820:
lsl r2, r2, #0x10
mov r1, #0x9
lsr r2, r2, #0x10
- bl FUN_020688E8
+ bl MonApplyFriendshipModEncrypted
_0208283A:
add sp, #0xc
pop {r4-r7, pc}
diff --git a/arm9/asm/unk_020828BC.s b/arm9/asm/unk_020828BC.s
index 591b7226..afd66a05 100644
--- a/arm9/asm/unk_020828BC.s
+++ b/arm9/asm/unk_020828BC.s
@@ -789,7 +789,7 @@ _02082D9A:
add r0, r6, #0x0
add r1, #0x36
add r2, #0x2
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r4, r4, #0x1
add r5, r5, #0x2
cmp r4, #0x4
@@ -810,11 +810,11 @@ _02082D9A:
add r0, r6, #0x0
mov r1, #0x76
add r2, r5, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r2, [sp, #0x14]
add r0, r6, #0x0
mov r1, #0x90
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #0x0
bl FUN_02021A20
ldr r0, [sp, #0x14]
@@ -838,30 +838,30 @@ _02082D9A:
strb r1, [r0, #0x0]
add r0, r6, #0x0
mov r1, #0x13
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r6, #0x0
mov r1, #0x14
add r2, sp, #0x1c
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, sp, #0x18
add r0, r6, #0x0
mov r1, #0x15
add r2, #0x3
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, sp, #0x18
add r0, r6, #0x0
mov r1, #0x16
add r2, #0x2
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, sp, #0x18
add r0, r6, #0x0
mov r1, #0x17
add r2, #0x1
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r6, #0x0
mov r1, #0x18
add r2, sp, #0x18
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add sp, #0x20
pop {r3-r7, pc}
nop
diff --git a/arm9/asm/unk_020834D0.s b/arm9/asm/unk_020834D0.s
index 7f5a041a..ec1b74b2 100644
--- a/arm9/asm/unk_020834D0.s
+++ b/arm9/asm/unk_020834D0.s
@@ -284,7 +284,7 @@ FUN_02083694: ; 0x02083694
push {r3-r5, lr}
add r5, r2, #0x0
add r4, r3, #0x0
- bl FUN_020669BC
+ bl SizeOfStructPokemon
add r2, r0, #0x0
ldrb r1, [r5, r2]
add r0, r5, #0x0
@@ -304,7 +304,7 @@ FUN_020836BC: ; 0x020836BC
push {r3-r7, lr}
add r6, r1, #0x0
add r7, r2, #0x0
- bl FUN_020669BC
+ bl SizeOfStructPokemon
add r4, r0, #0x0
mov r0, #0x14
add r1, r4, #0x1
@@ -337,7 +337,7 @@ FUN_020836FC: ; 0x020836FC
sub sp, #0x8
str r2, [sp, #0x0]
str r3, [sp, #0x4]
- bl FUN_020669BC
+ bl SizeOfStructPokemon
mov r7, #0x0
ldr r4, [sp, #0x4]
add r6, r0, #0x0
@@ -370,7 +370,7 @@ FUN_0208373C: ; 0x0208373C
sub sp, #0x8
add r4, r0, #0x0
add r5, r1, #0x0
- bl FUN_020669BC
+ bl SizeOfStructPokemon
add r6, r0, #0x0
lsl r0, r6, #0x2
str r0, [sp, #0x0]
diff --git a/arm9/asm/unk_020842DC.s b/arm9/asm/unk_020842DC.s
index 659f3a36..705a4f7f 100644
--- a/arm9/asm/unk_020842DC.s
+++ b/arm9/asm/unk_020842DC.s
@@ -717,7 +717,7 @@ _020848C0:
add r0, r5, #0x0
mov r1, #0x9f
add r2, sp, #0x54
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r6, #0x1
_020848D4:
add r0, r5, #0x0
@@ -797,11 +797,11 @@ _0208495C:
cmp r0, #0x64
bge _020849B2
add r0, r5, #0x0
- bl FUN_020686F8
+ bl CalcMonExpToNextLevelEncrypted
add r2, r0, #0x0
add r0, r5, #0x0
mov r1, #0x8
- bl FUN_02068018
+ bl AddMonPartyStatEncrypted
add r0, r5, #0x0
bl FUN_02066ED8
ldr r0, [sp, #0x50]
@@ -985,7 +985,7 @@ _02084A66:
add r0, r5, #0x0
mov r1, #0xd
add r2, sp, #0x50
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #0x0
bl FUN_02066ED8
mov r6, #0x1
@@ -1030,7 +1030,7 @@ _02084B20:
add r0, r5, #0x0
mov r1, #0xe
add r2, sp, #0x54
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #0x0
bl FUN_02066ED8
mov r6, #0x1
@@ -1075,7 +1075,7 @@ _02084B80:
add r0, r5, #0x0
mov r1, #0xf
add r2, sp, #0x58
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #0x0
bl FUN_02066ED8
mov r6, #0x1
@@ -1120,7 +1120,7 @@ _02084BE0:
add r0, r5, #0x0
mov r1, #0x10
add r2, sp, #0x5c
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #0x0
bl FUN_02066ED8
mov r6, #0x1
@@ -1165,7 +1165,7 @@ _02084C40:
add r0, r5, #0x0
mov r1, #0x11
add r2, sp, #0x60
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #0x0
bl FUN_02066ED8
mov r6, #0x1
@@ -1210,7 +1210,7 @@ _02084CA0:
add r0, r5, #0x0
mov r1, #0x12
add r2, sp, #0x64
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #0x0
bl FUN_02066ED8
mov r6, #0x1
@@ -1429,7 +1429,7 @@ _02084EA8:
ldr r1, [sp, #0x0]
add r0, r6, #0x0
add r2, sp, #0x4
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add sp, #0x8
mov r0, #0x1
pop {r3-r7, pc}
@@ -1511,12 +1511,12 @@ _02084F34:
ldr r1, [sp, #0x0]
add r0, r5, #0x0
add r2, sp, #0x8
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r2, sp, #0x8
add r0, r5, #0x0
add r1, r4, #0x0
add r2, #0x1
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r0, #0x1
add sp, #0xc
pop {r4-r7, pc}
@@ -1556,7 +1556,7 @@ _02084F96:
_02084F98:
mov r1, #0xa2
add r2, sp, #0xc
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
pop {r3}
pop {r3}
add sp, #0x10
@@ -1775,7 +1775,7 @@ _0208512C:
add r0, r5, #0x0
mov r1, #0x9
add r2, sp, #0x18
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r0, #0x1
pop {r4-r6}
pop {r3}
@@ -1811,13 +1811,13 @@ _02085154:
add r0, r5, #0x0
mov r1, #0xa2
add r2, sp, #0x8
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r0, #0x0
str r0, [sp, #0x8]
add r0, r5, #0x0
mov r1, #0x9f
add r2, sp, #0x8
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r4, #0x0
_02085190:
add r0, r5, #0x0
diff --git a/arm9/asm/unk_020854E0.s b/arm9/asm/unk_020854E0.s
index 76d5564d..0921775e 100644
--- a/arm9/asm/unk_020854E0.s
+++ b/arm9/asm/unk_020854E0.s
@@ -180,7 +180,7 @@ _0208561E:
ldr r2, [r5, #0x14]
add r0, r4, #0x0
mov r1, #0xa9
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r0, #0x1
pop {r3-r5, pc}
@@ -229,11 +229,11 @@ FUN_02085644: ; 0x02085644
add r0, r5, #0x0
mov r1, #0xa9
add r2, r4, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #0x0
mov r1, #0x6
add r2, sp, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r4, #0x0
bl FreeToHeap
add r0, r6, #0x0
@@ -262,11 +262,11 @@ _020856BC:
add r0, r4, #0x0
mov r1, #0xa9
add r2, r6, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r4, #0x0
mov r1, #0x6
add r2, sp, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r7, #0x0
mov r1, #0x0
add r2, r5, #0x0
diff --git a/arm9/asm/unk_020859C0.s b/arm9/asm/unk_020859C0.s
index 1a2050fe..ed131b94 100644
--- a/arm9/asm/unk_020859C0.s
+++ b/arm9/asm/unk_020859C0.s
@@ -113,7 +113,7 @@ FUN_020859C0: ; 0x020859C0
bl FUN_0200628C
str r0, [r4, #0x0]
mov r0, #0x35
- bl FUN_020669C0
+ bl AllocMonZeroed
ldr r1, _02085BA4 ; =0x00000428
mov r2, #0xff
str r0, [r4, r1]
@@ -675,7 +675,7 @@ _02085EA6:
mov r1, #0xa1
add r2, sp, #0x8
add r5, r0, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r1, [sp, #0x8]
ldr r0, [r7, #0x20]
sub r1, r1, #0x1
@@ -683,7 +683,7 @@ _02085EA6:
add r2, r0, #0x0
add r0, r5, #0x0
mov r1, #0xaa
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
ldr r1, [sp, #0x8]
ldr r0, [r7, #0x20]
sub r1, r1, #0x1
diff --git a/arm9/asm/unk_02086084.s b/arm9/asm/unk_02086084.s
index 51a7378c..8a6d5079 100644
--- a/arm9/asm/unk_02086084.s
+++ b/arm9/asm/unk_02086084.s
@@ -286,7 +286,7 @@ _020862D6:
add r0, r5, #0x0
mov r1, #0x4c
add r2, sp, #0x8
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
mov r0, #0xb
str r0, [sp, #0x0]
ldr r3, [sp, #0x4]
@@ -297,7 +297,7 @@ _020862D6:
add r0, r5, #0x0
mov r1, #0xb2
mov r2, #0x0
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r6, #0x0
bl FUN_020377AC
ldr r1, [r4, #0xc]
@@ -359,7 +359,7 @@ _02086396:
ldr r0, [r4, #0xc]
ldr r2, [r2, #0x18]
mov r1, #0x77
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_020863A8:
ldr r0, [r4, #0x8]
bl FUN_02077AC4
diff --git a/arm9/asm/unk_02086414.s b/arm9/asm/unk_02086414.s
index 73ff0ee5..184e3bfd 100644
--- a/arm9/asm/unk_02086414.s
+++ b/arm9/asm/unk_02086414.s
@@ -1452,7 +1452,7 @@ FUN_02086EE8: ; 0x02086EE8
add r0, r4, #0x0
mov r1, #0x4c
add r2, sp, #0x10
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, sp, #0x28
add r1, r4, #0x0
mov r2, #0x2
@@ -1491,7 +1491,7 @@ FUN_02086F4C: ; 0x02086F4C
add r4, r0, #0x0
ldr r0, [r5, #0x0]
ldr r0, [r0, #0xc]
- bl FUN_02068854
+ bl GetMonNatureEncrypted
add r6, r0, #0x0
ldr r0, [r5, #0x68]
mov r1, #0x1
diff --git a/arm9/asm/unk_02087D00.s b/arm9/asm/unk_02087D00.s
index a5a9b7c9..c3c27acb 100644
--- a/arm9/asm/unk_02087D00.s
+++ b/arm9/asm/unk_02087D00.s
@@ -704,7 +704,7 @@ FUN_0208821C: ; 0x0208821C
add r6, r1, #0x0
add r4, r0, #0x0
add r0, r6, #0x0
- bl FUN_02068854
+ bl GetMonNatureEncrypted
lsl r1, r0, #0x1
ldr r0, _02088310 ; =UNK_020FD17C
ldrb r0, [r0, r1]
@@ -791,7 +791,7 @@ _020882D4:
add r0, r6, #0x0
add r1, #0x13
add r2, r4, r2
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
add r0, r5, #0x1
lsl r0, r0, #0x18
lsr r5, r0, #0x18
@@ -811,7 +811,7 @@ _020882D4:
add r0, r6, #0x0
mov r1, #0x9
add r2, sp, #0x8
- bl SetBoxMonDataEncrypted
+ bl SetMonDataEncrypted
_0208830C:
add sp, #0x30
pop {r3-r7, pc}
diff --git a/arm9/global.inc b/arm9/global.inc
index b1937f13..41e237b6 100644
--- a/arm9/global.inc
+++ b/arm9/global.inc
@@ -4705,42 +4705,42 @@
.extern FUN_02066818
.extern FUN_02066840
.extern ZeroMonData
-.extern FUN_020669A0
-.extern FUN_020669BC
-.extern FUN_020669C0
-.extern FUN_020669D4
-.extern FUN_02066A20
-.extern FUN_02066A6C
-.extern FUN_02066A94
+.extern WipeBoxMonDataAndEncrypt
+.extern SizeOfStructPokemon
+.extern AllocMonZeroed
+.extern TryDecryptMon
+.extern TryEncryptMon
+.extern TryDecryptBoxMon
+.extern TryEncryptBoxMon
.extern CreateMon
.extern CreateMonWithNature
.extern FUN_02066DD4
.extern FUN_02066E74
.extern FUN_02066EA4
.extern FUN_02066ED8
-.extern FUN_02066F04
+.extern CalcMonStatsMaybeEncrypted
.extern GetMonDataEncrypted
-.extern FUN_020672BC
+.extern GetBoxMonDataEncrypted
+.extern SetMonDataEncrypted
.extern SetBoxMonDataEncrypted
-.extern FUN_02067960
-.extern FUN_02068018
+.extern AddMonPartyStatEncrypted
.extern AllocAndLoadMonPersonal
.extern GetPersonalAttr
.extern FreeMonPersonal
.extern GetMonBaseStat_HandleFormeConversion
.extern GetMonBaseStat
.extern FUN_02068698
-.extern FUN_020686F8
+.extern CalcMonExpToNextLevelEncrypted
.extern FUN_02068734
.extern GetMonExpByLevel
-.extern FUN_020687C0
-.extern FUN_020687C8
-.extern CalcMonLevel
-.extern CalcMonLevelInternal
-.extern FUN_02068854
-.extern FUN_0206885C
+.extern CalcMonLevelEncrypted
+.extern CalcBoxMonLevelEncrypted
+.extern CalcLevelBySpeciesAndExp
+.extern CalcLevelBySpeciesAndExp_PreloadedPersonal
+.extern GetMonNatureEncrypted
+.extern GetBoxMonNatureEncrypted
.extern GetNatureFromPersonality
-.extern FUN_020688E8
+.extern MonApplyFriendshipModEncrypted
.extern FUN_020689E0
.extern FUN_020689E8
.extern FUN_02068A20
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
diff --git a/include/pokemon.h b/include/pokemon.h
index edb8c146..7f875770 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -259,18 +259,16 @@ typedef union {
struct BoxPokemon {
/* 0x000 */ u32 personalityValue;
- /* 0x004 */ u16 control_4_0:1;
+ /* 0x004 */ u16 no_encrypt:1;
u16 control_4_1:1;
u16 control_4_2:1;
u16 Unused:13; // Might be used for validity checks
/* 0x006 */ u16 checksum; // Stored checksum of pokemon
- /* 0x008 */ PokemonDataBlock block1; // Blocks A-D; Order based on personalityValue
- /* 0x028 */ PokemonDataBlock block2;
- /* 0x048 */ PokemonDataBlock block3;
- /* 0x068 */ PokemonDataBlock block4;
+ /* 0x008 */ PokemonDataBlock box[4];
};
-struct Pokemon {
+struct PartyPokemon
+{
/* 0x000 */ struct BoxPokemon box;
/* 0x088 */ u8 slp:3;
u8 psn:1;
@@ -291,6 +289,11 @@ struct Pokemon {
/* 0x09A */ u16 spdef;
/* 0x09C */ u8 filler9C[0x38];
/* 0x0D4 */ u8 sealCoords[0x18];
+};
+
+struct Pokemon {
+ /* 0x000 */ struct BoxPokemon box;
+ /* 0x088 */ struct PartyPokemon party;
}; // size: 0xEC
int GetMonBaseStat_HandleFormeConversion(int species, int form, int stat_id);
@@ -298,6 +301,6 @@ int GetMonBaseStat(int species, int stat_id);
int GetMonExpByLevel(int species, int level);
void LoadGrowthTable(int species, int * table);
int GetExpByGrowthRateAndLevel(int rate, int level);
-int CalcMonLevel(int species, int experience);
+int CalcLevelBySpeciesAndExp(int species, int experience);
#endif //POKEDIAMOND_POKEMON_H