diff --git a/Menu/menu_draw.asm b/Menu/menu_draw.asm index e08b201..632fc0e 100644 --- a/Menu/menu_draw.asm +++ b/Menu/menu_draw.asm @@ -796,6 +796,78 @@ Menu_DrawMagicRings: RTS } +; TODO: Update the Ring SRAM checks. +Menu_DrawMagicRingsInBox: +{ + SEP #$30 + LDA.b #$7E : STA.b $0A ; Set up the bank of our indirect address + REP #$30 + + LDA.l FOUNDRINGS : AND.w #$00FF : CMP.w #$0001 : BCC .no_attack + LDA.w #$0002 : BRA + + .no_attack + LDA.w #$0001 + + + STA.w MenuItemValueSpoof : LDA.w #MenuItemValueSpoof + LDX.w #menu_offset(9,7) + LDY.w #RingGFX + JSR DrawMenuItem + + LDA.l FOUNDRINGS : AND.w #$00FF : CMP.w #$0001 : BCC .no_defense + LDA.w #$0003 : BRA + + .no_defense + LDA.w #$0001 + + + STA.w MenuItemValueSpoof : LDA.w #MenuItemValueSpoof + LDX.w #menu_offset(9,11) + LDY.w #RingGFX + JSR DrawMenuItem + + LDA.l FOUNDRINGS : AND.w #$00FF : CMP.w #$0001 : BCC .no_steadfast + LDA.w #$0004 : BRA + + .no_steadfast + LDA.w #$0001 + + + STA.w MenuItemValueSpoof : LDA.w #MenuItemValueSpoof + LDX.w #menu_offset(9,15) + LDY.w #RingGFX + JSR DrawMenuItem + + LDA.l FOUNDRINGS : AND.w #$00FF : CMP.w #$0001 : BCC .no_light + LDA.w #$0005 : BRA + + .no_light + LDA.w #$0001 + + + STA.w MenuItemValueSpoof : LDA.w #MenuItemValueSpoof + LDX.w #menu_offset(13,7) + LDY.w #RingGFX + JSR DrawMenuItem + + LDA.l FOUNDRINGS : AND.w #$00FF : CMP.w #$0001 : BCC .no_blast + LDA.w #$0006 : BRA + + .no_blast + LDA.w #$0001 + + + STA.w MenuItemValueSpoof : LDA.w #MenuItemValueSpoof + LDX.w #menu_offset(13,11) + LDY.w #RingGFX + JSR DrawMenuItem + + LDA.l FOUNDRINGS : AND.w #$00FF : CMP.w #$0001 : BCC .no_heart + LDA.w #$0007 : BRA + + .no_heart + LDA.w #$0001 + + + STA.w MenuItemValueSpoof : LDA.w #MenuItemValueSpoof + LDX.w #menu_offset(13,15) + LDY.w #RingGFX + JSR DrawMenuItem + + SEP #$30 + + RTS +} + Menu_DrawMagicItems: { SEP #$30 diff --git a/Menu/menu_gfx_table.asm b/Menu/menu_gfx_table.asm index c486884..3baad55 100644 --- a/Menu/menu_gfx_table.asm +++ b/Menu/menu_gfx_table.asm @@ -195,6 +195,9 @@ RingGFX: dw $2449, $244A, $A449, $A44A ; Red Ring dw $2C49, $2C4A, $AC49, $AC4A ; Blue Ring dw $3C49, $3C4A, $BC49, $BC4A ; Green Ring + dw $2849, $284A, $A849, $A84A ; Gold Ring + dw $3449, $344A, $B449, $B44A ; Silver Ring + dw $2049, $204A, $A049, $A04A ; Black Ring PineappleGFX: dw $3D7C, $3D7D, $356C, $756C ; Pineapple