From 42fc1a086cde4380d1f7b46d4dd7cd861d1236f8 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Wed, 29 May 2024 19:24:39 -0500 Subject: [PATCH] ROM fixes for Prize Shuffle - Added color blind support for Prize Shuffle - Changed LW dungeon icons to letters - Added crystal numbers to crystals in Prize Shuffle - Fixed HP refill bug interrupting boss cutscene --- Rom.py | 2 +- data/base2current.bps | Bin 133325 -> 133594 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Rom.py b/Rom.py index e07e3371..a525e934 100644 --- a/Rom.py +++ b/Rom.py @@ -43,7 +43,7 @@ from source.enemizer.Enemizer import write_enemy_shuffle_settings JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = '096e6adebfa630e827c662f12f79b4cd' +RANDOMIZERBASEHASH = 'd72b50e97435c3f36b8278d2921e88a0' class JsonRom(object): diff --git a/data/base2current.bps b/data/base2current.bps index 0aa27aaf7877197ced96152fb0be2d7e1c21b802..b45c5fea3f33e6e27eb47591569748f8e762b026 100644 GIT binary patch delta 5709 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 XW2OU{<~|P2X7RPfwUX@HKP~$|Yw4Vk delta 5488 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