diff options
author | golem galvanize <golemgalvanize@github.com> | 2018-01-09 16:48:01 -0500 |
---|---|---|
committer | golem galvanize <golemgalvanize@github.com> | 2018-01-09 16:48:01 -0500 |
commit | c7722a492017dbd8a5fb3bb216062eb62129daf5 (patch) | |
tree | 2a5c0ba6a6b9364aa93eb4a9a89b35153954ab63 /include/daycare.h | |
parent | 2d141bc612ffecc984f6b4238c2791ba8419a192 (diff) | |
parent | 85174ad6193d3d58b92deaaedf8c510440ed85ee (diff) |
fixing merge conflicts
Diffstat (limited to 'include/daycare.h')
-rw-r--r-- | include/daycare.h | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/include/daycare.h b/include/daycare.h index b90c50610..c612113b9 100644 --- a/include/daycare.h +++ b/include/daycare.h @@ -1,14 +1,17 @@ #ifndef GUARD_DAYCARE_H #define GUARD_DAYCARE_H -u8 Daycare_CountPokemon(struct BoxPokemon *); -void sub_8041324(struct BoxPokemon *, struct RecordMixing_UnknownStruct *); -void sub_8041790(int i); -u16 sub_8041870(u16); -void sub_8041940(void); -void sub_8041950(void); -void sub_8042044(struct Pokemon *mon, u16, u8); -u8 sub_80422A0(void); -u8 daycare_relationship_score_from_savegame(void); +u8 *GetMonNick(struct Pokemon *, u8 *); +u8 *GetBoxMonNick(struct BoxPokemon *, u8 *); +u8 CountPokemonInDaycare(struct DayCare *); +void InitDaycareMailRecordMixing(struct BoxPokemon *, struct RecordMixingDayCareMail *); +void Debug_AddDaycareSteps(u16 i); +u16 GetEggSpecies(u16); +void TriggerPendingDaycareEgg(void); +void TriggerPendingDaycareMaleEgg(void); +void CreateEgg(struct Pokemon *mon, u16, u8); +u8 ShouldEggHatch(void); +u8 GetDaycareCompatibilityScoreFromSave(void); +bool8 NameHasGenderSymbol(const u8 *, u8); #endif // GUARD_DAYCARE_H |