Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2025-02-18 14:28:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update speciesname fetch usages to be gen sensitive

Browse source
This commit is contained in:
Kurt 2017-06-20 22:53:39 -07:00
parent ea473ae74f
commit f15333ea6c
6 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
PKHeX.Core/MysteryGifts/PGF.cs
View file

@ -229,7 +229,7 @@ namespace PKHeX.Core
pk.OT_Gender = OTGender % 2; // %2 just in case? pk.OT_Gender = OTGender % 2; // %2 just in case?
} }
pk.IsNicknamed = IsNicknamed; pk.IsNicknamed = IsNicknamed;
pk.Nickname = IsNicknamed ? Nickname : PKX.GetSpeciesName(Species, pk.Language); pk.Nickname = IsNicknamed ? Nickname : PKX.GetSpeciesNameGeneration(Species, pk.Language, Format);
// More 'complex' logic to determine final values // More 'complex' logic to determine final values

2
PKHeX.Core/MysteryGifts/PGT.cs
View file

@ -264,7 +264,7 @@ namespace PKHeX.Core
pk4.Met_Location = pk4.Egg_Location + 3000; pk4.Met_Location = pk4.Egg_Location + 3000;
pk4.Egg_Location = 0; pk4.Egg_Location = 0;
pk4.IsNicknamed = true; pk4.IsNicknamed = true;
pk4.Nickname = PKX.GetSpeciesName(0, pk4.Language).ToUpper(); pk4.Nickname = PKX.GetSpeciesNameGeneration(0, pk4.Language, Format);
pk4.MetDate = DateTime.Now; pk4.MetDate = DateTime.Now;
} }
else else

2
PKHeX.Core/MysteryGifts/WC6.cs
View file

@ -373,7 +373,7 @@ namespace PKHeX.Core
pk.HT_Friendship = pk.OT_Friendship; pk.HT_Friendship = pk.OT_Friendship;
} }
pk.IsNicknamed = IsNicknamed; pk.IsNicknamed = IsNicknamed;
pk.Nickname = IsNicknamed ? Nickname : PKX.GetSpeciesName(Species, pk.Language); pk.Nickname = IsNicknamed ? Nickname : PKX.GetSpeciesNameGeneration(Species, pk.Language, Format);
// More 'complex' logic to determine final values // More 'complex' logic to determine final values

4
PKHeX.Core/MysteryGifts/WC7.cs
View file

@ -384,7 +384,7 @@ namespace PKHeX.Core
pk.MetDate = Date ?? DateTime.Now; pk.MetDate = Date ?? DateTime.Now;
pk.IsNicknamed = IsNicknamed; pk.IsNicknamed = IsNicknamed;
pk.Nickname = IsNicknamed ? Nickname : PKX.GetSpeciesName(Species, pk.Language); pk.Nickname = IsNicknamed ? Nickname : PKX.GetSpeciesNameGeneration(Species, pk.Language, Format);
// More 'complex' logic to determine final values // More 'complex' logic to determine final values
@ -449,7 +449,7 @@ namespace PKHeX.Core
{ {
pk.IsEgg = true; pk.IsEgg = true;
pk.EggMetDate = Date; pk.EggMetDate = Date;
pk.Nickname = PKX.GetSpeciesName(0, pk.Language); pk.Nickname = PKX.GetSpeciesNameGeneration(0, pk.Language, Format);
} }
pk.RefreshChecksum(); pk.RefreshChecksum();

2
PKHeX.Core/PKM/PK3.cs
View file

@ -275,7 +275,7 @@ namespace PKHeX.Core
// Yay for reusing string buffers! // Yay for reusing string buffers!
PKX.G4TransferTrashBytes[pk4.Language].CopyTo(pk4.Data, 0x48 + 4); PKX.G4TransferTrashBytes[pk4.Language].CopyTo(pk4.Data, 0x48 + 4);
pk4.Nickname = IsEgg ? PKX.GetSpeciesName(pk4.Species, pk4.Language) : Nickname; pk4.Nickname = IsEgg ? PKX.GetSpeciesNameGeneration(pk4.Species, pk4.Language, pk4.Format) : Nickname;
Array.Copy(pk4.Data, 0x48, pk4.Data, 0x68, 0x10); Array.Copy(pk4.Data, 0x48, pk4.Data, 0x68, 0x10);
pk4.OT_Name = OT_Name; pk4.OT_Name = OT_Name;

2
PKHeX.Core/PKM/PK5.cs
View file

@ -362,7 +362,7 @@ namespace PKHeX.Core
// Apply trash bytes for species name of current app language -- default to PKM's language if no match // Apply trash bytes for species name of current app language -- default to PKM's language if no match
int curLang = PKX.GetSpeciesNameLanguage(Species, Nickname, Format); int curLang = PKX.GetSpeciesNameLanguage(Species, Nickname, Format);
pk6.Nickname = PKX.GetSpeciesName(Species, curLang < 0 ? Language : curLang); pk6.Nickname = PKX.GetSpeciesNameGeneration(Species, curLang < 0 ? Language : curLang, pk6.Format);
if (IsNicknamed) if (IsNicknamed)
pk6.Nickname = Nickname; pk6.Nickname = Nickname;