From 841d764a83a8d517654ff6a26d3b0eb5ee2dc369 Mon Sep 17 00:00:00 2001 From: mrdudz Date: Mon, 28 Sep 2015 16:10:11 +0200 Subject: [PATCH] some cleanup, checked usage of __bgcolor and __textcolor --- libsrc/c64/soft80_cgetc.s | 2 +- libsrc/c64/soft80_color.s | 3 +-- libsrc/c64/soft80_cputc.s | 2 +- libsrc/c64/soft80_kclrscr.s | 2 +- libsrc/c64/soft80_kplot.s | 3 ++- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libsrc/c64/soft80_cgetc.s b/libsrc/c64/soft80_cgetc.s index 12b2071a2..a8c52c1a2 100644 --- a/libsrc/c64/soft80_cgetc.s +++ b/libsrc/c64/soft80_cgetc.s @@ -3,7 +3,7 @@ ; .export soft80_cgetc - .import cursor ; FIX/CHECK + .import cursor .import soft80_putcolor .include "c64.inc" diff --git a/libsrc/c64/soft80_color.s b/libsrc/c64/soft80_color.s index c176eca7f..8475cc05c 100644 --- a/libsrc/c64/soft80_color.s +++ b/libsrc/c64/soft80_color.s @@ -5,7 +5,7 @@ ; .export soft80_textcolor, soft80_bgcolor, soft80_bordercolor - .export __textcolor,__bgcolor ; CHECK/FIX + .export __textcolor, __bgcolor .importzp tmp1,tmp2 @@ -89,7 +89,6 @@ soft80_bordercolor: txa rts - ; FIXME: shouldnt they be in zeropage? .bss __textcolor: .res 1 diff --git a/libsrc/c64/soft80_cputc.s b/libsrc/c64/soft80_cputc.s index d4c7e3050..590e16740 100644 --- a/libsrc/c64/soft80_cputc.s +++ b/libsrc/c64/soft80_cputc.s @@ -11,7 +11,7 @@ .import popa, _gotoxy .import xsize .import soft80_kplot - .import __bgcolor ; FIX/CHECK + .import __bgcolor .importzp tmp4,tmp3 diff --git a/libsrc/c64/soft80_kclrscr.s b/libsrc/c64/soft80_kclrscr.s index e801c9398..ff1a14a07 100644 --- a/libsrc/c64/soft80_kclrscr.s +++ b/libsrc/c64/soft80_kclrscr.s @@ -1,7 +1,7 @@ .export soft80_kclrscr .import soft80_kplot - .import __bgcolor ; FIX/CHECK + .import __bgcolor .include "c64.inc" .include "soft80.inc" diff --git a/libsrc/c64/soft80_kplot.s b/libsrc/c64/soft80_kplot.s index a813fd679..884404b5f 100644 --- a/libsrc/c64/soft80_kplot.s +++ b/libsrc/c64/soft80_kplot.s @@ -18,7 +18,8 @@ soft80_kplot: ; calc pointer to vram tya - lsr a + lsr a ; NOTE: we can save 2 cycles here at the expense of + ; making the tables twice as big (+50 bytes) clc adc _vramlo,x sta CRAM_PTR -- 2.39.5