through GenPersonalityByGenderAndNature

7 files changed, 18 insertions, 564 deletions

diff --git a/arm9/asm/pokemon_s.s b/arm9/asm/pokemon_s.s
index 2395e7f1..97650972 100644
--- a/arm9/asm/pokemon_s.s
+++ b/arm9/asm/pokemon_s.s
@@ -116,552 +116,6 @@ UNK_021C5AC0: ; 0x021C5AC0
 
 	.text
 
-	thumb_func_start TryEncryptMon
-TryEncryptMon: ; 0x02066A20
-	push {r3-r5, lr}
-	add r5, r0, #0x0
-	ldrh r2, [r5, #0x4]
-	mov r4, #0x0
-	lsl r0, r2, #0x1f
-	lsr r0, r0, #0x1f
-	cmp r0, #0x1
-	bne _02066A68
-	cmp r1, #0x1
-	bne _02066A68
-	mov r0, #0x1
-	bic r2, r0
-	strh r2, [r5, #0x4]
-	ldrh r1, [r5, #0x4]
-	mov r0, #0x2
-	mov r4, #0x1
-	bic r1, r0
-	strh r1, [r5, #0x4]
-	add r0, r5, #0x0
-	ldr r2, [r5, #0x0]
-	add r0, #0x88
-	mov r1, #0x64
-	bl MonEncryptSegment
-	add r0, r5, #0x0
-	add r0, #0x8
-	mov r1, #0x80
-	bl CalcMonChecksum
-	strh r0, [r5, #0x6]
-	add r0, r5, #0x0
-	ldrh r2, [r5, #0x6]
-	add r0, #0x8
-	mov r1, #0x80
-	bl MonEncryptSegment
-_02066A68:
-	add r0, r4, #0x0
-	pop {r3-r5, pc}
-
-	thumb_func_start TryDecryptBoxMon
-TryDecryptBoxMon: ; 0x02066A6C
-	push {r4, lr}
-	add r2, r0, #0x0
-	ldrh r1, [r2, #0x4]
-	mov r4, #0x0
-	lsl r0, r1, #0x1e
-	lsr r0, r0, #0x1f
-	bne _02066A8E
-	mov r0, #0x2
-	orr r0, r1
-	strh r0, [r2, #0x4]
-	add r0, r2, #0x0
-	ldrh r2, [r2, #0x6]
-	add r0, #0x8
-	mov r1, #0x80
-	mov r4, #0x1
-	bl MonDecryptSegment
-_02066A8E:
-	add r0, r4, #0x0
-	pop {r4, pc}
-	.balign 4
-
-	thumb_func_start TryEncryptBoxMon
-TryEncryptBoxMon: ; 0x02066A94
-	push {r3-r5, lr}
-	add r5, r0, #0x0
-	ldrh r2, [r5, #0x4]
-	mov r4, #0x0
-	lsl r0, r2, #0x1e
-	lsr r0, r0, #0x1f
-	cmp r0, #0x1
-	bne _02066AC8
-	cmp r1, #0x1
-	bne _02066AC8
-	mov r0, #0x2
-	bic r2, r0
-	add r0, r5, #0x0
-	strh r2, [r5, #0x4]
-	add r0, #0x8
-	mov r1, #0x80
-	mov r4, #0x1
-	bl CalcMonChecksum
-	strh r0, [r5, #0x6]
-	add r0, r5, #0x0
-	ldrh r2, [r5, #0x6]
-	add r0, #0x8
-	mov r1, #0x80
-	bl MonEncryptSegment
-_02066AC8:
-	add r0, r4, #0x0
-	pop {r3-r5, pc}
-
-	thumb_func_start CreateMon
-CreateMon: ; 0x02066ACC
-	push {r0-r3}
-	push {r3-r6, lr}
-	sub sp, #0x2c
-	add r5, r0, #0x0
-	add r4, r1, #0x0
-	add r6, r3, #0x0
-	bl ZeroMonData
-	ldr r0, [sp, #0x50]
-	add r1, r4, #0x0
-	str r0, [sp, #0x0]
-	ldr r0, [sp, #0x54]
-	add r3, r6, #0x0
-	str r0, [sp, #0x4]
-	ldr r0, [sp, #0x58]
-	str r0, [sp, #0x8]
-	ldr r0, [sp, #0x5c]
-	str r0, [sp, #0xc]
-	ldr r2, [sp, #0x48]
-	add r0, r5, #0x0
-	bl CreateBoxMon
-	add r0, r5, #0x0
-	add r0, #0x88
-	mov r1, #0x64
-	mov r2, #0x0
-	bl MonEncryptSegment
-	add r0, r5, #0x0
-	ldr r2, [r5, #0x0]
-	add r0, #0x88
-	mov r1, #0x64
-	bl MonEncryptSegment
-	add r0, r5, #0x0
-	mov r1, #0xa0
-	add r2, sp, #0x48
-	bl SetMonDataEncrypted
-	mov r0, #0x0
-	bl CreateNewSealsObject
-	add r4, r0, #0x0
-	add r0, r5, #0x0
-	mov r1, #0xa9
-	add r2, r4, #0x0
-	bl SetMonDataEncrypted
-	add r0, r4, #0x0
-	bl FreeToHeap
-	mov r0, #0x0
-	str r0, [sp, #0x10]
-	add r0, r5, #0x0
-	mov r1, #0xa1
-	add r2, sp, #0x10
-	bl SetMonDataEncrypted
-	mov r0, #0x0
-	add r1, sp, #0x14
-	mov r2, #0x18
-	bl MIi_CpuClearFast
-	add r0, r5, #0x0
-	mov r1, #0xaa
-	add r2, sp, #0x14
-	bl SetMonDataEncrypted
-	add r0, r5, #0x0
-	bl UpdateMonLevelAndRecalcStats
-	add sp, #0x2c
-	pop {r3-r6}
-	pop {r3}
-	add sp, #0x10
-	bx r3
-
-	thumb_func_start CreateBoxMon
-CreateBoxMon: ; 0x02066B64
-	push {r0-r3}
-	push {r4-r7, lr}
-	sub sp, #0xc
-	add r5, r0, #0x0
-	bl ZeroBoxMonData
-	add r0, r5, #0x0
-	bl TryDecryptBoxMon
-	str r0, [sp, #0x0]
-	ldr r0, [sp, #0x30]
-	cmp r0, #0x0
-	bne _02066B8E
-	bl rand_LC
-	add r4, r0, #0x0
-	bl rand_LC
-	lsl r0, r0, #0x10
-	orr r0, r4
-	str r0, [sp, #0x34]
-_02066B8E:
-	add r0, r5, #0x0
-	mov r1, #0x0
-	add r2, sp, #0x34
-	bl SetBoxMonDataEncrypted
-	// If otIdType == 2, generate a random OT ID that prevents shininess
-	ldr r0, [sp, #0x38]
-	cmp r0, #0x2
-	bne _02066BD6
-	ldr r7, _02066D84 ; =0xFFFF0000
-	add r6, r7, #0x0
-_02066BA2:
-	bl rand_LC
-	add r4, r0, #0x0
-	bl rand_LC
-	ldr r1, [sp, #0x34]
-	lsl r0, r0, #0x10
-	add r3, r4, #0x0
-	orr r3, r0
-	lsl r0, r1, #0x10
-	lsr r2, r0, #0x10
-	add r0, r1, #0x0
-	and r0, r7
-	lsr r1, r0, #0x10
-	add r0, r3, #0x0
-	str r3, [sp, #0x3c]
-	and r0, r6
-	lsl r3, r3, #0x10
-	lsr r0, r0, #0x10
-	lsr r3, r3, #0x10
-	eor r0, r3
-	eor r0, r1
-	eor r0, r2
-	cmp r0, #0x8
-	blo _02066BA2
-	b _02066BDE
-_02066BD6:
-	cmp r0, #0x1
-	beq _02066BDE
-	mov r0, #0x0
-	str r0, [sp, #0x3c]
-_02066BDE:
-	add r0, r5, #0x0
-	mov r1, #0x7
-	add r2, sp, #0x3c
-	bl SetBoxMonDataEncrypted
-	ldr r2, _02066D88 ; =gGameLanguage
-	add r0, r5, #0x0
-	mov r1, #0xc
-	bl SetBoxMonDataEncrypted
-	add r0, r5, #0x0
-	mov r1, #0x5
-	add r2, sp, #0x24
-	bl SetBoxMonDataEncrypted
-	add r0, r5, #0x0
-	mov r1, #0xb2
-	mov r2, #0x0
-	bl SetBoxMonDataEncrypted
-	ldr r0, [sp, #0x24]
-	ldr r1, [sp, #0x28]
-	bl GetMonExpBySpeciesAndLevel
-	str r0, [sp, #0x8]
-	add r0, r5, #0x0
-	mov r1, #0x8
-	add r2, sp, #0x8
-	bl SetBoxMonDataEncrypted
-	ldr r0, [sp, #0x24]
-	mov r1, #0x14
-	bl GetMonBaseStat
-	str r0, [sp, #0x8]
-	add r0, r5, #0x0
-	mov r1, #0x9
-	add r2, sp, #0x8
-	bl SetBoxMonDataEncrypted
-	add r0, r5, #0x0
-	mov r1, #0x9b
-	add r2, sp, #0x28
-	bl SetBoxMonDataEncrypted
-	ldr r2, _02066D8C ; =gGameVersion
-	add r0, r5, #0x0
-	mov r1, #0x79
-	bl SetBoxMonDataEncrypted
-	mov r0, #0x4
-	str r0, [sp, #0x8]
-	add r0, r5, #0x0
-	mov r1, #0x9a
-	add r2, sp, #0x8
-	bl SetBoxMonDataEncrypted
-	ldr r0, [sp, #0x2c]
-	cmp r0, #0x20
-	bge _02066C94
-	add r0, r5, #0x0
-	mov r1, #0x46
-	add r2, sp, #0x2c
-	bl SetBoxMonDataEncrypted
-	add r0, r5, #0x0
-	mov r1, #0x47
-	add r2, sp, #0x2c
-	bl SetBoxMonDataEncrypted
-	add r0, r5, #0x0
-	mov r1, #0x48
-	add r2, sp, #0x2c
-	bl SetBoxMonDataEncrypted
-	add r0, r5, #0x0
-	mov r1, #0x49
-	add r2, sp, #0x2c
-	bl SetBoxMonDataEncrypted
-	add r0, r5, #0x0
-	mov r1, #0x4a
-	add r2, sp, #0x2c
-	bl SetBoxMonDataEncrypted
-	add r0, r5, #0x0
-	mov r1, #0x4b
-	add r2, sp, #0x2c
-	bl SetBoxMonDataEncrypted
-	b _02066D18
-_02066C94:
-	bl rand_LC
-	mov r1, #0x1f
-	str r0, [sp, #0x8]
-	and r0, r1
-	str r0, [sp, #0x4]
-	add r0, r5, #0x0
-	mov r1, #0x46
-	add r2, sp, #0x4
-	bl SetBoxMonDataEncrypted
-	mov r0, #0x3e
-	ldr r1, [sp, #0x8]
-	lsl r0, r0, #0x4
-	and r0, r1
-	lsr r0, r0, #0x5
-	str r0, [sp, #0x4]
-	add r0, r5, #0x0
-	mov r1, #0x47
-	add r2, sp, #0x4
-	bl SetBoxMonDataEncrypted
-	mov r0, #0x1f
-	ldr r1, [sp, #0x8]
-	lsl r0, r0, #0xa
-	and r0, r1
-	lsr r0, r0, #0xa
-	str r0, [sp, #0x4]
-	add r0, r5, #0x0
-	mov r1, #0x48
-	add r2, sp, #0x4
-	bl SetBoxMonDataEncrypted
-	bl rand_LC
-	mov r1, #0x1f
-	str r0, [sp, #0x8]
-	and r0, r1
-	str r0, [sp, #0x4]
-	add r0, r5, #0x0
-	mov r1, #0x49
-	add r2, sp, #0x4
-	bl SetBoxMonDataEncrypted
-	mov r0, #0x3e
-	ldr r1, [sp, #0x8]
-	lsl r0, r0, #0x4
-	and r0, r1
-	lsr r0, r0, #0x5
-	str r0, [sp, #0x4]
-	add r0, r5, #0x0
-	mov r1, #0x4a
-	add r2, sp, #0x4
-	bl SetBoxMonDataEncrypted
-	mov r0, #0x1f
-	ldr r1, [sp, #0x8]
-	lsl r0, r0, #0xa
-	and r0, r1
-	lsr r0, r0, #0xa
-	str r0, [sp, #0x4]
-	add r0, r5, #0x0
-	mov r1, #0x4b
-	add r2, sp, #0x4
-	bl SetBoxMonDataEncrypted
-_02066D18:
-	ldr r0, [sp, #0x24]
-	mov r1, #0x18
-	bl GetMonBaseStat
-	str r0, [sp, #0x8]
-	ldr r0, [sp, #0x24]
-	mov r1, #0x19
-	bl GetMonBaseStat
-	str r0, [sp, #0x4]
-	cmp r0, #0x0
-	beq _02066D50
-	ldr r1, [sp, #0x34]
-	mov r0, #0x1
-	tst r0, r1
-	beq _02066D44
-	add r0, r5, #0x0
-	mov r1, #0xa
-	add r2, sp, #0x4
-	bl SetBoxMonDataEncrypted
-	b _02066D5A
-_02066D44:
-	add r0, r5, #0x0
-	mov r1, #0xa
-	add r2, sp, #0x8
-	bl SetBoxMonDataEncrypted
-	b _02066D5A
-_02066D50:
-	add r0, r5, #0x0
-	mov r1, #0xa
-	add r2, sp, #0x8
-	bl SetBoxMonDataEncrypted
-_02066D5A:
-	add r0, r5, #0x0
-	bl GetBoxMonGenderEncrypted
-	str r0, [sp, #0x8]
-	add r0, r5, #0x0
-	mov r1, #0x6f
-	add r2, sp, #0x8
-	bl SetBoxMonDataEncrypted
-	add r0, r5, #0x0
-	bl InitBoxMonMoveset
-	ldr r1, [sp, #0x0]
-	add r0, r5, #0x0
-	bl TryEncryptBoxMon
-	add sp, #0xc
-	pop {r4-r7}
-	pop {r3}
-	add sp, #0x10
-	bx r3
-	.balign 4
-_02066D84: .word 0xFFFF0000
-_02066D88: .word gGameLanguage
-_02066D8C: .word gGameVersion
-
-	thumb_func_start CreateMonWithNature
-CreateMonWithNature: ; 0x02066D90
-	push {r3-r7, lr}
-	sub sp, #0x18
-	str r2, [sp, #0x10]
-	str r3, [sp, #0x14]
-	ldr r4, [sp, #0x30]
-	add r6, r0, #0x0
-	add r7, r1, #0x0
-_02066D9E:
-	bl rand_LC
-	add r5, r0, #0x0
-	bl rand_LC
-	lsl r0, r0, #0x10
-	orr r5, r0
-	add r0, r5, #0x0
-	bl GetNatureFromPersonality
-	cmp r4, r0
-	bne _02066D9E
-	mov r0, #0x1
-	str r0, [sp, #0x0]
-	str r5, [sp, #0x4]
-	mov r0, #0x0
-	str r0, [sp, #0x8]
-	str r0, [sp, #0xc]
-	ldr r2, [sp, #0x10]
-	ldr r3, [sp, #0x14]
-	add r0, r6, #0x0
-	add r1, r7, #0x0
-	bl CreateMon
-	add sp, #0x18
-	pop {r3-r7, pc}
-	.balign 4
-
-	thumb_func_start CreateMonWithNatureGenderLetter
-CreateMonWithNatureGenderLetter: ; 0x02066DD4
-	push {r4-r7, lr}
-	sub sp, #0x24
-	str r1, [sp, #0x14]
-	str r2, [sp, #0x18]
-	str r3, [sp, #0x1c]
-	str r0, [sp, #0x10]
-	add r0, sp, #0x28
-	ldrb r0, [r0, #0x18]
-	ldr r6, [sp, #0x38]
-	ldr r7, [sp, #0x3c]
-	cmp r0, #0x0
-	beq _02066E4C
-	cmp r0, #0x1d
-	bhs _02066E4C
-	sub r0, r0, #0x1
-	str r0, [sp, #0x20]
-_02066DF4:
-	bl rand_LC
-	add r4, r0, #0x0
-	bl rand_LC
-	lsl r0, r0, #0x10
-	orr r4, r0
-	mov r3, #0x3
-	lsl r3, r3, #0x10
-	and r3, r4
-	mov r0, #0x3
-	add r2, r4, #0x0
-	and r2, r0
-	lsl r0, r0, #0x8
-	and r0, r4
-	lsr r1, r0, #0x6
-	mov r0, #0x3
-	lsl r0, r0, #0x18
-	and r0, r4
-	lsr r0, r0, #0x12
-	lsr r3, r3, #0xc
-	orr r0, r3
-	orr r0, r1
-	orr r0, r2
-	mov r1, #0x1c
-	bl _u32_div_f
-	lsl r0, r1, #0x10
-	lsr r5, r0, #0x10
-	add r0, r4, #0x0
-	bl GetNatureFromPersonality
-	cmp r7, r0
-	bne _02066DF4
-	ldr r0, [sp, #0x14]
-	add r1, r4, #0x0
-	bl GetGenderBySpeciesAndPersonality
-	cmp r6, r0
-	bne _02066DF4
-	ldr r0, [sp, #0x20]
-	cmp r5, r0
-	bne _02066DF4
-	b _02066E58
-_02066E4C:
-	ldr r0, [sp, #0x14]
-	add r1, r6, #0x0
-	add r2, r7, #0x0
-	bl AdjustPersonalityToForceGenderAndNature
-	add r4, r0, #0x0
-_02066E58:
-	mov r0, #0x1
-	str r0, [sp, #0x0]
-	str r4, [sp, #0x4]
-	mov r0, #0x0
-	str r0, [sp, #0x8]
-	str r0, [sp, #0xc]
-	ldr r0, [sp, #0x10]
-	ldr r1, [sp, #0x14]
-	ldr r2, [sp, #0x18]
-	ldr r3, [sp, #0x1c]
-	bl CreateMon
-	add sp, #0x24
-	pop {r4-r7, pc}
-
-	thumb_func_start AdjustPersonalityToForceGenderAndNature
-AdjustPersonalityToForceGenderAndNature: ; 0x02066E74
-	push {r3-r5, lr}
-	add r5, r1, #0x0
-	mov r1, #0x12
-	add r4, r2, #0x0
-	bl GetMonBaseStat
-	lsl r0, r0, #0x18
-	lsr r0, r0, #0x18
-	beq _02066EA0
-	cmp r0, #0xfe
-	beq _02066EA0
-	cmp r0, #0xff
-	beq _02066EA0
-	cmp r5, #0x0
-	bne _02066EA0
-	mov r1, #0x19
-	bl _s32_div_f
-	add r1, r0, #0x1
-	mov r0, #0x19
-	mul r0, r1
-	add r4, r0, r4
-_02066EA0:
-	add r0, r4, #0x0
-	pop {r3-r5, pc}
-
 	thumb_func_start CreateMonWithFixedIVs
 CreateMonWithFixedIVs: ; 0x02066EA4
 	push {r0-r3}
@@ -681,15 +135,15 @@ CreateMonWithFixedIVs: ; 0x02066EA4
 	add r2, sp, #0x24
 	bl SetMonDataEncrypted
 	add r0, r4, #0x0
-	bl UpdateMonLevelAndRecalcStats
+	bl CalcMonStats
 	add sp, #0x10
 	pop {r4}
 	pop {r3}
 	add sp, #0x10
 	bx r3
 
-	thumb_func_start UpdateMonLevelAndRecalcStats
-UpdateMonLevelAndRecalcStats: ; 0x02066ED8
+	thumb_func_start CalcMonStats
+CalcMonStats: ; 0x02066ED8
 	push {r3-r5, lr}
 	add r5, r0, #0x0
 	bl TryDecryptMon
@@ -6641,7 +6095,7 @@ _02069A8E:
 	add r2, sp, #0x4
 	bl SetMonDataEncrypted
 	add r0, r4, #0x0
-	bl UpdateMonLevelAndRecalcStats
+	bl CalcMonStats
 	add sp, #0x1c
 	pop {r4-r5, pc}
 
diff --git a/arm9/asm/scrcmd.s b/arm9/asm/scrcmd.s
index 275875f4..09f2b266 100644
--- a/arm9/asm/scrcmd.s
+++ b/arm9/asm/scrcmd.s
@@ -10729,7 +10729,7 @@ _0203EF18:
 	add r2, sp, #0x4
 	bl SetMonDataEncrypted
 	add r0, r4, #0x0
-	bl UpdateMonLevelAndRecalcStats
+	bl CalcMonStats
 	add r0, r7, #0x0
 	add r1, r4, #0x0
 	bl FUN_02024AF0
diff --git a/arm9/asm/scrcmd_12.s b/arm9/asm/scrcmd_12.s
index 37665648..d326b254 100644
--- a/arm9/asm/scrcmd_12.s
+++ b/arm9/asm/scrcmd_12.s
@@ -653,7 +653,7 @@ _0204322C:
 	mov r2, #0x4
 	bl FUN_0208089C
 	add r0, r4, #0x0
-	bl UpdateMonLevelAndRecalcStats
+	bl CalcMonStats
 	ldr r0, [sp, #0x4]
 	ldr r0, [r0, #0xc]
 	bl FUN_0206BB1C
diff --git a/arm9/asm/unk_020476CC.s b/arm9/asm/unk_020476CC.s
index dce3e575..24d4a9b4 100644
--- a/arm9/asm/unk_020476CC.s
+++ b/arm9/asm/unk_020476CC.s
@@ -684,7 +684,7 @@ _02047C40:
 	add r2, sp, #0x18
 	bl SetMonDataEncrypted
 	add r0, r5, #0x0
-	bl UpdateMonLevelAndRecalcStats
+	bl CalcMonStats
 _02047C82:
 	add r0, r6, #0x0
 	add r1, r5, #0x0
diff --git a/arm9/asm/unk_0206C700.s b/arm9/asm/unk_0206C700.s
index 561ba6c3..506fbef0 100644
--- a/arm9/asm/unk_0206C700.s
+++ b/arm9/asm/unk_0206C700.s
@@ -1044,7 +1044,7 @@ _0206CF7E:
 	ldr r0, [r4, #0x28]
 	bl FUN_0206A1C4
 	ldr r0, [r4, #0x28]
-	bl UpdateMonLevelAndRecalcStats
+	bl CalcMonStats
 	ldr r0, [r4, #0x28]
 	bl FUN_020690E4
 	add r2, r0, #0x0
@@ -2192,7 +2192,7 @@ _0206D8EA:
 	add r0, r5, #0x0
 	bl FUN_0206A1C4
 	add r0, r5, #0x0
-	bl UpdateMonLevelAndRecalcStats
+	bl CalcMonStats
 	ldr r0, [r4, #0x24]
 	add r1, r5, #0x0
 	bl FUN_0206B900
@@ -2583,7 +2583,7 @@ FUN_0206DC80: ; 0x0206DC80
 	add r2, #0x62
 	bl SetMonDataEncrypted
 	add r0, r5, #0x0
-	bl UpdateMonLevelAndRecalcStats
+	bl CalcMonStats
 	add r0, sp, #0x10
 	add r1, r5, #0x0
 	mov r2, #0x2
diff --git a/arm9/asm/unk_020828BC.s b/arm9/asm/unk_020828BC.s
index d3c740aa..8a04ec14 100644
--- a/arm9/asm/unk_020828BC.s
+++ b/arm9/asm/unk_020828BC.s
@@ -765,7 +765,7 @@ FUN_02082D60: ; 0x02082D60
 	lsl r1, r1, #0x18
 	lsr r1, r1, #0x18
 	mov r2, #0x0
-	bl AdjustPersonalityToForceGenderAndNature
+	bl GenPersonalityByGenderAndNature
 	mov r1, #0x1
 	str r1, [sp, #0x0]
 	str r0, [sp, #0x4]
diff --git a/arm9/asm/unk_020842DC.s b/arm9/asm/unk_020842DC.s
index 17aec9b7..15ec2abe 100644
--- a/arm9/asm/unk_020842DC.s
+++ b/arm9/asm/unk_020842DC.s
@@ -803,7 +803,7 @@ _0208495C:
 	mov r1, #0x8
 	bl AddMonPartyStatEncrypted
 	add r0, r5, #0x0
-	bl UpdateMonLevelAndRecalcStats
+	bl CalcMonStats
 	ldr r0, [sp, #0x50]
 	cmp r0, #0x0
 	bne _020849B0
@@ -987,7 +987,7 @@ _02084A66:
 	add r2, sp, #0x50
 	bl SetMonDataEncrypted
 	add r0, r5, #0x0
-	bl UpdateMonLevelAndRecalcStats
+	bl CalcMonStats
 	mov r6, #0x1
 _02084B18:
 	ldr r0, [sp, #0x6c]
@@ -1032,7 +1032,7 @@ _02084B20:
 	add r2, sp, #0x54
 	bl SetMonDataEncrypted
 	add r0, r5, #0x0
-	bl UpdateMonLevelAndRecalcStats
+	bl CalcMonStats
 	mov r6, #0x1
 _02084B78:
 	ldr r0, [sp, #0x6c]
@@ -1077,7 +1077,7 @@ _02084B80:
 	add r2, sp, #0x58
 	bl SetMonDataEncrypted
 	add r0, r5, #0x0
-	bl UpdateMonLevelAndRecalcStats
+	bl CalcMonStats
 	mov r6, #0x1
 _02084BD8:
 	ldr r0, [sp, #0x6c]
@@ -1122,7 +1122,7 @@ _02084BE0:
 	add r2, sp, #0x5c
 	bl SetMonDataEncrypted
 	add r0, r5, #0x0
-	bl UpdateMonLevelAndRecalcStats
+	bl CalcMonStats
 	mov r6, #0x1
 _02084C38:
 	ldr r0, [sp, #0x6c]
@@ -1167,7 +1167,7 @@ _02084C40:
 	add r2, sp, #0x60
 	bl SetMonDataEncrypted
 	add r0, r5, #0x0
-	bl UpdateMonLevelAndRecalcStats
+	bl CalcMonStats
 	mov r6, #0x1
 _02084C98:
 	ldr r0, [sp, #0x6c]
@@ -1212,7 +1212,7 @@ _02084CA0:
 	add r2, sp, #0x64
 	bl SetMonDataEncrypted
 	add r0, r5, #0x0
-	bl UpdateMonLevelAndRecalcStats
+	bl CalcMonStats
 	mov r6, #0x1
 _02084CF8:
 	ldr r0, [sp, #0x6c]