mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-06 16:04:35 +00:00
Code Issues Projects Releases Wiki Activity

Remove 0xFF padding from uncompressed ROMs (#1910)

Browse source 
* Remove 0xFF padding from uncompressed ROMs

* Add comment about overdump contents

* Update checksum in README

* Reword comment
This commit is contained in:
cadmic 2024-03-04 08:39:16 -08:00 • committed by GitHub
parent e7b1868d84
commit 01a5fa9a45
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 14 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

25
tools/decompress_baserom.py
View file

@ -88,9 +88,10 @@ def decompress_rom(
dma_entry.to_bin(entry_data)
decompressed.write(entry_data)
# pad to size
padding_end = round_up(dma_entries[-1].vrom_end, 14)
decompressed.seek(padding_end - 1)
decompressed.write(bytearray([0]))
padding_start = dma_entries[-1].vrom_end
padding_end = round_up(padding_start, 12)
decompressed.seek(padding_start)
decompressed.write(b"\x00" * (padding_end - padding_start))
# re-calculate crc
return bytearray(update_crc(decompressed).getbuffer())
@ -127,9 +128,10 @@ def byte_swap(file_content: bytearray) -> bytearray:
def per_version_fixes(file_content: bytearray, version: str) -> bytearray:
if version == "gc-eu-mq-dbg":
# Strip the overdump
# Strip the overdump, which consists of an area of 0xFF bytes (which may
# be erased flash memory) and ROM data from an unrelated game
print("Stripping overdump...")
file_content = file_content[0:0x3600000]
file_content = file_content[0:0x035CF000]
# Patch the header
print("Patching header...")
@ -137,15 +139,6 @@ def per_version_fixes(file_content: bytearray, version: str) -> bytearray:
return file_content
def pad_rom(file_content: bytearray, dma_entries: list[dmadata.DmaEntry]) -> bytearray:
padding_start = round_up(dma_entries[-1].vrom_end, 12)
padding_end = round_up(dma_entries[-1].vrom_end, 14)
print(f"Padding from {padding_start:X} to {padding_end:X}...")
for i in range(padding_start, padding_end):
file_content[i] = 0xFF
return file_content
# Determine if we have a ROM file
ROM_FILE_EXTENSIONS = ["z64", "n64", "v64"]
@ -227,8 +220,6 @@ def main():
file_content, dmadata_start, dma_entries, is_zlib_compressed
)
file_content = pad_rom(file_content, dma_entries)
# Check to see if the ROM is a "vanilla" ROM
str_hash = get_str_hash(file_content)
if str_hash != correct_str_hash:
@ -237,7 +228,7 @@ def main():
)
if version == "gc-eu-mq-dbg":
if str_hash == "32fe2770c0f9b1a9cd2a4d449348c1cb":
if str_hash == "9fede30e3239558cf3993f12b7ed7458":
print(
"The provided baserom is a rom which has been edited with ZeldaEdit and is not suitable for use with decomp. Find a new one."
)