Edit Wit call to only export the DATA partition

bgsamm · Nov 14, 2021 · 6577777 · 6577777
1 parent 7a199d6
commit 6577777
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 598 deletions.
diff --git 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<uint, string>();
             string path = $@"{Program.UserDir}\comments.txt";

diff --git a/PBRHex/HexEditor/HexEditorWindow.Designer.cs b/PBRHex/HexEditor/HexEditorWindow.Designer.cs
diff --git 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
@@ -170,12 +170,6 @@
     <Compile Include="Tables\ItemTable.cs" />
     <Compile Include="Tables\MoveTable.cs" />
     <Compile Include="Tables\PassTable.cs" />
-    <Compile Include="Uninstall.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="Uninstall.Designer.cs">
-      <DependentUpon>Uninstall.cs</DependentUpon>
-    </Compile>
     <Compile Include="Tables\DexTable.cs" />
     <Compile Include="Tables\FSYSTable.cs" />
     <Compile Include="Tables\ModelTable.cs" />

diff --git 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
diff --git a/PBRHex/Uninstall.cs b/PBRHex/Uninstall.cs
diff --git 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) {