Renamed randomize to _randomize

[cc65] / libsrc / cbm610 / cputc.s

diff --git a/libsrc/cbm610/cputc.s b/libsrc/cbm610/cputc.s
index 2a2a6fac6d7731dcd09544e3bd398ac0a709ed5d..aa94b8aa42e32867946d10553b7a83c9fdb88215 100644 (file)
--- a/libsrc/cbm610/cputc.s
+++ b/libsrc/cbm610/cputc.s
@@ -6,14 +6,13 @@
 ;
 
        .export         _cputcxy, _cputc, cputdirect, putchar
-       .export         advance, newline, plot
+       .export         newline, plot
        .exportzp       CURS_X, CURS_Y
        .import         _gotoxy
        .import         popa
        .import         xsize, revers
 
        .include        "cbm610.inc"
-       .include        "zeropage.inc"
        .include        "../cbm/cbm.inc"
 
 _cputcxy:
@@ -31,33 +30,34 @@ _cputc: cmp         #$0A            ; CR?
                beq     plot            ; Recalculate pointers
 
 L1:    cmp     #$0D            ; LF?
-               bne     L2
-       ldy     CURS_Y
-       iny
-       bne     newline         ; Recalculate pointers
+               beq     newline         ; Recalculate pointers
 
 ; Printable char of some sort
 
-L2:            cmp     #' '
+       cmp     #' '
        bcc     cputdirect      ; Other control char
        tay
        bmi     L10
        cmp     #$60
-       bcc     L3
+       bcc     L2
        and     #$DF
        bne     cputdirect      ; Branch always
-L3:    and     #$3F
+L2:    and     #$3F
 
 cputdirect:
-       jsr     putchar         ; Write the character to the screen
+       jsr     putchar         ; Write the character to the screen
 
 ; Advance cursor position
 
 advance:
-       iny
-       cpy     xsize
-       bne     L9
-       ldy     #0              ; new line
+        iny
+        cpy     xsize
+        bne     L3
+        jsr     newline         ; new line
+        ldy     #0              ; + cr
+L3:     sty     CURS_X
+        rts
+
 newline:
        clc
        lda     xsize
@@ -66,7 +66,6 @@ newline:
        bcc     L4
        inc     CharPtr+1
 L4:    inc     CURS_Y
-L9:            sty     CURS_X
        rts
 
 ; Handle character if high bit set