Apple-2-SW
/
Applecorn
mirror of https://github.com/bobbimanners/Applecorn.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix #223. Also CLREOL (sorta) works in SHR mode.

This commit is contained in:
Bobbi Webber-Manners 2022-12-24 01:06:40 -05:00
parent e5eabbac97
commit 0e74697271
3 changed files with 51 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
applecorn.po
View File

Binary file not shown.

53
auxmem.hostfs.s
View File

@ -564,12 +564,16 @@ CATLONG LDY #$21
JMP OSNEWL
PRDATETIME JSR PRSPACE
JSR PRSPACE
>>> RDMAIN
LDA (FSPTR1),Y
>>> RDAUX
PHA
AND #$1F
JSR PRDECSLH ; Day
INY
>>> RDMAIN
LDA (FSPTR1),Y
>>> RDAUX
ASL A
PLA
ROL A
@ -578,7 +582,9 @@ PRDATETIME JSR PRSPACE
ROL A
AND #$0F
JSR PRDECSLH ; Month
>>> RDMAIN
LDA (FSPTR1),Y
>>> RDAUX
PHA
CMP #80
LDA #$19
@ -591,12 +597,16 @@ PRDATETIME JSR PRSPACE
JSR PRSPACE
INY
INY
>>> RDMAIN
LDA (FSPTR1),Y
>>> RDAUX
JSR PRDEC ; Hour
LDA #$3A
JSR OSWRCH
DEY
>>> RDMAIN
LDA (FSPTR1),Y ; Minute
>>> RDAUX
PRDEC TAX
LDA #$99
SED
@ -613,10 +623,14 @@ PRDECSLH JSR PRDEC
* Print object access string
PRACCESS LDX #$04 ; Offset to 'D' char
LDY #$00
>>> RDMAIN
LDA (FSPTR1),Y
>>> RDAUX
CMP #$D0 ; CS=Directory
LDY #$1E
>>> RDMAIN
LDA (FSPTR1),Y ; Permission byte
>>> RDAUX
LDY #$0C ; Char counter
EOR #$C0
* AND #$E3 ; Keep LLB---WR
@ -635,47 +649,14 @@ PRACCESS LDX #$04 ; Offset to 'D' char
BPL :PRACCLP ; Loop for all chars
JMP PRSPACES ; Pad
* LDX #$04 ; Offset to chars
* LDY #$1E
* LDA (FSPTR1),Y
* PHA
* LDY #$00 ; Chars printed
* LDA (FSPTR1),Y
* CMP #$D0
* JSR :PRACCCHR ; 'D'
* PLA
* CPY #$01 ; Has 'D' been printed?
* PHP
* PHA
* EOR #$C0
* CMP #$40
* JSR :PRACCCHR ; 'L'
* PLA
* PLP
* BCS :PRACCDONE ; Dir, skip 'WR'
* ROR A
* PHP
* ROR A
* JSR :PRACCCHR ; 'W'
* PLP
* JSR :PRACCCHR ; 'R'
*:PRACCDONE LDA #$20
*:PRACCLP JSR :PRSPACE
* CPY #$04
* BCC :PRACCLP
*:PRSKIP RTS
*:PRACCCHR DEX
* BCC :PRSKIP
* LDA ACCESSCHRS,X
*:PRSPACE INY
* JMP OSWRCH
ACCESSCHRS ASC 'RWBLD'
ACCESSBITS DB $01,$02,$20,$C0,$00
* Print object addresses
PRADDR LDX #3
PRADDRLP LDA (FSPTR1),Y
PRADDRLP >>> RDMAIN
LDA (FSPTR1),Y
>>> RDAUX
PRADDR0 JSR OUTHEX
DEY
DEX

42
auxmem.shr.s
View File

@ -109,13 +109,7 @@ SHRPRCHAR SEC
JSR SHRCHAR320
BRA :S2
:S1 JSR SHRCHAR640
:S2 LDA VDUADDR+0 ; Add 160 to VDUADDR
CLC
ADC #160
STA VDUADDR+0
LDA VDUADDR+1
ADC #$00
STA VDUADDR+1
:S2 JSR SHRNEXTROW ; Add 160 to VDUADDR
INY ; Next row of font
CPY #$08 ; Last row?
BNE :L1
@ -200,6 +194,17 @@ SHRCHARADDR LDA #$20 ; MSB starts at $20
* (VDUADDR)=>character address, X=preserved
* Advance VDUADDR to the next row of pixels
SHRNEXTROW LDA VDUADDR+0 ; Add 160 to VDUADDR
CLC
ADC #160
STA VDUADDR+0
LDA VDUADDR+1
ADC #$00
STA VDUADDR+1
RTS
* Forwards scroll one line
SHRSCR1LINE
RTS
@ -211,8 +216,29 @@ SHRRSCR1LINE
* Clear from current location to EOL
SHRCLREOL
* TODO: This is only for 640 mode at present
SHRCLREOL JSR SHRCHARADDR
STZ VDUADDR+0 ; Addr of start of line
LDA #$08 ; Eight rows
STA :CTR
:L0 LDA VDUTEXTX
TAX
ASL ; 2 bytes / char
TAY
LDA #$00
:L1 CPX TXTWINRGT
BCS :S1
STA [VDUADDR],Y
INY
STA [VDUADDR],Y
INY
INX
BRA :L1
:S1 JSR SHRNEXTROW
DEC :CTR
BNE :L0
RTS
:CTR DB $00
* VDU16 (CLG) clears the whole SHR screen right now