Merged in DR v1.4.1.12

This commit is contained in:
codemann8
2024-05-23 21:49:24 -05:00
26 changed files with 557 additions and 3048 deletions

View File

@@ -10,7 +10,7 @@ import sys
from BaseClasses import World
from Regions import create_regions
from OverworldShuffle import link_overworld
from EntranceShuffle import link_entrances, connect_entrance, connect_two_way, connect_exit
from source.overworld.EntranceShuffle2 import link_entrances_new, connect_entrance, connect_two_way, connect_exit
from Rom import patch_rom, LocalRom, write_string_to_rom, apply_rom_settings, get_sprite_from_name
from Rules import set_rules
from Dungeons import create_dungeons
@@ -48,7 +48,7 @@ def main(args):
link_overworld(world, 1)
link_entrances(world, 1)
link_entrances_new(world, 1)
logger.info('Calculating Access Rules.')