From 5030d5aec6857d3f7c5a34f5041daf54ed0d4cea Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Wed, 10 Jul 2024 20:07:29 -0400
Subject: [PATCH] update magic ring menu draw

---
 Menu/menu_draw.asm | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Menu/menu_draw.asm b/Menu/menu_draw.asm
index 1ec1944..5f81532 100644
--- a/Menu/menu_draw.asm
+++ b/Menu/menu_draw.asm
@@ -763,7 +763,7 @@ Menu_DrawRingBox:
 
 Menu_DrawMagicRings:
 {
-  LDA.l $7EF3D8 : AND.w #$00FF : CMP.w #$0001 : BCC .no_attack
+  LDA.l RingSlot1 : AND.w #$00FF : CMP.w #$0001 : BCC .no_attack
     LDA.w #$0002 : BRA .draw_storms
   .no_attack
   LDA.w #$0001
@@ -773,7 +773,7 @@ Menu_DrawMagicRings:
   LDY.w #RingGFX
   JSR DrawMenuItem
 
-  LDA.l $7EF3D8 : AND.w #$00FF : CMP.w #$0001 : BCC .no_defense
+  LDA.l RingSlot2 : AND.w #$00FF : CMP.w #$0001 : BCC .no_defense
     LDA.w #$0003 : BRA .draw_defense
   .no_defense
   LDA.w #$0001
@@ -783,7 +783,7 @@ Menu_DrawMagicRings:
   LDY.w #RingGFX
   JSR DrawMenuItem
 
-  LDA.l $7EF3D8 : AND.w #$00FF : CMP.w #$0001 : BCC .no_luck
+  LDA.l RingSlot3 : AND.w #$00FF : CMP.w #$0001 : BCC .no_luck
     LDA.w #$0004 : BRA .draw_luck
   .no_luck
   LDA.w #$0001
@@ -802,7 +802,7 @@ Menu_DrawMagicRingsInBox:
   LDA.b #$7E : STA.b $0A ; Set up the bank of our indirect address
   REP #$30
 
-  LDA.l MAGICRINGS : AND.w #$00FF : CMP.w #$0020 : BNE .no_attack
+  LDA.l FOUNDRINGS : AND.w #$00FF : BIT.w #$0020 : BEQ .no_attack
     LDA.w #$0002 : BRA +
   .no_attack
   LDA.w #$0001
@@ -812,7 +812,7 @@ Menu_DrawMagicRingsInBox:
   LDY.w #RingGFX
   JSR DrawMenuItem
 
-  LDA.l MAGICRINGS : AND.w #$00FF : CMP.w #$0010 : BNE .no_defense
+  LDA.l FOUNDRINGS : AND.w #$00FF : BIT.w #$0010 : BEQ .no_defense
     LDA.w #$0003 : BRA +
   .no_defense
   LDA.w #$0001
@@ -822,7 +822,7 @@ Menu_DrawMagicRingsInBox:
   LDY.w #RingGFX
   JSR DrawMenuItem
 
-  LDA.l MAGICRINGS : AND.w #$00FF : CMP.w #$0008 : BNE .no_steadfast
+  LDA.l FOUNDRINGS : AND.w #$00FF : BIT.w #$0008 : BEQ .no_steadfast
     LDA.w #$0004 : BRA +
   .no_steadfast
   LDA.w #$0001
@@ -832,7 +832,7 @@ Menu_DrawMagicRingsInBox:
   LDY.w #RingGFX
   JSR DrawMenuItem
 
-  LDA.l MAGICRINGS : AND.w #$00FF : CMP.w #$0004 : BNE .no_light
+  LDA.l FOUNDRINGS : AND.w #$00FF : BIT.w #$0004 : BEQ .no_light
     LDA.w #$0005 : BRA +
   .no_light
   LDA.w #$0001
@@ -842,7 +842,7 @@ Menu_DrawMagicRingsInBox:
   LDY.w #RingGFX
   JSR DrawMenuItem
 
-  LDA.l MAGICRINGS : AND.w #$00FF : CMP.w #$0002 : BNE .no_blast
+  LDA.l FOUNDRINGS : AND.w #$00FF : BIT.w #$0002 : BEQ .no_blast
     LDA.w #$0006 : BRA +
   .no_blast
   LDA.w #$0001
@@ -852,7 +852,7 @@ Menu_DrawMagicRingsInBox:
   LDY.w #RingGFX
   JSR DrawMenuItem
 
-  LDA.l MAGICRINGS : AND.w #$00FF : CMP.w #$0001 : BNE .no_heart
+  LDA.l FOUNDRINGS : AND.w #$00FF : BIT.w #$0001 : BEQ .no_heart
     LDA.w #$0007 : BRA +
   .no_heart
   LDA.w #$0001