diff --git a/mockingboard/ksp_theme2_compressed.inc b/mockingboard/ksp_theme2_compressed.inc index 7c117cee..7a551c5b 100644 --- a/mockingboard/ksp_theme2_compressed.inc +++ b/mockingboard/ksp_theme2_compressed.inc @@ -10,7 +10,8 @@ ksp_theme2: .byte $01,$80,$38,$00 ; 00000 -.byte $01,$3C,$7D,$02,$BB,$03,$06,$0D,$0D ; 00096 +.byte $01,$3C, $7D,$02,$BB,$03, $06,$0D,$0D ; 00096 +;.byte $01,$35, $BD,$EE,$DD,$01, $07,$0D,$0D,$0D .byte $01,$00,$06,$0E,$0E ; 00097 .byte $01,$00,$06,$0F,$0F ; 00098 .byte $01,$00,$06,$0E,$0E ; 00099 diff --git a/mockingboard/ksp_theme_6ch.s b/mockingboard/ksp_theme_6ch.s index fa1beb0f..beab26f8 100644 --- a/mockingboard/ksp_theme_6ch.s +++ b/mockingboard/ksp_theme_6ch.s @@ -63,9 +63,9 @@ mockingboard_found: ; load pointer to the music ;=========================== - lda #ksp_theme + lda #>ksp_theme2 sta INH lda (INL),Y ; read in frame delay @@ -359,7 +359,7 @@ interrupt_handler: bit $C404 ; can clear 6522 interrupt by reading T1C-L - inc $0401 ; DEBUG: increment text char +; inc $0401 ; DEBUG: increment text char ; jsr interrupt_handle_right ; jsr interrupt_handle_left @@ -380,7 +380,6 @@ bottom_regs_right_loop: inx ; increment X cpx #$8 ; if we reach 8, done beq top_regs_right ; move on to top - ror MASK bcc bottom_regs_right_loop ; if bit not set in mask, skip reg @@ -409,9 +408,8 @@ top_regs_right: ldx #$7 ; load X as 7 (we increment first) top_regs_right_loop: inx ; increment - cpx #$16 + cpx #16 beq done_with_masks_right ; exit if done - ror MASK bcc top_regs_right_loop ; loop if not set @@ -474,7 +472,6 @@ bottom_regs_left_loop: inx ; increment X cpx #$8 ; if we reach 8, done beq top_regs_left ; move on to top - ror MASK bcc bottom_regs_left_loop ; if bit not set in mask, skip reg @@ -503,11 +500,10 @@ top_regs_left: ldx #$7 ; load X as 7 (we increment first) top_regs_left_loop: inx ; increment - cpx #$16 + cpx #16 beq done_with_masks_left ; exit if done - ror MASK - bcc top_regs_left_loop ; loop if not set + bcc top_regs_left_loop ; loop if not set stx XX ; save X value @@ -578,6 +574,7 @@ done_interrupt: .include "ksp_theme2_compressed.inc" + ;========= ; strings ;========= diff --git a/mockingboard/ksp_theme_interrupt.s b/mockingboard/ksp_theme_interrupt.s index 4bfb25cb..9e13dae3 100644 --- a/mockingboard/ksp_theme_interrupt.s +++ b/mockingboard/ksp_theme_interrupt.s @@ -62,9 +62,9 @@ mockingboard_found: ; load pointer to the music ;=========================== - lda #ksptheme + lda #>ksp_theme sta INH lda (INL),Y ; read in frame delay