From e9f0b7943eed63fc533c24976abd7e9ecc66be44 Mon Sep 17 00:00:00 2001
From: mrdudz <mrdudz@users.noreply.github.com>
Date: Mon, 12 Oct 2015 19:57:33 +0200
Subject: [PATCH] some renaming, preparing plot table names

---
 libsrc/c64/soft80_cputc.s | 21 ++++++++-------------
 libsrc/c64/soft80_kplot.s | 29 ++++++++++++++---------------
 2 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/libsrc/c64/soft80_cputc.s b/libsrc/c64/soft80_cputc.s
index c7ba6e096..0e8cb0bd8 100644
--- a/libsrc/c64/soft80_cputc.s
+++ b/libsrc/c64/soft80_cputc.s
@@ -72,7 +72,7 @@ soft80_cputdirect:
         ; Advance cursor position
         iny                     ; contains CURS_X
         cpy     #charsperline
-        beq     L3
+        beq     @L3
 
         sty     CURS_X
         tya
@@ -92,7 +92,7 @@ soft80_cputdirect:
         inc     CRAM_PTR+1
 @L5:
         rts
-L3:
+@L3:
         inc     CURS_Y          ; new line
         ldy     #0              ; + cr
         sty     CURS_X
@@ -114,9 +114,9 @@ soft80_newline:
         clc
         adc     #40
         sta     CRAM_PTR
-        bcc     L5
+        bcc     @L5
         inc     CRAM_PTR+1
-L5:
+@L5:
         inc     CURS_Y
         rts
 
@@ -336,7 +336,8 @@ draw_charinvers:
 ;
 ; in:  x must be $34
 ;      y must be $00
-; out: y = $00
+; out: x = $34
+;      y = $00
 remcolor:
 
         ;ldy     #$00            ; is still $00
@@ -357,23 +358,17 @@ remcolor:
         and     #$0f
         cmp     soft80_internal_bgcolor
         beq     @sk2            ; yes, colram==bgcolor
+        sta     tmp3            ; A contains colram
 
         ; two characters in the current cell, of which one will get removed
 
-        ; vram = colram
-        ;inc     $01
-        ;lda     (CRAM_PTR),y    ; colram
-        ;stx     $01             ;$34
-        ;and     #$0f
-        sta     tmp3            ; A contains colram
-
         lda     soft80_internal_cursorxlsb
         bne     @sk3
 
         ; vram = colram
         lda     (CRAM_PTR),y    ; vram
         and     #$f0
-        ora     tmp3
+        ora     tmp3            ; colram value
         sta     (CRAM_PTR),y    ; vram
 @sk3:
         ; colram = bgcolor
diff --git a/libsrc/c64/soft80_kplot.s b/libsrc/c64/soft80_kplot.s
index 8d8c77c5c..79a14cbcb 100644
--- a/libsrc/c64/soft80_kplot.s
+++ b/libsrc/c64/soft80_kplot.s
@@ -18,12 +18,12 @@ soft80_kplot:
         sty     CURS_X
 
         ; calc pointer to bitmap
-        lda     _bitmaplo,x
+        lda     soft80_bitmapylo,x
         clc
-        adc     _bitmapxlo,y
+        adc     soft80_bitmapxlo,y
         sta     SCREEN_PTR
-        lda     _bitmaphi,x
-        adc     _bitmapxhi,y
+        lda     soft80_bitmapyhi,x
+        adc     soft80_bitmapxhi,y
         sta     SCREEN_PTR+1
 
         tya
@@ -32,13 +32,13 @@ soft80_kplot:
 
         ; calc pointer to vram
         tya
-        lsr     a               ; NOTE: we can save 2 cycles here at the expense of
-                                ;       making the tables twice as big (+50 bytes)
+        lsr     a
+
         clc
-        adc     _vramlo,x
+        adc     soft80_vramlo,x
         sta     CRAM_PTR
         lda     #0
-        adc     _vramhi,x
+        adc     soft80_vramhi,x
         sta     CRAM_PTR+1
 
 @getpos:
@@ -50,28 +50,27 @@ soft80_kplot:
         ;        to 0xdc00... area in ram under i/o
 
         .rodata
-_bitmapxlo:
+soft80_bitmapxlo:
         .repeat 80,col
         .byte <((col/2)*8)
         .endrepeat
-
-_bitmapxhi:
+soft80_bitmapxhi:
         .repeat 80,col
         .byte >((col/2)*8)
         .endrepeat
-_vramlo:
+soft80_vramlo:
         .repeat 25,row
         .byte <(soft80_vram+(row*40))
         .endrepeat
-_vramhi:
+soft80_vramhi:
         .repeat 25,row
         .byte >(soft80_vram+(row*40))
         .endrepeat
-_bitmaplo:
+soft80_bitmapylo:
         .repeat 25,row
         .byte <(soft80_bitmap+(row*40*8))
         .endrepeat
-_bitmaphi:
+soft80_bitmapyhi:
         .repeat 25,row
         .byte >(soft80_bitmap+(row*40*8))
         .endrepeat
-- 
2.39.5