diff --git a/demos/second/NOTES b/demos/second/NOTES index 1538afb7..ecc14fc6 100644 --- a/demos/second/NOTES +++ b/demos/second/NOTES @@ -16,10 +16,10 @@ ocean: 24k 90% polar: 5k 50% ========================= -DISK2: Track Sectors -~~~~~~ ~~~ ~~~~~~ -nuts: 8k 8 32 (2T) -credits: 16k 12 64 (4T) +DISK2: Track Sectors AUX +~~~~~~ ~~~ ~~~~~~ ~~~~ +nuts: 8k 8 32 (2T) $2000 +credits: 16k 12 64 (4T) $6000 3d: 32k 20 128 (8T) ============== 56k diff --git a/demos/second/part19_nuts/nuts.s b/demos/second/part19_nuts/nuts.s index 0d3fb63c..d416fef7 100644 --- a/demos/second/part19_nuts/nuts.s +++ b/demos/second/part19_nuts/nuts.s @@ -14,7 +14,7 @@ div7_table = $1d00 hposn_low = $1e00 hposn_high = $1f00 -intro_start: +nuts_start: ;===================== ; initializations ;===================== @@ -57,7 +57,7 @@ load_loop: jsr wait_until_keypress nuts_done: - jmp nuts_done + rts .align $100 diff --git a/demos/second/qload2.s b/demos/second/qload2.s index 8963044d..17ad0ae4 100644 --- a/demos/second/qload2.s +++ b/demos/second/qload2.s @@ -174,7 +174,7 @@ length_array: .byte 32, 128, 64, 32 ; MUSIC2, THREED, CREDITS, NUTS aux_address_array: - .byte $FF,$FF,$20,$40 ; MUSIC2, THREED, CREDITS, NUTS + .byte $FF,$FF,$60,$20 ; MUSIC2, THREED, CREDITS, NUTS .include "wait.s" diff --git a/demos/second/start2.s b/demos/second/start2.s index 55b49028..cff59ee3 100644 --- a/demos/second/start2.s +++ b/demos/second/start2.s @@ -95,14 +95,14 @@ load_loop: jsr load_file ;====================== - ; copy NUTS to AUX $4000 + ; copy NUTS to AUX $2000 - lda #$20 ; AUX dest $20 - ldy #$40 ; MAIN src + lda #$20 ; AUX dest $4000 + ldy #$60 ; MAIN src $6000 ldx #32 ; 64 pages jsr copy_main_aux - ;==================== + ;===================== ; load CREDITS to $6000 lda #2 ; CREDITS @@ -110,9 +110,9 @@ load_loop: jsr load_file ;=========================== - ; copy CREDITS to AUX $2000 + ; copy CREDITS to AUX $6000 - lda #$20 ; AUX dest $20 + lda #$60 ; AUX dest $60 ldy #$60 ; MAIN src ldx #64 ; 64 pages jsr copy_main_aux @@ -133,16 +133,25 @@ load_loop: ;======================= ; run NUTS - ;======================= + ;============================================ + ; copy NUTS from AUX $2000 to MAIN $6000 + + lda #$20 ; AUX src $2000 + ldy #$60 ; MAIN dest $6000 + ldx #32 ; 32 pages + jsr copy_aux_main + + ; run nuts + + jsr $6000 + ;======================= ; run CREDITS - ;======================= - ;============================================ - ; copy CREDITS from AUX $2000 to MAIN $8000 + ; copy CREDITS from AUX $6000 to MAIN $8000 - lda #$20 ; AUX src $2000 + lda #$60 ; AUX src $6000 ldy #$80 ; MAIN dest $8000 ldx #64 ; 64 pages jsr copy_aux_main