diff --git a/Makefile b/Makefile index 924a6be83..29cec594d 100644 --- a/Makefile +++ b/Makefile @@ -31,17 +31,17 @@ dsk: asm $(CADIUS) ADDFILE build/"$(DISK)" "/$(VOLUME)/" "build/LAUNCHER.SYSTEM" >>build/log rsync -aP res/PREFS.CONF build/PREFS.CONF >> build/log bin/padto.sh 512 build/PREFS.CONF >>build/log - bin/buildhelp.sh "res/GAMES.CONF" "build/HELP.DATA" "build/HELPFUL" >>build/log - bin/buildokvs.sh "res/ATTRACT.CONF" "build/ATTRACT.DATA" >>build/log - bin/buildfx.sh "res/FX.CONF" "build/FX.DATA" "build/FXFUL" "build/FX" >>build/log - bin/buildfx.sh "res/DFX.CONF" "build/DFX.DATA" "build/DFXFUL" "build/FX" >>build/log - rm -f build/SSDIR.CONF && touch build/SSDIR.CONF + bin/buildhelp.sh "res/GAMES.CONF" "build/GAMEHELP.IDX" "build/GAMEHELP.ALL" >>build/log + bin/buildokvs.sh "res/ATTRACT.CONF" "build/ATTRACT.IDX" >>build/log + bin/buildfx.sh "res/FX.CONF" "build/FX.IDX" "build/FX.ALL" "build/FX" >>build/log + bin/buildfx.sh "res/DFX.CONF" "build/DFX.IDX" "build/DFX.ALL" "build/FX" >>build/log + rm -f build/SSDIR.CONF && touch build/SSDIR.CONF >>build/log for f in res/SS/*; do bin/buildokvs.sh "$$f" "build/SS/$$(basename $$f)" && echo "$$(basename $$f)" >> build/SSDIR.CONF; done >>build/log - bin/buildfx.sh "build/SSDIR.CONF" "build/SS.DATA" "build/SSFUL" "build/SS" >>build/log - rm -f build/ATTRACTDIR.CONF && touch build/ATTRACTDIR.CONF + bin/buildfx.sh "build/SSDIR.CONF" "build/SLIDESHOW.IDX" "build/SLIDESHOW.ALL" "build/SS" >>build/log + rm -f build/ATTRACTDIR.CONF && touch build/ATTRACTDIR.CONF >>build/log for f in res/ATTRACT/*; do bin/buildokvs.sh "$$f" "build/ATTRACT/$$(basename $$f)" && echo "$$(basename $$f)" >> build/ATTRACTDIR.CONF; done >>build/log - bin/buildfx.sh "build/ATTRACTDIR.CONF" "build/ATTRACTIVE" "build/ATTRACTFUL" "build/ATTRACT" >>build/log - for f in res/TITLE res/COVER res/HELP res/GAMES.CONF build/PREFS.CONF res/CREDITS res/HELPTEXT build/ATTRACT.DATA build/FX.DATA build/FXFUL build/DFX.DATA build/DFXFUL build/HELP.DATA build/HELPFUL build/SS.DATA build/SSFUL build/ATTRACTIVE build/ATTRACTFUL res/DECRUNCH res/JOYSTICK res/Finder.Data res/Finder.Root; do $(CADIUS) ADDFILE build/"$(DISK)" "/$(VOLUME)/" "$$f" >>build/log; done + bin/buildfx.sh "build/ATTRACTDIR.CONF" "build/MINIATTRACT.IDX" "build/MINIATTRACT.ALL" "build/ATTRACT" >>build/log + for f in res/TITLE res/COVER res/HELP res/GAMES.CONF build/PREFS.CONF res/CREDITS res/HELPTEXT build/ATTRACT.IDX build/FX.IDX build/FX.ALL build/DFX.IDX build/DFX.ALL build/GAMEHELP.IDX build/GAMEHELP.ALL build/SLIDESHOW.IDX build/SLIDESHOW.ALL build/MINIATTRACT.IDX build/MINIATTRACT.ALL 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 8572dfb19..525e3a0b7 100644 --- a/res/_FileInformation.txt +++ b/res/_FileInformation.txt @@ -3,22 +3,22 @@ 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.DATA=Type(06),AuxType(6000),Access(C3) -ATTRACTFUL=Type(06),AuxType(6000),Access(C3) -ATTRACTIVE=Type(06),AuxType(6000),Access(C3) -FX.DATA=Type(06),AuxType(6000),Access(C3) -DFX.DATA=Type(06),AuxType(6000),Access(C3) -FXFUL=Type(06),AuxType(6000),Access(C3) -DFXFUL=Type(06),AuxType(6000),Access(C3) +ATTRACT.IDX=Type(06),AuxType(6000),Access(C3) +MINIATTRACT.IDX=Type(06),AuxType(6000),Access(C3) +MINIATTRACT.ALL=Type(06),AuxType(6000),Access(C3) +FX.IDX=Type(06),AuxType(6000),Access(C3) +FX.ALL=Type(06),AuxType(6000),Access(C3) +DFX.IDX=Type(06),AuxType(6000),Access(C3) +DFX.ALL=Type(06),AuxType(6000),Access(C3) +GAMEHELP.IDX=Type(06),AuxType(6000),Access(C3) +GAMEHELP.ALL=Type(04),AuxType(6000),Access(C3) +SLIDESHOW.IDX=Type(06),AuxType(4000),Access(C3) +SLIDESHOW.ALL=Type(06),AuxType(0800),Access(C3) COVER=Type(06),AuxType(2000),Access(C3) TITLE=Type(06),AuxType(2000),Access(C3) HELP=Type(06),AuxType(2000),Access(C3) CREDITS=Type(04),AuxType(6000),Access(C3) -HELP.DATA=Type(06),AuxType(6000),Access(C3) HELPTEXT=Type(04),AuxType(6000),Access(C3) -HELPFUL=Type(04),AuxType(6000),Access(C3) -SS.DATA=Type(06),AuxType(4000),Access(C3) -SSFUL=Type(06),AuxType(0800),Access(C3) DECRUNCH=Type(06),AuxType(0200),Access(C3) JOYSTICK=Type(06),AuxType(0800),Access(C3) Finder.Data=Type(C9),AuxType(0000),Access(E7) diff --git a/src/constants.a b/src/constants.a index 631a1d6a4..6fc0eb9f2 100644 --- a/src/constants.a +++ b/src/constants.a @@ -151,7 +151,7 @@ iProDOS_enter = $D670 LoadFileDirect = $DAF9 iAuxReq = $DB1F launchpatch = $D60E -iAddToPath = $FE97 +iAddToPath = $FE78 itraverse = $D8D8 ldrhi = $56 namlo = $57 diff --git a/src/prodos.path.a b/src/prodos.path.a index f1820408b..b61f4a156 100644 --- a/src/prodos.path.a +++ b/src/prodos.path.a @@ -81,18 +81,6 @@ kSHRArtworkDirectory !byte 12 !raw "ARTWORK.SHR/" -kMiniAttractDataFile - !byte 10 - !raw "ATTRACTIVE" - -kAttractModeSlideshowDataFile - !byte 7 - !raw "SS.DATA" - -kAttractModeSlideshowFulFile - !byte 5 - !raw "SSFUL" - kDemoDirectory !byte 5 !raw "DEMO/" @@ -118,29 +106,49 @@ kGlobalPrefsFilename !byte 10 !raw "PREFS.CONF" -kAttractModeDataFile - !byte 12 - !raw "ATTRACT.DATA" +kAttractModeIndexFile + !byte 11 + !raw "ATTRACT.IDX" + +kMiniAttractIndexFile + !byte 15 + !raw "MINIATTRACT.IDX" kAttractModeFulFile - !byte 10 - !raw "ATTRACTFUL" + !byte 15 + !raw "MINIATTRACT.ALL" -kFXDataFile - !byte 7 - !raw "FX.DATA" +kAttractModeSlideshowIndexFile + !byte 13 + !raw "SLIDESHOW.IDX" -kDFXDataFile - !byte 8 - !raw "DFX.DATA" +kAttractModeSlideshowFulFile + !byte 13 + !raw "SLIDESHOW.ALL" + +kFXIndexFile + !byte 6 + !raw "FX.IDX" kFXFile - !byte 5 - !raw "FXFUL" + !byte 6 + !raw "FX.ALL" + +kDFXIndexFile + !byte 7 + !raw "DFX.IDX" kDFXFile - !byte 6 - !raw "DFXFUL" + !byte 7 + !raw "DFX.ALL" + +kGameHelpIndexFile + !byte 12 + !raw "GAMEHELP.IDX" + +kGameHelpFile + !byte 12 + !raw "GAMEHELP.ALL" kCreditsFile !byte 7 @@ -150,14 +158,6 @@ kHelpBackgroundFile !byte 4 !raw "HELP" -kGameHelpDataFile - !byte 9 - !raw "HELP.DATA" - -kGameHelpFile - !byte 7 - !raw "HELPFUL" - kHelpTextFile !byte 8 !raw "HELPTEXT" diff --git a/src/ui.attract.dhgr.a b/src/ui.attract.dhgr.a index 20ccd15d4..c79ccad5b 100644 --- a/src/ui.attract.dhgr.a +++ b/src/ui.attract.dhgr.a @@ -138,7 +138,7 @@ gMachineInDHGRMode=*+1 LoadDHGRTransition jsr LoadFile ; load DHGR transition effects list into $6000 !word kRootDirectory - !word kDFXDataFile + !word kDFXIndexFile - !word $6000 jsr pref_get ; get DHGR transition effect from prefs diff --git a/src/ui.attract.hgr.a b/src/ui.attract.hgr.a index becc7ba15..bb5646933 100644 --- a/src/ui.attract.hgr.a +++ b/src/ui.attract.hgr.a @@ -69,7 +69,7 @@ HGRSingle LoadHGRTransition jsr LoadFile ; load HGR transition effects list into $6000 !word kRootDirectory - !word kFXDataFile + !word kFXIndexFile - !word $6000 jsr pref_get ; get HGR transition effect from prefs diff --git a/src/ui.attract.mode.a b/src/ui.attract.mode.a index 536dcfea5..d19da77f3 100644 --- a/src/ui.attract.mode.a +++ b/src/ui.attract.mode.a @@ -26,7 +26,7 @@ MegaAttractMode jsr LoadFile ; load pre-parsed attract mode configuration data into $6000 !word kRootDirectory - !word kAttractModeDataFile + !word kAttractModeIndexFile - !word $6000 jsr pref_get ; get attract mode module from prefs @@ -76,7 +76,7 @@ MiniAttractMode @loop jsr LoadFile ; load mini attract mode configuration file into $6000 !word kRootDirectory - !word kMiniAttractDataFile + !word kMiniAttractIndexFile - !word $6000 jsr okvs_find !word - @@ -174,7 +174,7 @@ RunAttractModule ; it's a slideshow, so load slideshow configuration file pha ; save module type jsr LoadFile ; load slideshow configuration file into $4000 - !word kAttractModeSlideshowDataFile + !word kAttractModeSlideshowIndexFile !word kRootDirectory - !word $4000 jsr okvs_find diff --git a/src/ui.credits.a b/src/ui.credits.a index 53f511a87..97d0ce16b 100644 --- a/src/ui.credits.a +++ b/src/ui.credits.a @@ -56,7 +56,7 @@ Help +ST16 ++ jsr LoadFile !word kRootDirectory - !word kGameHelpDataFile + !word kGameHelpIndexFile - !word $6000 jsr okvs_find !word -