From bc5c6da2acdce4f8f21ab1f66fb4d87a052d1244 Mon Sep 17 00:00:00 2001 From: aerinon Date: Mon, 7 Aug 2023 12:19:35 -0600 Subject: [PATCH] Fix for hera boss music (the last?) --- RELEASENOTES.md | 2 ++ Rom.py | 2 +- data/base2current.bps | Bin 94167 -> 94175 bytes 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 35155c50..336c604e 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -110,10 +110,12 @@ These are now independent of retro mode and have three options: None, Random, an # Bug Fixes and Notes * 1.2.0.20u + * New generation feature that allows Spiral Stair to link to themselves (thank Catobat) * Added logic for trap doors that could be opened using existing room triggers * Fixed a problem with inverted generation and the experimental flag * Added a notes field for user added notes either via CLI or Customizer (thanks Hiimcody and Codemann) * Fixed a typo for a specific pot hint + * Fix for Hera Boss music (thanks Codemann) * 1.1.6 (from Stable) * Minor issue with dungeon counter hud interfering with timer * 1.2.0.19u diff --git a/Rom.py b/Rom.py index 5b65c852..5dc3652a 100644 --- a/Rom.py +++ b/Rom.py @@ -37,7 +37,7 @@ from source.dungeon.RoomList import Room0127 JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = '168574b64461acded5f2e8394a05577e' +RANDOMIZERBASEHASH = '61662913cc0cb12fb870d794937d88d9' class JsonRom(object): diff --git a/data/base2current.bps b/data/base2current.bps index 80dff6bf7a424495c72c7b12a3e5ab3083e2fc14..23872f82d3be21e2fabd52ac809761a819691b9f 100644 GIT binary patch delta 5805 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 delta 5761 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