Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-03-21 17:48:28 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Split winforms to separate project

Browse Source 
resources still are associated with winforms, eh
program still runs fine and I've replicated the mono build options. lmk
if this breaks stuff
This commit is contained in:
Kurt 2017-01-07 23:54:09 -08:00
parent bd1ac8e266
commit 595c7eb4c5
240 changed files with 5858 additions and 5313 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
PKHeX.WinForms/App.config Normal file
View File

@ -0,0 +1,3 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
</configuration>

66
PKHeX/MainWindow/Main.Designer.cs → PKHeX.WinForms/MainWindow/Main.Designer.cs generated
View File

@ -1,4 +1,4 @@
namespace PKHeX
namespace PKHeX.WinForms
{
partial class Main
{
@ -3419,8 +3419,8 @@ public void InitializeComponent()
//
// PB_MarkAlola
//
this.PB_MarkAlola.Image = global::PKHeX.Properties.Resources.sanchi;
this.PB_MarkAlola.InitialImage = global::PKHeX.Properties.Resources.sanchi;
this.PB_MarkAlola.Image = Core.Properties.Resources.sanchi;
this.PB_MarkAlola.InitialImage = Core.Properties.Resources.sanchi;
this.PB_MarkAlola.Location = new System.Drawing.Point(96, 15);
this.PB_MarkAlola.Name = "PB_MarkAlola";
this.PB_MarkAlola.Size = new System.Drawing.Size(20, 20);
@ -3696,7 +3696,7 @@ public void InitializeComponent()
//
// Menu_Open
//
this.Menu_Open.Image = global::PKHeX.Properties.Resources.open;
this.Menu_Open.Image = Core.Properties.Resources.open;
this.Menu_Open.Name = "Menu_Open";
this.Menu_Open.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O)));
this.Menu_Open.ShowShortcutKeys = false;
@ -3706,7 +3706,7 @@ public void InitializeComponent()
//
// Menu_Save
//
this.Menu_Save.Image = global::PKHeX.Properties.Resources.savePKM;
this.Menu_Save.Image = Core.Properties.Resources.savePKM;
this.Menu_Save.Name = "Menu_Save";
this.Menu_Save.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S)));
this.Menu_Save.ShowShortcutKeys = false;
@ -3720,14 +3720,14 @@ public void InitializeComponent()
this.Menu_ExportMAIN,
this.Menu_ExportBAK});
this.Menu_ExportSAV.Enabled = false;
this.Menu_ExportSAV.Image = global::PKHeX.Properties.Resources.saveSAV;
this.Menu_ExportSAV.Image = Core.Properties.Resources.saveSAV;
this.Menu_ExportSAV.Name = "Menu_ExportSAV";
this.Menu_ExportSAV.Size = new System.Drawing.Size(139, 22);
this.Menu_ExportSAV.Text = "&Export SAV...";
//
// Menu_ExportMAIN
//
this.Menu_ExportMAIN.Image = global::PKHeX.Properties.Resources.main;
this.Menu_ExportMAIN.Image = Core.Properties.Resources.main;
this.Menu_ExportMAIN.Name = "Menu_ExportMAIN";
this.Menu_ExportMAIN.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.E)));
this.Menu_ExportMAIN.ShowShortcutKeys = false;
@ -3737,7 +3737,7 @@ public void InitializeComponent()
//
// Menu_ExportBAK
//
this.Menu_ExportBAK.Image = global::PKHeX.Properties.Resources.bak;
this.Menu_ExportBAK.Image = Core.Properties.Resources.bak;
this.Menu_ExportBAK.Name = "Menu_ExportBAK";
this.Menu_ExportBAK.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.B)));
this.Menu_ExportBAK.ShowShortcutKeys = false;
@ -3747,7 +3747,7 @@ public void InitializeComponent()
//
// Menu_Exit
//
this.Menu_Exit.Image = global::PKHeX.Properties.Resources.exit;
this.Menu_Exit.Image = Core.Properties.Resources.exit;
this.Menu_Exit.Name = "Menu_Exit";
this.Menu_Exit.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Q)));
this.Menu_Exit.ShowShortcutKeys = false;
@ -3773,14 +3773,14 @@ public void InitializeComponent()
this.Menu_ShowdownExportPKM,
this.Menu_ShowdownExportParty,
this.Menu_ShowdownExportBattleBox});
this.Menu_Showdown.Image = global::PKHeX.Properties.Resources.showdown;
this.Menu_Showdown.Image = Core.Properties.Resources.showdown;
this.Menu_Showdown.Name = "Menu_Showdown";
this.Menu_Showdown.Size = new System.Drawing.Size(143, 22);
this.Menu_Showdown.Text = "Showdown";
//
// Menu_ShowdownImportPKM
//
this.Menu_ShowdownImportPKM.Image = global::PKHeX.Properties.Resources.import;
this.Menu_ShowdownImportPKM.Image = Core.Properties.Resources.import;
this.Menu_ShowdownImportPKM.Name = "Menu_ShowdownImportPKM";
this.Menu_ShowdownImportPKM.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.T)));
this.Menu_ShowdownImportPKM.ShowShortcutKeys = false;
@ -3790,7 +3790,7 @@ public void InitializeComponent()
//
// Menu_ShowdownExportPKM
//
this.Menu_ShowdownExportPKM.Image = global::PKHeX.Properties.Resources.export;
this.Menu_ShowdownExportPKM.Image = Core.Properties.Resources.export;
this.Menu_ShowdownExportPKM.Name = "Menu_ShowdownExportPKM";
this.Menu_ShowdownExportPKM.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
| System.Windows.Forms.Keys.T)));
@ -3801,7 +3801,7 @@ public void InitializeComponent()
//
// Menu_ShowdownExportParty
//
this.Menu_ShowdownExportParty.Image = global::PKHeX.Properties.Resources.export;
this.Menu_ShowdownExportParty.Image = Core.Properties.Resources.export;
this.Menu_ShowdownExportParty.Name = "Menu_ShowdownExportParty";
this.Menu_ShowdownExportParty.Size = new System.Drawing.Size(231, 22);
this.Menu_ShowdownExportParty.Text = "Export Party to Clipboard";
@ -3809,7 +3809,7 @@ public void InitializeComponent()
//
// Menu_ShowdownExportBattleBox
//
this.Menu_ShowdownExportBattleBox.Image = global::PKHeX.Properties.Resources.export;
this.Menu_ShowdownExportBattleBox.Image = Core.Properties.Resources.export;
this.Menu_ShowdownExportBattleBox.Name = "Menu_ShowdownExportBattleBox";
this.Menu_ShowdownExportBattleBox.Size = new System.Drawing.Size(231, 22);
this.Menu_ShowdownExportBattleBox.Text = "Export Battle Box to Clipboard";
@ -3820,14 +3820,14 @@ public void InitializeComponent()
this.Menu_CyberGadget.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.Menu_OpenTemp,
this.Menu_OpenCache});
this.Menu_CyberGadget.Image = global::PKHeX.Properties.Resources.other;
this.Menu_CyberGadget.Image = Core.Properties.Resources.other;
this.Menu_CyberGadget.Name = "Menu_CyberGadget";
this.Menu_CyberGadget.Size = new System.Drawing.Size(143, 22);
this.Menu_CyberGadget.Text = "CyberGadget";
//
// Menu_OpenTemp
//
this.Menu_OpenTemp.Image = global::PKHeX.Properties.Resources.folder;
this.Menu_OpenTemp.Image = Core.Properties.Resources.folder;
this.Menu_OpenTemp.Name = "Menu_OpenTemp";
this.Menu_OpenTemp.Size = new System.Drawing.Size(175, 22);
this.Menu_OpenTemp.Text = "Open Temp Folder";
@ -3835,7 +3835,7 @@ public void InitializeComponent()
//
// Menu_OpenCache
//
this.Menu_OpenCache.Image = global::PKHeX.Properties.Resources.folder;
this.Menu_OpenCache.Image = Core.Properties.Resources.folder;
this.Menu_OpenCache.Name = "Menu_OpenCache";
this.Menu_OpenCache.Size = new System.Drawing.Size(175, 22);
this.Menu_OpenCache.Text = "Open Cache Folder";
@ -3850,14 +3850,14 @@ public void InitializeComponent()
this.Menu_Database,
this.Menu_MGDatabase,
this.Menu_BatchEditor});
this.Menu_Data.Image = global::PKHeX.Properties.Resources.data;
this.Menu_Data.Image = Core.Properties.Resources.data;
this.Menu_Data.Name = "Menu_Data";
this.Menu_Data.Size = new System.Drawing.Size(143, 22);
this.Menu_Data.Text = "Data";
//
// Menu_LoadBoxes
//
this.Menu_LoadBoxes.Image = global::PKHeX.Properties.Resources.load;
this.Menu_LoadBoxes.Image = Core.Properties.Resources.load;
this.Menu_LoadBoxes.Name = "Menu_LoadBoxes";
this.Menu_LoadBoxes.Size = new System.Drawing.Size(182, 22);
this.Menu_LoadBoxes.Text = "Load Boxes";
@ -3865,7 +3865,7 @@ public void InitializeComponent()
//
// Menu_DumpBoxes
//
this.Menu_DumpBoxes.Image = global::PKHeX.Properties.Resources.dump;
this.Menu_DumpBoxes.Image = Core.Properties.Resources.dump;
this.Menu_DumpBoxes.Name = "Menu_DumpBoxes";
this.Menu_DumpBoxes.Size = new System.Drawing.Size(182, 22);
this.Menu_DumpBoxes.Text = "Dump Boxes";
@ -3873,7 +3873,7 @@ public void InitializeComponent()
//
// Menu_Report
//
this.Menu_Report.Image = global::PKHeX.Properties.Resources.report;
this.Menu_Report.Image = Core.Properties.Resources.report;
this.Menu_Report.Name = "Menu_Report";
this.Menu_Report.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.R)));
this.Menu_Report.ShowShortcutKeys = false;
@ -3883,7 +3883,7 @@ public void InitializeComponent()
//
// Menu_Database
//
this.Menu_Database.Image = global::PKHeX.Properties.Resources.database;
this.Menu_Database.Image = Core.Properties.Resources.database;
this.Menu_Database.Name = "Menu_Database";
this.Menu_Database.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.D)));
this.Menu_Database.ShowShortcutKeys = false;
@ -3893,7 +3893,7 @@ public void InitializeComponent()
//
// Menu_MGDatabase
//
this.Menu_MGDatabase.Image = global::PKHeX.Properties.Resources.gift;
this.Menu_MGDatabase.Image = Core.Properties.Resources.gift;
this.Menu_MGDatabase.Name = "Menu_MGDatabase";
this.Menu_MGDatabase.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.G)));
this.Menu_MGDatabase.ShowShortcutKeys = false;
@ -3903,7 +3903,7 @@ public void InitializeComponent()
//
// Menu_BatchEditor
//
this.Menu_BatchEditor.Image = global::PKHeX.Properties.Resources.settings;
this.Menu_BatchEditor.Image = Core.Properties.Resources.settings;
this.Menu_BatchEditor.Name = "Menu_BatchEditor";
this.Menu_BatchEditor.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.M)));
this.Menu_BatchEditor.ShowShortcutKeys = false;
@ -3916,14 +3916,14 @@ public void InitializeComponent()
this.Menu_Other.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.Menu_OpenSDF,
this.Menu_OpenSDB});
this.Menu_Other.Image = global::PKHeX.Properties.Resources.other;
this.Menu_Other.Image = Core.Properties.Resources.other;
this.Menu_Other.Name = "Menu_Other";
this.Menu_Other.Size = new System.Drawing.Size(143, 22);
this.Menu_Other.Text = "Other";
//
// Menu_OpenSDF
//
this.Menu_OpenSDF.Image = global::PKHeX.Properties.Resources.folder;
this.Menu_OpenSDF.Image = Core.Properties.Resources.folder;
this.Menu_OpenSDF.Name = "Menu_OpenSDF";
this.Menu_OpenSDF.Size = new System.Drawing.Size(229, 22);
this.Menu_OpenSDF.Text = "Open SaveDataFiler Folder";
@ -3931,7 +3931,7 @@ public void InitializeComponent()
//
// Menu_OpenSDB
//
this.Menu_OpenSDB.Image = global::PKHeX.Properties.Resources.folder;
this.Menu_OpenSDB.Image = Core.Properties.Resources.folder;
this.Menu_OpenSDB.Name = "Menu_OpenSDB";
this.Menu_OpenSDB.Size = new System.Drawing.Size(229, 22);
this.Menu_OpenSDB.Text = "Open SaveDataBackup Folder";
@ -3952,7 +3952,7 @@ public void InitializeComponent()
//
this.Menu_Language.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.CB_MainLanguage});
this.Menu_Language.Image = global::PKHeX.Properties.Resources.language;
this.Menu_Language.Image = Core.Properties.Resources.language;
this.Menu_Language.Name = "Menu_Language";
this.Menu_Language.Size = new System.Drawing.Size(139, 22);
this.Menu_Language.Text = "Language";
@ -3971,7 +3971,7 @@ public void InitializeComponent()
this.Menu_ModifyPKM,
this.Menu_Undo,
this.Menu_Redo});
this.Menu_Modify.Image = global::PKHeX.Properties.Resources.settings;
this.Menu_Modify.Image = Core.Properties.Resources.settings;
this.Menu_Modify.Name = "Menu_Modify";
this.Menu_Modify.Size = new System.Drawing.Size(139, 22);
this.Menu_Modify.Text = "Set to SAV";
@ -4028,12 +4028,12 @@ public void InitializeComponent()
//
// Menu_About
//
this.Menu_About.Image = global::PKHeX.Properties.Resources.about;
this.Menu_About.Image = Core.Properties.Resources.about;
this.Menu_About.Name = "Menu_About";
this.Menu_About.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.P)));
this.Menu_About.ShowShortcutKeys = false;
this.Menu_About.Size = new System.Drawing.Size(139, 22);
this.Menu_About.Text = "About &PKHeX";
this.Menu_About.Text = "About &PKHeX.Core";
this.Menu_About.Click += new System.EventHandler(this.mainMenuAbout);
//
// tabBoxMulti
@ -4067,7 +4067,7 @@ public void InitializeComponent()
//
// PAN_Box
//
this.PAN_Box.BackgroundImage = global::PKHeX.Properties.Resources.box_wp16xy;
this.PAN_Box.BackgroundImage = Core.Properties.Resources.box_wp16xy;
this.PAN_Box.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.PAN_Box.Controls.Add(this.bpkx30);
this.PAN_Box.Controls.Add(this.bpkx29);
@ -5734,7 +5734,7 @@ public void InitializeComponent()
this.MaximizeBox = false;
this.Name = "Main";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "PKHeX";
this.Text = "PKHeX.Core";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Main_FormClosing);
this.DragDrop += new System.Windows.Forms.DragEventHandler(this.tabMain_DragDrop);
this.DragEnter += new System.Windows.Forms.DragEventHandler(this.tabMain_DragEnter);

477
PKHeX/MainWindow/Main.cs → PKHeX.WinForms/MainWindow/Main.cs
View File

File diff suppressed because it is too large Load Diff

0
PKHeX/MainWindow/Main.resx → PKHeX.WinForms/MainWindow/Main.resx
View File

39
PKHeX/MainWindow/MainCK3.cs → PKHeX.WinForms/MainWindow/MainCK3.cs
View File

@ -1,7 +1,8 @@
using System;
using System.Drawing;
using PKHeX.Core;
namespace PKHeX
namespace PKHeX.WinForms
{
public partial class Main
{
@ -129,8 +130,8 @@ private PKM prepareCK3()
if (ck3 == null)
return null;
ck3.Species = Util.getIndex(CB_Species);
ck3.HeldItem = Util.getIndex(CB_HeldItem);
ck3.Species = WinFormsUtil.getIndex(CB_Species);
ck3.HeldItem = WinFormsUtil.getIndex(CB_HeldItem);
ck3.TID = Util.ToInt32(TB_TID.Text);
ck3.SID = Util.ToInt32(TB_SID.Text);
ck3.EXP = Util.ToUInt32(TB_EXP.Text);
@ -156,18 +157,18 @@ private PKM prepareCK3()
ck3.PKRS_Days = CB_PKRSDays.SelectedIndex;
ck3.PKRS_Strain = CB_PKRSStrain.SelectedIndex;
ck3.Nickname = TB_Nickname.Text;
ck3.Move1 = Util.getIndex(CB_Move1);
ck3.Move2 = Util.getIndex(CB_Move2);
ck3.Move3 = Util.getIndex(CB_Move3);
ck3.Move4 = Util.getIndex(CB_Move4);
ck3.Move1_PP = Util.getIndex(CB_Move1) > 0 ? Util.ToInt32(TB_PP1.Text) : 0;
ck3.Move2_PP = Util.getIndex(CB_Move2) > 0 ? Util.ToInt32(TB_PP2.Text) : 0;
ck3.Move3_PP = Util.getIndex(CB_Move3) > 0 ? Util.ToInt32(TB_PP3.Text) : 0;
ck3.Move4_PP = Util.getIndex(CB_Move4) > 0 ? Util.ToInt32(TB_PP4.Text) : 0;
ck3.Move1_PPUps = Util.getIndex(CB_Move1) > 0 ? CB_PPu1.SelectedIndex : 0;
ck3.Move2_PPUps = Util.getIndex(CB_Move2) > 0 ? CB_PPu2.SelectedIndex : 0;
ck3.Move3_PPUps = Util.getIndex(CB_Move3) > 0 ? CB_PPu3.SelectedIndex : 0;
ck3.Move4_PPUps = Util.getIndex(CB_Move4) > 0 ? CB_PPu4.SelectedIndex : 0;
ck3.Move1 = WinFormsUtil.getIndex(CB_Move1);
ck3.Move2 = WinFormsUtil.getIndex(CB_Move2);
ck3.Move3 = WinFormsUtil.getIndex(CB_Move3);
ck3.Move4 = WinFormsUtil.getIndex(CB_Move4);
ck3.Move1_PP = WinFormsUtil.getIndex(CB_Move1) > 0 ? Util.ToInt32(TB_PP1.Text) : 0;
ck3.Move2_PP = WinFormsUtil.getIndex(CB_Move2) > 0 ? Util.ToInt32(TB_PP2.Text) : 0;
ck3.Move3_PP = WinFormsUtil.getIndex(CB_Move3) > 0 ? Util.ToInt32(TB_PP3.Text) : 0;
ck3.Move4_PP = WinFormsUtil.getIndex(CB_Move4) > 0 ? Util.ToInt32(TB_PP4.Text) : 0;
ck3.Move1_PPUps = WinFormsUtil.getIndex(CB_Move1) > 0 ? CB_PPu1.SelectedIndex : 0;
ck3.Move2_PPUps = WinFormsUtil.getIndex(CB_Move2) > 0 ? CB_PPu2.SelectedIndex : 0;
ck3.Move3_PPUps = WinFormsUtil.getIndex(CB_Move3) > 0 ? CB_PPu3.SelectedIndex : 0;
ck3.Move4_PPUps = WinFormsUtil.getIndex(CB_Move4) > 0 ? CB_PPu4.SelectedIndex : 0;
ck3.IV_HP = Util.ToInt32(TB_HPIV.Text);
ck3.IV_ATK = Util.ToInt32(TB_ATKIV.Text);
@ -181,13 +182,13 @@ private PKM prepareCK3()
ck3.OT_Name = TB_OT.Text;
ck3.CurrentFriendship = Util.ToInt32(TB_Friendship.Text);
ck3.Ball = Util.getIndex(CB_Ball);
ck3.Ball = WinFormsUtil.getIndex(CB_Ball);
ck3.Met_Level = Util.ToInt32(TB_MetLevel.Text);
ck3.OT_Gender = PKX.getGender(Label_OTGender.Text);
ck3.Version = Util.getIndex(CB_GameOrigin);
ck3.Language = Util.getIndex(CB_Language);
ck3.Version = WinFormsUtil.getIndex(CB_GameOrigin);
ck3.Language = WinFormsUtil.getIndex(CB_Language);
ck3.Met_Location = Util.getIndex(CB_MetLocation);
ck3.Met_Location = WinFormsUtil.getIndex(CB_MetLocation);
// Toss in Party Stats
Array.Resize(ref ck3.Data, ck3.SIZE_PARTY);

29
PKHeX/MainWindow/MainPK1.cs → PKHeX.WinForms/MainWindow/MainPK1.cs
View File

@ -1,6 +1,7 @@
using System;
using PKHeX.Core;
namespace PKHeX
namespace PKHeX.WinForms
{
public partial class Main
{
@ -67,7 +68,7 @@ private PKM preparePK1()
if (pk1 == null)
return null;
pk1.Species = Util.getIndex(CB_Species);
pk1.Species = WinFormsUtil.getIndex(CB_Species);
pk1.TID = Util.ToInt32(TB_TID.Text);
pk1.EXP = Util.ToUInt32(TB_EXP.Text);
@ -81,18 +82,18 @@ private PKM preparePK1()
pk1.Nickname = TB_Nickname.Text;
else
pk1.setNotNicknamed();
pk1.Move1 = Util.getIndex(CB_Move1);
pk1.Move2 = Util.getIndex(CB_Move2);
pk1.Move3 = Util.getIndex(CB_Move3);
pk1.Move4 = Util.getIndex(CB_Move4);
pk1.Move1_PP = Util.getIndex(CB_Move1) > 0 ? Util.ToInt32(TB_PP1.Text) : 0;
pk1.Move2_PP = Util.getIndex(CB_Move2) > 0 ? Util.ToInt32(TB_PP2.Text) : 0;
pk1.Move3_PP = Util.getIndex(CB_Move3) > 0 ? Util.ToInt32(TB_PP3.Text) : 0;
pk1.Move4_PP = Util.getIndex(CB_Move4) > 0 ? Util.ToInt32(TB_PP4.Text) : 0;
pk1.Move1_PPUps = Util.getIndex(CB_Move1) > 0 ? CB_PPu1.SelectedIndex : 0;
pk1.Move2_PPUps = Util.getIndex(CB_Move2) > 0 ? CB_PPu2.SelectedIndex : 0;
pk1.Move3_PPUps = Util.getIndex(CB_Move3) > 0 ? CB_PPu3.SelectedIndex : 0;
pk1.Move4_PPUps = Util.getIndex(CB_Move4) > 0 ? CB_PPu4.SelectedIndex : 0;
pk1.Move1 = WinFormsUtil.getIndex(CB_Move1);
pk1.Move2 = WinFormsUtil.getIndex(CB_Move2);
pk1.Move3 = WinFormsUtil.getIndex(CB_Move3);
pk1.Move4 = WinFormsUtil.getIndex(CB_Move4);
pk1.Move1_PP = WinFormsUtil.getIndex(CB_Move1) > 0 ? Util.ToInt32(TB_PP1.Text) : 0;
pk1.Move2_PP = WinFormsUtil.getIndex(CB_Move2) > 0 ? Util.ToInt32(TB_PP2.Text) : 0;
pk1.Move3_PP = WinFormsUtil.getIndex(CB_Move3) > 0 ? Util.ToInt32(TB_PP3.Text) : 0;
pk1.Move4_PP = WinFormsUtil.getIndex(CB_Move4) > 0 ? Util.ToInt32(TB_PP4.Text) : 0;
pk1.Move1_PPUps = WinFormsUtil.getIndex(CB_Move1) > 0 ? CB_PPu1.SelectedIndex : 0;
pk1.Move2_PPUps = WinFormsUtil.getIndex(CB_Move2) > 0 ? CB_PPu2.SelectedIndex : 0;
pk1.Move3_PPUps = WinFormsUtil.getIndex(CB_Move3) > 0 ? CB_PPu3.SelectedIndex : 0;
pk1.Move4_PPUps = WinFormsUtil.getIndex(CB_Move4) > 0 ? CB_PPu4.SelectedIndex : 0;
pk1.IV_HP = Util.ToInt32(TB_HPIV.Text);
pk1.IV_ATK = Util.ToInt32(TB_ATKIV.Text);

33
PKHeX/MainWindow/MainPK2.cs → PKHeX.WinForms/MainWindow/MainPK2.cs
View File

@ -1,7 +1,8 @@
using System;
using System.Drawing;
using PKHeX.Core;
namespace PKHeX
namespace PKHeX.WinForms
{
public partial class Main
{
@ -80,14 +81,14 @@ private PKM preparePK2()
if (pk2 == null)
return null;
pk2.Species = Util.getIndex(CB_Species);
pk2.Species = WinFormsUtil.getIndex(CB_Species);
pk2.TID = Util.ToInt32(TB_TID.Text);
pk2.EXP = Util.ToUInt32(TB_EXP.Text);
pk2.HeldItem = Util.getIndex(CB_HeldItem);
pk2.HeldItem = WinFormsUtil.getIndex(CB_HeldItem);
pk2.IsEgg = CHK_IsEgg.Checked;
pk2.CurrentFriendship = Util.ToInt32(TB_Friendship.Text);
pk2.Met_Level = Util.ToInt32(TB_MetLevel.Text);
pk2.Met_Location = Util.getIndex(CB_MetLocation);
pk2.Met_Location = WinFormsUtil.getIndex(CB_MetLocation);
pk2.Met_TimeOfDay = CB_MetTimeOfDay.SelectedIndex;
pk2.EV_HP = Util.ToInt32(TB_HPEV.Text);
@ -100,18 +101,18 @@ private PKM preparePK2()
pk2.Nickname = TB_Nickname.Text;
else
pk2.setNotNicknamed();
pk2.Move1 = Util.getIndex(CB_Move1);
pk2.Move2 = Util.getIndex(CB_Move2);
pk2.Move3 = Util.getIndex(CB_Move3);
pk2.Move4 = Util.getIndex(CB_Move4);
pk2.Move1_PP = Util.getIndex(CB_Move1) > 0 ? Util.ToInt32(TB_PP1.Text) : 0;
pk2.Move2_PP = Util.getIndex(CB_Move2) > 0 ? Util.ToInt32(TB_PP2.Text) : 0;
pk2.Move3_PP = Util.getIndex(CB_Move3) > 0 ? Util.ToInt32(TB_PP3.Text) : 0;
pk2.Move4_PP = Util.getIndex(CB_Move4) > 0 ? Util.ToInt32(TB_PP4.Text) : 0;
pk2.Move1_PPUps = Util.getIndex(CB_Move1) > 0 ? CB_PPu1.SelectedIndex : 0;
pk2.Move2_PPUps = Util.getIndex(CB_Move2) > 0 ? CB_PPu2.SelectedIndex : 0;
pk2.Move3_PPUps = Util.getIndex(CB_Move3) > 0 ? CB_PPu3.SelectedIndex : 0;
pk2.Move4_PPUps = Util.getIndex(CB_Move4) > 0 ? CB_PPu4.SelectedIndex : 0;
pk2.Move1 = WinFormsUtil.getIndex(CB_Move1);
pk2.Move2 = WinFormsUtil.getIndex(CB_Move2);
pk2.Move3 = WinFormsUtil.getIndex(CB_Move3);
pk2.Move4 = WinFormsUtil.getIndex(CB_Move4);
pk2.Move1_PP = WinFormsUtil.getIndex(CB_Move1) > 0 ? Util.ToInt32(TB_PP1.Text) : 0;
pk2.Move2_PP = WinFormsUtil.getIndex(CB_Move2) > 0 ? Util.ToInt32(TB_PP2.Text) : 0;
pk2.Move3_PP = WinFormsUtil.getIndex(CB_Move3) > 0 ? Util.ToInt32(TB_PP3.Text) : 0;
pk2.Move4_PP = WinFormsUtil.getIndex(CB_Move4) > 0 ? Util.ToInt32(TB_PP4.Text) : 0;
pk2.Move1_PPUps = WinFormsUtil.getIndex(CB_Move1) > 0 ? CB_PPu1.SelectedIndex : 0;
pk2.Move2_PPUps = WinFormsUtil.getIndex(CB_Move2) > 0 ? CB_PPu2.SelectedIndex : 0;
pk2.Move3_PPUps = WinFormsUtil.getIndex(CB_Move3) > 0 ? CB_PPu3.SelectedIndex : 0;
pk2.Move4_PPUps = WinFormsUtil.getIndex(CB_Move4) > 0 ? CB_PPu4.SelectedIndex : 0;
pk2.IV_HP = Util.ToInt32(TB_HPIV.Text);
pk2.IV_ATK = Util.ToInt32(TB_ATKIV.Text);

39
PKHeX/MainWindow/MainPK3.cs → PKHeX.WinForms/MainWindow/MainPK3.cs
View File

@ -1,7 +1,8 @@
using System;
using System.Drawing;
using PKHeX.Core;
namespace PKHeX
namespace PKHeX.WinForms
{
public partial class Main
{
@ -107,8 +108,8 @@ private PKM preparePK3()
if (pk3 == null)
return null;
pk3.Species = Util.getIndex(CB_Species);
pk3.HeldItem = Util.getIndex(CB_HeldItem);
pk3.Species = WinFormsUtil.getIndex(CB_Species);
pk3.HeldItem = WinFormsUtil.getIndex(CB_HeldItem);
pk3.TID = Util.ToInt32(TB_TID.Text);
pk3.SID = Util.ToInt32(TB_SID.Text);
pk3.EXP = Util.ToUInt32(TB_EXP.Text);
@ -134,18 +135,18 @@ private PKM preparePK3()
pk3.PKRS_Days = CB_PKRSDays.SelectedIndex;
pk3.PKRS_Strain = CB_PKRSStrain.SelectedIndex;
pk3.Nickname = TB_Nickname.Text;
pk3.Move1 = Util.getIndex(CB_Move1);
pk3.Move2 = Util.getIndex(CB_Move2);
pk3.Move3 = Util.getIndex(CB_Move3);
pk3.Move4 = Util.getIndex(CB_Move4);
pk3.Move1_PP = Util.getIndex(CB_Move1) > 0 ? Util.ToInt32(TB_PP1.Text) : 0;
pk3.Move2_PP = Util.getIndex(CB_Move2) > 0 ? Util.ToInt32(TB_PP2.Text) : 0;
pk3.Move3_PP = Util.getIndex(CB_Move3) > 0 ? Util.ToInt32(TB_PP3.Text) : 0;
pk3.Move4_PP = Util.getIndex(CB_Move4) > 0 ? Util.ToInt32(TB_PP4.Text) : 0;
pk3.Move1_PPUps = Util.getIndex(CB_Move1) > 0 ? CB_PPu1.SelectedIndex : 0;
pk3.Move2_PPUps = Util.getIndex(CB_Move2) > 0 ? CB_PPu2.SelectedIndex : 0;
pk3.Move3_PPUps = Util.getIndex(CB_Move3) > 0 ? CB_PPu3.SelectedIndex : 0;
pk3.Move4_PPUps = Util.getIndex(CB_Move4) > 0 ? CB_PPu4.SelectedIndex : 0;
pk3.Move1 = WinFormsUtil.getIndex(CB_Move1);
pk3.Move2 = WinFormsUtil.getIndex(CB_Move2);
pk3.Move3 = WinFormsUtil.getIndex(CB_Move3);
pk3.Move4 = WinFormsUtil.getIndex(CB_Move4);
pk3.Move1_PP = WinFormsUtil.getIndex(CB_Move1) > 0 ? Util.ToInt32(TB_PP1.Text) : 0;
pk3.Move2_PP = WinFormsUtil.getIndex(CB_Move2) > 0 ? Util.ToInt32(TB_PP2.Text) : 0;
pk3.Move3_PP = WinFormsUtil.getIndex(CB_Move3) > 0 ? Util.ToInt32(TB_PP3.Text) : 0;
pk3.Move4_PP = WinFormsUtil.getIndex(CB_Move4) > 0 ? Util.ToInt32(TB_PP4.Text) : 0;
pk3.Move1_PPUps = WinFormsUtil.getIndex(CB_Move1) > 0 ? CB_PPu1.SelectedIndex : 0;
pk3.Move2_PPUps = WinFormsUtil.getIndex(CB_Move2) > 0 ? CB_PPu2.SelectedIndex : 0;
pk3.Move3_PPUps = WinFormsUtil.getIndex(CB_Move3) > 0 ? CB_PPu3.SelectedIndex : 0;
pk3.Move4_PPUps = WinFormsUtil.getIndex(CB_Move4) > 0 ? CB_PPu4.SelectedIndex : 0;
pk3.IV_HP = Util.ToInt32(TB_HPIV.Text);
pk3.IV_ATK = Util.ToInt32(TB_ATKIV.Text);
@ -159,13 +160,13 @@ private PKM preparePK3()
pk3.OT_Name = TB_OT.Text;
pk3.CurrentFriendship = Util.ToInt32(TB_Friendship.Text);
pk3.Ball = Util.getIndex(CB_Ball);
pk3.Ball = WinFormsUtil.getIndex(CB_Ball);
pk3.Met_Level = Util.ToInt32(TB_MetLevel.Text);
pk3.OT_Gender = PKX.getGender(Label_OTGender.Text);
pk3.Version = Util.getIndex(CB_GameOrigin);
pk3.Language = Util.getIndex(CB_Language);
pk3.Version = WinFormsUtil.getIndex(CB_GameOrigin);
pk3.Language = WinFormsUtil.getIndex(CB_Language);
pk3.Met_Location = Util.getIndex(CB_MetLocation);
pk3.Met_Location = WinFormsUtil.getIndex(CB_MetLocation);
// Toss in Party Stats
Array.Resize(ref pk3.Data, pk3.SIZE_PARTY);

91
PKHeX/MainWindow/MainPK4.cs → PKHeX.WinForms/MainWindow/MainPK4.cs
View File

@ -1,7 +1,8 @@
using System;
using System.Drawing;
using PKHeX.Core;
namespace PKHeX
namespace PKHeX.WinForms
{
public partial class Main
{
@ -142,13 +143,13 @@ private PKM preparePK4()
if (pk4 == null)
return null;
pk4.Species = Util.getIndex(CB_Species);
pk4.HeldItem = Util.getIndex(CB_HeldItem);
pk4.Species = WinFormsUtil.getIndex(CB_Species);
pk4.HeldItem = WinFormsUtil.getIndex(CB_HeldItem);
pk4.TID = Util.ToInt32(TB_TID.Text);
pk4.SID = Util.ToInt32(TB_SID.Text);
pk4.EXP = Util.ToUInt32(TB_EXP.Text);
pk4.PID = Util.getHEXval(TB_PID.Text);
pk4.Ability = (byte)Array.IndexOf(GameStrings.abilitylist, CB_Ability.Text.Remove(CB_Ability.Text.Length - 4));
pk4.Ability = (byte)Array.IndexOf(GameInfo.Strings.abilitylist, CB_Ability.Text.Remove(CB_Ability.Text.Length - 4));
pk4.FatefulEncounter = CHK_Fateful.Checked;
pk4.Gender = PKX.getGender(Label_Gender.Text);
@ -170,18 +171,18 @@ private PKM preparePK4()
pk4.PKRS_Days = CB_PKRSDays.SelectedIndex;
pk4.PKRS_Strain = CB_PKRSStrain.SelectedIndex;
pk4.Nickname = TB_Nickname.Text;
pk4.Move1 = Util.getIndex(CB_Move1);
pk4.Move2 = Util.getIndex(CB_Move2);
pk4.Move3 = Util.getIndex(CB_Move3);
pk4.Move4 = Util.getIndex(CB_Move4);
pk4.Move1_PP = Util.getIndex(CB_Move1) > 0 ? Util.ToInt32(TB_PP1.Text) : 0;
pk4.Move2_PP = Util.getIndex(CB_Move2) > 0 ? Util.ToInt32(TB_PP2.Text) : 0;
pk4.Move3_PP = Util.getIndex(CB_Move3) > 0 ? Util.ToInt32(TB_PP3.Text) : 0;
pk4.Move4_PP = Util.getIndex(CB_Move4) > 0 ? Util.ToInt32(TB_PP4.Text) : 0;
pk4.Move1_PPUps = Util.getIndex(CB_Move1) > 0 ? CB_PPu1.SelectedIndex : 0;
pk4.Move2_PPUps = Util.getIndex(CB_Move2) > 0 ? CB_PPu2.SelectedIndex : 0;
pk4.Move3_PPUps = Util.getIndex(CB_Move3) > 0 ? CB_PPu3.SelectedIndex : 0;
pk4.Move4_PPUps = Util.getIndex(CB_Move4) > 0 ? CB_PPu4.SelectedIndex : 0;
pk4.Move1 = WinFormsUtil.getIndex(CB_Move1);
pk4.Move2 = WinFormsUtil.getIndex(CB_Move2);
pk4.Move3 = WinFormsUtil.getIndex(CB_Move3);
pk4.Move4 = WinFormsUtil.getIndex(CB_Move4);
pk4.Move1_PP = WinFormsUtil.getIndex(CB_Move1) > 0 ? Util.ToInt32(TB_PP1.Text) : 0;
pk4.Move2_PP = WinFormsUtil.getIndex(CB_Move2) > 0 ? Util.ToInt32(TB_PP2.Text) : 0;
pk4.Move3_PP = WinFormsUtil.getIndex(CB_Move3) > 0 ? Util.ToInt32(TB_PP3.Text) : 0;
pk4.Move4_PP = WinFormsUtil.getIndex(CB_Move4) > 0 ? Util.ToInt32(TB_PP4.Text) : 0;
pk4.Move1_PPUps = WinFormsUtil.getIndex(CB_Move1) > 0 ? CB_PPu1.SelectedIndex : 0;
pk4.Move2_PPUps = WinFormsUtil.getIndex(CB_Move2) > 0 ? CB_PPu2.SelectedIndex : 0;
pk4.Move3_PPUps = WinFormsUtil.getIndex(CB_Move3) > 0 ? CB_PPu3.SelectedIndex : 0;
pk4.Move4_PPUps = WinFormsUtil.getIndex(CB_Move4) > 0 ? CB_PPu4.SelectedIndex : 0;
pk4.IV_HP = Util.ToInt32(TB_HPIV.Text);
pk4.IV_ATK = Util.ToInt32(TB_ATKIV.Text);
@ -195,12 +196,12 @@ private PKM preparePK4()
pk4.OT_Name = TB_OT.Text;
pk4.CurrentFriendship = Util.ToInt32(TB_Friendship.Text);
pk4.Ball = Util.getIndex(CB_Ball);
pk4.Ball = WinFormsUtil.getIndex(CB_Ball);
pk4.Met_Level = Util.ToInt32(TB_MetLevel.Text);
pk4.OT_Gender = PKX.getGender(Label_OTGender.Text);
pk4.EncounterType = Util.getIndex(CB_EncounterType);
pk4.Version = Util.getIndex(CB_GameOrigin);
pk4.Language = Util.getIndex(CB_Language);
pk4.EncounterType = WinFormsUtil.getIndex(CB_EncounterType);
pk4.Version = WinFormsUtil.getIndex(CB_GameOrigin);
pk4.Language = WinFormsUtil.getIndex(CB_Language);
// Default Dates
DateTime? egg_date = null;
@ -208,14 +209,14 @@ private PKM preparePK4()
if (CHK_AsEgg.Checked) // If encountered as an egg, load the Egg Met data from fields.
{
egg_date = CAL_EggDate.Value;
egg_location = Util.getIndex(CB_EggLocation);
egg_location = WinFormsUtil.getIndex(CB_EggLocation);
}
// Egg Met Data
pk4.EggMetDate = egg_date;
pk4.Egg_Location = egg_location;
// Met Data
pk4.MetDate = CAL_MetDate.Value;
pk4.Met_Location = Util.getIndex(CB_MetLocation);
pk4.Met_Location = WinFormsUtil.getIndex(CB_MetLocation);
if (pk4.IsEgg && pk4.Met_Location == 0) // If still an egg, it has no hatch location/date. Zero it!
pk4.MetDate = null;
@ -233,7 +234,7 @@ private PKM preparePK4()
if (HaX)
{
pk4.Ability = (byte)Util.getIndex(DEV_Ability);
pk4.Ability = (byte)WinFormsUtil.getIndex(DEV_Ability);
pk4.Stat_Level = (byte)Math.Min(Convert.ToInt32(MT_Level.Text), byte.MaxValue);
}
@ -375,13 +376,13 @@ private PKM prepareBK4()
if (pk4 == null)
return null;
pk4.Species = Util.getIndex(CB_Species);
pk4.HeldItem = Util.getIndex(CB_HeldItem);
pk4.Species = WinFormsUtil.getIndex(CB_Species);
pk4.HeldItem = WinFormsUtil.getIndex(CB_HeldItem);
pk4.TID = Util.ToInt32(TB_TID.Text);
pk4.SID = Util.ToInt32(TB_SID.Text);
pk4.EXP = Util.ToUInt32(TB_EXP.Text);
pk4.PID = Util.getHEXval(TB_PID.Text);
pk4.Ability = (byte)Array.IndexOf(GameStrings.abilitylist, CB_Ability.Text.Remove(CB_Ability.Text.Length - 4));
pk4.Ability = (byte)Array.IndexOf(GameInfo.Strings.abilitylist, CB_Ability.Text.Remove(CB_Ability.Text.Length - 4));
pk4.FatefulEncounter = CHK_Fateful.Checked;
pk4.Gender = PKX.getGender(Label_Gender.Text);
@ -403,18 +404,18 @@ private PKM prepareBK4()
pk4.PKRS_Days = CB_PKRSDays.SelectedIndex;
pk4.PKRS_Strain = CB_PKRSStrain.SelectedIndex;
pk4.Nickname = TB_Nickname.Text;
pk4.Move1 = Util.getIndex(CB_Move1);
pk4.Move2 = Util.getIndex(CB_Move2);
pk4.Move3 = Util.getIndex(CB_Move3);
pk4.Move4 = Util.getIndex(CB_Move4);
pk4.Move1_PP = Util.getIndex(CB_Move1) > 0 ? Util.ToInt32(TB_PP1.Text) : 0;
pk4.Move2_PP = Util.getIndex(CB_Move2) > 0 ? Util.ToInt32(TB_PP2.Text) : 0;
pk4.Move3_PP = Util.getIndex(CB_Move3) > 0 ? Util.ToInt32(TB_PP3.Text) : 0;
pk4.Move4_PP = Util.getIndex(CB_Move4) > 0 ? Util.ToInt32(TB_PP4.Text) : 0;
pk4.Move1_PPUps = Util.getIndex(CB_Move1) > 0 ? CB_PPu1.SelectedIndex : 0;
pk4.Move2_PPUps = Util.getIndex(CB_Move2) > 0 ? CB_PPu2.SelectedIndex : 0;
pk4.Move3_PPUps = Util.getIndex(CB_Move3) > 0 ? CB_PPu3.SelectedIndex : 0;
pk4.Move4_PPUps = Util.getIndex(CB_Move4) > 0 ? CB_PPu4.SelectedIndex : 0;
pk4.Move1 = WinFormsUtil.getIndex(CB_Move1);
pk4.Move2 = WinFormsUtil.getIndex(CB_Move2);
pk4.Move3 = WinFormsUtil.getIndex(CB_Move3);
pk4.Move4 = WinFormsUtil.getIndex(CB_Move4);
pk4.Move1_PP = WinFormsUtil.getIndex(CB_Move1) > 0 ? Util.ToInt32(TB_PP1.Text) : 0;
pk4.Move2_PP = WinFormsUtil.getIndex(CB_Move2) > 0 ? Util.ToInt32(TB_PP2.Text) : 0;
pk4.Move3_PP = WinFormsUtil.getIndex(CB_Move3) > 0 ? Util.ToInt32(TB_PP3.Text) : 0;
pk4.Move4_PP = WinFormsUtil.getIndex(CB_Move4) > 0 ? Util.ToInt32(TB_PP4.Text) : 0;
pk4.Move1_PPUps = WinFormsUtil.getIndex(CB_Move1) > 0 ? CB_PPu1.SelectedIndex : 0;
pk4.Move2_PPUps = WinFormsUtil.getIndex(CB_Move2) > 0 ? CB_PPu2.SelectedIndex : 0;
pk4.Move3_PPUps = WinFormsUtil.getIndex(CB_Move3) > 0 ? CB_PPu3.SelectedIndex : 0;
pk4.Move4_PPUps = WinFormsUtil.getIndex(CB_Move4) > 0 ? CB_PPu4.SelectedIndex : 0;
pk4.IV_HP = Util.ToInt32(TB_HPIV.Text);
pk4.IV_ATK = Util.ToInt32(TB_ATKIV.Text);
@ -428,12 +429,12 @@ private PKM prepareBK4()
pk4.OT_Name = TB_OT.Text;
pk4.CurrentFriendship = Util.ToInt32(TB_Friendship.Text);
pk4.Ball = Util.getIndex(CB_Ball);
pk4.Ball = WinFormsUtil.getIndex(CB_Ball);
pk4.Met_Level = Util.ToInt32(TB_MetLevel.Text);
pk4.OT_Gender = PKX.getGender(Label_OTGender.Text);
pk4.EncounterType = Util.getIndex(CB_EncounterType);
pk4.Version = Util.getIndex(CB_GameOrigin);
pk4.Language = Util.getIndex(CB_Language);
pk4.EncounterType = WinFormsUtil.getIndex(CB_EncounterType);
pk4.Version = WinFormsUtil.getIndex(CB_GameOrigin);
pk4.Language = WinFormsUtil.getIndex(CB_Language);
// Default Dates
DateTime? egg_date = null;
@ -441,14 +442,14 @@ private PKM prepareBK4()
if (CHK_AsEgg.Checked) // If encountered as an egg, load the Egg Met data from fields.
{
egg_date = CAL_EggDate.Value;
egg_location = Util.getIndex(CB_EggLocation);
egg_location = WinFormsUtil.getIndex(CB_EggLocation);
}
// Egg Met Data
pk4.EggMetDate = egg_date;
pk4.Egg_Location = egg_location;
// Met Data
pk4.MetDate = CAL_MetDate.Value;
pk4.Met_Location = Util.getIndex(CB_MetLocation);
pk4.Met_Location = WinFormsUtil.getIndex(CB_MetLocation);
if (pk4.IsEgg && pk4.Met_Location == 0) // If still an egg, it has no hatch location/date. Zero it!
pk4.MetDate = null;
@ -466,7 +467,7 @@ private PKM prepareBK4()
if (HaX)
{
pk4.Ability = (byte)Util.getIndex(DEV_Ability);
pk4.Ability = (byte)WinFormsUtil.getIndex(DEV_Ability);
pk4.Stat_Level = (byte)Math.Min(Convert.ToInt32(MT_Level.Text), byte.MaxValue);
}

49
PKHeX/MainWindow/MainPK5.cs → PKHeX.WinForms/MainWindow/MainPK5.cs
View File

@ -1,7 +1,8 @@
using System;
using System.Drawing;
using PKHeX.Core;
namespace PKHeX
namespace PKHeX.WinForms
{
public partial class Main
{
@ -148,14 +149,14 @@ private PKM preparePK5()
if (pk5 == null)
return null;
pk5.Species = Util.getIndex(CB_Species);
pk5.HeldItem = Util.getIndex(CB_HeldItem);
pk5.Species = WinFormsUtil.getIndex(CB_Species);
pk5.HeldItem = WinFormsUtil.getIndex(CB_HeldItem);
pk5.TID = Util.ToInt32(TB_TID.Text);
pk5.SID = Util.ToInt32(TB_SID.Text);
pk5.EXP = Util.ToUInt32(TB_EXP.Text);
pk5.PID = Util.getHEXval(TB_PID.Text);
pk5.Nature = (byte)Util.getIndex(CB_Nature);
pk5.Nature = (byte)WinFormsUtil.getIndex(CB_Nature);
pk5.FatefulEncounter = CHK_Fateful.Checked;
pk5.Gender = PKX.getGender(Label_Gender.Text);
pk5.AltForm = (MT_Form.Enabled ? Convert.ToInt32(MT_Form.Text) : CB_Form.Enabled ? CB_Form.SelectedIndex : 0) & 0x1F;
@ -176,18 +177,18 @@ private PKM preparePK5()
pk5.PKRS_Days = CB_PKRSDays.SelectedIndex;
pk5.PKRS_Strain = CB_PKRSStrain.SelectedIndex;
pk5.Nickname = TB_Nickname.Text;
pk5.Move1 = Util.getIndex(CB_Move1);
pk5.Move2 = Util.getIndex(CB_Move2);
pk5.Move3 = Util.getIndex(CB_Move3);
pk5.Move4 = Util.getIndex(CB_Move4);
pk5.Move1_PP = Util.getIndex(CB_Move1) > 0 ? Util.ToInt32(TB_PP1.Text) : 0;
pk5.Move2_PP = Util.getIndex(CB_Move2) > 0 ? Util.ToInt32(TB_PP2.Text) : 0;
pk5.Move3_PP = Util.getIndex(CB_Move3) > 0 ? Util.ToInt32(TB_PP3.Text) : 0;
pk5.Move4_PP = Util.getIndex(CB_Move4) > 0 ? Util.ToInt32(TB_PP4.Text) : 0;
pk5.Move1_PPUps = Util.getIndex(CB_Move1) > 0 ? CB_PPu1.SelectedIndex : 0;
pk5.Move2_PPUps = Util.getIndex(CB_Move2) > 0 ? CB_PPu2.SelectedIndex : 0;
pk5.Move3_PPUps = Util.getIndex(CB_Move3) > 0 ? CB_PPu3.SelectedIndex : 0;
pk5.Move4_PPUps = Util.getIndex(CB_Move4) > 0 ? CB_PPu4.SelectedIndex : 0;
pk5.Move1 = WinFormsUtil.getIndex(CB_Move1);
pk5.Move2 = WinFormsUtil.getIndex(CB_Move2);
pk5.Move3 = WinFormsUtil.getIndex(CB_Move3);
pk5.Move4 = WinFormsUtil.getIndex(CB_Move4);
pk5.Move1_PP = WinFormsUtil.getIndex(CB_Move1) > 0 ? Util.ToInt32(TB_PP1.Text) : 0;
pk5.Move2_PP = WinFormsUtil.getIndex(CB_Move2) > 0 ? Util.ToInt32(TB_PP2.Text) : 0;
pk5.Move3_PP = WinFormsUtil.getIndex(CB_Move3) > 0 ? Util.ToInt32(TB_PP3.Text) : 0;
pk5.Move4_PP = WinFormsUtil.getIndex(CB_Move4) > 0 ? Util.ToInt32(TB_PP4.Text) : 0;
pk5.Move1_PPUps = WinFormsUtil.getIndex(CB_Move1) > 0 ? CB_PPu1.SelectedIndex : 0;
pk5.Move2_PPUps = WinFormsUtil.getIndex(CB_Move2) > 0 ? CB_PPu2.SelectedIndex : 0;
pk5.Move3_PPUps = WinFormsUtil.getIndex(CB_Move3) > 0 ? CB_PPu3.SelectedIndex : 0;
pk5.Move4_PPUps = WinFormsUtil.getIndex(CB_Move4) > 0 ? CB_PPu4.SelectedIndex : 0;
pk5.IV_HP = Util.ToInt32(TB_HPIV.Text);
pk5.IV_ATK = Util.ToInt32(TB_ATKIV.Text);
@ -207,24 +208,24 @@ private PKM preparePK5()
if (CHK_AsEgg.Checked) // If encountered as an egg, load the Egg Met data from fields.
{
egg_date = CAL_EggDate.Value;
egg_location = Util.getIndex(CB_EggLocation);
egg_location = WinFormsUtil.getIndex(CB_EggLocation);
}
// Egg Met Data
pk5.EggMetDate = egg_date;
pk5.Egg_Location = egg_location;
// Met Data
pk5.MetDate = CAL_MetDate.Value;
pk5.Met_Location = Util.getIndex(CB_MetLocation);
pk5.Met_Location = WinFormsUtil.getIndex(CB_MetLocation);
if (pk5.IsEgg && pk5.Met_Location == 0) // If still an egg, it has no hatch location/date. Zero it!
pk5.MetDate = null;
pk5.Ball = Util.getIndex(CB_Ball);
pk5.Ball = WinFormsUtil.getIndex(CB_Ball);
pk5.Met_Level = Util.ToInt32(TB_MetLevel.Text);
pk5.OT_Gender = PKX.getGender(Label_OTGender.Text);
pk5.EncounterType = Util.getIndex(CB_EncounterType);
pk5.Version = Util.getIndex(CB_GameOrigin);
pk5.Language = Util.getIndex(CB_Language);
pk5.EncounterType = WinFormsUtil.getIndex(CB_EncounterType);
pk5.Version = WinFormsUtil.getIndex(CB_GameOrigin);
pk5.Language = WinFormsUtil.getIndex(CB_Language);
pk5.NPokémon = CHK_NSparkle.Checked;
@ -241,12 +242,12 @@ private PKM preparePK5()
if (HaX)
{
pk5.Ability = (byte)Util.getIndex(DEV_Ability);
pk5.Ability = (byte)WinFormsUtil.getIndex(DEV_Ability);
pk5.Stat_Level = (byte)Math.Min(Convert.ToInt32(MT_Level.Text), byte.MaxValue);
}
else
{
pk5.Ability = (byte)Array.IndexOf(GameStrings.abilitylist, CB_Ability.Text.Remove(CB_Ability.Text.Length - 4));
pk5.Ability = (byte)Array.IndexOf(GameInfo.Strings.abilitylist, CB_Ability.Text.Remove(CB_Ability.Text.Length - 4));
pk5.HiddenAbility = CB_Ability.SelectedIndex > 1; // not 0 or 1
}

65
PKHeX/MainWindow/MainPK6.cs → PKHeX.WinForms/MainWindow/MainPK6.cs
View File

@ -1,7 +1,8 @@
using System;
using System.Drawing;
using PKHeX.Core;
namespace PKHeX
namespace PKHeX.WinForms
{
public partial class Main
{
@ -150,7 +151,7 @@ private PKM preparePK6()
return null;
// Repopulate PK6 with Edited Stuff
if (Util.getIndex(CB_GameOrigin) < 24)
if (WinFormsUtil.getIndex(CB_GameOrigin) < 24)
{
uint EC = Util.getHEXval(TB_EC.Text);
uint PID = Util.getHEXval(TB_PID.Text);
@ -178,16 +179,16 @@ private PKM preparePK6()
pk6.Checksum = 0; // 0 CHK for now
// Block A
pk6.Species = Util.getIndex(CB_Species);
pk6.HeldItem = Util.getIndex(CB_HeldItem);
pk6.Species = WinFormsUtil.getIndex(CB_Species);
pk6.HeldItem = WinFormsUtil.getIndex(CB_HeldItem);
pk6.TID = Util.ToInt32(TB_TID.Text);
pk6.SID = Util.ToInt32(TB_SID.Text);
pk6.EXP = Util.ToUInt32(TB_EXP.Text);
pk6.Ability = (byte)Array.IndexOf(GameStrings.abilitylist, CB_Ability.Text.Remove(CB_Ability.Text.Length - 4));
pk6.Ability = (byte)Array.IndexOf(GameInfo.Strings.abilitylist, CB_Ability.Text.Remove(CB_Ability.Text.Length - 4));
pk6.AbilityNumber = Util.ToInt32(TB_AbilityNumber.Text); // Number
// pkx[0x16], pkx[0x17] are handled by the Medals UI (Hits & Training Bag)
pk6.PID = Util.getHEXval(TB_PID.Text);
pk6.Nature = (byte)Util.getIndex(CB_Nature);
pk6.Nature = (byte)WinFormsUtil.getIndex(CB_Nature);
pk6.FatefulEncounter = CHK_Fateful.Checked;
pk6.Gender = PKX.getGender(Label_Gender.Text);
pk6.AltForm = (MT_Form.Enabled ? Convert.ToInt32(MT_Form.Text) : CB_Form.Enabled ? CB_Form.SelectedIndex : 0) & 0x1F;
@ -220,22 +221,22 @@ private PKM preparePK6()
// Block B
// Convert Nickname field back to bytes
pk6.Nickname = TB_Nickname.Text;
pk6.Move1 = Util.getIndex(CB_Move1);
pk6.Move2 = Util.getIndex(CB_Move2);
pk6.Move3 = Util.getIndex(CB_Move3);
pk6.Move4 = Util.getIndex(CB_Move4);
pk6.Move1_PP = Util.getIndex(CB_Move1) > 0 ? Util.ToInt32(TB_PP1.Text) : 0;
pk6.Move2_PP = Util.getIndex(CB_Move2) > 0 ? Util.ToInt32(TB_PP2.Text) : 0;
pk6.Move3_PP = Util.getIndex(CB_Move3) > 0 ? Util.ToInt32(TB_PP3.Text) : 0;
pk6.Move4_PP = Util.getIndex(CB_Move4) > 0 ? Util.ToInt32(TB_PP4.Text) : 0;
pk6.Move1_PPUps = Util.getIndex(CB_Move1) > 0 ? CB_PPu1.SelectedIndex : 0;
pk6.Move2_PPUps = Util.getIndex(CB_Move2) > 0 ? CB_PPu2.SelectedIndex : 0;
pk6.Move3_PPUps = Util.getIndex(CB_Move3) > 0 ? CB_PPu3.SelectedIndex : 0;
pk6.Move4_PPUps = Util.getIndex(CB_Move4) > 0 ? CB_PPu4.SelectedIndex : 0;
pk6.RelearnMove1 = Util.getIndex(CB_RelearnMove1);
pk6.RelearnMove2 = Util.getIndex(CB_RelearnMove2);
pk6.RelearnMove3 = Util.getIndex(CB_RelearnMove3);
pk6.RelearnMove4 = Util.getIndex(CB_RelearnMove4);
pk6.Move1 = WinFormsUtil.getIndex(CB_Move1);
pk6.Move2 = WinFormsUtil.getIndex(CB_Move2);
pk6.Move3 = WinFormsUtil.getIndex(CB_Move3);
pk6.Move4 = WinFormsUtil.getIndex(CB_Move4);
pk6.Move1_PP = WinFormsUtil.getIndex(CB_Move1) > 0 ? Util.ToInt32(TB_PP1.Text) : 0;
pk6.Move2_PP = WinFormsUtil.getIndex(CB_Move2) > 0 ? Util.ToInt32(TB_PP2.Text) : 0;
pk6.Move3_PP = WinFormsUtil.getIndex(CB_Move3) > 0 ? Util.ToInt32(TB_PP3.Text) : 0;
pk6.Move4_PP = WinFormsUtil.getIndex(CB_Move4) > 0 ? Util.ToInt32(TB_PP4.Text) : 0;
pk6.Move1_PPUps = WinFormsUtil.getIndex(CB_Move1) > 0 ? CB_PPu1.SelectedIndex : 0;
pk6.Move2_PPUps = WinFormsUtil.getIndex(CB_Move2) > 0 ? CB_PPu2.SelectedIndex : 0;
pk6.Move3_PPUps = WinFormsUtil.getIndex(CB_Move3) > 0 ? CB_PPu3.SelectedIndex : 0;
pk6.Move4_PPUps = WinFormsUtil.getIndex(CB_Move4) > 0 ? CB_PPu4.SelectedIndex : 0;
pk6.RelearnMove1 = WinFormsUtil.getIndex(CB_RelearnMove1);
pk6.RelearnMove2 = WinFormsUtil.getIndex(CB_RelearnMove2);
pk6.RelearnMove3 = WinFormsUtil.getIndex(CB_RelearnMove3);
pk6.RelearnMove4 = WinFormsUtil.getIndex(CB_RelearnMove4);
// 0x72 - Ribbon editor sets this flag (Secret Super Training)
// 0x73
pk6.IV_HP = Util.ToInt32(TB_HPIV.Text);
@ -263,29 +264,29 @@ private PKM preparePK6()
if (CHK_AsEgg.Checked) // If encountered as an egg, load the Egg Met data from fields.
{
egg_date = CAL_EggDate.Value;
egg_location = Util.getIndex(CB_EggLocation);
egg_location = WinFormsUtil.getIndex(CB_EggLocation);
}
// Egg Met Data
pk6.EggMetDate = egg_date;
pk6.Egg_Location = egg_location;
// Met Data
pk6.MetDate = CAL_MetDate.Value;
pk6.Met_Location = Util.getIndex(CB_MetLocation);
pk6.Met_Location = WinFormsUtil.getIndex(CB_MetLocation);
if (pk6.IsEgg && pk6.Met_Location == 0) // If still an egg, it has no hatch location/date. Zero it!
pk6.MetDate = null;
// 0xD7 Unknown
pk6.Ball = Util.getIndex(CB_Ball);
pk6.Ball = WinFormsUtil.getIndex(CB_Ball);
pk6.Met_Level = Util.ToInt32(TB_MetLevel.Text);
pk6.OT_Gender = PKX.getGender(Label_OTGender.Text);
pk6.EncounterType = Util.getIndex(CB_EncounterType);
pk6.Version = Util.getIndex(CB_GameOrigin);
pk6.Country = Util.getIndex(CB_Country);
pk6.Region = Util.getIndex(CB_SubRegion);
pk6.ConsoleRegion = Util.getIndex(CB_3DSReg);
pk6.Language = Util.getIndex(CB_Language);
pk6.EncounterType = WinFormsUtil.getIndex(CB_EncounterType);
pk6.Version = WinFormsUtil.getIndex(CB_GameOrigin);
pk6.Country = WinFormsUtil.getIndex(CB_Country);
pk6.Region = WinFormsUtil.getIndex(CB_SubRegion);
pk6.ConsoleRegion = WinFormsUtil.getIndex(CB_3DSReg);
pk6.Language = WinFormsUtil.getIndex(CB_Language);
// 0xE4-0xE7
// Toss in Party Stats
@ -308,7 +309,7 @@ private PKM preparePK6()
// Hax Illegality
if (HaX)
{
pk6.Ability = (byte)Util.getIndex(DEV_Ability);
pk6.Ability = (byte)WinFormsUtil.getIndex(DEV_Ability);
pk6.Stat_Level = (byte)Math.Min(Convert.ToInt32(MT_Level.Text), byte.MaxValue);
}

65
PKHeX/MainWindow/MainPK7.cs → PKHeX.WinForms/MainWindow/MainPK7.cs
View File

@ -1,7 +1,8 @@
using System;
using System.Drawing;
using PKHeX.Core;
namespace PKHeX
namespace PKHeX.WinForms
{
public partial class Main
{
@ -150,7 +151,7 @@ private PKM preparePK7()
return null;
// Repopulate PK6 with Edited Stuff
if (Util.getIndex(CB_GameOrigin) < 24)
if (WinFormsUtil.getIndex(CB_GameOrigin) < 24)
{
uint EC = Util.getHEXval(TB_EC.Text);
uint PID = Util.getHEXval(TB_PID.Text);
@ -178,16 +179,16 @@ private PKM preparePK7()
pk7.Checksum = 0; // 0 CHK for now
// Block A
pk7.Species = Util.getIndex(CB_Species);
pk7.HeldItem = Util.getIndex(CB_HeldItem);
pk7.Species = WinFormsUtil.getIndex(CB_Species);
pk7.HeldItem = WinFormsUtil.getIndex(CB_HeldItem);
pk7.TID = Util.ToInt32(TB_TID.Text);
pk7.SID = Util.ToInt32(TB_SID.Text);
pk7.EXP = Util.ToUInt32(TB_EXP.Text);
pk7.Ability = (byte)Array.IndexOf(GameStrings.abilitylist, CB_Ability.Text.Remove(CB_Ability.Text.Length - 4));
pk7.Ability = (byte)Array.IndexOf(GameInfo.Strings.abilitylist, CB_Ability.Text.Remove(CB_Ability.Text.Length - 4));
pk7.AbilityNumber = Util.ToInt32(TB_AbilityNumber.Text); // Number
// pkx[0x16], pkx[0x17] are handled by the Medals UI (Hits & Training Bag)
pk7.PID = Util.getHEXval(TB_PID.Text);
pk7.Nature = (byte)Util.getIndex(CB_Nature);
pk7.Nature = (byte)WinFormsUtil.getIndex(CB_Nature);
pk7.FatefulEncounter = CHK_Fateful.Checked;
pk7.Gender = PKX.getGender(Label_Gender.Text);
pk7.AltForm = (MT_Form.Enabled ? Convert.ToInt32(MT_Form.Text) : CB_Form.Enabled ? CB_Form.SelectedIndex : 0) & 0x1F;
@ -220,22 +221,22 @@ private PKM preparePK7()
// Block B
// Convert Nickname field back to bytes
pk7.Nickname = TB_Nickname.Text;
pk7.Move1 = Util.getIndex(CB_Move1);
pk7.Move2 = Util.getIndex(CB_Move2);
pk7.Move3 = Util.getIndex(CB_Move3);
pk7.Move4 = Util.getIndex(CB_Move4);
pk7.Move1_PP = Util.getIndex(CB_Move1) > 0 ? Util.ToInt32(TB_PP1.Text) : 0;
pk7.Move2_PP = Util.getIndex(CB_Move2) > 0 ? Util.ToInt32(TB_PP2.Text) : 0;
pk7.Move3_PP = Util.getIndex(CB_Move3) > 0 ? Util.ToInt32(TB_PP3.Text) : 0;
pk7.Move4_PP = Util.getIndex(CB_Move4) > 0 ? Util.ToInt32(TB_PP4.Text) : 0;
pk7.Move1_PPUps = Util.getIndex(CB_Move1) > 0 ? CB_PPu1.SelectedIndex : 0;
pk7.Move2_PPUps = Util.getIndex(CB_Move2) > 0 ? CB_PPu2.SelectedIndex : 0;
pk7.Move3_PPUps = Util.getIndex(CB_Move3) > 0 ? CB_PPu3.SelectedIndex : 0;
pk7.Move4_PPUps = Util.getIndex(CB_Move4) > 0 ? CB_PPu4.SelectedIndex : 0;
pk7.RelearnMove1 = Util.getIndex(CB_RelearnMove1);
pk7.RelearnMove2 = Util.getIndex(CB_RelearnMove2);
pk7.RelearnMove3 = Util.getIndex(CB_RelearnMove3);
pk7.RelearnMove4 = Util.getIndex(CB_RelearnMove4);
pk7.Move1 = WinFormsUtil.getIndex(CB_Move1);
pk7.Move2 = WinFormsUtil.getIndex(CB_Move2);
pk7.Move3 = WinFormsUtil.getIndex(CB_Move3);
pk7.Move4 = WinFormsUtil.getIndex(CB_Move4);
pk7.Move1_PP = WinFormsUtil.getIndex(CB_Move1) > 0 ? Util.ToInt32(TB_PP1.Text) : 0;
pk7.Move2_PP = WinFormsUtil.getIndex(CB_Move2) > 0 ? Util.ToInt32(TB_PP2.Text) : 0;
pk7.Move3_PP = WinFormsUtil.getIndex(CB_Move3) > 0 ? Util.ToInt32(TB_PP3.Text) : 0;
pk7.Move4_PP = WinFormsUtil.getIndex(CB_Move4) > 0 ? Util.ToInt32(TB_PP4.Text) : 0;
pk7.Move1_PPUps = WinFormsUtil.getIndex(CB_Move1) > 0 ? CB_PPu1.SelectedIndex : 0;
pk7.Move2_PPUps = WinFormsUtil.getIndex(CB_Move2) > 0 ? CB_PPu2.SelectedIndex : 0;
pk7.Move3_PPUps = WinFormsUtil.getIndex(CB_Move3) > 0 ? CB_PPu3.SelectedIndex : 0;
pk7.Move4_PPUps = WinFormsUtil.getIndex(CB_Move4) > 0 ? CB_PPu4.SelectedIndex : 0;
pk7.RelearnMove1 = WinFormsUtil.getIndex(CB_RelearnMove1);
pk7.RelearnMove2 = WinFormsUtil.getIndex(CB_RelearnMove2);
pk7.RelearnMove3 = WinFormsUtil.getIndex(CB_RelearnMove3);
pk7.RelearnMove4 = WinFormsUtil.getIndex(CB_RelearnMove4);
// 0x72 - Ribbon editor sets this flag (Secret Super Training)
// 0x73
pk7.IV_HP = Util.ToInt32(TB_HPIV.Text);
@ -263,29 +264,29 @@ private PKM preparePK7()
if (CHK_AsEgg.Checked) // If encountered as an egg, load the Egg Met data from fields.
{
egg_date = CAL_EggDate.Value;
egg_location = Util.getIndex(CB_EggLocation);
egg_location = WinFormsUtil.getIndex(CB_EggLocation);
}
// Egg Met Data
pk7.EggMetDate = egg_date;
pk7.Egg_Location = egg_location;
// Met Data
pk7.MetDate = CAL_MetDate.Value;
pk7.Met_Location = Util.getIndex(CB_MetLocation);
pk7.Met_Location = WinFormsUtil.getIndex(CB_MetLocation);
if (pk7.IsEgg && pk7.Met_Location == 0) // If still an egg, it has no hatch location/date. Zero it!
pk7.MetDate = null;
// 0xD7 Unknown
pk7.Ball = Util.getIndex(CB_Ball);
pk7.Ball = WinFormsUtil.getIndex(CB_Ball);
pk7.Met_Level = Util.ToInt32(TB_MetLevel.Text);
pk7.OT_Gender = PKX.getGender(Label_OTGender.Text);
pk7.EncounterType = Util.getIndex(CB_EncounterType);
pk7.Version = Util.getIndex(CB_GameOrigin);
pk7.Country = Util.getIndex(CB_Country);
pk7.Region = Util.getIndex(CB_SubRegion);
pk7.ConsoleRegion = Util.getIndex(CB_3DSReg);
pk7.Language = Util.getIndex(CB_Language);
pk7.EncounterType = WinFormsUtil.getIndex(CB_EncounterType);
pk7.Version = WinFormsUtil.getIndex(CB_GameOrigin);
pk7.Country = WinFormsUtil.getIndex(CB_Country);
pk7.Region = WinFormsUtil.getIndex(CB_SubRegion);
pk7.ConsoleRegion = WinFormsUtil.getIndex(CB_3DSReg);
pk7.Language = WinFormsUtil.getIndex(CB_Language);
// 0xE4-0xE7
// Toss in Party Stats
@ -308,7 +309,7 @@ private PKM preparePK7()
// Hax Illegality
if (HaX)
{
pk7.Ability = (byte)Util.getIndex(DEV_Ability);
pk7.Ability = (byte)WinFormsUtil.getIndex(DEV_Ability);
pk7.Stat_Level = (byte)Math.Min(Convert.ToInt32(MT_Level.Text), byte.MaxValue);
}

39
PKHeX/MainWindow/MainXK3.cs → PKHeX.WinForms/MainWindow/MainXK3.cs
View File

@ -1,7 +1,8 @@
using System;
using System.Drawing;
using PKHeX.Core;
namespace PKHeX
namespace PKHeX.WinForms
{
public partial class Main
{
@ -126,8 +127,8 @@ private PKM prepareXK3()
if (xk3 == null)
return null;
xk3.Species = Util.getIndex(CB_Species);
xk3.HeldItem = Util.getIndex(CB_HeldItem);
xk3.Species = WinFormsUtil.getIndex(CB_Species);
xk3.HeldItem = WinFormsUtil.getIndex(CB_HeldItem);
xk3.TID = Util.ToInt32(TB_TID.Text);
xk3.SID = Util.ToInt32(TB_SID.Text);
xk3.EXP = Util.ToUInt32(TB_EXP.Text);
@ -153,18 +154,18 @@ private PKM prepareXK3()
xk3.PKRS_Days = CB_PKRSDays.SelectedIndex;
xk3.PKRS_Strain = CB_PKRSStrain.SelectedIndex;
xk3.Nickname = TB_Nickname.Text;
xk3.Move1 = Util.getIndex(CB_Move1);
xk3.Move2 = Util.getIndex(CB_Move2);
xk3.Move3 = Util.getIndex(CB_Move3);
xk3.Move4 = Util.getIndex(CB_Move4);
xk3.Move1_PP = Util.getIndex(CB_Move1) > 0 ? Util.ToInt32(TB_PP1.Text) : 0;
xk3.Move2_PP = Util.getIndex(CB_Move2) > 0 ? Util.ToInt32(TB_PP2.Text) : 0;
xk3.Move3_PP = Util.getIndex(CB_Move3) > 0 ? Util.ToInt32(TB_PP3.Text) : 0;
xk3.Move4_PP = Util.getIndex(CB_Move4) > 0 ? Util.ToInt32(TB_PP4.Text) : 0;
xk3.Move1_PPUps = Util.getIndex(CB_Move1) > 0 ? CB_PPu1.SelectedIndex : 0;
xk3.Move2_PPUps = Util.getIndex(CB_Move2) > 0 ? CB_PPu2.SelectedIndex : 0;
xk3.Move3_PPUps = Util.getIndex(CB_Move3) > 0 ? CB_PPu3.SelectedIndex : 0;
xk3.Move4_PPUps = Util.getIndex(CB_Move4) > 0 ? CB_PPu4.SelectedIndex : 0;
xk3.Move1 = WinFormsUtil.getIndex(CB_Move1);
xk3.Move2 = WinFormsUtil.getIndex(CB_Move2);
xk3.Move3 = WinFormsUtil.getIndex(CB_Move3);
xk3.Move4 = WinFormsUtil.getIndex(CB_Move4);
xk3.Move1_PP = WinFormsUtil.getIndex(CB_Move1) > 0 ? Util.ToInt32(TB_PP1.Text) : 0;
xk3.Move2_PP = WinFormsUtil.getIndex(CB_Move2) > 0 ? Util.ToInt32(TB_PP2.Text) : 0;
xk3.Move3_PP = WinFormsUtil.getIndex(CB_Move3) > 0 ? Util.ToInt32(TB_PP3.Text) : 0;
xk3.Move4_PP = WinFormsUtil.getIndex(CB_Move4) > 0 ? Util.ToInt32(TB_PP4.Text) : 0;
xk3.Move1_PPUps = WinFormsUtil.getIndex(CB_Move1) > 0 ? CB_PPu1.SelectedIndex : 0;
xk3.Move2_PPUps = WinFormsUtil.getIndex(CB_Move2) > 0 ? CB_PPu2.SelectedIndex : 0;
xk3.Move3_PPUps = WinFormsUtil.getIndex(CB_Move3) > 0 ? CB_PPu3.SelectedIndex : 0;
xk3.Move4_PPUps = WinFormsUtil.getIndex(CB_Move4) > 0 ? CB_PPu4.SelectedIndex : 0;
xk3.IV_HP = Util.ToInt32(TB_HPIV.Text);
xk3.IV_ATK = Util.ToInt32(TB_ATKIV.Text);
@ -178,13 +179,13 @@ private PKM prepareXK3()
xk3.OT_Name = TB_OT.Text;
xk3.CurrentFriendship = Util.ToInt32(TB_Friendship.Text);
xk3.Ball = Util.getIndex(CB_Ball);
xk3.Ball = WinFormsUtil.getIndex(CB_Ball);
xk3.Met_Level = Util.ToInt32(TB_MetLevel.Text);
xk3.OT_Gender = PKX.getGender(Label_OTGender.Text);
xk3.Version = Util.getIndex(CB_GameOrigin);
xk3.Language = Util.getIndex(CB_Language);
xk3.Version = WinFormsUtil.getIndex(CB_GameOrigin);
xk3.Language = WinFormsUtil.getIndex(CB_Language);
xk3.Met_Location = Util.getIndex(CB_MetLocation);
xk3.Met_Location = WinFormsUtil.getIndex(CB_MetLocation);
// Toss in Party Stats
Array.Resize(ref xk3.Data, xk3.SIZE_PARTY);

2
PKHeX/MainWindow/SlotChange.cs → PKHeX.WinForms/MainWindow/SlotChange.cs
View File

@ -1,4 +1,4 @@
namespace PKHeX
namespace PKHeX.WinForms
{
public class SlotChange
{

2
PKHeX/Misc/About.Designer.cs → PKHeX.WinForms/Misc/About.Designer.cs generated
View File

@ -1,4 +1,4 @@
namespace PKHeX
namespace PKHeX.WinForms
{
partial class About
{

8
PKHeX/Misc/About.cs → PKHeX.WinForms/Misc/About.cs
View File

@ -1,14 +1,14 @@
using System;
using System.Windows.Forms;
namespace PKHeX
namespace PKHeX.WinForms
{
public partial class About : Form
{
public About()
{
InitializeComponent();
RTB.Text = Properties.Resources.changelog;
RTB.Text = Core.Properties.Resources.changelog;
}
private void B_Close_Click(object sender, EventArgs e)
{
@ -18,12 +18,12 @@ private void B_Shortcuts_Click(object sender, EventArgs e)
{
if (B_Shortcuts.Text == "Shortcuts")
{
RTB.Text = Properties.Resources.shortcuts; // display shortcuts
RTB.Text = Core.Properties.Resources.shortcuts; // display shortcuts
B_Shortcuts.Text = "Changelog";
}
else
{
RTB.Text = Properties.Resources.changelog; // display changelog
RTB.Text = Core.Properties.Resources.changelog; // display changelog
B_Shortcuts.Text = "Shortcuts";
}
}

0
PKHeX/Misc/About.resx → PKHeX.WinForms/Misc/About.resx
View File

2
PKHeX/Misc/ErrorWindow.Designer.cs → PKHeX.WinForms/Misc/ErrorWindow.Designer.cs generated
View File

@ -1,4 +1,4 @@
namespace PKHeX.Misc
namespace PKHeX.WinForms
{
partial class ErrorWindow
{

4
PKHeX/Misc/ErrorWindow.cs → PKHeX.WinForms/Misc/ErrorWindow.cs
View File

@ -2,7 +2,7 @@
using System.Text;
using System.Windows.Forms;
namespace PKHeX.Misc
namespace PKHeX.WinForms
{
public partial class ErrorWindow : Form
{
@ -30,7 +30,7 @@ public ErrorWindow()
public ErrorWindow(string lang) : this()
{
Util.TranslateInterface(this, lang);
WinFormsUtil.TranslateInterface(this, lang);
}
/// <summary>

0
PKHeX/Misc/ErrorWindow.resx → PKHeX.WinForms/Misc/ErrorWindow.resx
View File

4
PKHeX/Misc/QR.Designer.cs → PKHeX.WinForms/Misc/QR.Designer.cs generated
View File

@ -1,4 +1,4 @@
namespace PKHeX
namespace PKHeX.WinForms
{
partial class QR
{
@ -189,7 +189,7 @@ private void InitializeComponent()
this.MinimizeBox = false;
this.Name = "QR";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "PKHeX QR Code (Click QR to Copy Image)";
this.Text = "PKHeX.Core QR Code (Click QR to Copy Image)";
((System.ComponentModel.ISupportInitialize)(this.PB_QR)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.NUD_Box)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.NUD_Slot)).EndInit();

28
PKHeX/Misc/QR.cs → PKHeX.WinForms/Misc/QR.cs
View File

@ -5,9 +5,9 @@
using System.Text.RegularExpressions;
using System.Web;
using System.Windows.Forms;
using PKHeX.Saves.Substructures;
using PKHeX.Core;
namespace PKHeX
namespace PKHeX.WinForms
{
public partial class QR : Form
{
@ -48,7 +48,7 @@ public QR(Image qr, Image icon, string line1, string line2, string line3, string
private void RefreshImage()
{
Font font = !Main.unicode ? FontLabel.Font : PKX.getPKXFont((float)8.25);
Font font = !Main.unicode ? FontLabel.Font : FontUtil.getPKXFont((float)8.25);
Image preview = new Bitmap(45, 45);
using (Graphics gfx = Graphics.FromImage(preview))
{
@ -74,9 +74,9 @@ private void RefreshImage()
private void PB_QR_Click(object sender, EventArgs e)
{
if (DialogResult.Yes != Util.Prompt(MessageBoxButtons.YesNo, "Copy QR Image to Clipboard?")) return;
if (DialogResult.Yes != WinFormsUtil.Prompt(MessageBoxButtons.YesNo, "Copy QR Image to Clipboard?")) return;
try { Clipboard.SetImage(PB_QR.BackgroundImage); }
catch { Util.Alert("Failed to set Image to Clipboard"); }
catch { WinFormsUtil.Alert("Failed to set Image to Clipboard"); }
}
// QR Utility
@ -85,15 +85,15 @@ internal static byte[] getQRData()
// Fetch data from QR code...
string address;
try { address = Clipboard.GetText(); }
catch { Util.Alert("No text (url) in clipboard."); return null; }
try { if (address.Length < 4 || address.Substring(0, 3) != "htt") { Util.Alert("Clipboard text is not a valid URL:", address); return null; } }
catch { Util.Alert("Clipboard text is not a valid URL:", address); return null; }
catch { WinFormsUtil.Alert("No text (url) in clipboard."); return null; }
try { if (address.Length < 4 || address.Substring(0, 3) != "htt") { WinFormsUtil.Alert("Clipboard text is not a valid URL:", address); return null; } }
catch { WinFormsUtil.Alert("Clipboard text is not a valid URL:", address); return null; }
string webURL = "http://api.qrserver.com/v1/read-qr-code/?fileurl=" + HttpUtility.UrlEncode(address);
try
{
string data = Util.getStringFromURL(webURL);
if (data.Contains("could not find")) { Util.Alert("Reader could not find QR data in the image."); return null; }
if (data.Contains("filetype not supported")) { Util.Alert("Input URL is not valid. Double check that it is an image (jpg/png).", address); return null; }
if (data.Contains("could not find")) { WinFormsUtil.Alert("Reader could not find QR data in the image."); return null; }
if (data.Contains("filetype not supported")) { WinFormsUtil.Alert("Input URL is not valid. Double check that it is an image (jpg/png).", address); return null; }
// Quickly convert the json response to a data string
const string cap = "\",\"error\":null}]}]";
const string intro = "[{\"type\":\"qrcode\",\"symbol\":[{\"seq\":0,\"data\":\"";
@ -119,9 +119,9 @@ internal static byte[] getQRData()
return Convert.FromBase64String(pkstr);
}
catch { Util.Alert("QR string to Data failed."); return null; }
catch { WinFormsUtil.Alert("QR string to Data failed."); return null; }
}
catch { Util.Alert("Unable to connect to the internet to decode QR code."); return null; }
catch { WinFormsUtil.Alert("Unable to connect to the internet to decode QR code."); return null; }
}
internal static Image getQRImage(byte[] data, string server)
{
@ -135,10 +135,10 @@ internal static Image getQRImage(byte[] data, string server)
}
catch
{
if (DialogResult.Yes != Util.Prompt(MessageBoxButtons.YesNo, "Unable to connect to the internet to receive QR code.", "Copy QR URL to Clipboard?"))
if (DialogResult.Yes != WinFormsUtil.Prompt(MessageBoxButtons.YesNo, "Unable to connect to the internet to receive QR code.", "Copy QR URL to Clipboard?"))
return null;
try { Clipboard.SetText(webURL); }
catch { Util.Alert("Failed to set text to Clipboard"); }
catch { WinFormsUtil.Alert("Failed to set text to Clipboard"); }
}
return null;
}

0
PKHeX/Misc/QR.resx → PKHeX.WinForms/Misc/QR.resx
View File

4
PKHeX/Misc/SplashScreen.Designer.cs → PKHeX.WinForms/Misc/SplashScreen.Designer.cs generated
View File

@ -1,4 +1,4 @@
namespace PKHeX
namespace PKHeX.WinForms
{
partial class SplashScreen
{
@ -42,7 +42,7 @@ private void InitializeComponent()
this.L_Status.Name = "L_Status";
this.L_Status.Size = new System.Drawing.Size(105, 13);
this.L_Status.TabIndex = 0;
this.L_Status.Text = "Starting up PKHeX...";
this.L_Status.Text = "Starting up PKHeX.Core...";
//
// label2
//

2
PKHeX/Misc/SplashScreen.cs → PKHeX.WinForms/Misc/SplashScreen.cs
View File

@ -1,7 +1,7 @@
using System.Threading;
using System.Windows.Forms;
namespace PKHeX
namespace PKHeX.WinForms
{
public partial class SplashScreen : Form
{

0
PKHeX/Misc/SplashScreen.resx → PKHeX.WinForms/Misc/SplashScreen.resx
View File

514
PKHeX.WinForms/PKHeX.WinForms.csproj Normal file
View File

@ -0,0 +1,514 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{D1B91861-A448-4762-A313-C7BC179F4415}</ProjectGuid>
<OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>PKHeX.WinForms</RootNamespace>
<AssemblyName>PKHeX</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<TargetFrameworkProfile />
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
<UpdateEnabled>false</UpdateEnabled>
<UpdateMode>Foreground</UpdateMode>
<UpdateInterval>7</UpdateInterval>
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
<UpdatePeriodically>false</UpdatePeriodically>
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>x86</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;CLICKONCE;WINDOWS</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
<UseVSHostingProcess>false</UseVSHostingProcess>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>x86</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>CLICKONCE;WINDOWS</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>icon.ico</ApplicationIcon>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Mono-Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\Debug-Mono\</OutputPath>
<DefineConstants>DEBUG;MONO</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Mono-Release|AnyCPU'">
<OutputPath>bin\Mono-Release\</OutputPath>
<DefineConstants>MONO</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Deployment" />
<Reference Include="System.Drawing" />
<Reference Include="System.Web" />
<Reference Include="System.Windows.Forms" />
</ItemGroup>
<ItemGroup>
<Compile Include="MainWindow\Main.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="MainWindow\Main.Designer.cs">
<DependentUpon>Main.cs</DependentUpon>
</Compile>
<Compile Include="MainWindow\MainCK3.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="MainWindow\MainPK1.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="MainWindow\MainPK2.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="MainWindow\MainPK3.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="MainWindow\MainPK4.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="MainWindow\MainPK5.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="MainWindow\MainPK6.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="MainWindow\MainPK7.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="MainWindow\MainXK3.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="MainWindow\SlotChange.cs" />
<Compile Include="Misc\About.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Misc\About.Designer.cs">
<DependentUpon>About.cs</DependentUpon>
</Compile>
<Compile Include="Misc\ErrorWindow.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Misc\ErrorWindow.Designer.cs">
<DependentUpon>ErrorWindow.cs</DependentUpon>
</Compile>
<Compile Include="Misc\QR.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Misc\QR.Designer.cs">
<DependentUpon>QR.cs</DependentUpon>
</Compile>
<Compile Include="Misc\SplashScreen.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Misc\SplashScreen.Designer.cs">
<DependentUpon>SplashScreen.cs</DependentUpon>
</Compile>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Settings.cs" />
<Compile Include="Subforms\frmReport.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Subforms\frmReport.Designer.cs">
<DependentUpon>frmReport.cs</DependentUpon>
</Compile>
<Compile Include="Subforms\KChart.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Subforms\KChart.Designer.cs">
<DependentUpon>KChart.cs</DependentUpon>
</Compile>
<Compile Include="Subforms\PKM Editors\BatchEditor.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Subforms\PKM Editors\BatchEditor.Designer.cs">
<DependentUpon>BatchEditor.cs</DependentUpon>
</Compile>
<Compile Include="Subforms\PKM Editors\MemoryAmie.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Subforms\PKM Editors\MemoryAmie.Designer.cs">
<DependentUpon>MemoryAmie.cs</DependentUpon>
</Compile>
<Compile Include="Subforms\PKM Editors\RibbonEditor.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Subforms\PKM Editors\RibbonEditor.Designer.cs">
<DependentUpon>RibbonEditor.cs</DependentUpon>
</Compile>
<Compile Include="Subforms\PKM Editors\SuperTrainingEditor.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Subforms\PKM Editors\SuperTrainingEditor.Designer.cs">
<DependentUpon>SuperTrainingEditor.cs</DependentUpon>
</Compile>
<Compile Include="Subforms\PKM Editors\Text.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Subforms\PKM Editors\Text.Designer.cs">
<DependentUpon>Text.cs</DependentUpon>
</Compile>
<Compile Include="Subforms\Save Editors\Gen5\CGearBackground.cs" />
<Compile Include="Subforms\Save Editors\Gen5\SAV_CGearSkin.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Subforms\Save Editors\Gen5\SAV_CGearSkin.Designer.cs">
<DependentUpon>SAV_CGearSkin.cs</DependentUpon>
</Compile>
<Compile Include="Subforms\Save Editors\Gen6\SAV_BerryFieldXY.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Subforms\Save Editors\Gen6\SAV_BerryFieldXY.Designer.cs">
<DependentUpon>SAV_BerryFieldXY.cs</DependentUpon>
</Compile>
<Compile Include="Subforms\Save Editors\Gen6\SAV_BoxLayout.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Subforms\Save Editors\Gen6\SAV_BoxLayout.Designer.cs">
<DependentUpon>SAV_BoxLayout.cs</DependentUpon>
</Compile>
<Compile Include="Subforms\Save Editors\Gen6\SAV_HallOfFame.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Subforms\Save Editors\Gen6\SAV_HallOfFame.Designer.cs">
<DependentUpon>SAV_HallOfFame.cs</DependentUpon>
</Compile>
<Compile Include="Subforms\Save Editors\Gen6\SAV_Link6.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Subforms\Save Editors\Gen6\SAV_Link6.Designer.cs">
<DependentUpon>SAV_Link6.cs</DependentUpon>
</Compile>
<Compile Include="Subforms\Save Editors\Gen6\SAV_OPower.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Subforms\Save Editors\Gen6\SAV_OPower.Designer.cs">
<DependentUpon>SAV_OPower.cs</DependentUpon>
</Compile>
<Compile Include="Subforms\Save Editors\Gen6\SAV_PokeBlockORAS.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Subforms\Save Editors\Gen6\SAV_PokeBlockORAS.Designer.cs">
<DependentUpon>SAV_PokeBlockORAS.cs</DependentUpon>
</Compile>
<Compile Include="Subforms\Save Editors\Gen6\SAV_PokedexORAS.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Subforms\Save Editors\Gen6\SAV_PokedexORAS.Designer.cs">
<DependentUpon>SAV_PokedexORAS.cs</DependentUpon>
</Compile>
<Compile Include="Subforms\Save Editors\Gen6\SAV_PokedexXY.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Subforms\Save Editors\Gen6\SAV_PokedexXY.Designer.cs">
<DependentUpon>SAV_PokedexXY.cs</DependentUpon>
</Compile>
<Compile Include="Subforms\Save Editors\Gen6\SAV_Pokepuff.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Subforms\Save Editors\Gen6\SAV_Pokepuff.Designer.cs">
<DependentUpon>SAV_Pokepuff.cs</DependentUpon>
</Compile>
<Compile Include="Subforms\Save Editors\Gen6\SAV_SecretBase.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Subforms\Save Editors\Gen6\SAV_SecretBase.Designer.cs">
<DependentUpon>SAV_SecretBase.cs</DependentUpon>
</Compile>
<Compile Include="Subforms\Save Editors\Gen6\SAV_SuperTrain.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Subforms\Save Editors\Gen6\SAV_SuperTrain.Designer.cs">
<DependentUpon>SAV_SuperTrain.cs</DependentUpon>
</Compile>
<Compile Include="Subforms\Save Editors\Gen6\SAV_Trainer.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Subforms\Save Editors\Gen6\SAV_Trainer.Designer.cs">
<DependentUpon>SAV_Trainer.cs</DependentUpon>
</Compile>
<Compile Include="Subforms\Save Editors\Gen7\SAV_Pokebean.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Subforms\Save Editors\Gen7\SAV_Pokebean.Designer.cs">
<DependentUpon>SAV_Pokebean.cs</DependentUpon>
</Compile>
<Compile Include="Subforms\Save Editors\Gen7\SAV_PokedexSM.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Subforms\Save Editors\Gen7\SAV_PokedexSM.Designer.cs">
<DependentUpon>SAV_PokedexSM.cs</DependentUpon>
</Compile>
<Compile Include="Subforms\Save Editors\Gen7\SAV_Trainer7.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Subforms\Save Editors\Gen7\SAV_Trainer7.Designer.cs">
<DependentUpon>SAV_Trainer7.cs</DependentUpon>
</Compile>
<Compile Include="Subforms\Save Editors\Gen7\SAV_ZygardeCell.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Subforms\Save Editors\Gen7\SAV_ZygardeCell.Designer.cs">
<DependentUpon>SAV_ZygardeCell.cs</DependentUpon>
</Compile>
<Compile Include="Subforms\Save Editors\SAV_BoxViewer.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Subforms\Save Editors\SAV_BoxViewer.Designer.cs">
<DependentUpon>SAV_BoxViewer.cs</DependentUpon>
</Compile>
<Compile Include="Subforms\Save Editors\SAV_EventFlags.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Subforms\Save Editors\SAV_EventFlags.Designer.cs">
<DependentUpon>SAV_EventFlags.cs</DependentUpon>
</Compile>
<Compile Include="Subforms\Save Editors\SAV_Inventory.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Subforms\Save Editors\SAV_Inventory.Designer.cs">
<DependentUpon>SAV_Inventory.cs</DependentUpon>
</Compile>
<Compile Include="Subforms\Save Editors\SAV_SimplePokedex.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Subforms\Save Editors\SAV_SimplePokedex.Designer.cs">
<DependentUpon>SAV_SimplePokedex.cs</DependentUpon>
</Compile>
<Compile Include="Subforms\Save Editors\SAV_SimpleTrainer.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Subforms\Save Editors\SAV_SimpleTrainer.Designer.cs">
<DependentUpon>SAV_SimpleTrainer.cs</DependentUpon>
</Compile>
<Compile Include="Subforms\Save Editors\SAV_Wondercard.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Subforms\Save Editors\SAV_Wondercard.Designer.cs">
<DependentUpon>SAV_Wondercard.cs</DependentUpon>
</Compile>
<Compile Include="Subforms\SAV_Database.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Subforms\SAV_Database.Designer.cs">
<DependentUpon>SAV_Database.cs</DependentUpon>
</Compile>
<Compile Include="Subforms\SAV_MysteryGiftDB.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Subforms\SAV_MysteryGiftDB.Designer.cs">
<DependentUpon>SAV_MysteryGiftDB.cs</DependentUpon>
</Compile>
<Compile Include="Util\CyberGadgetUtil.cs" />
<Compile Include="Util\FontUtil.cs" />
<Compile Include="Util\WinFormsUtil.cs" />
<EmbeddedResource Include="MainWindow\Main.resx">
<DependentUpon>Main.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Misc\About.resx">
<DependentUpon>About.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Misc\ErrorWindow.resx">
<DependentUpon>ErrorWindow.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Misc\QR.resx">
<DependentUpon>QR.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Misc\SplashScreen.resx">
<DependentUpon>SplashScreen.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
</EmbeddedResource>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
<DesignTime>True</DesignTime>
</Compile>
<EmbeddedResource Include="Subforms\frmReport.resx">
<DependentUpon>frmReport.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Subforms\KChart.resx">
<DependentUpon>KChart.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Subforms\PKM Editors\BatchEditor.resx">
<DependentUpon>BatchEditor.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Subforms\PKM Editors\MemoryAmie.resx">
<DependentUpon>MemoryAmie.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Subforms\PKM Editors\RibbonEditor.resx">
<DependentUpon>RibbonEditor.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Subforms\PKM Editors\SuperTrainingEditor.resx">
<DependentUpon>SuperTrainingEditor.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Subforms\PKM Editors\Text.resx">
<DependentUpon>Text.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Subforms\Save Editors\Gen5\SAV_CGearSkin.resx">
<DependentUpon>SAV_CGearSkin.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Subforms\Save Editors\Gen6\SAV_BerryFieldXY.resx">
<DependentUpon>SAV_BerryFieldXY.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Subforms\Save Editors\Gen6\SAV_BoxLayout.resx">
<DependentUpon>SAV_BoxLayout.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Subforms\Save Editors\Gen6\SAV_HallOfFame.resx">
<DependentUpon>SAV_HallOfFame.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Subforms\Save Editors\Gen6\SAV_Link6.resx">
<DependentUpon>SAV_Link6.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Subforms\Save Editors\Gen6\SAV_OPower.resx">
<DependentUpon>SAV_OPower.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Subforms\Save Editors\Gen6\SAV_PokeBlockORAS.resx">
<DependentUpon>SAV_PokeBlockORAS.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Subforms\Save Editors\Gen6\SAV_PokedexORAS.resx">
<DependentUpon>SAV_PokedexORAS.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Subforms\Save Editors\Gen6\SAV_PokedexXY.resx">
<DependentUpon>SAV_PokedexXY.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Subforms\Save Editors\Gen6\SAV_Pokepuff.resx">
<DependentUpon>SAV_Pokepuff.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Subforms\Save Editors\Gen6\SAV_SecretBase.resx">
<DependentUpon>SAV_SecretBase.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Subforms\Save Editors\Gen6\SAV_SuperTrain.resx">
<DependentUpon>SAV_SuperTrain.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Subforms\Save Editors\Gen6\SAV_Trainer.resx">
<DependentUpon>SAV_Trainer.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Subforms\Save Editors\Gen7\SAV_Pokebean.resx">
<DependentUpon>SAV_Pokebean.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Subforms\Save Editors\Gen7\SAV_PokedexSM.resx">
<DependentUpon>SAV_PokedexSM.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Subforms\Save Editors\Gen7\SAV_Trainer7.resx">
<DependentUpon>SAV_Trainer7.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Subforms\Save Editors\Gen7\SAV_ZygardeCell.resx">
<DependentUpon>SAV_ZygardeCell.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Subforms\Save Editors\SAV_BoxViewer.resx">
<DependentUpon>SAV_BoxViewer.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Subforms\Save Editors\SAV_EventFlags.resx">
<DependentUpon>SAV_EventFlags.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Subforms\Save Editors\SAV_Inventory.resx">
<DependentUpon>SAV_Inventory.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Subforms\Save Editors\SAV_SimplePokedex.resx">
<DependentUpon>SAV_SimplePokedex.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Subforms\Save Editors\SAV_SimpleTrainer.resx">
<DependentUpon>SAV_SimpleTrainer.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Subforms\Save Editors\SAV_Wondercard.resx">
<DependentUpon>SAV_Wondercard.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Subforms\SAV_Database.resx">
<DependentUpon>SAV_Database.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Subforms\SAV_MysteryGiftDB.resx">
<DependentUpon>SAV_MysteryGiftDB.cs</DependentUpon>
</EmbeddedResource>
<None Include="App.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
<Compile Include="Properties\Settings.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
</ItemGroup>
<ItemGroup>
<Content Include="icon.ico" />
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include=".NETFramework,Version=v4.0">
<Visible>False</Visible>
<ProductName>Microsoft .NET Framework 4 %28x86 and x64%29</ProductName>
<Install>true</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1</ProductName>
<Install>false</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Windows.Installer.4.5">
<Visible>False</Visible>
<ProductName>Windows Installer 4.5</ProductName>
<Install>true</Install>
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\PKHeX\PKHeX.Core.csproj">
<Project>{b4eff030-c75a-49f9-a4bc-738d1b61c4af}</Project>
<Name>PKHeX.Core</Name>
<EmbedInteropTypes>False</EmbedInteropTypes>
<Private>True</Private>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>

18
PKHeX/Program.cs → PKHeX.WinForms/Program.cs
View File

@ -1,10 +1,8 @@
using PKHeX.Misc;
using System;
using System.Diagnostics;
using System;
using System.Threading;
using System.Windows.Forms;
namespace PKHeX
namespace PKHeX.WinForms
{
internal static class Program
{
@ -15,13 +13,13 @@ internal static class Program
private static void Main()
{
// Add the event handler for handling UI thread exceptions to the event.
Application.ThreadException += new ThreadExceptionEventHandler(UIThreadException);
Application.ThreadException += UIThreadException;
// Set the unhandled exception mode to force all Windows Forms errors to go through our handler.
Application.SetUnhandledExceptionMode(UnhandledExceptionMode.CatchException);
// Add the event handler for handling non-UI thread exceptions to the event.
AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException);
AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
// Run the application
Application.EnableVisualStyles();
@ -36,14 +34,14 @@ private static void UIThreadException(object sender, ThreadExceptionEventArgs t)
try
{
// Todo: make this translatable
ErrorWindow.ShowErrorDialog("An unhandled exception has occurred.\nYou can continue running PKHeX, but please report this error.", t.Exception, true);
ErrorWindow.ShowErrorDialog("An unhandled exception has occurred.\nYou can continue running PKHeX.Core, but please report this error.", t.Exception, true);
}
catch
{
try
{
// Todo: make this translatable
MessageBox.Show("A fatal error has occurred in PKHeX, and the details could not be displayed. Please report this to the author.", "PKHeX Error", MessageBoxButtons.OK, MessageBoxIcon.Stop);
MessageBox.Show("A fatal error has occurred in PKHeX.Core, and the details could not be displayed. Please report this to the author.", "PKHeX.Core Error", MessageBoxButtons.OK, MessageBoxIcon.Stop);
}
finally
{
@ -66,14 +64,14 @@ private static void CurrentDomain_UnhandledException(object sender, UnhandledExc
{
var ex = (Exception)e.ExceptionObject;
// Todo: make this translatable
ErrorWindow.ShowErrorDialog("An unhandled exception has occurred.\nPKHeX must now close.", ex, false);
ErrorWindow.ShowErrorDialog("An unhandled exception has occurred.\nPKHeX.Core must now close.", ex, false);
}
catch
{
try
{
// Todo: make this translatable
MessageBox.Show("A fatal non-UI error has occurred in PKHeX, and the details could not be displayed. Please report this to the author.", "PKHeX Error", MessageBoxButtons.OK, MessageBoxIcon.Stop);
MessageBox.Show("A fatal non-UI error has occurred in PKHeX.Core, and the details could not be displayed. Please report this to the author.", "PKHeX.Core Error", MessageBoxButtons.OK, MessageBoxIcon.Stop);
}
finally
{

37
PKHeX.WinForms/Properties/AssemblyInfo.cs Normal file
View File

@ -0,0 +1,37 @@
using System.Reflection;
using System.Runtime.InteropServices;
using System.Resources;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("PKHeX")]
[assembly: AssemblyDescription("Pokémon Save Editor")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("ProjectPokémon")]
[assembly: AssemblyProduct("PKHeX")]
[assembly: AssemblyCopyright("Kaphotics")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("fda550dc-8ad4-4b1c-9fee-1375b810cde1")]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: NeutralResourcesLanguageAttribute("en")]

63
PKHeX.WinForms/Properties/Resources.Designer.cs generated Normal file
View File

@ -0,0 +1,63 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace PKHeX.WinForms.WinForms.Properties {
using System;
/// <summary>
/// A strongly-typed resource class, for looking up localized strings, etc.
/// </summary>
// This class was auto-generated by the StronglyTypedResourceBuilder
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
private static global::System.Resources.ResourceManager resourceMan;
private static global::System.Globalization.CultureInfo resourceCulture;
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
internal Resources() {
}
/// <summary>
/// Returns the cached ResourceManager instance used by this class.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Resources.ResourceManager ResourceManager {
get {
if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("PKHeX.WinForms.Properties.Resources", typeof(Resources).Assembly);
resourceMan = temp;
}
return resourceMan;
}
}
/// <summary>
/// Overrides the current thread's CurrentUICulture property for all
/// resource lookups using this strongly typed resource class.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture {
get {
return resourceCulture;
}
set {
resourceCulture = value;
}
}
}
}

117
PKHeX.WinForms/Properties/Resources.resx Normal file
View File

@ -0,0 +1,117 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

98
PKHeX.WinForms/Properties/Settings.Designer.cs generated Normal file
View File

@ -0,0 +1,98 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace PKHeX.WinForms.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
public static Settings Default {
get {
return defaultInstance;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
public string Language {
get {
return ((string)(this["Language"]));
}
set {
this["Language"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
public string Version {
get {
return ((string)(this["Version"]));
}
set {
this["Version"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("True")]
public bool Unicode {
get {
return ((bool)(this["Unicode"]));
}
set {
this["Unicode"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("True")]
public bool SetUpdateDex {
get {
return ((bool)(this["SetUpdateDex"]));
}
set {
this["SetUpdateDex"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("True")]
public bool SetUpdatePKM {
get {
return ((bool)(this["SetUpdatePKM"]));
}
set {
this["SetUpdatePKM"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool BAKPrompt {
get {
return ((bool)(this["BAKPrompt"]));
}
set {
this["BAKPrompt"] = value;
}
}
}
}

24
PKHeX.WinForms/Properties/Settings.settings Normal file
View File

@ -0,0 +1,24 @@
<?xml version='1.0' encoding='utf-8'?>
<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="PKHeX.Core.Properties" GeneratedClassName="Settings">
<Profiles />
<Settings>
<Setting Name="Language" Type="System.String" Scope="User">
<Value Profile="(Default)" />
</Setting>
<Setting Name="Version" Type="System.String" Scope="User">
<Value Profile="(Default)" />
</Setting>
<Setting Name="Unicode" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">True</Value>
</Setting>
<Setting Name="SetUpdateDex" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">True</Value>
</Setting>
<Setting Name="SetUpdatePKM" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">True</Value>
</Setting>
<Setting Name="BAKPrompt" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
</Settings>
</SettingsFile>

2
PKHeX/Settings.cs → PKHeX.WinForms/Settings.cs
View File

@ -1,4 +1,4 @@
namespace PKHeX.Properties {
namespace PKHeX.WinForms.Properties {
// This class allows you to handle specific events on the settings class:

2
PKHeX/Subforms/KChart.Designer.cs → PKHeX.WinForms/Subforms/KChart.Designer.cs generated
View File

@ -1,4 +1,4 @@
namespace PKHeX
namespace PKHeX.WinForms
{
partial class KChart
{

11
PKHeX/Subforms/KChart.cs → PKHeX.WinForms/Subforms/KChart.cs
View File

@ -3,16 +3,17 @@
using System.Drawing;
using System.Linq;
using System.Windows.Forms;
using PKHeX.Properties;
using PKHeX.Core;
using PKHeX.Core.Properties;
namespace PKHeX
namespace PKHeX.WinForms
{
public partial class KChart : Form
{
private readonly string[] species = Main.GameStrings.specieslist;
private readonly string[] abilities = Main.GameStrings.abilitylist;
private readonly string[] species = GameInfo.Strings.specieslist;
private readonly string[] abilities = GameInfo.Strings.abilitylist;
private readonly bool alolanOnly = Main.SAV.Generation == 7 && DialogResult.Yes == Util.Prompt(MessageBoxButtons.YesNo, "Alolan Dex only?");
private readonly bool alolanOnly = Main.SAV.Generation == 7 && DialogResult.Yes == WinFormsUtil.Prompt(MessageBoxButtons.YesNo, "Alolan Dex only?");
private static int[] baseForm;
private static int[] formVal;
public KChart()

0
PKHeX/Subforms/KChart.resx → PKHeX.WinForms/Subforms/KChart.resx
View File

2
PKHeX/Subforms/PKM Editors/BatchEditor.Designer.cs → PKHeX.WinForms/Subforms/PKM Editors/BatchEditor.Designer.cs generated
View File

@ -1,4 +1,4 @@
namespace PKHeX
namespace PKHeX.WinForms
{
partial class BatchEditor
{

29
PKHeX/Subforms/PKM Editors/BatchEditor.cs → PKHeX.WinForms/Subforms/PKM Editors/BatchEditor.cs
View File

@ -5,8 +5,9 @@
using System.IO;
using System.Linq;
using System.Windows.Forms;
using PKHeX.Core;
namespace PKHeX
namespace PKHeX.WinForms
{
public partial class BatchEditor : Form
{
@ -67,10 +68,10 @@ private void B_SAV_Click(object sender, EventArgs e)
private void B_Go_Click(object sender, EventArgs e)
{
if (b.IsBusy)
{ Util.Alert("Currently executing instruction list."); return; }
{ WinFormsUtil.Alert("Currently executing instruction list."); return; }
if (RTB_Instructions.Lines.Any(line => line.Length == 0))
{ Util.Error("Line length error in instruction list."); return; }
{ WinFormsUtil.Error("Line length error in instruction list."); return; }
runBackgroundWorker();
}
@ -80,14 +81,14 @@ private void runBackgroundWorker()
{
var Filters = getFilters().ToList();
if (Filters.Any(z => string.IsNullOrWhiteSpace(z.PropertyValue)))
{ Util.Error("Empty Filter Value detected."); return; }
{ WinFormsUtil.Error("Empty Filter Value detected."); return; }
var Instructions = getInstructions().ToList();
var emptyVal = Instructions.Where(z => string.IsNullOrWhiteSpace(z.PropertyValue)).ToArray();
if (emptyVal.Any())
{
string props = string.Join(", ", emptyVal.Select(z => z.PropertyName));
if (DialogResult.Yes != Util.Prompt(MessageBoxButtons.YesNo,
if (DialogResult.Yes != WinFormsUtil.Prompt(MessageBoxButtons.YesNo,
$"Empty Property Value{(emptyVal.Length > 1 ? "s" : "")} detected:" + Environment.NewLine + props,
"Continue?"))
return;
@ -96,7 +97,7 @@ private void runBackgroundWorker()
string destPath = "";
if (RB_Path.Checked)
{
Util.Alert("Please select the folder where the files will be saved to.", "This can be the same folder as the source of PKM files.");
WinFormsUtil.Alert("Please select the folder where the files will be saved to.", "This can be the same folder as the source of PKM files.");
var fbd = new FolderBrowserDialog();
var dr = fbd.ShowDialog();
if (dr != DialogResult.OK)
@ -133,7 +134,7 @@ private void runBackgroundWorker()
string result = $"Modified {ctr}/{len} files.";
if (err > 0)
result += Environment.NewLine + $"{err} files ignored due to an internal error.";
Util.Alert(result);
WinFormsUtil.Alert(result);
FLP_RB.Enabled = RTB_Instructions.Enabled = B_Go.Enabled = true;
setupProgressBar(0);
};
@ -275,11 +276,11 @@ public static void screenStrings(IEnumerable<StringInstruction> il)
switch (i.PropertyName)
{
case nameof(PKM.Species): i.setScreenedValue(Main.GameStrings.specieslist); continue;
case nameof(PKM.HeldItem): i.setScreenedValue(Main.GameStrings.itemlist); continue;
case nameof(PKM.Ability): i.setScreenedValue(Main.GameStrings.abilitylist); continue;
case nameof(PKM.Nature): i.setScreenedValue(Main.GameStrings.natures); continue;
case nameof(PKM.Ball): i.setScreenedValue(Main.GameStrings.balllist); continue;
case nameof(PKM.Species): i.setScreenedValue(GameInfo.Strings.specieslist); continue;
case nameof(PKM.HeldItem): i.setScreenedValue(GameInfo.Strings.itemlist); continue;
case nameof(PKM.Ability): i.setScreenedValue(GameInfo.Strings.abilitylist); continue;
case nameof(PKM.Nature): i.setScreenedValue(GameInfo.Strings.natures); continue;
case nameof(PKM.Ball): i.setScreenedValue(GameInfo.Strings.balllist); continue;
case nameof(PKM.Move1):
case nameof(PKM.Move2):
case nameof(PKM.Move3):
@ -288,7 +289,7 @@ public static void screenStrings(IEnumerable<StringInstruction> il)
case nameof(PKM.RelearnMove2):
case nameof(PKM.RelearnMove3):
case nameof(PKM.RelearnMove4):
i.setScreenedValue(Main.GameStrings.movelist); continue;
i.setScreenedValue(GameInfo.Strings.movelist); continue;
}
}
}
@ -425,7 +426,7 @@ private static void setRandomIVs(PKM PKM, StringInstruction cmd)
private void B_Add_Click(object sender, EventArgs e)
{
if (CB_Property.SelectedIndex < 0)
{ Util.Alert("Invalid property selected."); return; }
{ WinFormsUtil.Alert("Invalid property selected."); return; }
char[] prefix = {'.', '=', '!'};
string s = prefix[CB_Require.SelectedIndex] + CB_Property.Items[CB_Property.SelectedIndex].ToString() + "=";

0
PKHeX/Subforms/PKM Editors/BatchEditor.resx → PKHeX.WinForms/Subforms/PKM Editors/BatchEditor.resx
View File

2
PKHeX/Subforms/PKM Editors/MemoryAmie.Designer.cs → PKHeX.WinForms/Subforms/PKM Editors/MemoryAmie.Designer.cs generated
View File

@ -1,4 +1,4 @@
namespace PKHeX
namespace PKHeX.WinForms
{
partial class MemoryAmie
{

69
PKHeX/Subforms/PKM Editors/MemoryAmie.cs → PKHeX.WinForms/Subforms/PKM Editors/MemoryAmie.cs
View File

@ -1,8 +1,9 @@
using System;
using System.Linq;
using System.Windows.Forms;
using PKHeX.Core;
namespace PKHeX
namespace PKHeX.WinForms
{
public partial class MemoryAmie : Form
{
@ -17,7 +18,7 @@ public partial class MemoryAmie : Form
CB_Country0.ValueMember = CB_Country1.ValueMember = CB_Country2.ValueMember = CB_Country3.ValueMember = CB_Country4.ValueMember = "Value";
CB_Region0.DisplayMember = CB_Region1.DisplayMember = CB_Region2.DisplayMember = CB_Region3.DisplayMember = CB_Region4.DisplayMember = "Text";
CB_Region0.ValueMember = CB_Region1.ValueMember = CB_Region2.ValueMember = CB_Region3.ValueMember = CB_Region4.ValueMember = "Value";
Util.TranslateInterface(this, Main.curlanguage);
WinFormsUtil.TranslateInterface(this, Main.curlanguage);
string[] arguments = L_Arguments.Text.Split(new[] {" ; "}, StringSplitOptions.None);
for (int i = 5; i < Math.Min(arguments.Length, vartypes.Length + 5); i++)
@ -126,7 +127,7 @@ private void loadFields()
RTB_OT.Visible = CB_OTQual.Enabled = CB_OTMemory.Enabled = CB_OTFeel.Enabled = CB_OTVar.Enabled = M_OT_Affection.Enabled = enable;
}
else
GB_M_OT.Text = GB_M_CT.Text = $"N/A: {Main.GameStrings.eggname}";
GB_M_OT.Text = GB_M_CT.Text = $"N/A: {GameInfo.Strings.eggname}";
if (pkm.GenNumber == 7)
{
@ -143,16 +144,16 @@ private void loadFields()
private void saveFields()
{
// Save Region & Country Data
pkm.Geo1_Region = Util.getIndex(CB_Region0);
pkm.Geo2_Region = Util.getIndex(CB_Region1);
pkm.Geo3_Region = Util.getIndex(CB_Region2);
pkm.Geo4_Region = Util.getIndex(CB_Region3);
pkm.Geo5_Region = Util.getIndex(CB_Region4);
pkm.Geo1_Country = Util.getIndex(CB_Country0);
pkm.Geo2_Country = Util.getIndex(CB_Country1);
pkm.Geo3_Country = Util.getIndex(CB_Country2);
pkm.Geo4_Country = Util.getIndex(CB_Country3);
pkm.Geo5_Country = Util.getIndex(CB_Country4);
pkm.Geo1_Region = WinFormsUtil.getIndex(CB_Region0);
pkm.Geo2_Region = WinFormsUtil.getIndex(CB_Region1);
pkm.Geo3_Region = WinFormsUtil.getIndex(CB_Region2);
pkm.Geo4_Region = WinFormsUtil.getIndex(CB_Region3);
pkm.Geo5_Region = WinFormsUtil.getIndex(CB_Region4);
pkm.Geo1_Country = WinFormsUtil.getIndex(CB_Country0);
pkm.Geo2_Country = WinFormsUtil.getIndex(CB_Country1);
pkm.Geo3_Country = WinFormsUtil.getIndex(CB_Country2);
pkm.Geo4_Country = WinFormsUtil.getIndex(CB_Country3);
pkm.Geo5_Country = WinFormsUtil.getIndex(CB_Country4);
// Save 0-255 stats
pkm.HT_Friendship = Util.ToInt32(M_CT_Friendship.Text);
@ -163,13 +164,13 @@ private void saveFields()
pkm.Enjoyment = (byte)Util.ToInt32(M_Enjoyment.Text);
// Save Memories
pkm.HT_Memory = Util.getIndex(CB_CTMemory);
pkm.HT_TextVar = CB_CTVar.Enabled ? Util.getIndex(CB_CTVar) : 0;
pkm.HT_Memory = WinFormsUtil.getIndex(CB_CTMemory);
pkm.HT_TextVar = CB_CTVar.Enabled ? WinFormsUtil.getIndex(CB_CTVar) : 0;
pkm.HT_Intensity = CB_CTFeel.Enabled ? CB_CTQual.SelectedIndex + 1 : 0;
pkm.HT_Feeling = CB_CTFeel.Enabled ? CB_CTFeel.SelectedIndex : 0;
pkm.OT_Memory = Util.getIndex(CB_OTMemory);
pkm.OT_TextVar = CB_OTVar.Enabled ? Util.getIndex(CB_OTVar) : 0;
pkm.OT_Memory = WinFormsUtil.getIndex(CB_OTMemory);
pkm.OT_TextVar = CB_OTVar.Enabled ? WinFormsUtil.getIndex(CB_OTVar) : 0;
pkm.OT_Intensity = CB_OTFeel.Enabled ? CB_OTQual.SelectedIndex + 1 : 0;
pkm.OT_Feeling = CB_OTFeel.Enabled ? CB_OTFeel.SelectedIndex : 0;
@ -191,12 +192,12 @@ private void B_Cancel_Click(object sender, EventArgs e)
private void getLangStrings()
{
// Memory Chooser
int memorycount = Main.GameStrings.memories.Length - 38;
int memorycount = GameInfo.Strings.memories.Length - 38;
string[] memories = new string[memorycount];
int[] allowed = new int[memorycount];
for (int i = 0; i < memorycount; i++)
{
memories[i] = Main.GameStrings.memories[38 + i];
memories[i] = GameInfo.Strings.memories[38 + i];
allowed[i] = i + 1;
}
Array.Resize(ref allowed, allowed.Length - 1);
@ -216,8 +217,8 @@ private void getLangStrings()
CB_OTQual.Items.Clear();
for (int i = 0; i < 7; i++)
{
CB_CTQual.Items.Add(Main.GameStrings.memories[2 + i]);
CB_OTQual.Items.Add(Main.GameStrings.memories[2 + i]);
CB_CTQual.Items.Add(GameInfo.Strings.memories[2 + i]);
CB_OTQual.Items.Add(GameInfo.Strings.memories[2 + i]);
}
// Feeling Chooser
@ -225,8 +226,8 @@ private void getLangStrings()
CB_OTFeel.Items.Clear();
for (int i = 0; i < 24; i++)
{
CB_CTFeel.Items.Add(Main.GameStrings.memories[10 + i]);
CB_OTFeel.Items.Add(Main.GameStrings.memories[10 + i]);
CB_CTFeel.Items.Add(GameInfo.Strings.memories[10 + i]);
CB_OTFeel.Items.Add(GameInfo.Strings.memories[10 + i]);
}
}
private void getMemoryArguments(string ARG, ComboBox sender)
@ -242,11 +243,11 @@ private void getMemoryArguments(string ARG, ComboBox sender)
vs = "";
break;
case "PKM":
argvals = Util.getCBList(Main.GameStrings.specieslist.Take(Main.SAV.MaxSpeciesID+1).ToArray(), null);
argvals = Util.getCBList(GameInfo.Strings.specieslist.Take(Main.SAV.MaxSpeciesID+1).ToArray(), null);
vs = vartypes[0];
break;
case "GENLOC":
argvals = Util.getCBList(Main.GameStrings.genloc, null);
argvals = Util.getCBList(GameInfo.Strings.genloc, null);
vs = vartypes[1];
break;
case "ITEM":
@ -272,18 +273,18 @@ private void getMemoryArguments(string ARG, ComboBox sender)
/* ORAS */
718,719,720,737,738,739,740,741,742,752,753,754,755,756,757,758,759,760,761,762,763,764,765,767,768, 769,770,775
};
var item_list = Util.getCBList(Main.GameStrings.itemlist, items_allowed);
var item_list = Util.getCBList(GameInfo.Strings.itemlist, items_allowed);
#endregion
argvals = item_list;
vs = vartypes[2];
}
break;
case "MOVE":
argvals = Util.getCBList(Main.GameStrings.movelist.Take(622).ToArray(), null); // Hyperspace Fury
argvals = Util.getCBList(GameInfo.Strings.movelist.Take(622).ToArray(), null); // Hyperspace Fury
vs = vartypes[3];
break;
case "LOCATION":
argvals = Util.getCBList(Main.GameStrings.metXY_00000, Legal.Met_XY_0);
argvals = Util.getCBList(GameInfo.Strings.metXY_00000, Legal.Met_XY_0);
vs = vartypes[4];
break;
}
@ -310,14 +311,14 @@ private string getMemoryString(ComboBox m, ComboBox arg, ComboBox q, ComboBox f,
string result;
string nn = pkm.Nickname;
string a = (ComboItem)arg.SelectedItem == null ? arg.Text ?? "ERROR" : ((ComboItem)arg.SelectedItem).Text;
int mem = Util.getIndex(m);
int mem = WinFormsUtil.getIndex(m);
bool enabled = false;
if (mem == 0)
result = Main.GameStrings.memories[38];
result = GameInfo.Strings.memories[38];
else
{
result = string.Format(Main.GameStrings.memories[mem + 38], nn, tr, a, f.Text, q.Text);
result = string.Format(GameInfo.Strings.memories[mem + 38], nn, tr, a, f.Text, q.Text);
enabled = true;
}
@ -338,7 +339,7 @@ private void changeMemory(object sender, EventArgs e)
ComboBox m = (ComboBox)sender;
if (m == CB_CTMemory || m == CB_OTMemory)
{
int memory = Util.getIndex(m);
int memory = WinFormsUtil.getIndex(m);
switch (memory) // Memory Case Switchtable
{
case 0: getMemoryArguments("NONE", m); break;
@ -417,9 +418,9 @@ private void changeMemory(object sender, EventArgs e)
private void changeCountryIndex(object sender, EventArgs e)
{
int index = Array.IndexOf(cba, sender);
if (Util.getIndex(sender as ComboBox) > 0)
if (WinFormsUtil.getIndex(sender as ComboBox) > 0)
{
Main.setCountrySubRegion(mta[index], "sr_" + Util.getIndex(sender as ComboBox).ToString("000"));
Main.setCountrySubRegion(mta[index], "sr_" + WinFormsUtil.getIndex(sender as ComboBox).ToString("000"));
mta[index].Enabled = true;
}
else

0
PKHeX/Subforms/PKM Editors/MemoryAmie.resx → PKHeX.WinForms/Subforms/PKM Editors/MemoryAmie.resx
View File

2
PKHeX/Subforms/PKM Editors/RibbonEditor.Designer.cs → PKHeX.WinForms/Subforms/PKM Editors/RibbonEditor.Designer.cs generated
View File

@ -1,4 +1,4 @@
namespace PKHeX
namespace PKHeX.WinForms
{
partial class RibbonEditor
{

17
PKHeX/Subforms/PKM Editors/RibbonEditor.cs → PKHeX.WinForms/Subforms/PKM Editors/RibbonEditor.cs
View File

@ -3,8 +3,9 @@
using System.Drawing;
using System.Linq;
using System.Windows.Forms;
using PKHeX.Core;
namespace PKHeX
namespace PKHeX.WinForms
{
public partial class RibbonEditor : Form
{
@ -16,10 +17,10 @@ public RibbonEditor()
// Updating a Control display with autosized elements on every row addition is cpu intensive. Disable layout updates while populating.
TLP_Ribbons.SuspendLayout();
FLP_Ribbons.Scroll += Util.PanelScroll;
TLP_Ribbons.Scroll += Util.PanelScroll;
FLP_Ribbons.Scroll += WinFormsUtil.PanelScroll;
TLP_Ribbons.Scroll += WinFormsUtil.PanelScroll;
populateRibbons();
Util.TranslateInterface(this, Main.curlanguage);
WinFormsUtil.TranslateInterface(this, Main.curlanguage);
TLP_Ribbons.ResumeLayout();
}
@ -71,7 +72,7 @@ private void populateRibbons()
private void addRibbonSprite(RibbonInfo rib)
{
PictureBox pb = new PictureBox { AutoSize = false, Size = new Size(40,40), BackgroundImageLayout = ImageLayout.Center, Visible = false, Name = PrefixPB + rib.Name };
var img = Properties.Resources.ResourceManager.GetObject(rib.Name.Replace("CountG3", "G3").ToLower());
var img = Core.Properties.Resources.ResourceManager.GetObject(rib.Name.Replace("CountG3", "G3").ToLower());
if (img != null)
pb.BackgroundImage = (Bitmap)img;
if (img == null)
@ -127,12 +128,12 @@ private void addRibbonChoice(RibbonInfo rib)
case 3: n += "Hyper"; break;
case 4: n += "Master"; break;
}
FLP_Ribbons.Controls[PrefixPB + rib.Name].BackgroundImage = (Bitmap)Properties.Resources.ResourceManager.GetObject(n.ToLower());
FLP_Ribbons.Controls[PrefixPB + rib.Name].BackgroundImage = (Bitmap)Core.Properties.Resources.ResourceManager.GetObject(n.ToLower());
}
else if (nud.Maximum == nud.Value)
FLP_Ribbons.Controls[PrefixPB + rib.Name].BackgroundImage = (Bitmap)Properties.Resources.ResourceManager.GetObject(rib.Name.ToLower() +"2");
FLP_Ribbons.Controls[PrefixPB + rib.Name].BackgroundImage = (Bitmap)Core.Properties.Resources.ResourceManager.GetObject(rib.Name.ToLower() +"2");
else
FLP_Ribbons.Controls[PrefixPB + rib.Name].BackgroundImage = (Bitmap)Properties.Resources.ResourceManager.GetObject(rib.Name.ToLower());
FLP_Ribbons.Controls[PrefixPB + rib.Name].BackgroundImage = (Bitmap)Core.Properties.Resources.ResourceManager.GetObject(rib.Name.ToLower());
};
nud.Value = rib.RibbonCount > nud.Maximum ? nud.Maximum : rib.RibbonCount;
TLP_Ribbons.Controls.Add(nud, 0, row);

0
PKHeX/Subforms/PKM Editors/RibbonEditor.resx → PKHeX.WinForms/Subforms/PKM Editors/RibbonEditor.resx
View File

2
PKHeX/Subforms/PKM Editors/SuperTrainingEditor.Designer.cs → PKHeX.WinForms/Subforms/PKM Editors/SuperTrainingEditor.Designer.cs generated
View File

@ -1,4 +1,4 @@
namespace PKHeX
namespace PKHeX.WinForms
{
partial class SuperTrainingEditor
{

13
PKHeX/Subforms/PKM Editors/SuperTrainingEditor.cs → PKHeX.WinForms/Subforms/PKM Editors/SuperTrainingEditor.cs
View File

@ -2,8 +2,9 @@
using System.Collections.Generic;
using System.Linq;
using System.Windows.Forms;
using PKHeX.Core;
namespace PKHeX
namespace PKHeX.WinForms
{
public partial class SuperTrainingEditor : Form
{
@ -16,11 +17,11 @@ public SuperTrainingEditor()
// Updating a Control display with autosized elements on every row addition is cpu intensive. Disable layout updates while populating.
TLP_SuperTrain.SuspendLayout();
TLP_DistSuperTrain.SuspendLayout();
TLP_SuperTrain.Scroll += Util.PanelScroll;
TLP_DistSuperTrain.Scroll += Util.PanelScroll;
TLP_SuperTrain.Scroll += WinFormsUtil.PanelScroll;
TLP_DistSuperTrain.Scroll += WinFormsUtil.PanelScroll;
populateRegimens("SuperTrain", TLP_SuperTrain, reglist);
populateRegimens("DistSuperTrain", TLP_DistSuperTrain, distlist);
Util.TranslateInterface(this, Main.curlanguage);
WinFormsUtil.TranslateInterface(this, Main.curlanguage);
TLP_SuperTrain.ResumeLayout();
TLP_DistSuperTrain.ResumeLayout();
@ -33,8 +34,8 @@ public SuperTrainingEditor()
{
CB_Bag.Items.Clear();
CB_Bag.Items.Add("---");
for (int i = 1; i < Main.GameStrings.trainingbags.Length - 1; i++)
CB_Bag.Items.Add(Main.GameStrings.trainingbags[i]);
for (int i = 1; i < GameInfo.Strings.trainingbags.Length - 1; i++)
CB_Bag.Items.Add(GameInfo.Strings.trainingbags[i]);
PK6 pk6 = (PK6) pkm;
CB_Bag.SelectedIndex = pk6.TrainingBag;

0
PKHeX/Subforms/PKM Editors/SuperTrainingEditor.resx → PKHeX.WinForms/Subforms/PKM Editors/SuperTrainingEditor.resx
View File

2
PKHeX/Subforms/PKM Editors/Text.Designer.cs → PKHeX.WinForms/Subforms/PKM Editors/Text.Designer.cs generated
View File

@ -1,4 +1,4 @@
namespace PKHeX
namespace PKHeX.WinForms
{
partial class f2_Text
{

7
PKHeX/Subforms/PKM Editors/Text.cs → PKHeX.WinForms/Subforms/PKM Editors/Text.cs
View File

@ -1,8 +1,9 @@
using System;
using System.Drawing;
using System.Windows.Forms;
using PKHeX.Core;
namespace PKHeX
namespace PKHeX.WinForms
{
public partial class f2_Text : Form
{
@ -10,9 +11,9 @@ public f2_Text(TextBox TB_NN)
{
Hide();
InitializeComponent();
Util.TranslateInterface(this, Main.curlanguage);
WinFormsUtil.TranslateInterface(this, Main.curlanguage);
TB_Nickname = TB_NN;
Font pkxFont = PKX.getPKXFont(12F);
Font pkxFont = FontUtil.getPKXFont(12F);
Label[] lbla =
{
L00, L01, L02, L03, L04, L05, L06, L07,

0
PKHeX/Subforms/PKM Editors/Text.resx → PKHeX.WinForms/Subforms/PKM Editors/Text.resx
View File

16
PKHeX/Subforms/SAV_Database.Designer.cs → PKHeX.WinForms/Subforms/SAV_Database.Designer.cs generated
View File

@ -1,4 +1,4 @@
namespace PKHeX
namespace PKHeX.WinForms
{
partial class SAV_Database
{
@ -926,7 +926,7 @@ private void InitializeComponent()
//
// Menu_Exit
//
this.Menu_Exit.Image = global::PKHeX.Properties.Resources.exit;
this.Menu_Exit.Image = Core.Properties.Resources.exit;
this.Menu_Exit.Name = "Menu_Exit";
this.Menu_Exit.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.E)));
this.Menu_Exit.ShowShortcutKeys = false;
@ -955,7 +955,7 @@ private void InitializeComponent()
this.Menu_SearchIllegal,
this.Menu_SearchClones,
this.Menu_SearchAdvanced});
this.Menu_SearchSettings.Image = global::PKHeX.Properties.Resources.settings;
this.Menu_SearchSettings.Image = Core.Properties.Resources.settings;
this.Menu_SearchSettings.Name = "Menu_SearchSettings";
this.Menu_SearchSettings.Size = new System.Drawing.Size(197, 22);
this.Menu_SearchSettings.Text = "Search Settings";
@ -1007,7 +1007,7 @@ private void InitializeComponent()
//
// Menu_OpenDB
//
this.Menu_OpenDB.Image = global::PKHeX.Properties.Resources.folder;
this.Menu_OpenDB.Image = Core.Properties.Resources.folder;
this.Menu_OpenDB.Name = "Menu_OpenDB";
this.Menu_OpenDB.Size = new System.Drawing.Size(197, 22);
this.Menu_OpenDB.Text = "Open Database Folder";
@ -1015,7 +1015,7 @@ private void InitializeComponent()
//
// Menu_Report
//
this.Menu_Report.Image = global::PKHeX.Properties.Resources.report;
this.Menu_Report.Image = Core.Properties.Resources.report;
this.Menu_Report.Name = "Menu_Report";
this.Menu_Report.Size = new System.Drawing.Size(197, 22);
this.Menu_Report.Text = "Create Data Report";
@ -1023,7 +1023,7 @@ private void InitializeComponent()
//
// Menu_Export
//
this.Menu_Export.Image = global::PKHeX.Properties.Resources.export;
this.Menu_Export.Image = Core.Properties.Resources.export;
this.Menu_Export.Name = "Menu_Export";
this.Menu_Export.Size = new System.Drawing.Size(197, 22);
this.Menu_Export.Text = "Export Results to Folder";
@ -1042,7 +1042,7 @@ private void InitializeComponent()
//
// PAN_Box
//
this.PAN_Box.BackgroundImage = global::PKHeX.Properties.Resources.box_wp16xy;
this.PAN_Box.BackgroundImage = Core.Properties.Resources.box_wp16xy;
this.PAN_Box.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.PAN_Box.Controls.Add(this.bpkx66);
this.PAN_Box.Controls.Add(this.bpkx65);
@ -1827,7 +1827,7 @@ private void InitializeComponent()
//
// Menu_DeleteClones
//
this.Menu_DeleteClones.Image = global::PKHeX.Properties.Resources.nocheck;
this.Menu_DeleteClones.Image = Core.Properties.Resources.nocheck;
this.Menu_DeleteClones.Name = "Menu_DeleteClones";
this.Menu_DeleteClones.Size = new System.Drawing.Size(197, 22);
this.Menu_DeleteClones.Text = "Delete Clones";

59
PKHeX/Subforms/SAV_Database.cs → PKHeX.WinForms/Subforms/SAV_Database.cs
View File

@ -7,8 +7,9 @@
using System.Linq;
using System.Threading.Tasks;
using System.Windows.Forms;
using PKHeX.Core;
namespace PKHeX
namespace PKHeX.WinForms
{
public partial class SAV_Database : Form
{
@ -134,7 +135,7 @@ private void clickView(object sender, EventArgs e)
{
m_parent.populateFields(dataArr[index], false);
slotSelected = index + SCR_Box.Value * RES_MIN;
slotColor = Properties.Resources.slotView;
slotColor = Core.Properties.Resources.slotView;
FillPKXBoxes(SCR_Box.Value);
L_Viewed.Text = string.Format(Viewed, dataArr[index].Identifier);
}
@ -172,7 +173,7 @@ private void clickDelete(object sender, EventArgs e)
}
else
{
Util.Error("Database slot data does not match save data!", "Don't move Pokémon after initializing the Database, please re-open the Database viewer.");
WinFormsUtil.Error("Database slot data does not match save data!", "Don't move Pokémon after initializing the Database, please re-open the Database viewer.");
return;
}
}
@ -200,7 +201,7 @@ private void clickSet(object sender, EventArgs e)
if (RawDB.Any(p => p.Identifier == path))
{
Util.Alert("File already exists in database!");
WinFormsUtil.Alert("File already exists in database!");
return;
}
@ -212,18 +213,18 @@ private void clickSet(object sender, EventArgs e)
RawDB = new List<PKM>(RawDB.Distinct()); // just in case
int post = RawDB.Count;
if (pre == post)
{ Util.Alert("Pokémon already exists in database."); return; }
{ WinFormsUtil.Alert("Pokémon already exists in database."); return; }
Results.Add(pk);
// Refresh database view.
L_Count.Text = string.Format(Counter, Results.Count);
slotSelected = Results.Count - 1;
slotColor = Properties.Resources.slotSet;
slotColor = Core.Properties.Resources.slotSet;
if ((SCR_Box.Maximum+1)*6 < Results.Count)
SCR_Box.Maximum += 1;
SCR_Box.Value = Math.Max(0, SCR_Box.Maximum - PKXBOXES.Length/6 + 1);
FillPKXBoxes(SCR_Box.Value);
Util.Alert("Added Pokémon from tabs to database.");
WinFormsUtil.Alert("Added Pokémon from tabs to database.");
}
private void populateComboBoxes()
{
@ -260,7 +261,7 @@ private void populateComboBoxes()
var DS_Version = new List<ComboItem>(GameInfo.VersionDataSource);
DS_Version.Insert(0, Any); CB_GameOrigin.DataSource = DS_Version;
string[] hptypes = new string[Main.GameStrings.types.Length - 2]; Array.Copy(Main.GameStrings.types, 1, hptypes, 0, hptypes.Length);
string[] hptypes = new string[GameInfo.Strings.types.Length - 2]; Array.Copy(GameInfo.Strings.types, 1, hptypes, 0, hptypes.Length);
var DS_Type = Util.getCBList(hptypes, null);
DS_Type.Insert(0, Any); CB_HPType.DataSource = DS_Type;
@ -307,7 +308,7 @@ private void resetFilters(object sender, EventArgs e)
}
private void generateDBReport(object sender, EventArgs e)
{
if (Util.Prompt(MessageBoxButtons.YesNo, "Generate a Report on all data?", "This may take a while...")
if (WinFormsUtil.Prompt(MessageBoxButtons.YesNo, "Generate a Report on all data?", "This may take a while...")
!= DialogResult.Yes)
return;
@ -325,9 +326,9 @@ private void openDB(object sender, EventArgs e)
private void Menu_Export_Click(object sender, EventArgs e)
{
if (Results == null || Results.Count == 0)
{ Util.Alert("No results to export."); return; }
{ WinFormsUtil.Alert("No results to export."); return; }
if (DialogResult.Yes != Util.Prompt(MessageBoxButtons.YesNo, "Export to a folder?"))
if (DialogResult.Yes != WinFormsUtil.Prompt(MessageBoxButtons.YesNo, "Export to a folder?"))
return;
FolderBrowserDialog fbd = new FolderBrowserDialog();
@ -377,27 +378,27 @@ private void B_Search_Click(object sender, EventArgs e)
}
// Primary Searchables
int species = Util.getIndex(CB_Species);
int ability = Util.getIndex(CB_Ability);
int nature = Util.getIndex(CB_Nature);
int item = Util.getIndex(CB_HeldItem);
int species = WinFormsUtil.getIndex(CB_Species);
int ability = WinFormsUtil.getIndex(CB_Ability);
int nature = WinFormsUtil.getIndex(CB_Nature);
int item = WinFormsUtil.getIndex(CB_HeldItem);
if (species != -1) res = res.Where(pk => pk.Species == species);
if (ability != -1) res = res.Where(pk => pk.Ability == ability);
if (nature != -1) res = res.Where(pk => pk.Nature == nature);
if (item != -1) res = res.Where(pk => pk.HeldItem == item);
// Secondary Searchables
int move1 = Util.getIndex(CB_Move1);
int move2 = Util.getIndex(CB_Move2);
int move3 = Util.getIndex(CB_Move3);
int move4 = Util.getIndex(CB_Move4);
int move1 = WinFormsUtil.getIndex(CB_Move1);
int move2 = WinFormsUtil.getIndex(CB_Move2);
int move3 = WinFormsUtil.getIndex(CB_Move3);
int move4 = WinFormsUtil.getIndex(CB_Move4);
if (move1 != -1) res = res.Where(pk => pk.Moves.Contains(move1));
if (move2 != -1) res = res.Where(pk => pk.Moves.Contains(move2));
if (move3 != -1) res = res.Where(pk => pk.Moves.Contains(move3));
if (move4 != -1) res = res.Where(pk => pk.Moves.Contains(move4));
int vers = Util.getIndex(CB_GameOrigin);
int vers = WinFormsUtil.getIndex(CB_GameOrigin);
if (vers != -1) res = res.Where(pk => pk.Version == vers);
int hptype = Util.getIndex(CB_HPType);
int hptype = WinFormsUtil.getIndex(CB_HPType);
if (hptype != -1) res = res.Where(pk => pk.HPType == hptype);
if (CHK_Shiny.CheckState == CheckState.Checked) res = res.Where(pk => pk.IsShiny);
if (CHK_Shiny.CheckState == CheckState.Unchecked) res = res.Where(pk => !pk.IsShiny);
@ -516,9 +517,9 @@ private void B_Search_Click(object sender, EventArgs e)
if (results.Length == 0)
{
if (!Menu_SearchBoxes.Checked && !Menu_SearchDatabase.Checked)
Util.Alert("No data source to search!", "No results found!");
WinFormsUtil.Alert("No data source to search!", "No results found!");
else
Util.Alert("No results found!");
WinFormsUtil.Alert("No results found!");
}
setResults(new List<PKM>(results)); // updates Count Label as well.
System.Media.SystemSounds.Asterisk.Play();
@ -555,9 +556,9 @@ private void FillPKXBoxes(int start)
PKXBOXES[i].Image = null;
for (int i = 0; i < RES_MAX; i++)
PKXBOXES[i].BackgroundImage = Properties.Resources.slotTrans;
PKXBOXES[i].BackgroundImage = Core.Properties.Resources.slotTrans;
if (slotSelected != -1 && slotSelected >= RES_MIN * start && slotSelected < RES_MIN * start + RES_MAX)
PKXBOXES[slotSelected - start * RES_MIN].BackgroundImage = slotColor ?? Properties.Resources.slotView;
PKXBOXES[slotSelected - start * RES_MIN].BackgroundImage = slotColor ?? Core.Properties.Resources.slotView;
}
// Misc Update Methods
@ -619,7 +620,7 @@ private void changeFormatFilter(object sender, EventArgs e)
private void Menu_DeleteClones_Click(object sender, EventArgs e)
{
var dr = Util.Prompt(MessageBoxButtons.YesNo,
var dr = WinFormsUtil.Prompt(MessageBoxButtons.YesNo,
"Deleting clones from database is not reversible." + Environment.NewLine +
"If a PKM is deemed a clone, only the newest file (date modified) will be kept.", "Continue?");
@ -637,13 +638,13 @@ private void Menu_DeleteClones_Click(object sender, EventArgs e)
{ hashes.Add(h); continue; }
try { File.Delete(pk.Identifier); ++deleted; }
catch { Util.Error("Unable to delete clone:" + Environment.NewLine + pk.Identifier); }
catch { WinFormsUtil.Error("Unable to delete clone:" + Environment.NewLine + pk.Identifier); }
}
if (deleted == 0)
{ Util.Alert("No clones detected or deleted."); return; }
{ WinFormsUtil.Alert("No clones detected or deleted."); return; }
Util.Alert($"{deleted} files deleted.", "The form will now close.");
WinFormsUtil.Alert($"{deleted} files deleted.", "The form will now close.");
Close();
}
}

0
PKHeX/Subforms/SAV_Database.resx → PKHeX.WinForms/Subforms/SAV_Database.resx
View File

12
PKHeX/Subforms/SAV_MysteryGiftDB.Designer.cs → PKHeX.WinForms/Subforms/SAV_MysteryGiftDB.Designer.cs generated
View File

@ -1,4 +1,4 @@
namespace PKHeX
namespace PKHeX.WinForms
{
partial class SAV_MysteryGiftDB
{
@ -899,7 +899,7 @@ private void InitializeComponent()
//
// Menu_Exit
//
this.Menu_Exit.Image = global::PKHeX.Properties.Resources.exit;
this.Menu_Exit.Image = Core.Properties.Resources.exit;
this.Menu_Exit.Name = "Menu_Exit";
this.Menu_Exit.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.E)));
this.Menu_Exit.ShowShortcutKeys = false;
@ -921,7 +921,7 @@ private void InitializeComponent()
//
this.Menu_SearchSettings.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.Menu_SearchAdvanced});
this.Menu_SearchSettings.Image = global::PKHeX.Properties.Resources.settings;
this.Menu_SearchSettings.Image = Core.Properties.Resources.settings;
this.Menu_SearchSettings.Name = "Menu_SearchSettings";
this.Menu_SearchSettings.Size = new System.Drawing.Size(197, 22);
this.Menu_SearchSettings.Text = "Search Settings";
@ -937,7 +937,7 @@ private void InitializeComponent()
//
// Menu_OpenDB
//
this.Menu_OpenDB.Image = global::PKHeX.Properties.Resources.folder;
this.Menu_OpenDB.Image = Core.Properties.Resources.folder;
this.Menu_OpenDB.Name = "Menu_OpenDB";
this.Menu_OpenDB.Size = new System.Drawing.Size(197, 22);
this.Menu_OpenDB.Text = "Open Database Folder";
@ -945,7 +945,7 @@ private void InitializeComponent()
//
// Menu_Export
//
this.Menu_Export.Image = global::PKHeX.Properties.Resources.export;
this.Menu_Export.Image = Core.Properties.Resources.export;
this.Menu_Export.Name = "Menu_Export";
this.Menu_Export.Size = new System.Drawing.Size(197, 22);
this.Menu_Export.Text = "Export Results to Folder";
@ -964,7 +964,7 @@ private void InitializeComponent()
//
// PAN_Box
//
this.PAN_Box.BackgroundImage = global::PKHeX.Properties.Resources.box_wp16xy;
this.PAN_Box.BackgroundImage = Core.Properties.Resources.box_wp16xy;
this.PAN_Box.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.PAN_Box.Controls.Add(this.bpkx66);
this.PAN_Box.Controls.Add(this.bpkx65);

29
PKHeX/Subforms/SAV_MysteryGiftDB.cs → PKHeX.WinForms/Subforms/SAV_MysteryGiftDB.cs
View File

@ -5,8 +5,9 @@
using System.IO;
using System.Linq;
using System.Windows.Forms;
using PKHeX.Core;
namespace PKHeX
namespace PKHeX.WinForms
{
public partial class SAV_MysteryGiftDB : Form
{
@ -127,7 +128,7 @@ private void clickView(object sender, EventArgs e)
{
m_parent.populateFields(dataArr[index].convertToPKM(Main.SAV), false);
slotSelected = index + SCR_Box.Value * RES_MIN;
slotColor = Properties.Resources.slotView;
slotColor = Core.Properties.Resources.slotView;
FillPKXBoxes(SCR_Box.Value);
L_Viewed.Text = string.Format(Viewed, dataArr[index].FileName);
}
@ -190,9 +191,9 @@ private void openDB(object sender, EventArgs e)
private void Menu_Export_Click(object sender, EventArgs e)
{
if (Results == null || Results.Count == 0)
{ Util.Alert("No results to export."); return; }
{ WinFormsUtil.Alert("No results to export."); return; }
if (DialogResult.Yes != Util.Prompt(MessageBoxButtons.YesNo, "Export to a folder?"))
if (DialogResult.Yes != WinFormsUtil.Prompt(MessageBoxButtons.YesNo, "Export to a folder?"))
return;
FolderBrowserDialog fbd = new FolderBrowserDialog();
@ -224,16 +225,16 @@ private void B_Search_Click(object sender, EventArgs e)
}
// Primary Searchables
int species = Util.getIndex(CB_Species);
int item = Util.getIndex(CB_HeldItem);
int species = WinFormsUtil.getIndex(CB_Species);
int item = WinFormsUtil.getIndex(CB_HeldItem);
if (species != -1) res = res.Where(pk => pk.Species == species);
if (item != -1) res = res.Where(pk => pk.HeldItem == item);
// Secondary Searchables
int move1 = Util.getIndex(CB_Move1);
int move2 = Util.getIndex(CB_Move2);
int move3 = Util.getIndex(CB_Move3);
int move4 = Util.getIndex(CB_Move4);
int move1 = WinFormsUtil.getIndex(CB_Move1);
int move2 = WinFormsUtil.getIndex(CB_Move2);
int move3 = WinFormsUtil.getIndex(CB_Move3);
int move4 = WinFormsUtil.getIndex(CB_Move4);
if (move1 != -1) res = res.Where(pk => pk.Moves.Contains(move1));
if (move2 != -1) res = res.Where(pk => pk.Moves.Contains(move2));
if (move3 != -1) res = res.Where(pk => pk.Moves.Contains(move3));
@ -259,7 +260,7 @@ private void B_Search_Click(object sender, EventArgs e)
select new BatchEditor.StringInstruction { PropertyName = split[0], PropertyValue = split[1], Evaluator = eval }).ToArray();
if (filters.Any(z => string.IsNullOrWhiteSpace(z.PropertyValue)))
{ Util.Error("Empty Filter Value detected."); return; }
{ WinFormsUtil.Error("Empty Filter Value detected."); return; }
res = res.Where(gift => // Compare across all filters
{
@ -278,7 +279,7 @@ private void B_Search_Click(object sender, EventArgs e)
var results = res.ToArray();
if (results.Length == 0)
{
Util.Alert("No results found!");
WinFormsUtil.Alert("No results found!");
}
setResults(new List<MysteryGift>(results)); // updates Count Label as well.
System.Media.SystemSounds.Asterisk.Play();
@ -315,9 +316,9 @@ private void FillPKXBoxes(int start)
PKXBOXES[i].Image = null;
for (int i = 0; i < RES_MAX; i++)
PKXBOXES[i].BackgroundImage = Properties.Resources.slotTrans;
PKXBOXES[i].BackgroundImage = Core.Properties.Resources.slotTrans;
if (slotSelected != -1 && slotSelected >= RES_MIN * start && slotSelected < RES_MIN * start + RES_MAX)
PKXBOXES[slotSelected - start * RES_MIN].BackgroundImage = slotColor ?? Properties.Resources.slotView;
PKXBOXES[slotSelected - start * RES_MIN].BackgroundImage = slotColor ?? Core.Properties.Resources.slotView;
}
private void Menu_SearchAdvanced_Click(object sender, EventArgs e)

0
PKHeX/Subforms/SAV_MysteryGiftDB.resx → PKHeX.WinForms/Subforms/SAV_MysteryGiftDB.resx
View File

2
PKHeX/Subforms/Save Editors/Gen5/CGearBackground.cs → PKHeX.WinForms/Subforms/Save Editors/Gen5/CGearBackground.cs
View File

@ -6,7 +6,7 @@
using System.Linq;
using System.Runtime.InteropServices;
namespace PKHeX
namespace PKHeX.WinForms
{
public class CGearBackground
{

2
PKHeX/Subforms/Save Editors/Gen5/SAV_CGearSkin.Designer.cs → PKHeX.WinForms/Subforms/Save Editors/Gen5/SAV_CGearSkin.Designer.cs generated
View File

@ -1,4 +1,4 @@
namespace PKHeX
namespace PKHeX.WinForms
{
partial class SAV_CGearSkin
{

7
PKHeX/Subforms/Save Editors/Gen5/SAV_CGearSkin.cs → PKHeX.WinForms/Subforms/Save Editors/Gen5/SAV_CGearSkin.cs
View File

@ -4,8 +4,9 @@
using System.IO;
using System.Linq;
using System.Windows.Forms;
using PKHeX.Core;
namespace PKHeX
namespace PKHeX.WinForms
{
public partial class SAV_CGearSkin : Form
{
@ -46,7 +47,7 @@ private void B_ImportPNG_Click(object sender, EventArgs e)
}
catch (Exception ex)
{
Util.Error(ex.Message);
WinFormsUtil.Error(ex.Message);
}
}
private void B_ExportPNG_Click(object sender, EventArgs e)
@ -76,7 +77,7 @@ private void B_ImportCGB_Click(object sender, EventArgs e)
var len = new FileInfo(ofd.FileName).Length;
if (len != CGearBackground.SIZE_CGB)
{
Util.Error($"Incorrect size, got {len} bytes, expected {CGearBackground.SIZE_CGB} bytes.");
WinFormsUtil.Error($"Incorrect size, got {len} bytes, expected {CGearBackground.SIZE_CGB} bytes.");
return;
}

0
PKHeX/Subforms/Save Editors/Gen5/SAV_CGearSkin.resx → PKHeX.WinForms/Subforms/Save Editors/Gen5/SAV_CGearSkin.resx
View File

2
PKHeX/Subforms/Save Editors/Gen6/SAV_BerryFieldXY.Designer.cs → PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_BerryFieldXY.Designer.cs generated
View File

@ -1,4 +1,4 @@
namespace PKHeX
namespace PKHeX.WinForms
{
partial class SAV_BerryFieldXY
{

5
PKHeX/Subforms/Save Editors/Gen6/SAV_BerryFieldXY.cs → PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_BerryFieldXY.cs
View File

@ -1,14 +1,15 @@
using System;
using System.Windows.Forms;
using PKHeX.Core;
namespace PKHeX
namespace PKHeX.WinForms
{
public partial class SAV_BerryFieldXY : Form
{
public SAV_BerryFieldXY()
{
InitializeComponent();
Util.TranslateInterface(this, Main.curlanguage);
WinFormsUtil.TranslateInterface(this, Main.curlanguage);
listBox1.SelectedIndex = 0;
}
private readonly SAV6 SAV = new SAV6(Main.SAV.Data);

0
PKHeX/Subforms/Save Editors/Gen6/SAV_BerryFieldXY.resx → PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_BerryFieldXY.resx
View File

2
PKHeX/Subforms/Save Editors/Gen6/SAV_BoxLayout.Designer.cs → PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_BoxLayout.Designer.cs generated
View File

@ -1,4 +1,4 @@
namespace PKHeX
namespace PKHeX.WinForms
{
partial class SAV_BoxLayout
{

15
PKHeX/Subforms/Save Editors/Gen6/SAV_BoxLayout.cs → PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_BoxLayout.cs
View File

@ -1,15 +1,16 @@
using System;
using System.Linq;
using System.Windows.Forms;
using PKHeX.Core;
namespace PKHeX
namespace PKHeX.WinForms
{
public partial class SAV_BoxLayout : Form
{
public SAV_BoxLayout(int box)
{
InitializeComponent();
Util.TranslateInterface(this, Main.curlanguage);
WinFormsUtil.TranslateInterface(this, Main.curlanguage);
editing = true;
// Repopulate Wallpaper names
@ -20,18 +21,18 @@ public SAV_BoxLayout(int box)
case 3:
if (SAV.GameCube)
goto default;
CB_BG.Items.AddRange(Main.GameStrings.wallpapernames.Take(16).ToArray());
CB_BG.Items.AddRange(GameInfo.Strings.wallpapernames.Take(16).ToArray());
break;
case 4:
case 5:
case 6:
CB_BG.Items.AddRange(Main.GameStrings.wallpapernames);
CB_BG.Items.AddRange(GameInfo.Strings.wallpapernames);
break;
case 7:
CB_BG.Items.AddRange(Main.GameStrings.wallpapernames.Take(16).ToArray());
CB_BG.Items.AddRange(GameInfo.Strings.wallpapernames.Take(16).ToArray());
break;
default:
Util.Error("Box layout is not supported for this game.", "Please close the window.");
WinFormsUtil.Error("Box layout is not supported for this game.", "Please close the window.");
break;
}
@ -165,7 +166,7 @@ private void moveBox(object sender, EventArgs e)
else if (!SAV.SwapBox(index, index + dir)) // valid but locked
{
MoveItem(-dir); // undo
Util.Alert("Locked slots prevent movement of box(es).");
WinFormsUtil.Alert("Locked slots prevent movement of box(es).");
}
else
changeBox(null, null);

0
PKHeX/Subforms/Save Editors/Gen6/SAV_BoxLayout.resx → PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_BoxLayout.resx
View File

4
PKHeX/Subforms/Save Editors/Gen6/SAV_HallOfFame.Designer.cs → PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_HallOfFame.Designer.cs generated
View File

@ -1,4 +1,4 @@
namespace PKHeX
namespace PKHeX.WinForms
{
partial class SAV_HallOfFame
{
@ -333,7 +333,7 @@ private void InitializeComponent()
this.TB_OT.Name = "TB_OT";
this.TB_OT.Size = new System.Drawing.Size(94, 20);
this.TB_OT.TabIndex = 3;
this.TB_OT.Text = "PKHeX";
this.TB_OT.Text = "PKHeX.Core";
this.TB_OT.TextChanged += new System.EventHandler(this.Write_Entry);
//
// TB_SID

33
PKHeX/Subforms/Save Editors/Gen6/SAV_HallOfFame.cs → PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_HallOfFame.cs
View File

@ -3,15 +3,16 @@
using System.Linq;
using System.Text;
using System.Windows.Forms;
using PKHeX.Core;
namespace PKHeX
namespace PKHeX.WinForms
{
public partial class SAV_HallOfFame : Form
{
public SAV_HallOfFame()
{
InitializeComponent();
Util.TranslateInterface(this, Main.curlanguage);
WinFormsUtil.TranslateInterface(this, Main.curlanguage);
Array.Copy(SAV.Data, SAV.HoF, data, 0, data.Length); //Copy HoF section of save into Data
Setup();
@ -44,8 +45,8 @@ public SAV_HallOfFame()
};
LB_DataEntry.SelectedIndex = 0;
NUP_PartyIndex_ValueChanged(null, null);
try { TB_Nickname.Font = PKX.getPKXFont(11); }
catch (Exception e) { Util.Alert("Font loading failed...", e.ToString()); }
try { TB_Nickname.Font = FontUtil.getPKXFont(11); }
catch (Exception e) { WinFormsUtil.Alert("Font loading failed...", e.ToString()); }
editing = true;
}
private bool editing;
@ -154,12 +155,12 @@ private void displayEntry(object sender, EventArgs e)
string genderstr=gendersymbols[gender];
string shinystr = shiny == 1 ? "Yes" : "No";
string[] movelist = Main.GameStrings.movelist;
string[] movelist = GameInfo.Strings.movelist;
s += "Name: " + nickname;
s += " (" + Main.GameStrings.specieslist[species] + " - " + genderstr + ")" + Environment.NewLine;
s += " (" + GameInfo.Strings.specieslist[species] + " - " + genderstr + ")" + Environment.NewLine;
s += "Level: " + level + Environment.NewLine;
s += "Shiny: " + shinystr + Environment.NewLine;
s += "Held Item: " + Main.GameStrings.itemlist[helditem] + Environment.NewLine;
s += "Held Item: " + GameInfo.Strings.itemlist[helditem] + Environment.NewLine;
s += "Move 1: " + movelist[move1] + Environment.NewLine;
s += "Move 2: " + movelist[move2] + Environment.NewLine;
s += "Move 3: " + movelist[move3] + Environment.NewLine;
@ -289,7 +290,7 @@ private void Write_Entry(object sender, EventArgs e)
vnd |= rawvnd & 0x80000000;
Array.Copy(BitConverter.GetBytes(vnd), 0, data, offset + 0x1B0, 4);
bpkx.Image = PKX.getSprite(Util.getIndex(CB_Species), CB_Form.SelectedIndex & 0x1F, PKX.getGender(Label_Gender.Text), Util.getIndex(CB_HeldItem), false, CHK_Shiny.Checked);
bpkx.Image = PKX.getSprite(WinFormsUtil.getIndex(CB_Species), CB_Form.SelectedIndex & 0x1F, PKX.getGender(Label_Gender.Text), WinFormsUtil.getIndex(CB_HeldItem), false, CHK_Shiny.Checked);
displayEntry(null, null); // refresh text view
}
private void Validate_TextBoxes()
@ -304,7 +305,7 @@ private void updateNickname(object sender, EventArgs e)
if (!CHK_Nicknamed.Checked)
{
// Fetch Current Species and set it as Nickname Text
int species = Util.getIndex(CB_Species);
int species = WinFormsUtil.getIndex(CB_Species);
if (species == 0 || species > 721)
TB_Nickname.Text = "";
else try
@ -321,13 +322,13 @@ private void updateNickname(object sender, EventArgs e)
private void setForms()
{
int species = Util.getIndex(CB_Species);
int species = WinFormsUtil.getIndex(CB_Species);
bool hasForms = PersonalTable.AO[species].HasFormes || new[] { 664, 665, 414 }.Contains(species);
CB_Form.Enabled = CB_Form.Visible = hasForms;
CB_Form.DisplayMember = "Text";
CB_Form.ValueMember = "Value";
CB_Form.DataSource = PKX.getFormList(species, Main.GameStrings.types, Main.GameStrings.forms, Main.gendersymbols).ToList();
CB_Form.DataSource = PKX.getFormList(species, GameInfo.Strings.types, GameInfo.Strings.forms, Main.gendersymbols).ToList();
}
private void updateSpecies(object sender, EventArgs e)
{
@ -338,14 +339,14 @@ private void updateShiny(object sender, EventArgs e)
{
if (!editing)
return; //Don't do writing until loaded
bpkx.Image = PKX.getSprite(Util.getIndex(CB_Species), CB_Form.SelectedIndex & 0x1F, PKX.getGender(Label_Gender.Text), Util.getIndex(CB_HeldItem), false, CHK_Shiny.Checked);
bpkx.Image = PKX.getSprite(WinFormsUtil.getIndex(CB_Species), CB_Form.SelectedIndex & 0x1F, PKX.getGender(Label_Gender.Text), WinFormsUtil.getIndex(CB_HeldItem), false, CHK_Shiny.Checked);
Write_Entry(null, null);
}
private void updateGender(object sender, EventArgs e)
{
// Get Gender Threshold
int species = Util.getIndex(CB_Species);
int species = WinFormsUtil.getIndex(CB_Species);
int gt = SAV.Personal[species].Gender;
if (gt == 255)
@ -392,9 +393,9 @@ private void B_CopyText_Click(object sender, EventArgs e)
private void B_Delete_Click(object sender, EventArgs e)
{
if (LB_DataEntry.SelectedIndex < 1) { Util.Alert("Cannot delete your first Hall of Fame Clear entry."); return; }
if (LB_DataEntry.SelectedIndex < 1) { WinFormsUtil.Alert("Cannot delete your first Hall of Fame Clear entry."); return; }
int index = LB_DataEntry.SelectedIndex;
if (Util.Prompt(MessageBoxButtons.YesNo, $"Delete Entry {index} from your records?")
if (WinFormsUtil.Prompt(MessageBoxButtons.YesNo, $"Delete Entry {index} from your records?")
!= DialogResult.Yes) return;
int offset = index * 0x1B4;
@ -412,7 +413,7 @@ private void changeNickname(object sender, MouseEventArgs e)
return;
if (Application.OpenForms.Cast<Form>().Any(form => form.Name == typeof(f2_Text).Name))
{ Util.Alert("Window is already open."); return; }
{ WinFormsUtil.Alert("Window is already open."); return; }
new f2_Text(tb).Show();
}
}

0
PKHeX/Subforms/Save Editors/Gen6/SAV_HallOfFame.resx → PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_HallOfFame.resx
View File

2
PKHeX/Subforms/Save Editors/Gen6/SAV_Link6.Designer.cs → PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_Link6.Designer.cs generated
View File

@ -1,4 +1,4 @@
namespace PKHeX
namespace PKHeX.WinForms
{
partial class SAV_Link6
{

23
PKHeX/Subforms/Save Editors/Gen6/SAV_Link6.cs → PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_Link6.cs
View File

@ -2,8 +2,9 @@
using System.IO;
using System.Linq;
using System.Windows.Forms;
using PKHeX.Core;
namespace PKHeX
namespace PKHeX.WinForms
{
public partial class SAV_Link6 : Form
{
@ -16,11 +17,11 @@ public SAV_Link6()
cb.ValueMember = "Value";
cb.DataSource = new BindingSource(GameInfo.ItemDataSource.Where(item => item.Value <= SAV.MaxItemID).ToArray(), null);
}
Util.TranslateInterface(this, Main.curlanguage);
WinFormsUtil.TranslateInterface(this, Main.curlanguage);
byte[] data = SAV.LinkBlock;
if (data == null)
{
Util.Alert("Invalid save file / Link Information");
WinFormsUtil.Alert("Invalid save file / Link Information");
Close();
}
data = data.Skip(0x1FF).Take(PL6.Size).ToArray();
@ -54,7 +55,7 @@ private void B_Import_Click(object sender, EventArgs e)
return;
if (new FileInfo(ofd.FileName).Length != PL6.Size)
{ Util.Alert("Invalid file length"); return; }
{ WinFormsUtil.Alert("Invalid file length"); return; }
byte[] data = File.ReadAllBytes(ofd.FileName);
@ -71,7 +72,7 @@ private void B_Export_Click(object sender, EventArgs e)
return;
File.WriteAllBytes(sfd.FileName, LinkInfo.Data);
Util.Alert("Pokémon Link data saved to:\r" + sfd.FileName + ".");
WinFormsUtil.Alert("Pokémon Link data saved to:\r" + sfd.FileName + ".");
}
private void loadLinkData(byte[] data)
@ -99,12 +100,12 @@ private void loadLinkData(byte[] data)
NUD_Item6.Value = LinkInfo.Quantity_6;
// Pokemon slots
TB_PKM1.Text = Main.GameStrings.specieslist[LinkInfo.Pokes[0].Species];
TB_PKM2.Text = Main.GameStrings.specieslist[LinkInfo.Pokes[1].Species];
TB_PKM3.Text = Main.GameStrings.specieslist[LinkInfo.Pokes[2].Species];
TB_PKM4.Text = Main.GameStrings.specieslist[LinkInfo.Pokes[3].Species];
TB_PKM5.Text = Main.GameStrings.specieslist[LinkInfo.Pokes[4].Species];
TB_PKM6.Text = Main.GameStrings.specieslist[LinkInfo.Pokes[5].Species];
TB_PKM1.Text = GameInfo.Strings.specieslist[LinkInfo.Pokes[0].Species];
TB_PKM2.Text = GameInfo.Strings.specieslist[LinkInfo.Pokes[1].Species];
TB_PKM3.Text = GameInfo.Strings.specieslist[LinkInfo.Pokes[2].Species];
TB_PKM4.Text = GameInfo.Strings.specieslist[LinkInfo.Pokes[3].Species];
TB_PKM5.Text = GameInfo.Strings.specieslist[LinkInfo.Pokes[4].Species];
TB_PKM6.Text = GameInfo.Strings.specieslist[LinkInfo.Pokes[5].Species];
}
}
}

0
PKHeX/Subforms/Save Editors/Gen6/SAV_Link6.resx → PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_Link6.resx
View File

2
PKHeX/Subforms/Save Editors/Gen6/SAV_OPower.Designer.cs → PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_OPower.Designer.cs generated
View File

@ -1,4 +1,4 @@
namespace PKHeX
namespace PKHeX.WinForms
{
partial class SAV_OPower
{

5
PKHeX/Subforms/Save Editors/Gen6/SAV_OPower.cs → PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_OPower.cs
View File

@ -1,15 +1,16 @@
using System;
using System.Linq;
using System.Windows.Forms;
using PKHeX.Core;
namespace PKHeX
namespace PKHeX.WinForms
{
public partial class SAV_OPower : Form
{
public SAV_OPower()
{
InitializeComponent();
Util.TranslateInterface(this, Main.curlanguage);
WinFormsUtil.TranslateInterface(this, Main.curlanguage);
LoadData();
}

0
PKHeX/Subforms/Save Editors/Gen6/SAV_OPower.resx → PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_OPower.resx
View File

2
PKHeX/Subforms/Save Editors/Gen6/SAV_PokeBlockORAS.Designer.cs → PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_PokeBlockORAS.Designer.cs generated
View File

@ -1,4 +1,4 @@
namespace PKHeX
namespace PKHeX.WinForms
{
partial class SAV_PokeBlockORAS
{

9
PKHeX/Subforms/Save Editors/Gen6/SAV_PokeBlockORAS.cs → PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_PokeBlockORAS.cs
View File

@ -1,20 +1,21 @@
using System;
using System.Windows.Forms;
using PKHeX.Core;
namespace PKHeX
namespace PKHeX.WinForms
{
public partial class SAV_PokeBlockORAS : Form
{
public SAV_PokeBlockORAS()
{
InitializeComponent();
Util.TranslateInterface(this, Main.curlanguage);
WinFormsUtil.TranslateInterface(this, Main.curlanguage);
nup_spec = new[] { NUP_Red, NUP_Blue, NUP_Pink, NUP_Green, NUP_Yellow, NUP_Rainbow, NUP_RedPlus, NUP_BluePlus, NUP_PinkPlus, NUP_GreenPlus, NUP_YellowPlus, NUP_RainbowPlus };
Label[] lbl_spec = { L_Red, L_Blue, L_Pink, L_Green, L_Yellow, L_Rainbow, L_RedPlus, L_BluePlus, L_PinkPlus, L_GreenPlus, L_YellowPlus, L_RainbowPlus };
for (int i = 0; i < lbl_spec.Length; i++)
{
lbl_spec[i].Text = $"{Main.GameStrings.pokeblocks[94 + i]}:";
lbl_spec[i].Text = $"{GameInfo.Strings.pokeblocks[94 + i]}:";
nup_spec[i].Value = BitConverter.ToUInt32(SAV.Data, SAV.Contest + i * 4);
}
}
@ -35,7 +36,7 @@ private void B_Save_Click(object sender, EventArgs e)
private void B_RandomizeBerries_Click(object sender, EventArgs e)
{
if (DialogResult.Yes != Util.Prompt(MessageBoxButtons.YesNo, "Repopulate all berry plots with random berries?"))
if (DialogResult.Yes != WinFormsUtil.Prompt(MessageBoxButtons.YesNo, "Repopulate all berry plots with random berries?"))
return;
// Randomize the trees.

0
PKHeX/Subforms/Save Editors/Gen6/SAV_PokeBlockORAS.resx → PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_PokeBlockORAS.resx
View File

2
PKHeX/Subforms/Save Editors/Gen6/SAV_PokedexORAS.Designer.cs → PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_PokedexORAS.Designer.cs generated
View File

@ -1,4 +1,4 @@
namespace PKHeX
namespace PKHeX.WinForms
{
partial class SAV_PokedexORAS
{

9
PKHeX/Subforms/Save Editors/Gen6/SAV_PokedexORAS.cs → PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_PokedexORAS.cs
View File

@ -3,8 +3,9 @@
using System.Drawing;
using System.Linq;
using System.Windows.Forms;
using PKHeX.Core;
namespace PKHeX
namespace PKHeX.WinForms
{
public partial class SAV_PokedexORAS : Form
{
@ -13,7 +14,7 @@ public SAV_PokedexORAS()
InitializeComponent();
CP = new[] { CHK_P1, CHK_P2, CHK_P3, CHK_P4, CHK_P5, CHK_P6, CHK_P7, CHK_P8, CHK_P9, };
CL = new[] { CHK_L1, CHK_L2, CHK_L3, CHK_L4, CHK_L5, CHK_L6, CHK_L7, };
Util.TranslateInterface(this, Main.curlanguage);
WinFormsUtil.TranslateInterface(this, Main.curlanguage);
editing = true;
// Clear Listbox and ComboBox
@ -26,7 +27,7 @@ public SAV_PokedexORAS()
CB_Species.DataSource = new BindingSource(GameInfo.SpeciesDataSource.Skip(1).Where(id => id.Value <= SAV.MaxSpeciesID).ToList(), null);
for (int i = 1; i < SAV.MaxSpeciesID + 1; i++)
LB_Species.Items.Add(i.ToString("000") + " - " + Main.GameStrings.specieslist[i]);
LB_Species.Items.Add(i.ToString("000") + " - " + GameInfo.Strings.specieslist[i]);
getData();
editing = false;
@ -131,7 +132,7 @@ private void getEntry()
int f = SaveUtil.getDexFormIndexORAS(species, fc);
if (f < 0)
return;
string[] forms = PKX.getFormList(species, Main.GameStrings.types, Main.GameStrings.forms, Main.gendersymbols);
string[] forms = PKX.getFormList(species, GameInfo.Strings.types, GameInfo.Strings.forms, Main.gendersymbols);
if (forms.Length < 1)
return;

0
PKHeX/Subforms/Save Editors/Gen6/SAV_PokedexORAS.resx → PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_PokedexORAS.resx
View File

2
PKHeX/Subforms/Save Editors/Gen6/SAV_PokedexXY.Designer.cs → PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_PokedexXY.Designer.cs generated
View File

@ -1,4 +1,4 @@
namespace PKHeX
namespace PKHeX.WinForms
{
partial class SAV_PokedexXY
{

9
PKHeX/Subforms/Save Editors/Gen6/SAV_PokedexXY.cs → PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_PokedexXY.cs
View File

@ -3,8 +3,9 @@
using System.Drawing;
using System.Linq;
using System.Windows.Forms;
using PKHeX.Core;
namespace PKHeX
namespace PKHeX.WinForms
{
public partial class SAV_PokedexXY : Form
{
@ -13,7 +14,7 @@ public SAV_PokedexXY()
InitializeComponent();
CP = new[] { CHK_P1, CHK_P2, CHK_P3, CHK_P4, CHK_P5, CHK_P6, CHK_P7, CHK_P8, CHK_P9, };
CL = new[] { CHK_L1, CHK_L2, CHK_L3, CHK_L4, CHK_L5, CHK_L6, CHK_L7, };
Util.TranslateInterface(this, Main.curlanguage);
WinFormsUtil.TranslateInterface(this, Main.curlanguage);
editing = true;
// Clear Listbox and ComboBox
@ -26,7 +27,7 @@ public SAV_PokedexXY()
CB_Species.DataSource = new BindingSource(GameInfo.SpeciesDataSource.Skip(1).Where(id => id.Value <= SAV.MaxSpeciesID).ToList(), null);
for (int i = 1; i < SAV.MaxSpeciesID + 1; i++)
LB_Species.Items.Add(i.ToString("000") + " - " + Main.GameStrings.specieslist[i]);
LB_Species.Items.Add(i.ToString("000") + " - " + GameInfo.Strings.specieslist[i]);
getData();
editing = false;
@ -132,7 +133,7 @@ private void getEntry()
int f = SaveUtil.getDexFormIndexXY(species, fc);
if (f < 0)
return;
string[] forms = PKX.getFormList(species, Main.GameStrings.types, Main.GameStrings.forms, Main.gendersymbols);
string[] forms = PKX.getFormList(species, GameInfo.Strings.types, GameInfo.Strings.forms, Main.gendersymbols);
if (forms.Length < 1)
return;

0
PKHeX/Subforms/Save Editors/Gen6/SAV_PokedexXY.resx → PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_PokedexXY.resx
View File

2
PKHeX/Subforms/Save Editors/Gen6/SAV_Pokepuff.Designer.cs → PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_Pokepuff.Designer.cs generated
View File

@ -1,4 +1,4 @@
namespace PKHeX
namespace PKHeX.WinForms
{
partial class SAV_Pokepuff
{

9
PKHeX/Subforms/Save Editors/Gen6/SAV_Pokepuff.cs → PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_Pokepuff.cs
View File

@ -1,16 +1,17 @@
using System;
using System.Windows.Forms;
using PKHeX.Core;
namespace PKHeX
namespace PKHeX.WinForms
{
public partial class SAV_Pokepuff : Form
{
public SAV_Pokepuff()
{
InitializeComponent();
Util.TranslateInterface(this, Main.curlanguage);
WinFormsUtil.TranslateInterface(this, Main.curlanguage);
pfa = Main.GameStrings.puffs;
pfa = GameInfo.Strings.puffs;
pfa[0] = "---";
Setup();
@ -56,7 +57,7 @@ private void Setup()
int puffval = Puffs[i];
if (puffval >= pfa.Length)
{
Util.Error($"Invalid Puff Index: {i}", $"Expected < ${pfa.Length}");
WinFormsUtil.Error($"Invalid Puff Index: {i}", $"Expected < ${pfa.Length}");
puffval = 0;
}
dgv.Rows[i].Cells[1].Value = pfa[puffval];

0
PKHeX/Subforms/Save Editors/Gen6/SAV_Pokepuff.resx → PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_Pokepuff.resx
View File

2
PKHeX/Subforms/Save Editors/Gen6/SAV_SecretBase.Designer.cs → PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_SecretBase.Designer.cs generated
View File

@ -1,4 +1,4 @@
namespace PKHeX
namespace PKHeX.WinForms
{
partial class SAV_SecretBase
{

43
PKHeX/Subforms/Save Editors/Gen6/SAV_SecretBase.cs → PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_SecretBase.cs
View File

@ -3,16 +3,17 @@
using System.Linq;
using System.Text;
using System.Windows.Forms;
using PKHeX.Core;
namespace PKHeX
namespace PKHeX.WinForms
{
public partial class SAV_SecretBase : Form
{
public SAV_SecretBase()
{
InitializeComponent();
Util.TranslateInterface(this, Main.curlanguage);
abilitylist = Main.GameStrings.abilitylist;
WinFormsUtil.TranslateInterface(this, Main.curlanguage);
abilitylist = GameInfo.Strings.abilitylist;
setupComboBoxes();
popFavorite();
@ -124,11 +125,11 @@ private void B_FAV2SAV(object sender, EventArgs e)
// Write data back to save
int index = LB_Favorite.SelectedIndex; // store for restoring
if (!GB_PKM.Enabled && index > 0)
{ Util.Error("Sorry, no overwriting someone else's base with your own data."); return; }
{ WinFormsUtil.Error("Sorry, no overwriting someone else's base with your own data."); return; }
if (GB_PKM.Enabled && index == 0)
{ Util.Error("Sorry, no overwriting of your own base with someone else's."); return; }
{ WinFormsUtil.Error("Sorry, no overwriting of your own base with someone else's."); return; }
if (LB_Favorite.Items[index].ToString().Substring(LB_Favorite.Items[index].ToString().Length - 5, 5) == "Empty")
{ Util.Error("Sorry, no overwriting an empty base with someone else's."); return; }
{ WinFormsUtil.Error("Sorry, no overwriting an empty base with someone else's."); return; }
if (index < 0) return;
int offset = SAV.SecretBase + 0x25A;
@ -266,11 +267,11 @@ private void saveFavPKM()
byte[] pkm = new byte[0x34];
BitConverter.GetBytes(Util.getHEXval(TB_EC.Text)).CopyTo(pkm, 0);
BitConverter.GetBytes((ushort)Util.getIndex(CB_Species)).CopyTo(pkm, 8);
BitConverter.GetBytes((ushort)Util.getIndex(CB_HeldItem)).CopyTo(pkm, 0xA);
BitConverter.GetBytes((ushort)WinFormsUtil.getIndex(CB_Species)).CopyTo(pkm, 8);
BitConverter.GetBytes((ushort)WinFormsUtil.getIndex(CB_HeldItem)).CopyTo(pkm, 0xA);
pkm[0xC] = (byte)Array.IndexOf(abilitylist, CB_Ability.Text.Remove(CB_Ability.Text.Length - 4));
pkm[0xD] = (byte)(CB_Ability.SelectedIndex << 1);
pkm[0x14] = (byte)Util.getIndex(CB_Nature);
pkm[0x14] = (byte)WinFormsUtil.getIndex(CB_Nature);
int fegform = 0;
fegform += PKX.getGender(Label_Gender.Text) << 1;
@ -284,10 +285,10 @@ private void saveFavPKM()
pkm[0x1A] = (byte)Math.Min(Convert.ToInt32(TB_SPDEV.Text), 252);
pkm[0x1B] = (byte)Math.Min(Convert.ToInt32(TB_SPEEV.Text), 252);
BitConverter.GetBytes((ushort)Util.getIndex(CB_Move1)).CopyTo(pkm, 0x1C);
BitConverter.GetBytes((ushort)Util.getIndex(CB_Move2)).CopyTo(pkm, 0x1E);
BitConverter.GetBytes((ushort)Util.getIndex(CB_Move3)).CopyTo(pkm, 0x20);
BitConverter.GetBytes((ushort)Util.getIndex(CB_Move4)).CopyTo(pkm, 0x22);
BitConverter.GetBytes((ushort)WinFormsUtil.getIndex(CB_Move1)).CopyTo(pkm, 0x1C);
BitConverter.GetBytes((ushort)WinFormsUtil.getIndex(CB_Move2)).CopyTo(pkm, 0x1E);
BitConverter.GetBytes((ushort)WinFormsUtil.getIndex(CB_Move3)).CopyTo(pkm, 0x20);
BitConverter.GetBytes((ushort)WinFormsUtil.getIndex(CB_Move4)).CopyTo(pkm, 0x22);
pkm[0x24] = (byte)CB_PPu1.SelectedIndex;
pkm[0x25] = (byte)CB_PPu2.SelectedIndex;
@ -304,7 +305,7 @@ private void saveFavPKM()
pkm[0x2D] |= (byte)shiny;
pkm[0x2E] = Convert.ToByte(TB_Friendship.Text);
pkm[0x2F] = (byte)Util.getIndex(CB_Ball);
pkm[0x2F] = (byte)WinFormsUtil.getIndex(CB_Ball);
pkm[0x30] = Convert.ToByte(TB_Level.Text);
for (int i = 0; i < 0x34; i++) // Copy data back to storage.
@ -410,7 +411,7 @@ private void loadFavPKM()
private void setAbilityList()
{
int newabil = Convert.ToInt16(MT_AbilNo.Text) >> 1;
int species = Util.getIndex(CB_Species);
int species = WinFormsUtil.getIndex(CB_Species);
int formnum = CB_Form.SelectedIndex;
int[] abils = PersonalTable.AO.getAbilities(species, formnum);
@ -428,13 +429,13 @@ private void setAbilityList()
private void setForms()
{
int species = Util.getIndex(CB_Species);
int species = WinFormsUtil.getIndex(CB_Species);
bool hasForms = PersonalTable.AO[species].HasFormes || new[] { 664, 665, 414 }.Contains(species);
CB_Form.Enabled = CB_Form.Visible = hasForms;
CB_Form.DisplayMember = "Text";
CB_Form.ValueMember = "Value";
CB_Form.DataSource = PKX.getFormList(species, Main.GameStrings.types, Main.GameStrings.forms, Main.gendersymbols).ToList();
CB_Form.DataSource = PKX.getFormList(species, GameInfo.Strings.types, GameInfo.Strings.forms, Main.gendersymbols).ToList();
}
private void updateSpecies(object sender, EventArgs e)
@ -444,7 +445,7 @@ private void updateSpecies(object sender, EventArgs e)
// Check for Gender Changes
// Get Gender Threshold
int gt = SAV.Personal[Util.getIndex(CB_Species)].Gender;
int gt = SAV.Personal[WinFormsUtil.getIndex(CB_Species)].Gender;
if (gt == 255) // Genderless
genderflag = 2;
@ -469,7 +470,7 @@ private void updateForm(object sender, EventArgs e)
private void Label_Gender_Click(object sender, EventArgs e)
{
// Get Gender Threshold
int gt = SAV.Personal[Util.getIndex(CB_Species)].Gender;
int gt = SAV.Personal[WinFormsUtil.getIndex(CB_Species)].Gender;
if (gt == 255 || gt == 0 || gt == 254) // Single gender/genderless
return;
@ -484,7 +485,7 @@ private void setGenderLabel()
private void B_FDelete_Click(object sender, EventArgs e)
{
if (LB_Favorite.SelectedIndex < 1) { Util.Alert("Cannot delete your Secret Base."); return; }
if (LB_Favorite.SelectedIndex < 1) { WinFormsUtil.Alert("Cannot delete your Secret Base."); return; }
int index = LB_Favorite.SelectedIndex - 1;
int favoff = SAV.SecretBase + 0x63A;
@ -492,7 +493,7 @@ private void B_FDelete_Click(object sender, EventArgs e)
if (string.IsNullOrEmpty(BaseTrainer))
BaseTrainer = "Empty";
if (DialogResult.Yes != Util.Prompt(MessageBoxButtons.YesNo, $"Delete {BaseTrainer}'s base (Entry {index}) from your records?"))
if (DialogResult.Yes != WinFormsUtil.Prompt(MessageBoxButtons.YesNo, $"Delete {BaseTrainer}'s base (Entry {index}) from your records?"))
return;
const int max = 29;

0
PKHeX/Subforms/Save Editors/Gen6/SAV_SecretBase.resx → PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_SecretBase.resx
View File

2
PKHeX/Subforms/Save Editors/Gen6/SAV_SuperTrain.Designer.cs → PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_SuperTrain.Designer.cs generated
View File

@ -1,4 +1,4 @@
namespace PKHeX
namespace PKHeX.WinForms
{
partial class SAV_SuperTrain
{

13
PKHeX/Subforms/Save Editors/Gen6/SAV_SuperTrain.cs → PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_SuperTrain.cs
View File

@ -1,21 +1,22 @@
using System;
using System.Linq;
using System.Windows.Forms;
using PKHeX.Core;
namespace PKHeX
namespace PKHeX.WinForms
{
public partial class SAV_SuperTrain : Form
{
public SAV_SuperTrain()
{
trba = Main.GameStrings.trainingbags;
trba = GameInfo.Strings.trainingbags;
trba[0] = "---";
offsetTime = SAV.SuperTrain + 0x08;
offsetSpec = SAV.SuperTrain + 0x188;
offsetVal = SAV.SuperTrain + 0x18A;
InitializeComponent();
Util.TranslateInterface(this, Main.curlanguage);
string[] stages = Main.GameStrings.trainingstage;
WinFormsUtil.TranslateInterface(this, Main.curlanguage);
string[] stages = GameInfo.Strings.trainingstage;
listBox1.Items.Clear();
for (int i = 0; i < 30; i++)
listBox1.Items.Add((i + 1).ToString("00") + " - " + stages[i + 2]);
@ -117,7 +118,7 @@ private void B_Save_Click(object sender, EventArgs e)
}
try { BitConverter.GetBytes(float.Parse(TB_Time1.Text)).CopyTo(SAV.Data, offsetTime + 4 * 30); } catch { }
try { BitConverter.GetBytes(float.Parse(TB_Time2.Text)).CopyTo(SAV.Data, offsetTime + 4 * 31); } catch { }
BitConverter.GetBytes((ushort)Util.getIndex(CB_S2)).CopyTo(SAV.Data, offsetSpec + 4 * 30);
BitConverter.GetBytes((ushort)WinFormsUtil.getIndex(CB_S2)).CopyTo(SAV.Data, offsetSpec + 4 * 30);
bagarray.CopyTo(SAV.Data, SAV.SuperTrain + 0x308);
Array.Copy(SAV.Data, Main.SAV.Data, Main.SAV.Data.Length);
Main.SAV.Edited = true;
@ -131,7 +132,7 @@ private void changeRecordSpecies(object sender, EventArgs e)
{
int index = listBox1.SelectedIndex;
if (index < 0) return;
BitConverter.GetBytes(Util.getIndex(CB_Species)).CopyTo(SAV.Data, offsetSpec + 4 * index);
BitConverter.GetBytes(WinFormsUtil.getIndex(CB_Species)).CopyTo(SAV.Data, offsetSpec + 4 * index);
}
private void changeRecordVal(object sender, EventArgs e)
{

0
PKHeX/Subforms/Save Editors/Gen6/SAV_SuperTrain.resx → PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_SuperTrain.resx
View File

18
PKHeX/Subforms/Save Editors/Gen6/SAV_Trainer.Designer.cs → PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_Trainer.Designer.cs generated
View File

@ -1,4 +1,4 @@
namespace PKHeX
namespace PKHeX.WinForms
{
partial class SAV_Trainer
{
@ -416,7 +416,7 @@ private void InitializeComponent()
//
// PB_Badge8
//
this.PB_Badge8.Image = global::PKHeX.Properties.Resources.badge_8;
this.PB_Badge8.Image = Core.Properties.Resources.badge_8;
this.PB_Badge8.Location = new System.Drawing.Point(248, 63);
this.PB_Badge8.Name = "PB_Badge8";
this.PB_Badge8.Size = new System.Drawing.Size(50, 50);
@ -427,7 +427,7 @@ private void InitializeComponent()
//
// PB_Badge6
//
this.PB_Badge6.Image = global::PKHeX.Properties.Resources.badge_6;
this.PB_Badge6.Image = Core.Properties.Resources.badge_6;
this.PB_Badge6.Location = new System.Drawing.Point(142, 63);
this.PB_Badge6.Name = "PB_Badge6";
this.PB_Badge6.Size = new System.Drawing.Size(50, 50);
@ -438,7 +438,7 @@ private void InitializeComponent()
//
// PB_Badge4
//
this.PB_Badge4.Image = global::PKHeX.Properties.Resources.badge_4;
this.PB_Badge4.Image = Core.Properties.Resources.badge_4;
this.PB_Badge4.Location = new System.Drawing.Point(248, 10);
this.PB_Badge4.Name = "PB_Badge4";
this.PB_Badge4.Size = new System.Drawing.Size(50, 50);
@ -449,7 +449,7 @@ private void InitializeComponent()
//
// PB_Badge2
//
this.PB_Badge2.Image = global::PKHeX.Properties.Resources.badge_2;
this.PB_Badge2.Image = Core.Properties.Resources.badge_2;
this.PB_Badge2.Location = new System.Drawing.Point(142, 10);
this.PB_Badge2.Name = "PB_Badge2";
this.PB_Badge2.Size = new System.Drawing.Size(50, 50);
@ -460,7 +460,7 @@ private void InitializeComponent()
//
// PB_Badge7
//
this.PB_Badge7.Image = global::PKHeX.Properties.Resources.badge_7;
this.PB_Badge7.Image = Core.Properties.Resources.badge_7;
this.PB_Badge7.Location = new System.Drawing.Point(195, 63);
this.PB_Badge7.Name = "PB_Badge7";
this.PB_Badge7.Size = new System.Drawing.Size(50, 50);
@ -471,7 +471,7 @@ private void InitializeComponent()
//
// PB_Badge5
//
this.PB_Badge5.Image = global::PKHeX.Properties.Resources.badge_5;
this.PB_Badge5.Image = Core.Properties.Resources.badge_5;
this.PB_Badge5.Location = new System.Drawing.Point(89, 63);
this.PB_Badge5.Name = "PB_Badge5";
this.PB_Badge5.Size = new System.Drawing.Size(50, 50);
@ -482,7 +482,7 @@ private void InitializeComponent()
//
// PB_Badge3
//
this.PB_Badge3.Image = global::PKHeX.Properties.Resources.badge_3;
this.PB_Badge3.Image = Core.Properties.Resources.badge_3;
this.PB_Badge3.Location = new System.Drawing.Point(195, 10);
this.PB_Badge3.Name = "PB_Badge3";
this.PB_Badge3.Size = new System.Drawing.Size(50, 50);
@ -493,7 +493,7 @@ private void InitializeComponent()
//
// PB_Badge1
//
this.PB_Badge1.Image = global::PKHeX.Properties.Resources.badge_1;
this.PB_Badge1.Image = Core.Properties.Resources.badge_1;
this.PB_Badge1.Location = new System.Drawing.Point(89, 10);
this.PB_Badge1.Name = "PB_Badge1";
this.PB_Badge1.Size = new System.Drawing.Size(50, 50);

61
PKHeX/Subforms/Save Editors/Gen6/SAV_Trainer.cs → PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_Trainer.cs
View File

@ -2,8 +2,9 @@
using System.Drawing;
using System.Linq;
using System.Windows.Forms;
using PKHeX.Core;
namespace PKHeX
namespace PKHeX.WinForms
{
public partial class SAV_Trainer : Form
{
@ -12,10 +13,10 @@ public SAV_Trainer()
{
InitializeComponent();
if (Main.unicode)
try { TB_OTName.Font = PKX.getPKXFont(11); }
catch (Exception e) { Util.Alert("Font loading failed...", e.ToString()); }
try { TB_OTName.Font = FontUtil.getPKXFont(11); }
catch (Exception e) { WinFormsUtil.Alert("Font loading failed...", e.ToString()); }
Util.TranslateInterface(this, Main.curlanguage);
WinFormsUtil.TranslateInterface(this, Main.curlanguage);
B_MaxCash.Click += (sender, e) => MT_Money.Text = "9,999,999";
CB_Gender.Items.Clear();
@ -329,34 +330,34 @@ private void getComboBoxes()
CB_MultiplayerSprite.ValueMember = "Value";
CB_MultiplayerSprite.DataSource = oras_sprite_list;
L_Vivillon.Text = Main.GameStrings.specieslist[666] + ":";
L_Vivillon.Text = GameInfo.Strings.specieslist[666] + ":";
CB_Vivillon.DisplayMember = "Text";
CB_Vivillon.ValueMember = "Value";
CB_Vivillon.DataSource = PKX.getFormList(666, Main.GameStrings.types, Main.GameStrings.forms, Main.gendersymbols).ToList();
CB_Vivillon.DataSource = PKX.getFormList(666, GameInfo.Strings.types, GameInfo.Strings.forms, Main.gendersymbols).ToList();
}
private void getBadges()
{
// Fetch Badges
Bitmap[] bma = Main.SAV.ORAS ?
new[] {
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,
Core.Properties.Resources.badge_01, // ORAS Badges
Core.Properties.Resources.badge_02,
Core.Properties.Resources.badge_03,
Core.Properties.Resources.badge_04,
Core.Properties.Resources.badge_05,
Core.Properties.Resources.badge_06,
Core.Properties.Resources.badge_07,
Core.Properties.Resources.badge_08,
} :
new [] {
Properties.Resources.badge_1, // XY Badges
Properties.Resources.badge_2,
Properties.Resources.badge_3,
Properties.Resources.badge_4,
Properties.Resources.badge_5,
Properties.Resources.badge_6,
Properties.Resources.badge_7,
Properties.Resources.badge_8,
Core.Properties.Resources.badge_1, // XY Badges
Core.Properties.Resources.badge_2,
Core.Properties.Resources.badge_3,
Core.Properties.Resources.badge_4,
Core.Properties.Resources.badge_5,
Core.Properties.Resources.badge_6,
Core.Properties.Resources.badge_7,
Core.Properties.Resources.badge_8,
};
for (int i = 0; i < 8; i++)
@ -422,7 +423,7 @@ private void getTextBoxes()
// Load PSS Sprite
CB_MultiplayerSprite.SelectedValue = SAV.Sprite;
PB_Sprite.Image = (Image)Properties.Resources.ResourceManager.GetObject("tr_" + SAV.Sprite.ToString("00"));
PB_Sprite.Image = (Image)Core.Properties.Resources.ResourceManager.GetObject("tr_" + SAV.Sprite.ToString("00"));
if (SAV.XY)
{
@ -472,10 +473,10 @@ private void save()
SAV.TID = (ushort)Util.ToUInt32(MT_TID.Text);
SAV.SID = (ushort)Util.ToUInt32(MT_SID.Text);
SAV.Money = Util.ToUInt32(MT_Money.Text);
SAV.SubRegion = Util.getIndex(CB_Region);
SAV.Country = Util.getIndex(CB_Country);
SAV.ConsoleRegion = Util.getIndex(CB_3DSReg);
SAV.Language = Util.getIndex(CB_Language);
SAV.SubRegion = WinFormsUtil.getIndex(CB_Region);
SAV.Country = WinFormsUtil.getIndex(CB_Country);
SAV.ConsoleRegion = WinFormsUtil.getIndex(CB_3DSReg);
SAV.Language = WinFormsUtil.getIndex(CB_Language);
SAV.OT = TB_OTName.Text;
@ -646,8 +647,8 @@ private void giveAllAccessories(object sender, EventArgs e)
private void updateCountry(object sender, EventArgs e)
{
if (Util.getIndex(sender as ComboBox) > 0)
Main.setCountrySubRegion(CB_Region, "sr_" + Util.getIndex(sender as ComboBox).ToString("000"));
if (WinFormsUtil.getIndex(sender as ComboBox) > 0)
Main.setCountrySubRegion(CB_Region, "sr_" + WinFormsUtil.getIndex(sender as ComboBox).ToString("000"));
}
private void toggleBadge(object sender, EventArgs e)
{
@ -656,7 +657,7 @@ private void toggleBadge(object sender, EventArgs e)
private void CB_Multi_SelectedIndexChanged(object sender, EventArgs e)
{
PB_Sprite.Image = (Image)Properties.Resources.ResourceManager.GetObject(Main.SAV.ORAS || Main.SAV.ORASDEMO ? "tr_" + Util.getIndex(CB_MultiplayerSprite).ToString("00") : "tr_00");
PB_Sprite.Image = (Image)Core.Properties.Resources.ResourceManager.GetObject(Main.SAV.ORAS || Main.SAV.ORASDEMO ? "tr_" + WinFormsUtil.getIndex(CB_MultiplayerSprite).ToString("00") : "tr_00");
}
}
}

0
PKHeX/Subforms/Save Editors/Gen6/SAV_Trainer.resx → PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_Trainer.resx
View File

2
PKHeX/Subforms/Save Editors/Gen7/SAV_Pokebean.Designer.cs → PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_Pokebean.Designer.cs generated
View File

@ -1,4 +1,4 @@
namespace PKHeX
namespace PKHeX.WinForms
{
partial class SAV_Pokebean
{

5
PKHeX/Subforms/Save Editors/Gen7/SAV_Pokebean.cs → PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_Pokebean.cs
View File

@ -1,15 +1,16 @@
using System;
using System.Collections.Generic;
using System.Windows.Forms;
using PKHeX.Core;
namespace PKHeX
namespace PKHeX.WinForms
{
public partial class SAV_Pokebean : Form
{
public SAV_Pokebean()
{
InitializeComponent();
Util.TranslateInterface(this, Main.curlanguage);
WinFormsUtil.TranslateInterface(this, Main.curlanguage);
var colors = new[] {"Red", "Blue", "Light Blue", "Green", "Yellow", "Purple", "Orange"};
var beans = new List<string>();

Some files were not shown because too many files have changed in this diff Show More