log the exact T/S where we switched to the built-in RWTS, use more compact log in common cases

This commit is contained in:
4am 2018-01-19 11:04:58 -05:00
parent e9b12036d1
commit f46863bf4c
2 changed files with 17 additions and 16 deletions

View File

@ -507,6 +507,8 @@ nextsector
jmp TheEnd jmp TheEnd
SwitchToUniv SwitchToUniv
lda gSector
sta gDisplayBytes
lda #s_switch lda #s_switch
!byte $2C ; hide next LDA !byte $2C ; hide next LDA
StartWithUniv StartWithUniv

View File

@ -138,7 +138,7 @@ StringTable
; can be set directly before calling PrintByID. ; can be set directly before calling PrintByID.
; ;
.header .header
!text "Passport by 4am 2018-01-17",$00 !text "Passport by 4am 2018-01-19",$00
.mainmenu .mainmenu
!text "________________________________________",$8D,$8D,$8D,$8D,$8D,$8D,$8D !text "________________________________________",$8D,$8D,$8D,$8D,$8D,$8D,$8D
!text " " !text " "
@ -179,7 +179,7 @@ StringTable
.builtin .builtin
!text "Using built-in RWTS",$8D,$00 !text "Using built-in RWTS",$8D,$00
.switch .switch
!text "Switching to built-in RWTS",$8D,$00 !text "T%t,S%s Switching to built-in RWTS",$8D,$00
.writing .writing
!text "Writing to S%S,D%D",$8D,$00 !text "Writing to S%S,D%D",$8D,$00
.unformat .unformat
@ -191,11 +191,11 @@ StringTable
.optbad .optbad
!text "T%t,S%s is unreadable (ignoring)",$8D,$00 !text "T%t,S%s is unreadable (ignoring)",$8D,$00
.passver .passver
!text "Verification complete. The disk is good.",$00 !text "Verification complete. The disk is good.",$8D,$00
.passdemuf .passdemuf
!text "Demuffin complete.",$8D,$00 !text "Demuffin complete. ",$00
.passcrack .passcrack
!text "Crack complete.",$8D,$00 !text "Crack complete. ",$00
.passcrack0 .passcrack0
!byte $8D !byte $8D
!text "The disk was copied successfully, but",$8D !text "The disk was copied successfully, but",$8D
@ -204,27 +204,26 @@ StringTable
!text "- The source disk is not copy protected." !text "- The source disk is not copy protected."
!text "- The target disk works without patches." !text "- The target disk works without patches."
!text "- The disk uses an unknown protection,",$8D !text "- The disk uses an unknown protection,",$8D
!text " and Passport can not help any further.",$00 !text " and Passport can not help any further.",$8D,$00
.fail .fail
!byte $8D !byte $8D
!text "T%t,S%s Fatal read error",$8D,$00 !text "T%t,S%s Fatal read error",$8D,$8D,$00
.fatal0000 .fatal0000
!byte $8D !byte $8D
!text "Possible reasons:",$8D !text "Possible reasons:",$8D
!text "- There is no disk in S6,D1.",$8D !text "- There is no disk in S6,D1.",$8D
!text "- It is not an Apple ][ disk.",$8D !text "- It is not an Apple ][ disk.",$8D
!text "- The disk is 13-sector only.",$8D !text "- The disk is 13-sector only.",$8D
!text "- The disk is unformatted.",$8D,$00 !text "- The disk is unformatted.",$8D,$8D,$00
.fatal220f .fatal220f
!byte $8D !byte $8D
!text "Passport does not work on this disk.",$8D,$8D !text "Passport does not work on this disk.",$8D,$8D
!text "Possible reasons:",$8D !text "Possible reasons:",$8D
!text "- This is not a 13- or 16-sector disk.",$8D !text "- This is not a 13- or 16-sector disk.",$8D
!text "- The disk modifies its RWTS in ways",$8D !text "- The disk modifies its RWTS in ways",$8D
!text " that Passport is not able to detect.",$8D,$00 !text " that Passport is not able to detect.",$8D,$8D,$00
.done .done
!byte $8D !text "Press any key "
!text "Press any key to continue "
!scrxor $40, " ",$00 !scrxor $40, " ",$00
.noslot6 .noslot6
!text "Passport requires a Disk II drive in S6.",$8D !text "Passport requires a Disk II drive in S6.",$8D
@ -245,28 +244,28 @@ StringTable
; MLI error $28 ; MLI error $28
; ;
.writenodev .writenodev
!text "S%S,D%D does not exist.",$8D,$00 !text "S%S,D%D does not exist.",$8D,$8D,$00
; ;
; MLI error $2B ; MLI error $2B
; ;
.writeprot .writeprot
!text "The disk in S%S,D%D is write-protected.",$8D,$00 !text "The disk in S%S,D%D is write-protected.",$8D,$8D,$00
; ;
; other MLI error ; other MLI error
; ;
.othermli .othermli
!text "MLI error $%0.",$8D !text "MLI error $%0.",$8D
!text "Please contact the developer.",$8D,$00 !text "Please contact the developer.",$8D,$8D,$00
.canttrace .canttrace
!text "Unrecognized drive, tracing is disabled",$8D,$00 !text "Unrecognized drive, tracing is disabled",$8D,$00
.canceled .canceled
!text "Canceled at your request.",$8D,$00 !text "Canceled at your request. ",$00
.bademu .bademu
!byte 00 !byte 00
.reset .reset
!byte $8D !byte $8D
!text "Press <Ctrl-Reset> to continue.",$8D,$00 !text "Press <Ctrl-Reset> to resume.",$8D,$00
.modify .modify
!text "T%t,S%0,$%1: ",$00 !text "T%t,S%0,$%1: ",$00
.modifyto .modifyto