From d3f32a8743a3ce9a6a4c3875719807ab49ca8cce Mon Sep 17 00:00:00 2001
From: Bobbi Webber-Manners <bobbi.manners@gmail.com>
Date: Fri, 10 Sep 2021 16:11:57 -0400
Subject: [PATCH] Fixed to assemble in Merlin-16 again.

---
 applecorn.po    | Bin 819200 -> 819200 bytes
 applecorn.s     |   2 ++
 auxmem.bytwrd.s |   2 ++
 auxmem.chario.s |   2 ++
 auxmem.hostfs.s |   2 ++
 auxmem.init.s   |   2 ++
 auxmem.misc.s   |   2 ++
 auxmem.mosequ.s |   2 ++
 auxmem.oscli.s  |   2 ++
 auxmem.vdu.s    |   2 ++
 mainmem.fsequ.s |   2 ++
 mainmem.init.s  |   2 ++
 mainmem.ldr.s   |   2 ++
 mainmem.lists.s |   2 ++
 mainmem.menu.s  |   2 ++
 mainmem.misc.s  |   2 ++
 mainmem.path.s  |   2 ++
 mainmem.svc.s   |   8 ++------
 mainmem.wild.s  |   2 ++
 19 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/applecorn.po b/applecorn.po
index 6884d9c5c540cf90f066d9f46204f910d18ae83b..62b1315da3b12648d7848dd4e93332af1ee33f78 100644
GIT binary patch
delta 1161
zcmZ{hTSyd97{||<oin>$$W_zrVmg^o-qun`6p=QyTyQlVFGE3C=$rJ?4Si61*_6`I
zg{Gin&@hYARpYEBCT2?(YHCW@+opzwdD}HZ2|A-Y=`IArVb1sc{{R2ScPcAmD=TBo
zwY0i$7l?@TQip*lKz`zUObv8$MN+(LkpeNgJl>FI(59s8a`ahRjxGiPfIsp-EIo_M
zJ<SoU41|GaY3^9G(@meL&((4O&<#KdLOf-RagK5kY2uf|<?2>(dlW+!mzJGJGP(f*
zgN!R?Y9rb(t!t42QO@A}R3Zc<coOUf<~Uc(^almS*U_#;3TO>FeWtVn=hSo)g+Qr$
z?pa0?&nextF|sy8&*e&cc|kGYlFAh`H87frUN^%XxduI#LZ+s>i1wA6b_aG=mzyqO
zZzykYJHR!90@3m$T)t!m=#LZ&z9q?6w6tX}^$xoNeMYKe_k;2U4}xV*ej%m*?hR@$
zNZ8&q8xiTJ?yORNrD2G0(@#+>h{+1JQ%&uG9lI`+3%BY}DY=Eij@rZop*aDbGpVVP
zj)DB}%@(;F?^tO$BV-jI9w)*B-h!^0=_QIVh|}R>q}1@mSK&vM<yr<h0dYADJth^~
z2@?&CX7W+ktY}4&d5#e)FsAR`v2>T9G)UZ|a4Nc?5`JER{zPyc;!Kq7A?e#Nj|x5i
zap!Rn>QQYP6IDIFj4Yn=?LIC;)tXHY(ksIC=#bZ`k-@$iab$oT{X-*S)8j6)*v)>h
zvvUr%ajmhpMto}>6<-g3`to7$oz(fx+83X*3ybX9-2C*EZDran9DIZhE1ifC(~0se
z4<Dh8SW9Rt42F0N_3!g&?-Q+~6XKI5p<y0{c(X0GdB@Dkg3U4W)Y3DLsvsw&j80fT
zkCTwe8M||wp}z6{0V3{Z`(y#TWOGPbc52qP!nVxX?6XhFl*3l>^_cZNA%_=hwwx>_
z3&^UF-)E`$7oy<0039e0`k5d#dv6tKguqoahkv6b3Nn`Eb>tJ-{1OJ?lT2&C)<f`&
Vkyjddm67)_@}5TCtC{yc`WId-fKdPd

delta 1315
zcmZ{iZ)h839LJyMa!-<GHA{7E%5-v!O3k{avrcP^Om4~5JC;99FO4U{$c6<4eK#45
z(VQ}mb(<?C;JuKQbmDA_X0e4kbxZ}VHhocIUpYbZr)#>ovEH)TYU>uCOPjd_gyXs2
z^L;+w@9%dHCyMQ&*q%5`+74R5u9m&lCa?f-;jl(W$bFHnj!KaLZFHaDWxP%oOZReq
zCr|c+dJt;<KaBPB!EPR7$3PPpW2&*%%{0!(1)V$q<Onc<9hNd?)JJ*F8a;&U9m|fg
zx-s8>qj>#16X?S|E&&8)jg?sRBKGcdR*D4Jz1cYA#zue}UjdJU__LK*^d5SmV~DI2
z3E=e7oKL@l&8f+c2?UN-_w6y-I|8O^Z(G^x;rO6_FP{@e5H?q0(GjCPa=9w-p}t;@
zcj2kYFR@px@;-$1&_Pzmz9DMCV0~o^0<@MV;X`^DAZG~*eDq=&Yc1dMgRgys^SJf6
zKZrW;%#&qq^Jh6^dTiSo(Fi*Ao8G+@hzo$yi>Z^QUrG3q{O+TMemS<!Kuy_*MmT9b
zI3Q1S!Vunh;N;n^PPr)#f1I2NIrL&;vM~0t{OwyvP`cobTJ`W@Gy<bGf>Btw+@c@U
zDM#R}S;g%0P#J(b_o!H;b>^IufKq}`5{5X^vw9`PpeW?f8Ts@udItmlC~kDrT-xF8
z+o0k@ff_yYq9UNMrF_r=mDkZ_^G2?E|84Y@<v|a#atsaHOQd>#7(KN`R)0V*$U{?z
zR+rA9^>&qt!#ANakG|io-n)t3gUxf(v9IT+e~MkA=9WLBuHXIi4wa<}i%Wmr%oeDH
zYuQ3};qGGL19kounl?m*+hcgPW(e11xPls@khuQgDzeLstLU0qyn`U2{Dm|Eey84E
zLt9%eC~&*7-x#kieXv|?FwRAC>E1ryiCmfy26Ji7*X=)r6~;$<nKQYx$4|S916iI9
zF~#FqH{)S~jHG3~2i#omNiFNzcy$Y6UB=%NJl&89^l?G)wJghcdc>8?ewyc8BFY_L
zUd1cpV*R2iSCsN6md=A17|ri#3q%TzbjnB#r)N^y7lou#tHZTz9WNV??Uyj-w30ZJ
zvXqeDl62w<btF9w!qj|bG|%GG_ix~3js4^Xdy2Ja25K?$MtCKkB3710^I=NMVB;ei
zIg?rq$BNX?ndC0*Z!8p&dyi|kl5Ls|8!&Z#D)u{t2eO1Qqpgh-shV+;>c6Tjj~iG$
d(-EPVs}qu7lmwF`m?fb`5-gIi<$_TA^uNxr#l8Rl

diff --git a/applecorn.s b/applecorn.s
index 3276268..c693f29 100644
--- a/applecorn.s
+++ b/applecorn.s
@@ -192,3 +192,5 @@ MAINZP      MAC
 
 
 
+
+
diff --git a/auxmem.bytwrd.s b/auxmem.bytwrd.s
index 4972762..c44982b 100644
--- a/auxmem.bytwrd.s
+++ b/auxmem.bytwrd.s
@@ -534,3 +534,5 @@ OSBM2        ASC   ').'
 
 
 
+
+
diff --git a/auxmem.chario.s b/auxmem.chario.s
index 7de5e62..34aefad 100644
--- a/auxmem.chario.s
+++ b/auxmem.chario.s
@@ -449,3 +449,5 @@ BYTE76       LDX   #$00                      ; Update LEDs and return X=SHIFT
 
 
 
+
+
diff --git a/auxmem.hostfs.s b/auxmem.hostfs.s
index b25991c..cc752b6 100644
--- a/auxmem.hostfs.s
+++ b/auxmem.hostfs.s
@@ -907,3 +907,5 @@ ERROR2E     DW    $C800
 
 
 
+
+
diff --git a/auxmem.init.s b/auxmem.init.s
index 80b64a2..69199ed 100644
--- a/auxmem.init.s
+++ b/auxmem.init.s
@@ -150,3 +150,5 @@ BYTE00A     BRK
 HELLO       ASC   'Applecorn MOS 2021-09-10 snapshot'
             DB    $00                        ; Unify MOS messages
 
+
+
diff --git a/auxmem.misc.s b/auxmem.misc.s
index dae6b45..71ce76a 100644
--- a/auxmem.misc.s
+++ b/auxmem.misc.s
@@ -478,3 +478,5 @@ AUXBLK      ASC   '**ENDOFCODE**'
 
 
 
+
+
diff --git a/auxmem.mosequ.s b/auxmem.mosequ.s
index 821d8f0..2b953a8 100644
--- a/auxmem.mosequ.s
+++ b/auxmem.mosequ.s
@@ -66,3 +66,5 @@ OSFILECB     EQU   $2EE        ; OSFILE control block
 
 
 
+
+
diff --git a/auxmem.oscli.s b/auxmem.oscli.s
index 276addd..5b8a68b 100644
--- a/auxmem.oscli.s
+++ b/auxmem.oscli.s
@@ -580,3 +580,5 @@ ECHO3        PHP
 
 
 
+
+
diff --git a/auxmem.vdu.s b/auxmem.vdu.s
index 9f132e9..1d7b071 100644
--- a/auxmem.vdu.s
+++ b/auxmem.vdu.s
@@ -631,3 +631,5 @@ BYTEA0       LDY   #79              ; Read VDU variable $09,$0A
 
 
 
+
+
diff --git a/mainmem.fsequ.s b/mainmem.fsequ.s
index 4402cc5..5c39514 100644
--- a/mainmem.fsequ.s
+++ b/mainmem.fsequ.s
@@ -56,3 +56,5 @@ GEOFCMD     EQU   $D1
 
 
 
+
+
diff --git a/mainmem.init.s b/mainmem.init.s
index 35d097a..904179f 100644
--- a/mainmem.init.s
+++ b/mainmem.init.s
@@ -102,3 +102,5 @@ RESET       TSX
 
 
 
+
+
diff --git a/mainmem.ldr.s b/mainmem.ldr.s
index 3c7ec2d..3c38247 100644
--- a/mainmem.ldr.s
+++ b/mainmem.ldr.s
@@ -130,4 +130,6 @@ CANTOPEN    ASC   "Unable to open ROM file"
 
 
 
+
+
 
diff --git a/mainmem.lists.s b/mainmem.lists.s
index bd32c69..aa4dfca 100644
--- a/mainmem.lists.s
+++ b/mainmem.lists.s
@@ -106,3 +106,5 @@ QUITPL      HEX   04          ; Number of parameters
 
 
 
+
+
diff --git a/mainmem.menu.s b/mainmem.menu.s
index e15d6af..c004fac 100644
--- a/mainmem.menu.s
+++ b/mainmem.menu.s
@@ -136,4 +136,6 @@ ROM8        STR   "USERROM2.ROM"
 
 
 
+
+
 
diff --git a/mainmem.misc.s b/mainmem.misc.s
index dc63e71..7f95753 100644
--- a/mainmem.misc.s
+++ b/mainmem.misc.s
@@ -155,3 +155,5 @@ FILEREFS    DB    $00,$00,$00,$00
 
 
 
+
+
diff --git a/mainmem.path.s b/mainmem.path.s
index 23adb07..37fe761 100644
--- a/mainmem.path.s
+++ b/mainmem.path.s
@@ -282,3 +282,5 @@ PREFIX      DS    65           ; Buffer for ProDOS prefix
 
 
 
+
+
diff --git a/mainmem.svc.s b/mainmem.svc.s
index 82d7aa4..82d7236 100644
--- a/mainmem.svc.s
+++ b/mainmem.svc.s
@@ -94,9 +94,9 @@ OFILE        >>>   ENTMAIN
              PLA
              PHA
              CMP   #$80               ; Is it "w"?
-             BEQ   :S1                ; If so, no wildcards
+             BEQ   :NOWILD            ; If so, no wildcards
              JSR   WILDONE            ; Handle any wildcards
-:S1          JSR   EXISTS             ; See if file exists ...
+:NOWILD      JSR   EXISTS             ; See if file exists ...
              CMP   #$02               ; ... and is a directory
              BNE   :NOTDIR
              JMP   :NOTFND            ; Bail out if directory
@@ -812,7 +812,3 @@ MAINRDMEM    STA   A1L
              LDA   (A1L)
 MAINRDEXIT   >>>   XF2AUX,NULLRTS     ; Back to an RTS
 
-
-
-
-
diff --git a/mainmem.wild.s b/mainmem.wild.s
index 998ae55..d2b8ffc 100644
--- a/mainmem.wild.s
+++ b/mainmem.wild.s
@@ -332,3 +332,5 @@ MATCHBUF    DS    65            ; For storing match results (Pascal str)
 
 
 
+
+