fix multiple issues with Mockingboard reporting (speech, mono)

This commit is contained in:
4am
2024-12-30 21:19:20 -05:00
parent a8dfafa221
commit 7f08582335

View File

@@ -251,17 +251,22 @@
jsr BuildVBLFunction ; requires ROM read, RAM1 write jsr BuildVBLFunction ; requires ROM read, RAM1 write
plp plp
beq @done_with_mb beq @done_with_mb
+READ_RAM1_NO_WRITE
lda MockingboardStuff ; requires RAM1 read
+READ_ROM_NO_WRITE
and #HAS_STEREO and #HAS_STEREO
beq @mb_mono beq @mb_mono
+LDADDR LoadingMockingboardStereo +LDADDR LoadingMockingboardStereo
bne @mb_print bne @mb_print ; always branches
@mb_mono @mb_mono
+LDADDR LoadingMockingboardStereo +LDADDR LoadingMockingboardMono
@mb_print @mb_print
jsr LoadingPrint ; requires ROM read jsr LoadingPrint ; requires ROM read
; if Mockingboard AND HAS_SPEECH then print CR & '...and it talks!' ; if Mockingboard AND HAS_SPEECH then print CR & '...and it talks!'
txa +READ_RAM1_NO_WRITE
lda MockingboardStuff ; requires RAM1 read
+READ_ROM_NO_WRITE
and #HAS_SPEECH and #HAS_SPEECH
beq @done_with_mb beq @done_with_mb
+LDADDR LoadingMockingboardSpeech +LDADDR LoadingMockingboardSpeech