Trock door fixes.

This commit is contained in:
LLCoolDave 2017-05-28 15:40:59 +02:00
parent e3a9d73ca1
commit aebfcf9b94
3 changed files with 8 additions and 1 deletions

View File

@ -1260,6 +1260,7 @@ mandatory_connections = [('Links House', 'Links House'), # unshuffled. For now
('Turtle Rock Chain Chomp Staircase', 'Turtle Rock (Chain Chomp Room)'), ('Turtle Rock Chain Chomp Staircase', 'Turtle Rock (Chain Chomp Room)'),
('Turtle Rock (Big Chest) (North)', 'Turtle Rock (Second Section)'), ('Turtle Rock (Big Chest) (North)', 'Turtle Rock (Second Section)'),
('Turtle Rock Big Key Door', 'Turtle Rock (Roller Switch Room)'), ('Turtle Rock Big Key Door', 'Turtle Rock (Roller Switch Room)'),
('Turtle Rock Big Key Door Reverse', 'Turtle Rock (Second Section)'),
('Turtle Rock Dark Room Staircase', 'Turtle Rock (Dark Room)'), ('Turtle Rock Dark Room Staircase', 'Turtle Rock (Dark Room)'),
('Turtle Rock (Dark Room) (North)', 'Turtle Rock (Roller Switch Room)'), ('Turtle Rock (Dark Room) (North)', 'Turtle Rock (Roller Switch Room)'),
('Turtle Rock (Dark Room) (South)', 'Turtle Rock (Eye Bridge)'), ('Turtle Rock (Dark Room) (South)', 'Turtle Rock (Eye Bridge)'),

View File

@ -226,7 +226,7 @@ def create_regions(world):
create_region('Turtle Rock (Chain Chomp Room)', ['[dungeon-D7-1F] Turtle Rock - Chain Chomp Room'], ['Turtle Rock (Chain Chomp Room) (North)', 'Turtle Rock (Chain Chomp Room) (South)']), create_region('Turtle Rock (Chain Chomp Room)', ['[dungeon-D7-1F] Turtle Rock - Chain Chomp Room'], ['Turtle Rock (Chain Chomp Room) (North)', 'Turtle Rock (Chain Chomp Room) (South)']),
create_region('Turtle Rock (Second Section)', ['[dungeon-D7-B1] Turtle Rock - Big Key Room'], ['Turtle Rock Ledge Exit (West)', 'Turtle Rock Chain Chomp Staircase', 'Turtle Rock Big Key Door']), create_region('Turtle Rock (Second Section)', ['[dungeon-D7-B1] Turtle Rock - Big Key Room'], ['Turtle Rock Ledge Exit (West)', 'Turtle Rock Chain Chomp Staircase', 'Turtle Rock Big Key Door']),
create_region('Turtle Rock (Big Chest)', ['[dungeon-D7-B1] Turtle Rock - Big Chest'], ['Turtle Rock (Big Chest) (North)', 'Turtle Rock Ledge Exit (East)']), create_region('Turtle Rock (Big Chest)', ['[dungeon-D7-B1] Turtle Rock - Big Chest'], ['Turtle Rock (Big Chest) (North)', 'Turtle Rock Ledge Exit (East)']),
create_region('Turtle Rock (Roller Switch Room)', ['[dungeon-D7-B1] Turtle Rock - Roller Switch Room'], ['Turtle Rock Dark Room Staircase']), create_region('Turtle Rock (Roller Switch Room)', ['[dungeon-D7-B1] Turtle Rock - Roller Switch Room'], ['Turtle Rock Dark Room Staircase', 'Turtle Rock Big Key Door Reverse']),
create_region('Turtle Rock (Dark Room)', None, ['Turtle Rock (Dark Room) (North)', 'Turtle Rock (Dark Room) (South)']), create_region('Turtle Rock (Dark Room)', None, ['Turtle Rock (Dark Room) (North)', 'Turtle Rock (Dark Room) (South)']),
create_region('Turtle Rock (Eye Bridge)', ['[dungeon-D7-B2] Turtle Rock - Eye Bridge Room [bottom left chest]', '[dungeon-D7-B2] Turtle Rock - Eye Bridge Room [bottom right chest]', create_region('Turtle Rock (Eye Bridge)', ['[dungeon-D7-B2] Turtle Rock - Eye Bridge Room [bottom left chest]', '[dungeon-D7-B2] Turtle Rock - Eye Bridge Room [bottom right chest]',
'[dungeon-D7-B2] Turtle Rock - Eye Bridge Room [top left chest]', '[dungeon-D7-B2] Turtle Rock - Eye Bridge Room [top right chest]'], '[dungeon-D7-B2] Turtle Rock - Eye Bridge Room [top left chest]', '[dungeon-D7-B2] Turtle Rock - Eye Bridge Room [top right chest]'],

6
Rom.py
View File

@ -206,6 +206,12 @@ def patch_rom(world, rom, hashtable, quickswap=False, beep='normal', sprite=None
for i in range(0x85): for i in range(0x85):
write_byte(rom, 0x15274 + i, 0x00) write_byte(rom, 0x15274 + i, 0x00)
# fix trock doors for reverse entrances
if world.shuffle != 'default':
write_byte(rom, 0xFED31, 0x0E) # preopen bombable exit
write_byte(rom, 0xFEE41, 0x0E) # preopen bombable exit
write_byte(rom, 0xFE465, 0x1E) # remove small key door on backside of big key door
# enable quick item swapping with L and R (ported by Amazing Ampharos) # enable quick item swapping with L and R (ported by Amazing Ampharos)
if quickswap: if quickswap:
write_bytes(rom, 0x107fb, [0x22, 0x50, 0xFF, 0x1F]) write_bytes(rom, 0x107fb, [0x22, 0x50, 0xFF, 0x1F])