Name remaining player_data routines

22 files changed, 72 insertions, 72 deletions

diff --git a/arm9/asm/scrcmd.s b/arm9/asm/scrcmd.s
index 1cd62a91..716c0f15 100644
--- a/arm9/asm/scrcmd.s
+++ b/arm9/asm/scrcmd.s
@@ -7876,7 +7876,7 @@ FUN_0203D834: ; 0x0203D834
 	lsl r1, r1, #0x18
 	add r0, r4, #0x0
 	lsr r1, r1, #0x18
-	bl FUN_02023A2C
+	bl PlayerProfile_SetAvatar
 	mov r0, #0x0
 	pop {r3-r5, pc}
 	.balign 4
@@ -10039,7 +10039,7 @@ FUN_0203E968: ; 0x0203E968
 	ldr r0, [r5, #0x0]
 	ldr r0, [r0, #0xc]
 	bl Sav2_PlayerData_GetProfileAddr
-	bl FUN_02023A90
+	bl PlayerProfile_SetNatDexFlag
 	b _0203E9C8
 _0203E9AE:
 	cmp r4, #0x2
diff --git a/arm9/asm/scrcmd_4.s b/arm9/asm/scrcmd_4.s
index b3af2c5c..14d6ef99 100644
--- a/arm9/asm/scrcmd_4.s
+++ b/arm9/asm/scrcmd_4.s
@@ -441,7 +441,7 @@ FUN_02040A30: ; 0x02040A30
 	bl PlayerProfile_GetTrainerGender
 	add r7, r0, #0x0
 	add r0, r4, #0x0
-	bl FUN_02023A28
+	bl PlayerProfile_GetAvatar
 	add r1, r0, #0x0
 	add r0, r7, #0x0
 	mov r2, #0x2
diff --git a/arm9/asm/unk_02025954.s b/arm9/asm/unk_02025954.s
index 51653819..8cbf5483 100644
--- a/arm9/asm/unk_02025954.s
+++ b/arm9/asm/unk_02025954.s
@@ -501,14 +501,14 @@ _02025C72:
 	add r1, #0xa0
 	str r0, [r1, #0x0]
 	add r0, r6, #0x0
-	bl FUN_02023A70
+	bl PlayerProfile_GetLanguage
 	ldr r1, [sp, #0x0]
 	add r2, r7, r1
 	mov r1, #0x41
 	lsl r1, r1, #0x2
 	strb r0, [r2, r1]
 	add r0, r6, #0x0
-	bl FUN_02023A68
+	bl PlayerProfile_GetVersion
 	ldr r1, [sp, #0x0]
 	add r2, r7, r1
 	ldr r1, _02025CD4 ; =0x00000109
@@ -558,13 +558,13 @@ _02025CE8:
 	add r2, r5, r4
 	ldrb r1, [r2, r1]
 	add r0, r6, #0x0
-	bl FUN_02023A6C
+	bl PlayerProfile_SetVersion
 	mov r1, #0x41
 	add r2, r5, r4
 	lsl r1, r1, #0x2
 	ldrb r1, [r2, r1]
 	add r0, r6, #0x0
-	bl FUN_02023A74
+	bl PlayerProfile_SetLanguage
 	lsl r1, r4, #0x2
 	add r1, r5, r1
 	add r1, #0xa0
diff --git a/arm9/asm/unk_02033778.s b/arm9/asm/unk_02033778.s
index 844eac17..763e7b30 100644
--- a/arm9/asm/unk_02033778.s
+++ b/arm9/asm/unk_02033778.s
@@ -28,7 +28,7 @@ _02033792:
 	add r6, r0, #0x0
 	add r0, r5, #0x0
 	bl FUN_0202DFA4
-	bl FUN_02023A70
+	bl PlayerProfile_GetLanguage
 	add r3, r0, #0x0
 	ldr r0, [sp, #0x0]
 	add r1, r4, #0x0
diff --git a/arm9/asm/unk_02033874.s b/arm9/asm/unk_02033874.s
index e48fdc8a..ddd4483b 100644
--- a/arm9/asm/unk_02033874.s
+++ b/arm9/asm/unk_02033874.s
@@ -341,7 +341,7 @@ _02033B22:
 	ldr r0, [sp, #0x10]
 	bl String_dtor
 	add r0, r6, #0x0
-	bl FUN_02023A28
+	bl PlayerProfile_GetAvatar
 	add r3, r0, #0x0
 	add r0, r4, #0x0
 	add r1, r5, #0x0
diff --git a/arm9/asm/unk_020476CC.s b/arm9/asm/unk_020476CC.s
index 0a74196b..60437a7d 100644
--- a/arm9/asm/unk_020476CC.s
+++ b/arm9/asm/unk_020476CC.s
@@ -950,7 +950,7 @@ _02047E2C:
 	cmp r0, #0x0
 	beq _02047F10
 	ldr r0, [sp, #0x20]
-	bl FUN_02023A28
+	bl PlayerProfile_GetAvatar
 	add r4, r0, #0x0
 	ldr r0, [sp, #0x20]
 	bl PlayerProfile_GetTrainerGender
diff --git a/arm9/asm/unk_020484A8.s b/arm9/asm/unk_020484A8.s
index 81c79a9a..c8fe6f41 100644
--- a/arm9/asm/unk_020484A8.s
+++ b/arm9/asm/unk_020484A8.s
@@ -319,7 +319,7 @@ _0204871E:
 	add r0, r6, #0x0
 	bl FUN_0205ECFC
 	ldr r0, [sp, #0x0]
-	bl FUN_02023A78
+	bl PlayerProfile_SetGameClearFlag
 	ldr r0, [r4, #0xc]
 	bl FUN_02029FC8
 	mov r1, #0x2e
diff --git a/arm9/asm/unk_020520AC.s b/arm9/asm/unk_020520AC.s
index 48a4f8ec..b7b805a2 100644
--- a/arm9/asm/unk_020520AC.s
+++ b/arm9/asm/unk_020520AC.s
@@ -1546,7 +1546,7 @@ _02052B32:
 	lsl r1, r4, #0x2
 	str r0, [r5, r1]
 	add r0, r7, #0x0
-	bl FUN_02023A28
+	bl PlayerProfile_GetAvatar
 	str r0, [sp, #0x0]
 	add r0, r7, #0x0
 	bl PlayerProfile_GetTrainerGender
@@ -1688,7 +1688,7 @@ _02052C46:
 	cmp r0, #0x4
 	beq _02052C78
 	ldr r0, [r5, #0x8]
-	bl FUN_02023A28
+	bl PlayerProfile_GetAvatar
 	add r4, r0, #0x0
 	ldr r0, [r5, #0x8]
 	bl PlayerProfile_GetTrainerGender
@@ -1820,7 +1820,7 @@ _02052D3C:
 	mov r1, #0x1
 	bl BufferPlayersName
 	add r0, r4, #0x0
-	bl FUN_02023A70
+	bl PlayerProfile_GetLanguage
 	add r4, r0, #0x0
 	cmp r4, #0x1
 	blt _02052D80
@@ -1967,7 +1967,7 @@ FUN_02052E38: ; 0x02052E38
 	bl PlayerProfile_GetTrainerGender
 	add r5, r0, #0x0
 	ldr r0, [r4, #0x8]
-	bl FUN_02023A28
+	bl PlayerProfile_GetAvatar
 	add r1, r0, #0x0
 	add r0, r5, #0x0
 	mov r2, #0x0
diff --git a/arm9/asm/unk_02052EE8.s b/arm9/asm/unk_02052EE8.s
index d46e356e..5a3ae781 100644
--- a/arm9/asm/unk_02052EE8.s
+++ b/arm9/asm/unk_02052EE8.s
@@ -342,7 +342,7 @@ _02053166:
 	cmp r6, #0x0
 	beq _020531D8
 	ldr r0, [sp, #0xc]
-	bl FUN_02023A28
+	bl PlayerProfile_GetAvatar
 	strb r0, [r5, #0x14]
 	ldr r0, [sp, #0xc]
 	bl PlayerProfile_GetTrainerID
diff --git a/arm9/asm/unk_02064E90.s b/arm9/asm/unk_02064E90.s
index 27f1c143..ea21d648 100644
--- a/arm9/asm/unk_02064E90.s
+++ b/arm9/asm/unk_02064E90.s
@@ -27,7 +27,7 @@ FUN_02064E90: ; 0x02064E90
 	bl FUN_02065078
 	str r0, [sp, #0x24]
 	add r0, r7, #0x0
-	bl FUN_02023A70
+	bl PlayerProfile_GetLanguage
 	str r0, [sp, #0x0]
 	str r5, [sp, #0x4]
 	ldr r0, [sp, #0x10]
diff --git a/arm9/asm/unk_02066840.s b/arm9/asm/unk_02066840.s
index 52fefe54..d443fce9 100644
--- a/arm9/asm/unk_02066840.s
+++ b/arm9/asm/unk_02066840.s
@@ -72,7 +72,7 @@ FUN_02066840: ; 0x02066840
 	add r0, #0xc8
 	strb r1, [r0, #0x0]
 	add r0, r4, #0x0
-	bl FUN_02023A28
+	bl PlayerProfile_GetAvatar
 	add r1, r0, #0x0
 	add r0, r7, #0x0
 	add r0, #0xc8
diff --git a/arm9/asm/unk_0206BF90.s b/arm9/asm/unk_0206BF90.s
index b6551933..d672d875 100644
--- a/arm9/asm/unk_0206BF90.s
+++ b/arm9/asm/unk_0206BF90.s
@@ -998,10 +998,10 @@ FUN_0206C66C: ; 0x0206C66C
 	bl PlayerProfile_GetTrainerID
 	str r0, [r4, #0x10]
 	add r0, r6, #0x0
-	bl FUN_02023A70
+	bl PlayerProfile_GetLanguage
 	strb r0, [r4, #0x14]
 	add r0, r6, #0x0
-	bl FUN_02023A68
+	bl PlayerProfile_GetVersion
 	strb r0, [r4, #0x15]
 	add r0, r6, #0x0
 	bl PlayerProfile_GetTrainerGender
diff --git a/arm9/asm/unk_02080C38.s b/arm9/asm/unk_02080C38.s
index ed311aef..80943988 100644
--- a/arm9/asm/unk_02080C38.s
+++ b/arm9/asm/unk_02080C38.s
@@ -2350,7 +2350,7 @@ _02081DEC:
 	bl ErrorHandling
 _02081DFA:
 	add r0, r7, #0x0
-	bl FUN_02023A88
+	bl PlayerProfile_GetGameClearFlag
 	cmp r0, #0x0
 	beq _02081E0A
 	add r5, r5, #0x1
@@ -2377,7 +2377,7 @@ _02081E1E:
 	bl ErrorHandling
 _02081E2C:
 	add r0, r7, #0x0
-	bl FUN_02023A9C
+	bl PlayerProfile_GetNatDexFlag
 	cmp r0, #0x0
 	beq _02081E3C
 	add r5, r5, #0x1
diff --git a/arm9/global.inc b/arm9/global.inc
index a5386482..4ce9c8c0 100644
--- a/arm9/global.inc
+++ b/arm9/global.inc
@@ -1494,18 +1494,18 @@
 .extern PlayerProfile_CountBadges
 .extern PlayerProfile_GetMoney
 .extern PlayerProfile_SetMoney
-.extern FUN_02023A28
-.extern FUN_02023A2C
+.extern PlayerProfile_GetAvatar
+.extern PlayerProfile_SetAvatar
 .extern PlayerProfile_AddMoney
 .extern PlayerProfile_SubMoney
-.extern FUN_02023A68
-.extern FUN_02023A6C
-.extern FUN_02023A70
-.extern FUN_02023A74
-.extern FUN_02023A78
-.extern FUN_02023A88
-.extern FUN_02023A90
-.extern FUN_02023A9C
+.extern PlayerProfile_GetVersion
+.extern PlayerProfile_SetVersion
+.extern PlayerProfile_GetLanguage
+.extern PlayerProfile_SetLanguage
+.extern PlayerProfile_SetGameClearFlag
+.extern PlayerProfile_GetGameClearFlag
+.extern PlayerProfile_SetNatDexFlag
+.extern PlayerProfile_GetNatDexFlag
 .extern PlayerProfile_NameAndOTIDMatchPlayer
 .extern FUN_02023AC4
 .extern FUN_02023AC8
diff --git a/arm9/modules/16/asm/module_16.s b/arm9/modules/16/asm/module_16.s
index c3c739e5..6b18fb65 100644
--- a/arm9/modules/16/asm/module_16.s
+++ b/arm9/modules/16/asm/module_16.s
@@ -4630,7 +4630,7 @@ _021D980C:
 	add r0, r5, #0
 	bl MOD16_021D9A78
 	ldr r0, [r4, #4]
-	bl FUN_02023A68
+	bl PlayerProfile_GetVersion
 	ldr r1, _021D989C ; =0x0000174C
 	str r0, [r5, r1]
 	ldr r0, [r4, #4]
diff --git a/arm9/modules/52/asm/module_52.s b/arm9/modules/52/asm/module_52.s
index 829ee276..3fac1c6f 100644
--- a/arm9/modules/52/asm/module_52.s
+++ b/arm9/modules/52/asm/module_52.s
@@ -198,7 +198,7 @@ _021D7656:
 	lsl r1, r1, #0x18
 	add r0, r4, #0
 	lsr r1, r1, #0x18
-	bl FUN_02023A2C
+	bl PlayerProfile_SetAvatar
 	add r0, r5, #0
 	bl FUN_02024ECC
 	ldr r1, [sp]
diff --git a/arm9/modules/54/asm/module_54.s b/arm9/modules/54/asm/module_54.s
index 2c2aad31..0acfed98 100644
--- a/arm9/modules/54/asm/module_54.s
+++ b/arm9/modules/54/asm/module_54.s
@@ -3141,7 +3141,7 @@ _021D8D9E:
 	mov r0, #0xd9
 	lsl r0, r0, #2
 	ldr r0, [r6, r0]
-	bl FUN_02023A28
+	bl PlayerProfile_GetAvatar
 	str r0, [sp, #0x10]
 	bl FUN_02031190
 	cmp r4, r0
diff --git a/arm9/modules/56/asm/module_56.s b/arm9/modules/56/asm/module_56.s
index 755f3092..f5670155 100644
--- a/arm9/modules/56/asm/module_56.s
+++ b/arm9/modules/56/asm/module_56.s
@@ -2022,11 +2022,11 @@ _02212E52:
 	blt _02212E52
 _02212E82:
 	ldr r0, [sp, #0x14]
-	bl FUN_02023A68
+	bl PlayerProfile_GetVersion
 	ldr r1, [r5, #4]
 	strb r0, [r1, #0x18]
 	ldr r0, [sp, #0x14]
-	bl FUN_02023A70
+	bl PlayerProfile_GetLanguage
 	ldr r1, [r5, #4]
 	strb r0, [r1, #0x19]
 	ldr r0, [sp, #0x10]
@@ -2040,7 +2040,7 @@ _02212E82:
 	mov r1, #0
 	strb r1, [r0, #0x1c]
 	ldr r0, [sp, #0x14]
-	bl FUN_02023A28
+	bl PlayerProfile_GetAvatar
 	ldr r1, [r5, #4]
 	strb r0, [r1, #0x1d]
 	ldr r0, [sp, #0x14]
diff --git a/arm9/modules/71/asm/module_71.s b/arm9/modules/71/asm/module_71.s
index 53041f4d..4f418110 100644
--- a/arm9/modules/71/asm/module_71.s
+++ b/arm9/modules/71/asm/module_71.s
@@ -3751,10 +3751,10 @@ MOD71_0222F4BC: ; 0x0222F4BC
 	bl PlayerProfile_GetTrainerID
 	str r0, [r4, #0x10]
 	add r0, r6, #0
-	bl FUN_02023A70
+	bl PlayerProfile_GetLanguage
 	strb r0, [r4, #0x14]
 	add r0, r6, #0
-	bl FUN_02023A68
+	bl PlayerProfile_GetVersion
 	strb r0, [r4, #0x15]
 	add r0, r6, #0
 	bl PlayerProfile_GetTrainerGender
diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s
index 03973e76..28954019 100644
--- a/arm9/modules/80/asm/module_80.s
+++ b/arm9/modules/80/asm/module_80.s
@@ -13612,7 +13612,7 @@ _022342BC:
 	strb r0, [r5, r1]
 	ldr r0, [r4]
 	ldr r0, [r0, #0x1c]
-	bl FUN_02023A28
+	bl PlayerProfile_GetAvatar
 	mov r1, #0x12
 	lsl r1, r1, #4
 	strb r0, [r5, r1]
@@ -17658,11 +17658,11 @@ MOD80_022361AC: ; 0x022361AC
 	ldr r1, _022361E0 ; =0x00000122
 	add r0, r4, #0
 	ldrb r1, [r5, r1]
-	bl FUN_02023A6C
+	bl PlayerProfile_SetVersion
 	ldr r1, _022361E4 ; =0x00000123
 	add r0, r4, #0
 	ldrb r1, [r5, r1]
-	bl FUN_02023A74
+	bl PlayerProfile_SetLanguage
 	add r0, r4, #0
 	pop {r3, r4, r5, pc}
 	.align 2, 0
diff --git a/arm9/src/player_data.c b/arm9/src/player_data.c
index 35daf328..ea5802aa 100644
--- a/arm9/src/player_data.c
+++ b/arm9/src/player_data.c
@@ -156,12 +156,12 @@ u32 PlayerProfile_SetMoney(struct PlayerData * data, u32 amount)
     return amount;
 }
 
-u8 FUN_02023A28(struct PlayerData * data)
+u8 PlayerProfile_GetAvatar(struct PlayerData * data)
 {
     return data->avatar;
 }
 
-void FUN_02023A2C(struct PlayerData * data, u8 avatar)
+void PlayerProfile_SetAvatar(struct PlayerData * data, u8 avatar)
 {
     data->avatar = avatar;
 }
@@ -186,44 +186,44 @@ u32 PlayerProfile_SubMoney(struct PlayerData * data, u32 amount)
     return data->money;
 }
 
-u8 FUN_02023A68(struct PlayerData * data)
+u8 PlayerProfile_GetVersion(struct PlayerData * data)
 {
-    return data->field_1C;
+    return data->version;
 }
 
-void FUN_02023A6C(struct PlayerData * data, u8 a1)
+void PlayerProfile_SetVersion(struct PlayerData * data, u8 a1)
 {
-    data->field_1C = a1;
+    data->version = a1;
 }
 
-u8 FUN_02023A70(struct PlayerData * data)
+u8 PlayerProfile_GetLanguage(struct PlayerData * data)
 {
     return data->language;
 }
 
-void FUN_02023A74(struct PlayerData * data, u8 language)
+void PlayerProfile_SetLanguage(struct PlayerData * data, u8 language)
 {
     data->language = language;
 }
 
-void FUN_02023A78(struct PlayerData * data)
+void PlayerProfile_SetGameClearFlag(struct PlayerData * data)
 {
-    data->field_1D_0 = 1;
+    data->gameCleared = 1;
 }
 
-BOOL FUN_02023A88(struct PlayerData * data)
+BOOL PlayerProfile_GetGameClearFlag(struct PlayerData * data)
 {
-    return data->field_1D_0;
+    return data->gameCleared;
 }
 
-void FUN_02023A90(struct PlayerData * data)
+void PlayerProfile_SetNatDexFlag(struct PlayerData * data)
 {
-    data->field_1D_1 = 1;
+    data->nationalDex = 1;
 }
 
-BOOL FUN_02023A9C(struct PlayerData * data)
+BOOL PlayerProfile_GetNatDexFlag(struct PlayerData * data)
 {
-    return data->field_1D_1;
+    return data->nationalDex;
 }
 
 BOOL PlayerProfile_NameAndOTIDMatchPlayer(struct PlayerData * a, struct PlayerData * b)
diff --git a/include/player_data.h b/include/player_data.h
index 229f3cc4..5095ea61 100644
--- a/include/player_data.h
+++ b/include/player_data.h
@@ -16,9 +16,9 @@ struct PlayerData
     /* 0x19 */ u8 language;
     /* 0x1A */ u8 badges;
     /* 0x1B */ u8 avatar;
-    /* 0x1C */ u8 field_1C;
-    /* 0x1D */ u8 field_1D_0:1;
-               u8 field_1D_1:1;
+    /* 0x1C */ u8 version;
+    /* 0x1D */ u8 gameCleared:1;
+               u8 nationalDex:1;
                u8 field_1D_pad:6;
     /* 0x1E */ u8 padding_1E[2];
 };
@@ -58,18 +58,18 @@ void PlayerProfile_SetBadgeFlag(struct PlayerData * data, u32 badgeno);
 u32 PlayerProfile_CountBadges(struct PlayerData * data);
 u32 PlayerProfile_GetMoney(struct PlayerData * data);
 u32 PlayerProfile_SetMoney(struct PlayerData * data, u32 amount);
-u8 FUN_02023A28(struct PlayerData * data);
-void FUN_02023A2C(struct PlayerData * data, u8 avatar);
+u8 PlayerProfile_GetAvatar(struct PlayerData * data);
+void PlayerProfile_SetAvatar(struct PlayerData * data, u8 avatar);
 u32 PlayerProfile_AddMoney(struct PlayerData * data, u32 amount);
 u32 PlayerProfile_SubMoney(struct PlayerData * data, u32 amount);
-u8 FUN_02023A68(struct PlayerData * data);
-void FUN_02023A6C(struct PlayerData * data, u8 a1);
-u8 FUN_02023A70(struct PlayerData * data);
-void FUN_02023A74(struct PlayerData * data, u8 language);
-void FUN_02023A78(struct PlayerData * data);
-BOOL FUN_02023A88(struct PlayerData * data);
-void FUN_02023A90(struct PlayerData * data);
-BOOL FUN_02023A9C(struct PlayerData * data);
+u8 PlayerProfile_GetVersion(struct PlayerData * data);
+void PlayerProfile_SetVersion(struct PlayerData * data, u8 a1);
+u8 PlayerProfile_GetLanguage(struct PlayerData * data);
+void PlayerProfile_SetLanguage(struct PlayerData * data, u8 language);
+void PlayerProfile_SetGameClearFlag(struct PlayerData * data);
+BOOL PlayerProfile_GetGameClearFlag(struct PlayerData * data);
+void PlayerProfile_SetNatDexFlag(struct PlayerData * data);
+BOOL PlayerProfile_GetNatDexFlag(struct PlayerData * data);
 BOOL PlayerProfile_NameAndOTIDMatchPlayer(struct PlayerData * a, struct PlayerData * b);
 
 #endif //POKEDIAMOND_PLAYER_DATA_H