ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

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
#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

16
src/daycare.c
View File

@ -894,8 +894,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();
}
@ -1050,7 +1050,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
@ -1065,14 +1065,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
}
@ -1095,9 +1095,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]);