notwa/baku
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

mark files for no compression, reduce alignment

Browse source 
this fixes two files that weren't being dumped properly.
everything seems to be working now!
This commit is contained in:
Connor Olding 2018-08-11 04:40:49 +02:00
parent 431ee8e37d
commit 124e6d9f2c
1 changed files with 21 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
fs.py
View file

@ -40,8 +40,8 @@ def hexdump(data):
print(("{:06X} |" + " {:02X}" * len(butts)).format(i * 16, *butts)) print(("{:06X} |" + " {:02X}" * len(butts)).format(i * 16, *butts))
def pad_align_data(data): def pad_align_data(data):
if len(data) % 16 != 0: if len(data) % 8 != 0:
return data + bytearray(16 - len(data) % 16) return data + bytearray(8 - len(data) % 8)
else: else:
return data return data
@ -240,14 +240,7 @@ def create_rom(d):
rom_size = 8 * 1024 * 1024 rom_size = 8 * 1024 * 1024
base_offset = 0x2008 base_offset = 0x2008
# TODO: don't hardcode?: nocomps = []
skip_14 = [
32, # sound or music bank?
33, # sound or music bank?
220, # ?
221, # ?
267, # ?
]
with open(d + ".z64", "w+b") as f: with open(d + ".z64", "w+b") as f:
# initialize with zeros # initialize with zeros
@ -263,10 +256,12 @@ def create_rom(d):
f.seek(0) f.seek(0)
f.write(data) f.write(data)
elif "-" in fn: elif fn.endswith(".bin") and "-" in fn:
extless = fn.split(".")[0] extless = fn.split(".")[0]
di, fi = extless.split("-") di, fi = extless.split("-")[:2]
di, fi = int(di), int(fi) di, fi = int(di), int(fi)
if extless.endswith("-nocomp"):
nocomps.append((di, fi))
if di != old_di: if di != old_di:
old_fi = -1 old_fi = -1
old_di = di old_di = di
@ -288,7 +283,7 @@ def create_rom(d):
offset = 0 offset = 0
for fi, data in enumerate(files): for fi, data in enumerate(files):
f.write(W4(offset)) f.write(W4(offset))
if fi == 0 and di != 14 or di == 14 and fi in skip_14: if fi == 0 and di != 14 or (di, fi) in nocomps:
new_data = data new_data = data
else: else:
#new_data = compress(data, "best" if di == 14 else "greedy") #new_data = compress(data, "best" if di == 14 else "greedy")
@ -341,20 +336,23 @@ def dump_files(f):
header_resume = f.tell() header_resume = f.tell()
seek_to = offset + base_offset + block_offset seek_to = offset + base_offset + block_offset
#print(f"offset: {offset:08X}")
#print(f"base_offset: {base_offset:08X}")
#print(f"block_offset: {block_offset:08X}")
fn = f"{dir_index:02}-{file_index:03}.bin"
print(f"extracting file at {seek_to:06X} to {fn}")
f.seek(seek_to) f.seek(seek_to)
hint = R1(f.read(1)) # TODO: what is this really? temp = f.read(4)
if hint == 0: hint = temp[0] # TODO: what is this really?
uncompressed_size = R4(b"\0" + f.read(3)) uncompressed_size = R4(temp)
is_compressed = hint == 0 and uncompressed_size != 0
fn = f"{dir_index:02}-{file_index:03}.bin"
if not is_compressed:
fn = fn.replace(".bin", "-nocomp.bin")
print(f"extracting file at {seek_to:06X} to {fn}")
if is_compressed:
data = decompress(f.read(size - 4), uncompressed_size) data = decompress(f.read(size - 4), uncompressed_size)
else: else:
print("hinted:", fn) data = temp + f.read(size - 4)
data = bytes([hint]) + f.read(size - 1)
dump_as(data, fn) dump_as(data, fn)
f.seek(header_resume) f.seek(header_resume)