From f15333ea6cae74481064bffc6fd7c4494368f5d5 Mon Sep 17 00:00:00 2001 From: Kurt Date: Tue, 20 Jun 2017 22:53:39 -0700 Subject: [PATCH] Update speciesname fetch usages to be gen sensitive --- PKHeX.Core/MysteryGifts/PGF.cs | 2 +- PKHeX.Core/MysteryGifts/PGT.cs | 2 +- PKHeX.Core/MysteryGifts/WC6.cs | 2 +- PKHeX.Core/MysteryGifts/WC7.cs | 4 ++-- PKHeX.Core/PKM/PK3.cs | 2 +- PKHeX.Core/PKM/PK5.cs | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/PKHeX.Core/MysteryGifts/PGF.cs b/PKHeX.Core/MysteryGifts/PGF.cs index f2649c77e..622c3e1e4 100644 --- a/PKHeX.Core/MysteryGifts/PGF.cs +++ b/PKHeX.Core/MysteryGifts/PGF.cs @@ -229,7 +229,7 @@ namespace PKHeX.Core pk.OT_Gender = OTGender % 2; // %2 just in case? } 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 diff --git a/PKHeX.Core/MysteryGifts/PGT.cs b/PKHeX.Core/MysteryGifts/PGT.cs index e487bbd83..cc4b54ea6 100644 --- a/PKHeX.Core/MysteryGifts/PGT.cs +++ b/PKHeX.Core/MysteryGifts/PGT.cs @@ -264,7 +264,7 @@ namespace PKHeX.Core pk4.Met_Location = pk4.Egg_Location + 3000; pk4.Egg_Location = 0; pk4.IsNicknamed = true; - pk4.Nickname = PKX.GetSpeciesName(0, pk4.Language).ToUpper(); + pk4.Nickname = PKX.GetSpeciesNameGeneration(0, pk4.Language, Format); pk4.MetDate = DateTime.Now; } else diff --git a/PKHeX.Core/MysteryGifts/WC6.cs b/PKHeX.Core/MysteryGifts/WC6.cs index 4cff4fd78..15db3ca9c 100644 --- a/PKHeX.Core/MysteryGifts/WC6.cs +++ b/PKHeX.Core/MysteryGifts/WC6.cs @@ -373,7 +373,7 @@ namespace PKHeX.Core pk.HT_Friendship = pk.OT_Friendship; } 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 diff --git a/PKHeX.Core/MysteryGifts/WC7.cs b/PKHeX.Core/MysteryGifts/WC7.cs index d2c6d544e..020d0d193 100644 --- a/PKHeX.Core/MysteryGifts/WC7.cs +++ b/PKHeX.Core/MysteryGifts/WC7.cs @@ -384,7 +384,7 @@ namespace PKHeX.Core pk.MetDate = Date ?? DateTime.Now; 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 @@ -449,7 +449,7 @@ namespace PKHeX.Core { pk.IsEgg = true; pk.EggMetDate = Date; - pk.Nickname = PKX.GetSpeciesName(0, pk.Language); + pk.Nickname = PKX.GetSpeciesNameGeneration(0, pk.Language, Format); } pk.RefreshChecksum(); diff --git a/PKHeX.Core/PKM/PK3.cs b/PKHeX.Core/PKM/PK3.cs index 6493955aa..f1ac11c40 100644 --- a/PKHeX.Core/PKM/PK3.cs +++ b/PKHeX.Core/PKM/PK3.cs @@ -275,7 +275,7 @@ namespace PKHeX.Core // Yay for reusing string buffers! 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); pk4.OT_Name = OT_Name; diff --git a/PKHeX.Core/PKM/PK5.cs b/PKHeX.Core/PKM/PK5.cs index cad6657d2..8f179b752 100644 --- a/PKHeX.Core/PKM/PK5.cs +++ b/PKHeX.Core/PKM/PK5.cs @@ -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 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) pk6.Nickname = Nickname;