diff --git a/Main.py b/Main.py index 22c73a50..913f79a8 100644 --- a/Main.py +++ b/Main.py @@ -31,7 +31,7 @@ from Utils import output_path, parse_player_names from source.item.FillUtil import create_item_pool_config, massage_item_pool, district_item_pool_config -__version__ = '1.0.0.2-u' +__version__ = '1.0.0.3-u' from source.classes.BabelFish import BabelFish diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 67394d00..9a86fec7 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -114,6 +114,9 @@ Same as above but both small keys and bigs keys of the dungeon are not allowed o ## Notes and Bug Fixes +* 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) * 1.0.0.2 * Include 1.0.1 fixes * District hint rework diff --git a/Rom.py b/Rom.py index ed4c208a..4f219949 100644 --- a/Rom.py +++ b/Rom.py @@ -32,7 +32,7 @@ from source.classes.SFX import randomize_sfx JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = '4e4d7c1352c6b85dfe0d3f19aa2afae2' +RANDOMIZERBASEHASH = '7f28f440ac83d3ddca458dfc64e87978' class JsonRom(object): @@ -1412,8 +1412,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/data/base2current.bps b/data/base2current.bps index bb57b114..57aa7d1d 100644 Binary files a/data/base2current.bps and b/data/base2current.bps differ