Merge pull request #37 from peterferrie/master

make Stickybear compatible again
This commit is contained in:
4am 2017-11-07 21:17:22 -05:00 committed by GitHub
commit 06ebbba4ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 15 deletions

View File

@ -100,9 +100,7 @@
;read T01S0F, remains encoded at $BB00-BC55 ;read T01S0F, remains encoded at $BB00-BC55
ldy #<gRWTSParams jsr ReadSector
lda #>gRWTSParams
jsr $BD00
;re-enable decoding ;re-enable decoding
@ -287,9 +285,7 @@
.domerge .domerge
lda #$21 ; $2100-21FF lda #$21 ; $2100-21FF
sta gAddress+1 sta gAddress+1
ldy #<gRWTSParams jsr ReadSector
lda #>gRWTSParams
jsr $BD00
lda .mergelo+1 lda .mergelo+1
beq ++ beq ++
dec gSector dec gSector
@ -298,9 +294,7 @@
sta gSector sta gSector
dec gTrack dec gTrack
+ inc gAddress+1 + inc gAddress+1
ldy #<gRWTSParams jsr ReadSector
lda #>gRWTSParams
jsr $BD00
dec gAddress+1 dec gAddress+1
ldy #0 ldy #0
@ -321,15 +315,17 @@
bne - bne -
;read other page in block ;read other page in block
;sector $01 pairs with $0F ;sector $01 pairs with $0F on disk, but
;sector $0E pairs with $0F in RAM disk
lda #1 lda #1
sta gTrack sta gTrack
sta gSector ldx gUsingRAMDisk
bne +
lda #$0E
+ sta gSector
dec gAddress+1 ; and $2000-20FF dec gAddress+1 ; and $2000-20FF
ldy #<gRWTSParams jsr ReadSector
lda #>gRWTSParams
jsr $BD00
;write replaced block ;write replaced block
@ -337,9 +333,17 @@
sta mliparam+3 ; hi byte of data buffer sta mliparam+3 ; hi byte of data buffer
dec mliparam+4 ; lo byte of block number dec mliparam+4 ; lo byte of block number
jsr SwapProDOS jsr SwapProDOS
lda gUsingRAMDisk
beq +
lda #$81 ; 'write block' command lda #$81 ; 'write block' command
ldy #$03 ; parameter count ldy #$03 ; parameter count
jsr mli jsr mli
bcs .writeerr
bcc .writedone
+ jsr WriteToRAMFile
.writeerr
.writedone
jsr SwapProDOS jsr SwapProDOS
;restore original disk location ;restore original disk location

View File

@ -234,7 +234,7 @@ StringTable
; can be set directly before calling PrintByID. ; can be set directly before calling PrintByID.
; ;
.header .header
!text "Passport by 4am 2017-10-29",$00 !text "Passport by 4am 2017-11-07",$00
.mainmenu .mainmenu
!text "________________________________________",$8D,$8D,$8D,$8D,$8D,$8D,$8D !text "________________________________________",$8D,$8D,$8D,$8D,$8D,$8D,$8D
!text " " !text " "