Baserom update

This commit is contained in:
aerinon
2021-07-07 14:04:50 -07:00
parent f21dace6d5
commit fb22c88ace
3 changed files with 14 additions and 21 deletions

23
Rom.py
View File

@@ -31,7 +31,7 @@ from EntranceShuffle import door_addresses, exit_ids
JAP10HASH = '03a63945398191337e896e5771f77173'
RANDOMIZERBASEHASH = '712324ad3ca7bff751d9f62812a2c3b6'
RANDOMIZERBASEHASH = '736978dd2b3a2bb109ac80ed7c048e67'
class JsonRom(object):
@@ -809,7 +809,7 @@ def patch_rom(world, rom, player, team, enemized, is_mystery=False):
write_int16(rom, 0x187010, credits_total) # dynamic credits
if credits_total != 216:
# collection rate address:
cr_address = 0x2391FA
cr_address = 0x2391F2
cr_pc = cr_address - 0x120000 # convert to pc
mid_top, mid_bot = credits_digit((credits_total // 10) % 10)
last_top, last_bot = credits_digit(credits_total % 10)
@@ -820,25 +820,6 @@ def patch_rom(world, rom, player, team, enemized, is_mystery=False):
rom.write_byte(cr_pc+0x3a, mid_bot)
rom.write_byte(cr_pc+0x3b, last_bot)
if world.keydropshuffle[player] or world.doorShuffle[player] != 'vanilla':
gt = world.dungeon_layouts[player]['Ganons Tower']
gt_logic = world.key_logic[player]['Ganons Tower']
total = 0
for region in gt.master_sector.regions:
total += count_locations_exclude_logic(region.locations, gt_logic)
# rom.write_byte(0x187012, total) # dynamic credits
# gt big key address:
gtbk_address = 0x23911C
gtbk_pc = gtbk_address - 0x120000 # convert to pc
mid_top, mid_bot = credits_digit(total // 10)
last_top, last_bot = credits_digit(total % 10)
# top half
rom.write_byte(gtbk_pc+0x1c, mid_top)
rom.write_byte(gtbk_pc+0x1d, last_top)
# bottom half
rom.write_byte(gtbk_pc+0x3a, mid_bot)
rom.write_byte(gtbk_pc+0x3b, last_bot)
# patch medallion requirements
if world.required_medallions[player][0] == 'Bombos':
rom.write_byte(0x180022, 0x00) # requirement