Bug with sanc/pull switch doors fixed.

Bug with doors with offset 2 going to doors with offset 2 was fixed in asm.
Refactor asm code to use Y as 2nd index, which cleaned up code.
Also learned the phb:phk:plb ... plb trick (cleaner than what I was doing)
This commit is contained in:
randall.rupper
2019-08-26 15:03:42 -06:00
parent 8db381a59c
commit 7f6c593df0
6 changed files with 162 additions and 125 deletions

9
Rom.py
View File

@@ -18,7 +18,7 @@ from EntranceShuffle import door_addresses
JAP10HASH = '03a63945398191337e896e5771f77173'
RANDOMIZERBASEHASH = '286871f737f98e7764c0f6ce125c68ca'
RANDOMIZERBASEHASH = '10d5e3bb3fad6cb230090678ce5b86c2'
# RANDOMIZERBASEHASH = 'cb560220b7b1b8202e92381aee19cd36' todo clean this up
@@ -534,10 +534,9 @@ def patch_rom(world, player, rom):
patch_shuffled_dark_sanc(world, rom, player)
# patch doors
if world.doorShuffle != 'vanilla':
for door in world.doors:
if door.dest is not None and door.player == player and door.type == DoorType.Normal:
rom.write_bytes(door.getAddress(), door.dest.getTarget(door.toggle))
for door in world.doors:
if door.dest is not None and door.player == player and door.type == DoorType.Normal:
rom.write_bytes(door.getAddress(), door.dest.getTarget(door.toggle))
write_custom_shops(rom, world, player)