Merge pull request #386 from PikalaxALT/pikalax_work

Decompile code related to Chatot's data in the save block

9 files changed, 75 insertions, 224 deletions

diff --git a/arm9/asm/scrcmd_3.s b/arm9/asm/scrcmd_3.s
index 28df2444..4568c590 100644
--- a/arm9/asm/scrcmd_3.s
+++ b/arm9/asm/scrcmd_3.s
@@ -173,7 +173,7 @@ FUN_0203FF10: ; 0x0203FF10
 	str r0, [sp, #0x30]
 	ldr r0, [r5, #0x0]
 	ldr r0, [r0, #0xc]
-	bl FUN_02029EF8
+	bl Sav2_Chatot_get
 	str r0, [sp, #0x34]
 	add r0, sp, #0x14
 	bl FUN_02081214
diff --git a/arm9/asm/unk_020040F4.s b/arm9/asm/unk_020040F4.s
index 5e62cb80..86e069f9 100644
--- a/arm9/asm/unk_020040F4.s
+++ b/arm9/asm/unk_020040F4.s
@@ -203,133 +203,133 @@ _0200421A: ; jump table (using 16-bit offset)
 	.short _020042AE - _0200421A - 2; case 3
 _02004222:
 	mov r0, #0x1
-	bl FUN_02003F78
+	bl GF_Snd_LoadGroup
 	add r1, r0, #0x0
 	b _0200432C
 _0200422C:
 	mov r0, #0x2
-	bl FUN_02003F78
+	bl GF_Snd_LoadGroup
 	add r1, r0, #0x0
 	b _0200432C
 _02004236:
 	mov r0, #0xd
-	bl FUN_02003F78
+	bl GF_Snd_LoadGroup
 	add r1, r0, #0x0
 	b _0200432C
 _02004240:
 	mov r0, #0x1
-	bl FUN_02003F78
+	bl GF_Snd_LoadGroup
 	add r1, r0, #0x0
 	b _0200432C
 _0200424A:
 	mov r0, #0x2
-	bl FUN_02003F78
+	bl GF_Snd_LoadGroup
 	add r1, r0, #0x0
 	b _0200432C
 _02004254:
 	mov r0, #0x1
-	bl FUN_02003F78
+	bl GF_Snd_LoadGroup
 	add r1, r0, #0x0
 	b _0200432C
 _0200425E:
 	mov r0, #0xb
-	bl FUN_02003F78
+	bl GF_Snd_LoadGroup
 	add r1, r0, #0x0
 	b _0200432C
 _02004268:
 	mov r0, #0x1
-	bl FUN_02003F78
+	bl GF_Snd_LoadGroup
 	add r1, r0, #0x0
 	b _0200432C
 _02004272:
 	mov r0, #0xe
-	bl FUN_02003F78
+	bl GF_Snd_LoadGroup
 	add r1, r0, #0x0
 	b _0200432C
 _0200427C:
 	mov r0, #0x3
-	bl FUN_02003F78
+	bl GF_Snd_LoadGroup
 	add r1, r0, #0x0
 	b _0200432C
 _02004286:
 	mov r0, #0x6
-	bl FUN_02003F78
+	bl GF_Snd_LoadGroup
 	add r1, r0, #0x0
 	b _0200432C
 _02004290:
 	mov r0, #0x5
-	bl FUN_02003F78
+	bl GF_Snd_LoadGroup
 	add r1, r0, #0x0
 	b _0200432C
 _0200429A:
 	mov r0, #0x9
-	bl FUN_02003F78
+	bl GF_Snd_LoadGroup
 	add r1, r0, #0x0
 	b _0200432C
 _020042A4:
 	mov r0, #0xa
-	bl FUN_02003F78
+	bl GF_Snd_LoadGroup
 	add r1, r0, #0x0
 	b _0200432C
 _020042AE:
 	ldr r0, _02004330 ; =0x000005E5
-	bl FUN_02003FDC
+	bl GF_Snd_LoadBank
 	ldr r0, _02004330 ; =0x000005E5
-	bl FUN_02003FC4
+	bl GF_Snd_LoadWaveArc
 	add r1, r0, #0x0
 	b _0200432C
 _020042BE:
 	mov r0, #0xc
-	bl FUN_02003F78
+	bl GF_Snd_LoadGroup
 	add r1, r0, #0x0
 	b _0200432C
 _020042C8:
 	mov r0, #0x7
-	bl FUN_02003F78
+	bl GF_Snd_LoadGroup
 	add r1, r0, #0x0
 	b _0200432C
 _020042D2:
 	mov r0, #0x8
-	bl FUN_02003F78
+	bl GF_Snd_LoadGroup
 	add r1, r0, #0x0
 	b _0200432C
 _020042DC:
 	mov r0, #0xf
-	bl FUN_02003F78
+	bl GF_Snd_LoadGroup
 	add r1, r0, #0x0
 	b _0200432C
 _020042E6:
 	mov r0, #0x3
-	bl FUN_02003F78
+	bl GF_Snd_LoadGroup
 	add r1, r0, #0x0
 	b _0200432C
 _020042F0:
 	mov r0, #0x5
-	bl FUN_02003F78
+	bl GF_Snd_LoadGroup
 	add r1, r0, #0x0
 	b _0200432C
 _020042FA:
 	mov r0, #0xf
-	bl FUN_02003F78
+	bl GF_Snd_LoadGroup
 	add r1, r0, #0x0
 	b _0200432C
 _02004304:
 	mov r0, #0x4
-	bl FUN_02003F78
+	bl GF_Snd_LoadGroup
 	add r1, r0, #0x0
 	b _0200432C
 _0200430E:
 	ldr r0, _02004334 ; =0x000005ED
-	bl FUN_02003FDC
+	bl GF_Snd_LoadBank
 	ldr r0, _02004334 ; =0x000005ED
-	bl FUN_02003FC4
+	bl GF_Snd_LoadWaveArc
 	add r1, r0, #0x0
 	b _0200432C
 _0200431E:
 	ldr r0, _02004338 ; =0x000005EC
-	bl FUN_02003FDC
+	bl GF_Snd_LoadBank
 	ldr r0, _02004338 ; =0x000005EC
-	bl FUN_02003FC4
+	bl GF_Snd_LoadWaveArc
 	add r1, r0, #0x0
 _0200432C:
 	add r0, r1, #0x0
@@ -536,15 +536,15 @@ FUN_020044A8: ; 0x020044A8
 	mov r0, #0x17
 	bl FUN_02003D38
 	ldr r0, [r0, #0x0]
-	bl FUN_02003F64
+	bl GF_Snd_RestoreState
 	mov r0, #0x18
 	bl FUN_02003D38
-	bl FUN_02003F3C
+	bl GF_Snd_SaveState
 	add r0, r4, #0x0
 	bl FUN_02004180
 	mov r0, #0x19
 	bl FUN_02003D38
-	bl FUN_02003F3C
+	bl GF_Snd_SaveState
 	pop {r4, pc}
 
 	thumb_func_start FUN_020044D4
@@ -588,12 +588,12 @@ _02004528:
 	bne _02004560
 	mov r0, #0x2
 	bl FUN_02004748
-	bl FUN_02003F64
+	bl GF_Snd_RestoreState
 	mov r0, #0x4
 	bl FUN_02004180
 	mov r0, #0x19
 	bl FUN_02003D38
-	bl FUN_02003F3C
+	bl GF_Snd_SaveState
 	cmp r4, r5
 	beq _02004554
 	mov r0, #0x1
@@ -628,17 +628,17 @@ FUN_02004568: ; 0x02004568
 	beq _02004594
 	add r0, r5, #0x0
 	mov r1, #0x4
-	bl FUN_02003FA8
+	bl GF_Snd_LoadSeqEx
 	bl ErrorHandling
 	b _0200459C
 _02004594:
 	ldrh r0, [r4, #0x0]
 	mov r1, #0x6
-	bl FUN_02003FA8
+	bl GF_Snd_LoadSeqEx
 _0200459C:
 	mov r0, #0x1a
 	bl FUN_02003D38
-	bl FUN_02003F3C
+	bl GF_Snd_SaveState
 	mov r0, #0x1
 	mov r1, #0x0
 	bl FUN_020047C8
@@ -671,18 +671,18 @@ FUN_020045C4: ; 0x020045C4
 _020045E4:
 	mov r0, #0x1
 	bl FUN_02004748
-	bl FUN_02003F64
+	bl GF_Snd_RestoreState
 	ldrh r0, [r4, #0x0]
 	mov r1, #0x2
-	bl FUN_02003FA8
+	bl GF_Snd_LoadSeqEx
 	mov r0, #0x18
 	bl FUN_02003D38
-	bl FUN_02003F3C
+	bl GF_Snd_SaveState
 	mov r0, #0x4
 	bl FUN_02004180
 	mov r0, #0x19
 	bl FUN_02003D38
-	bl FUN_02003F3C
+	bl GF_Snd_SaveState
 	ldrh r0, [r4, #0x0]
 	bl FUN_02004900
 	ldr r1, _02004644 ; =0x000003E9
@@ -693,17 +693,17 @@ _020045E4:
 	beq _02004630
 	add r0, r7, #0x0
 	mov r1, #0x4
-	bl FUN_02003FA8
+	bl GF_Snd_LoadSeqEx
 	bl ErrorHandling
 	b _02004638
 _02004630:
 	ldrh r0, [r4, #0x0]
 	mov r1, #0x4
-	bl FUN_02003FA8
+	bl GF_Snd_LoadSeqEx
 _02004638:
 	mov r0, #0x1a
 	bl FUN_02003D38
-	bl FUN_02003F3C
+	bl GF_Snd_SaveState
 _02004642:
 	pop {r3-r7, pc}
 	.balign 4
@@ -718,12 +718,12 @@ FUN_02004648: ; 0x02004648
 	bl FUN_020051AC
 	mov r0, #0x2
 	bl FUN_02004748
-	bl FUN_02003F64
+	bl GF_Snd_RestoreState
 	mov r0, #0x5
 	bl FUN_02004180
 	mov r0, #0x19
 	bl FUN_02003D38
-	bl FUN_02003F3C
+	bl GF_Snd_SaveState
 	mov r0, #0x1
 	bl FUN_02004DBC
 	add r0, r4, #0x0
@@ -786,7 +786,7 @@ FUN_020046E8: ; 0x020046E8
 	bl FUN_02004180
 	mov r0, #0x1b
 	bl FUN_02003D38
-	bl FUN_02003F3C
+	bl GF_Snd_SaveState
 	pop {r4, pc}
 	.balign 4
 
@@ -820,7 +820,7 @@ FUN_02004738: ; 0x02004738
 	push {r3, lr}
 	mov r0, #0x4
 	bl FUN_02004748
-	bl FUN_02003F64
+	bl GF_Snd_RestoreState
 	pop {r3, pc}
 	.balign 4
 
@@ -1824,7 +1824,7 @@ FUN_02004E98: ; 0x02004E98
 	add r5, r0, #0x0
 	mov r0, #0x5
 	bl FUN_02004748
-	bl FUN_02003F64
+	bl GF_Snd_RestoreState
 	lsl r0, r5, #0x10
 	lsr r4, r0, #0x10
 	ldr r0, _02004ECC ; =0x000001B9
@@ -1839,7 +1839,7 @@ _02004EBA:
 	mov r4, #0x1
 _02004EBC:
 	add r0, r4, #0x0
-	bl FUN_02003FC4
+	bl GF_Snd_LoadWaveArc
 	add r0, r4, #0x0
 	bl FUN_02004ED0
 	pop {r3-r5, pc}
diff --git a/arm9/asm/unk_020051F4.s b/arm9/asm/unk_020051F4.s
index 12b0c8cb..843ae7b6 100644
--- a/arm9/asm/unk_020051F4.s
+++ b/arm9/asm/unk_020051F4.s
@@ -81,12 +81,12 @@ FUN_02005288: ; 0x02005288
 	mov r0, #0x3
 	add r4, r2, #0x0
 	bl FUN_02004748
-	bl FUN_02003F64
+	bl GF_Snd_RestoreState
 	add r0, r5, #0x0
-	bl FUN_02003F90
+	bl GF_Snd_LoadSeq
 	mov r0, #0x1a
 	bl FUN_02003D38
-	bl FUN_02003F3C
+	bl GF_Snd_SaveState
 	add r0, r4, #0x0
 	bl FUN_02003FF4
 	add r1, r5, #0x0
@@ -148,7 +148,7 @@ _02005318:
 _0200532A:
 	add r0, r5, #0x0
 	mov r1, #0x1
-	bl FUN_02003FA8
+	bl GF_Snd_LoadSeqEx
 	mov r0, #0x7
 	bl FUN_02003FF4
 	add r1, r5, #0x0
@@ -1232,10 +1232,10 @@ PlayBGM: ; 0x02005C28
 _02005C48:
 	mov r0, #0x1c
 	bl FUN_02003D38
-	bl FUN_02003F3C
+	bl GF_Snd_SaveState
 	add r0, r5, #0x0
 	mov r1, #0x3
-	bl FUN_02003FA8
+	bl GF_Snd_LoadSeqEx
 	mov r0, #0x2
 	bl FUN_02003FF4
 	add r1, r5, #0x0
@@ -1282,7 +1282,7 @@ FUN_02005CA0: ; 0x02005CA0
 	bl NNS_SndPlayerStopSeq
 	mov r0, #0x6
 	bl FUN_02004748
-	bl FUN_02003F64
+	bl GF_Snd_RestoreState
 	pop {r4, pc}
 
 	thumb_func_start FUN_02005CBC
diff --git a/arm9/asm/unk_02005CFC.s b/arm9/asm/unk_02005CFC.s
index 6a601c58..7a7010b0 100644
--- a/arm9/asm/unk_02005CFC.s
+++ b/arm9/asm/unk_02005CFC.s
@@ -30,7 +30,7 @@ FUN_02005D20: ; 0x02005D20
 	bl FUN_02003D38
 	add r4, r0, #0x0
 	add r0, r5, #0x0
-	bl FUN_02029F04
+	bl Chatot_exists
 	cmp r0, #0x0
 	bne _02005D3A
 	mov r0, #0x0
@@ -80,10 +80,10 @@ _02005D70:
 	lsl r0, r0, #0x10
 	lsr r4, r0, #0x10
 	add r0, r6, #0x0
-	bl FUN_02029F10
+	bl Chatot_GetData
 	add r1, r0, #0x0
 	ldr r0, [sp, #0x0]
-	bl FUN_02029F14
+	bl Chatot_Decode
 	mov r0, #0xe
 	bl FUN_02004930
 	str r0, [sp, #0x8]
@@ -192,7 +192,7 @@ FUN_02005E6C: ; 0x02005E6C
 	bl FUN_02004DB4
 	add r1, r0, #0x0
 	add r0, r4, #0x0
-	bl FUN_02029F4C
+	bl Chatot_Encode
 	pop {r4, pc}
 	.balign 4
 
@@ -250,14 +250,14 @@ _02005EDC: .word 0x000001B9
 FUN_02005EE0: ; 0x02005EE0
 	push {r4, lr}
 	add r4, r0, #0x0
-	bl FUN_02029F04
+	bl Chatot_exists
 	cmp r0, #0x0
 	bne _02005EF0
 	mov r0, #0x0
 	pop {r4, pc}
 _02005EF0:
 	add r0, r4, #0x0
-	bl FUN_02029F10
+	bl Chatot_GetData
 	mov r1, #0xf
 	ldrsb r0, [r0, r1]
 	sub r1, #0x2d
diff --git a/arm9/asm/unk_02029EC4.s b/arm9/asm/unk_02029EC4.s
deleted file mode 100644
index 03893fab..00000000
--- a/arm9/asm/unk_02029EC4.s
+++ /dev/null
@@ -1,149 +0,0 @@
-	.include "asm/macros.inc"
-    .include "global.inc"
-
-	.text
-
-	thumb_func_start FUN_02029EC4
-FUN_02029EC4: ; 0x02029EC4
-	mov r0, #0xfb
-	lsl r0, r0, #0x2
-	bx lr
-	.balign 4
-
-	thumb_func_start FUN_02029ECC
-FUN_02029ECC: ; 0x02029ECC
-	push {r4, lr}
-	add r4, r0, #0x0
-	mov r2, #0xfb
-	mov r0, #0x0
-	add r1, r4, #0x0
-	lsl r2, r2, #0x2
-	bl MIi_CpuClear32
-	mov r0, #0x0
-	str r0, [r4, #0x0]
-	pop {r4, pc}
-	.balign 4
-
-	thumb_func_start FUN_02029EE4
-FUN_02029EE4: ; 0x02029EE4
-	push {r4, lr}
-	mov r1, #0xfb
-	lsl r1, r1, #0x2
-	bl AllocFromHeap
-	add r4, r0, #0x0
-	bl FUN_02029ECC
-	add r0, r4, #0x0
-	pop {r4, pc}
-
-	thumb_func_start FUN_02029EF8
-FUN_02029EF8: ; 0x02029EF8
-	ldr r3, _02029F00 ; =SavArray_get
-	mov r1, #0x16
-	bx r3
-	nop
-_02029F00: .word SavArray_get
-
-	thumb_func_start FUN_02029F04
-FUN_02029F04: ; 0x02029F04
-	ldr r0, [r0, #0x0]
-	bx lr
-
-	thumb_func_start FUN_02029F08
-FUN_02029F08: ; 0x02029F08
-	mov r1, #0x0
-	str r1, [r0, #0x0]
-	bx lr
-	.balign 4
-
-	thumb_func_start FUN_02029F10
-FUN_02029F10: ; 0x02029F10
-	add r0, r0, #0x4
-	bx lr
-
-	thumb_func_start FUN_02029F14
-FUN_02029F14: ; 0x02029F14
-	push {r4-r7}
-	mov r5, #0x0
-	mov r2, #0xfa
-	add r4, r5, #0x0
-	mov r6, #0xf
-	lsl r2, r2, #0x2
-_02029F20:
-	ldrsb r7, [r1, r4]
-	add r3, r0, r5
-	and r7, r6
-	lsl r7, r7, #0x18
-	lsr r7, r7, #0x18
-	sub r7, #0x8
-	lsl r7, r7, #0x18
-	asr r7, r7, #0x14
-	strb r7, [r0, r5]
-	ldrsb r7, [r1, r4]
-	add r4, r4, #0x1
-	add r5, r5, #0x2
-	lsl r7, r7, #0x14
-	lsr r7, r7, #0x18
-	sub r7, #0x8
-	lsl r7, r7, #0x18
-	asr r7, r7, #0x14
-	strb r7, [r3, #0x1]
-	cmp r4, r2
-	blt _02029F20
-	pop {r4-r7}
-	bx lr
-
-	thumb_func_start FUN_02029F4C
-FUN_02029F4C: ; 0x02029F4C
-	push {r4-r7}
-	add r3, r0, #0x0
-	add r2, r1, #0x0
-	mov r0, #0x1
-	mov r1, #0x0
-	str r0, [r3, #0x0]
-	add r0, r1, #0x0
-_02029F5A:
-	ldrsb r4, [r2, r0]
-	add r6, r3, r1
-	add r7, r2, r0
-	asr r5, r4, #0x3
-	lsr r5, r5, #0x1c
-	add r5, r4, r5
-	lsl r4, r5, #0x14
-	asr r4, r4, #0x18
-	add r4, #0x8
-	strb r4, [r6, #0x4]
-	mov r4, #0x4
-	ldrsb r5, [r6, r4]
-	mov r4, #0x1
-	ldrsb r4, [r7, r4]
-	add r0, r0, #0x2
-	add r1, r1, #0x1
-	asr r7, r4, #0x3
-	lsr r7, r7, #0x1c
-	add r7, r4, r7
-	lsl r4, r7, #0x14
-	asr r4, r4, #0x18
-	add r4, #0x8
-	lsl r4, r4, #0x18
-	lsr r4, r4, #0x14
-	orr r4, r5
-	strb r4, [r6, #0x4]
-	mov r4, #0x7d
-	lsl r4, r4, #0x4
-	cmp r0, r4
-	blt _02029F5A
-	pop {r4-r7}
-	bx lr
-	.balign 4
-
-	thumb_func_start FUN_02029F9C
-FUN_02029F9C: ; 0x02029F9C
-	add r2, r0, #0x0
-	add r0, r1, #0x0
-	add r1, r2, #0x0
-	mov r2, #0xfb
-	ldr r3, _02029FAC ; =MIi_CpuCopyFast
-	lsl r2, r2, #0x2
-	bx r3
-	nop
-_02029FAC: .word MIi_CpuCopyFast
diff --git a/arm9/asm/unk_020476CC.s b/arm9/asm/unk_020476CC.s
index 7e25689f..54679259 100644
--- a/arm9/asm/unk_020476CC.s
+++ b/arm9/asm/unk_020476CC.s
@@ -97,7 +97,7 @@ _0204775C:
 	add r4, r7, #0x0
 _02047774:
 	add r0, r5, #0x0
-	bl FUN_02029EE4
+	bl Chatot_new
 	mov r1, #0x46
 	lsl r1, r1, #0x2
 	str r0, [r4, r1]
@@ -455,11 +455,11 @@ FUN_02047A64: ; 0x02047A64
 	add r2, r0, r2
 	mov r0, #0x46
 	lsl r0, r0, #0x2
-	ldr r3, _02047A74 ; =FUN_02029F9C
+	ldr r3, _02047A74 ; =Chatot_copy
 	ldr r0, [r2, r0]
 	bx r3
 	nop
-_02047A74: .word FUN_02029F9C
+_02047A74: .word Chatot_copy
 
 	thumb_func_start FUN_02047A78
 FUN_02047A78: ; 0x02047A78
@@ -480,7 +480,7 @@ FUN_02047A78: ; 0x02047A78
 	bl Sav2_Pokedex_get
 	str r0, [sp, #0x4]
 	ldr r0, [r4, #0xc]
-	bl FUN_02029EF8
+	bl Sav2_Chatot_get
 	str r0, [sp, #0x8]
 	ldr r0, [r4, #0xc]
 	bl Sav2_PlayerData_GetOptionsAddr
@@ -628,7 +628,7 @@ FUN_02047BC0: ; 0x02047BC0
 	str r0, [sp, #0xc]
 	ldr r0, [sp, #0x0]
 	ldr r0, [r0, #0xc]
-	bl FUN_02029EF8
+	bl Sav2_Chatot_get
 	str r0, [sp, #0x8]
 	ldr r0, [sp, #0x0]
 	ldr r0, [r0, #0xc]
@@ -795,7 +795,7 @@ FUN_02047D48: ; 0x02047D48
 	str r0, [sp, #0x18]
 	ldr r0, [sp, #0x0]
 	ldr r0, [r0, #0xc]
-	bl FUN_02029EF8
+	bl Sav2_Chatot_get
 	str r0, [sp, #0x14]
 	ldr r0, [sp, #0x0]
 	ldr r0, [r0, #0xc]
diff --git a/arm9/asm/unk_0206BF90.s b/arm9/asm/unk_0206BF90.s
index d672d875..acf84738 100644
--- a/arm9/asm/unk_0206BF90.s
+++ b/arm9/asm/unk_0206BF90.s
@@ -572,7 +572,7 @@ _0206C350:
 	add r0, r4, #0x0
 	ldr r1, [r2, r1]
 	add r0, #0x20
-	bl FUN_02029F9C
+	bl Chatot_copy
 	mov r0, #0x1
 	pop {r4, pc}
 	.balign 4
diff --git a/arm9/asm/unk_02080C38.s b/arm9/asm/unk_02080C38.s
index 0f1630ed..36539633 100644
--- a/arm9/asm/unk_02080C38.s
+++ b/arm9/asm/unk_02080C38.s
@@ -916,7 +916,7 @@ _020812F2:
 	add r5, r4, #0x0
 _02081304:
 	mov r0, #0x14
-	bl FUN_02029EE4
+	bl Chatot_new
 	mov r1, #0x57
 	lsl r1, r1, #0x2
 	str r0, [r5, r1]
@@ -927,7 +927,7 @@ _02081304:
 	add r0, r1, #0x0
 	ldr r0, [r4, r0]
 	ldr r1, [r6, #0x20]
-	bl FUN_02029F9C
+	bl Chatot_copy
 	ldr r0, [r6, #0x8]
 	ldr r1, [r4, #0x0]
 	bl CopyPokemonToPokemon
@@ -1900,7 +1900,7 @@ _02081A7C:
 	strb r0, [r4, r2]
 	pop {r3-r7, pc}
 _02081A8A:
-	bl FUN_02029EC4
+	bl Sav2_Chatot_sizeof
 	add r2, r0, #0x0
 	mov r0, #0x57
 	lsl r0, r0, #0x2
diff --git a/arm9/asm/unk_020834D0.s b/arm9/asm/unk_020834D0.s
index e86c6f2d..39062a81 100644
--- a/arm9/asm/unk_020834D0.s
+++ b/arm9/asm/unk_020834D0.s
@@ -830,7 +830,7 @@ FUN_02083AA8: ; 0x02083AA8
 	push {r3-r5, lr}
 	add r5, r2, #0x0
 	add r4, r3, #0x0
-	bl FUN_02029EC4
+	bl Sav2_Chatot_sizeof
 	add r2, r0, #0x0
 	ldrb r1, [r5, r2]
 	add r0, r5, #0x0
@@ -854,7 +854,7 @@ FUN_02083AD4: ; 0x02083AD4
 	add r4, r0, #0x0
 	add r7, r1, #0x0
 	add r6, r2, #0x0
-	bl FUN_02029EC4
+	bl Sav2_Chatot_sizeof
 	add r5, r0, #0x0
 	ldr r0, _02083B0C ; =0x00000585
 	add r4, r4, r0