diff --git a/res/attract.conf b/res/attract.conf index cfe46a9a8..e10cfd37a 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 DHGR.CONF=2 BRODERBUND.CONF=1 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 fe74db5b5..1d1ea838e 100644 --- a/res/fx.conf +++ b/res/fx.conf @@ -1 +1 @@ -# # transition effects for HGR slideshows # BLOCK.MOSAIC BLOCK.FIZZLE IRIS FIZZLE INTERLOCK.UD DIAGONAL SPIRAL INTERLOCK.LR BAR.DISSOLVE [eof] \ No newline at end of file +# # 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 diff --git a/res/ss/FAVORITES.CONF b/res/ss/FAVORITES.CONF index bc7a42529..9be29d1ac 100644 --- a/res/ss/FAVORITES.CONF +++ b/res/ss/FAVORITES.CONF @@ -1 +1 @@ -# # slideshow of favorite title screens # DUNG.BEETLES MR.ROBOT MOON.PATROL HERO DROL MONTEZUMA DAVIDS.MAGIC CRAZY.MAZY SPYS.DEMISE WAVY.NAVY DIG.DUG PAPERBOY TUBEWAY PRINCEUNP LOST.TOMB NIBBLER SNAKE.BYTE SWASHBUCKLER POOYAN TAPPER GOONIES PLASMANIA PITFALL.II ALCAZAR SABOTAGE FROGGER GORGON CONAN NIGHT.MISSION DINO.EGGS FALCONS BRUCE.LEE BCS.QUEST JOUST [eof] \ No newline at end of file +# # slideshow of favorite title screens # POOYAN TAPPER GOONIES PLASMANIA PITFALL.II ALCAZAR SABOTAGE FROGGER GORGON CONAN NIGHT.MISSION DINO.EGGS FALCONS BRUCE.LEE BCS.QUEST JOUST DUNG.BEETLES MR.ROBOT MOON.PATROL HERO DROL MONTEZUMA DAVIDS.MAGIC CRAZY.MAZY SPYS.DEMISE WAVY.NAVY DIG.DUG PAPERBOY TUBEWAY PRINCEUNP LOST.TOMB NIBBLER SNAKE.BYTE SWASHBUCKLER [eof] \ No newline at end of file diff --git a/src/fx/fx.hgr.interlock.lr.a b/src/fx/fx.hgr.interlock.lr.a index a3e992bf2..81a87fa42 100644 --- a/src/fx/fx.hgr.interlock.lr.a +++ b/src/fx/fx.hgr.interlock.lr.a @@ -2,72 +2,40 @@ !to "build/FX/INTERLOCK.LR",plain *=$6000 -index1 = $FE -index2 = $FF +row = $FF - lda #$27 - sta index1 lda #$00 - sta index2 + sta @h1 + lda #$27 + sta @h2 @outerloop - ldy #$5F ; logical row index -@innerloop - lda @data1,y - sta @sub2+2 - clc - adc #$20 - sta @sub1+2 - lda @data2,y - sta @sub1+1 - sta @sub2+1 - lda @data3,y - sta @sub4+2 - clc - adc #$20 - sta @sub3+2 - lda @data4,y - sta @sub3+1 - sta @sub4+1 - ldx index1 -@sub1 lda $FDFD,x -@sub2 sta $FDFD,x - ldx index2 -@sub3 lda $FDFD,x -@sub4 sta $FDFD,x - dey - bpl @innerloop - lda #$40 + lda #$BF + sta row +@loop lda row + jsr HGRCalc +@h1=*+1 + ldy #$00 + lda ($3c),y + sta ($26),y + dec row + lda row + jsr HGRCalc +@h2=*+1 + ldy #$27 + lda ($3c),y + sta ($26),y + dec row + lda row + cmp #$FF + bne @loop + lda #$20 jsr WaitForKeyWithTimeout lda $C000 bmi @exit - inc index2 - dec index1 + inc @h1 + dec @h2 bpl @outerloop @exit rts -@data1 !hex 20283038202830382129313921293139 - !hex 222A323A222A323A232B333B232B333B - !hex 20283038202830382129313921293139 - !hex 222A323A222A323A232B333B232B333B - !hex 20283038202830382129313921293139 - !hex 222A323A222A323A232B333B232B333B -@data2 !hex 00000000808080800000000080808080 - !hex 00000000808080800000000080808080 - !hex 28282828A8A8A8A828282828A8A8A8A8 - !hex 28282828A8A8A8A828282828A8A8A8A8 - !hex 50505050D0D0D0D050505050D0D0D0D0 - !hex 50505050D0D0D0D050505050D0D0D0D0 -@data3 !hex 3F372F273F372F273E362E263E362E26 - !hex 3D352D253D352D253C342C243C342C24 - !hex 3F372F273F372F273E362E263E362E26 - !hex 3D352D253D352D253C342C243C342C24 - !hex 3F372F273F372F273E362E263E362E26 - !hex 3D352D253D352D253C342C243C342C24 -@data4 !hex D0D0D0D050505050D0D0D0D050505050 - !hex D0D0D0D050505050D0D0D0D050505050 - !hex A8A8A8A828282828A8A8A8A828282828 - !hex A8A8A8A828282828A8A8A8A828282828 - !hex 80808080000000008080808000000000 - !hex 80808080000000008080808000000000 - !source "src/wait.a" + !source "src/fx/fx.hgr.common.a"