Merge pull request #271 from PikalaxALT/pikalax_work

player_data, daycare, use_item_on_mon, item_data.json

16 files changed, 105 insertions, 105 deletions

diff --git a/arm9/modules/05/asm/mod05_021D80E8.s b/arm9/modules/05/asm/mod05_021D80E8.s
index f1a29149..946b25da 100644
--- a/arm9/modules/05/asm/mod05_021D80E8.s
+++ b/arm9/modules/05/asm/mod05_021D80E8.s
@@ -1765,7 +1765,7 @@ MOD05_021D8F38: ; 0x021D8F38
 	bl SavArray_PlayerParty_get
 	add r5, r0, #0
 	ldr r0, [r4, #0xc]
-	bl FUN_02023D58
+	bl Sav2_DayCare_get
 	add r1, r5, #0
 	add r2, r4, #0
 	bl MOD05_021ED378
diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s
index dabce6d4..2244fdd6 100644
--- a/arm9/modules/05/asm/module_05.s
+++ b/arm9/modules/05/asm/module_05.s
@@ -14321,8 +14321,8 @@ _021EC454: .word UNK05_021F7930
 	thumb_func_start MOD05_021EC458
 MOD05_021EC458: ; 0x021EC458
 	push {r3, lr}
-	bl FUN_02023C74
-	bl FUN_02023C7C
+	bl Sav2_DayCare_GetMonX
+	bl DayCareMon_GetBoxMon
 	pop {r3, pc}
 
 	thumb_func_start MOD05_021EC464
@@ -14335,8 +14335,8 @@ MOD05_021EC464: ; 0x021EC464
 _021EC46E:
 	add r0, r6, #0
 	add r1, r5, #0
-	bl FUN_02023C74
-	bl FUN_02023C7C
+	bl Sav2_DayCare_GetMonX
+	bl DayCareMon_GetBoxMon
 	add r1, r7, #0
 	mov r2, #0
 	bl GetBoxMonData
@@ -14367,8 +14367,8 @@ MOD05_021EC49C: ; 0x021EC49C
 _021EC4AA:
 	add r0, r5, #0
 	add r1, r4, #0
-	bl FUN_02023C74
-	bl FUN_02023C7C
+	bl Sav2_DayCare_GetMonX
+	bl DayCareMon_GetBoxMon
 	add r1, r6, #0
 	add r2, r7, #0
 	bl GetBoxMonData
@@ -14410,10 +14410,10 @@ MOD05_021EC4F0: ; 0x021EC4F0
 	bl GetPartyMonByIndex
 	add r4, r0, #0
 	add r0, r5, #0
-	bl FUN_02023C80
+	bl DayCareMon_GetExtras
 	str r0, [sp, #8]
 	add r0, r5, #0
-	bl FUN_02023C7C
+	bl DayCareMon_GetBoxMon
 	str r0, [sp, #4]
 	add r0, r7, #0
 	bl Sav2_PlayerData_GetProfileAddr
@@ -14428,7 +14428,7 @@ MOD05_021EC4F0: ; 0x021EC4F0
 	cmp r0, #0
 	beq _021EC544
 	ldr r0, [sp, #8]
-	bl FUN_02023C8C
+	bl DayCareMail_GetCapsule
 	add r2, r0, #0
 	add r0, r4, #0
 	mov r1, #0xa9
@@ -14439,7 +14439,7 @@ _021EC544:
 	bl FUN_02069BB4
 	add r0, r5, #0
 	mov r1, #0
-	bl FUN_02023CA0
+	bl DayCareMon_SetSteps
 	ldr r1, [sp]
 	add r0, r6, #0
 	bl RemoveMonFromParty
@@ -14472,7 +14472,7 @@ MOD05_021EC57C: ; 0x021EC57C
 	bl MOD05_021EC49C
 	add r1, r0, #0
 	add r0, r4, #0
-	bl FUN_02023C74
+	bl Sav2_DayCare_GetMonX
 	add r2, r0, #0
 	add r0, r5, #0
 	add r1, r6, #0
@@ -14486,17 +14486,17 @@ MOD05_021EC5B0: ; 0x021EC5B0
 	push {r3, r4, r5, r6, r7, lr}
 	add r4, r0, #0
 	mov r1, #0
-	bl FUN_02023C74
+	bl Sav2_DayCare_GetMonX
 	add r5, r0, #0
 	add r0, r4, #0
 	mov r1, #1
-	bl FUN_02023C74
+	bl Sav2_DayCare_GetMonX
 	add r4, r0, #0
 	add r0, r5, #0
-	bl FUN_02023C7C
+	bl DayCareMon_GetBoxMon
 	add r6, r0, #0
 	add r0, r4, #0
-	bl FUN_02023C7C
+	bl DayCareMon_GetBoxMon
 	add r7, r0, #0
 	add r0, r6, #0
 	mov r1, #5
@@ -14512,9 +14512,9 @@ MOD05_021EC5B0: ; 0x021EC5B0
 	beq _021EC600
 	add r0, r5, #0
 	add r1, r4, #0
-	bl FUN_02023CF0
+	bl DayCareMon_Copy
 	add r0, r4, #0
-	bl FUN_02023D3C
+	bl DayCareMon_Init
 _021EC600:
 	pop {r3, r4, r5, r6, r7, pc}
 	.balign 4, 0
@@ -14582,10 +14582,10 @@ MOD05_021EC668: ; 0x021EC668
 	bl AllocMonZeroed
 	add r4, r0, #0
 	add r0, r6, #0
-	bl FUN_02023C7C
+	bl DayCareMon_GetBoxMon
 	add r5, r0, #0
 	add r0, r6, #0
-	bl FUN_02023C80
+	bl DayCareMon_GetExtras
 	str r0, [sp, #4]
 	add r0, r7, #0
 	mov r1, #0
@@ -14612,7 +14612,7 @@ MOD05_021EC668: ; 0x021EC668
 	bl GetMonData
 	str r0, [sp, #8]
 	add r0, r6, #0
-	bl FUN_02023C84
+	bl DayCareMon_GetSteps
 	ldr r1, [sp, #8]
 	add r2, sp, #8
 	add r0, r1, r0
@@ -14628,7 +14628,7 @@ _021EC6E0:
 	cmp r0, #0
 	beq _021EC6FA
 	ldr r0, [sp, #4]
-	bl FUN_02023C8C
+	bl DayCareMail_GetCapsule
 	add r2, r0, #0
 	add r0, r4, #0
 	mov r1, #0xa9
@@ -14641,7 +14641,7 @@ _021EC6FA:
 	bl ZeroBoxMonData
 	add r0, r6, #0
 	mov r1, #0
-	bl FUN_02023CA0
+	bl DayCareMon_SetSteps
 	add r0, r4, #0
 	bl FreeToHeap
 	add r0, r7, #0
@@ -14656,7 +14656,7 @@ MOD05_021EC71C: ; 0x021EC71C
 	add r4, r1, #0
 	add r0, r6, #0
 	add r1, r3, #0
-	bl FUN_02023C74
+	bl Sav2_DayCare_GetMonX
 	add r1, r0, #0
 	add r0, r5, #0
 	add r2, r4, #0
@@ -14704,13 +14704,13 @@ MOD05_021EC744: ; 0x021EC744
 MOD05_021EC78C: ; 0x021EC78C
 	push {r4, r5, r6, lr}
 	add r5, r0, #0
-	bl FUN_02023C7C
+	bl DayCareMon_GetBoxMon
 	add r6, r0, #0
 	bl CalcBoxMonLevel
 	lsl r0, r0, #0x18
 	lsr r4, r0, #0x18
 	add r0, r5, #0
-	bl FUN_02023C84
+	bl DayCareMon_GetSteps
 	add r1, r0, #0
 	add r0, r6, #0
 	bl MOD05_021EC744
@@ -14723,10 +14723,10 @@ MOD05_021EC78C: ; 0x021EC78C
 MOD05_021EC7B4: ; 0x021EC7B4
 	push {r3, r4, r5, lr}
 	add r5, r0, #0
-	bl FUN_02023C7C
+	bl DayCareMon_GetBoxMon
 	add r4, r0, #0
 	add r0, r5, #0
-	bl FUN_02023C84
+	bl DayCareMon_GetSteps
 	add r1, r0, #0
 	add r0, r4, #0
 	bl MOD05_021EC744
@@ -14741,7 +14741,7 @@ MOD05_021EC7D4: ; 0x021EC7D4
 	sub sp, #8
 	add r4, r0, #0
 	add r5, r1, #0
-	bl FUN_02023C7C
+	bl DayCareMon_GetBoxMon
 	add r6, r0, #0
 	add r0, r4, #0
 	bl MOD05_021EC78C
@@ -14770,7 +14770,7 @@ MOD05_021EC810: ; 0x021EC810
 	sub sp, #8
 	add r4, r0, #0
 	add r5, r1, #0
-	bl FUN_02023C7C
+	bl DayCareMon_GetBoxMon
 	add r6, r0, #0
 	add r0, r4, #0
 	bl MOD05_021EC78C
@@ -14801,7 +14801,7 @@ MOD05_021EC810: ; 0x021EC810
 MOD05_021EC854: ; 0x021EC854
 	push {r4, lr}
 	add r4, r2, #0
-	bl FUN_02023C74
+	bl Sav2_DayCare_GetMonX
 	add r1, r4, #0
 	bl MOD05_021EC810
 	pop {r4, pc}
@@ -14810,9 +14810,9 @@ MOD05_021EC854: ; 0x021EC854
 MOD05_021EC864: ; 0x021EC864
 	push {r3, r4, r5, lr}
 	add r5, r2, #0
-	bl FUN_02023C74
+	bl Sav2_DayCare_GetMonX
 	add r4, r0, #0
-	bl FUN_02023C7C
+	bl DayCareMon_GetBoxMon
 	mov r1, #5
 	mov r2, #0
 	bl GetBoxMonData
@@ -14935,7 +14935,7 @@ MOD05_021EC944: ; 0x021EC944
 	bl MTRandom
 	add r1, r0, #0
 	ldr r0, [sp]
-	bl FUN_02023CB8
+	bl Sav2_DayCare_SetEggPID
 	pop {r3, r4, r5, r6, r7, pc}
 _021EC960:
 	ldr r0, [sp]
@@ -14962,7 +14962,7 @@ _021EC98A:
 _021EC990:
 	ldr r0, [sp]
 	add r1, r4, #0
-	bl FUN_02023CB8
+	bl Sav2_DayCare_SetEggPID
 	pop {r3, r4, r5, r6, r7, pc}
 	.balign 4, 0
 
@@ -15467,10 +15467,10 @@ MOD05_021ECD64: ; 0x021ECD64
 	push {r4, lr}
 	add r4, r0, #0
 	mov r1, #0
-	bl FUN_02023CB8
+	bl Sav2_DayCare_SetEggPID
 	add r0, r4, #0
 	mov r1, #0
-	bl FUN_02023CC0
+	bl Sav2_DayCare_SetEggCycleCounter
 	pop {r4, pc}
 
 	thumb_func_start MOD05_021ECD78
@@ -15628,7 +15628,7 @@ _021ECE8C:
 	cmp r4, #0x1d
 	bne _021ECEBC
 	ldr r0, [sp]
-	bl FUN_02023C90
+	bl Sav2_DayCare_GetEggPID
 	mov r1, #2
 	lsl r1, r1, #0xe
 	tst r0, r1
@@ -15642,7 +15642,7 @@ _021ECEBC:
 	cmp r4, r0
 	bne _021ECED6
 	ldr r0, [sp]
-	bl FUN_02023C90
+	bl Sav2_DayCare_GetEggPID
 	mov r1, #2
 	lsl r1, r1, #0xe
 	tst r0, r1
@@ -15794,8 +15794,8 @@ _021ECFEE:
 	.balign 4, 0
 _021ED008: .word 0x000001EE
 
-	thumb_func_start MOD05_021ED00C
-MOD05_021ED00C: ; 0x021ED00C
+	thumb_func_start MOD05_DayCare_CreateEgg
+MOD05_DayCare_CreateEgg: ; 0x021ED00C
 	push {r3, r4, r5, r6, r7, lr}
 	sub sp, #0x18
 	str r1, [sp, #0x10]
@@ -15808,10 +15808,10 @@ MOD05_021ED00C: ; 0x021ED00C
 	add r1, sp, #0x14
 	strb r0, [r1]
 	add r0, r5, #0
-	bl FUN_02023C90
+	bl Sav2_DayCare_GetEggPID
 	add r4, r0, #0
 	add r0, r5, #0
-	bl FUN_02023CC8
+	bl Sav2_DayCare_MasudaCheck
 	cmp r0, #0
 	beq _021ED05E
 	add r0, r6, #0
@@ -15881,8 +15881,8 @@ _021ED05E:
 	.balign 4, 0
 _021ED0C8: .word 0x000001EE
 
-	thumb_func_start MOD05_021ED0CC
-MOD05_021ED0CC: ; 0x021ED0CC
+	thumb_func_start MOD05_DayCare_GiveEggToPlayer
+MOD05_DayCare_GiveEggToPlayer: ; 0x021ED0CC
 	push {r4, r5, r6, r7, lr}
 	sub sp, #0x14
 	add r5, r0, #0
@@ -15915,7 +15915,7 @@ MOD05_021ED0CC: ; 0x021ED0CC
 	add r0, r4, #0
 	add r1, r6, #0
 	add r2, r5, #0
-	bl MOD05_021ED00C
+	bl MOD05_DayCare_CreateEgg
 	add r0, r4, #0
 	add r1, r5, #0
 	bl MOD05_021EC9D4
@@ -16251,9 +16251,9 @@ _021ED38E:
 	beq _021ED3AC
 	ldr r0, [sp]
 	add r1, r4, #0
-	bl FUN_02023C74
+	bl Sav2_DayCare_GetMonX
 	mov r1, #1
-	bl FUN_02023CA8
+	bl DayCareMon_AddSteps
 	add r6, r6, #1
 _021ED3AC:
 	add r4, r4, #1
@@ -16261,15 +16261,15 @@ _021ED3AC:
 	cmp r4, #2
 	blo _021ED38E
 	ldr r0, [sp]
-	bl FUN_02023C90
+	bl Sav2_DayCare_GetEggPID
 	cmp r0, #0
 	bne _021ED3F8
 	cmp r6, #2
 	bne _021ED3F8
 	ldr r0, [sp]
 	mov r1, #1
-	bl FUN_02023C74
-	bl FUN_02023C84
+	bl Sav2_DayCare_GetMonX
+	bl DayCareMon_GetSteps
 	lsl r0, r0, #0x18
 	lsr r0, r0, #0x18
 	cmp r0, #0xff
@@ -16289,11 +16289,11 @@ _021ED3AC:
 	bl MOD05_021EC944
 _021ED3F8:
 	ldr r0, [sp]
-	bl FUN_02023C98
+	bl Sav2_DayCare_GetEggCycleCounter
 	add r4, r0, #0
 	ldr r0, [sp]
 	add r1, r4, #1
-	bl FUN_02023CC0
+	bl Sav2_DayCare_SetEggCycleCounter
 	ldr r0, [sp, #4]
 	bl MOD05_021ED334
 	add r1, r4, #1
@@ -16301,7 +16301,7 @@ _021ED3F8:
 	bne _021ED490
 	ldr r0, [sp]
 	mov r1, #0
-	bl FUN_02023CC0
+	bl Sav2_DayCare_SetEggCycleCounter
 	add r0, r7, #0
 	bl MOD05_021ED190
 	add r6, r0, #0
@@ -16448,7 +16448,7 @@ MOD05_021ED52C: ; 0x021ED52C
 	add r7, r2, #0
 	add r1, r6, #0
 	str r3, [sp, #8]
-	bl FUN_02023C74
+	bl Sav2_DayCare_GetMonX
 	str r0, [sp, #0xc]
 	add r0, r5, #0
 	add r1, r6, #0
@@ -16459,7 +16459,7 @@ MOD05_021ED52C: ; 0x021ED52C
 	add r2, r5, #0
 	bl BufferBoxMonNickname
 	ldr r0, [sp, #0xc]
-	bl FUN_02023C84
+	bl DayCareMon_GetSteps
 	add r1, r0, #0
 	add r0, r5, #0
 	bl MOD05_021EC744
@@ -16531,7 +16531,7 @@ MOD05_021ED5C4: ; 0x021ED5C4
 MOD05_021ED5EC: ; 0x021ED5EC
 	push {r4, lr}
 	add r4, r0, #0
-	bl FUN_02023C90
+	bl Sav2_DayCare_GetEggPID
 	cmp r0, #0
 	beq _021ED5FC
 	mov r0, #1
@@ -22038,7 +22038,7 @@ _021F000E:
 	bl FUN_020286EC
 	add r7, r0, #0
 	mov r0, #4
-	bl PlayerProfile_init
+	bl PlayerProfile_new
 	add r6, r0, #0
 	add r0, r7, #0
 	add r1, r4, #0
diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s
index fd961cc0..dd12992e 100644
--- a/arm9/modules/06/asm/module_06.s
+++ b/arm9/modules/06/asm/module_06.s
@@ -5044,7 +5044,7 @@ _0223BBDA:
 	add r0, r5, #0
 	bl ScriptEnvironment_GetSav2Ptr
 	bl FUN_02024DA0
-	bl FUN_02024CA4
+	bl Pokedex_GetNatDexFlag
 	add r6, r0, #0
 	add r0, r4, #0
 	add r1, sp, #0x64
@@ -5481,7 +5481,7 @@ _0223BF7E:
 	add r0, r5, #0
 	bl ScriptEnvironment_GetSav2Ptr
 	bl FUN_02024DA0
-	bl FUN_02024CA4
+	bl Pokedex_GetNatDexFlag
 	add r6, r0, #0
 	add r0, r4, #0
 	add r1, sp, #0x5c
@@ -5791,7 +5791,7 @@ _0223C222:
 	add r0, r5, #0
 	bl ScriptEnvironment_GetSav2Ptr
 	bl FUN_02024DA0
-	bl FUN_02024CA4
+	bl Pokedex_GetNatDexFlag
 	add r6, r0, #0
 	ldr r0, [sp, #0x14]
 	add r1, sp, #0x5c
@@ -11448,7 +11448,7 @@ _0223EF28:
 	ldr r1, [r1]
 	str r0, [r1, #0x78]
 	mov r0, #4
-	bl PlayerProfile_init
+	bl PlayerProfile_new
 	ldr r1, _0223EFF4 ; =0x02252420
 	ldr r2, [r1]
 	str r0, [r2, #0x7c]
@@ -23654,7 +23654,7 @@ _02245098:
 	add r0, r5, #0
 	bl ScriptEnvironment_GetSav2Ptr
 	bl FUN_02024DA0
-	bl FUN_02024CA4
+	bl Pokedex_GetNatDexFlag
 	add r6, r0, #0
 	ldr r0, [r5, #0xc]
 	bl FUN_0202A9B0
@@ -31000,9 +31000,9 @@ _0224886C:
 	bl AllocMonZeroed
 	str r0, [r4, #4]
 	add r0, r5, #0
-	bl PlayerProfile_init
+	bl PlayerProfile_new
 	str r0, [r4, #8]
-	bl PlayerProfile_Clear
+	bl PlayerProfile_init
 	add r0, r5, #0
 	add r1, r6, #4
 	bl GetInGameTradeMonOrPartnerName
diff --git a/arm9/modules/11/asm/module_11_thumb1.s b/arm9/modules/11/asm/module_11_thumb1.s
index b5cc45b0..bbcb304d 100644
--- a/arm9/modules/11/asm/module_11_thumb1.s
+++ b/arm9/modules/11/asm/module_11_thumb1.s
@@ -1185,7 +1185,7 @@ _0222DFEC:
 	lsl r1, r1, #4
 	ldr r0, [r4, #0x60]
 	ldr r1, [r7, r1]
-	bl FUN_02023D80
+	bl Sav2_Pokedex_Copy
 	ldr r0, [r4, #0x60]
 	bl FreeToHeap
 	mov r0, #0x45
@@ -1741,7 +1741,7 @@ MOD11_0222E520: ; 0x0222E520
 	add r5, r1, #0
 _0222E532:
 	mov r0, #5
-	bl PlayerProfile_init
+	bl PlayerProfile_new
 	add r1, r0, #0
 	add r0, r5, #0
 	str r1, [r6, #0x48]
@@ -1767,14 +1767,14 @@ _0222E532:
 	ldr r1, [r4, #0x58]
 	bl Sav2_Bag_copy
 	mov r0, #5
-	bl FUN_02023D6C
+	bl Sav2_Pokedex_new
 	str r0, [r4, #0x60]
 	mov r1, #0x11
 	ldr r0, [sp, #4]
 	lsl r1, r1, #4
 	ldr r0, [r0, r1]
 	ldr r1, [r4, #0x60]
-	bl FUN_02023D80
+	bl Sav2_Pokedex_Copy
 	mov r1, #0x45
 	lsl r1, r1, #2
 	ldr r0, [sp, #4]
diff --git a/arm9/modules/16/asm/module_16.s b/arm9/modules/16/asm/module_16.s
index c3c739e5..14a64b6c 100644
--- a/arm9/modules/16/asm/module_16.s
+++ b/arm9/modules/16/asm/module_16.s
@@ -4573,7 +4573,7 @@ MOD16_021D9798: ; 0x021D9798
 	ldr r0, _021D9890 ; =0x00001744
 	str r1, [r5, r0]
 	ldr r0, [r5]
-	bl FUN_02024CA4
+	bl Pokedex_GetNatDexFlag
 	cmp r0, #0
 	beq _021D97C2
 	mov r1, #1
@@ -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]
@@ -4955,11 +4955,11 @@ _021D9A50: .word FUN_02024970
 
 	thumb_func_start MOD16_021D9A54
 MOD16_021D9A54: ; 0x021D9A54
-	ldr r3, _021D9A5C ; =FUN_02024CA4
+	ldr r3, _021D9A5C ; =Pokedex_GetNatDexFlag
 	ldr r0, [r0]
 	bx r3
 	nop
-_021D9A5C: .word FUN_02024CA4
+_021D9A5C: .word Pokedex_GetNatDexFlag
 	thumb_func_end MOD16_021D9A54
 
 	thumb_func_start MOD16_021D9A60
diff --git a/arm9/modules/18/asm/module_18.s b/arm9/modules/18/asm/module_18.s
index 09b24dc9..bf7fde6d 100644
--- a/arm9/modules/18/asm/module_18.s
+++ b/arm9/modules/18/asm/module_18.s
@@ -3028,7 +3028,7 @@ MOD18_0223AE88: ; 0x0223AE88
 	add r4, r0, #0
 	add r0, r6, #0
 	bl FUN_02024DA0
-	bl FUN_02024CA4
+	bl Pokedex_GetNatDexFlag
 	mov r1, #0
 	cmp r0, #0
 	beq _0223AEB6
@@ -38229,7 +38229,7 @@ MOD18_0224C0AC: ; 0x0224C0AC
 	add r7, r0, #0
 	add r0, r5, #0
 	bl FUN_02024DA0
-	bl FUN_02024CA4
+	bl Pokedex_GetNatDexFlag
 	str r0, [sp, #4]
 	add r0, r7, #0
 	bl FUN_02025D40
diff --git a/arm9/modules/23/asm/module_23.s b/arm9/modules/23/asm/module_23.s
index 56b78aaf..a7bb626a 100644
--- a/arm9/modules/23/asm/module_23.s
+++ b/arm9/modules/23/asm/module_23.s
@@ -1023,7 +1023,7 @@ MOD23_02254F94: ; 0x02254F94
 	bl MOD20_02252C40
 	bl FUN_02024DA0
 	add r5, r0, #0
-	bl FUN_02024CA4
+	bl Pokedex_GetNatDexFlag
 	cmp r0, #0
 	beq _02254FCE
 	lsl r0, r4, #0x10
diff --git a/arm9/modules/35/asm/module_35.s b/arm9/modules/35/asm/module_35.s
index 7b347ca5..45cab8d3 100644
--- a/arm9/modules/35/asm/module_35.s
+++ b/arm9/modules/35/asm/module_35.s
@@ -48,7 +48,7 @@ MOD35_0225489C: ; 0x0225489C
 	add r0, r4, #0
 	add r6, r2, #0
 	bl MOD20_02252C40
-	bl FUN_02023D58
+	bl Sav2_DayCare_get
 	str r0, [r5, #0x30]
 	ldr r1, [r5, #0x30]
 	add r0, r5, #4
@@ -301,7 +301,7 @@ MOD35_02254A50: ; 0x02254A50
 	ldr r1, [sp]
 	strb r0, [r1]
 	ldr r0, [sp, #4]
-	bl FUN_02023C90
+	bl Sav2_DayCare_GetEggPID
 	ldr r1, [sp]
 	mov r7, #0
 	strb r0, [r1, #1]
@@ -314,9 +314,9 @@ MOD35_02254A50: ; 0x02254A50
 _02254A7A:
 	ldr r0, [sp, #4]
 	add r1, r7, #0
-	bl FUN_02023C74
+	bl Sav2_DayCare_GetMonX
 	str r0, [sp, #8]
-	bl FUN_02023C7C
+	bl DayCareMon_GetBoxMon
 	add r4, r0, #0
 	bl AcquireBoxMonLock
 	str r0, [sp, #0xc]
diff --git a/arm9/modules/51/asm/module_51.s b/arm9/modules/51/asm/module_51.s
index c28270a3..72a21ef0 100644
--- a/arm9/modules/51/asm/module_51.s
+++ b/arm9/modules/51/asm/module_51.s
@@ -1834,7 +1834,7 @@ MOD51_02255690: ; 0x02255690
 	cmp r0, #0
 	bne _02255714
 	mov r0, #4
-	bl PlayerProfile_init
+	bl PlayerProfile_new
 	str r0, [sp, #4]
 	mov r6, #0
 _022556AA:
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/55/asm/module_55.s b/arm9/modules/55/asm/module_55.s
index 78542890..eb124639 100644
--- a/arm9/modules/55/asm/module_55.s
+++ b/arm9/modules/55/asm/module_55.s
@@ -1974,7 +1974,7 @@ MOD55_021D84C8: ; 0x021D84C8
 	cmp r0, #0
 	beq _021D8534
 	mov r0, #0x34
-	bl PlayerProfile_init
+	bl PlayerProfile_new
 	add r4, r0, #0
 	add r0, r5, #0
 	add r0, #0xd4
@@ -3314,7 +3314,7 @@ _021D8F1A:
 	add r0, r5, r1
 	bl FUN_02019220
 	mov r0, #0x34
-	bl PlayerProfile_init
+	bl PlayerProfile_new
 	mov r1, #0xf2
 	lsl r1, r1, #2
 	ldrb r1, [r5, r1]
@@ -3504,7 +3504,7 @@ MOD55_021D90D8: ; 0x021D90D8
 	orr r0, r1
 	beq _021D9170
 	mov r0, #0x34
-	bl PlayerProfile_init
+	bl PlayerProfile_new
 	mov r1, #0xf2
 	lsl r1, r1, #2
 	ldrb r1, [r5, r1]
@@ -4166,7 +4166,7 @@ _021D969A:
 	mov r1, #0
 	bl FUN_02019620
 	mov r0, #0x34
-	bl PlayerProfile_init
+	bl PlayerProfile_new
 	str r0, [sp, #0x20]
 	ldr r0, [sp, #0x1c]
 	ldr r1, [sp, #0x18]
@@ -4406,7 +4406,7 @@ _021D987C:
 	add r3, r1, #0
 	bl AddTextPrinterParameterized2
 	mov r0, #0x34
-	bl PlayerProfile_init
+	bl PlayerProfile_new
 	add r5, r0, #0
 	ldr r0, [sp, #0x1c]
 	ldr r1, [sp, #0x18]
@@ -5204,7 +5204,7 @@ MOD55_021D9F8C: ; 0x021D9F8C
 	add r5, r0, #0
 	mov r0, #0x34
 	add r6, r1, #0
-	bl PlayerProfile_init
+	bl PlayerProfile_new
 	add r4, r0, #0
 	ldr r0, [r5, #8]
 	bl FUN_020286EC
diff --git a/arm9/modules/56/asm/module_56.s b/arm9/modules/56/asm/module_56.s
index 48a760dd..775315bc 100644
--- a/arm9/modules/56/asm/module_56.s
+++ b/arm9/modules/56/asm/module_56.s
@@ -2022,15 +2022,15 @@ _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]
-	bl FUN_02024CA4
+	bl Pokedex_GetNatDexFlag
 	ldr r1, [r5, #4]
 	strb r0, [r1, #0x1a]
 	ldr r1, [r5, #4]
@@ -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]
@@ -7098,7 +7098,7 @@ _02215532:
 	add r3, r1, #0
 	bl AddTextPrinterParameterized2
 	mov r0, #0x36
-	bl PlayerProfile_init
+	bl PlayerProfile_new
 	add r6, r0, #0
 	ldr r0, [r5]
 	add r1, r4, #0
@@ -8431,7 +8431,7 @@ MOD56_022160E4: ; 0x022160E4
 	cmp r6, r0
 	beq _0221611C
 	mov r0, #0x36
-	bl PlayerProfile_init
+	bl PlayerProfile_new
 	add r4, r0, #0
 	ldr r0, [r5]
 	add r1, r6, #0
diff --git a/arm9/modules/71/asm/module_71.s b/arm9/modules/71/asm/module_71.s
index b61bff20..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
@@ -4348,7 +4348,7 @@ _0222F9A0:
 	ldr r0, _0222FA24 ; =0x00003670
 	str r4, [r5, r0]
 	mov r0, #0x1a
-	bl PlayerProfile_init
+	bl PlayerProfile_new
 	add r6, r0, #0
 	ldr r0, _0222FA28 ; =0x00003694
 	add r1, r4, #0
diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s
index d45b6251..196c959f 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]
@@ -13746,7 +13746,7 @@ MOD80_022343DC: ; 0x022343DC
 	mov r6, #0
 	sub r7, r1, r0
 	add r0, r4, #0
-	bl FUN_02024CA4
+	bl Pokedex_GetNatDexFlag
 	str r0, [sp, #0x14]
 	ldr r0, _022344D8 ; =0x02237B50
 	ldrh r0, [r0, r5]
@@ -17647,9 +17647,9 @@ MOD80_022361AC: ; 0x022361AC
 	push {r3, r4, r5, lr}
 	add r5, r0, #0
 	mov r0, #0x3e
-	bl PlayerProfile_init
+	bl PlayerProfile_new
 	add r4, r0, #0
-	bl PlayerProfile_Clear
+	bl PlayerProfile_init
 	mov r1, #0x43
 	lsl r1, r1, #2
 	add r0, r4, #0
@@ -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/modules/83/asm/module_83.s b/arm9/modules/83/asm/module_83.s
index c21879dd..fec76301 100644
--- a/arm9/modules/83/asm/module_83.s
+++ b/arm9/modules/83/asm/module_83.s
@@ -144,7 +144,7 @@ _0222D6BE:
 	add r0, r4, #0
 	bl FUN_02016438
 	ldr r0, [r5, #8]
-	bl FUN_02024CA4
+	bl Pokedex_GetNatDexFlag
 	cmp r0, #0
 	beq _0222D6E6
 	bl MOD83_02236EA8