alttpr-gwaa-kiwi/alttpr-python
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'DoorDevUnstable' into DoorDevVolatile

Browse Source 
# Conflicts:
#	Main.py
#	RELEASENOTES.md
#	Rom.py
#	data/base2current.bps
This commit is contained in:
aerinon
2022-04-21 13:18:06 -06:00
parent 1c4e3e09ba 86128c76ff
commit a9797bfd83
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Rom.py
View File

@@ -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: