Overflow progressives no longer become triforce pieces

Also commir a change that  was supposed to be included a few days ago.
This commit is contained in:
Kevin Cathcart 2018-03-29 22:01:43 -04:00
parent 4c6a140af9
commit 48f08c70d7
1 changed files with 4 additions and 6 deletions

10
Rom.py
View File

@ -534,19 +534,17 @@ def patch_rom(world, rom, hashtable, beep='normal', color='red', sprite=None):
# Make silver arrows freely usable # Make silver arrows freely usable
rom.write_byte(0x180181, 0x00) rom.write_byte(0x180181, 0x00)
#Set overflow items for progressive equipment #Set overflow items for progressive equipment
if world.goal == 'triforcehunt': if world.timer in ['timed', 'timed-countdown', 'timed-ohko']:
overflow_replacement = TRIFORCE_PIECE
elif world.timer in ['timed', 'timed-countdown', 'timed-ohko']:
overflow_replacement = GREEN_CLOCK overflow_replacement = GREEN_CLOCK
else: else:
overflow_replacement = GREEN_TWENTY_RUPEES overflow_replacement = GREEN_TWENTY_RUPEES
if world.difficulty in ['easy']: 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 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: 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 #Byrna residual magic cost
rom.write_bytes(0x45C42, [0x04, 0x02, 0x01]) rom.write_bytes(0x45C42, [0x04, 0x02, 0x01])