From 7f1cbc6070cb24a713534a7d363bf3669792534c Mon Sep 17 00:00:00 2001 From: Bobbi Webber-Manners Date: Fri, 24 Sep 2021 15:51:31 -0400 Subject: [PATCH] Only scroll HGR screen in MODE 2. --- applecorn.po | Bin 819200 -> 819200 bytes auxmem.vdu.s | 19 +++++++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/applecorn.po b/applecorn.po index 0d5a1a781edf64e7ad6863d463267ac3693fbd56..7c21ee2c111120e4d4c17fb35da3948c3eeeafe8 100644 GIT binary patch delta 6097 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 A<^TWy delta 2779 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 diff --git a/auxmem.vdu.s b/auxmem.vdu.s index e987799..78cd86e 100644 --- a/auxmem.vdu.s +++ b/auxmem.vdu.s @@ -99,11 +99,11 @@ VDUWORKSZ EQU VDUVAREND-VDUWORKSP+1 * * Screen definitions -* 3 6 7 +* 0 1 2 3 4 5 6 7 SCNTXTMAXX DB 79,39,19,79,39,19,39,39 ; Max text column SCNTXTMAXY DB 23,23,23,23,23,23,23,23 ; Max text row -SCNBYTES DB 1,1,8 -SCNCOLOURS DB 1,1,8 +SCNBYTES DB 1,1,8,1,1,1,1,1 +SCNCOLOURS DB 1,1,8,1,1,1,1,1 SCNTYPE DB 1,0,128,1 * b7=FastDraw * b6=Teletext @@ -526,7 +526,7 @@ VDUINIT STA VDUQ+8 * MODE 3 - 80x24 text * MODE 6 - 40x24 text * MODE 7 - 40x24 with $80-$9F converted to spaces -* MODE 2 - 280x192 HGR graphics +* MODE 2 - 280x192 HGR graphics, 40 cols bitmap text * MODE 0 defaults to MODE 3 * All others default to MODE 6 * @@ -552,7 +552,7 @@ VDU22 LDA VDUQ+8 BMI VDU22G ; b7=1, graphics mode * TEMP CPX #2 - BEQ VDU22G ; Jump out for MODE 2 + BEQ VDU22G ; Jump out for MODE 1 * TEMP * AND #$01 ; 40col/80col bit @@ -631,12 +631,15 @@ CLREOL LDA VDUTEXTY ; ROW * Scroll whole screen one line SCROLLER LDA #$00 :L1 PHA - JSR SCR1LINE + JSR SCR1LINE ; Scroll text screen 1 line PLA + LDY VDUBYTES + DEY ; If VDUBYTE=1, text mode + BEQ :TEXTONLY ; Text mode, skip HGR scroll PHA - JSR HSCR1LINE ;;;; TODO ONLY DO THIS FOR MODE 2!! + JSR HSCR1LINE ; Scroll HGR screen 1 text line PLA - INC +:TEXTONLY INC CMP #23 BNE :L1 BIT VDUSTATUS