demos: move some demos around

demos/TODO

@@ -0,0 +1,2 @@
+lores_escape -- get the mockingboard access under 10 cycles
+

demos/kfest2018/Makefile

@@ -1,7 +1,7 @@
-include ../Makefile.inc
+include ../../Makefile.inc
 
-DOS33 = ../dos33fs-utils/dos33
+DOS33 = ../../utils/dos33fs-utils/dos33
-TOKENIZE = ../asoft_basic-utils/tokenize_asoft
+TOKENIZE = ../../utils/asoft_basic-utils/tokenize_asoft
 
 all:	kfest18.dsk
 
@@ -16,13 +16,13 @@ RASTER.lz4: RASTER
 	lz4 -f -16 RASTER
 
 RASTER:	raster.o
-	ld65 -o RASTER raster.o -C ../linker_scripts/apple2_2000.inc
+	ld65 -o RASTER raster.o -C ../../linker_scripts/apple2_2000.inc
 
 raster_decompress.o:	raster_decompress.s RASTER.lz4
 	ca65 -o raster_decompress.o raster_decompress.s
 
 RASTER_C:	raster_decompress.o
-	ld65 -o RASTER_C raster_decompress.o -C ../linker_scripts/apple2_1000.inc
+	ld65 -o RASTER_C raster_decompress.o -C ../../linker_scripts/apple2_1000.inc
 
 
 
@@ -31,7 +31,7 @@ raster2.o:	raster2.s
 	ca65 -o raster2.o raster2.s -l raster2.lst
 
 RASTER2:	raster2.o
-	ld65 -o RASTER2 raster2.o -C ../linker_scripts/apple2_1000.inc
+	ld65 -o RASTER2 raster2.o -C ../../linker_scripts/apple2_1000.inc
 
 
 clean:	

demos/lores_escape/Makefile

@@ -1,11 +1,13 @@
-include ../Makefile.inc
+include ../../Makefile.inc
+
+DOS33 = ../../utils/dos33fs-utils/dos33
+PNG2RLE = ../../utils/gr-utils/png2rle
+PNG2LZ4 = ../../utils/gr-utils/png2lz4
+PNG_TO_40x96 = ../../utils/gr-utils/png_to_40x96
+PNG_TO_40x48D = ../../utils/gr-utils/png_to_40x48d
+B2D = ../../utils/bmp2dhr/b2d
+TOKENIZE = ../../utils/asoft_basic-utils/tokenize_asoft
 
-DOS33 = ../dos33fs-utils/dos33
-PNG2RLE = ../gr-utils/png2rle
-PNG2LZ4 = ../gr-utils/png2lz4
-PNG_TO_40x96 = ../gr-utils/png_to_40x96
-PNG_TO_40x48D = ../gr-utils/png_to_40x48d
-B2D = ../bmp2dhr/b2d
 
 all:	demosplash2019.dsk
 
@@ -20,13 +22,13 @@ demosplash2019.dsk:	HELLO LOADER DEMOSPLASH
 
 
 HELLO:  hello.bas
-	../asoft_basic-utils/tokenize_asoft < hello.bas > HELLO
+	$(TOKENIZE) < hello.bas > HELLO
 
 
 #####
 
 #DEMOSPLASH:	demosplash.o
-#	ld65 -o DEMOSPLASH demosplash.o -C ../linker_scripts/apple2_1700.inc
+#	ld65 -o DEMOSPLASH demosplash.o -C ../../linker_scripts/apple2_1700.inc
 
 #demosplash.o:	demosplash.s \
 #	zp.inc hardware.inc \
@@ -45,7 +47,7 @@ HELLO:  hello.bas
 #####
 
 DEMOSPLASH:	demosplash.o
-	ld65 -o DEMOSPLASH demosplash.o -C ../linker_scripts/apple2_1400.inc
+	ld65 -o DEMOSPLASH demosplash.o -C ../../linker_scripts/apple2_1400.inc
 
 demosplash.o:	demosplash.s \
 	zp.inc hardware.inc \
@@ -73,7 +75,7 @@ demosplash.o:	demosplash.s \
 #####
 
 LOADER:	loader.o
-	ld65 -o LOADER loader.o -C ../linker_scripts/apple2_1000.inc
+	ld65 -o LOADER loader.o -C ../../linker_scripts/apple2_1000.inc
 
 loader.o:	loader.s
 	ca65 -o loader.o loader.s -l loader.lst
@@ -112,3 +114,5 @@ k_40_48d.inc:   k_40_48d.png
 clean:		
 		rm -f *~ *.o *.lst *.lz4 HELLO \
 			DEMOSPLASH
+		cd ansi && make clean
+		cd generator && make clean

demos/lores_escape/README

@@ -0,0 +1,13 @@
+Apple II Lores Escape Demo
+
+presented at Demosplash 2019 (came in 3rd retro demo)
+
+was doing too much that year
+
+had to fix bugs (with memory not being inited to zero) right before
+it was presented
+
+struggled with the sound transition from cycle-counted to interrupt
+driven
+
+bass sound still not 100% great much to Dya's disappointment

demos/lores_escape/generator/Makefile

@@ -23,4 +23,4 @@ offsets2.o:	offsets2.c
 	$(CC) $(CFLAGS) -c offsets2.c
 
 clean:
-	rm -f *.o creator offsets offsets2
+	rm -f *~ *.o creator offsets offsets2