From cbb90ea1aa1a98e354ed0f916318c132c0d8beeb Mon Sep 17 00:00:00 2001
From: blondie7575 <qd@quinndunki.com>
Date: Tue, 17 Oct 2017 08:21:29 -0700
Subject: [PATCH] Fixed art pipeline bug

---
 Art/Block1_002.xcf      | Bin 671 -> 699 bytes
 Art/Block_001.xcf       | Bin 665 -> 696 bytes
 Art/Cat_000.xcf         | Bin 941 -> 930 bytes
 Art/TestPattern_003.xcf | Bin 0 -> 841 bytes
 Art/block1_002.gif      | Bin 76 -> 121 bytes
 Art/block_001.gif       | Bin 68 -> 87 bytes
 Art/cat_000.gif         | Bin 195 -> 189 bytes
 Art/testpattern_003.gif | Bin 0 -> 90 bytes
 MerlinToCA65.sh         |   2 ++
 SpriteBank00.bin        | Bin 903 -> 1217 bytes
 spritebank.s            |   6 +++---
 11 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 Art/TestPattern_003.xcf
 create mode 100644 Art/testpattern_003.gif

diff --git a/Art/Block1_002.xcf b/Art/Block1_002.xcf
index b5e057887157950ecf85f283a23df5dae75ef7a0..54796611e2e9997335edde65df94417d397931ee 100644
GIT binary patch
delta 152
zcmbQwx|`K5Ju|mJp&~g=q0GR*kO2q;pqL3rGXk*;5OV-=N1EW7na1ySyWCAn`#*CP
z!+(bV|Nl>vQekA<XrIO?dI_im24F_8PTs}1#;_kM3=;(!%(NI)jA=87U(d+E3dH{b
DyoVee

delta 124
zcmdnZI-gZ4Ju|mJp&~g=AuTf}l>rC@pqOEzoeCrC#^f|c(RCnkD1b>bPQJ&u#xfgC
bl!bwTsUB5~sUO6zXJq&f#4~|-6^IQ0{`?aj

diff --git a/Art/Block_001.xcf b/Art/Block_001.xcf
index ef5fef671967dd92bc9400c9a415d123f3c04c0e..6188cc2a69669740396cdf501d7f72263b10a4e2 100644
GIT binary patch
delta 165
zcmbQqx`Wj&Ju|mJp&~g=q0GR*kO2q;pqL3rGXk*;5OV-=N1EW7na1ySyWCAn`#*CP
z!+(bV|Nl>vQekA?XrIQYb_u8i24F_800sDxa`Kb2<AH|jrDvv1KEXIgcLG!$Oc~G?
QrX{FiOj|(wdPW9z0KFg|4FCWD

delta 134
zcmdnNI+Il@Ju|mJp&~g=AuTf}l>rC@pqOEzoeCq<#^f|c<#ix&D1b`?`P@#4$=T^e
h`K5U&lixGWG0j9%!_2_IREsLc)C=O*Gcx>#VE{fy7F+-T

diff --git a/Art/Cat_000.xcf b/Art/Cat_000.xcf
index e840896478da22aa3623fbff1d2a62585269f07d..f731213d739022bc11555760a9bdf2f8a8de53fe 100644
GIT binary patch
delta 106
zcmW;D(G7q=2m?@Cu&m`QF5)i!o4B62^As+8l-Ix&XWX0Z4<i7I8Z@__l&jH<IWJ2+
aR{*mtri8l5KNmQPGgcu6OBJpI%l8BRJrW`S

delta 117
zcmXAg!3}^g3<I%4owZnq8Q6tC62tK+P#~f5>rUs@H{U0l54r=CifE(Vfud@XG1i!T
fCKJGwx{F{zA>!SOUw{u}`EX|h@J1CY3x@XtEvgY)

diff --git a/Art/TestPattern_003.xcf b/Art/TestPattern_003.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..b19dd914c83878b77775cc091b08e9316a4cf0d1
GIT binary patch
literal 841
zcmbVKy-ve05Kf}XDg6;Ce-nepb_hzv8x*990f|>gQ`@y@k}64|eFGLG){d-f%)9~<
zJFmb70)Ys3!A7Yl3nzWL&-dN=PCg46PUtM)^vv_R2AHE@fj0rWfGXgEx9%7FPj`op
zoac)hBRBFqhj<HMV&W#C+Pg9g1lSg!0;mCY6vw=6$nS%13TW*HaTu~FgLBbs;~-&v
z#)kA<W+U1^IzB<gDN<$V3+9SM4pp{kw9{-pW;Bh*a@eW0xd`HMoX~dR+(Zm~>g{=j
ztsq?`b)a;xqEzejZ-S+>bm9jx611y(L2$k*sABFkk{OjzFk&gz$DF4u`xy|ce}}#!
z%cb}Z%FGAN!0R32^VfTRa4M2`8WqomYegdflyQZ)UgWr)HO0XdtH(GRZc+1ki8o5T
zS>o%!@m_5<5M8f-hMol^>ry4^(P0+rdO2p@;@Kfh+a#YhsgZY^5cF?_2MWTg<`wd+
WDJcIxy_9Z&`*lz4KTvMi4*3Eo8G;c2

literal 0
HcmV?d00001

diff --git a/Art/block1_002.gif b/Art/block1_002.gif
index f7b683c765fae1028ce819c2ee89d726f87258cc..cccd503476d1edfb46ead9057034144f6aaf893f 100644
GIT binary patch
delta 98
zcmeaNv~u@!v#?AQU=Uz<%+3G=9chARW*WcS?Q%CQ?f=YG4F4Ja;{X!{<P_N%bU>Ow
c+8I~`H=OWXz1QOP+1>vWH2P99{RA1T0VM=4pa1{>

delta 53
zcmb>Q5pef(v#?AQU=UzvU}X3|bJavEIXOlK9R?r(2{JJ8we+t%{g!|6oGrJyH`}o?
GSOWlG-wx3L

diff --git a/Art/block_001.gif b/Art/block_001.gif
index 5188694bbcb86a5a3f4da8c9afc6960c4bbbddc8..79025513c05fe28ecf28d6d09c159c00b736ae68 100644
GIT binary patch
delta 60
zcmZ<>S914sv#?AQU=Uz9#LfT&9chARW*WcS?Q%CQ?f=YG4F4G>3MdIP^H=P;^UvUv
Q=jy!{ug~s|=VY)3094r)ssI20

delta 41
xcmWG{5pef(v#?AQU=UzvU|{(F|NlfKB_Srhmj0Ee-|{b>v*lLzW;<2}YXB1~4)g#3

diff --git a/Art/cat_000.gif b/Art/cat_000.gif
index 2b40907c51b5598d9d3a69c0de3b7cc89f27e135..a269e38edd4aefbd6484a0e0df12e0f7a761c9a2 100644
GIT binary patch
delta 39
vcmX@ixR-H4Dr4xxG#lyEtxQ2_tGN3^WBbn(Ii~M*o490F;l{T!IT)+~GN=$3

delta 45
zcmV+|0Mh@x0mA{1WdU1}W;`JoI5?evL;=gf+j2$K^_<o0tXBdC`Rr<vMWX*cpAi5%
DyM`20

diff --git a/Art/testpattern_003.gif b/Art/testpattern_003.gif
new file mode 100644
index 0000000000000000000000000000000000000000..25c289996d6c1cecbc5aeeae81c94393adadc5c3
GIT binary patch
literal 90
zcmZ?wbhEHb6krfwIK<8X1RZIDXJ#6|+wF2UE$#ozRSf?b{{R241Cjx$VPICz*mbAM
r!0YE6>#IgNKYC`Cx88IsQ(jf{EJ|<D?IZWxvvs?#e{0F+WUvMR&kQ7t

literal 0
HcmV?d00001

diff --git a/MerlinToCA65.sh b/MerlinToCA65.sh
index d2e605d..3566633 100755
--- a/MerlinToCA65.sh
+++ b/MerlinToCA65.sh
@@ -11,6 +11,8 @@ BEGIN {
 	else if ($2 == "HEX")
 	{
 		$2 = ".dbyt"
+		$3 = "$" $3
+		gsub(/,/,",$",$3)
 	}
 }
 {
diff --git a/SpriteBank00.bin b/SpriteBank00.bin
index e18377c185cff124e9aab66612941dcd333939dd..79064b365415533b6aa313c9bd6ecfeaf0bd207c 100644
GIT binary patch
literal 1217
zcmdUtzi-n}5XWErQ;!Z78<LkQ4wWnxD>jpdMvb=)tO)iBi-DDa?KULDO45|Nxun4$
z)PDhGWMR(+e}M&03@qmRURp>B0|Nti@zdSs?tSlj@8Hd~*H5Gn;+sWV@5Oa-<MDR>
z%opbm-hGsbc#hwTaMHGU>5FiQFE3yH3kR(){?KZDZ=vkg-G{#wet7tw3fGQTB4i<h
zmIQmUZOHqy!<7uE;<;>SzDV-Y)w{^cy{!;Aut0s}{HxqdXy6FI5g!9Mz5pgTPZr75
z9u~qDyTILzeg@|m;<KL``fHc}^}-*Mu1~P3T94Aglr!zo*`^QLBUCPzfB0UCqAHx)
z>EEx@UChX_XymR%jIMUvNSkc-%-`dA9LSy37K{Tm_5>Ba3H$45PlPJHt!{Sna;o=G
zM>OJ7a0#6*5|w2tDol#UaU-N1(HKydMp%r>kTSC)FyzWqRjBGm_wtfOxUJGlf`>-h
z5ZOnOy7N_~9o0?qa*lU&5{p1~5<0;oBZHy4YCo$qQblHNe@ZVe1QayJO(@uFs8WL#
zFAO8rSwU9aiD<&Y=qyOEqp?9l4hppP0W6s6Sdq}wl&xT=2N)It*@uZMxCfX`tY<8C
V&2+9_8tz*a245}<ak771<9Ao011$gm

delta 232
zcmX@e+0M@Ay_#!P4JQKwLnGq}2L6o#9gG|<E(=&3R=Su>7H3|<`Nf6BI&(3DbkyWS
z%xd1VG(RwKGP^X-TD(A${{yE1Tl0c1|37^(R_3<OT*@Hb)jW6cY^ajii|1=H@N?RK
zXrBK_Veul(51eexiw+rl`LFcF#o0R3ezGQui3m`J9W2AXcsZC}e#l^QEQ`4hrm%IU
z1EciHw6tcn#S9=T_&+x@EN0PU_`vy@t(gUA5Hlx#GxH&X^%(~qYM%e!52V(zGe~Pk
GWCH-1f>qK0

diff --git a/spritebank.s b/spritebank.s
index 92dfa46..c1c2532 100644
--- a/spritebank.s
+++ b/spritebank.s
@@ -2,16 +2,16 @@
 
 
 DrawSpriteBank :
- 	 ASL 	  	 ; A=Sprite Number ($0000-$0002)
+ 	 ASL 	  	 ; A=Sprite Number ($0000-$0003)
 	  	 TAX 	  	 ; Y=Target Screen Address ($2000-$9D00)
 	  	 LDA 	 SpriteBankNum,X 	 ; Relative Sprite Number Table
 	  	 JMP 	 (SpriteBankBank,X) 	 ; Bank Number Table
 	  	  	  	 
 SpriteBankNum :
- 	 .dbyt 	 0000,0200,0100 	 
+ 	 .dbyt 	 $0000,$0300,$0200,$0100 	 
 	  	  	  	 
 SpriteBankBank :
- 	 .addr 	 SpriteBankBank00,SpriteBankBank00,SpriteBankBank00 	 
+ 	 .addr 	 SpriteBankBank00,SpriteBankBank00,SpriteBankBank00,SpriteBankBank00 	 
 	  	  	  	 
 SpriteBankBank00 :
  	 JSL 	 $AA0000