diff --git a/PKHeX.Core/Legality/Encounters/Data/Encounters3.cs b/PKHeX.Core/Legality/Encounters/Data/Encounters3.cs index a5f6c4b91..bd4b2adba 100644 --- a/PKHeX.Core/Legality/Encounters/Data/Encounters3.cs +++ b/PKHeX.Core/Legality/Encounters/Data/Encounters3.cs @@ -467,9 +467,9 @@ private static EncounterArea GetUnownArea(int location, IReadOnlyList SlotF new EncounterStaticShadow { Species = 217, Level = 45, Gauge = 07000, Moves = new[] {185,313,122,163}, Location = 132, Locks = Ursaring }, // Ursaring: Team Snagem Agrev @ Snagem Hideout new EncounterStaticShadow { Species = 213, Level = 45, Gauge = 07000, Moves = new[] {219,227,156,117}, Location = 125 }, // Shuckle: Deep King Agnol @ Deep Colosseum new EncounterStaticShadow { Species = 176, Level = 20, Gauge = 05000, Moves = new[] {118,204,186,281}, Location = 001 }, // Togetic: Cipher Peon Fein @ Outskirt Stand - new EncounterStaticShadow { Species = 175, Level = 20, Gauge = 00000, Moves = new[] {118,204,186,281}, IVs = new[] {0,0,0,0,0,0}, EReader = true }, // Togepi: Chaser ボデス @ Card e Room (Japanese games only) - new EncounterStaticShadow { Species = 179, Level = 37, Gauge = 00000, Moves = new[] {087,084,086,178}, IVs = new[] {0,0,0,0,0,0}, EReader = true }, // Mareep: Hunter ホル @ Card e Room (Japanese games only) - new EncounterStaticShadow { Species = 212, Level = 50, Gauge = 00000, Moves = new[] {210,232,014,163}, IVs = new[] {0,0,0,0,0,0}, EReader = true }, // Scizor: Bodybuilder ワーバン @ Card e Room (Japanese games only) + new EncounterStaticShadow { Species = 175, Level = 20, Gauge = 00000, Moves = new[] {118,204,186,281}, IVs = new[] {0,0,0,0,0,0}, EReader = true, Locks = CTogepi }, // Togepi: Chaser ボデス @ Card e Room (Japanese games only) + new EncounterStaticShadow { Species = 179, Level = 37, Gauge = 00000, Moves = new[] {087,084,086,178}, IVs = new[] {0,0,0,0,0,0}, EReader = true, Locks = CMareep }, // Mareep: Hunter ホル @ Card e Room (Japanese games only) + new EncounterStaticShadow { Species = 212, Level = 50, Gauge = 00000, Moves = new[] {210,232,014,163}, IVs = new[] {0,0,0,0,0,0}, EReader = true, Locks = CScizor }, // Scizor: Bodybuilder ワーバン @ Card e Room (Japanese games only) }; #endregion diff --git a/PKHeX.Core/Legality/Encounters/Data/Encounters3Shadow.cs b/PKHeX.Core/Legality/Encounters/Data/Encounters3Shadow.cs index e0d9a7a24..3955b28d2 100644 --- a/PKHeX.Core/Legality/Encounters/Data/Encounters3Shadow.cs +++ b/PKHeX.Core/Legality/Encounters/Data/Encounters3Shadow.cs @@ -2,6 +2,8 @@ { public static class Encounters3Shadow { + #region Colosseum + public static readonly TeamLock CMakuhita = new TeamLock { Species = 296, // Makuhita Locks = new[] { @@ -40,6 +42,38 @@ public static class Encounters3Shadow new NPCLock(275, 21, 1, 127), // Shiftry (F) (Gentle) }}; + #endregion + + #region E-Reader + + public static readonly TeamLock ETogepi = new TeamLock { + Species = 175, // Togepi + Locks = new[] { + new NPCLock(302, 23, 0, 025), // Sableye (M) (Careful) + new NPCLock(088, 08, 0, 127), // Grimer (M) (Impish) + new NPCLock(316, 24, 0, 127), // Gulpin (M) (Quirky) + }}; + + public static readonly TeamLock EMareep = new TeamLock { + Species = 179, // Mareep + Locks = new[] { + new NPCLock(300, 04, 1, 191), // Skitty (F) (Naughty) + new NPCLock(211, 10, 1, 127), // Quilfish (F) (Timid) + new NPCLock(355, 12, 1, 127), // Duskull (F) (Serious) + }}; + + public static readonly TeamLock EScizor = new TeamLock { + Species = 212, // Scizor + Locks = new[] { + new NPCLock(198, 13, 0, 191), // Murkrow (M) (Jolly) + new NPCLock(344, 02, 2, 256), // Claydol (M) (Brave) + new NPCLock(208, 03, 0, 127), // Steelix (M) (Adamant) + }}; + + #endregion + + #region XD + public static readonly TeamLock XRalts = new TeamLock { Species = 280, // Ralts Locks = new[] { @@ -1037,5 +1071,7 @@ public static class Encounters3Shadow new NPCLock(272, 12, 1, 127), // Ludicolo (F) (Serious) new NPCLock(272, 00, 0, 127), // Ludicolo (M) (Hardy) }}; + + #endregion } } diff --git a/PKHeX.Core/Legality/Encounters/Data/Encounters3Teams.cs b/PKHeX.Core/Legality/Encounters/Data/Encounters3Teams.cs index 065301e38..a639adee3 100644 --- a/PKHeX.Core/Legality/Encounters/Data/Encounters3Teams.cs +++ b/PKHeX.Core/Legality/Encounters/Data/Encounters3Teams.cs @@ -11,6 +11,11 @@ public static class Encounters3Teams public static readonly TeamLock[] Heracross = { CHeracross }; public static readonly TeamLock[] Ursaring = { CUrsaring }; + // E-Reader + public static readonly TeamLock[] CTogepi = {ETogepi}; + public static readonly TeamLock[] CMareep = {EMareep}; + public static readonly TeamLock[] CScizor = {EScizor}; + // XD public static readonly TeamLock[] Spheal = { XSphealCipherLab, XSphealPhenacCityandPost }; public static readonly TeamLock[] Seedot = { XSeedotCipherLab, XSeedotPhenacCity, XSeedotPost };