diff --git a/pkNX.WinForms/Dumping/DumperPLA.Designer.cs b/pkNX.WinForms/Dumping/DumperPLA.Designer.cs index bf657ed3..a48ef26b 100644 --- a/pkNX.WinForms/Dumping/DumperPLA.Designer.cs +++ b/pkNX.WinForms/Dumping/DumperPLA.Designer.cs @@ -32,7 +32,6 @@ private void InitializeComponent() this.Tab_General = new System.Windows.Forms.TabPage(); this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); this.B_ParsePKMDetails = new System.Windows.Forms.Button(); - this.B_DumpTrainers = new System.Windows.Forms.Button(); this.B_Wild = new System.Windows.Forms.Button(); this.B_Static = new System.Windows.Forms.Button(); this.B_Gift = new System.Windows.Forms.Button(); @@ -96,7 +95,6 @@ private void InitializeComponent() // flowLayoutPanel1 // this.flowLayoutPanel1.Controls.Add(this.B_ParsePKMDetails); - this.flowLayoutPanel1.Controls.Add(this.B_DumpTrainers); this.flowLayoutPanel1.Controls.Add(this.B_Wild); this.flowLayoutPanel1.Controls.Add(this.B_Static); this.flowLayoutPanel1.Controls.Add(this.B_Gift); @@ -122,19 +120,9 @@ private void InitializeComponent() this.B_ParsePKMDetails.UseVisualStyleBackColor = true; this.B_ParsePKMDetails.Click += new System.EventHandler(this.B_ParsePersonal_Click); // - // B_DumpTrainers - // - this.B_DumpTrainers.Location = new System.Drawing.Point(132, 3); - this.B_DumpTrainers.Name = "B_DumpTrainers"; - this.B_DumpTrainers.Size = new System.Drawing.Size(123, 55); - this.B_DumpTrainers.TabIndex = 2; - this.B_DumpTrainers.Text = "Trainers"; - this.B_DumpTrainers.UseVisualStyleBackColor = true; - this.B_DumpTrainers.Click += new System.EventHandler(this.B_DumpTrainers_Click); - // // B_Wild // - this.B_Wild.Location = new System.Drawing.Point(261, 3); + this.B_Wild.Location = new System.Drawing.Point(132, 3); this.B_Wild.Name = "B_Wild"; this.B_Wild.Size = new System.Drawing.Size(123, 55); this.B_Wild.TabIndex = 11; @@ -144,7 +132,7 @@ private void InitializeComponent() // // B_Static // - this.B_Static.Location = new System.Drawing.Point(3, 64); + this.B_Static.Location = new System.Drawing.Point(261, 3); this.B_Static.Name = "B_Static"; this.B_Static.Size = new System.Drawing.Size(123, 55); this.B_Static.TabIndex = 10; @@ -154,7 +142,7 @@ private void InitializeComponent() // // B_Gift // - this.B_Gift.Location = new System.Drawing.Point(132, 64); + this.B_Gift.Location = new System.Drawing.Point(3, 64); this.B_Gift.Name = "B_Gift"; this.B_Gift.Size = new System.Drawing.Size(123, 55); this.B_Gift.TabIndex = 9; @@ -164,7 +152,7 @@ private void InitializeComponent() // // B_ItemInfo // - this.B_ItemInfo.Location = new System.Drawing.Point(261, 64); + this.B_ItemInfo.Location = new System.Drawing.Point(132, 64); this.B_ItemInfo.Name = "B_ItemInfo"; this.B_ItemInfo.Size = new System.Drawing.Size(123, 55); this.B_ItemInfo.TabIndex = 6; @@ -174,7 +162,7 @@ private void InitializeComponent() // // B_Moves // - this.B_Moves.Location = new System.Drawing.Point(3, 125); + this.B_Moves.Location = new System.Drawing.Point(261, 64); this.B_Moves.Name = "B_Moves"; this.B_Moves.Size = new System.Drawing.Size(123, 55); this.B_Moves.TabIndex = 7; @@ -184,7 +172,7 @@ private void InitializeComponent() // // B_Details // - this.B_Details.Location = new System.Drawing.Point(132, 125); + this.B_Details.Location = new System.Drawing.Point(3, 125); this.B_Details.Name = "B_Details"; this.B_Details.Size = new System.Drawing.Size(123, 55); this.B_Details.TabIndex = 15; @@ -194,7 +182,7 @@ private void InitializeComponent() // // B_Placement // - this.B_Placement.Location = new System.Drawing.Point(261, 125); + this.B_Placement.Location = new System.Drawing.Point(132, 125); this.B_Placement.Name = "B_Placement"; this.B_Placement.Size = new System.Drawing.Size(123, 55); this.B_Placement.TabIndex = 18; @@ -204,7 +192,7 @@ private void InitializeComponent() // // B_Resident // - this.B_Resident.Location = new System.Drawing.Point(3, 186); + this.B_Resident.Location = new System.Drawing.Point(261, 125); this.B_Resident.Name = "B_Resident"; this.B_Resident.Size = new System.Drawing.Size(123, 55); this.B_Resident.TabIndex = 19; @@ -214,7 +202,7 @@ private void InitializeComponent() // // B_DumpDrops // - this.B_DumpDrops.Location = new System.Drawing.Point(132, 186); + this.B_DumpDrops.Location = new System.Drawing.Point(3, 186); this.B_DumpDrops.Name = "B_DumpDrops"; this.B_DumpDrops.Size = new System.Drawing.Size(123, 55); this.B_DumpDrops.TabIndex = 20; @@ -428,7 +416,6 @@ private void InitializeComponent() private System.Windows.Forms.TabPage Tab_General; private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1; private System.Windows.Forms.Button B_ParsePKMDetails; - private System.Windows.Forms.Button B_DumpTrainers; private System.Windows.Forms.Button B_ItemInfo; private System.Windows.Forms.Button B_Moves; private System.Windows.Forms.TabPage Tab_PKHeX; diff --git a/pkNX.WinForms/Dumping/DumperPLA.cs b/pkNX.WinForms/Dumping/DumperPLA.cs index 3dd36df5..d9f45da7 100644 --- a/pkNX.WinForms/Dumping/DumperPLA.cs +++ b/pkNX.WinForms/Dumping/DumperPLA.cs @@ -29,12 +29,6 @@ private void B_ParsePKMDetails_Click(object sender, EventArgs e) System.Media.SystemSounds.Asterisk.Play(); } - private void B_DumpTrainers_Click(object sender, EventArgs e) - { - Dumper.DumpTrainers(); - System.Media.SystemSounds.Asterisk.Play(); - } - private void B_Wild_Click(object sender, EventArgs e) { Dumper.DumpWilds(); diff --git a/pkNX.WinForms/Dumping/GameDumperPLA.cs b/pkNX.WinForms/Dumping/GameDumperPLA.cs index 79cbc6e0..5241ce10 100644 --- a/pkNX.WinForms/Dumping/GameDumperPLA.cs +++ b/pkNX.WinForms/Dumping/GameDumperPLA.cs @@ -225,48 +225,6 @@ private TrainerEditor GetTrainerEditor() return editor; } - public void DumpTrainers() - { - var trc = ROM.GetStrings(TextName.TrainerClasses); - var trn = ROM.GetStrings(TextName.TrainerNames); - var m = ROM.GetStrings(TextName.MoveNames); - var s = ROM.GetStrings(TextName.SpeciesNames); - - var tr = GetTrainerEditor(); - var result = new List(); - for (int i = 0; i < tr.Length; i++) - { - var t = tr[i]; - - // some battles with Avery and Klara have out of bounds trclasses -- set back to "Pokémon Trainer" - if (t.Self.Class > trc.Length) - t.Self.Class = 1; - - result.Add($"{i:000} - {trc[t.Self.Class]}: {trn[i]}"); - const int MoneyScalar = 80; - result.Add($"AI: {t.Self.AI} | Mode: {t.Self.Mode} | Money: {t.Self.Money * MoneyScalar}"); - result.Add($"Pokémon Count: {t.Self.NumPokemon}"); - - result.Add("---"); - for (int j = 0; j < t.Team.Count; j++) - { - IEnumerable moves = t.Team[j].Moves.Where(z => z != 0).Select(z => m[z]).ToArray(); - if (!moves.Any()) moves = new[] { "Default Level Up" }; - int form = t.Team[j].Form; - var formstr = form != 0 ? $"-{form}" : ""; - var str = $"{j + 1}: Lv{t.Team[j].Level:00} {s[t.Team[j].Species]}{formstr} : {string.Join(" / ", moves)}"; - result.Add(str); - } - result.Add("---"); - - result.Add("========="); - result.Add(""); - } - - var outname = GetPath("trparse.txt"); - File.WriteAllLines(outname, result); - } - public void DumpDrops() { var names = ROM.GetStrings(TextName.ItemNames);