Builds on Merlin-16 again.

2024-06-26 06:29:31 +00:00 · 2021-09-22 18:36:05 -04:00 · 2021-09-22 18:36:05 -04:00 · 2afc3bff3b
commit 2afc3bff3b
parent 2fb7f01e67
20 changed files with 78 additions and 46 deletions
--- a/applecorn.po
+++ b/applecorn.po
--- a/applecorn.s
+++ b/applecorn.s
@ -210,4 +210,6 @@ MAINZP      MAC



+
+

--- a/auxmem.bytwrd.s
+++ b/auxmem.bytwrd.s
@ -476,3 +476,5 @@ OSBM2        ASC   ').'



+
+
--- a/auxmem.chario.s
+++ b/auxmem.chario.s
@ -451,3 +451,5 @@ BYTE76       LDX   #$00                      ; Update LEDs and return X=SHIFT



+
+
--- a/auxmem.gfx.s
+++ b/auxmem.gfx.s
@ -94,3 +94,5 @@ RELCOORD    CLC



+
+
--- a/auxmem.hostfs.s
+++ b/auxmem.hostfs.s
@ -981,3 +981,5 @@ ERROR2E     DW    $C800
            DB    $00


+
+
--- a/auxmem.init.s
+++ b/auxmem.init.s
@ -177,8 +177,6 @@ BYTE00XX    BEQ   BYTE00A                    ; OSBYTE 0,0 - generate error
            RTS                              ; %000x1xxx host type, 'A'pple
 BYTE00A     BRK
            DB    $F7
-HELLO       ASC   'Applecorn MOS 2021-09-21'
+HELLO       ASC   'Applecorn MOS 2021-09-22'
            DB    $00                        ; Unify MOS messages

-
-
--- a/auxmem.misc.s
+++ b/auxmem.misc.s
@ -534,3 +534,5 @@ AUXBLK      ASC   '**ENDOFCODE**'



+
+
--- a/auxmem.mosequ.s
+++ b/auxmem.mosequ.s
@ -73,3 +73,5 @@ OSFILECB     EQU   $2EE        ; OSFILE control block



+
+
--- a/auxmem.oscli.s
+++ b/auxmem.oscli.s
@ -501,3 +501,5 @@ ECHOLP1     JSR   GSREAD



+
+
--- a/auxmem.vdu.s
+++ b/auxmem.vdu.s
@ -81,9 +81,9 @@ VDUCOLOURS   EQU   VDUVARS+$37    ; *TEMP* colours-1
 *                       3        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, 1, 1, 1, 1, 1, 1  ; Bytes per character
-SCNCOLOURS   DB    1, 1, 1, 1, 1, 1, 1, 1  ; Colours-1
-SCNTYPE      DB    1, 0,128,1, 0, 0, 0,64  ; Screen type
+SCNBYTES     DB    1,1
+SCNCOLOURS   DB    1,1
+SCNTYPE      DB    1,0,128,1
 * b7=FastDraw
 * b6=Teletext
 * b0=40COL/80COL
--- a/mainmem.fsequ.s
+++ b/mainmem.fsequ.s
@ -63,6 +63,8 @@ GEOFCMD     EQU   $D1



+
+



--- a/mainmem.init.s
+++ b/mainmem.init.s
@ -109,6 +109,8 @@ RESET       TSX



+
+



--- a/mainmem.ldr.s
+++ b/mainmem.ldr.s
@ -150,3 +150,5 @@ LOADCODE    PHP                    ; Save carry flag



+
+
--- a/mainmem.lists.s
+++ b/mainmem.lists.s
@ -127,6 +127,8 @@ QUITPL      HEX   04          ; Number of parameters



+
+



--- a/mainmem.menu.s
+++ b/mainmem.menu.s
@ -144,6 +144,8 @@ ROM8        STR   "USERROM2.ROM"



+
+



--- a/mainmem.misc.s
+++ b/mainmem.misc.s
@ -213,6 +213,8 @@ FILEREFS    DB    $00,$00,$00,$00



+
+



--- a/mainmem.path.s
+++ b/mainmem.path.s
@ -308,6 +308,8 @@ PREFIX      DS    65           ; Buffer for ProDOS prefix



+
+



--- a/mainmem.svc.s
+++ b/mainmem.svc.s
@ -1138,3 +1138,5 @@ PLOTMODE     DB    $00                ; K value for PLOT K,X,Y



+
+
--- a/mainmem.wild.s
+++ b/mainmem.wild.s
@ -388,3 +388,5 @@ MATCHBUF    DS    65            ; For storing match results (Pascal str)



+
+
				`@ -451,3 +451,5 @@ BYTE76 LDX #$00 ; Update LEDs and return X=SHIFT`
				`@ -308,6 +308,8 @@ PREFIX DS 65 ; Buffer for ProDOS prefix`
				`@ -1138,3 +1138,5 @@ PLOTMODE DB $00 ; K value for PLOT K,X,Y`
				`@ -388,3 +388,5 @@ MATCHBUF DS 65 ; For storing match results (Pascal str)`