From 5780da59fe18910aab46c8b346f69378ce47b3f2 Mon Sep 17 00:00:00 2001 From: Bobbi Webber-Manners Date: Fri, 30 Dec 2022 00:31:28 -0500 Subject: [PATCH] Minor cleanup of text colour setting code. --- applecorn.po | Bin 819200 -> 819200 bytes auxmem.shr.s | 5 +---- auxmem.vdu.s | 17 +++++++++++------ 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/applecorn.po b/applecorn.po index 0c4bda7dc55000eec8025c3145dd49e5469b4de0..6bd2c83e7af72b44037537a1f9172c5a44c6b9c7 100644 GIT binary patch delta 11479 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 diff --git a/auxmem.shr.s b/auxmem.shr.s index 5780f8d..6908e1f 100644 --- a/auxmem.shr.s +++ b/auxmem.shr.s @@ -556,10 +556,7 @@ SHRCLEAR PHP ; Disable interrupts * Set text colour * A=txt colour -SHRSETTCOL BIT VDUBANK ; Check it is a GS .. - BMI :GS ; .. easier to check here - RTS -:GS PHA +SHRSETTCOL PHA LDX VDUPIXELS ; Pixels per byte CPX #$02 ; 2 is 320-mode (MODE 1) BNE :MODE0 diff --git a/auxmem.vdu.s b/auxmem.vdu.s index bd97215..ad0311c 100644 --- a/auxmem.vdu.s +++ b/auxmem.vdu.s @@ -921,8 +921,7 @@ VDU20LP STA TXTFGD,X ; Clear all colours DEX ; and gcol actions BPL VDU20LP LDA #$80 - JSR HGRSETTCOL ; Set txt background - JSR SHRSETTCOL ; Set txt background + JSR SETTCOL ; Set txt background LDX #$00 LDA #$80 JSR HGRSETGCOL ; Set gfx background @@ -930,8 +929,7 @@ VDU20LP STA TXTFGD,X ; Clear all colours AND #$07 PHA STA TXTFGD ; Note txt foreground - JSR HGRSETTCOL ; Set txt foreground - JSR SHRSETTCOL ; Set txt background + JSR SETTCOL ; Set txt foreground LDX #$00 PLA STA GFXFGD ; Note gfx foreground @@ -941,8 +939,7 @@ VDU20LP STA TXTFGD,X ; Clear all colours VDU17 LDA VDUQ+8 CMP #$C0 BCS VDU17BORDER - JSR HGRSETTCOL - JMP SHRSETTCOL + JMP SETTCOL VDU17BORDER AND #$0F STA VDUBORDER TAX @@ -950,6 +947,14 @@ VDU17BORDER AND #$0F STA CLOCKCTL RTS +* Helper function +SETTCOL JSR HGRSETTCOL ; Set txt foreground + BIT VDUBANK + BPL :NOTGS + JSR SHRSETTCOL ; Set txt background +:NOTGS RTS + + * VDU 18 - GCOL k,a - select graphics colour and plot action VDU18 LDY #$02 ; Y=>gfd settings LDA VDUQ+8 ; GCOL colour