From 4a20319304421b7b6e83d5e4b8f1d186b40d8c01 Mon Sep 17 00:00:00 2001 From: pkali Date: Sat, 3 Jun 2023 22:59:51 -0400 Subject: [PATCH] inventory price clearing fix --- Atari/textproc.asm | 19 +++++++++---------- scorch.xex | Bin 56295 -> 56299 bytes 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/Atari/textproc.asm b/Atari/textproc.asm index ea78842..282507b 100644 --- a/Atari/textproc.asm +++ b/Atari/textproc.asm @@ -505,15 +505,6 @@ DeffensiveSelected ; we have enough cash and the weapon can be ; added to the list - - ; clear list line - lda #0 - tay ; ldy #0 -@ sta (XBYTE),y - iny - cpy #32 ; end of price - bne @- - ; first special chars ; (it's easier this way) @@ -551,7 +542,7 @@ itIsInventory mwa #InventoryTitle DLPurTitleAddr ; ldx @weapon_index - ; WHAT THE HECK IS Y HERE???? I DO NOT UNDERSTAND!!!! + ; Y contains TankNr lda TanksWeaponsTableL,y sta weaponPointer lda TanksWeaponsTableH,y @@ -560,6 +551,14 @@ itIsInventory lda (weaponPointer),y jeq noWeapon + ; clear price area + ldy #21 ; beginning of the price area + lda #0 +@ sta (XBYTE),y + iny + cpy #32 ; end of price + bne @- + notInventory ; number of posessed shells diff --git a/scorch.xex b/scorch.xex index 4f0cc3051a052a3a675dffe366523e25f1b2f8e2..5f4c059c3ef2c01fd99d969314e1151d869bbf8c 100644 GIT binary patch delta 5384 zcmZuV3s_WDx3ifU9C>&K!~l7?K~NDDR7^~*>=qIKF|{bod<>5i90Ue65MzMR%}bDh zjU$L-h#Z=O44_bof8(S7I(4w@^w93LoArrN^c<6}e}2Ds*O`I(Z(rZQIeV|yUTf{O z)?WL3b6WoWX?f4{>8P(aIbEqhDRg~?7U`%xW2yfqIlL$SB^k5NVQn(jCtH0PhdX|a z24tQ=Ed40+>G>;mUk2f8Z2A-6cnd=!~I-~h%B7@&E z!8$hYYFnDFK1P{ zrxoxB`yT%;3r%Eq^IT~v;D&I2p!P!;2bj^&B4>O_(U?8->wA+kIRy=3(sBs zVx6C3lF@y1ogX`Y%?;<19i@)!uaSmc%bAT5D9U{ZX=y-i2s|IojfLmdTox&5U+y9p zf0w&(rZ%5%C#U!qNiSbQ{tMRqZx%rB{24@_)cpgkpsKv5eVn`D#a|%TG_Kw0)#Sab zLW%V4!Z{E>!-dho5I^I=1K|OV!|$v%uk#yF-^JH^WA{9S&^7w>YxyAX{A(Ie2N#8U zH>9!WHsky>yjp`#(!UkOs5Yhw6ChePQbW-`)IcZbLxS_u*o&J%$@B0k)7h4;1N@bg zHf_XU>~{LNKGN+<3f1YSf#r4jAP?o%mOx%nm(H%GZ|SGcaMHF+;bnE{?_I#+Z=4Pf zn#hR&EGUEC{~GKlE}dRrfej#AI!VAMfp6&EQyQ>`sDw|FZ3M{&^PCsQ@BmTpd~ zI#$(ozCTCJ?x44e8y2Lc3G+lRKAM>MW9CMNh4~zD0{=MKC=KVr@Pca?1H%Vo6Pwn1 zx+D!v;nSVrhO4`Vw4C;mRUFbl5X2Z3P5pce#PeCk((hPbvp39k!8Ixm!;ezEVV3I4 zbioS@x=gzai;KTZZ`Y2VWq>?NZa&MfU#1V;;%*5OMFsfk7EJ9hRV#RvbHd#U$dnU6 z8z*qL;)f@W0po`Os0L6#rV9izFEFsMAQzR8I2RACVbexGRZQ7sfHAiOY6NJq<~A)sbgte%yy)yk^@_suwND==pRwQVOuI{DAX zz)IR$u^d>ws`v`6q8BR{AUz$aoQ`^FK-D~?pift=LSgh!RU}HHHh6BQgH_?kNZt2` z2K>Bzbs~4udzu=`OmHE0PF&2T#V*8sblLs|fj@5t*ieb+HdM-$UMd$AT*;*}hn&4f z%lETWP1!>^0h}RIMGRbp!zf}@^vC`Fio|SeqN?fz^MVWGxxTL}Nh%`l|3zL z0{c*9Tsm_khkGLmL1;XYC)sGd$B1*l?5qNCQ~*@5R7i0hWZe(O>1ZWY*FAK>~%VwCZI05jV?yZXe*6J7wG3S4kc4{!`o;F{h$G()AXl? znJ9)nbZ`N>PoFtBf6D!QyHWg6Gk#ccC&_16OKT4<47#81oa}oZHqOW^$Vu?UDSj>K z#rNqK2g4?%71+ucQfXV~N7~s+>SZcK{AUpnzu5Av>=rFN0J8ecUqO-l^P4Z6ao_SEG)8Kw+U7(nF zSo%ZtiTxq^L`}Zlps&!^>l^i->Oav}7e|-OFWI2qppPqETDqe2Bg5y0r%TtAt}V?f z-BDUvT2WeQs5Klk{AhUB;90&=|1SNiIdaW`eY_9p7Vq$Zq#Nuqi$6kYbc-Vr6u+j& z$E6M>p>4}?YloV&^IpUp&s`o?lFJZ<@8iAup_iEig{~VfG4V=pd>wu9NTkOS6Rz6_ zjQA5ujwGPH^!+0dtCpF7*i)k7J%QoCK6{T?16zHQI|f15VbVw|OFCdxNj#?+4tIt6 z7$ktxWIjnWM#v}^gg$1Tg;X@d91^H1aRwQuA^BViDd19}=%+y)K0uF}BVqsl(_9kd zvqzGkbV(Spb9P~hSZluo2f#|Y`RHcd`HWvJDci!o_R7 z0@>i^;Q=NrGj)ByR6&{Wi?@Bq3@gkZGPci{VVU_e270C3*B7HlsO9yAKG}whjsf+} zD_0m`h7~`eKfI1#@!13J>=r%vhv2E;r#S`k9^f8CIv~WSWV@0Z2ESL74zA-;w|L8y zQ_GzkY)ctvYnJ#$m2>2RgJ&(Qh3Z-&+ycw!?N&c}qNTz=uF!fL67+Rs(kap;E_?QwQT6D7}_%%R2BBI=^)Z zaA{lPpyz67edys4$ZBYXA@|$08ALk(7QeI4rLv@`Y}`7RF~3Urtigfwht@=uw5%A7 zGw8D8i2)hAxl__9KvK9q>2x4z&Ja65j~wrXg0{MC!$Qyu;z>HQgN@N}Z|KG&IXAkb zrMYfF*&~PSvUiK$jbTP54E?h0IiRvx7y*e&TPq_x+@l(81*eQ!Bu4hzayb0gaDjgJ zaxywHEM?jXFd(bk-VKi0O7+}~;+s-e0HPyIYB|1HHQqwQkzt8aIKmsF+(bFMp~}j9 zEIfdbqEfi)e8HU~>b&rnI1vgT9@@kfR0!T;tW*UbkU{Lf8JY^|asv0B>p2k{SIhCo z^%0w32~y9y!=(y5ca1$&B@`b3X_=KmExg()g-&?wsS@hMiQMLA9+1sI67`rc$&o35 zO>AMM;0`bEDrdiYu2Kkt*_kTnASD%rNO&Et5*~$DN0qP~s`&g(Ab^djuok#QF#_Z8 zw7|M6`(Izr_EzBVlpF|e>||nZz?;^+G3Aj69b7h`jtUPP5{~bK-d=jc zg$4e3xSs$r9&!yx6vlri8DobVi^Sdsib{+96?;IYlfCEvkYW>wB+)0Gx~xT3vcNrig%o+TW{ z-&=I(7Tw5yi(aM)9cw3kp`C-(v2y%AZSQymU8i0r=0^OzhPx@kWpFoJR?S_2aKA`W ztRqs3^eePT5vE+g(TyiC%AooaK>>4X!GAZUz+MO};u2 zhu)%7I-|YDa?!k8ihQ;+D7eGKdlNIXPS800fh6ye0U+4hIR}|&Pv=~C-sm)-ewt!U zLIt$bT7)*x*g2HNeJC^B2)=D;GNeUpeTJ6 zSJ9;IhNl+loa#%xn0YZ{ev&aKF;dZi>)~}*&w+yu;etl?GBn`_?2ObYmTmgM&N#xQ zZwMh+sK*QG^qyJ8LcQxF0edr(p981Q12||SHpY73J5BhX^}NiX!hOzB2{D1z8#UE- z1}{0x9f#27+92ZD8Ef!MuL_|?#juy?2F>F!=nl--a1iI@!^Ik|Bv7C(9WzFQ#@sGJ zX`BEs3tpcGm1<~LgjB2~sE5_#<0z@OS)a$whOY_E5lG=>SVw>A2``58RB8gC(wl9| z8Nm;dwNYAQy#C;edCrpK2oml({H0>^nBeYsS(xAmcV>M`1KUQ&(|UqMO6l_yGTE^Q z;2_bl0~*|zRbzhrw*nd0;|T?l)}C|^^lyL;$jtjfT8VKI&!b~JwCiL@*h&|+6|ho; zgjxn)6t*2?DFscPcKmQM2wkMAQ%|80`s}HhYN)rQVL;skW=#U0jZkuGQS3+#^pehE zEe${hJMW+~`CXkUBp`Q8@O8++9UvV7;=5B*r@~Q?06kedd~8T}eQbcE+#ve#=`^&r z1w#3JFI9bNsyWJN@E~2^7p|OnD6xMAE$xenU=M9SbpO!B#_t;Ao64FN9fF;J;_{m? zspr?IQA@vz@Je4enn`c>Ek@tas5jSoM4EAGBc_e`4y}4~9(s=UzZo zxYc)Rc=Uoto=Acign$#2J)V+dvGZW0_ugDN0hlj0vI_d_Tj9RWF*vBN$rW5Uk{aHM znYPp{xc4Zbh*g8qe?cR@6*KQIXwrX|)1tsL&3{BHUP|Yl{+D7&GkgU(ehSBI74s{JaQrMm$0uQQ<@#)kb1owTi5R#?dXJy=Vo*8l h5gJta7V-=C&%gr84g^lvZ!sU8+TYTfHL%C${{TKoM(qFq delta 5528 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 RD$K^We1_Wxv&Rn1`WK6>eklL|