diff --git a/graphics/dhgr/Makefile b/graphics/dhgr/Makefile index d1b1a17f..cee84f15 100644 --- a/graphics/dhgr/Makefile +++ b/graphics/dhgr/Makefile @@ -5,16 +5,19 @@ TOKENIZE = ../../utils/asoft_basic-utils/tokenize_asoft B2D = ../../utils/bmp2dhr/b2d LZSA = ~/research/lzsa/lzsa/lzsa +EMPTY_DISK = ../../empty_disk/empty.dsk + all: dhgr.dsk -dhgr.dsk: HELLO RASTER RASTER2 RASTER3 RASTER4 BITS LOTS DHR_LOAD - cp empty.dsk dhgr.dsk +dhgr.dsk: HELLO RASTER RASTER2 RASTER3 RASTER4 RASTER4_GOOD BITS LOTS DHR_LOAD + cp $(EMPTY_DISK) dhgr.dsk $(DOS33) -y dhgr.dsk SAVE A HELLO $(DOS33) -y dhgr.dsk BSAVE -a 0x0300 RASTER $(DOS33) -y dhgr.dsk BSAVE -a 0x0300 RASTER2 $(DOS33) -y dhgr.dsk BSAVE -a 0x0300 RASTER3 $(DOS33) -y dhgr.dsk BSAVE -a 0x0300 RASTER4 + $(DOS33) -y dhgr.dsk BSAVE -a 0x0300 RASTER4_GOOD $(DOS33) -y dhgr.dsk BSAVE -a 0x1000 DHR_LOAD $(DOS33) -y dhgr.dsk BSAVE -a 0x0300 BITS $(DOS33) -y dhgr.dsk BSAVE -a 0x0300 LOTS @@ -74,6 +77,15 @@ raster4.o: raster4.s ### +RASTER4_GOOD: raster4.o + ld65 -o RASTER4_GOOD raster4.o -C ../../linker_scripts/apple2_300.inc + +raster4.o: raster4.s + ca65 -o raster4.o raster4.s -l raster4.lst + + +### + DHR_LOAD: dhr_load.o ld65 -o DHR_LOAD dhr_load.o -C ../../linker_scripts/apple2_1000.inc diff --git a/graphics/dhgr/empty.dsk b/graphics/dhgr/empty.dsk deleted file mode 100644 index b34eb519..00000000 Binary files a/graphics/dhgr/empty.dsk and /dev/null differ diff --git a/graphics/dhgr/raster4.s b/graphics/dhgr/raster4.s index e4e2d590..138f8923 100644 --- a/graphics/dhgr/raster4.s +++ b/graphics/dhgr/raster4.s @@ -1,3 +1,5 @@ +; Double hi-res Rasterbars + GBASL = $26 GBASH = $27 HGRPAGE = $E6 @@ -91,7 +93,7 @@ draw_line_color: ldy #0 jsr HPOSN ; put into GBASL addr of coord (Y,X),A -; ldy #39 + ldy #39 loop_it: ; set page2 sta $C055 ; 3