diff --git a/BaseClasses.py b/BaseClasses.py index 07f8f7f2..d1c17187 100644 --- a/BaseClasses.py +++ b/BaseClasses.py @@ -1318,6 +1318,7 @@ class Door(object): self.dungeonLink = None self.bk_shuffle_req = False self.standard_restricted = False # flag if portal is not allowed in HC in standard + self.lw_restricted = False # flag if portal is not allowed in DW # self.incognitoPos = -1 # self.sectorLink = False diff --git a/CLI.py b/CLI.py index e1ae72b6..8e5ff9bd 100644 --- a/CLI.py +++ b/CLI.py @@ -98,7 +98,7 @@ def parse_cli(argv, no_defaults=False): 'shuffle', 'door_shuffle', 'intensity', 'crystals_ganon', 'crystals_gt', 'openpyramid', 'mapshuffle', 'compassshuffle', 'keyshuffle', 'bigkeyshuffle', 'startinventory', 'triforce_pool_min', 'triforce_pool_max', 'triforce_goal_min', 'triforce_goal_max', - 'triforce_min_difference', 'triforce_goal', 'triforce_pool', + 'triforce_min_difference', 'triforce_goal', 'triforce_pool', 'shufflelinks', 'retro', 'accessibility', 'hints', 'beemizer', 'experimental', 'dungeon_counters', 'shufflebosses', 'shuffleenemies', 'enemy_health', 'enemy_damage', 'shufflepots', 'ow_palettes', 'uw_palettes', 'sprite', 'disablemusic', 'quickswap', 'fastmenu', 'heartcolor', 'heartbeep', @@ -145,6 +145,7 @@ def parse_settings(): "ow_shuffle": "vanilla", "ow_keepsimilar": False, "shuffle": "vanilla", + "shufflelinks": False, "shufflepots": False, "shuffleenemies": "none", diff --git a/DoorShuffle.py b/DoorShuffle.py index ced73e03..e7bf3302 100644 --- a/DoorShuffle.py +++ b/DoorShuffle.py @@ -563,6 +563,9 @@ def assign_portal(candidates, possible_portals, world, player): candidate = random.choice(candidates) portal_choice = random.choice(possible_portals) portal = world.get_portal(portal_choice, player) + while candidate.lw_restricted and not portal.light_world: + candidates.remove(candidate) + candidate = random.choice(candidates) if candidate != portal.door: if candidate.entranceFlag: for other_portal in world.dungeon_portals[player]: @@ -2025,6 +2028,7 @@ class DROptions(Flag): Open_PoD_Wall = 0x40 # If on, pre opens the PoD wall, no bow required Open_Desert_Wall = 0x80 # If on, pre opens the desert wall, no fire required Hide_Total = 0x100 + DarkWorld_Spawns = 0x200 # DATA GOES DOWN HERE @@ -2180,7 +2184,6 @@ logical_connections = [ ('Ice Cross Bottom Push Block Left', 'Ice Floor Switch'), ('Ice Cross Right Push Block Top', 'Ice Bomb Drop'), - ('Ice Cross Top Push Block Bottom', 'Ice Compass Room'), ('Ice Conveyor to Crystal', 'Ice Conveyor - Crystal'), ('Ice Conveyor Crystal Exit', 'Ice Conveyor'), ('Ice Big Key Push Block', 'Ice Dead End'), diff --git a/Doors.py b/Doors.py index 5f20d285..eb824fb1 100644 --- a/Doors.py +++ b/Doors.py @@ -1465,6 +1465,8 @@ def create_doors(world, player): # static portal flags world.get_door('Sanctuary S', player).dead_end(allowPassage=True) + if world.mode[player] == 'open' and world.shuffle[player] not in ['crossed', 'insanity']: + world.get_door('Sanctuary S', player).lw_restricted = True world.get_door('Eastern Hint Tile Blocked Path SE', player).passage = False world.get_door('TR Big Chest Entrance SE', player).passage = False world.get_door('Sewers Secret Room Key Door S', player).dungeonLink = 'Hyrule Castle' diff --git a/EntranceShuffle.py b/EntranceShuffle.py index 4d363a64..76eebddc 100644 --- a/EntranceShuffle.py +++ b/EntranceShuffle.py @@ -5,7 +5,6 @@ from collections import defaultdict def link_entrances(world, player): - connect_two_way(world, 'Links House', 'Links House Exit', player) # unshuffled. For now connect_exit(world, 'Chris Houlihan Room Exit', 'Links House', player) # should always match link's house, except for plandos Dungeon_Exits = Dungeon_Exits_Base.copy() @@ -82,7 +81,7 @@ def link_entrances(world, player): single_doors = list(Single_Cave_Doors) bomb_shop_doors = list(Bomb_Shop_Single_Cave_Doors) - blacksmith_doors = list(Blacksmith_Single_Cave_Doors) + blacksmith_doors = list(Blacksmith_Single_Cave_Doors) + ['Links House'] door_targets = list(Single_Cave_Targets) # we shuffle all 2 entrance caves as pairs as a start @@ -105,6 +104,18 @@ def link_entrances(world, player): connect_two_way(world, entrance1, exit1, player) connect_two_way(world, entrance2, exit2, player) + # place links house + if world.mode[player] == 'standard' or not world.shufflelinks[player]: + links_house = 'Links House' + else: + links_house_doors = [i for i in LW_Single_Cave_Doors if i not in Isolated_LH_Doors_Open] + links_house = random.choice(links_house_doors) + connect_two_way(world, links_house, 'Links House Exit', player) + if links_house in bomb_shop_doors: + bomb_shop_doors.remove(links_house) + if links_house in blacksmith_doors: + blacksmith_doors.remove(links_house) + # at this point only Light World death mountain entrances remain # place old man, has limited options remaining_entrances = ['Old Man Cave (West)', 'Old Man House (Bottom)', 'Death Mountain Return Cave (West)', 'Paradox Cave (Bottom)', 'Paradox Cave (Middle)', 'Paradox Cave (Top)', @@ -157,6 +168,16 @@ def link_entrances(world, player): blacksmith_doors = list(Blacksmith_Single_Cave_Doors + Blacksmith_Multi_Cave_Doors) door_targets = list(Single_Cave_Targets) + # place links house + if world.mode[player] == 'standard' or not world.shufflelinks[player]: + links_house = 'Links House' + else: + links_house_doors = [i for i in lw_entrances if i not in Isolated_LH_Doors_Open] + links_house = random.choice(links_house_doors) + connect_two_way(world, links_house, 'Links House Exit', player) + if links_house in lw_entrances: + lw_entrances.remove(links_house) + # tavern back door cannot be shuffled yet connect_doors(world, ['Tavern North'], ['Tavern'], player) @@ -301,7 +322,18 @@ def link_entrances(world, player): else: dw_entrances.append('Ganons Tower') caves.append('Ganons Tower Exit') - + + # place links house + if world.mode[player] == 'standard' or not world.shufflelinks[player]: + links_house = 'Links House' + else: + links_house_doors = [i for i in lw_entrances + lw_must_exits if i not in Isolated_LH_Doors_Open] + links_house = random.choice(links_house_doors) + connect_two_way(world, links_house, 'Links House Exit', player) + if links_house in lw_entrances: + lw_entrances.remove(links_house) + if links_house in lw_must_exits: + lw_must_exits.remove(links_house) # we randomize which world requirements we fulfill first so we get better dungeon distribution #we also places the Old Man House at this time to make sure he can be connected to the desert one way @@ -408,6 +440,22 @@ def link_entrances(world, player): entrances.append('Ganons Tower') caves.append('Ganons Tower Exit') + # place links house + if world.mode[player] == 'standard' or not world.shufflelinks[player]: + links_house = 'Links House' + else: + links_house_doors = [i for i in entrances + must_exits if i not in Isolated_LH_Doors_Open] + if world.doorShuffle[player] == 'crossed' and world.intensity[player] >= 3: + exclusions = DW_Entrances + DW_Dungeon_Entrances + DW_Single_Cave_Doors\ + + DW_Entrances_Must_Exit + DW_Dungeon_Entrances_Must_Exit + ['Ganons Tower'] + links_house_doors = [i for i in links_house_doors if i not in exclusions] + links_house = random.choice(list(links_house_doors)) + connect_two_way(world, links_house, 'Links House Exit', player) + if links_house in entrances: + entrances.remove(links_house) + elif links_house in must_exits: + must_exits.remove(links_house) + #place must-exit caves connect_mandatory_exits(world, entrances, caves, must_exits, player) @@ -854,6 +902,23 @@ def link_entrances(world, player): entrances.append('Hyrule Castle Entrance (South)') caves.append(('Hyrule Castle Exit (South)', 'Hyrule Castle Exit (West)', 'Hyrule Castle Exit (East)')) + # place links house + if world.mode[player] == 'standard' or not world.shufflelinks[player]: + links_house = 'Links house' + else: + links_house_doors = [i for i in entrances + entrances_must_exits if i not in Isolated_LH_Doors_Open] + if world.doorShuffle[player] == 'crossed' and world.intensity[player] >= 3: + exclusions = DW_Entrances + DW_Dungeon_Entrances + DW_Single_Cave_Doors \ + + DW_Entrances_Must_Exit + DW_Dungeon_Entrances_Must_Exit + ['Ganons Tower'] + links_house_doors = [i for i in links_house_doors if i not in exclusions] + links_house = random.choice(links_house_doors) + connect_two_way(world, links_house, 'Links House Exit', player) + if links_house in entrances: + entrances.remove(links_house) + elif links_house in entrances_must_exits: + entrances_must_exits.remove(links_house) + doors.remove(links_house) + # now let's deal with mandatory reachable stuff def extract_reachable_exit(cavelist): random.shuffle(cavelist) @@ -1200,9 +1265,12 @@ def link_inverted_entrances(world, player): connect_two_way(world, entrance2, exit2, player) # place links house - links_house_doors = [i for i in bomb_shop_doors + blacksmith_doors if i not in Inverted_Dark_Sanctuary_Doors + Isolated_LH_Doors] - links_house = random.choice(list(links_house_doors)) - connect_two_way(world, links_house, 'Links House Exit', player) + if not world.shufflelinks[player]: + links_house = 'Inverted Links House' + else: + links_house_doors = [i for i in DW_Single_Cave_Doors if i not in Inverted_Dark_Sanctuary_Doors + Isolated_LH_Doors] + links_house = random.choice(links_house_doors) + connect_two_way(world, links_house, 'Inverted Links House Exit', player) if links_house in bomb_shop_doors: bomb_shop_doors.remove(links_house) if links_house in blacksmith_doors: @@ -1277,15 +1345,14 @@ def link_inverted_entrances(world, player): door_targets = list(Inverted_Single_Cave_Targets) # place links house - links_house_doors = [i for i in lw_entrances + dw_entrances + lw_must_exits if i not in Inverted_Dark_Sanctuary_Doors + Isolated_LH_Doors] - links_house = random.choice(list(links_house_doors)) - connect_two_way(world, links_house, 'Links House Exit', player) - if links_house in lw_entrances: - lw_entrances.remove(links_house) - elif links_house in dw_entrances: + if not world.shufflelinks[player]: + links_house = 'Inverted Links House' + else: + links_house_doors = [i for i in dw_entrances if i not in Inverted_Dark_Sanctuary_Doors + Isolated_LH_Doors] + links_house = random.choice(links_house_doors) + connect_two_way(world, links_house, 'Inverted Links House Exit', player) + if links_house in dw_entrances: dw_entrances.remove(links_house) - elif links_house in lw_must_exits: - lw_must_exits.remove(links_house) # place dark sanc sanc_doors = [door for door in Inverted_Dark_Sanctuary_Doors if door in dw_entrances] @@ -1407,15 +1474,14 @@ def link_inverted_entrances(world, player): caves.remove('Agahnims Tower Exit') # place links house - links_house_doors = [i for i in lw_entrances + dw_entrances + lw_must_exits if i not in Inverted_Dark_Sanctuary_Doors + Isolated_LH_Doors] - links_house = random.choice(list(links_house_doors)) - connect_two_way(world, links_house, 'Links House Exit', player) - if links_house in lw_entrances: - lw_entrances.remove(links_house) + if not world.shufflelinks[player]: + links_house = 'Inverted Links House' + else: + links_house_doors = [i for i in dw_entrances if i not in Inverted_Dark_Sanctuary_Doors + Isolated_LH_Doors] + links_house = random.choice(links_house_doors) + connect_two_way(world, links_house, 'Inverted Links House Exit', player) if links_house in dw_entrances: dw_entrances.remove(links_house) - if links_house in lw_must_exits: - lw_must_exits.remove(links_house) # place dark sanc sanc_doors = [door for door in Inverted_Dark_Sanctuary_Doors if door in dw_entrances] @@ -1529,7 +1595,7 @@ def link_inverted_entrances(world, player): hc_ledge_entrances = ['Hyrule Castle Entrance (West)', 'Hyrule Castle Entrance (East)', 'Agahnims Tower'] # shuffle aga door. if it's on hc ledge, then one other hc ledge door has to be must_exit - aga_door = random.choice(list(entrances)) + aga_door = random.choice(entrances) if aga_door in hc_ledge_entrances: hc_ledge_entrances.remove(aga_door) @@ -1543,11 +1609,13 @@ def link_inverted_entrances(world, player): connect_two_way(world, aga_door, 'Agahnims Tower Exit', player) caves.remove('Agahnims Tower Exit') - # place links house - links_house_doors = [i for i in entrances + must_exits if i not in Inverted_Dark_Sanctuary_Doors + Isolated_LH_Doors] - links_house = random.choice(list(links_house_doors)) - connect_two_way(world, links_house, 'Links House Exit', player) + if not world.shufflelinks[player]: + links_house = 'Inverted Links House' + else: + links_house_doors = [i for i in entrances + must_exits if i not in Inverted_Dark_Sanctuary_Doors + Isolated_LH_Doors] + links_house = random.choice(links_house_doors) + connect_two_way(world, links_house, 'Inverted Links House Exit', player) if links_house in entrances: entrances.remove(links_house) elif links_house in must_exits: @@ -1678,9 +1746,12 @@ def link_inverted_entrances(world, player): caves.append(('Hyrule Castle Exit (South)', 'Hyrule Castle Exit (West)', 'Hyrule Castle Exit (East)')) # place links house and dark sanc - links_house_doors = [i for i in entrances + entrances_must_exits if i not in Inverted_Dark_Sanctuary_Doors + Isolated_LH_Doors] - links_house = random.choice(list(links_house_doors)) - connect_two_way(world, links_house, 'Links House Exit', player) + if not world.shufflelinks[player]: + links_house = 'Inverted Links House' + else: + links_house_doors = [i for i in entrances + entrances_must_exits if i not in Inverted_Dark_Sanctuary_Doors + Isolated_LH_Doors] + links_house = random.choice(links_house_doors) + connect_two_way(world, links_house, 'Inverted Links House Exit', player) if links_house in entrances: entrances.remove(links_house) elif links_house in entrances_must_exits: @@ -2440,7 +2511,19 @@ LW_Single_Cave_Doors = ['Blinds Hideout', 'Kings Grave', 'Bonk Fairy (Light)', 'Hookshot Fairy', - 'Mimic Cave'] + 'Mimic Cave', + 'Links House'] + +Isolated_LH_Doors_Open = ['Mimic Cave', + 'Kings Grave', + 'Waterfall of Wishing', + 'Desert Palace Entrance (South)', + 'Desert Palace Entrance (North)', + 'Capacity Upgrade', + 'Ice Palace', + 'Skull Woods Final Section', + 'Dark World Hammer Peg Cave', + 'Turtle Rock Isolated Ledge Entrance'] DW_Single_Cave_Doors = ['Bonk Fairy (Dark)', 'Dark Sanctuary Hint', @@ -2728,7 +2811,7 @@ Inverted_Bomb_Shop_Multi_Cave_Doors = ['Hyrule Castle Entrance (South)', Inverted_Blacksmith_Multi_Cave_Doors = Blacksmith_Multi_Cave_Doors # same as non-inverted -Inverted_LW_Single_Cave_Doors = LW_Single_Cave_Doors + ['Links House'] +Inverted_LW_Single_Cave_Doors = [x for x in LW_Single_Cave_Doors if x != 'Links House'] + ['Inverted Big Bomb Shop'] Inverted_DW_Single_Cave_Doors = ['Bonk Fairy (Dark)', 'Dark Sanctuary Hint', @@ -2974,7 +3057,9 @@ inverted_mandatory_connections = [('Sanctuary S&Q', 'Dark Sanctuary Hint'), ('Other World S&Q', 'Hyrule Castle Ledge')] # non-shuffled entrance links -default_connections = [('Waterfall of Wishing', 'Waterfall of Wishing'), +default_connections = [('Links House', 'Links House'), + ('Links House Exit', 'Links House Area'), + ('Waterfall of Wishing', 'Waterfall of Wishing'), ("Blinds Hideout", "Blinds Hideout"), ('Dam', 'Dam'), ('Lumberjack House', 'Lumberjack House'), @@ -3140,6 +3225,10 @@ inverted_default_connections = [('Old Man Cave (West)', 'Bumper Cave'), ('Death Mountain Return Cave (East)', 'Death Mountain Return Cave'), ('Death Mountain Return Cave Exit (West)', 'West Death Mountain (Bottom)'), ('Death Mountain Return Cave Exit (East)', 'West Death Mountain (Bottom)'), + + ('Links House', 'Big Bomb Shop'), + ('Links House Exit', 'Big Bomb Shop Area'), + ('Big Bomb Shop', 'Links House'), ('Pyramid Exit', 'Hyrule Castle Courtyard')] # non shuffled dungeons diff --git a/Main.py b/Main.py index cc2c7e08..b3fee882 100644 --- a/Main.py +++ b/Main.py @@ -28,7 +28,7 @@ from Fill import sell_potions, sell_keys, balance_multiworld_progression, balanc from ItemList import generate_itempool, difficulties, fill_prizes, customize_shops from Utils import output_path, parse_player_names -__version__ = '0.4.0.2-u' +__version__ = '0.4.0.4-u' class EnemizerError(RuntimeError): @@ -91,6 +91,7 @@ def main(args, seed=None, fish=None): world.standardize_palettes = args.standardize_palettes.copy() world.treasure_hunt_count = args.triforce_goal.copy() world.treasure_hunt_total = args.triforce_pool.copy() + world.shufflelinks = args.shufflelinks.copy() world.rom_seeds = {player: random.randint(0, 999999999) for player in range(1, world.players + 1)} diff --git a/Mystery.py b/Mystery.py index 36f51733..98f0d88f 100644 --- a/Mystery.py +++ b/Mystery.py @@ -145,6 +145,7 @@ def roll_settings(weights): if ret.dungeon_counters == 'default': ret.dungeon_counters = 'pickup' if ret.door_shuffle != 'vanilla' or ret.compassshuffle == 'on' else 'off' + ret.shufflelinks = get_choice('shufflelinks') == 'on' ret.shopsanity = get_choice('shopsanity') == 'on' ret.keydropshuffle = get_choice('keydropshuffle') == 'on' ret.mixed_travel = get_choice('mixed_travel') if 'mixed_travel' in weights else 'prevent' diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 4873d28c..6bbab2ce 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -1,11 +1,21 @@ # New Features +## Shuffle Links House + +Links house can now be shuffled in different ER settings. It will be limited to the Light World (or Dark World in inverted) if Crossed or Insanity shuffle is not one. It it also limited if door shuffle settings allow the Sanctuary to be in the dark world. (This is prevent having no Light World spawn points in Open modes) This setting is ignored by standard mode. THe CLI parameter is --shufflelinks + ## OWG Glitch Logic Thanks to qadan, cheuer, & compiling # Bug Fixes and Notes. +* 0.4.0.4 + * Added --shufflelinks option + * Moved spawning as a bunny indoors to experimental + * Baserom bug fixes +* 0.4.0.3 + * Fixed a bug where Sanctuary could be chosen as a lobby for a DW dungeon in non-crossed ER modes * 0.4.0.2 * Fixed a bug where Defeat Ganon is not possible * Fixed the item counter total diff --git a/Rom.py b/Rom.py index 5458fd98..13909da1 100644 --- a/Rom.py +++ b/Rom.py @@ -27,7 +27,7 @@ from EntranceShuffle import door_addresses, exit_ids JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = 'a6186512f1c02acfcb8554e0538a84f9' +RANDOMIZERBASEHASH = '06e14a9760b94dc64806b401cacd4680' class JsonRom(object): @@ -677,6 +677,8 @@ def patch_rom(world, rom, player, team, enemized, is_mystery=False): dr_flags |= DROptions.Rails if world.standardize_palettes[player] == 'original': dr_flags |= DROptions.OriginalPalettes + if world.experimental[player]: + dr_flags |= DROptions.DarkWorld_Spawns # fix hc big key problems (map and compass too) @@ -687,6 +689,23 @@ def patch_rom(world, rom, player, team, enemized, is_mystery=False): rom.write_byte(0x1597b, sanctuary.dungeon.dungeon_id*2) update_compasses(rom, world, player) + def should_be_bunny(region, mode): + if mode != 'inverted': + return region.is_dark_world and not region.is_light_world + else: + return region.is_light_world and not region.is_dark_world + + # dark world spawns + sanc_region = world.get_region('Sanctuary', player) + if should_be_bunny(sanc_region, world.mode[player]): + rom.write_bytes(0x13fff2, [0x12, 0x00]) + + lh_name = 'Links House' if world.mode[player] != 'inverted' else 'Inverted Links House' + links_house = world.get_region(lh_name, player) + if should_be_bunny(links_house, world.mode[player]): + rom.write_bytes(0x13fff0, [0x04, 0x01]) + + # patch doors if world.doorShuffle[player] == 'crossed': rom.write_byte(0x138002, 2) diff --git a/Rules.py b/Rules.py index c6ee08a0..bc2e3f35 100644 --- a/Rules.py +++ b/Rules.py @@ -679,7 +679,8 @@ def bomb_rules(world, player): add_rule(world.get_entrance('TR Lazy Eyes SE', player), lambda state: state.can_use_bombs(player)) # ToDo: Add always true for inverted, cross-entrance, and door-variants and so on. add_rule(world.get_entrance('Turtle Rock Ledge Exit (West)', player), lambda state: state.can_use_bombs(player)) # Is this the same as above? - dungeon_bonkable = ['PoD Warp Hint SE', 'PoD Jelly Hall NW', 'PoD Jelly Hall NE', 'PoD Mimics 1 SW', + dungeon_bonkable = ['Sewers Rat Path WS', 'Sewers Rat Path WN', + 'PoD Warp Hint SE', 'PoD Jelly Hall NW', 'PoD Jelly Hall NE', 'PoD Mimics 1 SW', 'Thieves Ambush E', 'Thieves Rail Ledge W', 'TR Dash Room NW', 'TR Crystaroller SW', 'TR Dash Room ES', 'GT Four Torches NW','GT Fairy Abyss SW' @@ -2082,7 +2083,7 @@ def set_bunny_rules(world, player, inverted): # Note spiral cave may be technically passible, but it would be too absurd to require since OHKO mode is a thing. bunny_impassable_caves = ['Bumper Cave', 'Two Brothers House', 'Hookshot Cave', 'Pyramid', 'Spiral Cave (Top)', 'Fairy Ascension Cave (Drop)'] - bunny_accessible_locations = ['Link\'s House', 'Link\'s Uncle', 'Sahasrahla', 'Sick Kid', 'Lost Woods Hideout', 'Lumberjack Tree', + bunny_accessible_locations = ['Link\'s Uncle', 'Sahasrahla', 'Sick Kid', 'Lost Woods Hideout', 'Lumberjack Tree', 'Checkerboard Cave', 'Potion Shop', 'Spectacle Rock Cave', 'Pyramid', 'Hype Cave - Generous Guy', 'Peg Cave', 'Bumper Cave Ledge', 'Dark Blacksmith Ruins', 'Spectacle Rock', 'Bombos Tablet', 'Ether Tablet', 'Purple Chest', 'Blacksmith', diff --git a/asm/doortables.asm b/asm/doortables.asm index 2c0140ea..dbbdb3c4 100644 --- a/asm/doortables.asm +++ b/asm/doortables.asm @@ -669,6 +669,10 @@ db $07,$07,$02,$02,$02,$02,$07,$07,$07,$20,$20,$07,$20,$20,$20,$07 ;27f300 ; -org $27ff00 -SancDarkWorldFlag: -db 0 +;org $27ff00 + +org $27fff0 +LinksHouseDarkWorld: +dw $ffff +SanctuaryDarkWorld: +dw $ffff \ No newline at end of file diff --git a/asm/dr_lobby.asm b/asm/dr_lobby.asm index 2c1b9c87..1cac9d10 100644 --- a/asm/dr_lobby.asm +++ b/asm/dr_lobby.asm @@ -1,10 +1,9 @@ -CheckDarkWorldSanc: +CheckDarkWorldSpawn: STA $A0 : STA $048E ; what we wrote over - LDA.l InvertedMode : AND #$00FF : BNE + - LDA.l SancDarkWorldFlag : AND #$00FF : BEQ + - SEP #$30 - LDA $A0 : CMP #$12 : BNE ++ - LDA.l $7EF357 : BNE ++ ; moon pearl? - LDA #$17 : STA $5D : INC $02E0 : LDA.b #$40 : STA !DARK_WORLD - ++ REP #$30 + LDA.l DRFlags : AND #$0200 : BEQ + ; skip if the flag isn't set + LDA.l $7EF357 : AND #$00FF : BNE + ; moon pearl? + LDA.l LinksHouseDarkWorld : CMP $A0 : BEQ ++ + LDA.l SanctuaryDarkWorld : CMP $A0 : BNE + + ++ SEP #$30 : LDA #$17 : STA $5D + INC $02E0 : LDA.b #$40 : STA !DARK_WORLD : REP #$30 + RTL diff --git a/asm/drhooks.asm b/asm/drhooks.asm index c4939e9d..6739de34 100644 --- a/asm/drhooks.asm +++ b/asm/drhooks.asm @@ -165,7 +165,7 @@ org $08c450 ; <- ancilla_receive_item.asm : 146-148 (STY $5D : STZ $02D8) JSL RetrieveBunnyState : NOP org $02d9ce ; <- Bank02.asm : Dungeon_LoadEntrance 10829 (STA $A0 : STA $048E) -JSL CheckDarkWorldSanc : NOP +JSL CheckDarkWorldSpawn : NOP org $01891e ; <- Bank 01.asm : 991 Dungeon_LoadType2Object (LDA $00 : XBA : AND.w #$00FF) JSL RainPrevention : NOP #2 diff --git a/asm/hudadditions.asm b/asm/hudadditions.asm index f5e4a119..7f9eb342 100644 --- a/asm/hudadditions.asm +++ b/asm/hudadditions.asm @@ -8,7 +8,7 @@ DrHudOverride: HudAdditions: { lda.l DRFlags : and #$0008 : beq ++ - LDA.w #$28A4 : STA !GOAL_DRAW_ADDRESS +; LDA.w #$28A4 : STA !GOAL_DRAW_ADDRESS lda $7EF423 jsr HudHexToDec4DigitCopy LDX.b $05 : TXA : ORA.w #$2400 : STA !GOAL_DRAW_ADDRESS+2 ; draw 100's digit diff --git a/data/base2current.bps b/data/base2current.bps index 64ba8323..afeff333 100644 Binary files a/data/base2current.bps and b/data/base2current.bps differ diff --git a/resources/app/cli/args.json b/resources/app/cli/args.json index 0795b9d0..7a8582bb 100644 --- a/resources/app/cli/args.json +++ b/resources/app/cli/args.json @@ -327,6 +327,10 @@ "dest": "shuffleganon", "help": "suppress" }, + "shufflelinks": { + "action": "store_true", + "type": "bool" + }, "calc_playthrough": { "action": "store_false", "type": "bool" diff --git a/resources/app/cli/lang/en.json b/resources/app/cli/lang/en.json index 4233b5e8..2576afda 100644 --- a/resources/app/cli/lang/en.json +++ b/resources/app/cli/lang/en.json @@ -291,6 +291,9 @@ "Include the Ganon's Tower and Pyramid Hole in the", "entrance shuffle pool. (default: %(default)s)" ], + "shufflelink": [ + "Include Link's House in the entrance shuffle pool. (default: %(default)s)" + ], "heartbeep": [ "Select the rate at which the heart beep sound is played at", "low health. (default: %(default)s)" diff --git a/resources/app/gui/lang/en.json b/resources/app/gui/lang/en.json index 033829ba..c70c5699 100644 --- a/resources/app/gui/lang/en.json +++ b/resources/app/gui/lang/en.json @@ -118,6 +118,7 @@ "randomizer.entrance.openpyramid": "Pre-open Pyramid Hole", "randomizer.entrance.shuffleganon": "Include Ganon's Tower and Pyramid Hole in shuffle pool", + "randomizer.entrance.shufflelinks": "Include Link's House in the shuffle pool", "randomizer.entrance.entranceshuffle": "Entrance Shuffle", "randomizer.entrance.entranceshuffle.vanilla": "Vanilla", diff --git a/resources/app/gui/randomize/entrando/widgets.json b/resources/app/gui/randomize/entrando/widgets.json index e46ee36e..5e2b75b2 100644 --- a/resources/app/gui/randomize/entrando/widgets.json +++ b/resources/app/gui/randomize/entrando/widgets.json @@ -18,6 +18,7 @@ "dungeonsfull", "dungeonssimple" ] - } + }, + "shufflelinks": { "type": "checkbox" } } } diff --git a/source/classes/constants.py b/source/classes/constants.py index 68df9519..4cd2c6da 100644 --- a/source/classes/constants.py +++ b/source/classes/constants.py @@ -77,6 +77,7 @@ SETTINGSTOPROCESS = { "entrance": { "openpyramid": "openpyramid", "shuffleganon": "shuffleganon", + "shufflelinks": "shufflelinks", "entranceshuffle": "shuffle" }, "enemizer": {