From 4c8deecbf82cb306acc03bdde9f51ba71c3dffa3 Mon Sep 17 00:00:00 2001
From: Bobbi Webber-Manners <bobbi.manners@gmail.com>
Date: Mon, 16 Jan 2023 19:25:30 -0500
Subject: [PATCH] Removed commented out code

---
 mainmem.shr.s | 26 +++++++-------------------
 1 file changed, 7 insertions(+), 19 deletions(-)

diff --git a/mainmem.shr.s b/mainmem.shr.s
index 874e89a..6162bc5 100644
--- a/mainmem.shr.s
+++ b/mainmem.shr.s
@@ -90,6 +90,7 @@ SHRXPLDFONT   >>>   ENTMAIN
               INC   A
               CMP   #128                   ; 96 chars in FONT8
               BNE   :L1
+              JSR   SHRCLR24               ; Clear row 24
               >>>   XF2AUX,SHRV22RET
               RTS
 
@@ -198,6 +199,12 @@ SHRXPLDROW    LDX   SHRPIXELS              ; Pixels per byte
 :S4           RTS
 
 
+* Clear text row 24 (0-based index)
+SHRCLR24      
+* $9800
+              RTS
+
+
 * Explode one pixel row of font in 320 mode
 * 4 bytes per char, 4 bits per pixel
 * On entry: A contains row of font data
@@ -258,8 +265,6 @@ SHRCHAR640    PHY                          ; Preserve Y
 
 * VDU5 plot char at graphics cursor position
 SHRVDU5CH     >>>   ENTMAIN
-*              PHP                          ; Disable interrupts
-*              SEI
               CLC                          ; 65816 native mode
               XCE
               REP   #$30                   ; 16 bit M & X
@@ -385,7 +390,6 @@ SHRVDU5CH     >>>   ENTMAIN
 :DONE         SEC                          ; 65816 emulation mode
               XCE
               MX    %11                    ; Tell Merlin
-*              PLP
               >>>   XF2AUX,SHRPRCH320RET
 * Zero page
 :COLCTR       EQU   TMPZP+0
@@ -685,8 +689,6 @@ SHRPLOT       >>>   ENTMAIN
 :S1           CMP   #$40                   ; Plot point
               BNE   :BAIL                  ; Other? Bail out
 
-*              PHP                          ; Disable interrupts
-*              SEI
               CLC                          ; 65816 native mode
               XCE
               SEP   #$30                   ; 8 bit M & X
@@ -695,7 +697,6 @@ SHRPLOT       >>>   ENTMAIN
               SEC                          ; 65816 emulation mode
               XCE
               MX    %11                    ; Tell Merlin
-*              PLP                          ; Resume normal service
 
               BRA   :S2
 :S2           PLA                          ; Store prev pt in screen coords
@@ -906,8 +907,6 @@ SHRLINE       LDA   A2L                    ; y1
               INC   A
 :S1           STA   TMPZP+0                ; abs(y1 - y0)
               STZ   TMPZP+1                ; Pad to 16 bit
-*              PHP                          ; Disable interrupts
-*              SEI
               CLC                          ; 65816 native mode
               XCE
               REP   #$30                   ; 16 bit M & X
@@ -1019,7 +1018,6 @@ SHRLINELO     MX    %00                    ; Tell merlin 16 bit M & X
               SEC                          ; 65816 emulation mode
               XCE
               MX    %11                    ; Tell Merlin
-*              PLP                          ; Resume normal service
               RTS
 * Zero page
 :DX           EQU   TMPZP+0                ; dx initially, then (2 * (dy - dx))
@@ -1111,8 +1109,6 @@ SHRLINEHI     MX    %00                    ; Tell Merlin 16 bit M & X
 * from 1280x1024 to 640x200 or 320x200
 * On return: X-coordinate in A1L/H, Y-coordinate in A2L (A2H=0)
 SHRCOORD      MAC
-*              PHP                          ; Disable interrupts
-*              SEI
               CLC                          ; 65816 native mode
               XCE
               REP   #$30                   ; 16 bit M & X
@@ -1160,7 +1156,6 @@ SHRCOORDM0    LDA   SHRVDUQ+5
               SEC                          ; Back to emulation mode
               XCE
               MX    %11                    ; Tell Merlin
-*              PLP                          ; Normal service resumed
               BRA   SHRCOORDEND
 
 SHRCOORDNEG   MX    %00                    ; Tell Merlin we are 16 bit
@@ -1235,8 +1230,6 @@ SHRCOORD2M0   LDA   SHRVDUQ,X
 
 * Clear the graphics window
 SHRVDU16      >>>   ENTMAIN
-*              PHP                          ; Disable interrupts
-*              SEI
               CLC                          ; 816 native mode
               XCE
               REP   #$30                   ; 16 bit M & X
@@ -1333,7 +1326,6 @@ SHRVDU16      >>>   ENTMAIN
               SEC                          ; Back to 6502 emu mode
               XCE
               MX    %11                    ; Tell Merlin
-*              PLP                          ; Normal service resumed
               >>>   XF2AUX,SHRCLRRET
 :LEFT320      DB    %11111111
               DB    %00001111
@@ -1386,8 +1378,6 @@ SHRVDU16V     PHA
 * Validate graphics window parms & store if okay
 * First 8 bytes of SHRVDUQ: left, bottom, right, top
 SHRVDU24      >>>   ENTMAIN
-*              PHP                          ; Disable interrupts
-*              SEI
               CLC                          ; 65816 native mode
               XCE
               REP   #$30                   ; 16 bit M & X
@@ -1418,11 +1408,9 @@ SHRVDU24      >>>   ENTMAIN
 
               SEC                          ; 65816 emulation mode
               XCE
-*              PLP
               >>>   XF2AUX,VDU24RET
 :BAD          SEC                          ; 65816 emulation mode
               XCE
-*              PLP
               >>>   XF2AUX,VDUXXRET