From a6b4ac61ae7600a8dedd963634d3005e657bbbad Mon Sep 17 00:00:00 2001 From: codemann8 Date: Wed, 23 Jun 2021 11:01:06 -0500 Subject: [PATCH] Merged DR 0.4.0.7 --- Rom.py | 2 +- data/base2current.bps | Bin 137926 -> 138498 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Rom.py b/Rom.py index e931078e..255659da 100644 --- a/Rom.py +++ b/Rom.py @@ -27,7 +27,7 @@ from EntranceShuffle import door_addresses, exit_ids JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = 'c475e79eb7b90de8ed0cc415400caaf0' +RANDOMIZERBASEHASH = 'a49b2bd71e6670fd1595d7c6d86ab440' class JsonRom(object): diff --git a/data/base2current.bps b/data/base2current.bps index f73d421ee17c47f0fdf274e6d46986d006ddcf4c..8b49d9dd2a468c0b5db367827eb86a9969f90602 100644 GIT binary patch delta 6588 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 delta 5926 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