Add definitions in telestrat.inc (TELEMON 2.4)

[cc65] / libsrc / c64 / soft80_cgetc.s

diff --git a/libsrc/c64/soft80_cgetc.s b/libsrc/c64/soft80_cgetc.s
index 849af753a5e9bb82e2d72764495dc9ec65724f36..ae0e2385718e33462943af4dd40c13b57caa81bb 100644 (file)
--- a/libsrc/c64/soft80_cgetc.s
+++ b/libsrc/c64/soft80_cgetc.s
@@ -1,11 +1,13 @@
 ;
 ; Groepaz/Hitmen, 11.10.2015
 ;
+; high level implementation for the soft80 implementation
+;
 ; char cgetc (void);
 ;
 
         .export         soft80_cgetc
-        .import         soft80_internal_cursorxlsb
+        .import         soft80_internal_cellcolor, soft80_internal_cursorxlsb
         .import         cursor
         .importzp       tmp1
 
@@ -14,18 +16,18 @@
 
 soft80_cgetc:
         lda     KEY_COUNT       ; Get number of characters
-        bne     L3              ; Jump if there are already chars waiting
+        bne     @L3             ; Jump if there are already chars waiting
 
         sec
         jsr     invertcursor    ; set cursor on or off accordingly
 
-L1:     lda     KEY_COUNT       ; wait for key
-        beq     L1
+@L1:    lda     KEY_COUNT       ; wait for key
+        beq     @L1
 
         clc
         jsr     invertcursor    ; set cursor on or off accordingly
 
-L3:     jsr     KBDREAD         ; Read char and return in A
+@L3:    jsr     KBDREAD         ; Read char and return in A
         ldx     #0
         rts
 
@@ -74,7 +76,7 @@ setcolor:
         ; save old value
         lda     (CRAM_PTR),y    ; vram
         sta     tmp1
-        lda     CHARCOLOR
+        lda     soft80_internal_cellcolor
         sta     (CRAM_PTR),y    ; vram
         rts