Skip to content

Commit 7fbc0db

Browse files
committed
Merge 'Maybe fix race condition with archive file' (#2389)
2 parents ce53b35 + 21e7cf7 commit 7fbc0db

13 files changed

Lines changed: 227 additions & 84 deletions

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
* Misc. location hints no longer prevent their area from being hinted as Barren.
2929
* Fix a generator failure when a `named_items_required` Named Item hint conflicts with a misc. location hint.
3030
* Prevent another case of Dead Hand spawning outside the room collision.
31+
* Fix a bug where the ROM compressor may rarely produce corrupted ROMs.
3132

3233
## Other changes
3334
* Big poe souls can now be collected while riding Epona.

Main.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -240,10 +240,7 @@ def compress_rom(input_file: str, output_file: str, delete_input: bool = False)
240240
else:
241241
compressor_path += "Compress"
242242
elif platform.system() == 'Darwin':
243-
if platform.machine() == 'arm64':
244-
compressor_path += "Compress_ARM64.out"
245-
else:
246-
compressor_path += "Compress.out"
243+
compressor_path += "Compress.out"
247244
else:
248245
logger.info("OS not supported for ROM compression.")
249246
raise Exception("This operating system does not support ROM compression. You may only output patch files or uncompressed ROMs.")

bin/Compress/Compress

7.8 KB
Binary file not shown.

bin/Compress/Compress.exe

23.6 KB
Binary file not shown.

bin/Compress/Compress.out

48.3 KB
Binary file not shown.

bin/Compress/Compress32.exe

380 KB
Binary file not shown.

bin/Compress/Compress_ARM32

4.39 KB
Binary file not shown.

bin/Compress/Compress_ARM64

52.9 KB
Binary file not shown.

bin/Compress/Compress_ARM64.exe

167 KB
Binary file not shown.

bin/Compress/Compress_ARM64.out

-51.8 KB
Binary file not shown.

0 commit comments

Comments
 (0)