Extract ROM segments from gc-eu-mq (take 2) (#1709)

* Extract ROM segments from gc-eu-mq (take 2)

* Apply suggestions from code review

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Typo

* dma_{start,names} -> dmadata_{start,names}

* Restore dest

* Don't assume rom location == vrom location

---------

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
This commit is contained in:
cadmic
2024-02-04 19:59:09 -08:00
committed by GitHub
parent 454b1caa52
commit 54ffd50fa2
9 changed files with 3148 additions and 1635 deletions
+12 -19
View File
@@ -34,17 +34,6 @@ def decompress(data: bytes, is_zlib_compressed: bool) -> bytes:
return crunch64.yaz0.decompress(data)
FILE_TABLE_OFFSET = {
"gc-eu-mq": 0x07170,
"gc-eu-mq-dbg": 0x12F70,
}
VERSIONS_MD5S = {
"gc-eu-mq": "1a438f4235f8038856971c14a798122a",
"gc-eu-mq-dbg": "f0b7f35375f9cc8ca1b2d59d78e35405",
}
def round_up(n, shift):
mod = 1 << shift
return (n + mod - 1) >> shift << shift
@@ -64,7 +53,7 @@ def update_crc(decompressed: io.BytesIO) -> io.BytesIO:
def decompress_rom(
file_content: bytearray,
dmadata_offset: int,
dmadata_start: int,
dma_entries: list[dmadata.DmaEntry],
is_zlib_compressed: bool,
) -> bytearray:
@@ -93,7 +82,7 @@ def decompress_rom(
decompressed.seek(vrom_st)
decompressed.write(data)
# write new dmadata
decompressed.seek(dmadata_offset)
decompressed.seek(dmadata_start)
for dma_entry in new_dmadata:
entry_data = bytearray(dmadata.DmaEntry.SIZE_BYTES)
dma_entry.to_bin(entry_data)
@@ -177,17 +166,21 @@ def main():
parser.add_argument(
"version",
help="Version of the game to decompress.",
choices=list(VERSIONS_MD5S.keys()),
)
args = parser.parse_args()
version = args.version
uncompressed_path = Path(f"baseroms/{version}/baserom-decompressed.z64")
baserom_dir = Path(f"baseroms/{version}")
if not baserom_dir.exists():
print(f"Error: Unknown version '{version}'.")
exit(1)
dmadata_offset = FILE_TABLE_OFFSET[version]
correct_str_hash = VERSIONS_MD5S[version]
uncompressed_path = baserom_dir / "baserom-decompressed.z64"
dmadata_start = int((baserom_dir / "dmadata_start.txt").read_text(), 16)
correct_str_hash = (baserom_dir / "checksum.md5").read_text().split()[0]
if check_existing_rom(uncompressed_path, correct_str_hash):
print("Found valid baserom - exiting early")
@@ -225,13 +218,13 @@ def main():
file_content = per_version_fixes(file_content, version)
dma_entries = dmadata.read_dmadata(file_content, dmadata_offset)
dma_entries = dmadata.read_dmadata(file_content, dmadata_start)
# Decompress
if any(dma_entry.is_compressed() for dma_entry in dma_entries):
print("Decompressing rom...")
is_zlib_compressed = version in {"ique-cn", "ique-zh"}
file_content = decompress_rom(
file_content, dmadata_offset, dma_entries, is_zlib_compressed
file_content, dmadata_start, dma_entries, is_zlib_compressed
)
file_content = pad_rom(file_content, dma_entries)