Leahnaya/DS-Pokemon-Rom-Editor
1
0
Fork 0
mirror of https://github.com/AdAstra-LD/DS-Pokemon-Rom-Editor.git synced 2026-05-11 22:44:48 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed bugs with bgs importer

Browse Source 
also minor ui changes [command database window]
This commit is contained in:
AdAstra-LD 2021-02-08 12:03:20 +01:00
parent b3c934a99d
commit 6cdfea8abc
5 changed files with 59 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
DS_Map/Main Window.cs
View File

@ -3643,6 +3643,7 @@ namespace DSPRE {
currentMapFile.ImportSoundPlates(new FileStream(it.FileName, FileMode.Open));
MessageBox.Show("BackGround Sound data imported successfully!", "", MessageBoxButtons.OK, MessageBoxIcon.Information);
BGSSizeTXT.Text = currentMapFile.bgs.Length.ToString() + "B";
}
private void soundPlatesExportButton_Click(object sender, EventArgs e) {

10
DS_Map/ROMFiles/MapFile.cs
View File

@ -73,10 +73,10 @@ namespace DSPRE.ROMFiles {
MessageBox.Show("The header section of this map's BackGround Sound data is corrupted.",
"BGS Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
ushort bgsSectionLength = reader.ReadUInt16();
ushort bgsDataLength = reader.ReadUInt16();
reader.BaseStream.Position -= 4;
ImportSoundPlates(new MemoryStream(reader.ReadBytes(bgsSectionLength + 4)));
reader.BaseStream.Position -= 4; //go back so that the signature "1234" + size can be read and stored
ImportSoundPlates(new MemoryStream(reader.ReadBytes(bgsDataLength + 4)));
}
/* Read permission data */
@ -213,9 +213,7 @@ namespace DSPRE.ROMFiles {
writer.Write(bdhc.Length);
/* Write soundplate section for HG/SS */
if (gameVersion == "HG" || gameVersion == "SS") {
writer.Write((ushort)0x1234);
writer.Write((ushort)bgs.Length);
if (gameVersion == "HG" || gameVersion == "SS") {
writer.Write(bgs);
}

108
DS_Map/Resources/CommandsDatabase.Designer.cs generated
View File

@ -24,12 +24,8 @@ namespace DSPRE.Resources {
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent() {
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
this.scriptcmdDataGridView = new System.Windows.Forms.DataGridView();
this.CommandID = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.CommandName = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ParamsCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Params = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.cmdSearchTextBox = new System.Windows.Forms.TextBox();
this.startSearchButton = new System.Windows.Forms.Button();
this.label1 = new System.Windows.Forms.Label();
@ -37,6 +33,10 @@ namespace DSPRE.Resources {
this.matchCB = new System.Windows.Forms.RadioButton();
this.containsCB = new System.Windows.Forms.RadioButton();
this.startsWithCB = new System.Windows.Forms.RadioButton();
this.CommandID = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.CommandName = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ParamsCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Params = new System.Windows.Forms.DataGridViewTextBoxColumn();
((System.ComponentModel.ISupportInitialize)(this.scriptcmdDataGridView)).BeginInit();
this.criteriaGroupBox.SuspendLayout();
this.SuspendLayout();
@ -58,49 +58,6 @@ namespace DSPRE.Resources {
this.scriptcmdDataGridView.Size = new System.Drawing.Size(501, 602);
this.scriptcmdDataGridView.TabIndex = 0;
//
// CommandID
//
this.CommandID.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
dataGridViewCellStyle3.Format = "X4";
this.CommandID.DefaultCellStyle = dataGridViewCellStyle3;
this.CommandID.FillWeight = 30F;
this.CommandID.HeaderText = "Command ID";
this.CommandID.MaxInputLength = 10;
this.CommandID.Name = "CommandID";
this.CommandID.ReadOnly = true;
this.CommandID.Width = 70;
//
// CommandName
//
this.CommandName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
this.CommandName.FillWeight = 60F;
this.CommandName.HeaderText = "Command Name";
this.CommandName.MaxInputLength = 200;
this.CommandName.MinimumWidth = 90;
this.CommandName.Name = "CommandName";
this.CommandName.ReadOnly = true;
this.CommandName.Width = 101;
//
// ParamsCount
//
this.ParamsCount.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
this.ParamsCount.FillWeight = 110F;
this.ParamsCount.HeaderText = "Parameter Count";
this.ParamsCount.MaxInputLength = 10;
this.ParamsCount.MinimumWidth = 20;
this.ParamsCount.Name = "ParamsCount";
this.ParamsCount.ReadOnly = true;
//
// Params
//
this.Params.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
this.Params.FillWeight = 190F;
this.Params.HeaderText = "Parameters";
this.Params.MaxInputLength = 200;
this.Params.MinimumWidth = 85;
this.Params.Name = "Params";
this.Params.ReadOnly = true;
//
// cmdSearchTextBox
//
this.cmdSearchTextBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
@ -180,7 +137,50 @@ namespace DSPRE.Resources {
this.startsWithCB.Text = "Starts with";
this.startsWithCB.UseVisualStyleBackColor = true;
//
// ScriptCommands
// CommandID
//
this.CommandID.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
dataGridViewCellStyle1.Format = "X4";
this.CommandID.DefaultCellStyle = dataGridViewCellStyle1;
this.CommandID.FillWeight = 30F;
this.CommandID.HeaderText = "Command ID";
this.CommandID.MaxInputLength = 10;
this.CommandID.Name = "CommandID";
this.CommandID.ReadOnly = true;
this.CommandID.Width = 70;
//
// CommandName
//
this.CommandName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
this.CommandName.FillWeight = 60F;
this.CommandName.HeaderText = "Command Name";
this.CommandName.MaxInputLength = 200;
this.CommandName.MinimumWidth = 90;
this.CommandName.Name = "CommandName";
this.CommandName.ReadOnly = true;
this.CommandName.Width = 101;
//
// ParamsCount
//
this.ParamsCount.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
this.ParamsCount.FillWeight = 90F;
this.ParamsCount.HeaderText = "Parameter Count";
this.ParamsCount.MaxInputLength = 10;
this.ParamsCount.MinimumWidth = 20;
this.ParamsCount.Name = "ParamsCount";
this.ParamsCount.ReadOnly = true;
//
// Params
//
this.Params.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
this.Params.FillWeight = 190F;
this.Params.HeaderText = "Parameters";
this.Params.MaxInputLength = 200;
this.Params.MinimumWidth = 85;
this.Params.Name = "Params";
this.Params.ReadOnly = true;
//
// CommandsDatabase
//
this.AutoSize = true;
this.ClientSize = new System.Drawing.Size(536, 676);
@ -190,7 +190,7 @@ namespace DSPRE.Resources {
this.Controls.Add(this.cmdSearchTextBox);
this.Controls.Add(this.scriptcmdDataGridView);
this.DoubleBuffered = true;
this.Name = "ScriptCommands";
this.Name = "CommandsDatabase";
this.Text = "Script Commands Database";
((System.ComponentModel.ISupportInitialize)(this.scriptcmdDataGridView)).EndInit();
this.criteriaGroupBox.ResumeLayout(false);
@ -206,13 +206,13 @@ namespace DSPRE.Resources {
private System.Windows.Forms.TextBox cmdSearchTextBox;
private System.Windows.Forms.Button startSearchButton;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.DataGridViewTextBoxColumn CommandID;
private System.Windows.Forms.DataGridViewTextBoxColumn CommandName;
private System.Windows.Forms.DataGridViewTextBoxColumn ParamsCount;
private System.Windows.Forms.DataGridViewTextBoxColumn Params;
private System.Windows.Forms.GroupBox criteriaGroupBox;
private System.Windows.Forms.RadioButton matchCB;
private System.Windows.Forms.RadioButton containsCB;
private System.Windows.Forms.RadioButton startsWithCB;
private System.Windows.Forms.DataGridViewTextBoxColumn CommandID;
private System.Windows.Forms.DataGridViewTextBoxColumn CommandName;
private System.Windows.Forms.DataGridViewTextBoxColumn ParamsCount;
private System.Windows.Forms.DataGridViewTextBoxColumn Params;
}
}

1
DS_Map/Resources/CommandsDatabase.cs
View File

@ -84,6 +84,5 @@ namespace DSPRE.Resources {
startSearchButton_Click(null, null);
}
}
}
}

12
DS_Map/Resources/CommandsDatabase.resx
View File

@ -129,18 +129,6 @@
<metadata name="Params.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="CommandID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="CommandName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ParamsCount.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Params.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>35</value>
</metadata>