From cfa5a0a5dad603a2a303ed8bfd79f84802fb47fc Mon Sep 17 00:00:00 2001
From: Kurt <kaphotics@gmail.com>
Date: Fri, 2 Dec 2016 22:55:05 -0800
Subject: [PATCH] manual merge continued

---
 PKHeX/Resources/img/box/bw/box_wp02bw.png | Bin 0 -> 1002 bytes
 PKHeX/Resources/img/box/bw/box_wp07bw.png | Bin 0 -> 1567 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 PKHeX/Resources/img/box/bw/box_wp02bw.png
 create mode 100644 PKHeX/Resources/img/box/bw/box_wp07bw.png

diff --git a/PKHeX/Resources/img/box/bw/box_wp02bw.png b/PKHeX/Resources/img/box/bw/box_wp02bw.png
new file mode 100644
index 0000000000000000000000000000000000000000..15178f4a4cc1e231d2a3dfcc82ab578b3daced1d
GIT binary patch
literal 1002
zcmeAS@N?(olHy`uVBq!ia0vp^bAY&rg9%7#PSJk>q*&4&eH|GXHuiJ>Nn{1`ISV`@
ziy0XB4uLSEsD@VqP*9@8HKHUqKdq!Zu_%?HATcwqL@zJ3M8QPQK+iJAxXzD(fjPs|
z#WAEJ?(MXLymu``n1lc6tE%R3Mu*K)Im9K;B){ia|Jk{gfh=!N-)N|-v70|%z=hK_
zOG@qQe0#_J6@mR%{2V|yKS;4z_v`)p8ONI^$KCHdT=(&8ZR!%fN#CYUwDPzWelJLo
zZL-$&bDrzpA6Xdx=cwGuxeXwEZ;2CI^s2f8p0ZExW^QKw)~)_VTe)<?mi0YX953zr
zG>yw}Mo4A(3vvBd6K`?80AXLPlnqN?eKJ|Oc#m~%*@3#kP2oj(HT%Vio39)c|K@eB
z_x<&xya`r64#l0^`SEYmnX_;+#H;>V10A3~m)kbT+Wgz4r*pnkUD|m;d24a9ek?>{
zuV*XIwvbwb$yTR!Uru9xBkq4A-0hV@X1wIe<|VaHbw!g5R(^VSK|k(_@>XG>PT>o)
zLrx@kUwxVx<X%~R>&*l1YSrh*zGpw&QwY%l34-k*9S4`3+WlF)y0#i@(f>r0a0`|H
zv!w6SyDc{ve;*Zwh8Wn|O7B()pH+LTzjTX#^?1wj1%%Z^jcx>$R?fN-cyF$mb;ACN
zL;H+^*gb!r@{m<|tDV16pxJY3d3)W*MW|t{=TEMu8vZ`wgqjYHnmtRMc+^7g$^JUp
zUA3f)35+LmN#?BFW#juw<GtT(*$weFiCFyajGkUXr!R*`{N%lpiXZ>pIzxI1-@Xl4
zqI4T144wDyxbXUZp<k8l%NSsK*tv1K-t#5bC!cEt`c}I7Wf4RIl1Q3ok{d?iReLWc
z?*E~W#oKd%$-Axi(reH5y251CShT-_Jr*N_6uZtp7yngQAS;`e%?!+!44$rjF6*2U
FngFm&*p~nR

literal 0
HcmV?d00001

diff --git a/PKHeX/Resources/img/box/bw/box_wp07bw.png b/PKHeX/Resources/img/box/bw/box_wp07bw.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f17dc19e863d063b2b3a6bbe52bacc134cfd76e
GIT binary patch
literal 1567
zcmeAS@N?(olHy`uVBq!ia0vp^bAY&rgBeIp)bQv9QY`6?zK#qG8~eHcB(gFvFf#=B
zgt&GrIC0>?hXXG@+<5T;sAd$5hQNplfjw<&^?)AcEbxddW?<ku1j3A>8eR=RL5ULA
zh?3y^w370~qEv>0#LT=By}Z;C1rt33J<A;9IzI*mriq>|jv*CsZ>Kf(EjHkBxqbKl
z|K~@)-7xIU2tQ&X+&R(fkI|jG!c8ya?o|Gp^laypJLmb?Qq<NfeZP}5xwXOBZ`U28
z4W~0FMzQ%7z12!gnEp9-m1xmN8^eMPCtcffg~E1T$vk*y!ez-$zM04WIbM-_JBcaI
zrO#mdotq^^tm{wdDevjJ^RY5{<^e_Z*gVM_Pq%pJGOO<_n`*G(^v}GzS%;thzPDyV
z_w&xg3EQ)ib6A!?Wu6^VazpOP+vz{Q++Sa`@^aD~!|XUSk^jfRmRKH~G2#4o`3>~~
zTitgrX%L^Nd`7q2Y;MfK)tgRptXC?pxfh{UaKdwXG+UXaZqVrip6g;&dEON5^WN&D
zH&307&ur(54Zer8rd#PoNEBHqUsU{j!@lFz;@F@A-6sT}O|zcux9&mc&D56giPm=c
zI>HuDmYmjQ-aSWbW$FW!>+6Jorryt8&HMMCc=(B<pSL9LHaq545T%zkx%=F<?eWht
z|KAS=2FS#Xw*&t0Is2tQVcp&PWAlm9H}WoTFY0MNaDBp2e0r|0diaM`Z;TGDJ|R2b
zd>W@r(WR%;8e{#suNW0f$`0oQTK7I^EhtPHn|<}Hawcy$wbYMWtZmLYkCGEM-}o1O
z%a|_mL8+)^=hJh`CTmxOmPtMgebRSc`ZNol<;$Ye2lSS^W=UF{+`77@G4@>f{_VFu
ze6s_(_DF$Y{`F%wIP$uIG55B+@^`A;pYNf1rDflr_C$W(v@nCma_+<z6SyUWiz@cx
z2;b}H#JL&U=alSBO_+XJX)Dj1C$~Zm9ngEeJ4E}*qspWQ36s0|ZmX;TMq5*>;&Njl
sS)=~H%`0qgsj}|rkV$muGwVMtulrzK;=8Ba??Ktv)78&qol`;+0BRk5)c^nh

literal 0
HcmV?d00001