diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2021-02-05 07:18:01 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-05 07:18:01 -0500 |
commit | efba18bb0bc1e919b13d1b6421011f94b409e33f (patch) | |
tree | 1d6d76ed21d22ab02588eb2a6a8e23bae6a460e5 /src | |
parent | 8a0294f9f1b48f4b47b81cab8c13ae2f2ef1c86f (diff) | |
parent | b423d06cd96fd7a0eaae8fcbf98e80c6dda5581c (diff) |
Merge pull request #384 from Deokishisu/patch-2
Fix "Compatibility" Misspelling
Diffstat (limited to 'src')
-rw-r--r-- | src/daycare.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/daycare.c b/src/daycare.c index fe0de9bc6..18333c036 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -1145,8 +1145,8 @@ static bool8 TryProduceOrHatchEgg(struct DayCare *daycare) // Check if an egg should be produced if (daycare->offspringPersonality == 0 && validEggs == DAYCARE_MON_COUNT && (daycare->mons[1].steps & 0xFF) == 0xFF) { - u8 compatability = GetDaycareCompatibilityScore(daycare); - if (compatability > (Random() * 100u) / USHRT_MAX) + u8 compatibility = GetDaycareCompatibilityScore(daycare); + if (compatibility > (Random() * 100u) / USHRT_MAX) TriggerPendingDaycareEgg(); } @@ -1298,7 +1298,7 @@ static u8 GetDaycareCompatibilityScore(struct DayCare *daycare) if (trainerIds[0] == trainerIds[1]) return PARENTS_LOW_COMPATIBILITY; - return PARENTS_MED_COMPATABILITY; + return PARENTS_MED_COMPATIBILITY; } // neither parent is Ditto else @@ -1313,14 +1313,14 @@ static u8 GetDaycareCompatibilityScore(struct DayCare *daycare) if (species[0] == species[1]) { if (trainerIds[0] == trainerIds[1]) - return PARENTS_MED_COMPATABILITY; // same species, same trainer + return PARENTS_MED_COMPATIBILITY; // same species, same trainer - return PARENTS_MAX_COMPATABILITY; // same species, different trainers + return PARENTS_MAX_COMPATIBILITY; // same species, different trainers } else { if (trainerIds[0] != trainerIds[1]) - return PARENTS_MED_COMPATABILITY; // different species, different trainers + return PARENTS_MED_COMPATIBILITY; // different species, different trainers return PARENTS_LOW_COMPATIBILITY; // different species, same trainer } @@ -1343,9 +1343,9 @@ void SetDaycareCompatibilityString(void) whichString = 3; if (relationshipScore == PARENTS_LOW_COMPATIBILITY) whichString = 2; - if (relationshipScore == PARENTS_MED_COMPATABILITY) + if (relationshipScore == PARENTS_MED_COMPATIBILITY) whichString = 1; - if (relationshipScore == PARENTS_MAX_COMPATABILITY) + if (relationshipScore == PARENTS_MAX_COMPATIBILITY) whichString = 0; StringCopy(gStringVar4, sCompatibilityMessages[whichString]); |