Apple-2-SW/Applecorn
1
0
Fork 0
mirror of https://github.com/bobbimanners/Applecorn.git synced 2024-06-15 19:29:32 +00:00
Code Issues Projects Releases Wiki Activity

Fixed VDU24 bug

Browse Source
This commit is contained in:
Bobbi Webber-Manners 2023-01-05 22:33:16 -05:00
parent ec913ef6cb
commit 0fbe7c9592
3 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
applecorn.po
View File

Binary file not shown.

17
auxmem.vdu.s
View File

@ -1073,34 +1073,35 @@ VDU26QUIT RTS
VDU28 LDX VDUMODE VDU28 LDX VDUMODE
LDA VDUQCOORD+2 ; right LDA VDUQCOORD+2 ; right
CMP VDUQCOORD+0 ; left CMP VDUQCOORD+0 ; left
BCC VDUCOPYEXIT ; right<left BCC VDU28EXIT ; right<left
CMP SCNTXTMAXX,X CMP SCNTXTMAXX,X
BEQ VDU28B BEQ VDU28B
BCS VDUCOPYEXIT ; right>width BCS VDU28EXIT ; right>width
VDU28B LDA VDUQCOORD+1 ; bottom VDU28B LDA VDUQCOORD+1 ; bottom
CMP VDUQCOORD+3 ; top CMP VDUQCOORD+3 ; top
BCC VDUCOPYEXIT ; bottom<top BCC VDU28EXIT ; bottom<top
CMP SCNTXTMAXY,X CMP SCNTXTMAXY,X
BEQ VDU28C BEQ VDU28C
BCS VDUCOPYEXIT ; top>height BCS VDU28EXIT ; top>height
VDU28C LDY #TXTWINLFT+3-VDUVARS ; Copy to txt window params VDU28C LDY #TXTWINLFT+3-VDUVARS ; Copy to txt window params
BEQ VDU28D BEQ VDU28EXIT
JSR VDUCOPY4 JSR VDUCOPY4
LDA TXTWINLFT ; Cursor to top-left of window LDA TXTWINLFT ; Cursor to top-left of window
STA VDUTEXTX STA VDUTEXTX
LDA TXTWINTOP LDA TXTWINTOP
STA VDUTEXTY STA VDUTEXTY
VDU28D RTS VDU28EXIT RTS
* VDU 24,left;bottom;right;top; - define graphics window * VDU 24,left;bottom;right;top; - define graphics window
VDU24 BIT VDUBANK ; Check if this is a GS VDU24 BIT VDUBANK ; Check if this is a GS
BMI :GS BMI :GS
RTS ; If not, hasta la vista RTS ; If not, hasta la vista
:GS LDX #$08 :GS LDX #$00
>>> WRTMAIN >>> WRTMAIN
:L1 LDA VDUQGFXWIND,X ; Copy to main mem for SHR :L1 LDA VDUQGFXWIND,X ; Copy to main mem for SHR
STA SHRVDUQ,X STA SHRVDUQ,X
DEX INX
CPX #$08
BNE :L1 BNE :L1
>>> WRTAUX >>> WRTAUX
>>> XF2MAIN,SHRVDU24 >>> XF2MAIN,SHRVDU24

14
mainmem.shr.s
View File

@ -307,9 +307,9 @@ SHRPLOTCOL LDA SHRGFXFGMASK ; Preserve FG colour
SHRPOINT REP #$30 ; 16 bit M & X SHRPOINT REP #$30 ; 16 bit M & X
MX %00 ; Tell Merlin MX %00 ; Tell Merlin
LDA A2L ; y coordinate LDA A2L ; y coordinate
CMP SHRWINTOP
BMI :OUT
CMP SHRWINBTM CMP SHRWINBTM
BMI :OUT
CMP SHRWINTOP
BPL :OUT BPL :OUT
LDA A1L ; x coordinate LDA A1L ; x coordinate
CMP SHRWINLFT CMP SHRWINLFT
@ -840,7 +840,7 @@ SHRVDU24 >>> ENTMAIN
LDA A1L ; right converted LDA A1L ; right converted
STA SHRWINRGT STA SHRWINRGT
LDA A2L ; top converted LDA A2L ; top converted
STA SHRWINBTM STA SHRWINTOP
SEC ; 65816 emulation mode SEC ; 65816 emulation mode
XCE XCE
@ -856,16 +856,16 @@ SHRVDU24 >>> ENTMAIN
SHRVDU26 >>> ENTMAIN SHRVDU26 >>> ENTMAIN
STZ SHRWINLFT+0 STZ SHRWINLFT+0
STZ SHRWINLFT+1 STZ SHRWINLFT+1
STZ SHRWINTOP+0 STZ SHRWINBTM+0
STZ SHRWINTOP+1 STZ SHRWINBTM+1
LDA #<639 LDA #<639
STA SHRWINRGT+0 STA SHRWINRGT+0
LDA #>639 LDA #>639
STA SHRWINRGT+1 STA SHRWINRGT+1
LDA #<199 LDA #<199
STA SHRWINBTM+0 STA SHRWINTOP+0
LDA #>199 LDA #>199
STA SHRWINBTM+1 STA SHRWINTOP+1
>>> XF2AUX,VDU26RET >>> XF2AUX,VDU26RET