morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 20:21:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pull/58' into compilingERupdate

Browse Source 
# Conflicts:
#	EntranceShuffle.py
#	Rom.py
#	Rules.py
This commit is contained in:
Fabian Dill
2020-04-05 19:06:15 +02:00
parent f9f7916404 11a91b96c6
commit 94e5b5962f
5 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Rom.py
View File

@@ -1225,7 +1225,7 @@ def patch_rom(world, rom, player, team, enemized):
rom.write_bytes(0x02F539, [0xEA, 0xEA, 0xEA, 0xEA, 0xEA] if world.powder_patch_required[player] else [0xAD, 0xBF, 0x0A, 0xF0, 0x4F])
# allow smith into multi-entrance caves in appropriate shuffles
if world.shuffle[player] in ['restricted', 'full', 'crossed', 'insanity']:
if world.shuffle[player] in ['restricted', 'full', 'crossed', 'insanity'] or (world.shuffle == 'simple' and world.mode == 'inverted'):
rom.write_byte(0x18004C, 0x01)
# set correct flag for hera basement item