diff --git a/common/util/read_iso_file.cpp b/common/util/read_iso_file.cpp index ed35889659..4d5051932e 100644 --- a/common/util/read_iso_file.cpp +++ b/common/util/read_iso_file.cpp @@ -79,7 +79,7 @@ void add_from_dir(FILE* fp, u32 sector, u32 size, IsoFile::Entry* parent) { } else { entry.name.pop_back(); entry.name.pop_back(); - entry.offset_in_file = SECTOR_SIZE * extent; + entry.offset_in_file = (u64)SECTOR_SIZE * (u64)extent; entry.size = dir_or_file_size; } } @@ -100,7 +100,8 @@ void unpack_entry(FILE* fp, } } else { if (print_progress) { - lg::info("Extracting {}...", entry.name); + lg::info("Extracting {}, size 0x{:x} offset 0x{:x}...", entry.name, entry.size, + entry.offset_in_file); } std::vector buffer(entry.size); if (fseek_64(fp, entry.offset_in_file, SEEK_SET)) { diff --git a/decompiler/extractor/extractor_util.cpp b/decompiler/extractor/extractor_util.cpp index d3f58eb54d..56fe0c96c6 100644 --- a/decompiler/extractor/extractor_util.cpp +++ b/decompiler/extractor/extractor_util.cpp @@ -83,9 +83,9 @@ extractor_iso_database() { {{18445016742498932084U, // hash of ELF {"Jak II", // canonical name GAME_TERRITORY_SCEA, - 593, // number of files - {4835330407820245819U, 5223305410190549348U}, // iso hash - "ntsc_v1", // decompiler config + 593, // number of files + {4835330407820245819U, 5223305410190549348U, 3212700152698192932}, // iso hash + "ntsc_v1", // decompiler config "jak2", {}}}}}, // Jak 2 PAL