Apple-2-SW
/
Applecorn
mirror of https://github.com/bobbimanners/Applecorn.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed VDU19 bug. Ensure parms are within range.

This commit is contained in:
Bobbi Webber-Manners 2022-12-27 23:41:31 -05:00
parent 72c5863958
commit 06d1c6b4d3
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
applecorn.po
View File

Binary file not shown.

21
auxmem.shr.s
View File

@ -700,9 +700,15 @@ SHRDEFPAL LDY #00 ; Palette offset for 320 mode
* Assign a 'physical' colour from the 16 colour palette to a
* 'logical' colour for the current mode
* On entry: X=logical colour, Y=physical colour
SHRPALCHANGE LDA VDUPIXELS ; Pixels per byte
SHRPALCHANGE TYA
AND #%00011110 ; Has already been shifted
TAY
LDA VDUPIXELS ; Pixels per byte
CMP #$02 ; 2 is 320-mode (MODE 1)
BEQ :MODE320
TXA
AND #%00000110 ; Has already been shifted
TAX
LDA PALETTE320,Y ; Byte 1 of physical colour
STAL $E19E00,X ; Store in logical slot (4 copies)
STAL $E19E00+8,X
@ -714,7 +720,10 @@ SHRPALCHANGE LDA VDUPIXELS ; Pixels per byte
STAL $E19E00+17,X
STAL $E19E00+25,X
RTS
:MODE320 LDA PALETTE320,Y ; Byte 1 of physical colour
:MODE320 TXA
AND #%00011110 ; Has already been shifted
TAX
LDA PALETTE320,Y ; Byte 1 of physical colour
STAL $E19E00,X ; Store in logical slot
LDA PALETTE320+1,Y ; Byte 2 of physical colour
STAL $E19E00+1,X ; Store in logical slot
@ -727,6 +736,9 @@ SHRPALCUSTOM PHA ; Preserve GB components
LDA VDUPIXELS ; Pixels per byte
CMP #$02 ; 2 is 320-mode (MODE 1)
BEQ :MODE320
TXA
AND #%00000110 ; Has already been shifted
TAX
PLA ; Recover GB components
STAL $E19E00,X ; Store in logical slot (4 copies)
STAL $E19E00+8,X
@ -738,7 +750,10 @@ SHRPALCUSTOM PHA ; Preserve GB components
STAL $E19E00+17,X
STAL $E19E00+25,X
RTS
:MODE320 PLA ; Recover GB components
:MODE320 TXA
AND #%00011110 ; Has already been shifted
TAX
PLA ; Recover GB components
STAL $E19E00,X ; Store in logical slot
TYA ; R component
STAL $E19E00+1,X ; Store in logical slot

1
auxmem.vdu.s
View File

@ -963,6 +963,7 @@ VDU19 LDA VDUQ+5 ; Second parm
TAY ; Phys colour in X
* TODO: Only call this if GS ...
JSR SHRPALCHANGE
RTS
:RGB LDA VDUQ+6 ; 3rd parm (red)
AND #$0F
TAY ; Red in Y