mainmem.shr.s

@@ -92,6 +92,7 @@ SHRXPLDFONT   >>>   ENTMAIN
               BNE   :L1
               JSR   SHRCLR24               ; Clear row 24
               >>>   XF2AUX,SHRV22RET
+              RTS
 
 
 * Explode one character to location pointed to by A3L
@@ -1092,7 +1093,7 @@ SHRLINELO     MX    %00                    ; Tell merlin 16 bit M & X
               STA   :D                     ; D = D + 2 * dy
 :S3           INX
               CPX   :LIM                   ; Compare with x1
-              BCC   :L1
+              BNE   :L1
 
               SEC                          ; 65816 emulation mode
               XCE
@@ -1168,7 +1169,7 @@ SHRLINEHI     MX    %00                    ; Tell Merlin 16 bit M & X
               STA   :D                     ; D = D + 2 * dx
 :S3           INX
               CPX   :LIM                   ; Compare with y1
-              BCC   :L1
+              BNE   :L1
 
               SEC                          ; 65816 emulation mode
               XCE
@@ -1567,7 +1568,7 @@ SHRPALCHANGE  >>>   ENTMAIN
               STAL  $E19E00+9,X
               STAL  $E19E00+17,X
               STAL  $E19E00+25,X
-              BRA   :DONE
+              RTS
 :MODE320      TXA
               AND   #%00011110             ; Has already been shifted
               TAX
@@ -1575,7 +1576,7 @@ SHRPALCHANGE  >>>   ENTMAIN
               STAL  $E19E00,X              ; Store in logical slot
               LDA   PALETTE320+1,Y         ; Byte 2 of physical colour
               STAL  $E19E00+1,X            ; Store in logical slot
-:DONE         >>>   XF2AUX,VDUXXRET 
+              >>>   XF2AUX,VDUXXRET 
 
 
 * Assign a custom RGB colour to a 'logical' colour
@@ -1599,7 +1600,7 @@ SHRPALCUSTOM  >>>   ENTMAIN
               STAL  $E19E00+9,X
               STAL  $E19E00+17,X
               STAL  $E19E00+25,X
-              BRA   :DONE
+              RTS
 :MODE320      TXA
               AND   #%00011110             ; Has already been shifted
               TAX
@@ -1607,7 +1608,7 @@ SHRPALCUSTOM  >>>   ENTMAIN
               STAL  $E19E00,X              ; Store in logical slot
               TYA                          ; R component
               STAL  $E19E00+1,X            ; Store in logical slot
-:DONE         >>>   XF2AUX,VDUXXRET 
+              >>>   XF2AUX,VDUXXRET 
               
 
 * Table of addresses of SHR rows (in reverse order)

mame_applecorn

@@ -1,2 +1,2 @@
 #mame -w apple2ee -debug -sl5 mouse -sl7 cffa2 -harddisk1 ~/Personal/Development/Applecorn/applecorn.po
-mame -w apple2gs -debug -sl7 cffa2 -harddisk1 ~/Personal/Development/Applecorn/applecorn.po -harddisk2 tests/Creat*po
+mame -w apple2gs -debug -sl7 cffa2 -harddisk1 ~/Personal/Development/Applecorn/applecorn.po -harddisk2 tests/JGHMusic2.po