diff --git a/demos/second/NOTES b/demos/second/NOTES index 3635e67d..2cc67046 100644 --- a/demos/second/NOTES +++ b/demos/second/NOTES @@ -25,8 +25,8 @@ qload 4k 1 16 ; pause to load again? -10 transmission: 4k? 27 16 $2000-$2FFF -11 ocean: 24k 28 96 ??? +10 transmission: 4k? 27 16 $8000-$8FFF +11 ocean: 24k 28 96 $2000-$7FFF 12 polar: 4k 34 16 $1000-$1FFF ========================= diff --git a/demos/second/TODO b/demos/second/TODO index cdbb826a..efe70298 100644 --- a/demos/second/TODO +++ b/demos/second/TODO @@ -1,6 +1,14 @@ TODO CREDITS -+ credit french touch for plasma -+ credit ZX02 ++ Break out code use + + credit french touch for plasma + + credit ZX02 + + Qkumba - disk code + + 4am - font + + iipix + + oliver - sound + +TODO MUSIC ++ be sure to mute channels when pausing DISK I diff --git a/demos/second/qload.s b/demos/second/qload.s index be752f71..f38d0807 100644 --- a/demos/second/qload.s +++ b/demos/second/qload.s @@ -183,8 +183,8 @@ start_address: aux_dest: .byte $D0,$D0,$A0,$A0 ; MUSIC_INTRO, MUSIC_MAIN, INTRO, CHESS .byte $70,$50,$40,$30 ; GORILLA,LEAVES,LENS,PLASMA - .byte $20,$10,$80,$A0 ; CUBE,DOTS,SPHERES,OCEAN - .byte $A0 ; POLAR + .byte $20,$10,$80,$20 ; CUBE,DOTS,SPHERES,OCEAN + .byte $10 ; POLAR track_array: .byte 2,4,10,15 ; MUSIC_INTRO, MUSIC_MAIN, INTRO, CHESS diff --git a/demos/second/start.s b/demos/second/start.s index 3eded505..1642f49e 100644 --- a/demos/second/start.s +++ b/demos/second/start.s @@ -233,7 +233,46 @@ load_program_loop: ;======================= ;======================= - ; TODO + ; disable music + + sei + + + ;============================= + ; want to load 10..12 + + lda #10 + sta COUNT + +load_program_loop2: + ;============================ + ; load next program to MAIN $6000 + + ; load from disk + + lda COUNT ; which one + sta WHICH_LOAD + jsr load_file + + ; copy to proper AUX location + + ldx COUNT + lda aux_dest,X ; load AUX dest + pha + + ldy #$60 ; MAIN src $6000 + + lda length_array,X ; number of pages + tax ; in X + pla ; restore AUX dest to A + + jsr copy_main_aux + + inc COUNT + lda COUNT + cmp #13 + bne load_program_loop2 + ;========================== ;========================== @@ -244,15 +283,35 @@ load_program_loop: ;======================= ; run SPHERES ;============================================ + ; copy SPHERES from AUX $8000 to MAIN $8000 - ; TODO + lda #$80 ; AUX src $8000 + ldy #$80 ; MAIN dest $8000 + ldx #16 ; 16 pages + jsr copy_aux_main + jsr $8000 + ;======================= + ; run OCEAN + ;======================= + ; copy OCEAN from AUX $2000 to MAIN $6000 + + lda #$20 ; AUX src $1000 + ldy #$60 ; MAIN dest $6000 + ldx #96 ; 16 pages + jsr copy_aux_main + jsr $6000 ;======================= ; run POLAR - ;============================================ + ;======================= + ; copy POLAR from AUX $1000 to MAIN $8000 - ; TODO + lda #$10 ; AUX src $1000 + ldy #$80 ; MAIN dest $8000 + ldx #16 ; 16 pages + jsr copy_aux_main + jsr $8000 ; setup music ocean=pattern24 (3:07) pattern#43 ; lda #43