Fix Line Splitter & Add New Subtitles

* Fix Line Splitter * Add New Subtitles
wagrenier · Aug 12, 2021 · 4fb493b · 4fb493b
1 parent 3954aa6
commit 4fb493b
Show file tree

Hide file tree

Showing 5 changed files with 62 additions and 38 deletions.
diff --git a/ZeroUndubProcess/GameText/IntroSplashScreen.cs b/ZeroUndubProcess/GameText/IntroSplashScreen.cs
diff --git a/ZeroUndubProcess/GameText/TextUtils.cs b/ZeroUndubProcess/GameText/TextUtils.cs
diff --git a/ZeroUndubProcess/ZeroFileImporter.cs b/ZeroUndubProcess/ZeroFileImporter.cs
@@ -61,7 +61,7 @@ public void RestoreGame()
                     if (zeroFile.FileId == 660)
                     {
                         // Patch the title screen
-                        _euWriterHandler.PatchBytesAtAbsoluteOffset(0x4179F830, TextUtils.NewSplashScreen);
+                        _euWriterHandler.PatchBytesAtAbsoluteOffset(0x4179F830, IntroSplashScreen.NewSplashScreen);
                     }
 
                     if (UndubOptions.IsUndub)
@@ -111,7 +111,7 @@ private void InjectNewSubtitles(ZeroFile zeroFile)
             PatchBinarySubtitle();
 
             var subtitleOverallOffset = 0x0;
-            var subtitles = JsonSerializer.Deserialize<List<SubtitleFile>>(File.ReadAllText("transcribe_real.json"));
+            var subtitles = JsonSerializer.Deserialize<List<SubtitleFile>>(File.ReadAllText("transcribe.json"));
 
             for (var i = 0; i < EuIsoConstants.NumberSubtitles + 46; i++)
             {
@@ -200,6 +200,9 @@ private void SwapModels(ZeroFile euFile)
                     jpFileIndex = 42;
                     SwapHomeMenu(euFile, jpFileIndex);
                     return;
+                case 170:
+                    jpFileIndex = 66;
+                    break;
                 case 214:
                     jpFileIndex = 78;
                     break;
@@ -208,7 +211,6 @@ private void SwapModels(ZeroFile euFile)
                 case 493:
                 case 494:
                 case 495:
-                case 496:
                     jpFileIndex = 259;
                     SwapHomeMenu(euFile, jpFileIndex);
                     return;

diff --git a/ZeroUndubProcess/ZeroUndubProcess.csproj b/ZeroUndubProcess/ZeroUndubProcess.csproj
@@ -5,7 +5,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <None Update="transcribe_real.json">
+      <None Update="transcribe.json">
         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       </None>
     </ItemGroup>

diff --git a/ZeroUndubProcess/transcribe_real.json → ZeroUndubProcess/transcribe.json b/ZeroUndubProcess/transcribe_real.json → ZeroUndubProcess/transcribe.json
@@ -687,97 +687,97 @@
       {
             "Id": 137,
             "TextId": "SUBTITLES-5020-01",
-            "Text": "Ever since that day, I've stoped seeing things that other people don't see."
+            "Text": "Ever since that day, I stopped seeing things that other people don't see."
       },
       {
             "Id": 138,
             "TextId": "SUBTITLES-5020-02",
-            "Text": "138"
+            "Text": "Mafuyu, thank goodness."
       },
       {
             "Id": 139,
             "TextId": "SUBTITLES-5020-03",
-            "Text": "139"
+            "Text": "Don't forget your duty."
       },
       {
             "Id": 140,
             "TextId": "SUBTITLES-5020-05A",
-            "Text": "140"
+            "Text": "My duty is to keep this door closed."
       },
       {
             "Id": 141,
             "TextId": "SUBTITLES-5020-05B",
-            "Text": "141"
+            "Text": "Leave this gate to me."
       },
       {
             "Id": 142,
             "TextId": "SUBTITLES-5020-06",
-            "Text": "142"
+            "Text": "The rest of you hurry and escape!"
       },
       {
             "Id": 143,
             "TextId": "SUBTITLES-5020-07",
-            "Text": "143"
+            "Text": "But what about you?"
       },
       {
             "Id": 144,
             "TextId": "SUBTITLES-5020-08A",
-            "Text": "144"
+            "Text": "I must stop the Calamity or else it will happen again."
       },
       {
             "Id": 145,
             "TextId": "SUBTITLES-5020-09",
-            "Text": "145"
+            "Text": "Don't worry about me, you must go."
       },
       {
             "Id": 146,
             "TextId": "SUBTITLES-5020-10A",
-            "Text": "146"
+            "Text": "Mafuyu come on!"
       },
       {
             "Id": 147,
             "TextId": "SUBTITLES-5020-10B",
-            "Text": "147"
+            "Text": "Look!"
       },
       {
             "Id": 148,
             "TextId": "SUBTITLES-5020-11A",
-            "Text": "148"
+            "Text": "Their souls are all going back to where they belong."
       },
       {
             "Id": 149,
             "TextId": "SUBTITLES-5020-11B",
-            "Text": "149"
+            "Text": "Kirie..."
       },
       {
             "Id": 150,
             "TextId": "SUBTITLES-5020-12A",
-            "Text": "150"
+            "Text": "She was always struggling for life."
       },
       {
             "Id": 151,
             "TextId": "SUBTITLES-5020-12B",
-            "Text": "151"
+            "Text": "Her soul must remain there, keeping the gate sealed off for all eternity."
       },
       {
             "Id": 152,
             "TextId": "SUBTITLES-5020-13A",
-            "Text": "152"
+            "Text": "She had to sacrifice everything."
       },
       {
             "Id": 153,
             "TextId": "SUBTITLES-5020-13B",
-            "Text": "153"
+            "Text": "These souls may rest in piece but her soul will always suffer."
       },
       {
             "Id": 154,
             "TextId": "SUBTITLES-5020-14",
-            "Text": "154"
+            "Text": "Forever and ever..."
       },
       {
             "Id": 155,
             "TextId": "SUBTITLES-TAPE-W1-01",
-            "Text": "155"
+            "Text": "Ever since that day, we stopped seeing things that other people don't see."
       },
       {
             "Id": 156,
@@ -1032,7 +1032,7 @@
       {
             "Id": 206,
             "TextId": "SUBTITLES-GD-EDITOR-01",
-            "Text": "206"
+            "Text": "Ropes... ropes... always more ropes..."
       },
       {
             "Id": 207,
@@ -1057,7 +1057,7 @@
       {
             "Id": 211,
             "TextId": "SUBTITLES-GD-LOSTCHL3-01",
-            "Text": "211"
+            "Text": "How can I break the curse of the rope?"
       },
       {
             "Id": 212,
@@ -1077,7 +1077,7 @@
       {
             "Id": 215,
             "TextId": "SUBTITLES-GD-MASTER-01",
-            "Text": "215"
+            "Text": "I didn't want to come here.  My instincts told me not to."
       },
       {
             "Id": 216,
@@ -1092,7 +1092,7 @@
       {
             "Id": 218,
             "TextId": "SUBTITLES-GD-PRIEST3-01",
-            "Text": "Kirie..."
+            "Text": "Tomoe..."
       },
       {
             "Id": 219,
@@ -1102,12 +1102,12 @@
       {
             "Id": 220,
             "TextId": "SUBTITLES-MASTER-01",
-            "Text": "220"
+            "Text": "That girl is trying to say something. Something... important."
       },
       {
             "Id": 221,
             "TextId": "SUBTITLES-PRIEST1-01",
-            "Text": "221"
+            "Text": "Kirie...Kirie..."
       },
       {
             "Id": 222,