through FUN_02069CF4

54 files changed, 876 insertions, 1125 deletions

diff --git a/arm9/asm/party.s b/arm9/asm/party.s
index 12a63f73..de141e25 100644
--- a/arm9/asm/party.s
+++ b/arm9/asm/party.s
@@ -153,13 +153,13 @@ _0206B992:
 	pop {r3-r7, pc}
 	.balign 4
 
-	thumb_func_start FUN_0206B9AC
-FUN_0206B9AC: ; 0x0206B9AC
+	thumb_func_start GetPartyCount
+GetPartyCount: ; 0x0206B9AC
 	ldr r0, [r0, #0x4]
 	bx lr
 
-	thumb_func_start FUN_0206B9B0
-FUN_0206B9B0: ; 0x0206B9B0
+	thumb_func_start GetPartyMonByIndex
+GetPartyMonByIndex: ; 0x0206B9B0
 	push {r3-r5, lr}
 	add r5, r0, #0x0
 	add r4, r1, #0x0
diff --git a/arm9/asm/pokemon_s.s b/arm9/asm/pokemon_s.s
index 472197ae..7e0497d2 100644
--- a/arm9/asm/pokemon_s.s
+++ b/arm9/asm/pokemon_s.s
@@ -9,693 +9,13 @@
 
 	.text
 
-	thumb_func_start FUN_02069818
-FUN_02069818: ; 0x02069818
-	push {r3-r7, lr}
-	sub sp, #0x10
-	add r7, r0, #0x0
-	add r5, r1, #0x0
-	mov r0, #0x0
-	mov r1, #0x2c
-	str r2, [sp, #0x0]
-	str r0, [sp, #0x8]
-	bl AllocFromHeap
-	add r4, r0, #0x0
-	add r0, r7, #0x0
-	mov r1, #0x5
-	mov r2, #0x0
-	bl GetMonData
-	lsl r0, r0, #0x10
-	lsr r0, r0, #0x10
-	str r0, [sp, #0x4]
-	add r0, r7, #0x0
-	mov r1, #0x70
-	mov r2, #0x0
-	bl GetMonData
-	str r0, [sp, #0xc]
-	add r0, r7, #0x0
-	mov r1, #0xa0
-	mov r2, #0x0
-	bl GetMonData
-	lsl r0, r0, #0x18
-	lsr r6, r0, #0x18
-	ldr r0, [sp, #0x4]
-	ldr r1, [sp, #0xc]
-	add r2, r4, #0x0
-	bl LoadWotbl_HandleAlternateForme
-	ldr r0, [r5, #0x0]
-	lsl r0, r0, #0x1
-	ldrh r2, [r4, r0]
-	ldr r0, _020698D8 ; =0x0000FFFF
-	cmp r2, r0
-	bne _0206987A
-	add r0, r4, #0x0
-	bl FreeToHeap
-	add sp, #0x10
-	mov r0, #0x0
-	pop {r3-r7, pc}
-_0206987A:
-	mov r0, #0xfe
-	lsl r0, r0, #0x8
-	add r3, r2, #0x0
-	and r3, r0
-	lsl r6, r6, #0x9
-	cmp r6, r3
-	beq _020698AC
-	ldr r1, _020698D8 ; =0x0000FFFF
-_0206988A:
-	ldr r2, [r5, #0x0]
-	add r2, r2, #0x1
-	str r2, [r5, #0x0]
-	lsl r2, r2, #0x1
-	ldrh r2, [r4, r2]
-	cmp r2, r1
-	bne _020698A4
-	add r0, r4, #0x0
-	bl FreeToHeap
-	add sp, #0x10
-	mov r0, #0x0
-	pop {r3-r7, pc}
-_020698A4:
-	add r3, r2, #0x0
-	and r3, r0
-	cmp r6, r3
-	bne _0206988A
-_020698AC:
-	cmp r6, r3
-	bne _020698CC
-	ldr r0, _020698DC ; =0x000001FF
-	add r1, r2, #0x0
-	and r1, r0
-	ldr r0, [sp, #0x0]
-	strh r1, [r0, #0x0]
-	ldr r0, [r5, #0x0]
-	ldr r1, [sp, #0x0]
-	add r0, r0, #0x1
-	str r0, [r5, #0x0]
-	ldrh r1, [r1, #0x0]
-	add r0, r7, #0x0
-	bl FUN_02069698
-	str r0, [sp, #0x8]
-_020698CC:
-	add r0, r4, #0x0
-	bl FreeToHeap
-	ldr r0, [sp, #0x8]
-	add sp, #0x10
-	pop {r3-r7, pc}
-	.balign 4
-_020698D8: .word 0x0000FFFF
-_020698DC: .word 0x000001FF
-
-	thumb_func_start FUN_020698E0
-FUN_020698E0: ; 0x020698E0
-	ldr r3, _020698E4 ; =FUN_020698E8
-	bx r3
-	.balign 4
-_020698E4: .word FUN_020698E8
-
-	thumb_func_start FUN_020698E8
-FUN_020698E8: ; 0x020698E8
-	push {r4-r6, lr}
-	sub sp, #0x8
-	add r4, r1, #0x0
-	add r6, r2, #0x0
-	add r1, #0x36
-	mov r2, #0x0
-	add r5, r0, #0x0
-	bl GetBoxMonData
-	add r1, sp, #0x0
-	strh r0, [r1, #0x4]
-	add r1, r4, #0x0
-	add r0, r5, #0x0
-	add r1, #0x3a
-	mov r2, #0x0
-	bl GetBoxMonData
-	add r1, sp, #0x0
-	strb r0, [r1, #0x2]
-	add r1, r4, #0x0
-	add r0, r5, #0x0
-	add r1, #0x3e
-	mov r2, #0x0
-	bl GetBoxMonData
-	add r1, sp, #0x0
-	strb r0, [r1, #0x0]
-	add r1, r6, #0x0
-	add r0, r5, #0x0
-	add r1, #0x36
-	mov r2, #0x0
-	bl GetBoxMonData
-	add r1, sp, #0x0
-	strh r0, [r1, #0x6]
-	add r1, r6, #0x0
-	add r0, r5, #0x0
-	add r1, #0x3a
-	mov r2, #0x0
-	bl GetBoxMonData
-	add r1, sp, #0x0
-	strb r0, [r1, #0x3]
-	add r1, r6, #0x0
-	add r0, r5, #0x0
-	add r1, #0x3e
-	mov r2, #0x0
-	bl GetBoxMonData
-	add r1, sp, #0x0
-	strb r0, [r1, #0x1]
-	add r1, r4, #0x0
-	add r2, sp, #0x4
-	add r0, r5, #0x0
-	add r1, #0x36
-	add r2, #0x2
-	bl SetBoxMonData
-	add r1, r4, #0x0
-	add r2, sp, #0x0
-	add r0, r5, #0x0
-	add r1, #0x3a
-	add r2, #0x3
-	bl SetBoxMonData
-	add r4, #0x3e
-	add r2, sp, #0x0
-	add r0, r5, #0x0
-	add r1, r4, #0x0
-	add r2, #0x1
-	bl SetBoxMonData
-	add r1, r6, #0x0
-	add r0, r5, #0x0
-	add r1, #0x36
-	add r2, sp, #0x4
-	bl SetBoxMonData
-	add r1, r6, #0x0
-	add r2, sp, #0x0
-	add r0, r5, #0x0
-	add r1, #0x3a
-	add r2, #0x2
-	bl SetBoxMonData
-	add r6, #0x3e
-	add r0, r5, #0x0
-	add r1, r6, #0x0
-	add r2, sp, #0x0
-	bl SetBoxMonData
-	add sp, #0x8
-	pop {r4-r6, pc}
-	.balign 4
-
-	thumb_func_start FUN_020699A4
-FUN_020699A4: ; 0x020699A4
-	push {r3-r7, lr}
-	add r4, r1, #0x0
-	add r5, r0, #0x0
-	cmp r4, #0x3
-	bhs _02069A0A
-	mov r7, #0x0
-	add r6, sp, #0x0
-_020699B2:
-	add r1, r4, #0x0
-	add r0, r5, #0x0
-	add r1, #0x37
-	add r2, r7, #0x0
-	bl GetMonData
-	add r1, r4, #0x0
-	strh r0, [r6, #0x2]
-	add r0, r5, #0x0
-	add r1, #0x3b
-	mov r2, #0x0
-	bl GetMonData
-	add r1, r4, #0x0
-	strb r0, [r6, #0x1]
-	add r0, r5, #0x0
-	add r1, #0x3f
-	mov r2, #0x0
-	bl GetMonData
-	add r1, r4, #0x0
-	add r2, sp, #0x0
-	strb r0, [r6, #0x0]
-	add r0, r5, #0x0
-	add r1, #0x36
-	add r2, #0x2
-	bl SetMonData
-	add r1, r4, #0x0
-	add r2, sp, #0x0
-	add r0, r5, #0x0
-	add r1, #0x3a
-	add r2, #0x1
-	bl SetMonData
-	add r1, r4, #0x0
-	add r0, r5, #0x0
-	add r1, #0x3e
-	add r2, sp, #0x0
-	bl SetMonData
-	add r4, r4, #0x1
-	cmp r4, #0x3
-	blo _020699B2
-_02069A0A:
-	mov r1, #0x0
-	add r0, sp, #0x0
-	strh r1, [r0, #0x2]
-	strb r1, [r0, #0x1]
-	strb r1, [r0, #0x0]
-	add r2, sp, #0x0
-	add r0, r5, #0x0
-	mov r1, #0x39
-	add r2, #0x2
-	bl SetMonData
-	add r2, sp, #0x0
-	add r0, r5, #0x0
-	mov r1, #0x3d
-	add r2, #0x1
-	bl SetMonData
-	add r0, r5, #0x0
-	mov r1, #0x41
-	add r2, sp, #0x0
-	bl SetMonData
-	pop {r3-r7, pc}
-
-	thumb_func_start MonHasMove
-MonHasMove: ; 0x02069A38
-	push {r3-r7, lr}
-	mov r4, #0x0
-	add r6, r0, #0x0
-	add r5, r1, #0x0
-	add r7, r4, #0x0
-_02069A42:
-	add r1, r4, #0x0
-	add r0, r6, #0x0
-	add r1, #0x36
-	add r2, r7, #0x0
-	bl GetMonData
-	cmp r5, r0
-	beq _02069A58
-	add r4, r4, #0x1
-	cmp r4, #0x4
-	blt _02069A42
-_02069A58:
-	cmp r4, #0x4
-	beq _02069A60
-	mov r0, #0x1
-	pop {r3-r7, pc}
-_02069A60:
-	mov r0, #0x0
-	pop {r3-r7, pc}
-
-	thumb_func_start FUN_02069A64
-FUN_02069A64: ; 0x02069A64
-	push {r4-r5, lr}
-	sub sp, #0x1c
-	add r5, r0, #0x0
-	add r4, r1, #0x0
-	mov r0, #0x0
-	str r0, [sp, #0x0]
-	add r3, r4, #0x0
-	mov r2, #0x11
-_02069A74:
-	ldmia r5!, {r0-r1}
-	stmia r3!, {r0-r1}
-	sub r2, r2, #0x1
-	bne _02069A74
-	ldrh r1, [r4, #0x4]
-	lsl r0, r1, #0x1e
-	lsr r0, r0, #0x1f
-	beq _02069A8E
-	mov r0, #0x1
-	bic r1, r0
-	mov r0, #0x1
-	orr r0, r1
-	strh r0, [r4, #0x4]
-_02069A8E:
-	add r0, r4, #0x0
-	mov r1, #0x9f
-	add r2, sp, #0x0
-	bl SetMonData
-	add r0, r4, #0x0
-	mov r1, #0xa2
-	add r2, sp, #0x0
-	bl SetMonData
-	add r0, r4, #0x0
-	mov r1, #0xa3
-	add r2, sp, #0x0
-	bl SetMonData
-	mov r0, #0x0
-	bl CreateNewSealsObject
-	add r5, r0, #0x0
-	add r0, r4, #0x0
-	mov r1, #0xa9
-	add r2, r5, #0x0
-	bl SetMonData
-	add r0, r5, #0x0
-	bl FreeToHeap
-	add r0, r4, #0x0
-	mov r1, #0xa1
-	add r2, sp, #0x0
-	bl SetMonData
-	mov r0, #0x0
-	add r1, sp, #0x4
-	mov r2, #0x18
-	bl MIi_CpuClearFast
-	add r0, r4, #0x0
-	mov r1, #0xaa
-	add r2, sp, #0x4
-	bl SetMonData
-	add r0, r4, #0x0
-	bl CalcMonLevelAndStats
-	add sp, #0x1c
-	pop {r4-r5, pc}
-
-	thumb_func_start FUN_02069AEC
-FUN_02069AEC: ; 0x02069AEC
-	push {r3-r7, lr}
-	str r0, [sp, #0x0]
-	bl FUN_0206B9AC
-	add r7, r0, #0x0
-	mov r6, #0x1
-	mov r5, #0x0
-	cmp r7, #0x0
-	ble _02069B3C
-_02069AFE:
-	ldr r0, [sp, #0x0]
-	add r1, r5, #0x0
-	bl FUN_0206B9B0
-	mov r1, #0x5
-	mov r2, #0x0
-	add r4, r0, #0x0
-	bl GetMonData
-	cmp r0, #0x0
-	beq _02069B36
-	add r0, r4, #0x0
-	mov r1, #0x4c
-	mov r2, #0x0
-	bl GetMonData
-	cmp r0, #0x0
-	bne _02069B36
-	add r0, r4, #0x0
-	mov r1, #0xa0
-	mov r2, #0x0
-	bl GetMonData
-	lsl r0, r0, #0x18
-	lsr r0, r0, #0x18
-	cmp r0, r6
-	bls _02069B36
-	add r6, r0, #0x0
-_02069B36:
-	add r5, r5, #0x1
-	cmp r5, r7
-	blt _02069AFE
-_02069B3C:
-	add r0, r6, #0x0
-	pop {r3-r7, pc}
-
-	thumb_func_start FUN_02069B40
-FUN_02069B40: ; 0x02069B40
-	push {r3, lr}
-	sub sp, #0x8
-	add r3, r0, #0x0
-	mov r0, #0x2
-	str r0, [sp, #0x0]
-	add r0, sp, #0x4
-	mov r1, #0x6d ; NARC_POKETOOL_POKEZUKAN
-	mov r2, #0x0
-	lsl r3, r3, #0x1
-	bl ReadFromNarcMemberByIdPair
-	add r0, sp, #0x4
-	ldrh r0, [r0, #0x0]
-	add sp, #0x8
-	pop {r3, pc}
-	.balign 4
-
-	thumb_func_start FUN_02069B60
-FUN_02069B60: ; 0x02069B60
-	push {r3, lr}
-	sub sp, #0x8
-	add r3, r0, #0x0
-	mov r2, #0x0
-	add r0, sp, #0x4
-	strh r2, [r0, #0x0]
-	cmp r3, #0x97
-	bhi _02069B7E
-	mov r0, #0x2
-	str r0, [sp, #0x0]
-	add r0, sp, #0x4
-	mov r1, #0x91 ; NARC_POKETOOL_SHINZUKAN
-	lsl r3, r3, #0x1
-	bl ReadFromNarcMemberByIdPair
-_02069B7E:
-	add r0, sp, #0x4
-	ldrh r0, [r0, #0x0]
-	add sp, #0x8
-	pop {r3, pc}
-	.balign 4
-
-	thumb_func_start FUN_02069B88
-FUN_02069B88: ; 0x02069B88
-	push {r3-r4}
-	add r4, r0, #0x0
-	add r3, r1, #0x0
-	mov r2, #0x1d
-_02069B90:
-	ldmia r4!, {r0-r1}
-	stmia r3!, {r0-r1}
-	sub r2, r2, #0x1
-	bne _02069B90
-	ldr r0, [r4, #0x0]
-	str r0, [r3, #0x0]
-	pop {r3-r4}
-	bx lr
-
-	thumb_func_start FUN_02069BA0
-FUN_02069BA0: ; 0x02069BA0
-	push {r3-r4}
-	add r4, r0, #0x0
-	add r3, r1, #0x0
-	mov r2, #0x11
-_02069BA8:
-	ldmia r4!, {r0-r1}
-	stmia r3!, {r0-r1}
-	sub r2, r2, #0x1
-	bne _02069BA8
-	pop {r3-r4}
-	bx lr
-
-	thumb_func_start FUN_02069BB4
-FUN_02069BB4: ; 0x02069BB4
-	push {r3-r4}
-	add r4, r0, #0x0
-	add r3, r1, #0x0
-	mov r2, #0x11
-_02069BBC:
-	ldmia r4!, {r0-r1}
-	stmia r3!, {r0-r1}
-	sub r2, r2, #0x1
-	bne _02069BBC
-	pop {r3-r4}
-	bx lr
-
-	thumb_func_start FUN_02069BC8
-FUN_02069BC8: ; 0x02069BC8
-	ldr r3, _02069BCC ; =FUN_02069BD0
-	bx r3
-	.balign 4
-_02069BCC: .word FUN_02069BD0
-
-	thumb_func_start FUN_02069BD0
-FUN_02069BD0: ; 0x02069BD0
-	push {r4, lr}
-	add r4, r1, #0x0
-	mov r1, #0x0
-	add r2, r1, #0x0
-	bl GetBoxMonData
-	add r1, r4, #0x0
-	bl FUN_02069BE4
-	pop {r4, pc}
-
-	thumb_func_start FUN_02069BE4
-FUN_02069BE4: ; 0x02069BE4
-	push {r4, lr}
-	add r4, r1, #0x0
-	bl GetNatureFromPersonality
-	lsl r1, r0, #0x2
-	add r1, r0, r1
-	ldr r0, _02069BF8 ; =UNK_020F7F16
-	add r0, r0, r1
-	ldrsb r0, [r4, r0]
-	pop {r4, pc}
-	.balign 4
-_02069BF8: .word UNK_020F7F16
-
-	thumb_func_start FUN_02069BFC
-FUN_02069BFC: ; 0x02069BFC
-	push {r3-r7, lr}
-	add r4, r0, #0x0
-	add r7, r1, #0x0
-	mov r0, #0x0
-	mov r1, #0x2c
-	add r5, r2, #0x0
-	bl AllocFromHeap
-	add r6, r0, #0x0
-	add r0, r4, #0x0
-	add r1, r7, #0x0
-	add r2, r6, #0x0
-	bl LoadWotbl_HandleAlternateForme
-	ldrh r1, [r6, #0x0]
-	ldr r0, _02069C44 ; =0x0000FFFF
-	mov r4, #0x0
-	cmp r1, r0
-	beq _02069C3A
-	ldr r1, _02069C48 ; =0x000001FF
-	ldr r2, _02069C44 ; =0x0000FFFF
-	add r0, r6, #0x0
-_02069C28:
-	ldrh r3, [r0, #0x0]
-	add r0, r0, #0x2
-	add r4, r4, #0x1
-	and r3, r1
-	strh r3, [r5, #0x0]
-	ldrh r3, [r0, #0x0]
-	add r5, r5, #0x2
-	cmp r3, r2
-	bne _02069C28
-_02069C3A:
-	add r0, r6, #0x0
-	bl FreeToHeap
-	add r0, r4, #0x0
-	pop {r3-r7, pc}
-	.balign 4
-_02069C44: .word 0x0000FFFF
-_02069C48: .word 0x000001FF
-
-	thumb_func_start FUN_02069C4C
-FUN_02069C4C: ; 0x02069C4C
-	push {r3-r7, lr}
-	add r5, r0, #0x0
-	bl FUN_0206B9AC
-	add r6, r0, #0x0
-	bl rand_LC
-	mov r1, #0x1
-	lsl r1, r1, #0xe
-	cmp r0, r1
-	beq _02069C70
-	lsl r1, r1, #0x1
-	cmp r0, r1
-	beq _02069C70
-	mov r1, #0x3
-	lsl r1, r1, #0xe
-	cmp r0, r1
-	bne _02069CF2
-_02069C70:
-	bl rand_LC
-	add r1, r6, #0x0
-	bl _s32_div_f
-	add r0, r5, #0x0
-	add r7, r1, #0x0
-	bl FUN_0206B9B0
-	mov r1, #0x5
-	mov r2, #0x0
-	add r4, r0, #0x0
-	bl GetMonData
-	cmp r0, #0x0
-	beq _02069C70
-	add r0, r4, #0x0
-	mov r1, #0x4c
-	mov r2, #0x0
-	bl GetMonData
-	cmp r0, #0x0
-	bne _02069C70
-	add r0, r7, #0x0
-	bl MaskOfFlagNo
-	add r1, r0, #0x0
-	lsl r1, r1, #0x18
-	add r0, r5, #0x0
-	lsr r1, r1, #0x18
-	bl FUN_02069CF4
-	cmp r0, #0x0
-	bne _02069CF2
-	add r5, sp, #0x0
-	mov r6, #0x7
-_02069CB8:
-	bl rand_LC
-	strb r0, [r5, #0x0]
-	ldrb r2, [r5, #0x0]
-	add r1, r2, #0x0
-	and r1, r6
-	beq _02069CB8
-	mov r0, #0xf0
-	tst r0, r2
-	beq _02069CD0
-	add r0, sp, #0x0
-	strb r1, [r0, #0x0]
-_02069CD0:
-	add r1, sp, #0x0
-	ldrb r2, [r1, #0x0]
-	lsl r0, r2, #0x4
-	orr r0, r2
-	strb r0, [r1, #0x0]
-	ldrb r2, [r1, #0x0]
-	mov r0, #0xf3
-	and r0, r2
-	strb r0, [r1, #0x0]
-	ldrb r0, [r1, #0x0]
-	add r2, sp, #0x0
-	add r0, r0, #0x1
-	strb r0, [r1, #0x0]
-	add r0, r4, #0x0
-	mov r1, #0x99
-	bl SetMonData
-_02069CF2:
-	pop {r3-r7, pc}
-
-	thumb_func_start FUN_02069CF4
-FUN_02069CF4: ; 0x02069CF4
-	push {r3-r7, lr}
-	mov r6, #0x0
-	add r5, r1, #0x0
-	str r0, [sp, #0x0]
-	mov r4, #0x1
-	add r7, r6, #0x0
-	cmp r5, #0x0
-	beq _02069D32
-_02069D04:
-	mov r0, #0x1
-	tst r0, r5
-	beq _02069D26
-	ldr r0, [sp, #0x0]
-	add r1, r6, #0x0
-	bl FUN_0206B9B0
-	mov r1, #0x99
-	mov r2, #0x0
-	bl GetMonData
-	cmp r0, #0x0
-	beq _02069D26
-	add r0, r7, #0x0
-	orr r0, r4
-	lsl r0, r0, #0x18
-	lsr r7, r0, #0x18
-_02069D26:
-	lsl r0, r5, #0x17
-	add r6, r6, #0x1
-	lsl r4, r4, #0x1
-	lsr r5, r0, #0x18
-	bne _02069D04
-	b _02069D4A
-_02069D32:
-	add r1, r6, #0x0
-	bl FUN_0206B9B0
-	mov r1, #0x99
-	add r2, r6, #0x0
-	bl GetMonData
-	cmp r0, #0x0
-	beq _02069D4A
-	add r0, r7, #0x1
-	lsl r0, r0, #0x18
-	lsr r7, r0, #0x18
-_02069D4A:
-	add r0, r7, #0x0
-	pop {r3-r7, pc}
-	.balign 4
-
 	thumb_func_start FUN_02069D50
 FUN_02069D50: ; 0x02069D50
 	push {r4-r7, lr}
 	sub sp, #0xc
 	str r0, [sp, #0x0]
 	add r5, r1, #0x0
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	mov r6, #0x0
 	str r0, [sp, #0x4]
 	cmp r0, #0x0
@@ -704,7 +24,7 @@ FUN_02069D50: ; 0x02069D50
 _02069D66:
 	ldr r0, [sp, #0x0]
 	add r1, r6, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #0x5
 	mov r2, #0x0
 	add r7, r0, #0x0
@@ -759,7 +79,7 @@ FUN_02069DC8: ; 0x02069DC8
 	push {r3-r7, lr}
 	sub sp, #0x8
 	add r5, r0, #0x0
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	add r7, r0, #0x0
 	bl rand_LC
 	mov r1, #0x3
@@ -774,7 +94,7 @@ FUN_02069DC8: ; 0x02069DC8
 _02069DEC:
 	add r0, r5, #0x0
 	add r1, r4, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #0x5
 	mov r2, #0x0
 	add r6, r0, #0x0
@@ -796,7 +116,7 @@ _02069DEC:
 	beq _02069E40
 	add r0, r5, #0x0
 	sub r1, r4, #0x1
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #0x99
 	mov r2, #0x0
 	add r6, r0, #0x0
@@ -814,7 +134,7 @@ _02069E40:
 	bge _02069E6A
 	add r0, r5, #0x0
 	add r1, r4, #0x1
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #0x99
 	mov r2, #0x0
 	add r6, r0, #0x0
diff --git a/arm9/asm/scrcmd.s b/arm9/asm/scrcmd.s
index 8594afe7..4a3c3f82 100644
--- a/arm9/asm/scrcmd.s
+++ b/arm9/asm/scrcmd.s
@@ -3953,7 +3953,7 @@ FUN_0203B8A0: ; 0x0203B8A0
 	ldr r0, [r0, #0xc]
 	bl FUN_0206BB1C
 	add r1, r6, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	bl FUN_020690CC
 	strh r0, [r4, #0x0]
 	mov r0, #0x0
@@ -4602,7 +4602,7 @@ FUN_0203BDB8: ; 0x0203BDB8
 	ldr r0, [r0, #0xc]
 	bl FUN_0206BB1C
 	add r1, r4, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r4, r0, #0x0
 	mov r0, #0x0
 	str r0, [sp, #0x0]
@@ -5526,7 +5526,7 @@ FUN_0203C520: ; 0x0203C520
 	ldr r0, [r4, #0xc]
 	bl FUN_0206BB1C
 	add r1, r6, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #0x74
 	add r2, sp, #0xc
 	add r7, r0, #0x0
@@ -6063,7 +6063,7 @@ FUN_0203C990: ; 0x0203C990
 	ldr r0, [r0, #0xc]
 	bl FUN_0206BB1C
 	add r1, r6, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r6, r0, #0x0
 	add r0, r5, #0x0
 	add r0, #0x80
@@ -10081,7 +10081,7 @@ FUN_0203E9CC: ; 0x0203E9CC
 	ldr r0, [r0, #0xc]
 	bl FUN_0206BB1C
 	add r1, r4, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r5, r0, #0x0
 	mov r1, #0xd
 	mov r2, #0x0
@@ -10193,7 +10193,7 @@ FUN_0203EAB0: ; 0x0203EAB0
 	ldr r0, [r0, #0xc]
 	bl FUN_0206BB1C
 	add r1, r7, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #0x5
 	mov r2, #0x0
 	bl GetMonData
@@ -10703,7 +10703,7 @@ FUN_0203EED8: ; 0x0203EED8
 	ldr r0, [r0, #0xc]
 	bl FUN_0206BB1C
 	str r0, [sp, #0x0]
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	add r4, #0x80
 	add r6, r0, #0x0
 	ldr r0, [r4, #0x0]
@@ -10716,7 +10716,7 @@ FUN_0203EED8: ; 0x0203EED8
 _0203EF18:
 	ldr r0, [sp, #0x0]
 	add r1, r5, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #0x5
 	mov r2, #0x0
 	add r4, r0, #0x0
@@ -10761,7 +10761,7 @@ FUN_0203EF58: ; 0x0203EF58
 	ldr r0, [r0, #0xc]
 	bl FUN_0206BB1C
 	str r0, [sp, #0xc]
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	add r2, sp, #0x18
 	mov r4, #0x0
 	ldr r3, _0203F008 ; =UNK_020F34FC
@@ -10782,7 +10782,7 @@ FUN_0203EF58: ; 0x0203EF58
 _0203EFA2:
 	ldr r0, [sp, #0xc]
 	add r1, r4, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r6, r0, #0x0
 	mov r1, #0x5
 	mov r2, #0x0
diff --git a/arm9/asm/scrcmd_12.s b/arm9/asm/scrcmd_12.s
index 3c0ac2f0..e97249d2 100644
--- a/arm9/asm/scrcmd_12.s
+++ b/arm9/asm/scrcmd_12.s
@@ -284,7 +284,7 @@ FUN_02042F10: ; 0x02042F10
 	push {r3, lr}
 	ldr r0, [r0, #0xc]
 	bl FUN_0206BB1C
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	cmp r0, #0x6
 	bge _02042F24
 	mov r0, #0x1
diff --git a/arm9/asm/scrcmd_18.s b/arm9/asm/scrcmd_18.s
index 4b248a90..bcd4dc70 100644
--- a/arm9/asm/scrcmd_18.s
+++ b/arm9/asm/scrcmd_18.s
@@ -91,7 +91,7 @@ FUN_0204434C: ; 0x0204434C
 	ldr r0, [r5, #0xc]
 	bl FUN_0206BB1C
 	ldrh r1, [r6, #0x0]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #0x4c
 	mov r2, #0x0
 	add r5, r0, #0x0
@@ -138,7 +138,7 @@ FUN_020443A8: ; 0x020443A8
 	ldr r0, [r5, #0xc]
 	bl FUN_0206BB1C
 	ldrh r1, [r6, #0x0]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #0x7
 	mov r2, #0x0
 	bl GetMonData
@@ -187,7 +187,7 @@ FUN_02044414: ; 0x02044414
 	ldr r0, [r4, #0xc]
 	bl FUN_0206BB1C
 	add r6, r0, #0x0
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	lsl r0, r0, #0x18
 	lsr r0, r0, #0x18
 	cmp r0, #0x6
@@ -289,7 +289,7 @@ FUN_020444F4: ; 0x020444F4
 	ldr r0, [r7, #0xc]
 	bl FUN_0206BB1C
 	add r1, r4, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r2, #0x0
 	mov r1, #0x4c
 	add r4, r0, #0x0
@@ -358,7 +358,7 @@ FUN_02044598: ; 0x02044598
 	ldr r0, [sp, #0x4]
 	ldr r0, [r0, #0xc]
 	bl FUN_0206BB1C
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	lsl r0, r0, #0x18
 	lsr r7, r0, #0x18
 	ldr r1, _02044650 ; =0x00000006
@@ -371,7 +371,7 @@ _020445E4:
 	ldr r0, [r0, #0xc]
 	bl FUN_0206BB1C
 	add r1, r6, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #0x4c
 	mov r2, #0x0
 	add r4, r0, #0x0
@@ -444,7 +444,7 @@ FUN_02044658: ; 0x02044658
 	ldr r0, [r0, #0xc]
 	bl FUN_0206BB1C
 	add r1, r6, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	bl FUN_0204A32C
 	strh r0, [r4, #0x0]
 	mov r0, #0x0
@@ -474,7 +474,7 @@ FUN_0204469C: ; 0x0204469C
 	str r0, [sp, #0x0]
 	ldr r0, [r7, #0xc]
 	bl FUN_0206BB1C
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	lsl r0, r0, #0x18
 	lsr r0, r0, #0x18
 	str r0, [sp, #0x8]
@@ -489,7 +489,7 @@ _020446EA:
 	ldr r0, [r7, #0xc]
 	bl FUN_0206BB1C
 	add r1, r4, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #0x4c
 	mov r2, #0x0
 	add r6, r0, #0x0
@@ -544,7 +544,7 @@ FUN_02044730: ; 0x02044730
 	ldr r0, [r6, #0xc]
 	bl FUN_0206BB1C
 	add r1, r5, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r2, #0x0
 	mov r1, #0x4c
 	add r5, r0, #0x0
@@ -585,7 +585,7 @@ FUN_0204478C: ; 0x0204478C
 	add r6, r0, #0x0
 	ldr r0, [r5, #0xc]
 	bl FUN_0206BB1C
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	lsl r0, r0, #0x18
 	lsr r0, r0, #0x18
 	cmp r6, r0
@@ -597,7 +597,7 @@ _020447D2:
 	ldr r0, [r5, #0xc]
 	bl FUN_0206BB1C
 	add r1, r6, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #0x4c
 	mov r2, #0x0
 	add r5, r0, #0x0
@@ -639,7 +639,7 @@ FUN_02044800: ; 0x02044800
 	str r0, [sp, #0x0]
 	ldr r0, [r7, #0xc]
 	bl FUN_0206BB1C
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	lsl r0, r0, #0x18
 	lsr r6, r0, #0x18
 	ldr r1, _02044884 ; =0x000000FF
@@ -651,7 +651,7 @@ _02044848:
 	ldr r0, [r7, #0xc]
 	bl FUN_0206BB1C
 	add r1, r5, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #0x4c
 	mov r2, #0x0
 	add r4, r0, #0x0
@@ -704,7 +704,7 @@ FUN_0204488C: ; 0x0204488C
 	ldr r0, [r4, #0xc]
 	bl FUN_0206BB1C
 	add r1, r5, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #0x9
 	mov r2, #0x0
 	bl GetMonData
@@ -744,7 +744,7 @@ FUN_020448D4: ; 0x020448D4
 	ldr r0, [r6, #0xc]
 	bl FUN_0206BB1C
 	ldr r1, [sp, #0x0]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #0x9
 	mov r2, #0x0
 	add r5, r0, #0x0
@@ -834,7 +834,7 @@ FUN_020449A4: ; 0x020449A4
 	ldr r0, [r6, #0xc]
 	bl FUN_0206BB1C
 	add r1, r5, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #0x9
 	mov r2, #0x0
 	add r5, r0, #0x0
@@ -890,7 +890,7 @@ FUN_02044A0C: ; 0x02044A0C
 	ldr r0, [r0, #0xc]
 	bl FUN_0206BB1C
 	add r1, r7, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r4, #0x13
 	add r1, r4, #0x0
 	mov r2, #0x0
@@ -952,7 +952,7 @@ FUN_02044A94: ; 0x02044A94
 	ldr r0, [r4, #0xc]
 	bl FUN_0206BB1C
 	add r1, r5, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r4, r0, #0x0
 	mov r1, #0xb0
 	mov r2, #0x0
@@ -982,7 +982,7 @@ FUN_02044B00: ; 0x02044B00
 	add r5, r0, #0x0
 	ldr r0, [r4, #0xc]
 	bl FUN_0206BB1C
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	strh r0, [r5, #0x0]
 	mov r0, #0x0
 	pop {r3-r5, pc}
@@ -1003,7 +1003,7 @@ FUN_02044B2C: ; 0x02044B2C
 	str r0, [sp, #0x0]
 	ldr r0, [r6, #0xc]
 	bl FUN_0206BB1C
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	mov r5, #0x0
 	add r7, r0, #0x0
 	add r4, r5, #0x0
@@ -1013,7 +1013,7 @@ _02044B5A:
 	ldr r0, [r6, #0xc]
 	bl FUN_0206BB1C
 	add r1, r5, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #0x4c
 	mov r2, #0x0
 	bl GetMonData
@@ -1055,7 +1055,7 @@ FUN_02044B84: ; 0x02044B84
 	str r0, [sp, #0x0]
 	ldr r0, [r7, #0xc]
 	bl FUN_0206BB1C
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	mov r5, #0x0
 	add r4, r5, #0x0
 	str r0, [sp, #0x8]
@@ -1068,7 +1068,7 @@ _02044BC8:
 	ldr r0, [r7, #0xc]
 	bl FUN_0206BB1C
 	add r1, r5, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #0x4c
 	mov r2, #0x0
 	add r6, r0, #0x0
@@ -1114,7 +1114,7 @@ FUN_02044C0C: ; 0x02044C0C
 	str r0, [sp, #0x4]
 	ldr r0, [r7, #0xc]
 	bl FUN_0206BB1C
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	mov r5, #0x0
 	add r4, r5, #0x0
 	str r0, [sp, #0x8]
@@ -1124,7 +1124,7 @@ _02044C44:
 	ldr r0, [r7, #0xc]
 	bl FUN_0206BB1C
 	add r1, r5, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #0x4c
 	mov r2, #0x0
 	add r6, r0, #0x0
@@ -1168,7 +1168,7 @@ FUN_02044C88: ; 0x02044C88
 	str r0, [sp, #0x0]
 	ldr r0, [r6, #0xc]
 	bl FUN_0206BB1C
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	mov r5, #0x0
 	add r7, r0, #0x0
 	add r4, r5, #0x0
@@ -1178,7 +1178,7 @@ _02044CB6:
 	ldr r0, [r6, #0xc]
 	bl FUN_0206BB1C
 	add r1, r5, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #0x4c
 	mov r2, #0x0
 	bl GetMonData
@@ -1211,7 +1211,7 @@ FUN_02044CE0: ; 0x02044CE0
 	str r0, [sp, #0x0]
 	ldr r0, [r5, #0xc]
 	bl FUN_0206BB1C
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	lsl r0, r0, #0x10
 	lsr r6, r0, #0x10
 	ldr r4, _02044D40 ; =0x00000000
@@ -1223,7 +1223,7 @@ _02044D12:
 	ldr r0, [r5, #0xc]
 	bl FUN_0206BB1C
 	add r1, r4, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r1, r7, #0x0
 	mov r2, #0x0
 	bl GetMonData
@@ -1269,7 +1269,7 @@ FUN_02044D44: ; 0x02044D44
 	ldr r0, [r0, #0xc]
 	bl FUN_0206BB1C
 	add r1, r6, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #0x6f
 	mov r2, #0x0
 	bl GetMonData
@@ -1301,7 +1301,7 @@ FUN_02044D8C: ; 0x02044D8C
 	ldr r0, [r6, #0xc]
 	bl FUN_0206BB1C
 	add r1, r4, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #0x4c
 	mov r2, #0x0
 	add r6, r0, #0x0
@@ -1382,7 +1382,7 @@ FUN_02044E34: ; 0x02044E34
 	ldr r0, [r5, #0xc]
 	bl FUN_0206BB1C
 	add r1, r6, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r1, r4, #0x0
 	bl FUN_020699A4
 	mov r0, #0x0
@@ -1420,7 +1420,7 @@ FUN_02044E78: ; 0x02044E78
 	ldr r0, [r5, #0xc]
 	bl FUN_0206BB1C
 	add r1, r7, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r4, #0x36
 	add r1, r4, #0x0
 	mov r2, #0x0
@@ -1454,7 +1454,7 @@ FUN_02044ED8: ; 0x02044ED8
 	ldr r0, [r4, #0xc]
 	bl FUN_0206BB1C
 	add r1, r5, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #0x6
 	mov r2, #0x0
 	bl GetMonData
@@ -1478,7 +1478,7 @@ FUN_02044F20: ; 0x02044F20
 	ldr r0, [r4, #0xc]
 	bl FUN_0206BB1C
 	add r1, r5, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r2, #0x0
 	add r1, sp, #0x0
 	strh r2, [r1, #0x0]
@@ -1512,7 +1512,7 @@ FUN_02044F58: ; 0x02044F58
 	str r0, [sp, #0x0]
 	ldr r0, [r7, #0xc]
 	bl FUN_0206BB1C
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	lsl r0, r0, #0x18
 	lsr r6, r0, #0x18
 	ldr r5, _02044FE4 ; =0x00000000
@@ -1523,7 +1523,7 @@ _02044F9E:
 	ldr r0, [r7, #0xc]
 	bl FUN_0206BB1C
 	add r1, r5, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #0x4c
 	mov r2, #0x0
 	add r4, r0, #0x0
@@ -1580,7 +1580,7 @@ FUN_02044FE8: ; 0x02044FE8
 	ldr r0, [r0, #0xc]
 	bl FUN_0206BB1C
 	add r1, r4, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r4, #0x0
 	add r6, r0, #0x0
 	add r5, r4, #0x0
@@ -1628,7 +1628,7 @@ FUN_0204505C: ; 0x0204505C
 	ldr r0, [r0, #0x0]
 	ldr r0, [r0, #0xc]
 	bl FUN_0206BB1C
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	lsl r0, r0, #0x10
 	add r4, #0x80
 	lsr r6, r0, #0x10
@@ -1649,7 +1649,7 @@ _0204509A:
 _020450A6:
 	ldr r0, [sp, #0xc]
 	add r1, r5, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #0x4c
 	mov r2, #0x0
 	add r4, r0, #0x0
@@ -1725,7 +1725,7 @@ FUN_02045104: ; 0x02045104
 	ldr r0, [r0, #0xc]
 	bl FUN_0206BB1C
 	add r1, r7, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r5, r0, #0x0
 	lsl r0, r6, #0x18
 	lsr r0, r0, #0x18
@@ -1768,7 +1768,7 @@ FUN_02045170: ; 0x02045170
 	ldr r0, [r0, #0xc]
 	bl FUN_0206BB1C
 	add r1, r6, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r5, r0, #0x0
 	lsl r0, r4, #0x18
 	lsr r0, r0, #0x18
@@ -1800,7 +1800,7 @@ FUN_020451D0: ; 0x020451D0
 	ldr r0, [r0, #0x0]
 	ldr r0, [r0, #0xc]
 	bl FUN_0206BB1C
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	lsl r0, r0, #0x10
 	add r4, #0x80
 	lsr r6, r0, #0x10
@@ -1817,7 +1817,7 @@ _0204520C:
 _02045212:
 	add r0, r7, #0x0
 	add r1, r5, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #0x4c
 	mov r2, #0x0
 	add r4, r0, #0x0
diff --git a/arm9/asm/scrcmd_24.s b/arm9/asm/scrcmd_24.s
index ed57d780..85f03ebe 100644
--- a/arm9/asm/scrcmd_24.s
+++ b/arm9/asm/scrcmd_24.s
@@ -102,7 +102,7 @@ FUN_02045E20: ; 0x02045E20
 	ldr r0, [r0, #0xc]
 	bl FUN_0206BB1C
 	add r1, r6, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #0x20
 	bl FUN_02088DF8
 	add r5, r0, #0x0
@@ -185,7 +185,7 @@ FUN_02045EE4: ; 0x02045EE4
 	ldr r0, [r0, #0xc]
 	bl FUN_0206BB1C
 	add r1, r4, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r4, r0, #0x0
 	mov r1, #0x20
 	bl FUN_02088DF8
@@ -222,7 +222,7 @@ FUN_02045F24: ; 0x02045F24
 	ldr r0, [r0, #0xc]
 	bl FUN_0206BB1C
 	add r1, r6, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r6, r0, #0x0
 	mov r0, #0x20
 	mov r1, #0x4
diff --git a/arm9/asm/scrcmd_3.s b/arm9/asm/scrcmd_3.s
index 54c1e00c..959b85d1 100644
--- a/arm9/asm/scrcmd_3.s
+++ b/arm9/asm/scrcmd_3.s
@@ -119,7 +119,7 @@ FUN_0203FF10: ; 0x0203FF10
 	ldr r0, [r0, #0xc]
 	bl FUN_0206BB1C
 	add r1, r6, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	str r0, [sp, #0x10]
 	add r0, r4, #0x0
 	mov r1, #0x4
diff --git a/arm9/asm/scrcmd_4.s b/arm9/asm/scrcmd_4.s
index ad51e8aa..078e899f 100644
--- a/arm9/asm/scrcmd_4.s
+++ b/arm9/asm/scrcmd_4.s
@@ -92,7 +92,7 @@ FUN_02040748: ; 0x02040748
 	ldr r0, [r6, #0xc]
 	bl FUN_0206BB1C
 	add r1, r5, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r2, r0, #0x0
 	ldr r0, [r7, #0x0]
 	add r1, r4, #0x0
@@ -315,7 +315,7 @@ FUN_0204091C: ; 0x0204091C
 	ldr r0, [r6, #0xc]
 	bl FUN_0206BB1C
 	add r1, r5, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r2, r0, #0x0
 	ldr r0, [r7, #0x0]
 	add r1, r4, #0x0
@@ -943,7 +943,7 @@ FUN_02040E4C: ; 0x02040E4C
 	ldr r0, [r6, #0xc]
 	bl FUN_0206BB1C
 	ldr r1, [sp, #0x0]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r4, #0x36
 	add r1, r4, #0x0
 	mov r2, #0x0
diff --git a/arm9/asm/scrcmd_5.s b/arm9/asm/scrcmd_5.s
index 0a13ac22..bb5b7be6 100644
--- a/arm9/asm/scrcmd_5.s
+++ b/arm9/asm/scrcmd_5.s
@@ -75,7 +75,7 @@ FUN_020411C4: ; 0x020411C4
 	str r0, [sp, #0x0]
 	ldr r0, [r7, #0xc]
 	bl FUN_0206BB1C
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	lsl r0, r0, #0x10
 	lsr r6, r0, #0x10
 	ldr r0, _0204133C ; =0x00000000
@@ -87,7 +87,7 @@ _0204123C:
 	ldr r0, [r7, #0xc]
 	bl FUN_0206BB1C
 	add r1, r5, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #0x4c
 	mov r2, #0x0
 	add r4, r0, #0x0
diff --git a/arm9/asm/scrcmd_9.s b/arm9/asm/scrcmd_9.s
index f75ac5ce..8ea6313d 100644
--- a/arm9/asm/scrcmd_9.s
+++ b/arm9/asm/scrcmd_9.s
@@ -253,7 +253,7 @@ FUN_02042000: ; 0x02042000
 	bl FUN_020394F0
 	add r1, r0, #0x0
 	add r0, r4, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r5, #0x80
 	add r1, r0, #0x0
 	ldr r0, [r5, #0x0]
@@ -417,7 +417,7 @@ _02042170:
 	bl FUN_020394F0
 	add r1, r0, #0x0
 	add r0, r6, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r1, r0, #0x0
 	add r0, r4, #0x0
 	mov r2, #0x4
diff --git a/arm9/asm/unk_02025658.s b/arm9/asm/unk_02025658.s
index b18eca9c..9cf2dfa2 100644
--- a/arm9/asm/unk_02025658.s
+++ b/arm9/asm/unk_02025658.s
@@ -109,14 +109,14 @@ FUN_020256DC: ; 0x020256DC
 	str r0, [r5, #0x0]
 	ldr r0, [sp, #0x0]
 	mov r6, #0x0
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	cmp r4, r0
 	bge _020257AE
 	add r5, #0x18
 _0202572A:
 	ldr r0, [sp, #0x0]
 	add r1, r4, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #0x5
 	mov r2, #0x0
 	add r7, r0, #0x0
@@ -170,7 +170,7 @@ _0202572A:
 	lsl r0, r0, #0x18
 	lsr r4, r0, #0x18
 	ldr r0, [sp, #0x0]
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	cmp r4, r0
 	blt _0202572A
 _020257AE:
diff --git a/arm9/asm/unk_0202B034.s b/arm9/asm/unk_0202B034.s
index 1f26f48a..2708bee6 100644
--- a/arm9/asm/unk_0202B034.s
+++ b/arm9/asm/unk_0202B034.s
@@ -58,7 +58,7 @@ _0202B07E:
 	add r0, r0, r2
 	str r0, [sp, #0x14]
 	ldr r0, [sp, #0x4]
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	str r0, [sp, #0x10]
 	mov r0, #0xb
 	mov r1, #0x0
@@ -77,7 +77,7 @@ _0202B07E:
 _0202B0BA:
 	ldr r0, [sp, #0x4]
 	add r1, r7, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r4, r0, #0x0
 	bl AcquireMonLock
 	str r0, [sp, #0xc]
diff --git a/arm9/asm/unk_02035068.s b/arm9/asm/unk_02035068.s
index 3b0e21b2..6cb0e026 100644
--- a/arm9/asm/unk_02035068.s
+++ b/arm9/asm/unk_02035068.s
@@ -1855,7 +1855,7 @@ _02035ECC:
 	ldrb r0, [r0, #0x0]
 	strb r0, [r7, #0x14]
 	ldr r0, [r7, #0x0]
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	strb r0, [r7, #0x13]
 	mov r0, #0x0
 	strh r0, [r7, #0x18]
@@ -2050,7 +2050,7 @@ _020360AC:
 	add r1, r6, #0x0
 	add r1, #0x22
 	ldrb r1, [r1, #0x0]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r1, r0, #0x0
 	add r0, r5, #0x0
 	mov r2, #0xb
@@ -2444,7 +2444,7 @@ _020363F6:
 	add r5, r0, #0x0
 	ldr r0, [sp, #0x4]
 	add r1, r7, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	str r0, [sp, #0xc]
 	mov r0, #0x7f
 	lsl r0, r0, #0x2
@@ -3277,7 +3277,7 @@ _02036B0E:
 	ldr r0, [r6, #0xc]
 	bl FUN_0206BB1C
 	add r1, r7, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r2, r0, #0x0
 	ldr r0, [r5, #0x14]
 	add r1, r6, #0x0
@@ -3547,7 +3547,7 @@ FUN_02036CEC: ; 0x02036CEC
 	str r5, [r4, #0x1c]
 	ldrb r1, [r7, #0x2]
 	ldr r0, [r4, #0x0]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r1, r0, #0x0
 	mov r0, #0x7e
 	lsl r0, r0, #0x2
@@ -3648,7 +3648,7 @@ FUN_02036E08: ; 0x02036E08
 	bl FUN_0206BB1C
 	ldrb r1, [r5, #0x0]
 	str r0, [sp, #0x20]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	str r0, [sp, #0x24]
 	ldrb r0, [r5, #0x1]
 	cmp r0, #0x0
diff --git a/arm9/asm/unk_020377F0.s b/arm9/asm/unk_020377F0.s
index 3959856b..2e9774eb 100644
--- a/arm9/asm/unk_020377F0.s
+++ b/arm9/asm/unk_020377F0.s
@@ -732,7 +732,7 @@ FUN_02037C00: ; 0x02037C00
 	strb r0, [r4, #0x11]
 	strb r6, [r4, #0x14]
 	ldr r0, [r4, #0x0]
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	strb r0, [r4, #0x13]
 	mov r0, #0x0
 	strh r0, [r4, #0x18]
@@ -789,7 +789,7 @@ FUN_02037C7C: ; 0x02037C7C
 	mov r0, #0x0
 	strb r0, [r4, #0x14]
 	ldr r0, [r4, #0x0]
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	strb r0, [r4, #0x13]
 	mov r0, #0x0
 	strh r0, [r4, #0x18]
@@ -1231,7 +1231,7 @@ FUN_0203800C: ; 0x0203800C
 	add r0, r5, #0x0
 	bl FUN_0206BB1C
 	add r1, r7, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	str r0, [r4, #0x0]
 	add r0, r5, #0x0
 	bl FUN_02027E24
@@ -1652,7 +1652,7 @@ _02038386:
 	beq _020383C8
 	ldr r0, [r4, #0xc]
 	ldr r1, [r4, #0x30]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r1, r0, #0x0
 	ldr r0, [r4, #0x44]
 	bl FUN_02069B88
@@ -1906,7 +1906,7 @@ _02038590:
 	ldr r0, [r5, #0xc]
 	bl FUN_0206BB1C
 	ldr r1, [r4, #0x4]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	ldr r2, [r4, #0xc]
 	mov r1, #0x75
 	add r2, #0x1c
@@ -1973,7 +1973,7 @@ _02038620:
 	ldr r0, [r7, #0xc]
 	bl FUN_0206BB1C
 	ldr r1, [r4, #0x4]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #0x6f
 	mov r2, #0x0
 	add r6, r0, #0x0
diff --git a/arm9/asm/unk_0204653C.s b/arm9/asm/unk_0204653C.s
index cc6edb17..8a0cf5cd 100644
--- a/arm9/asm/unk_0204653C.s
+++ b/arm9/asm/unk_0204653C.s
@@ -945,7 +945,7 @@ _02046CAA:
 	ldr r0, [r5, #0x10]
 	mov r1, #0x0
 	ldr r0, [r0, #0x8]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r1, r0, #0x0
 	ldr r0, [sp, #0x4]
 	bl FUN_02060FE0
@@ -1025,7 +1025,7 @@ _02046D5C:
 	cmp r0, #0x12
 	bne _02046D8C
 	add r0, r5, #0x0
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	cmp r0, #0x6
 	bne _02046D8C
 	mov r2, #0x0
@@ -1711,7 +1711,7 @@ _0204732A:
 	bne _020473C8
 	ldr r0, [r1, #0x8]
 	mov r1, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #0x5
 	mov r2, #0x0
 	bl GetMonData
@@ -1758,7 +1758,7 @@ _02047390:
 	bne _020473C8
 	ldr r0, [r1, #0x8]
 	mov r1, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #0x5
 	mov r2, #0x0
 	bl GetMonData
@@ -1827,7 +1827,7 @@ _02047400:
 	blo _020474FC
 	ldr r0, [r4, #0x8]
 	mov r1, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r6, r0, #0x0
 	ldr r0, [r5, #0xc]
 	bl FUN_02023918
@@ -1871,7 +1871,7 @@ _02047470:
 	lsl r0, r0, #0x2
 	add r0, r4, r0
 	ldr r0, [r0, #0x4]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r6, r0, #0x0
 	ldr r0, [r5, #0xc]
 	bl FUN_02023918
diff --git a/arm9/asm/unk_020476CC.s b/arm9/asm/unk_020476CC.s
index 619b8594..e167517a 100644
--- a/arm9/asm/unk_020476CC.s
+++ b/arm9/asm/unk_020476CC.s
@@ -649,19 +649,19 @@ FUN_02047BC0: ; 0x02047BC0
 	bl AllocMonZeroed
 	add r5, r0, #0x0
 	ldr r0, [sp, #0x14]
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	add r1, r0, #0x0
 	ldr r0, [r6, #0x4]
 	bl FUN_0206B8CC
 	ldr r0, [sp, #0x14]
 	mov r4, #0x0
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	cmp r0, #0x0
 	ble _02047C98
 _02047C40:
 	ldr r0, [sp, #0x14]
 	add r1, r4, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r1, r5, #0x0
 	bl FUN_02069B88
 	add r0, r5, #0x0
@@ -692,7 +692,7 @@ _02047C82:
 	bl FUN_020479FC
 	ldr r0, [sp, #0x14]
 	add r4, r4, #0x1
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	cmp r4, r0
 	blt _02047C40
 _02047C98:
@@ -856,7 +856,7 @@ _02047DEE:
 	ldrb r1, [r7, r6]
 	ldr r0, [sp, #0x4]
 	sub r1, r1, #0x1
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	ldr r1, [sp, #0x8]
 	bl FUN_02069B88
 	ldr r1, [sp, #0x8]
diff --git a/arm9/asm/unk_0204A01C.s b/arm9/asm/unk_0204A01C.s
index 5ea5d8c5..10664314 100644
--- a/arm9/asm/unk_0204A01C.s
+++ b/arm9/asm/unk_0204A01C.s
@@ -130,7 +130,7 @@ FUN_0204A120: ; 0x0204A120
 	push {r3-r5, lr}
 	add r5, r2, #0x0
 	add r4, r3, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	lsl r2, r5, #0x18
 	add r1, r4, #0x0
 	lsr r2, r2, #0x18
@@ -143,7 +143,7 @@ FUN_0204A138: ; 0x0204A138
 	push {r3-r7, lr}
 	str r0, [sp, #0x0]
 	add r5, r1, #0x0
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	add r7, r0, #0x0
 	mov r6, #0x0
 	cmp r7, #0x0
@@ -151,7 +151,7 @@ FUN_0204A138: ; 0x0204A138
 _0204A14A:
 	ldr r0, [sp, #0x0]
 	add r1, r6, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #0x4c
 	mov r2, #0x0
 	add r4, r0, #0x0
@@ -198,7 +198,7 @@ _0204A1A2:
 FUN_0204A1A8: ; 0x0204A1A8
 	push {r3-r7, lr}
 	add r7, r0, #0x0
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	mov r5, #0x0
 	add r6, r0, #0x0
 	add r4, r5, #0x0
@@ -207,7 +207,7 @@ FUN_0204A1A8: ; 0x0204A1A8
 _0204A1BA:
 	add r0, r7, #0x0
 	add r1, r4, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	bl FUN_0204A01C
 	cmp r0, #0x0
 	beq _0204A1CC
@@ -225,7 +225,7 @@ _0204A1D2:
 FUN_0204A1D8: ; 0x0204A1D8
 	push {r3-r7, lr}
 	add r6, r0, #0x0
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	add r5, r0, #0x0
 	mov r4, #0x0
 	cmp r5, #0x0
@@ -233,7 +233,7 @@ FUN_0204A1D8: ; 0x0204A1D8
 _0204A1E8:
 	add r0, r6, #0x0
 	add r1, r4, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r7, r0, #0x0
 	bl FUN_0204A01C
 	cmp r0, #0x0
@@ -253,7 +253,7 @@ _0204A204:
 FUN_0204A20C: ; 0x0204A20C
 	push {r3-r7, lr}
 	add r6, r0, #0x0
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	lsl r0, r0, #0x10
 	lsr r5, r0, #0x10
 	ldr r4, _0204A244 ; =0x00000000
@@ -261,7 +261,7 @@ FUN_0204A20C: ; 0x0204A20C
 _0204A21C:
 	add r0, r6, #0x0
 	add r1, r4, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #0x4c
 	mov r2, #0x0
 	add r7, r0, #0x0
@@ -302,7 +302,7 @@ FUN_0204A25C: ; 0x0204A25C
 	add r1, sp, #0x0
 	add r7, r0, #0x0
 	strb r2, [r1, #0x0]
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	add r6, r0, #0x0
 	mov r5, #0x0
 	cmp r6, #0x0
@@ -310,7 +310,7 @@ FUN_0204A25C: ; 0x0204A25C
 _0204A272:
 	add r0, r7, #0x0
 	add r1, r5, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #0x4c
 	mov r2, #0x0
 	add r4, r0, #0x0
@@ -337,7 +337,7 @@ FUN_0204A29C: ; 0x0204A29C
 	str r0, [sp, #0x0]
 	str r1, [sp, #0x4]
 	add r6, r7, #0x0
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	add r4, r7, #0x0
 	str r0, [sp, #0x8]
 	cmp r0, #0x0
@@ -345,7 +345,7 @@ FUN_0204A29C: ; 0x0204A29C
 _0204A2B4:
 	ldr r0, [sp, #0x0]
 	add r1, r4, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r5, r0, #0x0
 	bl FUN_0204A01C
 	cmp r0, #0x0
diff --git a/arm9/asm/unk_02050E48.s b/arm9/asm/unk_02050E48.s
index 08d3b46d..d2267271 100644
--- a/arm9/asm/unk_02050E48.s
+++ b/arm9/asm/unk_02050E48.s
@@ -50,7 +50,7 @@ FUN_02050E48: ; 0x02050E48
 	ldr r0, [sp, #0x4]
 	strb r0, [r4, #0x14]
 	ldr r0, [r4, #0x0]
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	strb r0, [r4, #0x13]
 	mov r0, #0x0
 	strh r0, [r4, #0x18]
@@ -957,7 +957,7 @@ _020515BA:
 	add r1, #0x84
 	ldrb r1, [r1, #0x0]
 	ldr r0, [r4, #0x50]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	bl FUN_020690E4
 	add r2, r0, #0x0
 	ldr r0, [r4, #0x28]
@@ -1482,7 +1482,7 @@ _02051A16:
 	ldrb r1, [r1, #0x0]
 	ldr r0, [sp, #0x0]
 	sub r1, r1, #0x1
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r1, r4, #0x0
 	add r2, r6, #0x0
 	bl MI_CpuCopy8
diff --git a/arm9/asm/unk_02054C14.s b/arm9/asm/unk_02054C14.s
index a2114d7c..1c47a7c6 100644
--- a/arm9/asm/unk_02054C14.s
+++ b/arm9/asm/unk_02054C14.s
@@ -289,7 +289,7 @@ FUN_02054DEC: ; 0x02054DEC
 	push {r3-r7, lr}
 	add r6, r0, #0x0
 	bl FUN_0206BB1C
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	lsl r0, r0, #0x10
 	lsr r5, r0, #0x10
 	ldr r4, _02054E2C ; =0x00000000
@@ -299,7 +299,7 @@ _02054E02:
 	add r0, r6, #0x0
 	bl FUN_0206BB1C
 	add r1, r4, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r1, r7, #0x0
 	mov r2, #0x0
 	bl GetMonData
@@ -326,7 +326,7 @@ FUN_02054E30: ; 0x02054E30
 	mov r7, #0x0
 	bl FUN_0206BB1C
 	str r0, [sp, #0x0]
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	add r4, r0, #0x0
 	add r6, r7, #0x0
 	cmp r4, #0x0
@@ -335,7 +335,7 @@ FUN_02054E30: ; 0x02054E30
 _02054E4A:
 	ldr r0, [sp, #0x0]
 	add r1, r6, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #0x5
 	mov r2, #0x0
 	bl GetMonData
diff --git a/arm9/asm/unk_0205FA2C.s b/arm9/asm/unk_0205FA2C.s
index 21beb029..c06deaff 100644
--- a/arm9/asm/unk_0205FA2C.s
+++ b/arm9/asm/unk_0205FA2C.s
@@ -175,7 +175,7 @@ FUN_0205FB34: ; 0x0205FB34
 	ldrb r0, [r6, #0xd]
 	strb r0, [r4, #0x14]
 	ldr r0, [r4, #0x0]
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	strb r0, [r4, #0x13]
 	mov r0, #0x0
 	strh r0, [r4, #0x18]
diff --git a/arm9/asm/unk_0206439C.s b/arm9/asm/unk_0206439C.s
index e9d72f9f..76ea9f7f 100644
--- a/arm9/asm/unk_0206439C.s
+++ b/arm9/asm/unk_0206439C.s
@@ -14,7 +14,7 @@ FUN_0206439C: ; 0x0206439C
 	add r0, r6, #0x0
 	bl FUN_0206BB1C
 	add r1, r5, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	str r0, [r4, #0x0]
 	mov r0, #0x0
 	str r0, [r4, #0x4]
diff --git a/arm9/asm/unk_020653EC.s b/arm9/asm/unk_020653EC.s
index cc2e0ae8..ec33a0a1 100644
--- a/arm9/asm/unk_020653EC.s
+++ b/arm9/asm/unk_020653EC.s
@@ -1810,7 +1810,7 @@ FUN_020661F8: ; 0x020661F8
 	bl FUN_020377AC
 	bl FUN_0206BB1C
 	add r1, r7, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r2, r0, #0x0
 	mov r0, #0x6b
 	lsl r0, r0, #0x2
diff --git a/arm9/asm/unk_0206BB5C.s b/arm9/asm/unk_0206BB5C.s
index 29d28032..afcace47 100644
--- a/arm9/asm/unk_0206BB5C.s
+++ b/arm9/asm/unk_0206BB5C.s
@@ -193,7 +193,7 @@ _0206BCBC:
 	beq _0206BD0A
 	ldr r0, [sp, #0x4]
 	sub r1, r1, #0x1
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r4, r0, #0x0
 	ldr r0, [sp, #0x0]
 	ldr r2, [sp, #0x8]
@@ -407,7 +407,7 @@ FUN_0206BE48: ; 0x0206BE48
 	add r0, r1, #0x0
 	str r1, [sp, #0x10]
 	str r2, [sp, #0x14]
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	str r0, [sp, #0x20]
 	add r6, r0, #0x0
 	add r0, sp, #0x30
@@ -423,7 +423,7 @@ FUN_0206BE48: ; 0x0206BE48
 _0206BE72:
 	ldr r0, [sp, #0x10]
 	add r1, r7, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	str r0, [sp, #0x24]
 	mov r1, #0x5
 	mov r2, #0x0
diff --git a/arm9/asm/unk_0206C700.s b/arm9/asm/unk_0206C700.s
index 270bcd79..81a90ae3 100644
--- a/arm9/asm/unk_0206C700.s
+++ b/arm9/asm/unk_0206C700.s
@@ -2085,7 +2085,7 @@ _0206D854:
 	cmp r0, #0x0
 	beq _0206D86C
 	ldr r0, [r4, #0x24]
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	cmp r0, #0x6
 	blt _0206D86E
 _0206D86C:
diff --git a/arm9/asm/unk_0206F3FC.s b/arm9/asm/unk_0206F3FC.s
index 05ed529d..4534dc1b 100644
--- a/arm9/asm/unk_0206F3FC.s
+++ b/arm9/asm/unk_0206F3FC.s
@@ -1666,7 +1666,7 @@ FUN_0207008C: ; 0x0207008C
 	ldr r0, _020701DC ; =0x000005A4
 	ldr r0, [r5, r0]
 	ldr r0, [r0, #0x0]
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	ldr r1, [sp, #0x0]
 	cmp r0, r1
 	bgt _020700BC
@@ -1677,7 +1677,7 @@ _020700BC:
 	ldr r0, _020701DC ; =0x000005A4
 	ldr r0, [r5, r0]
 	ldr r0, [r0, #0x0]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #0x5
 	mov r2, #0x0
 	add r7, r0, #0x0
@@ -2809,7 +2809,7 @@ FUN_020709FC: ; 0x020709FC
 	add r6, r1, #0x0
 	ldr r0, [r5, r0]
 	ldr r0, [r0, #0x0]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	ldr r1, _02070A7C ; =0x00000B23
 	ldrb r2, [r5, r1]
 	lsl r3, r2, #0x19
@@ -3755,7 +3755,7 @@ FUN_0207117C: ; 0x0207117C
 	ldr r1, [sp, #0x0]
 	ldr r0, [r0, #0x0]
 	ldrb r1, [r1, r2]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	str r0, [sp, #0x8]
 	ldr r0, [sp, #0x4]
 	mov r1, #0x1
@@ -3996,7 +3996,7 @@ FUN_02071340: ; 0x02071340
 	cmp r0, #0x0
 	beq _0207136E
 	ldr r0, [r2, #0x0]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r1, r0, #0x0
 	ldr r0, _020713E0 ; =0x000005A4
 	ldr r2, _020713E4 ; =0x00000B34
@@ -5033,7 +5033,7 @@ _02071B34:
 	ldr r0, [r4, r0]
 	ldrb r1, [r4, r1]
 	ldr r0, [r0, #0x0]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r6, r0, #0x0
 	ldr r0, _02071C3C ; =0x0000069C
 	mov r1, #0x40
@@ -5244,7 +5244,7 @@ _02071D14:
 	add r1, r6, #0x0
 	ldr r0, [r5, r0]
 	ldr r0, [r0, #0x0]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	ldrh r1, [r7, r4]
 	add r2, sp, #0x0
 	str r1, [sp, #0x0]
@@ -5426,7 +5426,7 @@ _02071E5A:
 	ldr r0, [r5, r0]
 	ldrb r1, [r5, r1]
 	ldr r0, [r0, #0x0]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r1, r0, #0x0
 	ldr r0, _02071F1C ; =0x000005A4
 	mov r2, #0x3
@@ -5460,7 +5460,7 @@ _02071ECC:
 	ldr r0, [r1, #0x0]
 	ldr r1, _02071F20 ; =0x00000B25
 	ldrb r1, [r5, r1]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r1, r0, #0x0
 	ldr r0, _02071F1C ; =0x000005A4
 	ldr r2, [r5, r0]
@@ -5526,7 +5526,7 @@ FUN_02071F58: ; 0x02071F58
 	ldr r0, [r5, r0]
 	ldrb r1, [r5, r1]
 	ldr r0, [r0, #0x0]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r6, r0, #0x0
 	mov r7, #0x89
 	add r0, r5, #0x0
@@ -5804,7 +5804,7 @@ _020721B0:
 	ldr r0, [r5, r0]
 	ldrb r1, [r5, r1]
 	ldr r0, [r0, #0x0]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r7, r0, #0x0
 	ldr r0, _020722A8 ; =0x000005A4
 	ldr r0, [r5, r0]
@@ -5968,7 +5968,7 @@ FUN_0207230C: ; 0x0207230C
 	ldr r0, [r5, r0]
 	ldrb r1, [r5, r1]
 	ldr r0, [r0, #0x0]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r7, r0, #0x0
 	ldr r0, _02072410 ; =0x000005A4
 	ldr r0, [r5, r0]
diff --git a/arm9/asm/unk_02072548.s b/arm9/asm/unk_02072548.s
index ca80e1db..062862b7 100644
--- a/arm9/asm/unk_02072548.s
+++ b/arm9/asm/unk_02072548.s
@@ -582,7 +582,7 @@ _0207297E:
 	ldr r1, _020729CC ; =0x00000B25
 	ldr r0, [r2, #0x0]
 	ldrb r1, [r5, r1]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r6, r0, #0x0
 	ldr r0, _020729D0 ; =0x0000069C
 	mov r1, #0x25
@@ -1211,7 +1211,7 @@ _02072E98:
 	add r1, r4, #0x0
 	ldr r0, [r5, r0]
 	ldr r0, [r0, #0x0]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r1, r0, #0x0
 	mov r0, #0x0
 	ldr r3, _02072EE0 ; =0x000005A4
@@ -1280,7 +1280,7 @@ _02072F2C:
 	add r1, r4, #0x0
 	ldr r0, [r5, r0]
 	ldr r0, [r0, #0x0]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r1, r0, #0x0
 	add r0, r5, #0x0
 	bl FUN_02076AA0
@@ -1983,7 +1983,7 @@ FUN_020734C0: ; 0x020734C0
 	ldr r0, [r5, r0]
 	ldrb r1, [r5, r1]
 	ldr r0, [r0, #0x0]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #0xa3
 	mov r2, #0x0
 	add r4, r0, #0x0
diff --git a/arm9/asm/unk_02073710.s b/arm9/asm/unk_02073710.s
index b7a572da..16631f9e 100644
--- a/arm9/asm/unk_02073710.s
+++ b/arm9/asm/unk_02073710.s
@@ -218,7 +218,7 @@ FUN_020737D0: ; 0x020737D0
 	add r4, r2, #0x0
 	ldr r0, [r0, #0x0]
 	add r7, r1, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	lsl r1, r4, #0x10
 	asr r6, r1, #0x10
 	mov r1, #0x2c
diff --git a/arm9/asm/unk_02073DA8.s b/arm9/asm/unk_02073DA8.s
index 94f4426e..cb5d7a22 100644
--- a/arm9/asm/unk_02073DA8.s
+++ b/arm9/asm/unk_02073DA8.s
@@ -199,7 +199,7 @@ FUN_02073EEC: ; 0x02073EEC
 	bne _02073F66
 	ldr r0, [r5, r0]
 	ldr r0, [r0, #0x0]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	ldr r2, _02074058 ; =0x0000069C
 	add r6, r0, #0x0
 	ldr r0, [r5, r2]
@@ -238,7 +238,7 @@ _02073F66:
 	ldr r0, [r5, r0]
 	ldrb r1, [r5, r1]
 	ldr r0, [r0, #0x0]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #0x0
 	str r1, [sp, #0x0]
 	add r6, r0, #0x0
@@ -530,7 +530,7 @@ FUN_02074200: ; 0x02074200
 	ldr r0, [r4, r0]
 	ldrb r1, [r4, r1]
 	ldr r0, [r0, #0x0]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r1, r0, #0x0
 	ldr r0, _02074268 ; =0x000005A4
 	mov r2, #0xc
@@ -625,7 +625,7 @@ FUN_020742A8: ; 0x020742A8
 	ldr r0, [r4, r0]
 	ldrb r1, [r4, r1]
 	ldr r0, [r0, #0x0]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #0x0
 	str r1, [sp, #0x0]
 	add r5, r0, #0x0
@@ -789,7 +789,7 @@ FUN_02074428: ; 0x02074428
 	ldr r0, [r4, r0]
 	ldrb r1, [r4, r1]
 	ldr r0, [r0, #0x0]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	bl FUN_0206AA84
 	ldr r0, _0207444C ; =0x000005A4
 	mov r1, #0x0
@@ -2383,7 +2383,7 @@ FUN_02075118: ; 0x02075118
 	ldr r0, [r4, r0]
 	ldrb r1, [r4, r1]
 	ldr r0, [r0, #0x0]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #0xa1
 	mov r2, #0x0
 	bl GetMonData
diff --git a/arm9/asm/unk_0207550C.s b/arm9/asm/unk_0207550C.s
index dfbddd58..995ebf7e 100644
--- a/arm9/asm/unk_0207550C.s
+++ b/arm9/asm/unk_0207550C.s
@@ -365,7 +365,7 @@ FUN_020757F4: ; 0x020757F4
 	ldrb r1, [r4, r1]
 	ldr r0, [r0, #0x0]
 	add r5, r2, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	bl FUN_020690E4
 	add r2, r0, #0x0
 	mov r0, #0x6a
@@ -1045,7 +1045,7 @@ FUN_02075DC0: ; 0x02075DC0
 	ldr r0, [r5, r0]
 	ldrb r1, [r5, r1]
 	ldr r0, [r0, #0x0]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #0xd
 	mov r2, #0x0
 	add r4, r0, #0x0
@@ -1243,7 +1243,7 @@ FUN_02075F60: ; 0x02075F60
 	ldr r0, [r5, r0]
 	ldrb r1, [r5, r1]
 	ldr r0, [r0, #0x0]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #0xa2
 	mov r2, #0x0
 	str r0, [sp, #0x8]
@@ -1372,7 +1372,7 @@ FUN_020760A0: ; 0x020760A0
 	ldr r0, [r5, r0]
 	ldrb r1, [r5, r1]
 	ldr r0, [r0, #0x0]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #0xa2
 	mov r2, #0x0
 	bl GetMonData
@@ -1558,7 +1558,7 @@ _02076212:
 	ldr r0, [r4, r0]
 	ldrb r1, [r4, r1]
 	ldr r0, [r0, #0x0]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r5, r0, #0x0
 	add r0, r4, #0x0
 	bl FUN_020772CC
@@ -1646,7 +1646,7 @@ _020762DC:
 	ldr r0, [r4, r0]
 	ldrb r1, [r4, r1]
 	ldr r0, [r0, #0x0]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #0xa2
 	mov r2, #0x0
 	bl GetMonData
@@ -1782,7 +1782,7 @@ FUN_0207640C: ; 0x0207640C
 	ldr r0, [r5, r0]
 	ldrb r1, [r5, r1]
 	ldr r0, [r0, #0x0]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #0xa3
 	mov r2, #0x0
 	add r4, r0, #0x0
@@ -2056,7 +2056,7 @@ _02076680:
 	ldr r0, [r4, r0]
 	ldrb r1, [r4, r1]
 	ldr r0, [r0, #0x0]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	ldr r1, _02076878 ; =0x000005A4
 	add r5, r0, #0x0
 	ldr r2, [r4, r1]
@@ -2196,7 +2196,7 @@ _020767A4:
 	ldr r0, [r4, r0]
 	ldrb r1, [r4, r1]
 	ldr r0, [r0, #0x0]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	ldr r2, _02076878 ; =0x000005A4
 	add r1, r0, #0x0
 	ldr r2, [r4, r2]
@@ -2241,7 +2241,7 @@ _02076814:
 	ldr r0, [r4, r0]
 	ldrb r1, [r4, r1]
 	ldr r0, [r0, #0x0]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r5, r0, #0x0
 	ldr r0, _02076878 ; =0x000005A4
 	ldr r0, [r4, r0]
@@ -2307,7 +2307,7 @@ FUN_02076890: ; 0x02076890
 	ldr r0, [r4, r0]
 	ldrb r1, [r4, r1]
 	ldr r0, [r0, #0x0]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r5, r0, #0x0
 	bl FUN_020690E4
 	add r2, r0, #0x0
@@ -2586,7 +2586,7 @@ FUN_02076AF8: ; 0x02076AF8
 	ldr r0, [r4, r0]
 	ldrb r1, [r4, r1]
 	ldr r0, [r0, #0x0]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r6, r0, #0x0
 	add r0, r4, #0x0
 	add r1, r6, #0x0
@@ -2775,7 +2775,7 @@ FUN_02076C94: ; 0x02076C94
 	ldr r0, [r4, r0]
 	ldrb r1, [r4, r1]
 	ldr r0, [r0, #0x0]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r5, r0, #0x0
 	bl FUN_020690E4
 	add r2, r0, #0x0
@@ -2854,7 +2854,7 @@ FUN_02076D3C: ; 0x02076D3C
 	ldr r0, [r5, r0]
 	ldrb r1, [r5, r1]
 	ldr r0, [r0, #0x0]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	ldr r2, _02076DC4 ; =0x000005A4
 	add r1, r0, #0x0
 	ldr r2, [r5, r2]
@@ -3138,7 +3138,7 @@ FUN_02076FB0: ; 0x02076FB0
 	ldr r0, [r5, r0]
 	ldrb r1, [r5, r1]
 	ldr r0, [r0, #0x0]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r1, r6, #0x0
 	add r1, #0x36
 	mov r2, #0x0
@@ -3375,7 +3375,7 @@ _0207716A:
 	ldr r0, [r5, r0]
 	ldrb r1, [r5, r1]
 	ldr r0, [r0, #0x0]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r4, #0x36
 	add r1, r4, #0x0
 	mov r2, #0x0
diff --git a/arm9/asm/unk_02079C70.s b/arm9/asm/unk_02079C70.s
index 8b972fcc..9da982ce 100644
--- a/arm9/asm/unk_02079C70.s
+++ b/arm9/asm/unk_02079C70.s
@@ -3169,7 +3169,7 @@ _0207B588:
 _0207B58E:
 	ldr r0, [r1, #0x0]
 	add r1, r4, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #0x5
 	mov r2, #0x0
 	add r6, r0, #0x0
@@ -3269,7 +3269,7 @@ _0207B640:
 _0207B64E:
 	ldrb r1, [r4, #0x14]
 	ldr r0, [r4, #0x0]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	pop {r4, pc}
 _0207B658:
 	bl FUN_020690C8
diff --git a/arm9/asm/unk_02080C38.s b/arm9/asm/unk_02080C38.s
index bf8c6901..86eedd81 100644
--- a/arm9/asm/unk_02080C38.s
+++ b/arm9/asm/unk_02080C38.s
@@ -108,7 +108,7 @@ _02080CB4:
 	ldr r0, [r6, #0xc]
 	bl FUN_0206BB1C
 	mov r1, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r7, r0, #0x0
 	add r0, r6, #0x0
 	bl FUN_020377AC
diff --git a/arm9/asm/unk_020842DC.s b/arm9/asm/unk_020842DC.s
index a1b65c4a..b4f2fa48 100644
--- a/arm9/asm/unk_020842DC.s
+++ b/arm9/asm/unk_020842DC.s
@@ -616,7 +616,7 @@ FUN_020847F8: ; 0x020847F8
 	add r5, r1, #0x0
 	add r1, r2, #0x0
 	add r4, r3, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	ldr r3, [sp, #0x10]
 	add r1, r5, #0x0
 	add r2, r4, #0x0
@@ -1320,7 +1320,7 @@ FUN_02084DD0: ; 0x02084DD0
 	add r5, r1, #0x0
 	add r1, r2, #0x0
 	add r4, r3, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	ldr r1, [sp, #0x14]
 	add r3, sp, #0x0
 	str r1, [sp, #0x0]
@@ -1787,7 +1787,7 @@ FUN_02085140: ; 0x02085140
 	push {r4-r7, lr}
 	sub sp, #0xc
 	str r0, [sp, #0x0]
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	mov r7, #0x0
 	str r0, [sp, #0x4]
 	cmp r0, #0x0
@@ -1796,7 +1796,7 @@ FUN_02085140: ; 0x02085140
 _02085154:
 	ldr r0, [sp, #0x0]
 	add r1, r7, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #0xab
 	mov r2, #0x0
 	add r5, r0, #0x0
diff --git a/arm9/asm/unk_020859C0.s b/arm9/asm/unk_020859C0.s
index 8eb483b3..0111206a 100644
--- a/arm9/asm/unk_020859C0.s
+++ b/arm9/asm/unk_020859C0.s
@@ -573,7 +573,7 @@ _02085DDC:
 	ldr r0, [r6, #0x10]
 	bl FUN_0206BB1C
 	str r0, [r7, #0x1c]
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	mov r4, #0x0
 	str r0, [sp, #0x0]
 	str r0, [r7, #0x0]
@@ -583,7 +583,7 @@ _02085DDC:
 _02085E0A:
 	ldr r0, [r7, #0x1c]
 	add r1, r4, #0x0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	str r0, [r5, #0x4]
 	ldr r0, [sp, #0x0]
 	add r4, r4, #0x1
diff --git a/arm9/asm/unk_02087D00.s b/arm9/asm/unk_02087D00.s
index 835e4fea..644d8dc5 100644
--- a/arm9/asm/unk_02087D00.s
+++ b/arm9/asm/unk_02087D00.s
@@ -446,7 +446,7 @@ _02087FFE:
 	strb r0, [r4, #0x11]
 	strb r6, [r4, #0x14]
 	ldr r0, [r4, #0x0]
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	strb r0, [r4, #0x13]
 	mov r1, #0x0
 	strh r1, [r4, #0x18]
@@ -540,7 +540,7 @@ FUN_020880A0: ; 0x020880A0
 	ldr r0, [r5, #0xc]
 	ldrb r1, [r5, #0x8]
 	ldr r0, [r0, #0x10]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	str r0, [r4, #0x0]
 	ldr r0, [r5, #0xc]
 	ldr r0, [r0, #0x18]
@@ -608,7 +608,7 @@ FUN_02088130: ; 0x02088130
 	ldrb r0, [r5, #0x8]
 	strb r0, [r4, #0x14]
 	ldr r0, [r4, #0x0]
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	strb r0, [r4, #0x13]
 	mov r1, #0x0
 	strh r1, [r4, #0x18]
diff --git a/arm9/global.inc b/arm9/global.inc
index 840fe78b..ec19fbfe 100644
--- a/arm9/global.inc
+++ b/arm9/global.inc
@@ -4862,8 +4862,8 @@
 .extern FUN_0206B8CC

 .extern FUN_0206B900

 .extern FUN_0206B938

-.extern FUN_0206B9AC

-.extern FUN_0206B9B0

+.extern GetPartyCount

+.extern GetPartyMonByIndex

 .extern FUN_0206B9DC

 .extern FUN_0206BA38

 .extern FUN_0206BAD0

diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s
index b5f89157..a05f9c76 100644
--- a/arm9/modules/05/asm/module_05.s
+++ b/arm9/modules/05/asm/module_05.s
@@ -3279,7 +3279,7 @@ MOD05_021D8FD0: ; 0x021D8FD0
 	lsl r0, r0, #0x10
 	lsr r5, r0, #0x10
 	add r0, r6, #0
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	add r7, r0, #0
 	mov r4, #0
 	cmp r7, #0
@@ -3287,7 +3287,7 @@ MOD05_021D8FD0: ; 0x021D8FD0
 _021D8FF6:
 	add r0, r6, #0
 	add r1, r4, #0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #5
 	add r2, r5, #0
 	bl MonApplyFriendshipMod
@@ -32853,7 +32853,7 @@ MOD05_021E72E8: ; 0x021E72E8
 	add r4, r1, #0
 	bl FUN_0206BB1C
 	add r1, r4, #0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	pop {r4, pc}
 	.balign 4, 0
 
@@ -43117,7 +43117,7 @@ MOD05_021EC4F0: ; 0x021EC4F0
 	add r6, r0, #0
 	str r1, [sp]
 	add r7, r3, #0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r4, r0, #0
 	add r0, r5, #0
 	bl FUN_02023C80
@@ -44679,7 +44679,7 @@ _021ED168:
 MOD05_021ED190: ; 0x021ED190
 	push {r3, r4, r5, r6, r7, lr}
 	add r5, r0, #0
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	add r6, r0, #0
 	mov r4, #0
 	cmp r6, #0
@@ -44688,7 +44688,7 @@ MOD05_021ED190: ; 0x021ED190
 _021ED1A2:
 	add r0, r5, #0
 	add r1, r4, #0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r1, r7, #0
 	mov r2, #0
 	bl GetMonData
@@ -44696,7 +44696,7 @@ _021ED1A2:
 	bne _021ED1D6
 	add r0, r5, #0
 	add r1, r4, #0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #0xa
 	mov r2, #0
 	bl GetMonData
@@ -45017,13 +45017,13 @@ _021ED3F8:
 	add r6, r0, #0
 	add r0, r7, #0
 	mov r5, #0
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	cmp r0, #0
 	bls _021ED490
 _021ED430:
 	add r0, r7, #0
 	add r1, r5, #0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #0x4c
 	mov r2, #0
 	add r4, r0, #0
@@ -45064,7 +45064,7 @@ _021ED47E:
 _021ED484:
 	add r0, r7, #0
 	add r5, r5, #1
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	cmp r5, r0
 	blo _021ED430
 _021ED490:
@@ -45078,7 +45078,7 @@ _021ED498: .word 0x0000FFFF
 MOD05_021ED49C: ; 0x021ED49C
 	push {r3, r4, r5, r6, r7, lr}
 	add r7, r0, #0
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	add r6, r0, #0
 	mov r5, #0
 	cmp r6, #0
@@ -45086,7 +45086,7 @@ MOD05_021ED49C: ; 0x021ED49C
 _021ED4AC:
 	add r0, r7, #0
 	add r1, r5, #0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #0x4c
 	mov r2, #0
 	add r4, r0, #0
@@ -45222,7 +45222,7 @@ _021ED5B4:
 MOD05_021ED5C4: ; 0x021ED5C4
 	push {r3, r4, r5, lr}
 	add r5, r2, #0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r4, r0, #0
 	bl FUN_020690E4
 	add r2, r0, #0
@@ -58275,7 +58275,7 @@ MOD05_021F3A18: ; 0x021F3A18
 	add r5, r1, #0
 	bl FUN_0206BB1C
 	add r1, r5, #0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #5
 	mov r2, #0
 	str r0, [sp]
@@ -58344,7 +58344,7 @@ MOD05_021F3AB4: ; 0x021F3AB4
 	add r5, r1, #0
 	bl FUN_0206BB1C
 	add r1, r5, #0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	bl MOD05_021F38CC
 	add r1, sp, #0
 	strh r0, [r1]
@@ -58440,7 +58440,7 @@ MOD05_021F3B7C: ; 0x021F3B7C
 	add r7, r1, #0
 	bl FUN_0206BB1C
 	add r1, r4, #0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #5
 	mov r2, #0
 	add r6, r0, #0
@@ -62943,7 +62943,7 @@ _021F5CBA:
 	bne _021F5D10
 	ldr r0, [r0, #8]
 	mov r1, #0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	ldr r2, [r5, #4]
 	add r3, r0, #0
 	lsl r2, r2, #0x10
diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s
index a857283f..a7f8e367 100644
--- a/arm9/modules/06/asm/module_06.s
+++ b/arm9/modules/06/asm/module_06.s
@@ -4786,7 +4786,7 @@ _0223BA42:
 	add r4, r0, #0
 	add r0, r7, #0
 	mov r1, #0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	str r0, [sp, #0x20]
 	ldr r1, [sp, #0x20]
 	add r0, r5, #0
@@ -5130,7 +5130,7 @@ _0223BD2E:
 	ldr r0, [r0, #0xc]
 	bl FUN_0206BB1C
 	mov r1, #0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	str r0, [sp, #0x14]
 	ldr r0, [sp, #8]
 	ldr r1, [sp, #0x14]
@@ -5312,7 +5312,7 @@ _0223BEA4:
 	add r4, r0, #0
 	add r0, r6, #0
 	mov r1, #0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	str r0, [sp, #0x18]
 	ldr r1, [sp, #0x18]
 	add r0, r5, #0
@@ -5568,7 +5568,7 @@ _0223C0CE:
 	str r0, [sp, #0x14]
 	add r0, r6, #0
 	mov r1, #0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	str r0, [sp, #0x1c]
 	ldr r1, [sp, #0x1c]
 	ldr r2, [sp, #0x14]
@@ -7118,7 +7118,7 @@ MOD06_0223CCDC: ; 0x0223CCDC
 	ldr r0, [r5, #0xc]
 	bl FUN_0206BB1C
 	mov r1, #0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	str r0, [sp, #0xc]
 	ldr r1, [sp, #0xc]
 	add r0, r5, #0
@@ -7194,7 +7194,7 @@ MOD06_0223CD7C: ; 0x0223CD7C
 	add r6, r3, #0
 	bl FUN_0206BB1C
 	mov r1, #0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r4, r0, #0
 	add r0, r5, #0
 	add r1, r4, #0
@@ -19735,7 +19735,7 @@ MOD06_022432E4: ; 0x022432E4
 	add r0, r1, #0
 	bl FUN_0206BB1C
 	str r0, [sp, #4]
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	lsl r0, r0, #0x18
 	lsr r1, r0, #0x18
 	str r1, [sp, #8]
@@ -19754,7 +19754,7 @@ _02243308:
 _02243312:
 	ldr r0, [sp, #4]
 	add r1, r7, #0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #5
 	mov r2, #0
 	str r0, [sp, #0xc]
@@ -20281,7 +20281,7 @@ _02243726:
 	add r1, #0x2a
 	ldrb r1, [r1]
 	ldr r0, [sp, #8]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	lsl r1, r4, #1
 	add r6, r5, r1
 	add r7, r0, #0
@@ -20333,7 +20333,7 @@ _0224379C:
 	add r1, r1, r5
 	add r1, #0x2a
 	ldrb r1, [r1]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	str r0, [sp, #8]
 	lsl r6, r5, #1
 	mov r1, #5
@@ -20579,7 +20579,7 @@ _0224394A:
 	bne _0224396C
 	add r5, #0x2a
 	ldrb r1, [r5]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r2, r0, #0
 	add r0, r4, #0
 	add r1, r6, #0
@@ -20589,7 +20589,7 @@ _0224394A:
 _0224396C:
 	add r5, #0x2a
 	ldrb r1, [r5]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r2, r0, #0
 	add r0, r4, #0
 	add r1, r6, #0
@@ -21453,7 +21453,7 @@ _02243FFA:
 	add r1, #0x2a
 	ldrb r1, [r1]
 	ldr r0, [sp]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r1, r6, #0
 	mov r2, #0
 	str r0, [sp, #4]
@@ -21673,7 +21673,7 @@ _022441B8:
 	add r1, #0x2a
 	ldrb r1, [r1]
 	add r0, r7, #0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r1, r0, #0
 	add r0, r5, #0
 	bl MOD06_0224406C
@@ -22151,7 +22151,7 @@ _022445A6:
 	add r1, #0x2a
 	ldrb r1, [r1]
 	ldr r0, [sp, #4]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r1, r4, #0
 	bl FUN_02069B88
 	add r0, r4, #0
@@ -22345,7 +22345,7 @@ _0224471C:
 	add r1, #0x2a
 	ldrb r1, [r1]
 	add r0, r7, #0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #5
 	mov r2, #0
 	bl GetMonData
@@ -30761,7 +30761,7 @@ MOD06_02248724: ; 0x02248724
 	ldr r0, [r1, #8]
 	str r1, [sp]
 	mov r1, #0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r6, r0, #0
 	ldr r0, [r5, #0xc]
 	bl FUN_0202A9B0
@@ -31014,7 +31014,7 @@ MOD06_0224891C: ; 0x0224891C
 	add r4, r3, #0
 	bl FUN_0206BB1C
 	add r1, r7, #0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #0xa0
 	mov r2, #0
 	add r7, r0, #0
diff --git a/arm9/modules/07/asm/module_07.s b/arm9/modules/07/asm/module_07.s
index 5f048017..c9c4dd87 100644
--- a/arm9/modules/07/asm/module_07.s
+++ b/arm9/modules/07/asm/module_07.s
@@ -2305,7 +2305,7 @@ MOD07_02213104: ; 0x02213104
 	str r1, [sp]
 	str r2, [sp, #4]
 	add r7, r3, #0
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	lsl r0, r0, #0x18
 	lsr r0, r0, #0x18
 	str r0, [sp, #8]
@@ -2329,7 +2329,7 @@ _0221312A:
 	bls _022131B0
 	ldr r0, [sp]
 	add r1, r4, #0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #5
 	mov r2, #0
 	add r7, r0, #0
@@ -3643,7 +3643,7 @@ MOD07_02213BEC: ; 0x02213BEC
 	add r0, r1, #0
 	str r1, [sp]
 	add r5, r2, #0
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	lsl r0, r0, #0x10
 	lsr r0, r0, #0x10
 	str r0, [sp, #8]
@@ -3672,7 +3672,7 @@ _02213C0C:
 _02213C2E:
 	ldr r0, [sp]
 	add r1, r6, #0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #0x18
 	add r2, r6, #0
 	mul r2, r1
@@ -4488,13 +4488,13 @@ MOD07_0221428C: ; 0x0221428C
 	bhs _022142B4
 	ldr r0, [r0, #4]
 	add r1, r4, #0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	str r0, [sp, #0x18]
 	b _022142BE
 _022142B4:
 	ldr r0, [r0, #0xc]
 	sub r1, r4, #3
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	str r0, [sp, #0x18]
 _022142BE:
 	add r1, r4, #0
diff --git a/arm9/modules/09/asm/module_09.s b/arm9/modules/09/asm/module_09.s
index 26c682ce..50557058 100644
--- a/arm9/modules/09/asm/module_09.s
+++ b/arm9/modules/09/asm/module_09.s
@@ -2423,7 +2423,7 @@ MOD09_022131C8: ; 0x022131C8
 	ldr r0, [sp]

 	ldr r0, [r0]

 	ldr r0, [r0]

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r0, #0

 	bgt _022131E2

 	b _02213476

@@ -2437,7 +2437,7 @@ _022131E2:
 	ldr r0, [r0]

 	ldr r1, [sp, #8]

 	ldr r0, [r0]

-	bl FUN_0206B9B0

+	bl GetPartyMonByIndex

 	str r0, [r4, #4]

 	mov r1, #5

 	mov r2, #0

@@ -2724,7 +2724,7 @@ _0221345A:
 	ldr r0, [sp]

 	ldr r0, [r0]

 	ldr r0, [r0]

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	ldr r1, [sp, #8]

 	cmp r1, r0

 	bge _02213476

@@ -6734,7 +6734,7 @@ MOD09_022155D0: ; 0x022155D0
 	ldr r0, [r5]

 	mov r4, #0

 	ldr r0, [r0]

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r0, #0

 	ble _02215656

 	add r0, r4, #0

@@ -6788,7 +6788,7 @@ _0221563E:
 	add r7, #0x50

 	ldr r0, [r0]

 	add r4, r4, #1

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r4, r0

 	blt _022155EE

 _02215656:

@@ -10495,7 +10495,7 @@ MOD09_02217580: ; 0x02217580
 	ldr r0, [r5]

 	mov r4, #0

 	ldr r0, [r0]

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r0, #0

 	ble _022175D8

 	add r7, r5, #4

@@ -10528,7 +10528,7 @@ _022175C6:
 	lsr r4, r0, #0x10

 	ldr r0, [r5]

 	ldr r0, [r0]

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r4, r0

 	blt _02217594

 _022175D8:

@@ -13506,7 +13506,7 @@ _02218DF2:
 	bl MOD11_02230290

 	add r4, r0, #0

 	add r0, r6, #0

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r0, #6

 	bne _02218E32

 	add r0, r4, #0

diff --git a/arm9/modules/11/asm/module_11.s b/arm9/modules/11/asm/module_11.s
index 2a3e4f64..5558b99a 100644
--- a/arm9/modules/11/asm/module_11.s
+++ b/arm9/modules/11/asm/module_11.s
@@ -213,7 +213,7 @@ _0222D752:
 	bl FUN_0201681C

 	ldr r0, [r5, #4]

 	ldr r1, [sp, #0x24]

-	bl FUN_0206B9B0

+	bl GetPartyMonByIndex

 	add r1, r0, #0

 	mov r0, #0x5a

 	lsl r0, r0, #2

@@ -1141,7 +1141,7 @@ MOD11_0222DFA4: ; 0x0222DFA4
 	beq _0222DFE4

 	ldr r0, [r4, #0x6c]

 	mov r1, #0

-	bl FUN_0206B9B0

+	bl GetPartyMonByIndex

 	add r1, r0, #0

 	add r0, r4, #0

 	bl MOD11_02230FA8

@@ -2014,13 +2014,13 @@ _0222E734:
 _0222E760:

 	ldr r0, [r7, #0x68]

 	mov r5, #0

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r0, #0

 	ble _0222E7AA

 _0222E76C:

 	ldr r0, [r7, #0x68]

 	add r1, r5, #0

-	bl FUN_0206B9B0

+	bl GetPartyMonByIndex

 	mov r1, #5

 	mov r2, #0

 	add r6, r0, #0

@@ -2042,7 +2042,7 @@ _0222E76C:
 _0222E79E:

 	ldr r0, [r7, #0x68]

 	add r5, r5, #1

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r5, r0

 	blt _0222E76C

 _0222E7AA:

@@ -2119,13 +2119,13 @@ _0222E810:
 _0222E83C:

 	ldr r0, [r7, #0x68]

 	mov r5, #0

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r0, #0

 	ble _0222E886

 _0222E848:

 	ldr r0, [r7, #0x68]

 	add r1, r5, #0

-	bl FUN_0206B9B0

+	bl GetPartyMonByIndex

 	mov r1, #5

 	mov r2, #0

 	add r6, r0, #0

@@ -2147,7 +2147,7 @@ _0222E848:
 _0222E87A:

 	ldr r0, [r7, #0x68]

 	add r5, r5, #1

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r5, r0

 	blt _0222E848

 _0222E886:

@@ -2234,13 +2234,13 @@ _0222E920:
 	add r7, r4, r0

 	ldr r0, [r7, #0x68]

 	mov r6, #0

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r0, #0

 	ble _0222E9B8

 _0222E938:

 	ldr r0, [r7, #0x68]

 	add r1, r6, #0

-	bl FUN_0206B9B0

+	bl GetPartyMonByIndex

 	ldr r1, [sp, #0x14]

 	add r5, r0, #0

 	cmp r1, #1

@@ -2292,7 +2292,7 @@ _0222E984:
 _0222E9AC:

 	ldr r0, [r7, #0x68]

 	add r6, r6, #1

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r6, r0

 	blt _0222E938

 _0222E9B8:

@@ -2345,13 +2345,13 @@ _0222EA0C:
 	bl FUN_0206BAD0

 	ldr r0, [r7, #0x68]

 	mov r5, #0

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r0, #0

 	ble _0222EA60

 _0222EA22:

 	ldr r0, [r7, #0x68]

 	add r1, r5, #0

-	bl FUN_0206B9B0

+	bl GetPartyMonByIndex

 	mov r1, #5

 	mov r2, #0

 	add r6, r0, #0

@@ -2373,7 +2373,7 @@ _0222EA22:
 _0222EA54:

 	ldr r0, [r7, #0x68]

 	add r5, r5, #1

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r5, r0

 	blt _0222EA22

 _0222EA60:

@@ -2572,13 +2572,13 @@ _0222EBC6:
 _0222EBEA:

 	ldr r0, [r7, #0x68]

 	mov r5, #0

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r0, #0

 	ble _0222EC34

 _0222EBF6:

 	ldr r0, [r7, #0x68]

 	add r1, r5, #0

-	bl FUN_0206B9B0

+	bl GetPartyMonByIndex

 	mov r1, #5

 	mov r2, #0

 	add r6, r0, #0

@@ -2600,7 +2600,7 @@ _0222EBF6:
 _0222EC28:

 	ldr r0, [r7, #0x68]

 	add r5, r5, #1

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r5, r0

 	blt _0222EBF6

 _0222EC34:

@@ -2686,13 +2686,13 @@ _0222ECC8:
 	add r7, r4, r0

 	ldr r0, [r7, #0x68]

 	mov r6, #0

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r0, #0

 	ble _0222ED60

 _0222ECE0:

 	ldr r0, [r7, #0x68]

 	add r1, r6, #0

-	bl FUN_0206B9B0

+	bl GetPartyMonByIndex

 	ldr r1, [sp, #0x20]

 	add r5, r0, #0

 	cmp r1, #1

@@ -2744,7 +2744,7 @@ _0222ED2C:
 _0222ED54:

 	ldr r0, [r7, #0x68]

 	add r6, r6, #1

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r6, r0

 	blt _0222ECE0

 _0222ED60:

@@ -2800,13 +2800,13 @@ _0222EDBC:
 	bl FUN_0206BAD0

 	ldr r0, [r7, #0x68]

 	mov r5, #0

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r0, #0

 	ble _0222EE10

 _0222EDD2:

 	ldr r0, [r7, #0x68]

 	add r1, r5, #0

-	bl FUN_0206B9B0

+	bl GetPartyMonByIndex

 	mov r1, #5

 	mov r2, #0

 	add r6, r0, #0

@@ -2828,7 +2828,7 @@ _0222EDD2:
 _0222EE04:

 	ldr r0, [r7, #0x68]

 	add r5, r5, #1

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r5, r0

 	blt _0222EDD2

 _0222EE10:

@@ -2861,7 +2861,7 @@ _0222EE3E:
 	beq _0222EE5A

 	ldr r0, [r4, #0x6c]

 	mov r1, #0

-	bl FUN_0206B9B0

+	bl GetPartyMonByIndex

 	add r2, r4, #0

 	mov r1, #0x8f

 	add r2, #0xf4

@@ -2885,7 +2885,7 @@ _0222EE5A:
 _0222EE7C:

 	ldr r0, [r4, #0x68]

 	mov r5, #0

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r0, #0

 	ble _0222EEAC

 	ldr r6, _0222EEEC ; =0x00002404

@@ -2893,7 +2893,7 @@ _0222EE7C:
 _0222EE8C:

 	ldr r0, [r4, #0x68]

 	add r1, r5, #0

-	bl FUN_0206B9B0

+	bl GetPartyMonByIndex

 	ldr r2, [r4, r6]

 	add r1, r7, #0

 	lsl r2, r2, #0x10

@@ -2901,13 +2901,13 @@ _0222EE8C:
 	bl MonApplyFriendshipMod

 	ldr r0, [r4, #0x68]

 	add r5, r5, #1

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r5, r0

 	blt _0222EE8C

 _0222EEAC:

 	ldr r0, [r4, #0x70]

 	mov r5, #0

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r0, #0

 	ble _0222EEDC

 	ldr r6, _0222EEEC ; =0x00002404

@@ -2915,7 +2915,7 @@ _0222EEAC:
 _0222EEBC:

 	ldr r0, [r4, #0x70]

 	add r1, r5, #0

-	bl FUN_0206B9B0

+	bl GetPartyMonByIndex

 	ldr r2, [r4, r6]

 	add r1, r7, #0

 	lsl r2, r2, #0x10

@@ -2923,7 +2923,7 @@ _0222EEBC:
 	bl MonApplyFriendshipMod

 	ldr r0, [r4, #0x70]

 	add r5, r5, #1

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r5, r0

 	blt _0222EEBC

 _0222EEDC:

@@ -5057,7 +5057,7 @@ _0222FFE6:
 	lsl r0, r4, #2

 	add r0, r5, r0

 	ldr r0, [r0, #0x68]

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	pop {r3, r4, r5, pc}

 _0222FFF2:

 	ldr r1, [r5, #0x2c]

@@ -5068,13 +5068,13 @@ _0222FFF2:
 	lsr r0, r0, #0x1d

 	add r0, r5, r0

 	ldr r0, [r0, #0x68]

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	pop {r3, r4, r5, pc}

 _02230008:

 	lsl r0, r4, #2

 	add r0, r5, r0

 	ldr r0, [r0, #0x68]

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	pop {r3, r4, r5, pc}

 

 	thumb_func_start MOD11_02230014

@@ -5099,7 +5099,7 @@ _02230034:
 	add r0, r5, r0

 	ldr r0, [r0, #0x68]

 	add r1, r6, #0

-	bl FUN_0206B9B0

+	bl GetPartyMonByIndex

 	pop {r4, r5, r6, pc}

 _02230042:

 	ldr r1, [r5, #0x2c]

@@ -5111,14 +5111,14 @@ _02230042:
 	add r0, r5, r0

 	ldr r0, [r0, #0x68]

 	add r1, r6, #0

-	bl FUN_0206B9B0

+	bl GetPartyMonByIndex

 	pop {r4, r5, r6, pc}

 _0223005A:

 	lsl r0, r4, #2

 	add r0, r5, r0

 	ldr r0, [r0, #0x68]

 	add r1, r6, #0

-	bl FUN_0206B9B0

+	bl GetPartyMonByIndex

 	pop {r4, r5, r6, pc}

 

 	thumb_func_start MOD11_02230068

@@ -6901,7 +6901,7 @@ _02230D9C:
 	cmp r1, #6

 	bge _02230DC4

 	ldr r0, [r5, #4]

-	bl FUN_0206B9B0

+	bl GetPartyMonByIndex

 	mov r3, #0x59

 	str r7, [sp]

 	lsl r3, r3, #2

@@ -12578,7 +12578,7 @@ _02233938:
 	add r4, r0, #0

 	add r0, r7, #0

 	bl MOD11_0222FF88

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r0, #0

 	ble _022339C6

 _02233950:

@@ -12632,7 +12632,7 @@ _022339B4:
 	mov r1, #0

 	add r4, r4, #1

 	bl MOD11_0222FF88

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r4, r0

 	blt _02233950

 _022339C6:

@@ -18480,7 +18480,7 @@ _0223678C:
 _02236794:

 	ldr r0, [sp, #0x14]

 	add r1, r5, #0

-	bl FUN_0206B9B0

+	bl GetPartyMonByIndex

 	mov r1, #5

 	mov r2, #0

 	add r4, r0, #0

@@ -18533,7 +18533,7 @@ _022367EA:
 	beq _022367EA

 	ldr r0, [sp, #0x14]

 	add r1, r5, #0

-	bl FUN_0206B9B0

+	bl GetPartyMonByIndex

 	add r1, r7, #0

 	mov r2, #0

 	add r4, r0, #0

@@ -25352,13 +25352,13 @@ _02239DFA:
 	bl MOD11_0222FF7C

 	add r0, r7, #0

 	mov r4, #0

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r0, #0

 	ble _02239E68

 _02239E2A:

 	add r0, r7, #0

 	add r1, r4, #0

-	bl FUN_0206B9B0

+	bl GetPartyMonByIndex

 	mov r1, #0xad

 	mov r2, #0

 	add r6, r0, #0

@@ -25380,7 +25380,7 @@ _02239E2A:
 _02239E5C:

 	add r0, r7, #0

 	add r4, r4, #1

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r4, r0

 	blt _02239E2A

 _02239E68:

@@ -25400,14 +25400,14 @@ _02239E76:
 _02239E82:

 	ldr r0, [sp, #8]

 	mov r4, #0

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r0, #0

 	ble _02239ECC

 	ldr r7, _02239F48 ; =0x000001EE

 _02239E90:

 	ldr r0, [sp, #8]

 	add r1, r4, #0

-	bl FUN_0206B9B0

+	bl GetPartyMonByIndex

 	mov r1, #0xad

 	mov r2, #0

 	add r6, r0, #0

@@ -25428,7 +25428,7 @@ _02239E90:
 _02239EC0:

 	ldr r0, [sp, #8]

 	add r4, r4, #1

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r4, r0

 	blt _02239E90

 _02239ECC:

@@ -25448,13 +25448,13 @@ _02239EDA:
 	bl MOD11_0222FF7C

 	add r0, r7, #0

 	mov r4, #0

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r0, #0

 	ble _02239F36

 _02239EF8:

 	add r0, r7, #0

 	add r1, r4, #0

-	bl FUN_0206B9B0

+	bl GetPartyMonByIndex

 	mov r1, #0xad

 	mov r2, #0

 	add r6, r0, #0

@@ -25476,7 +25476,7 @@ _02239EF8:
 _02239F2A:

 	add r0, r7, #0

 	add r4, r4, #1

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r4, r0

 	blt _02239EF8

 _02239F36:

@@ -27988,7 +27988,7 @@ MOD11_0223B2DC: ; 0x0223B2DC
 	add r7, r0, #0

 	ldr r0, [sp]

 	ldr r1, [sp, #4]

-	bl FUN_0206B9B0

+	bl GetPartyMonByIndex

 	mov r1, #6

 	add r2, r4, #0

 	str r0, [sp, #0x14]

@@ -41607,7 +41607,7 @@ _02241DD2:
 	bl MOD11_0222FF7C

 	add r0, r6, #0

 	add r5, r7, #0

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r0, #0

 	ble _02241E4A

 	ldr r0, [sp, #0x2c]

@@ -41619,7 +41619,7 @@ _02241DD2:
 _02241DFE:

 	add r0, r6, #0

 	add r1, r5, #0

-	bl FUN_0206B9B0

+	bl GetPartyMonByIndex

 	mov r1, #0xad

 	mov r2, #0

 	add r4, r0, #0

@@ -41648,7 +41648,7 @@ _02241DFE:
 _02241E3E:

 	add r0, r6, #0

 	add r5, r5, #1

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r5, r0

 	blt _02241DFE

 _02241E4A:

@@ -41700,13 +41700,13 @@ _02241E8A:
 	bl MOD11_0222FF7C

 	add r0, r6, #0

 	add r5, r7, #0

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r0, #0

 	ble _02241EF2

 _02241EB4:

 	add r0, r6, #0

 	add r1, r5, #0

-	bl FUN_0206B9B0

+	bl GetPartyMonByIndex

 	mov r1, #0xad

 	mov r2, #0

 	add r4, r0, #0

@@ -41728,7 +41728,7 @@ _02241EB4:
 _02241EE6:

 	add r0, r6, #0

 	add r5, r5, #1

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r5, r0

 	blt _02241EB4

 _02241EF2:

@@ -41905,13 +41905,13 @@ _0224200C:
 	bl MOD11_0222FF7C

 	add r0, r6, #0

 	add r4, r7, #0

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r0, #0

 	ble _02242094

 _02242056:

 	add r0, r6, #0

 	add r1, r4, #0

-	bl FUN_0206B9B0

+	bl GetPartyMonByIndex

 	mov r1, #0xad

 	mov r2, #0

 	add r5, r0, #0

@@ -41933,7 +41933,7 @@ _02242056:
 _02242088:

 	add r0, r6, #0

 	add r4, r4, #1

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r4, r0

 	blt _02242056

 _02242094:

@@ -41985,13 +41985,13 @@ _022420CA:
 	str r0, [sp, #0x14]

 	add r0, r7, #0

 	add r4, r5, #0

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r0, #0

 	ble _0224213C

 _022420FE:

 	add r0, r7, #0

 	add r1, r4, #0

-	bl FUN_0206B9B0

+	bl GetPartyMonByIndex

 	mov r1, #0xad

 	mov r2, #0

 	add r6, r0, #0

@@ -42013,20 +42013,20 @@ _022420FE:
 _02242130:

 	add r0, r7, #0

 	add r4, r4, #1

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r4, r0

 	blt _022420FE

 _0224213C:

 	ldr r0, [sp, #0x18]

 	mov r4, #0

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r0, #0

 	ble _02242186

 	ldr r7, _02242340 ; =0x000001EE

 _0224214A:

 	ldr r0, [sp, #0x18]

 	add r1, r4, #0

-	bl FUN_0206B9B0

+	bl GetPartyMonByIndex

 	mov r1, #0xad

 	mov r2, #0

 	add r6, r0, #0

@@ -42047,7 +42047,7 @@ _0224214A:
 _0224217A:

 	ldr r0, [sp, #0x18]

 	add r4, r4, #1

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r4, r0

 	blt _0224214A

 _02242186:

@@ -42089,13 +42089,13 @@ _022421B0:
 	str r0, [sp, #0x10]

 	add r0, r6, #0

 	add r4, r7, #0

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r0, #0

 	ble _0224221A

 _022421DC:

 	add r0, r6, #0

 	add r1, r4, #0

-	bl FUN_0206B9B0

+	bl GetPartyMonByIndex

 	mov r1, #0xad

 	mov r2, #0

 	add r5, r0, #0

@@ -42117,7 +42117,7 @@ _022421DC:
 _0224220E:

 	add r0, r6, #0

 	add r4, r4, #1

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r4, r0

 	blt _022421DC

 _0224221A:

@@ -48640,13 +48640,13 @@ _02245384:
 	mov r6, #0

 	add r5, r0, #0

 	add r4, r6, #0

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r0, #0

 	ble _022453C6

 _022453A4:

 	add r0, r5, #0

 	add r1, r4, #0

-	bl FUN_0206B9B0

+	bl GetPartyMonByIndex

 	mov r1, #0xa2

 	mov r2, #0

 	bl GetMonData

@@ -48656,7 +48656,7 @@ _022453A4:
 _022453BA:

 	add r0, r5, #0

 	add r4, r4, #1

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r4, r0

 	blt _022453A4

 _022453C6:

@@ -48697,13 +48697,13 @@ _022453F8:
 	mov r6, #0

 	add r5, r0, #0

 	add r4, r6, #0

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r0, #0

 	ble _0224543A

 _02245418:

 	add r0, r5, #0

 	add r1, r4, #0

-	bl FUN_0206B9B0

+	bl GetPartyMonByIndex

 	mov r1, #0xa2

 	mov r2, #0

 	bl GetMonData

@@ -48713,7 +48713,7 @@ _02245418:
 _0224542E:

 	add r0, r5, #0

 	add r4, r4, #1

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r4, r0

 	blt _02245418

 _0224543A:

@@ -52132,7 +52132,7 @@ _02246E72:
 _02246E76:

 	ldr r0, [sp, #0x14]

 	add r1, r5, #0

-	bl FUN_0206B9B0

+	bl GetPartyMonByIndex

 	mov r1, #5

 	mov r2, #0

 	add r4, r0, #0

@@ -65586,13 +65586,13 @@ _0224D452:
 	bl MOD11_0222FF88

 	add r6, r0, #0

 	mov r5, #0

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r0, #0

 	ble _0224D4C0

 _0224D466:

 	add r0, r6, #0

 	add r1, r5, #0

-	bl FUN_0206B9B0

+	bl GetPartyMonByIndex

 	mov r1, #5

 	mov r2, #0

 	add r4, r0, #0

@@ -65627,7 +65627,7 @@ _0224D4A8:
 _0224D4B4:

 	add r0, r6, #0

 	add r5, r5, #1

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r5, r0

 	blt _0224D466

 _0224D4C0:

@@ -73750,7 +73750,7 @@ _02251662:
 	bl FUN_0206B8CC

 	ldr r0, [sp, #0x14]

 	mov r6, #0

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r0, #0

 	ble _022516B0

 	mov r0, #6

@@ -73775,7 +73775,7 @@ _02251680:
 	strb r0, [r1]

 	ldr r0, [sp, #0x14]

 	add r6, r6, #1

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r6, r0

 	blt _02251680

 _022516B0:

@@ -75168,7 +75168,7 @@ _022521DC:
 	ldr r0, [r4, #4]

 	add r1, r6, #0

 	ldr r0, [r0]

-	bl FUN_0206B9B0

+	bl GetPartyMonByIndex

 	add r1, r0, #0

 	ldr r0, [sp, #0x1c]

 	bl FUN_02069B88

@@ -75208,7 +75208,7 @@ _02252232:
 	ldr r0, [r4, #4]

 	ldr r1, [sp, #0xc]

 	ldr r0, [r0]

-	bl FUN_0206B9B0

+	bl GetPartyMonByIndex

 	add r1, r0, #0

 	ldr r0, [sp, #0x20]

 	bl FUN_02069B88

@@ -75279,7 +75279,7 @@ _022522C4:
 	bl MOD11_0222FF88

 	str r0, [sp, #0x10]

 	mov r5, #0

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r0, #0

 	ble _0225230E

 	mov r0, #6

@@ -75302,7 +75302,7 @@ _022522E2:
 	ldr r0, [sp, #0x10]

 	add r6, r6, #1

 	add r5, r5, #1

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r5, r0

 	blt _022522E2

 _0225230E:

@@ -75514,7 +75514,7 @@ _0225249A:
 	bl MOD11_0222FF88

 	str r0, [sp, #8]

 	mov r4, #0

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r0, #0

 	ble _022524FE

 	ldr r0, [sp, #4]

@@ -75539,7 +75539,7 @@ _022524D0:
 _022524F2:

 	ldr r0, [sp, #8]

 	add r4, r4, #1

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r4, r0

 	blt _022524D0

 _022524FE:

@@ -81265,7 +81265,7 @@ _02255210:
 	bl MOD11_0222FF88

 	str r0, [sp, #0x24]

 	mov r6, #0

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r0, #0

 	ble _022552A6

 	mov r0, #6

@@ -81283,7 +81283,7 @@ _0225523A:
 	ldr r1, _022554FC ; =0x0000312C

 	ldr r0, [sp, #0x24]

 	ldrb r1, [r7, r1]

-	bl FUN_0206B9B0

+	bl GetPartyMonByIndex

 	mov r1, #0xad

 	mov r2, #0

 	add r4, r0, #0

@@ -81331,7 +81331,7 @@ _02255298:
 	ldr r0, [sp, #0x24]

 	add r7, r7, #1

 	add r6, r6, #1

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r6, r0

 	blt _0225523A

 _022552A6:

@@ -81371,7 +81371,7 @@ _022552E2:
 	bl MOD11_0222FF88

 	str r0, [sp, #0x10]

 	mov r5, #0

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r0, #0

 	ble _0225535E

 	add r1, r4, #0

@@ -81384,7 +81384,7 @@ _02255304:
 	ldr r1, _022554FC ; =0x0000312C

 	ldr r0, [sp, #0x10]

 	ldrb r1, [r6, r1]

-	bl FUN_0206B9B0

+	bl GetPartyMonByIndex

 	mov r1, #0xad

 	mov r2, #0

 	add r7, r0, #0

@@ -81422,7 +81422,7 @@ _02255350:
 	ldr r0, [sp, #0x10]

 	add r6, r6, #1

 	add r5, r5, #1

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r5, r0

 	blt _02255304

 _0225535E:

@@ -81446,7 +81446,7 @@ _0225537C:
 	bl MOD11_0222FF88

 	str r0, [sp, #0x14]

 	mov r5, #0

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r0, #0

 	ble _02255482

 	add r1, r4, #0

@@ -81460,7 +81460,7 @@ _022553A0:
 	ldr r1, _022554FC ; =0x0000312C

 	ldr r0, [sp, #0x14]

 	ldrb r1, [r6, r1]

-	bl FUN_0206B9B0

+	bl GetPartyMonByIndex

 	mov r1, #0xad

 	mov r2, #0

 	add r7, r0, #0

@@ -81498,7 +81498,7 @@ _022553EC:
 	ldr r0, [sp, #0x14]

 	add r6, r6, #1

 	add r5, r5, #1

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r5, r0

 	blt _022553A0

 	b _02255482

@@ -81513,7 +81513,7 @@ _022553FC:
 	bl MOD11_0222FF88

 	str r0, [sp, #0x18]

 	mov r5, #0

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r0, #0

 	ble _02255482

 	add r1, r4, #0

@@ -81526,7 +81526,7 @@ _02255428:
 	ldr r1, _022554FC ; =0x0000312C

 	ldr r0, [sp, #0x18]

 	ldrb r1, [r6, r1]

-	bl FUN_0206B9B0

+	bl GetPartyMonByIndex

 	mov r1, #0xad

 	mov r2, #0

 	add r7, r0, #0

@@ -81564,7 +81564,7 @@ _02255474:
 	ldr r0, [sp, #0x18]

 	add r6, r6, #1

 	add r5, r5, #1

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r5, r0

 	blt _02255428

 _02255482:

@@ -84454,7 +84454,7 @@ _02256A60:
 	mov r4, #0

 	str r0, [sp, #0x10]

 	add r7, r4, #0

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r0, #0

 	ble _02256AE0

 	mov r0, #6

@@ -84466,7 +84466,7 @@ _02256A80:
 	ldr r1, _02256C00 ; =0x0000312C

 	ldr r0, [sp, #0x10]

 	ldrb r1, [r6, r1]

-	bl FUN_0206B9B0

+	bl GetPartyMonByIndex

 	mov r1, #0xad

 	mov r2, #0

 	str r0, [sp, #0x14]

@@ -84507,7 +84507,7 @@ _02256AD2:
 	ldr r0, [sp, #0x10]

 	add r6, r6, #1

 	add r7, r7, #1

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r7, r0

 	blt _02256A80

 _02256AE0:

@@ -84517,7 +84517,7 @@ _02256AE0:
 	str r0, [sp, #8]

 	mov r4, #3

 	mov r6, #0

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r0, #0

 	bgt _02256AF8

 	b _02256BFA

@@ -84531,7 +84531,7 @@ _02256B02:
 	ldr r1, _02256C00 ; =0x0000312C

 	ldr r0, [sp, #8]

 	ldrb r1, [r7, r1]

-	bl FUN_0206B9B0

+	bl GetPartyMonByIndex

 	mov r1, #0xad

 	mov r2, #0

 	str r0, [sp, #0x18]

@@ -84572,7 +84572,7 @@ _02256B54:
 	ldr r0, [sp, #8]

 	add r7, r7, #1

 	add r6, r6, #1

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r6, r0

 	blt _02256B02

 	add sp, #0x20

@@ -84595,7 +84595,7 @@ _02256B7A:
 	mov r4, #0

 	str r0, [sp, #0xc]

 	add r7, r4, #0

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r0, #0

 	ble _02256BFA

 	ldr r0, [sp, #0x38]

@@ -84607,7 +84607,7 @@ _02256B9A:
 	ldr r1, _02256C00 ; =0x0000312C

 	ldr r0, [sp, #0xc]

 	ldrb r1, [r6, r1]

-	bl FUN_0206B9B0

+	bl GetPartyMonByIndex

 	mov r1, #0xad

 	mov r2, #0

 	str r0, [sp, #0x1c]

@@ -84648,7 +84648,7 @@ _02256BEC:
 	ldr r0, [sp, #0xc]

 	add r6, r6, #1

 	add r7, r7, #1

-	bl FUN_0206B9AC

+	bl GetPartyCount

 	cmp r7, r0

 	blt _02256B9A

 _02256BFA:

diff --git a/arm9/modules/14/asm/module_14.s b/arm9/modules/14/asm/module_14.s
index e0034fd2..191de449 100644
--- a/arm9/modules/14/asm/module_14.s
+++ b/arm9/modules/14/asm/module_14.s
@@ -1905,7 +1905,7 @@ _021D8476:
 	add r0, #0x19
 	strb r2, [r4, r0]
 	ldr r0, [r4, r1]
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	ldr r1, _021D8504 ; =0x0000013F
 	strb r0, [r4, r1]
 	add r0, r4, #0
@@ -4031,7 +4031,7 @@ _021D95CA:
 	mov r0, #0x49
 	lsl r0, r0, #2
 	ldr r0, [r5, r0]
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	sub r0, r0, #1
 	cmp r6, r0
 	beq _021D9610
@@ -4238,7 +4238,7 @@ _021D979C:
 	mov r0, #0x49
 	lsl r0, r0, #2
 	ldr r0, [r4, r0]
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	cmp r0, #6
 	beq _021D97F2
 	mov r0, #0x45
@@ -4699,7 +4699,7 @@ MOD14_021D9B84: ; 0x021D9B84
 	lsl r1, r1, #2
 	str r0, [sp]
 	ldr r0, [r0, r1]
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	mov r6, #0
 	add r5, r6, #0
 	str r0, [sp, #4]
@@ -4711,7 +4711,7 @@ _021D9B9E:
 	lsl r0, r0, #2
 	ldr r0, [r1, r0]
 	add r1, r6, #0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r4, r0, #0
 	bl AcquireMonLock
 	add r7, r0, #0
@@ -5351,7 +5351,7 @@ _021DA0A4:
 _021DA0AE:
 	add r0, r1, #0
 	ldr r0, [r0, #0x18]
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	str r0, [sp, #0x10]
 	mov r0, #0
 	str r0, [sp, #8]
@@ -5362,7 +5362,7 @@ _021DA0C2:
 	ldr r0, [sp, #4]
 	ldr r1, [sp, #8]
 	ldr r0, [r0, #0x18]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	ldr r4, _021DA164 ; =0x021E6224
 	ldr r5, [sp, #4]
 	add r7, r0, #0
@@ -8416,7 +8416,7 @@ MOD14_021DB8D0: ; 0x021DB8D0
 	mov r0, #0x49
 	lsl r0, r0, #2
 	ldr r0, [r5, r0]
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	strb r0, [r4, #8]
 	mov r0, #8
 	ldrsb r0, [r4, r0]
@@ -8495,14 +8495,14 @@ _021DB96C:
 	mov r0, #0x49
 	lsl r0, r0, #2
 	ldr r0, [r5, r0]
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	cmp r6, r0
 	bge _021DB98E
 	mov r0, #0x49
 	lsl r0, r0, #2
 	ldr r0, [r5, r0]
 	add r1, r6, #0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	str r0, [r4]
 	b _021DB998
 _021DB98E:
@@ -8896,13 +8896,13 @@ _021DBC70:
 	mov r0, #0x49
 	lsl r0, r0, #2
 	ldr r0, [r5, r0]
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	add r1, r0, #0
 	mov r0, #0x49
 	lsl r0, r0, #2
 	ldr r0, [r5, r0]
 	sub r1, r1, #1
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r1, r0, #0
 _021DBC8A:
 	add r0, r7, #0
@@ -23402,7 +23402,7 @@ MOD14_021E2C7C: ; 0x021E2C7C
 	add r6, r0, #0
 	ldr r0, [r6, #0xc]
 	ldr r0, [r0, #4]
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	add r1, r6, #0
 	add r1, #0x28
 	ldrb r4, [r1]
@@ -23570,7 +23570,7 @@ MOD14_021E2DB4: ; 0x021E2DB4
 	add r5, r0, #0
 	ldr r0, [r5, #0xc]
 	ldr r0, [r0, #4]
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	sub r4, r0, #1
 	add r0, r5, #0
 	add r0, #0x28
@@ -23975,7 +23975,7 @@ MOD14_021E30C0: ; 0x021E30C0
 	str r1, [sp]
 	ldr r0, [r0, #4]
 	str r2, [sp, #4]
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	sub r6, r0, #1
 	add r4, r5, #0
 	mov r0, #0x34
@@ -24281,7 +24281,7 @@ _021E330E:
 	ldr r0, [sp, #0x24]
 	ldr r0, [r0, #0xc]
 	ldr r0, [r0, #4]
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	mov r4, #0
 	str r0, [sp, #0x20]
 	cmp r0, #0
@@ -24299,7 +24299,7 @@ _021E3330:
 	add r1, r4, #0
 	ldr r0, [r0, #0xc]
 	ldr r0, [r0, #4]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r1, r0, #0
 	mov r0, #1
 	str r0, [sp]
@@ -24347,7 +24347,7 @@ MOD14_021E3390: ; 0x021E3390
 	add r7, r0, #0
 	ldr r0, [r7, #0xc]
 	ldr r0, [r0, #4]
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	mov r6, #0
 	str r0, [sp]
 	cmp r0, #0
diff --git a/arm9/modules/16/asm/module_16.s b/arm9/modules/16/asm/module_16.s
index dfa30774..0dae9777 100644
--- a/arm9/modules/16/asm/module_16.s
+++ b/arm9/modules/16/asm/module_16.s
@@ -55018,7 +55018,7 @@ _021F0E5A:
 _021F0E68:
 	ldr r0, [sp, #0xc]
 	add r1, r4, #0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	ldr r1, [sp, #8]
 	add r6, r0, #0
 	cmp r4, r1
@@ -55568,7 +55568,7 @@ _021F1276:
 _021F128E:
 	ldr r0, [sp, #0x14]
 	add r1, r5, #0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	ldr r1, [sp, #8]
 	add r4, r0, #0
 	cmp r5, r1
@@ -55683,7 +55683,7 @@ _021F136A:
 _021F1382:
 	ldr r0, [sp, #0x14]
 	add r1, r5, #0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	ldr r1, [sp, #8]
 	add r4, r0, #0
 	cmp r5, r1
@@ -62866,13 +62866,13 @@ _021F4A94:
 	bl MOD11_0222FF88
 	add r7, r0, #0
 	mov r5, #0
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	cmp r0, #0
 	ble _021F4AF2
 _021F4AA8:
 	add r0, r7, #0
 	add r1, r5, #0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #0xa2
 	mov r2, #0
 	add r6, r0, #0
@@ -62900,7 +62900,7 @@ _021F4AA8:
 _021F4AE6:
 	add r0, r7, #0
 	add r5, r5, #1
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	cmp r5, r0
 	blt _021F4AA8
 _021F4AF2:
diff --git a/arm9/modules/27/asm/module_27.s b/arm9/modules/27/asm/module_27.s
index ee9a4bd1..7bd6fc00 100644
--- a/arm9/modules/27/asm/module_27.s
+++ b/arm9/modules/27/asm/module_27.s
@@ -293,7 +293,7 @@ MOD27_02254A48: ; 0x02254A48
 	str r0, [sp]
 	add r0, r1, #0
 	str r1, [sp, #4]
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	ldr r1, [sp]
 	mov r6, #0
 	str r0, [r1]
@@ -303,7 +303,7 @@ MOD27_02254A48: ; 0x02254A48
 _02254A62:
 	ldr r0, [sp, #4]
 	add r1, r6, #0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r4, r0, #0
 	bl AcquireMonLock
 	add r7, r0, #0
diff --git a/arm9/modules/28/asm/module_28.s b/arm9/modules/28/asm/module_28.s
index e4a0b678..2ba07ed6 100644
--- a/arm9/modules/28/asm/module_28.s
+++ b/arm9/modules/28/asm/module_28.s
@@ -73,7 +73,7 @@ MOD28_0225489C: ; 0x0225489C
 	mov r1, #0
 	str r0, [sp, #4]
 	str r1, [sp]
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	mov r6, #0
 	str r0, [r7, #4]
 	cmp r0, #0
@@ -82,7 +82,7 @@ MOD28_0225489C: ; 0x0225489C
 _022548D6:
 	ldr r0, [sp, #4]
 	add r1, r6, #0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #0x4c
 	mov r2, #0
 	add r5, r0, #0
diff --git a/arm9/modules/39/asm/module_39.s b/arm9/modules/39/asm/module_39.s
index 863492a4..f7c09bfc 100644
--- a/arm9/modules/39/asm/module_39.s
+++ b/arm9/modules/39/asm/module_39.s
@@ -63,7 +63,7 @@ MOD39_0225489C: ; 0x0225489C
 	bl MOD20_02252C40
 	bl FUN_0206BB1C
 	str r0, [sp, #0x10]
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	ldr r1, [sp, #4]
 	mov r6, #0
 	add r1, #0x34
@@ -78,7 +78,7 @@ MOD39_0225489C: ; 0x0225489C
 _022548CC:
 	ldr r0, [sp, #0x10]
 	add r1, r6, #0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r7, r0, #0
 	bl FUN_0206B688
 	str r0, [r4, #4]
diff --git a/arm9/modules/56/asm/module_56.s b/arm9/modules/56/asm/module_56.s
index a4bf2048..ee020bca 100644
--- a/arm9/modules/56/asm/module_56.s
+++ b/arm9/modules/56/asm/module_56.s
@@ -212,7 +212,7 @@ MOD56_02211F88: ; 0x02211F88
 	ldr r0, [r0]
 	bl FUN_0206BB1C
 	str r0, [sp]
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	mov r5, #0
 	add r7, r0, #0
 	add r4, r5, #0
@@ -221,7 +221,7 @@ MOD56_02211F88: ; 0x02211F88
 _02211FA2:
 	ldr r0, [sp]
 	add r1, r4, #0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #0xa2
 	mov r2, #0
 	add r6, r0, #0
@@ -1992,7 +1992,7 @@ MOD56_02212E0C: ; 0x02212E0C
 	bl FUN_02029AFC
 	str r0, [sp, #8]
 	ldr r0, [sp, #0xc]
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	mov r6, #0
 	str r0, [sp, #4]
 	cmp r0, #0
@@ -2001,7 +2001,7 @@ MOD56_02212E0C: ; 0x02212E0C
 _02212E52:
 	ldr r0, [sp, #0xc]
 	add r1, r6, #0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #5
 	mov r2, #0
 	add r7, r0, #0
diff --git a/arm9/modules/69/asm/module_69.s b/arm9/modules/69/asm/module_69.s
index 32eb8847..bdd1afca 100644
--- a/arm9/modules/69/asm/module_69.s
+++ b/arm9/modules/69/asm/module_69.s
@@ -50,7 +50,7 @@ MOD69_0222D5C0: ; 0x0222D5C0
 	str r0, [r4, #4]
 	ldr r0, [r4, #0xc]
 	ldr r0, [r0, #4]
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	add r6, r0, #0
 	mov r5, #0
 	cmp r6, #0
@@ -61,7 +61,7 @@ _0222D63A:
 	ldr r0, [r4, #0xc]
 	add r1, r5, #0
 	ldr r0, [r0, #4]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #0x4c
 	mov r2, #0
 	bl GetMonData
@@ -1224,7 +1224,7 @@ _0222DF98:
 	lsl r1, r1, #2
 	ldr r0, [r0, #4]
 	ldr r1, [r5, r1]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	str r0, [sp, #0x2c]
 	ldr r1, [sp, #0x2c]
 	add r0, sp, #0xc4
@@ -2281,7 +2281,7 @@ _0222E860:
 	lsl r1, r1, #2
 	ldr r0, [r0, #4]
 	ldr r1, [r2, r1]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	str r0, [r4, #0x24]
 	ldr r0, [r5, #0xc]
 	mov r2, #0
diff --git a/arm9/modules/71/asm/module_71.s b/arm9/modules/71/asm/module_71.s
index 606353f1..a480a3f6 100644
--- a/arm9/modules/71/asm/module_71.s
+++ b/arm9/modules/71/asm/module_71.s
@@ -420,11 +420,11 @@ MOD71_0222D93C: ; 0x0222D93C
 	bl MOD71_0222DB94
 	ldr r0, _0222D9B8 ; =0x00002218
 	ldr r0, [r5, r0]
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	add r4, r0, #0
 	ldr r0, _0222D9BC ; =0x0000221C
 	ldr r0, [r5, r0]
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	add r2, r0, #0
 	mov r0, #0x5d
 	lsl r0, r0, #2
@@ -644,13 +644,13 @@ MOD71_0222DB5C: ; 0x0222DB5C
 	add r0, r5, #0
 	add r6, r2, #0
 	mov r4, #0
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	cmp r0, #0
 	ble _0222DB92
 _0222DB70:
 	add r0, r5, #0
 	add r1, r4, #0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	bl FUN_020690E4
 	add r2, r0, #0
 	add r0, r7, #0
@@ -658,7 +658,7 @@ _0222DB70:
 	bl FUN_0200ACF8
 	add r0, r5, #0
 	add r4, r4, #1
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	cmp r4, r0
 	blt _0222DB70
 _0222DB92:
@@ -676,7 +676,7 @@ MOD71_0222DB94: ; 0x0222DB94
 	str r3, [sp, #0x10]
 	ldr r6, [sp, #0x28]
 	mov r4, #0
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	cmp r0, #0
 	ble _0222DBE6
 	add r7, r6, #1
@@ -701,7 +701,7 @@ _0222DBB0:
 	ldr r0, [sp, #0x10]
 	add r5, #0x10
 	add r4, r4, #1
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	cmp r4, r0
 	blt _0222DBB0
 _0222DBE6:
@@ -718,7 +718,7 @@ MOD71_0222DBEC: ; 0x0222DBEC
 	str r1, [sp, #0xc]
 	str r2, [sp, #0x20]
 	mov r7, #0
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	cmp r0, #0
 	bgt _0222DC02
 	b _0222DD10
@@ -847,7 +847,7 @@ _0222DCE2:
 _0222DD02:
 	ldr r0, [sp, #8]
 	add r7, r7, #1
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	cmp r7, r0
 	bge _0222DD10
 	b _0222DC0C
@@ -1086,7 +1086,7 @@ _0222DED6:
 	blt _0222DED6
 	ldr r0, _0222E0F8 ; =0x00002218
 	ldr r0, [r4, r0]
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	cmp r0, #0
 	ble _0222DF12
 	mov r0, #0x69
@@ -1097,20 +1097,20 @@ _0222DEF4:
 	ldr r0, _0222E0F8 ; =0x00002218
 	add r1, r5, #0
 	ldr r0, [r4, r0]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r1, r6, #0
 	bl MOD71_0222E118
 	ldr r0, [r4, r7]
 	add r6, #0x10
 	add r5, r5, #1
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	cmp r5, r0
 	blt _0222DEF4
 _0222DF12:
 	ldr r0, _0222E0FC ; =0x0000221C
 	mov r5, #0
 	ldr r0, [r4, r0]
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	cmp r0, #0
 	ble _0222DF48
 	mov r0, #0x69
@@ -1121,14 +1121,14 @@ _0222DF28:
 	ldr r0, _0222E0FC ; =0x0000221C
 	add r1, r5, #0
 	ldr r0, [r4, r0]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r1, r5, #6
 	lsl r1, r1, #4
 	add r1, r6, r1
 	bl MOD71_0222E118
 	ldr r0, [r4, r7]
 	add r5, r5, #1
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	cmp r5, r0
 	blt _0222DF28
 _0222DF48:
@@ -1233,7 +1233,7 @@ _0222E010:
 	ldr r0, _0222E0F8 ; =0x00002218
 	mov r1, #0
 	ldr r0, [r4, r0]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r2, #0x7f
 	ldr r3, _0222E104 ; =0x000020F0
 	lsl r2, r2, #4
@@ -1412,7 +1412,7 @@ MOD71_0222E1A0: ; 0x0222E1A0
 	ldr r0, _0222E20C ; =0x0000221C
 	add r7, r1, #0
 	ldr r0, [r5, r0]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r6, r0, #0
 	add r0, r4, #0
 	mov r1, #6
@@ -1473,7 +1473,7 @@ MOD71_0222E224: ; 0x0222E224
 	bge _0222E29E
 	ldr r0, _0222E2BC ; =0x00002218
 	ldr r0, [r5, r0]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r4, r0, #0
 	add r0, r5, #0
 	add r0, #0x88
@@ -1675,7 +1675,7 @@ MOD71_0222E3D4: ; 0x0222E3D4
 	ldr r0, _0222E42C ; =0x00002218
 	mov r4, #0
 	ldr r0, [r6, r0]
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	cmp r0, #0
 	ble _0222E402
 	ldr r7, _0222E42C ; =0x00002218
@@ -1688,14 +1688,14 @@ _0222E3EA:
 	ldr r0, [r6, r7]
 	add r5, r5, #4
 	add r4, r4, #1
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	cmp r4, r0
 	blt _0222E3EA
 _0222E402:
 	ldr r0, _0222E430 ; =0x0000221C
 	mov r5, #0
 	ldr r0, [r6, r0]
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	cmp r0, #0
 	ble _0222E42A
 	ldr r7, _0222E430 ; =0x0000221C
@@ -1707,7 +1707,7 @@ _0222E414:
 	ldr r0, [r6, r7]
 	add r4, r4, #4
 	add r5, r5, #1
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	cmp r5, r0
 	blt _0222E414
 _0222E42A:
@@ -2694,7 +2694,7 @@ MOD71_0222EC5C: ; 0x0222EC5C
 	add r4, r0, #0
 	add r0, r6, #0
 	add r1, r7, #0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #0x76
 	add r2, r4, #0
 	bl GetMonData
@@ -2728,7 +2728,7 @@ MOD71_0222ECA8: ; 0x0222ECA8
 _0222ECB6:
 	add r0, r1, #0
 	add r1, r2, #0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #0x4d
 	mov r2, #0
 	bl GetMonData
@@ -2753,7 +2753,7 @@ MOD71_0222ECD4: ; 0x0222ECD4
 	str r2, [sp, #8]
 	str r3, [sp, #0xc]
 	ldr r4, [sp, #0x50]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #2
 	bl FUN_02068E14
 	str r0, [sp, #0x10]
@@ -2929,7 +2929,7 @@ _0222EE14:
 	bl MOD71_02230EFC
 	ldr r0, [sp, #8]
 	ldr r1, [sp, #0xc]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #0xa0
 	mov r2, #0
 	bl GetMonData
@@ -2975,7 +2975,7 @@ _0222EEA6:
 	bl MOD71_02230EFC
 	ldr r0, [sp, #8]
 	ldr r1, [sp, #0xc]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #6
 	mov r2, #0
 	bl GetMonData
@@ -3864,7 +3864,7 @@ MOD71_0222F59C: ; 0x0222F59C
 	str r0, [r5, #0xc]
 	ldr r0, [r5, #8]
 	ldr r0, [r0, #8]
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	strb r0, [r5, #0x1f]
 	mov r0, #0
 	str r0, [r5, #0x34]
@@ -3880,7 +3880,7 @@ _0222F5CC:
 	ldr r1, [r5, r0]
 	str r1, [r5, #0xc]
 	ldr r0, [r5, r0]
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	strb r0, [r5, #0x1f]
 	bl FUN_02031190
 	mov r2, #1
@@ -4875,7 +4875,7 @@ MOD71_0222FDD8: ; 0x0222FDD8
 	add r1, #0x88
 	ldr r0, [r4, r0]
 	ldr r1, [r1]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	bl FUN_020690E4
 	add r2, r0, #0
 	mov r0, #0x5f
@@ -5694,7 +5694,7 @@ MOD71_022304AC: ; 0x022304AC
 	add r1, #0x88
 	ldr r0, [r4, r0]
 	ldr r1, [r1]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	bl FUN_020690E4
 	add r2, r0, #0
 	mov r0, #0x5f
@@ -5708,7 +5708,7 @@ MOD71_022304AC: ; 0x022304AC
 	ldr r1, [r1]
 	ldr r0, [r4, r0]
 	sub r1, r1, #6
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	bl FUN_020690E4
 	add r2, r0, #0
 	mov r0, #0x5f
@@ -6121,7 +6121,7 @@ MOD71_02230810: ; 0x02230810
 	ldr r1, [r1]
 	ldr r0, [r4, r0]
 	sub r1, r1, #6
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	bl FUN_020690E4
 	add r2, r0, #0
 	mov r0, #0x5f
@@ -6327,12 +6327,12 @@ MOD71_022309E8: ; 0x022309E8
 	add r4, r0, #0
 	ldr r0, [sp, #4]
 	add r1, r6, #0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r1, r7, #0
 	bl FUN_02069B88
 	ldr r0, [sp, #8]
 	ldr r1, [sp, #0xc]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r1, r4, #0
 	bl FUN_02069B88
 	add r0, r4, #0
@@ -6387,13 +6387,13 @@ _02230A98:
 	bl FUN_0202C144
 	ldr r0, [sp, #4]
 	add r1, r6, #0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r1, r0, #0
 	add r0, r4, #0
 	bl FUN_02069B88
 	ldr r0, [sp, #8]
 	ldr r1, [sp, #0xc]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r1, r0, #0
 	add r0, r7, #0
 	bl FUN_02069B88
@@ -6538,7 +6538,7 @@ MOD71_02230BC4: ; 0x02230BC4
 	ldr r0, _02230C00 ; =0x00002218
 	mov r4, #0
 	ldr r0, [r5, r0]
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	add r3, r4, #0
 	cmp r0, #0
 	ble _02230BF0
diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s
index 71ef95f1..2ff872c5 100644
--- a/arm9/modules/80/asm/module_80.s
+++ b/arm9/modules/80/asm/module_80.s
@@ -4660,7 +4660,7 @@ _0222FA26:
 	beq _0222FA80
 	ldr r0, [r5]
 	ldr r0, [r0, #8]
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	cmp r0, #6
 	bne _0222FA80
 	ldr r0, _0222FAE4 ; =0x00000F0F
@@ -9976,7 +9976,7 @@ _022325CE:
 	add r1, #0xba
 	ldrh r1, [r1]
 	ldr r0, [r0, #8]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #0xa1
 	add r2, r4, #0
 	bl GetMonData
@@ -10216,7 +10216,7 @@ _022327CE:
 	add r1, #0xba
 	ldrh r1, [r1]
 	ldr r0, [r0, #8]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	mov r1, #0xa1
 	add r2, r4, #0
 	bl GetMonData
@@ -10458,7 +10458,7 @@ MOD80_02232990: ; 0x02232990
 	beq _022329E6
 	ldr r0, [r4]
 	ldr r0, [r0, #8]
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	cmp r0, #6
 	bne _022329E6
 	ldr r0, _02232A2C ; =0x00000F0F
@@ -11031,7 +11031,7 @@ _02232E22:
 _02232E3A:
 	ldr r0, [r5]
 	ldr r0, [r0, #8]
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	mov r4, #0
 	str r0, [sp, #0x14]
 	cmp r0, #0
@@ -11040,7 +11040,7 @@ _02232E4A:
 	ldr r0, [r5]
 	add r1, r4, #0
 	ldr r0, [r0, #8]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	str r0, [sp, #0x24]
 	bl FUN_020690E4
 	ldr r1, _02232F84 ; =0x00001004
@@ -11221,7 +11221,7 @@ MOD80_02232FB8: ; 0x02232FB8
 	cmp r0, #0
 	beq _02232FEA
 	add r0, r5, #0
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	sub r0, r0, #1
 	cmp r4, r0
 	ble _02232FDC
@@ -11230,7 +11230,7 @@ MOD80_02232FB8: ; 0x02232FB8
 _02232FDC:
 	add r0, r5, #0
 	add r1, r4, #0
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	bl FUN_020690E4
 	pop {r3, r4, r5, r6, r7, pc}
 _02232FEA:
@@ -11251,7 +11251,7 @@ MOD80_02232FF8: ; 0x02232FF8
 	cmp r0, #0
 	beq _02233014
 	add r0, r4, #0
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	cmp r0, #2
 	bge _02233014
 	mov r0, #0
@@ -16102,7 +16102,7 @@ _02235590:
 	add r1, #0xba
 	ldrh r1, [r1]
 	ldr r0, [r0, #8]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r4, r0, #0
 	bl FUN_0206AA84
 	add r2, r5, #0
@@ -16161,7 +16161,7 @@ MOD80_022355F0: ; 0x022355F0
 	str r0, [sp, #0x20]
 	ldr r0, [r5]
 	ldr r0, [r0, #8]
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	cmp r0, #6
 	bne _02235624
 	mov r0, #0
@@ -16189,7 +16189,7 @@ _02235640:
 	bl FUN_0206B900
 	ldr r0, [r5]
 	ldr r0, [r0, #8]
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	add r1, r5, #0
 	mov r2, #0x12
 	add r1, #0xcc
@@ -16246,7 +16246,7 @@ MOD80_022356AC: ; 0x022356AC
 	str r0, [sp, #0x20]
 	ldr r0, [r5]
 	ldr r0, [r0, #8]
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	cmp r0, #6
 	bne _022356D2
 	mov r0, #0
@@ -16268,7 +16268,7 @@ _022356D2:
 	bl FUN_0206B900
 	ldr r0, [r5]
 	ldr r0, [r0, #8]
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	add r1, r5, #0
 	mov r2, #0x12
 	add r1, #0xcc
@@ -16395,7 +16395,7 @@ MOD80_022357DC: ; 0x022357DC
 	beq _022357FA
 	ldr r0, [r4]
 	ldr r0, [r0, #8]
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	cmp r0, #6
 	bne _022357FA
 	mov r0, #2
@@ -16409,7 +16409,7 @@ _022357FA:
 	bne _02235816
 	ldr r0, [r4]
 	ldr r0, [r0, #8]
-	bl FUN_0206B9AC
+	bl GetPartyCount
 	cmp r0, #6
 	bne _02235816
 	mov r0, #1
@@ -17717,7 +17717,7 @@ MOD80_02236218: ; 0x02236218
 	add r5, #0xd0
 	ldr r0, [r0, #8]
 	ldr r1, [r5]
-	bl FUN_0206B9B0
+	bl GetPartyMonByIndex
 	add r1, r0, #0
 	add r0, r4, #0
 	bl FUN_02069B88
diff --git a/arm9/src/pokemon.c b/arm9/src/pokemon.c
index d3c4ead6..24d95575 100644
--- a/arm9/src/pokemon.c
+++ b/arm9/src/pokemon.c
@@ -1,6 +1,7 @@
 #include "global.h"
 #define IN_POKEMON_C
 #include "proto.h"
+#include "party.h"
 #include "pokemon.h"
 #include "filesystem.h"
 #include "heap.h"
@@ -12,6 +13,7 @@
 #include "constants/abilities.h"
 #include "constants/items.h"
 #include "constants/moves.h"
+#include "constants/sinnoh_dex.h"
 
 #pragma thumb on
 
@@ -30,6 +32,10 @@ void InitBoxMonMoveset(struct BoxPokemon * boxmon);
 u32 FUN_020696A8(struct BoxPokemon * boxmon, u16 move);
 void FUN_02069718(struct BoxPokemon * boxmon, u16 move);
 void FUN_020697D4(struct BoxPokemon * boxmon, u16 move, u8 slot);
+void FUN_020698E8(struct BoxPokemon * boxmon, int slot1, int slot2);
+s8 FUN_02069BD0(struct BoxPokemon * boxmon, int flavor);
+s8 FUN_02069BE4(u32 personality, int flavor);
+u8 FUN_02069CF4(struct PlayerParty * party_p, u8 mask);
 void LoadWotbl_HandleAlternateForme(int species, int forme, u16 * wotbl);
 u32 MaskOfFlagNo(int flagno);
 void LoadMonPersonal(int species, struct BaseStats * personal);
@@ -2874,3 +2880,261 @@ void FUN_020697D4(struct BoxPokemon * boxmon, u16 move, u8 slot)
     pp = FUN_0206AB30(move, ppUp);
     SetBoxMonData(boxmon, MON_DATA_MOVE1PP + slot, &pp);
 }
+
+u32 FUN_02069818(struct Pokemon * pokemon, u32 * r5, u16 * sp0)
+{
+    u32 ret = 0;
+    u16 * wotbl = AllocFromHeap(0, 22 * sizeof(u16));
+    u16 species = GetMonData(pokemon, MON_DATA_SPECIES, NULL);
+    u32 forme = GetMonData(pokemon, MON_DATA_FORME, NULL);
+    u8 level = GetMonData(pokemon, MON_DATA_LEVEL, NULL);
+    LoadWotbl_HandleAlternateForme(species, forme, wotbl);
+
+
+    if (wotbl[*r5] == 0xFFFF)
+    {
+        FreeToHeap(wotbl);
+        return 0;
+    }
+    while ((wotbl[*r5] & WOTBL_LVL_MASK) != (level << WOTBL_LVL_SHIFT))
+    {
+        (*r5)++;
+        if (wotbl[*r5] == 0xFFFF)
+        {
+            FreeToHeap(wotbl);
+            return 0;
+        }
+    }
+    if ((wotbl[*r5] & WOTBL_LVL_MASK) == (level << WOTBL_LVL_SHIFT))
+    {
+        *sp0 = WOTBL_MOVE(wotbl[*r5]);
+        (*r5)++;
+        ret = FUN_02069698(pokemon, *sp0);
+    }
+    FreeToHeap(wotbl);
+    return ret;
+}
+
+void FUN_020698E0(struct Pokemon * pokemon, int slot1, int slot2)
+{
+    FUN_020698E8(&pokemon->box, slot1, slot2);
+}
+
+void FUN_020698E8(struct BoxPokemon * boxmon, int slot1, int slot2)
+{
+    u16 moves[2];
+    u8 pp[2];
+    u8 ppUp[2];
+
+    moves[0] = GetBoxMonData(boxmon, MON_DATA_MOVE1 + slot1, NULL);
+    pp[0] = GetBoxMonData(boxmon, MON_DATA_MOVE1PP + slot1, NULL);
+    ppUp[0] = GetBoxMonData(boxmon, MON_DATA_MOVE1PPUP + slot1, NULL);
+    moves[1] = GetBoxMonData(boxmon, MON_DATA_MOVE1 + slot2, NULL);
+    pp[1] = GetBoxMonData(boxmon, MON_DATA_MOVE1PP + slot2, NULL);
+    ppUp[1] = GetBoxMonData(boxmon, MON_DATA_MOVE1PPUP + slot2, NULL);
+
+    SetBoxMonData(boxmon, MON_DATA_MOVE1 + slot1, &moves[1]);
+    SetBoxMonData(boxmon, MON_DATA_MOVE1PP + slot1, &pp[1]);
+    SetBoxMonData(boxmon, MON_DATA_MOVE1PPUP + slot1, &ppUp[1]);
+    SetBoxMonData(boxmon, MON_DATA_MOVE1 + slot2, &moves[0]);
+    SetBoxMonData(boxmon, MON_DATA_MOVE1PP + slot2, &pp[0]);
+    SetBoxMonData(boxmon, MON_DATA_MOVE1PPUP + slot2, &ppUp[0]);
+}
+
+void FUN_020699A4(struct Pokemon * pokemon, u32 slot)
+{
+    u16 move;
+    u8 pp;
+    u8 ppUp;
+    for (; slot < 3; slot++)
+    {
+        move = GetMonData(pokemon, MON_DATA_MOVE1 + slot + 1, NULL);
+        pp = GetMonData(pokemon, MON_DATA_MOVE1PP + slot + 1, NULL);
+        ppUp = GetMonData(pokemon, MON_DATA_MOVE1PPUP + slot + 1, NULL);
+        SetMonData(pokemon, MON_DATA_MOVE1 + slot, &move);
+        SetMonData(pokemon, MON_DATA_MOVE1PP + slot, &pp);
+        SetMonData(pokemon, MON_DATA_MOVE1PPUP + slot, &ppUp);
+    }
+    move = MOVE_NONE;
+    pp = 0;
+    ppUp = 0;
+    SetMonData(pokemon, MON_DATA_MOVE1 + 3, &move);
+    SetMonData(pokemon, MON_DATA_MOVE1PP + 3, &pp);
+    SetMonData(pokemon, MON_DATA_MOVE1PPUP + 3, &ppUp);
+}
+
+BOOL MonHasMove(struct Pokemon * pokemon, u16 move)
+{
+    int i;
+    for (i = 0; i < 4; i++)
+    {
+        if (GetMonData(pokemon, MON_DATA_MOVE1 + i, NULL) == move)
+            break;
+    }
+    if (i != 4)
+        return TRUE;
+    else
+        return FALSE;
+}
+
+void FUN_02069A64(struct BoxPokemon * src, struct Pokemon * dest)
+{
+    u32 sp0 = 0;
+    u8 sp4[12][2];
+    struct SealStruct * seals;
+    dest->box = *src;
+    if (dest->box.box_lock)
+        dest->box.party_lock = TRUE;
+    SetMonData(dest, MON_DATA_STATUS, &sp0);
+    SetMonData(dest, MON_DATA_HP, &sp0);
+    SetMonData(dest, MON_DATA_MAXHP, &sp0);
+    seals = CreateNewSealsObject(0);
+    SetMonData(dest, MON_DATA_SEAL_STRUCT, seals);
+    FreeToHeap(seals);
+    SetMonData(dest, MON_DATA_CAPSULE, &sp0);
+    MIi_CpuClearFast(0, sp4, sizeof(sp4));
+    SetMonData(dest, MON_DATA_SEAL_COORDS, sp4);
+    CalcMonLevelAndStats(dest);
+}
+
+u8 FUN_02069AEC(struct PlayerParty * party)
+{
+    int i;
+    int r7 = GetPartyCount(party);
+    u8 ret = 1;
+    u8 level;
+    for (i = 0; i < r7; i++)
+    {
+        struct Pokemon * pokemon = GetPartyMonByIndex(party, i);
+        if (GetMonData(pokemon, MON_DATA_SPECIES, NULL) != SPECIES_NONE
+         && !GetMonData(pokemon, MON_DATA_IS_EGG, NULL))
+        {
+            level = GetMonData(pokemon, MON_DATA_LEVEL, NULL);
+            if (level > ret)
+                ret = level;
+        }
+    }
+    return ret;
+}
+
+u16 FUN_02069B40(u16 species)
+{
+    u16 ret;
+    ReadFromNarcMemberByIdPair(&ret, NARC_POKETOOL_POKEZUKAN, 0, species * sizeof(u16), sizeof(u16));
+    return ret;
+}
+
+u16 FUN_02069B60(u16 sinnoh_dex)
+{
+    u16 ret = SPECIES_NONE;
+    if (sinnoh_dex <= SINNOH_DEX_COUNT)
+        ReadFromNarcMemberByIdPair(&ret, NARC_POKETOOL_SHINZUKAN, 0, sinnoh_dex * sizeof(u16), sizeof(u16));
+    return ret;
+}
+
+void FUN_02069B88(struct Pokemon * src, struct Pokemon * dest)
+{
+    *dest = *src;
+}
+
+void FUN_02069BA0(struct Pokemon * src, struct BoxPokemon * dest)
+{
+    *dest = src->box;
+}
+
+void FUN_02069BB4(struct BoxPokemon * src, struct BoxPokemon * dest)
+{
+    *dest = *src;
+}
+
+s8 FUN_02069BC8(struct Pokemon * pokemon, int flavor)
+{
+    return FUN_02069BD0(&pokemon->box, flavor);
+}
+
+s8 FUN_02069BD0(struct BoxPokemon * boxmon, int flavor)
+{
+    u32 personality = GetBoxMonData(boxmon, MON_DATA_PERSONALITY, NULL);
+    return FUN_02069BE4(personality, flavor);
+}
+
+s8 FUN_02069BE4(u32 personality, int flavor)
+{
+    return UNK_020F7F16[GetNatureFromPersonality(personality)][flavor];
+}
+
+int FUN_02069BFC(u16 species, u32 forme, u16 * dest)
+{
+    int i;
+    u16 * wotbl = AllocFromHeap(0, 22 * sizeof(u16));
+    LoadWotbl_HandleAlternateForme(species, forme, wotbl);
+    for (i = 0; wotbl[i] != WOTBL_END; i++)
+    {
+        dest[i] = WOTBL_MOVE(wotbl[i]);
+    }
+    FreeToHeap(wotbl);
+    return i;
+}
+
+void FUN_02069C4C(struct PlayerParty * party)
+{
+    int count = GetPartyCount(party);
+    int idx;
+    struct Pokemon * pokemon;
+    u8 sp0;
+    switch (rand_LC())
+    {
+    case 0x4000:
+    case 0x8000:
+    case 0xC000:
+        do
+        {
+            idx = rand_LC() % count;
+            pokemon = GetPartyMonByIndex(party, idx);
+        } while (GetMonData(pokemon, MON_DATA_SPECIES, NULL) == SPECIES_NONE || GetMonData(pokemon, MON_DATA_IS_EGG, NULL));
+        if (!FUN_02069CF4(party, MaskOfFlagNo(idx)))
+        {
+            do
+            {
+                sp0 = rand_LC();
+            } while (!(sp0 & 7));
+            if (sp0 & 0xF0)
+                sp0 &= 7;
+            sp0 |= sp0 << 4;
+            sp0 &= 0xF3;
+            sp0++;
+            SetMonData(pokemon, MON_DATA_POKERUS, &sp0);
+        }
+    }
+}
+
+u8 FUN_02069CF4(struct PlayerParty * party, u8 mask)
+{
+    int i = 0;
+    u32 flag = 1;
+    u8 ret = 0;
+    struct Pokemon * pokemon;
+    if (mask != 0)
+    {
+        do
+        {
+            if (mask & 1)
+            {
+                pokemon = GetPartyMonByIndex(party, i);
+                if (GetMonData(pokemon, MON_DATA_POKERUS, NULL))
+                    ret |= flag;
+            }
+            i++;
+            flag <<= 1;
+            mask >>= 1;
+        }
+        while (mask != 0);
+    }
+    else
+    {
+        pokemon = GetPartyMonByIndex(party, 0);
+        if (GetMonData(pokemon, MON_DATA_POKERUS, NULL))
+            ret++;
+    }
+    return ret;
+}
diff --git a/include/constants/sinnoh_dex.h b/include/constants/sinnoh_dex.h
new file mode 100644
index 00000000..555ced8b
--- /dev/null
+++ b/include/constants/sinnoh_dex.h
@@ -0,0 +1,158 @@
+#ifndef POKEDIAMOND_CONSTANTS_SINNOH_DEX_H
+#define POKEDIAMOND_CONSTANTS_SINNOH_DEX_H
+
+#define SINNOH_DEX_ARCEUS       0
+#define SINNOH_DEX_TURTWIG      1
+#define SINNOH_DEX_GROTLE       2
+#define SINNOH_DEX_TORTERRA     3
+#define SINNOH_DEX_CHIMCHAR     4
+#define SINNOH_DEX_MONFERNO     5
+#define SINNOH_DEX_INFERNAPE    6
+#define SINNOH_DEX_PIPLUP       7
+#define SINNOH_DEX_PRINPLUP     8
+#define SINNOH_DEX_EMPOLEON     9
+#define SINNOH_DEX_STARLY      10
+#define SINNOH_DEX_STARAVIA    11
+#define SINNOH_DEX_STARAPTOR   12
+#define SINNOH_DEX_BIDOOF      13
+#define SINNOH_DEX_BIBAREL     14
+#define SINNOH_DEX_KRICKETOT   15
+#define SINNOH_DEX_KRICKETUNE  16
+#define SINNOH_DEX_SHINX       17
+#define SINNOH_DEX_LUXIO       18
+#define SINNOH_DEX_LUXRAY      19
+#define SINNOH_DEX_ABRA        20
+#define SINNOH_DEX_KADABRA     21
+#define SINNOH_DEX_ALAKAZAM    22
+#define SINNOH_DEX_MAGIKARP    23
+#define SINNOH_DEX_GYARADOS    24
+#define SINNOH_DEX_BUDEW       25
+#define SINNOH_DEX_ROSELIA     26
+#define SINNOH_DEX_ROSERADE    27
+#define SINNOH_DEX_ZUBAT       28
+#define SINNOH_DEX_GOLBAT      29
+#define SINNOH_DEX_CROBAT      30
+#define SINNOH_DEX_GEODUDE     31
+#define SINNOH_DEX_GRAVELER    32
+#define SINNOH_DEX_GOLEM       33
+#define SINNOH_DEX_ONIX        34
+#define SINNOH_DEX_STEELIX     35
+#define SINNOH_DEX_CRANIDOS    36
+#define SINNOH_DEX_RAMPARDOS   37
+#define SINNOH_DEX_SHIELDON    38
+#define SINNOH_DEX_BASTIODON   39
+#define SINNOH_DEX_MACHOP      40
+#define SINNOH_DEX_MACHOKE     41
+#define SINNOH_DEX_MACHAMP     42
+#define SINNOH_DEX_PSYDUCK     43
+#define SINNOH_DEX_GOLDUCK     44
+#define SINNOH_DEX_BURMY       45
+#define SINNOH_DEX_WORMADAM    46
+#define SINNOH_DEX_MOTHIM      47
+#define SINNOH_DEX_WURMPLE     48
+#define SINNOH_DEX_SILCOON     49
+#define SINNOH_DEX_BEAUTIFLY   50
+#define SINNOH_DEX_CASCOON     51
+#define SINNOH_DEX_DUSTOX      52
+#define SINNOH_DEX_COMBEE      53
+#define SINNOH_DEX_VESPIQUEN   54
+#define SINNOH_DEX_PACHIRISU   55
+#define SINNOH_DEX_BUIZEL      56
+#define SINNOH_DEX_FLOATZEL    57
+#define SINNOH_DEX_CHERUBI     58
+#define SINNOH_DEX_CHERRIM     59
+#define SINNOH_DEX_SHELLOS     60
+#define SINNOH_DEX_GASTRODON   61
+#define SINNOH_DEX_HERACROSS   62
+#define SINNOH_DEX_AIPOM       63
+#define SINNOH_DEX_AMBIPOM     64
+#define SINNOH_DEX_DRIFLOON    65
+#define SINNOH_DEX_DRIFBLIM    66
+#define SINNOH_DEX_BUNEARY     67
+#define SINNOH_DEX_LOPUNNY     68
+#define SINNOH_DEX_GASTLY      69
+#define SINNOH_DEX_HAUNTER     70
+#define SINNOH_DEX_GENGAR      71
+#define SINNOH_DEX_MISDREAVUS  72
+#define SINNOH_DEX_MISMAGIUS   73
+#define SINNOH_DEX_MURKROW     74
+#define SINNOH_DEX_HONCHKROW   75
+#define SINNOH_DEX_GLAMEOW     76
+#define SINNOH_DEX_PURUGLY     77
+#define SINNOH_DEX_GOLDEEN     78
+#define SINNOH_DEX_SEAKING     79
+#define SINNOH_DEX_BARBOACH    80
+#define SINNOH_DEX_WHISCASH    81
+#define SINNOH_DEX_CHINGLING   82
+#define SINNOH_DEX_CHIMECHO    83
+#define SINNOH_DEX_STUNKY      84
+#define SINNOH_DEX_SKUNTANK    85
+#define SINNOH_DEX_MEDITITE    86
+#define SINNOH_DEX_MEDICHAM    87
+#define SINNOH_DEX_BRONZOR     88
+#define SINNOH_DEX_BRONZONG    89
+#define SINNOH_DEX_PONYTA      90
+#define SINNOH_DEX_RAPIDASH    91
+#define SINNOH_DEX_BONSLY      92
+#define SINNOH_DEX_SUDOWOODO   93
+#define SINNOH_DEX_MIME_JR     94
+#define SINNOH_DEX_MR_MIME     95
+#define SINNOH_DEX_HAPPINY     96
+#define SINNOH_DEX_CHANSEY     97
+#define SINNOH_DEX_BLISSEY     98
+#define SINNOH_DEX_CLEFFA      99
+#define SINNOH_DEX_CLEFAIRY   100
+#define SINNOH_DEX_CLEFABLE   101
+#define SINNOH_DEX_CHATOT     102
+#define SINNOH_DEX_PICHU      103
+#define SINNOH_DEX_PIKACHU    104
+#define SINNOH_DEX_RAICHU     105
+#define SINNOH_DEX_HOOTHOOT   106
+#define SINNOH_DEX_NOCTOWL    107
+#define SINNOH_DEX_SPIRITOMB  108
+#define SINNOH_DEX_GIBLE      109
+#define SINNOH_DEX_GABITE     110
+#define SINNOH_DEX_GARCHOMP   111
+#define SINNOH_DEX_MUNCHLAX   112
+#define SINNOH_DEX_SNORLAX    113
+#define SINNOH_DEX_UNOWN      114
+#define SINNOH_DEX_RIOLU      115
+#define SINNOH_DEX_LUCARIO    116
+#define SINNOH_DEX_WOOPER     117
+#define SINNOH_DEX_QUAGSIRE   118
+#define SINNOH_DEX_WINGULL    119
+#define SINNOH_DEX_PELIPPER   120
+#define SINNOH_DEX_GIRAFARIG  121
+#define SINNOH_DEX_HIPPOPOTAS 122
+#define SINNOH_DEX_HIPPOWDON  123
+#define SINNOH_DEX_AZURILL    124
+#define SINNOH_DEX_MARILL     125
+#define SINNOH_DEX_AZUMARILL  126
+#define SINNOH_DEX_SKORUPI    127
+#define SINNOH_DEX_DRAPION    128
+#define SINNOH_DEX_CROAGUNK   129
+#define SINNOH_DEX_TOXICROAK  130
+#define SINNOH_DEX_CARNIVINE  131
+#define SINNOH_DEX_REMORAID   132
+#define SINNOH_DEX_OCTILLERY  133
+#define SINNOH_DEX_FINNEON    134
+#define SINNOH_DEX_LUMINEON   135
+#define SINNOH_DEX_TENTACOOL  136
+#define SINNOH_DEX_TENTACRUEL 137
+#define SINNOH_DEX_FEEBAS     138
+#define SINNOH_DEX_MILOTIC    139
+#define SINNOH_DEX_MANTYKE    140
+#define SINNOH_DEX_MANTINE    141
+#define SINNOH_DEX_SNOVER     142
+#define SINNOH_DEX_ABOMASNOW  143
+#define SINNOH_DEX_SNEASEL    144
+#define SINNOH_DEX_WEAVILE    145
+#define SINNOH_DEX_UXIE       146
+#define SINNOH_DEX_MESPRIT    147
+#define SINNOH_DEX_AZELF      148
+#define SINNOH_DEX_DIALGA     149
+#define SINNOH_DEX_PALKIA     150
+#define SINNOH_DEX_MANAPHY    151
+#define SINNOH_DEX_COUNT SINNOH_DEX_MANAPHY
+
+#endif //POKEDIAMOND_CONSTANTS_SINNOH_DEX_H
diff --git a/include/party.h b/include/party.h
new file mode 100644
index 00000000..b6065a3f
--- /dev/null
+++ b/include/party.h
@@ -0,0 +1,19 @@
+#ifndef POKEDIAMOND_PARTY_H
+#define POKEDIAMOND_PARTY_H
+
+#include "pokemon.h"
+
+#define PARTY_SIZE 6
+
+struct PlayerParty
+{
+    u32 maxCount;
+    u32 curCount;
+    struct Pokemon mons[PARTY_SIZE];
+};
+
+BOOL PartyHasMon(struct PlayerParty * party_p, u16 species);
+int GetPartyCount(struct PlayerParty * party_p);
+struct Pokemon * GetPartyMonByIndex(struct PlayerParty * party_p, int idx);
+
+#endif //POKEDIAMOND_PARTY_H
diff --git a/include/pokemon.h b/include/pokemon.h
index 83630d39..166a1c7e 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -537,15 +537,6 @@ struct Evolution
     u16 target;
 };
 
-#define PARTY_SIZE 6
-
-struct PlayerParty
-{
-    u32 maxCount;
-    u32 curCount;
-    struct Pokemon mons[PARTY_SIZE];
-};
-
 void ZeroMonData(struct Pokemon * pokemon);
 void ZeroBoxMonData(struct BoxPokemon * boxmon);
 u32 SizeOfStructPokemon(void);
diff --git a/include/proto.h b/include/proto.h
index d9a5ec2a..d26b7750 100644
--- a/include/proto.h
+++ b/include/proto.h
@@ -17,6 +17,5 @@ u32 GetArceusTypeByPlate(u16 plate);
 int FUN_02014C3C(u8);
 void FUN_02014C54(int, int, struct UnkStruct_02069038 *, u8);
 u32 IsNighttime(void); // is day or night
-u32 PartyHasMon(struct PlayerParty *, u16);
 
 #endif //POKEDIAMOND_PROTO_H