diff options
author | scnorton <scnorton@biociphers.org> | 2017-08-30 16:42:05 -0400 |
---|---|---|
committer | scnorton <scnorton@biociphers.org> | 2017-08-30 16:42:05 -0400 |
commit | a1c5f2e6bad52af49dbf7de48ac78d4015dd073f (patch) | |
tree | 549198ea75bd7f1431fe0241a9f2ab8b3673adbb /include/global.h | |
parent | 97d9399be794f6a94137a1945af52ef1e26de4a7 (diff) |
Nonmatching sub_80421B0
Diffstat (limited to 'include/global.h')
-rw-r--r-- | include/global.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/include/global.h b/include/global.h index 82dcd1a53..b2b4ffcc4 100644 --- a/include/global.h +++ b/include/global.h @@ -540,26 +540,30 @@ struct DayCareMail /*0x24*/ u8 names[19]; }; -struct DayCareMailExtra { +struct DayCareMailExtra_RecordMixing { u32 unk70; u16 unk74[2]; }; +struct DayCareMailExtra_EggData { + u32 steps[2]; + u16 personalityLo; + u8 unk_11a; +}; + struct DayCareMailEtc { struct DayCareMail data[2]; union { - struct DayCareMailExtra rc; - u32 steps[2]; + struct DayCareMailExtra_RecordMixing rc; + struct DayCareMailExtra_EggData egg; + u8 misc[12]; } extra; }; struct DayCareData { struct BoxPokemon mons[2]; struct DayCareMailEtc mail; - u16 eggPersonalityLo; - u8 unk_11a; - u8 unk_11b; }; struct LinkBattleRecord |