diff --git a/pkNX.Randomization/Randomizers/FormRandomizer.cs b/pkNX.Randomization/Randomizers/FormRandomizer.cs index 7b5e094c..c872303d 100644 --- a/pkNX.Randomization/Randomizers/FormRandomizer.cs +++ b/pkNX.Randomization/Randomizers/FormRandomizer.cs @@ -14,6 +14,7 @@ public FormRandomizer(PersonalTable t) public bool AllowMega { get; set; } = false; public bool AllowAlolanForm { get; set; } = true; + public bool AllowGalarianForm { get; set; } = true; public int GetRandomForme(int species, PersonalInfo[] stats = null) { @@ -35,10 +36,20 @@ public int GetRandomForme(int species, PersonalInfo[] stats = null) return 30; // save file specific case 774: // Minior return Util.Random.Next(7); + case 890: // Eternatus + return 0; + + // Galarian Forms + case 052 when AllowGalarianForm: // Galarian Meowth is altform 2 + return Util.Random.Next(3); + case 555 when AllowGalarianForm: // Galarian Darmanitan is altform 2, Galarian Zen is altform 3 + return Util.Random.Next(4); } if (AllowAlolanForm && Legal.EvolveToAlolanForms.Contains(species)) return Util.Random.Next(2); + if (AllowGalarianForm && Legal.EvolveToGalarForms.Contains(species)) + return Util.Random.Next(2); if (!Legal.BattleExclusiveForms.Contains(species) || AllowMega) return Util.Random.Next(stats[species].FormeCount); // Slot-Random return 0; diff --git a/pkNX.Randomization/Randomizers/Settings/TrainerRandSettings.cs b/pkNX.Randomization/Randomizers/Settings/TrainerRandSettings.cs index a76d3a06..70986b6c 100644 --- a/pkNX.Randomization/Randomizers/Settings/TrainerRandSettings.cs +++ b/pkNX.Randomization/Randomizers/Settings/TrainerRandSettings.cs @@ -50,6 +50,9 @@ public class TrainerRandSettings [Category(PKM), Description("Allows random Mega Forms when randomizing species.")] public bool AllowRandomMegaForms { get; set; } = false; + [Category(PKM), Description("Allows random Held Items when randomizing species.")] + public bool AllowRandomHeldItems { get; set; } = false; + [Category(PKM), Description("Forces all PKM above the specified level setting to be fully evolved.")] public bool ForceFullyEvolved { get; set; } = true; diff --git a/pkNX.Randomization/Randomizers/TrainerRandomizer.cs b/pkNX.Randomization/Randomizers/TrainerRandomizer.cs index 8805df40..74395f17 100644 --- a/pkNX.Randomization/Randomizers/TrainerRandomizer.cs +++ b/pkNX.Randomization/Randomizers/TrainerRandomizer.cs @@ -158,8 +158,7 @@ private void RandomizeSpecFormItem(IPokeData pk, int Type) { pk.Species = RandSpec.GetRandomSpeciesType(pk.Species, Type); TryForceEvolve(pk); - pk.HeldItem = PossibleHeldItems[Util.Random.Next(PossibleHeldItems.Length)]; - pk.Form = Legal.GetRandomForme(pk.Species, Settings.AllowRandomMegaForms, true, Personal); + pk.Form = Legal.GetRandomForme(pk.Species, Settings.AllowRandomMegaForms, true, true, Personal); } } @@ -172,14 +171,14 @@ private void RandomizeSpecForm(TrainerPoke7b pk, int type) pk.Species = species; pk.MegaFormChoice = Util.Random.Next(mega.Length); pk.CanMegaEvolve = true; - pk.Form = Legal.GetRandomForme(pk.Species, Settings.AllowRandomMegaForms, true, Personal); + pk.Form = Legal.GetRandomForme(pk.Species, Settings.AllowRandomMegaForms, true, false, Personal); return; } pk.MegaFormChoice = 0; pk.Species = RandSpec.GetRandomSpeciesType(pk.Species, type); TryForceEvolve(pk); - pk.Form = Legal.GetRandomForme(pk.Species, Settings.AllowRandomMegaForms, true, Personal); + pk.Form = Legal.GetRandomForme(pk.Species, Settings.AllowRandomMegaForms, true, false, Personal); } private void TryForceEvolve(IPokeData pk) @@ -220,12 +219,14 @@ private int TryForceEvolve(IReadOnlyList evos, ref int species, re private void UpdatePKMFromSettings(TrainerPoke pk) { + if (Settings.AllowRandomHeldItems) + pk.HeldItem = PossibleHeldItems[Util.Random.Next(PossibleHeldItems.Length)]; if (Settings.BoostLevel) BoostLevel(pk, Settings.LevelBoostRatio); if (Settings.RandomShinies) pk.Shiny = Util.Random.Next(0, 100 + 1) < Settings.ShinyChance; if (Settings.RandomAbilities) - pk.Ability = (int)Util.Rand32() % 4; + pk.Ability = Util.Random.Next(1, 4); // 1, 2, or H if (Settings.MaxIVs) pk.IVs = new[] { 31, 31, 31, 31, 31, 31 }; if (Settings.MaxDynamaxLevel && pk is TrainerPoke8 c && c.DynamaxLevel != 0) @@ -341,7 +342,7 @@ private static int[] GetRandomMega(Dictionary megas, out int species } private static readonly int[] CrashClasses_GG = Enumerable.Range(72, 382 - 72 + 1).ToArray(); - private static readonly int[] CrashClasses_SWSH = Enumerable.Range(219, 236 - 219 + 1).Concat(Legal.UnusedClasses_SWSH).ToArray(); + private static readonly int[] CrashClasses_SWSH = Enumerable.Range(94, 151 - 94 + 1).Concat(Enumerable.Range(219, 236 - 219 + 1)).Concat(Legal.UnusedClasses_SWSH).ToArray(); private static int[] GetSpecialClasses(GameVersion game) { diff --git a/pkNX.Sprites/Properties/Resources.resx b/pkNX.Sprites/Properties/Resources.resx index b842aab8..fbbe037d 100644 --- a/pkNX.Sprites/Properties/Resources.resx +++ b/pkNX.Sprites/Properties/Resources.resx @@ -7708,12 +7708,39 @@ ..\Sprites\Big Pokemon Sprites\b_10.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_100.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Sprites\Big Pokemon Sprites\b_101.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Sprites\Big Pokemon Sprites\b_102.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Sprites\Big Pokemon Sprites\b_103-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Sprites\Big Pokemon Sprites\b_103.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Sprites\Big Pokemon Sprites\b_104.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Sprites\Big Pokemon Sprites\b_105-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Sprites\Big Pokemon Sprites\b_105.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_106.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Sprites\Big Pokemon Sprites\b_107.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_108.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_109.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -7732,6 +7759,24 @@ ..\Sprites\Big Pokemon Sprites\b_112.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_113.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Sprites\Big Pokemon Sprites\b_114.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Sprites\Big Pokemon Sprites\b_115-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Sprites\Big Pokemon Sprites\b_115.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Sprites\Big Pokemon Sprites\b_116.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Sprites\Big Pokemon Sprites\b_117.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_118.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -7741,15 +7786,48 @@ ..\Sprites\Big Pokemon Sprites\b_12.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_120.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Sprites\Big Pokemon Sprites\b_121.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_122.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Sprites\Big Pokemon Sprites\b_122-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_123.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Sprites\Big Pokemon Sprites\b_124.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Sprites\Big Pokemon Sprites\b_125.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Sprites\Big Pokemon Sprites\b_126.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Sprites\Big Pokemon Sprites\b_127-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Sprites\Big Pokemon Sprites\b_127.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Sprites\Big Pokemon Sprites\b_128.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_129.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_13.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Sprites\Big Pokemon Sprites\b_130-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_130.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -7759,6 +7837,9 @@ ..\Sprites\Big Pokemon Sprites\b_132.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_133-1p.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_133.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -7771,21 +7852,81 @@ ..\Sprites\Big Pokemon Sprites\b_136.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_137.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Sprites\Big Pokemon Sprites\b_138.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Sprites\Big Pokemon Sprites\b_139.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Sprites\Big Pokemon Sprites\b_14.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Sprites\Big Pokemon Sprites\b_140.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Sprites\Big Pokemon Sprites\b_141.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Sprites\Big Pokemon Sprites\b_142-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Sprites\Big Pokemon Sprites\b_142.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_143.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_144.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Sprites\Big Pokemon Sprites\b_145.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Sprites\Big Pokemon Sprites\b_146.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Sprites\Big Pokemon Sprites\b_147.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Sprites\Big Pokemon Sprites\b_148.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Sprites\Big Pokemon Sprites\b_149.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Sprites\Big Pokemon Sprites\b_15-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Sprites\Big Pokemon Sprites\b_15.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Sprites\Big Pokemon Sprites\b_150-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Sprites\Big Pokemon Sprites\b_150-2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_150.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Sprites\Big Pokemon Sprites\b_151.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_163.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Sprites\Big Pokemon Sprites\b_164.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_17.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_170.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -7810,12 +7951,24 @@ ..\Sprites\Big Pokemon Sprites\b_178.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_18-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Sprites\Big Pokemon Sprites\b_18.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_182.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Sprites\Big Pokemon Sprites\b_185.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_19-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Sprites\Big Pokemon Sprites\b_19.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_194.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -7831,12 +7984,21 @@ ..\Sprites\Big Pokemon Sprites\b_2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_20-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Sprites\Big Pokemon Sprites\b_20.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_202.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Sprites\Big Pokemon Sprites\b_208.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_21.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_211.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -7846,6 +8008,9 @@ ..\Sprites\Big Pokemon Sprites\b_215.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_22.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_220.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -7870,12 +8035,18 @@ ..\Sprites\Big Pokemon Sprites\b_226.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_23.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_236.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Sprites\Big Pokemon Sprites\b_237.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_246.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -7912,6 +8083,9 @@ ..\Sprites\Big Pokemon Sprites\b_25-7.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_25-8p.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_26.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -7930,6 +8104,12 @@ ..\Sprites\Big Pokemon Sprites\b_26-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_27-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Sprites\Big Pokemon Sprites\b_27.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_270.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -7954,6 +8134,12 @@ ..\Sprites\Big Pokemon Sprites\b_279.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_28-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Sprites\Big Pokemon Sprites\b_28.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_280.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -7963,6 +8149,9 @@ ..\Sprites\Big Pokemon Sprites\b_282.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_29.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_290.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -7972,9 +8161,15 @@ ..\Sprites\Big Pokemon Sprites\b_292.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_3-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_30.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_302.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -7984,12 +8179,18 @@ ..\Sprites\Big Pokemon Sprites\b_309.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_31.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_310.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Sprites\Big Pokemon Sprites\b_315.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_320.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -8005,6 +8206,9 @@ ..\Sprites\Big Pokemon Sprites\b_329.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_33.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_330.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -8017,6 +8221,9 @@ ..\Sprites\Big Pokemon Sprites\b_339.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_34.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_340.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -8074,21 +8281,33 @@ ..\Sprites\Big Pokemon Sprites\b_38-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_39.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_4.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_40.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_406.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Sprites\Big Pokemon Sprites\b_407.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_41.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_415.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Sprites\Big Pokemon Sprites\b_416.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_42.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_420.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -8179,6 +8398,9 @@ ..\Sprites\Big Pokemon Sprites\b_459.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_46.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_460.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -8191,6 +8413,9 @@ ..\Sprites\Big Pokemon Sprites\b_468.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_47.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_470.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -8227,6 +8452,12 @@ ..\Sprites\Big Pokemon Sprites\b_479-5.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Sprites\Big Pokemon Sprites\b_49.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_5.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -8326,12 +8557,18 @@ ..\Sprites\Big Pokemon Sprites\b_53-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_54.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_546.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Sprites\Big Pokemon Sprites\b_547.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_55.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_550.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -8368,6 +8605,9 @@ ..\Sprites\Big Pokemon Sprites\b_559.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_56.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_560.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -8389,6 +8629,9 @@ ..\Sprites\Big Pokemon Sprites\b_569.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_57.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_572.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -8461,9 +8704,18 @@ ..\Sprites\Big Pokemon Sprites\b_599.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_6-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Sprites\Big Pokemon Sprites\b_6-2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_6.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_60.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_600.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -8485,6 +8737,9 @@ ..\Sprites\Big Pokemon Sprites\b_609.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_61.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_610.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -8512,6 +8767,9 @@ ..\Sprites\Big Pokemon Sprites\b_618-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_62.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_622.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -8533,6 +8791,9 @@ ..\Sprites\Big Pokemon Sprites\b_629.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_63.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_630.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -8557,6 +8818,9 @@ ..\Sprites\Big Pokemon Sprites\b_639.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_640.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -8581,6 +8845,12 @@ ..\Sprites\Big Pokemon Sprites\b_647-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_65-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Sprites\Big Pokemon Sprites\b_65.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_659.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -8647,6 +8917,9 @@ ..\Sprites\Big Pokemon Sprites\b_689.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_69.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_694.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -8656,6 +8929,9 @@ ..\Sprites\Big Pokemon Sprites\b_7.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_70.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_700.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -8677,6 +8953,9 @@ ..\Sprites\Big Pokemon Sprites\b_709.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_71.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_710.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -8713,6 +8992,9 @@ ..\Sprites\Big Pokemon Sprites\b_715.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_72.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_722.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -8737,6 +9019,9 @@ ..\Sprites\Big Pokemon Sprites\b_729.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_73.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_730.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -8749,6 +9034,12 @@ ..\Sprites\Big Pokemon Sprites\b_738.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_74-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Sprites\Big Pokemon Sprites\b_74.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_742.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -8770,6 +9061,12 @@ ..\Sprites\Big Pokemon Sprites\b_749.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_75-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Sprites\Big Pokemon Sprites\b_75.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_750.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -8794,6 +9091,12 @@ ..\Sprites\Big Pokemon Sprites\b_759.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_76-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Sprites\Big Pokemon Sprites\b_76.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_760.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -8920,6 +9223,9 @@ ..\Sprites\Big Pokemon Sprites\b_78-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_79.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_790.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -8932,6 +9238,12 @@ ..\Sprites\Big Pokemon Sprites\b_8.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_80-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Sprites\Big Pokemon Sprites\b_80.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_800.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -8953,6 +9265,9 @@ ..\Sprites\Big Pokemon Sprites\b_809.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_81.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_810.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -8983,6 +9298,9 @@ ..\Sprites\Big Pokemon Sprites\b_819.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_82.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_820.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -9049,6 +9367,9 @@ ..\Sprites\Big Pokemon Sprites\b_83-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_84.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_840.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -9088,6 +9409,9 @@ ..\Sprites\Big Pokemon Sprites\b_849-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_85.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_850.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -9124,6 +9448,9 @@ ..\Sprites\Big Pokemon Sprites\b_859.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_86.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_860.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -9178,6 +9505,9 @@ ..\Sprites\Big Pokemon Sprites\b_869-8.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_87.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_870.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -9217,6 +9547,12 @@ ..\Sprites\Big Pokemon Sprites\b_879.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_88-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Sprites\Big Pokemon Sprites\b_88.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_880.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -9253,9 +9589,21 @@ ..\Sprites\Big Pokemon Sprites\b_889-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_89-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Sprites\Big Pokemon Sprites\b_89.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_890.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_890-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Sprites\Big Pokemon Sprites\b_9-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_9.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -9271,12 +9619,21 @@ ..\Sprites\Big Pokemon Sprites\b_93.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_94-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_94.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Sprites\Big Pokemon Sprites\b_95.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Sprites\Big Pokemon Sprites\b_96.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Sprites\Big Pokemon Sprites\b_97.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Sprites\Big Pokemon Sprites\b_98.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_100.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_100.png new file mode 100644 index 00000000..aeb1c07a Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_100.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_101.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_101.png new file mode 100644 index 00000000..9650fb6f Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_101.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_102.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_102.png new file mode 100644 index 00000000..663f535a Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_102.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_103-1.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_103-1.png new file mode 100644 index 00000000..47547e2e Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_103-1.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_103.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_103.png new file mode 100644 index 00000000..5f787b9f Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_103.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_104.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_104.png new file mode 100644 index 00000000..78a5e9f3 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_104.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_105-1.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_105-1.png new file mode 100644 index 00000000..fdef1db6 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_105-1.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_105.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_105.png new file mode 100644 index 00000000..41cd9836 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_105.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_108.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_108.png new file mode 100644 index 00000000..118de8e2 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_108.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_113.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_113.png new file mode 100644 index 00000000..f99e931d Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_113.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_114.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_114.png new file mode 100644 index 00000000..81d6349c Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_114.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_115-1.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_115-1.png new file mode 100644 index 00000000..a24345e1 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_115-1.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_115.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_115.png new file mode 100644 index 00000000..3fd86397 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_115.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_116.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_116.png new file mode 100644 index 00000000..89c21267 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_116.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_117.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_117.png new file mode 100644 index 00000000..efa9ab0d Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_117.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_120.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_120.png new file mode 100644 index 00000000..8f210ff9 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_120.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_121.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_121.png new file mode 100644 index 00000000..9cdf131d Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_121.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_123.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_123.png new file mode 100644 index 00000000..43dab717 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_123.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_124.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_124.png new file mode 100644 index 00000000..8eaec9c8 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_124.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_125.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_125.png new file mode 100644 index 00000000..56abc5ca Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_125.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_126.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_126.png new file mode 100644 index 00000000..09608033 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_126.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_127-1.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_127-1.png new file mode 100644 index 00000000..0f5fe6a9 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_127-1.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_127.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_127.png new file mode 100644 index 00000000..e24d50f3 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_127.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_128.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_128.png new file mode 100644 index 00000000..67d4000c Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_128.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_13.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_13.png new file mode 100644 index 00000000..b8c126b6 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_13.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_130-1.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_130-1.png new file mode 100644 index 00000000..075a700b Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_130-1.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_133-1p.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_133-1p.png new file mode 100644 index 00000000..af55f76a Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_133-1p.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_137.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_137.png new file mode 100644 index 00000000..f213509c Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_137.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_138.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_138.png new file mode 100644 index 00000000..21b22e16 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_138.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_139.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_139.png new file mode 100644 index 00000000..7491c369 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_139.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_14.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_14.png new file mode 100644 index 00000000..4e17d2da Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_14.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_140.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_140.png new file mode 100644 index 00000000..7f55f4f4 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_140.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_141.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_141.png new file mode 100644 index 00000000..de6fb964 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_141.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_142-1.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_142-1.png new file mode 100644 index 00000000..a9c933ee Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_142-1.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_142.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_142.png new file mode 100644 index 00000000..6ec69202 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_142.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_144.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_144.png new file mode 100644 index 00000000..68e9eff1 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_144.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_145.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_145.png new file mode 100644 index 00000000..8350a7b3 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_145.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_146.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_146.png new file mode 100644 index 00000000..33b36dd5 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_146.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_147.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_147.png new file mode 100644 index 00000000..9c6f7991 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_147.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_148.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_148.png new file mode 100644 index 00000000..b099f8f9 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_148.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_149.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_149.png new file mode 100644 index 00000000..966b4e21 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_149.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_15-1.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_15-1.png new file mode 100644 index 00000000..7a88f0f4 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_15-1.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_15.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_15.png new file mode 100644 index 00000000..68d97272 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_15.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_150-1.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_150-1.png new file mode 100644 index 00000000..6035ee89 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_150-1.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_150-2.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_150-2.png new file mode 100644 index 00000000..6035ee89 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_150-2.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_16.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_16.png new file mode 100644 index 00000000..39e40f00 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_16.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_17.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_17.png new file mode 100644 index 00000000..fd59eaa4 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_17.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_18-1.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_18-1.png new file mode 100644 index 00000000..c9acee3c Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_18-1.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_18.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_18.png new file mode 100644 index 00000000..4a064fa1 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_18.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_19-1.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_19-1.png new file mode 100644 index 00000000..b78b730e Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_19-1.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_19.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_19.png new file mode 100644 index 00000000..4f548b70 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_19.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_20-1.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_20-1.png new file mode 100644 index 00000000..84b1b71a Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_20-1.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_20.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_20.png new file mode 100644 index 00000000..72cd14ac Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_20.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_21.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_21.png new file mode 100644 index 00000000..2c3eb4f0 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_21.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_22.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_22.png new file mode 100644 index 00000000..69ab6843 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_22.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_23.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_23.png new file mode 100644 index 00000000..44d38456 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_23.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_24.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_24.png new file mode 100644 index 00000000..3a698f42 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_24.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_25-8p.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_25-8p.png new file mode 100644 index 00000000..bf9b2eae Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_25-8p.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_27-1.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_27-1.png new file mode 100644 index 00000000..c8696843 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_27-1.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_27.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_27.png new file mode 100644 index 00000000..1781c2e3 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_27.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_28-1.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_28-1.png new file mode 100644 index 00000000..45d8abf8 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_28-1.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_28.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_28.png new file mode 100644 index 00000000..b155469c Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_28.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_29.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_29.png new file mode 100644 index 00000000..893c4a18 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_29.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_3-1.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_3-1.png new file mode 100644 index 00000000..699fe562 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_3-1.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_30.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_30.png new file mode 100644 index 00000000..aabe52b0 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_30.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_31.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_31.png new file mode 100644 index 00000000..68b3e93f Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_31.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_32.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_32.png new file mode 100644 index 00000000..13526be9 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_32.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_33.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_33.png new file mode 100644 index 00000000..7bc952e5 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_33.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_34.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_34.png new file mode 100644 index 00000000..37dc995c Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_34.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_39.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_39.png new file mode 100644 index 00000000..47d139a5 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_39.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_40.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_40.png new file mode 100644 index 00000000..51f033a6 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_40.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_41.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_41.png new file mode 100644 index 00000000..9a68cfa4 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_41.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_42.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_42.png new file mode 100644 index 00000000..06e3452a Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_42.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_46.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_46.png new file mode 100644 index 00000000..29f28e21 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_46.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_47.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_47.png new file mode 100644 index 00000000..3c80f580 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_47.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_48.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_48.png new file mode 100644 index 00000000..4d82e31f Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_48.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_49.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_49.png new file mode 100644 index 00000000..f22c9330 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_49.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_54.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_54.png new file mode 100644 index 00000000..6e2a2403 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_54.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_55.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_55.png new file mode 100644 index 00000000..6afedbf9 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_55.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_56.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_56.png new file mode 100644 index 00000000..8c2a9021 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_56.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_57.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_57.png new file mode 100644 index 00000000..18cb4338 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_57.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_6-1.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_6-1.png new file mode 100644 index 00000000..cdc5018f Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_6-1.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_6-2.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_6-2.png new file mode 100644 index 00000000..cdc5018f Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_6-2.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_60.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_60.png new file mode 100644 index 00000000..4bd6d223 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_60.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_61.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_61.png new file mode 100644 index 00000000..dc01ce46 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_61.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_62.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_62.png new file mode 100644 index 00000000..50d30164 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_62.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_63.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_63.png new file mode 100644 index 00000000..ea24e414 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_63.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_64.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_64.png new file mode 100644 index 00000000..4684d255 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_64.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_65-1.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_65-1.png new file mode 100644 index 00000000..d434d126 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_65-1.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_65.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_65.png new file mode 100644 index 00000000..5f2c84cc Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_65.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_69.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_69.png new file mode 100644 index 00000000..06b7e798 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_69.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_70.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_70.png new file mode 100644 index 00000000..f0393f87 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_70.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_71.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_71.png new file mode 100644 index 00000000..abcb6c1d Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_71.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_72.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_72.png new file mode 100644 index 00000000..8daf7cc9 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_72.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_73.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_73.png new file mode 100644 index 00000000..c62edf77 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_73.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_74-1.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_74-1.png new file mode 100644 index 00000000..2d3f66fb Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_74-1.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_74.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_74.png new file mode 100644 index 00000000..de6added Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_74.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_75-1.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_75-1.png new file mode 100644 index 00000000..1e8ce224 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_75-1.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_75.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_75.png new file mode 100644 index 00000000..628d25a0 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_75.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_76-1.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_76-1.png new file mode 100644 index 00000000..6d9da8e6 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_76-1.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_76.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_76.png new file mode 100644 index 00000000..063c1eeb Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_76.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_79.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_79.png new file mode 100644 index 00000000..accfed27 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_79.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_80-1.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_80-1.png new file mode 100644 index 00000000..6ee63db4 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_80-1.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_80.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_80.png new file mode 100644 index 00000000..1429627c Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_80.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_81.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_81.png new file mode 100644 index 00000000..3ade6c6d Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_81.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_82.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_82.png new file mode 100644 index 00000000..197bf574 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_82.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_84.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_84.png new file mode 100644 index 00000000..91aa47c1 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_84.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_85.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_85.png new file mode 100644 index 00000000..96db883e Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_85.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_86.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_86.png new file mode 100644 index 00000000..2503efd4 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_86.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_87.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_87.png new file mode 100644 index 00000000..4d11c0c8 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_87.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_88-1.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_88-1.png new file mode 100644 index 00000000..61860db0 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_88-1.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_88.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_88.png new file mode 100644 index 00000000..8a0233c8 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_88.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_89-1.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_89-1.png new file mode 100644 index 00000000..77f38ca0 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_89-1.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_89.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_89.png new file mode 100644 index 00000000..4935c261 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_89.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_890-1.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_890-1.png new file mode 100644 index 00000000..833ffa4b Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_890-1.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_9-1.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_9-1.png new file mode 100644 index 00000000..9aab6153 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_9-1.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_94-1.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_94-1.png new file mode 100644 index 00000000..301a344b Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_94-1.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_96.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_96.png new file mode 100644 index 00000000..d91a5a3c Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_96.png differ diff --git a/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_97.png b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_97.png new file mode 100644 index 00000000..d3f27dd2 Binary files /dev/null and b/pkNX.Sprites/Sprites/Big Pokemon Sprites/b_97.png differ diff --git a/pkNX.Structures/Evolution/EvolutionType.cs b/pkNX.Structures/Evolution/EvolutionType.cs index e286d179..aa6bedb0 100644 --- a/pkNX.Structures/Evolution/EvolutionType.cs +++ b/pkNX.Structures/Evolution/EvolutionType.cs @@ -45,12 +45,11 @@ public enum EvolutionType : byte LevelUpDusk, LevelUpWormhole, UseItemWormhole, - - U43, // Farfetch'd (1) with val 3? -> Sirfetch'd - U44, // Yamask (1) -> Runerigus (val 49) - U45, // Milcery->Alcremie (Console Region==Form?) - U46, // Toxel->Toxtricity (0) - U47, // Toxel->Toxtricity (1) + CriticalHitsInBattle, + HitPointsLostInBattle, + Spin, + LevelUpNatureAmped, + LevelUpNatureLowKey, } public enum EvolutionTypeArgumentType diff --git a/pkNX.Structures/Evolution/Extensions.cs b/pkNX.Structures/Evolution/Extensions.cs index 86d43f70..beb6d770 100644 --- a/pkNX.Structures/Evolution/Extensions.cs +++ b/pkNX.Structures/Evolution/Extensions.cs @@ -56,11 +56,11 @@ public static partial class Extensions [LevelUpWormhole] = Level, [UseItemWormhole] = Items, - [U43] = Version, // Farfetch'd (1) with val 3? -> Sirfetch'd - [U44] = Version, // Yamask (1) -> Runerigus (val 49) - [U45] = Version, // Milcery->Alcremie (Console Region==Form?) - [U46] = Version, // Toxel->Toxtricity (0) - [U47] = Version, // Toxel->Toxtricity (1) + [CriticalHitsInBattle] = Version, + [HitPointsLostInBattle] = Version, + [Spin] = NoArg, + [LevelUpNatureAmped] = NoArg, + [LevelUpNatureLowKey] = NoArg, }; public static EvolutionTypeArgumentType GetArgType(this EvolutionType t) => ArgType[t]; diff --git a/pkNX.Structures/Legality/Legal.cs b/pkNX.Structures/Legality/Legal.cs index e2addfd0..44515858 100644 --- a/pkNX.Structures/Legality/Legal.cs +++ b/pkNX.Structures/Legality/Legal.cs @@ -6,7 +6,7 @@ namespace pkNX.Structures { public static partial class Legal { - public static int GetRandomForme(int species, bool mega, bool alola, PersonalTable stats) + public static int GetRandomForme(int species, bool mega, bool alola, bool galar, PersonalTable stats) { if (stats == null) return 0; @@ -19,11 +19,20 @@ public static int GetRandomForme(int species, bool mega, bool alola, PersonalTab return 30; // save file specific if (species == 774) // minior return Util.Rand.Next(7); + if (species == 890) // Eternatus + return 0; + + if (galar && species == 052) // Galarian Meowth is altform 2 + return Util.Rand.Next(3); + if (galar && species == 555) // Galarian Darmanitan is altform 2, Galarian Zen is altform 3 + return Util.Rand.Next(4); if (stats.TableLength == 980 && (species == 25 || species == 133)) // gg tableB -- no starters, they crash trainer battles. return 0; // Pikachu if (EvolveToAlolanForms.Contains(species)) return alola ? Util.Rand.Next(2) : 0; + if (EvolveToGalarForms.Contains(species)) + return galar ? Util.Rand.Next(2) : 0; if (!BattleExclusiveForms.Contains(species) || mega) return Util.Rand.Next(stats[species].FormeCount); // Slot-Random return 0; @@ -47,15 +56,18 @@ public static int GetModifiedLevel(int level, double factor) public static int[] GetRandomItemList(GameVersion game) { - if (GameVersion.ORAS.Contains(game) || game == GameVersion.ORASDEMO) - return Items_HeldAO.Concat(Items_Ball).Where(i => i != 0).ToArray(); - if (GameVersion.XY.Contains(game)) return Items_HeldXY.Concat(Items_Ball).Where(i => i != 0).ToArray(); + if (GameVersion.ORAS.Contains(game) || game == GameVersion.ORASDEMO) + return Items_HeldAO.Concat(Items_Ball).Where(i => i != 0).ToArray(); + if (GameVersion.SM.Contains(game) || GameVersion.USUM.Contains(game)) return HeldItemsBuy_SM.Select(i => (int)i).Concat(Items_Ball).Where(i => i != 0).ToArray(); + if (GameVersion.SWSH.Contains(game)) + return HeldItems_SWSH.Select(i => (int)i).Concat(Items_Ball).Where(i => i != 0).ToArray(); + return new int[1]; } diff --git a/pkNX.Structures/Legality/Tables8.cs b/pkNX.Structures/Legality/Tables8.cs index b4d2f71c..68bde523 100644 --- a/pkNX.Structures/Legality/Tables8.cs +++ b/pkNX.Structures/Legality/Tables8.cs @@ -13,65 +13,210 @@ public static partial class Legal public const int MaxGameID_8 = 45; #region Met Locations - internal static readonly int[] Met_SWSH_0 = { + 002, 004, 006, 008, + 012, 014, 016, 018, + 020, 022, 024, 028, + 030, 032, 034, 036, + 040, 044, 046, 048, + 052, 054, 056, 058, + 060, 064, 066, 068, + 070, 072, 076, 078, + 080, 084, 086, 088, + 090, 092, 094, 096, 098, + 102, 104, 106, 108, + 110, 112, 114, 116, 118, + 120, 122, 124, 126, 128, + 130, 132, 134, 136, 138, + 140, 142, 144, 146, 148, + 150, 152, 154, 156, 158, + 160, 162, }; internal static readonly int[] Met_SWSH_3 = { + 30001, 30003, 30004, 30005, 30006, 30007, 30008, 30009, 30010, 30011, 30012, 30013, 30014, 30015, 30016, 30017, 30018 }; internal static readonly int[] Met_SWSH_4 = { + 40001, 40002, 40003, 40005, 40006, 40007, 40008, 40009, 40010, + 40011, 40012, 40013, 40014, 40016, 40017, 40018, 40019, 40020, + 40021, 40022, 40024, 40025, 40026, 40027, 40028, 40029, 40030, + 40032, 40033, 40034, 40035, 40036, 40037, 40038, 40039, 40040, + 40041, 40042, 40043, 40044, 40045, 40047, 40048, 40049, 40050, + 40051, 40052, 40053, 40055, 40056, 40057, 40058, 40059, 40060, + 40061, 40063, 40064, 40065, 40066, 40067, 40068, 40069, 40070, + 40071, 40072, 40074, 40075, 40076, 40077, 40078, 40079, 40080, + 40081, 40082, 40083, 40084, 40085, 40086, }; - internal static readonly int[] Met_SWSH_6 = - { - }; - - public const int StandardHatchLocation8 = 50; // todo + internal static readonly int[] Met_SWSH_6 = {/* XY */ 60001, 60003, /* ORAS */ 60004, }; #endregion - internal static readonly ushort[] Pouch_Regular_SWSH = // 00 + internal static readonly ushort[] Pouch_Regular_SWSH = { + 045, 046, 047, 048, 049, 050, 051, 052, 053, 076, 077, 079, 080, 081, 082, 083, 084, 085, 107, 108, 109, + 116, 117, 118, 119, 213, 214, 215, 217, 218, 219, 220, 221, 222, 223, 224, 228, 229, 230, 231, 232, 233, + 234, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 253, 254, 255, 257, + 259, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, + 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, + 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 325, 326, 537, 538, 539, + 540, 541, 542, 543, 544, 545, 546, 547, 564, 565, 566, 567, 568, 569, 570, 639, 640, 644, 645, 646, 647, + 648, 649, 650, 846, 849, 879, 880, 881, 882, 883, 884, 904, 905, 906, 907, 908, 909, 910, 911, 912, 913, + 914, 915, 916, 917, 918, 919, 920, 1103, 1104, 1109, 1110, 1111, 1112, 1113, 1114, 1115, 1116, 1117, 1118, + 1119, 1120, 1121, 1122, 1123, 1124, 1125, 1126, 1127, 1128, 1129, 1231, 1232, 1233, 1234, 1235, 1236, 1237, + 1238, 1239, 1240, 1241, 1242, 1243, 1244, 1245, 1246, 1247, 1248, 1249, 1250, 1251, 1252, 1253, 1254, }; - internal static readonly ushort[] Pouch_Ball_SWSH = { // 08 + internal static readonly ushort[] Pouch_Ball_SWSH = + { + 001, 002, 003, 004, 005, 006, 007, 008, 009, 010, 011, 012, 013, 014, 015, 016, + 492, 493, 494, 495, 496, 497, 498, 499, 500, + 576, + 851, }; - internal static readonly ushort[] Pouch_Battle_SWSH = { // 16 + internal static readonly ushort[] Pouch_Battle_SWSH = + { + 055, 056, 057, 058, 059, 060, 061, 062, 063, }; internal static readonly ushort[] Pouch_Items_SWSH = Pouch_Regular_SWSH.Concat(Pouch_Ball_SWSH).Concat(Pouch_Battle_SWSH).ToArray(); - internal static readonly ushort[] Pouch_Key_SWSH = { + internal static readonly ushort[] Pouch_Key_SWSH = + { + 078, + 628, 629, 631, 632, + 703, + 943, 944, 945, 946, + 1074, 1075, 1076, 1077, 1080, 1081, 1100, + 1255, 1266, 1267, 1269, 1270, 1271, 1278, }; - internal static readonly ushort[] Pouch_TMHM_SWSH = { // 02 + internal static readonly ushort[] TM_SWSH = + { + 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, + 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, + 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, + 358, 359, 360, 361, 362, 363, 364, 365, 366, 367, + 368, 369, 370, 371, 372, 373, 374, 375, 376, 377, + 378, 379, 380, 381, 382, 383, 384, 385, 386, 387, + 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, + 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, + 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, + 418, 419, 618, 619, 620, 690, 691, 692, 693, // TM99 + 1230, // TM00 }; - internal static readonly ushort[] Pouch_Medicine_SWSH = { // 32 + internal static readonly ushort[] TR_SWSH = + { + 1130, 1131, 1132, 1133, 1134, 1135, 1136, 1137, 1138, 1139, + 1140, 1141, 1142, 1143, 1144, 1145, 1146, 1147, 1148, 1149, + 1150, 1151, 1152, 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, 1224, 1225, 1226, 1227, 1228, 1229, }; - internal static readonly ushort[] Pouch_Berries_SWSH = { + internal static readonly ushort[] Pouch_TMHM_SWSH = TM_SWSH.Concat(TR_SWSH).ToArray(); + + internal static readonly ushort[] Pouch_Medicine_SWSH = + { + 017, 018, 019, 020, 021, 022, 023, 024, 025, 026, + 027, 028, 029, 030, 031, 032, 033, 034, 035, 036, + 037, 038, 039, 040, 041, 042, 043, 054, + 134, + 504, 591, + 708, 709, + 852, 903, }; - internal static readonly ushort[] HeldItems_SWSH = new ushort[1].Concat(Pouch_Items_SWSH).Concat(Pouch_Berries_SWSH).Concat(Pouch_Medicine_SWSH).ToArray(); + internal static readonly ushort[] Pouch_Berries_SWSH = + { + 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, + 159, 160, 161, 162, 163, 169, 170, 171, 172, 173, + 174, 184, 185, 186, 187, 188, 189, 190, 191, 192, + 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, + 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, + 686, 687, 688, + }; + + internal static readonly ushort[] Pouch_Ingredients_SWSH = + { + 1084, 1085, 1086, 1087, 1088, 1089, 1090, 1091, 1092, 1093, + 1094, 1095, 1096, 1097, 1098, 1099, 1256, 1257, 1258, 1259, + 1260, 1261, 1262, 1263, 1264, + }; + + internal static readonly ushort[] Pouch_Treasure_SWSH = + { + 086, 087, 088, 089, 090, 091, 092, 094, 106, + 571, 580, 581, 582, 583, + 795, 796, + 1105, 1106, 1107, 1108, + }; + + internal static readonly ushort[] HeldItems_SWSH = new ushort[1].Concat(Pouch_Items_SWSH).Concat(Pouch_Berries_SWSH).Concat(Pouch_Medicine_SWSH).Concat(Pouch_Ingredients_SWSH).Concat(Pouch_Treasure_SWSH).ToArray(); internal static readonly HashSet GalarOriginForms = new HashSet { + 052, // Meowth + 077, // Ponyta + 078, // Rapidash + 083, // Farfetch’d + 122, // Mr. Mime + 222, // Corsola + 263, // Zigzagoon + 264, // Linoone + 554, // Darumaka + 555, // Darmanitan + 562, // Yamask + 618, // Stunfisk }; internal static readonly HashSet GalarVariantFormEvolutions = new HashSet { + 110, // Weezing }; - internal static readonly HashSet EvolveToGalarForms = new HashSet(GalarVariantFormEvolutions.Concat(GalarOriginForms)); + internal static readonly HashSet GalarForm0Evolutions = new HashSet + { + 862, // Obstagoon + 863, // Perrserker + 864, // Cursola + 865, // Sirfetch’d + 866, // Mr. Rime + 867, // Runerigus + }; + + public static readonly HashSet EvolveToGalarForms = new HashSet(GalarVariantFormEvolutions.Concat(GalarOriginForms)); internal static readonly HashSet ValidMet_SWSH = new HashSet { + 006, 008, + 012, 014, 016, 018, + 020, 022, 024, 028, + 030, 032, 034, 036, + 040, 044, 046, 048, + 052, 054, 056, 058, + 060, 064, 066, 068, + 070, 072, 076, 078, + 080, 084, 086, 088, + 090, 092, 094, 096, 098, + 102, 104, 106, 108, + 110, 112, 114, 116, 118, + 120, 122, 124, 126, 128, + 130, 132, 134, 136, 138, + 140, 142, 144, 146, 148, + 150, 152, 154, 156, 158, + 160, 162, }; public static readonly int[] TMHM_SWSH = @@ -103,19 +248,366 @@ public static partial class Legal internal static readonly byte[] MovePP_SWSH = { - }; - - internal static readonly HashSet Ban_NoHidden8 = new HashSet - { - }; - - internal static readonly HashSet TransferrableGalar = new HashSet() - { + 00, + 35, 25, 10, 15, 20, 20, 15, 15, 15, 35, 30, 05, 10, 20, 30, 35, 35, 20, 15, 20, 20, 25, 20, 30, 05, 10, 15, 15, 15, 25, 20, 05, 35, 15, 20, 20, 10, 15, 30, 35, 20, 20, 30, 25, 40, 20, 15, 20, 20, 20, + 30, 25, 15, 30, 25, 05, 15, 10, 05, 20, 20, 20, 05, 35, 20, 20, 20, 20, 20, 15, 25, 15, 10, 20, 25, 10, 35, 30, 15, 10, 40, 10, 15, 30, 15, 20, 10, 15, 10, 05, 10, 10, 25, 10, 20, 40, 30, 30, 20, 20, + 15, 10, 40, 15, 10, 30, 10, 20, 10, 40, 40, 20, 30, 30, 20, 30, 10, 10, 20, 05, 10, 30, 20, 20, 20, 05, 15, 15, 20, 10, 15, 35, 20, 15, 10, 10, 30, 15, 40, 20, 10, 10, 05, 10, 30, 10, 15, 20, 15, 40, + 20, 10, 05, 15, 10, 10, 10, 15, 30, 30, 10, 10, 20, 10, 01, 01, 10, 25, 10, 05, 15, 25, 15, 10, 15, 30, 05, 40, 15, 10, 25, 10, 30, 10, 20, 10, 10, 10, 10, 10, 20, 05, 40, 05, 05, 15, 05, 10, 05, 10, + 10, 10, 10, 20, 20, 40, 15, 10, 20, 20, 25, 05, 15, 10, 05, 20, 15, 20, 25, 20, 05, 30, 05, 10, 20, 40, 05, 20, 40, 20, 15, 35, 10, 05, 05, 05, 15, 05, 20, 05, 05, 15, 20, 10, 05, 05, 15, 10, 15, 15, + 10, 10, 10, 20, 10, 10, 10, 10, 15, 15, 15, 10, 20, 20, 10, 20, 20, 20, 20, 20, 10, 10, 10, 20, 20, 05, 15, 10, 10, 15, 10, 20, 05, 05, 10, 10, 20, 05, 10, 20, 10, 20, 20, 20, 05, 05, 15, 20, 10, 15, + 20, 15, 10, 10, 15, 10, 05, 05, 10, 15, 10, 05, 20, 25, 05, 40, 15, 05, 40, 15, 20, 20, 05, 15, 20, 20, 15, 15, 05, 10, 30, 20, 30, 15, 05, 40, 15, 05, 20, 05, 15, 25, 25, 15, 20, 15, 20, 15, 20, 10, + 20, 20, 05, 05, 10, 05, 40, 10, 10, 05, 10, 10, 15, 10, 20, 15, 30, 10, 20, 05, 10, 10, 15, 10, 10, 05, 15, 05, 10, 10, 30, 20, 20, 10, 10, 05, 05, 10, 05, 20, 10, 20, 10, 15, 10, 20, 20, 20, 15, 15, + 10, 15, 15, 15, 10, 10, 10, 20, 10, 30, 05, 10, 15, 10, 10, 05, 20, 30, 10, 30, 15, 15, 15, 15, 30, 10, 20, 15, 10, 10, 20, 15, 05, 05, 15, 15, 05, 10, 05, 20, 05, 15, 20, 05, 20, 20, 20, 20, 10, 20, + 10, 15, 20, 15, 10, 10, 05, 10, 05, 05, 10, 05, 05, 10, 05, 05, 05, 15, 10, 10, 10, 10, 10, 10, 15, 20, 15, 10, 15, 10, 15, 10, 20, 10, 10, 10, 20, 20, 20, 20, 20, 15, 15, 15, 15, 15, 15, 20, 15, 10, + 15, 15, 15, 15, 10, 10, 10, 10, 10, 15, 15, 15, 15, 05, 05, 15, 05, 10, 10, 10, 20, 20, 20, 10, 10, 30, 15, 15, 10, 15, 25, 10, 15, 10, 10, 10, 20, 10, 10, 10, 10, 10, 15, 15, 05, 05, 10, 10, 10, 05, + 05, 10, 05, 05, 15, 10, 05, 05, 05, 10, 10, 10, 10, 20, 25, 10, 20, 30, 25, 20, 20, 15, 20, 15, 20, 20, 10, 10, 10, 10, 10, 20, 10, 30, 15, 10, 10, 10, 20, 20, 05, 05, 05, 20, 10, 10, 20, 15, 20, 20, + 10, 20, 30, 10, 10, 40, 40, 30, 20, 40, 20, 20, 10, 10, 10, 10, 05, 10, 10, 05, 05, 01, 01, 01, 01, 01, 01, 01, 01, 01, 01, 01, 01, 01, 01, 01, 01, 01, 01, 01, 01, 01, 01, 01, 01, 01, 01, 01, 01, 01, + 01, 01, 01, 01, 01, 01, 01, 01, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 40, 15, 20, 30, 20, 15, 15, 20, 10, 15, 15, 10, 05, 10, 10, 20, 15, 10, 15, 15, 15, 05, 15, 20, 20, 01, 01, 01, 01, 01, 01, + 01, 01, 01, 05, 05, 10, 10, 10, 20, 10, 10, 10, 05, 05, 20, 10, 10, 10, 01, 05, 15, 05, 01, 01, 01, 01, 01, 01, 10, 15, 15, 20, 20, 20, 20, 15, 15, 10, 10, 05, 20, 05, 10, 05, 15, 10, 10, 05, 15, 20, + 10, 10, 15, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 05, 10, 15, 10, 15, 05, 05, 05, 10, 15, 40, 10, 10, 10, 15, 10, 10, 10, 10, 05, 05, 05, }; #region Unreleased Items internal static readonly HashSet UnreleasedHeldItems_8 = new HashSet { + 116, // Douse Drive + 117, // Shock Drive + 118, // Burn Drive + 119, // Chill Drive + + 298, // Flame Plate + 299, // Splash Plate + 300, // Zap Plate + 301, // Meadow Plate + 302, // Icicle Plate + 303, // Fist Plate + 304, // Toxic Plate + 305, // Earth Plate + 306, // Sky Plate + 307, // Mind Plate + 308, // Insect Plate + 309, // Stone Plate + 310, // Spooky Plate + 311, // Draco Plate + 312, // Dread Plate + 313, // Iron Plate + // 644, // Pixie Plate + + 1114, // Star Sweet + 1115, // Ribbon Sweet + + // 1279, // ★And458 (Jangmo-o) + // 1280, // ★And15 (Larvitar) + 1281, // ★And337 + 1282, // ★And603 + 1283, // ★And390 + 1284, // ★Sgr6879 + 1285, // ★Sgr6859 + 1286, // ★Sgr6913 + 1287, // ★Sgr7348 + 1288, // ★Sgr7121 + 1289, // ★Sgr6746 + 1290, // ★Sgr7194 + 1291, // ★Sgr7337 + 1292, // ★Sgr7343 + 1293, // ★Sgr6812 + 1294, // ★Sgr7116 + 1295, // ★Sgr7264 + 1296, // ★Sgr7597 + 1297, // ★Del7882 + 1298, // ★Del7906 + 1299, // ★Del7852 + 1300, // ★Psc596 + 1301, // ★Psc361 + 1302, // ★Psc510 + 1303, // ★Psc437 + 1304, // ★Psc8773 + 1305, // ★Lep1865 + 1306, // ★Lep1829 + 1307, // ★Boo5340 + 1308, // ★Boo5506 + 1309, // ★Boo5435 + 1310, // ★Boo5602 + 1311, // ★Boo5733 + 1312, // ★Boo5235 + 1313, // ★Boo5351 + 1314, // ★Hya3748 + 1315, // ★Hya3903 + 1316, // ★Hya3418 + 1317, // ★Hya3482 + 1318, // ★Hya3845 + 1319, // ★Eri1084 + 1320, // ★Eri472 + 1321, // ★Eri1666 + 1322, // ★Eri897 + 1323, // ★Eri1231 + 1324, // ★Eri874 + 1325, // ★Eri1298 + 1326, // ★Eri1325 + 1327, // ★Eri984 + 1328, // ★Eri1464 + 1329, // ★Eri1393 + 1330, // ★Eri850 + 1331, // ★Tau1409 + 1332, // ★Tau1457 + 1333, // ★Tau1165 + 1334, // ★Tau1791 + 1335, // ★Tau1910 + 1336, // ★Tau1346 + 1337, // ★Tau1373 + 1338, // ★Tau1412 + 1339, // ★CMa2491 + 1340, // ★CMa2693 + 1341, // ★CMa2294 + 1342, // ★CMa2827 + 1343, // ★CMa2282 + 1344, // ★CMa2618 + 1345, // ★CMa2657 + 1346, // ★CMa2646 + 1347, // ★UMa4905 + 1348, // ★UMa4301 + 1349, // ★UMa5191 + 1350, // ★UMa5054 + 1351, // ★UMa4295 + 1352, // ★UMa4660 + 1353, // ★UMa4554 + 1354, // ★UMa4069 + 1355, // ★UMa3569 + 1356, // ★UMa3323 + 1357, // ★UMa4033 + 1358, // ★UMa4377 + 1359, // ★UMa4375 + 1360, // ★UMa4518 + 1361, // ★UMa3594 + 1362, // ★Vir5056 + 1363, // ★Vir4825 + 1364, // ★Vir4932 + 1365, // ★Vir4540 + 1366, // ★Vir4689 + 1367, // ★Vir5338 + 1368, // ★Vir4910 + 1369, // ★Vir5315 + 1370, // ★Vir5359 + 1371, // ★Vir5409 + 1372, // ★Vir5107 + 1373, // ★Ari617 + 1374, // ★Ari553 + 1375, // ★Ari546 + 1376, // ★Ari951 + 1377, // ★Ori1713 + 1378, // ★Ori2061 + 1379, // ★Ori1790 + 1380, // ★Ori1903 + 1381, // ★Ori1948 + 1382, // ★Ori2004 + 1383, // ★Ori1852 + 1384, // ★Ori1879 + 1385, // ★Ori1899 + 1386, // ★Ori1543 + 1387, // ★Cas21 + 1388, // ★Cas168 + 1389, // ★Cas403 + 1390, // ★Cas153 + 1391, // ★Cas542 + 1392, // ★Cas219 + 1393, // ★Cas265 + 1394, // ★Cnc3572 + 1395, // ★Cnc3208 + 1396, // ★Cnc3461 + 1397, // ★Cnc3449 + 1398, // ★Cnc3429 + 1399, // ★Cnc3627 + 1400, // ★Cnc3268 + 1401, // ★Cnc3249 + 1402, // ★Com4968 + 1403, // ★Crv4757 + 1404, // ★Crv4623 + 1405, // ★Crv4662 + 1406, // ★Crv4786 + 1407, // ★Aur1708 + 1408, // ★Aur2088 + 1409, // ★Aur1605 + 1410, // ★Aur2095 + 1411, // ★Aur1577 + 1412, // ★Aur1641 + 1413, // ★Aur1612 + 1414, // ★Pav7790 + 1415, // ★Cet911 + 1416, // ★Cet681 + 1417, // ★Cet188 + 1418, // ★Cet539 + 1419, // ★Cet804 + 1420, // ★Cep8974 + 1421, // ★Cep8162 + 1422, // ★Cep8238 + 1423, // ★Cep8417 + 1424, // ★Cen5267 + 1425, // ★Cen5288 + 1426, // ★Cen551 + 1427, // ★Cen5459 + 1428, // ★Cen5460 + 1429, // ★CMi2943 + 1430, // ★CMi2845 + 1431, // ★Equ8131 + 1432, // ★Vul7405 + 1433, // ★UMi424 + 1434, // ★UMi5563 + 1435, // ★UMi5735 + 1436, // ★UMi6789 + 1437, // ★Crt4287 + 1438, // ★Lyr7001 + 1439, // ★Lyr7178 + 1440, // ★Lyr7106 + 1441, // ★Lyr7298 + 1442, // ★Ara6585 + 1443, // ★Sco6134 + 1444, // ★Sco6527 + 1445, // ★Sco6553 + 1446, // ★Sco5953 + 1447, // ★Sco5984 + 1448, // ★Sco6508 + 1449, // ★Sco6084 + 1450, // ★Sco5944 + 1451, // ★Sco6630 + 1452, // ★Sco6027 + 1453, // ★Sco6247 + 1454, // ★Sco6252 + 1455, // ★Sco5928 + 1456, // ★Sco6241 + 1457, // ★Sco6165 + 1458, // ★Tri544 + 1459, // ★Leo3982 + 1460, // ★Leo4534 + 1461, // ★Leo4357 + 1462, // ★Leo4057 + 1463, // ★Leo4359 + 1464, // ★Leo4031 + 1465, // ★Leo3852 + 1466, // ★Leo3905 + 1467, // ★Leo3773 + 1468, // ★Gru8425 + 1469, // ★Gru8636 + 1470, // ★Gru8353 + 1471, // ★Lib5685 + 1472, // ★Lib5531 + 1473, // ★Lib5787 + 1474, // ★Lib5603 + 1475, // ★Pup3165 + 1476, // ★Pup3185 + 1477, // ★Pup3045 + 1478, // ★Cyg7924 + 1479, // ★Cyg7417 + 1480, // ★Cyg7796 + 1481, // ★Cyg8301 + 1482, // ★Cyg7949 + 1483, // ★Cyg7528 + 1484, // ★Oct7228 + 1485, // ★Col1956 + 1486, // ★Col2040 + 1487, // ★Col2177 + 1488, // ★Gem2990 + 1489, // ★Gem2891 + 1490, // ★Gem2421 + 1491, // ★Gem2473 + 1492, // ★Gem2216 + 1493, // ★Gem2777 + 1494, // ★Gem2650 + 1495, // ★Gem2286 + 1496, // ★Gem2484 + 1497, // ★Gem2930 + 1498, // ★Peg8775 + 1499, // ★Peg8781 + 1500, // ★Peg39 + 1501, // ★Peg8308 + 1502, // ★Peg8650 + 1503, // ★Peg8634 + 1504, // ★Peg8684 + 1505, // ★Peg8450 + 1506, // ★Peg8880 + 1507, // ★Peg8905 + 1508, // ★Oph6556 + 1509, // ★Oph6378 + 1510, // ★Oph6603 + 1511, // ★Oph6149 + 1512, // ★Oph6056 + 1513, // ★Oph6075 + 1514, // ★Ser5854 + 1515, // ★Ser7141 + 1516, // ★Ser5879 + 1517, // ★Her6406 + 1518, // ★Her6148 + 1519, // ★Her6410 + 1520, // ★Her6526 + 1521, // ★Her6117 + 1522, // ★Her6008 + 1523, // ★Per936 + 1524, // ★Per1017 + 1525, // ★Per1131 + 1526, // ★Per1228 + 1527, // ★Per834 + 1528, // ★Per941 + 1529, // ★Phe99 + 1530, // ★Phe338 + 1531, // ★Vel3634 + 1532, // ★Vel3485 + 1533, // ★Vel3734 + 1534, // ★Aqr8232 + 1535, // ★Aqr8414 + 1536, // ★Aqr8709 + 1537, // ★Aqr8518 + 1538, // ★Aqr7950 + 1539, // ★Aqr8499 + 1540, // ★Aqr8610 + 1541, // ★Aqr8264 + 1542, // ★Cru4853 + 1543, // ★Cru4730 + 1544, // ★Cru4763 + 1545, // ★Cru4700 + 1546, // ★Cru4656 + 1547, // ★PsA8728 + 1548, // ★TrA6217 + 1549, // ★Cap7776 + 1550, // ★Cap7754 + 1551, // ★Cap8278 + 1552, // ★Cap8322 + 1553, // ★Cap7773 + 1554, // ★Sge7479 + 1555, // ★Car2326 + 1556, // ★Car3685 + 1557, // ★Car3307 + 1558, // ★Car3699 + 1559, // ★Dra5744 + 1560, // ★Dra5291 + 1561, // ★Dra6705 + 1562, // ★Dra6536 + 1563, // ★Dra7310 + 1564, // ★Dra6688 + 1565, // ★Dra4434 + 1566, // ★Dra6370 + 1567, // ★Dra7462 + 1568, // ★Dra6396 + 1569, // ★Dra6132 + 1570, // ★Dra6636 + 1571, // ★CVn4915 + 1572, // ★CVn4785 + 1573, // ★CVn4846 + 1574, // ★Aql7595 + 1575, // ★Aql7557 + 1576, // ★Aql7525 + 1577, // ★Aql7602 + 1578, // ★Aql7235 + + 005, // Safari Ball + 016, // Cherish Ball + 499, // Sport Ball + 500, // Park Ball + + 193, // Payapa Berry + 208, // Enigma Berry + 209, // Micle Berry + 210, // Custap Berry + 211, // Jaboca Berry + 212, // Rowap Berry }; #endregion internal static readonly bool[] ReleasedHeldItems_8 = Enumerable.Range(0, MaxItemID_8 + 1).Select(i => HeldItems_SWSH.Contains((ushort)i) && !UnreleasedHeldItems_8.Contains(i)).ToArray(); diff --git a/pkNX.Structures/Legality/Trainers.cs b/pkNX.Structures/Legality/Trainers.cs index 9b196a7e..a3be543e 100644 --- a/pkNX.Structures/Legality/Trainers.cs +++ b/pkNX.Structures/Legality/Trainers.cs @@ -400,7 +400,8 @@ public static partial class Legal public static readonly int[] UnusedClasses_SWSH = { - 000, 001, 002, 003, 009, 010, 016, 017, 018, 019, 031, 148, 149, 150, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 201, 202, 203, 204, + 000, 001, 002, 003, 009, 010, 016, 017, 018, 019, 031, 047, 068, 090, 091, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 168, 169, 174, 177, 182, 201, 202, 203, + 204 }; public static readonly int[] Model_XY = @@ -486,9 +487,9 @@ public static partial class Legal public static readonly int[] ImportantTrainers_SWSH = { - 004, 005, 006, 007, 008, 009, 032, 036, 037, 077, 078, 107, 108, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 138, 143, 144, 145, 149, 153, 154, 155, 156, 157, - 158, 175, 189, 190, 191, 192, 193, 195, 196, 197, 198, 199, 202, 203, 204, 210, 211, 212, 213, 214, 215, 216, 221, 222, 225, 226, 227, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, - 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 264, 265, 266, 267, 268, 269, 289, + 032, 036, 037, 077, 078, 107, 108, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 136, 138, 143, 144, 145, 149, 153, 154, 155, 156, 157, 158, 175, 189, 190, 191, + 192, 193, 195, 196, 197, 198, 199, 202, 203, 204, 210, 211, 212, 213, 214, 215, 216, 221, 222, 225, 226, 227, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 248, 249, 250, 251, 252, + 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 264, 265, 266, 267, 268, 269, 289 }; } } diff --git a/pkNX.WinForms/Controls/EncounterList.cs b/pkNX.WinForms/Controls/EncounterList.cs index ff5a8d2c..91bb66c5 100644 --- a/pkNX.WinForms/Controls/EncounterList.cs +++ b/pkNX.WinForms/Controls/EncounterList.cs @@ -30,15 +30,19 @@ public void Initialize() { HeaderText = "Sprite", DisplayIndex = 0, - Width = 42, + Width = SpriteUtil.Spriter.Width + 2, DefaultCellStyle = { Alignment = DataGridViewContentAlignment.MiddleCenter }, ReadOnly = true, }; + var padding = SpriteUtil.Spriter.Height > 40 + ? new Padding(0, (SpriteUtil.Spriter.Height / 2) - 8, 0, 0) + : new Padding(0); var dgvSpecies = new DataGridViewComboBoxColumn { HeaderText = "Species", DisplayIndex = 1, Width = 135, + DefaultCellStyle = { Alignment = DataGridViewContentAlignment.MiddleCenter, Padding = padding }, FlatStyle = FlatStyle.Flat }; var dgvForm = new DataGridViewTextBoxColumn @@ -101,7 +105,7 @@ public void LoadSlots(EncounterSlot7b[] slots) row.Cells[1].Value = species[slots[i].Species]; row.Cells[2].Value = slots[i].Form; row.Cells[3].Value = slots[i].Probability; - row.Height = 32; + row.Height = SpriteUtil.Spriter.Height + 2; } dgv.CancelEdit(); diff --git a/pkNX.WinForms/Controls/EvolutionRow.Designer.cs b/pkNX.WinForms/Controls/EvolutionRow.Designer.cs index c8f3c4db..8d8af72c 100644 --- a/pkNX.WinForms/Controls/EvolutionRow.Designer.cs +++ b/pkNX.WinForms/Controls/EvolutionRow.Designer.cs @@ -34,6 +34,11 @@ private void InitializeComponent() this.CB_Arg = new System.Windows.Forms.ComboBox(); this.CB_Species = new System.Windows.Forms.ComboBox(); this.CB_Method = new System.Windows.Forms.ComboBox(); + this.L_Method = new System.Windows.Forms.Label(); + this.L_Species = new System.Windows.Forms.Label(); + this.L_Form = new System.Windows.Forms.Label(); + this.L_Level = new System.Windows.Forms.Label(); + this.L_Arg = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.NUD_Level)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_Form)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.PB_Preview)).BeginInit(); @@ -41,7 +46,7 @@ private void InitializeComponent() // // NUD_Level // - this.NUD_Level.Location = new System.Drawing.Point(372, 13); + this.NUD_Level.Location = new System.Drawing.Point(469, 41); this.NUD_Level.Maximum = new decimal(new int[] { 127, 0, @@ -63,7 +68,7 @@ private void InitializeComponent() // // NUD_Form // - this.NUD_Form.Location = new System.Drawing.Point(332, 13); + this.NUD_Form.Location = new System.Drawing.Point(429, 41); this.NUD_Form.Maximum = new decimal(new int[] { 127, 0, @@ -87,7 +92,7 @@ private void InitializeComponent() // this.PB_Preview.Location = new System.Drawing.Point(0, 5); this.PB_Preview.Name = "PB_Preview"; - this.PB_Preview.Size = new System.Drawing.Size(40, 30); + this.PB_Preview.Size = new System.Drawing.Size(68, 56); this.PB_Preview.TabIndex = 70; this.PB_Preview.TabStop = false; // @@ -96,9 +101,9 @@ private void InitializeComponent() this.CB_Arg.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; this.CB_Arg.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.CB_Arg.FormattingEnabled = true; - this.CB_Arg.Location = new System.Drawing.Point(248, 12); + this.CB_Arg.Location = new System.Drawing.Point(308, 40); this.CB_Arg.Name = "CB_Arg"; - this.CB_Arg.Size = new System.Drawing.Size(82, 21); + this.CB_Arg.Size = new System.Drawing.Size(120, 21); this.CB_Arg.TabIndex = 69; this.CB_Arg.Visible = false; // @@ -107,7 +112,7 @@ private void InitializeComponent() this.CB_Species.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; this.CB_Species.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.CB_Species.FormattingEnabled = true; - this.CB_Species.Location = new System.Drawing.Point(160, 12); + this.CB_Species.Location = new System.Drawing.Point(220, 40); this.CB_Species.Name = "CB_Species"; this.CB_Species.Size = new System.Drawing.Size(87, 21); this.CB_Species.TabIndex = 68; @@ -117,16 +122,66 @@ private void InitializeComponent() this.CB_Method.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.CB_Method.DropDownWidth = 250; this.CB_Method.FormattingEnabled = true; - this.CB_Method.Location = new System.Drawing.Point(41, 12); + this.CB_Method.Location = new System.Drawing.Point(69, 40); this.CB_Method.MaxDropDownItems = 10; this.CB_Method.Name = "CB_Method"; - this.CB_Method.Size = new System.Drawing.Size(118, 21); + this.CB_Method.Size = new System.Drawing.Size(150, 21); this.CB_Method.TabIndex = 66; // + // L_Method + // + this.L_Method.AutoSize = true; + this.L_Method.Location = new System.Drawing.Point(68, 24); + this.L_Method.Name = "L_Method"; + this.L_Method.Size = new System.Drawing.Size(43, 13); + this.L_Method.TabIndex = 73; + this.L_Method.Text = "Method"; + // + // L_Species + // + this.L_Species.AutoSize = true; + this.L_Species.Location = new System.Drawing.Point(219, 24); + this.L_Species.Name = "L_Species"; + this.L_Species.Size = new System.Drawing.Size(66, 13); + this.L_Species.TabIndex = 74; + this.L_Species.Text = "Evolves Into"; + // + // L_Form + // + this.L_Form.AutoSize = true; + this.L_Form.Location = new System.Drawing.Point(428, 24); + this.L_Form.Name = "L_Form"; + this.L_Form.Size = new System.Drawing.Size(30, 13); + this.L_Form.TabIndex = 75; + this.L_Form.Text = "Form"; + // + // L_Level + // + this.L_Level.AutoSize = true; + this.L_Level.Location = new System.Drawing.Point(468, 24); + this.L_Level.Name = "L_Level"; + this.L_Level.Size = new System.Drawing.Size(33, 13); + this.L_Level.TabIndex = 76; + this.L_Level.Text = "Level"; + // + // L_Arg + // + this.L_Arg.AutoSize = true; + this.L_Arg.Location = new System.Drawing.Point(307, 24); + this.L_Arg.Name = "L_Arg"; + this.L_Arg.Size = new System.Drawing.Size(52, 13); + this.L_Arg.TabIndex = 77; + this.L_Arg.Text = "Argument"; + // // EvolutionRow // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.L_Arg); + this.Controls.Add(this.L_Level); + this.Controls.Add(this.L_Form); + this.Controls.Add(this.L_Species); + this.Controls.Add(this.L_Method); this.Controls.Add(this.NUD_Level); this.Controls.Add(this.NUD_Form); this.Controls.Add(this.PB_Preview); @@ -134,11 +189,12 @@ private void InitializeComponent() this.Controls.Add(this.CB_Species); this.Controls.Add(this.CB_Method); this.Name = "EvolutionRow"; - this.Size = new System.Drawing.Size(414, 40); + this.Size = new System.Drawing.Size(530, 66); ((System.ComponentModel.ISupportInitialize)(this.NUD_Level)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_Form)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.PB_Preview)).EndInit(); this.ResumeLayout(false); + this.PerformLayout(); } @@ -150,5 +206,10 @@ private void InitializeComponent() private System.Windows.Forms.ComboBox CB_Arg; private System.Windows.Forms.ComboBox CB_Species; private System.Windows.Forms.ComboBox CB_Method; + private System.Windows.Forms.Label L_Method; + private System.Windows.Forms.Label L_Species; + private System.Windows.Forms.Label L_Form; + private System.Windows.Forms.Label L_Level; + private System.Windows.Forms.Label L_Arg; } } diff --git a/pkNX.WinForms/Controls/EvolutionRow.cs b/pkNX.WinForms/Controls/EvolutionRow.cs index 5a4e2cfc..7d1705f0 100644 --- a/pkNX.WinForms/Controls/EvolutionRow.cs +++ b/pkNX.WinForms/Controls/EvolutionRow.cs @@ -23,7 +23,8 @@ public EvolutionRow() { var index = (EvolutionType)CB_Method.SelectedIndex; var type = index.GetArgType(); - CB_Arg.Visible = type >= EvolutionTypeArgumentType.Items; + L_Method.Visible = L_Species.Visible = L_Arg.Visible = L_Form.Visible = L_Level.Visible = index > 0; + L_Arg.Visible = CB_Arg.Visible = type >= EvolutionTypeArgumentType.Items; if (type == oldMethod) return; diff --git a/pkNX.WinForms/Controls/MegaEvoEntry.Designer.cs b/pkNX.WinForms/Controls/MegaEvoEntry.Designer.cs index f506f712..6cedffe0 100644 --- a/pkNX.WinForms/Controls/MegaEvoEntry.Designer.cs +++ b/pkNX.WinForms/Controls/MegaEvoEntry.Designer.cs @@ -41,9 +41,9 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.PB_Base)).BeginInit(); this.GB_Name.SuspendLayout(); this.SuspendLayout(); - // + // // NUD_Form - // + // this.NUD_Form.Location = new System.Drawing.Point(82, 73); this.NUD_Form.Maximum = new decimal(new int[] { 127, @@ -58,26 +58,26 @@ private void InitializeComponent() this.NUD_Form.Name = "NUD_Form"; this.NUD_Form.Size = new System.Drawing.Size(45, 20); this.NUD_Form.TabIndex = 71; - // + // // PB_Preview - // + // this.PB_Preview.Location = new System.Drawing.Point(87, 99); this.PB_Preview.Name = "PB_Preview"; - this.PB_Preview.Size = new System.Drawing.Size(40, 30); + this.PB_Preview.Size = new System.Drawing.Size(68, 56); this.PB_Preview.TabIndex = 70; this.PB_Preview.TabStop = false; - // + // // L_Method - // + // this.L_Method.Location = new System.Drawing.Point(16, 73); this.L_Method.Name = "L_Method"; this.L_Method.Size = new System.Drawing.Size(60, 20); this.L_Method.TabIndex = 67; this.L_Method.Text = "Form:"; this.L_Method.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // + // // CB_Arg - // + // this.CB_Arg.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; this.CB_Arg.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.CB_Arg.FormattingEnabled = true; @@ -85,26 +85,26 @@ private void InitializeComponent() this.CB_Arg.Name = "CB_Arg"; this.CB_Arg.Size = new System.Drawing.Size(121, 21); this.CB_Arg.TabIndex = 72; - // + // // PB_Base - // + // this.PB_Base.Location = new System.Drawing.Point(6, 99); this.PB_Base.Name = "PB_Base"; - this.PB_Base.Size = new System.Drawing.Size(40, 30); + this.PB_Base.Size = new System.Drawing.Size(68, 56); this.PB_Base.TabIndex = 73; this.PB_Base.TabStop = false; - // - // label1 - // - this.L_Into.Location = new System.Drawing.Point(27, 103); + // + // L_Into + // + this.L_Into.Location = new System.Drawing.Point(27, 125); this.L_Into.Name = "L_Into"; this.L_Into.Size = new System.Drawing.Size(60, 20); this.L_Into.TabIndex = 74; this.L_Into.Text = "Into ->"; this.L_Into.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // + // // CB_Method - // + // this.CB_Method.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; this.CB_Method.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.CB_Method.FormattingEnabled = true; @@ -112,9 +112,9 @@ private void InitializeComponent() this.CB_Method.Name = "CB_Method"; this.CB_Method.Size = new System.Drawing.Size(121, 21); this.CB_Method.TabIndex = 75; - // + // // GB_Name - // + // this.GB_Name.Controls.Add(this.PB_Base); this.GB_Name.Controls.Add(this.CB_Method); this.GB_Name.Controls.Add(this.L_Into); @@ -125,18 +125,18 @@ private void InitializeComponent() this.GB_Name.Dock = System.Windows.Forms.DockStyle.Fill; this.GB_Name.Location = new System.Drawing.Point(0, 0); this.GB_Name.Name = "GB_Name"; - this.GB_Name.Size = new System.Drawing.Size(132, 137); + this.GB_Name.Size = new System.Drawing.Size(160, 160); this.GB_Name.TabIndex = 76; this.GB_Name.TabStop = false; this.GB_Name.Text = "Mega"; - // + // // MegaEvoEntry - // + // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.Controls.Add(this.GB_Name); this.Name = "MegaEvoEntry"; - this.Size = new System.Drawing.Size(132, 137); + this.Size = new System.Drawing.Size(160, 160); ((System.ComponentModel.ISupportInitialize)(this.NUD_Form)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.PB_Preview)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.PB_Base)).EndInit(); diff --git a/pkNX.WinForms/Main.cs b/pkNX.WinForms/Main.cs index babc3e21..95560a8e 100644 --- a/pkNX.WinForms/Main.cs +++ b/pkNX.WinForms/Main.cs @@ -146,7 +146,7 @@ private void LoadROM(EditorBase editor) Menu_Current.Enabled = true; EditUtil.LoadSettings(Editor.Game); EditUtil.SaveSettings(Editor.Game); - SpriteUtil.Initialize(editor.Game.GetGeneration() >= 8); + SpriteUtil.Initialize(editor.Game.GetMaxSpeciesID() >= 809); System.Media.SystemSounds.Asterisk.Play(); } diff --git a/pkNX.WinForms/MainEditor/EditorGG.cs b/pkNX.WinForms/MainEditor/EditorGG.cs index 9584a1b7..5ddfc0f6 100644 --- a/pkNX.WinForms/MainEditor/EditorGG.cs +++ b/pkNX.WinForms/MainEditor/EditorGG.cs @@ -123,7 +123,7 @@ void Randomize() foreach (var t in objs) { t.Species = srand.GetRandomSpecies(t.Species); - t.Form = Legal.GetRandomForme(t.Species, false, true, ROM.Data.PersonalData); + t.Form = Legal.GetRandomForme(t.Species, false, true, false, ROM.Data.PersonalData); } } @@ -152,7 +152,7 @@ void Randomize() foreach (var t in objs) { t.Species = srand.GetRandomSpecies(t.Species); - t.Form = Legal.GetRandomForme(t.Species, false, true, ROM.Data.PersonalData); + t.Form = Legal.GetRandomForme(t.Species, false, true, false, ROM.Data.PersonalData); t.RequiredSpecies = srand.GetRandomSpecies(t.RequiredSpecies); } } @@ -183,7 +183,7 @@ void Randomize() { var t = objs[i]; t.Species = srand.GetRandomSpecies(t.Species); - t.Form = Legal.GetRandomForme(t.Species, false, true, ROM.Data.PersonalData); + t.Form = Legal.GetRandomForme(t.Species, false, true, false, ROM.Data.PersonalData); } } diff --git a/pkNX.WinForms/Subforms/BTTE.cs b/pkNX.WinForms/Subforms/BTTE.cs index e8acf458..fb86478c 100644 --- a/pkNX.WinForms/Subforms/BTTE.cs +++ b/pkNX.WinForms/Subforms/BTTE.cs @@ -71,6 +71,8 @@ public BTTE(GameManager game, TrainerEditor editor) PG_Moves.SelectedObject = EditUtil.Settings.Move; PG_RTrainer.SelectedObject = EditUtil.Settings.Trainer; PG_Species.SelectedObject = EditUtil.Settings.Species; + + L_Gift.Visible = CB_Gift.Visible = NUD_GiftCount.Visible = Game.Info.GG; } public bool Modified { get; set; } @@ -165,8 +167,7 @@ private void GetSlotColor(int slot, Image color) private static void GetQuickFiller(PictureBox pb, TrainerPoke pk) { - var rawImg = SpriteUtil.GetSprite(pk.Species, pk.Form, pk.Gender, pk.HeldItem, false, pk.Shiny); - pb.Image = ImageUtil.ResizeImage((Bitmap)rawImg, pb.Width, pb.Height); + pb.Image = SpriteUtil.GetSprite(pk.Species, pk.Form, pk.Gender, pk.HeldItem, false, pk.Shiny); } // Top Level Functions @@ -334,18 +335,17 @@ private void PopulateFields(TrainerPoke pk) { CHK_CanMega.Checked = b.CanMegaEvolve; NUD_MegaForm.Value = b.MegaFormChoice; - FLP_HeldItem.Visible = FLP_Ability.Visible = false; NUD_Friendship.Value = b.Friendship; + FLP_HeldItem.Visible = FLP_Ability.Visible = false; + L_DynamaxLevel.Visible = CB_DynamaxLevel.Visible = CHK_Gigantamax.Visible = false; } else if (pkm is TrainerPoke8 c) { CB_DynamaxLevel.SelectedIndex = c.DynamaxLevel; CHK_Gigantamax.Checked = c.CanGigantamax; - } - else - { FLP_Friendship.Visible = FLP_Mega.Visible = false; FLP_HeldItem.Visible = FLP_Ability.Visible = true; + L_DynamaxLevel.Visible = CB_DynamaxLevel.Visible = CHK_Gigantamax.Visible = true; } Stats.LoadStats(pkm); @@ -566,8 +566,18 @@ private TrainerRandomizer GetRandomizer() var rmove = new MoveRandomizer(Game.Info, moves, Personal); int[] banned = Legal.GetBannedMoves(Game.Info.Game, moves.Length); rmove.Initialize((MovesetRandSettings)PG_Moves.SelectedObject, banned); + int[] ban = new int[0]; + + if (Game.Info.SWSH) + { + var pt = Game.Data.PersonalData; + ban = pt.Table.Take(Game.Info.MaxSpeciesID + 1) + .Select((z, i) => new {Species = i, Present = ((PersonalInfoSWSH)z).IsPresentInGame}) + .Where(z => !z.Present).Select(z => z.Species).ToArray(); + } + var rspec = new SpeciesRandomizer(Game.Info, Personal); - rspec.Initialize((SpeciesSettings)PG_Species.SelectedObject); + rspec.Initialize((SpeciesSettings)PG_Species.SelectedObject, ban); learn.Moves = moves; var evos = Game.Data.EvolutionData; var trand = new TrainerRandomizer(Game.Info, Personal, Trainers.LoadAll(), evos.LoadAll()) diff --git a/pkNX.WinForms/Subforms/BTTE.designer.cs b/pkNX.WinForms/Subforms/BTTE.designer.cs index bc0101d0..376ecac8 100644 --- a/pkNX.WinForms/Subforms/BTTE.designer.cs +++ b/pkNX.WinForms/Subforms/BTTE.designer.cs @@ -302,7 +302,7 @@ private void InitializeComponent() // L_Team // this.L_Team.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.L_Team.Location = new System.Drawing.Point(-19, 353); + this.L_Team.Location = new System.Drawing.Point(-4, 358); this.L_Team.Name = "L_Team"; this.L_Team.Size = new System.Drawing.Size(66, 15); this.L_Team.TabIndex = 445; @@ -314,9 +314,9 @@ private void InitializeComponent() this.PB_Team1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.PB_Team1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.PB_Team1.ContextMenuStrip = this.mnuVSD; - this.PB_Team1.Location = new System.Drawing.Point(53, 330); + this.PB_Team1.Location = new System.Drawing.Point(72, 333); this.PB_Team1.Name = "PB_Team1"; - this.PB_Team1.Size = new System.Drawing.Size(82, 62); + this.PB_Team1.Size = new System.Drawing.Size(70, 58); this.PB_Team1.TabIndex = 444; this.PB_Team1.TabStop = false; // @@ -352,9 +352,9 @@ private void InitializeComponent() this.PB_Team2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.PB_Team2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.PB_Team2.ContextMenuStrip = this.mnuVSD; - this.PB_Team2.Location = new System.Drawing.Point(139, 330); + this.PB_Team2.Location = new System.Drawing.Point(158, 333); this.PB_Team2.Name = "PB_Team2"; - this.PB_Team2.Size = new System.Drawing.Size(82, 62); + this.PB_Team2.Size = new System.Drawing.Size(70, 58); this.PB_Team2.TabIndex = 443; this.PB_Team2.TabStop = false; // @@ -363,9 +363,9 @@ private void InitializeComponent() this.PB_Team3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.PB_Team3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.PB_Team3.ContextMenuStrip = this.mnuVSD; - this.PB_Team3.Location = new System.Drawing.Point(225, 330); + this.PB_Team3.Location = new System.Drawing.Point(244, 333); this.PB_Team3.Name = "PB_Team3"; - this.PB_Team3.Size = new System.Drawing.Size(82, 62); + this.PB_Team3.Size = new System.Drawing.Size(70, 58); this.PB_Team3.TabIndex = 442; this.PB_Team3.TabStop = false; // @@ -374,9 +374,9 @@ private void InitializeComponent() this.PB_Team4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.PB_Team4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.PB_Team4.ContextMenuStrip = this.mnuVSD; - this.PB_Team4.Location = new System.Drawing.Point(311, 330); + this.PB_Team4.Location = new System.Drawing.Point(330, 333); this.PB_Team4.Name = "PB_Team4"; - this.PB_Team4.Size = new System.Drawing.Size(82, 62); + this.PB_Team4.Size = new System.Drawing.Size(70, 58); this.PB_Team4.TabIndex = 441; this.PB_Team4.TabStop = false; // @@ -385,9 +385,9 @@ private void InitializeComponent() this.PB_Team5.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.PB_Team5.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.PB_Team5.ContextMenuStrip = this.mnuVSD; - this.PB_Team5.Location = new System.Drawing.Point(397, 330); + this.PB_Team5.Location = new System.Drawing.Point(416, 333); this.PB_Team5.Name = "PB_Team5"; - this.PB_Team5.Size = new System.Drawing.Size(82, 62); + this.PB_Team5.Size = new System.Drawing.Size(70, 58); this.PB_Team5.TabIndex = 440; this.PB_Team5.TabStop = false; // @@ -396,9 +396,9 @@ private void InitializeComponent() this.PB_Team6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.PB_Team6.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.PB_Team6.ContextMenuStrip = this.mnuVSD; - this.PB_Team6.Location = new System.Drawing.Point(483, 330); + this.PB_Team6.Location = new System.Drawing.Point(502, 333); this.PB_Team6.Name = "PB_Team6"; - this.PB_Team6.Size = new System.Drawing.Size(82, 62); + this.PB_Team6.Size = new System.Drawing.Size(70, 58); this.PB_Team6.TabIndex = 439; this.PB_Team6.TabStop = false; // @@ -767,7 +767,7 @@ private void InitializeComponent() // // L_DynamaxLevel // - this.L_DynamaxLevel.Location = new System.Drawing.Point(-24, 192); + this.L_DynamaxLevel.Location = new System.Drawing.Point(-24, 194); this.L_DynamaxLevel.Margin = new System.Windows.Forms.Padding(0); this.L_DynamaxLevel.Name = "L_DynamaxLevel"; this.L_DynamaxLevel.Size = new System.Drawing.Size(120, 21); @@ -791,7 +791,7 @@ private void InitializeComponent() "8", "9", "10"}); - this.CB_DynamaxLevel.Location = new System.Drawing.Point(96, 192); + this.CB_DynamaxLevel.Location = new System.Drawing.Point(96, 194); this.CB_DynamaxLevel.Margin = new System.Windows.Forms.Padding(0); this.CB_DynamaxLevel.Name = "CB_DynamaxLevel"; this.CB_DynamaxLevel.Size = new System.Drawing.Size(40, 21); @@ -800,7 +800,7 @@ private void InitializeComponent() // CHK_Gigantamax // this.CHK_Gigantamax.AutoSize = true; - this.CHK_Gigantamax.Location = new System.Drawing.Point(139, 195); + this.CHK_Gigantamax.Location = new System.Drawing.Point(139, 197); this.CHK_Gigantamax.Name = "CHK_Gigantamax"; this.CHK_Gigantamax.Size = new System.Drawing.Size(82, 17); this.CHK_Gigantamax.TabIndex = 47; @@ -812,7 +812,7 @@ private void InitializeComponent() this.Stats.Location = new System.Drawing.Point(0, 1); this.Stats.Name = "Stats"; this.Stats.PKM = null; - this.Stats.Size = new System.Drawing.Size(224, 218); + this.Stats.Size = new System.Drawing.Size(224, 190); this.Stats.TabIndex = 0; // // Tab_Moves diff --git a/pkNX.WinForms/Subforms/GGWE.Designer.cs b/pkNX.WinForms/Subforms/GGWE.Designer.cs index 67f126d0..20f4e1d0 100644 --- a/pkNX.WinForms/Subforms/GGWE.Designer.cs +++ b/pkNX.WinForms/Subforms/GGWE.Designer.cs @@ -34,11 +34,17 @@ private void InitializeComponent() this.L_Rank = new System.Windows.Forms.Label(); this.TC_Tables = new System.Windows.Forms.TabControl(); this.Tab_Ground = new System.Windows.Forms.TabPage(); + this.EL_Ground = new pkNX.WinForms.EncounterList(); this.Tab_Water = new System.Windows.Forms.TabPage(); + this.EL_Water = new pkNX.WinForms.EncounterList(); this.Tab_Old = new System.Windows.Forms.TabPage(); + this.EL_Old = new pkNX.WinForms.EncounterList(); this.Tab_Good = new System.Windows.Forms.TabPage(); + this.EL_Good = new pkNX.WinForms.EncounterList(); this.Tab_Super = new System.Windows.Forms.TabPage(); + this.EL_Super = new pkNX.WinForms.EncounterList(); this.Tab_Sky = new System.Windows.Forms.TabPage(); + this.EL_Sky = new pkNX.WinForms.EncounterList(); this.Tab_Rand = new System.Windows.Forms.TabPage(); this.CHK_ForceType = new System.Windows.Forms.CheckBox(); this.L_SpawnDuration = new System.Windows.Forms.Label(); @@ -55,13 +61,9 @@ private void InitializeComponent() this.B_ModSpawn = new System.Windows.Forms.Button(); this.L_Hash = new System.Windows.Forms.Label(); this.B_Save = new System.Windows.Forms.Button(); - this.EL_Ground = new pkNX.WinForms.EncounterList(); - this.EL_Water = new pkNX.WinForms.EncounterList(); - this.EL_Old = new pkNX.WinForms.EncounterList(); - this.EL_Good = new pkNX.WinForms.EncounterList(); - this.EL_Super = new pkNX.WinForms.EncounterList(); - this.EL_Sky = new pkNX.WinForms.EncounterList(); this.B_Dump = new System.Windows.Forms.Button(); + this.NUD_LevelBoost = new System.Windows.Forms.NumericUpDown(); + this.CHK_Level = new System.Windows.Forms.CheckBox(); ((System.ComponentModel.ISupportInitialize)(this.NUD_RankMin)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_RankMax)).BeginInit(); this.TC_Tables.SuspendLayout(); @@ -75,6 +77,7 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.NUD_ModDuration)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_ModRate)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_ModCount)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_LevelBoost)).BeginInit(); this.SuspendLayout(); // // CB_Location @@ -126,7 +129,7 @@ private void InitializeComponent() this.TC_Tables.Location = new System.Drawing.Point(12, 78); this.TC_Tables.Name = "TC_Tables"; this.TC_Tables.SelectedIndex = 0; - this.TC_Tables.Size = new System.Drawing.Size(321, 426); + this.TC_Tables.Size = new System.Drawing.Size(321, 681); this.TC_Tables.TabIndex = 10; // // Tab_Ground @@ -134,11 +137,19 @@ private void InitializeComponent() this.Tab_Ground.Controls.Add(this.EL_Ground); this.Tab_Ground.Location = new System.Drawing.Point(4, 22); this.Tab_Ground.Name = "Tab_Ground"; - this.Tab_Ground.Size = new System.Drawing.Size(313, 400); + this.Tab_Ground.Size = new System.Drawing.Size(313, 665); this.Tab_Ground.TabIndex = 0; this.Tab_Ground.Text = "Ground"; this.Tab_Ground.UseVisualStyleBackColor = true; // + // EL_Ground + // + this.EL_Ground.Dock = System.Windows.Forms.DockStyle.Fill; + this.EL_Ground.Location = new System.Drawing.Point(0, 0); + this.EL_Ground.Name = "EL_Ground"; + this.EL_Ground.Size = new System.Drawing.Size(313, 665); + this.EL_Ground.TabIndex = 14; + // // Tab_Water // this.Tab_Water.Controls.Add(this.EL_Water); @@ -149,6 +160,14 @@ private void InitializeComponent() this.Tab_Water.Text = "Water"; this.Tab_Water.UseVisualStyleBackColor = true; // + // EL_Water + // + this.EL_Water.Dock = System.Windows.Forms.DockStyle.Fill; + this.EL_Water.Location = new System.Drawing.Point(0, 0); + this.EL_Water.Name = "EL_Water"; + this.EL_Water.Size = new System.Drawing.Size(313, 400); + this.EL_Water.TabIndex = 13; + // // Tab_Old // this.Tab_Old.Controls.Add(this.EL_Old); @@ -159,6 +178,14 @@ private void InitializeComponent() this.Tab_Old.Text = "Old"; this.Tab_Old.UseVisualStyleBackColor = true; // + // EL_Old + // + this.EL_Old.Dock = System.Windows.Forms.DockStyle.Fill; + this.EL_Old.Location = new System.Drawing.Point(0, 0); + this.EL_Old.Name = "EL_Old"; + this.EL_Old.Size = new System.Drawing.Size(313, 400); + this.EL_Old.TabIndex = 13; + // // Tab_Good // this.Tab_Good.Controls.Add(this.EL_Good); @@ -169,6 +196,14 @@ private void InitializeComponent() this.Tab_Good.Text = "Good"; this.Tab_Good.UseVisualStyleBackColor = true; // + // EL_Good + // + this.EL_Good.Dock = System.Windows.Forms.DockStyle.Fill; + this.EL_Good.Location = new System.Drawing.Point(0, 0); + this.EL_Good.Name = "EL_Good"; + this.EL_Good.Size = new System.Drawing.Size(313, 400); + this.EL_Good.TabIndex = 13; + // // Tab_Super // this.Tab_Super.Controls.Add(this.EL_Super); @@ -179,6 +214,14 @@ private void InitializeComponent() this.Tab_Super.Text = "Super"; this.Tab_Super.UseVisualStyleBackColor = true; // + // EL_Super + // + this.EL_Super.Dock = System.Windows.Forms.DockStyle.Fill; + this.EL_Super.Location = new System.Drawing.Point(0, 0); + this.EL_Super.Name = "EL_Super"; + this.EL_Super.Size = new System.Drawing.Size(313, 400); + this.EL_Super.TabIndex = 12; + // // Tab_Sky // this.Tab_Sky.Controls.Add(this.EL_Sky); @@ -189,8 +232,18 @@ private void InitializeComponent() this.Tab_Sky.Text = "Sky"; this.Tab_Sky.UseVisualStyleBackColor = true; // + // EL_Sky + // + this.EL_Sky.Dock = System.Windows.Forms.DockStyle.Fill; + this.EL_Sky.Location = new System.Drawing.Point(0, 0); + this.EL_Sky.Name = "EL_Sky"; + this.EL_Sky.Size = new System.Drawing.Size(313, 400); + this.EL_Sky.TabIndex = 12; + // // Tab_Rand // + this.Tab_Rand.Controls.Add(this.NUD_LevelBoost); + this.Tab_Rand.Controls.Add(this.CHK_Level); this.Tab_Rand.Controls.Add(this.CHK_ForceType); this.Tab_Rand.Controls.Add(this.L_SpawnDuration); this.Tab_Rand.Controls.Add(this.L_SpawnCount); @@ -207,7 +260,7 @@ private void InitializeComponent() this.Tab_Rand.Location = new System.Drawing.Point(4, 22); this.Tab_Rand.Name = "Tab_Rand"; this.Tab_Rand.Padding = new System.Windows.Forms.Padding(3); - this.Tab_Rand.Size = new System.Drawing.Size(313, 400); + this.Tab_Rand.Size = new System.Drawing.Size(313, 655); this.Tab_Rand.TabIndex = 6; this.Tab_Rand.Text = "Rand"; this.Tab_Rand.UseVisualStyleBackColor = true; @@ -272,7 +325,7 @@ private void InitializeComponent() // // PG_Species // - this.PG_Species.Location = new System.Drawing.Point(0, 142); + this.PG_Species.Location = new System.Drawing.Point(0, 165); this.PG_Species.Name = "PG_Species"; this.PG_Species.Size = new System.Drawing.Size(313, 258); this.PG_Species.TabIndex = 6; @@ -377,54 +430,6 @@ private void InitializeComponent() this.B_Save.UseVisualStyleBackColor = true; this.B_Save.Click += new System.EventHandler(this.B_Save_Click); // - // EL_Ground - // - this.EL_Ground.Dock = System.Windows.Forms.DockStyle.Fill; - this.EL_Ground.Location = new System.Drawing.Point(0, 0); - this.EL_Ground.Name = "EL_Ground"; - this.EL_Ground.Size = new System.Drawing.Size(313, 400); - this.EL_Ground.TabIndex = 14; - // - // EL_Water - // - this.EL_Water.Dock = System.Windows.Forms.DockStyle.Fill; - this.EL_Water.Location = new System.Drawing.Point(0, 0); - this.EL_Water.Name = "EL_Water"; - this.EL_Water.Size = new System.Drawing.Size(313, 400); - this.EL_Water.TabIndex = 13; - // - // EL_Old - // - this.EL_Old.Dock = System.Windows.Forms.DockStyle.Fill; - this.EL_Old.Location = new System.Drawing.Point(0, 0); - this.EL_Old.Name = "EL_Old"; - this.EL_Old.Size = new System.Drawing.Size(313, 400); - this.EL_Old.TabIndex = 13; - // - // EL_Good - // - this.EL_Good.Dock = System.Windows.Forms.DockStyle.Fill; - this.EL_Good.Location = new System.Drawing.Point(0, 0); - this.EL_Good.Name = "EL_Good"; - this.EL_Good.Size = new System.Drawing.Size(313, 400); - this.EL_Good.TabIndex = 13; - // - // EL_Super - // - this.EL_Super.Dock = System.Windows.Forms.DockStyle.Fill; - this.EL_Super.Location = new System.Drawing.Point(0, 0); - this.EL_Super.Name = "EL_Super"; - this.EL_Super.Size = new System.Drawing.Size(313, 400); - this.EL_Super.TabIndex = 12; - // - // EL_Sky - // - this.EL_Sky.Dock = System.Windows.Forms.DockStyle.Fill; - this.EL_Sky.Location = new System.Drawing.Point(0, 0); - this.EL_Sky.Name = "EL_Sky"; - this.EL_Sky.Size = new System.Drawing.Size(313, 400); - this.EL_Sky.TabIndex = 12; - // // B_Dump // this.B_Dump.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -436,11 +441,49 @@ private void InitializeComponent() this.B_Dump.UseVisualStyleBackColor = true; this.B_Dump.Click += new System.EventHandler(this.B_Dump_Click); // + // NUD_LevelBoost + // + this.NUD_LevelBoost.DecimalPlaces = 2; + this.NUD_LevelBoost.Increment = new decimal(new int[] { + 5, + 0, + 0, + 131072}); + this.NUD_LevelBoost.Location = new System.Drawing.Point(209, 139); + this.NUD_LevelBoost.Maximum = new decimal(new int[] { + 3, + 0, + 0, + 0}); + this.NUD_LevelBoost.Minimum = new decimal(new int[] { + 1, + 0, + 0, + 65536}); + this.NUD_LevelBoost.Name = "NUD_LevelBoost"; + this.NUD_LevelBoost.Size = new System.Drawing.Size(43, 20); + this.NUD_LevelBoost.TabIndex = 305; + this.NUD_LevelBoost.Value = new decimal(new int[] { + 1, + 0, + 0, + 0}); + // + // CHK_Level + // + this.CHK_Level.AutoSize = true; + this.CHK_Level.Location = new System.Drawing.Point(80, 140); + this.CHK_Level.Name = "CHK_Level"; + this.CHK_Level.Size = new System.Drawing.Size(130, 17); + this.CHK_Level.TabIndex = 304; + this.CHK_Level.Text = "Multiply PKM Level by"; + this.CHK_Level.UseVisualStyleBackColor = true; + // // GGWE // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(346, 516); + this.ClientSize = new System.Drawing.Size(346, 771); this.Controls.Add(this.B_Dump); this.Controls.Add(this.B_Save); this.Controls.Add(this.L_Hash); @@ -468,6 +511,7 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.NUD_ModDuration)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_ModRate)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_ModCount)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_LevelBoost)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -508,5 +552,7 @@ private void InitializeComponent() private System.Windows.Forms.NumericUpDown NUD_ModDuration; private System.Windows.Forms.Button B_ModDuration; private System.Windows.Forms.Button B_Dump; + private System.Windows.Forms.NumericUpDown NUD_LevelBoost; + private System.Windows.Forms.CheckBox CHK_Level; } } \ No newline at end of file diff --git a/pkNX.WinForms/Subforms/GGWE.cs b/pkNX.WinForms/Subforms/GGWE.cs index 2e8ba5ea..ad1eea2e 100644 --- a/pkNX.WinForms/Subforms/GGWE.cs +++ b/pkNX.WinForms/Subforms/GGWE.cs @@ -349,18 +349,29 @@ private void B_RandAll_Click(object sender, EventArgs e) settings.Gen2 = settings.Gen3 = settings.Gen4 = settings.Gen5 = settings.Gen6 = settings.Gen7 = false; var rand = new SpeciesRandomizer(ROM.Info, ROM.Data.PersonalData); rand.Initialize(settings, 808, 809); - RandomizeWild(rand, CHK_FillEmpty.Checked); + RandomizeWild(rand, CHK_FillEmpty.Checked, CHK_Level.Checked); LoadEntry(entry); System.Media.SystemSounds.Asterisk.Play(); } - private void RandomizeWild(SpeciesRandomizer rand, bool fill) + private void RandomizeWild(SpeciesRandomizer rand, bool fill, bool boost) { var pt = ROM.Data.PersonalData; bool IsGrassOrWater(int s) => pt[s].IsType((int)Types.Water) || pt[s].IsType((int)Types.Grass); foreach (var area in Tables.EncounterTables) { + if (boost) + { + area.GroundTableLevelMin = Legal.GetModifiedLevel(area.GroundTableLevelMin, (double)NUD_LevelBoost.Value); + area.GroundTableLevelMax = Legal.GetModifiedLevel(area.GroundTableLevelMax, (double)NUD_LevelBoost.Value); + + area.WaterTableLevelMin = Legal.GetModifiedLevel(area.WaterTableLevelMin, (double)NUD_LevelBoost.Value); + area.WaterTableLevelMax = Legal.GetModifiedLevel(area.WaterTableLevelMax, (double)NUD_LevelBoost.Value); + + area.SkyTableLevelMin = Legal.GetModifiedLevel(area.SkyTableLevelMin, (double)NUD_LevelBoost.Value); + area.SkyTableLevelMax = Legal.GetModifiedLevel(area.SkyTableLevelMax, (double)NUD_LevelBoost.Value); + } ApplyRand(area.GroundTable); ApplyRand(area.WaterTable); ApplyRand(area.SkyTable); diff --git a/pkNX.WinForms/Subforms/PokeDataUI.Designer.cs b/pkNX.WinForms/Subforms/PokeDataUI.Designer.cs index 17fce9f8..ec8a54a0 100644 --- a/pkNX.WinForms/Subforms/PokeDataUI.Designer.cs +++ b/pkNX.WinForms/Subforms/PokeDataUI.Designer.cs @@ -31,6 +31,7 @@ private void InitializeComponent() this.B_Save = new System.Windows.Forms.Button(); this.tabControl1 = new System.Windows.Forms.TabControl(); this.Tab_Personal = new System.Windows.Forms.TabPage(); + this.PB_MonSprite = new System.Windows.Forms.PictureBox(); this.B_PDumpTable = new System.Windows.Forms.Button(); this.L_GoID = new System.Windows.Forms.Label(); this.MT_GoID = new System.Windows.Forms.MaskedTextBox(); @@ -137,9 +138,9 @@ private void InitializeComponent() this.B_RandEvo = new System.Windows.Forms.Button(); this.PG_Evolution = new System.Windows.Forms.PropertyGrid(); this.CB_Species = new System.Windows.Forms.ComboBox(); - this.PB_MonSprite = new System.Windows.Forms.PictureBox(); this.tabControl1.SuspendLayout(); this.Tab_Personal.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.PB_MonSprite)).BeginInit(); this.Tab_Learn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dgv)).BeginInit(); this.Tab_Evo.SuspendLayout(); @@ -149,13 +150,12 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.NUD_AmpEXP)).BeginInit(); this.Tab_RLearn.SuspendLayout(); this.Tab_REvo.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.PB_MonSprite)).BeginInit(); this.SuspendLayout(); // // B_Save // this.B_Save.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.B_Save.Location = new System.Drawing.Point(460, -1); + this.B_Save.Location = new System.Drawing.Point(456, -1); this.B_Save.Name = "B_Save"; this.B_Save.Size = new System.Drawing.Size(75, 23); this.B_Save.TabIndex = 0; @@ -173,11 +173,12 @@ private void InitializeComponent() this.tabControl1.Location = new System.Drawing.Point(0, 0); this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; - this.tabControl1.Size = new System.Drawing.Size(534, 541); + this.tabControl1.Size = new System.Drawing.Size(534, 766); this.tabControl1.TabIndex = 1; // // Tab_Personal // + this.Tab_Personal.Controls.Add(this.PB_MonSprite); this.Tab_Personal.Controls.Add(this.B_PDumpTable); this.Tab_Personal.Controls.Add(this.L_GoID); this.Tab_Personal.Controls.Add(this.MT_GoID); @@ -262,14 +263,24 @@ private void InitializeComponent() this.Tab_Personal.Location = new System.Drawing.Point(4, 22); this.Tab_Personal.Name = "Tab_Personal"; this.Tab_Personal.Padding = new System.Windows.Forms.Padding(3); - this.Tab_Personal.Size = new System.Drawing.Size(526, 515); + this.Tab_Personal.Size = new System.Drawing.Size(526, 740); this.Tab_Personal.TabIndex = 0; this.Tab_Personal.Text = "Personal"; this.Tab_Personal.UseVisualStyleBackColor = true; // + // PB_MonSprite + // + this.PB_MonSprite.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.PB_MonSprite.BackColor = System.Drawing.Color.Transparent; + this.PB_MonSprite.Location = new System.Drawing.Point(382, 8); + this.PB_MonSprite.Name = "PB_MonSprite"; + this.PB_MonSprite.Size = new System.Drawing.Size(136, 112); + this.PB_MonSprite.TabIndex = 91; + this.PB_MonSprite.TabStop = false; + // // B_PDumpTable // - this.B_PDumpTable.Location = new System.Drawing.Point(451, 492); + this.B_PDumpTable.Location = new System.Drawing.Point(443, 709); this.B_PDumpTable.Name = "B_PDumpTable"; this.B_PDumpTable.Size = new System.Drawing.Size(75, 23); this.B_PDumpTable.TabIndex = 502; @@ -280,7 +291,7 @@ private void InitializeComponent() // L_GoID // this.L_GoID.AutoSize = true; - this.L_GoID.Location = new System.Drawing.Point(122, 425); + this.L_GoID.Location = new System.Drawing.Point(116, 567); this.L_GoID.Name = "L_GoID"; this.L_GoID.Size = new System.Drawing.Size(35, 13); this.L_GoID.TabIndex = 501; @@ -289,7 +300,7 @@ private void InitializeComponent() // MT_GoID // this.MT_GoID.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.MT_GoID.Location = new System.Drawing.Point(163, 423); + this.MT_GoID.Location = new System.Drawing.Point(157, 565); this.MT_GoID.Mask = "000"; this.MT_GoID.Name = "MT_GoID"; this.MT_GoID.Size = new System.Drawing.Size(31, 20); @@ -298,7 +309,7 @@ private void InitializeComponent() // // TB_RawColor // - this.TB_RawColor.Location = new System.Drawing.Point(421, 255); + this.TB_RawColor.Location = new System.Drawing.Point(440, 356); this.TB_RawColor.Name = "TB_RawColor"; this.TB_RawColor.ReadOnly = true; this.TB_RawColor.Size = new System.Drawing.Size(30, 20); @@ -309,7 +320,7 @@ private void InitializeComponent() // L_HiddenAbility // this.L_HiddenAbility.AutoSize = true; - this.L_HiddenAbility.Location = new System.Drawing.Point(419, 138); + this.L_HiddenAbility.Location = new System.Drawing.Point(438, 208); this.L_HiddenAbility.Name = "L_HiddenAbility"; this.L_HiddenAbility.Size = new System.Drawing.Size(21, 13); this.L_HiddenAbility.TabIndex = 499; @@ -318,7 +329,7 @@ private void InitializeComponent() // L_WeightKG // this.L_WeightKG.AutoSize = true; - this.L_WeightKG.Location = new System.Drawing.Point(418, 376); + this.L_WeightKG.Location = new System.Drawing.Point(437, 518); this.L_WeightKG.Name = "L_WeightKG"; this.L_WeightKG.Size = new System.Drawing.Size(19, 13); this.L_WeightKG.TabIndex = 495; @@ -327,7 +338,7 @@ private void InitializeComponent() // L_Ability2 // this.L_Ability2.AutoSize = true; - this.L_Ability2.Location = new System.Drawing.Point(420, 116); + this.L_Ability2.Location = new System.Drawing.Point(439, 186); this.L_Ability2.Name = "L_Ability2"; this.L_Ability2.Size = new System.Drawing.Size(19, 13); this.L_Ability2.TabIndex = 497; @@ -336,7 +347,7 @@ private void InitializeComponent() // L_HeightM // this.L_HeightM.AutoSize = true; - this.L_HeightM.Location = new System.Drawing.Point(418, 355); + this.L_HeightM.Location = new System.Drawing.Point(437, 497); this.L_HeightM.Name = "L_HeightM"; this.L_HeightM.Size = new System.Drawing.Size(15, 13); this.L_HeightM.TabIndex = 494; @@ -345,7 +356,7 @@ private void InitializeComponent() // L_Ability1 // this.L_Ability1.AutoSize = true; - this.L_Ability1.Location = new System.Drawing.Point(420, 94); + this.L_Ability1.Location = new System.Drawing.Point(439, 164); this.L_Ability1.Name = "L_Ability1"; this.L_Ability1.Size = new System.Drawing.Size(19, 13); this.L_Ability1.TabIndex = 496; @@ -354,7 +365,7 @@ private void InitializeComponent() // TB_Weight // this.TB_Weight.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_Weight.Location = new System.Drawing.Point(386, 372); + this.TB_Weight.Location = new System.Drawing.Point(405, 514); this.TB_Weight.Mask = "000.0"; this.TB_Weight.Name = "TB_Weight"; this.TB_Weight.Size = new System.Drawing.Size(32, 20); @@ -364,7 +375,7 @@ private void InitializeComponent() // TB_Height // this.TB_Height.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_Height.Location = new System.Drawing.Point(386, 351); + this.TB_Height.Location = new System.Drawing.Point(405, 493); this.TB_Height.Mask = "00.0"; this.TB_Height.Name = "TB_Height"; this.TB_Height.Size = new System.Drawing.Size(32, 20); @@ -374,7 +385,7 @@ private void InitializeComponent() // L_Weight // this.L_Weight.AutoSize = true; - this.L_Weight.Location = new System.Drawing.Point(342, 375); + this.L_Weight.Location = new System.Drawing.Point(361, 517); this.L_Weight.Name = "L_Weight"; this.L_Weight.Size = new System.Drawing.Size(44, 13); this.L_Weight.TabIndex = 491; @@ -384,7 +395,7 @@ private void InitializeComponent() // L_Height // this.L_Height.AutoSize = true; - this.L_Height.Location = new System.Drawing.Point(345, 354); + this.L_Height.Location = new System.Drawing.Point(364, 496); this.L_Height.Name = "L_Height"; this.L_Height.Size = new System.Drawing.Size(41, 13); this.L_Height.TabIndex = 490; @@ -394,31 +405,31 @@ private void InitializeComponent() // CB_ZMove // this.CB_ZMove.FormattingEnabled = true; - this.CB_ZMove.Location = new System.Drawing.Point(297, 463); + this.CB_ZMove.Location = new System.Drawing.Point(316, 605); this.CB_ZMove.Name = "CB_ZMove"; - this.CB_ZMove.Size = new System.Drawing.Size(121, 21); + this.CB_ZMove.Size = new System.Drawing.Size(175, 21); this.CB_ZMove.TabIndex = 488; // // CB_ZBaseMove // this.CB_ZBaseMove.FormattingEnabled = true; - this.CB_ZBaseMove.Location = new System.Drawing.Point(297, 441); + this.CB_ZBaseMove.Location = new System.Drawing.Point(316, 583); this.CB_ZBaseMove.Name = "CB_ZBaseMove"; - this.CB_ZBaseMove.Size = new System.Drawing.Size(121, 21); + this.CB_ZBaseMove.Size = new System.Drawing.Size(125, 21); this.CB_ZBaseMove.TabIndex = 485; // // CB_ZItem // this.CB_ZItem.FormattingEnabled = true; - this.CB_ZItem.Location = new System.Drawing.Point(297, 419); + this.CB_ZItem.Location = new System.Drawing.Point(316, 561); this.CB_ZItem.Name = "CB_ZItem"; - this.CB_ZItem.Size = new System.Drawing.Size(121, 21); + this.CB_ZItem.Size = new System.Drawing.Size(125, 21); this.CB_ZItem.TabIndex = 484; // // TB_CallRate // this.TB_CallRate.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_CallRate.Location = new System.Drawing.Point(163, 334); + this.TB_CallRate.Location = new System.Drawing.Point(157, 476); this.TB_CallRate.Mask = "000"; this.TB_CallRate.Name = "TB_CallRate"; this.TB_CallRate.Size = new System.Drawing.Size(31, 20); @@ -428,7 +439,7 @@ private void InitializeComponent() // L_CallRate // this.L_CallRate.AutoSize = true; - this.L_CallRate.Location = new System.Drawing.Point(109, 338); + this.L_CallRate.Location = new System.Drawing.Point(103, 480); this.L_CallRate.Name = "L_CallRate"; this.L_CallRate.Size = new System.Drawing.Size(53, 13); this.L_CallRate.TabIndex = 482; @@ -439,7 +450,7 @@ private void InitializeComponent() // this.CHK_Variant.AutoSize = true; this.CHK_Variant.CheckAlign = System.Drawing.ContentAlignment.MiddleRight; - this.CHK_Variant.Location = new System.Drawing.Point(91, 452); + this.CHK_Variant.Location = new System.Drawing.Point(85, 594); this.CHK_Variant.Name = "CHK_Variant"; this.CHK_Variant.Size = new System.Drawing.Size(104, 17); this.CHK_Variant.TabIndex = 481; @@ -448,7 +459,7 @@ private void InitializeComponent() // // TB_BST // - this.TB_BST.Location = new System.Drawing.Point(387, 20); + this.TB_BST.Location = new System.Drawing.Point(341, 33); this.TB_BST.Name = "TB_BST"; this.TB_BST.ReadOnly = true; this.TB_BST.Size = new System.Drawing.Size(31, 20); @@ -459,7 +470,7 @@ private void InitializeComponent() // L_BST // this.L_BST.AutoSize = true; - this.L_BST.Location = new System.Drawing.Point(355, 23); + this.L_BST.Location = new System.Drawing.Point(307, 37); this.L_BST.Name = "L_BST"; this.L_BST.Size = new System.Drawing.Size(31, 13); this.L_BST.TabIndex = 479; @@ -469,7 +480,7 @@ private void InitializeComponent() // TB_CatchRate // this.TB_CatchRate.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_CatchRate.Location = new System.Drawing.Point(387, 44); + this.TB_CatchRate.Location = new System.Drawing.Point(157, 539); this.TB_CatchRate.Mask = "000"; this.TB_CatchRate.Name = "TB_CatchRate"; this.TB_CatchRate.Size = new System.Drawing.Size(31, 20); @@ -478,7 +489,7 @@ private void InitializeComponent() // // TB_Stage // - this.TB_Stage.Location = new System.Drawing.Point(386, 288); + this.TB_Stage.Location = new System.Drawing.Point(405, 430); this.TB_Stage.Name = "TB_Stage"; this.TB_Stage.ReadOnly = true; this.TB_Stage.Size = new System.Drawing.Size(32, 20); @@ -488,7 +499,7 @@ private void InitializeComponent() // L_Stage // this.L_Stage.AutoSize = true; - this.L_Stage.Location = new System.Drawing.Point(301, 290); + this.L_Stage.Location = new System.Drawing.Point(320, 432); this.L_Stage.Name = "L_Stage"; this.L_Stage.Size = new System.Drawing.Size(85, 13); this.L_Stage.TabIndex = 476; @@ -497,7 +508,7 @@ private void InitializeComponent() // // TB_FormeCount // - this.TB_FormeCount.Location = new System.Drawing.Point(386, 330); + this.TB_FormeCount.Location = new System.Drawing.Point(405, 472); this.TB_FormeCount.Name = "TB_FormeCount"; this.TB_FormeCount.ReadOnly = true; this.TB_FormeCount.Size = new System.Drawing.Size(32, 20); @@ -507,7 +518,7 @@ private void InitializeComponent() // L_FormesCount // this.L_FormesCount.AutoSize = true; - this.L_FormesCount.Location = new System.Drawing.Point(311, 333); + this.L_FormesCount.Location = new System.Drawing.Point(330, 475); this.L_FormesCount.Name = "L_FormesCount"; this.L_FormesCount.Size = new System.Drawing.Size(75, 13); this.L_FormesCount.TabIndex = 474; @@ -516,7 +527,7 @@ private void InitializeComponent() // // TB_FormeSprite // - this.TB_FormeSprite.Location = new System.Drawing.Point(386, 309); + this.TB_FormeSprite.Location = new System.Drawing.Point(405, 451); this.TB_FormeSprite.Name = "TB_FormeSprite"; this.TB_FormeSprite.ReadOnly = true; this.TB_FormeSprite.Size = new System.Drawing.Size(32, 20); @@ -526,7 +537,7 @@ private void InitializeComponent() // L_FormeSprite // this.L_FormeSprite.AutoSize = true; - this.L_FormeSprite.Location = new System.Drawing.Point(317, 312); + this.L_FormeSprite.Location = new System.Drawing.Point(336, 454); this.L_FormeSprite.Name = "L_FormeSprite"; this.L_FormeSprite.Size = new System.Drawing.Size(69, 13); this.L_FormeSprite.TabIndex = 472; @@ -536,7 +547,7 @@ private void InitializeComponent() // L_CatchRate // this.L_CatchRate.AutoSize = true; - this.L_CatchRate.Location = new System.Drawing.Point(322, 47); + this.L_CatchRate.Location = new System.Drawing.Point(92, 543); this.L_CatchRate.Name = "L_CatchRate"; this.L_CatchRate.Size = new System.Drawing.Size(64, 13); this.L_CatchRate.TabIndex = 471; @@ -547,7 +558,7 @@ private void InitializeComponent() this.CB_Color.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; this.CB_Color.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.CB_Color.FormattingEnabled = true; - this.CB_Color.Location = new System.Drawing.Point(297, 255); + this.CB_Color.Location = new System.Drawing.Point(316, 356); this.CB_Color.Name = "CB_Color"; this.CB_Color.Size = new System.Drawing.Size(121, 21); this.CB_Color.TabIndex = 470; @@ -557,7 +568,7 @@ private void InitializeComponent() this.CB_EXPGroup.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; this.CB_EXPGroup.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.CB_EXPGroup.FormattingEnabled = true; - this.CB_EXPGroup.Location = new System.Drawing.Point(82, 256); + this.CB_EXPGroup.Location = new System.Drawing.Point(76, 357); this.CB_EXPGroup.Name = "CB_EXPGroup"; this.CB_EXPGroup.Size = new System.Drawing.Size(112, 21); this.CB_EXPGroup.TabIndex = 469; @@ -565,7 +576,7 @@ private void InitializeComponent() // L_Color // this.L_Color.AutoSize = true; - this.L_Color.Location = new System.Drawing.Point(263, 257); + this.L_Color.Location = new System.Drawing.Point(282, 358); this.L_Color.Name = "L_Color"; this.L_Color.Size = new System.Drawing.Size(34, 13); this.L_Color.TabIndex = 468; @@ -574,7 +585,7 @@ private void InitializeComponent() // L_EXPGrowth // this.L_EXPGrowth.AutoSize = true; - this.L_EXPGrowth.Location = new System.Drawing.Point(18, 259); + this.L_EXPGrowth.Location = new System.Drawing.Point(12, 360); this.L_EXPGrowth.Name = "L_EXPGrowth"; this.L_EXPGrowth.Size = new System.Drawing.Size(63, 13); this.L_EXPGrowth.TabIndex = 467; @@ -585,7 +596,7 @@ private void InitializeComponent() this.CB_Ability3.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; this.CB_Ability3.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.CB_Ability3.FormattingEnabled = true; - this.CB_Ability3.Location = new System.Drawing.Point(278, 135); + this.CB_Ability3.Location = new System.Drawing.Point(297, 205); this.CB_Ability3.Name = "CB_Ability3"; this.CB_Ability3.Size = new System.Drawing.Size(140, 21); this.CB_Ability3.TabIndex = 466; @@ -595,7 +606,7 @@ private void InitializeComponent() this.CB_Ability2.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; this.CB_Ability2.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.CB_Ability2.FormattingEnabled = true; - this.CB_Ability2.Location = new System.Drawing.Point(278, 113); + this.CB_Ability2.Location = new System.Drawing.Point(297, 183); this.CB_Ability2.Name = "CB_Ability2"; this.CB_Ability2.Size = new System.Drawing.Size(140, 21); this.CB_Ability2.TabIndex = 465; @@ -605,7 +616,7 @@ private void InitializeComponent() this.CB_Ability1.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; this.CB_Ability1.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.CB_Ability1.FormattingEnabled = true; - this.CB_Ability1.Location = new System.Drawing.Point(278, 91); + this.CB_Ability1.Location = new System.Drawing.Point(297, 161); this.CB_Ability1.Name = "CB_Ability1"; this.CB_Ability1.Size = new System.Drawing.Size(140, 21); this.CB_Ability1.TabIndex = 464; @@ -615,7 +626,7 @@ private void InitializeComponent() this.CB_EggGroup2.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; this.CB_EggGroup2.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.CB_EggGroup2.FormattingEnabled = true; - this.CB_EggGroup2.Location = new System.Drawing.Point(297, 206); + this.CB_EggGroup2.Location = new System.Drawing.Point(316, 297); this.CB_EggGroup2.Name = "CB_EggGroup2"; this.CB_EggGroup2.Size = new System.Drawing.Size(121, 21); this.CB_EggGroup2.TabIndex = 463; @@ -625,7 +636,7 @@ private void InitializeComponent() this.CB_EggGroup1.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; this.CB_EggGroup1.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.CB_EggGroup1.FormattingEnabled = true; - this.CB_EggGroup1.Location = new System.Drawing.Point(297, 184); + this.CB_EggGroup1.Location = new System.Drawing.Point(316, 275); this.CB_EggGroup1.Name = "CB_EggGroup1"; this.CB_EggGroup1.Size = new System.Drawing.Size(121, 21); this.CB_EggGroup1.TabIndex = 462; @@ -633,7 +644,7 @@ private void InitializeComponent() // L_EggGroup // this.L_EggGroup.AutoSize = true; - this.L_EggGroup.Location = new System.Drawing.Point(232, 187); + this.L_EggGroup.Location = new System.Drawing.Point(251, 278); this.L_EggGroup.Name = "L_EggGroup"; this.L_EggGroup.Size = new System.Drawing.Size(66, 13); this.L_EggGroup.TabIndex = 461; @@ -642,7 +653,7 @@ private void InitializeComponent() // L_Ability // this.L_Ability.AutoSize = true; - this.L_Ability.Location = new System.Drawing.Point(232, 95); + this.L_Ability.Location = new System.Drawing.Point(251, 165); this.L_Ability.Name = "L_Ability"; this.L_Ability.Size = new System.Drawing.Size(45, 13); this.L_Ability.TabIndex = 460; @@ -651,7 +662,7 @@ private void InitializeComponent() // TB_BaseExp // this.TB_BaseExp.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_BaseExp.Location = new System.Drawing.Point(163, 355); + this.TB_BaseExp.Location = new System.Drawing.Point(157, 497); this.TB_BaseExp.Mask = "000"; this.TB_BaseExp.Name = "TB_BaseExp"; this.TB_BaseExp.Size = new System.Drawing.Size(31, 20); @@ -661,7 +672,7 @@ private void InitializeComponent() // L_BaseEXP // this.L_BaseEXP.AutoSize = true; - this.L_BaseEXP.Location = new System.Drawing.Point(104, 359); + this.L_BaseEXP.Location = new System.Drawing.Point(98, 501); this.L_BaseEXP.Name = "L_BaseEXP"; this.L_BaseEXP.Size = new System.Drawing.Size(58, 13); this.L_BaseEXP.TabIndex = 458; @@ -671,7 +682,7 @@ private void InitializeComponent() // TB_HatchCycles // this.TB_HatchCycles.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_HatchCycles.Location = new System.Drawing.Point(163, 376); + this.TB_HatchCycles.Location = new System.Drawing.Point(157, 518); this.TB_HatchCycles.Mask = "000"; this.TB_HatchCycles.Name = "TB_HatchCycles"; this.TB_HatchCycles.Size = new System.Drawing.Size(31, 20); @@ -681,7 +692,7 @@ private void InitializeComponent() // L_HatchCycles // this.L_HatchCycles.AutoSize = true; - this.L_HatchCycles.Location = new System.Drawing.Point(89, 379); + this.L_HatchCycles.Location = new System.Drawing.Point(83, 521); this.L_HatchCycles.Name = "L_HatchCycles"; this.L_HatchCycles.Size = new System.Drawing.Size(73, 13); this.L_HatchCycles.TabIndex = 456; @@ -691,7 +702,7 @@ private void InitializeComponent() // TB_Friendship // this.TB_Friendship.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_Friendship.Location = new System.Drawing.Point(163, 313); + this.TB_Friendship.Location = new System.Drawing.Point(157, 455); this.TB_Friendship.Mask = "000"; this.TB_Friendship.Name = "TB_Friendship"; this.TB_Friendship.Size = new System.Drawing.Size(31, 20); @@ -701,7 +712,7 @@ private void InitializeComponent() // TB_Gender // this.TB_Gender.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_Gender.Location = new System.Drawing.Point(163, 292); + this.TB_Gender.Location = new System.Drawing.Point(157, 434); this.TB_Gender.Mask = "000"; this.TB_Gender.Name = "TB_Gender"; this.TB_Gender.Size = new System.Drawing.Size(31, 20); @@ -711,7 +722,7 @@ private void InitializeComponent() // L_Friendship // this.L_Friendship.AutoSize = true; - this.L_Friendship.Location = new System.Drawing.Point(104, 317); + this.L_Friendship.Location = new System.Drawing.Point(98, 459); this.L_Friendship.Name = "L_Friendship"; this.L_Friendship.Size = new System.Drawing.Size(58, 13); this.L_Friendship.TabIndex = 453; @@ -721,7 +732,7 @@ private void InitializeComponent() // L_Gender // this.L_Gender.AutoSize = true; - this.L_Gender.Location = new System.Drawing.Point(117, 295); + this.L_Gender.Location = new System.Drawing.Point(111, 437); this.L_Gender.Name = "L_Gender"; this.L_Gender.Size = new System.Drawing.Size(45, 13); this.L_Gender.TabIndex = 452; @@ -731,7 +742,7 @@ private void InitializeComponent() // L_Item1 // this.L_Item1.AutoSize = true; - this.L_Item1.Location = new System.Drawing.Point(197, 137); + this.L_Item1.Location = new System.Drawing.Point(191, 207); this.L_Item1.Name = "L_Item1"; this.L_Item1.Size = new System.Drawing.Size(21, 13); this.L_Item1.TabIndex = 451; @@ -740,7 +751,7 @@ private void InitializeComponent() // L_Item5 // this.L_Item5.AutoSize = true; - this.L_Item5.Location = new System.Drawing.Point(197, 115); + this.L_Item5.Location = new System.Drawing.Point(191, 185); this.L_Item5.Name = "L_Item5"; this.L_Item5.Size = new System.Drawing.Size(21, 13); this.L_Item5.TabIndex = 450; @@ -749,7 +760,7 @@ private void InitializeComponent() // L_Item50 // this.L_Item50.AutoSize = true; - this.L_Item50.Location = new System.Drawing.Point(197, 94); + this.L_Item50.Location = new System.Drawing.Point(191, 164); this.L_Item50.Name = "L_Item50"; this.L_Item50.Size = new System.Drawing.Size(27, 13); this.L_Item50.TabIndex = 449; @@ -760,7 +771,7 @@ private void InitializeComponent() this.CB_HeldItem3.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; this.CB_HeldItem3.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.CB_HeldItem3.FormattingEnabled = true; - this.CB_HeldItem3.Location = new System.Drawing.Point(54, 134); + this.CB_HeldItem3.Location = new System.Drawing.Point(48, 204); this.CB_HeldItem3.Name = "CB_HeldItem3"; this.CB_HeldItem3.Size = new System.Drawing.Size(140, 21); this.CB_HeldItem3.TabIndex = 448; @@ -770,7 +781,7 @@ private void InitializeComponent() this.CB_HeldItem2.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; this.CB_HeldItem2.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.CB_HeldItem2.FormattingEnabled = true; - this.CB_HeldItem2.Location = new System.Drawing.Point(54, 112); + this.CB_HeldItem2.Location = new System.Drawing.Point(48, 182); this.CB_HeldItem2.Name = "CB_HeldItem2"; this.CB_HeldItem2.Size = new System.Drawing.Size(140, 21); this.CB_HeldItem2.TabIndex = 447; @@ -780,7 +791,7 @@ private void InitializeComponent() this.CB_HeldItem1.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; this.CB_HeldItem1.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.CB_HeldItem1.FormattingEnabled = true; - this.CB_HeldItem1.Location = new System.Drawing.Point(54, 90); + this.CB_HeldItem1.Location = new System.Drawing.Point(48, 160); this.CB_HeldItem1.Name = "CB_HeldItem1"; this.CB_HeldItem1.Size = new System.Drawing.Size(140, 21); this.CB_HeldItem1.TabIndex = 446; @@ -788,7 +799,7 @@ private void InitializeComponent() // L_HeldItem // this.L_HeldItem.AutoSize = true; - this.L_HeldItem.Location = new System.Drawing.Point(18, 93); + this.L_HeldItem.Location = new System.Drawing.Point(12, 163); this.L_HeldItem.Name = "L_HeldItem"; this.L_HeldItem.Size = new System.Drawing.Size(35, 13); this.L_HeldItem.TabIndex = 445; @@ -799,7 +810,7 @@ private void InitializeComponent() this.CB_Type2.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; this.CB_Type2.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.CB_Type2.FormattingEnabled = true; - this.CB_Type2.Location = new System.Drawing.Point(65, 206); + this.CB_Type2.Location = new System.Drawing.Point(59, 297); this.CB_Type2.Name = "CB_Type2"; this.CB_Type2.Size = new System.Drawing.Size(129, 21); this.CB_Type2.TabIndex = 444; @@ -809,7 +820,7 @@ private void InitializeComponent() this.CB_Type1.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; this.CB_Type1.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.CB_Type1.FormattingEnabled = true; - this.CB_Type1.Location = new System.Drawing.Point(65, 184); + this.CB_Type1.Location = new System.Drawing.Point(59, 275); this.CB_Type1.Name = "CB_Type1"; this.CB_Type1.Size = new System.Drawing.Size(129, 21); this.CB_Type1.TabIndex = 443; @@ -817,7 +828,7 @@ private void InitializeComponent() // L_Type // this.L_Type.AutoSize = true; - this.L_Type.Location = new System.Drawing.Point(18, 187); + this.L_Type.Location = new System.Drawing.Point(12, 278); this.L_Type.Name = "L_Type"; this.L_Type.Size = new System.Drawing.Size(47, 13); this.L_Type.TabIndex = 442; @@ -826,7 +837,7 @@ private void InitializeComponent() // TB_SPEEVs // this.TB_SPEEVs.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_SPEEVs.Location = new System.Drawing.Point(273, 44); + this.TB_SPEEVs.Location = new System.Drawing.Point(267, 57); this.TB_SPEEVs.Mask = "0"; this.TB_SPEEVs.Name = "TB_SPEEVs"; this.TB_SPEEVs.Size = new System.Drawing.Size(31, 20); @@ -836,7 +847,7 @@ private void InitializeComponent() // TB_SPDEVs // this.TB_SPDEVs.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_SPDEVs.Location = new System.Drawing.Point(234, 44); + this.TB_SPDEVs.Location = new System.Drawing.Point(228, 57); this.TB_SPDEVs.Mask = "0"; this.TB_SPDEVs.Name = "TB_SPDEVs"; this.TB_SPDEVs.Size = new System.Drawing.Size(31, 20); @@ -846,7 +857,7 @@ private void InitializeComponent() // TB_SPAEVs // this.TB_SPAEVs.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_SPAEVs.Location = new System.Drawing.Point(195, 44); + this.TB_SPAEVs.Location = new System.Drawing.Point(189, 57); this.TB_SPAEVs.Mask = "0"; this.TB_SPAEVs.Name = "TB_SPAEVs"; this.TB_SPAEVs.Size = new System.Drawing.Size(31, 20); @@ -856,7 +867,7 @@ private void InitializeComponent() // TB_DEFEVs // this.TB_DEFEVs.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_DEFEVs.Location = new System.Drawing.Point(157, 44); + this.TB_DEFEVs.Location = new System.Drawing.Point(151, 57); this.TB_DEFEVs.Mask = "0"; this.TB_DEFEVs.Name = "TB_DEFEVs"; this.TB_DEFEVs.Size = new System.Drawing.Size(31, 20); @@ -866,7 +877,7 @@ private void InitializeComponent() // TB_ATKEVs // this.TB_ATKEVs.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_ATKEVs.Location = new System.Drawing.Point(119, 44); + this.TB_ATKEVs.Location = new System.Drawing.Point(113, 57); this.TB_ATKEVs.Mask = "0"; this.TB_ATKEVs.Name = "TB_ATKEVs"; this.TB_ATKEVs.Size = new System.Drawing.Size(31, 20); @@ -876,7 +887,7 @@ private void InitializeComponent() // TB_HPEVs // this.TB_HPEVs.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_HPEVs.Location = new System.Drawing.Point(80, 44); + this.TB_HPEVs.Location = new System.Drawing.Point(74, 57); this.TB_HPEVs.Mask = "0"; this.TB_HPEVs.Name = "TB_HPEVs"; this.TB_HPEVs.Size = new System.Drawing.Size(31, 20); @@ -886,7 +897,7 @@ private void InitializeComponent() // TB_BaseSPE // this.TB_BaseSPE.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_BaseSPE.Location = new System.Drawing.Point(273, 20); + this.TB_BaseSPE.Location = new System.Drawing.Point(267, 33); this.TB_BaseSPE.Mask = "000"; this.TB_BaseSPE.Name = "TB_BaseSPE"; this.TB_BaseSPE.Size = new System.Drawing.Size(31, 20); @@ -896,7 +907,7 @@ private void InitializeComponent() // TB_BaseSPD // this.TB_BaseSPD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_BaseSPD.Location = new System.Drawing.Point(234, 20); + this.TB_BaseSPD.Location = new System.Drawing.Point(228, 33); this.TB_BaseSPD.Mask = "000"; this.TB_BaseSPD.Name = "TB_BaseSPD"; this.TB_BaseSPD.Size = new System.Drawing.Size(31, 20); @@ -906,7 +917,7 @@ private void InitializeComponent() // TB_BaseSPA // this.TB_BaseSPA.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_BaseSPA.Location = new System.Drawing.Point(195, 20); + this.TB_BaseSPA.Location = new System.Drawing.Point(189, 33); this.TB_BaseSPA.Mask = "000"; this.TB_BaseSPA.Name = "TB_BaseSPA"; this.TB_BaseSPA.Size = new System.Drawing.Size(31, 20); @@ -916,7 +927,7 @@ private void InitializeComponent() // TB_BaseDEF // this.TB_BaseDEF.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_BaseDEF.Location = new System.Drawing.Point(157, 20); + this.TB_BaseDEF.Location = new System.Drawing.Point(151, 33); this.TB_BaseDEF.Mask = "000"; this.TB_BaseDEF.Name = "TB_BaseDEF"; this.TB_BaseDEF.Size = new System.Drawing.Size(31, 20); @@ -926,7 +937,7 @@ private void InitializeComponent() // TB_BaseATK // this.TB_BaseATK.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_BaseATK.Location = new System.Drawing.Point(119, 20); + this.TB_BaseATK.Location = new System.Drawing.Point(113, 33); this.TB_BaseATK.Mask = "000"; this.TB_BaseATK.Name = "TB_BaseATK"; this.TB_BaseATK.Size = new System.Drawing.Size(31, 20); @@ -936,7 +947,7 @@ private void InitializeComponent() // TB_BaseHP // this.TB_BaseHP.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_BaseHP.Location = new System.Drawing.Point(80, 20); + this.TB_BaseHP.Location = new System.Drawing.Point(74, 33); this.TB_BaseHP.Mask = "000"; this.TB_BaseHP.Name = "TB_BaseHP"; this.TB_BaseHP.Size = new System.Drawing.Size(31, 20); @@ -945,7 +956,7 @@ private void InitializeComponent() // // Label_HP // - this.Label_HP.Location = new System.Drawing.Point(77, 4); + this.Label_HP.Location = new System.Drawing.Point(71, 17); this.Label_HP.Name = "Label_HP"; this.Label_HP.Size = new System.Drawing.Size(31, 13); this.Label_HP.TabIndex = 424; @@ -954,7 +965,7 @@ private void InitializeComponent() // // Label_ATK // - this.Label_ATK.Location = new System.Drawing.Point(119, 4); + this.Label_ATK.Location = new System.Drawing.Point(113, 17); this.Label_ATK.Name = "Label_ATK"; this.Label_ATK.Size = new System.Drawing.Size(31, 13); this.Label_ATK.TabIndex = 425; @@ -963,7 +974,7 @@ private void InitializeComponent() // // Label_DEF // - this.Label_DEF.Location = new System.Drawing.Point(157, 4); + this.Label_DEF.Location = new System.Drawing.Point(151, 17); this.Label_DEF.Name = "Label_DEF"; this.Label_DEF.Size = new System.Drawing.Size(31, 13); this.Label_DEF.TabIndex = 426; @@ -972,7 +983,7 @@ private void InitializeComponent() // // Label_SPA // - this.Label_SPA.Location = new System.Drawing.Point(195, 4); + this.Label_SPA.Location = new System.Drawing.Point(189, 17); this.Label_SPA.Name = "Label_SPA"; this.Label_SPA.Size = new System.Drawing.Size(31, 13); this.Label_SPA.TabIndex = 427; @@ -981,7 +992,7 @@ private void InitializeComponent() // // Label_SPD // - this.Label_SPD.Location = new System.Drawing.Point(234, 4); + this.Label_SPD.Location = new System.Drawing.Point(228, 17); this.Label_SPD.Name = "Label_SPD"; this.Label_SPD.Size = new System.Drawing.Size(31, 13); this.Label_SPD.TabIndex = 428; @@ -990,7 +1001,7 @@ private void InitializeComponent() // // Label_SPE // - this.Label_SPE.Location = new System.Drawing.Point(271, 4); + this.Label_SPE.Location = new System.Drawing.Point(265, 17); this.Label_SPE.Name = "Label_SPE"; this.Label_SPE.Size = new System.Drawing.Size(31, 13); this.Label_SPE.TabIndex = 429; @@ -1000,7 +1011,7 @@ private void InitializeComponent() // L_EVYield // this.L_EVYield.AutoSize = true; - this.L_EVYield.Location = new System.Drawing.Point(16, 47); + this.L_EVYield.Location = new System.Drawing.Point(10, 60); this.L_EVYield.Name = "L_EVYield"; this.L_EVYield.Size = new System.Drawing.Size(50, 13); this.L_EVYield.TabIndex = 423; @@ -1009,7 +1020,7 @@ private void InitializeComponent() // L_BaseStats // this.L_BaseStats.AutoSize = true; - this.L_BaseStats.Location = new System.Drawing.Point(16, 23); + this.L_BaseStats.Location = new System.Drawing.Point(10, 36); this.L_BaseStats.Name = "L_BaseStats"; this.L_BaseStats.Size = new System.Drawing.Size(61, 13); this.L_BaseStats.TabIndex = 422; @@ -1018,7 +1029,7 @@ private void InitializeComponent() // L_ZMove // this.L_ZMove.AutoSize = true; - this.L_ZMove.Location = new System.Drawing.Point(250, 466); + this.L_ZMove.Location = new System.Drawing.Point(269, 608); this.L_ZMove.Name = "L_ZMove"; this.L_ZMove.Size = new System.Drawing.Size(47, 13); this.L_ZMove.TabIndex = 489; @@ -1027,7 +1038,7 @@ private void InitializeComponent() // L_BaseMove // this.L_BaseMove.AutoSize = true; - this.L_BaseMove.Location = new System.Drawing.Point(233, 445); + this.L_BaseMove.Location = new System.Drawing.Point(252, 587); this.L_BaseMove.Name = "L_BaseMove"; this.L_BaseMove.Size = new System.Drawing.Size(64, 13); this.L_BaseMove.TabIndex = 487; @@ -1036,7 +1047,7 @@ private void InitializeComponent() // L_ZCrystal // this.L_ZCrystal.AutoSize = true; - this.L_ZCrystal.Location = new System.Drawing.Point(246, 423); + this.L_ZCrystal.Location = new System.Drawing.Point(265, 565); this.L_ZCrystal.Name = "L_ZCrystal"; this.L_ZCrystal.Size = new System.Drawing.Size(51, 13); this.L_ZCrystal.TabIndex = 486; @@ -1051,7 +1062,7 @@ private void InitializeComponent() this.Tab_Learn.Location = new System.Drawing.Point(4, 22); this.Tab_Learn.Name = "Tab_Learn"; this.Tab_Learn.Padding = new System.Windows.Forms.Padding(3); - this.Tab_Learn.Size = new System.Drawing.Size(526, 515); + this.Tab_Learn.Size = new System.Drawing.Size(526, 715); this.Tab_Learn.TabIndex = 1; this.Tab_Learn.Text = "Learnset"; this.Tab_Learn.UseVisualStyleBackColor = true; @@ -1072,7 +1083,7 @@ private void InitializeComponent() this.CLB_TM.FormattingEnabled = true; this.CLB_TM.Location = new System.Drawing.Point(284, 34); this.CLB_TM.Name = "CLB_TM"; - this.CLB_TM.Size = new System.Drawing.Size(147, 469); + this.CLB_TM.Size = new System.Drawing.Size(147, 664); this.CLB_TM.TabIndex = 6; // // L_LevelUp @@ -1093,7 +1104,7 @@ private void InitializeComponent() this.dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgv.Location = new System.Drawing.Point(0, 34); this.dgv.Name = "dgv"; - this.dgv.Size = new System.Drawing.Size(282, 469); + this.dgv.Size = new System.Drawing.Size(282, 669); this.dgv.TabIndex = 1; // // Tab_Evo @@ -1101,7 +1112,7 @@ private void InitializeComponent() this.Tab_Evo.Controls.Add(this.flowLayoutPanel1); this.Tab_Evo.Location = new System.Drawing.Point(4, 22); this.Tab_Evo.Name = "Tab_Evo"; - this.Tab_Evo.Size = new System.Drawing.Size(526, 515); + this.Tab_Evo.Size = new System.Drawing.Size(526, 715); this.Tab_Evo.TabIndex = 2; this.Tab_Evo.Text = "Evolve"; this.Tab_Evo.UseVisualStyleBackColor = true; @@ -1111,7 +1122,7 @@ private void InitializeComponent() this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 0); this.flowLayoutPanel1.Name = "flowLayoutPanel1"; - this.flowLayoutPanel1.Size = new System.Drawing.Size(526, 515); + this.flowLayoutPanel1.Size = new System.Drawing.Size(526, 715); this.flowLayoutPanel1.TabIndex = 0; // // Tab_Extra @@ -1121,7 +1132,7 @@ private void InitializeComponent() this.Tab_Extra.Location = new System.Drawing.Point(4, 22); this.Tab_Extra.Name = "Tab_Extra"; this.Tab_Extra.Padding = new System.Windows.Forms.Padding(3); - this.Tab_Extra.Size = new System.Drawing.Size(526, 515); + this.Tab_Extra.Size = new System.Drawing.Size(526, 715); this.Tab_Extra.TabIndex = 3; this.Tab_Extra.Text = "Enhancements"; this.Tab_Extra.UseVisualStyleBackColor = true; @@ -1327,22 +1338,11 @@ private void InitializeComponent() this.CB_Species.TabIndex = 2; this.CB_Species.SelectedIndexChanged += new System.EventHandler(this.UpdateIndex); // - // PB_MonSprite - // - this.PB_MonSprite.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.PB_MonSprite.BackColor = System.Drawing.Color.Transparent; - this.PB_MonSprite.Location = new System.Drawing.Point(446, 26); - this.PB_MonSprite.Name = "PB_MonSprite"; - this.PB_MonSprite.Size = new System.Drawing.Size(80, 60); - this.PB_MonSprite.TabIndex = 91; - this.PB_MonSprite.TabStop = false; - // // PokeDataUI // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(534, 541); - this.Controls.Add(this.PB_MonSprite); + this.ClientSize = new System.Drawing.Size(534, 766); this.Controls.Add(this.CB_Species); this.Controls.Add(this.B_Save); this.Controls.Add(this.tabControl1); @@ -1354,6 +1354,7 @@ private void InitializeComponent() this.tabControl1.ResumeLayout(false); this.Tab_Personal.ResumeLayout(false); this.Tab_Personal.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.PB_MonSprite)).EndInit(); this.Tab_Learn.ResumeLayout(false); this.Tab_Learn.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.dgv)).EndInit(); @@ -1365,7 +1366,6 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.NUD_AmpEXP)).EndInit(); this.Tab_RLearn.ResumeLayout(false); this.Tab_REvo.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.PB_MonSprite)).EndInit(); this.ResumeLayout(false); } diff --git a/pkNX.WinForms/Subforms/PokeDataUI.cs b/pkNX.WinForms/Subforms/PokeDataUI.cs index e1698198..2b51c171 100644 --- a/pkNX.WinForms/Subforms/PokeDataUI.cs +++ b/pkNX.WinForms/Subforms/PokeDataUI.cs @@ -203,9 +203,20 @@ private void LoadIndex(int index) LoadEvolutions(Editor.Evolve[index]); if (Editor.Mega != null) LoadMegas(Editor.Mega[index], spec); - var img = SpriteUtil.GetSprite(spec, form, 0, 0, false, false); - img = ImageUtil.ResizeImage((Bitmap)img, PB_MonSprite.Width, PB_MonSprite.Height); - PB_MonSprite.Image = img; + Bitmap rawImg = (Bitmap)SpriteUtil.GetSprite(spec, form, 0, 0, false, false); + Bitmap bigImg = new Bitmap(rawImg.Width * 2, rawImg.Height * 2); + for (int x = 0; x < rawImg.Width; x++) + { + for (int y = 0; y < rawImg.Height; y++) + { + Color c = rawImg.GetPixel(x, y); + bigImg.SetPixel(2 * x, 2 * y, c); + bigImg.SetPixel((2 * x) + 1, 2 * y, c); + bigImg.SetPixel(2 * x, (2 * y) + 1, c); + bigImg.SetPixel((2 * x) + 1, (2 * y) + 1, c); + } + } + PB_MonSprite.Image = bigImg; } private void SaveCurrent() diff --git a/pkNX.WinForms/Subforms/SSWE.Designer.cs b/pkNX.WinForms/Subforms/SSWE.Designer.cs index 7355a0b3..2ef3692b 100644 --- a/pkNX.WinForms/Subforms/SSWE.Designer.cs +++ b/pkNX.WinForms/Subforms/SSWE.Designer.cs @@ -32,6 +32,7 @@ private void InitializeComponent() this.CB_Location = new System.Windows.Forms.ComboBox(); this.L_Hash = new System.Windows.Forms.Label(); this.B_Save = new System.Windows.Forms.Button(); + this.L_Type = new System.Windows.Forms.Label(); this.TC_Types = new System.Windows.Forms.TabControl(); this.Tab_Normal = new System.Windows.Forms.TabPage(); this.Tab_Overcast = new System.Windows.Forms.TabPage(); @@ -48,13 +49,14 @@ private void InitializeComponent() this.CHK_FillEmpty = new System.Windows.Forms.CheckBox(); this.B_RandAll = new System.Windows.Forms.Button(); this.PG_Species = new System.Windows.Forms.PropertyGrid(); - this.L_Type = new System.Windows.Forms.Label(); + this.NUD_LevelBoost = new System.Windows.Forms.NumericUpDown(); + this.CHK_Level = new System.Windows.Forms.CheckBox(); this.SL_0 = new pkNX.WinForms.EncounterList8(); this.SL_1 = new pkNX.WinForms.EncounterList8(); this.SL_2 = new pkNX.WinForms.EncounterList8(); this.SL_3 = new pkNX.WinForms.EncounterList8(); - this.SL_5 = new pkNX.WinForms.EncounterList8(); this.SL_4 = new pkNX.WinForms.EncounterList8(); + this.SL_5 = new pkNX.WinForms.EncounterList8(); this.SL_6 = new pkNX.WinForms.EncounterList8(); this.SL_7 = new pkNX.WinForms.EncounterList8(); this.SL_8 = new pkNX.WinForms.EncounterList8(); @@ -77,6 +79,7 @@ private void InitializeComponent() this.ST_Shaking.SuspendLayout(); this.ST_Fishing.SuspendLayout(); this.Tab_Rand.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_LevelBoost)).BeginInit(); this.SuspendLayout(); // // splitContainer1 @@ -134,6 +137,17 @@ private void InitializeComponent() this.B_Save.UseVisualStyleBackColor = true; this.B_Save.Click += new System.EventHandler(this.B_Save_Click); // + // L_Type + // + this.L_Type.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.L_Type.AutoSize = true; + this.L_Type.ForeColor = System.Drawing.Color.Red; + this.L_Type.Location = new System.Drawing.Point(2, 624); + this.L_Type.Name = "L_Type"; + this.L_Type.Size = new System.Drawing.Size(41, 13); + this.L_Type.TabIndex = 12; + this.L_Type.Text = "Source"; + // // TC_Types // this.TC_Types.Alignment = System.Windows.Forms.TabAlignment.Left; @@ -273,6 +287,8 @@ private void InitializeComponent() // // Tab_Rand // + this.Tab_Rand.Controls.Add(this.NUD_LevelBoost); + this.Tab_Rand.Controls.Add(this.CHK_Level); this.Tab_Rand.Controls.Add(this.CHK_FillEmpty); this.Tab_Rand.Controls.Add(this.B_RandAll); this.Tab_Rand.Controls.Add(this.PG_Species); @@ -314,16 +330,43 @@ private void InitializeComponent() this.PG_Species.TabIndex = 6; this.PG_Species.ToolbarVisible = false; // - // L_Type + // NUD_LevelBoost // - this.L_Type.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.L_Type.AutoSize = true; - this.L_Type.ForeColor = System.Drawing.Color.Red; - this.L_Type.Location = new System.Drawing.Point(2, 624); - this.L_Type.Name = "L_Type"; - this.L_Type.Size = new System.Drawing.Size(41, 13); - this.L_Type.TabIndex = 12; - this.L_Type.Text = "Source"; + this.NUD_LevelBoost.DecimalPlaces = 2; + this.NUD_LevelBoost.Increment = new decimal(new int[] { + 5, + 0, + 0, + 131072}); + this.NUD_LevelBoost.Location = new System.Drawing.Point(298, 15); + this.NUD_LevelBoost.Maximum = new decimal(new int[] { + 3, + 0, + 0, + 0}); + this.NUD_LevelBoost.Minimum = new decimal(new int[] { + 1, + 0, + 0, + 65536}); + this.NUD_LevelBoost.Name = "NUD_LevelBoost"; + this.NUD_LevelBoost.Size = new System.Drawing.Size(43, 20); + this.NUD_LevelBoost.TabIndex = 303; + this.NUD_LevelBoost.Value = new decimal(new int[] { + 1, + 0, + 0, + 0}); + // + // CHK_Level + // + this.CHK_Level.AutoSize = true; + this.CHK_Level.Location = new System.Drawing.Point(169, 16); + this.CHK_Level.Name = "CHK_Level"; + this.CHK_Level.Size = new System.Drawing.Size(130, 17); + this.CHK_Level.TabIndex = 302; + this.CHK_Level.Text = "Multiply PKM Level by"; + this.CHK_Level.UseVisualStyleBackColor = true; // // SL_0 // @@ -361,15 +404,6 @@ private void InitializeComponent() this.SL_3.Size = new System.Drawing.Size(349, 632); this.SL_3.TabIndex = 1; // - // SL_5 - // - this.SL_5.Dock = System.Windows.Forms.DockStyle.Fill; - this.SL_5.Location = new System.Drawing.Point(0, 0); - this.SL_5.Margin = new System.Windows.Forms.Padding(0); - this.SL_5.Name = "SL_5"; - this.SL_5.Size = new System.Drawing.Size(349, 632); - this.SL_5.TabIndex = 1; - // // SL_4 // this.SL_4.Dock = System.Windows.Forms.DockStyle.Fill; @@ -379,6 +413,15 @@ private void InitializeComponent() this.SL_4.Size = new System.Drawing.Size(349, 632); this.SL_4.TabIndex = 2; // + // SL_5 + // + this.SL_5.Dock = System.Windows.Forms.DockStyle.Fill; + this.SL_5.Location = new System.Drawing.Point(0, 0); + this.SL_5.Margin = new System.Windows.Forms.Padding(0); + this.SL_5.Name = "SL_5"; + this.SL_5.Size = new System.Drawing.Size(349, 632); + this.SL_5.TabIndex = 1; + // // SL_6 // this.SL_6.Dock = System.Windows.Forms.DockStyle.Fill; @@ -453,6 +496,8 @@ private void InitializeComponent() this.ST_Shaking.ResumeLayout(false); this.ST_Fishing.ResumeLayout(false); this.Tab_Rand.ResumeLayout(false); + this.Tab_Rand.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_LevelBoost)).EndInit(); this.ResumeLayout(false); } @@ -490,5 +535,7 @@ private void InitializeComponent() private System.Windows.Forms.Button B_RandAll; private System.Windows.Forms.PropertyGrid PG_Species; private System.Windows.Forms.Label L_Type; + private System.Windows.Forms.NumericUpDown NUD_LevelBoost; + private System.Windows.Forms.CheckBox CHK_Level; } } \ No newline at end of file diff --git a/pkNX.WinForms/Subforms/SSWE.cs b/pkNX.WinForms/Subforms/SSWE.cs index 1df053c8..a443faa0 100644 --- a/pkNX.WinForms/Subforms/SSWE.cs +++ b/pkNX.WinForms/Subforms/SSWE.cs @@ -152,12 +152,12 @@ private void B_RandAll_Click(object sender, EventArgs e) .Where(z => !z.Present).Select(z => z.Species).ToArray(); rand.Initialize(settings, ban); - RandomizeWild(rand, CHK_FillEmpty.Checked); + RandomizeWild(rand, CHK_FillEmpty.Checked, CHK_Level.Checked); LoadEntry(entry); System.Media.SystemSounds.Asterisk.Play(); } - private void RandomizeWild(SpeciesRandomizer rand, bool fill) + private void RandomizeWild(SpeciesRandomizer rand, bool fill, bool boost) { var pt = ROM.Data.PersonalData; var fr = new FormRandomizer(pt); @@ -165,6 +165,11 @@ private void RandomizeWild(SpeciesRandomizer rand, bool fill) { foreach (var sub in area.SubTables) { + if (boost) + { + sub.LevelMin = Legal.GetModifiedLevel(sub.LevelMin, (double)NUD_LevelBoost.Value); + sub.LevelMax = Legal.GetModifiedLevel(sub.LevelMax, (double)NUD_LevelBoost.Value); + } ApplyRand(sub.Slots); } }