From ca37a55046b717c4c559f6be518351b3d2d1874b Mon Sep 17 00:00:00 2001 From: codemann8 Date: Sun, 4 Jul 2021 11:29:44 -0500 Subject: [PATCH] Adding OW Rando credits --- Rom.py | 6 +++--- data/base2current.bps | Bin 138574 -> 138609 bytes 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Rom.py b/Rom.py index c3ff380e..79768a46 100644 --- a/Rom.py +++ b/Rom.py @@ -28,7 +28,7 @@ from OverworldShuffle import default_flute_connections, flute_data JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = '6e44346357f8a9471a8499ab787635c1' +RANDOMIZERBASEHASH = '6a018a61c2ba2d9d5c75cd5fb8ac003e' class JsonRom(object): @@ -890,7 +890,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 = 0x2391BE + cr_address = 0x2391CC 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) @@ -909,7 +909,7 @@ def patch_rom(world, rom, player, team, enemized, is_mystery=False): total += count_locations_exclude_logic(region.locations, gt_logic) # rom.write_byte(0x187012, total) # dynamic credits # gt big key address: - gtbk_address = 0x2390E0 + gtbk_address = 0x2390EE gtbk_pc = gtbk_address - 0x120000 # convert to pc mid_top, mid_bot = credits_digit(total // 10) last_top, last_bot = credits_digit(total % 10) diff --git a/data/base2current.bps b/data/base2current.bps index d788ef0229b0c36f0ef7f2bbddcb07a75539fb1e..42006a56bd4494db21c72494f988fc6bf2574611 100644 GIT binary patch delta 3490 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