Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-11-10 22:54:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Handle japanese name if egg

Browse source 
Closes #2756

For eggs that we don't know the OT of, they'll still show invalid (empty string).
ty @PrometheusG !
This commit is contained in:
Kurt 2020-03-13 18:37:51 -07:00
parent 0a39e0a834
commit c4ce22412a
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
PKHeX.Core/MysteryGifts/WC3.cs
View file

@ -104,10 +104,10 @@ namespace PKHeX.Core
pk.TID = TID; pk.TID = TID;
pk.SID = SID; pk.SID = SID;
pk.Language = (int)GetSafeLanguage((LanguageID)SAV.Language, (LanguageID)Language); pk.Language = (int)GetSafeLanguage((LanguageID)SAV.Language);
pk.OT_Name = !string.IsNullOrWhiteSpace(OT_Name) ? OT_Name : SAV.OT; pk.OT_Name = !string.IsNullOrWhiteSpace(OT_Name) ? OT_Name : SAV.OT;
if (IsEgg) if (IsEgg)
pk.IsEgg = true; // lang should be set to japanese by IsEgg setter pk.IsEgg = true; // lang should be set to japanese already
} }
pk.Nickname = SpeciesName.GetSpeciesNameGeneration(Species, pk.Language, 3); // will be set to Egg nickname if appropriate by PK3 setter pk.Nickname = SpeciesName.GetSpeciesNameGeneration(Species, pk.Language, 3); // will be set to Egg nickname if appropriate by PK3 setter
@ -178,13 +178,15 @@ namespace PKHeX.Core
}; };
} }
private static LanguageID GetSafeLanguage(LanguageID hatchLang, LanguageID supplied) private LanguageID GetSafeLanguage(LanguageID hatchLang)
{ {
if (supplied >= LanguageID.Japanese) if (IsEgg)
return supplied; return LanguageID.Japanese;
if (hatchLang < LanguageID.Hacked || hatchLang > LanguageID.Korean) // ko if (Language != -1)
return LanguageID.English; return (LanguageID)Language;
return hatchLang; if (hatchLang < LanguageID.Korean && hatchLang != LanguageID.Hacked)
return hatchLang;
return LanguageID.English; // fallback
} }
private static GameVersion GetRandomVersion(GameVersion version) private static GameVersion GetRandomVersion(GameVersion version)