empathicqubit/cc65
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix some style issues

Browse source
This commit is contained in:
mrdudz 2015-10-12 15:54:08 +02:00
parent 21732e3c5b
commit a2b514a7cf
3 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
libsrc/c64/soft80_color.s
View file

@ -14,18 +14,18 @@
.include "soft80.inc" .include "soft80.inc"
soft80_textcolor: soft80_textcolor:
ldx soft80_internal_textcolor ; get old value ldx soft80_internal_textcolor ; get old value
sta soft80_internal_textcolor ; set new value sta soft80_internal_textcolor ; set new value
jsr mkcharcolor jsr mkcharcolor
txa ; get old value txa ; get old value
rts rts
soft80_bgcolor: soft80_bgcolor:
ldx soft80_internal_bgcolor ; get old value ldx soft80_internal_bgcolor ; get old value
stx tmp2 ; save old value stx tmp2 ; save old value
sta soft80_internal_bgcolor ; set new value sta soft80_internal_bgcolor ; set new value
jsr mkcharcolor jsr mkcharcolor
@ -40,9 +40,9 @@ lp1:
.scope .scope
lda soft80_colram+(page*250),x lda soft80_colram+(page*250),x
and #$0f and #$0f
cmp tmp2 ; old bg color cmp tmp2 ; old bg color
bne @sk1 bne @sk1
lda soft80_internal_bgcolor ; new bg color lda soft80_internal_bgcolor ; new bg color
sta soft80_colram+(page*250),x sta soft80_colram+(page*250),x
@sk1: @sk1:
.endscope .endscope
@ -54,7 +54,7 @@ lp1:
sei sei
ldy $01 ldy $01
lda #$34 ; disable I/O lda #$34 ; disable I/O
sta $01 sta $01
; if the old bg color is equal to text color in this cell, then also ; if the old bg color is equal to text color in this cell, then also
@ -66,11 +66,11 @@ lp2:
.scope .scope
lda soft80_vram+(page*250),x lda soft80_vram+(page*250),x
and #$0f and #$0f
cmp tmp2 ; old bg color cmp tmp2 ; old bg color
bne @sk2 bne @sk2
lda soft80_internal_bgcolor ; new bg color lda soft80_internal_bgcolor ; new bg color
@sk2: @sk2:
ora tmp1 ; new bg color (high nibble) ora tmp1 ; new bg color (high nibble)
sta soft80_vram+(page*250),x sta soft80_vram+(page*250),x
.endscope .endscope
.endrepeat .endrepeat
@ -78,10 +78,10 @@ lp2:
inx inx
bne lp2 bne lp2
sty $01 ; enable I/O sty $01 ; enable I/O
cli cli
lda tmp2 ; get old value lda tmp2 ; get old value
rts rts
mkcharcolor: mkcharcolor:
@ -90,9 +90,9 @@ mkcharcolor:
asl a asl a
asl a asl a
asl a asl a
sta tmp1 ; remember new bg color (high nibble) sta tmp1 ; remember new bg color (high nibble)
ora soft80_internal_textcolor ora soft80_internal_textcolor
sta CHARCOLOR ; text/bg combo for new chars sta CHARCOLOR ; text/bg combo for new chars
rts rts
;------------------------------------------------------------------------------- ;-------------------------------------------------------------------------------

4
libsrc/c64/soft80_conio.s
View file

@ -70,11 +70,11 @@ soft80_init:
sta $01 sta $01
cli cli
lda 646 ; use current textcolor lda 646 ; use current textcolor
and #$0f and #$0f
sta soft80_internal_textcolor sta soft80_internal_textcolor
lda VIC_BG_COLOR0 ; use current bgcolor lda VIC_BG_COLOR0 ; use current bgcolor
and #$0f and #$0f
sta soft80_internal_bgcolor sta soft80_internal_bgcolor
asl a asl a

6
libsrc/c64/soft80_kclrscr.s
View file

@ -40,18 +40,18 @@ soft80_kclrscr:
.if SOFT80COLORVOODOO = 1 .if SOFT80COLORVOODOO = 1
lda soft80_internal_bgcolor lda soft80_internal_bgcolor
jsr clear ; clear color ram jsr clear ; clear color ram
.endif .endif
sei sei
ldy $01 ldy $01
lda #$34 ; enable RAM under I/O lda #$34 ; enable RAM under I/O
sta $01 sta $01
lda CHARCOLOR lda CHARCOLOR
and #$f0 and #$f0
ora soft80_internal_bgcolor ora soft80_internal_bgcolor
jsr clear ; clear vram jsr clear ; clear vram
sty $01 sty $01
cli cli