From 48f08c70d76ad242fe08442e3acec0214f6e5b67 Mon Sep 17 00:00:00 2001 From: Kevin Cathcart Date: Thu, 29 Mar 2018 22:01:43 -0400 Subject: [PATCH] Overflow progressives no longer become triforce pieces Also commir a change that was supposed to be included a few days ago. --- Rom.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Rom.py b/Rom.py index ce506410..2abc22a8 100644 --- a/Rom.py +++ b/Rom.py @@ -534,19 +534,17 @@ def patch_rom(world, rom, hashtable, beep='normal', color='red', sprite=None): # Make silver arrows freely usable rom.write_byte(0x180181, 0x00) #Set overflow items for progressive equipment - if world.goal == 'triforcehunt': - overflow_replacement = TRIFORCE_PIECE - elif world.timer in ['timed', 'timed-countdown', 'timed-ohko']: + if world.timer in ['timed', 'timed-countdown', 'timed-ohko']: overflow_replacement = GREEN_CLOCK else: overflow_replacement = GREEN_TWENTY_RUPEES if world.difficulty in ['easy']: - rom.write_byte(0x180181, 0x03) # auto equip silvers on pickup and at ganon + rom.write_byte(0x180182, 0x03) # auto equip silvers on pickup and at ganon elif world.retro and world.difficulty in ['hard','expert', 'insane']: #FIXME: this is temporary for v29 baserom - rom.write_byte(0x180181, 0x03) # auto equip silvers on pickup and at ganon + rom.write_byte(0x180182, 0x03) # auto equip silvers on pickup and at ganon else: - rom.write_byte(0x180181, 0x01) # auto equip silvers on pickup + rom.write_byte(0x180182, 0x01) # auto equip silvers on pickup #Byrna residual magic cost rom.write_bytes(0x45C42, [0x04, 0x02, 0x01])