Initial Release 1.0

wagrenier · wagrenier · commit d7ad55e5b02e · 2021-09-11T16:56:38.000-04:00
* All assets that are smaller or equal size in the JP version will be undubbed
* Audio files that are larger are appended at the end of the archive file
* All FMV are undubbed, but some will retain the english text/logo
* Over 30 voice clips restored from the JP version
* All audio in Japanese!
* Custom splash screen
diff --git a/README.md b/README.md
@@ -7,13 +7,19 @@
 
 ## Undub project for Fatal Frame 2 PS2 (Project Zero 2零紅い蝶)
 
+![](docs/splash.gif)
+
 Includes:
 * All assets that are smaller or equal size in the JP version will be undubbed
 * Audio files that are larger are appended at the end of the archive file
 * All FMV are undubbed, but some will retain the english text/logo
+* Over 30 voice clips restored from the JP version
+* All audio in Japanese!
+* *Custom splash screen
 
 Next version:
 * New more accurate subtitle (?)
+* (Coming soon!) EU support
 
 What this programs needs:
 * Your owned copy of Fatal Frame 2 ISO (US)
diff --git a/Zero2UndubProcess/Constants/GameConstants.cs b/Zero2UndubProcess/Constants/GameConstants.cs
@@ -3,5 +3,6 @@ namespace Zero2UndubProcess.Constants
     public static class GameConstants
     {
         public const int FileInfoByteSize = 0xC;
+        public static byte[] LogoPatch = new byte[] {0xC0, 0x2C, 0x32, 0x65, 0x46, 0x68, 0x06, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x02, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
     }
 }
diff --git a/Zero2UndubProcess/Constants/GameRegionConstants.cs b/Zero2UndubProcess/Constants/GameRegionConstants.cs
@@ -5,12 +5,13 @@ public static class GameRegionConstants
         public static class EuIsoConstants
         {
             public const string TitleId = "SLES_523.84";
-            public const int NumberFiles = 0x879;
-            public const long FileTableStartAddress = 0xA63000;
-            public const long FileTypeTableStartAddress = 0x2082D000;
-            public const long FileArchiveStartAddress = 0x30D40000;
-            public const long FileArchiveEndAddress = 0x9168B000;
-            public const long FileArchiveEndIsoAddress = 0xC23CB000;
+            public const int NumberFiles = 0x879; // TODO: Change
+            public const long FileTableStartAddress = 0xA63000; // TODO: Change
+            public const long FileTypeTableStartAddress = 0x2082D000; // TODO: Change
+            public const long FileArchiveStartAddress = 0x493E0000;
+            public const long FileArchiveEndAddress = 0x92A40000;
+            public const long FileArchiveEndIsoAddress = 0xDBE20000;
+            public const long LogoDatOffset = 0x2C4130;
         }
 
         public static class UsIsoConstants
@@ -22,6 +23,7 @@ public static class UsIsoConstants
             public const long FileArchiveStartAddress = 0x30D40000;
             public const long FileArchiveEndAddress = 0x9168B000;
             public const long FileArchiveEndIsoAddress = 0xC23CB000;
+            public const long LogoDatOffset = 0x2C4130;
         }
 
         public static class JpIsoConstants
@@ -33,6 +35,7 @@ public static class JpIsoConstants
             public const long FileArchiveStartAddress = 0x30D40000;
             public const long FileArchiveEndAddress = 0x91566000;
             public const long FileArchiveEndIsoAddress = 0xC22A6000;
+            public const long LogoDatOffset = 0x2C4130;
         }
     }
 }
diff --git a/Zero2UndubProcess/GameFiles/RegionHandler.cs b/Zero2UndubProcess/GameFiles/RegionHandler.cs
@@ -44,7 +44,8 @@ private static RegionInfo GetRegionInfoFromGameRegion(GameRegions gameRegion)
                     FileTypeTableStartAddress = GameRegionConstants.EuIsoConstants.FileTypeTableStartAddress,
                     NumberFiles = GameRegionConstants.EuIsoConstants.NumberFiles,
                     FileArchiveEndAddress = GameRegionConstants.EuIsoConstants.FileArchiveEndAddress,
-                    FileArchiveEndIsoAddress = GameRegionConstants.EuIsoConstants.FileArchiveEndIsoAddress
+                    FileArchiveEndIsoAddress = GameRegionConstants.EuIsoConstants.FileArchiveEndIsoAddress,
+                    LogoDatOffset = GameRegionConstants.EuIsoConstants.LogoDatOffset
                 },
                 GameRegions.USA => new RegionInfo
                 {
@@ -53,7 +54,8 @@ private static RegionInfo GetRegionInfoFromGameRegion(GameRegions gameRegion)
                     FileTypeTableStartAddress = GameRegionConstants.UsIsoConstants.FileTypeTableStartAddress,
                     NumberFiles = GameRegionConstants.UsIsoConstants.NumberFiles,
                     FileArchiveEndAddress = GameRegionConstants.UsIsoConstants.FileArchiveEndAddress,
-                    FileArchiveEndIsoAddress = GameRegionConstants.UsIsoConstants.FileArchiveEndIsoAddress
+                    FileArchiveEndIsoAddress = GameRegionConstants.UsIsoConstants.FileArchiveEndIsoAddress,
+                    LogoDatOffset = GameRegionConstants.UsIsoConstants.LogoDatOffset
                 },
                 GameRegions.Japan => new RegionInfo
                 {
@@ -62,7 +64,8 @@ private static RegionInfo GetRegionInfoFromGameRegion(GameRegions gameRegion)
                     FileTypeTableStartAddress = GameRegionConstants.JpIsoConstants.FileTypeTableStartAddress,
                     NumberFiles = GameRegionConstants.JpIsoConstants.NumberFiles,
                     FileArchiveEndAddress = GameRegionConstants.JpIsoConstants.FileArchiveEndAddress,
-                    FileArchiveEndIsoAddress = GameRegionConstants.JpIsoConstants.FileArchiveEndIsoAddress
+                    FileArchiveEndIsoAddress = GameRegionConstants.JpIsoConstants.FileArchiveEndIsoAddress,
+                    LogoDatOffset = GameRegionConstants.JpIsoConstants.LogoDatOffset
                 },
                 GameRegions.UNKNOWN => throw new Exception("Unknown game region."),
                 _=> throw new Exception("Unknown game region.")
@@ -97,6 +100,7 @@ public class RegionInfo
         public long FileTypeTableStartAddress { get; init; }
         public long FileArchiveEndAddress { get; set; }
         public long FileArchiveEndIsoAddress { get; set; }
+        public long LogoDatOffset { get; set; }
         public int NumberFiles { get; init; }
     }
 
diff --git a/Zero2UndubProcess/GameFiles/SplashScreen.cs b/Zero2UndubProcess/GameFiles/SplashScreen.cs
diff --git a/Zero2UndubProcess/Importer/ZeroFileImporter.cs b/Zero2UndubProcess/Importer/ZeroFileImporter.cs
@@ -38,9 +38,9 @@ public void RestoreGame()
                     var originFile = _isoHandler.OriginGetFile(i);
 
                     // Check for splash screen logo
-                    if (targetFile.FileId == 3)
+                    if (targetFile.FileId == 2)
                     {
-                        
+                        _isoHandler.OverwriteSplashScreen(originFile, targetFile);
                     }
 
                     if (targetFile.Type != FileType.VIDEO && targetFile.Type != FileType.AUDIO)
diff --git a/Zero2UndubProcess/Iso/IsoHandler.cs b/Zero2UndubProcess/Iso/IsoHandler.cs
@@ -1,4 +1,5 @@
 using System.IO;
+using Zero2UndubProcess.Constants;
 using Zero2UndubProcess.GameFiles;
 using Zero2UndubProcess.Pss;
 
@@ -71,12 +72,20 @@ public void LargerVideoUndub(ZeroFile origin, ZeroFile target)
 
         public void AppendFile(ZeroFile origin, ZeroFile target)
         {
-            var originHeaderFile = OriginGetFile(origin.FileId - 1);
-            var targetHeaderFile = TargetGetFile(target.FileId - 1);
-            
+            if (target.Type == FileType.AUDIO)
+            {
+                var originHeaderFile = OriginGetFile(origin.FileId - 1);
+                var targetHeaderFile = TargetGetFile(target.FileId - 1);
+                _targetIsoWriter.OverwriteFile(originHeaderFile, targetHeaderFile, GetFileContentOrigin(originHeaderFile));
+            }
+
             _targetIsoWriter.AppendFile(origin, target, GetFileContentOrigin(origin));
+        }
 
-            _targetIsoWriter.OverwriteFile(originHeaderFile, targetHeaderFile, GetFileContentOrigin(originHeaderFile));
+        public void OverwriteSplashScreen(ZeroFile origin, ZeroFile target)
+        {
+            _targetIsoWriter.AppendCompressedFile(origin, target, SplashScreen.Content);
+            _targetIsoWriter.PatchBytesAtAbsoluteAddress(IsoRegionHandler.TargetRegionInfo.LogoDatOffset, GameConstants.LogoPatch);
         }
 
         private byte[] GetFileContentOrigin(ZeroFile origin)
diff --git a/Zero2UndubProcess/Iso/IsoWriter.cs b/Zero2UndubProcess/Iso/IsoWriter.cs
@@ -36,6 +36,12 @@ public void OverwriteFile(ZeroFile origin, ZeroFile target, byte[] fileContent)
             SeekFile(target);
             _writer.Write(fileContent);
         }
+
+        public void AppendCompressedFile(ZeroFile origin, ZeroFile target, byte[] fileContent)
+        {
+            AppendFile(origin, target, fileContent);
+            WriteNewSizeFileCompressed(origin, target, fileContent.Length);
+        }
         
         public void AppendFile(ZeroFile origin, ZeroFile target, byte[] fileContent)
         {
@@ -52,15 +58,20 @@ public void AppendFile(ZeroFile origin, ZeroFile target, byte[] fileContent)
             _regionInfo.FileArchiveEndAddress += fileContent.Length + blankBytes;
             
             WriteNewAddressFile(origin, target, startAddress);
+            WriteNewSizeFile(origin, target, fileContent.Length);
+        }
+
+        public void PatchBytesAtAbsoluteAddress(long address, byte[] patch)
+        {
+            _writer.BaseStream.Seek(address, SeekOrigin.Begin);
+            _writer.BaseStream.Write(patch);
         }
 
         private void WriteNewAddressFile(ZeroFile origin, ZeroFile target, uint newStartAddress)
         {
             var fileSizeOffset = target.FileId * GameConstants.FileInfoByteSize;
-            
             SeekFileTableOffset(fileSizeOffset);
             _writer.Write(newStartAddress);
-            WriteNewSizeFile(origin, target, (int)origin.Size);
         }
 
         private void WriteNewSizeFile(ZeroFile origin, ZeroFile target, int newSize)
@@ -70,6 +81,13 @@ private void WriteNewSizeFile(ZeroFile origin, ZeroFile target, int newSize)
             _writer.Write((uint) newSize);
         }
         
+        private void WriteNewSizeFileCompressed(ZeroFile origin, ZeroFile target, int newSize)
+        {
+            var fileSizeOffset = target.FileId * GameConstants.FileInfoByteSize + 0x8;
+            SeekFileTableOffset(fileSizeOffset);
+            _writer.Write(newSize);
+        }
+        
         private void SeekFileTableOffset(long offset)
         {
             _writer.BaseStream.Seek(_regionInfo.FileTableStartAddress, SeekOrigin.Begin);
diff --git a/docs/splash.gif b/docs/splash.gif

Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,6 @@ namespace Zero2UndubProcess.Constants`
`3`	`3`	`public static class GameConstants`
`4`	`4`	`{`
`5`	`5`	`public const int FileInfoByteSize = 0xC;`
	`6`	`+ public static byte[] LogoPatch = new byte[] {0xC0, 0x2C, 0x32, 0x65, 0x46, 0x68, 0x06, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x02, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};`
`6`	`7`	`}`
`7`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,12 +5,13 @@ public static class GameRegionConstants`
`5`	`5`	`public static class EuIsoConstants`
`6`	`6`	`{`
`7`	`7`	`public const string TitleId = "SLES_523.84";`
`8`		`- public const int NumberFiles = 0x879;`
`9`		`- public const long FileTableStartAddress = 0xA63000;`
`10`		`- public const long FileTypeTableStartAddress = 0x2082D000;`
`11`		`- public const long FileArchiveStartAddress = 0x30D40000;`
`12`		`- public const long FileArchiveEndAddress = 0x9168B000;`
`13`		`- public const long FileArchiveEndIsoAddress = 0xC23CB000;`
	`8`	`+ public const int NumberFiles = 0x879; // TODO: Change`
	`9`	`+ public const long FileTableStartAddress = 0xA63000; // TODO: Change`
	`10`	`+ public const long FileTypeTableStartAddress = 0x2082D000; // TODO: Change`
	`11`	`+ public const long FileArchiveStartAddress = 0x493E0000;`
	`12`	`+ public const long FileArchiveEndAddress = 0x92A40000;`
	`13`	`+ public const long FileArchiveEndIsoAddress = 0xDBE20000;`
	`14`	`+ public const long LogoDatOffset = 0x2C4130;`
`14`	`15`	`}`
`15`	`16`
`16`	`17`	`public static class UsIsoConstants`
`@@ -22,6 +23,7 @@ public static class UsIsoConstants`
`22`	`23`	`public const long FileArchiveStartAddress = 0x30D40000;`
`23`	`24`	`public const long FileArchiveEndAddress = 0x9168B000;`
`24`	`25`	`public const long FileArchiveEndIsoAddress = 0xC23CB000;`
	`26`	`+ public const long LogoDatOffset = 0x2C4130;`
`25`	`27`	`}`
`26`	`28`
`27`	`29`	`public static class JpIsoConstants`
`@@ -33,6 +35,7 @@ public static class JpIsoConstants`
`33`	`35`	`public const long FileArchiveStartAddress = 0x30D40000;`
`34`	`36`	`public const long FileArchiveEndAddress = 0x91566000;`
`35`	`37`	`public const long FileArchiveEndIsoAddress = 0xC22A6000;`
	`38`	`+ public const long LogoDatOffset = 0x2C4130;`
`36`	`39`	`}`
`37`	`40`	`}`
`38`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,9 +38,9 @@ public void RestoreGame()`
`38`	`38`	`var originFile = _isoHandler.OriginGetFile(i);`
`39`	`39`
`40`	`40`	`// Check for splash screen logo`
`41`		`- if (targetFile.FileId == 3)`
	`41`	`+ if (targetFile.FileId == 2)`
`42`	`42`	`{`
`43`		`-`
	`43`	`+ _isoHandler.OverwriteSplashScreen(originFile, targetFile);`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`if (targetFile.Type != FileType.VIDEO && targetFile.Type != FileType.AUDIO)`