Daycare_SendPokemon

4 files changed, 27 insertions, 15 deletions

diff --git a/include/daycare.h b/include/daycare.h
index b90c50610..23ddb1cdd 100644
--- a/include/daycare.h
+++ b/include/daycare.h
@@ -2,7 +2,7 @@
 #define GUARD_DAYCARE_H
 
 u8 Daycare_CountPokemon(struct BoxPokemon *);
-void sub_8041324(struct BoxPokemon *, struct RecordMixing_UnknownStruct *);
+void sub_8041324(struct BoxPokemon *, struct DayCareMailEtc *);
 void sub_8041790(int i);
 u16 sub_8041870(u16);
 void sub_8041940(void);
diff --git a/include/global.h b/include/global.h
index f076274cc..d5535a9c7 100644
--- a/include/global.h
+++ b/include/global.h
@@ -534,18 +534,32 @@ struct GabbyAndTyData
     /*2b1b*/ u8 valB_5:3;
 };
 
-struct RecordMixing_UnknownStructSub
+struct DayCareMail
 {
-    u32 unk0;
-    u8 data[0x34];
-    //u8 data[0x38];
+    /*0x00*/ struct MailStruct mail;
+    /*0x24*/ u8 names[19];
 };
 
-struct RecordMixing_UnknownStruct
-{
-    struct RecordMixing_UnknownStructSub data[2];
+struct DayCareMailExtra {
     u32 unk70;
-    u16 unk74[0x2];
+    u16 unk74[2];
+};
+
+struct DayCareMailEtc
+{
+    struct DayCareMail data[2];
+    union {
+        struct DayCareMailExtra rc;
+        u32 unk70[2];
+    } extra;
+};
+
+struct DayCareData {
+    struct BoxPokemon mons[2];
+    struct DayCareMailEtc mail;
+    u8 unk_118[2];
+    u8 unk_11a;
+    u8 unk_11b;
 };
 
 struct LinkBattleRecord
@@ -644,11 +658,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 BoxPokemon daycareData[2];
-    /*0x303C*/ struct RecordMixing_UnknownStruct filler_303C;
-    /*0x30AC*/ u8 filler_30B4[0x2];
-    /*0x30B6*/ u8 filler_30B6;
-    /*0x30B7*/ u8 filler_30B7[1];
+    /*0x2F9C*/ struct DayCareData daycareData;
     /*0x30B8*/ struct LinkBattleRecord linkBattleRecords[5];
     /*0x3108*/ u8 filler_3108[8];
     /*0x3110*/ u8 giftRibbons[7];
diff --git a/include/mail_data.h b/include/mail_data.h
index df4b385a1..2659c0d37 100644
--- a/include/mail_data.h
+++ b/include/mail_data.h
@@ -11,6 +11,6 @@ u8 GiveMailToMon2(struct Pokemon *, struct MailStruct *);
 void TakeMailFromMon(struct Pokemon *);
 u8 TakeMailFromMon2(struct Pokemon *);
 bool8 ItemIsMail(u16);
-bool8 ItemIsMail(u16);
+bool8 MonHasMail(struct Pokemon *);
 
 #endif // GUARD_MAIL_DATA_H
diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h
index bd4e7915b..9fe3436ef 100644
--- a/include/pokemon_storage_system.h
+++ b/include/pokemon_storage_system.h
@@ -2,5 +2,7 @@
 #define GUARD_POKEMON_STORAGE_SYSTEM_H
 
 void ResetPokemonStorageSystem(void);
+void BoxMonRestorePP(struct BoxPokemon *);
+void party_compaction(void);
 
 #endif // GUARD_POKEMON_STORAGE_SYSTEM_H