diff --git a/megademo/arrival.s b/megademo/arrival.s index 076081d7..cf22d3b7 100644 --- a/megademo/arrival.s +++ b/megademo/arrival.s @@ -169,7 +169,7 @@ ar_no_carry: ;================= lda FRAMEH ; 3 - cmp #30 ; 2 + cmp #32 ; 2 bne ar_not_done ; 3 jmp ar_all_done ar_not_done: @@ -181,8 +181,12 @@ ar_not_done: ; STATE2 = 5+5+4+3 = 17 ; STATE4 = 5+5+2+3+(2) =17 + ; looking at FRAMEH (orig 5,16,30) -> 9, 20, 32 + ; if 0 < 9 then STATE0 (waiting) $0 < $9 + ; if 9 < 20 then STATE2 (walking) $9 < $14 + ; if 20 < 32 then STATE4 (heart) $14 < $20 - cmp #5 ; 2 + cmp #9 ; 2 bcs ar_state_notzero ; bge ; 3 ar_state_zero: ; -1 @@ -191,7 +195,7 @@ ar_state_zero: ldx #0 ; 2 jmp ar_set_state ; 3 ar_state_notzero: - cmp #16 ; 2 + cmp #20 ; 2 bcs ar_state_four ; bge ; 3 ar_state_two: ; -1 @@ -660,12 +664,15 @@ heart_loop: rts ; 6 ar_heart_lookup_x: - .byte 14,14,13,13,14,14,14,14 + .byte 14,14,14,14,14,14,13,13,14,14,14,14 + ; .byte 14,14,15,15,14,14,14,14 - .byte 14,14,14,14,14,14,14,14 + + .byte 14,14,14,14 + ar_heart_lookup_y: ; HEART_Y - .byte 20,20,18,18,16,16,16,16 - .byte 16,16,16,16,16,16,16,16 + .byte 16,16,16,16,20,20,18,18,16,16,16,16 + .byte 16,16,16,16 heart_path: ; .byte $14,$20 diff --git a/megademo/falling_apple.s b/megademo/falling_apple.s index e05ebe19..8bc2afa5 100644 --- a/megademo/falling_apple.s +++ b/megademo/falling_apple.s @@ -196,7 +196,7 @@ fa_doneinc: ;==================== ; 7 cycles lda FRAMEH ; 3 - cmp #80 ; 2 + cmp #77 ; 2 beq fa_done ; 3 ; -1 diff --git a/megademo/music/CREATING_MUSIC_FILES b/megademo/music/CREATING_MUSIC_FILES new file mode 100644 index 00000000..5b68c6e8 --- /dev/null +++ b/megademo/music/CREATING_MUSIC_FILES @@ -0,0 +1,15 @@ +Load into wine VT.exe +To get from roughly 50Hz to 60Hz save with speed=4 + +Save, load into AY_emul + Click "PL" to bring up playlist + Right click on filename + Convert to YM6 + Make sure to save as 1MHz, 60Hz + +Now, break it into chunks + ~/research/vmw-meter.git/ay-3-8910/conversion_tools/ym5_to_mega + ~/research/vmw-meter.git/ay-3-8910/conversion_tools/ym5_to_mega ./mockingbird_fix4.ym + + By hand I used things like md5sum * | sort to find duplicates + diff --git a/megademo/music/mockingbird_fix.pt3 b/megademo/music/mockingbird_fix.pt3 new file mode 100644 index 00000000..81ff2316 Binary files /dev/null and b/megademo/music/mockingbird_fix.pt3 differ diff --git a/megademo/music/mockingbird_fix4.pt3 b/megademo/music/mockingbird_fix4.pt3 new file mode 100644 index 00000000..8374fb80 Binary files /dev/null and b/megademo/music/mockingbird_fix4.pt3 differ diff --git a/megademo/music_chunks/mock.ah.00 b/megademo/music_chunks.old/mock.ah.00 similarity index 100% rename from megademo/music_chunks/mock.ah.00 rename to megademo/music_chunks.old/mock.ah.00 diff --git a/megademo/music_chunks/mock.ah.02 b/megademo/music_chunks.old/mock.ah.02 similarity index 100% rename from megademo/music_chunks/mock.ah.02 rename to megademo/music_chunks.old/mock.ah.02 diff --git a/megademo/music_chunks/mock.ah.03 b/megademo/music_chunks.old/mock.ah.03 similarity index 100% rename from megademo/music_chunks/mock.ah.03 rename to megademo/music_chunks.old/mock.ah.03 diff --git a/megademo/music_chunks/mock.ah.04 b/megademo/music_chunks.old/mock.ah.04 similarity index 100% rename from megademo/music_chunks/mock.ah.04 rename to megademo/music_chunks.old/mock.ah.04 diff --git a/megademo/music_chunks/mock.ah.05 b/megademo/music_chunks.old/mock.ah.05 similarity index 100% rename from megademo/music_chunks/mock.ah.05 rename to megademo/music_chunks.old/mock.ah.05 diff --git a/megademo/music_chunks/mock.ah.07 b/megademo/music_chunks.old/mock.ah.07 similarity index 100% rename from megademo/music_chunks/mock.ah.07 rename to megademo/music_chunks.old/mock.ah.07 diff --git a/megademo/music_chunks/mock.ah.10 b/megademo/music_chunks.old/mock.ah.10 similarity index 100% rename from megademo/music_chunks/mock.ah.10 rename to megademo/music_chunks.old/mock.ah.10 diff --git a/megademo/music_chunks/mock.ah.11 b/megademo/music_chunks.old/mock.ah.11 similarity index 100% rename from megademo/music_chunks/mock.ah.11 rename to megademo/music_chunks.old/mock.ah.11 diff --git a/megademo/music_chunks/mock.ah.30 b/megademo/music_chunks.old/mock.ah.30 similarity index 100% rename from megademo/music_chunks/mock.ah.30 rename to megademo/music_chunks.old/mock.ah.30 diff --git a/megademo/music_chunks/mock.al.00 b/megademo/music_chunks.old/mock.al.00 similarity index 100% rename from megademo/music_chunks/mock.al.00 rename to megademo/music_chunks.old/mock.al.00 diff --git a/megademo/music_chunks/mock.al.02 b/megademo/music_chunks.old/mock.al.02 similarity index 100% rename from megademo/music_chunks/mock.al.02 rename to megademo/music_chunks.old/mock.al.02 diff --git a/megademo/music_chunks/mock.bh.00 b/megademo/music_chunks.old/mock.bh.00 similarity index 100% rename from megademo/music_chunks/mock.bh.00 rename to megademo/music_chunks.old/mock.bh.00 diff --git a/megademo/music_chunks/mock.bh.01 b/megademo/music_chunks.old/mock.bh.01 similarity index 100% rename from megademo/music_chunks/mock.bh.01 rename to megademo/music_chunks.old/mock.bh.01 diff --git a/megademo/music_chunks/mock.bh.04 b/megademo/music_chunks.old/mock.bh.04 similarity index 100% rename from megademo/music_chunks/mock.bh.04 rename to megademo/music_chunks.old/mock.bh.04 diff --git a/megademo/music_chunks/mock.bh.05 b/megademo/music_chunks.old/mock.bh.05 similarity index 100% rename from megademo/music_chunks/mock.bh.05 rename to megademo/music_chunks.old/mock.bh.05 diff --git a/megademo/music_chunks/mock.bh.07 b/megademo/music_chunks.old/mock.bh.07 similarity index 100% rename from megademo/music_chunks/mock.bh.07 rename to megademo/music_chunks.old/mock.bh.07 diff --git a/megademo/music_chunks/mock.bh.08 b/megademo/music_chunks.old/mock.bh.08 similarity index 100% rename from megademo/music_chunks/mock.bh.08 rename to megademo/music_chunks.old/mock.bh.08 diff --git a/megademo/music_chunks/mock.bh.10 b/megademo/music_chunks.old/mock.bh.10 similarity index 100% rename from megademo/music_chunks/mock.bh.10 rename to megademo/music_chunks.old/mock.bh.10 diff --git a/megademo/music_chunks/mock.bh.11 b/megademo/music_chunks.old/mock.bh.11 similarity index 100% rename from megademo/music_chunks/mock.bh.11 rename to megademo/music_chunks.old/mock.bh.11 diff --git a/megademo/music_chunks/mock.bh.22 b/megademo/music_chunks.old/mock.bh.22 similarity index 100% rename from megademo/music_chunks/mock.bh.22 rename to megademo/music_chunks.old/mock.bh.22 diff --git a/megademo/music_chunks/mock.bh.23 b/megademo/music_chunks.old/mock.bh.23 similarity index 100% rename from megademo/music_chunks/mock.bh.23 rename to megademo/music_chunks.old/mock.bh.23 diff --git a/megademo/music_chunks/mock.bh.30 b/megademo/music_chunks.old/mock.bh.30 similarity index 100% rename from megademo/music_chunks/mock.bh.30 rename to megademo/music_chunks.old/mock.bh.30 diff --git a/megademo/music_chunks/mock.bl.00 b/megademo/music_chunks.old/mock.bl.00 similarity index 100% rename from megademo/music_chunks/mock.bl.00 rename to megademo/music_chunks.old/mock.bl.00 diff --git a/megademo/music_chunks/mock.bl.01 b/megademo/music_chunks.old/mock.bl.01 similarity index 100% rename from megademo/music_chunks/mock.bl.01 rename to megademo/music_chunks.old/mock.bl.01 diff --git a/megademo/music_chunks/mock.bl.02 b/megademo/music_chunks.old/mock.bl.02 similarity index 100% rename from megademo/music_chunks/mock.bl.02 rename to megademo/music_chunks.old/mock.bl.02 diff --git a/megademo/music_chunks/mock.bl.07 b/megademo/music_chunks.old/mock.bl.07 similarity index 100% rename from megademo/music_chunks/mock.bl.07 rename to megademo/music_chunks.old/mock.bl.07 diff --git a/megademo/music_chunks/mock.bl.10 b/megademo/music_chunks.old/mock.bl.10 similarity index 100% rename from megademo/music_chunks/mock.bl.10 rename to megademo/music_chunks.old/mock.bl.10 diff --git a/megademo/music_chunks/mock.bl.11 b/megademo/music_chunks.old/mock.bl.11 similarity index 100% rename from megademo/music_chunks/mock.bl.11 rename to megademo/music_chunks.old/mock.bl.11 diff --git a/megademo/music_chunks/mock.bl.22 b/megademo/music_chunks.old/mock.bl.22 similarity index 100% rename from megademo/music_chunks/mock.bl.22 rename to megademo/music_chunks.old/mock.bl.22 diff --git a/megademo/music_chunks/mock.bl.23 b/megademo/music_chunks.old/mock.bl.23 similarity index 100% rename from megademo/music_chunks/mock.bl.23 rename to megademo/music_chunks.old/mock.bl.23 diff --git a/megademo/music_chunks/mock.ch.00 b/megademo/music_chunks.old/mock.ch.00 similarity index 100% rename from megademo/music_chunks/mock.ch.00 rename to megademo/music_chunks.old/mock.ch.00 diff --git a/megademo/music_chunks/mock.ch.03 b/megademo/music_chunks.old/mock.ch.03 similarity index 100% rename from megademo/music_chunks/mock.ch.03 rename to megademo/music_chunks.old/mock.ch.03 diff --git a/megademo/music_chunks/mock.ch.04 b/megademo/music_chunks.old/mock.ch.04 similarity index 100% rename from megademo/music_chunks/mock.ch.04 rename to megademo/music_chunks.old/mock.ch.04 diff --git a/megademo/music_chunks/mock.ch.05 b/megademo/music_chunks.old/mock.ch.05 similarity index 100% rename from megademo/music_chunks/mock.ch.05 rename to megademo/music_chunks.old/mock.ch.05 diff --git a/megademo/music_chunks/mock.ch.07 b/megademo/music_chunks.old/mock.ch.07 similarity index 100% rename from megademo/music_chunks/mock.ch.07 rename to megademo/music_chunks.old/mock.ch.07 diff --git a/megademo/music_chunks/mock.ch.08 b/megademo/music_chunks.old/mock.ch.08 similarity index 100% rename from megademo/music_chunks/mock.ch.08 rename to megademo/music_chunks.old/mock.ch.08 diff --git a/megademo/music_chunks/mock.ch.09 b/megademo/music_chunks.old/mock.ch.09 similarity index 100% rename from megademo/music_chunks/mock.ch.09 rename to megademo/music_chunks.old/mock.ch.09 diff --git a/megademo/music_chunks/mock.ch.10 b/megademo/music_chunks.old/mock.ch.10 similarity index 100% rename from megademo/music_chunks/mock.ch.10 rename to megademo/music_chunks.old/mock.ch.10 diff --git a/megademo/music_chunks/mock.ch.11 b/megademo/music_chunks.old/mock.ch.11 similarity index 100% rename from megademo/music_chunks/mock.ch.11 rename to megademo/music_chunks.old/mock.ch.11 diff --git a/megademo/music_chunks/mock.ch.22 b/megademo/music_chunks.old/mock.ch.22 similarity index 100% rename from megademo/music_chunks/mock.ch.22 rename to megademo/music_chunks.old/mock.ch.22 diff --git a/megademo/music_chunks/mock.ch.23 b/megademo/music_chunks.old/mock.ch.23 similarity index 100% rename from megademo/music_chunks/mock.ch.23 rename to megademo/music_chunks.old/mock.ch.23 diff --git a/megademo/music_chunks/mock.ch.30 b/megademo/music_chunks.old/mock.ch.30 similarity index 100% rename from megademo/music_chunks/mock.ch.30 rename to megademo/music_chunks.old/mock.ch.30 diff --git a/megademo/music_chunks/mock.cl.00 b/megademo/music_chunks.old/mock.cl.00 similarity index 100% rename from megademo/music_chunks/mock.cl.00 rename to megademo/music_chunks.old/mock.cl.00 diff --git a/megademo/music_chunks/mock.cl.03 b/megademo/music_chunks.old/mock.cl.03 similarity index 100% rename from megademo/music_chunks/mock.cl.03 rename to megademo/music_chunks.old/mock.cl.03 diff --git a/megademo/music_chunks/mock.cl.04 b/megademo/music_chunks.old/mock.cl.04 similarity index 100% rename from megademo/music_chunks/mock.cl.04 rename to megademo/music_chunks.old/mock.cl.04 diff --git a/megademo/music_chunks/mock.cl.05 b/megademo/music_chunks.old/mock.cl.05 similarity index 100% rename from megademo/music_chunks/mock.cl.05 rename to megademo/music_chunks.old/mock.cl.05 diff --git a/megademo/music_chunks/mock.cl.07 b/megademo/music_chunks.old/mock.cl.07 similarity index 100% rename from megademo/music_chunks/mock.cl.07 rename to megademo/music_chunks.old/mock.cl.07 diff --git a/megademo/music_chunks/mock.cl.08 b/megademo/music_chunks.old/mock.cl.08 similarity index 100% rename from megademo/music_chunks/mock.cl.08 rename to megademo/music_chunks.old/mock.cl.08 diff --git a/megademo/music_chunks/mock.cl.09 b/megademo/music_chunks.old/mock.cl.09 similarity index 100% rename from megademo/music_chunks/mock.cl.09 rename to megademo/music_chunks.old/mock.cl.09 diff --git a/megademo/music_chunks/mock.cl.10 b/megademo/music_chunks.old/mock.cl.10 similarity index 100% rename from megademo/music_chunks/mock.cl.10 rename to megademo/music_chunks.old/mock.cl.10 diff --git a/megademo/music_chunks/mock.cl.11 b/megademo/music_chunks.old/mock.cl.11 similarity index 100% rename from megademo/music_chunks/mock.cl.11 rename to megademo/music_chunks.old/mock.cl.11 diff --git a/megademo/music_chunks/mock.cl.22 b/megademo/music_chunks.old/mock.cl.22 similarity index 100% rename from megademo/music_chunks/mock.cl.22 rename to megademo/music_chunks.old/mock.cl.22 diff --git a/megademo/music_chunks/mock.cl.23 b/megademo/music_chunks.old/mock.cl.23 similarity index 100% rename from megademo/music_chunks/mock.cl.23 rename to megademo/music_chunks.old/mock.cl.23 diff --git a/megademo/music_chunks/mock.cl.30 b/megademo/music_chunks.old/mock.cl.30 similarity index 100% rename from megademo/music_chunks/mock.cl.30 rename to megademo/music_chunks.old/mock.cl.30 diff --git a/megademo/music_chunks/mock.nh.00 b/megademo/music_chunks.old/mock.nh.00 similarity index 100% rename from megademo/music_chunks/mock.nh.00 rename to megademo/music_chunks.old/mock.nh.00 diff --git a/megademo/music_chunks/mock.nh.01 b/megademo/music_chunks.old/mock.nh.01 similarity index 100% rename from megademo/music_chunks/mock.nh.01 rename to megademo/music_chunks.old/mock.nh.01 diff --git a/megademo/music_chunks/mock.nh.02 b/megademo/music_chunks.old/mock.nh.02 similarity index 100% rename from megademo/music_chunks/mock.nh.02 rename to megademo/music_chunks.old/mock.nh.02 diff --git a/megademo/music_chunks/mock.nh.03 b/megademo/music_chunks.old/mock.nh.03 similarity index 100% rename from megademo/music_chunks/mock.nh.03 rename to megademo/music_chunks.old/mock.nh.03 diff --git a/megademo/music_chunks/mock.nh.04 b/megademo/music_chunks.old/mock.nh.04 similarity index 100% rename from megademo/music_chunks/mock.nh.04 rename to megademo/music_chunks.old/mock.nh.04 diff --git a/megademo/music_chunks/mock.nh.05 b/megademo/music_chunks.old/mock.nh.05 similarity index 100% rename from megademo/music_chunks/mock.nh.05 rename to megademo/music_chunks.old/mock.nh.05 diff --git a/megademo/music_chunks/mock.nh.07 b/megademo/music_chunks.old/mock.nh.07 similarity index 100% rename from megademo/music_chunks/mock.nh.07 rename to megademo/music_chunks.old/mock.nh.07 diff --git a/megademo/music_chunks/mock.nh.08 b/megademo/music_chunks.old/mock.nh.08 similarity index 100% rename from megademo/music_chunks/mock.nh.08 rename to megademo/music_chunks.old/mock.nh.08 diff --git a/megademo/music_chunks/mock.nh.09 b/megademo/music_chunks.old/mock.nh.09 similarity index 100% rename from megademo/music_chunks/mock.nh.09 rename to megademo/music_chunks.old/mock.nh.09 diff --git a/megademo/music_chunks/mock.nh.10 b/megademo/music_chunks.old/mock.nh.10 similarity index 100% rename from megademo/music_chunks/mock.nh.10 rename to megademo/music_chunks.old/mock.nh.10 diff --git a/megademo/music_chunks/mock.nh.11 b/megademo/music_chunks.old/mock.nh.11 similarity index 100% rename from megademo/music_chunks/mock.nh.11 rename to megademo/music_chunks.old/mock.nh.11 diff --git a/megademo/music_chunks/mock.nh.23 b/megademo/music_chunks.old/mock.nh.23 similarity index 100% rename from megademo/music_chunks/mock.nh.23 rename to megademo/music_chunks.old/mock.nh.23 diff --git a/megademo/music_chunks/mock.nh.30 b/megademo/music_chunks.old/mock.nh.30 similarity index 100% rename from megademo/music_chunks/mock.nh.30 rename to megademo/music_chunks.old/mock.nh.30 diff --git a/megademo/music_chunks/mock.nl.00 b/megademo/music_chunks.old/mock.nl.00 similarity index 100% rename from megademo/music_chunks/mock.nl.00 rename to megademo/music_chunks.old/mock.nl.00 diff --git a/megademo/music_chunks/mock.nl.03 b/megademo/music_chunks.old/mock.nl.03 similarity index 100% rename from megademo/music_chunks/mock.nl.03 rename to megademo/music_chunks.old/mock.nl.03 diff --git a/megademo/music_chunks/mock.nl.04 b/megademo/music_chunks.old/mock.nl.04 similarity index 100% rename from megademo/music_chunks/mock.nl.04 rename to megademo/music_chunks.old/mock.nl.04 diff --git a/megademo/music_chunks/mock.nl.05 b/megademo/music_chunks.old/mock.nl.05 similarity index 100% rename from megademo/music_chunks/mock.nl.05 rename to megademo/music_chunks.old/mock.nl.05 diff --git a/megademo/music_chunks/mock.nl.07 b/megademo/music_chunks.old/mock.nl.07 similarity index 100% rename from megademo/music_chunks/mock.nl.07 rename to megademo/music_chunks.old/mock.nl.07 diff --git a/megademo/music_chunks/mock.nl.10 b/megademo/music_chunks.old/mock.nl.10 similarity index 100% rename from megademo/music_chunks/mock.nl.10 rename to megademo/music_chunks.old/mock.nl.10 diff --git a/megademo/music_chunks/mock.nl.11 b/megademo/music_chunks.old/mock.nl.11 similarity index 100% rename from megademo/music_chunks/mock.nl.11 rename to megademo/music_chunks.old/mock.nl.11 diff --git a/megademo/music_chunks/mock.nl.30 b/megademo/music_chunks.old/mock.nl.30 similarity index 100% rename from megademo/music_chunks/mock.nl.30 rename to megademo/music_chunks.old/mock.nl.30 diff --git a/megademo/music_chunks/out b/megademo/music_chunks.old/out similarity index 100% rename from megademo/music_chunks/out rename to megademo/music_chunks.old/out