Decompile unk_02046294.s --> event_data.c

12 files changed, 71 insertions, 71 deletions

diff --git a/arm9/modules/05/asm/mod05_021D80E8.s b/arm9/modules/05/asm/mod05_021D80E8.s
index 14425f2d..15241646 100644
--- a/arm9/modules/05/asm/mod05_021D80E8.s
+++ b/arm9/modules/05/asm/mod05_021D80E8.s
@@ -318,7 +318,7 @@ _021D8342:
 	lsr r0, r0, #0x1f
 	bne _021D8384
 	ldr r0, [r4, #0xc]
-	bl FUN_0206BB1C
+	bl SavArray_PlayerParty_get
 	bl FUN_0204A248
 	add r6, r0, #0
 	ldr r0, [r4, #0xc]
@@ -385,7 +385,7 @@ _021D83C2:
 	orr r6, r0
 _021D83E4:
 	ldr r0, [r4, #0xc]
-	bl FUN_0206BB1C
+	bl SavArray_PlayerParty_get
 	mov r1, #0x7f
 	bl FUN_0204A138
 	cmp r0, #0xff
@@ -1471,7 +1471,7 @@ _021D8C88:
 	cmp r0, #0
 	beq _021D8CE0
 	ldr r0, [r5, #0xc]
-	bl FUN_0206BB1C
+	bl SavArray_PlayerParty_get
 	mov r1, #0x39
 	bl FUN_0204A138
 	cmp r0, #0xff
@@ -1762,7 +1762,7 @@ MOD05_021D8F38: ; 0x021D8F38
 	push {r3, r4, r5, lr}
 	add r4, r0, #0
 	ldr r0, [r4, #0xc]
-	bl FUN_0206BB1C
+	bl SavArray_PlayerParty_get
 	add r5, r0, #0
 	ldr r0, [r4, #0xc]
 	bl FUN_02023D58
@@ -1842,7 +1842,7 @@ MOD05_021D8FD0: ; 0x021D8FD0
 	push {r3, r4, r5, r6, r7, lr}
 	add r4, r0, #0
 	ldr r0, [r4, #0xc]
-	bl FUN_0206BB1C
+	bl SavArray_PlayerParty_get
 	add r6, r0, #0
 	ldr r0, [r4, #0x1c]
 	ldr r0, [r0]
@@ -1874,7 +1874,7 @@ MOD05_021D9010: ; 0x021D9010
 	push {r3, r4, r5, lr}
 	add r5, r0, #0
 	ldr r0, [r5, #0xc]
-	bl FUN_0206BB1C
+	bl SavArray_PlayerParty_get
 	add r4, r0, #0
 	ldr r0, [r5, #0xc]
 	bl FUN_02034E30
diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s
index 1172f733..6d2dcb07 100644
--- a/arm9/modules/05/asm/module_05.s
+++ b/arm9/modules/05/asm/module_05.s
@@ -9333,7 +9333,7 @@ MOD05_021E72E8: ; 0x021E72E8
 	push {r4, lr}
 	ldr r0, [r0, #0xc]
 	add r4, r1, #0
-	bl FUN_0206BB1C
+	bl SavArray_PlayerParty_get
 	add r1, r4, #0
 	bl GetPartyMonByIndex
 	pop {r4, pc}
@@ -19634,7 +19634,7 @@ _021EC544:
 	bl FUN_02023CA0
 	ldr r1, [sp]
 	add r0, r6, #0
-	bl FUN_0206B938
+	bl RemoveMonFromParty
 	ldr r1, _021EC578 ; =0x000001B9
 	add r0, r6, #0
 	bl PartyHasMon
@@ -19828,7 +19828,7 @@ _021EC6E0:
 _021EC6FA:
 	ldr r0, [sp]
 	add r1, r4, #0
-	bl FUN_0206B900
+	bl AddMonToParty
 	add r0, r5, #0
 	bl ZeroBoxMonData
 	add r0, r6, #0
@@ -21149,7 +21149,7 @@ _021ED168:
 	bl SetMonData
 	ldr r0, [sp, #4]
 	add r1, r4, #0
-	bl FUN_0206B900
+	bl AddMonToParty
 	add r0, r5, #0
 	bl MOD05_021ECD64
 	add r0, r4, #0
@@ -34755,7 +34755,7 @@ MOD05_021F3A18: ; 0x021F3A18
 	add r4, r0, #0
 	ldr r0, [r4, #0xc]
 	add r5, r1, #0
-	bl FUN_0206BB1C
+	bl SavArray_PlayerParty_get
 	add r1, r5, #0
 	bl GetPartyMonByIndex
 	mov r1, #5
@@ -34824,7 +34824,7 @@ MOD05_021F3AB4: ; 0x021F3AB4
 	add r4, r0, #0
 	ldr r0, [r4, #0xc]
 	add r5, r1, #0
-	bl FUN_0206BB1C
+	bl SavArray_PlayerParty_get
 	add r1, r5, #0
 	bl GetPartyMonByIndex
 	bl MOD05_021F38CC
@@ -34920,7 +34920,7 @@ MOD05_021F3B7C: ; 0x021F3B7C
 	ldr r0, [r5, #0xc]
 	add r4, r3, #0
 	add r7, r1, #0
-	bl FUN_0206BB1C
+	bl SavArray_PlayerParty_get
 	add r1, r4, #0
 	bl GetPartyMonByIndex
 	mov r1, #5
diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s
index 561761c1..cc2792bc 100644
--- a/arm9/modules/06/asm/module_06.s
+++ b/arm9/modules/06/asm/module_06.s
@@ -4844,7 +4844,7 @@ MOD06_0223BA04: ; 0x0223BA04
 	pop {r4, r5, r6, r7, pc}
 _0223BA42:
 	ldr r0, [r5, #0xc]
-	bl FUN_0206BB1C
+	bl SavArray_PlayerParty_get
 	add r7, r0, #0
 	add r0, r5, #0
 	bl FUN_02034CE0
@@ -5193,7 +5193,7 @@ MOD06_0223BD14: ; 0x0223BD14
 _0223BD2E:
 	ldr r0, [sp, #8]
 	ldr r0, [r0, #0xc]
-	bl FUN_0206BB1C
+	bl SavArray_PlayerParty_get
 	mov r1, #0
 	bl GetPartyMonByIndex
 	str r0, [sp, #0x14]
@@ -5370,7 +5370,7 @@ MOD06_0223BE70: ; 0x0223BE70
 	pop {r4, r5, r6, r7, pc}
 _0223BEA4:
 	ldr r0, [r5, #0xc]
-	bl FUN_0206BB1C
+	bl SavArray_PlayerParty_get
 	add r6, r0, #0
 	add r0, r5, #0
 	bl FUN_02034CE0
@@ -5626,7 +5626,7 @@ MOD06_0223C08C: ; 0x0223C08C
 	pop {r4, r5, r6, r7, pc}
 _0223C0CE:
 	ldr r0, [r5, #0xc]
-	bl FUN_0206BB1C
+	bl SavArray_PlayerParty_get
 	add r6, r0, #0
 	add r0, r5, #0
 	bl FUN_02034CE0
@@ -7181,7 +7181,7 @@ MOD06_0223CCDC: ; 0x0223CCDC
 	bl MOD05_021F51D0
 	str r0, [sp, #8]
 	ldr r0, [r5, #0xc]
-	bl FUN_0206BB1C
+	bl SavArray_PlayerParty_get
 	mov r1, #0
 	bl GetPartyMonByIndex
 	str r0, [sp, #0xc]
@@ -7257,7 +7257,7 @@ MOD06_0223CD7C: ; 0x0223CD7C
 	ldr r0, [r5, #0xc]
 	add r7, r1, #0
 	add r6, r3, #0
-	bl FUN_0206BB1C
+	bl SavArray_PlayerParty_get
 	mov r1, #0
 	bl GetPartyMonByIndex
 	add r4, r0, #0
@@ -7702,7 +7702,7 @@ MOD06_0223D044: ; 0x0223D044
 	bl SetMonData
 	ldr r0, [r6, #8]
 	add r1, r4, #0
-	bl FUN_0206B900
+	bl AddMonToParty
 	cmp r0, #0
 	bne _0223D0D8
 	bl ErrorHandling
@@ -7911,7 +7911,7 @@ _0223D25C:
 	lsl r0, r0, #2
 	add r0, r7, r0
 	ldr r0, [r0, #4]
-	bl FUN_0206B900
+	bl AddMonToParty
 	add sp, #0xc
 	pop {r4, r5, r6, r7, pc}
 	nop
@@ -15300,7 +15300,7 @@ MOD06_02240F40: ; 0x02240F40
 	add r4, r0, #0
 	ldr r0, [r4, #0x10]
 	ldr r0, [r0, #0xc]
-	bl FUN_0206BB1C
+	bl SavArray_PlayerParty_get
 	add r1, r0, #0
 	ldr r0, [r4, #0x10]
 	ldr r2, [r4, #0x6c]
@@ -19798,7 +19798,7 @@ MOD06_022432E4: ; 0x022432E4
 	sub sp, #0x28
 	str r0, [sp]
 	add r0, r1, #0
-	bl FUN_0206BB1C
+	bl SavArray_PlayerParty_get
 	str r0, [sp, #4]
 	bl GetPartyCount
 	lsl r0, r0, #0x18
@@ -20327,7 +20327,7 @@ _02243706:
 	pop {r4, r5, r6, r7, pc}
 _02243716:
 	add r0, r2, #0
-	bl FUN_0206BB1C
+	bl SavArray_PlayerParty_get
 	str r0, [sp, #8]
 	ldrb r0, [r5, #0xe]
 	mov r4, #0
@@ -20383,7 +20383,7 @@ MOD06_02243780: ; 0x02243780
 	sub sp, #0x1c
 	str r0, [sp]
 	add r0, r1, #0
-	bl FUN_0206BB1C
+	bl SavArray_PlayerParty_get
 	str r0, [sp, #4]
 	ldr r0, [sp]
 	mov r5, #0
@@ -20638,7 +20638,7 @@ MOD06_02243938: ; 0x02243938
 	bne _02243980
 _0224394A:
 	ldr r0, [r4, #0xc]
-	bl FUN_0206BB1C
+	bl SavArray_PlayerParty_get
 	ldrb r1, [r5, #0xf]
 	cmp r1, #0
 	bne _0224396C
@@ -21506,7 +21506,7 @@ MOD06_02243FDC: ; 0x02243FDC
 	mov r2, #1
 	add r1, sp, #8
 	strb r2, [r1]
-	bl FUN_0206BB1C
+	bl SavArray_PlayerParty_get
 	str r0, [sp]
 	mov r7, #0
 	ldrb r0, [r5, #0xe]
@@ -21729,7 +21729,7 @@ MOD06_02244190: ; 0x02244190
 	str r0, [sp, #4]
 	bl MI_CpuFill8
 	add r0, r4, #0
-	bl FUN_0206BB1C
+	bl SavArray_PlayerParty_get
 	ldr r5, [sp, #4]
 	add r7, r0, #0
 	mov r4, #0
@@ -22189,7 +22189,7 @@ MOD06_02244558: ; 0x02244558
 	bl FUN_020476CC
 	add r7, r0, #0
 	ldr r0, [r4, #0xc]
-	bl FUN_0206BB1C
+	bl SavArray_PlayerParty_get
 	str r0, [sp, #4]
 	add r0, r7, #0
 	add r1, r4, #0
@@ -22206,7 +22206,7 @@ MOD06_02244558: ; 0x02244558
 	add r4, r0, #0
 	ldrb r1, [r5, #0xe]
 	ldr r0, [r7, #4]
-	bl FUN_0206B8CC
+	bl InitPartyWithMaxSize
 	ldrb r0, [r5, #0xe]
 	mov r6, #0
 	cmp r0, #0
@@ -22401,7 +22401,7 @@ MOD06_022446FC: ; 0x022446FC
 	ldr r1, _02244750 ; =0x0000083E
 	strh r0, [r6, r1]
 	add r0, r4, #0
-	bl FUN_0206BB1C
+	bl SavArray_PlayerParty_get
 	add r7, r0, #0
 	mov r4, #0
 	add r5, r6, #0
@@ -23257,7 +23257,7 @@ _02244D8A:
 	bl MOD06_02244388
 	ldr r0, [r7, #4]
 	add r1, r4, #0
-	bl FUN_0206B900
+	bl AddMonToParty
 	ldr r0, [sp]
 	add r6, r6, #1
 	add r5, #0x38
@@ -31059,10 +31059,10 @@ MOD06_022488FC: ; 0x022488FC
 	ldr r0, [r5, #0xc]
 	add r4, r1, #0
 	add r6, r2, #0
-	bl FUN_0206BB1C
+	bl SavArray_PlayerParty_get
 	ldr r2, [r4, #4]
 	add r1, r6, #0
-	bl FUN_0206B9DC
+	bl ReplacePartySlotWithMon
 	ldr r0, [r5, #0xc]
 	ldr r1, [r4, #4]
 	bl FUN_0202C144
@@ -31077,7 +31077,7 @@ MOD06_0224891C: ; 0x0224891C
 	add r7, r2, #0
 	add r5, r1, #0
 	add r4, r3, #0
-	bl FUN_0206BB1C
+	bl SavArray_PlayerParty_get
 	add r1, r7, #0
 	bl GetPartyMonByIndex
 	mov r1, #0xa0
diff --git a/arm9/modules/11/asm/module_11_thumb1.s b/arm9/modules/11/asm/module_11_thumb1.s
index ed9b4dc3..3da91ac5 100644
--- a/arm9/modules/11/asm/module_11_thumb1.s
+++ b/arm9/modules/11/asm/module_11_thumb1.s
@@ -1153,7 +1153,7 @@ _0222DFE4:
 _0222DFEC:
 	ldr r0, [r5, #0x68]
 	ldr r1, [r6, #4]
-	bl FUN_0206BAD0
+	bl CopyPlayerParty
 	ldr r0, [r5, #0x68]
 	bl FreeToHeap
 	add r1, r6, #0
@@ -1945,7 +1945,7 @@ _0222E69E:
 	mov r7, #5
 _0222E6D2:
 	add r0, r7, #0
-	bl FUN_0206B8AC
+	bl SavArray_Party_alloc
 	str r0, [r5, #0x68]
 	add r6, r6, #1
 	add r5, r5, #4
@@ -1997,7 +1997,7 @@ _0222E734:
 	ldr r0, [sp, #4]
 	ldr r1, [r5, #0x68]
 	ldr r0, [r0, #4]
-	bl FUN_0206BAD0
+	bl CopyPlayerParty
 	ldr r0, [sp, #4]
 	add r6, r6, #1
 	add r0, r0, #4
@@ -2102,7 +2102,7 @@ _0222E810:
 	ldr r0, [sp, #4]
 	ldr r1, [r5, #0x68]
 	ldr r0, [r0, #4]
-	bl FUN_0206BAD0
+	bl CopyPlayerParty
 	ldr r0, [sp, #4]
 	add r6, r6, #1
 	add r0, r0, #4
@@ -2212,7 +2212,7 @@ _0222E8FE:
 	ldr r0, [sp, #4]
 	ldr r1, [r5, #0x68]
 	ldr r0, [r0, #4]
-	bl FUN_0206BAD0
+	bl CopyPlayerParty
 	ldr r0, [sp, #4]
 	add r6, r6, #1
 	add r0, r0, #4
@@ -2342,7 +2342,7 @@ _0222EA0C:
 	ldr r0, [sp, #4]
 	ldr r1, [r7, #0x68]
 	ldr r0, [r0, #4]
-	bl FUN_0206BAD0
+	bl CopyPlayerParty
 	ldr r0, [r7, #0x68]
 	mov r5, #0
 	bl GetPartyCount
@@ -2428,7 +2428,7 @@ _0222EAC0:
 	ldr r0, [sp, #4]
 	ldr r1, [r5, #0x68]
 	ldr r0, [r0, #4]
-	bl FUN_0206BAD0
+	bl CopyPlayerParty
 	ldr r0, [sp, #4]
 	add r6, r6, #1
 	add r0, r0, #4
@@ -2555,7 +2555,7 @@ _0222EBC6:
 	ldr r0, [sp, #4]
 	ldr r1, [r5, #0x68]
 	ldr r0, [r0, #4]
-	bl FUN_0206BAD0
+	bl CopyPlayerParty
 	ldr r0, [sp, #4]
 	add r6, r6, #1
 	add r0, r0, #4
@@ -2664,7 +2664,7 @@ _0222ECA6:
 	ldr r0, [sp, #4]
 	ldr r1, [r5, #0x68]
 	ldr r0, [r0, #4]
-	bl FUN_0206BAD0
+	bl CopyPlayerParty
 	ldr r0, [sp, #4]
 	add r6, r6, #1
 	add r0, r0, #4
@@ -2797,7 +2797,7 @@ _0222EDBC:
 	ldr r0, [sp, #4]
 	ldr r1, [r7, #0x68]
 	ldr r0, [r0, #4]
-	bl FUN_0206BAD0
+	bl CopyPlayerParty
 	ldr r0, [r7, #0x68]
 	mov r5, #0
 	bl GetPartyCount
diff --git a/arm9/modules/11/asm/module_11_thumb2.s b/arm9/modules/11/asm/module_11_thumb2.s
index 92756469..1dae40e9 100644
--- a/arm9/modules/11/asm/module_11_thumb2.s
+++ b/arm9/modules/11/asm/module_11_thumb2.s
@@ -25766,7 +25766,7 @@ _0223BC8A:
 	bl MOD11_022564A8
 	ldr r0, [sp, #0x28]
 	add r1, r6, #0
-	bl FUN_0206B900
+	bl AddMonToParty
 	cmp r0, #1
 	bne _0223BD1E
 	ldr r0, [r4, #0x28]
@@ -63816,7 +63816,7 @@ MOD11_0224E130: ; 0x0224E130
 	ldr r1, [r4, #8]
 	str r0, [r1, #4]
 	mov r0, #5
-	bl FUN_0206B8AC
+	bl SavArray_Party_alloc
 	ldr r1, [r4, #8]
 	mov r6, #0
 	ldr r1, [r1, #4]
@@ -70358,7 +70358,7 @@ _02251662:
 	mov r1, #6
 	ldr r0, [r0, #4]
 	ldr r0, [r0]
-	bl FUN_0206B8CC
+	bl InitPartyWithMaxSize
 	ldr r0, [sp, #0x14]
 	mov r6, #0
 	bl GetPartyCount
@@ -70376,7 +70376,7 @@ _02251680:
 	ldr r0, [r4, #8]
 	ldr r0, [r0, #4]
 	ldr r0, [r0]
-	bl FUN_0206B900
+	bl AddMonToParty
 	ldr r1, [r4, #8]
 	ldrb r0, [r5, #0x18]
 	ldr r1, [r1, #4]
@@ -71710,7 +71710,7 @@ _02252146:
 	bl AllocFromHeap
 	str r0, [r4, #4]
 	mov r0, #5
-	bl FUN_0206B8AC
+	bl SavArray_Party_alloc
 	ldr r1, [r4, #4]
 	str r0, [r1]
 	ldr r0, [r4]
@@ -71753,7 +71753,7 @@ _022521AE:
 	ldr r0, [r4, #4]
 	add r1, r6, #0
 	ldr r0, [r0]
-	bl FUN_0206B900
+	bl AddMonToParty
 	add r5, r5, #1
 	cmp r5, #6
 	blt _022521AE
@@ -71904,7 +71904,7 @@ _022522E2:
 	add r1, r0, #0
 	ldr r0, [r4, #4]
 	ldr r0, [r0]
-	bl FUN_0206B900
+	bl AddMonToParty
 	ldr r0, [r4, #4]
 	ldrb r1, [r6, #0x1c]
 	add r0, r0, r5
diff --git a/arm9/modules/14/asm/module_14.s b/arm9/modules/14/asm/module_14.s
index c8d6e847..0958064d 100644
--- a/arm9/modules/14/asm/module_14.s
+++ b/arm9/modules/14/asm/module_14.s
@@ -7527,7 +7527,7 @@ MOD14_021DB220: ; 0x021DB220
 	sub r0, r1, #4
 	str r2, [r5, r0]
 	ldr r0, [r4]
-	bl FUN_0206BB1C
+	bl SavArray_PlayerParty_get
 	mov r1, #0x49
 	lsl r1, r1, #2
 	str r0, [r5, r1]
@@ -8661,7 +8661,7 @@ _021DBA98:
 	lsl r0, r0, #2
 	ldrsb r1, [r5, r1]
 	ldr r0, [r7, r0]
-	bl FUN_0206B938
+	bl RemoveMonFromParty
 	mov r0, #1
 _021DBAB6:
 	strb r0, [r4, #0xb]
@@ -8878,7 +8878,7 @@ _021DBC42:
 	lsl r0, r0, #2
 	ldr r0, [r5, r0]
 	ldr r1, [r4]
-	bl FUN_0206B900
+	bl AddMonToParty
 	b _021DBC70
 _021DBC56:
 	mov r1, #0x1a
@@ -8891,7 +8891,7 @@ _021DBC56:
 	ldr r0, [r5, r1]
 	add r1, #0x7c
 	ldr r1, [r5, r1]
-	bl FUN_0206B900
+	bl AddMonToParty
 _021DBC70:
 	mov r0, #0x49
 	lsl r0, r0, #2
@@ -9056,7 +9056,7 @@ _021DBDB0:
 	ldrsb r1, [r1, r2]
 	add r3, #0x7c
 	ldr r2, [r5, r3]
-	bl FUN_0206B9DC
+	bl ReplacePartySlotWithMon
 	mov r0, #1
 	strb r0, [r4, #0xb]
 _021DBDC8:
@@ -9108,7 +9108,7 @@ MOD14_021DBE00: ; 0x021DBE00
 	lsl r0, r0, #2
 	ldrsb r1, [r4, r1]
 	ldr r0, [r5, r0]
-	bl FUN_0206B938
+	bl RemoveMonFromParty
 	add r0, r5, #0
 	bl MOD14_021DB934
 	mov r0, #1
@@ -9154,7 +9154,7 @@ _021DBE70:
 	lsl r0, r0, #2
 	ldrsb r1, [r4, r1]
 	ldr r0, [r5, r0]
-	bl FUN_0206B938
+	bl RemoveMonFromParty
 _021DBE7E:
 	add r0, r5, #0
 	bl MOD14_021DB934
diff --git a/arm9/modules/27/asm/module_27.s b/arm9/modules/27/asm/module_27.s
index 3ac786b0..9fa91fb4 100644
--- a/arm9/modules/27/asm/module_27.s
+++ b/arm9/modules/27/asm/module_27.s
@@ -56,7 +56,7 @@ MOD27_0225489C: ; 0x0225489C
 	strb r0, [r5, #2]
 	add r0, r4, #0
 	bl MOD20_02252C40
-	bl FUN_0206BB1C
+	bl SavArray_PlayerParty_get
 	add r1, r0, #0
 	add r0, r5, #4
 	bl MOD27_02254A48
@@ -223,7 +223,7 @@ _0225499C:
 	blo _02254A02
 	ldr r0, [r4, #0x78]
 	bl MOD20_02252C40
-	bl FUN_0206BB1C
+	bl SavArray_PlayerParty_get
 	add r1, r0, #0
 	add r0, r4, #4
 	bl MOD27_02254A48
diff --git a/arm9/modules/28/asm/module_28.s b/arm9/modules/28/asm/module_28.s
index 16acbd62..618309d1 100644
--- a/arm9/modules/28/asm/module_28.s
+++ b/arm9/modules/28/asm/module_28.s
@@ -57,7 +57,7 @@ MOD28_0225489C: ; 0x0225489C
 	strb r0, [r7, #2]
 	str r4, [r7, #0x60]
 	bl FUN_020225F8
-	bl FUN_0206BB1C
+	bl SavArray_PlayerParty_get
 	mov r1, #0
 	str r0, [sp, #4]
 	str r1, [sp]
diff --git a/arm9/modules/39/asm/module_39.s b/arm9/modules/39/asm/module_39.s
index 6ee54fe8..a850e16a 100644
--- a/arm9/modules/39/asm/module_39.s
+++ b/arm9/modules/39/asm/module_39.s
@@ -49,7 +49,7 @@ MOD39_0225489C: ; 0x0225489C
 	str r1, [sp, #8]
 	str r2, [sp, #0xc]
 	bl MOD20_02252C40
-	bl FUN_0206BB1C
+	bl SavArray_PlayerParty_get
 	str r0, [sp, #0x10]
 	bl GetPartyCount
 	ldr r1, [sp, #4]
diff --git a/arm9/modules/56/asm/module_56.s b/arm9/modules/56/asm/module_56.s
index 8fb23c76..3f445873 100644
--- a/arm9/modules/56/asm/module_56.s
+++ b/arm9/modules/56/asm/module_56.s
@@ -210,7 +210,7 @@ MOD56_02211F88: ; 0x02211F88
 	push {r3, r4, r5, r6, r7, lr}
 	add r0, #0xc4
 	ldr r0, [r0]
-	bl FUN_0206BB1C
+	bl SavArray_PlayerParty_get
 	str r0, [sp]
 	bl GetPartyCount
 	mov r5, #0
@@ -1984,7 +1984,7 @@ MOD56_02212E0C: ; 0x02212E0C
 	add r0, r5, #0
 	add r0, #0xc4
 	ldr r0, [r0]
-	bl FUN_0206BB1C
+	bl SavArray_PlayerParty_get
 	str r0, [sp, #0xc]
 	add r0, r5, #0
 	add r0, #0xc4
diff --git a/arm9/modules/71/asm/module_71.s b/arm9/modules/71/asm/module_71.s
index a409c3fb..b4e8e297 100644
--- a/arm9/modules/71/asm/module_71.s
+++ b/arm9/modules/71/asm/module_71.s
@@ -2143,7 +2143,7 @@ MOD71_0222E76C: ; 0x0222E76C
 	str r0, [r5, r1]
 	ldr r0, [r4, #0x10]
 	str r0, [r5, #4]
-	bl FUN_0206B8A4
+	bl SavArray_Party_sizeof
 	add r1, r0, #0
 	mov r0, #0x1a
 	bl AllocFromHeap
@@ -2151,8 +2151,8 @@ MOD71_0222E76C: ; 0x0222E76C
 	str r0, [r5, r1]
 	ldr r0, [r5, r1]
 	mov r1, #6
-	bl FUN_0206B8CC
-	bl FUN_0206B8A4
+	bl InitPartyWithMaxSize
+	bl SavArray_Party_sizeof
 	add r2, r0, #0
 	ldr r0, _0222E844 ; =0x0000221C
 	mov r1, #0xff
diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s
index 63810310..8e97f574 100644
--- a/arm9/modules/80/asm/module_80.s
+++ b/arm9/modules/80/asm/module_80.s
@@ -16117,7 +16117,7 @@ _02235590:
 	add r1, #0xba
 	ldrh r1, [r1]
 	ldr r0, [r0, #8]
-	bl FUN_0206B938
+	bl RemoveMonFromParty
 	ldr r0, [r5]
 	ldr r1, _022355EC ; =0x000001B9
 	ldr r0, [r0, #8]
@@ -16186,7 +16186,7 @@ _02235640:
 	ldr r0, [r5]
 	add r1, r4, #0
 	ldr r0, [r0, #8]
-	bl FUN_0206B900
+	bl AddMonToParty
 	ldr r0, [r5]
 	ldr r0, [r0, #8]
 	bl GetPartyCount
@@ -16265,7 +16265,7 @@ _022356D2:
 	ldr r0, [r5]
 	add r1, r4, #0
 	ldr r0, [r0, #8]
-	bl FUN_0206B900
+	bl AddMonToParty
 	ldr r0, [r5]
 	ldr r0, [r0, #8]
 	bl GetPartyCount