Merge pull request #1717 from Fabrizio-Caruso/GamateConioFix

Fix color 1 and 2 (grey/green levels)

.gitignore

@@ -7,3 +7,6 @@
 /testwrk/
 /wrk/
 /cc65.zip
+/util/atari/*.exe
+/util/gamate/*.exe
+

include/gamate.h

@@ -145,6 +145,8 @@
 
 /* constants for the conio implementation */
 #define COLOR_BLACK     0x03
+#define COLOR_GRAY2     0x02
+#define COLOR_GRAY1     0x01
 #define COLOR_WHITE     0x00
 
 #define CH_HLINE        1

libsrc/gamate/cputc.s

@@ -94,11 +94,12 @@ putchar:
         adc     CURS_X
         sta     LCD_X
 
-        lda     CHARCOLOR
-        and     #1
-        beq     @delete1
-
         ldy     #$F8
+
+        lda     CHARCOLOR
+        lsr     
+        bcc     @delete1
+
 @copylp1:
         lda     (ptr3),y
         eor     RVS
@@ -110,9 +111,10 @@ putchar:
 
 @delete1:
         lda   #$00
+@del1:
         sta   LCD_DATA
         iny
-        bne @delete1
+        bne @del1
 
 @skip_delete1:
 
@@ -125,12 +127,12 @@ putchar:
         lda     _plotlo,x
         sta     LCD_Y
         
+        ldy     #$F8        
+        
         lda     CHARCOLOR
         and     #2
         beq     @delete2
 
-        ldy     #$F8
-
 @copylp2:
         lda     (ptr3),y
         eor     RVS
@@ -142,9 +144,10 @@ putchar:
         
 @delete2:
         lda   #$00
+@del2:
         sta   LCD_DATA
         iny
-        bne @delete2
+        bne @del2
 
 @skip_delete2:
         pla