From d30a9615cec52bf44e324402f9243ce743dfc697 Mon Sep 17 00:00:00 2001
From: Maz Hades <mazhades@yahoo.com>
Date: Mon, 3 Aug 2015 19:47:19 -0700
Subject: [PATCH] sprites: new minigun and shotgun pickups based on Soda's new
 versions

---
 buildcfg.txt                 |   4 ++--
 sprites/mazmon/mguna0.gif    | Bin 0 -> 655 bytes
 sprites/mazmon/shota0.gif    | Bin 0 -> 234 bytes
 sprites/mguna0.gif           |   2 +-
 sprites/shota0.gif           |   2 +-
 sprites/sodaholic/shota0.gif | Bin 1133 -> 0 bytes
 sprites/z86/mguna0.gif       | Bin 1405 -> 0 bytes
 7 files changed, 4 insertions(+), 4 deletions(-)
 create mode 100644 sprites/mazmon/mguna0.gif
 create mode 100644 sprites/mazmon/shota0.gif
 delete mode 100644 sprites/sodaholic/shota0.gif
 delete mode 100644 sprites/z86/mguna0.gif

diff --git a/buildcfg.txt b/buildcfg.txt
index 6d312bfe..17967679 100644
--- a/buildcfg.txt
+++ b/buildcfg.txt
@@ -2299,7 +2299,7 @@ IFOGD0 25 44
 IFOGE0 25 44
 LAUNA0	31	16
 MEDIA0	13	19
-MGUNA0	30	24
+MGUNA0	28	23
 MISGA0	-58	-111
 MISGB0	-58	-115
 MISFA0	-59	-110
@@ -2399,7 +2399,7 @@ SAWGC0	-156	-81
 SAWGD0	-159	-81
 SBOXA0	8	12
 SHELA0	5	9
-SHOTA0	29	18
+SHOTA0	23	15
 SHTGA0	-114	-108
 SHTGB0	-68	-39
 SHTGC0	-27	-17
diff --git a/sprites/mazmon/mguna0.gif b/sprites/mazmon/mguna0.gif
new file mode 100644
index 0000000000000000000000000000000000000000..645885b7374a2db3e67fc54e8850790495999626
GIT binary patch
literal 655
zcmZ?wbh9u|v|x~6SgOLn&dx5*&n_%1EG;dqFU_s2tZc3<tgfzpoq<7LU*BF|{67PO
zxw*Nwxpc6-e7v)=ySux$w|BO?db=~bzrTOEzjktR^6Y5g)8Xvd+1cgg<@eM1>+9=3
z7mIgycTb)?dHVF}|K~ez-@bkS{{0O9|382J97s|T=`a8R$S(|R{~RV2c<Au)vo9_>
znPb&1aJtxQZIHv&HP<BWR&8c?n`9|bGrNaz5@V+Ey}%RFk?YP+71NAc&vSaQLZeuH
zWib~YKOYMV16QEx1m#JM3d$2EDo>d-N!2AsWPW8{aS1b@Xcs#JKfi*QoU+^|5fLS&
zO_Mfn-M(pqGaFmrg1p2n$2b!?xmcK2pRT-6=`rErCH5;9<eb>Jc-eD{l6W}8IGRLG
z2=J}q7v*OT^!Vhl?epiapPjgbPABFk35XR4oM>!jEn%M_8+1X(Yi@g`oYNMCi7btI
zygU;;l%CCY<mOapk>NbhsN}}Q(Dd7#`;Hfz?!iEX#08A@O6*rSHXmqk-s(StbBE-K
zl?NPV)_>0Ut6b{v@=~{uQQhRpm-*MSytv?KA<*b}eLVw{hm694DMvP0%Ez7YXz-9+
z9sRh@IziF-?rv5l4MBwj&ihK;JUT_c%^2rQ^)QJDIJ2W+rm?fw*4U){xJG_KJA(s%
z7BZyh3mbGCGgx?F_WFFA`fE*!EwA|`JVa*rMt^;!v&i~DpKnsrd(Q29U)0G~A8LJk
hpn3DL1<_yf@1JTdSFro#RB}POr2I$iTo(ZbYXAkW49frj

literal 0
HcmV?d00001

diff --git a/sprites/mazmon/shota0.gif b/sprites/mazmon/shota0.gif
new file mode 100644
index 0000000000000000000000000000000000000000..42ce8998bbc77e9071e4eb8f8a32bc13d569b6d7
GIT binary patch
literal 234
zcmZ?wbh9u|)Mwykc+ADX&CRW^ukY^euAi(N9v+^YoSdDVZQrcl+}!+szB9xB|7b{u
z0SG{P8Cd2Aob+7H<s@;Wmm|!Aae>Apr$iA)>55!0kt12>KZlDnS?=1%z%b#~fuLEl
zCb=u`v9n|4JbcI}S(33!;XzSj%%uz0oz}!eiXK06c~SB)e{ZHam(8songp-sU+)m5
zA|xdn%E-zgU+-MY5ZKc!BEiWtb$U&UT#$lO;AC4dU3R7=%gUr|o9E3Jj#X4)X4<r6
X-c0eTwF}hiYwP-ViE4-mGFSruUXWFT

literal 0
HcmV?d00001

diff --git a/sprites/mguna0.gif b/sprites/mguna0.gif
index 690c40d7..8f3f3b29 120000
--- a/sprites/mguna0.gif
+++ b/sprites/mguna0.gif
@@ -1 +1 @@
-z86/mguna0.gif
\ No newline at end of file
+mazmon/mguna0.gif
\ No newline at end of file
diff --git a/sprites/shota0.gif b/sprites/shota0.gif
index 089615a4..ffeedc2c 120000
--- a/sprites/shota0.gif
+++ b/sprites/shota0.gif
@@ -1 +1 @@
-sodaholic/shota0.gif
\ No newline at end of file
+mazmon/shota0.gif
\ No newline at end of file
diff --git a/sprites/sodaholic/shota0.gif b/sprites/sodaholic/shota0.gif
deleted file mode 100644
index 77053255b17d569176ae09a097ae397aa50a5383..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1133
zcmW-gVT{uR6vy9bxZXM9;41cX#ECsKwIod((mNYdlOB|#Bvt#NYSF3{CswRdbeIK(
zE@qfT7MaP8Yr=q;8@O<1Sj<fJVMj(>aDh|yVVa>kIb`Y~`#=nS^4a6%eSN?GOaA}A
zG_iS<dvy%%hFh>aLCQz@30amAF%SrlB<b_{2!dd_AkFxxAmOJ#;Tb7R3rqmZ<y*z#
z&3t|-o9(94on*2di!~jmVOe$4tm=A2(@KgmD@g@G$n(4#4rf_5%`hpNP6UJTKp;v{
z4oO;mf5hiA2tp?al^_%V2|xtEr4BAOv0cYz1?NjxFJRThN(M`bTg6x}?{r<OlQCN<
zeLkT!;z~6pmmH~Ri+M|MO+IaKNi7^#*{H%;QpgZ#RS3#lKwzmbLo&3#*Xwn=-A<>|
zZnvAwW~0%l*Xz}4wOlTjN~L14SSS>7xm-4z&15pER4S23#N+X3G-}(nWm%?a>bkCJ
znxZI@B#ENP^E}6KEX#&MA)2P6XxqI=q+=NKnqF1ZSxL?bVulkEEaxz+Nr%)xP^74^
zpQL?0il`RS<y>+$8!x1zxuosJtxU{JIeNm<Vx|%`WLpy>s$j^RCWcjk%_YoqR83fN
z)DR+SSeF=ur^Rp}7B_82i&%<oN~*?7N?4E>P6#17OKq)H5o<0x8w<KRnG^|!0nck}
zx3N+|*Tq;24Fd%MgFyu70W1Qv02%;QfD%9fzy(MF!~q<D2!IaYS?2lG?P9%-#UiHD
z=s2jV$Z=kZJdC#<#$$K@?>Yfs0jSHmOKogbu<l|hhIt*+JjMez9csz;cOw3l;cI9_
zO@Xomv*PVPv4vPdOe0!|5+aQV1p#s#WLQYjUN}P{8{lY?4fs5X+fm{HSO6M;0`M(U
zaw2wRjCrRx5A!*2ZLkWKwSKt)%Uyth|DZRxcFWht&L#%P`^OhIAFm}>kuy7oSN}G(
zVL1H8_R{oc?#30PukA@pU%iiuJa_o*+O?H#U*!AI*H4TOlF_#=o;-W-+P3+}cbwa^
zF8|$y`W?GQX9iDw@#m#O{XdQGsP(TSrzQ@qoj5UGm^%9Cg~>5<dgTjG*mn)@YfhhT
zm+fDMCu7HEGR3_|)<664muzcl+sUo_GWVW#554*PSMSfQIlubhO$Q%Y_t23uhv|L3
zji*kHObl(E{Csc!^{W#f-P!-w#T6gE`1fV5|4IJjn125H$TwE#$L--yjTw1z!_F(`
zCJsPh=`myffrUO|%WnP5)wxSUggnCxzVmLWJ91W5Dei%%kL|vBfgG~0%=Nt&s{L&2
z+WpUinchZO7<+mDD=*=i6<dBF-QUXw46NOt_4N<@vG9~KCtW6QjQqRs$-t)3U-u7x
Tu=g3b@onvRa%AY9Rlxrb<}2YY

diff --git a/sprites/z86/mguna0.gif b/sprites/z86/mguna0.gif
deleted file mode 100644
index 01c7b26aba8b56924dfc84900c4f3780e9ceb49e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1405
zcmW-ge@s(%6vZ$8D$<!c>L~D>)jdWRYOGr2={oa($9S@i6jqm~D_UKVGT&l{FVe7P
zsZzBI73(acYMnKLR;@~1XZTUEMkaMsB}yjDs<omrWwTLZn49`t@#g+}Kj$Xr9J;t@
z5wT_oWWXqljabAN33y7S5+Q_Pm{2I>^Z7g;PezDwsX!#=2}Gb$NNG7vN-@;dHtO|0
zYi=HKI*0A{sMQ)Vnff^{%(5Y!E~wE27{;$swbHbQB%2iqmt5|Y$?Q_84aY5Fu^GdR
zA`vGPvI2pg&)4#J8Xiy0<Ea2>015z&MA1+`iiA*q0QLD%$b*6|6mTHFWz=hmH*>=-
zHtNs~*ff0>b=a&5nv{Ny_8O>WmUQV9b}eCL<Yu+ZsFJd@L`&gnQmiB}QYMm1g;HD)
zkH?3HhojMGBogWG?+=H=p-?Co47Rnk`Tc&c*X!|k+-|qi>2x?8Hk-|2v6#(fqtR$E
z7+99o>2w;6hG7_$N=4H&MNtZcf*=T)OeT>?a2z)xgCVZhN445MMiW%2TWO`6q#Oik
zkrA9!ro$y_OiYPHa)A)%^F_R%$KK|)wmQuoyU}emxXi4>q_c4v3(J^vDx+3uU?{zs
z)G7&vlB-FX+oH1@)fQH1)RKC&TtiD$3Y?N-CbQ1KF?v>|(a~x~L965>EhR_^LflA%
z83<6_E?KKd?9vFW6pxca!fO<Xpg;h*T*zcXS}h_;Bo-rpIKU9V06-WZ2;c|s0Js2b
z0A>IVKo6h+NLZHeYj_xiLdfeyc01xYq*fz>NTeu%No)d>U?c#EYYPAipdQm5iJ*Z1
z3b~Nqgqk(Tu0Uq&87CSs2%>tyfR-O-c-<;!qoI|0^CucW$d8a6Ar>JTAsiv_kl-f3
zAp<L(2&aUSVFWIeVf=)|n<yy&WB@pT2!KCEaZ_kmiA;%8)CYZTa2bI0u<Y!y28?w9
zl3zo7^7N&?1NjzT<-6q<eX(<MR`xblSC!r^tWVD<Dzs#m?A<;-?8_hj^S$o*RkzQ~
zTD%j_w2Al!tGlmN^fcs<saqaCU7fjOG^^mFMe`~z9GF;r_Q}$3TEaWNT9)z_eszj#
z!J3%`+s{9*XTG1<SsuIboOSwEbrt1jJa51b=R|!SkFMg_kNV!M{JOmLd%jN%mcJ<2
zji(XIlTGixyfF96p1SyolA#ADdgmuko%TU#?Hp`^{>t3iw!+C;Z|dUnv(<}JT&KM&
z0@YI#zC3TD2R+C4aBGQmx3^agRTl5cil?-<y!_ADxS(vW(mbQ<MIMp!_UfAECH~P%
zpWb{u@93p1zolk>-8k@jO4)m9^5ui<MuGd)JDaNm<_A{-t%2-VS9eiuN%EgXNgEHH
z%A{AeBn{S8E%@h-cC^Bytx7*Xtth?u^Xn5f#b4$+X;sIXO-XByZ@#9M|FrvV{jpm^
zw`!7)l<ilHYpVPrqr0PQ|K_1s)9uQ_w3(k}e4Jfdv1?pyXk|mJgDMvuI#u1HnAK#R
zfjw^TpT4r@@<QRV$=~Ky)-C*w8M02QDZZI8G56~IefLktTsto}Jp7})_S!EJY*MYK
zNciikrTa3A*I(~BSo3ewktE)X-Bn3DH}qst1{l-{*Ug*@n0s6OCYZl&+qwKnHyw`(
zj-K5616HvibySNP8uPcEXg`~OtmI5uOGeZ3PRg6Ub}IW9)|IU+-DNu)y8x?vPmYT&
z=CFS+Ib6YhvX$HVA#-{lN7LJWXjwW_9$OW@+<EV=MUXq#;(FXU(#dZ<^YkRYHTTAy
JNNFA@{s#$eY;*ts