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

Eliminated duplicate aux mem return code for VDU statements

This commit is contained in:
Bobbi Webber-Manners 2023-01-15 17:16:50 -05:00
parent 168a18ad6d
commit de58977721
3 changed files with 13 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
applecorn.po
View File

Binary file not shown.

20
auxmem.vdu.s
View File

@ -535,6 +535,10 @@ CHARADDROK STA VDUBANK
* CC=auxmem, CS=mainmem, X=preserved
* Generic return for all SHRVDUxx returns to aux mem
VDUXXRET >>> ENTAUX ; SHRVDU08 returns here
RTS
* Move text cursor position
***************************
* Move cursor left
@ -556,8 +560,6 @@ VDU08VDU4 LDA VDUTEXTX ; COL
LDA TXTWINRGT
STA VDUTEXTX ; COL
VDU08DONE RTS
VDU08RET >>> ENTAUX ; SHRVDU08 returns here
RTS
* Move cursor right
VDU09 LDA VDUSTATUS
@ -583,8 +585,6 @@ SCROLL JSR SCROLLER
STA VDUTEXTX
JSR CLREOL
RTS
VDU09RET >>> ENTAUX ; SHRVDU09 returns here
RTS
* Move cursor down
VDU10 LDA VDUSTATUS
@ -599,8 +599,6 @@ VDU10VDU4 LDA VDUTEXTY ; ROW
INC VDUTEXTY ; ROW
VDU10DONE RTS
VDU10SCRL JMP SCROLL
VDU10RET >>> ENTAUX ; SHRVDU10 returns here
RTS
* Move cursor up
VDU11 LDA VDUSTATUS
@ -622,8 +620,6 @@ VDU11VDU4 LDA VDUTEXTY ; ROW
RTS
VDU11UP DEC VDUTEXTY ; ROW
VDU11DONE RTS
VDU11RET >>> ENTAUX ; SHRVDU11 returns here
RTS
* Move to start of line
VDU13 LDA VDUSTATUS
@ -637,8 +633,6 @@ VDU13VDU4 LDA #$BF
LDA TXTWINLFT
STA VDUTEXTX ; COL
VDU13DONE RTS
VDU13RET >>> ENTAUX ; SHRVDU13 returns here
RTS
* Move to (0,0)
VDU30 LDA TXTWINTOP
@ -1141,8 +1135,6 @@ VDU19 LDA VDUQ+5 ; Second parm
STX SHRVDUQ ; Stash X for call to main
>>> WRTAUX
>>> XF2MAIN,SHRPALCUSTOM
VDU19RET >>> ENTAUX
RTS
:TMP DB $00
@ -1228,8 +1220,6 @@ VDU24 BIT VDUBANK ; Check if this is a GS
BNE :L1
>>> WRTAUX
>>> XF2MAIN,SHRVDU24
VDU24RETBAD >>> ENTAUX
RTS ; Validation failure
VDU24RET >>> ENTAUX
LDY #GFXWINLFT+7-VDUVARS ; Copy to gfx window params
LDA #$08
@ -1380,8 +1370,6 @@ VDU23 BIT VDUSCREEN ; Check we are in SHR mode
RTS
:SHR JSR VDUCOPYMAIN ; Copy VDUQ to main mem
>>> XF2MAIN,SHRUSERCHAR
VDU23RET >>> ENTAUX
RTS
* Copy VDUQ to SHRVDUQ in main memory
VDUCOPYMAIN LDY #$00

18
mainmem.shr.s
View File

@ -165,7 +165,7 @@ SHRUSERCHAR >>> ENTMAIN
INY
CPY #$08 ; Last row?
BNE :L1
:DONE >>> XF2AUX,VDU23RET
:DONE >>> XF2AUX,VDUXXRET
:INCREMENT DB $00
@ -479,7 +479,7 @@ SHRVDU08 >>> ENTMAIN
XCE
MX %11 ; Tell Merlin
* PLP
>>> XF2AUX,VDU08RET
>>> XF2AUX,VDUXXRET
* Handle cursor right in VDU5 mode
@ -504,7 +504,7 @@ SHRVDU09 >>> ENTMAIN
XCE
MX %11 ; Tell Merlin
* PLP
>>> XF2AUX,VDU09RET
>>> XF2AUX,VDUXXRET
* Handle cursor down / linefeed in VDU5 mode
@ -520,7 +520,7 @@ SHRVDU10 >>> ENTMAIN
XCE
MX %11 ; Tell Merlin
* PLP
>>> XF2AUX,VDU10RET
>>> XF2AUX,VDUXXRET
* Handle cursor up in VDU5 mode
@ -541,7 +541,7 @@ SHRVDU11 >>> ENTMAIN
:DONE SEC ; 65816 emulation mode
XCE
MX %11 ; Tell Merlin
>>> XF2AUX,VDU11RET
>>> XF2AUX,VDUXXRET
* Handle linefeed in VDU5 mode - does the actual work
@ -577,7 +577,7 @@ SHRVDU13 >>> ENTMAIN
XCE
MX %11 ; Tell Merlin
* PLP
>>> XF2AUX,VDU13RET
>>> XF2AUX,VDUXXRET
* Plot actions: PLOT k,x,y
@ -1357,7 +1357,7 @@ SHRVDU24 >>> ENTMAIN
:BAD SEC ; 65816 emulation mode
XCE
* PLP
>>> XF2AUX,VDU24RETBAD
>>> XF2AUX,VDUXXRET
* Reset graphics window
@ -1442,7 +1442,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
>>> XF2AUX,VDU19RET
>>> XF2AUX,VDUXXRET
* Assign a custom RGB colour to a 'logical' colour
@ -1474,7 +1474,7 @@ SHRPALCUSTOM >>> ENTMAIN
STAL $E19E00,X ; Store in logical slot
TYA ; R component
STAL $E19E00+1,X ; Store in logical slot
>>> XF2AUX,VDU19RET
>>> XF2AUX,VDUXXRET
* Table of addresses of SHR rows (in reverse order)