diff --git a/chiptune_player/chiptune_player.s b/chiptune_player/chiptune_player.s index 9f99cc09..b0a95fc4 100644 --- a/chiptune_player/chiptune_player.s +++ b/chiptune_player/chiptune_player.s @@ -280,9 +280,32 @@ volume_bars: jsr hlin_double ; middle + lda #8 middle_loop: pha + + cmp #8 + beq middle_black + cmp #26 + beq middle_black + + ldx #COLOR_BOTH_RED + stx A_COLOR + ldx #COLOR_BOTH_DARKBLUE + stx B_COLOR + ldx #COLOR_BOTH_DARKGREEN + stx C_COLOR + jmp middle_color_done + +middle_black: + ldx #COLOR_BOTH_BLACK + stx A_COLOR + stx B_COLOR + stx C_COLOR + +middle_color_done: + ; left border ldy #COLOR_BOTH_GREY sty COLOR @@ -292,12 +315,57 @@ middle_loop: jsr hlin_double + ; border space lda #COLOR_BOTH_BLACK sta COLOR - ldx #13 + ldx #1 jsr hlin_double_continue + ; A volume + lda A_COLOR + sta COLOR + + ldx #3 + jsr hlin_double_continue + + ; A space + lda #COLOR_BOTH_BLACK + sta COLOR + + ldx #1 + jsr hlin_double_continue + + ; B volume + lda B_COLOR + sta COLOR + + ldx #3 + jsr hlin_double_continue + + ; B space + lda #COLOR_BOTH_BLACK + sta COLOR + + ldx #1 + jsr hlin_double_continue + + ; C volume + lda C_COLOR + sta COLOR + + ldx #3 + jsr hlin_double_continue + + ; C space + lda #COLOR_BOTH_BLACK + sta COLOR + + ldx #1 + jsr hlin_double_continue + + ; Right border + lda #COLOR_BOTH_GREY sta COLOR diff --git a/chiptune_player/zp.inc b/chiptune_player/zp.inc index 616b482b..cf58c3a2 100644 --- a/chiptune_player/zp.inc +++ b/chiptune_player/zp.inc @@ -61,6 +61,13 @@ SCREEN_Y EQU $62 ;NUM1L EQU $7E ;NUM1H EQU $7F +A_VOLUME EQU $80 +B_VOLUME EQU $81 +C_VOLUME EQU $82 +A_COLOR EQU $83 +B_COLOR EQU $84 +C_COLOR EQU $85 + ;NUM2L EQU $80 ;NUM2H EQU $81 ;RESULT EQU $82 ; 83,84,85