5 files changed, 29 insertions, 29 deletions

diff --git a/arm9/asm/scrcmd_10.s b/arm9/asm/scrcmd_10.s
index 3235f5ae..6f417ce9 100644
--- a/arm9/asm/scrcmd_10.s
+++ b/arm9/asm/scrcmd_10.s
@@ -243,12 +243,12 @@ _020424F6:
 	b _020426FA
 _020424FC:
 	ldr r0, [r1, #0xc]
-	bl FUN_0202A8CC
+	bl SaveStruct23_GetSubstruct1
 	bl MOD06_022433A8
 	b _020426FA
 _02042508:
 	ldr r0, [r1, #0xc]
-	bl FUN_0202A8CC
+	bl SaveStruct23_GetSubstruct1
 	bl MOD06_022433B0
 	strh r0, [r4, #0x0]
 	b _020426FA
@@ -717,7 +717,7 @@ ScrCmd_Unk01E3: ; 0x02042894
 	add r6, r0, #0x0
 	ldr r0, [r5, #0x0]
 	ldr r0, [r0, #0xc]
-	bl FUN_0202A8E4
+	bl SaveStruct23_GetSubstruct4
 	add r1, sp, #0x0
 	bl FUN_0202A864
 	add r0, sp, #0x0
@@ -743,8 +743,8 @@ ScrCmd_Unk01E4: ; 0x020428E0
 	add r4, r0, #0x0
 	ldr r0, [r5, #0x0]
 	ldr r0, [r0, #0xc]
-	bl FUN_0202A8E4
-	bl FUN_0202A74C
+	bl SaveStruct23_GetSubstruct4
+	bl SaveStruct23_Substruct4_GetField_0xFF
 	strh r0, [r4, #0x0]
 	mov r0, #0x0
 	pop {r3-r5, pc}
@@ -862,10 +862,10 @@ ScrCmd_Unk0297: ; 0x020429B8
 	bl GetVarPointer
 	add r5, r0, #0x0
 	add r0, r4, #0x0
-	bl FUN_0202A8D8
+	bl SaveStruct23_GetSubstruct2
 	mov r1, #0x0
 	add r2, r1, #0x0
-	bl FUN_0202A3B4
+	bl SaveStruct23_Substruct2_SetField_0x0
 	strh r0, [r5, #0x0]
 	mov r0, #0x0
 	pop {r3-r5, pc}
@@ -885,10 +885,10 @@ ScrCmd_Unk0298: ; 0x020429E8
 	bl VarGet
 	add r5, r0, #0x0
 	add r0, r4, #0x0
-	bl FUN_0202A8D8
+	bl SaveStruct23_GetSubstruct2
 	add r1, r5, #0x0
 	mov r2, #0x5
-	bl FUN_0202A3B4
+	bl SaveStruct23_Substruct2_SetField_0x0
 	mov r0, #0x0
 	pop {r3-r5, pc}
 	.balign 4
@@ -908,10 +908,10 @@ ScrCmd_Unk0299: ; 0x02042A18
 	bl VarGet
 	add r5, r0, #0x0
 	add r0, r4, #0x0
-	bl FUN_0202A8D8
+	bl SaveStruct23_GetSubstruct2
 	add r1, r5, #0x0
 	mov r2, #0x6
-	bl FUN_0202A3B4
+	bl SaveStruct23_Substruct2_SetField_0x0
 	mov r0, #0x0
 	pop {r3-r5, pc}
 	.balign 4
@@ -939,10 +939,10 @@ ScrCmd_Unk029A: ; 0x02042A48
 	bl GetVarPointer
 	add r4, r0, #0x0
 	add r0, r5, #0x0
-	bl FUN_0202A8D8
+	bl SaveStruct23_GetSubstruct2
 	mov r1, #0x0
 	add r2, r1, #0x0
-	bl FUN_0202A3B4
+	bl SaveStruct23_Substruct2_SetField_0x0
 	cmp r0, r6
 	bhs _02042A8E
 	mov r0, #0x0
diff --git a/arm9/asm/unk_020377F0.s b/arm9/asm/unk_020377F0.s
index 9c2132bf..1505027c 100644
--- a/arm9/asm/unk_020377F0.s
+++ b/arm9/asm/unk_020377F0.s
@@ -2193,10 +2193,10 @@ FUN_02038790: ; 0x02038790
 	bl AllocFromHeapAtEnd
 	add r4, r0, #0x0
 	ldr r0, [r5, #0xc]
-	bl FUN_0202A8D8
+	bl SaveStruct23_GetSubstruct2
 	str r0, [r4, #0x0]
 	ldr r0, [r5, #0xc]
-	bl FUN_0202A8E4
+	bl SaveStruct23_GetSubstruct4
 	str r0, [r4, #0x4]
 	ldr r0, [r5, #0xc]
 	bl Sav2_SysInfo_get
diff --git a/arm9/asm/unk_02066840.s b/arm9/asm/unk_02066840.s
index d443fce9..e8495712 100644
--- a/arm9/asm/unk_02066840.s
+++ b/arm9/asm/unk_02066840.s
@@ -19,7 +19,7 @@ FUN_02066840: ; 0x02066840
 	bl FUN_02029AFC
 	add r5, r0, #0x0
 	add r0, r6, #0x0
-	bl FUN_0202A8D8
+	bl SaveStruct23_GetSubstruct2
 	str r0, [sp, #0x4]
 	add r0, r7, #0x0
 	mov r1, #0x0
@@ -93,7 +93,7 @@ FUN_02066840: ; 0x02066840
 _020668FC:
 	add r0, r6, #0x0
 	add r1, r4, #0x0
-	bl FUN_0202A5F4
+	bl SaveStruct23_GetMessage
 	ldr r1, [sp, #0x8]
 	mov r2, #0x8
 	add r1, r1, r5
@@ -104,7 +104,7 @@ _020668FC:
 	blt _020668FC
 	add r0, r6, #0x0
 	mov r1, #0x3
-	bl FUN_0202A5F4
+	bl SaveStruct23_GetMessage
 	add r1, r7, #0x0
 	add r1, #0xc0
 	mov r2, #0x8
@@ -115,7 +115,7 @@ _020668FC:
 	ldr r0, [sp, #0x4]
 	mov r1, #0x7
 	mov r2, #0x0
-	bl FUN_0202A578
+	bl SaveStruct23_Substruct2_SetFlag
 	add r1, r7, #0x0
 	add r1, #0xe2
 	strh r0, [r1, #0x0]
@@ -127,19 +127,19 @@ _020668FC:
 	ldr r0, [sp, #0x4]
 	ldr r1, [sp, #0x0]
 	add r2, r7, #0x0
-	bl FUN_0202A498
+	bl SaveStruct23_Substruct2_GetArray
 	add sp, #0xc
 	pop {r4-r7, pc}
 _02066956:
 	ldr r0, [sp, #0x4]
-	bl FUN_0202A520
+	bl SaveStruct23_Substruct2_GetField_0x16
 	add r1, r7, #0x0
 	add r1, #0xe2
 	strh r0, [r1, #0x0]
 	ldr r0, [sp, #0x4]
 	ldr r1, [sp, #0x0]
 	add r2, r7, #0x0
-	bl FUN_0202A498
+	bl SaveStruct23_Substruct2_GetArray
 _0206696C:
 	add sp, #0xc
 	pop {r4-r7, pc}
diff --git a/arm9/asm/unk_0206E2F0.s b/arm9/asm/unk_0206E2F0.s
index ab6068fc..a1bf9798 100644
--- a/arm9/asm/unk_0206E2F0.s
+++ b/arm9/asm/unk_0206E2F0.s
@@ -168,10 +168,10 @@ FUN_0206E3D8: ; 0x0206E3D8
 	thumb_func_start FUN_0206E3E8
 FUN_0206E3E8: ; 0x0206E3E8
 	push {r3, lr}
-	bl FUN_0202A8D8
+	bl SaveStruct23_GetSubstruct2
 	mov r1, #0x0
 	add r2, r1, #0x0
-	bl FUN_0202A3B4
+	bl SaveStruct23_Substruct2_SetField_0x0
 	pop {r3, pc}
 
 	thumb_func_start FUN_0206E3F8
diff --git a/arm9/asm/unk_0208A338.s b/arm9/asm/unk_0208A338.s
index bafa4c91..f96c2e10 100644
--- a/arm9/asm/unk_0208A338.s
+++ b/arm9/asm/unk_0208A338.s
@@ -208,7 +208,7 @@ _0208A4E8:
 	ldr r0, [r4, #0x0]
 	mov r1, #0x0
 	ldr r0, [r0, #0xc]
-	bl FUN_0202A5F4
+	bl SaveStruct23_GetMessage
 	add r1, r0, #0x0
 	add r0, r4, #0x0
 	add r0, #0x48
@@ -220,7 +220,7 @@ _0208A502:
 	ldr r0, [r4, #0x0]
 	mov r1, #0x1
 	ldr r0, [r0, #0xc]
-	bl FUN_0202A5F4
+	bl SaveStruct23_GetMessage
 	add r1, r0, #0x0
 	add r0, r4, #0x0
 	add r0, #0x48
@@ -232,7 +232,7 @@ _0208A51C:
 	ldr r0, [r4, #0x0]
 	mov r1, #0x2
 	ldr r0, [r0, #0xc]
-	bl FUN_0202A5F4
+	bl SaveStruct23_GetMessage
 	add r1, r0, #0x0
 	add r0, r4, #0x0
 	add r0, #0x48
@@ -244,7 +244,7 @@ _0208A536:
 	ldr r0, [r4, #0x0]
 	mov r1, #0x3
 	ldr r0, [r0, #0xc]
-	bl FUN_0202A5F4
+	bl SaveStruct23_GetMessage
 	add r1, r0, #0x0
 	add r0, r4, #0x0
 	add r0, #0x48
@@ -335,7 +335,7 @@ _0208A5EC:
 	ldr r0, [r0, #0xc]
 	ldr r1, [r4, #0x64]
 	add r2, #0x48
-	bl FUN_0202A5D4
+	bl SaveStruct23_SetMessage
 	add r0, r4, #0x0
 	mov r1, #0x6
 	mov r2, #0x0