diff --git a/applecorn.po b/applecorn.po index cb4ed9e..0d078a4 100644 Binary files a/applecorn.po and b/applecorn.po differ diff --git a/applecorn.s b/applecorn.s index 35e629c..b4d35a8 100644 --- a/applecorn.s +++ b/applecorn.s @@ -210,4 +210,6 @@ MAINZP MAC + + diff --git a/auxmem.bytwrd.s b/auxmem.bytwrd.s index ebdd022..16b5251 100644 --- a/auxmem.bytwrd.s +++ b/auxmem.bytwrd.s @@ -476,3 +476,5 @@ OSBM2 ASC ').' + + diff --git a/auxmem.chario.s b/auxmem.chario.s index ed5d717..20ecc9c 100644 --- a/auxmem.chario.s +++ b/auxmem.chario.s @@ -451,3 +451,5 @@ BYTE76 LDX #$00 ; Update LEDs and return X=SHIFT + + diff --git a/auxmem.gfx.s b/auxmem.gfx.s index 4fc7c16..7729e53 100644 --- a/auxmem.gfx.s +++ b/auxmem.gfx.s @@ -94,3 +94,5 @@ RELCOORD CLC + + diff --git a/auxmem.hostfs.s b/auxmem.hostfs.s index 8cfb175..b1b7ec9 100644 --- a/auxmem.hostfs.s +++ b/auxmem.hostfs.s @@ -981,3 +981,5 @@ ERROR2E DW $C800 DB $00 + + diff --git a/auxmem.init.s b/auxmem.init.s index 14744ae..b0166ea 100644 --- 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 - - diff --git a/auxmem.misc.s b/auxmem.misc.s index 732054c..0d65087 100644 --- a/auxmem.misc.s +++ b/auxmem.misc.s @@ -534,3 +534,5 @@ AUXBLK ASC '**ENDOFCODE**' + + diff --git a/auxmem.mosequ.s b/auxmem.mosequ.s index 3176175..b72a46f 100644 --- a/auxmem.mosequ.s +++ b/auxmem.mosequ.s @@ -73,3 +73,5 @@ OSFILECB EQU $2EE ; OSFILE control block + + diff --git a/auxmem.oscli.s b/auxmem.oscli.s index f282cf3..0d1f044 100644 --- a/auxmem.oscli.s +++ b/auxmem.oscli.s @@ -501,3 +501,5 @@ ECHOLP1 JSR GSREAD + + diff --git a/auxmem.vdu.s b/auxmem.vdu.s index 40b0069..5e96b3d 100644 --- a/auxmem.vdu.s +++ b/auxmem.vdu.s @@ -22,7 +22,7 @@ * VDU DRIVER ZERO PAGE ********************** * $00D0-$00DF VDU driver zero page workspace -VDUSTATUS EQU $D0 ; $D0 # VDU status +VDUSTATUS EQU $D0 ; $D0 # VDU status * bit 7 = VDU 21 VDU disabled * bit 6 = COPY cursor active * bit 5 = VDU 5 Text at graphics cursor @@ -32,10 +32,10 @@ VDUSTATUS EQU $D0 ; $D0 # VDU status * bit 1 = Don't scroll (COPY cursor or VDU 5 mode) * bit 0 = VDU 2 printer echo active * -VDUCHAR EQU VDUSTATUS+1 ; $D1 -VDUADDR EQU VDUSTATUS+4 ; $D4 address of current char cell -OLDCHAR EQU OSKBD1 ; *TEMP* character under cursor -COPYCHAR EQU OSKBD2 ; *TEMP* character under copy cursor +VDUCHAR EQU VDUSTATUS+1 ; $D1 +VDUADDR EQU VDUSTATUS+4 ; $D4 address of current char cell +OLDCHAR EQU OSKBD1 ; *TEMP* character under cursor +COPYCHAR EQU OSKBD2 ; *TEMP* character under copy cursor * VDU DRIVER MAIN WORKSPACE @@ -45,45 +45,45 @@ FXVDUQLEN EQU BYTEVARBASE+218 ; Length of pending VDU queue VDUVARS EQU $290 VDUVAREND EQU $2DF -GFXWINLFT EQU VDUVARS+$00 ; # graphics window left -GFXWINBOT EQU VDUVARS+$02 ; # graphics window bottom \ window -GFXWINRGT EQU VDUVARS+$04 ; # graphics window right / size -GFXWINTOP EQU VDUVARS+$06 ; # graphics window top -TXTWINLFT EQU VDUVARS+$08 ; # text window left -TXTWINBOT EQU VDUVARS+$09 ; # text window bottom \ window -TXTWINRGT EQU VDUVARS+$0A ; # text window right / size -TXTWINTOP EQU VDUVARS+$0B ; # text window top -GFXORIGX EQU VDUVARS+$0C ; graphics X origin -GFXORIGY EQU VDUVARS+$0E ; graphics Y origin +GFXWINLFT EQU VDUVARS+$00 ; # graphics window left +GFXWINBOT EQU VDUVARS+$02 ; # graphics window bottom \ window +GFXWINRGT EQU VDUVARS+$04 ; # graphics window right / size +GFXWINTOP EQU VDUVARS+$06 ; # graphics window top +TXTWINLFT EQU VDUVARS+$08 ; # text window left +TXTWINBOT EQU VDUVARS+$09 ; # text window bottom \ window +TXTWINRGT EQU VDUVARS+$0A ; # text window right / size +TXTWINTOP EQU VDUVARS+$0B ; # text window top +GFXORIGX EQU VDUVARS+$0C ; graphics X origin +GFXORIGY EQU VDUVARS+$0E ; graphics Y origin * -GFXPOSNX EQU VDUVARS+$10 ; current graphics X posn -GFXPOSNY EQU VDUVARS+$12 ; current graphics Y posn -GFXLASTX EQU VDUVARS+$14 ; last graphics X posn -GFXLASTY EQU VDUVARS+$16 ; last graphics Y posn -VDUTEXTX EQU VDUVARS+$18 ; absolute text X posn = POS+WINLFT -VDUTEXTY EQU VDUVARS+$19 ; absolute text Y posn = VPOS+WINTOP -VDUCOPYX EQU VDUVARS+$1A ; absolute COPY text X posn -VDUCOPYY EQU VDUVARS+$1B ; absolute COPY text Y posn +GFXPOSNX EQU VDUVARS+$10 ; current graphics X posn +GFXPOSNY EQU VDUVARS+$12 ; current graphics Y posn +GFXLASTX EQU VDUVARS+$14 ; last graphics X posn +GFXLASTY EQU VDUVARS+$16 ; last graphics Y posn +VDUTEXTX EQU VDUVARS+$18 ; absolute text X posn = POS+WINLFT +VDUTEXTY EQU VDUVARS+$19 ; absolute text Y posn = VPOS+WINTOP +VDUCOPYX EQU VDUVARS+$1A ; absolute COPY text X posn +VDUCOPYY EQU VDUVARS+$1B ; absolute COPY text Y posn * -VDUQ EQU VDUVARS+$27 ; *TEMP* $27.$2F -CURSOR EQU VDUVARS+$30 ; *TEMP* character used for cursor -CURSORED EQU VDUVARS+$31 ; *TEMP* character used for edit cursor -CURSORCP EQU VDUVARS+$32 ; *TEMP* character used for copy cursor +VDUQ EQU VDUVARS+$27 ; *TEMP* $27.$2F +CURSOR EQU VDUVARS+$30 ; *TEMP* character used for cursor +CURSORED EQU VDUVARS+$31 ; *TEMP* character used for edit cursor +CURSORCP EQU VDUVARS+$32 ; *TEMP* character used for copy cursor * -VDUPIXELS EQU VDUVARS+$33 ; *TEMP* pixels per byte -VDUBYTES EQU VDUVARS+$34 ; *TEMP* bytes per char, 1=text only -VDUMODE EQU VDUVARS+$35 ; *TEMP* current MODE -VDUSCREEN EQU VDUVARS+$36 ; *TEMP* MODE type -VDUCOLOURS EQU VDUVARS+$37 ; *TEMP* colours-1 +VDUPIXELS EQU VDUVARS+$33 ; *TEMP* pixels per byte +VDUBYTES EQU VDUVARS+$34 ; *TEMP* bytes per char, 1=text only +VDUMODE EQU VDUVARS+$35 ; *TEMP* current MODE +VDUSCREEN EQU VDUVARS+$36 ; *TEMP* MODE type +VDUCOLOURS EQU VDUVARS+$37 ; *TEMP* colours-1 * * Screen definitions -* 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 +* 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 +SCNCOLOURS DB 1,1 +SCNTYPE DB 1,0,128,1 * b7=FastDraw * b6=Teletext * b0=40COL/80COL @@ -496,7 +496,7 @@ VDU22 LDA VDUQ+8 BMI VDU22G ; b7=1, graphics mode * TEMP CPX #2 - BEQ VDU22G ; Jump out for MODE 2 + BEQ VDU22G ; Jump out for MODE 2 * TEMP * AND #$01 ; 40col/80col bit @@ -508,7 +508,7 @@ VDU22 LDA VDUQ+8 STA $C00F ; Enable alt charset BRA VDU22CLR - + VDU22G STA $C050 ; Enable Graphics STA $C057 ; Hi-Res STA $C054 ; PAGE1 @@ -539,7 +539,7 @@ CLEAR STZ VDUTEXTY ; ROW :S3 STZ VDUTEXTY ; ROW STZ VDUTEXTX ; COL RTS -VDU12SOFT JMP VDU16 ; *TEMP* +VDU12SOFT JMP VDU16 ; *TEMP* * Clear to EOL @@ -735,8 +735,8 @@ VDU29 RTS * OSBYTE &A0 - Read VDU variable ******************************** -BYTEA0 LDY VDUVARS+1,X - LDA VDUVARS+0,X +BYTEA0 LDY VDUVARS+1,X + LDA VDUVARS+0,X TAX RTS diff --git a/mainmem.fsequ.s b/mainmem.fsequ.s index 6aaa364..6fc81ba 100644 --- a/mainmem.fsequ.s +++ b/mainmem.fsequ.s @@ -63,6 +63,8 @@ GEOFCMD EQU $D1 + + diff --git a/mainmem.init.s b/mainmem.init.s index dedcbdf..3c21804 100644 --- a/mainmem.init.s +++ b/mainmem.init.s @@ -109,6 +109,8 @@ RESET TSX + + diff --git a/mainmem.ldr.s b/mainmem.ldr.s index 0edea07..ae51e36 100644 --- a/mainmem.ldr.s +++ b/mainmem.ldr.s @@ -150,3 +150,5 @@ LOADCODE PHP ; Save carry flag + + diff --git a/mainmem.lists.s b/mainmem.lists.s index aa1f91d..143f2a6 100644 --- a/mainmem.lists.s +++ b/mainmem.lists.s @@ -127,6 +127,8 @@ QUITPL HEX 04 ; Number of parameters + + diff --git a/mainmem.menu.s b/mainmem.menu.s index 7187806..9bc2f26 100644 --- a/mainmem.menu.s +++ b/mainmem.menu.s @@ -144,6 +144,8 @@ ROM8 STR "USERROM2.ROM" + + diff --git a/mainmem.misc.s b/mainmem.misc.s index e9e235e..2934856 100644 --- a/mainmem.misc.s +++ b/mainmem.misc.s @@ -213,6 +213,8 @@ FILEREFS DB $00,$00,$00,$00 + + diff --git a/mainmem.path.s b/mainmem.path.s index 5197ca3..16b7350 100644 --- a/mainmem.path.s +++ b/mainmem.path.s @@ -308,6 +308,8 @@ PREFIX DS 65 ; Buffer for ProDOS prefix + + diff --git a/mainmem.svc.s b/mainmem.svc.s index 2e583e1..581fc30 100644 --- a/mainmem.svc.s +++ b/mainmem.svc.s @@ -1138,3 +1138,5 @@ PLOTMODE DB $00 ; K value for PLOT K,X,Y + + diff --git a/mainmem.wild.s b/mainmem.wild.s index 2c52624..6ff72c6 100644 --- a/mainmem.wild.s +++ b/mainmem.wild.s @@ -388,3 +388,5 @@ MATCHBUF DS 65 ; For storing match results (Pascal str) + +