diff --git a/Menu/menu.asm b/Menu/menu.asm index 088396d..b10c23a 100644 --- a/Menu/menu.asm +++ b/Menu/menu.asm @@ -56,22 +56,23 @@ Menu_Entry: SEP #$20 PLB RTL + + .vectors + dw Menu_InitGraphics ; 00 + dw Menu_UploadRight ; 01 + dw Menu_UploadLeft ; 02 + dw Menu_ScrollDown ; 03 + dw Menu_ItemScreen ; 04 + dw Menu_ScrollTo ; 05 + dw Menu_StatsScreen ; 06 + dw Menu_ScrollFrom ; 07 + dw Menu_ScrollUp ; 08 + dw Menu_RingBox ; 09 + dw Menu_Exit ; 0A + dw Menu_InitiateScrollDown ; 0B + dw Menu_MagicBag ; 0C + dw Menu_SongMenu ; 0D } -.vectors - dw Menu_InitGraphics ; 00 - dw Menu_UploadRight ; 01 - dw Menu_UploadLeft ; 02 - dw Menu_ScrollDown ; 03 - dw Menu_ItemScreen ; 04 - dw Menu_ScrollTo ; 05 - dw Menu_StatsScreen ; 06 - dw Menu_ScrollFrom ; 07 - dw Menu_ScrollUp ; 08 - dw Menu_RingBox ; 09 - dw Menu_Exit ; 0A - dw Menu_InitiateScrollDown ; 0B - dw Menu_MagicBag ; 0C - dw Menu_SongMenu ; 0D ; ========================================================= ; 00 MENU INIT GRAPHICS @@ -529,7 +530,6 @@ Menu_SongMenu: { REP #$30 JSR Menu_DrawMusicNotes - INC $0207 LDA.w $030F : BEQ .continue diff --git a/Menu/menu_draw.asm b/Menu/menu_draw.asm index 632fc0e..1ec1944 100644 --- a/Menu/menu_draw.asm +++ b/Menu/menu_draw.asm @@ -796,14 +796,13 @@ 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.l MAGICRINGS : AND.w #$00FF : CMP.w #$0020 : BNE .no_attack LDA.w #$0002 : BRA + .no_attack LDA.w #$0001 @@ -813,7 +812,7 @@ Menu_DrawMagicRingsInBox: LDY.w #RingGFX JSR DrawMenuItem - LDA.l FOUNDRINGS : AND.w #$00FF : CMP.w #$0001 : BCC .no_defense + LDA.l MAGICRINGS : AND.w #$00FF : CMP.w #$0010 : BNE .no_defense LDA.w #$0003 : BRA + .no_defense LDA.w #$0001 @@ -823,7 +822,7 @@ Menu_DrawMagicRingsInBox: LDY.w #RingGFX JSR DrawMenuItem - LDA.l FOUNDRINGS : AND.w #$00FF : CMP.w #$0001 : BCC .no_steadfast + LDA.l MAGICRINGS : AND.w #$00FF : CMP.w #$0008 : BNE .no_steadfast LDA.w #$0004 : BRA + .no_steadfast LDA.w #$0001 @@ -833,7 +832,7 @@ Menu_DrawMagicRingsInBox: LDY.w #RingGFX JSR DrawMenuItem - LDA.l FOUNDRINGS : AND.w #$00FF : CMP.w #$0001 : BCC .no_light + LDA.l MAGICRINGS : AND.w #$00FF : CMP.w #$0004 : BNE .no_light LDA.w #$0005 : BRA + .no_light LDA.w #$0001 @@ -843,7 +842,7 @@ Menu_DrawMagicRingsInBox: LDY.w #RingGFX JSR DrawMenuItem - LDA.l FOUNDRINGS : AND.w #$00FF : CMP.w #$0001 : BCC .no_blast + LDA.l MAGICRINGS : AND.w #$00FF : CMP.w #$0002 : BNE .no_blast LDA.w #$0006 : BRA + .no_blast LDA.w #$0001 @@ -853,7 +852,7 @@ Menu_DrawMagicRingsInBox: LDY.w #RingGFX JSR DrawMenuItem - LDA.l FOUNDRINGS : AND.w #$00FF : CMP.w #$0001 : BCC .no_heart + LDA.l MAGICRINGS : AND.w #$00FF : CMP.w #$0001 : BNE .no_heart LDA.w #$0007 : BRA + .no_heart LDA.w #$0001