17 files changed, 29 insertions, 1172 deletions

diff --git a/arm9/asm/scrcmd.s b/arm9/asm/scrcmd.s
index b874b757..affbe1c1 100644
--- a/arm9/asm/scrcmd.s
+++ b/arm9/asm/scrcmd.s
@@ -6376,7 +6376,7 @@ FUN_0203CBE8: ; 0x0203CBE8
 	ldr r0, [sp, #0x0]
 	ldr r2, [r6, #0x0]
 	mov r3, #0xb
-	bl FUN_0206AD4C
+	bl GetTrainerMessageByIdPair
 	add r0, r4, #0x0
 	mov r1, #0x1
 	bl FUN_02039438
diff --git a/arm9/asm/scrcmd_12.s b/arm9/asm/scrcmd_12.s
index 137140a8..a434a5cb 100644
--- a/arm9/asm/scrcmd_12.s
+++ b/arm9/asm/scrcmd_12.s
@@ -625,7 +625,7 @@ _020431D4:
 	add r7, r0, #0x0
 	add r0, r4, #0x0
 	add r1, r7, #0x0
-	bl FUN_02069B88
+	bl CopyPokemonToPokemon
 	add r0, r7, #0x0
 	mov r1, #0x90
 	add r2, r5, #0x0
diff --git a/arm9/asm/unk_0202BE98.s b/arm9/asm/unk_0202BE98.s
index 2b1b2f16..37bc1c4e 100644
--- a/arm9/asm/unk_0202BE98.s
+++ b/arm9/asm/unk_0202BE98.s
@@ -133,10 +133,10 @@ FUN_0202BF7C: ; 0x0202BF7C
 	mov r1, #0xec
 	mul r1, r2
 	add r1, r3, r1
-	ldr r3, _0202BF8C ; =FUN_02069A64
+	ldr r3, _0202BF8C ; =CopyBoxPokemonToPokemon
 	bx r3
 	nop
-_0202BF8C: .word FUN_02069A64
+_0202BF8C: .word CopyBoxPokemonToPokemon
 
 	thumb_func_start FUN_0202BF90
 FUN_0202BF90: ; 0x0202BF90
diff --git a/arm9/asm/unk_020377F0.s b/arm9/asm/unk_020377F0.s
index d0d60821..e7d630f6 100644
--- a/arm9/asm/unk_020377F0.s
+++ b/arm9/asm/unk_020377F0.s
@@ -1687,7 +1687,7 @@ _02038386:
 	bl GetPartyMonByIndex
 	add r1, r0, #0x0
 	ldr r0, [r4, #0x44]
-	bl FUN_02069B88
+	bl CopyPokemonToPokemon
 	ldr r0, [r4, #0x60]
 	bl FUN_0206C92C
 	mov r0, #0x1a
diff --git a/arm9/asm/unk_0204653C.s b/arm9/asm/unk_0204653C.s
index b74847fc..4309494e 100644
--- a/arm9/asm/unk_0204653C.s
+++ b/arm9/asm/unk_0204653C.s
@@ -1482,7 +1482,7 @@ _0204711A:
 	ldr r1, [r7, #0xc]
 	ldr r2, [sp, #0x20]
 	add r0, r4, #0x0
-	bl FUN_0206ABC4
+	bl EnemyTrainerSet_Init
 	ldr r0, [r7, #0xc]
 	bl FUN_02029FC8
 	mov r1, #0x8
diff --git a/arm9/asm/unk_020476CC.s b/arm9/asm/unk_020476CC.s
index 374ab418..568c4b5d 100644
--- a/arm9/asm/unk_020476CC.s
+++ b/arm9/asm/unk_020476CC.s
@@ -663,7 +663,7 @@ _02047C40:
 	add r1, r4, #0x0
 	bl GetPartyMonByIndex
 	add r1, r5, #0x0
-	bl FUN_02069B88
+	bl CopyPokemonToPokemon
 	add r0, r5, #0x0
 	mov r1, #0xa0
 	mov r2, #0x0
@@ -858,7 +858,7 @@ _02047DEE:
 	sub r1, r1, #0x1
 	bl GetPartyMonByIndex
 	ldr r1, [sp, #0x8]
-	bl FUN_02069B88
+	bl CopyPokemonToPokemon
 	ldr r1, [sp, #0x8]
 	add r0, r5, #0x0
 	mov r2, #0x0
diff --git a/arm9/asm/unk_0204B0A0.s b/arm9/asm/unk_0204B0A0.s
index f2e46ab6..a78c13d0 100644
--- a/arm9/asm/unk_0204B0A0.s
+++ b/arm9/asm/unk_0204B0A0.s
@@ -149,7 +149,7 @@ FUN_0204B1DC: ; 0x0204B1DC
 	ldr r0, [r5, #0xc]
 	bl SavArray_PlayerParty_get
 	add r1, r4, #0x0
-	bl FUN_02069D50
+	bl Party_UpdatePokerus
 	ldr r0, [r5, #0xc]
 	bl SavArray_Flags_get
 	add r6, r0, #0x0
diff --git a/arm9/asm/unk_0206ABC4.s b/arm9/asm/unk_0206ABC4.s
deleted file mode 100644
index b4b3d88e..00000000
--- a/arm9/asm/unk_0206ABC4.s
+++ /dev/null
@@ -1,749 +0,0 @@
-    .include "asm/macros.inc"
-    .include "global.inc"
-
-	.section .rodata
-
-	.global UNK_020F8010
-UNK_020F8010: ; 0x020F8010
-	.byte 0, 1, 0, 1, 0, 1, 0, 1, 1, 0, 1, 0, 0, 1, 0, 0
-	.byte 0, 1, 1, 0, 0, 1, 1, 2, 0, 1, 1, 0, 0, 0, 1, 2
-	.byte 0, 1, 0, 1, 1, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 2
-	.byte 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0, 0
-	.byte 0, 0, 1, 0, 0, 1, 2, 0, 1, 0, 1, 0, 1, 1, 1, 0
-	.byte 1, 0, 2, 0, 1, 1, 0, 1, 1, 1, 1, 0, 1, 0, 1, 0
-	.byte 1, 0, 0, 0
-
-	.text
-
-	thumb_func_start FUN_0206ABC4
-FUN_0206ABC4: ; 0x0206ABC4
-	push {r3-r7, lr}
-	sub sp, #0x48
-	str r2, [sp, #0x4]
-	ldr r2, _0206AC70 ; =0x0000022F
-	str r0, [sp, #0x0]
-	add r4, r1, #0x0
-	ldr r3, [sp, #0x4]
-	mov r0, #0x1
-	mov r1, #0x1a
-	bl NewMsgDataFromNarc
-	str r0, [sp, #0x10]
-	add r0, r4, #0x0
-	bl FUN_02024EC0
-	bl FUN_02024EE8
-	ldr r4, [sp, #0x0]
-	str r0, [sp, #0xc]
-	add r0, r4, #0x0
-	add r5, r4, #0x0
-	mov r7, #0x0
-	str r0, [sp, #0x8]
-	add r5, #0x3c
-_0206ABF4:
-	ldr r0, [r4, #0x18]
-	cmp r0, #0x0
-	beq _0206AC48
-	add r1, sp, #0x14
-	bl TrainerData_ReadTrData
-	ldr r3, [sp, #0x8]
-	add r6, sp, #0x14
-	add r3, #0x28
-	mov r2, #0x6
-_0206AC08:
-	ldmia r6!, {r0-r1}
-	stmia r3!, {r0-r1}
-	sub r2, r2, #0x1
-	bne _0206AC08
-	ldr r0, [r6, #0x0]
-	str r0, [r3, #0x0]
-	add r0, sp, #0x14
-	ldrb r0, [r0, #0x1]
-	cmp r0, #0x3f
-	bne _0206AC26
-	ldr r1, [sp, #0xc]
-	add r0, r5, #0x0
-	bl CopyU16StringArray
-	b _0206AC3E
-_0206AC26:
-	ldr r0, [sp, #0x10]
-	ldr r1, [r4, #0x18]
-	bl NewString_ReadMsgData
-	add r6, r0, #0x0
-	add r1, r5, #0x0
-	mov r2, #0x8
-	bl CopyStringToU16Array
-	add r0, r6, #0x0
-	bl String_dtor
-_0206AC3E:
-	ldr r0, [sp, #0x0]
-	ldr r2, [sp, #0x4]
-	add r1, r7, #0x0
-	bl LoadTrainerParty
-_0206AC48:
-	ldr r0, [sp, #0x8]
-	add r7, r7, #0x1
-	add r0, #0x34
-	add r4, r4, #0x4
-	add r5, #0x34
-	str r0, [sp, #0x8]
-	cmp r7, #0x4
-	blt _0206ABF4
-	ldr r0, [sp, #0x0]
-	ldr r1, [r0, #0x0]
-	ldr r0, [sp, #0x24]
-	orr r1, r0
-	ldr r0, [sp, #0x0]
-	str r1, [r0, #0x0]
-	ldr r0, [sp, #0x10]
-	bl DestroyMsgData
-	add sp, #0x48
-	pop {r3-r7, pc}
-	nop
-_0206AC70: .word 0x0000022F
-
-	thumb_func_start TrainerData_GetAttr
-TrainerData_GetAttr: ; 0x0206AC74
-	push {r4-r5, lr}
-	sub sp, #0x34
-	add r5, r1, #0x0
-	add r1, sp, #0x0
-	bl TrainerData_ReadTrData
-	cmp r5, #0x9
-	bhi _0206ACCC
-	add r0, r5, r5
-	add r0, pc
-	ldrh r0, [r0, #0x6]
-	lsl r0, r0, #0x10
-	asr r0, r0, #0x10
-	add pc, r0
-_0206AC90: ; jump table (using 16-bit offset)
-	.short _0206ACA4 - _0206AC90 - 2; case 0
-	.short _0206ACAA - _0206AC90 - 2; case 1
-	.short _0206ACB0 - _0206AC90 - 2; case 2
-	.short _0206ACB6 - _0206AC90 - 2; case 3
-	.short _0206ACBC - _0206AC90 - 2; case 4
-	.short _0206ACBC - _0206AC90 - 2; case 5
-	.short _0206ACBC - _0206AC90 - 2; case 6
-	.short _0206ACBC - _0206AC90 - 2; case 7
-	.short _0206ACC6 - _0206AC90 - 2; case 8
-	.short _0206ACCA - _0206AC90 - 2; case 9
-_0206ACA4:
-	add r0, sp, #0x0
-	ldrb r4, [r0, #0x0]
-	b _0206ACCC
-_0206ACAA:
-	add r0, sp, #0x0
-	ldrb r4, [r0, #0x1]
-	b _0206ACCC
-_0206ACB0:
-	add r0, sp, #0x0
-	ldrb r4, [r0, #0x2]
-	b _0206ACCC
-_0206ACB6:
-	add r0, sp, #0x0
-	ldrb r4, [r0, #0x3]
-	b _0206ACCC
-_0206ACBC:
-	sub r0, r5, #0x4
-	lsl r1, r0, #0x1
-	add r0, sp, #0x4
-	ldrh r4, [r0, r1]
-	b _0206ACCC
-_0206ACC6:
-	ldr r4, [sp, #0xc]
-	b _0206ACCC
-_0206ACCA:
-	ldr r4, [sp, #0x10]
-_0206ACCC:
-	add r0, r4, #0x0
-	add sp, #0x34
-	pop {r4-r5, pc}
-	.balign 4
-
-	thumb_func_start FUN_0206ACD4
-FUN_0206ACD4: ; 0x0206ACD4
-	push {r4-r7, lr}
-	sub sp, #0x14
-	add r5, r0, #0x0
-	mov r0, #0x0
-	str r0, [sp, #0x4]
-	add r7, r1, #0x0
-	ldr r1, [sp, #0x4]
-	mov r0, #0x3b
-	add r4, r2, #0x0
-	bl GetNarcMemberSizeByIdPair
-	add r6, r0, #0x0
-	mov r0, #0x2
-	str r0, [sp, #0x0]
-	add r0, sp, #0xc
-	mov r1, #0x89
-	mov r2, #0x0
-	lsl r3, r5, #0x1
-	bl ReadFromNarcMemberByIdPair
-	mov r0, #0x3b
-	add r1, r4, #0x0
-	bl NARC_ctor
-	add r4, sp, #0xc
-	ldrh r2, [r4, #0x0]
-	str r0, [sp, #0x8]
-	cmp r2, r6
-	beq _0206AD40
-_0206AD0E:
-	add r0, sp, #0xc
-	add r0, #0x2
-	str r0, [sp, #0x0]
-	ldr r0, [sp, #0x8]
-	mov r1, #0x0
-	mov r3, #0x4
-	bl NARC_ReadFromMember
-	ldrh r1, [r4, #0x2]
-	cmp r1, r5
-	bne _0206AD30
-	ldrh r0, [r4, #0x4]
-	cmp r0, r7
-	bne _0206AD30
-	mov r0, #0x1
-	str r0, [sp, #0x4]
-	b _0206AD40
-_0206AD30:
-	cmp r1, r5
-	bne _0206AD40
-	ldrh r0, [r4, #0x0]
-	add r0, r0, #0x4
-	strh r0, [r4, #0x0]
-	ldrh r2, [r4, #0x0]
-	cmp r2, r6
-	bne _0206AD0E
-_0206AD40:
-	ldr r0, [sp, #0x8]
-	bl NARC_dtor
-	ldr r0, [sp, #0x4]
-	add sp, #0x14
-	pop {r4-r7, pc}
-
-	thumb_func_start FUN_0206AD4C
-FUN_0206AD4C: ; 0x0206AD4C
-	push {r3-r7, lr}
-	sub sp, #0x18
-	add r6, r0, #0x0
-	add r7, r1, #0x0
-	mov r0, #0x3b
-	mov r1, #0x0
-	str r2, [sp, #0x4]
-	str r3, [sp, #0x8]
-	bl GetNarcMemberSizeByIdPair
-	add r5, r0, #0x0
-	mov r0, #0x2
-	str r0, [sp, #0x0]
-	add r0, sp, #0x10
-	mov r1, #0x89
-	mov r2, #0x0
-	lsl r3, r6, #0x1
-	bl ReadFromNarcMemberByIdPair
-	ldr r1, [sp, #0x8]
-	mov r0, #0x3b
-	bl NARC_ctor
-	add r4, sp, #0x10
-	ldrh r2, [r4, #0x0]
-	str r0, [sp, #0xc]
-	cmp r2, r5
-	beq _0206ADC2
-_0206AD84:
-	add r0, sp, #0x10
-	add r0, #0x2
-	str r0, [sp, #0x0]
-	ldr r0, [sp, #0xc]
-	mov r1, #0x0
-	mov r3, #0x4
-	bl NARC_ReadFromMember
-	ldrh r0, [r4, #0x2]
-	cmp r0, r6
-	bne _0206ADB6
-	ldrh r0, [r4, #0x4]
-	cmp r0, r7
-	bne _0206ADB6
-	ldr r0, [sp, #0x4]
-	add r2, sp, #0x10
-	str r0, [sp, #0x0]
-	ldrh r2, [r2, #0x0]
-	ldr r1, _0206ADDC ; =0x0000022E
-	ldr r3, [sp, #0x8]
-	mov r0, #0x1a
-	lsr r2, r2, #0x2
-	bl ReadMsgData_NewNarc_ExistingString
-	b _0206ADC2
-_0206ADB6:
-	ldrh r0, [r4, #0x0]
-	add r0, r0, #0x4
-	strh r0, [r4, #0x0]
-	ldrh r2, [r4, #0x0]
-	cmp r2, r5
-	bne _0206AD84
-_0206ADC2:
-	ldr r0, [sp, #0xc]
-	bl NARC_dtor
-	add r0, sp, #0x10
-	ldrh r0, [r0, #0x0]
-	cmp r0, r5
-	bne _0206ADD6
-	ldr r0, [sp, #0x4]
-	bl StringSetEmpty
-_0206ADD6:
-	add sp, #0x18
-	pop {r3-r7, pc}
-	nop
-_0206ADDC: .word 0x0000022E
-
-	thumb_func_start TrainerData_ReadTrData
-TrainerData_ReadTrData: ; 0x0206ADE0
-	ldr r3, _0206ADEC ; =ReadWholeNarcMemberByIdPair
-	add r2, r0, #0x0
-	add r0, r1, #0x0
-	mov r1, #0x39
-	bx r3
-	nop
-_0206ADEC: .word ReadWholeNarcMemberByIdPair
-
-	thumb_func_start TrainerData_ReadTrPoke
-TrainerData_ReadTrPoke: ; 0x0206ADF0
-	ldr r3, _0206ADFC ; =ReadWholeNarcMemberByIdPair
-	add r2, r0, #0x0
-	add r0, r1, #0x0
-	mov r1, #0x3a
-	bx r3
-	nop
-_0206ADFC: .word ReadWholeNarcMemberByIdPair
-
-	thumb_func_start FUN_0206AE00
-FUN_0206AE00: ; 0x0206AE00
-	ldr r1, _0206AE08 ; =UNK_020F8010
-	ldrb r0, [r1, r0]
-	bx lr
-	nop
-_0206AE08: .word UNK_020F8010
-
-	thumb_func_start LoadTrainerParty
-LoadTrainerParty: ; 0x0206AE0C
-	push {r3-r7, lr}
-	sub sp, #0x50
-	add r7, r1, #0x0
-	add r4, r0, #0x0
-	add r5, r2, #0x0
-	bl GetLCRNGSeed
-	lsl r6, r7, #0x2
-	str r0, [sp, #0x44]
-	add r0, r4, r6
-	ldr r0, [r0, #0x4]
-	mov r1, #0x6
-	bl InitPartyWithMaxSize
-	add r0, r5, #0x0
-	mov r1, #0x60
-	bl AllocFromHeap
-	str r0, [sp, #0x4c]
-	add r0, r5, #0x0
-	bl AllocMonZeroed
-	str r0, [sp, #0x40]
-	add r0, r4, r6
-	ldr r0, [r0, #0x18]
-	ldr r1, [sp, #0x4c]
-	bl TrainerData_ReadTrPoke
-	mov r0, #0x34
-	add r5, r7, #0x0
-	mul r5, r0
-	add r0, r4, r5
-	add r0, #0x29
-	ldrb r0, [r0, #0x0]
-	bl FUN_0206AE00
-	cmp r0, #0x1
-	bne _0206AE5E
-	mov r0, #0x78
-	str r0, [sp, #0x10]
-	b _0206AE62
-_0206AE5E:
-	mov r0, #0x88
-	str r0, [sp, #0x10]
-_0206AE62:
-	add r0, r4, r5
-	add r0, #0x28
-	ldrb r0, [r0, #0x0]
-	cmp r0, #0x3
-	bhi _0206AF26
-	add r0, r0, r0
-	add r0, pc
-	ldrh r0, [r0, #0x6]
-	lsl r0, r0, #0x10
-	asr r0, r0, #0x10
-	add pc, r0
-_0206AE78: ; jump table (using 16-bit offset)
-	.short _0206AE80 - _0206AE78 - 2; case 0
-	.short _0206AF28 - _0206AE78 - 2; case 1
-	.short _0206AFE8 - _0206AE78 - 2; case 2
-	.short _0206B08C - _0206AE78 - 2; case 3
-_0206AE80:
-	mov r0, #0x0
-	str r0, [sp, #0x48]
-	add r0, r4, r5
-	add r0, #0x2b
-	ldrb r0, [r0, #0x0]
-	cmp r0, #0x0
-	ble _0206AF26
-	ldr r0, [sp, #0x4c]
-	str r0, [sp, #0x28]
-	add r0, r4, r6
-	str r0, [sp, #0x24]
-_0206AE96:
-	ldr r0, [sp, #0x24]
-	ldr r2, [sp, #0x28]
-	ldr r1, [r0, #0x18]
-	ldr r0, [sp, #0x28]
-	ldrh r3, [r2, #0x0]
-	ldrh r2, [r2, #0x2]
-	ldrh r0, [r0, #0x4]
-	add r2, r3, r2
-	add r0, r0, r2
-	add r7, r1, r0
-	add r0, r7, #0x0
-	bl SetLCRNGSeed
-	add r0, r4, r5
-	add r0, #0x29
-	ldrb r0, [r0, #0x0]
-	mov r6, #0x0
-	cmp r0, #0x0
-	ble _0206AECE
-_0206AEBC:
-	bl LCRandom
-	add r7, r0, #0x0
-	add r0, r4, r5
-	add r0, #0x29
-	ldrb r0, [r0, #0x0]
-	add r6, r6, #0x1
-	cmp r6, r0
-	blt _0206AEBC
-_0206AECE:
-	ldr r0, [sp, #0x10]
-	lsl r1, r7, #0x8
-	add r6, r1, r0
-	ldr r0, [sp, #0x28]
-	ldrh r1, [r0, #0x0]
-	mov r0, #0x1f
-	mul r0, r1
-	mov r1, #0xff
-	bl _s32_div_f
-	add r3, r0, #0x0
-	mov r0, #0x1
-	str r0, [sp, #0x0]
-	lsl r3, r3, #0x18
-	str r6, [sp, #0x4]
-	mov r0, #0x2
-	str r0, [sp, #0x8]
-	mov r0, #0x0
-	str r0, [sp, #0xc]
-	ldr r1, [sp, #0x28]
-	ldr r2, [sp, #0x28]
-	ldrh r1, [r1, #0x4]
-	ldrh r2, [r2, #0x2]
-	ldr r0, [sp, #0x40]
-	lsr r3, r3, #0x18
-	bl CreateMon
-	ldr r0, [sp, #0x24]
-	ldr r1, [sp, #0x40]
-	ldr r0, [r0, #0x4]
-	bl AddMonToParty
-	ldr r0, [sp, #0x28]
-	add r0, r0, #0x6
-	str r0, [sp, #0x28]
-	ldr r0, [sp, #0x48]
-	add r0, r0, #0x1
-	str r0, [sp, #0x48]
-	add r0, r4, r5
-	add r0, #0x2b
-	ldrb r1, [r0, #0x0]
-	ldr r0, [sp, #0x48]
-	cmp r0, r1
-	blt _0206AE96
-_0206AF26:
-	b _0206B156
-_0206AF28:
-	mov r0, #0x0
-	str r0, [sp, #0x18]
-	add r0, r4, r5
-	add r0, #0x2b
-	ldrb r0, [r0, #0x0]
-	cmp r0, #0x0
-	ble _0206AFE6
-	ldr r0, [sp, #0x4c]
-	str r0, [sp, #0x30]
-	add r0, r4, r6
-	str r0, [sp, #0x2c]
-_0206AF3E:
-	ldr r0, [sp, #0x2c]
-	ldr r2, [sp, #0x30]
-	ldr r1, [r0, #0x18]
-	ldr r0, [sp, #0x30]
-	ldrh r3, [r2, #0x0]
-	ldrh r2, [r2, #0x2]
-	ldrh r0, [r0, #0x4]
-	add r2, r3, r2
-	add r0, r0, r2
-	add r7, r1, r0
-	add r0, r7, #0x0
-	bl SetLCRNGSeed
-	add r0, r4, r5
-	add r0, #0x29
-	ldrb r0, [r0, #0x0]
-	mov r6, #0x0
-	cmp r0, #0x0
-	ble _0206AF76
-_0206AF64:
-	bl LCRandom
-	add r7, r0, #0x0
-	add r0, r4, r5
-	add r0, #0x29
-	ldrb r0, [r0, #0x0]
-	add r6, r6, #0x1
-	cmp r6, r0
-	blt _0206AF64
-_0206AF76:
-	ldr r0, [sp, #0x10]
-	lsl r1, r7, #0x8
-	add r6, r1, r0
-	ldr r0, [sp, #0x30]
-	ldrh r1, [r0, #0x0]
-	mov r0, #0x1f
-	mul r0, r1
-	mov r1, #0xff
-	bl _s32_div_f
-	add r3, r0, #0x0
-	mov r0, #0x1
-	str r0, [sp, #0x0]
-	lsl r3, r3, #0x18
-	str r6, [sp, #0x4]
-	mov r0, #0x2
-	str r0, [sp, #0x8]
-	mov r0, #0x0
-	str r0, [sp, #0xc]
-	ldr r1, [sp, #0x30]
-	ldr r2, [sp, #0x30]
-	ldrh r1, [r1, #0x4]
-	ldrh r2, [r2, #0x2]
-	ldr r0, [sp, #0x40]
-	lsr r3, r3, #0x18
-	bl CreateMon
-	ldr r7, [sp, #0x30]
-	mov r6, #0x0
-_0206AFB0:
-	ldrh r1, [r7, #0x6]
-	lsl r2, r6, #0x18
-	ldr r0, [sp, #0x40]
-	lsr r2, r2, #0x18
-	bl MonSetMoveInSlot
-	add r6, r6, #0x1
-	add r7, r7, #0x2
-	cmp r6, #0x4
-	blt _0206AFB0
-	ldr r0, [sp, #0x2c]
-	ldr r1, [sp, #0x40]
-	ldr r0, [r0, #0x4]
-	bl AddMonToParty
-	ldr r0, [sp, #0x30]
-	add r0, #0xe
-	str r0, [sp, #0x30]
-	ldr r0, [sp, #0x18]
-	add r0, r0, #0x1
-	str r0, [sp, #0x18]
-	add r0, r4, r5
-	add r0, #0x2b
-	ldrb r1, [r0, #0x0]
-	ldr r0, [sp, #0x18]
-	cmp r0, r1
-	blt _0206AF3E
-_0206AFE6:
-	b _0206B156
-_0206AFE8:
-	mov r0, #0x0
-	str r0, [sp, #0x1c]
-	add r0, r4, r5
-	add r0, #0x2b
-	ldrb r0, [r0, #0x0]
-	cmp r0, #0x0
-	ble _0206B08A
-	add r0, r4, r6
-	ldr r7, [sp, #0x4c]
-	str r0, [sp, #0x34]
-_0206AFFC:
-	ldr r0, [sp, #0x34]
-	ldrh r3, [r7, #0x0]
-	ldrh r2, [r7, #0x2]
-	ldr r1, [r0, #0x18]
-	ldrh r0, [r7, #0x4]
-	add r2, r3, r2
-	add r0, r0, r2
-	add r0, r1, r0
-	str r0, [sp, #0x14]
-	bl SetLCRNGSeed
-	add r0, r4, r5
-	add r0, #0x29
-	ldrb r0, [r0, #0x0]
-	mov r6, #0x0
-	cmp r0, #0x0
-	ble _0206B030
-_0206B01E:
-	bl LCRandom
-	str r0, [sp, #0x14]
-	add r0, r4, r5
-	add r0, #0x29
-	ldrb r0, [r0, #0x0]
-	add r6, r6, #0x1
-	cmp r6, r0
-	blt _0206B01E
-_0206B030:
-	ldr r0, [sp, #0x14]
-	lsl r1, r0, #0x8
-	ldr r0, [sp, #0x10]
-	add r6, r1, r0
-	ldrh r1, [r7, #0x0]
-	mov r0, #0x1f
-	mul r0, r1
-	mov r1, #0xff
-	bl _s32_div_f
-	add r3, r0, #0x0
-	mov r0, #0x1
-	str r0, [sp, #0x0]
-	lsl r3, r3, #0x18
-	str r6, [sp, #0x4]
-	mov r0, #0x2
-	str r0, [sp, #0x8]
-	mov r0, #0x0
-	str r0, [sp, #0xc]
-	ldrh r1, [r7, #0x4]
-	ldrh r2, [r7, #0x2]
-	ldr r0, [sp, #0x40]
-	lsr r3, r3, #0x18
-	bl CreateMon
-	ldr r0, [sp, #0x40]
-	mov r1, #0x6
-	add r2, r7, #0x6
-	bl SetMonData
-	ldr r0, [sp, #0x34]
-	ldr r1, [sp, #0x40]
-	ldr r0, [r0, #0x4]
-	bl AddMonToParty
-	ldr r0, [sp, #0x1c]
-	add r7, #0x8
-	add r0, r0, #0x1
-	str r0, [sp, #0x1c]
-	add r0, r4, r5
-	add r0, #0x2b
-	ldrb r1, [r0, #0x0]
-	ldr r0, [sp, #0x1c]
-	cmp r0, r1
-	blt _0206AFFC
-_0206B08A:
-	b _0206B156
-_0206B08C:
-	mov r0, #0x0
-	str r0, [sp, #0x20]
-	add r0, r4, r5
-	add r0, #0x2b
-	ldrb r0, [r0, #0x0]
-	cmp r0, #0x0
-	ble _0206B156
-	ldr r0, [sp, #0x4c]
-	str r0, [sp, #0x3c]
-	add r0, r4, r6
-	str r0, [sp, #0x38]
-_0206B0A2:
-	ldr r0, [sp, #0x38]
-	ldr r2, [sp, #0x3c]
-	ldr r1, [r0, #0x18]
-	ldr r0, [sp, #0x3c]
-	ldrh r3, [r2, #0x0]
-	ldrh r2, [r2, #0x2]
-	ldrh r0, [r0, #0x4]
-	add r2, r3, r2
-	add r0, r0, r2
-	add r7, r1, r0
-	add r0, r7, #0x0
-	bl SetLCRNGSeed
-	add r0, r4, r5
-	add r0, #0x29
-	ldrb r0, [r0, #0x0]
-	mov r6, #0x0
-	cmp r0, #0x0
-	ble _0206B0DA
-_0206B0C8:
-	bl LCRandom
-	add r7, r0, #0x0
-	add r0, r4, r5
-	add r0, #0x29
-	ldrb r0, [r0, #0x0]
-	add r6, r6, #0x1
-	cmp r6, r0
-	blt _0206B0C8
-_0206B0DA:
-	ldr r0, [sp, #0x10]
-	lsl r1, r7, #0x8
-	add r6, r1, r0
-	ldr r0, [sp, #0x3c]
-	ldrh r1, [r0, #0x0]
-	mov r0, #0x1f
-	mul r0, r1
-	mov r1, #0xff
-	bl _s32_div_f
-	add r3, r0, #0x0
-	mov r0, #0x1
-	str r0, [sp, #0x0]
-	lsl r3, r3, #0x18
-	str r6, [sp, #0x4]
-	mov r0, #0x2
-	str r0, [sp, #0x8]
-	mov r0, #0x0
-	str r0, [sp, #0xc]
-	ldr r1, [sp, #0x3c]
-	ldr r2, [sp, #0x3c]
-	ldrh r1, [r1, #0x4]
-	ldrh r2, [r2, #0x2]
-	ldr r0, [sp, #0x40]
-	lsr r3, r3, #0x18
-	bl CreateMon
-	ldr r2, [sp, #0x3c]
-	ldr r0, [sp, #0x40]
-	mov r1, #0x6
-	add r2, r2, #0x6
-	bl SetMonData
-	ldr r7, [sp, #0x3c]
-	mov r6, #0x0
-_0206B120:
-	ldrh r1, [r7, #0x8]
-	lsl r2, r6, #0x18
-	ldr r0, [sp, #0x40]
-	lsr r2, r2, #0x18
-	bl MonSetMoveInSlot
-	add r6, r6, #0x1
-	add r7, r7, #0x2
-	cmp r6, #0x4
-	blt _0206B120
-	ldr r0, [sp, #0x38]
-	ldr r1, [sp, #0x40]
-	ldr r0, [r0, #0x4]
-	bl AddMonToParty
-	ldr r0, [sp, #0x3c]
-	add r0, #0x10
-	str r0, [sp, #0x3c]
-	ldr r0, [sp, #0x20]
-	add r0, r0, #0x1
-	str r0, [sp, #0x20]
-	add r0, r4, r5
-	add r0, #0x2b
-	ldrb r1, [r0, #0x0]
-	ldr r0, [sp, #0x20]
-	cmp r0, r1
-	blt _0206B0A2
-_0206B156:
-	ldr r0, [sp, #0x4c]
-	bl FreeToHeap
-	ldr r0, [sp, #0x40]
-	bl FreeToHeap
-	ldr r0, [sp, #0x44]
-	bl SetLCRNGSeed
-	add sp, #0x50
-	pop {r3-r7, pc}
diff --git a/arm9/asm/unk_0206B688.s b/arm9/asm/unk_0206B688.s
deleted file mode 100644
index c92d347d..00000000
--- a/arm9/asm/unk_0206B688.s
+++ /dev/null
@@ -1,357 +0,0 @@
-    .include "asm/macros.inc"
-    .include "global.inc"
-
-	.section .rodata
-
-	.global UNK_020F8074
-UNK_020F8074: ; 0x020F8074
-	.byte 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x00, 0x01, 0x02, 0x02
-	.byte 0x00, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, 0x02, 0x02, 0x02, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02
-	.byte 0x02, 0x02, 0x02, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, 0x02, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00
-	.byte 0x00, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02
-	.byte 0x02, 0x02, 0x00, 0x02, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02
-	.byte 0x02, 0x01, 0x02, 0x02, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01
-	.byte 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x00, 0x01, 0x02, 0x01, 0x00, 0x02
-	.byte 0x02, 0x00, 0x00, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x00, 0x01
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02
-	.byte 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x00, 0x02, 0x02, 0x00, 0x00, 0x00, 0x01, 0x02
-	.byte 0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01
-	.byte 0x01, 0x01, 0x00, 0x00, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x02, 0x02
-	.byte 0x00, 0x00, 0x02, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0x02, 0x02, 0x00, 0x00
-	.byte 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x01, 0x02, 0x02, 0x01, 0x01
-	.byte 0x01, 0x01, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x00, 0x02, 0x00, 0x02, 0x01, 0x01, 0x01
-	.byte 0x01, 0x01, 0x01, 0x00, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x02, 0x00, 0x01, 0x01, 0x02
-	.byte 0x02, 0x01, 0x01, 0x01, 0x01, 0x00, 0x02, 0x02, 0x02, 0x01, 0x02, 0x00, 0x00, 0x02, 0x02, 0x02
-	.byte 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x01, 0x02, 0x00, 0x00
-	.byte 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00
-	.byte 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00
-	.byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x02, 0x02, 0x00, 0x00, 0x00
-	.byte 0x00, 0x01, 0x00, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x00
-	.byte 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x02
-	.byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x00
-	.byte 0x02, 0x00, 0x02, 0x02, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02
-	.byte 0x02, 0x01, 0x01, 0x00, 0x02, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01
-	.byte 0x00, 0x02, 0x01, 0x00, 0x02, 0x01, 0x01, 0x00, 0x02, 0x02, 0x00, 0x01, 0x00, 0x02, 0x02, 0x00
-	.byte 0x00, 0x00, 0x00, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x02
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01
-	.byte 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-
-	.text
-
-	thumb_func_start FUN_0206B688
-FUN_0206B688: ; 0x0206B688
-	push {r3-r7, lr}
-	add r5, r0, #0x0
-	bl AcquireBoxMonLock
-	add r7, r0, #0x0
-	add r0, r5, #0x0
-	mov r1, #0x5
-	mov r2, #0x0
-	bl GetBoxMonData
-	add r4, r0, #0x0
-	add r0, r5, #0x0
-	mov r1, #0x4c
-	mov r2, #0x0
-	bl GetBoxMonData
-	add r6, r0, #0x0
-	add r0, r5, #0x0
-	bl BoxMon_GetAlternateForme
-	add r2, r0, #0x0
-	add r0, r4, #0x0
-	add r1, r6, #0x0
-	bl FUN_0206B6D4
-	add r4, r0, #0x0
-	add r0, r5, #0x0
-	add r1, r7, #0x0
-	bl ReleaseBoxMonLock
-	add r0, r4, #0x0
-	pop {r3-r7, pc}
-
-	thumb_func_start FUN_0206B6C8
-FUN_0206B6C8: ; 0x0206B6C8
-	push {r3, lr}
-	bl FUN_020690E4
-	bl FUN_0206B688
-	pop {r3, pc}
-
-	thumb_func_start FUN_0206B6D4
-FUN_0206B6D4: ; 0x0206B6D4
-	cmp r1, #0x1
-	bne _0206B6E8
-	ldr r1, _0206B748 ; =0x000001EA
-	cmp r0, r1
-	bne _0206B6E2
-	add r1, #0xc
-	b _0206B6E4
-_0206B6E2:
-	add r1, #0xb
-_0206B6E4:
-	add r0, r1, #0x0
-	bx lr
-_0206B6E8:
-	cmp r2, #0x0
-	beq _0206B73A
-	ldr r3, _0206B74C ; =0x00000182
-	cmp r0, r3
-	bne _0206B6F8
-	add r3, #0x74
-	add r0, r2, r3
-	bx lr
-_0206B6F8:
-	cmp r0, #0xc9
-	bne _0206B702
-	add r3, #0x78
-	add r0, r2, r3
-	bx lr
-_0206B702:
-	add r1, r3, #0x0
-	add r1, #0x1a
-	cmp r0, r1
-	bne _0206B710
-	add r3, #0x93
-	add r0, r2, r3
-	bx lr
-_0206B710:
-	add r1, r3, #0x0
-	add r1, #0x1b
-	cmp r0, r1
-	bne _0206B71E
-	add r3, #0x95
-	add r0, r2, r3
-	bx lr
-_0206B71E:
-	add r1, r3, #0x0
-	add r1, #0x24
-	cmp r0, r1
-	bne _0206B72C
-	add r3, #0x97
-	add r0, r2, r3
-	bx lr
-_0206B72C:
-	add r1, r3, #0x0
-	add r1, #0x25
-	cmp r0, r1
-	bne _0206B73A
-	add r3, #0x98
-	add r0, r2, r3
-	bx lr
-_0206B73A:
-	ldr r1, _0206B750 ; =0x000001ED
-	cmp r0, r1
-	bls _0206B742
-	mov r0, #0x0
-_0206B742:
-	add r0, r0, #0x7
-	bx lr
-	nop
-_0206B748: .word 0x000001EA
-_0206B74C: .word 0x00000182
-_0206B750: .word 0x000001ED
-
-	thumb_func_start BoxMon_GetAlternateForme
-BoxMon_GetAlternateForme: ; 0x0206B754
-	push {r4, lr}
-	mov r1, #0xad
-	mov r2, #0x0
-	add r4, r0, #0x0
-	bl GetBoxMonData
-	ldr r2, _0206B7B8 ; =0x0000019D
-	cmp r0, r2
-	bhi _0206B784
-	sub r1, r2, #0x1
-	cmp r0, r1
-	blo _0206B774
-	beq _0206B7A4
-	cmp r0, r2
-	beq _0206B7A4
-	b _0206B7B4
-_0206B774:
-	cmp r0, #0xc9
-	bhi _0206B77C
-	beq _0206B79C
-	b _0206B7B4
-_0206B77C:
-	sub r2, #0x1b
-	cmp r0, r2
-	beq _0206B7A4
-	b _0206B7B4
-_0206B784:
-	add r1, r2, #0x0
-	add r1, #0x9
-	cmp r0, r1
-	bhi _0206B794
-	add r2, #0x9
-	cmp r0, r2
-	beq _0206B7A4
-	b _0206B7B4
-_0206B794:
-	add r2, #0xa
-	cmp r0, r2
-	beq _0206B7A4
-	b _0206B7B4
-_0206B79C:
-	add r0, r4, #0x0
-	bl GetBoxMonUnownLetter
-	pop {r4, pc}
-_0206B7A4:
-	add r0, r4, #0x0
-	mov r1, #0x70
-	mov r2, #0x0
-	bl GetBoxMonData
-	lsl r0, r0, #0x10
-	lsr r0, r0, #0x10
-	pop {r4, pc}
-_0206B7B4:
-	mov r0, #0x0
-	pop {r4, pc}
-	.balign 4
-_0206B7B8: .word 0x0000019D
-
-	thumb_func_start FUN_0206B7BC
-FUN_0206B7BC: ; 0x0206B7BC
-	cmp r2, #0x1
-	bne _0206B7CE
-	ldr r1, _0206B830 ; =0x000001EA
-	cmp r0, r1
-	bne _0206B7CA
-	add r0, r1, #0x5
-	b _0206B82A
-_0206B7CA:
-	add r0, r1, #0x4
-	b _0206B82A
-_0206B7CE:
-	ldr r3, _0206B834 ; =0x000001ED
-	cmp r0, r3
-	bls _0206B7D8
-	mov r0, #0x0
-	b _0206B82A
-_0206B7D8:
-	cmp r1, #0x0
-	beq _0206B82A
-	add r2, r3, #0x0
-	sub r2, #0x6b
-	cmp r0, r2
-	bne _0206B7EA
-	add r0, r3, #0x2
-	add r0, r1, r0
-	b _0206B82A
-_0206B7EA:
-	cmp r0, #0xc9
-	bne _0206B7F4
-	add r0, r3, #0x5
-	add r0, r1, r0
-	b _0206B82A
-_0206B7F4:
-	add r2, r3, #0x0
-	sub r2, #0x51
-	cmp r0, r2
-	bne _0206B802
-	add r3, #0x21
-	add r0, r1, r3
-	b _0206B82A
-_0206B802:
-	add r2, r3, #0x0
-	sub r2, #0x50
-	cmp r0, r2
-	bne _0206B810
-	add r3, #0x23
-	add r0, r1, r3
-	b _0206B82A
-_0206B810:
-	add r2, r3, #0x0
-	sub r2, #0x47
-	cmp r0, r2
-	bne _0206B81E
-	add r3, #0x25
-	add r0, r1, r3
-	b _0206B82A
-_0206B81E:
-	add r2, r3, #0x0
-	sub r2, #0x46
-	cmp r0, r2
-	bne _0206B82A
-	add r3, #0x26
-	add r0, r1, r3
-_0206B82A:
-	ldr r1, _0206B838 ; =UNK_020F8074
-	ldrb r0, [r1, r0]
-	bx lr
-	.balign 4
-_0206B830: .word 0x000001EA
-_0206B834: .word 0x000001ED
-_0206B838: .word UNK_020F8074
-
-	thumb_func_start FUN_0206B83C
-FUN_0206B83C: ; 0x0206B83C
-	push {r3-r7, lr}
-	add r5, r0, #0x0
-	bl AcquireBoxMonLock
-	add r4, r0, #0x0
-	add r0, r5, #0x0
-	bl BoxMon_GetAlternateForme
-	add r6, r0, #0x0
-	add r0, r5, #0x0
-	mov r1, #0x5
-	mov r2, #0x0
-	bl GetBoxMonData
-	add r7, r0, #0x0
-	add r0, r5, #0x0
-	mov r1, #0x4c
-	mov r2, #0x0
-	bl GetBoxMonData
-	str r0, [sp, #0x0]
-	add r0, r5, #0x0
-	add r1, r4, #0x0
-	bl ReleaseBoxMonLock
-	ldr r2, [sp, #0x0]
-	add r0, r7, #0x0
-	add r1, r6, #0x0
-	bl FUN_0206B7BC
-	pop {r3-r7, pc}
-	.balign 4
-
-	thumb_func_start FUN_0206B87C
-FUN_0206B87C: ; 0x0206B87C
-	push {r3, lr}
-	bl FUN_020690E4
-	bl FUN_0206B83C
-	pop {r3, pc}
-
-	thumb_func_start FUN_0206B888
-FUN_0206B888: ; 0x0206B888
-	mov r0, #0x0
-	bx lr
-
-	thumb_func_start FUN_0206B88C
-FUN_0206B88C: ; 0x0206B88C
-	mov r0, #0x2
-	bx lr
-
-	thumb_func_start FUN_0206B890
-FUN_0206B890: ; 0x0206B890
-	mov r0, #0x4
-	bx lr
-
-	thumb_func_start FUN_0206B894
-FUN_0206B894: ; 0x0206B894
-	mov r0, #0x6
-	bx lr
-
-	thumb_func_start FUN_0206B898
-FUN_0206B898: ; 0x0206B898
-	mov r0, #0x1
-	bx lr
-
-	thumb_func_start FUN_0206B89C
-FUN_0206B89C: ; 0x0206B89C
-	mov r0, #0x3
-	bx lr
-
-	thumb_func_start FUN_0206B8A0
-FUN_0206B8A0: ; 0x0206B8A0
-	mov r0, #0x5
-	bx lr
diff --git a/arm9/asm/unk_0206BB28.s b/arm9/asm/unk_0206BB28.s
deleted file mode 100644
index 15f4469e..00000000
--- a/arm9/asm/unk_0206BB28.s
+++ /dev/null
@@ -1,37 +0,0 @@
-    .include "asm/macros.inc"
-    .include "global.inc"
-
-	.text
-
-	thumb_func_start FUN_0206BB28
-FUN_0206BB28: ; 0x0206BB28
-	push {r3, lr}
-	bl Sav2_Pokedex_get
-	bl FUN_0206BB34
-	pop {r3, pc}
-
-	thumb_func_start FUN_0206BB34
-FUN_0206BB34: ; 0x0206BB34
-	push {r3, lr}
-	bl Pokedex_GetNatDexFlag
-	cmp r0, #0x1
-	bne _0206BB42
-	mov r0, #0x1
-	pop {r3, pc}
-_0206BB42:
-	mov r0, #0x0
-	pop {r3, pc}
-	.balign 4
-
-	thumb_func_start FUN_0206BB48
-FUN_0206BB48: ; 0x0206BB48
-	push {r3, lr}
-	cmp r0, #0x0
-	bne _0206BB58
-	lsl r0, r1, #0x10
-	lsr r0, r0, #0x10
-	bl SpeciesToSinnohDexNo
-	add r1, r0, #0x0
-_0206BB58:
-	add r0, r1, #0x0
-	pop {r3, pc}
diff --git a/arm9/asm/unk_0206C700.s b/arm9/asm/unk_0206C700.s
index c42b766a..f5a0873e 100644
--- a/arm9/asm/unk_0206C700.s
+++ b/arm9/asm/unk_0206C700.s
@@ -2096,7 +2096,7 @@ _0206D86E:
 	add r5, r0, #0x0
 	ldr r0, [r4, #0x28]
 	add r1, r5, #0x0
-	bl FUN_02069B88
+	bl CopyPokemonToPokemon
 	mov r0, #0x49
 	lsl r0, r0, #0x2
 	str r0, [sp, #0x0]
@@ -2576,7 +2576,7 @@ FUN_0206DC80: ; 0x0206DC80
 	add r5, r0, #0x0
 	ldr r0, [r4, #0x28]
 	add r1, r5, #0x0
-	bl FUN_02069B88
+	bl CopyPokemonToPokemon
 	add r2, r4, #0x0
 	add r0, r5, #0x0
 	mov r1, #0x5
diff --git a/arm9/asm/unk_0206F3FC.s b/arm9/asm/unk_0206F3FC.s
index db3328a4..212030cc 100644
--- a/arm9/asm/unk_0206F3FC.s
+++ b/arm9/asm/unk_0206F3FC.s
@@ -5672,7 +5672,7 @@ FUN_02072080: ; 0x02072080
 	add r2, sp, #0x0
 	bl SetMonData
 	add r0, r5, #0x0
-	bl FUN_02069EC4
+	bl Pokemon_UpdateArceusForme
 	ldr r1, _020720D8 ; =0x00000B25
 	ldr r0, _020720D4 ; =0x000005A4
 	ldrb r3, [r4, r1]
@@ -5715,7 +5715,7 @@ FUN_020720E0: ; 0x020720E0
 	add r2, sp, #0x1c
 	bl SetMonData
 	add r0, r5, #0x0
-	bl FUN_02069EC4
+	bl Pokemon_UpdateArceusForme
 	ldr r1, _02072138 ; =0x00000B25
 	mov r2, #0x2c
 	ldrb r3, [r4, r1]
diff --git a/arm9/asm/unk_02073DA8.s b/arm9/asm/unk_02073DA8.s
index 8b8442a3..6635b399 100644
--- a/arm9/asm/unk_02073DA8.s
+++ b/arm9/asm/unk_02073DA8.s
@@ -246,7 +246,7 @@ _02073F66:
 	add r2, sp, #0x0
 	bl SetMonData
 	add r0, r6, #0x0
-	bl FUN_02069EC4
+	bl Pokemon_UpdateArceusForme
 	ldr r2, _02074058 ; =0x0000069C
 	mov r1, #0x52
 	ldr r0, [r5, r2]
@@ -633,7 +633,7 @@ FUN_020742A8: ; 0x020742A8
 	add r2, sp, #0x0
 	bl SetMonData
 	add r0, r5, #0x0
-	bl FUN_02069EC4
+	bl Pokemon_UpdateArceusForme
 	ldr r1, _02074330 ; =0x00000B25
 	mov r2, #0x2c
 	ldrb r3, [r4, r1]
@@ -790,7 +790,7 @@ FUN_02074428: ; 0x02074428
 	ldrb r1, [r4, r1]
 	ldr r0, [r0, #0x0]
 	bl GetPartyMonByIndex
-	bl FUN_0206AA84
+	bl Pokemon_RemoveCapsule
 	ldr r0, _0207444C ; =0x000005A4
 	mov r1, #0x0
 	ldr r0, [r4, r0]
diff --git a/arm9/asm/unk_02079C70.s b/arm9/asm/unk_02079C70.s
index c701f1a8..33c0a040 100644
--- a/arm9/asm/unk_02079C70.s
+++ b/arm9/asm/unk_02079C70.s
@@ -1536,7 +1536,7 @@ _0207A896:
 	add r4, r0, #0x0
 	add r0, r6, #0x0
 	add r1, r4, #0x0
-	bl FUN_02069A64
+	bl CopyBoxPokemonToPokemon
 	b _0207A8C0
 _0207A8BA:
 	bl FUN_0207B628
@@ -1825,7 +1825,7 @@ FUN_0207AAE0: ; 0x0207AAE0
 	add r4, r0, #0x0
 	add r0, r6, #0x0
 	add r1, r4, #0x0
-	bl FUN_02069A64
+	bl CopyBoxPokemonToPokemon
 	add r0, r5, #0x0
 	add r1, r4, #0x0
 	add r2, r7, #0x0
@@ -2163,7 +2163,7 @@ _0207AD26:
 _0207ADE0:
 	add r0, r6, #0x0
 	add r1, r4, #0x0
-	bl FUN_02069BC8
+	bl MonGetFlavorPreference
 	cmp r0, #0x1
 	bne _0207ADF4
 	add r0, r5, #0x0
@@ -2202,7 +2202,7 @@ _0207ADFE:
 	orr r0, r2
 	str r0, [r5, #0x50]
 	add r0, r6, #0x0
-	bl FUN_02069E94
+	bl Pokemon_IsImmuneToPokerus
 	cmp r0, #0x1
 	bne _0207AE4E
 	ldr r1, [r5, #0x50]
@@ -2215,7 +2215,7 @@ _0207ADFE:
 	b _0207AE84
 _0207AE4E:
 	add r0, r6, #0x0
-	bl FUN_02069E74
+	bl Pokemon_HasPokerus
 	cmp r0, #0x1
 	bne _0207AE7C
 	ldr r2, [r5, #0x50]
diff --git a/arm9/asm/unk_0207D5BC.s b/arm9/asm/unk_0207D5BC.s
index ca5fef37..2546b905 100644
--- a/arm9/asm/unk_0207D5BC.s
+++ b/arm9/asm/unk_0207D5BC.s
@@ -1540,7 +1540,7 @@ FUN_0207E190: ; 0x0207E190
 	add r4, r0, #0x0
 	add r0, r6, #0x0
 	add r1, r4, #0x0
-	bl FUN_02069A64
+	bl CopyBoxPokemonToPokemon
 	mov r0, #0x91
 	lsl r0, r0, #0x2
 	ldr r0, [r5, r0]
diff --git a/arm9/asm/unk_0207FD00.s b/arm9/asm/unk_0207FD00.s
index 294b8bfc..e48ad6f9 100644
--- a/arm9/asm/unk_0207FD00.s
+++ b/arm9/asm/unk_0207FD00.s
@@ -5,14 +5,14 @@
 
 	.global UNK_020FBB48
 UNK_020FBB48: ; 0x020FBB48
-	.byte 0x46, 0x00, 0x41, 0x00, 0x42, 0x00, 0x43, 0x00, 0x44, 0x00, 0x45, 0x00
+	.short 0x0046, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045
 
 	.global UNK_020FBB54
 UNK_020FBB54: ; 0x020FBB54
-	.byte 0x47, 0x00, 0x48, 0x00, 0x49, 0x00, 0x4A, 0x00, 0x4B, 0x00, 0x4C, 0x00, 0x4D, 0x00, 0x4E, 0x00
-	.byte 0x4F, 0x00, 0x50, 0x00, 0x51, 0x00, 0x52, 0x00, 0x53, 0x00, 0x54, 0x00, 0x55, 0x00, 0x56, 0x00
-	.byte 0x57, 0x00, 0x58, 0x00, 0x59, 0x00, 0x5A, 0x00, 0x5B, 0x00, 0x5C, 0x00, 0x5D, 0x00, 0x5E, 0x00
-	.byte 0x5F, 0x00, 0x60, 0x00, 0x61, 0x00, 0x62, 0x00, 0x63, 0x00, 0x64, 0x00
+	.short 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E
+	.short 0x004F, 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056
+	.short 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E
+	.short 0x005F, 0x0060, 0x0061, 0x0062, 0x0063, 0x0064
 
 	.text
 
@@ -1171,7 +1171,7 @@ FUN_02080678: ; 0x02080678
 _0208068A:
 	ldr r0, [r5, #0xc]
 	add r1, r4, #0x0
-	bl FUN_02069BC8
+	bl MonGetFlavorPreference
 	cmp r0, #0x1
 	bne _02080698
 	add r6, r4, #0x1
diff --git a/arm9/asm/unk_02080C38.s b/arm9/asm/unk_02080C38.s
index 458d4420..0f1630ed 100644
--- a/arm9/asm/unk_02080C38.s
+++ b/arm9/asm/unk_02080C38.s
@@ -930,7 +930,7 @@ _02081304:
 	bl FUN_02029F9C
 	ldr r0, [r6, #0x8]
 	ldr r1, [r4, #0x0]
-	bl FUN_02069B88
+	bl CopyPokemonToPokemon
 	mov r0, #0x8
 	mov r1, #0x14
 	bl String_ctor