diff --git a/setup.py b/setup.py index fb36425e..99c1b4c7 100644 --- a/setup.py +++ b/setup.py @@ -162,6 +162,9 @@ if signtool: os.system(signtool + os.path.join(buildfolder, exe.target_name)) print(f"Signing SNI") os.system(signtool + os.path.join(buildfolder, "SNI", "SNI.exe")) + print(f"Signing OoT Utils") + for exe_path in (("Compress", "Compress.exe"), ("Decompress", "Decompress.exe")): + os.system(signtool + os.path.join(buildfolder, "lib", "worlds", "oot", "data", *exe_path)) remove_sprites_from_folder(buildfolder / "data" / "sprites" / "alttpr") diff --git a/worlds/oot/Rom.py b/worlds/oot/Rom.py index 32e8cab6..17514350 100644 --- a/worlds/oot/Rom.py +++ b/worlds/oot/Rom.py @@ -88,15 +88,11 @@ class Rom(BigStream): raise RuntimeError('ROM file %s is not a valid OoT 1.0 US ROM.' % file) elif len(self.buffer) == 0x2000000: # If Input ROM is compressed, then Decompress it - subcall = [] sub_dir = data_path("Decompress") if platform.system() == 'Windows': - if 8 * struct.calcsize("P") == 64: - subcall = [sub_dir + "\\Decompress.exe", file, decomp_file] - else: - subcall = [sub_dir + "\\Decompress32.exe", file, decomp_file] + subcall = [sub_dir + "\\Decompress.exe", file, decomp_file] elif platform.system() == 'Linux': if platform.uname()[4] == 'aarch64' or platform.uname()[4] == 'arm64': subcall = [sub_dir + "/Decompress_ARM64", file, decomp_file] @@ -288,10 +284,7 @@ def compress_rom_file(input_file, output_file): compressor_path = data_path("Compress") if platform.system() == 'Windows': - if 8 * struct.calcsize("P") == 64: - compressor_path += "\\Compress.exe" - else: - compressor_path += "\\Compress32.exe" + compressor_path += "\\Compress.exe" elif platform.system() == 'Linux': if platform.uname()[4] == 'aarch64' or platform.uname()[4] == 'arm64': compressor_path += "/Compress_ARM64" diff --git a/worlds/oot/data/Compress/Compress32.exe b/worlds/oot/data/Compress/Compress32.exe deleted file mode 100644 index f8c25929..00000000 Binary files a/worlds/oot/data/Compress/Compress32.exe and /dev/null differ diff --git a/worlds/oot/data/Decompress/Decompress32.exe b/worlds/oot/data/Decompress/Decompress32.exe deleted file mode 100644 index d890fda2..00000000 Binary files a/worlds/oot/data/Decompress/Decompress32.exe and /dev/null differ