From 64d3cfbb18fa5645a835ef64f7b95ef13a855137 Mon Sep 17 00:00:00 2001 From: Bobbi Webber-Manners Date: Mon, 19 Sep 2022 13:26:12 -0400 Subject: [PATCH] Less duplication in gfx reverse scrolling code. --- applecorn.po | Bin 819200 -> 819200 bytes auxmem.gfx.s | 2 -- auxmem.init.s | 2 +- mainmem.gfx.s | 22 ++-------------------- 4 files changed, 3 insertions(+), 23 deletions(-) diff --git a/applecorn.po b/applecorn.po index 45ca1f09cbacafa7fe4023eb605ecc39e4508425..d3f22c4387fb898c54e9421b8e06dc074863de6f 100644 GIT binary patch delta 9022 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 OG}*8wTY}rB-Si*nc6z}8 diff --git a/auxmem.gfx.s b/auxmem.gfx.s index 1f55c08..56a963c 100644 --- a/auxmem.gfx.s +++ b/auxmem.gfx.s @@ -54,8 +54,6 @@ HRSCR1LINE >>> WRTMAIN STX MTXTWINRGT >>> WRTAUX >>> XF2MAIN,HGRRSCR1L -HRSCR1RET >>> ENTAUX - RTS HSCRCLREOL LDA VDUTEXTY ASL diff --git a/auxmem.init.s b/auxmem.init.s index 4df9e74..ff926a1 100644 --- a/auxmem.init.s +++ b/auxmem.init.s @@ -204,7 +204,7 @@ BYTE00 BEQ BYTE00A ; OSBYTE 0,0 - generate error RTS ; %000x1xxx host type, 'A'pple BYTE00A BRK DB $F7 -HELLO ASC 'Applecorn MOS 2022-09-18' +HELLO ASC 'Applecorn MOS 2022-09-19' DB $00 ; Unify MOS messages diff --git a/mainmem.gfx.s b/mainmem.gfx.s index 4645a21..d8e9e39 100644 --- a/mainmem.gfx.s +++ b/mainmem.gfx.s @@ -158,7 +158,7 @@ HGRSCR1L >>> ENTMAIN STA A1L LDA MHGRTAB+1,X STA A1H - LDX #$00 +DOHGRSCR1L LDX #$00 :L1 LDY MTXTWINLFT :L2 LDA (A1L),Y STA (A4L),Y @@ -193,25 +193,7 @@ HGRRSCR1L >>> ENTMAIN STA A4L LDA MHGRTAB+1,X STA A4H - LDX #$00 -:L1 LDY MTXTWINLFT -:L2 LDA (A1L),Y - STA (A4L),Y - INY - CPY MTXTWINRGT - BNE :L2 - INC A1H ; Advance source 1024 bytes - INC A1H - INC A1H - INC A1H - INC A4H ; Advance dest 1024 bytes - INC A4H - INC A4H - INC A4H - INX - CPX #8 ; 8 pixel rows in character - BNE :L1 - >>> XF2AUX,HRSCR1RET + BRA DOHGRSCR1L * Clear one text line on HGR screen, * from current cursor col to text window right limit