cleanup daycare.c

red031000 · Jul 12, 2023 · 2fc5329 · 2fc5329
1 parent 2b1a0ea
commit 2fc5329
Show file tree

Hide file tree

Showing 12 changed files with 241 additions and 241 deletions.
diff --git a/asm/include/overlay_01_021E6880.inc b/asm/include/overlay_01_021E6880.inc
@@ -8,7 +8,7 @@
 .public GF_AssertFail
 .public Save_PlayerData_GetProfileAddr
 .public PlayerProfile_TestBadgeFlag
-.public Save_DayCare_Get
+.public Save_Daycare_Get
 .public Save_GameStats_Get
 .public GameStats_Inc
 .public GameStats_GetCapped
@@ -147,7 +147,7 @@
 .public FollowingPokemon_IsActive
 .public sub_02069FB0
 .public FsysUnkSub108_MoveMoodTowardsNeutral
-.public HandleDayCareStep
+.public HandleDaycareStep
 .public FieldSys_BugContest_Get
 .public MonApplyFriendshipMod
 .public GetPartyCount

diff --git a/asm/include/overlay_101.inc b/asm/include/overlay_101.inc
@@ -176,10 +176,10 @@
 .public PlayerProfile_GetTrainerGender
 .public PlayerProfile_TestBadgeFlag
 .public PlayerProfile_CountBadges
-.public Save_DayCare_GetMonX
-.public DayCareMon_GetBoxMon
-.public Save_DayCare_HasEgg
-.public Save_DayCare_Get
+.public Save_Daycare_GetMonX
+.public DaycareMon_GetBoxMon
+.public Save_Daycare_HasEgg
+.public Save_Daycare_Get
 .public Pokedex_CountNationalDexOwned
 .public Pokedex_CountNationalDexSeen
 .public Pokedex_CountJohtoDexOwned
@@ -265,8 +265,8 @@
 .public Save_VarsFlags_SetVar4057
 .public Save_VarsFlags_GetBuenasPasswordSet
 .public sub_02068F98
-.public DayCareMon_CalcLevelGrowth
-.public Save_DayCare_CalcCompatibility
+.public DaycareMon_CalcLevelGrowth
+.public Save_Daycare_CalcCompatibility
 .public GetBoxMonData
 .public TrainerData_ReadTrData
 .public TrainerData_ReadTrPoke

diff --git a/asm/overlay_01_021E6880.s b/asm/overlay_01_021E6880.s
@@ -1996,10 +1996,10 @@ ov01_021E788C: ; 0x021E788C
 	bl SaveArray_PlayerParty_Get
 	add r5, r0, #0
 	ldr r0, [r4, #0xc]
-	bl Save_DayCare_Get
+	bl Save_Daycare_Get
 	add r1, r5, #0
 	add r2, r4, #0
-	bl HandleDayCareStep
+	bl HandleDaycareStep
 	cmp r0, #1
 	bne _021E78CE
 	ldr r0, [r4, #0xc]

diff --git a/asm/overlay_101.s b/asm/overlay_101.s
@@ -24849,7 +24849,7 @@ _021F371A:
 	pop {r3, r4, r5, r6, r7, pc}
 _021F3720:
 	ldr r0, [r7, #0x1c]
-	bl Save_DayCare_Get
+	bl Save_Daycare_Get
 	ldr r1, [sp]
 	str r0, [sp, #4]
 	str r0, [r1, #0x50]
@@ -24862,16 +24862,16 @@ _021F3720:
 _021F3738:
 	ldr r0, [sp, #4]
 	add r1, r5, #0
-	bl Save_DayCare_GetMonX
+	bl Save_Daycare_GetMonX
 	add r6, r0, #0
-	bl DayCareMon_GetBoxMon
+	bl DaycareMon_GetBoxMon
 	mov r1, #5
 	mov r2, #0
 	bl GetBoxMonData
 	cmp r0, #0
 	beq _021F376A
 	add r0, r6, #0
-	bl DayCareMon_GetBoxMon
+	bl DaycareMon_GetBoxMon
 	add r2, r0, #0
 	add r1, r5, #0
 	ldr r0, [r7, #0x50]
@@ -24890,7 +24890,7 @@ _021F376A:
 	cmp r0, #2
 	bne _021F3786
 	ldr r0, [sp, #4]
-	bl Save_DayCare_CalcCompatibility
+	bl Save_Daycare_CalcCompatibility
 	ldr r1, [sp]
 	add r1, #0x48
 	strh r0, [r1]
@@ -24940,7 +24940,7 @@ _021F37CA:
 	pop {r3, r4, r5, pc}
 _021F37D6:
 	ldr r0, [r4, #0x50]
-	bl Save_DayCare_HasEgg
+	bl Save_Daycare_HasEgg
 	cmp r0, #0
 	beq _021F37F0
 	ldr r1, [r5, #0x4c]
@@ -25047,7 +25047,7 @@ ov101_021F388C: ; 0x021F388C
 	pop {r3, r4, r5, r6, r7, pc}
 _021F38A2:
 	ldr r0, [r0, #0x1c]
-	bl Save_DayCare_Get
+	bl Save_Daycare_Get
 	add r6, r5, #0
 	str r0, [sp]
 	str r0, [r5, #0x50]
@@ -25059,9 +25059,9 @@ _021F38A2:
 _021F38B8:
 	ldr r0, [sp]
 	add r1, r4, #0
-	bl Save_DayCare_GetMonX
+	bl Save_Daycare_GetMonX
 	add r7, r0, #0
-	bl DayCareMon_GetBoxMon
+	bl DaycareMon_GetBoxMon
 	mov r1, #5
 	mov r2, #0
 	bl GetBoxMonData
@@ -25071,7 +25071,7 @@ _021F38B8:
 	add r0, r0, #1
 	strb r0, [r6]
 	add r0, r7, #0
-	bl DayCareMon_CalcLevelGrowth
+	bl DaycareMon_CalcLevelGrowth
 	add r1, r5, r4
 	add r1, #0x4b
 	b _021F38EA
@@ -25200,8 +25200,8 @@ _021F39B0:
 _021F39C4:
 	ldr r0, [r4, #0x50]
 	add r1, r6, #0
-	bl Save_DayCare_GetMonX
-	bl DayCareMon_GetBoxMon
+	bl Save_Daycare_GetMonX
+	bl DaycareMon_GetBoxMon
 	add r2, r0, #0
 	ldr r0, [r5, #0x50]
 	mov r1, #0xa
@@ -25234,8 +25234,8 @@ _021F3A02:
 _021F3A10:
 	ldr r0, [r4, #0x50]
 	mov r1, #1
-	bl Save_DayCare_GetMonX
-	bl DayCareMon_GetBoxMon
+	bl Save_Daycare_GetMonX
+	bl DaycareMon_GetBoxMon
 	add r2, r0, #0
 	ldr r0, [r5, #0x50]
 	mov r1, #0xa

diff --git a/include/daycare.h b/include/daycare.h
@@ -25,23 +25,23 @@ typedef struct Daycare {
 } Daycare;
 
 u32 Save_Daycare_sizeof(void);
-void Save_Daycare_Init(Daycare* daycare);
-DaycareMon* Save_DayCare_GetMonX(Daycare* daycare, int i);
-BoxPokemon *DayCareMon_GetBoxMon(DaycareMon* dcmon);
-DaycareMail* DayCareMon_GetExtras(DaycareMon* dcmon);
-int DayCareMon_GetSteps(DaycareMon* dcmon);
-Mail* DayCareMail_GetMailPtr(DaycareMail* dcmail);
-u32 Save_DayCare_GetEggPID(Daycare* daycare);
-u8 Save_DayCare_GetEggCycleCounter(Daycare* daycare);
-void DayCareMon_SetSteps(DaycareMon* dcmon, u32 steps);
-void DayCareMon_AddSteps(DaycareMon* dcmon, u32 steps);
-void Save_DayCare_SetEggPID(Daycare* daycare, u32 pid);
-void Save_DayCare_SetEggCycleCounter(Daycare* daycare, int count);
-BOOL Save_DayCare_MasudaCheck(Daycare* daycare);
-void DayCareMon_Copy(DaycareMon* dest, const DaycareMon* src);
-void DayCareMon_Extras_Init(DaycareMail* mail);
-void DayCareMon_Init(DaycareMon* mon);
-Daycare* Save_DayCare_Get(SaveData* savedata);
-BOOL Save_DayCare_HasEgg(Daycare* daycare);
+void Save_Daycare_Init(Daycare *daycare);
+DaycareMon *Save_Daycare_GetMonX(Daycare *daycare, s32 i);
+BoxPokemon *DaycareMon_GetBoxMon(DaycareMon *dcmon);
+DaycareMail *DaycareMon_GetExtras(DaycareMon *dcmon);
+u32 DaycareMon_GetSteps(DaycareMon *dcmon);
+Mail *DaycareMail_GetMailPtr(DaycareMail *dcmail);
+u32 Save_Daycare_GetEggPID(Daycare *daycare);
+u8 Save_Daycare_GetEggCycleCounter(Daycare *daycare);
+void DaycareMon_SetSteps(DaycareMon *dcmon, u32 steps);
+void DaycareMon_AddSteps(DaycareMon *dcmon, u32 steps);
+void Save_Daycare_SetEggPID(Daycare *daycare, u32 pid);
+void Save_Daycare_SetEggCycleCounter(Daycare *daycare, s32 count);
+BOOL Save_Daycare_MasudaCheck(Daycare *daycare);
+void DaycareMon_Copy(DaycareMon *dest, const DaycareMon *src);
+void DaycareMon_Extras_Init(DaycareMail *mail);
+void DaycareMon_Init(DaycareMon *mon);
+Daycare *Save_Daycare_Get(SaveData *savedata);
+BOOL Save_Daycare_HasEgg(Daycare *daycare);
 
 #endif
diff --git a/include/get_egg.h b/include/get_egg.h
@@ -4,22 +4,22 @@
 #include "daycare.h"
 #include "script.h"
 
-BoxPokemon *Daycare_GetBoxMonI(Daycare *daycare, int idx);
-void Save_DayCare_PutMonIn(PARTY *party, u8 partyIdx, Daycare *dayCare, SaveData *saveData);
-u16 Save_DayCare_RetrieveMon(PARTY *party, MessageFormat *msgFmt, Daycare *daycare, u8 whomst);
-int DayCareMon_CalcLevelGrowth(DaycareMon *daycareMon);
-u16 Save_DayCare_BufferMonNickAndRetrievalPrice(Daycare *dayCare, u8 slot, MessageFormat *msgFmt);
-u8 Save_DayCare_BufferGrowthAndNick(Daycare *dayCare, u32 slot, MessageFormat *msgFmt);
-void Save_DayCare_ResetEggStats(Daycare *dayCare);
+BoxPokemon *Daycare_GetBoxMonI(Daycare *daycare, s32 idx);
+void Save_Daycare_PutMonIn(PARTY *party, u8 partyIdx, Daycare *dayCare, SaveData *saveData);
+u16 Save_Daycare_RetrieveMon(PARTY *party, MessageFormat *msgFmt, Daycare *daycare, u8 whomst);
+int DaycareMon_CalcLevelGrowth(DaycareMon *daycareMon);
+u16 Save_Daycare_BufferMonNickAndRetrievalPrice(Daycare *dayCare, u8 slot, MessageFormat *msgFmt);
+u8 Save_Daycare_BufferGrowthAndNick(Daycare *dayCare, u32 slot, MessageFormat *msgFmt);
+void Save_Daycare_ResetEggStats(Daycare *dayCare);
 void SetEggStats(Pokemon *mon, int species, u8 metLocation, PlayerProfile *profile, int a4, int a5);
 void GiveEggToPlayer(Daycare *dayCare, PARTY *party, PlayerProfile* profile);
-BOOL HandleDayCareStep(Daycare *dayCare, PARTY *party, FieldSystem *fsys);
+BOOL HandleDaycareStep(Daycare *dayCare, PARTY *party, FieldSystem *fsys);
 Pokemon *sub_0206CE44(PARTY *party);
-void Save_DayCare_BufferStoredMonNicks(Daycare *dayCare, MessageFormat *msgFmt);
-void Save_DayCare_BufferMonStats(Daycare *dayCare, u32 nickname_idx, u32 level_idx, u32 gender_idx, u8 slot, MessageFormat *msgFmt);
-u16 Save_DayCare_BufferTailMonNick(Daycare *dayCare, MessageFormat *msgFmt);
-u8 Save_DayCare_GetState(Daycare *dayCare);
-u8 Save_DayCare_CalcCompatibility(Daycare *dayCare);
+void Save_Daycare_BufferStoredMonNicks(Daycare *dayCare, MessageFormat *msgFmt);
+void Save_Daycare_BufferMonStats(Daycare *dayCare, u32 nickname_idx, u32 level_idx, u32 gender_idx, u8 slot, MessageFormat *msgFmt);
+u16 Save_Daycare_BufferTailMonNick(Daycare *dayCare, MessageFormat *msgFmt);
+u8 Save_Daycare_GetState(Daycare *dayCare);
+u8 Save_Daycare_CalcCompatibility(Daycare *dayCare);
 void sub_0206D328(Pokemon *mon, HeapID heapId);
 
 #endif
diff --git a/include/scrcmd.h b/include/scrcmd.h
@@ -344,8 +344,8 @@ BOOL ScrCmd_308(ScriptContext* ctx);
 BOOL ScrCmd_309(ScriptContext* ctx);
 BOOL ScrCmd_310(ScriptContext* ctx);
 BOOL ScrCmd_311(ScriptContext* ctx);
-BOOL ScrCmd_BufferDayCareMonNicks(ScriptContext* ctx);
-BOOL ScrCmd_GetDayCareState(ScriptContext* ctx);
+BOOL ScrCmd_BufferDaycareMonNicks(ScriptContext* ctx);
+BOOL ScrCmd_GetDaycareState(ScriptContext* ctx);
 BOOL ScrCmd_EcruteakGymInit(ScriptContext* ctx);
 BOOL ScrCmd_315(ScriptContext* ctx);
 BOOL ScrCmd_316(ScriptContext* ctx);
@@ -395,19 +395,19 @@ BOOL ScrCmd_PartyCountEgg(ScriptContext* ctx);
 
 // scrcmd_money.c
 BOOL ScrCmd_SubMoneyVar(ScriptContext* ctx);
-BOOL ScrCmd_RetrieveDayCareMon(ScriptContext* ctx);
+BOOL ScrCmd_RetrieveDaycareMon(ScriptContext* ctx);
 BOOL ScrCmd_GiveLoanMon(ScriptContext* ctx);
 BOOL ScrCmd_CheckReturnLoanMon(ScriptContext* ctx);
 BOOL ScrCmd_TakeMon(ScriptContext* ctx);
-BOOL ScrCmd_ResetDayCareEgg(ScriptContext* ctx);
-BOOL ScrCmd_GiveDayCareEgg(ScriptContext* ctx);
-BOOL ScrCmd_BufferDayCareWithdrawCost(ScriptContext* ctx);
+BOOL ScrCmd_ResetDaycareEgg(ScriptContext* ctx);
+BOOL ScrCmd_GiveDaycareEgg(ScriptContext* ctx);
+BOOL ScrCmd_BufferDaycareWithdrawCost(ScriptContext* ctx);
 BOOL ScrCmd_HasEnoughMoneyVar(ScriptContext* ctx);
 BOOL ScrCmd_EggHatchAnim(ScriptContext* ctx);
 BOOL ScrCmd_370(ScriptContext* ctx);
-BOOL ScrCmd_BufferDayCareMonGrowth(ScriptContext* ctx);
-BOOL ScrCmd_GetTailDayCareMonSpeciesAndNick(ScriptContext* ctx);
-BOOL ScrCmd_PutMonInDayCare(ScriptContext* ctx);
+BOOL ScrCmd_BufferDaycareMonGrowth(ScriptContext* ctx);
+BOOL ScrCmd_GetTailDaycareMonSpeciesAndNick(ScriptContext* ctx);
+BOOL ScrCmd_PutMonInDaycare(ScriptContext* ctx);
 BOOL ScrCmd_374(ScriptContext* ctx);
 BOOL ScrCmd_375(ScriptContext* ctx);
 BOOL ScrCmd_376(ScriptContext* ctx);
@@ -419,10 +419,10 @@ BOOL ScrCmd_381(ScriptContext* ctx);
 BOOL ScrCmd_MonGetFriendship(ScriptContext* ctx);
 BOOL ScrCmd_MonAddFriendship(ScriptContext* ctx);
 BOOL ScrCmd_MonSubtractFriendship(ScriptContext* ctx);
-BOOL ScrCmd_BufferDayCareMonStats(ScriptContext* ctx);
+BOOL ScrCmd_BufferDaycareMonStats(ScriptContext* ctx);
 BOOL ScrCmd_GetPlayerFacing(ScriptContext* ctx);
-BOOL ScrCmd_GetDayCareCompatibility(ScriptContext* ctx);
-BOOL ScrCmd_CheckDayCareEgg(ScriptContext* ctx);
+BOOL ScrCmd_GetDaycareCompatibility(ScriptContext* ctx);
+BOOL ScrCmd_CheckDaycareEgg(ScriptContext* ctx);
 BOOL ScrCmd_PlayerHasSpecies(ScriptContext* ctx);
 BOOL ScrCmd_SizeRecordCompare(ScriptContext* ctx);
 BOOL ScrCmd_SizeRecordUpdate(ScriptContext* ctx);
@@ -724,7 +724,7 @@ BOOL ScrCmd_686(ScriptContext* ctx);
 BOOL ScrCmd_687(ScriptContext* ctx);
 BOOL ScrCmd_GetPartySlotWithFatefulEncounter(ScriptContext* ctx);
 BOOL ScrCmd_CommSanitizeParty(ScriptContext* ctx);
-BOOL ScrCmd_DayCareSanitizeMon(ScriptContext* ctx);
+BOOL ScrCmd_DaycareSanitizeMon(ScriptContext* ctx);
 BOOL ScrCmd_691(ScriptContext* ctx);
 BOOL ScrCmd_BufferBattleHallStreak(ScriptContext* ctx);
 BOOL ScrCmd_BattleHallCountUsedSpecies(ScriptContext* ctx);
@@ -749,7 +749,7 @@ BOOL ScrCmd_FollowPokeInteract(ScriptContext* ctx);
 BOOL ScrCmd_712(ScriptContext* ctx);
 BOOL ScrCmd_AlphPuzzle(ScriptContext* ctx);
 BOOL ScrCmd_OpenAlphHiddenRoom(ScriptContext* ctx);
-BOOL ScrCmd_UpdateDayCareMonObjects(ScriptContext* ctx);
+BOOL ScrCmd_UpdateDaycareMonObjects(ScriptContext* ctx);
 BOOL ScrCmd_716(ScriptContext* ctx);
 BOOL ScrCmd_717(ScriptContext* ctx);
 BOOL ScrCmd_718(ScriptContext* ctx);