From 65781912a6314b52ecde794740d983d900852741 Mon Sep 17 00:00:00 2001 From: Kara Alexandra Date: Sun, 7 Jun 2026 21:48:20 -0500 Subject: [PATCH 1/4] Update hint text for refill hearts and heart containers --- Items.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Items.py b/Items.py index 52a399fc..8c6a7ce7 100644 --- a/Items.py +++ b/Items.py @@ -97,8 +97,8 @@ item_table = {'Bow': (True, False, None, 0x0B, 200, 'Bow!\nJoin the archer class 'Progressive Shield': (True, False, None, 0x5F, 50, 'Shield!\nA better shield for your time!', 'and the new shield', 'shield-wielding kid', 'shield for sale', 'fungus for shield', 'shield boy defends again', 'a shield'), 'Bug Catching Net': (True, False, None, 0x21, 50, 'Bug Net!\nCatch all manner\nof things!', 'and the bee catcher', 'the bug-catching kid', 'stick web for sale', 'fungus for butterflies', 'wrong boy catches bees again', 'the Bug Net'), 'Cane of Byrna': (True, False, None, 0x18, 50, 'Cane of Byrna!\nSwirly protection!', 'and the bad cane', 'the spark-making kid', 'spark stick for sale', 'spark-stick for trade', 'cane boy encircles again', 'the Blue Cane'), - 'Boss Heart Container': (False, True, None, 0x3E, 40, 'Heart Container!\nHealth Increased!', 'and the full heart', 'the life-giving kid', 'love for sale', 'fungus for life', 'life boy feels love again', 'a heart'), - 'Sanctuary Heart Container': (False, True, None, 0x3F, 50, 'Heart Container!\nHealth Increased!', 'and the full heart', 'the life-giving kid', 'love for sale', 'fungus for life', 'life boy feels love again', 'a heart'), + 'Boss Heart Container': (False, True, None, 0x3E, 40, 'Heart Container!\nHealth Increased!', 'and the full heart', 'the life-giving kid', 'love for sale', 'fungus for life', 'life boy feels love again', 'a heart container'), + 'Sanctuary Heart Container': (False, True, None, 0x3F, 50, 'Heart Container!\nHealth Increased!', 'and the full heart', 'the life-giving kid', 'love for sale', 'fungus for life', 'life boy feels love again', 'a heart container'), 'Piece of Heart': (False, False, None, 0x17, 10, 'Heart Piece!\nOne step closer\nto more health!', 'and the broken heart', 'the life-giving kid', 'little love for sale', 'fungus for life', 'life boy feels some love again', 'a heart piece'), 'Rupee (1)': (False, False, None, 0x34, 0, 'Rupees!\nJust pocket\nchange.', 'the pocket change', 'poverty-struck kid', 'life lesson for sale', 'buying cheap drugs', 'destitute boy has snack again', 'a green rupee'), 'Rupees (5)': (False, False, None, 0x35, 2, 'Rupees!\nJust pocket\nchange.', 'the pocket change', 'poverty-struck kid', 'life lesson for sale', 'buying cheap drugs', 'destitute boy has snack again', 'a blue rupee'), @@ -174,7 +174,7 @@ item_table = {'Bow': (True, False, None, 0x0B, 200, 'Bow!\nJoin the archer class 'Blue Potion': (False, False, None, 0x30, 160, 'Delicious blue goop!', 'and the blue goo', 'the liquid kid', 'potion for sale', 'free samples', 'bottle boy has blue goo again', 'a blue potion'), 'Bee': (False, False, None, 0x0E, 10, 'I will sting your foes a few times', 'and the sting buddy', 'the beekeeper kid', 'insect for sale', 'shroom pollenation', 'bottle boy has mad bee again', 'a bee'), 'Good Bee': (False, False, None, 0xD6, 10, 'I will sting your foes a lot', 'and the cold buddy', 'the beekeeper kid', 'cold insect for sale', 'shroom pollenation', 'bottle boy has cold bee again', 'a good bee'), - 'Small Heart': (False, False, None, 0x42, 10, 'Just a little\npiece of love!', 'and the heart', 'the life-giving kid', 'little love for sale', 'fungus for life', 'life boy feels some love again', 'a heart'), + 'Small Heart': (False, False, None, 0x42, 10, 'Just a little\npiece of love!', 'and the heart', 'the life-giving kid', 'little love for sale', 'fungus for life', 'life boy feels some love again', 'a refill heart'), 'Apples': (False, False, None, 0xD1, 30, 'Just a few pieces of fruit!', 'and the juicy fruit', 'the fruity kid', 'the fruit stand', 'expired fruit', 'bottle boy has fruit again', 'an apple hoard'), 'Fairy': (False, False, None, 0xD2, 50, 'Just a pixie!', 'and the pixie', 'the pixie kid', 'pixie for sale', 'pixie fungus', 'bottle boy has pixie again', 'a pixie'), 'Beat Boss': (True, False, 'Event', 999, None, None, None, None, None, None, None, None), From 68c8d17d32e944fa5ea8a5bcec3cd04c61d20f2f Mon Sep 17 00:00:00 2001 From: Kara Alexandra Date: Mon, 8 Jun 2026 16:13:27 -0500 Subject: [PATCH 2/4] Update baserom --- Rom.py | 2 +- data/base2current.bps | Bin 158170 -> 158170 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Rom.py b/Rom.py index f45267ce..ccdc341b 100644 --- a/Rom.py +++ b/Rom.py @@ -85,7 +85,7 @@ from Utils import int16_as_bytes, int32_as_bytes, local_path, snes_to_pc from Versions import DRVersion, GKVersion, ORVersion JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = 'abaa7ce289fd18e0ab898f2ca1263db1' +RANDOMIZERBASEHASH = '9c603108cc074d98c06d1e200e777e4a' class JsonRom(object): diff --git a/data/base2current.bps b/data/base2current.bps index 91fc261a680311b1afce4763769edf73d26ea277..aeadbac3083129b56294ab1d7fac8c5a15b16618 100644 GIT binary patch delta 44 zcmV+{0Mq~4(+S$s39yU<15? Date: Sat, 13 Jun 2026 20:35:20 -0500 Subject: [PATCH 3/4] Ganon needs ARROWS not ARROYS, silly logic --- BaseClasses.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BaseClasses.py b/BaseClasses.py index d8fb6307..afebc605 100644 --- a/BaseClasses.py +++ b/BaseClasses.py @@ -1409,7 +1409,7 @@ class CollectionState(object): def can_hit_stunned_ganon(self, player): ganon_item = self.world.ganon_item[player] if ganon_item == "silver": - return self.has("Silver Arroys", player) and self.can_shoot_arrows(player) + return self.has("Silver Arrows", player) and self.can_shoot_arrows(player) elif ganon_item == "boomerang": return self.has("Blue Boomerang", player) or self.has("Red Boomerang", player) elif ganon_item == "hookshot": From b61c198159d9e2c4760801e6393dabf2490a163c Mon Sep 17 00:00:00 2001 From: Kara Alexandra Date: Mon, 15 Jun 2026 16:57:05 -0500 Subject: [PATCH 4/4] Fix orange potion being overwritten --- Rom.py | 2 +- data/base2current.bps | Bin 158530 -> 158534 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Rom.py b/Rom.py index 4b620e9a..d84e4bf6 100644 --- a/Rom.py +++ b/Rom.py @@ -85,7 +85,7 @@ from Utils import int16_as_bytes, int32_as_bytes, local_path, snes_to_pc from Versions import DRVersion, GKVersion, ORVersion JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = '589a044786a63d98aff0e44b51a6a339' +RANDOMIZERBASEHASH = 'd80446af9eeb1726d2b6c1303bec1226' class JsonRom(object): diff --git a/data/base2current.bps b/data/base2current.bps index 77850823a2bca42aa12b2d1ace5c127d0dd4be83..3419e75b8f49e0cee30c7889e118dd93127b44d2 100644 GIT binary patch delta 47 zcmV+~0MP%!)(OVe39yU<1mg%C_p^`#mM#U