From dab54e2a9657ce2c296a8be652864c670f5c998d Mon Sep 17 00:00:00 2001
From: 4am <a2_4am@sent.com>
Date: Wed, 6 Oct 2021 16:38:51 -0400
Subject: [PATCH] precompute gDFXStore data

---
 Makefile                 |  3 ++-
 res/_FileInformation.txt |  6 +++---
 src/prodos.path.a        |  4 ++--
 src/ui.attract.dhgr.a    | 10 +++-------
 4 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index abb55f202..d75000e75 100644
--- a/Makefile
+++ b/Makefile
@@ -35,7 +35,8 @@ dsk: asm
 	$(ACME) -r build/helper.lst src/helper/helper.a >>build/log
 	bin/buildokvs.sh "res/ATTRACT.CONF" "build/ATTRACT.DATA" >>build/log
 	bin/buildokvs.sh "res/FX.CONF" "build/FX.DATA" >>build/log
-	for f in res/TITLE res/COVER res/HELP res/GAMES.CONF build/ATTRACT.DATA build/FX.DATA res/DFX.CONF build/PREFS.CONF res/CREDITS res/HELPTEXT build/HELPER build/HELPFUL res/DECRUNCH res/JOYSTICK res/Finder.Data res/Finder.Root; do $(CADIUS) ADDFILE build/"$(DISK)" "/$(VOLUME)/" "$$f" >>build/log; done
+	bin/buildokvs.sh "res/DFX.CONF" "build/DFX.DATA" >>build/log
+	for f in res/TITLE res/COVER res/HELP res/GAMES.CONF build/ATTRACT.DATA build/FX.DATA build/DFX.DATA build/PREFS.CONF res/CREDITS res/HELPTEXT build/HELPER build/HELPFUL res/DECRUNCH res/JOYSTICK res/Finder.Data res/Finder.Root; do $(CADIUS) ADDFILE build/"$(DISK)" "/$(VOLUME)/" "$$f" >>build/log; done
 	bin/buildfileinfo.sh res/TITLE.HGR "06" "4000" >>build/log
 	bin/buildfileinfo.sh res/TITLE.DHGR "06" "4000" >>build/log
 	bin/buildfileinfo.sh res/ACTION.HGR "06" "3FF8" >>build/log
diff --git a/res/_FileInformation.txt b/res/_FileInformation.txt
index 16762515c..5d8cb4f97 100644
--- a/res/_FileInformation.txt
+++ b/res/_FileInformation.txt
@@ -3,9 +3,9 @@
 LAUNCHER.SYSTEM=Type(FF),AuxType(2000),Access(C3)
 PREFS.CONF=Type(04),AuxType(8000),Access(C3)
 GAMES.CONF=Type(04),AuxType(8000),Access(C3)
-ATTRACT.CONF=Type(04),AuxType(8000),Access(C3)
-FX.CONF=Type(04),AuxType(8000),Access(C3)
-DFX.CONF=Type(04),AuxType(8000),Access(C3)
+ATTRACT.DATA=Type(06),AuxType(6000),Access(C3)
+FX.DATA=Type(06),AuxType(6000),Access(C3)
+DFX.DATA=Type(06),AuxType(6000),Access(C3)
 COVER=Type(06),AuxType(2000),Access(C3)
 TITLE=Type(06),AuxType(2000),Access(C3)
 HELP=Type(06),AuxType(2000),Access(C3)
diff --git a/src/prodos.path.a b/src/prodos.path.a
index 7a6c3a40b..ba17096ef 100644
--- a/src/prodos.path.a
+++ b/src/prodos.path.a
@@ -122,9 +122,9 @@ kFXDataFile
          !byte 7
          !raw  "FX.DATA"
 
-kDFXConfFile
+kDFXDataFile
          !byte 8
-         !raw  "DFX.CONF"
+         !raw  "DFX.DATA"
 
 kCreditsFile
          !byte 7
diff --git a/src/ui.attract.dhgr.a b/src/ui.attract.dhgr.a
index 29306f719..0b532929a 100644
--- a/src/ui.attract.dhgr.a
+++ b/src/ui.attract.dhgr.a
@@ -136,14 +136,10 @@ gMachineInDHGRMode=*+1
 ;        $6000..$BFFF/main contains transition effect code
 ;------------------------------------------------------------------------------
 LoadDHGRTransition
-         jsr   LoadFile              ; load DHGR transition effects list into $8000
+         jsr   LoadFile              ; load DHGR transition effects list into $6000
          !word kRootDirectory
-         !word kDFXConfFile
--        !word $8000
-         jsr   ParseKeyValueList     ; parse DHGR transition effects list into $6000
-         !word gDFXStore
-         !word -
-         !byte 0
+         !word kDFXDataFile
+         !word $6000
 
          jsr   pref_get              ; get DHGR transition effect from prefs
          !word kNextDFX