From 2bea1345c9df7e0e1279471a1127132ea9284a65 Mon Sep 17 00:00:00 2001
From: sporchia <print@blindchaos.net>
Date: Sat, 14 Oct 2017 22:49:15 -0400
Subject: [PATCH] update usages for new areas to make hard modes completable

---
 hardmode.asm | 13 +++++++++----
 tables.asm   |  7 +++++--
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/hardmode.asm b/hardmode.asm
index 77994f2..02a62c5 100644
--- a/hardmode.asm
+++ b/hardmode.asm
@@ -19,14 +19,17 @@ CalculateByrnaUsage:
 	LDA $1B : BEQ ++
 	REP #$20 ; set 16-bit accumulator
 	LDA $A0 ; these are all decimal because i got them that way
-	CMP.w #279 : BEQ + ; Spike Cave
+	CMP.w #95 : BEQ + ; Ice Palace Spike Room
+	CMP.w #172 : BEQ + ; Blind Boss Room
 	CMP.w #179 : BEQ + ; Room in Misery Mire
+	CMP.w #213 : BEQ + ; Laser Bridge
+	CMP.w #279 : BEQ + ; Spike Cave
 	SEP #$20 ; set 8-bit accumulator
 	BRA ++
 	+
 		SEP #$20 ; set 8-bit accumulator
 		PHX : TYX
-		LDA.l ByrnaCaveCaneOfByrnaUsage, X : STA $00
+		LDA.l HardModeExclusionCaneOfByrnaUsage, X : STA $00
 		PLX
 	++
 	LDA $7EF36E ; thing we wrote over
@@ -36,14 +39,16 @@ CalculateCapeUsage:
 	LDA $1B : BEQ ++
 	REP #$20 ; set 16-bit accumulator
 	LDA $A0 ; these are all decimal because i got them that way
-	CMP.w #279 : BEQ + ; Spike Cave
+	CMP.w #95 : BEQ + ; Ice Palace Spike Room
 	CMP.w #179 : BEQ + ; Room in Misery Mire
+	CMP.w #213 : BEQ + ; Laser Bridge
+	CMP.w #279 : BEQ + ; Spike Cave
 	SEP #$20 ; set 8-bit accumulator
 	BRA ++
 	+
 		SEP #$20 ; set 8-bit accumulator
 		PHX : TYX
-		LDA.l ByrnaCaveCapeUsage, X : STA $4C ; set cape decrement timer
+		LDA.l HardModeExclusionCapeUsage, X : STA $4C ; set cape decrement timer
 		PLX
 	++
 	LDA $7EF36E ; thing we wrote over
diff --git a/tables.asm b/tables.asm
index cb388a4..4cd1dcf 100644
--- a/tables.asm
+++ b/tables.asm
@@ -257,6 +257,9 @@ db $01 ; #$01 = 1/2 Magic (default) - #$02 = 1/4 Magic
 org $07ADA7 ; PC 0x3ADA7 - Bank07.asm:7216 - (db 4, 8, 8)
 CapeMagicUse:
 db $04, $08, $10 ; change to db $04, $08, $08 for original cape behavior
+org $08DC42 ; PC 0x45C42 - ancilla_cane_spark.asm:200 - (db 4, 2, 1)
+ByrnaMagicUsage:
+db #$04, #$02, #$01 ; normal, 1/2, 1/4 magic
 ;--------------------------------------------------------------------------------
 ;Dungeon Music
 ;org $02D592 ; PC 0x15592
@@ -701,10 +704,10 @@ FreeItemText:
 db #$00 ; #00 = Off - #$01 = On (default)
 ;================================================================================
 org $30816B ; PC 0x18016B
-ByrnaCaveCaneOfByrnaUsage:
+HardModeExclusionCaneOfByrnaUsage:
 db #$04, #$02, #$01 ; normal, 1/2, 1/4 magic
 org $30816E ; PC 0x18016E
-ByrnaCaveCapeUsage:
+HardModeExclusionCapeUsage:
 db #$04, #$08, #$10 ; normal, 1/2, 1/4 magic
 ;================================================================================
 org $308190 ; PC 0x180190