merge FX and DFX

bin/buildfx.js

@@ -1,5 +1,6 @@
 a = new ActiveXObject("scripting.filesystemobject")
 x = new ActiveXObject("wscript.shell")
+fx_off = a.fileexists(WScript.Arguments(2)) ? a.getFile(WScript.Arguments(2)).size : 0
 x.run('cmd /c bin\\buildfxful.bat ' + WScript.Arguments(0) + ' ' + WScript.Arguments(2) + ' ' + WScript.Arguments(3), 0, 1)
 
 b = a.opentextfile(WScript.Arguments(0))
@@ -34,7 +35,6 @@ while (!b.atendofstream)
   }
 }
 
-fx_off = 0
 groups = "*=0\n" + "!le16 " + entries.length.toString() + ", 0\n"
 
 for (i = 0; i < entries.length; i++)

bin/buildfxful.bat

@@ -1,6 +1,5 @@
 @echo off
 setlocal enabledelayedexpansion
-1>nul copy /y nul %2
 for /f "tokens=*" %%a in (%1) do (
 set f=0
 call :x %%a

src/constants.a

@@ -7,7 +7,7 @@
 ;
 ; LC RAM BANK 1
 ; D000..E789 - persistent data structures (gGlobalPrefsStore, gGamesListStore)
-; E95C..FFEE - main program code
+; E966..FFEE - main program code
 ; FFEF..FFF9 - API functions and global constants available for main program
 ;              code, prelaunchers, transition effects, &c.
 ;              (LoadFileDirect, Wait/UnwaitForVBL, MockingboardStuff, MachineStatus)
@@ -16,8 +16,8 @@
 ; LC RAM BANK 2
 ; D000..D3FF - ProRWTS data
 ; D400..D6B6 - ProRWTS code
-; D6B7..DB84 - HGR font code & ProRWTS glue code
-; DB85..DB94 - backup of stack (during gameplay and self-running demos)
+; D6B7..DB88 - HGR font code & ProRWTS glue code
+; DB89..DB98 - backup of stack (during gameplay and self-running demos)
 ; ...unused...
 ; DBB4..DBFF - (de)acceleration function
 ; DC00..DFFF - HGR font data
@@ -150,7 +150,7 @@ iCurBlockLo    = $D401               ; constant
 iCurBlockHi    = $D403               ; constant
 launchpatch    = $D655               ; glue.launch.a
 iAddToPath     = $FE64               ; Roger Rabbit, avoid, use Infiltrator 2 style instead
-itraverse      = $D92F               ; Roger Rabbit, avoid, use Infiltrator 2 style instead
+itraverse      = $D933               ; Roger Rabbit, avoid, use Infiltrator 2 style instead
 ldrhi          = $56                 ; constant
 namlo          = $57                 ; constant
 namhi          = $58                 ; constant

src/prodos.impl.lc2.a

@@ -218,6 +218,7 @@ resetval=$f0
          jsr   @set_rdwrbuff
          ldx   #0
          stx   blkidx
+         stx   treeidx
          stx   blkofflo
          stx   blkoffhi
          stx   reqcmd
@@ -248,6 +249,7 @@ resetval=$f0
          ora   ldrlo
          bne   @jmp_zp
          dec   blkidx
+         sta   treeidx
 @link_jmpzp
          beq   @jmp_zp ;always
 
@@ -317,11 +319,11 @@ resetval=$f0
          stx   dirbufpatch10+1
          stx   dirbufpatch11+1
          stx   dirbufpatch12+1
-         stx   dirbufpatch13+1
+         stx   dirbufpatch13+2
          inx
          stx   dirbufpatch5+2
          stx   dirbufpatch8+2
-         stx   dirbufpatch14+1
+         stx   dirbufpatch14+2
 @close_ret
          rts
 

src/prodos.path.a

@@ -142,10 +142,6 @@ kDFXIndexFile
          !byte 7
          !raw  "DFX.IDX"
 
-kDFXFile
-         !byte 7
-         !raw  "DFX.ALL"
-
 kGameHelpIndexFile
          !byte 12
          !raw  "GAMEHELP.IDX"

src/ui.attract.dhgr.a

@@ -155,7 +155,7 @@ LoadDHGRTransition
 +        !word $FDFD                 ; SMC
 
          jsr   LoadIndexedFile
-         !word kDFXFile
+         !word kFXFile
          !word $6000
 @indexRecordPtr
          !word $FDFD                 ; SMC

winmake.bat

@@ -56,8 +56,9 @@ rem
 rem precompute FX and DFX indexes and merged data files containing multiple
 rem graphic effects in a single file (loaded at runtime by LoadIndexedFile())
 rem
+1>nul copy /y nul build\FX.ALL
 cscript /nologo bin\buildfx.js res\FX.CONF build\FX.IDX build\FX.ALL build\FX.INDEXED >>build\log
-cscript /nologo bin\buildfx.js res\DFX.CONF build\DFX.IDX build\DFX.ALL build\FX.INDEXED >>build\log
+cscript /nologo bin\buildfx.js res\DFX.CONF build\DFX.IDX build\FX.ALL build\FX.INDEXED >>build\log
 rem
 rem substitute special characters in help text and other pages that will be
 rem drawn with DrawPage()
@@ -101,7 +102,6 @@ rem
 %CADIUS% ADDFILE "build\%DISK%" "/%VOLUME%/" "build\FX.IDX" >>build\log
 %CADIUS% ADDFILE "build\%DISK%" "/%VOLUME%/" "build\FX.ALL" >>build\log
 %CADIUS% ADDFILE "build\%DISK%" "/%VOLUME%/" "build\DFX.IDX" >>build\log
-%CADIUS% ADDFILE "build\%DISK%" "/%VOLUME%/" "build\DFX.ALL" >>build\log
 %CADIUS% ADDFILE "build\%DISK%" "/%VOLUME%/" "build\GAMEHELP.IDX" >>build\log
 %CADIUS% ADDFILE "build\%DISK%" "/%VOLUME%/" "build\GAMEHELP.ALL" >>build\log
 %CADIUS% ADDFILE "build\%DISK%" "/%VOLUME%/" "build\SLIDESHOW.IDX" >>build\log