From 602ab583453f21f0b61252331966570c843e3133 Mon Sep 17 00:00:00 2001
From: Andrew Yang <andrewyang96@users.noreply.github.com>
Date: Sun, 18 Oct 2015 09:05:24 -0400
Subject: [PATCH] Still no dice on sprites...

---
 appinfo.json                        |   8 ++++----
 resources/images/charizard-back.png | Bin 2110 -> 545 bytes
 resources/images/umbreon-front.png  | Bin 836 -> 429 bytes
 src/app.js                          |  10 +++++-----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/appinfo.json b/appinfo.json
index 302bee5..21507a6 100644
--- a/appinfo.json
+++ b/appinfo.json
@@ -29,13 +29,13 @@
                 "type": "font"
             },
             {
-                "file": "images/charizard-back.png",
-                "name": "IMAGES_CHARIZARD_BACK_PNG",
+                "file": "images/umbreon-front.png",
+                "name": "IMAGES_UMBREON_FRONT_PNG",
                 "type": "png"
             },
             {
-                "file": "images/umbreon-front.png",
-                "name": "IMAGES_UMBREON_FRONT_PNG",
+                "file": "images/charizard-back.png",
+                "name": "IMAGES_CHARIZARD_BACK_PNG",
                 "type": "png"
             },
             {
diff --git a/resources/images/charizard-back.png b/resources/images/charizard-back.png
index ccdd579aa4b8e2eb2eb26d53b9cb33991dfd3625..efa1c66ea30ed7984acd96606c98cbcff8ab4ef3 100644
GIT binary patch
literal 545
zcmeAS@N?(olHy`uVBq!ia0vp^VL%+r$P6UyLzCEn6kC8#h%1o(|NsBeoAd7iS)2tP
zk;M!QLM0%~crQ)90w~B{;_2(kexFN-mr3>Aw`G-JA=ii!$I_CF{33>x>&|!pg?LJU
zLN2Mr$wiq3C7Jno48oj>%0O{0khpVxL1j^9dPWJu8vZj@Kv6!hXi;h+NU1_eW^O8j
z>34okpbRHSCOAK>q&%@Gl_9p^KS((@*znBa<eWsH(jtcK2e$MBg*iaN;fY0gnR)39
z2c)011I5@O`b&$FQyISgZ+;C^=A56Ko0?a`@a@dB{Xj7`kg|}>lAKhA74I&o14V9m
zx;TbtOniH3FYh4-9@Yo#Of5_Y+3s-pOfcY54hWi<b4W>KqC|`I!xbJ!1Rpcs=Xdg$
zA`<h}v~Jp4=A-TV>knVAEt$T<H%It&<p;)te}#6Ib3akvn5JFGyFf&Fmw%4^j=zVF
z?X24FcSj{J-qzEGm6d<5WwFhI36f`KZhmo9NBHv&?)(K|NpjmYQ^Rc@?JC-5vEF>@
z?dMmwn%<s!<3Sqt(RVxEcKlkDGJogQIV)DoTPJ$`@@0*aQyWdTf7*U6h5e%1=RA++
u_l~>w>?k)(di(zD))P&<Ascw_KjsS%{?c_uouL}&O9oF@KbLh*2~7ZNPtW53

literal 2110
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

diff --git a/resources/images/umbreon-front.png b/resources/images/umbreon-front.png
index 1f7440d3eb54e27c6b4b82fc958a26d7c9736f72..62039688cacea16d3c90b3b4572e2b571dce4662 100644
GIT binary patch
literal 429
zcmeAS@N?(olHy`uVBq!ia0vp^5<slR$P6T(oIIHZq}T#{LR^9L|NsA&-kg6I$l@&U
zh%9Dc5Gny-#(Qb<6+l7u5>H=O_WN8yyi5|?=Do@Q3%N#=IF^=V<QFllTzAF;D8y3&
z6mm%|PA<wUD9OyvV-V(4R0fK3fyABj3o45;(=$pK*6^RP0*dm1MT=4sK}r=$GILWI
zOuzGU0%bTsGQs(2CFO}lsSL3N|3S*R!G>oRC+8#rl@>8<Kd_}AD9iy84o@t~%gjq>
zI3WG39Vo^Q(O+7WoXYU^fAedYGUxo<+|;}hhHq!4?FWjnfs}=0mgJ-|tax`x9Vn9K
z>Eal|G1K(;M&1?!5tfS^Ib?#EdM8{sIn{x4nujJ=cf*IM9j_UT*bjW_RjgPXtD-1d
zvvp%e+O-6&MK&MTbXK3O&xy$NRoZ!H{!A|M8^$u~qFnn<{C?K;;nkVrU(`e|KmMmJ
bRl;Z`=yvJr`D5`w8yP%Z{an^LB{Ts5rbd$z

literal 836
zcmV-K1H1f*P)<h;3K|Lk000e1NJLTq000aC000vR1^@s6r1k8n0009ENkl<Zc${66
zO-L(e7=_O_Gl^!B%nXtQ%^0ndxG_-|of|@>S#(p|;-b<}%58Dcg;20NTPOv=O&7Ye
z(2ZTSlu|JuxM-n>R4(Nfs}a0JEYW6uB=|$M%ok=fGhY|whTcBAvv@d*^S%H;GMUUE
z{)OO0x_N49>Ty1wpWrl2Q%6Qde$VA{?*d?zN`(gi!!QUTglU?Vn3<XRv9GW1+aL%C
z^7;Im+uPf0eSN*5s;a!Uwic>XD&dut6#+nab93|Q>FFt(ot@nV0AX-&@TS>p`i5a>
z>2!K*VPWA{0NB{rK)GE0^7#0;7>~!jVzKyHwOR!MK*q<%e<&0R?;IT+ebLj?W5;4K
z?dt04aB_0;8`pI^wrzi~zrX*zq9_T%7$ZYNL+a@0=w2q1d1-oj8aq2XxV^mvrS#z9
z;^O04t@dPYZtlCYv$Ha%>$+f?re)jq*QHX4>ALRvzVC)Yp}=vRXSG`G$@21Yb#Za=
zz4`fhRgh&F07y6-7Eex2f`^9(o>IyU3=D9sR?E|Mz1(Ot-d<f@y)P6BMDTr|0buQR
z`=HTi@Rnuqj4|IdP1v@5BuUa+p63M|$A!1Hwtgc28Hg*DN^6Ruyzl#d)NvdV4u^>(
zNj}f>oa?&Jn$6~{@O(+eSU?E*s8}q%B8uW<EEWqCMIoV3hyfty=jT7y>-9gl?hO#a
zqS0t7kw|2d$s}Z1CLG7XbzK60rPJvTQ>j$8D*ync)b%{i5d;A|&!f}nK$d0RaU3E^
zQaqc@zWiKZOG`@}fWJji{H@dJpw()1lF1};xtw8|W;+^<vWbZaz1y(6yUPJUyWKt@
zgn&}oQB@WF{r#UBhVe<O)gsr|*N+7J57%{Ze}4}}QF`k2`d^2KhkG|SH@0otul4r!
zzTRy}rBVz4JkR@uQX0hLabj84pVeyh8UTqzB2OccNVF?lUS1La5CowliXsPq+}+)&
z!^6W7034<C4cB#F_%IGYFg7;!m7*w*7-Q73tj|r;+ylUCn)WJy-hTkYg-+<^2#5Xv
O0000<MNUMnLSTa9)SBu5

diff --git a/src/app.js b/src/app.js
index f1ceaa1..59e57fd 100644
--- a/src/app.js
+++ b/src/app.js
@@ -34,15 +34,15 @@ var infoRect = new UI.Rect({
 });
 
 var yourPokemon = new UI.Image({
-  image: 'images/charizard-back.png',
-  position: new Vector2(52, 4),
-  size: new Vector2(144, 144)
+  position: new Vector2(4, 80),
+  compositing: 'and',
+  image: 'images/charizard-back.png'
 });
 battleWind.add(yourPokemon);
 var opponentPokemon = new UI.Image({
-  image: 'images/umbreon-front.png',
   position: new Vector2(80, 4),
-  size: new Vector2(144, 144)
+  compositing: 'and',
+  image: 'images/umbreon-front.png'
 });
 battleWind.add(opponentPokemon);