Virtual-World-RE/NeoGF
4
0
Fork 0
mirror of https://github.com/Virtual-World-RE/NeoGF.git synced 2024-11-15 13:55:35 +01:00
Code Issues Releases Wiki Activity

Compression fix (see message)

Browse Source 
Fix compression "value" from `0x3FF` to `0x7FF`. Now the file compress correctly.

Add bytes_align function that adds missing 0x00 bytes at the end of the file.

Minor variables rename to make them more explicit.
This commit is contained in:
Gabriel GRONDIN 2021-11-05 18:44:11 +01:00
parent 6bcf47ef54
commit 1ae6370675
Signed by: GGLinnk
GPG Key ID: 22C286336131C900
1 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
pzztool.py
View File

@ -1,23 +1,23 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
__version__ = "1.0" __version__ = "1.0"
__author__ = "rigodron, algoflash" __author__ = "rigodron, algoflash, GGLinnk"
__OriginalAutor__ = "infval" __OriginalAutor__ = "infval"
from pathlib import Path from pathlib import Path
from struct import unpack from struct import unpack
def pzz_decompress(b): def pzz_decompress(compressed_bytes: bytes):
bout = bytearray() uncompressed_bytes = bytearray()
size_b = len(b) compressed_bytes_size = len(compressed_bytes) // 2 * 2
cb = 0 # Control bytes cb = 0 # Control bytes
cb_bit = -1 cb_bit = -1
i = 0 i = 0
while i < size_b: while i < compressed_bytes_size:
if cb_bit < 0: if cb_bit < 0:
cb = b[i + 1] cb = compressed_bytes[i + 1]
cb |= b[i + 0] << 8 cb |= compressed_bytes[i + 0] << 8
cb_bit = 15 cb_bit = 15
i += 2 i += 2
continue continue
@ -27,26 +27,35 @@ def pzz_decompress(b):
print(compress_flag) print(compress_flag)
if compress_flag: if compress_flag:
c = b[i + 1] c = compressed_bytes[i + 1]
c |= b[i + 0] << 8 c |= compressed_bytes[i + 0] << 8
offset = (c & 0x7FF) * 2 offset = (c & 0x7FF) * 2
if offset == 0: if offset == 0:
break # End of the compressed data break # End of the compressed data
count = (c >> 11) * 2 count = (c >> 11) * 2
if count == 0: if count == 0:
i += 2 i += 2
c = b[i + 1] c = compressed_bytes[i + 1]
c |= b[i + 0] << 8 c |= compressed_bytes[i + 0] << 8
count = c * 2 count = c * 2
index = len(bout) - offset index = len(uncompressed_bytes) - offset
for j in range(count): for j in range(count):
bout.append(bout[index + j]) uncompressed_bytes.append(uncompressed_bytes[index + j])
else: else:
bout.extend(b[i: i + 2]) uncompressed_bytes.extend(compressed_bytes[i: i + 2])
i += 2 i += 2
return bout return uncompressed_bytes
def bytes_align(bout: bytes):
success = False
while not success:
bout.extend(b"\x00\x00")
address = len(bout)
if hex(address).endswith("00"):
break
def pzz_compress(b): def pzz_compress(b):
@ -60,7 +69,7 @@ def pzz_compress(b):
i = 0 i = 0
while i < size_b: while i < size_b:
start = max(i - 0x3FF * 2, 0) start = max(i - 0x7FF * 2, 0)
count_r = 0 count_r = 0
max_i = -1 max_i = -1
tmp = b[i: i + 2] tmp = b[i: i + 2]
@ -73,9 +82,9 @@ def pzz_compress(b):
if start != -1: if start != -1:
count = init_count count = init_count
while i < size_b - count \ while i < size_b - count \
and count < 0xFFFF * 2 \ and count < 0xFFFF * 2 \
and b[start + count ] == b[i + count ] \ and b[start + count] == b[i + count] \
and b[start + count + 1] == b[i + count + 1]: and b[start + count + 1] == b[i + count + 1]:
count += 2 count += 2
if count_r < count: if count_r < count:
count_r = count count_r = count
@ -120,6 +129,8 @@ def pzz_compress(b):
bout[cb_pos + 0] = cb >> 8 bout[cb_pos + 0] = cb >> 8
bout.extend(b"\x00\x00") bout.extend(b"\x00\x00")
bytes_align(bout)
return bout return bout