diff --git a/PKHeX.Core/Editing/BallRandomizer.cs b/PKHeX.Core/Editing/BallRandomizer.cs index f99aa4b5b..a6981bf9a 100644 --- a/PKHeX.Core/Editing/BallRandomizer.cs +++ b/PKHeX.Core/Editing/BallRandomizer.cs @@ -87,8 +87,8 @@ private static IEnumerable GetBallList(int ball) private static IEnumerable GetBallListFromColor(PKM pkm) { - // Fetch with latest-gen personal info; Gen1/2 don't store color - var pi = PKX.Personal.GetFormeEntry(pkm.Species, pkm.AltForm); + // Gen1/2 don't store color in personal info + var pi = pkm.Format >= 3 ? pkm.PersonalInfo : PersonalTable.USUM.GetFormeEntry(pkm.Species, 0); var color = (PersonalColor)pi.Color; var balls = BallColors[color]; var currentBall = (Ball)pkm.Ball; diff --git a/PKHeX.Core/Editing/CommonEdits.cs b/PKHeX.Core/Editing/CommonEdits.cs index 3a48a3bb0..82c732dd4 100644 --- a/PKHeX.Core/Editing/CommonEdits.cs +++ b/PKHeX.Core/Editing/CommonEdits.cs @@ -168,7 +168,9 @@ public static bool SetUnshiny(this PKM pk) public static void SetNature(this PKM pk, int nature) { var value = Math.Min((int)Nature.Quirky, Math.Max((int)Nature.Hardy, nature)); - if (pk.Format <= 4) + if (pk.Format >= 8) + pk.StatNature = value; + else if (pk.Format <= 4) pk.SetPIDNature(value); else pk.Nature = value; @@ -302,8 +304,8 @@ public static IReadOnlyList GetSuggestedRelearnMoves(this LegalityAnalysis return m; var encounter = legal.GetSuggestedMetInfo(); - if (encounter?.Relearn?.Length > 0) - m = encounter.Relearn; + if (encounter is IRelearn r && r.Relearn.Length > 0) + m = r.Relearn; return m; } @@ -671,6 +673,7 @@ public static int[] ToggleMarking(this PKM pk, int index, int[] markings) pk.Markings = markings; break; case 7: // 0 (none) | 1 (blue) | 2 (pink) + case 8: markings[index] = (markings[index] + 1) % 3; // cycle 0->1->2->0... pk.Markings = markings; break; diff --git a/PKHeX.Core/Editing/PKM/PKMSummary.cs b/PKHeX.Core/Editing/PKM/PKMSummary.cs index fc794c7c8..21a37f2e6 100644 --- a/PKHeX.Core/Editing/PKM/PKMSummary.cs +++ b/PKHeX.Core/Editing/PKM/PKMSummary.cs @@ -16,7 +16,7 @@ public class PKMSummary // do NOT seal, allow inheritance public string? Position => pkm.Identifier; public string Nickname => pkm.Nickname; public string Species => Get(Strings.specieslist, pkm.Species); - public string Nature => Get(Strings.natures, pkm.Nature); + public string Nature => Get(Strings.natures, pkm.StatNature); public string Gender => Get(GenderSymbols, pkm.Gender); public string ESV => pkm.PSV.ToString("0000"); public string HP_Type => Get(Strings.types, pkm.HPType + 1); diff --git a/PKHeX.Core/Editing/RibbonApplicator.cs b/PKHeX.Core/Editing/RibbonApplicator.cs new file mode 100644 index 000000000..5efb5a8bd --- /dev/null +++ b/PKHeX.Core/Editing/RibbonApplicator.cs @@ -0,0 +1,211 @@ +using System.Collections.Generic; +using System.Linq; + +namespace PKHeX.Core +{ + /// + /// Logic for applying ribbons. + /// + public static class RibbonApplicator + { + private static List GetAllRibbonNames(PKM pkm) => RibbonInfo.GetRibbonInfo(pkm).Select(z => z.Name).ToList(); + + /// + /// Gets a list of valid ribbons for the . + /// + /// Entity to fetch the list for. + /// All ribbon names. + /// List of all valid ribbon names. + public static IReadOnlyList GetValidRibbons(PKM pkm, IList allRibbons) + { + var pk = pkm.Clone(); + return SetAllValidRibbons(allRibbons, pk); + } + + /// + /// Gets a list of valid ribbons for the . + /// + /// Entity to fetch the list for. + /// List of all valid ribbon names. + public static IReadOnlyList GetValidRibbons(PKM pkm) + { + var names = GetAllRibbonNames(pkm); + return GetValidRibbons(pkm, names); + } + + /// + /// Gets a list of valid ribbons for the that can be removed. + /// + /// Entity to fetch the list for. + /// All ribbon names. + /// List of all removable ribbon names. + public static IReadOnlyList GetRemovableRibbons(PKM pkm, IList allRibbons) + { + var pk = pkm.Clone(); + return RemoveAllValidRibbons(allRibbons, pk); + } + + /// + /// Gets a list of valid ribbons for the that can be removed. + /// + /// Entity to fetch the list for. + /// List of all removable ribbon names. + public static IReadOnlyList GetRemovableRibbons(PKM pkm) + { + var names = GetAllRibbonNames(pkm); + return GetRemovableRibbons(pkm, names); + } + + /// + /// Sets all valid ribbons to the . + /// + /// Entity to set ribbons for. + /// True if any ribbons were applied. + public static bool SetAllValidRibbons(PKM pkm) + { + var ribNames = GetAllRibbonNames(pkm); + return SetAllValidRibbons(pkm, ribNames); + } + + /// + /// Sets all valid ribbons to the . + /// + /// Entity to set ribbons for. + /// Ribbon names to try setting. + /// True if any ribbons were applied. + public static bool SetAllValidRibbons(PKM pkm, List ribNames) + { + var list = SetAllValidRibbons(ribNames, pkm); + return list.Count != 0; + } + + private static IReadOnlyList SetAllValidRibbons(IList allRibbons, PKM pk) + { + var la = new LegalityAnalysis(pk); + var valid = new List(); + + while (TryApplyAllRibbons(pk, la, allRibbons, valid) != 0) + { + // Repeat the operation until no more ribbons are set. + } + + return valid; + } + + /// + /// Sets all valid ribbons to the . + /// + /// Entity to set ribbons for. + /// True if any ribbons were removed. + public static bool RemoveAllValidRibbons(PKM pkm) + { + var ribNames = GetAllRibbonNames(pkm); + return RemoveAllValidRibbons(pkm, ribNames); + } + + /// + /// Sets all valid ribbons to the . + /// + /// Entity to set ribbons for. + /// Ribbon names to try setting. + /// True if any ribbons were removed. + public static bool RemoveAllValidRibbons(PKM pkm, List ribNames) + { + var list = RemoveAllValidRibbons(ribNames, pkm); + return list.Count != 0; + } + + private static IReadOnlyList RemoveAllValidRibbons(IList allRibbons, PKM pk) + { + var la = new LegalityAnalysis(pk); + var valid = new List(); + + while (TryRemoveAllRibbons(pk, la, allRibbons, valid) != 0) + { + // Repeat the operation until no more ribbons are set. + } + + return valid; + } + + private static int TryApplyAllRibbons(PKM pk, LegalityAnalysis la, IList allRibbons, ICollection valid) + { + int applied = 0; + for (int i = 0; i < allRibbons.Count;) + { + la.ResetParse(); + var rib = allRibbons[i]; + var success = TryApplyRibbon(pk, la, rib); + if (success) + { + ++applied; + allRibbons.RemoveAt(i); + valid.Add(rib); + } + else + { + RemoveRibbon(pk, rib); + ++i; + } + } + + return applied; + } + + private static int TryRemoveAllRibbons(PKM pk, LegalityAnalysis la, IList allRibbons, ICollection valid) + { + int removed = 0; + for (int i = 0; i < allRibbons.Count;) + { + la.ResetParse(); + var rib = allRibbons[i]; + var success = TryRemoveRibbon(pk, la, rib); + if (success) + { + ++removed; + allRibbons.RemoveAt(i); + valid.Add(rib); + } + else + { + SetRibbonValue(pk, rib, 1); + ++i; + } + } + + return removed; + } + + private static void RemoveRibbon(PKM pk, string rib) => SetRibbonValue(pk, rib, 0); + + private static bool TryRemoveRibbon(PKM pk, LegalityAnalysis la, string rib) + { + RemoveRibbon(pk, rib); + LegalityAnalysis.Ribbon.Verify(la); + return la.Results.All(z => z.Valid); + } + + private static bool TryApplyRibbon(PKM pk, LegalityAnalysis la, string rib) + { + SetRibbonValue(pk, rib, 1); + LegalityAnalysis.Ribbon.Verify(la); + return la.Results.All(z => z.Valid); + } + + private static void SetRibbonValue(PKM pk, string rib, int value) + { + switch (rib) + { + case nameof(PK7.RibbonCountMemoryBattle): + ReflectUtil.SetValue(pk, rib, value * (pk.Gen4 ? 6 : 8)); + break; + case nameof(PK7.RibbonCountMemoryContest): + ReflectUtil.SetValue(pk, rib, value * (pk.Gen4 ? 20 : 40)); + break; + default: + ReflectUtil.SetValue(pk, rib, value != 0); + break; + } + } + } +} \ No newline at end of file diff --git a/PKHeX.Core/Editing/Saves/Editors/SaveDataEditor.cs b/PKHeX.Core/Editing/Saves/Editors/SaveDataEditor.cs index 45af7f6de..1f79b8999 100644 --- a/PKHeX.Core/Editing/Saves/Editors/SaveDataEditor.cs +++ b/PKHeX.Core/Editing/Saves/Editors/SaveDataEditor.cs @@ -56,12 +56,12 @@ public sealed class FakeSaveFile : SaveFile public override string Extension => string.Empty; public override bool ChecksumsValid => true; public override string ChecksumInfo => string.Empty; - public override int Generation => PKX.Generation; + public override int Generation => 3; public override string GetString(byte[] data, int offset, int length) => string.Empty; public override byte[] SetString(string value, int maxLength, int PadToSize = 0, ushort PadWith = 0) => Array.Empty(); - public override PersonalTable Personal => PKX.Personal; + public override PersonalTable Personal => PersonalTable.RS; public override int MaxEV => 0; - public override IReadOnlyList HeldItems => Legal.HeldItems_GG; + public override IReadOnlyList HeldItems => Legal.HeldItems_RS; public override int GetBoxOffset(int box) => -1; public override string GetBoxName(int box) => $"Box {box:00}"; public override void SetBoxName(int box, string value) { } @@ -77,10 +77,10 @@ public sealed class FakeSaveFile : SaveFile public override int GetPartyOffset(int slot) => -1; protected override void SetChecksums() { } - public override Type PKMType => typeof(PKM); + public override Type PKMType => typeof(PK3); protected override PKM GetPKM(byte[] data) => BlankPKM; protected override byte[] DecryptPKM(byte[] data) => data; - public override PKM BlankPKM => new PK7(); + public override PKM BlankPKM => new PK3(); public override int SIZE_STORED => 0; protected override int SIZE_PARTY => 0; } diff --git a/PKHeX.Core/Editing/Saves/Slots/Extensions.cs b/PKHeX.Core/Editing/Saves/Slots/Extensions.cs index c33716b4e..ab2fc0252 100644 --- a/PKHeX.Core/Editing/Saves/Slots/Extensions.cs +++ b/PKHeX.Core/Editing/Saves/Slots/Extensions.cs @@ -11,8 +11,6 @@ public static IReadOnlyList GetAllPKM(this SaveFile sav) pkms.AddRange(sav.BoxData); if (sav.HasParty) pkms.AddRange(sav.PartyData); - if (sav.HasBattleBox) - pkms.AddRange(sav.BattleBoxData); var extra = sav.GetExtraPKM(); pkms.AddRange(extra); @@ -57,6 +55,7 @@ private static List GetExtraSlotsUnsafe(SaveFile sav, bool all) SAV6XY xy => GetExtraSlots6XY(xy), SAV6AO xy => GetExtraSlots6AO(xy), SAV7 sav7 => GetExtraSlots7(sav7, all), + SAV8SWSH ss => GetExtraSlots8(ss), _ => None }; } @@ -65,7 +64,7 @@ private static List GetExtraSlots2(SAV2 sav) { return new List { - new SlotInfoMisc(0, sav.GetDaycareSlotOffset(0, 2)) {Type = StorageSlotType.Daycare } // egg + new SlotInfoMisc(sav.Data, 0, sav.GetDaycareSlotOffset(0, 2)) {Type = StorageSlotType.Daycare } // egg }; } @@ -75,7 +74,7 @@ private static List GetExtraSlots3(SAV3 sav) return None; return new List { - new SlotInfoMisc(0, sav.GetBlockOffset(4) + 0xE18) {Type = StorageSlotType.Daycare } + new SlotInfoMisc(sav.Data, 0, sav.GetBlockOffset(4) + 0xE18) {Type = StorageSlotType.Daycare } }; } @@ -83,7 +82,7 @@ private static List GetExtraSlots4(SAV4 sav) { return new List { - new SlotInfoMisc(0, sav.GTS) {Type = StorageSlotType.GTS }, + new SlotInfoMisc(sav.Data, 0, sav.GTS) {Type = StorageSlotType.GTS }, }; } @@ -91,8 +90,15 @@ private static List GetExtraSlots5(SAV5 sav) { return new List { - new SlotInfoMisc(0, sav.GTS) {Type = StorageSlotType.GTS}, - new SlotInfoMisc(0, sav.Fused) {Type = StorageSlotType.Fused} + new SlotInfoMisc(sav.Data, 0, sav.GTS) {Type = StorageSlotType.GTS}, + new SlotInfoMisc(sav.Data, 0, sav.Fused) {Type = StorageSlotType.Fused}, + + new SlotInfoMisc(sav.Data, 0, sav.GetBattleBoxSlot(0)) {Type = StorageSlotType.BattleBox}, + new SlotInfoMisc(sav.Data, 1, sav.GetBattleBoxSlot(1)) {Type = StorageSlotType.BattleBox}, + new SlotInfoMisc(sav.Data, 2, sav.GetBattleBoxSlot(2)) {Type = StorageSlotType.BattleBox}, + new SlotInfoMisc(sav.Data, 3, sav.GetBattleBoxSlot(3)) {Type = StorageSlotType.BattleBox}, + new SlotInfoMisc(sav.Data, 4, sav.GetBattleBoxSlot(4)) {Type = StorageSlotType.BattleBox}, + new SlotInfoMisc(sav.Data, 5, sav.GetBattleBoxSlot(5)) {Type = StorageSlotType.BattleBox}, }; } @@ -100,9 +106,16 @@ private static List GetExtraSlots6XY(SAV6XY sav) { return new List { - new SlotInfoMisc(0, sav.GTS) {Type = StorageSlotType.GTS}, - new SlotInfoMisc(0, sav.Fused) {Type = StorageSlotType.Fused}, - new SlotInfoMisc(0, sav.SUBE) {Type = StorageSlotType.Misc}, + new SlotInfoMisc(sav.Data, 0, sav.GTS) {Type = StorageSlotType.GTS}, + new SlotInfoMisc(sav.Data, 0, sav.Fused) {Type = StorageSlotType.Fused}, + new SlotInfoMisc(sav.Data, 0, sav.SUBE) {Type = StorageSlotType.Misc}, + + new SlotInfoMisc(sav.Data, 0, sav.GetBattleBoxSlot(0)) {Type = StorageSlotType.BattleBox}, + new SlotInfoMisc(sav.Data, 1, sav.GetBattleBoxSlot(1)) {Type = StorageSlotType.BattleBox}, + new SlotInfoMisc(sav.Data, 2, sav.GetBattleBoxSlot(2)) {Type = StorageSlotType.BattleBox}, + new SlotInfoMisc(sav.Data, 3, sav.GetBattleBoxSlot(3)) {Type = StorageSlotType.BattleBox}, + new SlotInfoMisc(sav.Data, 4, sav.GetBattleBoxSlot(4)) {Type = StorageSlotType.BattleBox}, + new SlotInfoMisc(sav.Data, 5, sav.GetBattleBoxSlot(5)) {Type = StorageSlotType.BattleBox}, }; } @@ -110,8 +123,15 @@ private static List GetExtraSlots6AO(SAV6AO sav) { return new List { - new SlotInfoMisc(0, sav.GTS) {Type = StorageSlotType.GTS}, - new SlotInfoMisc(0, sav.Fused) {Type = StorageSlotType.Fused} + new SlotInfoMisc(sav.Data, 0, sav.GTS) {Type = StorageSlotType.GTS}, + new SlotInfoMisc(sav.Data, 0, sav.Fused) {Type = StorageSlotType.Fused}, + + new SlotInfoMisc(sav.Data, 0, sav.GetBattleBoxSlot(0)) {Type = StorageSlotType.BattleBox}, + new SlotInfoMisc(sav.Data, 1, sav.GetBattleBoxSlot(1)) {Type = StorageSlotType.BattleBox}, + new SlotInfoMisc(sav.Data, 2, sav.GetBattleBoxSlot(2)) {Type = StorageSlotType.BattleBox}, + new SlotInfoMisc(sav.Data, 3, sav.GetBattleBoxSlot(3)) {Type = StorageSlotType.BattleBox}, + new SlotInfoMisc(sav.Data, 4, sav.GetBattleBoxSlot(4)) {Type = StorageSlotType.BattleBox}, + new SlotInfoMisc(sav.Data, 5, sav.GetBattleBoxSlot(5)) {Type = StorageSlotType.BattleBox}, }; } @@ -119,15 +139,15 @@ private static List GetExtraSlots7(SAV7 sav, bool all) { var list = new List { - new SlotInfoMisc(0, sav.AllBlocks[07].Offset) {Type = StorageSlotType.GTS}, - new SlotInfoMisc(0, sav.GetFusedSlotOffset(0)) {Type = StorageSlotType.Fused} + new SlotInfoMisc(sav.Data, 0, sav.AllBlocks[07].Offset) {Type = StorageSlotType.GTS}, + new SlotInfoMisc(sav.Data, 0, sav.GetFusedSlotOffset(0)) {Type = StorageSlotType.Fused} }; if (sav is SAV7USUM) { list.AddRange(new[] { - new SlotInfoMisc(1, sav.GetFusedSlotOffset(1)) {Type = StorageSlotType.Fused}, - new SlotInfoMisc(2, sav.GetFusedSlotOffset(2)) {Type = StorageSlotType.Fused}, + new SlotInfoMisc(sav.Data, 1, sav.GetFusedSlotOffset(1)) {Type = StorageSlotType.Fused}, + new SlotInfoMisc(sav.Data, 2, sav.GetFusedSlotOffset(2)) {Type = StorageSlotType.Fused}, }); } @@ -135,8 +155,25 @@ private static List GetExtraSlots7(SAV7 sav, bool all) return list; for (int i = 0; i < ResortSave7.ResortCount; i++) - list.Add(new SlotInfoMisc(i, sav.ResortSave.GetResortSlotOffset(i)) { Type = StorageSlotType.Resort }); + list.Add(new SlotInfoMisc(sav.Data, i, sav.ResortSave.GetResortSlotOffset(i)) { Type = StorageSlotType.Resort }); return list; } + + private static List GetExtraSlots8(ISaveBlock8Main sav) + { + var fused = sav.Fused; + var dc = sav.Daycare; + return new List + { + new SlotInfoMisc(fused.Data, 0, Fused8.GetFusedSlotOffset(0), true), + new SlotInfoMisc(fused.Data, 0, Fused8.GetFusedSlotOffset(0), true), + new SlotInfoMisc(fused.Data, 0, Fused8.GetFusedSlotOffset(0), true), + + new SlotInfoMisc(dc.Data, 0, Daycare8.GetDaycareSlotOffset(0, 0)), + new SlotInfoMisc(dc.Data, 0, Daycare8.GetDaycareSlotOffset(0, 1)), + new SlotInfoMisc(dc.Data, 0, Daycare8.GetDaycareSlotOffset(1, 0)), + new SlotInfoMisc(dc.Data, 0, Daycare8.GetDaycareSlotOffset(1, 1)), + }; + } } } diff --git a/PKHeX.Core/Editing/Saves/Slots/Info/SlotInfoMisc.cs b/PKHeX.Core/Editing/Saves/Slots/Info/SlotInfoMisc.cs index acc1cf7fa..9c92d4dfe 100644 --- a/PKHeX.Core/Editing/Saves/Slots/Info/SlotInfoMisc.cs +++ b/PKHeX.Core/Editing/Saves/Slots/Info/SlotInfoMisc.cs @@ -12,25 +12,36 @@ public sealed class SlotInfoMisc : ISlotInfo public WriteBlockedMessage CanWriteTo(SaveFile sav, PKM pkm) => WriteBlockedMessage.InvalidDestination; public StorageSlotType Type { get; set; } - public SlotInfoMisc(int slot, int offset, bool party = false) + private readonly byte[] Data; // buffer to r/w + + public SlotInfoMisc(SaveFile sav, int slot, int offset, bool party = false) { Slot = slot; Offset = offset; PartyFormat = party; + Data = sav.Data; + } + + public SlotInfoMisc(byte[] data, int slot, int offset, bool party = false) + { + Slot = slot; + Offset = offset; + PartyFormat = party; + Data = data; } public bool WriteTo(SaveFile sav, PKM pkm, PKMImportSetting setting = PKMImportSetting.UseDefault) { if (PartyFormat) - sav.SetPartySlot(pkm, Offset, setting, setting); + sav.SetSlotFormatParty(pkm, Data, Offset, setting, setting); else - sav.SetStoredSlot(pkm, Offset, setting, setting); + sav.SetSlotFormatStored(pkm, Data, Offset, setting, setting); return true; } public PKM Read(SaveFile sav) { - return PartyFormat ? sav.GetPartySlot(Offset) : sav.GetStoredSlot(Offset); + return PartyFormat ? sav.GetPartySlot(Data, Offset) : sav.GetStoredSlot(Data, Offset); } private bool Equals(SlotInfoMisc other) => Offset == other.Offset; diff --git a/PKHeX.Core/Editing/ShowdownSet.cs b/PKHeX.Core/Editing/ShowdownSet.cs index 731230849..5f90001ee 100644 --- a/PKHeX.Core/Editing/ShowdownSet.cs +++ b/PKHeX.Core/Editing/ShowdownSet.cs @@ -69,7 +69,7 @@ public sealed class ShowdownSet public int Friendship { get; private set; } = 255; /// - /// of the Set entity. + /// of the Set entity. /// public int Nature { get; set; } = -1; @@ -393,7 +393,7 @@ public ShowdownSet(PKM pkm) Nature = pkm.Nature; Gender = genders[pkm.Gender < 2 ? pkm.Gender : 2]; Friendship = pkm.CurrentFriendship; - Level = Experience.GetLevel(pkm.EXP, pkm.Species, pkm.AltForm); + Level = Experience.GetLevel(pkm.EXP, pkm.PersonalInfo.EXPGrowth); Shiny = pkm.IsShiny; SetFormString(pkm.AltForm); diff --git a/PKHeX.Core/Game/Ability.cs b/PKHeX.Core/Game/Ability.cs index 9b8951278..916318df8 100644 --- a/PKHeX.Core/Game/Ability.cs +++ b/PKHeX.Core/Game/Ability.cs @@ -239,6 +239,31 @@ public enum Ability ShadowShield, PrismArmor, Neuroforce, + IntrepidSword, + DauntlessShield, + Libero, + BallFetch, + CottonDown, + PropellerTail, + MirrorArmor, + GulpMissile, + Stalwart, + SteamEngine, + PunkRock, + SandSpit, + IceScales, + Ripen, + IceFace, + PowerSpot, + Mimicry, + ScreenCleaner, + SteelySpirit, + PerishBody, + WanderingSpirit, + GorillaTactics, + NeutralizingGas, + PastelVeil, + HungerSwitch, MAX_COUNT, } } diff --git a/PKHeX.Core/Game/GameStrings/GameDataSource.cs b/PKHeX.Core/Game/GameStrings/GameDataSource.cs index b975e8382..1f074afb5 100644 --- a/PKHeX.Core/Game/GameStrings/GameDataSource.cs +++ b/PKHeX.Core/Game/GameStrings/GameDataSource.cs @@ -42,6 +42,8 @@ public GameDataSource(GameStrings s) MetGen8 = CreateGen8(s); Memories = new MemoryStrings(s); + + Empty = new ComboItem(s.Species[0], 0); } public readonly GameStrings Source; @@ -66,6 +68,8 @@ public GameDataSource(GameStrings s) private readonly IReadOnlyList MetGen7GG; private readonly IReadOnlyList MetGen8; + public readonly ComboItem Empty; + private static IReadOnlyList GetVersionList(GameStrings s) { var list = s.gamelist; diff --git a/PKHeX.Core/Game/GameStrings/GameStrings.cs b/PKHeX.Core/Game/GameStrings/GameStrings.cs index 4a026f7c6..6402972ee 100644 --- a/PKHeX.Core/Game/GameStrings/GameStrings.cs +++ b/PKHeX.Core/Game/GameStrings/GameStrings.cs @@ -125,11 +125,10 @@ public GameStrings(string l) metGG_40000 = Get("gg_40000"); metGG_60000 = metSM_60000; - // todo - metSWSH_00000 = Enumerable.Range(1, 500).Select(z => $"a{z}").ToArray(); - metSWSH_30000 = Enumerable.Range(1, 500).Select(z => $"b{z}").ToArray(); - metSWSH_40000 = Enumerable.Range(1, 500).Select(z => $"c{z}").ToArray(); - metSWSH_60000 = Enumerable.Range(1, 500).Select(z => $"d{z}").ToArray(); + metSWSH_00000 = Get("swsh_00000"); + metSWSH_30000 = Get("swsh_30000"); + metSWSH_40000 = Get("swsh_40000"); + metSWSH_60000 = Get("swsh_60000"); Sanitize(); @@ -206,6 +205,14 @@ private void SanitizeItemNames() foreach (var i in Legal.Pouch_ZCrystal_USUM) itemlist[i] += " [Z]"; + itemlist[0121] += " (1)"; // Pokémon Box Link + itemlist[1075] += " (2)"; // Pokémon Box Link + + itemlist[1080] += " (SW/SH)"; // Fishing Rod + + itemlist[1081] += " (1)"; // Rotom Bike + itemlist[1266] += " (2)"; // Rotom Bike + for (int i = 12; i <= 29; i++) // Differentiate DNA Samples g3coloitems[500 + i] += $" ({i - 11:00})"; // differentiate G3 Card Key from Colo @@ -219,6 +226,7 @@ private void SanitizeMetLocations() SanitizeMetG5BW(); SanitizeMetG6XY(); SanitizeMetG7SM(); + SanitizeMetG8SWSH(); if (lang == "es" || lang == "it") { @@ -322,6 +330,34 @@ private void SanitizeMetG7SM() metGG_40000[i] += " (-)"; } + private void SanitizeMetG8SWSH() + { + // SWSH duplicates -- elaborate! + var metSWSH_00000_good = (string[])metSWSH_00000.Clone(); + for (int i = 2; i < metSWSH_00000_good.Length; i += 2) + { + var nextLoc = metSWSH_00000[i + 1]; + if (!string.IsNullOrWhiteSpace(nextLoc) && nextLoc[0] != '[') + metSWSH_00000_good[i] += $" ({nextLoc})"; + } + + for (int i = 121; i <= 155; i+=2) + metSWSH_00000_good[i] = string.Empty; // clear Wild Area sub-zone strings (trips duplicate Test) + + metSWSH_00000_good.CopyTo(metSWSH_00000, 0); + + metSWSH_30000[0] += $" ({NPC})"; // Anything from an NPC + metSWSH_30000[1] += $" ({EggName})"; // Egg From Link Trade + for (int i = 2; i <= 5; i++) // distinguish first set of regions (unused) from second (used) + metSWSH_30000[i] += " (-)"; + metSWSH_30000[18] += " (?)"; // Kanto for the third time + + for (int i = 54; i < 60; i++) // distinguish Event year duplicates + metSWSH_40000[i] += " (-)"; + metSWSH_40000[29] += " (-)"; // a Video game Event (in spanish etc) -- duplicate with line 39 + metSWSH_40000[52] += " (-)"; // a Pokémon event -- duplicate with line 37 + } + public IReadOnlyList GetItemStrings(int generation, GameVersion game = GameVersion.Any) { return generation switch diff --git a/PKHeX.Core/Game/GameStrings/MemoryStrings.cs b/PKHeX.Core/Game/GameStrings/MemoryStrings.cs index 1d1ae4215..7658f2e08 100644 --- a/PKHeX.Core/Game/GameStrings/MemoryStrings.cs +++ b/PKHeX.Core/Game/GameStrings/MemoryStrings.cs @@ -13,10 +13,10 @@ public MemoryStrings(GameStrings strings) s = strings; memories = new Lazy>(GetMemories); none = new Lazy>(() => Util.GetCBList(new[] {string.Empty})); - species = new Lazy>(() => Util.GetCBList(s.specieslist.Take(Legal.MaxSpeciesID_6 + 1).ToArray())); + species = new Lazy>(() => Util.GetCBList(s.specieslist.ToArray())); item = new Lazy>(() => Util.GetCBList(s.itemlist, Memories.MemoryItems)); genloc = new Lazy>(() => Util.GetCBList(s.genloc)); - moves = new Lazy>(() => Util.GetCBList(s.movelist.Take(622).ToArray())); // Hyperspace Fury + moves = new Lazy>(() => Util.GetCBList(s.movelist.ToArray())); // Hyperspace Fury specific = new Lazy>(() => Util.GetCBList(s.metXY_00000, Legal.Met_XY_0)); } @@ -48,21 +48,8 @@ private List GetMemories() return memory_list1; } - public string[] GetMemoryQualities() - { - var list = new string[7]; - for (int i = 0; i < list.Length; i++) - list[i] = s.memories[2 + i]; - return list; - } - - public string[] GetMemoryFeelings() - { - var list = new string[24]; - for (int i = 0; i < 24; i++) - list[i] = s.memories[10 + i]; - return list; - } + public string[] GetMemoryQualities() => s.memories.Slice(2, 7); + public string[] GetMemoryFeelings() => s.memories.Slice(10, 24); public List GetArgumentStrings(MemoryArgType memIndex) { diff --git a/PKHeX.Core/Game/GameUtil.cs b/PKHeX.Core/Game/GameUtil.cs index 855a21041..ac1fe9a13 100644 --- a/PKHeX.Core/Game/GameUtil.cs +++ b/PKHeX.Core/Game/GameUtil.cs @@ -237,9 +237,10 @@ public static bool Contains(this GameVersion g1, GameVersion g2) case Gen7: return SM.Contains(g2) || USUM.Contains(g2) || GG.Contains(g2); - case Gen8: case SWSH: return g2 == SW || g2 == SH; + case Gen8: + return SWSH.Contains(g2); default: return false; } diff --git a/PKHeX.Core/Game/Nature.cs b/PKHeX.Core/Game/Nature.cs index a39107596..1c4e21a8b 100644 --- a/PKHeX.Core/Game/Nature.cs +++ b/PKHeX.Core/Game/Nature.cs @@ -5,31 +5,31 @@ /// public enum Nature : byte { - Hardy, - Lonely, - Brave, - Adamant, - Naughty, - Bold, - Docile, - Relaxed, - Impish, - Lax, - Timid, - Hasty, - Serious, - Jolly, - Naive, - Modest, - Mild, - Quiet, - Bashful, - Rash, - Calm, - Gentle, - Sassy, - Careful, - Quirky, + Hardy = 0, + Lonely = 1, + Brave = 2, + Adamant = 3, + Naughty = 4, + Bold = 5, + Docile = 6, + Relaxed = 7, + Impish = 8, + Lax = 9, + Timid = 10, + Hasty = 11, + Serious = 12, + Jolly = 13, + Naive = 14, + Modest = 15, + Mild = 16, + Quiet = 17, + Bashful = 18, + Rash = 19, + Calm = 20, + Gentle = 21, + Sassy = 22, + Careful = 23, + Quirky = 24, Random = 25, } diff --git a/PKHeX.Core/Game/Species.cs b/PKHeX.Core/Game/Species.cs index f38822f41..97e9650aa 100644 --- a/PKHeX.Core/Game/Species.cs +++ b/PKHeX.Core/Game/Species.cs @@ -815,6 +815,87 @@ public enum Species : ushort Zeraora, Meltan, Melmetal, + Grookey, + Thwackey, + Rillaboom, + Scorbunny, + Raboot, + Cinderace, + Sobble, + Drizzile, + Inteleon, + Skwovet, + Greedent, + Rookidee, + Corvisquire, + Corviknight, + Blipbug, + Dottler, + Orbeetle, + Nickit, + Thievul, + Gossifleur, + Eldegoss, + Wooloo, + Dubwool, + Chewtle, + Drednaw, + Yamper, + Boltund, + Rolycoly, + Carkol, + Coalossal, + Applin, + Flapple, + Appletun, + Silicobra, + Sandaconda, + Cramorant, + Arrokuda, + Barraskewda, + Toxel, + Toxtricity, + Sizzlipede, + Centiskorch, + Clobbopus, + Grapploct, + Sinistea, + Polteageist, + Hatenna, + Hattrem, + Hatterene, + Impidimp, + Morgrem, + Grimmsnarl, + Obstagoon, + Perrserker, + Cursola, + Sirfetchd, + MrRime, + Runerigus, + Milcery, + Alcremie, + Falinks, + Pincurchin, + Snom, + Frosmoth, + Stonjourner, + Eiscue, + Indeedee, + Morpeko, + Cufant, + Copperajah, + Dracozolt, + Arctozolt, + Dracovish, + Arctovish, + Duraludon, + Dreepy, + Drakloak, + Dragapult, + Zacian, + Zamazenta, + Eternatus, MAX_COUNT, } } diff --git a/PKHeX.Core/Legality/Analysis.cs b/PKHeX.Core/Legality/Analysis.cs index 48a7c91af..c296e7867 100644 --- a/PKHeX.Core/Legality/Analysis.cs +++ b/PKHeX.Core/Legality/Analysis.cs @@ -22,6 +22,11 @@ public partial class LegalityAnalysis /// public IReadOnlyList Results => Parse; + /// + /// Only use this when trying to mutate the legality. Not for use when checking legality. + /// + public void ResetParse() => Parse.Clear(); + private IEncounterable? EncounterOriginalGB; /// diff --git a/PKHeX.Core/Legality/Areas/EncounterArea.cs b/PKHeX.Core/Legality/Areas/EncounterArea.cs index 8df1a3846..723c62a97 100644 --- a/PKHeX.Core/Legality/Areas/EncounterArea.cs +++ b/PKHeX.Core/Legality/Areas/EncounterArea.cs @@ -51,7 +51,7 @@ public static T[] GetSimpleEncounterArea(int[] species, int[] lvls, int locat /// Evolution lineage /// Minimum level of the encounter /// Enumerable list of encounters - public virtual IEnumerable GetMatchingSlots(PKM pkm, IReadOnlyList vs, int minLevel = 0) + public virtual IEnumerable GetMatchingSlots(PKM pkm, IReadOnlyList vs, int minLevel = 0) { if (minLevel == 0) // any return Slots.Where(slot => vs.Any(evo => evo.Species == slot.Species)); @@ -60,7 +60,7 @@ public virtual IEnumerable GetMatchingSlots(PKM pkm, IReadOnlyLis return GetFilteredSlots(pkm, slots, minLevel); } - protected virtual IEnumerable GetMatchFromEvoLevel(PKM pkm, IEnumerable vs, int minLevel) + protected virtual IEnumerable GetMatchFromEvoLevel(PKM pkm, IEnumerable vs, int minLevel) { var slots = Slots.Where(slot => vs.Any(evo => evo.Species == slot.Species && evo.Level >= slot.LevelMin)); // Get slots where pokemon can exist with respect to level constraints diff --git a/PKHeX.Core/Legality/Areas/EncounterArea3.cs b/PKHeX.Core/Legality/Areas/EncounterArea3.cs index 95cf87974..4868d6442 100644 --- a/PKHeX.Core/Legality/Areas/EncounterArea3.cs +++ b/PKHeX.Core/Legality/Areas/EncounterArea3.cs @@ -125,7 +125,7 @@ public static EncounterArea3[] GetArray3(byte[][] entries) return entries.Select(GetArea3).Where(Area => Area.Slots.Length != 0).ToArray(); } - protected override IEnumerable GetMatchFromEvoLevel(PKM pkm, IEnumerable vs, int minLevel) + protected override IEnumerable GetMatchFromEvoLevel(PKM pkm, IEnumerable vs, int minLevel) { var slots = Slots.Where(slot => vs.Any(evo => evo.Species == slot.Species && evo.Level >= slot.LevelMin)); diff --git a/PKHeX.Core/Legality/Areas/EncounterArea4.cs b/PKHeX.Core/Legality/Areas/EncounterArea4.cs index 419f94830..1b3e32703 100644 --- a/PKHeX.Core/Legality/Areas/EncounterArea4.cs +++ b/PKHeX.Core/Legality/Areas/EncounterArea4.cs @@ -59,7 +59,7 @@ protected static void MarkStaticMagnetPermute(IEnumerable grp, Li EncounterUtil.MarkEncountersStaticMagnetPullPermutation(grp, PersonalTable.HGSS, trackPermute); } - protected override IEnumerable GetMatchFromEvoLevel(PKM pkm, IEnumerable vs, int minLevel) + protected override IEnumerable GetMatchFromEvoLevel(PKM pkm, IEnumerable vs, int minLevel) { var slots = Slots.Where(slot => vs.Any(evo => evo.Species == slot.Species && evo.Level >= slot.LevelMin)); diff --git a/PKHeX.Core/Legality/Areas/EncounterArea6AO.cs b/PKHeX.Core/Legality/Areas/EncounterArea6AO.cs index 4cac70cf4..a42a64889 100644 --- a/PKHeX.Core/Legality/Areas/EncounterArea6AO.cs +++ b/PKHeX.Core/Legality/Areas/EncounterArea6AO.cs @@ -13,7 +13,7 @@ public sealed class EncounterArea6AO : EncounterArea32 private const int FluteBoostMax = 3; // Black Flute increases levels. private const int DexNavBoost = 30; // Maximum DexNav chain - protected override IEnumerable GetMatchFromEvoLevel(PKM pkm, IEnumerable vs, int minLevel) + protected override IEnumerable GetMatchFromEvoLevel(PKM pkm, IEnumerable vs, int minLevel) { var slots = Slots.Where(slot => vs.Any(evo => evo.Species == slot.Species && evo.Level >= (slot.LevelMin - FluteBoostMax))); diff --git a/PKHeX.Core/Legality/Areas/EncounterArea7b.cs b/PKHeX.Core/Legality/Areas/EncounterArea7b.cs index d229cf99b..8774900c6 100644 --- a/PKHeX.Core/Legality/Areas/EncounterArea7b.cs +++ b/PKHeX.Core/Legality/Areas/EncounterArea7b.cs @@ -11,7 +11,7 @@ public sealed class EncounterArea7b : EncounterArea32 { private const int CatchComboBonus = 1; - protected override IEnumerable GetMatchFromEvoLevel(PKM pkm, IEnumerable vs, int minLevel) + protected override IEnumerable GetMatchFromEvoLevel(PKM pkm, IEnumerable vs, int minLevel) { var slots = Slots.Where(slot => vs.Any(evo => evo.Species == slot.Species && evo.Level >= (slot.LevelMin - CatchComboBonus))); diff --git a/PKHeX.Core/Legality/Areas/EncounterArea8.cs b/PKHeX.Core/Legality/Areas/EncounterArea8.cs index 71af59555..9f3c45a35 100644 --- a/PKHeX.Core/Legality/Areas/EncounterArea8.cs +++ b/PKHeX.Core/Legality/Areas/EncounterArea8.cs @@ -9,35 +9,24 @@ namespace PKHeX.Core /// public sealed class EncounterArea8 : EncounterArea32 { - protected override IEnumerable GetMatchFromEvoLevel(PKM pkm, IEnumerable vs, int minLevel) + protected override IEnumerable GetMatchFromEvoLevel(PKM pkm, IEnumerable vs, int minLevel) { + var loc = Location; + if (120 <= loc && loc <= 154) // wild area gets boosted up to level 60 postgame + { + const int boostTo = 60; + if (pkm.Met_Level == boostTo) + { + var boost = Slots.Where(slot => vs.Any(evo => evo.Species == slot.Species && evo.Form == slot.Form && evo.Level >= boostTo)); + return boost.Where(s => s.LevelMax < 60 || s.IsLevelWithinRange(minLevel)); + } + } var slots = Slots.Where(slot => vs.Any(evo => evo.Species == slot.Species && evo.Level >= (slot.LevelMin))); // Get slots where pokemon can exist with respect to level constraints return slots.Where(s => s.IsLevelWithinRange(minLevel)); } - protected override IEnumerable GetFilteredSlots(PKM pkm, IEnumerable slots, int minLevel) - { - int species = pkm.Species; - - int form = pkm.AltForm; - if (Legal.GalarVariantFormEvolutions.Contains(species)) // match form if same species, else form 0. - { - foreach (var slot in slots) - { - if (species == slot.Species ? slot.Form == form : slot.Form == 0) - yield return slot; - } - } - else if (form == 0) - { - // enforce no form - foreach (var slot in slots) - { - yield return slot; - } - } - } + protected override IEnumerable GetFilteredSlots(PKM pkm, IEnumerable slots, int minLevel) => slots; } } \ No newline at end of file diff --git a/PKHeX.Core/Legality/Areas/EncounterAreaFake.cs b/PKHeX.Core/Legality/Areas/EncounterAreaFake.cs index 68c34826f..ad73c6002 100644 --- a/PKHeX.Core/Legality/Areas/EncounterAreaFake.cs +++ b/PKHeX.Core/Legality/Areas/EncounterAreaFake.cs @@ -9,7 +9,7 @@ namespace PKHeX.Core /// public sealed class EncounterAreaFake : EncounterArea { - protected override IEnumerable GetMatchFromEvoLevel(PKM pkm, IEnumerable vs, int minLevel) + protected override IEnumerable GetMatchFromEvoLevel(PKM pkm, IEnumerable vs, int minLevel) => Enumerable.Empty(); protected override IEnumerable GetFilteredSlots(PKM pkm, IEnumerable slots, int minLevel) diff --git a/PKHeX.Core/Legality/Areas/EncounterAreaGB.cs b/PKHeX.Core/Legality/Areas/EncounterAreaGB.cs index 94ac067dd..9d7f36559 100644 --- a/PKHeX.Core/Legality/Areas/EncounterAreaGB.cs +++ b/PKHeX.Core/Legality/Areas/EncounterAreaGB.cs @@ -39,7 +39,7 @@ protected static EncounterSlot1[] ReadSlots1(byte[] data, ref int ofs, int count return slots; } - public override IEnumerable GetMatchingSlots(PKM pkm, IReadOnlyList vs, int minLevel = 0) + public override IEnumerable GetMatchingSlots(PKM pkm, IReadOnlyList vs, int minLevel = 0) { if (minLevel == 0) // any return Slots.Where(slot => vs.Any(evo => evo.Species == slot.Species)); @@ -54,7 +54,7 @@ public override IEnumerable GetMatchingSlots(PKM pkm, IReadOnlyLi return GetFilteredSlots(pkm, encounterSlots, Gen1Version, RBDragonair).OrderBy(slot => slot.LevelMin); // prefer lowest levels } - private static bool FilterGBSlotsCatchRate(PKM pkm, ref IReadOnlyList vs, ref GameVersion Gen1Version, ref bool RBDragonair) + private static bool FilterGBSlotsCatchRate(PKM pkm, ref IReadOnlyList vs, ref GameVersion Gen1Version, ref bool RBDragonair) { if (!(pkm is PK1 pk1) || !pkm.Gen1_NotTradeback) return true; @@ -129,7 +129,7 @@ private static bool FilterGBSlotsCatchRate(PKM pkm, ref IReadOnlyList } } - protected override IEnumerable GetMatchFromEvoLevel(PKM pkm, IEnumerable vs, int minLevel) + protected override IEnumerable GetMatchFromEvoLevel(PKM pkm, IEnumerable vs, int minLevel) { var slots = Slots.Where(slot => vs.Any(evo => evo.Species == slot.Species && evo.Level >= slot.LevelMin)); diff --git a/PKHeX.Core/Legality/Checks.cs b/PKHeX.Core/Legality/Checks.cs index 42e28ab09..1c210c3ff 100644 --- a/PKHeX.Core/Legality/Checks.cs +++ b/PKHeX.Core/Legality/Checks.cs @@ -15,7 +15,7 @@ public partial class LegalityAnalysis private static readonly Verifier ConsoleRegion = new ConsoleRegionVerifier(); private static readonly Verifier Ability = new AbilityVerifier(); private static readonly Verifier Medal = new MedalVerifier(); - private static readonly Verifier Ribbon = new RibbonVerifier(); + public static readonly Verifier Ribbon = new RibbonVerifier(); private static readonly Verifier Item = new ItemVerifier(); private static readonly Verifier EncounterType = new EncounterTypeVerifier(); private static readonly Verifier HyperTraining = new HyperTrainingVerifier(); diff --git a/PKHeX.Core/Legality/Core.cs b/PKHeX.Core/Legality/Core.cs index 684dde904..792af82af 100644 --- a/PKHeX.Core/Legality/Core.cs +++ b/PKHeX.Core/Legality/Core.cs @@ -58,8 +58,8 @@ public static partial class Legal internal static readonly Learnset[] LevelUpGG = LearnsetReader.GetArray(Data.UnpackMini(Util.GetBinaryResource("lvlmove_gg.pkl"), "gg")); // Gen 8 - internal static readonly EggMoves7[] EggMovesSWSH = EggMoves7.GetArray(Data.UnpackMini(Util.GetBinaryResource("eggmove_sm.pkl"), "sm")); - internal static readonly Learnset[] LevelUpSWSH = LearnsetReader.GetArray(Data.UnpackMini(Util.GetBinaryResource("lvlmove_sm.pkl"), "sm")); + internal static readonly EggMoves7[] EggMovesSWSH = EggMoves7.GetArray(Data.UnpackMini(Util.GetBinaryResource("eggmove_swsh.pkl"), "ss")); + internal static readonly Learnset[] LevelUpSWSH = LearnsetReader.GetArray(Data.UnpackMini(Util.GetBinaryResource("lvlmove_swsh.pkl"), "ss")); // Setup Help static Legal() @@ -513,6 +513,13 @@ private static bool IsEvolvedFormChange(PKM pkm) if (pkm.Format >= 7 && AlolanVariantEvolutions12.Contains(pkm.Species)) return pkm.AltForm == 1; + if (pkm.Format >= 8) + { + if (GalarVariantFormEvolutions.Contains(pkm.Species)) + return pkm.AltForm == 1; + if (GalarForm0Evolutions.TryGetValue(pkm.Species, out var orig)) + return pkm.AltForm != orig; // bad compare? + } if (pkm.Species == 678 && pkm.Gender == 1) return pkm.AltForm == 1; return pkm.Species == 773; diff --git a/PKHeX.Core/Legality/Encounters/Data/EncounterEvent.cs b/PKHeX.Core/Legality/Encounters/Data/EncounterEvent.cs index b4346c918..16b4b1572 100644 --- a/PKHeX.Core/Legality/Encounters/Data/EncounterEvent.cs +++ b/PKHeX.Core/Legality/Encounters/Data/EncounterEvent.cs @@ -27,8 +27,8 @@ public static class EncounterEvent /// Event Database for Generation 7 public static WB7[] MGDB_G7GG { get; private set; } = Array.Empty(); - /// Event Database for Generation 7 - public static WC7[] MGDB_G8 { get; private set; } = Array.Empty(); // todo + /// Event Database for Generation 8 + public static WC8[] MGDB_G8 { get; private set; } = Array.Empty(); /// Indicates if the databases are initialized. public static bool Initialized => MGDB_G3.Length != 0; @@ -47,6 +47,9 @@ public static class EncounterEvent private static HashSet GetWB7DB(byte[] wc7full) => new HashSet(ArrayUtil.EnumerateSplit(wc7full, WB7.SizeFull).Select(d => new WB7(d))); + private static HashSet GetWC8DB(byte[] wc8bin) => + new HashSet(ArrayUtil.EnumerateSplit(wc8bin, WC8.Size).Select(d => new WC8(d))); + public static void RefreshMGDB(params string[] paths) { var g4 = GetPCDDB(Util.GetBinaryResource("wc4.pkl")); @@ -54,6 +57,7 @@ public static void RefreshMGDB(params string[] paths) var g6 = GetWC6DB(Util.GetBinaryResource("wc6.pkl"), Util.GetBinaryResource("wc6full.pkl")); var g7 = GetWC7DB(Util.GetBinaryResource("wc7.pkl"), Util.GetBinaryResource("wc7full.pkl")); var b7 = GetWB7DB(Util.GetBinaryResource("wb7full.pkl")); + var g8 = GetWC8DB(Util.GetBinaryResource("wc8.pkl")); foreach (var gift in paths.Where(Directory.Exists).SelectMany(MysteryUtil.GetGiftsFromFolder)) { @@ -64,6 +68,7 @@ public static void RefreshMGDB(params string[] paths) case WC6 wc6: g6.Add(wc6); continue; case WC7 wc7: g7.Add(wc7); continue; case WB7 wb7: b7.Add(wb7); continue; + case WC8 wc8: g8.Add(wc8); continue; } } @@ -73,6 +78,7 @@ public static void RefreshMGDB(params string[] paths) MGDB_G6 = g6.ToArray(); MGDB_G7 = g7.ToArray(); MGDB_G7GG = b7.ToArray(); + MGDB_G8 = g8.ToArray(); } public static IEnumerable GetAllEvents(bool sorted = true) diff --git a/PKHeX.Core/Legality/Encounters/Data/Encounters8.cs b/PKHeX.Core/Legality/Encounters/Data/Encounters8.cs index f48fa6e08..a38e9b8fd 100644 --- a/PKHeX.Core/Legality/Encounters/Data/Encounters8.cs +++ b/PKHeX.Core/Legality/Encounters/Data/Encounters8.cs @@ -1,36 +1,1886 @@ -using static PKHeX.Core.EncounterUtil; +using System; +using static PKHeX.Core.EncounterUtil; +using static PKHeX.Core.Shiny; +using static PKHeX.Core.GameVersion; namespace PKHeX.Core { internal static class Encounters8 { - internal static readonly EncounterArea8[] SlotsSW = GetEncounterTables("gg", "gp"); - internal static readonly EncounterArea8[] SlotsSH = GetEncounterTables("gg", "ge"); + internal static readonly EncounterArea8[] SlotsSW = GetEncounterTables("sw", "sw"); + internal static readonly EncounterArea8[] SlotsSH = GetEncounterTables("sh", "sh"); internal static readonly EncounterStatic[] StaticSW, StaticSH; static Encounters8() { - StaticSW = GetStaticEncounters(Encounter_SWSH, GameVersion.SW); - StaticSH = GetStaticEncounters(Encounter_SWSH, GameVersion.SH); + SlotsSW.SetVersion(SW); + SlotsSH.SetVersion(SH); + Encounter_SWSH.SetVersion(SWSH); + TradeGift_SWSH.SetVersion(SWSH); + Nest_Common.SetVersion(SWSH); + Nest_SW.SetVersion(SW); + Nest_SH.SetVersion(SH); + Crystal_SWSH.SetVersion(SWSH); + MarkEncounterTradeStrings(TradeGift_SWSH, TradeSWSH); + + StaticSW = GetStaticEncounters(Encounter_SWSH, SW); + StaticSH = GetStaticEncounters(Encounter_SWSH, SH); + StaticSW = ConcatAll(StaticSW, Nest_Common, Nest_SW, GetStaticEncounters(Crystal_SWSH, SW)); + StaticSH = ConcatAll(StaticSH, Nest_Common, Nest_SH, GetStaticEncounters(Crystal_SWSH, SH)); - SlotsSW.SetVersion(GameVersion.SW); - SlotsSH.SetVersion(GameVersion.SH); - Encounter_SWSH.SetVersion(GameVersion.SWSH); - TradeGift_SWSH.SetVersion(GameVersion.SWSH); MarkEncountersGeneration(8, SlotsSW, SlotsSH); MarkEncountersGeneration(8, StaticSW, StaticSH, TradeGift_SWSH); } private static readonly EncounterStatic[] Encounter_SWSH = { - // encounters - // gifts + new EncounterStatic { Gift = true, Species = 810, Shiny = Never, Level = 05, Location = 006, }, // Grookey + new EncounterStatic { Gift = true, Species = 813, Shiny = Never, Level = 05, Location = 006, }, // Scorbunny + new EncounterStatic { Gift = true, Species = 816, Shiny = Never, Level = 05, Location = 006, }, // Sobble + + new EncounterStatic { Gift = true, Species = 772, Shiny = Never, Level = 50, Location = 158, FlawlessIVCount = 3, }, // Type: Null + new EncounterStatic { Gift = true, Species = 848, Shiny = Never, Level = 01, Location = -1, IVs = new[]{-1,31,-1,-1,-1,31}, Ball = 11 }, // Toxel + + new EncounterStatic { Gift = true, Species = 881, FlawlessIVCount = 3, Level = 10, Location = 068, }, // Dracozolt @ Route 6 + new EncounterStatic { Gift = true, Species = 881, FlawlessIVCount = 3, Level = 10, Location = 068, }, // Arctozolt @ Route 6 + new EncounterStatic { Gift = true, Species = 882, FlawlessIVCount = 3, Level = 10, Location = 068, }, // Dracovish @ Route 6 + new EncounterStatic { Gift = true, Species = 883, FlawlessIVCount = 3, Level = 10, Location = 068, }, // Arctovish @ Route 6 + + new EncounterGift8 { Gift = true, Species = 004, Shiny = Never, Level = 05, Gender = 0, Location = 006, FlawlessIVCount = 3, CanGigantamax = true }, // Charmander + new EncounterGift8 { Gift = true, Species = 025, Shiny = Never, Level = 10, Gender = 0, Location = 156, FlawlessIVCount = 6, CanGigantamax = true }, // Pikachu + new EncounterGift8 { Gift = true, Species = 133, Shiny = Never, Level = 10, Gender = 0, Location = 156, FlawlessIVCount = 6, CanGigantamax = true }, // Eevee + + #region Static Part 1 + // encounters + // new EncounterStatic { Species = 612, Level = 62, Location = -1, Moves = new[] {200,089,231,416}, Shiny = Never, Ability = 2, IVs = new[] {00, 00, 00, 00, 00, 00}, Nature = Nature.Jolly }, // Haxorus (dyna 1) + // new EncounterStatic { Species = 477, Level = 62, Location = -1, Moves = new[] {008,089,009,325}, Shiny = Never, Ability = 1, IVs = new[] {00, 00, 00, 00, 00, 00}, Nature = Nature.Adamant }, // Dusknoir (dyna 1) + // new EncounterStatic { Species = 324, Level = 62, Location = -1, Moves = new[] {436,089,776,231}, Shiny = Never, Ability = 2, IVs = new[] {31, 31, 31, 31, 31, 31}, Nature = Nature.Sassy, Gender = Male }, // Torkoal (dyna 5) (126 ATK, 126 SPD, 252 SPE) + // new EncounterStatic { Species = 526, Level = 62, Location = -1, Moves = new[] {157,089,444,675}, Shiny = Never, Ability = 4, IVs = new[] {00, 00, 00, 00, 00, 00}, Nature = Nature.Careful, Gender = Male }, // Gigalith (dyna 1) + // new EncounterStatic { Species = 534, Level = 62, Location = -1, Moves = new[] {009,008,359,444}, Shiny = Never, Ability = 4, IVs = new[] {00, 00, 00, 00, 00, 00}, Nature = Nature.Adamant, Gender = Male }, // Conkeldurr (dyna 1) + // new EncounterStatic { Species = 478, Level = 62, Location = -1, Moves = new[] {196,247,087,094}, Shiny = Never, Ability = 1, IVs = new[] {00, 00, 00, 00, 00, 00}, Nature = Nature.Timid, Gender = Female }, // Froslass (dyna 1) + // new EncounterStatic { Species = 763, Level = 62, Location = -1, Moves = new[] {438,136,583,428}, Shiny = Never, Ability = 2, IVs = new[] {31, 31, 31, 31, 31, 31}, Nature = Nature.Adamant, Gender = Female }, // Tsareena (dyna 5) (252 DEF, 252 SPE) + // new EncounterStatic { Species = 130, Level = 62, Location = -1, Moves = new[] {127,444,242,419}, Shiny = Never, Ability = 1, IVs = new[] {31, 31, 31, 31, 31, 31}, Nature = Nature.Jolly, Gender = Male }, // Gyarados (dyna 5) (252 HP, 252 ATK) + new EncounterStatic { Species = 888, Level = 70, Location = 66, Moves = new[] {533,014,442,242}, Shiny = Never, Ability = 1, FlawlessIVCount = 3, Version = SW }, // Zacian + new EncounterStatic { Species = 889, Level = 70, Location = 66, Moves = new[] {163,242,442,334}, Shiny = Never, Ability = 1, FlawlessIVCount = 3, Version = SH }, // Zamazenta + // new EncounterStatic { Species = 888, Level = 01, Location = -1, Moves = new[] {533,014,336,163}, Shiny = Never, Ability = 1, Nature = Nature.Hardy, Version = SW }, // Zacian + // new EncounterStatic { Species = 889, Level = 01, Location = -1, Moves = new[] {368,334,336,163}, Shiny = Never, Ability = 1, Nature = Nature.Hardy, Version = SH }, // Zamazenta + // new EncounterStatic { Species = 890, Level = 60, Location = 66, Moves = new[] {440,406,053,744}, Shiny = Never, Ability = 1 }, // Eternatus + // new EncounterStatic { Species = 890, Level = 60, Location = 66, Moves = new[] {440,406,053,744}, Shiny = Never, Ability = 1 }, // Eternatus-1 + new EncounterStatic { Species = 890, Level = 60, Location = 66, Moves = new[] {440,406,053,744}, Shiny = Never, Ability = 1, FlawlessIVCount = 3 }, // Eternatus-1 (reverts to form 0) + // new EncounterStatic { Species = 888, Level = 55, Location = -1, Moves = new[] {533,336,232,781}, Shiny = Never, Ability = 1, IVs = new[] {30, 15, 15, 15, 15, 15}, Nature = Nature.Timid, Version = SW }, // Zacian (212 HP EVs) + // new EncounterStatic { Species = 889, Level = 55, Location = -1, Moves = new[] {242,113,232,782}, Shiny = Never, Ability = 1, IVs = new[] {30, 15, 15, 15, 15, 15}, Nature = Nature.Jolly, Version = SH }, // Zamazenta (212 HP EVs) + // new EncounterStatic { Species = 819, Level = 02, Location = -1, Moves = new[] {033,039,000,000}, Shiny = Never, Ability = 1, IVs = new[] {00, 00, 00, 00, 00, 00}, Nature = Nature.Modest, Gender = Male }, // Skwovet + new EncounterStatic { Species = 618, Level = 25, Location = 54, Moves = new[] {389,319,279,341}, Form = 01, Ability = 1 }, // Stunfisk + // new EncounterStatic { Species = 888, Level = 55, Location = -1, Moves = new[] {533,014,442,781}, Shiny = Never, Ability = 1, Nature = Nature.Hardy, Version = SW }, // Zacian + // new EncounterStatic { Species = 889, Level = 55, Location = -1, Moves = new[] {368,334,336,163}, Shiny = Never, Ability = 1, Nature = Nature.Hardy, Version = SH }, // Zamazenta + // new EncounterStatic { Species = 821, Level = 02, Location = -1, Moves = new[] {064,043,000,000}, Shiny = Never, IVs = new[] {00, 00, 00, 00, 00, 00}, Gender = Male }, // Rookidee + // new EncounterStatic { Species = 819, Level = 03, Location = -1, Moves = new[] {033,039,000,000}, Shiny = Never, Ability = 1, IVs = new[] {00, 00, 00, 00, 00, 00}, Gender = Female }, // Skwovet + // new EncounterStatic { Species = 889, Level = 70, Location = -1, Moves = new[] {583,334,242,442}, Shiny = Never, Ability = 1, IVs = new[] {31, 31, 31, 31, 31, 31} }, // Zamazenta (HP/ATK EVs) + // new EncounterStatic { Species = 888, Level = 70, Location = -1, Moves = new[] {533,014,442,242}, Shiny = Never, Ability = 1, IVs = new[] {31, 31, 31, 31, 31, 31} }, // Zacian (HP/ATK EVs) + new EncounterStatic { Species = 037, Level = 24, Location = 24, Moves = new[] {000,000,000,000}, Version = SW }, // Vulpix + new EncounterStatic { Species = 058, Level = 24, Location = 24, Moves = new[] {000,000,000,000}, Version = SH }, // Growlithe + new EncounterStatic { Species = 607, Level = 25, Location = 24, Moves = new[] {000,000,000,000} }, // Litwick + new EncounterStatic { Species = 850, Level = 25, Location = 24, Moves = new[] {000,000,000,000}, FlawlessIVCount = 3 }, // Sizzlipede + new EncounterStatic { Species = 618, Level = 48, Location = -1, Moves = new[] {779,330,340,334}, Form = 01 }, // Stunfisk + new EncounterStatic { Species = 527, Level = 16, Location = -1, Moves = new[] {000,000,000,000} }, // Woobat + new EncounterStatic { Species = 838, Level = 18, Location = -1, Moves = new[] {488,397,229,033} }, // Carkol + new EncounterStatic { Species = 834, Level = 24, Location = 54, Moves = new[] {317,029,055,044} }, // Drednaw + new EncounterStatic { Species = 423, Level = 50, Location = -1, Moves = new[] {240,414,330,246}, FlawlessIVCount = 3, Form = 01 }, // Gastrodon + new EncounterStatic { Species = 859, Level = 31, Location = 76, Moves = new[] {259,389,207,372} }, // Impidimp + new EncounterStatic { Species = 860, Level = 38, Location = -1, Moves = new[] {793,399,259,389} }, // Morgrem + new EncounterStatic { Species = 835, Level = 08, Location = 18, Moves = new[] {039,033,609,000} }, // Yamper + new EncounterStatic { Species = 834, Level = 50, Location = -1, Moves = new[] {710,746,068,317}, FlawlessIVCount = 3 }, // Drednaw + new EncounterStatic { Species = 833, Level = 08, Location = -1, Moves = new[] {044,055,000,000} }, // Chewtle + new EncounterStatic { Species = 131, Level = 55, Location = -1, Moves = new[] {056,240,058,034}, FlawlessIVCount = 3 }, // Lapras + new EncounterStatic { Species = 862, Level = 50, Location = -1, Moves = new[] {269,068,792,184} }, // Obstagoon + new EncounterStatic { Species = 822, Level = 18, Location = -1, Moves = new[] {681,468,031,365}, Shiny = Never }, // Corvisquire + new EncounterStatic { Species = 050, Level = 17, Location = -1, Moves = new[] {523,189,310,045} }, // Diglett + new EncounterStatic { Species = 830, Level = 22, Location = 40, Moves = new[] {178,496,075,047} }, // Eldegoss + new EncounterStatic { Species = 558, Level = 40, Location = -1, Moves = new[] {404,350,446,157} }, // Crustle + new EncounterStatic { Species = 870, Level = 40, Location = -1, Moves = new[] {748,660,179,203} }, // Falinks + new EncounterStatic { Species = 362, Level = 55, Location = -1, Moves = new[] {573,329,104,182}, FlawlessIVCount = 3 }, // Glalie + new EncounterStatic { Species = 853, Level = 50, Location = 92, Moves = new[] {753,576,276,179} }, // Grapploct + new EncounterStatic { Species = 822, Level = 35, Location = -1, Moves = new[] {065,184,269,365} }, // Corvisquire + new EncounterStatic { Species = 614, Level = 55, Location = 106, Moves = new[] {276,059,156,329} }, // Beartic + new EncounterStatic { Species = 460, Level = 55, Location = 106, Moves = new[] {008,059,452,275} }, // Abomasnow + new EncounterStatic { Species = 342, Level = 50, Location = -1, Moves = new[] {242,014,534,400}, FlawlessIVCount = 3 }, // Crawdaunt + #endregion + + #region Static Part 2 + new EncounterStatic { Species = 095, Level = 26, Location = -1, }, // Onix + new EncounterStatic { Species = 416, Level = 26, Location = -1, }, // Vespiquen + new EncounterStatic { Species = 675, Level = 32, Location = -1, }, // Pangoro + new EncounterStatic { Species = 291, Level = 15, Location = -1, }, // Ninjask + new EncounterStatic { Species = 315, Level = 15, Location = -1, }, // Roselia + new EncounterStatic { Species = 045, Level = 36, Location = -1, }, // Vileplume + new EncounterStatic { Species = 760, Level = 34, Location = -1, }, // Bewear + new EncounterStatic { Species = 275, Level = 34, Location = -1, }, // Shiftry + new EncounterStatic { Species = 272, Level = 34, Location = -1, }, // Ludicolo + new EncounterStatic { Species = 426, Level = 34, Location = -1, }, // Drifblim + new EncounterStatic { Species = 623, Level = 40, Location = -1, }, // Golurk + new EncounterStatic { Species = 195, Level = 15, Location = -1, }, // Quagsire + new EncounterStatic { Species = 099, Level = 28, Location = -1, }, // Kingler + new EncounterStatic { Species = 660, Level = 15, Location = 122, }, // Diggersby + new EncounterStatic { Species = 178, Level = 26, Location = -1, }, // Xatu + new EncounterStatic { Species = 569, Level = 36, Location = -1, }, // Garbodor + new EncounterStatic { Species = 510, Level = 28, Location = -1, }, // Liepard + new EncounterStatic { Species = 750, Level = 31, Location = -1, }, // Mudsdale + new EncounterStatic { Species = 067, Level = 26, Location = -1, }, // Machoke + new EncounterStatic { Species = 435, Level = 34, Location = -1, }, // Skuntank + new EncounterStatic { Species = 099, Level = 31, Location = -1, }, // Kingler + new EncounterStatic { Species = 342, Level = 31, Location = -1, }, // Crawdaunt + new EncounterStatic { Species = 208, Level = 50, Location = -1, }, // Steelix + new EncounterStatic { Species = 823, Level = 50, Location = -1, }, // Corviknight + new EncounterStatic { Species = 448, Level = 36, Location = -1, }, // Lucario + new EncounterStatic { Species = 112, Level = 46, Location = -1, }, // Rhydon + new EncounterStatic { Species = 625, Level = 52, Location = -1, }, // Bisharp + new EncounterStatic { Species = 738, Level = 46, Location = -1, }, // Vikavolt + new EncounterStatic { Species = 091, Level = 46, Location = -1, }, // Cloyster + new EncounterStatic { Species = 131, Level = 56, Location = -1, }, // Lapras + new EncounterStatic { Species = 119, Level = 46, Location = -1, }, // Seaking + new EncounterStatic { Species = 130, Level = 56, Location = -1, }, // Gyarados + new EncounterStatic { Species = 279, Level = 46, Location = -1, }, // Pelipper + new EncounterStatic { Species = 853, Level = 56, Location = -1, }, // Grapploct + new EncounterStatic { Species = 593, Level = 46, Location = -1, }, // Jellicent + new EncounterStatic { Species = 171, Level = 46, Location = -1, }, // Lanturn + new EncounterStatic { Species = 340, Level = 46, Location = -1, }, // Whiscash + new EncounterStatic { Species = 426, Level = 46, Location = -1, }, // Drifblim + new EncounterStatic { Species = 224, Level = 46, Location = -1, }, // Octillery + new EncounterStatic { Species = 612, Level = 60, Location = -1, Ability = 1, }, // Haxorus + new EncounterStatic { Species = 143, Level = 36, Location = -1, }, // Snorlax + new EncounterStatic { Species = 452, Level = 40, Location = -1, }, // Drapion + new EncounterStatic { Species = 561, Level = 36, Location = -1, }, // Sigilyph + new EncounterStatic { Species = 534, Level = 55, Location = -1, Ability = 1, }, // Conkeldurr + new EncounterStatic { Species = 320, Level = 56, Location = -1, }, // Wailmer + new EncounterStatic { Species = 561, Level = 40, Location = -1, }, // Sigilyph + new EncounterStatic { Species = 569, Level = 40, Location = -1, }, // Garbodor + new EncounterStatic { Species = 743, Level = 40, Location = -1, }, // Ribombee + new EncounterStatic { Species = 475, Level = 60, Location = -1, }, // Gallade + new EncounterStatic { Species = 264, Level = 40, Location = -1, Form = 01, }, // Linoone + new EncounterStatic { Species = 606, Level = 42, Location = -1, }, // Beheeyem + new EncounterStatic { Species = 715, Level = 50, Location = -1, }, // Noivern + new EncounterStatic { Species = 537, Level = 46, Location = -1, }, // Seismitoad + new EncounterStatic { Species = 768, Level = 50, Location = -1, }, // Golisopod + new EncounterStatic { Species = 760, Level = 42, Location = -1, }, // Bewear + new EncounterStatic { Species = 820, Level = 42, Location = -1, }, // Greedent + new EncounterStatic { Species = 598, Level = 40, Location = -1, }, // Ferrothorn + new EncounterStatic { Species = 344, Level = 42, Location = -1, }, // Claydol + new EncounterStatic { Species = 477, Level = 60, Location = -1, }, // Dusknoir + new EncounterStatic { Species = 623, Level = 43, Location = -1, }, // Golurk + new EncounterStatic { Species = 561, Level = 40, Location = -1, }, // Sigilyph + new EncounterStatic { Species = 558, Level = 34, Location = -1, }, // Crustle + new EncounterStatic { Species = 112, Level = 41, Location = -1, }, // Rhydon + new EncounterStatic { Species = 763, Level = 36, Location = -1, }, // Tsareena + new EncounterStatic { Species = 750, Level = 41, Location = -1, }, // Mudsdale + new EncounterStatic { Species = 185, Level = 41, Location = -1, }, // Sudowoodo + new EncounterStatic { Species = 437, Level = 41, Location = -1, }, // Bronzong + new EncounterStatic { Species = 248, Level = 60, Location = -1, }, // Tyranitar + new EncounterStatic { Species = 784, Level = 60, Location = -1, Ability = 1, }, // Kommo-o + new EncounterStatic { Species = 213, Level = 34, Location = -1, }, // Shuckle + new EncounterStatic { Species = 330, Level = 51, Location = -1, }, // Flygon + new EncounterStatic { Species = 526, Level = 51, Location = -1, }, // Gigalith + new EncounterStatic { Species = 423, Level = 56, Location = -1, Form = 01, }, // Gastrodon + new EncounterStatic { Species = 208, Level = 50, Location = -1, }, // Steelix + new EncounterStatic { Species = 068, Level = 60, Location = -1, Ability = 1, }, // Machamp + new EncounterStatic { Species = 182, Level = 41, Location = -1, }, // Bellossom + new EncounterStatic { Species = 521, Level = 41, Location = -1, }, // Unfezant + new EncounterStatic { Species = 701, Level = 36, Location = -1, }, // Hawlucha + new EncounterStatic { Species = 094, Level = 60, Location = -1, }, // Gengar + new EncounterStatic { Species = 823, Level = 39, Location = -1, }, // Corviknight + new EncounterStatic { Species = 573, Level = 46, Location = -1, }, // Cinccino + new EncounterStatic { Species = 826, Level = 41, Location = -1, }, // Orbeetle + new EncounterStatic { Species = 834, Level = 36, Location = -1, }, // Drednaw + new EncounterStatic { Species = 680, Level = 56, Location = -1, }, // Doublade + new EncounterStatic { Species = 711, Level = 41, Location = -1, }, // Gourgeist + new EncounterStatic { Species = 600, Level = 46, Location = -1, }, // Klang + new EncounterStatic { Species = 045, Level = 41, Location = -1, }, // Vileplume + new EncounterStatic { Species = 823, Level = 38, Location = -1, }, // Corviknight + new EncounterStatic { Species = 130, Level = 60, Location = -1, }, // Gyarados + new EncounterStatic { Species = 853, Level = 56, Location = -1, }, // Grapploct + new EncounterStatic { Species = 282, Level = 60, Location = -1, }, // Gardevoir + new EncounterStatic { Species = 470, Level = 56, Location = -1, }, // Leafeon + new EncounterStatic { Species = 510, Level = 31, Location = -1, }, // Liepard + new EncounterStatic { Species = 832, Level = 65, Location = -1, }, // Dubwool + new EncounterStatic { Species = 826, Level = 65, Location = -1, }, // Orbeetle + new EncounterStatic { Species = 823, Level = 65, Location = -1, }, // Corviknight + new EncounterStatic { Species = 110, Level = 65, Location = -1, Form = 01, }, // Weezing + new EncounterStatic { Species = 834, Level = 65, Location = -1, }, // Drednaw + new EncounterStatic { Species = 845, Level = 65, Location = -1, }, // Cramorant + new EncounterStatic { Species = 828, Level = 65, Location = -1, }, // Thievul + new EncounterStatic { Species = 884, Level = 65, Location = -1, }, // Duraludon + new EncounterStatic { Species = 836, Level = 65, Location = -1, }, // Boltund + new EncounterStatic { Species = 830, Level = 65, Location = -1, }, // Eldegoss + new EncounterStatic { Species = 862, Level = 65, Location = -1, }, // Obstagoon + new EncounterStatic { Species = 861, Level = 65, Location = -1, Gender = 0, }, // Grimmsnarl + new EncounterStatic { Species = 844, Level = 65, Location = -1, }, // Sandaconda + new EncounterStatic { Species = 863, Level = 65, Location = -1, }, // Perrserker + new EncounterStatic { Species = 879, Level = 65, Location = -1, }, // Copperajah + new EncounterStatic { Species = 839, Level = 65, Location = -1, }, // Coalossal + new EncounterStatic { Species = 858, Level = 65, Location = -1, Gender = 1 }, // Hatterene + new EncounterStatic { Species = 279, Level = 26, Location = -1, }, // Pelipper + new EncounterStatic { Species = 310, Level = 26, Location = -1, }, // Manectric + new EncounterStatic { Species = 660, Level = 26, Location = -1, }, // Diggersby + new EncounterStatic { Species = 281, Level = 26, Location = -1, }, // Kirlia + new EncounterStatic { Species = 025, Level = 15, Location = -1, }, // Pikachu + new EncounterStatic { Species = 439, Level = 15, Location = -1, }, // Mime Jr. + new EncounterStatic { Species = 221, Level = 33, Location = -1, }, // Piloswine + new EncounterStatic { Species = 558, Level = 34, Location = -1, }, // Crustle + new EncounterStatic { Species = 282, Level = 32, Location = -1, }, // Gardevoir + new EncounterStatic { Species = 537, Level = 36, Location = -1, }, // Seismitoad + new EncounterStatic { Species = 583, Level = 36, Location = -1, }, // Vanillish + new EncounterStatic { Species = 344, Level = 36, Location = -1, }, // Claydol + new EncounterStatic { Species = 093, Level = 34, Location = -1, }, // Haunter + new EncounterStatic { Species = 356, Level = 40, Location = -1, }, // Dusclops + new EncounterStatic { Species = 362, Level = 40, Location = -1, }, // Glalie + new EncounterStatic { Species = 279, Level = 28, Location = -1, }, // Pelipper + new EncounterStatic { Species = 536, Level = 28, Location = -1, }, // Palpitoad + new EncounterStatic { Species = 660, Level = 28, Location = -1, }, // Diggersby + new EncounterStatic { Species = 221, Level = 36, Location = -1, }, // Piloswine + new EncounterStatic { Species = 750, Level = 36, Location = -1, }, // Mudsdale + new EncounterStatic { Species = 437, Level = 36, Location = -1, }, // Bronzong + new EncounterStatic { Species = 536, Level = 34, Location = -1, }, // Palpitoad + new EncounterStatic { Species = 279, Level = 26, Location = -1, }, // Pelipper + new EncounterStatic { Species = 093, Level = 31, Location = -1, }, // Haunter + new EncounterStatic { Species = 221, Level = 33, Location = -1, }, // Piloswine + new EncounterStatic { Species = 558, Level = 34, Location = -1, }, // Crustle + new EncounterStatic { Species = 067, Level = 31, Location = -1, }, // Machoke + new EncounterStatic { Species = 426, Level = 31, Location = -1, }, // Drifblim + new EncounterStatic { Species = 435, Level = 36, Location = -1, }, // Skuntank + new EncounterStatic { Species = 537, Level = 36, Location = -1, }, // Seismitoad + new EncounterStatic { Species = 583, Level = 36, Location = -1, }, // Vanillish + new EncounterStatic { Species = 426, Level = 36, Location = -1, }, // Drifblim + new EncounterStatic { Species = 437, Level = 46, Location = -1, }, // Bronzong + new EncounterStatic { Species = 460, Level = 46, Location = -1, }, // Abomasnow + new EncounterStatic { Species = 750, Level = 46, Location = -1, }, // Mudsdale + new EncounterStatic { Species = 623, Level = 46, Location = -1, }, // Golurk + new EncounterStatic { Species = 356, Level = 46, Location = -1, }, // Dusclops + new EncounterStatic { Species = 518, Level = 46, Location = -1, }, // Musharna + new EncounterStatic { Species = 362, Level = 46, Location = -1, }, // Glalie + new EncounterStatic { Species = 596, Level = 46, Location = -1, }, // Galvantula + new EncounterStatic { Species = 584, Level = 47, Location = -1, }, // Vanilluxe + new EncounterStatic { Species = 537, Level = 60, Location = -1, }, // Seismitoad + new EncounterStatic { Species = 460, Level = 60, Location = -1, }, // Abomasnow + new EncounterStatic { Species = 036, Level = 36, Location = -1, }, // Clefable + new EncounterStatic { Species = 743, Level = 40, Location = -1, }, // Ribombee + new EncounterStatic { Species = 112, Level = 55, Location = -1, }, // Rhydon + new EncounterStatic { Species = 823, Level = 40, Location = -1, }, // Corviknight + new EncounterStatic { Species = 760, Level = 40, Location = -1, }, // Bewear + new EncounterStatic { Species = 614, Level = 60, Location = -1, }, // Beartic + new EncounterStatic { Species = 461, Level = 60, Location = -1, }, // Weavile + new EncounterStatic { Species = 518, Level = 60, Location = -1, }, // Musharna + new EncounterStatic { Species = 437, Level = 42, Location = -1, }, // Bronzong + new EncounterStatic { Species = 344, Level = 42, Location = -1, }, // Claydol + new EncounterStatic { Species = 452, Level = 50, Location = -1, }, // Drapion + new EncounterStatic { Species = 164, Level = 50, Location = -1, }, // Noctowl + new EncounterStatic { Species = 760, Level = 46, Location = -1, }, // Bewear + new EncounterStatic { Species = 675, Level = 42, Location = -1, }, // Pangoro + new EncounterStatic { Species = 584, Level = 50, Location = -1, }, // Vanilluxe + new EncounterStatic { Species = 112, Level = 50, Location = -1, }, // Rhydon + new EncounterStatic { Species = 778, Level = 50, Location = -1, }, // Mimikyu + new EncounterStatic { Species = 521, Level = 40, Location = -1, }, // Unfezant + new EncounterStatic { Species = 752, Level = 34, Location = -1, }, // Araquanid + new EncounterStatic { Species = 537, Level = 41, Location = -1, }, // Seismitoad + new EncounterStatic { Species = 435, Level = 41, Location = -1, }, // Skuntank + new EncounterStatic { Species = 221, Level = 41, Location = -1, }, // Piloswine + new EncounterStatic { Species = 356, Level = 41, Location = -1, }, // Dusclops + new EncounterStatic { Species = 344, Level = 41, Location = -1, }, // Claydol + new EncounterStatic { Species = 689, Level = 60, Location = -1, }, // Barbaracle + new EncounterStatic { Species = 561, Level = 51, Location = -1, }, // Sigilyph + new EncounterStatic { Species = 623, Level = 51, Location = -1, }, // Golurk + new EncounterStatic { Species = 537, Level = 60, Location = -1, }, // Seismitoad + new EncounterStatic { Species = 460, Level = 60, Location = -1, }, // Abomasnow + new EncounterStatic { Species = 045, Level = 41, Location = -1, }, // Vileplume + new EncounterStatic { Species = 178, Level = 41, Location = -1, }, // Xatu + new EncounterStatic { Species = 768, Level = 60, Location = -1, }, // Golisopod + new EncounterStatic { Species = 614, Level = 60, Location = -1, }, // Beartic + new EncounterStatic { Species = 530, Level = 46, Location = -1, }, // Excadrill + new EncounterStatic { Species = 362, Level = 46, Location = -1, }, // Glalie + new EncounterStatic { Species = 537, Level = 46, Location = -1, }, // Seismitoad + new EncounterStatic { Species = 681, Level = 58, Location = -1, }, // Aegislash + new EncounterStatic { Species = 601, Level = 49, Location = -1, }, // Klinklang + new EncounterStatic { Species = 407, Level = 41, Location = -1, }, // Roserade + new EncounterStatic { Species = 460, Level = 41, Location = -1, }, // Abomasnow + new EncounterStatic { Species = 350, Level = 60, Location = -1, Gender = 0, Ability = 1, }, // Milotic + new EncounterStatic { Species = 112, Level = 60, Location = -1, }, // Rhydon + new EncounterStatic { Species = 609, Level = 60, Location = -1, }, // Chandelure + new EncounterStatic { Species = 713, Level = 60, Location = -1, }, // Avalugg + new EncounterStatic { Species = 756, Level = 60, Location = -1, }, // Shiinotic + new EncounterStatic { Species = 134, Level = 56, Location = -1, }, // Vaporeon + new EncounterStatic { Species = 135, Level = 56, Location = -1, }, // Jolteon + new EncounterStatic { Species = 196, Level = 56, Location = -1, }, // Espeon + new EncounterStatic { Species = 471, Level = 56, Location = -1, }, // Glaceon + new EncounterStatic { Species = 136, Level = 56, Location = -1, }, // Flareon + new EncounterStatic { Species = 197, Level = 56, Location = -1, }, // Umbreon + new EncounterStatic { Species = 700, Level = 56, Location = -1, }, // Sylveon + #endregion }; - internal static readonly EncounterTrade[] TradeGift_SWSH = + #region Nest + private const int Nest00 = 100000; + private const int Nest01 = 100001; + private const int Nest02 = 100002; + private const int Nest03 = 100003; + private const int Nest04 = 100004; + private const int Nest05 = 100005; + private const int Nest06 = 100006; + private const int Nest07 = 100007; + private const int Nest08 = 100008; + private const int Nest09 = 100009; + private const int Nest10 = 100010; + private const int Nest11 = 100011; + private const int Nest12 = 100012; + private const int Nest13 = 100013; + private const int Nest14 = 100014; + private const int Nest15 = 100015; + private const int Nest16 = 100016; + private const int Nest17 = 100017; + private const int Nest18 = 100018; + private const int Nest19 = 100019; + private const int Nest20 = 100020; + private const int Nest21 = 100021; + private const int Nest22 = 100022; + private const int Nest23 = 100023; + private const int Nest24 = 100024; + private const int Nest25 = 100025; + private const int Nest26 = 100026; + private const int Nest27 = 100027; + private const int Nest28 = 100028; + private const int Nest29 = 100029; + private const int Nest30 = 100030; + private const int Nest31 = 100031; + private const int Nest32 = 100032; + private const int Nest33 = 100033; + private const int Nest34 = 100034; + private const int Nest35 = 100035; + private const int Nest36 = 100036; + private const int Nest37 = 100037; + private const int Nest38 = 100038; + private const int Nest39 = 100039; + private const int Nest40 = 100040; + private const int Nest41 = 100041; + private const int Nest42 = 100042; + private const int Nest43 = 100043; + private const int Nest44 = 100044; + private const int Nest45 = 100045; + private const int Nest46 = 100046; + private const int Nest47 = 100047; + private const int Nest48 = 100048; + private const int Nest49 = 100049; + private const int Nest50 = 100050; + private const int Nest51 = 100051; + private const int Nest52 = 100052; + private const int Nest53 = 100053; + private const int Nest54 = 100054; + private const int Nest55 = 100055; + private const int Nest56 = 100056; + private const int Nest57 = 100057; + private const int Nest58 = 100058; + private const int Nest59 = 100059; + private const int Nest60 = 100060; + private const int Nest61 = 100061; + private const int Nest62 = 100062; + private const int Nest63 = 100063; + private const int Nest64 = 100064; + private const int Nest65 = 100065; + private const int Nest66 = 100066; + private const int Nest67 = 100067; + private const int Nest68 = 100068; + private const int Nest69 = 100069; + private const int Nest70 = 100070; + private const int Nest71 = 100071; + private const int Nest72 = 100072; + private const int Nest73 = 100073; + private const int Nest74 = 100074; + private const int Nest75 = 100075; + private const int Nest76 = 100076; + private const int Nest77 = 100077; + private const int Nest78 = 100078; + private const int Nest79 = 100079; + private const int Nest80 = 100080; + private const int Nest81 = 100081; + private const int Nest82 = 100082; + private const int Nest83 = 100083; + private const int Nest84 = 100084; + private const int Nest85 = 100085; + private const int Nest86 = 100086; + private const int Nest87 = 100087; + private const int Nest88 = 100088; + private const int Nest89 = 100089; + private const int Nest90 = 100090; + private const int Nest91 = 100091; + private const int Nest92 = 100092; + + internal static readonly EncounterStatic8N[] Nest_Common = { + new EncounterStatic8N(Nest00,0,0,1) { Species = 236, Ability = 4 }, // Tyrogue + new EncounterStatic8N(Nest00,0,0,1) { Species = 066, Ability = 4 }, // Machop + new EncounterStatic8N(Nest00,0,1,1) { Species = 532, Ability = 4 }, // Timburr + new EncounterStatic8N(Nest00,1,2,2) { Species = 067, Ability = 4 }, // Machoke + new EncounterStatic8N(Nest00,1,2,2) { Species = 533, Ability = 4 }, // Gurdurr + new EncounterStatic8N(Nest00,4,4,4) { Species = 068, Ability = -1 }, // Machamp + new EncounterStatic8N(Nest01,0,0,1) { Species = 280, Ability = 4 }, // Ralts + new EncounterStatic8N(Nest01,0,0,1) { Species = 517, Ability = 4 }, // Munna + new EncounterStatic8N(Nest01,0,1,1) { Species = 677, Ability = 4 }, // Espurr + new EncounterStatic8N(Nest01,0,1,1) { Species = 605, Ability = 4 }, // Elgyem + new EncounterStatic8N(Nest01,1,2,2) { Species = 281, Ability = 4 }, // Kirlia + new EncounterStatic8N(Nest01,2,4,4) { Species = 518, Ability = 4 }, // Musharna + new EncounterStatic8N(Nest01,4,4,4) { Species = 282, Ability = -1 }, // Gardevoir + new EncounterStatic8N(Nest02,0,0,1) { Species = 438, Ability = 4 }, // Bonsly + new EncounterStatic8N(Nest02,0,1,1) { Species = 557, Ability = 4 }, // Dwebble + new EncounterStatic8N(Nest02,1,2,2) { Species = 111, Ability = 4 }, // Rhyhorn + new EncounterStatic8N(Nest02,1,2,2) { Species = 525, Ability = 4 }, // Boldore + new EncounterStatic8N(Nest02,2,3,3) { Species = 689, Ability = 4 }, // Barbaracle + new EncounterStatic8N(Nest02,2,4,4) { Species = 112, Ability = 4 }, // Rhydon + new EncounterStatic8N(Nest02,2,4,4) { Species = 185, Ability = 4 }, // Sudowoodo + new EncounterStatic8N(Nest02,4,4,4) { Species = 213, Ability = -1 }, // Shuckle + new EncounterStatic8N(Nest03,0,0,1) { Species = 010, Ability = 4 }, // Caterpie + new EncounterStatic8N(Nest03,0,0,1) { Species = 736, Ability = 4 }, // Grubbin + new EncounterStatic8N(Nest03,0,1,1) { Species = 290, Ability = 4 }, // Nincada + new EncounterStatic8N(Nest03,0,1,1) { Species = 595, Ability = 4 }, // Joltik + new EncounterStatic8N(Nest03,1,2,2) { Species = 011, Ability = 4 }, // Metapod + new EncounterStatic8N(Nest03,1,2,2) { Species = 632, Ability = 4 }, // Durant + new EncounterStatic8N(Nest03,2,3,3) { Species = 737, Ability = 4 }, // Charjabug + new EncounterStatic8N(Nest03,2,4,4) { Species = 291, Ability = 4 }, // Ninjask + new EncounterStatic8N(Nest03,2,4,4) { Species = 012, Ability = 4 }, // Butterfree + new EncounterStatic8N(Nest03,3,4,4) { Species = 596, Ability = -1 }, // Galvantula + new EncounterStatic8N(Nest03,4,4,4) { Species = 738, Ability = -1 }, // Vikavolt + new EncounterStatic8N(Nest03,4,4,4) { Species = 632, Ability = -1 }, // Durant + new EncounterStatic8N(Nest04,0,0,1) { Species = 010, Ability = 4 }, // Caterpie + new EncounterStatic8N(Nest04,0,0,1) { Species = 415, Ability = 4 }, // Combee + new EncounterStatic8N(Nest04,0,1,1) { Species = 742, Ability = 4 }, // Cutiefly + new EncounterStatic8N(Nest04,0,1,1) { Species = 824, Ability = 4 }, // Blipbug + new EncounterStatic8N(Nest04,1,2,2) { Species = 595, Ability = 4 }, // Joltik + new EncounterStatic8N(Nest04,1,2,2) { Species = 011, Ability = 4 }, // Metapod + new EncounterStatic8N(Nest04,2,3,3) { Species = 825, Ability = 4 }, // Dottler + new EncounterStatic8N(Nest04,2,4,4) { Species = 596, Ability = 4 }, // Galvantula + new EncounterStatic8N(Nest04,2,4,4) { Species = 012, Ability = 4 }, // Butterfree + new EncounterStatic8N(Nest04,3,4,4) { Species = 743, Ability = -1 }, // Ribombee + new EncounterStatic8N(Nest04,4,4,4) { Species = 416, Ability = -1 }, // Vespiquen + new EncounterStatic8N(Nest04,4,4,4) { Species = 826, Ability = -1 }, // Orbeetle + new EncounterStatic8N(Nest05,0,0,1) { Species = 092, Ability = 4 }, // Gastly + new EncounterStatic8N(Nest05,0,0,1) { Species = 355, Ability = 4 }, // Duskull + new EncounterStatic8N(Nest05,0,1,1) { Species = 425, Ability = 4 }, // Drifloon + new EncounterStatic8N(Nest05,0,1,1) { Species = 708, Ability = 4 }, // Phantump + new EncounterStatic8N(Nest05,0,1,1) { Species = 592, Ability = 4 }, // Frillish + new EncounterStatic8N(Nest05,1,2,2) { Species = 710, Ability = 4 }, // Pumpkaboo + new EncounterStatic8N(Nest05,2,3,3) { Species = 093, Ability = 4 }, // Haunter + new EncounterStatic8N(Nest05,2,4,4) { Species = 356, Ability = 4 }, // Dusclops + new EncounterStatic8N(Nest05,2,4,4) { Species = 426, Ability = 4 }, // Drifblim + new EncounterStatic8N(Nest05,3,4,4) { Species = 709, Ability = -1 }, // Trevenant + new EncounterStatic8N(Nest05,4,4,4) { Species = 711, Ability = -1 }, // Gourgeist + new EncounterStatic8N(Nest05,4,4,4) { Species = 593, Ability = -1 }, // Jellicent + new EncounterStatic8N(Nest06,0,0,1) { Species = 129, Ability = 4 }, // Magikarp + new EncounterStatic8N(Nest06,0,0,1) { Species = 458, Ability = 4 }, // Mantyke + new EncounterStatic8N(Nest06,1,2,2) { Species = 320, Ability = 4 }, // Wailmer + new EncounterStatic8N(Nest06,2,3,3) { Species = 224, Ability = 4 }, // Octillery + new EncounterStatic8N(Nest06,2,4,4) { Species = 226, Ability = 4 }, // Mantine + new EncounterStatic8N(Nest06,2,4,4) { Species = 171, Ability = 4 }, // Lanturn + new EncounterStatic8N(Nest06,3,4,4) { Species = 321, Ability = -1 }, // Wailord + new EncounterStatic8N(Nest06,4,4,4) { Species = 746, Ability = -1 }, // Wishiwashi + new EncounterStatic8N(Nest06,4,4,4) { Species = 130, Ability = -1 }, // Gyarados + new EncounterStatic8N(Nest07,0,0,1) { Species = 833, Ability = 4 }, // Chewtle + new EncounterStatic8N(Nest07,0,0,1) { Species = 846, Ability = 4 }, // Arrokuda + new EncounterStatic8N(Nest07,0,1,1) { Species = 422, Ability = 4, Form = 1 }, // Shellos-1 + new EncounterStatic8N(Nest07,0,1,1) { Species = 751, Ability = 4 }, // Dewpider + new EncounterStatic8N(Nest07,1,2,2) { Species = 320, Ability = 4 }, // Wailmer + new EncounterStatic8N(Nest07,2,3,3) { Species = 746, Ability = 4 }, // Wishiwashi + new EncounterStatic8N(Nest07,2,4,4) { Species = 834, Ability = 4 }, // Drednaw + new EncounterStatic8N(Nest07,2,4,4) { Species = 847, Ability = 4 }, // Barraskewda + new EncounterStatic8N(Nest07,3,4,4) { Species = 752, Ability = -1 }, // Araquanid + new EncounterStatic8N(Nest07,4,4,4) { Species = 423, Ability = -1, Form = 1 }, // Gastrodon-1 + new EncounterStatic8N(Nest07,4,4,4) { Species = 321, Ability = -1 }, // Wailord + new EncounterStatic8N(Nest08,0,0,1) { Species = 833, Ability = 4 }, // Chewtle + new EncounterStatic8N(Nest08,0,0,1) { Species = 194, Ability = 4 }, // Wooper + new EncounterStatic8N(Nest08,0,1,1) { Species = 535, Ability = 4 }, // Tympole + new EncounterStatic8N(Nest08,0,1,1) { Species = 341, Ability = 4 }, // Corphish + new EncounterStatic8N(Nest08,1,2,2) { Species = 536, Ability = 4 }, // Palpitoad + new EncounterStatic8N(Nest08,2,3,3) { Species = 834, Ability = 4 }, // Drednaw + new EncounterStatic8N(Nest08,2,4,4) { Species = 195, Ability = 4 }, // Quagsire + new EncounterStatic8N(Nest08,2,4,4) { Species = 771, Ability = 4 }, // Pyukumuku + new EncounterStatic8N(Nest08,3,4,4) { Species = 091, Ability = -1 }, // Cloyster + new EncounterStatic8N(Nest08,4,4,4) { Species = 537, Ability = -1 }, // Seismitoad + new EncounterStatic8N(Nest08,4,4,4) { Species = 342, Ability = -1 }, // Crawdaunt + new EncounterStatic8N(Nest09,0,0,1) { Species = 236, Ability = 4 }, // Tyrogue + new EncounterStatic8N(Nest09,0,0,1) { Species = 759, Ability = 4 }, // Stufful + new EncounterStatic8N(Nest09,0,1,1) { Species = 852, Ability = 4 }, // Clobbopus + new EncounterStatic8N(Nest09,0,1,1) { Species = 674, Ability = 4 }, // Pancham + new EncounterStatic8N(Nest09,2,4,4) { Species = 760, Ability = 4 }, // Bewear + new EncounterStatic8N(Nest09,2,4,4) { Species = 675, Ability = 4 }, // Pangoro + new EncounterStatic8N(Nest09,2,4,4) { Species = 701, Ability = 4 }, // Hawlucha + new EncounterStatic8N(Nest09,4,4,4) { Species = 853, Ability = -1 }, // Grapploct + new EncounterStatic8N(Nest09,4,4,4) { Species = 870, Ability = -1 }, // Falinks + new EncounterStatic8N(Nest10,0,0,1) { Species = 599, Ability = 4 }, // Klink + new EncounterStatic8N(Nest10,0,0,1) { Species = 052, Ability = 4, Form = 2 }, // Meowth-2 + new EncounterStatic8N(Nest10,0,1,1) { Species = 436, Ability = 4 }, // Bronzor + new EncounterStatic8N(Nest10,0,1,1) { Species = 597, Ability = 4 }, // Ferroseed + new EncounterStatic8N(Nest10,1,1,2) { Species = 624, Ability = 4 }, // Pawniard + new EncounterStatic8N(Nest10,1,2,2) { Species = 878, Ability = 4 }, // Cufant + new EncounterStatic8N(Nest10,2,4,4) { Species = 600, Ability = 4 }, // Klang + new EncounterStatic8N(Nest10,2,4,4) { Species = 863, Ability = 4 }, // Perrserker + new EncounterStatic8N(Nest10,2,4,4) { Species = 437, Ability = 4 }, // Bronzong + new EncounterStatic8N(Nest10,3,4,4) { Species = 625, Ability = -1 }, // Bisharp + new EncounterStatic8N(Nest10,4,4,4) { Species = 601, Ability = -1 }, // Klinklang + new EncounterStatic8N(Nest10,4,4,4) { Species = 879, Ability = -1 }, // Copperajah + new EncounterStatic8N(Nest11,0,0,1) { Species = 599, Ability = 4 }, // Klink + new EncounterStatic8N(Nest11,0,0,1) { Species = 436, Ability = 4 }, // Bronzor + new EncounterStatic8N(Nest11,0,1,1) { Species = 597, Ability = 4 }, // Ferroseed + new EncounterStatic8N(Nest11,0,1,1) { Species = 624, Ability = 4 }, // Pawniard + new EncounterStatic8N(Nest11,1,1,2) { Species = 599, Ability = 4 }, // Klink + new EncounterStatic8N(Nest11,1,2,2) { Species = 436, Ability = 4 }, // Bronzor + new EncounterStatic8N(Nest11,2,4,4) { Species = 208, Ability = 4 }, // Steelix + new EncounterStatic8N(Nest11,2,4,4) { Species = 598, Ability = 4 }, // Ferrothorn + new EncounterStatic8N(Nest11,2,4,4) { Species = 437, Ability = 4 }, // Bronzong + new EncounterStatic8N(Nest11,3,4,4) { Species = 625, Ability = -1 }, // Bisharp + new EncounterStatic8N(Nest11,4,4,4) { Species = 777, Ability = -1 }, // Togedemaru + new EncounterStatic8N(Nest12,0,0,1) { Species = 439, Ability = 4 }, // Mime Jr. + new EncounterStatic8N(Nest12,0,0,1) { Species = 824, Ability = 4 }, // Blipbug + new EncounterStatic8N(Nest12,2,3,3) { Species = 561, Ability = 4 }, // Sigilyph + new EncounterStatic8N(Nest12,2,3,3) { Species = 178, Ability = 4 }, // Xatu + new EncounterStatic8N(Nest12,4,4,4) { Species = 858, Ability = -1 }, // Hatterene + new EncounterStatic8N(Nest13,0,0,1) { Species = 439, Ability = 4 }, // Mime Jr. + new EncounterStatic8N(Nest13,0,0,1) { Species = 360, Ability = 4 }, // Wynaut + new EncounterStatic8N(Nest13,0,1,1) { Species = 177, Ability = 4 }, // Natu + new EncounterStatic8N(Nest13,0,1,1) { Species = 343, Ability = 4 }, // Baltoy + new EncounterStatic8N(Nest13,1,1,1) { Species = 436, Ability = 4 }, // Bronzor + new EncounterStatic8N(Nest13,1,3,3) { Species = 122, Ability = 4, Form = 1 }, // Mr. Mime-1 + new EncounterStatic8N(Nest13,2,3,3) { Species = 561, Ability = 4 }, // Sigilyph + new EncounterStatic8N(Nest13,2,3,3) { Species = 178, Ability = 4 }, // Xatu + new EncounterStatic8N(Nest13,3,4,4) { Species = 344, Ability = -1 }, // Claydol + new EncounterStatic8N(Nest13,4,4,4) { Species = 866, Ability = -1 }, // Mr. Rime + new EncounterStatic8N(Nest13,4,4,4) { Species = 202, Ability = -1 }, // Wobbuffet + new EncounterStatic8N(Nest14,0,0,1) { Species = 837, Ability = 4 }, // Rolycoly + new EncounterStatic8N(Nest14,0,1,1) { Species = 688, Ability = 4 }, // Binacle + new EncounterStatic8N(Nest14,1,1,1) { Species = 838, Ability = 4 }, // Carkol + new EncounterStatic8N(Nest14,1,2,2) { Species = 525, Ability = 4 }, // Boldore + new EncounterStatic8N(Nest14,2,3,3) { Species = 558, Ability = 4 }, // Crustle + new EncounterStatic8N(Nest14,2,4,4) { Species = 689, Ability = 4 }, // Barbaracle + new EncounterStatic8N(Nest14,4,4,4) { Species = 464, Ability = -1 }, // Rhyperior + new EncounterStatic8N(Nest15,0,0,1) { Species = 050, Ability = 4 }, // Diglett + new EncounterStatic8N(Nest15,0,0,1) { Species = 749, Ability = 4 }, // Mudbray + new EncounterStatic8N(Nest15,0,1,1) { Species = 290, Ability = 4 }, // Nincada + new EncounterStatic8N(Nest15,0,1,1) { Species = 529, Ability = 4 }, // Drilbur + new EncounterStatic8N(Nest15,1,1,1) { Species = 095, Ability = 4 }, // Onix + new EncounterStatic8N(Nest15,1,2,2) { Species = 339, Ability = 4 }, // Barboach + new EncounterStatic8N(Nest15,2,3,3) { Species = 208, Ability = 4 }, // Steelix + new EncounterStatic8N(Nest15,2,4,4) { Species = 340, Ability = 4 }, // Whiscash + new EncounterStatic8N(Nest15,2,4,4) { Species = 660, Ability = 4 }, // Diggersby + new EncounterStatic8N(Nest15,3,4,4) { Species = 051, Ability = -1 }, // Dugtrio + new EncounterStatic8N(Nest15,4,4,4) { Species = 530, Ability = -1 }, // Excadrill + new EncounterStatic8N(Nest15,4,4,4) { Species = 750, Ability = -1 }, // Mudsdale + new EncounterStatic8N(Nest16,0,0,1) { Species = 843, Ability = 4 }, // Silicobra + new EncounterStatic8N(Nest16,0,0,1) { Species = 562, Ability = 4, Form = 1 }, // Yamask-1 + new EncounterStatic8N(Nest16,0,1,1) { Species = 449, Ability = 4 }, // Hippopotas + new EncounterStatic8N(Nest16,1,2,2) { Species = 221, Ability = 4 }, // Piloswine + new EncounterStatic8N(Nest16,4,4,4) { Species = 867, Ability = 4 }, // Runerigus + new EncounterStatic8N(Nest16,4,4,4) { Species = 844, Ability = -1 }, // Sandaconda + new EncounterStatic8N(Nest17,0,0,1) { Species = 850, Ability = 4 }, // Sizzlipede + new EncounterStatic8N(Nest17,0,1,1) { Species = 757, Ability = 4 }, // Salandit + new EncounterStatic8N(Nest17,0,1,1) { Species = 607, Ability = 4 }, // Litwick + new EncounterStatic8N(Nest17,2,4,4) { Species = 324, Ability = 4 }, // Torkoal + new EncounterStatic8N(Nest18,0,0,1) { Species = 757, Ability = 4 }, // Salandit + new EncounterStatic8N(Nest18,0,1,1) { Species = 607, Ability = 4 }, // Litwick + new EncounterStatic8N(Nest18,1,1,1) { Species = 757, Ability = 4 }, // Salandit + new EncounterStatic8N(Nest18,4,4,4) { Species = 609, Ability = -1 }, // Chandelure + new EncounterStatic8N(Nest19,0,0,1) { Species = 850, Ability = 4 }, // Sizzlipede + new EncounterStatic8N(Nest19,0,1,1) { Species = 757, Ability = 4 }, // Salandit + new EncounterStatic8N(Nest19,0,1,1) { Species = 607, Ability = 4 }, // Litwick + new EncounterStatic8N(Nest19,2,4,4) { Species = 324, Ability = 4 }, // Torkoal + new EncounterStatic8N(Nest19,3,4,4) { Species = 851, Ability = -1 }, // Centiskorch + new EncounterStatic8N(Nest19,4,4,4) { Species = 839, Ability = -1 }, // Coalossal + new EncounterStatic8N(Nest20,0,0,1) { Species = 582, Ability = 4 }, // Vanillite + new EncounterStatic8N(Nest20,0,0,1) { Species = 220, Ability = 4 }, // Swinub + new EncounterStatic8N(Nest20,0,1,1) { Species = 459, Ability = 4 }, // Snover + new EncounterStatic8N(Nest20,0,1,1) { Species = 712, Ability = 4 }, // Bergmite + new EncounterStatic8N(Nest20,1,1,1) { Species = 225, Ability = 4 }, // Delibird + new EncounterStatic8N(Nest20,1,2,2) { Species = 583, Ability = 4 }, // Vanillish + new EncounterStatic8N(Nest20,2,3,3) { Species = 221, Ability = 4 }, // Piloswine + new EncounterStatic8N(Nest20,2,4,4) { Species = 713, Ability = 4 }, // Avalugg + new EncounterStatic8N(Nest20,2,4,4) { Species = 460, Ability = 4 }, // Abomasnow + new EncounterStatic8N(Nest20,3,4,4) { Species = 091, Ability = -1 }, // Cloyster + new EncounterStatic8N(Nest20,4,4,4) { Species = 584, Ability = -1 }, // Vanilluxe + new EncounterStatic8N(Nest20,4,4,4) { Species = 131, Ability = -1 }, // Lapras + new EncounterStatic8N(Nest21,0,0,1) { Species = 220, Ability = 4 }, // Swinub + new EncounterStatic8N(Nest21,0,0,1) { Species = 613, Ability = 4 }, // Cubchoo + new EncounterStatic8N(Nest21,0,1,1) { Species = 872, Ability = 4 }, // Snom + new EncounterStatic8N(Nest21,0,1,1) { Species = 215, Ability = 4 }, // Sneasel + new EncounterStatic8N(Nest21,1,1,1) { Species = 122, Ability = 4, Form = 1 }, // Mr. Mime-1 + new EncounterStatic8N(Nest21,1,2,2) { Species = 221, Ability = 4 }, // Piloswine + new EncounterStatic8N(Nest21,2,3,3) { Species = 091, Ability = 4 }, // Cloyster + new EncounterStatic8N(Nest21,2,4,4) { Species = 614, Ability = 4 }, // Beartic + new EncounterStatic8N(Nest21,2,4,4) { Species = 866, Ability = 4 }, // Mr. Rime + new EncounterStatic8N(Nest21,3,4,4) { Species = 473, Ability = -1 }, // Mamoswine + new EncounterStatic8N(Nest21,4,4,4) { Species = 873, Ability = -1 }, // Frosmoth + new EncounterStatic8N(Nest21,4,4,4) { Species = 461, Ability = -1 }, // Weavile + new EncounterStatic8N(Nest22,0,0,1) { Species = 361, Ability = 4 }, // Snorunt + new EncounterStatic8N(Nest22,0,0,1) { Species = 872, Ability = 4 }, // Snom + new EncounterStatic8N(Nest22,0,1,1) { Species = 215, Ability = 4 }, // Sneasel + new EncounterStatic8N(Nest22,1,1,2) { Species = 122, Ability = 4, Form = 1 }, // Mr. Mime-1 + new EncounterStatic8N(Nest22,1,2,3) { Species = 459, Ability = 4 }, // Snover + new EncounterStatic8N(Nest22,2,3,3) { Species = 460, Ability = 4 }, // Abomasnow + new EncounterStatic8N(Nest22,2,4,4) { Species = 362, Ability = 4 }, // Glalie + new EncounterStatic8N(Nest22,2,4,4) { Species = 866, Ability = 4 }, // Mr. Rime + new EncounterStatic8N(Nest22,3,4,4) { Species = 873, Ability = -1 }, // Frosmoth + new EncounterStatic8N(Nest22,4,4,4) { Species = 478, Ability = -1 }, // Froslass + new EncounterStatic8N(Nest23,0,0,1) { Species = 172, Ability = 4 }, // Pichu + new EncounterStatic8N(Nest23,0,0,1) { Species = 309, Ability = 4 }, // Electrike + new EncounterStatic8N(Nest23,0,1,1) { Species = 595, Ability = 4 }, // Joltik + new EncounterStatic8N(Nest23,0,1,1) { Species = 170, Ability = 4 }, // Chinchou + new EncounterStatic8N(Nest23,1,1,2) { Species = 737, Ability = 4 }, // Charjabug + new EncounterStatic8N(Nest23,1,2,3) { Species = 025, Ability = 4 }, // Pikachu + new EncounterStatic8N(Nest23,2,3,3) { Species = 025, Ability = 4 }, // Pikachu + new EncounterStatic8N(Nest23,2,4,4) { Species = 310, Ability = 4 }, // Manectric + new EncounterStatic8N(Nest23,2,4,4) { Species = 171, Ability = 4 }, // Lanturn + new EncounterStatic8N(Nest23,3,4,4) { Species = 596, Ability = -1 }, // Galvantula + new EncounterStatic8N(Nest23,4,4,4) { Species = 738, Ability = -1 }, // Vikavolt + new EncounterStatic8N(Nest23,4,4,4) { Species = 026, Ability = -1 }, // Raichu + new EncounterStatic8N(Nest24,0,0,1) { Species = 835, Ability = 4 }, // Yamper + new EncounterStatic8N(Nest24,0,0,1) { Species = 694, Ability = 4 }, // Helioptile + new EncounterStatic8N(Nest24,0,1,1) { Species = 848, Ability = 4 }, // Toxel + new EncounterStatic8N(Nest24,0,1,1) { Species = 170, Ability = 4 }, // Chinchou + new EncounterStatic8N(Nest24,1,1,2) { Species = 025, Ability = 4 }, // Pikachu + new EncounterStatic8N(Nest24,1,2,3) { Species = 171, Ability = 4 }, // Lanturn + new EncounterStatic8N(Nest24,2,3,3) { Species = 836, Ability = 4 }, // Boltund + new EncounterStatic8N(Nest24,2,4,4) { Species = 695, Ability = 4 }, // Heliolisk + new EncounterStatic8N(Nest24,2,4,4) { Species = 849, Ability = 4 }, // Toxtricity + new EncounterStatic8N(Nest24,3,4,4) { Species = 871, Ability = -1 }, // Pincurchin + new EncounterStatic8N(Nest24,4,4,4) { Species = 777, Ability = -1 }, // Togedemaru + new EncounterStatic8N(Nest24,4,4,4) { Species = 877, Ability = -1 }, // Morpeko + new EncounterStatic8N(Nest25,0,0,1) { Species = 406, Ability = 4 }, // Budew + new EncounterStatic8N(Nest25,0,1,1) { Species = 761, Ability = 4 }, // Bounsweet + new EncounterStatic8N(Nest25,0,1,1) { Species = 043, Ability = 4 }, // Oddish + new EncounterStatic8N(Nest25,1,2,3) { Species = 315, Ability = 4 }, // Roselia + new EncounterStatic8N(Nest25,2,3,3) { Species = 044, Ability = 4 }, // Gloom + new EncounterStatic8N(Nest25,2,4,4) { Species = 762, Ability = 4 }, // Steenee + new EncounterStatic8N(Nest25,3,4,4) { Species = 763, Ability = -1 }, // Tsareena + new EncounterStatic8N(Nest25,4,4,4) { Species = 045, Ability = -1 }, // Vileplume + new EncounterStatic8N(Nest25,4,4,4) { Species = 182, Ability = -1 }, // Bellossom + new EncounterStatic8N(Nest26,0,0,1) { Species = 406, Ability = 4 }, // Budew + new EncounterStatic8N(Nest26,0,0,1) { Species = 829, Ability = 4 }, // Gossifleur + new EncounterStatic8N(Nest26,0,1,1) { Species = 546, Ability = 4 }, // Cottonee + new EncounterStatic8N(Nest26,0,1,1) { Species = 840, Ability = 4 }, // Applin + new EncounterStatic8N(Nest26,1,1,2) { Species = 420, Ability = 4 }, // Cherubi + new EncounterStatic8N(Nest26,1,2,2) { Species = 315, Ability = 4 }, // Roselia + new EncounterStatic8N(Nest26,2,3,3) { Species = 597, Ability = 4 }, // Ferroseed + new EncounterStatic8N(Nest26,2,4,4) { Species = 598, Ability = 4 }, // Ferrothorn + new EncounterStatic8N(Nest26,2,4,4) { Species = 421, Ability = 4 }, // Cherrim + new EncounterStatic8N(Nest26,3,4,4) { Species = 830, Ability = -1 }, // Eldegoss + new EncounterStatic8N(Nest26,4,4,4) { Species = 547, Ability = -1 }, // Whimsicott + new EncounterStatic8N(Nest27,0,0,1) { Species = 710, Ability = 4, Form = 1 }, // Pumpkaboo-1 + new EncounterStatic8N(Nest27,0,0,1) { Species = 708, Ability = 4 }, // Phantump + new EncounterStatic8N(Nest27,0,1,1) { Species = 710, Ability = 4 }, // Pumpkaboo + new EncounterStatic8N(Nest27,0,1,1) { Species = 755, Ability = 4 }, // Morelull + new EncounterStatic8N(Nest27,1,1,2) { Species = 710, Ability = 4, Form = 2 }, // Pumpkaboo-2 + new EncounterStatic8N(Nest27,1,2,2) { Species = 315, Ability = 4 }, // Roselia + new EncounterStatic8N(Nest27,2,3,3) { Species = 756, Ability = 4 }, // Shiinotic + new EncounterStatic8N(Nest27,2,4,4) { Species = 556, Ability = 4 }, // Maractus + new EncounterStatic8N(Nest27,2,4,4) { Species = 709, Ability = 4 }, // Trevenant + new EncounterStatic8N(Nest27,3,4,4) { Species = 711, Ability = -1 }, // Gourgeist + new EncounterStatic8N(Nest27,4,4,4) { Species = 781, Ability = -1 }, // Dhelmise + new EncounterStatic8N(Nest27,4,4,4) { Species = 710, Ability = -1, Form = 3 }, // Pumpkaboo-3 + new EncounterStatic8N(Nest28,0,0,1) { Species = 434, Ability = 4 }, // Stunky + new EncounterStatic8N(Nest28,0,0,1) { Species = 568, Ability = 4 }, // Trubbish + new EncounterStatic8N(Nest28,0,1,1) { Species = 451, Ability = 4 }, // Skorupi + new EncounterStatic8N(Nest28,1,2,2) { Species = 315, Ability = 4 }, // Roselia + new EncounterStatic8N(Nest28,2,3,3) { Species = 211, Ability = 4 }, // Qwilfish + new EncounterStatic8N(Nest28,2,4,4) { Species = 452, Ability = 4 }, // Drapion + new EncounterStatic8N(Nest28,2,4,4) { Species = 045, Ability = 4 }, // Vileplume + new EncounterStatic8N(Nest28,4,4,4) { Species = 569, Ability = -1 }, // Garbodor + new EncounterStatic8N(Nest29,0,0,1) { Species = 848, Ability = 4 }, // Toxel + new EncounterStatic8N(Nest29,0,0,1) { Species = 092, Ability = 4 }, // Gastly + new EncounterStatic8N(Nest29,0,1,1) { Species = 451, Ability = 4 }, // Skorupi + new EncounterStatic8N(Nest29,0,1,1) { Species = 043, Ability = 4 }, // Oddish + new EncounterStatic8N(Nest29,1,1,2) { Species = 044, Ability = 4 }, // Gloom + new EncounterStatic8N(Nest29,1,2,2) { Species = 093, Ability = 4 }, // Haunter + new EncounterStatic8N(Nest29,2,3,3) { Species = 109, Ability = 4 }, // Koffing + new EncounterStatic8N(Nest29,2,4,4) { Species = 211, Ability = 4 }, // Qwilfish + new EncounterStatic8N(Nest29,2,4,4) { Species = 045, Ability = 4 }, // Vileplume + new EncounterStatic8N(Nest29,3,4,4) { Species = 315, Ability = -1 }, // Roselia + new EncounterStatic8N(Nest29,4,4,4) { Species = 849, Ability = -1 }, // Toxtricity + new EncounterStatic8N(Nest29,4,4,4) { Species = 110, Ability = -1, Form = 1 }, // Weezing-1 + new EncounterStatic8N(Nest30,0,0,1) { Species = 519, Ability = 4 }, // Pidove + new EncounterStatic8N(Nest30,0,0,1) { Species = 163, Ability = 4 }, // Hoothoot + new EncounterStatic8N(Nest30,0,1,1) { Species = 177, Ability = 4 }, // Natu + new EncounterStatic8N(Nest30,1,1,2) { Species = 527, Ability = 4 }, // Woobat + new EncounterStatic8N(Nest30,1,2,2) { Species = 520, Ability = 4 }, // Tranquill + new EncounterStatic8N(Nest30,2,3,3) { Species = 521, Ability = 4 }, // Unfezant + new EncounterStatic8N(Nest30,2,4,4) { Species = 164, Ability = 4 }, // Noctowl + new EncounterStatic8N(Nest30,2,4,4) { Species = 528, Ability = 4 }, // Swoobat + new EncounterStatic8N(Nest30,3,4,4) { Species = 178, Ability = -1 }, // Xatu + new EncounterStatic8N(Nest30,4,4,4) { Species = 561, Ability = -1 }, // Sigilyph + new EncounterStatic8N(Nest31,0,0,1) { Species = 821, Ability = 4 }, // Rookidee + new EncounterStatic8N(Nest31,0,0,1) { Species = 714, Ability = 4 }, // Noibat + new EncounterStatic8N(Nest31,0,1,1) { Species = 278, Ability = 4 }, // Wingull + new EncounterStatic8N(Nest31,0,1,1) { Species = 177, Ability = 4 }, // Natu + new EncounterStatic8N(Nest31,1,1,2) { Species = 425, Ability = 4 }, // Drifloon + new EncounterStatic8N(Nest31,1,2,2) { Species = 822, Ability = 4 }, // Corvisquire + new EncounterStatic8N(Nest31,2,3,3) { Species = 426, Ability = 4 }, // Drifblim + new EncounterStatic8N(Nest31,2,4,4) { Species = 279, Ability = 4 }, // Pelipper + new EncounterStatic8N(Nest31,2,4,4) { Species = 178, Ability = 4 }, // Xatu + new EncounterStatic8N(Nest31,3,4,4) { Species = 823, Ability = -1 }, // Corviknight + new EncounterStatic8N(Nest31,4,4,4) { Species = 701, Ability = -1 }, // Hawlucha + new EncounterStatic8N(Nest31,4,4,4) { Species = 845, Ability = -1 }, // Cramorant + new EncounterStatic8N(Nest32,0,0,1) { Species = 173, Ability = 4 }, // Cleffa + new EncounterStatic8N(Nest32,0,0,1) { Species = 175, Ability = 4 }, // Togepi + new EncounterStatic8N(Nest32,0,1,1) { Species = 742, Ability = 4 }, // Cutiefly + new EncounterStatic8N(Nest32,1,1,2) { Species = 035, Ability = 4 }, // Clefairy + new EncounterStatic8N(Nest32,1,2,2) { Species = 755, Ability = 4 }, // Morelull + new EncounterStatic8N(Nest32,2,3,3) { Species = 176, Ability = 4 }, // Togetic + new EncounterStatic8N(Nest32,2,4,4) { Species = 036, Ability = 4 }, // Clefable + new EncounterStatic8N(Nest32,2,4,4) { Species = 743, Ability = 4 }, // Ribombee + new EncounterStatic8N(Nest32,3,4,4) { Species = 756, Ability = -1 }, // Shiinotic + new EncounterStatic8N(Nest32,4,4,4) { Species = 468, Ability = -1 }, // Togekiss + new EncounterStatic8N(Nest33,0,0,1) { Species = 439, Ability = 4 }, // Mime Jr. + new EncounterStatic8N(Nest33,0,0,1) { Species = 868, Ability = 4 }, // Milcery + new EncounterStatic8N(Nest33,0,1,1) { Species = 859, Ability = 4 }, // Impidimp + new EncounterStatic8N(Nest33,0,1,1) { Species = 280, Ability = 4 }, // Ralts + new EncounterStatic8N(Nest33,1,1,2) { Species = 035, Ability = 4 }, // Clefairy + new EncounterStatic8N(Nest33,1,2,2) { Species = 281, Ability = 4 }, // Kirlia + new EncounterStatic8N(Nest33,2,3,3) { Species = 860, Ability = 4 }, // Morgrem + new EncounterStatic8N(Nest33,2,4,4) { Species = 036, Ability = 4 }, // Clefable + new EncounterStatic8N(Nest33,2,4,4) { Species = 282, Ability = 4 }, // Gardevoir + new EncounterStatic8N(Nest33,3,4,4) { Species = 869, Ability = -1 }, // Alcremie + new EncounterStatic8N(Nest33,4,4,4) { Species = 861, Ability = -1 }, // Grimmsnarl + new EncounterStatic8N(Nest34,0,0,1) { Species = 509, Ability = 4 }, // Purrloin + new EncounterStatic8N(Nest34,0,0,1) { Species = 434, Ability = 4 }, // Stunky + new EncounterStatic8N(Nest34,0,1,1) { Species = 215, Ability = 4 }, // Sneasel + new EncounterStatic8N(Nest34,0,1,1) { Species = 686, Ability = 4 }, // Inkay + new EncounterStatic8N(Nest34,1,1,2) { Species = 624, Ability = 4 }, // Pawniard + new EncounterStatic8N(Nest34,1,2,2) { Species = 510, Ability = 4 }, // Liepard + new EncounterStatic8N(Nest34,2,3,3) { Species = 435, Ability = 4 }, // Skuntank + new EncounterStatic8N(Nest34,2,4,4) { Species = 461, Ability = 4 }, // Weavile + new EncounterStatic8N(Nest34,2,4,4) { Species = 687, Ability = 4 }, // Malamar + new EncounterStatic8N(Nest34,3,4,4) { Species = 625, Ability = -1 }, // Bisharp + new EncounterStatic8N(Nest34,4,4,4) { Species = 342, Ability = -1 }, // Crawdaunt + new EncounterStatic8N(Nest35,0,0,1) { Species = 827, Ability = 4 }, // Nickit + new EncounterStatic8N(Nest35,0,0,1) { Species = 263, Ability = 4, Form = 1 }, // Zigzagoon-1 + new EncounterStatic8N(Nest35,0,1,1) { Species = 509, Ability = 4 }, // Purrloin + new EncounterStatic8N(Nest35,0,1,1) { Species = 859, Ability = 4 }, // Impidimp + new EncounterStatic8N(Nest35,1,2,2) { Species = 828, Ability = 4 }, // Thievul + new EncounterStatic8N(Nest35,2,3,3) { Species = 264, Ability = 4, Form = 1 }, // Linoone-1 + new EncounterStatic8N(Nest35,2,4,4) { Species = 860, Ability = 4 }, // Morgrem + new EncounterStatic8N(Nest35,2,4,4) { Species = 861, Ability = 4 }, // Grimmsnarl + new EncounterStatic8N(Nest35,4,4,4) { Species = 862, Ability = -1 }, // Obstagoon + new EncounterStatic8N(Nest36,0,0,1) { Species = 714, Ability = 4 }, // Noibat + new EncounterStatic8N(Nest36,0,1,1) { Species = 714, Ability = 4 }, // Noibat + new EncounterStatic8N(Nest36,1,2,2) { Species = 329, Ability = 4 }, // Vibrava + new EncounterStatic8N(Nest37,0,0,1) { Species = 714, Ability = 4 }, // Noibat + new EncounterStatic8N(Nest37,0,0,1) { Species = 840, Ability = 4 }, // Applin + new EncounterStatic8N(Nest37,0,1,1) { Species = 885, Ability = 4 }, // Dreepy + new EncounterStatic8N(Nest37,1,1,2) { Species = 714, Ability = 4 }, // Noibat + new EncounterStatic8N(Nest37,1,2,2) { Species = 840, Ability = 4 }, // Applin + new EncounterStatic8N(Nest37,2,3,3) { Species = 886, Ability = 4 }, // Drakloak + new EncounterStatic8N(Nest37,2,4,4) { Species = 715, Ability = 4 }, // Noivern + new EncounterStatic8N(Nest37,4,4,4) { Species = 887, Ability = -1 }, // Dragapult + new EncounterStatic8N(Nest38,0,0,1) { Species = 659, Ability = 4 }, // Bunnelby + new EncounterStatic8N(Nest38,0,0,1) { Species = 163, Ability = 4 }, // Hoothoot + new EncounterStatic8N(Nest38,0,1,1) { Species = 519, Ability = 4 }, // Pidove + new EncounterStatic8N(Nest38,0,1,1) { Species = 572, Ability = 4 }, // Minccino + new EncounterStatic8N(Nest38,1,1,2) { Species = 694, Ability = 4 }, // Helioptile + new EncounterStatic8N(Nest38,1,2,2) { Species = 759, Ability = 4 }, // Stufful + new EncounterStatic8N(Nest38,2,3,3) { Species = 660, Ability = 4 }, // Diggersby + new EncounterStatic8N(Nest38,2,4,4) { Species = 164, Ability = 4 }, // Noctowl + new EncounterStatic8N(Nest38,2,4,4) { Species = 521, Ability = 4 }, // Unfezant + new EncounterStatic8N(Nest38,3,4,4) { Species = 695, Ability = -1 }, // Heliolisk + new EncounterStatic8N(Nest38,4,4,4) { Species = 573, Ability = -1 }, // Cinccino + new EncounterStatic8N(Nest38,4,4,4) { Species = 760, Ability = -1 }, // Bewear + new EncounterStatic8N(Nest39,0,0,1) { Species = 819, Ability = 4 }, // Skwovet + new EncounterStatic8N(Nest39,0,0,1) { Species = 831, Ability = 4 }, // Wooloo + new EncounterStatic8N(Nest39,0,1,1) { Species = 263, Ability = 4, Form = 1 }, // Zigzagoon-1 + new EncounterStatic8N(Nest39,0,1,1) { Species = 446, Ability = 4 }, // Munchlax + new EncounterStatic8N(Nest39,1,2,2) { Species = 820, Ability = 4 }, // Greedent + new EncounterStatic8N(Nest39,2,3,3) { Species = 264, Ability = 4, Form = 1 }, // Linoone-1 + new EncounterStatic8N(Nest39,2,4,4) { Species = 820, Ability = 4 }, // Greedent + new EncounterStatic8N(Nest39,2,4,4) { Species = 832, Ability = 4 }, // Dubwool + new EncounterStatic8N(Nest39,3,4,4) { Species = 660, Ability = -1 }, // Diggersby + new EncounterStatic8N(Nest39,4,4,4) { Species = 143, Ability = -1 }, // Snorlax + new EncounterStatic8N(Nest40,0,0,1) { Species = 535, Ability = 4 }, // Tympole + new EncounterStatic8N(Nest40,0,0,1) { Species = 090, Ability = 4 }, // Shellder + new EncounterStatic8N(Nest40,0,1,1) { Species = 170, Ability = 4 }, // Chinchou + new EncounterStatic8N(Nest40,1,2,2) { Species = 846, Ability = 4 }, // Arrokuda + new EncounterStatic8N(Nest40,2,4,4) { Species = 171, Ability = 4 }, // Lanturn + new EncounterStatic8N(Nest40,4,4,4) { Species = 847, Ability = -1 }, // Barraskewda + new EncounterStatic8N(Nest41,0,0,1) { Species = 422, Ability = 4, Form = 1 }, // Shellos-1 + new EncounterStatic8N(Nest41,0,0,1) { Species = 098, Ability = 4 }, // Krabby + new EncounterStatic8N(Nest41,0,1,1) { Species = 341, Ability = 4 }, // Corphish + new EncounterStatic8N(Nest41,0,1,1) { Species = 833, Ability = 4 }, // Chewtle + new EncounterStatic8N(Nest41,1,1,2) { Species = 688, Ability = 4 }, // Binacle + new EncounterStatic8N(Nest41,1,2,2) { Species = 771, Ability = 4 }, // Pyukumuku + new EncounterStatic8N(Nest41,2,3,3) { Species = 099, Ability = 4 }, // Kingler + new EncounterStatic8N(Nest41,2,4,4) { Species = 342, Ability = 4 }, // Crawdaunt + new EncounterStatic8N(Nest41,2,4,4) { Species = 689, Ability = 4 }, // Barbaracle + new EncounterStatic8N(Nest41,3,4,4) { Species = 423, Ability = -1, Form = 1 }, // Gastrodon-1 + new EncounterStatic8N(Nest41,4,4,4) { Species = 593, Ability = -1 }, // Jellicent + new EncounterStatic8N(Nest41,4,4,4) { Species = 834, Ability = -1 }, // Drednaw + new EncounterStatic8N(Nest42,0,0,1) { Species = 092, Ability = 4 }, // Gastly + new EncounterStatic8N(Nest42,0,0,1) { Species = 562, Ability = 4, Form = 1 }, // Yamask-1 + new EncounterStatic8N(Nest42,0,1,1) { Species = 854, Ability = 4 }, // Sinistea + new EncounterStatic8N(Nest42,0,1,1) { Species = 355, Ability = 4 }, // Duskull + new EncounterStatic8N(Nest42,1,2,2) { Species = 093, Ability = 4 }, // Haunter + new EncounterStatic8N(Nest42,2,3,3) { Species = 356, Ability = 4 }, // Dusclops + new EncounterStatic8N(Nest42,4,4,4) { Species = 477, Ability = -1 }, // Dusknoir + new EncounterStatic8N(Nest42,4,4,4) { Species = 094, Ability = -1 }, // Gengar + new EncounterStatic8N(Nest43,0,0,1) { Species = 129, Ability = 4 }, // Magikarp + new EncounterStatic8N(Nest43,0,0,1) { Species = 349, Ability = 4 }, // Feebas + new EncounterStatic8N(Nest43,0,1,1) { Species = 846, Ability = 4 }, // Arrokuda + new EncounterStatic8N(Nest43,0,1,1) { Species = 833, Ability = 4 }, // Chewtle + new EncounterStatic8N(Nest43,1,2,2) { Species = 747, Ability = 4 }, // Mareanie + new EncounterStatic8N(Nest43,2,3,3) { Species = 211, Ability = 4 }, // Qwilfish + new EncounterStatic8N(Nest43,2,4,4) { Species = 748, Ability = 4 }, // Toxapex + new EncounterStatic8N(Nest43,3,4,4) { Species = 771, Ability = -1 }, // Pyukumuku + new EncounterStatic8N(Nest43,3,4,4) { Species = 130, Ability = -1 }, // Gyarados + new EncounterStatic8N(Nest43,4,4,4) { Species = 131, Ability = -1 }, // Lapras + new EncounterStatic8N(Nest43,4,4,4) { Species = 350, Ability = -1 }, // Milotic + new EncounterStatic8N(Nest44,0,0,1) { Species = 447, Ability = 4 }, // Riolu + new EncounterStatic8N(Nest44,0,0,1) { Species = 436, Ability = 4 }, // Bronzor + new EncounterStatic8N(Nest44,0,1,1) { Species = 624, Ability = 4 }, // Pawniard + new EncounterStatic8N(Nest44,0,1,1) { Species = 599, Ability = 4 }, // Klink + new EncounterStatic8N(Nest44,1,2,2) { Species = 095, Ability = 4 }, // Onix + new EncounterStatic8N(Nest44,2,4,4) { Species = 437, Ability = 4 }, // Bronzong + new EncounterStatic8N(Nest44,3,4,4) { Species = 625, Ability = -1 }, // Bisharp + new EncounterStatic8N(Nest44,3,4,4) { Species = 208, Ability = -1 }, // Steelix + new EncounterStatic8N(Nest44,4,4,4) { Species = 601, Ability = -1 }, // Klinklang + new EncounterStatic8N(Nest44,4,4,4) { Species = 448, Ability = -1 }, // Lucario + new EncounterStatic8N(Nest45,0,0,1) { Species = 767, Ability = 4 }, // Wimpod + new EncounterStatic8N(Nest45,0,0,1) { Species = 824, Ability = 4 }, // Blipbug + new EncounterStatic8N(Nest45,0,1,1) { Species = 751, Ability = 4 }, // Dewpider + new EncounterStatic8N(Nest45,1,2,2) { Species = 557, Ability = 4 }, // Dwebble + new EncounterStatic8N(Nest45,2,3,3) { Species = 825, Ability = 4 }, // Dottler + new EncounterStatic8N(Nest45,2,4,4) { Species = 826, Ability = 4 }, // Orbeetle + new EncounterStatic8N(Nest45,3,4,4) { Species = 752, Ability = -1 }, // Araquanid + new EncounterStatic8N(Nest45,3,4,4) { Species = 768, Ability = -1 }, // Golisopod + new EncounterStatic8N(Nest45,4,4,4) { Species = 292, Ability = -1 }, // Shedinja + new EncounterStatic8N(Nest46,0,0,1) { Species = 679, Ability = 4 }, // Honedge + new EncounterStatic8N(Nest46,0,0,1) { Species = 562, Ability = 4, Form = 1 }, // Yamask-1 + new EncounterStatic8N(Nest46,0,1,1) { Species = 854, Ability = 4 }, // Sinistea + new EncounterStatic8N(Nest46,0,1,1) { Species = 425, Ability = 4 }, // Drifloon + new EncounterStatic8N(Nest46,1,2,2) { Species = 680, Ability = 4 }, // Doublade + new EncounterStatic8N(Nest46,2,3,3) { Species = 426, Ability = 4 }, // Drifblim + new EncounterStatic8N(Nest46,3,4,4) { Species = 855, Ability = -1 }, // Polteageist + new EncounterStatic8N(Nest46,4,4,4) { Species = 867, Ability = -1 }, // Runerigus + new EncounterStatic8N(Nest46,4,4,4) { Species = 681, Ability = -1 }, // Aegislash + new EncounterStatic8N(Nest47,0,0,1) { Species = 447, Ability = 4 }, // Riolu + new EncounterStatic8N(Nest47,0,0,1) { Species = 066, Ability = 4 }, // Machop + new EncounterStatic8N(Nest47,0,1,1) { Species = 759, Ability = 4 }, // Stufful + new EncounterStatic8N(Nest47,1,2,2) { Species = 760, Ability = 4 }, // Bewear + new EncounterStatic8N(Nest47,1,3,3) { Species = 870, Ability = 4 }, // Falinks + new EncounterStatic8N(Nest47,2,3,3) { Species = 067, Ability = 4 }, // Machoke + new EncounterStatic8N(Nest47,3,4,4) { Species = 068, Ability = -1 }, // Machamp + new EncounterStatic8N(Nest47,4,4,4) { Species = 448, Ability = -1 }, // Lucario + new EncounterStatic8N(Nest47,4,4,4) { Species = 475, Ability = -1 }, // Gallade + new EncounterStatic8N(Nest48,0,0,1) { Species = 052, Ability = 4, Form = 2 }, // Meowth-2 + new EncounterStatic8N(Nest48,0,0,1) { Species = 436, Ability = 4 }, // Bronzor + new EncounterStatic8N(Nest48,0,1,1) { Species = 624, Ability = 4 }, // Pawniard + new EncounterStatic8N(Nest48,0,1,1) { Species = 597, Ability = 4 }, // Ferroseed + new EncounterStatic8N(Nest48,1,2,2) { Species = 679, Ability = 4 }, // Honedge + new EncounterStatic8N(Nest48,1,2,2) { Species = 437, Ability = 4 }, // Bronzong + new EncounterStatic8N(Nest48,3,4,4) { Species = 863, Ability = -1 }, // Perrserker + new EncounterStatic8N(Nest48,2,4,4) { Species = 598, Ability = 4 }, // Ferrothorn + new EncounterStatic8N(Nest48,3,4,4) { Species = 625, Ability = -1 }, // Bisharp + new EncounterStatic8N(Nest48,3,4,4) { Species = 618, Ability = -1, Form = 1 }, // Stunfisk-1 + new EncounterStatic8N(Nest48,4,4,4) { Species = 879, Ability = -1 }, // Copperajah + new EncounterStatic8N(Nest48,4,4,4) { Species = 884, Ability = -1 }, // Duraludon + new EncounterStatic8N(Nest49,0,0,1) { Species = 686, Ability = 4 }, // Inkay + new EncounterStatic8N(Nest49,0,0,1) { Species = 280, Ability = 4 }, // Ralts + new EncounterStatic8N(Nest49,0,1,1) { Species = 122, Ability = 4, Form = 1 }, // Mr. Mime-1 + new EncounterStatic8N(Nest49,0,1,1) { Species = 527, Ability = 4 }, // Woobat + new EncounterStatic8N(Nest49,1,2,2) { Species = 856, Ability = 4 }, // Hatenna + new EncounterStatic8N(Nest49,1,2,2) { Species = 857, Ability = 4 }, // Hattrem + new EncounterStatic8N(Nest49,2,3,3) { Species = 281, Ability = 4 }, // Kirlia + new EncounterStatic8N(Nest49,2,4,4) { Species = 528, Ability = 4 }, // Swoobat + new EncounterStatic8N(Nest49,3,4,4) { Species = 858, Ability = -1 }, // Hatterene + new EncounterStatic8N(Nest49,3,4,4) { Species = 866, Ability = -1 }, // Mr. Rime + new EncounterStatic8N(Nest49,4,4,4) { Species = 687, Ability = -1 }, // Malamar + new EncounterStatic8N(Nest49,4,4,4) { Species = 282, Ability = -1 }, // Gardevoir + new EncounterStatic8N(Nest50,0,0,1) { Species = 557, Ability = 4 }, // Dwebble + new EncounterStatic8N(Nest50,0,0,1) { Species = 438, Ability = 4 }, // Bonsly + new EncounterStatic8N(Nest50,0,1,1) { Species = 837, Ability = 4 }, // Rolycoly + new EncounterStatic8N(Nest50,1,2,2) { Species = 838, Ability = 4 }, // Carkol + new EncounterStatic8N(Nest50,2,4,4) { Species = 095, Ability = 4 }, // Onix + new EncounterStatic8N(Nest50,3,4,4) { Species = 558, Ability = -1 }, // Crustle + new EncounterStatic8N(Nest50,3,4,4) { Species = 839, Ability = -1 }, // Coalossal + new EncounterStatic8N(Nest50,4,4,4) { Species = 208, Ability = -1 }, // Steelix + new EncounterStatic8N(Nest51,0,0,1) { Species = 194, Ability = 4 }, // Wooper + new EncounterStatic8N(Nest51,0,0,1) { Species = 339, Ability = 4 }, // Barboach + new EncounterStatic8N(Nest51,0,1,1) { Species = 562, Ability = 4, Form = 1 }, // Yamask-1 + new EncounterStatic8N(Nest51,0,1,1) { Species = 622, Ability = 4 }, // Golett + new EncounterStatic8N(Nest51,1,2,2) { Species = 536, Ability = 4 }, // Palpitoad + new EncounterStatic8N(Nest51,1,2,2) { Species = 195, Ability = 4 }, // Quagsire + new EncounterStatic8N(Nest51,2,3,3) { Species = 618, Ability = 4, Form = 1 }, // Stunfisk-1 + new EncounterStatic8N(Nest51,2,4,4) { Species = 623, Ability = 4 }, // Golurk + new EncounterStatic8N(Nest51,3,4,4) { Species = 423, Ability = -1, Form = 1 }, // Gastrodon-1 + new EncounterStatic8N(Nest51,3,4,4) { Species = 537, Ability = -1 }, // Seismitoad + new EncounterStatic8N(Nest51,4,4,4) { Species = 867, Ability = -1 }, // Runerigus + new EncounterStatic8N(Nest51,4,4,4) { Species = 464, Ability = -1 }, // Rhyperior + new EncounterStatic8N(Nest52,0,0,1) { Species = 850, Ability = 4 }, // Sizzlipede + new EncounterStatic8N(Nest52,0,1,1) { Species = 607, Ability = 4 }, // Litwick + new EncounterStatic8N(Nest52,0,1,1) { Species = 004, Ability = 4 }, // Charmander + new EncounterStatic8N(Nest52,1,2,2) { Species = 005, Ability = 4 }, // Charmeleon + new EncounterStatic8N(Nest52,2,3,3) { Species = 631, Ability = 4 }, // Heatmor + new EncounterStatic8N(Nest52,2,4,4) { Species = 324, Ability = 4 }, // Torkoal + new EncounterStatic8N(Nest52,3,4,4) { Species = 758, Ability = -1, Gender = 1 }, // Salazzle + new EncounterStatic8N(Nest52,4,4,4) { Species = 851, Ability = -1 }, // Centiskorch + new EncounterStatic8N(Nest52,4,4,4) { Species = 006, Ability = -1 }, // Charizard + new EncounterStatic8N(Nest53,0,0,1) { Species = 850, Ability = 4 }, // Sizzlipede + new EncounterStatic8N(Nest53,0,1,1) { Species = 607, Ability = 4 }, // Litwick + new EncounterStatic8N(Nest53,0,1,1) { Species = 757, Ability = 4 }, // Salandit + new EncounterStatic8N(Nest53,1,2,2) { Species = 838, Ability = 4 }, // Carkol + new EncounterStatic8N(Nest53,2,4,4) { Species = 324, Ability = 4 }, // Torkoal + new EncounterStatic8N(Nest53,3,4,4) { Species = 609, Ability = -1 }, // Chandelure + new EncounterStatic8N(Nest53,4,4,4) { Species = 839, Ability = -1 }, // Coalossal + new EncounterStatic8N(Nest54,0,0,1) { Species = 582, Ability = 4 }, // Vanillite + new EncounterStatic8N(Nest54,0,1,1) { Species = 122, Ability = 4, Form = 1 }, // Mr. Mime-1 + new EncounterStatic8N(Nest54,0,1,1) { Species = 712, Ability = 4 }, // Bergmite + new EncounterStatic8N(Nest54,1,2,2) { Species = 361, Ability = 4 }, // Snorunt + new EncounterStatic8N(Nest54,1,2,2) { Species = 225, Ability = 4 }, // Delibird + new EncounterStatic8N(Nest54,2,3,3) { Species = 713, Ability = 4 }, // Avalugg + new EncounterStatic8N(Nest54,2,4,4) { Species = 362, Ability = 4 }, // Glalie + new EncounterStatic8N(Nest54,3,4,4) { Species = 584, Ability = -1 }, // Vanilluxe + new EncounterStatic8N(Nest54,3,4,4) { Species = 866, Ability = -1 }, // Mr. Rime + new EncounterStatic8N(Nest54,4,4,4) { Species = 131, Ability = -1 }, // Lapras + new EncounterStatic8N(Nest55,0,0,1) { Species = 835, Ability = 4 }, // Yamper + new EncounterStatic8N(Nest55,0,0,1) { Species = 848, Ability = 4 }, // Toxel + new EncounterStatic8N(Nest55,0,1,1) { Species = 025, Ability = 4 }, // Pikachu + new EncounterStatic8N(Nest55,0,1,1) { Species = 595, Ability = 4 }, // Joltik + new EncounterStatic8N(Nest55,1,2,2) { Species = 170, Ability = 4 }, // Chinchou + new EncounterStatic8N(Nest55,1,2,2) { Species = 171, Ability = 4 }, // Lanturn + new EncounterStatic8N(Nest55,2,4,4) { Species = 836, Ability = 4 }, // Boltund + new EncounterStatic8N(Nest55,2,4,4) { Species = 849, Ability = 4 }, // Toxtricity + new EncounterStatic8N(Nest55,3,4,4) { Species = 871, Ability = -1 }, // Pincurchin + new EncounterStatic8N(Nest55,3,4,4) { Species = 596, Ability = -1 }, // Galvantula + new EncounterStatic8N(Nest55,4,4,4) { Species = 777, Ability = -1 }, // Togedemaru + new EncounterStatic8N(Nest55,4,4,4) { Species = 877, Ability = -1 }, // Morpeko + new EncounterStatic8N(Nest56,0,0,1) { Species = 172, Ability = 4 }, // Pichu + new EncounterStatic8N(Nest56,0,0,1) { Species = 309, Ability = 4 }, // Electrike + new EncounterStatic8N(Nest56,0,1,1) { Species = 848, Ability = 4 }, // Toxel + new EncounterStatic8N(Nest56,0,1,1) { Species = 694, Ability = 4 }, // Helioptile + new EncounterStatic8N(Nest56,1,2,2) { Species = 595, Ability = 4 }, // Joltik + new EncounterStatic8N(Nest56,1,2,2) { Species = 025, Ability = 4 }, // Pikachu + new EncounterStatic8N(Nest56,2,4,4) { Species = 025, Ability = 4 }, // Pikachu + new EncounterStatic8N(Nest56,2,4,4) { Species = 479, Ability = 4, Form = 5 }, // Rotom-5 + new EncounterStatic8N(Nest56,3,4,4) { Species = 479, Ability = -1, Form = 4 }, // Rotom-4 + new EncounterStatic8N(Nest56,3,4,4) { Species = 479, Ability = -1, Form = 3 }, // Rotom-3 + new EncounterStatic8N(Nest56,4,4,4) { Species = 479, Ability = -1, Form = 2 }, // Rotom-2 + new EncounterStatic8N(Nest56,4,4,4) { Species = 479, Ability = -1, Form = 1 }, // Rotom-1 + new EncounterStatic8N(Nest57,0,0,1) { Species = 406, Ability = 4 }, // Budew + new EncounterStatic8N(Nest57,0,1,1) { Species = 829, Ability = 4 }, // Gossifleur + new EncounterStatic8N(Nest57,0,1,1) { Species = 597, Ability = 4 }, // Ferroseed + new EncounterStatic8N(Nest57,1,2,2) { Species = 840, Ability = 4 }, // Applin + new EncounterStatic8N(Nest57,2,4,4) { Species = 315, Ability = 4 }, // Roselia + new EncounterStatic8N(Nest57,3,4,4) { Species = 830, Ability = -1 }, // Eldegoss + new EncounterStatic8N(Nest57,3,4,4) { Species = 598, Ability = -1 }, // Ferrothorn + new EncounterStatic8N(Nest57,4,4,4) { Species = 407, Ability = -1 }, // Roserade + new EncounterStatic8N(Nest58,0,0,1) { Species = 420, Ability = 4 }, // Cherubi + new EncounterStatic8N(Nest58,0,1,1) { Species = 829, Ability = 4 }, // Gossifleur + new EncounterStatic8N(Nest58,0,1,1) { Species = 546, Ability = 4 }, // Cottonee + new EncounterStatic8N(Nest58,1,2,2) { Species = 755, Ability = 4 }, // Morelull + new EncounterStatic8N(Nest58,2,4,4) { Species = 421, Ability = 4 }, // Cherrim + new EncounterStatic8N(Nest58,2,4,4) { Species = 756, Ability = 4 }, // Shiinotic + new EncounterStatic8N(Nest58,3,4,4) { Species = 830, Ability = -1 }, // Eldegoss + new EncounterStatic8N(Nest58,3,4,4) { Species = 547, Ability = -1 }, // Whimsicott + new EncounterStatic8N(Nest58,4,4,4) { Species = 781, Ability = -1 }, // Dhelmise + new EncounterStatic8N(Nest59,0,0,1) { Species = 434, Ability = 4 }, // Stunky + new EncounterStatic8N(Nest59,0,0,1) { Species = 568, Ability = 4 }, // Trubbish + new EncounterStatic8N(Nest59,0,1,1) { Species = 451, Ability = 4 }, // Skorupi + new EncounterStatic8N(Nest59,0,1,1) { Species = 109, Ability = 4 }, // Koffing + new EncounterStatic8N(Nest59,1,2,2) { Species = 848, Ability = 4 }, // Toxel + new EncounterStatic8N(Nest59,2,4,4) { Species = 569, Ability = 4 }, // Garbodor + new EncounterStatic8N(Nest59,2,4,4) { Species = 452, Ability = 4 }, // Drapion + new EncounterStatic8N(Nest59,3,4,4) { Species = 849, Ability = -1 }, // Toxtricity + new EncounterStatic8N(Nest59,3,4,4) { Species = 435, Ability = -1 }, // Skuntank + new EncounterStatic8N(Nest59,4,4,4) { Species = 110, Ability = -1, Form = 1 }, // Weezing-1 + new EncounterStatic8N(Nest60,0,0,1) { Species = 177, Ability = 4 }, // Natu + new EncounterStatic8N(Nest60,0,0,1) { Species = 163, Ability = 4 }, // Hoothoot + new EncounterStatic8N(Nest60,0,1,1) { Species = 821, Ability = 4 }, // Rookidee + new EncounterStatic8N(Nest60,0,1,1) { Species = 278, Ability = 4 }, // Wingull + new EncounterStatic8N(Nest60,1,2,2) { Species = 012, Ability = 4 }, // Butterfree + new EncounterStatic8N(Nest60,1,2,2) { Species = 822, Ability = 4 }, // Corvisquire + new EncounterStatic8N(Nest60,2,4,4) { Species = 164, Ability = 4 }, // Noctowl + new EncounterStatic8N(Nest60,2,4,4) { Species = 279, Ability = 4 }, // Pelipper + new EncounterStatic8N(Nest60,3,4,4) { Species = 178, Ability = -1 }, // Xatu + new EncounterStatic8N(Nest60,3,4,4) { Species = 701, Ability = -1 }, // Hawlucha + new EncounterStatic8N(Nest60,4,4,4) { Species = 823, Ability = -1 }, // Corviknight + new EncounterStatic8N(Nest60,4,4,4) { Species = 225, Ability = -1 }, // Delibird + new EncounterStatic8N(Nest61,0,0,1) { Species = 175, Ability = 4 }, // Togepi + new EncounterStatic8N(Nest61,0,0,1) { Species = 755, Ability = 4 }, // Morelull + new EncounterStatic8N(Nest61,0,1,1) { Species = 859, Ability = 4 }, // Impidimp + new EncounterStatic8N(Nest61,0,1,1) { Species = 280, Ability = 4 }, // Ralts + new EncounterStatic8N(Nest61,1,2,2) { Species = 176, Ability = 4 }, // Togetic + new EncounterStatic8N(Nest61,1,2,2) { Species = 756, Ability = 4 }, // Shiinotic + new EncounterStatic8N(Nest61,2,4,4) { Species = 860, Ability = 4 }, // Morgrem + new EncounterStatic8N(Nest61,3,4,4) { Species = 282, Ability = -1 }, // Gardevoir + new EncounterStatic8N(Nest61,3,4,4) { Species = 468, Ability = -1 }, // Togekiss + new EncounterStatic8N(Nest61,4,4,4) { Species = 861, Ability = -1 }, // Grimmsnarl + new EncounterStatic8N(Nest61,4,4,4) { Species = 778, Ability = -1 }, // Mimikyu + new EncounterStatic8N(Nest62,0,0,1) { Species = 827, Ability = 4 }, // Nickit + new EncounterStatic8N(Nest62,0,0,1) { Species = 263, Ability = 4, Form = 1 }, // Zigzagoon-1 + new EncounterStatic8N(Nest62,0,1,1) { Species = 215, Ability = 4 }, // Sneasel + new EncounterStatic8N(Nest62,1,2,2) { Species = 510, Ability = 4 }, // Liepard + new EncounterStatic8N(Nest62,1,2,2) { Species = 264, Ability = 4, Form = 1 }, // Linoone-1 + new EncounterStatic8N(Nest62,2,4,4) { Species = 828, Ability = 4 }, // Thievul + new EncounterStatic8N(Nest62,2,4,4) { Species = 675, Ability = 4 }, // Pangoro + new EncounterStatic8N(Nest62,3,4,4) { Species = 461, Ability = -1 }, // Weavile + new EncounterStatic8N(Nest62,4,4,4) { Species = 862, Ability = -1 }, // Obstagoon + new EncounterStatic8N(Nest63,0,0,1) { Species = 840, Ability = 4 }, // Applin + new EncounterStatic8N(Nest63,1,2,2) { Species = 885, Ability = 4 }, // Dreepy + new EncounterStatic8N(Nest63,3,4,4) { Species = 886, Ability = -1 }, // Drakloak + new EncounterStatic8N(Nest63,4,4,4) { Species = 887, Ability = -1 }, // Dragapult + new EncounterStatic8N(Nest64,0,0,1) { Species = 659, Ability = 4 }, // Bunnelby + new EncounterStatic8N(Nest64,0,0,1) { Species = 519, Ability = 4 }, // Pidove + new EncounterStatic8N(Nest64,0,1,1) { Species = 819, Ability = 4 }, // Skwovet + new EncounterStatic8N(Nest64,0,1,1) { Species = 133, Ability = 4 }, // Eevee + new EncounterStatic8N(Nest64,1,2,2) { Species = 520, Ability = 4 }, // Tranquill + new EncounterStatic8N(Nest64,1,2,2) { Species = 831, Ability = 4 }, // Wooloo + new EncounterStatic8N(Nest64,2,4,4) { Species = 521, Ability = 4 }, // Unfezant + new EncounterStatic8N(Nest64,2,4,4) { Species = 832, Ability = 4 }, // Dubwool + new EncounterStatic8N(Nest64,4,4,4) { Species = 133, Ability = -1 }, // Eevee + new EncounterStatic8N(Nest64,4,4,4) { Species = 143, Ability = -1 }, // Snorlax + new EncounterStatic8N(Nest65,0,0,1) { Species = 132, Ability = 4 }, // Ditto + new EncounterStatic8N(Nest65,0,1,2) { Species = 132, Ability = 4 }, // Ditto + new EncounterStatic8N(Nest65,1,2,3) { Species = 132, Ability = 4 }, // Ditto + new EncounterStatic8N(Nest65,2,3,3) { Species = 132, Ability = 4 }, // Ditto + new EncounterStatic8N(Nest65,3,4,4) { Species = 132, Ability = -1 }, // Ditto + new EncounterStatic8N(Nest65,4,4,4) { Species = 132, Ability = -1 }, // Ditto + new EncounterStatic8N(Nest66,0,0,1) { Species = 458, Ability = 4 }, // Mantyke + new EncounterStatic8N(Nest66,0,0,1) { Species = 341, Ability = 4 }, // Corphish + new EncounterStatic8N(Nest66,0,1,1) { Species = 846, Ability = 4 }, // Arrokuda + new EncounterStatic8N(Nest66,0,1,1) { Species = 833, Ability = 4 }, // Chewtle + new EncounterStatic8N(Nest66,1,2,2) { Species = 747, Ability = 4 }, // Mareanie + new EncounterStatic8N(Nest66,2,3,3) { Species = 342, Ability = 4 }, // Crawdaunt + new EncounterStatic8N(Nest66,2,4,4) { Species = 748, Ability = 4 }, // Toxapex + new EncounterStatic8N(Nest66,3,4,4) { Species = 771, Ability = -1 }, // Pyukumuku + new EncounterStatic8N(Nest66,3,4,4) { Species = 226, Ability = -1 }, // Mantine + new EncounterStatic8N(Nest66,4,4,4) { Species = 131, Ability = -1 }, // Lapras + new EncounterStatic8N(Nest66,4,4,4) { Species = 134, Ability = -1 }, // Vaporeon + new EncounterStatic8N(Nest67,0,0,1) { Species = 686, Ability = 4 }, // Inkay + new EncounterStatic8N(Nest67,0,0,1) { Species = 436, Ability = 4 }, // Bronzor + new EncounterStatic8N(Nest67,0,1,1) { Species = 122, Ability = 4, Form = 1 }, // Mr. Mime-1 + new EncounterStatic8N(Nest67,0,1,1) { Species = 527, Ability = 4 }, // Woobat + new EncounterStatic8N(Nest67,1,2,2) { Species = 856, Ability = 4 }, // Hatenna + new EncounterStatic8N(Nest67,1,2,2) { Species = 857, Ability = 4 }, // Hattrem + new EncounterStatic8N(Nest67,2,3,3) { Species = 437, Ability = 4 }, // Bronzong + new EncounterStatic8N(Nest67,2,4,4) { Species = 528, Ability = 4 }, // Swoobat + new EncounterStatic8N(Nest67,3,4,4) { Species = 687, Ability = -1 }, // Malamar + new EncounterStatic8N(Nest67,3,4,4) { Species = 866, Ability = -1 }, // Mr. Rime + new EncounterStatic8N(Nest67,4,4,4) { Species = 858, Ability = -1 }, // Hatterene + new EncounterStatic8N(Nest67,4,4,4) { Species = 196, Ability = -1 }, // Espeon + new EncounterStatic8N(Nest68,0,0,1) { Species = 827, Ability = 4 }, // Nickit + new EncounterStatic8N(Nest68,0,0,1) { Species = 263, Ability = 4, Form = 1 }, // Zigzagoon-1 + new EncounterStatic8N(Nest68,0,1,1) { Species = 686, Ability = 4 }, // Inkay + new EncounterStatic8N(Nest68,0,1,1) { Species = 624, Ability = 4 }, // Pawniard + new EncounterStatic8N(Nest68,1,2,2) { Species = 510, Ability = 4 }, // Liepard + new EncounterStatic8N(Nest68,1,2,2) { Species = 264, Ability = 4, Form = 1 }, // Linoone-1 + new EncounterStatic8N(Nest68,2,4,4) { Species = 828, Ability = 4 }, // Thievul + new EncounterStatic8N(Nest68,2,4,4) { Species = 675, Ability = 4 }, // Pangoro + new EncounterStatic8N(Nest68,3,4,4) { Species = 625, Ability = -1 }, // Bisharp + new EncounterStatic8N(Nest68,3,4,4) { Species = 687, Ability = -1 }, // Malamar + new EncounterStatic8N(Nest68,4,4,4) { Species = 862, Ability = -1 }, // Obstagoon + new EncounterStatic8N(Nest68,4,4,4) { Species = 197, Ability = -1 }, // Umbreon + new EncounterStatic8N(Nest69,0,0,1) { Species = 420, Ability = 4 }, // Cherubi + new EncounterStatic8N(Nest69,0,0,1) { Species = 761, Ability = 4 }, // Bounsweet + new EncounterStatic8N(Nest69,0,1,1) { Species = 829, Ability = 4 }, // Gossifleur + new EncounterStatic8N(Nest69,0,1,1) { Species = 546, Ability = 4 }, // Cottonee + new EncounterStatic8N(Nest69,1,2,2) { Species = 762, Ability = 4 }, // Steenee + new EncounterStatic8N(Nest69,1,2,2) { Species = 597, Ability = 4 }, // Ferroseed + new EncounterStatic8N(Nest69,2,4,4) { Species = 421, Ability = 4 }, // Cherrim + new EncounterStatic8N(Nest69,2,4,4) { Species = 598, Ability = 4 }, // Ferrothorn + new EncounterStatic8N(Nest69,3,4,4) { Species = 830, Ability = -1 }, // Eldegoss + new EncounterStatic8N(Nest69,3,4,4) { Species = 763, Ability = -1 }, // Tsareena + new EncounterStatic8N(Nest69,4,4,4) { Species = 547, Ability = -1 }, // Whimsicott + new EncounterStatic8N(Nest69,4,4,4) { Species = 470, Ability = -1 }, // Leafeon + new EncounterStatic8N(Nest70,0,0,1) { Species = 850, Ability = 4 }, // Sizzlipede + new EncounterStatic8N(Nest70,0,1,1) { Species = 607, Ability = 4 }, // Litwick + new EncounterStatic8N(Nest70,1,2,2) { Species = 838, Ability = 4 }, // Carkol + new EncounterStatic8N(Nest70,2,4,4) { Species = 324, Ability = 4 }, // Torkoal + new EncounterStatic8N(Nest70,3,4,4) { Species = 059, Ability = -1 }, // Arcanine + new EncounterStatic8N(Nest70,3,4,4) { Species = 038, Ability = -1 }, // Ninetales + new EncounterStatic8N(Nest70,4,4,4) { Species = 609, Ability = -1 }, // Chandelure + new EncounterStatic8N(Nest70,4,4,4) { Species = 136, Ability = -1 }, // Flareon + new EncounterStatic8N(Nest71,0,0,1) { Species = 835, Ability = 4 }, // Yamper + new EncounterStatic8N(Nest71,0,0,1) { Species = 848, Ability = 4 }, // Toxel + new EncounterStatic8N(Nest71,0,1,1) { Species = 025, Ability = 4 }, // Pikachu + new EncounterStatic8N(Nest71,0,1,1) { Species = 694, Ability = 4 }, // Helioptile + new EncounterStatic8N(Nest71,1,2,2) { Species = 170, Ability = 4 }, // Chinchou + new EncounterStatic8N(Nest71,1,2,2) { Species = 171, Ability = 4 }, // Lanturn + new EncounterStatic8N(Nest71,2,4,4) { Species = 836, Ability = 4 }, // Boltund + new EncounterStatic8N(Nest71,2,4,4) { Species = 849, Ability = 4 }, // Toxtricity + new EncounterStatic8N(Nest71,3,4,4) { Species = 695, Ability = -1 }, // Heliolisk + new EncounterStatic8N(Nest71,3,4,4) { Species = 738, Ability = -1 }, // Vikavolt + new EncounterStatic8N(Nest71,4,4,4) { Species = 025, Ability = -1 }, // Pikachu + new EncounterStatic8N(Nest71,4,4,4) { Species = 135, Ability = -1 }, // Jolteon + new EncounterStatic8N(Nest72,0,0,1) { Species = 582, Ability = 4 }, // Vanillite + new EncounterStatic8N(Nest72,0,0,1) { Species = 872, Ability = 4 }, // Snom + new EncounterStatic8N(Nest72,0,1,1) { Species = 122, Ability = 4, Form = 1 }, // Mr. Mime-1 + new EncounterStatic8N(Nest72,0,1,1) { Species = 712, Ability = 4 }, // Bergmite + new EncounterStatic8N(Nest72,1,2,2) { Species = 361, Ability = 4 }, // Snorunt + new EncounterStatic8N(Nest72,1,2,2) { Species = 583, Ability = 4 }, // Vanillish + new EncounterStatic8N(Nest72,2,3,3) { Species = 713, Ability = 4 }, // Avalugg + new EncounterStatic8N(Nest72,2,4,4) { Species = 873, Ability = 4 }, // Frosmoth + new EncounterStatic8N(Nest72,3,4,4) { Species = 584, Ability = -1 }, // Vanilluxe + new EncounterStatic8N(Nest72,3,4,4) { Species = 866, Ability = -1 }, // Mr. Rime + new EncounterStatic8N(Nest72,4,4,4) { Species = 478, Ability = -1 }, // Froslass + new EncounterStatic8N(Nest72,4,4,4) { Species = 471, Ability = -1 }, // Glaceon + new EncounterStatic8N(Nest73,0,0,1) { Species = 175, Ability = 4 }, // Togepi + new EncounterStatic8N(Nest73,0,1,1) { Species = 859, Ability = 4 }, // Impidimp + new EncounterStatic8N(Nest73,0,1,1) { Species = 280, Ability = 4 }, // Ralts + new EncounterStatic8N(Nest73,1,2,2) { Species = 176, Ability = 4 }, // Togetic + new EncounterStatic8N(Nest73,1,2,2) { Species = 860, Ability = 4 }, // Morgrem + new EncounterStatic8N(Nest73,2,4,4) { Species = 868, Ability = 4 }, // Milcery + new EncounterStatic8N(Nest73,3,4,4) { Species = 282, Ability = -1 }, // Gardevoir + new EncounterStatic8N(Nest73,3,4,4) { Species = 861, Ability = -1 }, // Grimmsnarl + new EncounterStatic8N(Nest73,4,4,4) { Species = 468, Ability = -1 }, // Togekiss + new EncounterStatic8N(Nest73,4,4,4) { Species = 700, Ability = -1 }, // Sylveon + new EncounterStatic8N(Nest74,0,0,1) { Species = 129, Ability = 4 }, // Magikarp + new EncounterStatic8N(Nest74,0,0,1) { Species = 751, Ability = 4 }, // Dewpider + new EncounterStatic8N(Nest74,0,1,1) { Species = 194, Ability = 4 }, // Wooper + new EncounterStatic8N(Nest74,0,1,1) { Species = 339, Ability = 4 }, // Barboach + new EncounterStatic8N(Nest74,1,2,2) { Species = 098, Ability = 4 }, // Krabby + new EncounterStatic8N(Nest74,1,2,2) { Species = 746, Ability = 4 }, // Wishiwashi + new EncounterStatic8N(Nest74,2,3,3) { Species = 099, Ability = 4 }, // Kingler + new EncounterStatic8N(Nest74,2,4,4) { Species = 340, Ability = 4 }, // Whiscash + new EncounterStatic8N(Nest74,3,4,4) { Species = 211, Ability = -1 }, // Qwilfish + new EncounterStatic8N(Nest74,3,4,4) { Species = 195, Ability = -1 }, // Quagsire + new EncounterStatic8N(Nest74,4,4,4) { Species = 752, Ability = -1 }, // Araquanid + new EncounterStatic8N(Nest74,4,4,4) { Species = 130, Ability = -1 }, // Gyarados + new EncounterStatic8N(Nest75,0,0,1) { Species = 458, Ability = 4 }, // Mantyke + new EncounterStatic8N(Nest75,0,0,1) { Species = 223, Ability = 4 }, // Remoraid + new EncounterStatic8N(Nest75,0,1,1) { Species = 320, Ability = 4 }, // Wailmer + new EncounterStatic8N(Nest75,0,1,1) { Species = 688, Ability = 4 }, // Binacle + new EncounterStatic8N(Nest75,1,2,2) { Species = 098, Ability = 4 }, // Krabby + new EncounterStatic8N(Nest75,1,2,2) { Species = 771, Ability = 4 }, // Pyukumuku + new EncounterStatic8N(Nest75,2,3,3) { Species = 099, Ability = 4 }, // Kingler + new EncounterStatic8N(Nest75,3,4,4) { Species = 211, Ability = -1 }, // Qwilfish + new EncounterStatic8N(Nest75,3,4,4) { Species = 224, Ability = -1 }, // Octillery + new EncounterStatic8N(Nest75,4,4,4) { Species = 321, Ability = -1 }, // Wailord + new EncounterStatic8N(Nest75,4,4,4) { Species = 226, Ability = -1 }, // Mantine + new EncounterStatic8N(Nest76,0,0,1) { Species = 850, Ability = 4 }, // Sizzlipede + new EncounterStatic8N(Nest76,0,1,1) { Species = 607, Ability = 4 }, // Litwick + new EncounterStatic8N(Nest76,0,1,1) { Species = 004, Ability = 4 }, // Charmander + new EncounterStatic8N(Nest76,1,2,2) { Species = 005, Ability = 4 }, // Charmeleon + new EncounterStatic8N(Nest76,2,3,3) { Species = 631, Ability = 4 }, // Heatmor + new EncounterStatic8N(Nest76,2,4,4) { Species = 324, Ability = 4 }, // Torkoal + new EncounterStatic8N(Nest76,3,4,4) { Species = 758, Ability = -1, Gender = 1 }, // Salazzle + new EncounterStatic8N(Nest76,4,4,4) { Species = 851, Ability = -1 }, // Centiskorch + new EncounterStatic8N(Nest76,4,4,4) { Species = 006, Ability = -1, CanGigantamax = true }, // Charizard + new EncounterStatic8N(Nest77,0,0,1) { Species = 129, Ability = 4 }, // Magikarp + new EncounterStatic8N(Nest77,0,0,1) { Species = 846, Ability = 4 }, // Arrokuda + new EncounterStatic8N(Nest77,0,1,1) { Species = 833, Ability = 4 }, // Chewtle + new EncounterStatic8N(Nest77,0,1,1) { Species = 098, Ability = 4 }, // Krabby + new EncounterStatic8N(Nest77,1,2,2) { Species = 771, Ability = 4 }, // Pyukumuku + new EncounterStatic8N(Nest77,2,3,3) { Species = 211, Ability = 4 }, // Qwilfish + new EncounterStatic8N(Nest77,2,4,4) { Species = 099, Ability = 4 }, // Kingler + new EncounterStatic8N(Nest77,3,4,4) { Species = 746, Ability = -1 }, // Wishiwashi + new EncounterStatic8N(Nest77,3,4,4) { Species = 130, Ability = -1 }, // Gyarados + new EncounterStatic8N(Nest77,4,4,4) { Species = 423, Ability = -1, Form = 1 }, // Gastrodon-1 + new EncounterStatic8N(Nest77,4,4,4) { Species = 834, Ability = -1, CanGigantamax = true }, // Drednaw + new EncounterStatic8N(Nest78,0,0,1) { Species = 406, Ability = 4 }, // Budew + new EncounterStatic8N(Nest78,0,1,1) { Species = 829, Ability = 4 }, // Gossifleur + new EncounterStatic8N(Nest78,0,1,1) { Species = 597, Ability = 4 }, // Ferroseed + new EncounterStatic8N(Nest78,1,2,2) { Species = 840, Ability = 4 }, // Applin + new EncounterStatic8N(Nest78,2,4,4) { Species = 315, Ability = 4 }, // Roselia + new EncounterStatic8N(Nest78,3,4,4) { Species = 830, Ability = -1 }, // Eldegoss + new EncounterStatic8N(Nest78,3,4,4) { Species = 598, Ability = -1 }, // Ferrothorn + new EncounterStatic8N(Nest78,4,4,4) { Species = 407, Ability = -1 }, // Roserade + new EncounterStatic8N(Nest79,0,0,1) { Species = 850, Ability = 4 }, // Sizzlipede + new EncounterStatic8N(Nest79,0,1,1) { Species = 607, Ability = 4 }, // Litwick + new EncounterStatic8N(Nest79,0,1,1) { Species = 757, Ability = 4 }, // Salandit + new EncounterStatic8N(Nest79,1,2,2) { Species = 838, Ability = 4 }, // Carkol + new EncounterStatic8N(Nest79,1,2,2) { Species = 608, Ability = 4 }, // Lampent + new EncounterStatic8N(Nest79,2,3,3) { Species = 631, Ability = 4 }, // Heatmor + new EncounterStatic8N(Nest79,2,4,4) { Species = 324, Ability = 4 }, // Torkoal + new EncounterStatic8N(Nest79,3,4,4) { Species = 609, Ability = -1 }, // Chandelure + new EncounterStatic8N(Nest79,4,4,4) { Species = 839, Ability = -1 }, // Coalossal + new EncounterStatic8N(Nest79,4,4,4) { Species = 851, Ability = -1, CanGigantamax = true }, // Centiskorch + new EncounterStatic8N(Nest81,0,0,1) { Species = 175, Ability = 4 }, // Togepi + new EncounterStatic8N(Nest81,0,1,1) { Species = 859, Ability = 4 }, // Impidimp + new EncounterStatic8N(Nest81,0,1,1) { Species = 280, Ability = 4 }, // Ralts + new EncounterStatic8N(Nest81,1,2,2) { Species = 176, Ability = 4 }, // Togetic + new EncounterStatic8N(Nest81,1,2,2) { Species = 756, Ability = 4 }, // Shiinotic + new EncounterStatic8N(Nest81,2,3,3) { Species = 860, Ability = 4 }, // Morgrem + new EncounterStatic8N(Nest81,3,4,4) { Species = 282, Ability = -1 }, // Gardevoir + new EncounterStatic8N(Nest81,3,4,4) { Species = 468, Ability = -1 }, // Togekiss + new EncounterStatic8N(Nest81,4,4,4) { Species = 861, Ability = -1 }, // Grimmsnarl + new EncounterStatic8N(Nest81,4,4,4) { Species = 869, Ability = -1, CanGigantamax = true }, // Alcremie + new EncounterStatic8N(Nest83,0,0,1) { Species = 447, Ability = 4 }, // Riolu + new EncounterStatic8N(Nest83,0,0,1) { Species = 436, Ability = 4 }, // Bronzor + new EncounterStatic8N(Nest83,0,1,1) { Species = 624, Ability = 4 }, // Pawniard + new EncounterStatic8N(Nest83,0,1,1) { Species = 599, Ability = 4 }, // Klink + new EncounterStatic8N(Nest83,1,2,2) { Species = 095, Ability = 4 }, // Onix + new EncounterStatic8N(Nest83,2,4,4) { Species = 437, Ability = 4 }, // Bronzong + new EncounterStatic8N(Nest83,3,4,4) { Species = 625, Ability = -1 }, // Bisharp + new EncounterStatic8N(Nest83,3,4,4) { Species = 208, Ability = -1 }, // Steelix + new EncounterStatic8N(Nest83,4,4,4) { Species = 601, Ability = -1 }, // Klinklang + new EncounterStatic8N(Nest83,4,4,4) { Species = 884, Ability = -1, CanGigantamax = true }, // Duraludon + new EncounterStatic8N(Nest84,0,0,1) { Species = 052, Ability = 4, Form = 2 }, // Meowth-2 + new EncounterStatic8N(Nest84,0,0,1) { Species = 436, Ability = 4 }, // Bronzor + new EncounterStatic8N(Nest84,0,1,1) { Species = 624, Ability = 4 }, // Pawniard + new EncounterStatic8N(Nest84,0,1,1) { Species = 597, Ability = 4 }, // Ferroseed + new EncounterStatic8N(Nest84,1,2,2) { Species = 679, Ability = 4 }, // Honedge + new EncounterStatic8N(Nest84,1,2,2) { Species = 437, Ability = 4 }, // Bronzong + new EncounterStatic8N(Nest84,2,3,3) { Species = 863, Ability = 4 }, // Perrserker + new EncounterStatic8N(Nest84,2,4,4) { Species = 598, Ability = 4 }, // Ferrothorn + new EncounterStatic8N(Nest84,3,4,4) { Species = 625, Ability = -1 }, // Bisharp + new EncounterStatic8N(Nest84,3,4,4) { Species = 618, Ability = -1, Form = 1 }, // Stunfisk-1 + new EncounterStatic8N(Nest84,4,4,4) { Species = 884, Ability = -1 }, // Duraludon + new EncounterStatic8N(Nest84,4,4,4) { Species = 879, Ability = -1, CanGigantamax = true }, // Copperajah + new EncounterStatic8N(Nest85,0,0,1) { Species = 434, Ability = 4 }, // Stunky + new EncounterStatic8N(Nest85,0,0,1) { Species = 568, Ability = 4 }, // Trubbish + new EncounterStatic8N(Nest85,0,1,1) { Species = 451, Ability = 4 }, // Skorupi + new EncounterStatic8N(Nest85,0,1,1) { Species = 109, Ability = 4 }, // Koffing + new EncounterStatic8N(Nest85,1,2,2) { Species = 848, Ability = 4 }, // Toxel + new EncounterStatic8N(Nest85,2,3,3) { Species = 452, Ability = 4 }, // Drapion + new EncounterStatic8N(Nest85,2,4,4) { Species = 849, Ability = 4 }, // Toxtricity + new EncounterStatic8N(Nest85,3,4,4) { Species = 435, Ability = -1 }, // Skuntank + new EncounterStatic8N(Nest85,3,4,4) { Species = 110, Ability = -1, Form = 1 }, // Weezing-1 + new EncounterStatic8N(Nest85,4,4,4) { Species = 569, Ability = -1, CanGigantamax = true }, // Garbodor + new EncounterStatic8N(Nest86,0,0,1) { Species = 175, Ability = 4 }, // Togepi + new EncounterStatic8N(Nest86,0,1,1) { Species = 859, Ability = 4 }, // Impidimp + new EncounterStatic8N(Nest86,0,1,1) { Species = 280, Ability = 4 }, // Ralts + new EncounterStatic8N(Nest86,1,2,2) { Species = 176, Ability = 4 }, // Togetic + new EncounterStatic8N(Nest86,1,2,2) { Species = 860, Ability = 4 }, // Morgrem + new EncounterStatic8N(Nest86,2,4,4) { Species = 868, Ability = 4 }, // Milcery + new EncounterStatic8N(Nest86,3,4,4) { Species = 282, Ability = -1 }, // Gardevoir + new EncounterStatic8N(Nest86,3,4,4) { Species = 861, Ability = -1 }, // Grimmsnarl + new EncounterStatic8N(Nest86,4,4,4) { Species = 468, Ability = -1 }, // Togekiss + new EncounterStatic8N(Nest86,4,4,4) { Species = 858, Ability = -1, CanGigantamax = true }, // Hatterene + new EncounterStatic8N(Nest87,0,0,1) { Species = 827, Ability = 4 }, // Nickit + new EncounterStatic8N(Nest87,0,0,1) { Species = 263, Ability = 4, Form = 1 }, // Zigzagoon-1 + new EncounterStatic8N(Nest87,0,1,1) { Species = 859, Ability = 4 }, // Impidimp + new EncounterStatic8N(Nest87,1,2,2) { Species = 510, Ability = 4 }, // Liepard + new EncounterStatic8N(Nest87,1,2,2) { Species = 264, Ability = 4, Form = 1 }, // Linoone-1 + new EncounterStatic8N(Nest87,2,3,3) { Species = 860, Ability = 4 }, // Morgrem + new EncounterStatic8N(Nest87,2,4,4) { Species = 828, Ability = 4 }, // Thievul + new EncounterStatic8N(Nest87,3,4,4) { Species = 675, Ability = -1 }, // Pangoro + new EncounterStatic8N(Nest87,4,4,4) { Species = 861, Ability = -1, CanGigantamax = true }, // Grimmsnarl + new EncounterStatic8N(Nest88,0,0,1) { Species = 177, Ability = 4 }, // Natu + new EncounterStatic8N(Nest88,0,0,1) { Species = 163, Ability = 4 }, // Hoothoot + new EncounterStatic8N(Nest88,0,1,1) { Species = 821, Ability = 4 }, // Rookidee + new EncounterStatic8N(Nest88,0,1,1) { Species = 278, Ability = 4 }, // Wingull + new EncounterStatic8N(Nest88,1,2,2) { Species = 012, Ability = 4 }, // Butterfree + new EncounterStatic8N(Nest88,1,2,2) { Species = 822, Ability = 4 }, // Corvisquire + new EncounterStatic8N(Nest88,2,3,3) { Species = 164, Ability = 4 }, // Noctowl + new EncounterStatic8N(Nest88,2,4,4) { Species = 279, Ability = 4 }, // Pelipper + new EncounterStatic8N(Nest88,3,4,4) { Species = 178, Ability = -1 }, // Xatu + new EncounterStatic8N(Nest88,3,4,4) { Species = 701, Ability = -1 }, // Hawlucha + new EncounterStatic8N(Nest88,4,4,4) { Species = 561, Ability = -1 }, // Sigilyph + new EncounterStatic8N(Nest88,4,4,4) { Species = 823, Ability = -1, CanGigantamax = true }, // Corviknight + new EncounterStatic8N(Nest89,0,0,1) { Species = 767, Ability = 4 }, // Wimpod + new EncounterStatic8N(Nest89,0,0,1) { Species = 824, Ability = 4 }, // Blipbug + new EncounterStatic8N(Nest89,0,1,1) { Species = 751, Ability = 4 }, // Dewpider + new EncounterStatic8N(Nest89,1,2,2) { Species = 557, Ability = 4 }, // Dwebble + new EncounterStatic8N(Nest89,2,3,3) { Species = 825, Ability = 4 }, // Dottler + new EncounterStatic8N(Nest89,2,4,4) { Species = 826, Ability = 4 }, // Orbeetle + new EncounterStatic8N(Nest89,3,4,4) { Species = 752, Ability = -1 }, // Araquanid + new EncounterStatic8N(Nest89,3,4,4) { Species = 768, Ability = -1 }, // Golisopod + new EncounterStatic8N(Nest89,0,4,4) { Species = 012, Ability = -1, CanGigantamax = true }, // Butterfree + new EncounterStatic8N(Nest90,0,0,1) { Species = 341, Ability = 4 }, // Corphish + new EncounterStatic8N(Nest90,0,0,1) { Species = 098, Ability = 4 }, // Krabby + new EncounterStatic8N(Nest90,0,1,1) { Species = 846, Ability = 4 }, // Arrokuda + new EncounterStatic8N(Nest90,0,1,1) { Species = 833, Ability = 4 }, // Chewtle + new EncounterStatic8N(Nest90,1,2,2) { Species = 747, Ability = 4 }, // Mareanie + new EncounterStatic8N(Nest90,2,3,3) { Species = 342, Ability = 4 }, // Crawdaunt + new EncounterStatic8N(Nest90,2,4,4) { Species = 748, Ability = 4 }, // Toxapex + new EncounterStatic8N(Nest90,3,4,4) { Species = 771, Ability = -1 }, // Pyukumuku + new EncounterStatic8N(Nest90,3,4,4) { Species = 130, Ability = -1 }, // Gyarados + new EncounterStatic8N(Nest90,4,4,4) { Species = 131, Ability = -1 }, // Lapras + new EncounterStatic8N(Nest90,1,4,4) { Species = 099, Ability = -1, CanGigantamax = true }, // Kingler + new EncounterStatic8N(Nest91,0,0,1) { Species = 767, Ability = 4 }, // Wimpod + new EncounterStatic8N(Nest91,0,0,1) { Species = 824, Ability = 4 }, // Blipbug + new EncounterStatic8N(Nest91,0,1,1) { Species = 751, Ability = 4 }, // Dewpider + new EncounterStatic8N(Nest91,1,2,2) { Species = 557, Ability = 4 }, // Dwebble + new EncounterStatic8N(Nest91,2,3,3) { Species = 825, Ability = 4 }, // Dottler + new EncounterStatic8N(Nest91,2,4,4) { Species = 826, Ability = 4 }, // Orbeetle + new EncounterStatic8N(Nest91,3,4,4) { Species = 752, Ability = -1 }, // Araquanid + new EncounterStatic8N(Nest91,3,4,4) { Species = 768, Ability = -1 }, // Golisopod + new EncounterStatic8N(Nest91,2,4,4) { Species = 826, Ability = -1, CanGigantamax = true }, // Orbeetle + new EncounterStatic8N(Nest92,0,0,1) { Species = 194, Ability = 4 }, // Wooper + new EncounterStatic8N(Nest92,0,0,1) { Species = 339, Ability = 4 }, // Barboach + new EncounterStatic8N(Nest92,0,1,1) { Species = 562, Ability = 4, Form = 1 }, // Yamask-1 + new EncounterStatic8N(Nest92,0,1,1) { Species = 622, Ability = 4 }, // Golett + new EncounterStatic8N(Nest92,1,2,2) { Species = 536, Ability = 4 }, // Palpitoad + new EncounterStatic8N(Nest92,1,2,2) { Species = 195, Ability = 4 }, // Quagsire + new EncounterStatic8N(Nest92,2,3,3) { Species = 618, Ability = 4, Form = 1 }, // Stunfisk-1 + new EncounterStatic8N(Nest92,2,4,4) { Species = 623, Ability = 4 }, // Golurk + new EncounterStatic8N(Nest92,3,4,4) { Species = 423, Ability = -1, Form = 1 }, // Gastrodon-1 + new EncounterStatic8N(Nest92,3,4,4) { Species = 537, Ability = -1 }, // Seismitoad + new EncounterStatic8N(Nest92,4,4,4) { Species = 464, Ability = -1 }, // Rhyperior + new EncounterStatic8N(Nest92,3,4,4) { Species = 844, Ability = -1, CanGigantamax = true }, // Sandaconda + }; + + internal static readonly EncounterStatic8N[] Nest_SW = + { + new EncounterStatic8N(Nest00,0,1,1) { Species = 559, Ability = 4 }, // Scraggy + new EncounterStatic8N(Nest00,2,3,3) { Species = 106, Ability = 4 }, // Hitmonlee + new EncounterStatic8N(Nest00,2,4,4) { Species = 107, Ability = 4 }, // Hitmonchan + new EncounterStatic8N(Nest00,2,4,4) { Species = 560, Ability = 4 }, // Scrafty + new EncounterStatic8N(Nest00,3,4,4) { Species = 534, Ability = -1 }, // Conkeldurr + new EncounterStatic8N(Nest00,4,4,4) { Species = 237, Ability = -1 }, // Hitmontop + new EncounterStatic8N(Nest01,0,1,1) { Species = 574, Ability = 4 }, // Gothita + new EncounterStatic8N(Nest01,2,3,3) { Species = 678, Ability = 4, Gender = 0 }, // Meowstic + new EncounterStatic8N(Nest01,2,3,3) { Species = 575, Ability = 4 }, // Gothorita + new EncounterStatic8N(Nest01,3,4,4) { Species = 576, Ability = -1 }, // Gothitelle + new EncounterStatic8N(Nest01,4,4,4) { Species = 338, Ability = -1 }, // Solrock + new EncounterStatic8N(Nest02,0,0,1) { Species = 524, Ability = 4 }, // Roggenrola + new EncounterStatic8N(Nest02,0,1,1) { Species = 688, Ability = 4 }, // Binacle + new EncounterStatic8N(Nest02,3,4,4) { Species = 558, Ability = -1 }, // Crustle + new EncounterStatic8N(Nest02,4,4,4) { Species = 526, Ability = -1 }, // Gigalith + new EncounterStatic8N(Nest06,0,1,1) { Species = 223, Ability = 4 }, // Remoraid + new EncounterStatic8N(Nest06,0,1,1) { Species = 170, Ability = 4 }, // Chinchou + new EncounterStatic8N(Nest06,1,2,2) { Species = 550, Ability = 4 }, // Basculin + new EncounterStatic8N(Nest07,1,2,2) { Species = 550, Ability = 4 }, // Basculin + new EncounterStatic8N(Nest08,1,1,2) { Species = 090, Ability = 4 }, // Shellder + new EncounterStatic8N(Nest09,1,1,2) { Species = 083, Ability = 4, Form = 1 }, // Farfetch’d-1 + new EncounterStatic8N(Nest09,1,2,2) { Species = 539, Ability = 4 }, // Sawk + new EncounterStatic8N(Nest09,3,4,4) { Species = 865, Ability = -1 }, // Sirfetch’d + new EncounterStatic8N(Nest11,4,4,4) { Species = 303, Ability = -1 }, // Mawile + new EncounterStatic8N(Nest12,0,1,1) { Species = 177, Ability = 4 }, // Natu + new EncounterStatic8N(Nest12,0,1,1) { Species = 856, Ability = 4 }, // Hatenna + new EncounterStatic8N(Nest12,1,1,2) { Species = 825, Ability = 4 }, // Dottler + new EncounterStatic8N(Nest12,1,3,2) { Species = 857, Ability = 4 }, // Hattrem + new EncounterStatic8N(Nest12,2,4,4) { Species = 876, Ability = 4, Gender = 0 }, // Indeedee + new EncounterStatic8N(Nest12,3,4,4) { Species = 561, Ability = -1 }, // Sigilyph + new EncounterStatic8N(Nest12,4,4,4) { Species = 826, Ability = -1 }, // Orbeetle + new EncounterStatic8N(Nest13,2,4,4) { Species = 876, Ability = 4, Gender = 0 }, // Indeedee + new EncounterStatic8N(Nest14,0,0,1) { Species = 524, Ability = 4 }, // Roggenrola + new EncounterStatic8N(Nest14,0,1,1) { Species = 557, Ability = 4 }, // Dwebble + new EncounterStatic8N(Nest14,2,4,4) { Species = 095, Ability = 4 }, // Onix + new EncounterStatic8N(Nest14,3,4,4) { Species = 839, Ability = -1 }, // Coalossal + new EncounterStatic8N(Nest14,4,4,4) { Species = 526, Ability = -1 }, // Gigalith + new EncounterStatic8N(Nest16,0,1,1) { Species = 220, Ability = 4 }, // Swinub + new EncounterStatic8N(Nest16,1,1,1) { Species = 328, Ability = 4 }, // Trapinch + new EncounterStatic8N(Nest16,2,3,3) { Species = 329, Ability = 4 }, // Vibrava + new EncounterStatic8N(Nest16,2,4,4) { Species = 618, Ability = 4, Form = 1 }, // Stunfisk-1 + new EncounterStatic8N(Nest16,3,4,4) { Species = 450, Ability = -1 }, // Hippowdon + new EncounterStatic8N(Nest16,4,4,4) { Species = 330, Ability = -1 }, // Flygon + new EncounterStatic8N(Nest17,0,0,1) { Species = 037, Ability = 4 }, // Vulpix + new EncounterStatic8N(Nest17,1,1,1) { Species = 554, Ability = 4, Form = 1 }, // Darumaka-1 + new EncounterStatic8N(Nest17,1,2,2) { Species = 758, Ability = 4, Gender = 1 }, // Salazzle + new EncounterStatic8N(Nest17,2,3,3) { Species = 608, Ability = 4 }, // Lampent + new EncounterStatic8N(Nest17,2,4,4) { Species = 038, Ability = 4 }, // Ninetales + new EncounterStatic8N(Nest17,3,4,4) { Species = 851, Ability = -1 }, // Centiskorch + new EncounterStatic8N(Nest17,4,4,4) { Species = 631, Ability = -1 }, // Heatmor + new EncounterStatic8N(Nest17,4,4,4) { Species = 555, Ability = -1, Form = 2 }, // Darmanitan-2 + new EncounterStatic8N(Nest18,0,0,1) { Species = 037, Ability = 4 }, // Vulpix + new EncounterStatic8N(Nest18,0,1,1) { Species = 037, Ability = 4 }, // Vulpix + new EncounterStatic8N(Nest18,1,2,2) { Species = 758, Ability = 4, Gender = 1 }, // Salazzle + new EncounterStatic8N(Nest18,2,3,3) { Species = 608, Ability = 4 }, // Lampent + new EncounterStatic8N(Nest18,2,4,4) { Species = 038, Ability = 4 }, // Ninetales + new EncounterStatic8N(Nest18,2,4,4) { Species = 324, Ability = 4 }, // Torkoal + new EncounterStatic8N(Nest18,3,4,4) { Species = 758, Ability = -1, Gender = 1 }, // Salazzle + new EncounterStatic8N(Nest18,4,4,4) { Species = 776, Ability = -1 }, // Turtonator + new EncounterStatic8N(Nest19,0,0,1) { Species = 037, Ability = 4 }, // Vulpix + new EncounterStatic8N(Nest19,1,1,1) { Species = 554, Ability = 4, Form = 1 }, // Darumaka-1 + new EncounterStatic8N(Nest19,1,2,2) { Species = 758, Ability = 4, Gender = 1 }, // Salazzle + new EncounterStatic8N(Nest19,2,3,3) { Species = 838, Ability = 4 }, // Carkol + new EncounterStatic8N(Nest19,2,4,4) { Species = 038, Ability = 4 }, // Ninetales + new EncounterStatic8N(Nest19,4,4,4) { Species = 555, Ability = -1, Form = 2 }, // Darmanitan-2 + new EncounterStatic8N(Nest22,0,1,1) { Species = 554, Ability = 4, Form = 1 }, // Darumaka-1 + new EncounterStatic8N(Nest22,4,4,4) { Species = 555, Ability = -1, Form = 2 }, // Darmanitan-2 + new EncounterStatic8N(Nest25,0,0,1) { Species = 273, Ability = 4 }, // Seedot + new EncounterStatic8N(Nest25,1,1,2) { Species = 274, Ability = 4 }, // Nuzleaf + new EncounterStatic8N(Nest25,2,4,4) { Species = 275, Ability = 4 }, // Shiftry + new EncounterStatic8N(Nest26,4,4,4) { Species = 841, Ability = -1 }, // Flapple + new EncounterStatic8N(Nest28,0,1,1) { Species = 747, Ability = 4 }, // Mareanie + new EncounterStatic8N(Nest28,1,1,2) { Species = 043, Ability = 4 }, // Oddish + new EncounterStatic8N(Nest28,3,4,4) { Species = 748, Ability = -1 }, // Toxapex + new EncounterStatic8N(Nest28,4,4,4) { Species = 435, Ability = -1 }, // Skuntank + new EncounterStatic8N(Nest30,0,1,1) { Species = 627, Ability = 4 }, // Rufflet + new EncounterStatic8N(Nest30,4,4,4) { Species = 628, Ability = -1 }, // Braviary + new EncounterStatic8N(Nest32,0,1,1) { Species = 684, Ability = 4 }, // Swirlix + new EncounterStatic8N(Nest32,4,4,4) { Species = 685, Ability = -1 }, // Slurpuff + new EncounterStatic8N(Nest33,4,4,4) { Species = 303, Ability = -1 }, // Mawile + new EncounterStatic8N(Nest34,4,4,4) { Species = 275, Ability = -1 }, // Shiftry + new EncounterStatic8N(Nest35,1,1,2) { Species = 633, Ability = 4 }, // Deino + new EncounterStatic8N(Nest35,3,4,4) { Species = 634, Ability = -1 }, // Zweilous + new EncounterStatic8N(Nest35,4,4,4) { Species = 635, Ability = -1 }, // Hydreigon + new EncounterStatic8N(Nest36,0,0,1) { Species = 328, Ability = 4 }, // Trapinch + new EncounterStatic8N(Nest36,0,1,1) { Species = 610, Ability = 4 }, // Axew + new EncounterStatic8N(Nest36,1,1,2) { Species = 782, Ability = 4 }, // Jangmo-o + new EncounterStatic8N(Nest36,2,3,3) { Species = 783, Ability = 4 }, // Hakamo-o + new EncounterStatic8N(Nest36,2,4,4) { Species = 611, Ability = 4 }, // Fraxure + new EncounterStatic8N(Nest36,2,4,4) { Species = 612, Ability = 4 }, // Haxorus + new EncounterStatic8N(Nest36,3,4,4) { Species = 330, Ability = -1 }, // Flygon + new EncounterStatic8N(Nest36,4,4,4) { Species = 776, Ability = -1 }, // Turtonator + new EncounterStatic8N(Nest36,4,4,4) { Species = 784, Ability = -1 }, // Kommo-o + new EncounterStatic8N(Nest37,0,1,1) { Species = 782, Ability = 4 }, // Jangmo-o + new EncounterStatic8N(Nest37,2,4,4) { Species = 783, Ability = 4 }, // Hakamo-o + new EncounterStatic8N(Nest37,3,4,4) { Species = 784, Ability = -1 }, // Kommo-o + new EncounterStatic8N(Nest37,4,4,4) { Species = 841, Ability = -1 }, // Flapple + new EncounterStatic8N(Nest39,1,1,2) { Species = 876, Ability = 4, Gender = 0 }, // Indeedee + new EncounterStatic8N(Nest39,4,4,4) { Species = 628, Ability = -1 }, // Braviary + new EncounterStatic8N(Nest40,0,1,1) { Species = 747, Ability = 4 }, // Mareanie + new EncounterStatic8N(Nest40,1,1,2) { Species = 536, Ability = 4 }, // Palpitoad + new EncounterStatic8N(Nest40,2,3,3) { Species = 091, Ability = 4 }, // Cloyster + new EncounterStatic8N(Nest40,2,4,4) { Species = 746, Ability = 4 }, // Wishiwashi + new EncounterStatic8N(Nest40,3,4,4) { Species = 537, Ability = -1 }, // Seismitoad + new EncounterStatic8N(Nest40,4,4,4) { Species = 748, Ability = -1 }, // Toxapex + new EncounterStatic8N(Nest42,1,3,2) { Species = 710, Ability = 4 }, // Pumpkaboo + new EncounterStatic8N(Nest42,4,4,4) { Species = 867, Ability = 4 }, // Runerigus + new EncounterStatic8N(Nest42,3,4,4) { Species = 855, Ability = -1 }, // Polteageist + new EncounterStatic8N(Nest42,3,4,4) { Species = 711, Ability = -1 }, // Gourgeist + new EncounterStatic8N(Nest43,1,2,2) { Species = 550, Ability = 4 }, // Basculin + new EncounterStatic8N(Nest44,1,2,2) { Species = 632, Ability = 4 }, // Durant + new EncounterStatic8N(Nest44,2,3,3) { Species = 600, Ability = 4 }, // Klang + new EncounterStatic8N(Nest45,0,1,1) { Species = 588, Ability = 4 }, // Karrablast + new EncounterStatic8N(Nest45,1,2,2) { Species = 616, Ability = 4 }, // Shelmet + new EncounterStatic8N(Nest45,4,4,4) { Species = 589, Ability = -1 }, // Escavalier + new EncounterStatic8N(Nest46,1,3,3) { Species = 710, Ability = 4 }, // Pumpkaboo + new EncounterStatic8N(Nest46,2,4,4) { Species = 711, Ability = 4 }, // Gourgeist + new EncounterStatic8N(Nest46,3,4,4) { Species = 711, Ability = -1 }, // Gourgeist + new EncounterStatic8N(Nest47,0,1,1) { Species = 559, Ability = 4 }, // Scraggy + new EncounterStatic8N(Nest47,2,4,4) { Species = 560, Ability = 4 }, // Scrafty + new EncounterStatic8N(Nest47,3,4,4) { Species = 766, Ability = -1 }, // Passimian + new EncounterStatic8N(Nest50,0,1,1) { Species = 688, Ability = 4 }, // Binacle + new EncounterStatic8N(Nest50,1,2,2) { Species = 185, Ability = 4 }, // Sudowoodo + new EncounterStatic8N(Nest50,2,3,3) { Species = 689, Ability = 4 }, // Barbaracle + new EncounterStatic8N(Nest50,4,4,4) { Species = 874, Ability = -1 }, // Stonjourner + new EncounterStatic8N(Nest52,0,0,1) { Species = 037, Ability = 4 }, // Vulpix + new EncounterStatic8N(Nest52,1,2,2) { Species = 038, Ability = 4 }, // Ninetales + new EncounterStatic8N(Nest52,3,4,4) { Species = 038, Ability = -1 }, // Ninetales + new EncounterStatic8N(Nest53,0,0,1) { Species = 037, Ability = 4 }, // Vulpix + new EncounterStatic8N(Nest53,1,2,2) { Species = 608, Ability = 4 }, // Lampent + new EncounterStatic8N(Nest53,2,3,3) { Species = 631, Ability = 4 }, // Heatmor + new EncounterStatic8N(Nest53,3,4,4) { Species = 038, Ability = -1 }, // Ninetales + new EncounterStatic8N(Nest53,4,4,4) { Species = 776, Ability = -1 }, // Turtonator + new EncounterStatic8N(Nest54,0,0,1) { Species = 554, Ability = 4, Form = 1 }, // Darumaka-1 + new EncounterStatic8N(Nest54,4,4,4) { Species = 555, Ability = -1, Form = 2 }, // Darmanitan-2 + new EncounterStatic8N(Nest57,0,0,1) { Species = 273, Ability = 4 }, // Seedot + new EncounterStatic8N(Nest57,1,2,2) { Species = 274, Ability = 4 }, // Nuzleaf + new EncounterStatic8N(Nest57,2,4,4) { Species = 275, Ability = 4 }, // Shiftry + new EncounterStatic8N(Nest57,4,4,4) { Species = 841, Ability = -1 }, // Flapple + new EncounterStatic8N(Nest58,0,0,1) { Species = 273, Ability = 4 }, // Seedot + new EncounterStatic8N(Nest58,1,2,2) { Species = 274, Ability = 4 }, // Nuzleaf + new EncounterStatic8N(Nest58,4,4,4) { Species = 275, Ability = -1 }, // Shiftry + new EncounterStatic8N(Nest59,1,2,2) { Species = 747, Ability = 4 }, // Mareanie + new EncounterStatic8N(Nest59,4,4,4) { Species = 748, Ability = -1 }, // Toxapex + new EncounterStatic8N(Nest61,2,4,4) { Species = 303, Ability = 4 }, // Mawile + new EncounterStatic8N(Nest62,0,1,1) { Species = 559, Ability = 4 }, // Scraggy + new EncounterStatic8N(Nest62,3,4,4) { Species = 560, Ability = -1 }, // Scrafty + new EncounterStatic8N(Nest62,4,4,4) { Species = 635, Ability = -1 }, // Hydreigon + new EncounterStatic8N(Nest63,0,0,1) { Species = 328, Ability = 4 }, // Trapinch + new EncounterStatic8N(Nest63,0,1,1) { Species = 610, Ability = 4 }, // Axew + new EncounterStatic8N(Nest63,0,1,1) { Species = 782, Ability = 4 }, // Jangmo-o + new EncounterStatic8N(Nest63,1,2,2) { Species = 611, Ability = 4 }, // Fraxure + new EncounterStatic8N(Nest63,2,4,4) { Species = 783, Ability = 4 }, // Hakamo-o + new EncounterStatic8N(Nest63,2,4,4) { Species = 776, Ability = 4 }, // Turtonator + new EncounterStatic8N(Nest63,3,4,4) { Species = 784, Ability = -1 }, // Kommo-o + new EncounterStatic8N(Nest63,4,4,4) { Species = 612, Ability = -1 }, // Haxorus + new EncounterStatic8N(Nest64,3,4,4) { Species = 628, Ability = -1 }, // Braviary + new EncounterStatic8N(Nest64,3,4,4) { Species = 876, Ability = -1, Gender = 0 }, // Indeedee + new EncounterStatic8N(Nest66,1,2,2) { Species = 550, Ability = 4 }, // Basculin + new EncounterStatic8N(Nest70,0,0,1) { Species = 037, Ability = 4 }, // Vulpix + new EncounterStatic8N(Nest70,0,1,1) { Species = 037, Ability = 4 }, // Vulpix + new EncounterStatic8N(Nest70,1,2,2) { Species = 608, Ability = 4 }, // Lampent + new EncounterStatic8N(Nest70,2,3,3) { Species = 631, Ability = 4 }, // Heatmor + new EncounterStatic8N(Nest73,0,0,1) { Species = 684, Ability = 4 }, // Swirlix + new EncounterStatic8N(Nest73,2,4,4) { Species = 685, Ability = 4 }, // Slurpuff + new EncounterStatic8N(Nest75,2,4,4) { Species = 550, Ability = 4 }, // Basculin + new EncounterStatic8N(Nest76,0,0,1) { Species = 037, Ability = 4 }, // Vulpix + new EncounterStatic8N(Nest76,1,2,2) { Species = 038, Ability = 4 }, // Ninetales + new EncounterStatic8N(Nest76,3,4,4) { Species = 038, Ability = -1 }, // Ninetales + new EncounterStatic8N(Nest77,1,2,2) { Species = 550, Ability = 4 }, // Basculin + new EncounterStatic8N(Nest78,0,0,1) { Species = 273, Ability = 4 }, // Seedot + new EncounterStatic8N(Nest78,1,2,2) { Species = 274, Ability = 4 }, // Nuzleaf + new EncounterStatic8N(Nest78,2,4,4) { Species = 275, Ability = 4 }, // Shiftry + new EncounterStatic8N(Nest78,4,4,4) { Species = 841, Ability = -1, CanGigantamax = true }, // Flapple + new EncounterStatic8N(Nest79,0,0,1) { Species = 037, Ability = 4 }, // Vulpix + new EncounterStatic8N(Nest79,3,4,4) { Species = 038, Ability = -1 }, // Ninetales + new EncounterStatic8N(Nest80,0,0,1) { Species = 447, Ability = 4 }, // Riolu + new EncounterStatic8N(Nest80,0,0,1) { Species = 066, Ability = 4 }, // Machop + new EncounterStatic8N(Nest80,0,1,1) { Species = 759, Ability = 4 }, // Stufful + new EncounterStatic8N(Nest80,0,1,1) { Species = 083, Ability = 4, Form = 1 }, // Farfetch’d-1 + new EncounterStatic8N(Nest80,1,2,2) { Species = 760, Ability = 4 }, // Bewear + new EncounterStatic8N(Nest80,1,3,3) { Species = 067, Ability = 4 }, // Machoke + new EncounterStatic8N(Nest80,2,3,3) { Species = 870, Ability = 4 }, // Falinks + new EncounterStatic8N(Nest80,2,4,4) { Species = 701, Ability = 4 }, // Hawlucha + new EncounterStatic8N(Nest80,3,4,4) { Species = 448, Ability = -1 }, // Lucario + new EncounterStatic8N(Nest80,3,4,4) { Species = 475, Ability = -1 }, // Gallade + new EncounterStatic8N(Nest80,4,4,4) { Species = 865, Ability = -1 }, // Sirfetch’d + new EncounterStatic8N(Nest80,4,4,4) { Species = 068, Ability = -1, CanGigantamax = true }, // Machamp + new EncounterStatic8N(Nest81,0,0,1) { Species = 755, Ability = 4 }, // Morelull + new EncounterStatic8N(Nest81,2,4,4) { Species = 303, Ability = 4 }, // Mawile + new EncounterStatic8N(Nest82,0,0,1) { Species = 557, Ability = 4 }, // Dwebble + new EncounterStatic8N(Nest82,0,0,1) { Species = 438, Ability = 4 }, // Bonsly + new EncounterStatic8N(Nest82,0,1,1) { Species = 837, Ability = 4 }, // Rolycoly + new EncounterStatic8N(Nest82,0,1,1) { Species = 688, Ability = 4 }, // Binacle + new EncounterStatic8N(Nest82,1,2,2) { Species = 838, Ability = 4 }, // Carkol + new EncounterStatic8N(Nest82,1,2,2) { Species = 185, Ability = 4 }, // Sudowoodo + new EncounterStatic8N(Nest82,2,3,3) { Species = 689, Ability = 4 }, // Barbaracle + new EncounterStatic8N(Nest82,2,4,4) { Species = 095, Ability = 4 }, // Onix + new EncounterStatic8N(Nest82,3,4,4) { Species = 558, Ability = -1 }, // Crustle + new EncounterStatic8N(Nest82,3,4,4) { Species = 208, Ability = -1 }, // Steelix + new EncounterStatic8N(Nest82,4,4,4) { Species = 874, Ability = -1 }, // Stonjourner + new EncounterStatic8N(Nest82,4,4,4) { Species = 839, Ability = -1, CanGigantamax = true }, // Coalossal + new EncounterStatic8N(Nest83,1,2,2) { Species = 632, Ability = 4 }, // Durant + new EncounterStatic8N(Nest83,2,3,3) { Species = 600, Ability = 4 }, // Klang + new EncounterStatic8N(Nest85,1,2,2) { Species = 747, Ability = 4 }, // Mareanie + new EncounterStatic8N(Nest85,4,4,4) { Species = 748, Ability = -1 }, // Toxapex + new EncounterStatic8N(Nest86,0,0,1) { Species = 684, Ability = 4 }, // Swirlix + new EncounterStatic8N(Nest86,2,3,3) { Species = 685, Ability = 4 }, // Slurpuff + new EncounterStatic8N(Nest87,0,1,1) { Species = 559, Ability = 4 }, // Scraggy + new EncounterStatic8N(Nest87,3,4,4) { Species = 560, Ability = -1 }, // Scrafty + new EncounterStatic8N(Nest87,4,4,4) { Species = 635, Ability = -1 }, // Hydreigon + new EncounterStatic8N(Nest89,0,1,1) { Species = 588, Ability = 4 }, // Karrablast + new EncounterStatic8N(Nest89,1,2,2) { Species = 616, Ability = 4 }, // Shelmet + new EncounterStatic8N(Nest89,4,4,4) { Species = 589, Ability = -1 }, // Escavalier + new EncounterStatic8N(Nest90,1,2,2) { Species = 550, Ability = 4 }, // Basculin + new EncounterStatic8N(Nest91,0,1,1) { Species = 588, Ability = 4 }, // Karrablast + new EncounterStatic8N(Nest91,1,2,2) { Species = 616, Ability = 4 }, // Shelmet + new EncounterStatic8N(Nest91,4,4,4) { Species = 589, Ability = -1 }, // Escavalier }; + + internal static readonly EncounterStatic8N[] Nest_SH = + { + new EncounterStatic8N(Nest00,0,1,1) { Species = 453, Ability = 4 }, // Croagunk + new EncounterStatic8N(Nest00,2,3,3) { Species = 107, Ability = 4 }, // Hitmonchan + new EncounterStatic8N(Nest00,2,4,4) { Species = 106, Ability = 4 }, // Hitmonlee + new EncounterStatic8N(Nest00,2,4,4) { Species = 454, Ability = 4 }, // Toxicroak + new EncounterStatic8N(Nest00,3,4,4) { Species = 237, Ability = -1 }, // Hitmontop + new EncounterStatic8N(Nest00,4,4,4) { Species = 534, Ability = -1 }, // Conkeldurr + new EncounterStatic8N(Nest01,0,1,1) { Species = 577, Ability = 4 }, // Solosis + new EncounterStatic8N(Nest01,2,3,3) { Species = 678, Ability = 4, Gender = 1, Form = 1 }, // Meowstic-1 + new EncounterStatic8N(Nest01,2,3,3) { Species = 578, Ability = 4 }, // Duosion + new EncounterStatic8N(Nest01,3,4,4) { Species = 579, Ability = -1 }, // Reuniclus + new EncounterStatic8N(Nest01,4,4,4) { Species = 337, Ability = -1 }, // Lunatone + new EncounterStatic8N(Nest02,0,0,1) { Species = 688, Ability = 4 }, // Binacle + new EncounterStatic8N(Nest02,0,1,1) { Species = 524, Ability = 4 }, // Roggenrola + new EncounterStatic8N(Nest02,3,4,4) { Species = 526, Ability = -1 }, // Gigalith + new EncounterStatic8N(Nest02,4,4,4) { Species = 558, Ability = -1 }, // Crustle + new EncounterStatic8N(Nest06,0,1,2) { Species = 223, Ability = 4 }, // Remoraid + new EncounterStatic8N(Nest06,0,1,2) { Species = 170, Ability = 4 }, // Chinchou + new EncounterStatic8N(Nest06,1,2,2) { Species = 550, Ability = 4, Form = 1 }, // Basculin-1 + new EncounterStatic8N(Nest07,1,2,2) { Species = 550, Ability = 4, Form = 1 }, // Basculin-1 + new EncounterStatic8N(Nest08,1,1,1) { Species = 090, Ability = 4 }, // Shellder + new EncounterStatic8N(Nest09,1,1,2) { Species = 759, Ability = 4 }, // Stufful + new EncounterStatic8N(Nest09,1,2,2) { Species = 538, Ability = 4 }, // Throh + new EncounterStatic8N(Nest09,3,4,4) { Species = 760, Ability = -1 }, // Bewear + new EncounterStatic8N(Nest11,4,4,4) { Species = 208, Ability = -1 }, // Steelix + new EncounterStatic8N(Nest12,0,1,2) { Species = 177, Ability = 4 }, // Natu + new EncounterStatic8N(Nest12,0,1,2) { Species = 856, Ability = 4 }, // Hatenna + new EncounterStatic8N(Nest12,1,1,2) { Species = 077, Ability = 4, Form = 1 }, // Ponyta-1 + new EncounterStatic8N(Nest12,1,3,3) { Species = 857, Ability = 4 }, // Hattrem + new EncounterStatic8N(Nest12,2,4,4) { Species = 876, Ability = 4, Gender = 1, Form = 1 }, // Indeedee-1 + new EncounterStatic8N(Nest12,3,4,4) { Species = 765, Ability = -1 }, // Oranguru + new EncounterStatic8N(Nest12,4,4,4) { Species = 078, Ability = -1, Form = 1 }, // Rapidash-1 + new EncounterStatic8N(Nest13,2,4,4) { Species = 876, Ability = 4, Gender = 1, Form = 1 }, // Indeedee-1 + new EncounterStatic8N(Nest14,0,0,1) { Species = 557, Ability = 4 }, // Dwebble + new EncounterStatic8N(Nest14,0,1,1) { Species = 524, Ability = 4 }, // Roggenrola + new EncounterStatic8N(Nest14,2,4,4) { Species = 839, Ability = 4 }, // Coalossal + new EncounterStatic8N(Nest14,3,4,4) { Species = 526, Ability = -1 }, // Gigalith + new EncounterStatic8N(Nest14,4,4,4) { Species = 095, Ability = -1 }, // Onix + new EncounterStatic8N(Nest16,0,1,1) { Species = 328, Ability = 4 }, // Trapinch + new EncounterStatic8N(Nest16,1,1,1) { Species = 220, Ability = 4 }, // Swinub + new EncounterStatic8N(Nest16,2,3,3) { Species = 618, Ability = 4, Form = 1 }, // Stunfisk-1 + new EncounterStatic8N(Nest16,2,4,4) { Species = 329, Ability = 4 }, // Vibrava + new EncounterStatic8N(Nest16,3,4,4) { Species = 330, Ability = -1 }, // Flygon + new EncounterStatic8N(Nest16,4,4,4) { Species = 450, Ability = -1 }, // Hippowdon + new EncounterStatic8N(Nest17,0,0,1) { Species = 058, Ability = 4 }, // Growlithe + new EncounterStatic8N(Nest17,1,1,1) { Species = 631, Ability = 4 }, // Heatmor + new EncounterStatic8N(Nest17,1,2,2) { Species = 608, Ability = 4 }, // Lampent + new EncounterStatic8N(Nest17,2,3,3) { Species = 758, Ability = 4, Gender = 1 }, // Salazzle + new EncounterStatic8N(Nest17,2,4,4) { Species = 059, Ability = 4 }, // Arcanine + new EncounterStatic8N(Nest17,3,4,4) { Species = 631, Ability = -1 }, // Heatmor + new EncounterStatic8N(Nest17,4,4,4) { Species = 851, Ability = -1 }, // Centiskorch + new EncounterStatic8N(Nest17,4,4,4) { Species = 059, Ability = -1 }, // Arcanine + new EncounterStatic8N(Nest18,0,0,1) { Species = 058, Ability = 4 }, // Growlithe + new EncounterStatic8N(Nest18,0,1,1) { Species = 058, Ability = 4 }, // Growlithe + new EncounterStatic8N(Nest18,1,2,2) { Species = 608, Ability = 4 }, // Lampent + new EncounterStatic8N(Nest18,2,3,3) { Species = 758, Ability = 4, Gender = 1 }, // Salazzle + new EncounterStatic8N(Nest18,2,4,4) { Species = 059, Ability = 4 }, // Arcanine + new EncounterStatic8N(Nest18,2,4,4) { Species = 758, Ability = 4, Gender = 1 }, // Salazzle + new EncounterStatic8N(Nest18,3,4,4) { Species = 324, Ability = -1 }, // Torkoal + new EncounterStatic8N(Nest18,4,4,4) { Species = 059, Ability = -1 }, // Arcanine + new EncounterStatic8N(Nest19,0,0,1) { Species = 058, Ability = 4 }, // Growlithe + new EncounterStatic8N(Nest19,1,1,1) { Species = 324, Ability = 4 }, // Torkoal + new EncounterStatic8N(Nest19,1,2,2) { Species = 838, Ability = 4 }, // Carkol + new EncounterStatic8N(Nest19,2,3,3) { Species = 758, Ability = 4, Gender = 1 }, // Salazzle + new EncounterStatic8N(Nest19,2,4,4) { Species = 059, Ability = 4 }, // Arcanine + new EncounterStatic8N(Nest19,4,4,4) { Species = 059, Ability = -1 }, // Arcanine + new EncounterStatic8N(Nest22,0,1,1) { Species = 225, Ability = 4 }, // Delibird + new EncounterStatic8N(Nest22,4,4,4) { Species = 875, Ability = -1 }, // Eiscue + new EncounterStatic8N(Nest25,0,0,1) { Species = 270, Ability = 4 }, // Lotad + new EncounterStatic8N(Nest25,1,1,2) { Species = 271, Ability = 4 }, // Lombre + new EncounterStatic8N(Nest25,2,4,4) { Species = 272, Ability = 4 }, // Ludicolo + new EncounterStatic8N(Nest26,4,4,4) { Species = 842, Ability = -1 }, // Appletun + new EncounterStatic8N(Nest28,0,1,1) { Species = 043, Ability = 4 }, // Oddish + new EncounterStatic8N(Nest28,1,1,1) { Species = 747, Ability = 4 }, // Mareanie + new EncounterStatic8N(Nest28,3,4,4) { Species = 435, Ability = -1 }, // Skuntank + new EncounterStatic8N(Nest28,4,4,4) { Species = 748, Ability = -1 }, // Toxapex + new EncounterStatic8N(Nest30,0,1,1) { Species = 629, Ability = 4 }, // Vullaby + new EncounterStatic8N(Nest30,4,4,4) { Species = 630, Ability = -1 }, // Mandibuzz + new EncounterStatic8N(Nest32,0,1,1) { Species = 682, Ability = 4 }, // Spritzee + new EncounterStatic8N(Nest32,4,4,4) { Species = 683, Ability = -1 }, // Aromatisse + new EncounterStatic8N(Nest33,4,4,4) { Species = 078, Ability = -1, Form = 1 }, // Rapidash-1 + new EncounterStatic8N(Nest34,4,4,4) { Species = 302, Ability = -1 }, // Sableye + new EncounterStatic8N(Nest35,1,1,2) { Species = 629, Ability = 4 }, // Vullaby + new EncounterStatic8N(Nest35,3,4,4) { Species = 630, Ability = -1 }, // Mandibuzz + new EncounterStatic8N(Nest35,4,4,4) { Species = 248, Ability = -1 }, // Tyranitar + new EncounterStatic8N(Nest36,0,0,1) { Species = 610, Ability = 4 }, // Axew + new EncounterStatic8N(Nest36,0,1,1) { Species = 328, Ability = 4 }, // Trapinch + new EncounterStatic8N(Nest36,1,1,2) { Species = 704, Ability = 4 }, // Goomy + new EncounterStatic8N(Nest36,2,3,3) { Species = 611, Ability = 4 }, // Fraxure + new EncounterStatic8N(Nest36,2,4,4) { Species = 705, Ability = 4 }, // Sliggoo + new EncounterStatic8N(Nest36,2,4,4) { Species = 330, Ability = 4 }, // Flygon + new EncounterStatic8N(Nest36,3,4,4) { Species = 612, Ability = -1 }, // Haxorus + new EncounterStatic8N(Nest36,4,4,4) { Species = 780, Ability = -1 }, // Drampa + new EncounterStatic8N(Nest36,4,4,4) { Species = 706, Ability = -1 }, // Goodra + new EncounterStatic8N(Nest37,0,1,1) { Species = 704, Ability = 4 }, // Goomy + new EncounterStatic8N(Nest37,2,4,4) { Species = 705, Ability = 4 }, // Sliggoo + new EncounterStatic8N(Nest37,3,4,4) { Species = 706, Ability = -1 }, // Goodra + new EncounterStatic8N(Nest37,4,4,4) { Species = 842, Ability = -1 }, // Appletun + new EncounterStatic8N(Nest39,1,1,2) { Species = 876, Ability = 4, Gender = 1, Form = 1 }, // Indeedee-1 + new EncounterStatic8N(Nest39,4,4,4) { Species = 765, Ability = -1 }, // Oranguru + new EncounterStatic8N(Nest40,0,1,1) { Species = 536, Ability = 4 }, // Palpitoad + new EncounterStatic8N(Nest40,1,1,2) { Species = 747, Ability = 4 }, // Mareanie + new EncounterStatic8N(Nest40,2,3,3) { Species = 748, Ability = 4 }, // Toxapex + new EncounterStatic8N(Nest40,2,4,4) { Species = 091, Ability = 4 }, // Cloyster + new EncounterStatic8N(Nest40,3,4,4) { Species = 746, Ability = -1 }, // Wishiwashi + new EncounterStatic8N(Nest40,4,4,4) { Species = 537, Ability = -1 }, // Seismitoad + new EncounterStatic8N(Nest42,1,3,3) { Species = 222, Ability = 4, Form = 1 }, // Corsola-1 + new EncounterStatic8N(Nest42,4,4,4) { Species = 302, Ability = 4 }, // Sableye + new EncounterStatic8N(Nest42,3,4,4) { Species = 867, Ability = -1 }, // Runerigus + new EncounterStatic8N(Nest42,3,4,4) { Species = 864, Ability = -1 }, // Cursola + new EncounterStatic8N(Nest43,1,2,2) { Species = 550, Ability = 4, Form = 1 }, // Basculin-1 + new EncounterStatic8N(Nest44,1,2,2) { Species = 600, Ability = 4 }, // Klang + new EncounterStatic8N(Nest44,2,3,3) { Species = 632, Ability = 4 }, // Durant + new EncounterStatic8N(Nest45,0,1,1) { Species = 616, Ability = 4 }, // Shelmet + new EncounterStatic8N(Nest45,1,2,2) { Species = 588, Ability = 4 }, // Karrablast + new EncounterStatic8N(Nest45,4,4,4) { Species = 617, Ability = -1 }, // Accelgor + new EncounterStatic8N(Nest46,1,3,3) { Species = 222, Ability = 4, Form = 1 }, // Corsola-1 + new EncounterStatic8N(Nest46,2,4,4) { Species = 302, Ability = 4 }, // Sableye + new EncounterStatic8N(Nest46,3,4,4) { Species = 864, Ability = -1 }, // Cursola + new EncounterStatic8N(Nest47,0,1,1) { Species = 453, Ability = 4 }, // Croagunk + new EncounterStatic8N(Nest47,2,4,4) { Species = 454, Ability = 4 }, // Toxicroak + new EncounterStatic8N(Nest47,3,4,4) { Species = 701, Ability = -1 }, // Hawlucha + new EncounterStatic8N(Nest50,0,1,1) { Species = 524, Ability = 4 }, // Roggenrola + new EncounterStatic8N(Nest50,1,2,2) { Species = 246, Ability = 4 }, // Larvitar + new EncounterStatic8N(Nest50,2,3,3) { Species = 247, Ability = 4 }, // Pupitar + new EncounterStatic8N(Nest50,4,4,4) { Species = 248, Ability = -1 }, // Tyranitar + new EncounterStatic8N(Nest52,0,0,1) { Species = 058, Ability = 4 }, // Growlithe + new EncounterStatic8N(Nest52,1,2,2) { Species = 631, Ability = 4 }, // Heatmor + new EncounterStatic8N(Nest52,3,4,4) { Species = 059, Ability = -1 }, // Arcanine + new EncounterStatic8N(Nest53,0,0,1) { Species = 058, Ability = 4 }, // Growlithe + new EncounterStatic8N(Nest53,1,2,2) { Species = 631, Ability = 4 }, // Heatmor + new EncounterStatic8N(Nest53,2,3,3) { Species = 608, Ability = 4 }, // Lampent + new EncounterStatic8N(Nest53,3,4,4) { Species = 059, Ability = -1 }, // Arcanine + new EncounterStatic8N(Nest53,4,4,4) { Species = 758, Ability = -1, Gender = 1 }, // Salazzle + new EncounterStatic8N(Nest54,0,0,1) { Species = 613, Ability = 4 }, // Cubchoo + new EncounterStatic8N(Nest54,4,4,4) { Species = 875, Ability = -1 }, // Eiscue + new EncounterStatic8N(Nest57,0,0,1) { Species = 270, Ability = 4 }, // Lotad + new EncounterStatic8N(Nest57,1,2,2) { Species = 271, Ability = 4 }, // Lombre + new EncounterStatic8N(Nest57,2,4,4) { Species = 272, Ability = 4 }, // Ludicolo + new EncounterStatic8N(Nest57,4,4,4) { Species = 842, Ability = -1 }, // Appletun + new EncounterStatic8N(Nest58,0,0,1) { Species = 270, Ability = 4 }, // Lotad + new EncounterStatic8N(Nest58,1,2,2) { Species = 271, Ability = 4 }, // Lombre + new EncounterStatic8N(Nest58,4,4,4) { Species = 272, Ability = -1 }, // Ludicolo + new EncounterStatic8N(Nest59,1,2,2) { Species = 757, Ability = 4 }, // Salandit + new EncounterStatic8N(Nest59,4,4,4) { Species = 758, Ability = -1, Gender = 1 }, // Salazzle + new EncounterStatic8N(Nest61,2,4,4) { Species = 078, Ability = 4, Form = 1 }, // Rapidash-1 + new EncounterStatic8N(Nest62,0,1,1) { Species = 629, Ability = 4 }, // Vullaby + new EncounterStatic8N(Nest62,3,4,4) { Species = 630, Ability = -1 }, // Mandibuzz + new EncounterStatic8N(Nest62,4,4,4) { Species = 248, Ability = -1 }, // Tyranitar + new EncounterStatic8N(Nest63,0,0,1) { Species = 610, Ability = 4 }, // Axew + new EncounterStatic8N(Nest63,0,1,1) { Species = 328, Ability = 4 }, // Trapinch + new EncounterStatic8N(Nest63,0,1,1) { Species = 704, Ability = 4 }, // Goomy + new EncounterStatic8N(Nest63,1,2,2) { Species = 329, Ability = 4 }, // Vibrava + new EncounterStatic8N(Nest63,2,4,4) { Species = 705, Ability = 4 }, // Sliggoo + new EncounterStatic8N(Nest63,2,4,4) { Species = 780, Ability = 4 }, // Drampa + new EncounterStatic8N(Nest63,3,4,4) { Species = 706, Ability = -1 }, // Goodra + new EncounterStatic8N(Nest63,4,4,4) { Species = 330, Ability = -1 }, // Flygon + new EncounterStatic8N(Nest64,3,4,4) { Species = 765, Ability = -1 }, // Oranguru + new EncounterStatic8N(Nest64,3,4,4) { Species = 876, Ability = -1, Gender = 1, Form = 1 }, // Indeedee-1 + new EncounterStatic8N(Nest66,1,2,2) { Species = 550, Ability = 4, Form = 1 }, // Basculin-1 + new EncounterStatic8N(Nest70,0,0,1) { Species = 058, Ability = 4 }, // Growlithe + new EncounterStatic8N(Nest70,0,1,1) { Species = 058, Ability = 4 }, // Growlithe + new EncounterStatic8N(Nest70,1,2,2) { Species = 631, Ability = 4 }, // Heatmor + new EncounterStatic8N(Nest70,2,3,3) { Species = 608, Ability = 4 }, // Lampent + new EncounterStatic8N(Nest73,0,0,1) { Species = 682, Ability = 4 }, // Spritzee + new EncounterStatic8N(Nest73,2,4,4) { Species = 683, Ability = 4 }, // Aromatisse + new EncounterStatic8N(Nest75,2,4,4) { Species = 550, Ability = 4, Form = 1 }, // Basculin-1 + new EncounterStatic8N(Nest76,0,0,1) { Species = 058, Ability = 4 }, // Growlithe + new EncounterStatic8N(Nest76,1,2,2) { Species = 631, Ability = 4 }, // Heatmor + new EncounterStatic8N(Nest76,3,4,4) { Species = 059, Ability = -1 }, // Arcanine + new EncounterStatic8N(Nest77,1,2,2) { Species = 550, Ability = 4, Form = 1 }, // Basculin-1 + new EncounterStatic8N(Nest78,0,0,1) { Species = 270, Ability = 4 }, // Lotad + new EncounterStatic8N(Nest78,1,2,2) { Species = 271, Ability = 4 }, // Lombre + new EncounterStatic8N(Nest78,2,4,4) { Species = 272, Ability = 4 }, // Ludicolo + new EncounterStatic8N(Nest78,4,4,4) { Species = 842, Ability = -1, CanGigantamax = true }, // Appletun + new EncounterStatic8N(Nest79,0,0,1) { Species = 058, Ability = 4 }, // Growlithe + new EncounterStatic8N(Nest79,3,4,4) { Species = 059, Ability = -1 }, // Arcanine + new EncounterStatic8N(Nest80,0,0,1) { Species = 679, Ability = 4 }, // Honedge + new EncounterStatic8N(Nest80,0,0,1) { Species = 562, Ability = 4, Form = 1 }, // Yamask-1 + new EncounterStatic8N(Nest80,0,1,1) { Species = 854, Ability = 4 }, // Sinistea + new EncounterStatic8N(Nest80,0,1,1) { Species = 092, Ability = 4 }, // Gastly + new EncounterStatic8N(Nest80,1,2,2) { Species = 680, Ability = 4 }, // Doublade + new EncounterStatic8N(Nest80,1,3,3) { Species = 222, Ability = 4, Form = 1 }, // Corsola-1 + new EncounterStatic8N(Nest80,2,3,3) { Species = 093, Ability = 4 }, // Haunter + new EncounterStatic8N(Nest80,2,4,4) { Species = 302, Ability = 4 }, // Sableye + new EncounterStatic8N(Nest80,3,4,4) { Species = 855, Ability = -1 }, // Polteageist + new EncounterStatic8N(Nest80,3,4,4) { Species = 864, Ability = -1 }, // Cursola + new EncounterStatic8N(Nest80,4,4,4) { Species = 867, Ability = -1 }, // Runerigus + new EncounterStatic8N(Nest80,4,4,4) { Species = 094, Ability = -1, CanGigantamax = true }, // Gengar + new EncounterStatic8N(Nest81,0,0,1) { Species = 077, Ability = 4, Form = 1 }, // Ponyta-1 + new EncounterStatic8N(Nest81,2,4,4) { Species = 078, Ability = 4, Form = 1 }, // Rapidash-1 + new EncounterStatic8N(Nest82,0,0,1) { Species = 582, Ability = 4 }, // Vanillite + new EncounterStatic8N(Nest82,0,0,1) { Species = 613, Ability = 4 }, // Cubchoo + new EncounterStatic8N(Nest82,0,1,1) { Species = 122, Ability = 4, Form = 1 }, // Mr. Mime-1 + new EncounterStatic8N(Nest82,0,1,1) { Species = 712, Ability = 4 }, // Bergmite + new EncounterStatic8N(Nest82,1,2,2) { Species = 361, Ability = 4 }, // Snorunt + new EncounterStatic8N(Nest82,1,2,2) { Species = 225, Ability = 4 }, // Delibird + new EncounterStatic8N(Nest82,2,3,3) { Species = 713, Ability = 4 }, // Avalugg + new EncounterStatic8N(Nest82,2,4,4) { Species = 362, Ability = 4 }, // Glalie + new EncounterStatic8N(Nest82,3,4,4) { Species = 584, Ability = -1 }, // Vanilluxe + new EncounterStatic8N(Nest82,3,4,4) { Species = 866, Ability = -1 }, // Mr. Rime + new EncounterStatic8N(Nest82,4,4,4) { Species = 875, Ability = -1 }, // Eiscue + new EncounterStatic8N(Nest82,4,4,4) { Species = 131, Ability = -1, CanGigantamax = true }, // Lapras + new EncounterStatic8N(Nest83,1,2,2) { Species = 600, Ability = 4 }, // Klang + new EncounterStatic8N(Nest83,2,3,3) { Species = 632, Ability = 4 }, // Durant + new EncounterStatic8N(Nest85,1,2,2) { Species = 757, Ability = 4 }, // Salandit + new EncounterStatic8N(Nest85,4,4,4) { Species = 758, Ability = -1, Gender = 1 }, // Salazzle + new EncounterStatic8N(Nest86,0,0,1) { Species = 682, Ability = 4 }, // Spritzee + new EncounterStatic8N(Nest86,2,3,3) { Species = 683, Ability = 4 }, // Aromatisse + new EncounterStatic8N(Nest87,0,1,1) { Species = 629, Ability = 4 }, // Vullaby + new EncounterStatic8N(Nest87,3,4,4) { Species = 630, Ability = -1 }, // Mandibuzz + new EncounterStatic8N(Nest87,4,4,4) { Species = 248, Ability = -1 }, // Tyranitar + new EncounterStatic8N(Nest89,0,1,1) { Species = 616, Ability = 4 }, // Shelmet + new EncounterStatic8N(Nest89,1,2,2) { Species = 588, Ability = 4 }, // Karrablast + new EncounterStatic8N(Nest89,4,4,4) { Species = 617, Ability = -1 }, // Accelgor + new EncounterStatic8N(Nest90,1,2,2) { Species = 550, Ability = 4, Form = 1 }, // Basculin-1 + new EncounterStatic8N(Nest91,0,1,1) { Species = 616, Ability = 4 }, // Shelmet + new EncounterStatic8N(Nest91,1,2,2) { Species = 588, Ability = 4 }, // Karrablast + new EncounterStatic8N(Nest91,4,4,4) { Species = 617, Ability = -1 }, // Accelgor + }; + + private const string tradeSWSH = "tradeswsh"; + private static readonly string[][] TradeSWSH = Util.GetLanguageStrings10(tradeSWSH); + private static readonly int[] TradeIVs = {15, 15, 15, 15, 15, 15}; + + internal static readonly EncounterTrade8[] TradeGift_SWSH = + { + new EncounterTrade8(052,18) { Ability = 2, TID7 = 263455, IVs = TradeIVs, DynamaxLevel = 1 , Relearn = new[] {387,000,000,000} }, // Meowth + new EncounterTrade8(819,10) { Ability = 1, TID7 = 648753, IVs = TradeIVs, DynamaxLevel = 1, Gender = 0 }, // Skwovet + new EncounterTrade8(546,23) { Ability = 1, TID7 = 101154, IVs = TradeIVs, DynamaxLevel = 1, Gender = 0 }, // Cottonee + new EncounterTrade8(175,25) { Ability = 2, TID7 = 109591, IVs = TradeIVs, DynamaxLevel = 1, Gender = 0, Relearn = new[] {791,000,000,000} }, // Togepi + new EncounterTrade8(856,30) { Ability = 2, TID7 = 101101, IVs = TradeIVs, DynamaxLevel = 1 }, // Hatenna + new EncounterTrade8(859,30) { Ability = 1, TID7 = 256081, IVs = TradeIVs, DynamaxLevel = 1 , Relearn = new[] {252,000,000,000} }, // Impidimp + new EncounterTrade8(562,35) { Ability = 1, TID7 = 102534, IVs = TradeIVs, DynamaxLevel = 2, Gender = 0, Relearn = new[] {261,000,000,000} }, // Yamask + new EncounterTrade8(538,37) { Ability = 2, TID7 = 768945, IVs = TradeIVs, DynamaxLevel = 2 }, // Throh + new EncounterTrade8(539,37) { Ability = 1, TID7 = 881426, IVs = TradeIVs, DynamaxLevel = 2 }, // Sawk + new EncounterTrade8(122,40) { Ability = 1, TID7 = 891846, IVs = TradeIVs, DynamaxLevel = 1 }, // Mr. Mime + new EncounterTrade8(884,50) { Ability = 2, TID7 = 101141, IVs = TradeIVs, DynamaxLevel = 3 , Relearn = new[] {400,000,000,000} }, // Duraludon + + }; + #endregion + + #region Dynamax Crystal Distributions + + internal static readonly EncounterStatic8ND[] Crystal_SWSH = + { + new EncounterStatic8ND { Species = 782, Level = 16, Ability = -1, Location = 126, IVs = new []{31,31,31,-1,-1,-1}, DynamaxLevel = 2, Moves = new[] {33,29,525,43}, }, // ★And458 Jangmo-o + new EncounterStatic8ND { Species = 246, Level = 16, Ability = -1, Location = 126, IVs = new []{31,31,31,-1,-1,-1}, DynamaxLevel = 2, Moves = new[] {33,157,371,44}, }, // ★And15 Larvitar + }; + + #endregion + } + + public class EncounterGift8 : EncounterStatic, IGigantamax, IDynamaxLevel + { + public bool CanGigantamax { get; set; } + public byte DynamaxLevel { get; set; } + } + + public class EncounterTrade8 : EncounterTrade, IDynamaxLevel, IRelearn + { + public byte DynamaxLevel { get; set; } + public int[] Relearn { get; set; } = Array.Empty(); + + public EncounterTrade8(int species, int level) + { + Species = species; + Level = level; + } + + public override bool IsMatch(PKM pkm, int lvl) + { + if (pkm is IDynamaxLevel d && d.DynamaxLevel < DynamaxLevel) + return false; + return base.IsMatch(pkm, lvl); + } + + protected override void ApplyDetails(ITrainerInfo SAV, EncounterCriteria criteria, PKM pk) + { + if (pk is IDynamaxLevel d) + d.DynamaxLevel = DynamaxLevel; + pk.SetRelearnMoves(Relearn); + ((PK8)pk).HT_Language = SAV.Language; + base.ApplyDetails(SAV, criteria, pk); + } + } + + public sealed class EncounterStatic8N : EncounterStatic, IGigantamax, IDynamaxLevel + { + public bool CanGigantamax { get; set; } + public byte DynamaxLevel { get; set; } + + private readonly int MinRank; + private readonly int MaxRank; + + public EncounterStatic8N(int loc, int minRank, int maxRank, byte val) + { + Location = loc; + MinRank = minRank; + MaxRank = maxRank; + DynamaxLevel = val; + } + + private readonly int[] LevelCaps = + { + 15, 20, // 0 + 25, 30, // 1 + 35, 40, // 2 + 45, 50, // 3 + 55, 60, // 4 + }; + + protected override int GetMinimalLevel() => LevelCaps[MinRank * 2]; + + protected override bool IsMatchLevel(PKM pkm, int lvl) + { + var metLevel = pkm.Met_Level - 15; + var rank = metLevel / 10; + if ((uint)rank > 4u) + return false; + if (rank < MinRank || MaxRank < rank) + return false; + + return metLevel % 10 <= 5; + } + + public override bool IsMatch(PKM pkm, int lvl) + { + if (Ability != -1 && pkm.AbilityNumber != 4) + return false; + if (pkm is IDynamaxLevel d && d.DynamaxLevel < DynamaxLevel) + return false; + + return base.IsMatch(pkm, lvl); + } + } + + public sealed class EncounterStatic8ND : EncounterStatic, IGigantamax, IDynamaxLevel + { + public bool CanGigantamax { get; set; } + public byte DynamaxLevel { get; set; } + + public override bool IsMatch(PKM pkm, int lvl) + { + if (Ability != -1 && pkm.AbilityNumber != 4) + return false; + if (pkm is IDynamaxLevel d && d.DynamaxLevel < DynamaxLevel) + return false; + + return base.IsMatch(pkm, lvl); + } } } diff --git a/PKHeX.Core/Legality/Encounters/EncounterStatic.cs b/PKHeX.Core/Legality/Encounters/EncounterStatic.cs index 151304049..d2f676633 100644 --- a/PKHeX.Core/Legality/Encounters/EncounterStatic.cs +++ b/PKHeX.Core/Legality/Encounters/EncounterStatic.cs @@ -9,7 +9,7 @@ namespace PKHeX.Core /// /// Static Encounters are fixed position encounters with properties that are not subject to Wild Encounter conditions. /// - public class EncounterStatic : IEncounterable, IMoveset, IGeneration, ILocation, IContestStats, IVersion + public class EncounterStatic : IEncounterable, IMoveset, IGeneration, ILocation, IContestStats, IVersion, IRelearn { public int Species { get; set; } public int[] Moves { get; set; } = Array.Empty(); @@ -80,7 +80,7 @@ public PKM ConvertToPKM(ITrainerInfo SAV, EncounterCriteria criteria) pk.AltForm = Form; int lang = (int)Language.GetSafeLanguage(Generation, (LanguageID)SAV.Language); - int level = LevelMin; + int level = GetMinimalLevel(); var version = this.GetCompatibleVersion((GameVersion)SAV.Game); SanityCheckVersion(ref version); @@ -126,25 +126,41 @@ public PKM ConvertToPKM(ITrainerInfo SAV, EncounterCriteria criteria) if (pk.Format < 6) return pk; - if (Relearn.Length > 0) - pk.RelearnMoves = Relearn; + pk.SetRelearnMoves(Relearn); SAV.ApplyHandlingTrainerInfo(pk); pk.SetRandomEC(); + if (this is IGigantamax g && pk is IGigantamax pg) + pg.CanGigantamax = g.CanGigantamax; + if (this is IDynamaxLevel d && pk is IDynamaxLevel pd) + pd.DynamaxLevel = d.DynamaxLevel; + return pk; } + protected virtual int GetMinimalLevel() => LevelMin; + protected virtual void SetPINGA(PKM pk, EncounterCriteria criteria) { int gender = criteria.GetGender(Gender, pk.PersonalInfo); int nature = (int)criteria.GetNature(Nature); - int ability = Ability; + int ability = GetRandomAbility(); // use criteria? var pidtype = GetPIDType(); - PIDGenerator.SetRandomWildPID(pk, pk.Format, nature, ability >> 1, gender, pidtype); + PIDGenerator.SetRandomWildPID(pk, pk.Format, nature, ability, gender, pidtype); SetIVs(pk); } + private int GetRandomAbility() + { + return Ability switch + { + 0 => Util.Rand.Next(2), + -1 => Util.Rand.Next(3), + _ => (Ability >> 1) + }; + } + private void SetEggMetData(PKM pk, ITrainerInfo tr, DateTime today) { pk.Met_Location = Math.Max(0, EncounterSuggestion.GetSuggestedEggMetLocation(pk)); @@ -240,16 +256,65 @@ private PIDType GetPIDType() } } - public bool IsMatch(PKM pkm, int lvl) + public virtual bool IsMatch(PKM pkm, int lvl) { - if (Nature != Nature.Random && pkm.Nature != (int)Nature) + if (Nature != Nature.Random && pkm.Nature != (int) Nature) return false; if (Generation > 3 && pkm.Format > 3 && pkm.WasEgg != EggEncounter && pkm.Egg_Location == 0 && !pkm.IsEgg) return false; - if (this is EncounterStaticPID p && p.PID != pkm.PID) + + if (!IsMatchEggLocation(pkm, ref lvl)) return false; + if (!IsMatchLevel(pkm, lvl)) + return false; + if (!IsMatchGender(pkm)) + return false; + if (!IsMatchForm(pkm)) + return false; + + if (EggLocation == Locations.Daycare5 && Relearn.Length == 0 && pkm.RelearnMoves.Any(z => z != 0)) // gen7 eevee edge case + return false; + + if (!IsMatchIVs(pkm)) + return false; + + if (pkm is IContestStats s && s.IsContestBelow(this)) + return false; + + // Defer to EC/PID check + // if (e.Shiny != null && e.Shiny != pkm.IsShiny) + // continue; + + // Defer ball check to later + // if (e.Gift && pkm.Ball != 4) // PokéBall + // continue; + + return true; + } + + private bool IsMatchIVs(PKM pkm) + { + if (IVs.Length == 0) + return true; // nothing to check, IVs are random + if (Generation <= 2 && pkm.Format > 2) + return true; // IVs are regenerated on VC transfer upward + + return Legal.GetIsFixedIVSequenceValidSkipRand(IVs, pkm); + } + + private bool IsMatchForm(PKM pkm) + { + if (SkipFormCheck) + return true; + if (Form != pkm.AltForm && !Legal.IsFormChangeable(pkm, Species)) + return false; + return true; + } + + private bool IsMatchEggLocation(PKM pkm, ref int lvl) + { if (Generation == 3 && EggLocation != 0) // Gen3 Egg { if (pkm.Format == 3 && pkm.IsEgg && EggLocation != pkm.Met_Location) @@ -257,30 +322,31 @@ public bool IsMatch(PKM pkm, int lvl) } else if (Generation <= 2 && EggLocation != 0) // Gen2 Egg { - if (pkm.Format <= 2) + if (pkm.Format > 2) + return true; + + if (pkm.IsEgg) { - if (pkm.IsEgg) - { - if (pkm.Met_Location != 0 && pkm.Met_Level != 0) - return false; - } - else - { - switch (pkm.Met_Level) - { - case 0 when pkm.Met_Location != 0: - return false; - case 1 when pkm.Met_Location == 0: - return false; - default: - if (pkm.Met_Location == 0 && pkm.Met_Level != 0) - return false; - break; - } - } - if (pkm.Met_Level == 1) // Gen2 Eggs are met at 1, and hatch at level 5. - lvl = 5; + if (pkm.Met_Location != 0 && pkm.Met_Level != 0) + return false; } + else + { + switch (pkm.Met_Level) + { + case 0 when pkm.Met_Location != 0: + return false; + case 1 when pkm.Met_Location == 0: + return false; + default: + if (pkm.Met_Location == 0 && pkm.Met_Level != 0) + return false; + break; + } + } + + if (pkm.Met_Level == 1) // Gen2 Eggs are met at 1, and hatch at level 5. + lvl = 5; } else if (EggLocation != pkm.Egg_Location) { @@ -297,7 +363,7 @@ public bool IsMatch(PKM pkm, int lvl) { // check Pt/HGSS data if (pkm.Format <= 4) - return false; // must match + return false; if (!Locations.IsPtHGSSLocationEgg(EggLocation)) // non-Pt/HGSS egg gift return false; // transferring 4->5 clears pt/hgss location value and keeps Faraway Place @@ -317,59 +383,37 @@ public bool IsMatch(PKM pkm, int lvl) if (Locations.IsPtHGSSLocationEgg(EggLocation)) // egg gift { if (pkm.Format > 4) - return false; // locations match when it shouldn't - } - } - - if (pkm.HasOriginalMetLocation) - { - if (!EggEncounter && Location != 0 && Location != pkm.Met_Location) - return false; - if (Level != lvl) - { - if (!(pkm.Format == 3 && EggEncounter && lvl == 0)) return false; } } - else if (Level > lvl) - { - return false; - } - if (Gender != -1 && Gender != pkm.Gender) - { - if (Species == (int)Core.Species.Azurill && Generation == 4 && Location == 233 && pkm.Gender == 0) - { - if (PKX.GetGenderFromPIDAndRatio(pkm.PID, 0xBF) != 1) - return false; - } - else - { - return false; - } - } - if (Form != pkm.AltForm && !SkipFormCheck && !Legal.IsFormChangeable(pkm, Species)) - return false; - if (EggLocation == Locations.Daycare5 && Relearn.Length == 0 && pkm.RelearnMoves.Any(z => z != 0)) // gen7 eevee edge case + return true; + } + + private bool IsMatchGender(PKM pkm) + { + if (Gender == -1 || Gender == pkm.Gender) + return true; + + if (Species == (int) Core.Species.Azurill && Generation == 4 && Location == 233 && pkm.Gender == 0) + return PKX.GetGenderFromPIDAndRatio(pkm.PID, 0xBF) == 1; + + return false; + } + + protected virtual bool IsMatchLevel(PKM pkm, int lvl) + { + if (!pkm.HasOriginalMetLocation) + return lvl >= Level; + + if (!EggEncounter && Location != 0 && Location != pkm.Met_Location) return false; - if (IVs.Length != 0 && (Generation > 2 || pkm.Format <= 2)) // 1,2->7 regenerates IVs, only check if original IVs still exist - { - if (!Legal.GetIsFixedIVSequenceValidSkipRand(IVs, pkm)) - return false; - } - - if (pkm is IContestStats s && s.IsContestBelow(this)) + if (lvl == Level) + return true; + if (!(pkm.Format == 3 && EggEncounter && lvl == 0)) return false; - // Defer to EC/PID check - // if (e.Shiny != null && e.Shiny != pkm.IsShiny) - // continue; - - // Defer ball check to later - // if (e.Gift && pkm.Ball != 4) // PokéBall - // continue; - return true; } } diff --git a/PKHeX.Core/Legality/Encounters/EncounterStaticPID.cs b/PKHeX.Core/Legality/Encounters/EncounterStaticPID.cs index 5de682296..f522d78f9 100644 --- a/PKHeX.Core/Legality/Encounters/EncounterStaticPID.cs +++ b/PKHeX.Core/Legality/Encounters/EncounterStaticPID.cs @@ -19,6 +19,13 @@ protected sealed override void SetPINGA(PKM pk, EncounterCriteria criteria) pk.Nature = nature; pk.RefreshAbility(ability >> 1); } + + public override bool IsMatch(PKM pkm, int lvl) + { + if (PID != pkm.PID) + return false; + return base.IsMatch(pkm, lvl); + } } internal sealed class EncounterStaticN : EncounterStaticPID diff --git a/PKHeX.Core/Legality/Encounters/EncounterTrade.cs b/PKHeX.Core/Legality/Encounters/EncounterTrade.cs index ed15deaa4..79ee2e6ff 100644 --- a/PKHeX.Core/Legality/Encounters/EncounterTrade.cs +++ b/PKHeX.Core/Legality/Encounters/EncounterTrade.cs @@ -74,6 +74,7 @@ public int TID7 Locations.LinkTrade5NPC, Locations.LinkTrade6NPC, Locations.LinkTrade6NPC, // 7 is same as 6 + Locations.LinkTrade6NPC, // 8 is same as 6 }; public PKM ConvertToPKM(ITrainerInfo SAV) => ConvertToPKM(SAV, EncounterCriteria.Unrestricted); @@ -83,6 +84,12 @@ public PKM ConvertToPKM(ITrainerInfo SAV, EncounterCriteria criteria) var pk = PKMConverter.GetBlank(Generation, Version); SAV.ApplyToPKM(pk); + ApplyDetails(SAV, criteria, pk); + return pk; + } + + protected virtual void ApplyDetails(ITrainerInfo SAV, EncounterCriteria criteria, PKM pk) + { var version = this.GetCompatibleVersion((GameVersion)SAV.Game); int lang = (int)Language.GetSafeLanguage(Generation, (LanguageID)SAV.Language); int level = CurrentLevel > 0 ? CurrentLevel : LevelMin; @@ -102,7 +109,7 @@ public PKM ConvertToPKM(ITrainerInfo SAV, EncounterCriteria criteria) pk.SetNickname(GetNickname(lang)); pk.CurrentLevel = level; - pk.Version = (int)version; + pk.Version = (int) version; pk.TID = TID; pk.SID = SID; pk.Ball = Ball; @@ -117,11 +124,12 @@ public PKM ConvertToPKM(ITrainerInfo SAV, EncounterCriteria criteria) var location = Location > 0 ? Location : DefaultMetLocation[Generation - 1]; SetMetData(pk, level, location, time); } + if (EggLocation != 0) SetEggMetData(pk, time); if (pk is PK1 pk1 && this is EncounterTradeCatchRate c) - pk1.Catch_Rate = (int)c.Catch_Rate; + pk1.Catch_Rate = (int) c.Catch_Rate; if (pk is IContestStats s) this.CopyContestStatsTo(s); @@ -132,7 +140,7 @@ public PKM ConvertToPKM(ITrainerInfo SAV, EncounterCriteria criteria) UpdateEdgeCase(pk); if (pk.Format < 6) - return pk; + return; SAV.ApplyHandlingTrainerInfo(pk, force: true); pk.SetRandomEC(); @@ -141,8 +149,6 @@ public PKM ConvertToPKM(ITrainerInfo SAV, EncounterCriteria criteria) pk.SetRandomMemory6(); else if (pk.Format == 7) SetSMOTMemory(pk); - - return pk; } protected virtual void SetPINGA(PKM pk, EncounterCriteria criteria) @@ -229,7 +235,7 @@ private static void SetSMOTMemory(PKM pk) pk.OT_Feeling = 5; } - public bool IsMatch(PKM pkm, int lvl) + public virtual bool IsMatch(PKM pkm, int lvl) { if (IVs.Length != 0) { @@ -237,27 +243,38 @@ public bool IsMatch(PKM pkm, int lvl) return false; } - if (this is EncounterTradePID p) - { - if (p.PID != pkm.EncryptionConstant) - return false; - if (Nature != Nature.Random && (int)Nature != pkm.Nature) // gen5 BW only - return false; - } - else - { - if (!Shiny.IsValid(pkm)) - return false; - if (Nature != Nature.Random && (int)Nature != pkm.Nature) - return false; - if (Gender != -1 && Gender != pkm.Gender) - return false; - } + if (!IsMatchNatureGenderShiny(pkm)) + return false; if (TID != pkm.TID) return false; if (SID != pkm.SID) return false; + if (!IsMatchLevel(pkm, lvl)) + return false; + + if (CurrentLevel != -1 && CurrentLevel > pkm.CurrentLevel) + return false; + + if (Form != pkm.AltForm && !Legal.IsFormChangeable(pkm, pkm.Species)) + return false; + if (OTGender != -1 && OTGender != pkm.OT_Gender) + return false; + if (EggLocation != pkm.Egg_Location) + return false; + // if (z.Ability == 4 ^ pkm.AbilityNumber == 4) // defer to Ability + // countinue; + if (!Version.Contains((GameVersion)pkm.Version)) + return false; + + if (pkm is IContestStats s && s.IsContestBelow(this)) + return false; + + return true; + } + + private bool IsMatchLevel(PKM pkm, int lvl) + { if (pkm.HasOriginalMetLocation) { var loc = Location > 0 ? Location : DefaultMetLocation[Generation - 1]; @@ -279,21 +296,17 @@ public bool IsMatch(PKM pkm, int lvl) return false; } - if (CurrentLevel != -1 && CurrentLevel > pkm.CurrentLevel) + return true; + } + + protected virtual bool IsMatchNatureGenderShiny(PKM pkm) + { + if (!Shiny.IsValid(pkm)) + return false; + if (Gender != -1 && Gender != pkm.Gender) return false; - if (Form != pkm.AltForm && !Legal.IsFormChangeable(pkm, pkm.Species)) - return false; - if (OTGender != -1 && OTGender != pkm.OT_Gender) - return false; - if (EggLocation != pkm.Egg_Location) - return false; - // if (z.Ability == 4 ^ pkm.AbilityNumber == 4) // defer to Ability - // countinue; - if (!Version.Contains((GameVersion)pkm.Version)) - return false; - - if (pkm is IContestStats s && s.IsContestBelow(this)) + if (Nature != Nature.Random && pkm.Nature != (int)Nature) return false; return true; diff --git a/PKHeX.Core/Legality/Encounters/EncounterTradePID.cs b/PKHeX.Core/Legality/Encounters/EncounterTradePID.cs index 375263485..9edafb356 100644 --- a/PKHeX.Core/Legality/Encounters/EncounterTradePID.cs +++ b/PKHeX.Core/Legality/Encounters/EncounterTradePID.cs @@ -25,5 +25,14 @@ protected override void SetPINGA(PKM pk, EncounterCriteria criteria) SetIVs(pk); } + + protected override bool IsMatchNatureGenderShiny(PKM pkm) + { + if (pkm.PID != pkm.EncryptionConstant) + return false; + if (Nature != Nature.Random && (int)Nature != pkm.Nature) // gen5 BW only + return false; + return true; + } } } \ No newline at end of file diff --git a/PKHeX.Core/Legality/Encounters/Generator/EncounterSlotGenerator.cs b/PKHeX.Core/Legality/Encounters/Generator/EncounterSlotGenerator.cs index 727b2cd46..32b16f602 100644 --- a/PKHeX.Core/Legality/Encounters/Generator/EncounterSlotGenerator.cs +++ b/PKHeX.Core/Legality/Encounters/Generator/EncounterSlotGenerator.cs @@ -131,7 +131,7 @@ private static bool IsDeferred(this EncounterSlot slot, int currentSpecies, PKM private static bool IsDeferredSport(this EncounterSlot slot, bool IsSportBall) => IsSportBall != ((slot.Type & SlotType.BugContest) != 0); private static bool IsDeferredHiddenAbility(this EncounterSlot slot, bool IsHidden) => IsHidden != slot.IsHiddenAbilitySlot(); - private static IEnumerable GetValidEncounterSlots(PKM pkm, EncounterArea loc, IReadOnlyList vs, int lvl) + private static IEnumerable GetValidEncounterSlots(PKM pkm, EncounterArea loc, IReadOnlyList vs, int lvl) { if (pkm.Egg_Location != 0) return Enumerable.Empty(); diff --git a/PKHeX.Core/Legality/Encounters/IRelearn.cs b/PKHeX.Core/Legality/Encounters/IRelearn.cs new file mode 100644 index 000000000..9cf03894b --- /dev/null +++ b/PKHeX.Core/Legality/Encounters/IRelearn.cs @@ -0,0 +1,7 @@ +namespace PKHeX.Core +{ + public interface IRelearn + { + int[] Relearn { get; } + } +} \ No newline at end of file diff --git a/PKHeX.Core/Legality/Encounters/Verifiers/EvolutionVerifier.cs b/PKHeX.Core/Legality/Encounters/Verifiers/EvolutionVerifier.cs index 285347b67..6f741ab74 100644 --- a/PKHeX.Core/Legality/Encounters/Verifiers/EvolutionVerifier.cs +++ b/PKHeX.Core/Legality/Encounters/Verifiers/EvolutionVerifier.cs @@ -48,5 +48,21 @@ private static bool IsValidEvolution(PKM pkm, LegalInfo info) return true; } + + public static bool IsEvolvedChangedFormValid(int species, int currentForm, int originalForm) + { + switch (currentForm) + { + case 0 when Legal.GalarForm0Evolutions.TryGetValue(species, out var val): + return originalForm == val; + case 1 when Legal.AlolanVariantEvolutions12.Contains(species): + case 1 when Legal.GalarVariantFormEvolutions.Contains(species): + return originalForm == 0; + case 2 when species == (int)Species.Darmanitan: + return originalForm == 1; + default: + return false; + } + } } } diff --git a/PKHeX.Core/Legality/Encounters/Verifiers/VerifyRelearnMoves.cs b/PKHeX.Core/Legality/Encounters/Verifiers/VerifyRelearnMoves.cs index 063a6faae..ade3de8de 100644 --- a/PKHeX.Core/Legality/Encounters/Verifiers/VerifyRelearnMoves.cs +++ b/PKHeX.Core/Legality/Encounters/Verifiers/VerifyRelearnMoves.cs @@ -21,7 +21,7 @@ public static CheckResult[] VerifyRelearn(PKM pkm, LegalInfo info) return info.EncounterMatch switch { MysteryGift g => VerifyRelearnSpecifiedMoveset(pkm, info, g.RelearnMoves), - EncounterStatic s when s.Relearn.Length > 0 => VerifyRelearnSpecifiedMoveset(pkm, info, s.Relearn), + IRelearn s when s.Relearn.Length > 0 => VerifyRelearnSpecifiedMoveset(pkm, info, s.Relearn), EncounterEgg e => VerifyRelearnEggBase(pkm, info, e), EncounterSlot z when pkm.RelearnMove1 != 0 && z.Permissions.DexNav && EncounterSlotGenerator.IsDexNavValid(pkm) => VerifyRelearnDexNav(pkm, info), _ => VerifyRelearnNone(pkm, info) diff --git a/PKHeX.Core/Legality/Evolutions/EvolutionMethod.cs b/PKHeX.Core/Legality/Evolutions/EvolutionMethod.cs index 6ed6b8ee9..dafef0cde 100644 --- a/PKHeX.Core/Legality/Evolutions/EvolutionMethod.cs +++ b/PKHeX.Core/Legality/Evolutions/EvolutionMethod.cs @@ -106,6 +106,7 @@ private bool HasMetLevelIncreased(PKM pkm, int lvl) case 5: // Bank keeps current level case 6: case 7: + case 8: return lvl >= Level && (!pkm.IsNative || pkm.Met_Level < lvl); default: return false; diff --git a/PKHeX.Core/Legality/Evolutions/EvolutionTree.cs b/PKHeX.Core/Legality/Evolutions/EvolutionTree.cs index 4ee98b0b2..a0e13b7a9 100644 --- a/PKHeX.Core/Legality/Evolutions/EvolutionTree.cs +++ b/PKHeX.Core/Legality/Evolutions/EvolutionTree.cs @@ -35,7 +35,7 @@ static EvolutionTree() Evolves6 = new EvolutionTree(unpack("ao"), GameVersion.Gen6, PersonalTable.AO, Legal.MaxSpeciesID_6); Evolves7 = new EvolutionTree(unpack("uu"), GameVersion.Gen7, PersonalTable.USUM, Legal.MaxSpeciesID_7_USUM); Evolves7b = new EvolutionTree(unpack("gg"), GameVersion.Gen7, PersonalTable.GG, Legal.MaxSpeciesID_7b); - Evolves8 = new EvolutionTree(unpack("gg"), GameVersion.Gen8, PersonalTable.SWSH, Legal.MaxSpeciesID_8); + Evolves8 = new EvolutionTree(unpack("ss"), GameVersion.Gen8, PersonalTable.SWSH, Legal.MaxSpeciesID_8); // There's always oddballs. Evolves7.FixEvoTreeSM(); diff --git a/PKHeX.Core/Legality/LegalityCheckStrings.cs b/PKHeX.Core/Legality/LegalityCheckStrings.cs index d29a2ae87..e04ad0936 100644 --- a/PKHeX.Core/Legality/LegalityCheckStrings.cs +++ b/PKHeX.Core/Legality/LegalityCheckStrings.cs @@ -184,6 +184,8 @@ public static class LegalityCheckStrings public static string LFatefulMystery { get; set; } = "Mystery Gift Fateful Encounter."; public static string LFatefulMysteryMissing { get; set; } = "Mystery Gift Fateful Encounter flag missing."; + public static string LFavoriteMarkingUnavailable { get; set; } = "Favorite Marking is not available."; + public static string LFormBattle { get; set; } = "Form cannot exist outside of a battle."; public static string LFormEternal { get; set; } = "Valid Eternal Flower encounter."; public static string LFormEternalInvalid { get; set; } = "Invalid Eternal Flower encounter."; @@ -297,6 +299,7 @@ public static class LegalityCheckStrings public static string LMemoryHTEvent { get; set; } = "Current handler should not be Event OT."; public static string LMemoryHTFlagInvalid { get; set; } = "Untraded: Current handler should not be the Handling Trainer."; public static string LMemoryHTGender { get; set; } = "HT Gender invalid: {0}"; + public static string LMemoryHTLanguage { get; set; } = "HT Language is missing."; public static string LMemoryIndexArgHT { get; set; } = "Should have a HT Memory TextVar value (somewhere)."; public static string LMemoryIndexFeel { get; set; } = "{0} Memory: Feeling should be index {1}."; @@ -370,6 +373,7 @@ public static class LegalityCheckStrings public static string LMoveSourceSpecial { get; set; } = "Special Non-Relearn Move."; public static string LMoveSourceTMHM { get; set; } = "Learned by TM/HM."; public static string LMoveSourceTutor { get; set; } = "Learned by Move Tutor."; + public static string LMoveSourceTR { get; set; } = "Unexpected Technical Record Learned flag: {0}"; public static string LNickFlagEggNo { get; set; } = "Egg must be not nicknamed."; public static string LNickFlagEggYes { get; set; } = "Egg must be nicknamed."; @@ -410,9 +414,11 @@ public static class LegalityCheckStrings public static string LRibbonFInvalid_0 { get; set; } = "Invalid Ribbons: {0}"; public static string LRibbonFMissing_0 { get; set; } = "Missing Ribbons: {0}"; + public static string LStatDynamaxInvalid { get; set; } = "Dynamax Level is not within the expected range."; public static string LStatIncorrectHeight { get; set; } = "Calculated Height does not match stored value."; public static string LStatIncorrectWeight { get; set; } = "Calculated Weight does not match stored value."; public static string LStatIncorrectCP { get; set; } = "Calculated CP does not match stored value."; + public static string LStatGigantamaxInvalid { get; set; } = "Gigantamax Flag mismatch."; public static string LSuperComplete { get; set; } = "Super Training complete flag mismatch."; public static string LSuperDistro { get; set; } = "Distribution Super Training missions are not released."; diff --git a/PKHeX.Core/Legality/Memories.cs b/PKHeX.Core/Legality/Memories.cs index 0c1086a4f..1c45f9598 100644 --- a/PKHeX.Core/Legality/Memories.cs +++ b/PKHeX.Core/Legality/Memories.cs @@ -150,10 +150,10 @@ internal static GameVersion GetGameVersionForPokeCenterIndex(int index) #endregion - private static readonly HashSet MemoryGeneral = new HashSet { 1, 2, 3, 4, 19, 24, 31, 32, 33, 35, 36, 37, 38, 39, 42, 52, 59 }; + private static readonly HashSet MemoryGeneral = new HashSet { 1, 2, 3, 4, 19, 24, 31, 32, 33, 35, 36, 37, 38, 39, 42, 52, 59, 70, 86 }; private static readonly HashSet MemorySpecific = new HashSet { 6 }; - private static readonly HashSet MemoryMove = new HashSet { 12, 16, 48, 49 }; - private static readonly HashSet MemoryItem = new HashSet { 5, 15, 26, 34, 40, 51 }; + private static readonly HashSet MemoryMove = new HashSet { 12, 16, 48, 49, 80, 81, 89 }; + private static readonly HashSet MemoryItem = new HashSet { 5, 15, 26, 34, 40, 51, 84, 88 }; private static readonly HashSet MemorySpecies = new HashSet { 7, 9, 13, 14, 17, 21, 18, 25, 29, 44, 45, 50, 60 }; public static MemoryArgType GetMemoryArgType(int memory) diff --git a/PKHeX.Core/Legality/Moves/MoveLevelUp.cs b/PKHeX.Core/Legality/Moves/MoveLevelUp.cs index 9b77e9b1f..4d212314b 100644 --- a/PKHeX.Core/Legality/Moves/MoveLevelUp.cs +++ b/PKHeX.Core/Legality/Moves/MoveLevelUp.cs @@ -35,14 +35,15 @@ public static LearnVersion GetIsLevelUpMove(PKM pkm, int species, int form, int switch (generation) { case 1: return GetIsLevelUp1(species, move, lvl, form, minlvlG1, version); - case 2: if (move > MaxMoveID_1 && pkm.LearnMovesNew2Disallowed()) return LearnNONE; - return GetIsLevelUp2(species, move, lvl, form, minlvlG2, pkm.Korean, version); + case 2 when move > MaxMoveID_1 && pkm.LearnMovesNew2Disallowed(): return LearnNONE; + case 2: return GetIsLevelUp2(species, move, lvl, form, minlvlG2, pkm.Korean, version); + case 3: return GetIsLevelUp3(species, move, lvl, form, version); case 4: return GetIsLevelUp4(species, move, lvl, form, version); case 5: return GetIsLevelUp5(species, move, lvl, form, version); case 6: return GetIsLevelUp6(species, move, lvl, form, version); - case 7: return GetIsLevelUp7(species, move, form, version); - case 8: return GetIsLevelUp8(species, move, form, version); + case 7: return GetIsLevelUp7(species, move, form, version); // move reminder can give any move 1-100 + case 8: return GetIsLevelUp8(species, move, lvl, form, version); } return LearnNONE; } @@ -203,7 +204,7 @@ private static LearnVersion GetIsLevelUp7(int species, int move, int form, GameV return LearnNONE; } - private static LearnVersion GetIsLevelUp8(int species, int move, int form, GameVersion ver = Any) + private static LearnVersion GetIsLevelUp8(int species, int move, int lvl, int form, GameVersion ver = Any) { switch (ver) { @@ -211,7 +212,7 @@ private static LearnVersion GetIsLevelUp8(int species, int move, int form, GameV case SW: case SH: if (species > MaxSpeciesID_8) return LearnNONE; - return LearnSWSH.GetIsLevelUp(species, form, move); + return LearnSWSH.GetIsLevelUp(species, form, move, lvl); } return LearnNONE; } @@ -273,7 +274,7 @@ public static IEnumerable GetMovesLevelUp(PKM pkm, int species, int minlvlG 5 => GetMovesLevelUp5(species, form, lvl, version), 6 => GetMovesLevelUp6(species, form, lvl, version), 7 => GetMovesLevelUp7(species, form, lvl, MoveReminder, version), - 8 => GetMovesLevelUp8(species, form, lvl, MoveReminder, version), + 8 => GetMovesLevelUp8(species, form, lvl, version), _ => (IEnumerable)Array.Empty() }; } @@ -318,9 +319,9 @@ private static List GetMovesLevelUp7(int species, int form, int max, bool M return AddMovesLevelUp7(new List(), ver, species, max, form, MoveReminder); } - private static List GetMovesLevelUp8(int species, int form, int max, bool MoveReminder, GameVersion ver = Any) + private static List GetMovesLevelUp8(int species, int form, int max, GameVersion ver = Any) { - return AddMovesLevelUp8(new List(), ver, species, max, form, MoveReminder); + return AddMovesLevelUp8(new List(), ver, species, max, form); } private static List AddMovesLevelUp1(List moves, GameVersion ver, int species, int form, int max, int min) @@ -467,10 +468,9 @@ private static List AddMovesLevelUp7(List moves, GameVersion ver, int return moves; } - private static List AddMovesLevelUp8(List moves, GameVersion ver, int species, int max, int form, bool MoveReminder) + private static List AddMovesLevelUp8(List moves, GameVersion ver, int species, int max, int form) { - if (MoveReminder) - max = 100; // Move reminder can teach any level in movepool now! + // Move reminder can NOT teach any level like Gen7 switch (ver) { case Any: diff --git a/PKHeX.Core/Legality/Moves/MoveTechnicalMachine.cs b/PKHeX.Core/Legality/Moves/MoveTechnicalMachine.cs index 13d548843..42d8c9dff 100644 --- a/PKHeX.Core/Legality/Moves/MoveTechnicalMachine.cs +++ b/PKHeX.Core/Legality/Moves/MoveTechnicalMachine.cs @@ -5,7 +5,7 @@ namespace PKHeX.Core { internal static class MoveTechnicalMachine { - internal static GameVersion GetIsMachineMove(PKM pkm, int species, int form, int generation, int move, GameVersion ver = GameVersion.Any, bool RemoveTransfer = false) + internal static GameVersion GetIsMachineMove(PKM pkm, int species, int form, int generation, int move, GameVersion ver = GameVersion.Any, bool RemoveTransfer = false, bool allowBit = false) { if (pkm.IsMovesetRestricted()) ver = (GameVersion) pkm.Version; @@ -21,7 +21,7 @@ internal static GameVersion GetIsMachineMove(PKM pkm, int species, int form, int case 5: return GetIsMachine5(species, move, form); case 6: return GetIsMachine6(species, move, form, ver); case 7: return GetIsMachine7(species, move, form, ver); - case 8: return GetIsMachine8(species, move, form, ver); + case 8: return GetIsMachine8(pkm, species, move, form, ver, allowBit); default: return Legal.NONE; } @@ -219,11 +219,11 @@ private static GameVersion GetIsMachine7(int species, int move, int form, GameVe return Legal.NONE; } - private static GameVersion GetIsMachine8(int species, int move, int form, GameVersion ver) + private static GameVersion GetIsMachine8(PKM pkm, int species, int move, int form, GameVersion ver, bool allowBit) { if (GameVersion.SWSH.Contains(ver)) { - for (int i = 0; i < Legal.TMHM_SWSH.Length; i++) + for (int i = 0; i < 100; i++) { if (Legal.TMHM_SWSH[i] != move) continue; @@ -231,6 +231,18 @@ private static GameVersion GetIsMachine8(int species, int move, int form, GameVe return GameVersion.SWSH; break; } + for (int i = 0; i < 100; i++) + { + if (Legal.TMHM_SWSH[i + 100] != move) + continue; + if (!PersonalTable.SWSH.GetFormeEntry(species, form).TMHM[i + 100]) + break; + if (allowBit) + return GameVersion.SWSH; + if (((PK8) pkm).GetMoveRecordFlag(i)) + return GameVersion.SWSH; + break; + } } return Legal.NONE; @@ -254,7 +266,7 @@ internal static IEnumerable GetTMHM(PKM pkm, int species, int form, int gen case 5: AddMachine5(r, species, form); break; case 6: AddMachine6(r, species, form, ver); break; case 7: AddMachine7(r, species, form, ver); break; - case 8: AddMachine8(r, species, form, ver); break; + case 8: AddMachine8(r, species, form, pkm, ver); break; } return r.Distinct(); } @@ -368,7 +380,7 @@ private static void AddMachine7(List r, int species, int form, GameVersion } } - private static void AddMachine8(List r, int species, int form, GameVersion ver = GameVersion.Any) + private static void AddMachine8(List r, int species, int form, PKM pkm, GameVersion ver = GameVersion.Any) { switch (ver) { @@ -376,7 +388,7 @@ private static void AddMachine8(List r, int species, int form, GameVersion case GameVersion.SW: case GameVersion.SH: case GameVersion.SWSH: - AddMachineSWSH(r, species, form); + AddMachineSWSH(r, species, form, pkm); return; } } @@ -415,12 +427,28 @@ private static void AddMachineGG(List r, int species, int form) r.AddRange(Legal.TMHM_GG.Where((_, m) => pi.TMHM[m])); } - private static void AddMachineSWSH(List r, int species, int form) + private static void AddMachineSWSH(List r, int species, int form, PKM pkm) { if (species > Legal.MaxSpeciesID_8) return; var pi = PersonalTable.SWSH.GetFormeEntry(species, form); - r.AddRange(Legal.TMHM_SWSH.Where((_, m) => pi.TMHM[m])); + var tmhm = pi.TMHM; + for (int i = 0; i < 100; i++) + { + if (!tmhm[i]) + continue; + r.Add(Legal.TMHM_SWSH[i]); + } + + var pk8 = (PK8)pkm; + for (int i = 0; i < 100; i++) + { + if (!tmhm[i + 100]) + continue; + if (!pk8.GetMoveRecordFlag(i)) + continue; + r.Add(Legal.TMHM_SWSH[i + 100]); + } } } } \ No newline at end of file diff --git a/PKHeX.Core/Legality/Tables/Locations.cs b/PKHeX.Core/Legality/Tables/Locations.cs index 078e96281..5a6b650df 100644 --- a/PKHeX.Core/Legality/Tables/Locations.cs +++ b/PKHeX.Core/Legality/Tables/Locations.cs @@ -50,8 +50,8 @@ public static class Locations /// Route 4 in public const int HatchLocation7 = 50; - /// ??? in - public const int HatchLocation8 = 50; // todo + /// Route 5 in + public const int HatchLocation8 = 40; /// Generation 3 -> Generation 4 Transfer Location (Pal Park) public const int Transfer3 = 0x37; diff --git a/PKHeX.Core/Legality/Tables/Tables.cs b/PKHeX.Core/Legality/Tables/Tables.cs index 9900fb9ed..af26a87ab 100644 --- a/PKHeX.Core/Legality/Tables/Tables.cs +++ b/PKHeX.Core/Legality/Tables/Tables.cs @@ -168,6 +168,12 @@ public static partial class Legal 808, // Meltan 809, // Melmetal + + (int)Species.Zacian, + (int)Species.Zamazenta, + (int)Species.Eternatus, + // 891, // mythical1? + // 892, // mythical2? }; public static readonly HashSet BattleFrontierBanlist = new HashSet @@ -231,6 +237,10 @@ public static partial class Legal 716, // Xerneas 746, // Wishiwashi 778, // Mimikyu + + (int)Species.Zacian, + (int)Species.Zamazenta, + (int)Species.Eternatus, }; public static readonly HashSet BattleMegas = new HashSet diff --git a/PKHeX.Core/Legality/Tables/Tables8.cs b/PKHeX.Core/Legality/Tables/Tables8.cs index 6f8907040..668893dc0 100644 --- a/PKHeX.Core/Legality/Tables/Tables8.cs +++ b/PKHeX.Core/Legality/Tables/Tables8.cs @@ -1,65 +1,187 @@ using System.Collections.Generic; using System.Linq; -// ReSharper disable RedundantEmptyObjectOrCollectionInitializer todo namespace PKHeX.Core { public static partial class Legal { - internal const int MaxSpeciesID_8 = 809; - internal const int MaxMoveID_8 = 719; - internal const int MaxItemID_8 = 920; - internal const int MaxAbilityID_8 = 232; - internal const int MaxBallID_8 = 0x1A; // 26 + internal const int MaxSpeciesID_8 = 890; // Eternatus + internal const int MaxMoveID_8 = 796; // Steel Beam (jet fuel) + internal const int MaxItemID_8 = 1278; // Rotom Catalog, or 1578 for all catalog parts? + internal const int MaxAbilityID_8 = 258; + internal const int MaxBallID_8 = 0x1A; // 26 Beast internal 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, + + 1279, + 1280, 1281, 1282, 1283, 1284, 1285, 1286, 1287, 1288, 1289, 1290, 1291, 1292, 1293, 1294, 1295, 1296, 1297, + 1298, 1299, 1300, 1301, 1302, 1303, 1304, 1305, 1306, 1307, 1308, 1309, 1310, 1311, 1312, 1313, 1314, 1315, + 1316, 1317, 1318, 1319, 1320, 1321, 1322, 1323, 1324, 1325, 1326, 1327, 1328, 1329, 1330, 1331, 1332, 1333, + 1334, 1335, 1336, 1337, 1338, 1339, 1340, 1341, 1342, 1343, 1344, 1345, 1346, 1347, 1348, 1349, 1350, 1351, + 1352, 1353, 1354, 1355, 1356, 1357, 1358, 1359, 1360, 1361, 1362, 1363, 1364, 1365, 1366, 1367, 1368, 1369, + 1370, 1371, 1372, 1373, 1374, 1375, 1376, 1377, 1378, 1379, 1380, 1381, 1382, 1383, 1384, 1385, 1386, 1387, + 1388, 1389, 1390, 1391, 1392, 1393, 1394, 1395, 1396, 1397, 1398, 1399, 1400, 1401, 1402, 1403, 1404, 1405, + 1406, 1407, 1408, 1409, 1410, 1411, 1412, 1413, 1414, 1415, 1416, 1417, 1418, 1419, 1420, 1421, 1422, 1423, + 1424, 1425, 1426, 1427, 1428, 1429, 1430, 1431, 1432, 1433, 1434, 1435, 1436, 1437, 1438, 1439, 1440, 1441, + 1442, 1443, 1444, 1445, 1446, 1447, 1448, 1449, 1450, 1451, 1452, 1453, 1454, 1455, 1456, 1457, 1458, 1459, + 1460, 1461, 1462, 1463, 1464, 1465, 1466, 1467, 1468, 1469, 1470, 1471, 1472, 1473, 1474, 1475, 1476, 1477, + 1478, 1479, 1480, 1481, 1482, 1483, 1484, 1485, 1486, 1487, 1488, 1489, 1490, 1491, 1492, 1493, 1494, 1495, + 1496, 1497, 1498, 1499, 1500, 1501, 1502, 1503, 1504, 1505, 1506, 1507, 1508, 1509, 1510, 1511, 1512, 1513, + 1514, 1515, 1516, 1517, 1518, 1519, 1520, 1521, 1522, 1523, 1524, 1525, 1526, 1527, 1528, 1529, 1530, 1531, + 1532, 1533, 1534, 1535, 1536, 1537, 1538, 1539, 1540, 1541, 1542, 1543, 1544, 1545, 1546, 1547, 1548, 1549, + 1550, 1551, 1552, 1553, 1554, 1555, 1556, 1557, 1558, 1559, 1560, 1561, 1562, 1563, 1564, 1565, 1566, 1567, + 1568, 1569, 1570, 1571, 1572, 1573, 1574, 1575, 1576, 1577, 1578, }; - 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(TR_SWSH).ToArray(); internal static readonly HashSet WildPokeballs8 = new HashSet { (int)Ball.Poke, @@ -76,14 +198,45 @@ public static partial class Legal (int)Ball.Dusk, (int)Ball.Heal, (int)Ball.Quick, + + // Ball Guy + (int)Ball.Friend, + (int)Ball.Lure, + (int)Ball.Level, + (int)Ball.Heavy, + (int)Ball.Love, + (int)Ball.Moon, + (int)Ball.Dream, }; internal static readonly HashSet GalarOriginForms = new HashSet { + (int)Species.Meowth, + (int)Species.Ponyta, + (int)Species.Rapidash, + (int)Species.Farfetchd, + (int)Species.MrMime, + (int)Species.Corsola, + (int)Species.Zigzagoon, + (int)Species.Linoone, + (int)Species.Yamask, + (int)Species.Darmanitan, + (int)Species.Stunfisk, }; internal static readonly HashSet GalarVariantFormEvolutions = new HashSet { + (int)Species.Weezing, + }; + + internal static readonly IReadOnlyDictionary GalarForm0Evolutions = new Dictionary + { + {(int)Species.Perrserker, 2}, + {(int)Species.Obstagoon, 1}, + {(int)Species.MrMime, 1}, + {(int)Species.Sirfetchd, 2}, + {(int)Species.Runerigus, 1}, + {(int)Species.Cursola, 1}, }; internal static readonly HashSet EvolveToGalarForms = new HashSet(GalarVariantFormEvolutions.Concat(GalarOriginForms)); @@ -92,29 +245,163 @@ public static partial class Legal 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, }; internal static readonly int[] TMHM_SWSH = { + // TM + 005, 025, 006, 007, 008, 009, 019, 042, 063, 416, + 345, 076, 669, 083, 086, 091, 103, 113, 115, 219, + 120, 156, 157, 168, 173, 182, 184, 196, 202, 204, + 211, 213, 201, 240, 241, 258, 250, 251, 261, 263, + 129, 270, 279, 280, 286, 291, 311, 313, 317, 328, + 331, 333, 340, 341, 350, 362, 369, 371, 372, 374, + 384, 385, 683, 409, 419, 421, 422, 423, 424, 427, + 433, 472, 478, 440, 474, 490, 496, 506, 512, 514, + 521, 523, 527, 534, 541, 555, 566, 577, 580, 581, + 604, 678, 595, 598, 206, 403, 684, 693, 707, 784, + + // TR + 014, 034, 053, 056, 057, 058, 059, 067, 085, 087, + 089, 094, 097, 116, 118, 126, 127, 133, 141, 161, + 164, 179, 188, 191, 200, 473, 203, 214, 224, 226, + 227, 231, 242, 247, 248, 253, 257, 269, 271, 276, + 285, 299, 304, 315, 322, 330, 334, 337, 339, 347, + 348, 349, 360, 370, 390, 394, 396, 398, 399, 402, + 404, 405, 406, 408, 411, 412, 413, 414, 417, 428, + 430, 437, 438, 441, 442, 444, 446, 447, 482, 484, + 486, 492, 500, 502, 503, 526, 528, 529, 535, 542, + 583, 599, 605, 663, 667, 675, 676, 706, 710, 776, }; internal static readonly byte[] MovePP_SWSH = { + 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, }; internal static readonly HashSet Ban_NoHidden8 = new HashSet { - }; + // No wild encounter with Hidden, so can't breed a hidden yet. + (int)Species.Grookey, + (int)Species.Thwackey, + (int)Species.Rillaboom, + (int)Species.Scorbunny, + (int)Species.Raboot, + (int)Species.Cinderace, + (int)Species.Sobble, + (int)Species.Drizzile, + (int)Species.Inteleon, - internal static readonly HashSet TransferrableGalar = new HashSet() - { + (int)Species.Dracozolt, + (int)Species.Arctozolt, + (int)Species.Dracovish, + (int)Species.Arctovish, + + (int)Species.Toxel, + (int)Species.Toxtricity, }; #region Unreleased Items internal static readonly HashSet UnreleasedHeldItems_8 = new HashSet { + // todo + 504, // Rage Candy Bar + 708, // Lumiose Galette + 709, // Shalour Sable + 715, // Fairy Gem }; #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(); + + /// + /// Moves that aren't kill + /// + internal static readonly HashSet ValidMoves_SWSH = new HashSet + { + 001, 005, 006, 007, 008, 009, 010, 011, 012, 014, + 015, 016, 017, 018, 019, 020, 021, 022, 023, 024, + 025, 028, 029, 030, 031, 032, 033, 034, 035, 036, + 037, 038, 039, 040, 042, 043, 044, 045, 046, 047, + 048, 050, 051, 052, 053, 054, 055, 056, 057, 058, + 059, 060, 061, 062, 063, 064, 065, 066, 067, 069, + 070, 071, 072, 073, 074, 075, 076, 077, 078, 079, + 080, 081, 083, 084, 085, 086, 087, 088, 089, 090, + 091, 092, 093, 094, 095, 097, 098, 100, 101, 103, + 104, 105, 106, 107, 108, 109, 110, 111, 113, 114, + 115, 116, 120, 122, 123, 124, 126, 127, 129, 130, + 133, 135, 136, 137, 138, 139, 141, 143, 147, 150, + 151, 152, 153, 154, 156, 157, 161, 162, 163, 164, + 167, 170, 172, 174, 175, 178, 179, 180, 181, 183, + 184, 186, 187, 188, 189, 190, 191, 192, 195, 196, + 198, 199, 200, 201, 202, 204, 205, 206, 207, 209, + 210, 211, 212, 213, 215, 217, 219, 220, 223, 224, + 225, 226, 227, 229, 230, 231, 232, 233, 234, 235, + 236, 238, 239, 240, 241, 242, 244, 245, 246, 247, + 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, + 258, 259, 260, 261, 262, 263, 268, 269, 272, 273, + 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, + 285, 286, 288, 291, 292, 297, 298, 299, 303, 304, + 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, + 315, 317, 319, 321, 322, 323, 325, 326, 328, 329, + 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, + 340, 341, 342, 344, 345, 347, 348, 349, 350, 351, + 352, 353, 355, 356, 359, 360, 361, 362, 365, 366, + 367, 368, 369, 370, 371, 372, 374, 375, 379, 380, + 384, 385, 387, 388, 389, 390, 392, 393, 394, 395, + 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, + 406, 407, 408, 409, 410, 411, 412, 413, 414, 416, + 417, 418, 419, 420, 421, 422, 423, 424, 425, 427, + 428, 430, 432, 433, 434, 435, 436, 437, 438, 439, + 440, 441, 442, 444, 446, 447, 450, 451, 452, 453, + 454, 455, 457, 458, 468, 470, 471, 472, 473, 474, + 475, 478, 479, 480, 482, 483, 484, 486, 487, 488, + 489, 490, 491, 492, 493, 494, 496, 497, 499, 500, + 502, 503, 504, 505, 506, 508, 509, 510, 512, 513, + 514, 515, 517, 518, 519, 520, 521, 522, 523, 524, + 525, 526, 527, 528, 529, 530, 532, 533, 534, 535, + 536, 538, 539, 540, 541, 542, 544, 549, 550, 551, + 556, 558, 559, 560, 564, 565, 566, 567, 568, 570, + 571, 572, 573, 574, 575, 576, 577, 579, 580, 581, + 582, 583, 584, 585, 586, 587, 589, 590, 594, 595, + 597, 598, 599, 602, 603, 604, 605, 608, 609, 610, + 611, 612, 660, 662, 663, 664, 667, 668, 669, 670, + 673, 674, 675, 676, 677, 678, 679, 680, 681, 682, + 683, 684, 685, 688, 691, 693, 694, 706, 707, 709, + 710, 711, 715, 716, 718, 745, 746, 747, 748, 749, + 750, 751, 752, 753, 754, 755, 756, + }; } } diff --git a/PKHeX.Core/Legality/Verifiers/FormVerifier.cs b/PKHeX.Core/Legality/Verifiers/FormVerifier.cs index abfa23cba..bd85f8117 100644 --- a/PKHeX.Core/Legality/Verifiers/FormVerifier.cs +++ b/PKHeX.Core/Legality/Verifiers/FormVerifier.cs @@ -175,7 +175,10 @@ bool IsValidPikachuCap() } if (pkm.AltForm != 0 && BattleOnly.Contains(pkm.Species)) - return GetInvalid(LFormBattle); + { + if (pkm.Species == (int)Species.Darmanitan && pkm.Species == 2) { } // this one is OK, Galarian non-Zen + else return GetInvalid(LFormBattle); + } return VALID; } diff --git a/PKHeX.Core/Legality/Verifiers/LevelVerifier.cs b/PKHeX.Core/Legality/Verifiers/LevelVerifier.cs index 4ab80cef5..7bf6ac264 100644 --- a/PKHeX.Core/Legality/Verifiers/LevelVerifier.cs +++ b/PKHeX.Core/Legality/Verifiers/LevelVerifier.cs @@ -46,7 +46,7 @@ public override void Verify(LegalityAnalysis data) var reqEXP = EncounterMatch is EncounterStatic s && s.Version == GameVersion.C ? 125 // Gen2 Dizzy Punch gifts always have 125 EXP, even if it's more than the Lv5 exp required. - : Experience.GetEXP(elvl, pkm.Species, pkm.AltForm); + : Experience.GetEXP(elvl, pkm.PersonalInfo.EXPGrowth); if (reqEXP != pkm.EXP) data.AddLine(GetInvalid(LEggEXP)); return; @@ -55,7 +55,7 @@ public override void Verify(LegalityAnalysis data) int lvl = pkm.CurrentLevel; if (lvl < pkm.Met_Level) data.AddLine(GetInvalid(LLevelMetBelow)); - else if (!EncounterMatch.IsWithinRange(pkm) && lvl != 100 && pkm.EXP == Experience.GetEXP(lvl, pkm.Species, pkm.AltForm)) + else if (!EncounterMatch.IsWithinRange(pkm) && lvl != 100 && pkm.EXP == Experience.GetEXP(lvl, pkm.PersonalInfo.EXPGrowth)) data.AddLine(Get(LLevelEXPThreshold, Severity.Fishy)); else data.AddLine(GetValid(LLevelMetSane)); diff --git a/PKHeX.Core/Legality/Verifiers/MemoryVerifier.cs b/PKHeX.Core/Legality/Verifiers/MemoryVerifier.cs index a8138fcb7..ba9acf716 100644 --- a/PKHeX.Core/Legality/Verifiers/MemoryVerifier.cs +++ b/PKHeX.Core/Legality/Verifiers/MemoryVerifier.cs @@ -213,7 +213,7 @@ private CheckResult VerifyCommonMemory(PKM pkm, int handler) return GetInvalid(string.Format(LMemoryArgBadPokecenter, memory.Handler)); // {0} saw {2} carrying {1} on its back. {4} that {3}. - case 21 when !Legal.GetCanLearnMachineMove(new PK6 {Species = memory.Variable, EXP = Experience.GetEXP(100, memory.Variable, 0)}, 19, 6): + case 21 when !Legal.GetCanLearnMachineMove(new PK6 {Species = memory.Variable, EXP = Experience.GetEXP(100, PersonalTable.XY.GetFormeIndex(memory.Variable, 0))}, 19, 6): return GetInvalid(string.Format(LMemoryArgBadMove, memory.Handler)); case 16 when memory.Variable == 0 || !Legal.GetCanKnowMove(pkm, memory.Variable, 6): diff --git a/PKHeX.Core/Legality/Verifiers/MiscVerifier.cs b/PKHeX.Core/Legality/Verifiers/MiscVerifier.cs index 410a4b52a..681962bb5 100644 --- a/PKHeX.Core/Legality/Verifiers/MiscVerifier.cs +++ b/PKHeX.Core/Legality/Verifiers/MiscVerifier.cs @@ -43,6 +43,8 @@ public override void Verify(LegalityAnalysis data) data.AddLine(GetInvalid(LTransferBad)); if (pkm is PB7 pb7) VerifyBelugaStats(data, pb7); + if (pkm is PK8 pk8) + VerifySWSHStats(data, pk8); VerifyMiscFatefulEncounter(data); } @@ -223,6 +225,7 @@ private static void VerifyReceivability(LegalityAnalysis data, MysteryGift g) { case WC6 wc6 when !wc6.CanBeReceivedByVersion(pkm.Version) && !pkm.WasTradedEgg: case WC7 wc7 when !wc7.CanBeReceivedByVersion(pkm.Version) && !pkm.WasTradedEgg: + case WC8 wc8 when !wc8.CanBeReceivedByVersion(pkm.Version) && !pkm.WasTradedEgg: data.AddLine(GetInvalid(LEncGiftVersionNotDistributed, GameOrigin)); return; case WC6 wc6 when wc6.RestrictLanguage != 0 && wc6.Language != wc6.RestrictLanguage: @@ -259,11 +262,11 @@ public void VerifyVersionEvolution(LegalityAnalysis data) // No point using the evolution tree. Just handle certain species. switch (pkm.Species) { - case 745 when (pkm.AltForm == 0 && Moon()) || (pkm.AltForm == 1 && Sun()): // Lycanroc - case 791 when Moon(): // Solgaleo - case 792 when Sun(): // Lunala - bool Sun() => pkm.Version == (int)GameVersion.SN || pkm.Version == (int)GameVersion.US; - bool Moon() => pkm.Version == (int)GameVersion.MN || pkm.Version == (int)GameVersion.UM; + case (int)Species.Lycanroc when (pkm.AltForm == 0 && Moon()) || (pkm.AltForm == 1 && Sun()): + case (int)Species.Solgaleo when Moon(): + case (int)Species.Lunala when Sun(): + bool Sun() => (pkm.Version & 1) == 0; + bool Moon() => (pkm.Version & 1) == 1; if (pkm.IsUntraded) data.AddLine(GetInvalid(LEvoTradeRequired, Evolution)); break; @@ -315,5 +318,35 @@ private static bool IsTradeEvoRequired7b(IEncounterable enc, PKM pb7) private static readonly int[] tradeEvo7b = { 064, 067, 075, 093 }; private static bool IsStarter(PKM pb7) => (pb7.Species == 25 && pb7.AltForm == 8) || (pb7.Species == 133 && pb7.AltForm == 1); + + private void VerifySWSHStats(LegalityAnalysis data, PK8 pk8) + { + if (pk8.Favorite) + data.AddLine(GetInvalid(LFavoriteMarkingUnavailable, Encounter)); + + var gflag = data.EncounterMatch is IGigantamax g && g.CanGigantamax; + if (gflag != pk8.CanGigantamax) + data.AddLine(GetInvalid(LStatGigantamaxInvalid)); + + if (pk8.DynamaxLevel != 0) + { + if (pk8.IsEgg || pk8.DynamaxLevel > 10) + data.AddLine(GetInvalid(LStatDynamaxInvalid)); + } + + PersonalInfo? pi = null; + for (int i = 0; i < 100; i++) + { + if (!pk8.GetMoveRecordFlag(i)) + continue; + if (!(pi ??= pk8.PersonalInfo).TMHM[i + 100]) + data.AddLine(GetInvalid(string.Format(LMoveSourceTR, LegalityAnalysis.MoveStrings[Legal.TMHM_SWSH[i + 100]]))); + } + + if (!string.IsNullOrWhiteSpace(pk8.HT_Name) && pk8.HT_Language == 0) + data.AddLine(GetInvalid(LMemoryHTLanguage)); + + // weight/height scalars can be legally 0 (1:65536) so don't bother checking + } } } diff --git a/PKHeX.Core/Legality/Verifiers/NicknameVerifier.cs b/PKHeX.Core/Legality/Verifiers/NicknameVerifier.cs index c638616e9..57b1aa014 100644 --- a/PKHeX.Core/Legality/Verifiers/NicknameVerifier.cs +++ b/PKHeX.Core/Legality/Verifiers/NicknameVerifier.cs @@ -28,14 +28,17 @@ public override void Verify(LegalityAnalysis data) return; } - if (pkm.VC && pkm.IsNicknamed) + if (pkm.Format <= 7) // can nickname afterwards { - VerifyG1NicknameWithinBounds(data, pkm.Nickname); - } - else if (EncounterMatch is MysteryGift m) - { - if (pkm.IsNicknamed && !m.IsEgg) - data.AddLine(Get(LEncGiftNicknamed, ParseSettings.NicknamedMysteryGift)); + if (pkm.VC && pkm.IsNicknamed) + { + VerifyG1NicknameWithinBounds(data, pkm.Nickname); + } + else if (EncounterMatch is MysteryGift m) + { + if (pkm.IsNicknamed && !m.IsEgg) + data.AddLine(Get(LEncGiftNicknamed, ParseSettings.NicknamedMysteryGift)); + } } if (EncounterMatch is EncounterTrade t) @@ -83,7 +86,7 @@ private bool VerifyUnNicknamedEncounter(LegalityAnalysis data, PKM pkm, string n } if (nickname.Length > Legal.GetMaxLengthNickname(data.Info.Generation, (LanguageID)pkm.Language)) { - var severe = data.EncounterOriginal.EggEncounter && pkm.WasTradedEgg && nickname.Length <= Legal.GetMaxLengthNickname(data.Info.Generation, English) + var severe = pkm.Format >= 8 || (data.EncounterOriginal.EggEncounter && pkm.WasTradedEgg && nickname.Length <= Legal.GetMaxLengthNickname(data.Info.Generation, English)) ? Severity.Fishy : Severity.Invalid; data.AddLine(Get(LNickLengthLong, severe)); @@ -345,7 +348,7 @@ private static void VerifyTradeOTOnly(LegalityAnalysis data, EncounterTrade t) private static CheckResult CheckTradeOTOnly(LegalityAnalysis data, string[] validOT) { var pkm = data.pkm; - if (pkm.IsNicknamed) + if (pkm.IsNicknamed && pkm.Format < 8) return GetInvalid(LEncTradeChangedNickname, CheckIdentifier.Nickname); int lang = pkm.Language; if (validOT.Length <= lang) diff --git a/PKHeX.Core/Legality/Verifiers/TransferVerifier.cs b/PKHeX.Core/Legality/Verifiers/TransferVerifier.cs index 1af46872d..29d9175af 100644 --- a/PKHeX.Core/Legality/Verifiers/TransferVerifier.cs +++ b/PKHeX.Core/Legality/Verifiers/TransferVerifier.cs @@ -104,10 +104,9 @@ public void VerifyTransferLegalityG8(LegalityAnalysis data) { var pkm = data.pkm; int species = pkm.Species; - if (!Legal.TransferrableGalar.Contains(species)) + var pi = (PersonalInfoSWSH)PersonalTable.SWSH.GetFormeEntry(species, pkm.AltForm); + if (!pi.IsPresentInGame) data.AddLine(GetInvalid(LTransferBad)); - - // todo: alternate forms disallowed? } public IEnumerable VerifyVCEncounter(PKM pkm, IEncounterable encounter, ILocation transfer, IList Moves) diff --git a/PKHeX.Core/MysteryGifts/MysteryGift.cs b/PKHeX.Core/MysteryGifts/MysteryGift.cs index b0a38fa34..1dc71b2a9 100644 --- a/PKHeX.Core/MysteryGifts/MysteryGift.cs +++ b/PKHeX.Core/MysteryGifts/MysteryGift.cs @@ -45,7 +45,7 @@ public abstract class MysteryGift : IEncounterable, IMoveset, IGeneration, ILoca /// A boolean indicating whether or not the given length is valid for a mystery gift. public static bool IsMysteryGift(long len) => MGSizes.Contains((int)len); - private static readonly HashSet MGSizes = new HashSet{ WC6Full.Size, WC6.Size, PGF.Size, PGT.Size, PCD.Size }; + private static readonly HashSet MGSizes = new HashSet{ WC8.Size, WC6Full.Size, WC6.Size, PGF.Size, PGT.Size, PCD.Size }; /// /// Converts the given data to a . @@ -61,6 +61,8 @@ public abstract class MysteryGift : IEncounterable, IMoveset, IGeneration, ILoca switch (data.Length) { + case WC8.Size when ext == ".wc8": + return new WC8(data); case WB7.SizeFull when ext == ".wb7full": case WB7.Size when ext == ".wb7": return new WB7(data); @@ -106,6 +108,7 @@ public abstract class MysteryGift : IEncounterable, IMoveset, IGeneration, ILoca return new WC7(data); return new WC6(data); case WR7.Size: return new WR7(data); + case WC8.Size: return new WC8(data); case PGF.Size: return new PGF(data); case PGT.Size: return new PGT(data); diff --git a/PKHeX.Core/MysteryGifts/PGF.cs b/PKHeX.Core/MysteryGifts/PGF.cs index 14e822a35..a9ba78bee 100644 --- a/PKHeX.Core/MysteryGifts/PGF.cs +++ b/PKHeX.Core/MysteryGifts/PGF.cs @@ -8,7 +8,7 @@ namespace PKHeX.Core /// /// Generation 5 Mystery Gift Template File /// - public sealed class PGF : DataMysteryGift, IRibbonSetEvent3, IRibbonSetEvent4, ILangNick, IContestStats + public sealed class PGF : DataMysteryGift, IRibbonSetEvent3, IRibbonSetEvent4, ILangNick, IContestStats, INature { public const int Size = 0xCC; public override int Format => 5; @@ -201,7 +201,7 @@ public override PKM ConvertToPKM(ITrainerInfo SAV, EncounterCriteria criteria) CNT_Tough = CNT_Tough, CNT_Sheen = CNT_Sheen, - EXP = Experience.GetEXP(currentLevel, Species, 0), + EXP = Experience.GetEXP(currentLevel, pi.EXPGrowth), // Ribbons RibbonCountry = RibbonCountry, @@ -370,7 +370,8 @@ protected override bool IsMatchExact(PKM pkm, IEnumerable vs) if (Level != pkm.Met_Level) return false; if (Ball != pkm.Ball) return false; - if (Nature != -1 && Nature != pkm.Nature) return false; + if (Nature != -1 && pkm.Nature != Nature) + return false; if (Gender != 2 && Gender != pkm.Gender) return false; if (pkm is IContestStats s && s.IsContestBelow(this)) diff --git a/PKHeX.Core/MysteryGifts/WB7.cs b/PKHeX.Core/MysteryGifts/WB7.cs index a81d04036..92487f9d8 100644 --- a/PKHeX.Core/MysteryGifts/WB7.cs +++ b/PKHeX.Core/MysteryGifts/WB7.cs @@ -8,7 +8,7 @@ namespace PKHeX.Core /// /// Generation 7 Mystery Gift Template File /// - public sealed class WB7 : DataMysteryGift, IRibbonSetEvent3, IRibbonSetEvent4, ILangNick, IAwakened + public sealed class WB7 : DataMysteryGift, IRibbonSetEvent3, IRibbonSetEvent4, ILangNick, IAwakened, INature { public const int Size = 0x108; public const int SizeFull = 0x310; @@ -360,7 +360,7 @@ public override PKM ConvertToPKM(ITrainerInfo SAV, EncounterCriteria criteria) HT_Gender = OT_Name.Length > 0 ? SAV.Gender : 0, CurrentHandler = OT_Name.Length > 0 ? 1 : 0, - EXP = Experience.GetEXP(currentLevel, Species, 0), + EXP = Experience.GetEXP(currentLevel, pi.EXPGrowth), OT_Friendship = pi.BaseFriendship, FatefulEncounter = true, @@ -518,7 +518,7 @@ protected override bool IsMatchExact(PKM pkm, IEnumerable vs) if (MetLevel != pkm.Met_Level) return false; if (Ball != pkm.Ball) return false; if (OTGender < 3 && OTGender != pkm.OT_Gender) return false; - if (Nature != -1 && Nature != pkm.Nature) return false; + if (Nature != -1 && pkm.Nature != Nature) return false; if (Gender != 3 && Gender != pkm.Gender) return false; if (pkm is IAwakened s && s.IsAwakeningBelow(this)) diff --git a/PKHeX.Core/MysteryGifts/WC3.cs b/PKHeX.Core/MysteryGifts/WC3.cs index 8eb551808..115282e1d 100644 --- a/PKHeX.Core/MysteryGifts/WC3.cs +++ b/PKHeX.Core/MysteryGifts/WC3.cs @@ -77,9 +77,7 @@ public override PKM ConvertToPKM(ITrainerInfo SAV, EncounterCriteria criteria) Met_Level = Met_Level, Met_Location = Location, Ball = 4, - - EXP = Experience.GetEXP(Level, Species, 0), - + // Ribbons RibbonCountry = RibbonCountry, RibbonNational = RibbonNational, @@ -91,6 +89,7 @@ public override PKM ConvertToPKM(ITrainerInfo SAV, EncounterCriteria criteria) FatefulEncounter = Fateful, Version = GetVersion(SAV), }; + pk.EXP = Experience.GetEXP(Level, pk.PersonalInfo.EXPGrowth); SetMoves(pk); bool hatchedEgg = IsEgg && SAV.Generation != 3; diff --git a/PKHeX.Core/MysteryGifts/WC6.cs b/PKHeX.Core/MysteryGifts/WC6.cs index bcf8e9a4b..bbccf28af 100644 --- a/PKHeX.Core/MysteryGifts/WC6.cs +++ b/PKHeX.Core/MysteryGifts/WC6.cs @@ -8,7 +8,7 @@ namespace PKHeX.Core /// /// Generation 6 Mystery Gift Template File /// - public sealed class WC6 : DataMysteryGift, IRibbonSetEvent3, IRibbonSetEvent4, ILangNick, IContestStats + public sealed class WC6 : DataMysteryGift, IRibbonSetEvent3, IRibbonSetEvent4, ILangNick, IContestStats, INature { public const int Size = 0x108; public const uint EonTicketConst = 0x225D73C2; @@ -305,7 +305,7 @@ public override PKM ConvertToPKM(ITrainerInfo SAV, EncounterCriteria criteria) HT_Gender = OT_Name.Length > 0 ? SAV.Gender : 0, CurrentHandler = OT_Name.Length > 0 ? 1 : 0, - EXP = Experience.GetEXP(Level, Species, 0), + EXP = Experience.GetEXP(Level, pi.EXPGrowth), // Ribbons RibbonCountry = RibbonCountry, @@ -501,7 +501,7 @@ protected override bool IsMatchExact(PKM pkm, IEnumerable vs) if (Level != pkm.Met_Level) return false; if (Ball != pkm.Ball) return false; if (OTGender < 3 && OTGender != pkm.OT_Gender) return false; - if (Nature != -1 && Nature != pkm.Nature) return false; + if (Nature != -1 && pkm.Nature != Nature) return false; if (Gender != 3 && Gender != pkm.Gender) return false; if (pkm is IContestStats s && s.IsContestBelow(this)) diff --git a/PKHeX.Core/MysteryGifts/WC7.cs b/PKHeX.Core/MysteryGifts/WC7.cs index 1be125044..e0fe07ddd 100644 --- a/PKHeX.Core/MysteryGifts/WC7.cs +++ b/PKHeX.Core/MysteryGifts/WC7.cs @@ -8,7 +8,7 @@ namespace PKHeX.Core /// /// Generation 7 Mystery Gift Template File /// - public sealed class WC7 : DataMysteryGift, IRibbonSetEvent3, IRibbonSetEvent4, ILangNick, IContestStats + public sealed class WC7 : DataMysteryGift, IRibbonSetEvent3, IRibbonSetEvent4, ILangNick, IContestStats, INature { public const int Size = 0x108; public override int Format => 7; @@ -349,7 +349,7 @@ public override PKM ConvertToPKM(ITrainerInfo SAV, EncounterCriteria criteria) HT_Gender = OT_Name.Length > 0 ? SAV.Gender : 0, CurrentHandler = OT_Name.Length > 0 ? 1 : 0, - EXP = Experience.GetEXP(currentLevel, Species, 0), + EXP = Experience.GetEXP(currentLevel, pi.EXPGrowth), // Ribbons RibbonCountry = RibbonCountry, @@ -543,7 +543,7 @@ protected override bool IsMatchExact(PKM pkm, IEnumerable vs) if (MetLevel != pkm.Met_Level) return false; if (Ball != pkm.Ball) return false; if (OTGender < 3 && OTGender != pkm.OT_Gender) return false; - if (Nature != -1 && Nature != pkm.Nature) return false; + if (Nature != -1 && pkm.Nature != Nature) return false; if (Gender != 3 && Gender != pkm.Gender) return false; if (pkm is IContestStats s && s.IsContestBelow(this)) diff --git a/PKHeX.Core/MysteryGifts/WC8.cs b/PKHeX.Core/MysteryGifts/WC8.cs new file mode 100644 index 000000000..4c9301a07 --- /dev/null +++ b/PKHeX.Core/MysteryGifts/WC8.cs @@ -0,0 +1,544 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace PKHeX.Core +{ + /// + /// Generation 8 Mystery Gift Template File + /// + public sealed class WC8 : DataMysteryGift, ILangNick, INature, IGigantamax, IDynamaxLevel + { + public const int Size = 0x2D0; + public const int CardStart = 0x0; + + public override int Format => 8; + + public enum GiftType : byte + { + None = 0, + Pokemon = 1, + Item = 2, + BP = 3, + Clothing = 4, + } + + public WC8() : this(new byte[Size]) { } + public WC8(byte[] data) : base(data) { } + + // TODO: public byte RestrictVersion? + + public bool CanBeReceivedByVersion(int v) + { + if (v < (int)GameVersion.SW || v > (int)GameVersion.SH) + return false; + return true; + } + + // General Card Properties + public override int CardID + { + get => BitConverter.ToUInt16(Data, CardStart + 0x8); + set => BitConverter.GetBytes((ushort)value).CopyTo(Data, CardStart + 0x8); + } + + public byte CardFlags { get => Data[CardStart + 0x10]; set => Data[CardStart + 0x10] = value; } + public GiftType CardType { get => (GiftType)Data[CardStart + 0x11]; set => Data[CardStart + 0x11] = (byte)value; } + public bool GiftRepeatable { get => (CardFlags & 1) == 0; set => CardFlags = (byte)((CardFlags & ~1) | (value ? 0 : 1)); } + public override bool GiftUsed { get => false; set => throw new Exception(); } + + public int CardTitleIndex + { + get => Data[CardStart + 0x15]; + set => Data[CardStart + 0x15] = (byte) value; + } + + public override string CardTitle + { + get => "Mystery Gift"; // TODO: Use text string from CardTitleIndex + set => throw new Exception(); + } + + // Item Properties + public override bool IsItem { get => CardType == GiftType.Item; set { if (value) CardType = GiftType.Item; } } + + public override int ItemID + { + get => GetItem(0); + set => SetItem(0, (ushort)value); + } + + public override int Quantity + { + get => GetQuantity(0); + set => SetQuantity(0, (ushort)value); + } + + public int GetItem(int index) => BitConverter.ToUInt16(Data, CardStart + 0x20 + (0x4 * index)); + public void SetItem(int index, ushort item) => BitConverter.GetBytes(item).CopyTo(Data, CardStart + 0x20 + (4 * index)); + public int GetQuantity(int index) => BitConverter.ToUInt16(Data, CardStart + 0x22 + (0x4 * index)); + public void SetQuantity(int index, ushort quantity) => BitConverter.GetBytes(quantity).CopyTo(Data, CardStart + 0x22 + (4 * index)); + + // Pokémon Properties + public override bool IsPokémon { get => CardType == GiftType.Pokemon; set { if (value) CardType = GiftType.Pokemon; } } + public override bool IsShiny => PIDType == Shiny.Always; + + public override int TID + { + get => BitConverter.ToUInt16(Data, CardStart + 0x20); + set => BitConverter.GetBytes((ushort)value).CopyTo(Data, CardStart + 0x20); + } + + public override int SID { + get => BitConverter.ToUInt16(Data, CardStart + 0x22); + set => BitConverter.GetBytes((ushort)value).CopyTo(Data, CardStart + 0x22); + } + + public int OriginGame + { + get => BitConverter.ToInt32(Data, CardStart + 0x24); + set => BitConverter.GetBytes(value).CopyTo(Data, CardStart + 0x24); + } + + public uint EncryptionConstant + { + get => BitConverter.ToUInt32(Data, CardStart + 0x28); + set => BitConverter.GetBytes(value).CopyTo(Data, CardStart + 0x28); + } + + public uint PID + { + get => BitConverter.ToUInt32(Data, CardStart + 0x2C); + set => BitConverter.GetBytes(value).CopyTo(Data, CardStart + 0x2C); + } + + // Nicknames, OT Names 0x30 - 0x228 + public override int EggLocation { get => BitConverter.ToUInt16(Data, CardStart + 0x228); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, CardStart + 0x228); } + public int MetLocation { get => BitConverter.ToUInt16(Data, CardStart + 0x22A); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, CardStart + 0x22A); } + + public override int Ball + { + get => BitConverter.ToUInt16(Data, CardStart + 0x22C); + set => BitConverter.GetBytes((ushort)value).CopyTo(Data, CardStart + 0x22C); + } + + public override int HeldItem + { + get => BitConverter.ToUInt16(Data, CardStart + 0x22E); + set => BitConverter.GetBytes((ushort)value).CopyTo(Data, CardStart + 0x22E); + } + + public int Move1 { get => BitConverter.ToUInt16(Data, CardStart + 0x230); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, CardStart + 0x230); } + public int Move2 { get => BitConverter.ToUInt16(Data, CardStart + 0x232); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, CardStart + 0x232); } + public int Move3 { get => BitConverter.ToUInt16(Data, CardStart + 0x234); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, CardStart + 0x234); } + public int Move4 { get => BitConverter.ToUInt16(Data, CardStart + 0x236); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, CardStart + 0x236); } + public int RelearnMove1 { get => BitConverter.ToUInt16(Data, CardStart + 0x238); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, CardStart + 0x238); } + public int RelearnMove2 { get => BitConverter.ToUInt16(Data, CardStart + 0x23A); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, CardStart + 0x23A); } + public int RelearnMove3 { get => BitConverter.ToUInt16(Data, CardStart + 0x23C); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, CardStart + 0x23C); } + public int RelearnMove4 { get => BitConverter.ToUInt16(Data, CardStart + 0x23E); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, CardStart + 0x23E); } + + public override int Species { get => BitConverter.ToUInt16(Data, CardStart + 0x240); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, CardStart + 0x240); } + public override int Form { get => Data[CardStart + 0x242]; set => Data[CardStart + 0x242] = (byte)value; } + public override int Gender { get => Data[CardStart + 0x243]; set => Data[CardStart + 0x243] = (byte)value; } + public override int Level { get => Data[CardStart + 0x244]; set => Data[CardStart + 0x244] = (byte)value; } + public override bool IsEgg { get => Data[CardStart + 0x245] == 1; set => Data[CardStart + 0x245] = (byte)(value ? 1 : 0); } + public int Nature { get => (sbyte)Data[CardStart + 0x246]; set => Data[CardStart + 0x246] = (byte)value; } + public override int AbilityType { get => Data[CardStart + 0x247]; set => Data[CardStart + 0x247] = (byte)value; } + + public Shiny PIDType + { + get + { + switch (Data[CardStart + 0x248]) + { + case 0: + return Shiny.Never; + case 1: + return Shiny.Random; + case 2: // Fixed never shiny + case 3: // Fixed always shiny + case 4: + return Shiny.FixedValue; + default: + throw new ArgumentException(); + } + } + } + + public int MetLevel { get => Data[CardStart + 0x249]; set => Data[CardStart + 0x249] = (byte)value; } + public byte DynamaxLevel { get => Data[CardStart + 0x24A]; set => Data[CardStart + 0x24A] = value; } + public bool CanGigantamax { get => Data[CardStart + 0x24B] != 0; set => Data[CardStart + 0x24B] = (byte)(value ? 1 : 0); } + + // Ribbons 0x24C-0x26C + public byte GetRibbon(int index) + { + if (index >= 0x20) throw new IndexOutOfRangeException(); + return Data[0x24C + index]; + } + + public void SetRibbon(int index, byte value) + { + if (index >= 0x20) throw new IndexOutOfRangeException(); + Data[0x24C + index] = value; + } + + public int IV_HP { get => Data[CardStart + 0x26C]; set => Data[CardStart + 0x26C] = (byte)value; } + public int IV_ATK { get => Data[CardStart + 0x26D]; set => Data[CardStart + 0x26D] = (byte)value; } + public int IV_DEF { get => Data[CardStart + 0x26E]; set => Data[CardStart + 0x26E] = (byte)value; } + public int IV_SPE { get => Data[CardStart + 0x26F]; set => Data[CardStart + 0x26F] = (byte)value; } + public int IV_SPA { get => Data[CardStart + 0x270]; set => Data[CardStart + 0x270] = (byte)value; } + public int IV_SPD { get => Data[CardStart + 0x271]; set => Data[CardStart + 0x271] = (byte)value; } + + public int OTGender { get => Data[CardStart + 0x272]; set => Data[CardStart + 0x272] = (byte)value; } + + public int EV_HP { get => Data[CardStart + 0x273]; set => Data[CardStart + 0x273] = (byte)value; } + public int EV_ATK { get => Data[CardStart + 0x274]; set => Data[CardStart + 0x274] = (byte)value; } + public int EV_DEF { get => Data[CardStart + 0x275]; set => Data[CardStart + 0x275] = (byte)value; } + public int EV_SPE { get => Data[CardStart + 0x276]; set => Data[CardStart + 0x276] = (byte)value; } + public int EV_SPA { get => Data[CardStart + 0x277]; set => Data[CardStart + 0x277] = (byte)value; } + public int EV_SPD { get => Data[CardStart + 0x278]; set => Data[CardStart + 0x278] = (byte)value; } + + public int OT_Intensity { get => Data[CardStart + 0x279]; set => Data[CardStart + 0x279] = (byte)value; } + public int OT_Memory { get => Data[CardStart + 0x27A]; set => Data[CardStart + 0x27A] = (byte)value; } + public int OT_Feeling { get => Data[CardStart + 0x27B]; set => Data[CardStart + 0x27B] = (byte)value; } + public int OT_TextVar { get => BitConverter.ToUInt16(Data, CardStart + 0x27C); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, CardStart + 0x27C); } + + // Meta Accessible Properties + public override int[] IVs + { + get => new[] { IV_HP, IV_ATK, IV_DEF, IV_SPE, IV_SPA, IV_SPD }; + set + { + if (value.Length != 6) return; + IV_HP = value[0]; IV_ATK = value[1]; IV_DEF = value[2]; + IV_SPE = value[3]; IV_SPA = value[4]; IV_SPD = value[5]; + } + } + + public int[] EVs + { + get => new[] { EV_HP, EV_ATK, EV_DEF, EV_SPE, EV_SPA, EV_SPD }; + set + { + if (value.Length != 6) return; + EV_HP = value[0]; EV_ATK = value[1]; EV_DEF = value[2]; + EV_SPE = value[3]; EV_SPA = value[4]; EV_SPD = value[5]; + } + } + + public bool GetIsNicknamed(int language) => BitConverter.ToUInt16(Data, GetNicknameOffset(language)) != 0; + + public int GetNicknameLanguage(int language) => Data[GetNicknameOffset(language) + 0x1A]; + + public bool GetHasOT(int language) => BitConverter.ToUInt16(Data, GetOTOffset(language)) != 0; + + private int GetLanguageIndex(int language) + { + var lang = (LanguageID) language; + if (lang < LanguageID.Japanese || lang == LanguageID.UNUSED_6) + return (int) LanguageID.English; // fallback + return lang < LanguageID.UNUSED_6 ? language - 1 : language - 2; + } + + public override int Location { get => MetLocation; set => MetLocation = (ushort)value; } + + public override int[] Moves + { + get => new[] { Move1, Move2, Move3, Move4 }; + set + { + if (value.Length > 0) Move1 = value[0]; + if (value.Length > 1) Move2 = value[1]; + if (value.Length > 2) Move3 = value[2]; + if (value.Length > 3) Move4 = value[3]; + } + } + + public override int[] RelearnMoves + { + get => new[] { RelearnMove1, RelearnMove2, RelearnMove3, RelearnMove4 }; + set + { + if (value.Length > 0) RelearnMove1 = value[0]; + if (value.Length > 1) RelearnMove2 = value[1]; + if (value.Length > 2) RelearnMove3 = value[2]; + if (value.Length > 3) RelearnMove4 = value[3]; + } + } + + public override string OT_Name { get; set; } = string.Empty; + public string Nickname => string.Empty; + public bool IsNicknamed => false; + public int Language => 2; + + public string GetNickname(int language) => Util.TrimFromZero(Encoding.Unicode.GetString(Data, GetNicknameOffset(language), 0x1A)); + public void SetNickname(int language, string value) => Encoding.Unicode.GetBytes(value.PadRight(0x1A / 2, '\0')).CopyTo(Data, GetNicknameOffset(language)); + + public string GetOT(int language) => Util.TrimFromZero(Encoding.Unicode.GetString(Data, GetOTOffset(language), 0x1A)); + public void SetOT(int language, string value) => Encoding.Unicode.GetBytes(value.PadRight(0x1A / 2, '\0')).CopyTo(Data, GetOTOffset(language)); + + private int GetNicknameOffset(int language) + { + int index = GetLanguageIndex(language); + return 0x30 + (index * 0x1C); + } + + private int GetOTOffset(int language) + { + int index = GetLanguageIndex(language); + return 0x12C + (index * 0x1C); + } + + public override PKM ConvertToPKM(ITrainerInfo SAV, EncounterCriteria criteria) + { + if (!IsPokémon) + throw new ArgumentException(nameof(IsPokémon)); + + int currentLevel = Level > 0 ? Level : Util.Rand.Next(100) + 1; + int metLevel = MetLevel > 0 ? MetLevel : currentLevel; + var pi = PersonalTable.SWSH.GetFormeEntry(Species, Form); + var OT = GetOT(SAV.Language); + + var pk = new PK8 + { + EncryptionConstant = EncryptionConstant != 0 ? EncryptionConstant : Util.Rand32(), + TID = TID, + SID = SID, + Species = Species, + AltForm = Form, + CurrentLevel = currentLevel, + Ball = Ball != 0 ? Ball : 4, // Default is Pokeball + Met_Level = metLevel, + HeldItem = HeldItem, + + EXP = Experience.GetEXP(currentLevel, pi.EXPGrowth), + + Move1 = Move1, + Move2 = Move2, + Move3 = Move3, + Move4 = Move4, + RelearnMove1 = RelearnMove1, + RelearnMove2 = RelearnMove2, + RelearnMove3 = RelearnMove3, + RelearnMove4 = RelearnMove4, + + Version = OriginGame != 0 ? OriginGame : SAV.Game, + + OT_Name = OT.Length > 0 ? OT : SAV.OT, + OT_Gender = OTGender < 2 ? OTGender : SAV.Gender, + HT_Name = GetHasOT(Language) ? SAV.OT : string.Empty, + HT_Gender = GetHasOT(Language) ? SAV.Gender : 0, + HT_Language = GetHasOT(Language) ? SAV.Language : 0, + CurrentHandler = GetHasOT(Language) ? 1 : 0, + OT_Friendship = pi.BaseFriendship, + + OT_Intensity = OT_Intensity, + OT_Memory = OT_Memory, + OT_TextVar = OT_TextVar, + OT_Feeling = OT_Feeling, + FatefulEncounter = true, + + EVs = EVs, + + CanGigantamax = CanGigantamax, + DynamaxLevel = DynamaxLevel, + + Met_Location = MetLocation, + Egg_Location = EggLocation, + }; + pk.SetMaximumPPCurrent(); + + if ((SAV.Generation > Format && OriginGame == 0) || !CanBeReceivedByVersion(pk.Version)) + { + // give random valid game + do { pk.Version = (int)GameVersion.SW + Util.Rand.Next(2); } + while (!CanBeReceivedByVersion(pk.Version)); + } + + if (OTGender >= 2) + { + pk.TID = SAV.TID; + pk.SID = SAV.SID; + } + + // Official code explicitly corrects for meowstic + if (pk.Species == 678) + pk.AltForm = pk.Gender; + + pk.MetDate = DateTime.Now; + + var nickname_language = GetNicknameLanguage(SAV.Language); + pk.Language = nickname_language != 0 ? nickname_language : SAV.Language; + pk.IsNicknamed = GetIsNicknamed(SAV.Language); + pk.Nickname = pk.IsNicknamed ? Nickname : SpeciesName.GetSpeciesNameGeneration(Species, pk.Language, Format); + + for (var i = 0; i < 0x20; i++) + { + var ribbon = GetRibbon(i); + if (ribbon != 0xFF) + pk.SetRibbon(ribbon); + } + + SetPINGA(pk, SAV, criteria); + + if (IsEgg) + SetEggMetData(pk); + pk.CurrentFriendship = pk.IsEgg ? pi.HatchCycles : pi.BaseFriendship; + + pk.HeightScalar = PokeSizeExtensions.GetRandomPokeSize(); + pk.WeightScalar = PokeSizeExtensions.GetRandomPokeSize(); + + pk.RefreshChecksum(); + return pk; + } + + private void SetEggMetData(PKM pk) + { + pk.IsEgg = true; + pk.EggMetDate = DateTime.Now; + pk.Nickname = SpeciesName.GetSpeciesNameGeneration(0, pk.Language, Format); + pk.IsNicknamed = true; + } + + private void SetPINGA(PKM pk, ITrainerInfo SAV, EncounterCriteria criteria) + { + var pi = PersonalTable.USUM.GetFormeEntry(Species, Form); + pk.Nature = (int)criteria.GetNature(Nature == -1 ? Core.Nature.Random : (Nature)Nature); + pk.StatNature = pk.Nature; + pk.Gender = criteria.GetGender(Gender, pi); + var av = GetAbilityIndex(criteria, pi); + pk.RefreshAbility(av); + SetPID(pk, SAV); + SetIVs(pk); + } + + private int GetAbilityIndex(EncounterCriteria criteria, PersonalInfo pi) + { + switch (AbilityType) + { + case 00: // 0 - 0 + case 01: // 1 - 1 + case 02: // 2 - H + return AbilityType; + case 03: // 0/1 + case 04: // 0/1/H + return criteria.GetAbility(AbilityType, pi); // 3 or 2 + default: + throw new ArgumentException(nameof(AbilityType)); + } + } + + private uint GetFixedPID(ITrainerInfo SAV) + { + uint pid = PID; + var val = Data[CardStart + 0x248]; + if (val == 4) + return pid; + return (uint)((pid & 0xFFFF) | ((SAV.SID ^ SAV.TID ^ (pid & 0xFFFF) ^ (val == 2 ? 1 : 0)) << 16)); + } + + private void SetPID(PKM pk, ITrainerInfo SAV) + { + switch (PIDType) + { + case Shiny.FixedValue: // Specified + pk.PID = GetFixedPID(SAV); + break; + case Shiny.Random: // Random + pk.PID = Util.Rand32(); + break; + case Shiny.Always: // Random Shiny + pk.PID = Util.Rand32(); + pk.PID = (uint)(((pk.TID ^ pk.SID ^ (pk.PID & 0xFFFF)) << 16) | (pk.PID & 0xFFFF)); + break; + case Shiny.Never: // Random Nonshiny + pk.PID = Util.Rand32(); + if (pk.IsShiny) pk.PID ^= 0x10000000; + break; + } + } + + private void SetIVs(PKM pk) + { + int[] finalIVs = new int[6]; + var ivflag = Array.Find(IVs, iv => (byte)(iv - 0xFC) < 3); + if (ivflag == 0) // Random IVs + { + for (int i = 0; i < 6; i++) + finalIVs[i] = IVs[i] > 31 ? Util.Rand.Next(pk.MaxIV + 1) : IVs[i]; + } + else // 1/2/3 perfect IVs + { + int IVCount = ivflag - 0xFB; + do { finalIVs[Util.Rand.Next(6)] = 31; } + while (finalIVs.Count(iv => iv == 31) < IVCount); + for (int i = 0; i < 6; i++) + finalIVs[i] = finalIVs[i] == 31 ? pk.MaxIV : Util.Rand.Next(pk.MaxIV + 1); + } + pk.IVs = finalIVs; + } + + protected override bool IsMatchExact(PKM pkm, IEnumerable vs) + { + if (pkm.Egg_Location == 0) // Not Egg + { + if (OTGender < 2) + { + if (SID != pkm.SID) return false; + if (TID != pkm.TID) return false; + if (OTGender != pkm.OT_Gender) return false; + } + var OT = GetOT(pkm.Language); // May not be guaranteed to work. + if (!string.IsNullOrEmpty(OT) && OT != pkm.OT_Name) return false; + if (OriginGame != 0 && OriginGame != pkm.Version) return false; + if (EncryptionConstant != 0 && EncryptionConstant != pkm.EncryptionConstant) return false; + } + + if (Form != pkm.AltForm && vs.All(z => !Legal.IsFormChangeable(pkm, z.Species))) + return false; + + if (IsEgg) + { + if (EggLocation != pkm.Egg_Location) // traded + { + if (pkm.Egg_Location != Locations.LinkTrade6) + return false; + } + else if (PIDType == 0 && pkm.IsShiny) + { + return false; // can't be traded away for unshiny + } + + if (pkm.IsEgg && !pkm.IsNative) + return false; + } + else + { + if (!PIDType.IsValid(pkm)) return false; + if (EggLocation != pkm.Egg_Location) return false; + if (MetLocation != pkm.Met_Location) return false; + } + + if (MetLevel != 0 && MetLevel != pkm.Met_Level) return false; + if (Ball != 0 && Ball != pkm.Ball) return false; + if (Ball == 0 && pkm.Ball != 4) return false; + if (OTGender < 2 && OTGender != pkm.OT_Gender) return false; + if (Nature != -1 && pkm.Nature != Nature) return false; + if (Gender != 3 && Gender != pkm.Gender) return false; + + if (!(pkm is IGigantamax g && g.CanGigantamax == CanGigantamax)) + return false; + + if (!(pkm is IDynamaxLevel dl && dl.DynamaxLevel >= DynamaxLevel)) + return false; + + return PIDType != 0 || pkm.PID == PID; + } + + protected override bool IsMatchDeferred(PKM pkm) + { + return pkm.Species == Species; + } + } +} diff --git a/PKHeX.Core/PKHeX.Core.csproj b/PKHeX.Core/PKHeX.Core.csproj index 81247bb18..74a222996 100644 --- a/PKHeX.Core/PKHeX.Core.csproj +++ b/PKHeX.Core/PKHeX.Core.csproj @@ -78,7 +78,7 @@ - + @@ -128,6 +128,7 @@ + @@ -173,6 +174,7 @@ + @@ -227,6 +229,7 @@ + @@ -281,6 +284,7 @@ + @@ -335,6 +339,7 @@ + @@ -413,6 +418,7 @@ + @@ -467,6 +473,7 @@ + @@ -519,6 +526,7 @@ + @@ -781,6 +789,7 @@ + @@ -856,7 +865,7 @@ - + @@ -906,6 +915,7 @@ + @@ -951,6 +961,7 @@ + @@ -1005,6 +1016,7 @@ + @@ -1059,6 +1071,7 @@ + @@ -1113,6 +1126,7 @@ + @@ -1191,6 +1205,7 @@ + @@ -1245,6 +1260,7 @@ + @@ -1297,6 +1313,7 @@ + @@ -1559,6 +1576,7 @@ + diff --git a/PKHeX.Core/PKM/BK4.cs b/PKHeX.Core/PKM/BK4.cs index b669ff5a3..37be7ba25 100644 --- a/PKHeX.Core/PKM/BK4.cs +++ b/PKHeX.Core/PKM/BK4.cs @@ -7,12 +7,12 @@ namespace PKHeX.Core /// Values are stored in Big Endian format rather than Little Endian. Beware. public sealed class BK4 : G4PKM { - private static readonly byte[] Unused = + private static readonly ushort[] Unused = { 0x42, 0x43, 0x5E, 0x63, 0x64, 0x65, 0x66, 0x67, 0x87 }; - public override IReadOnlyList ExtraBytes => Unused; + public override IReadOnlyList ExtraBytes => Unused; public override int SIZE_PARTY => PKX.SIZE_4STORED; public override int SIZE_STORED => PKX.SIZE_4STORED; diff --git a/PKHeX.Core/PKM/CK3.cs b/PKHeX.Core/PKM/CK3.cs index 7ca4a6996..ac1de5b79 100644 --- a/PKHeX.Core/PKM/CK3.cs +++ b/PKHeX.Core/PKM/CK3.cs @@ -6,7 +6,7 @@ namespace PKHeX.Core /// Generation 3 format, exclusively for Pokémon Colosseum. public sealed class CK3 : G3PKM, IShadowPKM { - private static readonly byte[] Unused = + private static readonly ushort[] Unused = { 0x11, 0x12, 0x13, 0x61, 0x62, 0x63, 0x64, @@ -15,7 +15,7 @@ public sealed class CK3 : G3PKM, IShadowPKM // 0xFC onwards unused? }; - public override IReadOnlyList ExtraBytes => Unused; + public override IReadOnlyList ExtraBytes => Unused; public override int SIZE_PARTY => PKX.SIZE_3CSTORED; public override int SIZE_STORED => PKX.SIZE_3CSTORED; diff --git a/PKHeX.Core/PKM/PB7.cs b/PKHeX.Core/PKM/PB7.cs index f2228f492..c0c812b83 100644 --- a/PKHeX.Core/PKM/PB7.cs +++ b/PKHeX.Core/PKM/PB7.cs @@ -5,9 +5,9 @@ namespace PKHeX.Core { /// Generation 7 format used for . - public sealed class PB7 : G6PKM, IHyperTrain, IAwakened + public sealed class PB7 : G6PKM, IHyperTrain, IAwakened, IScaledSize, IFavorite { - public static readonly byte[] Unused = + public static readonly ushort[] Unused = { 0x2A, // Old Marking Value (PelagoEventStatus) 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, // Unused Ribbons @@ -20,7 +20,7 @@ public sealed class PB7 : G6PKM, IHyperTrain, IAwakened 0xC8, 0xC9, // OT Terminator }; - public override IReadOnlyList ExtraBytes => Unused; + public override IReadOnlyList ExtraBytes => Unused; public override int SIZE_PARTY => SIZE; public override int SIZE_STORED => SIZE; @@ -533,19 +533,6 @@ public void ResetWeight() WeightAbsolute = updated; } - public static int GetSizeRating(int scalar) - { - if (scalar < 0x10) - return 0; // 1/16 = XS - if (scalar < 0x30u) - return 1; // 2/16 = S - if (scalar < 0xD0u) - return 2; // average (10/16) - if (scalar < 0xF0u) - return 3; // 2/16 = L - return 4; // 1/16 = XL - } - [MethodImpl(MethodImplOptions.NoOptimization | MethodImplOptions.NoInlining)] private static float GetHeightRatio(int heightScalar) { diff --git a/PKHeX.Core/PKM/PK3.cs b/PKHeX.Core/PKM/PK3.cs index b4c0b88ab..ff0f93d3d 100644 --- a/PKHeX.Core/PKM/PK3.cs +++ b/PKHeX.Core/PKM/PK3.cs @@ -6,7 +6,7 @@ namespace PKHeX.Core /// Generation 3 format. public sealed class PK3 : G3PKM { - private static readonly byte[] Unused = + private static readonly ushort[] Unused = { 0x2A, 0x2B }; @@ -16,7 +16,7 @@ public sealed class PK3 : G3PKM public override int Format => 3; public override PersonalInfo PersonalInfo => PersonalTable.RS[Species]; - public override IReadOnlyList ExtraBytes => Unused; + public override IReadOnlyList ExtraBytes => Unused; public override byte[] Data { get; } public PK3() => Data = new byte[PKX.SIZE_3PARTY]; @@ -213,7 +213,7 @@ public PK4 ConvertToPK4() Species = Species, TID = TID, SID = SID, - EXP = IsEgg ? Experience.GetEXP(5, Species, 0) : EXP, + EXP = IsEgg ? Experience.GetEXP(5, PersonalInfo.EXPGrowth) : EXP, Gender = PKX.GetGenderFromPID(Species, PID), AltForm = AltForm, // IsEgg = false, -- already false diff --git a/PKHeX.Core/PKM/PK4.cs b/PKHeX.Core/PKM/PK4.cs index dfd6ecc53..4bb66e1ee 100644 --- a/PKHeX.Core/PKM/PK4.cs +++ b/PKHeX.Core/PKM/PK4.cs @@ -7,12 +7,12 @@ namespace PKHeX.Core /// Generation 4 format. public sealed class PK4 : G4PKM { - private static readonly byte[] Unused = + private static readonly ushort[] Unused = { 0x42, 0x43, 0x5E, 0x63, 0x64, 0x65, 0x66, 0x67, 0x87 }; - public override IReadOnlyList ExtraBytes => Unused; + public override IReadOnlyList ExtraBytes => Unused; public override int SIZE_PARTY => PKX.SIZE_4PARTY; public override int SIZE_STORED => PKX.SIZE_4STORED; diff --git a/PKHeX.Core/PKM/PK5.cs b/PKHeX.Core/PKM/PK5.cs index a330b6fd5..6073dbfd0 100644 --- a/PKHeX.Core/PKM/PK5.cs +++ b/PKHeX.Core/PKM/PK5.cs @@ -7,7 +7,7 @@ namespace PKHeX.Core /// Generation 5 format. public sealed class PK5 : PKM, IRibbonSetEvent3, IRibbonSetEvent4, IRibbonSetUnique3, IRibbonSetUnique4, IRibbonSetCommon3, IRibbonSetCommon4, IContestStats { - private static readonly byte[] Unused = + private static readonly ushort[] Unused = { 0x87, // PokeStar Fame -- this is first to prevent 0x42 from being the first ExtraByte as this byte has GUI functionality 0x42, // Hidden Ability/NPokemon @@ -18,7 +18,7 @@ public sealed class PK5 : PKM, IRibbonSetEvent3, IRibbonSetEvent4, IRibbonSetUni 0x86, // unused }; - public override IReadOnlyList ExtraBytes => Unused; + public override IReadOnlyList ExtraBytes => Unused; public override int SIZE_PARTY => PKX.SIZE_5PARTY; public override int SIZE_STORED => PKX.SIZE_5STORED; diff --git a/PKHeX.Core/PKM/PK6.cs b/PKHeX.Core/PKM/PK6.cs index 7783cd798..80926b4be 100644 --- a/PKHeX.Core/PKM/PK6.cs +++ b/PKHeX.Core/PKM/PK6.cs @@ -6,13 +6,13 @@ namespace PKHeX.Core /// Generation 6 format. public sealed class PK6 : G6PKM, IRibbonSetEvent3, IRibbonSetEvent4, IRibbonSetCommon3, IRibbonSetCommon4, IRibbonSetCommon6, IContestStats, IGeoTrack, ISuperTrain { - private static readonly byte[] Unused = + private static readonly ushort[] Unused = { 0x36, 0x37, // Unused Ribbons 0x58, 0x59, 0x73, 0x90, 0x91, 0x9E, 0x9F, 0xA0, 0xA1, 0xA7, 0xAA, 0xAB, 0xAC, 0xAD, 0xC8, 0xC9, 0xD7, 0xE4, 0xE5, 0xE6, 0xE7 }; - public override IReadOnlyList ExtraBytes => Unused; + public override IReadOnlyList ExtraBytes => Unused; public override int Format => 6; public override PersonalInfo PersonalInfo => PersonalTable.AO.GetFormeEntry(Species, AltForm); @@ -194,8 +194,8 @@ public override uint PID public bool RibbonChampionRegional { get => (RIB4 & (1 << 2)) == 1 << 2; set => RIB4 = (byte)((RIB4 & ~(1 << 2)) | (value ? 1 << 2 : 0)); } public bool RibbonChampionNational { get => (RIB4 & (1 << 3)) == 1 << 3; set => RIB4 = (byte)((RIB4 & ~(1 << 3)) | (value ? 1 << 3 : 0)); } public bool RibbonChampionWorld { get => (RIB4 & (1 << 4)) == 1 << 4; set => RIB4 = (byte)((RIB4 & ~(1 << 4)) | (value ? 1 << 4 : 0)); } - public bool RIB4_5 { get => (RIB4 & (1 << 5)) == 1 << 5; set => RIB4 = (byte)((RIB4 & ~(1 << 5)) | (value ? 1 << 5 : 0)); } // Unused - public bool RIB4_6 { get => (RIB4 & (1 << 6)) == 1 << 6; set => RIB4 = (byte)((RIB4 & ~(1 << 6)) | (value ? 1 << 6 : 0)); } // Unused + public bool HasContestMemoryRibbon { get => (RIB4 & (1 << 5)) == 1 << 5; set => RIB4 = (byte)((RIB4 & ~(1 << 5)) | (value ? 1 << 5 : 0)); } + public bool HasBattleMemoryRibbon { get => (RIB4 & (1 << 6)) == 1 << 6; set => RIB4 = (byte)((RIB4 & ~(1 << 6)) | (value ? 1 << 6 : 0)); } public bool RibbonChampionG6Hoenn { get => (RIB4 & (1 << 7)) == 1 << 7; set => RIB4 = (byte)((RIB4 & ~(1 << 7)) | (value ? 1 << 7 : 0)); } public bool RibbonContestStar { get => (RIB5 & (1 << 0)) == 1 << 0; set => RIB5 = (byte)((RIB5 & ~(1 << 0)) | (value ? 1 << 0 : 0)); } public bool RibbonMasterCoolness { get => (RIB5 & (1 << 1)) == 1 << 1; set => RIB5 = (byte)((RIB5 & ~(1 << 1)) | (value ? 1 << 1 : 0)); } @@ -205,8 +205,8 @@ public override uint PID public bool RibbonMasterToughness { get => (RIB5 & (1 << 5)) == 1 << 5; set => RIB5 = (byte)((RIB5 & ~(1 << 5)) | (value ? 1 << 5 : 0)); } public bool RIB5_6 { get => (RIB5 & (1 << 6)) == 1 << 6; set => RIB5 = (byte)((RIB5 & ~(1 << 6)) | (value ? 1 << 6 : 0)); } // Unused public bool RIB5_7 { get => (RIB5 & (1 << 7)) == 1 << 7; set => RIB5 = (byte)((RIB5 & ~(1 << 7)) | (value ? 1 << 7 : 0)); } // Unused - public int RibbonCountMemoryContest { get => Data[0x38]; set => Data[0x38] = (byte)value; } - public int RibbonCountMemoryBattle { get => Data[0x39]; set => Data[0x39] = (byte)value; } + public int RibbonCountMemoryContest { get => Data[0x38]; set => HasContestMemoryRibbon = (Data[0x38] = (byte)value) != 0; } + public int RibbonCountMemoryBattle { get => Data[0x39]; set => HasBattleMemoryRibbon = (Data[0x39] = (byte)value) != 0; } private ushort DistByte { get => BitConverter.ToUInt16(Data, 0x3A); set => BitConverter.GetBytes(value).CopyTo(Data, 0x3A); } public bool DistSuperTrain1 { get => (DistByte & (1 << 0)) == 1 << 0; set => DistByte = (byte)((DistByte & ~(1 << 0)) | (value ? 1 << 0 : 0)); } public bool DistSuperTrain2 { get => (DistByte & (1 << 1)) == 1 << 1; set => DistByte = (byte)((DistByte & ~(1 << 1)) | (value ? 1 << 1 : 0)); } diff --git a/PKHeX.Core/PKM/PK7.cs b/PKHeX.Core/PKM/PK7.cs index 86b126f15..6cf0952ad 100644 --- a/PKHeX.Core/PKM/PK7.cs +++ b/PKHeX.Core/PKM/PK7.cs @@ -6,14 +6,14 @@ namespace PKHeX.Core /// Generation 7 format. public sealed class PK7 : G6PKM, IRibbonSetEvent3, IRibbonSetEvent4, IRibbonSetCommon3, IRibbonSetCommon4, IRibbonSetCommon6, IRibbonSetCommon7, IContestStats, IHyperTrain, IGeoTrack, ISuperTrain { - private static readonly byte[] Unused = + private static readonly ushort[] Unused = { 0x2A, // Old Marking Value (PelagoEventStatus) // 0x36, 0x37, // Unused Ribbons 0x58, 0x59, 0x73, 0x90, 0x91, 0x9E, 0x9F, 0xA0, 0xA1, 0xA7, 0xAA, 0xAB, 0xAC, 0xAD, 0xC8, 0xC9, 0xD7, 0xE4, 0xE5, 0xE6, 0xE7 }; - public override IReadOnlyList ExtraBytes => Unused; + public override IReadOnlyList ExtraBytes => Unused; public override int Format => 7; public override PersonalInfo PersonalInfo => PersonalTable.USUM.GetFormeEntry(Species, AltForm); @@ -196,8 +196,8 @@ public override uint PID public bool RibbonChampionRegional { get => (RIB4 & (1 << 2)) == 1 << 2; set => RIB4 = (byte)((RIB4 & ~(1 << 2)) | (value ? 1 << 2 : 0)); } public bool RibbonChampionNational { get => (RIB4 & (1 << 3)) == 1 << 3; set => RIB4 = (byte)((RIB4 & ~(1 << 3)) | (value ? 1 << 3 : 0)); } public bool RibbonChampionWorld { get => (RIB4 & (1 << 4)) == 1 << 4; set => RIB4 = (byte)((RIB4 & ~(1 << 4)) | (value ? 1 << 4 : 0)); } - public bool RIB4_5 { get => (RIB4 & (1 << 5)) == 1 << 5; set => RIB4 = (byte)((RIB4 & ~(1 << 5)) | (value ? 1 << 5 : 0)); } // Unused - public bool RIB4_6 { get => (RIB4 & (1 << 6)) == 1 << 6; set => RIB4 = (byte)((RIB4 & ~(1 << 6)) | (value ? 1 << 6 : 0)); } // Unused + public bool HasContestMemoryRibbon { get => (RIB4 & (1 << 5)) == 1 << 5; set => RIB4 = (byte)((RIB4 & ~(1 << 5)) | (value ? 1 << 5 : 0)); } + public bool HasBattleMemoryRibbon { get => (RIB4 & (1 << 6)) == 1 << 6; set => RIB4 = (byte)((RIB4 & ~(1 << 6)) | (value ? 1 << 6 : 0)); } public bool RibbonChampionG6Hoenn { get => (RIB4 & (1 << 7)) == 1 << 7; set => RIB4 = (byte)((RIB4 & ~(1 << 7)) | (value ? 1 << 7 : 0)); } public bool RibbonContestStar { get => (RIB5 & (1 << 0)) == 1 << 0; set => RIB5 = (byte)((RIB5 & ~(1 << 0)) | (value ? 1 << 0 : 0)); } public bool RibbonMasterCoolness { get => (RIB5 & (1 << 1)) == 1 << 1; set => RIB5 = (byte)((RIB5 & ~(1 << 1)) | (value ? 1 << 1 : 0)); } @@ -215,8 +215,8 @@ public override uint PID public bool RIB6_5 { get => (RIB6 & (1 << 5)) == 1 << 5; set => RIB6 = (byte)((RIB6 & ~(1 << 5)) | (value ? 1 << 5 : 0)); } // Unused public bool RIB6_6 { get => (RIB6 & (1 << 6)) == 1 << 6; set => RIB6 = (byte)((RIB6 & ~(1 << 6)) | (value ? 1 << 6 : 0)); } // Unused public bool RIB6_7 { get => (RIB6 & (1 << 7)) == 1 << 7; set => RIB6 = (byte)((RIB6 & ~(1 << 7)) | (value ? 1 << 7 : 0)); } // Unused - public int RibbonCountMemoryContest { get => Data[0x38]; set => Data[0x38] = (byte)value; } - public int RibbonCountMemoryBattle { get => Data[0x39]; set => Data[0x39] = (byte)value; } + public int RibbonCountMemoryContest { get => Data[0x38]; set => HasContestMemoryRibbon = (Data[0x38] = (byte)value) != 0; } + public int RibbonCountMemoryBattle { get => Data[0x39]; set => HasBattleMemoryRibbon = (Data[0x39] = (byte)value) != 0; } private ushort DistByte { get => BitConverter.ToUInt16(Data, 0x3A); set => BitConverter.GetBytes(value).CopyTo(Data, 0x3A); } public bool DistSuperTrain1 { get => (DistByte & (1 << 0)) == 1 << 0; set => DistByte = (byte)((DistByte & ~(1 << 0)) | (value ? 1 << 0 : 0)); } public bool DistSuperTrain2 { get => (DistByte & (1 << 1)) == 1 << 1; set => DistByte = (byte)((DistByte & ~(1 << 1)) | (value ? 1 << 1 : 0)); } diff --git a/PKHeX.Core/PKM/PK8.cs b/PKHeX.Core/PKM/PK8.cs index 0da913a8a..8cbe88370 100644 --- a/PKHeX.Core/PKM/PK8.cs +++ b/PKHeX.Core/PKM/PK8.cs @@ -4,18 +4,49 @@ namespace PKHeX.Core { /// Generation 8 format. - public sealed class PK8 : G6PKM, IRibbonSetEvent3, IRibbonSetEvent4, IRibbonSetCommon3, IRibbonSetCommon4, IRibbonSetCommon6, IRibbonSetCommon7, IContestStats, IHyperTrain, IGeoTrack + public sealed class PK8 : PKM, + IRibbonSetEvent3, IRibbonSetEvent4, IRibbonSetCommon3, IRibbonSetCommon4, IRibbonSetCommon6, IRibbonSetCommon7, IRibbonSetCommon8, + IContestStats, IHyperTrain, IScaledSize, IGigantamax, IFavorite, IDynamaxLevel, IRibbonIndex, IHandlerLanguage { - private static readonly byte[] Unused = + private static readonly ushort[] Unused = { + // Alignment bytes + 0x17, 0x1A, 0x1B, 0x23, 0x33, 0x3E, 0x3F, + 0xC5, 0x115, 0x11F, }; - public override IReadOnlyList ExtraBytes => Unused; + public override IReadOnlyList ExtraBytes => Unused; public override int Format => 8; - public override PersonalInfo PersonalInfo => PersonalTable.USUM.GetFormeEntry(Species, AltForm); + public override PersonalInfo PersonalInfo => PersonalTable.SWSH.GetFormeEntry(Species, AltForm); public override byte[] Data { get; } - public PK8() => Data = new byte[PKX.SIZE_8PARTY]; + + public PK8() + { + Data = new byte[PKX.SIZE_8PARTY]; + AffixedRibbon = -1; // 00 would make it show Kalos Champion :) + } + + protected override ushort CalculateChecksum() + { + ushort chk = 0; + for (int i = 8; i < PKX.SIZE_8STORED; i += 2) // don't use SIZE_STORED property; pb7 overrides stored size + chk += BitConverter.ToUInt16(Data, i); + return chk; + } + + // Simple Generated Attributes + public override int CurrentFriendship + { + get => CurrentHandler == 0 ? OT_Friendship : HT_Friendship; + set { if (CurrentHandler == 0) OT_Friendship = value; else HT_Friendship = value; } + } + + public int OppositeFriendship + { + get => CurrentHandler == 1 ? OT_Friendship : HT_Friendship; + set { if (CurrentHandler == 1) OT_Friendship = value; else HT_Friendship = value; } + } public PK8(byte[] data) { @@ -30,280 +61,354 @@ public PK8(byte[] data) private string GetString(int Offset, int Count) => StringConverter.GetString7(Data, Offset, Count); private byte[] SetString(string value, int maxLength, bool chinese = false) => StringConverter.SetString7(value, maxLength, Language, chinese: chinese); + public override int SIZE_PARTY => PKX.SIZE_8PARTY; + public override int SIZE_STORED => PKX.SIZE_8STORED; + + // Trash Bytes + public override byte[] Nickname_Trash { get => GetData(0x58, 24); set { if (value?.Length == 24) value.CopyTo(Data, 0x58); } } + public override byte[] HT_Trash { get => GetData(0xA8, 24); set { if (value?.Length == 24) value.CopyTo(Data, 0xA8); } } + public override byte[] OT_Trash { get => GetData(0xF8, 24); set { if (value?.Length == 24) value.CopyTo(Data, 0xF8); } } + public override bool WasLink => Met_Location == Locations.LinkGift6; + public override bool WasEvent => Locations.IsEventLocation5(Met_Location) || FatefulEncounter; + public override bool WasEventEgg => GenNumber < 5 ? base.WasEventEgg : (Locations.IsEventLocation5(Egg_Location) || (FatefulEncounter && Egg_Location == Locations.LinkTrade6)) && Met_Level == 1; + + // Maximums + public override int MaxIV => 31; + public override int MaxEV => 252; + public override int OTLength => 12; + public override int NickLength => 12; + + public override int PSV => (int)((PID >> 16 ^ (PID & 0xFFFF)) >> 4); + public override int TSV => (TID ^ SID) >> 4; + public override bool IsUntraded => Data[0x78] == 0 && Data[0x78 + 1] == 0 && Format == GenNumber; // immediately terminated HT_Name data (\0) + + // Complex Generated Attributes + public override int Characteristic + { + get + { + int pm6 = (int)(EncryptionConstant % 6); + int maxIV = MaximumIV; + int pm6stat = 0; + for (int i = 0; i < 6; i++) + { + pm6stat = (pm6 + i) % 6; + if (GetIV(pm6stat) == maxIV) + break; + } + return (pm6stat * 5) + (maxIV % 5); + } + } + + // Methods + protected override byte[] Encrypt() + { + RefreshChecksum(); + return PKX.EncryptArray8(Data); + } + + public void FixRelearn() + { + while (true) + { + if (RelearnMove4 != 0 && RelearnMove3 == 0) + { + RelearnMove3 = RelearnMove4; + RelearnMove4 = 0; + } + if (RelearnMove3 != 0 && RelearnMove2 == 0) + { + RelearnMove2 = RelearnMove3; + RelearnMove3 = 0; + continue; + } + if (RelearnMove2 != 0 && RelearnMove1 == 0) + { + RelearnMove1 = RelearnMove2; + RelearnMove2 = 0; + continue; + } + break; + } + } + + public void Trade(ITrainerInfo tr, int Day = 1, int Month = 1, int Year = 2015) + { + if (IsEgg) + { + // Eggs do not have any modifications done if they are traded + // Apply link trade data, only if it left the OT (ignore if dumped & imported, or cloned, etc) + if ((tr.OT != OT_Name) || (tr.TID != TID) || (tr.SID != SID) || (tr.Gender != OT_Gender)) + SetLinkTradeEgg(Day, Month, Year, Locations.LinkTrade6); + return; + } + + // Process to the HT if the OT of the Pokémon does not match the SAV's OT info. + if (!TradeOT(tr)) + TradeHT(tr); + } + + public override uint EncryptionConstant { get => BitConverter.ToUInt32(Data, 0x00); set => BitConverter.GetBytes(value).CopyTo(Data, 0x00); } + public override ushort Sanity { get => BitConverter.ToUInt16(Data, 0x04); set => BitConverter.GetBytes(value).CopyTo(Data, 0x04); } + public override ushort Checksum { get => BitConverter.ToUInt16(Data, 0x06); set => BitConverter.GetBytes(value).CopyTo(Data, 0x06); } + // Structure #region Block A - public override uint EncryptionConstant - { - get => BitConverter.ToUInt32(Data, 0x00); - set => BitConverter.GetBytes(value).CopyTo(Data, 0x00); - } + public override int Species { get => BitConverter.ToUInt16(Data, 0x08); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x08); } + public override int HeldItem { get => BitConverter.ToUInt16(Data, 0x0A); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x0A); } + public override int TID { get => BitConverter.ToUInt16(Data, 0x0C); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x0C); } + public override int SID { get => BitConverter.ToUInt16(Data, 0x0E); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x0E); } + public override uint EXP { get => BitConverter.ToUInt32(Data, 0x10); set => BitConverter.GetBytes(value).CopyTo(Data, 0x10); } + public override int Ability { get => BitConverter.ToUInt16(Data, 0x14); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x14); } + public override int AbilityNumber { get => Data[0x16] & 7; set => Data[0x16] = (byte)((Data[0x16] & ~7) | (value & 7)); } + public bool Favorite { get => (Data[0x16] & 8) != 0; set => Data[0x16] = (byte)((Data[0x16] & ~8) | ((value ? 1 : 0) << 3)); } // unused, was in LGPE but not in SWSH + public bool CanGigantamax { get => (Data[0x16] & 16) != 0; set => Data[0x16] = (byte)((Data[0x16] & ~16) | (value ? 16 : 0)); } + // 0x17 alignment unused + public override int MarkValue { get => BitConverter.ToUInt16(Data, 0x18); protected set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x18); } + // 0x1A alignment unused + // 0x1B alignment unused + public override uint PID { get => BitConverter.ToUInt32(Data, 0x1C); set => BitConverter.GetBytes(value).CopyTo(Data, 0x1C); } + public override int Nature { get => Data[0x20]; set => Data[0x20] = (byte)value; } + public override int StatNature { get => Data[0x21]; set => Data[0x21] = (byte)value; } + public override bool FatefulEncounter { get => (Data[0x22] & 1) == 1; set => Data[0x22] = (byte)((Data[0x22] & ~0x01) | (value ? 1 : 0)); } + public bool Flag2 { get => (Data[0x22] & 2) == 2; set => Data[0x22] = (byte)((Data[0x22] & ~0x02) | (value ? 2 : 0)); } + public override int Gender { get => (Data[0x22] >> 2) & 0x3; set => Data[0x22] = (byte)((Data[0x22] & 0xF3) | (value << 2)); } + // 0x23 alignment unused - public override ushort Sanity - { - get => BitConverter.ToUInt16(Data, 0x04); - set => BitConverter.GetBytes(value).CopyTo(Data, 0x04); - } - - public override ushort Checksum - { - get => BitConverter.ToUInt16(Data, 0x06); - set => BitConverter.GetBytes(value).CopyTo(Data, 0x06); - } - - public override int Species - { - get => BitConverter.ToUInt16(Data, 0x08); - set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x08); - } - - public override int HeldItem - { - get => BitConverter.ToUInt16(Data, 0x0A); - set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x0A); - } - - public override int TID - { - get => BitConverter.ToUInt16(Data, 0x0C); - set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x0C); - } - - public override int SID - { - get => BitConverter.ToUInt16(Data, 0x0E); - set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x0E); - } - - public override uint EXP - { - get => BitConverter.ToUInt32(Data, 0x10); - set => BitConverter.GetBytes(value).CopyTo(Data, 0x10); - } - - public override int Ability { get => Data[0x14]; set => Data[0x14] = (byte)value; } - public override int AbilityNumber { get => Data[0x15] & 7; set => Data[0x15] = (byte)((Data[0x15] & ~7) | (value & 7)); } - public override int MarkValue { get => BitConverter.ToUInt16(Data, 0x16); protected set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x16); } - - public override uint PID - { - get => BitConverter.ToUInt32(Data, 0x18); - set => BitConverter.GetBytes(value).CopyTo(Data, 0x18); - } - - public override int Nature { get => Data[0x1C]; set => Data[0x1C] = (byte)value; } - public override bool FatefulEncounter { get => (Data[0x1D] & 1) == 1; set => Data[0x1D] = (byte)((Data[0x1D] & ~0x01) | (value ? 1 : 0)); } - public override int Gender { get => (Data[0x1D] >> 1) & 0x3; set => Data[0x1D] = (byte)((Data[0x1D] & ~0x06) | (value << 1)); } - public override int AltForm { get => Data[0x1D] >> 3; set => Data[0x1D] = (byte)((Data[0x1D] & 0x07) | (value << 3)); } - public override int EV_HP { get => Data[0x1E]; set => Data[0x1E] = (byte)value; } - public override int EV_ATK { get => Data[0x1F]; set => Data[0x1F] = (byte)value; } - public override int EV_DEF { get => Data[0x20]; set => Data[0x20] = (byte)value; } - public override int EV_SPE { get => Data[0x21]; set => Data[0x21] = (byte)value; } - public override int EV_SPA { get => Data[0x22]; set => Data[0x22] = (byte)value; } - public override int EV_SPD { get => Data[0x23]; set => Data[0x23] = (byte)value; } - public int CNT_Cool { get => Data[0x24]; set => Data[0x24] = (byte)value; } - public int CNT_Beauty { get => Data[0x25]; set => Data[0x25] = (byte)value; } - public int CNT_Cute { get => Data[0x26]; set => Data[0x26] = (byte)value; } - public int CNT_Smart { get => Data[0x27]; set => Data[0x27] = (byte)value; } - public int CNT_Tough { get => Data[0x28]; set => Data[0x28] = (byte)value; } - public int CNT_Sheen { get => Data[0x29]; set => Data[0x29] = (byte)value; } - public byte ResortEventStatus { get => Data[0x2A]; set => Data[0x2A] = value; } - private byte PKRS { get => Data[0x2B]; set => Data[0x2B] = value; } + public override int AltForm { get => BitConverter.ToUInt16(Data, 0x24); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x24); } + public override int EV_HP { get => Data[0x26]; set => Data[0x26] = (byte)value; } + public override int EV_ATK { get => Data[0x27]; set => Data[0x27] = (byte)value; } + public override int EV_DEF { get => Data[0x28]; set => Data[0x28] = (byte)value; } + public override int EV_SPE { get => Data[0x29]; set => Data[0x29] = (byte)value; } + public override int EV_SPA { get => Data[0x2A]; set => Data[0x2A] = (byte)value; } + public override int EV_SPD { get => Data[0x2B]; set => Data[0x2B] = (byte)value; } + public int CNT_Cool { get => Data[0x2C]; set => Data[0x2C] = (byte)value; } + public int CNT_Beauty { get => Data[0x2D]; set => Data[0x2D] = (byte)value; } + public int CNT_Cute { get => Data[0x2E]; set => Data[0x2E] = (byte)value; } + public int CNT_Smart { get => Data[0x2F]; set => Data[0x2F] = (byte)value; } + public int CNT_Tough { get => Data[0x30]; set => Data[0x30] = (byte)value; } + public int CNT_Sheen { get => Data[0x31]; set => Data[0x31] = (byte)value; } + private byte PKRS { get => Data[0x32]; set => Data[0x32] = value; } public override int PKRS_Days { get => PKRS & 0xF; set => PKRS = (byte)((PKRS & ~0xF) | value); } public override int PKRS_Strain { get => PKRS >> 4; set => PKRS = (byte)((PKRS & 0xF) | value << 4); } - private byte ST1 { get => Data[0x2C]; set => Data[0x2C] = value; } - public bool Unused0 { get => (ST1 & (1 << 0)) == 1 << 0; set => ST1 = (byte)((ST1 & ~(1 << 0)) | (value ? 1 << 0 : 0)); } - public bool Unused1 { get => (ST1 & (1 << 1)) == 1 << 1; set => ST1 = (byte)((ST1 & ~(1 << 1)) | (value ? 1 << 1 : 0)); } - public bool SuperTrain1_SPA { get => (ST1 & (1 << 2)) == 1 << 2; set => ST1 = (byte)((ST1 & ~(1 << 2)) | (value ? 1 << 2 : 0)); } - public bool SuperTrain1_HP { get => (ST1 & (1 << 3)) == 1 << 3; set => ST1 = (byte)((ST1 & ~(1 << 3)) | (value ? 1 << 3 : 0)); } - public bool SuperTrain1_ATK { get => (ST1 & (1 << 4)) == 1 << 4; set => ST1 = (byte)((ST1 & ~(1 << 4)) | (value ? 1 << 4 : 0)); } - public bool SuperTrain1_SPD { get => (ST1 & (1 << 5)) == 1 << 5; set => ST1 = (byte)((ST1 & ~(1 << 5)) | (value ? 1 << 5 : 0)); } - public bool SuperTrain1_SPE { get => (ST1 & (1 << 6)) == 1 << 6; set => ST1 = (byte)((ST1 & ~(1 << 6)) | (value ? 1 << 6 : 0)); } - public bool SuperTrain1_DEF { get => (ST1 & (1 << 7)) == 1 << 7; set => ST1 = (byte)((ST1 & ~(1 << 7)) | (value ? 1 << 7 : 0)); } - private byte ST2 { get => Data[0x2D]; set => Data[0x2D] = value; } - public bool SuperTrain2_SPA { get => (ST2 & (1 << 0)) == 1 << 0; set => ST2 = (byte)((ST2 & ~(1 << 0)) | (value ? 1 << 0 : 0)); } - public bool SuperTrain2_HP { get => (ST2 & (1 << 1)) == 1 << 1; set => ST2 = (byte)((ST2 & ~(1 << 1)) | (value ? 1 << 1 : 0)); } - public bool SuperTrain2_ATK { get => (ST2 & (1 << 2)) == 1 << 2; set => ST2 = (byte)((ST2 & ~(1 << 2)) | (value ? 1 << 2 : 0)); } - public bool SuperTrain2_SPD { get => (ST2 & (1 << 3)) == 1 << 3; set => ST2 = (byte)((ST2 & ~(1 << 3)) | (value ? 1 << 3 : 0)); } - public bool SuperTrain2_SPE { get => (ST2 & (1 << 4)) == 1 << 4; set => ST2 = (byte)((ST2 & ~(1 << 4)) | (value ? 1 << 4 : 0)); } - public bool SuperTrain2_DEF { get => (ST2 & (1 << 5)) == 1 << 5; set => ST2 = (byte)((ST2 & ~(1 << 5)) | (value ? 1 << 5 : 0)); } - public bool SuperTrain3_SPA { get => (ST2 & (1 << 6)) == 1 << 6; set => ST2 = (byte)((ST2 & ~(1 << 6)) | (value ? 1 << 6 : 0)); } - public bool SuperTrain3_HP { get => (ST2 & (1 << 7)) == 1 << 7; set => ST2 = (byte)((ST2 & ~(1 << 7)) | (value ? 1 << 7 : 0)); } - private byte ST3 { get => Data[0x2E]; set => Data[0x2E] = value; } - public bool SuperTrain3_ATK { get => (ST3 & (1 << 0)) == 1 << 0; set => ST3 = (byte)((ST3 & ~(1 << 0)) | (value ? 1 << 0 : 0)); } - public bool SuperTrain3_SPD { get => (ST3 & (1 << 1)) == 1 << 1; set => ST3 = (byte)((ST3 & ~(1 << 1)) | (value ? 1 << 1 : 0)); } - public bool SuperTrain3_SPE { get => (ST3 & (1 << 2)) == 1 << 2; set => ST3 = (byte)((ST3 & ~(1 << 2)) | (value ? 1 << 2 : 0)); } - public bool SuperTrain3_DEF { get => (ST3 & (1 << 3)) == 1 << 3; set => ST3 = (byte)((ST3 & ~(1 << 3)) | (value ? 1 << 3 : 0)); } - public bool SuperTrain4_1 { get => (ST3 & (1 << 4)) == 1 << 4; set => ST3 = (byte)((ST3 & ~(1 << 4)) | (value ? 1 << 4 : 0)); } - public bool SuperTrain5_1 { get => (ST3 & (1 << 5)) == 1 << 5; set => ST3 = (byte)((ST3 & ~(1 << 5)) | (value ? 1 << 5 : 0)); } - public bool SuperTrain5_2 { get => (ST3 & (1 << 6)) == 1 << 6; set => ST3 = (byte)((ST3 & ~(1 << 6)) | (value ? 1 << 6 : 0)); } - public bool SuperTrain5_3 { get => (ST3 & (1 << 7)) == 1 << 7; set => ST3 = (byte)((ST3 & ~(1 << 7)) | (value ? 1 << 7 : 0)); } - private byte ST4 { get => Data[0x2F]; set => Data[0x2F] = value; } - public bool SuperTrain5_4 { get => (ST4 & (1 << 0)) == 1 << 0; set => ST4 = (byte)((ST4 & ~(1 << 0)) | (value ? 1 << 0 : 0)); } - public bool SuperTrain6_1 { get => (ST4 & (1 << 1)) == 1 << 1; set => ST4 = (byte)((ST4 & ~(1 << 1)) | (value ? 1 << 1 : 0)); } - public bool SuperTrain6_2 { get => (ST4 & (1 << 2)) == 1 << 2; set => ST4 = (byte)((ST4 & ~(1 << 2)) | (value ? 1 << 2 : 0)); } - public bool SuperTrain6_3 { get => (ST4 & (1 << 3)) == 1 << 3; set => ST4 = (byte)((ST4 & ~(1 << 3)) | (value ? 1 << 3 : 0)); } - public bool SuperTrain7_1 { get => (ST4 & (1 << 4)) == 1 << 4; set => ST4 = (byte)((ST4 & ~(1 << 4)) | (value ? 1 << 4 : 0)); } - public bool SuperTrain7_2 { get => (ST4 & (1 << 5)) == 1 << 5; set => ST4 = (byte)((ST4 & ~(1 << 5)) | (value ? 1 << 5 : 0)); } - public bool SuperTrain7_3 { get => (ST4 & (1 << 6)) == 1 << 6; set => ST4 = (byte)((ST4 & ~(1 << 6)) | (value ? 1 << 6 : 0)); } - public bool SuperTrain8_1 { get => (ST4 & (1 << 7)) == 1 << 7; set => ST4 = (byte)((ST4 & ~(1 << 7)) | (value ? 1 << 7 : 0)); } - public uint SuperTrainBitFlags { get => BitConverter.ToUInt32(Data, 0x2C); set => BitConverter.GetBytes(value).CopyTo(Data); } - private byte RIB0 { get => Data[0x30]; set => Data[0x30] = value; } // Ribbons are read as uints, but let's keep them per byte. - private byte RIB1 { get => Data[0x31]; set => Data[0x31] = value; } - private byte RIB2 { get => Data[0x32]; set => Data[0x32] = value; } - private byte RIB3 { get => Data[0x33]; set => Data[0x33] = value; } - private byte RIB4 { get => Data[0x34]; set => Data[0x34] = value; } - private byte RIB5 { get => Data[0x35]; set => Data[0x35] = value; } - private byte RIB6 { get => Data[0x36]; set => Data[0x36] = value; } - //private byte RIB7 { get => Data[0x37]; set => Data[0x37] = value; } // Unused - public bool RibbonChampionKalos { get => (RIB0 & (1 << 0)) == 1 << 0; set => RIB0 = (byte)((RIB0 & ~(1 << 0)) | (value ? 1 << 0 : 0)); } - public bool RibbonChampionG3Hoenn { get => (RIB0 & (1 << 1)) == 1 << 1; set => RIB0 = (byte)((RIB0 & ~(1 << 1)) | (value ? 1 << 1 : 0)); } - public bool RibbonChampionSinnoh { get => (RIB0 & (1 << 2)) == 1 << 2; set => RIB0 = (byte)((RIB0 & ~(1 << 2)) | (value ? 1 << 2 : 0)); } - public bool RibbonBestFriends { get => (RIB0 & (1 << 3)) == 1 << 3; set => RIB0 = (byte)((RIB0 & ~(1 << 3)) | (value ? 1 << 3 : 0)); } - public bool RibbonTraining { get => (RIB0 & (1 << 4)) == 1 << 4; set => RIB0 = (byte)((RIB0 & ~(1 << 4)) | (value ? 1 << 4 : 0)); } - public bool RibbonBattlerSkillful { get => (RIB0 & (1 << 5)) == 1 << 5; set => RIB0 = (byte)((RIB0 & ~(1 << 5)) | (value ? 1 << 5 : 0)); } - public bool RibbonBattlerExpert { get => (RIB0 & (1 << 6)) == 1 << 6; set => RIB0 = (byte)((RIB0 & ~(1 << 6)) | (value ? 1 << 6 : 0)); } - public bool RibbonEffort { get => (RIB0 & (1 << 7)) == 1 << 7; set => RIB0 = (byte)((RIB0 & ~(1 << 7)) | (value ? 1 << 7 : 0)); } - public bool RibbonAlert { get => (RIB1 & (1 << 0)) == 1 << 0; set => RIB1 = (byte)((RIB1 & ~(1 << 0)) | (value ? 1 << 0 : 0)); } - public bool RibbonShock { get => (RIB1 & (1 << 1)) == 1 << 1; set => RIB1 = (byte)((RIB1 & ~(1 << 1)) | (value ? 1 << 1 : 0)); } - public bool RibbonDowncast { get => (RIB1 & (1 << 2)) == 1 << 2; set => RIB1 = (byte)((RIB1 & ~(1 << 2)) | (value ? 1 << 2 : 0)); } - public bool RibbonCareless { get => (RIB1 & (1 << 3)) == 1 << 3; set => RIB1 = (byte)((RIB1 & ~(1 << 3)) | (value ? 1 << 3 : 0)); } - public bool RibbonRelax { get => (RIB1 & (1 << 4)) == 1 << 4; set => RIB1 = (byte)((RIB1 & ~(1 << 4)) | (value ? 1 << 4 : 0)); } - public bool RibbonSnooze { get => (RIB1 & (1 << 5)) == 1 << 5; set => RIB1 = (byte)((RIB1 & ~(1 << 5)) | (value ? 1 << 5 : 0)); } - public bool RibbonSmile { get => (RIB1 & (1 << 6)) == 1 << 6; set => RIB1 = (byte)((RIB1 & ~(1 << 6)) | (value ? 1 << 6 : 0)); } - public bool RibbonGorgeous { get => (RIB1 & (1 << 7)) == 1 << 7; set => RIB1 = (byte)((RIB1 & ~(1 << 7)) | (value ? 1 << 7 : 0)); } - public bool RibbonRoyal { get => (RIB2 & (1 << 0)) == 1 << 0; set => RIB2 = (byte)((RIB2 & ~(1 << 0)) | (value ? 1 << 0 : 0)); } - public bool RibbonGorgeousRoyal { get => (RIB2 & (1 << 1)) == 1 << 1; set => RIB2 = (byte)((RIB2 & ~(1 << 1)) | (value ? 1 << 1 : 0)); } - public bool RibbonArtist { get => (RIB2 & (1 << 2)) == 1 << 2; set => RIB2 = (byte)((RIB2 & ~(1 << 2)) | (value ? 1 << 2 : 0)); } - public bool RibbonFootprint { get => (RIB2 & (1 << 3)) == 1 << 3; set => RIB2 = (byte)((RIB2 & ~(1 << 3)) | (value ? 1 << 3 : 0)); } - public bool RibbonRecord { get => (RIB2 & (1 << 4)) == 1 << 4; set => RIB2 = (byte)((RIB2 & ~(1 << 4)) | (value ? 1 << 4 : 0)); } - public bool RibbonLegend { get => (RIB2 & (1 << 5)) == 1 << 5; set => RIB2 = (byte)((RIB2 & ~(1 << 5)) | (value ? 1 << 5 : 0)); } - public bool RibbonCountry { get => (RIB2 & (1 << 6)) == 1 << 6; set => RIB2 = (byte)((RIB2 & ~(1 << 6)) | (value ? 1 << 6 : 0)); } - public bool RibbonNational { get => (RIB2 & (1 << 7)) == 1 << 7; set => RIB2 = (byte)((RIB2 & ~(1 << 7)) | (value ? 1 << 7 : 0)); } - public bool RibbonEarth { get => (RIB3 & (1 << 0)) == 1 << 0; set => RIB3 = (byte)((RIB3 & ~(1 << 0)) | (value ? 1 << 0 : 0)); } - public bool RibbonWorld { get => (RIB3 & (1 << 1)) == 1 << 1; set => RIB3 = (byte)((RIB3 & ~(1 << 1)) | (value ? 1 << 1 : 0)); } - public bool RibbonClassic { get => (RIB3 & (1 << 2)) == 1 << 2; set => RIB3 = (byte)((RIB3 & ~(1 << 2)) | (value ? 1 << 2 : 0)); } - public bool RibbonPremier { get => (RIB3 & (1 << 3)) == 1 << 3; set => RIB3 = (byte)((RIB3 & ~(1 << 3)) | (value ? 1 << 3 : 0)); } - public bool RibbonEvent { get => (RIB3 & (1 << 4)) == 1 << 4; set => RIB3 = (byte)((RIB3 & ~(1 << 4)) | (value ? 1 << 4 : 0)); } - public bool RibbonBirthday { get => (RIB3 & (1 << 5)) == 1 << 5; set => RIB3 = (byte)((RIB3 & ~(1 << 5)) | (value ? 1 << 5 : 0)); } - public bool RibbonSpecial { get => (RIB3 & (1 << 6)) == 1 << 6; set => RIB3 = (byte)((RIB3 & ~(1 << 6)) | (value ? 1 << 6 : 0)); } - public bool RibbonSouvenir { get => (RIB3 & (1 << 7)) == 1 << 7; set => RIB3 = (byte)((RIB3 & ~(1 << 7)) | (value ? 1 << 7 : 0)); } - public bool RibbonWishing { get => (RIB4 & (1 << 0)) == 1 << 0; set => RIB4 = (byte)((RIB4 & ~(1 << 0)) | (value ? 1 << 0 : 0)); } - public bool RibbonChampionBattle { get => (RIB4 & (1 << 1)) == 1 << 1; set => RIB4 = (byte)((RIB4 & ~(1 << 1)) | (value ? 1 << 1 : 0)); } - public bool RibbonChampionRegional { get => (RIB4 & (1 << 2)) == 1 << 2; set => RIB4 = (byte)((RIB4 & ~(1 << 2)) | (value ? 1 << 2 : 0)); } - public bool RibbonChampionNational { get => (RIB4 & (1 << 3)) == 1 << 3; set => RIB4 = (byte)((RIB4 & ~(1 << 3)) | (value ? 1 << 3 : 0)); } - public bool RibbonChampionWorld { get => (RIB4 & (1 << 4)) == 1 << 4; set => RIB4 = (byte)((RIB4 & ~(1 << 4)) | (value ? 1 << 4 : 0)); } - public bool RIB4_5 { get => (RIB4 & (1 << 5)) == 1 << 5; set => RIB4 = (byte)((RIB4 & ~(1 << 5)) | (value ? 1 << 5 : 0)); } // Unused - public bool RIB4_6 { get => (RIB4 & (1 << 6)) == 1 << 6; set => RIB4 = (byte)((RIB4 & ~(1 << 6)) | (value ? 1 << 6 : 0)); } // Unused - public bool RibbonChampionG6Hoenn { get => (RIB4 & (1 << 7)) == 1 << 7; set => RIB4 = (byte)((RIB4 & ~(1 << 7)) | (value ? 1 << 7 : 0)); } - public bool RibbonContestStar { get => (RIB5 & (1 << 0)) == 1 << 0; set => RIB5 = (byte)((RIB5 & ~(1 << 0)) | (value ? 1 << 0 : 0)); } - public bool RibbonMasterCoolness { get => (RIB5 & (1 << 1)) == 1 << 1; set => RIB5 = (byte)((RIB5 & ~(1 << 1)) | (value ? 1 << 1 : 0)); } - public bool RibbonMasterBeauty { get => (RIB5 & (1 << 2)) == 1 << 2; set => RIB5 = (byte)((RIB5 & ~(1 << 2)) | (value ? 1 << 2 : 0)); } - public bool RibbonMasterCuteness { get => (RIB5 & (1 << 3)) == 1 << 3; set => RIB5 = (byte)((RIB5 & ~(1 << 3)) | (value ? 1 << 3 : 0)); } - public bool RibbonMasterCleverness { get => (RIB5 & (1 << 4)) == 1 << 4; set => RIB5 = (byte)((RIB5 & ~(1 << 4)) | (value ? 1 << 4 : 0)); } - public bool RibbonMasterToughness { get => (RIB5 & (1 << 5)) == 1 << 5; set => RIB5 = (byte)((RIB5 & ~(1 << 5)) | (value ? 1 << 5 : 0)); } - public bool RibbonChampionAlola { get => (RIB5 & (1 << 6)) == 1 << 6; set => RIB5 = (byte)((RIB5 & ~(1 << 6)) | (value ? 1 << 6 : 0)); } - public bool RibbonBattleRoyale { get => (RIB5 & (1 << 7)) == 1 << 7; set => RIB5 = (byte)((RIB5 & ~(1 << 7)) | (value ? 1 << 7 : 0)); } - public bool RibbonBattleTreeGreat { get => (RIB6 & (1 << 0)) == 1 << 0; set => RIB6 = (byte)((RIB6 & ~(1 << 0)) | (value ? 1 << 0 : 0)); } - public bool RibbonBattleTreeMaster { get => (RIB6 & (1 << 1)) == 1 << 1; set => RIB6 = (byte)((RIB6 & ~(1 << 1)) | (value ? 1 << 1 : 0)); } - public bool RIB6_2 { get => (RIB6 & (1 << 2)) == 1 << 2; set => RIB6 = (byte)((RIB6 & ~(1 << 2)) | (value ? 1 << 2 : 0)); } // Unused - public bool RIB6_3 { get => (RIB6 & (1 << 3)) == 1 << 3; set => RIB6 = (byte)((RIB6 & ~(1 << 3)) | (value ? 1 << 3 : 0)); } // Unused - public bool RIB6_4 { get => (RIB6 & (1 << 4)) == 1 << 4; set => RIB6 = (byte)((RIB6 & ~(1 << 4)) | (value ? 1 << 4 : 0)); } // Unused - public bool RIB6_5 { get => (RIB6 & (1 << 5)) == 1 << 5; set => RIB6 = (byte)((RIB6 & ~(1 << 5)) | (value ? 1 << 5 : 0)); } // Unused - public bool RIB6_6 { get => (RIB6 & (1 << 6)) == 1 << 6; set => RIB6 = (byte)((RIB6 & ~(1 << 6)) | (value ? 1 << 6 : 0)); } // Unused - public bool RIB6_7 { get => (RIB6 & (1 << 7)) == 1 << 7; set => RIB6 = (byte)((RIB6 & ~(1 << 7)) | (value ? 1 << 7 : 0)); } // Unused - public int RibbonCountMemoryContest { get => Data[0x38]; set => Data[0x38] = (byte)value; } - public int RibbonCountMemoryBattle { get => Data[0x39]; set => Data[0x39] = (byte)value; } - private ushort DistByte { get => BitConverter.ToUInt16(Data, 0x3A); set => BitConverter.GetBytes(value).CopyTo(Data, 0x3A); } - public bool DistSuperTrain1 { get => (DistByte & (1 << 0)) == 1 << 0; set => DistByte = (byte)((DistByte & ~(1 << 0)) | (value ? 1 << 0 : 0)); } - public bool DistSuperTrain2 { get => (DistByte & (1 << 1)) == 1 << 1; set => DistByte = (byte)((DistByte & ~(1 << 1)) | (value ? 1 << 1 : 0)); } - public bool DistSuperTrain3 { get => (DistByte & (1 << 2)) == 1 << 2; set => DistByte = (byte)((DistByte & ~(1 << 2)) | (value ? 1 << 2 : 0)); } - public bool DistSuperTrain4 { get => (DistByte & (1 << 3)) == 1 << 3; set => DistByte = (byte)((DistByte & ~(1 << 3)) | (value ? 1 << 3 : 0)); } - public bool DistSuperTrain5 { get => (DistByte & (1 << 4)) == 1 << 4; set => DistByte = (byte)((DistByte & ~(1 << 4)) | (value ? 1 << 4 : 0)); } - public bool DistSuperTrain6 { get => (DistByte & (1 << 5)) == 1 << 5; set => DistByte = (byte)((DistByte & ~(1 << 5)) | (value ? 1 << 5 : 0)); } - public bool Dist7 { get => (DistByte & (1 << 6)) == 1 << 6; set => DistByte = (byte)((DistByte & ~(1 << 6)) | (value ? 1 << 6 : 0)); } - public bool Dist8 { get => (DistByte & (1 << 7)) == 1 << 7; set => DistByte = (byte)((DistByte & ~(1 << 7)) | (value ? 1 << 7 : 0)); } - public uint FormDuration { get => BitConverter.ToUInt32(Data, 0x3C); set => BitConverter.GetBytes(value).CopyTo(Data, 0x3C); } + // 0x33 unused padding + + // ribbon u32 + public bool RibbonChampionKalos { get => FlagUtil.GetFlag(Data, 0x34, 0); set => FlagUtil.SetFlag(Data, 0x34, 0, value); } + public bool RibbonChampionG3Hoenn { get => FlagUtil.GetFlag(Data, 0x34, 1); set => FlagUtil.SetFlag(Data, 0x34, 1, value); } + public bool RibbonChampionSinnoh { get => FlagUtil.GetFlag(Data, 0x34, 2); set => FlagUtil.SetFlag(Data, 0x34, 2, value); } + public bool RibbonBestFriends { get => FlagUtil.GetFlag(Data, 0x34, 3); set => FlagUtil.SetFlag(Data, 0x34, 3, value); } + public bool RibbonTraining { get => FlagUtil.GetFlag(Data, 0x34, 4); set => FlagUtil.SetFlag(Data, 0x34, 4, value); } + public bool RibbonBattlerSkillful { get => FlagUtil.GetFlag(Data, 0x34, 5); set => FlagUtil.SetFlag(Data, 0x34, 5, value); } + public bool RibbonBattlerExpert { get => FlagUtil.GetFlag(Data, 0x34, 6); set => FlagUtil.SetFlag(Data, 0x34, 6, value); } + public bool RibbonEffort { get => FlagUtil.GetFlag(Data, 0x34, 7); set => FlagUtil.SetFlag(Data, 0x34, 7, value); } + + public bool RibbonAlert { get => FlagUtil.GetFlag(Data, 0x35, 0); set => FlagUtil.SetFlag(Data, 0x35, 0, value); } + public bool RibbonShock { get => FlagUtil.GetFlag(Data, 0x35, 1); set => FlagUtil.SetFlag(Data, 0x35, 1, value); } + public bool RibbonDowncast { get => FlagUtil.GetFlag(Data, 0x35, 2); set => FlagUtil.SetFlag(Data, 0x35, 2, value); } + public bool RibbonCareless { get => FlagUtil.GetFlag(Data, 0x35, 3); set => FlagUtil.SetFlag(Data, 0x35, 3, value); } + public bool RibbonRelax { get => FlagUtil.GetFlag(Data, 0x35, 4); set => FlagUtil.SetFlag(Data, 0x35, 4, value); } + public bool RibbonSnooze { get => FlagUtil.GetFlag(Data, 0x35, 5); set => FlagUtil.SetFlag(Data, 0x35, 5, value); } + public bool RibbonSmile { get => FlagUtil.GetFlag(Data, 0x35, 6); set => FlagUtil.SetFlag(Data, 0x35, 6, value); } + public bool RibbonGorgeous { get => FlagUtil.GetFlag(Data, 0x35, 7); set => FlagUtil.SetFlag(Data, 0x35, 7, value); } + + public bool RibbonRoyal { get => FlagUtil.GetFlag(Data, 0x36, 0); set => FlagUtil.SetFlag(Data, 0x36, 0, value); } + public bool RibbonGorgeousRoyal { get => FlagUtil.GetFlag(Data, 0x36, 1); set => FlagUtil.SetFlag(Data, 0x36, 1, value); } + public bool RibbonArtist { get => FlagUtil.GetFlag(Data, 0x36, 2); set => FlagUtil.SetFlag(Data, 0x36, 2, value); } + public bool RibbonFootprint { get => FlagUtil.GetFlag(Data, 0x36, 3); set => FlagUtil.SetFlag(Data, 0x36, 3, value); } + public bool RibbonRecord { get => FlagUtil.GetFlag(Data, 0x36, 4); set => FlagUtil.SetFlag(Data, 0x36, 4, value); } + public bool RibbonLegend { get => FlagUtil.GetFlag(Data, 0x36, 5); set => FlagUtil.SetFlag(Data, 0x36, 5, value); } + public bool RibbonCountry { get => FlagUtil.GetFlag(Data, 0x36, 6); set => FlagUtil.SetFlag(Data, 0x36, 6, value); } + public bool RibbonNational { get => FlagUtil.GetFlag(Data, 0x36, 7); set => FlagUtil.SetFlag(Data, 0x36, 7, value); } + + public bool RibbonEarth { get => FlagUtil.GetFlag(Data, 0x37, 0); set => FlagUtil.SetFlag(Data, 0x37, 0, value); } + public bool RibbonWorld { get => FlagUtil.GetFlag(Data, 0x37, 1); set => FlagUtil.SetFlag(Data, 0x37, 1, value); } + public bool RibbonClassic { get => FlagUtil.GetFlag(Data, 0x37, 2); set => FlagUtil.SetFlag(Data, 0x37, 2, value); } + public bool RibbonPremier { get => FlagUtil.GetFlag(Data, 0x37, 3); set => FlagUtil.SetFlag(Data, 0x37, 3, value); } + public bool RibbonEvent { get => FlagUtil.GetFlag(Data, 0x37, 4); set => FlagUtil.SetFlag(Data, 0x37, 4, value); } + public bool RibbonBirthday { get => FlagUtil.GetFlag(Data, 0x37, 5); set => FlagUtil.SetFlag(Data, 0x37, 5, value); } + public bool RibbonSpecial { get => FlagUtil.GetFlag(Data, 0x37, 6); set => FlagUtil.SetFlag(Data, 0x37, 6, value); } + public bool RibbonSouvenir { get => FlagUtil.GetFlag(Data, 0x37, 7); set => FlagUtil.SetFlag(Data, 0x37, 7, value); } + + // ribbon u32 + public bool RibbonWishing { get => FlagUtil.GetFlag(Data, 0x38, 0); set => FlagUtil.SetFlag(Data, 0x38, 0, value); } + public bool RibbonChampionBattle { get => FlagUtil.GetFlag(Data, 0x38, 1); set => FlagUtil.SetFlag(Data, 0x38, 1, value); } + public bool RibbonChampionRegional { get => FlagUtil.GetFlag(Data, 0x38, 2); set => FlagUtil.SetFlag(Data, 0x38, 2, value); } + public bool RibbonChampionNational { get => FlagUtil.GetFlag(Data, 0x38, 3); set => FlagUtil.SetFlag(Data, 0x38, 3, value); } + public bool RibbonChampionWorld { get => FlagUtil.GetFlag(Data, 0x38, 4); set => FlagUtil.SetFlag(Data, 0x38, 4, value); } + public bool HasContestMemoryRibbon { get => FlagUtil.GetFlag(Data, 0x38, 5); set => FlagUtil.SetFlag(Data, 0x38, 5, value); } + public bool HasBattleMemoryRibbon { get => FlagUtil.GetFlag(Data, 0x38, 6); set => FlagUtil.SetFlag(Data, 0x38, 6, value); } + public bool RibbonChampionG6Hoenn { get => FlagUtil.GetFlag(Data, 0x38, 7); set => FlagUtil.SetFlag(Data, 0x38, 7, value); } + + public bool RibbonContestStar { get => FlagUtil.GetFlag(Data, 0x39, 0); set => FlagUtil.SetFlag(Data, 0x39, 0, value); } + public bool RibbonMasterCoolness { get => FlagUtil.GetFlag(Data, 0x39, 1); set => FlagUtil.SetFlag(Data, 0x39, 1, value); } + public bool RibbonMasterBeauty { get => FlagUtil.GetFlag(Data, 0x39, 2); set => FlagUtil.SetFlag(Data, 0x39, 2, value); } + public bool RibbonMasterCuteness { get => FlagUtil.GetFlag(Data, 0x39, 3); set => FlagUtil.SetFlag(Data, 0x39, 3, value); } + public bool RibbonMasterCleverness { get => FlagUtil.GetFlag(Data, 0x39, 4); set => FlagUtil.SetFlag(Data, 0x39, 4, value); } + public bool RibbonMasterToughness { get => FlagUtil.GetFlag(Data, 0x39, 5); set => FlagUtil.SetFlag(Data, 0x39, 5, value); } + public bool RibbonChampionAlola { get => FlagUtil.GetFlag(Data, 0x39, 6); set => FlagUtil.SetFlag(Data, 0x39, 6, value); } + public bool RibbonBattleRoyale { get => FlagUtil.GetFlag(Data, 0x39, 7); set => FlagUtil.SetFlag(Data, 0x39, 7, value); } + + public bool RibbonBattleTreeGreat { get => FlagUtil.GetFlag(Data, 0x3A, 0); set => FlagUtil.SetFlag(Data, 0x3A, 0, value); } + public bool RibbonBattleTreeMaster { get => FlagUtil.GetFlag(Data, 0x3A, 1); set => FlagUtil.SetFlag(Data, 0x3A, 1, value); } + public bool RibbonChampionGalar { get => FlagUtil.GetFlag(Data, 0x3A, 2); set => FlagUtil.SetFlag(Data, 0x3A, 2, value); } + public bool RibbonTowerMaster { get => FlagUtil.GetFlag(Data, 0x3A, 3); set => FlagUtil.SetFlag(Data, 0x3A, 3, value); } + public bool RibbonMasterRank { get => FlagUtil.GetFlag(Data, 0x3A, 4); set => FlagUtil.SetFlag(Data, 0x3A, 4, value); } + public bool RibbonMarkLunchtime { get => FlagUtil.GetFlag(Data, 0x3A, 5); set => FlagUtil.SetFlag(Data, 0x3A, 5, value); } + public bool RibbonMarkSleepyTime { get => FlagUtil.GetFlag(Data, 0x3A, 6); set => FlagUtil.SetFlag(Data, 0x3A, 6, value); } + public bool RibbonMarkDusk { get => FlagUtil.GetFlag(Data, 0x3A, 7); set => FlagUtil.SetFlag(Data, 0x3A, 7, value); } + + public bool RibbonMarkDawn { get => FlagUtil.GetFlag(Data, 0x3B, 0); set => FlagUtil.SetFlag(Data, 0x3B, 0, value); } + public bool RibbonMarkCloudy { get => FlagUtil.GetFlag(Data, 0x3B, 1); set => FlagUtil.SetFlag(Data, 0x3B, 1, value); } + public bool RibbonMarkRainy { get => FlagUtil.GetFlag(Data, 0x3B, 2); set => FlagUtil.SetFlag(Data, 0x3B, 2, value); } + public bool RibbonMarkStormy { get => FlagUtil.GetFlag(Data, 0x3B, 3); set => FlagUtil.SetFlag(Data, 0x3B, 3, value); } + public bool RibbonMarkSnowy { get => FlagUtil.GetFlag(Data, 0x3B, 4); set => FlagUtil.SetFlag(Data, 0x3B, 4, value); } + public bool RibbonMarkBlizzard { get => FlagUtil.GetFlag(Data, 0x3B, 5); set => FlagUtil.SetFlag(Data, 0x3B, 5, value); } + public bool RibbonMarkDry { get => FlagUtil.GetFlag(Data, 0x3B, 6); set => FlagUtil.SetFlag(Data, 0x3B, 6, value); } + public bool RibbonMarkSandstorm { get => FlagUtil.GetFlag(Data, 0x3B, 7); set => FlagUtil.SetFlag(Data, 0x3B, 7, value); } + public int RibbonCountMemoryContest { get => Data[0x3C]; set => HasContestMemoryRibbon = (Data[0x3C] = (byte)value) != 0; } + public int RibbonCountMemoryBattle { get => Data[0x3D]; set => HasBattleMemoryRibbon = (Data[0x3D] = (byte)value) != 0; } + // 0x3E padding + // 0x3F padding + + // 0x40 Ribbon 1 + public bool RibbonMarkMisty { get => FlagUtil.GetFlag(Data, 0x40, 0); set => FlagUtil.SetFlag(Data, 0x40, 0, value); } + public bool RibbonMarkDestiny { get => FlagUtil.GetFlag(Data, 0x40, 1); set => FlagUtil.SetFlag(Data, 0x40, 1, value); } + public bool RibbonMarkFishing { get => FlagUtil.GetFlag(Data, 0x40, 2); set => FlagUtil.SetFlag(Data, 0x40, 2, value); } + public bool RibbonMarkCurry { get => FlagUtil.GetFlag(Data, 0x40, 3); set => FlagUtil.SetFlag(Data, 0x40, 3, value); } + public bool RibbonMarkUncommon { get => FlagUtil.GetFlag(Data, 0x40, 4); set => FlagUtil.SetFlag(Data, 0x40, 4, value); } + public bool RibbonMarkRare { get => FlagUtil.GetFlag(Data, 0x40, 5); set => FlagUtil.SetFlag(Data, 0x40, 5, value); } + public bool RibbonMarkRowdy { get => FlagUtil.GetFlag(Data, 0x40, 6); set => FlagUtil.SetFlag(Data, 0x40, 6, value); } + public bool RibbonMarkAbsentMinded { get => FlagUtil.GetFlag(Data, 0x40, 7); set => FlagUtil.SetFlag(Data, 0x40, 7, value); } + + public bool RibbonMarkJittery { get => FlagUtil.GetFlag(Data, 0x41, 0); set => FlagUtil.SetFlag(Data, 0x41, 0, value); } + public bool RibbonMarkExcited { get => FlagUtil.GetFlag(Data, 0x41, 1); set => FlagUtil.SetFlag(Data, 0x41, 1, value); } + public bool RibbonMarkCharismatic { get => FlagUtil.GetFlag(Data, 0x41, 2); set => FlagUtil.SetFlag(Data, 0x41, 2, value); } + public bool RibbonMarkCalmness { get => FlagUtil.GetFlag(Data, 0x41, 3); set => FlagUtil.SetFlag(Data, 0x41, 3, value); } + public bool RibbonMarkIntense { get => FlagUtil.GetFlag(Data, 0x41, 4); set => FlagUtil.SetFlag(Data, 0x41, 4, value); } + public bool RibbonMarkZonedOut { get => FlagUtil.GetFlag(Data, 0x41, 5); set => FlagUtil.SetFlag(Data, 0x41, 5, value); } + public bool RibbonMarkJoyful { get => FlagUtil.GetFlag(Data, 0x41, 6); set => FlagUtil.SetFlag(Data, 0x41, 6, value); } + public bool RibbonMarkAngry { get => FlagUtil.GetFlag(Data, 0x41, 7); set => FlagUtil.SetFlag(Data, 0x41, 7, value); } + + public bool RibbonMarkSmiley { get => FlagUtil.GetFlag(Data, 0x41, 0); set => FlagUtil.SetFlag(Data, 0x41, 0, value); } + public bool RibbonMarkTeary { get => FlagUtil.GetFlag(Data, 0x42, 1); set => FlagUtil.SetFlag(Data, 0x42, 1, value); } + public bool RibbonMarkUpbeat { get => FlagUtil.GetFlag(Data, 0x42, 2); set => FlagUtil.SetFlag(Data, 0x42, 2, value); } + public bool RibbonMarkPeeved { get => FlagUtil.GetFlag(Data, 0x42, 3); set => FlagUtil.SetFlag(Data, 0x42, 3, value); } + public bool RibbonMarkIntellectual { get => FlagUtil.GetFlag(Data, 0x42, 4); set => FlagUtil.SetFlag(Data, 0x42, 4, value); } + public bool RibbonMarkFerocious { get => FlagUtil.GetFlag(Data, 0x42, 5); set => FlagUtil.SetFlag(Data, 0x42, 5, value); } + public bool RibbonMarkCrafty { get => FlagUtil.GetFlag(Data, 0x42, 6); set => FlagUtil.SetFlag(Data, 0x42, 6, value); } + public bool RibbonMarkScowling { get => FlagUtil.GetFlag(Data, 0x42, 7); set => FlagUtil.SetFlag(Data, 0x42, 7, value); } + + public bool RibbonMarkKindly { get => FlagUtil.GetFlag(Data, 0x43, 0); set => FlagUtil.SetFlag(Data, 0x43, 0, value); } + public bool RibbonMarkFlustered { get => FlagUtil.GetFlag(Data, 0x43, 1); set => FlagUtil.SetFlag(Data, 0x43, 1, value); } + public bool RibbonMarkPumpedUp { get => FlagUtil.GetFlag(Data, 0x43, 2); set => FlagUtil.SetFlag(Data, 0x43, 2, value); } + public bool RibbonMarkZeroEnergy { get => FlagUtil.GetFlag(Data, 0x43, 3); set => FlagUtil.SetFlag(Data, 0x43, 3, value); } + public bool RibbonMarkPrideful { get => FlagUtil.GetFlag(Data, 0x43, 4); set => FlagUtil.SetFlag(Data, 0x43, 4, value); } + public bool RibbonMarkUnsure { get => FlagUtil.GetFlag(Data, 0x43, 5); set => FlagUtil.SetFlag(Data, 0x43, 5, value); } + public bool RibbonMarkHumble { get => FlagUtil.GetFlag(Data, 0x43, 6); set => FlagUtil.SetFlag(Data, 0x43, 6, value); } + public bool RibbonMarkThorny { get => FlagUtil.GetFlag(Data, 0x43, 7); set => FlagUtil.SetFlag(Data, 0x43, 7, value); } + // 0x44 Ribbon 2 + + public bool RibbonMarkVigor { get => FlagUtil.GetFlag(Data, 0x44, 0); set => FlagUtil.SetFlag(Data, 0x44, 0, value); } + public bool RibbonMarkSlump { get => FlagUtil.GetFlag(Data, 0x44, 1); set => FlagUtil.SetFlag(Data, 0x44, 1, value); } + public bool RIB44_2 { get => FlagUtil.GetFlag(Data, 0x44, 2); set => FlagUtil.SetFlag(Data, 0x44, 2, value); } + public bool RIB44_3 { get => FlagUtil.GetFlag(Data, 0x44, 3); set => FlagUtil.SetFlag(Data, 0x44, 3, value); } + public bool RIB44_4 { get => FlagUtil.GetFlag(Data, 0x44, 4); set => FlagUtil.SetFlag(Data, 0x44, 4, value); } + public bool RIB44_5 { get => FlagUtil.GetFlag(Data, 0x44, 5); set => FlagUtil.SetFlag(Data, 0x44, 5, value); } + public bool RIB44_6 { get => FlagUtil.GetFlag(Data, 0x44, 6); set => FlagUtil.SetFlag(Data, 0x44, 6, value); } + public bool RIB44_7 { get => FlagUtil.GetFlag(Data, 0x44, 7); set => FlagUtil.SetFlag(Data, 0x44, 7, value); } + + public bool RIB45_0 { get => FlagUtil.GetFlag(Data, 0x45, 0); set => FlagUtil.SetFlag(Data, 0x45, 0, value); } + public bool RIB45_1 { get => FlagUtil.GetFlag(Data, 0x45, 1); set => FlagUtil.SetFlag(Data, 0x45, 1, value); } + public bool RIB45_2 { get => FlagUtil.GetFlag(Data, 0x45, 2); set => FlagUtil.SetFlag(Data, 0x45, 2, value); } + public bool RIB45_3 { get => FlagUtil.GetFlag(Data, 0x45, 3); set => FlagUtil.SetFlag(Data, 0x45, 3, value); } + public bool RIB45_4 { get => FlagUtil.GetFlag(Data, 0x45, 4); set => FlagUtil.SetFlag(Data, 0x45, 4, value); } + public bool RIB45_5 { get => FlagUtil.GetFlag(Data, 0x45, 5); set => FlagUtil.SetFlag(Data, 0x45, 5, value); } + public bool RIB45_6 { get => FlagUtil.GetFlag(Data, 0x45, 6); set => FlagUtil.SetFlag(Data, 0x45, 6, value); } + public bool RIB45_7 { get => FlagUtil.GetFlag(Data, 0x45, 7); set => FlagUtil.SetFlag(Data, 0x45, 7, value); } + + public bool RIB46_0 { get => FlagUtil.GetFlag(Data, 0x41, 0); set => FlagUtil.SetFlag(Data, 0x41, 0, value); } + public bool RIB46_1 { get => FlagUtil.GetFlag(Data, 0x46, 1); set => FlagUtil.SetFlag(Data, 0x46, 1, value); } + public bool RIB46_2 { get => FlagUtil.GetFlag(Data, 0x46, 2); set => FlagUtil.SetFlag(Data, 0x46, 2, value); } + public bool RIB46_3 { get => FlagUtil.GetFlag(Data, 0x46, 3); set => FlagUtil.SetFlag(Data, 0x46, 3, value); } + public bool RIB46_4 { get => FlagUtil.GetFlag(Data, 0x46, 4); set => FlagUtil.SetFlag(Data, 0x46, 4, value); } + public bool RIB46_5 { get => FlagUtil.GetFlag(Data, 0x46, 5); set => FlagUtil.SetFlag(Data, 0x46, 5, value); } + public bool RIB46_6 { get => FlagUtil.GetFlag(Data, 0x46, 6); set => FlagUtil.SetFlag(Data, 0x46, 6, value); } + public bool RIB46_7 { get => FlagUtil.GetFlag(Data, 0x46, 7); set => FlagUtil.SetFlag(Data, 0x46, 7, value); } + + public bool RIB47_0 { get => FlagUtil.GetFlag(Data, 0x47, 0); set => FlagUtil.SetFlag(Data, 0x47, 0, value); } + public bool RIB47_1 { get => FlagUtil.GetFlag(Data, 0x47, 1); set => FlagUtil.SetFlag(Data, 0x47, 1, value); } + public bool RIB47_2 { get => FlagUtil.GetFlag(Data, 0x47, 2); set => FlagUtil.SetFlag(Data, 0x47, 2, value); } + public bool RIB47_3 { get => FlagUtil.GetFlag(Data, 0x47, 3); set => FlagUtil.SetFlag(Data, 0x47, 3, value); } + public bool RIB47_4 { get => FlagUtil.GetFlag(Data, 0x47, 4); set => FlagUtil.SetFlag(Data, 0x47, 4, value); } + public bool RIB47_5 { get => FlagUtil.GetFlag(Data, 0x47, 5); set => FlagUtil.SetFlag(Data, 0x47, 5, value); } + public bool RIB47_6 { get => FlagUtil.GetFlag(Data, 0x47, 6); set => FlagUtil.SetFlag(Data, 0x47, 6, value); } + public bool RIB47_7 { get => FlagUtil.GetFlag(Data, 0x47, 7); set => FlagUtil.SetFlag(Data, 0x47, 7, value); } + + public uint U48 { get => BitConverter.ToUInt32(Data, 0x48); set => BitConverter.GetBytes(value).CopyTo(Data, 0x48); } + + public byte GetFromArrayA1(int index) + { + if ((uint)index >= 4) + throw new ArgumentException(nameof(index)); + return Data[0x4C + index]; + } + + public void SetFromArrayA1(int index, byte value) + { + if ((uint)index >= 4) + throw new ArgumentException(nameof(index)); + Data[0x4C + index] = value; + } + + public int HeightScalar { get => Data[0x50]; set => Data[0x50] = (byte)value; } + public int WeightScalar { get => Data[0x51]; set => Data[0x51] = (byte)value; } + + public byte GetFromArrayA2(int index) + { + if ((uint)index >= 6) + throw new ArgumentException(nameof(index)); + return Data[0x52 + index]; + } + + public void SetFromArrayA2(int index, byte value) + { + if ((uint)index >= 6) + throw new ArgumentException(nameof(index)); + Data[0x52 + index] = value; + } #endregion #region Block B public override string Nickname { - get => GetString(0x40, 24); - set - { - if (!IsNicknamed) - { - int lang = SpeciesName.GetSpeciesNameLanguage(Species, Language, value, 8); - if (lang == (int)LanguageID.ChineseS || lang == (int)LanguageID.ChineseT) - { - StringConverter.SetString7(value, 12, lang, chinese: true).CopyTo(Data, 0x40); - return; - } - } - SetString(value, 12).CopyTo(Data, 0x40); - } + get => GetString(0x58, 24); + set => SetString(value, 12).CopyTo(Data, 0x58); } - public override int Move1 - { - get => BitConverter.ToUInt16(Data, 0x5A); - set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x5A); - } + // 2 bytes for \0, automatically handled above - public override int Move2 - { - get => BitConverter.ToUInt16(Data, 0x5C); - set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x5C); - } + public override int Move1 { get => BitConverter.ToUInt16(Data, 0x72); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x72); } + public override int Move2 { get => BitConverter.ToUInt16(Data, 0x74); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x74); } + public override int Move3 { get => BitConverter.ToUInt16(Data, 0x76); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x76); } + public override int Move4 { get => BitConverter.ToUInt16(Data, 0x78); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x78); } - public override int Move3 - { - get => BitConverter.ToUInt16(Data, 0x5E); - set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x5E); - } + public override int Move1_PP { get => Data[0x7A]; set => Data[0x7A] = (byte)value; } + public override int Move2_PP { get => Data[0x7B]; set => Data[0x7B] = (byte)value; } + public override int Move3_PP { get => Data[0x7C]; set => Data[0x7C] = (byte)value; } + public override int Move4_PP { get => Data[0x7D]; set => Data[0x7D] = (byte)value; } + public override int Move1_PPUps { get => Data[0x7E]; set => Data[0x7E] = (byte)value; } + public override int Move2_PPUps { get => Data[0x7F]; set => Data[0x7F] = (byte)value; } + public override int Move3_PPUps { get => Data[0x80]; set => Data[0x80] = (byte)value; } + public override int Move4_PPUps { get => Data[0x81]; set => Data[0x81] = (byte)value; } - public override int Move4 - { - get => BitConverter.ToUInt16(Data, 0x60); - set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x60); - } + public override int RelearnMove1 { get => BitConverter.ToUInt16(Data, 0x82); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x82); } + public override int RelearnMove2 { get => BitConverter.ToUInt16(Data, 0x84); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x84); } + public override int RelearnMove3 { get => BitConverter.ToUInt16(Data, 0x86); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x86); } + public override int RelearnMove4 { get => BitConverter.ToUInt16(Data, 0x88); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x88); } - public override int Move1_PP { get => Data[0x62]; set => Data[0x62] = (byte)value; } - public override int Move2_PP { get => Data[0x63]; set => Data[0x63] = (byte)value; } - public override int Move3_PP { get => Data[0x64]; set => Data[0x64] = (byte)value; } - public override int Move4_PP { get => Data[0x65]; set => Data[0x65] = (byte)value; } - public override int Move1_PPUps { get => Data[0x66]; set => Data[0x66] = (byte)value; } - public override int Move2_PPUps { get => Data[0x67]; set => Data[0x67] = (byte)value; } - public override int Move3_PPUps { get => Data[0x68]; set => Data[0x68] = (byte)value; } - public override int Move4_PPUps { get => Data[0x69]; set => Data[0x69] = (byte)value; } + public override int Stat_HPCurrent { get => BitConverter.ToUInt16(Data, 0x8A); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x8A); } - public override int RelearnMove1 - { - get => BitConverter.ToUInt16(Data, 0x6A); - set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x6A); - } - - public override int RelearnMove2 - { - get => BitConverter.ToUInt16(Data, 0x6C); - set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x6C); - } - - public override int RelearnMove3 - { - get => BitConverter.ToUInt16(Data, 0x6E); - set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x6E); - } - - public override int RelearnMove4 - { - get => BitConverter.ToUInt16(Data, 0x70); - set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x70); - } - - public bool SecretSuperTrainingUnlocked { get => (Data[0x72] & 1) == 1; set => Data[0x72] = (byte)((Data[0x72] & ~1) | (value ? 1 : 0)); } - public bool SecretSuperTrainingComplete { get => (Data[0x72] & 2) == 2; set => Data[0x72] = (byte)((Data[0x72] & ~2) | (value ? 2 : 0)); } - public byte _0x73 { get => Data[0x73]; set => Data[0x73] = value; } - private uint IV32 { get => BitConverter.ToUInt32(Data, 0x74); set => BitConverter.GetBytes(value).CopyTo(Data, 0x74); } + private uint IV32 { get => BitConverter.ToUInt32(Data, 0x8C); set => BitConverter.GetBytes(value).CopyTo(Data, 0x8C); } public override int IV_HP { get => (int)(IV32 >> 00) & 0x1F; set => IV32 = (IV32 & ~(0x1Fu << 00)) | ((value > 31 ? 31u : (uint)value) << 00); } public override int IV_ATK { get => (int)(IV32 >> 05) & 0x1F; set => IV32 = (IV32 & ~(0x1Fu << 05)) | ((value > 31 ? 31u : (uint)value) << 05); } public override int IV_DEF { get => (int)(IV32 >> 10) & 0x1F; set => IV32 = (IV32 & ~(0x1Fu << 10)) | ((value > 31 ? 31u : (uint)value) << 10); } @@ -312,89 +417,164 @@ public override int RelearnMove4 public override int IV_SPD { get => (int)(IV32 >> 25) & 0x1F; set => IV32 = (IV32 & ~(0x1Fu << 25)) | ((value > 31 ? 31u : (uint)value) << 25); } public override bool IsEgg { get => ((IV32 >> 30) & 1) == 1; set => IV32 = (IV32 & ~0x40000000u) | (value ? 0x40000000u : 0u); } public override bool IsNicknamed { get => ((IV32 >> 31) & 1) == 1; set => IV32 = (IV32 & 0x7FFFFFFFu) | (value ? 0x80000000u : 0u); } + + public byte DynamaxLevel { get => Data[0x90]; set => Data[0x90] = value; } + + public byte GetFromArrayB1(int index) + { + if ((uint)index >= 3) + throw new ArgumentException(nameof(index)); + return Data[0x90 + index]; + } + + public void SetFromArrayB1(int index, byte value) + { + if ((uint)index >= 3) + throw new ArgumentException(nameof(index)); + Data[0x90 + index] = value; + } + + public override int Status_Condition { get => BitConverter.ToInt32(Data, 0x94); set => BitConverter.GetBytes(value).CopyTo(Data, 0x94); } + public int Unk98 { get => BitConverter.ToInt32(Data, 0x98); set => BitConverter.GetBytes(value).CopyTo(Data, 0x98); } + + public byte GetFromArrayB2(int index) + { + if ((uint)index >= 14) + throw new ArgumentException(nameof(index)); + return Data[0x9C + index]; + } + + public void SetFromArrayB2(int index, byte value) + { + if ((uint)index >= 14) + throw new ArgumentException(nameof(index)); + Data[0x9C + index] = value; + } #endregion #region Block C - public override string HT_Name { get => GetString(0x78, 24); set => SetString(value, 12).CopyTo(Data, 0x78); } - public override int HT_Gender { get => Data[0x92]; set => Data[0x92] = (byte)value; } - public override int CurrentHandler { get => Data[0x93]; set => Data[0x93] = (byte)value; } - public int Geo1_Region { get => Data[0x94]; set => Data[0x94] = (byte)value; } - public int Geo1_Country { get => Data[0x95]; set => Data[0x95] = (byte)value; } - public int Geo2_Region { get => Data[0x96]; set => Data[0x96] = (byte)value; } - public int Geo2_Country { get => Data[0x97]; set => Data[0x97] = (byte)value; } - public int Geo3_Region { get => Data[0x98]; set => Data[0x98] = (byte)value; } - public int Geo3_Country { get => Data[0x99]; set => Data[0x99] = (byte)value; } - public int Geo4_Region { get => Data[0x9A]; set => Data[0x9A] = (byte)value; } - public int Geo4_Country { get => Data[0x9B]; set => Data[0x9B] = (byte)value; } - public int Geo5_Region { get => Data[0x9C]; set => Data[0x9C] = (byte)value; } - public int Geo5_Country { get => Data[0x9D]; set => Data[0x9D] = (byte)value; } - public byte _0x9E { get => Data[0x9E]; set => Data[0x9E] = value; } - public byte _0x9F { get => Data[0x9F]; set => Data[0x9F] = value; } - public byte _0xA0 { get => Data[0xA0]; set => Data[0xA0] = value; } - public byte _0xA1 { get => Data[0xA1]; set => Data[0xA1] = value; } - public override int HT_Friendship { get => Data[0xA2]; set => Data[0xA2] = (byte)value; } - public override int HT_Affection { get => Data[0xA3]; set => Data[0xA3] = (byte)value; } - public override int HT_Intensity { get => Data[0xA4]; set => Data[0xA4] = (byte)value; } - public override int HT_Memory { get => Data[0xA5]; set => Data[0xA5] = (byte)value; } - public override int HT_Feeling { get => Data[0xA6]; set => Data[0xA6] = (byte)value; } - public byte _0xA7 { get => Data[0xA7]; set => Data[0xA7] = value; } - public override int HT_TextVar { get => BitConverter.ToUInt16(Data, 0xA8); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0xA8); } - public byte _0xAA { get => Data[0xAA]; set => Data[0xAA] = value; } - public byte _0xAB { get => Data[0xAB]; set => Data[0xAB] = value; } - public byte _0xAC { get => Data[0xAC]; set => Data[0xAC] = value; } - public byte _0xAD { get => Data[0xAD]; set => Data[0xAD] = value; } - public override byte Fullness { get => Data[0xAE]; set => Data[0xAE] = value; } - public override byte Enjoyment { get => Data[0xAF]; set => Data[0xAF] = value; } + public override string HT_Name { get => GetString(0xA8, 24); set => SetString(value, 12).CopyTo(Data, 0xA8); } + public override int HT_Gender { get => Data[0xC2]; set => Data[0xC2] = (byte)value; } + public int HT_Language { get => Data[0xC3]; set => Data[0xC3] = (byte)value; } + public override int CurrentHandler { get => Data[0xC4]; set => Data[0xC4] = (byte)value; } + // 0xC5 unused (alignment) + public int HT_TrainerID { get => BitConverter.ToUInt16(Data, 0xC6); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0xC6); } // unused? + public override int HT_Friendship { get => Data[0xC8]; set => Data[0xC8] = (byte)value; } + public override int HT_Intensity { get => Data[0xC9]; set => Data[0xC9] = (byte)value; } + public override int HT_Memory { get => Data[0xCA]; set => Data[0xCA] = (byte)value; } + public override int HT_Feeling { get => Data[0xCB]; set => Data[0xCB] = (byte)value; } + public override int HT_TextVar { get => BitConverter.ToUInt16(Data, 0xCC); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0xCC); } + + public byte GetFromArrayC1(int index) + { + if ((uint)index >= 14) + throw new ArgumentException(nameof(index)); + return Data[0xCE + index]; + } + + public void SetFromArrayC1(int index, byte value) + { + if ((uint)index >= 14) + throw new ArgumentException(nameof(index)); + Data[0xCE + index] = value; + } + + public override byte Fullness { get => Data[0xDC]; set => Data[0xDC] = value; } + public override byte Enjoyment { get => Data[0xDD]; set => Data[0xDD] = value; } + public override int Version { get => Data[0xDE]; set => Data[0xDE] = (byte)value; } + public override int Country { get => Data[0xDF]; set => Data[0xDF] = (byte)value; } + public override int Region { get => Data[0xE0]; set => Data[0xE0] = (byte)value; } + public override int ConsoleRegion { get => Data[0xE1]; set => Data[0xE1] = (byte)value; } + public override int Language { get => Data[0xE2]; set => Data[0xE2] = (byte)value; } + public int UnkE3 { get => Data[0xE3]; set => Data[0xE3] = (byte)value; } + public uint FormDuration { get => BitConverter.ToUInt32(Data, 0xE4); set => BitConverter.GetBytes(value).CopyTo(Data, 0xE4); } + public sbyte AffixedRibbon { get => (sbyte)Data[0xE8]; set => Data[0xE8] = (byte)value; } // selected ribbon + + public byte GetFromArrayC2(int index) + { + if ((uint)index >= 15) + throw new ArgumentException(nameof(index)); + return Data[0xE9 + index]; + } + + public void SetFromArrayC2(int index, byte value) + { + if ((uint)index >= 15) + throw new ArgumentException(nameof(index)); + Data[0xE9 + index] = value; + } + #endregion #region Block D - public override string OT_Name { get => GetString(0xB0, 24); set => SetString(value, 12).CopyTo(Data, 0xB0); } - public override int OT_Friendship { get => Data[0xCA]; set => Data[0xCA] = (byte)value; } - public override int OT_Affection { get => Data[0xCB]; set => Data[0xCB] = (byte)value; } - public override int OT_Intensity { get => Data[0xCC]; set => Data[0xCC] = (byte)value; } - public override int OT_Memory { get => Data[0xCD]; set => Data[0xCD] = (byte)value; } - public override int OT_TextVar { get => BitConverter.ToUInt16(Data, 0xCE); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0xCE); } - public override int OT_Feeling { get => Data[0xD0]; set => Data[0xD0] = (byte)value; } - public override int Egg_Year { get => Data[0xD1]; set => Data[0xD1] = (byte)value; } - public override int Egg_Month { get => Data[0xD2]; set => Data[0xD2] = (byte)value; } - public override int Egg_Day { get => Data[0xD3]; set => Data[0xD3] = (byte)value; } - public override int Met_Year { get => Data[0xD4]; set => Data[0xD4] = (byte)value; } - public override int Met_Month { get => Data[0xD5]; set => Data[0xD5] = (byte)value; } - public override int Met_Day { get => Data[0xD6]; set => Data[0xD6] = (byte)value; } - public byte _0xD7 { get => Data[0xD7]; set => Data[0xD7] = value; } - public override int Egg_Location { get => BitConverter.ToUInt16(Data, 0xD8); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0xD8); } - public override int Met_Location { get => BitConverter.ToUInt16(Data, 0xDA); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0xDA); } - public override int Ball { get => Data[0xDC]; set => Data[0xDC] = (byte)value; } - public override int Met_Level { get => Data[0xDD] & ~0x80; set => Data[0xDD] = (byte)((Data[0xDD] & 0x80) | value); } - public override int OT_Gender { get => Data[0xDD] >> 7; set => Data[0xDD] = (byte)((Data[0xDD] & ~0x80) | (value << 7)); } - public int HyperTrainFlags { get => Data[0xDE]; set => Data[0xDE] = (byte)value; } + public override string OT_Name { get => GetString(0xF8, 24); set => SetString(value, 12).CopyTo(Data, 0xF8); } + public override int OT_Friendship { get => Data[0x112]; set => Data[0x112] = (byte)value; } + public override int OT_Intensity { get => Data[0x113]; set => Data[0x113] = (byte)value; } + public override int OT_Memory { get => Data[0x114]; set => Data[0x114] = (byte)value; } + // 0x115 unused align + public override int OT_TextVar { get => BitConverter.ToUInt16(Data, 0x116); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x116); } + public override int OT_Feeling { get => Data[0x118]; set => Data[0x118] = (byte)value; } + public override int Egg_Year { get => Data[0x119]; set => Data[0x119] = (byte)value; } + public override int Egg_Month { get => Data[0x11A]; set => Data[0x11A] = (byte)value; } + public override int Egg_Day { get => Data[0x11B]; set => Data[0x11B] = (byte)value; } + public override int Met_Year { get => Data[0x11C]; set => Data[0x11C] = (byte)value; } + public override int Met_Month { get => Data[0x11D]; set => Data[0x11D] = (byte)value; } + public override int Met_Day { get => Data[0x11E]; set => Data[0x11E] = (byte)value; } + // 0x11F unused align + public override int Egg_Location { get => BitConverter.ToUInt16(Data, 0x120); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x120); } + public override int Met_Location { get => BitConverter.ToUInt16(Data, 0x122); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x122); } + public override int Ball { get => Data[0x124]; set => Data[0x124] = (byte)value; } + public override int Met_Level { get => Data[0x125] & ~0x80; set => Data[0x125] = (byte)((Data[0x125] & 0x80) | value); } + public override int OT_Gender { get => Data[0x125] >> 7; set => Data[0x125] = (byte)((Data[0x125] & ~0x80) | (value << 7)); } + public int HyperTrainFlags { get => Data[0x126]; set => Data[0x126] = (byte)value; } public bool HT_HP { get => ((HyperTrainFlags >> 0) & 1) == 1; set => HyperTrainFlags = (HyperTrainFlags & ~(1 << 0)) | ((value ? 1 : 0) << 0); } public bool HT_ATK { get => ((HyperTrainFlags >> 1) & 1) == 1; set => HyperTrainFlags = (HyperTrainFlags & ~(1 << 1)) | ((value ? 1 : 0) << 1); } public bool HT_DEF { get => ((HyperTrainFlags >> 2) & 1) == 1; set => HyperTrainFlags = (HyperTrainFlags & ~(1 << 2)) | ((value ? 1 : 0) << 2); } public bool HT_SPA { get => ((HyperTrainFlags >> 3) & 1) == 1; set => HyperTrainFlags = (HyperTrainFlags & ~(1 << 3)) | ((value ? 1 : 0) << 3); } public bool HT_SPD { get => ((HyperTrainFlags >> 4) & 1) == 1; set => HyperTrainFlags = (HyperTrainFlags & ~(1 << 4)) | ((value ? 1 : 0) << 4); } public bool HT_SPE { get => ((HyperTrainFlags >> 5) & 1) == 1; set => HyperTrainFlags = (HyperTrainFlags & ~(1 << 5)) | ((value ? 1 : 0) << 5); } - public override int Version { get => Data[0xDF]; set => Data[0xDF] = (byte)value; } - public override int Country { get => Data[0xE0]; set => Data[0xE0] = (byte)value; } - public override int Region { get => Data[0xE1]; set => Data[0xE1] = (byte)value; } - public override int ConsoleRegion { get => Data[0xE2]; set => Data[0xE2] = (byte)value; } - public override int Language { get => Data[0xE3]; set => Data[0xE3] = (byte)value; } + + public bool GetMoveRecordFlag(int index) + { + if ((uint) index > 112) // 14 bytes, 8 bits + throw new ArgumentException(nameof(index)); + int ofs = index >> 3; + return FlagUtil.GetFlag(Data, 0x127 + ofs, index & 7); + } + + public void SetMoveRecordFlag(int index, bool value) + { + if ((uint)index > 112) // 14 bytes, 8 bits + throw new ArgumentException(nameof(index)); + int ofs = index >> 3; + FlagUtil.SetFlag(Data, 0x127 + ofs, index & 7, value); + } + + public byte GetFromArrayD1(int index) + { + if ((uint)index >= 19) + throw new ArgumentException(nameof(index)); + return Data[0x135 + index]; + } + + public void SetFromArrayD1(int index, byte value) + { + if ((uint)index >= 19) + throw new ArgumentException(nameof(index)); + Data[0x135 + index] = value; + } + #endregion #region Battle Stats - public override int Status_Condition { get => BitConverter.ToInt32(Data, 0xE8); set => BitConverter.GetBytes(value).CopyTo(Data, 0xE8); } - public override int Stat_Level { get => Data[0xEC]; set => Data[0xEC] = (byte)value; } - public byte DirtType { get => Data[0xED]; set => Data[0xED] = value; } - public byte DirtLocation { get => Data[0xEE]; set => Data[0xEE] = value; } - // 0xEF unused - public override int Stat_HPCurrent { get => BitConverter.ToUInt16(Data, 0xF0); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0xF0); } - public override int Stat_HPMax { get => BitConverter.ToUInt16(Data, 0xF2); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0xF2); } - public override int Stat_ATK { get => BitConverter.ToUInt16(Data, 0xF4); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0xF4); } - public override int Stat_DEF { get => BitConverter.ToUInt16(Data, 0xF6); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0xF6); } - public override int Stat_SPE { get => BitConverter.ToUInt16(Data, 0xF8); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0xF8); } - public override int Stat_SPA { get => BitConverter.ToUInt16(Data, 0xFA); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0xFA); } - public override int Stat_SPD { get => BitConverter.ToUInt16(Data, 0xFC); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0xFC); } + public override int Stat_Level { get => Data[0x148]; set => Data[0x148] = (byte)value; } + // 0x149 unused alignment + public override int Stat_HPMax { get => BitConverter.ToUInt16(Data, 0x14A); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x14A); } + public override int Stat_ATK { get => BitConverter.ToUInt16(Data, 0x14C); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x14C); } + public override int Stat_DEF { get => BitConverter.ToUInt16(Data, 0x14E); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x14E); } + public override int Stat_SPE { get => BitConverter.ToUInt16(Data, 0x150); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x150); } + public override int Stat_SPA { get => BitConverter.ToUInt16(Data, 0x152); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x152); } + public override int Stat_SPD { get => BitConverter.ToUInt16(Data, 0x154); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x154); } + public int DynamaxType { get => BitConverter.ToUInt16(Data, 0x156); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x156); } #endregion - public bool IsUntradedEvent6 => Geo1_Country == 0 && Geo1_Region == 0 && Met_Location / 10000 == 4 && Gen6; - public override int[] Markings { get @@ -422,7 +602,6 @@ public void FixMemories() { HT_Friendship = HT_Affection = HT_TextVar = HT_Memory = HT_Intensity = HT_Feeling = /* OT_Friendship */ OT_Affection = OT_TextVar = OT_Memory = OT_Intensity = OT_Feeling = 0; - this.ClearGeoLocationData(); // Clear Handler HT_Name = string.Empty.PadRight(11, '\0'); @@ -437,16 +616,13 @@ public void FixMemories() OT_TextVar = OT_Memory = OT_Intensity = OT_Feeling = 0; } - this.SanitizeGeoLocationData(); - - if (GenNumber < 7) // must be transferred via bank, and must have memories + if (GenNumber < 8) // must be transferred via HOME, and must have memories { - TradeMemory(Bank: true); - // georegions cleared on 6->7, no need to set + TradeMemory(); } } - protected override bool TradeOT(ITrainerInfo tr) + private bool TradeOT(ITrainerInfo tr) { // Check to see if the OT matches the SAV's OT info. if (!(tr.OT == OT_Name && tr.TID == TID && tr.SID == SID && tr.Gender == OT_Gender)) @@ -456,9 +632,9 @@ protected override bool TradeOT(ITrainerInfo tr) return true; } - protected override void TradeHT(ITrainerInfo tr) + private void TradeHT(ITrainerInfo tr) { - if (tr.OT != HT_Name || tr.Gender != HT_Gender || (Geo1_Country == 0 && Geo1_Region == 0 && !IsUntradedEvent6)) + if (tr.OT != HT_Name || tr.Gender != HT_Gender) { // No geolocations are set ingame -- except for bank transfers. Don't emulate bank transfers // this.TradeGeoLocation(tr.Country, tr.SubRegion); @@ -472,13 +648,12 @@ protected override void TradeHT(ITrainerInfo tr) } CurrentHandler = 1; HT_Gender = tr.Gender; + HT_Language = tr.Language; } // Misc Updates - public override void TradeMemory(bool Bank) + public static void TradeMemory() { - if (Bank) - base.TradeMemory(true); } // Maximums @@ -488,5 +663,17 @@ public override void TradeMemory(bool Bank) public override int MaxItemID => Legal.MaxItemID_8; public override int MaxBallID => Legal.MaxBallID_8; public override int MaxGameID => Legal.MaxGameID_8; + + public bool GetRibbon(int index) => FlagUtil.GetFlag(Data, GetRibbonByte(index), index & 7); + public void SetRibbon(int index, bool value = true) => FlagUtil.SetFlag(Data, GetRibbonByte(index), index & 7, value); + + public int GetRibbonByte(int index) + { + if ((uint)index >= 128) + throw new ArgumentOutOfRangeException(nameof(index)); + if (index < 64) + return 0x34 + (index >> 3); + return 0x40 + (index >> 3); + } } } \ No newline at end of file diff --git a/PKHeX.Core/PKM/PKM.cs b/PKHeX.Core/PKM/PKM.cs index 443cd2e73..9360e4173 100644 --- a/PKHeX.Core/PKM/PKM.cs +++ b/PKHeX.Core/PKM/PKM.cs @@ -7,14 +7,14 @@ namespace PKHeX.Core /// /// Object representing a 's data and derived properties. /// - public abstract class PKM : ITrainerID, ILangNick, IGameValueLimit + public abstract class PKM : ITrainerID, ILangNick, IGameValueLimit, INature { public static readonly string[] Extensions = PKX.GetPKMExtensions(); public abstract int SIZE_PARTY { get; } public abstract int SIZE_STORED { get; } public string Extension => GetType().Name.ToLower(); public abstract PersonalInfo PersonalInfo { get; } - public abstract IReadOnlyList ExtraBytes { get; } + public virtual IReadOnlyList ExtraBytes => Array.Empty(); // Internal Attributes set on creation public abstract byte[] Data { get; } // Raw Storage @@ -74,6 +74,7 @@ private byte[] Write() public abstract int HeldItem { get; set; } public abstract int Gender { get; set; } public abstract int Nature { get; set; } + public virtual int StatNature { get => Nature; set => Nature = value; } public abstract int Ability { get; set; } public abstract int CurrentFriendship { get; set; } public abstract int AltForm { get; set; } @@ -320,6 +321,7 @@ private void SetID7(int sid7, int tid7) protected bool PtHGSS => Pt || HGSS; public bool VC => VC1 || VC2; + public bool Gen8 => Version >= 44 && Version <= 45; public bool Gen7 => (Version >= 30 && Version <= 33) || GG; public bool Gen6 => Version >= 24 && Version <= 29; public bool Gen5 => Version >= 20 && Version <= 23; @@ -333,6 +335,7 @@ public int GenNumber { get { + if (Gen8) return 8; if (Gen7) return 7; if (Gen6) return 6; if (Gen5) return 5; @@ -360,7 +363,7 @@ public bool PKRS_Cured } public virtual bool ChecksumValid => Checksum == CalculateChecksum(); - public int CurrentLevel { get => Experience.GetLevel(EXP, Species, AltForm); set => EXP = Experience.GetEXP(Stat_Level = value, Species, AltForm); } + public int CurrentLevel { get => Experience.GetLevel(EXP, PersonalInfo.EXPGrowth); set => EXP = Experience.GetEXP(Stat_Level = value, PersonalInfo.EXPGrowth); } public int MarkCircle { get => Markings[0]; set { var marks = Markings; marks[0] = value; Markings = marks; } } public int MarkTriangle { get => Markings[1]; set { var marks = Markings; marks[1] = value; Markings = marks; } } public int MarkSquare { get => Markings[2]; set { var marks = Markings; marks[2] = value; Markings = marks; } } @@ -772,7 +775,7 @@ public virtual ushort[] GetStats(PersonalInfo p) ushort[] stats = this is IHyperTrain t ? GetStats(p, t, level) : GetStats(p, level); // Account for nature - PKX.ModifyStatsForNature(stats, Nature); + PKX.ModifyStatsForNature(stats, StatNature); return stats; } diff --git a/PKHeX.Core/PKM/Shared/GBPKM.cs b/PKHeX.Core/PKM/Shared/GBPKM.cs index 0cfa24562..81090df11 100644 --- a/PKHeX.Core/PKM/Shared/GBPKM.cs +++ b/PKHeX.Core/PKM/Shared/GBPKM.cs @@ -16,7 +16,7 @@ public abstract class GBPKM : PKM public override int OTLength => Japanese ? 5 : 7; public override int NickLength => Japanese ? 5 : 10; - public override IReadOnlyList ExtraBytes => Array.Empty(); + public override IReadOnlyList ExtraBytes => Array.Empty(); public override string FileNameWithoutExtension { diff --git a/PKHeX.Core/PKM/Shared/IFavorite.cs b/PKHeX.Core/PKM/Shared/IFavorite.cs new file mode 100644 index 000000000..bc019dcb8 --- /dev/null +++ b/PKHeX.Core/PKM/Shared/IFavorite.cs @@ -0,0 +1,7 @@ +namespace PKHeX.Core +{ + public interface IFavorite + { + bool Favorite { get; set; } + } +} \ No newline at end of file diff --git a/PKHeX.Core/PKM/Shared/IGigantamax.cs b/PKHeX.Core/PKM/Shared/IGigantamax.cs new file mode 100644 index 000000000..fa1cb26bd --- /dev/null +++ b/PKHeX.Core/PKM/Shared/IGigantamax.cs @@ -0,0 +1,12 @@ +namespace PKHeX.Core +{ + public interface IGigantamax + { + bool CanGigantamax { get; set; } + } + + public interface IDynamaxLevel + { + byte DynamaxLevel { get; set; } + } +} \ No newline at end of file diff --git a/PKHeX.Core/PKM/Shared/IHandlerLanguage.cs b/PKHeX.Core/PKM/Shared/IHandlerLanguage.cs new file mode 100644 index 000000000..631c8e357 --- /dev/null +++ b/PKHeX.Core/PKM/Shared/IHandlerLanguage.cs @@ -0,0 +1,7 @@ +namespace PKHeX.Core +{ + public interface IHandlerLanguage + { + int HT_Language { get; set; } + } +} \ No newline at end of file diff --git a/PKHeX.Core/PKM/Shared/INature.cs b/PKHeX.Core/PKM/Shared/INature.cs new file mode 100644 index 000000000..36aa1510d --- /dev/null +++ b/PKHeX.Core/PKM/Shared/INature.cs @@ -0,0 +1,7 @@ +namespace PKHeX.Core +{ + public interface INature + { + int Nature { get; set; } + } +} \ No newline at end of file diff --git a/PKHeX.Core/PKM/Shared/IScaledSize.cs b/PKHeX.Core/PKM/Shared/IScaledSize.cs new file mode 100644 index 000000000..e42a92f54 --- /dev/null +++ b/PKHeX.Core/PKM/Shared/IScaledSize.cs @@ -0,0 +1,8 @@ +namespace PKHeX.Core +{ + public interface IScaledSize + { + int WeightScalar { get; set; } + int HeightScalar { get; set; } + } +} \ No newline at end of file diff --git a/PKHeX.Core/PKM/Shared/PokeSize.cs b/PKHeX.Core/PKM/Shared/PokeSize.cs new file mode 100644 index 000000000..1fc7d6adc --- /dev/null +++ b/PKHeX.Core/PKM/Shared/PokeSize.cs @@ -0,0 +1,47 @@ +namespace PKHeX.Core +{ + public enum PokeSize + { + XS, + S, + AV, + L, + XL, + } + + public static class PokeSizeExtensions + { + /// + /// Compares the sizing scalar to different thresholds to determine the size rating. + /// + /// Sizing scalar (0-255) + /// 0-4 rating + public static PokeSize GetSizeRating(int scalar) + { + if (scalar < 0x10) + return PokeSize.XS; // 1/16 = XS + if (scalar < 0x30u) + return PokeSize.S; // 2/16 = S + if (scalar < 0xD0u) + return PokeSize.AV; // average (10/16) + if (scalar < 0xF0u) + return PokeSize.L; // 2/16 = L + return PokeSize.XL; // 1/16 = XL + } + + public static int GetRandomScalar(this PokeSize size) + { + return size switch + { + PokeSize.XS => (Util.Rand.Next(0x10) + 0x00), + PokeSize.S => (Util.Rand.Next(0x20) + 0x10), + PokeSize.AV => (Util.Rand.Next(0xA0) + 0x30), + PokeSize.L => (Util.Rand.Next(0x20) + 0xD0), + PokeSize.XL => (Util.Rand.Next(0x10) + 0xF0), + _ => GetRandomPokeSize() // Official code sums two randoms for triangular distribution. + }; + } + + public static int GetRandomPokeSize() => Util.Rand.Next(0x80) + Util.Rand.Next(0x81); + } +} \ No newline at end of file diff --git a/PKHeX.Core/PKM/Util/Experience.cs b/PKHeX.Core/PKM/Util/Experience.cs index f77a58543..32219ba42 100644 --- a/PKHeX.Core/PKM/Util/Experience.cs +++ b/PKHeX.Core/PKM/Util/Experience.cs @@ -9,12 +9,10 @@ public static class Experience /// Gets the current level of a species. /// /// Experience points - /// National Dex number of the Pokémon. - /// AltForm ID (starters in Let's Go) + /// Experience growth rate /// Current level of the species. - public static int GetLevel(uint exp, int species, int forme = 0) + public static int GetLevel(uint exp, int growth) { - int growth = PKX.Personal.GetFormeEntry(species, forme).EXPGrowth; if (exp >= ExpTable[99, growth]) return 100; int tl = 1; // Initial Level. Iterate upwards to find the level @@ -23,19 +21,6 @@ public static int GetLevel(uint exp, int species, int forme = 0) return tl; } - /// - /// Gets the minimum Experience points for the specified level. - /// - /// Current level - /// National Dex number of the Pokémon. - /// AltForm ID (starters in Let's Go) - /// Experience points needed to have specified level. - public static uint GetEXP(int level, int species, int forme) - { - var growth = PKX.Personal.GetFormeEntry(species, forme).EXPGrowth; - return GetEXP(level, growth); - } - /// /// Gets the minimum Experience points for the specified level. /// @@ -62,14 +47,12 @@ public static uint GetEXP(int level, int growth) /// Gets the amount of EXP to be earned until the next level-up occurs. /// /// Current Level - /// - /// AltForm ID (starters in Let's Go) + /// Growth Rate type /// Percentage [0,1.00) - public static uint GetEXPToLevelUp(int level, int species, int forme = 0) + public static uint GetEXPToLevelUp(int level, int growth) { if (level >= 100) return 0; - var growth = PKX.Personal.GetFormeEntry(species, forme).EXPGrowth; var current = ExpTable[level - 1, growth]; var next = ExpTable[level, growth]; return next - current; @@ -80,14 +63,12 @@ public static uint GetEXPToLevelUp(int level, int species, int forme = 0) /// /// Current Level /// Current Experience - /// - /// AltForm ID (starters in Let's Go) + /// Growth Rate type /// Percentage [0,1.00) - public static double GetEXPToLevelUpPercentage(int level, uint exp, int species, int forme = 0) + public static double GetEXPToLevelUpPercentage(int level, uint exp, int growth) { if (level >= 100) return 0; - var growth = PKX.Personal.GetFormeEntry(species, forme).EXPGrowth; var current = ExpTable[level - 1, growth]; var next = ExpTable[level, growth]; var amount = next - current; diff --git a/PKHeX.Core/PKM/Util/FormConverter.cs b/PKHeX.Core/PKM/Util/FormConverter.cs index 0eacd29ec..ac58d0d98 100644 --- a/PKHeX.Core/PKM/Util/FormConverter.cs +++ b/PKHeX.Core/PKM/Util/FormConverter.cs @@ -20,14 +20,8 @@ public static class FormConverter public static string[] GetFormList(int species, IReadOnlyList types, IReadOnlyList forms, IReadOnlyList genders, int generation) { // Mega List - if (IsFormListSingleMega(species)) - { - return new[] - { - types[000], // Normal - forms[804], // Mega - }; - } + if (generation < 8 && IsFormListSingleMega(species)) + return GetMegaSingle(types, forms); if (generation == 7 && Legal.Totem_USUM.Contains(species)) return GetFormsTotem(species, types, forms); @@ -37,15 +31,16 @@ public static string[] GetFormList(int species, IReadOnlyList types, IRe if (species <= Legal.MaxSpeciesID_2) return GetFormsGen2(species, types, forms, generation); if (species <= Legal.MaxSpeciesID_3) - return GetFormsGen3(species, types, forms); + return GetFormsGen3(species, types, forms, generation); if (species <= Legal.MaxSpeciesID_4) return GetFormsGen4(species, types, forms, generation); if (species <= Legal.MaxSpeciesID_5) - return GetFormsGen5(species, types, forms); + return GetFormsGen5(species, types, forms, generation); if (species <= Legal.MaxSpeciesID_6) return GetFormsGen6(species, types, forms, genders); - //if (species <= Legal.MaxSpeciesID_7) + if (species <= Legal.MaxSpeciesID_7_USUM) return GetFormsGen7(species, types, forms); + return GetFormsGen8(species, types, forms, genders); } private static bool IsGG() => GameVersion.GG.Contains(PKMConverter.Trainer.Game); @@ -95,14 +90,9 @@ private static string[] GetFormsGen1(int species, IReadOnlyList types, I { switch ((Species)species) { - case Charizard: - case Mewtwo: - return new[] - { - types[000], // Normal - forms[805], // Mega X - forms[806], // Mega Y - }; + case Charizard when generation < 8: + case Mewtwo when generation < 8: + return GetMegaXY(types, forms); case Eevee when IsGG(): return new[] @@ -114,6 +104,13 @@ private static string[] GetFormsGen1(int species, IReadOnlyList types, I case Pikachu: return GetFormsPikachu(generation, types, forms); + case Weezing when generation >= 8: + case Ponyta when generation >= 8: + case Rapidash when generation >= 8: + case MrMime when generation >= 8: + case Farfetchd when generation >= 8: + return GetFormsGalar(types, forms); + default: return GetFormsAlolan(generation, types, forms, species); } @@ -123,19 +120,24 @@ private static string[] GetFormsGen2(int species, IReadOnlyList types, I { return species switch { - (int)Pichu => GetFormsPichu(generation, types, forms), + (int)Pichu when generation == 4 => GetFormsPichu(types, forms), (int)Unown => GetFormsUnown(generation), + (int)Corsola when generation >= 8 => GetFormsGalar(types, forms), _ => EMPTY }; } - private static string[] GetFormsGen3(int species, IReadOnlyList types, IReadOnlyList forms) + private static string[] GetFormsGen3(int species, IReadOnlyList types, IReadOnlyList forms, int generation) { switch ((Species)species) { default: return EMPTY; + case Zigzagoon when generation >= 8: + case Linoone when generation >= 8: + return GetFormsGalar(types, forms); + case Castform: // Casftorm return new[] { @@ -225,7 +227,7 @@ private static string[] GetFormsGen4(int species, IReadOnlyList types, I } } - private static string[] GetFormsGen5(int species, IReadOnlyList types, IReadOnlyList forms) + private static string[] GetFormsGen5(int species, IReadOnlyList types, IReadOnlyList forms, int generation) { switch ((Species)species) { @@ -239,12 +241,30 @@ private static string[] GetFormsGen5(int species, IReadOnlyList types, I forms[942], // Blue }; + case Darumaka when generation >= 8: + return GetFormsGalar(types, forms); + case Darmanitan: + { + if (generation <= 7) + { + return new[] + { + forms[555], // Standard + forms[943], // Zen + }; + } return new[] { - forms[555], // Standard - forms[943], // Zen + types[0] + " " + forms[555], // Standard + types[0] + " " + forms[943], // Zen + forms[Galarian] + " " + forms[555], // Standard + forms[Galarian] + " " + forms[943], // Zen }; + } + + case Yamask when generation >= 8: + return GetFormsGalar(types, forms); case Deerling: case Sawsbuck: @@ -256,6 +276,9 @@ private static string[] GetFormsGen5(int species, IReadOnlyList types, I forms[949], // Winter }; + case Stunfisk when generation >= 8: + return GetFormsGalar(types, forms); + case Tornadus: case Thundurus: case Landorus: @@ -505,6 +528,87 @@ private static string[] GetFormsGen7(int species, IReadOnlyList types, I } } + private static string[] GetFormsGen8(int species, IReadOnlyList types, IReadOnlyList forms, IReadOnlyList genders) + { + switch ((Species)species) + { + default: + return EMPTY; + + case Cramorant: + return new[] + { + types[0], // Normal + forms[Gulping], + forms[Gorging], + }; + + case Toxtricity: + return new[] + { + types[0], // Normal + forms[LowKey], + }; + + case Indeedee: + return new[] + { + genders[000], // Male + genders[001], // Female + }; + + case Sinistea: + case Polteageist: + return new[] + { + "Cracked", + "Chipped", + }; + + case Alcremie: + return new[] + { + forms[RubyCream], + forms[MatchaCream], + forms[MintCream], + forms[LemonCream], + forms[SaltedCream], + forms[RubySwirl], + forms[CaramelSwirl], + forms[RainbowSwirl], + }; + + case Morpeko: + return new[] + { + types[0], // Normal + forms[HangryMode], + }; + + case Eiscue: + return new[] + { + types[0], // Normal + forms[NoiceFace], + }; + + case Zacian: + case Zamazenta: + return new[] + { + types[0], // Normal + forms[Crowned], + }; + + case Eternatus: + return new[] + { + types[0], // Normal + forms[Eternamax], + }; + } + } + private static string[] GetFormsAlolan (int generation, IReadOnlyList types, IReadOnlyList forms, int species) { if (generation < 7) @@ -515,6 +619,14 @@ private static string[] GetFormsAlolan (int generation, IReadOnlyList ty default: return EMPTY; + case Meowth when generation >= 8: + return new[] + { + types[000], + forms[810], // Alolan + forms[Galarian], // Alolan + }; + case Rattata: case Raichu: case Sandshrew: @@ -557,8 +669,9 @@ private static string[] GetFormsPikachu(int generation, IReadOnlyList ty forms[733], // Libre forms[734], // Cosplay }; - case 7: - var arr = new[] + + case 7 when IsGG(): + return new[] { types[000], // Normal forms[813], // Original @@ -567,28 +680,33 @@ private static string[] GetFormsPikachu(int generation, IReadOnlyList ty forms[816], // Unova forms[817], // Kalos forms[818], // Alola - forms[1063] // Partner + forms[1063], // Partner + Starter, + }; + + case 7: + case 8: + return new[] + { + types[000], // Normal + forms[813], // Original + forms[814], // Hoenn + forms[815], // Sinnoh + forms[816], // Unova + forms[817], // Kalos + forms[818], // Alola + forms[1063], // Partner }; - if (!IsGG()) - return arr; - System.Array.Resize(ref arr, arr.Length + 1); - arr[arr.Length - 1] = Starter; - return arr; } } - private static string[] GetFormsPichu (int generation, IReadOnlyList types, IReadOnlyList forms) + private static string[] GetFormsPichu (IReadOnlyList types, IReadOnlyList forms) { - if (generation == 4) + return new[] { - return new[] - { - types[000], // Normal - forms[000], // Spiky - }; - } - - return EMPTY; + types[000], // Normal + forms[000], // Spiky + }; } private static string[] GetFormsArceus (int generation, IReadOnlyList types) @@ -757,5 +875,63 @@ public static bool HasFormSelection(PersonalInfo pi, int species, int format) (int)Mothim, // (Burmy forme carried over, not cleared) (int)Scatterbug, (int)Spewpa, // Vivillon pre-evos }; + + private static string[] GetMegaSingle(IReadOnlyList types, IReadOnlyList forms) + { + return new[] + { + types[000], // Normal + forms[804], // Mega + }; + } + + private static string[] GetMegaXY(IReadOnlyList types, IReadOnlyList forms) + { + return new[] + { + types[000], // Normal + forms[805], // Mega X + forms[806], // Mega Y + }; + } + + private static string[] GetFormsGalar(IReadOnlyList types, IReadOnlyList forms) + { + return new[] + { + types[000], // Normal + forms[Galarian], // Galarian + }; + } + + private const int Galarian = 1068; + private const int Gigantamax = 1069; + private const int Gulping = 1070; + private const int Gorging = 1071; + private const int LowKey = 1072; + + private const int RubyCream = 1073; + private const int MatchaCream = 1074; + private const int MintCream = 1075; + private const int LemonCream = 1076; + private const int SaltedCream = 1077; + private const int RubySwirl = 1078; + private const int CaramelSwirl = 1079; + private const int RainbowSwirl = 1080; + + private const int NoiceFace = 1081; + private const int HangryMode = 1082; + + private const int Crowned = 1083; + private const int Eternamax = 1084; + + private static string[] GetSingleGigantamax(IReadOnlyList types, IReadOnlyList forms) + { + return new[] + { + types[000], // Normal + forms[Gigantamax], // Gigantamax + }; + } } } diff --git a/PKHeX.Core/PKM/Util/PKX.cs b/PKHeX.Core/PKM/Util/PKX.cs index 0daf836af..824dc537e 100644 --- a/PKHeX.Core/PKM/Util/PKX.cs +++ b/PKHeX.Core/PKM/Util/PKX.cs @@ -10,7 +10,7 @@ namespace PKHeX.Core /// public static class PKX { - internal static readonly PersonalTable Personal = PersonalTable.GG; + internal static readonly PersonalTable Personal = PersonalTable.SWSH; public const int Generation = 7; internal const int SIZE_1ULIST = 69; @@ -44,8 +44,8 @@ public static class PKX // Gen7 Format is the same size as Gen6. internal const int SIZE_8STORED = 8 + (4 * SIZE_8BLOCK); - internal const int SIZE_8PARTY = SIZE_8STORED; // todo swsh - internal const int SIZE_8BLOCK = 72; // todo swsh + internal const int SIZE_8PARTY = SIZE_8STORED + 0x10; + internal const int SIZE_8BLOCK = 80; private static readonly HashSet Sizes = new HashSet { @@ -549,7 +549,7 @@ public static void CheckEncrypted(ref byte[] pkm, int format) pkm = DecryptArray6(pkm); return; case 8: - if (BitConverter.ToUInt16(pkm, 4) != 0) // todo swsh: find hint of encrypted data + if (BitConverter.ToUInt16(pkm, 0x70) != 0 && BitConverter.ToUInt16(pkm, 0xC0) != 0) pkm = DecryptArray8(pkm); return; default: diff --git a/PKHeX.Core/PKM/XK3.cs b/PKHeX.Core/PKM/XK3.cs index 86a64c6a0..51105b4c9 100644 --- a/PKHeX.Core/PKM/XK3.cs +++ b/PKHeX.Core/PKM/XK3.cs @@ -6,7 +6,7 @@ namespace PKHeX.Core /// Generation 3 format, exclusively for Pokémon XD. public sealed class XK3 : G3PKM, IShadowPKM { - private static readonly byte[] Unused = + private static readonly ushort[] Unused = { 0x0A, 0x0B, 0x0C, 0x0D, 0x1E, 0x1F, 0x2A, 0x2B, @@ -14,7 +14,7 @@ public sealed class XK3 : G3PKM, IShadowPKM 0x7E, 0x7F }; - public override IReadOnlyList ExtraBytes => Unused; + public override IReadOnlyList ExtraBytes => Unused; public override int SIZE_PARTY => PKX.SIZE_3XSTORED; public override int SIZE_STORED => PKX.SIZE_3XSTORED; diff --git a/PKHeX.Core/PersonalInfo/PersonalInfoSWSH.cs b/PKHeX.Core/PersonalInfo/PersonalInfoSWSH.cs index 525b8edb1..817f98109 100644 --- a/PKHeX.Core/PersonalInfo/PersonalInfoSWSH.cs +++ b/PKHeX.Core/PersonalInfo/PersonalInfoSWSH.cs @@ -5,17 +5,96 @@ namespace PKHeX.Core /// /// class with values from the games. /// - public sealed class PersonalInfoSWSH : PersonalInfoSM + public sealed class PersonalInfoSWSH : PersonalInfo { - public new const int SIZE = PersonalInfoSM.SIZE; + public const int SIZE = 0xA8; - // todo: this is a copy of lgpe class public PersonalInfoSWSH(byte[] data) : base(data) { - TMHM = GetBits(Data, 0x28, 8); // only 60 TMs used - TypeTutors = GetBits(Data, 0x38, 1); // at most 8 flags used + TMHM = new bool[200]; + for (var i = 0; i < 100; i++) + { + TMHM[i] = FlagUtil.GetFlag(Data, 0x28 + (i >> 3), i); + TMHM[i + 100] = FlagUtil.GetFlag(Data, 0x3C + (i >> 3), i); + } + TypeTutors = Array.Empty(); } - public int GoSpecies { get => BitConverter.ToUInt16(Data, 0x48); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x48); } + public override byte[] Write() + { + for (var i = 0; i < 100; i++) + { + FlagUtil.SetFlag(Data, 0x28 + (i >> 3), i, TMHM[i]); + FlagUtil.SetFlag(Data, 0x3C + (i >> 3), i, TMHM[i + 100]); + } + return Data; + } + + public override int HP { get => Data[0x00]; set => Data[0x00] = (byte)value; } + public override int ATK { get => Data[0x01]; set => Data[0x01] = (byte)value; } + public override int DEF { get => Data[0x02]; set => Data[0x02] = (byte)value; } + public override int SPE { get => Data[0x03]; set => Data[0x03] = (byte)value; } + public override int SPA { get => Data[0x04]; set => Data[0x04] = (byte)value; } + public override int SPD { get => Data[0x05]; set => Data[0x05] = (byte)value; } + public override int Type1 { get => Data[0x06]; set => Data[0x06] = (byte)value; } + public override int Type2 { get => Data[0x07]; set => Data[0x07] = (byte)value; } + public override int CatchRate { get => Data[0x08]; set => Data[0x08] = (byte)value; } + public override int EvoStage { get => Data[0x09]; set => Data[0x09] = (byte)value; } + private int EVYield { get => BitConverter.ToUInt16(Data, 0x0A); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x0A); } + public override int EV_HP { get => EVYield >> 0 & 0x3; set => EVYield = (EVYield & ~(0x3 << 0)) | (value & 0x3) << 0; } + public override int EV_ATK { get => EVYield >> 2 & 0x3; set => EVYield = (EVYield & ~(0x3 << 2)) | (value & 0x3) << 2; } + public override int EV_DEF { get => EVYield >> 4 & 0x3; set => EVYield = (EVYield & ~(0x3 << 4)) | (value & 0x3) << 4; } + public override int EV_SPE { get => EVYield >> 6 & 0x3; set => EVYield = (EVYield & ~(0x3 << 6)) | (value & 0x3) << 6; } + public override int EV_SPA { get => EVYield >> 8 & 0x3; set => EVYield = (EVYield & ~(0x3 << 8)) | (value & 0x3) << 8; } + public override int EV_SPD { get => EVYield >> 10 & 0x3; set => EVYield = (EVYield & ~(0x3 << 10)) | (value & 0x3) << 10; } + public int Item1 { get => BitConverter.ToInt16(Data, 0x0C); set => BitConverter.GetBytes((short)value).CopyTo(Data, 0x0C); } + public int Item2 { get => BitConverter.ToInt16(Data, 0x0E); set => BitConverter.GetBytes((short)value).CopyTo(Data, 0x0E); } + public int Item3 { get => BitConverter.ToInt16(Data, 0x10); set => BitConverter.GetBytes((short)value).CopyTo(Data, 0x10); } + public override int Gender { get => Data[0x12]; set => Data[0x12] = (byte)value; } + public override int HatchCycles { get => Data[0x13]; set => Data[0x13] = (byte)value; } + public override int BaseFriendship { get => Data[0x14]; set => Data[0x14] = (byte)value; } + public override int EXPGrowth { get => Data[0x15]; set => Data[0x15] = (byte)value; } + public override int EggGroup1 { get => Data[0x16]; set => Data[0x16] = (byte)value; } + public override int EggGroup2 { get => Data[0x17]; set => Data[0x17] = (byte)value; } + public int Ability1 { get => BitConverter.ToUInt16(Data, 0x18); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x18); } + public int Ability2 { get => BitConverter.ToUInt16(Data, 0x1A); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x1A); } + public int AbilityH { get => BitConverter.ToUInt16(Data, 0x1C); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x1C); } + public override int EscapeRate { get => 0; set { } } // moved? + protected internal override int FormStatsIndex { get => BitConverter.ToUInt16(Data, 0x1E); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x1E); } + public override int FormeSprite { get => BitConverter.ToUInt16(Data, 0x1E); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x1E); } // ??? + public override int FormeCount { get => Data[0x20]; set => Data[0x20] = (byte)value; } + public override int Color { get => Data[0x21] & 0x3F; set => Data[0x21] = (byte)((Data[0x21] & 0xC0) | (value & 0x3F)); } + public bool IsPresentInGame { get => ((Data[0x21] >> 6) & 1) == 1; set => Data[0x21] = (byte)((Data[0x21] & ~0x40) | (value ? 0x40 : 0)); } + public bool SpriteForme { get => ((Data[0x21] >> 7) & 1) == 1; set => Data[0x21] = (byte)((Data[0x21] & ~0x80) | (value ? 0x80 : 0)); } + public override int BaseEXP { get => BitConverter.ToUInt16(Data, 0x22); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x22); } + public override int Height { get => BitConverter.ToUInt16(Data, 0x24); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x24); } + public override int Weight { get => BitConverter.ToUInt16(Data, 0x26); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x26); } + + public override int[] Items + { + get => new[] { Item1, Item2, Item3 }; + set + { + if (value?.Length != 3) return; + Item1 = value[0]; + Item2 = value[1]; + Item3 = value[2]; + } + } + + public override int[] Abilities + { + get => new[] { Ability1, Ability2, AbilityH }; + set + { + if (value?.Length != 3) return; + Ability1 = value[0]; + Ability2 = value[1]; + AbilityH = value[2]; + } + } + + public int BaseSpecies { get => BitConverter.ToUInt16(Data, 0x4C); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x4C); } + public int PokeDexIndex { get => BitConverter.ToUInt16(Data, 0x5C); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x5C); } } } \ No newline at end of file diff --git a/PKHeX.Core/PersonalInfo/PersonalTable.cs b/PKHeX.Core/PersonalInfo/PersonalTable.cs index 865edff76..592812e58 100644 --- a/PKHeX.Core/PersonalInfo/PersonalTable.cs +++ b/PKHeX.Core/PersonalInfo/PersonalTable.cs @@ -15,7 +15,7 @@ public class PersonalTable /// /// Personal Table used in . /// - public static readonly PersonalTable SWSH = GetTable("gg", GameVersion.SWSH); // todo + public static readonly PersonalTable SWSH = GetTable("swsh", GameVersion.SWSH); // todo /// /// Personal Table used in . @@ -164,7 +164,7 @@ private static int GetEntrySize(GameVersion format) case GameVersion.SM: case GameVersion.USUM: case GameVersion.GG: return PersonalInfoSM.SIZE; - case GameVersion.SWSH: return PersonalInfoSWSH.SIZE; // todo + case GameVersion.SWSH: return PersonalInfoSWSH.SIZE; default: return -1; } @@ -175,6 +175,7 @@ private static int GetEntrySize(GameVersion format) FixPersonalTableG1(); PopulateGen3Tutors(); PopulateGen4Tutors(); + CopyDexitGenders(); } private static void FixPersonalTableG1() @@ -207,6 +208,20 @@ private static void PopulateGen4Tutors() HGSS[i].AddTypeTutors(tutors[i]); } + /// + /// Sword/Shield do not contain personal data (stubbed) for all species that are not allowed to visit the game. + /// Copy all the genders from 's table for all past species, since we need it for gender lookups for all generations. + /// + private static void CopyDexitGenders() + { + for (int i = 1; i <= 807; i++) + { + var ss = SWSH[i]; + if (ss.HP == 0) + ss.Gender = USUM[i].Gender; + } + } + public PersonalTable(byte[] data, GameVersion format) { var get = GetConstructor(format); diff --git a/PKHeX.Core/Resources/byte/eggmove_swsh.pkl b/PKHeX.Core/Resources/byte/eggmove_swsh.pkl index eb556c2ec..2cca357cf 100644 Binary files a/PKHeX.Core/Resources/byte/eggmove_swsh.pkl and b/PKHeX.Core/Resources/byte/eggmove_swsh.pkl differ diff --git a/PKHeX.Core/Resources/byte/encounter_sh.pkl b/PKHeX.Core/Resources/byte/encounter_sh.pkl index eb556c2ec..31a331289 100644 Binary files a/PKHeX.Core/Resources/byte/encounter_sh.pkl and b/PKHeX.Core/Resources/byte/encounter_sh.pkl differ diff --git a/PKHeX.Core/Resources/byte/encounter_sw.pkl b/PKHeX.Core/Resources/byte/encounter_sw.pkl index eb556c2ec..deda6bd17 100644 Binary files a/PKHeX.Core/Resources/byte/encounter_sw.pkl and b/PKHeX.Core/Resources/byte/encounter_sw.pkl differ diff --git a/PKHeX.Core/Resources/byte/evos_ss.pkl b/PKHeX.Core/Resources/byte/evos_ss.pkl new file mode 100644 index 000000000..beec2feeb Binary files /dev/null and b/PKHeX.Core/Resources/byte/evos_ss.pkl differ diff --git a/PKHeX.Core/Resources/byte/evos_swsh.pkl b/PKHeX.Core/Resources/byte/evos_swsh.pkl deleted file mode 100644 index eb556c2ec..000000000 --- a/PKHeX.Core/Resources/byte/evos_swsh.pkl +++ /dev/null @@ -1 +0,0 @@ -todo :^) \ No newline at end of file diff --git a/PKHeX.Core/Resources/byte/lvlmove_swsh.pkl b/PKHeX.Core/Resources/byte/lvlmove_swsh.pkl index eb556c2ec..20694670b 100644 Binary files a/PKHeX.Core/Resources/byte/lvlmove_swsh.pkl and b/PKHeX.Core/Resources/byte/lvlmove_swsh.pkl differ diff --git a/PKHeX.Core/Resources/byte/personal_swsh b/PKHeX.Core/Resources/byte/personal_swsh index eb556c2ec..64c5fb2a9 100644 Binary files a/PKHeX.Core/Resources/byte/personal_swsh and b/PKHeX.Core/Resources/byte/personal_swsh differ diff --git a/PKHeX.Core/Resources/byte/wc8.pkl b/PKHeX.Core/Resources/byte/wc8.pkl new file mode 100644 index 000000000..30a8b020b Binary files /dev/null and b/PKHeX.Core/Resources/byte/wc8.pkl differ diff --git a/PKHeX.Core/Resources/text/de/text_Abilities_de.txt b/PKHeX.Core/Resources/text/de/text_Abilities_de.txt index 3c7567acd..941598e31 100644 --- a/PKHeX.Core/Resources/text/de/text_Abilities_de.txt +++ b/PKHeX.Core/Resources/text/de/text_Abilities_de.txt @@ -34,7 +34,7 @@ Edelmut Wassertempo Chlorophyll Erleuchtung -Fährte +Erfassen Kraftkoloss Giftdorn Konzentrator @@ -58,7 +58,7 @@ Charmebolzen Plus Minus Prognose -Wertehalter +Klebekörper Expidermis Adrenalin Notschutz @@ -140,7 +140,7 @@ Hitzewahn Reiche Ernte Telepathie Gefühlswippe -Wetterfest +Partikelschutz Giftgriff Belebekraft Brustbieter @@ -231,4 +231,29 @@ Gras-Erzeuger Metallprotektor Phantomschutz Prismarüstung -Zerebralmacht \ No newline at end of file +Zerebralmacht +Kühnes Schwert +Wackerer Schild +Libero +Apport +Wollflaum +Schraubflosse +Spiegelrüstung +Würggeschoss +Stahlrückgrat +Dampfantrieb +Punk Rock +Sandspeier +Eisflügelstaub +Heranreifen +Tiefkühlkopf +Kraftquelle +Mimese +Hemmungslos +Stählerner Wille +Unheilskörper +Rastlose Seele +Affenfokus +Reaktionsgas +Pastellhülle +Heißhunger \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/de/text_Forms_de.txt b/PKHeX.Core/Resources/text/de/text_Forms_de.txt index 8e7b2b906..3cd2f3b9b 100644 --- a/PKHeX.Core/Resources/text/de/text_Forms_de.txt +++ b/PKHeX.Core/Resources/text/de/text_Forms_de.txt @@ -1065,4 +1065,21 @@ Partner Abend Abend Morgen -Ultra \ No newline at end of file +Ultra +Galar +Gigadynamax +Schlingform +Stopfform +Tief +Ruby +Matcha +Minz +Zitronen +Salz +Ruby +Karamell +Trio +Wohlfühlkopf +Kohldampfmuster +König +Unendynamax \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/de/text_GenLoc_de.txt b/PKHeX.Core/Resources/text/de/text_GenLoc_de.txt index cb4aa214b..4074e64ee 100644 --- a/PKHeX.Core/Resources/text/de/text_GenLoc_de.txt +++ b/PKHeX.Core/Resources/text/de/text_GenLoc_de.txt @@ -1,6 +1,6 @@ -irgendwo +irgendwo in der ersten Stadt -in [VAR GENDBR(00FF,0506,0000)]dessenderen Zuhause +zu Hause im Zuhause eines Freundes in irgendjemandes Zuhause in einer lebhaften Stadt @@ -28,7 +28,7 @@ in einem Museum in einem Filmstudio in einem Bahnhof an einem Kampfschauplatz -in einem Schönheitssalon +in einem Friseursalon in einem Restaurant in einem Edelrestaurant in einer Küstenstadt @@ -36,7 +36,7 @@ im Inneren eines hohen Gebäudes in einer geheimnisvollen Stadt in einer Stadt am Fluss in einer schneebedeckten Stadt -in der Pokémon Liga +in der Pokémon-Liga in einem Palast in einer Höhle in einem Wald @@ -60,12 +60,21 @@ auf einem Feld in einer Ruine auf einer Wasserroute auf einer Safari -in einer Geheimbasis +auf einem großen Schiff +beim Flug durch die Lüfte in einer Wettbewerbshalle +an einem geheimnisvollen Ort +auf einer kleinen Insel +auf einem aschebedeckten Weg +in einer Geheimbasis in der Tiefe des Meeres an einem wundersamen Ort -auf einem großen Schiff -auf einem aschebedeckten Weg -auf einer kleinen Insel -an einem geheimnisvollen Ort -beim Flug durch die Lüfte \ No newline at end of file +auf einem Weg mit Seeblick +auf einer weiten Grasebene +in einem Stadion +in einem Pokémon-Hort +in einer Mine +in einer Stadt in den Bergen +in einer heruntergekommenen Stadt +in einem Tunnel +an einem gefährlichen Ort \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/de/text_Items_de.txt b/PKHeX.Core/Resources/text/de/text_Items_de.txt index a401b276b..f8df05c3b 100644 --- a/PKHeX.Core/Resources/text/de/text_Items_de.txt +++ b/PKHeX.Core/Resources/text/de/text_Items_de.txt @@ -56,11 +56,11 @@ Spezialität Megablock Angriffplus X-Angriff -X-Abwehr -X-Tempo -X-Treffer -X-Spezial -X-Spezial-Vert. +X-Verteidigung +X-Initiative +X-Genauigkeit +X-Sp.-Ang. +X-Sp.-Vert. Poképuppe Eneco-Rute Blaue Flöte @@ -108,7 +108,7 @@ Steinknochen Leuchtstein Finsterstein Funkelstein -Ovalen Stein +Ovaler Stein Spiritkern Platinum-Orb Tee @@ -228,7 +228,7 @@ Abysszahn Abyssplatte Rauchball Ewigstein -Fokus-Band +Fokusband Glücks-Ei Scope-Linse Metallmantel @@ -238,11 +238,11 @@ Kugelblitz Pudersand Granitstein Wundersaat -Schattenglas +Schattenbrille Schwarzgurt Magnet Zauberwasser -Hackattack +Spitzer Schnabel Giftstich Ewiges Eis Bannsticker @@ -251,21 +251,21 @@ Holzkohle Drachenzahn Seidenschal Up-Grade -Seegesang +Muschelglocke Seerauch Laxrauch Lucky Punch Metallstaub Kampfknochen Lauchstange -Roten Schal -Blauen Schal +Roter Schal +Blauer Schal Rosa Schal -Grünen Schal -Gelben Schal +Grüner Schal +Gelber Schal Großlinse Muskelband -Schlauglas +Schlaubrille Expertengurt Lichtlehm Leben-Orb @@ -295,7 +295,7 @@ Machtkette Machtgewicht Wechselhülle Großwurzel -Wahlglas +Wahlbrille Feuertafel Wassertafel Blitztafel @@ -426,7 +426,7 @@ VM05 VM06 ??? ??? -Forschersack +Erkundungs-Set Beutesack Regelbuch Pokéradar @@ -484,12 +484,12 @@ Silberflügel Buntschwinge Rätsel-Ei Aprikoko Rot -Aprikoko Blu -Aprikoko Glb -Aprikoko Grn -Aprikoko Pnk -Aprikoko Wss -Aprikoko Swz +Aprikoko Blau +Aprikoko Gelb +Aprikoko Grün +Aprikoko Pink +Aprikoko Weiß +Aprikoko Schwarz Turboball Levelball Köderball @@ -532,8 +532,8 @@ Datenkarte26 Datenkarte27 Grüne Kugel Tresorkapsel -Roten Edelstein -Blauen Edelstein +Roter Edelstein +Blauer Edelstein Mytokristall Schönschuppe Evolith @@ -582,33 +582,33 @@ Duftpilz Riesennugget Triperle Kometstück -Alten Heller -Alten Taler -Alten Dukaten +Alter Heller +Alter Taler +Alter Dukat Alte Vase -Alten Reif +Alter Reif Alte Statue Alte Krone Stratos-Eis Angriffplus2 -X-Tempo2 -X-Spezial2 -X-Sp.-Vert.2 -X-Abwehr2 -X-Angriff2 -X-Treffer2 -X-Tempo3 -X-Spezial3 -X-Sp.-Vert.3 -X-Abwehr3 -X-Angriff3 -X-Treffer3 -X-Tempo6 -X-Spezial6 -X-Sp.-Vert.6 -X-Abwehr6 -X-Angriff6 -X-Treffer6 +X-Initiative 2 +X-Sp.-Ang. 2 +X-Sp.-Vert. 2 +X-Verteidigung 2 +X-Angriff 2 +X-Genauigkeit 2 +X-Initiative 3 +X-Sp.-Ang. 3 +X-Sp.-Vert. 3 +X-Verteidigung 3 +X-Angriff 3 +X-Genauigkeit 3 +X-Initiative 6 +X-Sp.-Ang. 6 +X-Sp.-Vert. 6 +X-Verteidigung 6 +X-Angriff 6 +X-Genauigkeit 6 Fähigk.-Appell Itemabwurf Itemappell @@ -633,7 +633,7 @@ Ovalpin Schillerpin Plasmakarte Schnäuztuch -Achromaten +Achromat Fundsache Fundsache Wahrspiegel @@ -695,8 +695,8 @@ TM99 TM100 Kraftwerks-Pass Mega-Ring -Kuriosen Stein -Normalen Stein +Kurioser Stein +Normaler Stein Rabattmarke Liftschlüssel TMV-Pass @@ -726,7 +726,7 @@ Pokériegel-Set Brief an Troy Äon-Ticket Scanner -Wüstenglas +Wüstenbrille Meteorit R1-Schlüssel R2-Schlüssel @@ -851,10 +851,10 @@ Eisstein PokéMobil-Funk Ultraball Maxi-Malasada -Roten Nektar -Gelben Nektar +Roter Nektar +Gelber Nektar Rosa Nektar -Purpurnen Nektar +Purpurner Nektar Sonnenflöte Mondflöte ??? @@ -1055,4 +1055,525 @@ Dratini-Bonbon Mewtu-Bonbon Mew-Bonbon Meltan-Bonbon -Magmar-Bonbon \ No newline at end of file +Magmar-Bonbon +??? +??? +??? +??? +??? +??? +??? +??? +??? +??? +??? +??? +??? +??? +??? +??? +Empfehlungsbrief +Pokémon-Box +Wunschstern +Dynamax-Band +??? +??? +Angel +Rotom-Rad +??? +??? +Würstchen +Pauls Feinkost +Bachs Feinkost +Dosenbohnen +Toastbrot +Spaghetti +Pilzmix +Röstrute +Dicker Lauch +Luxusapfel +Feine Knochen +Kartoffeln +Uferkraut +Gemüse +Frittiertes +Gekochtes Ei +Camping-Set +??? +??? +Rostiges Schwert +Rostiger Schild +Vogelfossil +Fischfossil +Drachenfossil +Paddelfossil +Zucker-Erdbeere +Zucker-Herz +Zucker-Beere +Zucker-Kleeblatt +Zucker-Blume +Zucker-Stern +Zucker-Schleife +Süßer Apfel +Saurer Apfel +Halsspray +Fluchttasche +Plateauschuhe +Fehlschlagschutz +Bizarroservice +Allzweckschirm +EP-Bonbon XS +EP-Bonbon S +EP-Bonbon M +EP-Bonbon L +EP-Bonbon XL +Dynamax-Bonbon +TP00 +TP01 +TP02 +TP03 +TP04 +TP05 +TP06 +TP07 +TP08 +TP09 +TP10 +TP11 +TP12 +TP13 +TP14 +TP15 +TP16 +TP17 +TP18 +TP19 +TP20 +TP21 +TP22 +TP23 +TP24 +TP25 +TP26 +TP27 +TP28 +TP29 +TP30 +TP31 +TP32 +TP33 +TP34 +TP35 +TP36 +TP37 +TP38 +TP39 +TP40 +TP41 +TP42 +TP43 +TP44 +TP45 +TP46 +TP47 +TP48 +TP49 +TP50 +TP51 +TP52 +TP53 +TP54 +TP55 +TP56 +TP57 +TP58 +TP59 +TP60 +TP61 +TP62 +TP63 +TP64 +TP65 +TP66 +TP67 +TP68 +TP69 +TP70 +TP71 +TP72 +TP73 +TP74 +TP75 +TP76 +TP77 +TP78 +TP79 +TP80 +TP81 +TP82 +TP83 +TP84 +TP85 +TP86 +TP87 +TP88 +TP89 +TP90 +TP91 +TP92 +TP93 +TP94 +TP95 +TP96 +TP97 +TP98 +TP99 +TM00 +Solo-Minze +Hart-Minze +Frech-Minze +Mutig-Minze +Kühn-Minze +Pfiffig-Minze +Lasch-Minze +Locker-Minze +Mäßig-Minze +Mild-Minze +Hitzig-Minze +Ruhig-Minze +Still-Minze +Zart-Minze +Sacht-Minze +Forsch-Minze +Scheu-Minze +Hastig-Minze +Froh-Minze +Naiv-Minze +Ernst-Minze +Wunschbrocken +Rissige Kanne +Löchrige Kanne +Top-Ohrenstöpsel +Früchte +Kuhmuh-Käse +Gewürzmix +Frische Sahne +Fertigcurry +Kokosmilch +Fertignudeln +Frikadellen +Giga-Pulver +Wunschsplitter +Rotom-Rad +Superfangpin +??? +Vergilbter Brief +Band-Autogramm +Sanias Buch +??? +??? +??? +??? +??? +??? +Rotom-Katalog +★And458 +★And15 +★And337 +★And603 +★And390 +★Sgr6879 +★Sgr6859 +★Sgr6913 +★Sgr7348 +★Sgr7121 +★Sgr6746 +★Sgr7194 +★Sgr7337 +★Sgr7343 +★Sgr6812 +★Sgr7116 +★Sgr7264 +★Sgr7597 +★Del7882 +★Del7906 +★Del7852 +★Psc596 +★Psc361 +★Psc510 +★Psc437 +★Psc8773 +★Lep1865 +★Lep1829 +★Boo5340 +★Boo5506 +★Boo5435 +★Boo5602 +★Boo5733 +★Boo5235 +★Boo5351 +★Hya3748 +★Hya3903 +★Hya3418 +★Hya3482 +★Hya3845 +★Eri1084 +★Eri472 +★Eri1666 +★Eri897 +★Eri1231 +★Eri874 +★Eri1298 +★Eri1325 +★Eri984 +★Eri1464 +★Eri1393 +★Eri850 +★Tau1409 +★Tau1457 +★Tau1165 +★Tau1791 +★Tau1910 +★Tau1346 +★Tau1373 +★Tau1412 +★CMa2491 +★CMa2693 +★CMa2294 +★CMa2827 +★CMa2282 +★CMa2618 +★CMa2657 +★CMa2646 +★UMa4905 +★UMa4301 +★UMa5191 +★UMa5054 +★UMa4295 +★UMa4660 +★UMa4554 +★UMa4069 +★UMa3569 +★UMa3323 +★UMa4033 +★UMa4377 +★UMa4375 +★UMa4518 +★UMa3594 +★Vir5056 +★Vir4825 +★Vir4932 +★Vir4540 +★Vir4689 +★Vir5338 +★Vir4910 +★Vir5315 +★Vir5359 +★Vir5409 +★Vir5107 +★Ari617 +★Ari553 +★Ari546 +★Ari951 +★Ori1713 +★Ori2061 +★Ori1790 +★Ori1903 +★Ori1948 +★Ori2004 +★Ori1852 +★Ori1879 +★Ori1899 +★Ori1543 +★Cas21 +★Cas168 +★Cas403 +★Cas153 +★Cas542 +★Cas219 +★Cas265 +★Cnc3572 +★Cnc3208 +★Cnc3461 +★Cnc3449 +★Cnc3429 +★Cnc3627 +★Cnc3268 +★Cnc3249 +★Com4968 +★Crv4757 +★Crv4623 +★Crv4662 +★Crv4786 +★Aur1708 +★Aur2088 +★Aur1605 +★Aur2095 +★Aur1577 +★Aur1641 +★Aur1612 +★Pav7790 +★Cet911 +★Cet681 +★Cet188 +★Cet539 +★Cet804 +★Cep8974 +★Cep8162 +★Cep8238 +★Cep8417 +★Cen5267 +★Cen5288 +★Cen551 +★Cen5459 +★Cen5460 +★CMi2943 +★CMi2845 +★Equ8131 +★Vul7405 +★UMi424 +★UMi5563 +★UMi5735 +★UMi6789 +★Crt4287 +★Lyr7001 +★Lyr7178 +★Lyr7106 +★Lyr7298 +★Ara6585 +★Sco6134 +★Sco6527 +★Sco6553 +★Sco5953 +★Sco5984 +★Sco6508 +★Sco6084 +★Sco5944 +★Sco6630 +★Sco6027 +★Sco6247 +★Sco6252 +★Sco5928 +★Sco6241 +★Sco6165 +★Tri544 +★Leo3982 +★Leo4534 +★Leo4357 +★Leo4057 +★Leo4359 +★Leo4031 +★Leo3852 +★Leo3905 +★Leo3773 +★Gru8425 +★Gru8636 +★Gru8353 +★Lib5685 +★Lib5531 +★Lib5787 +★Lib5603 +★Pup3165 +★Pup3185 +★Pup3045 +★Cyg7924 +★Cyg7417 +★Cyg7796 +★Cyg8301 +★Cyg7949 +★Cyg7528 +★Oct7228 +★Col1956 +★Col2040 +★Col2177 +★Gem2990 +★Gem2891 +★Gem2421 +★Gem2473 +★Gem2216 +★Gem2777 +★Gem2650 +★Gem2286 +★Gem2484 +★Gem2930 +★Peg8775 +★Peg8781 +★Peg39 +★Peg8308 +★Peg8650 +★Peg8634 +★Peg8684 +★Peg8450 +★Peg8880 +★Peg8905 +★Oph6556 +★Oph6378 +★Oph6603 +★Oph6149 +★Oph6056 +★Oph6075 +★Ser5854 +★Ser7141 +★Ser5879 +★Her6406 +★Her6148 +★Her6410 +★Her6526 +★Her6117 +★Her6008 +★Per936 +★Per1017 +★Per1131 +★Per1228 +★Per834 +★Per941 +★Phe99 +★Phe338 +★Vel3634 +★Vel3485 +★Vel3734 +★Aqr8232 +★Aqr8414 +★Aqr8709 +★Aqr8518 +★Aqr7950 +★Aqr8499 +★Aqr8610 +★Aqr8264 +★Cru4853 +★Cru4730 +★Cru4763 +★Cru4700 +★Cru4656 +★PsA8728 +★TrA6217 +★Cap7776 +★Cap7754 +★Cap8278 +★Cap8322 +★Cap7773 +★Sge7479 +★Car2326 +★Car3685 +★Car3307 +★Car3699 +★Dra5744 +★Dra5291 +★Dra6705 +★Dra6536 +★Dra7310 +★Dra6688 +★Dra4434 +★Dra6370 +★Dra7462 +★Dra6396 +★Dra6132 +★Dra6636 +★CVn4915 +★CVn4785 +★CVn4846 +★Aql7595 +★Aql7557 +★Aql7525 +★Aql7602 +★Aql7235 \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/de/text_Memories_de.txt b/PKHeX.Core/Resources/text/de/text_Memories_de.txt index 72d142b32..6a8489940 100644 --- a/PKHeX.Core/Resources/text/de/text_Memories_de.txt +++ b/PKHeX.Core/Resources/text/de/text_Memories_de.txt @@ -36,72 +36,93 @@ wie müde es war irgendein Item irgendeine Attacke Pokémon -Es scheint ein gutes Gedächtnis zu haben, aber es sieht so aus, als könnte es sich nicht erinnern... -{0} ist {1} {2} begegnet. {1} warf einen Pokéball und ihre gemeinsame Reise begann. {4} {3}. -{0} sah {1} zum ersten Mal, als es {2} aus seinem Ei geschlüpft ist. {4} {3}. +{0} scheint schöne Erinnerungen zu haben, kann sich aber gerade nicht entsinnen. +{0} ist {1} {2} begegnet. Die gemeinsame Reise begann mit einem gezielten Pokéball-Wurf. {4} {3}. +{0} hat {1} zum ersten Mal gesehen, als es {2} aus seinem Ei geschlüpft ist. {4} {3}. {0} ist {1} {2} begegnet. {4} {3}. -{0} gelangte per Tausch {2} in das Team von {1}. {4} {3}. +{0} gelangte durch einen Tausch {2} in das Team von {1}. {4} {3}. {0} ist mit {1} in ein Pokémon-Center gegangen, um {2} zu kaufen. {4} {3}. -{0} wurde von {1} irgendwo in ein Pokémon-Center gebracht und dort wieder aufgepäppelt.Wo war das noch gleich? Ach ja, {2}! {4} {3}. -{0} war mit {1} fischen. Zusammen haben sie ein {2} geangelt! {4} {3}. -{0} war mit {1} angeln und {1} hat ein mühsam an Land gezogenes Pokémon entkommen lassen. {4} {3}. +{0} wurde von {1} ins Pokémon-Center gebracht und aufgepäppelt. {4} {3}. +{0} war mit {1} angeln. Zusammen haben sie ein {2} an Land gezogen. {4} {3}. +{0} war mit {1} angeln, als ihnen ein mühsam an Land gezogenes Pokémon doch noch entkommen ist. {4} {3}. {0} hat gesehen, wie {1} sich um ein {2} gekümmert hat. {4} {3}. {0} hat von {1} Süßigkeiten bekommen. {4} {3}. -{0} war mit {1} shoppen. {4} {3}. -{0} hat von {1} {2} gelernt. {4} {3}. +{0} war mit {1} Klamotten shoppen. {4} {3}. +{0} bekam von {1} die Attacke {2} beigebracht. {4} {3}. {0} hat {1} dabei geholfen, ein {2} aus einem Ei schlüpfen zu lassen. {4} {3}. {0} war dabei, als {1} ein {2} gefangen hat. {4} {3}. -Als {0} nur noch wenige KP hatte, setzte {1} ein Item ein.Wie hieß das Item noch gleich? Ach ja, {2}! {4} {3}. -{0} hat auf Anweisung von {1} {2} eingesetzt, aber die Attacke hat keinerlei Wirkung gezeigt. {4} {3}. -{0} hat zusammen mit {1} gekämpft und ein {2} besiegt. {4} {3}. +Als {0} in der Klemme steckte, hat {1} {2} eingesetzt. {4} {3}. +{0} hat auf Anweisung von {1} die Attacke {2} eingesetzt, aber sie zeigte keine Wirkung. {4} {3}. +{0} hat an der Seite von {1} gekämpft und ein {2} besiegt. {4} {3}. {0} wurde von einem {2} besiegt und ist mit {1} geflüchtet. {4} {3}. -{0} wurde von {1} trainiert und hat sich {2} entwickelt. {4} {3}. -{0} ist mit {1} auf seinem Rücken übers Wasser gesurft. {4} {3}. +{0} wurde von {1} trainiert und hat sich dann {2} entwickelt. {4} {3}. +{0} ist übers Wasser gesurft und hat dabei {1} auf dem Rücken getragen. {4} {3}. {0} hat gesehen, wie {1} von einem {2} auf dessen Rücken getragen wurde. {4} {3}. -{0} und {1} haben zusammen einen Arenaorden errungen. {4} {3}. +{0} hat mit {1} einen Arenaleiterkampf gewonnen. {4} {3}. Als {1} sich der Herausforderung im Kampfhaus gestellt hat, war {0} extrem nervös. {4} {3}. -{0} ist mit {1} auf seinem Rücken geflogen und sie landeten {2}. {4} {3}. +{0} ist mit {1} auf dem Rücken losgeflogen, um dann {2} zu landen. {4} {3}. {0} wurde zusammen mit {1} von einem wilden {2} überrascht. {4} {3}. -{0} hat gesehen, wie {1} ein Item eingesetzt hat.Wie hieß das Item noch gleich? Ach ja, {2}! {4} {3}. +{0} hat gesehen, wie {1} {2} eingesetzt hat. {4} {3}. {0} hat zusammen mit {1} den Champ besiegt. {4} {3}. {0} war dabei, als {1} den Pokédex vervollständigt hat. {4} {3}. -{0} und {1} sind zusammen {2} begegnet. {4} {3}. -{0} war dabei, als {1} eine Kampf-Châtelaine besiegt hat. {4} {3}. +{0} und {1} sind zusammen einem {2} begegnet. {4} {3}. +{0} war dabei, als {1} die höchste Autorität in Sachen Kämpfe besiegt hat. {4} {3}. {0} hat mit {1} {2} mit dem Itemradar nach versteckten Items gesucht. {4} {3}. {0} war mit {1} {2} Radfahren. {4} {3}. -{0} hat mit {1} {2} ein neues Reiseziel auf der Karte festgelegt. {4} {3}. -{0} hat zusammen mit {1} eine {2} gepflanzt und sich vorgestellt, wie reich die Ernte sein würde. {4} {3}. -{0} hat auf Befehl von {1} {2} die Attacke Stärke eingesetzt. {4} {3}. -{0} hat auf Befehl von {1} {2} die Attacke Zerschneider eingesetzt. {4} {3}. -{0} hat auf Befehl von {1} {2} einen Felsen zertrümmert. {4} {3}. -{0} hat mit {1} auf seinem Rücken {2} die Attacke Kaskade eingesetzt. {4} {3}. -{0} hat gesehen, wie {1} {2} heimlich etwas aufgehoben hat. {4} {3}. -{0} hat von {1} ein Item zum Tragen bekommen.Wie hieß das Item noch gleich? Ach ja, {2}! {4} {3}. -{0} ist mit {1} zur Siegesstraße aufgebrochen. {4} {3}. -{0} hat mit {1} ein Schild {2} gelesen. {4} {3}. +{0} hat mit {1} {2} auf der Karte überprüft, wo es langgeht. {4} {3}. +{0} hat mit {1} {2} gepflanzt und sich vorgestellt, wie reich die Ernte sein würde. {4} {3}. +{0} hat auf Wunsch von {1} stolz die Attacke Stärke {2} eingesetzt. {4} {3}. +{0} hat auf Wunsch von {1} die Attacke Zerschneider {2} zur Schau gestellt. {4} {3}. +{0} hat auf Wunsch von {1} mit aller Kraft {2} einen Felsen zertrümmert. {4} {3}. +{0} hat die Attacke Kaskade {2} eingesetzt, während {1} auf seinem Rücken saß. {4} {3}. +{0} hat gesehen, wie {1} heimlich etwas {2} aufgehoben hat. {4} {3}. +{0} hat von {1} {2} zum Tragen bekommen. {4} {3}. +{0} ist mit {1} zur Siegesstraße gegangen. {4} {3}. +{0} hat mit {1} {2} ein Schild gelesen. {4} {3}. {0} war sehr beeindruckt von der Geschwindigkeit des Zugs, den es mit {1} genommen hatte. {4} {3}. {0} hat mit {1} das Pokéradar benutzt und zusammen sind sie einem {2} begegnet. {4} {3}. {0} war mit {1} unterwegs, als sie plötzlich von einem wilden {2} angegriffen wurden. Völlig überrumpelt haben sie das Weite gesucht. {4} {3}. -{0} hat mit {1} im Haus der Prüfung eine hohe Punktzahl erzielt. {4} {3}. +{0} hat mit {1} im Haus der Prüfung eine hohe Punktzahl erreicht. {4} {3}. {0} hat über {1} den Richter kennengelernt, der es unverwandt angestarrt hat. {4} {3}. {0} hat über {1} den Attacken-Verlerner kennengelernt, durch den es {2} vergessen hat. {4} {3}. {0} konnte sich unter Anleitung von {1} wieder an {2} erinnern. {4} {3}. -{0} wurde von {1} in der Pokémon-Pension abgegeben und verbrachte seine Zeit dort zusammen mit einem {2}. {4} {3}. -{0} war neidisch, als {1} mit einem Los ein Item gewonnen hat.Wie hieß das Item noch gleich? Ach ja, {2}! {4} {3}. -{0} war dabei, als {1} {2} das Item Schutz eingesetzt hat. {4} {3}. -{0} hatte ein anstrengendes Spezialtraining mit {1}. {4} {3}. -{0} ist mit {1} Fahrstuhl gefahren. {4} {3}. -{0} wurde von {1} zum Namenbewerter gebracht und hat einen schicksalhaften Namen erhalten. {4} {3}. +{0} wurde von {1} in der Pokémon-Pension abgegeben und verbrachte seine Zeit dort mit einem {2}. {4} {3}. +{0} war neidisch, als {1} mit einem Los {2} gewonnen hat. {4} {3}. +{0} war dabei, als {1} das Item Schutz {2} eingesetzt hat. {4} {3}. +{0} hat mit {1} ein anstrengendes Spezialtraining absolviert. {4} {3}. +{0} hat mit {1} einen Fahrstuhl genommen. {4} {3}. +{0} wurde von {1} zum Namenbewerter gebracht und hat dort einen schicksalhaften Namen erhalten. {4} {3}. {0} war mit {1} in einer Boutique. {1} hat einiges anprobiert, aber nichts gekauft. {4} {3}. {0} war mit {1} in einem tollen Restaurant und hat dort ordentlich gemampft. {4} {3}. {0} wurde von {1} zu einer freundlichen Frau gebracht, die sich liebevoll um es gekümmert hat. {4} {3}. -{0} hat zusammen mit {1} {2} einen Abfalleimer durchstöbert. {4} {3}. +{0} hat mit {1} {2} einen Abfalleimer durchstöbert. {4} {3}. {0} hat mit {1} gegen ein {2} gekämpft und sich dabei so sehr angestrengt, dass es sogar Verzweifler eingesetzt hat. {4} {3}. -{0} war mit {1} auf einem hohen Turm und hat von dort auf die Welt hinabgeblickt. {4} {3}. -{0} war mit {1} in der Spiegelhöhle und hat dort sein Spiegelbild gesehen. {4} {3}. +{0} war mit {1} auf einem hohen Turm und hat von dort die Welt unter sich betrachtet. {4} {3}. +{0} war mit {1} in der Spiegelhöhle und hat dort sein Spiegelbild betrachtet. {4} {3}. {0} hat sich mit {1} fast verlaufen, als sie gemeinsam einen Wald erkundet haben. {4} {3}. -{0} war mit {1} in einer Fabrik und hat dort viele kompliziert erscheinende Maschinen gesehen. {4} {3}. +{0} war mit {1} in einer Fabrik, in der es viele kompliziert aussehende Maschinen gab. {4} {3}. +{0} war dabei, als {1} eine Geheimbasis eingerichtet hat. {4} {3}. {0} hat mit {1} an einem Wettbewerb teilgenommen und dabei viele Leute beeindruckt. {4} {3}. {0} hat mit {1} an einem Wettbewerb teilgenommen und einen spektakulären Sieg errungen. {4} {3}. -{0} ist zusammen mit {1} per Überflieger durch die Lüfte gesaust und zu verschiedenen Orten geflogen. {4} {3}. -{0} wurde von {1} gebeten, in die Tiefe hinabzutauchen und den Meeresboden zu erkunden. {4} {3}. \ No newline at end of file +{0} ist mit {1} per Überflieger durch die Lüfte gesaust und zu vielen verschiedenen Orten geflogen. {4} {3}. +{0} wurde von {1} gebeten, in die Tiefe hinabzutauchen und den Meeresboden zu erkunden. {4} {3}. +{0} hat sich mit {1} {2} auf eine Bank gesetzt. {4} {3}. +{0} hat mit {1} gegen ein dynamaximiertes {2} gekämpft. {4} {3}. +{0} hat sich auf Befehl von {1} dynamaximiert und gegen ein {2} gekämpft. {4} {3}. +{0} war mit {1} campen. {4} {3}. +{0} hat zusammen mit {1} gekocht. {4} {3}. +{0} wurde von {1} im Pokémon-Hort abgegeben und verbrachte seine Zeit dort mit einem {2}. {4} {3}. +{0} hat mit {1} im Pokémon-Center Geburtstag gefeiert. {4} {3}. +{0} war mit {1} im Friseursalon und hat gesehen, wie schwer es {1} gefallen ist, sich für eine Frisur zu entscheiden. {4} {3}. +{0} war mit {1} unterwegs, als es anfing zu regnen. Beide wurden klitschnass. {4} {3}. +{0} hat mit {1} an einer Rallye teilgenommen, bei der sie rasend schnell waren. {4} {3}. +Als {0} in einer Box war, hat es sich {1} zuliebe überlegt, wie es {2} gut einsetzen könnte. {4} {3}. +Als {0} in einer Box war, hat es eine besonders coole Pose für die Attacke {2} geübt, damit es von {1} gelobt wird. {4} {3}. +{0} war in derselben Box wie {2} und hat sich gut mit ihm über {1} unterhalten. {4} {3}. +{0} hat sich in einer Box mit {2} angefreundet. Zusammen haben sie Attacken geübt und über den Tag geredet, an dem sie von {1} gelobt werden würden. {4} {3}. +Als {0} in einer Box war, hat es sich darüber Sorgen gemacht, dass {1} das Item suchen könnte, das es bei sich trug. Es war {2}. {4} {3}. +Als {1} in einer Box nach {0} sehen kam, war es so nervös, dass es den Blick nicht heben konnte. {4} {3}. +Als {0} in einer Box war, hat es gehört, wie {1} {2} ankam. Es konnte sich diesen Moment bildlich vorstellen. {4} {3}. +Als {0} in derselben Box wie {2} war, haben sie sich über {1} gestritten. {4} {3}. +Als {0} in einer Box war, hat es darüber nachgedacht, warum {1} ihm {2} zum Tragen gegeben hatte. {4} {3}. +Als {0} in einer Box war, hatte es einen seltsamen Traum, in dem {1} {2} eingesetzt hat. {4} {3}. \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/de/text_Moves_de.txt b/PKHeX.Core/Resources/text/de/text_Moves_de.txt index cc9482df8..cff0c9602 100644 --- a/PKHeX.Core/Resources/text/de/text_Moves_de.txt +++ b/PKHeX.Core/Resources/text/de/text_Moves_de.txt @@ -1,5 +1,5 @@ ------ -Pfund +----- +Klaps Karateschlag Duplexhieb Kometenhieb @@ -62,7 +62,7 @@ Psystrahl Blubbstrahl Aurorastrahl Hyperstrahl -Schnabel +Pikser Bohrschnabel Überroller Fußkick @@ -107,7 +107,7 @@ Genesung Härtner Komprimator Rauchwolke -Konfustrahl +Konfusstrahl Panzerschutz Einigler Barriere @@ -135,7 +135,7 @@ Amnesie Psykraft Weichei Turmkick -Giftblick +Schlangenblick Traumfresser Giftwolke Stakkato @@ -191,7 +191,7 @@ Lehmschelle Octazooka Stachler Blitzkanone -Gesichte +Scharfblick Abgangsbund Abgesang Eissturm @@ -270,7 +270,7 @@ Ladevorgang Verhöhner Rechte Hand Trickbetrug -Rollentausch +Rollenspiel Wunschtraum Zuschuss Verwurzler @@ -283,7 +283,7 @@ Gähner Abschlag Notsituation Eruption -Wertewechsel +Fähigkeitstausch Begrenzer Heilung Nachspiel @@ -740,4 +740,58 @@ Sprießbomben Klirrfrost Glitzersturm Evo-Crash -Panzerfäuste \ No newline at end of file +Panzerfäuste +Dyna-Wall +Dynamax-Kanone +Präzisionsschuss +Fesselbiss +Backenstopfer +Finalformation +Teerschuss +Magiepuder +Drachenpfeile +Teatime +Octoklammer +Schockschnabel +Kiemenbiss +Seitenwechsel +Dyna-Brand +Dyna-Schwarm +Dyna-Gewitter +Dyna-Angriff +Dyna-Faust +Dyna-Spuk +Dyna-Frost +Dyna-Giftschwall +Dyna-Flut +Dyna-Düse +Dyna-Zauber +Dyna-Wyrm +Dyna-Kinese +Dyna-Brocken +Dyna-Erdstoß +Dyna-Dunkel +Dyna-Flora +Dyna-Stahlzacken +Seelentanz +Body Press +Verzierung +Trommelschläge +Fangeisen +Feuerball +Gigantenhieb +Gigantenstoß +Aura-Rad +Breitseite +Zweigstoß +Overdrive +Apfelsäure +Gravitation +Seelenbruch +Wunderdampf +Lebenstropfen +Abblocker +Kniefalltrick +Sternensturm +Unendynastrahlen +Stahlstrahl \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/de/text_Ribbons_de.txt b/PKHeX.Core/Resources/text/de/text_Ribbons_de.txt index 611263cff..2b2b33a4f 100644 --- a/PKHeX.Core/Resources/text/de/text_Ribbons_de.txt +++ b/PKHeX.Core/Resources/text/de/text_Ribbons_de.txt @@ -100,4 +100,52 @@ RibbonCountG3Tough = Stärke RibbonChampionAlola Alola Champion RibbonBattleRoyale Battle Royal Champion RibbonBattleTreeGreat Battle Tree Great -RibbonBattleTreeMaster Battle Tree Master \ No newline at end of file +RibbonBattleTreeMaster Battle Tree Master +RibbonChampionGalar Galar-Champs +RibbonTowerMaster Turmmeister +RibbonMasterRank Meisterrang +RibbonMarkLunchtime Mittags-Zeichen +RibbonMarkSleepyTime Mitternachts-Zeichen +RibbonMarkDusk Abenddämmerungs-Zeichen +RibbonMarkDawn Morgendämmerungs-Zeichen +RibbonMarkCloudy Wolken-Zeichen +RibbonMarkRainy Regen-Zeichen +RibbonMarkStormy Gewitter-Zeichen +RibbonMarkSnowy Schneefall-Zeichen +RibbonMarkBlizzard Schneesturm-Zeichen +RibbonMarkDry Dürre-Zeichen +RibbonMarkSandstorm Sandsturm-Zeichen +RibbonMarkMisty Nebel-Zeichen +RibbonMarkDestiny Schicksals-Zeichen +RibbonMarkFishing Angel-Zeichen +RibbonMarkCurry Curry-Zeichen +RibbonMarkUncommon Gängigkeits-Zeichen +RibbonMarkRare Raritäts-Zeichen +RibbonMarkRowdy Raufbold-Zeichen +RibbonMarkAbsentMinded Sorglos-Zeichen +RibbonMarkJittery Spannungs-Zeichen +RibbonMarkExcited Vorfreude-Zeichen +RibbonMarkCharismatic Charisma-Zeichen +RibbonMarkCalmness Gelassenheits-Zeichen +RibbonMarkIntense Hitzkopf-Zeichen +RibbonMarkZonedOut Achtlos-Zeichen +RibbonMarkJoyful Glücklichkeits-Zeichen +RibbonMarkAngry Wut-Zeichen +RibbonMarkSmiley Lächel-Zeichen +RibbonMarkTeary Trübsal-Zeichen +RibbonMarkUpbeat Heiterkeits-Zeichen +RibbonMarkPeeved Missmut-Zeichen +RibbonMarkIntellectual Verstands-Zeichen +RibbonMarkFerocious Impulsiv-Zeichen +RibbonMarkCrafty Listigkeits-Zeichen +RibbonMarkScowling Grimmig-Zeichen +RibbonMarkKindly Sanftmut-Zeichen +RibbonMarkFlustered Panik-Zeichen +RibbonMarkPumpedUp Ansporn-Zeichen +RibbonMarkZeroEnergy Lustlos-Zeichen +RibbonMarkPrideful Selbstvertrauens-Zeichen +RibbonMarkUnsure Selbstzweifel-Zeichen +RibbonMarkHumble Arglos-Zeichen +RibbonMarkThorny Scheinheilig-Zeichen +RibbonMarkVigor Elan-Zeichen +RibbonMarkSlump Formtief-Zeichen \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/de/text_Species_de.txt b/PKHeX.Core/Resources/text/de/text_Species_de.txt index 8e7105be2..7ab9ef4ea 100644 --- a/PKHeX.Core/Resources/text/de/text_Species_de.txt +++ b/PKHeX.Core/Resources/text/de/text_Species_de.txt @@ -807,4 +807,85 @@ Muramura Kopplosio Zeraora Meltan -Melmetal \ No newline at end of file +Melmetal +Chimpep +Chimstix +Gortrom +Hopplo +Kickerlo +Liberlo +Memmeon +Phlegleon +Intelleon +Raffel +Schlaraffel +Meikro +Kranoviz +Krarmor +Sensect +Keradar +Maritellit +Kleptifux +Gaunux +Cottini +Cottomi +Wolly +Zwollock +Kamehaps +Kamalm +Voldi +Bellektro +Klonkett +Wagong +Montecarbo +Knapfel +Drapfel +Schlapfel +Salanga +Sanaconda +Urgl +Pikuda +Barrakiefa +Toxel +Riffex +Thermopod +Infernopod +Klopptopus +Kaocto +Fatalitee +Mortipot +Brimova +Brimano +Silembrim +Bähmon +Pelzebub +Olangaar +Barrikadax +Mauzinger +Gorgasonn +Lauchzelot +Pantifrost +Oghnatoll +Hokumil +Pokusan +Legios +Britzigel +Snomnom +Mottineva +Humanolith +Kubuin +Servol +Morpeko +Kupfanti +Patinaraja +Lectragon +Lecryodon +Pescragon +Pescryodon +Duraludon +Grolldra +Phandra +Katapuldra +Zacian +Zamazenta +Endynalos \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/de/text_swsh_00000_de.txt b/PKHeX.Core/Resources/text/de/text_swsh_00000_de.txt index 4d9440604..6cccea1c4 100644 --- a/PKHeX.Core/Resources/text/de/text_swsh_00000_de.txt +++ b/PKHeX.Core/Resources/text/de/text_swsh_00000_de.txt @@ -1 +1,163 @@ -todo \ No newline at end of file +－－－－－－－－－－ + +an einem mysteriösen Ort + +an einem fernen Ort + +in Furlongham + +im Schlummerwald + +[~ 10] +[~ 11] +auf Route 1 + +in Brassbury + +am Brassbury-Bahnhof + +auf Route 2 + +in Engine City + +am Engine-City-Bahnhof + +im Engine-Stadion + +[~ 26] +[~ 27] +auf Route 3 + +in der Galar-Mine 1 + +auf Route 4 + +in Turffield + +im Turffield-Stadion + +[~ 38] +[~ 39] +auf Route 5 + +[~ 42] +[~ 43] +in Keelton + +am Keelton-Bahnhof + +im Keelton-Stadion + +[~ 50] +[~ 51] +am Engine-Ortsrand + +in der Galar-Mine 2 + +in Claw City + +am Claw-City-Bahnhof + +im Claw-Stadion + +[~ 62] +[~ 63] +im Energiewerk + +auf der Turmspitze + +auf Route 6 + +in Passbeck + +im Passbeck-Stadion + +[~ 74] +[~ 75] +im Wirrschein-Wald + +in Fairballey + +im Fairballey-Stadion + +[~ 82] +[~ 83] +auf Route 7 + +auf Route 8 + +auf Route 8 +auf dem Dampfschwaden-Pfad +auf Route 9 + +auf Route 9 +in der Circhester-Bucht +auf Route 9 +am Spikeford-Ortsrand +in Circhester + +im Circhester-Stadion + +[~ 100] +[~ 101] +in Spikeford + +im Route-9-Tunnel + +auf Route 10 + +am White-Hill-Bahnhof + +in Score City + +am Score-City-Bahnhof + +im Score-Stadion +im Liga-Hauptquartier +im Score-Stadion +im Wartebereich +im Score-Stadion + +am Treffpunkt +in der Naturzone +auf den Wonnewiesen +in der Naturzone +im Wipfelscheinwald +in der Naturzone +bei der Wachturmruine +in der Naturzone +am Milza-See (Osten) +in der Naturzone +am Milza-See (Westen) +in der Naturzone +am Milza-See (Auge) +in der Naturzone +am Milotic-See (Süden) +in der Naturzone +beim Sitz des Giganten +in der Naturzone +am Milotic-See (Norden) +in der Naturzone +am Engine-Flussufer +in der Naturzone +im Brückental +in der Naturzone +auf der Megalithen-Ebene +in der Naturzone +im Sandsturmkessel +in der Naturzone +beim Spiegel des Giganten +in der Naturzone +auf dem Claw-Plateau +in der Naturzone +beim Hut des Giganten +in der Naturzone +am Wutanfall-See +in der Naturzone +am Naturzonen-Bahnhof + +im Kampfturm + +am Rose Tower + +Ein Pokémon-Nest diff --git a/PKHeX.Core/Resources/text/de/text_swsh_30000_de.txt b/PKHeX.Core/Resources/text/de/text_swsh_30000_de.txt index 4d9440604..98a5beb2d 100644 --- a/PKHeX.Core/Resources/text/de/text_swsh_30000_de.txt +++ b/PKHeX.Core/Resources/text/de/text_swsh_30000_de.txt @@ -1 +1,19 @@ -todo \ No newline at end of file +Link-Tausch +Link-Tausch +Kanto-Region +Johto-Region +Hoenn-Region +Sinnoh-Region +Fernes Land +－－－－－－－－－－ +Einall-Region +Kalos-Region +Pokémon-Link +Pokémon GO +Kanto-Region +Hoenn-Region +Alola-Region +Pokémon-Resort +Johto-Region +Pokémon HOME +Kanto-Region \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/de/text_swsh_40000_de.txt b/PKHeX.Core/Resources/text/de/text_swsh_40000_de.txt index 4d9440604..a250fd847 100644 --- a/PKHeX.Core/Resources/text/de/text_swsh_40000_de.txt +++ b/PKHeX.Core/Resources/text/de/text_swsh_40000_de.txt @@ -1 +1,113 @@ -todo \ No newline at end of file +Netter Ort +Ferner Ort +Pokémon-Film +[~ 3] +Pokémon-Film 2019 +Pokémon-Film 2020 +Pokémon-Film 2021 +Pokémon-Film 2022 +Pokémon-Film 2023 +Pokémon-Film 2024 +Pokémon-Zeichentrickserie +Pokémon Center +Pokémon Center Tohoku +WCS +[~ 14] +WCS 2019 +WCS 2020 +WCS 2021 +WCS 2022 +WCS 2023 +WCS 2024 +Worlds +[~ 22] +Worlds 2019 +Worlds 2020 +Worlds 2021 +Worlds 2022 +Worlds 2023 +Worlds 2024 +VGE +[~ 30] +VGE 2019 +VGE 2020 +VGE 2021 +VGE 2022 +VGE 2023 +VGE 2024 +Pokémon-Veranstaltung +Kampfturnier +Videospiel-Veranstaltung +Pokémon Daisuki Club +Pokémon-TV-Programm +Konzert +Online-Geschenk +PGL +[~ 45] +Pokémon-Veranstaltung 2019 +Pokémon-Veranstaltung 2020 +Pokémon-Veranstaltung 2021 +Pokémon-Veranstaltung 2022 +Pokémon-Veranstaltung 2023 +Pokémon-Veranstaltung 2024 +Pokémon-Veranstaltung +[~ 53] +Pokémon-Veranstaltung 2019 +Pokémon-Veranstaltung 2020 +Pokémon-Veranstaltung 2021 +Pokémon-Veranstaltung 2022 +Pokémon-Veranstaltung 2023 +Pokémon-Veranstaltung 2024 +PokéPark +[~ 61] +PokéPark 2019 +PokéPark 2020 +PokéPark 2021 +PokéPark 2022 +PokéPark 2023 +PokéPark 2024 +Veranstaltung +GAME FREAK +Stadion +VGC +[~ 72] +VGC 2019 +VGC 2020 +VGC 2021 +VGC 2022 +VGC 2023 +VGC 2024 +Virtual Console +Pokémon GO +Pokémon Bank +Pokémon-Geschäft +Demoversion +Pokéball Plus +Pokémon HOME +[~ 86] +[~ 87] +[~ 88] +[~ 89] +[~ 90] +[~ 91] +[~ 92] +[~ 93] +[~ 94] +[~ 95] +[~ 96] +[~ 97] +[~ 98] +[~ 99] +[~ 100] +[~ 101] +[~ 102] +[~ 103] +[~ 104] +[~ 105] +[~ 106] +[~ 107] +[~ 108] +[~ 109] +[~ 110] +[~ 111] +[~ 112] \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/de/text_swsh_60000_de.txt b/PKHeX.Core/Resources/text/de/text_swsh_60000_de.txt index 4d9440604..1c2f57288 100644 --- a/PKHeX.Core/Resources/text/de/text_swsh_60000_de.txt +++ b/PKHeX.Core/Resources/text/de/text_swsh_60000_de.txt @@ -1 +1,4 @@ -todo \ No newline at end of file +Ferne Person +Hortleiterinnen +Schatzsucher +Dame der Heißen Quellen \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/de/text_tradeswsh_de.txt b/PKHeX.Core/Resources/text/de/text_tradeswsh_de.txt new file mode 100644 index 000000000..b6f7c26fa --- /dev/null +++ b/PKHeX.Core/Resources/text/de/text_tradeswsh_de.txt @@ -0,0 +1,22 @@ +Münzibal +Bäckchen +Zuckerwatti +Schoki +Locke +Glotzi +Maskabar +Rothand +Blauhand +Timo +Van Stahl +Giorgio +Hilde +Wilhelmina +Tarja +Johnny +Robby +Ira +Franz +Franz +Dominic +Klaus \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/en/text_Abilities_en.txt b/PKHeX.Core/Resources/text/en/text_Abilities_en.txt index 7383e9b68..b0f8fedbd 100644 --- a/PKHeX.Core/Resources/text/en/text_Abilities_en.txt +++ b/PKHeX.Core/Resources/text/en/text_Abilities_en.txt @@ -231,4 +231,29 @@ Grassy Surge Full Metal Body Shadow Shield Prism Armor -Neuroforce \ No newline at end of file +Neuroforce +Intrepid Sword +Dauntless Shield +Libero +Ball Fetch +Cotton Down +Propeller Tail +Mirror Armor +Gulp Missile +Stalwart +Steam Engine +Punk Rock +Sand Spit +Ice Scales +Ripen +Ice Face +Power Spot +Mimicry +Screen Cleaner +Steely Spirit +Perish Body +Wandering Spirit +Gorilla Tactics +Neutralizing Gas +Pastel Veil +Hunger Switch \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/en/text_Forms_en.txt b/PKHeX.Core/Resources/text/en/text_Forms_en.txt index 9e543bded..c84db3170 100644 Binary files a/PKHeX.Core/Resources/text/en/text_Forms_en.txt and b/PKHeX.Core/Resources/text/en/text_Forms_en.txt differ diff --git a/PKHeX.Core/Resources/text/en/text_GenLoc_en.txt b/PKHeX.Core/Resources/text/en/text_GenLoc_en.txt index 761c5daff..5c6c59ccf 100644 --- a/PKHeX.Core/Resources/text/en/text_GenLoc_en.txt +++ b/PKHeX.Core/Resources/text/en/text_GenLoc_en.txt @@ -1,71 +1,80 @@ -somewhere -the first town -home -a friend’s house -someone’s house -a lively town -a boutique -a shop -a simple town -a Pokémon Center -a castle -a hotel -a town with a mysterious air -a windswept town -a gate -a town on a river -a lab -an aquarium -a town on a cliff -a gorgeous city -a Pokémon Gym -a school -a large city -a building -a stylish café -a hideout -a museum -a studio -a train station -a battling spot -a beauty salon -a restaurant -a high-class restaurant -a seaside city -the inside of a tall building -a city with a mysterious air -a riverside city -a snowcapped city -the Pokémon League -a palace -a cave -a forest -a tree-lined road -a riverside road -a tranquil road -a road in bloom -the Pokémon Day Care -a rugged mountain pass -a stone-lined area -a road above the sea -a mired road -a sand-swept road -a leaf-strewn road -a snow-swept road -a factory -Victory Road -a snowy mountain -a power plant -a field -a ruin -a watery route -a safari -a Secret Base -a Contest Spectacular Hall -a place deep in the ocean -a Mirage spot -a large ship -an ash-covered path -a tiny island -a mystical place -oh, while soaring in the sky \ No newline at end of file +somewhere +in the first town +at home +at a friend’s house +at someone’s house +in a lively town +in a boutique +in a shop +in a simple town +in a Pokémon Center +in a castle +in a hotel +in a town with a mysterious air +in a windswept town +at a gate +in a town on a river +in a lab +in an aquarium +in a town on a cliff +in a gorgeous town +in a Pokémon Gym +in a school +in a large town +in a building +in a stylish café +in a hideout +in a museum +in a studio +at a train station +in a battling spot +in a hair salon +in a restaurant +in a high-class restaurant +in a seaside town +in a tall building +in a town with a mysterious air +in a riverside town +in a snowcapped town +at the Pokémon League +in a palace +in a cave +in a forest +on a treelined road +on a riverside road +on a tranquil road +on a road in bloom +in a Pokémon Day Care +on a rugged mountain pass +in a stone-lined area +on a seaside road +on a muddy road +on a sand-swept road +on a leaf-strewn road +on a snow-swept road +in a factory +on Victory Road +on a snowy mountain +in a power plant +in a field +in a ruin +on a watery route +on a safari +on a large ship +in the sky +in a Contest Spectacular Hall +in a mystical place +on a tiny island +on an ash-covered path +in a Secret Base +in a place deep in the ocean +at a Mirage spot +on a lakeside road +in a vast field +at a stadium +at a Pokémon Nursery +in a mine +in a town in the mountains +in a run-down town +in a tunnel +in a dangerous place \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/en/text_Items_en.txt b/PKHeX.Core/Resources/text/en/text_Items_en.txt index 45c6f6171..9d2bff90f 100644 --- a/PKHeX.Core/Resources/text/en/text_Items_en.txt +++ b/PKHeX.Core/Resources/text/en/text_Items_en.txt @@ -1,4 +1,4 @@ -None +None Master Ball Ultra Ball Great Ball @@ -119,7 +119,7 @@ Shock Drive Burn Drive Chill Drive ??? -Pokémon Box +Pokémon Box Link Medicine Pocket TM Case Candy Jar @@ -250,14 +250,14 @@ Twisted Spoon Charcoal Dragon Fang Silk Scarf -Up-Grade +Upgrade Shell Bell Sea Incense Lax Incense Lucky Punch Metal Powder Thick Club -Stick +Leek Red Scarf Blue Scarf Pink Scarf @@ -563,13 +563,13 @@ Dragon Gem Dark Gem Steel Gem Normal Gem -Health Wing -Muscle Wing -Resist Wing -Genius Wing -Clever Wing -Swift Wing -Pretty Wing +Health Feather +Muscle Feather +Resist Feather +Genius Feather +Clever Feather +Swift Feather +Pretty Feather Cover Fossil Plume Fossil Liberty Pass @@ -701,7 +701,7 @@ Discount Coupon Elevator Key TMV Pass Honor of Kalos -Adventure Rules +Adventure Guide Strange Souvenir Lens Case Makeup Bag @@ -1055,4 +1055,525 @@ Dratini Candy Mewtwo Candy Mew Candy Meltan Candy -Magmar Candy \ No newline at end of file +Magmar Candy +??? +??? +??? +??? +??? +??? +??? +??? +??? +??? +??? +??? +??? +??? +??? +??? +Endorsement +Pokémon Box Link +Wishing Star +Dynamax Band +??? +??? +Fishing Rod +Rotom Bike +??? +??? +Sausages +Bob’s Food Tin +Bach’s Food Tin +Tin of Beans +Bread +Pasta +Mixed Mushrooms +Smoke-Poke Tail +Large Leek +Fancy Apple +Brittle Bones +Pack of Potatoes +Pungent Root +Salad Mix +Fried Food +Boiled Egg +Camping Gear +??? +??? +Rusted Sword +Rusted Shield +Fossilized Bird +Fossilized Fish +Fossilized Drake +Fossilized Dino +Strawberry Sweet +Love Sweet +Berry Sweet +Clover Sweet +Flower Sweet +Star Sweet +Ribbon Sweet +Sweet Apple +Tart Apple +Throat Spray +Eject Pack +Heavy-Duty Boots +Blunder Policy +Room Service +Utility Umbrella +Exp. Candy XS +Exp. Candy S +Exp. Candy M +Exp. Candy L +Exp. Candy XL +Dynamax Candy +TR00 +TR01 +TR02 +TR03 +TR04 +TR05 +TR06 +TR07 +TR08 +TR09 +TR10 +TR11 +TR12 +TR13 +TR14 +TR15 +TR16 +TR17 +TR18 +TR19 +TR20 +TR21 +TR22 +TR23 +TR24 +TR25 +TR26 +TR27 +TR28 +TR29 +TR30 +TR31 +TR32 +TR33 +TR34 +TR35 +TR36 +TR37 +TR38 +TR39 +TR40 +TR41 +TR42 +TR43 +TR44 +TR45 +TR46 +TR47 +TR48 +TR49 +TR50 +TR51 +TR52 +TR53 +TR54 +TR55 +TR56 +TR57 +TR58 +TR59 +TR60 +TR61 +TR62 +TR63 +TR64 +TR65 +TR66 +TR67 +TR68 +TR69 +TR70 +TR71 +TR72 +TR73 +TR74 +TR75 +TR76 +TR77 +TR78 +TR79 +TR80 +TR81 +TR82 +TR83 +TR84 +TR85 +TR86 +TR87 +TR88 +TR89 +TR90 +TR91 +TR92 +TR93 +TR94 +TR95 +TR96 +TR97 +TR98 +TR99 +TM00 +Lonely Mint +Adamant Mint +Naughty Mint +Brave Mint +Bold Mint +Impish Mint +Lax Mint +Relaxed Mint +Modest Mint +Mild Mint +Rash Mint +Quiet Mint +Calm Mint +Gentle Mint +Careful Mint +Sassy Mint +Timid Mint +Hasty Mint +Jolly Mint +Naive Mint +Serious Mint +Wishing Piece +Cracked Pot +Chipped Pot +Hi-tech Earbuds +Fruit Bunch +Moomoo Cheese +Spice Mix +Fresh Cream +Packaged Curry +Coconut Milk +Instant Noodles +Precooked Burger +Gigantamix +Wishing Chip +Rotom Bike +Catching Charm +??? +Old Letter +Band Autograph +Sonia’s Book +??? +??? +??? +??? +??? +??? +Rotom Catalog +★And458 +★And15 +★And337 +★And603 +★And390 +★Sgr6879 +★Sgr6859 +★Sgr6913 +★Sgr7348 +★Sgr7121 +★Sgr6746 +★Sgr7194 +★Sgr7337 +★Sgr7343 +★Sgr6812 +★Sgr7116 +★Sgr7264 +★Sgr7597 +★Del7882 +★Del7906 +★Del7852 +★Psc596 +★Psc361 +★Psc510 +★Psc437 +★Psc8773 +★Lep1865 +★Lep1829 +★Boo5340 +★Boo5506 +★Boo5435 +★Boo5602 +★Boo5733 +★Boo5235 +★Boo5351 +★Hya3748 +★Hya3903 +★Hya3418 +★Hya3482 +★Hya3845 +★Eri1084 +★Eri472 +★Eri1666 +★Eri897 +★Eri1231 +★Eri874 +★Eri1298 +★Eri1325 +★Eri984 +★Eri1464 +★Eri1393 +★Eri850 +★Tau1409 +★Tau1457 +★Tau1165 +★Tau1791 +★Tau1910 +★Tau1346 +★Tau1373 +★Tau1412 +★CMa2491 +★CMa2693 +★CMa2294 +★CMa2827 +★CMa2282 +★CMa2618 +★CMa2657 +★CMa2646 +★UMa4905 +★UMa4301 +★UMa5191 +★UMa5054 +★UMa4295 +★UMa4660 +★UMa4554 +★UMa4069 +★UMa3569 +★UMa3323 +★UMa4033 +★UMa4377 +★UMa4375 +★UMa4518 +★UMa3594 +★Vir5056 +★Vir4825 +★Vir4932 +★Vir4540 +★Vir4689 +★Vir5338 +★Vir4910 +★Vir5315 +★Vir5359 +★Vir5409 +★Vir5107 +★Ari617 +★Ari553 +★Ari546 +★Ari951 +★Ori1713 +★Ori2061 +★Ori1790 +★Ori1903 +★Ori1948 +★Ori2004 +★Ori1852 +★Ori1879 +★Ori1899 +★Ori1543 +★Cas21 +★Cas168 +★Cas403 +★Cas153 +★Cas542 +★Cas219 +★Cas265 +★Cnc3572 +★Cnc3208 +★Cnc3461 +★Cnc3449 +★Cnc3429 +★Cnc3627 +★Cnc3268 +★Cnc3249 +★Com4968 +★Crv4757 +★Crv4623 +★Crv4662 +★Crv4786 +★Aur1708 +★Aur2088 +★Aur1605 +★Aur2095 +★Aur1577 +★Aur1641 +★Aur1612 +★Pav7790 +★Cet911 +★Cet681 +★Cet188 +★Cet539 +★Cet804 +★Cep8974 +★Cep8162 +★Cep8238 +★Cep8417 +★Cen5267 +★Cen5288 +★Cen551 +★Cen5459 +★Cen5460 +★CMi2943 +★CMi2845 +★Equ8131 +★Vul7405 +★UMi424 +★UMi5563 +★UMi5735 +★UMi6789 +★Crt4287 +★Lyr7001 +★Lyr7178 +★Lyr7106 +★Lyr7298 +★Ara6585 +★Sco6134 +★Sco6527 +★Sco6553 +★Sco5953 +★Sco5984 +★Sco6508 +★Sco6084 +★Sco5944 +★Sco6630 +★Sco6027 +★Sco6247 +★Sco6252 +★Sco5928 +★Sco6241 +★Sco6165 +★Tri544 +★Leo3982 +★Leo4534 +★Leo4357 +★Leo4057 +★Leo4359 +★Leo4031 +★Leo3852 +★Leo3905 +★Leo3773 +★Gru8425 +★Gru8636 +★Gru8353 +★Lib5685 +★Lib5531 +★Lib5787 +★Lib5603 +★Pup3165 +★Pup3185 +★Pup3045 +★Cyg7924 +★Cyg7417 +★Cyg7796 +★Cyg8301 +★Cyg7949 +★Cyg7528 +★Oct7228 +★Col1956 +★Col2040 +★Col2177 +★Gem2990 +★Gem2891 +★Gem2421 +★Gem2473 +★Gem2216 +★Gem2777 +★Gem2650 +★Gem2286 +★Gem2484 +★Gem2930 +★Peg8775 +★Peg8781 +★Peg39 +★Peg8308 +★Peg8650 +★Peg8634 +★Peg8684 +★Peg8450 +★Peg8880 +★Peg8905 +★Oph6556 +★Oph6378 +★Oph6603 +★Oph6149 +★Oph6056 +★Oph6075 +★Ser5854 +★Ser7141 +★Ser5879 +★Her6406 +★Her6148 +★Her6410 +★Her6526 +★Her6117 +★Her6008 +★Per936 +★Per1017 +★Per1131 +★Per1228 +★Per834 +★Per941 +★Phe99 +★Phe338 +★Vel3634 +★Vel3485 +★Vel3734 +★Aqr8232 +★Aqr8414 +★Aqr8709 +★Aqr8518 +★Aqr7950 +★Aqr8499 +★Aqr8610 +★Aqr8264 +★Cru4853 +★Cru4730 +★Cru4763 +★Cru4700 +★Cru4656 +★PsA8728 +★TrA6217 +★Cap7776 +★Cap7754 +★Cap8278 +★Cap8322 +★Cap7773 +★Sge7479 +★Car2326 +★Car3685 +★Car3307 +★Car3699 +★Dra5744 +★Dra5291 +★Dra6705 +★Dra6536 +★Dra7310 +★Dra6688 +★Dra4434 +★Dra6370 +★Dra7462 +★Dra6396 +★Dra6132 +★Dra6636 +★CVn4915 +★CVn4785 +★CVn4846 +★Aql7595 +★Aql7557 +★Aql7525 +★Aql7602 +★Aql7235 \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/en/text_Memories_en.txt b/PKHeX.Core/Resources/text/en/text_Memories_en.txt index 258fa07d4..1cc78e138 100644 --- a/PKHeX.Core/Resources/text/en/text_Memories_en.txt +++ b/PKHeX.Core/Resources/text/en/text_Memories_en.txt @@ -1,4 +1,4 @@ - + The Pokémon remembers The Pokémon remembers @@ -36,73 +36,93 @@ it got sleepy a certain item a certain move a Pokémon -The Pokémon seems to have a good memory, but it doesn’t seem to be able to remember... -{0} met {1} at... {2}. {1} threw a Poké Ball at it, and they started to travel together. {4} that {3}. -{0} hatched from an Egg and saw {1} for the first time at... {2}. {4} that {3}. -{0} met {1} at... {2}. {4} that {3}. -{0} became {1}’s friend when it arrived via Link Trade at... {2}. {4} that {3}. +{0} seems to have a fond memory, but it doesn’t seem to be able to remember the details... +{0} met {1} {2}. {1} threw a Poké Ball at it, and they started to travel together. {4} that {3}. +{0} hatched from an Egg and saw {1} for the first time {2}. {4} that {3}. +{0} met {1} {2}. {4} that {3}. +{0} became {1}’s friend when it came through Link Trade {2}. {4} that {3}. {0} went to a Pokémon Center with {1} to buy {2}. {4} that {3}. -{0} went to the Pokémon Center in {2} with {1} and had its tired body healed there. {4} that {3}. -{0} went fishing with {1}, and they caught {2}. {4} that {3}. -{0} went fishing with {1}, but the hooked Pokémon got away! {4} that {3}. +With {1}, {0} went to the Pokémon Center and had its tired body healed there. {4} that {3}. +With {1}, {0} went fishing, and they caught {2}. {4} that {3}. +With {1}, {0} went fishing, but the hooked Pokémon got away! {4} that {3}. {0} saw {1} paying attention to {2}. {4} that {3}. {0} got treats from {1}. {4} that {3}. {0} went clothes shopping with {1}. {4} that {3}. {0} learned {2} from {1}. {4} that {3}. {0} helped {1} hatch {2} from an Egg. {4} that {3}. -{0} was with {1} when (he/she) caught {2}. {4} that {3}. +{0} was with {1} when {1} caught {2}. {4} that {3}. {1} used {2} when {0} was in trouble. {4} that {3}. {0} used {2} at {1}’s instruction, but it had no effect. {4} that {3}. -{0} battled at {1}’s side and defeated {2}. {4} that {3}. -{0} was defeated by {2} and {1} ran away. {4} that {3}. -{0} was raised by {1} and evolved at {2}. {4} that {3}. +{0} battled at {1}’s side and beat {2}. {4} that {3}. +{0} lost to {2} and ran away with {1}. {4} that {3}. +{0} was raised by {1} and evolved {2}. {4} that {3}. {0} surfed across the water, carrying {1} on its back. {4} that {3}. {0} saw {2} carrying {1} on its back. {4} that {3}. {0} battled at {1}’s side and defeated a Gym Leader. {4} that {3}. -When {1} challenged the Battle Maison, {0} got so nervous. {4} that {3}. -{0} flew, carrying {1} on its back, to {2}. {4} that {3}. +When {1} challenged the Battle Maison, {0} got really nervous. {4} that {3}. +{0} flew, carrying {1} on its back, to a place... {2}. {4} that {3}. {0} and {1} were surprised when {2} jumped out! {4} that {3}. {0} saw {1} using {2}. {4} that {3}. {0} battled at {1}’s side and defeated the Champion. {4} that {3}. -{0} was with {1} when (he/she) completed (his/her) Pokédex. {4} that {3}. +{0} was there when {1} completed the Pokédex. {4} that {3}. {0} encountered {2} when it was with {1}. {4} that {3}. -{0} battled at {1}’s side and defeated a Battle Chatelaine. {4} that {3}. -{0} searched for hidden items with {1} using the Dowsing Machine at... {2}. {4} that {3}. -{0} rode a Bicycle with {1} at... {2}. {4} that {3}. -{0} checked a destination with {1} using the Town Map at... {2}. {4} that {3}. +{0} battled at {1}’s side and defeated the strongest Trainer. {4} that {3}. +{0} searched for hidden items with {1} using the Dowsing Machine {2}. {4} that {3}. +{0} rode a bike with {1} {2}. {4} that {3}. +{0} checked a destination with {1} using the Town Map {2}. {4} that {3}. {0} planted {2} with {1} and imagined a big harvest. {4} that {3}. -{0} proudly used Strength at {1}’s instruction in... {2}. {4} that {3}. -{0} proudly used Cut at {1}’s instruction in... {2}. {4} that {3}. -{0} shattered rocks to its heart’s content at {1}’s instruction in... {2}. {4} that {3}. -{0} used Waterfall while carrying {1} on its back in... {2}. {4} that {3}. -{0} saw {1} secretly picking up something in... {2}. {4} that {3}. +{1} asked {0} to use Strength, and it proudly used the move {2}. {4} that {3}. +{1} asked {0} to use Cut, and it proudly used the move {2}. {4} that {3}. +{1} asked {0} to shatter rocks, which it did to its heart’s content {2}. {4} that {3}. +{0} used Waterfall while carrying {1} on its back {2}. {4} that {3}. +{0} saw {1} secretly picking up something {2}. {4} that {3}. {1} had {0} hold items like {2} to help it along. {4} that {3}. {0} headed for Victory Road with {1}. {4} that {3}. -{0} checked the sign with {1} at... {2}. {4} that {3}. +{0} checked the sign with {1} {2}. {4} that {3}. {0} was impressed by the speed of the train it took with {1}. {4} that {3}. {0} encountered {2} with {1} using the Poké Radar. {4} that {3}. When {2} jumped out, {0} was surprised and ran away with {1}. {4} that {3}. -{0} got a high score at the Battle Institute where it challenged with {1}. {4} that {3}. -{0} was stared at by the Judge intensely when it met him with {1}. {4} that {3}. +{0} got a high score at the Battle Institute where it challenged others with {1}. {4} that {3}. +{0} was stared at by the Judge when it met him with {1}. {4} that {3}. The Move Deleter that {0} met through {1} made it forget {2}. {4} that {3}. -{0} was able to remember {2} at {1}’s instruction. {4} that {3}. -{0} was taken to Pokémon Day Care by {1} and left with {2}. {4} that {3}. -{0} was excited when {1} won with (his/her) Loto Ticket and won prizes like {2}. {4} that {3}. -{0} was with {1} when (he/she) used a Repel at... {2}. {4} that {3}. +{1} asked {0} to remember {2}, and it was able to remember the move. {4} that {3}. +{0} was taken to the Pokémon Day Care by {1} and left with {2}. {4} that {3}. +{0} was excited when {1} won prizes like {2} through Loto-ID. {4} that {3}. +{0} was there when {1} used a repellent {2}. {4} that {3}. {0} had a very hard training session with {1}. {4} that {3}. {0} took an elevator with {1}. {4} that {3}. {0} was taken to the Name Rater by {1} and given a fateful name. {4} that {3}. -{0} was with {1} when (he/she) went to a boutique and tried on clothes, but (he/she) left the boutique without buying anything. {4} that {3}. -{0} went to a nice restaurant with {1} and ate until it got totally full. {4} that {3}. +{0} was there when {1} went to a boutique and tried on clothes but left the boutique without buying anything. {4} that {3}. +{0} went to a nice restaurant with {1} and ate until it got completely full. {4} that {3}. {0} was taken to a nice lady by {1} and pampered. {4} that {3}. -{0} checked a trash can with {1} at... {2}. {4} that {3}. +{0} checked a bin with {1} {2}. {4} that {3}. {0} fought hard until it had to use Struggle when it battled at {1}’s side against {2}. {4} that {3}. -{0} looked down at the world from a tall tower where it went with {1}. {4} that {3}. -{0} saw itself in a mirror in a mirror cave that it went to with {1}. {4} that {3}. +{0} went to a tall tower with {1} and looked down on the world. {4} that {3}. +{0} saw itself in a mirror inside a mirror cave that it explored with {1}. {4} that {3}. {0} almost got lost when it explored a forest with {1}. {4} that {3}. {0} went to a factory with {1} and saw a lot of machines that looked very complicated. {4} that {3}. -{0} was with {1} when (he/she) built a Secret Base. {4} that {3}. +{0} was there when {1} created a Secret Base. {4} that {3}. {0} participated in a contest with {1} and impressed many people. {4} that {3}. {0} participated in a contest with {1} and won the title. {4} that {3}. {0} soared through the sky with {1} and went to many different places. {4} that {3}. -{1} asked {0} to dive. Down it went, deep into the ocean, to explore the bottom of the sea. {4} that {3}. \ No newline at end of file +{1} asked {0} to dive. Down it went, deep into the ocean, to explore the bottom of the sea. {4} that {3}. +{0} sat with {1} on a bench {2}. {4} that {3}. +{0} battled at {1}’s side against {2} that Dynamaxed. {4} that {3}. +{0} battled {2} and Dynamaxed upon {1}’s instruction. {4} that {3}. +{0} camped with {1}. {4} that {3}. +{0} cooked with {1}. {4} that {3}. +{0} was taken to a Pokémon Nursery by {1} and left with {2}. {4} that {3}. +{0} celebrated {1}’s birthday in a Pokémon Center. {4} that {3}. +{0} went to a hair salon with {1}. {4} that {3}. +When {0} was walking with {1}, it started raining, and they both got soaked. {4} that {3}. +{0} participated in a rally with {1} and went really fast. {4} that {3}. +{0} studied about how to use {2} in a Box, thinking about {1}. {4} that {3}. +{0} practiced its cool pose for the move {2} in a Box, wishing to be praised by {1}. {4} that {3}. +{0} had a great chat about {1} with the {2} that it was in a Box with. {4} that {3}. +{0} became good friends with the {2} in a Box, practiced moves with it, and talked about the day that {0} would be praised by {1}. {4} that {3}. +{0} was worried if {1} was looking for the {2} that it was holding in a Box. {4} that {3}. +When {1} came to check on {0} in a Box, it got nervous and couldn’t make eye contact with {1}. {4} that {3}. +When {0} heard a rumor that {1} arrived at a place... {2}, it imagined how {1} looked there. {4} that {3}. +{0} got in a fight with the {2} that it was in a Box with about {1}. {4} that {3}. +When {0} was in a Box, it thought about the reason why {1} had it hold the {2}. {4} that {3}. +When {0} was in a Box, it had a weird dream in which {1} was using the move {2}. {4} that {3}. \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/en/text_Moves_en.txt b/PKHeX.Core/Resources/text/en/text_Moves_en.txt index 7c4405377..81f5d8f31 100644 --- a/PKHeX.Core/Resources/text/en/text_Moves_en.txt +++ b/PKHeX.Core/Resources/text/en/text_Moves_en.txt @@ -1,4 +1,4 @@ -——— +——— Pound Karate Chop Double Slap @@ -9,7 +9,7 @@ Fire Punch Ice Punch Thunder Punch Scratch -Vice Grip +Vise Grip Guillotine Razor Wind Swords Dance @@ -740,4 +740,58 @@ Sappy Seed Freezy Frost Sparkly Swirl Veevee Volley -Double Iron Bash \ No newline at end of file +Double Iron Bash +Max Guard +Dynamax Cannon +Snipe Shot +Jaw Lock +Stuff Cheeks +No Retreat +Tar Shot +Magic Powder +Dragon Darts +Teatime +Octolock +Bolt Beak +Fishious Rend +Court Change +Max Flare +Max Flutterby +Max Lightning +Max Strike +Max Knuckle +Max Phantasm +Max Hailstorm +Max Ooze +Max Geyser +Max Airstream +Max Starfall +Max Wyrmwind +Max Mindstorm +Max Rockfall +Max Quake +Max Darkness +Max Overgrowth +Max Steelspike +Clangorous Soul +Body Press +Decorate +Drum Beating +Snap Trap +Pyro Ball +Behemoth Blade +Behemoth Bash +Aura Wheel +Breaking Swipe +Branch Poke +Overdrive +Apple Acid +Grav Apple +Spirit Break +Strange Steam +Life Dew +Obstruct +False Surrender +Meteor Assault +Eternabeam +Steel Beam \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/en/text_Ribbons_en.txt b/PKHeX.Core/Resources/text/en/text_Ribbons_en.txt index 6dedee5af..56e2f3f0c 100644 --- a/PKHeX.Core/Resources/text/en/text_Ribbons_en.txt +++ b/PKHeX.Core/Resources/text/en/text_Ribbons_en.txt @@ -100,4 +100,52 @@ RibbonCountG3Tough Tough RibbonChampionAlola Alola Champion RibbonBattleRoyale Battle Royal Champion RibbonBattleTreeGreat Battle Tree Great -RibbonBattleTreeMaster Battle Tree Master \ No newline at end of file +RibbonBattleTreeMaster Battle Tree Master +RibbonChampionGalar Galar Champion +RibbonTowerMaster Tower Master +RibbonMasterRank Master Rank +RibbonMarkLunchtime Lunchtime Mark +RibbonMarkSleepyTime Sleepy-Time Mark +RibbonMarkDusk Dusk Mark +RibbonMarkDawn Dawn Mark +RibbonMarkCloudy Cloudy Mark +RibbonMarkRainy Rainy Mark +RibbonMarkStormy Stormy Mark +RibbonMarkSnowy Snowy Mark +RibbonMarkBlizzard Blizzard Mark +RibbonMarkDry Dry Mark +RibbonMarkSandstorm Sandstorm Mark +RibbonMarkMisty Misty Mark +RibbonMarkDestiny Destiny Mark +RibbonMarkFishing Fishing Mark +RibbonMarkCurry Curry Mark +RibbonMarkUncommon Uncommon Mark +RibbonMarkRare Rare Mark +RibbonMarkRowdy Rowdy Mark +RibbonMarkAbsentMinded Absent-Minded Mark +RibbonMarkJittery Jittery Mark +RibbonMarkExcited Excited Mark +RibbonMarkCharismatic Charismatic Mark +RibbonMarkCalmness Calmness Mark +RibbonMarkIntense Intense Mark +RibbonMarkZonedOut Zoned-Out Mark +RibbonMarkJoyful Joyful Mark +RibbonMarkAngry Angry Mark +RibbonMarkSmiley Smiley Mark +RibbonMarkTeary Teary Mark +RibbonMarkUpbeat Upbeat Mark +RibbonMarkPeeved Peeved Mark +RibbonMarkIntellectual Intellectual Mark +RibbonMarkFerocious Ferocious Mark +RibbonMarkCrafty Crafty Mark +RibbonMarkScowling Scowling Mark +RibbonMarkKindly Kindly Mark +RibbonMarkFlustered Flustered Mark +RibbonMarkPumpedUp Pumped-Up Mark +RibbonMarkZeroEnergy Zero Energy Mark +RibbonMarkPrideful Prideful Mark +RibbonMarkUnsure Unsure Mark +RibbonMarkHumble Humble Mark +RibbonMarkThorny Thorny Mark +RibbonMarkVigor Vigor Mark +RibbonMarkSlump Slump Mark \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/en/text_Species_en.txt b/PKHeX.Core/Resources/text/en/text_Species_en.txt index a1537f1cd..a0d7754e2 100644 --- a/PKHeX.Core/Resources/text/en/text_Species_en.txt +++ b/PKHeX.Core/Resources/text/en/text_Species_en.txt @@ -807,4 +807,85 @@ Stakataka Blacephalon Zeraora Meltan -Melmetal \ No newline at end of file +Melmetal +Grookey +Thwackey +Rillaboom +Scorbunny +Raboot +Cinderace +Sobble +Drizzile +Inteleon +Skwovet +Greedent +Rookidee +Corvisquire +Corviknight +Blipbug +Dottler +Orbeetle +Nickit +Thievul +Gossifleur +Eldegoss +Wooloo +Dubwool +Chewtle +Drednaw +Yamper +Boltund +Rolycoly +Carkol +Coalossal +Applin +Flapple +Appletun +Silicobra +Sandaconda +Cramorant +Arrokuda +Barraskewda +Toxel +Toxtricity +Sizzlipede +Centiskorch +Clobbopus +Grapploct +Sinistea +Polteageist +Hatenna +Hattrem +Hatterene +Impidimp +Morgrem +Grimmsnarl +Obstagoon +Perrserker +Cursola +Sirfetch’d +Mr. Rime +Runerigus +Milcery +Alcremie +Falinks +Pincurchin +Snom +Frosmoth +Stonjourner +Eiscue +Indeedee +Morpeko +Cufant +Copperajah +Dracozolt +Arctozolt +Dracovish +Arctovish +Duraludon +Dreepy +Drakloak +Dragapult +Zacian +Zamazenta +Eternatus \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/en/text_swsh_00000_en.txt b/PKHeX.Core/Resources/text/en/text_swsh_00000_en.txt index 4d9440604..c25369902 100644 --- a/PKHeX.Core/Resources/text/en/text_swsh_00000_en.txt +++ b/PKHeX.Core/Resources/text/en/text_swsh_00000_en.txt @@ -1 +1,163 @@ -todo \ No newline at end of file +—————— + +in a mystery zone + +in a faraway place + +in the town of Postwick + +in the Slumbering Weald + +[~ 10] +[~ 11] +on Route 1 + +in the town of Wedgehurst + +at Wedgehurst Station + +on Route 2 + +in the city of Motostoke + +at Motostoke Station + +at Motostoke Stadium + +[~ 26] +[~ 27] +on Route 3 + +in Galar Mine + +on Route 4 + +in the town of Turffield + +at Turffield Stadium + +[~ 38] +[~ 39] +on Route 5 + +[~ 42] +[~ 43] +in the town of Hulbury + +at Hulbury Station + +at Hulbury Stadium + +[~ 50] +[~ 51] +in the Motostoke Outskirts + +in Galar Mine No. 2 + +in the city of Hammerlocke + +at Hammerlocke Station + +at Hammerlocke Stadium + +[~ 62] +[~ 63] +at the Energy Plant + +on the tower summit + +on Route 6 + +in the town of Stow-on-Side + +at Stow-on-Side Stadium + +[~ 74] +[~ 75] +in Glimwood Tangle + +in the town of Ballonlea + +at Ballonlea Stadium + +[~ 82] +[~ 83] +on Route 7 + +on Route 8 + +on Route 8 +on Steamdrift Way +on Route 9 + +on Route 9 +in Circhester Bay +on Route 9 +in Outer Spikemuth +in the town of Circhester + +at Circhester Stadium + +[~ 100] +[~ 101] +in the town of Spikemuth + +in the Route 9 Tunnel + +on Route 10 + +at White Hill Station + +in the city of Wyndon + +at Wyndon Station + +at Wyndon Stadium +at the Pokémon League HQ +at Wyndon Stadium +in a locker room +at Wyndon Stadium + +at the Meetup Spot +in a Wild Area +in the Rolling Fields +in a Wild Area +in the Dappled Grove +in a Wild Area +at Watchtower Ruins +in a Wild Area +at East Lake Axewell +in a Wild Area +at West Lake Axewell +in a Wild Area +on Axew’s Eye +in a Wild Area +at South Lake Miloch +in a Wild Area +near the Giant’s Seat +in a Wild Area +at North Lake Miloch +in a Wild Area +at the Motostoke Riverbank +in a Wild Area +in Bridge Field +in a Wild Area +in the Stony Wilderness +in a Wild Area +in Dusty Bowl +in a Wild Area +around the Giant’s Mirror +in a Wild Area +on the Hammerlocke Hills +in a Wild Area +near the Giant’s Cap +in a Wild Area +at the Lake of Outrage +in a Wild Area +at a Wild Area Station + +at the Battle Tower + +at Rose Tower + +in a Pokémon Den diff --git a/PKHeX.Core/Resources/text/en/text_swsh_30000_en.txt b/PKHeX.Core/Resources/text/en/text_swsh_30000_en.txt index 4d9440604..d46c0071c 100644 --- a/PKHeX.Core/Resources/text/en/text_swsh_30000_en.txt +++ b/PKHeX.Core/Resources/text/en/text_swsh_30000_en.txt @@ -1 +1,19 @@ -todo \ No newline at end of file +a Link Trade +a Link Trade +the Kanto region +the Johto region +the Hoenn region +the Sinnoh region +a distant land +—————— +the Unova region +the Kalos region +Pokémon Link +Pokémon GO +the Kanto region +the Hoenn region +the Alola region +Poké Pelago +the Johto region +Pokémon HOME +the Kanto region \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/en/text_swsh_40000_en.txt b/PKHeX.Core/Resources/text/en/text_swsh_40000_en.txt index 4d9440604..ba08c6b2b 100644 --- a/PKHeX.Core/Resources/text/en/text_swsh_40000_en.txt +++ b/PKHeX.Core/Resources/text/en/text_swsh_40000_en.txt @@ -1 +1,113 @@ -todo \ No newline at end of file +a lovely place +a faraway place +a Pokémon movie +[~ 3] +a 2019 Pokémon movie +a 2020 Pokémon movie +a 2021 Pokémon movie +a 2022 Pokémon movie +a 2023 Pokémon movie +a 2024 Pokémon movie +the Pokémon animated show +a Pokémon Center +Pokémon Center Tohoku +a WCS +[~ 14] +WCS 2019 +WCS 2020 +WCS 2021 +WCS 2022 +WCS 2023 +WCS 2024 +Worlds +[~ 22] +2019 Worlds +2020 Worlds +2021 Worlds +2022 Worlds +2023 Worlds +2024 Worlds +a VGE +[~ 30] +VGE 2019 +VGE 2020 +VGE 2021 +VGE 2022 +VGE 2023 +VGE 2024 +a Pokémon event +a Battle Competition +a game event +the Pokémon Daisuki Club +a Pokémon TV program +a concert +an online present +the PGL +[~ 45] +a 2019 Pokémon event +a 2020 Pokémon event +a 2021 Pokémon event +a 2022 Pokémon event +a 2023 Pokémon event +a 2024 Pokémon event +a Pokémon event +[~ 53] +a 2019 Pokémon event +a 2020 Pokémon event +a 2021 Pokémon event +a 2022 Pokémon event +a 2023 Pokémon event +a 2024 Pokémon event +PokéPark +[~ 61] +PokéPark 2019 +PokéPark 2020 +PokéPark 2021 +PokéPark 2022 +PokéPark 2023 +PokéPark 2024 +an event site +GAME FREAK +a stadium +a VGC event +[~ 72] +the VGC 2019 +the VGC 2020 +the VGC 2021 +the VGC 2022 +the VGC 2023 +the VGC 2024 +a Virtual Console game +Pokémon GO +Pokémon Bank +a Pokémon shop +a demo version +the Poké Ball Plus +Pokémon HOME +[~ 86] +[~ 87] +[~ 88] +[~ 89] +[~ 90] +[~ 91] +[~ 92] +[~ 93] +[~ 94] +[~ 95] +[~ 96] +[~ 97] +[~ 98] +[~ 99] +[~ 100] +[~ 101] +[~ 102] +[~ 103] +[~ 104] +[~ 105] +[~ 106] +[~ 107] +[~ 108] +[~ 109] +[~ 110] +[~ 111] +[~ 112] \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/en/text_swsh_60000_en.txt b/PKHeX.Core/Resources/text/en/text_swsh_60000_en.txt index 4d9440604..dbf225892 100644 --- a/PKHeX.Core/Resources/text/en/text_swsh_60000_en.txt +++ b/PKHeX.Core/Resources/text/en/text_swsh_60000_en.txt @@ -1 +1,4 @@ -todo \ No newline at end of file +a stranger +a Nursery worker +a treasure hunter +an old hot-springs visitor \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/en/text_tradeswsh_en.txt b/PKHeX.Core/Resources/text/en/text_tradeswsh_en.txt new file mode 100644 index 000000000..5420fcff1 --- /dev/null +++ b/PKHeX.Core/Resources/text/en/text_tradeswsh_en.txt @@ -0,0 +1,22 @@ +Cash +Cheekers +Candyfloss +Snips +Fringe +Peepers +Masky +Reddos +Blubop +Mymo +Linear +Mattia +Haley +Grazia +Holly +Romeo +Romeo +Eve +Grimm +Grimm +Edmund +Kapoor \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/es/text_Abilities_es.txt b/PKHeX.Core/Resources/text/es/text_Abilities_es.txt index 2411dfd37..aee991d0e 100644 --- a/PKHeX.Core/Resources/text/es/text_Abilities_es.txt +++ b/PKHeX.Core/Resources/text/es/text_Abilities_es.txt @@ -1,4 +1,4 @@ -- +— Hedor Llovizna Impulso @@ -104,7 +104,7 @@ Defensa Hoja Zoquete Rompemoldes Afortunado -Resquicio +Detonación Anticipación Alerta Ignorante @@ -134,7 +134,7 @@ Compiescolta Armadura Frágil Metal Pesado Metal Liviano -Compensación +Multiescamas Ímpetu Tóxico Ímpetu Ardiente Cosecha @@ -231,4 +231,29 @@ Herbogénesis Guardia Metálica Guardia Espectro Armadura Prisma -Fuerza Cerebral \ No newline at end of file +Fuerza Cerebral +Espada Indómita +Escudo Recio +Líbero +Recogebolas +Pelusa +Hélice Caudal +Coraza Reflejo +Tragamisil +Acérrimo +Combustible +Punk Rock +Expulsarena +Escama de Hielo +Maduración +Cara de Hielo +Fuente Energía +Mimetismo +Antibarrera +Alma Acerada +Cuerpo Mortal +Alma Errante +Monotema +Gas Reactivo +Velo Pastel +Mutapetito \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/es/text_Forms_es.txt b/PKHeX.Core/Resources/text/es/text_Forms_es.txt index 371ae36f6..035c53a2d 100644 Binary files a/PKHeX.Core/Resources/text/es/text_Forms_es.txt and b/PKHeX.Core/Resources/text/es/text_Forms_es.txt differ diff --git a/PKHeX.Core/Resources/text/es/text_GenLoc_es.txt b/PKHeX.Core/Resources/text/es/text_GenLoc_es.txt index 0a579d6fc..3e1b2be47 100644 --- a/PKHeX.Core/Resources/text/es/text_GenLoc_es.txt +++ b/PKHeX.Core/Resources/text/es/text_GenLoc_es.txt @@ -1,4 +1,4 @@ -algún lugar +algún lugar el pueblo de partida casa casa de un amigo @@ -28,13 +28,13 @@ un museo un estudio de grabación una estación un terreno de combate -un salón de belleza +una peluquería un restaurante un restaurante refinado una ciudad costera un edificio alto una ciudad misteriosa -una ciudad a la orilla del río +una ciudad a la orilla de un río una ciudad cubierta de nieve la Liga Pokémon un palacio @@ -60,12 +60,21 @@ un huerto unas ruinas unas alcantarillas un safari -una Base Secreta -un Auditorio del Gran Concurso -el fondo del mar -un paraje irreal un gran navío -una ruta cubierta de ceniza -un islote +el firmamento +un Auditorio un lugar misterioso -el firmamento \ No newline at end of file +un islote +una ruta cubierta de ceniza +una Base Secreta +el fondo del mar +un Paraje Espejismo +un camino con vistas al mar +una extensa pradera +un estadio +Cuidados Pokémon +una mina +un pueblo de montaña +un pueblo destartalado +un túnel +un lugar peligroso \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/es/text_Items_es.txt b/PKHeX.Core/Resources/text/es/text_Items_es.txt index 953520195..1769936a5 100644 --- a/PKHeX.Core/Resources/text/es/text_Items_es.txt +++ b/PKHeX.Core/Resources/text/es/text_Items_es.txt @@ -1,4 +1,4 @@ -Ningún +Ningún Master Ball Ultra Ball Super Ball @@ -53,13 +53,13 @@ Más PP Zinc PP Máximos Barrita Plus -Protec. Especial -Directo +Protección X +Crítico X Ataque X Defensa X Velocidad X Precisión X -Especial X +At. Especial X Def. Especial X Poké Muñeco Cola Skitty @@ -216,9 +216,9 @@ Hierba Blanca Brazal Firme Repartir Exp Garra Rápida -Campana Alivio +Cascabel Alivio Hierba Mental -Cinta Elegida +Cinta Elección Roca del Rey Polvo Plata Moneda Amuleto @@ -226,7 +226,7 @@ Amuleto Rocío Bondad Diente Marino Escama Marina -Bola Humo +Bola de Humo Piedra Eterna Cinta Focus Huevo Suerte @@ -249,15 +249,15 @@ Hechizo Cuchara Torcida Carbón Colmillo Dragón -Pañuelo Seda +Pañuelo de Seda Mejora -Campana Concha +Cascabel Concha Incienso Marino Incienso Suave Puño Suerte Polvo Metálico Hueso Grueso -Palo +Puerro Pañuelo Rojo Pañuelo Azul Pañuelo Rosa @@ -285,7 +285,7 @@ Roca Suave Roca Calor Roca Lluvia Garra Garfio -Pañuelo Elegido +Pañuelo Elección Toxiestrella Brazal Recio Cinto Recio @@ -295,7 +295,7 @@ Franja Recia Pesa Recia Muda Concha Raíz Grande -Gafas Elegid +Gafas Elección Tabla Llama Tabla Linfa Tabla Trueno @@ -315,7 +315,7 @@ Tabla Acero Incienso Raro Incienso Roca Incienso Lento -Incienso Aqua +Incienso Acua Incienso Floral Incienso Duplo Incienso Puro @@ -472,7 +472,7 @@ Plantabayas Zahorí Tarjeta Azul Cola Slowpoke -Campana Clara +Cascabel Claro Llave Magnética Llave Sótano Regadera @@ -501,7 +501,7 @@ Competi Ball Parque Ball Álbum Lector GB -Campana Oleaje +Cascabel Oleaje Caramelo Furia Tarjeta Datos 01 Tarjeta Datos 02 @@ -590,21 +590,21 @@ Brazal Efigie Antigua Corona Antigua Porcehelado -Directo 2 +Crítico X 2 Velocidad X 2 -Especial X 2 +At. Esp. X 2 Def. Esp. X 2 Defensa X 2 Ataque X 2 Precisión X 2 Velocidad X 3 -Especial X 3 +At. Esp. X 3 Def. Esp. X 3 Defensa X 3 Ataque X 3 Precisión X 3 Velocidad X 6 -Especial X 6 +At. Esp. X 6 Def. Esp. X 6 Defensa X 6 Ataque X 6 @@ -613,7 +613,7 @@ Habilitador Tiraobjeto Activaobjeto Quitaestado -Directo 3 +Crítico X 3 Orbe Claro Orbe Oscuro MT93 @@ -701,7 +701,7 @@ Vale Descuento Llave Ascensor Abono del TMV Emblema Kalos -Guía de Máximas +Guía de Aventura Estatuilla Rara Portalentillas Kit Maquillaje @@ -1055,4 +1055,525 @@ Caramelo Dratini Caramelo Mewtwo Caramelo Mew Caramelo Meltan -Caramelo Magmar \ No newline at end of file +Caramelo Magmar +(?) +(?) +(?) +(?) +(?) +(?) +(?) +(?) +(?) +(?) +(?) +(?) +(?) +(?) +(?) +(?) +Recomendación +Caja de Pokémon +Estrella Deseo +Maximuñequera +(?) +(?) +Caña +Bici Rotom +(?) +(?) +Salchichas +Lata de Darren +Lata de Bach +Lata de Habas +Pan de Molde +Pasta +Setas +Cola Ahumada +Puerro Grueso +Manzana Selecta +Huesos Finos +Patatas +Hierba Intensa +Verduras +Frituras +Huevo Duro +Kit de Acampada +(?) +(?) +Espada Oxidada +Escudo Oxidado +Ornitofósil +Ictiofósil +Dracofósil +Plesiofósil +Confite Fresa +Confite Corazón +Confite Fruto +Confite Trébol +Confite Flor +Confite Estrella +Confite Lazo +Manzana Dulce +Manzana Ácida +Espray Bucal +Mochila Escape +Botas Gruesas +Seguro Fallo +Servicio Raro +Parasol Multiuso +Caramelo Exp. XS +Caramelo Exp. S +Caramelo Exp. M +Caramelo Exp. L +Caramelo Exp. XL +Caramelo Dinamax +DT00 +DT01 +DT02 +DT03 +DT04 +DT05 +DT06 +DT07 +DT08 +DT09 +DT10 +DT11 +DT12 +DT13 +DT14 +DT15 +DT16 +DT17 +DT18 +DT19 +DT20 +DT21 +DT22 +DT23 +DT24 +DT25 +DT26 +DT27 +DT28 +DT29 +DT30 +DT31 +DT32 +DT33 +DT34 +DT35 +DT36 +DT37 +DT38 +DT39 +DT40 +DT41 +DT42 +DT43 +DT44 +DT45 +DT46 +DT47 +DT48 +DT49 +DT50 +DT51 +DT52 +DT53 +DT54 +DT55 +DT56 +DT57 +DT58 +DT59 +DT60 +DT61 +DT62 +DT63 +DT64 +DT65 +DT66 +DT67 +DT68 +DT69 +DT70 +DT71 +DT72 +DT73 +DT74 +DT75 +DT76 +DT77 +DT78 +DT79 +DT80 +DT81 +DT82 +DT83 +DT84 +DT85 +DT86 +DT87 +DT88 +DT89 +DT90 +DT91 +DT92 +DT93 +DT94 +DT95 +DT96 +DT97 +DT98 +DT99 +MT00 +Menta Huraña +Menta Firme +Menta Pícara +Menta Audaz +Menta Osada +Menta Agitada +Menta Floja +Menta Plácida +Menta Modesta +Menta Afable +Menta Alocada +Menta Mansa +Menta Serena +Menta Amable +Menta Cauta +Menta Grosera +Menta Miedosa +Menta Activa +Menta Alegre +Menta Ingenua +Menta Seria +Trozo Deseo +Tetera Agrietada +Tetera Rota +Supertapones +Fruta Tropical +Queso Mu-mu +Especias +Nata Fresca +Curri de Bote +Leche de Coco +Fideos de Bote +Hamburguesas +Especias Gigamax +Trocito Deseo +Bici Rotom +Amuleto Captura +(?) +Carta Ajada +Autógrafo Grupo +Libro de Sonia +(?) +(?) +(?) +(?) +(?) +(?) +Catálogo Rotom +★And458 +★And15 +★And337 +★And603 +★And390 +★Sgr6879 +★Sgr6859 +★Sgr6913 +★Sgr7348 +★Sgr7121 +★Sgr6746 +★Sgr7194 +★Sgr7337 +★Sgr7343 +★Sgr6812 +★Sgr7116 +★Sgr7264 +★Sgr7597 +★Del7882 +★Del7906 +★Del7852 +★Psc596 +★Psc361 +★Psc510 +★Psc437 +★Psc8773 +★Lep1865 +★Lep1829 +★Boo5340 +★Boo5506 +★Boo5435 +★Boo5602 +★Boo5733 +★Boo5235 +★Boo5351 +★Hya3748 +★Hya3903 +★Hya3418 +★Hya3482 +★Hya3845 +★Eri1084 +★Eri472 +★Eri1666 +★Eri897 +★Eri1231 +★Eri874 +★Eri1298 +★Eri1325 +★Eri984 +★Eri1464 +★Eri1393 +★Eri850 +★Tau1409 +★Tau1457 +★Tau1165 +★Tau1791 +★Tau1910 +★Tau1346 +★Tau1373 +★Tau1412 +★CMa2491 +★CMa2693 +★CMa2294 +★CMa2827 +★CMa2282 +★CMa2618 +★CMa2657 +★CMa2646 +★UMa4905 +★UMa4301 +★UMa5191 +★UMa5054 +★UMa4295 +★UMa4660 +★UMa4554 +★UMa4069 +★UMa3569 +★UMa3323 +★UMa4033 +★UMa4377 +★UMa4375 +★UMa4518 +★UMa3594 +★Vir5056 +★Vir4825 +★Vir4932 +★Vir4540 +★Vir4689 +★Vir5338 +★Vir4910 +★Vir5315 +★Vir5359 +★Vir5409 +★Vir5107 +★Ari617 +★Ari553 +★Ari546 +★Ari951 +★Ori1713 +★Ori2061 +★Ori1790 +★Ori1903 +★Ori1948 +★Ori2004 +★Ori1852 +★Ori1879 +★Ori1899 +★Ori1543 +★Cas21 +★Cas168 +★Cas403 +★Cas153 +★Cas542 +★Cas219 +★Cas265 +★Cnc3572 +★Cnc3208 +★Cnc3461 +★Cnc3449 +★Cnc3429 +★Cnc3627 +★Cnc3268 +★Cnc3249 +★Com4968 +★Crv4757 +★Crv4623 +★Crv4662 +★Crv4786 +★Aur1708 +★Aur2088 +★Aur1605 +★Aur2095 +★Aur1577 +★Aur1641 +★Aur1612 +★Pav7790 +★Cet911 +★Cet681 +★Cet188 +★Cet539 +★Cet804 +★Cep8974 +★Cep8162 +★Cep8238 +★Cep8417 +★Cen5267 +★Cen5288 +★Cen551 +★Cen5459 +★Cen5460 +★CMi2943 +★CMi2845 +★Equ8131 +★Vul7405 +★UMi424 +★UMi5563 +★UMi5735 +★UMi6789 +★Crt4287 +★Lyr7001 +★Lyr7178 +★Lyr7106 +★Lyr7298 +★Ara6585 +★Sco6134 +★Sco6527 +★Sco6553 +★Sco5953 +★Sco5984 +★Sco6508 +★Sco6084 +★Sco5944 +★Sco6630 +★Sco6027 +★Sco6247 +★Sco6252 +★Sco5928 +★Sco6241 +★Sco6165 +★Tri544 +★Leo3982 +★Leo4534 +★Leo4357 +★Leo4057 +★Leo4359 +★Leo4031 +★Leo3852 +★Leo3905 +★Leo3773 +★Gru8425 +★Gru8636 +★Gru8353 +★Lib5685 +★Lib5531 +★Lib5787 +★Lib5603 +★Pup3165 +★Pup3185 +★Pup3045 +★Cyg7924 +★Cyg7417 +★Cyg7796 +★Cyg8301 +★Cyg7949 +★Cyg7528 +★Oct7228 +★Col1956 +★Col2040 +★Col2177 +★Gem2990 +★Gem2891 +★Gem2421 +★Gem2473 +★Gem2216 +★Gem2777 +★Gem2650 +★Gem2286 +★Gem2484 +★Gem2930 +★Peg8775 +★Peg8781 +★Peg39 +★Peg8308 +★Peg8650 +★Peg8634 +★Peg8684 +★Peg8450 +★Peg8880 +★Peg8905 +★Oph6556 +★Oph6378 +★Oph6603 +★Oph6149 +★Oph6056 +★Oph6075 +★Ser5854 +★Ser7141 +★Ser5879 +★Her6406 +★Her6148 +★Her6410 +★Her6526 +★Her6117 +★Her6008 +★Per936 +★Per1017 +★Per1131 +★Per1228 +★Per834 +★Per941 +★Phe99 +★Phe338 +★Vel3634 +★Vel3485 +★Vel3734 +★Aqr8232 +★Aqr8414 +★Aqr8709 +★Aqr8518 +★Aqr7950 +★Aqr8499 +★Aqr8610 +★Aqr8264 +★Cru4853 +★Cru4730 +★Cru4763 +★Cru4700 +★Cru4656 +★PsA8728 +★TrA6217 +★Cap7776 +★Cap7754 +★Cap8278 +★Cap8322 +★Cap7773 +★Sge7479 +★Car2326 +★Car3685 +★Car3307 +★Car3699 +★Dra5744 +★Dra5291 +★Dra6705 +★Dra6536 +★Dra7310 +★Dra6688 +★Dra4434 +★Dra6370 +★Dra7462 +★Dra6396 +★Dra6132 +★Dra6636 +★CVn4915 +★CVn4785 +★CVn4846 +★Aql7595 +★Aql7557 +★Aql7525 +★Aql7602 +★Aql7235 \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/es/text_Memories_es.txt b/PKHeX.Core/Resources/text/es/text_Memories_es.txt index b2c1b41b9..5f73b5606 100644 --- a/PKHeX.Core/Resources/text/es/text_Memories_es.txt +++ b/PKHeX.Core/Resources/text/es/text_Memories_es.txt @@ -1,4 +1,4 @@ - + El Pokémon recuerda muy vagamente El Pokémon recuerda vagamente @@ -36,73 +36,93 @@ el sueño que le entró objeto determinado cierto movimiento cierto Pokémon -Aunque parece guardar un grato recuerdo, no es capaz de rescatarlo de la memoria, por lo que veo. -Los caminos de {0} y {1} se cruzaron en {2}. La Poké Ball lanzada por {1} marcó el punto de partida de su viaje conjunto. {4} {3}. -Lo primero que vio {0} cuando salió del cascarón en {2} fue la cara de {1}. {4} {3}. -Los caminos de {0} y {1} se cruzaron en {2}. {4} {3}. -{0} y {1} se conocieron como consecuencia de un intercambio Pokémon en {2} y ambos sintieron que era el comienzo de una gran amistad. {4} {3}. -En una ocasión, {0} y {1} fueron juntos a un Centro Pokémon para comprar {2}. {4} {3}. -{1} llevó a {0} al Centro Pokémon de {2} en una ocasión, para que pudiese reponerse. {4} {3}. -En una ocasión, {1} y {0} pescaron juntos un ejemplar de {2}. {4} {3}. -Cuando {1} y {0} fueron juntos de pesca en una ocasión, {1} dejó escapar un Pokémon que ya tenía en el bote. {4} {3}. -En una ocasión, {0} presenció cómo {1} mimaba a {2}. {4} {3}. -En una ocasión, {1} le dio un dulce a {0}. {4} {3}. -En una ocasión, {0} y {1} fueron juntos a comprar ropa. {4} {3}. -{1} enseñó {2} a {0}. {4} {3}. -{0} ayudó una vez a {1} a eclosionar el Huevo de {2}. {4} {3}. -{0} estaba presente cuando {1} atrapó a {2}. {4} {3}. -Cuando {0} estaba contra las cuerdas, {1} usó {2}. {4} {3}. -Siguiendo las instrucciones de {1}, en una ocasión {0} ejecutó {2} en vano, sin efecto alguno. {4} {3}. -{0} y {1} lucharon codo con codo para derrotar a {2}. {4} {3}. -Cuando {0} perdió el combate contra {2}, {1} se vio obligad(o/a) a poner pies en polvorosa. {4} {3}. -Gracias al entrenamiento de {1}, llegó el día en que {0} logró evolucionar. Todo ocurrió en {2}. {4} {3}. -En cierta ocasión, {1} surcó las aguas a lomos de {0}. {4} {3}. -En cierta ocasión, {0} vio como {1} iba a lomos de {2}. {4} {3}. -{0} y {1} lucharon codo con codo para derrotar a un Líder de Gimnasio. {4} {3}. -Cuando {1} afrontó el reto de la Mansión Batalla, {0} era un manojo de nervios. {4} {3}. -{0} llevó volando a {1} hasta {2} en cierta ocasión. {4} {3}. -En una ocasión, {0} y {1} se llevaron un susto de campeonato cuando, de repente, {2} se abalanzó sobre ellos. {4} {3}. -Una vez {0} vio como {1} utilizaba {2}. {4} {3}. -{0} y {1} lucharon codo con codo para derrotar a la Campeona. {4} {3}. -{0} estaba junto a {1} cuando consiguió completar su Pokédex. {4} {3}. -{0} se hallaba junto a {1} cuando ambos se toparon con {2}. {4} {3}. -En una ocasión, {1} derrotó a una Dama del Combate. {4} {3}. -{0} y {1} utilizaron el Zahorí para buscar juntos objetos ocultos en {2}. {4} {3}. -{0} se montó en Bici con {1} en {2}. {4} {3}. -{0} y {1} utilizaron el Mapa en {2} para comprobar adónde se dirigían. {4} {3}. -Mientras plantaba una {2} con {1}, {0} se imaginaba lo abundante que sería la cosecha. {4} {3}. -Siguiendo las indicaciones de {1}, {0} se sintió muy orgulloso una vez al usar Fuerza en {2}. {4} {3}. -Siguiendo las indicaciones de {1}, una vez {0} hizo gala de su destreza al usar Corte en {2}. {4} {3}. -Siguiendo las indicaciones de {1}, una vez {0} hizo añicos una roca en {2}. {4} {3}. -Una vez {0} utilizó Cascada en {2} llevando a cuestas a {1}. {4} {3}. -Una vez {0} vio como {1} recogía un objeto sin que nadie se diese cuenta en {2}. {4} {3}. -En cierta ocasión, {1} equipó a {0} con {2}. {4} {3}. -En cierto momento, {0} emprendió el camino hacia la Calle Victoria con {1}. {4} {3}. -En una ocasión, {0} y {1} examinaron juntos cierto cartel en {2}. {4} {3}. -Cuando {0} montó en el tren junto a {1}, se quedó de piedra por la velocidad vertiginosa que podía alcanzar. {4} {3}. -Cuando {0} y {1} usaron el Pokéradar, se toparon con {2}. {4} {3}. -{0} y {1} tomaron las de Villadiego cuando {2} les sorprendió con su repentina emboscada. {4} {3}. -{0} se hallaba junto a {1} cuando ambos obtuvieron una puntuación alta en la Casa Examinadora. {4} {3}. -Cuando {1} llevó a {0} ante el Juez, este realizó un riguroso examen. {4} {3}. -Cuando {0} se encontró con el Quita-Movimientos gracias a {1}, olvidó {2}. {4} {3}. -Siguiendo las instrucciones de {1}, {0} fue capaz de recordar {2}. {4} {3}. -{1} llevó a {0} a una Guardería Pokémon para que se criara junto a {2}. {4} {3}. -Cuando a {1} le tocó la lotería, {0} vio con envidia que se llevaba {2} como premio. {4} {3}. -Cuando {1} usó un Repelente en {2}, {0} se hallaba junto a (él/ella). {4} {3}. -En una ocasión, {0} se sometió a un duro entrenamiento impartido por {1}. {4} {3}. -En una ocasión, {0} se subió a un ascensor junto a {1}. {4} {3}. -En una ocasión, {1} y {0} fueron a ver juntos al Inspector de Motes, y este le puso un nombre de buen augurio. {4} {3}. -En una ocasión, {0} acompañó a {1} cuando fue a una boutique para probarse ropa, aunque al final no compró nada. {4} {3}. -Una vez {0} y {1} fueron juntos a un restaurante y se pusieron las botas. {4} {3}. -Una vez {1} llevó a {0} a un sitio donde una chica encantadora le dio todo tipo de mimos. {4} {3}. -En una ocasión, {0} y {1} rebuscaron juntos en una papelera que hay en {2}. {4} {3}. -Cuando una vez {1} y {0} se enfrentaron a {2}, {0} resistió cuanto pudo antes de recurrir a Combate. {4} {3}. -Cuando {1} y {0} estaban en una torre muy alta, {0} miró hacia abajo y todo le pareció muy pequeñito. {4} {3}. -Cuando {1} y {0} estaban en la Cueva de los Reflejos, {0} contempló su reflejo. {4} {3}. -{0} estuvo a punto de perderse al explorar un bosque junto a {1}. {4} {3}. -Al acompañar a {1} hasta una fábrica, {0} se encontró allí con un montón de máquinas que parecían muy complejas. {4} {3}. -En cierto momento, {0} y {1} construyeron juntos una Base Secreta. {4} {3}. -En una ocasión, {0} y {1} participaron en un concurso y se exhibieron delante de muchas personas. {4} {3}. -En determinado momento, {0} y {1} participaron en un concurso y se alzaron con la victoria. {4} {3}. -En cierta ocasión, {0} y {1} visitaron numerosos lugares gracias al Ultravuelo. {4} {3}. -Una vez, {0}, siguiendo las instrucciones de {1} se sumergió en las profundidades del mar para explorar el fondo oceánico. {4} {3}. \ No newline at end of file +Aunque parece guardar un grato recuerdo, no es capaz de rescatarlo de su memoria. +{0} {4} {3} cuando {1} le lanzó una Poké Ball en {2}, marcando el punto de partida de su viaje conjunto. +{0} {4} {3} cuando salió del cascarón y vio por primera vez la cara de {1}. +{0} {4} {3} cuando conoció a {1} en {2}. +{0} {4} {3} cuando trabó amistad con {1} en {2} tras un intercambio Pokémon. +{0} {4} {3} cuando fue con {1} a un Centro Pokémon a comprar {2}. +{0} {4} {3} cuando fue con {1} a un Centro Pokémon para reponer fuerzas. +{0} {4} {3} cuando pescó junto a {1} un ejemplar de {2}. +{0} {4} {3} cuando fue de pesca con {1} y estea dejó escapar un Pokémon que tenía en el bote. +{0} {4} {3} cuando vio como {1} le daba mimos a {2}. +{0} {4} {3} cuando {1} le dio un dulce. +{0} {4} {3} cuando fue a comprar ropa con {1}. +{0} {4} {3} cuando {1} le enseñó el movimiento {2}. +{0} {4} {3} cuando ayudó a {1} a hacer eclosionar el Huevo de {2}. +{0} {4} {3} cuando {1} capturó a {2}. +{0} {4} {3} cuando se encontraba contra las cuerdas y {1} usó {2}. +{0} {4} {3} cuando usó {2} siguiendo las instrucciones de {1} y el movimiento no tuvo ningún efecto. +{0} {4} {3} cuando luchó codo con codo junto a {1} para derrotar a {2}. +{0} {4} {3} cuando perdió el combate contra {2} y {1} se vio obligadoa a poner pies en polvorosa. +{0} {4} {3} cuando evolucionó en {2} tras su entrenamiento con {1}. +{0} {4} {3} cuando {1} surcó las aguas sobre su lomo. +{0} {4} {3} cuando vio a {1} a lomos de {2}. +{0} {4} {3} cuando luchó codo con codo junto a {1} para derrotar a un Líder de Gimnasio. +{0} {4} {3} cuando {1} afrontó el reto de la Mansión Batalla y tenía los nervios a flor de piel. +{0} {4} {3} cuando llevó volando a {1} hasta {2}. +{0} {4} {3} cuando, estando con {1}, se les echó encima un {2} y les dio un susto de campeonato. +{0} {4} {3} cuando vio como {1} utilizaba {2}. +{0} {4} {3} cuando luchó codo con codo junto a {1} para derrotar a quien tenía en ese momento el título de Campeón. +{0} {4} {3} cuando {1} consiguió completar la Pokédex. +{0} {4} {3} cuando, estando con {1}, se toparon con {2}. +{0} {4} {3} cuando {1} derrotó a toda una eminencia del combate. +{0} {4} {3} cuando utilizó el Zahorí junto a {1} para localizar objetos ocultos en {2}. +{0} {4} {3} cuando se montó en bici con {1} en {2}. +{0} {4} {3} cuando utilizó el mapa junto a {1} en {2} para comprobar adónde se dirigían. +{0} {4} {3} cuando plantó {2} con {1} y se imaginó cómo sería de abundante la cosecha. +{0} {4} {3} cuando usó Fuerza en {2} siguiendo las indicaciones de {1}. +{0} {4} {3} cuando hizo gala de su destreza al usar Corte en {2} siguiendo las indicaciones de {1}. +{0} {4} {3} cuando hizo añicos una roca en {2} siguiendo las indicaciones de {1}. +{0} {4} {3} cuando usó Cascada en {2} y llevó a cuestas a {1}. +{0} {4} {3} cuando vio a {1} recoger un objeto en {2} sin que nadie se diese cuenta. +{0} {4} {3} cuando {1} le entregó {2}. +{0} {4} {3} cuando emprendió el camino hacia la Calle Victoria con {1}. +{0} {4} {3} cuando examinó junto a {1} cierto cartel en {2}. +{0} {4} {3} cuando montó en tren junto a {1} y se quedó de piedra por la velocidad vertiginosa que podía alcanzar. +{0} {4} {3} cuando usó el Pokéradar con {1} y se toparon con {2}. +{0} {4} {3} cuando tuvo que huir junto a {1} tras sufrir el ataque de un {2}. +{0} {4} {3} cuando obtuvo junto a {1} una puntuación alta en la Casa Examinadora. +{0} {4} {3} cuando fue con {1} ante el Juez y este realizó un riguroso examen. +{0} {4} {3} cuando fue con {1} al Quita-Movimientos y este le hizo olvidar {2}. +{0} {4} {3} cuando logró recordar {2} gracias a las indicaciones de {1}. +{0} {4} {3} cuando se quedó en una Guardería Pokémon junto a {2} porque {1} así lo quiso. +{0} {4} {3} cuando a {1} le tocó la lotería y vio que el premio eran {2}. +{0} {4} {3} cuando {1} usó un Repelente en {2}. +{0} {4} {3} cuando se dejó la piel en un duro entrenamiento junto a {1}. +{0} {4} {3} cuando se subió a un ascensor junto a {1}. +{0} {4} {3} cuando fue con {1} al Inspector de Motes y este le puso un mote de buen augurio. +{0} {4} {3} cuando acompañó a {1} a una boutique para que se probara ropa y terminó yéndose sin comprar nada. +{0} {4} {3} cuando fue a un restaurante con {1} y se pusieron las botas. +{0} {4} {3} cuando fue con {1} a un sitio donde una chica encantadora le dio todo tipo de mimos. +{0} {4} {3} cuando rebuscó junto a {1} en una papelera que estaba en {2}. +{0} {4} {3} cuando se enfrentó junto a {1} a un {2} y resistió cuanto pudo antes de recurrir a Forcejeo. +{0} {4} {3} cuando se encontraba en una torre muy alta con {1} y todo le pareció muy pequeñito al mirar hacia abajo. +{0} {4} {3} cuando visitó una cueva llena de espejos con {1} y contempló su propio reflejo en uno de ellos. +{0} {4} {3} cuando fue a explorar un bosque con {1} y estuvieron a punto de perderse. +{0} {4} {3} cuando acompañó a {1} a una fábrica y se encontró con un montón de máquinas que parecían muy complejas. +{0} {4} {3} cuando construyó una Base Secreta junto a {1}. +{0} {4} {3} cuando participó junto a {1} en un concurso y se exhibieron delante de muchas personas. +{0} {4} {3} cuando participó junto a {1} en un concurso y se alzaron con la victoria. +{0} {4} {3} cuando surcó los cielos junto a {1} y visitaron numerosos lugares. +{0} {4} {3} cuando, siguiendo las instrucciones de {1}, se sumergió en las profundidades del mar para explorar el fondo oceánico. +{0} {4} {3} cuando se sentó con {1} en un banco en {2}. +{0} {4} {3} cuando se enfrentó codo con codo con {1} contra un {2} Dinamax. +{0} {4} {3} cuando {1} le pidió que se dinamaxizara en un combate contra un {2}. +{0} {4} {3} cuando se fue de acampada con {1}. +{0} {4} {3} cuando cocinó junto a {1}. +{0} {4} {3} cuando se quedó en Cuidados Pokémon junto a {2} por iniciativa de {1}. +{0} {4} {3} cuando celebraron el cumpleaños de {1} en un Centro Pokémon. +{0} {4} {3} cuando acompañó a {1} a la peluquería y estea no lograba decidirse por un peinado. +{0} {4} {3} cuando se puso a llover mientras iba paseando con {1} y les pilló por sorpresa. +{0} {4} {3} cuando participó en la Rotocrono con {1} y alcanzaron velocidades de vértigo. +{0} {4} {3} cuando se entretuvo dentro de una caja imaginando la mejor ocasión para usar {2} mientras pensaba en {1}. +{0} {4} {3} cuando se entretuvo dentro de una caja practicando una pose guay para {2} y ganarse así los elogios de {1}. +{0} {4} {3} cuando estuvo hablando con {2} sobre {1} dentro de una caja. +{0} {4} {3} cuando estrechó lazos con {2} en una caja y practicaron sus movimientos con la esperanza de que {1} los elogiase algún día. +{0} {4} {3} cuando empezó a preguntarse si {1} estaría buscando {2} que llevaba consigo antes de entrar en la caja. +{0} {4} {3} cuando {1} fue a comprobar qué tal se encontraba dentro de la caja y evitó su mirada a causa de los nervios. +{0} {4} {3} cuando escuchó mientras estaba en una caja que {1} había llegado hasta {2} y se loa imaginó allí viviendo aventuras. +{0} {4} {3} cuando tuvo una discusión con {2} acerca de {1} dentro de una caja. +{0} {4} {3} cuando empezó a reflexionar dentro de una caja sobre por qué le habría dado {1} {2}. +{0} {4} {3} cuando, dentro de una caja, tuvo un extraño sueño en el que {1} se decidía a usar {2}. \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/es/text_Moves_es.txt b/PKHeX.Core/Resources/text/es/text_Moves_es.txt index 973cf4197..c02293799 100644 --- a/PKHeX.Core/Resources/text/es/text_Moves_es.txt +++ b/PKHeX.Core/Resources/text/es/text_Moves_es.txt @@ -1,4 +1,4 @@ -— +— Destructor Golpe Kárate Doble Bofetón @@ -38,7 +38,7 @@ Derribo Golpe Doble Filo Látigo -Picotazo Ven +Picotazo Veneno Doble Ataque Pin Misil Malicioso @@ -67,7 +67,7 @@ Pico Taladro Sumisión Patada Baja Contraataque -Mov. Sísmico +Sísmico Fuerza Absorber Megaagotar @@ -117,7 +117,7 @@ Reflejo Foco Energía Venganza Metrónomo -Mov. Espejo +Espejo Autodestrucción Bomba Huevo Lengüetazo @@ -136,9 +136,9 @@ Kinético Amortiguador Pat. Salto Alta Deslumbrar -Come Sueños +Comesueños Gas Venenoso -Presa +Bombardeo Chupavidas Beso Amoroso Ataque Aéreo @@ -203,8 +203,8 @@ Tormenta Arena Gigadrenado Aguante Encanto -Desenrollar -Falsotortazo +Rodar +Falso Tortazo Contoneo Batido Chispa @@ -284,7 +284,7 @@ Desarme Esfuerzo Estallido Intercambio -Cerca +Sellar Alivio Rabia Robo @@ -303,7 +303,7 @@ Bola Hielo Brazo Pincho Relajo Vozarrón -Colmillo Ven +Colmillo Veneno Garra Brutal Anillo Ígneo Hidrocañón @@ -329,7 +329,7 @@ Gancho Alto Bucle Arena Frío Polar Agua Lodosa -Recurrente +Semilladora Golpe Aéreo Carámbano Defensa Férrea @@ -382,8 +382,8 @@ Bilis Conjuro Yo Primero Copión -Cambia Fuerza -Cambia Defensa +Cambiafuerza +Cambiadefensa Castigo Última Baza Abatidoras @@ -414,7 +414,7 @@ Energibola Pájaro Osado Tierra Viva Trapicheo -Giga Impacto +Gigaimpacto Maquinación Puño Bala Alud @@ -439,7 +439,7 @@ Lluevehojas Latigazo Romperrocas Veneno X -Lanza Mugre +Lanzamugre Cabeza de Hierro Bomba Imán Roca Afilada @@ -500,7 +500,7 @@ Guardia Baja Niebla Clara Poder Reserva Anticipo -Cambio Banda +Cambio de Banda Escaldar Rompecoraza Pulso Cura @@ -681,7 +681,7 @@ Plancha Látigo Ígneo Chulería Llama Final -Cambia Velocidad +Cambiavelocidad Cuerno Certero Purificación Danza Despertar @@ -740,4 +740,58 @@ Leafitobombas Glaceoprisma Sylveotornado Eevimpacto -Ferropuño Doble \ No newline at end of file +Ferropuño Doble +Maxibarrera +Cañón Dinamax +Disparo Certero +Presa Maxilar +Atiborramiento +Bastión Final +Alquitranazo +Polvo Mágico +Dracoflechas +Hora del Té +Octopresa +Electropico +Branquibocado +Cambio de Cancha +Maxignición +Maxinsecto +Maxitormenta +Maxiataque +Maxipuño +Maxiespectro +Maxihelada +Maxiácido +Maxichorro +Maxiciclón +Maxiestela +Maxidraco +Maxionda +Maxilito +Maxitemblor +Maxisombra +Maxiflora +Maximetal +Estruendo Escama +Plancha Corporal +Decoración +Batería Asalto +Cepo +Balón Ígneo +Tajo Supremo +Embate Supremo +Rueda Aural +Vasto Impacto +Punzada Rama +Amplificador +Ácido Málico +Fuerza G +Choque Anímico +Cautivapor +Gota Vital +Obstrucción +Irreverencia +Asalto Estelar +Rayo Infinito +Metaláser \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/es/text_Ribbons_es.txt b/PKHeX.Core/Resources/text/es/text_Ribbons_es.txt index 53f35fef5..e6431dd50 100644 --- a/PKHeX.Core/Resources/text/es/text_Ribbons_es.txt +++ b/PKHeX.Core/Resources/text/es/text_Ribbons_es.txt @@ -101,3 +101,51 @@ RibbonChampionAlola Campeón de Alola RibbonBattleRoyale Maestro Battle Royale RibbonBattleTreeGreat As del Árbol RibbonBattleTreeMaster Maestro del Árbol +RibbonChampionGalar Campeón de Galar +RibbonTowerMaster Maestro de la Torre +RibbonMasterRank Rango Maestro +RibbonMarkLunchtime Emblema Almuerzo +RibbonMarkSleepyTime Emblema Noche +RibbonMarkDusk Emblema Ocaso +RibbonMarkDawn Emblema Alba +RibbonMarkCloudy Emblema Nube +RibbonMarkRainy Emblema Lluvia +RibbonMarkStormy Emblema Tormenta +RibbonMarkSnowy Emblema Nieve +RibbonMarkBlizzard Emblema Nevasca +RibbonMarkDry Emblema Sequedad +RibbonMarkSandstorm Emblema Polvareda +RibbonMarkMisty Emblema Niebla +RibbonMarkDestiny Emblema Destino +RibbonMarkFishing Emblema Pesca +RibbonMarkCurry Emblema Curri +RibbonMarkUncommon Emblema Familiaridad +RibbonMarkRare Emblema Rareza +RibbonMarkRowdy Emblema Travesura +RibbonMarkAbsentMinded Emblema Despreocupación +RibbonMarkJittery Emblema Nerviosismo +RibbonMarkExcited Emblema Ilusión +RibbonMarkCharismatic Emblema Carisma +RibbonMarkCalmness Emblema Compostura +RibbonMarkIntense Emblema Pasión +RibbonMarkZonedOut Emblema Distracción +RibbonMarkJoyful Emblema Felicidad +RibbonMarkAngry Emblema Cólera +RibbonMarkSmiley Emblema Sonrisa +RibbonMarkTeary Emblema Llanto +RibbonMarkUpbeat Emblema Buen Humor +RibbonMarkPeeved Emblema Mal Humor +RibbonMarkIntellectual Emblema Intelecto +RibbonMarkFerocious Emblema Impulsividad +RibbonMarkCrafty Emblema Astucia +RibbonMarkScowling Emblema Intimidación +RibbonMarkKindly Emblema Amabilidad +RibbonMarkFlustered Emblema Desconcierto +RibbonMarkPumpedUp Emblema Motivación +RibbonMarkZeroEnergy Emblema Desgana +RibbonMarkPrideful Emblema Confianza +RibbonMarkUnsure Emblema Inseguridad +RibbonMarkHumble Emblema Sencillez +RibbonMarkThorny Emblema Altanería +RibbonMarkVigor Emblema Vigor +RibbonMarkSlump Emblema Extenuación \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/es/text_Species_es.txt b/PKHeX.Core/Resources/text/es/text_Species_es.txt index e643f6476..d59e248e6 100644 --- a/PKHeX.Core/Resources/text/es/text_Species_es.txt +++ b/PKHeX.Core/Resources/text/es/text_Species_es.txt @@ -807,4 +807,85 @@ Stakataka Blacephalon Zeraora Meltan -Melmetal \ No newline at end of file +Melmetal +Grookey +Thwackey +Rillaboom +Scorbunny +Raboot +Cinderace +Sobble +Drizzile +Inteleon +Skwovet +Greedent +Rookidee +Corvisquire +Corviknight +Blipbug +Dottler +Orbeetle +Nickit +Thievul +Gossifleur +Eldegoss +Wooloo +Dubwool +Chewtle +Drednaw +Yamper +Boltund +Rolycoly +Carkol +Coalossal +Applin +Flapple +Appletun +Silicobra +Sandaconda +Cramorant +Arrokuda +Barraskewda +Toxel +Toxtricity +Sizzlipede +Centiskorch +Clobbopus +Grapploct +Sinistea +Polteageist +Hatenna +Hattrem +Hatterene +Impidimp +Morgrem +Grimmsnarl +Obstagoon +Perrserker +Cursola +Sirfetch’d +Mr. Rime +Runerigus +Milcery +Alcremie +Falinks +Pincurchin +Snom +Frosmoth +Stonjourner +Eiscue +Indeedee +Morpeko +Cufant +Copperajah +Dracozolt +Arctozolt +Dracovish +Arctovish +Duraludon +Dreepy +Drakloak +Dragapult +Zacian +Zamazenta +Eternatus \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/es/text_swsh_00000_es.txt b/PKHeX.Core/Resources/text/es/text_swsh_00000_es.txt index 4d9440604..5cc845552 100644 --- a/PKHeX.Core/Resources/text/es/text_swsh_00000_es.txt +++ b/PKHeX.Core/Resources/text/es/text_swsh_00000_es.txt @@ -1 +1,163 @@ -todo \ No newline at end of file +－ + +un lugar misterioso + +un lugar lejano + +Pueblo Yarda + +Bosque Oniria + +[~ 10] +[~ 11] +Ruta 1 + +Pueblo Par + +Estación de Par + +Ruta 2 + +Ciudad Pistón + +Estación de Pistón + +Estadio de Pistón + +[~ 26] +[~ 27] +Ruta 3 + +Mina de Galar + +Ruta 4 + +Pueblo Hoyuelo + +Estadio de Hoyuelo + +[~ 38] +[~ 39] +Ruta 5 + +[~ 42] +[~ 43] +Pueblo Amura + +Estación de Amura + +Estadio de Amura + +[~ 50] +[~ 51] +Afueras de Pistón + +Mina de Galar n.º 2 + +Ciudad Artejo + +Estación de Artejo + +Estadio de Artejo + +[~ 62] +[~ 63] +Planta Eléctrica + +Corona de la Torre + +Ruta 6 + +Pueblo Ladera + +Estadio de Ladera + +[~ 74] +[~ 75] +Bosque Lumirinto + +Pueblo Plié + +Estadio de Plié + +[~ 82] +[~ 83] +Ruta 7 + +Ruta 8 + +Ruta 8 +Senda Vaporosa +Ruta 9 + +Ruta 9 +Bahía de Auriga +Ruta 9 +Afueras de Crampón +Pueblo Auriga + +Estadio de Auriga + +[~ 100] +[~ 101] +Pueblo Crampón + +Túnel de la Ruta 9 + +Ruta 10 + +Est. Colinablanca + +Ciudad Puntera + +Estación de Puntera + +Estadio de Puntera +Sede de la Liga +Estadio de Puntera +Antesala +Estadio de Puntera + +Punto de Encuentro +Área Silvestre +Pradera Radiante +Área Silvestre +Arboleda Claroscuro +Área Silvestre +Antigua Atalaya +Área Silvestre +Lago Axew (este) +Área Silvestre +Lago Axew (oeste) +Área Silvestre +Ojo de Axew +Área Silvestre +Lago Milotic (sur) +Área Silvestre +Silla del Gigante +Área Silvestre +Lago Milotic (norte) +Área Silvestre +Ribera de Pistón +Área Silvestre +Valle Entrepuentes +Área Silvestre +Llanura Pétrea +Área Silvestre +Cuenca Polvorienta +Área Silvestre +Espejo del Gigante +Área Silvestre +Cornisa de Artejo +Área Silvestre +Gorro del Gigante +Área Silvestre +Lago del Enfado +Área Silvestre +Est. Área Silvestre + +Torre Batalla + +Torre Rose + +Nido Pokémon diff --git a/PKHeX.Core/Resources/text/es/text_swsh_30000_es.txt b/PKHeX.Core/Resources/text/es/text_swsh_30000_es.txt index 4d9440604..d66d62023 100644 --- a/PKHeX.Core/Resources/text/es/text_swsh_30000_es.txt +++ b/PKHeX.Core/Resources/text/es/text_swsh_30000_es.txt @@ -1 +1,19 @@ -todo \ No newline at end of file +Intercambio en conexión +Intercambio en conexión +Kanto +Johto +Hoenn +Sinnoh +Tierra lejana +－－－－－－－－－－ +Teselia +Kalos +Nexo Pokémon +Pokémon GO +Kanto +Hoenn +Alola +Poké Resort +Johto +Pokémon HOME +Kanto \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/es/text_swsh_40000_es.txt b/PKHeX.Core/Resources/text/es/text_swsh_40000_es.txt index 4d9440604..aff340f55 100644 --- a/PKHeX.Core/Resources/text/es/text_swsh_40000_es.txt +++ b/PKHeX.Core/Resources/text/es/text_swsh_40000_es.txt @@ -1 +1,113 @@ -todo \ No newline at end of file +Lugar encantador +Lugar lejano +Película Pokémon +[~ 3] +Película Pokémon 2019 +Película Pokémon 2020 +Película Pokémon 2021 +Película Pokémon 2022 +Película Pokémon 2023 +Película Pokémon 2024 +Dibujos animados Pokémon +Pokémon Center +Pokémon Center Tohoku +WCS +[~ 14] +WCS 2019 +WCS 2020 +WCS 2021 +WCS 2022 +WCS 2023 +WCS 2024 +Worlds +[~ 22] +Worlds 2019 +Worlds 2020 +Worlds 2021 +Worlds 2022 +Worlds 2023 +Worlds 2024 +Evento de Videojuegos +[~ 30] +Evento Videojuegos 2019 +Evento Videojuegos 2020 +Evento Videojuegos 2021 +Evento Videojuegos 2022 +Evento Videojuegos 2023 +Evento Videojuegos 2024 +Evento Pokémon +Torneo +Evento de Videojuegos +Pokémon Daisuki Club +Programa sobre Pokémon +Concierto +Regalo en línea +Pokémon Global Link +[~ 45] +Evento Pokémon 2019 +Evento Pokémon 2020 +Evento Pokémon 2021 +Evento Pokémon 2022 +Evento Pokémon 2023 +Evento Pokémon 2024 +Evento Pokémon +[~ 53] +Evento Pokémon 2019 +Evento Pokémon 2020 +Evento Pokémon 2021 +Evento Pokémon 2022 +Evento Pokémon 2023 +Evento Pokémon 2024 +PokéPark +[~ 61] +PokéPark 2019 +PokéPark 2020 +PokéPark 2021 +PokéPark 2022 +PokéPark 2023 +PokéPark 2024 +Evento +GAME FREAK +Estadio +VGC +[~ 72] +VGC 2019 +VGC 2020 +VGC 2021 +VGC 2022 +VGC 2023 +VGC 2024 +Consola Virtual +Pokémon GO +Banco de Pokémon +Establecimiento Pokémon +Versión de prueba +Poké Ball Plus +Pokémon HOME +[~ 86] +[~ 87] +[~ 88] +[~ 89] +[~ 90] +[~ 91] +[~ 92] +[~ 93] +[~ 94] +[~ 95] +[~ 96] +[~ 97] +[~ 98] +[~ 99] +[~ 100] +[~ 101] +[~ 102] +[~ 103] +[~ 104] +[~ 105] +[~ 106] +[~ 107] +[~ 108] +[~ 109] +[~ 110] +[~ 111] +[~ 112] \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/es/text_swsh_60000_es.txt b/PKHeX.Core/Resources/text/es/text_swsh_60000_es.txt index 4d9440604..f7fb9df7e 100644 --- a/PKHeX.Core/Resources/text/es/text_swsh_60000_es.txt +++ b/PKHeX.Core/Resources/text/es/text_swsh_60000_es.txt @@ -1 +1,4 @@ -todo \ No newline at end of file +Persona lejana +Cuidados Pokémon +Buscatesoros +Anciana del Balneario \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/es/text_tradeswsh_es.txt b/PKHeX.Core/Resources/text/es/text_tradeswsh_es.txt new file mode 100644 index 000000000..3cbca4ad6 --- /dev/null +++ b/PKHeX.Core/Resources/text/es/text_tradeswsh_es.txt @@ -0,0 +1,22 @@ +Mone +Mofletitos +Algodoncín +Topi +Flequi +Incor +Maska +Rojudo +Azurate +Sr. Mimo +Dururu +Juanjo +Estrella +Marietta +Fortunata +Romeo +Romeo +Helena +Leopoldo +Leopoldo +Alexei +Benjamín \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/fr/text_Abilities_fr.txt b/PKHeX.Core/Resources/text/fr/text_Abilities_fr.txt index 1b8095166..23d070927 100644 --- a/PKHeX.Core/Resources/text/fr/text_Abilities_fr.txt +++ b/PKHeX.Core/Resources/text/fr/text_Abilities_fr.txt @@ -1,4 +1,4 @@ - +- Puanteur Crachin Turbo @@ -8,13 +8,13 @@ Moiteur Échauffement Voile Sable Statik -Absorb Volt -Absorb Eau +Absorbe-Volt +Absorbe-Eau Benêt Ciel Gris Œil Composé Insomnia -Déguisement +Homochromie Vaccin Torche Écran Poudre @@ -56,9 +56,9 @@ Absentéisme Agitation Joli Sourire Plus -Minus +Moins Météo -Glue +Glu Mue Cran Écaille Spéciale @@ -130,7 +130,7 @@ Acharné Défaitiste Corps Maudit Cœur Soin -Garde Amie +Garde-Ami Armurouillée Heavy Metal Light Metal @@ -161,7 +161,7 @@ Force Sable Épine de Fer Mode Transe Victorieux -TurboBrasier +Turbo Brasier Téra-Voltage Aroma-Voile Flora-Voile @@ -231,4 +231,29 @@ Créa-Herbe Métallo-Garde Spectro-Bouclier Prisme-Armure -Cérébro-Force \ No newline at end of file +Cérébro-Force +Lame Indomptable +Égide Inflexible +Libéro +Ramasse Ball +Effilochage +Propulseur +Armure Miroir +Dégobage +Nerfs d’Acier +Turbine +Punk Rock +Expul’Sable +Écailles Glacées +Mûrissement +Tête de Gel +Cercle d’Énergie +Mimétisme +Brise-Barrière +Boost Acier +Corps Condamné +Âme Vagabonde +Entêtement +Gaz Inhibiteur +Voile Pastel +Déclic Fringale \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/fr/text_Forms_fr.txt b/PKHeX.Core/Resources/text/fr/text_Forms_fr.txt index b3d7df7e4..518e5bbaa 100644 Binary files a/PKHeX.Core/Resources/text/fr/text_Forms_fr.txt and b/PKHeX.Core/Resources/text/fr/text_Forms_fr.txt differ diff --git a/PKHeX.Core/Resources/text/fr/text_GenLoc_fr.txt b/PKHeX.Core/Resources/text/fr/text_GenLoc_fr.txt index 4948b3415..bc2e314ae 100644 --- a/PKHeX.Core/Resources/text/fr/text_GenLoc_fr.txt +++ b/PKHeX.Core/Resources/text/fr/text_GenLoc_fr.txt @@ -1,7 +1,7 @@ -quelque part +quelque part dans la ville de départ -dans sa maison -chez un ami +à la maison +chez des amis chez quelqu’un dans une ville animée dans une boutique @@ -10,32 +10,32 @@ dans une ville ordinaire dans un Centre Pokémon dans un château dans un hôtel -dans une ville mystérieuse +dans une ville étrange dans une ville très venteuse -à une porte -dans une ville en bord de rivière +près d’une entrée +dans une ville au bord d’une rivière dans un laboratoire dans un aquarium dans une ville près d’une falaise -dans une ville resplendissante +dans une ville magnifique dans une Arène Pokémon dans une école -dans une ville immense +dans une grande ville dans un immeuble dans un café à la mode dans une planque dans un musée -dans un studio vidéo +dans un studio dans une gare -dans un lieu où l’on se bat -dans un salon de beauté +dans une zone de combat +dans un salon Salle à Mèches dans un restaurant dans un grand restaurant dans une ville en bord de mer -dans un bâtiment élevé -dans une ville mystérieuse -dans une ville au bord de l’eau -dans une ville enneigée +dans un immeuble très imposant +dans un quartier étrange +dans un quartier au bord de l’eau +dans une ville sous la neige à la Ligue Pokémon dans un palais dans une grotte @@ -46,8 +46,8 @@ sur un chemin tranquille sur un chemin fleuri à la Pension Pokémon sur un chemin escarpé -dans un champ de pierres levées -sur un chemin surplombant la mer +dans un lieu où se dressent des rochers +sur un chemin près de la mer sur un chemin boueux sur un chemin balayé par le sable sur un chemin couvert de feuilles @@ -60,12 +60,21 @@ dans un champ dans des ruines dans un Chenal au cours d’un safari +sur un grand bateau +dans le Grand Ciel +dans une Salle Concours +dans un lieu mystérieux +sur une petite île +sur un chemin recouvert de cendres dans une Base Secrète -au Concours Pokémon -tout au fond de la mer -dans un endroit irréel -dans un grand bateau -sur une route pleine de cendres -sur un tout petit îlot -dans un lieu très impressionnant -dans le Grand Ciel \ No newline at end of file +dans les profondeurs de la mer +dans un Mirage +sur une route près d’un lac +dans une vaste prairie +dans un stade +à la Garderie +dans une mine +dans une petite ville de montagne +dans une ville déserte +dans un tunnel +dans un lieu dangereux \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/fr/text_Items_fr.txt b/PKHeX.Core/Resources/text/fr/text_Items_fr.txt index e1b2bd0dd..5a806e6e8 100644 --- a/PKHeX.Core/Resources/text/fr/text_Items_fr.txt +++ b/PKHeX.Core/Resources/text/fr/text_Items_fr.txt @@ -1,4 +1,4 @@ -Aucun +Aucun Master Ball Hyper Ball Super Ball @@ -246,7 +246,7 @@ Bec Pointu Pic Venin Glace Éternelle Rune Sort -Cuiller Tordue +Cuillère Tordue Charbon Croc Dragon Mouchoir Soie @@ -257,7 +257,7 @@ Encens Doux Poing Chance Poudre Métal Masse Os -Bâton +Poireau Foulard Rouge Foulard Bleu Foulard Rose @@ -287,7 +287,7 @@ Roche Humide Accro Griffe Mouchoir Choix Piquants -Poignée Pouvoir +Poignet Pouvoir Ceinture Pouvoir Lentille Pouvoir Bandeau Pouvoir @@ -302,7 +302,7 @@ Plaque Volt Plaque Herbe Plaque Glace Plaque Poing -Plaque Toxik +Plaque Toxicité Plaque Terre Plaque Ciel Plaque Esprit @@ -476,7 +476,7 @@ Glas Transparent Carte Magnétique Clé Sous-Sol Carapuce à O -Écaillerouge +Écaille Rouge Objet perdu Passe Train Partie Machine @@ -563,13 +563,13 @@ Joyau Dragon Joyau Ténèbres Joyau Acier Joyau Normal -Aile Santé -Aile Force -Aile Armure -Aile Esprit -Aile Mental -Aile Sprint -Jolie Aile +Plume Santé +Plume Force +Plume Armure +Plume Esprit +Plume Mental +Plume Sprint +Jolie Plume Fossile Plaque Fossile Plume Passe Liberté @@ -1055,4 +1055,525 @@ Bonbon Minidraco Bonbon Mewtwo Bonbon Mew Bonbon Meltan -Bonbon Magmar \ No newline at end of file +Bonbon Magmar +??? +??? +??? +??? +??? +??? +??? +??? +??? +??? +??? +??? +??? +??? +??? +??? +Recommandation +Boîte Pokémon +Étoile Vœu +Poignet Dynamax +??? +??? +Canne à Pêche +Moticyclette +??? +??? +Saucisses +Conserve de Bob +Conserve de Bach +Haricots +Pain de Mie +Pâtes +Champignons +Queue Fumée +Gros Poireau +Pomme Juteuse +Os à Moelle +Pommes de Terre +Tubercule +Légumes +Fritures +Œuf Dur +Kit de Camping +??? +??? +Épée Rouillée +Bouclier Rouillé +Fossile Oiseau +Fossile Poisson +Fossile Dragon +Fossile Aileron +Fraise en Sucre +Cœur en Sucre +Baie en Sucre +Trèfle en Sucre +Fleur en Sucre +Étoile en Sucre +Ruban en Sucre +Pomme Sucrée +Pomme Acidulée +Spray Gorge +Sac Fuite +Grosses Bottes +Assurance Échec +Chariot Distordu +Parapluie Solide +Bonbon Exp. XS +Bonbon Exp. S +Bonbon Exp. M +Bonbon Exp. L +Bonbon Exp. XL +Bonbon Dynamax +DT00 +DT01 +DT02 +DT03 +DT04 +DT05 +DT06 +DT07 +DT08 +DT09 +DT10 +DT11 +DT12 +DT13 +DT14 +DT15 +DT16 +DT17 +DT18 +DT19 +DT20 +DT21 +DT22 +DT23 +DT24 +DT25 +DT26 +DT27 +DT28 +DT29 +DT30 +DT31 +DT32 +DT33 +DT34 +DT35 +DT36 +DT37 +DT38 +DT39 +DT40 +DT41 +DT42 +DT43 +DT44 +DT45 +DT46 +DT47 +DT48 +DT49 +DT50 +DT51 +DT52 +DT53 +DT54 +DT55 +DT56 +DT57 +DT58 +DT59 +DT60 +DT61 +DT62 +DT63 +DT64 +DT65 +DT66 +DT67 +DT68 +DT69 +DT70 +DT71 +DT72 +DT73 +DT74 +DT75 +DT76 +DT77 +DT78 +DT79 +DT80 +DT81 +DT82 +DT83 +DT84 +DT85 +DT86 +DT87 +DT88 +DT89 +DT90 +DT91 +DT92 +DT93 +DT94 +DT95 +DT96 +DT97 +DT98 +DT99 +CT00 +Aromate Solo +Aromate Rigide +Aromate Mauvais +Aromate Brave +Aromate Assuré +Aromate Malin +Aromate Lâche +Aromate Relax +Aromate Modeste +Aromate Doux +Aromate Foufou +Aromate Discret +Aromate Calme +Aromate Gentil +Aromate Prudent +Aromate Malpoli +Aromate Timide +Aromate Pressé +Aromate Jovial +Aromate Naïf +Aromate Sérieux +Morceau Vœu +Théière Fêlée +Théière Ébréchée +Bouchons Audio +Fruits +Fromage Meumeu +Épices +Crème Fraîche +Curry Instantané +Lait de Coco +Nouilles +Steak Haché +Poudre Gigamax +Fragment Vœu +Moticyclette +Charme Stabilité +??? +Lettre Jaunie +Dédicace +Livre de Sonya +??? +??? +??? +??? +??? +??? +Moti-Catalogue +★And458 +★And15 +★And337 +★And603 +★And390 +★Sgr6879 +★Sgr6859 +★Sgr6913 +★Sgr7348 +★Sgr7121 +★Sgr6746 +★Sgr7194 +★Sgr7337 +★Sgr7343 +★Sgr6812 +★Sgr7116 +★Sgr7264 +★Sgr7597 +★Del7882 +★Del7906 +★Del7852 +★Psc596 +★Psc361 +★Psc510 +★Psc437 +★Psc8773 +★Lep1865 +★Lep1829 +★Boo5340 +★Boo5506 +★Boo5435 +★Boo5602 +★Boo5733 +★Boo5235 +★Boo5351 +★Hya3748 +★Hya3903 +★Hya3418 +★Hya3482 +★Hya3845 +★Eri1084 +★Eri472 +★Eri1666 +★Eri897 +★Eri1231 +★Eri874 +★Eri1298 +★Eri1325 +★Eri984 +★Eri1464 +★Eri1393 +★Eri850 +★Tau1409 +★Tau1457 +★Tau1165 +★Tau1791 +★Tau1910 +★Tau1346 +★Tau1373 +★Tau1412 +★CMa2491 +★CMa2693 +★CMa2294 +★CMa2827 +★CMa2282 +★CMa2618 +★CMa2657 +★CMa2646 +★UMa4905 +★UMa4301 +★UMa5191 +★UMa5054 +★UMa4295 +★UMa4660 +★UMa4554 +★UMa4069 +★UMa3569 +★UMa3323 +★UMa4033 +★UMa4377 +★UMa4375 +★UMa4518 +★UMa3594 +★Vir5056 +★Vir4825 +★Vir4932 +★Vir4540 +★Vir4689 +★Vir5338 +★Vir4910 +★Vir5315 +★Vir5359 +★Vir5409 +★Vir5107 +★Ari617 +★Ari553 +★Ari546 +★Ari951 +★Ori1713 +★Ori2061 +★Ori1790 +★Ori1903 +★Ori1948 +★Ori2004 +★Ori1852 +★Ori1879 +★Ori1899 +★Ori1543 +★Cas21 +★Cas168 +★Cas403 +★Cas153 +★Cas542 +★Cas219 +★Cas265 +★Cnc3572 +★Cnc3208 +★Cnc3461 +★Cnc3449 +★Cnc3429 +★Cnc3627 +★Cnc3268 +★Cnc3249 +★Com4968 +★Crv4757 +★Crv4623 +★Crv4662 +★Crv4786 +★Aur1708 +★Aur2088 +★Aur1605 +★Aur2095 +★Aur1577 +★Aur1641 +★Aur1612 +★Pav7790 +★Cet911 +★Cet681 +★Cet188 +★Cet539 +★Cet804 +★Cep8974 +★Cep8162 +★Cep8238 +★Cep8417 +★Cen5267 +★Cen5288 +★Cen551 +★Cen5459 +★Cen5460 +★CMi2943 +★CMi2845 +★Equ8131 +★Vul7405 +★UMi424 +★UMi5563 +★UMi5735 +★UMi6789 +★Crt4287 +★Lyr7001 +★Lyr7178 +★Lyr7106 +★Lyr7298 +★Ara6585 +★Sco6134 +★Sco6527 +★Sco6553 +★Sco5953 +★Sco5984 +★Sco6508 +★Sco6084 +★Sco5944 +★Sco6630 +★Sco6027 +★Sco6247 +★Sco6252 +★Sco5928 +★Sco6241 +★Sco6165 +★Tri544 +★Leo3982 +★Leo4534 +★Leo4357 +★Leo4057 +★Leo4359 +★Leo4031 +★Leo3852 +★Leo3905 +★Leo3773 +★Gru8425 +★Gru8636 +★Gru8353 +★Lib5685 +★Lib5531 +★Lib5787 +★Lib5603 +★Pup3165 +★Pup3185 +★Pup3045 +★Cyg7924 +★Cyg7417 +★Cyg7796 +★Cyg8301 +★Cyg7949 +★Cyg7528 +★Oct7228 +★Col1956 +★Col2040 +★Col2177 +★Gem2990 +★Gem2891 +★Gem2421 +★Gem2473 +★Gem2216 +★Gem2777 +★Gem2650 +★Gem2286 +★Gem2484 +★Gem2930 +★Peg8775 +★Peg8781 +★Peg39 +★Peg8308 +★Peg8650 +★Peg8634 +★Peg8684 +★Peg8450 +★Peg8880 +★Peg8905 +★Oph6556 +★Oph6378 +★Oph6603 +★Oph6149 +★Oph6056 +★Oph6075 +★Ser5854 +★Ser7141 +★Ser5879 +★Her6406 +★Her6148 +★Her6410 +★Her6526 +★Her6117 +★Her6008 +★Per936 +★Per1017 +★Per1131 +★Per1228 +★Per834 +★Per941 +★Phe99 +★Phe338 +★Vel3634 +★Vel3485 +★Vel3734 +★Aqr8232 +★Aqr8414 +★Aqr8709 +★Aqr8518 +★Aqr7950 +★Aqr8499 +★Aqr8610 +★Aqr8264 +★Cru4853 +★Cru4730 +★Cru4763 +★Cru4700 +★Cru4656 +★PsA8728 +★TrA6217 +★Cap7776 +★Cap7754 +★Cap8278 +★Cap8322 +★Cap7773 +★Sge7479 +★Car2326 +★Car3685 +★Car3307 +★Car3699 +★Dra5744 +★Dra5291 +★Dra6705 +★Dra6536 +★Dra7310 +★Dra6688 +★Dra4434 +★Dra6370 +★Dra7462 +★Dra6396 +★Dra6132 +★Dra6636 +★CVn4915 +★CVn4785 +★CVn4846 +★Aql7595 +★Aql7557 +★Aql7525 +★Aql7602 +★Aql7235 \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/fr/text_Memories_fr.txt b/PKHeX.Core/Resources/text/fr/text_Memories_fr.txt index 850c402ac..d88a2be6e 100644 --- a/PKHeX.Core/Resources/text/fr/text_Memories_fr.txt +++ b/PKHeX.Core/Resources/text/fr/text_Memories_fr.txt @@ -1,4 +1,4 @@ - + se souvient vaguement que se souvient vaguement que @@ -36,73 +36,93 @@ c’était épuisant certain objet une capacité Pokémon -Il se rappelle un bon souvenir, mais les détails lui semblent flous. -{0} a fait la rencontre de {1} {2}. Il a accepté d’entrer dans sa Poké Ball, et c’est ainsi que leur amitié a commencé. Il {4} {3}. -{0} a brisé la coquille de son Œuf et a fait la rencontre de {1} {2}. Il {4} {3}. -{0} a fait la rencontre de {1} {2}. Il {4} {3}. -{0} est devenu l’ami de {1} lors d’un échange {2}. Il {4} {3}. -{0} est allé dans un Centre Pokémon avec {1} pour acheter {2}. Il {4} {3}. -{0} est allé dans un Centre Pokémon ( {2} ) avec {1} pour se reposer un moment. Il {4} {3}. -{0} est allé à la pêche avec {1} et ils ont attrapé un {2}. Il {4} {3}. -{0} est allé à la pêche avec {1}.Quelque chose a mordu à l’hameçon, mais la prise s’est échappée. Il {4} {3}. -{0} a vu {1} jouer avec un {2}. Il {4} {3}. -{0} a reçu une sucrerie de {1}. Il {4} {3}. -{0} est allé acheter des vêtements avec {1}. Il {4} {3}. -{0} a appris {2} grâce à {1}. Il {4} {3}. -{0} était avec {1} quand il a aidé un {2} à sortir de son Œuf. Il {4} {3}. -{0} était avec {1} lorsque ce Dresseur a attrapé un {2}. Il {4} {3}. -{0} était en mauvaise posture, quand {1} a utilisé {2}. Il {4} {3}. -{0} a utilisé {2} sur les indications de {1}, mais ça n’a eu aucun effet. Il {4} {3}. -{0} a aidé {1} à vaincre un {2}. Il {4} {3}. -{0} a été battu par un {2} et s’est enfui avec {1}. Il {4} {3}. -{0} a été entraîné par {1} et a évolué {2}. Il {4} {3}. -{0} a transporté {1} sur son dos pour lui permettre de traverser une étendue d’eau. Il {4} {3}. -{0} a vu un {2} porter {1} sur son dos. Il {4} {3}. -{0} a aidé {1} à vaincre un Champion d’Arène. Il {4} {3}. -{0} a aidé {1} à relever le défi de la Maison de Combat. Il {4} {3}. -{0} a amené {1} {2} en volant. Il {4} {3}. -{0} et {1} ont été surpris quand un {2} a jailli sur leur route. Il {4} {3}. -{0} a vu {1} utiliser {2}. Il {4} {3}. -{0} a aidé {1} à vaincre le Maître de la Ligue. Il {4} {3}. -{0} était avec {1} quand ce Dresseur a complété son Pokédex. Il {4} {3}. -{0} était aux côtés de {1} quand ce Dresseur a croisé un {2}. Il {4} {3}. -{0} a aidé {1} à vaincre une Châtelaine Combat. Il {4} {3}. -{0} était aux côtés de {1} quand ce Dresseur a utilisé le Cherch’Objet, {2}. Il {4} {3}. -{0} est monté à Bicyclette avec {1} {2}. Il {4} {3}. -{0} a consulté la Carte avec {1} {2}. Il {4} {3}. -{0} a planté des Baies avec {1}, et s’est imaginé à quel point les arbustes seraient jolis à l’heure de la récolte. Il {4} {3}. -{0} a utilisé Force {2} sur les instructions de {1}. Il {4} {3}. -{0} a utilisé Coupe {2} sur les instructions de {1}. Il {4} {3}. -{0} a utilisé Éclate-Roc {2} sur les instructions de {1}. Il {4} {3}. -{0} a utilisé Cascade pour aider {1} à remonter le courant {2}. Il {4} {3}. -{0} a vu {1} ramasser un objet {2}. Il {4} {3}. -{0} a reçu {2} des mains de {1}. Il {4} {3}. -{0} a aidé {1} à relever le défi de la Route Victoire. Il {4} {3}. -{0} était avec {1} quand ce Dresseur a regardé un panneau {2}. Il {4} {3}. -{0} a été impressionné par la vitesse du train qu’il a pris avec {1}. Il {4} {3}. -{0} était avec {1} quand ce Dresseur a trouvé un {2} avec le Poké Radar. Il {4} {3}. -{0} a fui avec {1} face à un {2} sorti de nulle part. Il {4} {3}. -{0} a aidé {1} à obtenir un bon score à un Test Combat, au Club des Épreuves. Il {4} {3}. -{0} s’est fait examiner de près par le Juge, que {1} lui avait présenté. Il {4} {3}. -{0} a oublié {2} grâce à l’Effaceur de Capacités, que {1} lui avait présenté. Il {4} {3}. -{0} s’est remémoré {2}, à la demande de {1}. Il {4} {3}. -{0} a été amené à la Pension Pokémon par {1}. Il y est resté avec un {2}. Il {4} {3}. -{0} a vu {1} gagner {2} à la Loterie ID. Il {4} {3}. -{0} était avec {1} quand ce Dresseur a utilisé un Repousse {2}. Il {4} {3}. -{0} se rappelle d’une session d’entraînement particulièrement dure avec {1}. Il {4} {3}. -{0} est monté dans un ascenseur avec {1}. Il {4} {3}. -{0} est allé voir le Spécialiste des Noms avec {1}, et s’est vu attribuer un très joli surnom. Il {4} {3}. -{0} était avec {1} quand ce Dresseur a essayé des vêtements dans une boutique, mais n’a rien acheté. Il {4} {3}. -{0} était avec {1} quand ce Dresseur est allé dans un grand restaurant s’offrir un menu gastronomique. Il {4} {3}. -{0} a été amené par {1} chez une gentille dame qui aime les Pokémon. Il {4} {3}. -{0} a fouillé les poubelles avec {1} {2}. Il {4} {3}. -{0} a combattu aux côtés de {1} contre un {2}, et a fini par utiliser la capacité Lutte. Il {4} {3}. -{0} a admiré le monde du haut d’une grande tour aux côtés de {1}. Il {4} {3}. -{0} est allé avec {1} dans une grotte qui semblait couverte de miroirs, et y a aperçu son reflet. Il {4} {3}. -{0} a failli se perdre dans une forêt avec {1}. Il {4} {3}. -{0} est allé avec {1} dans une usine remplie de machines étranges. Il {4} {3}. -{0} a vu {1} créer sa propre Base Secrète. Il {4} {3}. -{0} a participé à un Concours Pokémon aux côtés de {1}. Il a pu faire son show en faisant toutes sortes de Démonstrations devant un large public. Il {4} {3}. -{0} a participé à un Concours Pokémon aux côtés de {1} et il a réussi à gagner ! Il {4} {3}. -{0} a pris son Grand Envol aux côtés de {1} et a visité quelques endroits exotiques. Il {4} {3}. -{0} a plongé au cœur de l’océan sur les instructions de {1}. Il {4} {3}. \ No newline at end of file +{0} se rappelle un bon souvenir, mais les détails lui semblent flous... +{0} a rencontré {1} {2}. Il a accepté d’entrer dans sa Poké Ball, et c’est ainsi que leur amitié a commencé. {4} {3}. +{0} a brisé la coquille de son Œuf {2} et a fait la rencontre {1}. {4} {3}. +{0} a rencontré {1} {2}. {4} {3}. +{0} est devenu l’ami {1} lors d’un échange {2}. {4} {3}. +{0} est allé dans un Centre Pokémon avec {1} pour acheter {2}. {4} {3}. +{0} est allé se reposer un moment avec {1} dans un Centre Pokémon. {4} {3}. +{0} est allé à la pêche avec {1} et ils ont attrapé un {2}. {4} {3}. +{0} est allé à la pêche avec {1}. Quelque chose a mordu à l’hameçon, mais la prise s’est échappée. {4} {3}. +{0} a vu {1} s’occuper d’un {2}. {4} {3}. +{0} a reçu une sucrerie {1}. {4} {3}. +{0} est allé acheter des vêtements avec {1}. {4} {3}. +{0} a appris {2} grâce à {1}. {4} {3}. +{0} était avec {1} quand il a aidé un {2} à sortir de son Œuf. {4} {3}. +{0} était avec {1} lorsqu’ils ont attrapé un {2}. {4} {3}. +{0} était en mauvaise posture, quand {1} a utilisé {2}. {4} {3}. +{0} a utilisé {2} sur les indications {1}, mais ça n’a eu aucun effet. {4} {3}. +{0} a aidé {1} à vaincre un {2}. {4} {3}. +{0} a été battu par un {2} et s’est enfui avec {1}. {4} {3}. +{0} a été entraîné par {1} et a évolué {2}. {4} {3}. +{0} a transporté {1} sur son dos pour lui permettre de traverser une étendue d’eau. {4} {3}. +{0} a vu un {2} porter {1} sur son dos. {4} {3}. +{0} a aidé {1} à vaincre un Champion d’Arène. {4} {3}. +{0} était vraiment tendu quand il a aidé {1} à relever le défi de la Maison de Combat. {4} {3}. +{0} a amené {1} {2} en volant. {4} {3}. +{0} et {1} ont été surpris par un {2} qui a jailli devant eux. {4} {3}. +{0} a vu {1} utiliser {2}. {4} {3}. +{0} a aidé {1} à vaincre le Maître de la Ligue. {4} {3}. +{0} était là quand {1} a complété son Pokédex. {4} {3}. +{0} a croisé un {2} avec {1}. {4} {3}. +{0} a aidé {1} à vaincre une sommité dans le monde des Dresseurs. {4} {3}. +{0} était avec {1} quand ils ont utilisé le Cherch’Objet, {2}. {4} {3}. +{0} est monté à Bicyclette avec {1} {2}. {4} {3}. +{0} a consulté la Carte avec {1} {2}. {4} {3}. +{0} a planté des Baies avec {1}, et s’est imaginé à quel point les arbustes seraient jolis à l’heure de la récolte. {4} {3}. +{0} a utilisé Force {2} sur les instructions {1}. {4} {3}. +{0} a utilisé Coupe {2} sur les instructions {1}. {4} {3}. +{0} a détruit des rochers {2} sur les instructions {1}. {4} {3}. +{0} a utilisé Cascade pour aider {1} à remonter le courant {2}. {4} {3}. +{0} a vu {1} ramasser un objet {2}. {4} {3}. +{0} a reçu {2} des mains {1}. {4} {3}. +{0} a aidé {1} à relever le défi de la Route Victoire. {4} {3}. +{0} a regardé un panneau avec {1} {2}. {4} {3}. +{0} a été impressionné par la vitesse du train qu’il a pris avec {1}. {4} {3}. +{0} était avec {1} quand ils ont trouvé un {2} avec le Poké Radar. {4} {3}. +{0} a fui avec {1} face à un {2} sorti de nulle part. {4} {3}. +{0} a aidé {1} à obtenir un bon score à un Test Combat, au Club des Épreuves. {4} {3}. +{1} a présenté {0} au Juge pour qu’il l’examine de près. {4} {3}. +{1} a présenté {0} à l’Effaceur de Capacités pour qu’il lui fasse oublier {2}. {4} {3}. +{0} s’est remémoré {2}, à la demande {1}. {4} {3}. +{0} a été amené à la Pension Pokémon par {1}. Il y a séjourné avec un {2}. {4} {3}. +{0} a vu {1} gagner {2} à la Loterie. {4} {3}. +{0} était avec {1} quand ils ont utilisé un Repousse {2}. {4} {3}. +{0} se rappelle une session d’entraînement particulièrement difficile avec {1}. {4} {3}. +{0} est monté dans un ascenseur avec {1}. {4} {3}. +{0} est allé voir le Spécialiste des Noms avec {1}, et il s’est vu attribuer un très joli surnom. {4} {3}. +{0} a vu {1} essayer des vêtements dans une boutique, sans rien trouver à son goût. {4} {3}. +{0} est allé dans un grand restaurant s’offrir un menu gastronomique avec {1}. {4} {3}. +{0} a été amené par {1} chez une gentille dame qui aime les Pokémon. {4} {3}. +{0} a fouillé les poubelles avec {1} {2}. {4} {3}. +{0} a combattu aux côtés {1} contre un {2}, et a fini par utiliser la capacité Lutte. {4} {3}. +{0} a admiré le monde du haut d’une grande tour aux côtés {1}. {4} {3}. +{0} est allé avec {1} dans une grotte qui semblait couverte de miroirs, et y a aperçu son reflet. {4} {3}. +{0} a failli se perdre en forêt avec {1}. {4} {3}. +{0} est allé avec {1} dans une usine remplie de machines étranges. {4} {3}. +{0} a vu {1} créer sa propre Base Secrète. {4} {3}. +{0} a participé à un Concours Pokémon aux côtés {1}. Il a pu faire son show en effectuant toutes sortes de Démonstrations devant un large public. {4} {3}. +{0} a participé à un Concours Pokémon aux côtés {1} et il a réussi à gagner ! {4} {3}. +{0} a pris son envol aux côtés {1} et a visité quelques endroits exotiques. {4} {3}. +{0} a plongé au cœur de l’océan sur les instructions {1} pour explorer les abysses. {4} {3}. +{0} s’est assis sur un banc avec {1} {2}. {4} {3}. +{0} s’est battu aux côtés {1} contre un {2} sous sa forme Dynamax. {4} {3}. +{0} s’est dynamaxé à la demande {1} pour combattre un {2}. {4} {3}. +{0} a fait du camping avec {1}. {4} {3}. +{0} a cuisiné avec {1}. {4} {3}. +{0} a été amené à la Garderie Pokémon par {1}. Il y a séjourné avec un {2}. {4} {3}. +{0} a fêté l’anniversaire {1} au Centre Pokémon. {4} {3}. +{0} a aidé {1} à choisir une nouvelle coupe dans un salon de coiffure. {4} {3}. +{0} se baladait avec {1} quand la pluie s’est mise à tomber. Ils se sont retrouvés trempés. {4} {3}. +{0} a participé à une course avec {1}. Ils ont foncé à une vitesse ahurissante. {4} {3}. +Dans une Boîte PC, {0} s’est entraîné à utiliser {2} pour impressionner {1}. {4} {3}. +Dans une Boîte PC, {0} s’est entraîné à utiliser {2} en restant cool pour impressionner {1}. {4} {3}. +{0} a parlé {1} avec {2} dans une Boîte PC. {4} {3}. +{0} s’est lié d’amitié avec {2} dans une Boîte PC, et a décidé de s’entraîner à utiliser des capacités avec lui pour impressionner {1}. {4} {3}. +{0} s’est demandé si {1} n’avait pas oublié de récupérer {2} qu’il tenait au moment d’être envoyé vers une Boîte PC. {4} {3}. +{0} a fait le timide quand {1} lui a rendu visite dans sa Boîte PC. {4} {3}. +Depuis sa Boîte PC, {0} a entendu {1} était {2}, et s’est imaginé à quoi cela pouvait bien ressembler. {4} {3}. +Dans sa Boîte PC, {0} s’est disputé avec {2} à cause d’un désaccord à propos {1}. {4} {3}. +Dans sa Boîte PC, {0} s’est demandé pourquoi {1} lui avait donné {2}. {4} {3}. +Dans sa Boîte PC, {0} a rêvé {1} utilisait la capacité {2}. {4} {3}. \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/fr/text_Moves_fr.txt b/PKHeX.Core/Resources/text/fr/text_Moves_fr.txt index ee73fd0df..f559b6dff 100644 --- a/PKHeX.Core/Resources/text/fr/text_Moves_fr.txt +++ b/PKHeX.Core/Resources/text/fr/text_Moves_fr.txt @@ -1,21 +1,21 @@ -――――― +――――― Écras’Face -Poing-Karaté +Poing Karaté Torgnoles Poing Comète Ultimapoing Jackpot -Poing de Feu -Poing-Glace -Poing-Éclair +Poing Feu +Poing Glace +Poing Éclair Griffe Force Poigne Guillotine Coupe-Vent -Danse-Lames +Danse Lames Coupe Tornade -Cru-Aile +Cru-Ailes Cyclone Vol Étreinte @@ -39,7 +39,7 @@ Mania Damoclès Mimi-Queue Dard-Venin -Double-Dard +Double Dard Dard-Nuée Groz’Yeux Morsure @@ -47,7 +47,7 @@ Rugissement Hurlement Berceuse Ultrason -Sonicboom +Sonic Boom Entrave Acide Flammèche @@ -69,7 +69,7 @@ Balayage Riposte Frappe Atlas Force -Vol-Vie +Vole-Vie Méga-Sangsue Vampigraine Croissance @@ -78,13 +78,13 @@ Lance-Soleil Poudre Toxik Para-Spore Poudre Dodo -Danse-Fleur +Danse Fleurs Sécrétion Draco-Rage -Danse Flamme +Danse Flammes Éclair Tonnerre -Cage-Éclair +Cage Éclair Fatal-Foudre Jet-Pierres Séisme @@ -119,7 +119,7 @@ Patience Métronome Mimique Destruction -Bomb’Œuf +Bombe Œuf Léchouille Purédpois Détritus @@ -173,7 +173,7 @@ Cauchemar Roue de Feu Ronflement Malédiction -Fléau +Gigotage Conversion 2 Aéroblast Spore Coton @@ -186,17 +186,17 @@ Grimace Feinte Doux Baiser Cognobidon -Bomb-Beurk +Bombe Beurk Coud’Boue Octazooka Picots Élecanon Clairvoyance -Prélèvem. Destin +Lien du Destin Requiem Vent Glace Détection -Charge-Os +Charge Os Verrouillage Colère Tempête de Sable @@ -209,7 +209,7 @@ Vantardise Lait à Boire Étincelle Taillade -Aile d’Acier +Ailes d’Acier Regard Noir Attraction Blabla Dodo @@ -221,9 +221,9 @@ Rune Protect Balance Feu Sacré Ampleur -Dynamopoing +Dynamo-Poing Mégacorne -Dracosouffle +Draco-Souffle Relais Encore Poursuite @@ -236,7 +236,7 @@ Aurore Synthèse Rayon Lune Puissance Cachée -Coup-Croix +Coup Croix Ouragan Danse Pluie Zénith @@ -265,11 +265,11 @@ Façade Mitra-Poing Stimulant Par Ici -Force-Nature +Force Nature Chargeur Provoc Coup d’Main -Tourmagik +Tour de Magie Imitation Vœu Assistance @@ -292,11 +292,11 @@ Force Cachée Plongée Cogne Camouflage -Lumiqueue +Lumi-Queue Lumi-Éclat Ball’Brume -Danse-Plume -Danse-Folle +Danse Plumes +Danse Folle Pied Brûleur Lance-Boue Ball’Glace @@ -320,7 +320,7 @@ Vent Argenté Strido-Son Siffl’Herbe Chatouille -Force Cosmik +Force Cosmique Giclédo Rayon Signal Poing Ombre @@ -331,12 +331,12 @@ Glaciation Ocroupi Balle Graine Aéropique -Stalagtite +Stalactite Mur de Fer Barrage Grondement -Dracogriffe -Végé-Attak +Draco-Griffe +Végé-Attaque Gonflette Rebond Tir de Boue @@ -346,13 +346,13 @@ Implore Feuille Magik Tourniquet Plénitude -Lame-Feuille +Lame Feuille Danse Draco Boule Roc Onde de Choc Vibraqua -Carnareket -Psycho Boost +Vœu Destructeur +Psycho-Boost Atterrissage Gravité Œil Miracle @@ -399,15 +399,15 @@ Poliroche Direct Toxik Vibrobscur Tranche-Nuit -Hydroqueue +Hydro-Queue Canon Graine Lame d’Air -Plaie-Croix +Plaie Croix Bourdon -Dracochoc -Dracocharge +Draco-Choc +Draco-Charge Rayon Gemme -Vampipoing +Vampi-Poing Onde Vide Exploforce Éco-Sphère @@ -432,16 +432,16 @@ Luminocanon Escalade Anti-Brume Distorsion -Draco Météore +Draco-Météore Coup d’Jus Ébullilave Tempête Verte Mégafouet Roc-Boulet -Poison-Croix +Poison Croix Détricanon Tête de Fer -Bombaimant +Bombe Aimant Lame de Roc Séduction Piège de Roc @@ -459,7 +459,7 @@ Fracass’Tête Coup Double Hurle-Temps Spatio-Rift -Danse-Lune +Danse Lune Presse Vortex Magma Trou Noir @@ -492,7 +492,7 @@ Balayette Bombe Acide Tricherie Rayon Simple -Ten-danse +Ten-Danse Après Vous Chant Canon Écho @@ -511,7 +511,7 @@ Projection Calcination À la Queue Acrobatie -Copie Type +Copie-Type Vengeance Tout ou Rien Passe-Cadeau @@ -532,7 +532,7 @@ Double Baffe Crève-Cœur Encornebois Lame Sainte -Coquilame +Coqui-Lame Tacle Feu Phytomixeur Bulldoboule @@ -567,7 +567,7 @@ Dard Mortel Hantise Halloween Râle Mâle -DélugePlasmique +Déluge Plasmique Parabocharge Maléfice Sylvain Tempête Florale @@ -611,14 +611,14 @@ Frotte-Frimousse Retenue Harcèlement Poing Boost -Mort-Ailes +Mort’Ailes Myria-Flèches Myria-Vagues Force Chtonienne Lumière du Néant Onde Originelle Lame Pangéenne -Draco Ascension +Draco-Ascension Furie Dimension Turbo-Charge Bulldozer Turbo-Charge Bulldozer @@ -666,7 +666,7 @@ Aria de l’Écume Marteau de Glace Soin Floral Cavalerie Lourde -Vol-Force +Vole-Force Lame Solaire Feuillage Projecteur @@ -706,7 +706,7 @@ Carapiège Canon Floral Psycho-Croc Trépignement -Os’Ombre +Os Ombre Vif Roc Aqua-Brèche Laser Prisme @@ -740,4 +740,58 @@ Pika-Fracas Évo-Congélo Évo-Fabulo Évo-Chardasso -Écrous d’Poing \ No newline at end of file +Écrous d’Poing +Gardomax +Canon Dynamax +Tir de Précision +Croque Fort +Garde-à-Joues +Ultime Bastion +Goudronnage +Poudre Magique +Draco-Flèches +Thérémonie +Octoprise +Prise de Bec +Branchicrok +Change-Côté +Pyromax +Insectomax +Fulguromax +Normalomax +Pugilomax +Spectromax +Cryomax +Toxinomax +Hydromax +Aéromax +Enchantomax +Dracomax +Psychomax +Lithomax +Sismomax +Sinistromax +Phytomax +Métallomax +Dracacophonie +Big Splash +Nappage +Tambour Battant +Troquenard +Ballon Brûlant +Gladius Maximus +Aegis Maxima +Roue Libre +Abattage +Tapotige +Overdrive +Acide Malique +Force G +Choc Émotionnel +Vapeur Féérique +Fontaine de Vie +Blocage +Fourbette +Joute Astrale +Laser Infinimax +Métalaser \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/fr/text_Ribbons_fr.txt b/PKHeX.Core/Resources/text/fr/text_Ribbons_fr.txt index b3c59fd53..473bc1c9f 100644 --- a/PKHeX.Core/Resources/text/fr/text_Ribbons_fr.txt +++ b/PKHeX.Core/Resources/text/fr/text_Ribbons_fr.txt @@ -100,4 +100,52 @@ RibbonCountG3Cool Cool RibbonCountG3Beauty Beauty RibbonCountG3Cute Cute RibbonCountG3Smart Smart -RibbonCountG3Tough Tough \ No newline at end of file +RibbonCountG3Tough Tough +RibbonChampionGalar Maître de Galar +RibbonTowerMaster Maître de la Tour +RibbonMasterRank Top du Classement +RibbonMarkLunchtime Insigne Appétit +RibbonMarkSleepyTime Insigne Minuit +RibbonMarkDusk Insigne Crépuscule +RibbonMarkDawn Insigne Aube +RibbonMarkCloudy Insigne Nuages +RibbonMarkRainy Insigne Pluie +RibbonMarkStormy Insigne Tonnerre +RibbonMarkSnowy Insigne Neige +RibbonMarkBlizzard Insigne Blizzard +RibbonMarkDry Insigne Sécheresse +RibbonMarkSandstorm Insigne Tempête de Sable +RibbonMarkMisty Insigne Brume +RibbonMarkDestiny Insigne Destin +RibbonMarkFishing Insigne Pêche +RibbonMarkCurry Insigne Curry +RibbonMarkUncommon Insigne Sociabilité +RibbonMarkRare Insigne Rareté +RibbonMarkRowdy Insigne Espièglerie +RibbonMarkAbsentMinded Insigne Insouciance +RibbonMarkJittery Insigne Nervosité +RibbonMarkExcited Insigne Enthousiasme +RibbonMarkCharismatic Insigne Charisme +RibbonMarkCalmness Insigne Sang-Froid +RibbonMarkIntense Insigne Sang Chaud +RibbonMarkZonedOut Insigne Inattention +RibbonMarkJoyful Insigne Bonheur +RibbonMarkAngry Insigne Colère +RibbonMarkSmiley Insigne Rire +RibbonMarkTeary Insigne Pleurs +RibbonMarkUpbeat Insigne Bonne Humeur +RibbonMarkPeeved Insigne Saute d’Humeur +RibbonMarkIntellectual Insigne Réflexion +RibbonMarkFerocious Insigne Impulsivité +RibbonMarkCrafty Insigne Ruse +RibbonMarkScowling Insigne Menace +RibbonMarkKindly Insigne Gentillesse +RibbonMarkFlustered Insigne Panique +RibbonMarkPumpedUp Insigne Entrain +RibbonMarkZeroEnergy Insigne Nonchalance +RibbonMarkPrideful Insigne Fierté +RibbonMarkUnsure Insigne Abattement +RibbonMarkHumble Insigne Discrétion +RibbonMarkThorny Insigne Frime +RibbonMarkVigor Insigne Énergie +RibbonMarkSlump Insigne Blessure \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/fr/text_Species_fr.txt b/PKHeX.Core/Resources/text/fr/text_Species_fr.txt index 84c46bd18..8a456e229 100644 --- a/PKHeX.Core/Resources/text/fr/text_Species_fr.txt +++ b/PKHeX.Core/Resources/text/fr/text_Species_fr.txt @@ -807,4 +807,85 @@ Ama-Ama Pierroteknik Zeraora Meltan -Melmetal \ No newline at end of file +Melmetal +Ouistempo +Badabouin +Gorythmic +Flambino +Lapyro +Pyrobut +Larméléon +Arrozard +Lézargus +Rongourmand +Rongrigou +Minisange +Bleuseille +Corvaillus +Larvadar +Coléodôme +Astronelle +Goupilou +Roublenard +Tournicoton +Blancoton +Moumouton +Moumouflon +Khélocrok +Torgamord +Voltoutou +Fulgudog +Charbi +Wagomine +Monthracite +Verpom +Pomdrapi +Dratatin +Dunaja +Dunaconda +Nigosier +Embrochet +Hastacuda +Toxizap +Salarsen +Grillepattes +Scolocendre +Poulpaf +Krakos +Théffroi +Polthégeist +Bibichut +Chapotus +Sorcilence +Grimalin +Fourbelin +Angoliath +Ixon +Berserkatt +Corayôme +Palarticho +M. Glaquette +Tutétékri +Crèmy +Charmilly +Hexadron +Wattapik +Frissonille +Beldeneige +Dolman +Bekaglaçon +Wimessir +Morpeko +Charibari +Pachyradjah +Galvagon +Galvagla +Hydragon +Hydragla +Duralugon +Fantyrm +Dispareptil +Lanssorien +Zacian +Zamazenta +Éthernatos \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/fr/text_swsh_00000_fr.txt b/PKHeX.Core/Resources/text/fr/text_swsh_00000_fr.txt index 4d9440604..6469c9394 100644 --- a/PKHeX.Core/Resources/text/fr/text_swsh_00000_fr.txt +++ b/PKHeX.Core/Resources/text/fr/text_swsh_00000_fr.txt @@ -1 +1,163 @@ -todo \ No newline at end of file +－－－－－－－－－－ + +dans un endroit mystérieux + +dans un endroit lointain + +à Paddoxton + +dans la Forêt de Sleepwood + +[~ 10] +[~ 11] +sur la Route 1 + +à Brasswick + +à la Gare de Brasswick + +sur la Route 2 + +à Motorby + +à la Gare de Motorby + +au Stade de Motorby + +[~ 26] +[~ 27] +sur la Route 3 + +dans la Mine de Galar + +sur la Route 4 + +à Greenbury + +au Stade de Greenbury + +[~ 38] +[~ 39] +sur la Route 5 + +[~ 42] +[~ 43] +à Skifford + +à la Gare de Skifford + +au Stade de Skifford + +[~ 50] +[~ 51] +aux Abords de Motorby + +dans la Mine de Galar nº 2 + +à Kickenham + +à la Gare de Kickenham + +au Stade de Kickenham + +[~ 62] +[~ 63] +dans la salle du réacteur + +au sommet de la tour + +sur la Route 6 + +à Old Chister + +au Stade d’Old Chister + +[~ 74] +[~ 75] +dans la Forêt de Lumirinth + +à Corrifey + +au Stade de Corrifey + +[~ 82] +[~ 83] +sur la Route 7 + +sur la Route 8 + +sur la Route 8 +sur le Sentier des Sources +sur la Route 9 + +sur la Route 9 +dans la Baie de Ludester +sur la Route 9 +aux Abords de Smashings +à Ludester + +au Stade de Ludester + +[~ 100] +[~ 101] +à Smashings + +dans le Tunnel de la Route 9 + +sur la Route 10 + +à la Gare de White Hill + +à Winscor + +à la Gare de Winscor + +au Stade de Winscor +au Siège de la Ligue +au Stade de Winscor +dans les vestiaires +au Stade de Winscor + +sur le Sentier de la Gare +dans les Terres Sauvages +dans la Plaine Verdoyante +dans les Terres Sauvages +dans le Bois de Clairjour +dans les Terres Sauvages +à la Tour en ruines +dans les Terres Sauvages +au Lac Coupenotte Est +dans les Terres Sauvages +au Lac Coupenotte Ouest +dans les Terres Sauvages +à l’Œil du Lac +dans les Terres Sauvages +au Lac Milobellus Sud +dans les Terres Sauvages +au Siège du Géant +dans les Terres Sauvages +au Lac Milobellus Nord +dans les Terres Sauvages +sur les Berges de Motorby +dans les Terres Sauvages +dans la Prairie Entre-Ponts +dans les Terres Sauvages +dans la Plaine Rocheuse +dans les Terres Sauvages +dans la Fosse des Sables +dans les Terres Sauvages +au Miroir du Géant +dans les Terres Sauvages +sur le Plateau de Kickenham +dans les Terres Sauvages +à la Coiffe du Géant +dans les Terres Sauvages +au Lac Ouragan +dans les Terres Sauvages +à la Gare des Terres Sauvages + +à la Tour de Combat + +dans la Shehroz Tower + +dans un antre diff --git a/PKHeX.Core/Resources/text/fr/text_swsh_30000_fr.txt b/PKHeX.Core/Resources/text/fr/text_swsh_30000_fr.txt index 4d9440604..a8d5a07ca 100644 --- a/PKHeX.Core/Resources/text/fr/text_swsh_30000_fr.txt +++ b/PKHeX.Core/Resources/text/fr/text_swsh_30000_fr.txt @@ -1 +1,19 @@ -todo \ No newline at end of file +Échange en réseau +Échange en réseau +Kanto +Johto +Hoenn +Sinnoh +Pays lointain +－－－－－－－－－－ +Unys +Kalos +Poké Lien +Pokémon GO +Kanto +Hoenn +Alola +Poké Loisir +Johto +Pokémon HOME +Kanto \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/fr/text_swsh_40000_fr.txt b/PKHeX.Core/Resources/text/fr/text_swsh_40000_fr.txt index 4d9440604..1105f37f8 100644 --- a/PKHeX.Core/Resources/text/fr/text_swsh_40000_fr.txt +++ b/PKHeX.Core/Resources/text/fr/text_swsh_40000_fr.txt @@ -1 +1,113 @@ -todo \ No newline at end of file +Endroit superbe +Endroit lointain +Film Pokémon +[~ 3] +Film Pokémon 2019 +Film Pokémon 2020 +Film Pokémon 2021 +Film Pokémon 2022 +Film Pokémon 2023 +Film Pokémon 2024 +Dessin animé Pokémon +Pokémon Center +Pokémon Center Tohoku +WCS +[~ 14] +WCS 2019 +WCS 2020 +WCS 2021 +WCS 2022 +WCS 2023 +WCS 2024 +Worlds +[~ 22] +Worlds 2019 +Worlds 2020 +Worlds 2021 +Worlds 2022 +Worlds 2023 +Worlds 2024 +Évènement Jeu Vidéo +[~ 30] +Évènement Jeu Vidéo 2019 +Évènement Jeu Vidéo 2020 +Évènement Jeu Vidéo 2021 +Évènement Jeu Vidéo 2022 +Évènement Jeu Vidéo 2023 +Évènement Jeu Vidéo 2024 +Évènement Pokémon +Compétition +Évènement +Pokémon Daisuki Club +Émission Pokémon +Concert +Cadeau téléchargeable +Pokémon Global Link +[~ 45] +Évènement Pokémon 2019 +Évènement Pokémon 2020 +Évènement Pokémon 2021 +Évènement Pokémon 2022 +Évènement Pokémon 2023 +Évènement Pokémon 2024 +Pokémon Festa +[~ 53] +Pokémon Festa 2019 +Pokémon Festa 2020 +Pokémon Festa 2021 +Pokémon Festa 2022 +Pokémon Festa 2023 +Pokémon Festa 2024 +PokéPark +[~ 61] +PokéPark 2019 +PokéPark 2020 +PokéPark 2021 +PokéPark 2022 +PokéPark 2023 +PokéPark 2024 +Lieu d’Évènement +GAME FREAK +Stade +VGC +[~ 72] +VGC 2019 +VGC 2020 +VGC 2021 +VGC 2022 +VGC 2023 +VGC 2024 +Console Virtuelle +Pokémon GO +Banque Pokémon +Boutique Pokémon +Démo +Poké Ball Plus +Pokémon HOME +[~ 86] +[~ 87] +[~ 88] +[~ 89] +[~ 90] +[~ 91] +[~ 92] +[~ 93] +[~ 94] +[~ 95] +[~ 96] +[~ 97] +[~ 98] +[~ 99] +[~ 100] +[~ 101] +[~ 102] +[~ 103] +[~ 104] +[~ 105] +[~ 106] +[~ 107] +[~ 108] +[~ 109] +[~ 110] +[~ 111] +[~ 112] \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/fr/text_swsh_60000_fr.txt b/PKHeX.Core/Resources/text/fr/text_swsh_60000_fr.txt index 4d9440604..a80b9a525 100644 --- a/PKHeX.Core/Resources/text/fr/text_swsh_60000_fr.txt +++ b/PKHeX.Core/Resources/text/fr/text_swsh_60000_fr.txt @@ -1 +1,4 @@ -todo \ No newline at end of file +Personne lointaine +Responsable de la Garderie +Chercheur de Trésors +Dame des Eaux Thermales \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/fr/text_tradeswsh_fr.txt b/PKHeX.Core/Resources/text/fr/text_tradeswsh_fr.txt new file mode 100644 index 000000000..26c23f1f0 --- /dev/null +++ b/PKHeX.Core/Resources/text/fr/text_tradeswsh_fr.txt @@ -0,0 +1,22 @@ +Duchat +Joujou +Barbapôpô +Coquillou +Bibiche +Gromalin +Balèmask +Roujitsu +Bleushidô +Kantomime +Cubigon +Charlie +Joulia +Pôline +Fortunée +Ryan +Ryan +Anne-Sophie +Blanchard +Blanchard +Jared +Salvador \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/it/text_Abilities_it.txt b/PKHeX.Core/Resources/text/it/text_Abilities_it.txt index 56080541a..3ec8f219e 100644 --- a/PKHeX.Core/Resources/text/it/text_Abilities_it.txt +++ b/PKHeX.Core/Resources/text/it/text_Abilities_it.txt @@ -231,4 +231,29 @@ Erbogenesi Metalprotezione Spettroguardia Scudoprisma -Cerebroforza \ No newline at end of file +Cerebroforza +Spada Indomita +Scudo Saldo +Libero +Raccattapalle +Lanugine +Elicopinna +Blindospecchio +Inghiottimissile +Volontà di Ferro +Vapormacchina +Punk Rock +Sputasabbia +Geloscaglie +Maturazione +Gelofaccia +Fonte Energetica +Mimetismo +Annullabarriere +Spiritoferreo +Ultimotocco +Anima Errante +Vigorilla +Gas Reagente +Pastelvelo +Pancialterna \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/it/text_Forms_it.txt b/PKHeX.Core/Resources/text/it/text_Forms_it.txt index 48fe21a4f..6bfddf2af 100644 Binary files a/PKHeX.Core/Resources/text/it/text_Forms_it.txt and b/PKHeX.Core/Resources/text/it/text_Forms_it.txt differ diff --git a/PKHeX.Core/Resources/text/it/text_GenLoc_it.txt b/PKHeX.Core/Resources/text/it/text_GenLoc_it.txt index bb481b4d6..6059e486b 100644 --- a/PKHeX.Core/Resources/text/it/text_GenLoc_it.txt +++ b/PKHeX.Core/Resources/text/it/text_GenLoc_it.txt @@ -1,10 +1,10 @@ -da qualche parte +da qualche parte nella città iniziale a casa a casa di amici a casa di qualcuno in una città animata -in un negozio di vestiti +in un negozio di abbigliamento in un negozio in una città tranquilla in un Centro Pokémon @@ -28,7 +28,7 @@ in un museo in uno studio in una stazione sul campo di lotta -in un salone di bellezza +in un salone di acconciature in un ristorante in un ristorante di lusso in una città in riva al mare @@ -58,14 +58,23 @@ su una montagna innevata in una centrale elettrica in un orto in mezzo a delle rovine -in una via d’acqua +in un percorso acquatico in un safari -in una Base Segreta +in una grande nave +nell’Ipersfera in un’Arena delle Virtù +in un luogo misterioso +su una piccola isola +in una strada coperta di cenere +in una Base Segreta sul fondo del mare in una zona miraggio -in una grande nave -in una strada coperta di cenere -su una piccola isola -in un luogo misterioso -nell’Ipersfera \ No newline at end of file +in una città vicina a un lago +in una distesa verdeggiante +in uno stadio +in un Ostello Pokémon +in una miniera +in una città di montagna +in una città mezza abbandonata +in un tunnel +in un luogo pericoloso \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/it/text_Items_it.txt b/PKHeX.Core/Resources/text/it/text_Items_it.txt index f0d679914..e44fd7d46 100644 --- a/PKHeX.Core/Resources/text/it/text_Items_it.txt +++ b/PKHeX.Core/Resources/text/it/text_Items_it.txt @@ -1,4 +1,4 @@ -Niente +Niente Master Ball Ultra Ball Mega Ball @@ -28,7 +28,7 @@ Superpozione Cura totale Revitalizzante Revitalizz. Max -Acqua fresca +Acqua Fresca Gassosa Lemonsucco Latte Mumu @@ -465,7 +465,7 @@ Depochiave Pozione Segreta Registradati Gracidea -Chiave Segreta +Chiave segreta Ghicobox UnownBloc Piantabacche @@ -1055,4 +1055,525 @@ Caramella Dratini Caramella Mewtwo Caramella Mew Caramella Meltan -Caramella Magmar \ No newline at end of file +Caramella Magmar +??? +??? +??? +??? +??? +??? +??? +??? +??? +??? +??? +??? +??? +??? +??? +??? +Referenze +Box Pokémon +Desiostella +Polsino Dynamax +??? +??? +Amo +Bici Rotom +??? +??? +Salsicce +Lattina Gustavo +Scatoletta Bach +Lattina fagioli +Pan carré +Pasta +Funghi +Coda affumicata +Grosso porro +Mela prelibata +Ossi sottili +Patate +Erbe acquatiche +Verdure +Fritto misto +Uovo sodo +Kit da campeggio +??? +??? +Spada rovinata +Scudo rovinato +Ornitofossile +Ittiofossile +Dracofossile +Plesiofossile +Bonbonfragola +Bonboncuore +Bonbonbosco +Bonbonfoglio +Bonbonfiore +Bonbonstella +Bonbonfiocco +Dolcepomo +Aspropomo +Spray gola +Zainofuga +Scarponi robusti +Fiascopolizza +Distorservizio +Superombrello +Caram. Esp. XS +Caram. Esp. S +Caram. Esp. M +Caram. Esp. L +Caram. Esp. XL +Caram. Dynamax +DT00 +DT01 +DT02 +DT03 +DT04 +DT05 +DT06 +DT07 +DT08 +DT09 +DT10 +DT11 +DT12 +DT13 +DT14 +DT15 +DT16 +DT17 +DT18 +DT19 +DT20 +DT21 +DT22 +DT23 +DT24 +DT25 +DT26 +DT27 +DT28 +DT29 +DT30 +DT31 +DT32 +DT33 +DT34 +DT35 +DT36 +DT37 +DT38 +DT39 +DT40 +DT41 +DT42 +DT43 +DT44 +DT45 +DT46 +DT47 +DT48 +DT49 +DT50 +DT51 +DT52 +DT53 +DT54 +DT55 +DT56 +DT57 +DT58 +DT59 +DT60 +DT61 +DT62 +DT63 +DT64 +DT65 +DT66 +DT67 +DT68 +DT69 +DT70 +DT71 +DT72 +DT73 +DT74 +DT75 +DT76 +DT77 +DT78 +DT79 +DT80 +DT81 +DT82 +DT83 +DT84 +DT85 +DT86 +DT87 +DT88 +DT89 +DT90 +DT91 +DT92 +DT93 +DT94 +DT95 +DT96 +DT97 +DT98 +DT99 +MT00 +Menta Schiva +Menta Decisa +Menta Birbona +Menta Audace +Menta Sicura +Menta Scaltra +Menta Fiacca +Menta Placida +Menta Modesta +Menta Mite +Menta Ardente +Menta Quieta +Menta Calma +Menta Gentile +Menta Cauta +Menta Vivace +Menta Timida +Menta Lesta +Menta Allegra +Menta Ingenua +Menta Seria +Desioblocco +Teiera rotta +Teiera crepata +Supertappi +Frutti +Formaggio Mumu +Spezie assortite +Panna da cucina +Curry precotto +Latte di cocco +Noodle precotti +Hamburger +Gigaspezia +Desioframmento +Bici Rotom +Catturamuleto +??? +Vecchia lettera +Autografo band +Libro di Sonia +??? +??? +??? +??? +??? +??? +Catalogo Rotom +★And458 +★And15 +★And337 +★And603 +★And390 +★Sgr6879 +★Sgr6859 +★Sgr6913 +★Sgr7348 +★Sgr7121 +★Sgr6746 +★Sgr7194 +★Sgr7337 +★Sgr7343 +★Sgr6812 +★Sgr7116 +★Sgr7264 +★Sgr7597 +★Del7882 +★Del7906 +★Del7852 +★Psc596 +★Psc361 +★Psc510 +★Psc437 +★Psc8773 +★Lep1865 +★Lep1829 +★Boo5340 +★Boo5506 +★Boo5435 +★Boo5602 +★Boo5733 +★Boo5235 +★Boo5351 +★Hya3748 +★Hya3903 +★Hya3418 +★Hya3482 +★Hya3845 +★Eri1084 +★Eri472 +★Eri1666 +★Eri897 +★Eri1231 +★Eri874 +★Eri1298 +★Eri1325 +★Eri984 +★Eri1464 +★Eri1393 +★Eri850 +★Tau1409 +★Tau1457 +★Tau1165 +★Tau1791 +★Tau1910 +★Tau1346 +★Tau1373 +★Tau1412 +★CMa2491 +★CMa2693 +★CMa2294 +★CMa2827 +★CMa2282 +★CMa2618 +★CMa2657 +★CMa2646 +★UMa4905 +★UMa4301 +★UMa5191 +★UMa5054 +★UMa4295 +★UMa4660 +★UMa4554 +★UMa4069 +★UMa3569 +★UMa3323 +★UMa4033 +★UMa4377 +★UMa4375 +★UMa4518 +★UMa3594 +★Vir5056 +★Vir4825 +★Vir4932 +★Vir4540 +★Vir4689 +★Vir5338 +★Vir4910 +★Vir5315 +★Vir5359 +★Vir5409 +★Vir5107 +★Ari617 +★Ari553 +★Ari546 +★Ari951 +★Ori1713 +★Ori2061 +★Ori1790 +★Ori1903 +★Ori1948 +★Ori2004 +★Ori1852 +★Ori1879 +★Ori1899 +★Ori1543 +★Cas21 +★Cas168 +★Cas403 +★Cas153 +★Cas542 +★Cas219 +★Cas265 +★Cnc3572 +★Cnc3208 +★Cnc3461 +★Cnc3449 +★Cnc3429 +★Cnc3627 +★Cnc3268 +★Cnc3249 +★Com4968 +★Crv4757 +★Crv4623 +★Crv4662 +★Crv4786 +★Aur1708 +★Aur2088 +★Aur1605 +★Aur2095 +★Aur1577 +★Aur1641 +★Aur1612 +★Pav7790 +★Cet911 +★Cet681 +★Cet188 +★Cet539 +★Cet804 +★Cep8974 +★Cep8162 +★Cep8238 +★Cep8417 +★Cen5267 +★Cen5288 +★Cen551 +★Cen5459 +★Cen5460 +★CMi2943 +★CMi2845 +★Equ8131 +★Vul7405 +★UMi424 +★UMi5563 +★UMi5735 +★UMi6789 +★Crt4287 +★Lyr7001 +★Lyr7178 +★Lyr7106 +★Lyr7298 +★Ara6585 +★Sco6134 +★Sco6527 +★Sco6553 +★Sco5953 +★Sco5984 +★Sco6508 +★Sco6084 +★Sco5944 +★Sco6630 +★Sco6027 +★Sco6247 +★Sco6252 +★Sco5928 +★Sco6241 +★Sco6165 +★Tri544 +★Leo3982 +★Leo4534 +★Leo4357 +★Leo4057 +★Leo4359 +★Leo4031 +★Leo3852 +★Leo3905 +★Leo3773 +★Gru8425 +★Gru8636 +★Gru8353 +★Lib5685 +★Lib5531 +★Lib5787 +★Lib5603 +★Pup3165 +★Pup3185 +★Pup3045 +★Cyg7924 +★Cyg7417 +★Cyg7796 +★Cyg8301 +★Cyg7949 +★Cyg7528 +★Oct7228 +★Col1956 +★Col2040 +★Col2177 +★Gem2990 +★Gem2891 +★Gem2421 +★Gem2473 +★Gem2216 +★Gem2777 +★Gem2650 +★Gem2286 +★Gem2484 +★Gem2930 +★Peg8775 +★Peg8781 +★Peg39 +★Peg8308 +★Peg8650 +★Peg8634 +★Peg8684 +★Peg8450 +★Peg8880 +★Peg8905 +★Oph6556 +★Oph6378 +★Oph6603 +★Oph6149 +★Oph6056 +★Oph6075 +★Ser5854 +★Ser7141 +★Ser5879 +★Her6406 +★Her6148 +★Her6410 +★Her6526 +★Her6117 +★Her6008 +★Per936 +★Per1017 +★Per1131 +★Per1228 +★Per834 +★Per941 +★Phe99 +★Phe338 +★Vel3634 +★Vel3485 +★Vel3734 +★Aqr8232 +★Aqr8414 +★Aqr8709 +★Aqr8518 +★Aqr7950 +★Aqr8499 +★Aqr8610 +★Aqr8264 +★Cru4853 +★Cru4730 +★Cru4763 +★Cru4700 +★Cru4656 +★PsA8728 +★TrA6217 +★Cap7776 +★Cap7754 +★Cap8278 +★Cap8322 +★Cap7773 +★Sge7479 +★Car2326 +★Car3685 +★Car3307 +★Car3699 +★Dra5744 +★Dra5291 +★Dra6705 +★Dra6536 +★Dra7310 +★Dra6688 +★Dra4434 +★Dra6370 +★Dra7462 +★Dra6396 +★Dra6132 +★Dra6636 +★CVn4915 +★CVn4785 +★CVn4846 +★Aql7595 +★Aql7557 +★Aql7525 +★Aql7602 +★Aql7235 \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/it/text_Memories_it.txt b/PKHeX.Core/Resources/text/it/text_Memories_it.txt index a21d83b3e..e89c4987e 100644 --- a/PKHeX.Core/Resources/text/it/text_Memories_it.txt +++ b/PKHeX.Core/Resources/text/it/text_Memories_it.txt @@ -1,4 +1,4 @@ - + Il Pokémon ricorda ancora Il Pokémon ricorda ancora @@ -36,73 +36,93 @@ quanto sonno gli era venuto certo strumento una certa mossa Pokémon -Questo Pokémon ha dei bei ricordi, ma adesso non è possibile richiamarli... -Un giorno {0} ha incontrato {1} {2}. {1} ha lanciato una Poké Ball per catturarlo e da quel momento hanno iniziato a viaggiare insieme. {4} {3}. -{0} uscì dal suo Uovo incontrando {1} per la prima volta {2}. {4} {3}. -{0} ha incontrato {1} {2}. {4} {3}. -{0} ha fatto amicizia con {1} {2} grazie a uno scambio di Pokémon. {4} {3}. -Una volta {0} ha visitato con {1} il Centro Pokémon per comprare {2}. {4} {3}. -Una volta {0} ha visitato con {1} il Centro Pokémon di {2} per rimettersi in forze. {4} {3}. -Quando {1} ha pescato {2}, {0} era con (lui/lei). {4} {3}. -Una volta {0} stava pescando con {1}, ma si è lasciato sfuggire il Pokémon che aveva trovato. {4} {3}. -Una volta {0} ha visto {1} colmare di attenzioni {2}. {4} {3}. -Una volta {0} ha ricevuto un dolcetto da {1}. {4} {3}. -Una volta {0} è andato a comprare dei vestiti con {1}. {4} {3}. -Una volta {0} ha imparato {2} grazie a {1}. {4} {3}. -Una volta {0} ha aiutato {1} a far schiudere un Uovo di {2}. {4} {3}. -Quando {1} ha catturato {2}, {0} era con (lui/lei). {4} {3}. -Una volta {1} ha usato {2} quando {0} era in difficoltà. {4} {3}. -Una volta {0} ha usato {2} seguendo le indicazioni di {1}, ma la mossa non ha avuto effetto. {4} {3}. -Una volta {0} ha lottato insieme a {1} e ha sconfitto {2}. {4} {3}. -Una volta {0}, lottando contro {2}, è stato sconfitto ed è fuggito con {1}. {4} {3}. -{0} si è allenato con {1} fino a evolversi {2}. {4} {3}. -Una volta {0} ha usato Surf trasportando sul dorso {1}. {4} {3}. -Una volta {0} ha visto {2} portare sul dorso {1}. {4} {3}. -Una volta {0}, lottando con {1}, ha sconfitto la squadra di un Capopalestra. {4} {3}. -Una volta {0} ha affrontato le sfide della Villa Lotta con {1} in un’atmosfera di grande tensione. {4} {3}. -Una volta {0} ha usato Volo per trasportare {1} {2}. {4} {3}. -Una volta {0} e {1} si sono presi un bello spavento quando è sbucato fuori all’improvviso {2}. {4} {3}. -Una volta {0} ha visto {1} usare {2}. {4} {3}. -Una volta {0} ha lottato insieme a {1} e ha sconfitto la Campionessa. {4} {3}. -Quando {1} ha completato il Pokédex, {0} era con (lui/lei). {4} {3}. -Mentre era con {1}, {0} ha incontrato {2}. {4} {3}. -Una volta {0}, lottando insieme a {1}, ha sconfitto la squadra di una Dama della lotta. {4} {3}. -{0} e {1} una volta hanno usato il Ricerca Strumenti {2}. {4} {3}. -Una volta {1} ha portato {0} in Bicicletta {2}. {4} {3}. -Una volta {0} ha controllato la mappa con {1} {2}. {4} {3}. -{0} ha piantato con {1} {2} ed è impaziente di vederne spuntare i frutti. {4} {3}. -Una volta {0}, su indicazione di {1}, ha usato Forza, la sua mossa migliore, {2}. {4} {3}. -Una volta {0}, su indicazione di {1}, ha usato fieramente Taglio {2}. {4} {3}. -Una volta {0}, su indicazione di {1}, ha spaccato una roccia {2}. {4} {3}. -Una volta {0} ha usato Cascata mentre trasportava {1} {2}. {4} {3}. -Una volta {0} ha visto {1} raccogliere di nascosto qualcosa {2}. {4} {3}. -Una volta {1} ha dato a{0} {2}. {4} {3}. -Una volta {0} si è diretto verso Via Vittoria assieme a {1}. {4} {3}. -Una volta {0} ha letto un cartello insieme a {1} {2}. {4} {3}. -Una volta {0} ha preso il treno con {1} ed è rimasto colpito dalla velocità a cui sfrecciava. {4} {3}. -Una volta {0} ha incontrato {2} con {1} usando il Poké Radar. {4} {3}. -Una volta {0} e {1} sono fuggiti via spaventati da {2} sbucato fuori all’improvviso. {4} {3}. -Una volta {0} ha affrontato la Casa Esami con {1} e ha ottenuto un ottimo punteggio. {4} {3}. -Una volta {0} è stato attentamente esaminato da un Giudice da cui lo aveva portato {1}. {4} {3}. -Una volta {0} ha dimenticato {2} grazie ad Amnesio, il Cancellamosse presentatogli da {1}. {4} {3}. -Una volta {0} ha ricordato {2} su indicazione di {1}. {4} {3}. -Una volta {1} ha affidato {0} alla Pensione Pokémon assieme a {2}. {4} {3}. -Una volta {0} ha visto {1} vincere {2} al Centro Lotteria ID. {4} {3}. -Una volta {1} ha usato un Repellente {2} quando {0} era con (lui/lei). {4} {3}. -Una volta {0} ha fatto un allenamento faticoso con {1}. {4} {3}. -Una volta {0} ha preso l’ascensore con {1}. {4} {3}. -Una volta {1} ha portato {0} dal Giudice Onomastico per dargli un nome significativo. {4} {3}. -Una volta {0} e {1} sono andati in un negozio di vestiti. {1} ha provato degli abiti, ma non ha comprato nulla. {4} {3}. -Una volta {0} è andato con {1} in un bel ristorante dove hanno mangiato a volontà. {4} {3}. -Una volta {1} ha portato {0} da una signorina molto carina che lo ha riempito di coccole. {4} {3}. -Una volta {0} e {1} hanno esaminato insieme un cestino dei rifiuti {2}. {4} {3}. -Una volta {0} ha lottato duramente insieme a {1} contro {2} fino a dover usare la mossa Scontro. {4} {3}. -Una volta {0} è salito su una torre altissima con {1} e insieme hanno guardato il mondo da lassù. {4} {3}. -Una volta {0} è andato con {1} in una grotta piena di specchi e ha visto la propria immagine riflessa. {4} {3}. -Una volta {0} e {1} hanno smarrito la strada durante un’escursione nel bosco. {4} {3}. -Una volta {0} è andato con {1} in una fabbrica dove c’erano un sacco di macchinari complicati. {4} {3}. -Una volta {0} e {1} hanno costruito una Base Segreta. {4} {3}. -Una volta {0} e {1} hanno partecipato a una gara con un’esibizione che ha conquistato il pubblico. {4} {3}. -Una volta {0} e {1} hanno partecipato a una gara riportando una splendida vittoria. {4} {3}. -Una volta {0} e {1} hanno visitato posti meravigliosi usando Ipervolo. {4} {3}. -Una volta {0}, su indicazione di {1}, si è immerso negli abissi e ha esplorato il fondale marino. {4} {3}. \ No newline at end of file +{0} ha dei bei ricordi, ma adesso non è possibile richiamarli... +{0} ha incontrato {1} {2}. Ha lanciato una Poké Ball per catturarlo e da quel momento hanno iniziato a viaggiare insieme. {4} {3} +{0} ha incontrato {1} per la prima volta quando il Pokémon è nato da un Uovo {2}. {4} {3} +{0} ha incontrato {1} {2}. {4} {3} +{0} e {1} hanno fatto amicizia grazie a uno scambio di Pokémon {2}. {4} {3} +Una volta {0} ha visitato con {1} il Centro Pokémon per comprare {2}. {4} {3} +Una volta {0}, per rimettersi in forze, ha visitato con {1} un Centro Pokémon. {4} {3} +Quando {1} ha pescato {2}, era insieme a {0}. {4} {3} +Una volta {0} stava pescando con {1}, ma il Pokémon che aveva abboccato è riuscito a fuggire. {4} {3} +Una volta {0} ha visto {1} colmare di attenzioni {2}. {4} {3} +Una volta {0} ha ricevuto un dolcetto da {1}. {4} {3} +Una volta {0} è andato a comprare dei vestiti con {1}. {4} {3} +{0} ha imparato la mossa {2} grazie a {1}. {4} {3} +Una volta {0} ha aiutato {1} a far schiudere un Uovo di {2}. {4} {3} +Quando {1} ha catturato {2}, era insieme a {0}. {4} {3} +Una volta {1} ha usato {2} quando {0} era in difficoltà. {4} {3} +Una volta, seguendo le indicazioni di {1}, {0} ha usato {2}, ma la mossa non ha avuto effetto. {4} {3} +Una volta {0} ha lottato insieme a {1} e ha sconfitto {2}. {4} {3} +Una volta {0}, lottando contro {2}, è stato sconfitto ed è fuggito con {1}. {4} {3} +Grazie all’allenamento svolto con {1}, {0} si è evoluto mentre si trovava {2}. {4} {3} +Una volta {0} ha usato Surf trasportando sul dorso {1}. {4} {3} +Una volta {0} ha visto {2} portare sul dorso {1}. {4} {3} +Una volta {0}, lottando al fianco di {1}, ha sconfitto la squadra di un Capopalestra. {4} {3} +Una volta {0} ha affrontato le sfide della Villa Lotta con {1} in un’atmosfera di grande tensione. {4} {3} +Una volta {0} ha usato Volo per trasportare {1} {2}. {4} {3} +Una volta {2} è sbucato fuori all’improvviso, facendo prendere uno spavento a {0} e {1}! {4} {3} +Un giorno {0} ha visto {1} usare {2}. {4} {3} +Una volta, lottando insieme a {1}, {0} è entrato nella Sala d’Onore. {4} {3} +Quando {1} ha completato il Pokédex, era insieme a {0}. {4} {3} +Mentre era con {1}, {0} ha incontrato {2}. {4} {3} +Una volta {0}, lottando insieme a {1}, ha riportato un sensazionale trionfo nella lotta. {4} {3} +Una volta {0} e {1} hanno usato insieme il Ricerca strumenti {2}. {4} {3} +Una volta {1} e {0} hanno fatto insieme un giro in bicicletta {2}. {4} {3} +Una volta {0} ha controllato la Mappa città con {1} {2}. {4} {3} +{0} ha piantato con {1} {2} ed è impaziente di vederne spuntare i frutti. {4} {3} +Una volta, su indicazione di {1}, {0} ha usato Forza, mossa di cui va fiero, {2}. {4} {3} +Una volta {0}, su indicazione di {1}, ha usato fieramente Taglio {2}. {4} {3} +Una volta {0}, su indicazione di {1}, ha usato Spaccaroccia {2}. {4} {3} +Una volta, mentre trasportava sul dorso {1}, {0} ha usato Cascata {2}. {4} {3} +Una volta {0} ha visto {1} raccogliere di nascosto qualcosa {2}. {4} {3} +{1} ha dato a {0} {2} una volta. {4} {3} +Una volta {0} si è diretto verso Via Vittoria assieme a {1}. {4} {3} +Una volta {0} ha letto un cartello insieme a {1} {2}. {4} {3} +Una volta {0} ha preso il treno con {1} ed è rimasto colpito dalla velocità a cui sfrecciava. {4} {3} +Una volta {0} ha incontrato {2} con {1} usando il Poké Radar. {4} {3} +Una volta {0} e {1} sono fuggiti via spaventati da {2} sbucato fuori all’improvviso. {4} {3} +Una volta {0} ha affrontato la Casa Esami con {1} e ha ottenuto un ottimo punteggio. {4} {3} +Una volta {0} è stato attentamente osservato da un Giudice da cui lo aveva portato {1}. {4} {3} +Una volta {0} ha dimenticato {2} grazie al Cancellamosse presentatogli da {1}. {4} {3} +Una volta {0} ha ricordato {2} su indicazione di {1}. {4} {3} +Una volta {1} ha affidato {0} alla Pensione Pokémon assieme a {2}. {4} {3} +Una volta, al Centro Lotteria ID, {0} ha visto {1} vincere {2}. {4} {3} +Una volta {1} ha usato un Repellente {2} quando era insieme a {0}. {4} {3} +Una volta {0} ha fatto un allenamento faticoso con {1}. {4} {3} +Una volta {0} ha preso l’ascensore con {1}. {4} {3} +Una volta {1} ha portato {0} dal Giudice Onomastico per dargli un nome significativo. {4} {3} +Una volta {0} e {1} sono andati in un negozio di abbigliamento. {1} ha provato degli abiti, ma non ha comprato nulla. {4} {3} +Una volta {0} è andato con {1} in un bel ristorante dove hanno mangiato a volontà. {4} {3} +Una volta {1} ha portato {0} da una ragazza molto carina che lo ha riempito di coccole. {4} {3} +Una volta {0} e {1} hanno esaminato un cestino dei rifiuti {2}. {4} {3} +Una volta, mentre era insieme a {1}, {0} ha lottato così duramente contro {2} da dover ricorrere alla mossa Scontro. {4} {3} +Una volta {0} è salito su una torre altissima con {1} e insieme hanno guardato il mondo da lassù. {4} {3} +Una volta {0} è andato con {1} in una grotta piena di specchi e ha visto la propria immagine riflessa. {4} {3} +Una volta {0} e {1} hanno smarrito la strada durante un’escursione nel bosco. {4} {3} +Una volta {0} è andato con {1} in una fabbrica piena di macchinari complicati. {4} {3} +Una volta {0} e {1} hanno costruito una Base Segreta. {4} {3} +Una volta {0} e {1} hanno partecipato a una Gara con un’esibizione che ha conquistato il pubblico. {4} {3} +Una volta {0} e {1} hanno partecipato a una Gara riportando una splendida vittoria. {4} {3} +Una volta {0} e {1} hanno visitato posti fantastici usando l’Ipervolo. {4} {3} +Una volta {0}, su indicazione di {1}, si è immerso negli abissi e ha esplorato il fondale marino. {4} {3} +Una volta {0} si è seduto insieme a {1} su una panchina {2}. {4} {3} +Una volta {0} si è dynamaxizzato e ha lottato contro {2} insieme a {1}. {4} {3} +Una volta {0} si è dynamaxizzato su istruzioni di {1} e ha lottato contro {2}. {4} {3} +Una volta {0} si è accampato con {1}. {4} {3} +Una volta {0} ha cucinato insieme a {1}. {4} {3} +Una volta {1} ha affidato {0} all’Ostello Pokémon assieme a {2}. {4} {3} +Una volta {0} ha festeggiato il compleanno di {1} in un Centro Pokémon. {4} {3} +Una volta {0} ha accompagnato {1} a farsi rifare l’acconciatura e ha notato la sua indecisione. {4} {3} +Una volta {0} e {1} si sono inzuppati di pioggia mentre camminavano insieme. {4} {3} +Una volta {0} e {1} hanno partecipato a un rally correndo a velocità folle. {4} {3} +Mentre era in un Box, {0} si è messo a studiare la mossa {2} per usarla assieme a {1}. {4} {3} +Mentre era in un Box, {0} si è allenato a usare la mossa {2} sperando di ricevere le lodi di {1}. {4} {3} +Una volta {0} ha parlato di {1} con {2} che era in un Box insieme a lui. {4} {3} +Una volta {0} ha fatto amicizia con {2} nei Box. I due hanno studiato delle mosse insieme, parlando di come un giorno {1} avrebbe riconosciuto il loro valore. {4} {3} +Una volta {0} si è chiesto se {2} che aveva con sé nel Box servissero a {1}. {4} {3} +Una volta {0} si è agitato così tanto quando {1} ha controllato il suo Box, che non riusciva neanche a incrociare il suo sguardo. {4} {3} +Una volta, mentre era in un Box, {0} ha sentito parlare dell’arrivo di {1} {2} e si è immaginato la scena. {4} {3} +Una volta {0} ha litigato con {2}, suo compagno di Box, a proposito di {1}. {4} {3} +Una volta, mentre era in un Box, {0} ha riflettuto sul perché {1} gli avesse dato {2}. {4} {3} +Una volta, mentre era in un Box, {0} ha fatto uno strano sogno in cui {1} usava la mossa {2}. {4} {3} \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/it/text_Moves_it.txt b/PKHeX.Core/Resources/text/it/text_Moves_it.txt index 1ebf31531..30a0338ef 100644 --- a/PKHeX.Core/Resources/text/it/text_Moves_it.txt +++ b/PKHeX.Core/Resources/text/it/text_Moves_it.txt @@ -1,4 +1,4 @@ ------ +----- Botta Colpokarate Doppiasberla @@ -740,4 +740,58 @@ Bombafrush Scricchiagelo Sbrilluccibufera Eeveempatto -Pugni Corazzati \ No newline at end of file +Pugni Corazzati +Dynabarriera +Cannone Dynamax +Tiromirato +Morsostretto +Riempiguance +Spalle al Muro +Colpocatrame +Magipolvere +Dragofrecce +Ora del Tè +Tentacolock +Beccoshock +Branchiomorso +Cambiocampo +Dynafiammata +Dynainsetto +Dynasaetta +Dynattacco +Dynapugno +Dynavuoto +Dynagelo +Dynacorrosione +Dynaflusso +Dynajet +Dynafata +Dynadragone +Dynapsiche +Dynamacigno +Dynasisma +Dynatenebre +Dynaflora +Dynametallo +Dracofonia +Schiacciacorpo +Decorazione +Tamburattacco +Tagliola +Palla Infuocata +Taglio Maestoso +Colpo Maestoso +Ruota d’Aura +Vastoimpatto +Ramostoccata +Overdrive +Acido Malico +Forza G +Frantumanima +Vapore Incantato +Goccia Vitale +Sbarramento +Supplicolpo +Sfolgorassalto +Raggio Infinito +Raggio d’Acciaio \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/it/text_Ribbons_it.txt b/PKHeX.Core/Resources/text/it/text_Ribbons_it.txt index 6dedee5af..73aa16fe0 100644 --- a/PKHeX.Core/Resources/text/it/text_Ribbons_it.txt +++ b/PKHeX.Core/Resources/text/it/text_Ribbons_it.txt @@ -100,4 +100,52 @@ RibbonCountG3Tough Tough RibbonChampionAlola Alola Champion RibbonBattleRoyale Battle Royal Champion RibbonBattleTreeGreat Battle Tree Great -RibbonBattleTreeMaster Battle Tree Master \ No newline at end of file +RibbonBattleTreeMaster Battle Tree Master +RibbonChampionGalar Campione Galar +RibbonTowerMaster Asso della Torre +RibbonMasterRank Asso Competizione +RibbonMarkLunchtime Emblema Mezzogiorno +RibbonMarkSleepyTime Emblema Mezzanotte +RibbonMarkDusk Emblema Tramonto +RibbonMarkDawn Emblema Alba +RibbonMarkCloudy Emblema Nuvolo +RibbonMarkRainy Emblema Pioggia +RibbonMarkStormy Emblema Tuoni e Lampi +RibbonMarkSnowy Emblema Neve +RibbonMarkBlizzard Emblema Tormenta +RibbonMarkDry Emblema Arsura +RibbonMarkSandstorm Emblema Tempesta di Sabbia +RibbonMarkMisty Emblema Nebbia +RibbonMarkDestiny Emblema Destino +RibbonMarkFishing Emblema Pesca +RibbonMarkCurry Emblema Curry +RibbonMarkUncommon Emblema Sporadicità +RibbonMarkRare Emblema Rarità +RibbonMarkRowdy Emblema Monello +RibbonMarkAbsentMinded Emblema Spensieratezza +RibbonMarkJittery Emblema Nervosismo +RibbonMarkExcited Emblema Speranza +RibbonMarkCharismatic Emblema Carisma +RibbonMarkCalmness Emblema Sangue Freddo +RibbonMarkIntense Emblema Sangue Caldo +RibbonMarkZonedOut Emblema Disattenzione +RibbonMarkJoyful Emblema Felicità +RibbonMarkAngry Emblema Collera +RibbonMarkSmiley Emblema Sorriso +RibbonMarkTeary Emblema Sconforto +RibbonMarkUpbeat Emblema Buonumore +RibbonMarkPeeved Emblema Malumore +RibbonMarkIntellectual Emblema Ragione +RibbonMarkFerocious Emblema Istinto +RibbonMarkCrafty Emblema Astuzia +RibbonMarkScowling Emblema Aria Minacciosa +RibbonMarkKindly Emblema Aria Gentile +RibbonMarkFlustered Emblema Agitazione +RibbonMarkPumpedUp Emblema Entusiasmo +RibbonMarkZeroEnergy Emblema Pigrizia +RibbonMarkPrideful Emblema Sicurezza +RibbonMarkUnsure Emblema Insicurezza +RibbonMarkHumble Emblema Ingenuità +RibbonMarkThorny Emblema Artificio +RibbonMarkVigor Emblema Vitalità +RibbonMarkSlump Emblema Sottotono \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/it/text_Species_it.txt b/PKHeX.Core/Resources/text/it/text_Species_it.txt index 4d24da13f..cf0cfdc27 100644 --- a/PKHeX.Core/Resources/text/it/text_Species_it.txt +++ b/PKHeX.Core/Resources/text/it/text_Species_it.txt @@ -807,4 +807,85 @@ Stakataka Blacephalon Zeraora Meltan -Melmetal \ No newline at end of file +Melmetal +Grookey +Thwackey +Rillaboom +Scorbunny +Raboot +Cinderace +Sobble +Drizzile +Inteleon +Skwovet +Greedent +Rookidee +Corvisquire +Corviknight +Blipbug +Dottler +Orbeetle +Nickit +Thievul +Gossifleur +Eldegoss +Wooloo +Dubwool +Chewtle +Drednaw +Yamper +Boltund +Rolycoly +Carkol +Coalossal +Applin +Flapple +Appletun +Silicobra +Sandaconda +Cramorant +Arrokuda +Barraskewda +Toxel +Toxtricity +Sizzlipede +Centiskorch +Clobbopus +Grapploct +Sinistea +Polteageist +Hatenna +Hattrem +Hatterene +Impidimp +Morgrem +Grimmsnarl +Obstagoon +Perrserker +Cursola +Sirfetch’d +Mr. Rime +Runerigus +Milcery +Alcremie +Falinks +Pincurchin +Snom +Frosmoth +Stonjourner +Eiscue +Indeedee +Morpeko +Cufant +Copperajah +Dracozolt +Arctozolt +Dracovish +Arctovish +Duraludon +Dreepy +Drakloak +Dragapult +Zacian +Zamazenta +Eternatus \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/it/text_swsh_00000_it.txt b/PKHeX.Core/Resources/text/it/text_swsh_00000_it.txt index 4d9440604..41275a9f7 100644 --- a/PKHeX.Core/Resources/text/it/text_swsh_00000_it.txt +++ b/PKHeX.Core/Resources/text/it/text_swsh_00000_it.txt @@ -1 +1,163 @@ -todo \ No newline at end of file +---------- + +in una zona misteriosa + +in un luogo remoto + +a Furlongham + +nel Bosco Assopito + +[~ 10] +[~ 11] +sul Percorso 1 + +a Brassbury + +alla Stazione di Brassbury + +sul Percorso 2 + +a Steamington + +alla Stazione di Steamington + +allo Stadio di Steamington + +[~ 26] +[~ 27] +sul Percorso 3 + +nella Miniera di Galar + +sul Percorso 4 + +a Turffield + +allo Stadio di Turffield + +[~ 38] +[~ 39] +sul Percorso 5 + +[~ 42] +[~ 43] +a Keelford + +alla Stazione di Keelford + +allo Stadio di Keelford + +[~ 50] +[~ 51] +nella periferia di Steamington + +nella Miniera 2 + +a Knuckleburgh + +alla Stazione di Knuckleburgh + +allo Stadio di Knuckleburgh + +[~ 62] +[~ 63] +nella Centrale Energetica + +sulla Cima della Torre + +sul Percorso 6 + +a Latermore + +allo Stadio di Latermore + +[~ 74] +[~ 75] +nel Bosco Brillabirinto + +a Piquedilly + +allo Stadio di Piquedilly + +[~ 82] +[~ 83] +sul Percorso 7 + +sul Percorso 8 + +sul Percorso 8 +sul Sentiero del Vapore +sul Percorso 9 + +sul Percorso 9 +nella Baia di Circhester +sul Percorso 9 +nella Periferia di Spikeville +a Circhester + +allo Stadio di Circhester + +[~ 100] +[~ 101] +a Spikeville + +nel Tunnel del Percorso 9 + +sul Percorso 10 + +alla Stazione di Collebianco + +a Goalwick + +alla Stazione di Goalwick + +allo Stadio di Goalwick +alla Sede della Lega Pokémon +allo Stadio di Goalwick +nello Spogliatoio +allo Stadio di Goalwick + +nel Piazzale Adunanza +nelle Terre Selvagge +nella Pianura Serena +nelle Terre Selvagge +nel Boschetto Ombraluce +nelle Terre Selvagge +alla Torre Diroccata +nelle Terre Selvagge +al Lago Axew (est) +nelle Terre Selvagge +al Lago Axew (ovest) +nelle Terre Selvagge +all’Occhio del Lago Axew +nelle Terre Selvagge +al Lago Milotic (sud) +nelle Terre Selvagge +alla Sedia del Gigante +nelle Terre Selvagge +al Lago Milotic (nord) +nelle Terre Selvagge +al Fiume di Steamington +nelle Terre Selvagge +nella Piana dei Ponti +nelle Terre Selvagge +nella Landa delle Pietre +nelle Terre Selvagge +nella Conca delle Sabbie +nelle Terre Selvagge +allo Specchio del Gigante +nelle Terre Selvagge +sul Colle Knuckleburgh +nelle Terre Selvagge +al Berretto del Gigante +nelle Terre Selvagge +al Lago Dragofuria +nelle Terre Selvagge +alla Stazione delle Terre Selvagge + +alla Torre Lotta + +alla Rose Tower + +in una tana di Pokémon diff --git a/PKHeX.Core/Resources/text/it/text_swsh_30000_it.txt b/PKHeX.Core/Resources/text/it/text_swsh_30000_it.txt index 4d9440604..c90e637ab 100644 --- a/PKHeX.Core/Resources/text/it/text_swsh_30000_it.txt +++ b/PKHeX.Core/Resources/text/it/text_swsh_30000_it.txt @@ -1 +1,19 @@ -todo \ No newline at end of file +Scambio in link +Scambio in link +Kanto +Johto +Hoenn +Sinnoh +Terra lontana +---------- +Unima +Kalos +Pokémon Link +Pokémon GO +Kanto +Hoenn +Alola +Poké Resort +Johto +Pokémon HOME +Kanto \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/it/text_swsh_40000_it.txt b/PKHeX.Core/Resources/text/it/text_swsh_40000_it.txt index 4d9440604..395fdb61d 100644 --- a/PKHeX.Core/Resources/text/it/text_swsh_40000_it.txt +++ b/PKHeX.Core/Resources/text/it/text_swsh_40000_it.txt @@ -1 +1,113 @@ -todo \ No newline at end of file +Luogo grazioso +Luogo remoto +Film Pokémon +[~ 3] +Film Pokémon 2019 +Film Pokémon 2020 +Film Pokémon 2021 +Film Pokémon 2022 +Film Pokémon 2023 +Film Pokémon 2024 +Cartone animato Pokémon +Pokémon Center +Pokémon Center Tohoku +WCS +[~ 14] +WCS 2019 +WCS 2020 +WCS 2021 +WCS 2022 +WCS 2023 +WCS 2024 +Worlds +[~ 22] +Worlds 2019 +Worlds 2020 +Worlds 2021 +Worlds 2022 +Worlds 2023 +Worlds 2024 +Evento di gioco +[~ 30] +Evento di gioco 2019 +Evento di gioco 2020 +Evento di gioco 2021 +Evento di gioco 2022 +Evento di gioco 2023 +Evento di gioco 2024 +Evento Pokémon +Gara +Evento di gioco +Pokémon Daisuki Club +Programma TV Pokémon +Concerto +Regalo online +PGL +[~ 45] +Evento Pokémon 2019 +Evento Pokémon 2020 +Evento Pokémon 2021 +Evento Pokémon 2022 +Evento Pokémon 2023 +Evento Pokémon 2024 +Evento Pokémon +[~ 53] +Evento Pokémon 2019 +Evento Pokémon 2020 +Evento Pokémon 2021 +Evento Pokémon 2022 +Evento Pokémon 2023 +Evento Pokémon 2024 +PokéPark +[~ 61] +PokéPark 2019 +PokéPark 2020 +PokéPark 2021 +PokéPark 2022 +PokéPark 2023 +PokéPark 2024 +Evento +GAME FREAK +Stadio +VGC +[~ 72] +VGC 2019 +VGC 2020 +VGC 2021 +VGC 2022 +VGC 2023 +VGC 2024 +Virtual Console +Pokémon GO +Banca Pokémon +Negozio Pokémon +Demo +Poké Ball Plus +Pokémon HOME +[~ 86] +[~ 87] +[~ 88] +[~ 89] +[~ 90] +[~ 91] +[~ 92] +[~ 93] +[~ 94] +[~ 95] +[~ 96] +[~ 97] +[~ 98] +[~ 99] +[~ 100] +[~ 101] +[~ 102] +[~ 103] +[~ 104] +[~ 105] +[~ 106] +[~ 107] +[~ 108] +[~ 109] +[~ 110] +[~ 111] +[~ 112] \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/it/text_swsh_60000_it.txt b/PKHeX.Core/Resources/text/it/text_swsh_60000_it.txt index 4d9440604..b1d6e817f 100644 --- a/PKHeX.Core/Resources/text/it/text_swsh_60000_it.txt +++ b/PKHeX.Core/Resources/text/it/text_swsh_60000_it.txt @@ -1 +1,4 @@ -todo \ No newline at end of file +Persona lontana +Ostello Pokémon +Cercatesori +Vecchina delle terme \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/it/text_tradeswsh_it.txt b/PKHeX.Core/Resources/text/it/text_tradeswsh_it.txt new file mode 100644 index 000000000..2bfcd80ca --- /dev/null +++ b/PKHeX.Core/Resources/text/it/text_tradeswsh_it.txt @@ -0,0 +1,22 @@ +Monetino +Guanciotte +Batuffolo +Ciokki +Frangetta +Occhibelli +Mascherina +Rossiccio +Bluastro +Mr. Mimmo +Scheggia +Giovannino +Felicia +Celeste +Gemma +Romeo +Romeo +Eva +Ermanno +Ermanno +Mimmo +Renzo \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/ja/text_Abilities_ja.txt b/PKHeX.Core/Resources/text/ja/text_Abilities_ja.txt index 3a5488a8d..95cd0a5d5 100644 --- a/PKHeX.Core/Resources/text/ja/text_Abilities_ja.txt +++ b/PKHeX.Core/Resources/text/ja/text_Abilities_ja.txt @@ -231,4 +231,29 @@ メタルプロテクト ファントムガード プリズムアーマー -ブレインフォース \ No newline at end of file +ブレインフォース +ふとうのけん +ふくつのたて +リベロ +たまひろい +わたげ +スクリューおびれ +ミラーアーマー +うのミサイル +すじがねいり +じょうききかん +パンクロック +すなはき +こおりのりんぷん +じゅくせい +アイスフェイス +パワースポット +ぎたい +バリアフリー +はがねのせいしん +ほろびのボディ +さまようたましい +ごりむちゅう +かがくへんかガス +パステルベール +はらぺこスイッチ \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/ja/text_Forms_ja.txt b/PKHeX.Core/Resources/text/ja/text_Forms_ja.txt index 7efcaf1ee..b7f757871 100644 --- a/PKHeX.Core/Resources/text/ja/text_Forms_ja.txt +++ b/PKHeX.Core/Resources/text/ja/text_Forms_ja.txt @@ -1066,3 +1066,20 @@ たそがれのたてがみ あかつきのつばさ ウルトラ +ガラルのすがた +キョダイマックス +うのみのすがた +まるのみのすがた +ローなすがた +ミルキィルビー +ミルキィまっちゃ +ミルキィミント +ミルキィレモン +ミルキィソルト +ルビーミックス +キャラメルミックス +トリプルミックス +ナイスフェイス +はらぺこもよう +けんのおう +ムゲンダイマックス \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/ja/text_GenLoc_ja.txt b/PKHeX.Core/Resources/text/ja/text_GenLoc_ja.txt index 9671da207..107b0abb6 100644 --- a/PKHeX.Core/Resources/text/ja/text_GenLoc_ja.txt +++ b/PKHeX.Core/Resources/text/ja/text_GenLoc_ja.txt @@ -1,7 +1,7 @@ -どこか +どこか さいしょのまち うち -ともだちのいえ +ともだちのうち ひとのうち にぎやかなまち ブティック @@ -10,17 +10,17 @@ ポケモンセンター おしろ ホテル -ふしぎなふんいきのまち +ふしぎな　ふんいきの　まち かぜのふくまち ゲート かわべりのまち けんきゅうじょ すいぞくかん がけにあるまち -はなやかなまち +はなやかな　まち ポケモンジム がっこう -きょだいなまち +きょだいな　まち ビル オシャレなカフェ アジト @@ -28,28 +28,28 @@ スタジオ えき たたかいのば -びようしつ +ヘアサロン レストラン こうきゅうレストラン うみべのまち -たかいたてもののなか -ふしぎなふんいきのまち -かわぞいのまち -ゆきのふりつもるまち +たかい　たてものの　なか +ふしぎな　ふんいきの　まち +かわぞいの　まち +ゆきの　ふりつもる　まち ポケモンリーグ きゅうでん どうくつ もり -がいろじゅのつづくみち +がいろじゅの　つづく　みち かわぞいのみち のどかなみち はなさくみち そだてや -けわしいやまみち -いしのたちならぶばしょ -うみのみえるみち +けわしい　やまみち +いしの　たちならぶ　ばしょ +うみのみえる　みち ぬかるんだみち -すなのふきあれるみち +すなの　ふきあれる　みち おちばみち ゆきみち こうじょう @@ -60,12 +60,21 @@ はいきょ すいどう サファリ -ひみつきち +おおきな　ふね +おおぞら コンテストライブかいじょう -ふかいうみのそこ +しんぴてきな　ばしょ +ちいさな　しま +はいが　ふりつもる　みち +ひみつきち +ふかい　うみのそこ マボロシのばしょ -おおきなふね -はいがふりつもるみち -ちいさなしま -しんぴてきなばしょ -おおぞら \ No newline at end of file +みずうみのみえるみち +こうだいなそうげん +スタジアム +あずかりや +こうざん +やまあいのまち +さびれたまち +トンネル +きけんなばしょ \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/ja/text_Items_ja.txt b/PKHeX.Core/Resources/text/ja/text_Items_ja.txt index abe489042..08877ea83 100644 --- a/PKHeX.Core/Resources/text/ja/text_Items_ja.txt +++ b/PKHeX.Core/Resources/text/ja/text_Items_ja.txt @@ -1,4 +1,4 @@ -なし +なし マスターボール ハイパーボール スーパーボール @@ -1055,4 +1055,525 @@ ミュウツーのアメ ミュウのアメ メルタンのアメ -ブーバーのアメ \ No newline at end of file +ブーバーのアメ +？？？ +？？？ +？？？ +？？？ +？？？ +？？？ +？？？ +？？？ +？？？ +？？？ +？？？ +？？？ +？？？ +？？？ +？？？ +？？？ +すいせんじょう +ポケモンボックス +ねがいぼし +ダイマックスＢ +？？？ +？？？ +つりざお +ロトムじてんしゃ +？？？ +？？？ +あらびきヴルスト +ボブのかんづめ +バックのかんづめ +マメかん +しょくパン +パスタ +キノコパック +しっぽのくんせい +ふといながねぎ +とくせんリンゴ +かぼそいホネ +ポテトパック +みずべのハーブ +やさいパック +フライもりあわせ +ゆでタマゴ +キャンプセット +？？？ +？？？ +くちたけん +くちたたて +カセキのトリ +カセキのサカナ +カセキのリュウ +カセキのクビナガ +いちごアメざいく +ハートアメざいく +ベリーアメざいく +よつばアメざいく +おはなアメざいく +スターアメざいく +リボンアメざいく +あまーいりんご +すっぱいりんご +のどスプレー +だっしゅつパック +あつぞこブーツ +からぶりほけん +ルームサービス +ばんのうがさ +けいけんアメＸＳ +けいけんアメＳ +けいけんアメＭ +けいけんアメＬ +けいけんアメＸＬ +ダイマックスアメ +わざレコード００ +わざレコード０１ +わざレコード０２ +わざレコード０３ +わざレコード０４ +わざレコード０５ +わざレコード０６ +わざレコード０７ +わざレコード０８ +わざレコード０９ +わざレコード１０ +わざレコード１１ +わざレコード１２ +わざレコード１３ +わざレコード１４ +わざレコード１５ +わざレコード１６ +わざレコード１７ +わざレコード１８ +わざレコード１９ +わざレコード２０ +わざレコード２１ +わざレコード２２ +わざレコード２３ +わざレコード２４ +わざレコード２５ +わざレコード２６ +わざレコード２７ +わざレコード２８ +わざレコード２９ +わざレコード３０ +わざレコード３１ +わざレコード３２ +わざレコード３３ +わざレコード３４ +わざレコード３５ +わざレコード３６ +わざレコード３７ +わざレコード３８ +わざレコード３９ +わざレコード４０ +わざレコード４１ +わざレコード４２ +わざレコード４３ +わざレコード４４ +わざレコード４５ +わざレコード４６ +わざレコード４７ +わざレコード４８ +わざレコード４９ +わざレコード５０ +わざレコード５１ +わざレコード５２ +わざレコード５３ +わざレコード５４ +わざレコード５５ +わざレコード５６ +わざレコード５７ +わざレコード５８ +わざレコード５９ +わざレコード６０ +わざレコード６１ +わざレコード６２ +わざレコード６３ +わざレコード６４ +わざレコード６５ +わざレコード６６ +わざレコード６７ +わざレコード６８ +わざレコード６９ +わざレコード７０ +わざレコード７１ +わざレコード７２ +わざレコード７３ +わざレコード７４ +わざレコード７５ +わざレコード７６ +わざレコード７７ +わざレコード７８ +わざレコード７９ +わざレコード８０ +わざレコード８１ +わざレコード８２ +わざレコード８３ +わざレコード８４ +わざレコード８５ +わざレコード８６ +わざレコード８７ +わざレコード８８ +わざレコード８９ +わざレコード９０ +わざレコード９１ +わざレコード９２ +わざレコード９３ +わざレコード９４ +わざレコード９５ +わざレコード９６ +わざレコード９７ +わざレコード９８ +わざレコード９９ +わざマシン００ +さみしがりミント +いじっぱりミント +やんちゃミント +ゆうかんミント +ずぶといミント +わんぱくミント +のうてんきミント +のんきミント +ひかえめミント +おっとりミント +うっかりやミント +れいせいミント +おだやかミント +おとなしいミント +しんちょうミント +なまいきミント +おくびょうミント +せっかちミント +ようきミント +むじゃきミント +まじめミント +ねがいのかたまり +われたポット +かけたポット +すごいみみせん +フサパック +モーモーチーズ +スパイスセット +しんせんクリーム +レトルトカレー +ヤシのミルク +レトルトめん +レトルトバーグ +キョダイパウダー +ねがいのかけら +ロトムじてんしゃ +ゆれないおまもり +？？？ +ふるびたてがみ +バンドのサイン +ソニアのほん +？？？ +？？？ +？？？ +？？？ +？？？ +？？？ +ロトムのカタログ +★And458 +★And15 +★And337 +★And603 +★And390 +★Sgr6879 +★Sgr6859 +★Sgr6913 +★Sgr7348 +★Sgr7121 +★Sgr6746 +★Sgr7194 +★Sgr7337 +★Sgr7343 +★Sgr6812 +★Sgr7116 +★Sgr7264 +★Sgr7597 +★Del7882 +★Del7906 +★Del7852 +★Psc596 +★Psc361 +★Psc510 +★Psc437 +★Psc8773 +★Lep1865 +★Lep1829 +★Boo5340 +★Boo5506 +★Boo5435 +★Boo5602 +★Boo5733 +★Boo5235 +★Boo5351 +★Hya3748 +★Hya3903 +★Hya3418 +★Hya3482 +★Hya3845 +★Eri1084 +★Eri472 +★Eri1666 +★Eri897 +★Eri1231 +★Eri874 +★Eri1298 +★Eri1325 +★Eri984 +★Eri1464 +★Eri1393 +★Eri850 +★Tau1409 +★Tau1457 +★Tau1165 +★Tau1791 +★Tau1910 +★Tau1346 +★Tau1373 +★Tau1412 +★CMa2491 +★CMa2693 +★CMa2294 +★CMa2827 +★CMa2282 +★CMa2618 +★CMa2657 +★CMa2646 +★UMa4905 +★UMa4301 +★UMa5191 +★UMa5054 +★UMa4295 +★UMa4660 +★UMa4554 +★UMa4069 +★UMa3569 +★UMa3323 +★UMa4033 +★UMa4377 +★UMa4375 +★UMa4518 +★UMa3594 +★Vir5056 +★Vir4825 +★Vir4932 +★Vir4540 +★Vir4689 +★Vir5338 +★Vir4910 +★Vir5315 +★Vir5359 +★Vir5409 +★Vir5107 +★Ari617 +★Ari553 +★Ari546 +★Ari951 +★Ori1713 +★Ori2061 +★Ori1790 +★Ori1903 +★Ori1948 +★Ori2004 +★Ori1852 +★Ori1879 +★Ori1899 +★Ori1543 +★Cas21 +★Cas168 +★Cas403 +★Cas153 +★Cas542 +★Cas219 +★Cas265 +★Cnc3572 +★Cnc3208 +★Cnc3461 +★Cnc3449 +★Cnc3429 +★Cnc3627 +★Cnc3268 +★Cnc3249 +★Com4968 +★Crv4757 +★Crv4623 +★Crv4662 +★Crv4786 +★Aur1708 +★Aur2088 +★Aur1605 +★Aur2095 +★Aur1577 +★Aur1641 +★Aur1612 +★Pav7790 +★Cet911 +★Cet681 +★Cet188 +★Cet539 +★Cet804 +★Cep8974 +★Cep8162 +★Cep8238 +★Cep8417 +★Cen5267 +★Cen5288 +★Cen551 +★Cen5459 +★Cen5460 +★CMi2943 +★CMi2845 +★Equ8131 +★Vul7405 +★UMi424 +★UMi5563 +★UMi5735 +★UMi6789 +★Crt4287 +★Lyr7001 +★Lyr7178 +★Lyr7106 +★Lyr7298 +★Ara6585 +★Sco6134 +★Sco6527 +★Sco6553 +★Sco5953 +★Sco5984 +★Sco6508 +★Sco6084 +★Sco5944 +★Sco6630 +★Sco6027 +★Sco6247 +★Sco6252 +★Sco5928 +★Sco6241 +★Sco6165 +★Tri544 +★Leo3982 +★Leo4534 +★Leo4357 +★Leo4057 +★Leo4359 +★Leo4031 +★Leo3852 +★Leo3905 +★Leo3773 +★Gru8425 +★Gru8636 +★Gru8353 +★Lib5685 +★Lib5531 +★Lib5787 +★Lib5603 +★Pup3165 +★Pup3185 +★Pup3045 +★Cyg7924 +★Cyg7417 +★Cyg7796 +★Cyg8301 +★Cyg7949 +★Cyg7528 +★Oct7228 +★Col1956 +★Col2040 +★Col2177 +★Gem2990 +★Gem2891 +★Gem2421 +★Gem2473 +★Gem2216 +★Gem2777 +★Gem2650 +★Gem2286 +★Gem2484 +★Gem2930 +★Peg8775 +★Peg8781 +★Peg39 +★Peg8308 +★Peg8650 +★Peg8634 +★Peg8684 +★Peg8450 +★Peg8880 +★Peg8905 +★Oph6556 +★Oph6378 +★Oph6603 +★Oph6149 +★Oph6056 +★Oph6075 +★Ser5854 +★Ser7141 +★Ser5879 +★Her6406 +★Her6148 +★Her6410 +★Her6526 +★Her6117 +★Her6008 +★Per936 +★Per1017 +★Per1131 +★Per1228 +★Per834 +★Per941 +★Phe99 +★Phe338 +★Vel3634 +★Vel3485 +★Vel3734 +★Aqr8232 +★Aqr8414 +★Aqr8709 +★Aqr8518 +★Aqr7950 +★Aqr8499 +★Aqr8610 +★Aqr8264 +★Cru4853 +★Cru4730 +★Cru4763 +★Cru4700 +★Cru4656 +★PsA8728 +★TrA6217 +★Cap7776 +★Cap7754 +★Cap8278 +★Cap8322 +★Cap7773 +★Sge7479 +★Car2326 +★Car3685 +★Car3307 +★Car3699 +★Dra5744 +★Dra5291 +★Dra6705 +★Dra6536 +★Dra7310 +★Dra6688 +★Dra4434 +★Dra6370 +★Dra7462 +★Dra6396 +★Dra6132 +★Dra6636 +★CVn4915 +★CVn4785 +★CVn4846 +★Aql7595 +★Aql7557 +★Aql7525 +★Aql7602 +★Aql7235 \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/ja/text_Memories_ja.txt b/PKHeX.Core/Resources/text/ja/text_Memories_ja.txt index cd91daa59..2edb1f7f1 100644 --- a/PKHeX.Core/Resources/text/ja/text_Memories_ja.txt +++ b/PKHeX.Core/Resources/text/ja/text_Memories_ja.txt @@ -1,4 +1,4 @@ - + おもいで　らしいわ おもいで　らしいわ @@ -36,73 +36,93 @@ なにかのどうぐ なにかのわざ だれか -いい　おもいでが　あるようだけど ちょっと　おもいおこせないみたい…… -{0}は　{1}に {2}で　であい　 モンスターボールを　なげられて いっしょに　たびする　ことになり　 {3}ことが {4} -{0}は {2}で　 タマゴの　からをやぶって　でてきたとき はじめて　{1}と　であい　 {3}ことが {4} -{0}は　{1}と {2}で　であえて　 {3}ことが {4} -{0}は {2}で　 ポケモンこうかんに　よって {1}の　なかまとなり　 {3}ことが {4} -{0}は　{1}と ポケモンセンターに　{2}を　 かいに　いって {3}ことが {4} -{0}は　{1}と ~の　 ポケモンセンターに　いって つかれた　からだを　かいふくしてもらい　 {3}ことが {4} -{0}は　{1}と いっしょに　つりをして　 {2}を つりあげ　 {3}ことが {4} -{0}は　{1}と いっしょに　つりをしたとき　 {1}が　せっかく　つれた ポケモンを　のがしてしまって　 {3}ことが {4} -{0}は　{1}が {2}のことを　 かまって　いたときに {3}ことが {4} -{0}は {1}に　 おかしを　もらって {3}ことが {4} -{0}は {1}と　 いっしょに　ようふくを　かいにいって {3}ことが {4} -{0}は　{1}に {2}を　 おぼえさせてもらい {3}ことが {4} -{0}は　{1}が {2}の　 タマゴを　かえすのを　てつだって {3}ことが {4} -{0}は　{1}が {2}を　 つかまえた　ときに {3}ことが {4} -{0}は ピンチの　ときに　 {1}に {2}を　つかってもらって　 {3}ことが {4} -{0}は　{1}の しじで　だした　{2}が　 あいてに　こうかが　なくて {3}ことが {4} -{0}は　{1}と いっしょに　たたかい　 {2}を たおして　 {3}ことが {4} -{0}は {2}との　 たたかいに　やぶれて {1}と　 いっしょに　にげかえり {3}ことが {4} -{0}は　{1}に そだてられ　 {2}で しんかして　 {3}ことが {4} -{0}は なみのりで　{1}を　 じぶんの　せなかに　のせて {3}ことが {4} -{0}は {2}が　 {1}を せなかに　のせているのを　みて　 {3}ことが {4} -{0}は　{1}と いっしょに　たたかって　 ジムリーダーに　かったとき {3}ことが {4} -{0}は　{1}が バトルハウスに　いどんだとき　 あまりにも　きんちょうして {3}ことが {4} -{0}は そらをとぶで　{1}を　 {2}へ　はこび {3}ことが {4} -{0}は とびだしてきた　{2}に　 {1}と いっしょに　おどろいてしまい　 {3}ことが {4} -{0}は　{1}が {2}を　つかったのを　みて　 {3}ことが {4} -{0}は　{1}と いっしょに　たたかって　 チャンピオンを　たおしたとき {3}ことが {4} -{0}は　{1}が ポケモンずかんを　かんせい　させたとき　 {3}ことが {4} -{0}は {2}と　そうぐうして　 {1}と　いっしょに {3}ことが {4} -{0}は　{1}が バトルシャトレーヌを　たおしたとき　 {3}ことが {4} -{0}は　{1}と {2}で　 ダウジングマシンを　つかって かくされた　どうぐを　さがし　 {3}ことが {4} -{0}は　{1}と {2}で　 じてんしゃに　のって {3}ことが {4} -{0}は　{1}と {2}で　 タウンマップを　つかって もくてきの　ばしょを　かくにんし　 {3}ことが {4} -{0}は　{1}と {2}を　つちに　うめて　 たくさんの　みが　なったときの ことを　そうぞうしながら　 {3}ことが {4} -{0}は {1}に　しじされ　 {2}で じまんの　かいりきを　つかい　 {3}ことが {4} -{0}は {1}に　しじされ　 {2}で いあいぎりを　ひろうして　 {3}ことが {4} -{0}は {1}に　しじされ　 {2}で おもいっきり　いわをくだき　 {3}ことが {4} -{0}は {2}で　 {1}を　のせて たきのぼりを　つかい　 {3}ことが {4} -{0}は {2}で　 {1}が　なにかを こそっと　ひろったのを　みて　 {3}ことが {4} -{0}は {1}に　 {2}を おもむろに　もたされて　 {3}ことが {4} -{0}は {1}と　いっしょに　 チャンピオンロードへ　むかい {3}ことが {4} -{0}は {1}と　いっしょに　 {2}にある かんばんを　かくにんし　 {3}ことが {4} -{0}は {1}と　いっしょに　 のった　でんしゃの　スピードが とても　はやいことに　かんどうし　 {3}ことが {4} -{0}は {1}と　いっしょに　 ポケトレを　つかって {2}と　そうぐうし　 {3}ことが {4} -{0}は {2}が　とびだしてきたとき　 びっくりして　{1}と いっしょに　にげたし　 {3}ことが {4} -{0}は {1}と　いっしょに　 チャレンジした　トライアルハウスで こうとくてんを　だして　 {3}ことが {4} -{0}は {1}の　しょうかいで　 あった　ジャッジに じろじろと　みられすぎて　 {3}ことが {4} -{0}は {1}の　しょうかいで　 あった　わすれジイさんに {2}を　わすれさせられ　 {3}ことが {4} -{0}は {1}の　しじによって　 {2}を おもいだすことが　でき　 {3}ことが {4} -{0}は　{1}に そだてやさんへ　つれていかれて　 {2}と いっしょに　あずけられ　 {3}ことが {4} -{0}は {1}が　 くじびきで　{2}を もらったことを　うらやましく　おもい　 {3}ことが {4} -{0}は　{1}が {2}で　 むしよけスプレーを　ふりまいたとき {3}ことが {4} -{0}は {1}と　いっしょに　 ハードな　とっくんを　して {3}ことが {4} -{0}は {1}と　いっしょに　 エレベータに　のって {3}ことが {4} -{0}は {1}に　つれられ　 せいめいはんだんしの　ところへ　いき うんめいてきな　なまえを　つけられて　 {3}ことが {4} -{0}は {1}と　いっしょに　 ブティックにいき　しちゃくしたけど なにも　かわずに　でてきて　 {3}ことが {4} -{0}は {1}と　いっしょに　 すてきな　レストランに　いき おなか　いっぱい　たべて　 {3}ことが {4} -{0}は {1}に　つれられて　 すてきな　おねえさんに かわいがって　もらい　 {3}ことが {4} -{0}は {1}と　いっしょに　 {2}に　あった ゴミばこを　あさって　 {3}ことが {4} -{0}は {1}と　いっしょに　 {2}と　たたかったとき わるあがきを　だすまで　がんばって　 {3}ことが {4} -{0}は {1}と　いった　 たかい　タワーの　おくじょうから げかいを　みおろし　 {3}ことが {4} -{0}は {1}と　いった　 かがみの　どうくつの　なかで かがみに　うつった　じぶんを　みて　 {3}ことが {4} -{0}は {1}と　 もりの　なかを　たんさくしたとき まよいそうに　なって　 {3}ことが {4} -{0}は {1}と　こうじょうに　いき　 たくさんの　むずかしそうな　きかいを まのあたりにして　 {3}ことが {4} -{0}は {1}が ひみつきちを　つくったとき {3}ことが {4} +{0}には いい　おもいでが　あるようだけど ちょっと　おもいおこせないみたい…… +{0}は {1}に {2}で　であい モンスターボールを　なげられ いっしょに　たびすることに　なり {3}ことが {4} +{0}は {2}で タマゴの　カラを　やぶって　でてきたとき はじめて　{1}と　であい {3}ことが {4} +{0}は {1}と {2}で　であえて {3}ことが {4} +{0}は {2}で ポケモンこうかんに　よって {1}の　なかまとなり {3}ことが {4} +{0}は {1}と ポケモンセンターに {2}を　かいにいって {3}ことが {4} +{0}は {1}と ポケモンセンターに　いって つかれた　からだを　かいふくしてもらい {3}ことが {4} +{0}は {1}と いっしょに　つりをして {2}を　つりあげ {3}ことが {4} +{0}は {1}と いっしょに　つりを　したとき {1}が　せっかく　つれた ポケモンを　のがしてしまって {3}ことが {4} +{0}は {1}が {2}のことを かまって　いたときに {3}ことが {4} +{0}は {1}に おかしを　もらって {3}ことが {4} +{0}は {1}と いっしょに　ようふくを　かいにいって {3}ことが {4} +{0}は {1}に {2}を おぼえさせてもらい {3}ことが {4} +{0}は {1}が {2}の　タマゴを かえすのを　てつだって {3}ことが {4} +{0}は {1}が {2}を　つかまえた　ときに {3}ことが {4} +{0}は ピンチの　ときに　{1}に {2}を　つかってもらって {3}ことが {4} +{0}は {1}の しじで　だした　{2}が あいてに　こうかが　なくて {3}ことが {4} +{0}は {1}と　いっしょに　たたかい {2}を　たおして {3}ことが {4} +{0}は {2}との　たたかいに　やぶれて {1}と　いっしょに　にげかえり {3}ことが {4} +{0}は {1}に　そだてられ {2}で しんかして {3}ことが {4} +{0}は　なみのりで {1}を じぶんの　せなかに　のせて {3}ことが {4} +{0}は {2}が {1}を　のせているのを　みて {3}ことが {4} +{0}は {1}と　いっしょに　たたかって ジムリーダーに　かったとき {3}ことが {4} +{0}は {1}が バトルハウスに　いどんだとき あまりにも　きんちょうして {3}ことが {4} +{0}は　そらをとぶで {1}を {2}へ　はこび {3}ことが {4} +{0}は とびだしてきた　{2}に {1}と いっしょに　おどろいてしまい {3}ことが {4} +{0}は {1}が {2}を つかったのを　みて {3}ことが {4} +{0}は {1}と　いっしょに　たたかって チャンピオンを　たおしたとき {3}ことが {4} +{0}は {1}が　ポケモンずかんを かんせい　させたとき {3}ことが {4} +{0}は {2}と　そうぐうして {1}と　いっしょに {3}ことが {4} +{0}は {1}が バトルの　さいこうほうを せいは　したとき {3}ことが {4} +{0}は {1}と {2}で ダウジングマシンを　つかって かくされた　どうぐを　さがし {3}ことが {4} +{0}は {1}と {2}で じてんしゃに　のって {3}ことが {4} +{0}は {1}と {2}で タウンマップを　つかって もくてきの　ばしょを　かくにんし {3}ことが {4} +{0}は {1}と {2}を　つちに　うめて たくさんの　みが なったときのことを　そうぞうしながら {3}ことが {4} +{0}は {1}に　しじされ {2}で じまんの　かいりきを　つかい {3}ことが {4} +{0}は {1}に　しじされ {2}で いあいぎりを　ひろうして {3}ことが {4} +{0}は {1}に　しじされ {2}で おもいきり　いわを　くだき {3}ことが {4} +{0}は {2}で {1}を　のせて たきのぼりを　つかい {3}ことが {4} +{0}は {2}で {1}が なにかを　こそっと　ひろったのを　みて {3}ことが {4} +{0}は {1}に {2}を おもむろに　もたされて {3}ことが {4} +{0}は {1}と　いっしょに チャンピオンロードへ　むかい {3}ことが {4} +{0}は {1}と　いっしょに {2}にある かんばんを　かくにんし {3}ことが {4} +{0}は {1}と　いっしょに のった　でんしゃの　スピードが とても　はやいことに　かんどうし {3}ことが {4} +{0}は {1}と いっしょに　ポケトレを　つかって {2}と　そうぐうし {3}ことが {4} +{0}は {2}が とびだしてきて　びっくりして {1}と いっしょに　にげだし {3}ことが {4} +{0}は {1}と いっしょに　チャレンジした トライアルハウスで　こうとくてんを　だして {3}ことが {4} +{0}は {1}の　しょうかいで　あった ジャッジに　じろじろと　みられすぎて {3}ことが {4} +{0}は {1}の　しょうかいで　あった わすれジイさんに {2}を　わすれさせられ {3}ことが {4} +{0}は {1}の　しじによって {2}を おもいだすことが　でき {3}ことが {4} +{0}は {1}に そだてやさんへ　つれていかれ {2}と　いっしょに　あずけられ {3}ことが {4} +{0}は {1}が　くじびきで {2}を　もらったことを うらやましく　おもい {3}ことが {4} +{0}は {1}が {2}で むしよけスプレーを　ふりまいたとき {3}ことが {4} +{0}は {1}と いっしょに　ハードな　とっくんを　して {3}ことが {4} +{0}は {1}と いっしょに　エレベータに　のって {3}ことが {4} +{0}は {1}に　つれられ せいめいはんだんしの　ところへ　いき うんめいてきな　なまえを　つけられて {3}ことが {4} +{0}は {1}と　いっしょに ブティックに　いき　しちゃくしたけど なにも　かわずに　でてきて {3}ことが {4} +{0}は {1}と いっしょに　すてきな　レストランに　いき おなか　いっぱい　たべて {3}ことが {4} +{0}は {1}に　つれられて すてきな　おねえさんに かわいがって　もらい {3}ことが {4} +{0}は {1}と　いっしょに {2}に　あった ゴミばこを　あさって {3}ことが {4} +{0}は {1}と　いっしょに {2}と　たたかったとき わるあがきを　だすまで　がんばって {3}ことが {4} +{0}は {1}と　いった たかい　タワーの　おくじょうから げかいを　みおろし {3}ことが {4} +{0}は {1}と　いった かがみの　どうくつの　なかで かがみに　うつった　じぶんを　みて {3}ことが {4} +{0}は {1}と もりの　なかを　たんさくしたとき まよいそうに　なって {3}ことが {4} +{0}は {1}と こうじょうに　いき たくさんの　むずかしそうな きかいを　まのあたりにして {3}ことが {4} +{0}は {1}が ひみつきちを　つくったときに {3}ことが {4} {0}は {1}と コンテストに　さんかして たくさんの　ひとに　アピールしたとき {3}ことが {4} {0}は {1}と コンテストに　さんかして みごと　ゆうしょう　したとき {3}ことが {4} -{0}は {1}と　いっしょに おおぞらを　とんで いろんなばしょに　いったとき {3}ことが {4} -{0}は {1}に　たのまれて ふかいうみに　もぐって うみのそこを　たんさくしたとき {3}ことが {4} \ No newline at end of file +{0}は {1}と いっしょに　おおぞらを　とんで いろんな　ばしょに　いったとき {3}ことが {4} +{0}は {1}に たのまれて　ふかいうみに　もぐって うみのそこを　たんさくしたとき {3}ことが {4} +{0}は {1}と　いっしょに {2}で ベンチに　すわり {3}ことが {4} +{0}は {1}と いっしょに　ダイマックスと　なった {2}と　たたかったとき {3}ことが {4} +{0}は {1}に　しじされて ダイマックスを　して {2}と　たたかったとき {3}ことが {4} +{0}は {1}と いっしょに　キャンプをして {3}ことが {4} +{0}は {1}と いっしょに　りょうりを　つくり {3}ことが {4} +{0}は {1}に あずかりやさんへ　つれていかれ {2}と　いっしょに　あずけられ {3}ことが {4} +{0}は　ポケモンセンターで {1}の たんじょうびの　おいわいを　して {3}ことが {4} +{0}は {1}と いっしょに　ヘアサロンに　いったとき {1}が かみがたに　なやんでいるのを　みて {3}ことが {4} +{0}は {1}と いっしょに　あるいたとき あめに　ふられて ふたりとも　びしょびしょに　なり {3}ことが {4} +{0}は {1}と いっしょに　ラリーをして あまりの　そくどに {3}ことが {4} +{0}は ボックスの　なかで {1}のことを　おもいながら {2}の だしかたを　けんきゅうし {3}ことが {4} +{0}は ボックスの　なかで {1}に　ほめてもらえるよう {2}の きめポーズを　れんしゅうし {3}ことが {4} +{0}は ボックスで　いっしょに　なった {2}と {1}に　ついて　かたりあい {3}ことが {4} +{0}は ボックスで　なかよくなった {2}と わざの　けんきゅうをして {1}に みとめてもらう　ひを　かたりあい {3}ことが {4} +{0}は ボックスの　なかで　もたされていた {2}を {1}が さがしていないか　しんぱいをして {3}ことが {4} +{0}は ボックスで　{1}が ようすを　みにきたとき きんちょうして　めをあわせられず {3}ことが {4} +{0}は ボックスの　なかで {1}が {2}に とうちゃくした　という　はなしをきき その　すがたを　そうぞうしながら {3}ことが {4} +{0}は ボックスで　いっしょになった {2}と {1}の　わだいで けんかに　なってしまい {3}ことが {4} +{0}は ボックスの　なかで {1}に {2}を もたされた　いみを　かんがえながら {3}ことが {4} +{0}は ボックスに　いたとき {1}が {2}を　つかっている ふしぎな　ゆめをみて {3}ことが {4} \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/ja/text_Moves_ja.txt b/PKHeX.Core/Resources/text/ja/text_Moves_ja.txt index 1059f894a..6a6dc95cb 100644 --- a/PKHeX.Core/Resources/text/ja/text_Moves_ja.txt +++ b/PKHeX.Core/Resources/text/ja/text_Moves_ja.txt @@ -1,4 +1,4 @@ -――――― +――――― はたく からてチョップ おうふくビンタ @@ -740,4 +740,58 @@ こちこちフロスト きらきらストーム ブイブイブレイク -ダブルパンツァー \ No newline at end of file +ダブルパンツァー +ダイウォール +ダイマックスほう +ねらいうち +くらいつく +ほおばる +はいすいのじん +タールショット +まほうのこな +ドラゴンアロー +おちゃかい +たこがため +でんげきくちばし +エラがみ +コートチェンジ +ダイバーン +ダイワーム +ダイサンダー +ダイアタック +ダイナックル +ダイホロウ +ダイアイス +ダイアシッド +ダイストリーム +ダイジェット +ダイフェアリー +ダイドラグーン +ダイサイコ +ダイロック +ダイアース +ダイアーク +ダイソウゲン +ダイスチル +ソウルビート +ボディプレス +デコレーション +ドラムアタック +トラバサミ +かえんボール +きょじゅうざん +きょじゅうだん +オーラぐるま +ワイドブレイカー +えだづき +オーバードライブ +りんごさん +Ｇのちから +ソウルクラッシュ +ワンダースチーム +いのちのしずく +ブロッキング +どげざつき +スターアサルト +ムゲンダイビーム +てっていこうせん \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/ja/text_Ribbons_ja.txt b/PKHeX.Core/Resources/text/ja/text_Ribbons_ja.txt index 9327fb3d3..682a953c6 100644 --- a/PKHeX.Core/Resources/text/ja/text_Ribbons_ja.txt +++ b/PKHeX.Core/Resources/text/ja/text_Ribbons_ja.txt @@ -101,3 +101,51 @@ RibbonChampionAlola アローラ　チャンプ RibbonBattleRoyale ロイヤルマスター RibbonBattleTreeGreat グレートツリー RibbonBattleTreeMaster マスターツリー +RibbonChampionGalar ガラル チャンプリボン +RibbonTowerMaster マスタータワーリボン +RibbonMasterRank マスターランクリボン +RibbonMarkLunchtime しょうごのあかし +RibbonMarkSleepyTime しょうしのあかし +RibbonMarkDusk たそがれのあかし +RibbonMarkDawn あかつきのあかし +RibbonMarkCloudy どんてんのあかし +RibbonMarkRainy あめふりのあかし +RibbonMarkStormy いかづちのあかし +RibbonMarkSnowy こうせつのあかし +RibbonMarkBlizzard ごうせつのあかし +RibbonMarkDry かんそうのあかし +RibbonMarkSandstorm さじんのあかし +RibbonMarkMisty のうむのあかし +RibbonMarkDestiny うんめいのあかし +RibbonMarkFishing つりあげられたあかし +RibbonMarkCurry カレーのあかし +RibbonMarkUncommon ときどきみるあかし +RibbonMarkRare みたことのないあかし +RibbonMarkRowdy わんぱくなあかし +RibbonMarkAbsentMinded のうてんきなあかし +RibbonMarkJittery きんちょうのあかし +RibbonMarkExcited きたいのあかし +RibbonMarkCharismatic カリスマのあかし +RibbonMarkCalmness れいせいのあかし +RibbonMarkIntense じょうねつのあかし +RibbonMarkZonedOut ゆだんのあかし +RibbonMarkJoyful たこうのあかし +RibbonMarkAngry ふんぬのあかし +RibbonMarkSmiley びしょうのあかし +RibbonMarkTeary ひそうのあかし +RibbonMarkUpbeat かいちょうのあかし +RibbonMarkPeeved げきはつのあかし +RibbonMarkIntellectual りせいのあかし +RibbonMarkFerocious ほんのうのあかし +RibbonMarkCrafty こうかつのあかし +RibbonMarkScowling こわもてのあかし +RibbonMarkKindly やさがたのあかし +RibbonMarkFlustered どうようのあかし +RibbonMarkPumpedUp こうようのあかし +RibbonMarkZeroEnergy けんたいのあかし +RibbonMarkPrideful じしんのあかし +RibbonMarkUnsure ふしんのあかし +RibbonMarkHumble ぼくとつのあかし +RibbonMarkThorny ふじゅんのあかし +RibbonMarkVigor げんきのあかし +RibbonMarkSlump ふちょうのあかし \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/ja/text_Species_ja.txt b/PKHeX.Core/Resources/text/ja/text_Species_ja.txt index 8a0c618d1..0e5ad6b5e 100644 --- a/PKHeX.Core/Resources/text/ja/text_Species_ja.txt +++ b/PKHeX.Core/Resources/text/ja/text_Species_ja.txt @@ -807,4 +807,85 @@ ズガドーン ゼラオラ メルタン -メルメタル \ No newline at end of file +メルメタル +サルノリ +バチンキー +ゴリランダー +ヒバニー +ラビフット +エースバーン +メッソン +ジメレオン +インテレオン +ホシガリス +ヨクバリス +ココガラ +アオガラス +アーマーガア +サッチムシ +レドームシ +イオルブ +クスネ +フォクスライ +ヒメンカ +ワタシラガ +ウールー +バイウールー +カムカメ +カジリガメ +ワンパチ +パルスワン +タンドン +トロッゴン +セキタンザン +カジッチュ +アップリュー +タルップル +スナヘビ +サダイジャ +ウッウ +サシカマス +カマスジョー +エレズン +ストリンダー +ヤクデ +マルヤクデ +タタッコ +オトスパス +ヤバチャ +ポットデス +ミブリム +テブリム +ブリムオン +ベロバー +ギモー +オーロンゲ +タチフサグマ +ニャイキング +サニゴーン +ネギガナイト +バリコオル +デスバーン +マホミル +マホイップ +タイレーツ +バチンウニ +ユキハミ +モスノウ +イシヘンジン +コオリッポ +イエッサン +モルペコ +ゾウドウ +ダイオウドウ +パッチラゴン +パッチルドン +ウオノラゴン +ウオチルドン +ジュラルドン +ドラメシヤ +ドロンチ +ドラパルト +ザシアン +ザマゼンタ +ムゲンダイナ \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/ja/text_swsh_00000_ja.txt b/PKHeX.Core/Resources/text/ja/text_swsh_00000_ja.txt index 4d9440604..176687d22 100644 --- a/PKHeX.Core/Resources/text/ja/text_swsh_00000_ja.txt +++ b/PKHeX.Core/Resources/text/ja/text_swsh_00000_ja.txt @@ -1 +1,163 @@ -todo \ No newline at end of file +－－－－－－－－－－ + +なぞのばしょ + +とおいばしょ + +ハロンタウン + +まどろみのもり + +[~ 10] +[~ 11] +１ばんどうろ + +ブラッシータウン + +ブラッシータウンえき + +２ばんどうろ + +エンジンシティ + +エンジンシティえき + +エンジンスタジアム + +[~ 26] +[~ 27] +３ばんどうろ + +ガラルこうざん + +４ばんどうろ + +ターフタウン + +ターフスタジアム + +[~ 38] +[~ 39] +５ばんどうろ + +[~ 42] +[~ 43] +バウタウン + +バウタウンえき + +バウスタジアム + +[~ 50] +[~ 51] +エンジンシティはずれ + +だいにこうざん + +ナックルシティ + +ナックルシティえき + +ナックルスタジアム + +[~ 62] +[~ 63] +エネルギープラント + +タワートップ + +６ばんどうろ + +ラテラルタウン + +ラテラルスタジアム + +[~ 74] +[~ 75] +ルミナスメイズのもり + +アラベスクタウン + +アラベスクスタジアム + +[~ 82] +[~ 83] +７ばんどうろ + +８ばんどうろ + +８ばんどうろ +ゆけむりこみち +９ばんどうろ + +９ばんどうろ +キルクスのいりえ +９ばんどうろ +スパイクタウンはずれ +キルクスタウン + +キルクススタジアム + +[~ 100] +[~ 101] +スパイクタウン + +ルートナイントンネル + +１０ばんどうろ + +ホワイトヒルえき + +シュートシティ + +シュートシティえき + +シュートスタジアム +ポケモンリーグほんぶ +シュートスタジアム +せんしゅひかえしつ +シュートスタジアム + +つどいのあきち +ワイルドエリア +うららかそうげん +ワイルドエリア +こもれびばやし +ワイルドエリア +みはりとうあとち +ワイルドエリア +キバこ・ひがし +ワイルドエリア +キバこ・にし +ワイルドエリア +キバこのひとみ +ワイルドエリア +ミロカロこ・みなみ +ワイルドエリア +きょじんのこしかけ +ワイルドエリア +ミロカロこ・きた +ワイルドエリア +エンジンリバーサイド +ワイルドエリア +ハシノマはらっぱ +ワイルドエリア +ストーンズげんや +ワイルドエリア +さじんのくぼち +ワイルドエリア +きょじんのかがみいけ +ワイルドエリア +ナックルきゅうりょう +ワイルドエリア +きょじんのぼうし +ワイルドエリア +げきりんのみずうみ +ワイルドエリア +ワイルドエリアえき + +バトルタワー + +ローズタワービル + +どこかのすあな diff --git a/PKHeX.Core/Resources/text/ja/text_swsh_30000_ja.txt b/PKHeX.Core/Resources/text/ja/text_swsh_30000_ja.txt index 4d9440604..2d0eb1275 100644 --- a/PKHeX.Core/Resources/text/ja/text_swsh_30000_ja.txt +++ b/PKHeX.Core/Resources/text/ja/text_swsh_30000_ja.txt @@ -1 +1,19 @@ -todo \ No newline at end of file +つうしんこうかん +つうしんこうかん +カントーちほう +ジョウトちほう +ホウエンちほう +シンオウちほう +とおくはなれたとち +－－－－－－－－－－ +イッシュちほう +カロスちほう +ポケモンリンク +Pokémon GO +カントーちほう +ホウエンちほう +アローラちほう +ポケリゾート +ジョウトちほう +Pokémon HOME +カントーちほう \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/ja/text_swsh_40000_ja.txt b/PKHeX.Core/Resources/text/ja/text_swsh_40000_ja.txt index 4d9440604..ffa81dc3b 100644 --- a/PKHeX.Core/Resources/text/ja/text_swsh_40000_ja.txt +++ b/PKHeX.Core/Resources/text/ja/text_swsh_40000_ja.txt @@ -1 +1,113 @@ -todo \ No newline at end of file +すてきなばしょ +とおいばしょ +ポケモンえいが +[~ 3] +ポケモンえいが１９ +ポケモンえいが２０ +ポケモンえいが２１ +ポケモンえいが２２ +ポケモンえいが２３ +ポケモンえいが２４ +ポケモンアニメ +ポケモンセンター +ＰＣトウホク +WCS +[~ 14] +WCS２０１９ +WCS２０２０ +WCS２０２１ +WCS２０２２ +WCS２０２３ +WCS２０２４ +Ｗｏｒｌｄｓ +[~ 22] +Ｗｏｒｌｄｓ２０１９ +Ｗｏｒｌｄｓ２０２０ +Ｗｏｒｌｄｓ２０２１ +Ｗｏｒｌｄｓ２０２２ +Ｗｏｒｌｄｓ２０２３ +Ｗｏｒｌｄｓ２０２４ +VGE +[~ 30] +VGE２０１９ +VGE２０２０ +VGE２０２１ +VGE２０２２ +VGE２０２３ +VGE２０２４ +ポケモンイベント +バトルたいかい +ゲームイベント +だいすきクラブ +ポケモンばんぐみ +コンサート +オンラインプレゼント +PGL +[~ 45] +ポケモンイベント１９ +ポケモンイベント２０ +ポケモンイベント２１ +ポケモンイベント２２ +ポケモンイベント２３ +ポケモンイベント２４ +ポケモンフェスタ +[~ 53] +ポケモンフェスタ１９ +ポケモンフェスタ２０ +ポケモンフェスタ２１ +ポケモンフェスタ２２ +ポケモンフェスタ２３ +ポケモンフェスタ２４ +ポケパーク +[~ 61] +ポケパーク２０１９ +ポケパーク２０２０ +ポケパーク２０２１ +ポケパーク２０２２ +ポケパーク２０２３ +ポケパーク２０２４ +イベントかいじょう +ゲームフリーク +スタジアム +VGC +[~ 72] +VGC２０１９ +VGC２０２０ +VGC２０２１ +VGC２０２２ +VGC２０２３ +VGC２０２４ +バーチャルコンソール +Pokémon GO +ポケモンバンク +ポケモンのショップ +たいけんばん +モンスターボール Plus +Pokémon HOME +[~ 86] +[~ 87] +[~ 88] +[~ 89] +[~ 90] +[~ 91] +[~ 92] +[~ 93] +[~ 94] +[~ 95] +[~ 96] +[~ 97] +[~ 98] +[~ 99] +[~ 100] +[~ 101] +[~ 102] +[~ 103] +[~ 104] +[~ 105] +[~ 106] +[~ 107] +[~ 108] +[~ 109] +[~ 110] +[~ 111] +[~ 112] \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/ja/text_swsh_60000_ja.txt b/PKHeX.Core/Resources/text/ja/text_swsh_60000_ja.txt index 4d9440604..e7c50304f 100644 --- a/PKHeX.Core/Resources/text/ja/text_swsh_60000_ja.txt +++ b/PKHeX.Core/Resources/text/ja/text_swsh_60000_ja.txt @@ -1 +1,4 @@ -todo \ No newline at end of file +とおくにいるひと +あずかりやさん +トレジャーハンター +おんせんばあさん \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/ja/text_tradeswsh_ja.txt b/PKHeX.Core/Resources/text/ja/text_tradeswsh_ja.txt new file mode 100644 index 000000000..ce609ea6d --- /dev/null +++ b/PKHeX.Core/Resources/text/ja/text_tradeswsh_ja.txt @@ -0,0 +1,22 @@ +コバン +ほっぺ +わたあめ +チョッキ +まえがみ +ギョロギョロ +カーメン +あかなげ +あおぱん +バリさん +ちょくせん +ジョバンニ +ハツミ +マイド +タカラコ +ロミオ +ロミオ +イヴ +シラユキ +シラユキ +タナベ +カプーア \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/ko/text_Abilities_ko.txt b/PKHeX.Core/Resources/text/ko/text_Abilities_ko.txt index b2161fd33..db49139d9 100644 --- a/PKHeX.Core/Resources/text/ko/text_Abilities_ko.txt +++ b/PKHeX.Core/Resources/text/ko/text_Abilities_ko.txt @@ -231,4 +231,29 @@ AR시스템 메탈프로텍트 스펙터가드 프리즘아머 -브레인포스 \ No newline at end of file +브레인포스 +불요의검 +불굴의방패 +리베로 +볼줍기 +솜털 +스크루지느러미 +미러아머 +그대로꿀꺽미사일 +굳건한신념 +증기기관 +펑크록 +모래뿜기 +얼음인분 +숙성 +아이스페이스 +파워스폿 +의태 +배리어프리 +강철정신 +멸망의바디 +떠도는영혼 +무아지경 +화학변화가스 +파스텔베일 +꼬르륵스위치 \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/ko/text_Forms_ko.txt b/PKHeX.Core/Resources/text/ko/text_Forms_ko.txt index e1332275a..cdcc08be8 100644 Binary files a/PKHeX.Core/Resources/text/ko/text_Forms_ko.txt and b/PKHeX.Core/Resources/text/ko/text_Forms_ko.txt differ diff --git a/PKHeX.Core/Resources/text/ko/text_GenLoc_ko.txt b/PKHeX.Core/Resources/text/ko/text_GenLoc_ko.txt index 7db328dbe..e0af97cf2 100644 --- a/PKHeX.Core/Resources/text/ko/text_GenLoc_ko.txt +++ b/PKHeX.Core/Resources/text/ko/text_GenLoc_ko.txt @@ -1,4 +1,4 @@ -어딘가 +어딘가 최초의 마을 집 친구의 집 @@ -28,7 +28,7 @@ 스튜디오 역 배틀 장소 -미용실 +헤어살롱 레스토랑 고급 레스토랑 해변의 마을 @@ -60,12 +60,21 @@ 폐허 수로 사파리 -비밀기지 +커다란 배 +창공 콘테스트 라이브 회장 +신비스러운 장소 +작은 섬 +재가 떨어져 쌓이는 길 +비밀기지 깊은 바다 밑 환상의 장소 -커다란 배 -재가 떨어져 쌓이는 길 -작은 섬 -신비스러운 장소 -창공 \ No newline at end of file +호수가 보이는 길 +광대한 초원 +스타디움 +맡기미집 +광산 +산간 마을 +쇠퇴한 마을 +터널 +위험한 장소 \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/ko/text_Items_ko.txt b/PKHeX.Core/Resources/text/ko/text_Items_ko.txt index 0065dfcdd..12ba6ae48 100644 --- a/PKHeX.Core/Resources/text/ko/text_Items_ko.txt +++ b/PKHeX.Core/Resources/text/ko/text_Items_ko.txt @@ -1,4 +1,4 @@ -없음 +없음 마스터볼 하이퍼볼 수퍼볼 @@ -1055,4 +1055,525 @@ PP회복캡슐토이 뮤츠의사탕 뮤의사탕 멜탄의사탕 -마그마의사탕 \ No newline at end of file +마그마의사탕 +??? +??? +??? +??? +??? +??? +??? +??? +??? +??? +??? +??? +??? +??? +??? +??? +추천장 +포켓몬 박스 +소원의별 +다이맥스 밴드 +??? +??? +낚싯대 +로토무자전거 +??? +??? +탱글탱글부어스트 +밥의통조림 +바크의통조림 +콩통조림 +식빵 +파스타 +버섯팩 +꼬리훈제 +굵은대파 +특선사과 +가느다란뼈 +포테이토팩 +물가허브팩 +채소팩 +모둠튀김 +삶은알 +캠프세트 +??? +??? +녹슨검 +녹슨방패 +화석새 +화석물고기 +화석용 +화석긴목 +딸기사탕공예 +하트사탕공예 +베리사탕공예 +네잎사탕공예 +꽃사탕공예 +스타사탕공예 +리본사탕공예 +달콤한사과 +새콤한사과 +목스프레이 +탈출팩 +통굽부츠 +허탕보험 +룸서비스 +만능우산 +경험사탕XS +경험사탕S +경험사탕M +경험사탕L +경험사탕XL +다이맥스사탕 +기술레코드00 +기술레코드01 +기술레코드02 +기술레코드03 +기술레코드04 +기술레코드05 +기술레코드06 +기술레코드07 +기술레코드08 +기술레코드09 +기술레코드10 +기술레코드11 +기술레코드12 +기술레코드13 +기술레코드14 +기술레코드15 +기술레코드16 +기술레코드17 +기술레코드18 +기술레코드19 +기술레코드20 +기술레코드21 +기술레코드22 +기술레코드23 +기술레코드24 +기술레코드25 +기술레코드26 +기술레코드27 +기술레코드28 +기술레코드29 +기술레코드30 +기술레코드31 +기술레코드32 +기술레코드33 +기술레코드34 +기술레코드35 +기술레코드36 +기술레코드37 +기술레코드38 +기술레코드39 +기술레코드40 +기술레코드41 +기술레코드42 +기술레코드43 +기술레코드44 +기술레코드45 +기술레코드46 +기술레코드47 +기술레코드48 +기술레코드49 +기술레코드50 +기술레코드51 +기술레코드52 +기술레코드53 +기술레코드54 +기술레코드55 +기술레코드56 +기술레코드57 +기술레코드58 +기술레코드59 +기술레코드60 +기술레코드61 +기술레코드62 +기술레코드63 +기술레코드64 +기술레코드65 +기술레코드66 +기술레코드67 +기술레코드68 +기술레코드69 +기술레코드70 +기술레코드71 +기술레코드72 +기술레코드73 +기술레코드74 +기술레코드75 +기술레코드76 +기술레코드77 +기술레코드78 +기술레코드79 +기술레코드80 +기술레코드81 +기술레코드82 +기술레코드83 +기술레코드84 +기술레코드85 +기술레코드86 +기술레코드87 +기술레코드88 +기술레코드89 +기술레코드90 +기술레코드91 +기술레코드92 +기술레코드93 +기술레코드94 +기술레코드95 +기술레코드96 +기술레코드97 +기술레코드98 +기술레코드99 +기술머신00 +외로움민트 +고집민트 +개구쟁이민트 +용감민트 +대담민트 +장난꾸러기민트 +촐랑민트 +무사태평민트 +조심민트 +의젓민트 +덜렁민트 +냉정민트 +차분민트 +얌전민트 +신중민트 +건방민트 +겁쟁이민트 +성급민트 +명랑민트 +천진난만민트 +성실민트 +소원의덩어리 +깨진포트 +이빠진포트 +대단한귀마개 +송이팩 +튼튼치즈 +스파이스세트 +신선한크림 +레토르트카레 +야자밀크 +레토르트면 +레토르트햄버그 +거대파우더 +소원의조각 +로토무자전거 +흔들림없는부적 +??? +낡은편지 +밴드의사인 +소니아의책 +??? +??? +??? +??? +??? +??? +로토무카탈로그 +★And458 +★And15 +★And337 +★And603 +★And390 +★Sgr6879 +★Sgr6859 +★Sgr6913 +★Sgr7348 +★Sgr7121 +★Sgr6746 +★Sgr7194 +★Sgr7337 +★Sgr7343 +★Sgr6812 +★Sgr7116 +★Sgr7264 +★Sgr7597 +★Del7882 +★Del7906 +★Del7852 +★Psc596 +★Psc361 +★Psc510 +★Psc437 +★Psc8773 +★Lep1865 +★Lep1829 +★Boo5340 +★Boo5506 +★Boo5435 +★Boo5602 +★Boo5733 +★Boo5235 +★Boo5351 +★Hya3748 +★Hya3903 +★Hya3418 +★Hya3482 +★Hya3845 +★Eri1084 +★Eri472 +★Eri1666 +★Eri897 +★Eri1231 +★Eri874 +★Eri1298 +★Eri1325 +★Eri984 +★Eri1464 +★Eri1393 +★Eri850 +★Tau1409 +★Tau1457 +★Tau1165 +★Tau1791 +★Tau1910 +★Tau1346 +★Tau1373 +★Tau1412 +★CMa2491 +★CMa2693 +★CMa2294 +★CMa2827 +★CMa2282 +★CMa2618 +★CMa2657 +★CMa2646 +★UMa4905 +★UMa4301 +★UMa5191 +★UMa5054 +★UMa4295 +★UMa4660 +★UMa4554 +★UMa4069 +★UMa3569 +★UMa3323 +★UMa4033 +★UMa4377 +★UMa4375 +★UMa4518 +★UMa3594 +★Vir5056 +★Vir4825 +★Vir4932 +★Vir4540 +★Vir4689 +★Vir5338 +★Vir4910 +★Vir5315 +★Vir5359 +★Vir5409 +★Vir5107 +★Ari617 +★Ari553 +★Ari546 +★Ari951 +★Ori1713 +★Ori2061 +★Ori1790 +★Ori1903 +★Ori1948 +★Ori2004 +★Ori1852 +★Ori1879 +★Ori1899 +★Ori1543 +★Cas21 +★Cas168 +★Cas403 +★Cas153 +★Cas542 +★Cas219 +★Cas265 +★Cnc3572 +★Cnc3208 +★Cnc3461 +★Cnc3449 +★Cnc3429 +★Cnc3627 +★Cnc3268 +★Cnc3249 +★Com4968 +★Crv4757 +★Crv4623 +★Crv4662 +★Crv4786 +★Aur1708 +★Aur2088 +★Aur1605 +★Aur2095 +★Aur1577 +★Aur1641 +★Aur1612 +★Pav7790 +★Cet911 +★Cet681 +★Cet188 +★Cet539 +★Cet804 +★Cep8974 +★Cep8162 +★Cep8238 +★Cep8417 +★Cen5267 +★Cen5288 +★Cen551 +★Cen5459 +★Cen5460 +★CMi2943 +★CMi2845 +★Equ8131 +★Vul7405 +★UMi424 +★UMi5563 +★UMi5735 +★UMi6789 +★Crt4287 +★Lyr7001 +★Lyr7178 +★Lyr7106 +★Lyr7298 +★Ara6585 +★Sco6134 +★Sco6527 +★Sco6553 +★Sco5953 +★Sco5984 +★Sco6508 +★Sco6084 +★Sco5944 +★Sco6630 +★Sco6027 +★Sco6247 +★Sco6252 +★Sco5928 +★Sco6241 +★Sco6165 +★Tri544 +★Leo3982 +★Leo4534 +★Leo4357 +★Leo4057 +★Leo4359 +★Leo4031 +★Leo3852 +★Leo3905 +★Leo3773 +★Gru8425 +★Gru8636 +★Gru8353 +★Lib5685 +★Lib5531 +★Lib5787 +★Lib5603 +★Pup3165 +★Pup3185 +★Pup3045 +★Cyg7924 +★Cyg7417 +★Cyg7796 +★Cyg8301 +★Cyg7949 +★Cyg7528 +★Oct7228 +★Col1956 +★Col2040 +★Col2177 +★Gem2990 +★Gem2891 +★Gem2421 +★Gem2473 +★Gem2216 +★Gem2777 +★Gem2650 +★Gem2286 +★Gem2484 +★Gem2930 +★Peg8775 +★Peg8781 +★Peg39 +★Peg8308 +★Peg8650 +★Peg8634 +★Peg8684 +★Peg8450 +★Peg8880 +★Peg8905 +★Oph6556 +★Oph6378 +★Oph6603 +★Oph6149 +★Oph6056 +★Oph6075 +★Ser5854 +★Ser7141 +★Ser5879 +★Her6406 +★Her6148 +★Her6410 +★Her6526 +★Her6117 +★Her6008 +★Per936 +★Per1017 +★Per1131 +★Per1228 +★Per834 +★Per941 +★Phe99 +★Phe338 +★Vel3634 +★Vel3485 +★Vel3734 +★Aqr8232 +★Aqr8414 +★Aqr8709 +★Aqr8518 +★Aqr7950 +★Aqr8499 +★Aqr8610 +★Aqr8264 +★Cru4853 +★Cru4730 +★Cru4763 +★Cru4700 +★Cru4656 +★PsA8728 +★TrA6217 +★Cap7776 +★Cap7754 +★Cap8278 +★Cap8322 +★Cap7773 +★Sge7479 +★Car2326 +★Car3685 +★Car3307 +★Car3699 +★Dra5744 +★Dra5291 +★Dra6705 +★Dra6536 +★Dra7310 +★Dra6688 +★Dra4434 +★Dra6370 +★Dra7462 +★Dra6396 +★Dra6132 +★Dra6636 +★CVn4915 +★CVn4785 +★CVn4846 +★Aql7595 +★Aql7557 +★Aql7525 +★Aql7602 +★Aql7235 \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/ko/text_Memories_ko.txt b/PKHeX.Core/Resources/text/ko/text_Memories_ko.txt index 18b15f2c7..dfcc0add7 100644 --- a/PKHeX.Core/Resources/text/ko/text_Memories_ko.txt +++ b/PKHeX.Core/Resources/text/ko/text_Memories_ko.txt @@ -1,4 +1,4 @@ - + 추억인 것 같아 추억인 것 같아 @@ -36,14 +36,14 @@ 어떤 도구 어떤 기술 누군가 -좋은 추억이 있는 것 같은데 기억이 잘 떠오르지 않는 것 같아... +{0}에게는 좋은 추억이 있는 것 같지만 기억이 잘 떠오르지는 않는 모양이군... {0} {1} {2}에서 만나 몬스터볼에 들어가게 되고 함께 여행하게 되어 {3} 게 {4} {0} {2}에서 알의 껍데기를 깨고 나왔을 때 처음 {1} 만나서 {3} 게 {4} -{0} {1} {2}에서 만나서 {3} 게 {4} +{0} {1} {2}에서 만나 {3} 게 {4} {0} {2}에서 포켓몬 교환으로 {1}의 동료가 되어 {3} 게 {4} {0} {1} 포켓몬센터에 {2} 사러가서 {3} 게 {4} -{0} {1} {2}의 포켓몬센터에 가서 지친 몸을 회복하고 {3} 게 {4} -{0} {1} 함께 낚시로 {2} 낚아 올려 {3} 게 {4} +{0} {1} 포켓몬센터에 가서 지친 몸을 회복하고 {3} 게 {4} +{0} {1} 함께 낚시로 {2} 낚아 올렸을 때 {3} 게 {4} {0} {1} 함께 낚시했을 때 {1} 모처럼 낚은 포켓몬을 놓쳐 버려 {3} 게 {4} {0} {1} {2} 놀고 있을 때 {3} 게 {4} {0} {1}에게 과자를 받고 {3} 게 {4} @@ -53,9 +53,9 @@ {0} {1} {2} 잡았을 때 {3} 게 {4} {0} 위기에 몰렸을 때 {1} {2} 써줘서 {3} 게 {4} {0} {1}의 명령으로 썼던 {2} 상대방에게 효과가 없어서 {3} 게 {4} -{0} {1} 함께 {2} 쓰러뜨려서 {3} 게 {4} -{0} {2}의 싸움에서 지고 {1} 함께 도망치고 돌아와서 {3} 게 {4} -{0} {1}에게 키워지고 {2}에서 진화해서 {3} 게 {4} +{0} {1} 함께 싸우고 {2} 쓰러뜨렸을 때 {3} 게 {4} +{0} {2}의 싸움에서 지고 {1} 함께 도망치고 돌아왔을 때 {3} 게 {4} +{0} {1}에게 키워지고 {2}에서 진화했을 때 {3} 게 {4} {0} 파도타기로 {1} 자기 등에 태워서 {3} 게 {4} {0} {2} {1} 등위에 태우고 있는 걸 보고 {3} 게 {4} {0} {1} 함께 싸워 체육관 관장을 이겼을 때 {3} 게 {4} @@ -66,18 +66,18 @@ {0} {1} 함께 싸워 챔피언을 쓰러뜨리고 {3} 게 {4} {0} {1} 포켓몬 도감을 완성했을 때 {3} 게 {4} {0} {2} 조우해서 {1} 함께 {3} 게 {4} -{0} {1} 배틀샤틀레느를 쓰러뜨렸을 때 {3} 게 {4} +{0} {1} 최강의 트레이너를 쓰러뜨렸을 때 {3} 게 {4} {0} {1} {2}에서 다우징머신으로 숨겨진 도구를 찾아서 {3} 게 {4} {0} {1} {2}에서 자전거를 타고 {3} 게 {4} {0} {1} {2}에서 타운맵으로 목적지를 확인하고 {3} 게 {4} {0} {1} {2} 땅에 묻고 열매가 많이 열렸을 때를 상상하며 {3} 게 {4} -{0} {1}에게 명령받아 {2}에서 특기인 괴력을 쓰고 {3} 게 {4} -{0} {1}에게 명령받아 {2}에서 풀베기를 펼쳐서 {3} 게 {4} -{0} {1}에게 명령받아 {2}에서 힘껏 바위를 깨서 {3} 게 {4} -{0} {2}에서 {1} 태우고 폭포오르기를 써서 {3} 게 {4} +{0} {1}에게 부탁받아 {2}에서 특기인 괴력을 쓰고 {3} 게 {4} +{0} {1}에게 부탁받아 {2}에서 풀베기를 해 보이고 {3} 게 {4} +{0} {1}에게 부탁받아 {2}에서 힘껏 바위를 깼을 때 {3} 게 {4} +{0} {2}에서 {1} 태우고 폭포오르기를 썼을 때 {3} 게 {4} {0} {2}에서 {1} 뭔가를 슬쩍 줍는 걸 보고 {3} 게 {4} -{0} {1}에게 {2} 조심스럽게 받고 {3} 게 {4} -{0} {1} 함께 챔피언로드에 가서 {3} 게 {4} +{0} {1}에게 {2} 갑자기 받고 {3} 게 {4} +{0} {1} 함께 챔피언로드에 들어가서 {3} 게 {4} {0} {1} 함께 {2}에 있는 간판을 확인하고 {3} 게 {4} {0} {1} 함께 탄 열차의 엄청나게 빠른 스피드에 감동해서 {3} 게 {4} {0} {1} 함께 포켓트레로 {2} 조우해서 {3} 게 {4} @@ -85,24 +85,44 @@ {0} {1} 함께 도전한 트라이얼하우스에서 높은 점수를 얻고 {3} 게 {4} {0} {1}의 소개로 만난 심판이 너무 빤히 쳐다봐서 {3} 게 {4} {0} {1}의 소개로 만난 깜빡할아버지가 {2} 잊어버리게 해서 {3} 게 {4} -{0} {1}의 명령으로 {2} 떠올릴 수 있어서 {3} 게 {4} -{0} {1} 데리고 간 키우미집에 {2} 함께 맡겨져 {3} 게 {4} +{0} {1}의 지시에 따라 {2} 떠올릴 수 있게 되었을 때 {3} 게 {4} +{0} {1} 데리고 가 준 키우미집에 {2} 함께 맡겨져 {3} 게 {4} {0} {1} 추첨에 당첨되어 {2} 받은 게 부러워서 {3} 게 {4} {0} {1} {2}에서 벌레회피스프레이를 주변에 뿌렸을 때 {3} 게 {4} {0} {1} 함께 하드한 특훈을 해서 {3} 게 {4} {0} {1} 함께 엘리베이터를 타고 {3} 게 {4} -{0} {1}에게 이끌려 이름 감정사에게 가서 운명적인 이름을 받아 {3} 게 {4} -{0} {1} 함께 부티크에 가서 착용해 보고도 아무것도 사지 않고 나와서 {3} 게 {4} -{0} {1} 함께 멋진 레스토랑에서 잔뜩 먹고 {3} 게 {4} -{0} {1}에게 이끌려 멋진 아가씨에게 귀여움을 받고 {3} 게 {4} +{0} {1}에게 이끌려서 이름 감정사에게 운명적인 이름을 받았을 때 {3} 게 {4} +{0} {1} 함께 부티크에 가서 착용까지 했는데 아무것도 사지 않고 나와서 {3} 게 {4} +{0} {1} 함께 멋진 레스토랑에 가서 배부르게 잔뜩 먹고 {3} 게 {4} +{0} {1}에게 이끌려 멋진 아가씨에게 귀여움을 받았을 때 {3} 게 {4} {0} {1} 함께 {2}에 있었던 쓰레기통을 뒤지고 {3} 게 {4} {0} {1} 함께 {2} 싸웠을 때 발버둥을 쓸 때까지 노력해서 {3} 게 {4} -{0} {1} 간 높은 타워의 옥상에서 세상을 내려다보고 {3} 게 {4} +{0} {1} 함께 간 높은 타워의 옥상에서 세상을 내려다보고 {3} 게 {4} {0} {1} 간 거울로 된 동굴 안에서 거울에 비친 자신을 보고 {3} 게 {4} -{0} {1} 숲 속을 탐색하러 갔을 때 길을 잃을 뻔해서 {3} 게 {4} +{0} {1} 숲속을 탐색하러 갔을 때 길을 잃을 뻔해서 {3} 게 {4} {0} {1} 공장에 가서 수많은 어려워 보이는 기계를 눈앞에서 보고 {3} 게 {4} {0} {1} 비밀기지를 만들었을 때 {3} 게 {4} {0} {1} 콘테스트에 참가해서 많은 사람들에게 어필했을 때 {3} 게 {4} {0} {1} 콘테스트에 참가해서 멋지게 우승했을 때 {3} 게 {4} {0} {1} 함께 넓은 하늘을 날고 여러 장소에 갔을 때 {3} 게 {4} -{0} {1}에게 부탁받아 깊은 바다에 잠수하여 해저 바닥을 탐사했을 때 {3} 게 {4} \ No newline at end of file +{0} {1}에게 부탁받아 깊은 바다에 잠수하여 해저를 탐사했을 때 {3} 게 {4} +{0} {1} 함께 {2}에 있는 벤치에 앉았을 때 {3} 게 {4} +{0} {1} 함께 다이맥스한 {2} 싸웠을 때 {3} 게 {4} +{0} {1}의 지시를 받고 다이맥스해서 {2} 싸웠을 때 {3} 게 {4} +{0} {1} 함께 캠핑을 해서 {3} 게 {4} +{0} {1} 함께 요리를 만들어서 {3} 게 {4} +{0} {1} 데리고 가 준 맡기미집에 {2} 함께 맡겨져 {3} 게 {4} +{0} 포켓몬센터에서 {1}의 생일을 축하해줘서 {3} 게 {4} +{0} {1} 함께 헤어살롱에 갔을 때 {1} 헤어스타일을 고민하는 것을 보고 {3} 게 {4} +{0} {1} 함께 걷고 있을 때 내리는 비에 둘 다 흠뻑 젖어서 {3} 게 {4} +{0} {1} 함께 랠리를 했을 때 너무 빠른 속도에 {3} 게 {4} +{0} 박스 안에서 {1} 생각하며 {2}의 사용 방법을 연구해서 {3} 게 {4} +{0} 박스 안에서 {1}에게 칭찬받기 위해 {2}의 포즈를 연습해서 {3} 게 {4} +{0} 박스 안에 함께 있던 {2} {1}에 대한 이야기를 나눌 때 {3} 게 {4} +{0} 박스 안에서 친해진 {2} 기술을 연구하며 {1}에게 인정받을 날에 대한 이야기를 나눌 때 {3} 게 {4} +{0} 박스 안에서 지니고 있던 {2} {1} 찾고 있지는 않을까 걱정하며 {3} 게 {4} +{0} 박스에서 {1} 상태를 보러 왔을 때 긴장 때문에 눈을 마주치지 못해서 {3} 게 {4} +{0} 박스 안에서 {1} {2}에 도착했다는 이야기를 듣고 그 모습을 상상하면서 {3} 게 {4} +{0} 박스 안에 함께 있던 {2} {1}에 대한 이야기로 다투게 되어 {3} 게 {4} +{0} 박스 안에서 {1} {2} 지니고 있게 한 의미를 생각하며 {3} 게 {4} +{0} 박스 안에 있었을 때 {1} {2} 쓰는 이상한 꿈을 꾸고 {3} 게 {4} \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/ko/text_Moves_ko.txt b/PKHeX.Core/Resources/text/ko/text_Moves_ko.txt index 5b0c22c77..f6bddb7e1 100644 --- a/PKHeX.Core/Resources/text/ko/text_Moves_ko.txt +++ b/PKHeX.Core/Resources/text/ko/text_Moves_ko.txt @@ -1,4 +1,4 @@ -――――― +――――― 막치기 태권당수 연속뺨치기 @@ -740,4 +740,58 @@ DD래리어트 꽁꽁프로스트 반짝반짝스톰 브이브이브레이크 -더블펀처 \ No newline at end of file +더블펀처 +다이월 +다이맥스포 +노려맞히기 +물고버티기 +볼가득넣기 +배수의진 +타르숏 +마법가루 +드래곤애로 +다과회 +문어굳히기 +전격부리 +아가미물기 +코트체인지 +다이번 +다이웜 +다이썬더 +다이어택 +다이너클 +다이할로우 +다이아이스 +다이애시드 +다이스트림 +다이제트 +다이페어리 +다이드라군 +다이사이코 +다이록 +다이어스 +다이아크 +다이그래스 +다이스틸 +소울비트 +바디프레스 +데코레이션 +드럼어택 +집게덫 +화염볼 +거수참 +거수탄 +오라휠 +와이드브레이커 +가지찌르기 +오버드라이브 +사과산 +G의힘 +소울크래시 +원더스팀 +생명의물방울 +블로킹 +사죄의찌르기 +스타어설트 +무한다이빔 +철제광선 \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/ko/text_Ribbons_ko.txt b/PKHeX.Core/Resources/text/ko/text_Ribbons_ko.txt index db13180ac..f34c75d72 100644 --- a/PKHeX.Core/Resources/text/ko/text_Ribbons_ko.txt +++ b/PKHeX.Core/Resources/text/ko/text_Ribbons_ko.txt @@ -100,4 +100,52 @@ RibbonCountG3Tough = 파워풀리본 RibbonChampionAlola 알로라챔피언리본 RibbonBattleRoyale 로열마스터리본 RibbonBattleTreeGreat 그레이트트리리본 -RibbonBattleTreeMaster 마스터트리리본 \ No newline at end of file +RibbonBattleTreeMaster 마스터트리리본 +RibbonChampionGalar 가라르챔피언리본 +RibbonTowerMaster 마스터타워리본 +RibbonMasterRank 마스터랭크리본 +RibbonMarkLunchtime 정오의증표 +RibbonMarkSleepyTime 자정의증표 +RibbonMarkDusk 황혼의증표 +RibbonMarkDawn 새벽의증표 +RibbonMarkCloudy 흐림의증표 +RibbonMarkRainy 강우의증표 +RibbonMarkStormy 우레의증표 +RibbonMarkSnowy 강설의증표 +RibbonMarkBlizzard 폭설의증표 +RibbonMarkDry 건조의증표 +RibbonMarkSandstorm 모래먼지의증표 +RibbonMarkMisty 짙은안개의증표 +RibbonMarkDestiny 운명의증표 +RibbonMarkFishing 낚아올린증표 +RibbonMarkCurry 카레의증표 +RibbonMarkUncommon 가끔보는증표 +RibbonMarkRare 본적없는증표 +RibbonMarkRowdy 장난꾸러기증표 +RibbonMarkAbsentMinded 촐랑거리는증표 +RibbonMarkJittery 긴장의증표 +RibbonMarkExcited 기대의증표 +RibbonMarkCharismatic 카리스마의증표 +RibbonMarkCalmness 냉정의증표 +RibbonMarkIntense 정열의증표 +RibbonMarkZonedOut 방심의증표 +RibbonMarkJoyful 다행의증표 +RibbonMarkAngry 분노의증표 +RibbonMarkSmiley 미소의증표 +RibbonMarkTeary 비통의증표 +RibbonMarkUpbeat 쾌조의증표 +RibbonMarkPeeved 격렬의증표 +RibbonMarkIntellectual 이성의증표 +RibbonMarkFerocious 본능의증표 +RibbonMarkCrafty 교활의증표 +RibbonMarkScowling 두려움의증표 +RibbonMarkKindly 상냥함의증표 +RibbonMarkFlustered 동요의증표 +RibbonMarkPumpedUp 고양의증표 +RibbonMarkZeroEnergy 권태의증표 +RibbonMarkPrideful 자신의증표 +RibbonMarkUnsure 불신의증표 +RibbonMarkHumble 순박의증표 +RibbonMarkThorny 불순의증표 +RibbonMarkVigor 기력의증표 +RibbonMarkSlump 피곤의증표 \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/ko/text_Species_ko.txt b/PKHeX.Core/Resources/text/ko/text_Species_ko.txt index 4a73d2d87..984d5eac3 100644 --- a/PKHeX.Core/Resources/text/ko/text_Species_ko.txt +++ b/PKHeX.Core/Resources/text/ko/text_Species_ko.txt @@ -807,4 +807,85 @@ 두파팡 제라오라 멜탄 -멜메탈 \ No newline at end of file +멜메탈 +흥나숭 +채키몽 +고릴타 +염버니 +래비풋 +에이스번 +울머기 +누겔레온 +인텔리레온 +탐리스 +요씽리스 +파라꼬 +파크로우 +아머까오 +두루지벌레 +레돔벌레 +이올브 +훔처우 +폭슬라이 +꼬모카 +백솜모카 +우르 +배우르 +깨물부기 +갈가부기 +멍파치 +펄스멍 +탄동 +탄차곤 +석탄산 +과사삭벌레 +애프룡 +단지래플 +모래뱀 +사다이사 +윽우지 +찌로꼬치 +꼬치조 +일레즌 +스트린더 +태우지네 +다태우지네 +때때무노 +케오퍼스 +데인차 +포트데스 +몸지브림 +손지브림 +브리무음 +메롱꿍 +쏘겨모 +오롱털 +가로막구리 +나이킹 +산호르곤 +창파나이트 +마임꽁꽁 +데스판 +마빌크 +마휘핑 +대여르 +찌르성게 +누니머기 +모스노우 +돌헨진 +빙큐보 +에써르 +모르페코 +끼리동 +대왕끼리동 +파치래곤 +파치르돈 +어래곤 +어치르돈 +두랄루돈 +드라꼰 +드래런치 +드래펄트 +자시안 +자마젠타 +무한다이노 \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/ko/text_swsh_00000_ko.txt b/PKHeX.Core/Resources/text/ko/text_swsh_00000_ko.txt index 4d9440604..2415a39df 100644 --- a/PKHeX.Core/Resources/text/ko/text_swsh_00000_ko.txt +++ b/PKHeX.Core/Resources/text/ko/text_swsh_00000_ko.txt @@ -1 +1,163 @@ -todo \ No newline at end of file +－－－－－－－－－－ + +수수께끼의 장소 + +먼 곳 + +펄롱마을 + +꾸벅졸음숲 + +[~ 10] +[~ 11] +1번도로 + +브래시마을 + +브래시마을역 + +2번도로 + +엔진시티 + +엔진시티역 + +엔진스타디움 + +[~ 26] +[~ 27] +3번도로 + +가라르광산 + +4번도로 + +터프마을 + +터프스타디움 + +[~ 38] +[~ 39] +5번도로 + +[~ 42] +[~ 43] +바우마을 + +바우마을역 + +바우스타디움 + +[~ 50] +[~ 51] +엔진시티 변두리 + +제2광산 + +너클시티 + +너클시티역 + +너클스타디움 + +[~ 62] +[~ 63] +에너지플랜트 + +타워톱 + +6번도로 + +래터럴마을 + +래터럴스타디움 + +[~ 74] +[~ 75] +루미너스메이즈숲 + +아라베스크마을 + +아라베스크스타디움 + +[~ 82] +[~ 83] +7번도로 + +8번도로 + +8번도로 +모락모락 좁은 길 +9번도로 + +9번도로 +키르쿠스만 +9번도로 +스파이크마을 변두리 +키르쿠스마을 + +키르쿠스스타디움 + +[~ 100] +[~ 101] +스파이크마을 + +루트나인터널 + +10번도로 + +화이트힐역 + +슛시티 + +슛시티역 + +슛스타디움 +포켓몬리그본부 +슛스타디움 +선수대기실 +슛스타디움 + +모임의 공터 +와일드에리어 +화창한 초원 +와일드에리어 +햇살비추는숲 +와일드에리어 +감시탑 유적지 +와일드에리어 +터검니호 동쪽 +와일드에리어 +터검니호 서쪽 +와일드에리어 +터검니호의 눈동자 +와일드에리어 +밀로틱호 남쪽 +와일드에리어 +거인의 의자 +와일드에리어 +밀로틱호 북쪽 +와일드에리어 +엔진 리버사이드 +와일드에리어 +다리아래 벌판 +와일드에리어 +스톤즈들판 +와일드에리어 +모래먼지구덩이 +와일드에리어 +거인의 거울 연못 +와일드에리어 +너클 구릉 +와일드에리어 +거인의 모자 +와일드에리어 +역린호수 +와일드에리어 +와일드에리어역 + +배틀타워 + +로즈타워빌딩 + +어딘가의 굴 diff --git a/PKHeX.Core/Resources/text/ko/text_swsh_30000_ko.txt b/PKHeX.Core/Resources/text/ko/text_swsh_30000_ko.txt index 4d9440604..b26da0bcd 100644 --- a/PKHeX.Core/Resources/text/ko/text_swsh_30000_ko.txt +++ b/PKHeX.Core/Resources/text/ko/text_swsh_30000_ko.txt @@ -1 +1,19 @@ -todo \ No newline at end of file +통신교환 +통신교환 +관동지방 +성도지방 +호연지방 +신오지방 +아주 먼 땅 +－－－－－－－－－－ +하나지방 +칼로스지방 +포켓몬링크 +Pokémon GO +관동지방 +호연지방 +알로라지방 +포켓리조트 +성도지방 +Pokémon HOME +관동지방 \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/ko/text_swsh_40000_ko.txt b/PKHeX.Core/Resources/text/ko/text_swsh_40000_ko.txt index 4d9440604..e778371d7 100644 --- a/PKHeX.Core/Resources/text/ko/text_swsh_40000_ko.txt +++ b/PKHeX.Core/Resources/text/ko/text_swsh_40000_ko.txt @@ -1 +1,113 @@ -todo \ No newline at end of file +근사한 장소 +먼 곳 +포켓몬영화 +[~ 3] +포켓몬영화19 +포켓몬영화20 +포켓몬영화21 +포켓몬영화22 +포켓몬영화23 +포켓몬영화24 +포켓몬 애니메이션 +포켓몬센터 +PC도호쿠 +WCS +[~ 14] +WCS2019 +WCS2020 +WCS2021 +WCS2022 +WCS2023 +WCS2024 +Worlds +[~ 22] +Worlds2019 +Worlds2020 +Worlds2021 +Worlds2022 +Worlds2023 +Worlds2024 +VGE +[~ 30] +VGE2019 +VGE2020 +VGE2021 +VGE2022 +VGE2023 +VGE2024 +포켓몬이벤트 +배틀 대회 +게임 이벤트 +the Pokémon Daisuki Club +포켓몬 방송 +콘서트 +온라인 선물 +PGL +[~ 45] +포켓몬이벤트19 +포켓몬이벤트20 +포켓몬이벤트21 +포켓몬이벤트22 +포켓몬이벤트23 +포켓몬이벤트24 +포켓몬페스타 +[~ 53] +포켓몬페스타19 +포켓몬페스타20 +포켓몬페스타21 +포켓몬페스타22 +포켓몬페스타23 +포켓몬페스타24 +포켓파크 +[~ 61] +포켓파크2019 +포켓파크2020 +포켓파크2021 +포켓파크2022 +포켓파크2023 +포켓파크2024 +이벤트회장 +게임프리크 +스타디움 +VGC +[~ 72] +VGC2019 +VGC2020 +VGC2021 +VGC2022 +VGC2023 +VGC2024 +버추얼 콘솔 +Pokémon GO +포켓몬 뱅크 +a Pokémon shop +체험판 +몬스터볼 Plus +Pokémon HOME +[~ 86] +[~ 87] +[~ 88] +[~ 89] +[~ 90] +[~ 91] +[~ 92] +[~ 93] +[~ 94] +[~ 95] +[~ 96] +[~ 97] +[~ 98] +[~ 99] +[~ 100] +[~ 101] +[~ 102] +[~ 103] +[~ 104] +[~ 105] +[~ 106] +[~ 107] +[~ 108] +[~ 109] +[~ 110] +[~ 111] +[~ 112] \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/ko/text_swsh_60000_ko.txt b/PKHeX.Core/Resources/text/ko/text_swsh_60000_ko.txt index 4d9440604..09e457a80 100644 --- a/PKHeX.Core/Resources/text/ko/text_swsh_60000_ko.txt +++ b/PKHeX.Core/Resources/text/ko/text_swsh_60000_ko.txt @@ -1 +1,4 @@ -todo \ No newline at end of file +멀리 있는 사람 +맡기미집 +트레져헌터 +온천할머니 \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/ko/text_tradeswsh_ko.txt b/PKHeX.Core/Resources/text/ko/text_tradeswsh_ko.txt new file mode 100644 index 000000000..7d4cf0e99 --- /dev/null +++ b/PKHeX.Core/Resources/text/ko/text_tradeswsh_ko.txt @@ -0,0 +1,22 @@ +쩌니 +볼땡이 +솜사탕 +토게푸링 +암모리 +도리도리 +카면 +적지미 +푸르귀 +마임님 +직선 +조반니 +초미 +마이드 +보희 +로미오 +로미오 +이브 +백설 +백설 +춘식 +카푸어 \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/other/text_Ribbons_pt.txt b/PKHeX.Core/Resources/text/other/text_Ribbons_pt.txt deleted file mode 100644 index 30e894187..000000000 --- a/PKHeX.Core/Resources/text/other/text_Ribbons_pt.txt +++ /dev/null @@ -1,103 +0,0 @@ -RibbonChampionKalos Campião de Kalos -RibbonChampionG3Hoenn Campião de Hoenn (RSE) -RibbonChampionSinnoh Campião de Sinnoh -RibbonBestFriends Melhores Amigos -RibbonTraining Treino -RibbonBattlerSkillful Batalhador Hábil -RibbonBattlerExpert Batalhador Experiente -RibbonEffort Empenho -RibbonAlert Alerta -RibbonShock Choque -RibbonDowncast Desanimado -RibbonCareless Descuidado -RibbonRelax Descontraído -RibbonSnooze Dorminhoco -RibbonSmile Sorridente -RibbonGorgeous Deslumbrante -RibbonRoyal Nobre -RibbonGorgeousRoyal Nobre Deslumbrante -RibbonArtist Artista -RibbonFootprint Pegada -RibbonRecord Recorde -RibbonLegend Lenda -RibbonCountry País -RibbonNational Nacional -RibbonEarth Terra -RibbonWorld Mundo -RibbonClassic Clássico -RibbonPremier Premier -RibbonEvent Evento -RibbonBirthday Aniversário -RibbonSpecial Especial -RibbonSouvenir Lembrança -RibbonWishing Desejando -RibbonChampionBattle Campião de Batalha -RibbonChampionRegional Campião Regional -RibbonChampionNational Campião Nacional -RibbonChampionWorld Campião Mundial -RibbonCountMemoryContest Fitas de Concursos Passados -RibbonCountMemoryBattle Fitas de Batalhas Passadas -RibbonChampionG6Hoenn Campeão de Hoenn (ORAS) -RibbonContestStar Estrela de Concurso -RibbonMasterCoolness Mestre da Fixeza -RibbonMasterBeauty Mestre da Beleza -RibbonMasterCuteness Mestre da Fofura -RibbonMasterCleverness Mestre da Esperteza -RibbonMasterToughness Mestre da Tenacidade -RibbonG3Cool Fixeza (G3) -RibbonG3CoolSuper Fixeza Super -RibbonG3CoolHyper Fixeza Hyper -RibbonG3CoolMaster Fixeza Master -RibbonG3Beauty Beleza (G3) -RibbonG3BeautySuper Beleza Super -RibbonG3BeautyHyper Beleza Hyper -RibbonG3BeautyMaster Beleza Master -RibbonG3Cute Fofura (G3) -RibbonG3CuteSuper Fofura Super -RibbonG3CuteHyper Fofura Hyper -RibbonG3CuteMaster Fofura Master -RibbonG3Smart Esperteza (G3) -RibbonG3SmartSuper Esperteza Super -RibbonG3SmartHyper Esperteza Hyper -RibbonG3SmartMaster Esperteza Master -RibbonG3Tough Tenacidade (G3) -RibbonG3ToughSuper Tenacidade Super -RibbonG3ToughHyper Tenacidade Hyper -RibbonG3ToughMaster Tenacidade Master -RibbonG4Cool Fixeza (G4) -RibbonG4CoolGreat Fixeza Great -RibbonG4CoolUltra Fixeza Ultra -RibbonG4CoolMaster Fixeza Master -RibbonG4Beauty Beleza (G4) -RibbonG4BeautyGreat Beleza Great -RibbonG4BeautyUltra Beleza Ultra -RibbonG4BeautyMaster Beleza Master -RibbonG4Cute Fofura (G4) -RibbonG4CuteGreat Fofura Great -RibbonG4CuteUltra Fofura Ultra -RibbonG4CuteMaster Fofura Master -RibbonG4Smart Esperteza (G4) -RibbonG4SmartGreat Esperteza Great -RibbonG4SmartUltra Esperteza Ultra -RibbonG4SmartMaster Esperteza Master -RibbonG4Tough Tenacidade (G4) -RibbonG4ToughGreat Tenacidade Great -RibbonG4ToughUltra Tenacidade Ultra -RibbonG4ToughMaster Tenacidade Master -RibbonWinning Winning -RibbonVictory Victory -RibbonAbility Ability -RibbonAbilityGreat Great Ability -RibbonAbilityDouble Double Ability -RibbonAbilityMulti Multi Ability -RibbonAbilityPair Pair Ability -RibbonAbilityWorld World Ability -RibbonCountG3Cool Fixeza -RibbonCountG3Beauty Beleza -RibbonCountG3Cute Fofura -RibbonCountG3Smart Esperteza -RibbonCountG3Tough Tenacidade -RibbonChampionAlola Alola Champion -RibbonBattleRoyale Battle Royal Champion -RibbonBattleTreeGreat Battle Tree Great -RibbonBattleTreeMaster Battle Tree Master \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/zh/text_Abilities_zh.txt b/PKHeX.Core/Resources/text/zh/text_Abilities_zh.txt index 289c55092..337e9204b 100644 --- a/PKHeX.Core/Resources/text/zh/text_Abilities_zh.txt +++ b/PKHeX.Core/Resources/text/zh/text_Abilities_zh.txt @@ -231,4 +231,29 @@ 金属防护 幻影防守 棱镜装甲 -脑核之力 \ No newline at end of file +脑核之力 +不挠之剑 +不屈之盾 +自由者 +捡球 +棉絮 +螺旋尾鳍 +镜甲 +一口导弹 +坚毅 +蒸汽机 +庞克摇滚 +吐沙 +冰鳞粉 +熟成 +结冻头 +能量点 +拟态 +除障 +钢之意志 +灭亡之躯 +游魂 +一猩一意 +化学变化气体 +粉彩护幕 +饱了又饿 \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/zh/text_Forms_zh.txt b/PKHeX.Core/Resources/text/zh/text_Forms_zh.txt index 2a1079fc1..b64b3e255 100644 Binary files a/PKHeX.Core/Resources/text/zh/text_Forms_zh.txt and b/PKHeX.Core/Resources/text/zh/text_Forms_zh.txt differ diff --git a/PKHeX.Core/Resources/text/zh/text_GenLoc_zh.txt b/PKHeX.Core/Resources/text/zh/text_GenLoc_zh.txt index 4488e68eb..7082286bb 100644 --- a/PKHeX.Core/Resources/text/zh/text_GenLoc_zh.txt +++ b/PKHeX.Core/Resources/text/zh/text_GenLoc_zh.txt @@ -1,57 +1,57 @@ -某处 -第一个城镇 +某地 +一开始的城镇 家 朋友的家 -别人的房子 -热闹的小镇 -精品屋 +别人的家 +热闹的城镇 +时装店 商店 -普通小镇 -精灵中心 +质朴的小镇 +宝可梦中心 城堡 -酒店 -雾气的小镇 -微风吹过的小镇 -门 -河边小镇 -实验室 +旅馆 +充满神秘气息的城镇 +吹着风的城镇 +闸口 +河畔的城镇 +研究所 水族馆 -悬崖上的小镇 -华丽的城市 -精灵健身房 +悬崖上的城镇 +繁华的城镇 +宝可梦道馆 学校 大城市 -建筑 -时尚咖啡厅 -藏身处 -博物馆 -工作室 +大厦 +时髦的咖啡馆 +基地 +美术馆 +摄影棚 车站 -战场 -美容院 +对战场地 +美发沙龙 餐厅 -高档餐厅 -海滨城市 -高大建筑物内 -神秘气息的城市 -河畔城市 -白雪皑皑的城市 -精灵联赛 +高级餐厅 +海边的城镇 +高楼的内部 +充满神秘气息的城镇 +河边的城镇 +积雪的城镇 +宝可梦联盟 宫殿 -山洞 +洞窟 森林 -绿树成荫的道路 -滨江路 -宁静的道路 -盛开的道路 -饲育屋 -崎岖山路 -满是石头的路 -海边道路 -泥泞的路 -沙子路 -落叶路 -雪扫路 +林荫道 +沿河的道路 +恬静的道路 +鲜花盛开的道路 +培育屋 +险峻的山路 +乱石林立的地方 +看得见海的道路 +满是泥泞的道路 +飞沙走石的道路 +遍地落叶的道路 +积雪的道路 工厂 冠军之路 雪山 @@ -59,13 +59,22 @@ 田地 废墟 水路 -野生动物园 -秘密基地 -华丽大赛会场 -海洋深处 -幻之位置 +野外 大船 -火山小径 -小岛 +高空 +华丽现场大赛会场 神秘的地方 -天空 \ No newline at end of file +小岛 +积满灰尘的道路 +秘密基地 +深海海底 +梦幻般的地方 +看得见湖的城镇 +辽阔的草原 +竞技场 +寄放屋 +矿山 +山间的城镇 +萧条的城镇 +隧道 +危险的地方 \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/zh/text_Items_zh.txt b/PKHeX.Core/Resources/text/zh/text_Items_zh.txt index ec6d7da07..37017c5f1 100644 --- a/PKHeX.Core/Resources/text/zh/text_Items_zh.txt +++ b/PKHeX.Core/Resources/text/zh/text_Items_zh.txt @@ -1,4 +1,4 @@ -无 +无 大师球 高级球 超级球 @@ -36,22 +36,22 @@ 元气根 万能粉 复活草 -PP单项小补剂 -PP单项全补剂 -PP多项小补剂 -PP多项全补剂 +ＰＰ单项小补剂 +ＰＰ单项全补剂 +ＰＰ多项小补剂 +ＰＰ多项全补剂 釜炎仙贝 树果汁 圣灰 -HP增强剂 +ＨＰ增强剂 攻击增强剂 防御增强剂 速度增强剂 特攻增强剂 神奇糖果 -PP提升剂 +ＰＰ提升剂 特防增强剂 -PP极限提升剂 +ＰＰ极限提升剂 森之羊羹 能力防守 要害攻击 @@ -326,104 +326,104 @@ PP极限提升剂 灵界之布 锐利之爪 锐利之牙 -招式学习器01 -招式学习器02 -招式学习器03 -招式学习器04 -招式学习器05 -招式学习器06 -招式学习器07 -招式学习器08 -招式学习器09 -招式学习器10 -招式学习器11 -招式学习器12 -招式学习器13 -招式学习器14 -招式学习器15 -招式学习器16 -招式学习器17 -招式学习器18 -招式学习器19 -招式学习器20 -招式学习器21 -招式学习器22 -招式学习器23 -招式学习器24 -招式学习器25 -招式学习器26 -招式学习器27 -招式学习器28 -招式学习器29 -招式学习器30 -招式学习器31 -招式学习器32 -招式学习器33 -招式学习器34 -招式学习器35 -招式学习器36 -招式学习器37 -招式学习器38 -招式学习器39 -招式学习器40 -招式学习器41 -招式学习器42 -招式学习器43 -招式学习器44 -招式学习器45 -招式学习器46 -招式学习器47 -招式学习器48 -招式学习器49 -招式学习器50 -招式学习器51 -招式学习器52 -招式学习器53 -招式学习器54 -招式学习器55 -招式学习器56 -招式学习器57 -招式学习器58 -招式学习器59 -招式学习器60 -招式学习器61 -招式学习器62 -招式学习器63 -招式学习器64 -招式学习器65 -招式学习器66 -招式学习器67 -招式学习器68 -招式学习器69 -招式学习器70 -招式学习器71 -招式学习器72 -招式学习器73 -招式学习器74 -招式学习器75 -招式学习器76 -招式学习器77 -招式学习器78 -招式学习器79 -招式学习器80 -招式学习器81 -招式学习器82 -招式学习器83 -招式学习器84 -招式学习器85 -招式学习器86 -招式学习器87 -招式学习器88 -招式学习器89 -招式学习器90 -招式学习器91 -招式学习器92 -秘传学习器01 -秘传学习器02 -秘传学习器03 -秘传学习器04 -秘传学习器05 -秘传学习器06 +招式学习器０１ +招式学习器０２ +招式学习器０３ +招式学习器０４ +招式学习器０５ +招式学习器０６ +招式学习器０７ +招式学习器０８ +招式学习器０９ +招式学习器１０ +招式学习器１１ +招式学习器１２ +招式学习器１３ +招式学习器１４ +招式学习器１５ +招式学习器１６ +招式学习器１７ +招式学习器１８ +招式学习器１９ +招式学习器２０ +招式学习器２１ +招式学习器２２ +招式学习器２３ +招式学习器２４ +招式学习器２５ +招式学习器２６ +招式学习器２７ +招式学习器２８ +招式学习器２９ +招式学习器３０ +招式学习器３１ +招式学习器３２ +招式学习器３３ +招式学习器３４ +招式学习器３５ +招式学习器３６ +招式学习器３７ +招式学习器３８ +招式学习器３９ +招式学习器４０ +招式学习器４１ +招式学习器４２ +招式学习器４３ +招式学习器４４ +招式学习器４５ +招式学习器４６ +招式学习器４７ +招式学习器４８ +招式学习器４９ +招式学习器５０ +招式学习器５１ +招式学习器５２ +招式学习器５３ +招式学习器５４ +招式学习器５５ +招式学习器５６ +招式学习器５７ +招式学习器５８ +招式学习器５９ +招式学习器６０ +招式学习器６１ +招式学习器６２ +招式学习器６３ +招式学习器６４ +招式学习器６５ +招式学习器６６ +招式学习器６７ +招式学习器６８ +招式学习器６９ +招式学习器７０ +招式学习器７１ +招式学习器７２ +招式学习器７３ +招式学习器７４ +招式学习器７５ +招式学习器７６ +招式学习器７７ +招式学习器７８ +招式学习器７９ +招式学习器８０ +招式学习器８１ +招式学习器８２ +招式学习器８３ +招式学习器８４ +招式学习器８５ +招式学习器８６ +招式学习器８７ +招式学习器８８ +招式学习器８９ +招式学习器９０ +招式学习器９１ +招式学习器９２ +秘传学习器０１ +秘传学习器０２ +秘传学习器０３ +秘传学习器０４ +秘传学习器０５ +秘传学习器０６ ？？？ ？？？ 探险套装 @@ -500,36 +500,36 @@ PP极限提升剂 竞赛球 公园球 相册 -GB播放器 +ＧＢ播放器 海声铃铛 愤怒馒头 -数据卡01 -数据卡02 -数据卡03 -数据卡04 -数据卡05 -数据卡06 -数据卡07 -数据卡08 -数据卡09 -数据卡10 -数据卡11 -数据卡12 -数据卡13 -数据卡14 -数据卡15 -数据卡16 -数据卡17 -数据卡18 -数据卡19 -数据卡20 -数据卡21 -数据卡22 -数据卡23 -数据卡24 -数据卡25 -数据卡26 -数据卡27 +数据卡０１ +数据卡０２ +数据卡０３ +数据卡０４ +数据卡０５ +数据卡０６ +数据卡０７ +数据卡０８ +数据卡０９ +数据卡１０ +数据卡１１ +数据卡１２ +数据卡１３ +数据卡１４ +数据卡１５ +数据卡１６ +数据卡１７ +数据卡１８ +数据卡１９ +数据卡２０ +数据卡２１ +数据卡２２ +数据卡２３ +数据卡２４ +数据卡２５ +数据卡２６ +数据卡２７ 草绿色宝珠 上锁的容器 朱红色宝珠 @@ -616,9 +616,9 @@ GB播放器 要害攻击３ 光明石 黑暗石 -招式学习器93 -招式学习器94 -招式学习器95 +招式学习器９３ +招式学习器９４ +招式学习器９５ 即时通讯器 神石 配送物品１ @@ -688,18 +688,18 @@ GB播放器 亚开果 香罗果 莲叶童子喷壶 -招式学习器96 -招式学习器97 -招式学习器98 -招式学习器99 -招式学习器100 +招式学习器９６ +招式学习器９７ +招式学习器９８ +招式学习器９９ +招式学习器１００ 发电厂通行证 超级环 似珍石 常见石 折价券 电梯钥匙 -TMV自由票 +ＴＭＶ自由票 卡洛斯勋章 探险心得 神秘摆设 @@ -726,7 +726,7 @@ TMV自由票 给大吾的信 无限船票 探测器 -GOGO护目镜 +ＧＯＧＯ护目镜 陨石 １号客房的钥匙 ２号客房的钥匙 @@ -735,7 +735,7 @@ GOGO护目镜 仓库钥匙 得文侦测镜 船票 -秘传学习器07 +秘传学习器０７ 得文潜水装备 演出礼服 演出礼裙 @@ -945,7 +945,7 @@ GOGO护目镜 奈克洛露奈合体器 奈克洛索尔合体器 奈克洛露奈合体器 -伊利马的一般Ｚ +伊利马一般Ｚ 留下的精灵球 孵蛋碰碰 优惠碰碰 @@ -954,8 +954,8 @@ GOGO护目镜 亲密碰碰 相遇碰碰 隐身碰碰 -HP回复碰碰 -PP回复碰碰 +ＨＰ回复碰碰 +ＰＰ回复碰碰 加油碰碰 捕捉碰碰 元气糖果 @@ -964,18 +964,18 @@ PP回复碰碰 知识糖果 心灵糖果 敏捷糖果 -元气糖果L -力量糖果L -守护糖果L -知识糖果L -心灵糖果L -敏捷糖果L -元气糖果XL -力量糖果XL -守护糖果XL -知识糖果XL -心灵糖果XL -敏捷糖果XL +元气糖果Ｌ +力量糖果Ｌ +守护糖果Ｌ +知识糖果Ｌ +心灵糖果Ｌ +敏捷糖果Ｌ +元气糖果ＸＬ +力量糖果ＸＬ +守护糖果ＸＬ +知识糖果ＸＬ +心灵糖果ＸＬ +敏捷糖果ＸＬ 妙蛙种子的糖果 小火龙的糖果 杰尼龟的糖果 @@ -1055,4 +1055,525 @@ PP回复碰碰 超梦的糖果 梦幻的糖果 美录坦的糖果 -鸭嘴火兽的糖果 \ No newline at end of file +鸭嘴火兽的糖果 +？？？ +？？？ +？？？ +？？？ +？？？ +？？？ +？？？ +？？？ +？？？ +？？？ +？？？ +？？？ +？？？ +？？？ +？？？ +？？？ +推荐函 +宝可梦盒 +许愿星 +极巨腕带 +？？？ +？？？ +钓竿 +洛托姆自行车 +？？？ +？？？ +粗绞肉香肠 +饱伯罐头 +巴哈罐头 +豆子罐头 +吐司面包 +通心粉 +袋装蕈菇 +烟熏尾巴 +粗枝大葱 +特选苹果 +细骨 +袋装土豆 +水边香草 +袋装蔬菜 +炸物拼盘 +水煮蛋 +露营组合 +？？？ +？？？ +腐朽的剑 +腐朽的盾 +化石鸟 +化石鱼 +化石龙 +化石海兽 +草莓糖饰 +爱心糖饰 +野莓糖饰 +幸运草糖饰 +花朵糖饰 +星星糖饰 +蝴蝶结糖饰 +甜甜苹果 +酸酸苹果 +爽喉喷雾 +避难背包 +厚底靴 +打空保险 +客房服务 +万能伞 +经验糖果ＸＳ +经验糖果Ｓ +经验糖果Ｍ +经验糖果Ｌ +经验糖果ＸＬ +极巨糖果 +招式记录００ +招式记录０１ +招式记录０２ +招式记录０３ +招式记录０４ +招式记录０５ +招式记录０６ +招式记录０７ +招式记录０８ +招式记录０９ +招式记录１０ +招式记录１１ +招式记录１２ +招式记录１３ +招式记录１４ +招式记录１５ +招式记录１６ +招式记录１７ +招式记录１８ +招式记录１９ +招式记录２０ +招式记录２１ +招式记录２２ +招式记录２３ +招式记录２４ +招式记录２５ +招式记录２６ +招式记录２７ +招式记录２８ +招式记录２９ +招式记录３０ +招式记录３１ +招式记录３２ +招式记录３３ +招式记录３４ +招式记录３５ +招式记录３６ +招式记录３７ +招式记录３８ +招式记录３９ +招式记录４０ +招式记录４１ +招式记录４２ +招式记录４３ +招式记录４４ +招式记录４５ +招式记录４６ +招式记录４７ +招式记录４８ +招式记录４９ +招式记录５０ +招式记录５１ +招式记录５２ +招式记录５３ +招式记录５４ +招式记录５５ +招式记录５６ +招式记录５７ +招式记录５８ +招式记录５９ +招式记录６０ +招式记录６１ +招式记录６２ +招式记录６３ +招式记录６４ +招式记录６５ +招式记录６６ +招式记录６７ +招式记录６８ +招式记录６９ +招式记录７０ +招式记录７１ +招式记录７２ +招式记录７３ +招式记录７４ +招式记录７５ +招式记录７６ +招式记录７７ +招式记录７８ +招式记录７９ +招式记录８０ +招式记录８１ +招式记录８２ +招式记录８３ +招式记录８４ +招式记录８５ +招式记录８６ +招式记录８７ +招式记录８８ +招式记录８９ +招式记录９０ +招式记录９１ +招式记录９２ +招式记录９３ +招式记录９４ +招式记录９５ +招式记录９６ +招式记录９７ +招式记录９８ +招式记录９９ +招式学习器００ +怕寂寞薄荷 +固执薄荷 +顽皮薄荷 +勇敢薄荷 +大胆薄荷 +淘气薄荷 +乐天薄荷 +悠闲薄荷 +内敛薄荷 +慢吞吞薄荷 +马虎薄荷 +冷静薄荷 +温和薄荷 +温顺薄荷 +慎重薄荷 +自大薄荷 +胆小薄荷 +急躁薄荷 +爽朗薄荷 +天真薄荷 +认真薄荷 +许愿星块 +破裂的茶壶 +缺损的茶壶 +厉害耳塞 +袋装果实 +哞哞乳酪 +香料组合 +鲜鲜奶油 +即食咖喱 +椰奶 +即食面 +即食肉排 +超极粉 +许愿星碎片 +洛托姆自行车 +防晃护符 +？？？ +陈旧的信 +乐队的签名 +索妮亚的书 +？？？ +？？？ +？？？ +？？？ +？？？ +？？？ +洛托姆型录 +★And458 +★And15 +★And337 +★And603 +★And390 +★Sgr6879 +★Sgr6859 +★Sgr6913 +★Sgr7348 +★Sgr7121 +★Sgr6746 +★Sgr7194 +★Sgr7337 +★Sgr7343 +★Sgr6812 +★Sgr7116 +★Sgr7264 +★Sgr7597 +★Del7882 +★Del7906 +★Del7852 +★Psc596 +★Psc361 +★Psc510 +★Psc437 +★Psc8773 +★Lep1865 +★Lep1829 +★Boo5340 +★Boo5506 +★Boo5435 +★Boo5602 +★Boo5733 +★Boo5235 +★Boo5351 +★Hya3748 +★Hya3903 +★Hya3418 +★Hya3482 +★Hya3845 +★Eri1084 +★Eri472 +★Eri1666 +★Eri897 +★Eri1231 +★Eri874 +★Eri1298 +★Eri1325 +★Eri984 +★Eri1464 +★Eri1393 +★Eri850 +★Tau1409 +★Tau1457 +★Tau1165 +★Tau1791 +★Tau1910 +★Tau1346 +★Tau1373 +★Tau1412 +★CMa2491 +★CMa2693 +★CMa2294 +★CMa2827 +★CMa2282 +★CMa2618 +★CMa2657 +★CMa2646 +★UMa4905 +★UMa4301 +★UMa5191 +★UMa5054 +★UMa4295 +★UMa4660 +★UMa4554 +★UMa4069 +★UMa3569 +★UMa3323 +★UMa4033 +★UMa4377 +★UMa4375 +★UMa4518 +★UMa3594 +★Vir5056 +★Vir4825 +★Vir4932 +★Vir4540 +★Vir4689 +★Vir5338 +★Vir4910 +★Vir5315 +★Vir5359 +★Vir5409 +★Vir5107 +★Ari617 +★Ari553 +★Ari546 +★Ari951 +★Ori1713 +★Ori2061 +★Ori1790 +★Ori1903 +★Ori1948 +★Ori2004 +★Ori1852 +★Ori1879 +★Ori1899 +★Ori1543 +★Cas21 +★Cas168 +★Cas403 +★Cas153 +★Cas542 +★Cas219 +★Cas265 +★Cnc3572 +★Cnc3208 +★Cnc3461 +★Cnc3449 +★Cnc3429 +★Cnc3627 +★Cnc3268 +★Cnc3249 +★Com4968 +★Crv4757 +★Crv4623 +★Crv4662 +★Crv4786 +★Aur1708 +★Aur2088 +★Aur1605 +★Aur2095 +★Aur1577 +★Aur1641 +★Aur1612 +★Pav7790 +★Cet911 +★Cet681 +★Cet188 +★Cet539 +★Cet804 +★Cep8974 +★Cep8162 +★Cep8238 +★Cep8417 +★Cen5267 +★Cen5288 +★Cen551 +★Cen5459 +★Cen5460 +★CMi2943 +★CMi2845 +★Equ8131 +★Vul7405 +★UMi424 +★UMi5563 +★UMi5735 +★UMi6789 +★Crt4287 +★Lyr7001 +★Lyr7178 +★Lyr7106 +★Lyr7298 +★Ara6585 +★Sco6134 +★Sco6527 +★Sco6553 +★Sco5953 +★Sco5984 +★Sco6508 +★Sco6084 +★Sco5944 +★Sco6630 +★Sco6027 +★Sco6247 +★Sco6252 +★Sco5928 +★Sco6241 +★Sco6165 +★Tri544 +★Leo3982 +★Leo4534 +★Leo4357 +★Leo4057 +★Leo4359 +★Leo4031 +★Leo3852 +★Leo3905 +★Leo3773 +★Gru8425 +★Gru8636 +★Gru8353 +★Lib5685 +★Lib5531 +★Lib5787 +★Lib5603 +★Pup3165 +★Pup3185 +★Pup3045 +★Cyg7924 +★Cyg7417 +★Cyg7796 +★Cyg8301 +★Cyg7949 +★Cyg7528 +★Oct7228 +★Col1956 +★Col2040 +★Col2177 +★Gem2990 +★Gem2891 +★Gem2421 +★Gem2473 +★Gem2216 +★Gem2777 +★Gem2650 +★Gem2286 +★Gem2484 +★Gem2930 +★Peg8775 +★Peg8781 +★Peg39 +★Peg8308 +★Peg8650 +★Peg8634 +★Peg8684 +★Peg8450 +★Peg8880 +★Peg8905 +★Oph6556 +★Oph6378 +★Oph6603 +★Oph6149 +★Oph6056 +★Oph6075 +★Ser5854 +★Ser7141 +★Ser5879 +★Her6406 +★Her6148 +★Her6410 +★Her6526 +★Her6117 +★Her6008 +★Per936 +★Per1017 +★Per1131 +★Per1228 +★Per834 +★Per941 +★Phe99 +★Phe338 +★Vel3634 +★Vel3485 +★Vel3734 +★Aqr8232 +★Aqr8414 +★Aqr8709 +★Aqr8518 +★Aqr7950 +★Aqr8499 +★Aqr8610 +★Aqr8264 +★Cru4853 +★Cru4730 +★Cru4763 +★Cru4700 +★Cru4656 +★PsA8728 +★TrA6217 +★Cap7776 +★Cap7754 +★Cap8278 +★Cap8322 +★Cap7773 +★Sge7479 +★Car2326 +★Car3685 +★Car3307 +★Car3699 +★Dra5744 +★Dra5291 +★Dra6705 +★Dra6536 +★Dra7310 +★Dra6688 +★Dra4434 +★Dra6370 +★Dra7462 +★Dra6396 +★Dra6132 +★Dra6636 +★CVn4915 +★CVn4785 +★CVn4846 +★Aql7595 +★Aql7557 +★Aql7525 +★Aql7602 +★Aql7235 \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/zh/text_Memories_zh.txt b/PKHeX.Core/Resources/text/zh/text_Memories_zh.txt index f7432ff90..a2493b8ac 100644 --- a/PKHeX.Core/Resources/text/zh/text_Memories_zh.txt +++ b/PKHeX.Core/Resources/text/zh/text_Memories_zh.txt @@ -1,4 +1,4 @@ - + 宝可梦记得 宝可梦记得 @@ -36,73 +36,93 @@ 某一道具 某一技能 宝可梦 -这只宝可梦好像有很美好的回忆，但是它似乎想不起来了…… -{0}和{1}的第一次相遇在……{2}。{1}朝它使用了精灵球，之后他们就开始一起旅行了。 -{0}从蛋中孵化并且看见{1}第一眼的地方是在……{2}。 -{0}和{1}相遇的地方是……{2}。 -{0}在{2}通过通讯交换遇见了{1}，他们随后成了朋友。 -{0}和{1}一起去了宝可梦中心/友好商店，购买了{2}。 -{0}和{1}一起去了{2}的宝可梦中心并且恢复了它疲惫的身体。 -{0}和{1}一起垂钓，之后他们捕获了{2}。 -{0}和{1}一起垂钓，但是上钩的宝可梦逃跑了！ -{0}看见{1}关心{2}。 -{0}被{1}关心了。 -{0}和{1}一起去买服饰。 -{0}在{1}那里时学会了{2}。 -{0}帮助{1}从蛋里孵化了{2}。 -{0}和{1}一起捕获了{2}。 -当{0}陷入麻烦时，{1}使用了{2}。 -{0}在{1}的指示下使用了{2}，但是并没有什么效果。 -{0}和{1}一起对战并且打败了{2}。 -{0}被{2}打败了，随后和{1}一起逃走了。 -{0}和{1}在{2}的时候变强了然后进化了。 -{0}载着{1}在水上冲浪。 -{0}看见{2}载着{1}在水上冲浪。 -{0}和{1}一起对战并且打败了道馆训练家。 -当{1}/{0}挑战对战宅第的时候，{0}/{1}感到非常紧张。 -{0}载着{1}飞翔到了{2}。 -{0}和{1}都被突然蹦出的{2}吓了一跳。 -{0}看见{1}使用了{2}。 -{0}和{1}一起对战并且打败了冠军。 -{0}和{1}一起完成了他/她的宝可梦图鉴。 -{0}和{1}一起遇见了{2}。 -{0}和{1}一起对战并且打败了对战女城主。 -{1}在{2}使用探宝器时，{0}也在搜索隐藏道具。 -{0}和{1}在{2}一起乘上自行车。 -{0}和{1}在{2}一起用城镇地图查看一个地方。 -{0}和{1}一起种下了{2}并且想象大丰收的情景。 -{0}在{2}在{1}的指示下自豪地使用了劲力。 -{0}在{2}在{1}的指示下自豪地使用了一字斩。 -{0}在{2}在{1}的指示下用心地打碎了岩石。 -{0}载着{1}攀上了瀑布。 -{0}看见{1}在{2}神神秘秘地捡起了什么东西。 -{1}让{0}带上了很有用的携带道具，比如{2}。 -{0}和{1}一起进入了冠军冠军。 -{0}和{1}在{2}一起查看了标志。 -火车载着{1}和{0}时，它对火车的速度留下了深刻的印象。 -{0}和{1}在一起使用了神奇追踪并且遇见了{2}。 -当{2}跳出时，{0}和{1}都被吓到并且逃跑了。 -{0}和{1}一起挑战试炼屋并且获得了高分。 -{0}在和{1}一起拜访检测员时紧张地盯着他。 -{0}和{1}一起拜访技能遗忘爷爷并忘记了{2}。 -{0}在{1}的指示下回想起了{2}。 -{0}被{1}寄存在了饲育屋，和{2}在一起。 -当{1}去ID抽奖抽到{2}时，{0}很开心。 -当{1}在{2}使用喷雾器时，{0}和他/她在一起。 -{0}和{1}一起进行很累的训练。 -{0}和{1}一起搭乘电梯。 -{0}和{1}一起去拜访姓名判断师并且获得了一个命中注定的绰号。 -{0}和{1}一起去服装店试衣服，但最后什么也没买就走了。 -{0}和{1}一起去密阿雷市的餐厅并且吃到饱。 -{0}被{1}带去拜访一位女士并且接受了细心照顾。 -{0}和{1}一起在{2}翻垃圾桶。 -{0}和{1}一起对战{2}时陷入绝境，不得不使用了挣扎。 -{0}和{1}一起从高塔顶端俯瞰世界。 -{0}和{1}一起在一个镜子洞窟里看见了它自己。 -{0}和{1}一起去一个森林时差点走失了。 -{0}和{1}一起去了一个工厂并参观了一些很复杂的机械。 -{0}和{1}一起建造了一个秘密基地。 -{0}和{1}一起参加了华丽大赛并感动了很多人。 -{0}和{1}一起参加了华丽大赛并获得了优胜。 -{0}和{1}一起在天空中翱翔并去了很多地方。 -{0}和{1}一起潜水，探索海底的世界。 \ No newline at end of file +{0}好像拥有美好的回忆， 但它似乎有点想不起来了…… +{0}在 {2} 与{1}相遇。 在进入了精灵球之后， 和{1}一起踏上旅途。 {3} {4}。 +{0}在 {2} 从蛋里破壳而出时第一次与 {1}相遇。 {3} {4}。 +{0}与 {1}相遇于 {2}。 {3} {4}。 +{0}在 {2} 通过宝可梦交换成为了 {1}的伙伴。 {3} {4}。 +{0}曾经和 {1}去宝可梦中心 买了{2}。 {3} {4}。 +{0}曾经和 {1}一起去 宝可梦中心回复了疲劳的身体。 {3} {4}。 +在{0}和 {1}一起钓鱼的时候， 钓到了{2}。 {3} {4}。 +在{0}和 {1}一起钓鱼的时候， {1}放跑了 好不容易钓起来的宝可梦。 {3} {4}。 +{0}曾经看到 {1}疼爱 {2}。 {3} {4}。 +{0}曾经从 {1}那里得到过零食。 {3} {4}。 +{0}曾经和 {1}一起去买衣服。 {3} {4}。 +{0}在 {1}让自己 学会了{2}的时候， {3} {4}。 +{0}在 {1}帮忙孵化了 {2}的蛋的时候， {3} {4}。 +{0}在 {1}捉住了 {2}的时候， {3} {4}。 +在{0}陷入危机时， {1}使用了 {2}来帮助它。 {3} {4}。 +{0}曾经根据 {1}的指示， 使出了{2}， 但对对手没有效果。 {3} {4}。 +{0}曾经和 {1}一起并肩作战， 合力击败了{2}。 {3} {4}。 +{0}在 与{2}的对战中败退， 和{1}一起逃走。 {3} {4}。 +{0}受到 {1}的培育， 在{2} 进化了。 {3} {4}。 +{0}曾经使出冲浪， 让{1}骑在自己身上。 {3} {4}。 +{0}曾经看到 {2}让 {1}骑在它身上。 {3} {4}。 +{0}曾经和 {1}一起并肩作战， 战胜了道馆馆主。 {3} {4}。 +{0}曾经在 {1}挑战对战屋 的时候紧张过了头。 {3} {4}。 +{0}曾经使出飞翔， 把{1}送到了 {2}。 {3} {4}。 +{0}和 {1}曾经被突然扑过来的 {2}吓了一跳。 {3} {4}。 +{0}曾经看着 {1} 使用了{2}。 {3} {4}。 +{0}曾经和 {1}一起与冠军对战， 并且取得了胜利。 {3} {4}。 +{0}见证了 {1}完成宝可梦图鉴。 {3} {4}。 +{0}曾经 和{1}一起 遇到了{2}。 {3} {4}。 +{0}见证了 {1}在最高峰的对战中称霸。 {3} {4}。 +{0}和 {1}在 {2} 用探宝器找到了隐藏的道具。 {3} {4}。 +{0}曾经和 {1}一起骑自行车驶过 {2}。 {3} {4}。 +{0}曾经和 {1}一起在 {2} 使用城镇地图确认目的地。 {3} {4}。 +{0}曾经和 {1}一起 把{2}埋进土里， 想象以后会收获许许多多的果实。 {3} {4}。 +{0}曾经根据 {1}的指示， 在{2} 使出了引以为傲的怪力。 {3} {4}。 +{0}曾经根据 {1}的指示， 在{2} 使出了居合斩。 {3} {4}。 +{0}曾经根据 {1}的指示， 在{2} 奋力击碎了岩石。 {3} {4}。 +{0}曾经 让{1}骑在自己身上， 在{2} 使出了攀瀑。 {3} {4}。 +{0}曾经看到 {1}在 {2} 偷偷地拾起了什么东西。 {3} {4}。 +{1}曾经悠悠地 让{0} 携带{2}。 {3} {4}。 +{0}曾经和 {1}一起迈向冠军之路。 {3} {4}。 +{0}曾经和 {1}一起在 {2} 阅读提示牌。 {3} {4}。 +{0}曾经因为和 {1}一起坐的列车速度飞快， 而觉得很感动。 {3} {4}。 +{0}曾经和 {1}一起用宝可追踪 找到{2}。 {3} {4}。 +{0}曾经被突然扑过来的 {2}吓了一跳， 和{1}一起逃得远远的。 {3} {4}。 +{0}曾经和 {1}一起挑战试炼屋， 并且留下了好成绩。 {3} {4}。 +{0}曾经被 {1}介绍来的评定员 从头到尾盯着看了个不停。 {3} {4}。 +{0}曾经因为 {1}介绍来的遗忘爷爷 而忘记了{2}。 {3} {4}。 +{0}曾经根据 {1}的指示， 回忆起了{2}。 {3} {4}。 +{0}曾经和 {2}一起被 {1}寄放到培育屋里。 {3} {4}。 +{0}曾经很羡慕 {1}通过抽签 得到了{2}。 {3} {4}。 +{0}曾经看到 {1}在 {2} 使用了除虫喷雾。 {3} {4}。 +{0}曾经和 {1}一起 经历过严格的特训。 {3} {4}。 +{0}曾经和 {1}一起乘上电梯。 {3} {4}。 +{0}曾经被 {1}带到姓名鉴定师那里， 得到了一个命中注定的名字。 {3} {4}。 +{0}曾经和 {1}一起 去时装店试穿了不少服装， 但最后什么都没买就回去了。 {3} {4}。 +{0}曾经和 {1}一起 去高级餐厅吃了个饱。 {3} {4}。 +{0}曾经被 {1}带到 漂亮的大姐姐那里受到百般疼爱。 {3} {4}。 +{0}曾经和 {1}一起 在{2} 翻过垃圾箱。 {3} {4}。 +{0}曾经 在和{1}一起 与{2}对战时陷入绝境， 不得不使出了挣扎。 {3} {4}。 +{0}曾经和 {1}一起从 高塔顶端俯瞰世界。 {3} {4}。 +{0}曾经和 {1}在一个镜子洞窟里 看到了镜中的自己。 {3} {4}。 +{0}曾经和 {1}在探索森林时 险些迷失了方向。 {3} {4}。 +{0}曾经和 {1}一起在工厂里看到了 许多看上去复杂难懂的机器。 {3} {4}。 +{0}在{1} 建立秘密基地的时候也在场。 {3} {4}。 +{0}和 {1}一起在 华丽大赛中表演时，台下座无虚席。 {3} {4}。 +{0}曾经和 {1}一起参加华丽大赛， 并最终赢得胜利。 {3} {4}。 +{0}曾经和 {1}一起在天空中翱翔， 飞到各种各样的地方。 {3} {4}。 +{0}曾经根据 {1}的指示 潜到海的深处探索海底。 {3} {4}。 +{0}曾经和 {1}一起坐在 {2}的长椅上。 {3} {4}。 +{0}曾经和 {1}一起 与极巨化的{2}展开激战。 {3} {4}。 +{0}曾经受到 {1}的指示而极巨化， 与{2}展开激战。 {3} {4}。 +{0}曾经和 {1}一起露营。 {3} {4}。 +{0}曾经和 {1}一起制作料理。 {3} {4}。 +{0}曾经和 {2}一起被 {1}寄放到培育屋里。 {3} {4}。 +{0}曾经在宝可梦中心 为{1}庆祝生日。 {3} {4}。 +{0}在和{1} 一起去美发沙龙的时候， 看到过{1}为发型而纠结。 {3} {4}。 +{0}曾经在 和{1}一起走路时 被雨淋成了落汤鸡。 {3} {4}。 +{0}曾经和 {1}一起 参加了速度刺激的越野赛。 {3} {4}。 +{0}曾经在盒子里 一边想着{1}一边研究 如何使出{2}。 {3} {4}。 +{0}为了得到 {1}的夸奖， 曾经在盒子里练习 {2}的帅气造型。 {3} {4}。 +{0}曾经在盒子里 和{2}一起 讨论有关{1}的事。 {3} {4}。 +{0}曾经和 在盒子里交到的好朋友 {2}一起研究招式， 憧憬着有朝一日能够得到 {1}的认可。 {3} {4}。 +{0}曾经在盒子里 担心{1}会不会在找 自己带着的{2}。 {3} {4}。 +{0}曾经在 {1}打开盒子查看 自己的状况时紧张得移开了视线。 {3} {4}。 +在盒子里听说{1}已经抵达 {2}时， {0}曾经 在脑海里想象了那幅场景。 {3} {4}。 +{0}曾经在盒子里 为{1}的事 和{2}争吵。 {3} {4}。 +{0}曾经在盒子里 思考{1}为什么会 让它携带{2}。 {3} {4}。 +{0}曾经 在盒子里梦见{1} 使出了{2}， 真是个不可思议的梦。 {3} {4}。 \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/zh/text_Moves_zh.txt b/PKHeX.Core/Resources/text/zh/text_Moves_zh.txt index 0d8312e43..dca019959 100644 --- a/PKHeX.Core/Resources/text/zh/text_Moves_zh.txt +++ b/PKHeX.Core/Resources/text/zh/text_Moves_zh.txt @@ -1,4 +1,4 @@ -――――― +――――― 拍击 空手劈 连环巴掌 @@ -661,7 +661,7 @@ 迎头一击 碉堡 缝影 -DD金勾臂 +ＤＤ金勾臂 泡影的咏叹调 冰锤 花疗 @@ -696,7 +696,7 @@ DD金勾臂 遮天蔽日暗影箭 极恶飞跃粉碎击 海神庄严交响乐 -巨人卫士·阿罗拉 +巨人卫士・阿罗拉 七星夺魂腿 驾雷驭电戏冲浪 认真起来大爆击 @@ -740,4 +740,58 @@ DD金勾臂 冰冰霜冻 亮亮风暴 砰砰击破 -钢拳双击 \ No newline at end of file +钢拳双击 +极巨防壁 +极巨炮 +狙击 +紧咬不放 +大快朵颐 +背水一战 +沥青射击 +魔法粉 +龙箭 +茶会 +蛸固 +电喙 +鳃咬 +换场 +极巨火爆 +极巨虫蛊 +极巨闪电 +极巨攻击 +极巨拳斗 +极巨幽魂 +极巨寒冰 +极巨酸毒 +极巨水流 +极巨飞冲 +极巨妖精 +极巨龙骑 +极巨超能 +极巨岩石 +极巨大地 +极巨恶霸 +极巨草原 +极巨钢铁 +魂舞烈音爆 +扑击 +装饰 +鼓击 +捕兽夹 +火焰球 +巨兽斩 +巨兽弹 +气场轮 +广域破坏 +木枝突刺 +破音 +苹果酸 +万有引力 +灵魂冲击 +神奇蒸汽 +生命水滴 +拦堵 +假跪真撞 +流星突击 +无极光束 +铁蹄光线 \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/zh/text_Ribbons_zh.txt b/PKHeX.Core/Resources/text/zh/text_Ribbons_zh.txt index a40d6bb76..131bf4813 100644 --- a/PKHeX.Core/Resources/text/zh/text_Ribbons_zh.txt +++ b/PKHeX.Core/Resources/text/zh/text_Ribbons_zh.txt @@ -100,4 +100,52 @@ RibbonCountG3Tough 强壮 RibbonChampionAlola 阿罗拉冠军 RibbonBattleRoyale 皇家大师 RibbonBattleTreeGreat 高手对战树 -RibbonBattleTreeMaster 大师对战树 \ No newline at end of file +RibbonBattleTreeMaster 大师对战树 +RibbonChampionGalar 伽勒尔冠军奖章 +RibbonTowerMaster 对战塔大师奖章 +RibbonMasterRank 级别对战大师奖章 +RibbonMarkLunchtime 正午之证 +RibbonMarkSleepyTime 午夜之证 +RibbonMarkDusk 黄昏之证 +RibbonMarkDawn 拂晓之证 +RibbonMarkCloudy 阴云之证 +RibbonMarkRainy 降雨之证 +RibbonMarkStormy 落雷之证 +RibbonMarkSnowy 降雪之证 +RibbonMarkBlizzard 暴雪之证 +RibbonMarkDry 干燥之证 +RibbonMarkSandstorm 沙尘之证 +RibbonMarkMisty 浓雾之证 +RibbonMarkDestiny 命运之证 +RibbonMarkFishing 上钩之证 +RibbonMarkCurry 咖喱之证 +RibbonMarkUncommon 偶遇之证 +RibbonMarkRare 未知之证 +RibbonMarkRowdy 淘气之证 +RibbonMarkAbsentMinded 无虑之证 +RibbonMarkJittery 紧张之证 +RibbonMarkExcited 期待之证 +RibbonMarkCharismatic 领袖之证 +RibbonMarkCalmness 冷静之证 +RibbonMarkIntense 热情之证 +RibbonMarkZonedOut 疏忽之证 +RibbonMarkJoyful 幸福之证 +RibbonMarkAngry 愤怒之证 +RibbonMarkSmiley 微笑之证 +RibbonMarkTeary 悲伤之证 +RibbonMarkUpbeat 爽快之证 +RibbonMarkPeeved 激动之证 +RibbonMarkIntellectual 理性之证 +RibbonMarkFerocious 本能之证 +RibbonMarkCrafty 狡猾之证 +RibbonMarkScowling 凶悍之证 +RibbonMarkKindly 优雅之证 +RibbonMarkFlustered 动摇之证 +RibbonMarkPumpedUp 昂扬之证 +RibbonMarkZeroEnergy 倦怠之证 +RibbonMarkPrideful 自信之证 +RibbonMarkUnsure 自卑之证 +RibbonMarkHumble 木讷之证 +RibbonMarkThorny 不纯之证 +RibbonMarkVigor 活力之证 +RibbonMarkSlump 不振之证 \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/zh/text_Species_zh.txt b/PKHeX.Core/Resources/text/zh/text_Species_zh.txt index 6f3f12e59..0184f77a8 100644 --- a/PKHeX.Core/Resources/text/zh/text_Species_zh.txt +++ b/PKHeX.Core/Resources/text/zh/text_Species_zh.txt @@ -807,4 +807,85 @@ 砰头小丑 捷拉奥拉 美录坦 -美录梅塔 \ No newline at end of file +美录梅塔 +敲音猴 +啪咚猴 +轰擂金刚猩 +炎兔儿 +腾蹴小将 +闪焰王牌 +泪眼蜥 +变涩蜥 +千面避役 +贪心栗鼠 +藏饱栗鼠 +稚山雀 +蓝鸦 +钢铠鸦 +索侦虫 +天罩虫 +以欧路普 +偷儿狐 +狐大盗 +幼棉棉 +白蓬蓬 +毛辫羊 +毛毛角羊 +咬咬龟 +暴噬龟 +来电汪 +逐电犬 +小炭仔 +大炭车 +巨炭山 +啃果虫 +苹裹龙 +丰蜜龙 +沙包蛇 +沙螺蟒 +古月鸟 +刺梭鱼 +戽斗尖梭 +毒电婴 +颤弦蝾螈 +烧火蚣 +焚焰蚣 +拳拳蛸 +八爪武师 +来悲茶 +怖思壶 +迷布莉姆 +提布莉姆 +布莉姆温 +捣蛋小妖 +诈唬魔 +长毛巨魔 +堵拦熊 +喵头目 +魔灵珊瑚 +葱游兵 +踏冰人偶 +死神板 +小仙奶 +霜奶仙 +列阵兵 +啪嚓海胆 +雪吞虫 +雪绒蛾 +巨石丁 +冰砌鹅 +爱管侍 +莫鲁贝可 +铜象 +大王铜象 +雷鸟龙 +雷鸟海兽 +鳃鱼龙 +鳃鱼海兽 +铝钢龙 +多龙梅西亚 +多龙奇 +多龙巴鲁托 +苍响 +藏玛然特 +无极汰那 \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/zh/text_swsh_00000_zh.txt b/PKHeX.Core/Resources/text/zh/text_swsh_00000_zh.txt index 4d9440604..2d5a1bcff 100644 --- a/PKHeX.Core/Resources/text/zh/text_swsh_00000_zh.txt +++ b/PKHeX.Core/Resources/text/zh/text_swsh_00000_zh.txt @@ -1 +1,163 @@ -todo \ No newline at end of file +－－－－－－－－－－ + +神秘的地方 + +遥远的地方 + +化朗镇 + +微寐森林 + +[~ 10] +[~ 11] +１号道路 + +木杆镇 + +木杆镇车站 + +２号道路 + +机擎市 + +机擎市车站 + +机擎竞技场 + +[~ 26] +[~ 27] +３号道路 + +伽勒尔矿山 + +４号道路 + +草路镇 + +草路竞技场 + +[~ 38] +[~ 39] +５号道路 + +[~ 42] +[~ 43] +水舟镇 + +水舟镇车站 + +水舟竞技场 + +[~ 50] +[~ 51] +机擎市郊外 + +第二矿山 + +拳关市 + +拳关市车站 + +拳关竞技场 + +[~ 62] +[~ 63] +能源工厂 + +塔顶 + +６号道路 + +溯传镇 + +溯传竞技场 + +[~ 74] +[~ 75] +迷光森林 + +舞姿镇 + +舞姿竞技场 + +[~ 82] +[~ 83] +７号道路 + +８号道路 + +８号道路 +泉烟小路 +９号道路 + +９号道路 +战竞湾 +９号道路 +尖钉镇郊外 +战竞镇 + +战竞竞技场 + +[~ 100] +[~ 101] +尖钉镇 + +九路隧道 + +１０号道路 + +白丘车站 + +宫门市 + +宫门市车站 + +宫门竞技场 +宝可梦联盟总部 +宫门竞技场 +选手休息室 +宫门竞技场 + +集汇空地 +旷野地带 +煦丽草原 +旷野地带 +沐光森林 +旷野地带 +瞭望塔旧址 +旷野地带 +牙牙湖东岸 +旷野地带 +牙牙湖西岸 +旷野地带 +牙牙湖之眼 +旷野地带 +美纳斯湖南岸 +旷野地带 +巨人凳岩 +旷野地带 +美纳斯湖北岸 +旷野地带 +机擎河岸 +旷野地带 +桥间空地 +旷野地带 +巨石原野 +旷野地带 +沙尘洼地 +旷野地带 +巨人镜池 +旷野地带 +拳关丘陵 +旷野地带 +巨人帽岩 +旷野地带 +逆鳞湖 +旷野地带 +旷野地带车站 + +对战塔 + +洛兹大厦 + +某处的巢穴 diff --git a/PKHeX.Core/Resources/text/zh/text_swsh_30000_zh.txt b/PKHeX.Core/Resources/text/zh/text_swsh_30000_zh.txt index 4d9440604..f272218dd 100644 --- a/PKHeX.Core/Resources/text/zh/text_swsh_30000_zh.txt +++ b/PKHeX.Core/Resources/text/zh/text_swsh_30000_zh.txt @@ -1 +1,19 @@ -todo \ No newline at end of file +连接交换 +连接交换 +关都地区 +城都地区 +丰缘地区 +神奥地区 +遥远的土地 +－－－－－－－－－－ +合众地区 +卡洛斯地区 +宝可梦连接 +Pokémon GO +关都地区 +丰缘地区 +阿罗拉地区 +宝可度假地 +城都地区 +Pokémon HOME +关都地区 \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/zh/text_swsh_40000_zh.txt b/PKHeX.Core/Resources/text/zh/text_swsh_40000_zh.txt index 4d9440604..03796a905 100644 --- a/PKHeX.Core/Resources/text/zh/text_swsh_40000_zh.txt +++ b/PKHeX.Core/Resources/text/zh/text_swsh_40000_zh.txt @@ -1 +1,113 @@ -todo \ No newline at end of file +美丽的地方 +遥远的地方 +宝可梦电影 +[~ 3] +宝可梦电影１９ +宝可梦电影２０ +宝可梦电影２１ +宝可梦电影２２ +宝可梦电影２３ +宝可梦电影２４ +宝可梦动画片 +宝可梦中心 +东北ＰＣ +WCS +[~ 14] +WCS２０１９ +WCS２０２０ +WCS２０２１ +WCS２０２２ +WCS２０２３ +WCS２０２４ +Ｗｏｒｌｄｓ +[~ 22] +Ｗｏｒｌｄｓ２０１９ +Ｗｏｒｌｄｓ２０２０ +Ｗｏｒｌｄｓ２０２１ +Ｗｏｒｌｄｓ２０２２ +Ｗｏｒｌｄｓ２０２３ +Ｗｏｒｌｄｓ２０２４ +VGE +[~ 30] +VGE２０１９ +VGE２０２０ +VGE２０２１ +VGE２０２２ +VGE２０２３ +VGE２０２４ +宝可梦活动 +对战大赛 +游戏活动 +发烧友俱乐部 +宝可梦节目 +音乐会 +在线礼物 +PGL +[~ 45] +宝可梦活动１９ +宝可梦活动２０ +宝可梦活动２１ +宝可梦活动２２ +宝可梦活动２３ +宝可梦活动２４ +宝可梦庆典 +[~ 53] +宝可梦庆典１９ +宝可梦庆典２０ +宝可梦庆典２１ +宝可梦庆典２２ +宝可梦庆典２３ +宝可梦庆典２４ +宝可公园 +[~ 61] +宝可公园２０１９ +宝可公园２０２０ +宝可公园２０２１ +宝可公园２０２２ +宝可公园２０２３ +宝可公园２０２４ +活动会场 +GAME FREAK +竞技场 +VGC +[~ 72] +VGC２０１９ +VGC２０２０ +VGC２０２１ +VGC２０２２ +VGC２０２３ +VGC２０２４ +Virtual Console +Pokémon GO +宝可梦虚拟银行 +宝可梦的店 +体验版 +精灵球 Plus +Pokémon HOME +[~ 86] +[~ 87] +[~ 88] +[~ 89] +[~ 90] +[~ 91] +[~ 92] +[~ 93] +[~ 94] +[~ 95] +[~ 96] +[~ 97] +[~ 98] +[~ 99] +[~ 100] +[~ 101] +[~ 102] +[~ 103] +[~ 104] +[~ 105] +[~ 106] +[~ 107] +[~ 108] +[~ 109] +[~ 110] +[~ 111] +[~ 112] \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/zh/text_swsh_60000_zh.txt b/PKHeX.Core/Resources/text/zh/text_swsh_60000_zh.txt index 4d9440604..c54fc68a7 100644 --- a/PKHeX.Core/Resources/text/zh/text_swsh_60000_zh.txt +++ b/PKHeX.Core/Resources/text/zh/text_swsh_60000_zh.txt @@ -1 +1,4 @@ -todo \ No newline at end of file +远处的人 +寄放屋 +寻宝猎人 +温泉婆婆 \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/zh/text_tradeswsh_zh.txt b/PKHeX.Core/Resources/text/zh/text_tradeswsh_zh.txt new file mode 100644 index 000000000..2b140bb6a --- /dev/null +++ b/PKHeX.Core/Resources/text/zh/text_tradeswsh_zh.txt @@ -0,0 +1,22 @@ +金小判 +脸蛋儿 +棉花糖 +背心 +刘海 +摇摇 +贾面 +红投鬼 +蓝投鬼 +巴里 +直线 +乔邦尼 +初美 +麦豆 +宝子 +罗密欧 +罗密欧 +伊芙 +白雪 +白雪 +田边 +卡普亚 \ No newline at end of file diff --git a/PKHeX.Core/Ribbons/IRibbonIndex.cs b/PKHeX.Core/Ribbons/IRibbonIndex.cs new file mode 100644 index 000000000..4b492af15 --- /dev/null +++ b/PKHeX.Core/Ribbons/IRibbonIndex.cs @@ -0,0 +1,12 @@ +namespace PKHeX.Core +{ + /// + /// Provides access for reading and writing ribbon states by ribbon index within the structure. + /// + public interface IRibbonIndex + { + bool GetRibbon(int index); + void SetRibbon(int index, bool value = true); + int GetRibbonByte(int index); + } +} diff --git a/PKHeX.Core/Ribbons/IRibbonSetCommon8.cs b/PKHeX.Core/Ribbons/IRibbonSetCommon8.cs new file mode 100644 index 000000000..c65be82de --- /dev/null +++ b/PKHeX.Core/Ribbons/IRibbonSetCommon8.cs @@ -0,0 +1,31 @@ +namespace PKHeX.Core +{ + /// Common Ribbons introduced in Generation 8 + public interface IRibbonSetCommon8 + { + bool RibbonChampionGalar { get; set; } + bool RibbonTowerMaster { get; set; } + bool RibbonMasterRank { get; set; } + } + + internal static partial class RibbonExtensions + { + private static readonly string[] RibbonSetNamesCommon8 = + { + nameof(IRibbonSetCommon8.RibbonChampionGalar), nameof(IRibbonSetCommon8.RibbonTowerMaster), + nameof(IRibbonSetCommon8.RibbonMasterRank), + }; + + internal static bool[] RibbonBits(this IRibbonSetCommon8 set) + { + return new[] + { + set.RibbonChampionGalar, + set.RibbonTowerMaster, + set.RibbonMasterRank, + }; + } + + internal static string[] RibbonNames(this IRibbonSetCommon8 _) => RibbonSetNamesCommon8; + } +} \ No newline at end of file diff --git a/PKHeX.Core/Saves/Access/ISaveBlock8Main.cs b/PKHeX.Core/Saves/Access/ISaveBlock8Main.cs index da66ee08d..f7a8a9cbc 100644 --- a/PKHeX.Core/Saves/Access/ISaveBlock8Main.cs +++ b/PKHeX.Core/Saves/Access/ISaveBlock8Main.cs @@ -2,17 +2,16 @@ { public interface ISaveBlock8Main { + Box8 BoxInfo { get; } + Party8 PartyInfo { get; } MyItem Items { get; } - Record8 Records { get; } - PlayTime8 Played { get; } MyStatus8 MyStatus { get; } - ConfigSave8 Config { get; } - GameTime8 GameTime { get; } Misc8 Misc { get; } Zukan8 Zukan { get; } - EventWork8 EventWork { get; } BoxLayout8 BoxLayout { get; } - Situation8 Situation { get; } - FieldMoveModelSave8 Overworld { get; } + PlayTime8 Played { get; } + Fused8 Fused { get; } + Daycare8 Daycare { get; } + Record8 Records { get; } } } \ No newline at end of file diff --git a/PKHeX.Core/Saves/Access/ISaveBlockAccessor.cs b/PKHeX.Core/Saves/Access/ISaveBlockAccessor.cs index 322a212a8..ca5358ac5 100644 --- a/PKHeX.Core/Saves/Access/ISaveBlockAccessor.cs +++ b/PKHeX.Core/Saves/Access/ISaveBlockAccessor.cs @@ -2,7 +2,7 @@ namespace PKHeX.Core { - public interface ISaveBlockAccessor where T : BlockInfo + public interface ISaveBlockAccessor { IReadOnlyList BlockInfo { get; } } diff --git a/PKHeX.Core/Saves/Access/SaveBlockAccessorSWSH.cs b/PKHeX.Core/Saves/Access/SaveBlockAccessorSWSH.cs index b738821ee..85236b6b1 100644 --- a/PKHeX.Core/Saves/Access/SaveBlockAccessorSWSH.cs +++ b/PKHeX.Core/Saves/Access/SaveBlockAccessorSWSH.cs @@ -2,67 +2,58 @@ namespace PKHeX.Core { - public class SaveBlockAccessorSWSH : ISaveBlockAccessor, ISaveBlock8Main + public class SaveBlockAccessorSWSH : ISaveBlockAccessor, ISaveBlock8Main { - public const int boGG = -1; - - private static readonly BlockInfo7b[] BlockInfoSWSH = + private static readonly SCBlock[] BlockInfoSWSH = { - new BlockInfo7b(boGG, 00, 0x00000, 0x00D90), - new BlockInfo7b(boGG, 01, 0x00E00, 0x00200), - new BlockInfo7b(boGG, 02, 0x01000, 0x00168), - new BlockInfo7b(boGG, 03, 0x01200, 0x01800), - new BlockInfo7b(boGG, 04, 0x02A00, 0x020E8), - new BlockInfo7b(boGG, 05, 0x04C00, 0x00930), - new BlockInfo7b(boGG, 06, 0x05600, 0x00004), - new BlockInfo7b(boGG, 07, 0x05800, 0x00130), - new BlockInfo7b(boGG, 08, 0x05A00, 0x00012), - new BlockInfo7b(boGG, 09, 0x05C00, 0x3F7A0), - new BlockInfo7b(boGG, 10, 0x45400, 0x00008), - new BlockInfo7b(boGG, 11, 0x45600, 0x00E90), - new BlockInfo7b(boGG, 12, 0x46600, 0x010A4), - new BlockInfo7b(boGG, 13, 0x47800, 0x000F0), - new BlockInfo7b(boGG, 14, 0x47A00, 0x06010), - new BlockInfo7b(boGG, 15, 0x4DC00, 0x00200), - new BlockInfo7b(boGG, 16, 0x4DE00, 0x00098), - new BlockInfo7b(boGG, 17, 0x4E000, 0x00068), - new BlockInfo7b(boGG, 18, 0x4E200, 0x69780), - new BlockInfo7b(boGG, 19, 0xB7A00, 0x000B0), - new BlockInfo7b(boGG, 20, 0xB7C00, 0x00940), }; - public IReadOnlyList BlockInfo => BlockInfoSWSH; + public IReadOnlyList BlockInfo { get; } + public Box8 BoxInfo { get; } + public Party8 PartyInfo { get; } public MyItem Items { get; } - public Record8 Records { get; } - public PlayTime8 Played { get; } public MyStatus8 MyStatus { get; } - public ConfigSave8 Config { get; } - public GameTime8 GameTime { get; } public Misc8 Misc { get; } public Zukan8 Zukan { get; } - public EventWork8 EventWork { get; } public BoxLayout8 BoxLayout { get; } - public Situation8 Situation { get; } - public FieldMoveModelSave8 Overworld { get; } + public PlayTime8 Played { get; } + public Fused8 Fused { get; } + public Daycare8 Daycare { get; } + public Record8 Records { get; } public SaveBlockAccessorSWSH(SAV8SWSH sav) { - const int langFlagStart = 0x550; // todo - Items = new MyItem8(sav); // todo - at offset 0? - Zukan = new Zukan8(sav, GetBlockOffset(SAV8BlockIndex.Pokedex), langFlagStart); - MyStatus = new MyStatus8(sav, GetBlockOffset(SAV8BlockIndex.MyStatus)); - Played = new PlayTime8(sav, GetBlockOffset(SAV8BlockIndex.PlayTime)); - Misc = new Misc8(sav, GetBlockOffset(SAV8BlockIndex.Misc)); - GameTime = new GameTime8(sav, GetBlockOffset(SAV8BlockIndex.GameTime)); - Overworld = new FieldMoveModelSave8(sav, GetBlockOffset(SAV8BlockIndex.FieldMoveModelSave)); - Records = new Record8(sav, GetBlockOffset(SAV8BlockIndex.Records), Core.Records.MaxType_SWSH); - Situation = new Situation8(sav, GetBlockOffset(SAV8BlockIndex.Situation)); - EventWork = new EventWork8(sav); - BoxLayout = new BoxLayout8(sav, GetBlockOffset(SAV8BlockIndex.BOX)); - Config = new ConfigSave8(sav, GetBlockOffset(SAV8BlockIndex.ConfigSave)); + BlockInfo = sav.AllBlocks; + BoxInfo = new Box8(sav, GetBlock(IBox)); + PartyInfo = new Party8(sav, GetBlock(IParty)); + Items = new MyItem8(sav, GetBlock(IItem)); + Zukan = new Zukan8(sav, GetBlock(IZukan)); + MyStatus = new MyStatus8(sav, GetBlock(IMyStatus)); + Misc = new Misc8(sav, GetBlock(IMisc)); + BoxLayout = new BoxLayout8(sav, GetBlock(IBoxLayout)); + Played = new PlayTime8(sav, GetBlock(IPlayTime)); + Fused = new Fused8(sav, GetBlock(IFused)); + Daycare = new Daycare8(sav, GetBlock(IDaycare)); + Records = new Record8(sav, GetBlock(IRecord), Core.Records.MaxType_SWSH); } - public BlockInfo GetBlock(SAV8BlockIndex index) => BlockInfo[(int)index]; - public int GetBlockOffset(SAV8BlockIndex index) => GetBlock(index).Offset; + private const int IBox = 143; // Box Data + private const int IMysteryGift = 186; // Mystery Gift Data + private const int IItem = 191; // Items + // Coordinates? 253 + private const int IBoxLayout = 275; // Box Names + private const int IMisc = 288; // Money + private const int IParty = 428; // Party Data + private const int IDaycare = 465; // Daycare slots (2 daycares) + private const int IRecord = 544; + private const int IZukan = 699; // PokeDex + private const int ITrainerCard = 1259; // Trainer Card + private const int IPlayTime = 1302; // Time Played + private const int IRepel = 1469; + private const int IFused = 1789; // Fused PKM (*3) + private const int IFashionUnlock = 1989; // Fashion unlock bool array (owned for (each apparel type) * 0x80, then another array for "new") + private const int IMyStatus = 2275; // Trainer Details + + public SCBlock GetBlock(int index) => BlockInfo[index]; } } \ No newline at end of file diff --git a/PKHeX.Core/Saves/Blocks/RecordBlock.cs b/PKHeX.Core/Saves/Blocks/RecordBlock.cs index 4803819bd..4c8604a79 100644 --- a/PKHeX.Core/Saves/Blocks/RecordBlock.cs +++ b/PKHeX.Core/Saves/Blocks/RecordBlock.cs @@ -15,5 +15,9 @@ public abstract class RecordBlock : SaveBlock protected RecordBlock(SaveFile sav) : base(sav) { } + + protected RecordBlock(SaveFile sav, byte[] data) : base(sav, data) + { + } } } \ No newline at end of file diff --git a/PKHeX.Core/Saves/MemeCrypto/SwishCrypto.cs b/PKHeX.Core/Saves/MemeCrypto/SwishCrypto.cs new file mode 100644 index 000000000..043528e8b --- /dev/null +++ b/PKHeX.Core/Saves/MemeCrypto/SwishCrypto.cs @@ -0,0 +1,450 @@ +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.IO; +using System.Linq; +using System.Security.Cryptography; + +namespace PKHeX.Core +{ + /// + /// MemeCrypto V2 - The Next Generation + /// + /// + /// A new variant of encryption and obfuscation, used in . + /// + public static class SwishCrypto + { + private static readonly SHA256 sha256 = new SHA256CryptoServiceProvider(); + private const int SIZE_HASH = 0x20; + + private static readonly byte[] IntroHashBytes = + { + 0x9E, 0xC9, 0x9C, 0xD7, 0x0E, 0xD3, 0x3C, 0x44, 0xFB, 0x93, 0x03, 0xDC, 0xEB, 0x39, 0xB4, 0x2A, + 0x19, 0x47, 0xE9, 0x63, 0x4B, 0xA2, 0x33, 0x44, 0x16, 0xBF, 0x82, 0xA2, 0xBA, 0x63, 0x55, 0xB6, + 0x3D, 0x9D, 0xF2, 0x4B, 0x5F, 0x7B, 0x6A, 0xB2, 0x62, 0x1D, 0xC2, 0x1B, 0x68, 0xE5, 0xC8, 0xB5, + 0x3A, 0x05, 0x90, 0x00, 0xE8, 0xA8, 0x10, 0x3D, 0xE2, 0xEC, 0xF0, 0x0C, 0xB2, 0xED, 0x4F, 0x6D, + }; + + private static readonly byte[] OutroHashBytes = + { + 0xD6, 0xC0, 0x1C, 0x59, 0x8B, 0xC8, 0xB8, 0xCB, 0x46, 0xE1, 0x53, 0xFC, 0x82, 0x8C, 0x75, 0x75, + 0x13, 0xE0, 0x45, 0xDF, 0x32, 0x69, 0x3C, 0x75, 0xF0, 0x59, 0xF8, 0xD9, 0xA2, 0x5F, 0xB2, 0x17, + 0xE0, 0x80, 0x52, 0xDB, 0xEA, 0x89, 0x73, 0x99, 0x75, 0x79, 0xAF, 0xCB, 0x2E, 0x80, 0x07, 0xE6, + 0xF1, 0x26, 0xE0, 0x03, 0x0A, 0xE6, 0x6F, 0xF6, 0x41, 0xBF, 0x7E, 0x59, 0xC2, 0xAE, 0x55, 0xFD, + }; + + private static readonly byte[] StaticXorpad = + { + 0xA0, 0x92, 0xD1, 0x06, 0x07, 0xDB, 0x32, 0xA1, 0xAE, 0x01, 0xF5, 0xC5, 0x1E, 0x84, 0x4F, 0xE3, + 0x53, 0xCA, 0x37, 0xF4, 0xA7, 0xB0, 0x4D, 0xA0, 0x18, 0xB7, 0xC2, 0x97, 0xDA, 0x5F, 0x53, 0x2B, + 0x75, 0xFA, 0x48, 0x16, 0xF8, 0xD4, 0x8A, 0x6F, 0x61, 0x05, 0xF4, 0xE2, 0xFD, 0x04, 0xB5, 0xA3, + 0x0F, 0xFC, 0x44, 0x92, 0xCB, 0x32, 0xE6, 0x1B, 0xB9, 0xB1, 0x2E, 0x01, 0xB0, 0x56, 0x53, 0x36, + 0xD2, 0xD1, 0x50, 0x3D, 0xDE, 0x5B, 0x2E, 0x0E, 0x52, 0xFD, 0xDF, 0x2F, 0x7B, 0xCA, 0x63, 0x50, + 0xA4, 0x67, 0x5D, 0x23, 0x17, 0xC0, 0x52, 0xE1, 0xA6, 0x30, 0x7C, 0x2B, 0xB6, 0x70, 0x36, 0x5B, + 0x2A, 0x27, 0x69, 0x33, 0xF5, 0x63, 0x7B, 0x36, 0x3F, 0x26, 0x9B, 0xA3, 0xED, 0x7A, 0x53, 0x00, + 0xA4, 0x48, 0xB3, 0x50, 0x9E, 0x14, 0xA0, 0x52, 0xDE, 0x7E, 0x10, 0x2B, 0x1B, 0x77, 0x6E, + }; + + private static void CryptStaticXorpadBytes(byte[] data) + { + for (var i = 0; i < data.Length - SIZE_HASH; i++) + data[i] ^= StaticXorpad[i % StaticXorpad.Length]; + } + + private static byte[] ComputeHash(byte[] data) + { + // can't use IncrementalHash.CreateHash(HashAlgorithmName.SHA256); cuz net46 doesn't support + using var stream = new MemoryStream(); + stream.Write(IntroHashBytes, 0, IntroHashBytes.Length); + stream.Write(data, 0, data.Length - SIZE_HASH); // hash is at the end + stream.Write(OutroHashBytes, 0, OutroHashBytes.Length); + stream.Seek(0, SeekOrigin.Begin); + return sha256.ComputeHash(stream); + } + + /// + /// Checks if the file is a rough example of a save file. + /// + /// Encrypted save data + /// True if hash matches + public static bool GetIsHashValid(byte[] data) + { + if (data.Length != SaveUtil.SIZE_G8SWSH) + return false; + + var hash = ComputeHash(data); + for (int i = 0; i < hash.Length; i++) + { + if (hash[i] != data[data.Length - SIZE_HASH + i]) + return false; + } + + return true; + } + + /// + /// Decrypts the save data. + /// + /// Encrypted save data + /// Decrypted blocks. + /// + /// Hash is assumed to be valid before calling this method. + /// + public static IReadOnlyList Decrypt(byte[] data) + { + // de-ref from input data, since we're going to modify the contents in-place + var temp = (byte[])data.Clone(); + CryptStaticXorpadBytes(temp); + return ReadBlocks(temp); + } + + private static IReadOnlyList ReadBlocks(byte[] data) + { + var result = new List(); + int offset = 0; + while (offset < data.Length - SIZE_HASH) + { + var block = SCBlock.ReadFromOffset(data, ref offset); + result.Add(block); + } + + return result; + } + + /// + /// Tries to encrypt the save data. + /// + /// Decrypted save data + /// Encrypted save data. + public static byte[] Encrypt(IReadOnlyList blocks) + { + using var ms = new MemoryStream(); + foreach (var block in blocks) + { + var enc_data = block.GetEncryptedData(); + ms.Write(enc_data, 0, enc_data.Length); + } + + // Allocate hash bytes at the end + var result = new byte[ms.Length + SIZE_HASH]; + ms.ToArray().CopyTo(result, 0); + + CryptStaticXorpadBytes(result); + + var hash = ComputeHash(result); + hash.CopyTo(result, result.Length - SIZE_HASH); + + return result; + } + } + + /// + /// Block of obtained from a encrypted block storage binary. + /// + public sealed class SCBlock : BlockInfo + { + /// + /// Used to encrypt the rest of the block. + /// + public uint Key { get; } + + /// + /// What kind of block is it? + /// + public SCBlockType Type { get; set; } + + /// + /// For : What kind of array is it? + /// + public SCBlockType SubType { get; set; } + + /// + /// Decrypted data for this block. + /// + public byte[] Data = Array.Empty(); + + private SCBlock(uint key) => Key = key; + internal SCBlock() { } + protected override bool ChecksumValid(byte[] data) => true; + protected override void SetChecksum(byte[] data) { } + + public SCBlock Clone() + { + var block = (SCBlock)MemberwiseClone(); + block.Data = (byte[])Data.Clone(); + return block; + } + + private static int GetArrayEntrySize(SCBlockType type) + { + switch (type) + { + case SCBlockType.Common3: + case SCBlockType.Single1: + case SCBlockType.Single5: + return 1; + case SCBlockType.Single2: + case SCBlockType.Single6: + return 2; + case SCBlockType.Single3: + case SCBlockType.Single7: + case SCBlockType.Single9: + return 4; + case SCBlockType.Single4: + case SCBlockType.Single8: + case SCBlockType.Single10: + return 8; + + default: + throw new ArgumentException(nameof(type)); + } + } + + private static void XorshiftAdvance(ref uint key) + { + key ^= (key << 2); + key ^= (key >> 15); + key ^= (key << 13); + } + + private static uint PopCount(ulong key) + { + // https://en.wikipedia.org/wiki/Hamming_weight#Efficient_implementation + const ulong m1 = 0x5555555555555555; + const ulong m2 = 0x3333333333333333; + const ulong m4 = 0x0f0f0f0f0f0f0f0f; + // const ulong m8 = 0x00ff00ff00ff00ff; + // const ulong m16 = 0x0000ffff0000ffff; + // const ulong m32 = 0x00000000ffffffff; + const ulong h01 = 0x0101010101010101; + key -= (key >> 1) & m1; + key = (key & m2) + ((key >> 2) & m2); + key = (key + (key >> 4)) & m4; + return (uint)((key * h01) >> 56); + } + + private byte[] GetKeyStream(int start, int size) + { + // Initialize the xorshift rng. + var key = Key; + var pop_count = PopCount(Key); + for (var i = 0; i < pop_count; i++) + XorshiftAdvance(ref key); + + int ofs = 0; + int out_ofs = 0; + while (ofs + 4 < start) + { + // Discard keystream until we're at offset. + XorshiftAdvance(ref key); + ofs += 4; + } + + var result = new byte[size]; + // If we aren't aligned, handle that. + if (ofs < start) + { + int cur_size = Math.Min(size, 4 - (start - ofs)); + Array.Copy(BitConverter.GetBytes(key), start - ofs, result, out_ofs, cur_size); + out_ofs += cur_size; + XorshiftAdvance(ref key); + } + + // Generate keystream until we're done. + while (out_ofs < size) + { + int cur_size = Math.Min(size - out_ofs, 4); + Array.Copy(BitConverter.GetBytes(key), 0, result, out_ofs, cur_size); + out_ofs += cur_size; + XorshiftAdvance(ref key); + } + + return result; + } + + private byte[] CryptBytes(byte[] data, int input_offset, int start, int size) + { + var result = new byte[size]; + Array.Copy(data, input_offset + start, result, 0, result.Length); + + var key_stream = GetKeyStream(start, size); + for (var i = 0; i < result.Length; i++) + result[i] ^= key_stream[i]; + return result; + } + + private int GetEncryptedDataSize() + { + const int size = 4 + 1; // key + type + switch (Type) + { + case SCBlockType.Common1: + case SCBlockType.Common2: + case SCBlockType.Common3: + return size; + case SCBlockType.Data: + return size + 4 + Data.Length; + case SCBlockType.Array: + return size + 5 + Data.Length; + case SCBlockType.Single1: + case SCBlockType.Single2: + case SCBlockType.Single3: + case SCBlockType.Single4: + case SCBlockType.Single5: + case SCBlockType.Single6: + case SCBlockType.Single7: + case SCBlockType.Single8: + case SCBlockType.Single9: + case SCBlockType.Single10: + return size + Data.Length; + default: + throw new ArgumentException(nameof(Type)); + } + } + + /// + /// Encrypts the according to the and . + /// + /// Encrypted data. + public byte[] GetEncryptedData() + { + var result = new byte[GetEncryptedDataSize()]; + BitConverter.GetBytes(Key).CopyTo(result, 0); + result[4] = (byte)Type; + var out_ofs = 5; + + if (Type == SCBlockType.Data) + { + BitConverter.GetBytes(Data.Length).CopyTo(result, out_ofs); + out_ofs += 4; + } + else if (Type == SCBlockType.Array) + { + BitConverter.GetBytes(Data.Length / GetArrayEntrySize(SubType)).CopyTo(result, out_ofs); + result[out_ofs + 4] = (byte)SubType; + out_ofs += 5; + } + + Data.CopyTo(result, out_ofs); + CryptBytes(result, 4, 0, result.Length - 4).CopyTo(result, 4); + + return result; + } + + /// + /// Reads a new object from the , determining the and during read. + /// + /// Decrypted data + /// Offset the block is to be read from (modified to offset by the amount of bytes consumed). + /// New object containing all info for the block. + public static SCBlock ReadFromOffset(byte[] data, ref int offset) + { + // Create block, parse its key. + var key = BitConverter.ToUInt32(data, offset); + offset += 4; + var block = new SCBlock(key); + + // Parse the block's type + block.Type = (SCBlockType)block.CryptBytes(data, offset, 0, 1)[0]; + + switch (block.Type) + { + case SCBlockType.Common1: + case SCBlockType.Common2: + case SCBlockType.Common3: + // Block types A, B, Common are empty, and have no extra data. + offset++; + break; + + case SCBlockType.Data: + var num_bytes = BitConverter.ToInt32(block.CryptBytes(data, offset, 1, 4), 0); + block.Data = block.CryptBytes(data, offset, 5, num_bytes); + offset += 5 + num_bytes; + break; + + case SCBlockType.Array: + var num_entries = BitConverter.ToInt32(block.CryptBytes(data, offset, 1, 4), 0); + block.SubType = (SCBlockType)block.CryptBytes(data, offset, 5, 1)[0]; + switch (block.SubType) + { + case SCBlockType.Common3: + // This is an array of booleans. + block.Data = block.CryptBytes(data, offset, 6, num_entries); + offset += 6 + num_entries; + Debug.Assert(block.Data.All(entry => entry <= 1)); + break; + + case SCBlockType.Single1: + case SCBlockType.Single2: + case SCBlockType.Single3: + case SCBlockType.Single4: + case SCBlockType.Single5: + case SCBlockType.Single6: + case SCBlockType.Single7: + case SCBlockType.Single8: + case SCBlockType.Single9: + case SCBlockType.Single10: + var entry_size = GetArrayEntrySize(block.SubType); + block.Data = block.CryptBytes(data, offset, 6, num_entries * entry_size); + offset += 6 + (num_entries * entry_size); + break; + + default: + throw new ArgumentException(nameof(block.SubType)); + } + break; + + case SCBlockType.Single1: + case SCBlockType.Single2: + case SCBlockType.Single3: + case SCBlockType.Single4: + case SCBlockType.Single5: + case SCBlockType.Single6: + case SCBlockType.Single7: + case SCBlockType.Single8: + case SCBlockType.Single9: + case SCBlockType.Single10: + { + var entry_size = GetArrayEntrySize(block.Type); + block.Data = block.CryptBytes(data, offset, 1, entry_size); + offset += 1 + entry_size; + break; + } + default: + throw new ArgumentException(nameof(block.Type)); + } + + return block; + } + } + + /// + /// Block type for a . + /// + [System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1027:Mark enums with FlagsAttribute", Justification = "NOT FLAGS")] + public enum SCBlockType + { + None = 0, + + // All aliases of each other + Common1 = 1, + Common2 = 2, + Common3 = 3, + + Data = 4, + + Array = 5, + + Single1 = 8, + Single2 = 9, + Single3 = 10, + Single4 = 11, + Single5 = 12, + Single6 = 13, + Single7 = 14, + Single8 = 15, + Single9 = 16, + Single10 = 17, + } +} diff --git a/PKHeX.Core/Saves/SAV1.cs b/PKHeX.Core/Saves/SAV1.cs index 1e0182654..e2fa58248 100644 --- a/PKHeX.Core/Saves/SAV1.cs +++ b/PKHeX.Core/Saves/SAV1.cs @@ -494,12 +494,20 @@ private void SetDexFlag(int region, int species, bool value) SetFlag(region + ofs, bit & 7, value); } - protected override void WriteStoredSlot(PKM pkm, int offset) + public override void WriteSlotFormatStored(PKM pkm, byte[] data, int offset) { // pkm that have never been boxed have yet to save the 'current level' for box indication // set this value at this time ((PK1)pkm).Stat_LevelBox = pkm.CurrentLevel; - SetStoredSlot(pkm, offset); + base.WriteSlotFormatStored(pkm, Data, offset); + } + + public override void WriteBoxSlot(PKM pkm, byte[] data, int offset) + { + // pkm that have never been boxed have yet to save the 'current level' for box indication + // set this value at this time + ((PK1)pkm).Stat_LevelBox = pkm.CurrentLevel; + base.WriteBoxSlot(pkm, Data, offset); } private const int SpawnFlagCount = 0xF0; diff --git a/PKHeX.Core/Saves/SAV3Colosseum.cs b/PKHeX.Core/Saves/SAV3Colosseum.cs index 9b0771b47..0c33f5285 100644 --- a/PKHeX.Core/Saves/SAV3Colosseum.cs +++ b/PKHeX.Core/Saves/SAV3Colosseum.cs @@ -63,7 +63,7 @@ private StrategyMemo Initialize() // Count up how many party slots are active. for (int i = 0; i < 6; i++) { - if (GetPartySlot(GetPartyOffset(i)).Species != 0) + if (GetPartySlot(Data, GetPartyOffset(i)).Species != 0) PartyCount++; } diff --git a/PKHeX.Core/Saves/SAV3RSBox.cs b/PKHeX.Core/Saves/SAV3RSBox.cs index b5d407ba0..18f947cb2 100644 --- a/PKHeX.Core/Saves/SAV3RSBox.cs +++ b/PKHeX.Core/Saves/SAV3RSBox.cs @@ -191,11 +191,11 @@ protected override byte[] DecryptPKM(byte[] data) protected override void SetDex(PKM pkm) { /* No Pokedex for this game, do nothing */ } - protected override void WriteBoxSlot(PKM pkm, int offset) + public override void WriteBoxSlot(PKM pkm, byte[] data, int offset) { - base.WriteBoxSlot(pkm, offset); - BitConverter.GetBytes((ushort)pkm.TID).CopyTo(Data, offset + PKX.SIZE_3STORED + 0); - BitConverter.GetBytes((ushort)pkm.SID).CopyTo(Data, offset + PKX.SIZE_3STORED + 2); + base.WriteBoxSlot(pkm, data, offset); + BitConverter.GetBytes((ushort)pkm.TID).CopyTo(data, offset + PKX.SIZE_3STORED + 0); + BitConverter.GetBytes((ushort)pkm.SID).CopyTo(data, offset + PKX.SIZE_3STORED + 2); } public override string GetString(byte[] data, int offset, int length) => StringConverter3.GetString3(data, offset, length, Japanese); diff --git a/PKHeX.Core/Saves/SAV3XD.cs b/PKHeX.Core/Saves/SAV3XD.cs index f59a4d554..201447e7d 100644 --- a/PKHeX.Core/Saves/SAV3XD.cs +++ b/PKHeX.Core/Saves/SAV3XD.cs @@ -112,7 +112,7 @@ private void Initialize() // Count up how many party slots are active. for (int i = 0; i < 6; i++) { - if (GetPartySlot(GetPartyOffset(i)).Species != 0) + if (GetPartySlot(Data, GetPartyOffset(i)).Species != 0) PartyCount++; } } @@ -275,12 +275,12 @@ protected override PKM GetPKM(byte[] data) } protected override byte[] DecryptPKM(byte[] data) => data; - public override PKM GetPartySlot(int offset) => GetStoredSlot(offset); + public override PKM GetPartySlot(byte[] data, int offset) => GetStoredSlot(data, offset); - public override PKM GetStoredSlot(int offset) + public override PKM GetStoredSlot(byte[] data, int offset) { // Get Shadow Data - var pk = (XK3)base.GetStoredSlot(offset); + var pk = (XK3)base.GetStoredSlot(data, offset); if (pk.ShadowID > 0 && pk.ShadowID < ShadowInfo.Count) pk.Purification = ShadowInfo[pk.ShadowID].Purification; return pk; diff --git a/PKHeX.Core/Saves/SAV4.cs b/PKHeX.Core/Saves/SAV4.cs index a7ab46ea3..6cb71c939 100644 --- a/PKHeX.Core/Saves/SAV4.cs +++ b/PKHeX.Core/Saves/SAV4.cs @@ -23,7 +23,8 @@ public abstract class SAV4 : SaveFile // SaveData is chunked into two pieces. protected readonly byte[] Storage; public readonly byte[] General; - protected override byte[] StorageData => Storage; + protected override byte[] BoxBuffer => Storage; + protected override byte[] PartyBuffer => General; protected abstract int StorageSize { get; } protected abstract int GeneralSize { get; } @@ -35,12 +36,6 @@ public abstract class SAV4 : SaveFile /// public override void SetFlag(int offset, int bitIndex, bool value) => FlagUtil.SetFlag(General, offset, bitIndex, value); - public override PKM GetPartySlot(int offset) => GetDecryptedPKM(General.Slice(offset, SIZE_PARTY)); - - protected override void WritePartySlot(PKM pkm, int offset) => SetData(General, pkm.EncryptedPartyData, offset); - protected override void WriteStoredSlot(PKM pkm, int offset) => SetData(General, pkm.EncryptedBoxData, offset); - protected override void WriteBoxSlot(PKM pkm, int offset) => SetData(Storage, pkm.EncryptedBoxData, offset); - protected SAV4() { Storage = new byte[StorageSize]; @@ -429,9 +424,6 @@ public int Z public override uint SecondsToStart { get => BitConverter.ToUInt32(General, AdventureInfo + 0x34); set => BitConverter.GetBytes(value).CopyTo(General, AdventureInfo + 0x34); } public override uint SecondsToFame { get => BitConverter.ToUInt32(General, AdventureInfo + 0x3C); set => BitConverter.GetBytes(value).CopyTo(General, AdventureInfo + 0x3C); } - public override PKM GetStoredSlot(int offset) => GetDecryptedPKM(General.Slice(offset, SIZE_STORED)); - public override PKM GetBoxSlot(int offset) => GetDecryptedPKM(Storage.Slice(offset, SIZE_STORED)); - protected override PKM GetPKM(byte[] data) => new PK4(data); protected override byte[] DecryptPKM(byte[] data) => PKX.DecryptArray45(data); diff --git a/PKHeX.Core/Saves/SAV5.cs b/PKHeX.Core/Saves/SAV5.cs index dfd6a03ee..f5d268935 100644 --- a/PKHeX.Core/Saves/SAV5.cs +++ b/PKHeX.Core/Saves/SAV5.cs @@ -97,7 +97,8 @@ public override int PartyCount public override void SetBoxName(int box, string value) => BoxLayout[box] = value; public override int CurrentBox { get => BoxLayout.CurrentBox; set => BoxLayout.CurrentBox = value; } - public override bool BattleBoxLocked + protected int BattleBoxOffset; + public bool BattleBoxLocked { get => Data[BattleBoxOffset + 0x358] != 0; // wifi/live set => Data[BattleBoxOffset + 0x358] = (byte)(value ? 1 : 0); @@ -205,5 +206,6 @@ public EntreeForest EntreeData public static int GetMailOffset(int index) => (index * Mail5.SIZE) + 0x1DD00; public byte[] GetMailData(int offset) => GetData(offset, Mail5.SIZE); + public int GetBattleBoxSlot(int slot) => BattleBoxOffset + (slot * SIZE_STORED); } } diff --git a/PKHeX.Core/Saves/SAV6.cs b/PKHeX.Core/Saves/SAV6.cs index 4b65b7a67..2d8ca9a9c 100644 --- a/PKHeX.Core/Saves/SAV6.cs +++ b/PKHeX.Core/Saves/SAV6.cs @@ -46,6 +46,8 @@ public abstract class SAV6 : SAV_BEEF, ITrainerStatRecord, ISaveBlock6Core public int BerryField { get; protected set; } = int.MinValue; public int HoF { get; protected set; } = int.MinValue; protected int PCLayout { private get; set; } = int.MinValue; + protected int BattleBoxOffset { get; set; } = int.MinValue; + public int GetBattleBoxSlot(int slot) => BattleBoxOffset + (slot * SIZE_STORED); public virtual string JPEGTitle => string.Empty; public virtual byte[] JPEGData => Array.Empty(); diff --git a/PKHeX.Core/Saves/SAV6AO.cs b/PKHeX.Core/Saves/SAV6AO.cs index 3c54880bd..5b437e8dd 100644 --- a/PKHeX.Core/Saves/SAV6AO.cs +++ b/PKHeX.Core/Saves/SAV6AO.cs @@ -218,7 +218,7 @@ public ushort[][] GymTeams public override int BoxesUnlocked { get => Blocks.BoxLayout.BoxesUnlocked; set => Blocks.BoxLayout.BoxesUnlocked = value; } public override byte[] BoxFlags { get => Blocks.BoxLayout.BoxFlags; set => Blocks.BoxLayout.BoxFlags = value; } - public override bool BattleBoxLocked + public bool BattleBoxLocked { get => Blocks.BattleBox.Locked; set => Blocks.BattleBox.Locked = value; diff --git a/PKHeX.Core/Saves/SAV6XY.cs b/PKHeX.Core/Saves/SAV6XY.cs index f0fdb63bb..00c60480c 100644 --- a/PKHeX.Core/Saves/SAV6XY.cs +++ b/PKHeX.Core/Saves/SAV6XY.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Linq; using System.Text; namespace PKHeX.Core @@ -95,6 +96,13 @@ private void Initialize() public override void SetDaycareOccupied(int loc, int slot, bool occupied) => Data[DaycareOffset + ((SIZE_STORED + 8) * slot)] = (byte)(occupied ? 1 : 0); public override void SetDaycareEXP(int loc, int slot, uint EXP) => BitConverter.GetBytes(EXP).CopyTo(Data, DaycareOffset + 4 + ((SIZE_STORED + 8) * slot)); + public override string GetDaycareRNGSeed(int loc) + { + int ofs = DaycareOffset; + var data = Data.Skip(ofs + 0x1E8).Take(DaycareSeedSize / 2).Reverse().ToArray(); + return BitConverter.ToString(data).Replace("-", string.Empty); + } + public override void SetDaycareRNGSeed(int loc, string seed) { if (loc != 0) @@ -180,7 +188,7 @@ public override GameVersion Version public override int BoxesUnlocked { get => Blocks.BoxLayout.BoxesUnlocked; set => Blocks.BoxLayout.BoxesUnlocked = value; } public override byte[] BoxFlags { get => Blocks.BoxLayout.BoxFlags; set => Blocks.BoxLayout.BoxFlags = value; } - public override bool BattleBoxLocked + public bool BattleBoxLocked { get => Blocks.BattleBox.Locked; set => Blocks.BattleBox.Locked = value; diff --git a/PKHeX.Core/Saves/SAV7b.cs b/PKHeX.Core/Saves/SAV7b.cs index 7ce4b7d1b..a5b41f8d2 100644 --- a/PKHeX.Core/Saves/SAV7b.cs +++ b/PKHeX.Core/Saves/SAV7b.cs @@ -18,6 +18,7 @@ public sealed class SAV7b : SAV_BEEF public override PKM BlankPKM => new PB7(); public override int SIZE_STORED => SIZE_PARTY; protected override int SIZE_PARTY => 260; + public override byte[] GetDataForBox(PKM pkm) => pkm.EncryptedPartyData; public override PersonalTable Personal => PersonalTable.GG; public override IReadOnlyList HeldItems => Legal.HeldItems_GG; diff --git a/PKHeX.Core/Saves/SAV8.cs b/PKHeX.Core/Saves/SAV8.cs index 7f82f4de9..b24b341c1 100644 --- a/PKHeX.Core/Saves/SAV8.cs +++ b/PKHeX.Core/Saves/SAV8.cs @@ -6,12 +6,12 @@ namespace PKHeX.Core /// /// Generation 8 object. /// - public abstract class SAV8 : SAV_BEEF, ITrainerStatRecord, ISaveBlock8Main + public abstract class SAV8 : SaveFile, ISaveBlock8Main { // Save Data Attributes protected override string BAKText => $"{OT} ({Version}) - {Played.LastSavedTime}"; - public override string Filter => "savedata|*.bin"; - public override string Extension => ".bin"; + public override string Filter => "Main SAV|*.*"; + public override string Extension => string.Empty; public override string[] PKMExtensions => PKM.Extensions.Where(f => { @@ -19,14 +19,8 @@ public abstract class SAV8 : SAV_BEEF, ITrainerStatRecord, ISaveBlock8Main return gen == 8; // future: change to <= when HOME released }).ToArray(); - protected SAV8(byte[] data, int biOffset) : base(data, biOffset) - { - } - - protected SAV8(int size, int biOffset) : base(size, biOffset) - { - ClearBoxes(); - } + protected SAV8(byte[] data) : base(data) { } + protected SAV8() { } // Configuration public override int SIZE_STORED => PKX.SIZE_8STORED; @@ -46,27 +40,19 @@ protected SAV8(int size, int biOffset) : base(size, biOffset) protected override byte[] DecryptPKM(byte[] data) => PKX.DecryptArray8(data); #region Blocks + public abstract Box8 BoxInfo { get; } + public abstract Party8 PartyInfo { get; } public abstract MyItem Items { get; } - public abstract Record8 Records { get; } public abstract PlayTime8 Played { get; } public abstract MyStatus8 MyStatus { get; } - public abstract ConfigSave8 Config { get; } - public abstract GameTime8 GameTime { get; } public abstract Misc8 Misc { get; } public abstract Zukan8 Zukan { get; } - public abstract EventWork8 EventWork { get; } public abstract BoxLayout8 BoxLayout { get; } - public abstract Situation8 Situation { get; } - public abstract FieldMoveModelSave8 Overworld { get; } + public abstract Fused8 Fused { get; } + public abstract Daycare8 Daycare { get; } + public abstract Record8 Records { get; } #endregion - // Feature Overrides - protected override byte[] GetFinalData() - { - SetChecksums(); - return Data; - } - public override GameVersion Version { get @@ -92,40 +78,24 @@ public override byte[] SetString(string value, int maxLength, int PadToSize = 0, public override int SID { get => MyStatus.SID; set => MyStatus.SID = value; } public override int Game { get => MyStatus.Game; set => MyStatus.Game = value; } public override int Gender { get => MyStatus.Gender; set => MyStatus.Gender = value; } - public override int SubRegion { get => MyStatus.SubRegion; set => MyStatus.SubRegion = value; } - public override int Country { get => MyStatus.Country; set => MyStatus.Country = value; } - public override int ConsoleRegion { get => MyStatus.ConsoleRegion; set => MyStatus.ConsoleRegion = value; } public override int Language { get => MyStatus.Language; set => MyStatus.Language = value; } public override string OT { get => MyStatus.OT; set => MyStatus.OT = value; } public override uint Money { get => Misc.Money; set => Misc.Money = value; } + public int Badges { get => Misc.Badges; set => Misc.Badges = value; } public override int PlayedHours { get => Played.PlayedHours; set => Played.PlayedHours = value; } public override int PlayedMinutes { get => Played.PlayedMinutes; set => Played.PlayedMinutes = value; } public override int PlayedSeconds { get => Played.PlayedSeconds; set => Played.PlayedSeconds = value; } - public override uint SecondsToStart { get => GameTime.SecondsToStart; set => GameTime.SecondsToStart = value; } - public override uint SecondsToFame { get => GameTime.SecondsToFame; set => GameTime.SecondsToFame = value; } - - // Stat Records - public int RecordCount => 200; - public int GetRecord(int recordID) => Records.GetRecord(recordID); - public void SetRecord(int recordID, int value) => Records.SetRecord(recordID, value); - public int GetRecordMax(int recordID) => Records.GetRecordMax(recordID); - public int GetRecordOffset(int recordID) => Records.GetRecordOffset(recordID); // Inventory public override InventoryPouch[] Inventory { get => Items.Inventory; set => Items.Inventory = value; } // Storage public override int GetPartyOffset(int slot) => Party + (SIZE_PARTY * slot); - public override int GetBoxOffset(int box) => Box + (SIZE_STORED * box * 30); - protected override int GetBoxWallpaperOffset(int box) => BoxLayout.GetBoxWallpaperOffset(box); - public override int GetBoxWallpaper(int box) => BoxLayout.GetBoxWallpaper(box); - public override void SetBoxWallpaper(int box, int value) => BoxLayout.SetBoxWallpaper(box, value); + public override int GetBoxOffset(int box) => Box + (SIZE_PARTY * box * 30); public override string GetBoxName(int box) => BoxLayout[box]; public override void SetBoxName(int box, string value) => BoxLayout[box] = value; - public override int CurrentBox { get => BoxLayout.CurrentBox; set => BoxLayout.CurrentBox = value; } - public override int BoxesUnlocked { get => BoxLayout.BoxesUnlocked; set => BoxLayout.BoxesUnlocked = value; } - public override byte[] BoxFlags { get => BoxLayout.BoxFlags; set => BoxLayout.BoxFlags = value; } + public override byte[] GetDataForBox(PKM pkm) => pkm.EncryptedPartyData; protected override void SetPKM(PKM pkm) { @@ -148,17 +118,6 @@ protected override void SetPKM(PKM pkm) private void AddCountAcquired(PKM pkm) { - Records.AddRecord(pkm.WasEgg ? 008 : 006); // egg, capture - if (pkm.CurrentHandler == 1) - Records.AddRecord(011); // trade - if (!pkm.WasEgg) - Records.AddRecord(004); // wild encounters - } - - protected override void SetPartyValues(PKM pkm, bool isParty) - { - base.SetPartyValues(pkm, isParty); - ((PK8)pkm).FormDuration = GetFormDuration(pkm, isParty); } private static uint GetFormDuration(PKM pkm, bool isParty) @@ -179,8 +138,14 @@ private static uint GetFormDuration(PKM pkm, bool isParty) public override int PartyCount { - get => Data[Party + (6 * SIZE_PARTY)]; - protected set => Data[Party + (6 * SIZE_PARTY)] = (byte)value; + get => PartyInfo.PartyCount; + protected set => PartyInfo.PartyCount = value; } + + protected override byte[] BoxBuffer => BoxInfo.Data; + protected override byte[] PartyBuffer => PartyInfo.Data; + public override int GetBoxSlotOffset(int box, int slot) => GetBoxOffset(box) + (slot * SIZE_PARTY); // party format in boxes! + public override PKM GetDecryptedPKM(byte[] data) => GetPKM(DecryptPKM(data)); + public override PKM GetBoxSlot(int offset) => GetDecryptedPKM(GetData(BoxInfo.Data, offset, SIZE_PARTY)); // party format in boxes! } } \ No newline at end of file diff --git a/PKHeX.Core/Saves/SAV8SWSH.cs b/PKHeX.Core/Saves/SAV8SWSH.cs index 0cd4c3b16..22b2653db 100644 --- a/PKHeX.Core/Saves/SAV8SWSH.cs +++ b/PKHeX.Core/Saves/SAV8SWSH.cs @@ -1,45 +1,71 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; +using System.Linq; namespace PKHeX.Core { /// /// Generation 8 object for games. /// - public sealed class SAV8SWSH : SAV8, ISaveBlock8SWSH + public sealed class SAV8SWSH : SAV8, ISaveBlock8SWSH, ITrainerStatRecord { - public SAV8SWSH(byte[] data) : base(data, SaveBlockAccessorSWSH.boGG) + public SAV8SWSH(byte[] data) : this(data, SwishCrypto.Decrypt(data)) { + } + + private SAV8SWSH(byte[] data, IReadOnlyList blocks) : base(data) + { + Data = Array.Empty(); + AllBlocks = blocks; Blocks = new SaveBlockAccessorSWSH(this); Initialize(); } - public SAV8SWSH() : base(SaveUtil.SIZE_G8SWSH, SaveBlockAccessorSWSH.boGG) + public SAV8SWSH() { + AllBlocks = Meta8.GetBlankDataSWSH(); Blocks = new SaveBlockAccessorSWSH(this); Initialize(); + ClearBoxes(); } + public override void CopyChangesFrom(SaveFile sav) + { + // Absorb changes from all blocks + var z = (SAV8SWSH)sav; + var mine = AllBlocks; + var newB = z.AllBlocks; + for (int i = 0; i < mine.Count; i++) + mine[i].Data = newB[i].Data; + Edited = true; + } + + public IReadOnlyList AllBlocks { get; } + public override bool ChecksumsValid => true; + public override string ChecksumInfo => string.Empty; + protected override void SetChecksums() { } // None! + protected override byte[] GetFinalData() => SwishCrypto.Encrypt(AllBlocks); + public override PersonalTable Personal => PersonalTable.SWSH; public override IReadOnlyList HeldItems => Legal.HeldItems_SWSH; #region Blocks public SaveBlockAccessorSWSH Blocks { get; } - public override IReadOnlyList AllBlocks => Blocks.BlockInfo; + public override Box8 BoxInfo => Blocks.BoxInfo; + public override Party8 PartyInfo => Blocks.PartyInfo; public override MyItem Items => Blocks.Items; - public override Record8 Records => Blocks.Records; - public override PlayTime8 Played => Blocks.Played; public override MyStatus8 MyStatus => Blocks.MyStatus; - public override ConfigSave8 Config => Blocks.Config; - public override GameTime8 GameTime => Blocks.GameTime; public override Misc8 Misc => Blocks.Misc; public override Zukan8 Zukan => Blocks.Zukan; - public override EventWork8 EventWork => Blocks.EventWork; public override BoxLayout8 BoxLayout => Blocks.BoxLayout; - public override Situation8 Situation => Blocks.Situation; - public override FieldMoveModelSave8 Overworld => Blocks.Overworld; + public override PlayTime8 Played => Blocks.Played; + public override Fused8 Fused => Blocks.Fused; + public override Daycare8 Daycare => Blocks.Daycare; + public override Record8 Records => Blocks.Records; #endregion - public override SaveFile Clone() => new SAV8SWSH((byte[])Data.Clone()); + public override SaveFile Clone() => new SAV8SWSH(BAK, AllBlocks.Select(z => z.Clone()).ToArray()); + public override int MaxMoveID => Legal.MaxMoveID_8; public override int MaxSpeciesID => Legal.MaxSpeciesID_8; public override int MaxItemID => Legal.MaxItemID_8; @@ -49,6 +75,35 @@ public SAV8SWSH() : base(SaveUtil.SIZE_G8SWSH, SaveBlockAccessorSWSH.boGG) private void Initialize() { + Box = 0; + Party = 0; + PokeDex = 0; } + + protected override void SetPartyValues(PKM pkm, bool isParty) + { + base.SetPartyValues(pkm, isParty); + ((PK8)pkm).FormDuration = GetFormDuration(pkm, isParty); + } + + private static uint GetFormDuration(PKM pkm, bool isParty) + { + if (!isParty || pkm.AltForm == 0) + return 0; + + // Neither species is available in SW/SH, but the game code still does this! + return pkm.Species switch + { + (int)Species.Furfrou => 5u, // Furfrou + (int)Species.Hoopa => 3u, // Hoopa + _ => 0u + }; + } + + public int GetRecord(int recordID) => Records.GetRecord(recordID); + public void SetRecord(int recordID, int value) => Records.SetRecord(recordID, value); + public int GetRecordMax(int recordID) => Records.GetRecordMax(recordID); + public int GetRecordOffset(int recordID) => Records.GetRecordOffset(recordID); + public int RecordCount => Record8.RecordCount; } } \ No newline at end of file diff --git a/PKHeX.Core/Saves/SaveFile.cs b/PKHeX.Core/Saves/SaveFile.cs index 28578df06..9978fb70d 100644 --- a/PKHeX.Core/Saves/SaveFile.cs +++ b/PKHeX.Core/Saves/SaveFile.cs @@ -80,7 +80,8 @@ protected virtual byte[] GetFinalData() #endregion #region Savedata Container Handling - public byte[] GetData(int offset, int length) => Data.Slice(offset, length); + public byte[] GetData(int offset, int length) => GetData(Data, offset, length); + public byte[] GetData(byte[] data, int offset, int length) => data.Slice(offset, length); public void SetData(byte[] input, int offset) => SetData(Data, input, offset); public void SetData(byte[] dest, byte[] input, int offset) @@ -112,35 +113,6 @@ public void SetData(byte[] dest, byte[] input, int offset) public virtual int MinGameID => 0; #endregion - #region Battle Box - public int BattleBoxOffset { get; protected set; } = int.MinValue; - public bool HasBattleBox => BattleBoxOffset > -1; - public int GetBattleBoxOffset(int index) => BattleBoxOffset + (SIZE_STORED * index); - public virtual bool BattleBoxLocked { get => false; set { } } - - public IList BattleBoxData - { - get - { - if (!HasBattleBox) - return Array.Empty(); - - PKM[] data = new PKM[6]; - for (int i = 0; i < data.Length; i++) - { - data[i] = GetStoredSlot(GetBattleBoxOffset(i)); - if (BattleBoxLocked) - data[i].StorageFlags |= StorageSlotFlag.Locked; - if (data[i].Species != 0) - continue; - Array.Resize(ref data, i); - return data; - } - return data; - } - } - #endregion - #region Event Work public virtual bool HasEvents => EventFlags.Length != 0; protected virtual int EventFlagMax { get; } = int.MinValue; @@ -326,7 +298,7 @@ public IList PartyData { PKM[] data = new PKM[PartyCount]; for (int i = 0; i < data.Length; i++) - data[i] = GetPartySlot(GetPartyOffset(i)); + data[i] = GetPartySlot(PartyBuffer, GetPartyOffset(i)); return data; } set @@ -340,9 +312,9 @@ public IList PartyData int ctr = 0; foreach (var exist in value.Where(pk => pk.Species != 0)) - SetPartySlot(exist, GetPartyOffset(ctr++)); + SetPartySlot(exist, PartyBuffer, GetPartyOffset(ctr++)); for (int i = ctr; i < 6; i++) - SetPartySlot(BlankPKM, GetPartyOffset(i)); + SetPartySlot(BlankPKM, PartyBuffer, GetPartyOffset(i)); } } #endregion @@ -370,7 +342,7 @@ public IList PartyData public virtual void SetDaycareOccupied(int loc, int slot, bool occupied) { } #endregion - public PKM GetPartySlotAtIndex(int index) => GetPartySlot(GetPartyOffset(index)); + public PKM GetPartySlotAtIndex(int index) => GetPartySlot(PartyBuffer, GetPartyOffset(index)); public void SetPartySlotAtIndex(PKM pkm, int index, PKMImportSetting trade = PKMImportSetting.UseDefault, PKMImportSetting dex = PKMImportSetting.UseDefault) { @@ -389,37 +361,47 @@ public void SetPartySlotAtIndex(PKM pkm, int index, PKMImportSetting trade = PKM } int offset = GetPartyOffset(index); - SetPartySlot(pkm, offset, trade, dex); + SetPartySlot(pkm, PartyBuffer, offset, trade, dex); } - public void SetPartySlot(PKM pkm, int offset, PKMImportSetting trade = PKMImportSetting.UseDefault, PKMImportSetting dex = PKMImportSetting.UseDefault) + public void SetSlotFormatParty(PKM pkm, byte[] data, int offset, PKMImportSetting trade = PKMImportSetting.UseDefault, PKMImportSetting dex = PKMImportSetting.UseDefault) { if (pkm.GetType() != PKMType) throw new ArgumentException($"PKM Format needs to be {PKMType} when setting to this Save File."); UpdatePKM(pkm, trade, dex); SetPartyValues(pkm, isParty: true); - WritePartySlot(pkm, offset); + WritePartySlot(pkm, data, offset); } - public void SetStoredSlot(PKM pkm, int offset, PKMImportSetting trade = PKMImportSetting.UseDefault, PKMImportSetting dex = PKMImportSetting.UseDefault) + public void SetPartySlot(PKM pkm, byte[] data, int offset, PKMImportSetting trade = PKMImportSetting.UseDefault, PKMImportSetting dex = PKMImportSetting.UseDefault) + { + if (pkm.GetType() != PKMType) + throw new ArgumentException($"PKM Format needs to be {PKMType} when setting to this Save File."); + + UpdatePKM(pkm, trade, dex); + SetPartyValues(pkm, isParty: true); + WritePartySlot(pkm, data, offset); + } + + public void SetSlotFormatStored(PKM pkm, byte[] data, int offset, PKMImportSetting trade = PKMImportSetting.UseDefault, PKMImportSetting dex = PKMImportSetting.UseDefault) { if (pkm.GetType() != PKMType) throw new ArgumentException($"PKM Format needs to be {PKMType} when setting to this Save File."); UpdatePKM(pkm, trade, dex); SetPartyValues(pkm, isParty: false); - WriteStoredSlot(pkm, offset); + WriteSlotFormatStored(pkm, data, offset); } - public void SetBoxSlot(PKM pkm, int offset, PKMImportSetting trade = PKMImportSetting.UseDefault, PKMImportSetting dex = PKMImportSetting.UseDefault) + public void SetBoxSlot(PKM pkm, byte[] data, int offset, PKMImportSetting trade = PKMImportSetting.UseDefault, PKMImportSetting dex = PKMImportSetting.UseDefault) { if (pkm.GetType() != PKMType) throw new ArgumentException($"PKM Format needs to be {PKMType} when setting to this Save File."); UpdatePKM(pkm, trade, dex); SetPartyValues(pkm, isParty: false); - WriteBoxSlot(pkm, offset); + WriteBoxSlot(pkm, data, offset); } public void DeletePartySlot(int slot) @@ -450,13 +432,23 @@ public void DeletePartySlot(int slot) public abstract int MaxEV { get; } public virtual int MaxIV => 31; public abstract IReadOnlyList HeldItems { get; } + protected virtual byte[] BoxBuffer => Data; + protected virtual byte[] PartyBuffer => Data; public virtual bool IsPKMPresent(byte[] data, int offset) => PKX.IsPKMPresent(data, offset); public virtual PKM GetDecryptedPKM(byte[] data) => GetPKM(DecryptPKM(data)); - public virtual PKM GetPartySlot(int offset) => GetDecryptedPKM(GetData(offset, SIZE_PARTY)); - public virtual PKM GetStoredSlot(int offset) => GetDecryptedPKM(GetData(offset, SIZE_STORED)); - public virtual PKM GetBoxSlot(int offset) => GetStoredSlot(offset); - protected virtual void WritePartySlot(PKM pkm, int offset) => SetData(pkm.EncryptedPartyData, offset); - protected virtual void WriteStoredSlot(PKM pkm, int offset) => SetData(pkm.EncryptedBoxData, offset); + public virtual PKM GetPartySlot(byte[] data, int offset) => GetDecryptedPKM(GetData(data, offset, SIZE_PARTY)); + public virtual PKM GetStoredSlot(byte[] data, int offset) => GetDecryptedPKM(GetData(data, offset, SIZE_STORED)); + public virtual PKM GetBoxSlot(int offset) => GetStoredSlot(BoxBuffer, offset); + + public virtual byte[] GetDataForFormatStored(PKM pkm) => pkm.EncryptedBoxData; + public virtual byte[] GetDataForFormatParty(PKM pkm) => pkm.EncryptedPartyData; + public virtual byte[] GetDataForParty(PKM pkm) => pkm.EncryptedPartyData; + public virtual byte[] GetDataForBox(PKM pkm) => pkm.EncryptedBoxData; + + public virtual void WriteSlotFormatStored(PKM pkm, byte[] data, int offset) => SetData(data, GetDataForFormatStored(pkm), offset); + public virtual void WriteSlotFormatParty(PKM pkm, byte[] data, int offset) => SetData(data, GetDataForFormatParty(pkm), offset); + public virtual void WritePartySlot(PKM pkm, byte[] data, int offset) => SetData(data, GetDataForParty(pkm), offset); + public virtual void WriteBoxSlot(PKM pkm, byte[] data, int offset) => SetData(data, GetDataForBox(pkm), offset); protected virtual void SetPartyValues(PKM pkm, bool isParty) { @@ -513,8 +505,6 @@ private static bool GetDexUpdateSetting(PKMImportSetting trade = PKMImportSettin public virtual byte[] BoxFlags { get => Array.Empty(); set { } } public virtual int CurrentBox { get; set; } - protected virtual void WriteBoxSlot(PKM pkm, int offset) => SetData(pkm.EncryptedBoxData, offset); - #region BoxData protected int Box { get; set; } = int.MinValue; @@ -592,7 +582,7 @@ public void AddBoxData(IList data, int box, int index) public int NextOpenBoxSlot(int lastKnownOccupied = -1) { - var storage = StorageData; + var storage = BoxBuffer; int count = BoxSlotCount * BoxCount; for (int i = lastKnownOccupied + 1; i < count; i++) { @@ -622,7 +612,7 @@ public bool IsAnySlotLockedInBox(int BoxStart, int BoxEnd) #region Storage Offsets and Indexing public abstract int GetBoxOffset(int box); - public int GetBoxSlotOffset(int box, int slot) => GetBoxOffset(box) + (slot * SIZE_STORED); + public virtual int GetBoxSlotOffset(int box, int slot) => GetBoxOffset(box) + (slot * SIZE_STORED); public PKM GetBoxSlotAtIndex(int box, int slot) => GetBoxSlot(GetBoxSlotOffset(box, slot)); public void GetBoxSlotFromIndex(int index, out int box, out int slot) @@ -646,14 +636,13 @@ public int GetBoxSlotOffset(int index) } public void SetBoxSlotAtIndex(PKM pkm, int box, int slot, PKMImportSetting trade = PKMImportSetting.UseDefault, PKMImportSetting dex = PKMImportSetting.UseDefault) - => SetBoxSlot(pkm, GetBoxSlotOffset(box, slot), trade, dex); + => SetBoxSlot(pkm, BoxBuffer, GetBoxSlotOffset(box, slot), trade, dex); public void SetBoxSlotAtIndex(PKM pkm, int index, PKMImportSetting trade = PKMImportSetting.UseDefault, PKMImportSetting dex = PKMImportSetting.UseDefault) - => SetBoxSlot(pkm, GetBoxSlotOffset(index), trade, dex); + => SetBoxSlot(pkm, BoxBuffer, GetBoxSlotOffset(index), trade, dex); #endregion #region Storage Manipulations - protected virtual byte[] StorageData => Data; public bool MoveBox(int box, int insertBeforeBox) { @@ -662,7 +651,7 @@ public bool MoveBox(int box, int insertBeforeBox) if (box >= BoxCount || insertBeforeBox >= BoxCount) // invalid box positions return false; - MoveBox(box, insertBeforeBox, StorageData); + MoveBox(box, insertBeforeBox, BoxBuffer); return true; } @@ -710,7 +699,7 @@ public bool SwapBox(int box1, int box2) if (!IsBoxAbleToMove(box1) || !IsBoxAbleToMove(box2)) return false; - SwapBox(box1, box2, StorageData); + SwapBox(box1, box2, BoxBuffer); return true; } @@ -788,7 +777,7 @@ public int SortBoxes(int BoxStart = 0, int BoxEnd = -1, Func, I /// Count of actual stored. /// Important slot pointers that need to be repointed if a slot moves. /// True if was updated, false if no update done. - public bool CompressStorage(out int storedCount, params IList[] slotPointers) => this.CompressStorage(StorageData, out storedCount, slotPointers); + public bool CompressStorage(out int storedCount, params IList[] slotPointers) => this.CompressStorage(BoxBuffer, out storedCount, slotPointers); /// /// Removes all present within the range specified by and if the provied is satisfied. @@ -799,7 +788,7 @@ public int SortBoxes(int BoxStart = 0, int BoxEnd = -1, Func, I /// Count of deleted slots. public int ClearBoxes(int BoxStart = 0, int BoxEnd = -1, Func? deleteCriteria = null) { - var storage = StorageData; + var storage = BoxBuffer; if (BoxEnd < 0) BoxEnd = BoxCount - 1; @@ -841,7 +830,7 @@ public int ModifyBoxes(Action action, int BoxStart = 0, int BoxEnd = -1) if (BoxEnd < 0) BoxEnd = BoxCount - 1; - var storage = StorageData; + var storage = BoxBuffer; int modified = 0; for (int b = BoxStart; b <= BoxEnd; b++) { @@ -855,7 +844,7 @@ public int ModifyBoxes(Action action, int BoxStart = 0, int BoxEnd = -1) var pk = GetBoxSlotAtIndex(b, s); action(pk); ++modified; - SetBoxSlot(pk, ofs, PKMImportSetting.Skip, PKMImportSetting.Skip); + SetBoxSlot(pk, storage, ofs, PKMImportSetting.Skip, PKMImportSetting.Skip); } } return modified; diff --git a/PKHeX.Core/Saves/Substructures/Gen7/MyItem.cs b/PKHeX.Core/Saves/Substructures/Gen7/MyItem.cs index 0f0df519d..12708dade 100644 --- a/PKHeX.Core/Saves/Substructures/Gen7/MyItem.cs +++ b/PKHeX.Core/Saves/Substructures/Gen7/MyItem.cs @@ -4,5 +4,6 @@ public abstract class MyItem : SaveBlock { public abstract InventoryPouch[] Inventory { get; set; } protected MyItem(SaveFile SAV) : base(SAV) { } + protected MyItem(SaveFile SAV, byte[] data) : base(SAV, data) { } } } \ No newline at end of file diff --git a/PKHeX.Core/Saves/Substructures/Gen7/ResortSave7.cs b/PKHeX.Core/Saves/Substructures/Gen7/ResortSave7.cs index 0f4a4a0ce..8b5331837 100644 --- a/PKHeX.Core/Saves/Substructures/Gen7/ResortSave7.cs +++ b/PKHeX.Core/Saves/Substructures/Gen7/ResortSave7.cs @@ -28,7 +28,7 @@ public PKM[] ResortPKM throw new ArgumentException(nameof(ResortCount)); for (int i = 0; i < value.Length; i++) - SAV.SetStoredSlot(value[i], GetResortSlotOffset(i)); + SAV.SetSlotFormatStored(value[i], Data, GetResortSlotOffset(i)); } } diff --git a/PKHeX.Core/Saves/Substructures/Gen7/SaveBlock.cs b/PKHeX.Core/Saves/Substructures/Gen7/SaveBlock.cs index 41c87c605..061fe673c 100644 --- a/PKHeX.Core/Saves/Substructures/Gen7/SaveBlock.cs +++ b/PKHeX.Core/Saves/Substructures/Gen7/SaveBlock.cs @@ -6,8 +6,14 @@ namespace PKHeX.Core public abstract class SaveBlock { public int Offset { get; protected set; } - protected readonly byte[] Data; + public readonly byte[] Data; protected readonly SaveFile SAV; protected SaveBlock(SaveFile sav) => Data = (SAV = sav).Data; + + protected SaveBlock(SaveFile sav, byte[] data) + { + SAV = sav; + Data = data; + } } } \ No newline at end of file diff --git a/PKHeX.Core/Saves/Substructures/Gen7/Situation8.cs b/PKHeX.Core/Saves/Substructures/Gen7/Situation8.cs deleted file mode 100644 index b946dc545..000000000 --- a/PKHeX.Core/Saves/Substructures/Gen7/Situation8.cs +++ /dev/null @@ -1,62 +0,0 @@ -using System; - -namespace PKHeX.Core -{ - public sealed class Situation8 : SaveBlock - { - public Situation8(SAV8SWSH sav, int offset) : base(sav) => Offset = offset; - - // "StartLocation" - public int M { get => BitConverter.ToUInt16(Data, Offset + 0x00); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, Offset + 0x00); } - public float X { get => BitConverter.ToSingle(Data, Offset + 0x08); set => BitConverter.GetBytes(value).CopyTo(Data, Offset + 0x08); } - public float Z { get => BitConverter.ToSingle(Data, Offset + 0x10); set => BitConverter.GetBytes(value).CopyTo(Data, Offset + 0x10); } - public float Y { get => (int)BitConverter.ToSingle(Data, Offset + 0x18); set => BitConverter.GetBytes(value).CopyTo(Data, Offset + 0x18); } - public float R { get => (int)BitConverter.ToSingle(Data, Offset + 0x20); set => BitConverter.GetBytes(value).CopyTo(Data, Offset + 0x20); } - - public void UpdateOverworldCoordinates() - { - var o = ((SAV8)SAV).Overworld; - o.M = M; - o.X = X; - o.Z = Z; - o.Y = Y; - o.R = R; - } - - public int SpecialLocation - { - get => Data[Offset + 0x24]; - set => Data[Offset + 0x24] = (byte)value; - } - - public int WarpContinueRequest - { - get => Data[Offset + 0x6E]; - set => Data[Offset + 0x6E] = (byte)value; - } - - public int StepCountEgg - { - get => BitConverter.ToInt32(Data, Offset + 0x70); - set => BitConverter.GetBytes(value).CopyTo(Data, Offset + 0x70); - } - - public int LastZoneID - { - get => BitConverter.ToUInt16(Data, Offset + 0x74); - set => BitConverter.GetBytes((ushort)value).CopyTo(Data, Offset + 0x74); - } - - public int StepCountFriendship - { - get => BitConverter.ToUInt16(Data, Offset + 0x76); - set => BitConverter.GetBytes((ushort)value).CopyTo(Data, Offset + 0x76); - } - - public int StepCountAffection // Kawaigari - { - get => BitConverter.ToUInt16(Data, Offset + 0x78); - set => BitConverter.GetBytes((ushort)value).CopyTo(Data, Offset + 0x78); - } - } -} \ No newline at end of file diff --git a/PKHeX.Core/Saves/Substructures/Gen8/Box8.cs b/PKHeX.Core/Saves/Substructures/Gen8/Box8.cs new file mode 100644 index 000000000..8cf837e47 --- /dev/null +++ b/PKHeX.Core/Saves/Substructures/Gen8/Box8.cs @@ -0,0 +1,7 @@ +namespace PKHeX.Core +{ + public sealed class Box8 : SaveBlock + { + public Box8(SaveFile sav, SCBlock block) : base(sav, block.Data) { } + } +} diff --git a/PKHeX.Core/Saves/Substructures/Gen8/BoxLayout8.cs b/PKHeX.Core/Saves/Substructures/Gen8/BoxLayout8.cs index c755321f2..d238e94be 100644 --- a/PKHeX.Core/Saves/Substructures/Gen8/BoxLayout8.cs +++ b/PKHeX.Core/Saves/Substructures/Gen8/BoxLayout8.cs @@ -2,35 +2,13 @@ { public sealed class BoxLayout8 : SaveBlock { - public const int BoxCount = 32; // todo - - private const int BattleBoxFlags = 0x4C4; - private const int PCBackgrounds = 0x5C0; - private const int PCFlags = 0x5E0; - private const int Unlocked = 0x5E1; - private const int LastViewedBoxOffset = 0x5E3; + public const int BoxCount = 32; private const int strlen = SAV6.LongStringLength / 2; - public BoxLayout8(SAV8SWSH sav, int offset) : base(sav) => Offset = offset; + public BoxLayout8(SAV8SWSH sav, SCBlock block) : base(sav, block.Data) { } - public int GetBoxWallpaperOffset(int box) => -1; // Offset + PCBackgrounds + box; - - public int GetBoxWallpaper(int box) - { - if ((uint)box > SAV.BoxCount) - return 0; - return Data[GetBoxWallpaperOffset(box)]; - } - - public void SetBoxWallpaper(int box, int value) - { - if ((uint)box > SAV.BoxCount) - return; - Data[GetBoxWallpaperOffset(box)] = (byte)value; - } - - private int GetBoxNameOffset(int box) => Offset + (SAV6.LongStringLength * box); + private int GetBoxNameOffset(int box) => SAV6.LongStringLength * box; public string GetBoxName(int box) { @@ -41,33 +19,9 @@ public void SetBoxName(int box, string value) { var data = SAV.SetString(value, strlen, strlen, 0); var offset = GetBoxNameOffset(box) + (SAV6.LongStringLength * box); - SAV.SetData(data, offset); + SAV.SetData(Data, data, offset); } - public byte[] BoxFlags - { - get => new[] { Data[Offset + PCFlags] }; // bits for wallpaper unlocks - set - { - if (value.Length != 1) - return; - Data[Offset + PCFlags] = value[0]; - } - } - - public int BoxesUnlocked - { - get => Data[Offset + Unlocked]; - set - { - if (value > BoxCount) - value = BoxCount; - Data[Offset + Unlocked] = (byte)value; - } - } - - public int CurrentBox { get => Data[Offset + LastViewedBoxOffset]; set => Data[Offset + LastViewedBoxOffset] = (byte)value; } - public string this[int i] { get => GetBoxName(i); diff --git a/PKHeX.Core/Saves/Substructures/Gen8/ConfigSave8.cs b/PKHeX.Core/Saves/Substructures/Gen8/ConfigSave8.cs deleted file mode 100644 index 7c5f803a7..000000000 --- a/PKHeX.Core/Saves/Substructures/Gen8/ConfigSave8.cs +++ /dev/null @@ -1,74 +0,0 @@ -using System; - -namespace PKHeX.Core -{ - public sealed class ConfigSave8 : SaveBlock - { - /* ===32 bits=== - * talkSpeed:2 0,1 - * battleAnim:1 2 - * battleStyle:1 3 - * unknown:9 4..12 - * buttonMode:2 13,14 - * boxStatus:1 15 - * everything else: unknown - */ - - public ConfigSave8(SAV8SWSH sav, int offset) : base(sav) => Offset = offset; - - public int ConfigValue - { - get => BitConverter.ToInt32(Data, Offset); - set => BitConverter.GetBytes(value).CopyTo(Data, Offset); - } - - public int TalkingSpeed - { - get => ConfigValue & 3; - set => ConfigValue = (ConfigValue & ~3) | (value & 3); - } - - public int BattleAnimation - { - // Effects OFF = 1, Effects ON = 0 - get => (ConfigValue >> 2) & 1; - set => ConfigValue = (ConfigValue & ~(1 << 2)) | (value << 2); - } - - public int BattleStyle - { - // SET = 1, SWITCH = 0 - get => (ConfigValue >> 3) & 1; - set => ConfigValue = (ConfigValue & ~(1 << 3)) | (value << 3); - } - - // UNKNOWN? - - public int ButtonMode - { - get => (ConfigValue >> 13) & 3; - set => ConfigValue = (ConfigValue & ~(1 << 13)) | (value << 13); - } - - public int BoxStatus - { - // MANUAL = 1, AUTOMATIC = 0 - get => (ConfigValue >> 15) & 1; - set => ConfigValue = (ConfigValue & ~(1 << 15)) | (value << 15); - } - - // NOTE: BELOW COMES FROM LGPE. MAYBE THIS IS WHAT THEY USE THE FLAGS FOR? - - /// - /// for messages, stored with skipped in the enumeration. - /// - public int Language - { - get => GetLanguageID((ConfigValue >> 4) & 0xF); - set => ConfigValue = ((ConfigValue & ~0xF0) | SetLanguageID(value) << 4); - } - - private static int GetLanguageID(int i) => i >= (int)LanguageID.UNUSED_6 ? i + 1 : i; // sets langBank to LanguageID - private static int SetLanguageID(int i) => i > (int)LanguageID.UNUSED_6 ? i - 1 : i; // sets LanguageID to langBank - } -} \ No newline at end of file diff --git a/PKHeX.Core/Saves/Substructures/Gen8/EventWork8.cs b/PKHeX.Core/Saves/Substructures/Gen8/EventWork8.cs index 545ab1411..2b4cd6274 100644 --- a/PKHeX.Core/Saves/Substructures/Gen8/EventWork8.cs +++ b/PKHeX.Core/Saves/Substructures/Gen8/EventWork8.cs @@ -4,10 +4,7 @@ namespace PKHeX.Core { public sealed class EventWork8 : SaveBlock, IEventWork { - public EventWork8(SAV8SWSH sav) : base(sav) - { - Offset = sav.Blocks.GetBlockOffset(SAV8BlockIndex.EventWork); - } + public EventWork8(SAV8SWSH sav, SCBlock block) : base(sav, block.Data) { } // Overall Layout private const int WorkCount = 1000; diff --git a/PKHeX.Core/Saves/Substructures/Gen8/FieldMoveModelSave8.cs b/PKHeX.Core/Saves/Substructures/Gen8/FieldMoveModelSave8.cs index 4b82da5fd..5420f7a63 100644 --- a/PKHeX.Core/Saves/Substructures/Gen8/FieldMoveModelSave8.cs +++ b/PKHeX.Core/Saves/Substructures/Gen8/FieldMoveModelSave8.cs @@ -4,12 +4,12 @@ namespace PKHeX.Core { public sealed class FieldMoveModelSave8 : SaveBlock { - public FieldMoveModelSave8(SAV8SWSH sav, int offset) : base(sav) => Offset = offset; + public FieldMoveModelSave8(SAV8SWSH sav, SCBlock block) : base(sav, block.Data) { } - public int M { get => BitConverter.ToUInt16(Data, Offset + 0x00); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, Offset + 0x00); } - public float X { get => BitConverter.ToSingle(Data, Offset + 0x08); set => BitConverter.GetBytes(value).CopyTo(Data, Offset + 0x08); } - public float Z { get => BitConverter.ToSingle(Data, Offset + 0x10); set => BitConverter.GetBytes(value).CopyTo(Data, Offset + 0x10); } - public float Y { get => (int)BitConverter.ToSingle(Data, Offset + 0x18); set => BitConverter.GetBytes(value).CopyTo(Data, Offset + 0x18); } - public float R { get => (int)BitConverter.ToSingle(Data, Offset + 0x20); set => BitConverter.GetBytes(value).CopyTo(Data, Offset + 0x20); } + public int M { get => BitConverter.ToUInt16(Data, 0x00); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x00); } + public float X { get => BitConverter.ToSingle(Data, 0x08); set => BitConverter.GetBytes(value).CopyTo(Data, 0x08); } + public float Z { get => BitConverter.ToSingle(Data, 0x10); set => BitConverter.GetBytes(value).CopyTo(Data, 0x10); } + public float Y { get => (int)BitConverter.ToSingle(Data, 0x18); set => BitConverter.GetBytes(value).CopyTo(Data, 0x18); } + public float R { get => (int)BitConverter.ToSingle(Data, 0x20); set => BitConverter.GetBytes(value).CopyTo(Data, 0x20); } } } \ No newline at end of file diff --git a/PKHeX.Core/Saves/Substructures/Gen8/Fused8.cs b/PKHeX.Core/Saves/Substructures/Gen8/Fused8.cs new file mode 100644 index 000000000..5a923e74f --- /dev/null +++ b/PKHeX.Core/Saves/Substructures/Gen8/Fused8.cs @@ -0,0 +1,66 @@ +using System; + +namespace PKHeX.Core +{ + public sealed class Fused8 : SaveBlock + { + public Fused8(SaveFile sav, SCBlock block) : base(sav, block.Data) { } + + public static int GetFusedSlotOffset(int slot) + { + if ((uint)slot >= 3) + return -1; + return PKX.SIZE_8PARTY * slot; + } + } + + public sealed class Daycare8 : SaveBlock + { + public Daycare8(SaveFile sav, SCBlock block) : base(sav, block.Data) { } + + private const int STRUCT_SIZE = 4 + PKX.SIZE_8STORED; + private const int DAYCARE_SIZE = (2 * STRUCT_SIZE) + 0x26; + + public bool GetDaycare1SlotOccupied(int slot) + { + if ((uint) slot >= 2) + throw new IndexOutOfRangeException(nameof(slot)); + + return Data[GetDaycare1StructOffset(slot)] == 1; + } + + public bool GetDaycare2SlotOccupied(int slot) + { + if ((uint)slot >= 2) + throw new IndexOutOfRangeException(nameof(slot)); + + return Data[GetDaycare2StructOffset(slot)] == 1; + } + + public static int GetDaycare1StructOffset(int slot) + { + if ((uint)slot >= 2) + throw new IndexOutOfRangeException(nameof(slot)); + + return 0 + (slot * STRUCT_SIZE); + } + + public static int GetDaycare2StructOffset(int slot) + { + if ((uint)slot >= 2) + throw new IndexOutOfRangeException(nameof(slot)); + + return DAYCARE_SIZE + (slot * STRUCT_SIZE); + } + + public static int GetDaycareSlotOffset(int daycare, int slot) + { + return daycare switch + { + 0 => (4 + GetDaycare1StructOffset(slot)), + 1 => (4 + GetDaycare2StructOffset(slot)), + _ => throw new IndexOutOfRangeException(nameof(daycare)) + }; + } + } +} \ No newline at end of file diff --git a/PKHeX.Core/Saves/Substructures/Gen8/GameTime8.cs b/PKHeX.Core/Saves/Substructures/Gen8/GameTime8.cs index 5ef3e88a9..d2488aedc 100644 --- a/PKHeX.Core/Saves/Substructures/Gen8/GameTime8.cs +++ b/PKHeX.Core/Saves/Substructures/Gen8/GameTime8.cs @@ -5,7 +5,7 @@ namespace PKHeX.Core public sealed class GameTime8 : SaveBlock { public GameTime8(SaveFile sav, int offset) : base(sav) => Offset = offset; - public uint SecondsToStart { get => BitConverter.ToUInt32(Data, Offset + 0x28); set => BitConverter.GetBytes(value).CopyTo(Data, Offset + 0x28); } - public uint SecondsToFame { get => BitConverter.ToUInt32(Data, Offset + 0x30); set => BitConverter.GetBytes(value).CopyTo(Data, Offset + 0x30); } + public uint SecondsToStart { get => BitConverter.ToUInt32(Data, 0x28); set => BitConverter.GetBytes(value).CopyTo(Data, 0x28); } + public uint SecondsToFame { get => BitConverter.ToUInt32(Data, 0x30); set => BitConverter.GetBytes(value).CopyTo(Data, 0x30); } } } \ No newline at end of file diff --git a/PKHeX.Core/Saves/Substructures/Gen8/Meta8.cs b/PKHeX.Core/Saves/Substructures/Gen8/Meta8.cs new file mode 100644 index 000000000..b01c5ac96 --- /dev/null +++ b/PKHeX.Core/Saves/Substructures/Gen8/Meta8.cs @@ -0,0 +1,105 @@ +using System; +using System.Collections.Generic; + +namespace PKHeX.Core +{ + public static class Meta8 + { + public static SCBlock[] GetBlankDataSWSH() => GetBlankBlockArray(DefaultChunkSizesSWSH, 2408); + + private static SCBlock[] GetBlankBlockArray(IReadOnlyList arr, int totalBlocks) + { + var blocks = new SCBlock[totalBlocks]; + for (int i = 0; i < blocks.Length; i++) + blocks[i] = new SCBlock {Data = Array.Empty()}; + + for (int i = 0; i < arr.Count; i += 2) + { + int index = arr[i]; + int length = arr[i + 1]; + blocks[index].Data = new byte[length]; + } + + return blocks; + } + + private static readonly int[] DefaultChunkSizesSWSH = + { + 0007, 0x00004, 0011, 0x00001, 0013, 0x00009, 0023, 0x00004, 0024, 0x00004, + 0025, 0x00004, 0048, 0x056F8, 0057, 0x00004, 0058, 0x00004, 0074, 0x00004, + 0075, 0x00004, 0076, 0x00004, 0097, 0x00004, 0104, 0x00004, 0105, 0x00004, + 0106, 0x00004, 0107, 0x00004, 0108, 0x00004, 0109, 0x00004, 0110, 0x00004, + 0111, 0x00004, 0112, 0x00004, 0113, 0x00004, 0114, 0x00004, 0115, 0x00004, + 0116, 0x00004, 0117, 0x00004, 0129, 0x00004, 0130, 0x00004, 0134, 0x00004, + 0136, 0x00004, 0141, 0x00004, 0142, 0x00004, 0143, 0x50A00, 0145, 0x00004, + 0147, 0x00004, 0148, 0x00001, 0150, 0x00004, 0151, 0x00004, 0168, 0x00004, + 0177, 0x00004, 0186, 0x017C8, 0190, 0x00004, 0191, 0x012F8, 0199, 0x00004, + 0201, 0x00004, 0210, 0x00004, 0217, 0x00004, 0229, 0x00880, 0231, 0x00648, + 0235, 0x00004, 0236, 0x00648, 0237, 0x00004, 0238, 0x00004, 0239, 0x00004, + 0240, 0x00004, 0241, 0x00004, 0242, 0x00004, 0243, 0x00004, 0244, 0x00004, + 0249, 0x00004, 0252, 0x00880, 0253, 0x06010, 0262, 0x00004, 0266, 0x00004, + 0268, 0x00880, 0269, 0x00004, 0272, 0x00880, 0273, 0x00084, 0275, 0x00440, + 0276, 0x00880, 0286, 0x00001, 0288, 0x0021C, 0308, 0x00004, 0352, 0x00132, + 0363, 0x00008, 0370, 0x00004, 0378, 0x00004, 0380, 0x00004, 0381, 0x00004, + 0382, 0x00004, 0386, 0x00004, 0387, 0x00004, 0398, 0x00004, 0399, 0x00004, + 0402, 0x00004, 0403, 0x00004, 0404, 0x00004, 0405, 0x00004, 0406, 0x00004, + 0407, 0x00004, 0408, 0x00004, 0409, 0x00004, 0414, 0x00004, 0418, 0x21FC0, + 0419, 0x00004, 0420, 0x00004, 0428, 0x00814, 0431, 0x00001, 0440, 0x00004, + 0465, 0x00570, 0470, 0x00004, 0476, 0x00020, 0481, 0x00004, 0484, 0x00008, + 0500, 0x00004, 0502, 0x00004, 0509, 0x00048, 0518, 0x00004, 0519, 0x00004, + 0526, 0x00004, 0532, 0x00004, 0536, 0x00004, 0539, 0x00004, 0544, 0x000C8, + 0546, 0x00004, 0549, 0x00D50, 0557, 0x00004, 0558, 0x00004, 0561, 0x00004, + 0570, 0x00004, 0582, 0x033D0, 0614, 0x00004, 0615, 0x00004, 0616, 0x00004, + 0617, 0x00004, 0619, 0x00002, 0626, 0x00004, 0627, 0x00004, 0629, 0x00001, + 0630, 0x00004, 0635, 0x00002, 0639, 0x00001, 0644, 0x00004, 0658, 0x00004, + 0659, 0x00004, 0661, 0x00001, 0668, 0x00038, 0678, 0x00004, 0692, 0x00028, + 0693, 0x00004, 0699, 0x04B00, 0705, 0x00004, 0718, 0x00004, 0727, 0x00004, + 0728, 0x00004, 0729, 0x00004, 0732, 0x00001, 0735, 0x00004, 0738, 0x00004, + 0741, 0x00004, 0743, 0x00004, 0748, 0x00004, 0777, 0x02964, 0811, 0x00004, + 0822, 0x02304, 0829, 0x02304, 0841, 0x02304, 0843, 0x00004, 0850, 0x02304, + 0865, 0x02304, 0871, 0x02304, 0877, 0x02304, 0879, 0x00004, 0889, 0x02304, + 0891, 0x00004, 0900, 0x00004, 0902, 0x00004, 0908, 0x00002, 0912, 0x00004, + 0916, 0x00001, 0926, 0x00810, 0928, 0x02304, 0929, 0x00004, 0933, 0x00004, + 0936, 0x00002, 0938, 0x00004, 0941, 0x00002, 0953, 0x02304, 0955, 0x00004, + 0971, 0x00004, 0980, 0x00004, 0987, 0x00004, 0988, 0x00004, 0992, 0x00004, + 0995, 0x00004, 0996, 0x0426C, 1002, 0x00004, 1003, 0x00004, 1012, 0x00004, + 1013, 0x00004, 1015, 0x00004, 1016, 0x00132, 1018, 0x00004, 1020, 0x00004, + 1024, 0x00004, 1027, 0x00002, 1039, 0x067D0, 1042, 0x00004, 1048, 0x00004, + 1058, 0x00004, 1059, 0x00004, 1060, 0x00001, 1061, 0x00132, 1065, 0x00004, + 1082, 0x00004, 1106, 0x00004, 1110, 0x00001, 1115, 0x04610, 1119, 0x00004, + 1123, 0x00004, 1128, 0x00004, 1129, 0x00004, 1134, 0x01F50, 1139, 0x00004, + 1146, 0x00004, 1151, 0x00004, 1158, 0x00004, 1169, 0x00020, 1173, 0x00008, + 1178, 0x00004, 1187, 0x00004, 1195, 0x00004, 1238, 0x00004, 1239, 0x00132, + 1251, 0x00004, 1256, 0x00004, 1259, 0x001D0, 1261, 0x00004, 1270, 0x033D0, + 1272, 0x033D0, 1278, 0x00004, 1288, 0x00004, 1298, 0x00004, 1300, 0x00004, + 1301, 0x00038, 1302, 0x00008, 1304, 0x00004, 1305, 0x000D0, 1308, 0x00004, + 1315, 0x00004, 1318, 0x00004, 1321, 0x00004, 1322, 0x00004, 1326, 0x00A68, + 1328, 0x00004, 1332, 0x00004, 1336, 0x00004, 1342, 0x00004, 1344, 0x00004, + 1346, 0x00055, 1347, 0x00004, 1355, 0x00132, 1356, 0x00004, 1373, 0x00019, + 1377, 0x00002, 1382, 0x00400, 1390, 0x00004, 1400, 0x00004, 1406, 0x00004, + 1407, 0x00004, 1411, 0x00004, 1412, 0x00004, 1413, 0x00004, 1433, 0x00004, + 1436, 0x00132, 1469, 0x00002, 1489, 0x00004, 1498, 0x00004, 1509, 0x00019, + 1517, 0x00004, 1518, 0x00004, 1526, 0x00004, 1536, 0x00004, 1544, 0x00004, + 1549, 0x00004, 1551, 0x00268, 1554, 0x00004, 1573, 0x00004, 1590, 0x00280, + 1591, 0x1241C, 1592, 0x00004, 1594, 0x00004, 1597, 0x023D4, 1603, 0x00004, + 1604, 0x00004, 1605, 0x00004, 1606, 0x00004, 1616, 0x00004, 1635, 0x000F8, + 1637, 0x00004, 1638, 0x00028, 1643, 0x00004, 1670, 0x50C20, 1690, 0x0001E, + 1730, 0x00004, 1744, 0x00004, 1765, 0x00004, 1784, 0x00004, 1789, 0x00408, + 1790, 0x00004, 1793, 0x00004, 1796, 0x00004, 1808, 0x000A0, 1814, 0x00004, + 1830, 0x00004, 1836, 0x00132, 1841, 0x00004, 1842, 0x00002, 1843, 0x00004, + 1848, 0x00004, 1849, 0x00004, 1851, 0x00004, 1855, 0x00004, 1868, 0x00004, + 1873, 0x00004, 1890, 0x0001C, 1891, 0x00001, 1892, 0x00004, 1912, 0x00004, + 1915, 0x00132, 1989, 0x00F1C, 2073, 0x00008, 2104, 0x00004, 2109, 0x00008, + 2111, 0x02304, 2116, 0x02304, 2128, 0x00004, 2130, 0x00001, 2131, 0x00001, + 2135, 0x00320, 2136, 0x00008, 2141, 0x00004, 2149, 0x02304, 2160, 0x02304, + 2165, 0x02304, 2169, 0x02304, 2197, 0x02304, 2207, 0x02304, 2209, 0x000F0, + 2213, 0x00014, 2216, 0x02304, 2222, 0x02304, 2232, 0x02304, 2234, 0x02304, + 2236, 0x00001, 2237, 0x00538, 2242, 0x033D0, 2243, 0x02304, 2246, 0x116C4, + 2248, 0x02304, 2252, 0x00002, 2253, 0x00004, 2262, 0x02304, 2269, 0x02304, + 2274, 0x02955, 2275, 0x00110, 2278, 0x02304, 2285, 0x02304, 2301, 0x00004, + 2312, 0x00004, 2313, 0x00004, 2319, 0x00004, 2321, 0x00004, 2343, 0x00004, + 2344, 0x00004, 2355, 0x00004, 2363, 0x00004, 2364, 0x02304, 2368, 0x03208, + 2373, 0x02304, 2391, 0x00004, 2396, 0x00002 + }; + } +} diff --git a/PKHeX.Core/Saves/Substructures/Gen8/Misc8.cs b/PKHeX.Core/Saves/Substructures/Gen8/Misc8.cs index 73b36ed89..c9f7351b0 100644 --- a/PKHeX.Core/Saves/Substructures/Gen8/Misc8.cs +++ b/PKHeX.Core/Saves/Substructures/Gen8/Misc8.cs @@ -4,19 +4,29 @@ namespace PKHeX.Core { public sealed class Misc8 : SaveBlock { - public Misc8(SAV8SWSH sav, int offset) : base(sav) => Offset = offset; + public Misc8(SAV8SWSH sav, SCBlock block) : base(sav, block.Data) { } + + public int Badges + { + get => Data[Offset + 0x00]; + set => Data[Offset + 0x00] = (byte)value; + } public uint Money { - get => BitConverter.ToUInt32(Data, Offset + 0x4); + get => BitConverter.ToUInt32(Data, Offset + 0x04); set { if (value > 9999999) value = 9999999; - SAV.SetData(BitConverter.GetBytes(value), Offset + 0x4); + SAV.SetData(Data, BitConverter.GetBytes(value), Offset + 0x04); } } - public int Vivillon { get; set; } // todo + public int BP + { + get => BitConverter.ToUInt16(Data, Offset + 0x11C); + set => BitConverter.GetBytes((ushort)value).CopyTo(Data, Offset + 0x11C); + } } } \ No newline at end of file diff --git a/PKHeX.Core/Saves/Substructures/Gen8/MyItem8.cs b/PKHeX.Core/Saves/Substructures/Gen8/MyItem8.cs index bf8574017..d2e79f540 100644 --- a/PKHeX.Core/Saves/Substructures/Gen8/MyItem8.cs +++ b/PKHeX.Core/Saves/Substructures/Gen8/MyItem8.cs @@ -2,15 +2,17 @@ namespace PKHeX.Core { public sealed class MyItem8 : MyItem { - private const int Medicine = 0x0000; // 0 - private const int TM = 0x00F0; // 1 - private const int Candy = 0x02A0; // 2 - private const int PowerUp = 0x05C0; // 3 - private const int Catching = 0x0818; // 4 - private const int Battle = 0x08E0; // 5 - private const int Key = 0x0B38; // 6 + public const int Medicine = 0; + public const int Balls = Medicine + (4 * PouchSize8.Medicine); + public const int Battle = Balls + (4 * PouchSize8.Balls); + public const int Berries = Battle + (4 * PouchSize8.Battle); + public const int Items = Berries + (4 * PouchSize8.Berries); + public const int TMs = Items + (4 * PouchSize8.Items); + public const int Treasures = TMs + (4 * PouchSize8.TMs); + public const int Ingredients = Treasures + (4 * PouchSize8.Treasures); + public const int Key = Ingredients + (4 * PouchSize8.Ingredients); - public MyItem8(SaveFile SAV) : base(SAV) { } + public MyItem8(SaveFile SAV, SCBlock block) : base(SAV, block.Data) { } public override InventoryPouch[] Inventory { @@ -19,10 +21,14 @@ public override InventoryPouch[] Inventory var pouch = new InventoryPouch[] { new InventoryPouch8(InventoryType.Medicine, Legal.Pouch_Medicine_SWSH, 999, Medicine, PouchSize8.Medicine), - new InventoryPouch8(InventoryType.TMHMs, Legal.Pouch_TMHM_SWSH, 1, TM, PouchSize8.TM), - new InventoryPouch8(InventoryType.Balls, Legal.Pouch_Berries_SWSH, 999, Catching, PouchSize8.Catching), - new InventoryPouch8(InventoryType.Items, Legal.Pouch_Regular_SWSH, 999, Key, PouchSize8.Items), + new InventoryPouch8(InventoryType.Balls, Legal.Pouch_Ball_SWSH, 999, Balls, PouchSize8.Balls), new InventoryPouch8(InventoryType.BattleItems, Legal.Pouch_Battle_SWSH, 999, Battle, PouchSize8.Battle), + new InventoryPouch8(InventoryType.Berries, Legal.Pouch_Berries_SWSH, 999, Berries, PouchSize8.Berries), + new InventoryPouch8(InventoryType.Items, Legal.Pouch_Regular_SWSH, 999, Items, PouchSize8.Items), + new InventoryPouch8(InventoryType.TMHMs, Legal.Pouch_TMHM_SWSH, 999, TMs, PouchSize8.TMs), + new InventoryPouch8(InventoryType.MailItems, Legal.Pouch_Treasure_SWSH, 999, Treasures, PouchSize8.Treasures), + new InventoryPouch8(InventoryType.Candy, Legal.Pouch_Ingredients_SWSH, 999, Ingredients, PouchSize8.Ingredients), + new InventoryPouch8(InventoryType.KeyItems, Legal.Pouch_Key_SWSH, 1, Key, PouchSize8.Key), }; return pouch.LoadAll(Data); } diff --git a/PKHeX.Core/Saves/Substructures/Gen8/MyStatus8.cs b/PKHeX.Core/Saves/Substructures/Gen8/MyStatus8.cs index 9443bd8cf..d9475209e 100644 --- a/PKHeX.Core/Saves/Substructures/Gen8/MyStatus8.cs +++ b/PKHeX.Core/Saves/Substructures/Gen8/MyStatus8.cs @@ -4,60 +4,43 @@ namespace PKHeX.Core { public sealed class MyStatus8 : SaveBlock { - public MyStatus8(SAV8SWSH sav, int offset) : base(sav) => Offset = offset; + public MyStatus8(SAV8SWSH sav, SCBlock block) : base(sav, block.Data) { } public int TID { - get => BitConverter.ToUInt16(Data, Offset + 0); - set => BitConverter.GetBytes((ushort)value).CopyTo(Data, Offset + 0); + get => BitConverter.ToUInt16(Data, 0xA0); + set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0xA0); } public int SID { - get => BitConverter.ToUInt16(Data, Offset + 2); - set => BitConverter.GetBytes((ushort)value).CopyTo(Data, Offset + 2); + get => BitConverter.ToUInt16(Data, 0xA2); + set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0xA2); } public int Game { - get => Data[Offset + 4]; - set => Data[Offset + 4] = (byte)value; + get => Data[0xA4]; + set => Data[0xA4] = (byte)value; } public int Gender { - get => Data[Offset + 5]; - set => Data[Offset + 5] = (byte)value; - } - - public int SubRegion - { - get => Data[Offset + 0x2E]; - set => Data[Offset + 0x2E] = (byte)value; - } - - public int Country - { - get => Data[Offset + 0x2F]; - set => Data[Offset + 0x2F] = (byte)value; - } - - public int ConsoleRegion - { - get => Data[Offset + 0x34]; - set => Data[Offset + 0x34] = (byte)value; + get => Data[0xA5]; + set => Data[0xA5] = (byte)value; } + // A6 public int Language { - get => Data[Offset + 0x35]; - set => Data[Offset + 0x35] = (byte)value; + get => Data[Offset + 0xA7]; + set => Data[Offset + 0xA7] = (byte)value; } public string OT { - get => SAV.GetString(Offset + 0x38, 0x1A); - set => SAV.SetString(value, SAV.OTLength).CopyTo(Data, Offset + 0x38); + get => SAV.GetString(Data, 0xB0, 0x1A); + set => SAV.SetString(value, SAV.OTLength).CopyTo(Data, 0xB0); } } } \ No newline at end of file diff --git a/PKHeX.Core/Saves/Substructures/Gen8/Party8.cs b/PKHeX.Core/Saves/Substructures/Gen8/Party8.cs new file mode 100644 index 000000000..87d6f29c6 --- /dev/null +++ b/PKHeX.Core/Saves/Substructures/Gen8/Party8.cs @@ -0,0 +1,13 @@ +namespace PKHeX.Core +{ + public sealed class Party8 : SaveBlock + { + public Party8(SaveFile sav, SCBlock block) : base(sav, block.Data) { } + + public int PartyCount + { + get => Data[6 * PKX.SIZE_8PARTY]; + set => Data[6 * PKX.SIZE_8PARTY] = (byte)value; + } + } +} \ No newline at end of file diff --git a/PKHeX.Core/Saves/Substructures/Gen8/PlayTime8.cs b/PKHeX.Core/Saves/Substructures/Gen8/PlayTime8.cs index 66f7cb813..66dc47f3e 100644 --- a/PKHeX.Core/Saves/Substructures/Gen8/PlayTime8.cs +++ b/PKHeX.Core/Saves/Substructures/Gen8/PlayTime8.cs @@ -4,7 +4,7 @@ namespace PKHeX.Core { public sealed class PlayTime8 : SaveBlock { - public PlayTime8(SaveFile sav, int offset) : base(sav) => Offset = offset; + public PlayTime8(SaveFile sav, SCBlock block) : base(sav, block.Data) { } public int PlayedHours { @@ -24,6 +24,7 @@ public int PlayedSeconds set => Data[Offset + 3] = (byte)value; } + // TODO private uint LastSaved { get => BitConverter.ToUInt32(Data, Offset + 0x4); set => BitConverter.GetBytes(value).CopyTo(Data, Offset + 0x4); } private int LastSavedYear { get => (int)(LastSaved & 0xFFF); set => LastSaved = (LastSaved & 0xFFFFF000) | (uint)value; } private int LastSavedMonth { get => (int)(LastSaved >> 12 & 0xF); set => LastSaved = (LastSaved & 0xFFFF0FFF) | ((uint)value & 0xF) << 12; } diff --git a/PKHeX.Core/Saves/Substructures/Gen8/PouchSize8.cs b/PKHeX.Core/Saves/Substructures/Gen8/PouchSize8.cs index ed4694830..be95a20fe 100644 --- a/PKHeX.Core/Saves/Substructures/Gen8/PouchSize8.cs +++ b/PKHeX.Core/Saves/Substructures/Gen8/PouchSize8.cs @@ -2,8 +2,6 @@ namespace PKHeX.Core { public static class PouchSize8 { - // todo - /// /// Pouch0 Item Max Capacity /// @@ -12,31 +10,41 @@ public static class PouchSize8 /// /// Pouch1 Item Max Capacity /// - public const int TM = 108; + public const int Balls = 30; /// /// Pouch2 Item Max Capacity /// - public const int Candy = 200; + public const int Battle = 20; /// /// Pouch3 Item Max Capacity /// - public const int PowerUp = 150; + public const int Berries = 80; /// /// Pouch4 Item Max Capacity /// - public const int Catching = 50; + public const int Items = 550; /// /// Pouch5 Item Max Capacity /// - public const int Battle = 150; + public const int TMs = 210; /// - /// Pouch6 Item Max Capacity + /// Pouch5 Item Max Capacity /// - public const int Items = 150; + public const int Treasures = 100; // todo + + /// + /// Pouch5 Item Max Capacity + /// + public const int Ingredients = 100; // todo + + /// + /// Pouch5 Item Max Capacity + /// + public const int Key = 64; } } \ No newline at end of file diff --git a/PKHeX.Core/Saves/Substructures/Gen8/Record6.cs b/PKHeX.Core/Saves/Substructures/Gen8/Record8.cs similarity index 67% rename from PKHeX.Core/Saves/Substructures/Gen8/Record6.cs rename to PKHeX.Core/Saves/Substructures/Gen8/Record8.cs index aba1774f6..1b06c8712 100644 --- a/PKHeX.Core/Saves/Substructures/Gen8/Record6.cs +++ b/PKHeX.Core/Saves/Substructures/Gen8/Record8.cs @@ -6,22 +6,17 @@ namespace PKHeX.Core { public sealed class Record8 : RecordBlock { - public const int RecordCount = 200; + public const int RecordCount = 50; protected override IReadOnlyList RecordMax { get; } - public Record8(SAV8SWSH sav, int offset, IReadOnlyList maxes) : base(sav) - { - Offset = offset; + public Record8(SaveFile sav, SCBlock block, IReadOnlyList maxes) : base(sav, block.Data) => RecordMax = maxes; - } public override int GetRecord(int recordID) { int ofs = Records.GetOffset(Offset, recordID); - if (recordID < 100) + if (recordID < RecordCount) return BitConverter.ToInt32(Data, ofs); - if (recordID < 200) - return BitConverter.ToInt16(Data, ofs); Trace.Fail(nameof(recordID)); return 0; } @@ -33,10 +28,8 @@ public override void SetRecord(int recordID, int value) int max = GetRecordMax(recordID); if (value > max) value = max; - if (recordID < 100) + if (recordID < RecordCount) BitConverter.GetBytes(value).CopyTo(Data, ofs); - else if (recordID < 200) - BitConverter.GetBytes((ushort)value).CopyTo(Data, ofs); else Trace.Fail(nameof(recordID)); } diff --git a/PKHeX.Core/Saves/Substructures/Gen8/Situation8.cs b/PKHeX.Core/Saves/Substructures/Gen8/Situation8.cs new file mode 100644 index 000000000..a5d2e3b34 --- /dev/null +++ b/PKHeX.Core/Saves/Substructures/Gen8/Situation8.cs @@ -0,0 +1,26 @@ +using System; + +namespace PKHeX.Core +{ + public sealed class Situation8 : SaveBlock + { + public Situation8(SAV8SWSH sav, SCBlock block) : base(sav, block.Data) { } + + // "StartLocation" + public int M { get => BitConverter.ToUInt16(Data, Offset + 0x00); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, Offset + 0x00); } + public float X { get => BitConverter.ToSingle(Data, Offset + 0x08); set => BitConverter.GetBytes(value).CopyTo(Data, Offset + 0x08); } + public float Z { get => BitConverter.ToSingle(Data, Offset + 0x10); set => BitConverter.GetBytes(value).CopyTo(Data, Offset + 0x10); } + public float Y { get => (int)BitConverter.ToSingle(Data, Offset + 0x18); set => BitConverter.GetBytes(value).CopyTo(Data, Offset + 0x18); } + public float R { get => (int)BitConverter.ToSingle(Data, Offset + 0x20); set => BitConverter.GetBytes(value).CopyTo(Data, Offset + 0x20); } + + public void UpdateOverworldCoordinates() + { + //var o = ((SAV8)SAV).Overworld; + //o.M = M; + //o.X = X; + //o.Z = Z; + //o.Y = Y; + //o.R = R; + } + } +} \ No newline at end of file diff --git a/PKHeX.Core/Saves/Substructures/Inventory/InventoryType.cs b/PKHeX.Core/Saves/Substructures/Inventory/InventoryType.cs index cf40d2a28..428d79fde 100644 --- a/PKHeX.Core/Saves/Substructures/Inventory/InventoryType.cs +++ b/PKHeX.Core/Saves/Substructures/Inventory/InventoryType.cs @@ -18,5 +18,7 @@ public enum InventoryType FreeSpace, ZCrystals, Candy, + Treasure, + Ingredients, } } \ No newline at end of file diff --git a/PKHeX.Core/Saves/Substructures/PokeDex/Zukan.cs b/PKHeX.Core/Saves/Substructures/PokeDex/Zukan.cs index 541d6cb5c..eee5f9ce6 100644 --- a/PKHeX.Core/Saves/Substructures/PokeDex/Zukan.cs +++ b/PKHeX.Core/Saves/Substructures/PokeDex/Zukan.cs @@ -3,16 +3,47 @@ namespace PKHeX.Core { - public abstract class Zukan + public abstract class ZukanBase { protected readonly SaveFile SAV; public readonly int PokeDex; - protected readonly int PokeDexLanguageFlags; - protected Zukan(SaveFile sav, int dex, int langflag) + protected ZukanBase(SaveFile sav, int dex) { SAV = sav; PokeDex = dex; + } + + public int SeenCount => Enumerable.Range(1, SAV.MaxSpeciesID).Count(GetSeen); + public int CaughtCount => Enumerable.Range(1, SAV.MaxSpeciesID).Count(GetCaught); + + public decimal PercentSeen => (decimal)SeenCount / SAV.MaxSpeciesID; + public decimal PercentCaught => (decimal)CaughtCount / SAV.MaxSpeciesID; + + public abstract bool GetSeen(int species); + public abstract bool GetCaught(int species); + + public abstract void SetDex(PKM pkm); + + // Bulk Manipulation + public abstract void SeenNone(); + public abstract void CaughtNone(); + + public abstract void SeenAll(bool shinyToo = false); + public abstract void CompleteDex(bool shinyToo = false); + public abstract void CaughtAll(bool shinyToo = false); + public abstract void SetAllSeen(bool value = true, bool shinyToo = false); + + public abstract void SetDexEntryAll(int species, bool shinyToo = false); + public abstract void ClearDexEntryAll(int species); + } + + public abstract class Zukan : ZukanBase + { + protected readonly int PokeDexLanguageFlags; + + protected Zukan(SaveFile sav, int dex, int langflag) : base(sav, dex) + { PokeDexLanguageFlags = langflag; if (langflag > dex) throw new ArgumentException(nameof(langflag)); @@ -30,18 +61,13 @@ protected Zukan(SaveFile sav, int dex, int langflag) protected abstract void SetAllDexFlagsLanguage(int bit, int lang, bool value = true); protected abstract void SetAllDexSeenFlags(int baseBit, int altform, int gender, bool isShiny, bool value = true); - protected bool GetFlag(int ofs, int bitIndex) => SAV.GetFlag(PokeDex + ofs + (bitIndex >> 3), bitIndex); - protected void SetFlag(int ofs, int bitIndex, bool value = true) => SAV.SetFlag(PokeDex + ofs + (bitIndex >> 3), bitIndex, value); + protected virtual bool GetFlag(int ofs, int bitIndex) => SAV.GetFlag(PokeDex + ofs + (bitIndex >> 3), bitIndex); + protected virtual void SetFlag(int ofs, int bitIndex, bool value = true) => SAV.SetFlag(PokeDex + ofs + (bitIndex >> 3), bitIndex, value); - public virtual bool GetCaught(int species) => GetFlag(OFS_CAUGHT, species - 1); + public override bool GetCaught(int species) => GetFlag(OFS_CAUGHT, species - 1); public virtual void SetCaught(int species, bool value = true) => SetFlag(OFS_CAUGHT, species - 1, value); - public int SeenCount => Enumerable.Range(1, SAV.MaxSpeciesID).Count(GetSeen); - public int CaughtCount => Enumerable.Range(1, SAV.MaxSpeciesID).Count(GetCaught); - public decimal PercentSeen => (decimal)SeenCount / SAV.MaxSpeciesID; - public decimal PercentCaught => (decimal)CaughtCount / SAV.MaxSpeciesID; - - public virtual bool GetSeen(int species) + public override bool GetSeen(int species) { // check all 4 seen flags (gender/shiny) for (int i = 0; i < 4; i++) @@ -86,7 +112,7 @@ private void ClearSeen(int species) SetFlag(OFS_SEEN + (i * BitSeenSize), species - 1, false); } - public virtual void SetDex(PKM pkm) + public override void SetDex(PKM pkm) { if (SAV.Version == GameVersion.Invalid) // sanity return; @@ -162,12 +188,12 @@ private bool GetIsSpeciesFormAnyDisplayed(int baseBit, int formBit) } // Bulk Manipulation - public void SeenNone() => SetDexEntriesAll(false, shinyToo: true); - public void CaughtNone() => SetAllCaught(false, true); - public void SeenAll(bool shinyToo = false) => SetAllSeen(shinyToo); - public void CompleteDex(bool shinyToo = false) => SetDexEntriesAll(shinyToo: shinyToo); + public override void SeenNone() => SetDexEntriesAll(false, shinyToo: true); + public override void CaughtNone() => SetAllCaught(false, true); + public override void SeenAll(bool shinyToo = false) => SetAllSeen(shinyToo); + public override void CompleteDex(bool shinyToo = false) => SetDexEntriesAll(shinyToo: shinyToo); - public void CaughtAll(bool shinyToo = false) + public override void CaughtAll(bool shinyToo = false) { SetAllSeen(true, shinyToo); SetAllCaught(true, shinyToo); @@ -183,12 +209,24 @@ public void SetAllCaught(bool value = true, bool shinyToo = false) } } - public void SetAllSeen(bool value = true, bool shinyToo = false) + public override void SetAllSeen(bool value = true, bool shinyToo = false) { for (int i = 0; i < SAV.MaxSpeciesID; i++) SetSeenSingle(i + 1, value, shinyToo); } + public override void SetDexEntryAll(int species, bool shinyToo = false) + { + SetSeenSingle(species, true, shinyToo); + SetCaughtSingle(species); + } + + public override void ClearDexEntryAll(int species) + { + SetSeenSingle(species, false); + SetCaughtSingle(species, false); + } + public void SetDexEntriesAll(bool value = true, int max = -1, bool shinyToo = false) { if (max <= 0) diff --git a/PKHeX.Core/Saves/Substructures/PokeDex/Zukan8.cs b/PKHeX.Core/Saves/Substructures/PokeDex/Zukan8.cs index d3f7fdb61..835791b08 100644 --- a/PKHeX.Core/Saves/Substructures/PokeDex/Zukan8.cs +++ b/PKHeX.Core/Saves/Substructures/PokeDex/Zukan8.cs @@ -1,127 +1,32 @@ using System; using System.Collections.Generic; -using System.Diagnostics; namespace PKHeX.Core { - public class Zukan8 : Zukan + public class Zukan8 : ZukanBase { - private const int MAGIC = 0x2F120F17; - private const int SIZE_MAGIC = 4; - private const int SIZE_FLAGS = 4; - private const int SIZE_MISC = 0x80; // Misc Data (1024 bits) - private const int SIZE_CAUGHT = 0x68; // 832 bits + private readonly SCBlock Block; + public static readonly IReadOnlyDictionary DexLookup = GetDexLookup(PersonalTable.SWSH); - protected override int OFS_CAUGHT => SIZE_MAGIC + SIZE_FLAGS + SIZE_MISC; - protected override int OFS_SEEN => OFS_CAUGHT + SIZE_CAUGHT; + public Zukan8(SAV8SWSH sav, SCBlock block) : base(sav, 0) => Block = block; - protected override int BitSeenSize => 0x8C; // 1120 bits - protected override int DexLangFlagByteCount => 920; // 0x398 = 817*9, top off the savedata block. - protected override int DexLangIDCount => 9; // CHT, skipping langID 6 (unused) + private bool GetFlag(int ofs, int bitIndex) => FlagUtil.GetFlag(Block.Data, ofs + (bitIndex >> 3), bitIndex); + private void SetFlag(int ofs, int bitIndex, bool value = true) => FlagUtil.SetFlag(Block.Data, ofs + (bitIndex >> 3), bitIndex, value); - private readonly IList FormBaseSpecies; - - public Zukan8(SAV8SWSH sav, int dex, int langflag) : this(sav, dex, langflag, DexFormUtil.GetDexFormIndexSWSH) { } - - private Zukan8(SaveFile sav, int dex, int langflag, Func form) : base(sav, dex, langflag) + private static Dictionary GetDexLookup(PersonalTable pt) { - DexFormIndexFetcher = form; - FormBaseSpecies = GetFormIndexBaseSpeciesList(); - Debug.Assert(!SAV.Exportable || BitConverter.ToUInt32(SAV.Data, PokeDex) == MAGIC); - } - - public Func DexFormIndexFetcher { get; } - - protected override void SetAllDexSeenFlags(int baseBit, int altform, int gender, bool isShiny, bool value = true) - { - int species = baseBit + 1; - - if (species == 351) // castform - isShiny = false; - - // Starting with Gen7, form bits are stored in the same region as the species flags. - int formstart = altform; - int formend = altform; - bool reset = GetSaneFormsToIterate(species, out int fs, out int fe, formstart); - if (reset) + var lookup = new Dictionary(); + for (int i = 1; i <= pt.MaxSpeciesID; i++) { - formstart = fs; - formend = fe; - } - - int shiny = isShiny ? 1 : 0; - for (int form = formstart; form <= formend; form++) - { - int formBit = baseBit; - if (form > 0) // Override the bit to overwrite - { - int fc = SAV.Personal[species].FormeCount; - if (fc > 1) // actually has forms - { - int f = DexFormIndexFetcher(species, fc, SAV.MaxSpeciesID - 1); - if (f >= 0) // bit index valid - formBit = f + form; - } - } - SetDexFlags(baseBit, formBit, gender, shiny, value); + var p = (PersonalInfoSWSH) pt[i]; + var index = p.PokeDexIndex; + if (index != 0) + lookup.Add(i, index); } + return lookup; } - protected override bool GetSaneFormsToIterate(int species, out int formStart, out int formEnd, int formIn) - { - return SanitizeFormsToIterate(species, out formStart, out formEnd, formIn); - } - - public static bool SanitizeFormsToIterate(int species, out int formStart, out int formEnd, int formIn) - { - // 004AA370 in Moon - // Simplified in terms of usage -- only overrides to give all the battle forms for a pkm - switch (species) - { - case 351: // Castform - formStart = 0; - formEnd = 3; - return true; - - case 421: // Cherrim - case 555: // Darmanitan - case 648: // Meloetta - case 746: // Wishiwashi - case 778: // Mimikyu - // Alolans - case 020: // Raticate - case 105: // Marowak - formStart = 0; - formEnd = 1; - return true; - - case 735: // Gumshoos - case 758: // Salazzle - case 754: // Lurantis - case 738: // Vikavolt - case 784: // Kommo-o - case 752: // Araquanid - case 777: // Togedemaru - case 743: // Ribombee - case 744: // Rockruff - break; - - case 774 when formIn <= 6: // Minior - break; // don't give meteor forms except the first - - case 718 when formIn > 1: - break; - default: - int count = DexFormUtil.GetDexFormCountSWSH(species); - formStart = formEnd = 0; - return count < formIn; - } - formStart = 0; - formEnd = 0; - return true; - } - - protected override int GetDexLangFlag(int lang) + private static int GetDexLangFlag(int lang) { if (lang > 10 || lang == 6 || lang <= 0) return -1; // invalid language @@ -132,182 +37,399 @@ protected override int GetDexLangFlag(int lang) return lang; } - protected override void SetSpindaDexData(PKM pkm, bool alreadySeen) + public static IList GetEntryNames(IReadOnlyList Species) { - int shift = (pkm.Gender & 1) | (pkm.IsShiny ? 2 : 0); - if (alreadySeen) // update? + var dex = new List(); + foreach (var d in DexLookup) { - var flag1 = (1 << (shift + 4)); - if ((SAV.Data[PokeDex + 0x84] & flag1) != 0) // Already showing this one - return; - BitConverter.GetBytes(pkm.EncryptionConstant).CopyTo(SAV.Data, PokeDex + 0x8E8 + (shift * 4)); - SAV.Data[PokeDex + 0x84] |= (byte)(flag1 | (1 << shift)); - } - else if ((SAV.Data[PokeDex + 0x84] & (1 << shift)) == 0) - { - BitConverter.GetBytes(pkm.EncryptionConstant).CopyTo(SAV.Data, PokeDex + 0x8E8 + (shift * 4)); - SAV.Data[PokeDex + 0x84] |= (byte)(1 << shift); + var spec = d.Key; + var index = d.Value; + var name = $"{index:000} - {Species[spec]}"; + dex.Add(name); } + dex.Sort(); + return dex; } - // Dex Flags - public bool NationalDex + #region Structure + private const int EntrySize = 0x30; + + // First 0x20 bytes are for seen flags, allocated as 4 QWORD values. + private const int SeenRegionCount = 4; + private const int SeenRegionSize = sizeof(ulong); + // not_shiny_gender_0, + // not_shiny_gender_1, + // shiny_gender_0, + // shiny_gender_1 + // Each QWORD stores the following bits: + // - FormsSeen[63], default form is index 0. + // - Gigantimax:1 + + // Next 4 bytes are for obtained info (u32) + private const int OFS_CAUGHT = 0x20; + // Caught:1 + // Unknown:1 + // LanguagesObtained:2-14 (flags) + // DisplayFormID:15-27 (value) + // DisplayGigantamaxInstead:28 (flag) + // DisplayGender:29/30 (m/f) + // DisplayShiny:31 (flag) + + // Next 4 bytes are Battled Count (u32) + private const int OFS_BATTLED = 0x24; + + // Next 4 bytes are Unused(?) + private const int OFS_UNK1 = 0x28; + // Next 4 bytes are Unused(?) + private const int OFS_UNK2 = 0x2C; + + public static int GetOffsetEntry(int species) { - get => (SAV.Data[PokeDex + 4] & 1) == 1; - set => SAV.Data[PokeDex + 4] = (byte)((SAV.Data[PokeDex + 4] & 0xFE) | (value ? 1 : 0)); + if (!DexLookup.TryGetValue(species, out var index)) + return -1; + if (index < 1) + throw new IndexOutOfRangeException(); + + return (index - 1) * EntrySize; } - /// - /// Gets the last viewed dex entry in the Pokedex (by National Dex ID), internally called DefaultMons - /// - public uint CurrentViewedDex => BitConverter.ToUInt32(SAV.Data, PokeDex + 4) >> 9 & 0x3FF; - - public IEnumerable GetAllFormEntries(int spec) + public override bool GetSeen(int species) { - var fc = SAV.Personal[spec].FormeCount; - for (int j = 1; j < fc; j++) - { - int start = j; - int end = j; - if (GetSaneFormsToIterate(spec, out int s, out int n, j)) - { - start = s; - end = n; - } - start = Math.Max(1, start); - for (int f = start; f <= end; f++) - { - int x = GetDexFormIndex(spec, fc, f); - if (x >= 0) - yield return x; - } - } - } - - public int GetDexFormIndex(int spec, int fc, int f) - { - var index = DexFormIndexFetcher(spec, fc, f); + var index = GetOffsetEntry(species); if (index < 0) - return index; - return index + SAV.MaxSpeciesID - 1; - } + return false; - public IList GetEntryNames(IReadOnlyList Species) - { - var names = new List(); - for (int i = 1; i <= SAV.MaxSpeciesID; i++) - names.Add($"{i:000} - {Species[i]}"); - - // Add Formes - int ctr = SAV.MaxSpeciesID; - for (int spec = 1; spec <= SAV.MaxSpeciesID; spec++) + for (int i = 0; i < SeenRegionCount; i++) { - int c = SAV.Personal[spec].FormeCount; - for (int f = 1; f < c; f++) - { - int x = GetDexFormIndex(spec, c, f); - if (x >= 0) - names.Add($"{ctr++:000} - {Species[spec]}-{f}"); - } + var ofs = index + (SeenRegionSize * i); + if (BitConverter.ToUInt64(Block.Data, ofs) != 0) + return true; } - return names; + + return false; } - /// - /// Gets a list of Species IDs that a given dex-forme index corresponds to. - /// - /// - private List GetFormIndexBaseSpeciesList() + public bool GetSeenRegion(int species, int form, int region) { - var baseSpecies = new List(); - for (int spec = 1; spec <= SAV.MaxSpeciesID; spec++) - { - int c = SAV.Personal[spec].FormeCount; - for (int f = 1; f < c; f++) - { - int x = GetDexFormIndex(spec, c, f); - if (x >= 0) - baseSpecies.Add(spec); - } - } - return baseSpecies; + if ((uint)region >= SeenRegionCount) + throw new ArgumentException(nameof(region)); + if ((uint)form > 63) + return false; + + var index = GetOffsetEntry(species); + if (index < 0) + return false; + + var ofs = SeenRegionSize * region; + return GetFlag(index + ofs, form); } - public int GetBaseSpeciesGenderValue(int index) + public void SetSeenRegion(int species, int form, int region, bool value = true) { - // meowstic special handling - const int meow = 678; - if (index == meow - 1 || (index >= SAV.MaxSpeciesID && FormBaseSpecies[index - SAV.MaxSpeciesID] == meow)) - return index < SAV.MaxSpeciesID ? 0 : 254; // M : F - - if (index < SAV.MaxSpeciesID) - return SAV.Personal[index + 1].Gender; - - index -= SAV.MaxSpeciesID; - int spec = FormBaseSpecies[index]; - return SAV.Personal[spec].Gender; - } - - public int GetBaseSpecies(int index) - { - if (index <= SAV.MaxSpeciesID) - return index; - - return FormBaseSpecies[index - SAV.MaxSpeciesID - 1]; - } - - protected override void SetAllDexFlagsLanguage(int bit, int lang, bool value = true) - { - lang = GetDexLangFlag(lang); - if (lang < 0) + if ((uint)region >= SeenRegionCount) + throw new ArgumentException(nameof(region)); + if ((uint)form > 63) return; - int lbit = (bit * DexLangIDCount) + lang; - if (lbit < DexLangFlagByteCount << 3) // Sanity check for max length of region - SetFlag(PokeDexLanguageFlags, lbit, value); + var index = GetOffsetEntry(species); + if (index < 0) + return; + + var ofs = SeenRegionSize * region; + SetFlag(index + ofs, form, value); } - public bool[] GetLanguageBitflags(int species) + public override bool GetCaught(int species) => GetCaughtFlagID(species, 0); + public void SetCaught(int species, bool value = true) => SetCaughtFlagID(species, 0, value); + public bool GetCaughtUnkFlag(int species) => GetCaughtFlagID(species, 1); + public void SetCaughtUnkFlag(int species, bool value = true) => SetCaughtFlagID(species, 1, value); + public bool GetIsLanguageIndexObtained(int species, int langIndex) => GetCaughtFlagID(species, 2 + langIndex); + public void SetIsLanguageIndexObtained(int species, int langIndex, bool value = true) => SetCaughtFlagID(species, 2 + langIndex, value); + + private bool GetCaughtFlagID(int species, int id) { - var result = new bool[DexLangIDCount]; - int bit = species - 1; - for (int i = 0; i < DexLangIDCount; i++) + var index = GetOffsetEntry(species); + if (index < 0) + return false; + + return GetFlag(index + OFS_CAUGHT, id); + } + + private void SetCaughtFlagID(int species, int id, bool value = true) + { + var index = GetOffsetEntry(species); + if (index < 0) + return; + + SetFlag(index + OFS_CAUGHT, id, value); + } + + public bool GetIsLanguageObtained(int species, int language) + { + int langIndex = GetDexLangFlag(language); + if (langIndex < 0) + return false; + + return GetIsLanguageIndexObtained(species, langIndex); + } + + public void SetIsLanguageObtained(int species, int language, bool value = true) + { + int langIndex = GetDexLangFlag(language); + if (langIndex < 0) + return; + + SetIsLanguageIndexObtained(species, langIndex, value); + } + + public uint GetAltFormDisplayed(int species) + { + var index = GetOffsetEntry(species); + if (index < 0) + return 0; + + var val = BitConverter.ToUInt32(Block.Data, index + OFS_CAUGHT); + return (val >> 15) & 0x1FFF; // (0x1FFF is really overkill, GameFreak) + } + + public void SetAltFormDisplayed(int species, uint value = 0) + { + var index = GetOffsetEntry(species); + if (index < 0) + return; + + var val = BitConverter.ToUInt32(Block.Data, index + OFS_CAUGHT); + var nv = (val & ~(0x1FFF << 15)) | ((value & 0x1FFF) << 15); + BitConverter.GetBytes(nv).CopyTo(Block.Data, index + OFS_CAUGHT); + } + + public uint GetGenderDisplayed(int species) + { + var index = GetOffsetEntry(species); + if (index < 0) + return 0; + + var val = BitConverter.ToUInt32(Block.Data, index + OFS_CAUGHT); + return (val >> 29) & 3; + } + + public void SetGenderDisplayed(int species, uint value = 0) + { + var index = GetOffsetEntry(species); + if (index < 0) + return; + + var val = BitConverter.ToUInt32(Block.Data, index + OFS_CAUGHT); + var nv = (val & ~(3 << 29)) | ((value & 3) << 29); + BitConverter.GetBytes(nv).CopyTo(Block.Data, index + OFS_CAUGHT); + } + + public bool GetDisplayDynamaxInstead(int species) => GetCaughtFlagID(species, 28); + public void SetDisplayDynamaxInstead(int species, bool value = true) => SetCaughtFlagID(species, 28, value); + public bool GetDisplayShiny(int species) => GetCaughtFlagID(species, 31); + public void SetDisplayShiny(int species, bool value = true) => SetCaughtFlagID(species, 31, value); + + public void SetCaughtFlags32(int species, uint value) => SetU32(species, value, OFS_CAUGHT); + public uint GetBattledCount(int species) => GetU32(species, OFS_BATTLED); + public void SetBattledCount(int species, uint value) => SetU32(species, value, OFS_BATTLED); + public uint GetUnk1Count(int species) => GetU32(species, OFS_UNK1); + public void SetUnk1Count(int species, uint value) => SetU32(species, value, OFS_UNK1); + public uint GetUnk2Count(int species) => GetU32(species, OFS_UNK2); + public void SetUnk2Count(int species, uint value) => SetU32(species, value, OFS_UNK2); + + private uint GetU32(int species, int ofs) + { + var index = GetOffsetEntry(species); + if (index < 0) + return 0; + + return BitConverter.ToUInt32(Block.Data, index + ofs); + } + + private void SetU32(int species, uint value, int ofs) + { + var index = GetOffsetEntry(species); + if (index < 0) + return; + + BitConverter.GetBytes(value).CopyTo(Block.Data, index + ofs); + } + #endregion + + #region Inherited + public override void SetDex(PKM pkm) + { + int species = pkm.Species; + var index = GetOffsetEntry(species); + if (index < 0) + return; + + var g = pkm.Gender == 1 ? 1 : 0; + bool shiny = pkm.IsShiny; + var s = shiny ? 2 : 0; + int form = pkm.AltForm; + if (species == (int)Species.Alcremie) { - int lbit = (bit * DexLangIDCount) + i; - result[i] = GetFlag(PokeDexLanguageFlags, lbit); + form *= 7; + form += 0; // alteration byte? } - return result; + else if (species == (int) Species.Eternatus && pkm.AltForm == 1) + { + form = 0; + SetSeenRegion(species, 63, g | s); + } + + SetSeenRegion(species, form, g | s); + SetCaught(species); + SetIsLanguageObtained(species, pkm.Language); + SetAltFormDisplayed(species, (byte)form); + + if (shiny) + SetDisplayShiny(species); + + var count = GetBattledCount(species); + if (count == 0) + SetBattledCount(species, 1); } - public void SetLanguageBitflags(int species, bool[] value) + public override void SeenNone() { - int bit = species - 1; - for (int i = 0; i < DexLangIDCount; i++) + Array.Clear(Block.Data, 0, DexLookup.Count * EntrySize); + } + + public override void CaughtNone() + { + foreach (var kvp in DexLookup) + CaughtNone(kvp.Key); + } + + private void CaughtNone(int species) + { + SetCaughtFlags32(species, 0); + SetUnk1Count(species, 0); + SetUnk2Count(species, 0); + } + + public override void SeenAll(bool shinyToo = false) + { + SetAllSeen(true, shinyToo); + } + + private void SeenAll(int species, int fc, PersonalInfo pi, bool shinyToo, bool value = true) + { + for (int i = 0; i < fc; i++) { - int lbit = (bit * DexLangIDCount) + i; - SetFlag(PokeDexLanguageFlags, lbit, value[i]); + if (pi.IsDualGender || !value) + { + SetSeenRegion(species, i, 0, value); + SetSeenRegion(species, i, 1, value); + if (!shinyToo && !value) + continue; + SetSeenRegion(species, i, 2, value); + SetSeenRegion(species, i, 3, value); + } + else + { + var index = pi.OnlyFemale ? 1 : 0; + SetSeenRegion(species, i, 0 + index); + if (!shinyToo) + continue; + SetSeenRegion(species, i, 2 + index); + } + } + + if (!value) + { + SetSeenRegion(species, 63, 0, false); + SetSeenRegion(species, 63, 1, false); + SetSeenRegion(species, 63, 2, false); + SetSeenRegion(species, 63, 3, false); } } - public void ToggleLanguageFlagsAll(bool value) + public override void CompleteDex(bool shinyToo = false) { - var arr = GetBlankLanguageBits(value); - for (int i = 1; i <= SAV.MaxSpeciesID; i++) - SetLanguageBitflags(i, arr); + foreach (var kvp in DexLookup) + SetDexEntryAll(kvp.Key, shinyToo); } - public void ToggleLanguageFlagsSingle(int species, bool value) + public override void CaughtAll(bool shinyToo = false) { - var arr = GetBlankLanguageBits(value); - SetLanguageBitflags(species, arr); + SeenAll(shinyToo); + foreach (var kvp in DexLookup) + { + var species = kvp.Key; + SetAllCaught(species, true, shinyToo); + } } - private bool[] GetBlankLanguageBits(bool value) + private void SetAllCaught(int species, bool value = true, bool shinyToo = false) { - var result = new bool[DexLangIDCount]; - for (int i = 0; i < DexLangIDCount; i++) - result[i] = value; - return result; + SetCaught(species); + for (int i = 0; i < 11; i++) + SetIsLanguageObtained(species, i, value); + + if (value) + { + var pi = PersonalTable.SWSH[species]; + if (shinyToo) + SetDisplayShiny(species); + + SetGenderDisplayed(species, (uint)pi.RandomGender()); + } + else + { + SetDisplayShiny(species, false); + SetDisplayDynamaxInstead(species, false); + SetGenderDisplayed(species, 0); + } } + + public override void SetAllSeen(bool value = true, bool shinyToo = false) + { + foreach (var kvp in DexLookup) + { + var species = kvp.Key; + SetAllSeen(species, value, shinyToo); + } + } + + private void SetAllSeen(int species, bool value = true, bool shinyToo = false) + { + var pi = PersonalTable.SWSH[species]; + var fc = pi.FormeCount; + if (species == (int) Species.Eternatus) + fc = 1; // ignore gigantamax + SeenAll(species, fc, pi, shinyToo, value); + + if (species == (int) Species.Alcremie) + { + // Alcremie forms + var alc = PersonalTable.SWSH[(int)Species.Alcremie]; + SeenAll((int)Species.Alcremie, 7 * 8, alc, shinyToo, value); + } + else if (species == (int) Species.Eternatus) + { + SetSeenRegion(species, 63, 0, value); + if (!shinyToo && !value) + return; + SetSeenRegion(species, 63, 2, value); + } + } + + public override void SetDexEntryAll(int species, bool shinyToo = false) + { + SetAllSeen(species, true, shinyToo); + SetAllCaught(species, true); + } + + public override void ClearDexEntryAll(int species) + { + var ofs = GetOffsetEntry(species); + if (ofs < 0) + return; + Array.Clear(Block.Data, ofs, EntrySize); + } + #endregion } } \ No newline at end of file diff --git a/PKHeX.Core/Saves/Substructures/Records.cs b/PKHeX.Core/Saves/Substructures/Records.cs index 248de9a00..d0fcafcff 100644 --- a/PKHeX.Core/Saves/Substructures/Records.cs +++ b/PKHeX.Core/Saves/Substructures/Records.cs @@ -156,28 +156,12 @@ public static int GetOffset(int baseOfs, int recordID) public static readonly IReadOnlyList MaxType_SWSH = new byte[] { - // todo - 0, 0, 0, 0, 0, 0, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 2, 2, 2, 0, 0, 0, 2, 2, 0, - 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, - 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 6, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 4, 4, 4, 5, 5, 4, 5, 5 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, }; public static readonly Dictionary RecordList_6 = new Dictionary @@ -549,10 +533,56 @@ public static int GetOffset(int baseOfs, int recordID) public static readonly Dictionary RecordList_8 = new Dictionary { - // todo - {000, "Steps Taken"}, - {001, "Times Saved"}, - {002, "Storyline Completed Time"}, + {00, "egg_hatching"}, + {01, "capture_wild"}, + {02, "capture_symbol"}, + {03, "capture_raid"}, + {04, "capture_camp"}, + {05, "capture_fishing"}, + {06, "total_capture"}, + {07, "dress_up"}, + {08, "training"}, + {09, "personal_change"}, + {10, "rotomu_circuit"}, + {11, "npc_trade"}, + {12, "pretty"}, + {13, "chain_encount"}, + {14, "hall_of_fame"}, + {15, "fossil_restore"}, + {16, "wild_pokemon_encount"}, + {17, "trade"}, + {18, "magical_trade"}, + {19, "one_day_captured"}, + {20, "one_day_evolution"}, + {21, "total_walk"}, + {22, "total_watt"}, + {23, "total_all_battle"}, + {24, "campin"}, + {25, "battle_point"}, + {26, "win_battle_point"}, + {27, "license_trade"}, + {28, "use_skill_record"}, + {29, "use_exp_ball"}, + {30, "use_personal_change_item"}, + {31, "clothes"}, + {32, "evolution"}, + {33, "net_battle"}, + {34, "cooking"}, + {35, "poke_job_return"}, + {36, "get_rare_item"}, + {37, "whistle"}, + {38, "bike_dash"}, + {39, "tree_shake"}, + {40, "tree_nut"}, + {41, "battle_lose"}, + {42, "recipe"}, + {43, "raid_battle"}, + {44, "total_money"}, + {45, "create_license_card"}, + {46, "change_hair"}, + {47, "battle_tower_single_win"}, + {48, "battle_tower_double_win"}, + {49, "now_money"}, }; } } diff --git a/PKHeX.Core/Saves/Util/DexFormUtil.cs b/PKHeX.Core/Saves/Util/DexFormUtil.cs index 8ab589b14..6d86f722e 100644 --- a/PKHeX.Core/Saves/Util/DexFormUtil.cs +++ b/PKHeX.Core/Saves/Util/DexFormUtil.cs @@ -7,11 +7,9 @@ namespace PKHeX.Core /// public static class DexFormUtil { - public static int GetDexFormIndexSWSH(int species, int formct, int start) => GetDexFormBitIndex(species, formct, start, formtable_SWSH); public static int GetDexFormIndexSM(int species, int formct, int start) => GetDexFormBitIndex(species, formct, start, formtable_SM); public static int GetDexFormIndexUSUM(int species, int formct, int start) => GetDexFormBitIndex(species, formct, start, formtable_USUM); public static int GetDexFormIndexGG(int species, int formct, int start) => GetDexFormBitIndex(species, formct, start, formtable_GG); - public static int GetDexFormCountSWSH(int species) => GetDexFormCount(species, formtable_SWSH); public static int GetDexFormCountSM(int species) => GetDexFormCount(species, formtable_SM); public static int GetDexFormCountUSUM(int species) => GetDexFormCount(species, formtable_USUM); public static int GetDexFormCountGG(int species) => GetDexFormCount(species, formtable_GG); @@ -96,11 +94,6 @@ public static class DexFormUtil 0x007F, 0x0002, 0x0082, 0x0002, 0x008E, 0x0002, 0x0096, 0x0003, }; - private static readonly ushort[] formtable_SWSH = // u16 species, u16 formcount - { - // todo - }; - private static int GetDexFormBitIndex(int species, int formct, int start, IReadOnlyList formtable) { int formindex = start; diff --git a/PKHeX.Core/Saves/Util/SaveUtil.cs b/PKHeX.Core/Saves/Util/SaveUtil.cs index fe008730d..984c7d6bc 100644 --- a/PKHeX.Core/Saves/Util/SaveUtil.cs +++ b/PKHeX.Core/Saves/Util/SaveUtil.cs @@ -16,7 +16,7 @@ public static class SaveUtil { public const int BEEF = 0x42454546; - public const int SIZE_G8SWSH = 0x845FED; // todo + public const int SIZE_G8SWSH = 0x1716B3; public const int SIZE_G7GG = 0x100000; public const int SIZE_G7USUM = 0x6CC00; public const int SIZE_G7SM = 0x6BE00; @@ -97,8 +97,6 @@ private static GameVersion GetSAVType(byte[] data) return ver; if ((ver = GetIsG7SAV(data)) != Invalid) return ver; - if ((ver = GetIsG8SAV(data)) != Invalid) - return ver; if (GetIsBelugaSAV(data) != Invalid) return GG; @@ -120,6 +118,9 @@ private static GameVersion GetSAVType(byte[] data) if (GetIsRanch4(data)) // ranch return DPPt; + if ((ver = GetIsG8SAV(data)) != Invalid) + return ver; + return Invalid; } @@ -445,10 +446,7 @@ private static GameVersion GetIsG8SAV(byte[] data) if (data.Length != SIZE_G8SWSH) return Invalid; - if (BitConverter.ToUInt32(data, data.Length - 0x1F0) != BEEF) - return Invalid; - - return SWSH; + return SwishCrypto.GetIsHashValid(data) ? SWSH : Invalid; } private static bool GetIsBank7(byte[] data) => data.Length == SIZE_G7BANK && data[0] != 0; diff --git a/PKHeX.Core/Util/FileUtil.cs b/PKHeX.Core/Util/FileUtil.cs index 69aaf934c..995eb988b 100644 --- a/PKHeX.Core/Util/FileUtil.cs +++ b/PKHeX.Core/Util/FileUtil.cs @@ -80,7 +80,7 @@ public static bool IsFileTooBig(long length) { if (length <= 0x100000) return false; - if (length == SaveUtil.SIZE_G4BR) + if (length == SaveUtil.SIZE_G4BR || length == SaveUtil.SIZE_G8SWSH) return false; if (SAV3GCMemoryCard.IsMemoryCardSize(length)) return false; // pbr/GC have size > 1MB diff --git a/PKHeX.Drawing/ImageUtil.cs b/PKHeX.Drawing/ImageUtil.cs index a623035dc..90defa890 100644 --- a/PKHeX.Drawing/ImageUtil.cs +++ b/PKHeX.Drawing/ImageUtil.cs @@ -1,5 +1,6 @@ using System; using System.Drawing; +using System.Drawing.Drawing2D; using System.Drawing.Imaging; using System.Runtime.InteropServices; @@ -235,5 +236,28 @@ public static Color Blend(Color color, Color backColor, double amount) byte b = (byte)((color.B * amount) + (backColor.B * (1 - amount))); return Color.FromArgb(r, g, b); } + + // https://stackoverflow.com/a/24199315 + public static Bitmap ResizeImage(Image image, int width, int height) + { + var destRect = new Rectangle(0, 0, width, height); + var destImage = new Bitmap(width, height); + + destImage.SetResolution(image.HorizontalResolution, image.VerticalResolution); + + using var wrapMode = new ImageAttributes(); + wrapMode.SetWrapMode(WrapMode.TileFlipXY); + + using var graphics = Graphics.FromImage(destImage); + graphics.CompositingMode = CompositingMode.SourceCopy; + graphics.CompositingQuality = CompositingQuality.HighQuality; + graphics.InterpolationMode = InterpolationMode.HighQualityBicubic; + graphics.SmoothingMode = SmoothingMode.HighQuality; + graphics.PixelOffsetMode = PixelOffsetMode.HighQuality; + + graphics.DrawImage(image, destRect, 0, 0, image.Width, image.Height, GraphicsUnit.Pixel, wrapMode); + + return destImage; + } } } diff --git a/PKHeX.Drawing/Names/SpriteName.cs b/PKHeX.Drawing/Names/SpriteName.cs index 889bdae38..2ef6321e0 100644 --- a/PKHeX.Drawing/Names/SpriteName.cs +++ b/PKHeX.Drawing/Names/SpriteName.cs @@ -47,7 +47,9 @@ public static string GetResourceStringSprite(int species, int form, int gender, } } else if (gender == 1 && SpeciesGenderedSprite.Contains(species)) - { sb.Append(Separator); sb.Append(gender); } + { + sb.Append('f'); + } if (shiny && AllowShinySprite) sb.Append(Shiny); @@ -72,6 +74,7 @@ public static string GetResourceStringSprite(int species, int form, int gender, /// private static readonly HashSet SpeciesGenderedSprite = new HashSet { + (int)Species.Hippowdon, (int)Species.Unfezant, (int)Species.Frillish, (int)Species.Jellicent, diff --git a/PKHeX.Drawing/Properties/Resources.Designer.cs b/PKHeX.Drawing/Properties/Resources.Designer.cs index 185cc4c77..6af078fa3 100644 --- a/PKHeX.Drawing/Properties/Resources.Designer.cs +++ b/PKHeX.Drawing/Properties/Resources.Designer.cs @@ -10013,9 +10013,19 @@ public class Resources { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap _450_1s { + public static System.Drawing.Bitmap _450f { get { - object obj = ResourceManager.GetObject("_450_1s", resourceCulture); + object obj = ResourceManager.GetObject("_450f", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap _450fs { + get { + object obj = ResourceManager.GetObject("_450fs", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -11853,9 +11863,9 @@ public class Resources { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap _521_1 { + public static System.Drawing.Bitmap _521f { get { - object obj = ResourceManager.GetObject("_521_1", resourceCulture); + object obj = ResourceManager.GetObject("_521f", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -11863,19 +11873,9 @@ public class Resources { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap _521_1s { + public static System.Drawing.Bitmap _521fs { get { - object obj = ResourceManager.GetObject("_521_1s", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap _521_1s1 { - get { - object obj = ResourceManager.GetObject("_521_1s1", resourceCulture); + object obj = ResourceManager.GetObject("_521fs", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -13643,9 +13643,9 @@ public class Resources { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap _592_1 { + public static System.Drawing.Bitmap _592f { get { - object obj = ResourceManager.GetObject("_592_1", resourceCulture); + object obj = ResourceManager.GetObject("_592f", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -13653,9 +13653,9 @@ public class Resources { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap _592_1s { + public static System.Drawing.Bitmap _592fs { get { - object obj = ResourceManager.GetObject("_592_1s", resourceCulture); + object obj = ResourceManager.GetObject("_592fs", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -13683,9 +13683,9 @@ public class Resources { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap _593_1 { + public static System.Drawing.Bitmap _593f { get { - object obj = ResourceManager.GetObject("_593_1", resourceCulture); + object obj = ResourceManager.GetObject("_593f", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -13693,9 +13693,9 @@ public class Resources { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap _593_1s { + public static System.Drawing.Bitmap _593fs { get { - object obj = ResourceManager.GetObject("_593_1s", resourceCulture); + object obj = ResourceManager.GetObject("_593fs", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -16063,9 +16063,9 @@ public class Resources { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap _668_1 { + public static System.Drawing.Bitmap _668f { get { - object obj = ResourceManager.GetObject("_668_1", resourceCulture); + object obj = ResourceManager.GetObject("_668f", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -16073,9 +16073,9 @@ public class Resources { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap _668_1s { + public static System.Drawing.Bitmap _668fs { get { - object obj = ResourceManager.GetObject("_668_1s", resourceCulture); + object obj = ResourceManager.GetObject("_668fs", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -21300,6 +21300,5296 @@ public class Resources { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_0 { + get { + object obj = ResourceManager.GetObject("b_0", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_0_1 { + get { + object obj = ResourceManager.GetObject("b_0_1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_1 { + get { + object obj = ResourceManager.GetObject("b_1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_10 { + get { + object obj = ResourceManager.GetObject("b_10", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_106 { + get { + object obj = ResourceManager.GetObject("b_106", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_107 { + get { + object obj = ResourceManager.GetObject("b_107", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_109 { + get { + object obj = ResourceManager.GetObject("b_109", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_11 { + get { + object obj = ResourceManager.GetObject("b_11", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_110 { + get { + object obj = ResourceManager.GetObject("b_110", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_110_1 { + get { + object obj = ResourceManager.GetObject("b_110_1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_111 { + get { + object obj = ResourceManager.GetObject("b_111", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_112 { + get { + object obj = ResourceManager.GetObject("b_112", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_118 { + get { + object obj = ResourceManager.GetObject("b_118", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_119 { + get { + object obj = ResourceManager.GetObject("b_119", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_12 { + get { + object obj = ResourceManager.GetObject("b_12", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_122 { + get { + object obj = ResourceManager.GetObject("b_122", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_122_1 { + get { + object obj = ResourceManager.GetObject("b_122_1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_129 { + get { + object obj = ResourceManager.GetObject("b_129", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_130 { + get { + object obj = ResourceManager.GetObject("b_130", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_131 { + get { + object obj = ResourceManager.GetObject("b_131", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_132 { + get { + object obj = ResourceManager.GetObject("b_132", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_133 { + get { + object obj = ResourceManager.GetObject("b_133", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_134 { + get { + object obj = ResourceManager.GetObject("b_134", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_135 { + get { + object obj = ResourceManager.GetObject("b_135", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_136 { + get { + object obj = ResourceManager.GetObject("b_136", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_143 { + get { + object obj = ResourceManager.GetObject("b_143", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_150 { + get { + object obj = ResourceManager.GetObject("b_150", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_151 { + get { + object obj = ResourceManager.GetObject("b_151", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_163 { + get { + object obj = ResourceManager.GetObject("b_163", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_164 { + get { + object obj = ResourceManager.GetObject("b_164", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_170 { + get { + object obj = ResourceManager.GetObject("b_170", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_171 { + get { + object obj = ResourceManager.GetObject("b_171", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_172 { + get { + object obj = ResourceManager.GetObject("b_172", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_173 { + get { + object obj = ResourceManager.GetObject("b_173", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_175 { + get { + object obj = ResourceManager.GetObject("b_175", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_176 { + get { + object obj = ResourceManager.GetObject("b_176", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_177 { + get { + object obj = ResourceManager.GetObject("b_177", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_178 { + get { + object obj = ResourceManager.GetObject("b_178", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_182 { + get { + object obj = ResourceManager.GetObject("b_182", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_185 { + get { + object obj = ResourceManager.GetObject("b_185", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_194 { + get { + object obj = ResourceManager.GetObject("b_194", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_195 { + get { + object obj = ResourceManager.GetObject("b_195", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_196 { + get { + object obj = ResourceManager.GetObject("b_196", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_197 { + get { + object obj = ResourceManager.GetObject("b_197", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_2 { + get { + object obj = ResourceManager.GetObject("b_2", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_202 { + get { + object obj = ResourceManager.GetObject("b_202", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_208 { + get { + object obj = ResourceManager.GetObject("b_208", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_211 { + get { + object obj = ResourceManager.GetObject("b_211", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_213 { + get { + object obj = ResourceManager.GetObject("b_213", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_215 { + get { + object obj = ResourceManager.GetObject("b_215", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_220 { + get { + object obj = ResourceManager.GetObject("b_220", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_221 { + get { + object obj = ResourceManager.GetObject("b_221", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_222 { + get { + object obj = ResourceManager.GetObject("b_222", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_222_1 { + get { + object obj = ResourceManager.GetObject("b_222_1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_223 { + get { + object obj = ResourceManager.GetObject("b_223", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_224 { + get { + object obj = ResourceManager.GetObject("b_224", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_225 { + get { + object obj = ResourceManager.GetObject("b_225", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_226 { + get { + object obj = ResourceManager.GetObject("b_226", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_236 { + get { + object obj = ResourceManager.GetObject("b_236", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_237 { + get { + object obj = ResourceManager.GetObject("b_237", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_246 { + get { + object obj = ResourceManager.GetObject("b_246", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_247 { + get { + object obj = ResourceManager.GetObject("b_247", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_248 { + get { + object obj = ResourceManager.GetObject("b_248", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_25 { + get { + object obj = ResourceManager.GetObject("b_25", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_25_1 { + get { + object obj = ResourceManager.GetObject("b_25_1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_25_2 { + get { + object obj = ResourceManager.GetObject("b_25_2", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_25_3 { + get { + object obj = ResourceManager.GetObject("b_25_3", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_25_4 { + get { + object obj = ResourceManager.GetObject("b_25_4", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_25_5 { + get { + object obj = ResourceManager.GetObject("b_25_5", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_25_6 { + get { + object obj = ResourceManager.GetObject("b_25_6", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_25_7 { + get { + object obj = ResourceManager.GetObject("b_25_7", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_251 { + get { + object obj = ResourceManager.GetObject("b_251", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_26 { + get { + object obj = ResourceManager.GetObject("b_26", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_26_1 { + get { + object obj = ResourceManager.GetObject("b_26_1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_263 { + get { + object obj = ResourceManager.GetObject("b_263", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_263_1 { + get { + object obj = ResourceManager.GetObject("b_263_1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_264 { + get { + object obj = ResourceManager.GetObject("b_264", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_264_1 { + get { + object obj = ResourceManager.GetObject("b_264_1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_270 { + get { + object obj = ResourceManager.GetObject("b_270", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_271 { + get { + object obj = ResourceManager.GetObject("b_271", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_272 { + get { + object obj = ResourceManager.GetObject("b_272", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_273 { + get { + object obj = ResourceManager.GetObject("b_273", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_274 { + get { + object obj = ResourceManager.GetObject("b_274", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_275 { + get { + object obj = ResourceManager.GetObject("b_275", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_278 { + get { + object obj = ResourceManager.GetObject("b_278", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_279 { + get { + object obj = ResourceManager.GetObject("b_279", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_280 { + get { + object obj = ResourceManager.GetObject("b_280", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_281 { + get { + object obj = ResourceManager.GetObject("b_281", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_282 { + get { + object obj = ResourceManager.GetObject("b_282", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_290 { + get { + object obj = ResourceManager.GetObject("b_290", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_291 { + get { + object obj = ResourceManager.GetObject("b_291", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_292 { + get { + object obj = ResourceManager.GetObject("b_292", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_3 { + get { + object obj = ResourceManager.GetObject("b_3", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_302 { + get { + object obj = ResourceManager.GetObject("b_302", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_303 { + get { + object obj = ResourceManager.GetObject("b_303", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_309 { + get { + object obj = ResourceManager.GetObject("b_309", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_310 { + get { + object obj = ResourceManager.GetObject("b_310", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_315 { + get { + object obj = ResourceManager.GetObject("b_315", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_320 { + get { + object obj = ResourceManager.GetObject("b_320", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_321 { + get { + object obj = ResourceManager.GetObject("b_321", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_324 { + get { + object obj = ResourceManager.GetObject("b_324", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_328 { + get { + object obj = ResourceManager.GetObject("b_328", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_329 { + get { + object obj = ResourceManager.GetObject("b_329", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_330 { + get { + object obj = ResourceManager.GetObject("b_330", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_337 { + get { + object obj = ResourceManager.GetObject("b_337", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_338 { + get { + object obj = ResourceManager.GetObject("b_338", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_339 { + get { + object obj = ResourceManager.GetObject("b_339", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_340 { + get { + object obj = ResourceManager.GetObject("b_340", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_341 { + get { + object obj = ResourceManager.GetObject("b_341", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_342 { + get { + object obj = ResourceManager.GetObject("b_342", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_343 { + get { + object obj = ResourceManager.GetObject("b_343", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_344 { + get { + object obj = ResourceManager.GetObject("b_344", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_349 { + get { + object obj = ResourceManager.GetObject("b_349", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_35 { + get { + object obj = ResourceManager.GetObject("b_35", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_350 { + get { + object obj = ResourceManager.GetObject("b_350", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_355 { + get { + object obj = ResourceManager.GetObject("b_355", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_356 { + get { + object obj = ResourceManager.GetObject("b_356", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_36 { + get { + object obj = ResourceManager.GetObject("b_36", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_360 { + get { + object obj = ResourceManager.GetObject("b_360", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_361 { + get { + object obj = ResourceManager.GetObject("b_361", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_362 { + get { + object obj = ResourceManager.GetObject("b_362", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_37 { + get { + object obj = ResourceManager.GetObject("b_37", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_37_1 { + get { + object obj = ResourceManager.GetObject("b_37_1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_38 { + get { + object obj = ResourceManager.GetObject("b_38", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_38_1 { + get { + object obj = ResourceManager.GetObject("b_38_1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_385 { + get { + object obj = ResourceManager.GetObject("b_385", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_4 { + get { + object obj = ResourceManager.GetObject("b_4", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_406 { + get { + object obj = ResourceManager.GetObject("b_406", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_407 { + get { + object obj = ResourceManager.GetObject("b_407", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_415 { + get { + object obj = ResourceManager.GetObject("b_415", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_416 { + get { + object obj = ResourceManager.GetObject("b_416", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_420 { + get { + object obj = ResourceManager.GetObject("b_420", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_421 { + get { + object obj = ResourceManager.GetObject("b_421", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_421_1 { + get { + object obj = ResourceManager.GetObject("b_421_1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_422 { + get { + object obj = ResourceManager.GetObject("b_422", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_422_1 { + get { + object obj = ResourceManager.GetObject("b_422_1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_423 { + get { + object obj = ResourceManager.GetObject("b_423", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_423_1 { + get { + object obj = ResourceManager.GetObject("b_423_1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_425 { + get { + object obj = ResourceManager.GetObject("b_425", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_426 { + get { + object obj = ResourceManager.GetObject("b_426", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_43 { + get { + object obj = ResourceManager.GetObject("b_43", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_434 { + get { + object obj = ResourceManager.GetObject("b_434", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_435 { + get { + object obj = ResourceManager.GetObject("b_435", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_436 { + get { + object obj = ResourceManager.GetObject("b_436", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_437 { + get { + object obj = ResourceManager.GetObject("b_437", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_438 { + get { + object obj = ResourceManager.GetObject("b_438", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_439 { + get { + object obj = ResourceManager.GetObject("b_439", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_44 { + get { + object obj = ResourceManager.GetObject("b_44", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_446 { + get { + object obj = ResourceManager.GetObject("b_446", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_447 { + get { + object obj = ResourceManager.GetObject("b_447", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_448 { + get { + object obj = ResourceManager.GetObject("b_448", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_449 { + get { + object obj = ResourceManager.GetObject("b_449", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_45 { + get { + object obj = ResourceManager.GetObject("b_45", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_450 { + get { + object obj = ResourceManager.GetObject("b_450", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_450f { + get { + object obj = ResourceManager.GetObject("b_450f", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_451 { + get { + object obj = ResourceManager.GetObject("b_451", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_452 { + get { + object obj = ResourceManager.GetObject("b_452", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_453 { + get { + object obj = ResourceManager.GetObject("b_453", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_454 { + get { + object obj = ResourceManager.GetObject("b_454", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_458 { + get { + object obj = ResourceManager.GetObject("b_458", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_459 { + get { + object obj = ResourceManager.GetObject("b_459", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_460 { + get { + object obj = ResourceManager.GetObject("b_460", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_461 { + get { + object obj = ResourceManager.GetObject("b_461", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_464 { + get { + object obj = ResourceManager.GetObject("b_464", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_468 { + get { + object obj = ResourceManager.GetObject("b_468", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_470 { + get { + object obj = ResourceManager.GetObject("b_470", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_471 { + get { + object obj = ResourceManager.GetObject("b_471", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_473 { + get { + object obj = ResourceManager.GetObject("b_473", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_475 { + get { + object obj = ResourceManager.GetObject("b_475", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_477 { + get { + object obj = ResourceManager.GetObject("b_477", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_478 { + get { + object obj = ResourceManager.GetObject("b_478", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_479 { + get { + object obj = ResourceManager.GetObject("b_479", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_479_1 { + get { + object obj = ResourceManager.GetObject("b_479_1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_479_2 { + get { + object obj = ResourceManager.GetObject("b_479_2", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_479_3 { + get { + object obj = ResourceManager.GetObject("b_479_3", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_479_4 { + get { + object obj = ResourceManager.GetObject("b_479_4", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_479_5 { + get { + object obj = ResourceManager.GetObject("b_479_5", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_5 { + get { + object obj = ResourceManager.GetObject("b_5", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_50 { + get { + object obj = ResourceManager.GetObject("b_50", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_50_1 { + get { + object obj = ResourceManager.GetObject("b_50_1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_509 { + get { + object obj = ResourceManager.GetObject("b_509", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_51 { + get { + object obj = ResourceManager.GetObject("b_51", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_51_1 { + get { + object obj = ResourceManager.GetObject("b_51_1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_510 { + get { + object obj = ResourceManager.GetObject("b_510", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_517 { + get { + object obj = ResourceManager.GetObject("b_517", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_518 { + get { + object obj = ResourceManager.GetObject("b_518", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_519 { + get { + object obj = ResourceManager.GetObject("b_519", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_52 { + get { + object obj = ResourceManager.GetObject("b_52", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_52_1 { + get { + object obj = ResourceManager.GetObject("b_52_1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_52_2 { + get { + object obj = ResourceManager.GetObject("b_52_2", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_520 { + get { + object obj = ResourceManager.GetObject("b_520", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_521 { + get { + object obj = ResourceManager.GetObject("b_521", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_521f { + get { + object obj = ResourceManager.GetObject("b_521f", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_524 { + get { + object obj = ResourceManager.GetObject("b_524", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_525 { + get { + object obj = ResourceManager.GetObject("b_525", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_526 { + get { + object obj = ResourceManager.GetObject("b_526", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_527 { + get { + object obj = ResourceManager.GetObject("b_527", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_528 { + get { + object obj = ResourceManager.GetObject("b_528", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_529 { + get { + object obj = ResourceManager.GetObject("b_529", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_53 { + get { + object obj = ResourceManager.GetObject("b_53", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_53_1 { + get { + object obj = ResourceManager.GetObject("b_53_1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_530 { + get { + object obj = ResourceManager.GetObject("b_530", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_532 { + get { + object obj = ResourceManager.GetObject("b_532", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_533 { + get { + object obj = ResourceManager.GetObject("b_533", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_534 { + get { + object obj = ResourceManager.GetObject("b_534", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_535 { + get { + object obj = ResourceManager.GetObject("b_535", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_536 { + get { + object obj = ResourceManager.GetObject("b_536", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_537 { + get { + object obj = ResourceManager.GetObject("b_537", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_538 { + get { + object obj = ResourceManager.GetObject("b_538", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_539 { + get { + object obj = ResourceManager.GetObject("b_539", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_546 { + get { + object obj = ResourceManager.GetObject("b_546", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_547 { + get { + object obj = ResourceManager.GetObject("b_547", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_550 { + get { + object obj = ResourceManager.GetObject("b_550", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_550_1 { + get { + object obj = ResourceManager.GetObject("b_550_1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_554 { + get { + object obj = ResourceManager.GetObject("b_554", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_554_1 { + get { + object obj = ResourceManager.GetObject("b_554_1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_555 { + get { + object obj = ResourceManager.GetObject("b_555", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_555_1 { + get { + object obj = ResourceManager.GetObject("b_555_1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_555_2 { + get { + object obj = ResourceManager.GetObject("b_555_2", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_555_3 { + get { + object obj = ResourceManager.GetObject("b_555_3", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_556 { + get { + object obj = ResourceManager.GetObject("b_556", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_557 { + get { + object obj = ResourceManager.GetObject("b_557", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_558 { + get { + object obj = ResourceManager.GetObject("b_558", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_559 { + get { + object obj = ResourceManager.GetObject("b_559", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_560 { + get { + object obj = ResourceManager.GetObject("b_560", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_561 { + get { + object obj = ResourceManager.GetObject("b_561", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_562 { + get { + object obj = ResourceManager.GetObject("b_562", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_562_1 { + get { + object obj = ResourceManager.GetObject("b_562_1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_563 { + get { + object obj = ResourceManager.GetObject("b_563", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_568 { + get { + object obj = ResourceManager.GetObject("b_568", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_569 { + get { + object obj = ResourceManager.GetObject("b_569", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_572 { + get { + object obj = ResourceManager.GetObject("b_572", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_573 { + get { + object obj = ResourceManager.GetObject("b_573", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_574 { + get { + object obj = ResourceManager.GetObject("b_574", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_575 { + get { + object obj = ResourceManager.GetObject("b_575", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_576 { + get { + object obj = ResourceManager.GetObject("b_576", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_577 { + get { + object obj = ResourceManager.GetObject("b_577", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_578 { + get { + object obj = ResourceManager.GetObject("b_578", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_579 { + get { + object obj = ResourceManager.GetObject("b_579", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_58 { + get { + object obj = ResourceManager.GetObject("b_58", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_582 { + get { + object obj = ResourceManager.GetObject("b_582", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_583 { + get { + object obj = ResourceManager.GetObject("b_583", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_584 { + get { + object obj = ResourceManager.GetObject("b_584", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_588 { + get { + object obj = ResourceManager.GetObject("b_588", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_589 { + get { + object obj = ResourceManager.GetObject("b_589", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_59 { + get { + object obj = ResourceManager.GetObject("b_59", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_592 { + get { + object obj = ResourceManager.GetObject("b_592", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_592f { + get { + object obj = ResourceManager.GetObject("b_592f", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_593 { + get { + object obj = ResourceManager.GetObject("b_593", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_593f { + get { + object obj = ResourceManager.GetObject("b_593f", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_595 { + get { + object obj = ResourceManager.GetObject("b_595", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_596 { + get { + object obj = ResourceManager.GetObject("b_596", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_597 { + get { + object obj = ResourceManager.GetObject("b_597", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_598 { + get { + object obj = ResourceManager.GetObject("b_598", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_599 { + get { + object obj = ResourceManager.GetObject("b_599", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_6 { + get { + object obj = ResourceManager.GetObject("b_6", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_600 { + get { + object obj = ResourceManager.GetObject("b_600", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_601 { + get { + object obj = ResourceManager.GetObject("b_601", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_605 { + get { + object obj = ResourceManager.GetObject("b_605", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_606 { + get { + object obj = ResourceManager.GetObject("b_606", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_607 { + get { + object obj = ResourceManager.GetObject("b_607", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_608 { + get { + object obj = ResourceManager.GetObject("b_608", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_609 { + get { + object obj = ResourceManager.GetObject("b_609", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_610 { + get { + object obj = ResourceManager.GetObject("b_610", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_611 { + get { + object obj = ResourceManager.GetObject("b_611", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_612 { + get { + object obj = ResourceManager.GetObject("b_612", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_613 { + get { + object obj = ResourceManager.GetObject("b_613", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_614 { + get { + object obj = ResourceManager.GetObject("b_614", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_616 { + get { + object obj = ResourceManager.GetObject("b_616", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_617 { + get { + object obj = ResourceManager.GetObject("b_617", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_618 { + get { + object obj = ResourceManager.GetObject("b_618", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_618_1 { + get { + object obj = ResourceManager.GetObject("b_618_1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_622 { + get { + object obj = ResourceManager.GetObject("b_622", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_623 { + get { + object obj = ResourceManager.GetObject("b_623", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_624 { + get { + object obj = ResourceManager.GetObject("b_624", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_625 { + get { + object obj = ResourceManager.GetObject("b_625", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_627 { + get { + object obj = ResourceManager.GetObject("b_627", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_628 { + get { + object obj = ResourceManager.GetObject("b_628", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_629 { + get { + object obj = ResourceManager.GetObject("b_629", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_630 { + get { + object obj = ResourceManager.GetObject("b_630", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_631 { + get { + object obj = ResourceManager.GetObject("b_631", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_632 { + get { + object obj = ResourceManager.GetObject("b_632", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_633 { + get { + object obj = ResourceManager.GetObject("b_633", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_634 { + get { + object obj = ResourceManager.GetObject("b_634", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_635 { + get { + object obj = ResourceManager.GetObject("b_635", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_638 { + get { + object obj = ResourceManager.GetObject("b_638", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_639 { + get { + object obj = ResourceManager.GetObject("b_639", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_640 { + get { + object obj = ResourceManager.GetObject("b_640", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_643 { + get { + object obj = ResourceManager.GetObject("b_643", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_644 { + get { + object obj = ResourceManager.GetObject("b_644", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_646 { + get { + object obj = ResourceManager.GetObject("b_646", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_646_1 { + get { + object obj = ResourceManager.GetObject("b_646_1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_646_2 { + get { + object obj = ResourceManager.GetObject("b_646_2", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_647 { + get { + object obj = ResourceManager.GetObject("b_647", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_647_1 { + get { + object obj = ResourceManager.GetObject("b_647_1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_659 { + get { + object obj = ResourceManager.GetObject("b_659", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_66 { + get { + object obj = ResourceManager.GetObject("b_66", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_660 { + get { + object obj = ResourceManager.GetObject("b_660", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_67 { + get { + object obj = ResourceManager.GetObject("b_67", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_674 { + get { + object obj = ResourceManager.GetObject("b_674", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_675 { + get { + object obj = ResourceManager.GetObject("b_675", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_677 { + get { + object obj = ResourceManager.GetObject("b_677", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_678 { + get { + object obj = ResourceManager.GetObject("b_678", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_678_1 { + get { + object obj = ResourceManager.GetObject("b_678_1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_679 { + get { + object obj = ResourceManager.GetObject("b_679", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_68 { + get { + object obj = ResourceManager.GetObject("b_68", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_680 { + get { + object obj = ResourceManager.GetObject("b_680", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_681 { + get { + object obj = ResourceManager.GetObject("b_681", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_681_1 { + get { + object obj = ResourceManager.GetObject("b_681_1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_682 { + get { + object obj = ResourceManager.GetObject("b_682", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_683 { + get { + object obj = ResourceManager.GetObject("b_683", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_684 { + get { + object obj = ResourceManager.GetObject("b_684", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_685 { + get { + object obj = ResourceManager.GetObject("b_685", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_686 { + get { + object obj = ResourceManager.GetObject("b_686", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_687 { + get { + object obj = ResourceManager.GetObject("b_687", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_688 { + get { + object obj = ResourceManager.GetObject("b_688", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_689 { + get { + object obj = ResourceManager.GetObject("b_689", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_694 { + get { + object obj = ResourceManager.GetObject("b_694", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_695 { + get { + object obj = ResourceManager.GetObject("b_695", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_7 { + get { + object obj = ResourceManager.GetObject("b_7", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_700 { + get { + object obj = ResourceManager.GetObject("b_700", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_701 { + get { + object obj = ResourceManager.GetObject("b_701", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_704 { + get { + object obj = ResourceManager.GetObject("b_704", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_705 { + get { + object obj = ResourceManager.GetObject("b_705", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_706 { + get { + object obj = ResourceManager.GetObject("b_706", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_708 { + get { + object obj = ResourceManager.GetObject("b_708", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_709 { + get { + object obj = ResourceManager.GetObject("b_709", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_710 { + get { + object obj = ResourceManager.GetObject("b_710", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_710_1 { + get { + object obj = ResourceManager.GetObject("b_710_1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_710_2 { + get { + object obj = ResourceManager.GetObject("b_710_2", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_710_3 { + get { + object obj = ResourceManager.GetObject("b_710_3", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_711 { + get { + object obj = ResourceManager.GetObject("b_711", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_711_1 { + get { + object obj = ResourceManager.GetObject("b_711_1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_711_2 { + get { + object obj = ResourceManager.GetObject("b_711_2", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_711_3 { + get { + object obj = ResourceManager.GetObject("b_711_3", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_712 { + get { + object obj = ResourceManager.GetObject("b_712", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_713 { + get { + object obj = ResourceManager.GetObject("b_713", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_714 { + get { + object obj = ResourceManager.GetObject("b_714", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_715 { + get { + object obj = ResourceManager.GetObject("b_715", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_722 { + get { + object obj = ResourceManager.GetObject("b_722", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_723 { + get { + object obj = ResourceManager.GetObject("b_723", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_724 { + get { + object obj = ResourceManager.GetObject("b_724", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_725 { + get { + object obj = ResourceManager.GetObject("b_725", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_726 { + get { + object obj = ResourceManager.GetObject("b_726", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_727 { + get { + object obj = ResourceManager.GetObject("b_727", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_728 { + get { + object obj = ResourceManager.GetObject("b_728", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_729 { + get { + object obj = ResourceManager.GetObject("b_729", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_730 { + get { + object obj = ResourceManager.GetObject("b_730", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_736 { + get { + object obj = ResourceManager.GetObject("b_736", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_737 { + get { + object obj = ResourceManager.GetObject("b_737", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_738 { + get { + object obj = ResourceManager.GetObject("b_738", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_742 { + get { + object obj = ResourceManager.GetObject("b_742", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_743 { + get { + object obj = ResourceManager.GetObject("b_743", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_746 { + get { + object obj = ResourceManager.GetObject("b_746", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_746_1 { + get { + object obj = ResourceManager.GetObject("b_746_1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_747 { + get { + object obj = ResourceManager.GetObject("b_747", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_748 { + get { + object obj = ResourceManager.GetObject("b_748", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_749 { + get { + object obj = ResourceManager.GetObject("b_749", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_750 { + get { + object obj = ResourceManager.GetObject("b_750", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_751 { + get { + object obj = ResourceManager.GetObject("b_751", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_752 { + get { + object obj = ResourceManager.GetObject("b_752", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_755 { + get { + object obj = ResourceManager.GetObject("b_755", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_756 { + get { + object obj = ResourceManager.GetObject("b_756", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_757 { + get { + object obj = ResourceManager.GetObject("b_757", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_758 { + get { + object obj = ResourceManager.GetObject("b_758", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_759 { + get { + object obj = ResourceManager.GetObject("b_759", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_760 { + get { + object obj = ResourceManager.GetObject("b_760", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_761 { + get { + object obj = ResourceManager.GetObject("b_761", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_762 { + get { + object obj = ResourceManager.GetObject("b_762", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_763 { + get { + object obj = ResourceManager.GetObject("b_763", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_765 { + get { + object obj = ResourceManager.GetObject("b_765", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_766 { + get { + object obj = ResourceManager.GetObject("b_766", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_767 { + get { + object obj = ResourceManager.GetObject("b_767", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_768 { + get { + object obj = ResourceManager.GetObject("b_768", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_77 { + get { + object obj = ResourceManager.GetObject("b_77", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_77_1 { + get { + object obj = ResourceManager.GetObject("b_77_1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_771 { + get { + object obj = ResourceManager.GetObject("b_771", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_772 { + get { + object obj = ResourceManager.GetObject("b_772", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_773 { + get { + object obj = ResourceManager.GetObject("b_773", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_773_1 { + get { + object obj = ResourceManager.GetObject("b_773_1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_773_10 { + get { + object obj = ResourceManager.GetObject("b_773_10", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_773_11 { + get { + object obj = ResourceManager.GetObject("b_773_11", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_773_12 { + get { + object obj = ResourceManager.GetObject("b_773_12", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_773_13 { + get { + object obj = ResourceManager.GetObject("b_773_13", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_773_14 { + get { + object obj = ResourceManager.GetObject("b_773_14", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_773_15 { + get { + object obj = ResourceManager.GetObject("b_773_15", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_773_16 { + get { + object obj = ResourceManager.GetObject("b_773_16", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_773_17 { + get { + object obj = ResourceManager.GetObject("b_773_17", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_773_2 { + get { + object obj = ResourceManager.GetObject("b_773_2", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_773_3 { + get { + object obj = ResourceManager.GetObject("b_773_3", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_773_4 { + get { + object obj = ResourceManager.GetObject("b_773_4", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_773_5 { + get { + object obj = ResourceManager.GetObject("b_773_5", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_773_6 { + get { + object obj = ResourceManager.GetObject("b_773_6", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_773_7 { + get { + object obj = ResourceManager.GetObject("b_773_7", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_773_8 { + get { + object obj = ResourceManager.GetObject("b_773_8", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_773_9 { + get { + object obj = ResourceManager.GetObject("b_773_9", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_776 { + get { + object obj = ResourceManager.GetObject("b_776", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_777 { + get { + object obj = ResourceManager.GetObject("b_777", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_778 { + get { + object obj = ResourceManager.GetObject("b_778", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_778_1 { + get { + object obj = ResourceManager.GetObject("b_778_1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_78 { + get { + object obj = ResourceManager.GetObject("b_78", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_78_1 { + get { + object obj = ResourceManager.GetObject("b_78_1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_780 { + get { + object obj = ResourceManager.GetObject("b_780", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_781 { + get { + object obj = ResourceManager.GetObject("b_781", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_782 { + get { + object obj = ResourceManager.GetObject("b_782", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_783 { + get { + object obj = ResourceManager.GetObject("b_783", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_784 { + get { + object obj = ResourceManager.GetObject("b_784", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_789 { + get { + object obj = ResourceManager.GetObject("b_789", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_790 { + get { + object obj = ResourceManager.GetObject("b_790", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_791 { + get { + object obj = ResourceManager.GetObject("b_791", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_792 { + get { + object obj = ResourceManager.GetObject("b_792", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_8 { + get { + object obj = ResourceManager.GetObject("b_8", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_800 { + get { + object obj = ResourceManager.GetObject("b_800", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_800_1 { + get { + object obj = ResourceManager.GetObject("b_800_1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_800_2 { + get { + object obj = ResourceManager.GetObject("b_800_2", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_802 { + get { + object obj = ResourceManager.GetObject("b_802", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_807 { + get { + object obj = ResourceManager.GetObject("b_807", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_808 { + get { + object obj = ResourceManager.GetObject("b_808", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_809 { + get { + object obj = ResourceManager.GetObject("b_809", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_810 { + get { + object obj = ResourceManager.GetObject("b_810", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_811 { + get { + object obj = ResourceManager.GetObject("b_811", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_812 { + get { + object obj = ResourceManager.GetObject("b_812", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_813 { + get { + object obj = ResourceManager.GetObject("b_813", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_814 { + get { + object obj = ResourceManager.GetObject("b_814", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_815 { + get { + object obj = ResourceManager.GetObject("b_815", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_816 { + get { + object obj = ResourceManager.GetObject("b_816", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_817 { + get { + object obj = ResourceManager.GetObject("b_817", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_818 { + get { + object obj = ResourceManager.GetObject("b_818", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_819 { + get { + object obj = ResourceManager.GetObject("b_819", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_820 { + get { + object obj = ResourceManager.GetObject("b_820", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_821 { + get { + object obj = ResourceManager.GetObject("b_821", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_822 { + get { + object obj = ResourceManager.GetObject("b_822", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_823 { + get { + object obj = ResourceManager.GetObject("b_823", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_824 { + get { + object obj = ResourceManager.GetObject("b_824", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_825 { + get { + object obj = ResourceManager.GetObject("b_825", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_826 { + get { + object obj = ResourceManager.GetObject("b_826", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_827 { + get { + object obj = ResourceManager.GetObject("b_827", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_828 { + get { + object obj = ResourceManager.GetObject("b_828", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_829 { + get { + object obj = ResourceManager.GetObject("b_829", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_83 { + get { + object obj = ResourceManager.GetObject("b_83", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_83_1 { + get { + object obj = ResourceManager.GetObject("b_83_1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_830 { + get { + object obj = ResourceManager.GetObject("b_830", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_831 { + get { + object obj = ResourceManager.GetObject("b_831", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_832 { + get { + object obj = ResourceManager.GetObject("b_832", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_833 { + get { + object obj = ResourceManager.GetObject("b_833", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_834 { + get { + object obj = ResourceManager.GetObject("b_834", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_835 { + get { + object obj = ResourceManager.GetObject("b_835", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_836 { + get { + object obj = ResourceManager.GetObject("b_836", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_837 { + get { + object obj = ResourceManager.GetObject("b_837", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_838 { + get { + object obj = ResourceManager.GetObject("b_838", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_839 { + get { + object obj = ResourceManager.GetObject("b_839", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_840 { + get { + object obj = ResourceManager.GetObject("b_840", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_841 { + get { + object obj = ResourceManager.GetObject("b_841", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_842 { + get { + object obj = ResourceManager.GetObject("b_842", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_843 { + get { + object obj = ResourceManager.GetObject("b_843", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_844 { + get { + object obj = ResourceManager.GetObject("b_844", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_845 { + get { + object obj = ResourceManager.GetObject("b_845", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_845_1 { + get { + object obj = ResourceManager.GetObject("b_845_1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_845_2 { + get { + object obj = ResourceManager.GetObject("b_845_2", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_846 { + get { + object obj = ResourceManager.GetObject("b_846", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_847 { + get { + object obj = ResourceManager.GetObject("b_847", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_848 { + get { + object obj = ResourceManager.GetObject("b_848", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_849 { + get { + object obj = ResourceManager.GetObject("b_849", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_849_1 { + get { + object obj = ResourceManager.GetObject("b_849_1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_850 { + get { + object obj = ResourceManager.GetObject("b_850", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_851 { + get { + object obj = ResourceManager.GetObject("b_851", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_852 { + get { + object obj = ResourceManager.GetObject("b_852", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_853 { + get { + object obj = ResourceManager.GetObject("b_853", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_854 { + get { + object obj = ResourceManager.GetObject("b_854", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_854_1 { + get { + object obj = ResourceManager.GetObject("b_854_1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_855 { + get { + object obj = ResourceManager.GetObject("b_855", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_855_1 { + get { + object obj = ResourceManager.GetObject("b_855_1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_856 { + get { + object obj = ResourceManager.GetObject("b_856", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_857 { + get { + object obj = ResourceManager.GetObject("b_857", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_858 { + get { + object obj = ResourceManager.GetObject("b_858", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_859 { + get { + object obj = ResourceManager.GetObject("b_859", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_860 { + get { + object obj = ResourceManager.GetObject("b_860", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_861 { + get { + object obj = ResourceManager.GetObject("b_861", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_862 { + get { + object obj = ResourceManager.GetObject("b_862", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_863 { + get { + object obj = ResourceManager.GetObject("b_863", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_864 { + get { + object obj = ResourceManager.GetObject("b_864", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_865 { + get { + object obj = ResourceManager.GetObject("b_865", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_866 { + get { + object obj = ResourceManager.GetObject("b_866", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_867 { + get { + object obj = ResourceManager.GetObject("b_867", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_868 { + get { + object obj = ResourceManager.GetObject("b_868", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_869 { + get { + object obj = ResourceManager.GetObject("b_869", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_869_1 { + get { + object obj = ResourceManager.GetObject("b_869_1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_869_2 { + get { + object obj = ResourceManager.GetObject("b_869_2", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_869_3 { + get { + object obj = ResourceManager.GetObject("b_869_3", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_869_4 { + get { + object obj = ResourceManager.GetObject("b_869_4", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_869_5 { + get { + object obj = ResourceManager.GetObject("b_869_5", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_869_6 { + get { + object obj = ResourceManager.GetObject("b_869_6", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_869_7 { + get { + object obj = ResourceManager.GetObject("b_869_7", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_869_8 { + get { + object obj = ResourceManager.GetObject("b_869_8", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_870 { + get { + object obj = ResourceManager.GetObject("b_870", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_871 { + get { + object obj = ResourceManager.GetObject("b_871", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_872 { + get { + object obj = ResourceManager.GetObject("b_872", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_873 { + get { + object obj = ResourceManager.GetObject("b_873", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_874 { + get { + object obj = ResourceManager.GetObject("b_874", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_875 { + get { + object obj = ResourceManager.GetObject("b_875", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_875_1 { + get { + object obj = ResourceManager.GetObject("b_875_1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_876 { + get { + object obj = ResourceManager.GetObject("b_876", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_876_1 { + get { + object obj = ResourceManager.GetObject("b_876_1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_877 { + get { + object obj = ResourceManager.GetObject("b_877", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_877_1 { + get { + object obj = ResourceManager.GetObject("b_877_1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_878 { + get { + object obj = ResourceManager.GetObject("b_878", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_879 { + get { + object obj = ResourceManager.GetObject("b_879", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_880 { + get { + object obj = ResourceManager.GetObject("b_880", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_881 { + get { + object obj = ResourceManager.GetObject("b_881", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_882 { + get { + object obj = ResourceManager.GetObject("b_882", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_883 { + get { + object obj = ResourceManager.GetObject("b_883", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_884 { + get { + object obj = ResourceManager.GetObject("b_884", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_885 { + get { + object obj = ResourceManager.GetObject("b_885", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_886 { + get { + object obj = ResourceManager.GetObject("b_886", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_887 { + get { + object obj = ResourceManager.GetObject("b_887", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_888 { + get { + object obj = ResourceManager.GetObject("b_888", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_888_1 { + get { + object obj = ResourceManager.GetObject("b_888_1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_889 { + get { + object obj = ResourceManager.GetObject("b_889", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_889_1 { + get { + object obj = ResourceManager.GetObject("b_889_1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_890 { + get { + object obj = ResourceManager.GetObject("b_890", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_9 { + get { + object obj = ResourceManager.GetObject("b_9", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_90 { + get { + object obj = ResourceManager.GetObject("b_90", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_91 { + get { + object obj = ResourceManager.GetObject("b_91", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_92 { + get { + object obj = ResourceManager.GetObject("b_92", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_93 { + get { + object obj = ResourceManager.GetObject("b_93", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_94 { + get { + object obj = ResourceManager.GetObject("b_94", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_95 { + get { + object obj = ResourceManager.GetObject("b_95", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_98 { + get { + object obj = ResourceManager.GetObject("b_98", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap b_99 { + get { + object obj = ResourceManager.GetObject("b_99", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -21310,6 +26600,4186 @@ public class Resources { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1 { + get { + object obj = ResourceManager.GetObject("bitem_1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_10 { + get { + object obj = ResourceManager.GetObject("bitem_10", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_106 { + get { + object obj = ResourceManager.GetObject("bitem_106", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_107 { + get { + object obj = ResourceManager.GetObject("bitem_107", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1074 { + get { + object obj = ResourceManager.GetObject("bitem_1074", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1075 { + get { + object obj = ResourceManager.GetObject("bitem_1075", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1076 { + get { + object obj = ResourceManager.GetObject("bitem_1076", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1077 { + get { + object obj = ResourceManager.GetObject("bitem_1077", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_108 { + get { + object obj = ResourceManager.GetObject("bitem_108", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1080 { + get { + object obj = ResourceManager.GetObject("bitem_1080", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1081 { + get { + object obj = ResourceManager.GetObject("bitem_1081", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1084 { + get { + object obj = ResourceManager.GetObject("bitem_1084", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1085 { + get { + object obj = ResourceManager.GetObject("bitem_1085", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1086 { + get { + object obj = ResourceManager.GetObject("bitem_1086", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1087 { + get { + object obj = ResourceManager.GetObject("bitem_1087", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1088 { + get { + object obj = ResourceManager.GetObject("bitem_1088", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1089 { + get { + object obj = ResourceManager.GetObject("bitem_1089", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_109 { + get { + object obj = ResourceManager.GetObject("bitem_109", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1090 { + get { + object obj = ResourceManager.GetObject("bitem_1090", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1091 { + get { + object obj = ResourceManager.GetObject("bitem_1091", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1092 { + get { + object obj = ResourceManager.GetObject("bitem_1092", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1093 { + get { + object obj = ResourceManager.GetObject("bitem_1093", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1094 { + get { + object obj = ResourceManager.GetObject("bitem_1094", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1095 { + get { + object obj = ResourceManager.GetObject("bitem_1095", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1096 { + get { + object obj = ResourceManager.GetObject("bitem_1096", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1097 { + get { + object obj = ResourceManager.GetObject("bitem_1097", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1098 { + get { + object obj = ResourceManager.GetObject("bitem_1098", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1099 { + get { + object obj = ResourceManager.GetObject("bitem_1099", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_11 { + get { + object obj = ResourceManager.GetObject("bitem_11", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1100 { + get { + object obj = ResourceManager.GetObject("bitem_1100", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1103 { + get { + object obj = ResourceManager.GetObject("bitem_1103", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1104 { + get { + object obj = ResourceManager.GetObject("bitem_1104", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1105 { + get { + object obj = ResourceManager.GetObject("bitem_1105", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1106 { + get { + object obj = ResourceManager.GetObject("bitem_1106", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1107 { + get { + object obj = ResourceManager.GetObject("bitem_1107", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1108 { + get { + object obj = ResourceManager.GetObject("bitem_1108", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1109 { + get { + object obj = ResourceManager.GetObject("bitem_1109", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1110 { + get { + object obj = ResourceManager.GetObject("bitem_1110", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1111 { + get { + object obj = ResourceManager.GetObject("bitem_1111", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1112 { + get { + object obj = ResourceManager.GetObject("bitem_1112", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1113 { + get { + object obj = ResourceManager.GetObject("bitem_1113", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1114 { + get { + object obj = ResourceManager.GetObject("bitem_1114", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1115 { + get { + object obj = ResourceManager.GetObject("bitem_1115", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1116 { + get { + object obj = ResourceManager.GetObject("bitem_1116", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1117 { + get { + object obj = ResourceManager.GetObject("bitem_1117", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1118 { + get { + object obj = ResourceManager.GetObject("bitem_1118", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1119 { + get { + object obj = ResourceManager.GetObject("bitem_1119", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1120 { + get { + object obj = ResourceManager.GetObject("bitem_1120", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1121 { + get { + object obj = ResourceManager.GetObject("bitem_1121", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1122 { + get { + object obj = ResourceManager.GetObject("bitem_1122", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1123 { + get { + object obj = ResourceManager.GetObject("bitem_1123", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1124 { + get { + object obj = ResourceManager.GetObject("bitem_1124", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1125 { + get { + object obj = ResourceManager.GetObject("bitem_1125", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1126 { + get { + object obj = ResourceManager.GetObject("bitem_1126", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1127 { + get { + object obj = ResourceManager.GetObject("bitem_1127", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1128 { + get { + object obj = ResourceManager.GetObject("bitem_1128", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1129 { + get { + object obj = ResourceManager.GetObject("bitem_1129", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_116 { + get { + object obj = ResourceManager.GetObject("bitem_116", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_117 { + get { + object obj = ResourceManager.GetObject("bitem_117", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_118 { + get { + object obj = ResourceManager.GetObject("bitem_118", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_119 { + get { + object obj = ResourceManager.GetObject("bitem_119", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_12 { + get { + object obj = ResourceManager.GetObject("bitem_12", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1231 { + get { + object obj = ResourceManager.GetObject("bitem_1231", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1232 { + get { + object obj = ResourceManager.GetObject("bitem_1232", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1233 { + get { + object obj = ResourceManager.GetObject("bitem_1233", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1234 { + get { + object obj = ResourceManager.GetObject("bitem_1234", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1235 { + get { + object obj = ResourceManager.GetObject("bitem_1235", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1236 { + get { + object obj = ResourceManager.GetObject("bitem_1236", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1237 { + get { + object obj = ResourceManager.GetObject("bitem_1237", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1238 { + get { + object obj = ResourceManager.GetObject("bitem_1238", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1239 { + get { + object obj = ResourceManager.GetObject("bitem_1239", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1240 { + get { + object obj = ResourceManager.GetObject("bitem_1240", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1241 { + get { + object obj = ResourceManager.GetObject("bitem_1241", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1242 { + get { + object obj = ResourceManager.GetObject("bitem_1242", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1243 { + get { + object obj = ResourceManager.GetObject("bitem_1243", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1244 { + get { + object obj = ResourceManager.GetObject("bitem_1244", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1245 { + get { + object obj = ResourceManager.GetObject("bitem_1245", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1246 { + get { + object obj = ResourceManager.GetObject("bitem_1246", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1247 { + get { + object obj = ResourceManager.GetObject("bitem_1247", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1248 { + get { + object obj = ResourceManager.GetObject("bitem_1248", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1249 { + get { + object obj = ResourceManager.GetObject("bitem_1249", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1250 { + get { + object obj = ResourceManager.GetObject("bitem_1250", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1251 { + get { + object obj = ResourceManager.GetObject("bitem_1251", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1252 { + get { + object obj = ResourceManager.GetObject("bitem_1252", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1253 { + get { + object obj = ResourceManager.GetObject("bitem_1253", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1254 { + get { + object obj = ResourceManager.GetObject("bitem_1254", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1255 { + get { + object obj = ResourceManager.GetObject("bitem_1255", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1256 { + get { + object obj = ResourceManager.GetObject("bitem_1256", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1257 { + get { + object obj = ResourceManager.GetObject("bitem_1257", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1258 { + get { + object obj = ResourceManager.GetObject("bitem_1258", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1259 { + get { + object obj = ResourceManager.GetObject("bitem_1259", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1260 { + get { + object obj = ResourceManager.GetObject("bitem_1260", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1261 { + get { + object obj = ResourceManager.GetObject("bitem_1261", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1262 { + get { + object obj = ResourceManager.GetObject("bitem_1262", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1263 { + get { + object obj = ResourceManager.GetObject("bitem_1263", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1264 { + get { + object obj = ResourceManager.GetObject("bitem_1264", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1266 { + get { + object obj = ResourceManager.GetObject("bitem_1266", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1267 { + get { + object obj = ResourceManager.GetObject("bitem_1267", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1269 { + get { + object obj = ResourceManager.GetObject("bitem_1269", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1270 { + get { + object obj = ResourceManager.GetObject("bitem_1270", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1271 { + get { + object obj = ResourceManager.GetObject("bitem_1271", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_1278 { + get { + object obj = ResourceManager.GetObject("bitem_1278", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_13 { + get { + object obj = ResourceManager.GetObject("bitem_13", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_134 { + get { + object obj = ResourceManager.GetObject("bitem_134", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_14 { + get { + object obj = ResourceManager.GetObject("bitem_14", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_149 { + get { + object obj = ResourceManager.GetObject("bitem_149", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_15 { + get { + object obj = ResourceManager.GetObject("bitem_15", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_150 { + get { + object obj = ResourceManager.GetObject("bitem_150", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_151 { + get { + object obj = ResourceManager.GetObject("bitem_151", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_152 { + get { + object obj = ResourceManager.GetObject("bitem_152", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_153 { + get { + object obj = ResourceManager.GetObject("bitem_153", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_154 { + get { + object obj = ResourceManager.GetObject("bitem_154", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_155 { + get { + object obj = ResourceManager.GetObject("bitem_155", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_156 { + get { + object obj = ResourceManager.GetObject("bitem_156", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_157 { + get { + object obj = ResourceManager.GetObject("bitem_157", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_158 { + get { + object obj = ResourceManager.GetObject("bitem_158", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_159 { + get { + object obj = ResourceManager.GetObject("bitem_159", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_16 { + get { + object obj = ResourceManager.GetObject("bitem_16", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_160 { + get { + object obj = ResourceManager.GetObject("bitem_160", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_161 { + get { + object obj = ResourceManager.GetObject("bitem_161", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_162 { + get { + object obj = ResourceManager.GetObject("bitem_162", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_163 { + get { + object obj = ResourceManager.GetObject("bitem_163", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_169 { + get { + object obj = ResourceManager.GetObject("bitem_169", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_17 { + get { + object obj = ResourceManager.GetObject("bitem_17", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_170 { + get { + object obj = ResourceManager.GetObject("bitem_170", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_171 { + get { + object obj = ResourceManager.GetObject("bitem_171", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_172 { + get { + object obj = ResourceManager.GetObject("bitem_172", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_173 { + get { + object obj = ResourceManager.GetObject("bitem_173", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_174 { + get { + object obj = ResourceManager.GetObject("bitem_174", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_18 { + get { + object obj = ResourceManager.GetObject("bitem_18", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_184 { + get { + object obj = ResourceManager.GetObject("bitem_184", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_185 { + get { + object obj = ResourceManager.GetObject("bitem_185", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_186 { + get { + object obj = ResourceManager.GetObject("bitem_186", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_187 { + get { + object obj = ResourceManager.GetObject("bitem_187", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_188 { + get { + object obj = ResourceManager.GetObject("bitem_188", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_189 { + get { + object obj = ResourceManager.GetObject("bitem_189", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_19 { + get { + object obj = ResourceManager.GetObject("bitem_19", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_190 { + get { + object obj = ResourceManager.GetObject("bitem_190", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_191 { + get { + object obj = ResourceManager.GetObject("bitem_191", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_192 { + get { + object obj = ResourceManager.GetObject("bitem_192", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_193 { + get { + object obj = ResourceManager.GetObject("bitem_193", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_194 { + get { + object obj = ResourceManager.GetObject("bitem_194", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_195 { + get { + object obj = ResourceManager.GetObject("bitem_195", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_196 { + get { + object obj = ResourceManager.GetObject("bitem_196", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_197 { + get { + object obj = ResourceManager.GetObject("bitem_197", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_198 { + get { + object obj = ResourceManager.GetObject("bitem_198", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_199 { + get { + object obj = ResourceManager.GetObject("bitem_199", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_2 { + get { + object obj = ResourceManager.GetObject("bitem_2", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_20 { + get { + object obj = ResourceManager.GetObject("bitem_20", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_200 { + get { + object obj = ResourceManager.GetObject("bitem_200", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_201 { + get { + object obj = ResourceManager.GetObject("bitem_201", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_202 { + get { + object obj = ResourceManager.GetObject("bitem_202", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_203 { + get { + object obj = ResourceManager.GetObject("bitem_203", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_204 { + get { + object obj = ResourceManager.GetObject("bitem_204", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_205 { + get { + object obj = ResourceManager.GetObject("bitem_205", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_206 { + get { + object obj = ResourceManager.GetObject("bitem_206", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_207 { + get { + object obj = ResourceManager.GetObject("bitem_207", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_208 { + get { + object obj = ResourceManager.GetObject("bitem_208", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_209 { + get { + object obj = ResourceManager.GetObject("bitem_209", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_21 { + get { + object obj = ResourceManager.GetObject("bitem_21", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_210 { + get { + object obj = ResourceManager.GetObject("bitem_210", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_211 { + get { + object obj = ResourceManager.GetObject("bitem_211", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_212 { + get { + object obj = ResourceManager.GetObject("bitem_212", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_213 { + get { + object obj = ResourceManager.GetObject("bitem_213", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_214 { + get { + object obj = ResourceManager.GetObject("bitem_214", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_215 { + get { + object obj = ResourceManager.GetObject("bitem_215", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_217 { + get { + object obj = ResourceManager.GetObject("bitem_217", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_218 { + get { + object obj = ResourceManager.GetObject("bitem_218", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_219 { + get { + object obj = ResourceManager.GetObject("bitem_219", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_22 { + get { + object obj = ResourceManager.GetObject("bitem_22", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_220 { + get { + object obj = ResourceManager.GetObject("bitem_220", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_221 { + get { + object obj = ResourceManager.GetObject("bitem_221", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_222 { + get { + object obj = ResourceManager.GetObject("bitem_222", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_223 { + get { + object obj = ResourceManager.GetObject("bitem_223", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_224 { + get { + object obj = ResourceManager.GetObject("bitem_224", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_228 { + get { + object obj = ResourceManager.GetObject("bitem_228", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_229 { + get { + object obj = ResourceManager.GetObject("bitem_229", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_23 { + get { + object obj = ResourceManager.GetObject("bitem_23", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_230 { + get { + object obj = ResourceManager.GetObject("bitem_230", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_231 { + get { + object obj = ResourceManager.GetObject("bitem_231", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_232 { + get { + object obj = ResourceManager.GetObject("bitem_232", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_233 { + get { + object obj = ResourceManager.GetObject("bitem_233", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_234 { + get { + object obj = ResourceManager.GetObject("bitem_234", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_236 { + get { + object obj = ResourceManager.GetObject("bitem_236", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_237 { + get { + object obj = ResourceManager.GetObject("bitem_237", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_238 { + get { + object obj = ResourceManager.GetObject("bitem_238", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_239 { + get { + object obj = ResourceManager.GetObject("bitem_239", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_24 { + get { + object obj = ResourceManager.GetObject("bitem_24", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_240 { + get { + object obj = ResourceManager.GetObject("bitem_240", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_241 { + get { + object obj = ResourceManager.GetObject("bitem_241", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_242 { + get { + object obj = ResourceManager.GetObject("bitem_242", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_243 { + get { + object obj = ResourceManager.GetObject("bitem_243", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_244 { + get { + object obj = ResourceManager.GetObject("bitem_244", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_245 { + get { + object obj = ResourceManager.GetObject("bitem_245", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_246 { + get { + object obj = ResourceManager.GetObject("bitem_246", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_247 { + get { + object obj = ResourceManager.GetObject("bitem_247", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_248 { + get { + object obj = ResourceManager.GetObject("bitem_248", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_249 { + get { + object obj = ResourceManager.GetObject("bitem_249", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_25 { + get { + object obj = ResourceManager.GetObject("bitem_25", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_250 { + get { + object obj = ResourceManager.GetObject("bitem_250", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_251 { + get { + object obj = ResourceManager.GetObject("bitem_251", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_253 { + get { + object obj = ResourceManager.GetObject("bitem_253", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_254 { + get { + object obj = ResourceManager.GetObject("bitem_254", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_255 { + get { + object obj = ResourceManager.GetObject("bitem_255", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_257 { + get { + object obj = ResourceManager.GetObject("bitem_257", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_259 { + get { + object obj = ResourceManager.GetObject("bitem_259", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_26 { + get { + object obj = ResourceManager.GetObject("bitem_26", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_265 { + get { + object obj = ResourceManager.GetObject("bitem_265", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_266 { + get { + object obj = ResourceManager.GetObject("bitem_266", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_267 { + get { + object obj = ResourceManager.GetObject("bitem_267", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_268 { + get { + object obj = ResourceManager.GetObject("bitem_268", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_269 { + get { + object obj = ResourceManager.GetObject("bitem_269", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_27 { + get { + object obj = ResourceManager.GetObject("bitem_27", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_270 { + get { + object obj = ResourceManager.GetObject("bitem_270", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_271 { + get { + object obj = ResourceManager.GetObject("bitem_271", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_272 { + get { + object obj = ResourceManager.GetObject("bitem_272", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_273 { + get { + object obj = ResourceManager.GetObject("bitem_273", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_274 { + get { + object obj = ResourceManager.GetObject("bitem_274", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_275 { + get { + object obj = ResourceManager.GetObject("bitem_275", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_276 { + get { + object obj = ResourceManager.GetObject("bitem_276", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_277 { + get { + object obj = ResourceManager.GetObject("bitem_277", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_278 { + get { + object obj = ResourceManager.GetObject("bitem_278", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_279 { + get { + object obj = ResourceManager.GetObject("bitem_279", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_28 { + get { + object obj = ResourceManager.GetObject("bitem_28", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_280 { + get { + object obj = ResourceManager.GetObject("bitem_280", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_281 { + get { + object obj = ResourceManager.GetObject("bitem_281", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_282 { + get { + object obj = ResourceManager.GetObject("bitem_282", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_283 { + get { + object obj = ResourceManager.GetObject("bitem_283", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_284 { + get { + object obj = ResourceManager.GetObject("bitem_284", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_285 { + get { + object obj = ResourceManager.GetObject("bitem_285", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_286 { + get { + object obj = ResourceManager.GetObject("bitem_286", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_287 { + get { + object obj = ResourceManager.GetObject("bitem_287", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_288 { + get { + object obj = ResourceManager.GetObject("bitem_288", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_289 { + get { + object obj = ResourceManager.GetObject("bitem_289", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_29 { + get { + object obj = ResourceManager.GetObject("bitem_29", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_290 { + get { + object obj = ResourceManager.GetObject("bitem_290", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_291 { + get { + object obj = ResourceManager.GetObject("bitem_291", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_292 { + get { + object obj = ResourceManager.GetObject("bitem_292", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_293 { + get { + object obj = ResourceManager.GetObject("bitem_293", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_294 { + get { + object obj = ResourceManager.GetObject("bitem_294", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_295 { + get { + object obj = ResourceManager.GetObject("bitem_295", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_296 { + get { + object obj = ResourceManager.GetObject("bitem_296", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_297 { + get { + object obj = ResourceManager.GetObject("bitem_297", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_298 { + get { + object obj = ResourceManager.GetObject("bitem_298", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_299 { + get { + object obj = ResourceManager.GetObject("bitem_299", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_3 { + get { + object obj = ResourceManager.GetObject("bitem_3", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_30 { + get { + object obj = ResourceManager.GetObject("bitem_30", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_300 { + get { + object obj = ResourceManager.GetObject("bitem_300", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_301 { + get { + object obj = ResourceManager.GetObject("bitem_301", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_302 { + get { + object obj = ResourceManager.GetObject("bitem_302", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_303 { + get { + object obj = ResourceManager.GetObject("bitem_303", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_304 { + get { + object obj = ResourceManager.GetObject("bitem_304", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_305 { + get { + object obj = ResourceManager.GetObject("bitem_305", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_306 { + get { + object obj = ResourceManager.GetObject("bitem_306", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_307 { + get { + object obj = ResourceManager.GetObject("bitem_307", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_308 { + get { + object obj = ResourceManager.GetObject("bitem_308", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_309 { + get { + object obj = ResourceManager.GetObject("bitem_309", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_31 { + get { + object obj = ResourceManager.GetObject("bitem_31", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_310 { + get { + object obj = ResourceManager.GetObject("bitem_310", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_311 { + get { + object obj = ResourceManager.GetObject("bitem_311", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_312 { + get { + object obj = ResourceManager.GetObject("bitem_312", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_313 { + get { + object obj = ResourceManager.GetObject("bitem_313", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_314 { + get { + object obj = ResourceManager.GetObject("bitem_314", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_315 { + get { + object obj = ResourceManager.GetObject("bitem_315", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_316 { + get { + object obj = ResourceManager.GetObject("bitem_316", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_317 { + get { + object obj = ResourceManager.GetObject("bitem_317", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_318 { + get { + object obj = ResourceManager.GetObject("bitem_318", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_319 { + get { + object obj = ResourceManager.GetObject("bitem_319", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_32 { + get { + object obj = ResourceManager.GetObject("bitem_32", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_320 { + get { + object obj = ResourceManager.GetObject("bitem_320", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_321 { + get { + object obj = ResourceManager.GetObject("bitem_321", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_325 { + get { + object obj = ResourceManager.GetObject("bitem_325", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_326 { + get { + object obj = ResourceManager.GetObject("bitem_326", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_33 { + get { + object obj = ResourceManager.GetObject("bitem_33", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_34 { + get { + object obj = ResourceManager.GetObject("bitem_34", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_35 { + get { + object obj = ResourceManager.GetObject("bitem_35", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_36 { + get { + object obj = ResourceManager.GetObject("bitem_36", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_37 { + get { + object obj = ResourceManager.GetObject("bitem_37", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_38 { + get { + object obj = ResourceManager.GetObject("bitem_38", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_39 { + get { + object obj = ResourceManager.GetObject("bitem_39", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_4 { + get { + object obj = ResourceManager.GetObject("bitem_4", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_40 { + get { + object obj = ResourceManager.GetObject("bitem_40", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_41 { + get { + object obj = ResourceManager.GetObject("bitem_41", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_42 { + get { + object obj = ResourceManager.GetObject("bitem_42", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_43 { + get { + object obj = ResourceManager.GetObject("bitem_43", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_45 { + get { + object obj = ResourceManager.GetObject("bitem_45", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_46 { + get { + object obj = ResourceManager.GetObject("bitem_46", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_47 { + get { + object obj = ResourceManager.GetObject("bitem_47", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_48 { + get { + object obj = ResourceManager.GetObject("bitem_48", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_49 { + get { + object obj = ResourceManager.GetObject("bitem_49", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_492 { + get { + object obj = ResourceManager.GetObject("bitem_492", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_493 { + get { + object obj = ResourceManager.GetObject("bitem_493", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_494 { + get { + object obj = ResourceManager.GetObject("bitem_494", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_495 { + get { + object obj = ResourceManager.GetObject("bitem_495", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_496 { + get { + object obj = ResourceManager.GetObject("bitem_496", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_497 { + get { + object obj = ResourceManager.GetObject("bitem_497", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_498 { + get { + object obj = ResourceManager.GetObject("bitem_498", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_499 { + get { + object obj = ResourceManager.GetObject("bitem_499", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_5 { + get { + object obj = ResourceManager.GetObject("bitem_5", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_50 { + get { + object obj = ResourceManager.GetObject("bitem_50", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_500 { + get { + object obj = ResourceManager.GetObject("bitem_500", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_504 { + get { + object obj = ResourceManager.GetObject("bitem_504", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_51 { + get { + object obj = ResourceManager.GetObject("bitem_51", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_52 { + get { + object obj = ResourceManager.GetObject("bitem_52", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_53 { + get { + object obj = ResourceManager.GetObject("bitem_53", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_537 { + get { + object obj = ResourceManager.GetObject("bitem_537", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_538 { + get { + object obj = ResourceManager.GetObject("bitem_538", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_539 { + get { + object obj = ResourceManager.GetObject("bitem_539", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_54 { + get { + object obj = ResourceManager.GetObject("bitem_54", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_540 { + get { + object obj = ResourceManager.GetObject("bitem_540", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_541 { + get { + object obj = ResourceManager.GetObject("bitem_541", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_542 { + get { + object obj = ResourceManager.GetObject("bitem_542", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_543 { + get { + object obj = ResourceManager.GetObject("bitem_543", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_544 { + get { + object obj = ResourceManager.GetObject("bitem_544", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_545 { + get { + object obj = ResourceManager.GetObject("bitem_545", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_546 { + get { + object obj = ResourceManager.GetObject("bitem_546", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_547 { + get { + object obj = ResourceManager.GetObject("bitem_547", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_55 { + get { + object obj = ResourceManager.GetObject("bitem_55", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_56 { + get { + object obj = ResourceManager.GetObject("bitem_56", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_564 { + get { + object obj = ResourceManager.GetObject("bitem_564", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_565 { + get { + object obj = ResourceManager.GetObject("bitem_565", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_566 { + get { + object obj = ResourceManager.GetObject("bitem_566", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_567 { + get { + object obj = ResourceManager.GetObject("bitem_567", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_568 { + get { + object obj = ResourceManager.GetObject("bitem_568", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_569 { + get { + object obj = ResourceManager.GetObject("bitem_569", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_57 { + get { + object obj = ResourceManager.GetObject("bitem_57", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_570 { + get { + object obj = ResourceManager.GetObject("bitem_570", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_571 { + get { + object obj = ResourceManager.GetObject("bitem_571", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_576 { + get { + object obj = ResourceManager.GetObject("bitem_576", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_58 { + get { + object obj = ResourceManager.GetObject("bitem_58", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_580 { + get { + object obj = ResourceManager.GetObject("bitem_580", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_581 { + get { + object obj = ResourceManager.GetObject("bitem_581", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_582 { + get { + object obj = ResourceManager.GetObject("bitem_582", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_583 { + get { + object obj = ResourceManager.GetObject("bitem_583", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_59 { + get { + object obj = ResourceManager.GetObject("bitem_59", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_591 { + get { + object obj = ResourceManager.GetObject("bitem_591", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_6 { + get { + object obj = ResourceManager.GetObject("bitem_6", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_60 { + get { + object obj = ResourceManager.GetObject("bitem_60", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_61 { + get { + object obj = ResourceManager.GetObject("bitem_61", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_618 { + get { + object obj = ResourceManager.GetObject("bitem_618", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_62 { + get { + object obj = ResourceManager.GetObject("bitem_62", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_628 { + get { + object obj = ResourceManager.GetObject("bitem_628", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_629 { + get { + object obj = ResourceManager.GetObject("bitem_629", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_63 { + get { + object obj = ResourceManager.GetObject("bitem_63", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_631 { + get { + object obj = ResourceManager.GetObject("bitem_631", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_632 { + get { + object obj = ResourceManager.GetObject("bitem_632", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_639 { + get { + object obj = ResourceManager.GetObject("bitem_639", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_640 { + get { + object obj = ResourceManager.GetObject("bitem_640", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_644 { + get { + object obj = ResourceManager.GetObject("bitem_644", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_645 { + get { + object obj = ResourceManager.GetObject("bitem_645", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_646 { + get { + object obj = ResourceManager.GetObject("bitem_646", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_647 { + get { + object obj = ResourceManager.GetObject("bitem_647", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_648 { + get { + object obj = ResourceManager.GetObject("bitem_648", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_649 { + get { + object obj = ResourceManager.GetObject("bitem_649", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_650 { + get { + object obj = ResourceManager.GetObject("bitem_650", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_686 { + get { + object obj = ResourceManager.GetObject("bitem_686", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_687 { + get { + object obj = ResourceManager.GetObject("bitem_687", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_688 { + get { + object obj = ResourceManager.GetObject("bitem_688", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_7 { + get { + object obj = ResourceManager.GetObject("bitem_7", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_703 { + get { + object obj = ResourceManager.GetObject("bitem_703", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_708 { + get { + object obj = ResourceManager.GetObject("bitem_708", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_709 { + get { + object obj = ResourceManager.GetObject("bitem_709", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_76 { + get { + object obj = ResourceManager.GetObject("bitem_76", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_77 { + get { + object obj = ResourceManager.GetObject("bitem_77", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_78 { + get { + object obj = ResourceManager.GetObject("bitem_78", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_79 { + get { + object obj = ResourceManager.GetObject("bitem_79", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_795 { + get { + object obj = ResourceManager.GetObject("bitem_795", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_796 { + get { + object obj = ResourceManager.GetObject("bitem_796", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_8 { + get { + object obj = ResourceManager.GetObject("bitem_8", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_80 { + get { + object obj = ResourceManager.GetObject("bitem_80", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_81 { + get { + object obj = ResourceManager.GetObject("bitem_81", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_82 { + get { + object obj = ResourceManager.GetObject("bitem_82", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_83 { + get { + object obj = ResourceManager.GetObject("bitem_83", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_84 { + get { + object obj = ResourceManager.GetObject("bitem_84", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_846 { + get { + object obj = ResourceManager.GetObject("bitem_846", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_849 { + get { + object obj = ResourceManager.GetObject("bitem_849", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_85 { + get { + object obj = ResourceManager.GetObject("bitem_85", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_851 { + get { + object obj = ResourceManager.GetObject("bitem_851", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_852 { + get { + object obj = ResourceManager.GetObject("bitem_852", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_86 { + get { + object obj = ResourceManager.GetObject("bitem_86", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_87 { + get { + object obj = ResourceManager.GetObject("bitem_87", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_879 { + get { + object obj = ResourceManager.GetObject("bitem_879", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_88 { + get { + object obj = ResourceManager.GetObject("bitem_88", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_880 { + get { + object obj = ResourceManager.GetObject("bitem_880", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_881 { + get { + object obj = ResourceManager.GetObject("bitem_881", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_882 { + get { + object obj = ResourceManager.GetObject("bitem_882", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_883 { + get { + object obj = ResourceManager.GetObject("bitem_883", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_884 { + get { + object obj = ResourceManager.GetObject("bitem_884", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_89 { + get { + object obj = ResourceManager.GetObject("bitem_89", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_9 { + get { + object obj = ResourceManager.GetObject("bitem_9", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_90 { + get { + object obj = ResourceManager.GetObject("bitem_90", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_903 { + get { + object obj = ResourceManager.GetObject("bitem_903", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_904 { + get { + object obj = ResourceManager.GetObject("bitem_904", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_905 { + get { + object obj = ResourceManager.GetObject("bitem_905", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_906 { + get { + object obj = ResourceManager.GetObject("bitem_906", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_907 { + get { + object obj = ResourceManager.GetObject("bitem_907", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_908 { + get { + object obj = ResourceManager.GetObject("bitem_908", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_909 { + get { + object obj = ResourceManager.GetObject("bitem_909", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_91 { + get { + object obj = ResourceManager.GetObject("bitem_91", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_910 { + get { + object obj = ResourceManager.GetObject("bitem_910", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_911 { + get { + object obj = ResourceManager.GetObject("bitem_911", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_912 { + get { + object obj = ResourceManager.GetObject("bitem_912", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_913 { + get { + object obj = ResourceManager.GetObject("bitem_913", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_914 { + get { + object obj = ResourceManager.GetObject("bitem_914", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_915 { + get { + object obj = ResourceManager.GetObject("bitem_915", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_916 { + get { + object obj = ResourceManager.GetObject("bitem_916", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_917 { + get { + object obj = ResourceManager.GetObject("bitem_917", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_918 { + get { + object obj = ResourceManager.GetObject("bitem_918", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_919 { + get { + object obj = ResourceManager.GetObject("bitem_919", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_92 { + get { + object obj = ResourceManager.GetObject("bitem_92", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_920 { + get { + object obj = ResourceManager.GetObject("bitem_920", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_94 { + get { + object obj = ResourceManager.GetObject("bitem_94", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_943 { + get { + object obj = ResourceManager.GetObject("bitem_943", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_944 { + get { + object obj = ResourceManager.GetObject("bitem_944", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_945 { + get { + object obj = ResourceManager.GetObject("bitem_945", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_946 { + get { + object obj = ResourceManager.GetObject("bitem_946", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_tm { + get { + object obj = ResourceManager.GetObject("bitem_tm", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_tr { + get { + object obj = ResourceManager.GetObject("bitem_tr", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -22710,6 +32180,16 @@ public class Resources { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap dyna { + get { + object obj = ResourceManager.GetObject("dyna", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -27910,6 +37390,16 @@ public class Resources { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap ribbonchampiongalar { + get { + object obj = ResourceManager.GetObject("ribbonchampiongalar", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -28510,6 +38000,456 @@ public class Resources { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap ribbonmarkabsentminded { + get { + object obj = ResourceManager.GetObject("ribbonmarkabsentminded", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap ribbonmarkangry { + get { + object obj = ResourceManager.GetObject("ribbonmarkangry", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap ribbonmarkblizzard { + get { + object obj = ResourceManager.GetObject("ribbonmarkblizzard", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap ribbonmarkcalmness { + get { + object obj = ResourceManager.GetObject("ribbonmarkcalmness", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap ribbonmarkcharismatic { + get { + object obj = ResourceManager.GetObject("ribbonmarkcharismatic", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap ribbonmarkcloudy { + get { + object obj = ResourceManager.GetObject("ribbonmarkcloudy", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap ribbonmarkcrafty { + get { + object obj = ResourceManager.GetObject("ribbonmarkcrafty", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap ribbonmarkcurry { + get { + object obj = ResourceManager.GetObject("ribbonmarkcurry", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap ribbonmarkdawn { + get { + object obj = ResourceManager.GetObject("ribbonmarkdawn", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap ribbonmarkdestiny { + get { + object obj = ResourceManager.GetObject("ribbonmarkdestiny", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap ribbonmarkdry { + get { + object obj = ResourceManager.GetObject("ribbonmarkdry", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap ribbonmarkdusk { + get { + object obj = ResourceManager.GetObject("ribbonmarkdusk", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap ribbonmarkexcited { + get { + object obj = ResourceManager.GetObject("ribbonmarkexcited", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap ribbonmarkferocious { + get { + object obj = ResourceManager.GetObject("ribbonmarkferocious", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap ribbonmarkfishing { + get { + object obj = ResourceManager.GetObject("ribbonmarkfishing", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap ribbonmarkflustered { + get { + object obj = ResourceManager.GetObject("ribbonmarkflustered", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap ribbonmarkhumble { + get { + object obj = ResourceManager.GetObject("ribbonmarkhumble", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap ribbonmarkintellectual { + get { + object obj = ResourceManager.GetObject("ribbonmarkintellectual", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap ribbonmarkintense { + get { + object obj = ResourceManager.GetObject("ribbonmarkintense", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap ribbonmarkjittery { + get { + object obj = ResourceManager.GetObject("ribbonmarkjittery", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap ribbonmarkjoyful { + get { + object obj = ResourceManager.GetObject("ribbonmarkjoyful", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap ribbonmarkkindly { + get { + object obj = ResourceManager.GetObject("ribbonmarkkindly", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap ribbonmarklunchtime { + get { + object obj = ResourceManager.GetObject("ribbonmarklunchtime", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap ribbonmarkmisty { + get { + object obj = ResourceManager.GetObject("ribbonmarkmisty", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap ribbonmarkpeeved { + get { + object obj = ResourceManager.GetObject("ribbonmarkpeeved", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap ribbonmarkprideful { + get { + object obj = ResourceManager.GetObject("ribbonmarkprideful", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap ribbonmarkpumpedup { + get { + object obj = ResourceManager.GetObject("ribbonmarkpumpedup", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap ribbonmarkrainy { + get { + object obj = ResourceManager.GetObject("ribbonmarkrainy", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap ribbonmarkrare { + get { + object obj = ResourceManager.GetObject("ribbonmarkrare", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap ribbonmarkrowdy { + get { + object obj = ResourceManager.GetObject("ribbonmarkrowdy", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap ribbonmarksandstorm { + get { + object obj = ResourceManager.GetObject("ribbonmarksandstorm", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap ribbonmarkscowling { + get { + object obj = ResourceManager.GetObject("ribbonmarkscowling", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap ribbonmarksleepytime { + get { + object obj = ResourceManager.GetObject("ribbonmarksleepytime", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap ribbonmarkslump { + get { + object obj = ResourceManager.GetObject("ribbonmarkslump", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap ribbonmarksmiley { + get { + object obj = ResourceManager.GetObject("ribbonmarksmiley", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap ribbonmarksnowy { + get { + object obj = ResourceManager.GetObject("ribbonmarksnowy", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap ribbonmarkstormy { + get { + object obj = ResourceManager.GetObject("ribbonmarkstormy", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap ribbonmarkteary { + get { + object obj = ResourceManager.GetObject("ribbonmarkteary", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap ribbonmarkthorny { + get { + object obj = ResourceManager.GetObject("ribbonmarkthorny", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap ribbonmarkuncommon { + get { + object obj = ResourceManager.GetObject("ribbonmarkuncommon", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap ribbonmarkunsure { + get { + object obj = ResourceManager.GetObject("ribbonmarkunsure", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap ribbonmarkupbeat { + get { + object obj = ResourceManager.GetObject("ribbonmarkupbeat", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap ribbonmarkvigor { + get { + object obj = ResourceManager.GetObject("ribbonmarkvigor", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap ribbonmarkzeroenergy { + get { + object obj = ResourceManager.GetObject("ribbonmarkzeroenergy", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap ribbonmarkzonedout { + get { + object obj = ResourceManager.GetObject("ribbonmarkzonedout", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -28550,6 +38490,16 @@ public class Resources { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap ribbonmasterrank { + get { + object obj = ResourceManager.GetObject("ribbonmasterrank", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -28660,6 +38610,16 @@ public class Resources { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap ribbontowermaster { + get { + object obj = ResourceManager.GetObject("ribbontowermaster", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -28710,6 +38670,126 @@ public class Resources { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap slotDel { + get { + object obj = ResourceManager.GetObject("slotDel", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap slotDel68 { + get { + object obj = ResourceManager.GetObject("slotDel68", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap slotDrag { + get { + object obj = ResourceManager.GetObject("slotDrag", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap slotDrag68 { + get { + object obj = ResourceManager.GetObject("slotDrag68", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap slotHover { + get { + object obj = ResourceManager.GetObject("slotHover", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap slotHover68 { + get { + object obj = ResourceManager.GetObject("slotHover68", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap slotSet { + get { + object obj = ResourceManager.GetObject("slotSet", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap slotSet68 { + get { + object obj = ResourceManager.GetObject("slotSet68", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap slotTrans { + get { + object obj = ResourceManager.GetObject("slotTrans", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap slotTrans68 { + get { + object obj = ResourceManager.GetObject("slotTrans68", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap slotView { + get { + object obj = ResourceManager.GetObject("slotView", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap slotView68 { + get { + object obj = ResourceManager.GetObject("slotView68", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/PKHeX.Drawing/Properties/Resources.resx b/PKHeX.Drawing/Properties/Resources.resx index 03b592e45..bf2233bdc 100644 --- a/PKHeX.Drawing/Properties/Resources.resx +++ b/PKHeX.Drawing/Properties/Resources.resx @@ -121,6 +121,1260 @@ ..\Resources\img\misc\Bag_Key.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\img\Big Items\bitem_1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_10.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_106.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_107.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1074.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1075.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1076.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1077.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_108.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1080.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1081.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1084.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1085.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1086.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1087.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1088.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1089.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_109.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1090.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1091.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1092.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1093.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1094.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1095.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1096.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1097.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1098.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1099.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_11.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1100.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1103.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1104.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1105.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1106.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1107.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1108.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1109.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1110.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1111.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1112.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1113.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1114.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1115.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1116.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1117.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1118.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1119.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1120.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1121.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1122.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1123.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1124.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1125.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1126.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1127.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1128.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1129.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_116.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_117.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_118.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_119.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_12.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1231.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1232.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1233.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1234.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1235.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1236.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1237.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1238.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1239.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1240.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1241.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1242.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1243.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1244.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1245.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1246.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1247.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1248.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1249.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1250.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1251.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1252.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1253.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1254.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1255.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1256.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1257.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1258.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1259.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1260.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1261.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1262.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1263.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1264.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1266.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1267.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1269.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1270.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1271.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_1278.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_13.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_134.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_14.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_149.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_15.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_150.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_151.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_152.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_153.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_154.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_155.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_156.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_157.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_158.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_159.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_160.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_163.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_169.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_17.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_170.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_171.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_172.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_173.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_174.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_18.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_184.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_185.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_186.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_187.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_188.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_189.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_19.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_190.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_191.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_192.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_193.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_194.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_195.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_196.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_197.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_198.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_199.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_20.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_200.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_201.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_202.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_203.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_204.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_205.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_206.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_207.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_208.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_209.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_21.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_210.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_211.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_212.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_213.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_214.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_215.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_217.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_218.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_219.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_22.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_220.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_221.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_222.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_223.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_224.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_228.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_229.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_23.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_230.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_231.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_232.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_233.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_234.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_236.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_237.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_238.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_239.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_240.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_241.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_242.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_243.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_244.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_245.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_246.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_247.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_248.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_249.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_25.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_250.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_251.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_253.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_254.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_255.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_257.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_259.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_26.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_265.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_266.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_267.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_268.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_269.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_27.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_270.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_271.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_272.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_273.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_274.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_275.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_276.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_277.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_278.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_279.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_28.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_280.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_281.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_282.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_283.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_284.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_285.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_286.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_287.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_288.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_289.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_29.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_290.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_291.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_292.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_293.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_294.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_295.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_296.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_297.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_298.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_299.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_30.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_300.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_301.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_302.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_303.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_304.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_305.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_306.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_307.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_308.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_309.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_31.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_310.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_311.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_312.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_313.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_314.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_315.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_316.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_317.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_318.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_319.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_320.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_325.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_326.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_33.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_34.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_35.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_36.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_37.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_38.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_39.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_4.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_40.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_41.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_42.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_43.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_45.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_46.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_47.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_49.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_492.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_493.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_494.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_495.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_496.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_497.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_498.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_499.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_5.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_500.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_504.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_51.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_52.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_53.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_537.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_538.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_539.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_54.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_540.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_541.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_542.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_543.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_544.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_545.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_546.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_547.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_55.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_56.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_564.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_565.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_566.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_567.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_568.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_569.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_57.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_570.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_571.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_576.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_58.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_580.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_581.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_582.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_583.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_59.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_591.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_6.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_60.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_61.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_618.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_62.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_628.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_629.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_63.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_631.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_632.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_639.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_640.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_644.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_645.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_646.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_647.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_648.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_649.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_650.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_686.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_687.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_688.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_7.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_703.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_708.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_709.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_76.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_77.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_78.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_79.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_795.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_796.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_8.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_80.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_81.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_82.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_83.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_84.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_846.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_849.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_85.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_851.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_852.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_86.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_87.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_879.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_88.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_880.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_881.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_882.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_883.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_884.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_89.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_9.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_90.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_903.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_904.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_905.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_906.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_907.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_908.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_909.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_91.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_910.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_911.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_912.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_913.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_914.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_915.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_916.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_917.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_918.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_919.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_92.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_920.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_94.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_943.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_944.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_945.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_946.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_tm.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Items\bitem_tr.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\img\box\bw\box_wp01bw.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -541,6 +1795,1596 @@ ..\Resources\img\box\xy\box_wp24xy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\img\Big Pokemon Sprites\b_0.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_0-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_10.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_106.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_107.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_109.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_11.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_110.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_110-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_111.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_112.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_118.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_119.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_12.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_122.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_122-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_129.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_130.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_131.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_132.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_133.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_134.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_135.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_136.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_143.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_150.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_151.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_163.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_164.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_170.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_171.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_172.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_173.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_175.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_176.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_177.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_178.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_182.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_185.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_194.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_195.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_196.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_197.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_202.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_208.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_211.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_213.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_215.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_220.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_221.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_222.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_222-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_223.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_224.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_225.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_226.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_236.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_237.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_246.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_247.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_248.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_25.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_251.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_25-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_25-2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_25-3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_25-4.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_25-5.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_25-6.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_25-7.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_26.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_263.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_263-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_264.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_264-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_26-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_270.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_271.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_272.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_273.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_274.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_275.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_278.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_279.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_280.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_281.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_282.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_290.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_291.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_292.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_302.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_303.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_309.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_310.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_315.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_320.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_324.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_328.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_329.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_330.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_337.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_338.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_339.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_340.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_341.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_342.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_343.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_344.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_349.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_35.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_350.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_355.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_356.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_36.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_360.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_361.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_362.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_37.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_37-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_38.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_385.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_38-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_4.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_406.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_407.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_415.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_416.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_420.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_421.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_421-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_422.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_422-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_423.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_423-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_425.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_426.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_43.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_434.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_435.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_436.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_437.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_438.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_439.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_44.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_446.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_447.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_448.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_449.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_45.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_450.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_450f.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_451.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_452.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_453.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_454.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_458.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_459.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_460.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_461.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_464.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_468.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_470.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_471.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_473.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_475.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_477.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_478.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_479.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_479-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_479-2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_479-3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_479-4.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_479-5.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_5.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_509.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_50-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_51.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_510.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_517.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_518.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_519.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_51-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_52.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_520.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_521.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_521f.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_524.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_525.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_526.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_527.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_528.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_529.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_52-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_52-2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_53.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_530.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_532.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_533.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_534.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_535.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_536.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_537.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_538.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_539.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_53-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_546.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_547.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_550.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_550-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_554.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_554-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_555.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_555-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_555-2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_555-3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_556.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_557.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_558.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_559.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_560.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_561.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_562.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_562-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_563.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_568.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_569.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_572.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_573.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_574.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_575.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_576.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_577.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_578.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_579.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_58.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_582.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_583.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_584.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_588.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_589.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_59.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_592.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_592f.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_593.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_593f.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_595.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_596.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_597.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_598.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_599.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_6.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_600.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_601.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_605.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_606.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_607.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_608.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_609.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_610.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_611.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_612.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_613.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_614.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_616.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_617.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_618.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_618-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_622.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_623.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_624.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_625.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_627.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_628.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_629.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_630.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_631.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_632.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_633.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_634.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_635.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_638.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_639.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_640.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_643.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_644.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_646.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_646-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_646-2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_647.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_647-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_659.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_66.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_660.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_67.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_674.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_675.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_677.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_678.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_678-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_679.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_68.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_680.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_681.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_681-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_682.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_683.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_684.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_685.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_686.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_687.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_688.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_689.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_694.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_695.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_7.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_700.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_701.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_704.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_705.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_706.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_708.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_709.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_710.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_710-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_710-2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_710-3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_711.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_711-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_711-2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_711-3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_712.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_713.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_714.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_715.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_722.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_723.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_724.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_725.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_726.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_727.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_728.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_729.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_730.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_736.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_737.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_738.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_742.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_743.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_746.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_746-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_747.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_748.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_749.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_750.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_751.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_752.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_755.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_756.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_757.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_758.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_759.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_760.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_761.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_762.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_763.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_765.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_766.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_767.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_768.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_77.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_771.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_772.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_773.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_773-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_773-10.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_773-11.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_773-12.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_773-13.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_773-14.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_773-15.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_773-16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_773-17.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_773-2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_773-3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_773-4.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_773-5.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_773-6.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_773-7.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_773-8.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_773-9.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_776.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_777.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_778.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_778-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_77-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_78.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_780.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_781.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_782.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_783.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_784.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_789.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_78-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_790.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_791.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_792.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_8.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_800.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_800-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_800-2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_802.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_807.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_808.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_809.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_810.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_811.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_812.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_813.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_814.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_815.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_816.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_817.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_818.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_819.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_820.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_821.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_822.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_823.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_824.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_825.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_826.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_827.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_828.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_829.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_83.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_830.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_831.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_832.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_833.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_834.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_835.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_836.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_837.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_838.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_839.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_83-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_840.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_841.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_842.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_843.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_844.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_845.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_845-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_845-2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_846.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_847.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_848.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_849.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_849-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_850.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_851.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_852.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_853.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_854.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_854-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_855.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_855-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_856.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_857.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_858.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_859.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_860.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_861.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_862.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_863.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_864.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_865.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_866.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_867.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_868.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_869.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_869-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_869-2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_869-3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_869-4.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_869-5.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_869-6.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_869-7.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_869-8.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_870.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_871.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_872.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_873.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_874.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_875.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_875-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_876.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_876-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_877.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_877-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_878.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_879.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_880.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_881.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_882.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_883.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_884.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_885.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_886.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_887.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_888.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_888-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_889.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_889-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_890.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_9.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_90.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_91.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_92.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_93.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_94.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_95.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_98.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Big Pokemon Sprites\b_99.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Pokemon Sprite Overlays\dyna.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\img\Pokemon Sprites\egg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -2101,6 +4945,9 @@ ..\Resources\img\ribbons\ribbonchampiong6hoenn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\img\ribbons\ribbonchampiongalar.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\img\ribbons\ribbonchampionkalos.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -2281,6 +5128,141 @@ ..\Resources\img\ribbons\ribbonlegend.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\img\ribbons\ribbonmarkabsentminded.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonmarkangry.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonmarkblizzard.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonmarkcalmness.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonmarkcharismatic.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonmarkcloudy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonmarkcrafty.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonmarkcurry.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonmarkdawn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonmarkdestiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonmarkdry.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonmarkdusk.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonmarkexcited.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonmarkferocious.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonmarkfishing.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonmarkflustered.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonmarkhumble.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonmarkintellectual.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonmarkintense.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonmarkjittery.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonmarkjoyful.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonmarkkindly.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonmarklunchtime.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonmarkmisty.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonmarkpeeved.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonmarkprideful.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonmarkpumpedup.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonmarkrainy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonmarkrare.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonmarkrowdy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonmarksandstorm.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonmarkscowling.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonmarksleepytime.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonmarkslump.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonmarksmiley.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonmarksnowy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonmarkstormy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonmarkteary.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonmarkthorny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonmarkuncommon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonmarkunsure.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonmarkupbeat.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonmarkvigor.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonmarkzeroenergy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\ribbons\ribbonmarkzonedout.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\img\ribbons\ribbonmasterbeauty.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -2293,6 +5275,9 @@ ..\Resources\img\ribbons\ribbonmastercuteness.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\img\ribbons\ribbonmasterrank.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\img\ribbons\ribbonmastertoughness.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -2326,6 +5311,9 @@ ..\Resources\img\ribbons\ribbonspecial.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\img\ribbons\ribbontowermaster.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\img\ribbons\ribbontraining.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -2341,6 +5329,42 @@ ..\Resources\img\ribbons\ribbonworld.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\img\accents\slotDel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\accents\slotDel68.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\accents\slotDrag.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\accents\slotDrag68.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\accents\slotHover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\accents\slotHover68.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\accents\slotSet.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\accents\slotSet68.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\accents\slotTrans.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\accents\slotTrans68.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\accents\slotView.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\accents\slotView68.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\img\Pokemon Sprite Overlays\starter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -5626,12 +8650,15 @@ ..\Resources\img\Pokemon Sprites\450.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\img\Pokemon Sprites\450f.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Shiny Pokemon Sprites\450fs.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\img\Shiny Pokemon Sprites\450s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\img\Shiny Pokemon Sprites\450-1s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\img\Pokemon Sprites\451.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -6172,18 +9199,15 @@ ..\Resources\img\Pokemon Sprites\521.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\img\Pokemon Sprites\521f.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Shiny Pokemon Sprites\521fs.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\img\Shiny Pokemon Sprites\521s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\img\Pokemon Sprites\521_1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\img\Shiny Pokemon Sprites\521_1s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\img\Shiny Pokemon Sprites\521-1s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\img\Pokemon Sprites\522.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -6715,27 +9739,27 @@ ..\Resources\img\Pokemon Sprites\592.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\img\Pokemon Sprites\592f.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Shiny Pokemon Sprites\592fs.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\img\Shiny Pokemon Sprites\592s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\img\Pokemon Sprites\592-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\img\Shiny Pokemon Sprites\592-1s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\img\Pokemon Sprites\593.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\img\Pokemon Sprites\593f.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Shiny Pokemon Sprites\593fs.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\img\Shiny Pokemon Sprites\593s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\img\Pokemon Sprites\593-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\img\Shiny Pokemon Sprites\593-1s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\img\Pokemon Sprites\594.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -7429,15 +10453,15 @@ ..\Resources\img\Pokemon Sprites\668.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\img\Pokemon Sprites\668f.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Shiny Pokemon Sprites\668fs.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\img\Shiny Pokemon Sprites\668s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\img\Pokemon Sprites\668_1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\img\Shiny Pokemon Sprites\668-1s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\img\Pokemon Sprites\669.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1.png new file mode 100644 index 000000000..565901542 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_10.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_10.png new file mode 100644 index 000000000..e32ad2da7 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_10.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_106.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_106.png new file mode 100644 index 000000000..df31fcc0d Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_106.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_107.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_107.png new file mode 100644 index 000000000..acf6e6c11 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_107.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1074.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1074.png new file mode 100644 index 000000000..178593c8a Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1074.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1075.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1075.png new file mode 100644 index 000000000..d5056587c Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1075.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1076.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1076.png new file mode 100644 index 000000000..c5c0840ac Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1076.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1077.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1077.png new file mode 100644 index 000000000..1898e1bc1 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1077.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_108.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_108.png new file mode 100644 index 000000000..9a47d20fc Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_108.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1080.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1080.png new file mode 100644 index 000000000..2cd339608 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1080.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1081.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1081.png new file mode 100644 index 000000000..990e8129e Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1081.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1084.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1084.png new file mode 100644 index 000000000..7a15dbf36 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1084.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1085.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1085.png new file mode 100644 index 000000000..4e8e40fb7 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1085.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1086.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1086.png new file mode 100644 index 000000000..caa315712 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1086.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1087.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1087.png new file mode 100644 index 000000000..81879ff9c Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1087.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1088.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1088.png new file mode 100644 index 000000000..95e2d26af Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1088.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1089.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1089.png new file mode 100644 index 000000000..b4d7be910 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1089.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_109.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_109.png new file mode 100644 index 000000000..8bc58a18b Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_109.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1090.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1090.png new file mode 100644 index 000000000..492c2b254 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1090.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1091.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1091.png new file mode 100644 index 000000000..87a002d91 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1091.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1092.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1092.png new file mode 100644 index 000000000..ad6ad857a Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1092.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1093.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1093.png new file mode 100644 index 000000000..1c4c12efb Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1093.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1094.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1094.png new file mode 100644 index 000000000..24b06a43f Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1094.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1095.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1095.png new file mode 100644 index 000000000..46a28a614 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1095.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1096.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1096.png new file mode 100644 index 000000000..386184c6b Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1096.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1097.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1097.png new file mode 100644 index 000000000..cf55cedf1 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1097.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1098.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1098.png new file mode 100644 index 000000000..61554291e Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1098.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1099.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1099.png new file mode 100644 index 000000000..3764e72a7 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1099.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_11.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_11.png new file mode 100644 index 000000000..f1faa87ad Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_11.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1100.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1100.png new file mode 100644 index 000000000..37d57b972 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1100.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1103.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1103.png new file mode 100644 index 000000000..fe43e7936 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1103.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1104.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1104.png new file mode 100644 index 000000000..c3702c6e9 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1104.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1105.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1105.png new file mode 100644 index 000000000..8d72be3fe Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1105.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1106.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1106.png new file mode 100644 index 000000000..fecf1e73c Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1106.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1107.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1107.png new file mode 100644 index 000000000..acf2c72a6 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1107.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1108.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1108.png new file mode 100644 index 000000000..2e488c1a7 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1108.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1109.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1109.png new file mode 100644 index 000000000..643d2e47f Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1109.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1110.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1110.png new file mode 100644 index 000000000..7f28d3751 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1110.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1111.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1111.png new file mode 100644 index 000000000..eca6c3940 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1111.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1112.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1112.png new file mode 100644 index 000000000..f47510ffb Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1112.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1113.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1113.png new file mode 100644 index 000000000..ff6414981 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1113.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1114.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1114.png new file mode 100644 index 000000000..de9abdde0 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1114.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1115.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1115.png new file mode 100644 index 000000000..009a23037 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1115.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1116.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1116.png new file mode 100644 index 000000000..2b71466fe Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1116.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1117.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1117.png new file mode 100644 index 000000000..3f73a9695 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1117.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1118.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1118.png new file mode 100644 index 000000000..2c3536a90 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1118.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1119.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1119.png new file mode 100644 index 000000000..804ef7176 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1119.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1120.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1120.png new file mode 100644 index 000000000..5189aaf5b Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1120.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1121.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1121.png new file mode 100644 index 000000000..016ebeafc Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1121.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1122.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1122.png new file mode 100644 index 000000000..1092182c1 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1122.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1123.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1123.png new file mode 100644 index 000000000..09b6218a5 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1123.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1124.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1124.png new file mode 100644 index 000000000..1ce70568b Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1124.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1125.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1125.png new file mode 100644 index 000000000..01623b548 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1125.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1126.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1126.png new file mode 100644 index 000000000..cdcfbcd8d Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1126.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1127.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1127.png new file mode 100644 index 000000000..d6c7e04e8 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1127.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1128.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1128.png new file mode 100644 index 000000000..12ba323d9 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1128.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1129.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1129.png new file mode 100644 index 000000000..9ef2f654c Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1129.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_116.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_116.png new file mode 100644 index 000000000..e2650f4d0 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_116.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_117.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_117.png new file mode 100644 index 000000000..da6f00247 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_117.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_118.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_118.png new file mode 100644 index 000000000..8c909d809 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_118.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_119.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_119.png new file mode 100644 index 000000000..77ce12333 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_119.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_12.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_12.png new file mode 100644 index 000000000..b97a74cbd Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_12.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1231.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1231.png new file mode 100644 index 000000000..bfc08c377 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1231.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1232.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1232.png new file mode 100644 index 000000000..bfc08c377 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1232.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1233.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1233.png new file mode 100644 index 000000000..bfc08c377 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1233.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1234.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1234.png new file mode 100644 index 000000000..bfc08c377 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1234.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1235.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1235.png new file mode 100644 index 000000000..f02ecbaf1 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1235.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1236.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1236.png new file mode 100644 index 000000000..f02ecbaf1 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1236.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1237.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1237.png new file mode 100644 index 000000000..f02ecbaf1 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1237.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1238.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1238.png new file mode 100644 index 000000000..f02ecbaf1 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1238.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1239.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1239.png new file mode 100644 index 000000000..8837bfe1d Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1239.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1240.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1240.png new file mode 100644 index 000000000..8837bfe1d Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1240.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1241.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1241.png new file mode 100644 index 000000000..8837bfe1d Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1241.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1242.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1242.png new file mode 100644 index 000000000..8837bfe1d Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1242.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1243.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1243.png new file mode 100644 index 000000000..a46ee0edf Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1243.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1244.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1244.png new file mode 100644 index 000000000..a46ee0edf Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1244.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1245.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1245.png new file mode 100644 index 000000000..a46ee0edf Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1245.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1246.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1246.png new file mode 100644 index 000000000..a46ee0edf Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1246.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1247.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1247.png new file mode 100644 index 000000000..203899e48 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1247.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1248.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1248.png new file mode 100644 index 000000000..203899e48 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1248.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1249.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1249.png new file mode 100644 index 000000000..203899e48 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1249.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1250.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1250.png new file mode 100644 index 000000000..203899e48 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1250.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1251.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1251.png new file mode 100644 index 000000000..fc9e0eecc Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1251.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1252.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1252.png new file mode 100644 index 000000000..9de6a0b44 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1252.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1253.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1253.png new file mode 100644 index 000000000..8fe27ba20 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1253.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1254.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1254.png new file mode 100644 index 000000000..43634dc38 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1254.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1255.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1255.png new file mode 100644 index 000000000..86dec7504 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1255.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1256.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1256.png new file mode 100644 index 000000000..ac318a564 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1256.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1257.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1257.png new file mode 100644 index 000000000..6d17bd0d7 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1257.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1258.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1258.png new file mode 100644 index 000000000..8b5949796 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1258.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1259.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1259.png new file mode 100644 index 000000000..0d69f2dbc Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1259.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1260.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1260.png new file mode 100644 index 000000000..d29c22b33 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1260.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1261.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1261.png new file mode 100644 index 000000000..c853412d4 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1261.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1262.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1262.png new file mode 100644 index 000000000..8086bd94f Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1262.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1263.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1263.png new file mode 100644 index 000000000..0d35eca07 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1263.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1264.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1264.png new file mode 100644 index 000000000..ce9de8edb Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1264.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1266.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1266.png new file mode 100644 index 000000000..0ac484c8f Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1266.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1267.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1267.png new file mode 100644 index 000000000..42bb5835e Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1267.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1269.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1269.png new file mode 100644 index 000000000..cc4233f90 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1269.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1270.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1270.png new file mode 100644 index 000000000..6a5208a9b Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1270.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1271.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1271.png new file mode 100644 index 000000000..8eb06ec22 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1271.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_1278.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_1278.png new file mode 100644 index 000000000..cbc371f66 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_1278.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_13.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_13.png new file mode 100644 index 000000000..ca67ded4d Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_13.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_134.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_134.png new file mode 100644 index 000000000..ecabb908f Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_134.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_14.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_14.png new file mode 100644 index 000000000..5dd8f2882 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_14.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_149.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_149.png new file mode 100644 index 000000000..be9f3f36a Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_149.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_15.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_15.png new file mode 100644 index 000000000..8d526bc9a Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_15.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_150.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_150.png new file mode 100644 index 000000000..8223fbbba Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_150.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_151.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_151.png new file mode 100644 index 000000000..9a75d6323 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_151.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_152.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_152.png new file mode 100644 index 000000000..b065b34fb Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_152.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_153.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_153.png new file mode 100644 index 000000000..5110ce27d Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_153.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_154.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_154.png new file mode 100644 index 000000000..f2b3e5c45 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_154.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_155.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_155.png new file mode 100644 index 000000000..08b9a6844 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_155.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_156.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_156.png new file mode 100644 index 000000000..414131c8d Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_156.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_157.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_157.png new file mode 100644 index 000000000..cda95b982 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_157.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_158.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_158.png new file mode 100644 index 000000000..9f6a41813 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_158.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_159.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_159.png new file mode 100644 index 000000000..bf8ee3a9f Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_159.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_16.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_16.png new file mode 100644 index 000000000..c242a8b27 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_16.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_160.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_160.png new file mode 100644 index 000000000..bea130f95 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_160.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_161.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_161.png new file mode 100644 index 000000000..398b03d0f Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_161.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_162.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_162.png new file mode 100644 index 000000000..0d7cc95e3 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_162.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_163.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_163.png new file mode 100644 index 000000000..4d9e61cbc Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_163.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_169.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_169.png new file mode 100644 index 000000000..affff4f57 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_169.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_17.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_17.png new file mode 100644 index 000000000..96e6a67a3 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_17.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_170.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_170.png new file mode 100644 index 000000000..371e71b11 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_170.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_171.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_171.png new file mode 100644 index 000000000..f940f79f0 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_171.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_172.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_172.png new file mode 100644 index 000000000..02d22cd87 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_172.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_173.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_173.png new file mode 100644 index 000000000..e01652c2c Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_173.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_174.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_174.png new file mode 100644 index 000000000..d9e5f5e95 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_174.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_18.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_18.png new file mode 100644 index 000000000..b8fbc7b15 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_18.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_184.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_184.png new file mode 100644 index 000000000..d8dfad3d8 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_184.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_185.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_185.png new file mode 100644 index 000000000..a31f74276 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_185.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_186.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_186.png new file mode 100644 index 000000000..a732a40c9 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_186.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_187.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_187.png new file mode 100644 index 000000000..18d92aa68 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_187.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_188.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_188.png new file mode 100644 index 000000000..2cda55352 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_188.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_189.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_189.png new file mode 100644 index 000000000..0b756b28d Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_189.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_19.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_19.png new file mode 100644 index 000000000..7bc7c18f3 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_19.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_190.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_190.png new file mode 100644 index 000000000..1bf2477c7 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_190.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_191.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_191.png new file mode 100644 index 000000000..62e310484 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_191.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_192.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_192.png new file mode 100644 index 000000000..5fbb60518 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_192.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_193.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_193.png new file mode 100644 index 000000000..72d334426 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_193.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_194.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_194.png new file mode 100644 index 000000000..7236347d9 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_194.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_195.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_195.png new file mode 100644 index 000000000..dbb082004 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_195.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_196.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_196.png new file mode 100644 index 000000000..013f2ae3b Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_196.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_197.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_197.png new file mode 100644 index 000000000..6c0751f3b Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_197.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_198.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_198.png new file mode 100644 index 000000000..1826f1bf7 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_198.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_199.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_199.png new file mode 100644 index 000000000..099748ffe Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_199.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_2.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_2.png new file mode 100644 index 000000000..fd3d454ee Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_2.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_20.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_20.png new file mode 100644 index 000000000..20feae7d9 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_20.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_200.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_200.png new file mode 100644 index 000000000..6c4a84c50 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_200.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_201.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_201.png new file mode 100644 index 000000000..e9c5485d1 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_201.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_202.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_202.png new file mode 100644 index 000000000..afa9a80ff Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_202.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_203.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_203.png new file mode 100644 index 000000000..3b1cd82bf Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_203.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_204.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_204.png new file mode 100644 index 000000000..7c9efb76f Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_204.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_205.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_205.png new file mode 100644 index 000000000..5ff38e39b Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_205.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_206.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_206.png new file mode 100644 index 000000000..7264c2eab Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_206.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_207.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_207.png new file mode 100644 index 000000000..997a17b34 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_207.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_208.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_208.png new file mode 100644 index 000000000..036eb0f44 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_208.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_209.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_209.png new file mode 100644 index 000000000..9c5539b43 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_209.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_21.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_21.png new file mode 100644 index 000000000..4d001b80a Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_21.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_210.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_210.png new file mode 100644 index 000000000..d2da2e5df Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_210.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_211.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_211.png new file mode 100644 index 000000000..27a1ae4f2 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_211.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_212.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_212.png new file mode 100644 index 000000000..9906a9fe8 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_212.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_213.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_213.png new file mode 100644 index 000000000..09fbfee50 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_213.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_214.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_214.png new file mode 100644 index 000000000..8ea3ad1e4 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_214.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_215.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_215.png new file mode 100644 index 000000000..3cb0c6adb Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_215.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_217.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_217.png new file mode 100644 index 000000000..7e4e6d21c Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_217.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_218.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_218.png new file mode 100644 index 000000000..3deafb81e Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_218.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_219.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_219.png new file mode 100644 index 000000000..f5fc2342e Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_219.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_22.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_22.png new file mode 100644 index 000000000..e582a0c86 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_22.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_220.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_220.png new file mode 100644 index 000000000..80f15887e Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_220.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_221.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_221.png new file mode 100644 index 000000000..a0820f126 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_221.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_222.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_222.png new file mode 100644 index 000000000..2bb211d0c Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_222.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_223.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_223.png new file mode 100644 index 000000000..2403d137d Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_223.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_224.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_224.png new file mode 100644 index 000000000..911c8168c Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_224.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_228.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_228.png new file mode 100644 index 000000000..4f9ed74a2 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_228.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_229.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_229.png new file mode 100644 index 000000000..216cfba11 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_229.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_23.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_23.png new file mode 100644 index 000000000..e90b7ac32 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_23.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_230.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_230.png new file mode 100644 index 000000000..07e96f0a2 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_230.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_231.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_231.png new file mode 100644 index 000000000..58c5c2977 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_231.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_232.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_232.png new file mode 100644 index 000000000..11d22ac0f Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_232.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_233.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_233.png new file mode 100644 index 000000000..bc352fd1a Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_233.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_234.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_234.png new file mode 100644 index 000000000..ed5a69934 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_234.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_236.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_236.png new file mode 100644 index 000000000..47a4c1ad6 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_236.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_237.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_237.png new file mode 100644 index 000000000..768a9cd4d Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_237.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_238.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_238.png new file mode 100644 index 000000000..1166ef5c0 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_238.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_239.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_239.png new file mode 100644 index 000000000..1cd577ee4 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_239.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_24.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_24.png new file mode 100644 index 000000000..b3aed7a03 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_24.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_240.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_240.png new file mode 100644 index 000000000..a1a6c5be5 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_240.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_241.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_241.png new file mode 100644 index 000000000..90a866fc4 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_241.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_242.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_242.png new file mode 100644 index 000000000..593d3ea3c Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_242.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_243.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_243.png new file mode 100644 index 000000000..dbeb92fd3 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_243.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_244.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_244.png new file mode 100644 index 000000000..3693a6679 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_244.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_245.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_245.png new file mode 100644 index 000000000..fd9fabe9c Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_245.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_246.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_246.png new file mode 100644 index 000000000..928c7c2b7 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_246.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_247.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_247.png new file mode 100644 index 000000000..2b970fe33 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_247.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_248.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_248.png new file mode 100644 index 000000000..0d43a8ddb Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_248.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_249.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_249.png new file mode 100644 index 000000000..f946614cf Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_249.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_25.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_25.png new file mode 100644 index 000000000..9d67d92a4 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_25.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_250.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_250.png new file mode 100644 index 000000000..84f28ffbc Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_250.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_251.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_251.png new file mode 100644 index 000000000..b25ca8588 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_251.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_253.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_253.png new file mode 100644 index 000000000..8f1bae7f4 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_253.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_254.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_254.png new file mode 100644 index 000000000..0b192b6fc Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_254.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_255.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_255.png new file mode 100644 index 000000000..bd5b0fe67 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_255.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_257.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_257.png new file mode 100644 index 000000000..5ee4aa549 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_257.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_259.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_259.png new file mode 100644 index 000000000..bfb77e211 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_259.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_26.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_26.png new file mode 100644 index 000000000..fe9476361 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_26.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_265.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_265.png new file mode 100644 index 000000000..b274c3419 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_265.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_266.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_266.png new file mode 100644 index 000000000..2abd9bc5e Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_266.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_267.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_267.png new file mode 100644 index 000000000..63ef68385 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_267.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_268.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_268.png new file mode 100644 index 000000000..9ed4538de Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_268.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_269.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_269.png new file mode 100644 index 000000000..0217c5c0e Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_269.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_27.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_27.png new file mode 100644 index 000000000..db424ca87 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_27.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_270.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_270.png new file mode 100644 index 000000000..c28cbefca Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_270.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_271.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_271.png new file mode 100644 index 000000000..2f6a6b348 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_271.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_272.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_272.png new file mode 100644 index 000000000..b41971b4f Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_272.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_273.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_273.png new file mode 100644 index 000000000..1954eebbb Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_273.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_274.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_274.png new file mode 100644 index 000000000..a64bb30d1 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_274.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_275.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_275.png new file mode 100644 index 000000000..79569c6e7 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_275.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_276.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_276.png new file mode 100644 index 000000000..43d58161a Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_276.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_277.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_277.png new file mode 100644 index 000000000..46d96b7a5 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_277.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_278.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_278.png new file mode 100644 index 000000000..0f9c1dad4 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_278.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_279.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_279.png new file mode 100644 index 000000000..20c90808e Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_279.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_28.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_28.png new file mode 100644 index 000000000..81cb24ddc Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_28.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_280.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_280.png new file mode 100644 index 000000000..ca9ea3a66 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_280.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_281.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_281.png new file mode 100644 index 000000000..182176e68 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_281.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_282.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_282.png new file mode 100644 index 000000000..8d6c35ab9 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_282.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_283.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_283.png new file mode 100644 index 000000000..e2f25e92d Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_283.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_284.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_284.png new file mode 100644 index 000000000..697b409d7 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_284.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_285.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_285.png new file mode 100644 index 000000000..402ebda33 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_285.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_286.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_286.png new file mode 100644 index 000000000..f087a850e Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_286.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_287.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_287.png new file mode 100644 index 000000000..f2f4fea08 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_287.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_288.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_288.png new file mode 100644 index 000000000..d56cf3699 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_288.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_289.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_289.png new file mode 100644 index 000000000..088c1a33f Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_289.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_29.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_29.png new file mode 100644 index 000000000..f520879d1 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_29.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_290.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_290.png new file mode 100644 index 000000000..86c63866f Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_290.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_291.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_291.png new file mode 100644 index 000000000..a5e55c749 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_291.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_292.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_292.png new file mode 100644 index 000000000..c21927f22 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_292.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_293.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_293.png new file mode 100644 index 000000000..198d978a0 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_293.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_294.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_294.png new file mode 100644 index 000000000..e86a815c2 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_294.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_295.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_295.png new file mode 100644 index 000000000..b79768789 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_295.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_296.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_296.png new file mode 100644 index 000000000..735b22d46 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_296.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_297.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_297.png new file mode 100644 index 000000000..ebfd52e92 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_297.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_298.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_298.png new file mode 100644 index 000000000..7c895cef4 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_298.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_299.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_299.png new file mode 100644 index 000000000..a3528182e Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_299.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_3.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_3.png new file mode 100644 index 000000000..f76e60977 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_3.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_30.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_30.png new file mode 100644 index 000000000..33f029b26 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_30.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_300.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_300.png new file mode 100644 index 000000000..880cffe2b Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_300.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_301.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_301.png new file mode 100644 index 000000000..d9f0ce602 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_301.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_302.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_302.png new file mode 100644 index 000000000..5af25ce2a Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_302.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_303.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_303.png new file mode 100644 index 000000000..7bd6b24fd Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_303.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_304.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_304.png new file mode 100644 index 000000000..07a63d1cf Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_304.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_305.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_305.png new file mode 100644 index 000000000..4f4ce3a5c Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_305.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_306.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_306.png new file mode 100644 index 000000000..d85db7e11 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_306.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_307.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_307.png new file mode 100644 index 000000000..bafb0d187 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_307.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_308.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_308.png new file mode 100644 index 000000000..f51cb445d Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_308.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_309.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_309.png new file mode 100644 index 000000000..5dba0f6ca Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_309.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_31.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_31.png new file mode 100644 index 000000000..22f8f75dc Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_31.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_310.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_310.png new file mode 100644 index 000000000..ee31fa278 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_310.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_311.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_311.png new file mode 100644 index 000000000..044ff1dde Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_311.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_312.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_312.png new file mode 100644 index 000000000..ee1261db2 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_312.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_313.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_313.png new file mode 100644 index 000000000..2a1f201f7 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_313.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_314.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_314.png new file mode 100644 index 000000000..ee54b9c1a Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_314.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_315.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_315.png new file mode 100644 index 000000000..03291473b Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_315.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_316.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_316.png new file mode 100644 index 000000000..7bb5910c7 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_316.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_317.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_317.png new file mode 100644 index 000000000..e9fb5fc57 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_317.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_318.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_318.png new file mode 100644 index 000000000..1657e6b7d Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_318.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_319.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_319.png new file mode 100644 index 000000000..99d98755e Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_319.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_32.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_32.png new file mode 100644 index 000000000..9a9b679a7 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_32.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_320.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_320.png new file mode 100644 index 000000000..2acebeaa7 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_320.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_321.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_321.png new file mode 100644 index 000000000..4d5f6b4e3 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_321.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_325.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_325.png new file mode 100644 index 000000000..1335f7732 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_325.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_326.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_326.png new file mode 100644 index 000000000..1223838c5 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_326.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_33.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_33.png new file mode 100644 index 000000000..7b7359f93 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_33.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_34.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_34.png new file mode 100644 index 000000000..abb09e87b Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_34.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_35.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_35.png new file mode 100644 index 000000000..36517fbd5 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_35.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_36.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_36.png new file mode 100644 index 000000000..188742a5a Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_36.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_37.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_37.png new file mode 100644 index 000000000..8f1594a8c Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_37.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_38.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_38.png new file mode 100644 index 000000000..fc41ede78 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_38.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_39.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_39.png new file mode 100644 index 000000000..fcd568c3a Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_39.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_4.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_4.png new file mode 100644 index 000000000..04f91dcb7 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_4.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_40.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_40.png new file mode 100644 index 000000000..adbb4c085 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_40.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_41.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_41.png new file mode 100644 index 000000000..960f79ed1 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_41.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_42.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_42.png new file mode 100644 index 000000000..2e3ea9ca5 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_42.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_43.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_43.png new file mode 100644 index 000000000..7d5e19d4f Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_43.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_45.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_45.png new file mode 100644 index 000000000..a5c699d90 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_45.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_46.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_46.png new file mode 100644 index 000000000..54daeee39 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_46.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_47.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_47.png new file mode 100644 index 000000000..cb7e633b9 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_47.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_48.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_48.png new file mode 100644 index 000000000..6c002d1cd Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_48.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_49.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_49.png new file mode 100644 index 000000000..4a3f04388 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_49.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_492.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_492.png new file mode 100644 index 000000000..5a47fd322 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_492.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_493.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_493.png new file mode 100644 index 000000000..720829c29 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_493.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_494.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_494.png new file mode 100644 index 000000000..a1e0d31d9 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_494.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_495.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_495.png new file mode 100644 index 000000000..c9273ab8e Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_495.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_496.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_496.png new file mode 100644 index 000000000..796ea745d Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_496.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_497.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_497.png new file mode 100644 index 000000000..06eaa4a75 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_497.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_498.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_498.png new file mode 100644 index 000000000..221b7bfd2 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_498.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_499.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_499.png new file mode 100644 index 000000000..94e61b6f4 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_499.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_5.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_5.png new file mode 100644 index 000000000..6d287781b Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_5.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_50.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_50.png new file mode 100644 index 000000000..1faaf8192 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_50.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_500.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_500.png new file mode 100644 index 000000000..c9a73e278 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_500.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_504.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_504.png new file mode 100644 index 000000000..00313f37a Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_504.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_51.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_51.png new file mode 100644 index 000000000..082559242 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_51.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_52.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_52.png new file mode 100644 index 000000000..9a3e3c17d Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_52.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_53.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_53.png new file mode 100644 index 000000000..1d83396fe Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_53.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_537.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_537.png new file mode 100644 index 000000000..0dc72f918 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_537.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_538.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_538.png new file mode 100644 index 000000000..f517eb312 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_538.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_539.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_539.png new file mode 100644 index 000000000..e0ebbf1cf Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_539.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_54.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_54.png new file mode 100644 index 000000000..9f923c010 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_54.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_540.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_540.png new file mode 100644 index 000000000..bfbd7d141 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_540.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_541.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_541.png new file mode 100644 index 000000000..b3f805b5d Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_541.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_542.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_542.png new file mode 100644 index 000000000..00ddbd806 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_542.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_543.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_543.png new file mode 100644 index 000000000..f287e48a3 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_543.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_544.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_544.png new file mode 100644 index 000000000..f249d194e Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_544.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_545.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_545.png new file mode 100644 index 000000000..d2b3a6e11 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_545.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_546.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_546.png new file mode 100644 index 000000000..c7fd04b2e Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_546.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_547.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_547.png new file mode 100644 index 000000000..c919cb0c4 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_547.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_55.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_55.png new file mode 100644 index 000000000..3b39e02e0 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_55.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_56.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_56.png new file mode 100644 index 000000000..98f733f31 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_56.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_564.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_564.png new file mode 100644 index 000000000..d09fde6ab Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_564.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_565.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_565.png new file mode 100644 index 000000000..a65bd84b0 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_565.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_566.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_566.png new file mode 100644 index 000000000..73dabdcc5 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_566.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_567.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_567.png new file mode 100644 index 000000000..87283c2af Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_567.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_568.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_568.png new file mode 100644 index 000000000..5810cdd5a Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_568.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_569.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_569.png new file mode 100644 index 000000000..8904a50bb Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_569.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_57.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_57.png new file mode 100644 index 000000000..8c768ccbb Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_57.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_570.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_570.png new file mode 100644 index 000000000..0ba62394a Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_570.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_571.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_571.png new file mode 100644 index 000000000..043947941 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_571.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_576.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_576.png new file mode 100644 index 000000000..d77eea585 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_576.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_58.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_58.png new file mode 100644 index 000000000..21f4d4390 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_58.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_580.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_580.png new file mode 100644 index 000000000..bbfcc7b9f Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_580.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_581.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_581.png new file mode 100644 index 000000000..237f1ce86 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_581.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_582.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_582.png new file mode 100644 index 000000000..da9f7a2f7 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_582.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_583.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_583.png new file mode 100644 index 000000000..f3bda4299 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_583.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_59.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_59.png new file mode 100644 index 000000000..a24077c73 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_59.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_591.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_591.png new file mode 100644 index 000000000..18c28267d Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_591.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_6.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_6.png new file mode 100644 index 000000000..2373a6878 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_6.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_60.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_60.png new file mode 100644 index 000000000..9153d5908 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_60.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_61.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_61.png new file mode 100644 index 000000000..4a3f73c72 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_61.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_618.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_618.png new file mode 100644 index 000000000..675c9c9ca Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_618.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_62.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_62.png new file mode 100644 index 000000000..93a8b8a21 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_62.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_628.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_628.png new file mode 100644 index 000000000..63da52bdd Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_628.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_629.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_629.png new file mode 100644 index 000000000..63da52bdd Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_629.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_63.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_63.png new file mode 100644 index 000000000..5057d1374 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_63.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_631.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_631.png new file mode 100644 index 000000000..5849beb9e Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_631.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_632.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_632.png new file mode 100644 index 000000000..2cc606eff Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_632.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_639.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_639.png new file mode 100644 index 000000000..d23e8462f Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_639.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_640.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_640.png new file mode 100644 index 000000000..8cb9226a1 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_640.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_644.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_644.png new file mode 100644 index 000000000..71289f474 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_644.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_645.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_645.png new file mode 100644 index 000000000..543a438ce Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_645.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_646.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_646.png new file mode 100644 index 000000000..a605f36df Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_646.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_647.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_647.png new file mode 100644 index 000000000..8c6585171 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_647.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_648.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_648.png new file mode 100644 index 000000000..f7899b027 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_648.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_649.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_649.png new file mode 100644 index 000000000..331c4783f Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_649.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_650.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_650.png new file mode 100644 index 000000000..ea36d3d4b Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_650.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_686.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_686.png new file mode 100644 index 000000000..480baf8af Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_686.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_687.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_687.png new file mode 100644 index 000000000..2aa424afc Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_687.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_688.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_688.png new file mode 100644 index 000000000..5031c8469 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_688.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_7.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_7.png new file mode 100644 index 000000000..eade5a3a0 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_7.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_703.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_703.png new file mode 100644 index 000000000..094a2a012 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_703.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_708.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_708.png new file mode 100644 index 000000000..85861e365 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_708.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_709.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_709.png new file mode 100644 index 000000000..324e6bd61 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_709.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_76.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_76.png new file mode 100644 index 000000000..405d64a02 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_76.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_77.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_77.png new file mode 100644 index 000000000..32c144b54 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_77.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_78.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_78.png new file mode 100644 index 000000000..3f0669339 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_78.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_79.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_79.png new file mode 100644 index 000000000..18fdefb05 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_79.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_795.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_795.png new file mode 100644 index 000000000..3eea2d2fa Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_795.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_796.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_796.png new file mode 100644 index 000000000..497a10e0b Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_796.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_8.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_8.png new file mode 100644 index 000000000..7c7d7aa07 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_8.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_80.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_80.png new file mode 100644 index 000000000..5926b8b9c Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_80.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_81.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_81.png new file mode 100644 index 000000000..27595487f Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_81.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_82.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_82.png new file mode 100644 index 000000000..95bb2df89 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_82.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_83.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_83.png new file mode 100644 index 000000000..be470133b Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_83.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_84.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_84.png new file mode 100644 index 000000000..88a7c50e8 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_84.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_846.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_846.png new file mode 100644 index 000000000..af8fa9848 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_846.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_849.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_849.png new file mode 100644 index 000000000..a758b2714 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_849.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_85.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_85.png new file mode 100644 index 000000000..b713180f4 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_85.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_851.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_851.png new file mode 100644 index 000000000..bd86b8691 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_851.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_852.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_852.png new file mode 100644 index 000000000..a709f5f28 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_852.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_86.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_86.png new file mode 100644 index 000000000..545a551d4 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_86.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_87.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_87.png new file mode 100644 index 000000000..de28d78bd Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_87.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_879.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_879.png new file mode 100644 index 000000000..edef1d294 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_879.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_88.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_88.png new file mode 100644 index 000000000..c73b2bbb4 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_88.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_880.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_880.png new file mode 100644 index 000000000..1ac338b33 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_880.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_881.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_881.png new file mode 100644 index 000000000..43b05a960 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_881.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_882.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_882.png new file mode 100644 index 000000000..0f4262705 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_882.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_883.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_883.png new file mode 100644 index 000000000..ea63a5abb Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_883.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_884.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_884.png new file mode 100644 index 000000000..550f0cdd7 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_884.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_89.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_89.png new file mode 100644 index 000000000..d74142629 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_89.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_9.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_9.png new file mode 100644 index 000000000..5dbce1e15 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_9.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_90.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_90.png new file mode 100644 index 000000000..16cec6da6 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_90.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_903.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_903.png new file mode 100644 index 000000000..265e20961 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_903.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_904.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_904.png new file mode 100644 index 000000000..e32f3526c Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_904.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_905.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_905.png new file mode 100644 index 000000000..4e5d881cb Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_905.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_906.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_906.png new file mode 100644 index 000000000..a8b9a3b9e Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_906.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_907.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_907.png new file mode 100644 index 000000000..63fc9e679 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_907.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_908.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_908.png new file mode 100644 index 000000000..e6c0879c2 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_908.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_909.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_909.png new file mode 100644 index 000000000..2e8a69018 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_909.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_91.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_91.png new file mode 100644 index 000000000..1cfc1dad8 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_91.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_910.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_910.png new file mode 100644 index 000000000..9a3a308a2 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_910.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_911.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_911.png new file mode 100644 index 000000000..d4aab6095 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_911.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_912.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_912.png new file mode 100644 index 000000000..a2225d4a3 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_912.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_913.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_913.png new file mode 100644 index 000000000..38952bfbc Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_913.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_914.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_914.png new file mode 100644 index 000000000..cbd637df0 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_914.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_915.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_915.png new file mode 100644 index 000000000..cdca492c4 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_915.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_916.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_916.png new file mode 100644 index 000000000..1fdc31600 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_916.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_917.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_917.png new file mode 100644 index 000000000..b43f64d84 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_917.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_918.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_918.png new file mode 100644 index 000000000..3937759d0 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_918.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_919.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_919.png new file mode 100644 index 000000000..8f824d1f5 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_919.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_92.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_92.png new file mode 100644 index 000000000..a88158832 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_92.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_920.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_920.png new file mode 100644 index 000000000..48221cb31 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_920.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_94.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_94.png new file mode 100644 index 000000000..e66e2b26c Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_94.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_943.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_943.png new file mode 100644 index 000000000..ec00fe63b Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_943.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_944.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_944.png new file mode 100644 index 000000000..6862e5faf Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_944.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_945.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_945.png new file mode 100644 index 000000000..ec00fe63b Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_945.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_946.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_946.png new file mode 100644 index 000000000..6862e5faf Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_946.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_tm.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_tm.png new file mode 100644 index 000000000..f28997496 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_tm.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_tr.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_tr.png new file mode 100644 index 000000000..02b45a4c8 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Items/bitem_tr.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_0-1.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_0-1.png new file mode 100644 index 000000000..c84a388a1 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_0-1.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_0.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_0.png new file mode 100644 index 000000000..90cae6d38 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_0.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_1.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_1.png new file mode 100644 index 000000000..20ecc84cb Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_1.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_10.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_10.png new file mode 100644 index 000000000..07149a810 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_10.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_106.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_106.png new file mode 100644 index 000000000..7d317767c Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_106.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_107.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_107.png new file mode 100644 index 000000000..1346cd3ae Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_107.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_109.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_109.png new file mode 100644 index 000000000..6c6d0fac7 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_109.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_11.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_11.png new file mode 100644 index 000000000..e4b36a653 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_11.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_110-1.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_110-1.png new file mode 100644 index 000000000..50d20c56a Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_110-1.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_110.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_110.png new file mode 100644 index 000000000..a15763806 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_110.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_111.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_111.png new file mode 100644 index 000000000..86951efd8 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_111.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_112.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_112.png new file mode 100644 index 000000000..9a94d662e Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_112.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_118.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_118.png new file mode 100644 index 000000000..c6749e216 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_118.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_119.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_119.png new file mode 100644 index 000000000..a5d8a85f5 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_119.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_12.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_12.png new file mode 100644 index 000000000..042e552fd Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_12.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_122-1.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_122-1.png new file mode 100644 index 000000000..3c8329960 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_122-1.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_122.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_122.png new file mode 100644 index 000000000..e7dda4980 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_122.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_129.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_129.png new file mode 100644 index 000000000..7afa1948c Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_129.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_130.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_130.png new file mode 100644 index 000000000..d61692a26 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_130.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_131.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_131.png new file mode 100644 index 000000000..c67ba8992 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_131.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_132.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_132.png new file mode 100644 index 000000000..053aed809 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_132.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_133.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_133.png new file mode 100644 index 000000000..ddfa193e1 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_133.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_134.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_134.png new file mode 100644 index 000000000..0b5a3da15 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_134.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_135.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_135.png new file mode 100644 index 000000000..26db11766 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_135.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_136.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_136.png new file mode 100644 index 000000000..eaa6ec0e9 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_136.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_143.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_143.png new file mode 100644 index 000000000..19dd7a978 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_143.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_150.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_150.png new file mode 100644 index 000000000..019c13515 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_150.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_151.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_151.png new file mode 100644 index 000000000..9fb0da3af Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_151.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_163.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_163.png new file mode 100644 index 000000000..efff47fdb Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_163.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_164.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_164.png new file mode 100644 index 000000000..034fbfaa2 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_164.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_170.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_170.png new file mode 100644 index 000000000..cafdeb89c Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_170.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_171.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_171.png new file mode 100644 index 000000000..1d7021e9a Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_171.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_172.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_172.png new file mode 100644 index 000000000..d683b8368 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_172.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_173.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_173.png new file mode 100644 index 000000000..fcd32d5ed Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_173.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_175.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_175.png new file mode 100644 index 000000000..451155360 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_175.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_176.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_176.png new file mode 100644 index 000000000..e66b9ff12 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_176.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_177.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_177.png new file mode 100644 index 000000000..d8a707068 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_177.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_178.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_178.png new file mode 100644 index 000000000..701fe06aa Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_178.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_182.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_182.png new file mode 100644 index 000000000..c5852456d Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_182.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_185.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_185.png new file mode 100644 index 000000000..42fd6d2e1 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_185.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_194.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_194.png new file mode 100644 index 000000000..ee27f82e0 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_194.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_195.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_195.png new file mode 100644 index 000000000..af5d3fc4c Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_195.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_196.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_196.png new file mode 100644 index 000000000..122534601 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_196.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_197.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_197.png new file mode 100644 index 000000000..fafbed615 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_197.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_2.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_2.png new file mode 100644 index 000000000..7993778ea Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_2.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_202.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_202.png new file mode 100644 index 000000000..e6090320c Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_202.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_208.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_208.png new file mode 100644 index 000000000..0228e87e5 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_208.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_211.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_211.png new file mode 100644 index 000000000..eca1edefa Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_211.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_213.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_213.png new file mode 100644 index 000000000..be864efc1 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_213.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_215.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_215.png new file mode 100644 index 000000000..4ef45e5f9 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_215.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_220.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_220.png new file mode 100644 index 000000000..8b9ae4cc3 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_220.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_221.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_221.png new file mode 100644 index 000000000..609484373 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_221.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_222-1.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_222-1.png new file mode 100644 index 000000000..64ab4d700 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_222-1.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_222.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_222.png new file mode 100644 index 000000000..0b93a4f63 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_222.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_223.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_223.png new file mode 100644 index 000000000..be97c5bdb Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_223.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_224.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_224.png new file mode 100644 index 000000000..7db573f6c Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_224.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_225.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_225.png new file mode 100644 index 000000000..79ba51357 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_225.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_226.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_226.png new file mode 100644 index 000000000..a3a66ab3c Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_226.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_236.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_236.png new file mode 100644 index 000000000..dce29de4b Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_236.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_237.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_237.png new file mode 100644 index 000000000..2be525169 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_237.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_246.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_246.png new file mode 100644 index 000000000..dd753a917 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_246.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_247.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_247.png new file mode 100644 index 000000000..37ccfc903 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_247.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_248.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_248.png new file mode 100644 index 000000000..674652988 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_248.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_25-1.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_25-1.png new file mode 100644 index 000000000..5307a9124 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_25-1.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_25-2.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_25-2.png new file mode 100644 index 000000000..023358b1f Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_25-2.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_25-3.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_25-3.png new file mode 100644 index 000000000..0aa2e9558 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_25-3.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_25-4.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_25-4.png new file mode 100644 index 000000000..5a9cde5fd Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_25-4.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_25-5.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_25-5.png new file mode 100644 index 000000000..e912f95a1 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_25-5.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_25-6.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_25-6.png new file mode 100644 index 000000000..eea017472 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_25-6.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_25-7.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_25-7.png new file mode 100644 index 000000000..385f1c9a9 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_25-7.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_25.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_25.png new file mode 100644 index 000000000..7987b83ce Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_25.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_251.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_251.png new file mode 100644 index 000000000..a8f9522b9 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_251.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_26-1.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_26-1.png new file mode 100644 index 000000000..41e755245 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_26-1.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_26.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_26.png new file mode 100644 index 000000000..541a214af Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_26.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_263-1.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_263-1.png new file mode 100644 index 000000000..d8a398af8 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_263-1.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_263.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_263.png new file mode 100644 index 000000000..76f9913a5 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_263.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_264-1.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_264-1.png new file mode 100644 index 000000000..f29bc0621 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_264-1.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_264.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_264.png new file mode 100644 index 000000000..75a292c63 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_264.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_270.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_270.png new file mode 100644 index 000000000..fc6acf482 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_270.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_271.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_271.png new file mode 100644 index 000000000..73c3c1d67 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_271.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_272.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_272.png new file mode 100644 index 000000000..5991c9fe2 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_272.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_273.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_273.png new file mode 100644 index 000000000..a6a331b65 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_273.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_274.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_274.png new file mode 100644 index 000000000..7b65d93c2 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_274.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_275.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_275.png new file mode 100644 index 000000000..3a578bc72 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_275.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_278.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_278.png new file mode 100644 index 000000000..e4a410ec6 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_278.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_279.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_279.png new file mode 100644 index 000000000..9e05cbf58 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_279.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_280.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_280.png new file mode 100644 index 000000000..e4622bccc Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_280.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_281.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_281.png new file mode 100644 index 000000000..8e682fe53 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_281.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_282.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_282.png new file mode 100644 index 000000000..eb985aba9 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_282.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_290.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_290.png new file mode 100644 index 000000000..1b5d6b083 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_290.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_291.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_291.png new file mode 100644 index 000000000..08a25b0fd Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_291.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_292.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_292.png new file mode 100644 index 000000000..27e3b3312 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_292.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_3.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_3.png new file mode 100644 index 000000000..f2a8a2c89 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_3.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_302.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_302.png new file mode 100644 index 000000000..aeaee9ad4 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_302.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_303.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_303.png new file mode 100644 index 000000000..66956bd4d Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_303.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_309.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_309.png new file mode 100644 index 000000000..4e3d537c6 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_309.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_310.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_310.png new file mode 100644 index 000000000..3e3659f45 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_310.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_315.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_315.png new file mode 100644 index 000000000..1a8ce8517 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_315.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_320.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_320.png new file mode 100644 index 000000000..543283642 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_320.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_321.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_321.png new file mode 100644 index 000000000..807949280 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_321.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_324.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_324.png new file mode 100644 index 000000000..e5420ffce Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_324.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_328.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_328.png new file mode 100644 index 000000000..2c3d89e8c Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_328.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_329.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_329.png new file mode 100644 index 000000000..6de11a447 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_329.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_330.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_330.png new file mode 100644 index 000000000..aa2422c9d Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_330.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_337.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_337.png new file mode 100644 index 000000000..cd3ffb5d5 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_337.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_338.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_338.png new file mode 100644 index 000000000..7ab4ecc32 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_338.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_339.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_339.png new file mode 100644 index 000000000..0ba6bd1d9 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_339.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_340.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_340.png new file mode 100644 index 000000000..6d9893536 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_340.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_341.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_341.png new file mode 100644 index 000000000..2cf8c05d6 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_341.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_342.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_342.png new file mode 100644 index 000000000..011035e5f Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_342.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_343.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_343.png new file mode 100644 index 000000000..268c62022 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_343.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_344.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_344.png new file mode 100644 index 000000000..7d25b056d Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_344.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_349.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_349.png new file mode 100644 index 000000000..5aa07cc68 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_349.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_35.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_35.png new file mode 100644 index 000000000..aca48f436 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_35.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_350.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_350.png new file mode 100644 index 000000000..300f1d72d Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_350.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_355.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_355.png new file mode 100644 index 000000000..2691ea5d2 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_355.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_356.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_356.png new file mode 100644 index 000000000..09ec565dd Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_356.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_36.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_36.png new file mode 100644 index 000000000..e10f380f4 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_36.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_360.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_360.png new file mode 100644 index 000000000..72bb1aa01 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_360.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_361.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_361.png new file mode 100644 index 000000000..9fd3ec04f Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_361.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_362.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_362.png new file mode 100644 index 000000000..286c828c1 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_362.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_37-1.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_37-1.png new file mode 100644 index 000000000..a121c690e Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_37-1.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_37.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_37.png new file mode 100644 index 000000000..a8955b884 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_37.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_38-1.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_38-1.png new file mode 100644 index 000000000..050a3eec8 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_38-1.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_38.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_38.png new file mode 100644 index 000000000..ebdb10f4b Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_38.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_385.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_385.png new file mode 100644 index 000000000..2005bbe0a Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_385.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_4.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_4.png new file mode 100644 index 000000000..92e90573e Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_4.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_406.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_406.png new file mode 100644 index 000000000..5ff949f34 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_406.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_407.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_407.png new file mode 100644 index 000000000..159878efe Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_407.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_415.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_415.png new file mode 100644 index 000000000..0ace9e61b Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_415.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_416.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_416.png new file mode 100644 index 000000000..8d3b05ab1 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_416.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_420.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_420.png new file mode 100644 index 000000000..a12167172 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_420.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_421-1.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_421-1.png new file mode 100644 index 000000000..52df08d53 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_421-1.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_421.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_421.png new file mode 100644 index 000000000..52687840d Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_421.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_422-1.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_422-1.png new file mode 100644 index 000000000..53369e5a6 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_422-1.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_422.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_422.png new file mode 100644 index 000000000..331610590 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_422.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_423-1.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_423-1.png new file mode 100644 index 000000000..17422bd25 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_423-1.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_423.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_423.png new file mode 100644 index 000000000..80c004d6f Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_423.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_425.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_425.png new file mode 100644 index 000000000..ffb2ce097 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_425.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_426.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_426.png new file mode 100644 index 000000000..a2d050073 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_426.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_43.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_43.png new file mode 100644 index 000000000..77e9dcd3f Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_43.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_434.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_434.png new file mode 100644 index 000000000..74233302f Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_434.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_435.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_435.png new file mode 100644 index 000000000..460c50408 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_435.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_436.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_436.png new file mode 100644 index 000000000..ee0042db7 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_436.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_437.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_437.png new file mode 100644 index 000000000..04c6b9319 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_437.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_438.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_438.png new file mode 100644 index 000000000..7d5c3514c Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_438.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_439.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_439.png new file mode 100644 index 000000000..cebb4d611 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_439.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_44.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_44.png new file mode 100644 index 000000000..7a543085d Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_44.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_446.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_446.png new file mode 100644 index 000000000..62896af4c Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_446.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_447.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_447.png new file mode 100644 index 000000000..9c4533d31 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_447.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_448.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_448.png new file mode 100644 index 000000000..71227972a Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_448.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_449.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_449.png new file mode 100644 index 000000000..0a7950e74 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_449.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_45.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_45.png new file mode 100644 index 000000000..5fa178f2d Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_45.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_450.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_450.png new file mode 100644 index 000000000..5015ada25 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_450.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_450f.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_450f.png new file mode 100644 index 000000000..5015ada25 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_450f.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_451.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_451.png new file mode 100644 index 000000000..fa41a81df Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_451.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_452.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_452.png new file mode 100644 index 000000000..4153fc95a Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_452.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_453.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_453.png new file mode 100644 index 000000000..634c10edc Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_453.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_454.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_454.png new file mode 100644 index 000000000..3176e98d5 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_454.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_458.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_458.png new file mode 100644 index 000000000..59fcbb100 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_458.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_459.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_459.png new file mode 100644 index 000000000..2ddff2164 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_459.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_460.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_460.png new file mode 100644 index 000000000..467c35eb0 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_460.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_461.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_461.png new file mode 100644 index 000000000..6c364f7d5 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_461.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_464.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_464.png new file mode 100644 index 000000000..f16f62f61 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_464.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_468.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_468.png new file mode 100644 index 000000000..e5f59f73c Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_468.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_470.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_470.png new file mode 100644 index 000000000..a0ce7c596 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_470.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_471.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_471.png new file mode 100644 index 000000000..20eefe753 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_471.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_473.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_473.png new file mode 100644 index 000000000..b38f699ce Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_473.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_475.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_475.png new file mode 100644 index 000000000..8489f518b Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_475.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_477.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_477.png new file mode 100644 index 000000000..8dfe00f75 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_477.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_478.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_478.png new file mode 100644 index 000000000..ff55fe18f Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_478.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_479-1.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_479-1.png new file mode 100644 index 000000000..dd3f7b7d4 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_479-1.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_479-2.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_479-2.png new file mode 100644 index 000000000..ecff95dbd Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_479-2.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_479-3.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_479-3.png new file mode 100644 index 000000000..587b58624 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_479-3.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_479-4.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_479-4.png new file mode 100644 index 000000000..6d8c166b5 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_479-4.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_479-5.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_479-5.png new file mode 100644 index 000000000..2291c06be Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_479-5.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_479.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_479.png new file mode 100644 index 000000000..54ff4194b Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_479.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_5.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_5.png new file mode 100644 index 000000000..a632bcdcb Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_5.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_50-1.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_50-1.png new file mode 100644 index 000000000..07174ef1d Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_50-1.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_50.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_50.png new file mode 100644 index 000000000..af87c126a Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_50.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_509.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_509.png new file mode 100644 index 000000000..40c4ea805 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_509.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_51-1.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_51-1.png new file mode 100644 index 000000000..23dc10198 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_51-1.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_51.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_51.png new file mode 100644 index 000000000..829e1727a Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_51.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_510.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_510.png new file mode 100644 index 000000000..b27ab5dab Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_510.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_517.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_517.png new file mode 100644 index 000000000..a98237362 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_517.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_518.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_518.png new file mode 100644 index 000000000..2f7af717f Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_518.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_519.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_519.png new file mode 100644 index 000000000..b4d8d15e9 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_519.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_52-1.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_52-1.png new file mode 100644 index 000000000..70de74b5d Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_52-1.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_52-2.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_52-2.png new file mode 100644 index 000000000..f6200bc0a Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_52-2.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_52.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_52.png new file mode 100644 index 000000000..54b9c9848 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_52.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_520.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_520.png new file mode 100644 index 000000000..5e67e9fb1 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_520.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_521.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_521.png new file mode 100644 index 000000000..c96970a66 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_521.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_521f.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_521f.png new file mode 100644 index 000000000..c5cc836b7 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_521f.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_524.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_524.png new file mode 100644 index 000000000..4847097f7 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_524.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_525.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_525.png new file mode 100644 index 000000000..b791209fb Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_525.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_526.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_526.png new file mode 100644 index 000000000..ea3f07342 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_526.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_527.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_527.png new file mode 100644 index 000000000..8ab1a37c4 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_527.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_528.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_528.png new file mode 100644 index 000000000..237263375 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_528.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_529.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_529.png new file mode 100644 index 000000000..3a0019981 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_529.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_53-1.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_53-1.png new file mode 100644 index 000000000..92854cb11 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_53-1.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_53.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_53.png new file mode 100644 index 000000000..a4e048eeb Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_53.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_530.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_530.png new file mode 100644 index 000000000..c59a4b7a7 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_530.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_532.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_532.png new file mode 100644 index 000000000..6eaa2bd41 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_532.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_533.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_533.png new file mode 100644 index 000000000..08ab51cbe Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_533.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_534.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_534.png new file mode 100644 index 000000000..8335fd1f4 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_534.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_535.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_535.png new file mode 100644 index 000000000..1d8ac062c Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_535.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_536.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_536.png new file mode 100644 index 000000000..10999b226 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_536.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_537.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_537.png new file mode 100644 index 000000000..0a73dbb5b Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_537.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_538.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_538.png new file mode 100644 index 000000000..94b45827d Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_538.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_539.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_539.png new file mode 100644 index 000000000..ed8b65d2e Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_539.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_546.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_546.png new file mode 100644 index 000000000..6d6a3865a Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_546.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_547.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_547.png new file mode 100644 index 000000000..909aa81a7 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_547.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_550-1.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_550-1.png new file mode 100644 index 000000000..1ebbb4c1e Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_550-1.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_550.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_550.png new file mode 100644 index 000000000..e12c2d59d Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_550.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_554-1.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_554-1.png new file mode 100644 index 000000000..22c81d817 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_554-1.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_554.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_554.png new file mode 100644 index 000000000..289a5b631 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_554.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_555-1.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_555-1.png new file mode 100644 index 000000000..d731e6c33 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_555-1.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_555-2.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_555-2.png new file mode 100644 index 000000000..f33378a47 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_555-2.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_555-3.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_555-3.png new file mode 100644 index 000000000..51103cf28 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_555-3.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_555.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_555.png new file mode 100644 index 000000000..82a3a747d Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_555.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_556.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_556.png new file mode 100644 index 000000000..335b6490a Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_556.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_557.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_557.png new file mode 100644 index 000000000..1b9f1fa1e Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_557.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_558.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_558.png new file mode 100644 index 000000000..1e8abb1da Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_558.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_559.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_559.png new file mode 100644 index 000000000..e7e1b9e3b Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_559.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_560.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_560.png new file mode 100644 index 000000000..e7cadfced Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_560.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_561.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_561.png new file mode 100644 index 000000000..31ae011c5 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_561.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_562-1.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_562-1.png new file mode 100644 index 000000000..cb1b3834b Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_562-1.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_562.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_562.png new file mode 100644 index 000000000..06fe75e07 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_562.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_563.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_563.png new file mode 100644 index 000000000..6b276a634 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_563.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_568.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_568.png new file mode 100644 index 000000000..4c4049049 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_568.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_569.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_569.png new file mode 100644 index 000000000..57f361468 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_569.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_572.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_572.png new file mode 100644 index 000000000..835dfd49e Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_572.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_573.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_573.png new file mode 100644 index 000000000..3c9093728 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_573.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_574.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_574.png new file mode 100644 index 000000000..f2c1cea46 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_574.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_575.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_575.png new file mode 100644 index 000000000..20aea218a Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_575.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_576.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_576.png new file mode 100644 index 000000000..8b6b88e1d Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_576.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_577.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_577.png new file mode 100644 index 000000000..52c08958b Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_577.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_578.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_578.png new file mode 100644 index 000000000..ddcad5a50 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_578.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_579.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_579.png new file mode 100644 index 000000000..a4a3209ab Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_579.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_58.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_58.png new file mode 100644 index 000000000..6e081bbbf Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_58.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_582.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_582.png new file mode 100644 index 000000000..ca9cd112f Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_582.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_583.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_583.png new file mode 100644 index 000000000..67b341293 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_583.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_584.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_584.png new file mode 100644 index 000000000..deaf1a38a Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_584.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_588.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_588.png new file mode 100644 index 000000000..e7d0081d5 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_588.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_589.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_589.png new file mode 100644 index 000000000..50f21b496 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_589.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_59.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_59.png new file mode 100644 index 000000000..5487c1bdc Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_59.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_592.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_592.png new file mode 100644 index 000000000..34f51dae6 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_592.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_592f.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_592f.png new file mode 100644 index 000000000..564215258 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_592f.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_593.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_593.png new file mode 100644 index 000000000..6ce9a24c8 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_593.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_593f.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_593f.png new file mode 100644 index 000000000..34015c160 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_593f.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_595.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_595.png new file mode 100644 index 000000000..1e5c245ba Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_595.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_596.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_596.png new file mode 100644 index 000000000..666992435 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_596.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_597.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_597.png new file mode 100644 index 000000000..af82b155e Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_597.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_598.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_598.png new file mode 100644 index 000000000..84e259306 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_598.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_599.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_599.png new file mode 100644 index 000000000..3b919a469 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_599.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_6.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_6.png new file mode 100644 index 000000000..4cba81cd7 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_6.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_600.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_600.png new file mode 100644 index 000000000..c131ef2a2 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_600.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_601.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_601.png new file mode 100644 index 000000000..8ace53302 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_601.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_605.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_605.png new file mode 100644 index 000000000..07e5d5a64 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_605.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_606.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_606.png new file mode 100644 index 000000000..40eb6f3ac Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_606.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_607.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_607.png new file mode 100644 index 000000000..bc6c9682f Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_607.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_608.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_608.png new file mode 100644 index 000000000..d44448012 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_608.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_609.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_609.png new file mode 100644 index 000000000..c732991c7 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_609.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_610.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_610.png new file mode 100644 index 000000000..9c6cb23ab Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_610.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_611.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_611.png new file mode 100644 index 000000000..e4acc4577 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_611.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_612.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_612.png new file mode 100644 index 000000000..5a971d890 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_612.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_613.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_613.png new file mode 100644 index 000000000..e64baea1e Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_613.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_614.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_614.png new file mode 100644 index 000000000..24838049c Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_614.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_616.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_616.png new file mode 100644 index 000000000..a73149b52 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_616.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_617.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_617.png new file mode 100644 index 000000000..90b8e3d0d Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_617.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_618-1.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_618-1.png new file mode 100644 index 000000000..eabcf9901 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_618-1.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_618.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_618.png new file mode 100644 index 000000000..37805432a Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_618.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_622.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_622.png new file mode 100644 index 000000000..0c4f2f874 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_622.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_623.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_623.png new file mode 100644 index 000000000..ff9bcc4d0 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_623.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_624.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_624.png new file mode 100644 index 000000000..08579d44b Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_624.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_625.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_625.png new file mode 100644 index 000000000..fa8e5fb83 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_625.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_627.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_627.png new file mode 100644 index 000000000..620a2c39f Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_627.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_628.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_628.png new file mode 100644 index 000000000..c0850b841 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_628.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_629.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_629.png new file mode 100644 index 000000000..83768a9cc Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_629.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_630.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_630.png new file mode 100644 index 000000000..b6d5bccdb Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_630.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_631.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_631.png new file mode 100644 index 000000000..81c242d62 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_631.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_632.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_632.png new file mode 100644 index 000000000..5c4e1de8e Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_632.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_633.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_633.png new file mode 100644 index 000000000..c78f4bb63 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_633.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_634.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_634.png new file mode 100644 index 000000000..b9e9ade53 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_634.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_635.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_635.png new file mode 100644 index 000000000..94298863c Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_635.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_638.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_638.png new file mode 100644 index 000000000..2eef4533b Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_638.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_639.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_639.png new file mode 100644 index 000000000..391801dea Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_639.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_640.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_640.png new file mode 100644 index 000000000..54bfd77ec Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_640.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_643.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_643.png new file mode 100644 index 000000000..3149bff9b Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_643.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_644.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_644.png new file mode 100644 index 000000000..873d7ee5a Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_644.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_646-1.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_646-1.png new file mode 100644 index 000000000..c6bcfcf0e Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_646-1.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_646-2.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_646-2.png new file mode 100644 index 000000000..9e6165a07 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_646-2.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_646.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_646.png new file mode 100644 index 000000000..0da837148 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_646.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_647-1.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_647-1.png new file mode 100644 index 000000000..07ccbd5f6 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_647-1.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_647.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_647.png new file mode 100644 index 000000000..153169a0d Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_647.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_659.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_659.png new file mode 100644 index 000000000..e5e9c2c35 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_659.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_66.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_66.png new file mode 100644 index 000000000..df5be3fc4 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_66.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_660.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_660.png new file mode 100644 index 000000000..4d6fc2263 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_660.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_67.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_67.png new file mode 100644 index 000000000..21721f7e5 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_67.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_674.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_674.png new file mode 100644 index 000000000..705d86ac0 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_674.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_675.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_675.png new file mode 100644 index 000000000..ad86bfe49 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_675.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_677.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_677.png new file mode 100644 index 000000000..c61c68dfd Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_677.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_678-1.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_678-1.png new file mode 100644 index 000000000..826b5018d Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_678-1.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_678.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_678.png new file mode 100644 index 000000000..a1ea09cec Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_678.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_679.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_679.png new file mode 100644 index 000000000..e988889dd Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_679.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_68.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_68.png new file mode 100644 index 000000000..72640e971 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_68.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_680.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_680.png new file mode 100644 index 000000000..d3a3b8a6d Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_680.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_681-1.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_681-1.png new file mode 100644 index 000000000..8d9f93a26 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_681-1.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_681.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_681.png new file mode 100644 index 000000000..75da19a30 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_681.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_682.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_682.png new file mode 100644 index 000000000..dafb97745 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_682.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_683.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_683.png new file mode 100644 index 000000000..1c80b056d Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_683.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_684.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_684.png new file mode 100644 index 000000000..37909c6bd Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_684.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_685.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_685.png new file mode 100644 index 000000000..f4ba0227b Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_685.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_686.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_686.png new file mode 100644 index 000000000..9a2dffd22 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_686.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_687.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_687.png new file mode 100644 index 000000000..8d14929a5 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_687.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_688.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_688.png new file mode 100644 index 000000000..1885447ba Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_688.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_689.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_689.png new file mode 100644 index 000000000..7b2ca26df Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_689.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_694.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_694.png new file mode 100644 index 000000000..5b2b284fa Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_694.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_695.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_695.png new file mode 100644 index 000000000..ed66145e6 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_695.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_7.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_7.png new file mode 100644 index 000000000..31b42d0e0 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_7.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_700.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_700.png new file mode 100644 index 000000000..557bc33f6 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_700.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_701.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_701.png new file mode 100644 index 000000000..28fd63a34 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_701.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_704.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_704.png new file mode 100644 index 000000000..99127afbd Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_704.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_705.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_705.png new file mode 100644 index 000000000..55d8448ca Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_705.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_706.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_706.png new file mode 100644 index 000000000..7844349a4 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_706.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_708.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_708.png new file mode 100644 index 000000000..e4a69b812 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_708.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_709.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_709.png new file mode 100644 index 000000000..4bd76ad65 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_709.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_710-1.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_710-1.png new file mode 100644 index 000000000..4c2a4767b Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_710-1.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_710-2.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_710-2.png new file mode 100644 index 000000000..4c2a4767b Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_710-2.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_710-3.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_710-3.png new file mode 100644 index 000000000..4c2a4767b Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_710-3.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_710.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_710.png new file mode 100644 index 000000000..4c2a4767b Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_710.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_711-1.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_711-1.png new file mode 100644 index 000000000..ac333d581 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_711-1.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_711-2.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_711-2.png new file mode 100644 index 000000000..ac333d581 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_711-2.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_711-3.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_711-3.png new file mode 100644 index 000000000..ac333d581 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_711-3.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_711.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_711.png new file mode 100644 index 000000000..ac333d581 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_711.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_712.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_712.png new file mode 100644 index 000000000..7805030e8 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_712.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_713.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_713.png new file mode 100644 index 000000000..9823a8f5c Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_713.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_714.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_714.png new file mode 100644 index 000000000..d6390252f Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_714.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_715.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_715.png new file mode 100644 index 000000000..a9fb48461 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_715.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_722.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_722.png new file mode 100644 index 000000000..67219eb90 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_722.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_723.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_723.png new file mode 100644 index 000000000..f61194272 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_723.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_724.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_724.png new file mode 100644 index 000000000..de9fb4104 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_724.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_725.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_725.png new file mode 100644 index 000000000..8531479a9 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_725.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_726.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_726.png new file mode 100644 index 000000000..3879d5054 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_726.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_727.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_727.png new file mode 100644 index 000000000..5b88b1254 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_727.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_728.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_728.png new file mode 100644 index 000000000..42672d5cf Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_728.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_729.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_729.png new file mode 100644 index 000000000..ff1d378fa Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_729.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_730.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_730.png new file mode 100644 index 000000000..24a763004 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_730.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_736.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_736.png new file mode 100644 index 000000000..2fe4fd0d4 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_736.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_737.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_737.png new file mode 100644 index 000000000..cdfc8e9a4 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_737.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_738.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_738.png new file mode 100644 index 000000000..3fd246c7b Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_738.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_742.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_742.png new file mode 100644 index 000000000..4aecd756d Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_742.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_743.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_743.png new file mode 100644 index 000000000..befa74733 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_743.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_746-1.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_746-1.png new file mode 100644 index 000000000..12719a84d Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_746-1.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_746.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_746.png new file mode 100644 index 000000000..f9fd20249 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_746.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_747.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_747.png new file mode 100644 index 000000000..7c9bab211 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_747.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_748.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_748.png new file mode 100644 index 000000000..57eef10c0 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_748.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_749.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_749.png new file mode 100644 index 000000000..f52ca51cc Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_749.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_750.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_750.png new file mode 100644 index 000000000..225260b6d Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_750.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_751.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_751.png new file mode 100644 index 000000000..d04c825b0 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_751.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_752.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_752.png new file mode 100644 index 000000000..0231ab8c7 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_752.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_755.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_755.png new file mode 100644 index 000000000..153b2f788 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_755.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_756.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_756.png new file mode 100644 index 000000000..e6ca3094a Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_756.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_757.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_757.png new file mode 100644 index 000000000..295053732 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_757.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_758.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_758.png new file mode 100644 index 000000000..6b25964c2 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_758.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_759.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_759.png new file mode 100644 index 000000000..88b48862b Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_759.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_760.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_760.png new file mode 100644 index 000000000..d7edeb66c Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_760.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_761.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_761.png new file mode 100644 index 000000000..966309954 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_761.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_762.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_762.png new file mode 100644 index 000000000..a8cfafab4 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_762.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_763.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_763.png new file mode 100644 index 000000000..6fab7da4c Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_763.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_765.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_765.png new file mode 100644 index 000000000..a2ca70b55 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_765.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_766.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_766.png new file mode 100644 index 000000000..139554d48 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_766.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_767.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_767.png new file mode 100644 index 000000000..9e1fe59b3 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_767.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_768.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_768.png new file mode 100644 index 000000000..013db65cb Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_768.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_77-1.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_77-1.png new file mode 100644 index 000000000..1925f1e39 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_77-1.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_77.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_77.png new file mode 100644 index 000000000..2a66bf323 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_77.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_771.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_771.png new file mode 100644 index 000000000..11a293011 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_771.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_772.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_772.png new file mode 100644 index 000000000..d7eb57ad7 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_772.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_773-1.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_773-1.png new file mode 100644 index 000000000..ab3e84fe3 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_773-1.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_773-10.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_773-10.png new file mode 100644 index 000000000..ab3e84fe3 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_773-10.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_773-11.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_773-11.png new file mode 100644 index 000000000..ab3e84fe3 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_773-11.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_773-12.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_773-12.png new file mode 100644 index 000000000..ab3e84fe3 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_773-12.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_773-13.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_773-13.png new file mode 100644 index 000000000..ab3e84fe3 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_773-13.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_773-14.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_773-14.png new file mode 100644 index 000000000..ab3e84fe3 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_773-14.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_773-15.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_773-15.png new file mode 100644 index 000000000..ab3e84fe3 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_773-15.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_773-16.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_773-16.png new file mode 100644 index 000000000..ab3e84fe3 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_773-16.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_773-17.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_773-17.png new file mode 100644 index 000000000..ab3e84fe3 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_773-17.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_773-2.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_773-2.png new file mode 100644 index 000000000..ab3e84fe3 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_773-2.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_773-3.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_773-3.png new file mode 100644 index 000000000..ab3e84fe3 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_773-3.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_773-4.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_773-4.png new file mode 100644 index 000000000..ab3e84fe3 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_773-4.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_773-5.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_773-5.png new file mode 100644 index 000000000..ab3e84fe3 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_773-5.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_773-6.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_773-6.png new file mode 100644 index 000000000..ab3e84fe3 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_773-6.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_773-7.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_773-7.png new file mode 100644 index 000000000..ab3e84fe3 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_773-7.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_773-8.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_773-8.png new file mode 100644 index 000000000..ab3e84fe3 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_773-8.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_773-9.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_773-9.png new file mode 100644 index 000000000..ab3e84fe3 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_773-9.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_773.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_773.png new file mode 100644 index 000000000..ab3e84fe3 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_773.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_776.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_776.png new file mode 100644 index 000000000..a96d53a22 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_776.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_777.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_777.png new file mode 100644 index 000000000..5c13a8ae7 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_777.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_778-1.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_778-1.png new file mode 100644 index 000000000..ea28244ec Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_778-1.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_778.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_778.png new file mode 100644 index 000000000..ea28244ec Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_778.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_78-1.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_78-1.png new file mode 100644 index 000000000..4ba8512b5 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_78-1.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_78.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_78.png new file mode 100644 index 000000000..8dd03fc35 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_78.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_780.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_780.png new file mode 100644 index 000000000..37e2d6dbe Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_780.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_781.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_781.png new file mode 100644 index 000000000..397813c3c Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_781.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_782.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_782.png new file mode 100644 index 000000000..18a95123a Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_782.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_783.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_783.png new file mode 100644 index 000000000..d39a806c5 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_783.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_784.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_784.png new file mode 100644 index 000000000..9483e725b Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_784.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_789.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_789.png new file mode 100644 index 000000000..d343dec7d Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_789.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_790.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_790.png new file mode 100644 index 000000000..2586eb3dc Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_790.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_791.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_791.png new file mode 100644 index 000000000..205c7e6eb Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_791.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_792.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_792.png new file mode 100644 index 000000000..82c78c607 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_792.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_8.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_8.png new file mode 100644 index 000000000..69d95b09f Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_8.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_800-1.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_800-1.png new file mode 100644 index 000000000..29c9476bc Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_800-1.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_800-2.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_800-2.png new file mode 100644 index 000000000..4fc29782c Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_800-2.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_800.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_800.png new file mode 100644 index 000000000..898e0e5a9 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_800.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_802.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_802.png new file mode 100644 index 000000000..484a46813 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_802.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_807.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_807.png new file mode 100644 index 000000000..23f227d8f Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_807.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_808.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_808.png new file mode 100644 index 000000000..da2df2d1d Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_808.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_809.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_809.png new file mode 100644 index 000000000..2207165c1 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_809.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_810.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_810.png new file mode 100644 index 000000000..881d03031 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_810.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_811.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_811.png new file mode 100644 index 000000000..adf8313cb Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_811.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_812.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_812.png new file mode 100644 index 000000000..2dceef125 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_812.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_813.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_813.png new file mode 100644 index 000000000..206ad1ff0 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_813.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_814.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_814.png new file mode 100644 index 000000000..6a56608d1 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_814.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_815.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_815.png new file mode 100644 index 000000000..a57c9c34d Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_815.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_816.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_816.png new file mode 100644 index 000000000..bba404303 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_816.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_817.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_817.png new file mode 100644 index 000000000..85b4996e1 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_817.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_818.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_818.png new file mode 100644 index 000000000..9c7d7e4ef Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_818.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_819.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_819.png new file mode 100644 index 000000000..628066d9f Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_819.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_820.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_820.png new file mode 100644 index 000000000..ffde2eb2e Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_820.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_821.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_821.png new file mode 100644 index 000000000..18a31c6e7 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_821.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_822.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_822.png new file mode 100644 index 000000000..ce2d3b46c Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_822.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_823.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_823.png new file mode 100644 index 000000000..7c3549e54 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_823.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_824.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_824.png new file mode 100644 index 000000000..8668a46e3 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_824.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_825.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_825.png new file mode 100644 index 000000000..e5795dc51 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_825.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_826.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_826.png new file mode 100644 index 000000000..e36d27910 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_826.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_827.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_827.png new file mode 100644 index 000000000..3ce4bda5c Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_827.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_828.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_828.png new file mode 100644 index 000000000..185710277 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_828.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_829.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_829.png new file mode 100644 index 000000000..dc0beb21b Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_829.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_83-1.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_83-1.png new file mode 100644 index 000000000..09d9c8f8b Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_83-1.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_83.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_83.png new file mode 100644 index 000000000..d3f335c34 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_83.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_830.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_830.png new file mode 100644 index 000000000..e92706dee Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_830.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_831.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_831.png new file mode 100644 index 000000000..5d45d9ed3 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_831.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_832.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_832.png new file mode 100644 index 000000000..2a24bea87 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_832.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_833.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_833.png new file mode 100644 index 000000000..ab8febfb3 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_833.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_834.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_834.png new file mode 100644 index 000000000..225b6a779 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_834.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_835.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_835.png new file mode 100644 index 000000000..698da87bc Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_835.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_836.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_836.png new file mode 100644 index 000000000..e1c9615a0 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_836.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_837.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_837.png new file mode 100644 index 000000000..848bb30a7 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_837.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_838.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_838.png new file mode 100644 index 000000000..c246aeb0c Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_838.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_839.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_839.png new file mode 100644 index 000000000..ae93281fb Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_839.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_840.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_840.png new file mode 100644 index 000000000..6858fcf05 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_840.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_841.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_841.png new file mode 100644 index 000000000..0a307efdb Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_841.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_842.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_842.png new file mode 100644 index 000000000..c840ee497 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_842.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_843.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_843.png new file mode 100644 index 000000000..54e9cb86c Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_843.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_844.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_844.png new file mode 100644 index 000000000..b95e8d477 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_844.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_845-1.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_845-1.png new file mode 100644 index 000000000..2da63369d Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_845-1.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_845-2.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_845-2.png new file mode 100644 index 000000000..54b809b39 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_845-2.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_845.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_845.png new file mode 100644 index 000000000..04ea24954 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_845.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_846.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_846.png new file mode 100644 index 000000000..0cafaecb9 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_846.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_847.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_847.png new file mode 100644 index 000000000..69de9ae8c Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_847.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_848.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_848.png new file mode 100644 index 000000000..c9ed9bba9 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_848.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_849-1.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_849-1.png new file mode 100644 index 000000000..2fb1ef2ea Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_849-1.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_849.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_849.png new file mode 100644 index 000000000..06b924de5 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_849.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_850.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_850.png new file mode 100644 index 000000000..af782fc52 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_850.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_851.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_851.png new file mode 100644 index 000000000..5d50e3baf Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_851.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_852.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_852.png new file mode 100644 index 000000000..50f965b34 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_852.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_853.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_853.png new file mode 100644 index 000000000..d440f24ba Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_853.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_854-1.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_854-1.png new file mode 100644 index 000000000..04cb70e8a Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_854-1.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_854.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_854.png new file mode 100644 index 000000000..04cb70e8a Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_854.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_855-1.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_855-1.png new file mode 100644 index 000000000..543eeab32 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_855-1.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_855.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_855.png new file mode 100644 index 000000000..543eeab32 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_855.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_856.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_856.png new file mode 100644 index 000000000..429578b91 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_856.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_857.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_857.png new file mode 100644 index 000000000..de65d32a9 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_857.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_858.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_858.png new file mode 100644 index 000000000..e540bb762 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_858.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_859.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_859.png new file mode 100644 index 000000000..3925ac4e1 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_859.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_860.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_860.png new file mode 100644 index 000000000..84c69120f Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_860.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_861.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_861.png new file mode 100644 index 000000000..2302698fc Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_861.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_862.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_862.png new file mode 100644 index 000000000..8a4b7b7ef Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_862.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_863.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_863.png new file mode 100644 index 000000000..98f7e39e7 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_863.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_864.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_864.png new file mode 100644 index 000000000..ce293619a Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_864.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_865.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_865.png new file mode 100644 index 000000000..b338acad6 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_865.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_866.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_866.png new file mode 100644 index 000000000..ee5619e7c Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_866.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_867.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_867.png new file mode 100644 index 000000000..e2634738d Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_867.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_868.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_868.png new file mode 100644 index 000000000..08596da23 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_868.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_869-1.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_869-1.png new file mode 100644 index 000000000..64ea9b39f Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_869-1.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_869-2.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_869-2.png new file mode 100644 index 000000000..8d7acb0dc Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_869-2.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_869-3.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_869-3.png new file mode 100644 index 000000000..923b7ce7e Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_869-3.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_869-4.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_869-4.png new file mode 100644 index 000000000..5966136e2 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_869-4.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_869-5.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_869-5.png new file mode 100644 index 000000000..018d400a4 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_869-5.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_869-6.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_869-6.png new file mode 100644 index 000000000..2a81e9a93 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_869-6.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_869-7.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_869-7.png new file mode 100644 index 000000000..6a81ec9fc Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_869-7.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_869-8.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_869-8.png new file mode 100644 index 000000000..c0913fc0a Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_869-8.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_869.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_869.png new file mode 100644 index 000000000..5da9cda83 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_869.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_870.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_870.png new file mode 100644 index 000000000..252ef8959 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_870.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_871.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_871.png new file mode 100644 index 000000000..90ec86121 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_871.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_872.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_872.png new file mode 100644 index 000000000..70f08e494 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_872.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_873.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_873.png new file mode 100644 index 000000000..4fdc98376 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_873.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_874.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_874.png new file mode 100644 index 000000000..8120481bc Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_874.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_875-1.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_875-1.png new file mode 100644 index 000000000..35d68bad4 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_875-1.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_875.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_875.png new file mode 100644 index 000000000..094b39681 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_875.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_876-1.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_876-1.png new file mode 100644 index 000000000..665407842 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_876-1.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_876.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_876.png new file mode 100644 index 000000000..cb6145be7 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_876.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_877-1.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_877-1.png new file mode 100644 index 000000000..1f0b2f415 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_877-1.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_877.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_877.png new file mode 100644 index 000000000..f77873a50 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_877.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_878.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_878.png new file mode 100644 index 000000000..0bca3fa02 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_878.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_879.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_879.png new file mode 100644 index 000000000..1627eecfe Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_879.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_880.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_880.png new file mode 100644 index 000000000..9cd3e9927 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_880.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_881.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_881.png new file mode 100644 index 000000000..afee959e2 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_881.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_882.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_882.png new file mode 100644 index 000000000..88b9c94db Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_882.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_883.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_883.png new file mode 100644 index 000000000..7c6f13b21 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_883.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_884.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_884.png new file mode 100644 index 000000000..2edeed549 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_884.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_885.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_885.png new file mode 100644 index 000000000..a1fb57498 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_885.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_886.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_886.png new file mode 100644 index 000000000..7e060d33d Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_886.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_887.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_887.png new file mode 100644 index 000000000..b489ca146 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_887.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_888-1.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_888-1.png new file mode 100644 index 000000000..5c33336aa Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_888-1.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_888.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_888.png new file mode 100644 index 000000000..61de5a051 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_888.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_889-1.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_889-1.png new file mode 100644 index 000000000..277e7ca8a Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_889-1.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_889.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_889.png new file mode 100644 index 000000000..dfe4cc5a2 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_889.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_890.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_890.png new file mode 100644 index 000000000..05a77eae0 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_890.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_9.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_9.png new file mode 100644 index 000000000..395534a85 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_9.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_90.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_90.png new file mode 100644 index 000000000..c419c90b7 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_90.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_91.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_91.png new file mode 100644 index 000000000..ecf35d227 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_91.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_92.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_92.png new file mode 100644 index 000000000..6f1731ae6 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_92.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_93.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_93.png new file mode 100644 index 000000000..e1149b703 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_93.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_94.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_94.png new file mode 100644 index 000000000..67fe4e51d Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_94.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_95.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_95.png new file mode 100644 index 000000000..1d2564453 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_95.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_98.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_98.png new file mode 100644 index 000000000..fe89d3f41 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_98.png differ diff --git a/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_99.png b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_99.png new file mode 100644 index 000000000..d3859b266 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Big Pokemon Sprites/b_99.png differ diff --git a/PKHeX.Drawing/Resources/img/Pokemon Sprite Overlays/dyna.png b/PKHeX.Drawing/Resources/img/Pokemon Sprite Overlays/dyna.png new file mode 100644 index 000000000..dc3e9fd4a Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Pokemon Sprite Overlays/dyna.png differ diff --git a/PKHeX.Drawing/Resources/img/Pokemon Sprites/450f.png b/PKHeX.Drawing/Resources/img/Pokemon Sprites/450f.png new file mode 100644 index 000000000..78863c7bc Binary files /dev/null and b/PKHeX.Drawing/Resources/img/Pokemon Sprites/450f.png differ diff --git a/PKHeX.Drawing/Resources/img/Pokemon Sprites/521_1.png b/PKHeX.Drawing/Resources/img/Pokemon Sprites/521f.png similarity index 100% rename from PKHeX.Drawing/Resources/img/Pokemon Sprites/521_1.png rename to PKHeX.Drawing/Resources/img/Pokemon Sprites/521f.png diff --git a/PKHeX.Drawing/Resources/img/Pokemon Sprites/592-1.png b/PKHeX.Drawing/Resources/img/Pokemon Sprites/592f.png similarity index 100% rename from PKHeX.Drawing/Resources/img/Pokemon Sprites/592-1.png rename to PKHeX.Drawing/Resources/img/Pokemon Sprites/592f.png diff --git a/PKHeX.Drawing/Resources/img/Pokemon Sprites/593-1.png b/PKHeX.Drawing/Resources/img/Pokemon Sprites/593f.png similarity index 100% rename from PKHeX.Drawing/Resources/img/Pokemon Sprites/593-1.png rename to PKHeX.Drawing/Resources/img/Pokemon Sprites/593f.png diff --git a/PKHeX.Drawing/Resources/img/Pokemon Sprites/668_1.png b/PKHeX.Drawing/Resources/img/Pokemon Sprites/668f.png similarity index 100% rename from PKHeX.Drawing/Resources/img/Pokemon Sprites/668_1.png rename to PKHeX.Drawing/Resources/img/Pokemon Sprites/668f.png diff --git a/PKHeX.Drawing/Resources/img/Shiny Pokemon Sprites/450-1s.png b/PKHeX.Drawing/Resources/img/Shiny Pokemon Sprites/450fs.png similarity index 100% rename from PKHeX.Drawing/Resources/img/Shiny Pokemon Sprites/450-1s.png rename to PKHeX.Drawing/Resources/img/Shiny Pokemon Sprites/450fs.png diff --git a/PKHeX.Drawing/Resources/img/Shiny Pokemon Sprites/521_1s.png b/PKHeX.Drawing/Resources/img/Shiny Pokemon Sprites/521_1s.png deleted file mode 100644 index 0cea07d5d..000000000 Binary files a/PKHeX.Drawing/Resources/img/Shiny Pokemon Sprites/521_1s.png and /dev/null differ diff --git a/PKHeX.Drawing/Resources/img/Shiny Pokemon Sprites/521-1s.png b/PKHeX.Drawing/Resources/img/Shiny Pokemon Sprites/521fs.png similarity index 100% rename from PKHeX.Drawing/Resources/img/Shiny Pokemon Sprites/521-1s.png rename to PKHeX.Drawing/Resources/img/Shiny Pokemon Sprites/521fs.png diff --git a/PKHeX.Drawing/Resources/img/Shiny Pokemon Sprites/592-1s.png b/PKHeX.Drawing/Resources/img/Shiny Pokemon Sprites/592fs.png similarity index 100% rename from PKHeX.Drawing/Resources/img/Shiny Pokemon Sprites/592-1s.png rename to PKHeX.Drawing/Resources/img/Shiny Pokemon Sprites/592fs.png diff --git a/PKHeX.Drawing/Resources/img/Shiny Pokemon Sprites/593-1s.png b/PKHeX.Drawing/Resources/img/Shiny Pokemon Sprites/593fs.png similarity index 100% rename from PKHeX.Drawing/Resources/img/Shiny Pokemon Sprites/593-1s.png rename to PKHeX.Drawing/Resources/img/Shiny Pokemon Sprites/593fs.png diff --git a/PKHeX.Drawing/Resources/img/Shiny Pokemon Sprites/668-1s.png b/PKHeX.Drawing/Resources/img/Shiny Pokemon Sprites/668fs.png similarity index 100% rename from PKHeX.Drawing/Resources/img/Shiny Pokemon Sprites/668-1s.png rename to PKHeX.Drawing/Resources/img/Shiny Pokemon Sprites/668fs.png diff --git a/PKHeX.WinForms/Resources/img/Slots/slotDel.png b/PKHeX.Drawing/Resources/img/accents/slotDel.png similarity index 100% rename from PKHeX.WinForms/Resources/img/Slots/slotDel.png rename to PKHeX.Drawing/Resources/img/accents/slotDel.png diff --git a/PKHeX.Drawing/Resources/img/accents/slotDel68.png b/PKHeX.Drawing/Resources/img/accents/slotDel68.png new file mode 100644 index 000000000..dc40a8ef3 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/accents/slotDel68.png differ diff --git a/PKHeX.WinForms/Resources/img/Slots/slotDrag.png b/PKHeX.Drawing/Resources/img/accents/slotDrag.png similarity index 100% rename from PKHeX.WinForms/Resources/img/Slots/slotDrag.png rename to PKHeX.Drawing/Resources/img/accents/slotDrag.png diff --git a/PKHeX.Drawing/Resources/img/accents/slotDrag68.png b/PKHeX.Drawing/Resources/img/accents/slotDrag68.png new file mode 100644 index 000000000..ba007b20a Binary files /dev/null and b/PKHeX.Drawing/Resources/img/accents/slotDrag68.png differ diff --git a/PKHeX.WinForms/Resources/img/Slots/slotHover.png b/PKHeX.Drawing/Resources/img/accents/slotHover.png similarity index 100% rename from PKHeX.WinForms/Resources/img/Slots/slotHover.png rename to PKHeX.Drawing/Resources/img/accents/slotHover.png diff --git a/PKHeX.Drawing/Resources/img/accents/slotHover68.png b/PKHeX.Drawing/Resources/img/accents/slotHover68.png new file mode 100644 index 000000000..842cceaa0 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/accents/slotHover68.png differ diff --git a/PKHeX.WinForms/Resources/img/Slots/slotSet.png b/PKHeX.Drawing/Resources/img/accents/slotSet.png similarity index 100% rename from PKHeX.WinForms/Resources/img/Slots/slotSet.png rename to PKHeX.Drawing/Resources/img/accents/slotSet.png diff --git a/PKHeX.Drawing/Resources/img/accents/slotSet68.png b/PKHeX.Drawing/Resources/img/accents/slotSet68.png new file mode 100644 index 000000000..5c5f581a0 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/accents/slotSet68.png differ diff --git a/PKHeX.WinForms/Resources/img/Slots/slotTrans.png b/PKHeX.Drawing/Resources/img/accents/slotTrans.png similarity index 100% rename from PKHeX.WinForms/Resources/img/Slots/slotTrans.png rename to PKHeX.Drawing/Resources/img/accents/slotTrans.png diff --git a/PKHeX.Drawing/Resources/img/accents/slotTrans68.png b/PKHeX.Drawing/Resources/img/accents/slotTrans68.png new file mode 100644 index 000000000..178104630 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/accents/slotTrans68.png differ diff --git a/PKHeX.WinForms/Resources/img/Slots/slotView.png b/PKHeX.Drawing/Resources/img/accents/slotView.png similarity index 100% rename from PKHeX.WinForms/Resources/img/Slots/slotView.png rename to PKHeX.Drawing/Resources/img/accents/slotView.png diff --git a/PKHeX.Drawing/Resources/img/accents/slotView68.png b/PKHeX.Drawing/Resources/img/accents/slotView68.png new file mode 100644 index 000000000..98d5c2ed0 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/accents/slotView68.png differ diff --git a/PKHeX.Drawing/Resources/img/ribbons/ribbonchampiongalar.png b/PKHeX.Drawing/Resources/img/ribbons/ribbonchampiongalar.png new file mode 100644 index 000000000..29fc279fe Binary files /dev/null and b/PKHeX.Drawing/Resources/img/ribbons/ribbonchampiongalar.png differ diff --git a/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkabsentminded.png b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkabsentminded.png new file mode 100644 index 000000000..6b171902c Binary files /dev/null and b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkabsentminded.png differ diff --git a/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkangry.png b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkangry.png new file mode 100644 index 000000000..4222ea34f Binary files /dev/null and b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkangry.png differ diff --git a/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkblizzard.png b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkblizzard.png new file mode 100644 index 000000000..a2a4efb7c Binary files /dev/null and b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkblizzard.png differ diff --git a/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkcalmness.png b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkcalmness.png new file mode 100644 index 000000000..6127bb176 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkcalmness.png differ diff --git a/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkcharismatic.png b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkcharismatic.png new file mode 100644 index 000000000..402b89dbc Binary files /dev/null and b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkcharismatic.png differ diff --git a/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkcloudy.png b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkcloudy.png new file mode 100644 index 000000000..25e665bea Binary files /dev/null and b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkcloudy.png differ diff --git a/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkcrafty.png b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkcrafty.png new file mode 100644 index 000000000..d7b028b02 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkcrafty.png differ diff --git a/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkcurry.png b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkcurry.png new file mode 100644 index 000000000..98741cec7 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkcurry.png differ diff --git a/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkdawn.png b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkdawn.png new file mode 100644 index 000000000..aef44f00b Binary files /dev/null and b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkdawn.png differ diff --git a/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkdestiny.png b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkdestiny.png new file mode 100644 index 000000000..962585c76 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkdestiny.png differ diff --git a/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkdry.png b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkdry.png new file mode 100644 index 000000000..9ac0e08e3 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkdry.png differ diff --git a/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkdusk.png b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkdusk.png new file mode 100644 index 000000000..1464fc34c Binary files /dev/null and b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkdusk.png differ diff --git a/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkexcited.png b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkexcited.png new file mode 100644 index 000000000..5c661c201 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkexcited.png differ diff --git a/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkferocious.png b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkferocious.png new file mode 100644 index 000000000..c43183864 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkferocious.png differ diff --git a/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkfishing.png b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkfishing.png new file mode 100644 index 000000000..da0868471 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkfishing.png differ diff --git a/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkflustered.png b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkflustered.png new file mode 100644 index 000000000..d0fed9c07 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkflustered.png differ diff --git a/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkhumble.png b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkhumble.png new file mode 100644 index 000000000..4616b23d9 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkhumble.png differ diff --git a/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkintellectual.png b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkintellectual.png new file mode 100644 index 000000000..de35a3a0b Binary files /dev/null and b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkintellectual.png differ diff --git a/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkintense.png b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkintense.png new file mode 100644 index 000000000..7d576ef35 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkintense.png differ diff --git a/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkjittery.png b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkjittery.png new file mode 100644 index 000000000..970e0e8a2 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkjittery.png differ diff --git a/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkjoyful.png b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkjoyful.png new file mode 100644 index 000000000..b01b46b31 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkjoyful.png differ diff --git a/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkkindly.png b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkkindly.png new file mode 100644 index 000000000..a5d249441 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkkindly.png differ diff --git a/PKHeX.Drawing/Resources/img/ribbons/ribbonmarklunchtime.png b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarklunchtime.png new file mode 100644 index 000000000..0aaf4b62a Binary files /dev/null and b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarklunchtime.png differ diff --git a/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkmisty.png b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkmisty.png new file mode 100644 index 000000000..2573df3e6 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkmisty.png differ diff --git a/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkpeeved.png b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkpeeved.png new file mode 100644 index 000000000..c10824ecf Binary files /dev/null and b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkpeeved.png differ diff --git a/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkprideful.png b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkprideful.png new file mode 100644 index 000000000..2e7ae7453 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkprideful.png differ diff --git a/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkpumpedup.png b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkpumpedup.png new file mode 100644 index 000000000..d25c9b52b Binary files /dev/null and b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkpumpedup.png differ diff --git a/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkrainy.png b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkrainy.png new file mode 100644 index 000000000..4f1e8e8df Binary files /dev/null and b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkrainy.png differ diff --git a/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkrare.png b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkrare.png new file mode 100644 index 000000000..1f833b8c9 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkrare.png differ diff --git a/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkrowdy.png b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkrowdy.png new file mode 100644 index 000000000..1c6636cec Binary files /dev/null and b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkrowdy.png differ diff --git a/PKHeX.Drawing/Resources/img/ribbons/ribbonmarksandstorm.png b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarksandstorm.png new file mode 100644 index 000000000..6d2d2f241 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarksandstorm.png differ diff --git a/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkscowling.png b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkscowling.png new file mode 100644 index 000000000..e88dc05fa Binary files /dev/null and b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkscowling.png differ diff --git a/PKHeX.Drawing/Resources/img/ribbons/ribbonmarksleepytime.png b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarksleepytime.png new file mode 100644 index 000000000..0271139ad Binary files /dev/null and b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarksleepytime.png differ diff --git a/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkslump.png b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkslump.png new file mode 100644 index 000000000..d1c27c89e Binary files /dev/null and b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkslump.png differ diff --git a/PKHeX.Drawing/Resources/img/ribbons/ribbonmarksmiley.png b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarksmiley.png new file mode 100644 index 000000000..11057c260 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarksmiley.png differ diff --git a/PKHeX.Drawing/Resources/img/ribbons/ribbonmarksnowy.png b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarksnowy.png new file mode 100644 index 000000000..ca07115bf Binary files /dev/null and b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarksnowy.png differ diff --git a/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkstormy.png b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkstormy.png new file mode 100644 index 000000000..5bebb7b95 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkstormy.png differ diff --git a/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkteary.png b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkteary.png new file mode 100644 index 000000000..4c98559dd Binary files /dev/null and b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkteary.png differ diff --git a/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkthorny.png b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkthorny.png new file mode 100644 index 000000000..407069951 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkthorny.png differ diff --git a/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkuncommon.png b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkuncommon.png new file mode 100644 index 000000000..75042e7c3 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkuncommon.png differ diff --git a/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkunsure.png b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkunsure.png new file mode 100644 index 000000000..e3e4c0143 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkunsure.png differ diff --git a/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkupbeat.png b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkupbeat.png new file mode 100644 index 000000000..4256dbbb9 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkupbeat.png differ diff --git a/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkvigor.png b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkvigor.png new file mode 100644 index 000000000..f80d8a55f Binary files /dev/null and b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkvigor.png differ diff --git a/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkzeroenergy.png b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkzeroenergy.png new file mode 100644 index 000000000..c74fcc2f9 Binary files /dev/null and b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkzeroenergy.png differ diff --git a/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkzonedout.png b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkzonedout.png new file mode 100644 index 000000000..69a544f8b Binary files /dev/null and b/PKHeX.Drawing/Resources/img/ribbons/ribbonmarkzonedout.png differ diff --git a/PKHeX.Drawing/Resources/img/ribbons/ribbonmasterrank.png b/PKHeX.Drawing/Resources/img/ribbons/ribbonmasterrank.png new file mode 100644 index 000000000..ba1c3116f Binary files /dev/null and b/PKHeX.Drawing/Resources/img/ribbons/ribbonmasterrank.png differ diff --git a/PKHeX.Drawing/Resources/img/ribbons/ribbontowermaster.png b/PKHeX.Drawing/Resources/img/ribbons/ribbontowermaster.png new file mode 100644 index 000000000..b6f9103fc Binary files /dev/null and b/PKHeX.Drawing/Resources/img/ribbons/ribbontowermaster.png differ diff --git a/PKHeX.Drawing/Sprites/SpriteBuilder.cs b/PKHeX.Drawing/Sprites/SpriteBuilder.cs index 5beb8253f..7924cc8df 100644 --- a/PKHeX.Drawing/Sprites/SpriteBuilder.cs +++ b/PKHeX.Drawing/Sprites/SpriteBuilder.cs @@ -4,19 +4,36 @@ namespace PKHeX.Drawing { - public sealed class SpriteBuilder : ISpriteBuilder + public abstract class SpriteBuilder : ISpriteBuilder { public static bool ShowEggSpriteAsItem { get; set; } = true; - private const int ItemShiftX = 22; - private const int ItemShiftY = 15; - private const int ItemMaxSize = 15; - private const int EggItemShiftX = 9; - private const int EggItemShiftY = 2; + public abstract int Width { get; } + public abstract int Height { get; } + + protected abstract int ItemShiftX { get; } + protected abstract int ItemShiftY { get; } + protected abstract int ItemMaxSize { get; } + protected abstract int EggItemShiftX { get; } + protected abstract int EggItemShiftY { get; } + + public abstract Bitmap Hover { get; } + public abstract Bitmap View { get; } + public abstract Bitmap Set { get; } + public abstract Bitmap Delete { get; } + public abstract Bitmap Transparent { get; } + public abstract Bitmap Drag { get; } + private const double UnknownFormTransparency = 0.5; private const double ShinyTransparency = 0.7; private const double EggUnderLayerTransparency = 0.33; + protected virtual string GetSpriteStringSpeciesOnly(int species) => $"_{species}"; + protected virtual string GetSpriteAll(int species, int form, int gender, bool shiny, int generation) => SpriteName.GetResourceStringSprite(species, form, gender, generation, shiny); + protected virtual string GetItemResourceName(int item) => $"item_{item}"; + protected virtual Image Unknown => Resources.unknown; + protected virtual Image GetEggSprite(int species) => species == 490 ? Resources._490_e : Resources.egg; + public void Initialize(SaveFile sav) { if (sav.Generation != 3) @@ -56,14 +73,14 @@ public Image GetSprite(Image baseSprite, int species, int heldItem, bool isEgg, { if (isEgg) baseSprite = LayerOverImageEgg(baseSprite, species, heldItem != 0); - if (isShiny) - baseSprite = LayerOverImageShiny(baseSprite, isBoxBGRed); if (heldItem > 0) baseSprite = LayerOverImageItem(baseSprite, heldItem, generation); + if (isShiny) + baseSprite = LayerOverImageShiny(baseSprite, isBoxBGRed); return baseSprite; } - private static Image GetBaseImage(int species, int form, int gender, bool shiny, int generation) + private Image GetBaseImage(int species, int form, int gender, bool shiny, int generation) { var img = FormConverter.IsTotemForm(species, form) ? GetBaseImageTotem(species, form, gender, shiny, generation) @@ -71,7 +88,7 @@ private static Image GetBaseImage(int species, int form, int gender, bool shiny, return img ?? GetBaseImageFallback(species, form, gender, shiny, generation); } - private static Image? GetBaseImageTotem(int species, int form, int gender, bool shiny, int generation) + private Image? GetBaseImageTotem(int species, int form, int gender, bool shiny, int generation) { var baseform = FormConverter.GetTotemBaseForm(species, form); var baseImage = GetBaseImageDefault(species, baseform, gender, shiny, generation); @@ -80,13 +97,13 @@ private static Image GetBaseImage(int species, int form, int gender, bool shiny, return ImageUtil.ToGrayscale(baseImage); } - private static Image? GetBaseImageDefault(int species, int form, int gender, bool shiny, int generation) + private Image? GetBaseImageDefault(int species, int form, int gender, bool shiny, int generation) { - var file = SpriteName.GetResourceStringSprite(species, form, gender, generation, shiny); + var file = GetSpriteAll(species, form, gender, shiny, generation); return (Image?)Resources.ResourceManager.GetObject(file); } - private static Image GetBaseImageFallback(int species, int form, int gender, bool shiny, int generation) + private Image GetBaseImageFallback(int species, int form, int gender, bool shiny, int generation) { if (shiny) // try again without shiny { @@ -96,17 +113,19 @@ private static Image GetBaseImageFallback(int species, int form, int gender, boo } // try again without form - var baseImage = (Image?)Resources.ResourceManager.GetObject($"_{species}"); + var baseImage = (Image?)Resources.ResourceManager.GetObject(GetSpriteStringSpeciesOnly(species)); if (baseImage == null) // failed again - return Resources.unknown; - return ImageUtil.LayerImage(baseImage, Resources.unknown, 0, 0, UnknownFormTransparency); + return Unknown; + return ImageUtil.LayerImage(baseImage, Unknown, 0, 0, UnknownFormTransparency); } - private static Image LayerOverImageItem(Image baseImage, int item, int generation) + private Image LayerOverImageItem(Image baseImage, int item, int generation) { - Image itemimg = (Image?)Resources.ResourceManager.GetObject($"item_{item}") ?? Resources.helditem; - if (generation >= 2 && generation <= 4 && 328 <= item && item <= 419) // gen2/3/4 TM + Image itemimg = (Image?)Resources.ResourceManager.GetObject(GetItemResourceName(item)) ?? Resources.helditem; + if (2 <= generation && generation <= 4 && 328 <= item && item <= 419) // gen2/3/4 TM itemimg = Resources.item_tm; + else if (generation >= 8 && (1130 <= item && item <= 1229)) // Gen8 TR + itemimg = Resources.bitem_tr; // Redraw item in bottom right corner; since images are cropped, try to not have them at the edge int x = ItemShiftX + ((ItemMaxSize - itemimg.Width) / 2); @@ -123,16 +142,14 @@ private static Image LayerOverImageShiny(Image baseImage, bool isBoxBGRed) return ImageUtil.LayerImage(baseImage, rare, 0, 0, ShinyTransparency); } - private static Image LayerOverImageEgg(Image baseImage, int species, bool hasItem) + private Image LayerOverImageEgg(Image baseImage, int species, bool hasItem) { if (ShowEggSpriteAsItem && !hasItem) return LayerOverImageEggAsItem(baseImage, species); return LayerOverImageEggTransparentSpecies(baseImage, species); } - private static Image GetEggSprite(int species) => species == 490 ? Resources._490_e : Resources.egg; - - private static Image LayerOverImageEggTransparentSpecies(Image baseImage, int species) + private Image LayerOverImageEggTransparentSpecies(Image baseImage, int species) { // Partially transparent species. baseImage = ImageUtil.ChangeOpacity(baseImage, EggUnderLayerTransparency); @@ -141,10 +158,60 @@ private static Image LayerOverImageEggTransparentSpecies(Image baseImage, int sp return ImageUtil.LayerImage(baseImage, egg, 0, 0); } - private static Image LayerOverImageEggAsItem(Image baseImage, int species) + private Image LayerOverImageEggAsItem(Image baseImage, int species) { var egg = GetEggSprite(species); return ImageUtil.LayerImage(baseImage, egg, EggItemShiftX, EggItemShiftY); // similar to held item, since they can't have any } } + + /// + /// 30 high, 40 wide sprite builder + /// + public class SpriteBuilder3040 : SpriteBuilder + { + public override int Height => 30; + public override int Width => 40; + + protected override int ItemShiftX => 22; + protected override int ItemShiftY => 15; + protected override int ItemMaxSize => 15; + protected override int EggItemShiftX => 9; + protected override int EggItemShiftY => 2; + + public override Bitmap Hover => Resources.slotHover; + public override Bitmap View => Resources.slotView; + public override Bitmap Set => Resources.slotSet; + public override Bitmap Delete => Resources.slotDel; + public override Bitmap Transparent => Resources.slotTrans; + public override Bitmap Drag => Resources.slotDrag; + } + + /// + /// 56 high, 68 wide sprite builder + /// + public class SpriteBuilder5668 : SpriteBuilder + { + public override int Height => 56; + public override int Width => 68; + + protected override int ItemShiftX => 52; + protected override int ItemShiftY => 28; + protected override int ItemMaxSize => 32; + protected override int EggItemShiftX => 9; + protected override int EggItemShiftY => 2; + + protected override string GetSpriteStringSpeciesOnly(int species) => 'b' + $"_{species}"; + protected override string GetSpriteAll(int species, int form, int gender, bool shiny, int generation) => 'b' + SpriteName.GetResourceStringSprite(species, form, gender, generation, shiny); + protected override string GetItemResourceName(int item) => 'b' + $"item_{item}"; + protected override Image Unknown => Resources.b_0; + protected override Image GetEggSprite(int species) => Resources.egg; // no manaphy egg sprite (yet) + + public override Bitmap Hover => Resources.slotHover68; + public override Bitmap View => Resources.slotView68; + public override Bitmap Set => Resources.slotSet68; + public override Bitmap Delete => Resources.slotDel68; + public override Bitmap Transparent => Resources.slotTrans68; + public override Bitmap Drag => Resources.slotDrag68; + } } diff --git a/PKHeX.Drawing/Sprites/SpriteUtil.cs b/PKHeX.Drawing/Sprites/SpriteUtil.cs index 927164296..3acef0e9c 100644 --- a/PKHeX.Drawing/Sprites/SpriteUtil.cs +++ b/PKHeX.Drawing/Sprites/SpriteUtil.cs @@ -6,7 +6,9 @@ namespace PKHeX.Drawing { public static class SpriteUtil { - public static ISpriteBuilder Spriter { get; set; } = new SpriteBuilder(); + public static readonly SpriteBuilder3040 SB17 = new SpriteBuilder3040(); + public static readonly SpriteBuilder5668 SB8 = new SpriteBuilder5668(); + public static SpriteBuilder Spriter { get; set; } = SB17; public static Image GetBallSprite(int ball) { @@ -98,6 +100,11 @@ private static Image GetSprite(PKM pk, bool isBoxBGRed = false) var glowImg = ImageUtil.GetBitmap(pixels, baseSprite.Width, baseSprite.Height, baseSprite.PixelFormat); img = ImageUtil.LayerImage(glowImg, img, 0, 0); } + else if (pk is IGigantamax g && g.CanGigantamax) + { + var gm = Resources.dyna; + img = ImageUtil.LayerImage(img, gm, (img.Width - gm.Width) / 2, 0); + } return img; } @@ -151,12 +158,12 @@ private static Image GetSprite(PKM pk, SaveFile sav, int box, int slot, bool fla } private const int MaxSlotCount = 30; // slots in a box - private const int SpriteWidth = 40; - private const int SpriteHeight = 30; - private const int PartyMarkShiftX = SpriteWidth - 16; - private const int SlotLockShiftX = SpriteWidth - 14; - private const int SlotTeamShiftX = SpriteWidth - 19; - private const int FlagIllegalShiftY = SpriteHeight - 16; + private static int SpriteWidth => Spriter.Width; + private static int SpriteHeight => Spriter.Height; + private static int PartyMarkShiftX => SpriteWidth - 16; + private static int SlotLockShiftX => SpriteWidth - 14; + private static int SlotTeamShiftX => SpriteWidth - 19; + private static int FlagIllegalShiftY => SpriteHeight - 16; private static readonly Bitmap[] PartyMarks = { @@ -203,5 +210,8 @@ public static void GetSpriteGlow(Image baseSprite, byte blue, byte green, byte r public static Image Sprite(this PKM pk, SaveFile sav, int box, int slot, bool flagIllegal = false) => GetSprite(pk, sav, box, slot, flagIllegal); + + public static void Initialize(SaveFile sav) => Initialize(sav.Generation >= 7); + public static void Initialize(bool big) => Spriter = big ? (SpriteBuilder)SB8 : SB17; } } diff --git a/PKHeX.WinForms/Controls/PKM Editor/BallBrowser.cs b/PKHeX.WinForms/Controls/PKM Editor/BallBrowser.cs index bc2c4c3a6..b9b68db4a 100644 --- a/PKHeX.WinForms/Controls/PKM Editor/BallBrowser.cs +++ b/PKHeX.WinForms/Controls/PKM Editor/BallBrowser.cs @@ -5,7 +5,6 @@ using PKHeX.Core; using PKHeX.Drawing; -using PKHeX.WinForms.Properties; namespace PKHeX.WinForms { @@ -43,7 +42,7 @@ private PictureBox GetBallView(Ball b, ICollection legal, IReadOnlyList Text = names.First(z => z.Value == (int)b).Text; diff --git a/PKHeX.WinForms/Controls/PKM Editor/EditPK8.cs b/PKHeX.WinForms/Controls/PKM Editor/EditPK8.cs index 0b396f27f..52860b06e 100644 --- a/PKHeX.WinForms/Controls/PKM Editor/EditPK8.cs +++ b/PKHeX.WinForms/Controls/PKM Editor/EditPK8.cs @@ -16,6 +16,7 @@ private void PopulateFieldsPK8() LoadMisc4(pk8); LoadMisc6(pk8); SizeCP.LoadPKM(pk8); + LoadMisc8(pk8); LoadPartyStats(pk8); UpdateStats(); @@ -32,6 +33,7 @@ private PK8 PreparePK8() SaveMisc3(pk8); SaveMisc4(pk8); SaveMisc6(pk8); + SaveMisc8(pk8); // Toss in Party Stats SavePartyStats(pk8); diff --git a/PKHeX.WinForms/Controls/PKM Editor/LoadSave.cs b/PKHeX.WinForms/Controls/PKM Editor/LoadSave.cs index aec20c3fd..760d9cb43 100644 --- a/PKHeX.WinForms/Controls/PKM Editor/LoadSave.cs +++ b/PKHeX.WinForms/Controls/PKM Editor/LoadSave.cs @@ -1,7 +1,6 @@ using System; using PKHeX.Core; using PKHeX.Drawing; -using PKHeX.WinForms.Properties; namespace PKHeX.WinForms.Controls { @@ -22,9 +21,9 @@ private void SaveNickname(PKM pk) private void LoadSpeciesLevelEXP(PKM pk) { // Do first - pk.Stat_Level = Experience.GetLevel(pk.EXP, pk.Species, pk.AltForm); + pk.Stat_Level = Experience.GetLevel(pk.EXP, pk.PersonalInfo.EXPGrowth); if (pk.Stat_Level == 100 && !HaX) - pk.EXP = Experience.GetEXP(pk.Stat_Level, pk.Species, pk.AltForm); + pk.EXP = Experience.GetEXP(pk.Stat_Level, pk.PersonalInfo.EXPGrowth); CB_Species.SelectedValue = pk.Species; TB_Level.Text = pk.Stat_Level.ToString(); @@ -264,7 +263,7 @@ private void SaveMisc4(PKM pk) if (pk.IsEgg && pk.Met_Location == 0) // If still an egg, it has no hatch location/date. Zero it! pk.MetDate = null; - pk.Ability = (byte)WinFormsUtil.GetIndex(HaX ? DEV_Ability : CB_Ability); + pk.Ability = WinFormsUtil.GetIndex(HaX ? DEV_Ability : CB_Ability); } private void LoadMisc6(PKM pk) @@ -289,7 +288,9 @@ private void SaveMisc6(PKM pk) SaveRelearnMoves(pk); SaveHandlingTrainer(pk); - SaveGeolocation(pk); + + if (pk.Format <= 7 && !(pk is PB7)) + SaveGeolocation(pk); } private void LoadGeolocation(PKM pk) @@ -322,12 +323,12 @@ private void UpadteHandlingTrainerBackground(PKM pk) { if (pk.CurrentHandler == 0) // OT { - GB_OT.BackgroundImage = ImageUtil.ChangeOpacity(Resources.slotSet, 0.5); + GB_OT.BackgroundImage = ImageUtil.ChangeOpacity(SpriteUtil.Spriter.Set, 0.5); GB_nOT.BackgroundImage = null; } else // Handling Trainer { - GB_nOT.BackgroundImage = ImageUtil.ChangeOpacity(Resources.slotSet, 0.5); + GB_nOT.BackgroundImage = ImageUtil.ChangeOpacity(SpriteUtil.Spriter.Set, 0.5); GB_OT.BackgroundImage = null; } } @@ -387,5 +388,21 @@ private static int GetAbilityIndex4(PKM pk, int[] abils) return pk.PIDAbility; return abilityIndex; } + + private void LoadMisc8(PK8 pk8) + { + CB_StatNature.SelectedValue = pk8.StatNature; + Stats.CB_DynamaxLevel.SelectedIndex = pk8.DynamaxLevel; + Stats.CHK_Gigantamax.Checked = pk8.CanGigantamax; + CB_HTLanguage.SelectedValue = pk8.HT_Language; + } + + private void SaveMisc8(PK8 pk8) + { + pk8.StatNature = WinFormsUtil.GetIndex(CB_StatNature); + pk8.DynamaxLevel = (byte)Math.Max(0, Stats.CB_DynamaxLevel.SelectedIndex); + pk8.CanGigantamax = Stats.CHK_Gigantamax.Checked; + pk8.HT_Language = WinFormsUtil.GetIndex(CB_HTLanguage); + } } } diff --git a/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.Designer.cs b/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.Designer.cs index 9fe7271d0..733731227 100644 --- a/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.Designer.cs +++ b/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.Designer.cs @@ -58,6 +58,9 @@ private void InitializeComponent() this.FLP_Nature = new System.Windows.Forms.FlowLayoutPanel(); this.Label_Nature = new System.Windows.Forms.Label(); this.CB_Nature = new System.Windows.Forms.ComboBox(); + this.FLP_OriginalNature = new System.Windows.Forms.FlowLayoutPanel(); + this.L_OriginalNature = new System.Windows.Forms.Label(); + this.CB_StatNature = new System.Windows.Forms.ComboBox(); this.FLP_HeldItem = new System.Windows.Forms.FlowLayoutPanel(); this.Label_HeldItem = new System.Windows.Forms.Label(); this.CB_HeldItem = new System.Windows.Forms.ComboBox(); @@ -185,6 +188,7 @@ private void InitializeComponent() this.CB_Move2 = new System.Windows.Forms.ComboBox(); this.CB_Move1 = new System.Windows.Forms.ComboBox(); this.Tab_OTMisc = new System.Windows.Forms.TabPage(); + this.PB_Origin = new System.Windows.Forms.PictureBox(); this.PB_Favorite = new System.Windows.Forms.PictureBox(); this.FLP_PKMEditors = new System.Windows.Forms.FlowLayoutPanel(); this.BTN_Ribbons = new System.Windows.Forms.Button(); @@ -197,11 +201,7 @@ private void InitializeComponent() this.Label_PrevOT = new System.Windows.Forms.Label(); this.BTN_RerollEC = new System.Windows.Forms.Button(); this.GB_Markings = new System.Windows.Forms.GroupBox(); - this.PB_MarkGO = new System.Windows.Forms.PictureBox(); - this.PB_MarkVC = new System.Windows.Forms.PictureBox(); - this.PB_MarkAlola = new System.Windows.Forms.PictureBox(); this.PB_Mark6 = new System.Windows.Forms.PictureBox(); - this.PB_MarkPentagon = new System.Windows.Forms.PictureBox(); this.PB_Mark3 = new System.Windows.Forms.PictureBox(); this.PB_Mark5 = new System.Windows.Forms.PictureBox(); this.PB_MarkCured = new System.Windows.Forms.PictureBox(); @@ -221,6 +221,7 @@ private void InitializeComponent() this.SpeciesIDTip = new System.Windows.Forms.ToolTip(this.components); this.NatureTip = new System.Windows.Forms.ToolTip(this.components); this.Tip3 = new System.Windows.Forms.ToolTip(this.components); + this.CB_HTLanguage = new System.Windows.Forms.ComboBox(); this.tabMain.SuspendLayout(); this.Tab_Main.SuspendLayout(); this.FLP_Main.SuspendLayout(); @@ -234,6 +235,7 @@ private void InitializeComponent() this.FLP_EXPLevel.SuspendLayout(); this.FLP_EXPLevelRight.SuspendLayout(); this.FLP_Nature.SuspendLayout(); + this.FLP_OriginalNature.SuspendLayout(); this.FLP_HeldItem.SuspendLayout(); this.FLP_FriendshipForm.SuspendLayout(); this.FLP_FriendshipFormLeft.SuspendLayout(); @@ -283,15 +285,12 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.PB_WarnRelearn1)).BeginInit(); this.GB_CurrentMoves.SuspendLayout(); this.Tab_OTMisc.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.PB_Origin)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.PB_Favorite)).BeginInit(); this.FLP_PKMEditors.SuspendLayout(); this.GB_nOT.SuspendLayout(); this.GB_Markings.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.PB_MarkGO)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.PB_MarkVC)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.PB_MarkAlola)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.PB_Mark6)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.PB_MarkPentagon)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.PB_Mark3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.PB_Mark5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.PB_MarkCured)).BeginInit(); @@ -306,13 +305,12 @@ private void InitializeComponent() // tabMain // this.tabMain.AllowDrop = true; - this.tabMain.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left))); this.tabMain.Controls.Add(this.Tab_Main); this.tabMain.Controls.Add(this.Tab_Met); this.tabMain.Controls.Add(this.Tab_Stats); this.tabMain.Controls.Add(this.Tab_Attacks); this.tabMain.Controls.Add(this.Tab_OTMisc); + this.tabMain.Dock = System.Windows.Forms.DockStyle.Fill; this.tabMain.Location = new System.Drawing.Point(0, 0); this.tabMain.Name = "tabMain"; this.tabMain.SelectedIndex = 0; @@ -340,6 +338,7 @@ private void InitializeComponent() this.FLP_Main.Controls.Add(this.FLP_Nickname); this.FLP_Main.Controls.Add(this.FLP_EXPLevel); this.FLP_Main.Controls.Add(this.FLP_Nature); + this.FLP_Main.Controls.Add(this.FLP_OriginalNature); this.FLP_Main.Controls.Add(this.FLP_HeldItem); this.FLP_Main.Controls.Add(this.FLP_FriendshipForm); this.FLP_Main.Controls.Add(this.FLP_Ability); @@ -677,12 +676,44 @@ private void InitializeComponent() this.CB_Nature.SelectedIndexChanged += new System.EventHandler(this.ValidateComboBox2); this.CB_Nature.Validating += new System.ComponentModel.CancelEventHandler(this.ValidateComboBox); // + // FLP_OriginalNature + // + this.FLP_OriginalNature.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_OriginalNature.Controls.Add(this.L_OriginalNature); + this.FLP_OriginalNature.Controls.Add(this.CB_StatNature); + this.FLP_OriginalNature.Location = new System.Drawing.Point(0, 107); + this.FLP_OriginalNature.Margin = new System.Windows.Forms.Padding(0); + this.FLP_OriginalNature.Name = "FLP_OriginalNature"; + this.FLP_OriginalNature.Size = new System.Drawing.Size(272, 21); + this.FLP_OriginalNature.TabIndex = 10; + // + // L_OriginalNature + // + this.L_OriginalNature.Location = new System.Drawing.Point(0, 0); + this.L_OriginalNature.Margin = new System.Windows.Forms.Padding(0); + this.L_OriginalNature.Name = "L_OriginalNature"; + this.L_OriginalNature.Size = new System.Drawing.Size(110, 21); + this.L_OriginalNature.TabIndex = 8; + this.L_OriginalNature.Text = "Stat Nature:"; + this.L_OriginalNature.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // CB_StatNature + // + this.CB_StatNature.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.CB_StatNature.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.CB_StatNature.FormattingEnabled = true; + this.CB_StatNature.Location = new System.Drawing.Point(110, 0); + this.CB_StatNature.Margin = new System.Windows.Forms.Padding(0); + this.CB_StatNature.Name = "CB_StatNature"; + this.CB_StatNature.Size = new System.Drawing.Size(126, 21); + this.CB_StatNature.TabIndex = 9; + // // FLP_HeldItem // this.FLP_HeldItem.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.FLP_HeldItem.Controls.Add(this.Label_HeldItem); this.FLP_HeldItem.Controls.Add(this.CB_HeldItem); - this.FLP_HeldItem.Location = new System.Drawing.Point(0, 107); + this.FLP_HeldItem.Location = new System.Drawing.Point(0, 128); this.FLP_HeldItem.Margin = new System.Windows.Forms.Padding(0); this.FLP_HeldItem.Name = "FLP_HeldItem"; this.FLP_HeldItem.Size = new System.Drawing.Size(272, 21); @@ -717,7 +748,7 @@ private void InitializeComponent() this.FLP_FriendshipForm.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.FLP_FriendshipForm.Controls.Add(this.FLP_FriendshipFormLeft); this.FLP_FriendshipForm.Controls.Add(this.FLP_FriendshipFormRight); - this.FLP_FriendshipForm.Location = new System.Drawing.Point(0, 128); + this.FLP_FriendshipForm.Location = new System.Drawing.Point(0, 149); this.FLP_FriendshipForm.Margin = new System.Windows.Forms.Padding(0); this.FLP_FriendshipForm.Name = "FLP_FriendshipForm"; this.FLP_FriendshipForm.Size = new System.Drawing.Size(272, 21); @@ -824,7 +855,7 @@ private void InitializeComponent() this.FLP_Ability.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.FLP_Ability.Controls.Add(this.Label_Ability); this.FLP_Ability.Controls.Add(this.FLP_AbilityRight); - this.FLP_Ability.Location = new System.Drawing.Point(0, 149); + this.FLP_Ability.Location = new System.Drawing.Point(0, 170); this.FLP_Ability.Margin = new System.Windows.Forms.Padding(0); this.FLP_Ability.Name = "FLP_Ability"; this.FLP_Ability.Size = new System.Drawing.Size(272, 21); @@ -895,7 +926,7 @@ private void InitializeComponent() this.FLP_Language.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.FLP_Language.Controls.Add(this.Label_Language); this.FLP_Language.Controls.Add(this.CB_Language); - this.FLP_Language.Location = new System.Drawing.Point(0, 170); + this.FLP_Language.Location = new System.Drawing.Point(0, 191); this.FLP_Language.Margin = new System.Windows.Forms.Padding(0); this.FLP_Language.Name = "FLP_Language"; this.FLP_Language.Size = new System.Drawing.Size(272, 21); @@ -928,7 +959,7 @@ private void InitializeComponent() this.FLP_EggPKRS.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.FLP_EggPKRS.Controls.Add(this.FLP_EggPKRSLeft); this.FLP_EggPKRS.Controls.Add(this.FLP_EggPKRSRight); - this.FLP_EggPKRS.Location = new System.Drawing.Point(0, 191); + this.FLP_EggPKRS.Location = new System.Drawing.Point(0, 212); this.FLP_EggPKRS.Margin = new System.Windows.Forms.Padding(0); this.FLP_EggPKRS.Name = "FLP_EggPKRS"; this.FLP_EggPKRS.Size = new System.Drawing.Size(272, 21); @@ -1000,7 +1031,7 @@ private void InitializeComponent() this.FLP_PKRS.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.FLP_PKRS.Controls.Add(this.Label_PKRS); this.FLP_PKRS.Controls.Add(this.FLP_PKRSRight); - this.FLP_PKRS.Location = new System.Drawing.Point(0, 212); + this.FLP_PKRS.Location = new System.Drawing.Point(0, 233); this.FLP_PKRS.Margin = new System.Windows.Forms.Padding(0); this.FLP_PKRS.Name = "FLP_PKRS"; this.FLP_PKRS.Size = new System.Drawing.Size(272, 21); @@ -1086,7 +1117,7 @@ private void InitializeComponent() this.FLP_Country.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.FLP_Country.Controls.Add(this.Label_Country); this.FLP_Country.Controls.Add(this.CB_Country); - this.FLP_Country.Location = new System.Drawing.Point(0, 233); + this.FLP_Country.Location = new System.Drawing.Point(0, 254); this.FLP_Country.Margin = new System.Windows.Forms.Padding(0); this.FLP_Country.Name = "FLP_Country"; this.FLP_Country.Size = new System.Drawing.Size(272, 21); @@ -1121,7 +1152,7 @@ private void InitializeComponent() this.FLP_SubRegion.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.FLP_SubRegion.Controls.Add(this.Label_SubRegion); this.FLP_SubRegion.Controls.Add(this.CB_SubRegion); - this.FLP_SubRegion.Location = new System.Drawing.Point(0, 254); + this.FLP_SubRegion.Location = new System.Drawing.Point(0, 275); this.FLP_SubRegion.Margin = new System.Windows.Forms.Padding(0); this.FLP_SubRegion.Name = "FLP_SubRegion"; this.FLP_SubRegion.Size = new System.Drawing.Size(272, 21); @@ -1155,7 +1186,7 @@ private void InitializeComponent() this.FLP_3DSRegion.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.FLP_3DSRegion.Controls.Add(this.Label_3DSRegion); this.FLP_3DSRegion.Controls.Add(this.CB_3DSReg); - this.FLP_3DSRegion.Location = new System.Drawing.Point(0, 275); + this.FLP_3DSRegion.Location = new System.Drawing.Point(0, 296); this.FLP_3DSRegion.Margin = new System.Windows.Forms.Padding(0); this.FLP_3DSRegion.Name = "FLP_3DSRegion"; this.FLP_3DSRegion.Size = new System.Drawing.Size(272, 21); @@ -1186,7 +1217,7 @@ private void InitializeComponent() this.FLP_NSparkle.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.FLP_NSparkle.Controls.Add(this.L_NSparkle); this.FLP_NSparkle.Controls.Add(this.CHK_NSparkle); - this.FLP_NSparkle.Location = new System.Drawing.Point(0, 296); + this.FLP_NSparkle.Location = new System.Drawing.Point(0, 317); this.FLP_NSparkle.Margin = new System.Windows.Forms.Padding(0); this.FLP_NSparkle.Name = "FLP_NSparkle"; this.FLP_NSparkle.Size = new System.Drawing.Size(272, 21); @@ -1219,7 +1250,7 @@ private void InitializeComponent() this.FLP_ShadowID.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.FLP_ShadowID.Controls.Add(this.L_ShadowID); this.FLP_ShadowID.Controls.Add(this.NUD_ShadowID); - this.FLP_ShadowID.Location = new System.Drawing.Point(0, 317); + this.FLP_ShadowID.Location = new System.Drawing.Point(0, 338); this.FLP_ShadowID.Margin = new System.Windows.Forms.Padding(0); this.FLP_ShadowID.Name = "FLP_ShadowID"; this.FLP_ShadowID.Size = new System.Drawing.Size(272, 21); @@ -1255,7 +1286,7 @@ private void InitializeComponent() this.FLP_Purification.Controls.Add(this.L_HeartGauge); this.FLP_Purification.Controls.Add(this.NUD_Purification); this.FLP_Purification.Controls.Add(this.CHK_Shadow); - this.FLP_Purification.Location = new System.Drawing.Point(0, 338); + this.FLP_Purification.Location = new System.Drawing.Point(0, 359); this.FLP_Purification.Margin = new System.Windows.Forms.Padding(0); this.FLP_Purification.Name = "FLP_Purification"; this.FLP_Purification.Size = new System.Drawing.Size(272, 21); @@ -1308,7 +1339,7 @@ private void InitializeComponent() this.FLP_ShinyLeaf.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.FLP_ShinyLeaf.Controls.Add(this.L_ShinyLeaf); this.FLP_ShinyLeaf.Controls.Add(this.ShinyLeaf); - this.FLP_ShinyLeaf.Location = new System.Drawing.Point(0, 359); + this.FLP_ShinyLeaf.Location = new System.Drawing.Point(0, 380); this.FLP_ShinyLeaf.Margin = new System.Windows.Forms.Padding(0); this.FLP_ShinyLeaf.Name = "FLP_ShinyLeaf"; this.FLP_ShinyLeaf.Size = new System.Drawing.Size(272, 56); @@ -1338,7 +1369,7 @@ private void InitializeComponent() this.FLP_CatchRate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.FLP_CatchRate.Controls.Add(this.L_CatchRate); this.FLP_CatchRate.Controls.Add(this.CR_PK1); - this.FLP_CatchRate.Location = new System.Drawing.Point(0, 415); + this.FLP_CatchRate.Location = new System.Drawing.Point(0, 436); this.FLP_CatchRate.Margin = new System.Windows.Forms.Padding(0); this.FLP_CatchRate.Name = "FLP_CatchRate"; this.FLP_CatchRate.Size = new System.Drawing.Size(272, 25); @@ -1366,7 +1397,7 @@ private void InitializeComponent() // this.FLP_SizeCP.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.FLP_SizeCP.Controls.Add(this.SizeCP); - this.FLP_SizeCP.Location = new System.Drawing.Point(0, 440); + this.FLP_SizeCP.Location = new System.Drawing.Point(0, 461); this.FLP_SizeCP.Margin = new System.Windows.Forms.Padding(0); this.FLP_SizeCP.Name = "FLP_SizeCP"; this.FLP_SizeCP.Size = new System.Drawing.Size(272, 72); @@ -1793,7 +1824,7 @@ private void InitializeComponent() this.Stats.EVsMaxed = System.Drawing.Color.Honeydew; this.Stats.Location = new System.Drawing.Point(0, 0); this.Stats.Name = "Stats"; - this.Stats.Size = new System.Drawing.Size(270, 240); + this.Stats.Size = new System.Drawing.Size(270, 264); this.Stats.StatDecreased = System.Drawing.Color.Blue; this.Stats.StatHyperTrained = System.Drawing.Color.LightGreen; this.Stats.StatIncreased = System.Drawing.Color.Red; @@ -1807,7 +1838,7 @@ private void InitializeComponent() this.Contest.CNT_Sheen = 0; this.Contest.CNT_Smart = 0; this.Contest.CNT_Tough = 0; - this.Contest.Location = new System.Drawing.Point(21, 247); + this.Contest.Location = new System.Drawing.Point(21, 265); this.Contest.Margin = new System.Windows.Forms.Padding(0); this.Contest.Name = "Contest"; this.Contest.Size = new System.Drawing.Size(230, 50); @@ -2200,6 +2231,7 @@ private void InitializeComponent() // Tab_OTMisc // this.Tab_OTMisc.AllowDrop = true; + this.Tab_OTMisc.Controls.Add(this.PB_Origin); this.Tab_OTMisc.Controls.Add(this.PB_Favorite); this.Tab_OTMisc.Controls.Add(this.FLP_PKMEditors); this.Tab_OTMisc.Controls.Add(this.TB_EC); @@ -2212,16 +2244,25 @@ private void InitializeComponent() this.Tab_OTMisc.Location = new System.Drawing.Point(4, 22); this.Tab_OTMisc.Name = "Tab_OTMisc"; this.Tab_OTMisc.Padding = new System.Windows.Forms.Padding(3); - this.Tab_OTMisc.Size = new System.Drawing.Size(192, 74); + this.Tab_OTMisc.Size = new System.Drawing.Size(272, 539); this.Tab_OTMisc.TabIndex = 4; this.Tab_OTMisc.Text = "OT/Misc"; this.Tab_OTMisc.UseVisualStyleBackColor = true; // + // PB_Origin + // + this.PB_Origin.Location = new System.Drawing.Point(209, 228); + this.PB_Origin.Name = "PB_Origin"; + this.PB_Origin.Size = new System.Drawing.Size(40, 40); + this.PB_Origin.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.PB_Origin.TabIndex = 11; + this.PB_Origin.TabStop = false; + // // PB_Favorite // this.PB_Favorite.Image = global::PKHeX.WinForms.Properties.Resources.icon_favo; this.PB_Favorite.InitialImage = global::PKHeX.WinForms.Properties.Resources.icon_favo; - this.PB_Favorite.Location = new System.Drawing.Point(23, 198); + this.PB_Favorite.Location = new System.Drawing.Point(22, 228); this.PB_Favorite.Name = "PB_Favorite"; this.PB_Favorite.Size = new System.Drawing.Size(40, 40); this.PB_Favorite.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; @@ -2238,7 +2279,7 @@ private void InitializeComponent() this.FLP_PKMEditors.Controls.Add(this.BTN_Ribbons); this.FLP_PKMEditors.Controls.Add(this.BTN_Medals); this.FLP_PKMEditors.Controls.Add(this.BTN_History); - this.FLP_PKMEditors.Location = new System.Drawing.Point(49, 245); + this.FLP_PKMEditors.Location = new System.Drawing.Point(49, 275); this.FLP_PKMEditors.Name = "FLP_PKMEditors"; this.FLP_PKMEditors.Size = new System.Drawing.Size(175, 25); this.FLP_PKMEditors.TabIndex = 9; @@ -2296,7 +2337,7 @@ private void InitializeComponent() // this.TB_EC.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.TB_EC.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.TB_EC.Location = new System.Drawing.Point(176, 276); + this.TB_EC.Location = new System.Drawing.Point(176, 306); this.TB_EC.MaxLength = 8; this.TB_EC.Name = "TB_EC"; this.TB_EC.Size = new System.Drawing.Size(60, 20); @@ -2307,11 +2348,12 @@ private void InitializeComponent() // GB_nOT // this.GB_nOT.Controls.Add(this.Label_CTGender); + this.GB_nOT.Controls.Add(this.CB_HTLanguage); this.GB_nOT.Controls.Add(this.TB_OTt2); this.GB_nOT.Controls.Add(this.Label_PrevOT); this.GB_nOT.Location = new System.Drawing.Point(40, 85); this.GB_nOT.Name = "GB_nOT"; - this.GB_nOT.Size = new System.Drawing.Size(190, 50); + this.GB_nOT.Size = new System.Drawing.Size(190, 74); this.GB_nOT.TabIndex = 2; this.GB_nOT.TabStop = false; this.GB_nOT.Text = "Latest (not OT) Handler"; @@ -2329,7 +2371,6 @@ private void InitializeComponent() // // TB_OTt2 // - this.TB_OTt2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.TB_OTt2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.TB_OTt2.Location = new System.Drawing.Point(46, 20); this.TB_OTt2.MaxLength = 12; @@ -2353,7 +2394,7 @@ private void InitializeComponent() // BTN_RerollEC // this.BTN_RerollEC.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F); - this.BTN_RerollEC.Location = new System.Drawing.Point(138, 276); + this.BTN_RerollEC.Location = new System.Drawing.Point(138, 306); this.BTN_RerollEC.Name = "BTN_RerollEC"; this.BTN_RerollEC.Size = new System.Drawing.Size(38, 20); this.BTN_RerollEC.TabIndex = 7; @@ -2363,11 +2404,7 @@ private void InitializeComponent() // // GB_Markings // - this.GB_Markings.Controls.Add(this.PB_MarkGO); - this.GB_Markings.Controls.Add(this.PB_MarkVC); - this.GB_Markings.Controls.Add(this.PB_MarkAlola); this.GB_Markings.Controls.Add(this.PB_Mark6); - this.GB_Markings.Controls.Add(this.PB_MarkPentagon); this.GB_Markings.Controls.Add(this.PB_Mark3); this.GB_Markings.Controls.Add(this.PB_Mark5); this.GB_Markings.Controls.Add(this.PB_MarkCured); @@ -2375,46 +2412,13 @@ private void InitializeComponent() this.GB_Markings.Controls.Add(this.PB_MarkShiny); this.GB_Markings.Controls.Add(this.PB_Mark1); this.GB_Markings.Controls.Add(this.PB_Mark4); - this.GB_Markings.Location = new System.Drawing.Point(68, 183); + this.GB_Markings.Location = new System.Drawing.Point(68, 213); this.GB_Markings.Name = "GB_Markings"; this.GB_Markings.Size = new System.Drawing.Size(135, 58); this.GB_Markings.TabIndex = 4; this.GB_Markings.TabStop = false; this.GB_Markings.Text = "Markings"; // - // PB_MarkGO - // - this.PB_MarkGO.Image = global::PKHeX.WinForms.Properties.Resources.horohoro; - this.PB_MarkGO.InitialImage = global::PKHeX.WinForms.Properties.Resources.horohoro; - this.PB_MarkGO.Location = new System.Drawing.Point(110, 15); - this.PB_MarkGO.Name = "PB_MarkGO"; - this.PB_MarkGO.Size = new System.Drawing.Size(20, 20); - this.PB_MarkGO.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.PB_MarkGO.TabIndex = 11; - this.PB_MarkGO.TabStop = false; - // - // PB_MarkVC - // - this.PB_MarkVC.Image = global::PKHeX.WinForms.Properties.Resources.vc; - this.PB_MarkVC.InitialImage = global::PKHeX.WinForms.Properties.Resources.vc; - this.PB_MarkVC.Location = new System.Drawing.Point(89, 15); - this.PB_MarkVC.Name = "PB_MarkVC"; - this.PB_MarkVC.Size = new System.Drawing.Size(20, 20); - this.PB_MarkVC.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.PB_MarkVC.TabIndex = 10; - this.PB_MarkVC.TabStop = false; - // - // PB_MarkAlola - // - this.PB_MarkAlola.Image = global::PKHeX.WinForms.Properties.Resources.alora; - this.PB_MarkAlola.InitialImage = global::PKHeX.WinForms.Properties.Resources.alora; - this.PB_MarkAlola.Location = new System.Drawing.Point(68, 15); - this.PB_MarkAlola.Name = "PB_MarkAlola"; - this.PB_MarkAlola.Size = new System.Drawing.Size(20, 20); - this.PB_MarkAlola.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.PB_MarkAlola.TabIndex = 9; - this.PB_MarkAlola.TabStop = false; - // // PB_Mark6 // this.PB_Mark6.Image = global::PKHeX.WinForms.Properties.Resources.box_mark_06; @@ -2428,17 +2432,6 @@ private void InitializeComponent() this.PB_Mark6.TabStop = false; this.PB_Mark6.Click += new System.EventHandler(this.ClickMarking); // - // PB_MarkPentagon - // - this.PB_MarkPentagon.Image = global::PKHeX.WinForms.Properties.Resources._6th; - this.PB_MarkPentagon.InitialImage = global::PKHeX.WinForms.Properties.Resources._6th; - this.PB_MarkPentagon.Location = new System.Drawing.Point(47, 15); - this.PB_MarkPentagon.Name = "PB_MarkPentagon"; - this.PB_MarkPentagon.Size = new System.Drawing.Size(20, 20); - this.PB_MarkPentagon.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.PB_MarkPentagon.TabIndex = 8; - this.PB_MarkPentagon.TabStop = false; - // // PB_Mark3 // this.PB_Mark3.Image = global::PKHeX.WinForms.Properties.Resources.box_mark_03; @@ -2469,9 +2462,9 @@ private void InitializeComponent() // this.PB_MarkCured.Image = global::PKHeX.WinForms.Properties.Resources.anti_pokerus_icon; this.PB_MarkCured.InitialImage = global::PKHeX.WinForms.Properties.Resources.anti_pokerus_icon; - this.PB_MarkCured.Location = new System.Drawing.Point(26, 15); + this.PB_MarkCured.Location = new System.Drawing.Point(67, 15); this.PB_MarkCured.Name = "PB_MarkCured"; - this.PB_MarkCured.Size = new System.Drawing.Size(20, 20); + this.PB_MarkCured.Size = new System.Drawing.Size(22, 20); this.PB_MarkCured.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; this.PB_MarkCured.TabIndex = 7; this.PB_MarkCured.TabStop = false; @@ -2493,9 +2486,9 @@ private void InitializeComponent() // this.PB_MarkShiny.Image = global::PKHeX.WinForms.Properties.Resources.rare_icon; this.PB_MarkShiny.InitialImage = global::PKHeX.WinForms.Properties.Resources.rare_icon; - this.PB_MarkShiny.Location = new System.Drawing.Point(5, 15); + this.PB_MarkShiny.Location = new System.Drawing.Point(46, 15); this.PB_MarkShiny.Name = "PB_MarkShiny"; - this.PB_MarkShiny.Size = new System.Drawing.Size(20, 20); + this.PB_MarkShiny.Size = new System.Drawing.Size(22, 20); this.PB_MarkShiny.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; this.PB_MarkShiny.TabIndex = 6; this.PB_MarkShiny.TabStop = false; @@ -2530,7 +2523,7 @@ private void InitializeComponent() // this.GB_ExtraBytes.Controls.Add(this.TB_ExtraByte); this.GB_ExtraBytes.Controls.Add(this.CB_ExtraBytes); - this.GB_ExtraBytes.Location = new System.Drawing.Point(68, 135); + this.GB_ExtraBytes.Location = new System.Drawing.Point(68, 165); this.GB_ExtraBytes.Name = "GB_ExtraBytes"; this.GB_ExtraBytes.Size = new System.Drawing.Size(135, 48); this.GB_ExtraBytes.TabIndex = 3; @@ -2610,13 +2603,24 @@ private void InitializeComponent() // // Label_EncryptionConstant // - this.Label_EncryptionConstant.Location = new System.Drawing.Point(20, 279); + this.Label_EncryptionConstant.Location = new System.Drawing.Point(20, 309); this.Label_EncryptionConstant.Name = "Label_EncryptionConstant"; this.Label_EncryptionConstant.Size = new System.Drawing.Size(120, 13); this.Label_EncryptionConstant.TabIndex = 1; this.Label_EncryptionConstant.Text = "Encryption Constant:"; this.Label_EncryptionConstant.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // + // CB_HTLanguage + // + this.CB_HTLanguage.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.CB_HTLanguage.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.CB_HTLanguage.FormattingEnabled = true; + this.CB_HTLanguage.Location = new System.Drawing.Point(46, 43); + this.CB_HTLanguage.Margin = new System.Windows.Forms.Padding(0); + this.CB_HTLanguage.Name = "CB_HTLanguage"; + this.CB_HTLanguage.Size = new System.Drawing.Size(126, 21); + this.CB_HTLanguage.TabIndex = 15; + // // PKMEditor // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -2641,6 +2645,7 @@ private void InitializeComponent() this.FLP_EXPLevelRight.ResumeLayout(false); this.FLP_EXPLevelRight.PerformLayout(); this.FLP_Nature.ResumeLayout(false); + this.FLP_OriginalNature.ResumeLayout(false); this.FLP_HeldItem.ResumeLayout(false); this.FLP_FriendshipForm.ResumeLayout(false); this.FLP_FriendshipFormLeft.ResumeLayout(false); @@ -2702,17 +2707,14 @@ private void InitializeComponent() this.GB_CurrentMoves.PerformLayout(); this.Tab_OTMisc.ResumeLayout(false); this.Tab_OTMisc.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.PB_Origin)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.PB_Favorite)).EndInit(); this.FLP_PKMEditors.ResumeLayout(false); this.FLP_PKMEditors.PerformLayout(); this.GB_nOT.ResumeLayout(false); this.GB_nOT.PerformLayout(); this.GB_Markings.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.PB_MarkGO)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.PB_MarkVC)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.PB_MarkAlola)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.PB_Mark6)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.PB_MarkPentagon)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.PB_Mark3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.PB_Mark5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.PB_MarkCured)).EndInit(); @@ -2887,11 +2889,7 @@ private void InitializeComponent() private System.Windows.Forms.Label Label_PrevOT; private System.Windows.Forms.Button BTN_RerollEC; private System.Windows.Forms.GroupBox GB_Markings; - private System.Windows.Forms.PictureBox PB_MarkGO; - private System.Windows.Forms.PictureBox PB_MarkVC; - private System.Windows.Forms.PictureBox PB_MarkAlola; private System.Windows.Forms.PictureBox PB_Mark6; - private System.Windows.Forms.PictureBox PB_MarkPentagon; private System.Windows.Forms.PictureBox PB_Mark3; private System.Windows.Forms.PictureBox PB_Mark5; private System.Windows.Forms.PictureBox PB_MarkCured; @@ -2922,5 +2920,10 @@ private void InitializeComponent() private System.Windows.Forms.ToolTip SpeciesIDTip; private System.Windows.Forms.ToolTip NatureTip; private System.Windows.Forms.ToolTip Tip3; + private System.Windows.Forms.FlowLayoutPanel FLP_OriginalNature; + private System.Windows.Forms.Label L_OriginalNature; + private System.Windows.Forms.ComboBox CB_StatNature; + private System.Windows.Forms.PictureBox PB_Origin; + private System.Windows.Forms.ComboBox CB_HTLanguage; } } diff --git a/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs b/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs index 4d0f4dee6..81f3fe409 100644 --- a/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs +++ b/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs @@ -36,6 +36,7 @@ public PKMEditor() { CB_Species, CB_Nature, CB_HeldItem, CB_Ability, // Main Tab CB_MetLocation, CB_EggLocation, CB_Ball, // Met Tab + CB_StatNature, }).ToArray(); relearnPB = new[] { PB_WarnRelearn1, PB_WarnRelearn2, PB_WarnRelearn3, PB_WarnRelearn4 }; movePB = new[] { PB_WarnMove1, PB_WarnMove2, PB_WarnMove3, PB_WarnMove4 }; @@ -52,9 +53,9 @@ public void InitializeBinding() { ComboBox[] cbs = { - CB_Nature, + CB_Nature, CB_StatNature, CB_Country, CB_SubRegion, CB_3DSReg, CB_Language, CB_Ball, CB_HeldItem, CB_Species, DEV_Ability, - CB_EncounterType, CB_GameOrigin, CB_Ability, CB_MetLocation, CB_EggLocation, CB_Language, + CB_EncounterType, CB_GameOrigin, CB_Ability, CB_MetLocation, CB_EggLocation, CB_Language, CB_HTLanguage, }; foreach (var cb in cbs.Concat(Moves.Concat(Relearn))) cb.InitializeBinding(); @@ -221,7 +222,7 @@ private void SetPKMFormatExtraBytes(PKM pk) var extraBytes = pk.ExtraBytes; GB_ExtraBytes.Visible = GB_ExtraBytes.Enabled = extraBytes.Count != 0; CB_ExtraBytes.Items.Clear(); - foreach (byte b in extraBytes) + foreach (var b in extraBytes) CB_ExtraBytes.Items.Add($"0x{b:X2}"); if (GB_ExtraBytes.Enabled) CB_ExtraBytes.SelectedIndex = 0; @@ -252,7 +253,7 @@ private void LoadFieldsFromPKM(PKM pk, bool focus = true, bool skipConversionChe if (HaX) // Load original values from pk not pkm { - MT_Level.Text = (pk.PartyStatsPresent ? pk.Stat_Level : Experience.GetLevel(pk.EXP, pk.Species, pk.AltForm)).ToString(); + MT_Level.Text = (pk.PartyStatsPresent ? pk.Stat_Level : Experience.GetLevel(pk.EXP, pk.PersonalInfo.EXPGrowth)).ToString(); TB_EXP.Text = pk.EXP.ToString(); MT_Form.Text = Math.Max(0, pk.AltForm).ToString(); if (pk.PartyStatsPresent) // stats present @@ -282,12 +283,12 @@ public void UpdateLegality(LegalityAnalysis la = null, bool skipMoveRepop = fals // Refresh Move Legality for (int i = 0; i < 4; i++) - movePB[i].Visible = !Legality.Info?.Moves[i].Valid ?? false; + movePB[i].Visible = !Legality.Info?.Moves[i]?.Valid ?? false; if (Entity.Format >= 6) { for (int i = 0; i < 4; i++) - relearnPB[i].Visible = !Legality.Info?.Relearn[i].Valid ?? false; + relearnPB[i].Visible = !Legality.Info?.Relearn[i]?.Valid ?? false; } if (skipMoveRepop) @@ -374,7 +375,11 @@ private void SetDetailsHT(ITrainerInfo tr) return; if (TB_OTt2.Text.Length > 0) + { Label_CTGender.Text = gendersymbols[tr.Gender & 1]; + if (Entity is IHandlerLanguage) + CB_HTLanguage.SelectedValue = tr.Language; + } } private void SetForms() @@ -443,17 +448,13 @@ private void SetMarkings() PB_MarkShiny.Image = changeOpacity(PB_MarkShiny, getOpacity(!BTN_Shinytize.Enabled)); PB_MarkCured.Image = changeOpacity(PB_MarkCured, getOpacity(CHK_Cured.Checked)); - PB_MarkPentagon.Image = changeOpacity(PB_MarkPentagon, getOpacity(Entity.Gen6)); - PB_Favorite.Image = changeOpacity(PB_Favorite, getOpacity(Entity is PB7 pb7 && pb7.Favorite)); + PB_Favorite.Image = changeOpacity(PB_Favorite, getOpacity(Entity is IFavorite pb7 && pb7.Favorite)); + PB_Origin.Image = GetOriginSprite(Entity); - // Gen7 Markings - if (Entity.Format != 7) + // Colored Markings + if (Entity.Format < 7) return; - PB_MarkAlola.Image = changeOpacity(PB_MarkAlola, getOpacity(Entity.Gen7)); - PB_MarkVC.Image = changeOpacity(PB_MarkVC, getOpacity(Entity.VC)); - PB_MarkGO.Image = changeOpacity(PB_MarkGO, getOpacity(Entity.GO)); - for (int i = 0; i < pba.Length; i++) { if (Draw.GetMarkingColor(markings[i], out Color c)) @@ -461,6 +462,23 @@ private void SetMarkings() } } + private static Image GetOriginSprite(PKM pkm) + { + if (pkm.Format < 6) + return null; + if (pkm.Gen6) + return Properties.Resources.gen_6; + if (pkm.GO) + return Properties.Resources.gen_go; + if (pkm.GG) + return Properties.Resources.gen_gg; + if (pkm.Gen7) + return Properties.Resources.gen_7; + if (pkm.Gen8) + return Properties.Resources.gen_8; + return null; + } + private void UpdateGender() { int Gender = Entity.GetSaneGender(); @@ -541,7 +559,7 @@ private void ClickMarking(object sender, EventArgs e) private void ClickFavorite(object sender, EventArgs e) { - if (Entity is PB7 pb7) + if (Entity is IFavorite pb7) pb7.Favorite ^= true; SetMarkings(); } @@ -763,11 +781,10 @@ private void UpdateEXPLevel(object sender, EventArgs e) { // Change the Level uint EXP = Util.ToUInt32(TB_EXP.Text); - int Species = Entity.Species; - int Form = Entity.AltForm; - int Level = Experience.GetLevel(EXP, Species, Form); + var gr = Entity.PersonalInfo.EXPGrowth; + int Level = Experience.GetLevel(EXP, gr); if (Level == 100) - EXP = Experience.GetEXP(100, Species, Form); + EXP = Experience.GetEXP(100, gr); TB_Level.Text = Level.ToString(); if (!HaX) @@ -792,7 +809,7 @@ private void UpdateEXPLevel(object sender, EventArgs e) if (Level > byte.MaxValue) MT_Level.Text = "255"; else if (Level <= 100) - TB_EXP.Text = Experience.GetEXP(Level, Entity.Species, Entity.AltForm).ToString(); + TB_EXP.Text = Experience.GetEXP(Level, Entity.PersonalInfo.EXPGrowth).ToString(); } ChangingFields = false; if (FieldsLoaded) // store values back @@ -855,7 +872,7 @@ private void UpdateForm(object sender, EventArgs e) if (CB_Form == sender && FieldsLoaded) { Entity.AltForm = CB_Form.SelectedIndex; - uint EXP = Experience.GetEXP(Entity.CurrentLevel, Entity.Species, Entity.AltForm); + uint EXP = Experience.GetEXP(Entity.CurrentLevel, Entity.PersonalInfo.EXPGrowth); TB_EXP.Text = EXP.ToString(); } @@ -1044,7 +1061,7 @@ private void UpdateSpecies(object sender, EventArgs e) return; // Recalculate EXP for Given Level - uint EXP = Experience.GetEXP(Entity.CurrentLevel, Entity.Species, Entity.AltForm); + uint EXP = Experience.GetEXP(Entity.CurrentLevel, Entity.PersonalInfo.EXPGrowth); TB_EXP.Text = EXP.ToString(); // Check for Gender Changes @@ -1584,10 +1601,20 @@ public bool ToggleInterface(SaveFile sav, PKM pk) private void ToggleInterface(PKM t) { + var pb7 = t is PB7; + int gen = t.Format; FLP_Purification.Visible = FLP_ShadowID.Visible = t is IShadowPKM; - FLP_SizeCP.Visible = PB_Favorite.Visible = t is PB7; - BTN_Medals.Visible = BTN_History.Visible = t.Format >= 6 && !(t is PB7); - BTN_Ribbons.Visible = t.Format >= 3 && !(t is PB7); + bool sizeCP = gen >= 8 || pb7; + FLP_SizeCP.Visible = sizeCP; + if (sizeCP) + SizeCP.ToggleVisibility(t); + PB_Favorite.Visible = t is IFavorite; + BTN_History.Visible = gen >= 6 && !pb7; + BTN_Ribbons.Visible = gen >= 3 && !pb7; + BTN_Medals.Visible = gen >= 6 && gen <= 7 && !pb7; + FLP_Country.Visible = FLP_SubRegion.Visible = FLP_3DSRegion.Visible = gen >= 6 && gen <= 7 && !pb7; + FLP_OriginalNature.Visible = gen >= 8; + ToggleInterface(Entity.Format); } @@ -1600,12 +1627,9 @@ private void ToggleSecrets(bool hidden, int gen) private void ToggleInterface(int gen) { ToggleSecrets(HideSecretValues, gen); - FLP_Country.Visible = FLP_SubRegion.Visible = FLP_3DSRegion.Visible = gen >= 6; GB_nOT.Visible = GB_RelearnMoves.Visible = gen >= 6; - PB_MarkPentagon.Visible = gen >= 6; - PB_MarkAlola.Visible = PB_MarkVC.Visible = PB_MarkGO.Visible = gen >= 7; - + PB_Origin.Visible = gen >= 6; FLP_NSparkle.Visible = L_NSparkle.Visible = CHK_NSparkle.Visible = gen == 5; CB_Form.Visible = Label_Form.Visible = CHK_AsEgg.Visible = GB_EggConditions.Visible = PB_Mark5.Visible = PB_Mark6.Visible = gen >= 4; @@ -1737,6 +1761,7 @@ private void InitializeLanguage(ITrainerInfo sav) CB_EncounterType.DataSource = new BindingSource(source.G4EncounterTypes, null); CB_Nature.DataSource = new BindingSource(source.Natures, null); + CB_StatNature.DataSource = new BindingSource(source.Natures, null); // Sub editors Stats.InitializeDataSources(); @@ -1751,7 +1776,10 @@ private void PopulateFilteredDataSources(ITrainerInfo sav) if (sav.Generation > 1) CB_HeldItem.DataSource = new BindingSource(source.Items, null); - CB_Language.DataSource = source.Languages; + CB_Language.DataSource = new BindingSource(source.Languages, null); + + var langWith0 = new[] {GameInfo.Sources.Empty}.Concat(source.Languages).ToArray(); + CB_HTLanguage.DataSource = new BindingSource(langWith0, null); CB_Ball.DataSource = new BindingSource(source.Balls, null); CB_Species.DataSource = new BindingSource(source.Species, null); diff --git a/PKHeX.WinForms/Controls/PKM Editor/SizeCP.Designer.cs b/PKHeX.WinForms/Controls/PKM Editor/SizeCP.Designer.cs index c851ee9a0..abe7a5052 100644 --- a/PKHeX.WinForms/Controls/PKM Editor/SizeCP.Designer.cs +++ b/PKHeX.WinForms/Controls/PKM Editor/SizeCP.Designer.cs @@ -40,9 +40,9 @@ private void InitializeComponent() this.FLP_Weight = new System.Windows.Forms.FlowLayoutPanel(); this.NUD_WeightScalar = new System.Windows.Forms.NumericUpDown(); this.TB_WeightAbs = new System.Windows.Forms.TextBox(); + this.L_SizeW = new System.Windows.Forms.Label(); this.FLP_Height = new System.Windows.Forms.FlowLayoutPanel(); this.L_SizeH = new System.Windows.Forms.Label(); - this.L_SizeW = new System.Windows.Forms.Label(); this.FLP_CP.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.NUD_HeightScalar)).BeginInit(); this.tableLayoutPanel1.SuspendLayout(); @@ -55,10 +55,10 @@ private void InitializeComponent() // this.FLP_CP.Controls.Add(this.MT_CP); this.FLP_CP.Controls.Add(this.CHK_Auto); - this.FLP_CP.Location = new System.Drawing.Point(63, 0); + this.FLP_CP.Location = new System.Drawing.Point(63, 48); this.FLP_CP.Margin = new System.Windows.Forms.Padding(0); this.FLP_CP.Name = "FLP_CP"; - this.FLP_CP.Size = new System.Drawing.Size(140, 23); + this.FLP_CP.Size = new System.Drawing.Size(140, 20); this.FLP_CP.TabIndex = 1; // // MT_CP @@ -68,7 +68,7 @@ private void InitializeComponent() this.MT_CP.Mask = "00000"; this.MT_CP.Name = "MT_CP"; this.MT_CP.Size = new System.Drawing.Size(36, 20); - this.MT_CP.TabIndex = 3; + this.MT_CP.TabIndex = 5; this.MT_CP.TextChanged += new System.EventHandler(this.MT_CP_TextChanged); // // CHK_Auto @@ -77,7 +77,7 @@ private void InitializeComponent() this.CHK_Auto.Location = new System.Drawing.Point(39, 3); this.CHK_Auto.Name = "CHK_Auto"; this.CHK_Auto.Size = new System.Drawing.Size(48, 17); - this.CHK_Auto.TabIndex = 4; + this.CHK_Auto.TabIndex = 6; this.CHK_Auto.Text = "Auto"; this.CHK_Auto.UseVisualStyleBackColor = true; this.CHK_Auto.CheckedChanged += new System.EventHandler(this.UpdateFlagState); @@ -85,7 +85,7 @@ private void InitializeComponent() // L_CP // this.L_CP.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.L_CP.Location = new System.Drawing.Point(3, 0); + this.L_CP.Location = new System.Drawing.Point(3, 48); this.L_CP.Name = "L_CP"; this.L_CP.Size = new System.Drawing.Size(57, 20); this.L_CP.TabIndex = 0; @@ -95,9 +95,9 @@ private void InitializeComponent() // L_Height // this.L_Height.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.L_Height.Location = new System.Drawing.Point(3, 23); + this.L_Height.Location = new System.Drawing.Point(3, 0); this.L_Height.Name = "L_Height"; - this.L_Height.Size = new System.Drawing.Size(57, 20); + this.L_Height.Size = new System.Drawing.Size(57, 13); this.L_Height.TabIndex = 1; this.L_Height.Text = "Height:"; this.L_Height.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -105,7 +105,7 @@ private void InitializeComponent() // L_Weight // this.L_Weight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.L_Weight.Location = new System.Drawing.Point(3, 46); + this.L_Weight.Location = new System.Drawing.Point(3, 24); this.L_Weight.Name = "L_Weight"; this.L_Weight.Size = new System.Drawing.Size(57, 20); this.L_Weight.TabIndex = 2; @@ -123,7 +123,7 @@ private void InitializeComponent() 0}); this.NUD_HeightScalar.Name = "NUD_HeightScalar"; this.NUD_HeightScalar.Size = new System.Drawing.Size(40, 20); - this.NUD_HeightScalar.TabIndex = 5; + this.NUD_HeightScalar.TabIndex = 1; this.NUD_HeightScalar.Value = new decimal(new int[] { 255, 0, @@ -137,7 +137,7 @@ private void InitializeComponent() this.TB_HeightAbs.Margin = new System.Windows.Forms.Padding(0); this.TB_HeightAbs.Name = "TB_HeightAbs"; this.TB_HeightAbs.Size = new System.Drawing.Size(67, 20); - this.TB_HeightAbs.TabIndex = 7; + this.TB_HeightAbs.TabIndex = 2; this.TB_HeightAbs.Text = "123.456789"; this.TB_HeightAbs.TextChanged += new System.EventHandler(this.TB_HeightAbs_TextChanged); // @@ -146,19 +146,18 @@ private void InitializeComponent() this.tableLayoutPanel1.ColumnCount = 2; this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 31F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 69F)); - this.tableLayoutPanel1.Controls.Add(this.FLP_Weight, 1, 2); - this.tableLayoutPanel1.Controls.Add(this.FLP_CP, 1, 0); - this.tableLayoutPanel1.Controls.Add(this.L_Weight, 0, 2); - this.tableLayoutPanel1.Controls.Add(this.FLP_Height, 1, 1); - this.tableLayoutPanel1.Controls.Add(this.L_Height, 0, 1); - this.tableLayoutPanel1.Controls.Add(this.L_CP, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.FLP_Weight, 1, 1); + this.tableLayoutPanel1.Controls.Add(this.L_Weight, 0, 1); + this.tableLayoutPanel1.Controls.Add(this.FLP_Height, 1, 0); + this.tableLayoutPanel1.Controls.Add(this.L_Height, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.L_CP, 0, 2); + this.tableLayoutPanel1.Controls.Add(this.FLP_CP, 1, 2); this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(0); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.tableLayoutPanel1.RowCount = 3; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); this.tableLayoutPanel1.Size = new System.Drawing.Size(204, 68); this.tableLayoutPanel1.TabIndex = 2; @@ -168,7 +167,7 @@ private void InitializeComponent() this.FLP_Weight.Controls.Add(this.NUD_WeightScalar); this.FLP_Weight.Controls.Add(this.TB_WeightAbs); this.FLP_Weight.Controls.Add(this.L_SizeW); - this.FLP_Weight.Location = new System.Drawing.Point(63, 46); + this.FLP_Weight.Location = new System.Drawing.Point(63, 24); this.FLP_Weight.Margin = new System.Windows.Forms.Padding(0); this.FLP_Weight.Name = "FLP_Weight"; this.FLP_Weight.Size = new System.Drawing.Size(140, 21); @@ -185,7 +184,7 @@ private void InitializeComponent() 0}); this.NUD_WeightScalar.Name = "NUD_WeightScalar"; this.NUD_WeightScalar.Size = new System.Drawing.Size(40, 20); - this.NUD_WeightScalar.TabIndex = 5; + this.NUD_WeightScalar.TabIndex = 3; this.NUD_WeightScalar.Value = new decimal(new int[] { 255, 0, @@ -199,16 +198,26 @@ private void InitializeComponent() this.TB_WeightAbs.Margin = new System.Windows.Forms.Padding(0); this.TB_WeightAbs.Name = "TB_WeightAbs"; this.TB_WeightAbs.Size = new System.Drawing.Size(67, 20); - this.TB_WeightAbs.TabIndex = 7; + this.TB_WeightAbs.TabIndex = 4; this.TB_WeightAbs.Text = "123.456789"; this.TB_WeightAbs.TextChanged += new System.EventHandler(this.TB_WeightAbs_TextChanged); // + // L_SizeW + // + this.L_SizeW.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.L_SizeW.Location = new System.Drawing.Point(110, 0); + this.L_SizeW.Name = "L_SizeW"; + this.L_SizeW.Size = new System.Drawing.Size(24, 20); + this.L_SizeW.TabIndex = 9; + this.L_SizeW.Text = "XS"; + this.L_SizeW.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // // FLP_Height // this.FLP_Height.Controls.Add(this.NUD_HeightScalar); this.FLP_Height.Controls.Add(this.TB_HeightAbs); this.FLP_Height.Controls.Add(this.L_SizeH); - this.FLP_Height.Location = new System.Drawing.Point(63, 23); + this.FLP_Height.Location = new System.Drawing.Point(63, 0); this.FLP_Height.Margin = new System.Windows.Forms.Padding(0); this.FLP_Height.Name = "FLP_Height"; this.FLP_Height.Size = new System.Drawing.Size(140, 21); @@ -224,16 +233,6 @@ private void InitializeComponent() this.L_SizeH.Text = "XL"; this.L_SizeH.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // - // L_SizeW - // - this.L_SizeW.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.L_SizeW.Location = new System.Drawing.Point(110, 0); - this.L_SizeW.Name = "L_SizeW"; - this.L_SizeW.Size = new System.Drawing.Size(24, 20); - this.L_SizeW.TabIndex = 9; - this.L_SizeW.Text = "XS"; - this.L_SizeW.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // // SizeCP // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; diff --git a/PKHeX.WinForms/Controls/PKM Editor/SizeCP.cs b/PKHeX.WinForms/Controls/PKM Editor/SizeCP.cs index a031d3008..c6f186bd7 100644 --- a/PKHeX.WinForms/Controls/PKM Editor/SizeCP.cs +++ b/PKHeX.WinForms/Controls/PKM Editor/SizeCP.cs @@ -6,6 +6,7 @@ namespace PKHeX.WinForms.Controls { public partial class SizeCP : UserControl { + private IScaledSize ss; private PB7 pkm; private bool Loading; @@ -16,21 +17,23 @@ public SizeCP() } private readonly bool Initialized; - private static readonly string[] SizeClass = {"XS", "S", "", "L", "XL"}; + private static readonly string[] SizeClass = Enum.GetNames(typeof(PokeSize)); public void LoadPKM(PKM pk) { pkm = pk as PB7; - if (pkm == null) + ss = pk as IScaledSize; + if (ss == null) return; TryResetStats(); } public void TryResetStats() { - if (!Initialized || pkm == null) + if (!Initialized) return; - if (CHK_Auto.Checked) + + if (pkm != null && CHK_Auto.Checked) pkm.ResetCalculatedValues(); LoadStoredValues(); } @@ -38,13 +41,17 @@ public void TryResetStats() private void LoadStoredValues() { Loading = true; - MT_CP.Text = Math.Min(65535, pkm.Stat_CP).ToString(); - - NUD_HeightScalar.Value = pkm.HeightScalar; - TB_HeightAbs.Text = pkm.HeightAbsolute.ToString(); - - NUD_WeightScalar.Value = pkm.WeightScalar; - TB_WeightAbs.Text = pkm.WeightAbsolute.ToString(); + if (ss != null) + { + NUD_HeightScalar.Value = ss.HeightScalar; + NUD_WeightScalar.Value = ss.WeightScalar; + } + if (pkm != null) + { + MT_CP.Text = Math.Min(65535, pkm.Stat_CP).ToString(); + TB_HeightAbs.Text = pkm.HeightAbsolute.ToString(); + TB_WeightAbs.Text = pkm.WeightAbsolute.ToString(); + } Loading = false; } @@ -65,10 +72,10 @@ private void MT_CP_TextChanged(object sender, EventArgs e) private void NUD_HeightScalar_ValueChanged(object sender, EventArgs e) { - pkm.HeightScalar = (byte) NUD_HeightScalar.Value; - L_SizeH.Text = SizeClass[PB7.GetSizeRating(pkm.HeightScalar)]; + ss.HeightScalar = (byte) NUD_HeightScalar.Value; + L_SizeH.Text = SizeClass[(int)PokeSizeExtensions.GetSizeRating(ss.HeightScalar)]; - if (!CHK_Auto.Checked || Loading) + if (!CHK_Auto.Checked || Loading || pkm == null) return; pkm.ResetHeight(); TB_HeightAbs.Text = pkm.HeightAbsolute.ToString(); @@ -76,10 +83,10 @@ private void NUD_HeightScalar_ValueChanged(object sender, EventArgs e) private void NUD_WeightScalar_ValueChanged(object sender, EventArgs e) { - pkm.WeightScalar = (byte) NUD_WeightScalar.Value; - L_SizeW.Text = SizeClass[PB7.GetSizeRating(pkm.WeightScalar)]; + ss.WeightScalar = (byte) NUD_WeightScalar.Value; + L_SizeW.Text = SizeClass[(int)PokeSizeExtensions.GetSizeRating(ss.WeightScalar)]; - if (!CHK_Auto.Checked || Loading) + if (!CHK_Auto.Checked || Loading || pkm == null) return; pkm.ResetWeight(); TB_WeightAbs.Text = pkm.WeightAbsolute.ToString("F8"); @@ -100,5 +107,11 @@ private void TB_WeightAbs_TextChanged(object sender, EventArgs e) else if (float.TryParse(TB_WeightAbs.Text, out var result)) pkm.WeightAbsolute = result; } + + public void ToggleVisibility(PKM pk) + { + var pb7 = pk is PB7; + FLP_CP.Visible = L_CP.Visible = TB_HeightAbs.Visible = TB_WeightAbs.Visible = pb7; + } } } diff --git a/PKHeX.WinForms/Controls/PKM Editor/StatEditor.Designer.cs b/PKHeX.WinForms/Controls/PKM Editor/StatEditor.Designer.cs index 86aba98a2..c94bcf68e 100644 --- a/PKHeX.WinForms/Controls/PKM Editor/StatEditor.Designer.cs +++ b/PKHeX.WinForms/Controls/PKM Editor/StatEditor.Designer.cs @@ -108,6 +108,10 @@ private void InitializeComponent() this.BTN_RandomIVs = new System.Windows.Forms.Button(); this.BTN_RandomEVs = new System.Windows.Forms.Button(); this.EVTip = new System.Windows.Forms.ToolTip(this.components); + this.FLP_DynamaxLevel = new System.Windows.Forms.FlowLayoutPanel(); + this.L_DynamaxLevel = new System.Windows.Forms.Label(); + this.CHK_Gigantamax = new System.Windows.Forms.CheckBox(); + this.CB_DynamaxLevel = new System.Windows.Forms.ComboBox(); this.FLP_Stats.SuspendLayout(); this.FLP_StatHeader.SuspendLayout(); this.FLP_HackedStats.SuspendLayout(); @@ -130,13 +134,11 @@ private void InitializeComponent() this.FLP_HPType.SuspendLayout(); this.FLP_Characteristic.SuspendLayout(); this.PAN_BTN.SuspendLayout(); + this.FLP_DynamaxLevel.SuspendLayout(); this.SuspendLayout(); // // FLP_Stats // - this.FLP_Stats.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); this.FLP_Stats.Controls.Add(this.FLP_StatHeader); this.FLP_Stats.Controls.Add(this.FLP_HP); this.FLP_Stats.Controls.Add(this.FLP_Atk); @@ -148,9 +150,11 @@ private void InitializeComponent() this.FLP_Stats.Controls.Add(this.FLP_HPType); this.FLP_Stats.Controls.Add(this.FLP_Characteristic); this.FLP_Stats.Controls.Add(this.PAN_BTN); + this.FLP_Stats.Controls.Add(this.FLP_DynamaxLevel); + this.FLP_Stats.Dock = System.Windows.Forms.DockStyle.Fill; this.FLP_Stats.Location = new System.Drawing.Point(0, 0); this.FLP_Stats.Name = "FLP_Stats"; - this.FLP_Stats.Size = new System.Drawing.Size(270, 253); + this.FLP_Stats.Size = new System.Drawing.Size(270, 303); this.FLP_Stats.TabIndex = 106; // // FLP_StatHeader @@ -1103,12 +1107,66 @@ private void InitializeComponent() this.BTN_RandomEVs.UseVisualStyleBackColor = true; this.BTN_RandomEVs.Click += new System.EventHandler(this.UpdateRandomEVs); // + // FLP_DynamaxLevel + // + this.FLP_DynamaxLevel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_DynamaxLevel.Controls.Add(this.L_DynamaxLevel); + this.FLP_DynamaxLevel.Controls.Add(this.CB_DynamaxLevel); + this.FLP_DynamaxLevel.Controls.Add(this.CHK_Gigantamax); + this.FLP_DynamaxLevel.Location = new System.Drawing.Point(0, 248); + this.FLP_DynamaxLevel.Margin = new System.Windows.Forms.Padding(0); + this.FLP_DynamaxLevel.Name = "FLP_DynamaxLevel"; + this.FLP_DynamaxLevel.Size = new System.Drawing.Size(272, 21); + this.FLP_DynamaxLevel.TabIndex = 133; + // + // L_DynamaxLevel + // + this.L_DynamaxLevel.Location = new System.Drawing.Point(0, 0); + 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); + this.L_DynamaxLevel.TabIndex = 43; + this.L_DynamaxLevel.Text = "Dynamax Level:"; + this.L_DynamaxLevel.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // checkBox1 + // + this.CHK_Gigantamax.AutoSize = true; + this.CHK_Gigantamax.Location = new System.Drawing.Point(163, 3); + this.CHK_Gigantamax.Name = "CHK_Gigantamax"; + this.CHK_Gigantamax.Size = new System.Drawing.Size(82, 17); + this.CHK_Gigantamax.TabIndex = 44; + this.CHK_Gigantamax.Text = "Gigantamax"; + this.CHK_Gigantamax.UseVisualStyleBackColor = true; + // + // comboBox1 + // + this.CB_DynamaxLevel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.CB_DynamaxLevel.FormattingEnabled = true; + this.CB_DynamaxLevel.Items.AddRange(new object[] { + "0", + "1", + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10"}); + this.CB_DynamaxLevel.Location = new System.Drawing.Point(120, 0); + 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); + this.CB_DynamaxLevel.TabIndex = 44; + // // StatEditor // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.Controls.Add(this.FLP_Stats); this.Name = "StatEditor"; - this.Size = new System.Drawing.Size(270, 247); + this.Size = new System.Drawing.Size(270, 303); this.FLP_Stats.ResumeLayout(false); this.FLP_StatHeader.ResumeLayout(false); this.FLP_HackedStats.ResumeLayout(false); @@ -1138,6 +1196,8 @@ private void InitializeComponent() this.FLP_HPType.ResumeLayout(false); this.FLP_Characteristic.ResumeLayout(false); this.PAN_BTN.ResumeLayout(false); + this.FLP_DynamaxLevel.ResumeLayout(false); + this.FLP_DynamaxLevel.PerformLayout(); this.ResumeLayout(false); } @@ -1223,5 +1283,9 @@ private void InitializeComponent() private System.Windows.Forms.TextBox TB_AVTotal; private System.Windows.Forms.Button BTN_RandomAVs; private System.Windows.Forms.ToolTip EVTip; + private System.Windows.Forms.FlowLayoutPanel FLP_DynamaxLevel; + private System.Windows.Forms.Label L_DynamaxLevel; + public System.Windows.Forms.ComboBox CB_DynamaxLevel; + public System.Windows.Forms.CheckBox CHK_Gigantamax; } } diff --git a/PKHeX.WinForms/Controls/PKM Editor/StatEditor.cs b/PKHeX.WinForms/Controls/PKM Editor/StatEditor.cs index 7e0eee0da..4f77e0b36 100644 --- a/PKHeX.WinForms/Controls/PKM Editor/StatEditor.cs +++ b/PKHeX.WinForms/Controls/PKM Editor/StatEditor.cs @@ -467,6 +467,8 @@ public void ToggleInterface(PKM pk, int gen) { FLP_StatsTotal.Visible = gen >= 3; FLP_Characteristic.Visible = gen >= 3; + FLP_HPType.Visible = gen <= 7; + FLP_DynamaxLevel.Visible = gen >= 8; switch (gen) { diff --git a/PKHeX.WinForms/Controls/SAV Editor/BitmapAnimator.cs b/PKHeX.WinForms/Controls/SAV Editor/BitmapAnimator.cs index 5d10250ea..2b5a9eb1a 100644 --- a/PKHeX.WinForms/Controls/SAV Editor/BitmapAnimator.cs +++ b/PKHeX.WinForms/Controls/SAV Editor/BitmapAnimator.cs @@ -9,16 +9,15 @@ namespace PKHeX.WinForms.Controls { public sealed class BitmapAnimator : Timer { - public BitmapAnimator(Image extraLayer = null) + public BitmapAnimator() { - ExtraLayer = extraLayer; Elapsed += TimerElapsed; } private int imgWidth; private int imgHeight; private byte[] GlowData; - private readonly Image ExtraLayer; + private Image ExtraLayer; private Image[] GlowCache; public Image OriginalBackground; private readonly object Lock = new object(); @@ -50,7 +49,7 @@ public new void Stop() GlowCache[i] = null; } - public void Start(PictureBox pbox, Image baseImage, byte[] glowData, Image original) + public void Start(PictureBox pbox, Image baseImage, byte[] glowData, Image original, Image extra) { Enabled = false; imgWidth = baseImage.Width; @@ -63,6 +62,7 @@ public void Start(PictureBox pbox, Image baseImage, byte[] glowData, Image origi lock (Lock) { pb = pbox; + ExtraLayer = extra; OriginalBackground = original; } Enabled = true; diff --git a/PKHeX.WinForms/Controls/SAV Editor/BoxEditor.Designer.cs b/PKHeX.WinForms/Controls/SAV Editor/BoxEditor.Designer.cs index 419eb2d4d..1038393a9 100644 --- a/PKHeX.WinForms/Controls/SAV Editor/BoxEditor.Designer.cs +++ b/PKHeX.WinForms/Controls/SAV Editor/BoxEditor.Designer.cs @@ -31,7 +31,7 @@ private void InitializeComponent() this.B_BoxRight = new System.Windows.Forms.Button(); this.B_BoxLeft = new System.Windows.Forms.Button(); this.CB_BoxSelect = new System.Windows.Forms.ComboBox(); - this.pokeGrid1 = new PKHeX.WinForms.Controls.PokeGrid(); + this.BoxPokeGrid = new PKHeX.WinForms.Controls.PokeGrid(); this.SuspendLayout(); // // B_BoxRight @@ -98,17 +98,20 @@ private void InitializeComponent() this.CB_BoxSelect.TabIndex = 63; this.CB_BoxSelect.SelectedIndexChanged += new System.EventHandler(this.GetBox); // - // pokeGrid1 + // BoxPokeGrid // - this.pokeGrid1.Location = new System.Drawing.Point(0, 25); - this.pokeGrid1.Name = "pokeGrid1"; - this.pokeGrid1.Size = new System.Drawing.Size(251, 160); - this.pokeGrid1.TabIndex = 66; + this.BoxPokeGrid.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.BoxPokeGrid.Location = new System.Drawing.Point(0, 25); + this.BoxPokeGrid.Margin = new System.Windows.Forms.Padding(0); + this.BoxPokeGrid.Name = "BoxPokeGrid"; + this.BoxPokeGrid.Size = new System.Drawing.Size(251, 160); + this.BoxPokeGrid.TabIndex = 66; // // BoxEditor // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; - this.Controls.Add(this.pokeGrid1); + this.AutoSize = true; + this.Controls.Add(this.BoxPokeGrid); this.Controls.Add(this.B_BoxRight); this.Controls.Add(this.B_BoxLeft); this.Controls.Add(this.CB_BoxSelect); @@ -122,6 +125,6 @@ private void InitializeComponent() public System.Windows.Forms.Button B_BoxRight; public System.Windows.Forms.Button B_BoxLeft; public System.Windows.Forms.ComboBox CB_BoxSelect; - private PokeGrid pokeGrid1; + public PokeGrid BoxPokeGrid; } } diff --git a/PKHeX.WinForms/Controls/SAV Editor/BoxEditor.cs b/PKHeX.WinForms/Controls/SAV Editor/BoxEditor.cs index 72ff7e6aa..08dac360f 100644 --- a/PKHeX.WinForms/Controls/SAV Editor/BoxEditor.cs +++ b/PKHeX.WinForms/Controls/SAV Editor/BoxEditor.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Drawing; using System.IO; using System.Windows.Forms; using PKHeX.Core; @@ -29,18 +30,29 @@ internal bool InitializeGrid() var count = SAV.BoxSlotCount; var width = count / 5; var height = count / width; - if (pokeGrid1.InitializeGrid(width, height)) - { - pokeGrid1.HorizontallyCenter(this); - InitializeSlots(); - return true; - } - return false; + if (!BoxPokeGrid.InitializeGrid(width, height, SpriteUtil.Spriter)) + return false; + RecenterControls(); + InitializeSlots(); + return true; + } + + public void RecenterControls() + { + BoxPokeGrid.HorizontallyCenter(this); + int p1 = CB_BoxSelect.Location.X; + CB_BoxSelect.HorizontallyCenter(this); + int p2 = CB_BoxSelect.Location.X; + if (p1 == p2) + return; + + B_BoxLeft.Location = new Point(B_BoxLeft.Location.X + p2 - p1, B_BoxLeft.Location.Y); + B_BoxRight.Location = new Point(B_BoxRight.Location.X + p2 - p1, B_BoxRight.Location.Y); } private void InitializeSlots() { - SlotPictureBoxes = pokeGrid1.Entries; + SlotPictureBoxes = BoxPokeGrid.Entries; BoxSlotCount = SlotPictureBoxes.Count; foreach (var pb in SlotPictureBoxes) { @@ -164,7 +176,7 @@ public void ResetSlots() { Editor.Reload(); int box = CurrentBox; - pokeGrid1.SetBackground(SAV.WallpaperImage(box)); + BoxPokeGrid.SetBackground(SAV.WallpaperImage(box)); M.Hover.Stop(); int index = box * SAV.BoxSlotCount; diff --git a/PKHeX.WinForms/Controls/SAV Editor/PartyEditor.Designer.cs b/PKHeX.WinForms/Controls/SAV Editor/PartyEditor.Designer.cs new file mode 100644 index 000000000..272dec524 --- /dev/null +++ b/PKHeX.WinForms/Controls/SAV Editor/PartyEditor.Designer.cs @@ -0,0 +1,61 @@ +namespace PKHeX.WinForms.Controls +{ + partial class PartyEditor + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Component Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.PartyPokeGrid = new PKHeX.WinForms.Controls.PokeGrid(); + this.SuspendLayout(); + // + // pokeGrid1 + // + this.PartyPokeGrid.AutoSize = true; + this.PartyPokeGrid.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.PartyPokeGrid.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.PartyPokeGrid.Dock = System.Windows.Forms.DockStyle.Fill; + this.PartyPokeGrid.Location = new System.Drawing.Point(0, 0); + this.PartyPokeGrid.Margin = new System.Windows.Forms.Padding(0); + this.PartyPokeGrid.Name = "PartyPokeGrid"; + this.PartyPokeGrid.Size = new System.Drawing.Size(251, 185); + this.PartyPokeGrid.TabIndex = 66; + // + // PartyEditor + // + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; + this.AutoSize = true; + this.Controls.Add(this.PartyPokeGrid); + this.Name = "PartyEditor"; + this.Size = new System.Drawing.Size(251, 185); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + private PokeGrid PartyPokeGrid; + } +} diff --git a/PKHeX.WinForms/Controls/SAV Editor/PartyEditor.cs b/PKHeX.WinForms/Controls/SAV Editor/PartyEditor.cs new file mode 100644 index 000000000..8cf874e4c --- /dev/null +++ b/PKHeX.WinForms/Controls/SAV Editor/PartyEditor.cs @@ -0,0 +1,132 @@ +using System; +using System.Collections.Generic; +using System.Windows.Forms; +using PKHeX.Core; +using PKHeX.Drawing; + +namespace PKHeX.WinForms.Controls +{ + public partial class PartyEditor : UserControl, ISlotViewer + { + public IList SlotPictureBoxes { get; private set; } + public SaveFile SAV => M?.SE.SAV; + + public int BoxSlotCount { get; private set; } + public SlotChangeManager M { get; set; } + public bool FlagIllegal { get; set; } + + public PartyEditor() + { + InitializeComponent(); + } + + internal bool InitializeGrid() + { + const int width = 2; + const int height = 3; + if (PartyPokeGrid.InitializeGrid(width, height, SpriteUtil.Spriter)) + { + PartyPokeGrid.HorizontallyCenter(this); + InitializeSlots(); + return true; + } + return false; + } + + private void InitializeSlots() + { + SlotPictureBoxes = PartyPokeGrid.Entries; + BoxSlotCount = SlotPictureBoxes.Count; + foreach (var pb in SlotPictureBoxes) + { + pb.MouseEnter += BoxSlot_MouseEnter; + pb.MouseLeave += BoxSlot_MouseLeave; + pb.MouseClick += BoxSlot_MouseClick; + pb.MouseMove += BoxSlot_MouseMove; + pb.MouseDown += BoxSlot_MouseDown; + pb.MouseUp += BoxSlot_MouseUp; + + pb.DragEnter += BoxSlot_DragEnter; + pb.DragDrop += BoxSlot_DragDrop; + pb.QueryContinueDrag += BoxSlot_QueryContinueDrag; + pb.GiveFeedback += (sender, e) => e.UseDefaultCursors = false; + pb.AllowDrop = true; + } + } + + public void NotifySlotOld(ISlotInfo previous) + { + if (!(previous is SlotInfoParty p)) + return; + + var pb = SlotPictureBoxes[p.Slot]; + pb.BackgroundImage = null; + } + + public void NotifySlotChanged(ISlotInfo slot, SlotTouchType type, PKM pkm) + { + int index = GetViewIndex(slot); + if (index < 0) + return; + + if (type == SlotTouchType.Delete) + { + ResetSlots(); + return; + } + + var pb = SlotPictureBoxes[index]; + SlotUtil.UpdateSlot(pb, slot, pkm, SAV, FlagIllegal, type); + } + + public int GetViewIndex(ISlotInfo slot) + { + if (!(slot is SlotInfoParty p)) + return -1; + return p.Slot; + } + + public ISlotInfo GetSlotData(PictureBox view) + { + int slot = GetSlot(view); + return new SlotInfoParty(slot); + } + + private int GetSlot(PictureBox sender) => SlotPictureBoxes.IndexOf(sender); + public int ViewIndex => -999; + + public void Setup(SlotChangeManager m) + { + M = m; + FlagIllegal = M.SE.FlagIllegal; + } + + public void ResetSlots() + { + //pokeGrid1.SetBackground(SAV.WallpaperImage(0)); + M.Hover.Stop(); + + foreach (var pb in SlotPictureBoxes) + { + var slot = (SlotInfoParty) GetSlotData(pb); + SlotUtil.UpdateSlot(pb, slot, slot.Read(SAV), SAV, FlagIllegal); + } + + if (M.Env.Slots.Publisher.Previous is SlotInfoParty p) + SlotPictureBoxes[p.Slot].BackgroundImage = SlotUtil.GetTouchTypeBackground(M.Env.Slots.Publisher.PreviousType); + } + + // Drag & Drop Handling + private void BoxSlot_MouseEnter(object sender, EventArgs e) => M?.MouseEnter(sender, e); + private void BoxSlot_MouseLeave(object sender, EventArgs e) => M?.MouseLeave(sender, e); + private void BoxSlot_MouseClick(object sender, MouseEventArgs e) => M?.MouseClick(sender, e); + private void BoxSlot_MouseUp(object sender, MouseEventArgs e) => M?.MouseUp(sender, e); + private void BoxSlot_MouseDown(object sender, MouseEventArgs e) => M?.MouseDown(sender, e); + private void BoxSlot_MouseMove(object sender, MouseEventArgs e) => M?.MouseMove(sender, e); + private void BoxSlot_DragEnter(object sender, DragEventArgs e) => M?.DragEnter(sender, e); + private void BoxSlot_QueryContinueDrag(object sender, QueryContinueDragEventArgs e) => M?.QueryContinueDrag(sender, e); + private void BoxSlot_DragDrop(object sender, DragEventArgs e) => M?.DragDrop(sender, e); + + public bool InitializeFromSAV(SaveFile sav) => InitializeGrid(); + } +} diff --git a/PKHeX.WinForms/Controls/SAV Editor/SAVEditor.Designer.cs b/PKHeX.WinForms/Controls/SAV Editor/SAVEditor.Designer.cs index c9e5e3e16..26a5218c6 100644 --- a/PKHeX.WinForms/Controls/SAV Editor/SAVEditor.Designer.cs +++ b/PKHeX.WinForms/Controls/SAV Editor/SAVEditor.Designer.cs @@ -34,24 +34,7 @@ private void InitializeComponent() this.Tab_Box = new System.Windows.Forms.TabPage(); this.Box = new PKHeX.WinForms.Controls.BoxEditor(); this.Tab_PartyBattle = new System.Windows.Forms.TabPage(); - this.PAN_BattleBox = new System.Windows.Forms.Panel(); - this.PB_Locked = new System.Windows.Forms.PictureBox(); - this.bbpkx1 = new System.Windows.Forms.PictureBox(); - this.bbpkx2 = new System.Windows.Forms.PictureBox(); - this.bbpkx3 = new System.Windows.Forms.PictureBox(); - this.bbpkx4 = new System.Windows.Forms.PictureBox(); - this.bbpkx5 = new System.Windows.Forms.PictureBox(); - this.bbpkx6 = new System.Windows.Forms.PictureBox(); - this.L_ReadOnlyPBB = new System.Windows.Forms.Label(); - this.L_BattleBox = new System.Windows.Forms.Label(); - this.L_Party = new System.Windows.Forms.Label(); - this.PAN_Party = new System.Windows.Forms.Panel(); - this.ppkx1 = new System.Windows.Forms.PictureBox(); - this.ppkx2 = new System.Windows.Forms.PictureBox(); - this.ppkx3 = new System.Windows.Forms.PictureBox(); - this.ppkx4 = new System.Windows.Forms.PictureBox(); - this.ppkx5 = new System.Windows.Forms.PictureBox(); - this.ppkx6 = new System.Windows.Forms.PictureBox(); + this.SL_Party = new PKHeX.WinForms.Controls.PartyEditor(); this.Tab_Other = new System.Windows.Forms.TabPage(); this.SL_Extra = new PKHeX.WinForms.Controls.SlotList(); this.GB_Daycare = new System.Windows.Forms.GroupBox(); @@ -69,16 +52,6 @@ private void InitializeComponent() this.L_ReadOnlyOther = new System.Windows.Forms.Label(); this.Tab_SAV = new System.Windows.Forms.TabPage(); this.CB_SaveSlot = new System.Windows.Forms.ComboBox(); - this.L_SaveSlot = new System.Windows.Forms.Label(); - this.L_Secure2 = new System.Windows.Forms.Label(); - this.TB_Secure2 = new System.Windows.Forms.TextBox(); - this.L_Secure1 = new System.Windows.Forms.Label(); - this.TB_Secure1 = new System.Windows.Forms.TextBox(); - this.B_JPEG = new System.Windows.Forms.Button(); - this.L_GameSync = new System.Windows.Forms.Label(); - this.TB_GameSync = new System.Windows.Forms.TextBox(); - this.B_SaveBoxBin = new System.Windows.Forms.Button(); - this.B_VerifyCHK = new System.Windows.Forms.Button(); this.GB_SAVtools = new System.Windows.Forms.GroupBox(); this.FLP_SAVtools = new System.Windows.Forms.FlowLayoutPanel(); this.B_OpenTrainerInfo = new System.Windows.Forms.Button(); @@ -108,24 +81,19 @@ private void InitializeComponent() this.B_FestivalPlaza = new System.Windows.Forms.Button(); this.B_MailBox = new System.Windows.Forms.Button(); this.B_OpenApricorn = new System.Windows.Forms.Button(); + this.L_SaveSlot = new System.Windows.Forms.Label(); + this.L_Secure2 = new System.Windows.Forms.Label(); + this.TB_Secure2 = new System.Windows.Forms.TextBox(); + this.L_Secure1 = new System.Windows.Forms.Label(); + this.TB_Secure1 = new System.Windows.Forms.TextBox(); + this.B_JPEG = new System.Windows.Forms.Button(); + this.L_GameSync = new System.Windows.Forms.Label(); + this.TB_GameSync = new System.Windows.Forms.TextBox(); + this.B_SaveBoxBin = new System.Windows.Forms.Button(); + this.B_VerifyCHK = new System.Windows.Forms.Button(); this.tabBoxMulti.SuspendLayout(); this.Tab_Box.SuspendLayout(); this.Tab_PartyBattle.SuspendLayout(); - this.PAN_BattleBox.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.PB_Locked)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bbpkx1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bbpkx2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bbpkx3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bbpkx4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bbpkx5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bbpkx6)).BeginInit(); - this.PAN_Party.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.ppkx1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.ppkx2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.ppkx3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.ppkx4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.ppkx5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.ppkx6)).BeginInit(); this.Tab_Other.SuspendLayout(); this.GB_Daycare.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dcpkx2)).BeginInit(); @@ -138,16 +106,15 @@ private void InitializeComponent() // tabBoxMulti // this.tabBoxMulti.AllowDrop = true; - this.tabBoxMulti.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); this.tabBoxMulti.Controls.Add(this.Tab_Box); this.tabBoxMulti.Controls.Add(this.Tab_PartyBattle); this.tabBoxMulti.Controls.Add(this.Tab_Other); this.tabBoxMulti.Controls.Add(this.Tab_SAV); + this.tabBoxMulti.Dock = System.Windows.Forms.DockStyle.Fill; this.tabBoxMulti.Location = new System.Drawing.Point(0, 0); this.tabBoxMulti.Name = "tabBoxMulti"; this.tabBoxMulti.SelectedIndex = 0; - this.tabBoxMulti.Size = new System.Drawing.Size(310, 225); + this.tabBoxMulti.Size = new System.Drawing.Size(449, 363); this.tabBoxMulti.TabIndex = 101; this.tabBoxMulti.DragOver += new System.Windows.Forms.DragEventHandler(this.MultiDragOver); this.tabBoxMulti.MouseClick += new System.Windows.Forms.MouseEventHandler(this.ClickBoxSort); @@ -160,7 +127,7 @@ private void InitializeComponent() this.Tab_Box.Location = new System.Drawing.Point(4, 22); this.Tab_Box.Name = "Tab_Box"; this.Tab_Box.Padding = new System.Windows.Forms.Padding(3); - this.Tab_Box.Size = new System.Drawing.Size(302, 199); + this.Tab_Box.Size = new System.Drawing.Size(441, 337); this.Tab_Box.TabIndex = 0; this.Tab_Box.Text = "Box"; this.Tab_Box.UseVisualStyleBackColor = true; @@ -168,13 +135,14 @@ private void InitializeComponent() // Box // this.Box.AllowDrop = true; + this.Box.AutoSize = true; this.Box.CanSetCurrentBox = true; this.Box.ControlsEnabled = true; this.Box.ControlsVisible = true; this.Box.CurrentBox = -1; this.Box.Editor = null; this.Box.FlagIllegal = false; - this.Box.Location = new System.Drawing.Point(26, 7); + this.Box.Location = new System.Drawing.Point(99, 7); this.Box.M = null; this.Box.Name = "Box"; this.Box.Size = new System.Drawing.Size(251, 185); @@ -183,197 +151,24 @@ private void InitializeComponent() // Tab_PartyBattle // this.Tab_PartyBattle.AllowDrop = true; - this.Tab_PartyBattle.Controls.Add(this.PAN_BattleBox); - this.Tab_PartyBattle.Controls.Add(this.L_ReadOnlyPBB); - this.Tab_PartyBattle.Controls.Add(this.L_BattleBox); - this.Tab_PartyBattle.Controls.Add(this.L_Party); - this.Tab_PartyBattle.Controls.Add(this.PAN_Party); + this.Tab_PartyBattle.Controls.Add(this.SL_Party); this.Tab_PartyBattle.Location = new System.Drawing.Point(4, 22); this.Tab_PartyBattle.Name = "Tab_PartyBattle"; this.Tab_PartyBattle.Padding = new System.Windows.Forms.Padding(3); - this.Tab_PartyBattle.Size = new System.Drawing.Size(302, 199); + this.Tab_PartyBattle.Size = new System.Drawing.Size(420, 337); this.Tab_PartyBattle.TabIndex = 1; - this.Tab_PartyBattle.Text = "Party-Battle Box"; + this.Tab_PartyBattle.Text = "Party"; this.Tab_PartyBattle.UseVisualStyleBackColor = true; // - // PAN_BattleBox + // SL_Party // - this.PAN_BattleBox.BackgroundImage = global::PKHeX.WinForms.Properties.Resources.party; - this.PAN_BattleBox.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.PAN_BattleBox.Controls.Add(this.PB_Locked); - this.PAN_BattleBox.Controls.Add(this.bbpkx1); - this.PAN_BattleBox.Controls.Add(this.bbpkx2); - this.PAN_BattleBox.Controls.Add(this.bbpkx3); - this.PAN_BattleBox.Controls.Add(this.bbpkx4); - this.PAN_BattleBox.Controls.Add(this.bbpkx5); - this.PAN_BattleBox.Controls.Add(this.bbpkx6); - this.PAN_BattleBox.Location = new System.Drawing.Point(168, 28); - this.PAN_BattleBox.Name = "PAN_BattleBox"; - this.PAN_BattleBox.Size = new System.Drawing.Size(111, 160); - this.PAN_BattleBox.TabIndex = 17; - // - // PB_Locked - // - this.PB_Locked.Image = global::PKHeX.WinForms.Properties.Resources.locked; - this.PB_Locked.Location = new System.Drawing.Point(76, 2); - this.PB_Locked.Name = "PB_Locked"; - this.PB_Locked.Size = new System.Drawing.Size(32, 32); - this.PB_Locked.TabIndex = 14; - this.PB_Locked.TabStop = false; - this.PB_Locked.Visible = false; - // - // bbpkx1 - // - this.bbpkx1.Location = new System.Drawing.Point(11, 14); - this.bbpkx1.Name = "bbpkx1"; - this.bbpkx1.Size = new System.Drawing.Size(40, 30); - this.bbpkx1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.bbpkx1.TabIndex = 8; - this.bbpkx1.TabStop = false; - // - // bbpkx2 - // - this.bbpkx2.Location = new System.Drawing.Point(60, 35); - this.bbpkx2.Name = "bbpkx2"; - this.bbpkx2.Size = new System.Drawing.Size(40, 30); - this.bbpkx2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.bbpkx2.TabIndex = 9; - this.bbpkx2.TabStop = false; - // - // bbpkx3 - // - this.bbpkx3.Location = new System.Drawing.Point(11, 54); - this.bbpkx3.Name = "bbpkx3"; - this.bbpkx3.Size = new System.Drawing.Size(40, 30); - this.bbpkx3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.bbpkx3.TabIndex = 10; - this.bbpkx3.TabStop = false; - // - // bbpkx4 - // - this.bbpkx4.Location = new System.Drawing.Point(60, 75); - this.bbpkx4.Name = "bbpkx4"; - this.bbpkx4.Size = new System.Drawing.Size(40, 30); - this.bbpkx4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.bbpkx4.TabIndex = 11; - this.bbpkx4.TabStop = false; - // - // bbpkx5 - // - this.bbpkx5.Location = new System.Drawing.Point(11, 94); - this.bbpkx5.Name = "bbpkx5"; - this.bbpkx5.Size = new System.Drawing.Size(40, 30); - this.bbpkx5.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.bbpkx5.TabIndex = 12; - this.bbpkx5.TabStop = false; - // - // bbpkx6 - // - this.bbpkx6.Location = new System.Drawing.Point(60, 115); - this.bbpkx6.Name = "bbpkx6"; - this.bbpkx6.Size = new System.Drawing.Size(40, 30); - this.bbpkx6.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.bbpkx6.TabIndex = 13; - this.bbpkx6.TabStop = false; - // - // L_ReadOnlyPBB - // - this.L_ReadOnlyPBB.ForeColor = System.Drawing.Color.Red; - this.L_ReadOnlyPBB.Location = new System.Drawing.Point(175, 186); - this.L_ReadOnlyPBB.Name = "L_ReadOnlyPBB"; - this.L_ReadOnlyPBB.Size = new System.Drawing.Size(100, 13); - this.L_ReadOnlyPBB.TabIndex = 15; - this.L_ReadOnlyPBB.Text = "This is read only."; - this.L_ReadOnlyPBB.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // L_BattleBox - // - this.L_BattleBox.AutoSize = true; - this.L_BattleBox.Location = new System.Drawing.Point(179, 13); - this.L_BattleBox.Name = "L_BattleBox"; - this.L_BattleBox.Size = new System.Drawing.Size(58, 13); - this.L_BattleBox.TabIndex = 1; - this.L_BattleBox.Text = "Battle Box:"; - this.L_BattleBox.Click += new System.EventHandler(this.ClickShowdownExportBattleBox); - // - // L_Party - // - this.L_Party.AutoSize = true; - this.L_Party.Location = new System.Drawing.Point(29, 13); - this.L_Party.Name = "L_Party"; - this.L_Party.Size = new System.Drawing.Size(34, 13); - this.L_Party.TabIndex = 0; - this.L_Party.Text = "Party:"; - this.L_Party.Click += new System.EventHandler(this.ClickShowdownExportParty); - // - // PAN_Party - // - this.PAN_Party.BackgroundImage = global::PKHeX.WinForms.Properties.Resources.party; - this.PAN_Party.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.PAN_Party.Controls.Add(this.ppkx1); - this.PAN_Party.Controls.Add(this.ppkx2); - this.PAN_Party.Controls.Add(this.ppkx3); - this.PAN_Party.Controls.Add(this.ppkx4); - this.PAN_Party.Controls.Add(this.ppkx5); - this.PAN_Party.Controls.Add(this.ppkx6); - this.PAN_Party.Location = new System.Drawing.Point(24, 28); - this.PAN_Party.Name = "PAN_Party"; - this.PAN_Party.Size = new System.Drawing.Size(111, 160); - this.PAN_Party.TabIndex = 16; - // - // ppkx1 - // - this.ppkx1.Location = new System.Drawing.Point(11, 14); - this.ppkx1.Name = "ppkx1"; - this.ppkx1.Size = new System.Drawing.Size(40, 30); - this.ppkx1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.ppkx1.TabIndex = 2; - this.ppkx1.TabStop = false; - // - // ppkx2 - // - this.ppkx2.Location = new System.Drawing.Point(60, 35); - this.ppkx2.Name = "ppkx2"; - this.ppkx2.Size = new System.Drawing.Size(40, 30); - this.ppkx2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.ppkx2.TabIndex = 3; - this.ppkx2.TabStop = false; - // - // ppkx3 - // - this.ppkx3.Location = new System.Drawing.Point(11, 54); - this.ppkx3.Name = "ppkx3"; - this.ppkx3.Size = new System.Drawing.Size(40, 30); - this.ppkx3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.ppkx3.TabIndex = 4; - this.ppkx3.TabStop = false; - // - // ppkx4 - // - this.ppkx4.Location = new System.Drawing.Point(60, 75); - this.ppkx4.Name = "ppkx4"; - this.ppkx4.Size = new System.Drawing.Size(40, 30); - this.ppkx4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.ppkx4.TabIndex = 5; - this.ppkx4.TabStop = false; - // - // ppkx5 - // - this.ppkx5.Location = new System.Drawing.Point(11, 94); - this.ppkx5.Name = "ppkx5"; - this.ppkx5.Size = new System.Drawing.Size(40, 30); - this.ppkx5.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.ppkx5.TabIndex = 6; - this.ppkx5.TabStop = false; - // - // ppkx6 - // - this.ppkx6.Location = new System.Drawing.Point(60, 115); - this.ppkx6.Name = "ppkx6"; - this.ppkx6.Size = new System.Drawing.Size(40, 30); - this.ppkx6.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.ppkx6.TabIndex = 7; - this.ppkx6.TabStop = false; + this.SL_Party.AutoSize = true; + this.SL_Party.FlagIllegal = false; + this.SL_Party.Location = new System.Drawing.Point(6, 6); + this.SL_Party.M = null; + this.SL_Party.Name = "SL_Party"; + this.SL_Party.Size = new System.Drawing.Size(251, 185); + this.SL_Party.TabIndex = 0; // // Tab_Other // @@ -382,7 +177,7 @@ private void InitializeComponent() this.Tab_Other.Controls.Add(this.L_ReadOnlyOther); this.Tab_Other.Location = new System.Drawing.Point(4, 22); this.Tab_Other.Name = "Tab_Other"; - this.Tab_Other.Size = new System.Drawing.Size(302, 199); + this.Tab_Other.Size = new System.Drawing.Size(420, 337); this.Tab_Other.TabIndex = 2; this.Tab_Other.Text = "Other"; this.Tab_Other.UseVisualStyleBackColor = true; @@ -390,10 +185,11 @@ private void InitializeComponent() // SL_Extra // this.SL_Extra.Dock = System.Windows.Forms.DockStyle.Right; - this.SL_Extra.Location = new System.Drawing.Point(227, 0); + this.SL_Extra.FlagIllegal = false; + this.SL_Extra.Location = new System.Drawing.Point(345, 0); this.SL_Extra.Name = "SL_Extra"; this.SL_Extra.SAV = null; - this.SL_Extra.Size = new System.Drawing.Size(75, 199); + this.SL_Extra.Size = new System.Drawing.Size(75, 337); this.SL_Extra.TabIndex = 30; this.SL_Extra.ViewIndex = -1; // @@ -533,6 +329,7 @@ private void InitializeComponent() // Tab_SAV // this.Tab_SAV.Controls.Add(this.CB_SaveSlot); + this.Tab_SAV.Controls.Add(this.GB_SAVtools); this.Tab_SAV.Controls.Add(this.L_SaveSlot); this.Tab_SAV.Controls.Add(this.L_Secure2); this.Tab_SAV.Controls.Add(this.TB_Secure2); @@ -545,7 +342,7 @@ private void InitializeComponent() this.Tab_SAV.Controls.Add(this.B_VerifyCHK); this.Tab_SAV.Location = new System.Drawing.Point(4, 22); this.Tab_SAV.Name = "Tab_SAV"; - this.Tab_SAV.Size = new System.Drawing.Size(302, 199); + this.Tab_SAV.Size = new System.Drawing.Size(420, 337); this.Tab_SAV.TabIndex = 3; this.Tab_SAV.Text = "SAV"; this.Tab_SAV.UseVisualStyleBackColor = true; @@ -560,6 +357,327 @@ private void InitializeComponent() this.CB_SaveSlot.TabIndex = 20; this.CB_SaveSlot.SelectedIndexChanged += new System.EventHandler(this.UpdateSaveSlot); // + // GB_SAVtools + // + this.GB_SAVtools.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.GB_SAVtools.Controls.Add(this.FLP_SAVtools); + this.GB_SAVtools.Location = new System.Drawing.Point(0, 175); + this.GB_SAVtools.Name = "GB_SAVtools"; + this.GB_SAVtools.Size = new System.Drawing.Size(420, 162); + this.GB_SAVtools.TabIndex = 102; + this.GB_SAVtools.TabStop = false; + // + // FLP_SAVtools + // + this.FLP_SAVtools.AutoScroll = true; + this.FLP_SAVtools.Controls.Add(this.B_OpenTrainerInfo); + this.FLP_SAVtools.Controls.Add(this.B_OpenItemPouch); + this.FLP_SAVtools.Controls.Add(this.B_OpenBoxLayout); + this.FLP_SAVtools.Controls.Add(this.B_OpenWondercards); + this.FLP_SAVtools.Controls.Add(this.B_OpenOPowers); + this.FLP_SAVtools.Controls.Add(this.B_OpenEventFlags); + this.FLP_SAVtools.Controls.Add(this.B_OpenPokedex); + this.FLP_SAVtools.Controls.Add(this.B_OpenLinkInfo); + this.FLP_SAVtools.Controls.Add(this.B_OpenBerryField); + this.FLP_SAVtools.Controls.Add(this.B_OpenPokeblocks); + this.FLP_SAVtools.Controls.Add(this.B_OpenSecretBase); + this.FLP_SAVtools.Controls.Add(this.B_OpenPokepuffs); + this.FLP_SAVtools.Controls.Add(this.B_OpenSuperTraining); + this.FLP_SAVtools.Controls.Add(this.B_OpenHallofFame); + this.FLP_SAVtools.Controls.Add(this.B_OUTPasserby); + this.FLP_SAVtools.Controls.Add(this.B_CGearSkin); + this.FLP_SAVtools.Controls.Add(this.B_OpenPokeBeans); + this.FLP_SAVtools.Controls.Add(this.B_CellsStickers); + this.FLP_SAVtools.Controls.Add(this.B_OpenMiscEditor); + this.FLP_SAVtools.Controls.Add(this.B_OpenHoneyTreeEditor); + this.FLP_SAVtools.Controls.Add(this.B_OpenFriendSafari); + this.FLP_SAVtools.Controls.Add(this.B_OpenRTCEditor); + this.FLP_SAVtools.Controls.Add(this.B_OpenUGSEditor); + this.FLP_SAVtools.Controls.Add(this.B_Roamer); + this.FLP_SAVtools.Controls.Add(this.B_FestivalPlaza); + this.FLP_SAVtools.Controls.Add(this.B_MailBox); + this.FLP_SAVtools.Controls.Add(this.B_OpenApricorn); + this.FLP_SAVtools.Dock = System.Windows.Forms.DockStyle.Fill; + this.FLP_SAVtools.Location = new System.Drawing.Point(3, 16); + this.FLP_SAVtools.Name = "FLP_SAVtools"; + this.FLP_SAVtools.Size = new System.Drawing.Size(414, 143); + this.FLP_SAVtools.TabIndex = 101; + // + // B_OpenTrainerInfo + // + this.B_OpenTrainerInfo.Location = new System.Drawing.Point(3, 3); + this.B_OpenTrainerInfo.Name = "B_OpenTrainerInfo"; + this.B_OpenTrainerInfo.Size = new System.Drawing.Size(87, 23); + this.B_OpenTrainerInfo.TabIndex = 3; + this.B_OpenTrainerInfo.Text = "Trainer Info"; + this.B_OpenTrainerInfo.UseVisualStyleBackColor = true; + this.B_OpenTrainerInfo.Click += new System.EventHandler(this.B_OpenTrainerInfo_Click); + // + // B_OpenItemPouch + // + this.B_OpenItemPouch.Location = new System.Drawing.Point(96, 3); + this.B_OpenItemPouch.Name = "B_OpenItemPouch"; + this.B_OpenItemPouch.Size = new System.Drawing.Size(87, 23); + this.B_OpenItemPouch.TabIndex = 2; + this.B_OpenItemPouch.Text = "Items"; + this.B_OpenItemPouch.UseVisualStyleBackColor = true; + this.B_OpenItemPouch.Click += new System.EventHandler(this.B_OpenItemPouch_Click); + // + // B_OpenBoxLayout + // + this.B_OpenBoxLayout.Location = new System.Drawing.Point(189, 3); + this.B_OpenBoxLayout.Name = "B_OpenBoxLayout"; + this.B_OpenBoxLayout.Size = new System.Drawing.Size(87, 23); + this.B_OpenBoxLayout.TabIndex = 5; + this.B_OpenBoxLayout.Text = "Box Layout"; + this.B_OpenBoxLayout.UseVisualStyleBackColor = true; + this.B_OpenBoxLayout.Click += new System.EventHandler(this.B_OpenBoxLayout_Click); + // + // B_OpenWondercards + // + this.B_OpenWondercards.Location = new System.Drawing.Point(282, 3); + this.B_OpenWondercards.Name = "B_OpenWondercards"; + this.B_OpenWondercards.Size = new System.Drawing.Size(87, 23); + this.B_OpenWondercards.TabIndex = 6; + this.B_OpenWondercards.Text = "Wondercard"; + this.B_OpenWondercards.UseVisualStyleBackColor = true; + this.B_OpenWondercards.Click += new System.EventHandler(this.B_OpenWondercards_Click); + // + // B_OpenOPowers + // + this.B_OpenOPowers.Location = new System.Drawing.Point(3, 32); + this.B_OpenOPowers.Name = "B_OpenOPowers"; + this.B_OpenOPowers.Size = new System.Drawing.Size(87, 23); + this.B_OpenOPowers.TabIndex = 9; + this.B_OpenOPowers.Text = "O-Powers"; + this.B_OpenOPowers.UseVisualStyleBackColor = true; + this.B_OpenOPowers.Click += new System.EventHandler(this.B_OpenOPowers_Click); + // + // B_OpenEventFlags + // + this.B_OpenEventFlags.Location = new System.Drawing.Point(96, 32); + this.B_OpenEventFlags.Name = "B_OpenEventFlags"; + this.B_OpenEventFlags.Size = new System.Drawing.Size(87, 23); + this.B_OpenEventFlags.TabIndex = 10; + this.B_OpenEventFlags.Text = "Event Flags"; + this.B_OpenEventFlags.UseVisualStyleBackColor = true; + this.B_OpenEventFlags.Click += new System.EventHandler(this.B_OpenEventFlags_Click); + // + // B_OpenPokedex + // + this.B_OpenPokedex.Location = new System.Drawing.Point(189, 32); + this.B_OpenPokedex.Name = "B_OpenPokedex"; + this.B_OpenPokedex.Size = new System.Drawing.Size(87, 23); + this.B_OpenPokedex.TabIndex = 11; + this.B_OpenPokedex.Text = "Pokédex"; + this.B_OpenPokedex.UseVisualStyleBackColor = true; + this.B_OpenPokedex.Click += new System.EventHandler(this.B_OpenPokedex_Click); + // + // B_OpenLinkInfo + // + this.B_OpenLinkInfo.Location = new System.Drawing.Point(282, 32); + this.B_OpenLinkInfo.Name = "B_OpenLinkInfo"; + this.B_OpenLinkInfo.Size = new System.Drawing.Size(87, 23); + this.B_OpenLinkInfo.TabIndex = 23; + this.B_OpenLinkInfo.Text = "Link Data"; + this.B_OpenLinkInfo.UseVisualStyleBackColor = true; + this.B_OpenLinkInfo.Click += new System.EventHandler(this.B_LinkInfo_Click); + // + // B_OpenBerryField + // + this.B_OpenBerryField.Location = new System.Drawing.Point(3, 61); + this.B_OpenBerryField.Name = "B_OpenBerryField"; + this.B_OpenBerryField.Size = new System.Drawing.Size(87, 23); + this.B_OpenBerryField.TabIndex = 12; + this.B_OpenBerryField.Text = "Berry Field"; + this.B_OpenBerryField.UseVisualStyleBackColor = true; + this.B_OpenBerryField.Click += new System.EventHandler(this.B_OpenBerryField_Click); + // + // B_OpenPokeblocks + // + this.B_OpenPokeblocks.Location = new System.Drawing.Point(96, 61); + this.B_OpenPokeblocks.Name = "B_OpenPokeblocks"; + this.B_OpenPokeblocks.Size = new System.Drawing.Size(87, 23); + this.B_OpenPokeblocks.TabIndex = 22; + this.B_OpenPokeblocks.Text = "Pokéblocks"; + this.B_OpenPokeblocks.UseVisualStyleBackColor = true; + this.B_OpenPokeblocks.Visible = false; + this.B_OpenPokeblocks.Click += new System.EventHandler(this.B_OpenPokeblocks_Click); + // + // B_OpenSecretBase + // + this.B_OpenSecretBase.Location = new System.Drawing.Point(189, 61); + this.B_OpenSecretBase.Name = "B_OpenSecretBase"; + this.B_OpenSecretBase.Size = new System.Drawing.Size(87, 23); + this.B_OpenSecretBase.TabIndex = 21; + this.B_OpenSecretBase.Text = "Secret Base"; + this.B_OpenSecretBase.UseVisualStyleBackColor = true; + this.B_OpenSecretBase.Visible = false; + this.B_OpenSecretBase.Click += new System.EventHandler(this.B_OpenSecretBase_Click); + // + // B_OpenPokepuffs + // + this.B_OpenPokepuffs.Location = new System.Drawing.Point(282, 61); + this.B_OpenPokepuffs.Name = "B_OpenPokepuffs"; + this.B_OpenPokepuffs.Size = new System.Drawing.Size(87, 23); + this.B_OpenPokepuffs.TabIndex = 1; + this.B_OpenPokepuffs.Text = "‎Poké Puffs"; + this.B_OpenPokepuffs.UseVisualStyleBackColor = true; + this.B_OpenPokepuffs.Click += new System.EventHandler(this.B_OpenPokepuffs_Click); + // + // B_OpenSuperTraining + // + this.B_OpenSuperTraining.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.B_OpenSuperTraining.Location = new System.Drawing.Point(3, 90); + this.B_OpenSuperTraining.Name = "B_OpenSuperTraining"; + this.B_OpenSuperTraining.Size = new System.Drawing.Size(87, 23); + this.B_OpenSuperTraining.TabIndex = 7; + this.B_OpenSuperTraining.Text = "Super Train"; + this.B_OpenSuperTraining.UseVisualStyleBackColor = true; + this.B_OpenSuperTraining.Click += new System.EventHandler(this.B_OpenSuperTraining_Click); + // + // B_OpenHallofFame + // + this.B_OpenHallofFame.Location = new System.Drawing.Point(96, 90); + this.B_OpenHallofFame.Name = "B_OpenHallofFame"; + this.B_OpenHallofFame.Size = new System.Drawing.Size(87, 23); + this.B_OpenHallofFame.TabIndex = 8; + this.B_OpenHallofFame.Text = "Hall of Fame"; + this.B_OpenHallofFame.UseVisualStyleBackColor = true; + this.B_OpenHallofFame.Click += new System.EventHandler(this.B_OUTHallofFame_Click); + // + // B_OUTPasserby + // + this.B_OUTPasserby.Location = new System.Drawing.Point(189, 90); + this.B_OUTPasserby.Name = "B_OUTPasserby"; + this.B_OUTPasserby.Size = new System.Drawing.Size(87, 23); + this.B_OUTPasserby.TabIndex = 4; + this.B_OUTPasserby.Text = "Passerby"; + this.B_OUTPasserby.UseVisualStyleBackColor = true; + this.B_OUTPasserby.Click += new System.EventHandler(this.B_OUTPasserby_Click); + // + // B_CGearSkin + // + this.B_CGearSkin.Location = new System.Drawing.Point(282, 90); + this.B_CGearSkin.Name = "B_CGearSkin"; + this.B_CGearSkin.Size = new System.Drawing.Size(87, 23); + this.B_CGearSkin.TabIndex = 24; + this.B_CGearSkin.Text = "C-Gear Skin"; + this.B_CGearSkin.UseVisualStyleBackColor = true; + this.B_CGearSkin.Click += new System.EventHandler(this.B_CGearSkin_Click); + // + // B_OpenPokeBeans + // + this.B_OpenPokeBeans.Location = new System.Drawing.Point(3, 119); + this.B_OpenPokeBeans.Name = "B_OpenPokeBeans"; + this.B_OpenPokeBeans.Size = new System.Drawing.Size(87, 23); + this.B_OpenPokeBeans.TabIndex = 25; + this.B_OpenPokeBeans.Text = "‎Poké Beans"; + this.B_OpenPokeBeans.UseVisualStyleBackColor = true; + this.B_OpenPokeBeans.Click += new System.EventHandler(this.B_OpenPokeBeans_Click); + // + // B_CellsStickers + // + this.B_CellsStickers.Location = new System.Drawing.Point(96, 119); + this.B_CellsStickers.Name = "B_CellsStickers"; + this.B_CellsStickers.Size = new System.Drawing.Size(87, 23); + this.B_CellsStickers.TabIndex = 26; + this.B_CellsStickers.Text = "Cells/Stickers"; + this.B_CellsStickers.UseVisualStyleBackColor = true; + this.B_CellsStickers.Click += new System.EventHandler(this.B_CellsStickers_Click); + // + // B_OpenMiscEditor + // + this.B_OpenMiscEditor.Location = new System.Drawing.Point(189, 119); + this.B_OpenMiscEditor.Name = "B_OpenMiscEditor"; + this.B_OpenMiscEditor.Size = new System.Drawing.Size(87, 23); + this.B_OpenMiscEditor.TabIndex = 27; + this.B_OpenMiscEditor.Text = "Misc Edits"; + this.B_OpenMiscEditor.UseVisualStyleBackColor = true; + this.B_OpenMiscEditor.Click += new System.EventHandler(this.B_OpenMiscEditor_Click); + // + // B_OpenHoneyTreeEditor + // + this.B_OpenHoneyTreeEditor.Location = new System.Drawing.Point(282, 119); + this.B_OpenHoneyTreeEditor.Name = "B_OpenHoneyTreeEditor"; + this.B_OpenHoneyTreeEditor.Size = new System.Drawing.Size(87, 23); + this.B_OpenHoneyTreeEditor.TabIndex = 28; + this.B_OpenHoneyTreeEditor.Text = "Honey Tree"; + this.B_OpenHoneyTreeEditor.UseVisualStyleBackColor = true; + this.B_OpenHoneyTreeEditor.Click += new System.EventHandler(this.B_OpenHoneyTreeEditor_Click); + // + // B_OpenFriendSafari + // + this.B_OpenFriendSafari.Location = new System.Drawing.Point(3, 148); + this.B_OpenFriendSafari.Name = "B_OpenFriendSafari"; + this.B_OpenFriendSafari.Size = new System.Drawing.Size(87, 23); + this.B_OpenFriendSafari.TabIndex = 28; + this.B_OpenFriendSafari.Text = "Friend Safari"; + this.B_OpenFriendSafari.UseVisualStyleBackColor = true; + this.B_OpenFriendSafari.Click += new System.EventHandler(this.B_OpenFriendSafari_Click); + // + // B_OpenRTCEditor + // + this.B_OpenRTCEditor.Location = new System.Drawing.Point(96, 148); + this.B_OpenRTCEditor.Name = "B_OpenRTCEditor"; + this.B_OpenRTCEditor.Size = new System.Drawing.Size(87, 23); + this.B_OpenRTCEditor.TabIndex = 29; + this.B_OpenRTCEditor.Text = "Clock (RTC)"; + this.B_OpenRTCEditor.UseVisualStyleBackColor = true; + this.B_OpenRTCEditor.Click += new System.EventHandler(this.B_OpenRTCEditor_Click); + // + // B_OpenUGSEditor + // + this.B_OpenUGSEditor.Location = new System.Drawing.Point(189, 148); + this.B_OpenUGSEditor.Name = "B_OpenUGSEditor"; + this.B_OpenUGSEditor.Size = new System.Drawing.Size(87, 23); + this.B_OpenUGSEditor.TabIndex = 2; + this.B_OpenUGSEditor.Text = "Underground"; + this.B_OpenUGSEditor.UseVisualStyleBackColor = true; + this.B_OpenUGSEditor.Click += new System.EventHandler(this.B_OpenUGSEditor_Click); + // + // B_Roamer + // + this.B_Roamer.Location = new System.Drawing.Point(282, 148); + this.B_Roamer.Name = "B_Roamer"; + this.B_Roamer.Size = new System.Drawing.Size(87, 23); + this.B_Roamer.TabIndex = 30; + this.B_Roamer.Text = "Roamer"; + this.B_Roamer.UseVisualStyleBackColor = true; + this.B_Roamer.Click += new System.EventHandler(this.B_Roamer_Click); + // + // B_FestivalPlaza + // + this.B_FestivalPlaza.Location = new System.Drawing.Point(3, 177); + this.B_FestivalPlaza.Name = "B_FestivalPlaza"; + this.B_FestivalPlaza.Size = new System.Drawing.Size(87, 23); + this.B_FestivalPlaza.TabIndex = 31; + this.B_FestivalPlaza.Text = "Festival Plaza"; + this.B_FestivalPlaza.UseVisualStyleBackColor = true; + this.B_FestivalPlaza.Click += new System.EventHandler(this.B_FestivalPlaza_Click); + // + // B_MailBox + // + this.B_MailBox.Location = new System.Drawing.Point(96, 177); + this.B_MailBox.Name = "B_MailBox"; + this.B_MailBox.Size = new System.Drawing.Size(87, 23); + this.B_MailBox.TabIndex = 32; + this.B_MailBox.Text = "Mail Box"; + this.B_MailBox.UseVisualStyleBackColor = true; + this.B_MailBox.Click += new System.EventHandler(this.B_MailBox_Click); + // + // B_OpenApricorn + // + this.B_OpenApricorn.Location = new System.Drawing.Point(189, 177); + this.B_OpenApricorn.Name = "B_OpenApricorn"; + this.B_OpenApricorn.Size = new System.Drawing.Size(87, 23); + this.B_OpenApricorn.TabIndex = 33; + this.B_OpenApricorn.Text = "Apricorns"; + this.B_OpenApricorn.UseVisualStyleBackColor = true; + this.B_OpenApricorn.Click += new System.EventHandler(this.B_OpenApricorn_Click); + // // L_SaveSlot // this.L_SaveSlot.AutoSize = true; @@ -663,357 +781,17 @@ private void InitializeComponent() this.B_VerifyCHK.UseVisualStyleBackColor = true; this.B_VerifyCHK.Click += new System.EventHandler(this.ClickVerifyCHK); // - // GB_SAVtools - // - this.GB_SAVtools.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.GB_SAVtools.Controls.Add(this.FLP_SAVtools); - this.GB_SAVtools.Location = new System.Drawing.Point(0, 225); - this.GB_SAVtools.Name = "GB_SAVtools"; - this.GB_SAVtools.Size = new System.Drawing.Size(308, 101); - this.GB_SAVtools.TabIndex = 102; - this.GB_SAVtools.TabStop = false; - // - // FLP_SAVtools - // - this.FLP_SAVtools.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.FLP_SAVtools.AutoScroll = true; - this.FLP_SAVtools.Controls.Add(this.B_OpenTrainerInfo); - this.FLP_SAVtools.Controls.Add(this.B_OpenItemPouch); - this.FLP_SAVtools.Controls.Add(this.B_OpenBoxLayout); - this.FLP_SAVtools.Controls.Add(this.B_OpenWondercards); - this.FLP_SAVtools.Controls.Add(this.B_OpenOPowers); - this.FLP_SAVtools.Controls.Add(this.B_OpenEventFlags); - this.FLP_SAVtools.Controls.Add(this.B_OpenPokedex); - this.FLP_SAVtools.Controls.Add(this.B_OpenLinkInfo); - this.FLP_SAVtools.Controls.Add(this.B_OpenBerryField); - this.FLP_SAVtools.Controls.Add(this.B_OpenPokeblocks); - this.FLP_SAVtools.Controls.Add(this.B_OpenSecretBase); - this.FLP_SAVtools.Controls.Add(this.B_OpenPokepuffs); - this.FLP_SAVtools.Controls.Add(this.B_OpenSuperTraining); - this.FLP_SAVtools.Controls.Add(this.B_OpenHallofFame); - this.FLP_SAVtools.Controls.Add(this.B_OUTPasserby); - this.FLP_SAVtools.Controls.Add(this.B_CGearSkin); - this.FLP_SAVtools.Controls.Add(this.B_OpenPokeBeans); - this.FLP_SAVtools.Controls.Add(this.B_CellsStickers); - this.FLP_SAVtools.Controls.Add(this.B_OpenMiscEditor); - this.FLP_SAVtools.Controls.Add(this.B_OpenHoneyTreeEditor); - this.FLP_SAVtools.Controls.Add(this.B_OpenFriendSafari); - this.FLP_SAVtools.Controls.Add(this.B_OpenRTCEditor); - this.FLP_SAVtools.Controls.Add(this.B_OpenUGSEditor); - this.FLP_SAVtools.Controls.Add(this.B_Roamer); - this.FLP_SAVtools.Controls.Add(this.B_FestivalPlaza); - this.FLP_SAVtools.Controls.Add(this.B_MailBox); - this.FLP_SAVtools.Controls.Add(this.B_OpenApricorn); - this.FLP_SAVtools.Location = new System.Drawing.Point(6, 10); - this.FLP_SAVtools.Name = "FLP_SAVtools"; - this.FLP_SAVtools.Size = new System.Drawing.Size(297, 88); - this.FLP_SAVtools.TabIndex = 101; - // - // B_OpenTrainerInfo - // - this.B_OpenTrainerInfo.Location = new System.Drawing.Point(3, 3); - this.B_OpenTrainerInfo.Name = "B_OpenTrainerInfo"; - this.B_OpenTrainerInfo.Size = new System.Drawing.Size(87, 23); - this.B_OpenTrainerInfo.TabIndex = 3; - this.B_OpenTrainerInfo.Text = "Trainer Info"; - this.B_OpenTrainerInfo.UseVisualStyleBackColor = true; - this.B_OpenTrainerInfo.Click += new System.EventHandler(this.B_OpenTrainerInfo_Click); - // - // B_OpenItemPouch - // - this.B_OpenItemPouch.Location = new System.Drawing.Point(96, 3); - this.B_OpenItemPouch.Name = "B_OpenItemPouch"; - this.B_OpenItemPouch.Size = new System.Drawing.Size(87, 23); - this.B_OpenItemPouch.TabIndex = 2; - this.B_OpenItemPouch.Text = "Items"; - this.B_OpenItemPouch.UseVisualStyleBackColor = true; - this.B_OpenItemPouch.Click += new System.EventHandler(this.B_OpenItemPouch_Click); - // - // B_OpenBoxLayout - // - this.B_OpenBoxLayout.Location = new System.Drawing.Point(189, 3); - this.B_OpenBoxLayout.Name = "B_OpenBoxLayout"; - this.B_OpenBoxLayout.Size = new System.Drawing.Size(87, 23); - this.B_OpenBoxLayout.TabIndex = 5; - this.B_OpenBoxLayout.Text = "Box Layout"; - this.B_OpenBoxLayout.UseVisualStyleBackColor = true; - this.B_OpenBoxLayout.Click += new System.EventHandler(this.B_OpenBoxLayout_Click); - // - // B_OpenWondercards - // - this.B_OpenWondercards.Location = new System.Drawing.Point(3, 32); - this.B_OpenWondercards.Name = "B_OpenWondercards"; - this.B_OpenWondercards.Size = new System.Drawing.Size(87, 23); - this.B_OpenWondercards.TabIndex = 6; - this.B_OpenWondercards.Text = "Wondercard"; - this.B_OpenWondercards.UseVisualStyleBackColor = true; - this.B_OpenWondercards.Click += new System.EventHandler(this.B_OpenWondercards_Click); - // - // B_OpenOPowers - // - this.B_OpenOPowers.Location = new System.Drawing.Point(96, 32); - this.B_OpenOPowers.Name = "B_OpenOPowers"; - this.B_OpenOPowers.Size = new System.Drawing.Size(87, 23); - this.B_OpenOPowers.TabIndex = 9; - this.B_OpenOPowers.Text = "O-Powers"; - this.B_OpenOPowers.UseVisualStyleBackColor = true; - this.B_OpenOPowers.Click += new System.EventHandler(this.B_OpenOPowers_Click); - // - // B_OpenEventFlags - // - this.B_OpenEventFlags.Location = new System.Drawing.Point(189, 32); - this.B_OpenEventFlags.Name = "B_OpenEventFlags"; - this.B_OpenEventFlags.Size = new System.Drawing.Size(87, 23); - this.B_OpenEventFlags.TabIndex = 10; - this.B_OpenEventFlags.Text = "Event Flags"; - this.B_OpenEventFlags.UseVisualStyleBackColor = true; - this.B_OpenEventFlags.Click += new System.EventHandler(this.B_OpenEventFlags_Click); - // - // B_OpenPokedex - // - this.B_OpenPokedex.Location = new System.Drawing.Point(3, 61); - this.B_OpenPokedex.Name = "B_OpenPokedex"; - this.B_OpenPokedex.Size = new System.Drawing.Size(87, 23); - this.B_OpenPokedex.TabIndex = 11; - this.B_OpenPokedex.Text = "Pokédex"; - this.B_OpenPokedex.UseVisualStyleBackColor = true; - this.B_OpenPokedex.Click += new System.EventHandler(this.B_OpenPokedex_Click); - // - // B_OpenLinkInfo - // - this.B_OpenLinkInfo.Location = new System.Drawing.Point(96, 61); - this.B_OpenLinkInfo.Name = "B_OpenLinkInfo"; - this.B_OpenLinkInfo.Size = new System.Drawing.Size(87, 23); - this.B_OpenLinkInfo.TabIndex = 23; - this.B_OpenLinkInfo.Text = "Link Data"; - this.B_OpenLinkInfo.UseVisualStyleBackColor = true; - this.B_OpenLinkInfo.Click += new System.EventHandler(this.B_LinkInfo_Click); - // - // B_OpenBerryField - // - this.B_OpenBerryField.Location = new System.Drawing.Point(189, 61); - this.B_OpenBerryField.Name = "B_OpenBerryField"; - this.B_OpenBerryField.Size = new System.Drawing.Size(87, 23); - this.B_OpenBerryField.TabIndex = 12; - this.B_OpenBerryField.Text = "Berry Field"; - this.B_OpenBerryField.UseVisualStyleBackColor = true; - this.B_OpenBerryField.Click += new System.EventHandler(this.B_OpenBerryField_Click); - // - // B_OpenPokeblocks - // - this.B_OpenPokeblocks.Location = new System.Drawing.Point(3, 90); - this.B_OpenPokeblocks.Name = "B_OpenPokeblocks"; - this.B_OpenPokeblocks.Size = new System.Drawing.Size(87, 23); - this.B_OpenPokeblocks.TabIndex = 22; - this.B_OpenPokeblocks.Text = "Pokéblocks"; - this.B_OpenPokeblocks.UseVisualStyleBackColor = true; - this.B_OpenPokeblocks.Visible = false; - this.B_OpenPokeblocks.Click += new System.EventHandler(this.B_OpenPokeblocks_Click); - // - // B_OpenSecretBase - // - this.B_OpenSecretBase.Location = new System.Drawing.Point(96, 90); - this.B_OpenSecretBase.Name = "B_OpenSecretBase"; - this.B_OpenSecretBase.Size = new System.Drawing.Size(87, 23); - this.B_OpenSecretBase.TabIndex = 21; - this.B_OpenSecretBase.Text = "Secret Base"; - this.B_OpenSecretBase.UseVisualStyleBackColor = true; - this.B_OpenSecretBase.Visible = false; - this.B_OpenSecretBase.Click += new System.EventHandler(this.B_OpenSecretBase_Click); - // - // B_OpenPokepuffs - // - this.B_OpenPokepuffs.Location = new System.Drawing.Point(189, 90); - this.B_OpenPokepuffs.Name = "B_OpenPokepuffs"; - this.B_OpenPokepuffs.Size = new System.Drawing.Size(87, 23); - this.B_OpenPokepuffs.TabIndex = 1; - this.B_OpenPokepuffs.Text = "‎Poké Puffs"; - this.B_OpenPokepuffs.UseVisualStyleBackColor = true; - this.B_OpenPokepuffs.Click += new System.EventHandler(this.B_OpenPokepuffs_Click); - // - // B_OpenSuperTraining - // - this.B_OpenSuperTraining.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.B_OpenSuperTraining.Location = new System.Drawing.Point(3, 119); - this.B_OpenSuperTraining.Name = "B_OpenSuperTraining"; - this.B_OpenSuperTraining.Size = new System.Drawing.Size(87, 23); - this.B_OpenSuperTraining.TabIndex = 7; - this.B_OpenSuperTraining.Text = "Super Train"; - this.B_OpenSuperTraining.UseVisualStyleBackColor = true; - this.B_OpenSuperTraining.Click += new System.EventHandler(this.B_OpenSuperTraining_Click); - // - // B_OpenHallofFame - // - this.B_OpenHallofFame.Location = new System.Drawing.Point(96, 119); - this.B_OpenHallofFame.Name = "B_OpenHallofFame"; - this.B_OpenHallofFame.Size = new System.Drawing.Size(87, 23); - this.B_OpenHallofFame.TabIndex = 8; - this.B_OpenHallofFame.Text = "Hall of Fame"; - this.B_OpenHallofFame.UseVisualStyleBackColor = true; - this.B_OpenHallofFame.Click += new System.EventHandler(this.B_OUTHallofFame_Click); - // - // B_OUTPasserby - // - this.B_OUTPasserby.Location = new System.Drawing.Point(189, 119); - this.B_OUTPasserby.Name = "B_OUTPasserby"; - this.B_OUTPasserby.Size = new System.Drawing.Size(87, 23); - this.B_OUTPasserby.TabIndex = 4; - this.B_OUTPasserby.Text = "Passerby"; - this.B_OUTPasserby.UseVisualStyleBackColor = true; - this.B_OUTPasserby.Click += new System.EventHandler(this.B_OUTPasserby_Click); - // - // B_CGearSkin - // - this.B_CGearSkin.Location = new System.Drawing.Point(3, 148); - this.B_CGearSkin.Name = "B_CGearSkin"; - this.B_CGearSkin.Size = new System.Drawing.Size(87, 23); - this.B_CGearSkin.TabIndex = 24; - this.B_CGearSkin.Text = "C-Gear Skin"; - this.B_CGearSkin.UseVisualStyleBackColor = true; - this.B_CGearSkin.Click += new System.EventHandler(this.B_CGearSkin_Click); - // - // B_OpenPokeBeans - // - this.B_OpenPokeBeans.Location = new System.Drawing.Point(96, 148); - this.B_OpenPokeBeans.Name = "B_OpenPokeBeans"; - this.B_OpenPokeBeans.Size = new System.Drawing.Size(87, 23); - this.B_OpenPokeBeans.TabIndex = 25; - this.B_OpenPokeBeans.Text = "‎Poké Beans"; - this.B_OpenPokeBeans.UseVisualStyleBackColor = true; - this.B_OpenPokeBeans.Click += new System.EventHandler(this.B_OpenPokeBeans_Click); - // - // B_CellsStickers - // - this.B_CellsStickers.Location = new System.Drawing.Point(189, 148); - this.B_CellsStickers.Name = "B_CellsStickers"; - this.B_CellsStickers.Size = new System.Drawing.Size(87, 23); - this.B_CellsStickers.TabIndex = 26; - this.B_CellsStickers.Text = "Cells/Stickers"; - this.B_CellsStickers.UseVisualStyleBackColor = true; - this.B_CellsStickers.Click += new System.EventHandler(this.B_CellsStickers_Click); - // - // B_OpenMiscEditor - // - this.B_OpenMiscEditor.Location = new System.Drawing.Point(3, 177); - this.B_OpenMiscEditor.Name = "B_OpenMiscEditor"; - this.B_OpenMiscEditor.Size = new System.Drawing.Size(87, 23); - this.B_OpenMiscEditor.TabIndex = 27; - this.B_OpenMiscEditor.Text = "Misc Edits"; - this.B_OpenMiscEditor.UseVisualStyleBackColor = true; - this.B_OpenMiscEditor.Click += new System.EventHandler(this.B_OpenMiscEditor_Click); - // - // B_OpenHoneyTreeEditor - // - this.B_OpenHoneyTreeEditor.Location = new System.Drawing.Point(96, 177); - this.B_OpenHoneyTreeEditor.Name = "B_OpenHoneyTreeEditor"; - this.B_OpenHoneyTreeEditor.Size = new System.Drawing.Size(87, 23); - this.B_OpenHoneyTreeEditor.TabIndex = 28; - this.B_OpenHoneyTreeEditor.Text = "Honey Tree"; - this.B_OpenHoneyTreeEditor.UseVisualStyleBackColor = true; - this.B_OpenHoneyTreeEditor.Click += new System.EventHandler(this.B_OpenHoneyTreeEditor_Click); - // - // B_OpenFriendSafari - // - this.B_OpenFriendSafari.Location = new System.Drawing.Point(189, 177); - this.B_OpenFriendSafari.Name = "B_OpenFriendSafari"; - this.B_OpenFriendSafari.Size = new System.Drawing.Size(87, 23); - this.B_OpenFriendSafari.TabIndex = 28; - this.B_OpenFriendSafari.Text = "Friend Safari"; - this.B_OpenFriendSafari.UseVisualStyleBackColor = true; - this.B_OpenFriendSafari.Click += new System.EventHandler(this.B_OpenFriendSafari_Click); - // - // B_OpenRTCEditor - // - this.B_OpenRTCEditor.Location = new System.Drawing.Point(3, 206); - this.B_OpenRTCEditor.Name = "B_OpenRTCEditor"; - this.B_OpenRTCEditor.Size = new System.Drawing.Size(87, 23); - this.B_OpenRTCEditor.TabIndex = 29; - this.B_OpenRTCEditor.Text = "Clock (RTC)"; - this.B_OpenRTCEditor.UseVisualStyleBackColor = true; - this.B_OpenRTCEditor.Click += new System.EventHandler(this.B_OpenRTCEditor_Click); - // - // B_OpenUGSEditor - // - this.B_OpenUGSEditor.Location = new System.Drawing.Point(96, 206); - this.B_OpenUGSEditor.Name = "B_OpenUGSEditor"; - this.B_OpenUGSEditor.Size = new System.Drawing.Size(87, 23); - this.B_OpenUGSEditor.TabIndex = 2; - this.B_OpenUGSEditor.Text = "Underground"; - this.B_OpenUGSEditor.UseVisualStyleBackColor = true; - this.B_OpenUGSEditor.Click += new System.EventHandler(this.B_OpenUGSEditor_Click); - // - // B_Roamer - // - this.B_Roamer.Location = new System.Drawing.Point(189, 206); - this.B_Roamer.Name = "B_Roamer"; - this.B_Roamer.Size = new System.Drawing.Size(87, 23); - this.B_Roamer.TabIndex = 30; - this.B_Roamer.Text = "Roamer"; - this.B_Roamer.UseVisualStyleBackColor = true; - this.B_Roamer.Click += new System.EventHandler(this.B_Roamer_Click); - // - // B_FestivalPlaza - // - this.B_FestivalPlaza.Location = new System.Drawing.Point(3, 235); - this.B_FestivalPlaza.Name = "B_FestivalPlaza"; - this.B_FestivalPlaza.Size = new System.Drawing.Size(87, 23); - this.B_FestivalPlaza.TabIndex = 31; - this.B_FestivalPlaza.Text = "Festival Plaza"; - this.B_FestivalPlaza.UseVisualStyleBackColor = true; - this.B_FestivalPlaza.Click += new System.EventHandler(this.B_FestivalPlaza_Click); - // - // B_MailBox - // - this.B_MailBox.Location = new System.Drawing.Point(96, 235); - this.B_MailBox.Name = "B_MailBox"; - this.B_MailBox.Size = new System.Drawing.Size(87, 23); - this.B_MailBox.TabIndex = 32; - this.B_MailBox.Text = "Mail Box"; - this.B_MailBox.UseVisualStyleBackColor = true; - this.B_MailBox.Click += new System.EventHandler(this.B_MailBox_Click); - // - // B_OpenApricorn - // - this.B_OpenApricorn.Location = new System.Drawing.Point(189, 235); - this.B_OpenApricorn.Name = "B_OpenApricorn"; - this.B_OpenApricorn.Size = new System.Drawing.Size(87, 23); - this.B_OpenApricorn.TabIndex = 33; - this.B_OpenApricorn.Text = "Apricorns"; - this.B_OpenApricorn.UseVisualStyleBackColor = true; - this.B_OpenApricorn.Click += new System.EventHandler(this.B_OpenApricorn_Click); - // // SAVEditor // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.Controls.Add(this.tabBoxMulti); - this.Controls.Add(this.GB_SAVtools); this.Name = "SAVEditor"; - this.Size = new System.Drawing.Size(310, 326); + this.Size = new System.Drawing.Size(449, 363); this.tabBoxMulti.ResumeLayout(false); this.Tab_Box.ResumeLayout(false); + this.Tab_Box.PerformLayout(); this.Tab_PartyBattle.ResumeLayout(false); this.Tab_PartyBattle.PerformLayout(); - this.PAN_BattleBox.ResumeLayout(false); - this.PAN_BattleBox.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.PB_Locked)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bbpkx1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bbpkx2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bbpkx3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bbpkx4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bbpkx5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bbpkx6)).EndInit(); - this.PAN_Party.ResumeLayout(false); - this.PAN_Party.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.ppkx1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.ppkx2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.ppkx3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.ppkx4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.ppkx5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.ppkx6)).EndInit(); this.Tab_Other.ResumeLayout(false); this.GB_Daycare.ResumeLayout(false); this.GB_Daycare.PerformLayout(); @@ -1032,24 +810,6 @@ private void InitializeComponent() private System.Windows.Forms.TabControl tabBoxMulti; private System.Windows.Forms.TabPage Tab_Box; private System.Windows.Forms.TabPage Tab_PartyBattle; - private System.Windows.Forms.Panel PAN_BattleBox; - private System.Windows.Forms.PictureBox PB_Locked; - private System.Windows.Forms.PictureBox bbpkx1; - private System.Windows.Forms.PictureBox bbpkx2; - private System.Windows.Forms.PictureBox bbpkx3; - private System.Windows.Forms.PictureBox bbpkx4; - private System.Windows.Forms.PictureBox bbpkx5; - private System.Windows.Forms.PictureBox bbpkx6; - private System.Windows.Forms.Label L_ReadOnlyPBB; - private System.Windows.Forms.Label L_BattleBox; - private System.Windows.Forms.Label L_Party; - private System.Windows.Forms.Panel PAN_Party; - private System.Windows.Forms.PictureBox ppkx1; - private System.Windows.Forms.PictureBox ppkx2; - private System.Windows.Forms.PictureBox ppkx3; - private System.Windows.Forms.PictureBox ppkx4; - private System.Windows.Forms.PictureBox ppkx5; - private System.Windows.Forms.PictureBox ppkx6; private System.Windows.Forms.TabPage Tab_Other; private System.Windows.Forms.GroupBox GB_Daycare; private System.Windows.Forms.Label L_XP2; @@ -1107,5 +867,6 @@ private void InitializeComponent() private System.Windows.Forms.Button B_MailBox; private System.Windows.Forms.Button B_OpenApricorn; private SlotList SL_Extra; + private PartyEditor SL_Party; } } diff --git a/PKHeX.WinForms/Controls/SAV Editor/SAVEditor.cs b/PKHeX.WinForms/Controls/SAV Editor/SAVEditor.cs index bab5e5286..0608e4a89 100644 --- a/PKHeX.WinForms/Controls/SAV Editor/SAVEditor.cs +++ b/PKHeX.WinForms/Controls/SAV Editor/SAVEditor.cs @@ -13,19 +13,18 @@ namespace PKHeX.WinForms.Controls { public partial class SAVEditor : UserControl, ISlotViewer, ISaveFileProvider { - public SaveDataEditor EditEnv + public SaveDataEditor EditEnv; + + public void SetEditEnvironment(SaveDataEditor value) { - get => _editEnv; - set - { - _editEnv = value; - M.Env = value; - menu.Editor = value; - SAV = value.SAV; - value.Slots.Publisher.Subscribers.Add(this); - value.Slots.Publisher.Subscribers.Add(Box); - value.Slots.Publisher.Subscribers.Add(SL_Extra); - } + EditEnv = value; + M.Env = value; + menu.Editor = value; + SAV = value.SAV; + value.Slots.Publisher.Subscribers.Add(this); + value.Slots.Publisher.Subscribers.Add(SL_Party); + value.Slots.Publisher.Subscribers.Add(Box); + value.Slots.Publisher.Subscribers.Add(SL_Extra); } public SaveFile SAV { get; private set; } @@ -51,7 +50,7 @@ public bool FlagIllegal get => Box.FlagIllegal; set { - Box.FlagIllegal = value && !HaX; + SL_Extra.FlagIllegal = SL_Party.FlagIllegal = Box.FlagIllegal = value && !HaX; if (SAV != null) ReloadSlots(); } @@ -72,14 +71,12 @@ public SAVEditor() L_SlotEXP = new[] { L_XP1, L_XP2 }; SlotPictureBoxes = new[] { - ppkx1, ppkx2, ppkx3, ppkx4, ppkx5, ppkx6, - bbpkx1, bbpkx2, bbpkx3, bbpkx4, bbpkx5, bbpkx6, - dcpkx1, dcpkx2 }; Tab_Box.ContextMenuStrip = SortMenu = new BoxMenuStrip(this); M = new SlotChangeManager(this) {Env = EditEnv}; Box.Setup(M); + SL_Party.Setup(M); SL_Extra.ViewIndex = -2; menu = new ContextMenuSAV { Manager = M }; @@ -146,9 +143,7 @@ public void EnableDragDrop(DragEventHandler enter, DragEventHandler drop) // Generic Subfunctions // public int GetSlotOffset(int slot) { - if (slot < (int)SlotIndex.Daycare) // Battle Box Slot - return SAV.BattleBoxOffset + ((slot - (int)SlotIndex.BattleBox) * SAV.SIZE_STORED); - return SAV.GetDaycareSlotOffset(SAV.DaycareIndex, slot - (int)SlotIndex.Daycare); + return SAV.GetDaycareSlotOffset(SAV.DaycareIndex, slot); } public int SwapBoxesViewer(int viewBox) @@ -213,7 +208,7 @@ public ISlotInfo GetSlotData(int index) return new SlotInfoParty(index); var ofs = GetSlotOffset(index); - return new SlotInfoMisc(index, ofs); + return new SlotInfoMisc(SAV, index, ofs); } public void SetPKMBoxes() @@ -227,7 +222,6 @@ public void SetPKMBoxes() private void ResetNonBoxSlots() { ResetParty(); - ResetBattleBox(); ResetDaycare(); ResetMiscSlots(); } @@ -245,26 +239,13 @@ private void ResetMiscSlots() private void ResetParty() { - if (!SAV.HasParty) - return; - - for (int i = 0; i < 6; i++) - UpdateSlot(i + (int) SlotIndex.Party); - } - - private void ResetBattleBox() - { - if (!SAV.HasBattleBox) - return; - - for (int i = 0; i < 6; i++) - UpdateSlot(i + (int)SlotIndex.BattleBox); + if (SAV.HasParty) + SL_Party.ResetSlots(); } private readonly Label[] L_SlotOccupied; private readonly TextBox[] TB_SlotEXP; private readonly Label[] L_SlotEXP; - private SaveDataEditor _editEnv; private void ResetDaycare() { @@ -273,7 +254,7 @@ private void ResetDaycare() for (int i = 0; i < 2; i++) { - var relIndex = i + (int)SlotIndex.Daycare; + var relIndex = i; var pb = UpdateSlot(relIndex); uint? exp = SAV.GetDaycareEXP(SAV.DaycareIndex, i); @@ -626,7 +607,7 @@ private static Form GetTrainerEditor(SaveFile sav) SAV6 s6 => new SAV_Trainer(s6), SAV7 s7 => new SAV_Trainer7(s7), SAV7b b7 => new SAV_Trainer7GG(b7), - SAV8SWSH swsh => new SAV_PokedexSWSH(swsh), + SAV8SWSH swsh => new SAV_Trainer8(swsh), _ => (Form) new SAV_SimpleTrainer(sav) }; } @@ -979,11 +960,26 @@ private void ToggleViewReset() z.FindForm()?.Close(); Box.M = M; - bool newSlots = Box.InitializeFromSAV(SAV); - if (newSlots) + SL_Party.M = M; + if (SAV.HasBox) { - foreach (var pb in Box.SlotPictureBoxes) - pb.ContextMenuStrip = menu.mnuVSD; + bool newSlots = Box.InitializeFromSAV(SAV); + if (newSlots) + { + Box.HorizontallyCenter(Tab_Box); + foreach (var pb in Box.SlotPictureBoxes) + pb.ContextMenuStrip = menu.mnuVSD; + } + } + if (SAV.HasParty) + { + bool newSlots = SL_Party.InitializeFromSAV(SAV); + if (newSlots) + { + SL_Party.HorizontallyCenter(Tab_PartyBattle); + foreach (var pb in SL_Party.SlotPictureBoxes) + pb.ContextMenuStrip = menu.mnuVSD; + } } SortMenu.ToggleVisibility(); @@ -1000,9 +996,8 @@ private bool ToggleViewBox(SaveFile sav) } B_SaveBoxBin.Enabled = true; - int startBox = !sav.Exportable ? 0 : sav.CurrentBox; // FF if BattleBox - if (startBox > sav.BoxCount - 1) { tabBoxMulti.SelectedIndex = 1; Box.CurrentBox = 0; } - else { tabBoxMulti.SelectedIndex = 0; Box.CurrentBox = startBox; } + tabBoxMulti.SelectedIndex = 0; + Box.CurrentBox = Math.Max(0, Math.Min(sav.BoxCount, sav.CurrentBox)); if (tabBoxMulti.TabPages.Contains(Tab_Box)) return false; @@ -1019,7 +1014,6 @@ private bool ToggleViewParty(SaveFile sav, int BoxTab) return false; } - PB_Locked.Visible = sav.HasBattleBox && sav.BattleBoxLocked; if (tabBoxMulti.TabPages.Contains(Tab_PartyBattle)) return false; @@ -1039,7 +1033,7 @@ private bool ToggleViewDaycare(SaveFile sav, int BoxTab, int PartyTab) return false; } - SlotPictureBoxes[(int)SlotIndex.Daycare + 1].Visible = sav.Generation >= 2; // Second daycare slot + SlotPictureBoxes[1].Visible = sav.Generation >= 2; // Second daycare slot if (tabBoxMulti.TabPages.Contains(Tab_Other)) return false; @@ -1063,7 +1057,6 @@ private void ToggleViewSubEditors(SaveFile sav) } { - PAN_BattleBox.Visible = L_BattleBox.Visible = L_ReadOnlyPBB.Visible = sav.HasBattleBox; GB_Daycare.Visible = sav.HasDaycare; B_OpenPokeblocks.Enabled = sav is SAV6AO; B_OpenSecretBase.Enabled = sav is SAV6AO; @@ -1135,8 +1128,9 @@ private void ToggleViewMisc(SaveFile sav) private void ToggleSecrets(SaveFile sav, bool hide) { - TB_Secure1.Visible = TB_Secure2.Visible = L_Secure1.Visible = L_Secure2.Visible = sav.Exportable && sav.Generation >= 6 && !hide; - TB_GameSync.Visible = L_GameSync.Visible = sav.Exportable && sav.Generation >= 6 && !hide; + var g67 = 6 <= sav.Generation && sav.Generation <= 7; + TB_Secure1.Visible = TB_Secure2.Visible = L_Secure1.Visible = L_Secure2.Visible = sav.Exportable && g67 && !hide; + TB_GameSync.Visible = L_GameSync.Visible = sav.Exportable && g67 && !hide; } // DragDrop @@ -1154,7 +1148,6 @@ private void MultiDragOver(object sender, DragEventArgs e) } public void ClickShowdownExportParty(object sender, EventArgs e) => ExportShowdownText(SAV, MsgSimulatorExportParty, sav => sav.PartyData); - public void ClickShowdownExportBattleBox(object sender, EventArgs e) => ExportShowdownText(SAV, MsgSimulatorExportBattleBox, sav => sav.BattleBoxData); public void ClickShowdownExportCurrentBox(object sender, EventArgs e) { diff --git a/PKHeX.WinForms/Controls/SAV Editor/SlotChangeManager.cs b/PKHeX.WinForms/Controls/SAV Editor/SlotChangeManager.cs index 2ca25ffc4..d2b83a2ac 100644 --- a/PKHeX.WinForms/Controls/SAV Editor/SlotChangeManager.cs +++ b/PKHeX.WinForms/Controls/SAV Editor/SlotChangeManager.cs @@ -8,7 +8,7 @@ using System.Threading.Tasks; using System.Windows.Forms; using PKHeX.Core; -using PKHeX.WinForms.Properties; +using PKHeX.Drawing; namespace PKHeX.WinForms.Controls { @@ -187,7 +187,7 @@ private bool TryMakeDragDropPKM(PictureBox pb, byte[] data, string newfile) Drag.SetCursor(pb.FindForm(), new Cursor(img.GetHicon())); Hover.Stop(); pb.Image = null; - pb.BackgroundImage = Resources.slotDrag; + pb.BackgroundImage = SpriteUtil.Spriter.Drag; // Thread Blocks on DoDragDrop Drag.Info.CurrentPath = newfile; diff --git a/PKHeX.WinForms/Controls/SAV Editor/SlotIndex.cs b/PKHeX.WinForms/Controls/SAV Editor/SlotIndex.cs deleted file mode 100644 index 8c778cb73..000000000 --- a/PKHeX.WinForms/Controls/SAV Editor/SlotIndex.cs +++ /dev/null @@ -1,13 +0,0 @@ -namespace PKHeX.WinForms.Controls -{ - /// - /// Indexes within the 's scope. - /// - /// The save editor displays party/battlebox/daycare outside of a , and need to be managed. - internal enum SlotIndex - { - Party = 0, - BattleBox = 6, - Daycare = 12, - } -} diff --git a/PKHeX.WinForms/Controls/Slots/PokeGrid.cs b/PKHeX.WinForms/Controls/Slots/PokeGrid.cs index 2d0d4d7ef..75212b661 100644 --- a/PKHeX.WinForms/Controls/Slots/PokeGrid.cs +++ b/PKHeX.WinForms/Controls/Slots/PokeGrid.cs @@ -1,6 +1,8 @@ using System.Collections.Generic; +using System.Diagnostics; using System.Drawing; using System.Windows.Forms; +using PKHeX.Drawing; namespace PKHeX.WinForms.Controls { @@ -11,18 +13,23 @@ public PokeGrid() InitializeComponent(); } - public List Entries = new List(); + public readonly List Entries = new List(); public int Slots { get; private set; } - private const int sizeW = 40; - private const int sizeH = 30; + private int sizeW = 40; + private int sizeH = 30; - public bool InitializeGrid(int width, int height) + public bool InitializeGrid(int width, int height, SpriteBuilder info) { var newCount = width * height; if (Slots == newCount) - return false; + { + if (info.Width == sizeW && info.Height == sizeH) + return false; + } + sizeW = info.Width; + sizeH = info.Height; Generate(width, height); Slots = newCount; @@ -38,9 +45,10 @@ private void Generate(int width, int height) Controls.Clear(); Entries.Clear(); - const int colWidth = sizeW; - const int rowHeight = sizeH; + int colWidth = sizeW; + int rowHeight = sizeH; + Location = new Point(0, Location.Y); // prevent auto-expanding parent if position changes (centered) for (int row = 0; row < height; row++) { var y = padEdge + (row * (rowHeight + border)); @@ -57,6 +65,7 @@ private void Generate(int width, int height) Width = (2 * padEdge) + border + (width * (colWidth + border)); Height = (2 * padEdge) + border + (height * (rowHeight + border)); + Debug.WriteLine($"{Name} -- Width: {Width}, Height: {Height}"); ResumeLayout(); } @@ -67,6 +76,7 @@ public static PictureBox GetControl(int width, int height) return new PictureBox { AutoSize = false, + SizeMode = PictureBoxSizeMode.CenterImage, BackColor = Color.Transparent, Width = width + (2 * 1), Height = height + (2 * 1), diff --git a/PKHeX.WinForms/Controls/Slots/SlotHoverHandler.cs b/PKHeX.WinForms/Controls/Slots/SlotHoverHandler.cs index 4ddb455b0..26a904641 100644 --- a/PKHeX.WinForms/Controls/Slots/SlotHoverHandler.cs +++ b/PKHeX.WinForms/Controls/Slots/SlotHoverHandler.cs @@ -17,8 +17,9 @@ public sealed class SlotHoverHandler : IDisposable public static readonly CryPlayer CryPlayer = new CryPlayer(); public static readonly SummaryPreviewer Preview = new SummaryPreviewer(); + private static Bitmap Hover => SpriteUtil.Spriter.Hover; - private readonly BitmapAnimator HoverWorker = new BitmapAnimator(Resources.slotHover); + private readonly BitmapAnimator HoverWorker = new BitmapAnimator(); private PictureBox Slot; @@ -35,16 +36,16 @@ public void Start(PictureBox pb, SlotTrackerImage LastSlot) if (GlowHover) { HoverWorker.Stop(); - + var hover = Hover; SpriteUtil.GetSpriteGlow(pk, Draw.GlowInitial.B, Draw.GlowInitial.G, Draw.GlowInitial.R, out var glowdata, out var GlowBase); - bg = ImageUtil.LayerImage(GlowBase, Resources.slotHover, 0, 0); + bg = ImageUtil.LayerImage(GlowBase, hover, 0, 0); HoverWorker.GlowToColor = Draw.GlowFinal; HoverWorker.GlowFromColor = Draw.GlowInitial; - HoverWorker.Start(pb, GlowBase, glowdata, orig); + HoverWorker.Start(pb, GlowBase, glowdata, orig, hover); } else { - bg = Resources.slotHover; + bg = Hover; } if (orig != null) diff --git a/PKHeX.WinForms/Controls/Slots/SlotList.cs b/PKHeX.WinForms/Controls/Slots/SlotList.cs index 673ec5f69..e10749cdb 100644 --- a/PKHeX.WinForms/Controls/Slots/SlotList.cs +++ b/PKHeX.WinForms/Controls/Slots/SlotList.cs @@ -13,6 +13,7 @@ public partial class SlotList : UserControl, ISlotViewer private List SlotOffsets = new List(); public int SlotCount { get; private set; } public SaveFile SAV { get; set; } + public bool FlagIllegal { get; set; } public SlotList() { @@ -56,7 +57,7 @@ public void NotifySlotChanged(ISlotInfo slot, SlotTouchType type, PKM pkm) if (index < 0) return; var pb = slots[index]; - SlotUtil.UpdateSlot(pb, slot, pkm, SAV, true, type); + SlotUtil.UpdateSlot(pb, slot, pkm, SAV, FlagIllegal, type); } public int GetViewIndex(ISlotInfo info) => SlotOffsets.FindIndex(info.Equals); diff --git a/PKHeX.WinForms/Controls/Slots/SlotUtil.cs b/PKHeX.WinForms/Controls/Slots/SlotUtil.cs index af4cbbdec..852711c4b 100644 --- a/PKHeX.WinForms/Controls/Slots/SlotUtil.cs +++ b/PKHeX.WinForms/Controls/Slots/SlotUtil.cs @@ -3,7 +3,6 @@ using System.Windows.Forms; using PKHeX.Core; using PKHeX.Drawing; -using PKHeX.WinForms.Properties; namespace PKHeX.WinForms.Controls { @@ -19,11 +18,11 @@ public static Image GetTouchTypeBackground(SlotTouchType type) { return type switch { - SlotTouchType.None => Resources.slotTrans, - SlotTouchType.Get => Resources.slotView, - SlotTouchType.Set => Resources.slotSet, - SlotTouchType.Delete => Resources.slotDel, - SlotTouchType.Swap => Resources.slotSet, + SlotTouchType.None => SpriteUtil.Spriter.Transparent, + SlotTouchType.Get => SpriteUtil.Spriter.View, + SlotTouchType.Set => SpriteUtil.Spriter.Set, + SlotTouchType.Delete => SpriteUtil.Spriter.Delete, + SlotTouchType.Swap => SpriteUtil.Spriter.Set, _ => throw new ArgumentOutOfRangeException(nameof(type), type, null) }; } diff --git a/PKHeX.WinForms/FodyWeavers.xml b/PKHeX.WinForms/FodyWeavers.xml index 5029e7060..a5dcf04fd 100644 --- a/PKHeX.WinForms/FodyWeavers.xml +++ b/PKHeX.WinForms/FodyWeavers.xml @@ -1,3 +1,4 @@ - + + \ No newline at end of file diff --git a/PKHeX.WinForms/MainWindow/Main.Designer.cs b/PKHeX.WinForms/MainWindow/Main.Designer.cs index 6773259f9..d09256139 100644 --- a/PKHeX.WinForms/MainWindow/Main.Designer.cs +++ b/PKHeX.WinForms/MainWindow/Main.Designer.cs @@ -43,7 +43,6 @@ public void InitializeComponent() this.Menu_ShowdownImportPKM = new System.Windows.Forms.ToolStripMenuItem(); this.Menu_ShowdownExportPKM = new System.Windows.Forms.ToolStripMenuItem(); this.Menu_ShowdownExportParty = new System.Windows.Forms.ToolStripMenuItem(); - this.Menu_ShowdownExportBattleBox = new System.Windows.Forms.ToolStripMenuItem(); this.Menu_ShowdownExportCurrentBox = new System.Windows.Forms.ToolStripMenuItem(); this.Menu_Data = new System.Windows.Forms.ToolStripMenuItem(); this.Menu_LoadBoxes = new System.Windows.Forms.ToolStripMenuItem(); @@ -62,13 +61,23 @@ public void InitializeComponent() this.Menu_Redo = new System.Windows.Forms.ToolStripMenuItem(); this.Menu_Settings = new System.Windows.Forms.ToolStripMenuItem(); this.Menu_About = new System.Windows.Forms.ToolStripMenuItem(); + this.L_UpdateAvailable = new System.Windows.Forms.LinkLabel(); + this.dragTip = new System.Windows.Forms.ToolTip(this.components); + this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.splitContainer2 = new System.Windows.Forms.SplitContainer(); this.dragout = new System.Windows.Forms.PictureBox(); this.PB_Legal = new System.Windows.Forms.PictureBox(); - this.L_UpdateAvailable = new System.Windows.Forms.LinkLabel(); - this.C_SAV = new PKHeX.WinForms.Controls.SAVEditor(); this.PKME_Tabs = new PKHeX.WinForms.Controls.PKMEditor(); - this.dragTip = new System.Windows.Forms.ToolTip(this.components); + this.C_SAV = new PKHeX.WinForms.Controls.SAVEditor(); this.menuStrip1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); + this.splitContainer1.Panel1.SuspendLayout(); + this.splitContainer1.Panel2.SuspendLayout(); + this.splitContainer1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit(); + this.splitContainer2.Panel1.SuspendLayout(); + this.splitContainer2.Panel2.SuspendLayout(); + this.splitContainer2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dragout)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.PB_Legal)).BeginInit(); this.SuspendLayout(); @@ -82,7 +91,7 @@ public void InitializeComponent() this.Menu_Options}); this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Size = new System.Drawing.Size(614, 24); + this.menuStrip1.Size = new System.Drawing.Size(761, 24); this.menuStrip1.TabIndex = 1; this.menuStrip1.Text = "menuStrip1"; // @@ -174,7 +183,6 @@ public void InitializeComponent() this.Menu_ShowdownImportPKM, this.Menu_ShowdownExportPKM, this.Menu_ShowdownExportParty, - this.Menu_ShowdownExportBattleBox, this.Menu_ShowdownExportCurrentBox}); this.Menu_Showdown.Image = global::PKHeX.WinForms.Properties.Resources.showdown; this.Menu_Showdown.Name = "Menu_Showdown"; @@ -210,14 +218,6 @@ public void InitializeComponent() this.Menu_ShowdownExportParty.Text = "Export Party to Clipboard"; this.Menu_ShowdownExportParty.Click += new System.EventHandler(this.ClickShowdownExportParty); // - // Menu_ShowdownExportBattleBox - // - this.Menu_ShowdownExportBattleBox.Image = global::PKHeX.WinForms.Properties.Resources.export; - this.Menu_ShowdownExportBattleBox.Name = "Menu_ShowdownExportBattleBox"; - this.Menu_ShowdownExportBattleBox.Size = new System.Drawing.Size(241, 22); - this.Menu_ShowdownExportBattleBox.Text = "Export Battle Box to Clipboard"; - this.Menu_ShowdownExportBattleBox.Click += new System.EventHandler(this.ClickShowdownExportBattleBox); - // // Menu_ShowdownExportCurrentBox // this.Menu_ShowdownExportCurrentBox.Image = global::PKHeX.WinForms.Properties.Resources.export; @@ -397,14 +397,64 @@ public void InitializeComponent() this.Menu_About.Text = "About &PKHeX"; this.Menu_About.Click += new System.EventHandler(this.MainMenuAbout); // + // L_UpdateAvailable + // + this.L_UpdateAvailable.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.L_UpdateAvailable.Location = new System.Drawing.Point(454, 8); + this.L_UpdateAvailable.Name = "L_UpdateAvailable"; + this.L_UpdateAvailable.Size = new System.Drawing.Size(300, 13); + this.L_UpdateAvailable.TabIndex = 102; + this.L_UpdateAvailable.TabStop = true; + this.L_UpdateAvailable.Text = "New Update Available!"; + this.L_UpdateAvailable.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.L_UpdateAvailable.Visible = false; + // + // splitContainer1 + // + this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer1.Location = new System.Drawing.Point(0, 0); + this.splitContainer1.Name = "splitContainer1"; + // + // splitContainer1.Panel1 + // + this.splitContainer1.Panel1.Controls.Add(this.PKME_Tabs); + // + // splitContainer1.Panel2 + // + this.splitContainer1.Panel2.Controls.Add(this.C_SAV); + this.splitContainer1.Size = new System.Drawing.Size(761, 356); + this.splitContainer1.SplitterDistance = 310; + this.splitContainer1.SplitterWidth = 2; + this.splitContainer1.TabIndex = 105; + // + // splitContainer2 + // + this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer2.Location = new System.Drawing.Point(0, 0); + this.splitContainer2.Name = "splitContainer2"; + this.splitContainer2.Orientation = System.Windows.Forms.Orientation.Horizontal; + // + // splitContainer2.Panel1 + // + this.splitContainer2.Panel1.Controls.Add(this.L_UpdateAvailable); + this.splitContainer2.Panel1.Controls.Add(this.menuStrip1); + // + // splitContainer2.Panel2 + // + this.splitContainer2.Panel2.Controls.Add(this.splitContainer1); + this.splitContainer2.Size = new System.Drawing.Size(761, 382); + this.splitContainer2.SplitterDistance = 25; + this.splitContainer2.SplitterWidth = 1; + this.splitContainer2.TabIndex = 106; + // // dragout // this.dragout.BackColor = System.Drawing.Color.Transparent; - this.dragout.Location = new System.Drawing.Point(248, 0); + this.dragout.Location = new System.Drawing.Point(244, 1); this.dragout.Name = "dragout"; - this.dragout.Size = new System.Drawing.Size(40, 30); + this.dragout.Size = new System.Drawing.Size(68, 56); this.dragout.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.dragout.TabIndex = 60; + this.dragout.TabIndex = 107; this.dragout.TabStop = false; this.dragout.DragDrop += new System.Windows.Forms.DragEventHandler(this.DragoutDrop); this.dragout.DragOver += new System.Windows.Forms.DragEventHandler(this.Dragout_DragOver); @@ -415,49 +465,23 @@ public void InitializeComponent() // PB_Legal // this.PB_Legal.Image = global::PKHeX.WinForms.Properties.Resources.valid; - this.PB_Legal.Location = new System.Drawing.Point(226, 5); + this.PB_Legal.Location = new System.Drawing.Point(222, 2); this.PB_Legal.Name = "PB_Legal"; this.PB_Legal.Size = new System.Drawing.Size(16, 16); - this.PB_Legal.TabIndex = 101; + this.PB_Legal.TabIndex = 108; this.PB_Legal.TabStop = false; this.PB_Legal.Click += new System.EventHandler(this.ClickLegality); // - // L_UpdateAvailable - // - this.L_UpdateAvailable.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.L_UpdateAvailable.Location = new System.Drawing.Point(305, 5); - this.L_UpdateAvailable.Name = "L_UpdateAvailable"; - this.L_UpdateAvailable.Size = new System.Drawing.Size(300, 13); - this.L_UpdateAvailable.TabIndex = 102; - this.L_UpdateAvailable.TabStop = true; - this.L_UpdateAvailable.Text = "New Update Available!"; - this.L_UpdateAvailable.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.L_UpdateAvailable.Visible = false; - // - // C_SAV - // - this.C_SAV.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Right))); - this.C_SAV.FlagIllegal = false; - this.C_SAV.Location = new System.Drawing.Point(292, 26); - this.C_SAV.Name = "C_SAV"; - this.C_SAV.Size = new System.Drawing.Size(310, 326); - this.C_SAV.TabIndex = 104; - this.C_SAV.ViewIndex = -1; - this.C_SAV.RequestCloneData += new System.EventHandler(this.ClickClone); - this.C_SAV.RequestReloadSave += new System.EventHandler(this.ClickSaveFileName); - // // PKME_Tabs // - this.PKME_Tabs.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); this.PKME_Tabs.ChangingFields = false; this.PKME_Tabs.Data = null; + this.PKME_Tabs.Dock = System.Windows.Forms.DockStyle.Fill; this.PKME_Tabs.HaX = false; - this.PKME_Tabs.Location = new System.Drawing.Point(8, 27); + this.PKME_Tabs.Location = new System.Drawing.Point(0, 0); + this.PKME_Tabs.Margin = new System.Windows.Forms.Padding(5); this.PKME_Tabs.Name = "PKME_Tabs"; - this.PKME_Tabs.Size = new System.Drawing.Size(280, 325); + this.PKME_Tabs.Size = new System.Drawing.Size(310, 356); this.PKME_Tabs.TabIndex = 103; this.PKME_Tabs.Unicode = true; this.PKME_Tabs.LegalityChanged += new System.EventHandler(this.PKME_Tabs_LegalityChanged); @@ -466,18 +490,28 @@ public void InitializeComponent() this.PKME_Tabs.RequestShowdownExport += new System.EventHandler(this.PKME_Tabs_RequestShowdownExport); this.PKME_Tabs.SaveFileRequested += new PKHeX.WinForms.Controls.PKMEditor.ReturnSAVEventHandler(this.PKME_Tabs_SaveFileRequested); // + // C_SAV + // + this.C_SAV.Dock = System.Windows.Forms.DockStyle.Fill; + this.C_SAV.FlagIllegal = false; + this.C_SAV.Location = new System.Drawing.Point(0, 0); + this.C_SAV.Margin = new System.Windows.Forms.Padding(5); + this.C_SAV.Name = "C_SAV"; + this.C_SAV.Size = new System.Drawing.Size(449, 356); + this.C_SAV.TabIndex = 104; + this.C_SAV.ViewIndex = -1; + this.C_SAV.RequestCloneData += new System.EventHandler(this.ClickClone); + this.C_SAV.RequestReloadSave += new System.EventHandler(this.ClickSaveFileName); + // // Main // this.AllowDrop = true; this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(614, 361); - this.Controls.Add(this.C_SAV); - this.Controls.Add(this.L_UpdateAvailable); - this.Controls.Add(this.PB_Legal); + this.ClientSize = new System.Drawing.Size(761, 382); this.Controls.Add(this.dragout); - this.Controls.Add(this.menuStrip1); - this.Controls.Add(this.PKME_Tabs); + this.Controls.Add(this.PB_Legal); + this.Controls.Add(this.splitContainer2); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.Icon = global::PKHeX.WinForms.Properties.Resources.Icon; this.KeyPreview = true; @@ -489,10 +523,18 @@ public void InitializeComponent() this.DragDrop += new System.Windows.Forms.DragEventHandler(this.Main_DragDrop); this.menuStrip1.ResumeLayout(false); this.menuStrip1.PerformLayout(); + this.splitContainer1.Panel1.ResumeLayout(false); + this.splitContainer1.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); + this.splitContainer1.ResumeLayout(false); + this.splitContainer2.Panel1.ResumeLayout(false); + this.splitContainer2.Panel1.PerformLayout(); + this.splitContainer2.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit(); + this.splitContainer2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.dragout)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.PB_Legal)).EndInit(); this.ResumeLayout(false); - this.PerformLayout(); } @@ -501,9 +543,6 @@ public void InitializeComponent() private Controls.SAVEditor C_SAV; private System.Windows.Forms.LinkLabel L_UpdateAvailable; - private System.Windows.Forms.PictureBox dragout; - private System.Windows.Forms.PictureBox PB_Legal; - private System.Windows.Forms.MenuStrip menuStrip1; private System.Windows.Forms.ToolStripMenuItem Menu_File; private System.Windows.Forms.ToolStripMenuItem Menu_Open; @@ -519,7 +558,6 @@ public void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem Menu_ShowdownExportPKM; private System.Windows.Forms.ToolStripMenuItem Menu_ShowdownImportPKM; private System.Windows.Forms.ToolStripMenuItem Menu_ShowdownExportParty; - private System.Windows.Forms.ToolStripMenuItem Menu_ShowdownExportBattleBox; private System.Windows.Forms.ToolStripMenuItem Menu_Folder; private System.Windows.Forms.ToolStripMenuItem Menu_Data; private System.Windows.Forms.ToolStripMenuItem Menu_LoadBoxes; @@ -537,6 +575,10 @@ public void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem Menu_ShowdownExportCurrentBox; private System.Windows.Forms.ToolStripMenuItem Menu_EncDatabase; private System.Windows.Forms.ToolTip dragTip; + private System.Windows.Forms.SplitContainer splitContainer1; + private System.Windows.Forms.SplitContainer splitContainer2; + private System.Windows.Forms.PictureBox dragout; + private System.Windows.Forms.PictureBox PB_Legal; } } diff --git a/PKHeX.WinForms/MainWindow/Main.cs b/PKHeX.WinForms/MainWindow/Main.cs index 8d8d493bb..5e280558e 100644 --- a/PKHeX.WinForms/MainWindow/Main.cs +++ b/PKHeX.WinForms/MainWindow/Main.cs @@ -33,7 +33,7 @@ public Main() FormLoadInitialSettings(args, out bool showChangelog, out bool BAKprompt); InitializeComponent(); - C_SAV.EditEnv = new SaveDataEditor(null, PKME_Tabs); + C_SAV.SetEditEnvironment(new SaveDataEditor(null, PKME_Tabs)); FormLoadAddEvents(); #if DEBUG // translation updater -- all controls are added at this point -- call translate now if (DevUtil.IsUpdatingTranslations) @@ -529,7 +529,6 @@ private void ClickShowdownExportPKM(object sender, EventArgs e) } private void ClickShowdownExportParty(object sender, EventArgs e) => C_SAV.ClickShowdownExportParty(sender, e); - private void ClickShowdownExportBattleBox(object sender, EventArgs e) => C_SAV.ClickShowdownExportBattleBox(sender, e); private void ClickShowdownExportCurrentBox(object sender, EventArgs e) => C_SAV.ClickShowdownExportCurrentBox(sender, e); // Main Menu Subfunctions @@ -725,7 +724,8 @@ private bool OpenSAV(SaveFile sav, string path) return true; StoreLegalSaveGameData(sav); PKMConverter.Trainer = sav; - SpriteUtil.Spriter.Initialize(sav); // refresh sprite generator + SpriteUtil.Initialize(sav); // refresh sprite generator + dragout.Size = new Size(SpriteUtil.Spriter.Width, SpriteUtil.Spriter.Height); // clean fields Menu_ExportSAV.Enabled = sav.Exportable; @@ -741,7 +741,6 @@ private bool OpenSAV(SaveFile sav, string path) Text = GetProgramTitle(sav); TryBackupExportCheck(sav, path); - Menu_ShowdownExportBattleBox.Visible = sav.HasBattleBox; Menu_ShowdownExportParty.Visible = sav.HasParty; Menu_ShowdownExportCurrentBox.Visible = sav.HasBox; @@ -752,7 +751,7 @@ private bool OpenSAV(SaveFile sav, string path) private void ResetSAVPKMEditors(SaveFile sav) { bool WindowToggleRequired = C_SAV.SAV?.Generation < 3 && sav.Generation >= 3; // version combobox refresh hack - C_SAV.EditEnv = new SaveDataEditor(sav, PKME_Tabs); + C_SAV.SetEditEnvironment(new SaveDataEditor(sav, PKME_Tabs)); var pk = sav.LoadTemplate(TemplatePath); var isBlank = pk.Data.SequenceEqual(sav.BlankPKM.Data); @@ -1138,13 +1137,13 @@ private void Dragout_MouseDown(object sender, MouseEventArgs e) private void DragoutEnter(object sender, EventArgs e) { - dragout.BackgroundImage = PKME_Tabs.Entity.Species > 0 ? Resources.slotSet : Resources.slotDel; + dragout.BackgroundImage = PKME_Tabs.Entity.Species > 0 ? SpriteUtil.Spriter.Set : SpriteUtil.Spriter.Delete; Cursor = Cursors.Hand; } private void DragoutLeave(object sender, EventArgs e) { - dragout.BackgroundImage = Resources.slotTrans; + dragout.BackgroundImage = SpriteUtil.Spriter.Transparent; if (Cursor == Cursors.Hand) Cursor = Cursors.Default; } diff --git a/PKHeX.WinForms/MainWindow/Main.resx b/PKHeX.WinForms/MainWindow/Main.resx new file mode 100644 index 000000000..98a1e281d --- /dev/null +++ b/PKHeX.WinForms/MainWindow/Main.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 17, 17 + + + 132, 17 + + \ No newline at end of file diff --git a/PKHeX.WinForms/PKHeX.WinForms.csproj b/PKHeX.WinForms/PKHeX.WinForms.csproj index 56c1700b3..4477fb8fc 100644 --- a/PKHeX.WinForms/PKHeX.WinForms.csproj +++ b/PKHeX.WinForms/PKHeX.WinForms.csproj @@ -38,6 +38,10 @@ + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + @@ -50,6 +54,9 @@ + + UserControl + True True diff --git a/PKHeX.WinForms/Properties/Resources.Designer.cs b/PKHeX.WinForms/Properties/Resources.Designer.cs index ee32f0971..5db8b610b 100644 --- a/PKHeX.WinForms/Properties/Resources.Designer.cs +++ b/PKHeX.WinForms/Properties/Resources.Designer.cs @@ -389,6 +389,66 @@ public class Resources { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap gen_6 { + get { + object obj = ResourceManager.GetObject("gen_6", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap gen_7 { + get { + object obj = ResourceManager.GetObject("gen_7", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap gen_8 { + get { + object obj = ResourceManager.GetObject("gen_8", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap gen_gg { + get { + object obj = ResourceManager.GetObject("gen_gg", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap gen_go { + get { + object obj = ResourceManager.GetObject("gen_go", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap gen_vc { + get { + object obj = ResourceManager.GetObject("gen_vc", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -680,66 +740,6 @@ public class Resources { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap slotDel { - get { - object obj = ResourceManager.GetObject("slotDel", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap slotDrag { - get { - object obj = ResourceManager.GetObject("slotDrag", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap slotHover { - get { - object obj = ResourceManager.GetObject("slotHover", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap slotSet { - get { - object obj = ResourceManager.GetObject("slotSet", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap slotTrans { - get { - object obj = ResourceManager.GetObject("slotTrans", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap slotView { - get { - object obj = ResourceManager.GetObject("slotView", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/PKHeX.WinForms/Properties/Resources.resx b/PKHeX.WinForms/Properties/Resources.resx index 537630003..a87fef83f 100644 --- a/PKHeX.WinForms/Properties/Resources.resx +++ b/PKHeX.WinForms/Properties/Resources.resx @@ -238,24 +238,6 @@ ..\Resources\img\Program\showdown.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\img\Slots\slotDel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\img\Slots\slotDrag.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\img\Slots\slotHover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\img\Slots\slotSet.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\img\Slots\slotTrans.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\img\Slots\slotView.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\img\Slots\swapBox.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -343,4 +325,22 @@ ..\Resources\img\Accents\warn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\img\Markings\gen_6.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Markings\gen_7.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Markings\gen_8.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Markings\gen_gg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Markings\gen_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Markings\gen_vc.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/PKHeX.WinForms/Resources/img/Bag/Bag_Ingredient.png b/PKHeX.WinForms/Resources/img/Bag/Bag_Ingredient.png new file mode 100644 index 000000000..caba05985 Binary files /dev/null and b/PKHeX.WinForms/Resources/img/Bag/Bag_Ingredient.png differ diff --git a/PKHeX.WinForms/Resources/img/Bag/Bag_Treasure.png b/PKHeX.WinForms/Resources/img/Bag/Bag_Treasure.png new file mode 100644 index 000000000..6825648ae Binary files /dev/null and b/PKHeX.WinForms/Resources/img/Bag/Bag_Treasure.png differ diff --git a/PKHeX.WinForms/Resources/img/Markings/gen_6.png b/PKHeX.WinForms/Resources/img/Markings/gen_6.png new file mode 100644 index 000000000..358d511ff Binary files /dev/null and b/PKHeX.WinForms/Resources/img/Markings/gen_6.png differ diff --git a/PKHeX.WinForms/Resources/img/Markings/gen_7.png b/PKHeX.WinForms/Resources/img/Markings/gen_7.png new file mode 100644 index 000000000..d3bde742d Binary files /dev/null and b/PKHeX.WinForms/Resources/img/Markings/gen_7.png differ diff --git a/PKHeX.WinForms/Resources/img/Markings/gen_8.png b/PKHeX.WinForms/Resources/img/Markings/gen_8.png new file mode 100644 index 000000000..1551a60fc Binary files /dev/null and b/PKHeX.WinForms/Resources/img/Markings/gen_8.png differ diff --git a/PKHeX.WinForms/Resources/img/Markings/gen_gg.png b/PKHeX.WinForms/Resources/img/Markings/gen_gg.png new file mode 100644 index 000000000..80237f932 Binary files /dev/null and b/PKHeX.WinForms/Resources/img/Markings/gen_gg.png differ diff --git a/PKHeX.WinForms/Resources/img/Markings/gen_go.png b/PKHeX.WinForms/Resources/img/Markings/gen_go.png new file mode 100644 index 000000000..cec84dc73 Binary files /dev/null and b/PKHeX.WinForms/Resources/img/Markings/gen_go.png differ diff --git a/PKHeX.WinForms/Resources/img/Markings/gen_vc.png b/PKHeX.WinForms/Resources/img/Markings/gen_vc.png new file mode 100644 index 000000000..f5e76cfce Binary files /dev/null and b/PKHeX.WinForms/Resources/img/Markings/gen_vc.png differ diff --git a/PKHeX.WinForms/Subforms/KChart.Designer.cs b/PKHeX.WinForms/Subforms/KChart.Designer.cs index 594b94444..2c6997cc9 100644 --- a/PKHeX.WinForms/Subforms/KChart.Designer.cs +++ b/PKHeX.WinForms/Subforms/KChart.Designer.cs @@ -105,10 +105,10 @@ private void InitializeComponent() // New // this.New.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells; - this.New.HeaderText = "Alola"; + this.New.HeaderText = "Native"; this.New.Name = "New"; this.New.ReadOnly = true; - this.New.Width = 36; + this.New.Width = 44; // // BST // @@ -223,21 +223,21 @@ private void InitializeComponent() #endregion private System.Windows.Forms.DataGridView DGV; - private System.Windows.Forms.DataGridViewTextBoxColumn AbilityH; - private System.Windows.Forms.DataGridViewTextBoxColumn Ability1; - private System.Windows.Forms.DataGridViewTextBoxColumn Ability0; - private System.Windows.Forms.DataGridViewTextBoxColumn SPE; - private System.Windows.Forms.DataGridViewTextBoxColumn SPD; - private System.Windows.Forms.DataGridViewTextBoxColumn SPA; - private System.Windows.Forms.DataGridViewTextBoxColumn DEF; - private System.Windows.Forms.DataGridViewTextBoxColumn ATK; - private System.Windows.Forms.DataGridViewTextBoxColumn HP; - private System.Windows.Forms.DataGridViewImageColumn Type2; - private System.Windows.Forms.DataGridViewImageColumn Type1; - private System.Windows.Forms.DataGridViewTextBoxColumn BST; - private System.Windows.Forms.DataGridViewCheckBoxColumn New; - private System.Windows.Forms.DataGridViewTextBoxColumn SpecName; - private System.Windows.Forms.DataGridViewImageColumn Sprite; private System.Windows.Forms.DataGridViewTextBoxColumn d_Index; + private System.Windows.Forms.DataGridViewImageColumn Sprite; + private System.Windows.Forms.DataGridViewTextBoxColumn SpecName; + private System.Windows.Forms.DataGridViewCheckBoxColumn New; + private System.Windows.Forms.DataGridViewTextBoxColumn BST; + private System.Windows.Forms.DataGridViewImageColumn Type1; + private System.Windows.Forms.DataGridViewImageColumn Type2; + private System.Windows.Forms.DataGridViewTextBoxColumn HP; + private System.Windows.Forms.DataGridViewTextBoxColumn ATK; + private System.Windows.Forms.DataGridViewTextBoxColumn DEF; + private System.Windows.Forms.DataGridViewTextBoxColumn SPA; + private System.Windows.Forms.DataGridViewTextBoxColumn SPD; + private System.Windows.Forms.DataGridViewTextBoxColumn SPE; + private System.Windows.Forms.DataGridViewTextBoxColumn Ability0; + private System.Windows.Forms.DataGridViewTextBoxColumn Ability1; + private System.Windows.Forms.DataGridViewTextBoxColumn AbilityH; } } \ No newline at end of file diff --git a/PKHeX.WinForms/Subforms/KChart.cs b/PKHeX.WinForms/Subforms/KChart.cs index 8d30c145d..2db4458e1 100644 --- a/PKHeX.WinForms/Subforms/KChart.cs +++ b/PKHeX.WinForms/Subforms/KChart.cs @@ -3,7 +3,6 @@ using System.Windows.Forms; using PKHeX.Core; using PKHeX.Drawing; -using PKHeX.WinForms.Properties; namespace PKHeX.WinForms { @@ -12,16 +11,15 @@ public partial class KChart : Form private readonly SaveFile SAV; private readonly string[] species = GameInfo.Strings.specieslist; private readonly string[] abilities = GameInfo.Strings.abilitylist; - private readonly bool alolanOnly; private readonly int[] baseForm; private readonly int[] formVal; public KChart(SaveFile sav) { InitializeComponent(); + Icon = Properties.Resources.Icon; WinFormsUtil.TranslateInterface(this, Main.CurrentLanguage); SAV = sav; - alolanOnly = SAV is SAV7 && DialogResult.Yes == WinFormsUtil.Prompt(MessageBoxButtons.YesNo, "Alolan Dex only?"); Array.Resize(ref species, SAV.Personal.TableLength); @@ -32,19 +30,19 @@ public KChart(SaveFile sav) for (int i = 1; i < species.Length; i++) PopEntry(i); + DGV.DoubleBuffered(true); + DGV.Sort(DGV.Columns[0], ListSortDirection.Ascending); } private void PopEntry(int index) { var p = SAV.Personal[index]; + if (p.HP == 0) + return; int s = index > SAV.MaxSpeciesID ? baseForm[index] : index; var f = index <= SAV.MaxSpeciesID ? 0 : formVal[index]; - bool alolan = s > 721 || Legal.PastGenAlolanNatives.Contains(s); - - if (alolanOnly && !alolan) - return; var row = new DataGridViewRow(); row.CreateCells(DGV); @@ -53,11 +51,11 @@ private void PopEntry(int index) row.Cells[r++].Value = s.ToString("000") + (f > 0 ? "-"+f.ToString("00") :""); row.Cells[r++].Value = SpriteUtil.GetSprite(s, f, 0, 0, false, false, SAV.Generation); row.Cells[r++].Value = species[index]; - row.Cells[r++].Value = s > 721 || Legal.PastGenAlolanNatives.Contains(s); + row.Cells[r++].Value = GetIsNative(p, s); row.Cells[r].Style.BackColor = ImageUtil.ColorBaseStat((int)((Math.Max(p.BST - 175, 0)) / 3f)); row.Cells[r++].Value = p.BST.ToString("000"); row.Cells[r++].Value = SpriteUtil.GetTypeSprite(p.Type1, SAV.Generation); - row.Cells[r++].Value = p.Type1 == p.Type2 ? Resources.slotTrans : SpriteUtil.GetTypeSprite(p.Type2, SAV.Generation); + row.Cells[r++].Value = p.Type1 == p.Type2 ? SpriteUtil.Spriter.Transparent : SpriteUtil.GetTypeSprite(p.Type2, SAV.Generation); row.Cells[r].Style.BackColor = ImageUtil.ColorBaseStat(p.HP); row.Cells[r++].Value = p.HP.ToString("000"); row.Cells[r].Style.BackColor = ImageUtil.ColorBaseStat(p.ATK); @@ -73,7 +71,18 @@ private void PopEntry(int index) row.Cells[r++].Value = abilities[p.Abilities[0]]; row.Cells[r++].Value = abilities[p.Abilities[1]]; row.Cells[r].Value = abilities[p.Abilities.Length <= 2 ? 0 : p.Abilities[2]]; + row.Height = SpriteUtil.Spriter.Height + 1; DGV.Rows.Add(row); } + + private static bool GetIsNative(PersonalInfo personalInfo, int s) + { + return personalInfo switch + { + PersonalInfoSM _ => s > 721 || Legal.PastGenAlolanNatives.Contains(s), + PersonalInfoSWSH ss => ss.PokeDexIndex > 0, + _ => true, + }; + } } } diff --git a/PKHeX.WinForms/Subforms/PKM Editors/BatchEditor.cs b/PKHeX.WinForms/Subforms/PKM Editors/BatchEditor.cs index 09b930106..b6c5104c7 100644 --- a/PKHeX.WinForms/Subforms/PKM Editors/BatchEditor.cs +++ b/PKHeX.WinForms/Subforms/PKM Editors/BatchEditor.cs @@ -162,14 +162,18 @@ private void RunBackgroundWorker() private void RunBatchEdit(StringInstructionSet[] sets, string source, string destination) { editor = new Core.BatchEditor(); + bool finished = false; // hack cuz DoWork event isn't cleared after completion b.DoWork += (sender, e) => { + if (finished) + return; if (RB_Boxes.Checked) RunBatchEditSaveFile(sets, boxes: true); else if (RB_Party.Checked) RunBatchEditSaveFile(sets, party: true); else RunBatchEditFolder(sets, source, destination); + finished = true; }; b.ProgressChanged += (sender, e) => SetProgressBar(e.ProgressPercentage); b.RunWorkerCompleted += (sender, e) => diff --git a/PKHeX.WinForms/Subforms/PKM Editors/RibbonEditor.cs b/PKHeX.WinForms/Subforms/PKM Editors/RibbonEditor.cs index 1c956ff40..193647c7d 100644 --- a/PKHeX.WinForms/Subforms/PKM Editors/RibbonEditor.cs +++ b/PKHeX.WinForms/Subforms/PKM Editors/RibbonEditor.cs @@ -66,10 +66,7 @@ private void AddRibbonSprite(RibbonInfo rib) var name = rib.Name; var pb = new PictureBox { AutoSize = false, Size = new Size(40,40), BackgroundImageLayout = ImageLayout.Center, Visible = false, Name = PrefixPB + name }; var img = SpriteUtil.GetRibbonSprite(name); - if (img != null) - pb.BackgroundImage = (Bitmap)img; - if (img == null) - return; + pb.BackgroundImage = (Bitmap)img; var display = RibbonStrings.GetName(name); pb.MouseEnter += (s, e) => tipName.SetToolTip(pb, display); @@ -151,6 +148,14 @@ private void Save() private void B_All_Click(object sender, EventArgs e) { + if (ModifierKeys == Keys.Shift) + { + RibbonApplicator.RemoveAllValidRibbons(pkm); + RibbonApplicator.SetAllValidRibbons(pkm); + Close(); + return; + } + foreach (var c in TLP_Ribbons.Controls.OfType()) c.Checked = true; foreach (var n in TLP_Ribbons.Controls.OfType()) @@ -159,6 +164,13 @@ private void B_All_Click(object sender, EventArgs e) private void B_None_Click(object sender, EventArgs e) { + if (ModifierKeys == Keys.Shift) + { + RibbonApplicator.RemoveAllValidRibbons(pkm); + Close(); + return; + } + foreach (var c in TLP_Ribbons.Controls.OfType()) c.Checked = false; foreach (var n in TLP_Ribbons.Controls.OfType()) diff --git a/PKHeX.WinForms/Subforms/ReportGrid.cs b/PKHeX.WinForms/Subforms/ReportGrid.cs index 61e1ccbec..b1f8be596 100644 --- a/PKHeX.WinForms/Subforms/ReportGrid.cs +++ b/PKHeX.WinForms/Subforms/ReportGrid.cs @@ -59,7 +59,7 @@ public void PopulateData(IList Data) var strings = GameInfo.Strings; foreach (PKM pkm in Data.Where(pkm => pkm.ChecksumValid && pkm.Species != 0)) { - pkm.Stat_Level = Experience.GetLevel(pkm.EXP, pkm.Species, pkm.AltForm); // recalc Level + pkm.Stat_Level = Experience.GetLevel(pkm.EXP, pkm.PersonalInfo.EXPGrowth); // recalc Level PL.Add(new PKMSummaryImage(pkm, strings)); BoxBar.PerformStep(); } diff --git a/PKHeX.WinForms/Subforms/SAV_Database.Designer.cs b/PKHeX.WinForms/Subforms/SAV_Database.Designer.cs index 0dcd95203..a985a3a24 100644 --- a/PKHeX.WinForms/Subforms/SAV_Database.Designer.cs +++ b/PKHeX.WinForms/Subforms/SAV_Database.Designer.cs @@ -47,7 +47,7 @@ private void InitializeComponent() this.Menu_Import = new System.Windows.Forms.ToolStripMenuItem(); this.Menu_DeleteClones = new System.Windows.Forms.ToolStripMenuItem(); this.P_Results = new System.Windows.Forms.Panel(); - this.pokeGrid1 = new PKHeX.WinForms.Controls.PokeGrid(); + this.DatabasePokeGrid = new PKHeX.WinForms.Controls.PokeGrid(); this.CB_Ability = new System.Windows.Forms.ComboBox(); this.CB_HeldItem = new System.Windows.Forms.ComboBox(); this.CB_Nature = new System.Windows.Forms.ComboBox(); @@ -270,7 +270,7 @@ private void InitializeComponent() // this.P_Results.BackColor = System.Drawing.SystemColors.ButtonHighlight; this.P_Results.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.P_Results.Controls.Add(this.pokeGrid1); + this.P_Results.Controls.Add(this.DatabasePokeGrid); this.P_Results.Controls.Add(this.SCR_Box); this.P_Results.Location = new System.Drawing.Point(12, 32); this.P_Results.Name = "P_Results"; @@ -279,12 +279,12 @@ private void InitializeComponent() // // pokeGrid1 // - this.pokeGrid1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.pokeGrid1.Location = new System.Drawing.Point(2, 2); - this.pokeGrid1.Margin = new System.Windows.Forms.Padding(0); - this.pokeGrid1.Name = "pokeGrid1"; - this.pokeGrid1.Size = new System.Drawing.Size(251, 346); - this.pokeGrid1.TabIndex = 2; + this.DatabasePokeGrid.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.DatabasePokeGrid.Location = new System.Drawing.Point(2, 2); + this.DatabasePokeGrid.Margin = new System.Windows.Forms.Padding(0); + this.DatabasePokeGrid.Name = "DatabasePokeGrid"; + this.DatabasePokeGrid.Size = new System.Drawing.Size(251, 346); + this.DatabasePokeGrid.TabIndex = 2; // // CB_Ability // @@ -1057,6 +1057,6 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem mnuView; private System.Windows.Forms.ToolStripMenuItem mnuDelete; private System.Windows.Forms.ToolTip hover; - private Controls.PokeGrid pokeGrid1; + private Controls.PokeGrid DatabasePokeGrid; } } \ No newline at end of file diff --git a/PKHeX.WinForms/Subforms/SAV_Database.cs b/PKHeX.WinForms/Subforms/SAV_Database.cs index 75e529bc3..b5926260c 100644 --- a/PKHeX.WinForms/Subforms/SAV_Database.cs +++ b/PKHeX.WinForms/Subforms/SAV_Database.cs @@ -34,9 +34,9 @@ public SAV_Database(PKMEditor f1, SAVEditor saveditor) // Preset Filters to only show PKM available for loaded save CB_FormatComparator.SelectedIndex = 3; // <= - pokeGrid1.InitializeGrid(6, 11); - pokeGrid1.SetBackground(Resources.box_wp_clean); - PKXBOXES = pokeGrid1.Entries.ToArray(); + DatabasePokeGrid.InitializeGrid(6, 11, SpriteUtil.Spriter); + DatabasePokeGrid.SetBackground(Resources.box_wp_clean); + PKXBOXES = DatabasePokeGrid.Entries.ToArray(); // Enable Scrolling when hovered over foreach (var slot in PKXBOXES) @@ -103,7 +103,7 @@ private void ClickView(object sender, EventArgs e) PKME_Tabs.PopulateFields(Results[index], false); slotSelected = index; - slotColor = Resources.slotView; + slotColor = SpriteUtil.Spriter.View; FillPKXBoxes(SCR_Box.Value); L_Viewed.Text = string.Format(Viewed, Results[index].Identifier); } @@ -190,7 +190,7 @@ private void ClickSet(object sender, EventArgs e) // Refresh database view. L_Count.Text = string.Format(Counter, Results.Count); slotSelected = Results.Count - 1; - slotColor = Resources.slotSet; + slotColor = SpriteUtil.Spriter.Set; if ((SCR_Box.Maximum+1)*6 < Results.Count) SCR_Box.Maximum++; SCR_Box.Value = Math.Max(0, SCR_Box.Maximum - (PKXBOXES.Length/6) + 1); @@ -547,9 +547,9 @@ private void FillPKXBoxes(int start) PKXBOXES[i].Image = null; for (int i = 0; i < RES_MAX; i++) - PKXBOXES[i].BackgroundImage = Resources.slotTrans; + PKXBOXES[i].BackgroundImage = SpriteUtil.Spriter.Transparent; if (slotSelected != -1 && slotSelected >= begin && slotSelected < begin + RES_MAX) - PKXBOXES[slotSelected - begin].BackgroundImage = slotColor ?? Resources.slotView; + PKXBOXES[slotSelected - begin].BackgroundImage = slotColor ?? SpriteUtil.Spriter.View; } // Misc Update Methods @@ -593,7 +593,7 @@ private void Menu_SearchAdvanced_Click(object sender, EventArgs e) protected override void OnMouseWheel(MouseEventArgs e) { - if (!pokeGrid1.RectangleToScreen(pokeGrid1.ClientRectangle).Contains(MousePosition)) + if (!DatabasePokeGrid.RectangleToScreen(DatabasePokeGrid.ClientRectangle).Contains(MousePosition)) return; int oldval = SCR_Box.Value; int newval = oldval + (e.Delta < 0 ? 1 : -1); diff --git a/PKHeX.WinForms/Subforms/SAV_Encounters.Designer.cs b/PKHeX.WinForms/Subforms/SAV_Encounters.Designer.cs index 1a9be4259..23b0b8496 100644 --- a/PKHeX.WinForms/Subforms/SAV_Encounters.Designer.cs +++ b/PKHeX.WinForms/Subforms/SAV_Encounters.Designer.cs @@ -37,7 +37,7 @@ private void InitializeComponent() this.Menu_SearchSettings = new System.Windows.Forms.ToolStripMenuItem(); this.Menu_SearchAdvanced = new System.Windows.Forms.ToolStripMenuItem(); this.P_Results = new System.Windows.Forms.Panel(); - this.pokeGrid1 = new PKHeX.WinForms.Controls.PokeGrid(); + this.EncounterPokeGrid = new PKHeX.WinForms.Controls.PokeGrid(); this.CB_Species = new System.Windows.Forms.ComboBox(); this.CB_Move4 = new System.Windows.Forms.ComboBox(); this.CB_Move3 = new System.Windows.Forms.ComboBox(); @@ -141,7 +141,7 @@ private void InitializeComponent() // this.P_Results.BackColor = System.Drawing.SystemColors.ButtonHighlight; this.P_Results.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.P_Results.Controls.Add(this.pokeGrid1); + this.P_Results.Controls.Add(this.EncounterPokeGrid); this.P_Results.Controls.Add(this.SCR_Box); this.P_Results.Location = new System.Drawing.Point(12, 32); this.P_Results.Name = "P_Results"; @@ -150,12 +150,12 @@ private void InitializeComponent() // // pokeGrid1 // - this.pokeGrid1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.pokeGrid1.Location = new System.Drawing.Point(2, 2); - this.pokeGrid1.Margin = new System.Windows.Forms.Padding(0); - this.pokeGrid1.Name = "pokeGrid1"; - this.pokeGrid1.Size = new System.Drawing.Size(251, 346); - this.pokeGrid1.TabIndex = 2; + this.EncounterPokeGrid.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.EncounterPokeGrid.Location = new System.Drawing.Point(2, 2); + this.EncounterPokeGrid.Margin = new System.Windows.Forms.Padding(0); + this.EncounterPokeGrid.Name = "EncounterPokeGrid"; + this.EncounterPokeGrid.Size = new System.Drawing.Size(251, 346); + this.EncounterPokeGrid.TabIndex = 2; // // CB_Species // @@ -523,7 +523,7 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem Menu_SearchAdvanced; private System.Windows.Forms.ComboBox CB_GameOrigin; private System.Windows.Forms.Label L_Version; - private Controls.PokeGrid pokeGrid1; + private Controls.PokeGrid EncounterPokeGrid; private System.Windows.Forms.FlowLayoutPanel TypeFilters; private System.Windows.Forms.ToolTip hover; private System.Windows.Forms.ContextMenuStrip mnu; diff --git a/PKHeX.WinForms/Subforms/SAV_Encounters.cs b/PKHeX.WinForms/Subforms/SAV_Encounters.cs index c74c9018e..790d438ac 100644 --- a/PKHeX.WinForms/Subforms/SAV_Encounters.cs +++ b/PKHeX.WinForms/Subforms/SAV_Encounters.cs @@ -25,9 +25,9 @@ public SAV_Encounters(PKMEditor f1) PKME_Tabs = f1; - pokeGrid1.InitializeGrid(6, 11); - pokeGrid1.SetBackground(Resources.box_wp_clean); - PKXBOXES = pokeGrid1.Entries.ToArray(); + EncounterPokeGrid.InitializeGrid(6, 11, SpriteUtil.Spriter); + EncounterPokeGrid.SetBackground(Resources.box_wp_clean); + PKXBOXES = EncounterPokeGrid.Entries.ToArray(); // Enable Scrolling when hovered over foreach (var slot in PKXBOXES) @@ -115,7 +115,7 @@ private void ClickView(object sender, EventArgs e) pk.RefreshChecksum(); PKME_Tabs.PopulateFields(pk, false); slotSelected = index; - slotColor = Resources.slotView; + slotColor = SpriteUtil.Spriter.View; FillPKXBoxes(SCR_Box.Value); } @@ -276,9 +276,9 @@ private void FillPKXBoxes(int start) PKXBOXES[i].Image = null; for (int i = 0; i < RES_MAX; i++) - PKXBOXES[i].BackgroundImage = Resources.slotTrans; + PKXBOXES[i].BackgroundImage = SpriteUtil.Spriter.Transparent; if (slotSelected != -1 && slotSelected >= begin && slotSelected < begin + RES_MAX) - PKXBOXES[slotSelected - begin].BackgroundImage = slotColor ?? Resources.slotView; + PKXBOXES[slotSelected - begin].BackgroundImage = slotColor ?? SpriteUtil.Spriter.View; } private static int GetForm(IEncounterable enc) @@ -302,7 +302,7 @@ private void Menu_SearchAdvanced_Click(object sender, EventArgs e) protected override void OnMouseWheel(MouseEventArgs e) { - if (!pokeGrid1.RectangleToScreen(pokeGrid1.ClientRectangle).Contains(MousePosition)) + if (!EncounterPokeGrid.RectangleToScreen(EncounterPokeGrid.ClientRectangle).Contains(MousePosition)) return; int oldval = SCR_Box.Value; int newval = oldval + (e.Delta < 0 ? 1 : -1); diff --git a/PKHeX.WinForms/Subforms/SAV_MysteryGiftDB.Designer.cs b/PKHeX.WinForms/Subforms/SAV_MysteryGiftDB.Designer.cs index b6c54905a..833590889 100644 --- a/PKHeX.WinForms/Subforms/SAV_MysteryGiftDB.Designer.cs +++ b/PKHeX.WinForms/Subforms/SAV_MysteryGiftDB.Designer.cs @@ -40,7 +40,7 @@ private void InitializeComponent() this.Menu_Export = new System.Windows.Forms.ToolStripMenuItem(); this.Menu_Import = new System.Windows.Forms.ToolStripMenuItem(); this.P_Results = new System.Windows.Forms.Panel(); - this.pokeGrid1 = new PKHeX.WinForms.Controls.PokeGrid(); + this.MysteryPokeGrid = new PKHeX.WinForms.Controls.PokeGrid(); this.CB_HeldItem = new System.Windows.Forms.ComboBox(); this.CB_Species = new System.Windows.Forms.ComboBox(); this.CB_Move4 = new System.Windows.Forms.ComboBox(); @@ -178,7 +178,7 @@ private void InitializeComponent() // this.P_Results.BackColor = System.Drawing.SystemColors.ButtonHighlight; this.P_Results.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.P_Results.Controls.Add(this.pokeGrid1); + this.P_Results.Controls.Add(this.MysteryPokeGrid); this.P_Results.Controls.Add(this.SCR_Box); this.P_Results.Location = new System.Drawing.Point(12, 32); this.P_Results.Name = "P_Results"; @@ -187,12 +187,12 @@ private void InitializeComponent() // // pokeGrid1 // - this.pokeGrid1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.pokeGrid1.Location = new System.Drawing.Point(2, 2); - this.pokeGrid1.Margin = new System.Windows.Forms.Padding(0); - this.pokeGrid1.Name = "pokeGrid1"; - this.pokeGrid1.Size = new System.Drawing.Size(251, 346); - this.pokeGrid1.TabIndex = 2; + this.MysteryPokeGrid.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.MysteryPokeGrid.Location = new System.Drawing.Point(2, 2); + this.MysteryPokeGrid.Margin = new System.Windows.Forms.Padding(0); + this.MysteryPokeGrid.Name = "MysteryPokeGrid"; + this.MysteryPokeGrid.Size = new System.Drawing.Size(251, 346); + this.MysteryPokeGrid.TabIndex = 2; // // CB_HeldItem // @@ -659,7 +659,7 @@ private void InitializeComponent() private System.Windows.Forms.RichTextBox RTB_Instructions; private System.Windows.Forms.ToolStripMenuItem Menu_SearchAdvanced; private System.Windows.Forms.ToolStripMenuItem Menu_Import; - private Controls.PokeGrid pokeGrid1; + private Controls.PokeGrid MysteryPokeGrid; private System.Windows.Forms.ContextMenuStrip mnu; private System.Windows.Forms.ToolStripMenuItem mnuView; private System.Windows.Forms.ToolStripMenuItem mnuSaveMG; diff --git a/PKHeX.WinForms/Subforms/SAV_MysteryGiftDB.cs b/PKHeX.WinForms/Subforms/SAV_MysteryGiftDB.cs index 3c40947ea..1efbb63ba 100644 --- a/PKHeX.WinForms/Subforms/SAV_MysteryGiftDB.cs +++ b/PKHeX.WinForms/Subforms/SAV_MysteryGiftDB.cs @@ -33,9 +33,9 @@ public SAV_MysteryGiftDB(PKMEditor tabs, SAVEditor sav) // Preset Filters to only show PKM available for loaded save CB_FormatComparator.SelectedIndex = 3; // <= - pokeGrid1.InitializeGrid(6, 11); - pokeGrid1.SetBackground(Resources.box_wp_clean); - PKXBOXES = pokeGrid1.Entries.ToArray(); + MysteryPokeGrid.InitializeGrid(6, 11, SpriteUtil.Spriter); + MysteryPokeGrid.SetBackground(Resources.box_wp_clean); + PKXBOXES = MysteryPokeGrid.Entries.ToArray(); // Enable Scrolling when hovered over foreach (var slot in PKXBOXES) @@ -89,7 +89,7 @@ private void ClickView(object sender, EventArgs e) return; PKME_Tabs.PopulateFields(Results[index].ConvertToPKM(SAV), false); slotSelected = index; - slotColor = Resources.slotView; + slotColor = SpriteUtil.Spriter.View; UpdateSlotColor(SCR_Box.Value); L_Viewed.Text = string.Format(Viewed, Results[index].FileName); } @@ -313,9 +313,9 @@ private void FillPKXBoxes(int start) private void UpdateSlotColor(int start) { for (int i = 0; i < RES_MAX; i++) - PKXBOXES[i].BackgroundImage = Resources.slotTrans; + PKXBOXES[i].BackgroundImage = SpriteUtil.Spriter.Transparent; if (slotSelected != -1 && slotSelected >= RES_MIN * start && slotSelected < (RES_MIN * start) + RES_MAX) - PKXBOXES[slotSelected - (start * RES_MIN)].BackgroundImage = slotColor ?? Resources.slotView; + PKXBOXES[slotSelected - (start * RES_MIN)].BackgroundImage = slotColor ?? SpriteUtil.Spriter.View; } private void Menu_SearchAdvanced_Click(object sender, EventArgs e) @@ -353,7 +353,7 @@ private void Menu_Exit_Click(object sender, EventArgs e) protected override void OnMouseWheel(MouseEventArgs e) { - if (!pokeGrid1.RectangleToScreen(pokeGrid1.ClientRectangle).Contains(MousePosition)) + if (!MysteryPokeGrid.RectangleToScreen(MysteryPokeGrid.ClientRectangle).Contains(MousePosition)) return; int oldval = SCR_Box.Value; int newval = oldval + (e.Delta < 0 ? 1 : -1); diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_FestivalPlaza.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_FestivalPlaza.cs index 7a37872d4..d97ddfc15 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_FestivalPlaza.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_FestivalPlaza.cs @@ -279,9 +279,9 @@ private void Save() private void LoadBattleAgency() { - p[0] = SAV.GetStoredSlot(0x6C200); - p[1] = SAV.GetPartySlot(0x6C2E8); - p[2] = SAV.GetPartySlot(0x6C420); + p[0] = SAV.GetStoredSlot(SAV.Data, 0x6C200); + p[1] = SAV.GetPartySlot(SAV.Data, 0x6C2E8); + p[2] = SAV.GetPartySlot(SAV.Data, 0x6C420); LoadPictureBox(); B_ImportParty.Visible = SAV.HasParty; CHK_Choosed.Checked = SAV.GetFlag(0x6C55E, 1); diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_PokedexSWSH.Designer.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_PokedexSWSH.Designer.cs index 1c59378e7..f757eb6ae 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_PokedexSWSH.Designer.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_PokedexSWSH.Designer.cs @@ -31,15 +31,7 @@ private void InitializeComponent() this.components = new System.ComponentModel.Container(); this.B_Cancel = new System.Windows.Forms.Button(); this.LB_Species = new System.Windows.Forms.ListBox(); - this.CHK_P1 = new System.Windows.Forms.CheckBox(); - this.CHK_P2 = new System.Windows.Forms.CheckBox(); - this.CHK_P3 = new System.Windows.Forms.CheckBox(); - this.CHK_P4 = new System.Windows.Forms.CheckBox(); - this.CHK_P5 = new System.Windows.Forms.CheckBox(); - this.CHK_P6 = new System.Windows.Forms.CheckBox(); - this.CHK_P7 = new System.Windows.Forms.CheckBox(); - this.CHK_P8 = new System.Windows.Forms.CheckBox(); - this.CHK_P9 = new System.Windows.Forms.CheckBox(); + this.CHK_Caught = new System.Windows.Forms.CheckBox(); this.CHK_L7 = new System.Windows.Forms.CheckBox(); this.CHK_L6 = new System.Windows.Forms.CheckBox(); this.CHK_L5 = new System.Windows.Forms.CheckBox(); @@ -55,9 +47,6 @@ private void InitializeComponent() this.GB_Language = new System.Windows.Forms.GroupBox(); this.CHK_L9 = new System.Windows.Forms.CheckBox(); this.CHK_L8 = new System.Windows.Forms.CheckBox(); - this.GB_Encountered = new System.Windows.Forms.GroupBox(); - this.GB_Owned = new System.Windows.Forms.GroupBox(); - this.GB_Displayed = new System.Windows.Forms.GroupBox(); this.modifyMenu = new System.Windows.Forms.ContextMenuStrip(this.components); this.mnuSeenNone = new System.Windows.Forms.ToolStripMenuItem(); this.mnuSeenAll = new System.Windows.Forms.ToolStripMenuItem(); @@ -67,18 +56,36 @@ private void InitializeComponent() this.mnuFormNone = new System.Windows.Forms.ToolStripMenuItem(); this.mnuForm1 = new System.Windows.Forms.ToolStripMenuItem(); this.mnuFormAll = new System.Windows.Forms.ToolStripMenuItem(); - this.LB_Forms = new System.Windows.Forms.ListBox(); + this.NUD_Battled = new System.Windows.Forms.NumericUpDown(); + this.L_Battled = new System.Windows.Forms.Label(); + this.label1 = new System.Windows.Forms.Label(); + this.GB_Displayed = new System.Windows.Forms.GroupBox(); + this.CHK_S = new System.Windows.Forms.CheckBox(); + this.CHK_G = new System.Windows.Forms.CheckBox(); + this.CHK_Unk = new System.Windows.Forms.CheckBox(); + this.NUD_Form = new System.Windows.Forms.NumericUpDown(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); + this.CLB_2 = new System.Windows.Forms.CheckedListBox(); + this.CLB_1 = new System.Windows.Forms.CheckedListBox(); + this.CLB_4 = new System.Windows.Forms.CheckedListBox(); + this.CLB_3 = new System.Windows.Forms.CheckedListBox(); + this.L_Male = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); + this.label4 = new System.Windows.Forms.Label(); + this.label5 = new System.Windows.Forms.Label(); + this.CB_Gender = new System.Windows.Forms.ComboBox(); this.GB_Language.SuspendLayout(); - this.GB_Encountered.SuspendLayout(); - this.GB_Owned.SuspendLayout(); - this.GB_Displayed.SuspendLayout(); this.modifyMenu.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_Battled)).BeginInit(); + this.GB_Displayed.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_Form)).BeginInit(); + this.tableLayoutPanel1.SuspendLayout(); this.SuspendLayout(); // // B_Cancel // this.B_Cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.B_Cancel.Location = new System.Drawing.Point(244, 261); + this.B_Cancel.Location = new System.Drawing.Point(642, 421); this.B_Cancel.Name = "B_Cancel"; this.B_Cancel.Size = new System.Drawing.Size(80, 23); this.B_Cancel.TabIndex = 0; @@ -88,110 +95,24 @@ private void InitializeComponent() // // LB_Species // + this.LB_Species.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left))); this.LB_Species.FormattingEnabled = true; this.LB_Species.Location = new System.Drawing.Point(12, 40); this.LB_Species.Name = "LB_Species"; - this.LB_Species.Size = new System.Drawing.Size(160, 173); + this.LB_Species.Size = new System.Drawing.Size(160, 394); this.LB_Species.TabIndex = 2; this.LB_Species.SelectedIndexChanged += new System.EventHandler(this.ChangeLBSpecies); // - // CHK_P1 + // CHK_Caught // - this.CHK_P1.AutoSize = true; - this.CHK_P1.Location = new System.Drawing.Point(18, 15); - this.CHK_P1.Name = "CHK_P1"; - this.CHK_P1.Size = new System.Drawing.Size(60, 17); - this.CHK_P1.TabIndex = 3; - this.CHK_P1.Text = "Owned"; - this.CHK_P1.UseVisualStyleBackColor = true; - // - // CHK_P2 - // - this.CHK_P2.AutoSize = true; - this.CHK_P2.Location = new System.Drawing.Point(6, 25); - this.CHK_P2.Name = "CHK_P2"; - this.CHK_P2.Size = new System.Drawing.Size(49, 17); - this.CHK_P2.TabIndex = 4; - this.CHK_P2.Text = "Male"; - this.CHK_P2.UseVisualStyleBackColor = true; - this.CHK_P2.Click += new System.EventHandler(this.ChangeEncountered); - // - // CHK_P3 - // - this.CHK_P3.AutoSize = true; - this.CHK_P3.Location = new System.Drawing.Point(6, 42); - this.CHK_P3.Name = "CHK_P3"; - this.CHK_P3.Size = new System.Drawing.Size(60, 17); - this.CHK_P3.TabIndex = 5; - this.CHK_P3.Text = "Female"; - this.CHK_P3.UseVisualStyleBackColor = true; - this.CHK_P3.Click += new System.EventHandler(this.ChangeEncountered); - // - // CHK_P4 - // - this.CHK_P4.AutoSize = true; - this.CHK_P4.Location = new System.Drawing.Point(6, 60); - this.CHK_P4.Name = "CHK_P4"; - this.CHK_P4.Size = new System.Drawing.Size(78, 17); - this.CHK_P4.TabIndex = 6; - this.CHK_P4.Text = "Shiny Male"; - this.CHK_P4.UseVisualStyleBackColor = true; - this.CHK_P4.Click += new System.EventHandler(this.ChangeEncountered); - // - // CHK_P5 - // - this.CHK_P5.AutoSize = true; - this.CHK_P5.Location = new System.Drawing.Point(6, 77); - this.CHK_P5.Name = "CHK_P5"; - this.CHK_P5.Size = new System.Drawing.Size(89, 17); - this.CHK_P5.TabIndex = 7; - this.CHK_P5.Text = "Shiny Female"; - this.CHK_P5.UseVisualStyleBackColor = true; - this.CHK_P5.Click += new System.EventHandler(this.ChangeEncountered); - // - // CHK_P6 - // - this.CHK_P6.AutoSize = true; - this.CHK_P6.Location = new System.Drawing.Point(6, 25); - this.CHK_P6.Name = "CHK_P6"; - this.CHK_P6.Size = new System.Drawing.Size(49, 17); - this.CHK_P6.TabIndex = 8; - this.CHK_P6.Text = "Male"; - this.CHK_P6.UseVisualStyleBackColor = true; - this.CHK_P6.Click += new System.EventHandler(this.ChangeDisplayed); - // - // CHK_P7 - // - this.CHK_P7.AutoSize = true; - this.CHK_P7.Location = new System.Drawing.Point(6, 42); - this.CHK_P7.Name = "CHK_P7"; - this.CHK_P7.Size = new System.Drawing.Size(60, 17); - this.CHK_P7.TabIndex = 9; - this.CHK_P7.Text = "Female"; - this.CHK_P7.UseVisualStyleBackColor = true; - this.CHK_P7.Click += new System.EventHandler(this.ChangeDisplayed); - // - // CHK_P8 - // - this.CHK_P8.AutoSize = true; - this.CHK_P8.Location = new System.Drawing.Point(6, 60); - this.CHK_P8.Name = "CHK_P8"; - this.CHK_P8.Size = new System.Drawing.Size(78, 17); - this.CHK_P8.TabIndex = 10; - this.CHK_P8.Text = "Shiny Male"; - this.CHK_P8.UseVisualStyleBackColor = true; - this.CHK_P8.Click += new System.EventHandler(this.ChangeDisplayed); - // - // CHK_P9 - // - this.CHK_P9.AutoSize = true; - this.CHK_P9.Location = new System.Drawing.Point(6, 77); - this.CHK_P9.Name = "CHK_P9"; - this.CHK_P9.Size = new System.Drawing.Size(89, 17); - this.CHK_P9.TabIndex = 11; - this.CHK_P9.Text = "Shiny Female"; - this.CHK_P9.UseVisualStyleBackColor = true; - this.CHK_P9.Click += new System.EventHandler(this.ChangeDisplayed); + this.CHK_Caught.AutoSize = true; + this.CHK_Caught.Location = new System.Drawing.Point(284, 15); + this.CHK_Caught.Name = "CHK_Caught"; + this.CHK_Caught.Size = new System.Drawing.Size(60, 17); + this.CHK_Caught.TabIndex = 3; + this.CHK_Caught.Text = "Owned"; + this.CHK_Caught.UseVisualStyleBackColor = true; // // CHK_L7 // @@ -300,7 +221,7 @@ private void InitializeComponent() // B_Save // this.B_Save.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.B_Save.Location = new System.Drawing.Point(330, 261); + this.B_Save.Location = new System.Drawing.Point(642, 392); this.B_Save.Name = "B_Save"; this.B_Save.Size = new System.Drawing.Size(80, 23); this.B_Save.TabIndex = 24; @@ -310,7 +231,8 @@ private void InitializeComponent() // // B_Modify // - this.B_Modify.Location = new System.Drawing.Point(347, 11); + this.B_Modify.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.B_Modify.Location = new System.Drawing.Point(600, 9); this.B_Modify.Name = "B_Modify"; this.B_Modify.Size = new System.Drawing.Size(60, 23); this.B_Modify.TabIndex = 25; @@ -320,6 +242,7 @@ private void InitializeComponent() // // GB_Language // + this.GB_Language.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.GB_Language.Controls.Add(this.CHK_L9); this.GB_Language.Controls.Add(this.CHK_L8); this.GB_Language.Controls.Add(this.CHK_L7); @@ -329,9 +252,9 @@ private void InitializeComponent() this.GB_Language.Controls.Add(this.CHK_L3); this.GB_Language.Controls.Add(this.CHK_L2); this.GB_Language.Controls.Add(this.CHK_L1); - this.GB_Language.Location = new System.Drawing.Point(300, 82); + this.GB_Language.Location = new System.Drawing.Point(600, 40); this.GB_Language.Name = "GB_Language"; - this.GB_Language.Size = new System.Drawing.Size(108, 172); + this.GB_Language.Size = new System.Drawing.Size(122, 172); this.GB_Language.TabIndex = 26; this.GB_Language.TabStop = false; this.GB_Language.Text = "Languages"; @@ -356,42 +279,6 @@ private void InitializeComponent() this.CHK_L8.Text = "Chinese"; this.CHK_L8.UseVisualStyleBackColor = true; // - // GB_Encountered - // - this.GB_Encountered.Controls.Add(this.CHK_P5); - this.GB_Encountered.Controls.Add(this.CHK_P4); - this.GB_Encountered.Controls.Add(this.CHK_P3); - this.GB_Encountered.Controls.Add(this.CHK_P2); - this.GB_Encountered.Location = new System.Drawing.Point(178, 40); - this.GB_Encountered.Name = "GB_Encountered"; - this.GB_Encountered.Size = new System.Drawing.Size(116, 104); - this.GB_Encountered.TabIndex = 27; - this.GB_Encountered.TabStop = false; - this.GB_Encountered.Text = "Seen"; - // - // GB_Owned - // - this.GB_Owned.Controls.Add(this.CHK_P1); - this.GB_Owned.Location = new System.Drawing.Point(300, 40); - this.GB_Owned.Name = "GB_Owned"; - this.GB_Owned.Size = new System.Drawing.Size(108, 36); - this.GB_Owned.TabIndex = 28; - this.GB_Owned.TabStop = false; - this.GB_Owned.Text = "Owned"; - // - // GB_Displayed - // - this.GB_Displayed.Controls.Add(this.CHK_P9); - this.GB_Displayed.Controls.Add(this.CHK_P8); - this.GB_Displayed.Controls.Add(this.CHK_P7); - this.GB_Displayed.Controls.Add(this.CHK_P6); - this.GB_Displayed.Location = new System.Drawing.Point(178, 151); - this.GB_Displayed.Name = "GB_Displayed"; - this.GB_Displayed.Size = new System.Drawing.Size(116, 104); - this.GB_Displayed.TabIndex = 31; - this.GB_Displayed.TabStop = false; - this.GB_Displayed.Text = "Displayed"; - // // modifyMenu // this.modifyMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -408,35 +295,35 @@ private void InitializeComponent() this.mnuSeenNone.Name = "mnuSeenNone"; this.mnuSeenNone.Size = new System.Drawing.Size(148, 22); this.mnuSeenNone.Text = "Seen none"; - this.mnuSeenNone.Click += new System.EventHandler(this.ModifyAll); + this.mnuSeenNone.Click += new System.EventHandler(this.SeenNone); // // mnuSeenAll // this.mnuSeenAll.Name = "mnuSeenAll"; this.mnuSeenAll.Size = new System.Drawing.Size(148, 22); this.mnuSeenAll.Text = "Seen all"; - this.mnuSeenAll.Click += new System.EventHandler(this.ModifyAll); + this.mnuSeenAll.Click += new System.EventHandler(this.SeenAll); // // mnuCaughtNone // this.mnuCaughtNone.Name = "mnuCaughtNone"; this.mnuCaughtNone.Size = new System.Drawing.Size(148, 22); this.mnuCaughtNone.Text = "Caught none"; - this.mnuCaughtNone.Click += new System.EventHandler(this.ModifyAll); + this.mnuCaughtNone.Click += new System.EventHandler(this.CaughtNone); // // mnuCaughtAll // this.mnuCaughtAll.Name = "mnuCaughtAll"; this.mnuCaughtAll.Size = new System.Drawing.Size(148, 22); this.mnuCaughtAll.Text = "Caught all"; - this.mnuCaughtAll.Click += new System.EventHandler(this.ModifyAll); + this.mnuCaughtAll.Click += new System.EventHandler(this.CaughtAll); // // mnuComplete // this.mnuComplete.Name = "mnuComplete"; this.mnuComplete.Size = new System.Drawing.Size(148, 22); this.mnuComplete.Text = "Complete Dex"; - this.mnuComplete.Click += new System.EventHandler(this.ModifyAll); + this.mnuComplete.Click += new System.EventHandler(this.CompleteDex); // // mnuFormNone // @@ -453,24 +340,224 @@ private void InitializeComponent() this.mnuFormAll.Name = "mnuFormAll"; this.mnuFormAll.Size = new System.Drawing.Size(32, 19); // - // LB_Forms + // NUD_Battled // - this.LB_Forms.FormattingEnabled = true; - this.LB_Forms.Location = new System.Drawing.Point(12, 222); - this.LB_Forms.Name = "LB_Forms"; - this.LB_Forms.Size = new System.Drawing.Size(160, 56); - this.LB_Forms.TabIndex = 32; - this.LB_Forms.SelectedIndexChanged += new System.EventHandler(this.ChangeLBForms); + this.NUD_Battled.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.NUD_Battled.Location = new System.Drawing.Point(603, 358); + this.NUD_Battled.Name = "NUD_Battled"; + this.NUD_Battled.Size = new System.Drawing.Size(113, 20); + this.NUD_Battled.TabIndex = 28; + // + // L_Battled + // + this.L_Battled.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.L_Battled.AutoSize = true; + this.L_Battled.Location = new System.Drawing.Point(600, 342); + this.L_Battled.Name = "L_Battled"; + this.L_Battled.Size = new System.Drawing.Size(43, 13); + this.L_Battled.TabIndex = 29; + this.L_Battled.Text = "Battled:"; + // + // label1 + // + this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(600, 219); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(82, 13); + this.label1.TabIndex = 32; + this.label1.Text = "Displayed Form:"; + // + // GB_Displayed + // + this.GB_Displayed.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.GB_Displayed.Controls.Add(this.CB_Gender); + this.GB_Displayed.Controls.Add(this.CHK_S); + this.GB_Displayed.Controls.Add(this.CHK_G); + this.GB_Displayed.Location = new System.Drawing.Point(600, 262); + this.GB_Displayed.Name = "GB_Displayed"; + this.GB_Displayed.Size = new System.Drawing.Size(122, 76); + this.GB_Displayed.TabIndex = 33; + this.GB_Displayed.TabStop = false; + this.GB_Displayed.Text = "Displayed"; + // + // CHK_S + // + this.CHK_S.AutoSize = true; + this.CHK_S.Location = new System.Drawing.Point(5, 27); + this.CHK_S.Name = "CHK_S"; + this.CHK_S.Size = new System.Drawing.Size(52, 17); + this.CHK_S.TabIndex = 9; + this.CHK_S.Text = "Shiny"; + this.CHK_S.UseVisualStyleBackColor = true; + // + // CHK_G + // + this.CHK_G.AutoSize = true; + this.CHK_G.Location = new System.Drawing.Point(5, 13); + this.CHK_G.Name = "CHK_G"; + this.CHK_G.Size = new System.Drawing.Size(78, 17); + this.CHK_G.TabIndex = 8; + this.CHK_G.Text = "Gigantamax"; + this.CHK_G.UseVisualStyleBackColor = true; + // + // CHK_Unk + // + this.CHK_Unk.AutoSize = true; + this.CHK_Unk.Enabled = false; + this.CHK_Unk.Location = new System.Drawing.Point(393, 15); + this.CHK_Unk.Name = "CHK_Unk"; + this.CHK_Unk.Size = new System.Drawing.Size(92, 17); + this.CHK_Unk.TabIndex = 34; + this.CHK_Unk.Text = "UnknownFlag"; + this.CHK_Unk.UseVisualStyleBackColor = true; + // + // NUD_Form + // + this.NUD_Form.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.NUD_Form.Location = new System.Drawing.Point(603, 236); + this.NUD_Form.Name = "NUD_Form"; + this.NUD_Form.Size = new System.Drawing.Size(113, 20); + this.NUD_Form.TabIndex = 35; + // + // tableLayoutPanel1 + // + this.tableLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.tableLayoutPanel1.ColumnCount = 4; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel1.Controls.Add(this.L_Male, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.label3, 1, 0); + this.tableLayoutPanel1.Controls.Add(this.label4, 2, 0); + this.tableLayoutPanel1.Controls.Add(this.label5, 3, 0); + this.tableLayoutPanel1.Controls.Add(this.CLB_3, 0, 1); + this.tableLayoutPanel1.Controls.Add(this.CLB_4, 0, 1); + this.tableLayoutPanel1.Controls.Add(this.CLB_1, 0, 1); + this.tableLayoutPanel1.Controls.Add(this.CLB_2, 0, 1); + this.tableLayoutPanel1.Location = new System.Drawing.Point(178, 40); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 2; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(416, 396); + this.tableLayoutPanel1.TabIndex = 36; + // + // CLB_2 + // + this.CLB_2.Dock = System.Windows.Forms.DockStyle.Fill; + this.CLB_2.FormattingEnabled = true; + this.CLB_2.Location = new System.Drawing.Point(105, 21); + this.CLB_2.Margin = new System.Windows.Forms.Padding(1); + this.CLB_2.Name = "CLB_2"; + this.CLB_2.Size = new System.Drawing.Size(102, 374); + this.CLB_2.TabIndex = 30; + // + // CLB_1 + // + this.CLB_1.Dock = System.Windows.Forms.DockStyle.Fill; + this.CLB_1.FormattingEnabled = true; + this.CLB_1.Location = new System.Drawing.Point(1, 21); + this.CLB_1.Margin = new System.Windows.Forms.Padding(1); + this.CLB_1.Name = "CLB_1"; + this.CLB_1.Size = new System.Drawing.Size(102, 374); + this.CLB_1.TabIndex = 32; + // + // CLB_4 + // + this.CLB_4.Dock = System.Windows.Forms.DockStyle.Fill; + this.CLB_4.FormattingEnabled = true; + this.CLB_4.Location = new System.Drawing.Point(313, 21); + this.CLB_4.Margin = new System.Windows.Forms.Padding(1); + this.CLB_4.Name = "CLB_4"; + this.CLB_4.Size = new System.Drawing.Size(102, 374); + this.CLB_4.TabIndex = 33; + // + // CLB_3 + // + this.CLB_3.Dock = System.Windows.Forms.DockStyle.Fill; + this.CLB_3.FormattingEnabled = true; + this.CLB_3.Location = new System.Drawing.Point(209, 21); + this.CLB_3.Margin = new System.Windows.Forms.Padding(1); + this.CLB_3.Name = "CLB_3"; + this.CLB_3.Size = new System.Drawing.Size(102, 374); + this.CLB_3.TabIndex = 34; + // + // L_Male + // + this.L_Male.AutoSize = true; + this.L_Male.Dock = System.Windows.Forms.DockStyle.Fill; + this.L_Male.Location = new System.Drawing.Point(3, 0); + this.L_Male.Name = "L_Male"; + this.L_Male.Size = new System.Drawing.Size(98, 20); + this.L_Male.TabIndex = 37; + this.L_Male.Text = "Male"; + this.L_Male.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Dock = System.Windows.Forms.DockStyle.Fill; + this.label3.Location = new System.Drawing.Point(107, 0); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(98, 20); + this.label3.TabIndex = 38; + this.label3.Text = "Female"; + this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Dock = System.Windows.Forms.DockStyle.Fill; + this.label4.Location = new System.Drawing.Point(211, 0); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(98, 20); + this.label4.TabIndex = 39; + this.label4.Text = "*Male*"; + this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Dock = System.Windows.Forms.DockStyle.Fill; + this.label5.Location = new System.Drawing.Point(315, 0); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(98, 20); + this.label5.TabIndex = 40; + this.label5.Text = "*Female*"; + this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // CB_Gender + // + this.CB_Gender.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.CB_Gender.FormattingEnabled = true; + this.CB_Gender.Items.AddRange(new object[] { + "♂", + "♀", + "-"}); + this.CB_Gender.Location = new System.Drawing.Point(6, 49); + this.CB_Gender.Name = "CB_Gender"; + this.CB_Gender.Size = new System.Drawing.Size(40, 21); + this.CB_Gender.TabIndex = 23; // // SAV_PokedexSWSH // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(417, 291); - this.Controls.Add(this.LB_Forms); + this.ClientSize = new System.Drawing.Size(734, 454); + this.Controls.Add(this.tableLayoutPanel1); + this.Controls.Add(this.NUD_Form); + this.Controls.Add(this.CHK_Unk); this.Controls.Add(this.GB_Displayed); - this.Controls.Add(this.GB_Owned); - this.Controls.Add(this.GB_Encountered); + this.Controls.Add(this.label1); + this.Controls.Add(this.L_Battled); + this.Controls.Add(this.NUD_Battled); + this.Controls.Add(this.CHK_Caught); this.Controls.Add(this.GB_Language); this.Controls.Add(this.B_Modify); this.Controls.Add(this.B_Save); @@ -479,22 +566,22 @@ private void InitializeComponent() this.Controls.Add(this.L_goto); this.Controls.Add(this.LB_Species); this.Controls.Add(this.B_Cancel); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.Icon = global::PKHeX.WinForms.Properties.Resources.Icon; this.MaximizeBox = false; this.MinimizeBox = false; + this.MinimumSize = new System.Drawing.Size(750, 493); this.Name = "SAV_PokedexSWSH"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Pokédex Editor"; this.GB_Language.ResumeLayout(false); this.GB_Language.PerformLayout(); - this.GB_Encountered.ResumeLayout(false); - this.GB_Encountered.PerformLayout(); - this.GB_Owned.ResumeLayout(false); - this.GB_Owned.PerformLayout(); + this.modifyMenu.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.NUD_Battled)).EndInit(); this.GB_Displayed.ResumeLayout(false); this.GB_Displayed.PerformLayout(); - this.modifyMenu.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.NUD_Form)).EndInit(); + this.tableLayoutPanel1.ResumeLayout(false); + this.tableLayoutPanel1.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -504,15 +591,7 @@ private void InitializeComponent() private System.Windows.Forms.Button B_Cancel; private System.Windows.Forms.ListBox LB_Species; - private System.Windows.Forms.CheckBox CHK_P1; - private System.Windows.Forms.CheckBox CHK_P2; - private System.Windows.Forms.CheckBox CHK_P3; - private System.Windows.Forms.CheckBox CHK_P4; - private System.Windows.Forms.CheckBox CHK_P5; - private System.Windows.Forms.CheckBox CHK_P6; - private System.Windows.Forms.CheckBox CHK_P7; - private System.Windows.Forms.CheckBox CHK_P8; - private System.Windows.Forms.CheckBox CHK_P9; + private System.Windows.Forms.CheckBox CHK_Caught; private System.Windows.Forms.CheckBox CHK_L7; private System.Windows.Forms.CheckBox CHK_L6; private System.Windows.Forms.CheckBox CHK_L5; @@ -526,9 +605,6 @@ private void InitializeComponent() private System.Windows.Forms.Button B_Save; private System.Windows.Forms.Button B_Modify; private System.Windows.Forms.GroupBox GB_Language; - private System.Windows.Forms.GroupBox GB_Encountered; - private System.Windows.Forms.GroupBox GB_Owned; - private System.Windows.Forms.GroupBox GB_Displayed; private System.Windows.Forms.ContextMenuStrip modifyMenu; private System.Windows.Forms.ToolStripMenuItem mnuSeenNone; private System.Windows.Forms.ToolStripMenuItem mnuSeenAll; @@ -540,6 +616,23 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem mnuFormAll; private System.Windows.Forms.CheckBox CHK_L8; private System.Windows.Forms.CheckBox CHK_L9; - private System.Windows.Forms.ListBox LB_Forms; + private System.Windows.Forms.NumericUpDown NUD_Battled; + private System.Windows.Forms.Label L_Battled; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.GroupBox GB_Displayed; + private System.Windows.Forms.CheckBox CHK_S; + private System.Windows.Forms.CheckBox CHK_G; + private System.Windows.Forms.CheckBox CHK_Unk; + private System.Windows.Forms.NumericUpDown NUD_Form; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; + private System.Windows.Forms.Label L_Male; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.CheckedListBox CLB_3; + private System.Windows.Forms.CheckedListBox CLB_4; + private System.Windows.Forms.CheckedListBox CLB_1; + private System.Windows.Forms.CheckedListBox CLB_2; + private System.Windows.Forms.ComboBox CB_Gender; } } diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_PokedexSWSH.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_PokedexSWSH.cs index 166ac91a1..db9e960a9 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_PokedexSWSH.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_PokedexSWSH.cs @@ -10,6 +10,14 @@ public partial class SAV_PokedexSWSH : Form { private readonly SAV8SWSH Origin; private readonly SAV8SWSH SAV; + private readonly Zukan8 Dex; + private readonly CheckBox[] CL; + private readonly CheckedListBox[] CHK; + + private int entry = -1; + private int CurrentSpecies => Zukan8.DexLookup.FirstOrDefault(z => z.Value == entry).Key; + private readonly bool CanSave; + private readonly bool Loading = true; public SAV_PokedexSWSH(SAV8SWSH sav) { @@ -17,230 +25,129 @@ public SAV_PokedexSWSH(SAV8SWSH sav) WinFormsUtil.TranslateInterface(this, Main.CurrentLanguage); SAV = (SAV8SWSH)(Origin = sav).Clone(); Dex = SAV.Blocks.Zukan; - CP = new[] { CHK_P1, CHK_P2, CHK_P3, CHK_P4, CHK_P5, CHK_P6, CHK_P7, CHK_P8, CHK_P9, }; - CL = new[] { CHK_L1, CHK_L2, CHK_L3, CHK_L4, CHK_L5, CHK_L6, CHK_L7, CHK_L8, CHK_L9, }; + CL = new[] {CHK_L1, CHK_L2, CHK_L3, CHK_L4, CHK_L5, CHK_L6, CHK_L7, CHK_L8, CHK_L9}; + CHK = new[] {CLB_1, CLB_2, CLB_3, CLB_4}; - editing = true; // Clear Listbox and ComboBox LB_Species.Items.Clear(); CB_Species.Items.Clear(); - LB_Forms.Items.Clear(); + foreach (var c in CHK) + { + c.Items.Clear(); + for (int j = 0; j < 63; j++) + c.Items.Add($"{j:00} - N/A"); + c.Items.Add("Gigantamax"); + } // Fill List CB_Species.InitializeBinding(); - CB_Species.DataSource = new BindingSource(GameInfo.FilteredSources.Species.Skip(1).ToList(), null); + var species = GameInfo.FilteredSources.Species.Where(z => Zukan8.DexLookup.ContainsKey(z.Value)).ToArray(); + CB_Species.DataSource = new BindingSource(species, null); var Species = GameInfo.Strings.Species; - var names = Dex.GetEntryNames(Species); + var names = Zukan8.GetEntryNames(Species); foreach (var n in names) LB_Species.Items.Add(n); - editing = false; + Loading = false; LB_Species.SelectedIndex = 0; CB_Species.KeyDown += WinFormsUtil.RemoveDropCB; + CanSave = true; } - private readonly Zukan8 Dex; - private bool editing; - private bool allModifying; - private int species = -1; - private readonly CheckBox[] CP, CL; - private void ChangeCBSpecies(object sender, EventArgs e) { - if (editing) + if (Loading) return; - SetEntry(); - editing = true; - species = (int)CB_Species.SelectedValue; - LB_Species.SelectedIndex = species - 1; // Since we don't allow index0 in combobox, everything is shifted by 1 - LB_Species.TopIndex = LB_Species.SelectedIndex; - if (!allModifying) FillLBForms(); - GetEntry(); - editing = false; + var spec = WinFormsUtil.GetIndex(CB_Species); + if (!Zukan8.DexLookup.TryGetValue(spec, out var index)) + throw new ArgumentException(nameof(spec)); + + --index; + + if (LB_Species.SelectedIndex != index) + LB_Species.SelectedIndex = index; // trigger event } private void ChangeLBSpecies(object sender, EventArgs e) { - if (editing) + if (Loading) return; + SetEntry(); - - editing = true; - species = LB_Species.SelectedIndex + 1; - CB_Species.SelectedValue = species; - if (!allModifying) - FillLBForms(); + entry = LB_Species.SelectedIndex + 1; GetEntry(); - editing = false; - } - - private void ChangeLBForms(object sender, EventArgs e) - { - if (allModifying || editing) - return; - SetEntry(); - - editing = true; - int fspecies = LB_Species.SelectedIndex + 1; - var bspecies = Dex.GetBaseSpecies(fspecies); - int form = LB_Forms.SelectedIndex; - if (form > 0) - { - int fc = SAV.Personal[bspecies].FormeCount; - if (fc > 1) // actually has forms - { - int f = Dex.GetDexFormIndex(bspecies, fc, form); - species = f >= 0 ? f + 1 : bspecies; - } - else - { - species = bspecies; - } - } - else - { - species = bspecies; - } - - CB_Species.SelectedValue = species; - LB_Species.SelectedIndex = species - 1; - LB_Species.TopIndex = LB_Species.SelectedIndex; - GetEntry(); - editing = false; - } - - private bool FillLBForms() - { - if (allModifying) - return false; - LB_Forms.DataSource = null; - LB_Forms.Items.Clear(); - - int fspecies = LB_Species.SelectedIndex + 1; - var bspecies = Dex.GetBaseSpecies(fspecies); - bool hasForms = FormConverter.HasFormSelection(SAV.Personal[bspecies], bspecies, 7); - LB_Forms.Enabled = hasForms; - if (!hasForms) - return false; - var ds = FormConverter.GetFormList(bspecies, GameInfo.Strings.types, GameInfo.Strings.forms, Main.GenderSymbols, SAV.Generation).ToList(); - if (ds.Count == 1 && string.IsNullOrEmpty(ds[0])) - { - // empty - LB_Forms.Enabled = false; - return false; - } - - // sanity check formes -- SM does not have totem form dex bits - int count = SAV.Personal[bspecies].FormeCount; - if (count < ds.Count) - ds.RemoveAt(count); // remove last - - LB_Forms.DataSource = ds; - if (fspecies <= SAV.MaxSpeciesID) - { - LB_Forms.SelectedIndex = 0; - } - else - { - int fc = SAV.Personal[bspecies].FormeCount; - if (fc <= 1) - return true; - - int f = Dex.GetDexFormIndex(bspecies, fc, 0); - if (f < 0) - return true; // bit index valid - - if (f > fspecies - LB_Forms.Items.Count - 1) - LB_Forms.SelectedIndex = fspecies - f - 1; - else - LB_Forms.SelectedIndex = -1; - } - return true; - } - - private void ChangeDisplayed(object sender, EventArgs e) - { - if (!((CheckBox) sender).Checked) - return; - - CHK_P6.Checked = sender == CHK_P6; - CHK_P7.Checked = sender == CHK_P7; - CHK_P8.Checked = sender == CHK_P8; - CHK_P9.Checked = sender == CHK_P9; - - CHK_P2.Checked |= CHK_P6.Checked; - CHK_P3.Checked |= CHK_P7.Checked; - CHK_P4.Checked |= CHK_P8.Checked; - CHK_P5.Checked |= CHK_P9.Checked; - } - - private void ChangeEncountered(object sender, EventArgs e) - { - if (!(CHK_P2.Checked || CHK_P3.Checked || CHK_P4.Checked || CHK_P5.Checked)) - { - CHK_P6.Checked = CHK_P7.Checked = CHK_P8.Checked = CHK_P9.Checked = false; - } - else if (!(CHK_P6.Checked || CHK_P7.Checked || CHK_P8.Checked || CHK_P9.Checked)) - { - if (sender == CHK_P2 && CHK_P2.Checked) - CHK_P6.Checked = true; - else if (sender == CHK_P3 && CHK_P3.Checked) - CHK_P7.Checked = true; - else if (sender == CHK_P4 && CHK_P4.Checked) - CHK_P8.Checked = true; - else if (sender == CHK_P5 && CHK_P5.Checked) - CHK_P9.Checked = true; - } } private void GetEntry() { - int pk = species - 1; - editing = true; - CHK_P1.Enabled = species <= SAV.MaxSpeciesID; - CHK_P1.Checked = CHK_P1.Enabled && Dex.GetCaught(species); + var s = CurrentSpecies; + if (s <= 0) + return; - int gt = Dex.GetBaseSpeciesGenderValue(LB_Species.SelectedIndex); + var forms = FormConverter + .GetFormList(s, GameInfo.Strings.Types, GameInfo.Strings.forms, GameInfo.GenderSymbolASCII, 8) + .ToArray(); + if (forms[0].Length == 0) + forms[0] = GameInfo.Strings.Types[0]; - CHK_P2.Enabled = CHK_P4.Enabled = CHK_P6.Enabled = CHK_P8.Enabled = gt != 254; // Not Female-Only - CHK_P3.Enabled = CHK_P5.Enabled = CHK_P7.Enabled = CHK_P9.Enabled = gt != 0 && gt != 255; // Not Male-Only and Not Genderless - - for (int i = 0; i < 4; i++) - CP[i + 1].Checked = Dex.GetSeen(species, i); - - for (int i = 0; i < 4; i++) - CP[i + 5].Checked = Dex.GetDisplayed(pk, i); - - for (int i = 0; i < 9; i++) + for (int i = 0; i < CHK.Length; i++) { - CL[i].Enabled = species <= SAV.MaxSpeciesID; - CL[i].Checked = CL[i].Enabled && Dex.GetLanguageFlag(pk, i); + var c = CHK[i]; + for (int j = 0; j < 64; j++) + { + if (j < 63) + c.Items[j] = $"{j:00} - {(j < forms.Length ? forms[j] : "N/A")}"; + var val = Dex.GetSeenRegion(s, j, i); + c.SetItemChecked(j, val); + } } - editing = false; + + for (int i = 0; i < CL.Length; i++) + CL[i].Checked = Dex.GetIsLanguageIndexObtained(s, i); + + NUD_Form.Value = Dex.GetAltFormDisplayed(s); + + CHK_Caught.Checked = Dex.GetCaught(s); + CHK_G.Checked = Dex.GetDisplayDynamaxInstead(s); + CHK_S.Checked = Dex.GetDisplayShiny(s); + CB_Gender.SelectedIndex = (int)Dex.GetGenderDisplayed(s); + + NUD_Battled.Value = Dex.GetBattledCount(s); } private void SetEntry() { - if (species <= 0) + if (!CanSave || Loading) return; - int pk = species - 1; - - for (int i = 0; i < 4; i++) - Dex.SetSeen(species, i, CP[i + 1].Checked); - - for (int i = 0; i < 4; i++) - Dex.SetDisplayed(pk, i, CP[i + 5].Checked); - - if (species > SAV.MaxSpeciesID) + var s = CurrentSpecies; + if (s <= 0) return; - Dex.SetCaught(species, CHK_P1.Checked); + for (int i = 0; i < CHK.Length; i++) + { + var c = CHK[i]; + for (int j = 0; j < 64; j++) + { + var val = c.GetItemChecked(j); + Dex.SetSeenRegion(s, j, i, val); + } + } - for (int i = 0; i < 9; i++) - Dex.SetLanguageFlag(pk, i, CL[i].Checked); + for (int i = 0; i < CL.Length; i++) + Dex.SetIsLanguageIndexObtained(s, i, CL[i].Checked); + + Dex.SetAltFormDisplayed(s, (uint)NUD_Form.Value); + + Dex.SetCaught(s, CHK_Caught.Checked); + Dex.SetCaughtUnkFlag(s, CHK_Unk.Checked); + Dex.SetGenderDisplayed(s, (uint)CB_Gender.SelectedIndex); + Dex.SetDisplayDynamaxInstead(s, CHK_G.Checked); + Dex.SetDisplayShiny(s, CHK_S.Checked); + + Dex.SetBattledCount(s, (uint)NUD_Battled.Value); } private void B_Cancel_Click(object sender, EventArgs e) @@ -257,36 +164,11 @@ private void B_Save_Click(object sender, EventArgs e) private void B_GiveAll_Click(object sender, EventArgs e) { - if (CHK_L1.Enabled) - { - CHK_L1.Checked = - CHK_L2.Checked = - CHK_L3.Checked = - CHK_L4.Checked = - CHK_L5.Checked = - CHK_L6.Checked = - CHK_L7.Checked = - CHK_L8.Checked = - CHK_L9.Checked = ModifierKeys != Keys.Control; - } - if (CHK_P1.Enabled) - { - CHK_P1.Checked = ModifierKeys != Keys.Control; - } - int gt = Dex.GetBaseSpeciesGenderValue(LB_Species.SelectedIndex); - - CHK_P2.Checked = CHK_P4.Checked = gt != 254 && ModifierKeys != Keys.Control; - CHK_P3.Checked = CHK_P5.Checked = gt != 0 && gt != 255 && ModifierKeys != Keys.Control; - - if (ModifierKeys == Keys.Control) - { - foreach (var chk in new[] { CHK_P6, CHK_P7, CHK_P8, CHK_P9 }) - chk.Checked = false; - } - else if (!(CHK_P6.Checked || CHK_P7.Checked || CHK_P8.Checked || CHK_P9.Checked)) - { - (gt != 254 ? CHK_P6 : CHK_P7).Checked = true; - } + SetEntry(); + bool shiny = ModifierKeys == Keys.Shift; + Dex.SetDexEntryAll(CurrentSpecies, shiny); + System.Media.SystemSounds.Asterisk.Play(); + GetEntry(); } private void B_Modify_Click(object sender, EventArgs e) @@ -295,133 +177,47 @@ private void B_Modify_Click(object sender, EventArgs e) modifyMenu.Show(btn.PointToScreen(new Point(0, btn.Height))); } - private void ModifyAll(object sender, EventArgs e) + private void SeenNone(object sender, EventArgs e) { - allModifying = true; - LB_Forms.Enabled = LB_Forms.Visible = false; - int lang = SAV.Language; - if (lang > 5) lang--; - lang--; - - if (sender == mnuSeenAll || sender == mnuCaughtAll || sender == mnuComplete) - SetAll(sender, lang); - else - ClearAll(sender); - SetEntry(); - // Turn off zh2 Petilil - Dex.SetLanguageFlag((int)Species.Petilil - 1, 8, false); - GetEntry(); - allModifying = false; - LB_Forms.Enabled = LB_Forms.Visible = true; - LB_Species.SelectedIndex = 0; + Dex.SeenNone(); System.Media.SystemSounds.Asterisk.Play(); + GetEntry(); } - private void ClearAll(object sender) + private void SeenAll(object sender, EventArgs e) { - for (int i = 0; i < LB_Species.Items.Count; i++) - { - LB_Species.SelectedIndex = i; - foreach (CheckBox chk in CL) - chk.Checked = false; - CHK_P1.Checked = false; // not caught - if (sender == mnuCaughtNone) - continue; - // remove seen/displayed - CHK_P2.Checked = CHK_P4.Checked = CHK_P3.Checked = CHK_P5.Checked = false; - CHK_P6.Checked = CHK_P7.Checked = CHK_P8.Checked = CHK_P9.Checked = false; - } + SetEntry(); + bool shiny = ModifierKeys == Keys.Shift; + Dex.SeenAll(shiny); + System.Media.SystemSounds.Asterisk.Play(); + GetEntry(); } - private void SetAll(object sender, int lang) + private void CaughtNone(object sender, EventArgs e) { - for (int i = 0; i < SAV.MaxSpeciesID; i++) - { - int spec = i + 1; - var gt = Dex.GetBaseSpeciesGenderValue(i); - - // Set base species flags - LB_Species.SelectedIndex = i; - SetSeen(sender, gt, false); - if (sender != mnuSeenAll) - SetCaught(sender, gt, lang, false); - - // Set forme flags - var entries = Dex.GetAllFormEntries(spec).Where(z => z >= SAV.MaxSpeciesID).Distinct(); - foreach (var f in entries) - { - LB_Species.SelectedIndex = f; - SetSeen(sender, gt, true); - if (sender != mnuSeenAll) - SetCaught(sender, gt, lang, true); - } - } + SetEntry(); + Dex.CaughtNone(); + System.Media.SystemSounds.Asterisk.Play(); + GetEntry(); } - private void SetCaught(object sender, int gt, int lang, bool isForm) + private void CaughtAll(object sender, EventArgs e) { - CHK_P1.Checked = mnuCaughtNone != sender; - for (int j = 0; j < CL.Length; j++) - CL[j].Checked = CL[j].Enabled && (sender == mnuComplete || (mnuCaughtNone != sender && j == lang)); - - if (mnuCaughtNone == sender) - { - if (isForm) - return; - if (!(CHK_P2.Checked || CHK_P3.Checked || CHK_P4.Checked || CHK_P5.Checked)) // if seen - { - if (!(CHK_P6.Checked || CHK_P7.Checked || CHK_P8.Checked || CHK_P9.Checked)) // not displayed - (gt != 254 ? CHK_P6 : CHK_P7).Checked = true; // check one - } - - return; - } - - if (mnuComplete == sender) - { - // Seen All - foreach (var chk in new[] {CHK_P2, CHK_P3, CHK_P4, CHK_P5}) - chk.Checked = chk.Enabled; - } - else - { - // ensure at least one SEEN - if (!(CHK_P2.Checked || CHK_P3.Checked || CHK_P4.Checked || CHK_P5.Checked)) - (gt != 254 ? CHK_P2 : CHK_P3).Checked = true; - } - - // ensure at least one Displayed except for formes - if (isForm) - return; - if (!(CHK_P6.Checked || CHK_P7.Checked || CHK_P8.Checked || CHK_P9.Checked)) - (gt != 254 ? CHK_P6 : CHK_P7).Checked = CHK_P1.Enabled; + SetEntry(); + bool shiny = ModifierKeys == Keys.Shift; + Dex.CaughtAll(shiny); + System.Media.SystemSounds.Asterisk.Play(); + GetEntry(); } - private void SetSeen(object sender, int gt, bool isForm) + private void CompleteDex(object sender, EventArgs e) { - foreach (CheckBox t in new[] {CHK_P2, CHK_P3, CHK_P4, CHK_P5}) - t.Checked = mnuSeenNone != sender && t.Enabled; - - if (mnuSeenNone != sender) - { - // ensure at least one Displayed except for formes - if (isForm) - return; - if (!(CHK_P6.Checked || CHK_P7.Checked || CHK_P8.Checked || CHK_P9.Checked)) - (gt != 254 ? CHK_P6 : CHK_P7).Checked = true; - } - else - { - foreach (CheckBox t in CP) - t.Checked = false; - } - - if (!CHK_P1.Checked) - { - foreach (CheckBox t in CL) - t.Checked = false; - } + SetEntry(); + bool shiny = ModifierKeys == Keys.Shift; + Dex.CompleteDex(shiny); + System.Media.SystemSounds.Asterisk.Play(); + GetEntry(); } } } diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_PokedexSWSH.resx b/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_PokedexSWSH.resx new file mode 100644 index 000000000..d185e9e84 --- /dev/null +++ b/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_PokedexSWSH.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 17, 17 + + \ No newline at end of file diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_Trainer8.Designer.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_Trainer8.Designer.cs index b1f20119f..3593cf5a7 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_Trainer8.Designer.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_Trainer8.Designer.cs @@ -53,14 +53,8 @@ private void InitializeComponent() this.L_Hours = new System.Windows.Forms.Label(); this.MT_Hours = new System.Windows.Forms.MaskedTextBox(); this.L_Language = new System.Windows.Forms.Label(); - this.L_Region = new System.Windows.Forms.Label(); - this.L_Country = new System.Windows.Forms.Label(); - this.CB_Region = new System.Windows.Forms.ComboBox(); - this.CB_Country = new System.Windows.Forms.ComboBox(); this.B_MaxCash = new System.Windows.Forms.Button(); - this.CB_3DSReg = new System.Windows.Forms.ComboBox(); this.CB_Language = new System.Windows.Forms.ComboBox(); - this.L_3DSReg = new System.Windows.Forms.Label(); this.CB_Game = new System.Windows.Forms.ComboBox(); this.CB_Gender = new System.Windows.Forms.ComboBox(); this.TB_MBMS = new System.Windows.Forms.MaskedTextBox(); @@ -99,9 +93,11 @@ private void InitializeComponent() this.L_SinglesC = new System.Windows.Forms.Label(); this.TC_Editor = new System.Windows.Forms.TabControl(); this.Tab_Overview = new System.Windows.Forms.TabPage(); + this.GB_Stats = new System.Windows.Forms.GroupBox(); + this.NUD_BP = new System.Windows.Forms.NumericUpDown(); + this.L_BP = new System.Windows.Forms.Label(); + this.TrainerStats = new PKHeX.WinForms.Subforms.Save_Editors.TrainerStat(); this.trainerID1 = new PKHeX.WinForms.Controls.TrainerID(); - this.CB_Vivillon = new System.Windows.Forms.ComboBox(); - this.L_Vivillon = new System.Windows.Forms.Label(); this.GB_Adventure = new System.Windows.Forms.GroupBox(); this.L_Fame = new System.Windows.Forms.Label(); this.CAL_HoFDate = new System.Windows.Forms.DateTimePicker(); @@ -122,10 +118,10 @@ private void InitializeComponent() this.L_CurrentMap = new System.Windows.Forms.Label(); this.L_Z = new System.Windows.Forms.Label(); this.L_X = new System.Windows.Forms.Label(); - this.GB_Stats = new System.Windows.Forms.GroupBox(); - this.TrainerStats = new PKHeX.WinForms.Subforms.Save_Editors.TrainerStat(); this.TC_Editor.SuspendLayout(); this.Tab_Overview.SuspendLayout(); + this.GB_Stats.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_BP)).BeginInit(); this.GB_Adventure.SuspendLayout(); this.Tab_BadgeMap.SuspendLayout(); this.GB_Map.SuspendLayout(); @@ -134,7 +130,6 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.NUD_M)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_Y)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_X)).BeginInit(); - this.GB_Stats.SuspendLayout(); this.SuspendLayout(); // // B_Cancel @@ -345,50 +340,13 @@ private void InitializeComponent() // // L_Language // - this.L_Language.Location = new System.Drawing.Point(202, 82); + this.L_Language.Location = new System.Drawing.Point(-7, 106); this.L_Language.Name = "L_Language"; this.L_Language.Size = new System.Drawing.Size(100, 13); this.L_Language.TabIndex = 21; this.L_Language.Text = "Language:"; this.L_Language.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - // L_Region - // - this.L_Region.Location = new System.Drawing.Point(202, 32); - this.L_Region.Name = "L_Region"; - this.L_Region.Size = new System.Drawing.Size(100, 13); - this.L_Region.TabIndex = 20; - this.L_Region.Text = "Sub Region:"; - this.L_Region.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // L_Country - // - this.L_Country.Location = new System.Drawing.Point(202, 10); - this.L_Country.Name = "L_Country"; - this.L_Country.Size = new System.Drawing.Size(100, 13); - this.L_Country.TabIndex = 19; - this.L_Country.Text = "Country:"; - this.L_Country.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // CB_Region - // - this.CB_Region.DropDownWidth = 180; - this.CB_Region.FormattingEnabled = true; - this.CB_Region.Location = new System.Drawing.Point(308, 29); - this.CB_Region.Name = "CB_Region"; - this.CB_Region.Size = new System.Drawing.Size(93, 21); - this.CB_Region.TabIndex = 18; - // - // CB_Country - // - this.CB_Country.DropDownWidth = 180; - this.CB_Country.FormattingEnabled = true; - this.CB_Country.Location = new System.Drawing.Point(308, 7); - this.CB_Country.Name = "CB_Country"; - this.CB_Country.Size = new System.Drawing.Size(93, 21); - this.CB_Country.TabIndex = 17; - this.CB_Country.SelectedIndexChanged += new System.EventHandler(this.UpdateCountry); - // // B_MaxCash // this.B_MaxCash.Location = new System.Drawing.Point(172, 29); @@ -398,42 +356,22 @@ private void InitializeComponent() this.B_MaxCash.Text = "+"; this.B_MaxCash.UseVisualStyleBackColor = true; // - // CB_3DSReg - // - this.CB_3DSReg.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.CB_3DSReg.FormattingEnabled = true; - this.CB_3DSReg.Location = new System.Drawing.Point(308, 51); - this.CB_3DSReg.Name = "CB_3DSReg"; - this.CB_3DSReg.Size = new System.Drawing.Size(93, 21); - this.CB_3DSReg.TabIndex = 14; - // // CB_Language // this.CB_Language.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.CB_Language.FormattingEnabled = true; - this.CB_Language.Location = new System.Drawing.Point(308, 79); + this.CB_Language.Location = new System.Drawing.Point(99, 103); this.CB_Language.Name = "CB_Language"; this.CB_Language.Size = new System.Drawing.Size(93, 21); this.CB_Language.TabIndex = 15; // - // L_3DSReg - // - this.L_3DSReg.Location = new System.Drawing.Point(202, 54); - this.L_3DSReg.Name = "L_3DSReg"; - this.L_3DSReg.Size = new System.Drawing.Size(100, 13); - this.L_3DSReg.TabIndex = 10; - this.L_3DSReg.Text = "Console Region:"; - this.L_3DSReg.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // // CB_Game // this.CB_Game.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.CB_Game.FormattingEnabled = true; this.CB_Game.Items.AddRange(new object[] { - "Sun", - "Moon", - "US", - "UM"}); + "Sword", + "Shield"}); this.CB_Game.Location = new System.Drawing.Point(141, 51); this.CB_Game.Name = "CB_Game"; this.CB_Game.Size = new System.Drawing.Size(51, 21); @@ -707,8 +645,6 @@ private void InitializeComponent() // this.Tab_Overview.Controls.Add(this.GB_Stats); this.Tab_Overview.Controls.Add(this.trainerID1); - this.Tab_Overview.Controls.Add(this.CB_Vivillon); - this.Tab_Overview.Controls.Add(this.L_Vivillon); this.Tab_Overview.Controls.Add(this.GB_Adventure); this.Tab_Overview.Controls.Add(this.TB_OTName); this.Tab_Overview.Controls.Add(this.CB_Gender); @@ -717,14 +653,8 @@ private void InitializeComponent() this.Tab_Overview.Controls.Add(this.MT_Money); this.Tab_Overview.Controls.Add(this.L_Money); this.Tab_Overview.Controls.Add(this.L_Language); - this.Tab_Overview.Controls.Add(this.L_3DSReg); this.Tab_Overview.Controls.Add(this.CB_Language); - this.Tab_Overview.Controls.Add(this.L_Region); - this.Tab_Overview.Controls.Add(this.CB_3DSReg); this.Tab_Overview.Controls.Add(this.B_MaxCash); - this.Tab_Overview.Controls.Add(this.L_Country); - this.Tab_Overview.Controls.Add(this.CB_Country); - this.Tab_Overview.Controls.Add(this.CB_Region); this.Tab_Overview.Location = new System.Drawing.Point(4, 22); this.Tab_Overview.Name = "Tab_Overview"; this.Tab_Overview.Padding = new System.Windows.Forms.Padding(3); @@ -733,31 +663,58 @@ private void InitializeComponent() this.Tab_Overview.Text = "Overview"; this.Tab_Overview.UseVisualStyleBackColor = true; // + // GB_Stats + // + this.GB_Stats.Controls.Add(this.NUD_BP); + this.GB_Stats.Controls.Add(this.L_BP); + this.GB_Stats.Controls.Add(this.TrainerStats); + this.GB_Stats.Location = new System.Drawing.Point(209, 130); + this.GB_Stats.Name = "GB_Stats"; + this.GB_Stats.Size = new System.Drawing.Size(171, 137); + this.GB_Stats.TabIndex = 67; + this.GB_Stats.TabStop = false; + this.GB_Stats.Text = "Stats"; + // + // NUD_BP + // + this.NUD_BP.Location = new System.Drawing.Point(115, 39); + this.NUD_BP.Maximum = new decimal(new int[] { + 9999, + 0, + 0, + 0}); + this.NUD_BP.Name = "NUD_BP"; + this.NUD_BP.Size = new System.Drawing.Size(47, 20); + this.NUD_BP.TabIndex = 69; + this.NUD_BP.Value = new decimal(new int[] { + 9999, + 0, + 0, + 0}); + // + // L_BP + // + this.L_BP.Location = new System.Drawing.Point(28, 37); + this.L_BP.Name = "L_BP"; + this.L_BP.Size = new System.Drawing.Size(81, 20); + this.L_BP.TabIndex = 68; + this.L_BP.Text = "BP:"; + this.L_BP.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // TrainerStats + // + this.TrainerStats.Location = new System.Drawing.Point(19, 61); + this.TrainerStats.Name = "TrainerStats"; + this.TrainerStats.Size = new System.Drawing.Size(146, 72); + this.TrainerStats.TabIndex = 67; + // // trainerID1 // this.trainerID1.Location = new System.Drawing.Point(6, 26); this.trainerID1.Name = "trainerID1"; - this.trainerID1.Size = new System.Drawing.Size(90, 64); + this.trainerID1.Size = new System.Drawing.Size(90, 74); this.trainerID1.TabIndex = 66; // - // CB_Vivillon - // - this.CB_Vivillon.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.CB_Vivillon.FormattingEnabled = true; - this.CB_Vivillon.Location = new System.Drawing.Point(85, 98); - this.CB_Vivillon.Name = "CB_Vivillon"; - this.CB_Vivillon.Size = new System.Drawing.Size(93, 21); - this.CB_Vivillon.TabIndex = 65; - // - // L_Vivillon - // - this.L_Vivillon.Location = new System.Drawing.Point(-1, 101); - this.L_Vivillon.Name = "L_Vivillon"; - this.L_Vivillon.Size = new System.Drawing.Size(80, 12); - this.L_Vivillon.TabIndex = 64; - this.L_Vivillon.Text = "Vivillon:"; - this.L_Vivillon.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // // GB_Adventure // this.GB_Adventure.Controls.Add(this.L_Fame); @@ -1031,23 +988,6 @@ private void InitializeComponent() this.L_X.Text = "X Coordinate:"; this.L_X.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - // GB_Stats - // - this.GB_Stats.Controls.Add(this.TrainerStats); - this.GB_Stats.Location = new System.Drawing.Point(209, 130); - this.GB_Stats.Name = "GB_Stats"; - this.GB_Stats.Size = new System.Drawing.Size(171, 137); - this.GB_Stats.TabIndex = 67; - this.GB_Stats.TabStop = false; - this.GB_Stats.Text = "Stats"; - // - // TrainerStats - // - this.TrainerStats.Location = new System.Drawing.Point(19, 61); - this.TrainerStats.Name = "TrainerStats"; - this.TrainerStats.Size = new System.Drawing.Size(146, 72); - this.TrainerStats.TabIndex = 67; - // // SAV_Trainer8 // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -1066,6 +1006,8 @@ private void InitializeComponent() this.TC_Editor.ResumeLayout(false); this.Tab_Overview.ResumeLayout(false); this.Tab_Overview.PerformLayout(); + this.GB_Stats.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.NUD_BP)).EndInit(); this.GB_Adventure.ResumeLayout(false); this.GB_Adventure.PerformLayout(); this.Tab_BadgeMap.ResumeLayout(false); @@ -1075,7 +1017,6 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.NUD_M)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_Y)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_X)).EndInit(); - this.GB_Stats.ResumeLayout(false); this.ResumeLayout(false); } @@ -1099,13 +1040,7 @@ private void InitializeComponent() private System.Windows.Forms.TextBox TB_Saying2; private System.Windows.Forms.TextBox TB_Saying1; private System.Windows.Forms.ComboBox CB_Language; - private System.Windows.Forms.ComboBox CB_3DSReg; - private System.Windows.Forms.Label L_3DSReg; private System.Windows.Forms.Button B_MaxCash; - private System.Windows.Forms.ComboBox CB_Region; - private System.Windows.Forms.ComboBox CB_Country; - private System.Windows.Forms.Label L_Region; - private System.Windows.Forms.Label L_Country; private System.Windows.Forms.Label L_SuperB; private System.Windows.Forms.Label L_NormalB; private System.Windows.Forms.Label L_MultiB; @@ -1173,10 +1108,10 @@ private void InitializeComponent() private System.Windows.Forms.GroupBox GB_Map; private System.Windows.Forms.NumericUpDown NUD_R; private System.Windows.Forms.Label L_R; - private System.Windows.Forms.Label L_Vivillon; - private System.Windows.Forms.ComboBox CB_Vivillon; private Controls.TrainerID trainerID1; private System.Windows.Forms.GroupBox GB_Stats; private Subforms.Save_Editors.TrainerStat TrainerStats; + private System.Windows.Forms.NumericUpDown NUD_BP; + private System.Windows.Forms.Label L_BP; } } \ No newline at end of file diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_Trainer8.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_Trainer8.cs index 3363d1093..671d4a1bb 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_Trainer8.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_Trainer8.cs @@ -8,14 +8,14 @@ namespace PKHeX.WinForms public partial class SAV_Trainer8 : Form { private readonly SaveFile Origin; - private readonly SAV8 SAV; + private readonly SAV8SWSH SAV; public SAV_Trainer8(SaveFile sav) { InitializeComponent(); WinFormsUtil.TranslateInterface(this, Main.CurrentLanguage); - SAV = (SAV8)(Origin = sav).Clone(); - Loading = true; + SAV = (SAV8SWSH)(Origin = sav).Clone(); + //Loading = true; if (Main.Unicode) { TB_OTName.Font = FontUtil.GetPKXFont(); @@ -27,91 +27,77 @@ public SAV_Trainer8(SaveFile sav) CB_Gender.Items.AddRange(Main.GenderSymbols.Take(2).ToArray()); // m/f depending on unicode selection TrainerStats.LoadRecords(SAV, Records.RecordList_8); - TrainerStats.GetToolTipText = UpdateTip; + NUD_BP.Value = SAV.Misc.BP; GetComboBoxes(); GetTextBoxes(); - Loading = false; + TC_Editor.TabPages.Remove(Tab_BadgeMap); // needs more work + + //Loading = false; } - private readonly bool Loading; - private bool MapUpdated; + // private readonly bool Loading; + // private bool MapUpdated; private void GetComboBoxes() { - CB_3DSReg.InitializeBinding(); - CB_3DSReg.DataSource = GameInfo.Regions; CB_Language.InitializeBinding(); CB_Language.DataSource = GameInfo.LanguageDataSource(SAV.Generation); - - CB_Country.InitializeBinding(); - CB_Region.InitializeBinding(); - Main.SetCountrySubRegion(CB_Country, "countries"); - - L_Vivillon.Text = GameInfo.Strings.Species[(int)Species.Vivillon] + ":"; // todo : did they replace this with the new multiform species? - CB_Vivillon.InitializeBinding(); - CB_Vivillon.DataSource = FormConverter.GetFormList((int)Species.Vivillon, GameInfo.Strings.types, GameInfo.Strings.forms, Main.GenderSymbols, SAV.Generation); } private void GetTextBoxes() { // Get Data - CB_Game.SelectedIndex = SAV.Game - (int)GameVersion.SN; + CB_Game.SelectedIndex = SAV.Game - (int)GameVersion.SW; CB_Gender.SelectedIndex = SAV.Gender; // Display Data TB_OTName.Text = SAV.OT; trainerID1.LoadIDValues(SAV); MT_Money.Text = SAV.Money.ToString(); - - CB_Country.SelectedValue = SAV.Country; - CB_Region.SelectedValue = SAV.SubRegion; - CB_3DSReg.SelectedValue = SAV.ConsoleRegion; CB_Language.SelectedValue = SAV.Language; - NUD_M.Value = SAV.Situation.M; - // Sanity Check Map Coordinates - try - { - NUD_X.Value = (decimal)SAV.Situation.X; - NUD_Z.Value = (decimal)SAV.Situation.Z; - NUD_Y.Value = (decimal)SAV.Situation.Y; - NUD_R.Value = (decimal)SAV.Situation.R; - } - catch { GB_Map.Enabled = false; } + //NUD_M.Value = SAV.Situation.M; + //// Sanity Check Map Coordinates + //try + //{ + // NUD_X.Value = (decimal)SAV.Situation.X; + // NUD_Z.Value = (decimal)SAV.Situation.Z; + // NUD_Y.Value = (decimal)SAV.Situation.Y; + // NUD_R.Value = (decimal)SAV.Situation.R; + //} + //catch { GB_Map.Enabled = false; } // Load Play Time MT_Hours.Text = SAV.PlayedHours.ToString(); MT_Minutes.Text = SAV.PlayedMinutes.ToString(); MT_Seconds.Text = SAV.PlayedSeconds.ToString(); - if (SAV.Played.LastSavedDate.HasValue) - { - CAL_LastSavedDate.Value = SAV.Played.LastSavedDate.Value; - CAL_LastSavedTime.Value = SAV.Played.LastSavedDate.Value; - } - else - { + //if (SAV.Played.LastSavedDate.HasValue) + //{ + // CAL_LastSavedDate.Value = SAV.Played.LastSavedDate.Value; + // CAL_LastSavedTime.Value = SAV.Played.LastSavedDate.Value; + //} + //else + //{ L_LastSaved.Visible = CAL_LastSavedDate.Visible = CAL_LastSavedTime.Visible = false; - } + //} - Util.GetDateTime2000(SAV.SecondsToStart, out var date, out var time); - CAL_AdventureStartDate.Value = date; - CAL_AdventureStartTime.Value = time; - - Util.GetDateTime2000(SAV.SecondsToFame, out date, out time); - CAL_HoFDate.Value = date; - CAL_HoFTime.Value = time; + L_Started.Visible = CAL_AdventureStartDate.Visible = CAL_AdventureStartTime.Visible = false; + L_Fame.Visible = CAL_HoFDate.Visible = CAL_HoFTime.Visible = false; + // Util.GetDateTime2000(SAV.SecondsToStart, out var date, out var time); + // CAL_AdventureStartDate.Value = date; + // CAL_AdventureStartTime.Value = time; + // + // Util.GetDateTime2000(SAV.SecondsToFame, out date, out time); + // CAL_HoFDate.Value = date; + // CAL_HoFTime.Value = time; } private void Save() { SaveTrainerInfo(); - - // Vivillon - if (CB_Vivillon.SelectedIndex >= 0) - SAV.Misc.Vivillon = CB_Vivillon.SelectedIndex; } private void SaveTrainerInfo() @@ -120,33 +106,32 @@ private void SaveTrainerInfo() SAV.Gender = (byte)CB_Gender.SelectedIndex; SAV.Money = Util.ToUInt32(MT_Money.Text); - SAV.SubRegion = WinFormsUtil.GetIndex(CB_Region); - SAV.Country = WinFormsUtil.GetIndex(CB_Country); - SAV.ConsoleRegion = WinFormsUtil.GetIndex(CB_3DSReg); SAV.Language = WinFormsUtil.GetIndex(CB_Language); SAV.OT = TB_OTName.Text; + SAV.Misc.BP = (int)NUD_BP.Value; + // Copy Position - if (GB_Map.Enabled && MapUpdated) - { - SAV.Situation.M = (int)NUD_M.Value; - SAV.Situation.X = (float)NUD_X.Value; - SAV.Situation.Z = (float)NUD_Z.Value; - SAV.Situation.Y = (float)NUD_Y.Value; - SAV.Situation.R = (float)NUD_R.Value; - SAV.Situation.UpdateOverworldCoordinates(); - } + //if (GB_Map.Enabled && MapUpdated) + //{ + // SAV.Situation.M = (int)NUD_M.Value; + // SAV.Situation.X = (float)NUD_X.Value; + // SAV.Situation.Z = (float)NUD_Z.Value; + // SAV.Situation.Y = (float)NUD_Y.Value; + // SAV.Situation.R = (float)NUD_R.Value; + // SAV.Situation.UpdateOverworldCoordinates(); + //} // Save PlayTime SAV.PlayedHours = ushort.Parse(MT_Hours.Text); SAV.PlayedMinutes = ushort.Parse(MT_Minutes.Text)%60; SAV.PlayedSeconds = ushort.Parse(MT_Seconds.Text)%60; - SAV.SecondsToStart = (uint)Util.GetSecondsFrom2000(CAL_AdventureStartDate.Value, CAL_AdventureStartTime.Value); - SAV.SecondsToFame = (uint)Util.GetSecondsFrom2000(CAL_HoFDate.Value, CAL_HoFTime.Value); - - if (SAV.Played.LastSavedDate.HasValue) - SAV.Played.LastSavedDate = new DateTime(CAL_LastSavedDate.Value.Year, CAL_LastSavedDate.Value.Month, CAL_LastSavedDate.Value.Day, CAL_LastSavedTime.Value.Hour, CAL_LastSavedTime.Value.Minute, 0); + //SAV.SecondsToStart = (uint)Util.GetSecondsFrom2000(CAL_AdventureStartDate.Value, CAL_AdventureStartTime.Value); + //SAV.SecondsToFame = (uint)Util.GetSecondsFrom2000(CAL_HoFDate.Value, CAL_HoFTime.Value); + // + //if (SAV.Played.LastSavedDate.HasValue) + // SAV.Played.LastSavedDate = new DateTime(CAL_LastSavedDate.Value.Year, CAL_LastSavedDate.Value.Month, CAL_LastSavedDate.Value.Day, CAL_LastSavedTime.Value.Hour, CAL_LastSavedTime.Value.Minute, 0); } private void ClickOT(object sender, MouseEventArgs e) @@ -182,27 +167,20 @@ private void Change255(object sender, EventArgs e) private void ChangeMapValue(object sender, EventArgs e) { - if (!Loading) - MapUpdated = true; + //if (!Loading) + // MapUpdated = true; } - private void UpdateCountry(object sender, EventArgs e) - { - int index; - if (sender is ComboBox c && (index = WinFormsUtil.GetIndex(c)) > 0) - Main.SetCountrySubRegion(CB_Region, $"sr_{index:000}"); - } - - private string UpdateTip(int index) - { - switch (index) - { - case 2: // Storyline Completed Time - var seconds = Util.GetSecondsFrom2000(CAL_AdventureStartDate.Value, CAL_AdventureStartTime.Value); - return Util.ConvertDateValueToString(SAV.GetRecord(index), seconds); - default: - return null; - } - } + //private string UpdateTip(int index) + //{ + // switch (index) + // { + // case 2: // Storyline Completed Time + // var seconds = Util.GetSecondsFrom2000(CAL_AdventureStartDate.Value, CAL_AdventureStartTime.Value); + // return Util.ConvertDateValueToString(SAV.GetRecord(index), seconds); + // default: + // return null; + // } + //} } } diff --git a/PKHeX.WinForms/Subforms/Save Editors/SAV_BoxList.cs b/PKHeX.WinForms/Subforms/Save Editors/SAV_BoxList.cs index 7ec65691a..e321b896b 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/SAV_BoxList.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/SAV_BoxList.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; using System.Diagnostics; using System.Windows.Forms; @@ -10,7 +9,7 @@ namespace PKHeX.WinForms { public sealed partial class SAV_BoxList : Form { - private readonly List Boxes = new List(); + private readonly BoxEditor[] Boxes; public SAV_BoxList(SAVEditor p, SlotChangeManager m) { @@ -20,6 +19,7 @@ public SAV_BoxList(SAVEditor p, SlotChangeManager m) // initialize boxes dynamically var sav = p.SAV; + Boxes = new BoxEditor[sav.BoxCount]; AddControls(p, m, sav); SetWindowDimensions(sav.BoxCount); @@ -63,9 +63,9 @@ private void AddControls(SAVEditor p, SlotChangeManager m, SaveFile sav) pb.ContextMenuStrip = p.SlotPictureBoxes[0].ContextMenuStrip; boxEditor.CurrentBox = i; boxEditor.CB_BoxSelect.Enabled = false; - Boxes.Add(boxEditor); - FLP_Boxes.Controls.Add(Boxes[i]); + Boxes[i] = boxEditor; } + FLP_Boxes.Controls.AddRange(Boxes); // Setup swapping foreach (var box in Boxes) @@ -73,14 +73,14 @@ private void AddControls(SAVEditor p, SlotChangeManager m, SaveFile sav) box.ClearEvents(); box.B_BoxLeft.Click += (s, e) => { - int index = Boxes.FindIndex(z => z == ((Button)s).Parent); - int other = (index + Boxes.Count - 1) % Boxes.Count; + int index = Array.FindIndex(Boxes, z => z == ((Button)s).Parent); + int other = (index + Boxes.Length - 1) % Boxes.Length; m.SwapBoxes(index, other, p.SAV); }; box.B_BoxRight.Click += (s, e) => { - int index = Boxes.FindIndex(z => z == ((Button)s).Parent); - int other = (index + 1) % Boxes.Count; + int index = Array.FindIndex(Boxes, z => z == ((Button)s).Parent); + int other = (index + 1) % Boxes.Length; m.SwapBoxes(index, other, p.SAV); }; } diff --git a/PKHeX.WinForms/Subforms/Save Editors/SAV_BoxViewer.cs b/PKHeX.WinForms/Subforms/Save Editors/SAV_BoxViewer.cs index a2172e40d..f0e2de75c 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/SAV_BoxViewer.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/SAV_BoxViewer.cs @@ -13,9 +13,17 @@ public SAV_BoxViewer(SAVEditor p, SlotChangeManager m) { parent = p; InitializeComponent(); + int deltaW = Width - Box.BoxPokeGrid.Width; + int deltaH = Height - Box.BoxPokeGrid.Height; Box.Editor = new BoxEdit(m.SE.SAV); Box.Setup(m); Box.InitializeGrid(); + + Width = Box.BoxPokeGrid.Width + deltaW + 2; + Height = Box.BoxPokeGrid.Height + deltaH + 2; + + Box.RecenterControls(); + Box.HorizontallyCenter(this); Box.Reset(); CenterToParent(); diff --git a/PKHeX.WinForms/Subforms/Save Editors/SAV_EventWork.cs b/PKHeX.WinForms/Subforms/Save Editors/SAV_EventWork.cs index 931fb69b3..d24df83a6 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/SAV_EventWork.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/SAV_EventWork.cs @@ -21,8 +21,8 @@ public SAV_EventWork(SaveFile sav) if (sav is SAV7b s7b) SAV = s7b.Blocks.EventWork; - else if (sav is SAV8SWSH s8ss) - SAV = s8ss.Blocks.EventWork; + //else if (sav is SAV8SWSH s8ss) + // SAV = s8ss.Blocks.EventWork; Origin = sav; DragEnter += Main_DragEnter; diff --git a/PKHeX.WinForms/Subforms/Save Editors/SAV_Inventory.Designer.cs b/PKHeX.WinForms/Subforms/Save Editors/SAV_Inventory.Designer.cs index 3740679ae..0f86dcacb 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/SAV_Inventory.Designer.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/SAV_Inventory.Designer.cs @@ -106,6 +106,8 @@ private void InitializeComponent() this.IL_Pouch.Images.SetKeyName(9, "Bag_Free.png"); this.IL_Pouch.Images.SetKeyName(10, "Bag_Z.png"); this.IL_Pouch.Images.SetKeyName(11, "Bag_Candy.png"); + this.IL_Pouch.Images.SetKeyName(12, "Bag_Treasure.png"); + this.IL_Pouch.Images.SetKeyName(13, "Bag_Ingredient.png"); // // B_GiveAll // diff --git a/PKHeX.WinForms/Subforms/Save Editors/SAV_Inventory.resx b/PKHeX.WinForms/Subforms/Save Editors/SAV_Inventory.resx index d207c2c84..7add1883c 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/SAV_Inventory.resx +++ b/PKHeX.WinForms/Subforms/Save Editors/SAV_Inventory.resx @@ -124,8 +124,8 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 - ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACQ - FAAAAk1TRnQBSQFMAgEBDAEAARgBAAEIAQABGAEAARgBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD8 + FgAAAk1TRnQBSQFMAgEBDgEAARABAAEQAQABGAEAARgBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABYAMAAWADAAEBAQABCAYAASQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -153,66 +153,77 @@ AcwBAAH/AZkB/wEAAf8BzAIAAf8BzAEzAQAB/wHMAWYBAAH/AcwBmQEAAf8CzAEAAf8BzAH/AQAC/wEz AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw - AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD//8A/wD/AP8A/wD/AP8A - /wD/AAwAFI0EABSSBAAUZwQAFJkDABaNAgAWkgIAFmcCABaZAQAYjRiSGGcYmQaNDP8GjRiSGGcOmQQQ - BpkFjQH/DBUB/wWNGJIYZwyZAhAEeQEQBZkFjQH/ARUB7AFQAewB8QFQAfEB7AHxAewCFQH/BY0JkgHt - AesCEwHrAe0JkgpnBBIKZwqZAhAHeQEQBJkFjQH/ARUBjQLxAUsB8QGNAfEBFQHxAewBFQH/BY0IkgHt - AW0BFQLtARUBbQHtCJIJZwESBBMBEglnCJkCEAl5ARAEmQWNAf8BFQFQAewBUALsAVAC7AFQAewBFQH/ - BY0HkgHtAeoBFAHtAvMB7QEUAeoB7QeSB2cBEgITARIBtQHvARICEwESB2cGmQIQC3kBEASZBY0B/wEV - CfEB7AEVAf8FjQaSAe0B6gETAe8B9AL/AfQB7wETAeoB7QaSBmcBEgITAW0BtQEJAfMB8QHrAhMBEgZn - BZkBEAh5AZoB/wHDAZoBeQEQBJkGjQH/ChUB/waNBZIB7QFtARMBBwb/AQcBEwFtAe0FkgRnAhIBEwES - AewDCQHzAvIB9wESARMBEgVnBJkBEAd5AZoC/wKaAcMBmgEQBJkFjgH/ARUK7AEVAf8FjgXvAe0BFQH3 - CP8B9wEVAe0F7wSuARMBEgHqAbUECQPzAfIBCAFtARMBEgSuBBoBEAV5AZoC/wSaAXoBWQEQBBoFjgH/ - ARUBBwgVAewBFQH/BY4F7wHrAW0B8gj/AfIBbQHrBe8DrgFtARMBrgYJBfMB8QHsARMBbQOuBBoBEAN5 - AZoC/wHDA5oBegNZARAEGgW3Af8BFQHsARUB7ATxAewBFQEHARUB/wW3BQcBbQHsCv8B7AFtBQcDrwGu - ARMB7AHxC/MB7QETAa4DrwTDARABeQGaAv8DwwGaAXoFWQEQBMMFtwH/ARUB7AIVAVAB7AGNARUB7AEV - AewBFQH/BbcFBwFtAewK/wHsAW0FBwSvAhIBbQG8CPMB8AHrARIBEwGNA68EwwEQAZoB/wPDAZoBegdZ - ARAEwwW3Af8BFQHsARUB7ALxAVAB7AFQARUB7AEVAf8FtwUHAewB6gHwA/8CvAP/AfAB6gHsBQcFrwFt - AhIB9wbzAe8B6gESAW0BjQSvBcMBEAGaAcMBmgF6CFkBegEQBMMFtwH/ARUB7AgVAewBFQH/BbcFBwH3 - ARMB7AEHAfAB7wLsAe8B8AEHAewBFAH3BQcGrwFtAhIB6wHxAvMB8gH4AhIBbQavBsMCEAJ6BlkBegGa - AXkBEATDBbcB/wEVAQcB7AEHAewBBwHsAQcB7AEHAewBFQH/BbcGBwGSARIBFAESARQCEwEUARIBFAES - AZIGBwevAa4BEgETAeoCBwISAeoBrgevCMMCEAJ6AlkBegGaAsMBeQEQBMMFtwH/ARUK8QEVAf8FtwcH - Ae8BkgHtAfcCBwH3Ae0BkgHvBwcJrwFtAxMBEgFtCa8KwwIQAXoBmgTDAXkBEATDBbcB/wEVCvEBFQH/ - BbcYBwqvAa4CbQGuCq8MwwMQAsMBmgEQBcMFtwL/ChUC/wW3GAcYrw/DAxAGwwa3DP8GtxgHGK8Ywxi3 - GAcYrxjDAQAWtwIAFgcCABavAgAWwwMAFLcEABQHBAAUrwQAFMMEABRxBAAUSwQAFKwEABSQAwAWcQIA - FksCABasAgAWkAEAGHEYSxisGJAYcRhLGKwYkAlxBP8LcQlLBv8JSw6sAv8IrAWQD/8EkAdxAv8B3ALN - AdwC/wlxB0sC/wHcBM0B3AL/B0sNrAH/Ac0B/wisBZAB/w3NAf8EkAZxAf8B3AbNAdwB/whxBksB/wHc - CM0B3AH/BksFrAT/AqwC/wLNAf8IrAWQAf8BzQvcAc0B/wSQBnEB/wjNAf8IcQVLAf8B3ArNAdwB/wVL - BawB/wLNAdwC/wHcA80B/wisBZAB/wHNC9wBzQH/BJAFcQH/AdwIzQHcAf8HcQVLAf8MzQH/BUsGrAH/ - CM0B/wisBZAB/wHNC9wBzQH/BJAFcQH/Cs0B/wdxBEsB/wHcBM0B3AL/AdwEzQHcAf8ESwasAf8B3AfN - Bf8ErAWQAf8BzQvcAc0B/wSQBU8B/wPNAdwGzQH/B08EUgH/BM0B3AH/As0B/wHcBM0B/wRSB60B/wLN - BNwFzQH/BK0FlgH/Ac0L3AHNAf8ElgVPAf8B3AHNAv8B3ATNAdwB/wdPBFIB/wTcAf8EzQH/BNwB/wRS - B60C/wPNAtwEzQH/Ba0FlgH/Ac0E3APNBNwBzQH/BJYGVQH/As0B/wXNAf8IVQRZBv8EzQb/BFkG1QH/ - AdwCzQTcAs0B3AH/BtUFuQH/Ac0D3AHNA9wBzQPcAc0B/wS5BlUB/wHcBs0B3AH/CFUEWQH/BM0B3AH/ - As0B/wHcBM0B/wRZBdUB/wTNAtwDzQL/B9UFuQH/Ac0C3AHNBdwBzQLcAc0B/wS5B1UC/wHcAs0B3AL/ - A1UC/wRVBFkB/wHcBM0B3AL/AdwEzQHcAf8EWQTVAf8FzQTcAs0B/wfVBbkB/wHNAdwBzQfcAc0B3AHN - Af8EuQlVAf8C3AH/BFUB/wHcAf8EVQVZAf8MzQH/BVkE1QX/B80B3AH/BtUFuQH/As0J3ALNAf8EuQlV - Af8CzQHcA/8B3ALNAf8EVQVZAf8B3ArNAdwB/wVZCNUB/wjNAf8G1QW5Af8BzQvcAc0B/wS5CVUB/wHc - B80B3AH/BFUGWQH/AdwIzQHcAf8GWQjVAf8DzQHcAv8B3ALNAf8F1QW5Af8BzQvcAc0B/wS5ClUB/wHc - Bc0B3AH/BVUHWQL/AdwEzQHcAv8HWQjVAf8CzQL/AtUE/wXVBbkB/w3NAf8EuQtVAv8DzQL/BlUJWQb/ - CVkI1QH/Ac0B/w3VBbkP/wS5DVUD/whVGFkI1QL/DtUYuRhVGFkY1Ri5AQAWVQIAFlkCABbVAgAWuQMA - FFUEABRZBAAU1QQAFLkEABSNBAAUqAQAFFAEABRLAwAWjQIAFqgCABZQAgAWSwEAGI0YqBhQGEsYjRio - GFAYSwmNBv8JjQeoBP8NqApQBP8KUAZLDP8GSweNAv8B3ATNAdwC/weNBagC/wHcAs0B3AL/C6gIUAL/ - BM0C/whQBksB/wnNAdwB/wZLBo0B/wHcCM0B3AH/Bo0FqAH/Bs0B/wuoB1AB/wLNAdwC/wHcAs0B/wdQ - BksB/wnNAdwB/wZLBo0B/wrNAf8GjQSoAf8B3ALNAv8CzQHcAf8KqAZQAf8BzQHcBP8D3AHNAf8GUAZL - Af8JzQHcAf8GSwWNAf8B3ArNAdwB/wWNBKgB/wLNAf8CqAH/As0B/wqoBVAB/wHNAdwE/wXcAc0B/wVQ - BksB/wnNAdwB/wZLBY0B/wzNAf8FjQSoAf8CzQH/AqgB/wLNAf8KqAVQAf8BzQX/BdwBzQH/BVAGSwH/ - Cc0B3AH/BksFjgH/DM0B/wWOBMoB/wHcAs0C/wLNAdwB/wrKBFcB/wHNAdwD/wHcAs0F3AHNAf8EVwZM - Af8K3AH/BkwFjgH/AdwKzQHcAf8FjgXKAf8GzQH/AsoB/wjKBFcB/wHNBP8BzQJXAc0C3AL/Ac0B/wRX - BkwB/wrcAf8GTAa3Af8KzQH/BrcF0AL/AdwDzQHcAf8B0AH/AdwB/wfQBFwB/wHNAv8C3AHNAlwBzQT/ - Ac0B/wRcBk0B/wnNAdwB/wZNBrcB/wHcCM0B3AH/BrcH0AP/As0B3AH/AdwCzQH/BtAEXAH/Ac0F3ALN - AdwD/wHcAc0B/wRcBk0B/wnNAdwB/wZNB7cC/wbcAv8HtwrQAf8CzQHcAs0B/wHcAf8F0AVcAf8BzQXc - Bf8BzQH/BVwGTQH/Cc0B3AH/Bk0ItwH/AdwEzQHcAf8ItwvQAf8DzQH/AdwCzQH/BNAFXAH/Ac0F3AT/ - AdwBzQH/BVwGTQL/CNwC/wZNB7cB/wHcBs0B3AH/B7cM0AH/As0B3ALNAf8F0AZcAf8BzQPcBP8B3AHN - Af8GXAdNAf8HzQHcAf8HTQa3Af8B3AjNAdwB/wa3DdAB/wPNAf8G0AdcAf8CzQHcAv8B3ALNAf8HXAdN - Af8HzQHcAf8HTQa3Af8B3AjNAdwB/wa3DtAB/wHNAf8H0AhcAv8EzQL/CFwHTQH/B80B3AH/B00Htwr/ - B7cP0AH/CNAKXAT/ClwHTQr/B00YtxjQGFwYTRi3GNAYXBhNAQAWtwIAFtACABZcAgAWTQMAFLcEABTQ - BAAUXAQAFE0CAAFCAU0BPgcAAT4DAAEoAwABYAMAAWADAAEBAQABAQUAAYABBBYAA///ACIAAcABAAED - AcABAAEDAcABAAEDAcABAAEDAYABAAEBAYABAAEBAYABAAEBAYABAAEB8AABgAEAAQEBgAEAAQEBgAEA - AQEBgAEAAQEBwAEAAQMBwAEAAQMBwAEAAQMBwAEAAQMBwAEAAQMBwAEAAQMBwAEAAQMBwAEAAQMBgAEA - AQEBgAEAAQEBgAEAAQEBgAEAAQHwAAGAAQABAQGAAQABAQGAAQABAQGAAQABAQHAAQABAwHAAQABAwHA - AQABAwHAAQABAwHAAQABAwHAAQABAwHAAQABAwHAAQABAwGAAQABAQGAAQABAQGAAQABAQGAAQABAfAA - AYABAAEBAYABAAEBAYABAAEBAYABAAEBAcABAAEDAcABAAEDAcABAAEDAcABAAEDCw== + AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/wMAFHMEAAx4BnMCeAL/ + MQAWcwIADHgCcwFvAkwBbwF0AXMCeAH/MAAYcwx4AXMBdAZMAW8BcwJ4MAAYcwt4AXMBdAhMAW8BcwF4 + MAAYcwt4AXMKTAF0AXMwAAVzDhAFcwp4AXMBbwpMAW8BczAABXMBEAxSARAFcwp4AXQMTAEcMAAFcwEQ + AlgIRAJYARAFcwl4AXMBbwxMARwwAAVzARACWAhEAlgBEAVzCXgBcw1MARwwAAVzARACWAJEBFgCRAJY + ARAFcwl4ARwMTAFvAe0wAAV5ARACTAJEAVgCRAFYAkQCTAEQBXkIeAGYAXQMTAF0AZgwAAV5ARAEoAFY + AkQBWASgARAFeQh4ARwBbwtMAW8BHAF4MAAF5QEQAlgCRASgAkQCWAEQBeUHnwGYAW8LTAFvAZgBngGf + MAAF5QEQAlgCSwREAksCWAEQBeUGnwGYAXQKTAFvAXQBmAOfMAAF5QEQAlgIRAJYARAF5QWfAXgBdAdM + Am8BdAEcApgEnzAABeUBEAJYCEsCWAEQBeUEnwJ4AnQBbwJMAW8BdAEcA5gBngafMAAF5QEQAlgIRAJY + ARAF5QGfAZ4BfQJ4AZkCmgF0AUwBbwEcAZgBngqfMAAF5QEQAlgISwJYARAF5QN4AXMBmQOaAXQBbwGY + AZ4MnzAABuUMEAblAXgBmQaaAngBng2fMAAY5QF4BpoCeAGeDp8wABjlAXgFmgFzAXgBng+fMAAY5QJ4 + ARwDmgEcAXgQnzEAFuUBAAH/AngDmgF4AX0PnzMAFOUCAAL/BXgBng6fNAAUjQQAFJIEABRnBAAUmQMA + Fo0CABaSAgAWZwIAFpkBABiNGJIYZxiZBo0M/waNGJIYZw6ZBBAGmQWNAf8MFQH/BY0YkhhnDJkCEAR5 + ARAFmQWNAf8BFQHsAVAB7AHxAVAB8QHsAfEB7AIVAf8FjQmSAe0B6wITAesB7QmSCmcEEgpnCpkCEAd5 + ARAEmQWNAf8BFQGNAvEBSwHxAY0B8QEVAfEB7AEVAf8FjQiSAe0BbQEVAu0BFQFtAe0IkglnARIEEwES + CWcImQIQCXkBEASZBY0B/wEVAVAB7AFQAuwBUALsAVAB7AEVAf8FjQeSAe0B6gEUAe0C8wHtARQB6gHt + B5IHZwESAhMBEgG1Ae8BEgITARIHZwaZAhALeQEQBJkFjQH/ARUJ8QHsARUB/wWNBpIB7QHqARMB7wH0 + Av8B9AHvARMB6gHtBpIGZwESAhMBbQG1AQkB8wHxAesCEwESBmcFmQEQCHkBmgH/AcMBmgF5ARAEmQaN + Af8KFQH/Bo0FkgHtAW0BEwEHBv8BBwETAW0B7QWSBGcCEgETARIB7AMJAfMC8gH3ARIBEwESBWcEmQEQ + B3kBmgL/ApoBwwGaARAEmQWOAf8BFQrsARUB/wWOBe8B7QEVAfcI/wH3ARUB7QXvBK4BEwESAeoBtQQJ + A/MB8gEIAW0BEwESBK4EGgEQBXkBmgL/BJoBegFZARAEGgWOAf8BFQEHCBUB7AEVAf8FjgXvAesBbQHy + CP8B8gFtAesF7wOuAW0BEwGuBgkF8wHxAewBEwFtA64EGgEQA3kBmgL/AcMDmgF6A1kBEAQaBbcB/wEV + AewBFQHsBPEB7AEVAQcBFQH/BbcFBwFtAewK/wHsAW0FBwOvAa4BEwHsAfEL8wHtARMBrgOvBMMBEAF5 + AZoC/wPDAZoBegVZARAEwwW3Af8BFQHsAhUBUAHsAY0BFQHsARUB7AEVAf8FtwUHAW0B7Ar/AewBbQUH + BK8CEgFtAbwI8wHwAesBEgETAY0DrwTDARABmgH/A8MBmgF6B1kBEATDBbcB/wEVAewBFQHsAvEBUAHs + AVABFQHsARUB/wW3BQcB7AHqAfAD/wK8A/8B8AHqAewFBwWvAW0CEgH3BvMB7wHqARIBbQGNBK8FwwEQ + AZoBwwGaAXoIWQF6ARAEwwW3Af8BFQHsCBUB7AEVAf8FtwUHAfcBEwHsAQcB8AHvAuwB7wHwAQcB7AEU + AfcFBwavAW0CEgHrAfEC8wHyAewCEgFtBq8GwwIQAnoGWQF6AZoBeQEQBMMFtwH/ARUBBwHsAQcB7AEH + AewBBwHsAQcB7AEVAf8FtwYHAZIBEgEUARIBFAITARQBEgEUARIBkgYHB68BrgESARMB6gIHAhIB6gGu + B68IwwIQAnoCWQF6AZoCwwF5ARAEwwW3Af8BFQrxARUB/wW3BwcB7wGSAe0B9wIHAfcB7QGSAe8HBwmv + AW0DEwESAW0JrwrDAhABegGaBMMBeQEQBMMFtwH/ARUK8QEVAf8FtxgHCq8BrgJtAa4KrwzDAxACwwGa + ARAFwwW3Av8KFQL/BbcYBxivD8MDEAbDBrcM/wa3GAcYrxjDGLcYBxivGMMBABa3AgAWBwIAFq8CABbD + AwAUtwQAFAcEABSvBAAUwwQAFHEEABRLBAAUrAQAFJADABZxAgAWSwIAFqwCABaQAQAYcRhLGKwYkBhx + GEsYrBiQCXEE/wtxCUsG/wlLDqwC/wisBZAP/wSQB3EC/wHcAs0B3AL/CXEHSwL/AdwEzQHcAv8HSw2s + Af8BzQH/CKwFkAH/Dc0B/wSQBnEB/wHcBs0B3AH/CHEGSwH/AdwIzQHcAf8GSwWsBP8CrAL/As0B/wis + BZAB/wHNC9wBzQH/BJAGcQH/CM0B/whxBUsB/wHcCs0B3AH/BUsFrAH/As0B3AL/AdwDzQH/CKwFkAH/ + Ac0L3AHNAf8EkAVxAf8B3AjNAdwB/wdxBUsB/wzNAf8FSwasAf8IzQH/CKwFkAH/Ac0L3AHNAf8EkAVx + Af8KzQH/B3EESwH/AdwEzQHcAv8B3ATNAdwB/wRLBqwB/wHcB80F/wSsBZAB/wHNC9wBzQH/BJAFTwH/ + A80B3AbNAf8HTwRSAf8EzQHcAf8CzQH/AdwEzQH/BFIHrQH/As0E3AXNAf8ErQWWAf8BzQvcAc0B/wSW + BU8B/wHcAc0C/wHcBM0B3AH/B08EUgH/BNwB/wTNAf8E3AH/BFIHrQL/A80C3ATNAf8FrQWWAf8BzQTc + A80E3AHNAf8ElgZVAf8CzQH/Bc0B/whVBFkG/wTNBv8EWQbVAf8B3ALNBNwCzQHcAf8G1QW5Af8BzQPc + Ac0D3AHNA9wBzQH/BLkGVQH/AdwGzQHcAf8IVQRZAf8EzQHcAf8CzQH/AdwEzQH/BFkF1QH/BM0C3APN + Av8H1QW5Af8BzQLcAc0F3AHNAtwBzQH/BLkHVQL/AdwCzQHcAv8DVQL/BFUEWQH/AdwEzQHcAv8B3ATN + AdwB/wRZBNUB/wXNBNwCzQH/B9UFuQH/Ac0B3AHNB9wBzQHcAc0B/wS5CVUB/wLcAf8EVQH/AdwB/wRV + BVkB/wzNAf8FWQTVBf8HzQHcAf8G1QW5Af8CzQncAs0B/wS5CVUB/wLNAdwD/wHcAs0B/wRVBVkB/wHc + Cs0B3AH/BVkI1QH/CM0B/wbVBbkB/wHNC9wBzQH/BLkJVQH/AdwHzQHcAf8EVQZZAf8B3AjNAdwB/wZZ + CNUB/wPNAdwC/wHcAs0B/wXVBbkB/wHNC9wBzQH/BLkKVQH/AdwFzQHcAf8FVQdZAv8B3ATNAdwC/wdZ + CNUB/wLNAv8C1QT/BdUFuQH/Dc0B/wS5C1UC/wPNAv8GVQlZBv8JWQjVAf8BzQH/DdUFuQ//BLkNVQP/ + CFUYWQjVAv8O1Ri5GFUYWRjVGLkBABZVAgAWWQIAFtUCABa5AwAUVQQAFFkEABTVBAAUuQQAFI0EABSo + BAAUUAQAFEsDABaNAgAWqAIAFlACABZLAQAYjRioGFAYSxiNGKgYUBhLCY0G/wmNB6gE/w2oClAE/wpQ + BksM/wZLB40C/wHcBM0B3AL/B40FqAL/AdwCzQHcAv8LqAhQAv8EzQL/CFAGSwH/Cc0B3AH/BksGjQH/ + AdwIzQHcAf8GjQWoAf8GzQH/C6gHUAH/As0B3AL/AdwCzQH/B1AGSwH/Cc0B3AH/BksGjQH/Cs0B/waN + BKgB/wHcAs0C/wLNAdwB/wqoBlAB/wHNAdwE/wPcAc0B/wZQBksB/wnNAdwB/wZLBY0B/wHcCs0B3AH/ + BY0EqAH/As0B/wKoAf8CzQH/CqgFUAH/Ac0B3AT/BdwBzQH/BVAGSwH/Cc0B3AH/BksFjQH/DM0B/wWN + BKgB/wLNAf8CqAH/As0B/wqoBVAB/wHNBf8F3AHNAf8FUAZLAf8JzQHcAf8GSwWOAf8MzQH/BY4EygH/ + AdwCzQL/As0B3AH/CsoEVwH/Ac0B3AP/AdwCzQXcAc0B/wRXBkwB/wrcAf8GTAWOAf8B3ArNAdwB/wWO + BcoB/wbNAf8CygH/CMoEVwH/Ac0E/wHNAlcBzQLcAv8BzQH/BFcGTAH/CtwB/wZMBrcB/wrNAf8GtwXQ + Av8B3APNAdwB/wHQAf8B3AH/B9AEXAH/Ac0C/wLcAc0CXAHNBP8BzQH/BFwGTQH/Cc0B3AH/Bk0GtwH/ + AdwIzQHcAf8GtwfQA/8CzQHcAf8B3ALNAf8G0ARcAf8BzQXcAs0B3AP/AdwBzQH/BFwGTQH/Cc0B3AH/ + Bk0HtwL/BtwC/we3CtAB/wLNAdwCzQH/AdwB/wXQBVwB/wHNBdwF/wHNAf8FXAZNAf8JzQHcAf8GTQi3 + Af8B3ATNAdwB/wi3C9AB/wPNAf8B3ALNAf8E0AVcAf8BzQXcBP8B3AHNAf8FXAZNAv8I3AL/Bk0HtwH/ + AdwGzQHcAf8HtwzQAf8CzQHcAs0B/wXQBlwB/wHNA9wE/wHcAc0B/wZcB00B/wfNAdwB/wdNBrcB/wHc + CM0B3AH/BrcN0AH/A80B/wbQB1wB/wLNAdwC/wHcAs0B/wdcB00B/wfNAdwB/wdNBrcB/wHcCM0B3AH/ + BrcO0AH/Ac0B/wfQCFwC/wTNAv8IXAdNAf8HzQHcAf8HTQe3Cv8Htw/QAf8I0ApcBP8KXAdNCv8HTRi3 + GNAYXBhNGLcY0BhcGE0BABa3AgAW0AIAFlwCABZNAwAUtwQAFNAEABRcBAAUTQIAAUIBTQE+BwABPgMA + ASgDAAFgAwABYAMAAQEBAAEBBQABgAEEFgAD/wEAAcABAAEDAcAIAAGAAQABAQGA+AABgAEAAQECAAEB + BgABwAEAAQMCAAEDBgABwAEAAQMBwAEAAQMBwAEAAQMBwAEAAQMBgAEAAQEBgAEAAQEBgAEAAQEBgAEA + AQHwAAGAAQABAQGAAQABAQGAAQABAQGAAQABAQHAAQABAwHAAQABAwHAAQABAwHAAQABAwHAAQABAwHA + AQABAwHAAQABAwHAAQABAwGAAQABAQGAAQABAQGAAQABAQGAAQABAfAAAYABAAEBAYABAAEBAYABAAEB + AYABAAEBAcABAAEDAcABAAEDAcABAAEDAcABAAEDAcABAAEDAcABAAEDAcABAAEDAcABAAEDAYABAAEB + AYABAAEBAYABAAEBAYABAAEB8AABgAEAAQEBgAEAAQEBgAEAAQEBgAEAAQEBwAEAAQMBwAEAAQMBwAEA + AQMBwAEAAQML diff --git a/PKHeX.WinForms/Subforms/Save Editors/SAV_Wondercard.cs b/PKHeX.WinForms/Subforms/Save Editors/SAV_Wondercard.cs index d1147defe..5ef9d94a8 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/SAV_Wondercard.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/SAV_Wondercard.cs @@ -161,7 +161,7 @@ private void ClickView(object sender, EventArgs e) var pb = WinFormsUtil.GetUnderlyingControl(sender); int index = Array.IndexOf(pba, pb); - SetBackground(index, Properties.Resources.slotView); + SetBackground(index, Drawing.Properties.Resources.slotView); ViewGiftData(mga.Gifts[index]); } @@ -190,7 +190,7 @@ private void ClickSet(object sender, EventArgs e) WinFormsUtil.Alert(MsgMysteryGiftSlotFail, $"{mg.Type} != {mga.Gifts[index].Type}"); return; } - SetBackground(index, Properties.Resources.slotSet); + SetBackground(index, Drawing.Properties.Resources.slotSet); mga.Gifts[index] = (DataMysteryGift)mg.Clone(); SetGiftBoxes(); SetCardID(mg.CardID); @@ -221,7 +221,7 @@ private void ClickDelete(object sender, EventArgs e) mga.Gifts[i-1] = mg1; mga.Gifts[i] = mg2; } - SetBackground(i, Properties.Resources.slotDel); + SetBackground(i, Drawing.Properties.Resources.slotDel); SetGiftBoxes(); } @@ -416,7 +416,7 @@ private void BoxSlot_DragDrop(object sender, DragEventArgs e) WinFormsUtil.Alert(MsgMysteryGiftSlotFail, $"{gift.Type} != {mga.Gifts[index].Type}"); return; } - SetBackground(index, Properties.Resources.slotSet); + SetBackground(index, Drawing.Properties.Resources.slotSet); mga.Gifts[index] = (DataMysteryGift)gift.Clone(); SetCardID(mga.Gifts[index].CardID); @@ -460,7 +460,7 @@ private void BoxSlot_DragDrop(object sender, DragEventArgs e) index = i-1; } } - SetBackground(index, Properties.Resources.slotView); + SetBackground(index, Drawing.Properties.Resources.slotView); SetGiftBoxes(); } diff --git a/Tests/PKHeX.Core.Tests/Saves/PokeDex.cs b/Tests/PKHeX.Core.Tests/Saves/PokeDex.cs index cced843d9..8bc2be174 100644 --- a/Tests/PKHeX.Core.Tests/Saves/PokeDex.cs +++ b/Tests/PKHeX.Core.Tests/Saves/PokeDex.cs @@ -30,8 +30,7 @@ private static void SetDexSpecies(SaveFile sav, int species, int regionSize) var pk5 = new PK5 {Species = species, TID = 1337}; // non-shiny pk5.Gender = pk5.GetSaneGender(); - int boxofs = sav.GetBoxSlotOffset(0, 0); - sav.SetStoredSlot(pk5, boxofs); + sav.SetBoxSlotAtIndex(pk5, 0); CheckFlags(sav, species, regionSize); }