display MB mono/stereo on start

This commit is contained in:
Peter Ferrie 2023-01-06 11:36:12 -08:00
parent 39b62e540d
commit 7590c290a3
3 changed files with 29 additions and 18 deletions

View File

@ -1,5 +1,5 @@
;license:MIT ;license:MIT
;(c) 2018-2020 by 4am ;(c) 2018-2023 by 4am
; ;
; first-run initialization code ; first-run initialization code
; ;
@ -157,7 +157,6 @@
lda zpMachineStatus lda zpMachineStatus
and #HAS_JOYSTICK and #HAS_JOYSTICK
beq + beq +
jsr LoadingCR
+LDADDR LoadingJoystick +LDADDR LoadingJoystick
jsr LoadingPrint jsr LoadingPrint
+ +
@ -165,7 +164,6 @@
lda zpMachineStatus lda zpMachineStatus
and #HAS_VIDHD and #HAS_VIDHD
beq + beq +
jsr LoadingCR
+LDADDR LoadingVidHD +LDADDR LoadingVidHD
jsr LoadingPrint jsr LoadingPrint
+ +
@ -235,11 +233,21 @@
stx MockingboardStuff ; save mockingboard slot and type in LC RAM stx MockingboardStuff ; save mockingboard slot and type in LC RAM
+READ_ROM_NO_WRITE +READ_ROM_NO_WRITE
txa
beq +
and #HAS_STEREO
beq @mb_mono
+LDADDR LoadingMockingboardStereo
bne @mb_print
@mb_mono
+LDADDR LoadingMockingboardStereo
@mb_print
jsr LoadingPrint
; if Mockingboard AND HAS_SPEECH then print CR & '...and it talks!' ; if Mockingboard AND HAS_SPEECH then print CR & '...and it talks!'
txa txa
and #HAS_SPEECH and #HAS_SPEECH
beq + beq +
jsr LoadingCR
+LDADDR LoadingMockingboardSpeech +LDADDR LoadingMockingboardSpeech
jsr LoadingPrint jsr LoadingPrint
@ -280,13 +288,8 @@ LoadingPrint
bne - bne -
rts rts
LoadingCR
lda #$8D
jmp ROM_COUT
FoundMockingboardCallback FoundMockingboardCallback
; in: zp$81 contains slot number in form $Cx ; in: zp$81 contains slot number in form $Cx
jsr LoadingCR
+LDADDR LoadingMockingboard +LDADDR LoadingMockingboard
jsr LoadingPrint jsr LoadingPrint
lda $81 lda $81
@ -319,14 +322,20 @@ LoadingIIgs
!byte 4 !byte 4
!text "IIgs" !text "IIgs"
LoadingJoystick LoadingJoystick
!byte 8 !byte 9
!text "joystick" !text $8D,"joystick"
LoadingVidHD LoadingVidHD
!byte 5 !byte 6
!text "VidHD" !text $8D,"VidHD"
LoadingMockingboard LoadingMockingboard
!byte 21 !byte 22
!text "Mockingboard in slot " !text $8D,"Mockingboard in slot "
LoadingMockingboardStereo
!byte 7
!text $8D,"Stereo"
LoadingMockingboardMono
!byte 5
!text $8D,"Mono"
LoadingMockingboardSpeech LoadingMockingboardSpeech
!byte 16 !byte 16
!text "...and it talks!" !text "...and it talks!"

View File

@ -1,5 +1,5 @@
;license:MIT ;license:MIT
;(c) 2018-2022 by 4am ;(c) 2018-2023 by 4am
; ;
;------------------------------------------------------------------------------ ;------------------------------------------------------------------------------
@ -11,7 +11,7 @@
; ...unused... ; ...unused...
; E000..E3FF - HGR font data ; E000..E3FF - HGR font data
; ...unused... ; ...unused...
; E730..FFEB - main program code ; E6C9..FFEB - main program code
; FFEC..FFF9 - API functions and global constants available for main program ; FFEC..FFF9 - API functions and global constants available for main program
; code, prelaunchers, transition effects, &c. ; code, prelaunchers, transition effects, &c.
; (LoadFileDirect, Wait/UnwaitForVBL, MockingboardStuff, MachineStatus) ; (LoadFileDirect, Wait/UnwaitForVBL, MockingboardStuff, MachineStatus)
@ -110,6 +110,7 @@ ROM_MACHINEID =$FBB3
ROM_MACHINE2C =$FBC0 ROM_MACHINE2C =$FBC0
ROM_HOME = $FC58 ROM_HOME = $FC58
ROM_WAIT = $FCA8 ROM_WAIT = $FCA8
ROM_CROUT= $FD8E
ROM_COUT = $FDED ROM_COUT = $FDED
ROM_NORMAL = $FE84 ; NORMAL text (instead of INVERSE or FLASH) ROM_NORMAL = $FE84 ; NORMAL text (instead of INVERSE or FLASH)
ROM_IN0 = $FE89 ; SETKBD ROM_IN0 = $FE89 ; SETKBD
@ -188,6 +189,7 @@ EnableAccelerator = DisableAccelerator+3
; AND masks for MockingboardStuff ; AND masks for MockingboardStuff
MOCKINGBOARD_SLOT = %00001111 MOCKINGBOARD_SLOT = %00001111
HAS_STEREO = %00100000
HAS_SPEECH = %11000000 HAS_SPEECH = %11000000
; AND masks for game info bitfield (after game display name in gSearchStore) ; AND masks for game info bitfield (after game display name in gSearchStore)

View File

@ -1,5 +1,5 @@
;license:MIT ;license:MIT
;(c) 2019-2020 by Andrew Roughan, qkumba, 4am, Tom Charlesworth, Rob Justice ;(c) 2019-2022 by Andrew Roughan, qkumba, 4am, Tom Charlesworth, Rob Justice
; ;
; Mockingboard support functions ; Mockingboard support functions
; ;