summaryrefslogtreecommitdiff
path: root/include/global.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/global.h')
-rw-r--r--include/global.h36
1 files changed, 23 insertions, 13 deletions
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];