From a9eb0ec1eeb13f34c95076fcaad03d596bf4e527 Mon Sep 17 00:00:00 2001 From: Bobbi Webber-Manners Date: Mon, 9 Jan 2023 21:50:06 -0500 Subject: [PATCH] Fixed VDU5 carriage return behaviour --- applecorn.po | Bin 819200 -> 819200 bytes mainmem.shr.s | 4 +++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/applecorn.po b/applecorn.po index 0e2bbe27d247fe36cd5186e0a1a1d4a7aa660631..37c41f98ad3db34dc6a31d0cd740ac2cfd7b67dd 100644 GIT binary patch delta 5158 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 delta 5161 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 ANB{r; diff --git a/mainmem.shr.s b/mainmem.shr.s index 3701f69..67a21e0 100644 --- a/mainmem.shr.s +++ b/mainmem.shr.s @@ -383,7 +383,9 @@ SHRVDU13 >>> ENTMAIN XCE REP #$30 ; 16 bit M & X MX %00 ; Tell Merlin - JSR SHRVDU5LF + LDA SHRWINLFT + STA SHRXPIXEL +* JSR SHRVDU5LF :DONE SEC ; 65816 emulation mode XCE MX %11 ; Tell Merlin