modify original spd header instead of generating a new one

Sewer56 · Oct 10, 2023 · cc8f7e0 · cc8f7e0
1 parent 3cba029
commit cc8f7e0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 16 deletions.
diff --git a/Emulator/SPD.File.Emulator/Spd/SpdBuilder.cs b/Emulator/SPD.File.Emulator/Spd/SpdBuilder.cs
@@ -128,23 +128,18 @@ public override unsafe MultiStream Build(IntPtr handle, string filepath, Logger?
         MemoryStream headerStream = new(HEADER_LENGTH);
 
         // Write Header
-        headerStream.Write(0x30525053); // 'SPR0'
-        headerStream.Write(2); // unk04 (usually 2)
 
         // Calculate filesize
         long newFileSize = totalTextureSize + HEADER_LENGTH + textureEntryStream.Length + spriteStream.Length;
 
-        headerStream.Write((int)newFileSize); // filesize
-        headerStream.Write(0); // unk0c (usually 0)
-        headerStream.Write(32); // unk10 (usually 32)
+        _spdHeader._fileSize = (int)newFileSize;
+        _spdHeader._textureEntryCount = (short)_textureEntries.Count;
+        _spdHeader._spriteEntryCount = (short)_spriteEntries.Count;
+        _spdHeader._textureEntryOffset = HEADER_LENGTH;
+        _spdHeader._spriteEntryOffset = HEADER_LENGTH + (_textureEntries.Count * TEXTURE_ENTRY_LENGTH);
 
-        int textureCount = _textureEntries.Count;
-        headerStream.Write((short)textureCount); // texture count
-        headerStream.Write((short)_spriteEntries.Count); // sprite count
-        headerStream.Write(HEADER_LENGTH); // texture entry start offset
-        headerStream.Write(HEADER_LENGTH + (textureCount * TEXTURE_ENTRY_LENGTH)); // sprite entry start offset
+        headerStream.Write(_spdHeader);
 
-        // Calculate
         // Make Multistream
         var pairs = new List<StreamOffsetPair<Stream>>()
         {

diff --git a/Emulator/SPD.File.Emulator/Spd/SpdHeader.cs b/Emulator/SPD.File.Emulator/Spd/SpdHeader.cs
@@ -6,13 +6,13 @@ public struct SpdHeader
 #pragma warning disable IDE0051 // Remove unused private members
     int magic;
     int _unk04;
-    int _fileSize;
+    internal int _fileSize;
     int _unk0c;
     int _unk10;
-    short _textureEntryCount;
-    short _spriteEntryCount;
-    int _textureEntryOffset;
-    int _spriteEntryOffset;
+    internal short _textureEntryCount;
+    internal short _spriteEntryCount;
+    internal int _textureEntryOffset;
+    internal int _spriteEntryOffset;
 
     public readonly (short, int) GetTextureEntryCountAndOffset() => (_textureEntryCount, _textureEntryOffset);
     public readonly (short, int) GetSpriteEntryCountAndOffset() => (_spriteEntryCount, _spriteEntryOffset);