From 5912bd118fedab048b9017eb809c75564add02ef Mon Sep 17 00:00:00 2001 From: Bobbi Webber-Manners Date: Wed, 11 Jan 2023 00:47:10 -0500 Subject: [PATCH] Fix VDU05 to use updated x-coord system --- applecorn.po | Bin 819200 -> 819200 bytes mainmem.shr.s | 15 +++++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/applecorn.po b/applecorn.po index 984bbd7be6ff598fafc24d68429467725bfef0e6..5706cfaa456d162307b5486ffc47153864730326 100644 GIT binary patch delta 5332 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 delta 5394 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 QJK-NRTvN2o+yuw}1J`CW`v3p{ diff --git a/mainmem.shr.s b/mainmem.shr.s index 406ddc2..d806d48 100644 --- a/mainmem.shr.s +++ b/mainmem.shr.s @@ -236,7 +236,7 @@ SHRVDU5CH >>> ENTMAIN CMP #$02 ; 2 is 320-mode (MODE 1) BNE :MODE0 LDA #$04 ; 4 bytes per row in MODE 1 - LDX #16 ; 16 pixels per char in MODE 1 + LDX #08 ; 8 pixels per char in MODE 1 ASL A1L ; A*32 -> A1L/H in MODE 1 BRA :S0 :MODE0 LDA #$02 ; 2 bytes per row in MODE 0 @@ -284,10 +284,13 @@ SHRVDU5CH >>> ENTMAIN LDX SHRXPIXEL ; Screen col (X-coord) STX A2L - LSR A2L ; Divide by 4 - LSR A2L + LSR A2L ; Divide by 2 - LDX A1L ; Index into exploded font + LDX SHRPIXELS + CPX #$02 + BEQ :M1 ; MODE 1 + LSR A2L ; Divide by 2 again +:M1 LDX A1L ; Index into exploded font STZ :ROWCTR :L0 LDY A2L ; Index into row of pixels STZ :COLCTR @@ -351,7 +354,7 @@ SHRVDU08 >>> ENTMAIN AND #$00FF CMP #$02 ; 2 is 320-mode (MODE 1) BNE :MODE0 - LDX #16 ; 16 pixels per char in MODE 1 + LDX #8 ; 8 pixels per char in MODE 1 BRA :S0 :MODE0 LDX #8 ; 8 pixels per char in MODE 0 :S0 STX :PIXELS @@ -397,7 +400,7 @@ SHRVDU09 >>> ENTMAIN AND #$00FF CMP #$02 ; 2 is 320-mode (MODE 1) BNE :MODE0 - LDX #16 ; 16 pixels per char in MODE 1 + LDX #8 ; 8 pixels per char in MODE 1 BRA :S0 :MODE0 LDX #8 ; 8 pixels per char in MODE 0 :S0 STX :PIXELS