From eafd31134e51785ed2459f1135a1b2b97e6e2a55 Mon Sep 17 00:00:00 2001 From: 4am Date: Tue, 30 Oct 2018 21:28:14 -0400 Subject: [PATCH] add fx/fx.hgr.2pass.lr --- Makefile | 1 + res/fx.conf | 2 +- res/fx/_FileInformation.txt | 1 + src/fx/fx.hgr.2pass.lr.a | 60 +++++++++++++++++++++++++++++++++++++ 4 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 src/fx/fx.hgr.2pass.lr.a diff --git a/Makefile b/Makefile index 69b3a82c1..17be83f02 100644 --- a/Makefile +++ b/Makefile @@ -30,6 +30,7 @@ asm: md $(ACME) src/fx/fx.hgr.bar.dissolve.a $(ACME) src/fx/fx.hgr.block.fizzle.a $(ACME) src/fx/fx.hgr.block.mosaic.a + $(ACME) src/fx/fx.hgr.2pass.lr.a dsk: md asm $(CADIUS) CREATEVOLUME build/"$(DISK)" "${VOLUME}" 32766KB >>build/log diff --git a/res/fx.conf b/res/fx.conf index 1d1ea838e..884011850 100644 --- a/res/fx.conf +++ b/res/fx.conf @@ -1 +1 @@ -# # transition effects for HGR slideshows # INTERLOCK.LR BLOCK.MOSAIC IRIS FIZZLE INTERLOCK.UD BLOCK.FIZZLE DIAGONAL SPIRAL BAR.DISSOLVE [eof] \ No newline at end of file +# # transition effects for HGR slideshows # TWOPASS.LR INTERLOCK.LR BLOCK.MOSAIC IRIS FIZZLE INTERLOCK.UD BLOCK.FIZZLE DIAGONAL SPIRAL BAR.DISSOLVE [eof] \ No newline at end of file diff --git a/res/fx/_FileInformation.txt b/res/fx/_FileInformation.txt index d60e34101..0699766f6 100644 --- a/res/fx/_FileInformation.txt +++ b/res/fx/_FileInformation.txt @@ -7,3 +7,4 @@ SPIRAL=Type(06),AuxType(6000),Access(C3) BAR.DISSOLVE=Type(06),AuxType(6000),Access(C3) BLOCK.FIZZLE=Type(06),AuxType(6000),Access(C3) BLOCK.MOSAIC=Type(06),AuxType(6000),Access(C3) +TWOPASS.LR=Type(06),AuxType(6000),Access(C3) diff --git a/src/fx/fx.hgr.2pass.lr.a b/src/fx/fx.hgr.2pass.lr.a new file mode 100644 index 000000000..f42dc0750 --- /dev/null +++ b/src/fx/fx.hgr.2pass.lr.a @@ -0,0 +1,60 @@ +!cpu 6502 +!to "build/FX/TWOPASS.LR",plain +*=$6000 + +row = $FF + + lda #$00 + sta @h1 + sta @h2 +@outerloop1 + lda #$BF + sta row +@loop1 jsr HGRCalc +@h1=*+1 + ldy #$00 + lda ($3c),y + sta ($26),y + dec row + dec row + lda row + cmp #$FF + bne @loop1 + + lda #$10 + jsr WaitForKeyWithTimeout + lda $C000 + bmi @exit + + inc @h1 + lda @h1 + cmp #$28 + bne @outerloop1 + +@outerloop2 + lda #$BE + sta row +@loop2 jsr HGRCalc +@h2=*+1 + ldy #$00 + lda ($3c),y + sta ($26),y + dec row + dec row + lda row + cmp #$FE + bne @loop2 + + lda #$10 + jsr WaitForKeyWithTimeout + lda $C000 + bmi @exit + + inc @h2 + lda @h2 + cmp #$28 + bne @outerloop2 +@exit rts + + !source "src/wait.a" + !source "src/fx/fx.hgr.common.a"