diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 06c6fc51..b18c1af0 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -98,7 +98,7 @@ These districts are chosen at random and then filled with major items. If a loca In entrance shuffle, what is shuffled to the entrances is considered instead of where the interior was originally. For example, if Blind's Hut is shuffled to the Dam, then the 5 chests in Blind's Hut are part of Central Hyrule instead of Kakariko. -Bombos Table, Lake Hylia Island, Bumper Cave Ledge, the Floating Island, Cave 45, the Graveyard Cave, Checkerboard Cave and Mimic Cave are considered part of the dark world region that you mirror from to get there (except in inverted where these are only accessible in the Light World). Note that Spectacle Rock is always part of light Death Mountain. +Note: Bombos Tablet, Lake Hylia Island, Bumper Cave Ledge, the Floating Island, Cave 45, the Graveyard Cave, Checkerboard Cave and Mimic Cave are considered part of the light world region rather than the dark world region you mirror from. In multiworld, the districts chosen apply to all players. @@ -247,6 +247,10 @@ Same as above but both small keys and bigs keys of the dungeon are not allowed o #### Unstable +* 1.0.0.3 + * overworld_map=map mode fixed. Location of dungeons with maps are not shown until map is retrieved. (Dungeon that do not have map like Castle Tower are simply never shown) + * Aga2 completion on overworld_map now tied to boss defeat flag instead of pyramid hole being opened (fast ganon fix) + * Minor issue in dungeon_only algorithm fixed (minorly affected major_only keyshuffle and vanilla fallbacks) * 1.0.0.2 * Include 1.0.1 fixes * District hint rework diff --git a/Rom.py b/Rom.py index 58155f80..d99ffef7 100644 --- a/Rom.py +++ b/Rom.py @@ -1503,8 +1503,13 @@ def patch_rom(world, rom, player, team, enemized, is_mystery=False): for idx, x_map in enumerate(x_map_position_generic): rom.write_bytes(0x53df6+idx*2, int16_as_bytes(x_map)) rom.write_bytes(0x53e16+idx*2, int16_as_bytes(0xFC0)) - if world.compassshuffle[player] and world.overworld_map[player] == 'compass': - compass_mode |= 0x40 # compasses are wild + if world.overworld_map[player] == 'compass': + compass_mode |= 0x20 # check for compass + if world.compassshuffle[player]: + compass_mode |= 0x40 # compasses are wild + elif world.overworld_map[player] == 'map': + if world.mapshuffle[player]: + compass_mode |= 0x40 # maps are wild for dungeon, portal_list in dungeon_portals.items(): ow_map_index = dungeon_table[dungeon].map_index if len(portal_list) == 1: diff --git a/source/item/FillUtil.py b/source/item/FillUtil.py index f9fe4c18..4f052bd4 100644 --- a/source/item/FillUtil.py +++ b/source/item/FillUtil.py @@ -688,7 +688,7 @@ mode_grouping = { 'Sewers - Dark Cross', 'Desert Palace - Torch', 'Tower of Hera - Basement Cage', 'Castle Tower - Room 03', 'Castle Tower - Dark Maze', 'Palace of Darkness - Stalfos Basement', 'Palace of Darkness - Dark Basement - Right', - 'Palace of Darkness - Dark Maze - Bottom', 'Palace of Darkness - Shooter Room', + 'Palace of Darkness - Harmless Hellway', 'Palace of Darkness - Shooter Room', 'Palace of Darkness - The Arena - Bridge', 'Palace of Darkness - The Arena - Ledge', "Thieves' Town - Blind's Cell", 'Skull Woods - Bridge Room', 'Ice Palace - Spike Room', 'Skull Woods - Pot Prison', 'Skull Woods - Pinball Room', 'Misery Mire - Spike Chest',