Name gamestats routines

2024-11-23 13:20:02 +00:00 · 2021-09-14 20:07:24 -04:00 · 2021-09-14 20:07:24 -04:00 · 663bf6d3b4
commit 663bf6d3b4
parent d9757ff591
32 changed files with 256 additions and 256 deletions
--- a/asm/game_init.s
+++ b/asm/game_init.s
@ -336,7 +336,7 @@ _0201A2F4:
 	lsl r1, r1, #0xa
 	bl sub_020DC9DC
 	mov r0, #0
-	bl sub_0201FFB0
+	bl GF_CRC16Init
 	pop {r3, r4, r5, pc}
 	.balign 4, 0
 _0201A324: .word 0x04000304
--- a/asm/math_util.s
+++ b/asm/math_util.s
@ -473,8 +473,8 @@ _0201FF20: .word 0x0000FFFF
 _0201FF24: .word 0x021094DC
 	thumb_func_end sub_0201FECC

-	thumb_func_start sub_0201FF28
-sub_0201FF28: ; 0x0201FF28
+	thumb_func_start Math_CalcArraySum
+Math_CalcArraySum: ; 0x0201FF28
 	push {r3, r4}
 	mov r3, #0
 	add r4, r3, #0
@ -491,7 +491,7 @@ _0201FF3E:
 	add r0, r3, #0
 	pop {r3, r4}
 	bx lr
-	thumb_func_end sub_0201FF28
+	thumb_func_end Math_CalcArraySum

 	thumb_func_start _MonEncryptSegment
 _MonEncryptSegment: ; 0x0201FF44
@ -546,22 +546,22 @@ _0201FF90: .word 0x41C64E6D
 _0201FF94: .word 0x00006073
 	thumb_func_end MonEncryptionLCRNG

-	thumb_func_start MATH_CalcCRC16CCITT
-MATH_CalcCRC16CCITT: ; 0x0201FF98
+	thumb_func_start GF_CalcCRC16
+GF_CalcCRC16: ; 0x0201FF98
 	add r3, r0, #0
 	add r2, r1, #0
 	ldr r0, _0201FFA8 ; =_021D15A4
 	add r1, r3, #0
-	ldr r3, _0201FFAC ; =sub_020E3A2C
+	ldr r3, _0201FFAC ; =MATH_CalcCRC16CCITT
 	ldr r0, [r0]
 	bx r3
 	nop
 _0201FFA8: .word _021D15A4
-_0201FFAC: .word sub_020E3A2C
-	thumb_func_end MATH_CalcCRC16CCITT
+_0201FFAC: .word MATH_CalcCRC16CCITT
+	thumb_func_end GF_CalcCRC16

-	thumb_func_start sub_0201FFB0
-sub_0201FFB0: ; 0x0201FFB0
+	thumb_func_start GF_CRC16Init
+GF_CRC16Init: ; 0x0201FFB0
 	push {r4, lr}
 	add r4, r0, #0
 	ldr r0, _0201FFD8 ; =_021D15A4
@ -577,9 +577,9 @@ _0201FFC0:
 	ldr r1, _0201FFD8 ; =_021D15A4
 	str r0, [r1]
 	ldr r1, _0201FFDC ; =0x00001021
-	bl sub_020E3850
+	bl MATHi_CRC16InitTable
 	pop {r4, pc}
 	nop
 _0201FFD8: .word _021D15A4
 _0201FFDC: .word 0x00001021
-	thumb_func_end sub_0201FFB0
+	thumb_func_end GF_CRC16Init
--- a/asm/overlay_01.s
+++ b/asm/overlay_01.s
@ -3888,10 +3888,10 @@ ov01_021E788C: ; 0x021E788C
 	bl Sav2_GameStats_get
 	add r5, r0, #0
 	mov r1, #0xc
-	bl sub_0202D0FC
+	bl GameStats_Inc
 	add r0, r5, #0
 	mov r1, #0xf
-	bl sub_0202D1C0
+	bl GameStats_AddSpecial
 	ldr r1, _021E78D4 ; =0x000007E5
 	add r0, r4, #0
 	mov r2, #0
@ -4086,7 +4086,7 @@ ov01_021E7A08: ; 0x021E7A08
 	ldr r0, [r4, #0xc]
 	bl Sav2_GameStats_get
 	mov r1, #1
-	bl sub_0202D18C
+	bl GameStats_GetCapped
 	mov r1, #1
 	lsl r1, r1, #0xa
 	cmp r0, r1
@ -4142,7 +4142,7 @@ ov01_021E7A98: ; 0x021E7A98
 	ldr r0, [r5, #0xc]
 	bl Sav2_GameStats_get
 	mov r1, #0
-	bl sub_0202D18C
+	bl GameStats_GetCapped
 	add r4, r0, #0
 	ldr r0, [r5, #0xc]
 	bl sub_02031B14
@ -48847,7 +48847,7 @@ _021FC6E2:
 	ldr r0, [r4, #0xc]
 	bl Sav2_GameStats_get
 	mov r1, #0xb
-	bl sub_0202D0FC
+	bl GameStats_Inc
 	ldr r2, [r5, #0x10]
 	add r0, r4, #0
 	add r1, r6, #0
@ -49243,7 +49243,7 @@ ov01_021FC9AC: ; 0x021FC9AC
 	ldr r0, [r0, #0xc]
 	bl Sav2_GameStats_get
 	mov r1, #0x65
-	bl sub_0202D0FC
+	bl GameStats_Inc
 	mov r0, #1
 	pop {r4, pc}
 	.balign 4, 0
--- a/asm/overlay_03.s
+++ b/asm/overlay_03.s
@ -8146,7 +8146,7 @@ _02257EF0:
 	ldrsh r2, [r4, r3]
 	mov r1, #0x24
 	mul r2, r5
-	bl sub_0202D144
+	bl GameStats_Add
 	mov r0, #0xd
 	pop {r3, r4, r5, pc}
 	nop
@ -8212,7 +8212,7 @@ _02257F5E:
 	sub r0, #0x3c
 	ldr r0, [r4, r0]
 	mov r1, #0x33
-	bl sub_0202D0FC
+	bl GameStats_Inc
 	mov r0, #0xf
 	pop {r4, pc}
 _02257F9E:
--- a/asm/overlay_112.s
+++ b/asm/overlay_112.s
@ -27255,7 +27255,7 @@ ov112_021F3244: ; 0x021F3244
 	bl ov112_021F33D8
 	ldr r1, _021F3288 ; =0x000001F2
 	add r0, r4, #0
-	bl MATH_CalcCRC16CCITT
+	bl GF_CalcCRC16
 	ldr r1, _021F3288 ; =0x000001F2
 	strh r0, [r4, r1]
 	pop {r4, r5, r6, pc}
@ -27286,7 +27286,7 @@ ov112_021F328C: ; 0x021F328C
 _021F32B6:
 	ldr r0, [sp, #4]
 	ldr r1, _021F3368 ; =0x000001F2
-	bl MATH_CalcCRC16CCITT
+	bl GF_CalcCRC16
 	ldr r2, _021F3368 ; =0x000001F2
 	ldr r1, [sp, #4]
 	ldrh r1, [r1, r2]
--- a/asm/overlay_12.s
+++ b/asm/overlay_12.s
@ -77,7 +77,7 @@ _0223792E:
 	lsl r0, r0, #2
 	ldr r0, [r5, r0]
 	mov r1, #0x15
-	bl sub_0202D0FC
+	bl GameStats_Inc
 	ldr r0, [r5]
 	cmp r0, #0x8f
 	beq _0223796E
@ -89,7 +89,7 @@ _02237962:
 	lsl r0, r0, #2
 	ldr r0, [r5, r0]
 	mov r1, #0x1a
-	bl sub_0202D0FC
+	bl GameStats_Inc
 _0223796E:
 	mov r0, #2
 	str r0, [r4]
@ -5224,14 +5224,14 @@ _0223A464:
 	lsl r0, r0, #2
 	ldr r0, [r7, r0]
 	mov r1, #0x16
-	bl sub_0202D0FC
+	bl GameStats_Inc
 	b _0223A4CE
 _0223A47A:
 	mov r0, #0x51
 	lsl r0, r0, #2
 	ldr r0, [r7, r0]
 	mov r1, #0x1b
-	bl sub_0202D0FC
+	bl GameStats_Inc
 	b _0223A4CE
 _0223A488:
 	bl sub_02039998
@ -5241,14 +5241,14 @@ _0223A488:
 	lsl r0, r0, #2
 	ldr r0, [r7, r0]
 	mov r1, #0x17
-	bl sub_0202D0FC
+	bl GameStats_Inc
 	b _0223A4CE
 _0223A49E:
 	mov r0, #0x51
 	lsl r0, r0, #2
 	ldr r0, [r7, r0]
 	mov r1, #0x1c
-	bl sub_0202D0FC
+	bl GameStats_Inc
 	b _0223A4CE
 _0223A4AC:
 	bl sub_02039998
@ -5258,14 +5258,14 @@ _0223A4AC:
 	lsl r0, r0, #2
 	ldr r0, [r7, r0]
 	mov r1, #0x18
-	bl sub_0202D0FC
+	bl GameStats_Inc
 	b _0223A4CE
 _0223A4C2:
 	mov r0, #0x51
 	lsl r0, r0, #2
 	ldr r0, [r7, r0]
 	mov r1, #0x1d
-	bl sub_0202D0FC
+	bl GameStats_Inc
 _0223A4CE:
 	ldr r1, [r7]
 	mov r0, #8
@ -8411,7 +8411,7 @@ ov12_0223BB28: ; 0x0223BB28
 	mov r2, #0x87
 	lsl r2, r2, #2
 	ldr r0, [r0, r2]
-	bl sub_0202D0FC
+	bl GameStats_Inc
 _0223BB3E:
 	pop {r3, pc}
 	.balign 4, 0
@ -8430,7 +8430,7 @@ ov12_0223BB44: ; 0x0223BB44
 	lsl r1, r1, #2
 	ldr r0, [r0, r1]
 	mov r1, #0x15
-	bl sub_0202D1C0
+	bl GameStats_AddSpecial
 _0223BB5C:
 	pop {r3, pc}
 	nop
--- a/asm/overlay_122.s
+++ b/asm/overlay_122.s
@ -5252,7 +5252,7 @@ _021E80A4:
 	ldr r0, [r5, #0x10]
 	bl Sav2_GameStats_get
 	mov r1, #6
-	bl sub_0202D1C0
+	bl GameStats_AddSpecial
 	pop {r3, r4, r5, pc}
 	.balign 4, 0
 _021E820C: .word 0x04000304
--- a/asm/overlay_17.s
+++ b/asm/overlay_17.s
@ -1089,7 +1089,7 @@ _022023F6:
 	bl ov16_02201610
 	ldr r0, [r4, #0x10]
 	mov r1, #5
-	bl sub_0202D0FC
+	bl GameStats_Inc
 	add r0, r4, #0
 	mov r1, #2
 	add r0, #0x7b
@ -2105,7 +2105,7 @@ ov17_02202B98: ; 0x02202B98
 	bl sub_020249D4
 	ldr r0, [r5, #0x10]
 	mov r1, #0
-	bl sub_0202D1C0
+	bl GameStats_AddSpecial
 	pop {r3, r4, r5, r6, r7, pc}
 	.balign 4, 0
 	thumb_func_end ov17_02202B98
--- a/asm/overlay_40.s
+++ b/asm/overlay_40.s
@ -8515,7 +8515,7 @@ ov40_0222FB28: ; 0x0222FB28
 	ldr r0, [r0, r1]
 	bl Sav2_GameStats_get
 	add r1, r4, #0
-	bl sub_0202D1C0
+	bl GameStats_AddSpecial
 	pop {r4, pc}
 	.balign 4, 0
 	thumb_func_end ov40_0222FB28
@ -27492,7 +27492,7 @@ _02239558:
 	ldr r0, [r4, r0]
 	bl Sav2_GameStats_get
 	ldr r1, [r6, r5]
-	bl sub_0202D18C
+	bl GameStats_GetCapped
 	pop {r4, r5, r6, pc}
 	nop
 _0223956C: .word 0x02245CE8
--- a/asm/overlay_41.s
+++ b/asm/overlay_41.s
@ -2479,7 +2479,7 @@ ov41_02247150: ; 0x02247150
 	bne _02247182
 	ldr r0, [r5, #0x10]
 	mov r1, #8
-	bl sub_0202D1C0
+	bl GameStats_AddSpecial
 	mov r1, #0xfd
 	lsl r1, r1, #2
 	ldr r0, [r5, #4]
--- a/asm/overlay_45_thumb.s
+++ b/asm/overlay_45_thumb.s
@ -2674,7 +2674,7 @@ ov45_0222B0F8: ; 0x0222B0F8
 	ldr r0, [r0]
 	bl Sav2_GameStats_get
 	mov r1, #0x2f
-	bl sub_0202D0FC
+	bl GameStats_Inc
 	pop {r3, pc}
 	thumb_func_end ov45_0222B0F8

@ -2684,7 +2684,7 @@ ov45_0222B108: ; 0x0222B108
 	ldr r0, [r0]
 	bl Sav2_GameStats_get
 	mov r1, #0x77
-	bl sub_0202D0FC
+	bl GameStats_Inc
 	pop {r3, pc}
 	thumb_func_end ov45_0222B108

--- a/asm/overlay_46.s
+++ b/asm/overlay_46.s
@ -315,7 +315,7 @@ _02258A80:
 	ldr r0, [r5]
 	bl Sav2_GameStats_get
 	mov r1, #0x21
-	bl sub_0202D1C0
+	bl GameStats_AddSpecial
 	bl GF_RTC_DateTimeToSec
 	ldr r2, [r6, #0xc]
 	str r0, [r2]
--- a/asm/overlay_52.s
+++ b/asm/overlay_52.s
@ -1580,10 +1580,10 @@ ov52_021E8DC4: ; 0x021E8DC4
 _021E8DDE:
 	ldr r0, [r5, #8]
 	mov r1, #4
-	bl sub_0202D1C0
+	bl GameStats_AddSpecial
 	ldr r0, [r5, #8]
 	mov r1, #0x73
-	bl sub_0202D0FC
+	bl GameStats_Inc
 	mov r0, #0xb5
 	lsl r0, r0, #2
 	add r0, r5, r0
--- a/asm/overlay_55.s
+++ b/asm/overlay_55.s
@ -153,11 +153,11 @@ _021E5A04:
 	ldr r0, [r5, #0x10]
 	bl Sav2_GameStats_get
 	mov r1, #2
-	bl sub_0202D1C0
+	bl GameStats_AddSpecial
 	ldr r0, [r5, #0x10]
 	bl Sav2_GameStats_get
 	mov r1, #0x2e
-	bl sub_0202D0FC
+	bl GameStats_Inc
 	mov r0, #1
 	str r0, [r5, #4]
 	b _021E5A3A
--- a/asm/overlay_57.s
+++ b/asm/overlay_57.s
@ -5447,7 +5447,7 @@ _0223A39A:
 	ldr r0, [r0, #0x28]
 	bl Sav2_GameStats_get
 	mov r1, #7
-	bl sub_0202D1C0
+	bl GameStats_AddSpecial
 	mov r0, #0xfb
 	lsl r0, r0, #2
 	ldr r1, [r4, r0]
--- a/asm/overlay_65.s
+++ b/asm/overlay_65.s
@ -6854,7 +6854,7 @@ _0221F6BC:
 	bl sub_02074708
 	ldr r0, [r5, #0x1c]
 	mov r1, #0x14
-	bl sub_0202D0FC
+	bl GameStats_Inc
 	ldr r0, [sp, #0xc]
 	bl FreeToHeap
 	add r0, r4, #0
--- a/asm/overlay_70.s
+++ b/asm/overlay_70.s
@ -16671,7 +16671,7 @@ _0223FDE2:
 	ldr r0, [r4]
 	mov r1, #0x2d
 	ldr r0, [r0, #0x28]
-	bl sub_0202D0FC
+	bl GameStats_Inc
 	mov r0, #0x1e
 	str r0, [r4, #0x2c]
 	b _0223FE36
@ -17625,11 +17625,11 @@ ov70_02240500: ; 0x02240500
 	add r4, r1, #0
 	ldr r0, [r0, #0x28]
 	mov r1, #0x18
-	bl sub_0202D1C0
+	bl GameStats_AddSpecial
 	ldr r0, [r5]
 	mov r1, #0x19
 	ldr r0, [r0, #0x28]
-	bl sub_0202D0FC
+	bl GameStats_Inc
 	add r0, r4, #0
 	mov r1, #0xc
 	mov r2, #0
--- a/asm/overlay_73.s
+++ b/asm/overlay_73.s
@ -2341,7 +2341,7 @@ ov73_021E6C20: ; 0x021E6C20
 	ldr r0, [r5, #8]
 	mov r1, #0x13
 	ldr r0, [r0, #0xc]
-	bl sub_0202D1C0
+	bl GameStats_AddSpecial
 	mov r0, #0xdd
 	lsl r0, r0, #2
 	add r0, r5, r0
--- a/asm/overlay_80.s
+++ b/asm/overlay_80.s
@ -6996,7 +6996,7 @@ ov80_0222D168: ; 0x0222D168
 	bl Sav2_GameStats_get
 	mov r1, #0x45
 	add r2, r5, #0
-	bl sub_0202D144
+	bl GameStats_Add
 	ldr r0, [r4, #8]
 	bl sub_0202D918
 	add r1, r5, #0
@ -7022,7 +7022,7 @@ ov80_0222D1A0: ; 0x0222D1A0
 	bl Sav2_GameStats_get
 	mov r1, #0x46
 	add r2, r5, #0
-	bl sub_0202D144
+	bl GameStats_Add
 	ldr r0, [r4, #8]
 	bl sub_0202D918
 	add r1, r5, #0
@ -7138,7 +7138,7 @@ ov80_0222D284: ; 0x0222D284
 	bl sub_02096808
 	ldr r0, [r0, #8]
 	bl SavArray_PlayerParty_get
-	bl sub_02090C1C
+	bl HealParty
 	mov r0, #0
 	pop {r3, pc}
 	thumb_func_end ov80_0222D284
@ -8951,7 +8951,7 @@ ov80_0222E078: ; 0x0222E078
 	ldr r0, [r0, #8]
 	bl Sav2_GameStats_get
 	add r1, r4, #0
-	bl sub_0202D0FC
+	bl GameStats_Inc
 	mov r0, #0
 	pop {r3, r4, r5, pc}
 	.balign 4, 0
@ -8973,7 +8973,7 @@ ov80_0222E09C: ; 0x0222E09C
 	bl Sav2_GameStats_get
 	add r1, r4, #0
 	add r2, r6, #0
-	bl sub_0202D144
+	bl GameStats_Add
 	mov r0, #0
 	pop {r4, r5, r6, pc}
 	thumb_func_end ov80_0222E09C
@ -8990,7 +8990,7 @@ ov80_0222E0C8: ; 0x0222E0C8
 	ldr r0, [r0, #8]
 	bl Sav2_GameStats_get
 	add r1, r4, #0
-	bl sub_0202D1C0
+	bl GameStats_AddSpecial
 	mov r0, #0
 	pop {r3, r4, r5, pc}
 	.balign 4, 0
@ -14293,7 +14293,7 @@ ov80_022309F8: ; 0x022309F8
 	ldr r0, [r4, r0]
 	bl Sav2_GameStats_get
 	mov r1, #0x41
-	bl sub_0202D0FC
+	bl GameStats_Inc
 _02230A4C:
 	pop {r4, pc}
 	nop
@ -19321,7 +19321,7 @@ _0223326A:
 	bl Sav2_GameStats_get
 	mov r1, #0x42
 	add r2, r4, #0
-	bl sub_0202D144
+	bl GameStats_Add
 	add sp, #0xc
 	pop {r4, r5, r6, r7, pc}
 	.balign 4, 0
@ -23807,7 +23807,7 @@ _022354D8:
 	bl Sav2_GameStats_get
 	ldrh r2, [r4]
 	mov r1, #0x45
-	bl sub_0202D144
+	bl GameStats_Add
 	b _0223557E
 _022354EE:
 	ldr r1, [sp]
@ -25173,7 +25173,7 @@ _02235F10:
 _02235F44:
 	ldr r0, [r7, #8]
 	bl SavArray_PlayerParty_get
-	bl sub_02090C1C
+	bl HealParty
 	add r0, r4, #0
 	bl sub_02096910
 	ldr r1, _02235F60 ; =0x000008D4
@ -27336,10 +27336,10 @@ ov80_02236F24: ; 0x02236F24
 	str r0, [sp, #0xc]
 	ldr r0, _022370EC ; =0x000004D4
 	ldr r0, [r5, r0]
-	bl sub_02090C1C
+	bl HealParty
 	ldr r0, _022370F0 ; =0x000004D8
 	ldr r0, [r5, r0]
-	bl sub_02090C1C
+	bl HealParty
 	ldrb r0, [r5, #4]
 	bl ov80_022370F4
 	add r1, r0, #0
@ -28219,7 +28219,7 @@ ov80_022375D0: ; 0x022375D0
 	ldr r0, [r5, r0]
 	bl SavArray_PlayerParty_get
 	str r0, [sp, #0x1c]
-	bl sub_02090C1C
+	bl HealParty
 	ldrb r0, [r5, #4]
 	bl ov80_02237850
 	add r1, r0, #0
@ -28998,7 +28998,7 @@ ov80_02237B8C: ; 0x02237B8C
 	bl ov80_02237B58
 	str r0, [sp, #0xc]
 	ldr r0, [r5, #0x2c]
-	bl sub_02090C1C
+	bl HealParty
 	ldrb r0, [r5, #0x10]
 	bl ov80_02237D5C
 	add r1, r0, #0
@ -29977,9 +29977,9 @@ _0223832A:
 	bl FreeToHeap
 _02238330:
 	ldr r0, [r7, #0x70]
-	bl sub_02090C1C
+	bl HealParty
 	ldr r0, [r7, #0x74]
-	bl sub_02090C1C
+	bl HealParty
 	add r0, r4, #0
 	add sp, #0x50
 	pop {r3, r4, r5, r6, r7, pc}
--- a/asm/overlay_85.s
+++ b/asm/overlay_85.s
@ -1743,13 +1743,13 @@ ov85_021E6594: ; 0x021E6594
 	ldr r0, [r0]
 	mov r1, #0x78
 	ldr r0, [r0, #0x28]
-	bl sub_0202D0FC
+	bl GameStats_Inc
 	add r0, r4, #0
 	add r0, #0xcc
 	ldr r0, [r0]
 	mov r1, #0x22
 	ldr r0, [r0, #0x28]
-	bl sub_0202D1C0
+	bl GameStats_AddSpecial
 	add r0, r4, #0
 	mov r1, #0xb
 	bl ov85_021E7194
@ -8381,7 +8381,7 @@ ov85_021E9834: ; 0x021E9834
 	ldr r0, [r5, #0xc]
 	mov r1, #0x13
 	ldr r0, [r0, #0x28]
-	bl sub_0202D1C0
+	bl GameStats_AddSpecial
 	mov r0, #0x3b
 	lsl r0, r0, #4
 	add r0, r5, r0
--- a/asm/overlay_90.s
+++ b/asm/overlay_90.s
@ -2007,7 +2007,7 @@ _02259688:
 	cmp r1, #0
 	beq _0225969A
 	mov r1, #0x27
-	bl sub_0202D1C0
+	bl GameStats_AddSpecial
 _0225969A:
 	add r0, r4, #0
 	pop {r3, r4, r5, r6, r7, pc}
--- a/asm/save.s
+++ b/asm/save.s
@ -662,23 +662,23 @@ sub_020275BC: ; 0x020275BC

 	thumb_func_start sub_020275C4
 sub_020275C4: ; 0x020275C4
-	ldr r3, _020275CC ; =MATH_CalcCRC16CCITT
+	ldr r3, _020275CC ; =GF_CalcCRC16
 	add r0, r1, #0
 	add r1, r2, #0
 	bx r3
 	.balign 4, 0
-_020275CC: .word MATH_CalcCRC16CCITT
+_020275CC: .word GF_CalcCRC16
 	thumb_func_end sub_020275C4

 	thumb_func_start sub_020275D0
 sub_020275D0: ; 0x020275D0
-	ldr r3, _020275DC ; =MATH_CalcCRC16CCITT
+	ldr r3, _020275DC ; =GF_CalcCRC16
 	sub r2, #0x10
 	add r0, r1, #0
 	add r1, r2, #0
 	bx r3
 	nop
-_020275DC: .word MATH_CalcCRC16CCITT
+_020275DC: .word GF_CalcCRC16
 	thumb_func_end sub_020275D0

 	thumb_func_start sub_020275E0
@ -1391,7 +1391,7 @@ _02027B14:
 	bl SavArray_get
 	ldr r1, _02027B64 ; =0x00023018
 	ldr r1, [r4, r1]
-	bl MATH_CalcCRC16CCITT
+	bl GF_CalcCRC16
 	ldr r1, _02027B68 ; =0x00023020
 	add r6, r6, #1
 	strh r0, [r4, r1]
@ -1406,7 +1406,7 @@ _02027B14:
 	add r1, r4, #0
 	mul r1, r0
 	add r0, r7, r6
-	bl MATH_CalcCRC16CCITT
+	bl GF_CalcCRC16
 	ldr r1, _02027B70 ; =0x00023300
 	strh r0, [r5, r1]
 	add r0, r5, #0
@ -2118,7 +2118,7 @@ CreateChunkFooter: ; 0x02028070
 	add r0, r1, #0
 	add r1, r3, #0
 	strh r2, [r4, #0xc]
-	bl MATH_CalcCRC16CCITT
+	bl GF_CalcCRC16
 	strh r0, [r4, #0xe]
 	pop {r3, r4, r5, pc}
 	nop
@ -2152,7 +2152,7 @@ _020280C0:
 	add r3, #0xe
 	add r0, r1, #0
 	add r1, r3, #0
-	bl MATH_CalcCRC16CCITT
+	bl GF_CalcCRC16
 	ldrh r1, [r4, #0xe]
 	cmp r1, r0
 	bne _020280D4
@ -3201,7 +3201,7 @@ sub_02028900: ; 0x02028900
 	sub r5, r0, #4
 	add r0, r4, #0
 	add r1, r5, #0
-	bl MATH_CalcCRC16CCITT
+	bl GF_CalcCRC16
 	lsr r1, r5, #0x1f
 	add r1, r5, r1
 	asr r1, r1, #1
@ -3231,7 +3231,7 @@ sub_0202893C: ; 0x0202893C
 	sub r5, r0, #4
 	add r0, r4, #0
 	add r1, r5, #0
-	bl MATH_CalcCRC16CCITT
+	bl GF_CalcCRC16
 	lsr r1, r5, #0x1f
 	add r1, r5, r1
 	asr r1, r1, #1
@ -3281,7 +3281,7 @@ _0202898A:
 	mov r1, #0x29
 	bl SavArray_get
 	add r1, r7, #0
-	bl MATH_CalcCRC16CCITT
+	bl GF_CalcCRC16
 	ldr r1, _02028AA8 ; =0x00023302
 	strh r0, [r6, r1]
 	add r0, r1, #2
--- a/asm/scrcmd.s
+++ b/asm/scrcmd.s
@ -8001,7 +8001,7 @@ sub_02044628: ; 0x02044628
 	bl sub_0205064C
 	ldr r0, [r0, #0xc]
 	bl SavArray_PlayerParty_get
-	bl sub_02090C1C
+	bl HealParty
 	mov r0, #0
 	pop {r3, pc}
 	.balign 4, 0
@ -9323,7 +9323,7 @@ sub_02045040: ; 0x02045040
 	ldr r0, [r0, #0xc]
 	bl Sav2_GameStats_get
 	add r1, r4, #0
-	bl sub_0202D0FC
+	bl GameStats_Inc
 	mov r0, #0
 	pop {r3, r4, r5, pc}
 	.balign 4, 0
@ -9358,7 +9358,7 @@ sub_02045060: ; 0x02045060
 	ldr r0, [r0, #0xc]
 	bl Sav2_GameStats_get
 	add r1, r7, #0
-	bl sub_0202D18C
+	bl GameStats_GetCapped
 	ldr r1, _020450B4 ; =0xFFFF0000
 	and r1, r0
 	lsr r1, r1, #0x10
@ -9402,7 +9402,7 @@ _020450EC:
 	bl Sav2_GameStats_get
 	add r1, r6, #0
 	add r2, r4, #0
-	bl sub_0202D144
+	bl GameStats_Add
 	b _02045126
 _02045100:
 	add r5, #0x80
@ -9411,7 +9411,7 @@ _02045100:
 	bl Sav2_GameStats_get
 	add r1, r6, #0
 	add r2, r4, #0
-	bl sub_0202D064
+	bl GameStats_SetCapped
 	b _02045126
 _02045114:
 	add r5, #0x80
@ -9420,7 +9420,7 @@ _02045114:
 	bl Sav2_GameStats_get
 	add r1, r6, #0
 	add r2, r4, #0
-	bl sub_0202D0A4
+	bl GameStats_UpdateBounded
 _02045126:
 	mov r0, #0
 	pop {r4, r5, r6, pc}
@ -9447,7 +9447,7 @@ sub_0204512C: ; 0x0204512C
 	bl Sav2_GameStats_get
 	add r1, r4, #0
 	add r2, r6, #0
-	bl sub_0202D144
+	bl GameStats_Add
 	mov r0, #0
 	pop {r4, r5, r6, pc}
 	thumb_func_end sub_0204512C
@ -9467,7 +9467,7 @@ sub_02045160: ; 0x02045160
 	bl Sav2_GameStats_get
 	add r1, r4, #0
 	add r2, r6, #0
-	bl sub_0202D144
+	bl GameStats_Add
 	mov r0, #0
 	pop {r4, r5, r6, pc}
 	thumb_func_end sub_02045160
@ -10415,7 +10415,7 @@ sub_020458CC: ; 0x020458CC
 	ldr r0, [r0, #0xc]
 	bl Sav2_GameStats_get
 	add r1, r4, #0
-	bl sub_0202D1C0
+	bl GameStats_AddSpecial
 	mov r0, #0
 	pop {r3, r4, r5, pc}
 	.balign 4, 0
@ -12459,7 +12459,7 @@ sub_020468F4: ; 0x020468F4
 	ldr r0, [r0, #0xc]
 	bl Sav2_GameStats_get
 	add r1, r4, #0
-	bl sub_0202D1C0
+	bl GameStats_AddSpecial
 	mov r0, #0
 	pop {r3, r4, r5, pc}
 	.balign 4, 0
--- a/asm/scrcmd_9.s
+++ b/asm/scrcmd_9.s
@ -919,7 +919,7 @@ sub_0204A31C: ; 0x0204A31C
 	bl Sav2_GameStats_get
 	mov r1, #0x45
 	add r2, r6, #0
-	bl sub_0202D144
+	bl GameStats_Add
 	add r0, r4, #0
 	bl sub_0202D918
 	add r1, r6, #0
@ -951,7 +951,7 @@ sub_0204A360: ; 0x0204A360
 	bl Sav2_GameStats_get
 	mov r1, #0x46
 	add r2, r6, #0
-	bl sub_0202D144
+	bl GameStats_Add
 	add r0, r4, #0
 	bl sub_0202D918
 	add r1, r6, #0
@ -1805,7 +1805,7 @@ _0204A9E0:
 _0204A9EE:
 	add r0, r7, #0
 	mov r1, #0x1e
-	bl sub_0202D18C
+	bl GameStats_GetCapped
 	str r0, [r4, #0x20]
 _0204A9F8:
 	ldrb r0, [r4, #0xf]
@ -2331,7 +2331,7 @@ _0204ADD0:
 	ldrb r2, [r5, #0xd]
 	ldr r0, [sp, #4]
 	mov r1, #0x1e
-	bl sub_0202D144
+	bl GameStats_Add
 	ldrb r1, [r5, #0xf]
 	ldr r0, [r5, #0x74]
 	mov r2, #2
@ -2343,7 +2343,7 @@ _0204ADD0:
 	bl Sav2_GameStats_get
 	mov r1, #0x10
 	mov r2, #1
-	bl sub_0202D144
+	bl GameStats_Add
 _0204ADF8:
 	add r0, r5, #0
 	bl sub_0204B318
@ -2460,7 +2460,7 @@ _0204AEC2:
 	ldr r0, [sp, #4]
 	mov r1, #0x1e
 	mov r2, #7
-	bl sub_0202D144
+	bl GameStats_Add
 	ldrb r1, [r5, #0xf]
 	ldr r0, [r5, #0x74]
 	mov r2, #3
@ -2471,11 +2471,11 @@ _0204AEC2:
 	ldr r0, [sp, #4]
 	mov r1, #0x10
 	mov r2, #1
-	bl sub_0202D144
+	bl GameStats_Add
 _0204AF0A:
 	ldr r0, [sp, #4]
 	mov r1, #0xe
-	bl sub_0202D1C0
+	bl GameStats_AddSpecial
 	add r0, r5, #0
 	bl sub_0204B318
 	lsl r3, r6, #0x10
--- a/asm/unk_0202CF1C.s
+++ b/asm/unk_0202CF1C.s
@ -39,7 +39,7 @@ GameStats_init: ; 0x0202CF24
 	strh r1, [r4, r0]
 	add r0, r4, #0
 	mov r1, #2
-	bl sub_0202CF60
+	bl GameStats_Release
 	pop {r4, pc}
 	.balign 4, 0
 _0202CF4C: .word 0x027FFC3C ; HW_VBLANK_COUNT_BUF
@ -55,8 +55,8 @@ Sav2_GameStats_get: ; 0x0202CF54
 _0202CF5C: .word SavArray_get
 	thumb_func_end Sav2_GameStats_get

-	thumb_func_start sub_0202CF60
-sub_0202CF60: ; 0x0202CF60
+	thumb_func_start GameStats_Release
+GameStats_Release: ; 0x0202CF60
 	push {r4, lr}
 	add r4, r0, #0
 	cmp r1, #1
@ -64,7 +64,7 @@ sub_0202CF60: ; 0x0202CF60
 	mov r1, #0x6d
 	add r0, #8
 	lsl r1, r1, #2
-	bl sub_0201FF28
+	bl Math_CalcArraySum
 	mov r3, #0x6f
 	lsl r3, r3, #2
 	strh r0, [r4, r3]
@ -80,10 +80,10 @@ sub_0202CF60: ; 0x0202CF60
 	bl _MonEncryptSegment
 _0202CF8E:
 	pop {r4, pc}
-	thumb_func_end sub_0202CF60
+	thumb_func_end GameStats_Release

-	thumb_func_start sub_0202CF90
-sub_0202CF90: ; 0x0202CF90
+	thumb_func_start GameStats_Acquire
+GameStats_Acquire: ; 0x0202CF90
 	push {r4, lr}
 	add r4, r0, #0
 	cmp r1, #1
@ -102,10 +102,10 @@ sub_0202CF90: ; 0x0202CF90
 	bl _MonDecryptSegment
 _0202CFB2:
 	pop {r4, pc}
-	thumb_func_end sub_0202CF90
+	thumb_func_end GameStats_Acquire

-	thumb_func_start sub_0202CFB4
-sub_0202CFB4: ; 0x0202CFB4
+	thumb_func_start GameStats_GetValue
+GameStats_GetValue: ; 0x0202CFB4
 	push {r3, lr}
 	cmp r1, #0x48
 	bge _0202CFC0
@ -127,10 +127,10 @@ _0202CFD2:
 	mov r0, #0
 	pop {r3, pc}
 	.balign 4, 0
-	thumb_func_end sub_0202CFB4
+	thumb_func_end GameStats_GetValue

-	thumb_func_start sub_0202CFDC
-sub_0202CFDC: ; 0x0202CFDC
+	thumb_func_start GameStats_SetValue
+GameStats_SetValue: ; 0x0202CFDC
 	push {r3, r4, r5, lr}
 	add r4, r1, #0
 	add r5, r0, #0
@ -155,13 +155,13 @@ _0202D000:
 _0202D004:
 	add r0, r5, #0
 	add r1, r4, #0
-	bl sub_0202CFB4
+	bl GameStats_GetValue
 	pop {r3, r4, r5, pc}
 	.balign 4, 0
-	thumb_func_end sub_0202CFDC
+	thumb_func_end GameStats_SetValue

-	thumb_func_start sub_0202D010
-sub_0202D010: ; 0x0202D010
+	thumb_func_start GameStats_GetMaxValue
+GameStats_GetMaxValue: ; 0x0202D010
 	push {r3, lr}
 	cmp r0, #0x48
 	bge _0202D026
@ -196,66 +196,66 @@ _0202D048: .word 0x3B9AC9FF
 _0202D04C: .word 0x000F423F
 _0202D050: .word 0x0000FFFF
 _0202D054: .word 0x0000270F
-	thumb_func_end sub_0202D010
+	thumb_func_end GameStats_GetMaxValue

-	thumb_func_start sub_0202D058
-sub_0202D058: ; 0x0202D058
+	thumb_func_start GameStats_GetStdInc
+GameStats_GetStdInc: ; 0x0202D058
 	lsl r1, r0, #1
 	ldr r0, _0202D060 ; =_020F67DC
 	ldrh r0, [r0, r1]
 	bx lr
 	.balign 4, 0
 _0202D060: .word _020F67DC
-	thumb_func_end sub_0202D058
+	thumb_func_end GameStats_GetStdInc

-	thumb_func_start sub_0202D064
-sub_0202D064: ; 0x0202D064
+	thumb_func_start GameStats_SetCapped
+GameStats_SetCapped: ; 0x0202D064
 	push {r3, r4, r5, r6, r7, lr}
 	add r4, r1, #0
 	add r5, r0, #0
 	add r0, r4, #0
 	add r6, r2, #0
-	bl sub_0202D010
+	bl GameStats_GetMaxValue
 	add r7, r0, #0
 	add r0, r5, #0
 	add r1, r4, #0
-	bl sub_0202CF90
+	bl GameStats_Acquire
 	cmp r6, r7
 	bhs _0202D08C
 	add r0, r5, #0
 	add r1, r4, #0
 	add r2, r6, #0
-	bl sub_0202CFDC
+	bl GameStats_SetValue
 	b _0202D096
 _0202D08C:
 	add r0, r5, #0
 	add r1, r4, #0
 	add r2, r7, #0
-	bl sub_0202CFDC
+	bl GameStats_SetValue
 _0202D096:
 	add r6, r0, #0
 	add r0, r5, #0
 	add r1, r4, #0
-	bl sub_0202CF60
+	bl GameStats_Release
 	add r0, r6, #0
 	pop {r3, r4, r5, r6, r7, pc}
-	thumb_func_end sub_0202D064
+	thumb_func_end GameStats_SetCapped

-	thumb_func_start sub_0202D0A4
-sub_0202D0A4: ; 0x0202D0A4
+	thumb_func_start GameStats_UpdateBounded
+GameStats_UpdateBounded: ; 0x0202D0A4
 	push {r3, r4, r5, r6, r7, lr}
 	add r5, r1, #0
 	add r6, r0, #0
 	add r0, r5, #0
 	add r7, r2, #0
-	bl sub_0202D010
+	bl GameStats_GetMaxValue
 	add r4, r0, #0
 	add r0, r6, #0
 	add r1, r5, #0
-	bl sub_0202CF90
+	bl GameStats_Acquire
 	add r0, r6, #0
 	add r1, r5, #0
-	bl sub_0202CFB4
+	bl GameStats_GetValue
 	str r0, [sp]
 	cmp r7, r4
 	bls _0202D0CC
@ -267,7 +267,7 @@ _0202D0CC:
 	add r0, r6, #0
 	add r1, r5, #0
 	add r2, r7, #0
-	bl sub_0202CFDC
+	bl GameStats_SetValue
 	str r0, [sp]
 	b _0202D0F0
 _0202D0E0:
@ -276,106 +276,106 @@ _0202D0E0:
 	add r0, r6, #0
 	add r1, r5, #0
 	add r2, r4, #0
-	bl sub_0202CFDC
+	bl GameStats_SetValue
 	str r0, [sp]
 _0202D0F0:
 	add r0, r6, #0
 	add r1, r5, #0
-	bl sub_0202CF60
+	bl GameStats_Release
 	ldr r0, [sp]
 	pop {r3, r4, r5, r6, r7, pc}
-	thumb_func_end sub_0202D0A4
+	thumb_func_end GameStats_UpdateBounded

-	thumb_func_start sub_0202D0FC
-sub_0202D0FC: ; 0x0202D0FC
+	thumb_func_start GameStats_Inc
+GameStats_Inc: ; 0x0202D0FC
 	push {r4, r5, r6, lr}
 	add r4, r1, #0
 	add r5, r0, #0
 	add r0, r4, #0
-	bl sub_0202D010
+	bl GameStats_GetMaxValue
 	add r6, r0, #0
 	add r0, r5, #0
 	add r1, r4, #0
-	bl sub_0202CF90
+	bl GameStats_Acquire
 	add r0, r5, #0
 	add r1, r4, #0
-	bl sub_0202CFB4
+	bl GameStats_GetValue
 	add r2, r0, #1
 	cmp r2, r6
 	bhs _0202D12A
 	add r0, r5, #0
 	add r1, r4, #0
-	bl sub_0202CFDC
+	bl GameStats_SetValue
 	b _0202D134
 _0202D12A:
 	add r0, r5, #0
 	add r1, r4, #0
 	add r2, r6, #0
-	bl sub_0202CFDC
+	bl GameStats_SetValue
 _0202D134:
 	add r6, r0, #0
 	add r0, r5, #0
 	add r1, r4, #0
-	bl sub_0202CF60
+	bl GameStats_Release
 	add r0, r6, #0
 	pop {r4, r5, r6, pc}
 	.balign 4, 0
-	thumb_func_end sub_0202D0FC
+	thumb_func_end GameStats_Inc

-	thumb_func_start sub_0202D144
-sub_0202D144: ; 0x0202D144
+	thumb_func_start GameStats_Add
+GameStats_Add: ; 0x0202D144
 	push {r3, r4, r5, r6, r7, lr}
 	add r4, r1, #0
 	add r5, r0, #0
 	add r0, r4, #0
 	add r7, r2, #0
-	bl sub_0202D010
+	bl GameStats_GetMaxValue
 	add r6, r0, #0
 	add r0, r5, #0
 	add r1, r4, #0
-	bl sub_0202CF90
+	bl GameStats_Acquire
 	add r0, r5, #0
 	add r1, r4, #0
-	bl sub_0202CFB4
+	bl GameStats_GetValue
 	add r2, r0, r7
 	cmp r2, r6
 	bhs _0202D174
 	add r0, r5, #0
 	add r1, r4, #0
-	bl sub_0202CFDC
+	bl GameStats_SetValue
 	b _0202D17E
 _0202D174:
 	add r0, r5, #0
 	add r1, r4, #0
 	add r2, r6, #0
-	bl sub_0202CFDC
+	bl GameStats_SetValue
 _0202D17E:
 	add r6, r0, #0
 	add r0, r5, #0
 	add r1, r4, #0
-	bl sub_0202CF60
+	bl GameStats_Release
 	add r0, r6, #0
 	pop {r3, r4, r5, r6, r7, pc}
-	thumb_func_end sub_0202D144
+	thumb_func_end GameStats_Add

-	thumb_func_start sub_0202D18C
-sub_0202D18C: ; 0x0202D18C
+	thumb_func_start GameStats_GetCapped
+GameStats_GetCapped: ; 0x0202D18C
 	push {r3, r4, r5, r6, r7, lr}
 	add r7, r1, #0
 	add r5, r0, #0
 	add r0, r7, #0
-	bl sub_0202D010
+	bl GameStats_GetMaxValue
 	add r4, r0, #0
 	add r0, r5, #0
 	add r1, r7, #0
-	bl sub_0202CF90
+	bl GameStats_Acquire
 	add r0, r5, #0
 	add r1, r7, #0
-	bl sub_0202CFB4
+	bl GameStats_GetValue
 	add r6, r0, #0
 	add r0, r5, #0
 	add r1, r7, #0
-	bl sub_0202CF60
+	bl GameStats_Release
 	cmp r6, r4
 	bhi _0202D1BA
 	add r4, r6, #0
@ -383,10 +383,10 @@ _0202D1BA:
 	add r0, r4, #0
 	pop {r3, r4, r5, r6, r7, pc}
 	.balign 4, 0
-	thumb_func_end sub_0202D18C
+	thumb_func_end GameStats_GetCapped

-	thumb_func_start sub_0202D1C0
-sub_0202D1C0: ; 0x0202D1C0
+	thumb_func_start GameStats_AddSpecial
+GameStats_AddSpecial: ; 0x0202D1C0
 	push {r4, r5, r6, lr}
 	add r6, r1, #0
 	add r5, r0, #0
@ -396,38 +396,38 @@ sub_0202D1C0: ; 0x0202D1C0
 _0202D1CE:
 	add r0, r5, #0
 	mov r1, #2
-	bl sub_0202D18C
+	bl GameStats_GetCapped
 	add r4, r0, #0
 	add r0, r6, #0
-	bl sub_0202D058
+	bl GameStats_GetStdInc
 	ldr r2, _0202D204 ; =0x05F5E0FF
 	add r0, r4, r0
 	cmp r0, r2
 	bls _0202D1F0
 	add r0, r5, #0
 	mov r1, #2
-	bl sub_0202D064
+	bl GameStats_SetCapped
 	pop {r4, r5, r6, pc}
 _0202D1F0:
 	add r0, r6, #0
-	bl sub_0202D058
+	bl GameStats_GetStdInc
 	add r2, r0, #0
 	add r0, r5, #0
 	mov r1, #2
-	bl sub_0202D144
+	bl GameStats_Add
 	pop {r4, r5, r6, pc}
 	nop
 _0202D204: .word 0x05F5E0FF
-	thumb_func_end sub_0202D1C0
+	thumb_func_end GameStats_AddSpecial

-	thumb_func_start sub_0202D208
-sub_0202D208: ; 0x0202D208
-	ldr r3, _0202D210 ; =sub_0202D18C
+	thumb_func_start GameStats_GetStat2
+GameStats_GetStat2: ; 0x0202D208
+	ldr r3, _0202D210 ; =GameStats_GetCapped
 	mov r1, #2
 	bx r3
 	nop
-_0202D210: .word sub_0202D18C
-	thumb_func_end sub_0202D208
+_0202D210: .word GameStats_GetCapped
+	thumb_func_end GameStats_GetStat2

 	thumb_func_start GameStats_IncSpeciesCaught
 GameStats_IncSpeciesCaught: ; 0x0202D214
@ -440,7 +440,7 @@ GameStats_IncSpeciesCaught: ; 0x0202D214
 	bne _0202D22C
 	add r0, r4, #0
 	mov r1, #0x15
-	bl sub_0202D1C0
+	bl GameStats_AddSpecial
 _0202D22C:
 	pop {r4, pc}
 	.balign 4, 0
--- a/asm/unk_0202E4B0.s
+++ b/asm/unk_0202E4B0.s
@ -202,13 +202,13 @@ _0202E5BA:
 _0202E5C8:
 	add r0, r4, #0
 	mov r1, #0x10
-	bl sub_0202D18C
+	bl GameStats_GetCapped
 	str r0, [sp, #8]
 	cmp r0, #0
 	beq _0202E5E6
 	add r0, r4, #0
 	mov r1, #0x1e
-	bl sub_0202D18C
+	bl GameStats_GetCapped
 	ldr r1, [sp, #8]
 	bl _u32_div_f
 	str r0, [sp, #8]
@ -219,11 +219,11 @@ _0202E5E6:
 _0202E5EC:
 	add r0, r4, #0
 	mov r1, #0x5d
-	bl sub_0202D18C
+	bl GameStats_GetCapped
 	str r0, [sp, #0xc]
 	add r0, r4, #0
 	mov r1, #0x5e
-	bl sub_0202D18C
+	bl GameStats_GetCapped
 	ldr r1, [sp, #0xc]
 	add r0, r1, r0
 	str r0, [r5]
@ -231,11 +231,11 @@ _0202E5EC:
 _0202E606:
 	add r0, r4, #0
 	mov r1, #0x5b
-	bl sub_0202D18C
+	bl GameStats_GetCapped
 	str r0, [sp, #0x10]
 	add r0, r4, #0
 	mov r1, #0x5c
-	bl sub_0202D18C
+	bl GameStats_GetCapped
 	ldr r1, [sp, #0x10]
 	add r1, r1, r0
 	beq _0202E62C
@ -262,7 +262,7 @@ _0202E630:
 _0202E646:
 	ldr r1, [r7]
 	add r0, r4, #0
-	bl sub_0202D18C
+	bl GameStats_GetCapped
 	str r0, [r5]
 _0202E650:
 	add r6, r6, #1
--- a/asm/unk_0203E348.s
+++ b/asm/unk_0203E348.s
@ -1442,7 +1442,7 @@ sub_0203ED24: ; 0x0203ED24
 	ldr r0, [r4, #0x18]
 	bl Sav2_GameStats_get
 	mov r1, #0
-	bl sub_0202D18C
+	bl GameStats_GetCapped
 	str r0, [r4, #0x10]
 	cmp r6, #1
 	bne _0203ED72
@ -1487,7 +1487,7 @@ sub_0203ED80: ; 0x0203ED80
 	ldr r0, [r4, #0x18]
 	bl Sav2_GameStats_get
 	mov r1, #0
-	bl sub_0202D18C
+	bl GameStats_GetCapped
 	str r0, [r4, #0x10]
 	mov r0, #3
 	strb r0, [r4]
@ -2362,13 +2362,13 @@ _0203F472:
 	bl Sav2_GameStats_get
 	mov r1, #0x10
 	add r4, r0, #0
-	bl sub_0202D1C0
+	bl GameStats_AddSpecial
 	bl sub_02039998
 	cmp r0, #0
 	beq _0203F49A
 	add r0, r4, #0
 	mov r1, #0x72
-	bl sub_0202D0FC
+	bl GameStats_Inc
 _0203F49A:
 	mov r0, #0
 	add sp, #0x2c
--- a/asm/unk_0204F500.s
+++ b/asm/unk_0204F500.s
@ -194,7 +194,7 @@ _0204F602:
 	bl Sav2_GameStats_get
 	mov r1, #0x45
 	add r2, r6, #0
-	bl sub_0202D144
+	bl GameStats_Add
 	cmp r6, #0
 	beq _0204F630
 	ldr r0, [sp, #8]
--- a/asm/unk_02050660.s
+++ b/asm/unk_02050660.s
@ -221,7 +221,7 @@ _020507CE:
 	beq _02050800
 	ldr r0, [r5, #0xc]
 	bl SavArray_PlayerParty_get
-	bl sub_02090C1C
+	bl HealParty
 	b _0205080A
 _02050800:
 	add r0, r6, #0
@ -236,7 +236,7 @@ _0205080A:
 	beq _02050822
 	ldr r0, [r5, #0xc]
 	bl SavArray_PlayerParty_get
-	bl sub_02090C1C
+	bl HealParty
 _02050822:
 	ldr r1, [r6, #0x10]
 	add r0, r5, #0
@ -383,7 +383,7 @@ _0205091E:
 	ldr r0, [r7, #0xc]
 	bl Sav2_GameStats_get
 	mov r1, #0x14
-	bl sub_0202D1C0
+	bl GameStats_AddSpecial
 	add r0, r5, #0
 	add r1, r7, #0
 	bl sub_020506F4
@ -450,7 +450,7 @@ _020509AE:
 	ldr r0, [r6, #0xc]
 	bl Sav2_GameStats_get
 	mov r1, #0x14
-	bl sub_0202D1C0
+	bl GameStats_AddSpecial
 	add r0, r5, #0
 	add r1, r6, #0
 	bl sub_020506F4
@ -770,7 +770,7 @@ _02050C48:
 	ldr r0, [r5, #0xc]
 	bl Sav2_GameStats_get
 	mov r1, #8
-	bl sub_0202D0FC
+	bl GameStats_Inc
 	ldr r1, [r4, #4]
 	ldr r2, [r4, #8]
 	add r0, r6, #0
@ -823,7 +823,7 @@ _02050CBE:
 	beq _02050CD6
 	ldr r0, [r5, #0xc]
 	bl SavArray_PlayerParty_get
-	bl sub_02090C1C
+	bl HealParty
 _02050CD6:
 	ldr r1, [r4, #0x10]
 	add r0, r5, #0
@ -901,7 +901,7 @@ _02050D68:
 	ldr r0, [r5, #0xc]
 	bl Sav2_GameStats_get
 	mov r1, #8
-	bl sub_0202D0FC
+	bl GameStats_Inc
 	ldr r1, [r6, #4]
 	ldr r2, [r6, #8]
 	add r0, r7, #0
@ -1097,7 +1097,7 @@ _02050F08:
 	ldr r0, [r6, #0xc]
 	bl Sav2_GameStats_get
 	mov r1, #8
-	bl sub_0202D0FC
+	bl GameStats_Inc
 	ldr r1, [r5, #4]
 	ldr r2, [r5, #8]
 	add r0, r7, #0
@ -1260,7 +1260,7 @@ _02051062:
 	ldr r0, [r5, #0xc]
 	bl Sav2_GameStats_get
 	mov r1, #8
-	bl sub_0202D0FC
+	bl GameStats_Inc
 	add r0, r4, #0
 	bl sub_020517E8
 	add r5, r0, #0
@ -1320,7 +1320,7 @@ _020510E6:
 	ldr r0, [r5, #0xc]
 	bl Sav2_GameStats_get
 	mov r1, #8
-	bl sub_0202D0FC
+	bl GameStats_Inc
 	add r0, r4, #0
 	bl sub_020517E8
 	add r5, r0, #0
@ -1372,7 +1372,7 @@ _0205114E:
 	ldr r0, [r6, #0xc]
 	bl Sav2_GameStats_get
 	mov r1, #8
-	bl sub_0202D0FC
+	bl GameStats_Inc
 	ldr r1, [r5, #4]
 	ldr r2, [r5, #8]
 	add r0, r7, #0
@ -1499,7 +1499,7 @@ sub_02051228: ; 0x02051228
 	ldr r0, [r5, #0xc]
 	bl Sav2_GameStats_get
 	mov r1, #8
-	bl sub_0202D0FC
+	bl GameStats_Inc
 	add r0, r4, #0
 	bl sub_020517E8
 	add r5, r0, #0
@ -1683,7 +1683,7 @@ _020513AC:
 	ldr r0, [r0, #0xc]
 	bl Sav2_GameStats_get
 	mov r1, #9
-	bl sub_0202D0FC
+	bl GameStats_Inc
 	ldr r0, [sp, #0x2c]
 	cmp r0, #0
 	beq _020513FE
@ -2017,7 +2017,7 @@ _02051684:
 	ldr r0, [r4, #0xc]
 	bl Sav2_GameStats_get
 	mov r1, #9
-	bl sub_0202D1C0
+	bl GameStats_AddSpecial
 	pop {r3, r4, r5, pc}
 _02051696:
 	cmp r2, #4
@ -2036,12 +2036,12 @@ _02051696:
 	beq _020516C4
 	bl Sav2_GameStats_get
 	mov r1, #0xa
-	bl sub_0202D1C0
+	bl GameStats_AddSpecial
 	pop {r3, r4, r5, pc}
 _020516C4:
 	bl Sav2_GameStats_get
 	mov r1, #0xb
-	bl sub_0202D1C0
+	bl GameStats_AddSpecial
 	pop {r3, r4, r5, pc}
 _020516D0:
 	mov r3, #1
@ -2056,7 +2056,7 @@ _020516DC:
 	ldr r0, [r4, #0xc]
 	bl Sav2_GameStats_get
 	mov r1, #0xc
-	bl sub_0202D1C0
+	bl GameStats_AddSpecial
 	pop {r3, r4, r5, pc}
 _020516EE:
 	mov r3, #0x20
@ -2083,12 +2083,12 @@ _020516FC:
 	beq _0205172A
 	bl Sav2_GameStats_get
 	mov r1, #0xa
-	bl sub_0202D1C0
+	bl GameStats_AddSpecial
 	pop {r3, r4, r5, pc}
 _0205172A:
 	bl Sav2_GameStats_get
 	mov r1, #0xb
-	bl sub_0202D1C0
+	bl GameStats_AddSpecial
 _02051734:
 	pop {r3, r4, r5, pc}
 	.balign 4, 0
@ -4263,7 +4263,7 @@ _0205288C:
 	bl sub_02067BD0
 	ldr r0, [r5, #0xc]
 	bl SavArray_PlayerParty_get
-	bl sub_02090C1C
+	bl HealParty
 	ldr r0, [r4]
 	add r0, r0, #1
 	str r0, [r4]
@ -4397,7 +4397,7 @@ _020529BE:
 	bl sub_02067BD0
 	ldr r0, [r5, #0xc]
 	bl SavArray_PlayerParty_get
-	bl sub_02090C1C
+	bl HealParty
 	ldr r0, [r4]
 	add r0, r0, #1
 	str r0, [r4]
@ -4622,7 +4622,7 @@ _02052B8E:
 _02052B96:
 	ldr r0, [r6, #0xc]
 	bl SavArray_PlayerParty_get
-	bl sub_02090C1C
+	bl HealParty
 	ldr r0, [r6, #0xc]
 	bl sub_020273F0
 	add r7, r0, #0
@ -4825,7 +4825,7 @@ _02052D3A:
 	ldr r0, [r4, #0xc]
 	bl Sav2_GameStats_get
 	mov r1, #0x4a
-	bl sub_0202D0FC
+	bl GameStats_Inc
 _02052D70:
 	ldr r0, [sp]
 	ldr r1, _02052D80 ; =sub_02052AA0
@ -10551,7 +10551,7 @@ _0205585E:
 	str r0, [r4, #0x48]
 	add r0, r5, #0
 	mov r1, #0x11
-	bl sub_0202D1C0
+	bl GameStats_AddSpecial
 	pop {r3, r4, r5, pc}
 	nop
 _0205586C: .word 0x021D4178
@ -29304,14 +29304,14 @@ sub_0205E048: ; 0x0205E048
 	bl Sav2_GameStats_get
 	mov r1, #0
 	add r4, r0, #0
-	bl sub_0202D0FC
+	bl GameStats_Inc
 	ldr r0, [r5, #0x40]
 	bl sub_0205C700
 	cmp r0, #1
 	bne _0205E074
 	add r0, r4, #0
 	mov r1, #1
-	bl sub_0202D0FC
+	bl GameStats_Inc
 _0205E074:
 	pop {r3, r4, r5, pc}
 	.balign 4, 0
@ -53902,7 +53902,7 @@ sub_02068FC8: ; 0x02068FC8
 	bl sub_0202A5F4
 	str r0, [sp, #0x3c]
 	add r0, r4, #0
-	bl sub_0202D208
+	bl GameStats_GetStat2
 	ldr r1, [sp, #0x38]
 	ldr r2, [sp, #0x30]
 	str r1, [sp]
@ -53946,27 +53946,27 @@ sub_02068FC8: ; 0x02068FC8
 	str r0, [sp, #0x44]
 	add r0, r4, #0
 	mov r1, #0x21
-	bl sub_0202D18C
+	bl GameStats_GetCapped
 	str r0, [sp, #0x48]
 	add r0, r4, #0
 	mov r1, #0x1a
-	bl sub_0202D18C
+	bl GameStats_GetCapped
 	str r0, [sp, #0x4c]
 	add r0, r4, #0
 	mov r1, #0x15
-	bl sub_0202D18C
+	bl GameStats_GetCapped
 	str r0, [sp, #0x50]
 	add r0, r4, #0
 	mov r1, #0x19
-	bl sub_0202D18C
+	bl GameStats_GetCapped
 	str r0, [sp, #0x54]
 	add r0, r4, #0
 	mov r1, #0x5c
-	bl sub_0202D18C
+	bl GameStats_GetCapped
 	str r0, [sp, #0x58]
 	add r0, r4, #0
 	mov r1, #0x14
-	bl sub_0202D18C
+	bl GameStats_GetCapped
 	ldr r1, [sp, #0x58]
 	add r1, r1, r0
 	ldr r0, [sp, #0x54]
@ -53978,27 +53978,27 @@ sub_02068FC8: ; 0x02068FC8
 	str r0, [sp, #0x5c]
 	add r0, r4, #0
 	mov r1, #0x16
-	bl sub_0202D18C
+	bl GameStats_GetCapped
 	str r0, [sp, #0x60]
 	add r0, r4, #0
 	mov r1, #0x1b
-	bl sub_0202D18C
+	bl GameStats_GetCapped
 	str r0, [sp, #0x64]
 	add r0, r4, #0
 	mov r1, #0x17
-	bl sub_0202D18C
+	bl GameStats_GetCapped
 	str r0, [sp, #0x68]
 	add r0, r4, #0
 	mov r1, #0x1c
-	bl sub_0202D18C
+	bl GameStats_GetCapped
 	str r0, [sp, #0x6c]
 	add r0, r4, #0
 	mov r1, #0x14
-	bl sub_0202D18C
+	bl GameStats_GetCapped
 	str r0, [sp, #0x70]
 	add r0, r4, #0
 	mov r1, #0x19
-	bl sub_0202D18C
+	bl GameStats_GetCapped
 	add r4, r0, #0
 	ldr r0, [sp, #0x44]
 	bl sub_0202C9E8
@ -59983,7 +59983,7 @@ sub_0206BED8: ; 0x0206BED8
 	add r4, r2, #0
 	bl Sav2_GameStats_get
 	mov r1, #0x29
-	bl sub_0202D0FC
+	bl GameStats_Inc
 	add r0, r4, #0
 	bl sub_0206BDF4
 	add r1, r0, #0
--- a/asm/unk_02072914.s
+++ b/asm/unk_02072914.s
@ -8033,10 +8033,10 @@ _02076478:
 	bl Pokedex_SetMonCaughtFlag
 	ldr r0, [r4, #0x50]
 	mov r1, #0xd
-	bl sub_0202D0FC
+	bl GameStats_Inc
 	ldr r0, [r4, #0x50]
 	mov r1, #0x15
-	bl sub_0202D1C0
+	bl GameStats_AddSpecial
 	ldr r0, [r4, #0x28]
 	mov r1, #0x4d
 	mov r2, #0
@ -9162,10 +9162,10 @@ _02076D62:
 	bl Pokedex_SetMonCaughtFlag
 	ldr r0, [r4, #0x50]
 	mov r1, #0xd
-	bl sub_0202D0FC
+	bl GameStats_Inc
 	ldr r0, [r4, #0x50]
 	mov r1, #0x15
-	bl sub_0202D1C0
+	bl GameStats_AddSpecial
 	add r0, r5, #0
 	bl FreeToHeap
 	ldr r0, [r4, #0x4c]
@ -61654,8 +61654,8 @@ _02090C08:
 	bx r3
 	thumb_func_end sub_02090B68

-	thumb_func_start sub_02090C1C
-sub_02090C1C: ; 0x02090C1C
+	thumb_func_start HealParty
+HealParty: ; 0x02090C1C
 	push {r4, r5, r6, r7, lr}
 	sub sp, #0xc
 	str r0, [sp]
@ -61713,7 +61713,7 @@ _02090C88:
 _02090C90:
 	add sp, #0xc
 	pop {r4, r5, r6, r7, pc}
-	thumb_func_end sub_02090C1C
+	thumb_func_end HealParty

 	thumb_func_start sub_02090C94
 sub_02090C94: ; 0x02090C94
--- a/global.inc
+++ b/global.inc
@ -264,7 +264,7 @@
 .public LoadDwcOverlay
 .public LoadHallOfFame
 .public LoadOVY38
-.public MATH_CalcCRC16CCITT
+.public GF_CalcCRC16
 .public MIC_Init
 .public MI_Copy36B
 .public MI_UncompressLZ8
@ -25089,10 +25089,10 @@
 .public sub_0201FD14
 .public sub_0201FD20
 .public sub_0201FECC
-.public sub_0201FF28
+.public Math_CalcArraySum
 .public _MonEncryptSegment
 .public _MonDecryptSegment
-.public sub_0201FFB0
+.public GF_CRC16Init
 .public sub_0201FFE0
 .public sub_02020080
 .public sub_02020094
@ -25676,13 +25676,13 @@
 .public Chatot_Decode
 .public Chatot_Encode
 .public Chatot_copy
-.public sub_0202D064
-.public sub_0202D0A4
-.public sub_0202D0FC
-.public sub_0202D144
-.public sub_0202D18C
-.public sub_0202D1C0
-.public sub_0202D208
+.public GameStats_SetCapped
+.public GameStats_UpdateBounded
+.public GameStats_Inc
+.public GameStats_Add
+.public GameStats_GetCapped
+.public GameStats_AddSpecial
+.public GameStats_GetStat2
 .public sub_0202D234
 .public sub_0202D240
 .public sub_0202D254
@ -28280,7 +28280,7 @@
 .public sub_0208F814
 .public sub_0208FB64
 .public sub_020902D0
-.public sub_02090C1C
+.public HealParty
 .public sub_02090C94
 .public sub_02090D0C
 .public sub_02090D14
@ -29127,13 +29127,13 @@
 .public sub_020E3758
 .public sub_020E3798
 .public sub_020E37D8
-.public sub_020E3850
+.public MATHi_CRC16InitTable
 .public sub_020E389C
 .public sub_020E3920
 .public sub_020E3960
 .public sub_020E39DC
 .public sub_020E3A04
-.public sub_020E3A2C
+.public MATH_CalcCRC16CCITT
 .public sub_020E3A58
 .public sub_020E3A84
 .public sub_020E3D74
--- a/lib/asm/nitro.s
+++ b/lib/asm/nitro.s
@ -30783,8 +30783,8 @@ _020E3848:
 	ldmia sp!, {r4, pc}
 	arm_func_end sub_020E3818

-	arm_func_start sub_020E3850
-sub_020E3850: ; 0x020E3850
+	arm_func_start MATHi_CRC16InitTable
+MATHi_CRC16InitTable: ; 0x020E3850
 	stmdb sp!, {r4, lr}
 	mov lr, #0
 	mov r4, lr
@ -30806,7 +30806,7 @@ _020E3868:
 	add r4, r4, #0x100
 	blo _020E3860
 	ldmia sp!, {r4, pc}
-	arm_func_end sub_020E3850
+	arm_func_end MATHi_CRC16InitTable

 	arm_func_start sub_020E389C
 sub_020E389C: ; 0x020E389C
@ -30946,8 +30946,8 @@ sub_020E3A04: ; 0x020E3A04
 	ldmia sp!, {r3, pc}
 	arm_func_end sub_020E3A04

-	arm_func_start sub_020E3A2C
-sub_020E3A2C: ; 0x020E3A2C
+	arm_func_start MATH_CalcCRC16CCITT
+MATH_CalcCRC16CCITT: ; 0x020E3A2C
 	stmdb sp!, {r3, lr}
 	ldr ip, _020E3A54 ; =0x0000FFFF
 	mov lr, r1
@ -30960,7 +30960,7 @@ sub_020E3A2C: ; 0x020E3A2C
 	ldmia sp!, {r3, pc}
 	.align 2, 0
 _020E3A54: .word 0x0000FFFF
-	arm_func_end sub_020E3A2C
+	arm_func_end MATH_CalcCRC16CCITT

 	arm_func_start sub_020E3A58
 sub_020E3A58: ; 0x020E3A58