From 7afebf6b04a95eaebfbbca5e6945b52126b9337d Mon Sep 17 00:00:00 2001 From: 4am Date: Tue, 9 Nov 2021 17:19:25 -0500 Subject: [PATCH] FIX: search cache incorrectly returned if a shorter input buffer matched --- bin/buildcache.py | 14 ++++---------- res/CACHE00.IDX | Bin 2272 -> 3580 bytes res/CACHE01.IDX | Bin 2508 -> 3940 bytes res/CACHE10.IDX | Bin 3055 -> 4615 bytes res/CACHE11.IDX | Bin 3690 -> 5562 bytes res/_FileInformation.txt | 16 ++++++++-------- src/4cade.a | 2 +- src/constants.a | 4 ++-- src/parse.prefs.a | 2 +- 9 files changed, 16 insertions(+), 22 deletions(-) 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 776078479a495f0a20a69e46f1db7ec8772866af..ca2ecb729bb515971613297808245eec8868121c 100644 GIT binary patch literal 3580 zcmZved$>&X8pq!qiAqK3qSBx!ilQi$gj0@g=kR2go;Yi*Su?Zto;7Rjb(yiZq*8IB z63K}Zd(XPfx|NDZLUbdA6A#jb(*-3Il}g9?{$`Ko@kf7rp6~blzVGk1_T`y(4L78b zuWb~bZ%nRj6!$cyjy9${H)RGjNqkdHwyE}!rtGXHd0|s-Ta$9QNo`lu`WE$jipGp$ z{>@_Hy<)>BMM|7R+^%AJUs3w8nEkmZx3Sc=R$WI+>tyLyS;n=NIoN8r#iGQ8#0|Ij z(Uu@vV!@K8TeXc=*0z+;QkPrWD$7`BnH#LaH&(;9nC?T|K8tT@3$5+c>2~@|J9Cbm zz1Ws}*-9TnGTh_$zUfZT=ZMIm;I3+mdA~fvqjJjW=v_1=@EI zx5nl_w9^}HeY2h4W{>*}>EDUlX$!k;aj%^^U`vPW>|tAJ?P#Yu`gu;_LWdInAg;5M z?CFTTope7(8sO9nbdbbqoFhNrC=WT>6OQ?mlb_+#KZgmO z)H#kZ53WF5(Gepjv%rxSIyFlia~aYHD7DU!HaPMoC%4rxKSlHqaXTF0pd^dY-uPZgQe4 zPI9FuTzQVG%yZSEtGTWopzVzI2Ok3`c$man-&! z##eaXNcmDSLjqXY4C{jB5XeBX#scgD?U zld{k!eu-bZ%+Id$b8q|F`@Xpj-LB|%#XrpFH=#No)y2eb^@UIU^bTMB%GY-L4L_mN zu{=kKek2_6(-h=d2I^^n-XSPl5K!W3bT1<=0oxz82e^{Bi-YW?fp$5I{ z5%dBBNSTW0CgNuV`g3rDNShOw^WcV~Jrp05Ky*f$q(qXqQ$q1{IElD3L&}^J z%IAlb#Zs+znD1LjRHO>116l=xr2b*ydQ9Yzj0YyD2jeJn zQ&=-3ly41lccT9wvI*cgBRY=6vNFT`Q@wn%h}R>z5Sinn{6xe{5wE1=q)4BP>TTkuM%kw$c_xYvC_6hc=fZ6yX?~i`#u7z!6)ED{GB6yV-ztjvwI`LS-r=7RD`O8iWzg|LT-TM{eF;Pw;0GFIP?^^GWg!##}O!5@^| z9Ot(oJ%Uf-XK{9CoclV~_Qd%Eas460EvqPTl*GdodjiT<;G_y|aYqZ#l9DY*K9P)8 z<)V4@Gv5ZBOhOydnPadc?0s>(9?MzQ4z#Z*Hg7u;+LMG(>Q4GamAng-ZDvNt3TKhj zfwE^;s&k+nz`4X7i`Za0GR`OS*irVVcBHZL0>Ex(?}knlpQzOAX^cxiS0cWmiEgBH zCABLxAWU>;1>5=MWiMPtxl5^@RXr)qw*M8RUtShU+yL$UC-g(c-W%+NaTT6(HKqGf z-8EFW1_5g_Sd-OwZImy%j^qJU7|@*XY=T|QYWA3GD0>BDV1=8Zj6q;97y@nqZ0$3K z0rs*OP8l{fqM7t4(nrBE*!pISu5cf83{e`Cm-$!{vD2}($pncMNP`T>R;aCL9hAYA zGsDFH7?jsBTg44j!(=>|2p+ER2y{|~$Dxmb$zU3I5=?D|pGLxyBuyiog^Z`cbnpyG z(@BQYXQE=`OlOkzEE&(jF`gqbW!2S|-Fnj4hT8~m z7Tc2&9|N{D*8|qu3^q}63+3VXt(4qG#&#O_C1Um?u*ZG|wgdL#d=A*-b`rmX)c=yf z1{rMMeN)jNpg)1{E9`>q25bgf^9NFnb$`USQsVcL@I7Vrk@7w1`zv$%pzQo1fQ9%2 tsRu|u{^DQI_!Y4102@HJo)rx2$1+Eu3~a(=Rh3$WMaY(7iz?FL{|`-YW@rEa literal 2272 zcmYk7dzck<8OJ{d5%QX#SVG2GHUcui6c!@mrfH~|=_43CMZcLdd(N&T1 zW*CUXB_S`NqA8*6?wL6=X$EK{m&$u0X-b+mKp;!ZNP2&}@I3u-p5J@<{@$5q-uLq! zbwP*G(qXRdC~WJn-sxyQ+)-@kEKTaPjn3IlXUp}S&dN?V?(|;j^grw@_v;GI>k6;w zsx0ejeXOhcWLNvnF7ka*Z*>)O*eBw=*X15dIaix=0>R0(u%T8NUW;^OZ3GS&?1`(~VRR_}EDC%=jkJpURm^*6CV<~=t(yKLR zPt6^N|3NM2ABPi&zDnyzsw3mJF){h6sEM(035BV#H3j>s*q;#x#kg`YQH!L%fw~mq zQi_)mUQX*bnR|si{7S_FS@w?b2 zvrYVUaS+GRZ>8*P)aKZ7DLot89WmlO~O^QE)&se)EWwFu&RkYKXLEGUqks$f;EJ9N%}tQyK(QuUn`%U zXh~9COZ(lDco4NJF&@CWCuv?!>A}RVB~BN9jq=tcibe5j)YFNPQrLv`deXd+Vurmx zaTEN5N$?2K@pbaQN1awT8tUd*^}?9CHL+frTDP~-@+X`paChQOtC!9CoTmt$rt-sj zw5s0v0@XL9{NGW(tQ$$)+)%f+)|+=zdaiE2i~p~BaHt;kNh==_eMI#?BK;Wq)U@@G zSme~1snI)EI48Ax=e%Ay^2g?^J~_8<&hINu4t0{qdQmtAdu;0TM&`8AM?#;#JdW~( zX?UDCCu^B`B88LmG*|SM9A%y9qcbHPI0d60W`FE{R4z}+4@J#Pt$z4J&=WjJB>hnX zkwGSZ2Fggyfmoly9)RPd5^d9o0T^NG48oHt^Q6k@_@4n|FdB-_;teLq6E%pk5j6y3 zh*+P)7>e0Q@y1jWvoLL6DL0!iM`%90JJRy~Y4}iDJzKORQ0L2W4r&z6D1uSqjKuG; zR1-p$VC8%XFHXx%1WiO^sg4oVS5V_H&&S@BYS^}?(I~3pY18G#<3A;joQN?20g(J8 zg2_aa#kvqR2?4L$x*2Qb1BC{%pZwPXuAb>5#Az# zkEPCSs9Pkv4D(jprFbV~obWcDHnuf$!BcSaVhAo{8Jt5A&@=51Ijy6G(cjOccW z-$8L$CTt3rno5DOGCC6y$^Qaj(0c&N>j>9L;33p{gh=u+=EGROqS%2wAuCVGDxDJT zKuwi*sAF7_*$JA)gfNwFpJ_ma%kUAAJxXPx9KS(L&y2^kEZRV8BB6~M=x~!*zr%RE z8`CGm*^aY==rysP!QMi!RjkdZm#|)x+B37lW`ZXr_B`em{4GSY3Qtu^b+U+UyyIBihL((L1yfrAXQ(X@)x=ED#mM=f2FjG@{+9bI>;s{ zze%`Tl6z1GWFd(4E^06SUa{W6d5hp}vEE1R#<)E*_hQ|b=>_thmIVJKd^C&ntq*9{ zS3X1?#Q(Qg`!Ehr-jam}#Q86UL+GtiIE-@`Sth{?S!=Ic+cC084r9G6Z`@lilA|l+ zc)dcp_lFRAbT?oRBOEN{PU|NBbg@2-(uWX#WKZ-X7$mbbRDz$!Z$zl>{_h*69gVd& zoVF2?Jxc>l{%pc8iheZ3^O!TH2iGs-j@Nu*G>Kvij;8+-O2TAu8bX)mNJC`Jf~bHd zfqc7W;K)?liwX5C{{(xfo@K)2;w?vpx3U5%E5*Bu;?L@>I_@aA0-_?~z$l91g8O{0(>dduGk^Tfz2A55d#?h?z5H3t zLT$5nPjmd0X6cLOM2D8-@Rrm$Epn=*=DL>J#fFv zt@YblbGup_542LO3-O)u$sT#RS3cb*uME#;N9OBJ&TEtM`i#6WJ8#a^qL4VQ zkUXi7I=PUZQcz|T)Qbw5R?u%Nn9BxY(AK z*>aPu(2Z@$I&>!+hI@oZK*{@mLfdC4RIcOmyO>JJMNB;yfoc-I3=w={iR>o$NwKyV)^sMc>QB z-{Ad2P45xE-w~)Nb}z>J6s5t%)GL#nhgn zTZVJsvf4G)pwtO=R}$B{*>$e|GK_;@98CP{uDHpKzvIeV zTw{CritG-A&cyF>Q+vt=#STGlFB0~;;@7VHoooCEe;DzdJ*lUsR(nQY&m7=UtT*w8 zd$}W#4J3Z3Cyw!?6FqsnS2NK|pYG+(@fyxUtuG1Fz4RO}GtV>TLm!39`;nUTNT~H{ zRWGf3nVhFx<(Ugn9fIl*;;;9Fo1g|k4JBc*C*JNQ@AR_EJ#CfOSVZNpav#M`Cb8rt zS9_T?UUt2wzvSiKKy@6d#}fY*(g{dMg5!yQ&r5Ifw2xqpA$6yx{R`PCMEvKT@RgU? z@1=k6l%KuK?_Rctul4fHK7OvhPq9;pALNTMUmoHsqkZ)R-yG-XPVpN~L+uRQd^#8d zCXsq3tjQ!y_4R4U&LVB5Z_YwC9p!WJ7wJovLrtML?<*2AcrwCN$|$~3=bNTad_%c| zVt>V%vq`wd&s+y*1{C80a3Qz|TudY`@{J`ZUkW)JTmr5HbHO~~m-@n8zP!TMAMkT| zzrjK0JXEeA$@dc_UtJC3G8mTwfs$+d^jhCs2U8-7Z}2lOA{9}SE7VeYqpxj-TSNT2 zzO)sYO8kdDr9SbM&-~24eeFwlI{Gz|zVX%Xp^UO(uJ)5(|69eWhiifyXaoyDLpjfM z2#n4F#jb{8u*%;^?jGb0hI=j4Kfpq8J@`ANdIvTA0%c&3ITH0n@NNQsh{Di791$p^ zg3R%OJ~n8afVRb?o{DfA8Iuu~;=r9?8HrOMmm$5i%@U>t;PfW=BFjMf{jh8i#B>{O7<6B%Bh)Cx`NsP?;KLriJRvP@jc{7g5}dKd-rA^72sQ zLtTQo3Fb@SRWfAA=aIfnyb=mVs4NK0tHb(hVZQ=<6UA=`^+izckgz07FAbHuAU>e< ziqO0l*-nz1L#=@9UE+(O6okY-7{(t7wa4M@Ch@6IeKs_ohuDhyJ_c`tufT`IzZ43a zL+M=qHiPuKy8zOBH1jkXVJI61Hgr$+VGLoDqu^~#m7|E|j>Kl>vQKavTjD3;$ zZTT+!076eL@k=CADN|L_yOxX|C5&;7?^RO!AnVKt{Y%+FC4B@$H7AcMsmGV}v1Nfd zj@SBf;)GKC)KdLqn0+{kPbsCRmNL^y+RRe@oKnL)*n`k_C@0OYqyr%bgCi>R#1GsN zR8hPmDV@mZTo!G+h~?ctcM`ji&N2o&!WP&cW4q71YS6n9u?MP2>`gLE`54k;75`{N zwkH^DD=_+y+?Ue*D(Xof_wi|8+iz_TaytM)w^S6ULKoeLF z?ruY9B5^s%O{6n(MFp0x1gpTkB(EX`nSMVMJI3Puq&+~!1IQRHL`E}WYenCO$nLU$ z4O~ikq!cO3#&|m}atv&>L`I2n54EZCv}P0g5%5@r#}OG%f~Ub+@D%FUQS@jJE(A zsf@kgJFo?81z&X8Y1DgGrH`)I)d*z7ad)8Bx7fPK<_z@Ge`gzqT(0~xH5!C`X! zT!~$g_W&J1RfUe6T*YOoIK7H9+Pz=U|10>dat=eiE2p-dOjWT1<<@Q-&v8NrPVC5~ zIx$!6$myNiY8~&;9Qc2f@R%?#gAma60=Y*2HdaYyR)IwSUjSsPzJ@w+lOn jQw>bCA8v2_6Fdy|GKV5EFv8;lxa@$oGb&dtYXD z7R<<$Ez%5HkPt8^70}q(`!aV7O%N4H3e+fGtcdi`5u~F*N?QG%**Kl!A9J4H^ZWgt z-*ac~_wyY-t550J)# z&ky8=rmL23`~VJwahCx>~6FGVr5;JRQnMLHcrJK8Gwq zy*@OqfYlf}(?jx>!N^zjok$LldJgIbQ942POr+Ju z`mbP(i|y9f*$#gP^}Px{EtX$F>UF5s$LW2@?1FZCZ0v+}ckJwj-w{LlJ@}$n?v9n^ zaq6*HeIm~G#@a!&{~7w5FiygJF1G#zdw1M%1kPXJos9jOa{g~9d_*^#0UuSCo6E|@ zWp!pb%~$M;idxI!d2W1HCqh)spZO#>K$}ptrh1NZBguxb- zL86isiQ$kNpp1al0PjQ@(nRnxWwim;1PFaMQOgMMu^^d48UxM}Wh~T2Xrqw35c<%B z3Pn*H1$jiGH^HPqO$mJ)`l$g~f}o}urUd6R@Gqjy7Vrs>Cs6cR$P=NoATuEmNVO(i zm(j^KD3b+1=9P&(Cvk5~3YSptWbmtKnFc-;`cybmX>%#8{)o4M&?D~jFTnUB%v%z> z4Ne>U%Tbs?jb8@80?Jj;7A6A7T;fkfVJ3=V;!Id3-FhwLYe0}fngwSz{Mi(J6?_)d zxfIPoYAy^BQSK|WTnF>|DyTOA{6&KefL_S=pe%#24CW66id_#;^D4r7nVWRa=`f(WRU?z#P9{x{h zzY%-~{U95lu1A&UjZkQc{d4$FQ29w@UQP&VB3j@~6nk$ZgfOH&5WHppJEZOyZcMof zcmhHh(hexkR?+??GTWfNmDooT?|CY`fb@3Q+bP-x{%)eaPfzy}w6Wey6w+#!O)iklUzZ26W*)^N=Mw$SeSXERYqjsw&{;AUK2cT|wCYn9)|k6^uLv zZH-_A?mF7713}@f2fW8=w+Wfe=vRJK_FGXX(I}x|Qf^h;kYYH`0`yk}X)kn=EGZY# zYmoQSRllK!*bk_uDRmh95R^j{os|#tw`q4wXp5ADegTnsI!P_kX(1r{pAgcKKK)Yv zFQBvPslMwWRkhSGg|eg*($oOv4yx*)DvwW(=~u*HR#n7cArFd*B#+c+W{+lY>GNMz Ca^#5s diff --git a/res/CACHE10.IDX b/res/CACHE10.IDX index d6d21d61e553d31f30025a4b05b73201f5daa2a4..82031d4fc5c7a40c46ce42db76417249284f5291 100644 GIT binary patch literal 4615 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 diff --git a/res/CACHE11.IDX b/res/CACHE11.IDX index a4bd5c3a5337e9b74042332a529b6cb392f632f1..75b7cfa03390efe7fd6d8a56d55c2af6f6a4771c 100644 GIT binary patch literal 5562 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 BP167X 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