Merge branch 'master' into document-eventscripts

include/constants/daycare.h

@@ -0,0 +1,27 @@
+#ifndef GUARD_DAYCARE_CONSTANTS_H
+#define GUARD_DAYCARE_CONSTANTS_H
+
+// Parent compatability scores
+#define PARENTS_INCOMPATIBLE       0
+#define PARENTS_LOW_COMPATIBILITY  20
+#define PARENTS_MED_COMPATABILITY  50
+#define PARENTS_MAX_COMPATABILITY  70
+
+// Daycare state
+#define DAYCARE_NO_MONS     0
+#define DAYCARE_EGG_WAITING 1
+#define DAYCARE_ONE_MON     2
+#define DAYCARE_TWO_MONS    3
+
+#define INHERITED_IV_COUNT 3
+#define EGG_HATCH_LEVEL 5
+#define EGG_GENDER_MALE 0x8000  // used to create a male egg from a female-only parent species (e.g. Nidoran)
+
+#define DAYCARE_LEVEL_MENU_EXIT 5
+#define DAYCARE_EXITED_LEVEL_MENU 2 // would be redundant with above if GF had used the same value
+
+// Array buffers
+#define EGG_MOVES_ARRAY_COUNT           10
+#define EGG_LVL_UP_MOVES_ARRAY_COUNT    50
+
+#endif //GUARD_DAYCARE_CONSTANTS_H

include/constants/global.h

@@ -65,6 +65,7 @@
 
 #define MALE 0
 #define FEMALE 1
+#define GENDER_COUNT 2
 
 #define OPTIONS_BUTTON_MODE_NORMAL 0
 #define OPTIONS_BUTTON_MODE_LR 1

include/constants/pokemon.h

@@ -41,6 +41,8 @@
 #define EGG_GROUP_DRAGON        14
 #define EGG_GROUP_UNDISCOVERED  15
 
+#define EGG_GROUPS_PER_MON      2
+
 // Pokemon natures
 #define NATURE_HARDY    0
 #define NATURE_LONELY   1

include/daycare.h

@@ -1,10 +1,10 @@
 #ifndef GUARD_DAYCARE_H
 #define GUARD_DAYCARE_H
 
-#define EGG_HATCH_LEVEL 5
+#include "constants/daycare.h"
 
-u8 *GetMonNick(struct Pokemon *mon, u8 *dest);
-u8 *GetBoxMonNick(struct BoxPokemon *mon, u8 *dest);
+u8 *GetMonNickname2(struct Pokemon *mon, u8 *dest);
+u8 *GetBoxMonNickname(struct BoxPokemon *mon, u8 *dest);
 u8 CountPokemonInDaycare(struct DayCare *daycare);
 void InitDaycareMailRecordMixing(struct DayCare *daycare, struct RecordMixingDayCareMail *daycareMail);
 void StoreSelectedPokemonInDaycare(void);
@@ -16,7 +16,7 @@ void RejectEggFromDayCare(void);
 void CreateEgg(struct Pokemon *mon, u16 species, bool8 setHotSpringsLocation);
 void GiveEggFromDaycare(void);
 bool8 ShouldEggHatch(void);
-u16 GetSelectedMonNickAndSpecies(void);
+u16 GetSelectedMonNicknameAndSpecies(void);
 void GetDaycareMonNicknames(void);
 u8 GetDaycareState(void);
 void SetDaycareCompatibilityString(void);

include/egg_hatch.h

@@ -2,9 +2,9 @@
 #define GUARD_EGG_HATCH_H
 
 void ScriptHatchMon(void);
-bool8 sub_8071614(void);
+bool8 CheckDaycareMonReceivedMail(void);
 void EggHatch(void);
 u8 GetEggStepsToSubtract(void);
-u16 sub_80722E0(void);
+u16 CountPartyAliveNonEggMons(void);
 
 #endif // GUARD_EGG_HATCH_H