diff --git a/PKHeX.Core/Legality/Encounters/Data/Gen9/Encounters9.cs b/PKHeX.Core/Legality/Encounters/Data/Gen9/Encounters9.cs index 4cc2a9697..895563b1f 100644 --- a/PKHeX.Core/Legality/Encounters/Data/Gen9/Encounters9.cs +++ b/PKHeX.Core/Legality/Encounters/Data/Gen9/Encounters9.cs @@ -108,7 +108,7 @@ internal static class Encounters9 // Mythical Pokémon new(SV) { Species = 0648, Shiny = Never, Level = 70, Location = 176, Ability = OnlyFirst, TeraType = GemType.Fighting, Size = 128, FlawlessIVCount = 3, Moves = new(547,304,047,094) }, // Meloetta - //new(SV) { Species = 1025, Shiny = Never, Level = 88, Location = 138, Ability = OnlyFirst, Nature = Nature.Timid, TeraType = GemType.Poison, Size = 128, FlawlessIVCount = 3, Moves = new(417,092,919,247) }, // Pecharunt + new(SV) { Species = 1025, Shiny = Never, Level = 88, Location = 138, Ability = OnlyFirst, Nature = Nature.Timid, TeraType = GemType.Poison, Size = 128, FlawlessIVCount = 3, Moves = new(417,092,919,247) }, // Pecharunt #endregion ]; @@ -154,14 +154,13 @@ internal static class Encounters9 private const string tradeSV = "tradesv"; private static readonly string[][] TradeNames = Util.GetLanguageStrings10(tradeSV, "zh2"); - // 5 Trades are currently inaccessible (legally at least) until the Mochi Mayhem Epilogue is released. internal static readonly EncounterTrade9[] TradeGift_SV = [ new(TradeNames, 00, SV, 0194, 18) { FixedBall = Ball.Poke, ID32 = 033081, Ability = OnlySecond, OTGender = 1, Gender = 0, Nature = Nature.Relaxed, TeraType = GemType.Water, Weight = SizeType9.M, Scale = SizeType9.M, IVs = new(27,18,25,13,16,31) }, // Wooper new(TradeNames, 01, SV, 0093, 25) { FixedBall = Ball.Poke, ID32 = 016519, Ability = OnlyFirst, OTGender = 1, Gender = 1, Nature = Nature.Lonely, TeraType = GemType.Ghost, Weight = SizeType9.S, Scale = SizeType9.S, IVs = new(14,20,25,31,28,16), EvolveOnTrade = true }, // Haunter new(TradeNames, 02, SV, 0240, 12) { FixedBall = Ball.Quick, ID32 = 418071, Ability = OnlyHidden, OTGender = 0, Gender = 0, Nature = Nature.Docile, TeraType = GemType.Fire, Weight = SizeType9.VALUE, Scale = SizeType9.VALUE, IVs = new(31,12,25,15,31,31), Moves = new(264,052,108,499) }, // Magby new(TradeNames, 03, SV, 0982, 35) { FixedBall = Ball.Poke, ID32 = 766634, Ability = OnlyFirst, OTGender = 0, Gender = 0, Nature = Nature.Relaxed, TeraType = GemType.Flying, Weight = SizeType9.VALUE, Scale = SizeType9.VALUE, IVs = new(15,24,31,26,31,11), Moves = new(263,403,529,887) }, // Dudunsparce - //new(TradeNames, 04, SV, 0133, 01) { FixedBall = Ball.Poke, ID32 = 376983, Ability = OnlyHidden, OTGender = 1, Gender = 0, Nature = Nature.Modest, TeraType = GemType.Dark, Weight = SizeType9.VALUE, Scale = SizeType9.VALUE, IVs = new(08,26,31,31,31,31), Moves = new(033,039,270,174) }, // Eevee + new(TradeNames, 04, SV, 0133, 01) { FixedBall = Ball.Poke, ID32 = 376983, Ability = OnlyHidden, OTGender = 1, Gender = 0, Nature = Nature.Modest, TeraType = GemType.Dark, Weight = SizeType9.VALUE, Scale = SizeType9.VALUE, IVs = new(08,26,31,31,31,31), Moves = new(033,039,270,174) }, // Eevee new(TradeNames, 05, SV, 0194, 08) { FixedBall = Ball.Poke, ID32 = 591912, Ability = OnlyHidden, OTGender = 1, Gender = 0, Nature = Nature.Naughty, TeraType = GemType.Poison, Weight = SizeType9.VALUE, Scale = SizeType9.VALUE, IVs = new(27,31,31,06,16,30), Moves = new(341,068,491,342), Form = 1 }, // Wooper-1 new(TradeNames, 06, SV, 0922, 24) { FixedBall = Ball.Poke, ID32 = 209896, Ability = OnlyFirst, OTGender = 0, Gender = 0, Nature = Nature.Hasty, TeraType = GemType.Fighting, Weight = SizeType9.VALUE, Scale = SizeType9.VALUE, IVs = new(15,22,31,29,14,03) }, // Pawmo new(TradeNames, 07, SV, 0974, 37) { FixedBall = Ball.Poke, ID32 = 209896, Ability = OnlyHidden, OTGender = 0, Gender = 0, Nature = Nature.Bashful, TeraType = GemType.Ice, Weight = SizeType9.VALUE, Scale = SizeType9.VALUE, IVs = new(31,23,18,31,15,09) }, // Cetoddle @@ -173,10 +172,10 @@ internal static class Encounters9 new(TradeNames, 13, SV, 0192, 40) { FixedBall = Ball.Poke, ID32 = 584457, Ability = OnlySecond, OTGender = 0, Gender = 0, Nature = Nature.Brave, TeraType = GemType.Grass, Weight = SizeType9.VALUE, Scale = SizeType9.VALUE, IVs = new(12,19,25,20,16,24), Moves = new(885,241,283,235) }, // Sunflora new(TradeNames, 14, SV, 0747, 20) { FixedBall = Ball.Poke, ID32 = 158604, Ability = OnlyHidden, OTGender = 1, Gender = 1, Nature = Nature.Timid, TeraType = GemType.Poison, Weight = SizeType9.VALUE, Scale = SizeType9.VALUE, IVs = new(30,21,10,16,22,29) }, // Mareanie new(TradeNames, 15, SV, 0081, 22) { FixedBall = Ball.Poke, ID32 = 568659, Ability = OnlyFirst, OTGender = 1, Gender = 2, Nature = Nature.Rash, TeraType = GemType.Electric, Weight = SizeType9.VALUE, Scale = SizeType9.VALUE, IVs = new(04,29,08,30,31,02), Moves = new(527,048,086,209) }, // Magnemite - //new(TradeNames, 16, SV, 0128, 50) { FixedBall = Ball.Poke, ID32 = 933665, Ability = OnlyFirst, OTGender = 1, Gender = 0, Nature = Nature.Jolly, TeraType = GemType.Fighting, Weight = SizeType9.VALUE, Scale = SizeType9.VALUE, IVs = new(31,31,26,31,31,31), Moves = new(873,528,038,370), Form = 1 }, // Tauros-1 + new(TradeNames, 16, SV, 0128, 50) { FixedBall = Ball.Poke, ID32 = 933665, Ability = OnlyFirst, OTGender = 1, Gender = 0, Nature = Nature.Jolly, TeraType = GemType.Fighting, Weight = SizeType9.VALUE, Scale = SizeType9.VALUE, IVs = new(31,31,26,31,31,31), Moves = new(873,528,038,370), Form = 1 }, // Tauros-1 new(TradeNames, 17, SV, 0227, 40) { FixedBall = Ball.Heavy, ID32 = 745642, Ability = OnlySecond, OTGender = 1, Gender = 1, Nature = Nature.Lonely, TeraType = GemType.Steel, Weight = SizeType9.VALUE, Scale = SizeType9.VALUE, IVs = new(24,15,22,19,14,09) }, // Skarmory new(TradeNames, 18, SV, 0969, 05) { FixedBall = Ball.Poke, ID32 = 661291, Ability = OnlyHidden, OTGender = 1, Gender = 1, Nature = Nature.Modest, TeraType = GemType.Psychic, Weight = SizeType9.VALUE, Scale = SizeType9.VALUE, IVs = new(31,00,22,31,30,31), Moves = new(851,092,088,479) }, // Glimmet - //new(TradeNames, 19, SV, 0819, 07) { FixedBall = Ball.Poke, ID32 = 105971, Ability = OnlyHidden, OTGender = 0, Gender = 1, Nature = Nature.Gentle, TeraType = GemType.Fighting, Weight = SizeType9.VALUE, Scale = SizeType9.VALUE, IVs = new(14,12,22,10,23,22) }, // Skwovet + new(TradeNames, 19, SV, 0819, 07) { FixedBall = Ball.Poke, ID32 = 105971, Ability = OnlyHidden, OTGender = 0, Gender = 1, Nature = Nature.Gentle, TeraType = GemType.Fighting, Weight = SizeType9.VALUE, Scale = SizeType9.VALUE, IVs = new(14,12,22,10,23,22) }, // Skwovet new(TradeNames, 20, SV, 0958, 25) { FixedBall = Ball.Poke, ID32 = 949475, Ability = OnlyFirst, OTGender = 1, Gender = 1, Nature = Nature.Careful, TeraType = GemType.Fairy, Weight = SizeType9.VALUE, Scale = SizeType9.VALUE, IVs = new(12,29,29,26,28,22) }, // Tinkatuff new(TradeNames, 21, SV, 0971, 10) { FixedBall = Ball.Poke, ID32 = 275703, Ability = OnlyHidden, OTGender = 1, Gender = 0, Nature = Nature.Jolly, TeraType = GemType.Ghost, Weight = SizeType9.VALUE, Scale = SizeType9.VALUE, IVs = new(15,26,14,16,04,31) }, // Greavard new(TradeNames, 22, SV, 0999, 30) { FixedBall = Ball.Poke, ID32 = 361010, Ability = OnlyFirst, OTGender = 1, Gender = 2, Nature = Nature.Sassy, TeraType = GemType.Steel, Weight = SizeType9.VALUE, Scale = SizeType9.VALUE, IVs = new(05,12,01,22,16,18) }, // Gimmighoul @@ -184,10 +183,10 @@ internal static class Encounters9 new(TradeNames, 24, SV, 0857, 33) { FixedBall = Ball.Poke, ID32 = 654886, Ability = OnlyFirst, OTGender = 0, Gender = 1, Nature = Nature.Serious, TeraType = GemType.Fairy, Weight = SizeType9.VALUE, Scale = SizeType9.VALUE, IVs = new(22,18,18,07,31,31) }, // Hattrem new(TradeNames, 25, SV, 0052, 21) { FixedBall = Ball.Poke, ID32 = 314512, Ability = OnlySecond, OTGender = 0, Gender = 1, Nature = Nature.Relaxed, TeraType = GemType.Dark, Weight = SizeType9.VALUE, Scale = SizeType9.VALUE, IVs = new(09,31,24,11,12,12), Form = 1 }, // Meowth-1 new(TradeNames, 26, SV, 0522, 20) { FixedBall = Ball.Poke, ID32 = 390518, Ability = OnlyFirst, OTGender = 0, Gender = 0, Nature = Nature.Hardy, TeraType = GemType.Electric, Weight = SizeType9.VALUE, Scale = SizeType9.VALUE, IVs = new(31,25,23,31,23,31), Shiny = Always }, // Blitzle - //new(TradeNames, 27, SV, 0840, 15) { FixedBall = Ball.Poke, ID32 = 184745, Ability = OnlyHidden, OTGender = 0, Gender = 0, Nature = Nature.Modest, TeraType = GemType.Dragon, Weight = SizeType9.VALUE, Scale = SizeType9.VALUE, IVs = new(30,31,22,18,31,26), Moves = new(110,310,278,389) }, // Applin + new(TradeNames, 27, SV, 0840, 15) { FixedBall = Ball.Poke, ID32 = 184745, Ability = OnlyHidden, OTGender = 0, Gender = 0, Nature = Nature.Modest, TeraType = GemType.Dragon, Weight = SizeType9.VALUE, Scale = SizeType9.VALUE, IVs = new(30,31,22,18,31,26), Moves = new(110,310,278,389) }, // Applin new(TradeNames, 28, SV, 0209, 18) { FixedBall = Ball.Nest, ID32 = 816963, Ability = OnlyFirst, OTGender = 1, Gender = 0, Nature = Nature.Adamant, TeraType = GemType.Fairy, Weight = SizeType9.VALUE, Scale = SizeType9.VALUE, IVs = new(18,30,24,31,24,25) }, // Snubbull new(TradeNames, 29, SV, 0744, 12) { FixedBall = Ball.Poke, ID32 = 980975, Ability = OnlyHidden, OTGender = 1, Gender = 1, Nature = Nature.Impish, TeraType = GemType.Ground, Weight = SizeType9.M, Scale = SizeType9.M, IVs = new(20,30,02,19,15,17), Moves = new(707,088,387,283) }, // Rockruff - //new(TradeNames, 30, SV, 1012, 30) { FixedBall = Ball.Poke, ID32 = 704310, Ability = OnlyFirst, OTGender = 1, Gender = 1, Nature = Nature.Sassy, TeraType = GemType.Water, Weight = SizeType9.VALUE, Scale = SizeType9.VALUE, IVs = new(12,19,29,22,31,03), Moves = new(506,072,078,503) }, // Poltchageist + new(TradeNames, 30, SV, 1012, 30) { FixedBall = Ball.Poke, ID32 = 704310, Ability = OnlyFirst, OTGender = 1, Gender = 2, Nature = Nature.Sassy, TeraType = GemType.Water, Weight = SizeType9.VALUE, Scale = SizeType9.VALUE, IVs = new(12,19,29,22,31,03), Moves = new(506,072,078,503) }, // Poltchageist new(TradeNames, 31, SV, 0316, 17) { FixedBall = Ball.Poke, ID32 = 134745, Ability = OnlyHidden, OTGender = 0, Gender = 1, Nature = Nature.Gentle, TeraType = GemType.Poison, Weight = SizeType9.VALUE, Scale = SizeType9.VALUE, IVs = new(12,28,25,19,17,31), Moves = new(491,227,499,281) }, // Gulpin new(TradeNames, 32, SV, 0872, 10) { FixedBall = Ball.Poke, ID32 = 050724, Ability = Any12, OTGender = 0, Gender = 1, Nature = Nature.Bashful, TeraType = GemType.Ice, Weight = SizeType9.L, Scale = SizeType9.L, IVs = new(31,18,13,20,28,26) }, // Snom ]; diff --git a/PKHeX.Core/Moves/MoveInfo.cs b/PKHeX.Core/Moves/MoveInfo.cs index d5bca37a2..d13a2bb94 100644 --- a/PKHeX.Core/Moves/MoveInfo.cs +++ b/PKHeX.Core/Moves/MoveInfo.cs @@ -165,7 +165,6 @@ public static bool IsSketchValid(ushort move, EntityContext context) // Unreleased (int)LightofRuin => false, - (int)MalignantChain => false, _ => IsMoveKnowable(move), }; diff --git a/PKHeX.Core/Saves/Substructures/Gen9/PlayerFashionUnlock9.cs b/PKHeX.Core/Saves/Substructures/Gen9/PlayerFashionUnlock9.cs index 349d020bb..6f769c089 100644 --- a/PKHeX.Core/Saves/Substructures/Gen9/PlayerFashionUnlock9.cs +++ b/PKHeX.Core/Saves/Substructures/Gen9/PlayerFashionUnlock9.cs @@ -20,9 +20,9 @@ public static class PlayerFashionUnlock9 1153, 1154, 1155, 1156, 1157, 1158, 1159, 1160, 1161, 1162, 1163, 1164, 1165, 1166, 1167, 1168, 1169, 1170, 1171, 1172, 1173, 1174, 1175, 1176, 1177, 1178, 1179, 1180, 1181, 1182, 1183, 1184, 1185, 1186, 1187, 1188, 1189, 1190, 1191, 1192, 1193, 1194, 1195, 1196, 1197, 1198, 1199, 1200, 1201, 1202, 1203, 1204, 1205, 1206, 1207, 1208, 1209, - 1210, 1211, 1212, 1213, 1214, 1215, 1216, 1217, 1218, 1219, 1220, 1221, 1222, 1223, 1225, 1226, 1227, 1228, 1229, - 1230, 1231, 1232, 1233, 1234, 1235, 1236, 1237, 1238, 1239, 1240, 1241, 1242, 1243, 1244, 1245, 1246, 1247, 1248, - 1249, + 1210, 1211, 1212, 1213, 1214, 1215, 1216, 1217, 1218, 1219, 1220, 1221, 1222, 1223, 1224, 1225, 1226, 1227, 1228, + 1229, 1230, 1231, 1232, 1233, 1234, 1235, 1236, 1237, 1238, 1239, 1240, 1241, 1242, 1243, 1244, 1245, 1246, 1247, + 1248, 1249, ]; private static ReadOnlySpan Gloves =>