mirror of
https://github.com/bobbimanners/Applecorn.git
synced 2024-06-15 19:29:32 +00:00
Eliminated duplicate aux mem return code for VDU statements
This commit is contained in:
parent
168a18ad6d
commit
de58977721
BIN
applecorn.po
BIN
applecorn.po
Binary file not shown.
20
auxmem.vdu.s
20
auxmem.vdu.s
|
@ -535,6 +535,10 @@ CHARADDROK STA VDUBANK
|
||||||
* CC=auxmem, CS=mainmem, X=preserved
|
* 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 text cursor position
|
||||||
***************************
|
***************************
|
||||||
* Move cursor left
|
* Move cursor left
|
||||||
|
@ -556,8 +560,6 @@ VDU08VDU4 LDA VDUTEXTX ; COL
|
||||||
LDA TXTWINRGT
|
LDA TXTWINRGT
|
||||||
STA VDUTEXTX ; COL
|
STA VDUTEXTX ; COL
|
||||||
VDU08DONE RTS
|
VDU08DONE RTS
|
||||||
VDU08RET >>> ENTAUX ; SHRVDU08 returns here
|
|
||||||
RTS
|
|
||||||
|
|
||||||
* Move cursor right
|
* Move cursor right
|
||||||
VDU09 LDA VDUSTATUS
|
VDU09 LDA VDUSTATUS
|
||||||
|
@ -583,8 +585,6 @@ SCROLL JSR SCROLLER
|
||||||
STA VDUTEXTX
|
STA VDUTEXTX
|
||||||
JSR CLREOL
|
JSR CLREOL
|
||||||
RTS
|
RTS
|
||||||
VDU09RET >>> ENTAUX ; SHRVDU09 returns here
|
|
||||||
RTS
|
|
||||||
|
|
||||||
* Move cursor down
|
* Move cursor down
|
||||||
VDU10 LDA VDUSTATUS
|
VDU10 LDA VDUSTATUS
|
||||||
|
@ -599,8 +599,6 @@ VDU10VDU4 LDA VDUTEXTY ; ROW
|
||||||
INC VDUTEXTY ; ROW
|
INC VDUTEXTY ; ROW
|
||||||
VDU10DONE RTS
|
VDU10DONE RTS
|
||||||
VDU10SCRL JMP SCROLL
|
VDU10SCRL JMP SCROLL
|
||||||
VDU10RET >>> ENTAUX ; SHRVDU10 returns here
|
|
||||||
RTS
|
|
||||||
|
|
||||||
* Move cursor up
|
* Move cursor up
|
||||||
VDU11 LDA VDUSTATUS
|
VDU11 LDA VDUSTATUS
|
||||||
|
@ -622,8 +620,6 @@ VDU11VDU4 LDA VDUTEXTY ; ROW
|
||||||
RTS
|
RTS
|
||||||
VDU11UP DEC VDUTEXTY ; ROW
|
VDU11UP DEC VDUTEXTY ; ROW
|
||||||
VDU11DONE RTS
|
VDU11DONE RTS
|
||||||
VDU11RET >>> ENTAUX ; SHRVDU11 returns here
|
|
||||||
RTS
|
|
||||||
|
|
||||||
* Move to start of line
|
* Move to start of line
|
||||||
VDU13 LDA VDUSTATUS
|
VDU13 LDA VDUSTATUS
|
||||||
|
@ -637,8 +633,6 @@ VDU13VDU4 LDA #$BF
|
||||||
LDA TXTWINLFT
|
LDA TXTWINLFT
|
||||||
STA VDUTEXTX ; COL
|
STA VDUTEXTX ; COL
|
||||||
VDU13DONE RTS
|
VDU13DONE RTS
|
||||||
VDU13RET >>> ENTAUX ; SHRVDU13 returns here
|
|
||||||
RTS
|
|
||||||
|
|
||||||
* Move to (0,0)
|
* Move to (0,0)
|
||||||
VDU30 LDA TXTWINTOP
|
VDU30 LDA TXTWINTOP
|
||||||
|
@ -1141,8 +1135,6 @@ VDU19 LDA VDUQ+5 ; Second parm
|
||||||
STX SHRVDUQ ; Stash X for call to main
|
STX SHRVDUQ ; Stash X for call to main
|
||||||
>>> WRTAUX
|
>>> WRTAUX
|
||||||
>>> XF2MAIN,SHRPALCUSTOM
|
>>> XF2MAIN,SHRPALCUSTOM
|
||||||
VDU19RET >>> ENTAUX
|
|
||||||
RTS
|
|
||||||
:TMP DB $00
|
:TMP DB $00
|
||||||
|
|
||||||
|
|
||||||
|
@ -1228,8 +1220,6 @@ VDU24 BIT VDUBANK ; Check if this is a GS
|
||||||
BNE :L1
|
BNE :L1
|
||||||
>>> WRTAUX
|
>>> WRTAUX
|
||||||
>>> XF2MAIN,SHRVDU24
|
>>> XF2MAIN,SHRVDU24
|
||||||
VDU24RETBAD >>> ENTAUX
|
|
||||||
RTS ; Validation failure
|
|
||||||
VDU24RET >>> ENTAUX
|
VDU24RET >>> ENTAUX
|
||||||
LDY #GFXWINLFT+7-VDUVARS ; Copy to gfx window params
|
LDY #GFXWINLFT+7-VDUVARS ; Copy to gfx window params
|
||||||
LDA #$08
|
LDA #$08
|
||||||
|
@ -1380,8 +1370,6 @@ VDU23 BIT VDUSCREEN ; Check we are in SHR mode
|
||||||
RTS
|
RTS
|
||||||
:SHR JSR VDUCOPYMAIN ; Copy VDUQ to main mem
|
:SHR JSR VDUCOPYMAIN ; Copy VDUQ to main mem
|
||||||
>>> XF2MAIN,SHRUSERCHAR
|
>>> XF2MAIN,SHRUSERCHAR
|
||||||
VDU23RET >>> ENTAUX
|
|
||||||
RTS
|
|
||||||
|
|
||||||
* Copy VDUQ to SHRVDUQ in main memory
|
* Copy VDUQ to SHRVDUQ in main memory
|
||||||
VDUCOPYMAIN LDY #$00
|
VDUCOPYMAIN LDY #$00
|
||||||
|
|
|
@ -165,7 +165,7 @@ SHRUSERCHAR >>> ENTMAIN
|
||||||
INY
|
INY
|
||||||
CPY #$08 ; Last row?
|
CPY #$08 ; Last row?
|
||||||
BNE :L1
|
BNE :L1
|
||||||
:DONE >>> XF2AUX,VDU23RET
|
:DONE >>> XF2AUX,VDUXXRET
|
||||||
:INCREMENT DB $00
|
:INCREMENT DB $00
|
||||||
|
|
||||||
|
|
||||||
|
@ -479,7 +479,7 @@ SHRVDU08 >>> ENTMAIN
|
||||||
XCE
|
XCE
|
||||||
MX %11 ; Tell Merlin
|
MX %11 ; Tell Merlin
|
||||||
* PLP
|
* PLP
|
||||||
>>> XF2AUX,VDU08RET
|
>>> XF2AUX,VDUXXRET
|
||||||
|
|
||||||
|
|
||||||
* Handle cursor right in VDU5 mode
|
* Handle cursor right in VDU5 mode
|
||||||
|
@ -504,7 +504,7 @@ SHRVDU09 >>> ENTMAIN
|
||||||
XCE
|
XCE
|
||||||
MX %11 ; Tell Merlin
|
MX %11 ; Tell Merlin
|
||||||
* PLP
|
* PLP
|
||||||
>>> XF2AUX,VDU09RET
|
>>> XF2AUX,VDUXXRET
|
||||||
|
|
||||||
|
|
||||||
* Handle cursor down / linefeed in VDU5 mode
|
* Handle cursor down / linefeed in VDU5 mode
|
||||||
|
@ -520,7 +520,7 @@ SHRVDU10 >>> ENTMAIN
|
||||||
XCE
|
XCE
|
||||||
MX %11 ; Tell Merlin
|
MX %11 ; Tell Merlin
|
||||||
* PLP
|
* PLP
|
||||||
>>> XF2AUX,VDU10RET
|
>>> XF2AUX,VDUXXRET
|
||||||
|
|
||||||
|
|
||||||
* Handle cursor up in VDU5 mode
|
* Handle cursor up in VDU5 mode
|
||||||
|
@ -541,7 +541,7 @@ SHRVDU11 >>> ENTMAIN
|
||||||
:DONE SEC ; 65816 emulation mode
|
:DONE SEC ; 65816 emulation mode
|
||||||
XCE
|
XCE
|
||||||
MX %11 ; Tell Merlin
|
MX %11 ; Tell Merlin
|
||||||
>>> XF2AUX,VDU11RET
|
>>> XF2AUX,VDUXXRET
|
||||||
|
|
||||||
|
|
||||||
* Handle linefeed in VDU5 mode - does the actual work
|
* Handle linefeed in VDU5 mode - does the actual work
|
||||||
|
@ -577,7 +577,7 @@ SHRVDU13 >>> ENTMAIN
|
||||||
XCE
|
XCE
|
||||||
MX %11 ; Tell Merlin
|
MX %11 ; Tell Merlin
|
||||||
* PLP
|
* PLP
|
||||||
>>> XF2AUX,VDU13RET
|
>>> XF2AUX,VDUXXRET
|
||||||
|
|
||||||
|
|
||||||
* Plot actions: PLOT k,x,y
|
* Plot actions: PLOT k,x,y
|
||||||
|
@ -1357,7 +1357,7 @@ SHRVDU24 >>> ENTMAIN
|
||||||
:BAD SEC ; 65816 emulation mode
|
:BAD SEC ; 65816 emulation mode
|
||||||
XCE
|
XCE
|
||||||
* PLP
|
* PLP
|
||||||
>>> XF2AUX,VDU24RETBAD
|
>>> XF2AUX,VDUXXRET
|
||||||
|
|
||||||
|
|
||||||
* Reset graphics window
|
* Reset graphics window
|
||||||
|
@ -1442,7 +1442,7 @@ SHRPALCHANGE >>> ENTMAIN
|
||||||
STAL $E19E00,X ; Store in logical slot
|
STAL $E19E00,X ; Store in logical slot
|
||||||
LDA PALETTE320+1,Y ; Byte 2 of physical colour
|
LDA PALETTE320+1,Y ; Byte 2 of physical colour
|
||||||
STAL $E19E00+1,X ; Store in logical slot
|
STAL $E19E00+1,X ; Store in logical slot
|
||||||
>>> XF2AUX,VDU19RET
|
>>> XF2AUX,VDUXXRET
|
||||||
|
|
||||||
|
|
||||||
* Assign a custom RGB colour to a 'logical' colour
|
* Assign a custom RGB colour to a 'logical' colour
|
||||||
|
@ -1474,7 +1474,7 @@ SHRPALCUSTOM >>> ENTMAIN
|
||||||
STAL $E19E00,X ; Store in logical slot
|
STAL $E19E00,X ; Store in logical slot
|
||||||
TYA ; R component
|
TYA ; R component
|
||||||
STAL $E19E00+1,X ; Store in logical slot
|
STAL $E19E00+1,X ; Store in logical slot
|
||||||
>>> XF2AUX,VDU19RET
|
>>> XF2AUX,VDUXXRET
|
||||||
|
|
||||||
|
|
||||||
* Table of addresses of SHR rows (in reverse order)
|
* Table of addresses of SHR rows (in reverse order)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user