diff --git a/.gitignore b/.gitignore index ad4d26c3f..9112484b8 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,6 @@ /testwrk/ /wrk/ /cc65.zip +/util/atari/*.exe +/util/gamate/*.exe + diff --git a/include/gamate.h b/include/gamate.h index 8b9790e39..bc6de3f98 100644 --- a/include/gamate.h +++ b/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 diff --git a/libsrc/gamate/cputc.s b/libsrc/gamate/cputc.s index 435bebfad..d80e8b41a 100644 --- a/libsrc/gamate/cputc.s +++ b/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,11 +127,11 @@ putchar: lda _plotlo,x sta LCD_Y + ldy #$F8 + lda CHARCOLOR and #2 beq @delete2 - - ldy #$F8 @copylp2: lda (ptr3),y @@ -142,9 +144,10 @@ putchar: @delete2: lda #$00 +@del2: sta LCD_DATA iny - bne @delete2 + bne @del2 @skip_delete2: pla