Name game stats methods

39 files changed, 292 insertions, 291 deletions

diff --git a/arm9/asm/scrcmd_9.s b/arm9/asm/scrcmd_9.s
index c3d8c4ba..211f5afc 100644
--- a/arm9/asm/scrcmd_9.s
+++ b/arm9/asm/scrcmd_9.s
@@ -316,7 +316,7 @@ _020420A8:
 	add r0, #0x80
 	ldr r0, [r0, #0x0]
 	ldr r0, [r0, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	add r4, r0, #0x0
 	add r0, r5, #0x0
 	bl ScriptReadHalfword
@@ -349,7 +349,7 @@ _020420A8:
 	bl FUN_020421D8
 	add r0, r4, #0x0
 	mov r1, #0x3
-	bl FUN_0202A170
+	bl GameStats_AddSpecial
 _02042106:
 	mov r0, #0x0
 	pop {r3-r7, pc}
diff --git a/arm9/asm/scrcmd_asm.s b/arm9/asm/scrcmd_asm.s
index 29106585..231a064d 100644
--- a/arm9/asm/scrcmd_asm.s
+++ b/arm9/asm/scrcmd_asm.s
@@ -6368,9 +6368,9 @@ ScrCmd_Unk01E5: ; 0x0203E4F0
 	add r4, r0, #0x0
 	ldr r0, [r5, #0x0]
 	ldr r0, [r0, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	add r1, r4, #0x0
-	bl FUN_0202A0E8
+	bl GameStats_Inc
 	mov r0, #0x0
 	pop {r3-r5, pc}
 	.balign 4
@@ -6402,9 +6402,9 @@ ScrCmd_Unk01E6: ; 0x0203E510
 	add r6, r0, #0x0
 	ldr r0, [r5, #0x0]
 	ldr r0, [r0, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	add r1, r7, #0x0
-	bl FUN_0202A150
+	bl GameStats_GetCapped
 	ldr r1, _0203E564 ; =0xFFFF0000
 	and r1, r0
 	lsr r1, r1, #0x10
@@ -6444,28 +6444,28 @@ _0203E59C:
 	add r5, #0x80
 	ldr r0, [r5, #0x0]
 	ldr r0, [r0, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	add r1, r6, #0x0
 	add r2, r4, #0x0
-	bl FUN_0202A11C
+	bl GameStats_Add
 	b _0203E5D6
 _0203E5B0:
 	add r5, #0x80
 	ldr r0, [r5, #0x0]
 	ldr r0, [r0, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	add r1, r6, #0x0
 	add r2, r4, #0x0
-	bl FUN_0202A07C
+	bl GameStats_SetCapped
 	b _0203E5D6
 _0203E5C4:
 	add r5, #0x80
 	ldr r0, [r5, #0x0]
 	ldr r0, [r0, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	add r1, r6, #0x0
 	add r2, r4, #0x0
-	bl FUN_0202A0A8
+	bl GameStats_UpdateBounded
 _0203E5D6:
 	mov r0, #0x0
 	pop {r4-r6, pc}
@@ -7563,9 +7563,9 @@ ScrCmd_Unk0260: ; 0x0203EE78
 	add r4, r0, #0x0
 	ldr r0, [r5, #0x0]
 	ldr r0, [r0, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	add r1, r4, #0x0
-	bl FUN_0202A170
+	bl GameStats_AddSpecial
 	mov r0, #0x0
 	pop {r3-r5, pc}
 	.balign 4
diff --git a/arm9/asm/unk_0202B870.s b/arm9/asm/unk_0202B870.s
index c4dc6cc4..33f15eb4 100644
--- a/arm9/asm/unk_0202B870.s
+++ b/arm9/asm/unk_0202B870.s
@@ -154,7 +154,7 @@ FUN_0202B93C: ; 0x0202B93C
 	push {r3-r7, lr}
 	sub sp, #0x8
 	add r5, r1, #0x0
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	add r4, r0, #0x0
 	add r0, r5, #0x0
 	mov r1, #0x34
@@ -175,12 +175,12 @@ _0202B95A:
 _0202B968:
 	add r0, r4, #0x0
 	mov r1, #0xf
-	bl FUN_0202A150
+	bl GameStats_GetCapped
 	add r7, r0, #0x0
 	beq _0202B984
 	add r0, r4, #0x0
 	mov r1, #0x1d
-	bl FUN_0202A150
+	bl GameStats_GetCapped
 	add r1, r7, #0x0
 	bl _u32_div_f
 	add r7, r0, #0x0
@@ -190,22 +190,22 @@ _0202B984:
 _0202B988:
 	add r0, r4, #0x0
 	mov r1, #0x41
-	bl FUN_0202A150
+	bl GameStats_GetCapped
 	add r7, r0, #0x0
 	add r0, r4, #0x0
 	mov r1, #0x42
-	bl FUN_0202A150
+	bl GameStats_GetCapped
 	add r0, r7, r0
 	str r0, [r5, #0x0]
 	b _0202B9D4
 _0202B9A0:
 	add r0, r4, #0x0
 	mov r1, #0x3f
-	bl FUN_0202A150
+	bl GameStats_GetCapped
 	add r7, r0, #0x0
 	add r0, r4, #0x0
 	mov r1, #0x40
-	bl FUN_0202A150
+	bl GameStats_GetCapped
 	add r1, r7, r0
 	beq _0202B9C4
 	ldr r0, [sp, #0x4]
@@ -221,7 +221,7 @@ _0202B9C8:
 	ldr r1, [sp, #0x0]
 	add r0, r4, #0x0
 	ldr r1, [r1, #0x0]
-	bl FUN_0202A150
+	bl GameStats_GetCapped
 	str r0, [r5, #0x0]
 _0202B9D4:
 	ldr r0, [sp, #0x0]
diff --git a/arm9/asm/unk_02035068.s b/arm9/asm/unk_02035068.s
index d0bddd04..ceed181f 100644
--- a/arm9/asm/unk_02035068.s
+++ b/arm9/asm/unk_02035068.s
@@ -3672,7 +3672,7 @@ FUN_02036E08: ; 0x02036E08
 	bl Sav2_Bag_get
 	str r0, [sp, #0x30]
 	ldr r0, [r4, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	str r0, [sp, #0x34]
 	ldr r0, [r4, #0xc]
 	bl Sav2_Poketch_get
@@ -3709,7 +3709,7 @@ _02036E9E:
 	bl Sav2_Bag_get
 	str r0, [sp, #0x40]
 	ldr r0, [r4, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	str r0, [sp, #0x44]
 	ldr r0, [r4, #0xc]
 	bl Sav2_Poketch_get
diff --git a/arm9/asm/unk_020377F0.s b/arm9/asm/unk_020377F0.s
index 5ac3b4c2..a5047e10 100644
--- a/arm9/asm/unk_020377F0.s
+++ b/arm9/asm/unk_020377F0.s
@@ -1279,7 +1279,7 @@ FUN_0203800C: ; 0x0203800C
 	bl Sav2_PlayerData_GetOptionsAddr
 	str r0, [r4, #0xc]
 	add r0, r5, #0x0
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	str r0, [r4, #0x10]
 	add r0, r5, #0x0
 	bl Sav2_PlayerData_GetProfileAddr
@@ -1435,7 +1435,7 @@ FUN_02038144: ; 0x02038144
 	ldr r0, [r0, #0x0]
 	str r0, [r5, #0x1c]
 	ldr r0, [r4, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	str r0, [r5, #0x20]
 	bl PlayerProfile_sizeof
 	add r1, r0, #0x0
@@ -1647,7 +1647,7 @@ _020382F6:
 	bl Sav2_Bag_get
 	str r0, [sp, #0x28]
 	ldr r0, [r5, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	str r0, [sp, #0x2c]
 	ldr r0, [r5, #0xc]
 	bl Sav2_Poketch_get
@@ -1702,9 +1702,9 @@ _020383B2:
 	mov r0, #0x2
 	str r0, [r4, #0x0]
 	ldr r0, [r5, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0x10
-	bl FUN_0202A170
+	bl GameStats_AddSpecial
 _020383C8:
 	mov r0, #0x0
 	add sp, #0x34
@@ -1771,7 +1771,7 @@ FUN_0203842C: ; 0x0203842C
 	bl Sav2_PlayerData_GetOptionsAddr
 	str r0, [r4, #0x8]
 	ldr r0, [r5, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	str r0, [r4, #0xc]
 	add r0, r5, #0x0
 	add r0, #0x98
@@ -2145,7 +2145,7 @@ FUN_020386E0: ; 0x020386E0
 	bl Sav2_PlayerData_GetOptionsAddr
 	str r0, [r4, #0x24]
 	ldr r0, [r5, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	str r0, [r4, #0x28]
 	add r0, r5, #0x0
 	add r0, #0x98
@@ -2473,7 +2473,7 @@ FUN_020389CC: ; 0x020389CC
 	str r0, [r4, #0x4]
 	str r1, [r4, #0x8]
 	ldr r0, [r5, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	str r0, [r4, #0x14]
 	mov r0, #0x0
 	str r0, [r4, #0x18]
@@ -2486,9 +2486,9 @@ FUN_020389CC: ; 0x020389CC
 	bl FUN_02038A3C
 	str r0, [r4, #0x10]
 	ldr r0, [r5, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0x5
-	bl FUN_0202A170
+	bl GameStats_AddSpecial
 	ldr r1, _02038A38 ; =FUN_02038914
 	add r0, r7, #0x0
 	add r2, r4, #0x0
diff --git a/arm9/asm/unk_0204653C.s b/arm9/asm/unk_0204653C.s
index f3d45372..212047b4 100644
--- a/arm9/asm/unk_0204653C.s
+++ b/arm9/asm/unk_0204653C.s
@@ -348,9 +348,9 @@ _020467C0:
 	add r1, r7, #0x0
 	bl FUN_02047FA4
 	ldr r0, [r7, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0x15
-	bl FUN_0202A170
+	bl GameStats_AddSpecial
 	add r0, r6, #0x0
 	bl FUN_0204AF84
 	ldr r0, [r4, #0x0]
@@ -410,9 +410,9 @@ _02046844:
 	add r1, r6, #0x0
 	bl FUN_02047FA4
 	ldr r0, [r6, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0x15
-	bl FUN_0202A170
+	bl GameStats_AddSpecial
 	ldr r0, [r4, #0x0]
 	add r0, r0, #0x1
 	str r0, [r4, #0x0]
@@ -710,9 +710,9 @@ _02046ABC:
 	ldr r0, [r5, #0x34]
 	bl FUN_02058780
 	ldr r0, [r5, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0x7
-	bl FUN_0202A0E8
+	bl GameStats_Inc
 	ldr r1, [r4, #0x4]
 	ldr r2, [r4, #0x8]
 	add r0, r6, #0x0
@@ -905,9 +905,9 @@ _02046C68:
 	ldr r0, [r6, #0x34]
 	bl FUN_02058780
 	ldr r0, [r6, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0x7
-	bl FUN_0202A0E8
+	bl GameStats_Inc
 	ldr r1, [r5, #0x4]
 	ldr r2, [r5, #0x8]
 	add r0, r7, #0x0
@@ -1079,9 +1079,9 @@ FUN_02046DB4: ; 0x02046DB4
 	add r1, r4, #0x0
 	bl MOD06_0223CCDC
 	ldr r0, [r5, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0x7
-	bl FUN_0202A0E8
+	bl GameStats_Inc
 	add r0, r4, #0x0
 	bl FUN_020475A0
 	add r5, r0, #0x0
@@ -1131,9 +1131,9 @@ FUN_02046E18: ; 0x02046E18
 	str r0, [r4, r1]
 _02046E60:
 	ldr r0, [r5, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0x7
-	bl FUN_0202A0E8
+	bl GameStats_Inc
 	add r0, r4, #0x0
 	bl FUN_020475A0
 	add r5, r0, #0x0
@@ -1181,9 +1181,9 @@ _02046EC6:
 	ldr r0, [r6, #0x34]
 	bl FUN_02058780
 	ldr r0, [r6, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0x7
-	bl FUN_0202A0E8
+	bl GameStats_Inc
 	ldr r1, [r5, #0x4]
 	ldr r2, [r5, #0x8]
 	add r0, r7, #0x0
@@ -1305,9 +1305,9 @@ FUN_02046FA0: ; 0x02046FA0
 	lsl r0, r0, #0x2
 	str r1, [r4, r0]
 	ldr r0, [r5, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0x7
-	bl FUN_0202A0E8
+	bl GameStats_Inc
 	add r0, r4, #0x0
 	bl FUN_020475A0
 	add r5, r0, #0x0
@@ -1484,9 +1484,9 @@ _0204711A:
 	add r0, r4, #0x0
 	bl EnemyTrainerSet_Init
 	ldr r0, [r7, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0x8
-	bl FUN_0202A0E8
+	bl GameStats_Inc
 	add r0, r4, #0x0
 	bl FUN_020475A0
 	add r5, r0, #0x0
@@ -1702,9 +1702,9 @@ _02047318:
 	cmp r2, #0x1
 	bne _0204732A
 	ldr r0, [r4, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0x8
-	bl FUN_0202A170
+	bl GameStats_AddSpecial
 	pop {r3-r5, pc}
 _0204732A:
 	cmp r2, #0x4
@@ -1721,14 +1721,14 @@ _0204732A:
 	cmp r0, #0x0
 	ldr r0, [r4, #0xc]
 	beq _02047358
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0x9
-	bl FUN_0202A170
+	bl GameStats_AddSpecial
 	pop {r3-r5, pc}
 _02047358:
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0xa
-	bl FUN_0202A170
+	bl GameStats_AddSpecial
 	pop {r3-r5, pc}
 _02047364:
 	mov r3, #0x1
@@ -1741,9 +1741,9 @@ _02047370:
 	cmp r2, #0x1
 	bne _020473C8
 	ldr r0, [r4, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0xb
-	bl FUN_0202A170
+	bl GameStats_AddSpecial
 	pop {r3-r5, pc}
 _02047382:
 	mov r3, #0x20
@@ -1768,14 +1768,14 @@ _02047390:
 	cmp r0, #0x0
 	ldr r0, [r4, #0xc]
 	beq _020473BE
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0x9
-	bl FUN_0202A170
+	bl GameStats_AddSpecial
 	pop {r3-r5, pc}
 _020473BE:
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0xa
-	bl FUN_0202A170
+	bl GameStats_AddSpecial
 _020473C8:
 	pop {r3-r5, pc}
 	.balign 4
diff --git a/arm9/asm/unk_020476CC.s b/arm9/asm/unk_020476CC.s
index cfbae230..5c61e632 100644
--- a/arm9/asm/unk_020476CC.s
+++ b/arm9/asm/unk_020476CC.s
@@ -295,7 +295,7 @@ FUN_02047814: ; 0x02047814
 	sub r1, #0x8
 	str r0, [r4, r1]
 	ldr r0, [r5, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0x51
 	lsl r1, r1, #0x2
 	str r0, [r4, r1]
@@ -572,7 +572,7 @@ FUN_02047A78: ; 0x02047A78
 	lsl r1, r1, #0x2
 	str r0, [r5, r1]
 	ldr r0, [r4, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0x51
 	lsl r1, r1, #0x2
 	str r0, [r5, r1]
@@ -747,7 +747,7 @@ _02047C98:
 	str r0, [r6, r1]
 	ldr r0, [sp, #0x0]
 	ldr r0, [r0, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0x51
 	lsl r1, r1, #0x2
 	str r0, [r6, r1]
@@ -925,7 +925,7 @@ _02047E2C:
 	str r0, [r5, r1]
 	ldr r0, [sp, #0x0]
 	ldr r0, [r0, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0x51
 	lsl r1, r1, #0x2
 	str r0, [r5, r1]
diff --git a/arm9/asm/unk_020484A8.s b/arm9/asm/unk_020484A8.s
index 97e67111..cbf66c82 100644
--- a/arm9/asm/unk_020484A8.s
+++ b/arm9/asm/unk_020484A8.s
@@ -321,9 +321,9 @@ _0204871E:
 	ldr r0, [sp, #0x0]
 	bl PlayerProfile_SetGameClearFlag
 	ldr r0, [r4, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0x2e
-	bl FUN_0202A0E8
+	bl GameStats_Inc
 	ldr r1, _02048760 ; =FUN_020484F8
 	add r0, r7, #0x0
 	add r2, r5, #0x0
diff --git a/arm9/asm/unk_0204B9EC.s b/arm9/asm/unk_0204B9EC.s
index fbf817bd..440b55ae 100644
--- a/arm9/asm/unk_0204B9EC.s
+++ b/arm9/asm/unk_0204B9EC.s
@@ -36,7 +36,7 @@ FUN_0204BA1C: ; 0x0204BA1C
 	push {r3-r5, lr}
 	ldr r0, [r0, #0xc]
 	ldr r4, _0204BA60 ; =UNK_021C5A1C
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	add r5, r0, #0x0
 	bl GF_RTC_DateTimeToSec
 	add r3, r1, #0x0
@@ -62,7 +62,7 @@ _0204BA52:
 	str r0, [r4, #0x48]
 	add r0, r5, #0x0
 	mov r1, #0x11
-	bl FUN_0202A170
+	bl GameStats_AddSpecial
 	pop {r3-r5, pc}
 	nop
 _0204BA60: .word UNK_021C5A1C
diff --git a/arm9/asm/unk_0204CB20.s b/arm9/asm/unk_0204CB20.s
index 87fb50fc..ad7e088e 100644
--- a/arm9/asm/unk_0204CB20.s
+++ b/arm9/asm/unk_0204CB20.s
@@ -2342,9 +2342,9 @@ FUN_0204DCB4: ; 0x0204DCB4
 	ldr r0, [r0, #0x0]
 	ldr r0, [r0, #0x54]
 	ldr r0, [r0, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0x25
-	bl FUN_0202A170
+	bl GameStats_AddSpecial
 _0204DD0C:
 	pop {r3-r5, pc}
 	nop
@@ -4606,9 +4606,9 @@ FUN_0204EDEC: ; 0x0204EDEC
 	beq _0204EE96
 	ldr r0, [r2, #0x54]
 	ldr r0, [r0, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0x1c
-	bl FUN_0202A170
+	bl GameStats_AddSpecial
 	ldr r0, _0204EE98 ; =UNK_021C5A68
 	ldr r1, [r0, #0x0]
 	mov r0, #0xa3
diff --git a/arm9/asm/unk_0204FBA8.s b/arm9/asm/unk_0204FBA8.s
index 16e26d1a..e2fcf579 100644
--- a/arm9/asm/unk_0204FBA8.s
+++ b/arm9/asm/unk_0204FBA8.s
@@ -180,9 +180,9 @@ FUN_0204FCA0: ; 0x0204FCA0
 	ldr r0, [r0, #0x0]
 	ldr r0, [r0, #0x18]
 	ldr r0, [r0, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0x24
-	bl FUN_0202A170
+	bl GameStats_AddSpecial
 	ldr r0, _0204FCD0 ; =UNK_021C5A6C
 	ldr r0, [r0, #0x0]
 	ldr r0, [r0, #0x18]
diff --git a/arm9/asm/unk_020557F4.s b/arm9/asm/unk_020557F4.s
index b3bd5347..e7b734a0 100644
--- a/arm9/asm/unk_020557F4.s
+++ b/arm9/asm/unk_020557F4.s
@@ -3408,9 +3408,9 @@ FUN_020572D4: ; 0x020572D4
 	bl FUN_020553A0
 	bl FUN_02058738
 	ldr r0, [r0, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0x5
-	bl FUN_0202A0E8
+	bl GameStats_Inc
 	pop {r3, pc}
 
 	thumb_func_start FUN_020572EC
diff --git a/arm9/asm/unk_02064E90.s b/arm9/asm/unk_02064E90.s
index ac7baa5d..2b45a359 100644
--- a/arm9/asm/unk_02064E90.s
+++ b/arm9/asm/unk_02064E90.s
@@ -19,7 +19,7 @@ FUN_02064E90: ; 0x02064E90
 	bl Sav2_PlayerData_GetProfileAddr
 	add r7, r0, #0x0
 	ldr r0, [sp, #0x20]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	add r4, r0, #0x0
 	ldr r0, [sp, #0x1c]
 	strb r0, [r5, #0x5]
@@ -56,7 +56,7 @@ FUN_02064E90: ; 0x02064E90
 	bl Pokedex_GetSinnohDexFlag
 	str r0, [sp, #0x3c]
 	add r0, r4, #0x0
-	bl FUN_0202A1B8
+	bl GameStats_GetStat0
 	ldr r1, [sp, #0x38]
 	ldr r2, [sp, #0x30]
 	str r1, [sp, #0x0]
@@ -100,27 +100,27 @@ FUN_02064E90: ; 0x02064E90
 	str r0, [sp, #0x44]
 	add r0, r4, #0x0
 	mov r1, #0x20
-	bl FUN_0202A150
+	bl GameStats_GetCapped
 	str r0, [sp, #0x48]
 	add r0, r4, #0x0
 	mov r1, #0x19
-	bl FUN_0202A150
+	bl GameStats_GetCapped
 	str r0, [sp, #0x4c]
 	add r0, r4, #0x0
 	mov r1, #0x14
-	bl FUN_0202A150
+	bl GameStats_GetCapped
 	str r0, [sp, #0x50]
 	add r0, r4, #0x0
 	mov r1, #0x18
-	bl FUN_0202A150
+	bl GameStats_GetCapped
 	str r0, [sp, #0x54]
 	add r0, r4, #0x0
 	mov r1, #0x40
-	bl FUN_0202A150
+	bl GameStats_GetCapped
 	str r0, [sp, #0x58]
 	add r0, r4, #0x0
 	mov r1, #0x13
-	bl FUN_0202A150
+	bl GameStats_GetCapped
 	ldr r1, [sp, #0x58]
 	add r1, r1, r0
 	ldr r0, [sp, #0x54]
@@ -132,27 +132,27 @@ FUN_02064E90: ; 0x02064E90
 	str r0, [sp, #0x5c]
 	add r0, r4, #0x0
 	mov r1, #0x15
-	bl FUN_0202A150
+	bl GameStats_GetCapped
 	str r0, [sp, #0x60]
 	add r0, r4, #0x0
 	mov r1, #0x1a
-	bl FUN_0202A150
+	bl GameStats_GetCapped
 	str r0, [sp, #0x64]
 	add r0, r4, #0x0
 	mov r1, #0x16
-	bl FUN_0202A150
+	bl GameStats_GetCapped
 	str r0, [sp, #0x68]
 	add r0, r4, #0x0
 	mov r1, #0x1b
-	bl FUN_0202A150
+	bl GameStats_GetCapped
 	str r0, [sp, #0x6c]
 	add r0, r4, #0x0
 	mov r1, #0x13
-	bl FUN_0202A150
+	bl GameStats_GetCapped
 	str r0, [sp, #0x70]
 	add r0, r4, #0x0
 	mov r1, #0x18
-	bl FUN_0202A150
+	bl GameStats_GetCapped
 	add r4, r0, #0x0
 	ldr r0, [sp, #0x44]
 	bl FUN_02029AC8
@@ -220,7 +220,7 @@ FUN_02065078: ; 0x02065078
 	push {r3-r7, lr}
 	bl ScriptEnvironment_GetSav2Ptr
 	add r7, r0, #0x0
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	add r6, r0, #0x0
 	add r0, r7, #0x0
 	bl SavArray_Flags_get
@@ -248,27 +248,27 @@ _020650A8:
 _020650BC:
 	add r0, r6, #0x0
 	mov r1, #0x35
-	bl FUN_0202A150
+	bl GameStats_GetCapped
 	cmp r0, #0x64
 	bhs _020650F8
 	add r0, r6, #0x0
 	mov r1, #0x37
-	bl FUN_0202A150
+	bl GameStats_GetCapped
 	cmp r0, #0x64
 	bhs _020650F8
 	add r0, r6, #0x0
 	mov r1, #0x39
-	bl FUN_0202A150
+	bl GameStats_GetCapped
 	cmp r0, #0x64
 	bhs _020650F8
 	add r0, r6, #0x0
 	mov r1, #0x3b
-	bl FUN_0202A150
+	bl GameStats_GetCapped
 	cmp r0, #0x64
 	bhs _020650F8
 	add r0, r6, #0x0
 	mov r1, #0x3d
-	bl FUN_0202A150
+	bl GameStats_GetCapped
 	cmp r0, #0x64
 	blo _020650FE
 _020650F8:
diff --git a/arm9/asm/unk_0206C700.s b/arm9/asm/unk_0206C700.s
index 345ecae1..ec33e447 100644
--- a/arm9/asm/unk_0206C700.s
+++ b/arm9/asm/unk_0206C700.s
@@ -1099,10 +1099,10 @@ _0206CFFA:
 	bl Pokedex_SetMonCaughtFlag
 	ldr r0, [r4, #0x50]
 	mov r1, #0xc
-	bl FUN_0202A0E8
+	bl GameStats_Inc
 	ldr r0, [r4, #0x50]
 	mov r1, #0x16
-	bl FUN_0202A170
+	bl GameStats_AddSpecial
 	ldr r0, [r4, #0x28]
 	bl FUN_020690E4
 	add r1, r0, #0x0
@@ -2201,10 +2201,10 @@ _0206D8EA:
 	bl Pokedex_SetMonCaughtFlag
 	ldr r0, [r4, #0x50]
 	mov r1, #0xc
-	bl FUN_0202A0E8
+	bl GameStats_Inc
 	ldr r0, [r4, #0x50]
 	mov r1, #0x16
-	bl FUN_0202A170
+	bl GameStats_AddSpecial
 	add r0, r5, #0x0
 	bl FUN_020690E4
 	add r1, r0, #0x0
diff --git a/arm9/asm/unk_02080C38.s b/arm9/asm/unk_02080C38.s
index e8299712..c3747143 100644
--- a/arm9/asm/unk_02080C38.s
+++ b/arm9/asm/unk_02080C38.s
@@ -3623,26 +3623,26 @@ _020826EA:
 	bl FUN_02060F10
 	ldr r0, _02082848 ; =0x0000198C
 	ldr r0, [r4, r0]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0x3f
 	add r6, r0, #0x0
-	bl FUN_0202A0E8
+	bl GameStats_Inc
 	add r0, r4, #0x0
 	bl FUN_0208217C
 	cmp r0, #0x0
 	bne _02082740
 	add r0, r6, #0x0
 	mov r1, #0x41
-	bl FUN_0202A0E8
+	bl GameStats_Inc
 	add r0, r6, #0x0
 	mov r1, #0xd
-	bl FUN_0202A170
+	bl GameStats_AddSpecial
 _02082740:
 	cmp r5, #0x1
 	bne _0208274C
 	add r0, r6, #0x0
 	mov r1, #0x43
-	bl FUN_0202A0E8
+	bl GameStats_Inc
 _0208274C:
 	ldr r0, _02082848 ; =0x0000198C
 	ldr r0, [r4, r0]
@@ -3679,20 +3679,20 @@ _02082774:
 	bl FUN_0202C108
 	ldr r0, _02082848 ; =0x0000198C
 	ldr r0, [r4, r0]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0x40
 	add r5, r0, #0x0
-	bl FUN_0202A0E8
+	bl GameStats_Inc
 	add r0, r4, #0x0
 	bl FUN_0208217C
 	cmp r0, #0x0
 	bne _020827BA
 	add r0, r5, #0x0
 	mov r1, #0x42
-	bl FUN_0202A0E8
+	bl GameStats_Inc
 	add r0, r5, #0x0
 	mov r1, #0x13
-	bl FUN_0202A170
+	bl GameStats_AddSpecial
 _020827BA:
 	ldr r1, _02082854 ; =0x00000123
 	mov r0, #0xc
diff --git a/arm9/asm/unk_020854E0.s b/arm9/asm/unk_020854E0.s
index 4c77e4ac..cf9d8236 100644
--- a/arm9/asm/unk_020854E0.s
+++ b/arm9/asm/unk_020854E0.s
@@ -531,9 +531,9 @@ _020858D2:
 	ldr r0, [r6, #0x14]
 	bl FUN_020857A4
 	ldr r0, [r6, #0x10]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0x2
-	bl FUN_0202A170
+	bl GameStats_AddSpecial
 	mov r0, #0x1
 	str r0, [r6, #0x4]
 	b _020858FC
diff --git a/arm9/global.inc b/arm9/global.inc
index fce4beab..7c369152 100644
--- a/arm9/global.inc
+++ b/arm9/global.inc
@@ -1987,17 +1987,17 @@
 .extern Chatot_Decode
 .extern Chatot_Encode
 .extern Chatot_copy
-.extern FUN_02029FB0
-.extern FUN_02029FB8
-.extern FUN_02029FC8
-.extern FUN_0202A07C
-.extern FUN_0202A0A8
-.extern FUN_0202A0E8
-.extern FUN_0202A11C
-.extern FUN_0202A150
-.extern FUN_0202A170
-.extern FUN_0202A1B8
-.extern FUN_0202A1C4
+.extern Sav2_GameStats_sizeof
+.extern Sav2_GameStats_init
+.extern Sav2_GameStats_get
+.extern GameStats_SetCapped
+.extern GameStats_UpdateBounded
+.extern GameStats_Inc
+.extern GameStats_Add
+.extern GameStats_GetCapped
+.extern GameStats_AddSpecial
+.extern GameStats_GetStat0
+.extern GameStats_IncSpeciesCaught
 .extern SaveStruct23_Substruct4_Substruct1_sizeof
 .extern SaveStruct23_Substruct1_Init
 .extern SaveStruct23_Substruct2_Init
diff --git a/arm9/modules/05/asm/mod05_021D80E8.s b/arm9/modules/05/asm/mod05_021D80E8.s
index 7af8c0ec..26329d91 100644
--- a/arm9/modules/05/asm/mod05_021D80E8.s
+++ b/arm9/modules/05/asm/mod05_021D80E8.s
@@ -1772,13 +1772,13 @@ MOD05_021D8F38: ; 0x021D8F38
 	cmp r0, #1
 	bne _021D8F7A
 	ldr r0, [r4, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	add r5, r0, #0
 	mov r1, #0xb
-	bl FUN_0202A0E8
+	bl GameStats_Inc
 	add r0, r5, #0
 	mov r1, #0xf
-	bl FUN_0202A170
+	bl GameStats_AddSpecial
 	ldr r1, _021D8F80 ; =0x000007EF
 	add r0, r4, #0
 	mov r2, #0
diff --git a/arm9/modules/05/asm/mod05_021EC458.s b/arm9/modules/05/asm/mod05_021EC458.s
index 216dfbb7..d1b57a92 100644
--- a/arm9/modules/05/asm/mod05_021EC458.s
+++ b/arm9/modules/05/asm/mod05_021EC458.s
@@ -150,9 +150,9 @@ MOD05_021EC57C: ; 0x021EC57C
 	add r0, r7, #0
 	add r6, r1, #0
 	add r4, r2, #0
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0x28
-	bl FUN_0202A0E8
+	bl GameStats_Inc
 	add r0, r4, #0
 	bl MOD05_021EC49C
 	add r1, r0, #0
diff --git a/arm9/modules/05/asm/mod05_021F5C44.s b/arm9/modules/05/asm/mod05_021F5C44.s
index 5bf30612..494fc941 100644
--- a/arm9/modules/05/asm/mod05_021F5C44.s
+++ b/arm9/modules/05/asm/mod05_021F5C44.s
@@ -86,9 +86,9 @@ _021F5CBA:
 	lsr r2, r2, #0x10
 	bl FUN_02061208
 	ldr r0, [r4, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0xa
-	bl FUN_0202A0E8
+	bl GameStats_Inc
 	ldr r2, [r5, #0x10]
 	add r0, r4, #0
 	add r1, r6, #0
@@ -439,9 +439,9 @@ MOD05_021F5F5C: ; 0x021F5F5C
 	str r0, [r4, #0xc]
 	ldr r0, [r4, #0x20]
 	ldr r0, [r0, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0x49
-	bl FUN_0202A0E8
+	bl GameStats_Inc
 	ldr r0, [r4, #0x1c]
 	bl MOD05_021F61B0
 	add r2, r0, #0
diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s
index 68ab4fbd..3a8eb17a 100644
--- a/arm9/modules/06/asm/module_06.s
+++ b/arm9/modules/06/asm/module_06.s
@@ -8134,7 +8134,7 @@ MOD06_0223D3D0: ; 0x0223D3D0
 	lsl r1, r1, #2
 	str r0, [r4, r1]
 	ldr r0, [r5, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0x87
 	lsl r1, r1, #2
 	str r0, [r4, r1]
@@ -10549,7 +10549,7 @@ _0223E7F6:
 	ldrsh r2, [r4, r3]
 	mov r1, #0x23
 	mul r2, r5
-	bl FUN_0202A11C
+	bl GameStats_Add
 	add r0, r4, #0
 	mov r1, #1
 	bl MOD06_0223DED0
@@ -19952,10 +19952,10 @@ MOD06_02243408: ; 0x02243408
 	mov r0, #0
 	pop {r4, pc}
 _02243414:
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	lsl r1, r4, #1
 	add r1, #0x36
-	bl FUN_0202A150
+	bl GameStats_GetCapped
 	lsl r0, r0, #0x10
 	lsr r0, r0, #0x10
 	pop {r4, pc}
@@ -20218,7 +20218,7 @@ _0224362A:
 	cmp r0, #5
 	beq _0224367E
 	add r0, r6, #0
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	ldrb r1, [r4, #0xf]
 	add r5, r0, #0
 	ldr r0, [r4, #0x74]
@@ -20234,12 +20234,12 @@ _0224362A:
 	add r0, r5, #0
 	lsl r1, r1, #1
 	add r1, #0x36
-	bl FUN_0202A150
+	bl GameStats_GetCapped
 	strh r0, [r4, #0x1a]
 _02243668:
 	add r0, r5, #0
 	mov r1, #0x1d
-	bl FUN_0202A150
+	bl GameStats_GetCapped
 	str r0, [r4, #0x20]
 	ldrb r1, [r4, #0xf]
 	ldr r0, [r4, #0x74]
@@ -20729,7 +20729,7 @@ MOD06_022439F8: ; 0x022439F8
 	ldr r0, [r1, #0xc]
 	str r1, [sp]
 	str r0, [sp, #8]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	ldrb r1, [r5, #0xf]
 	str r0, [sp, #4]
 	cmp r1, #5
@@ -20737,7 +20737,7 @@ MOD06_022439F8: ; 0x022439F8
 	lsl r6, r1, #1
 	add r6, #0x35
 	add r1, r6, #0
-	bl FUN_0202A150
+	bl GameStats_GetCapped
 	lsl r0, r0, #0x10
 	lsr r7, r0, #0x10
 	ldrh r3, [r5, #0x1a]
@@ -20745,7 +20745,7 @@ MOD06_022439F8: ; 0x022439F8
 	ldr r0, [sp, #4]
 	add r1, r6, #0
 	add r2, r3, r2
-	bl FUN_0202A0A8
+	bl GameStats_UpdateBounded
 	lsl r0, r0, #0x10
 	lsr r4, r0, #0x10
 	cmp r4, #1
@@ -20778,13 +20778,13 @@ _02243A52:
 	ldrb r2, [r5, #0xd]
 	ldr r0, [sp, #4]
 	add r1, r6, #1
-	bl FUN_0202A11C
+	bl GameStats_Add
 	b _02243A7E
 _02243A74:
 	ldrb r2, [r5, #0xd]
 	ldr r0, [sp, #4]
 	add r1, r6, #1
-	bl FUN_0202A07C
+	bl GameStats_SetCapped
 _02243A7E:
 	ldrb r1, [r5, #0xf]
 	add r4, r0, #0
@@ -20797,16 +20797,16 @@ _02243A7E:
 	ldrb r2, [r5, #0xd]
 	ldr r0, [sp, #4]
 	mov r1, #0x1d
-	bl FUN_0202A11C
+	bl GameStats_Add
 	ldrb r1, [r5, #0xf]
 	ldr r0, [r5, #0x74]
 	mov r2, #2
 	bl SaveStruct23_Substruct2_SetField_0xC
 	ldr r0, [sp, #8]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0xf
 	mov r2, #1
-	bl FUN_0202A11C
+	bl GameStats_Add
 	add r0, r5, #0
 	bl MOD06_0224403C
 	ldr r0, _02243AD4 ; =0x0000270F
@@ -20839,7 +20839,7 @@ MOD06_02243AD8: ; 0x02243AD8
 	cmp r0, #5
 	beq _02243BA2
 	ldr r0, [sp, #4]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	ldrb r1, [r5, #0xf]
 	add r6, r0, #0
 	ldr r0, [r5, #0x74]
@@ -20856,14 +20856,14 @@ MOD06_02243AD8: ; 0x02243AD8
 	add r0, r6, #0
 	add r1, r4, #1
 	mov r2, #7
-	bl FUN_0202A11C
+	bl GameStats_Add
 	str r0, [sp]
 	b _02243B26
 _02243B1A:
 	add r0, r6, #0
 	add r1, r4, #1
 	mov r2, #7
-	bl FUN_0202A07C
+	bl GameStats_SetCapped
 	str r0, [sp]
 _02243B26:
 	ldrb r1, [r5, #0xf]
@@ -20875,15 +20875,15 @@ _02243B26:
 	bl SaveStruct23_Substruct2_SetFlag
 	add r0, r6, #0
 	add r1, r4, #0
-	bl FUN_0202A150
+	bl GameStats_GetCapped
 	ldr r2, [sp]
 	add r0, r6, #0
 	add r1, r4, #0
-	bl FUN_0202A0A8
+	bl GameStats_UpdateBounded
 	add r0, r6, #0
 	mov r1, #0x1d
 	mov r2, #7
-	bl FUN_0202A11C
+	bl GameStats_Add
 	ldrb r1, [r5, #0xf]
 	ldr r0, [r5, #0x74]
 	mov r2, #3
@@ -20891,10 +20891,10 @@ _02243B26:
 	add r0, r6, #0
 	mov r1, #0xf
 	mov r2, #1
-	bl FUN_0202A11C
+	bl GameStats_Add
 	add r0, r6, #0
 	mov r1, #0xe
-	bl FUN_0202A170
+	bl GameStats_AddSpecial
 	add r0, r5, #0
 	bl MOD06_0224403C
 	ldr r3, [sp]
diff --git a/arm9/modules/11/asm/module_11_thumb1.s b/arm9/modules/11/asm/module_11_thumb1.s
index 72e5cdbb..75d66945 100644
--- a/arm9/modules/11/asm/module_11_thumb1.s
+++ b/arm9/modules/11/asm/module_11_thumb1.s
@@ -69,14 +69,14 @@ _0222D620:
 	lsl r0, r0, #2
 	ldr r0, [r5, r0]
 	mov r1, #0x14
-	bl FUN_0202A0E8
+	bl GameStats_Inc
 	b _0222D654
 _0222D648:
 	mov r0, #0x51
 	lsl r0, r0, #2
 	ldr r0, [r5, r0]
 	mov r1, #0x19
-	bl FUN_0202A0E8
+	bl GameStats_Inc
 _0222D654:
 	mov r0, #2
 	str r0, [r4]
diff --git a/arm9/modules/11/asm/module_11_thumb2.s b/arm9/modules/11/asm/module_11_thumb2.s
index 0d0c4341..30ec5c08 100644
--- a/arm9/modules/11/asm/module_11_thumb2.s
+++ b/arm9/modules/11/asm/module_11_thumb2.s
@@ -1262,14 +1262,14 @@ _0222FCEA:
 	lsl r0, r0, #2
 	ldr r0, [r7, r0]
 	mov r1, #0x15
-	bl FUN_0202A0E8
+	bl GameStats_Inc
 	b _0222FD54
 _0222FD00:
 	mov r0, #0x51
 	lsl r0, r0, #2
 	ldr r0, [r7, r0]
 	mov r1, #0x1a
-	bl FUN_0202A0E8
+	bl GameStats_Inc
 	b _0222FD54
 _0222FD0E:
 	bl FUN_02033590
@@ -1279,14 +1279,14 @@ _0222FD0E:
 	lsl r0, r0, #2
 	ldr r0, [r7, r0]
 	mov r1, #0x16
-	bl FUN_0202A0E8
+	bl GameStats_Inc
 	b _0222FD54
 _0222FD24:
 	mov r0, #0x51
 	lsl r0, r0, #2
 	ldr r0, [r7, r0]
 	mov r1, #0x1b
-	bl FUN_0202A0E8
+	bl GameStats_Inc
 	b _0222FD54
 _0222FD32:
 	bl FUN_02033590
@@ -1296,14 +1296,14 @@ _0222FD32:
 	lsl r0, r0, #2
 	ldr r0, [r7, r0]
 	mov r1, #0x17
-	bl FUN_0202A0E8
+	bl GameStats_Inc
 	b _0222FD54
 _0222FD48:
 	mov r0, #0x51
 	lsl r0, r0, #2
 	ldr r0, [r7, r0]
 	mov r1, #0x1c
-	bl FUN_0202A0E8
+	bl GameStats_Inc
 _0222FD54:
 	ldr r1, [r7]
 	mov r0, #8
@@ -4220,7 +4220,7 @@ MOD11_0223128C: ; 0x0223128C
 	ldr r0, [r0, r2]
 	bx r3
 	nop
-_02231298: .word FUN_0202A0E8
+_02231298: .word GameStats_Inc
 
 	thumb_func_start MOD11_0223129C
 MOD11_0223129C: ; 0x0223129C
@@ -4231,7 +4231,7 @@ MOD11_0223129C: ; 0x0223129C
 	mov r1, #0x16
 	bx r3
 	.align 2, 0
-_022312A8: .word FUN_0202A170
+_022312A8: .word GameStats_AddSpecial
 
 	thumb_func_start MOD11_022312AC
 MOD11_022312AC: ; 0x022312AC
diff --git a/arm9/modules/17/asm/module_17.s b/arm9/modules/17/asm/module_17.s
index 485836b0..acc5c84e 100644
--- a/arm9/modules/17/asm/module_17.s
+++ b/arm9/modules/17/asm/module_17.s
@@ -2444,7 +2444,7 @@ MOD17_021D8738: ; 0x021D8738
 	bne _021D8768
 	ldr r0, [r5, #0x10]
 	mov r1, #7
-	bl FUN_0202A170
+	bl GameStats_AddSpecial
 	mov r1, #0xfa
 	lsl r1, r1, #2
 	ldr r0, [r5, #4]
diff --git a/arm9/modules/18/asm/module_18.s b/arm9/modules/18/asm/module_18.s
index abced62a..5af32359 100644
--- a/arm9/modules/18/asm/module_18.s
+++ b/arm9/modules/18/asm/module_18.s
@@ -5702,9 +5702,9 @@ _0223C2D0:
 	ldr r0, [r0]
 	ldr r0, [r0]
 	ldr r0, [r0, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0x1e
-	bl FUN_0202A170
+	bl GameStats_AddSpecial
 	mov r0, #0xe
 	str r0, [r5]
 	mov r0, #0x19
@@ -15138,9 +15138,9 @@ MOD18_02240A44: ; 0x02240A44
 	ldr r0, [r0, #4]
 	ldr r0, [r0, #0x40]
 	ldr r0, [r0, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0x22
-	bl FUN_0202A170
+	bl GameStats_AddSpecial
 	bl FUN_0204F7E4
 	bl MOD18_0223D638
 	add r5, r0, #0
@@ -24150,8 +24150,8 @@ MOD18_02245054: ; 0x02245054
 	bl FUN_02026CC0
 	add r6, r0, #0
 	ldr r0, [r5, #0xc]
-	bl FUN_02029FC8
-	bl FUN_0202A1B8
+	bl Sav2_GameStats_get
+	bl GameStats_GetStat0
 	add r1, r0, #0
 	add r0, r6, #0
 	bl FUN_020268E8
@@ -27797,9 +27797,9 @@ _02246D5C:
 	ldr r0, [r0]
 	ldr r0, [r0]
 	ldr r0, [r0, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0x23
-	bl FUN_0202A170
+	bl GameStats_AddSpecial
 _02246D92:
 	pop {r3, r4, r5, r6, r7, pc}
 	.align 2, 0
@@ -30426,9 +30426,9 @@ _022481A6:
 _022481D8:
 	ldr r0, [r4, #8]
 	ldr r0, [r0, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0x20
-	bl FUN_0202A170
+	bl GameStats_AddSpecial
 	bl MOD18_0224D784
 	add r0, r4, #0
 	mov r1, #9
@@ -30676,9 +30676,9 @@ _022483BC:
 	bl FUN_0205F730
 	ldr r0, [r4, #8]
 	ldr r0, [r0, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0x1f
-	bl FUN_0202A170
+	bl GameStats_AddSpecial
 	add r0, r4, #0
 	mov r1, #0x19
 	add r0, #0x37
@@ -30843,9 +30843,9 @@ _02248542:
 	bne _022485F6
 	ldr r0, [r4, #8]
 	ldr r0, [r0, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #0x21
-	bl FUN_0202A170
+	bl GameStats_AddSpecial
 	add r0, r4, #0
 	mov r1, #0x8e
 	bl MOD18_022479E4
@@ -40880,8 +40880,8 @@ MOD18_0224D698: ; 0x0224D698
 	ldr r0, _0224D6FC ; =0x022513FC
 	ldr r0, [r0]
 	ldr r0, [r0, #8]
-	bl FUN_02029FC8
-	bl FUN_0202A1B8
+	bl Sav2_GameStats_get
+	bl GameStats_GetStat0
 	add r6, r0, #0
 	mov r0, #4
 	add r1, r4, #1
@@ -40925,8 +40925,8 @@ MOD18_0224D704: ; 0x0224D704
 	ldr r0, _0224D72C ; =0x022513FC
 	ldr r0, [r0]
 	ldr r0, [r0, #8]
-	bl FUN_02029FC8
-	bl FUN_0202A1B8
+	bl Sav2_GameStats_get
+	bl GameStats_GetStat0
 	add r1, r0, #0
 	ldr r0, _0224D730 ; =0x000F423F
 	cmp r1, r0
diff --git a/arm9/modules/54/asm/module_54.s b/arm9/modules/54/asm/module_54.s
index c91a960a..20fa5a0e 100644
--- a/arm9/modules/54/asm/module_54.s
+++ b/arm9/modules/54/asm/module_54.s
@@ -1981,7 +1981,7 @@ MOD54_021D84D4: ; 0x021D84D4
 	ldr r0, [r5, #8]
 	mov r1, #0x14
 	ldr r0, [r0, #0xc]
-	bl FUN_0202A170
+	bl GameStats_AddSpecial
 	mov r0, #0x3a
 	lsl r0, r0, #4
 	add r0, r5, r0
diff --git a/arm9/modules/58/asm/module_58.s b/arm9/modules/58/asm/module_58.s
index 88628998..2e64865b 100644
--- a/arm9/modules/58/asm/module_58.s
+++ b/arm9/modules/58/asm/module_58.s
@@ -88,7 +88,7 @@ _021D9A36:
 	str r0, [r4, r1]
 	add r0, r6, #0
 	bl OverlayManager_GetField18
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	str r0, [r4, #8]
 	add r0, r6, #0
 	bl OverlayManager_GetField18
@@ -1562,7 +1562,7 @@ MOD58_021DA6F4: ; 0x021DA6F4
 _021DA70E:
 	ldr r0, [r5, #8]
 	mov r1, #4
-	bl FUN_0202A170
+	bl GameStats_AddSpecial
 	mov r0, #0xb5
 	lsl r0, r0, #2
 	add r0, r5, r0
diff --git a/arm9/modules/62/asm/module_62.s b/arm9/modules/62/asm/module_62.s
index 722bfcff..61e5d735 100644
--- a/arm9/modules/62/asm/module_62.s
+++ b/arm9/modules/62/asm/module_62.s
@@ -6497,9 +6497,9 @@ _02230860:
 	bl MOD62_0222EC28
 	ldr r0, [r4]
 	ldr r0, [r0, #0x28]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	mov r1, #6
-	bl FUN_0202A170
+	bl GameStats_AddSpecial
 	mov r0, #0xf1
 	lsl r0, r0, #2
 	ldr r1, [r4, r0]
diff --git a/arm9/modules/71/asm/module_71.s b/arm9/modules/71/asm/module_71.s
index 9499d99e..d2f3d97d 100644
--- a/arm9/modules/71/asm/module_71.s
+++ b/arm9/modules/71/asm/module_71.s
@@ -6402,7 +6402,7 @@ _02230A98:
 	bl MOD71_02230AE4
 	ldr r0, [r5, #0x20]
 	mov r1, #0x13
-	bl FUN_0202A0E8
+	bl GameStats_Inc
 	add r0, r7, #0
 	bl FreeToHeap
 	add r0, r4, #0
diff --git a/arm9/modules/73/asm/module_73.s b/arm9/modules/73/asm/module_73.s
index 4fe0dba7..4c87c8a7 100644
--- a/arm9/modules/73/asm/module_73.s
+++ b/arm9/modules/73/asm/module_73.s
@@ -829,17 +829,17 @@ _021D7B98:
 _021D7BA8:
 	ldr r0, [r6, #0x10]
 	ldr r0, [r0, #0xc]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	ldr r1, _021D7C90 ; =0x00001428
 	ldr r1, [r4, r1]
 	cmp r1, #0
 	bne _021D7BC0
 	mov r1, #0xc
-	bl FUN_0202A170
+	bl GameStats_AddSpecial
 	b _021D7BC6
 _021D7BC0:
 	mov r1, #0x12
-	bl FUN_0202A170
+	bl GameStats_AddSpecial
 _021D7BC6:
 	ldr r0, _021D7C94 ; =0x00001424
 	ldr r0, [r4, r0]
diff --git a/arm9/modules/74/asm/module_74.s b/arm9/modules/74/asm/module_74.s
index 26a78f49..17d727b7 100644
--- a/arm9/modules/74/asm/module_74.s
+++ b/arm9/modules/74/asm/module_74.s
@@ -32,7 +32,7 @@ MOD74_021D74E0: ; 0x021D74E0
 	bl Sav2_PlayerData_GetOptionsAddr
 	str r0, [r4, #0x18]
 	ldr r0, [r5]
-	bl FUN_02029FC8
+	bl Sav2_GameStats_get
 	str r0, [r4, #0x1c]
 	ldr r0, [r5]
 	bl SaveStruct23_GetSubstruct2
@@ -953,13 +953,13 @@ MOD74_021D7C10: ; 0x021D7C10
 	ldr r0, [r5, #0x1c]
 	add r1, r7, #0
 	add r6, r2, #0
-	bl FUN_0202A150
+	bl GameStats_GetCapped
 	lsl r0, r0, #0x10
 	lsr r0, r0, #0x10
 	str r0, [sp, #0x10]
 	ldr r0, [r5, #0x1c]
 	add r1, r7, #1
-	bl FUN_0202A150
+	bl GameStats_GetCapped
 	lsl r0, r0, #0x10
 	add r6, #8
 	lsr r7, r0, #0x10
diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s
index 5ffe3380..5eac6fd5 100644
--- a/arm9/modules/80/asm/module_80.s
+++ b/arm9/modules/80/asm/module_80.s
@@ -15023,7 +15023,7 @@ _02234D80:
 	ldr r0, [r4]
 	mov r1, #0x19
 	ldr r0, [r0, #0x28]
-	bl FUN_0202A170
+	bl GameStats_AddSpecial
 	ldr r0, [r4]
 	ldr r1, _02234DF4 ; =0x000009F4
 	ldr r0, [r0, #0x2c]
@@ -15032,7 +15032,7 @@ _02234D80:
 	ldr r0, [r4]
 	mov r1, #0x18
 	ldr r0, [r0, #0x28]
-	bl FUN_0202A0E8
+	bl GameStats_Inc
 	b _02234DEE
 _02234DCA:
 	str r0, [r4, #0x3c]
@@ -15481,7 +15481,7 @@ MOD80_022350F0: ; 0x022350F0
 	ldr r0, [r4]
 	mov r1, #0x19
 	ldr r0, [r0, #0x28]
-	bl FUN_0202A170
+	bl GameStats_AddSpecial
 	ldr r0, [r4]
 	add r1, r4, #0
 	ldr r0, [r0, #0x2c]
@@ -15490,7 +15490,7 @@ MOD80_022350F0: ; 0x022350F0
 	ldr r0, [r4]
 	mov r1, #0x18
 	ldr r0, [r0, #0x28]
-	bl FUN_0202A0E8
+	bl GameStats_Inc
 	ldr r0, [r4]
 	mov r1, #0
 	ldr r0, [r0]
diff --git a/arm9/modules/85/asm/module_85.s b/arm9/modules/85/asm/module_85.s
index 2733fd96..d85b1a11 100644
--- a/arm9/modules/85/asm/module_85.s
+++ b/arm9/modules/85/asm/module_85.s
@@ -221,7 +221,7 @@ _021D76AA:
 	beq _021D76C6
 	ldr r2, [r2, #0xc]
 	mov r1, #0xe
-	bl FUN_0202A11C
+	bl GameStats_Add
 _021D76C6:
 	pop {r3, pc}
 	.align 2, 0
diff --git a/arm9/src/save_arrays.c b/arm9/src/save_arrays.c
index 1969e3f1..3ba70e39 100644
--- a/arm9/src/save_arrays.c
+++ b/arm9/src/save_arrays.c
@@ -27,7 +27,7 @@ extern u32 FUN_02026FD8(void);
 extern u32 FUN_02028054(void);
 extern u32 FUN_02028980(void);
 extern u32 FUN_02029A84(void);
-extern u32 FUN_02029FB0(void);
+extern u32 Sav2_GameStats_sizeof(void);
 extern u32 Sav2_Chatot_sizeof(void);
 extern u32 FUN_0202A8F4(void);
 extern u32 FUN_0202A924(void);
@@ -47,7 +47,7 @@ extern void FUN_02026F60(void *);
 extern void FUN_0202805C(void *);
 extern void FUN_02028994(void *);
 extern void FUN_02029A8C(void *);
-extern void FUN_02029FB8(void *);
+extern void Sav2_GameStats_init(void *);
 extern void FUN_0202A8F8(void *);
 extern void FUN_0202A92C(void *);
 extern void FUN_0202ABCC(void *);
@@ -74,27 +74,27 @@ const struct SaveChunkHeader UNK_020EE700[] = {
     {  7, 0, (SAVSIZEFN)Sav2_Pokedex_sizeof, (SAVINITFN)Sav2_Pokedex_init },
     {  8, 0, (SAVSIZEFN)Sav2_DayCare_sizeof, (SAVINITFN)Sav2_DayCare_init },
     {  9, 0, (SAVSIZEFN)FUN_020254B8, (SAVINITFN)FUN_020254CC },
-    { 10, 0, (SAVSIZEFN)FUN_02024E64, (SAVINITFN)FUN_02024E6C },
-    { 11, 0, (SAVSIZEFN)FUN_02034D80, (SAVINITFN)FUN_02034D88 },
-    { 12, 0, (SAVSIZEFN)FUN_02025954, (SAVINITFN)FUN_0202597C },
-    { 13, 0, (SAVSIZEFN)FUN_02023AC8, (SAVINITFN)FUN_02023AD8 },
-    { 14, 0, (SAVSIZEFN)FUN_02026FD8, (SAVINITFN)FUN_02026F60 },
-    { 15, 0, (SAVSIZEFN)Sav2_Mailbox_sizeof, (SAVINITFN)Sav2_Mailbox_init },
-    { 16, 0, (SAVSIZEFN)FUN_02028054, (SAVINITFN)FUN_0202805C },
-    { 17, 0, (SAVSIZEFN)FUN_020286F8, (SAVINITFN)FUN_02028724 },
-    { 18, 0, (SAVSIZEFN)FUN_02028980, (SAVINITFN)FUN_02028994 },
-    { 19, 0, (SAVSIZEFN)FUN_02029A84, (SAVINITFN)FUN_02029A8C },
-    { 20, 0, (SAVSIZEFN)FUN_02029FB0, (SAVINITFN)FUN_02029FB8 },
-    { 21, 0, (SAVSIZEFN)Sav2_SealCase_sizeof, (SAVINITFN)Sav2_SealCase_init },
-    { 22, 0, (SAVSIZEFN)Sav2_Chatot_sizeof, (SAVINITFN)Sav2_Chatot_init },
-    { 23, 0, (SAVSIZEFN)SaveStruct23_sizeof, (SAVINITFN)SaveStruct23_Init },
-    { 24, 0, (SAVSIZEFN)FUN_0202A8F4, (SAVINITFN)FUN_0202A8F8 },
-    { 25, 0, (SAVSIZEFN)FUN_0202A924, (SAVINITFN)FUN_0202A92C },
-    { 26, 0, (SAVSIZEFN)FUN_0202ABC8, (SAVINITFN)FUN_0202ABCC },
-    { 27, 0, (SAVSIZEFN)FUN_0202B374, (SAVINITFN)FUN_0202B37C },
-    { 28, 0, (SAVSIZEFN)FUN_0202B8B0, (SAVINITFN)FUN_0202B8B8 },
-    { 29, 0, (SAVSIZEFN)FUN_020281E0, (SAVINITFN)FUN_020281E8 },
-    { 30, 0, (SAVSIZEFN)FUN_02029AE0, (SAVINITFN)FUN_02029AE8 },
+    { 10, 0, (SAVSIZEFN)FUN_02024E64,          (SAVINITFN)FUN_02024E6C },
+    { 11, 0, (SAVSIZEFN)FUN_02034D80,          (SAVINITFN)FUN_02034D88 },
+    { 12, 0, (SAVSIZEFN)FUN_02025954,          (SAVINITFN)FUN_0202597C },
+    { 13, 0, (SAVSIZEFN)FUN_02023AC8,          (SAVINITFN)FUN_02023AD8 },
+    { 14, 0, (SAVSIZEFN)FUN_02026FD8,          (SAVINITFN)FUN_02026F60 },
+    { 15, 0, (SAVSIZEFN)Sav2_Mailbox_sizeof,   (SAVINITFN)Sav2_Mailbox_init },
+    { 16, 0, (SAVSIZEFN)FUN_02028054,          (SAVINITFN)FUN_0202805C },
+    { 17, 0, (SAVSIZEFN)FUN_020286F8,          (SAVINITFN)FUN_02028724 },
+    { 18, 0, (SAVSIZEFN)FUN_02028980,          (SAVINITFN)FUN_02028994 },
+    { 19, 0, (SAVSIZEFN)FUN_02029A84,          (SAVINITFN)FUN_02029A8C },
+    { 20, 0, (SAVSIZEFN)Sav2_GameStats_sizeof, (SAVINITFN)Sav2_GameStats_init },
+    { 21, 0, (SAVSIZEFN)Sav2_SealCase_sizeof,  (SAVINITFN)Sav2_SealCase_init },
+    { 22, 0, (SAVSIZEFN)Sav2_Chatot_sizeof,    (SAVINITFN)Sav2_Chatot_init },
+    { 23, 0, (SAVSIZEFN)SaveStruct23_sizeof,   (SAVINITFN)SaveStruct23_Init },
+    { 24, 0, (SAVSIZEFN)FUN_0202A8F4,          (SAVINITFN)FUN_0202A8F8 },
+    { 25, 0, (SAVSIZEFN)FUN_0202A924,          (SAVINITFN)FUN_0202A92C },
+    { 26, 0, (SAVSIZEFN)FUN_0202ABC8,          (SAVINITFN)FUN_0202ABCC },
+    { 27, 0, (SAVSIZEFN)FUN_0202B374,          (SAVINITFN)FUN_0202B37C },
+    { 28, 0, (SAVSIZEFN)FUN_0202B8B0,          (SAVINITFN)FUN_0202B8B8 },
+    { 29, 0, (SAVSIZEFN)FUN_020281E0,          (SAVINITFN)FUN_020281E8 },
+    { 30, 0, (SAVSIZEFN)FUN_02029AE0,          (SAVINITFN)FUN_02029AE8 },
     { 31, 0, (SAVSIZEFN)FUN_0202AC20, (SAVINITFN)FUN_0202AC28 },
     { 32, 0, (SAVSIZEFN)FUN_0202BE98, (SAVINITFN)FUN_0202BEA0 },
     { 33, 0, (SAVSIZEFN)FUN_0202C0E0, (SAVINITFN)FUN_0202C0E4 },
diff --git a/arm9/src/scrcmd_berry_trees.c b/arm9/src/scrcmd_berry_trees.c
index 7fce0387..43999cec 100644
--- a/arm9/src/scrcmd_berry_trees.c
+++ b/arm9/src/scrcmd_berry_trees.c
@@ -77,11 +77,11 @@ THUMB_FUNC BOOL ScrCmd_SetBerryTreeMulch(struct ScriptContext* ctx)
 THUMB_FUNC BOOL ScrCmd_SetBerryTreeType(struct ScriptContext* ctx)
 {
     void** unk = FUN_02039438(ctx->unk80, 10);
-    struct UnkStruct_02029FB0* unk2 = FUN_02029FC8(ctx->unk80->saveBlock2);
+    struct GameStats* unk2 = Sav2_GameStats_get(ctx->unk80->saveBlock2);
     u16 unk3 = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
 
     FUN_0204B5A8(ctx->unk80, *unk, unk3);
-    FUN_0202A0E8(unk2, 3);
+    GameStats_Inc(unk2, 3);
 
     return FALSE;
 }
@@ -108,11 +108,11 @@ THUMB_FUNC BOOL ScrCmd_Unk0184(struct ScriptContext* ctx) //SetBerryTreeWater/Wa
 
 THUMB_FUNC BOOL ScrCmd_TakeBerryTreeBerries(struct ScriptContext* ctx)
 {
-    struct UnkStruct_02029FB0* unk = FUN_02029FC8(ctx->unk80->saveBlock2);
+    struct GameStats* unk = Sav2_GameStats_get(ctx->unk80->saveBlock2);
     void** unk2 = FUN_02039438(ctx->unk80, 10);
 
     FUN_0204B4FC(ctx->unk80, *unk2);
-    FUN_0202A170(unk, 0);
+    GameStats_AddSpecial(unk, 0);
 
     return FALSE;
 }
diff --git a/arm9/src/unk_02029FB0.c b/arm9/src/unk_02029FB0.c
index 53b0a9d8..52cd5202 100644
--- a/arm9/src/unk_02029FB0.c
+++ b/arm9/src/unk_02029FB0.c
@@ -88,6 +88,7 @@ u8 UNK_02105CD8[] = {
     FALSE, // 041

     FALSE, // 042

     FALSE, // 043

+

     TRUE,  // 044

     TRUE,  // 045

     FALSE, // 046

@@ -178,22 +179,22 @@ static inline s32 GetOffsetToUnkB0(s32 a0)
     return a0 - 44;

 }

 

-THUMB_FUNC u32 FUN_02029FB0(void)

+THUMB_FUNC u32 Sav2_GameStats_sizeof(void)

 {

-    return sizeof(struct UnkStruct_02029FB0);

+    return sizeof(struct GameStats);

 }

 

-THUMB_FUNC void FUN_02029FB8(struct UnkStruct_02029FB0 * ptr)

+THUMB_FUNC void Sav2_GameStats_init(struct GameStats * ptr)

 {

-    MI_CpuClear32(ptr, sizeof(struct UnkStruct_02029FB0));

+    MI_CpuClear32(ptr, sizeof(struct GameStats));

 }

 

-THUMB_FUNC struct UnkStruct_02029FB0 * FUN_02029FC8(struct SaveBlock2 * sav2)

+THUMB_FUNC struct GameStats * Sav2_GameStats_get(struct SaveBlock2 * sav2)

 {

     return SavArray_get(sav2, 20);

 }

 

-THUMB_FUNC u32 FUN_02029FD4(struct UnkStruct_02029FB0 * ptr, s32 a1)

+THUMB_FUNC u32 GameStats_GetValue(struct GameStats * ptr, s32 a1)

 {

     if (a1 < 44)

     {

@@ -210,7 +211,7 @@ THUMB_FUNC u32 FUN_02029FD4(struct UnkStruct_02029FB0 * ptr, s32 a1)
     }

 }

 

-THUMB_FUNC u32 FUN_02029FF8(struct UnkStruct_02029FB0 * ptr, s32 a1, u32 a2)

+THUMB_FUNC u32 GameStats_SetValue(struct GameStats * ptr, s32 a1, u32 a2)

 {

     if (a1 < 44)

     {

@@ -224,10 +225,10 @@ THUMB_FUNC u32 FUN_02029FF8(struct UnkStruct_02029FB0 * ptr, s32 a1, u32 a2)
     {

         GF_ASSERT(0);

     }

-    return FUN_02029FD4(ptr, a1);

+    return GameStats_GetValue(ptr, a1);

 }

 

-THUMB_FUNC u32 FUN_0202A028(s32 a0)

+THUMB_FUNC u32 GameStats_GetMaxValue(s32 a0)

 {

     if (a0 < 44)

     {

@@ -250,39 +251,39 @@ THUMB_FUNC u32 FUN_0202A028(s32 a0)
     }

 }

 

-THUMB_FUNC u16 FUN_0202A070(s32 a0)

+THUMB_FUNC u16 GameStats_GetStdInc(s32 a0)

 {

     return UNK_020EEA7C[a0];

 }

 

-THUMB_FUNC u32 FUN_0202A07C(struct UnkStruct_02029FB0 * ptr, s32 a1, u32 a2)

+THUMB_FUNC u32 GameStats_SetCapped(struct GameStats * ptr, s32 a1, u32 a2)

 {

-    u32 r2 = FUN_0202A028(a1);

+    u32 r2 = GameStats_GetMaxValue(a1);

     if (a2 < r2)

     {

-        return FUN_02029FF8(ptr, a1, a2);

+        return GameStats_SetValue(ptr, a1, a2);

     }

     else

     {

-        return FUN_02029FF8(ptr, a1, r2);

+        return GameStats_SetValue(ptr, a1, r2);

     }

 }

 

-THUMB_FUNC u32 FUN_0202A0A8(struct UnkStruct_02029FB0 * ptr, s32 a1, u32 a2)

+THUMB_FUNC u32 GameStats_UpdateBounded(struct GameStats * ptr, s32 a1, u32 a2)

 {

-    u32 r4 = FUN_0202A028(a1);

-    u32 r0 = FUN_02029FD4(ptr, a1);

+    u32 r4 = GameStats_GetMaxValue(a1);

+    u32 r0 = GameStats_GetValue(ptr, a1);

     if (a2 > r4)

     {

         a2 = r4;

     }

     if (r0 < a2)

     {

-        return FUN_02029FF8(ptr, a1, a2);

+        return GameStats_SetValue(ptr, a1, a2);

     }

     else if (r0 > r4)

     {

-        return FUN_02029FF8(ptr, a1, r4);

+        return GameStats_SetValue(ptr, a1, r4);

     }

     else

     {

@@ -290,67 +291,67 @@ THUMB_FUNC u32 FUN_0202A0A8(struct UnkStruct_02029FB0 * ptr, s32 a1, u32 a2)
     }

 }

 

-THUMB_FUNC u32 FUN_0202A0E8(struct UnkStruct_02029FB0 * ptr, s32 a1)

+THUMB_FUNC u32 GameStats_Inc(struct GameStats * ptr, s32 a1)

 {

-    u32 r4 = FUN_0202A028(a1);

-    u32 r2 = FUN_02029FD4(ptr, a1) + 1;

+    u32 r4 = GameStats_GetMaxValue(a1);

+    u32 r2 = GameStats_GetValue(ptr, a1) + 1;

     if (r2 < r4)

     {

-        return FUN_02029FF8(ptr, a1, r2);

+        return GameStats_SetValue(ptr, a1, r2);

     }

     else

     {

-        return FUN_02029FF8(ptr, a1, r4);

+        return GameStats_SetValue(ptr, a1, r4);

     }

 }

 

-THUMB_FUNC u32 FUN_0202A11C(struct UnkStruct_02029FB0 * ptr, s32 a1, u32 a2)

+THUMB_FUNC u32 GameStats_Add(struct GameStats * ptr, s32 a1, u32 a2)

 {

-    u32 r6 = FUN_0202A028(a1);

-    u32 r2 = FUN_02029FD4(ptr, a1);

+    u32 r6 = GameStats_GetMaxValue(a1);

+    u32 r2 = GameStats_GetValue(ptr, a1);

     r2 += a2;

     if (r2 < r6)

     {

-        return FUN_02029FF8(ptr, a1, r2);

+        return GameStats_SetValue(ptr, a1, r2);

     }

     else

     {

-        return FUN_02029FF8(ptr, a1, r6);

+        return GameStats_SetValue(ptr, a1, r6);

     }

 }

 

-THUMB_FUNC u32 FUN_0202A150(struct UnkStruct_02029FB0 * ptr, s32 a1)

+THUMB_FUNC u32 GameStats_GetCapped(struct GameStats * ptr, s32 a1)

 {

-    u32 r4 = FUN_0202A028(a1);

-    u32 r0 = FUN_02029FD4(ptr, a1);

+    u32 r4 = GameStats_GetMaxValue(a1);

+    u32 r0 = GameStats_GetValue(ptr, a1);

     if (r0 <= r4)

         r4 = r0;

     return r4;

 }

 

-THUMB_FUNC u32 FUN_0202A170(struct UnkStruct_02029FB0 * ptr, s32 a1)

+THUMB_FUNC u32 GameStats_AddSpecial(struct GameStats * ptr, s32 a1)

 {

     GF_ASSERT(a1 < 38);

-    u32 r0 = FUN_0202A150(ptr, 0) + FUN_0202A070(a1);

+    u32 r0 = GameStats_GetCapped(ptr, 0) + GameStats_GetStdInc(a1);

     if (r0 > 99999999)

     {

-        return FUN_0202A07C(ptr, 0, 99999999);

+        return GameStats_SetCapped(ptr, 0, 99999999);

     }

     else

     {

-        return FUN_0202A11C(ptr, 0, FUN_0202A070(a1));

+        return GameStats_Add(ptr, 0, GameStats_GetStdInc(a1));

     }

 }

 

-THUMB_FUNC u32 FUN_0202A1B8(struct UnkStruct_02029FB0 * ptr)

+THUMB_FUNC u32 GameStats_GetStat0(struct GameStats * ptr)

 {

-    return FUN_0202A150(ptr, 0);

+    return GameStats_GetCapped(ptr, 0);

 }

 

-THUMB_FUNC void FUN_0202A1C4(struct UnkStruct_02029FB0 * ptr, struct Pokedex * pokedex, u16 species)

+THUMB_FUNC void GameStats_IncSpeciesCaught(struct GameStats * ptr, struct Pokedex * pokedex, u16 species)

 {

     if (!Pokedex_CheckMonCaughtFlag(pokedex, species))

     {

-        FUN_0202A170(ptr, 22);

+        GameStats_AddSpecial(ptr, 22);

     }

 }

diff --git a/arm9/src/unk_0202C144.c b/arm9/src/unk_0202C144.c
index 468a92e4..78c59e15 100644
--- a/arm9/src/unk_0202C144.c
+++ b/arm9/src/unk_0202C144.c
@@ -12,9 +12,9 @@ void FUN_0202C144(struct SaveBlock2 * sav2, struct Pokemon * mon)
     if (!is_egg)
     {
         struct Pokedex * pokedex = Sav2_Pokedex_get(sav2);
-        struct UnkStruct_02029FB0 * unk = FUN_02029FC8(sav2);
+        struct GameStats * unk = Sav2_GameStats_get(sav2);
         u32 species = GetMonData(mon, MON_DATA_SPECIES, NULL);
-        FUN_0202A1C4(unk, pokedex, (u16)species);
+        GameStats_IncSpeciesCaught(unk, pokedex, (u16) species);
         Pokedex_SetMonCaughtFlag(pokedex, mon);
 
         struct SavePoketch * poketch = Sav2_Poketch_get(sav2);
diff --git a/arm9/src/unk_0205FA2C.c b/arm9/src/unk_0205FA2C.c
index d8c4ecb2..b1f03faa 100644
--- a/arm9/src/unk_0205FA2C.c
+++ b/arm9/src/unk_0205FA2C.c
@@ -313,7 +313,7 @@ THUMB_FUNC void FUN_0205FDDC(struct UnkStruct_0204639C *param0, u16 param1, u16
 THUMB_FUNC u32 FUN_0205FE10(struct SaveBlock2 *sav2)
 {
 
-    u16 res = (u16)FUN_0202A150(FUN_02029FC8(sav2), 0x35);
+    u16 res = (u16) GameStats_GetCapped(Sav2_GameStats_get(sav2), 0x35);
     if (res < 20)
     {
         return 0;
@@ -393,7 +393,7 @@ THUMB_FUNC u32 FUN_0205FE10(struct SaveBlock2 *sav2)
 
 THUMB_FUNC u32 FUN_0205FF5C(struct SaveBlock2 *sav2)
 {
-    u16 res = (u16)FUN_0202A150(FUN_02029FC8(sav2), 0x35);
+    u16 res = (u16) GameStats_GetCapped(Sav2_GameStats_get(sav2), 0x35);
     if (res < 20)
     {
         return 0;
diff --git a/include/unk_02029FB0.h b/include/unk_02029FB0.h
index 9908d86d..e6fc813a 100644
--- a/include/unk_02029FB0.h
+++ b/include/unk_02029FB0.h
@@ -3,26 +3,26 @@
 
 struct Pokedex;
 
-struct UnkStruct_02029FB0
+struct GameStats
 {
     u32 unk_00[0x2C];
     u16 unk_B0[0x4D];
 };
 
-u32 FUN_02029FB0(void);
-void FUN_02029FB8(struct UnkStruct_02029FB0 * ptr);
-struct UnkStruct_02029FB0 * FUN_02029FC8(struct SaveBlock2 * sav2);
-u32 FUN_02029FD4(struct UnkStruct_02029FB0 * ptr, s32 a1);
-u32 FUN_02029FF8(struct UnkStruct_02029FB0 * ptr, s32 a1, u32 a2);
-u32 FUN_0202A028(s32 a0);
-u16 FUN_0202A070(s32 a0);
-u32 FUN_0202A07C(struct UnkStruct_02029FB0 * ptr, s32 a1, u32 a2);
-u32 FUN_0202A0A8(struct UnkStruct_02029FB0 * ptr, s32 a1, u32 a2);
-u32 FUN_0202A0E8(struct UnkStruct_02029FB0 * ptr, s32 a1);
-u32 FUN_0202A11C(struct UnkStruct_02029FB0 * ptr, s32 a1, u32 a2);
-u32 FUN_0202A150(struct UnkStruct_02029FB0 * ptr, s32 a1);
-u32 FUN_0202A170(struct UnkStruct_02029FB0 * ptr, s32 a1);
-u32 FUN_0202A1B8(struct UnkStruct_02029FB0 * ptr);
-void FUN_0202A1C4(struct UnkStruct_02029FB0 * ptr, struct Pokedex * pokedex, u16 species);
+u32 Sav2_GameStats_sizeof(void);
+void Sav2_GameStats_init(struct GameStats * ptr);
+struct GameStats * Sav2_GameStats_get(struct SaveBlock2 * sav2);
+u32 GameStats_GetValue(struct GameStats * ptr, s32 a1);
+u32 GameStats_SetValue(struct GameStats * ptr, s32 a1, u32 a2);
+u32 GameStats_GetMaxValue(s32 a0);
+u16 GameStats_GetStdInc(s32 a0);
+u32 GameStats_SetCapped(struct GameStats * ptr, s32 a1, u32 a2);
+u32 GameStats_UpdateBounded(struct GameStats * ptr, s32 a1, u32 a2);
+u32 GameStats_Inc(struct GameStats * ptr, s32 a1);
+u32 GameStats_Add(struct GameStats * ptr, s32 a1, u32 a2);
+u32 GameStats_GetCapped(struct GameStats * ptr, s32 a1);
+u32 GameStats_AddSpecial(struct GameStats * ptr, s32 a1);
+u32 GameStats_GetStat0(struct GameStats * ptr);
+void GameStats_IncSpeciesCaught(struct GameStats * ptr, struct Pokedex * pokedex, u16 species);
 
 #endif //POKEDIAMOND_UNK_02029FB0_H