start working on daycare

include/daycare.h

@@ -0,0 +1,6 @@
+#ifndef GUARD_DAYCARE
+#define GUARD_DAYCARE
+
+
+
+#endif // GUARD_DAYCARE

include/flags.h

@@ -1,6 +1,8 @@
 #ifndef GUARD_FLAGS_H
 #define GUARD_FLAGS_H
 
+#define FLAG_PENDING_DAYCARE_EGG    0x86
+
 #define TRAINER_FLAG_START  0x500
 #define TRAINERS_FLAG_NO    0x356
 #define CODE_FLAGS          (TRAINER_FLAG_START + TRAINERS_FLAG_NO + 0xA) // 0x860

include/global.h

@@ -426,30 +426,52 @@ struct ContestWinner
     u8 contestRank;
 };
 
+struct DaycareMiscMon
+{
+    struct MailStruct mail;
+    u8 OT_name[OT_NAME_LENGTH + 1];
+    u8 monName[POKEMON_NAME_LENGTH + 1];
+    u8 gameLanguage:4;
+    u8 monLanguage:4;
+};
+
 struct DaycareMon
 {
     struct BoxPokemon mon;
-    struct MailStruct mail;
-    u8 OT_name[OT_NAME_LENGTH + 1];
-    u8 monName[11];
-    u8 language_maybe : 4;
-    u8 unknown : 4;
-    u32 stepsTaken;
+    struct DaycareMiscMon misc;
+    u32 steps;
 };
 
-struct DaycareData
+#define DAYCARE_MON_COUNT   2
+
+struct DayCare
 {
-    struct DaycareMon mons[2];
+    struct DaycareMon mons[DAYCARE_MON_COUNT];
     u32 offspringPersonality;
     u8 stepCounter;
 };
 
+struct DayCareMail
+{
+    /*0x00*/ struct MailStruct message;
+    /*0x24*/ u8 names[19];
+};
+
+struct RecordMixingDayCareMail
+{
+    struct DayCareMail mail[DAYCARE_MON_COUNT];
+    u32 numDaycareMons;
+    bool16 holdsItem[DAYCARE_MON_COUNT];
+};
+
 #define MAP_OBJECTS_COUNT  16
 #define BERRY_TREES_COUNT  128
 #define FLAGS_COUNT        300
 #define VARS_COUNT         256
+#define MAIL_COUNT         16
 
-enum {
+enum
+{
     LILYCOVE_LADY_QUIZ,
     LILYCOVE_LADY_FAVOUR,
     LILYCOVE_LADY_CONTEST
@@ -579,15 +601,14 @@ struct SaveBlock1
     /*0x2BB0*/ u16 unk2BB0[6];
     /*0x2BBC*/ u16 unk2BBC[6];
     /*0x2BC8*/ u16 unk2BC8[6];
-    /*0x2BD4*/ u16 unk2BD4[3];
-    /*0x2BE0*/ struct MailStruct mail[16];
+    /*0x2BD4*/ u16 unk2BD4[6];
+    /*0x2BE0*/ struct MailStruct mail[MAIL_COUNT];
     /*0x2E20*/ u8 additionalPhrases[5]; // bitfield for 33 additional phrases in easy chat system
     /*0x2E25*/ u8 unk2E25[3]; // possibly padding?
     /*0x2E28*/ OldMan oldMan;
     /*0x2e64*/ struct EasyChatPair easyChatPairs[5]; //Dewford trend [0] and some other stuff
-    /*0x2e8c*/ u8 filler_2E8C[0x4];
     /*0x2e90*/ struct ContestWinner contestWinners[13]; // 0 - 5 used in contest hall, 6 - 7 unused?, 8 - 12 museum
-    /*0x3030*/ struct DaycareData daycare;
+    /*0x3030*/ struct DayCare daycare;
     /*0x3150*/ struct LinkBattleRecord linkBattleRecords[5];
     /*0x31A0*/ u8 unk_31A0;
     /*0x31A1*/ u8 filler_31A1[7];

include/mail.h

@@ -16,4 +16,10 @@
                               || itemId == ITEM_FAB_MAIL            \
                               || itemId == ITEM_RETRO_MAIL))
 
+
+bool8 MonHasMail(struct Pokemon *mon);
+void TakeMailFromMon(struct Pokemon *mon);
+u8 GiveMailToMon2(struct Pokemon *mon, struct MailStruct *mail);
+void ClearMailStruct(struct MailStruct *mail);
+
 #endif // GUARD_MAIL_H

include/pokemon.h

@@ -509,9 +509,11 @@ struct Evolution
     u16 targetSpecies;
 };
 
+#define EVOS_PER_MON 5
+
 struct EvolutionData
 {
-    struct Evolution evolutions[5];
+    struct Evolution evolutions[EVOS_PER_MON];
 };
 
 extern u8 gPlayerPartyCount;
@@ -648,6 +650,8 @@ u16 PlayerGenderToFrontTrainerPicId(u8 playerGender);
 void sub_806A1C0(u16 arg0, u8 bankIdentity);
 void sub_806A12C(u16 trainerSpriteId, u8 bankIdentity);
 u8 GetSecretBaseTrainerPicIndex(void);
+bool8 TryIncrementMonLevel(struct Pokemon *mon);
+void BoxMonToMon(struct BoxPokemon *srcMon, struct Pokemon *dstMon);
 
 #include "sprite.h"
 

include/pokemon_storage_system.h

@@ -4,5 +4,6 @@
 u8* GetBoxNamePtr(u8 boxNumber);
 struct BoxPokemon *GetBoxedMonPtr(u8, u8);
 void SetBoxMonNickFromAnyBox(u8, u8, u8 *);
+void CompactPartySlots(void);
 
 #endif // GUARD_POKEMON_STORAGE_SYSTEM_H