diff --git a/bin/buildcache.py b/bin/buildcache.py index f956b1fe9..776e8e844 100755 --- a/bin/buildcache.py +++ b/bin/buildcache.py @@ -70,20 +70,14 @@ def main(): if not index4: continue if index4 != index3: cache[a][b][c][d] = index4 - 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]: + if not cache[a][b][c]: del cache[a][b][c] - if (len(cache[a][b]) == 1) and (" " in cache[a][b]): - cache[a][b] = cache[a][b][" "] - elif not cache[a][b]: + if not cache[a][b]: del cache[a][b] - if (len(cache[a]) == 1) and (" " in cache[a]): - cache[a] = cache[a][" "] - elif not cache[a]: + if not cache[a]: del cache[a] - print('*=$B000') + print('*=$A000') for a in cache: print(f' !text "{a}"') if type(cache[a]) == int: diff --git a/res/CACHE00.IDX b/res/CACHE00.IDX index 776078479..ca2ecb729 100644 Binary files a/res/CACHE00.IDX and b/res/CACHE00.IDX differ diff --git a/res/CACHE01.IDX b/res/CACHE01.IDX index eae7a171b..238956047 100644 Binary files a/res/CACHE01.IDX and b/res/CACHE01.IDX differ diff --git a/res/CACHE10.IDX b/res/CACHE10.IDX index d6d21d61e..82031d4fc 100644 Binary files a/res/CACHE10.IDX and b/res/CACHE10.IDX differ diff --git a/res/CACHE11.IDX b/res/CACHE11.IDX index a4bd5c3a5..75b7cfa03 100644 Binary files a/res/CACHE11.IDX and b/res/CACHE11.IDX differ diff --git a/res/_FileInformation.txt b/res/_FileInformation.txt index 4e743f0be..78ba1161b 100644 --- a/res/_FileInformation.txt +++ b/res/_FileInformation.txt @@ -20,14 +20,14 @@ HGR4.IDX=Type(06),AuxType(4000),Access(C3) HGR5.IDX=Type(06),AuxType(4000),Access(C3) HGR6.IDX=Type(06),AuxType(4000),Access(C3) DHGR.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(B000),Access(C3) -CACHE00.IDX=Type(06),AuxType(B000),Access(C3) -CACHE01.IDX=Type(06),AuxType(B000),Access(C3) -CACHE10.IDX=Type(06),AuxType(B000),Access(C3) -CACHE11.IDX=Type(06),AuxType(B000),Access(C3) +SEARCH00.IDX=Type(06),AuxType(6000),Access(C3) +SEARCH01.IDX=Type(06),AuxType(6000),Access(C3) +SEARCH10.IDX=Type(06),AuxType(6000),Access(C3) +SEARCH11.IDX=Type(06),AuxType(6000),Access(C3) +CACHE00.IDX=Type(06),AuxType(A000),Access(C3) +CACHE01.IDX=Type(06),AuxType(A000),Access(C3) +CACHE10.IDX=Type(06),AuxType(A000),Access(C3) +CACHE11.IDX=Type(06),AuxType(A000),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/4cade.a b/src/4cade.a index c0eb6ca89..4905b1d50 100644 --- a/src/4cade.a +++ b/src/4cade.a @@ -123,7 +123,7 @@ ResetVector ; 6 bytes, copied to $100 !source "src/hw.vbl.a" !source "src/ui.wait.a" gSearchStore - !word $8200 + !word $6000 gSlideshowStore !word $0800 gGlobalPrefsStore diff --git a/src/constants.a b/src/constants.a index 17c719c4a..9eec7c148 100644 --- a/src/constants.a +++ b/src/constants.a @@ -116,8 +116,8 @@ UI_ToPlay = $1FF7 gValLen = $1F80 gVal = $1F81 -gSearchIndex = $8200 -gSearchCache = $B000 +gSearchIndex = $6000 +gSearchCache = $A000 ; LC RAM 1 iLoadFileDirect = $FFEF diff --git a/src/parse.prefs.a b/src/parse.prefs.a index e24573fd8..f57a10332 100644 --- a/src/parse.prefs.a +++ b/src/parse.prefs.a @@ -15,7 +15,7 @@ ; - kCheat ; -kGlobalPrefsBuffer = $8000 +kGlobalPrefsBuffer = $BD00 ; valid pref keys kNextAttract