atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1322 from Deokishisu/patch-2

Browse source 
Fix "Compatibility" Misspelling
This commit is contained in:
GriffinR 2021-02-05 07:15:51 -05:00 committed by GitHub
commit 3b33c950b2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/constants/daycare.h
View file

@ -1,11 +1,11 @@
#ifndef GUARD_DAYCARE_CONSTANTS_H #ifndef GUARD_DAYCARE_CONSTANTS_H
#define GUARD_DAYCARE_CONSTANTS_H #define GUARD_DAYCARE_CONSTANTS_H
// Parent compatability scores // Parent compatibility scores
#define PARENTS_INCOMPATIBLE 0 #define PARENTS_INCOMPATIBLE 0
#define PARENTS_LOW_COMPATIBILITY 20 #define PARENTS_LOW_COMPATIBILITY 20
#define PARENTS_MED_COMPATABILITY 50 #define PARENTS_MED_COMPATIBILITY 50
#define PARENTS_MAX_COMPATABILITY 70 #define PARENTS_MAX_COMPATIBILITY 70
// Daycare state // Daycare state
#define DAYCARE_NO_MONS 0 #define DAYCARE_NO_MONS 0

16
src/daycare.c
View file

@ -894,8 +894,8 @@ static bool8 TryProduceOrHatchEgg(struct DayCare *daycare)
// Check if an egg should be produced // Check if an egg should be produced
if (daycare->offspringPersonality == 0 && validEggs == DAYCARE_MON_COUNT && (daycare->mons[1].steps & 0xFF) == 0xFF) if (daycare->offspringPersonality == 0 && validEggs == DAYCARE_MON_COUNT && (daycare->mons[1].steps & 0xFF) == 0xFF)
{ {
u8 compatability = GetDaycareCompatibilityScore(daycare); u8 compatibility = GetDaycareCompatibilityScore(daycare);
if (compatability > (Random() * 100u) / USHRT_MAX) if (compatibility > (Random() * 100u) / USHRT_MAX)
TriggerPendingDaycareEgg(); TriggerPendingDaycareEgg();
} }
@ -1050,7 +1050,7 @@ static u8 GetDaycareCompatibilityScore(struct DayCare *daycare)
if (trainerIds[0] == trainerIds[1]) if (trainerIds[0] == trainerIds[1])
return PARENTS_LOW_COMPATIBILITY; return PARENTS_LOW_COMPATIBILITY;
return PARENTS_MED_COMPATABILITY; return PARENTS_MED_COMPATIBILITY;
} }
// neither parent is Ditto // neither parent is Ditto
else else
@ -1065,14 +1065,14 @@ static u8 GetDaycareCompatibilityScore(struct DayCare *daycare)
if (species[0] == species[1]) if (species[0] == species[1])
{ {
if (trainerIds[0] == trainerIds[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 else
{ {
if (trainerIds[0] != trainerIds[1]) 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 return PARENTS_LOW_COMPATIBILITY; // different species, same trainer
} }
@ -1095,9 +1095,9 @@ void SetDaycareCompatibilityString(void)
whichString = 3; whichString = 3;
if (relationshipScore == PARENTS_LOW_COMPATIBILITY) if (relationshipScore == PARENTS_LOW_COMPATIBILITY)
whichString = 2; whichString = 2;
if (relationshipScore == PARENTS_MED_COMPATABILITY) if (relationshipScore == PARENTS_MED_COMPATIBILITY)
whichString = 1; whichString = 1;
if (relationshipScore == PARENTS_MAX_COMPATABILITY) if (relationshipScore == PARENTS_MAX_COMPATIBILITY)
whichString = 0; whichString = 0;
StringCopy(gStringVar4, sCompatibilityMessages[whichString]); StringCopy(gStringVar4, sCompatibilityMessages[whichString]);