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

Merged DR v0.4.0.2

Browse Source
This commit is contained in:
codemann8
2021-05-16 04:50:44 -05:00
parent 2a394cc880 9f877d8811
commit 92ecee096a
12 changed files with 61 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Rom.py
View File

@@ -27,7 +27,7 @@ from EntranceShuffle import door_addresses, exit_ids
JAP10HASH = '03a63945398191337e896e5771f77173'
RANDOMIZERBASEHASH = '5ea3196d8db3ca0c757035f7fd51cf9b'
RANDOMIZERBASEHASH = '5c5111bcb73b033ddf72be5b8ea08a8e'
class JsonRom(object):
@@ -806,15 +806,17 @@ 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: 238C37
# collection rate address:
cr_address = 0x2391BE
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)
# top half
rom.write_byte(0x118C53, mid_top)
rom.write_byte(0x118C54, last_top)
rom.write_byte(cr_pc+0x1c, mid_top)
rom.write_byte(cr_pc+0x1d, last_top)
# bottom half
rom.write_byte(0x118C71, mid_bot)
rom.write_byte(0x118C72, last_bot)
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']
@@ -822,16 +824,18 @@ def patch_rom(world, rom, player, team, enemized, is_mystery=False):
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: 238B59
# rom.write_byte(0x187012, total) # dynamic credits
# gt big key address:
gtbk_address = 0x2390E0
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(0x118B75, mid_top)
rom.write_byte(0x118B76, last_top)
rom.write_byte(gtbk_pc+0x1c, mid_top)
rom.write_byte(gtbk_pc+0x1d, last_top)
# bottom half
rom.write_byte(0x118B93, mid_bot)
rom.write_byte(0x118B94, last_bot)
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':