From 1a9878dd7c2ab9bebcf75109491b80411dc964f0 Mon Sep 17 00:00:00 2001
From: Kara Alexandra <ardnaxelarak@gmail.com>
Date: Mon, 27 Dec 2021 14:03:32 -0800
Subject: [PATCH] Fix Byrna hard-mode exclusion usage in cane-only mode

---
 Rom.py                |   9 +++++++--
 data/base2current.bps | Bin 89819 -> 89823 bytes
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Rom.py b/Rom.py
index f70c9d3e..771ada98 100644
--- a/Rom.py
+++ b/Rom.py
@@ -33,7 +33,7 @@ from source.classes.SFX import randomize_sfx
 
 
 JAP10HASH = '03a63945398191337e896e5771f77173'
-RANDOMIZERBASEHASH = 'b61fd3ea2d9c4c0465317052fa30a721'
+RANDOMIZERBASEHASH = '88d2b2f989e71ff7f9ea9811faa4a4d0'
 
 
 class JsonRom(object):
@@ -1393,7 +1393,12 @@ def patch_rom(world, rom, player, team, enemized, is_mystery=False):
     rom.write_byte(0x180171, 0x01 if world.ganon_at_pyramid[player] else 0x00)  # Enable respawning on pyramid after ganon death
     rom.write_byte(0x180173, 0x01) # Bob is enabled
     rom.write_byte(0x180168, 0x08)  # Spike Cave Damage
-    rom.write_bytes(0x18016B, [0x04, 0x02, 0x01]) # Set spike cave and MM spike room Byrna usage
+
+    # Set spike cave and MM spike room Byrna usage
+    if world.swords[player] in ['byrna', 'cane']:
+        rom.write_bytes(0x18016B, [0x00, 0x00, 0x00])
+    else:
+        rom.write_bytes(0x18016B, [0x04, 0x02, 0x01])
     rom.write_bytes(0x18016E, [0x04, 0x08, 0x10]) # Set spike cave and MM spike room Cape usage
     rom.write_bytes(0x50563, [0x3F, 0x14]) # disable below ganon chest
     rom.write_byte(0x50599, 0x00) # disable below ganon chest
diff --git a/data/base2current.bps b/data/base2current.bps
index efd73101092423fedc56f0916ba2024f9ec560f7..53614d8debe5f475d8f2f50ab6f0431bcfccfab6 100644
GIT binary patch
delta 38
wcmV+>0NMZBy#?RB1+Ym01Efw{vrGZ>?FGAnfdP}VLGO}p2>dcoYt!Lk%2`hmb^rhX

delta 34
scmV+-0NwxJy#?F71+Ym01Dj4{vrGZ>?E%xXMemYt2$SHeB~H)?kQ$^ACjbBd