diff --git a/src/mkrel b/src/mkrel index 89f22e6..fc8ca8f 100755 --- a/src/mkrel +++ b/src/mkrel @@ -73,6 +73,8 @@ cp scripts/fileio.4th prodos/sys/scripts/FILEIO.4TH.TXT cp scripts/grlib.4th prodos/sys/scripts/GRLIB.4TH.TXT cp scripts/dgrlib.4th prodos/sys/scripts/DGRLIB.4TH.TXT cp scripts/hgrlib.4th prodos/sys/scripts/HGRLIB.4TH.TXT +cp scripts/hgrtile.4th prodos/sys/scripts/HGRTILE.4TH.TXT +cp scripts/hgrfont.4th prodos/sys/scripts/HGRFONT.4TH.TXT cp scripts/turtle.4th prodos/sys/scripts/TURTLE.4TH.TXT cp scripts/grafix.4th prodos/sys/scripts/GRAFIX.4TH.TXT cp scripts/int32.4th prodos/sys/scripts/INT32.4TH.TXT diff --git a/src/scripts/hgrfont.4th b/src/scripts/hgrfont.4th new file mode 100644 index 0000000..48039a3 --- /dev/null +++ b/src/scripts/hgrfont.4th @@ -0,0 +1,4 @@ +' HGRPUTSTR ?ENDSRC +" HGRTILE" LOADMOD" " +" HGRFONT" LOADMOD" " +LOOKUP HGRPUTSTR PLASMA HGRPUTSTR diff --git a/src/scripts/hgrlib.4th b/src/scripts/hgrlib.4th index f43f326..f0fb150 100644 --- a/src/scripts/hgrlib.4th +++ b/src/scripts/hgrlib.4th @@ -1,8 +1,6 @@ ' HGRMODE ?ENDSRC " HGRLIB" LOADMOD" " " LINES" LOADMOD" " -" HGRTILE" LOADMOD" " -" HGRFONT" LOADMOD" " LOOKUP HGRPLOT PLASMA HGRPLOT LOOKUP HGRORPLOT PLASMA HGRORPLOT LOOKUP HGRXORPLOT PLASMA HGRXORPLOT @@ -24,14 +22,6 @@ LOOKUP HGRSHOW PLASMA HGRSHOW LOOKUP HGRSWAP PLASMA HGRSWAP LOOKUP HGRDRAWBUF PLASMA HGRDRAWBUF LOOKUP HGRCOLOR PLASMA HGRCOLOR -LOOKUP HGRPUTSTR PLASMA HGRPUTSTR LOOKUP SETLINESPANS PLASMA SETLINESPANS LOOKUP LINESPANS PLASMA HGRLINE LOOKUP HGRHLIN LOOKUP HGRVLIN SETLINESPANS -LOOKUP TILEDRAW PLASMA TILEDRAW -LOOKUP TILEXORDRAW PLASMA TILEXORDRAW -LOOKUP TILEORDRAW PLASMA TILEORDRAW -LOOKUP TILEANDDRAW PLASMA TILEANDDRAW -LOOKUP TILEDRAWSTR PLASMA TILEDRAWSTR -LOOKUP TILEFROMTEXT PLASMA TILEFROMTEXT -LOOKUP TILEDRAWBUF PLASMA TILEDRAWBUF diff --git a/src/scripts/hgrtile.4th b/src/scripts/hgrtile.4th new file mode 100644 index 0000000..9abca07 --- /dev/null +++ b/src/scripts/hgrtile.4th @@ -0,0 +1,9 @@ +' TILEDRAW ?ENDSRC +" HGRTILE" LOADMOD" " +LOOKUP TILEDRAW PLASMA TILEDRAW +LOOKUP TILEXORDRAW PLASMA TILEXORDRAW +LOOKUP TILEORDRAW PLASMA TILEORDRAW +LOOKUP TILEANDDRAW PLASMA TILEANDDRAW +LOOKUP TILEDRAWSTR PLASMA TILEDRAWSTR +LOOKUP TILEFROMTEXT PLASMA TILEFROMTEXT +LOOKUP TILEDRAWBUF PLASMA TILEDRAWBUF \ No newline at end of file diff --git a/src/scripts/hrbounce.4th b/src/scripts/hrbounce.4th index 547e793..663af9b 100644 --- a/src/scripts/hrbounce.4th +++ b/src/scripts/hrbounce.4th @@ -5,6 +5,7 @@ OR NOT ?ABORT" Must run with HRFORTH." SRC" PLASMA.4TH" SRC" CONIO.4TH" SRC" HGRLIB.4TH" +SRC" HGRFONT.4TH" 5 VARIABLE BALLCLR 10 VARIABLE BALLX diff --git a/src/scripts/hrplot.4th b/src/scripts/hrplot.4th index 33da3a4..636b440 100644 --- a/src/scripts/hrplot.4th +++ b/src/scripts/hrplot.4th @@ -8,11 +8,10 @@ FORGET MACHID SRC" PLASMA.4TH" SRC" FPU.4TH" -SRC" CONIO.4TH" SRC" HGRLIB.4TH" : DRAWAXIS - 0 HGRMODE HGRDRAWBUF TILEDRAWBUF DROP + 0 HGRMODE HGRDRAWBUF DROP 1 HGRCOLOR 0 96 279 96 HGRLINE 139 0 139 191 HGRLINE diff --git a/src/vmsrc/apple/cmdjitstub.s b/src/vmsrc/apple/cmdjitstub.s index 54c84bc..db12be5 100644 --- a/src/vmsrc/apple/cmdjitstub.s +++ b/src/vmsrc/apple/cmdjitstub.s @@ -9,7 +9,7 @@ JITCOMP = $03E2 JITCODE = $03E4 !SOURCE "vmsrc/plvmzp.inc" ;* -;* MOVE CMD DOWN TO $1000-$2000 +;* MOVE CMD DOWN TO $0C00-$1C00 ;* LDA #<_CMDBEGIN STA SRCL @@ -26,7 +26,7 @@ JITCODE = $03E4 BNE - INC SRCH INC DSTH - DEX ; STOP WHEN DST=$2000 REACHED + DEX ; STOP WHEN DST=$1C00 REACHED BNE - ; ; INIT VM ENVIRONMENT STACK POINTERS