diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-08-30 19:04:07 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-08-30 19:04:07 -0400 |
| commit | b7f9479bdb37f12774f7e31a934a3dd5e8f821e0 (patch) | |
| tree | 9f34fcb903e0a17c2f8b364c267c7c732ca379d6 /include | |
| parent | e8d49bf6287142fcb463f416bb7edfd62c053959 (diff) | |
Fix building
Diffstat (limited to 'include')
| -rw-r--r-- | include/daycare.h | 2 | ||||
| -rw-r--r-- | include/global.h | 13 |
2 files changed, 9 insertions, 6 deletions
diff --git a/include/daycare.h b/include/daycare.h index 912b49649..e3aec68d3 100644 --- a/include/daycare.h +++ b/include/daycare.h @@ -2,7 +2,7 @@ #define GUARD_DAYCARE_H u8 Daycare_CountPokemon(struct DayCareData *); -void sub_8041324(struct BoxPokemon *, struct DayCareMailEtc *); +void sub_8041324(struct BoxPokemon *, struct RecordMixingDayCareMail *); void sub_8041790(u16 i); u16 sub_8041870(u16); void sub_8041940(void); diff --git a/include/global.h b/include/global.h index b2b4ffcc4..0a415e3e6 100644 --- a/include/global.h +++ b/include/global.h @@ -551,14 +551,17 @@ struct DayCareMailExtra_EggData { u8 unk_11a; }; +struct RecordMixingDayCareMail +{ + struct DayCareMail data[2]; + u32 unk70; + u16 unk74[2]; +}; + struct DayCareMailEtc { struct DayCareMail data[2]; - union { - struct DayCareMailExtra_RecordMixing rc; - struct DayCareMailExtra_EggData egg; - u8 misc[12]; - } extra; + struct DayCareMailExtra_EggData egg; }; struct DayCareData { |