fix MB detection as per TomCh

This commit is contained in:
Peter Ferrie 2020-05-13 10:24:35 -07:00
parent eccda5a409
commit 76fd0bbb52

View File

@ -1,5 +1,5 @@
;license:MIT ;license:MIT
;(c) 2019-2020 by Andrew Roughan, qkumba, 4am ;(c) 2019-2020 by Andrew Roughan, qkumba, 4am, Tom Charlesworth
; ;
; Mockingboard support functions ; Mockingboard support functions
; ;
@ -51,12 +51,12 @@ GetMockingboardStuff
beq @foundII beq @foundII
ldy #$0c ldy #$0c
sty @mb_smc3 + 1 sty @mb_smc1 + 1
iny iny
sty @mb_smc8 + 1 sty @mb_smc8 + 1
iny iny
sty @mb_smc7 + 1 sty @mb_smc5 + 1
sty @mb_smc11 + 1 sty @mb_smc12 + 1
+HIDE_NEXT_2_BYTES +HIDE_NEXT_2_BYTES
@foundII ;stereo @foundII ;stereo
@ -75,7 +75,6 @@ GetMockingboardStuff
sta @mb_smc10 + 2 sta @mb_smc10 + 2
sta @mb_smc11 + 2 sta @mb_smc11 + 2
sta @mb_smc12 + 2 sta @mb_smc12 + 2
sta @mb_smc13 + 2
; detect speech chip ; detect speech chip
@ -87,25 +86,20 @@ GetMockingboardStuff
sta $3ff sta $3ff
sta $ffff sta $ffff
lda #0
@mb_smc1
sta $c403
@mb_smc2
sta $c402
lda #$0c lda #$0c
@mb_smc3 @mb_smc1
sta $c48c sta $c48c
lda #$80 lda #$80
@mb_smc4 @mb_smc2
sta $c443 sta $c443
lda #$c0 lda #$c0
@mb_smc5 @mb_smc3
sta $c440 sta $c440
lda #$70 lda #$70
@mb_smc6 @mb_smc4
sta $c443 sta $c443
lda #$82 lda #$82
@mb_smc7 @mb_smc5
sta $c48e sta $c48e
ldx #0 ldx #0
@ -127,6 +121,13 @@ GetMockingboardStuff
ror $82 ror $82
@onlyI @onlyI
ldy #$ff
@mb_smc6
sty $c403
lda #7
@mb_smc7
sta $c402
lda $81 lda $81
and #7 and #7
ora $82 ora $82
@ -136,7 +137,7 @@ GetMockingboardStuff
lda #>Ignore lda #>Ignore
sta $ffff sta $ffff
ldy #0 iny
tya tya
sta ($80),y sta ($80),y
lda #4 lda #4
@ -162,22 +163,19 @@ GetMockingboardStuff
lda #2 lda #2
@mb_smc8 @mb_smc8
sta $c48d sta $c48d
lda #0 lda #$80
@mb_smc9 @mb_smc9
sta $c443
lda #0
@mb_smc10
sta $c440 sta $c440
lda #$70 lda #$70
@mb_smc10 @mb_smc11
sta $c443 sta $c443
sta $80 sta $80
lda #2 lda #2
@mb_smc11
sta $c48e
lda #$ff
@mb_smc12 @mb_smc12
sta $c403 sta $c48e
lda #7
@mb_smc13
sta $c402
lda $45 lda $45
rti rti