diff --git a/PKHeX.csproj b/PKHeX.csproj index 526738928..32c9d22c8 100644 --- a/PKHeX.csproj +++ b/PKHeX.csproj @@ -310,6 +310,14 @@ + + + + + + + + diff --git a/PKX/f1-Main.cs b/PKX/f1-Main.cs index 20922535b..c3180332c 100644 --- a/PKX/f1-Main.cs +++ b/PKX/f1-Main.cs @@ -3713,7 +3713,9 @@ private void openQuick(string path) else { - byte[] input = File.ReadAllBytes(path); + + byte[] input; try { input = File.ReadAllBytes(path); } + catch { MessageBox.Show("File is in use!\n\n"+path,"Error"); return; } try { openFile(input, path, ext); } catch @@ -3936,9 +3938,9 @@ private void openSave(bool oras) // temp ORAS save-editing disable // GB_SAVtools.Enabled = !oras; - B_OpenBerryField.Enabled = B_JPEG.Enabled = - B_OpenOPowers.Enabled = B_OpenPokedex.Enabled = B_OpenSuperTraining.Enabled = - B_OUTHallofFame.Enabled = B_OUTPasserby.Enabled = (!oras); + GB_SUBE.Visible = + B_OpenOPowers.Enabled = B_OpenPokedex.Enabled = + B_OpenBerryField.Enabled = !oras; //B_OpenTrainerInfo.Enabled = B_OpenPokepuffs.Enabled = B_OpenBoxLayout.Enabled = this.Width = largeWidth; @@ -4416,6 +4418,8 @@ private void B_VerifyCHK_Click(object sender, EventArgs e) } RTB_S.Text += "1st SAV: " + (start.Length - invalid1).ToString() + "/" + start.Length.ToString() + "\r\n"; + if (cybergadget) return; + // Do it again, but for the second SAV. csoff += 0x7F000; @@ -5066,6 +5070,28 @@ private void rcmSet_Click(object sender, EventArgs e) byte[] pkxdata = preparepkx(buff); byte[] ekxdata = PKX.encryptArray(pkxdata); + if (!savegame_oras) + { + // User Protection + int move1 = BitConverter.ToInt16(pkxdata,0x5A); + int move2 = BitConverter.ToInt16(pkxdata,0x5C); + int move3 = BitConverter.ToInt16(pkxdata,0x5E); + int move4 = BitConverter.ToInt16(pkxdata,0x60); + int ability = pkxdata[0x14]; + int item = BitConverter.ToInt16(pkxdata,0x0A); + DialogResult dr = new DialogResult(); + + if (move1 > 617 || move2 > 617 || move3 > 617 || move4 > 617) + dr = MessageBox.Show("Move does not exist in X/Y.\n\nContinue?", "Alert", MessageBoxButtons.YesNo); + else if (ability > 188) + dr = MessageBox.Show("Ability does not exist in X/Y.\n\nContinue?", "Alert", MessageBoxButtons.YesNo); + else if (item > 717) + dr = MessageBox.Show("Item does not exist in X/Y.\n\nContinue?", "Alert", MessageBoxButtons.YesNo); + else goto next; + if (dr != DialogResult.Yes) + return; + } + next: if (slot >= 30 && slot < 36) // Party Array.Copy(ekxdata, 0, savefile, offset, 0x104); else if (slot < 30 || (slot >= 36 && slot < 42 && DEV_Ability.Enabled)) @@ -5103,6 +5129,7 @@ private void rcmDelete_Click(object sender, EventArgs e) } private void setPokedex(byte[] pkxdata) { + if (savegame_oras) return; if (savindex > 1) return; int species = BitConverter.ToUInt16(pkxdata, 0x8); // Species int lang = pkxdata[0xE3] - 1; if (lang > 5) lang--; // 0-6 language vals @@ -5218,25 +5245,12 @@ private int getSlot(object sender) { Control sourceControl = null; // Try to cast the sender to a ToolStripItem - try - { - ToolStripItem menuItem = sender as ToolStripItem; - ContextMenuStrip owner = menuItem.Owner as ContextMenuStrip; - sourceControl = owner.SourceControl; - } - catch - { - // try to cast as picturebox - try - { - PictureBox pbItem = sender as PictureBox; - sourceControl = pbItem as Control; - } - catch - { - MessageBox.Show("Invalid slot!", "Error"); - return 0; - } + try { ToolStripItem menuItem = sender as ToolStripItem; ContextMenuStrip owner = menuItem.Owner as ContextMenuStrip; sourceControl = owner.SourceControl; } + catch + { // try to cast as picturebox + try { PictureBox pbItem = sender as PictureBox; sourceControl = pbItem as Control; } + catch + { MessageBox.Show("Invalid slot!", "Error"); return 0; } } string[] pba = { @@ -5535,9 +5549,7 @@ private void Menu_DumpLoadBoxes_Click(object sender, EventArgs e) // open folder dialog FolderBrowserDialog fbd = new FolderBrowserDialog(); if (fbd.ShowDialog() == DialogResult.OK) - { path = fbd.SelectedPath; - } } else return; } @@ -5546,9 +5558,7 @@ private void Menu_DumpLoadBoxes_Click(object sender, EventArgs e) // open folder dialog FolderBrowserDialog fbd = new FolderBrowserDialog(); if (fbd.ShowDialog() == DialogResult.OK) - { path = fbd.SelectedPath; - } } loadBoxesFromDB(path); } @@ -5561,18 +5571,14 @@ private void Menu_DumpLoadBoxes_Click(object sender, EventArgs e) { path = exepath + "\\db"; if (!Directory.Exists(path)) - { - DirectoryInfo di = Directory.CreateDirectory(path); - } + Directory.CreateDirectory(path); } else if (ld == DialogResult.No) { // open folder dialog FolderBrowserDialog fbd = new FolderBrowserDialog(); if (fbd.ShowDialog() == DialogResult.OK) - { path = fbd.SelectedPath; - } } else return; } @@ -5591,17 +5597,11 @@ private void Menu_DumpLoadBoxes_Click(object sender, EventArgs e) string nick = ""; if (Convert.ToBoolean((IV32 >> 31) & 1)) - { nick = Util.TrimFromZero(Encoding.Unicode.GetString(pkxdata, 0x40, 24)) + " (" + specieslist[species] + ")"; - } else - { nick = specieslist[species]; - } if (Convert.ToBoolean((IV32 >> 30) & 1)) - { nick += " (" + eggname + ")"; - } string isshiny = ""; int gamevers = pkxdata[0xDF]; @@ -5612,10 +5612,9 @@ private void Menu_DumpLoadBoxes_Click(object sender, EventArgs e) uint PSV = UID ^ LID; uint TSV = Util.ToUInt32(TB_TID.Text) ^ Util.ToUInt32(TB_SID.Text); uint XOR = TSV ^ PSV; - if (XOR < 16) - { // Is Shiny + if (XOR < 16) // Is Shiny isshiny = " ★"; - } + string savedname = species.ToString("000") + isshiny + " - " + nick + " - " @@ -5623,9 +5622,7 @@ private void Menu_DumpLoadBoxes_Click(object sender, EventArgs e) + ".pk6"; Array.Resize(ref pkxdata, 232); if (!File.Exists(path + "\\" + savedname)) - { File.WriteAllBytes(path + "\\" + Util.CleanFileName(savedname), pkxdata); - } } } } @@ -5670,11 +5667,9 @@ private void loadBoxesFromDB(string path) else { try // to convert g5pkm - { - data = PKX.encryptArray(Converter.ConvertPKM(input, savefile, savindex)); - pastctr++; - } - catch { continue; } + { data = PKX.encryptArray(Converter.ConvertPKM(input, savefile, savindex)); pastctr++; } + catch + { continue; } } } else if (ext == ".pkx" || ext == ".pk6") @@ -5749,7 +5744,7 @@ private void B_OpenBoxLayout_Click(object sender, EventArgs e) } private void B_OpenTrainerInfo_Click(object sender, EventArgs e) { - PKHeX.SAV_Trainer sb13 = new PKHeX.SAV_Trainer(this,SaveGame.Name); + PKHeX.SAV_Trainer sb13 = new PKHeX.SAV_Trainer(this); sb13.ShowDialog(); } private void B_OpenPokepuffs_Click(object sender, EventArgs e) @@ -5829,12 +5824,15 @@ private void B_OUTPasserby_Click(object sender, EventArgs e) ulong outfit = BitConverter.ToUInt64(savefile, r_offset + 0x5C); int favpkm = BitConverter.ToUInt16(savefile, r_offset + 0x9C) & 0x7FF; string gamename; - if (game == 0x18) - { + if (game == 24) gamename = "X"; - } - else gamename = "Y"; - + else if (game == 25) + gamename = "Y"; + else if(game == 26) + gamename = "AS"; + else if (game == 27) + gamename = "OR"; + else gamename = "UNK GAME"; result += "OT: " + otname + "\r\n" + "Message: " + message + "\r\n" + @@ -6079,28 +6077,28 @@ public SaveStruct(string GameID) // Temp Name = "ORAS"; Box = 0x38400; // Confirmed - TrainerCard = 0x19400; + TrainerCard = 0x19400; // Confirmed Party = 0x19600; // Confirmed BattleBox = 0x09E00;// Confirmed - Daycare = 0x20600; - GTS = 0x1D600; - Fused = 0x1BE00; - SUBE = 0x22C90; + Daycare = 0x21000; // Confirmed (thanks Rei) + GTS = 0x1D600; // Confirmed + Fused = 0x1BE00; // Confirmed + SUBE = 0x22C90; // ****not in use, not updating?**** - Puff = 0x5400; - Item = 0x5800; - Trainer1 = 0x6800; - Trainer2 = 0x9600; - PCLayout = 0x9800; - Wondercard = 0x22000;// Confirmed - BerryField = 0x20C00; + Puff = 0x5400; // Confirmed + Item = 0x5800; // Confirmed + Trainer1 = 0x6800; // Confirmed + Trainer2 = 0x9600; // Confirmed + PCLayout = 0x9800; // Confirmed + Wondercard = 0x22000; // Confirmed + BerryField = 0x20C00; // ****changed**** OPower = 0x1BE00; - EventFlag = 0x19E00; + EventFlag = 0x19E00; // Confirmed PokeDex = 0x1A400; - HoF = 0x1E800; - JPEG = 0x5C600; - PSS = 0x0A400; + HoF = 0x1F200; // Confirmed + JPEG = 0x6D000; // Confirmed + PSS = 0x0A400; // Confirmed (thanks Rei) } else { diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs index 83e162fcf..ff8f2f95b 100644 --- a/Properties/Resources.Designer.cs +++ b/Properties/Resources.Designer.cs @@ -9710,6 +9710,86 @@ internal class Resources { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap badge_01 { + get { + object obj = ResourceManager.GetObject("badge_01", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap badge_02 { + get { + object obj = ResourceManager.GetObject("badge_02", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap badge_03 { + get { + object obj = ResourceManager.GetObject("badge_03", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap badge_04 { + get { + object obj = ResourceManager.GetObject("badge_04", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap badge_05 { + get { + object obj = ResourceManager.GetObject("badge_05", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap badge_06 { + get { + object obj = ResourceManager.GetObject("badge_06", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap badge_07 { + get { + object obj = ResourceManager.GetObject("badge_07", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap badge_08 { + get { + object obj = ResourceManager.GetObject("badge_08", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -14839,86 +14919,6 @@ internal class Resources { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap rsBadge_1 { - get { - object obj = ResourceManager.GetObject("rsBadge_1", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap rsBadge_2 { - get { - object obj = ResourceManager.GetObject("rsBadge_2", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap rsBadge_3 { - get { - object obj = ResourceManager.GetObject("rsBadge_3", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap rsBadge_4 { - get { - object obj = ResourceManager.GetObject("rsBadge_4", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap rsBadge_5 { - get { - object obj = ResourceManager.GetObject("rsBadge_5", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap rsBadge_6 { - get { - object obj = ResourceManager.GetObject("rsBadge_6", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap rsBadge_7 { - get { - object obj = ResourceManager.GetObject("rsBadge_7", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap rsBadge_8 { - get { - object obj = ResourceManager.GetObject("rsBadge_8", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -18824,7 +18824,7 @@ internal class Resources { /// /// /// - ///Forma Vaga + ///Vaga /// /// /// @@ -18974,7 +18974,7 @@ internal class Resources { /// /// /// - ///Forma Castform + ///Castform /// /// /// @@ -19009,7 +19009,7 @@ internal class Resources { /// /// /// - ///Forma Normale + ///Normale /// /// /// @@ -19035,8 +19035,8 @@ internal class Resources { /// /// /// - ///Manto Pianta - ///Manto Pianta + ///Pianta + ///Pianta /// /// /// @@ -19044,9 +19044,41 @@ internal class Resources { /// /// /// - ///Forma Nuvola + ///Nuvola ///Mare Ovest - ///Mare O [rest of string was truncated]";. + ///Mare Ovest + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// [rest of string was truncated]";. /// internal static string text_Forms_it { get { @@ -19710,7 +19742,7 @@ internal class Resources { /// /// /// - ///형태별 모습 + ///형태별 /// /// /// @@ -19860,7 +19892,7 @@ internal class Resources { /// /// /// - ///캐스퐁의 모습 + ///캐스퐁 /// /// /// @@ -19891,8 +19923,8 @@ internal class Resources { /// /// /// - ///가이오가의 모습 - ///그란돈의 모습 + ///가이오가 + ///그란돈 /// /// ///노말폼 @@ -19971,6 +20003,21 @@ internal class Resources { /// /// /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// /// [rest of string was truncated]";. /// internal static string text_Forms_ko { diff --git a/Properties/Resources.resx b/Properties/Resources.resx index 205d00be7..f10c58cd6 100644 --- a/Properties/Resources.resx +++ b/Properties/Resources.resx @@ -259,30 +259,6 @@ ..\Resources\img\badges\badge_8.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\img\badges\rsBadge_1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\img\badges\rsBadge_2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\img\badges\rsBadge_3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\img\badges\rsBadge_4.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\img\badges\rsBadge_5.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\img\badges\rsBadge_6.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\img\badges\rsBadge_7.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\img\badges\rsBadge_8.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 @@ -5146,4 +5122,28 @@ ..\Resources\img\Pokemon Sprites\25-6.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\img\badges\badge_01.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\badges\badge_02.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\badges\badge_03.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\badges\badge_04.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\badges\badge_05.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\badges\badge_06.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\badges\badge_07.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\badges\badge_08.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/badges/badge_01.png b/Resources/img/badges/badge_01.png new file mode 100644 index 000000000..4a7b2c290 Binary files /dev/null and b/Resources/img/badges/badge_01.png differ diff --git a/Resources/img/badges/badge_02.png b/Resources/img/badges/badge_02.png new file mode 100644 index 000000000..a91428bc1 Binary files /dev/null and b/Resources/img/badges/badge_02.png differ diff --git a/Resources/img/badges/badge_03.png b/Resources/img/badges/badge_03.png new file mode 100644 index 000000000..f8db1c682 Binary files /dev/null and b/Resources/img/badges/badge_03.png differ diff --git a/Resources/img/badges/badge_04.png b/Resources/img/badges/badge_04.png new file mode 100644 index 000000000..92e5a2f72 Binary files /dev/null and b/Resources/img/badges/badge_04.png differ diff --git a/Resources/img/badges/badge_05.png b/Resources/img/badges/badge_05.png new file mode 100644 index 000000000..b6c6dd32e Binary files /dev/null and b/Resources/img/badges/badge_05.png differ diff --git a/Resources/img/badges/badge_06.png b/Resources/img/badges/badge_06.png new file mode 100644 index 000000000..42c62aa36 Binary files /dev/null and b/Resources/img/badges/badge_06.png differ diff --git a/Resources/img/badges/badge_07.png b/Resources/img/badges/badge_07.png new file mode 100644 index 000000000..ec3d68666 Binary files /dev/null and b/Resources/img/badges/badge_07.png differ diff --git a/Resources/img/badges/badge_08.png b/Resources/img/badges/badge_08.png new file mode 100644 index 000000000..252b7c5bb Binary files /dev/null and b/Resources/img/badges/badge_08.png differ diff --git a/Resources/img/badges/rsBadge_1.png b/Resources/img/badges/rsBadge_1.png deleted file mode 100644 index e6b117381..000000000 Binary files a/Resources/img/badges/rsBadge_1.png and /dev/null differ diff --git a/Resources/img/badges/rsBadge_2.png b/Resources/img/badges/rsBadge_2.png deleted file mode 100644 index 4a60a1de8..000000000 Binary files a/Resources/img/badges/rsBadge_2.png and /dev/null differ diff --git a/Resources/img/badges/rsBadge_3.png b/Resources/img/badges/rsBadge_3.png deleted file mode 100644 index 80a4e6153..000000000 Binary files a/Resources/img/badges/rsBadge_3.png and /dev/null differ diff --git a/Resources/img/badges/rsBadge_4.png b/Resources/img/badges/rsBadge_4.png deleted file mode 100644 index 9db41236f..000000000 Binary files a/Resources/img/badges/rsBadge_4.png and /dev/null differ diff --git a/Resources/img/badges/rsBadge_5.png b/Resources/img/badges/rsBadge_5.png deleted file mode 100644 index b1d7f2272..000000000 Binary files a/Resources/img/badges/rsBadge_5.png and /dev/null differ diff --git a/Resources/img/badges/rsBadge_6.png b/Resources/img/badges/rsBadge_6.png deleted file mode 100644 index 2fc420460..000000000 Binary files a/Resources/img/badges/rsBadge_6.png and /dev/null differ diff --git a/Resources/img/badges/rsBadge_7.png b/Resources/img/badges/rsBadge_7.png deleted file mode 100644 index 00c242f2d..000000000 Binary files a/Resources/img/badges/rsBadge_7.png and /dev/null differ diff --git a/Resources/img/badges/rsBadge_8.png b/Resources/img/badges/rsBadge_8.png deleted file mode 100644 index 17c1d9473..000000000 Binary files a/Resources/img/badges/rsBadge_8.png and /dev/null differ diff --git a/Resources/text/fr/text_Forms_fr.txt b/Resources/text/fr/text_Forms_fr.txt index 3a29e8e4b..ed0229aa3 100644 --- a/Resources/text/fr/text_Forms_fr.txt +++ b/Resources/text/fr/text_Forms_fr.txt @@ -851,8 +851,8 @@ Hiver Totémique Totémique Totémique -Kyurem Blanc -Kyurem Noir +Blanc +Noir Aspect Décidé Danse de Genesect diff --git a/Resources/text/it/text_Forms_it.txt b/Resources/text/it/text_Forms_it.txt index d6d0fe6e5..ab2aca492 100644 --- a/Resources/text/it/text_Forms_it.txt +++ b/Resources/text/it/text_Forms_it.txt @@ -199,7 +199,7 @@ -Forma Vaga +Vaga @@ -349,7 +349,7 @@ Forma Vaga -Forma Castform +Castform @@ -384,7 +384,7 @@ Forma Castform -Forma Normale +Normale @@ -410,8 +410,8 @@ Forma Normale -Manto Pianta -Manto Pianta +Pianta +Pianta @@ -419,7 +419,7 @@ Manto Pianta -Forma Nuvola +Nuvola Mare Ovest Mare Ovest @@ -477,7 +477,7 @@ Mare Ovest -Forma Rotom +Rotom @@ -485,13 +485,13 @@ Forma Rotom -Forma Alterata +Alterata -Forma Terra -Forma di Arceus +Terra +di Arceus @@ -548,12 +548,12 @@ Forma di Arceus -Forma Linearossa +Linearossa -Forma Normalità +Normalità @@ -583,8 +583,8 @@ Forma Normalità -Forma Primavera -Forma Primavera +Primavera +Primavera @@ -639,15 +639,15 @@ Forma Primavera -Forma Incarnazione -Forma Incarnazione +Incarnazione +Incarnazione -Forma Incarnazione -Forma di Kyurem -Forma Normale -Forma Canto -Forma di Genesect +Incarnazione +di +Normale +Canto +di Genesect @@ -664,22 +664,22 @@ Forma di Genesect -Motivo Nevi Perenni +Nevi Perenni -Fiore Rosso -Fiore Rosso -Fiore Rosso +Rosso +Rosso +Rosso -Forma Selvatica +Selvatica Maschio -Forma Scudo +Scudo @@ -714,25 +714,25 @@ Normale -Modo Relax +Relax -Hoopa Vincolato +Vincolato -MegaVenusaur -MegaCharizard X -MegaCharizard Y +Mega +Mega X +Mega Y MegaBlastoise MegaBeedrill MegaPidgeot -Pikachu rockstar -Pikachu damigella -Pikachu confetto -Pikachu scienziata -Pikachu wrestler -Pikachu Cosplay +rockstar +damigella +confetto +scienziata +wrestler +Cosplay MegaAlakazam MegaSlowbro MegaGengar @@ -743,33 +743,33 @@ MegaAerodactyl MegaMewtwo X MegaMewtwo Y MegaAmpharos -Forma Vaga -Forma Vaga -Forma Vaga -Forma Vaga -Forma Vaga -Forma Vaga -Forma Vaga -Forma Vaga -Forma Vaga -Forma Vaga -Forma Vaga -Forma Vaga -Forma Vaga -Forma Vaga -Forma Vaga -Forma Vaga -Forma Vaga -Forma Vaga -Forma Vaga -Forma Vaga -Forma Vaga -Forma Vaga -Forma Vaga -Forma Vaga -Forma Vaga -Forma Vaga -Forma Vaga +Vaga +Vaga +Vaga +Vaga +Vaga +Vaga +Vaga +Vaga +Vaga +Vaga +Vaga +Vaga +Vaga +Vaga +Vaga +Vaga +Vaga +Vaga +Vaga +Vaga +Vaga +Vaga +Vaga +Vaga +Vaga +Vaga +Vaga MegaSteelix MegaScizor MegaHeracross @@ -787,9 +787,9 @@ MegaManectric MegaSharpedo MegaCamerupt MegaAltaria -Forma Sole -Forma Pioggia -Forma Nuvola di Neve +Sole +Pioggia +Neve MegaBanette MegaAbsol MegaGlalie @@ -797,17 +797,17 @@ MegaSalamence MegaMetagross MegaLatias MegaLatios -Archeorisveglio -Archeorisveglio +Archeo. +Archeo. MegaRayquaza -Forma Attacco -Forma Difesa -Forma Velocità -Manto Sabbia -Manto Scarti -Manto Sabbia -Manto Scarti -Forma Splendore +Attacco +Difesa +Velocità +Sabbia +Scarti +Sabbia +Scarti +Splendore Mare Est Mare Est MegaLopunny @@ -815,99 +815,99 @@ MegaGarchomp MegaLucario MegaAbomasnow MegaGallade -Rotom Calore -Rotom Lavaggio -Rotom Gelo -Rotom Vortice -Rotom Taglio -Forma Originale -Forma Cielo -Forma di Arceus -Forma di Arceus -Forma di Arceus -Forma di Arceus -Forma di Arceus -Forma di Arceus -Forma di Arceus -Forma di Arceus -Forma di Arceus -Forma di Arceus -Forma di Arceus -Forma di Arceus -Forma di Arceus -Forma di Arceus -Forma di Arceus -Forma di Arceus -Forma di Arceus +Calore +Lavaggio +Gelo +Vortice +Taglio +Originale +Cielo +di Arceus +di Arceus +di Arceus +di Arceus +di Arceus +di Arceus +di Arceus +di Arceus +di Arceus +di Arceus +di Arceus +di Arceus +di Arceus +di Arceus +di Arceus +di Arceus +di Arceus MegaAudino -Forma Lineablu -Stato Zen -Forma Estate -Forma Autunno -Forma Inverno -Forma Estate -Forma Autunno -Forma Inverno -Forma Totem -Forma Totem -Forma Totem -Kyurem Bianco -Kyurem Nero -Forma Risoluta -Forma Danza -Forma di Genesect -Forma di Genesect -Forma di Genesect -Forma di Genesect -Motivo Nordico -Motivo Manto di Neve -Motivo Continentale -Motivo Prato -Motivo Eleganza -Motivo Giardinfiore -Motivo Trendy -Motivo Marino -Motivo Arcipelago -Motivo Deserto -Motivo Sabbia -Motivo Fluviale -Motivo Pluviale -Motivo Savana -Motivo Solare -Motivo Oceanico -Motivo Giungla -Motivo Sbarazzino -Motivo Poké Ball -Fiore Giallo -Fiore Arancione -Fiore Blu -Fiore Bianco -Fiore Giallo -Fiore Arancione -Fiore Blu -Fiore Bianco -Fiore Eterno -Fiore Giallo -Fiore Arancione -Fiore Blu -Fiore Bianco -Taglio Cuore -Taglio Stella -Taglio Diamante -Taglio Signorina -Taglio Gentildonna -Taglio Gentiluomo -Taglio Regina -Taglio Kabuki -Taglio Faraone +Lineablu +Zen +Estate +Autunno +Inverno +Estate +Autunno +Inverno +Totem +Totem +Totem +Bianco +Nero +Risoluta +Danza +di Genesect +di Genesect +di Genesect +di Genesect +Nordico +di Neve +Continentale +Prato +Eleganza +Giardinfiore +Trendy +Marino +Arcipelago +Deserto +Sabbia +Fluviale +Pluviale +Savana +Solare +Oceanico +Giungla +Sbarazzino +Poké Ball +Giallo +Arancione +Blu +Bianco +Giallo +Arancione +Blu +Bianco +Eterno +Giallo +Arancione +Blu +Bianco +Cuore +Stella +Diamante +Signorina +Gentildonna +Gentiluomo +Regina +Kabuki +Faraone Femmina -Forma Spada +Spada Mini Grande Maxi Mini Grande Maxi -Modo Attivo +Attivo MegaDiancie -Hoopa Libero \ No newline at end of file +Libero \ No newline at end of file diff --git a/Resources/text/ko/text_Forms_ko.txt b/Resources/text/ko/text_Forms_ko.txt index b466ea678..902904911 100644 --- a/Resources/text/ko/text_Forms_ko.txt +++ b/Resources/text/ko/text_Forms_ko.txt @@ -199,7 +199,7 @@ -형태별 모습 +형태별 @@ -349,7 +349,7 @@ -캐스퐁의 모습 +캐스퐁 @@ -380,8 +380,8 @@ -가이오가의 모습 -그란돈의 모습 +가이오가 +그란돈 노말폼 @@ -477,7 +477,7 @@ -로토무의 모습 +로토무 @@ -491,7 +491,7 @@ 랜드폼 -아르세우스의 모습 +아르세우스 @@ -548,7 +548,7 @@ -적색근의 모습 +적색근 @@ -583,8 +583,8 @@ -봄의 모습 -봄의 모습 +봄 +봄 @@ -644,10 +644,10 @@ 화신폼 -큐레무의 모습 -평상시 모습 +큐레무 +평상시 보이스폼 -게노세크트의 모습 +게노세크트 @@ -664,7 +664,7 @@ -빙설의 모양 +빙설의 빨간 꽃 @@ -674,9 +674,9 @@ -야생의 모습 +야생 -수컷의 모습 +수컷 실드폼 @@ -718,12 +718,12 @@ -굴레에 빠진 후파 +굴레에 빠진 -메가이상해꽃 -메가리자몽X -메가리자몽Y +메가 +메가X +메가Y 메가거북왕 메가독침붕 메가피죤투 @@ -743,33 +743,33 @@ 메가뮤츠X 메가뮤츠Y 메가전룡 -형태별 모습 -형태별 모습 -형태별 모습 -형태별 모습 -형태별 모습 -형태별 모습 -형태별 모습 -형태별 모습 -형태별 모습 -형태별 모습 -형태별 모습 -형태별 모습 -형태별 모습 -형태별 모습 -형태별 모습 -형태별 모습 -형태별 모습 -형태별 모습 -형태별 모습 -형태별 모습 -형태별 모습 -형태별 모습 -형태별 모습 -형태별 모습 -형태별 모습 -형태별 모습 -형태별 모습 +형태별 +형태별 +형태별 +형태별 +형태별 +형태별 +형태별 +형태별 +형태별 +형태별 +형태별 +형태별 +형태별 +형태별 +형태별 +형태별 +형태별 +형태별 +형태별 +형태별 +형태별 +형태별 +형태별 +형태별 +형태별 +형태별 +형태별 메가강철톤 메가핫삼 메가헤라크로스 @@ -787,9 +787,9 @@ 메가샤크니아 메가폭타 메가파비코리 -태양의 모습 -빗방울의 모습 -설운의 모습 +태양 +빗방울 +설운 메가다크펫 메가앱솔 메가얼음귀신 @@ -797,8 +797,8 @@ 메가메타그로스 메가라티아스 메가라티오스 -원시회귀의 모습 -원시회귀의 모습 +원시회귀 +원시회귀 메가레쿠쟈 어택폼 디펜스폼 @@ -822,62 +822,62 @@ 커트로토무 오리진폼 스카이폼 -아르세우스의 모습 -아르세우스의 모습 -아르세우스의 모습 -아르세우스의 모습 -아르세우스의 모습 -아르세우스의 모습 -아르세우스의 모습 -아르세우스의 모습 -아르세우스의 모습 -아르세우스의 모습 -아르세우스의 모습 -아르세우스의 모습 -아르세우스의 모습 -아르세우스의 모습 -아르세우스의 모습 -아르세우스의 모습 -아르세우스의 모습 +아르세우스 +아르세우스 +아르세우스 +아르세우스 +아르세우스 +아르세우스 +아르세우스 +아르세우스 +아르세우스 +아르세우스 +아르세우스 +아르세우스 +아르세우스 +아르세우스 +아르세우스 +아르세우스 +아르세우스 메가다부니 -청색근의 모습 +청색근 달마모드 -여름의 모습 -가을의 모습 -겨울의 모습 -여름의 모습 -가을의 모습 -겨울의 모습 +여름 +가을 +겨울 +여름 +가을 +겨울 영물폼 영물폼 영물폼 화이트큐레무 블랙큐레무 -각오의 모습 +각오 스텝폼 -게노세크트의 모습 -게노세크트의 모습 -게노세크트의 모습 -게노세크트의 모습 -설국의 모양 -설원의 모양 -대륙의 모양 -정원의 모양 -우아한 모양 -화원의 모양 -모던한 모양 -마린의 모양 -군도의 모양 -황야의 모양 -사진의 모양 -대하의 모양 -스콜의 모양 -사바나의 모양 -태양의 모양 -오션의 모양 -정글의 모양 -팬시한 모양 -볼의 모양 +게노세크트 +게노세크트 +게노세크트 +게노세크트 +설국의 +설원의 +대륙의 +정원의 +우아한 +화원의 +모던한 +마린의 +군도의 +황야의 +사진의 +대하의 +스콜의 +사바나의 +태양의 +오션의 +정글의 +팬시한 +볼의 노란 꽃 오렌지색 꽃 파란 꽃 @@ -900,7 +900,7 @@ 퀸컷 가부키컷 킹덤컷 -암컷의 모습 +암컷 블레이드폼 작은 사이즈 큰 사이즈 @@ -910,4 +910,4 @@ 특대 사이즈 액티브모드 메가디안시 -굴레를 벗어난 후파 \ No newline at end of file +굴레를 벗어난 \ No newline at end of file diff --git a/SAV/SAV_BoxIO.cs b/SAV/SAV_BoxIO.cs index 33356146e..9f529d1d1 100644 --- a/SAV/SAV_BoxIO.cs +++ b/SAV/SAV_BoxIO.cs @@ -43,12 +43,9 @@ private void B_ImportBox_Click(object sender, EventArgs e) m_parent.setPKXBoxes(); } else - { MessageBox.Show("Box data loaded is too big!", "Error"); - } } } - private void B_ExportBox_Click(object sender, EventArgs e) { int index = CB_Box.SelectedIndex; @@ -82,18 +79,14 @@ public void getBoxNames() string boxname = Encoding.Unicode.GetString(m_parent.savefile, boxnameoffset + (0x7F000 * savindex) + 0x22 * i, 0x22); boxname = Util.TrimFromZero(boxname); if (boxname.Length == 0) - { CB_Box.Items.Add("Box " + (i+1)); - } else CB_Box.Items.Add(boxname); } } catch { for (int i = 1; i < 32; i++) - { CB_Box.Items.Add("Box " + (i+1)); - } } CB_Box.SelectedIndex = selectedbox; // restore selected box diff --git a/SAV/SAV_EventFlagsORAS.Designer.cs b/SAV/SAV_EventFlagsORAS.Designer.cs index 779d16cf7..f535958f6 100644 --- a/SAV/SAV_EventFlagsORAS.Designer.cs +++ b/SAV/SAV_EventFlagsORAS.Designer.cs @@ -47,6 +47,10 @@ private void InitializeComponent() this.flag_0647 = new System.Windows.Forms.CheckBox(); this.flag_2840 = new System.Windows.Forms.CheckBox(); this.GB_Rebattle = new System.Windows.Forms.GroupBox(); + this.flag_2818 = new System.Windows.Forms.CheckBox(); + this.flag_0181 = new System.Windows.Forms.CheckBox(); + this.flag_2831 = new System.Windows.Forms.CheckBox(); + this.flag_0183 = new System.Windows.Forms.CheckBox(); this.groupBox3 = new System.Windows.Forms.GroupBox(); this.flag_0289 = new System.Windows.Forms.CheckBox(); this.flag_0288 = new System.Windows.Forms.CheckBox(); @@ -60,6 +64,10 @@ private void InitializeComponent() this.flag_0286 = new System.Windows.Forms.CheckBox(); this.flag_0285 = new System.Windows.Forms.CheckBox(); this.flag_2546 = new System.Windows.Forms.CheckBox(); + this.flag_2841 = new System.Windows.Forms.CheckBox(); + this.flag_0209 = new System.Windows.Forms.CheckBox(); + this.flag_2825 = new System.Windows.Forms.CheckBox(); + this.flag_0176 = new System.Windows.Forms.CheckBox(); this.groupBox1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.nud)).BeginInit(); this.groupBox2.SuspendLayout(); @@ -155,7 +163,7 @@ private void InitializeComponent() this.groupBox2.Size = new System.Drawing.Size(268, 120); this.groupBox2.TabIndex = 13; this.groupBox2.TabStop = false; - this.groupBox2.Text = "FlagDiff"; + this.groupBox2.Text = "FlagDiff Researcher"; // // L_UnSet // @@ -255,6 +263,14 @@ private void InitializeComponent() // // GB_Rebattle // + this.GB_Rebattle.Controls.Add(this.flag_2825); + this.GB_Rebattle.Controls.Add(this.flag_0176); + this.GB_Rebattle.Controls.Add(this.flag_2841); + this.GB_Rebattle.Controls.Add(this.flag_0209); + this.GB_Rebattle.Controls.Add(this.flag_2818); + this.GB_Rebattle.Controls.Add(this.flag_0181); + this.GB_Rebattle.Controls.Add(this.flag_2831); + this.GB_Rebattle.Controls.Add(this.flag_0183); this.GB_Rebattle.Controls.Add(this.flag_2840); this.GB_Rebattle.Controls.Add(this.flag_0647); this.GB_Rebattle.Location = new System.Drawing.Point(129, 12); @@ -264,6 +280,50 @@ private void InitializeComponent() this.GB_Rebattle.TabStop = false; this.GB_Rebattle.Text = "Rebattle"; // + // flag_2818 + // + this.flag_2818.AutoSize = true; + this.flag_2818.CheckAlign = System.Drawing.ContentAlignment.TopLeft; + this.flag_2818.Location = new System.Drawing.Point(16, 94); + this.flag_2818.Name = "flag_2818"; + this.flag_2818.Size = new System.Drawing.Size(95, 17); + this.flag_2818.TabIndex = 19; + this.flag_2818.Text = "Azelf Captured"; + this.flag_2818.UseVisualStyleBackColor = true; + // + // flag_0181 + // + this.flag_0181.AutoSize = true; + this.flag_0181.CheckAlign = System.Drawing.ContentAlignment.TopLeft; + this.flag_0181.Location = new System.Drawing.Point(16, 79); + this.flag_0181.Name = "flag_0181"; + this.flag_0181.Size = new System.Drawing.Size(96, 17); + this.flag_0181.TabIndex = 18; + this.flag_0181.Text = "Azelf Defeated"; + this.flag_0181.UseVisualStyleBackColor = true; + // + // flag_2831 + // + this.flag_2831.AutoSize = true; + this.flag_2831.CheckAlign = System.Drawing.ContentAlignment.TopLeft; + this.flag_2831.Location = new System.Drawing.Point(16, 64); + this.flag_2831.Name = "flag_2831"; + this.flag_2831.Size = new System.Drawing.Size(121, 17); + this.flag_2831.TabIndex = 17; + this.flag_2831.Text = "Zek/Resh Captured"; + this.flag_2831.UseVisualStyleBackColor = true; + // + // flag_0183 + // + this.flag_0183.AutoSize = true; + this.flag_0183.CheckAlign = System.Drawing.ContentAlignment.TopLeft; + this.flag_0183.Location = new System.Drawing.Point(16, 49); + this.flag_0183.Name = "flag_0183"; + this.flag_0183.Size = new System.Drawing.Size(122, 17); + this.flag_0183.TabIndex = 16; + this.flag_0183.Text = "Zek/Resh Defeated"; + this.flag_0183.UseVisualStyleBackColor = true; + // // groupBox3 // this.groupBox3.Controls.Add(this.flag_0289); @@ -277,13 +337,13 @@ private void InitializeComponent() this.groupBox3.Controls.Add(this.flag_0675); this.groupBox3.Controls.Add(this.flag_0286); this.groupBox3.Controls.Add(this.flag_0285); - this.groupBox3.Enabled = false; this.groupBox3.Location = new System.Drawing.Point(287, 12); this.groupBox3.Name = "groupBox3"; this.groupBox3.Size = new System.Drawing.Size(154, 288); this.groupBox3.TabIndex = 17; this.groupBox3.TabStop = false; this.groupBox3.Text = "Misc"; + this.groupBox3.Visible = false; // // flag_0289 // @@ -429,6 +489,50 @@ private void InitializeComponent() this.flag_2546.UseVisualStyleBackColor = true; this.flag_2546.Click += new System.EventHandler(this.toggleFlag); // + // flag_2841 + // + this.flag_2841.AutoSize = true; + this.flag_2841.CheckAlign = System.Drawing.ContentAlignment.TopLeft; + this.flag_2841.Location = new System.Drawing.Point(16, 124); + this.flag_2841.Name = "flag_2841"; + this.flag_2841.Size = new System.Drawing.Size(134, 17); + this.flag_2841.TabIndex = 21; + this.flag_2841.Text = "Lugia/Ho-Oh Captured"; + this.flag_2841.UseVisualStyleBackColor = true; + // + // flag_0209 + // + this.flag_0209.AutoSize = true; + this.flag_0209.CheckAlign = System.Drawing.ContentAlignment.TopLeft; + this.flag_0209.Location = new System.Drawing.Point(16, 109); + this.flag_0209.Name = "flag_0209"; + this.flag_0209.Size = new System.Drawing.Size(135, 17); + this.flag_0209.TabIndex = 20; + this.flag_0209.Text = "Lugia/Ho-Oh Defeated"; + this.flag_0209.UseVisualStyleBackColor = true; + // + // flag_2825 + // + this.flag_2825.AutoSize = true; + this.flag_2825.CheckAlign = System.Drawing.ContentAlignment.TopLeft; + this.flag_2825.Location = new System.Drawing.Point(16, 154); + this.flag_2825.Name = "flag_2825"; + this.flag_2825.Size = new System.Drawing.Size(113, 17); + this.flag_2825.TabIndex = 23; + this.flag_2825.Text = "Cobalion Captured"; + this.flag_2825.UseVisualStyleBackColor = true; + // + // flag_0176 + // + this.flag_0176.AutoSize = true; + this.flag_0176.CheckAlign = System.Drawing.ContentAlignment.TopLeft; + this.flag_0176.Location = new System.Drawing.Point(16, 139); + this.flag_0176.Name = "flag_0176"; + this.flag_0176.Size = new System.Drawing.Size(114, 17); + this.flag_0176.TabIndex = 22; + this.flag_0176.Text = "Cobalion Defeated"; + this.flag_0176.UseVisualStyleBackColor = true; + // // SAV_EventFlagsORAS // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -495,5 +599,13 @@ private void InitializeComponent() private System.Windows.Forms.CheckBox flag_0286; private System.Windows.Forms.CheckBox flag_0285; private System.Windows.Forms.CheckBox flag_2546; + private System.Windows.Forms.CheckBox flag_2831; + private System.Windows.Forms.CheckBox flag_0183; + private System.Windows.Forms.CheckBox flag_2818; + private System.Windows.Forms.CheckBox flag_0181; + private System.Windows.Forms.CheckBox flag_2841; + private System.Windows.Forms.CheckBox flag_0209; + private System.Windows.Forms.CheckBox flag_2825; + private System.Windows.Forms.CheckBox flag_0176; } } \ No newline at end of file diff --git a/SAV/SAV_EventFlagsORAS.cs b/SAV/SAV_EventFlagsORAS.cs index bbffc3b16..a81eb0fd0 100644 --- a/SAV/SAV_EventFlagsORAS.cs +++ b/SAV/SAV_EventFlagsORAS.cs @@ -52,7 +52,12 @@ private void Setup() // Fill Bit arrays chka = new CheckBox[] { - flag_2840,flag_0647, // Kyogre/Rayquaza + flag_0647,flag_2840, // Kyogre/Rayquaza + flag_0183,flag_2831, // Zekrom + flag_0181,flag_2818, // Azelf + flag_0209,flag_2814, // Lugia/Ho-Oh + + // old flag_0285,flag_0286,flag_0287,flag_0288,flag_0289, // Statuettes flag_0290,flag_0291,flag_0292,flag_0293,flag_0294, // Super Unlocks flag_0675, // Chatelaine 50 diff --git a/SAV/SAV_EventFlagsXY.Designer.cs b/SAV/SAV_EventFlagsXY.Designer.cs index 3fa398653..dbee69681 100644 --- a/SAV/SAV_EventFlagsXY.Designer.cs +++ b/SAV/SAV_EventFlagsXY.Designer.cs @@ -28,7 +28,7 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SAV_EventFlagsORAS)); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SAV_EventFlagsXY)); this.CHK_CustomFlag = new System.Windows.Forms.CheckBox(); this.B_Cancel = new System.Windows.Forms.Button(); this.groupBox1 = new System.Windows.Forms.GroupBox(); @@ -258,7 +258,7 @@ private void InitializeComponent() this.groupBox2.Size = new System.Drawing.Size(268, 120); this.groupBox2.TabIndex = 13; this.groupBox2.TabStop = false; - this.groupBox2.Text = "FlagDiff"; + this.groupBox2.Text = "FlagDiff Researcher"; // // L_UnSet // @@ -556,7 +556,7 @@ private void InitializeComponent() this.flag_2546.UseVisualStyleBackColor = true; this.flag_2546.Click += new System.EventHandler(this.toggleFlag); // - // SAV_EventFlags + // SAV_EventFlagsXY // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; @@ -580,7 +580,7 @@ private void InitializeComponent() this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; this.MinimizeBox = false; - this.Name = "SAV_EventFlags"; + this.Name = "SAV_EventFlagsXY"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Event Flag Editor"; this.groupBox1.ResumeLayout(false); diff --git a/SAV/SAV_HallOfFame.cs b/SAV/SAV_HallOfFame.cs index d0b32d491..80aa09efd 100644 --- a/SAV/SAV_HallOfFame.cs +++ b/SAV/SAV_HallOfFame.cs @@ -18,12 +18,14 @@ public SAV_HallOfFame(Form1 frm1) Array.Copy(m_parent.savefile, sav, 0x100000); savindex = m_parent.savindex; shiftval = savindex * 0x7F000; + if (m_parent.savegame_oras) data_offset = 0x1F200; listBox1.SelectedIndex = 0; } Form1 m_parent; public byte[] sav = new Byte[0x100000]; public int savindex; int shiftval; public bool editing = false; + private int data_offset = 0x1E800; private void B_Close_Click(object sender, EventArgs e) { @@ -35,7 +37,7 @@ private void displayEntry(object sender, EventArgs e) RTB.Text = ""; RTB.LanguageOption = RichTextBoxLanguageOptions.DualFont; int index = listBox1.SelectedIndex; - int offset = shiftval + 0x1E800 + index*0x1B4; + int offset = shiftval + data_offset + index * 0x1B4; uint vnd = BitConverter.ToUInt32(sav, offset + 0x1B0); uint vn = vnd & 0xFF; diff --git a/SAV/SAV_SuperTrain.cs b/SAV/SAV_SuperTrain.cs index d2df49799..ff07dec4a 100644 --- a/SAV/SAV_SuperTrain.cs +++ b/SAV/SAV_SuperTrain.cs @@ -17,24 +17,25 @@ public SAV_SuperTrain(Form1 frm1) savindex = m_parent.savindex; specieslist = Form1.specieslist; Array.Copy(m_parent.savefile, sav, 0x100000); + if (m_parent.savegame_oras) data_offset = 0x25600; trba = Form1.trainingbags; trba[0] = "---"; - offsetTime = 0x24608 + 0x7F000 * savindex; - offsetSpec = 0x24788 + 0x7F000 * savindex; - offsetVal = 0x2478A + 0x7F000 * savindex; + offsetTime = data_offset + 0x08 + 0x7F000 * savindex; + offsetSpec = data_offset + 0x188 + 0x7F000 * savindex; + offsetVal = data_offset + 0x18A + 0x7F000 * savindex; InitializeComponent(); string[] stages = Form1.trainingstage; listBox1.Items.Clear(); for (int i = 0; i < 30; i++) - { listBox1.Items.Add((i + 1).ToString("00") + " - " + stages[i + 2]); - } + setup(); } Form1 m_parent; public byte[] sav = new Byte[0x100000]; public string[] specieslist; public int savindex; + private int data_offset = 0x24600; private string[] trba = { "Empty", "HP Bag S","HP Bag M","HP Bag L", @@ -45,7 +46,7 @@ public SAV_SuperTrain(Form1 frm1) "Speed Bag S","Speed Bag M","Speed Bag L", "Strength Bag","Toughen Up Bag","Swiftness Bag", "Big-Shot Bag","Double-Up Bag","Team Flare Bag", - "Reset Bag","Soothing Bag", + "Reset Bag","Soothing Bag", }; private int offsetVal = 0; private int offsetTime = 0; @@ -100,9 +101,9 @@ private void fillTrainingBags() dgvBag.DisplayStyle = DataGridViewComboBoxDisplayStyle.Nothing; { for (int i = 0; i < trba.Length; i++) - { - dgvBag.Items.Add(trba[i]); - } + if (trba[i].Length > 0) + dgvBag.Items.Add(trba[i]); + dgvBag.DisplayIndex = 1; dgvBag.Width = 135; dgvBag.FlatStyle = FlatStyle.Flat; @@ -111,7 +112,7 @@ private void fillTrainingBags() dataGridView1.Columns.Add(dgvBag); dataGridView1.Rows.Add(12); - int offset = 0x24908 + 0x7F000 * savindex; + int offset = data_offset + 0x308 + 0x7F000 * savindex; for (int i = 0; i < 12; i++) { dataGridView1.Rows[i].Cells[0].Value = (i + 1).ToString(); @@ -153,7 +154,7 @@ private void B_Save_Click(object sender, EventArgs e) } bagarray[i - emptyslots] = (byte)Array.IndexOf(trba, bag); } - int offsetTime = 0x24610 + 0x7F000 * savindex; + int offsetTime = data_offset + 0x10 + 0x7F000 * savindex; try { byte[] data = BitConverter.GetBytes(Single.Parse(TB_Time1.Text)); @@ -169,12 +170,12 @@ private void B_Save_Click(object sender, EventArgs e) } catch { }; { - int offsetSpec = 0x24788 + 0x7F000 * savindex; + int offsetSpec = data_offset + 0x188 + 0x7F000 * savindex; byte[] data = BitConverter.GetBytes(Convert.ToUInt16(CB_S2.SelectedValue.ToString())); Array.Resize(ref data, 2); Array.Copy(data, 0, sav, offsetSpec + 4 * 30, 2); } - Array.Copy(bagarray, 0, sav, 0x24908 + savindex * 0x7F000, 12); + Array.Copy(bagarray, 0, sav, data_offset + 0x308 + savindex * 0x7F000, 12); Array.Copy(sav, m_parent.savefile, 0x100000); m_parent.savedited = true; this.Close(); diff --git a/SAV/SAV_Trainer.Designer.cs b/SAV/SAV_Trainer.Designer.cs index e4e51e398..66cddc845 100644 --- a/SAV/SAV_Trainer.Designer.cs +++ b/SAV/SAV_Trainer.Designer.cs @@ -318,6 +318,7 @@ private void InitializeComponent() this.cb1.TabIndex = 10; this.cb1.Text = "1 - Bug"; this.cb1.UseVisualStyleBackColor = true; + this.cb1.Visible = false; this.cb1.CheckedChanged += new System.EventHandler(this.changeBadge); // // cb2 @@ -329,6 +330,7 @@ private void InitializeComponent() this.cb2.TabIndex = 11; this.cb2.Text = "2 - Cliff"; this.cb2.UseVisualStyleBackColor = true; + this.cb2.Visible = false; this.cb2.CheckedChanged += new System.EventHandler(this.changeBadge); // // cb3 @@ -340,6 +342,7 @@ private void InitializeComponent() this.cb3.TabIndex = 12; this.cb3.Text = "3 - Rumble"; this.cb3.UseVisualStyleBackColor = true; + this.cb3.Visible = false; this.cb3.CheckedChanged += new System.EventHandler(this.changeBadge); // // cb4 @@ -351,6 +354,7 @@ private void InitializeComponent() this.cb4.TabIndex = 13; this.cb4.Text = "4 - Plant"; this.cb4.UseVisualStyleBackColor = true; + this.cb4.Visible = false; this.cb4.CheckedChanged += new System.EventHandler(this.changeBadge); // // cb5 @@ -362,6 +366,7 @@ private void InitializeComponent() this.cb5.TabIndex = 14; this.cb5.Text = "5 - Voltage"; this.cb5.UseVisualStyleBackColor = true; + this.cb5.Visible = false; this.cb5.CheckedChanged += new System.EventHandler(this.changeBadge); // // cb6 @@ -373,6 +378,7 @@ private void InitializeComponent() this.cb6.TabIndex = 15; this.cb6.Text = "6 - Fairy"; this.cb6.UseVisualStyleBackColor = true; + this.cb6.Visible = false; this.cb6.CheckedChanged += new System.EventHandler(this.changeBadge); // // cb7 @@ -384,6 +390,7 @@ private void InitializeComponent() this.cb7.TabIndex = 16; this.cb7.Text = "7 - Psychic"; this.cb7.UseVisualStyleBackColor = true; + this.cb7.Visible = false; this.cb7.CheckedChanged += new System.EventHandler(this.changeBadge); // // cb8 @@ -395,6 +402,7 @@ private void InitializeComponent() this.cb8.TabIndex = 17; this.cb8.Text = "8 - Iceberg"; this.cb8.UseVisualStyleBackColor = true; + this.cb8.Visible = false; this.cb8.CheckedChanged += new System.EventHandler(this.changeBadge); // // GB_Badges @@ -428,8 +436,10 @@ private void InitializeComponent() this.pb8.Location = new System.Drawing.Point(175, 77); this.pb8.Name = "pb8"; this.pb8.Size = new System.Drawing.Size(50, 50); + this.pb8.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.pb8.TabIndex = 25; this.pb8.TabStop = false; + this.pb8.Click += new System.EventHandler(this.toggleBadge); // // pb6 // @@ -437,8 +447,10 @@ private void InitializeComponent() this.pb6.Location = new System.Drawing.Point(63, 77); this.pb6.Name = "pb6"; this.pb6.Size = new System.Drawing.Size(50, 50); + this.pb6.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.pb6.TabIndex = 24; this.pb6.TabStop = false; + this.pb6.Click += new System.EventHandler(this.toggleBadge); // // pb4 // @@ -446,8 +458,10 @@ private void InitializeComponent() this.pb4.Location = new System.Drawing.Point(175, 21); this.pb4.Name = "pb4"; this.pb4.Size = new System.Drawing.Size(50, 50); + this.pb4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.pb4.TabIndex = 23; this.pb4.TabStop = false; + this.pb4.Click += new System.EventHandler(this.toggleBadge); // // pb2 // @@ -455,8 +469,10 @@ private void InitializeComponent() this.pb2.Location = new System.Drawing.Point(63, 21); this.pb2.Name = "pb2"; this.pb2.Size = new System.Drawing.Size(50, 50); + this.pb2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.pb2.TabIndex = 22; this.pb2.TabStop = false; + this.pb2.Click += new System.EventHandler(this.toggleBadge); // // pb7 // @@ -464,8 +480,10 @@ private void InitializeComponent() this.pb7.Location = new System.Drawing.Point(119, 77); this.pb7.Name = "pb7"; this.pb7.Size = new System.Drawing.Size(50, 50); + this.pb7.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.pb7.TabIndex = 21; this.pb7.TabStop = false; + this.pb7.Click += new System.EventHandler(this.toggleBadge); // // pb5 // @@ -473,8 +491,10 @@ private void InitializeComponent() this.pb5.Location = new System.Drawing.Point(7, 77); this.pb5.Name = "pb5"; this.pb5.Size = new System.Drawing.Size(50, 50); + this.pb5.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.pb5.TabIndex = 20; this.pb5.TabStop = false; + this.pb5.Click += new System.EventHandler(this.toggleBadge); // // pb3 // @@ -482,8 +502,10 @@ private void InitializeComponent() this.pb3.Location = new System.Drawing.Point(119, 21); this.pb3.Name = "pb3"; this.pb3.Size = new System.Drawing.Size(50, 50); + this.pb3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.pb3.TabIndex = 19; this.pb3.TabStop = false; + this.pb3.Click += new System.EventHandler(this.toggleBadge); // // pb1 // @@ -491,8 +513,10 @@ private void InitializeComponent() this.pb1.Location = new System.Drawing.Point(7, 21); this.pb1.Name = "pb1"; this.pb1.Size = new System.Drawing.Size(50, 50); + this.pb1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.pb1.TabIndex = 18; this.pb1.TabStop = false; + this.pb1.Click += new System.EventHandler(this.toggleBadge); // // GB_Sayings // diff --git a/SAV/SAV_Trainer.cs b/SAV/SAV_Trainer.cs index 500292af2..fb0974ace 100644 --- a/SAV/SAV_Trainer.cs +++ b/SAV/SAV_Trainer.cs @@ -15,9 +15,8 @@ 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) + public SAV_Trainer(Form1 frm1) { - Game = gamename; InitializeComponent(); m_parent = frm1; Array.Copy(m_parent.savefile, sav, 0x100000); @@ -188,7 +187,6 @@ public SAV_Trainer(Form1 frm1, string gamename) CB_Stats.SelectedIndex = 0; } private string[] statdata = new string[] { }; - string Game; Form1 m_parent; public byte[] sav = new Byte[0x100000]; public int savshift; @@ -339,17 +337,17 @@ private void getBadges() Properties.Resources.badge_7, Properties.Resources.badge_8, }; - if (Game == "ORAS") + if (m_parent.savegame_oras) { bma = new Bitmap[] { - Properties.Resources.rsBadge_1, // Add in ORAS badges. - Properties.Resources.rsBadge_2, - Properties.Resources.rsBadge_3, - Properties.Resources.rsBadge_4, - Properties.Resources.rsBadge_5, - Properties.Resources.rsBadge_6, - Properties.Resources.rsBadge_7, - Properties.Resources.rsBadge_8, + Properties.Resources.badge_01, // ORAS Badges + Properties.Resources.badge_02, + Properties.Resources.badge_03, + Properties.Resources.badge_04, + Properties.Resources.badge_05, + Properties.Resources.badge_06, + Properties.Resources.badge_07, + Properties.Resources.badge_08, }; } CheckBox[] cba = {cb1, cb2, cb3, cb4, cb5, cb6, cb7, cb8,}; @@ -453,8 +451,10 @@ private void getTextBoxes() 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; + GB_MaisonBest.Visible = GB_MaisonCurrent.Visible = + GB_Appear.Visible = GB_Map.Visible = GB_Misc.Visible = + L_BP.Visible = TB_BP.Visible = + L_PM.Visible = TB_PM.Visible = !m_parent.savegame_oras; TB_Style.Text = sav[0x694D + savshift].ToString(); @@ -681,5 +681,12 @@ private void giveAllAccessories(object sender, EventArgs e) }; Array.Copy(data,0,sav,savshift + 0x6E00,0x6C); } + + private void toggleBadge(object sender, EventArgs e) + { + int val = Convert.ToInt16(((PictureBox)sender).Name.Last().ToString())-1; + CheckBox[] chka = new CheckBox[] { cb1, cb2, cb3, cb4, cb5, cb6, cb7, cb8 }; + chka[val].Checked = !chka[val].Checked; + } } }