From 6b97cebec5b70e049fbe9e2fc59b64b0eb1e8b35 Mon Sep 17 00:00:00 2001 From: compiling <8335770+compiling@users.noreply.github.com> Date: Sun, 8 Dec 2019 12:41:28 +1100 Subject: [PATCH] Work around for json patch - split out bow limit into a separate patch so that it can be overridden properly. --- Rom.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Rom.py b/Rom.py index 2f548bfe..32f07c65 100644 --- a/Rom.py +++ b/Rom.py @@ -662,8 +662,10 @@ def patch_rom(world, player, rom): [difficulty.progressive_sword_limit, overflow_replacement, difficulty.progressive_shield_limit, overflow_replacement, difficulty.progressive_armor_limit, overflow_replacement, - difficulty.progressive_bottle_limit, overflow_replacement, - difficulty.progressive_bow_limit, overflow_replacement]) + difficulty.progressive_bottle_limit, overflow_replacement]) + + #Work around for json patch ordering issues - write bow limit separately so that it is replaced in the patch + rom.write_bytes(0x180098, [difficulty.progressive_bow_limit, overflow_replacement]) if difficulty.progressive_bow_limit < 2 and world.swords == 'swordless': rom.write_bytes(0x180098, [2, overflow_replacement])