alttpr-gwaa-kiwi/alttpr-python
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'Player' of https://github.com/Catobat/ALttPDoorRandomizer into Catobat-Player

Browse Source
This commit is contained in:
aerinon
2021-06-01 14:52:53 -06:00
parent e0479922cc b071191e9b
commit 5c60f1996e
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Rom.py
View File

@@ -970,7 +970,7 @@ def patch_rom(world, rom, player, team, enemized, is_mystery=False):
#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':
if difficulty.progressive_bow_limit < 2 and world.swords[player] == 'swordless':
rom.write_bytes(0x180098, [2, overflow_replacement])
# set up game internal RNG seed
@@ -1314,9 +1314,6 @@ def patch_rom(world, rom, player, team, enemized, is_mystery=False):
if item.name != 'Piece of Heart' or equip[0x36B] == 0:
equip[0x36C] = min(equip[0x36C] + 0x08, 0xA0)
equip[0x36D] = min(equip[0x36D] + 0x08, 0xA0)
elif item.name == 'Pegasus Boots':
rom.write_byte(0x183015, 0x01)
ability_flags |= 0b00000100
else:
raise RuntimeError(f'Unsupported item in starting equipment: {item.name}')