diff --git a/Makefile b/Makefile index 8d9353b35..abb55f202 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,8 @@ dsk: asm bin/buildhelp.sh "build/HELPFUL" "build/helper.inc" >>build/log $(ACME) -r build/helper.lst src/helper/helper.a >>build/log bin/buildokvs.sh "res/ATTRACT.CONF" "build/ATTRACT.DATA" >>build/log - for f in res/TITLE res/COVER res/HELP res/GAMES.CONF build/ATTRACT.DATA res/FX.CONF 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/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/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/src/prodos.path.a b/src/prodos.path.a index 89325545b..7a6c3a40b 100644 --- a/src/prodos.path.a +++ b/src/prodos.path.a @@ -118,9 +118,9 @@ kAttractModeDataFile !byte 12 !raw "ATTRACT.DATA" -kFXConfFile +kFXDataFile !byte 7 - !raw "FX.CONF" + !raw "FX.DATA" kDFXConfFile !byte 8 diff --git a/src/ui.attract.hgr.a b/src/ui.attract.hgr.a index b177dd607..2f573a299 100644 --- a/src/ui.attract.hgr.a +++ b/src/ui.attract.hgr.a @@ -67,14 +67,10 @@ HGRSingle ; $6000..$BFFF contains transition effect code ;------------------------------------------------------------------------------ LoadHGRTransition - jsr LoadFile ; load HGR transition effects list into $8000 + jsr LoadFile ; load HGR transition effects list into $6000 !word kRootDirectory - !word kFXConfFile -- !word $8000 - jsr ParseKeyValueList ; parse HGR transition effects list into $6000 - !word gFXStore - !word - - !byte 0 + !word kFXDataFile + !word $6000 jsr pref_get ; get HGR transition effect from prefs !word kNextFX