diff --git a/libsrc/c64/soft80_cpeekc.s b/libsrc/c64/soft80_cpeekc.s index 2801ade97..63ad635e7 100644 --- a/libsrc/c64/soft80_cpeekc.s +++ b/libsrc/c64/soft80_cpeekc.s @@ -1,3 +1,8 @@ +; +; 2017-12-28, Groepaz +; +; char cpeekc (void); +; .export soft80_cpeekc, soft80_cpeekchar @@ -16,8 +21,6 @@ soft80_cpeekc: soft80_cpeekchar: sei - ;;dec $01 ;; assumed = $36 - ;;dec $01 ;; assumed = $36 lda #$34 sta $01 @@ -32,105 +35,77 @@ soft80_cpeekchar: @l2aa: ldy #0 -;; stx $d020 - .repeat 8,line -;; jsr readdirect lda (SCREEN_PTR),y and #$f0 -; sta $e100,y cmp soft80_hi_charset+(line*$80),x -; cmp #0 bne @l2b .if (line < 7) iny .endif .endrepeat - @backok: -;inc $d020 -; inc $01 -; inc $01 lda #$36 sta $01 cli txa ; return char in A - ; sec -; sbc #$20 ldx #$00 ; revers flag -;inc $d020 rts @l2b: -;jmp * inx cpx #$80 jne @l2aa ; test inverted character (left side) - + ldx #0 @l2aa2: ldy #0 -;; stx $d020 - .repeat 8,line -;; jsr readdirect lda (SCREEN_PTR),y and #$f0 eor #$f0 cmp soft80_hi_charset+(line*$80),x -; cmp #0 bne @l2b2 .if (line < 7) iny .endif .endrepeat - + @backokrevers: -;inc $d020 -; inc $01 -; inc $01 lda #$36 sta $01 cli txa ; return char in A - ; sec -; sbc #$20 ldx #$01 ; revers flag -;inc $d020 rts - + @l2b2: inx cpx #$80 jne @l2aa2 - + @backerr: -;inc $d020 - ;; inc $01 -;; inc $01 lda #$36 sta $01 cli ldx #0 txa - rts ; test non-inverted character (right side) - + @l1a: ldx #0 @l1aa: ldy #0 .repeat 8,line -;; jsr readdirect lda (SCREEN_PTR),y and #$0f eor soft80_lo_charset+(line*$80),x - bne @l2bb + bne @l2bb .if line < 7 iny .endif @@ -140,19 +115,18 @@ soft80_cpeekchar: inx cpx #$80 bne @l1aa - + ; test inverted character (right side) - + ldx #0 @l1aa2: ldy #0 .repeat 8,line -;; jsr readdirect lda (SCREEN_PTR),y and #$0f eor #$0f eor soft80_lo_charset+(line*$80),x - bne @l2bb2 + bne @l2bb2 .if line < 7 iny .endif @@ -162,7 +136,6 @@ soft80_cpeekchar: inx cpx #$80 bne @l1aa2 - - + jmp @backerr diff --git a/libsrc/c64/soft80_cpeekrevers.s b/libsrc/c64/soft80_cpeekrevers.s index 6fc0c166a..779636ed5 100644 --- a/libsrc/c64/soft80_cpeekrevers.s +++ b/libsrc/c64/soft80_cpeekrevers.s @@ -1,3 +1,8 @@ +; +; 2017-12-28, Groepaz +; +; unsigned char cpeekrevers (void); +; .import soft80_cpeekchar