diff --git a/PKHeX.Core/Legality/Data.cs b/PKHeX.Core/Legality/Data.cs
index 254d2ac43..b5319599c 100644
--- a/PKHeX.Core/Legality/Data.cs
+++ b/PKHeX.Core/Legality/Data.cs
@@ -4,6 +4,12 @@ namespace PKHeX.Core
{
public static class Data
{
+ ///
+ /// Unpacks a BinLinkerAccessor generated file container into individual arrays.
+ ///
+ /// Packed data
+ /// Signature expected in the first two bytes (ASCII)
+ /// Unpacked array containing all files that were packed.
public static byte[][] UnpackMini(byte[] fileData, string identifier)
{
if (fileData == null || fileData.Length < 4)
diff --git a/PKHeX.Core/Saves/SAV6.cs b/PKHeX.Core/Saves/SAV6.cs
index e778a09d5..384eb5cf6 100644
--- a/PKHeX.Core/Saves/SAV6.cs
+++ b/PKHeX.Core/Saves/SAV6.cs
@@ -348,11 +348,22 @@ public string Saying5
get => Util.TrimFromZero(Encoding.Unicode.GetString(Data, TrainerCard + 0x7C + 0x22 * 4, 0x22));
set => Encoding.Unicode.GetBytes(value.PadRight(value.Length + 1, '\0')).CopyTo(Data, TrainerCard + 0x7C + 0x22 * 4);
}
+
+ public short EyeColor
+ {
+ get => BitConverter.ToInt16(Data, TrainerCard + 0x148);
+ set => BitConverter.GetBytes(value).CopyTo(Data, TrainerCard + 0x148);
+ }
public bool IsMegaEvolutionUnlocked
{
get => (Data[TrainerCard + 0x14A] & 0x01) != 0;
set => Data[TrainerCard + 0x14A] = (byte)((Data[TrainerCard + 0x14A] & 0xFE) | (value ? 1 : 0)); // in battle
}
+ public bool IsMegaRayquazaUnlocked
+ {
+ get => (Data[TrainerCard + 0x14A] & 0x02) != 0;
+ set => Data[TrainerCard + 0x14A] = (byte)((Data[TrainerCard + 0x14A] & ~2) | (value ? 2 : 0)); // in battle
+ }
public int M
{
diff --git a/PKHeX.Core/Saves/Substructures/Misc/TrainerFashion6.cs b/PKHeX.Core/Saves/Substructures/Misc/TrainerFashion6.cs
new file mode 100644
index 000000000..2abb98acf
--- /dev/null
+++ b/PKHeX.Core/Saves/Substructures/Misc/TrainerFashion6.cs
@@ -0,0 +1,123 @@
+using System;
+
+namespace PKHeX.Core
+{
+ public abstract class TrainerFashion6
+ {
+ protected uint data0;
+ protected uint data1;
+ protected uint data2;
+
+ protected TrainerFashion6(byte[] data, int offset)
+ {
+ data0 = BitConverter.ToUInt32(data, 0 + offset);
+ data1 = BitConverter.ToUInt32(data, 4 + offset);
+ data2 = BitConverter.ToUInt32(data, 8 + offset);
+ }
+
+ public static TrainerFashion6 GetFashion(byte[] data, int offset, int gender)
+ {
+ if (gender == 0) // m
+ return new Fashion6Male(data, offset);
+ return new Fashion6Female(data, offset);
+ }
+
+ public void Write(byte[] data, int offset)
+ {
+ BitConverter.GetBytes(data0).CopyTo(data, 0 + offset);
+ BitConverter.GetBytes(data1).CopyTo(data, 4 + offset);
+ BitConverter.GetBytes(data2).CopyTo(data, 8 + offset);
+ }
+
+ protected static uint GetBits(uint value, int startPos, int bits)
+ {
+ uint mask = ((1u << bits) - 1) << startPos;
+ return (value & mask) >> startPos;
+ }
+
+ protected static uint SetBits(uint value, int startPos, int bits, uint bitValue)
+ {
+ uint mask = ((1u << bits) - 1) << startPos;
+ bitValue &= mask >> startPos;
+ return (value & ~mask) | (bitValue << startPos);
+ }
+ }
+
+ public class Fashion6Male : TrainerFashion6
+ {
+ public Fashion6Male(byte[] data, int offset)
+ : base(data, offset) { }
+
+ public uint Version { get => GetBits(data0, 0, 3); set => data0 = SetBits(data0, 0, 3, value); }
+ public uint Model { get => GetBits(data0, 3, 3); set => data0 = SetBits(data0, 3, 3, value); }
+ public uint Skin { get => GetBits(data0, 6, 2); set => data0 = SetBits(data0, 6, 2, value); }
+ public uint HairColor{ get => GetBits(data0, 8, 3); set => data0 = SetBits(data0, 8, 3, value); }
+ public uint Hat { get => GetBits(data0, 11, 5); set => data0 = SetBits(data0, 11, 5, value); }
+ public uint Front { get => GetBits(data0, 16, 3); set => data0 = SetBits(data0, 16, 3, value); }
+ public uint Hair { get => GetBits(data0, 19, 4); set => data0 = SetBits(data0, 19, 4, value); }
+ public uint Face { get => GetBits(data0, 23, 3); set => data0 = SetBits(data0, 23, 3, value); }
+ public uint Arms { get => GetBits(data0, 26, 2); set => data0 = SetBits(data0, 26, 2, value); }
+ public uint _0 { get => GetBits(data0, 28, 2); set => data0 = SetBits(data0, 28, 2, value); }
+ public uint Unused0 { get => GetBits(data0, 30, 2); set => data0 = SetBits(data0, 30, 2, value); }
+
+ public uint Top { get => GetBits(data1, 0, 6); set => data1 = SetBits(data1, 0, 6, value); }
+ public uint Legs { get => GetBits(data1, 6, 5); set => data1 = SetBits(data1, 6, 5, value); }
+ public uint Socks { get => GetBits(data1, 11, 3); set => data1 = SetBits(data1, 11, 3, value); }
+ public uint Shoes { get => GetBits(data1, 14, 5); set => data1 = SetBits(data1, 14, 5, value); }
+ public uint Bag { get => GetBits(data1, 19, 4); set => data1 = SetBits(data1, 19, 4, value); }
+ public uint AHat { get => GetBits(data1, 23, 4); set => data1 = SetBits(data1, 23, 4, value); }
+ public uint _1 { get => GetBits(data1, 27, 2); set => data1 = SetBits(data1, 27, 2, value); }
+ public uint Unused1 { get => GetBits(data1, 29, 3); set => data1 = SetBits(data1, 29, 3, value); }
+
+ public bool Contacts { get => GetBits(data2, 0, 1) == 1; set => data2 = SetBits(data2, 0, 1, value ? 1u : 0); }
+ public uint FacialHair { get => GetBits(data2, 1, 3); set => data2 = SetBits(data2, 1, 3, value); }
+ public uint ColorContacts { get => GetBits(data2, 4, 3); set => data2 = SetBits(data2, 4, 3, value); }
+ public uint FacialColor { get => GetBits(data2, 7, 3); set => data2 = SetBits(data2, 7, 3, value); }
+ public uint PaintLeft { get => GetBits(data2, 10, 4); set => data2 = SetBits(data2, 10, 4, value); }
+ public uint PaintRight { get => GetBits(data2, 14, 4); set => data2 = SetBits(data2, 14, 4, value); }
+ public uint PaintLeftC { get => GetBits(data2, 18, 3); set => data2 = SetBits(data2, 18, 3, value); }
+ public uint PaintRightC { get => GetBits(data2, 21, 3); set => data2 = SetBits(data2, 21, 3, value); }
+ public uint Cheek { get => GetBits(data2, 24, 2); set => data2 = SetBits(data2, 24, 2, value); }
+ public uint CheekColor { get => GetBits(data2, 26, 3); set => data2 = SetBits(data2, 26, 3, value); }
+ public uint Unused2 { get => GetBits(data2, 29, 3); set => data2 = SetBits(data2, 29, 3, value); }
+ }
+
+ public class Fashion6Female : TrainerFashion6
+ {
+ public Fashion6Female(byte[] data, int offset)
+ : base(data, offset) { }
+
+ public uint Version { get => GetBits(data0, 0, 3); set => data0 = SetBits(data0, 0, 3, value); }
+ public uint Model { get => GetBits(data0, 3, 3); set => data0 = SetBits(data0, 3, 3, value); }
+ public uint Skin { get => GetBits(data0, 6, 2); set => data0 = SetBits(data0, 6, 2, value); }
+ public uint HairColor{ get => GetBits(data0, 8, 3); set => data0 = SetBits(data0, 8, 3, value); }
+ public uint Hat { get => GetBits(data0, 11, 6); set => data0 = SetBits(data0, 11, 6, value); }
+ public uint Front { get => GetBits(data0, 17, 3); set => data0 = SetBits(data0, 17, 3, value); }
+ public uint Hair { get => GetBits(data0, 20, 4); set => data0 = SetBits(data0, 20, 4, value); }
+ public uint Face { get => GetBits(data0, 24, 3); set => data0 = SetBits(data0, 24, 3, value); }
+ public uint Arms { get => GetBits(data0, 27, 2); set => data0 = SetBits(data0, 27, 2, value); }
+ public uint _0 { get => GetBits(data0, 29, 2); set => data0 = SetBits(data0, 29, 2, value); }
+ public uint Unused0 { get => GetBits(data0, 31, 1); set => data0 = SetBits(data0, 31, 1, value); }
+
+ public uint Top { get => GetBits(data1, 0, 6); set => data1 = SetBits(data1, 0, 6, value); }
+ public uint Legs { get => GetBits(data1, 6, 7); set => data1 = SetBits(data1, 6, 7, value); }
+ public uint OnePiece { get => GetBits(data1, 13, 4); set => data1 = SetBits(data1, 13, 4, value); }
+ public uint Socks { get => GetBits(data1, 17, 5); set => data1 = SetBits(data1, 17, 5, value); }
+ public uint Shoes { get => GetBits(data1, 22, 6); set => data1 = SetBits(data1, 22, 6, value); }
+ public uint _1 { get => GetBits(data1, 28, 2); set => data1 = SetBits(data1, 28, 2, value); }
+ public uint Unused1 { get => GetBits(data1, 30, 2); set => data1 = SetBits(data1, 30, 2, value); }
+
+ public uint Bag { get => GetBits(data2, 0, 5); set => data2 = SetBits(data2, 0, 5, value); }
+ public uint AHat { get => GetBits(data2, 5, 5); set => data2 = SetBits(data2, 5, 5, value); }
+ public bool Contacts { get => GetBits(data2, 10, 1) == 1; set => data2 = SetBits(data2, 10, 1, value ? 1u : 0); }
+ public uint Mascara { get => GetBits(data2, 11, 2); set => data2 = SetBits(data2, 11, 2, value); }
+ public uint EyeShadow { get => GetBits(data2, 13, 2); set => data2 = SetBits(data2, 13, 2, value); }
+ public uint Cheek { get => GetBits(data2, 15, 2); set => data2 = SetBits(data2, 15, 2, value); }
+ public uint Lips { get => GetBits(data2, 17, 2); set => data2 = SetBits(data2, 17, 2, value); }
+ public uint ColorContacts { get => GetBits(data2, 19, 3); set => data2 = SetBits(data2, 19, 3, value); }
+ public uint ColorMascara { get => GetBits(data2, 22, 3); set => data2 = SetBits(data2, 22, 3, value); }
+ public uint ColorEyeshadow{ get => GetBits(data2, 25, 3); set => data2 = SetBits(data2, 25, 3, value); }
+ public uint ColorCheek { get => GetBits(data2, 28, 3); set => data2 = SetBits(data2, 28, 3, value); }
+ public uint Unused2 { get => GetBits(data2, 31, 1); set => data2 = SetBits(data2, 31, 1, value); }
+ }
+}
diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_Trainer.Designer.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_Trainer.Designer.cs
index 9597c3f33..5afa01521 100644
--- a/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_Trainer.Designer.cs
+++ b/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_Trainer.Designer.cs
@@ -126,48 +126,7 @@ private void InitializeComponent()
this.L_TriplesC = new System.Windows.Forms.Label();
this.L_DoublesC = new System.Windows.Forms.Label();
this.L_SinglesC = new System.Windows.Forms.Label();
- this.L_Outfit = new System.Windows.Forms.Label();
- this.MT_1403F = new System.Windows.Forms.MaskedTextBox();
- this.MT_1403E = new System.Windows.Forms.MaskedTextBox();
- this.MT_1403D = new System.Windows.Forms.MaskedTextBox();
- this.MT_1403C = new System.Windows.Forms.MaskedTextBox();
this.B_GiveAccessories = new System.Windows.Forms.Button();
- this.MT_1403B = new System.Windows.Forms.MaskedTextBox();
- this.MT_1403A = new System.Windows.Forms.MaskedTextBox();
- this.MT_14039 = new System.Windows.Forms.MaskedTextBox();
- this.MT_14038 = new System.Windows.Forms.MaskedTextBox();
- this.MT_14037 = new System.Windows.Forms.MaskedTextBox();
- this.MT_14036 = new System.Windows.Forms.MaskedTextBox();
- this.MT_14035 = new System.Windows.Forms.MaskedTextBox();
- this.MT_14034 = new System.Windows.Forms.MaskedTextBox();
- this.MT_14033 = new System.Windows.Forms.MaskedTextBox();
- this.MT_14032 = new System.Windows.Forms.MaskedTextBox();
- this.MT_14031 = new System.Windows.Forms.MaskedTextBox();
- this.MT_14030 = new System.Windows.Forms.MaskedTextBox();
- this.MT_Hat = new System.Windows.Forms.MaskedTextBox();
- this.MT_HairColor = new System.Windows.Forms.MaskedTextBox();
- this.L_Dress = new System.Windows.Forms.Label();
- this.CB_Dress = new System.Windows.Forms.ComboBox();
- this.CB_Bag = new System.Windows.Forms.ComboBox();
- this.CB_Socks = new System.Windows.Forms.ComboBox();
- this.CB_Pants = new System.Windows.Forms.ComboBox();
- this.CB_Shirt = new System.Windows.Forms.ComboBox();
- this.CB_Accessory = new System.Windows.Forms.ComboBox();
- this.CB_Hat = new System.Windows.Forms.ComboBox();
- this.L_Accessory = new System.Windows.Forms.Label();
- this.L_Bag = new System.Windows.Forms.Label();
- this.L_Socks = new System.Windows.Forms.Label();
- this.L_Pants = new System.Windows.Forms.Label();
- this.L_Shirt = new System.Windows.Forms.Label();
- this.CB_FaceHair = new System.Windows.Forms.ComboBox();
- this.CB_Hair = new System.Windows.Forms.ComboBox();
- this.CB_Eye = new System.Windows.Forms.ComboBox();
- this.CB_Skin = new System.Windows.Forms.ComboBox();
- this.L_Hat = new System.Windows.Forms.Label();
- this.L_FacialHair = new System.Windows.Forms.Label();
- this.L_Hairstyle = new System.Windows.Forms.Label();
- this.L_HairColor = new System.Windows.Forms.Label();
- this.L_SkinColor = new System.Windows.Forms.Label();
this.CB_Vivillon = new System.Windows.Forms.ComboBox();
this.L_Vivillon = new System.Windows.Forms.Label();
this.L_MultiplayerSprite = new System.Windows.Forms.Label();
@@ -176,6 +135,7 @@ private void InitializeComponent()
this.TC_Editor = new System.Windows.Forms.TabControl();
this.Tab_Overview = new System.Windows.Forms.TabPage();
this.GB_Stats = new System.Windows.Forms.GroupBox();
+ this.TrainerStats = new PKHeX.WinForms.Subforms.Save_Editors.TrainerStat();
this.GB_Adventure = new System.Windows.Forms.GroupBox();
this.L_Fame = new System.Windows.Forms.Label();
this.CAL_HoFDate = new System.Windows.Forms.DateTimePicker();
@@ -199,9 +159,9 @@ private void InitializeComponent()
this.CHK_MegaUnlocked = new System.Windows.Forms.CheckBox();
this.Tab_Maison = new System.Windows.Forms.TabPage();
this.Tab_Appearance = new System.Windows.Forms.TabPage();
+ this.propertyGrid1 = new System.Windows.Forms.PropertyGrid();
this.L_TRNick = new System.Windows.Forms.Label();
this.TB_TRNick = new System.Windows.Forms.TextBox();
- this.TrainerStats = new PKHeX.WinForms.Subforms.Save_Editors.TrainerStat();
((System.ComponentModel.ISupportInitialize)(this.PB_Badge8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.PB_Badge6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.PB_Badge4)).BeginInit();
@@ -1236,431 +1196,16 @@ private void InitializeComponent()
this.L_SinglesC.TabIndex = 39;
this.L_SinglesC.Text = "Singles:";
//
- // L_Outfit
- //
- this.L_Outfit.AutoSize = true;
- this.L_Outfit.Location = new System.Drawing.Point(295, 137);
- this.L_Outfit.Name = "L_Outfit";
- this.L_Outfit.Size = new System.Drawing.Size(55, 13);
- this.L_Outfit.TabIndex = 72;
- this.L_Outfit.Text = "Outfit Vals";
- //
- // MT_1403F
- //
- this.MT_1403F.Location = new System.Drawing.Point(281, 192);
- this.MT_1403F.Mask = "000";
- this.MT_1403F.Name = "MT_1403F";
- this.MT_1403F.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
- this.MT_1403F.Size = new System.Drawing.Size(26, 20);
- this.MT_1403F.TabIndex = 71;
- this.MT_1403F.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
- this.MT_1403F.TextChanged += new System.EventHandler(this.Change255);
- //
- // MT_1403E
- //
- this.MT_1403E.Location = new System.Drawing.Point(255, 192);
- this.MT_1403E.Mask = "000";
- this.MT_1403E.Name = "MT_1403E";
- this.MT_1403E.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
- this.MT_1403E.Size = new System.Drawing.Size(26, 20);
- this.MT_1403E.TabIndex = 70;
- this.MT_1403E.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
- this.MT_1403E.TextChanged += new System.EventHandler(this.Change255);
- //
- // MT_1403D
- //
- this.MT_1403D.Location = new System.Drawing.Point(229, 192);
- this.MT_1403D.Mask = "000";
- this.MT_1403D.Name = "MT_1403D";
- this.MT_1403D.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
- this.MT_1403D.Size = new System.Drawing.Size(26, 20);
- this.MT_1403D.TabIndex = 69;
- this.MT_1403D.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
- this.MT_1403D.TextChanged += new System.EventHandler(this.Change255);
- //
- // MT_1403C
- //
- this.MT_1403C.Location = new System.Drawing.Point(203, 192);
- this.MT_1403C.Mask = "000";
- this.MT_1403C.Name = "MT_1403C";
- this.MT_1403C.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
- this.MT_1403C.Size = new System.Drawing.Size(26, 20);
- this.MT_1403C.TabIndex = 68;
- this.MT_1403C.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
- this.MT_1403C.TextChanged += new System.EventHandler(this.Change255);
- //
// B_GiveAccessories
//
- this.B_GiveAccessories.Location = new System.Drawing.Point(32, 189);
+ this.B_GiveAccessories.Location = new System.Drawing.Point(290, 121);
this.B_GiveAccessories.Name = "B_GiveAccessories";
- this.B_GiveAccessories.Size = new System.Drawing.Size(156, 23);
+ this.B_GiveAccessories.Size = new System.Drawing.Size(96, 59);
this.B_GiveAccessories.TabIndex = 67;
this.B_GiveAccessories.Text = "Give All Accessories";
this.B_GiveAccessories.UseVisualStyleBackColor = true;
this.B_GiveAccessories.Click += new System.EventHandler(this.GiveAllAccessories);
//
- // MT_1403B
- //
- this.MT_1403B.Location = new System.Drawing.Point(333, 173);
- this.MT_1403B.Mask = "000";
- this.MT_1403B.Name = "MT_1403B";
- this.MT_1403B.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
- this.MT_1403B.Size = new System.Drawing.Size(26, 20);
- this.MT_1403B.TabIndex = 66;
- this.MT_1403B.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
- this.MT_1403B.TextChanged += new System.EventHandler(this.Change255);
- //
- // MT_1403A
- //
- this.MT_1403A.Location = new System.Drawing.Point(307, 173);
- this.MT_1403A.Mask = "000";
- this.MT_1403A.Name = "MT_1403A";
- this.MT_1403A.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
- this.MT_1403A.Size = new System.Drawing.Size(26, 20);
- this.MT_1403A.TabIndex = 65;
- this.MT_1403A.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
- this.MT_1403A.TextChanged += new System.EventHandler(this.Change255);
- //
- // MT_14039
- //
- this.MT_14039.Location = new System.Drawing.Point(281, 173);
- this.MT_14039.Mask = "000";
- this.MT_14039.Name = "MT_14039";
- this.MT_14039.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
- this.MT_14039.Size = new System.Drawing.Size(26, 20);
- this.MT_14039.TabIndex = 64;
- this.MT_14039.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
- this.MT_14039.TextChanged += new System.EventHandler(this.Change255);
- //
- // MT_14038
- //
- this.MT_14038.Location = new System.Drawing.Point(255, 173);
- this.MT_14038.Mask = "000";
- this.MT_14038.Name = "MT_14038";
- this.MT_14038.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
- this.MT_14038.Size = new System.Drawing.Size(26, 20);
- this.MT_14038.TabIndex = 63;
- this.MT_14038.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
- this.MT_14038.TextChanged += new System.EventHandler(this.Change255);
- //
- // MT_14037
- //
- this.MT_14037.Location = new System.Drawing.Point(229, 173);
- this.MT_14037.Mask = "000";
- this.MT_14037.Name = "MT_14037";
- this.MT_14037.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
- this.MT_14037.Size = new System.Drawing.Size(26, 20);
- this.MT_14037.TabIndex = 61;
- this.MT_14037.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
- this.MT_14037.TextChanged += new System.EventHandler(this.Change255);
- //
- // MT_14036
- //
- this.MT_14036.Location = new System.Drawing.Point(203, 173);
- this.MT_14036.Mask = "000";
- this.MT_14036.Name = "MT_14036";
- this.MT_14036.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
- this.MT_14036.Size = new System.Drawing.Size(26, 20);
- this.MT_14036.TabIndex = 62;
- this.MT_14036.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
- this.MT_14036.TextChanged += new System.EventHandler(this.Change255);
- //
- // MT_14035
- //
- this.MT_14035.Location = new System.Drawing.Point(333, 154);
- this.MT_14035.Mask = "000";
- this.MT_14035.Name = "MT_14035";
- this.MT_14035.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
- this.MT_14035.Size = new System.Drawing.Size(26, 20);
- this.MT_14035.TabIndex = 60;
- this.MT_14035.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
- this.MT_14035.TextChanged += new System.EventHandler(this.Change255);
- //
- // MT_14034
- //
- this.MT_14034.Location = new System.Drawing.Point(307, 154);
- this.MT_14034.Mask = "000";
- this.MT_14034.Name = "MT_14034";
- this.MT_14034.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
- this.MT_14034.Size = new System.Drawing.Size(26, 20);
- this.MT_14034.TabIndex = 59;
- this.MT_14034.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
- this.MT_14034.TextChanged += new System.EventHandler(this.Change255);
- //
- // MT_14033
- //
- this.MT_14033.Location = new System.Drawing.Point(281, 154);
- this.MT_14033.Mask = "000";
- this.MT_14033.Name = "MT_14033";
- this.MT_14033.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
- this.MT_14033.Size = new System.Drawing.Size(26, 20);
- this.MT_14033.TabIndex = 58;
- this.MT_14033.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
- this.MT_14033.TextChanged += new System.EventHandler(this.Change255);
- //
- // MT_14032
- //
- this.MT_14032.Location = new System.Drawing.Point(255, 154);
- this.MT_14032.Mask = "000";
- this.MT_14032.Name = "MT_14032";
- this.MT_14032.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
- this.MT_14032.Size = new System.Drawing.Size(26, 20);
- this.MT_14032.TabIndex = 57;
- this.MT_14032.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
- this.MT_14032.TextChanged += new System.EventHandler(this.Change255);
- //
- // MT_14031
- //
- this.MT_14031.Enabled = false;
- this.MT_14031.Location = new System.Drawing.Point(229, 154);
- this.MT_14031.Mask = "000";
- this.MT_14031.Name = "MT_14031";
- this.MT_14031.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
- this.MT_14031.Size = new System.Drawing.Size(26, 20);
- this.MT_14031.TabIndex = 54;
- this.MT_14031.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
- this.MT_14031.TextChanged += new System.EventHandler(this.Change255);
- //
- // MT_14030
- //
- this.MT_14030.Location = new System.Drawing.Point(203, 154);
- this.MT_14030.Mask = "000";
- this.MT_14030.Name = "MT_14030";
- this.MT_14030.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
- this.MT_14030.Size = new System.Drawing.Size(26, 20);
- this.MT_14030.TabIndex = 56;
- this.MT_14030.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
- this.MT_14030.TextChanged += new System.EventHandler(this.Change255);
- //
- // MT_Hat
- //
- this.MT_Hat.Location = new System.Drawing.Point(100, 40);
- this.MT_Hat.Mask = "00";
- this.MT_Hat.Name = "MT_Hat";
- this.MT_Hat.Size = new System.Drawing.Size(22, 20);
- this.MT_Hat.TabIndex = 55;
- this.MT_Hat.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
- this.MT_Hat.TextChanged += new System.EventHandler(this.ChangeSpecial);
- //
- // MT_HairColor
- //
- this.MT_HairColor.Location = new System.Drawing.Point(271, 61);
- this.MT_HairColor.Mask = "00";
- this.MT_HairColor.Name = "MT_HairColor";
- this.MT_HairColor.Size = new System.Drawing.Size(22, 20);
- this.MT_HairColor.TabIndex = 55;
- this.MT_HairColor.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
- this.MT_HairColor.TextChanged += new System.EventHandler(this.ChangeSpecial);
- //
- // L_Dress
- //
- this.L_Dress.Location = new System.Drawing.Point(28, 126);
- this.L_Dress.Name = "L_Dress";
- this.L_Dress.Size = new System.Drawing.Size(65, 13);
- this.L_Dress.TabIndex = 21;
- this.L_Dress.Text = "Dress:";
- this.L_Dress.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
- //
- // CB_Dress
- //
- this.CB_Dress.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.CB_Dress.FormattingEnabled = true;
- this.CB_Dress.Location = new System.Drawing.Point(100, 124);
- this.CB_Dress.Name = "CB_Dress";
- this.CB_Dress.Size = new System.Drawing.Size(88, 21);
- this.CB_Dress.TabIndex = 20;
- this.CB_Dress.Visible = false;
- //
- // CB_Bag
- //
- this.CB_Bag.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.CB_Bag.FormattingEnabled = true;
- this.CB_Bag.Location = new System.Drawing.Point(100, 166);
- this.CB_Bag.Name = "CB_Bag";
- this.CB_Bag.Size = new System.Drawing.Size(88, 21);
- this.CB_Bag.TabIndex = 19;
- this.CB_Bag.Visible = false;
- //
- // CB_Socks
- //
- this.CB_Socks.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.CB_Socks.FormattingEnabled = true;
- this.CB_Socks.Location = new System.Drawing.Point(100, 145);
- this.CB_Socks.Name = "CB_Socks";
- this.CB_Socks.Size = new System.Drawing.Size(88, 21);
- this.CB_Socks.TabIndex = 18;
- this.CB_Socks.Visible = false;
- //
- // CB_Pants
- //
- this.CB_Pants.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.CB_Pants.FormattingEnabled = true;
- this.CB_Pants.Location = new System.Drawing.Point(100, 103);
- this.CB_Pants.Name = "CB_Pants";
- this.CB_Pants.Size = new System.Drawing.Size(88, 21);
- this.CB_Pants.TabIndex = 17;
- this.CB_Pants.Visible = false;
- //
- // CB_Shirt
- //
- this.CB_Shirt.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.CB_Shirt.FormattingEnabled = true;
- this.CB_Shirt.Location = new System.Drawing.Point(100, 82);
- this.CB_Shirt.Name = "CB_Shirt";
- this.CB_Shirt.Size = new System.Drawing.Size(88, 21);
- this.CB_Shirt.TabIndex = 16;
- this.CB_Shirt.Visible = false;
- //
- // CB_Accessory
- //
- this.CB_Accessory.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.CB_Accessory.FormattingEnabled = true;
- this.CB_Accessory.Location = new System.Drawing.Point(100, 61);
- this.CB_Accessory.Name = "CB_Accessory";
- this.CB_Accessory.Size = new System.Drawing.Size(88, 21);
- this.CB_Accessory.TabIndex = 15;
- this.CB_Accessory.Visible = false;
- //
- // CB_Hat
- //
- this.CB_Hat.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.CB_Hat.FormattingEnabled = true;
- this.CB_Hat.Location = new System.Drawing.Point(100, 40);
- this.CB_Hat.Name = "CB_Hat";
- this.CB_Hat.Size = new System.Drawing.Size(88, 21);
- this.CB_Hat.TabIndex = 14;
- this.CB_Hat.Visible = false;
- //
- // L_Accessory
- //
- this.L_Accessory.Location = new System.Drawing.Point(28, 63);
- this.L_Accessory.Name = "L_Accessory";
- this.L_Accessory.Size = new System.Drawing.Size(65, 13);
- this.L_Accessory.TabIndex = 13;
- this.L_Accessory.Text = "Accessory:";
- this.L_Accessory.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
- //
- // L_Bag
- //
- this.L_Bag.Location = new System.Drawing.Point(28, 167);
- this.L_Bag.Name = "L_Bag";
- this.L_Bag.Size = new System.Drawing.Size(65, 13);
- this.L_Bag.TabIndex = 12;
- this.L_Bag.Text = "Bag:";
- this.L_Bag.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
- //
- // L_Socks
- //
- this.L_Socks.Location = new System.Drawing.Point(28, 146);
- this.L_Socks.Name = "L_Socks";
- this.L_Socks.Size = new System.Drawing.Size(65, 13);
- this.L_Socks.TabIndex = 11;
- this.L_Socks.Text = "Socks:";
- this.L_Socks.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
- //
- // L_Pants
- //
- this.L_Pants.Location = new System.Drawing.Point(28, 105);
- this.L_Pants.Name = "L_Pants";
- this.L_Pants.Size = new System.Drawing.Size(65, 13);
- this.L_Pants.TabIndex = 10;
- this.L_Pants.Text = "Pants:";
- this.L_Pants.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
- //
- // L_Shirt
- //
- this.L_Shirt.Location = new System.Drawing.Point(28, 84);
- this.L_Shirt.Name = "L_Shirt";
- this.L_Shirt.Size = new System.Drawing.Size(65, 13);
- this.L_Shirt.TabIndex = 9;
- this.L_Shirt.Text = "Shirt:";
- this.L_Shirt.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
- //
- // CB_FaceHair
- //
- this.CB_FaceHair.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.CB_FaceHair.FormattingEnabled = true;
- this.CB_FaceHair.Location = new System.Drawing.Point(271, 103);
- this.CB_FaceHair.Name = "CB_FaceHair";
- this.CB_FaceHair.Size = new System.Drawing.Size(88, 21);
- this.CB_FaceHair.TabIndex = 8;
- this.CB_FaceHair.Visible = false;
- //
- // CB_Hair
- //
- this.CB_Hair.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.CB_Hair.FormattingEnabled = true;
- this.CB_Hair.Location = new System.Drawing.Point(271, 82);
- this.CB_Hair.Name = "CB_Hair";
- this.CB_Hair.Size = new System.Drawing.Size(88, 21);
- this.CB_Hair.TabIndex = 7;
- this.CB_Hair.Visible = false;
- //
- // CB_Eye
- //
- this.CB_Eye.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.CB_Eye.FormattingEnabled = true;
- this.CB_Eye.Location = new System.Drawing.Point(271, 61);
- this.CB_Eye.Name = "CB_Eye";
- this.CB_Eye.Size = new System.Drawing.Size(88, 21);
- this.CB_Eye.TabIndex = 6;
- this.CB_Eye.Visible = false;
- //
- // CB_Skin
- //
- this.CB_Skin.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.CB_Skin.FormattingEnabled = true;
- this.CB_Skin.Location = new System.Drawing.Point(271, 40);
- this.CB_Skin.Name = "CB_Skin";
- this.CB_Skin.Size = new System.Drawing.Size(88, 21);
- this.CB_Skin.TabIndex = 5;
- this.CB_Skin.Visible = false;
- //
- // L_Hat
- //
- this.L_Hat.Location = new System.Drawing.Point(28, 42);
- this.L_Hat.Name = "L_Hat";
- this.L_Hat.Size = new System.Drawing.Size(65, 13);
- this.L_Hat.TabIndex = 4;
- this.L_Hat.Text = "Hat:";
- this.L_Hat.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
- //
- // L_FacialHair
- //
- this.L_FacialHair.Location = new System.Drawing.Point(199, 104);
- this.L_FacialHair.Name = "L_FacialHair";
- this.L_FacialHair.Size = new System.Drawing.Size(65, 13);
- this.L_FacialHair.TabIndex = 3;
- this.L_FacialHair.Text = "Facial Hair:";
- this.L_FacialHair.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
- //
- // L_Hairstyle
- //
- this.L_Hairstyle.Location = new System.Drawing.Point(199, 83);
- this.L_Hairstyle.Name = "L_Hairstyle";
- this.L_Hairstyle.Size = new System.Drawing.Size(65, 13);
- this.L_Hairstyle.TabIndex = 2;
- this.L_Hairstyle.Text = "Hairstyle:";
- this.L_Hairstyle.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
- //
- // L_HairColor
- //
- this.L_HairColor.Location = new System.Drawing.Point(199, 63);
- this.L_HairColor.Name = "L_HairColor";
- this.L_HairColor.Size = new System.Drawing.Size(65, 13);
- this.L_HairColor.TabIndex = 1;
- this.L_HairColor.Text = "Hair Color:";
- this.L_HairColor.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
- //
- // L_SkinColor
- //
- this.L_SkinColor.Location = new System.Drawing.Point(199, 44);
- this.L_SkinColor.Name = "L_SkinColor";
- this.L_SkinColor.Size = new System.Drawing.Size(65, 13);
- this.L_SkinColor.TabIndex = 0;
- this.L_SkinColor.Text = "Skin Color:";
- this.L_SkinColor.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
- //
// CB_Vivillon
//
this.CB_Vivillon.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
@@ -1713,6 +1258,9 @@ private void InitializeComponent()
//
// TC_Editor
//
+ this.TC_Editor.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.TC_Editor.Controls.Add(this.Tab_Overview);
this.TC_Editor.Controls.Add(this.Tab_BadgeMap);
this.TC_Editor.Controls.Add(this.Tab_Multiplayer);
@@ -1773,6 +1321,13 @@ private void InitializeComponent()
this.GB_Stats.TabStop = false;
this.GB_Stats.Text = "Stats";
//
+ // TrainerStats
+ //
+ this.TrainerStats.Location = new System.Drawing.Point(23, 81);
+ this.TrainerStats.Name = "TrainerStats";
+ this.TrainerStats.Size = new System.Drawing.Size(146, 72);
+ this.TrainerStats.TabIndex = 9;
+ //
// GB_Adventure
//
this.GB_Adventure.Controls.Add(this.L_Fame);
@@ -2063,50 +1618,10 @@ private void InitializeComponent()
//
// Tab_Appearance
//
+ this.Tab_Appearance.Controls.Add(this.propertyGrid1);
this.Tab_Appearance.Controls.Add(this.L_TRNick);
this.Tab_Appearance.Controls.Add(this.TB_TRNick);
- this.Tab_Appearance.Controls.Add(this.CB_Skin);
- this.Tab_Appearance.Controls.Add(this.CB_Hair);
- this.Tab_Appearance.Controls.Add(this.MT_Hat);
- this.Tab_Appearance.Controls.Add(this.CB_FaceHair);
- this.Tab_Appearance.Controls.Add(this.L_Outfit);
- this.Tab_Appearance.Controls.Add(this.MT_HairColor);
- this.Tab_Appearance.Controls.Add(this.MT_1403F);
- this.Tab_Appearance.Controls.Add(this.CB_Eye);
this.Tab_Appearance.Controls.Add(this.B_GiveAccessories);
- this.Tab_Appearance.Controls.Add(this.L_FacialHair);
- this.Tab_Appearance.Controls.Add(this.CB_Shirt);
- this.Tab_Appearance.Controls.Add(this.L_SkinColor);
- this.Tab_Appearance.Controls.Add(this.L_Dress);
- this.Tab_Appearance.Controls.Add(this.L_Hairstyle);
- this.Tab_Appearance.Controls.Add(this.MT_1403E);
- this.Tab_Appearance.Controls.Add(this.L_HairColor);
- this.Tab_Appearance.Controls.Add(this.CB_Accessory);
- this.Tab_Appearance.Controls.Add(this.CB_Dress);
- this.Tab_Appearance.Controls.Add(this.MT_14030);
- this.Tab_Appearance.Controls.Add(this.CB_Hat);
- this.Tab_Appearance.Controls.Add(this.CB_Bag);
- this.Tab_Appearance.Controls.Add(this.MT_1403D);
- this.Tab_Appearance.Controls.Add(this.L_Accessory);
- this.Tab_Appearance.Controls.Add(this.CB_Socks);
- this.Tab_Appearance.Controls.Add(this.L_Hat);
- this.Tab_Appearance.Controls.Add(this.MT_14031);
- this.Tab_Appearance.Controls.Add(this.L_Shirt);
- this.Tab_Appearance.Controls.Add(this.CB_Pants);
- this.Tab_Appearance.Controls.Add(this.MT_1403C);
- this.Tab_Appearance.Controls.Add(this.MT_14032);
- this.Tab_Appearance.Controls.Add(this.MT_1403B);
- this.Tab_Appearance.Controls.Add(this.MT_14033);
- this.Tab_Appearance.Controls.Add(this.MT_1403A);
- this.Tab_Appearance.Controls.Add(this.L_Bag);
- this.Tab_Appearance.Controls.Add(this.MT_14034);
- this.Tab_Appearance.Controls.Add(this.L_Socks);
- this.Tab_Appearance.Controls.Add(this.MT_14039);
- this.Tab_Appearance.Controls.Add(this.L_Pants);
- this.Tab_Appearance.Controls.Add(this.MT_14035);
- this.Tab_Appearance.Controls.Add(this.MT_14038);
- this.Tab_Appearance.Controls.Add(this.MT_14036);
- this.Tab_Appearance.Controls.Add(this.MT_14037);
this.Tab_Appearance.Location = new System.Drawing.Point(4, 22);
this.Tab_Appearance.Name = "Tab_Appearance";
this.Tab_Appearance.Size = new System.Drawing.Size(386, 253);
@@ -2114,19 +1629,31 @@ private void InitializeComponent()
this.Tab_Appearance.Text = "Appearance";
this.Tab_Appearance.UseVisualStyleBackColor = true;
//
+ // propertyGrid1
+ //
+ this.propertyGrid1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.propertyGrid1.HelpVisible = false;
+ this.propertyGrid1.Location = new System.Drawing.Point(3, 3);
+ this.propertyGrid1.Name = "propertyGrid1";
+ this.propertyGrid1.PropertySort = System.Windows.Forms.PropertySort.Alphabetical;
+ this.propertyGrid1.Size = new System.Drawing.Size(281, 247);
+ this.propertyGrid1.TabIndex = 75;
+ this.propertyGrid1.ToolbarVisible = false;
+ //
// L_TRNick
//
- this.L_TRNick.Location = new System.Drawing.Point(68, 230);
+ this.L_TRNick.Location = new System.Drawing.Point(255, 51);
this.L_TRNick.Name = "L_TRNick";
- this.L_TRNick.Size = new System.Drawing.Size(128, 20);
+ this.L_TRNick.Size = new System.Drawing.Size(128, 41);
this.L_TRNick.TabIndex = 74;
this.L_TRNick.Text = "Trainer Nickname:";
- this.L_TRNick.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+ this.L_TRNick.TextAlign = System.Drawing.ContentAlignment.BottomRight;
//
// TB_TRNick
//
this.TB_TRNick.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.TB_TRNick.Location = new System.Drawing.Point(202, 230);
+ this.TB_TRNick.Location = new System.Drawing.Point(290, 95);
this.TB_TRNick.MaxLength = 12;
this.TB_TRNick.Name = "TB_TRNick";
this.TB_TRNick.Size = new System.Drawing.Size(93, 20);
@@ -2134,13 +1661,6 @@ private void InitializeComponent()
this.TB_TRNick.Text = "WWWWWWWWWWWW";
this.TB_TRNick.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
- // TrainerStats
- //
- this.TrainerStats.Location = new System.Drawing.Point(23, 81);
- this.TrainerStats.Name = "TrainerStats";
- this.TrainerStats.Size = new System.Drawing.Size(146, 72);
- this.TrainerStats.TabIndex = 9;
- //
// SAV_Trainer
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -2285,28 +1805,6 @@ private void InitializeComponent()
private System.Windows.Forms.MaskedTextBox TB_MCDN;
private System.Windows.Forms.MaskedTextBox TB_MCSS;
private System.Windows.Forms.MaskedTextBox TB_MCSN;
- private System.Windows.Forms.Label L_Dress;
- private System.Windows.Forms.ComboBox CB_Dress;
- private System.Windows.Forms.ComboBox CB_Bag;
- private System.Windows.Forms.ComboBox CB_Socks;
- private System.Windows.Forms.ComboBox CB_Pants;
- private System.Windows.Forms.ComboBox CB_Shirt;
- private System.Windows.Forms.ComboBox CB_Accessory;
- private System.Windows.Forms.ComboBox CB_Hat;
- private System.Windows.Forms.Label L_Accessory;
- private System.Windows.Forms.Label L_Bag;
- private System.Windows.Forms.Label L_Socks;
- private System.Windows.Forms.Label L_Pants;
- private System.Windows.Forms.Label L_Shirt;
- private System.Windows.Forms.ComboBox CB_FaceHair;
- private System.Windows.Forms.ComboBox CB_Hair;
- private System.Windows.Forms.ComboBox CB_Eye;
- private System.Windows.Forms.ComboBox CB_Skin;
- private System.Windows.Forms.Label L_Hat;
- private System.Windows.Forms.Label L_FacialHair;
- private System.Windows.Forms.Label L_Hairstyle;
- private System.Windows.Forms.Label L_HairColor;
- private System.Windows.Forms.Label L_SkinColor;
private System.Windows.Forms.Label L_MultiplayerSprite;
private System.Windows.Forms.PictureBox PB_Sprite;
private System.Windows.Forms.ComboBox CB_MultiplayerSprite;
@@ -2316,26 +1814,7 @@ private void InitializeComponent()
private System.Windows.Forms.MaskedTextBox MT_Minutes;
private System.Windows.Forms.Label L_Hours;
private System.Windows.Forms.MaskedTextBox MT_Hours;
- private System.Windows.Forms.MaskedTextBox MT_Hat;
- private System.Windows.Forms.MaskedTextBox MT_HairColor;
- private System.Windows.Forms.MaskedTextBox MT_1403B;
- private System.Windows.Forms.MaskedTextBox MT_1403A;
- private System.Windows.Forms.MaskedTextBox MT_14039;
- private System.Windows.Forms.MaskedTextBox MT_14038;
- private System.Windows.Forms.MaskedTextBox MT_14037;
- private System.Windows.Forms.MaskedTextBox MT_14036;
- private System.Windows.Forms.MaskedTextBox MT_14035;
- private System.Windows.Forms.MaskedTextBox MT_14034;
- private System.Windows.Forms.MaskedTextBox MT_14033;
- private System.Windows.Forms.MaskedTextBox MT_14032;
- private System.Windows.Forms.MaskedTextBox MT_14031;
- private System.Windows.Forms.MaskedTextBox MT_14030;
private System.Windows.Forms.Button B_GiveAccessories;
- private System.Windows.Forms.MaskedTextBox MT_1403F;
- private System.Windows.Forms.MaskedTextBox MT_1403E;
- private System.Windows.Forms.MaskedTextBox MT_1403D;
- private System.Windows.Forms.MaskedTextBox MT_1403C;
- private System.Windows.Forms.Label L_Outfit;
private System.Windows.Forms.ComboBox CB_Vivillon;
private System.Windows.Forms.Label L_Vivillon;
private System.Windows.Forms.Label L_LastSaved;
@@ -2369,5 +1848,6 @@ private void InitializeComponent()
private System.Windows.Forms.TextBox TB_TRNick;
private System.Windows.Forms.CheckBox CHK_MegaUnlocked;
private Subforms.Save_Editors.TrainerStat TrainerStats;
+ private System.Windows.Forms.PropertyGrid propertyGrid1;
}
}
diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_Trainer.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_Trainer.cs
index 16521b253..1c991c6b4 100644
--- a/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_Trainer.cs
+++ b/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_Trainer.cs
@@ -280,26 +280,7 @@ private void GetTextBoxes()
if (SAV.XY)
{
// Load Clothing Data
- int hat = SAV.Data[SAV.TrainerCard + 0x31] >> 3;
- int haircolor = SAV.Data[SAV.TrainerCard + 0x31] & 7;
- MT_Hat.Text = hat.ToString();
- MT_HairColor.Text = haircolor.ToString();
- MT_14030.Text = SAV.Data[SAV.TrainerCard + 0x30].ToString();
- MT_14031.Text = SAV.Data[SAV.TrainerCard + 0x31].ToString();
- MT_14032.Text = SAV.Data[SAV.TrainerCard + 0x32].ToString();
- MT_14033.Text = SAV.Data[SAV.TrainerCard + 0x33].ToString();
- MT_14034.Text = SAV.Data[SAV.TrainerCard + 0x34].ToString();
- MT_14035.Text = SAV.Data[SAV.TrainerCard + 0x35].ToString();
- MT_14036.Text = SAV.Data[SAV.TrainerCard + 0x36].ToString();
- MT_14037.Text = SAV.Data[SAV.TrainerCard + 0x37].ToString();
- MT_14038.Text = SAV.Data[SAV.TrainerCard + 0x38].ToString();
- MT_14039.Text = SAV.Data[SAV.TrainerCard + 0x39].ToString();
- MT_1403A.Text = SAV.Data[SAV.TrainerCard + 0x3A].ToString();
- MT_1403B.Text = SAV.Data[SAV.TrainerCard + 0x3B].ToString();
- MT_1403C.Text = SAV.Data[SAV.TrainerCard + 0x3C].ToString();
- MT_1403D.Text = SAV.Data[SAV.TrainerCard + 0x3D].ToString();
- MT_1403E.Text = SAV.Data[SAV.TrainerCard + 0x3E].ToString();
- MT_1403F.Text = SAV.Data[SAV.TrainerCard + 0x3F].ToString();
+ propertyGrid1.SelectedObject = TrainerFashion6.GetFashion(SAV.Data, SAV.TrainerCard + 0x30, SAV.Gender);
TB_TRNick.Text = SAV.OT_Nick;
}
@@ -381,22 +362,9 @@ private void Save()
// Appearance
if (SAV.XY)
{
- SAV.Data[SAV.TrainerCard + 0x30] = byte.Parse(MT_14030.Text);
- SAV.Data[SAV.TrainerCard + 0x31] = (byte)(byte.Parse(MT_HairColor.Text) | (byte.Parse(MT_Hat.Text) << 3));
- SAV.Data[SAV.TrainerCard + 0x32] = byte.Parse(MT_14032.Text);
- SAV.Data[SAV.TrainerCard + 0x33] = byte.Parse(MT_14033.Text);
- SAV.Data[SAV.TrainerCard + 0x34] = byte.Parse(MT_14034.Text);
- SAV.Data[SAV.TrainerCard + 0x35] = byte.Parse(MT_14035.Text);
- SAV.Data[SAV.TrainerCard + 0x36] = byte.Parse(MT_14036.Text);
- SAV.Data[SAV.TrainerCard + 0x37] = byte.Parse(MT_14037.Text);
- SAV.Data[SAV.TrainerCard + 0x38] = byte.Parse(MT_14038.Text);
- SAV.Data[SAV.TrainerCard + 0x39] = byte.Parse(MT_14039.Text);
- SAV.Data[SAV.TrainerCard + 0x3A] = byte.Parse(MT_1403A.Text);
- SAV.Data[SAV.TrainerCard + 0x3B] = byte.Parse(MT_1403B.Text);
- SAV.Data[SAV.TrainerCard + 0x3C] = byte.Parse(MT_1403C.Text);
- SAV.Data[SAV.TrainerCard + 0x3D] = byte.Parse(MT_1403D.Text);
- SAV.Data[SAV.TrainerCard + 0x3E] = byte.Parse(MT_1403E.Text);
- SAV.Data[SAV.TrainerCard + 0x3F] = byte.Parse(MT_1403F.Text);
+ // Save Clothing Data
+ var obj = (TrainerFashion6)propertyGrid1.SelectedObject;
+ obj.Write(SAV.Data, SAV.TrainerCard + 0x30);
SAV.OT_Nick = TB_TRNick.Text;
}
@@ -458,17 +426,6 @@ private void ChangeBadge(object sender, EventArgs e)
GetBadges();
}
- private void ChangeSpecial(object sender, EventArgs e)
- {
- MaskedTextBox box = sender as MaskedTextBox;
- int val = Util.ToInt32(box?.Text);
-
- if (box == MT_HairColor)
- box.Text = (val > 7 ? 7 : val).ToString();
- if (box == MT_Hat)
- box.Text = (val > 31 ? 31 : val).ToString();
- }
-
private void Change255(object sender, EventArgs e)
{
MaskedTextBox box = (MaskedTextBox)sender;