summaryrefslogtreecommitdiff
path: root/arm9/asm
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/asm')
-rw-r--r--arm9/asm/scrcmd_9.s4
-rw-r--r--arm9/asm/scrcmd_asm.s24
-rw-r--r--arm9/asm/unk_0202B870.s16
-rw-r--r--arm9/asm/unk_02035068.s4
-rw-r--r--arm9/asm/unk_020377F0.s20
-rw-r--r--arm9/asm/unk_0204653C.s60
-rw-r--r--arm9/asm/unk_020476CC.s8
-rw-r--r--arm9/asm/unk_020484A8.s4
-rw-r--r--arm9/asm/unk_0204B9EC.s4
-rw-r--r--arm9/asm/unk_0204CB20.s8
-rw-r--r--arm9/asm/unk_0204FBA8.s4
-rw-r--r--arm9/asm/unk_020557F4.s4
-rw-r--r--arm9/asm/unk_02064E90.s40
-rw-r--r--arm9/asm/unk_0206C700.s8
-rw-r--r--arm9/asm/unk_02080C38.s18
-rw-r--r--arm9/asm/unk_020854E0.s4
16 files changed, 115 insertions, 115 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
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-07 11:46:24 +0000