Merge branch 'DoorDevVolatileSRAM' of https://github.com/cassidoxa/ALttPEntranceRandomizer into cassidoxa-DoorDevVolatileSRAM

# Conflicts:
#	Rom.py
#	data/base2current.bps
This commit is contained in:
aerinon
2022-04-26 16:24:17 -06:00
6 changed files with 302 additions and 173 deletions

View File

@@ -1097,7 +1097,7 @@ def create_pot_location(pot, pot_index, super_tile, world, player):
def pot_address(pot_index, super_tile):
return 0x7f6600 + super_tile * 2 + (pot_index << 24)
return 0x7f6018 + super_tile * 2 + (pot_index << 24)
# (type, room_id, shopkeeper, custom, locked, [items])