From 6577777b64f130551bfbd24348cf20843fb82aa1 Mon Sep 17 00:00:00 2001 From: Sean Miller Date: Sat, 13 Nov 2021 19:01:27 -0800 Subject: [PATCH] Edit Wit call to only export the DATA partition --- PBRHex/Files/DOL.cs | 4 +- PBRHex/HexEditor/HexEditorWindow.Designer.cs | 529 ------------------- PBRHex/MainWindow.cs | 3 +- PBRHex/PBRHex.csproj | 6 - PBRHex/Tables/FSYSTable.cs | 4 +- PBRHex/Uninstall.Designer.cs | 34 -- PBRHex/Uninstall.cs | 17 - PBRHex/Utils/CommandUtils.cs | 12 +- 8 files changed, 11 insertions(+), 598 deletions(-) delete mode 100644 PBRHex/Uninstall.Designer.cs delete mode 100644 PBRHex/Uninstall.cs diff --git a/PBRHex/Files/DOL.cs b/PBRHex/Files/DOL.cs index de14c2f..a46cd7e 100644 --- a/PBRHex/Files/DOL.cs +++ b/PBRHex/Files/DOL.cs @@ -18,9 +18,9 @@ public static class DOL private static FileBuffer Main; public static void Initialize() { - Main = new FileBuffer($@"{Program.ISODir}\DATA\sys\main.dol") + Main = new FileBuffer($@"{Program.ISODir}\sys\main.dol") { - WorkingDir = FileUtils.CreateWorkspace($@"{Program.ISODir}\DATA\sys\main.dol") + WorkingDir = FileUtils.CreateWorkspace($@"{Program.ISODir}\sys\main.dol") }; Comments = new Dictionary(); string path = $@"{Program.UserDir}\comments.txt"; diff --git a/PBRHex/HexEditor/HexEditorWindow.Designer.cs b/PBRHex/HexEditor/HexEditorWindow.Designer.cs index 9dc8d04..0ec700b 100644 --- a/PBRHex/HexEditor/HexEditorWindow.Designer.cs +++ b/PBRHex/HexEditor/HexEditorWindow.Designer.cs @@ -72,54 +72,6 @@ private void InitializeComponent() { this.previousMatchButton = new System.Windows.Forms.Button(); this.fileSelectDropdown = new PBRHex.HexEditor.Controls.FileSelectDropdown(); this.hexGrid = new PBRHex.HexEditor.Controls.HexGridView(); - this.dataGridViewTextBoxColumn33 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn34 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn35 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn36 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn37 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn38 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn39 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn40 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn41 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn42 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn43 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn44 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn45 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn46 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn47 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn48 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn17 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn18 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn19 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn20 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn21 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn22 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn23 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn24 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn25 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn26 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn27 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn28 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn29 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn30 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn31 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn32 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn8 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn9 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn10 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn11 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn12 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn14 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn15 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn16 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.widgetsTabControl.SuspendLayout(); this.asciiViewTabPage.SuspendLayout(); this.labelsTabPage.SuspendLayout(); @@ -543,55 +495,6 @@ private void InitializeComponent() { dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; this.hexGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; this.hexGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.hexGrid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.dataGridViewTextBoxColumn33, - this.dataGridViewTextBoxColumn34, - this.dataGridViewTextBoxColumn35, - this.dataGridViewTextBoxColumn36, - this.dataGridViewTextBoxColumn37, - this.dataGridViewTextBoxColumn38, - this.dataGridViewTextBoxColumn39, - this.dataGridViewTextBoxColumn40, - this.dataGridViewTextBoxColumn41, - this.dataGridViewTextBoxColumn42, - this.dataGridViewTextBoxColumn43, - this.dataGridViewTextBoxColumn44, - this.dataGridViewTextBoxColumn45, - this.dataGridViewTextBoxColumn46, - this.dataGridViewTextBoxColumn47, - this.dataGridViewTextBoxColumn48, - this.dataGridViewTextBoxColumn17, - this.dataGridViewTextBoxColumn18, - this.dataGridViewTextBoxColumn19, - this.dataGridViewTextBoxColumn20, - this.dataGridViewTextBoxColumn21, - this.dataGridViewTextBoxColumn22, - this.dataGridViewTextBoxColumn23, - this.dataGridViewTextBoxColumn24, - this.dataGridViewTextBoxColumn25, - this.dataGridViewTextBoxColumn26, - this.dataGridViewTextBoxColumn27, - this.dataGridViewTextBoxColumn28, - this.dataGridViewTextBoxColumn29, - this.dataGridViewTextBoxColumn30, - this.dataGridViewTextBoxColumn31, - this.dataGridViewTextBoxColumn32, - this.dataGridViewTextBoxColumn1, - this.dataGridViewTextBoxColumn2, - this.dataGridViewTextBoxColumn3, - this.dataGridViewTextBoxColumn4, - this.dataGridViewTextBoxColumn5, - this.dataGridViewTextBoxColumn6, - this.dataGridViewTextBoxColumn7, - this.dataGridViewTextBoxColumn8, - this.dataGridViewTextBoxColumn9, - this.dataGridViewTextBoxColumn10, - this.dataGridViewTextBoxColumn11, - this.dataGridViewTextBoxColumn12, - this.dataGridViewTextBoxColumn13, - this.dataGridViewTextBoxColumn14, - this.dataGridViewTextBoxColumn15, - this.dataGridViewTextBoxColumn16}); this.hexGrid.ContextMenuStrip = this.hexGridContextMenu; dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; @@ -620,390 +523,6 @@ private void InitializeComponent() { this.hexGrid.CellEdited += new System.EventHandler(this.HexGrid_CellEdited); this.hexGrid.Scroll += new System.Windows.Forms.ScrollEventHandler(this.HexView_Scroll); // - // dataGridViewTextBoxColumn33 - // - this.dataGridViewTextBoxColumn33.HeaderText = "0"; - this.dataGridViewTextBoxColumn33.MinimumWidth = 6; - this.dataGridViewTextBoxColumn33.Name = "dataGridViewTextBoxColumn33"; - this.dataGridViewTextBoxColumn33.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewTextBoxColumn33.Width = 24; - // - // dataGridViewTextBoxColumn34 - // - this.dataGridViewTextBoxColumn34.HeaderText = "1"; - this.dataGridViewTextBoxColumn34.MinimumWidth = 6; - this.dataGridViewTextBoxColumn34.Name = "dataGridViewTextBoxColumn34"; - this.dataGridViewTextBoxColumn34.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewTextBoxColumn34.Width = 24; - // - // dataGridViewTextBoxColumn35 - // - this.dataGridViewTextBoxColumn35.HeaderText = "2"; - this.dataGridViewTextBoxColumn35.MinimumWidth = 6; - this.dataGridViewTextBoxColumn35.Name = "dataGridViewTextBoxColumn35"; - this.dataGridViewTextBoxColumn35.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewTextBoxColumn35.Width = 24; - // - // dataGridViewTextBoxColumn36 - // - this.dataGridViewTextBoxColumn36.HeaderText = "3"; - this.dataGridViewTextBoxColumn36.MinimumWidth = 6; - this.dataGridViewTextBoxColumn36.Name = "dataGridViewTextBoxColumn36"; - this.dataGridViewTextBoxColumn36.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewTextBoxColumn36.Width = 24; - // - // dataGridViewTextBoxColumn37 - // - this.dataGridViewTextBoxColumn37.HeaderText = "4"; - this.dataGridViewTextBoxColumn37.MinimumWidth = 6; - this.dataGridViewTextBoxColumn37.Name = "dataGridViewTextBoxColumn37"; - this.dataGridViewTextBoxColumn37.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewTextBoxColumn37.Width = 24; - // - // dataGridViewTextBoxColumn38 - // - this.dataGridViewTextBoxColumn38.HeaderText = "5"; - this.dataGridViewTextBoxColumn38.MinimumWidth = 6; - this.dataGridViewTextBoxColumn38.Name = "dataGridViewTextBoxColumn38"; - this.dataGridViewTextBoxColumn38.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewTextBoxColumn38.Width = 24; - // - // dataGridViewTextBoxColumn39 - // - this.dataGridViewTextBoxColumn39.HeaderText = "6"; - this.dataGridViewTextBoxColumn39.MinimumWidth = 6; - this.dataGridViewTextBoxColumn39.Name = "dataGridViewTextBoxColumn39"; - this.dataGridViewTextBoxColumn39.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewTextBoxColumn39.Width = 24; - // - // dataGridViewTextBoxColumn40 - // - this.dataGridViewTextBoxColumn40.HeaderText = "7"; - this.dataGridViewTextBoxColumn40.MinimumWidth = 6; - this.dataGridViewTextBoxColumn40.Name = "dataGridViewTextBoxColumn40"; - this.dataGridViewTextBoxColumn40.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewTextBoxColumn40.Width = 24; - // - // dataGridViewTextBoxColumn41 - // - this.dataGridViewTextBoxColumn41.HeaderText = "8"; - this.dataGridViewTextBoxColumn41.MinimumWidth = 6; - this.dataGridViewTextBoxColumn41.Name = "dataGridViewTextBoxColumn41"; - this.dataGridViewTextBoxColumn41.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewTextBoxColumn41.Width = 24; - // - // dataGridViewTextBoxColumn42 - // - this.dataGridViewTextBoxColumn42.HeaderText = "9"; - this.dataGridViewTextBoxColumn42.MinimumWidth = 6; - this.dataGridViewTextBoxColumn42.Name = "dataGridViewTextBoxColumn42"; - this.dataGridViewTextBoxColumn42.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewTextBoxColumn42.Width = 24; - // - // dataGridViewTextBoxColumn43 - // - this.dataGridViewTextBoxColumn43.HeaderText = "A"; - this.dataGridViewTextBoxColumn43.MinimumWidth = 6; - this.dataGridViewTextBoxColumn43.Name = "dataGridViewTextBoxColumn43"; - this.dataGridViewTextBoxColumn43.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewTextBoxColumn43.Width = 24; - // - // dataGridViewTextBoxColumn44 - // - this.dataGridViewTextBoxColumn44.HeaderText = "B"; - this.dataGridViewTextBoxColumn44.MinimumWidth = 6; - this.dataGridViewTextBoxColumn44.Name = "dataGridViewTextBoxColumn44"; - this.dataGridViewTextBoxColumn44.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewTextBoxColumn44.Width = 24; - // - // dataGridViewTextBoxColumn45 - // - this.dataGridViewTextBoxColumn45.HeaderText = "C"; - this.dataGridViewTextBoxColumn45.MinimumWidth = 6; - this.dataGridViewTextBoxColumn45.Name = "dataGridViewTextBoxColumn45"; - this.dataGridViewTextBoxColumn45.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewTextBoxColumn45.Width = 24; - // - // dataGridViewTextBoxColumn46 - // - this.dataGridViewTextBoxColumn46.HeaderText = "D"; - this.dataGridViewTextBoxColumn46.MinimumWidth = 6; - this.dataGridViewTextBoxColumn46.Name = "dataGridViewTextBoxColumn46"; - this.dataGridViewTextBoxColumn46.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewTextBoxColumn46.Width = 24; - // - // dataGridViewTextBoxColumn47 - // - this.dataGridViewTextBoxColumn47.HeaderText = "E"; - this.dataGridViewTextBoxColumn47.MinimumWidth = 6; - this.dataGridViewTextBoxColumn47.Name = "dataGridViewTextBoxColumn47"; - this.dataGridViewTextBoxColumn47.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewTextBoxColumn47.Width = 24; - // - // dataGridViewTextBoxColumn48 - // - this.dataGridViewTextBoxColumn48.HeaderText = "F"; - this.dataGridViewTextBoxColumn48.MinimumWidth = 6; - this.dataGridViewTextBoxColumn48.Name = "dataGridViewTextBoxColumn48"; - this.dataGridViewTextBoxColumn48.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewTextBoxColumn48.Width = 24; - // - // dataGridViewTextBoxColumn17 - // - this.dataGridViewTextBoxColumn17.HeaderText = "0"; - this.dataGridViewTextBoxColumn17.MinimumWidth = 6; - this.dataGridViewTextBoxColumn17.Name = "dataGridViewTextBoxColumn17"; - this.dataGridViewTextBoxColumn17.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewTextBoxColumn17.Width = 24; - // - // dataGridViewTextBoxColumn18 - // - this.dataGridViewTextBoxColumn18.HeaderText = "1"; - this.dataGridViewTextBoxColumn18.MinimumWidth = 6; - this.dataGridViewTextBoxColumn18.Name = "dataGridViewTextBoxColumn18"; - this.dataGridViewTextBoxColumn18.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewTextBoxColumn18.Width = 24; - // - // dataGridViewTextBoxColumn19 - // - this.dataGridViewTextBoxColumn19.HeaderText = "2"; - this.dataGridViewTextBoxColumn19.MinimumWidth = 6; - this.dataGridViewTextBoxColumn19.Name = "dataGridViewTextBoxColumn19"; - this.dataGridViewTextBoxColumn19.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewTextBoxColumn19.Width = 24; - // - // dataGridViewTextBoxColumn20 - // - this.dataGridViewTextBoxColumn20.HeaderText = "3"; - this.dataGridViewTextBoxColumn20.MinimumWidth = 6; - this.dataGridViewTextBoxColumn20.Name = "dataGridViewTextBoxColumn20"; - this.dataGridViewTextBoxColumn20.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewTextBoxColumn20.Width = 24; - // - // dataGridViewTextBoxColumn21 - // - this.dataGridViewTextBoxColumn21.HeaderText = "4"; - this.dataGridViewTextBoxColumn21.MinimumWidth = 6; - this.dataGridViewTextBoxColumn21.Name = "dataGridViewTextBoxColumn21"; - this.dataGridViewTextBoxColumn21.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewTextBoxColumn21.Width = 24; - // - // dataGridViewTextBoxColumn22 - // - this.dataGridViewTextBoxColumn22.HeaderText = "5"; - this.dataGridViewTextBoxColumn22.MinimumWidth = 6; - this.dataGridViewTextBoxColumn22.Name = "dataGridViewTextBoxColumn22"; - this.dataGridViewTextBoxColumn22.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewTextBoxColumn22.Width = 24; - // - // dataGridViewTextBoxColumn23 - // - this.dataGridViewTextBoxColumn23.HeaderText = "6"; - this.dataGridViewTextBoxColumn23.MinimumWidth = 6; - this.dataGridViewTextBoxColumn23.Name = "dataGridViewTextBoxColumn23"; - this.dataGridViewTextBoxColumn23.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewTextBoxColumn23.Width = 24; - // - // dataGridViewTextBoxColumn24 - // - this.dataGridViewTextBoxColumn24.HeaderText = "7"; - this.dataGridViewTextBoxColumn24.MinimumWidth = 6; - this.dataGridViewTextBoxColumn24.Name = "dataGridViewTextBoxColumn24"; - this.dataGridViewTextBoxColumn24.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewTextBoxColumn24.Width = 24; - // - // dataGridViewTextBoxColumn25 - // - this.dataGridViewTextBoxColumn25.HeaderText = "8"; - this.dataGridViewTextBoxColumn25.MinimumWidth = 6; - this.dataGridViewTextBoxColumn25.Name = "dataGridViewTextBoxColumn25"; - this.dataGridViewTextBoxColumn25.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewTextBoxColumn25.Width = 24; - // - // dataGridViewTextBoxColumn26 - // - this.dataGridViewTextBoxColumn26.HeaderText = "9"; - this.dataGridViewTextBoxColumn26.MinimumWidth = 6; - this.dataGridViewTextBoxColumn26.Name = "dataGridViewTextBoxColumn26"; - this.dataGridViewTextBoxColumn26.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewTextBoxColumn26.Width = 24; - // - // dataGridViewTextBoxColumn27 - // - this.dataGridViewTextBoxColumn27.HeaderText = "A"; - this.dataGridViewTextBoxColumn27.MinimumWidth = 6; - this.dataGridViewTextBoxColumn27.Name = "dataGridViewTextBoxColumn27"; - this.dataGridViewTextBoxColumn27.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewTextBoxColumn27.Width = 24; - // - // dataGridViewTextBoxColumn28 - // - this.dataGridViewTextBoxColumn28.HeaderText = "B"; - this.dataGridViewTextBoxColumn28.MinimumWidth = 6; - this.dataGridViewTextBoxColumn28.Name = "dataGridViewTextBoxColumn28"; - this.dataGridViewTextBoxColumn28.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewTextBoxColumn28.Width = 24; - // - // dataGridViewTextBoxColumn29 - // - this.dataGridViewTextBoxColumn29.HeaderText = "C"; - this.dataGridViewTextBoxColumn29.MinimumWidth = 6; - this.dataGridViewTextBoxColumn29.Name = "dataGridViewTextBoxColumn29"; - this.dataGridViewTextBoxColumn29.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewTextBoxColumn29.Width = 24; - // - // dataGridViewTextBoxColumn30 - // - this.dataGridViewTextBoxColumn30.HeaderText = "D"; - this.dataGridViewTextBoxColumn30.MinimumWidth = 6; - this.dataGridViewTextBoxColumn30.Name = "dataGridViewTextBoxColumn30"; - this.dataGridViewTextBoxColumn30.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewTextBoxColumn30.Width = 24; - // - // dataGridViewTextBoxColumn31 - // - this.dataGridViewTextBoxColumn31.HeaderText = "E"; - this.dataGridViewTextBoxColumn31.MinimumWidth = 6; - this.dataGridViewTextBoxColumn31.Name = "dataGridViewTextBoxColumn31"; - this.dataGridViewTextBoxColumn31.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewTextBoxColumn31.Width = 24; - // - // dataGridViewTextBoxColumn32 - // - this.dataGridViewTextBoxColumn32.HeaderText = "F"; - this.dataGridViewTextBoxColumn32.MinimumWidth = 6; - this.dataGridViewTextBoxColumn32.Name = "dataGridViewTextBoxColumn32"; - this.dataGridViewTextBoxColumn32.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewTextBoxColumn32.Width = 24; - // - // dataGridViewTextBoxColumn1 - // - this.dataGridViewTextBoxColumn1.HeaderText = "0"; - this.dataGridViewTextBoxColumn1.MinimumWidth = 6; - this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1"; - this.dataGridViewTextBoxColumn1.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewTextBoxColumn1.Width = 24; - // - // dataGridViewTextBoxColumn2 - // - this.dataGridViewTextBoxColumn2.HeaderText = "1"; - this.dataGridViewTextBoxColumn2.MinimumWidth = 6; - this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2"; - this.dataGridViewTextBoxColumn2.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewTextBoxColumn2.Width = 24; - // - // dataGridViewTextBoxColumn3 - // - this.dataGridViewTextBoxColumn3.HeaderText = "2"; - this.dataGridViewTextBoxColumn3.MinimumWidth = 6; - this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3"; - this.dataGridViewTextBoxColumn3.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewTextBoxColumn3.Width = 24; - // - // dataGridViewTextBoxColumn4 - // - this.dataGridViewTextBoxColumn4.HeaderText = "3"; - this.dataGridViewTextBoxColumn4.MinimumWidth = 6; - this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4"; - this.dataGridViewTextBoxColumn4.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewTextBoxColumn4.Width = 24; - // - // dataGridViewTextBoxColumn5 - // - this.dataGridViewTextBoxColumn5.HeaderText = "4"; - this.dataGridViewTextBoxColumn5.MinimumWidth = 6; - this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5"; - this.dataGridViewTextBoxColumn5.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewTextBoxColumn5.Width = 24; - // - // dataGridViewTextBoxColumn6 - // - this.dataGridViewTextBoxColumn6.HeaderText = "5"; - this.dataGridViewTextBoxColumn6.MinimumWidth = 6; - this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6"; - this.dataGridViewTextBoxColumn6.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewTextBoxColumn6.Width = 24; - // - // dataGridViewTextBoxColumn7 - // - this.dataGridViewTextBoxColumn7.HeaderText = "6"; - this.dataGridViewTextBoxColumn7.MinimumWidth = 6; - this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7"; - this.dataGridViewTextBoxColumn7.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewTextBoxColumn7.Width = 24; - // - // dataGridViewTextBoxColumn8 - // - this.dataGridViewTextBoxColumn8.HeaderText = "7"; - this.dataGridViewTextBoxColumn8.MinimumWidth = 6; - this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8"; - this.dataGridViewTextBoxColumn8.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewTextBoxColumn8.Width = 24; - // - // dataGridViewTextBoxColumn9 - // - this.dataGridViewTextBoxColumn9.HeaderText = "8"; - this.dataGridViewTextBoxColumn9.MinimumWidth = 6; - this.dataGridViewTextBoxColumn9.Name = "dataGridViewTextBoxColumn9"; - this.dataGridViewTextBoxColumn9.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewTextBoxColumn9.Width = 24; - // - // dataGridViewTextBoxColumn10 - // - this.dataGridViewTextBoxColumn10.HeaderText = "9"; - this.dataGridViewTextBoxColumn10.MinimumWidth = 6; - this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10"; - this.dataGridViewTextBoxColumn10.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewTextBoxColumn10.Width = 24; - // - // dataGridViewTextBoxColumn11 - // - this.dataGridViewTextBoxColumn11.HeaderText = "A"; - this.dataGridViewTextBoxColumn11.MinimumWidth = 6; - this.dataGridViewTextBoxColumn11.Name = "dataGridViewTextBoxColumn11"; - this.dataGridViewTextBoxColumn11.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewTextBoxColumn11.Width = 24; - // - // dataGridViewTextBoxColumn12 - // - this.dataGridViewTextBoxColumn12.HeaderText = "B"; - this.dataGridViewTextBoxColumn12.MinimumWidth = 6; - this.dataGridViewTextBoxColumn12.Name = "dataGridViewTextBoxColumn12"; - this.dataGridViewTextBoxColumn12.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewTextBoxColumn12.Width = 24; - // - // dataGridViewTextBoxColumn13 - // - this.dataGridViewTextBoxColumn13.HeaderText = "C"; - this.dataGridViewTextBoxColumn13.MinimumWidth = 6; - this.dataGridViewTextBoxColumn13.Name = "dataGridViewTextBoxColumn13"; - this.dataGridViewTextBoxColumn13.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewTextBoxColumn13.Width = 24; - // - // dataGridViewTextBoxColumn14 - // - this.dataGridViewTextBoxColumn14.HeaderText = "D"; - this.dataGridViewTextBoxColumn14.MinimumWidth = 6; - this.dataGridViewTextBoxColumn14.Name = "dataGridViewTextBoxColumn14"; - this.dataGridViewTextBoxColumn14.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewTextBoxColumn14.Width = 24; - // - // dataGridViewTextBoxColumn15 - // - this.dataGridViewTextBoxColumn15.HeaderText = "E"; - this.dataGridViewTextBoxColumn15.MinimumWidth = 6; - this.dataGridViewTextBoxColumn15.Name = "dataGridViewTextBoxColumn15"; - this.dataGridViewTextBoxColumn15.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewTextBoxColumn15.Width = 24; - // - // dataGridViewTextBoxColumn16 - // - this.dataGridViewTextBoxColumn16.HeaderText = "F"; - this.dataGridViewTextBoxColumn16.MinimumWidth = 6; - this.dataGridViewTextBoxColumn16.Name = "dataGridViewTextBoxColumn16"; - this.dataGridViewTextBoxColumn16.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewTextBoxColumn16.Width = 24; - // // HexEditorWindow // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); @@ -1084,53 +603,5 @@ private void InitializeComponent() { private System.Windows.Forms.ToolStripMenuItem goToAddressMenuItem1; private System.Windows.Forms.ToolStripMenuItem renameLabelMenuItem; private System.Windows.Forms.ToolStripMenuItem deleteLabelMenuItem; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn7; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn8; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn9; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn10; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn11; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn12; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn13; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn14; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn15; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn16; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn17; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn18; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn19; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn20; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn21; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn22; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn23; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn24; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn25; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn26; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn27; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn28; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn29; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn30; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn31; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn32; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn33; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn34; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn35; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn36; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn37; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn38; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn39; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn40; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn41; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn42; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn43; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn44; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn45; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn46; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn47; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn48; } } \ No newline at end of file diff --git a/PBRHex/MainWindow.cs b/PBRHex/MainWindow.cs index 0f6c628..61bc320 100644 --- a/PBRHex/MainWindow.cs +++ b/PBRHex/MainWindow.cs @@ -97,9 +97,8 @@ private void FlashTaskbar() { private void BuildFileTree() { BuildFileTreeLoop(Program.ISODir); - // expand first two nodes + // expand first nodes fileTreeView.Nodes[0].Expand(); - fileTreeView.Nodes[0].Nodes[0].Expand(); } private void BuildFileTreeLoop(string dir, TreeNode parentNode = null) { diff --git a/PBRHex/PBRHex.csproj b/PBRHex/PBRHex.csproj index 38cc45f..61e3b51 100644 --- a/PBRHex/PBRHex.csproj +++ b/PBRHex/PBRHex.csproj @@ -170,12 +170,6 @@ - - Component - - - Uninstall.cs - diff --git a/PBRHex/Tables/FSYSTable.cs b/PBRHex/Tables/FSYSTable.cs index 11bae03..f0c5877 100644 --- a/PBRHex/Tables/FSYSTable.cs +++ b/PBRHex/Tables/FSYSTable.cs @@ -24,7 +24,7 @@ public static void Initialize() { { lock(TableLock) { initStart.Set(); - string tocPath = $@"{Program.ISODir}\DATA\files\GSfsys.toc"; + string tocPath = $@"{Program.ISODir}\files\GSfsys.toc"; GSfsys = new FileBuffer(tocPath) { WorkingDir = FileUtils.CreateWorkspace(tocPath) }; @@ -122,7 +122,7 @@ public static FSYS GetFile(int id) { public static string MakePath(string name) { if(!name.EndsWith(".fsys")) name += ".fsys"; - string path = $@"{Program.ISODir}\DATA\files\{name}"; + string path = $@"{Program.ISODir}\files\{name}"; return path; } diff --git a/PBRHex/Uninstall.Designer.cs b/PBRHex/Uninstall.Designer.cs deleted file mode 100644 index 863a414..0000000 --- a/PBRHex/Uninstall.Designer.cs +++ /dev/null @@ -1,34 +0,0 @@ - -namespace PBRHex -{ - partial class Uninstall - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) { - if(disposing && (components != null)) { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Component Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() { - components = new System.ComponentModel.Container(); - } - - #endregion - } -} \ No newline at end of file diff --git a/PBRHex/Uninstall.cs b/PBRHex/Uninstall.cs deleted file mode 100644 index fc937a3..0000000 --- a/PBRHex/Uninstall.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections; -using System.ComponentModel; -using System.Configuration.Install; -using System.IO; - -namespace PBRHex -{ - [RunInstaller(true)] - public partial class Uninstall : Installer - { - protected override void OnAfterUninstall(IDictionary savedState) { - base.OnAfterUninstall(savedState); - Directory.Delete(Program.DataDir, true); - } - } -} diff --git a/PBRHex/Utils/CommandUtils.cs b/PBRHex/Utils/CommandUtils.cs index 13b048f..66cf97f 100644 --- a/PBRHex/Utils/CommandUtils.cs +++ b/PBRHex/Utils/CommandUtils.cs @@ -34,11 +34,11 @@ public static void CompressLZSSFiles(string indir, string outdir) { public static void UnpackISO(string inpath) { FileUtils.DeleteDirectory(Program.ISODir); - RunProcess($@"{witDir}\wit.exe", $@"EXTRACT ""{inpath}"" ""{Program.ISODir}"""); - FileUtils.DeleteFile($@"{Program.ISODir}\DATA\align-files.txt"); - FileUtils.DeleteFile($@"{Program.ISODir}\DATA\setup.bat"); - FileUtils.DeleteFile($@"{Program.ISODir}\DATA\setup.sh"); - FileUtils.DeleteFile($@"{Program.ISODir}\DATA\setup.txt"); + RunProcess($@"{witDir}\wit.exe", $@"EXTRACT ""{inpath}"" ""{Program.ISODir}"" --psel ""DATA"""); + FileUtils.DeleteFile($@"{Program.ISODir}\align-files.txt"); + FileUtils.DeleteFile($@"{Program.ISODir}\setup.bat"); + FileUtils.DeleteFile($@"{Program.ISODir}\setup.sh"); + FileUtils.DeleteFile($@"{Program.ISODir}\setup.txt"); } public static void BuildISO(string outpath) { @@ -48,7 +48,7 @@ public static void BuildISO(string outpath) { public static Process RunDolphin() { return RunProcess($"Dolphin.exe", - $@"-b -e ""{Program.ISODir}\DATA\sys\main.dol""", false); + $@"-b -e ""{Program.ISODir}\sys\main.dol""", false); } private static Process RunProcess(string path, string args, bool wait = true) {