diff --git a/Makefile b/Makefile index 16954f696..350d7c862 100644 --- a/Makefile +++ b/Makefile @@ -27,6 +27,7 @@ asm: md $(ACME) src/fx/fx.hgr.interlock.lr.a $(ACME) src/fx/fx.hgr.spiral.a $(ACME) src/fx/fx.hgr.fizzle.a + $(ACME) src/fx/fx.hgr.bar.dissolve.a dsk: md asm $(CADIUS) CREATEVOLUME build/"$(DISK)" "${VOLUME}" 32766KB >>build/log @@ -51,7 +52,7 @@ dsk: md asm $(CADIUS) ADDFOLDER build/"$(DISK)" "/${VOLUME}/DEMO" "build/DEMO" >>build/log rsync -aP res/fx/* build/FX >>build/log $(CADIUS) ADDFOLDER build/"$(DISK)" "/${VOLUME}/FX" "build/FX" >>build/log -# bin/do2po.py res/dsk/ build/po/ + bin/do2po.py res/dsk/ build/po/ # rsync -a res/dsk/*.po build/po/ # bin/extract.py build/po/ | sh >build/log # rm -f build/X/**/.DS_Store diff --git a/res/attract.conf b/res/attract.conf index 2d89a3193..cfe46a9a8 100644 --- a/res/attract.conf +++ b/res/attract.conf @@ -1 +1 @@ -# # Mega-Attract-Mode configuration file # # Mega-Attract-Mode is split into modules. Each module can be a # short slideshow or a self-running demo (like a game's built-in # 'attract mode'). Modules are run in the order listed here, one # after the next, until interrupted by user input. The last-run # module is tracked in the master prefs file. # # Format: # key=value # # value must be one of # 1 for HGR slideshow (key is a file containing a list of HGR graphics) # 2 for DHGR slideshow (key is a file containing a list of DHGR graphics) # 3 for self-running demo (key is an executable binary file) # # Blank lines and lines beginning with '#' are ignored (like this one!) # A line beginning with '[' terminates the parsing # SHORT.CONF=1 FAVORITES.CONF=1 #WAVY.NAVY=3 AB.CONF=1 BRODERBUND.CONF=1 DHGR.CONF=2 ACTIVISION.CONF=1 CD.CONF=1 ATARI.CONF=1 EFG.CONF=1 SIERRA.CONF=1 DATAMOST.CONF=1 HIJKL.CONF=1 DATASOFT.CONF=1 MNO.CONF=1 MICROFUN.CONF=1 PQR.CONF=1 PICCADILLY.CONF=1 S.CONF=1 SIRIUS.CONF=1 T.CONF=1 [eof] \ No newline at end of file +# # Mega-Attract-Mode configuration file # # Mega-Attract-Mode is split into modules. Each module can be a # short slideshow or a self-running demo (like a game's built-in # 'attract mode'). Modules are run in the order listed here, one # after the next, until interrupted by user input. The last-run # module is tracked in the master prefs file. # # Format: # key=value # # value must be one of # 1 for HGR slideshow (key is a file containing a list of HGR graphics) # 2 for DHGR slideshow (key is a file containing a list of DHGR graphics) # 3 for self-running demo (key is an executable binary file) # # Blank lines and lines beginning with '#' are ignored (like this one!) # A line beginning with '[' terminates the parsing # #SHORT.CONF=1 FAVORITES.CONF=1 WAVY.NAVY=3 AB.CONF=1 BRODERBUND.CONF=1 DHGR.CONF=2 ACTIVISION.CONF=1 CD.CONF=1 ATARI.CONF=1 EFG.CONF=1 SIERRA.CONF=1 DATAMOST.CONF=1 HIJKL.CONF=1 DATASOFT.CONF=1 MNO.CONF=1 MICROFUN.CONF=1 PQR.CONF=1 PICCADILLY.CONF=1 S.CONF=1 SIRIUS.CONF=1 T.CONF=1 [eof] \ No newline at end of file diff --git a/res/fx.conf b/res/fx.conf index 16158f380..2b3cb4d53 100644 --- a/res/fx.conf +++ b/res/fx.conf @@ -1 +1 @@ -# # transition effects for HGR slideshows # IRIS FIZZLE INTERLOCK.UD DIAGONAL SPIRAL INTERLOCK.LR [eof] \ No newline at end of file +# # transition effects for HGR slideshows # BAR.DISSOLVE IRIS FIZZLE INTERLOCK.UD DIAGONAL SPIRAL INTERLOCK.LR [eof] \ No newline at end of file diff --git a/res/fx/_FileInformation.txt b/res/fx/_FileInformation.txt index c11f02ee5..fe0985b59 100644 --- a/res/fx/_FileInformation.txt +++ b/res/fx/_FileInformation.txt @@ -4,3 +4,4 @@ INTERLOCK.UD=Type(06),AuxType(6000),Access(C3) INTERLOCK.LR=Type(06),AuxType(6000),Access(C3) IRIS=Type(06),AuxType(6000),Access(C3) SPIRAL=Type(06),AuxType(6000),Access(C3) +BAR.DISSOLVE=Type(06),AuxType(6000),Access(C3) diff --git a/src/fx/fx.hgr.bar.dissolve.a b/src/fx/fx.hgr.bar.dissolve.a new file mode 100644 index 000000000..b6ff1524d --- /dev/null +++ b/src/fx/fx.hgr.bar.dissolve.a @@ -0,0 +1,40 @@ +!cpu 6502 +!to "build/FX/BAR.DISSOLVE",plain +*=$6000 + +row1 = $fe +row2 = $ff + + lda #$00 + sta row1 + lda #$BF + sta row2 +@loop lda row1 + jsr HGRCalc + ldy #$27 +- lda ($3c),y + sta ($26),y + dey + dey + bpl - + lda row2 + jsr HGRCalc + ldy #$26 +- lda ($3c),y + sta ($26),y + dey + dey + bpl - + lda #$30 + jsr WaitForKeyWithTimeout + lda $C000 + bmi @exit + inc row1 + dec row2 + lda row1 + cmp #$C0 + bne @loop +@exit rts + + !source "src/wait.a" + !source "src/fx/fx.hgr.common.a"