diff --git a/dither-image.js b/dither-image.js index 1241eb8..4aa7252 100644 --- a/dither-image.js +++ b/dither-image.js @@ -698,14 +698,6 @@ function genAssembly(width, height, nbits, lines, reps) { .export frame1_palette2_odd .export frame1_palette3_even .export frame1_palette3_odd -.export frame2_top -.export frame2_bottom -.export frame2_palette1_even -.export frame2_palette1_odd -.export frame2_palette2_even -.export frame2_palette2_odd -.export frame2_palette3_even -.export frame2_palette3_odd .export displaylist .segment "BUFFERS" @@ -744,38 +736,6 @@ ${byte2byte(frames[0].bitmap.slice(half))} -.align 4096 -frame2_top: -${byte2byte(frames[1].bitmap.slice(0, half))} - -.align 128 -frame2_palette1_even: -${byte2byte(even(frames[1].palette1))} - -.align 128 -frame2_palette1_odd: -${byte2byte(odd(frames[1].palette1))} - -.align 128 -frame2_palette2_even: -${byte2byte(even(frames[1].palette2))} - -.align 128 -frame2_palette2_odd: -${byte2byte(odd(frames[1].palette2))} - -.align 128 -frame2_palette3_even: -${byte2byte(even(frames[1].palette3))} - -.align 128 -frame2_palette3_odd: -${byte2byte(odd(frames[1].palette3))} - -.align 4096 -frame2_bottom: -${byte2byte(frames[1].bitmap.slice(half))} - .align 1024 displaylist: ; 40 lines overscan @@ -798,28 +758,6 @@ displaylist: .byte $0e .endrep - .byte $41 ; jump and blank - .addr displaylist_part2 - -displaylist_part2: - ; 40 lines overscan - .repeat 5 - .byte $70 ; 8 blank lines - .endrep - - ; 160 lines graphics - ; ANTIC mode e (160px 2bpp, 1 scan line per line) - .byte $4e - .addr frame2_top - .repeat ${linesEach / 2 - 1} - .byte $0e - .endrep - .byte $4e - .addr frame2_bottom - .repeat ${linesEach / 2 - 1} - .byte $0e - .endrep - .byte $41 ; jump and blank .addr displaylist `; @@ -873,7 +811,7 @@ async function main() { } let nbits = 2; - let reps = 2; + let reps = 1; let {width, height, lines} = await convert(process.argv[2], nbits, reps); diff --git a/dither4.s b/dither4.s index 010df89..0730b97 100644 --- a/dither4.s +++ b/dither4.s @@ -50,14 +50,6 @@ scanline_max = (lines_per_frame - scanline_offset) / 2 .import frame1_palette2_odd .import frame1_palette3_even .import frame1_palette3_odd -.import frame2_top -.import frame2_bottom -.import frame2_palette1_even -.import frame2_palette1_odd -.import frame2_palette2_even -.import frame2_palette2_odd -.import frame2_palette3_even -.import frame2_palette3_odd .import displaylist audio_high_byte: @@ -242,13 +234,8 @@ wait_loop: .endmacro each_frame: - lda frame_counter ; 3 cycles - beq run_frame1 ; 2 cycles - jmp run_frame2 ; 3 cycles run_frame1: run_frame 0 -run_frame2: - run_frame 8192 .endproc