From c4f20036f9728cc0f6777b3af1ee3be911846047 Mon Sep 17 00:00:00 2001 From: Bobbi Webber-Manners Date: Sun, 22 Aug 2021 16:59:07 -0400 Subject: [PATCH] Reinstated OSFILE error handling that I broke! --- applecorn.po | Bin 819200 -> 819200 bytes auxmem.oscli.s | 1 + mainmem.s | 5 ++++- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/applecorn.po b/applecorn.po index 023c2480fb9c26d68348fe8d0ee7d8e1dd11e012..f908b6430205e9dac3cdd998bd7b61914c2ffc8b 100644 GIT binary patch delta 2983 zcmaJ>4OA0X7M{st5=GH~E`o|Y5Yaq90ap+H;18e#jfp~65nCJg)Gq6BcMoE>E{7w- zsma>b;ecqL+R~F!MaOnRf{Ouvmf$bJR-?SduQI< z`@Z|#JNMrAST>bqQ!Uj&vboCYy+Ko?Uw6PWd3yk@;!qj3Cf`|WzJCK3}y97`8Z|ypg9arn5TU2UAgUDIbD@L!gS_Z ztLcQ}{B=i%O_4==Cmh$)2Vajo3Y`yc_uhW^_;xRB<<4GletY4J$=TM*;iISM13}KO z$d^^1r`k51rniR~opha3=9F2ixco9b5ij}-$Z^PJI@A_r0+*PN>cF_E_f(bPwbbb= z&^HWvpWkI4u?kr69Ckj_3&DtsN4%M+;SYF09Y_fyngs~@R6Jvt&nFntc?Or)fr|<` zI=w%JQ`mHe!A20Zv%(8%JrzA*TUug%zh>;&VVhq7^M`gaYY*V7M?qxR5@e=;6AH;K zTn2(v%lXCl$D^P=ytJDOvfKN8ppEsKsAejUW9<7&aqAagURe=03Gs-Fmhi1nNPoaw zZYMJz&WIZzA0;{N9O9TS;$kG5Sj0DQlcldX$@&Z&v{pMyHy#PQTet~GsBYmVBG`>fL|iTX9f=_KUUJY<fIHg_US8C9FbwX(1P%H-l;P7TjY73E@S7EGiJZr?UJm&_$$yX4Hf6GoK>DJBcJ` zt(2Ss$?>^-WJwd=K-?oFtVi5qBs@Zf4DKls9wS30*N02%L7ZZs^YGz%5LKoo4cm*3 z492prhBVGFyHGC8{JZWjXIJ5?{vh6d(m0>YRQ>N_3(pa$w(tV|pK6y4lv`!dNWYk! zCeR69Vwa*4WC>nknyMl+hWUmCgvXF>Sa^pFDG#KslvGz4sjGRW%1!w~?xd4Jw%geU z>^dP;<&aro9F$Wbq^O)Swtz4b7FmK}AyE)hg5c(^AT)*yKG%>L0YlFQh~W#B1+q-f zOclE$jbOcV{PCo!ymO^^*gHJUPL!a5^DARVzZ7tY70f`J22TX3$wf7CW|3IQamXcS zLHf&C5w`<`{)XmzSNf zGGjV*qd>il+%CI{@H!h+C&FUQe&gIh9C#3lqdp^4;fI}5q{4%LWvVXf6 z$25UiBZ^TY&22@EGVUF`p$VkWetkS{ZUW2bUL4d6;z%s2W{@eJCPG-K_C-7Tee)f1 z-&%gV=^OHMg=z>r{GS8gC4G9c7Z_{IJ;3;B?Z5D6&0s5Cio;I;YpBAb*X1qE%bZT> zr5Gy6-<<#%^2O3sr@}=x5RDg}1Y<|B-72@k?HtDMHC=}ayx}B>p#}WjNidma@!^wT zL8RPON$YEAYo#N^H(KJV2}IXsJO%1b1sUO8_Ph3g4}a7{Lb468Mdg|o^Cv`%(%d!y8aUH7U zdSr*Hxcf2~=d#4}Ayt)aWRL8?w_KJeq0zM9Rb6>gq1VD*!b zB`5yCQZ5|TfBDKQS{3nQuC*d}$@{(*ybR}yvwg#Ut$3P2kIXEFe7z_*t$Q)w3t zS;|CbuN60n8^qs`v5|~Qu}XYj{77tapX@3T%fuaI^j+<^`nvchGWPi2AB#5ex8kkN z+2R8KSSV(T>v8c?CTm(^r{P(1LZ_kc(EWoC>U|EIk>ws+mYyhh1u>m}Ehh!)ztexg4foB=j6rFC&j?G)%&18N-&PdrY+T zd7!hMkM;Z|lZS)@zwp3+_LHe;^MstgcJ0cw6DEpxnLHZls?5#G%3U#?;=db^m#ki* zC1Rgn%+AZv=Da3t2b;PHJUcIU$>OZ(l+DxR*-ys2Z!0>BJD-SAT@U~6>WJChq3c-G zarkfVe*?q1H60#J%r(tFJeppQ26Stlh?*$8Y&nx8-|uPjqfQX9-9tc7AptATF$tXSmdBkN=FiL$iTdggVF@wfVWSB&* zHoIv@F9netbwayg1bfxHEGi;C1`;0u(!|x;Ca`kZi!+LC!6iP6T6)ed3QZ=x=g$52 z|IhdR|9{T^pEJwzb9jD^qf)J!r>(3~zfQ#kpSbN4ft=Tv1s(WP|3?HD~A5FYv_+>|uOTV&j|kTx55J;>$LmvpU&2r^<;VzG0)9 z=G(wm9HHqxsRNUz-_@6g*Dx2aL61M|f6>Q3;{9OR3)ub4EcqiL4vBVRhL7;#I*=4f zEQ=5v(2KybNKCM#hyd@d17G^7(ZxeC0@sv#6l?)e*0O$3qm&JR;^dhH!^W^n{#*Y8 z?0Z|uTXPU!KL#Q~(~zA3PAC~#grx{FEmxM{=f^;OcuB9IZfza*fHuD0#xyhe0@r$| z1b==UEG#V&rXmpuQ564qBr+ei?`|b;0Zfb=aUMhicaI4y775cR2O`lS#L!={l>J5Y zC_Ag2cV@z8uMuc464VqEf&>nUmxNFxYJ`bMWP~vCi4`Uxkrl#`RNf*?Mp8wKphMFB z79j#jl`X;)1l_p$1TaJdp?%{KaTiE^jid3}0+2&1O~7|ffTX~pkv)`(aEt_IQhg=` zbtK@m5=aao`aBwF0S%mt;B$;65NjajJS5~$j^F_*||M&wA4@=q?_SxYykfCj$2204Oq{}Nax|B^&qO0^y?t{^Jpput4ZJZw@SO|ThQkYb@sgK4if8s+UC?fyKG!=S&kZE$`Hzwbwts;)AA`O>ndZaa5m|mJh5Amfir2nWu(kmtqQcSh zKq~TO26Cp8T*+a`BPW5baz4e!AyUS|2Jrf;Y8)VBHXC1V0I^Y8WG37;;1z#a=oKBW zdBsg))PhemVTyb5zY;!_R(HRfn zwo|}4 zm`Q|R6G)rLDY^NXsVh@wGhOSlipkxwuLy5!0?Ww!pPInhS)Fb^w|&^Tf=+!(TAynz z;FtPvsBD{8C-pFRr?=y(vmhR4p9R`++fgGcyoVZ9!VbLoEJ$L#liS!qtZ4>uB$tF{ zkVb+OHG}YIPASZS(Te!7?OU?2!jd7gy&qVs?E}F2$C^HTxfwuwsTr(hOR(-7Xb9mH zb8db{e%frtOaqsZC7lDQ>=Hbf#!dRe|Grdc-K27w?>~g zLn@b4`hmFGvR~}7RKl_@2M6UY{vGjWV=cp7e1W*}2bK)+?Xec+JAR(Hd90<;#m9<; zqZR;}TjIN;x*uGBi!bKiFBP|s8acT27XM4Jc&w%37M~}Uj?x8}GjkUUW*T*7JBMaiewUBW4s&dj`g;M8uYb~%>71+Ln1VL(+|A>3ENSeGMS z9A8o1M&`&2+~jgZNvB+bM>f5l;#yQ^`EYgRM=A=pMvt&YGyD}vkw)>-G%smB4&8@#=m{m8yrqry z+M$uN)<>0nKIKQy2|lR9cPxES2fnwQo6dIPkPL2G=305P{IjLl?}$$yYPmJi5h z+|513@`v&sGKQ|-yuMD}NydKf_mJEu|5{eM=gEt_BSl^=Z@@bg~tqYuql)K zIXQn)CKnT-*kre#M=k!tCX+^~y-!d71DkB*@ZC&q7R%sCS)7^uJAOZliy2qfQ}Vlm zL&@eWSchw}xY)>;o?{0M8XHrtvPGKRENvr)ss`$4l%6bZ2U&f7HuoDg2e)N&>w=<{ zV_9#KN3Vqmc=nqdU%F7Su?;VLz3hB!7TawKNdt-sygN)@<5gw+l^Zv%-8e^1M5j$L z(pxewJv}dHHY45}(U-4TZX)VaubP>kZOUFvr~Pfc1fH3nw|rUpY^G5;qhK-?cJAxm z-u+mP?D_t0uA4FYZ|2@ydh_UCfB!8E?ls;}j4?Niy^3*AF|xhJ$FeaJn^thMG+4Q+ mEL2XhDpp1Qj_$FVIIBrxHThXh{#H|f)f8wojjJ;S&G|1|2;=$y diff --git a/auxmem.oscli.s b/auxmem.oscli.s index 9db59bb..99a6cb0 100644 --- a/auxmem.oscli.s +++ b/auxmem.oscli.s @@ -72,6 +72,7 @@ CLIHND PHX JSR STRCMP BCS :S6 JSR STARSAVE + BRA :IEXIT :S6 LDA #<:RUN STA ZP2 LDA #>:RUN diff --git a/mainmem.s b/mainmem.s index 1316853..7aead42 100644 --- a/mainmem.s +++ b/mainmem.s @@ -478,7 +478,9 @@ LOADFILE >>> ENTMAIN :BLOCKS DB $00 * Copy FILEBLK to AUXBLK in aux memory -COPYFB LDX #$00 +* Preserves A +COPYFB PHA + LDX #$00 :L1 LDA FILEBLK,X TAY >>> ALTZP ; Alt ZP and LC @@ -488,6 +490,7 @@ COPYFB LDX #$00 INX CPX #18 ; 18 bytes in FILEBLK BNE :L1 + PLA RTS * ProDOS file handling for MOS OSFILE SAVE call