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

Rom generation fixes

Browse Source
This commit is contained in:
aerinon
2020-02-24 06:54:52 -07:00
parent c2e22a6223
commit 268975263e
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
BaseClasses.py
View File

@@ -1152,9 +1152,9 @@ class Door(object):
elif self.type == DoorType.Open: elif self.type == DoorType.Open:
base_address = { base_address = {
Direction.North: 0x13C500, Direction.North: 0x13C500,
Direction.South: 0x13C533, Direction.South: 0x13C521,
Direction.West: 0x13C566, Direction.West: 0x13C542,
Direction.East: 0x13C581, Direction.East: 0x13C55D,
} }
return base_address[self.direction] + self.edge_id * 3 return base_address[self.direction] + self.edge_id * 3

2
DoorShuffle.py
View File

@@ -102,7 +102,7 @@ def create_door_spoiler(world, player):
for ext in next.exits: for ext in next.exits:
door_a = ext.door door_a = ext.door
connect = ext.connected_region connect = ext.connected_region
if door_a and door_a.type in [DoorType.Normal, DoorType.SpiralStairs] and door_a not in done: if door_a and door_a.type in [DoorType.Normal, DoorType.SpiralStairs, DoorType.Open] and door_a not in done:
done.add(door_a) done.add(door_a)
door_b = door_a.dest door_b = door_a.dest
if door_b: if door_b:

2
Rom.py
View File

@@ -604,7 +604,7 @@ def patch_rom(world, rom, player, team, enemized):
if world.doorShuffle[player] == 'basic': if world.doorShuffle[player] == 'basic':
rom.write_byte(0x139004, 1) rom.write_byte(0x139004, 1)
for door in world.doors: for door in world.doors:
if door.dest is not None and door.player == player and door.type in [DoorType.Normal, DoorType.SpiralStairs]: if door.dest is not None and door.player == player and door.type in [DoorType.Normal, DoorType.SpiralStairs, DoorType.Open]:
rom.write_bytes(door.getAddress(), door.dest.getTarget(door)) rom.write_bytes(door.getAddress(), door.dest.getTarget(door))
for room in world.rooms: for room in world.rooms:
if room.player == player and room.modified: if room.player == player and room.modified: