precompute gSearchStore

This commit is contained in:
4am 2021-10-23 00:53:23 -04:00
parent 37c37b588b
commit 76242f8086
13 changed files with 408 additions and 357 deletions

460
Makefile
View File

@ -1,224 +1,236 @@
# #
# 4cade Makefile # 4cade Makefile
# assembles source code, optionally builds a disk image and mounts it # assembles source code, optionally builds a disk image and mounts it
# note: Windows users should probably use winmake.bat instead # note: Windows users should probably use winmake.bat instead
# #
# original by Quinn Dunki on 2014-08-15 # original by Quinn Dunki on 2014-08-15
# One Girl, One Laptop Productions # One Girl, One Laptop Productions
# http://www.quinndunki.com/blondihacks # http://www.quinndunki.com/blondihacks
# #
# adapted by 4am on 2018-08-19 # adapted by 4am on 2018-08-19
# #
DISK=4cade.hdv DISK=4cade.hdv
VOLUME=TOTAL.REPLAY VOLUME=TOTAL.REPLAY
# third-party tools required to build # third-party tools required to build
# https://sourceforge.net/projects/acme-crossass/ # https://sourceforge.net/projects/acme-crossass/
# version 0.96.3 or later # version 0.96.3 or later
ACME=acme ACME=acme
# https://github.com/mach-kernel/cadius # https://github.com/mach-kernel/cadius
# version 1.4.0 or later # version 1.4.0 or later
CADIUS=cadius CADIUS=cadius
# https://bitbucket.org/magli143/exomizer/wiki/Home # https://bitbucket.org/magli143/exomizer/wiki/Home
# version 3.1.0 or later # version 3.1.0 or later
EXOMIZER=exomizer mem -q -P23 -lnone EXOMIZER=exomizer mem -q -P23 -lnone
dsk: asm dsk: asm
cp res/blank.hdv build/"$(DISK)" >>build/log cp res/blank.hdv build/"$(DISK)" >>build/log
cp res/_FileInformation.txt build/ >>build/log cp res/_FileInformation.txt build/ >>build/log
$(CADIUS) ADDFILE build/"$(DISK)" "/$(VOLUME)/" build/LAUNCHER.SYSTEM >>build/log $(CADIUS) ADDFILE build/"$(DISK)" "/$(VOLUME)/" build/LAUNCHER.SYSTEM >>build/log
cp res/PREFS.CONF build/PREFS.CONF >>build/log cp res/PREFS.CONF build/PREFS.CONF >>build/log
bin/padto.sh 512 build/PREFS.CONF >>build/log bin/padto.sh 512 build/PREFS.CONF >>build/log
# #
# precompute binary data structure for mega-attract mode configuration file # precompute binary data structure for mega-attract mode configuration file
# #
bin/buildokvs.sh res/ATTRACT.CONF build/ATTRACT.IDX >>build/log bin/buildokvs.sh build/ATTRACT.IDX < res/ATTRACT.CONF >>build/log
# #
# precompute binary data structure and substitute special characters # precompute binary data structure and substitute special characters
# in game help and other all-text pages # in game help and other all-text pages
# #
bin/converthelp.sh res/HELPTEXT build/HELPTEXT >>build/log bin/converthelp.sh res/HELPTEXT build/HELPTEXT >>build/log
bin/converthelp.sh res/CREDITS build/CREDITS >>build/log bin/converthelp.sh res/CREDITS build/CREDITS >>build/log
for f in res/GAMEHELP/*; do \ for f in res/GAMEHELP/*; do \
bin/converthelp.sh "$$f" build/GAMEHELP/"$$(basename $$f)" >>build/log; \ bin/converthelp.sh "$$f" build/GAMEHELP/"$$(basename $$f)" >>build/log; \
done done
# #
# create distribution version of GAMES.CONF without comments or blank lines # create distribution version of GAMES.CONF without comments or blank lines
# #
awk '!/^$$|^#/' < res/GAMES.CONF > build/GAMES.CONF awk '!/^$$|^#/' < res/GAMES.CONF > build/GAMES.CONF
# #
# create a sorted list of game filenames, without metadata or display names # create a sorted list of game filenames, without metadata or display names
# #
awk -F, '/,/ { print $$2 }' < build/GAMES.CONF | awk -F= '{ print $$1 }' | sort > build/GAMES.SORTED awk -F, '/,/ { print $$2 }' < build/GAMES.CONF | awk -F= '{ print $$1 }' | sort > build/GAMES.SORTED
# #
# precompute indexed files for prelaunch # create search indexes
# note: prelaunch must be first in TOTAL.DATA due to a hack in LoadStandardPrelaunch #
# note 2: these can not be padded because they are loaded at $0106 and padding would clobber the stack bin/builddisplaynames.py < res/GAMES.CONF > build/DISPLAY.CONF
# grep "^00" < build/DISPLAY.CONF | cut -d"," -f2 | bin/buildokvs.sh build/SEARCH00.IDX
bin/buildindexedfile.sh build/GAMES.SORTED build/PRELAUNCH.IDX build/TOTAL.DATA build/PRELAUNCH.INDEXED >>build/log grep "^0" < build/DISPLAY.CONF | cut -d"," -f2 | bin/buildokvs.sh build/SEARCH01.IDX
# grep "^.0" < build/DISPLAY.CONF | cut -d"," -f2 | bin/buildokvs.sh build/SEARCH10.IDX
# precompute indexed files for game help cat build/DISPLAY.CONF | cut -d"," -f2 | bin/buildokvs.sh build/SEARCH11.IDX
# #
bin/buildindexedfile.sh -p -a build/GAMES.SORTED build/GAMEHELP.IDX build/TOTAL.DATA build/GAMEHELP >>build/log # precompute indexed files for prelaunch
# # note: prelaunch must be first in TOTAL.DATA due to a hack in LoadStandardPrelaunch
# precompute indexed files for slideshows # note 2: these can not be padded because they are loaded at $0106 and padding would clobber the stack
# #
(for f in res/SS/*; do \ bin/buildindexedfile.sh build/GAMES.SORTED build/PRELAUNCH.IDX build/TOTAL.DATA build/PRELAUNCH.INDEXED >>build/log
bin/buildokvs.sh "$$f" "build/SS/$$(basename $$f)"; \ #
echo "$$(basename $$f)"; \ # precompute indexed files for game help
done) > build/SSDIR #
bin/buildindexedfile.sh -p -a build/SSDIR build/SLIDESHOW.IDX build/TOTAL.DATA build/SS >>build/log bin/buildindexedfile.sh -p -a build/GAMES.SORTED build/GAMEHELP.IDX build/TOTAL.DATA build/GAMEHELP >>build/log
(for f in res/ATTRACT/*; do \ #
bin/buildokvs.sh "$$f" "build/ATTRACT/$$(basename $$f)"; \ # precompute indexed files for slideshows
echo "$$(basename $$f)"; \ #
done) > build/ATTRACTDIR (for f in res/SS/*; do \
bin/buildindexedfile.sh -p -a build/ATTRACTDIR build/MINIATTRACT.IDX build/TOTAL.DATA build/ATTRACT >>build/log bin/buildokvs.sh "build/SS/$$(basename $$f)" < "$$f"; \
# echo "$$(basename $$f)"; \
# precompute indexed files for graphic effects done) > build/SSDIR
# bin/buildindexedfile.sh -p -a build/SSDIR build/SLIDESHOW.IDX build/TOTAL.DATA build/SS >>build/log
bin/buildindexedfile.sh -p -a res/FX.CONF build/FX.IDX build/TOTAL.DATA build/FX.INDEXED >>build/log (for f in res/ATTRACT/*; do \
bin/buildindexedfile.sh -p -a res/DFX.CONF build/DFX.IDX build/TOTAL.DATA build/FX.INDEXED >>build/log bin/buildokvs.sh "build/ATTRACT/$$(basename $$f)" < "$$f"; \
# echo "$$(basename $$f)"; \
# precompute indexed files for HGR action screenshots done) > build/ATTRACTDIR
# note: these can not be padded because they are compressed and the decompressor needs the exact size bin/buildindexedfile.sh -p -a build/ATTRACTDIR build/MINIATTRACT.IDX build/TOTAL.DATA build/ATTRACT >>build/log
# #
(for f in res/ACTION.HGR/[ABCD]*; do echo "$$(basename $$f)"; done) > build/ACTIONHGR0 # precompute indexed files for graphic effects
(for f in res/ACTION.HGR/[EFGH]*; do echo "$$(basename $$f)"; done) > build/ACTIONHGR1 #
(for f in res/ACTION.HGR/[IJKL]*; do echo "$$(basename $$f)"; done) > build/ACTIONHGR2 bin/buildindexedfile.sh -p -a res/FX.CONF build/FX.IDX build/TOTAL.DATA build/FX.INDEXED >>build/log
(for f in res/ACTION.HGR/[MNOP]*; do echo "$$(basename $$f)"; done) > build/ACTIONHGR3 bin/buildindexedfile.sh -p -a res/DFX.CONF build/DFX.IDX build/TOTAL.DATA build/FX.INDEXED >>build/log
(for f in res/ACTION.HGR/[QRST]*; do echo "$$(basename $$f)"; done) > build/ACTIONHGR4 #
(for f in res/ACTION.HGR/[UVWX]*; do echo "$$(basename $$f)"; done) > build/ACTIONHGR5 # precompute indexed files for HGR action screenshots
(for f in res/ACTION.HGR/[YZ]*; do echo "$$(basename $$f)"; done) > build/ACTIONHGR6 # note: these can not be padded because they are compressed and the decompressor needs the exact size
bin/buildindexedfile.sh -a build/ACTIONHGR0 build/HGR0.IDX build/TOTAL.DATA res/ACTION.HGR >>build/log #
bin/buildindexedfile.sh -a build/ACTIONHGR1 build/HGR1.IDX build/TOTAL.DATA res/ACTION.HGR >>build/log (for f in res/ACTION.HGR/[ABCD]*; do echo "$$(basename $$f)"; done) > build/ACTIONHGR0
bin/buildindexedfile.sh -a build/ACTIONHGR2 build/HGR2.IDX build/TOTAL.DATA res/ACTION.HGR >>build/log (for f in res/ACTION.HGR/[EFGH]*; do echo "$$(basename $$f)"; done) > build/ACTIONHGR1
bin/buildindexedfile.sh -a build/ACTIONHGR3 build/HGR3.IDX build/TOTAL.DATA res/ACTION.HGR >>build/log (for f in res/ACTION.HGR/[IJKL]*; do echo "$$(basename $$f)"; done) > build/ACTIONHGR2
bin/buildindexedfile.sh -a build/ACTIONHGR4 build/HGR4.IDX build/TOTAL.DATA res/ACTION.HGR >>build/log (for f in res/ACTION.HGR/[MNOP]*; do echo "$$(basename $$f)"; done) > build/ACTIONHGR3
bin/buildindexedfile.sh -a build/ACTIONHGR5 build/HGR5.IDX build/TOTAL.DATA res/ACTION.HGR >>build/log (for f in res/ACTION.HGR/[QRST]*; do echo "$$(basename $$f)"; done) > build/ACTIONHGR4
bin/buildindexedfile.sh -a build/ACTIONHGR6 build/HGR6.IDX build/TOTAL.DATA res/ACTION.HGR >>build/log (for f in res/ACTION.HGR/[UVWX]*; do echo "$$(basename $$f)"; done) > build/ACTIONHGR5
# (for f in res/ACTION.HGR/[YZ]*; do echo "$$(basename $$f)"; done) > build/ACTIONHGR6
# precompute indexed files for SHR artwork bin/buildindexedfile.sh -a build/ACTIONHGR0 build/HGR0.IDX build/TOTAL.DATA res/ACTION.HGR >>build/log
# note: these can not be padded because they are compressed and the decompressor needs the exact size bin/buildindexedfile.sh -a build/ACTIONHGR1 build/HGR1.IDX build/TOTAL.DATA res/ACTION.HGR >>build/log
# bin/buildindexedfile.sh -a build/ACTIONHGR2 build/HGR2.IDX build/TOTAL.DATA res/ACTION.HGR >>build/log
(for f in res/ARTWORK.SHR/*; do \ bin/buildindexedfile.sh -a build/ACTIONHGR3 build/HGR3.IDX build/TOTAL.DATA res/ACTION.HGR >>build/log
echo "$$(basename $$f)"; \ bin/buildindexedfile.sh -a build/ACTIONHGR4 build/HGR4.IDX build/TOTAL.DATA res/ACTION.HGR >>build/log
done) > build/ARTWORKDIR bin/buildindexedfile.sh -a build/ACTIONHGR5 build/HGR5.IDX build/TOTAL.DATA res/ACTION.HGR >>build/log
bin/buildindexedfile.sh -a build/ARTWORKDIR build/ARTWORK.IDX build/TOTAL.DATA res/ARTWORK.SHR >>build/log bin/buildindexedfile.sh -a build/ACTIONHGR6 build/HGR6.IDX build/TOTAL.DATA res/ACTION.HGR >>build/log
# #
# create _FileInformation.txt files for subdirectories # precompute indexed files for SHR artwork
# # note: these can not be padded because they are compressed and the decompressor needs the exact size
bin/buildfileinfo.sh res/TITLE.HGR "06" "4000" >>build/log #
bin/buildfileinfo.sh res/TITLE.DHGR "06" "4000" >>build/log (for f in res/ARTWORK.SHR/*; do \
bin/buildfileinfo.sh res/ACTION.DHGR "06" "3FF8" >>build/log echo "$$(basename $$f)"; \
bin/buildfileinfo.sh res/ACTION.GR "06" "6000" >>build/log done) > build/ARTWORKDIR
bin/buildfileinfo.sh res/ICONS "CA" "0000" >>build/log bin/buildindexedfile.sh -a build/ARTWORKDIR build/ARTWORK.IDX build/TOTAL.DATA res/ARTWORK.SHR >>build/log
bin/buildfileinfo.sh build/FX "06" "6000" >>build/log #
bin/buildfileinfo.sh build/PRELAUNCH "06" "0106" >>build/log # create _FileInformation.txt files for subdirectories
# #
# add everything to the disk bin/buildfileinfo.sh res/TITLE.HGR "06" "4000" >>build/log
# bin/buildfileinfo.sh res/TITLE.DHGR "06" "4000" >>build/log
for f in \ bin/buildfileinfo.sh res/ACTION.DHGR "06" "3FF8" >>build/log
build/TOTAL.DATA \ bin/buildfileinfo.sh res/ACTION.GR "06" "6000" >>build/log
res/TITLE \ bin/buildfileinfo.sh res/ICONS "CA" "0000" >>build/log
res/COVER \ bin/buildfileinfo.sh build/FX "06" "6000" >>build/log
res/HELP \ bin/buildfileinfo.sh build/PRELAUNCH "06" "0106" >>build/log
build/GAMES.CONF \ #
build/PREFS.CONF \ # add everything to the disk
build/CREDITS \ #
build/HELPTEXT \ for f in \
build/ATTRACT.IDX \ build/TOTAL.DATA \
build/FX.IDX \ res/TITLE \
build/DFX.IDX \ res/COVER \
build/GAMEHELP.IDX \ res/HELP \
build/SLIDESHOW.IDX \ build/GAMES.CONF \
build/MINIATTRACT.IDX \ build/PREFS.CONF \
build/PRELAUNCH.IDX \ build/CREDITS \
build/ARTWORK.IDX \ build/HELPTEXT \
build/HGR0.IDX \ build/ATTRACT.IDX \
build/HGR1.IDX \ build/SEARCH00.IDX \
build/HGR2.IDX \ build/SEARCH01.IDX \
build/HGR3.IDX \ build/SEARCH10.IDX \
build/HGR4.IDX \ build/SEARCH11.IDX \
build/HGR5.IDX \ build/FX.IDX \
build/HGR6.IDX \ build/DFX.IDX \
res/DECRUNCH \ build/GAMEHELP.IDX \
res/JOYSTICK \ build/SLIDESHOW.IDX \
res/Finder.Data \ build/MINIATTRACT.IDX \
res/Finder.Root; do \ build/PRELAUNCH.IDX \
$(CADIUS) ADDFILE build/"$(DISK)" "/$(VOLUME)/" "$$f" >>build/log; \ build/ARTWORK.IDX \
done build/HGR0.IDX \
for f in \ build/HGR1.IDX \
res/TITLE.HGR \ build/HGR2.IDX \
res/TITLE.DHGR \ build/HGR3.IDX \
res/ACTION.DHGR \ build/HGR4.IDX \
res/ACTION.GR \ build/HGR5.IDX \
res/DEMO \ build/HGR6.IDX \
res/TITLE.ANIMATED \ res/DECRUNCH \
res/ICONS \ res/JOYSTICK \
build/FX \ res/Finder.Data \
build/PRELAUNCH; do \ res/Finder.Root; do \
rm -f "$$f"/.DS_Store; \ $(CADIUS) ADDFILE build/"$(DISK)" "/$(VOLUME)/" "$$f" >>build/log; \
$(CADIUS) ADDFOLDER build/"$(DISK)" "/$(VOLUME)/$$(basename $$f)" "$$f" >>build/log; \ done
done for f in \
for i in 1 2 3 4 5 6; do \ res/TITLE.HGR \
$(CADIUS) RENAMEFILE build/"$(DISK)" "/$(VOLUME)/DEMO/SPCARTOON.$${i}$${i}" "SPCARTOON.$${i}." >>build/log; \ res/TITLE.DHGR \
done res/ACTION.DHGR \
for f in res/dsk/*.po; do \ res/ACTION.GR \
$(CADIUS) EXTRACTVOLUME "$${f}" build/X/ >>build/log; \ res/DEMO \
done res/TITLE.ANIMATED \
rm -f build/X/**/.DS_Store build/X/**/PRODOS* build/X/**/LOADER.SYSTEM* res/ICONS \
$(CADIUS) CREATEFOLDER build/"$(DISK)" "/$(VOLUME)/X/" >>build/log build/FX \
for f in build/X/*; do \ build/PRELAUNCH; do \
$(CADIUS) ADDFOLDER build/"$(DISK)" "/$(VOLUME)/X/$$(basename $$f)" "$$f" >>build/log; \ rm -f "$$f"/.DS_Store; \
done $(CADIUS) ADDFOLDER build/"$(DISK)" "/$(VOLUME)/$$(basename $$f)" "$$f" >>build/log; \
bin/changebootloader.sh build/"$(DISK)" build/proboothd done
for i in 1 2 3 4 5 6; do \
asm: asmlauncher asmfx asmprelaunch asmproboot $(CADIUS) RENAMEFILE build/"$(DISK)" "/$(VOLUME)/DEMO/SPCARTOON.$${i}$${i}" "SPCARTOON.$${i}." >>build/log; \
done
asmlauncher: md for f in res/dsk/*.po; do \
$(ACME) -DBUILDNUMBER=`git rev-list --count HEAD` src/4cade.a 2>build/relbase.log $(CADIUS) EXTRACTVOLUME "$${f}" build/X/ >>build/log; \
$(ACME) -r build/4cade.lst -DBUILDNUMBER=`git rev-list --count HEAD` -DRELBASE=`cat build/relbase.log | grep "RELBASE =" | cut -d"=" -f2 | cut -d"(" -f2 | cut -d")" -f1` src/4cade.a done
rm -f build/X/**/.DS_Store build/X/**/PRODOS* build/X/**/LOADER.SYSTEM*
asmfx: md $(CADIUS) CREATEFOLDER build/"$(DISK)" "/$(VOLUME)/X/" >>build/log
for f in src/fx/*.a; do \ for f in build/X/*; do \
grep "^\!to" $${f} >/dev/null && $(ACME) $${f} >> build/log || true; \ $(CADIUS) ADDFOLDER build/"$(DISK)" "/$(VOLUME)/X/$$(basename $$f)" "$$f" >>build/log; \
done done
bin/changebootloader.sh build/"$(DISK)" build/proboothd
asmprelaunch: md
for f in src/prelaunch/*.a; do \ asm: asmlauncher asmfx asmprelaunch asmproboot
grep "^\!to" $${f} >/dev/null && $(ACME) $${f} >> build/log; \
done asmlauncher: md
$(ACME) -DBUILDNUMBER=`git rev-list --count HEAD` src/4cade.a 2>build/relbase.log
asmproboot: md $(ACME) -r build/4cade.lst -DBUILDNUMBER=`git rev-list --count HEAD` -DRELBASE=`cat build/relbase.log | grep "RELBASE =" | cut -d"=" -f2 | cut -d"(" -f2 | cut -d")" -f1` src/4cade.a
$(ACME) -r build/proboothd.lst src/proboothd/proboothd.a >> build/log
asmfx: md
# for f in src/fx/*.a; do \
# |compress| and |attract| must be called separately because they are slow. grep "^\!to" $${f} >/dev/null && $(ACME) $${f} >> build/log || true; \
# They create files in the repository which can then be checked in. done
#
compress: md asmprelaunch: md
for f in res/ACTION.HGR.UNCOMPRESSED/*; do o=res/ACTION.HGR/$$(basename $$f); [ -f "$$o" ] || ${EXOMIZER} "$$f"@0x4000 -o "$$o" >>build/log; done for f in src/prelaunch/*.a; do \
for f in res/ACTION.DHGR.UNCOMPRESSED/*; do o=res/ACTION.DHGR/$$(basename $$f); [ -f "$$o" ] || ${EXOMIZER} "$$f"@0x4000 -o "$$o" >>build/log; done grep "^\!to" $${f} >/dev/null && $(ACME) $${f} >> build/log; \
for f in res/ARTWORK.SHR.UNCOMPRESSED/*; do o=res/ARTWORK.SHR/$$(basename $$f); [ -f "$$o" ] || ${EXOMIZER} "$$f"@0x2000 -o "$$o" >>build/log; done done
attract: compress asmproboot: md
bin/check-attract-mode.sh $(ACME) -r build/proboothd.lst src/proboothd/proboothd.a >> build/log
bin/generate-mini-attract-mode.sh
#
mount: dsk # |compress| and |attract| must be called separately because they are slow.
osascript bin/V2Make.scpt "`pwd`" bin/4cade.vii build/"$(DISK)" # They create files in the repository which can then be checked in.
#
md: compress: md
mkdir -p build/X build/FX.INDEXED build/FX build/PRELAUNCH.INDEXED build/PRELAUNCH build/ATTRACT build/SS build/GAMEHELP for f in res/ACTION.HGR.UNCOMPRESSED/*; do o=res/ACTION.HGR/$$(basename $$f); [ -f "$$o" ] || ${EXOMIZER} "$$f"@0x4000 -o "$$o" >>build/log; done
touch build/log for f in res/ACTION.DHGR.UNCOMPRESSED/*; do o=res/ACTION.DHGR/$$(basename $$f); [ -f "$$o" ] || ${EXOMIZER} "$$f"@0x4000 -o "$$o" >>build/log; done
for f in res/ARTWORK.SHR.UNCOMPRESSED/*; do o=res/ARTWORK.SHR/$$(basename $$f); [ -f "$$o" ] || ${EXOMIZER} "$$f"@0x2000 -o "$$o" >>build/log; done
clean:
rm -rf build/ || rm -rf build attract: compress
bin/check-attract-mode.sh
all: clean dsk mount bin/generate-mini-attract-mode.sh
al: all mount: dsk
osascript bin/V2Make.scpt "`pwd`" bin/4cade.vii build/"$(DISK)"
md:
mkdir -p build/X build/FX.INDEXED build/FX build/PRELAUNCH.INDEXED build/PRELAUNCH build/ATTRACT build/SS build/GAMEHELP
touch build/log
clean:
rm -rf build/ || rm -rf build
all: clean dsk mount
al: all

14
bin/builddisplaynames.py Executable file
View File

@ -0,0 +1,14 @@
#!/usr/bin/env python3
# usage:
# builddisplaynames.py < res/GAMES.CONF > build/GAMES.CONF.WITH.NAMES
import sys
for line in sys.stdin:
if "," not in line: continue
if line.startswith("#"): continue
if "=" not in line:
prefix, key = line.split(",")
line = prefix + "," + key.strip() + "=" + key.replace(".", " ").title().replace(" Ii", " II")
print(line, end="")

View File

@ -4,7 +4,7 @@
# make temp file with just the key/value pairs (strip blank lines, comments, eof marker) # make temp file with just the key/value pairs (strip blank lines, comments, eof marker)
records=$(mktemp) records=$(mktemp)
grep -v "^$" < "$1" | grep -v "^#" | grep -v "^\[" > "$records" grep -v "^$" | grep -v "^#" | grep -v "^\[" > "$records"
# make temp assembly source file that represents the binary OKVS data structure # make temp assembly source file that represents the binary OKVS data structure
source=$(mktemp) source=$(mktemp)
@ -19,7 +19,7 @@ source=$(mktemp)
done < "$records") > "$source" done < "$records") > "$source"
# assemble temp source file to create binary OKVS data structure # assemble temp source file to create binary OKVS data structure
acme -o "$2" "$source" acme -o "$1" "$source"
# clean up # clean up
rm "$source" rm "$source"

7
res/ATTRACT/AO Normal file
View File

@ -0,0 +1,7 @@
#
# Attract mode for AO
# This file is automatically generated
#
[eof]

7
res/ATTRACT/CHIP.OUT Normal file
View File

@ -0,0 +1,7 @@
#
# Attract mode for CHIP.OUT
# This file is automatically generated
#
[eof]

7
res/ATTRACT/VV Normal file
View File

@ -0,0 +1,7 @@
#
# Attract mode for VV
# This file is automatically generated
#
[eof]

View File

@ -19,6 +19,10 @@ HGR3.IDX=Type(06),AuxType(4000),Access(C3)
HGR4.IDX=Type(06),AuxType(4000),Access(C3) HGR4.IDX=Type(06),AuxType(4000),Access(C3)
HGR5.IDX=Type(06),AuxType(4000),Access(C3) HGR5.IDX=Type(06),AuxType(4000),Access(C3)
HGR6.IDX=Type(06),AuxType(4000),Access(C3) HGR6.IDX=Type(06),AuxType(4000),Access(C3)
SEARCH00.IDX=Type(06),AuxType(8200),Access(C3)
SEARCH01.IDX=Type(06),AuxType(8200),Access(C3)
SEARCH10.IDX=Type(06),AuxType(8200),Access(C3)
SEARCH11.IDX=Type(06),AuxType(8200),Access(C3)
COVER=Type(06),AuxType(2000),Access(C3) COVER=Type(06),AuxType(2000),Access(C3)
TITLE=Type(06),AuxType(2000),Access(C3) TITLE=Type(06),AuxType(2000),Access(C3)
HELP=Type(06),AuxType(2000),Access(C3) HELP=Type(06),AuxType(2000),Access(C3)

View File

@ -413,6 +413,19 @@ CopyDevs
+READ_RAM1_WRITE_RAM1 +READ_RAM1_WRITE_RAM1
} }
ldx #$30
lda MachineStatus
and #HAS_JOYSTICK
beq +
inx
+ stx gSearchHasJoystick
ldx #$30
lda MachineStatus
and #HAS_128K
beq +
inx
+ stx gSearchHas128K
+LDADDR gGamesListStore +LDADDR gGamesListStore
jsr okvs_len jsr okvs_len
+LD16 WCOUNT +LD16 WCOUNT

View File

@ -7,7 +7,7 @@
; ;
; LC RAM BANK 1 ; LC RAM BANK 1
; D000..E7D2 - persistent data structures (gGlobalPrefsStore, gGamesListStore) ; D000..E7D2 - persistent data structures (gGlobalPrefsStore, gGamesListStore)
; E92D..FFEE - main program code ; E9E8..FFEE - main program code
; FFEF..FFF9 - API functions and global constants available for main program ; FFEF..FFF9 - API functions and global constants available for main program
; code, prelaunchers, transition effects, &c. ; code, prelaunchers, transition effects, &c.
; (LoadFileDirect, Wait/UnwaitForVBL, MockingboardStuff, MachineStatus) ; (LoadFileDirect, Wait/UnwaitForVBL, MockingboardStuff, MachineStatus)
@ -149,7 +149,7 @@ CHEATS_ENABLED = %00001000
iCurBlockLo = $D401 ; constant iCurBlockLo = $D401 ; constant
iCurBlockHi = $D403 ; constant iCurBlockHi = $D403 ; constant
launchpatch = $D661 ; glue.launch.a launchpatch = $D661 ; glue.launch.a
iAddToPath = $FEA5 ; Roger Rabbit, avoid, use Infiltrator 2 style instead iAddToPath = $FE98 ; Roger Rabbit, avoid, use Infiltrator 2 style instead
itraverse = $D958 ; Roger Rabbit, avoid, use Infiltrator 2 style instead itraverse = $D958 ; Roger Rabbit, avoid, use Infiltrator 2 style instead
ldrlo = $55 ; constant ldrlo = $55 ; constant
ldrhi = $56 ; constant ldrhi = $56 ; constant

View File

@ -118,109 +118,6 @@ okvs_len_imm
ora WCOUNT ora WCOUNT
rts rts
;------------------------------------------------------------------------------
; okvs_append
;
; in: stack contains 7 bytes of parameters:
; +1 [word] handle to storage space
; +3 [word] address of key
; +5 [word] address of value
; +7 [byte] maximum length of value (or 0 to fit)
; out: (new record count is not returned because no one cares)
; all registers clobbered
; $00/$01 clobbered
; $02/$03 clobbered
; $04/$05 has the address of the next available byte after the new record
; $08/$09 clobbered
;------------------------------------------------------------------------------
okvs_append
+PARAMS_ON_STACK 7
jsr GetStoreAddress
; PTR -> store
; Y = 0
lda (PTR),y ; A = number of keys in store
sta WINDEX
iny
lda (PTR), y
sta WINDEX+1
inc WINDEX
bne +
inc WINDEX+1
+
dey
lda WINDEX
sta (PTR),y ; increment number of keys
lda WINDEX+1
iny
sta (PTR),y
iny
lda (PTR),y ; get address of next free space
tax
iny
lda (PTR),y
sta PTR+1
sta SAVE+1
stx PTR
stx SAVE
; PTR -> new record
; SAVE -> new record
jsr incptr
; PTR -> space for new key
+LDPARAMPTR 3, SRC ; SRC -> new key to copy
ldy #0
lda (SRC),y
tay
tax
- lda (SRC),y ; copy new key
sta (PTR),y
dey
cpy #$FF
bne -
;;sec
txa
adc PTR ; update PTR to byte after copied key
sta PTR
bcc +
inc PTR+1
+ ; PTR -> space for new value
+LDPARAMPTR 5, SRC ; SRC -> new value to copy
iny ;;ldy #7
lda (PARAM),y ; get max length of value
tax
bne +
tay
lda (SRC),y ; no max, use actual length instead
tax
+ inx
tay
- lda (SRC),y
sta (PTR),y
dey
cpy #$FF
bne -
txa
clc
adc PTR
tax
lda PTR+1
adc #0
pha
+ jsr GetStoreAddress
; PTR -> store
pla
ldy #3
sta (PTR),y ; update next-free-space pointer in head
dey
txa
sta (PTR),y
sec
sbc SAVE
ldy #0
sta (SAVE),y ; set record length
rts
;------------------------------------------------------------------------------ ;------------------------------------------------------------------------------
; okvs_find / okvs_get ; okvs_find / okvs_get
; ;

View File

@ -135,3 +135,106 @@ IncAndGetChar
beq IncAndGetChar beq IncAndGetChar
.parseKeyValueDone .parseKeyValueDone
rts rts
;------------------------------------------------------------------------------
; okvs_append
;
; in: stack contains 7 bytes of parameters:
; +1 [word] handle to storage space
; +3 [word] address of key
; +5 [word] address of value
; +7 [byte] maximum length of value (or 0 to fit)
; out: (new record count is not returned because no one cares)
; all registers clobbered
; $00/$01 clobbered
; $02/$03 clobbered
; $04/$05 has the address of the next available byte after the new record
; $08/$09 clobbered
;------------------------------------------------------------------------------
okvs_append
+PARAMS_ON_STACK 7
jsr GetStoreAddress
; PTR -> store
; Y = 0
lda (PTR),y ; A = number of keys in store
sta WINDEX
iny
lda (PTR), y
sta WINDEX+1
inc WINDEX
bne +
inc WINDEX+1
+
dey
lda WINDEX
sta (PTR),y ; increment number of keys
lda WINDEX+1
iny
sta (PTR),y
iny
lda (PTR),y ; get address of next free space
tax
iny
lda (PTR),y
sta PTR+1
sta SAVE+1
stx PTR
stx SAVE
; PTR -> new record
; SAVE -> new record
jsr incptr
; PTR -> space for new key
+LDPARAMPTR 3, SRC ; SRC -> new key to copy
ldy #0
lda (SRC),y
tay
tax
- lda (SRC),y ; copy new key
sta (PTR),y
dey
cpy #$FF
bne -
;;sec
txa
adc PTR ; update PTR to byte after copied key
sta PTR
bcc +
inc PTR+1
+ ; PTR -> space for new value
+LDPARAMPTR 5, SRC ; SRC -> new value to copy
iny ;;ldy #7
lda (PARAM),y ; get max length of value
tax
bne +
tay
lda (SRC),y ; no max, use actual length instead
tax
+ inx
tay
- lda (SRC),y
sta (PTR),y
dey
cpy #$FF
bne -
txa
clc
adc PTR
tax
lda PTR+1
adc #0
pha
+ jsr GetStoreAddress
; PTR -> store
pla
ldy #3
sta (PTR),y ; update next-free-space pointer in head
dey
txa
sta (PTR),y
sec
sbc SAVE
ldy #0
sta (SAVE),y ; set record length
rts

View File

@ -190,3 +190,12 @@ kDecrunchFile
kJoystickFile kJoystickFile
!byte 8 !byte 8
!raw "JOYSTICK" !raw "JOYSTICK"
kSearchIndexFile
!byte 12
!raw "SEARCH"
gSearchHasJoystick
!raw "_"
gSearchHas128K
!raw "_"
!raw ".IDX"

View File

@ -36,32 +36,10 @@ InputBuffer
; out: gSearchStore populated ; out: gSearchStore populated
;------------------------------------------------------------------------------ ;------------------------------------------------------------------------------
BuildSearchStore BuildSearchStore
jsr SwitchToBank2 jsr LoadFile ; load appropriate search index into $8200
jsr EnableAcceleratorAndSwitchToBank1 !word kRootDirectory
+LDADDR gSearchStore !word kSearchIndexFile
jsr okvs_init !word $8200
jsr okvs_iter
!word gGamesListStore
!word @callback
jsr SwitchToBank2
jmp DisableAcceleratorAndSwitchToBank1
@callback
; callback called by okvs_iter on gGamesListStore
; in: A/Y contains address of filename
; $WINDEX contains 0-based index of the current record in gGamesListStore (word)
; out: all registers and flags clobbered
+ST16 @key
jsr GetGameDisplayName
+ST16 @value
@append
jsr okvs_append
!word gSearchStore
@key !word $FDFD ; SMC
@value !word $FDFD ; SMC
!byte 0
rts rts
;------------------------------------------------------------------------------ ;------------------------------------------------------------------------------