From 802e58656125aabe7934b013137e77a405f81096 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Tue, 22 Oct 2024 23:56:54 -0400 Subject: [PATCH] driven: add some missing parts --- demos/driven/Makefile | 11 ++++++----- demos/driven/part00_intro/Makefile | 2 +- demos/driven/part00_intro/intro.s | 2 +- demos/driven/qload.s | 4 ++-- demos/driven/start.s | 10 +++++----- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/demos/driven/Makefile b/demos/driven/Makefile index f6cd5f44..dcb90498 100644 --- a/demos/driven/Makefile +++ b/demos/driven/Makefile @@ -10,14 +10,15 @@ all: driven.dsk driven.dsk: QBOOT QLOAD \ MUSIC \ - music.inc qload.inc + music.inc qload.inc \ + ./part00_intro/INTRO cp $(EMPTY_DISK) driven.dsk $(DOS33_RAW) driven.dsk 0 0 QBOOT 0 1 $(DOS33_RAW) driven.dsk 0 2 QBOOT 1 1 $(DOS33_RAW) driven.dsk 0 4 QBOOT 2 1 $(DOS33_RAW) driven.dsk 1 0 QLOAD 0 0 $(DOS33_RAW) driven.dsk 4 0 MUSIC 0 0 - + $(DOS33_RAW) driven.dsk 9 0 ./part00_intro/INTRO 0 0 #second_d1.dsk: QBOOT QLOAD \ # music.inc qload.inc \ @@ -60,8 +61,8 @@ driven.dsk: QBOOT QLOAD \ #### -part00_boot/FAKE_BIOS: - cd part00_boot && make +part00_intro/INTRO: + cd part00_intro && make part01_intropan/INTRO: cd part01_intropan && make @@ -230,7 +231,7 @@ generate_common.o: generate_common.c clean: rm -f *~ *.o *.lst HELLO SECOND QBOOT QLOAD MUSIC START rm -f qload.inc qload2.inc music.inc music2.inc - + cd part00_intro && make clean ### diff --git a/demos/driven/part00_intro/Makefile b/demos/driven/part00_intro/Makefile index 918c2027..0334ebe5 100644 --- a/demos/driven/part00_intro/Makefile +++ b/demos/driven/part00_intro/Makefile @@ -22,7 +22,7 @@ intro.o: intro.s \ ### -graphics/intro2.hgr.zx02: +graphics/desire.hgr.zx02: cd graphics && make ### diff --git a/demos/driven/part00_intro/intro.s b/demos/driven/part00_intro/intro.s index 193366d3..00d114e9 100644 --- a/demos/driven/part00_intro/intro.s +++ b/demos/driven/part00_intro/intro.s @@ -30,7 +30,7 @@ load_loop: bit SET_GR bit HIRES bit FULLGR -; bit PAGE1 + bit PAGE1 ; lda #0 ; jsr hgr_page1_clearscreen diff --git a/demos/driven/qload.s b/demos/driven/qload.s index aad940c4..a00ff901 100644 --- a/demos/driven/qload.s +++ b/demos/driven/qload.s @@ -172,13 +172,13 @@ load_address_array: .byte $D0,$D0,$80,$80 ; MUSIC_INTRO, MUSIC_MAIN, INTRO, CHESS .byte $60,$60,$60,$60 ; GORILLA,LEAVES,LENS,PLASMA .byte $60,$60,$60,$60 ; CUBE,DOTS,SPHERES,OCEAN - .byte $60,$60 ; POLAR,FAKE_BIOS + .byte $60,$80 ; POLAR,FAKE_BIOS start_address: .byte $D0,$D0,$80,$80 ; MUSIC_INTRO, MUSIC_MAIN, INTRO, CHESS .byte $60,$60,$60,$80 ; GORILLA,LEAVES,LENS,PLASMA .byte $80,$80,$80,$60 ; CUBE,DOTS,SPHERES,OCEAN - .byte $80,$60 ; POLAR,FAKE_BIOS + .byte $80,$80 ; POLAR,FAKE_BIOS aux_dest: .byte $D0,$D0,$A0,$A0 ; MUSIC_INTRO, MUSIC_MAIN, INTRO, CHESS diff --git a/demos/driven/start.s b/demos/driven/start.s index ce013308..d6129f53 100644 --- a/demos/driven/start.s +++ b/demos/driven/start.s @@ -139,7 +139,7 @@ load_program_loop: cmp #10 bne load_program_loop - +.endif ;======================= ;======================= ; Load intro @@ -148,10 +148,10 @@ load_program_loop: ; load from disk - lda #2 ; INTRO + lda #13 ; INTRO sta WHICH_LOAD jsr load_file -.endif + ;======================= ;======================= ; Run intro @@ -159,9 +159,9 @@ load_program_loop: ;======================= cli ; start music -.if 0 - jsr $8000 + jsr $8000 +.if 0 ;======================= ;=======================