mockingboard: UGH the bug was #$16 rather than #16

well *A* bug was that.  It still isn't starting up right.
This commit is contained in:
Vince Weaver 2018-02-08 23:51:55 -05:00
parent e8c1942c63
commit a22629e73f
3 changed files with 11 additions and 13 deletions

View File

@ -10,7 +10,8 @@
ksp_theme2: ksp_theme2:
.byte $01,$80,$38,$00 ; 00000 .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,$0E,$0E ; 00097
.byte $01,$00,$06,$0F,$0F ; 00098 .byte $01,$00,$06,$0F,$0F ; 00098
.byte $01,$00,$06,$0E,$0E ; 00099 .byte $01,$00,$06,$0E,$0E ; 00099

View File

@ -63,9 +63,9 @@ mockingboard_found:
; load pointer to the music ; load pointer to the music
;=========================== ;===========================
lda #<ksp_theme lda #<ksp_theme2
sta INL sta INL
lda #>ksp_theme lda #>ksp_theme2
sta INH sta INH
lda (INL),Y ; read in frame delay lda (INL),Y ; read in frame delay
@ -359,7 +359,7 @@ interrupt_handler:
bit $C404 ; can clear 6522 interrupt by reading T1C-L 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_right
; jsr interrupt_handle_left ; jsr interrupt_handle_left
@ -380,7 +380,6 @@ bottom_regs_right_loop:
inx ; increment X inx ; increment X
cpx #$8 ; if we reach 8, done cpx #$8 ; if we reach 8, done
beq top_regs_right ; move on to top beq top_regs_right ; move on to top
ror MASK ror MASK
bcc bottom_regs_right_loop ; if bit not set in mask, skip reg 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) ldx #$7 ; load X as 7 (we increment first)
top_regs_right_loop: top_regs_right_loop:
inx ; increment inx ; increment
cpx #$16 cpx #16
beq done_with_masks_right ; exit if done beq done_with_masks_right ; exit if done
ror MASK ror MASK
bcc top_regs_right_loop ; loop if not set bcc top_regs_right_loop ; loop if not set
@ -474,7 +472,6 @@ bottom_regs_left_loop:
inx ; increment X inx ; increment X
cpx #$8 ; if we reach 8, done cpx #$8 ; if we reach 8, done
beq top_regs_left ; move on to top beq top_regs_left ; move on to top
ror MASK ror MASK
bcc bottom_regs_left_loop ; if bit not set in mask, skip reg 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) ldx #$7 ; load X as 7 (we increment first)
top_regs_left_loop: top_regs_left_loop:
inx ; increment inx ; increment
cpx #$16 cpx #16
beq done_with_masks_left ; exit if done beq done_with_masks_left ; exit if done
ror MASK 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 stx XX ; save X value
@ -578,6 +574,7 @@ done_interrupt:
.include "ksp_theme2_compressed.inc" .include "ksp_theme2_compressed.inc"
;========= ;=========
; strings ; strings
;========= ;=========

View File

@ -62,9 +62,9 @@ mockingboard_found:
; load pointer to the music ; load pointer to the music
;=========================== ;===========================
lda #<ksptheme lda #<ksp_theme
sta INL sta INL
lda #>ksptheme lda #>ksp_theme
sta INH sta INH
lda (INL),Y ; read in frame delay lda (INL),Y ; read in frame delay