From 45d24bd4a5bcc7aa3ced6b17d3c452fe710acbc5 Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Fri, 5 Jul 2024 16:40:28 -0400
Subject: [PATCH] add Menu_DrawMagicRings to quest menu

---
 Menu/menu.asm      |  2 +-
 Menu/menu_draw.asm | 42 +++++++++++++++++++++++-------------------
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/Menu/menu.asm b/Menu/menu.asm
index 6e1f8e9..8c7aa61 100644
--- a/Menu/menu.asm
+++ b/Menu/menu.asm
@@ -121,7 +121,7 @@ Menu_UploadRight:
   JSR Menu_DrawQuestIcons
   JSR Menu_DrawTriforceIcons
   JSR Menu_DrawPendantIcons
-
+  JSR Menu_DrawMagicRings
   JSR Menu_DrawPlaytimeLabel
 
   JSR Menu_DrawHeartPieces
diff --git a/Menu/menu_draw.asm b/Menu/menu_draw.asm
index b9f5c62..b4ed122 100644
--- a/Menu/menu_draw.asm
+++ b/Menu/menu_draw.asm
@@ -729,6 +729,29 @@ Menu_DrawMagicBag:
     incbin "tilemaps/magic_bag.tilemap"
 }
 
+Menu_DrawMagicRings:
+{
+  LDA.w #$0001
+  STA.w MenuItemValueSpoof : LDA.w #MenuItemValueSpoof
+  LDX.w #menu_offset(17,14)
+  LDY.w #RingGFX
+  JSR DrawMenuItem
+
+  LDA.w #$0003
+  STA.w MenuItemValueSpoof : LDA.w #MenuItemValueSpoof
+  LDX.w #menu_offset(17,17)
+  LDY.w #RingGFX
+  JSR DrawMenuItem
+
+  LDA.w #$0002
+  STA.w MenuItemValueSpoof : LDA.w #MenuItemValueSpoof
+  LDX.w #menu_offset(17,20)
+  LDY.w #RingGFX
+  JSR DrawMenuItem
+
+  RTS
+}
+
 Menu_DrawMagicItems:
 { 
   SEP #$30
@@ -753,25 +776,6 @@ Menu_DrawMagicItems:
   LDY.w #RockMeatGFX
   JSR DrawMenuItem
 
-
-  LDA.w #$0001
-  STA.w MenuItemValueSpoof : LDA.w #MenuItemValueSpoof
-  LDX.w #menu_offset(7,12)
-  LDY.w #RingGFX
-  JSR DrawMenuItem
-
-  LDA.w #$0002
-  STA.w MenuItemValueSpoof : LDA.w #MenuItemValueSpoof
-  LDX.w #menu_offset(7,15)
-  LDY.w #RingGFX
-  JSR DrawMenuItem
-
-  LDA.w #$0003
-  STA.w MenuItemValueSpoof : LDA.w #MenuItemValueSpoof
-  LDX.w #menu_offset(7,18)
-  LDY.w #RingGFX
-  JSR DrawMenuItem
-
   RTS
 }