From e3ae050a4cc58e721f90ec57b95f1df36bfa1c66 Mon Sep 17 00:00:00 2001 From: scawful Date: Fri, 5 Jul 2024 16:48:10 -0400 Subject: [PATCH] add greyed out rings to quest menu --- Menu/menu_draw.asm | 16 ++++++++++++++-- Menu/menu_gfx_table.asm | 1 + 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/Menu/menu_draw.asm b/Menu/menu_draw.asm index b4ed122..4cd8211 100644 --- a/Menu/menu_draw.asm +++ b/Menu/menu_draw.asm @@ -731,19 +731,31 @@ Menu_DrawMagicBag: Menu_DrawMagicRings: { + LDA.l $7EF3D8 : AND.w #$00FF : CMP.w #$0001 : BCC .no_attack + LDA.w #$0002 : BRA .draw_storms + .no_attack LDA.w #$0001 + .draw_storms STA.w MenuItemValueSpoof : LDA.w #MenuItemValueSpoof LDX.w #menu_offset(17,14) LDY.w #RingGFX JSR DrawMenuItem - LDA.w #$0003 + LDA.l $7EF3D8 : AND.w #$00FF : CMP.w #$0001 : BCC .no_defense + LDA.w #$0003 : BRA .draw_defense + .no_defense + LDA.w #$0001 + .draw_defense STA.w MenuItemValueSpoof : LDA.w #MenuItemValueSpoof LDX.w #menu_offset(17,17) LDY.w #RingGFX JSR DrawMenuItem - LDA.w #$0002 + LDA.l $7EF3D8 : AND.w #$00FF : CMP.w #$0001 : BCC .no_luck + LDA.w #$0004 : BRA .draw_luck + .no_luck + LDA.w #$0001 + .draw_luck STA.w MenuItemValueSpoof : LDA.w #MenuItemValueSpoof LDX.w #menu_offset(17,20) LDY.w #RingGFX diff --git a/Menu/menu_gfx_table.asm b/Menu/menu_gfx_table.asm index d1a2364..4717e93 100644 --- a/Menu/menu_gfx_table.asm +++ b/Menu/menu_gfx_table.asm @@ -190,6 +190,7 @@ BananaGFX: dw $341E, $341F, $342E, $342F ; Banana RingGFX: + dw $3049, $304A, $B049, $B04A ; Gray Ring dw $2449, $244A, $A449, $A44A ; Red Ring dw $2C49, $2C4A, $AC49, $AC4A ; Blue Ring dw $3C49, $3C4A, $BC49, $BC4A ; Green Ring