From 79f0b3665f9f22ecc7b6aa3c621c92253718aedd Mon Sep 17 00:00:00 2001 From: Kurt Date: Sat, 9 Jun 2018 12:44:30 -0700 Subject: [PATCH] Differentiate C/XD cologne IDs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://projectpokemon.org/home/forums/topic/45685-pokémon-xd-and-scent-bag/ Thanks Asia81! --- PKHeX.Core/Legality/Tables3.cs | 3 ++- PKHeX.Core/Saves/SAV3Colosseum.cs | 2 +- PKHeX.Core/Saves/SAV3XD.cs | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/PKHeX.Core/Legality/Tables3.cs b/PKHeX.Core/Legality/Tables3.cs index 0c021c638..fca8e5ae7 100644 --- a/PKHeX.Core/Legality/Tables3.cs +++ b/PKHeX.Core/Legality/Tables3.cs @@ -66,7 +66,7 @@ namespace PKHeX.Core 20, 20, 05, 05, }; - internal static readonly ushort[] Pouch_Cologne_CXD = {543, 544, 545}; + internal static readonly ushort[] Pouch_Cologne_COLO = {543, 544, 545}; internal static readonly ushort[] Pouch_Items_COLO = Pouch_Items_RS.Concat(new ushort[] {537}).ToArray(); // Time Flute internal static readonly ushort[] HeldItems_COLO = new ushort[1].Concat(Pouch_Items_COLO).Concat(Pouch_Ball_RS).Concat(Pouch_Berries_RS).Concat(Pouch_TM_RS).ToArray(); internal static readonly ushort[] Pouch_Key_COLO = @@ -78,6 +78,7 @@ namespace PKHeX.Core 540, 541, 542, 546, 547, }; + internal static readonly ushort[] Pouch_Cologne_XD = {513, 514, 515}; internal static readonly ushort[] Pouch_Items_XD = Pouch_Items_RS.Concat(new ushort[] {511}).ToArray(); // Poké Snack internal static readonly ushort[] HeldItems_XD = new ushort[1].Concat(Pouch_Items_XD).Concat(Pouch_Ball_RS).Concat(Pouch_Berries_RS).Concat(Pouch_TM_RS).ToArray(); internal static readonly ushort[] Pouch_Key_XD = diff --git a/PKHeX.Core/Saves/SAV3Colosseum.cs b/PKHeX.Core/Saves/SAV3Colosseum.cs index 45e46978e..ad8f51faa 100644 --- a/PKHeX.Core/Saves/SAV3Colosseum.cs +++ b/PKHeX.Core/Saves/SAV3Colosseum.cs @@ -96,7 +96,7 @@ namespace PKHeX.Core LegalBalls = Legal.Pouch_Ball_RS; LegalTMHMs = Legal.Pouch_TM_RS; // not HMs LegalBerries = Legal.Pouch_Berries_RS; - LegalCologne = Legal.Pouch_Cologne_CXD; + LegalCologne = Legal.Pouch_Cologne_COLO; Personal = PersonalTable.RS; HeldItems = Legal.HeldItems_COLO; diff --git a/PKHeX.Core/Saves/SAV3XD.cs b/PKHeX.Core/Saves/SAV3XD.cs index 545069dff..fcc147b82 100644 --- a/PKHeX.Core/Saves/SAV3XD.cs +++ b/PKHeX.Core/Saves/SAV3XD.cs @@ -103,7 +103,7 @@ namespace PKHeX.Core LegalBalls = Legal.Pouch_Ball_RS; LegalTMHMs = Legal.Pouch_TM_RS; // not HMs LegalBerries = Legal.Pouch_Berries_RS; - LegalCologne = Legal.Pouch_Cologne_CXD; + LegalCologne = Legal.Pouch_Cologne_XD; LegalDisc = Legal.Pouch_Disc_XD; Personal = PersonalTable.RS;