diff --git a/PKX/f1-Main.Designer.cs b/PKX/f1-Main.Designer.cs index 837ab6931..598513114 100644 --- a/PKX/f1-Main.Designer.cs +++ b/PKX/f1-Main.Designer.cs @@ -283,10 +283,6 @@ public void InitializeComponent() this.ppkx6 = new System.Windows.Forms.PictureBox(); this.Tab_Other = new System.Windows.Forms.TabPage(); this.B_OpenSecretBase = new System.Windows.Forms.Button(); - this.GB_SUBE = new System.Windows.Forms.GroupBox(); - this.subepkx1 = new System.Windows.Forms.PictureBox(); - this.subepkx2 = new System.Windows.Forms.PictureBox(); - this.subepkx3 = new System.Windows.Forms.PictureBox(); this.GB_Daycare = new System.Windows.Forms.GroupBox(); this.label4 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label(); @@ -304,6 +300,10 @@ public void InitializeComponent() this.GB_Fused = new System.Windows.Forms.GroupBox(); this.fusedpkx = new System.Windows.Forms.PictureBox(); this.L_ReadOnlyOther = new System.Windows.Forms.Label(); + this.GB_SUBE = new System.Windows.Forms.GroupBox(); + this.subepkx1 = new System.Windows.Forms.PictureBox(); + this.subepkx2 = new System.Windows.Forms.PictureBox(); + this.subepkx3 = new System.Windows.Forms.PictureBox(); this.Tab_Tools = new System.Windows.Forms.TabPage(); this.B_3DSSETemp = new System.Windows.Forms.Button(); this.B_BoxIO = new System.Windows.Forms.Button(); @@ -331,6 +331,7 @@ public void InitializeComponent() this.GB_SAVtools = new System.Windows.Forms.GroupBox(); this.B_OpenSuperTraining = new System.Windows.Forms.Button(); this.L_SAVINDEX = new System.Windows.Forms.Label(); + this.Menu_Unicode = new System.Windows.Forms.ToolStripMenuItem(); this.tabMain.SuspendLayout(); this.Tab_Main.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.Label_IsShiny)).BeginInit(); @@ -404,10 +405,6 @@ public void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.ppkx5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.ppkx6)).BeginInit(); this.Tab_Other.SuspendLayout(); - this.GB_SUBE.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.subepkx1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.subepkx2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.subepkx3)).BeginInit(); this.GB_Daycare.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dcpkx2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dcpkx1)).BeginInit(); @@ -415,6 +412,10 @@ public void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.gtspkx)).BeginInit(); this.GB_Fused.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.fusedpkx)).BeginInit(); + this.GB_SUBE.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.subepkx1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.subepkx2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.subepkx3)).BeginInit(); this.Tab_Tools.SuspendLayout(); this.Tab_SAV.SuspendLayout(); this.GB_SAVtools.SuspendLayout(); @@ -2649,7 +2650,8 @@ public void InitializeComponent() // this.Menu_Options.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.Menu_Language, - this.Menu_About}); + this.Menu_About, + this.Menu_Unicode}); this.Menu_Options.Name = "Menu_Options"; this.Menu_Options.Size = new System.Drawing.Size(61, 20); this.Menu_Options.Text = "Options"; @@ -2659,7 +2661,7 @@ public void InitializeComponent() this.Menu_Language.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.CB_MainLanguage}); this.Menu_Language.Name = "Menu_Language"; - this.Menu_Language.Size = new System.Drawing.Size(139, 22); + this.Menu_Language.Size = new System.Drawing.Size(183, 22); this.Menu_Language.Text = "Language"; // // CB_MainLanguage @@ -2674,7 +2676,7 @@ public void InitializeComponent() this.Menu_About.Name = "Menu_About"; this.Menu_About.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.B))); this.Menu_About.ShowShortcutKeys = false; - this.Menu_About.Size = new System.Drawing.Size(139, 22); + this.Menu_About.Size = new System.Drawing.Size(183, 22); this.Menu_About.Text = "A&bout PKHeX"; this.Menu_About.Click += new System.EventHandler(this.mainmenuAbout); // @@ -3495,50 +3497,6 @@ public void InitializeComponent() this.B_OpenSecretBase.Visible = false; this.B_OpenSecretBase.Click += new System.EventHandler(this.B_OpenSecretBase_Click); // - // GB_SUBE - // - this.GB_SUBE.Controls.Add(this.subepkx1); - this.GB_SUBE.Controls.Add(this.subepkx2); - this.GB_SUBE.Controls.Add(this.subepkx3); - this.GB_SUBE.Location = new System.Drawing.Point(227, 136); - this.GB_SUBE.Name = "GB_SUBE"; - this.GB_SUBE.Size = new System.Drawing.Size(60, 60); - this.GB_SUBE.TabIndex = 27; - this.GB_SUBE.TabStop = false; - this.GB_SUBE.Text = "OldMan"; - // - // subepkx1 - // - this.subepkx1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.subepkx1.Location = new System.Drawing.Point(9, 18); - this.subepkx1.Name = "subepkx1"; - this.subepkx1.Size = new System.Drawing.Size(42, 32); - this.subepkx1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.subepkx1.TabIndex = 18; - this.subepkx1.TabStop = false; - this.subepkx1.Click += new System.EventHandler(this.slotModifier_Click); - this.subepkx1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); - // - // subepkx2 - // - this.subepkx2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.subepkx2.Location = new System.Drawing.Point(62, 19); - this.subepkx2.Name = "subepkx2"; - this.subepkx2.Size = new System.Drawing.Size(42, 34); - this.subepkx2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.subepkx2.TabIndex = 19; - this.subepkx2.TabStop = false; - // - // subepkx3 - // - this.subepkx3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.subepkx3.Location = new System.Drawing.Point(109, 19); - this.subepkx3.Name = "subepkx3"; - this.subepkx3.Size = new System.Drawing.Size(42, 34); - this.subepkx3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.subepkx3.TabIndex = 20; - this.subepkx3.TabStop = false; - // // GB_Daycare // this.GB_Daycare.Controls.Add(this.label4); @@ -3719,6 +3677,50 @@ public void InitializeComponent() this.L_ReadOnlyOther.Text = "This tab is read only."; this.L_ReadOnlyOther.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // + // GB_SUBE + // + this.GB_SUBE.Controls.Add(this.subepkx1); + this.GB_SUBE.Controls.Add(this.subepkx2); + this.GB_SUBE.Controls.Add(this.subepkx3); + this.GB_SUBE.Location = new System.Drawing.Point(227, 136); + this.GB_SUBE.Name = "GB_SUBE"; + this.GB_SUBE.Size = new System.Drawing.Size(60, 60); + this.GB_SUBE.TabIndex = 27; + this.GB_SUBE.TabStop = false; + this.GB_SUBE.Text = "OldMan"; + // + // subepkx1 + // + this.subepkx1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.subepkx1.Location = new System.Drawing.Point(9, 18); + this.subepkx1.Name = "subepkx1"; + this.subepkx1.Size = new System.Drawing.Size(42, 32); + this.subepkx1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; + this.subepkx1.TabIndex = 18; + this.subepkx1.TabStop = false; + this.subepkx1.Click += new System.EventHandler(this.slotModifier_Click); + this.subepkx1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pbBoxSlot_MouseDown); + // + // subepkx2 + // + this.subepkx2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.subepkx2.Location = new System.Drawing.Point(62, 19); + this.subepkx2.Name = "subepkx2"; + this.subepkx2.Size = new System.Drawing.Size(42, 34); + this.subepkx2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; + this.subepkx2.TabIndex = 19; + this.subepkx2.TabStop = false; + // + // subepkx3 + // + this.subepkx3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.subepkx3.Location = new System.Drawing.Point(109, 19); + this.subepkx3.Name = "subepkx3"; + this.subepkx3.Size = new System.Drawing.Size(42, 34); + this.subepkx3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; + this.subepkx3.TabIndex = 20; + this.subepkx3.TabStop = false; + // // Tab_Tools // this.Tab_Tools.Controls.Add(this.B_3DSSETemp); @@ -4015,6 +4017,13 @@ public void InitializeComponent() this.L_SAVINDEX.TabIndex = 16; this.L_SAVINDEX.Text = "0"; // + // Menu_Unicode + // + this.Menu_Unicode.Name = "Menu_Unicode"; + this.Menu_Unicode.Size = new System.Drawing.Size(183, 22); + this.Menu_Unicode.Text = "Toggle Unicode Text"; + this.Menu_Unicode.Click += new System.EventHandler(this.Menu_Unicode_Click); + // // Form1 // this.AllowDrop = true; @@ -4120,11 +4129,6 @@ public void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.ppkx5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.ppkx6)).EndInit(); this.Tab_Other.ResumeLayout(false); - this.GB_SUBE.ResumeLayout(false); - this.GB_SUBE.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.subepkx1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.subepkx2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.subepkx3)).EndInit(); this.GB_Daycare.ResumeLayout(false); this.GB_Daycare.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.dcpkx2)).EndInit(); @@ -4135,6 +4139,11 @@ public void InitializeComponent() this.GB_Fused.ResumeLayout(false); this.GB_Fused.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.fusedpkx)).EndInit(); + this.GB_SUBE.ResumeLayout(false); + this.GB_SUBE.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.subepkx1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.subepkx2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.subepkx3)).EndInit(); this.Tab_Tools.ResumeLayout(false); this.Tab_SAV.ResumeLayout(false); this.Tab_SAV.PerformLayout(); @@ -4447,6 +4456,7 @@ public void InitializeComponent() private System.Windows.Forms.MaskedTextBox MT_Level; private System.Windows.Forms.MaskedTextBox MT_Form; private System.Windows.Forms.Button B_OpenSecretBase; + private System.Windows.Forms.ToolStripMenuItem Menu_Unicode; } } diff --git a/PKX/f1-Main.cs b/PKX/f1-Main.cs index f35b54f74..b0f65b452 100644 --- a/PKX/f1-Main.cs +++ b/PKX/f1-Main.cs @@ -212,6 +212,7 @@ public Form1() public static int colorizedslot = 0; public static int largeWidth, shortWidth = 0; public static string eggname = ""; + public static string[] gendersymbols = { "♂", "♀", "-" }; public static string[] specieslist = { }; public static string[] movelist = { }; public static string[] itemlist = { }; @@ -1678,10 +1679,8 @@ private void populateFields(byte[] buff) CHK_IsEgg.Checked = Convert.ToBoolean(isegg); CHK_Nicknamed.Checked = Convert.ToBoolean(isnick); if (Convert.ToBoolean(otgender)) - { - Label_OTGender.Text = "♀"; - } - else Label_OTGender.Text = "♂"; + Label_OTGender.Text = gendersymbols[1]; + else Label_OTGender.Text = gendersymbols[0]; // Nidoran Gender Fixing Text if (!Convert.ToBoolean(isnick)) @@ -1754,8 +1753,8 @@ private void populateFields(byte[] buff) CB_MetLocation.SelectedValue = metloc; - if (notOTG) Label_CTGender.Text = "♀"; - else Label_CTGender.Text = "♂"; + if (notOTG) Label_CTGender.Text = gendersymbols[1]; + else Label_CTGender.Text = gendersymbols[0]; if (TB_OTt2.Text == "") Label_CTGender.Text = ""; TB_MetLevel.Text = metlevel.ToString(); @@ -1997,8 +1996,8 @@ public void setForms(int species, ComboBox cb) new { Text = forms[846], Value = 3 }, // Winter }; var form_gender = new[] { - new { Text = "♂", Value = 0 }, // Male - new { Text = "♀", Value = 1 }, // Female + new { Text = gendersymbols[0], Value = 0 }, // Male + new { Text = gendersymbols[1], Value = 1 }, // Female }; var form_therian = new[] { new { Text = forms[641], Value = 0 }, // Incarnate @@ -2188,11 +2187,11 @@ public void setForms(int species, ComboBox cb) private void setGenderLabel() { if (genderflag == 0) - Label_Gender.Text = "♂"; // Male + Label_Gender.Text = gendersymbols[0]; // Male else if (genderflag == 1) - Label_Gender.Text = "♀"; // Female - else - Label_Gender.Text = "-"; // Genderless + Label_Gender.Text = gendersymbols[1]; // Female + else + Label_Gender.Text = gendersymbols[2]; // Genderless } private void setMarkings() { @@ -2234,11 +2233,14 @@ private void Label_Gender_Click(object sender, EventArgs e) if (gt < 256) // If not a single gender(less) species: { - if (Label_Gender.Text == "♂") - Label_Gender.Text = "♀"; + if (PKX.getGender(Label_Gender.Text) == 0) // ♂ + Label_Gender.Text = gendersymbols[1]; // ♀ else - Label_Gender.Text = "♂"; + Label_Gender.Text = gendersymbols[0]; // ♂ } + + if (species == 668 || species == 592 || species == 593) + CB_Form.SelectedIndex = PKX.getGender(Label_Gender.Text); } private void Label_PPups_Click(object sender, EventArgs e) { @@ -2266,8 +2268,8 @@ private void Label_OT_Click(object sender, EventArgs e) // Set Gender Label int g6trgend = savefile[SaveGame.TrainerCard + 0x5 + savshift]; if (g6trgend == 1) - Label_OTGender.Text = "♀"; - else Label_OTGender.Text = "♂"; + Label_OTGender.Text = gendersymbols[1]; // ♀ + else Label_OTGender.Text = gendersymbols[0]; // ♂ // Get TID/SID TB_TID.Text = BitConverter.ToUInt16(savefile, SaveGame.TrainerCard + 0 + savshift).ToString(); @@ -2296,22 +2298,22 @@ private void Label_CT_Click(object sender, EventArgs e) // Set Gender Label int g6trgend = savefile[0x19405 + savindex * 0x7F000]; if (g6trgend == 1) - Label_CTGender.Text = "♀"; - else Label_CTGender.Text = "♂"; + Label_CTGender.Text = gendersymbols[1]; // ♀ + else Label_CTGender.Text = gendersymbols[0]; // ♂ } } private void Label_OTGender_Click(object sender, EventArgs e) { - if (Label_OTGender.Text == "♂") - Label_OTGender.Text = "♀"; - else Label_OTGender.Text = "♂"; + if (PKX.getGender(Label_OTGender.Text) == 0) // ♂ + Label_OTGender.Text = gendersymbols[1]; // ♀ + else Label_OTGender.Text = gendersymbols[0]; // ♂ } private void Label_CTGender_Click(object sender, EventArgs e) { if (Label_CTGender.Text == "") return; - else if (Label_CTGender.Text == "♂") - Label_CTGender.Text = "♀"; - else Label_CTGender.Text = "♂"; + else if (PKX.getGender(Label_CTGender.Text) == 0) // ♂ + Label_CTGender.Text = gendersymbols[1]; // ♀ + else Label_CTGender.Text = gendersymbols[0]; // ♂ } // Prompted Updates of PKX Functions // public void setCountry(object sender) @@ -2520,14 +2522,28 @@ private void updateIVs(object sender, EventArgs e) TB_IVTotal.Text = ivtotal.ToString(); // Potential Reading - if (ivtotal <= 90) - L_Potential.Text = "★☆☆☆"; - else if (ivtotal <= 120) - L_Potential.Text = "★★☆☆"; - else if (ivtotal <= 150) - L_Potential.Text = "★★★☆"; + if (!unicode) + { + if (ivtotal <= 90) + L_Potential.Text = "★☆☆☆"; + else if (ivtotal <= 120) + L_Potential.Text = "★★☆☆"; + else if (ivtotal <= 150) + L_Potential.Text = "★★★☆"; + else + L_Potential.Text = "★★★★"; + } else - L_Potential.Text = "★★★★"; + { + if (ivtotal <= 90) + L_Potential.Text = "+"; + else if (ivtotal <= 120) + L_Potential.Text = "++"; + else if (ivtotal <= 150) + L_Potential.Text = "+++"; + else + L_Potential.Text = "++++"; + } // Characteristic with PID%6 @@ -2682,10 +2698,10 @@ private void updateForm(object sender, EventArgs e) updateAbilityList(TB_AbilityNumber, Util.getIndex(CB_Species), CB_Ability, CB_Form); // If form has a single gender, account for it. - if (CB_Form.Text == "♂") - Label_Gender.Text = "♂"; - else if (CB_Form.Text == "♀") - Label_Gender.Text = "♀"; + if (PKX.getGender(CB_Form.Text) == 0) + Label_Gender.Text = gendersymbols[0]; + else if (PKX.getGender(CB_Form.Text) == 1) + Label_Gender.Text = gendersymbols[1]; } private void updatePP(object sender, EventArgs e) { @@ -3172,7 +3188,7 @@ private void updateNotOT(object sender, EventArgs e) buff[0x93] = 0; } else if (Label_CTGender.Text == "") - Label_CTGender.Text = "♂"; + Label_CTGender.Text = gendersymbols[0]; } private void updatePKRSCured(object sender, EventArgs e) { @@ -4053,7 +4069,8 @@ public byte[] preparepkx(byte[] buff) Array.Copy(BitConverter.GetBytes(0), 0, pkx, 0x4, 4); // 0 CHK for now // Block A - Array.Copy(BitConverter.GetBytes(Util.getIndex(CB_Species)), 0, pkx, 0x08, 2); // Species + int species = Util.getIndex(CB_Species); + Array.Copy(BitConverter.GetBytes(species), 0, pkx, 0x08, 2); // Species Array.Copy(BitConverter.GetBytes(Util.getIndex(CB_HeldItem)), 0, pkx, 0x0A, 2); // Held Item Array.Copy(BitConverter.GetBytes(Util.ToUInt32(TB_TID.Text)), 0, pkx, 0x0C, 2); // TID Array.Copy(BitConverter.GetBytes(Util.ToUInt32(TB_SID.Text)), 0, pkx, 0x0E, 2); // SID @@ -4064,8 +4081,7 @@ public byte[] preparepkx(byte[] buff) Array.Copy(BitConverter.GetBytes(Util.getHEXval(TB_PID)), 0, pkx, 0x18, 4); // PID pkx[0x1C] = (byte)((Util.getIndex(CB_Nature))); // Nature int fegform = (int)(Convert.ToInt32(CHK_Fateful.Checked)); // Fateful - fegform += (Convert.ToInt32(Label_Gender.Text == "♀") * 2); // Female Gender - fegform += (Convert.ToInt32(Label_Gender.Text == "-") * 4); // Genderless + fegform += (PKX.getGender(Label_Gender.Text) << 1); // Gender if (MT_Form.Enabled) fegform += (Math.Min(Convert.ToInt32(MT_Form.Text), 32) * 8); // Form else fegform += ((Util.getIndex(CB_Form)) * 8); pkx[0x1D] = (byte)fegform; @@ -4166,7 +4182,7 @@ public byte[] preparepkx(byte[] buff) Array.Copy(OT2, 0, pkx, 0x78, OT2.Length); //0x90-0xAF - pkx[0x92] = Convert.ToByte(Label_CTGender.Text == "♀"); + pkx[0x92] = Convert.ToByte(PKX.getGender(Label_CTGender.Text) == 1); //Plus more, set by MemoryAmie (already in buff) // Block D @@ -4213,7 +4229,7 @@ public byte[] preparepkx(byte[] buff) Array.Copy(BitConverter.GetBytes(met_location), 0, pkx, 0xDA, 2); // Met Location pkx[0xDC] = (byte)Util.getIndex(CB_Ball); - pkx[0xDD] = (byte)(((Util.ToInt32(TB_MetLevel.Text) & 0x7F) + (Convert.ToInt32(Label_OTGender.Text == "♀") << 7))); + pkx[0xDD] = (byte)(((Util.ToInt32(TB_MetLevel.Text) & 0x7F) + (Convert.ToInt32(PKX.getGender(Label_OTGender.Text) == 1) << 7))); pkx[0xDE] = (byte)(Util.ToInt32(CB_EncounterType.SelectedValue.ToString())); pkx[0xDF] = (byte)Util.getIndex(CB_GameOrigin); pkx[0xE0] = (byte)Util.getIndex(CB_Country); @@ -5468,7 +5484,7 @@ private void getSlotFiller(int offset, PictureBox pb) file = "_" + species.ToString(); if (altforms > 0) // Alt Form Handling file = file + "_" + altforms.ToString(); - else if ((species == 521) && (gender == 1)) // Unfezant + else if ((species == 521 || species == 668) && (gender == 1)) // Unfezant & Pyroar file = file = "_" + species.ToString() + "f"; } @@ -6248,6 +6264,22 @@ private void L_Save_Click(object sender, EventArgs e) openQuick(path); // load save } } + + bool unicode = false; + private void Menu_Unicode_Click(object sender, EventArgs e) + { + unicode = (gendersymbols[0] == "♂"); + if (unicode) + { + gendersymbols = new string[] { "M", "F", "-" }; + BTN_Shinytize.Text = "*"; + } + else + { + gendersymbols = new string[] { "♂", "♀", "-" }; + BTN_Shinytize.Text = "☆"; + } + } } #region Structs & Classes public class cbItem diff --git a/SAV/SAV_SecretBase.cs b/SAV/SAV_SecretBase.cs index 82cd8076f..db04a1987 100644 --- a/SAV/SAV_SecretBase.cs +++ b/SAV/SAV_SecretBase.cs @@ -431,8 +431,7 @@ private void saveFavPKM() pkm[0x14] = (byte)Util.getIndex(CB_Nature); int fegform = 0; - fegform += (Convert.ToInt32(Label_Gender.Text == "♀") * 2); // Female Gender - fegform += (Convert.ToInt32(Label_Gender.Text == "-") * 4); // Genderless + fegform += PKX.getGender(Label_Gender.Text) << 1; // Gender fegform += ((Util.getIndex(CB_Form)) * 8); pkm[0x15] = (byte)fegform; @@ -595,10 +594,10 @@ private void updateForm(object sender, EventArgs e) m_parent.updateAbilityList(MT_AbilNo, Util.getIndex(CB_Species), CB_Ability, CB_Form); // If form has a single gender, account for it. - if (CB_Form.Text == "♂") - Label_Gender.Text = "♂"; - else if (CB_Form.Text == "♀") - Label_Gender.Text = "♀"; + if (PKX.getGender(CB_Form.Text) == 0) // ♂ + Label_Gender.Text = Form1.gendersymbols[0]; // ♂ + else if (PKX.getGender(CB_Form.Text) == 1) // ♀ + Label_Gender.Text = Form1.gendersymbols[1]; // ♀ } private int species; private int gt; private int genderflag; private void Label_Gender_Click(object sender, EventArgs e) @@ -613,21 +612,21 @@ private void Label_Gender_Click(object sender, EventArgs e) if (gt < 256) // If not a single gender(less) species: { - if (Label_Gender.Text == "♂") - Label_Gender.Text = "♀"; + if (PKX.getGender(Label_Gender.Text) == 0) + Label_Gender.Text = Form1.gendersymbols[1]; else - Label_Gender.Text = "♂"; + Label_Gender.Text = Form1.gendersymbols[0]; } } private void setGenderLabel() { if (genderflag == 0) // Gender = Male - Label_Gender.Text = "♂"; + Label_Gender.Text = Form1.gendersymbols[0]; else if (genderflag == 1) // Gender = Female - Label_Gender.Text = "♀"; - - else Label_Gender.Text = "-"; + Label_Gender.Text = Form1.gendersymbols[1]; + + else Label_Gender.Text = Form1.gendersymbols[2]; } } }