summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDeokishisu <6993375+Deokishisu@users.noreply.github.com>2021-02-05 01:17:54 -0500
committerDeokishisu <6993375+Deokishisu@users.noreply.github.com>2021-02-05 01:17:54 -0500
commitb423d06cd96fd7a0eaae8fcbf98e80c6dda5581c (patch)
tree1d6d76ed21d22ab02588eb2a6a8e23bae6a460e5
parentee0fb9ea5a24066d30e33ead4b21de2d004b8faf (diff)
Fix "Compatibility" Misspelling
Someone misspelled "compatibility" as "compatability" in pokeemerald and the error was brought over to pokefirered.
-rw-r--r--include/constants/daycare.h6
-rw-r--r--src/daycare.c16
2 files changed, 11 insertions, 11 deletions
diff --git a/include/constants/daycare.h b/include/constants/daycare.h
index 103f920f2..65ae403a2 100644
--- a/include/constants/daycare.h
+++ b/include/constants/daycare.h
@@ -1,11 +1,11 @@
#ifndef GUARD_DAYCARE_CONSTANTS_H
#define GUARD_DAYCARE_CONSTANTS_H
-// Parent compatability scores
+// Parent compatibility scores
#define PARENTS_INCOMPATIBLE 0
#define PARENTS_LOW_COMPATIBILITY 20
-#define PARENTS_MED_COMPATABILITY 50
-#define PARENTS_MAX_COMPATABILITY 70
+#define PARENTS_MED_COMPATIBILITY 50
+#define PARENTS_MAX_COMPATIBILITY 70
// Daycare state
#define DAYCARE_NO_MONS 0
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]);