Decompile daycare

3 files changed, 61 insertions, 61 deletions

diff --git a/arm9/modules/05/asm/mod05_021D80E8.s b/arm9/modules/05/asm/mod05_021D80E8.s
index c5546619..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 Sav2_Daycare_get
+	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 8ed0618c..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
diff --git a/arm9/modules/35/asm/module_35.s b/arm9/modules/35/asm/module_35.s
index 8892667e..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 Sav2_Daycare_get
+	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]