diff --git a/PKX/f1-Main.Designer.cs b/PKX/f1-Main.Designer.cs
index a060c9452..d87c1b605 100644
--- a/PKX/f1-Main.Designer.cs
+++ b/PKX/f1-Main.Designer.cs
@@ -675,6 +675,7 @@
//
this.CB_SubRegion.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
this.CB_SubRegion.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems;
+ this.CB_SubRegion.DropDownWidth = 180;
this.CB_SubRegion.FormattingEnabled = true;
this.CB_SubRegion.Location = new System.Drawing.Point(105, 256);
this.CB_SubRegion.Name = "CB_SubRegion";
@@ -688,7 +689,7 @@
//
this.CB_Country.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
this.CB_Country.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems;
- this.CB_Country.DropDownWidth = 170;
+ this.CB_Country.DropDownWidth = 180;
this.CB_Country.FormattingEnabled = true;
this.CB_Country.Location = new System.Drawing.Point(105, 236);
this.CB_Country.Name = "CB_Country";
@@ -2566,10 +2567,6 @@
// menuStrip1
//
this.menuStrip1.BackColor = System.Drawing.SystemColors.Control;
- this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.Menu_File,
- this.Menu_Tools,
- this.Menu_Options});
this.menuStrip1.Location = new System.Drawing.Point(0, 0);
this.menuStrip1.Name = "menuStrip1";
this.menuStrip1.Size = new System.Drawing.Size(614, 24);
diff --git a/PKX/f1-Main.resx b/PKX/f1-Main.resx
index 3e932927d..ed9546861 100644
--- a/PKX/f1-Main.resx
+++ b/PKX/f1-Main.resx
@@ -243,6 +243,279 @@
True
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
True
@@ -399,6 +672,60 @@
True
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
True
@@ -477,9 +804,51 @@
True
+
+ True
+
+
+ True
+
+
+ True
+
True
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
True
@@ -528,9 +897,75 @@
True
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
True
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
True
@@ -570,12 +1005,18 @@
True
+
+ True
+
True
True
+
+ True
+
True
@@ -585,12 +1026,39 @@
True
+
+ True
+
True
True
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
True
diff --git a/PKX/f3-MemoryAmie.Designer.cs b/PKX/f3-MemoryAmie.Designer.cs
index 8a0ab4b4c..690c38f4a 100644
--- a/PKX/f3-MemoryAmie.Designer.cs
+++ b/PKX/f3-MemoryAmie.Designer.cs
@@ -390,6 +390,7 @@
//
// CB_Country4
//
+ this.CB_Country4.DropDownWidth = 180;
this.CB_Country4.FormattingEnabled = true;
this.CB_Country4.Location = new System.Drawing.Point(82, 158);
this.CB_Country4.Name = "CB_Country4";
@@ -399,6 +400,7 @@
//
// CB_Country3
//
+ this.CB_Country3.DropDownWidth = 180;
this.CB_Country3.FormattingEnabled = true;
this.CB_Country3.Location = new System.Drawing.Point(82, 126);
this.CB_Country3.Name = "CB_Country3";
@@ -408,6 +410,7 @@
//
// CB_Country2
//
+ this.CB_Country2.DropDownWidth = 180;
this.CB_Country2.FormattingEnabled = true;
this.CB_Country2.Location = new System.Drawing.Point(82, 93);
this.CB_Country2.Name = "CB_Country2";
@@ -417,6 +420,7 @@
//
// CB_Country1
//
+ this.CB_Country1.DropDownWidth = 180;
this.CB_Country1.FormattingEnabled = true;
this.CB_Country1.Location = new System.Drawing.Point(82, 60);
this.CB_Country1.Name = "CB_Country1";
@@ -426,6 +430,7 @@
//
// CB_Country0
//
+ this.CB_Country0.DropDownWidth = 180;
this.CB_Country0.FormattingEnabled = true;
this.CB_Country0.Location = new System.Drawing.Point(82, 27);
this.CB_Country0.Name = "CB_Country0";
@@ -723,6 +728,7 @@
//
// Region4
//
+ this.Region4.DropDownWidth = 180;
this.Region4.FormattingEnabled = true;
this.Region4.Location = new System.Drawing.Point(204, 158);
this.Region4.Name = "Region4";
@@ -731,6 +737,7 @@
//
// Region3
//
+ this.Region3.DropDownWidth = 180;
this.Region3.FormattingEnabled = true;
this.Region3.Location = new System.Drawing.Point(204, 126);
this.Region3.Name = "Region3";
@@ -739,6 +746,7 @@
//
// Region2
//
+ this.Region2.DropDownWidth = 180;
this.Region2.FormattingEnabled = true;
this.Region2.Location = new System.Drawing.Point(204, 93);
this.Region2.Name = "Region2";
@@ -747,6 +755,7 @@
//
// Region1
//
+ this.Region1.DropDownWidth = 180;
this.Region1.FormattingEnabled = true;
this.Region1.Location = new System.Drawing.Point(204, 60);
this.Region1.Name = "Region1";
@@ -755,6 +764,7 @@
//
// Region0
//
+ this.Region0.DropDownWidth = 180;
this.Region0.FormattingEnabled = true;
this.Region0.Location = new System.Drawing.Point(204, 27);
this.Region0.Name = "Region0";
diff --git a/PKX/f3-MemoryAmie.cs b/PKX/f3-MemoryAmie.cs
index fd2ffb7d6..acc0dd985 100644
--- a/PKX/f3-MemoryAmie.cs
+++ b/PKX/f3-MemoryAmie.cs
@@ -61,22 +61,22 @@ namespace PKHeX
// Load/Save Actions
private void loadFields()
{
- // Save the region/country values.
- v1cb(Region0, 0x94); v1cb(CB_Country0, 0x95);
- v1cb(Region1, 0x96); v1cb(CB_Country1, 0x97);
- v1cb(Region2, 0x98); v1cb(CB_Country2, 0x99);
- v1cb(Region3, 0x9A); v1cb(CB_Country3, 0x9B);
- v1cb(Region4, 0x9C); v1cb(CB_Country4, 0x9D);
+ // Load the region/country values.
+ v1cb(CB_Country0, 0x95); v1cb(Region0, 0x94);
+ v1cb(CB_Country1, 0x97); v1cb(Region1, 0x96);
+ v1cb(CB_Country2, 0x99); v1cb(Region2, 0x98);
+ v1cb(CB_Country3, 0x9B); v1cb(Region3, 0x9A);
+ v1cb(CB_Country4, 0x9D); v1cb(Region4, 0x9C);
- // Write the Fullness, and Enjoyment
+ // Load the Fullness, and Enjoyment
v1s(M_Fullness, 0xAE); v1s(M_Enjoyment, 0xAF);
- // Write the CT Memories
+ // Load the CT Memories
v1s(M_CT_Friendship, 0xA2); v1s(M_CT_Affection, 0xA3);
CB_CTQual.SelectedIndex = Math.Max(0,h[0xA4]-1);
- v1cb(CB_CTMemory, 0xA5); v2cb(CB_CTVar, 0xA8); i1cb(CB_CTFeel, 0xA6);
+ v1cb(CB_CTMemory, 0xA5); v2cb(CB_CTVar, 0xA8); i1cb(CB_CTFeel, 0xA6);
- // Write the OT Memories
+ // Load the OT Memories
v1s(M_OT_Friendship, 0xCA); v1s(M_OT_Affection, 0xCB);
CB_OTQual.SelectedIndex = Math.Max(0,h[0xCC]-1);
v1cb(CB_OTMemory, 0xCD); v2cb(CB_OTVar, 0xCE); i1cb(CB_OTFeel, 0xD0);
diff --git a/SAV/SAV_Trainer.Designer.cs b/SAV/SAV_Trainer.Designer.cs
index 9707f6864..b4f846b4e 100644
--- a/SAV/SAV_Trainer.Designer.cs
+++ b/SAV/SAV_Trainer.Designer.cs
@@ -799,6 +799,7 @@ namespace PKHeX
//
// CB_Region
//
+ this.CB_Region.DropDownWidth = 180;
this.CB_Region.FormattingEnabled = true;
this.CB_Region.Location = new System.Drawing.Point(99, 131);
this.CB_Region.Name = "CB_Region";
@@ -807,6 +808,7 @@ namespace PKHeX
//
// CB_Country
//
+ this.CB_Country.DropDownWidth = 180;
this.CB_Country.FormattingEnabled = true;
this.CB_Country.Location = new System.Drawing.Point(99, 108);
this.CB_Country.Name = "CB_Country";