Merge pull request #460 from huderlem/daycare_cleanup

Cleanup and document daycare.c

3 files changed, 20 insertions, 15 deletions

diff --git a/include/daycare.h b/include/daycare.h
index e46351d72..c612113b9 100644
--- a/include/daycare.h
+++ b/include/daycare.h
@@ -1,15 +1,17 @@
 #ifndef GUARD_DAYCARE_H
 #define GUARD_DAYCARE_H
 
-u8 Daycare_CountPokemon(struct DayCareData *);
-void sub_8041324(struct BoxPokemon *, struct RecordMixingDayCareMail *);
-void sub_8041790(u16 i);
-u16 sub_8041870(u16);
-void sub_8041940(void);
-void sub_8041950(void);
-void sub_8042044(struct Pokemon *mon, u16, u8);
-u8 sub_80422A0(void);
-u8 daycare_relationship_score_from_savegame(void);
+u8 *GetMonNick(struct Pokemon *, u8 *);
+u8 *GetBoxMonNick(struct BoxPokemon *, u8 *);
+u8 CountPokemonInDaycare(struct DayCare *);
+void InitDaycareMailRecordMixing(struct BoxPokemon *, struct RecordMixingDayCareMail *);
+void Debug_AddDaycareSteps(u16 i);
+u16 GetEggSpecies(u16);
+void TriggerPendingDaycareEgg(void);
+void TriggerPendingDaycareMaleEgg(void);
+void CreateEgg(struct Pokemon *mon, u16, u8);
+u8 ShouldEggHatch(void);
+u8 GetDaycareCompatibilityScoreFromSave(void);
 bool8 NameHasGenderSymbol(const u8 *, u8);
 
 #endif // GUARD_DAYCARE_H
diff --git a/include/flags.h b/include/flags.h
index a60de6ea0..83fcdb383 100644
--- a/include/flags.h
+++ b/include/flags.h
@@ -1,6 +1,9 @@
 #ifndef GUARD_FLAGS_H
 #define GUARD_FLAGS_H
 
+// scripts
+#define FLAG_PENDING_DAYCARE_EGG 0x86
+
 #define TRAINER_FLAG_START 0x500
 
 // SYSTEM FLAGS
diff --git a/include/global.h b/include/global.h
index 647f66bc8..4921cf977 100644
--- a/include/global.h
+++ b/include/global.h
@@ -587,15 +587,15 @@ struct DayCareMail
 
 struct DayCareStepCountersEtc {
     u32 steps[2];
-    u16 personalityLo;
-    u8 unk_11a;
+    u16 pendingEggPersonality;
+    u8 eggCycleStepsRemaining;
 };
 
 struct RecordMixingDayCareMail
 {
     struct DayCareMail mail[2];
-    u32 unk70;
-    u16 unk74[2];
+    u32 numDaycareMons;
+    u16 itemsHeld[2]; // marks whether or not each daycare mon is currently holding an item.
 };
 
 struct DayCareMisc
@@ -604,7 +604,7 @@ struct DayCareMisc
     struct DayCareStepCountersEtc countersEtc;
 };
 
-struct DayCareData {
+struct DayCare {
     struct BoxPokemon mons[2];
     struct DayCareMisc misc;
 };
@@ -712,7 +712,7 @@ struct SaveBlock1 /* 0x02025734 */
     /*0x2DD4*/ struct EasyChatPair easyChatPairs[5]; //Dewford trend [0] and some other stuff
     /*0x2DFC*/ u8 filler_2DFC[0x8];
     /*0x2E04*/ SB_Struct sbStruct;
-    /*0x2F9C*/ struct DayCareData daycareData;
+    /*0x2F9C*/ struct DayCare daycare;
     /*0x30B8*/ struct LinkBattleRecord linkBattleRecords[5];
     /*0x3108*/ u8 filler_3108[8];
     /*0x3110*/ u8 giftRibbons[11];