From ef9c07d7ad02bc9bece5d32a4c1462695ab23276 Mon Sep 17 00:00:00 2001 From: AdAstra-LD <76622070+AdAstra-LD@users.noreply.github.com> Date: Sun, 1 Aug 2021 02:53:22 +0200 Subject: [PATCH] Turned Pokemon Party into a class [Trainer Editor] - Removed useless Games folder from Ekona\Images --- DS_Map/Main Window.Designer.cs | 402 ++++++++++++++--------------- DS_Map/Main Window.cs | 216 ++++++++-------- DS_Map/Main Window.resx | 2 +- DS_Map/ROMFiles/TrainerFile.cs | 62 +++-- DS_Map/ROMToolboxDialog.cs | 6 +- Images/Images/Games/NARUTO_POTN.cs | 131 ---------- Images/Images/Games/PCT.cs | 159 ------------ Images/Images/Images.csproj | 2 - 8 files changed, 362 insertions(+), 618 deletions(-) delete mode 100644 Images/Images/Games/NARUTO_POTN.cs delete mode 100644 Images/Images/Games/PCT.cs diff --git a/DS_Map/Main Window.Designer.cs b/DS_Map/Main Window.Designer.cs index 6a5a759..16cd298 100644 --- a/DS_Map/Main Window.Designer.cs +++ b/DS_Map/Main Window.Designer.cs @@ -30,8 +30,6 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainProgram)); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); @@ -47,6 +45,8 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle(); this.mainTabControl = new System.Windows.Forms.TabControl(); this.headerEditorTabPage = new System.Windows.Forms.TabPage(); this.removeLastHeaderBTN = new System.Windows.Forms.Button(); @@ -184,8 +184,11 @@ this.matrixNameLabel = new System.Windows.Forms.Label(); this.matrixTabControl = new System.Windows.Forms.TabControl(); this.headersTabPage = new System.Windows.Forms.TabPage(); + this.headersGridView = new DSPRE.DataGridViewDoubleBuffered(); this.heightsTabPage = new System.Windows.Forms.TabPage(); + this.heightsGridView = new DSPRE.DataGridViewDoubleBuffered(); this.mapFilesTabPage = new System.Windows.Forms.TabPage(); + this.mapFilesGridView = new DSPRE.DataGridViewDoubleBuffered(); this.matrixNameTextBox = new System.Windows.Forms.TextBox(); this.heightUpDown = new System.Windows.Forms.NumericUpDown(); this.widthUpDown = new System.Windows.Forms.NumericUpDown(); @@ -575,9 +578,7 @@ this.importReplacePropertiesButton = new System.Windows.Forms.Button(); this.exportPropertiesButton = new System.Windows.Forms.Button(); this.exportPartyButton = new System.Windows.Forms.Button(); - this.partyCountUpDown = new System.Windows.Forms.NumericUpDown(); this.addTrainerButton = new System.Windows.Forms.Button(); - this.label63 = new System.Windows.Forms.Label(); this.groupBox28 = new System.Windows.Forms.GroupBox(); this.party6GroupBox = new System.Windows.Forms.GroupBox(); this.label60 = new System.Windows.Forms.Label(); @@ -707,7 +708,9 @@ this.trainerMovesCheckBox = new System.Windows.Forms.CheckBox(); this.trainerDoubleCheckBox = new System.Windows.Forms.CheckBox(); this.trainerNameTextBox = new System.Windows.Forms.TextBox(); + this.partyCountUpDown = new System.Windows.Forms.NumericUpDown(); this.label44 = new System.Windows.Forms.Label(); + this.label63 = new System.Windows.Forms.Label(); this.label43 = new System.Windows.Forms.Label(); this.trainerClassListBox = new System.Windows.Forms.ListBox(); this.label42 = new System.Windows.Forms.Label(); @@ -766,9 +769,6 @@ this.spawnEditorToolStripButton = new System.Windows.Forms.ToolStripButton(); this.versionLabel = new System.Windows.Forms.Label(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); - this.headersGridView = new DSPRE.DataGridViewDoubleBuffered(); - this.heightsGridView = new DSPRE.DataGridViewDoubleBuffered(); - this.mapFilesGridView = new DSPRE.DataGridViewDoubleBuffered(); this.mainTabControl.SuspendLayout(); this.headerEditorTabPage.SuspendLayout(); this.worldmapCoordsGroupBox.SuspendLayout(); @@ -800,8 +800,11 @@ this.matrixEditorTabPage.SuspendLayout(); this.matrixTabControl.SuspendLayout(); this.headersTabPage.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.headersGridView)).BeginInit(); this.heightsTabPage.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.heightsGridView)).BeginInit(); this.mapFilesTabPage.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.mapFilesGridView)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.heightUpDown)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.widthUpDown)).BeginInit(); this.mapEditorTabPage.SuspendLayout(); @@ -927,7 +930,6 @@ this.cameraEditorTabPage.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.cameraEditorDataGridView)).BeginInit(); this.trainerEditorTabPage.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.partyCountUpDown)).BeginInit(); this.groupBox28.SuspendLayout(); this.party6GroupBox.SuspendLayout(); this.groupBox40.SuspendLayout(); @@ -975,6 +977,7 @@ this.groupBox25.SuspendLayout(); this.TrainerAIGroupBox.SuspendLayout(); this.trainerItemsGroupBox.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.partyCountUpDown)).BeginInit(); this.tableEditorTabPage.SuspendLayout(); this.conditionalMusicGroupBox.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.musicIDconditionalMusicUpDown)).BeginInit(); @@ -983,9 +986,6 @@ this.menuStrip1.SuspendLayout(); this.statusStrip1.SuspendLayout(); this.mainToolStrip.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.headersGridView)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.heightsGridView)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.mapFilesGridView)).BeginInit(); this.SuspendLayout(); // // mainTabControl @@ -2623,6 +2623,61 @@ this.headersTabPage.Text = "Map Headers"; this.headersTabPage.UseVisualStyleBackColor = true; // + // headersGridView + // + this.headersGridView.AllowUserToAddRows = false; + this.headersGridView.AllowUserToDeleteRows = false; + this.headersGridView.AllowUserToResizeColumns = false; + this.headersGridView.AllowUserToResizeRows = false; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.headersGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + this.headersGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle2.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.headersGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; + this.headersGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle3.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.Format = "D4"; + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.headersGridView.DefaultCellStyle = dataGridViewCellStyle3; + this.headersGridView.Location = new System.Drawing.Point(0, 0); + this.headersGridView.MultiSelect = false; + this.headersGridView.Name = "headersGridView"; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle4.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.headersGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle4; + this.headersGridView.RowHeadersWidth = 50; + this.headersGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle5.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.headersGridView.RowsDefaultCellStyle = dataGridViewCellStyle5; + this.headersGridView.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.headersGridView.RowTemplate.Height = 18; + this.headersGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; + this.headersGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; + this.headersGridView.ShowCellErrors = false; + this.headersGridView.Size = new System.Drawing.Size(1032, 576); + this.headersGridView.TabIndex = 1; + this.headersGridView.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.headersGridView_CellFormatting); + this.headersGridView.CellMouseDoubleClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.headersGridView_CellMouseDoubleClick); + this.headersGridView.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.headersGridView_CellValueChanged); + this.headersGridView.SelectionChanged += new System.EventHandler(this.headersGridView_SelectionChanged); + // // heightsTabPage // this.heightsTabPage.Controls.Add(this.heightsGridView); @@ -2633,6 +2688,59 @@ this.heightsTabPage.Text = "Map Heights"; this.heightsTabPage.UseVisualStyleBackColor = true; // + // heightsGridView + // + this.heightsGridView.AllowUserToAddRows = false; + this.heightsGridView.AllowUserToDeleteRows = false; + this.heightsGridView.AllowUserToResizeColumns = false; + this.heightsGridView.AllowUserToResizeRows = false; + dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.heightsGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle6; + this.heightsGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; + dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle7.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.heightsGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7; + this.heightsGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle8.Font = new System.Drawing.Font("Tahoma", 8.25F); + dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle8.Format = "D2"; + dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.heightsGridView.DefaultCellStyle = dataGridViewCellStyle8; + this.heightsGridView.Location = new System.Drawing.Point(0, 0); + this.heightsGridView.MultiSelect = false; + this.heightsGridView.Name = "heightsGridView"; + dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle9.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.heightsGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle9; + this.heightsGridView.RowHeadersWidth = 50; + this.heightsGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; + dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle10.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.heightsGridView.RowsDefaultCellStyle = dataGridViewCellStyle10; + this.heightsGridView.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.heightsGridView.RowTemplate.Height = 18; + this.heightsGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; + this.heightsGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; + this.heightsGridView.Size = new System.Drawing.Size(1032, 576); + this.heightsGridView.TabIndex = 2; + this.heightsGridView.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.heightsGridView_CellFormatting); + this.heightsGridView.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.heightsGridView_CellValueChanged); + this.heightsGridView.SelectionChanged += new System.EventHandler(this.heightsGridView_SelectionChanged); + // // mapFilesTabPage // this.mapFilesTabPage.Controls.Add(this.mapFilesGridView); @@ -2643,6 +2751,60 @@ this.mapFilesTabPage.Text = "Map Files"; this.mapFilesTabPage.UseVisualStyleBackColor = true; // + // mapFilesGridView + // + this.mapFilesGridView.AllowUserToAddRows = false; + this.mapFilesGridView.AllowUserToDeleteRows = false; + this.mapFilesGridView.AllowUserToResizeColumns = false; + this.mapFilesGridView.AllowUserToResizeRows = false; + dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.mapFilesGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle11; + this.mapFilesGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; + dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle12.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.mapFilesGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle12; + this.mapFilesGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle13.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle13.Format = "D4"; + dataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.mapFilesGridView.DefaultCellStyle = dataGridViewCellStyle13; + this.mapFilesGridView.Location = new System.Drawing.Point(0, 0); + this.mapFilesGridView.MultiSelect = false; + this.mapFilesGridView.Name = "mapFilesGridView"; + dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle14.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle14.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.mapFilesGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle14; + this.mapFilesGridView.RowHeadersWidth = 50; + this.mapFilesGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; + dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle15.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.mapFilesGridView.RowsDefaultCellStyle = dataGridViewCellStyle15; + this.mapFilesGridView.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.mapFilesGridView.RowTemplate.Height = 18; + this.mapFilesGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; + this.mapFilesGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; + this.mapFilesGridView.Size = new System.Drawing.Size(1032, 576); + this.mapFilesGridView.TabIndex = 2; + this.mapFilesGridView.CellContentDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.mapFilesGridView_CellMouseDoubleClick); + this.mapFilesGridView.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.mapFilesGridView_CellFormatting); + this.mapFilesGridView.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.mapFilesGridView_CellValueChanged); + this.mapFilesGridView.SelectionChanged += new System.EventHandler(this.mapFilesGridView_SelectionChanged); + // // matrixNameTextBox // this.matrixNameTextBox.Location = new System.Drawing.Point(13, 73); @@ -7443,7 +7605,7 @@ // this.importReplacePartyButton.Image = global::DSPRE.Properties.Resources.importArrow; this.importReplacePartyButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.importReplacePartyButton.Location = new System.Drawing.Point(840, 22); + this.importReplacePartyButton.Location = new System.Drawing.Point(890, 20); this.importReplacePartyButton.Name = "importReplacePartyButton"; this.importReplacePartyButton.Size = new System.Drawing.Size(87, 52); this.importReplacePartyButton.TabIndex = 41; @@ -7482,7 +7644,7 @@ // this.exportPartyButton.Image = global::DSPRE.Properties.Resources.exportArrow; this.exportPartyButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.exportPartyButton.Location = new System.Drawing.Point(754, 22); + this.exportPartyButton.Location = new System.Drawing.Point(804, 20); this.exportPartyButton.Name = "exportPartyButton"; this.exportPartyButton.Size = new System.Drawing.Size(84, 52); this.exportPartyButton.TabIndex = 38; @@ -7491,19 +7653,6 @@ this.exportPartyButton.UseVisualStyleBackColor = true; this.exportPartyButton.Click += new System.EventHandler(this.exportPartyButton_Click); // - // partyCountUpDown - // - this.partyCountUpDown.Location = new System.Drawing.Point(340, 99); - this.partyCountUpDown.Maximum = new decimal(new int[] { - 6, - 0, - 0, - 0}); - this.partyCountUpDown.Name = "partyCountUpDown"; - this.partyCountUpDown.Size = new System.Drawing.Size(41, 20); - this.partyCountUpDown.TabIndex = 33; - this.partyCountUpDown.ValueChanged += new System.EventHandler(this.partyCountUpDown_ValueChanged); - // // addTrainerButton // this.addTrainerButton.Image = global::DSPRE.Properties.Resources.addIcon; @@ -7517,15 +7666,6 @@ this.addTrainerButton.UseVisualStyleBackColor = true; this.addTrainerButton.Click += new System.EventHandler(this.addTrainerButton_Click); // - // label63 - // - this.label63.AutoSize = true; - this.label63.Location = new System.Drawing.Point(333, 83); - this.label63.Name = "label63"; - this.label63.Size = new System.Drawing.Size(57, 13); - this.label63.TabIndex = 34; - this.label63.Text = "Party Slots"; - // // groupBox28 // this.groupBox28.Controls.Add(this.party6GroupBox); @@ -8931,6 +9071,19 @@ this.trainerNameTextBox.Size = new System.Drawing.Size(152, 20); this.trainerNameTextBox.TabIndex = 22; // + // partyCountUpDown + // + this.partyCountUpDown.Location = new System.Drawing.Point(340, 99); + this.partyCountUpDown.Maximum = new decimal(new int[] { + 6, + 0, + 0, + 0}); + this.partyCountUpDown.Name = "partyCountUpDown"; + this.partyCountUpDown.Size = new System.Drawing.Size(41, 20); + this.partyCountUpDown.TabIndex = 33; + this.partyCountUpDown.ValueChanged += new System.EventHandler(this.partyCountUpDown_ValueChanged); + // // label44 // this.label44.AutoSize = true; @@ -8940,6 +9093,15 @@ this.label44.TabIndex = 21; this.label44.Text = "Trainer Name"; // + // label63 + // + this.label63.AutoSize = true; + this.label63.Location = new System.Drawing.Point(333, 83); + this.label63.Name = "label63"; + this.label63.Size = new System.Drawing.Size(57, 13); + this.label63.TabIndex = 34; + this.label63.Text = "Party Slots"; + // // label43 // this.label43.AutoSize = true; @@ -9560,168 +9722,6 @@ this.versionLabel.TabIndex = 9; this.versionLabel.Text = "ROM:"; // - // headersGridView - // - this.headersGridView.AllowUserToAddRows = false; - this.headersGridView.AllowUserToDeleteRows = false; - this.headersGridView.AllowUserToResizeColumns = false; - this.headersGridView.AllowUserToResizeRows = false; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.headersGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; - this.headersGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle2.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.headersGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; - this.headersGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle3.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle3.Format = "D4"; - dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.headersGridView.DefaultCellStyle = dataGridViewCellStyle3; - this.headersGridView.Location = new System.Drawing.Point(0, 0); - this.headersGridView.MultiSelect = false; - this.headersGridView.Name = "headersGridView"; - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle4.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.headersGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle4; - this.headersGridView.RowHeadersWidth = 50; - this.headersGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle5.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.headersGridView.RowsDefaultCellStyle = dataGridViewCellStyle5; - this.headersGridView.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.headersGridView.RowTemplate.Height = 18; - this.headersGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.headersGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; - this.headersGridView.ShowCellErrors = false; - this.headersGridView.Size = new System.Drawing.Size(1032, 576); - this.headersGridView.TabIndex = 1; - this.headersGridView.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.headersGridView_CellFormatting); - this.headersGridView.CellMouseDoubleClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.headersGridView_CellMouseDoubleClick); - this.headersGridView.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.headersGridView_CellValueChanged); - this.headersGridView.SelectionChanged += new System.EventHandler(this.headersGridView_SelectionChanged); - // - // heightsGridView - // - this.heightsGridView.AllowUserToAddRows = false; - this.heightsGridView.AllowUserToDeleteRows = false; - this.heightsGridView.AllowUserToResizeColumns = false; - this.heightsGridView.AllowUserToResizeRows = false; - dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.heightsGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle6; - this.heightsGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle7.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.heightsGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7; - this.heightsGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle8.Font = new System.Drawing.Font("Tahoma", 8.25F); - dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle8.Format = "D2"; - dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.heightsGridView.DefaultCellStyle = dataGridViewCellStyle8; - this.heightsGridView.Location = new System.Drawing.Point(0, 0); - this.heightsGridView.MultiSelect = false; - this.heightsGridView.Name = "heightsGridView"; - dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle9.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.heightsGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle9; - this.heightsGridView.RowHeadersWidth = 50; - this.heightsGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; - dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle10.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.heightsGridView.RowsDefaultCellStyle = dataGridViewCellStyle10; - this.heightsGridView.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.heightsGridView.RowTemplate.Height = 18; - this.heightsGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.heightsGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; - this.heightsGridView.Size = new System.Drawing.Size(1032, 576); - this.heightsGridView.TabIndex = 2; - this.heightsGridView.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.heightsGridView_CellFormatting); - this.heightsGridView.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.heightsGridView_CellValueChanged); - this.heightsGridView.SelectionChanged += new System.EventHandler(this.heightsGridView_SelectionChanged); - // - // mapFilesGridView - // - this.mapFilesGridView.AllowUserToAddRows = false; - this.mapFilesGridView.AllowUserToDeleteRows = false; - this.mapFilesGridView.AllowUserToResizeColumns = false; - this.mapFilesGridView.AllowUserToResizeRows = false; - dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.mapFilesGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle11; - this.mapFilesGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle12.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.mapFilesGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle12; - this.mapFilesGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle13.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle13.Format = "D4"; - dataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.mapFilesGridView.DefaultCellStyle = dataGridViewCellStyle13; - this.mapFilesGridView.Location = new System.Drawing.Point(0, 0); - this.mapFilesGridView.MultiSelect = false; - this.mapFilesGridView.Name = "mapFilesGridView"; - dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle14.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle14.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.mapFilesGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle14; - this.mapFilesGridView.RowHeadersWidth = 50; - this.mapFilesGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; - dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle15.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.mapFilesGridView.RowsDefaultCellStyle = dataGridViewCellStyle15; - this.mapFilesGridView.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.mapFilesGridView.RowTemplate.Height = 18; - this.mapFilesGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.mapFilesGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; - this.mapFilesGridView.Size = new System.Drawing.Size(1032, 576); - this.mapFilesGridView.TabIndex = 2; - this.mapFilesGridView.CellContentDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.mapFilesGridView_CellMouseDoubleClick); - this.mapFilesGridView.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.mapFilesGridView_CellFormatting); - this.mapFilesGridView.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.mapFilesGridView_CellValueChanged); - this.mapFilesGridView.SelectionChanged += new System.EventHandler(this.mapFilesGridView_SelectionChanged); - // // MainProgram // this.AllowDrop = true; @@ -9784,8 +9784,11 @@ this.matrixEditorTabPage.PerformLayout(); this.matrixTabControl.ResumeLayout(false); this.headersTabPage.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.headersGridView)).EndInit(); this.heightsTabPage.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.heightsGridView)).EndInit(); this.mapFilesTabPage.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.mapFilesGridView)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.heightUpDown)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.widthUpDown)).EndInit(); this.mapEditorTabPage.ResumeLayout(false); @@ -9949,7 +9952,6 @@ ((System.ComponentModel.ISupportInitialize)(this.cameraEditorDataGridView)).EndInit(); this.trainerEditorTabPage.ResumeLayout(false); this.trainerEditorTabPage.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.partyCountUpDown)).EndInit(); this.groupBox28.ResumeLayout(false); this.party6GroupBox.ResumeLayout(false); this.party6GroupBox.PerformLayout(); @@ -10006,6 +10008,7 @@ this.TrainerAIGroupBox.ResumeLayout(false); this.TrainerAIGroupBox.PerformLayout(); this.trainerItemsGroupBox.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.partyCountUpDown)).EndInit(); this.tableEditorTabPage.ResumeLayout(false); this.conditionalMusicGroupBox.ResumeLayout(false); this.conditionalMusicGroupBox.PerformLayout(); @@ -10018,9 +10021,6 @@ this.statusStrip1.PerformLayout(); this.mainToolStrip.ResumeLayout(false); this.mainToolStrip.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.headersGridView)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.heightsGridView)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.mapFilesGridView)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/DS_Map/Main Window.cs b/DS_Map/Main Window.cs index 86b97d9..564b01f 100644 --- a/DS_Map/Main Window.cs +++ b/DS_Map/Main Window.cs @@ -6690,16 +6690,16 @@ namespace DSPRE { #endregion #region TrainerEditor - private List PartyPokemonComponentList = new List(); - private List PartyItemComponentList = new List(); - private List PartyLevelComponentList = new List(); - private List PartyIVComponentList = new List(); - private List PartyBallComponentList = new List(); - private List PartyFirstMoveComponentList = new List(); - private List PartySecondMoveComponentList = new List(); - private List PartyThirdMoveComponentList = new List(); - private List PartyFourthMoveComponentList = new List(); - private List PartyGroupComponentList = new List(); + private List partyPokemonComponentList = new List(); + private List partyItemComponentList = new List(); + private List partyLevelComponentList = new List(); + private List partyIVComponentList = new List(); + private List partyBallComponentList = new List(); + private List partyFirstMoveComponentList = new List(); + private List partySecondMoveComponentList = new List(); + private List partyThirdMoveComponentList = new List(); + private List partyFourthMoveComponentList = new List(); + private List partyGroupComponentList = new List(); TrainerFile currentTrainerFile; PaletteBase pal; @@ -6746,85 +6746,85 @@ namespace DSPRE { DSUtils.TryUnpackNarcs(new List { DirNames.trainerProperties, DirNames.trainerParty, DirNames.trainerGraphics, DirNames.textArchives }); - PartyPokemonComponentList.Clear(); - PartyPokemonComponentList.Add(partyPokemon1ComboBox); - PartyPokemonComponentList.Add(partyPokemon2ComboBox); - PartyPokemonComponentList.Add(partyPokemon3ComboBox); - PartyPokemonComponentList.Add(partyPokemon4ComboBox); - PartyPokemonComponentList.Add(partyPokemon5ComboBox); - PartyPokemonComponentList.Add(partyPokemon6ComboBox); + partyPokemonComponentList.Clear(); + partyPokemonComponentList.Add(partyPokemon1ComboBox); + partyPokemonComponentList.Add(partyPokemon2ComboBox); + partyPokemonComponentList.Add(partyPokemon3ComboBox); + partyPokemonComponentList.Add(partyPokemon4ComboBox); + partyPokemonComponentList.Add(partyPokemon5ComboBox); + partyPokemonComponentList.Add(partyPokemon6ComboBox); - PartyItemComponentList.Clear(); - PartyItemComponentList.Add(partyItem1ComboBox); - PartyItemComponentList.Add(partyItem2ComboBox); - PartyItemComponentList.Add(partyItem3ComboBox); - PartyItemComponentList.Add(partyItem4ComboBox); - PartyItemComponentList.Add(partyItem5ComboBox); - PartyItemComponentList.Add(partyItem6ComboBox); + partyItemComponentList.Clear(); + partyItemComponentList.Add(partyItem1ComboBox); + partyItemComponentList.Add(partyItem2ComboBox); + partyItemComponentList.Add(partyItem3ComboBox); + partyItemComponentList.Add(partyItem4ComboBox); + partyItemComponentList.Add(partyItem5ComboBox); + partyItemComponentList.Add(partyItem6ComboBox); - PartyLevelComponentList.Clear(); - PartyLevelComponentList.Add(partyLevel1UpDown); - PartyLevelComponentList.Add(partyLevel2UpDown); - PartyLevelComponentList.Add(partyLevel3UpDown); - PartyLevelComponentList.Add(partyLevel4UpDown); - PartyLevelComponentList.Add(partyLevel5UpDown); - PartyLevelComponentList.Add(partyLevel6UpDown); + partyLevelComponentList.Clear(); + partyLevelComponentList.Add(partyLevel1UpDown); + partyLevelComponentList.Add(partyLevel2UpDown); + partyLevelComponentList.Add(partyLevel3UpDown); + partyLevelComponentList.Add(partyLevel4UpDown); + partyLevelComponentList.Add(partyLevel5UpDown); + partyLevelComponentList.Add(partyLevel6UpDown); - PartyIVComponentList.Clear(); - PartyIVComponentList.Add(partyIV1UpDown); - PartyIVComponentList.Add(partyIV2UpDown); - PartyIVComponentList.Add(partyIV3UpDown); - PartyIVComponentList.Add(partyIV4UpDown); - PartyIVComponentList.Add(partyIV5UpDown); - PartyIVComponentList.Add(partyIV6UpDown); + partyIVComponentList.Clear(); + partyIVComponentList.Add(partyIV1UpDown); + partyIVComponentList.Add(partyIV2UpDown); + partyIVComponentList.Add(partyIV3UpDown); + partyIVComponentList.Add(partyIV4UpDown); + partyIVComponentList.Add(partyIV5UpDown); + partyIVComponentList.Add(partyIV6UpDown); - PartyBallComponentList.Clear(); - PartyBallComponentList.Add(partyBall1UpDown); - PartyBallComponentList.Add(partyBall2UpDown); - PartyBallComponentList.Add(partyBall3UpDown); - PartyBallComponentList.Add(partyBall4UpDown); - PartyBallComponentList.Add(partyBall5UpDown); - PartyBallComponentList.Add(partyBall6UpDown); + partyBallComponentList.Clear(); + partyBallComponentList.Add(partyBall1UpDown); + partyBallComponentList.Add(partyBall2UpDown); + partyBallComponentList.Add(partyBall3UpDown); + partyBallComponentList.Add(partyBall4UpDown); + partyBallComponentList.Add(partyBall5UpDown); + partyBallComponentList.Add(partyBall6UpDown); - PartyFirstMoveComponentList.Clear(); - PartyFirstMoveComponentList.Add(partyMove1_1ComboBox); - PartyFirstMoveComponentList.Add(partyMove2_1ComboBox); - PartyFirstMoveComponentList.Add(partyMove3_1ComboBox); - PartyFirstMoveComponentList.Add(partyMove4_1ComboBox); - PartyFirstMoveComponentList.Add(partyMove5_1ComboBox); - PartyFirstMoveComponentList.Add(partyMove6_1ComboBox); + partyFirstMoveComponentList.Clear(); + partyFirstMoveComponentList.Add(partyMove1_1ComboBox); + partyFirstMoveComponentList.Add(partyMove2_1ComboBox); + partyFirstMoveComponentList.Add(partyMove3_1ComboBox); + partyFirstMoveComponentList.Add(partyMove4_1ComboBox); + partyFirstMoveComponentList.Add(partyMove5_1ComboBox); + partyFirstMoveComponentList.Add(partyMove6_1ComboBox); - PartySecondMoveComponentList.Clear(); - PartySecondMoveComponentList.Add(partyMove1_2ComboBox); - PartySecondMoveComponentList.Add(partyMove2_2ComboBox); - PartySecondMoveComponentList.Add(partyMove3_2ComboBox); - PartySecondMoveComponentList.Add(partyMove4_2ComboBox); - PartySecondMoveComponentList.Add(partyMove5_2ComboBox); - PartySecondMoveComponentList.Add(partyMove6_2ComboBox); + partySecondMoveComponentList.Clear(); + partySecondMoveComponentList.Add(partyMove1_2ComboBox); + partySecondMoveComponentList.Add(partyMove2_2ComboBox); + partySecondMoveComponentList.Add(partyMove3_2ComboBox); + partySecondMoveComponentList.Add(partyMove4_2ComboBox); + partySecondMoveComponentList.Add(partyMove5_2ComboBox); + partySecondMoveComponentList.Add(partyMove6_2ComboBox); - PartyThirdMoveComponentList.Clear(); - PartyThirdMoveComponentList.Add(partyMove1_3ComboBox); - PartyThirdMoveComponentList.Add(partyMove2_3ComboBox); - PartyThirdMoveComponentList.Add(partyMove3_3ComboBox); - PartyThirdMoveComponentList.Add(partyMove4_3ComboBox); - PartyThirdMoveComponentList.Add(partyMove5_3ComboBox); - PartyThirdMoveComponentList.Add(partyMove6_3ComboBox); + partyThirdMoveComponentList.Clear(); + partyThirdMoveComponentList.Add(partyMove1_3ComboBox); + partyThirdMoveComponentList.Add(partyMove2_3ComboBox); + partyThirdMoveComponentList.Add(partyMove3_3ComboBox); + partyThirdMoveComponentList.Add(partyMove4_3ComboBox); + partyThirdMoveComponentList.Add(partyMove5_3ComboBox); + partyThirdMoveComponentList.Add(partyMove6_3ComboBox); - PartyFourthMoveComponentList.Clear(); - PartyFourthMoveComponentList.Add(partyMove1_4ComboBox); - PartyFourthMoveComponentList.Add(partyMove2_4ComboBox); - PartyFourthMoveComponentList.Add(partyMove3_4ComboBox); - PartyFourthMoveComponentList.Add(partyMove4_4ComboBox); - PartyFourthMoveComponentList.Add(partyMove5_4ComboBox); - PartyFourthMoveComponentList.Add(partyMove6_4ComboBox); + partyFourthMoveComponentList.Clear(); + partyFourthMoveComponentList.Add(partyMove1_4ComboBox); + partyFourthMoveComponentList.Add(partyMove2_4ComboBox); + partyFourthMoveComponentList.Add(partyMove3_4ComboBox); + partyFourthMoveComponentList.Add(partyMove4_4ComboBox); + partyFourthMoveComponentList.Add(partyMove5_4ComboBox); + partyFourthMoveComponentList.Add(partyMove6_4ComboBox); - PartyGroupComponentList.Clear(); - PartyGroupComponentList.Add(party1GroupBox); - PartyGroupComponentList.Add(party2GroupBox); - PartyGroupComponentList.Add(party3GroupBox); - PartyGroupComponentList.Add(party4GroupBox); - PartyGroupComponentList.Add(party5GroupBox); - PartyGroupComponentList.Add(party6GroupBox); + partyGroupComponentList.Clear(); + partyGroupComponentList.Add(party1GroupBox); + partyGroupComponentList.Add(party2GroupBox); + partyGroupComponentList.Add(party3GroupBox); + partyGroupComponentList.Add(party4GroupBox); + partyGroupComponentList.Add(party5GroupBox); + partyGroupComponentList.Add(party6GroupBox); int trainerCount = Directory.GetFiles(RomInfo.gameDirs[DirNames.trainerProperties].unpackedDir).Length; trainerComboBox.Items.AddRange(GetTrainerNames()); @@ -6843,27 +6843,27 @@ namespace DSPRE { trainerItem3ComboBox.Items.AddRange(itemNames); trainerItem4ComboBox.Items.AddRange(itemNames); - foreach (ComboBox CB in PartyPokemonComponentList) { + foreach (ComboBox CB in partyPokemonComponentList) { CB.Items.AddRange(pokeNames); } - foreach (ComboBox CB in PartyItemComponentList) { + foreach (ComboBox CB in partyItemComponentList) { CB.Items.AddRange(itemNames); } - foreach (ComboBox CB in PartyFirstMoveComponentList) { + foreach (ComboBox CB in partyFirstMoveComponentList) { CB.Items.AddRange(moveNames); } - foreach (ComboBox CB in PartySecondMoveComponentList) { + foreach (ComboBox CB in partySecondMoveComponentList) { CB.Items.AddRange(moveNames); } - foreach (ComboBox CB in PartyThirdMoveComponentList) { + foreach (ComboBox CB in partyThirdMoveComponentList) { CB.Items.AddRange(moveNames); } - foreach (ComboBox CB in PartyFourthMoveComponentList) { + foreach (ComboBox CB in partyFourthMoveComponentList) { CB.Items.AddRange(moveNames); } @@ -6909,22 +6909,23 @@ namespace DSPRE { } public void RefreshTrainerPartyGUI() { for (int i = 0; i < TrainerFile.POKE_IN_PARTY; i++) { - PartyPokemonComponentList[i].SelectedIndex = currentTrainerFile.party[i].pokeID ?? 0; - PartyItemComponentList[i].SelectedIndex = currentTrainerFile.party[i].heldItem ?? 0; - PartyLevelComponentList[i].Value = currentTrainerFile.party[i].level; - PartyIVComponentList[i].Value = currentTrainerFile.party[i].unknown1_DATASTART; - PartyBallComponentList[i].Value = currentTrainerFile.party[i].unknown2_DATAEND; + partyPokemonComponentList[i].SelectedIndex = currentTrainerFile.party[i].pokeID ?? 0; + partyItemComponentList[i].SelectedIndex = currentTrainerFile.party[i].heldItem ?? 0; + partyLevelComponentList[i].Value = currentTrainerFile.party[i].level; + partyIVComponentList[i].Value = currentTrainerFile.party[i].unknown1_DATASTART; + partyBallComponentList[i].Value = currentTrainerFile.party[i].unknown2_DATAEND; - PartyFirstMoveComponentList[i].SelectedIndex = currentTrainerFile.party[i].moves == null ? 0 : currentTrainerFile.party[i].moves[0]; - PartySecondMoveComponentList[i].SelectedIndex = currentTrainerFile.party[i].moves == null ? 0 : currentTrainerFile.party[i].moves[1]; - PartyThirdMoveComponentList[i].SelectedIndex = currentTrainerFile.party[i].moves == null ? 0 : currentTrainerFile.party[i].moves[2]; - PartyFourthMoveComponentList[i].SelectedIndex = currentTrainerFile.party[i].moves == null ? 0 : currentTrainerFile.party[i].moves[3]; + partyFirstMoveComponentList[i].SelectedIndex = currentTrainerFile.party[i].moves == null ? 0 : currentTrainerFile.party[i].moves[0]; + partySecondMoveComponentList[i].SelectedIndex = currentTrainerFile.party[i].moves == null ? 0 : currentTrainerFile.party[i].moves[1]; + partyThirdMoveComponentList[i].SelectedIndex = currentTrainerFile.party[i].moves == null ? 0 : currentTrainerFile.party[i].moves[2]; + partyFourthMoveComponentList[i].SelectedIndex = currentTrainerFile.party[i].moves == null ? 0 : currentTrainerFile.party[i].moves[3]; } } private string FixPokenameString(string toFix) { TextInfo txtInfo = new CultureInfo("en-US", false).TextInfo; string pokeName = txtInfo.ToTitleCase(toFix.ToLower()); pokeName = pokeName.Replace(" ", "_"); + pokeName = pokeName.Replace("'", "_"); pokeName = pokeName.Replace(":", "_"); pokeName = pokeName.Replace("♀", "F"); pokeName = pokeName.Replace("♂", "M"); @@ -6997,7 +6998,7 @@ namespace DSPRE { private void partyCountUpDown_ValueChanged(object sender, EventArgs e) { for (int i = 0; i < TrainerFile.POKE_IN_PARTY; i++) { - PartyGroupComponentList[i].Enabled = (partyCountUpDown.Value > i); + partyGroupComponentList[i].Enabled = (partyCountUpDown.Value > i); } for (int i = 5; i >= partyCountUpDown.Value; i--) { currentTrainerFile.party[i] = new PartyPokemon(); @@ -7012,10 +7013,10 @@ namespace DSPRE { private void trainerMovesCheckBox_CheckedChanged(object sender, EventArgs e) { for (int i = 0; i < TrainerFile.POKE_IN_PARTY; i++) { - PartyFirstMoveComponentList[i].Enabled = trainerMovesCheckBox.Checked; - PartySecondMoveComponentList[i].Enabled = trainerMovesCheckBox.Checked; - PartyThirdMoveComponentList[i].Enabled = trainerMovesCheckBox.Checked; - PartyFourthMoveComponentList[i].Enabled = trainerMovesCheckBox.Checked; + partyFirstMoveComponentList[i].Enabled = trainerMovesCheckBox.Checked; + partySecondMoveComponentList[i].Enabled = trainerMovesCheckBox.Checked; + partyThirdMoveComponentList[i].Enabled = trainerMovesCheckBox.Checked; + partyFourthMoveComponentList[i].Enabled = trainerMovesCheckBox.Checked; } if (!disableHandlers) { @@ -7025,7 +7026,7 @@ namespace DSPRE { private void trainerItemsCheckBox_CheckedChanged(object sender, EventArgs e) { for (int i = 0; i < TrainerFile.POKE_IN_PARTY; i++) { - PartyItemComponentList[i].Enabled = trainerItemsCheckBox.Checked; + partyItemComponentList[i].Enabled = trainerItemsCheckBox.Checked; } if (!disableHandlers) { currentTrainerFile.trp.hasItems = trainerItemsCheckBox.Checked; @@ -7218,10 +7219,10 @@ namespace DSPRE { private void partyMoveComboBox_SelectedIndexChanged(object sender, EventArgs e) { if (!disableHandlers) { for (int i = 0; i < TrainerFile.POKE_IN_PARTY; i++) { - currentTrainerFile.party[i].moves[0] = (ushort)PartyFirstMoveComponentList[i].SelectedIndex; - currentTrainerFile.party[i].moves[1] = (ushort)PartySecondMoveComponentList[i].SelectedIndex; - currentTrainerFile.party[i].moves[2] = (ushort)PartyThirdMoveComponentList[i].SelectedIndex; - currentTrainerFile.party[i].moves[3] = (ushort)PartyFourthMoveComponentList[i].SelectedIndex; + currentTrainerFile.party[i].moves[0] = (ushort)partyFirstMoveComponentList[i].SelectedIndex; + currentTrainerFile.party[i].moves[1] = (ushort)partySecondMoveComponentList[i].SelectedIndex; + currentTrainerFile.party[i].moves[2] = (ushort)partyThirdMoveComponentList[i].SelectedIndex; + currentTrainerFile.party[i].moves[3] = (ushort)partyFourthMoveComponentList[i].SelectedIndex; } } } @@ -7232,7 +7233,7 @@ namespace DSPRE { } using (BinaryWriter writer = new BinaryWriter(new FileStream(RomInfo.gameDirs[DirNames.trainerParty].unpackedDir + "\\" + trainerComboBox.SelectedIndex.ToString("D4"), FileMode.Create))) { - writer.Write(currentTrainerFile.PartyDataToByteArray()); + writer.Write(currentTrainerFile.party.ToByteArray()); } UpdateCurrentTrainerName(newName: trainerNameTextBox.Text); @@ -7416,7 +7417,8 @@ namespace DSPRE { } private void exportPartyButton_Click(object sender, EventArgs e) { - + currentTrainerFile.party.exportCondensedData = true; + currentTrainerFile.party.SaveToFileExplorePath("G4 Party Data " + trainerComboBox.SelectedItem); } private void importReplacePartyButton_Click(object sender, EventArgs e) { diff --git a/DS_Map/Main Window.resx b/DS_Map/Main Window.resx index 4622851..e262bdc 100644 --- a/DS_Map/Main Window.resx +++ b/DS_Map/Main Window.resx @@ -856,7 +856,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABy - EQAAAk1TRnQBSQFMAgEBCQEAAawBFQGsARUBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + EQAAAk1TRnQBSQFMAgEBCQEAAbQBFQG0ARUBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAATADAAEBAQABCAYAAQwYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/DS_Map/ROMFiles/TrainerFile.cs b/DS_Map/ROMFiles/TrainerFile.cs index 091e74a..c6e45c6 100644 --- a/DS_Map/ROMFiles/TrainerFile.cs +++ b/DS_Map/ROMFiles/TrainerFile.cs @@ -135,13 +135,56 @@ namespace DSPRE.ROMFiles { #endregion } + + public class Party : RomFile { + private PartyPokemon[] content; + private TrainerProperties trp; + public bool exportCondensedData; + public Party(int POKE_IN_PARTY, bool init, TrainerProperties trp) { + this.trp = trp; + this.content = new PartyPokemon[POKE_IN_PARTY]; + + if (init) { + for (int i = 0; i < content.Length; i++) { + this.content[i] = new PartyPokemon(); + } + } + } + public PartyPokemon this[int index] { + get { + return content[index]; + } + set { + content[index] = value; + } + } + public override byte[] ToByteArray() { + MemoryStream newData = new MemoryStream(); + using (BinaryWriter writer = new BinaryWriter(newData)) { + if (this.exportCondensedData && trp != null) { + byte condensedTrData = (byte)(((trp.hasMoves ? 1 : 0) & 0b_1) + (((trp.hasItems ? 1 : 0) & 0b_1) << 1) + ((trp.partyCount & 0b_1111_11) << 2)); + writer.Write(condensedTrData); + } + + foreach (PartyPokemon poke in this.content) { + if (poke.pokeID != null && poke.level > 0) { + writer.Write(poke.ToByteArray()); + } + } + } + return newData.ToArray(); + } + public void SaveToFileExplorePath(string suggestedFileName, bool showSuccessMessage = true) { + SaveToFileExplorePath("Gen IV Party Data", "pdat", suggestedFileName, showSuccessMessage); + } + } public class TrainerFile : RomFile { public const int POKE_IN_PARTY = 6; #region Fields public string name; public TrainerProperties trp; - public PartyPokemon[] party = new PartyPokemon[POKE_IN_PARTY]; + public Party party; #endregion #region Constructor @@ -149,11 +192,12 @@ namespace DSPRE.ROMFiles { this.name = name; this.trp = trp; trp.partyCount = 1; - party = new PartyPokemon[1] { new PartyPokemon() }; + this.party = new Party(1, init: true, trp); } public TrainerFile(TrainerProperties trp, Stream partyData, string name = "") { this.name = name; this.trp = trp; + party = new Party(POKE_IN_PARTY, init: false, trp); using (BinaryReader reader = new BinaryReader(partyData)) { int dividend = 8; int nMoves = 4; @@ -195,18 +239,6 @@ namespace DSPRE.ROMFiles { #endregion #region Methods - public byte[] PartyDataToByteArray() { - MemoryStream newData = new MemoryStream(); - using (BinaryWriter writer = new BinaryWriter(newData)) { - foreach (PartyPokemon poke in party) { - if (poke.pokeID != null && poke.level > 0) { - writer.Write(poke.ToByteArray()); - } - } - } - return newData.ToArray(); - } - public override byte[] ToByteArray() { MemoryStream newData = new MemoryStream(); using (BinaryWriter writer = new BinaryWriter(newData)) { @@ -216,7 +248,7 @@ namespace DSPRE.ROMFiles { writer.Write((byte)trDat.Length); writer.Write(trDat); - byte[] pDat = PartyDataToByteArray(); + byte[] pDat = party.ToByteArray(); writer.Write((byte)pDat.Length); writer.Write(pDat); } diff --git a/DS_Map/ROMToolboxDialog.cs b/DS_Map/ROMToolboxDialog.cs index 8026386..0a85d0c 100644 --- a/DS_Map/ROMToolboxDialog.cs +++ b/DS_Map/ROMToolboxDialog.cs @@ -253,8 +253,9 @@ namespace DSPRE { foreach (KeyValuePair kv in ToolboxDB.matrixExpansionDB) { foreach (uint offset in kv.Key) { int languageOffset = 0; - if (RomInfo.romID == "IPKE" || RomInfo.romID == "IPGE" || RomInfo.romID == "IPGS") + if (RomInfo.romID == "IPKE" || RomInfo.romID == "IPGE" || RomInfo.romID == "IPGS") { languageOffset = +8; + } byte[] read = DSUtils.ReadBytesFromArm9((uint)(offset - 0x02000000 + languageOffset), kv.Value.Length / 3 + 1); byte[] code = DSUtils.HexStringToByteArray(kv.Value); @@ -587,8 +588,9 @@ namespace DSPRE { string listOfChanges = ""; int languageOffset = 0; - if (RomInfo.romID == "IPKE" || RomInfo.romID == "IPGE" || RomInfo.romID == "IPGS") + if (RomInfo.romID == "IPKE" || RomInfo.romID == "IPGE" || RomInfo.romID == "IPGS") { languageOffset = +8; + } foreach (KeyValuePair kv in ToolboxDB.matrixExpansionDB) { listOfChanges += " - Replace " + (kv.Value.Length / 3 + 1) + " bytes of data at arm9 offset"; diff --git a/Images/Images/Games/NARUTO_POTN.cs b/Images/Images/Games/NARUTO_POTN.cs deleted file mode 100644 index ed11552..0000000 --- a/Images/Images/Games/NARUTO_POTN.cs +++ /dev/null @@ -1,131 +0,0 @@ -// ---------------------------------------------------------------------- -// - -// Copyright (C) 2012 -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -// -// - -// pleoNeX -// benito356@gmail.com -// 17/07/2012 14:52:12 -// ----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.IO; -using Ekona; -using Ekona.Images; - -namespace Images.Games -{ - public class NARUTO_POTN : IGamePlugin - { - IPluginHost pluginHost; - string gameCode; - - public void Initialize(IPluginHost pluginHost, string gameCode) - { - this.pluginHost = pluginHost; - this.gameCode = gameCode; - } - public bool IsCompatible() - { - if (gameCode == "YN5E") - return true; - - return false; - } - - public Format Get_Format(sFile file, byte[] magic) - { - if (file.name.EndsWith(".acl")) - return Format.Palette; - else if (file.name.EndsWith(".acg")) - return Format.Tile; - else if (file.name.EndsWith(".asc")) - return Format.Map; - - return Format.Unknown; - } - - public void Read(sFile file) - { - throw new NotImplementedException(); - } - public System.Windows.Forms.Control Show_Info(sFile file) - { - if (file.name.EndsWith(".acl")) - { - PaletteBase palette = new RawPalette(file.path, file.id, true, 0, -1, file.name); - pluginHost.Set_Palette(palette); - return new PaletteControl(pluginHost); - } - - if (file.name.EndsWith(".acg")) - { - ColorFormat depth = (pluginHost.Get_Palette().Loaded ? pluginHost.Get_Palette().Depth : ColorFormat.colors256); - ImageBase image = new RawImage(file.path, file.id, TileForm.Horizontal, depth, true, 0, -1, file.name); - pluginHost.Set_Image(image); - return new ImageControl(pluginHost, false); - } - - if (file.name.EndsWith(".asc")) - { - MapBase map = new Naruto_ASC(file); - pluginHost.Set_Map(map); - return new ImageControl(pluginHost, true); - } - - return new System.Windows.Forms.Control(); - } - - public string Pack(ref sFolder unpacked, sFile file) - { - throw new NotImplementedException(); - } - public sFolder Unpack(sFile file) - { - throw new NotImplementedException(); - } - } - - public class Naruto_ASC : MapBase - { - public Naruto_ASC(sFile file) : base(file.path, file.id, file.name) { } - - public override void Read(string fileIn) - { - BinaryReader br = new BinaryReader(File.OpenRead(fileIn)); - NTFS[] maps = new NTFS[br.BaseStream.Length / 2]; - - for (int i = 0; i < maps.Length; i++) - { - ushort v = br.ReadUInt16(); - maps[i].nTile = (ushort)(v & 0x1FF); - maps[i].nPalette = (byte)(v >> 14); - } - - br.Close(); - Set_Map(maps, false); - } - - public override void Write(string fileOut, ImageBase image, PaletteBase palette) - { - throw new NotImplementedException(); - } - } -} diff --git a/Images/Images/Games/PCT.cs b/Images/Images/Games/PCT.cs deleted file mode 100644 index b17fde9..0000000 --- a/Images/Images/Games/PCT.cs +++ /dev/null @@ -1,159 +0,0 @@ -// ---------------------------------------------------------------------- -// - -// Copyright (C) 2012 -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -// -// - -// pleoNeX -// benito356@gmail.com -// 25/04/2012 20:10:58 -// ----------------------------------------------------------------------- -using System; -using System.IO; -using System.Drawing; -using Ekona; -using Ekona.Images; - -namespace Images.Games -{ - public class PCT : IGamePlugin - { - string gameCode; - IPluginHost pluginHost; - - public Format Get_Format(sFile file, byte[] magic) - { - string ext = new string(System.Text.Encoding.ASCII.GetChars(magic)); - if (ext == "STD ") - return Format.FullImage; - - return Format.Unknown; - } - - public void Initialize(IPluginHost pluginHost, string gameCode) - { - this.gameCode = gameCode; - this.pluginHost = pluginHost; - } - public bool IsCompatible() - { - if (gameCode == "TBWJ") - return true; - - return false; - } - - public void Read(sFile file) - { - } - public System.Windows.Forms.Control Show_Info(sFile file) - { - // BTM only support STD files - new STD(pluginHost, file.path, file.id, file.name); - return new ImageControl(pluginHost, true); - } - - public sFolder Unpack(sFile file) - { - return new sFolder(); - } - public string Pack(ref sFolder unpacked, sFile file) - { - return null; - } - - } - - class STD : MapBase - { - IPluginHost pluginHost; - - public STD(IPluginHost pluginHost, string file, int id, string fileName = "") - { - this.id = id; - if (fileName == "") - this.fileName = Path.GetFileName(file); - else - this.fileName = fileName; - this.pluginHost = pluginHost; - - Read(file); - } - - public override void Read(string fileIn) - { - BinaryReader br = new BinaryReader(File.OpenRead(fileIn)); - - // Header - char[] type = br.ReadChars(4); // "STD " - uint unknown_header = br.ReadUInt32(); - ushort clrformat = br.ReadUInt16(); - ColorFormat format = ColorFormat.colors256; - if (clrformat == 0) - format = ColorFormat.colors16; - br.BaseStream.Position = 0x10; // Unknown values - - // Palette - ushort unknown_pal = br.ReadUInt16(); - ushort num_colors = br.ReadUInt16(); - Color[] colors = Actions.BGR555ToColor(br.ReadBytes(num_colors * 2)); - PaletteBase palette = new RawPalette(new Color[][] { colors }, false, format); - - // Map - int tile_width = br.ReadUInt16() * 8; - int tile_height = br.ReadUInt16() * 8; - int tile_size = tile_width * tile_height; - if (tile_height != tile_width) - System.Windows.Forms.MessageBox.Show("Different tile size; height != width"); - - int width = br.ReadUInt16() * tile_width; - int height = br.ReadUInt16() * tile_height; - uint unknown2_map = br.ReadUInt32(); // Padding ? - NTFS[] map = new NTFS[width * height / tile_size]; - for (int i = 0; i < map.Length; i++) - { - map[i] = new NTFS(); - uint mapv = br.ReadUInt32(); - map[i].nTile = (ushort)(mapv & 0xFFFFFF); - map[i].nTile /= (ushort)(tile_size / 0x40); - map[i].nPalette = (byte)(mapv >> 28); - } - Set_Map(map, false, width, height); - - // Image - if (clrformat == 2) - format = ColorFormat.A3I5; - else if (clrformat == 3) - format = ColorFormat.A5I3; - else if (clrformat != 0 && clrformat != 1) - System.Windows.Forms.MessageBox.Show("ClrFormat: " + clrformat.ToString()); - byte[] tiles = br.ReadBytes((int)(br.BaseStream.Length - br.BaseStream.Position)); - ImageBase image = new RawImage(tiles, TileForm.Horizontal, format, width, height, false); - image.TileSize = tile_width; - - br.Close(); - - pluginHost.Set_Palette(palette); - pluginHost.Set_Image(image); - pluginHost.Set_Map(this); - } - - public override void Write(string fileOut, ImageBase image, PaletteBase palette) - { - } - } -} diff --git a/Images/Images/Images.csproj b/Images/Images/Images.csproj index 8ce28e5..451fbc0 100644 --- a/Images/Images/Images.csproj +++ b/Images/Images/Images.csproj @@ -118,8 +118,6 @@ AnimationControl.cs - -