Apple-2-Tools/4cade
1
0
Fork 0
mirror of https://github.com/a2-4am/4cade.git synced 2025-02-17 22:30:44 +00:00
Code Issues Projects Releases Wiki Activity

Revert "FIX: search cache incorrectly returned if a shorter input buffer matched"

Browse Source 
This reverts commit 6b3e5509a58dc5e721d3a13bd1b7732b86e97d50.
This commit is contained in:
4am 2021-11-09 17:23:18 -05:00
parent 70de373dd3
commit 89d2f3cdc4
9 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bin/buildcache.py
View File

@ -70,14 +70,20 @@ def main():
if not index4: continue if not index4: continue
if index4 != index3: if index4 != index3:
cache[a][b][c][d] = index4 cache[a][b][c][d] = index4
if not cache[a][b][c]: if (len(cache[a][b][c]) == 1) and (" " in cache[a][b][c]):
cache[a][b][c] = cache[a][b][c][" "]
elif not cache[a][b][c]:
del cache[a][b][c] del cache[a][b][c]
if not cache[a][b]: if (len(cache[a][b]) == 1) and (" " in cache[a][b]):
cache[a][b] = cache[a][b][" "]
elif not cache[a][b]:
del cache[a][b] del cache[a][b]
if not cache[a]: if (len(cache[a]) == 1) and (" " in cache[a]):
cache[a] = cache[a][" "]
elif not cache[a]:
del cache[a] del cache[a]
print('*=$A000') print('*=$B000')
for a in cache: for a in cache:
print(f' !text "{a}"') print(f' !text "{a}"')
if type(cache[a]) == int: if type(cache[a]) == int:

BIN
res/CACHE00.IDX
View File

Binary file not shown.

BIN
res/CACHE01.IDX
View File

Binary file not shown.

BIN
res/CACHE10.IDX
View File

Binary file not shown.

BIN
res/CACHE11.IDX
View File

Binary file not shown.

16
res/_FileInformation.txt
View File

@ -20,14 +20,14 @@ 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)
DHGR.IDX=Type(06),AuxType(4000),Access(C3) DHGR.IDX=Type(06),AuxType(4000),Access(C3)
SEARCH00.IDX=Type(06),AuxType(6000),Access(C3) SEARCH00.IDX=Type(06),AuxType(8200),Access(C3)
SEARCH01.IDX=Type(06),AuxType(6000),Access(C3) SEARCH01.IDX=Type(06),AuxType(8200),Access(C3)
SEARCH10.IDX=Type(06),AuxType(6000),Access(C3) SEARCH10.IDX=Type(06),AuxType(8200),Access(C3)
SEARCH11.IDX=Type(06),AuxType(6000),Access(C3) SEARCH11.IDX=Type(06),AuxType(B000),Access(C3)
CACHE00.IDX=Type(06),AuxType(A000),Access(C3) CACHE00.IDX=Type(06),AuxType(B000),Access(C3)
CACHE01.IDX=Type(06),AuxType(A000),Access(C3) CACHE01.IDX=Type(06),AuxType(B000),Access(C3)
CACHE10.IDX=Type(06),AuxType(A000),Access(C3) CACHE10.IDX=Type(06),AuxType(B000),Access(C3)
CACHE11.IDX=Type(06),AuxType(A000),Access(C3) CACHE11.IDX=Type(06),AuxType(B000),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)

2
src/4cade.a
View File

@ -123,7 +123,7 @@ ResetVector ; 6 bytes, copied to $100
!source "src/hw.vbl.a" !source "src/hw.vbl.a"
!source "src/ui.wait.a" !source "src/ui.wait.a"
gSearchStore gSearchStore
!word $6000 !word $8200
gSlideshowStore gSlideshowStore
!word $0800 !word $0800
gGlobalPrefsStore gGlobalPrefsStore

4
src/constants.a
View File

@ -116,8 +116,8 @@ UI_ToPlay = $1FF7
gValLen = $1F80 gValLen = $1F80
gVal = $1F81 gVal = $1F81
gSearchIndex = $6000 gSearchIndex = $8200
gSearchCache = $A000 gSearchCache = $B000
; LC RAM 1 ; LC RAM 1
iLoadFileDirect = $FFEF iLoadFileDirect = $FFEF

2
src/parse.prefs.a
View File

@ -15,7 +15,7 @@
; - kCheat ; - kCheat
; ;
kGlobalPrefsBuffer = $BD00 kGlobalPrefsBuffer = $8000
; valid pref keys ; valid pref keys
kNextAttract kNextAttract