scawful/oracle-of-secrets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

housekeeping ring menu

Browse Source
This commit is contained in:
scawful
2024-07-10 22:23:34 -04:00
parent 928a340f67
commit a61d8ce228
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Menu/menu.asm
View File

@@ -717,7 +717,7 @@ RingMenu_Controls:
BEQ + ; If not, skip setting the ring
INY #2
TYA ; Transfer Y to A
JSR StoreRingToSlotStack
JSR RingMenu_StoreRingToSlotStack
+
; Return to item menu if player presses X

12
Menu/menu_draw.asm
View File

@@ -802,7 +802,7 @@ Menu_DrawMagicRingsInBox:
LDA.b #$7E : STA.b $0A ; Set up the bank of our indirect address
REP #$30
LDA.l FOUNDRINGS : AND.w #$00FF : BIT.w #$0020 : BEQ .no_attack
LDA.l MAGICRINGS : 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 FOUNDRINGS : AND.w #$00FF : BIT.w #$0010 : BEQ .no_defense
LDA.l MAGICRINGS : 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 FOUNDRINGS : AND.w #$00FF : BIT.w #$0008 : BEQ .no_steadfast
LDA.l MAGICRINGS : 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 FOUNDRINGS : AND.w #$00FF : BIT.w #$0004 : BEQ .no_light
LDA.l MAGICRINGS : 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 FOUNDRINGS : AND.w #$00FF : BIT.w #$0002 : BEQ .no_blast
LDA.l MAGICRINGS : 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 FOUNDRINGS : AND.w #$00FF : BIT.w #$0001 : BEQ .no_heart
LDA.l MAGICRINGS : AND.w #$00FF : BIT.w #$0001 : BEQ .no_heart
LDA.w #$0007 : BRA +
.no_heart
LDA.w #$0001