diff --git a/demos/lovebyte2024/d2v/Makefile b/demos/lovebyte2024/dtv_1k/Makefile similarity index 96% rename from demos/lovebyte2024/d2v/Makefile rename to demos/lovebyte2024/dtv_1k/Makefile index e5914f97..6c404622 100644 --- a/demos/lovebyte2024/d2v/Makefile +++ b/demos/lovebyte2024/dtv_1k/Makefile @@ -46,7 +46,7 @@ DONT_COMPRESS.zx02: DONT_COMPRESS DONT_COMPRESS: dont_compress.o ld65 -o DONT_COMPRESS dont_compress.o -C $(LINKERSCRIPTS)/apple2_2000.inc -dont_compress.o: dont_compress.s graphics/scene.hgr +dont_compress.o: dont_compress.s graphics/scene.hgr still.s ca65 -o dont_compress.o dont_compress.s -l dont_compress.lst ### diff --git a/demos/lovebyte2024/dtv_1k/SA.ED b/demos/lovebyte2024/dtv_1k/SA.ED new file mode 100644 index 00000000..ce72e4ec Binary files /dev/null and b/demos/lovebyte2024/dtv_1k/SA.ED differ diff --git a/demos/lovebyte2024/d2v/dont2.s b/demos/lovebyte2024/dtv_1k/dont2.s similarity index 100% rename from demos/lovebyte2024/d2v/dont2.s rename to demos/lovebyte2024/dtv_1k/dont2.s diff --git a/demos/lovebyte2024/d2v/dont_compress.s b/demos/lovebyte2024/dtv_1k/dont_compress.s similarity index 100% rename from demos/lovebyte2024/d2v/dont_compress.s rename to demos/lovebyte2024/dtv_1k/dont_compress.s diff --git a/demos/lovebyte2024/d2v/dont_new.s b/demos/lovebyte2024/dtv_1k/dont_new.s similarity index 98% rename from demos/lovebyte2024/d2v/dont_new.s rename to demos/lovebyte2024/dtv_1k/dont_new.s index 1d5c6faf..7d4d3fc0 100644 --- a/demos/lovebyte2024/d2v/dont_new.s +++ b/demos/lovebyte2024/dtv_1k/dont_new.s @@ -4,9 +4,11 @@ dont_new: - jsr HGR +; jsr HGR - jsr opener +; jsr opener + + .include "opener.s" ; inlined @@ -176,4 +178,4 @@ exit: compressed_data: .incbin "DONT_COMPRESS.zx02" -.include "opener.s" + diff --git a/demos/lovebyte2024/d2v/graphics/Makefile b/demos/lovebyte2024/dtv_1k/graphics/Makefile similarity index 100% rename from demos/lovebyte2024/d2v/graphics/Makefile rename to demos/lovebyte2024/dtv_1k/graphics/Makefile diff --git a/demos/lovebyte2024/d2v/graphics/scene.png b/demos/lovebyte2024/dtv_1k/graphics/scene.png similarity index 100% rename from demos/lovebyte2024/d2v/graphics/scene.png rename to demos/lovebyte2024/dtv_1k/graphics/scene.png diff --git a/demos/lovebyte2024/d2v/hello.bas b/demos/lovebyte2024/dtv_1k/hello.bas similarity index 100% rename from demos/lovebyte2024/d2v/hello.bas rename to demos/lovebyte2024/dtv_1k/hello.bas diff --git a/demos/lovebyte2024/d2v/opener.s b/demos/lovebyte2024/dtv_1k/opener.s similarity index 67% rename from demos/lovebyte2024/d2v/opener.s rename to demos/lovebyte2024/dtv_1k/opener.s index f02fe859..03b1debd 100644 --- a/demos/lovebyte2024/d2v/opener.s +++ b/demos/lovebyte2024/dtv_1k/opener.s @@ -1,36 +1,21 @@ ; draws a circle pattern -; by Vince `deater` Weaver / DsR - -.if 0 -; zero page locations -GBASL = $26 -GBASH = $27 -HGR_SCALE = $E7 -HGR_ROTATION = $F9 - -; ROM locations -HGR2 = $F3D8 -HPOSN = $F411 -XDRAW0 = $F65D -XDRAW1 = $F661 -HPLOT0 = $F457 -.endif - opener: - sta HGR_ROTATION + ; A=0 from HGR + + lda #$20 sta HGR_SCALE - -; jsr HGR2 ; Hi-res, full screen ; 3 - ; Y=0, A=0 after this call + jsr HGR + sta HGR_ROTATION ; A and Y are 0 here. ; X is left behind by the boot process? tiny_loop: - ldy #0 + tay +; ldy #0 ldx #140 lda #96 jsr HPOSN ; set screen position to X= (y,x) Y=(a) @@ -57,7 +42,7 @@ done_circle: lda #250 jsr WAIT - rts +; rts our_shape = $E2E2 diff --git a/demos/lovebyte2024/d2v/still.s b/demos/lovebyte2024/dtv_1k/still.s similarity index 90% rename from demos/lovebyte2024/d2v/still.s rename to demos/lovebyte2024/dtv_1k/still.s index f939aa19..bb2f80d1 100644 --- a/demos/lovebyte2024/d2v/still.s +++ b/demos/lovebyte2024/dtv_1k/still.s @@ -2,11 +2,10 @@ ; still... still: + jsr HOME bit SET_TEXT -; HLINE = $F819 ; HLINE Y,$2C at A -; VLINE = $F828 ; VLINE A,$2D at Y lda #'*'|$80 sta COLOR @@ -40,7 +39,7 @@ still: lda #1 ldy #39 jsr VLINE - +.if 0 ;============== ; set screen for wrap @@ -66,7 +65,7 @@ opening_loop: jsr COUT1 iny bne opening_loop ; bra - +.endif ;=========================== ; play music and draw loop @@ -98,10 +97,14 @@ play_music: lda #>music_data sta MADDRH - jsr play_ed +; jsr play_ed -done_music: - jmp done_music +.include "duet.s" + + ; we crash! + +;done_music: +; jmp done_music display_lyrics_ed: @@ -116,6 +119,7 @@ display_lyrics_ed: rts +.if 0 opening: .byte 13 .byte " ,:/;=",13 @@ -128,10 +132,11 @@ opening: .byte " . . -H @@M ",13 .byte " =MMM@MH +M@+ MX",13 .byte " ,++ .MMMM= ",0 +.endif -.include "duet.s" +;.include "duet.s" music_data: -.incbin "SA.ED" +.incbin "SA.ED",$0,$100 diff --git a/demos/lovebyte2024/d2v/still_old.s b/demos/lovebyte2024/dtv_1k/still_old.s similarity index 100% rename from demos/lovebyte2024/d2v/still_old.s rename to demos/lovebyte2024/dtv_1k/still_old.s diff --git a/demos/lovebyte2024/d2v/zp.inc b/demos/lovebyte2024/dtv_1k/zp.inc similarity index 100% rename from demos/lovebyte2024/d2v/zp.inc rename to demos/lovebyte2024/dtv_1k/zp.inc diff --git a/demos/lovebyte2024/d2v/zx02_optim.s b/demos/lovebyte2024/dtv_1k/zx02_optim.s similarity index 100% rename from demos/lovebyte2024/d2v/zx02_optim.s rename to demos/lovebyte2024/dtv_1k/zx02_optim.s