diff --git a/applecorn.po b/applecorn.po index 924fa02..1191758 100644 Binary files a/applecorn.po and b/applecorn.po differ diff --git a/auxmem.gfx.s b/auxmem.gfx.s index d1f17c5..e1536f7 100644 --- a/auxmem.gfx.s +++ b/auxmem.gfx.s @@ -145,7 +145,10 @@ HGRPLOTACT LDA VDUQ+4 BEQ :LINE CMP #$40 BEQ :POINT - CMP #$90 + CMP #$60 + BNE :S1 + JMP :RECT +:S1 CMP #$90 BNE :UNDEF JMP :CIRC :UNDEF RTS @@ -177,6 +180,23 @@ HGRPLOTACT LDA VDUQ+4 STA FDRAWADDR+11 ; Y1 >>> WRTAUX >>> XF2MAIN,DRAWLINE +:RECT >>> WRTMAIN + LDA VDUQ+4 + STA PLOTMODE + LDA XPIXEL+0 + STA FDRAWADDR+6 + LDA XPIXEL+1 + STA FDRAWADDR+7 + LDA YPIXEL + STA FDRAWADDR+8 + LDA VDUQ+5 + STA FDRAWADDR+9 ; LSB of X1 + LDA VDUQ+6 + STA FDRAWADDR+10 ; MSB of X1 + LDA VDUQ+7 + STA FDRAWADDR+11 ; Y1 + >>> WRTAUX + >>> XF2MAIN,FILLRECT :CIRC >>> WRTMAIN LDA XPIXEL+0 STA FDRAWADDR+6 diff --git a/mainmem.gfx.s b/mainmem.gfx.s index 1dc2858..4d2dc6a 100644 --- a/mainmem.gfx.s +++ b/mainmem.gfx.s @@ -60,6 +60,12 @@ FILLCIRC >>> ENTMAIN JSR FDRAWADDR+40 ; FDRAW: FillCircle >>> XF2AUX,VDU25RET +* Call FDraw FillRect routine +FILLRECT >>> ENTMAIN + JSR SETCOLOR + JSR FDRAWADDR+34 ; FDRAW: FillRect + >>> XF2AUX,VDU25RET + * Reset colours and linetype GFXINIT JSR FDRAWADDR+0 ; Initialize FDRAW library LDA #$20