Finish decomping sav_chatot

7 files changed, 19 insertions, 111 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_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 2c4bdd91..00000000
--- a/arm9/asm/unk_02029EC4.s
+++ /dev/null
@@ -1,92 +0,0 @@
-	.include "asm/macros.inc"
-    .include "global.inc"
-
-	.text
-
-	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