remove chline/cvline dupes

diff --git a/libsrc/c64/extra/soft80.s b/libsrc/c64/extra/soft80.s
index 5490a379008bbfd3e2c817af8859e2562112bddc..9efb8d57723a40c5e180e72f41df1dae8a313c56 100644 (file)
--- a/libsrc/c64/extra/soft80.s
+++ b/libsrc/c64/extra/soft80.s
@@ -9,12 +9,6 @@
         .import soft80_cgetc
         .export _cgetc := soft80_cgetc
 
-        ; soft80_chline.s
-        .import soft80_chlinexy
-        .import soft80_chline
-        .export _chlinexy := soft80_chlinexy
-        .export _chline := soft80_chline
-
         ; soft80_color.s
         .import soft80_textcolor
         .import soft80_bgcolor
@@ -39,12 +33,6 @@
         .export newline := soft80_newline
         .export plot := soft80_plot
 
-        ; soft80_cvline.s
-        .import soft80_cvlinexy
-        .import soft80_cvline
-        .export _cvlinexy := soft80_cvlinexy
-        .export _cvline := soft80_cvline
-
         ; soft80_kclrscr.s
         .import soft80_kclrscr
         .export _clrscr := soft80_kclrscr
@@ -58,5 +46,10 @@
         .import soft80_screensize
         .export screensize := soft80_screensize
 
-        .export mcb_spritememory  := soft80_spriteblock
-        .export mcb_spritepointer := (soft80_vram + $03F8)
+        ; VIC sprite data for the mouse pointer
+        .export         mcb_spritememory  := soft80_spriteblock
+        .export         mcb_spritepointer := (soft80_vram + $03F8)
+
+        ; Chars used by chline () and cvline ()
+        .exportzp       chlinechar = CH_HLINE
+        .exportzp       cvlinechar = CH_VLINE

diff --git a/libsrc/c64/soft80_chline.s b/libsrc/c64/soft80_chline.s
deleted file mode 100644 (file)
index 73c8c1e..0000000
--- a/libsrc/c64/soft80_chline.s
+++ /dev/null
@@ -1,33 +0,0 @@
-;
-; Groepaz/Hitmen, 12.10.2015
-;
-; void chlinexy (unsigned char x, unsigned char y, unsigned char length);
-; void chline (unsigned char length);
-;
-
-        .export         soft80_chlinexy, soft80_chline
-        .import         popa, _gotoxy, soft80_cputdirect
-        .importzp       tmp1
-
-        .include        "c64.inc"
-        .include        "soft80.inc"
-
-soft80_chlinexy:
-        pha                             ; Save the length
-        jsr     popa                    ; Get y
-        jsr     _gotoxy                 ; Call this one, will pop params
-        pla                             ; Restore the length
-
-soft80_chline:
-        cmp     #0                      ; Is the length zero?
-        beq     L9                      ; Jump if done
-        sta     tmp1
-L1:     lda     #CH_HLINE               ; Horizontal line, petscii code
-        jsr     soft80_cputdirect       ; Direct output
-        dec     tmp1
-        bne     L1
-L9:     rts
-
-
-
-

diff --git a/libsrc/c64/soft80_cvline.s b/libsrc/c64/soft80_cvline.s
deleted file mode 100644 (file)
index e2c6e94..0000000
--- a/libsrc/c64/soft80_cvline.s
+++ /dev/null
@@ -1,33 +0,0 @@
-;
-; Groepaz/Hitmen, 12.10.2015
-;
-; void cvlinexy (unsigned char x, unsigned char y, unsigned char length);
-; void cvline (unsigned char length);
-;
-
-        .export         soft80_cvline, soft80_cvlinexy
-        .import         popa, _gotoxy, soft80_putchar, soft80_newline
-        .importzp       tmp1
-
-        .include        "c64.inc"
-        .include        "soft80.inc"
-
-soft80_cvlinexy:
-        pha                     ; Save the length
-        jsr     popa            ; Get y
-        jsr     _gotoxy         ; Call this one, will pop params
-        pla                     ; Restore the length and run into soft80_cvlinexy
-
-soft80_cvline:
-        cmp     #0              ; Is the length zero?
-        beq     L9              ; Jump if done
-        sta     tmp1
-L1:     lda     #CH_VLINE       ; Vertical bar, petscii code
-        jsr     soft80_putchar  ; Write, no cursor advance
-        jsr     soft80_newline  ; Advance cursor to next line
-        dec     tmp1
-        bne     L1
-L9:     rts
-
-
-