diff --git a/DRV/DHGR.DRV.G.txt b/DRV/DHGR.DRV.G.txt index e8aa1bf7..5348ca31 100644 --- a/DRV/DHGR.DRV.G.txt +++ b/DRV/DHGR.DRV.G.txt @@ -125,27 +125,6 @@ Color.Pixels .DA #%00000000,#%00000000,#%00000000,#%00000000 black (color bit di .DA #%11101110,#%11011101,#%10111011,#%11110111 yellow .DA #%01111111,#%01111111,#%01111111,#%01111111 white (color bit disabled) *-------------------------------------- -COL.BANK .DA #SETPAGE2,#CLRPAGE2,#SETPAGE2,#CLRPAGE2 - .DA #SETPAGE2,#CLRPAGE2,#SETPAGE2,#CLRPAGE2 - .DA #SETPAGE2,#CLRPAGE2,#SETPAGE2,#CLRPAGE2 - .DA #SETPAGE2,#CLRPAGE2,#SETPAGE2,#CLRPAGE2 - .DA #SETPAGE2,#CLRPAGE2,#SETPAGE2,#CLRPAGE2 - .DA #SETPAGE2,#CLRPAGE2,#SETPAGE2,#CLRPAGE2 - .DA #SETPAGE2,#CLRPAGE2,#SETPAGE2,#CLRPAGE2 - .DA #SETPAGE2,#CLRPAGE2,#SETPAGE2,#CLRPAGE2 - .DA #SETPAGE2,#CLRPAGE2,#SETPAGE2,#CLRPAGE2 - .DA #SETPAGE2,#CLRPAGE2,#SETPAGE2,#CLRPAGE2 - .DA #SETPAGE2,#CLRPAGE2,#SETPAGE2,#CLRPAGE2 - .DA #SETPAGE2,#CLRPAGE2,#SETPAGE2,#CLRPAGE2 - .DA #SETPAGE2,#CLRPAGE2,#SETPAGE2,#CLRPAGE2 - .DA #SETPAGE2,#CLRPAGE2,#SETPAGE2,#CLRPAGE2 - .DA #SETPAGE2,#CLRPAGE2,#SETPAGE2,#CLRPAGE2 - .DA #SETPAGE2,#CLRPAGE2,#SETPAGE2,#CLRPAGE2 - .DA #SETPAGE2,#CLRPAGE2,#SETPAGE2,#CLRPAGE2 - .DA #SETPAGE2,#CLRPAGE2,#SETPAGE2,#CLRPAGE2 - .DA #SETPAGE2,#CLRPAGE2,#SETPAGE2,#CLRPAGE2 - .DA #SETPAGE2,#CLRPAGE2,#SETPAGE2,#CLRPAGE2 -*-------------------------------------- DIV7.0 .HS 00 DIV7.512 .HS 000000 DIV7.256 .HS 000000 diff --git a/DRV/DHGR.DRV.S.BLT.txt b/DRV/DHGR.DRV.S.BLT.txt index 5973e566..aad40e70 100644 --- a/DRV/DHGR.DRV.S.BLT.txt +++ b/DRV/DHGR.DRV.S.BLT.txt @@ -22,12 +22,10 @@ BITBLT >LDYA CB.Cache+S.CB.X1 tay lda CB.Cache+S.CB.X1+1 adc CB.Cache+S.CB.SrcW+1 - pha - tya - sbc #0 - tay - pla - sbc #0 + cpy #1 + bcs .0 + dec +.0 dey jsr LBUF.SetBounds2YA @@ -60,8 +58,10 @@ BITBLT >LDYA CB.Cache+S.CB.X1 ldx LBUF.C1 -.3 ldy COL.BANK,x - sta $C000,y +.3 txa + and #1 + tay + sta CLRPAGE2,y txa lsr tay @@ -110,8 +110,10 @@ BITBLT.0 bit #S.CB.OP.SAVE ldx LBUF.C1 -.3 ldy COL.BANK,x - sta $C000,y +.3 txa + and #1 + tay + sta CLRPAGE2,y txa lsr tay @@ -156,17 +158,15 @@ BITBLT.2 ldy #S.BM-1 dey bpl .1 - ldx #0 - lda BM.Cache+S.BM.F - cmp #S.BM.F.BBP1 - beq .11 + eor #S.BM.F.BBP1 + cmp #1 + lda #0 + ror - ldx #$80 - -.11 stx BLT.CMASK + sta BLT.CMASK lda ZPBMDataPtr - clc +* clc adc BM.Cache+S.BM.MASK.OFS sta ZPBMMaskPtr lda ZPBMDataPtr+1 @@ -174,7 +174,7 @@ BITBLT.2 ldy #S.BM-1 sta ZPBMMaskPtr+1 lda ZPBMDataPtr - clc +* clc adc #S.BM sta ZPBMDataPtr bcc .2 diff --git a/DRV/DHGR.DRV.S.LBUF.txt b/DRV/DHGR.DRV.S.LBUF.txt index d987d737..ee426849 100644 --- a/DRV/DHGR.DRV.S.LBUF.txt +++ b/DRV/DHGR.DRV.S.LBUF.txt @@ -45,8 +45,10 @@ LBUF.DrawAtY.SET LBUF.DrawAtY.AND.SET ldx LBUF.C1 x C1->C2 - ldy COL.BANK,x - sta $C000,y + txa + and #1 + tay + sta CLRPAGE2,y txa lsr tay @@ -66,8 +68,10 @@ LBUF.DrawAtY.AND.SET bcs .8 C1+1 > C2, we are done... -.1 ldy COL.BANK,x - sta $C000,y +.1 txa + and #1 + tay + sta CLRPAGE2,y txa lsr tay @@ -79,8 +83,10 @@ LBUF.DrawAtY.AND.SET cpx LBUF.C2 bcc .1 -.2 ldy COL.BANK,x - sta $C000,y +.2 txa + and #1 + tay + sta CLRPAGE2,y txa lsr tay @@ -110,8 +116,10 @@ LBUF.DrawAtY.XXX ldx LBUF.C1 x C1->C2 - ldy COL.BANK,x - sta $C000,y + txa + and #1 + tay + sta CLRPAGE2,y txa lsr tay @@ -131,8 +139,10 @@ LBUF.DrawAtY.XXX bcs .8 C1+1 > C2, we are done... -.1 ldy COL.BANK,x - sta $C000,y +.1 txa + and #1 + tay + sta CLRPAGE2,y txa lsr tay @@ -145,8 +155,10 @@ LBUF.DrawAtY.XXX cpx LBUF.C2 bne .1 -.2 ldy COL.BANK,x - sta $C000,y +.2 txa + and #1 + tay + sta CLRPAGE2,y txa lsr tay @@ -166,8 +178,10 @@ LBUF.DrawAtY.XXX LBUF.DrawAtY.AND.ORA ldx LBUF.C1 x C1->C2 - ldy COL.BANK,x - sta $C000,y + txa + and #1 + tay + sta CLRPAGE2,y txa lsr tay @@ -198,8 +212,10 @@ LBUF.DrawAtY.AND.ORA bra .3 -.2 ldy COL.BANK,x - sta $C000,y +.2 txa + and #1 + tay + sta CLRPAGE2,y txa lsr tay @@ -214,8 +230,10 @@ LBUF.DrawAtY.AND.ORA cpx LBUF.C2 bne .2 - ldy COL.BANK,x - sta $C000,y + txa + and #1 + tay + sta CLRPAGE2,y txa lsr tay diff --git a/DRV/DHGR.DRV.S.LINE.txt b/DRV/DHGR.DRV.S.LINE.txt index ccf59513..314561c0 100644 --- a/DRV/DHGR.DRV.S.LINE.txt +++ b/DRV/DHGR.DRV.S.LINE.txt @@ -74,13 +74,13 @@ VLINE lda CB.Cache+S.CB.M VLINE.MONO >LDYA CB.Cache+S.CB.X1 jsr DIVMOD7YA X = MOD 7 - tay lsr sta ZPTmpByte Save COL (DIV) - lda COL.BANK,y + lda #0 + rol tay - sta $C000,y Select proper BANK + sta CLRPAGE2,y Select proper BANK ldy CB.Cache+S.CB.Y1 clc diff --git a/DRV/DHGR.DRV.S.PIX.txt b/DRV/DHGR.DRV.S.PIX.txt index bff5308c..71674a98 100644 --- a/DRV/DHGR.DRV.S.PIX.txt +++ b/DRV/DHGR.DRV.S.PIX.txt @@ -15,19 +15,19 @@ SETPIXEL lda CB.Cache+S.CB.M SETPIXEL.MONO >LDYA CB.Cache+S.CB.X1 jsr DIVMOD7YA - tay lsr - phy + php ldy CB.Cache+S.CB.Y1 clc adc BASEL,y sta ZPBasePtr lda BASEH,y sta ZPBasePtr+1 - ply - lda COL.BANK,y + plp + lda #0 + rol tay - sta $C000,y Select proper BANK + sta CLRPAGE2,y Select proper BANK lda CB.Cache+S.CB.OP * cmp #S.CB.OP.XOR beq SETPIXEL.MONO.XOR diff --git a/DRV/DHGR.DRV.S.txt b/DRV/DHGR.DRV.S.txt index 9c069a30..a15ece72 100644 --- a/DRV/DHGR.DRV.S.txt +++ b/DRV/DHGR.DRV.S.txt @@ -143,7 +143,7 @@ DrvReloc lda FD.DEV+S.FD.DEV.DRVPTR adc /Shift.L.HI+1 sta ZPPtr3+1 - ldy #0 + ldy #5 .1 lda (ZPPtr2),y clc @@ -154,9 +154,8 @@ DrvReloc lda FD.DEV+S.FD.DEV.DRVPTR adc ZPPtr1+1 sta (ZPPtr3),y - iny - cpy #6 - bne .1 + dey + bpl .1 lda ZPPtr1 clc @@ -176,7 +175,7 @@ DrvReloc lda FD.DEV+S.FD.DEV.DRVPTR adc /Shift.R.HI+1 sta ZPPtr3+1 - ldy #0 + ldy #5 .2 lda (ZPPtr2),y clc @@ -187,9 +186,8 @@ DrvReloc lda FD.DEV+S.FD.DEV.DRVPTR adc ZPPtr1+1 sta (ZPPtr3),y - iny - cpy #6 - bne .2 + dey + bpl .2 rts *--------------------------------------