3 files changed, 6 insertions, 97 deletions

diff --git a/arm9/asm/pokemon.s b/arm9/asm/pokemon_s.s
index ec6ac699..2395e7f1 100644
--- a/arm9/asm/pokemon.s
+++ b/arm9/asm/pokemon_s.s
@@ -116,97 +116,6 @@ UNK_021C5AC0: ; 0x021C5AC0
 
 	.text
 
-	thumb_func_start ZeroMonData
-ZeroMonData: ; 0x02066978
-	push {r4, lr}
-	add r4, r0, #0x0
-	mov r0, #0x0
-	add r1, r4, #0x0
-	mov r2, #0xec
-	bl MIi_CpuClearFast
-	add r0, r4, #0x0
-	ldrh r2, [r4, #0x6]
-	add r0, #0x8
-	mov r1, #0x80
-	bl MonEncryptSegment
-	add r0, r4, #0x0
-	ldr r2, [r4, #0x0]
-	add r0, #0x88
-	mov r1, #0x64
-	bl MonEncryptSegment
-	pop {r4, pc}
-
-	thumb_func_start WipeBoxMonDataAndEncrypt
-WipeBoxMonDataAndEncrypt: ; 0x020669A0
-	push {r4, lr}
-	add r4, r0, #0x0
-	mov r0, #0x0
-	add r1, r4, #0x0
-	mov r2, #0x88
-	bl MIi_CpuClearFast
-	add r0, r4, #0x0
-	ldrh r2, [r4, #0x6]
-	add r0, #0x8
-	mov r1, #0x80
-	bl MonEncryptSegment
-	pop {r4, pc}
-
-	thumb_func_start SizeOfStructPokemon
-SizeOfStructPokemon: ; 0x020669BC
-	mov r0, #0xec
-	bx lr
-
-	thumb_func_start AllocMonZeroed
-AllocMonZeroed: ; 0x020669C0
-	push {r4, lr}
-	mov r1, #0xec
-	bl AllocFromHeap
-	add r4, r0, #0x0
-	bl ZeroMonData
-	add r0, r4, #0x0
-	pop {r4, pc}
-	.balign 4
-
-	thumb_func_start TryDecryptMon
-TryDecryptMon: ; 0x020669D4
-	push {r3-r5, lr}
-	add r5, r0, #0x0
-	ldrh r0, [r5, #0x4]
-	mov r4, #0x0
-	lsl r1, r0, #0x1f
-	lsr r1, r1, #0x1f
-	bne _02066A1A
-	lsl r0, r0, #0x1e
-	mov r4, #0x1
-	lsr r0, r0, #0x1f
-	beq _020669EE
-	bl ErrorHandling
-_020669EE:
-	ldrh r1, [r5, #0x4]
-	mov r0, #0x1
-	bic r1, r0
-	mov r0, #0x1
-	orr r0, r1
-	strh r0, [r5, #0x4]
-	ldrh r1, [r5, #0x4]
-	mov r0, #0x2
-	orr r0, r1
-	strh r0, [r5, #0x4]
-	add r0, r5, #0x0
-	ldr r2, [r5, #0x0]
-	add r0, #0x88
-	mov r1, #0x64
-	bl MonDecryptSegment
-	add r0, r5, #0x0
-	ldrh r2, [r5, #0x6]
-	add r0, #0x8
-	mov r1, #0x80
-	bl MonDecryptSegment
-_02066A1A:
-	add r0, r4, #0x0
-	pop {r3-r5, pc}
-	.balign 4
-
 	thumb_func_start TryEncryptMon
 TryEncryptMon: ; 0x02066A20
 	push {r3-r5, lr}
@@ -372,7 +281,7 @@ CreateBoxMon: ; 0x02066B64
 	push {r4-r7, lr}
 	sub sp, #0xc
 	add r5, r0, #0x0
-	bl WipeBoxMonDataAndEncrypt
+	bl ZeroBoxMonData
 	add r0, r5, #0x0
 	bl TryDecryptBoxMon
 	str r0, [sp, #0x0]
diff --git a/arm9/asm/unk_02023C40.s b/arm9/asm/unk_02023C40.s
index 30aa59a0..9b5622d0 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 WipeBoxMonDataAndEncrypt
+	bl ZeroBoxMonData
 	add r0, r4, #0x0
 	add r0, #0xec
-	bl WipeBoxMonDataAndEncrypt
+	bl ZeroBoxMonData
 	mov r0, #0x76
 	mov r1, #0x0
 	lsl r0, r0, #0x2
@@ -187,7 +187,7 @@ _02023D38: .word 0x0000FFFF
 FUN_02023D3C: ; 0x02023D3C
 	push {r4, lr}
 	add r4, r0, #0x0
-	bl WipeBoxMonDataAndEncrypt
+	bl ZeroBoxMonData
 	add r0, r4, #0x0
 	mov r1, #0x0
 	add r0, #0xe8
diff --git a/arm9/asm/unk_0206B16C.s b/arm9/asm/unk_0206B16C.s
index b6ec1416..465dbabb 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 WipeBoxMonDataAndEncrypt
+	bl ZeroBoxMonData
 	add r4, r4, #0x1
 	add r5, #0x88
 	cmp r4, #0x1e
@@ -241,7 +241,7 @@ _0206B308:
 	mov r0, #0x88
 	mul r0, r2
 	add r0, r1, r0
-	bl WipeBoxMonDataAndEncrypt
+	bl ZeroBoxMonData
 	bl FUN_02022830
 	pop {r3, pc}
 _0206B32A: