Leahnaya/pk3DS
1
0
Fork 0
mirror of https://github.com/kwsch/pk3DS.git synced 2026-10-02 05:46:47 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update Decompression

Browse Source 
Signed is now handled properly; shared bit behavior should be much more
apparent
This commit is contained in:
Kurt
2015-05-21 22:35:05 -07:00
parent c8dc7b6e6f
commit fb937f00c8
2 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pk3DS/Subforms/OWSE.cs
View File

@@ -140,7 +140,6 @@ private void getScriptData()
byte[] compressed = ScriptData.Skip(start).ToArray();
string c = Util.getHexString(compressed);
compressed = File.ReadAllBytes("raw.bin");
byte[] decompressed = Scripts.decompressScript(compressed);
string d = Util.getHexString(decompressed);

22
pk3DS/Tools/Scripts.cs
View File

@@ -36,28 +36,26 @@ internal static byte[] decompressScript(byte[] data)
if (compressedBytes.Length > 1 && (compressedBytes[1] >> 7) > 0) // Many-bits-required command
{
// 2 Byte Signed Parameter
// Process Many-bits instructional
// there can only be 1 manybit based on max CMD value restriction; simple.
int cmd = (compressedBytes[1] & 0x7F << 7) | compressedBytes[2];
bw.Write(BitConverter.GetBytes((ushort)cmd), 0, 2);
int cmd = (compressedBytes[0] & 0x3 << 14) | (compressedBytes[1] & 0x7F << 7) | compressedBytes[2]; // 16 Bits total
bw.Write(BitConverter.GetBytes(cmd), 0, 2);
int deviation = -((val & 0x3F) >> 1);
bw.Write(BitConverter.GetBytes(deviation), 0, 2);
int deviation = ((val & 0x3F) - 0x40) >> 2; // Lowest 2 bits have already been used for the command
bw.Write(BitConverter.GetBytes(deviation), 0, 2); // 16 Bits
}
else if ((val >> 7) > 0)
{
// 3 Byte Signed Parameter
// Process Many-bits instructional
bw.Write((byte)(((val & 0x1) << 7) | compressedBytes[1])); // bottom bit is sent to low byte as the 8th bit
int cmd = ((compressedBytes[0] << 7) | compressedBytes[1]);
bw.Write(BitConverter.GetBytes(cmd), 0, 1); // 8 Bits Total
int deviation = ((val & 0x3F) >> 1) - 0x40;
bw.Write(BitConverter.GetBytes(deviation), 0, 3);
int deviation = ((val & 0x3F) - 0x40) >> 1; // Lowest bit has already been used for the command
bw.Write(BitConverter.GetBytes(deviation), 0, 3); // 24 Bits
}
else
{
// 4 Byte Signed Parameter
int deviation = ((val & 0x3F) >> 1) - 0x40;
bw.Write(BitConverter.GetBytes(deviation), 0, 4);
int deviation = ((val & 0x3F) - 0x40) >> 0; // No bits have already been used; no command
bw.Write(BitConverter.GetBytes(deviation), 0, 4); // 32 Bits
}
}
else if ((val >> 7) > 0) // Manybit