Merge pull request #1716 from Fabrizio-Caruso/GamateConioFix

[Tentative: please review] Fix Gamate CONIO: non-solid characters bug
This commit is contained in:
Bob Andrews 2022-04-02 15:15:53 +02:00 committed by GitHub
commit d5cb3661f3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -89,16 +89,16 @@ putchar:
adc #>(fontdata-$f8) adc #>(fontdata-$f8)
sta ptr3+1 sta ptr3+1
lda CHARCOLOR
and #1
beq @skip_plane1
lda #LCD_XPOS_PLANE1 lda #LCD_XPOS_PLANE1
clc clc
adc CURS_X adc CURS_X
sta LCD_X sta LCD_X
ldy #$f8 lda CHARCOLOR
and #1
beq @delete1
ldy #$F8
@copylp1: @copylp1:
lda (ptr3),y lda (ptr3),y
eor RVS eor RVS
@ -106,11 +106,15 @@ putchar:
iny iny
bne @copylp1 bne @copylp1
@skip_plane1: beq @skip_delete1
lda CHARCOLOR @delete1:
and #2 lda #$00
beq @skip_plane2 sta LCD_DATA
iny
bne @delete1
@skip_delete1:
lda #LCD_XPOS_PLANE2 lda #LCD_XPOS_PLANE2
clc clc
@ -121,7 +125,12 @@ putchar:
lda _plotlo,x lda _plotlo,x
sta LCD_Y sta LCD_Y
ldy #$f8 lda CHARCOLOR
and #2
beq @delete2
ldy #$F8
@copylp2: @copylp2:
lda (ptr3),y lda (ptr3),y
eor RVS eor RVS
@ -129,7 +138,15 @@ putchar:
iny iny
bne @copylp2 bne @copylp2
@skip_plane2: beq @skip_delete2
@delete2:
lda #$00
sta LCD_DATA
iny
bne @delete2
@skip_delete2:
pla pla
tax tax
ldy CURS_X ldy CURS_X