diff --git a/PKHeX.csproj b/PKHeX.csproj index 087d645c1..c67cd92f1 100644 --- a/PKHeX.csproj +++ b/PKHeX.csproj @@ -301,6 +301,20 @@ + + + + + + + + + + + + + + diff --git a/PKX/f1-Main.cs b/PKX/f1-Main.cs index 6d172491f..5b3183b98 100644 --- a/PKX/f1-Main.cs +++ b/PKX/f1-Main.cs @@ -2115,13 +2115,13 @@ private void setForms(int species) new { Text = forms[912], Value = 1}, }; var form_pikachu = new[] { - new { Text = types[0], Value = 0}, - new { Text = forms[729], Value = 1}, - new { Text = forms[730], Value = 2}, - new { Text = forms[731], Value = 3}, - new { Text = forms[732], Value = 4}, - new { Text = forms[733], Value = 5}, - new { Text = forms[734], Value = 6}, + new { Text = types[0], Value = 0}, // Normal + new { Text = forms[729], Value = 1}, // Rockstar + new { Text = forms[730], Value = 2}, // Belle + new { Text = forms[731], Value = 3}, // Pop + new { Text = forms[732], Value = 4}, // PhD + new { Text = forms[733], Value = 5}, // Libre + new { Text = forms[734], Value = 6}, // Cosplay }; CB_Form.DataSource = form_list; @@ -2153,7 +2153,8 @@ private void setForms(int species) } // Regular Form List - if (species == 201) { form_list = form_unown; } + if (species == 025) { form_list = form_pikachu; } + else if (species == 201) { form_list = form_unown; } else if (species == 351) { form_list = form_castform; } else if (species == 386) { form_list = form_deoxys; } else if (species == 421) { form_list = form_cherrim; } @@ -2271,25 +2272,25 @@ private void Label_Marking_Click(object sender, EventArgs e) } private void Label_OT_Click(object sender, EventArgs e) { - string OT = Util.TrimFromZero(Encoding.Unicode.GetString(savefile, 0x19448 + savindex * 0x7F000, 0x1A)); + string OT = Util.TrimFromZero(Encoding.Unicode.GetString(savefile, SaveGame.TrainerCard + 0x48 + savindex * 0x7F000, 0x1A)); if (OT.Length > 0) { TB_OT.Text = OT; int savshift = 0x7F000 * savindex; // Set Gender Label - int g6trgend = savefile[0x19405 + savshift]; + int g6trgend = savefile[SaveGame.TrainerCard + 0x5 + savshift]; if (g6trgend == 1) Label_OTGender.Text = "♀"; else Label_OTGender.Text = "♂"; // Get TID/SID - TB_TID.Text = BitConverter.ToUInt16(savefile, 0x19400 + savshift).ToString(); - TB_SID.Text = BitConverter.ToUInt16(savefile, 0x19402 + savshift).ToString(); - int game = savefile[0x19404 + savshift]; - int subreg = savefile[0x19426 + savshift]; - int country = savefile[0x19427 + savshift]; - int _3DSreg = savefile[0x1942C + savshift]; - int lang = savefile[0x1942D + savshift]; + TB_TID.Text = BitConverter.ToUInt16(savefile, SaveGame.TrainerCard + 0 + savshift).ToString(); + TB_SID.Text = BitConverter.ToUInt16(savefile, SaveGame.TrainerCard + 2 + savshift).ToString(); + int game = savefile[SaveGame.TrainerCard + 0x4 + savshift]; + int subreg = savefile[SaveGame.TrainerCard + 0x26 + savshift]; + int country = savefile[SaveGame.TrainerCard + 0x27 + savshift]; + int _3DSreg = savefile[SaveGame.TrainerCard + 0x2C + savshift]; + int lang = savefile[SaveGame.TrainerCard + 0x2D + savshift]; // CB_GameOrigin.SelectedValue = game; @@ -3935,9 +3936,10 @@ private void openSave(bool oras) // temp ORAS save-editing disable // GB_SAVtools.Enabled = !oras; - B_OpenBerryField.Enabled = B_JPEG.Enabled = B_OpenBoxLayout.Enabled = B_OpenEventFlags.Enabled = B_OpenTrainerInfo.Enabled = - B_OpenOPowers.Enabled = B_OpenPokedex.Enabled = B_OpenPokepuffs.Enabled = B_OpenSuperTraining.Enabled = - B_OpenTrainerInfo.Enabled = B_OUTHallofFame.Enabled = B_OUTPasserby.Enabled = (!oras); + B_OpenBerryField.Enabled = B_JPEG.Enabled = + B_OpenOPowers.Enabled = B_OpenPokedex.Enabled = B_OpenSuperTraining.Enabled = + B_OUTHallofFame.Enabled = B_OUTPasserby.Enabled = (!oras); + //B_OpenTrainerInfo.Enabled = B_OpenPokepuffs.Enabled = B_OpenBoxLayout.Enabled = this.Width = largeWidth; } @@ -4241,7 +4243,6 @@ public byte[] preparepkx(byte[] buff) { pkx[0x14] = (byte)Util.getIndex(DEV_Ability); // Ability pkx[0xEC] = (byte)Math.Min(Convert.ToInt32(MT_Level.Text), 255); // Level - Array.Copy(BitConverter.GetBytes(PKX.getEXP(pkx[0xEC], Util.getIndex(CB_Species))), 0, pkx, 0x10, 4); // EXP } // Fix Moves if a slot is empty @@ -4902,8 +4903,6 @@ private void exportSAV(object sender, EventArgs e) byte[] cybersav = new Byte[0x65600]; if (savegame_oras) cybersav = new Byte[0x76000]; Array.Copy(editedsav, 0x5400, cybersav, 0, cybersav.Length); - ushort wtf = BitConverter.ToUInt16(editedsav, 0x75E1A); - ushort wtf2 = BitConverter.ToUInt16(cybersav, 0x75E1A); if (savegame_oras) goto postcheck; // Chunk Error Checking byte[] FFFF = new Byte[0x200]; @@ -5261,7 +5260,8 @@ public void setPKXBoxes() int boxbgofst = (0x7F000 * savindex) + 0x9C1E + C_BoxSelect.SelectedIndex; int boxbgval = 1 + savefile[boxbgofst]; - PAN_Box.BackgroundImage = (Image)Properties.Resources.ResourceManager.GetObject("box_wp" + boxbgval.ToString("00")); + string imagename = "box_wp" + boxbgval.ToString("00"); if (savegame_oras && boxbgval > 16) imagename += "o"; + PAN_Box.BackgroundImage = (Image)Properties.Resources.ResourceManager.GetObject(imagename); PictureBox[] pba = { bpkx1, bpkx2, bpkx3, bpkx4, bpkx5, bpkx6, @@ -5284,13 +5284,13 @@ public void setPKXBoxes() // Reload Party for (int i = 0; i < 6; i++) { - int offset = 0x19600 + (0x7F000 * savindex) + 0x104 * i; + int offset = SaveGame.Party + (0x7F000 * savindex) + 0x104 * i; getSlotFiller(offset, pba[i + 30]); } // Reload Battle Box for (int i = 0; i < 6; i++) { - int offset = 0x09E00 + (0x7F000 * savindex) + 0xE8 * i; + int offset = SaveGame.BattleBox + (0x7F000 * savindex) + 0xE8 * i; getSlotFiller(offset, pba[i + 36]); } // Reload Daycare @@ -5304,10 +5304,10 @@ public void setPKXBoxes() }; for (int i = 0; i < 2; i++) { - int offset = 0x20600 + (0x7F000 * savindex) + 0xE8 * i + 8 * (i + 1); + int offset = SaveGame.Daycare + (0x7F000 * savindex) + 0xE8 * i + 8 * (i + 1); getSlotFiller(offset, pba[i + 42]); - dctexta[i].Text = BitConverter.ToUInt32(savefile, 0x20600 + (0x7F000 * savindex) + 0xF0 * i + 4).ToString(); - if (Convert.ToBoolean(savefile[0x20600 + (0x7F000 * savindex) + 0xF0 * i])) // If Occupied + dctexta[i].Text = BitConverter.ToUInt32(savefile, SaveGame.Daycare + (0x7F000 * savindex) + 0xF0 * i + 4).ToString(); + if (Convert.ToBoolean(savefile[SaveGame.Daycare + (0x7F000 * savindex) + 0xF0 * i])) // If Occupied { pba[i + 42].Image = Util.ChangeOpacity(pba[i + 42].Image, 1); dclabela[i].Text = (i + 1) + ": Occupied"; @@ -5318,14 +5318,14 @@ public void setPKXBoxes() dclabela[i].Text = (i + 1) + ": Not Occupied"; } } - DayCare_HasEgg.Checked = Convert.ToBoolean(savefile[0x20600 + (0x7F000 * savindex) + 0x1E0]); - TB_RNGSeed.Text = BitConverter.ToUInt64(savefile, 0x20600 + (0x7F000 * savindex) + 0x1E8).ToString("X16"); + DayCare_HasEgg.Checked = Convert.ToBoolean(savefile[SaveGame.Daycare + (0x7F000 * savindex) + 0x1E0]); + TB_RNGSeed.Text = BitConverter.ToUInt64(savefile, SaveGame.Daycare + (0x7F000 * savindex) + 0x1E8).ToString("X16"); // GTS - getSlotFiller(0x1CC00 + (0x7F000 * savindex), pba[44]); + getSlotFiller(SaveGame.GTS + (0x7F000 * savindex), pba[44]); // Fused - getSlotFiller(0x1B400 + (0x7F000 * savindex), pba[45]); + getSlotFiller(SaveGame.Fused + (0x7F000 * savindex), pba[45]); // SUBE for (int i = 0; i < 3; i++) @@ -5964,6 +5964,9 @@ private void InitializeStrings() itempouch = Util.getStringList("ItemPouch", l); wallpapernames = Util.getStringList("Wallpaper", l); + // Fix (None) tags + abilitylist[0] = itemlist[0] = movelist[0] = "("+itemlist[0]+")"; + // Fix Item Names (Duplicate entries) itemlist[629] += " (2)"; itemlist[707] += " (2)"; @@ -6040,7 +6043,7 @@ public class SaveGames { public struct SaveStruct { - public int Box, Party, BattleBox, GTS, Daycare, Fused, SUBE, Puff, Item, Trainer1, Trainer2, PCLayout, Wondercard, BerryField, OPower, EventFlag, PokeDex, HoF, PSS, JPEG; + public int Box, TrainerCard, Party, BattleBox, GTS, Daycare, Fused, SUBE, Puff, Item, Trainer1, Trainer2, PCLayout, Wondercard, BerryField, OPower, EventFlag, PokeDex, HoF, PSS, JPEG; public string Name; public SaveStruct(string GameID) { @@ -6048,6 +6051,7 @@ public SaveStruct(string GameID) { Name = "XY"; Box = 0x27A00; + TrainerCard = 0x19400; Party = 0x19600; BattleBox = 0x09E00; Daycare = 0x20600; @@ -6075,11 +6079,12 @@ public SaveStruct(string GameID) // Temp Name = "ORAS"; Box = 0x38400; // Confirmed + TrainerCard = 0x19400; Party = 0x19600; // Confirmed BattleBox = 0x09E00;// Confirmed Daycare = 0x20600; - GTS = 0x1CC00; - Fused = 0x1B400; + GTS = 0x1D600; + Fused = 0x1BE00; SUBE = 0x22C90; Puff = 0x5400; @@ -6102,6 +6107,7 @@ public SaveStruct(string GameID) // Copied... Name = "Unknown"; Box = 0x27A00; + TrainerCard = 0x19400; Party = 0x19600; BattleBox = 0x09E00; Daycare = 0x20600; diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs index b3bf29d3d..83e162fcf 100644 --- a/Properties/Resources.Designer.cs +++ b/Properties/Resources.Designer.cs @@ -2160,6 +2160,66 @@ internal class Resources { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap _25_1 { + get { + object obj = ResourceManager.GetObject("_25_1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap _25_2 { + get { + object obj = ResourceManager.GetObject("_25_2", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap _25_3 { + get { + object obj = ResourceManager.GetObject("_25_3", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap _25_4 { + get { + object obj = ResourceManager.GetObject("_25_4", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap _25_5 { + get { + object obj = ResourceManager.GetObject("_25_5", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap _25_6 { + get { + object obj = ResourceManager.GetObject("_25_6", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -10010,6 +10070,16 @@ internal class Resources { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap box_wp17o { + get { + object obj = ResourceManager.GetObject("box_wp17o", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -10020,6 +10090,16 @@ internal class Resources { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap box_wp18o { + get { + object obj = ResourceManager.GetObject("box_wp18o", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -10030,6 +10110,16 @@ internal class Resources { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap box_wp19o { + get { + object obj = ResourceManager.GetObject("box_wp19o", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -10040,6 +10130,16 @@ internal class Resources { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap box_wp20o { + get { + object obj = ResourceManager.GetObject("box_wp20o", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -10050,6 +10150,16 @@ internal class Resources { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap box_wp21o { + get { + object obj = ResourceManager.GetObject("box_wp21o", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -10060,6 +10170,16 @@ internal class Resources { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap box_wp22o { + get { + object obj = ResourceManager.GetObject("box_wp22o", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -10070,6 +10190,16 @@ internal class Resources { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap box_wp23o { + get { + object obj = ResourceManager.GetObject("box_wp23o", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -10080,6 +10210,16 @@ internal class Resources { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap box_wp24o { + get { + object obj = ResourceManager.GetObject("box_wp24o", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -14890,7 +15030,7 @@ internal class Resources { } /// - /// Looks up a localized string similar to Nichts + /// Looks up a localized string similar to - ///Duftnote ///Niesel ///Temposchub @@ -14937,7 +15077,7 @@ internal class Resources { ///Regengenuss ///Sandsturm ///Erzwinger - ///Speck [rest of string was truncated]";. + ///Speckschic [rest of string was truncated]";. /// internal static string text_Abilities_de { get { @@ -14946,7 +15086,7 @@ internal class Resources { } /// - /// Looks up a localized string similar to None + /// Looks up a localized string similar to — ///Stench ///Drizzle ///Speed Boost @@ -14994,7 +15134,7 @@ internal class Resources { ///Sand Stream ///Pressure ///Thick Fat - /// [rest of string was truncated]";. + ///Ear [rest of string was truncated]";. /// internal static string text_Abilities_en { get { @@ -15003,7 +15143,7 @@ internal class Resources { } /// - /// Looks up a localized string similar to Ninguno + /// Looks up a localized string similar to - ///Hedor ///Llovizna ///Impulso @@ -15048,7 +15188,8 @@ internal class Resources { ///Imán ///Insonorizar ///Cura Lluvia - ///Chorro Are [rest of string was truncated]";. + ///Chorro Arena + ///Pre [rest of string was truncated]";. /// internal static string text_Abilities_es { get { @@ -15057,7 +15198,7 @@ internal class Resources { } /// - /// Looks up a localized string similar to Aucun + /// Looks up a localized string similar to ///Puanteur ///Crachin ///Turbo @@ -15106,7 +15247,8 @@ internal class Resources { ///Pression ///Isograisse ///Matinal - ///Corps Ar [rest of string was truncated]";. + ///Corps Ardent + /// [rest of string was truncated]";. /// internal static string text_Abilities_fr { get { @@ -15115,7 +15257,7 @@ internal class Resources { } /// - /// Looks up a localized string similar to Niente + /// Looks up a localized string similar to - ///Tanfo ///Piovischio ///Acceleratore @@ -15162,7 +15304,8 @@ internal class Resources { ///Copripioggia ///Sabbiafiume ///Pressione - ///Grassospe [rest of string was truncated]";. + ///Grassospesso + ///S [rest of string was truncated]";. /// internal static string text_Abilities_it { get { @@ -15171,7 +15314,7 @@ internal class Resources { } /// - /// Looks up a localized string similar to なし + /// Looks up a localized string similar to ― ///あくしゅう ///あめふらし ///かそく @@ -15258,7 +15401,7 @@ internal class Resources { ///かるわざ ///たいねつ ///たんじゅん - ///かん [rest of string was truncated]";. + ///かんそ [rest of string was truncated]";. /// internal static string text_Abilities_ja { get { @@ -15267,7 +15410,7 @@ internal class Resources { } /// - /// Looks up a localized string similar to 없음 + /// Looks up a localized string similar to - ///악취 ///잔비 ///가속 @@ -15387,7 +15530,7 @@ internal class Resources { ///눈퍼뜨리기 ///꿀모으기 ///통찰 - ///이 [rest of string was truncated]";. + ///이판 [rest of string was truncated]";. /// internal static string text_Abilities_ko { get { @@ -16878,7 +17021,7 @@ internal class Resources { /// /// /// - /// + ///Ein /// /// /// @@ -17059,8 +17202,8 @@ internal class Resources { /// /// /// - /// - /// + ///Kyogre + ///Groudon /// /// ///Normal @@ -17099,14 +17242,8 @@ internal class Resources { /// /// ///Wolken - ///Westliches Meer - ///Westliches Meer - /// - /// - /// - /// - /// - /// + ///Westliches + ///Westliches /// /// /// @@ -17339,7 +17476,7 @@ internal class Resources { /// /// /// - /// + ///One /// /// /// @@ -17520,8 +17657,8 @@ internal class Resources { /// /// /// - /// - /// + ///Kyogre + ///Groudon /// /// ///Normal @@ -17559,7 +17696,7 @@ internal class Resources { /// /// /// - ///Overcast + ///Overcast ///West Sea ///West Sea /// @@ -17588,21 +17725,6 @@ internal class Resources { /// /// /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// /// [rest of string was truncated]";. /// internal static string text_Forms_en { @@ -17813,6 +17935,7 @@ internal class Resources { /// /// /// + ///Unaa /// /// /// @@ -17962,8 +18085,8 @@ internal class Resources { /// /// /// + ///de Castform /// - ///a de Cast /// /// /// @@ -17993,12 +18116,11 @@ internal class Resources { /// /// /// + ///Kyogre + ///Groudon /// /// - /// - /// - /// - ///a Normal + ///Normal /// /// /// @@ -18033,7 +18155,7 @@ internal class Resources { /// /// /// - ///a Encapotado + ///Encapotado ///Mar Oeste ///Mar Oeste /// @@ -18050,21 +18172,6 @@ internal class Resources { /// /// /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// /// [rest of string was truncated]";. /// internal static string text_Forms_es { @@ -18275,6 +18382,7 @@ internal class Resources { /// /// /// + ///Unique /// /// /// @@ -18424,8 +18532,8 @@ internal class Resources { /// /// /// + ///de Morphéo /// - ///e de Morphéo /// /// /// @@ -18455,12 +18563,11 @@ internal class Resources { /// /// /// + ///Kyogre + ///Groudon /// /// - /// - /// - /// - ///e Normale + ///Normale /// /// /// @@ -18495,7 +18602,7 @@ internal class Resources { /// /// /// - ///Temps Couvert + ///Couvert ///Mer Occident ///Mer Occident /// @@ -18507,15 +18614,6 @@ internal class Resources { /// /// /// - /// - /// - /// - /// - /// - /// - /// - /// - /// /// [rest of string was truncated]";. /// internal static string text_Forms_fr { @@ -18726,6 +18824,7 @@ internal class Resources { /// /// /// + ///Forma Vaga /// /// /// @@ -18875,8 +18974,8 @@ internal class Resources { /// /// /// + ///Forma Castform /// - ///a Cast /// /// /// @@ -18910,8 +19009,8 @@ internal class Resources { /// /// /// + ///Forma Normale /// - ///a Normale /// /// /// @@ -18936,53 +19035,18 @@ internal class Resources { /// /// /// + ///Manto Pianta + ///Manto Pianta /// - ///Pianta - ///Pianta /// /// /// /// /// /// - /// - ///a Nuvola + ///Forma Nuvola ///Mare Ovest - ///Mare Ovest - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// [rest of string was truncated]";. + ///Mare O [rest of string was truncated]";. /// internal static string text_Forms_it { get { @@ -19373,8 +19437,8 @@ internal class Resources { /// /// /// - /// - /// + ///カイオーガのすがた + ///グラードンのすがた /// /// ///ノーマルフォルム @@ -19436,24 +19500,6 @@ internal class Resources { /// /// /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// /// [rest of string was truncated]";. /// internal static string text_Forms_ja { @@ -19845,8 +19891,8 @@ internal class Resources { /// /// /// - /// - /// + ///가이오가의 모습 + ///그란돈의 모습 /// /// ///노말폼 @@ -19925,21 +19971,6 @@ internal class Resources { /// /// /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// /// [rest of string was truncated]";. /// internal static string text_Forms_ko { @@ -19951,7 +19982,7 @@ internal class Resources { /// /// Looks up a localized string similar to irgendwo ///in der ersten Stadt - ///in \x10\x04ᄀÿԆ\x00dessenderen Zuhause + ///in [VAR GENDBR(00FF,0506,0000)]dessenderen Zuhause ///im Zuhause eines Freundes ///in irgendjemandes Zuhause ///in einer lebhaften Stadt @@ -19971,7 +20002,7 @@ internal class Resources { ///in einer prachtvollen Stadt ///in einer Pokémon-Arena ///in einer Schule - ///in einer großen Stad [rest of string was truncated]";. + ///in eine [rest of string was truncated]";. /// internal static string text_GenLoc_de { get { @@ -20005,7 +20036,7 @@ internal class Resources { ///a large city ///a building ///a stylish café - ///a secret base + ///a hideout ///a museum ///a studio ///a train station @@ -20015,7 +20046,7 @@ internal class Resources { ///a high-class restaurant ///a seaside city ///the inside of a tall building - ///a city with a mysteriou [rest of string was truncated]";. + ///a city with a mysterious ai [rest of string was truncated]";. /// internal static string text_GenLoc_en { get { @@ -20077,7 +20108,7 @@ internal class Resources { ///dans un hôtel ///dans une ville mystérieuse ///dans une ville très venteuse - ///à une Porte + ///à une porte ///dans une ville en bord de rivière ///dans un laboratoire ///dans un aquarium @@ -20121,9 +20152,9 @@ internal class Resources { ///in una grande città ///in un edificio ///in un caffè elegante - ///in una base segreta + ///in un covo segreto ///in un museo - /// [rest of string was truncated]";. + ///i [rest of string was truncated]";. /// internal static string text_GenLoc_it { get { @@ -20193,7 +20224,16 @@ internal class Resources { ///はたけ ///はいきょ ///すいどう - ///サファリ. + ///サファリ + ///ひみつきち + ///コンテストライブかいじょう + ///ふかいうみのそこ + ///マボロシのばしょ + ///おおきなふね + ///はいがふりつもるみち + ///ちいさなしま + ///しんぴてきなばしょ + ///おおぞら. /// internal static string text_GenLoc_ja { get { @@ -20263,7 +20303,16 @@ internal class Resources { ///밭 ///폐허 ///수로 - ///사파리. + ///사파리 + ///비밀기지 + ///콘테스트 라이브 회장 + ///깊은 바다 밑 + ///환상의 장소 + ///커다란 배 + ///재가 떨어져 쌓이는 길 + ///작은 섬 + ///신비스러운 장소 + ///창공. /// internal static string text_GenLoc_ko { get { @@ -21307,7 +21356,7 @@ internal class Resources { } /// - /// Looks up a localized string similar to (Nichts) + /// Looks up a localized string similar to Kein ///Meisterball ///Hyperball ///Superball @@ -21357,7 +21406,8 @@ internal class Resources { ///Eisen ///Carbon ///Kalzium - ///Sonderbon [rest of string was truncated]";. + ///Sonderbonbon + /// [rest of string was truncated]";. /// internal static string text_Items_de { get { @@ -21366,7 +21416,7 @@ internal class Resources { } /// - /// Looks up a localized string similar to (None) + /// Looks up a localized string similar to None ///Master Ball ///Ultra Ball ///Great Ball @@ -21415,7 +21465,7 @@ internal class Resources { ///Protein ///Iron ///Carbos - ///Cal [rest of string was truncated]";. + ///Calci [rest of string was truncated]";. /// internal static string text_Items_en { get { @@ -21424,7 +21474,7 @@ internal class Resources { } /// - /// Looks up a localized string similar to (Ninguno) + /// Looks up a localized string similar to Ningún ///Master Ball ///Ultra Ball ///Super Ball @@ -21468,7 +21518,8 @@ internal class Resources { ///Elixir Máximo ///Galleta Lava ///Zumo de Baya - ///Ceniza Sagrad [rest of string was truncated]";. + ///Ceniza Sagrada + ///M [rest of string was truncated]";. /// internal static string text_Items_es { get { @@ -21477,7 +21528,7 @@ internal class Resources { } /// - /// Looks up a localized string similar to (Aucun) + /// Looks up a localized string similar to Aucun ///Master Ball ///Hyper Ball ///Super Ball @@ -21526,7 +21577,7 @@ internal class Resources { ///Protéine ///Fer ///Carbone - ///Cal [rest of string was truncated]";. + ///Calci [rest of string was truncated]";. /// internal static string text_Items_fr { get { @@ -21535,7 +21586,7 @@ internal class Resources { } /// - /// Looks up a localized string similar to (Niente) + /// Looks up a localized string similar to Niente ///Master Ball ///Ultra Ball ///Mega Ball @@ -21582,7 +21633,7 @@ internal class Resources { ///Ceneremagica ///PS-Su ///Proteina - /// [rest of string was truncated]";. + ///Fe [rest of string was truncated]";. /// internal static string text_Items_it { get { @@ -21591,7 +21642,7 @@ internal class Resources { } /// - /// Looks up a localized string similar to (なし) + /// Looks up a localized string similar to なし ///マスターボール ///ハイパーボール ///スーパーボール @@ -21657,7 +21708,8 @@ internal class Resources { ///ピッピにんぎょう ///エネコのシッポ ///あおいビードロ - ///きいろビードロ [rest of string was truncated]";. + ///きいろビードロ + ///あ [rest of string was truncated]";. /// internal static string text_Items_ja { get { @@ -21666,7 +21718,7 @@ internal class Resources { } /// - /// Looks up a localized string similar to (없음) + /// Looks up a localized string similar to 없음 ///마스터볼 ///하이퍼볼 ///수퍼볼 @@ -21704,10 +21756,10 @@ internal class Resources { ///힘의뿌리 ///만능가루 ///부활초 - ///피피에이드 - ///피피회복 - ///피피에이더 - ///피피맥스 + ///PP에이드 + ///PP회복 + ///PP에이더 + ///PP맥스 ///용암전병 ///나무열매쥬스 ///성스러운분말 @@ -21762,7 +21814,7 @@ internal class Resources { ///하트비늘 ///달콤한꿀 ///무럭무럭비료 - ///축축 [rest of string was truncated]";. + ///축축이비 [rest of string was truncated]";. /// internal static string text_Items_ko { get { @@ -22035,7 +22087,7 @@ internal class Resources { } /// - /// Looks up a localized string similar to (Nichts) + /// Looks up a localized string similar to ----- ///Pfund ///Karateschlag ///Duplexhieb @@ -22085,7 +22137,8 @@ internal class Resources { ///Gesang ///Superschall ///Ultraschall - ///Aussetze [rest of string was truncated]";. + ///Aussetzer + ///S [rest of string was truncated]";. /// internal static string text_Moves_de { get { @@ -22094,7 +22147,7 @@ internal class Resources { } /// - /// Looks up a localized string similar to (None) + /// Looks up a localized string similar to ——— ///Pound ///Karate Chop ///Double Slap @@ -22150,7 +22203,7 @@ internal class Resources { ///Flamethrower ///Mist ///Water Gun - ///Hyd [rest of string was truncated]";. + ///Hydro [rest of string was truncated]";. /// internal static string text_Moves_en { get { @@ -22159,7 +22212,7 @@ internal class Resources { } /// - /// Looks up a localized string similar to (Ninguno) + /// Looks up a localized string similar to - ///Destructor ///Golpe Kárate ///Doble Bofetón @@ -22208,7 +22261,8 @@ internal class Resources { ///Rugido ///Canto ///Supersónico - ///Bomba [rest of string was truncated]";. + ///Bomba Sónica + ///A [rest of string was truncated]";. /// internal static string text_Moves_es { get { @@ -22217,7 +22271,7 @@ internal class Resources { } /// - /// Looks up a localized string similar to (Aucun) + /// Looks up a localized string similar to ――――― ///Écras’Face ///Poing-Karaté ///Torgnoles @@ -22267,7 +22321,7 @@ internal class Resources { ///Berceuse ///Ultrason ///Sonicboom - ///Entra [rest of string was truncated]";. + ///Entrave [rest of string was truncated]";. /// internal static string text_Moves_fr { get { @@ -22276,7 +22330,7 @@ internal class Resources { } /// - /// Looks up a localized string similar to (Niente) + /// Looks up a localized string similar to ----- ///Botta ///Colpokarate ///Doppiasberla @@ -22327,7 +22381,7 @@ internal class Resources { ///Supersuono ///Sonicboom ///Inibitore - ///A [rest of string was truncated]";. + ///Acid [rest of string was truncated]";. /// internal static string text_Moves_it { get { @@ -22336,7 +22390,7 @@ internal class Resources { } /// - /// Looks up a localized string similar to (なし) + /// Looks up a localized string similar to ――――― ///はたく ///からてチョップ ///おうふくビンタ @@ -22416,7 +22470,7 @@ internal class Resources { ///どくのこな ///しびれごな ///ねむりごな - ///はなびらの [rest of string was truncated]";. + ///はなびら [rest of string was truncated]";. /// internal static string text_Moves_ja { get { @@ -22425,7 +22479,7 @@ internal class Resources { } /// - /// Looks up a localized string similar to (없음) + /// Looks up a localized string similar to ――――― ///막치기 ///태권당수 ///연속뺨치기 @@ -22510,7 +22564,7 @@ internal class Resources { ///용의분노 ///회오리불꽃 ///전기쇼크 - ///십만볼트 + ///10만볼트 ///전기자석파 ///번개 ///돌떨구기 @@ -22530,7 +22584,7 @@ internal class Resources { ///흉내내기 ///싫은소리 ///그림자분신 - ///에이치피회복 + ///HP회복 /// [rest of string was truncated]";. /// internal static string text_Moves_ko { @@ -24524,7 +24578,7 @@ internal class Resources { } /// - /// Looks up a localized string similar to ---------- + /// Looks up a localized string similar to —————— /// ///Mystery Zone /// @@ -24581,7 +24635,8 @@ internal class Resources { ///Route 11 ///Miroir Way ///Reflection Cave - /// [rest of string was truncated]";. + /// + ///Sha [rest of string was truncated]";. /// internal static string text_xy_00000_en { get { @@ -24657,7 +24712,7 @@ internal class Resources { /// ///Endroit Mystérieux /// - ///Endroit lointain + ///Endroit Lointain /// ///Bourg Croquis /// @@ -24857,11 +24912,12 @@ internal class Resources { /// ///１６ばんどうろ ///トリストどおり - ///\x10\x02뷿P - ///\x10\x02뷿Q + ///[~ 80] + ///[~ 81] ///フロストケイブ /// - ///１７ばんどうろ [rest of string was truncated]";. + ///１７ばんどうろ + ///マンムーロード [rest of string was truncated]";. /// internal static string text_xy_00000_ja { get { @@ -24950,8 +25006,8 @@ internal class Resources { /// ///16번도로 ///트리스트 도로 - ///\x10\x02뷿P - ///\x10\x02뷿Q + ///[~ 80] + ///[~ 81] ///프로스트케이브 /// ///17번도로 @@ -24974,7 +25030,9 @@ internal class Resources { ///데르니에 도로 ///22번도로 ///데뚜르네 도로 - ///챔피언 [rest of string was truncated]";. + ///챔피언로드 + /// + ///포켓몬리 [rest of string was truncated]";. /// internal static string text_xy_00000_ko { get { @@ -25484,8 +25542,8 @@ internal class Resources { /// /// Looks up a localized string similar to Ferne Person ///Pensionsleiter - ///Schatzjäger - ///. + ///Schatzsucher + ///Dame der Heißen Quellen. /// internal static string text_xy_60000_de { get { @@ -25495,9 +25553,9 @@ internal class Resources { /// /// Looks up a localized string similar to a stranger - ///a Day-Care Couple + ///Day Care helpers ///a treasure hunter - ///. + ///an old hot-springs visitor. /// internal static string text_xy_60000_en { get { @@ -25509,7 +25567,7 @@ internal class Resources { /// Looks up a localized string similar to Persona lejana ///Pareja de la Guardería ///Buscatesoros - ///. + ///Anciana del Balneario. /// internal static string text_xy_60000_es { get { @@ -25519,9 +25577,9 @@ internal class Resources { /// /// Looks up a localized string similar to Personne lointaine - ///Couple de la Pension - ///Chasseur de trésors - ///. + ///Responsable de la Pension + ///Chercheur de Trésors + ///Dame des Eaux Thermales. /// internal static string text_xy_60000_fr { get { @@ -25531,9 +25589,9 @@ internal class Resources { /// /// Looks up a localized string similar to Persona Lontana - ///Coppia Pensione + ///Pensione Pokémon ///Cercatesori - ///. + ///Vecchina delle terme. /// internal static string text_xy_60000_it { get { @@ -25543,9 +25601,9 @@ internal class Resources { /// /// Looks up a localized string similar to とおくにいるひと - ///そだてやふうふ + ///そだてやさん ///トレジャーハンター - ///. + ///おんせんばあさん. /// internal static string text_xy_60000_ja { get { @@ -25557,7 +25615,7 @@ internal class Resources { /// Looks up a localized string similar to 멀리 있는 사람 ///키우미집 ///트레져헌터 - ///. + ///온천할머니. /// internal static string text_xy_60000_ko { get { diff --git a/Properties/Resources.resx b/Properties/Resources.resx index 9d2523117..205d00be7 100644 --- a/Properties/Resources.resx +++ b/Properties/Resources.resx @@ -5104,4 +5104,46 @@ ..\Resources\img\Pokemon Sprites\80-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\img\box\box_wp17o.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\box\box_wp18o.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\box\box_wp19o.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\box\box_wp20o.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\box\box_wp21o.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\box\box_wp22o.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\box\box_wp23o.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\box\box_wp24o.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Pokemon Sprites\25-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Pokemon Sprites\25-2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Pokemon Sprites\25-3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Pokemon Sprites\25-4.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Pokemon Sprites\25-5.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\Pokemon Sprites\25-6.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/Resources/img/Pokemon Sprites/25-1.png b/Resources/img/Pokemon Sprites/25-1.png new file mode 100644 index 000000000..3543033ba Binary files /dev/null and b/Resources/img/Pokemon Sprites/25-1.png differ diff --git a/Resources/img/Pokemon Sprites/25-2.png b/Resources/img/Pokemon Sprites/25-2.png new file mode 100644 index 000000000..2a0adac50 Binary files /dev/null and b/Resources/img/Pokemon Sprites/25-2.png differ diff --git a/Resources/img/Pokemon Sprites/25-3.png b/Resources/img/Pokemon Sprites/25-3.png new file mode 100644 index 000000000..8369ed620 Binary files /dev/null and b/Resources/img/Pokemon Sprites/25-3.png differ diff --git a/Resources/img/Pokemon Sprites/25-4.png b/Resources/img/Pokemon Sprites/25-4.png new file mode 100644 index 000000000..e009d4885 Binary files /dev/null and b/Resources/img/Pokemon Sprites/25-4.png differ diff --git a/Resources/img/Pokemon Sprites/25-5.png b/Resources/img/Pokemon Sprites/25-5.png new file mode 100644 index 000000000..d59ca16f9 Binary files /dev/null and b/Resources/img/Pokemon Sprites/25-5.png differ diff --git a/Resources/img/Pokemon Sprites/25-6.png b/Resources/img/Pokemon Sprites/25-6.png new file mode 100644 index 000000000..c2d33a910 Binary files /dev/null and b/Resources/img/Pokemon Sprites/25-6.png differ diff --git a/Resources/img/box/box_wp17o.png b/Resources/img/box/box_wp17o.png new file mode 100644 index 000000000..a26fcded8 Binary files /dev/null and b/Resources/img/box/box_wp17o.png differ diff --git a/Resources/img/box/box_wp18o.png b/Resources/img/box/box_wp18o.png new file mode 100644 index 000000000..fbc89a6ae Binary files /dev/null and b/Resources/img/box/box_wp18o.png differ diff --git a/Resources/img/box/box_wp19o.png b/Resources/img/box/box_wp19o.png new file mode 100644 index 000000000..bccd7b53d Binary files /dev/null and b/Resources/img/box/box_wp19o.png differ diff --git a/Resources/img/box/box_wp20o.png b/Resources/img/box/box_wp20o.png new file mode 100644 index 000000000..51dff85be Binary files /dev/null and b/Resources/img/box/box_wp20o.png differ diff --git a/Resources/img/box/box_wp21o.png b/Resources/img/box/box_wp21o.png new file mode 100644 index 000000000..519cbf0b1 Binary files /dev/null and b/Resources/img/box/box_wp21o.png differ diff --git a/Resources/img/box/box_wp22o.png b/Resources/img/box/box_wp22o.png new file mode 100644 index 000000000..0ace7c932 Binary files /dev/null and b/Resources/img/box/box_wp22o.png differ diff --git a/Resources/img/box/box_wp23o.png b/Resources/img/box/box_wp23o.png new file mode 100644 index 000000000..1116b4441 Binary files /dev/null and b/Resources/img/box/box_wp23o.png differ diff --git a/Resources/img/box/box_wp24o.png b/Resources/img/box/box_wp24o.png new file mode 100644 index 000000000..62cb89016 Binary files /dev/null and b/Resources/img/box/box_wp24o.png differ diff --git a/Resources/text/de/text_Forms_de.txt b/Resources/text/de/text_Forms_de.txt index 5636ee61f..337e94303 100644 --- a/Resources/text/de/text_Forms_de.txt +++ b/Resources/text/de/text_Forms_de.txt @@ -199,7 +199,7 @@ -Einform +Ein @@ -349,7 +349,7 @@ Einform -Formeo +eo @@ -384,7 +384,7 @@ Kyogre Groudon -Normalform +Normal @@ -410,8 +410,8 @@ Normalform -Pflanzenumhang -Pflanzenumhang +Pflanzen +Pflanzen @@ -419,9 +419,9 @@ Pflanzenumhang -Wolkenform -Westliches Meer -Westliches Meer +Wolken +Westliches +Westliches @@ -485,12 +485,12 @@ Rotom -Wandelform +Wandel -Landform +Land Arceus @@ -548,12 +548,12 @@ Arceus -Rotlinige Form +Rotlinige -Normalmodus +Normal @@ -583,8 +583,8 @@ Normalmodus -Frühlingsform -Frühlingsform +Frühlings +Frühlings @@ -639,14 +639,14 @@ Frühlingsform -Inkarnationsform -Inkarnationsform +Inkarnations +Inkarnations -Inkarnationsform +Inkarnations Kyurem -Standardform -Gesangsform +Standard +Gesangs Genesect @@ -664,22 +664,22 @@ Genesect -Frostmuster +Frost -Rotblütler -Rotblütler -Rotblütler +Rot +Rot +Rot -Zottelform +Zottel Männlich -Schildform +Schild @@ -708,22 +708,22 @@ Schildform -Größe M -Größe M +M +M -Ruhe-Modus +Ruhe- -Gebanntes Hoopa +Gebanntes -Mega-Bisaflor -Mega-Glurak X -Mega-Glurak Y +Mega +Mega X +Mega Y Mega-Turtok Mega-Bibor Mega-Tauboss @@ -743,33 +743,33 @@ Mega-Aerodactyl Mega-Mewtu X Mega-Mewtu Y Mega-Ampharos -Einform -Einform -Einform -Einform -Einform -Einform -Einform -Einform -Einform -Einform -Einform -Einform -Einform -Einform -Einform -Einform -Einform -Einform -Einform -Einform -Einform -Einform -Einform -Einform -Einform -Einform -Einform +Ein +Ein +Ein +Ein +Ein +Ein +Ein +Ein +Ein +Ein +Ein +Ein +Ein +Ein +Ein +Ein +Ein +Ein +Ein +Ein +Ein +Ein +Ein +Ein +Ein +Ein +Ein Mega-Stahlos Mega-Scherox Mega-Skaraborn @@ -787,9 +787,9 @@ Mega-Voltenso Mega-Tohaido Mega-Camerupt Mega-Altaria -Sonnenform -Regenform -Schneeform +Sonnen +Regen +Schnee Mega-Banette Mega-Absol Mega-Firnontor @@ -797,19 +797,19 @@ Mega-Brutalanda Mega-Metagross Mega-Latias Mega-Latios -Protomorphose -Protomorphose +Proto +Proto Mega-Rayquaza -Angriffsform -Verteidigungsform -Initiativeform -Sandumhang -Lumpenumhang -Sandumhang -Lumpenumhang -Sonnenform -Östliches Meer -Östliches Meer +Angriffs +Verteidigungs +Initiative +Sand +Lumpen +Sand +Lumpen +Sonnen +Östliches +Östliches Mega-Schlapor Mega-Knakrack Mega-Lucario @@ -820,8 +820,8 @@ Wasch-Rotom Frost-Rotom Wirbel-Rotom Schneid-Rotom -Urform -Zenitform +Ur +Zenit Arceus Arceus Arceus @@ -840,74 +840,74 @@ Arceus Arceus Arceus Mega-Ohrdoch -Blaulinige Form -Trance-Modus -Sommerform -Herbstform -Winterform -Sommerform -Herbstform -Winterform -Tiergeistform -Tiergeistform -Tiergeistform -Weißes Kyurem -Schwarzes Kyurem -Resolutform -Tanzform +Blaulinige +Trance +Sommer +Herbst +Winter +Sommer +Herbst +Winter +Tiergeist +Tiergeist +Tiergeist +Weißes +Schwarzes +Resolut +Tanz Genesect Genesect Genesect Genesect -Schneefeldmuster -Flockenmuster -Kontinentalmuster -Ziergartenmuster -Prunkmuster -Blumenmeermuster -Innovationsmuster -Aquamarinmuster -Archipelmuster -Dürremuster -Sandmuster -Flussdeltamuster -Monsunmuster -Savannenmuster -Sonnenmuster -Ozeanmuster -Dschungelmuster -Fantasiemuster -Pokéball-Muster -Gelbblütler -Orangeblütler -Blaublütler -Weißblütler -Gelbblütler -Orangeblütler -Blaublütler -Weißblütler -Ewigblütler -Gelbblütler -Orangeblütler -Blaublütler -Weißblütler -Herzchenschnitt -Sternchenschnitt -Diamantenschnitt -Fräuleinschnitt -Damenschnitt -Kavaliersschnitt -Königinnenschnitt -Kabuki-Schnitt -Herrscherschnitt +Schneefeld +Flocken +Kontinental +Ziergarten +Prunk +Blumenmeer +Innovations +Aquamarin +Archipel +Dürre +Sand +Flussdelta +Monsun +Savannen +Sonnen +Ozean +Dschungel +Fantasie +Pokéball +Gelb +Orange +Blau +Weiß +Gelb +Orange +Blau +Weiß +Ewig +Gelb +Orange +Blau +Weiß +Herzchen +Sternchen +Diamanten +Fräulein +Damen +Kavaliers +Königinnen +Kabuki +Herrscher Weiblich -Klingenform -Größe S -Größe L -Größe XL -Größe S -Größe L -Größe XL -Aktiv-Modus +Klingen +S +L +XL +S +L +XL +Aktiv Mega-Diancie -Entfesseltes Hoopa \ No newline at end of file +Entfesseltes \ No newline at end of file diff --git a/Resources/text/de/text_Items_de.txt b/Resources/text/de/text_Items_de.txt index 0cdc50093..ae260ff0e 100644 --- a/Resources/text/de/text_Items_de.txt +++ b/Resources/text/de/text_Items_de.txt @@ -1,4 +1,4 @@ -Kein Item +Kein Meisterball Hyperball Superball diff --git a/Resources/text/en/lang_en.txt b/Resources/text/en/lang_en.txt index b787ea217..a294b1d0c 100644 --- a/Resources/text/en/lang_en.txt +++ b/Resources/text/en/lang_en.txt @@ -74,7 +74,7 @@ Label_ContestStats = Contest Stats Label_Cool = Cool Label_Beauty = Beauty Label_Cute = Cute -Label_Smart = Smart +Label_Smart = Clever Label_Tough = Tough Label_Sheen = Sheen -------------------Attacks Tab Data--------------------- diff --git a/Resources/text/en/text_Forms_en.txt b/Resources/text/en/text_Forms_en.txt index a5e2e241b..e89339bce 100644 --- a/Resources/text/en/text_Forms_en.txt +++ b/Resources/text/en/text_Forms_en.txt @@ -199,7 +199,7 @@ -One form +One @@ -384,7 +384,7 @@ Kyogre Groudon -Normal Forme +Normal @@ -410,8 +410,8 @@ Normal Forme -Plant Cloak -Plant Cloak +Plant +Plant @@ -419,7 +419,7 @@ Plant Cloak -Overcast Form +Overcast West Sea West Sea @@ -485,12 +485,12 @@ Rotom -Altered Forme +Altered -Land Forme +Land Arceus @@ -548,12 +548,12 @@ Arceus -Red-Striped Form +Red-Striped -Standard Mode +Standard @@ -583,8 +583,8 @@ Standard Mode -Spring Form -Spring Form +Spring +Spring @@ -639,14 +639,14 @@ Spring Form -Incarnate Forme -Incarnate Forme +Incarnate +Incarnate -Incarnate Forme +Incarnate Kyurem -Ordinary Form -Aria Forme +Ordinary +Aria Genesect @@ -664,22 +664,22 @@ Genesect -Icy Snow Pattern +Icy Snow -Red Flower -Red Flower -Red Flower +Red +Red +Red -Natural Form +Natural Male -Shield Forme +Shield @@ -708,31 +708,31 @@ Shield Forme -Average Size -Average Size +Average +Average -Neutral Mode +Neutral -Hoopa Confined +Confined -Mega Venusaur -Mega Charizard X -Mega Charizard Y +Mega +Mega X +Mega Y Mega Blastoise Mega Beedrill Mega Pidgeot -Pikachu Rock Star -Pikachu Belle -Pikachu Pop Star -Pikachu, Ph.D. -Pikachu Libre -Cosplay Pikachu +Rock Star +Belle +Pop Star +Ph.D. +Libre +Cosplay Mega Alakazam Mega Slowbro Mega Gengar @@ -743,33 +743,33 @@ Mega Aerodactyl Mega Mewtwo X Mega Mewtwo Y Mega Ampharos -One form -One form -One form -One form -One form -One form -One form -One form -One form -One form -One form -One form -One form -One form -One form -One form -One form -One form -One form -One form -One form -One form -One form -One form -One form -One form -One form +One +One +One +One +One +One +One +One +One +One +One +One +One +One +One +One +One +One +One +One +One +One +One +One +One +One +One Mega Steelix Mega Scizor Mega Heracross @@ -787,9 +787,9 @@ Mega Manectric Mega Sharpedo Mega Camerupt Mega Altaria -Sunny Form -Rainy Form -Snowy Form +Sunny +Rainy +Snowy Mega Banette Mega Absol Mega Glalie @@ -797,17 +797,17 @@ Mega Salamence Mega Metagross Mega Latias Mega Latios -Primal Reversion -Primal Reversion +Primal +Primal Mega Rayquaza -Attack Forme -Defense Forme -Speed Forme -Sandy Cloak -Trash Cloak -Sandy Cloak -Trash Cloak -Sunshine Form +Attack +Defense +Speed +Sandy +Trash +Sandy +Trash +Sunshine East Sea East Sea Mega Lopunny @@ -820,8 +820,8 @@ Wash Rotom Frost Rotom Fan Rotom Mow Rotom -Origin Forme -Sky Forme +Origin +Sky Arceus Arceus Arceus @@ -840,74 +840,74 @@ Arceus Arceus Arceus Mega Audino -Blue-Striped Form -Zen Mode -Summer Form -Autumn Form -Winter Form -Summer Form -Autumn Form -Winter Form -Therian Forme -Therian Forme -Therian Forme -White Kyurem -Black Kyurem -Resolute Form -Pirouette Forme +Blue-Striped +Zen +Summer +Autumn +Winter +Summer +Autumn +Winter +Therian +Therian +Therian +White +Black +Resolute +Pirouette Genesect Genesect Genesect Genesect -Polar Pattern -Tundra Pattern -Continental Pattern -Garden Pattern -Elegant Pattern -Meadow Pattern -Modern Pattern -Marine Pattern -Archipelago Pattern -High Plains Pattern -Sandstorm Pattern -River Pattern -Monsoon Pattern -Savanna Pattern -Sun Pattern -Ocean Pattern -Jungle Pattern -Fancy Pattern -Poké Ball Pattern -Yellow Flower -Orange Flower -Blue Flower -White Flower -Yellow Flower -Orange Flower -Blue Flower -White Flower -Eternal Flower -Yellow Flower -Orange Flower -Blue Flower -White Flower -Heart Trim -Star Trim -Diamond Trim -Debutante Trim -Matron Trim -Dandy Trim -La Reine Trim -Kabuki Trim -Pharaoh Trim +Polar +Tundra +Continental +Garden +Elegant +Meadow +Modern +Marine +Archipelago +High Plains +Sandstorm +River +Monsoon +Savanna +Sun +Ocean +Jungle +Fancy +Poké Ball +Yellow +Orange +Blue +White +Yellow +Orange +Blue +White +Eternal +Yellow +Orange +Blue +White +Heart +Star +Diamond +Debutante +Matron +Dandy +La Reine +Kabuki +Pharaoh Female -Blade Forme -Small Size -Large Size -Super Size -Small Size -Large Size -Super Size -Active Mode +Blade +Small +Large +Super +Small +Large +Super +Active Mega Diancie -Hoopa Unbound \ No newline at end of file +Unbound \ No newline at end of file diff --git a/Resources/text/es/text_Forms_es.txt b/Resources/text/es/text_Forms_es.txt index 10d7877b9..a6cef80de 100644 --- a/Resources/text/es/text_Forms_es.txt +++ b/Resources/text/es/text_Forms_es.txt @@ -199,7 +199,7 @@ -Una forma +Unaa @@ -349,7 +349,7 @@ Una forma -Forma de Castform +de Castform @@ -384,7 +384,7 @@ Kyogre Groudon -Forma Normal +Normal @@ -410,8 +410,8 @@ Forma Normal -Tronco Planta -Tronco Planta +Planta +Planta @@ -419,7 +419,7 @@ Tronco Planta -Forma Encapotado +Encapotado Mar Oeste Mar Oeste @@ -477,7 +477,7 @@ Mar Oeste -Forma de Rotom +de Rotom @@ -485,13 +485,13 @@ Forma de Rotom -Forma Modificada +Modificada -Forma Tierra -Forma de Arceus +Tierra +de Arceus @@ -548,12 +548,12 @@ Forma de Arceus -Forma Raya Roja +Raya Roja -Modo Normal +Normal @@ -583,8 +583,8 @@ Modo Normal -Forma Primavera -Forma Primavera +Primavera +Primavera @@ -639,15 +639,15 @@ Forma Primavera -Forma Avatar -Forma Avatar +Avatar +Avatar -Forma Avatar -Forma Kyurem -Forma Habitual -Forma Lírica -Forma de Genesect +Avatar +Forma +Habitual +Lírica +de Genesect @@ -664,22 +664,22 @@ Forma de Genesect -Motivo Polar +Polar -Flor Roja -Flor Roja -Flor Roja +Roja +Roja +Roja -Forma Salvaje +Salvaje Macho -Forma Escudo +Escudo @@ -708,31 +708,31 @@ Forma Escudo -Tamaño Normal -Tamaño Normal +Normal +Normal -Modo Relajado +Relajado -Hoopa Contenido +Contenido -Mega-Venusaur -Mega-Charizard X -Mega-Charizard Y +Mega +Mega X +Mega Y Mega-Blastoise Mega-Beedrill Mega-Pidgeot -Pikachu Roquera -Pikachu Aristócrata -Pikachu Superstar -Pikachu Erudita -Pikachu Enmascarada -Pikachu Coqueta +Roquera +Aristócrata +Superstar +Erudita +Enmascarada +Coqueta Mega-Alakazam Mega-Slowbro Mega-Gengar @@ -743,33 +743,33 @@ Mega-Aerodactyl Mega-Mewtwo X Mega-Mewtwo Y Mega-Ampharos -Una forma -Una forma -Una forma -Una forma -Una forma -Una forma -Una forma -Una forma -Una forma -Una forma -Una forma -Una forma -Una forma -Una forma -Una forma -Una forma -Una forma -Una forma -Una forma -Una forma -Una forma -Una forma -Una forma -Una forma -Una forma -Una forma -Una forma +Unaa +Unaa +Unaa +Unaa +Unaa +Unaa +Unaa +Unaa +Unaa +Unaa +Unaa +Unaa +Unaa +Unaa +Unaa +Unaa +Unaa +Unaa +Unaa +Unaa +Unaa +Unaa +Unaa +Unaa +Unaa +Unaa +Unaa Mega-Steelix Mega-Scizor Mega-Heracross @@ -787,9 +787,9 @@ Mega-Manectric Mega-Sharpedo Mega-Camerupt Mega-Altaria -Forma Sol -Forma Lluvia -Forma Nieve +Sol +Lluvia +Nieve Mega-Banette Mega-Absol Mega-Glalie @@ -797,17 +797,17 @@ Mega-Salamence Mega-Metagross Mega-Latias Mega-Latios -Regresión Primigenia -Regresión Primigenia +Primigenia +Primigenia Mega-Rayquaza -Forma Ataque -Forma Defensa -Forma Velocidad -Tronco Arena -Tronco Basura -Tronco Arena -Tronco Basura -Forma Soleado +Ataque +Defensa +Velocidad +Arena +Basura +Arena +Basura +Soleado Mar Este Mar Este Mega-Lopunny @@ -815,99 +815,99 @@ Mega-Garchomp Mega-Lucario Mega-Abomasnow Mega-Gallade -Rotom Calor -Rotom Lavado -Rotom Frío -Rotom Ventilador -Rotom Corte -Forma Origen -Forma Cielo -Forma de Arceus -Forma de Arceus -Forma de Arceus -Forma de Arceus -Forma de Arceus -Forma de Arceus -Forma de Arceus -Forma de Arceus -Forma de Arceus -Forma de Arceus -Forma de Arceus -Forma de Arceus -Forma de Arceus -Forma de Arceus -Forma de Arceus -Forma de Arceus -Forma de Arceus +Calor +Lavado +Frío +Ventilador +Corte +Origen +Cielo +de Arceus +de Arceus +de Arceus +de Arceus +de Arceus +de Arceus +de Arceus +de Arceus +de Arceus +de Arceus +de Arceus +de Arceus +de Arceus +de Arceus +de Arceus +de Arceus +de Arceus Mega-Audino -Forma Raya Azul -Modo Daruma -Forma Verano -Forma Otoño -Forma Invierno -Forma Verano -Forma Otoño -Forma Invierno -Forma Tótem -Forma Tótem -Forma Tótem -Kyurem Blanco -Kyurem Negro -Forma Brío -Forma Danza -Forma de Genesect -Forma de Genesect -Forma de Genesect -Forma de Genesect -Motivo Taiga -Motivo Tundra -Motivo Continental -Motivo Vergel -Motivo Oriental -Motivo Floral -Motivo Moderno -Motivo Marino -Motivo Isleño -Motivo Estepa -Motivo Desierto -Motivo Oasis -Motivo Monzón -Motivo Pantano -Motivo Solar -Motivo Océano -Motivo Jungla -Motivo Fantasía -Motivo Poké Ball -Flor Amarilla -Flor Naranja -Flor Azul -Flor Blanca -Flor Amarilla -Flor Naranja -Flor Azul -Flor Blanca -Flor Eterna -Flor Amarilla -Flor Naranja -Flor Azul -Flor Blanca -Corte Corazón -Corte Estrella -Corte Rombo -Corte Señorita -Corte Dama -Corte Caballero -Corte Aristocrático -Corte Kabuki -Corte Faraónico +Raya Azul +Daruma +Verano +Otoño +Invierno +Verano +Otoño +Invierno +Tótem +Tótem +Tótem +Blanco +Negro +Brío +Danza +de Genesect +de Genesect +de Genesect +de Genesect +Taiga +Tundra +Continental +Vergel +Oriental +Floral +Motivorno +Marino +Isleño +Estepa +Desierto +Oasis +Monzón +Pantano +Solar +Océano +Jungla +Fantasía +Poké Ball +Amarilla +Naranja +Azul +Blanca +Amarilla +Naranja +Azul +Blanca +Eterna +Amarilla +Naranja +Azul +Blanca +Corazón +Estrella +Rombo +Señorita +Dama +Caballero +Aristocrático +Kabuki +Faraónico Hembra -Forma Filo -Tamaño Pequeño -Tamaño Grande -Tamaño Extragrande -Tamaño Pequeño -Tamaño Grande -Tamaño Extragrande -Modo Activo +Filo +Pequeño +Grande +Extragrande +Pequeño +Grande +Extragrande +Activo Mega-Diancie -Hoopa Desatado \ No newline at end of file +Desatado \ No newline at end of file diff --git a/Resources/text/es/text_Items_es.txt b/Resources/text/es/text_Items_es.txt index 6c587892b..61c42489d 100644 --- a/Resources/text/es/text_Items_es.txt +++ b/Resources/text/es/text_Items_es.txt @@ -1,4 +1,4 @@ -Ningún objeto +Ningún Master Ball Ultra Ball Super Ball diff --git a/Resources/text/fr/text_Forms_fr.txt b/Resources/text/fr/text_Forms_fr.txt index 871a44597..3a29e8e4b 100644 --- a/Resources/text/fr/text_Forms_fr.txt +++ b/Resources/text/fr/text_Forms_fr.txt @@ -199,7 +199,7 @@ -Forme Unique +Unique @@ -349,7 +349,7 @@ Forme Unique -Forme de Morphéo +de Morphéo @@ -384,7 +384,7 @@ Kyogre Groudon -Forme Normale +Normale @@ -410,8 +410,8 @@ Forme Normale -Cape Plante -Cape Plante +Plante +Plante @@ -419,7 +419,7 @@ Cape Plante -Temps Couvert +Couvert Mer Occident Mer Occident @@ -477,7 +477,7 @@ Mer Occident -Forme de Motisma +de Motisma @@ -485,13 +485,13 @@ Forme de Motisma -Forme Alternative +Alternative -Forme Terrestre -Forme de Arceus +Terrestre +de Arceus @@ -548,7 +548,7 @@ Forme de Arceus -Motif Rouge +Rouge @@ -583,8 +583,8 @@ Mode Normal -Forme Printemps -Forme Printemps +Printemps +Printemps @@ -639,15 +639,15 @@ Forme Printemps -Forme Avatar -Forme Avatar +Avatar +Avatar -Forme Avatar -Forme de Kyurem +Avatar +de Aspect Normal -Forme Chant -Forme de Genesect +Chant +de Genesect @@ -664,22 +664,22 @@ Forme de Genesect -Motif Blizzard +Blizzard -Fleur Rouge -Fleur Rouge -Fleur Rouge +Rouge +Rouge +Rouge -Forme Sauvage +Sauvage Mâle -Forme Parade +Parade @@ -708,31 +708,31 @@ Forme Parade -Taille Normale -Taille Normale +Normale +Normale -Mode Paisible +Paisible -Hoopa Enchaîné +Enchaîné -Méga-Florizarre -Méga-Dracaufeu X -Méga-Dracaufeu Y +Méga +Méga X +Méga Y Méga-Tortank Méga-Dardargnan Méga-Roucarnage -Pikachu Rockeur -Pikachu Lady -Pikachu Star -Pikachu Docteur -Pikachu Catcheur -Pikachu Cosplayeur +Rockeur +Lady +Star +Docteur +Catcheur +Cosplayeur Méga-Alakazam Méga-Flagadoss Méga-Ectoplasma @@ -743,33 +743,33 @@ Méga-Ptéra Méga-Mewtwo X Méga-Mewtwo Y Méga-Pharamp -Forme Unique -Forme Unique -Forme Unique -Forme Unique -Forme Unique -Forme Unique -Forme Unique -Forme Unique -Forme Unique -Forme Unique -Forme Unique -Forme Unique -Forme Unique -Forme Unique -Forme Unique -Forme Unique -Forme Unique -Forme Unique -Forme Unique -Forme Unique -Forme Unique -Forme Unique -Forme Unique -Forme Unique -Forme Unique -Forme Unique -Forme Unique +Unique +Unique +Unique +Unique +Unique +Unique +Unique +Unique +Unique +Unique +Unique +Unique +Unique +Unique +Unique +Unique +Unique +Unique +Unique +Unique +Unique +Unique +Unique +Unique +Unique +Unique +Unique Méga-Steelix Méga-Cizayox Méga-Scarhino @@ -787,9 +787,9 @@ Méga-Élecsprint Méga-Sharpedo Méga-Camérupt Méga-Altaria -Forme Solaire -Forme Eau de Pluie -Forme Blizzard +Solaire +Eau de Pluie +Blizzard Méga-Branette Méga-Absol Méga-Oniglali @@ -800,14 +800,14 @@ Méga-Latios Primo-Résurgence Primo-Résurgence Méga-Rayquaza -Forme Attaque -Forme Défense -Forme Vitesse -Cape Sable -Cape Déchet -Cape Sable -Cape Déchet -Temps Ensoleillé +Attaque +Défense +Vitesse +Sable +Déchet +Sable +Déchet +Ensoleillé Mer Orient Mer Orient Méga-Lockpin @@ -815,99 +815,99 @@ Méga-Carchacrok Méga-Lucario Méga-Blizzaroi Méga-Gallame -Motisma Chaleur -Motisma Lavage -Motisma Froid -Motisma Hélice -Motisma Tonte -Forme Originelle -Forme Céleste -Forme de Arceus -Forme de Arceus -Forme de Arceus -Forme de Arceus -Forme de Arceus -Forme de Arceus -Forme de Arceus -Forme de Arceus -Forme de Arceus -Forme de Arceus -Forme de Arceus -Forme de Arceus -Forme de Arceus -Forme de Arceus -Forme de Arceus -Forme de Arceus -Forme de Arceus +Chaleur +Lavage +Froid +Hélice +Tonte +Originelle +Céleste +de Arceus +de Arceus +de Arceus +de Arceus +de Arceus +de Arceus +de Arceus +de Arceus +de Arceus +de Arceus +de Arceus +de Arceus +de Arceus +de Arceus +de Arceus +de Arceus +de Arceus Méga-Nanméouïe -Motif Bleu +Bleu Mode Transe -Forme Été -Forme Automne -Forme Hiver -Forme Été -Forme Automne -Forme Hiver -Forme Totémique -Forme Totémique -Forme Totémique +Été +Automne +Hiver +Été +Automne +Hiver +Totémique +Totémique +Totémique Kyurem Blanc Kyurem Noir Aspect Décidé -Forme Danse -Forme de Genesect -Forme de Genesect -Forme de Genesect -Forme de Genesect -Motif Banquise -Motif Glace -Motif Continent -Motif Verdure -Motif Monarchie -Motif Floraison -Motif Métropole -Motif Rivage -Motif Archipel -Motif Sécheresse -Motif Sable -Motif Delta -Motif Cyclone -Motif Mangrove -Motif Zénith -Motif Soleil Levant -Motif Jungle -Motif Fantaisie -Motif Poké Ball -Fleur Jaune -Fleur Orange -Fleur Bleue -Fleur Blanche -Fleur Jaune -Fleur Orange -Fleur Bleue -Fleur Blanche +Danse +de Genesect +de Genesect +de Genesect +de Genesect +Banquise +Glace +Continent +Verdure +Monarchie +Floraison +Métropole +Rivage +Archipel +Sécheresse +Sable +Delta +Cyclone +Mangrove +Zénith +Soleil Levant +Jungle +Fantaisie +Poké Ball +Jaune +Orange +Bleue +Blanche +Jaune +Orange +Bleue +Blanche Éternelle -Fleur Jaune -Fleur Orange -Fleur Bleue -Fleur Blanche -Coupe Cœur -Coupe Étoile -Coupe Diamant -Coupe Demoiselle -Coupe Madame -Coupe Monsieur -Coupe Reine -Coupe Kabuki -Coupe Pharaon +Jaune +Orange +Bleue +Blanche +Cœur +Étoile +Diamant +Demoiselle +Madame +Monsieur +Reine +Kabuki +Pharaon Femelle -Forme Assaut -Taille Mini -Taille Maxi -Taille Ultra -Taille Mini -Taille Maxi -Taille Ultra -Mode Déchaîné +Assaut +Mini +Maxi +Ultra +Mini +Maxi +Ultra +Déchaîné Méga-Diancie -Hoopa Déchaîné \ No newline at end of file +Déchaîné \ No newline at end of file diff --git a/Resources/text/fr/text_Items_fr.txt b/Resources/text/fr/text_Items_fr.txt index 996b05d20..8c5ee8755 100644 --- a/Resources/text/fr/text_Items_fr.txt +++ b/Resources/text/fr/text_Items_fr.txt @@ -1,4 +1,4 @@ -Aucun objet +Aucun Master Ball Hyper Ball Super Ball diff --git a/SAV/SAV_BoxLayout.cs b/SAV/SAV_BoxLayout.cs index 74dd80d0b..03ffcd554 100644 --- a/SAV/SAV_BoxLayout.cs +++ b/SAV/SAV_BoxLayout.cs @@ -93,7 +93,9 @@ private void B_Save_Click(object sender, EventArgs e) private void changeBoxBG(object sender, EventArgs e) { sav[(0x7F000 * savindex) + 0x9C1E + LB_BoxSelect.SelectedIndex] = (byte)CB_BG.SelectedIndex; - PAN_BG.BackgroundImage = (Image)Properties.Resources.ResourceManager.GetObject("box_wp" + (CB_BG.SelectedIndex+1).ToString("00")); + + string imagename = "box_wp" + (CB_BG.SelectedIndex + 1).ToString("00"); if (m_parent.savegame_oras && (CB_BG.SelectedIndex + 1) > 16) imagename += "o"; + PAN_BG.BackgroundImage = (Image)Properties.Resources.ResourceManager.GetObject(imagename); } } } \ No newline at end of file diff --git a/SAV/SAV_Trainer.Designer.cs b/SAV/SAV_Trainer.Designer.cs index 1e497dda4..e4e51e398 100644 --- a/SAV/SAV_Trainer.Designer.cs +++ b/SAV/SAV_Trainer.Designer.cs @@ -132,6 +132,7 @@ private void InitializeComponent() this.label19 = new System.Windows.Forms.Label(); this.label20 = new System.Windows.Forms.Label(); this.GB_Appear = new System.Windows.Forms.GroupBox(); + this.label35 = new System.Windows.Forms.Label(); this.MT_1403F = new System.Windows.Forms.MaskedTextBox(); this.MT_1403E = new System.Windows.Forms.MaskedTextBox(); this.MT_1403D = new System.Windows.Forms.MaskedTextBox(); @@ -188,7 +189,6 @@ private void InitializeComponent() this.CB_Stats = new System.Windows.Forms.ComboBox(); this.label39 = new System.Windows.Forms.Label(); this.MT_Stat = new System.Windows.Forms.MaskedTextBox(); - this.label35 = new System.Windows.Forms.Label(); this.GB_Badges.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pb8)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pb6)).BeginInit(); @@ -833,10 +833,12 @@ private void InitializeComponent() this.CB_Game.FormattingEnabled = true; this.CB_Game.Items.AddRange(new object[] { "X", - "Y"}); - this.CB_Game.Location = new System.Drawing.Point(157, 62); + "Y", + "AS", + "OR"}); + this.CB_Game.Location = new System.Drawing.Point(141, 62); this.CB_Game.Name = "CB_Game"; - this.CB_Game.Size = new System.Drawing.Size(35, 21); + this.CB_Game.Size = new System.Drawing.Size(51, 21); this.CB_Game.TabIndex = 24; // // CB_Gender @@ -844,11 +846,11 @@ private void InitializeComponent() this.CB_Gender.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.CB_Gender.FormattingEnabled = true; this.CB_Gender.Items.AddRange(new object[] { - "Male", - "Female"}); + "♂", + "♀"}); this.CB_Gender.Location = new System.Drawing.Point(99, 62); this.CB_Gender.Name = "CB_Gender"; - this.CB_Gender.Size = new System.Drawing.Size(57, 21); + this.CB_Gender.Size = new System.Drawing.Size(40, 21); this.CB_Gender.TabIndex = 22; // // TB_Style @@ -1316,6 +1318,15 @@ private void InitializeComponent() this.GB_Appear.TabStop = false; this.GB_Appear.Text = "Current Appearance (X/Y)"; // + // label35 + // + this.label35.AutoSize = true; + this.label35.Location = new System.Drawing.Point(116, 244); + this.label35.Name = "label35"; + this.label35.Size = new System.Drawing.Size(55, 13); + this.label35.TabIndex = 72; + this.label35.Text = "Outfit Vals"; + // // MT_1403F // this.MT_1403F.Location = new System.Drawing.Point(90, 242); @@ -1887,15 +1898,6 @@ private void InitializeComponent() this.MT_Stat.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; this.MT_Stat.TextChanged += new System.EventHandler(this.changeStatVal); // - // label35 - // - this.label35.AutoSize = true; - this.label35.Location = new System.Drawing.Point(116, 244); - this.label35.Name = "label35"; - this.label35.Size = new System.Drawing.Size(55, 13); - this.label35.TabIndex = 72; - this.label35.Text = "Outfit Vals"; - // // SAV_Trainer // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); diff --git a/SAV/SAV_Trainer.cs b/SAV/SAV_Trainer.cs index 09a257d38..500292af2 100644 --- a/SAV/SAV_Trainer.cs +++ b/SAV/SAV_Trainer.cs @@ -12,6 +12,9 @@ namespace PKHeX { public partial class SAV_Trainer : Form { + private int TrainerCard = 0x19400; + private int Trainer1 = 0x6800; + private int Trainer2 = 0x9600; public SAV_Trainer(Form1 frm1, string gamename) { Game = gamename; @@ -355,13 +358,9 @@ private void getBadges() for (int i = 0; i < 8; i++) { if (!cba[i].Checked) - { pba[i].Image = Util.ChangeOpacity(bma[i], 0.1); - } else - { pba[i].Image = Util.ChangeOpacity(bma[i], 1); - } } } private void getTextBoxes() @@ -372,26 +371,26 @@ private void getTextBoxes() cba[i].Checked = !((badgeval & (1 << i)) == 0); // Get Data - string OT_NAME = Encoding.Unicode.GetString(sav, 0x19448 + savshift, 0x1A); + string OT_NAME = Encoding.Unicode.GetString(sav, TrainerCard + 0x48 + savshift, 0x1A); string RIV_NAME = Encoding.Unicode.GetString(sav, 0x9610 + savshift, 0x1A); - CB_Game.SelectedIndex = sav[0x19404 + savshift]-0x18; - CB_Gender.SelectedIndex = sav[0x19405 + savshift]; + CB_Game.SelectedIndex = sav[TrainerCard + 0x04 + savshift]-0x18; + CB_Gender.SelectedIndex = sav[TrainerCard + 0x05 + savshift]; - int TID = BitConverter.ToUInt16(sav, 0x19400 + savshift); - int SID = BitConverter.ToUInt16(sav, 0x19402 + savshift); - uint money = BitConverter.ToUInt32(sav, 0x9608 + savshift); + int TID = BitConverter.ToUInt16(sav, TrainerCard + 0x0 + savshift); + int SID = BitConverter.ToUInt16(sav, TrainerCard + 0x2 + savshift); + uint money = BitConverter.ToUInt32(sav, Trainer2 + 0x8 + savshift); - string saying1 = Encoding.Unicode.GetString(sav, 0x1947C + savshift, 0x20); - string saying2 = Encoding.Unicode.GetString(sav, 0x1949E + savshift, 0x20); - string saying3 = Encoding.Unicode.GetString(sav, 0x194C0 + savshift, 0x20); - string saying4 = Encoding.Unicode.GetString(sav, 0x194E2 + savshift, 0x20); - string saying5 = Encoding.Unicode.GetString(sav, 0x19504 + savshift, 0x20); + string saying1 = Encoding.Unicode.GetString(sav, TrainerCard + 0x7C + savshift, 0x20); + string saying2 = Encoding.Unicode.GetString(sav, TrainerCard + 0x9E + savshift, 0x20); + string saying3 = Encoding.Unicode.GetString(sav, TrainerCard + 0xC0 + savshift, 0x20); + string saying4 = Encoding.Unicode.GetString(sav, TrainerCard + 0xE2 + savshift, 0x20); + string saying5 = Encoding.Unicode.GetString(sav, TrainerCard + 0x104 + savshift, 0x20); - int _region = sav[0x19426 + savshift]; - int _country = sav[0x19427 + savshift]; - int _3dsreg = sav[0x1942C + savshift]; - int _language = sav[0x1942D + savshift]; + int _region = sav[TrainerCard + 0x26 + savshift]; + int _country = sav[TrainerCard + 0x27 + savshift]; + int _3dsreg = sav[TrainerCard + 0x2C + savshift]; + int _language = sav[TrainerCard + 0x2D + savshift]; // Display Data TB_OTName.Text = OT_NAME; @@ -444,14 +443,18 @@ private void getTextBoxes() TB_MBMN.Text = BitConverter.ToUInt16(sav, savshift + 0x205C0 + 2 * 18).ToString(); TB_MBMS.Text = BitConverter.ToUInt16(sav, savshift + 0x205C0 + 2 * 19).ToString(); - TB_CoordM.Text = BitConverter.ToUInt16(sav, savshift + 0x6802).ToString(); - TB_CoordX.Text = BitConverter.ToSingle(sav, savshift + 0x6810).ToString(); - TB_CoordZ.Text = BitConverter.ToSingle(sav, savshift + 0x6814).ToString(); - TB_CoordY.Text = BitConverter.ToSingle(sav, savshift + 0x6818).ToString(); + TB_CoordM.Text = BitConverter.ToUInt16(sav, savshift + Trainer1 + 0x02).ToString(); + TB_CoordX.Text = BitConverter.ToSingle(sav, savshift + Trainer1 + 0x10).ToString(); + TB_CoordZ.Text = BitConverter.ToSingle(sav, savshift + Trainer1 + 0x14).ToString(); + TB_CoordY.Text = BitConverter.ToSingle(sav, savshift + Trainer1 + 0x18).ToString(); // Load BP and PokeMiles - TB_BP.Text = BitConverter.ToUInt32(sav, savshift + 0x963C).ToString(); + TB_BP.Text = BitConverter.ToUInt32(sav, savshift + Trainer2 + 0x3C).ToString(); TB_PM.Text = BitConverter.ToUInt32(sav, savshift + 0x238FC).ToString(); + + // Temp ORAS + TB_PM.Enabled = GB_MaisonBest.Enabled = GB_MaisonCurrent.Enabled = GB_Appear.Enabled = + GB_Map.Enabled = GB_Misc.Enabled = TB_BP.Enabled = !m_parent.savegame_oras; TB_Style.Text = sav[0x694D + savshift].ToString(); @@ -461,39 +464,39 @@ private void getTextBoxes() MT_Seconds.Text = sav[0x6C03 + savshift].ToString(); // Load PSS Sprite - int sprite = sav[0x19407]; + int sprite = sav[TrainerCard + 0x07]; MT_Sprite.Text = sprite.ToString(); // Load Clothing Data - int hat = sav[0x19431 + savshift] >> 3; - int haircolor = sav[0x19431 + savshift] & 7; + int hat = sav[TrainerCard + 0x31 + savshift] >> 3; + int haircolor = sav[TrainerCard + 0x31 + savshift] & 7; MT_Hat.Text = hat.ToString(); MT_HairColor.Text = haircolor.ToString(); - MT_14030.Text = sav[0x19430 + savshift].ToString(); - MT_14031.Text = sav[0x19431 + savshift].ToString(); - MT_14032.Text = sav[0x19432 + savshift].ToString(); - MT_14033.Text = sav[0x19433 + savshift].ToString(); - MT_14034.Text = sav[0x19434 + savshift].ToString(); - MT_14035.Text = sav[0x19435 + savshift].ToString(); - MT_14036.Text = sav[0x19436 + savshift].ToString(); - MT_14037.Text = sav[0x19437 + savshift].ToString(); - MT_14038.Text = sav[0x19438 + savshift].ToString(); - MT_14039.Text = sav[0x19439 + savshift].ToString(); - MT_1403A.Text = sav[0x1943A + savshift].ToString(); - MT_1403B.Text = sav[0x1943B + savshift].ToString(); - MT_1403C.Text = sav[0x1943C + savshift].ToString(); - MT_1403D.Text = sav[0x1943D + savshift].ToString(); - MT_1403E.Text = sav[0x1943E + savshift].ToString(); - MT_1403F.Text = sav[0x1943F + savshift].ToString(); + MT_14030.Text = sav[TrainerCard + 0x30 + savshift].ToString(); + MT_14031.Text = sav[TrainerCard + 0x31 + savshift].ToString(); + MT_14032.Text = sav[TrainerCard + 0x32 + savshift].ToString(); + MT_14033.Text = sav[TrainerCard + 0x33 + savshift].ToString(); + MT_14034.Text = sav[TrainerCard + 0x34 + savshift].ToString(); + MT_14035.Text = sav[TrainerCard + 0x35 + savshift].ToString(); + MT_14036.Text = sav[TrainerCard + 0x36 + savshift].ToString(); + MT_14037.Text = sav[TrainerCard + 0x37 + savshift].ToString(); + MT_14038.Text = sav[TrainerCard + 0x38 + savshift].ToString(); + MT_14039.Text = sav[TrainerCard + 0x39 + savshift].ToString(); + MT_1403A.Text = sav[TrainerCard + 0x3A + savshift].ToString(); + MT_1403B.Text = sav[TrainerCard + 0x3B + savshift].ToString(); + MT_1403C.Text = sav[TrainerCard + 0x3C + savshift].ToString(); + MT_1403D.Text = sav[TrainerCard + 0x3D + savshift].ToString(); + MT_1403E.Text = sav[TrainerCard + 0x3E + savshift].ToString(); + MT_1403F.Text = sav[TrainerCard + 0x3F + savshift].ToString(); } private void save() { string OT_Name = TB_OTName.Text; //string RIV_Name = TB_Rival.Text; - sav[0x19404 + savshift] = (byte)(CB_Game.SelectedIndex + 0x18); - sav[0x19405 + savshift] = (byte)CB_Gender.SelectedIndex; + sav[TrainerCard + 0x04 + savshift] = (byte)(CB_Game.SelectedIndex + 0x18); + sav[TrainerCard + 0x05 + savshift] = (byte)CB_Gender.SelectedIndex; uint TID = ToUInt32(MT_TID.Text); uint SID = ToUInt32(MT_SID.Text); @@ -510,36 +513,36 @@ private void save() uint _3dsreg = ToUInt32(CB_3DSReg.SelectedValue.ToString()); uint _language = ToUInt32(CB_Language.SelectedValue.ToString()); - Array.Copy(BitConverter.GetBytes(TID), 0, sav, 0x19400 + savshift, 2); - Array.Copy(BitConverter.GetBytes(SID), 0, sav, 0x19402 + savshift, 2); - Array.Copy(BitConverter.GetBytes(money), 0, sav, 0x9608 + savshift, 4); - Array.Copy(BitConverter.GetBytes(_region), 0, sav, 0x19426 + savshift, 1); - Array.Copy(BitConverter.GetBytes(_country), 0, sav, 0x19427 + savshift, 1); - Array.Copy(BitConverter.GetBytes(_3dsreg), 0, sav, 0x1942C + savshift, 1); - Array.Copy(BitConverter.GetBytes(_language), 0, sav, 0x1942D + savshift, 1); + Array.Copy(BitConverter.GetBytes(TID), 0, sav, TrainerCard + 0x0 + savshift, 2); + Array.Copy(BitConverter.GetBytes(SID), 0, sav, TrainerCard + 0x2 + savshift, 2); + Array.Copy(BitConverter.GetBytes(money), 0, sav, Trainer2 + 0x8 + savshift, 4); + Array.Copy(BitConverter.GetBytes(_region), 0, sav, TrainerCard + 0x26 + savshift, 1); + Array.Copy(BitConverter.GetBytes(_country), 0, sav, TrainerCard + 0x27 + savshift, 1); + Array.Copy(BitConverter.GetBytes(_3dsreg), 0, sav, TrainerCard + 0x2C + savshift, 1); + Array.Copy(BitConverter.GetBytes(_language), 0, sav, TrainerCard + 0x2D + savshift, 1); byte[] OT = Encoding.Unicode.GetBytes(OT_Name); Array.Resize(ref OT, 0x1A); - Array.Copy(OT, 0, sav, 0x19448 + savshift, 0x1A); + Array.Copy(OT, 0, sav, TrainerCard + 0x48 + savshift, 0x1A); //byte[] Rival = Encoding.Unicode.GetBytes(RIV_Name); //Array.Resize(ref Rival, 0x1A); //Array.Copy(Rival, 0, sav, 0x9610 + savshift, 0x1A); byte[] s1 = Encoding.Unicode.GetBytes(saying1); Array.Resize(ref s1, 0x22); - Array.Copy(s1, 0, sav, 0x1947C + savshift, 0x22); + Array.Copy(s1, 0, sav, TrainerCard + 0x7C + savshift, 0x22); byte[] s2 = Encoding.Unicode.GetBytes(saying2); Array.Resize(ref s2, 0x22); - Array.Copy(s2, 0, sav, 0x1949E + savshift, 0x22); + Array.Copy(s2, 0, sav, TrainerCard + 0x9E + savshift, 0x22); byte[] s3 = Encoding.Unicode.GetBytes(saying3); Array.Resize(ref s3, 0x22); - Array.Copy(s3, 0, sav, 0x194C0 + savshift, 0x22); + Array.Copy(s3, 0, sav, TrainerCard + 0xC0 + savshift, 0x22); byte[] s4 = Encoding.Unicode.GetBytes(saying4); Array.Resize(ref s4, 0x22); - Array.Copy(s4, 0, sav, 0x194E2 + savshift, 0x22); + Array.Copy(s4, 0, sav, TrainerCard + 0xE2 + savshift, 0x22); byte[] s5 = Encoding.Unicode.GetBytes(saying5); Array.Resize(ref s5, 0x22); - Array.Copy(s5, 0, sav, 0x19504 + savshift, 0x22); + Array.Copy(s5, 0, sav, TrainerCard + 0x104 + savshift, 0x22); // New stuff. // Copy Maison Data in @@ -558,10 +561,10 @@ private void save() } // Copy Position - byte[] m = BitConverter.GetBytes( Int16.Parse(TB_CoordM.Text)); Array.Resize(ref m, 2); Array.Copy(m,0,sav, savshift + 0x6802,2); - byte[] x = BitConverter.GetBytes(Single.Parse(TB_CoordX.Text)); Array.Resize(ref x, 4); Array.Copy(x,0,sav, savshift + 0x6810,4); - byte[] z = BitConverter.GetBytes(Single.Parse(TB_CoordZ.Text)); Array.Resize(ref z, 4); Array.Copy(z,0,sav, savshift + 0x6814,4); - byte[] y = BitConverter.GetBytes(Single.Parse(TB_CoordY.Text)); Array.Resize(ref y, 4); Array.Copy(y,0,sav, savshift + 0x6818,4); + byte[] m = BitConverter.GetBytes( Int16.Parse(TB_CoordM.Text)); Array.Resize(ref m, 2); Array.Copy(m,0,sav, savshift + Trainer1 + 0x02,2); + byte[] x = BitConverter.GetBytes(Single.Parse(TB_CoordX.Text)); Array.Resize(ref x, 4); Array.Copy(x,0,sav, savshift + Trainer1 + 0x10,4); + byte[] z = BitConverter.GetBytes(Single.Parse(TB_CoordZ.Text)); Array.Resize(ref z, 4); Array.Copy(z,0,sav, savshift + Trainer1 + 0x14,4); + byte[] y = BitConverter.GetBytes(Single.Parse(TB_CoordY.Text)); Array.Resize(ref y, 4); Array.Copy(y,0,sav, savshift + Trainer1 + 0x18,4); byte[] bp = BitConverter.GetBytes(ToUInt32(TB_BP.Text)); Array.Resize(ref bp, 2); Array.Copy(bp, 0, sav, savshift + 0x963C, 2); byte[] pm = BitConverter.GetBytes(ToUInt32(TB_PM.Text)); Array.Resize(ref pm, 4); Array.Copy(pm, 0, sav, savshift + 0x238FC, 4); Array.Copy(pm, 0, sav, savshift + 0x23900, 4); @@ -582,26 +585,26 @@ private void save() sav[0x6C03 + savshift] = (byte)(UInt16.Parse(MT_Seconds.Text) % 60); // Sprite - sav[0x19407] = Byte.Parse(MT_Sprite.Text); + sav[TrainerCard + 0x07] = Byte.Parse(MT_Sprite.Text); - sav[0x19431] = (byte)(Byte.Parse(MT_HairColor.Text) + (Byte.Parse(MT_Hat.Text) << 3)); + sav[TrainerCard + 0x31] = (byte)(Byte.Parse(MT_HairColor.Text) + (Byte.Parse(MT_Hat.Text) << 3)); - sav[0x19430 + savshift] = Byte.Parse(MT_14030.Text); - //sav[0x19431 + savshift] = Byte.Parse(MT_14031.Text); - sav[0x19432 + savshift] = Byte.Parse(MT_14032.Text); - sav[0x19433 + savshift] = Byte.Parse(MT_14033.Text); - sav[0x19434 + savshift] = Byte.Parse(MT_14034.Text); - sav[0x19435 + savshift] = Byte.Parse(MT_14035.Text); - sav[0x19436 + savshift] = Byte.Parse(MT_14036.Text); - sav[0x19437 + savshift] = Byte.Parse(MT_14037.Text); - sav[0x19438 + savshift] = Byte.Parse(MT_14038.Text); - sav[0x19439 + savshift] = Byte.Parse(MT_14039.Text); - sav[0x1943A + savshift] = Byte.Parse(MT_1403A.Text); - sav[0x1943B + savshift] = Byte.Parse(MT_1403B.Text); - sav[0x1943C + savshift] = Byte.Parse(MT_1403C.Text); - sav[0x1943D + savshift] = Byte.Parse(MT_1403D.Text); - sav[0x1943E + savshift] = Byte.Parse(MT_1403E.Text); - sav[0x1943F + savshift] = Byte.Parse(MT_1403F.Text); + sav[TrainerCard + 0x30 + savshift] = Byte.Parse(MT_14030.Text); + //sav[TrainerCard + 0x31 + savshift] = Byte.Parse(MT_14031.Text); + sav[TrainerCard + 0x32 + savshift] = Byte.Parse(MT_14032.Text); + sav[TrainerCard + 0x33 + savshift] = Byte.Parse(MT_14033.Text); + sav[TrainerCard + 0x34 + savshift] = Byte.Parse(MT_14034.Text); + sav[TrainerCard + 0x35 + savshift] = Byte.Parse(MT_14035.Text); + sav[TrainerCard + 0x36 + savshift] = Byte.Parse(MT_14036.Text); + sav[TrainerCard + 0x37 + savshift] = Byte.Parse(MT_14037.Text); + sav[TrainerCard + 0x38 + savshift] = Byte.Parse(MT_14038.Text); + sav[TrainerCard + 0x39 + savshift] = Byte.Parse(MT_14039.Text); + sav[TrainerCard + 0x3A + savshift] = Byte.Parse(MT_1403A.Text); + sav[TrainerCard + 0x3B + savshift] = Byte.Parse(MT_1403B.Text); + sav[TrainerCard + 0x3C + savshift] = Byte.Parse(MT_1403C.Text); + sav[TrainerCard + 0x3D + savshift] = Byte.Parse(MT_1403D.Text); + sav[TrainerCard + 0x3E + savshift] = Byte.Parse(MT_1403E.Text); + sav[TrainerCard + 0x3F + savshift] = Byte.Parse(MT_1403F.Text); } private void showTSV(object sender, EventArgs e)