Fix Cutscene Bug

wagrenier · Aug 11, 2021 · 67ddbf3 · 67ddbf3
1 parent 6ded831
commit 67ddbf3
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 5 deletions.
diff --git a/ZeroUndubProcess/ExternalProcess.cs b/ZeroUndubProcess/ExternalProcess.cs
@@ -25,7 +25,8 @@ public static void PssDemux(int fileId, string region, string folder)
                 {
                     FileName = "PSS_Plex.exe",
                     UseShellExecute = false,
-                    CreateNoWindow = false,
+                    CreateNoWindow = true,
+                    WindowStyle = ProcessWindowStyle.Hidden,
                     Arguments = args
                 }
             };
@@ -57,7 +58,8 @@ public static void PssMux(int fileId, string folder)
                 {
                     FileName = "PSS_Plex.exe",
                     UseShellExecute = false,
-                    CreateNoWindow = false,
+                    CreateNoWindow = true,
+                    WindowStyle = ProcessWindowStyle.Hidden,
                     Arguments = args
                 }
             };
@@ -75,7 +77,6 @@ public static void PssMux(int fileId, string folder)
                 {
                 }
             }
-
 
             File.Delete($"{folder}/{fileId}_eu.WAV");
             File.Delete($"{folder}/{fileId}_jp.WAV");

diff --git a/ZeroUndubProcess/PssAudioHandler.cs b/ZeroUndubProcess/PssAudioHandler.cs
@@ -0,0 +1,7 @@
+namespace ZeroUndubProcess
+{
+    public sealed class PssAudioHandler
+    {
+
+    }
+}
diff --git a/ZeroUndubProcess/WriterIsoHandler.cs b/ZeroUndubProcess/WriterIsoHandler.cs
@@ -74,7 +74,7 @@ public void OverwriteFile(ZeroFile zeroFile, byte[] buffer)
 
             if (newFileSize > (int) zeroFile.Size)
             {
-                Console.WriteLine($"File {zeroFile.FileId} cannot be undubbed.");
+                Console.WriteLine($"File {zeroFile.FileId} cannot be undubbed. Difference of {newFileSize - zeroFile.Size}");
                 return;
             }
 

diff --git a/ZeroUndubProcess/ZeroFileImporter.cs b/ZeroUndubProcess/ZeroFileImporter.cs
@@ -46,7 +46,7 @@ public void RestoreGame()
                 {
                     UndubbedFiles = i;
                     var zeroFile = _euReaderHandler.ExtractFileInfo(i);
-                    Console.WriteLine($"FileId: {zeroFile.FileId}, Offset: {zeroFile.Offset}, Size: {zeroFile.Size}");
+                    //Console.WriteLine($"FileId: {zeroFile.FileId}, Offset: {zeroFile.Offset}, Size: {zeroFile.Size}");
 
                     if (zeroFile.FileId == 660)
                     {
@@ -155,6 +155,7 @@ private void PssUndub(ZeroFile zeroFile)
                 if (newVideoBuffer.Length > pss[i].EuSize)
                 {
                     Console.WriteLine($"File {pss[i].Filename} is too big to be imported");
+                    continue;
                 }
 
                 _euWriterHandler.PatchBytesAtAbsoluteOffset(pss[i].EuOffset, newVideoBuffer);
@@ -249,6 +250,18 @@ private void SwapModels(ZeroFile euFile)
                 case 1067:
                     jpFileIndex = 748;
                     break;
+                case 1068:
+                    jpFileIndex = 749;
+                    break;
+                case 1069:
+                    jpFileIndex = 750;
+                    break;
+                case 1070:
+                    jpFileIndex = 751;
+                    break;
+                case 1071:
+                    jpFileIndex = 752;
+                    break;
                 default:
                     return;
             }