summaryrefslogtreecommitdiff
path: root/arm9/modules
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/modules')
-rw-r--r--arm9/modules/05/asm/mod05_021D74E0.s2
-rw-r--r--arm9/modules/05/asm/mod05_021D80E8.s6
-rw-r--r--arm9/modules/05/asm/mod05_021E2E88.s2
-rw-r--r--arm9/modules/05/asm/mod05_021EC458.s4
-rw-r--r--arm9/modules/05/asm/mod05_021F5C44.s8
-rw-r--r--arm9/modules/06/asm/module_06.s46
-rw-r--r--arm9/modules/11/asm/module_11_thumb1.s4
-rw-r--r--arm9/modules/11/asm/module_11_thumb2.s16
-rw-r--r--arm9/modules/17/asm/module_17.s2
-rw-r--r--arm9/modules/18/asm/module_18.s36
-rw-r--r--arm9/modules/47/asm/module_47.s2
-rw-r--r--arm9/modules/52/src/module_52.c12
-rw-r--r--arm9/modules/54/asm/module_54.s2
-rw-r--r--arm9/modules/58/asm/module_58.s4
-rw-r--r--arm9/modules/62/asm/module_62.s4
-rw-r--r--arm9/modules/71/asm/module_71.s2
-rw-r--r--arm9/modules/73/asm/module_73.s6
-rw-r--r--arm9/modules/74/asm/module_74.s6
-rw-r--r--arm9/modules/80/asm/module_80.s8
-rw-r--r--arm9/modules/85/asm/module_85.s2
20 files changed, 87 insertions, 87 deletions
diff --git a/arm9/modules/05/asm/mod05_021D74E0.s b/arm9/modules/05/asm/mod05_021D74E0.s
index 4b30f2d3..1ebf4312 100644
--- a/arm9/modules/05/asm/mod05_021D74E0.s
+++ b/arm9/modules/05/asm/mod05_021D74E0.s
@@ -960,7 +960,7 @@ MOD05_021D7CF0: ; 0x021D7CF0
str r0, [r5, #0x2c]
ldr r0, [r5, #0x1c]
ldr r0, [r0]
- bl MapHeader_GetField1
+ bl MapHeader_GetMoveModelBank
add r4, r0, #0
ldr r0, [r5, #0x30]
cmp r0, #0
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_021E2E88.s b/arm9/modules/05/asm/mod05_021E2E88.s
index 9a7c0b1f..eba8807c 100644
--- a/arm9/modules/05/asm/mod05_021E2E88.s
+++ b/arm9/modules/05/asm/mod05_021E2E88.s
@@ -601,7 +601,7 @@ MOD05_021E331C: ; 0x021E331C
add r4, r0, #0
ldr r0, [r4, #0x1c]
ldr r0, [r0]
- bl FUN_02034944
+ bl MapHeader_IsBuilding
cmp r0, #0
bne _021E333E
ldr r0, [r4, #0x1c]
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/47/asm/module_47.s b/arm9/modules/47/asm/module_47.s
index 48bd9b4a..b435d1ed 100644
--- a/arm9/modules/47/asm/module_47.s
+++ b/arm9/modules/47/asm/module_47.s
@@ -199,7 +199,7 @@ _0225498C:
bl MOD47_02254E24
ldr r0, [r5, #0x1c]
ldr r0, [r0]
- bl FUN_02034984
+ bl MapHeader_MapIsPokemonCenter
cmp r0, #0
beq _022549CA
add r0, r4, #0
diff --git a/arm9/modules/52/src/module_52.c b/arm9/modules/52/src/module_52.c
index 08da79f4..a9fdb810 100644
--- a/arm9/modules/52/src/module_52.c
+++ b/arm9/modules/52/src/module_52.c
@@ -1,7 +1,7 @@
#include "module_52.h"
#include "heap.h"
#include "unk_0205FA2C.h"
-#include "unk_02015E30.h"
+#include "play_timer.h"
extern struct Unk21DBE18 UNK_020FD144;
@@ -159,7 +159,7 @@ THUMB_FUNC BOOL MOD52_021D74E0(struct UnkStruct_02006234 *arg1, u32 *arg2)
{
#pragma unused(arg1)
#pragma unused(arg2)
- CreateHeap(3, 0x4d, 2 << 16);
+ CreateHeap(3, 0x4d, 0x20000);
InitializeMainRNG();
return 1;
@@ -189,7 +189,7 @@ THUMB_FUNC BOOL MOD52_021D7528(struct UnkStruct_02006234 *arg1, u32 *arg2)
{
#pragma unused(arg1)
#pragma unused(arg2)
- CreateHeap(3, 0x4d, 2 << 16);
+ CreateHeap(3, 0x4d, 0x20000);
InitializeMainRNG();
return 1;
@@ -202,7 +202,7 @@ THUMB_FUNC BOOL MOD52_021D7540(struct UnkStruct_02006234 *param0, u32 *unused)
MOD52_021D7604(0x4d, sav2, 1);
struct IGT *igt = Sav2_PlayerData_GetIGTAddr(sav2);
- FUN_02015E3C(igt);
+ PlayTimerStart(igt);
return 1;
}
@@ -221,7 +221,7 @@ THUMB_FUNC BOOL MOD52_021D757C(struct UnkStruct_02006234 *arg1, u32 *arg2)
{
#pragma unused(arg1)
#pragma unused(arg2)
- CreateHeap(3, 0x4d, 2 << 16);
+ CreateHeap(3, 0x4d, 0x20000);
InitializeMainRNG();
return 1;
@@ -243,7 +243,7 @@ THUMB_FUNC BOOL MOD52_021D7594(struct UnkStruct_02006234 *param0, u32 *unused)
Sav2_SysInfo_InitFromSystem(sav2_info);
}
- FUN_02015E3C(Sav2_PlayerData_GetIGTAddr(sav2));
+ PlayTimerStart(Sav2_PlayerData_GetIGTAddr(sav2));
return 1;
}
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