From 41ae3610f6c601e7803d6bcd049cf690f111f29a Mon Sep 17 00:00:00 2001
From: yenatch <yenatch@gmail.com>
Date: Sat, 24 Jun 2017 00:45:31 -0400
Subject: [PATCH] pngs in gfx/fx

- gave up on wind.png
- add --remove-yflip
---
 Makefile                                      |  18 ++++++++++++
 ...ast.2bpp.lz => aeroblast.2bpp.lz.2f07c4ea} | Bin
 gfx/fx/aeroblast.png                          | Bin 0 -> 187 bytes
 ...angels.2bpp.lz => angels.2bpp.lz.b026d81e} | Bin
 gfx/fx/angels.png                             | Bin 0 -> 363 bytes
 .../{beam.2bpp.lz => beam.2bpp.lz.80b6d613}   | Bin
 gfx/fx/beam.png                               | Bin 0 -> 562 bytes
 ...bubble.2bpp.lz => bubble.2bpp.lz.03b8ac99} | Bin
 gfx/fx/bubble.png                             | Bin 0 -> 237 bytes
 ...charge.2bpp.lz => charge.2bpp.lz.95d3ea98} | Bin
 gfx/fx/charge.png                             | Bin 0 -> 188 bytes
 gfx/fx/{cut.2bpp.lz => cut.2bpp.lz.03d343ed}  | Bin
 gfx/fx/cut.png                                | Bin 0 -> 170 bytes
 gfx/fx/{egg.2bpp.lz => egg.2bpp.lz.41dd1a53}  | Bin
 gfx/fx/egg.png                                | Bin 0 -> 200 bytes
 ...ion.2bpp.lz => explosion.2bpp.lz.55fc334f} | Bin
 gfx/fx/explosion.png                          | Bin 0 -> 157 bytes
 .../{fire.2bpp.lz => fire.2bpp.lz.d7701cda}   | Bin
 gfx/fx/fire.png                               | Bin 0 -> 153 bytes
 ...flower.2bpp.lz => flower.2bpp.lz.1bc2e9d2} | Bin
 gfx/fx/flower.png                             | Bin 0 -> 149 bytes
 .../{globe.2bpp.lz => globe.2bpp.lz.710dbb8e} | Bin
 gfx/fx/globe.png                              | Bin 0 -> 292 bytes
 .../{haze.2bpp.lz => haze.2bpp.lz.91424607}   | Bin
 gfx/fx/haze.png                               | Bin 0 -> 173 bytes
 gfx/fx/{hit.2bpp.lz => hit.2bpp.lz.2b3c83f2}  | Bin
 gfx/fx/hit.png                                | Bin 0 -> 306 bytes
 .../{horn.2bpp.lz => horn.2bpp.lz.48908aae}   | Bin
 gfx/fx/horn.png                               | Bin 0 -> 179 bytes
 gfx/fx/{ice.2bpp.lz => ice.2bpp.lz.664d900f}  | Bin
 gfx/fx/ice.png                                | Bin 0 -> 137 bytes
 ...ing.2bpp.lz => lightning.2bpp.lz.a88fc131} | Bin
 gfx/fx/lightning.png                          | Bin 0 -> 820 bytes
 .../{misc.2bpp.lz => misc.2bpp.lz.4b20c3d7}   | Bin
 gfx/fx/misc.png                               | Bin 0 -> 1082 bytes
 .../{noise.2bpp.lz => noise.2bpp.lz.acb4a76e} | Bin
 gfx/fx/noise.png                              | Bin 0 -> 526 bytes
 ...jects.2bpp.lz => objects.2bpp.lz.83f812de} | Bin
 gfx/fx/objects.png                            | Bin 0 -> 705 bytes
 .../{plant.2bpp.lz => plant.2bpp.lz.4a00c417} | Bin
 gfx/fx/plant.png                              | Bin 0 -> 293 bytes
 ...poison.2bpp.lz => poison.2bpp.lz.fc7dc9c1} | Bin
 gfx/fx/poison.png                             | Bin 0 -> 166 bytes
 ...ball.2bpp.lz => pokeball.2bpp.lz.c58f7e01} | Bin
 gfx/fx/pokeball.png                           | Bin 0 -> 388 bytes
 ...powder.2bpp.lz => powder.2bpp.lz.bfd566bb} | Bin
 gfx/fx/powder.png                             | Bin 0 -> 100 bytes
 ...ychic.2bpp.lz => psychic.2bpp.lz.d80f285c} | Bin
 gfx/fx/psychic.png                            | Bin 0 -> 175 bytes
 ...flect.2bpp.lz => reflect.2bpp.lz.9a9c822d} | Bin
 gfx/fx/reflect.png                            | Bin 0 -> 211 bytes
 .../{rocks.2bpp.lz => rocks.2bpp.lz.73d0153e} | Bin
 gfx/fx/rocks.png                              | Bin 0 -> 669 bytes
 .../{rope.2bpp.lz => rope.2bpp.lz.209d63dd}   | Bin
 gfx/fx/rope.png                               | Bin 0 -> 256 bytes
 .../{sand.2bpp.lz => sand.2bpp.lz.c87c0eaa}   | Bin
 gfx/fx/sand.png                               | Bin 0 -> 384 bytes
 ...shapes.2bpp.lz => shapes.2bpp.lz.262d77f0} | Bin
 gfx/fx/shapes.png                             | Bin 0 -> 237 bytes
 .../{shine.2bpp.lz => shine.2bpp.lz.5fb79056} | Bin
 gfx/fx/shine.png                              | Bin 0 -> 273 bytes
 ...ack.2bpp.lz => skyattack.2bpp.lz.31738ab8} | Bin
 gfx/fx/skyattack.png                          | Bin 0 -> 393 bytes
 .../{smoke.2bpp.lz => smoke.2bpp.lz.aa05905e} | Bin
 gfx/fx/smoke.png                              | Bin 0 -> 191 bytes
 .../{speed.2bpp.lz => speed.2bpp.lz.1732b364} | Bin
 gfx/fx/speed.png                              | Bin 0 -> 136 bytes
 ...status.2bpp.lz => status.2bpp.lz.0c0aa13e} | Bin
 gfx/fx/status.png                             | Bin 0 -> 364 bytes
 .../{water.2bpp.lz => water.2bpp.lz.7b52ed12} | Bin
 gfx/fx/water.png                              | Bin 0 -> 277 bytes
 .../{wave.2bpp.lz => wave.2bpp.lz.bee99402}   | Bin
 gfx/fx/wave.png                               | Bin 0 -> 205 bytes
 gfx/fx/{web.2bpp.lz => web.2bpp.lz.80e3d480}  | Bin
 gfx/fx/web.png                                | Bin 0 -> 191 bytes
 .../{whip.2bpp.lz => whip.2bpp.lz.d80d8d6e}   | Bin
 gfx/fx/whip.png                               | Bin 0 -> 210 bytes
 .../{wind.2bpp.lz => wind.2bpp.lz.5a785180}   | Bin
 gfx/fx/wind.png                               | Bin 0 -> 286 bytes
 tools/gfx.c                                   |  26 ++++++++++--------
 80 files changed, 33 insertions(+), 11 deletions(-)
 rename gfx/fx/{aeroblast.2bpp.lz => aeroblast.2bpp.lz.2f07c4ea} (100%)
 create mode 100644 gfx/fx/aeroblast.png
 rename gfx/fx/{angels.2bpp.lz => angels.2bpp.lz.b026d81e} (100%)
 create mode 100644 gfx/fx/angels.png
 rename gfx/fx/{beam.2bpp.lz => beam.2bpp.lz.80b6d613} (100%)
 create mode 100755 gfx/fx/beam.png
 rename gfx/fx/{bubble.2bpp.lz => bubble.2bpp.lz.03b8ac99} (100%)
 create mode 100644 gfx/fx/bubble.png
 rename gfx/fx/{charge.2bpp.lz => charge.2bpp.lz.95d3ea98} (100%)
 create mode 100644 gfx/fx/charge.png
 rename gfx/fx/{cut.2bpp.lz => cut.2bpp.lz.03d343ed} (100%)
 create mode 100644 gfx/fx/cut.png
 rename gfx/fx/{egg.2bpp.lz => egg.2bpp.lz.41dd1a53} (100%)
 create mode 100644 gfx/fx/egg.png
 rename gfx/fx/{explosion.2bpp.lz => explosion.2bpp.lz.55fc334f} (100%)
 create mode 100644 gfx/fx/explosion.png
 rename gfx/fx/{fire.2bpp.lz => fire.2bpp.lz.d7701cda} (100%)
 create mode 100644 gfx/fx/fire.png
 rename gfx/fx/{flower.2bpp.lz => flower.2bpp.lz.1bc2e9d2} (100%)
 create mode 100644 gfx/fx/flower.png
 rename gfx/fx/{globe.2bpp.lz => globe.2bpp.lz.710dbb8e} (100%)
 create mode 100644 gfx/fx/globe.png
 rename gfx/fx/{haze.2bpp.lz => haze.2bpp.lz.91424607} (100%)
 create mode 100644 gfx/fx/haze.png
 rename gfx/fx/{hit.2bpp.lz => hit.2bpp.lz.2b3c83f2} (100%)
 create mode 100644 gfx/fx/hit.png
 rename gfx/fx/{horn.2bpp.lz => horn.2bpp.lz.48908aae} (100%)
 create mode 100644 gfx/fx/horn.png
 rename gfx/fx/{ice.2bpp.lz => ice.2bpp.lz.664d900f} (100%)
 create mode 100644 gfx/fx/ice.png
 rename gfx/fx/{lightning.2bpp.lz => lightning.2bpp.lz.a88fc131} (100%)
 create mode 100755 gfx/fx/lightning.png
 rename gfx/fx/{misc.2bpp.lz => misc.2bpp.lz.4b20c3d7} (100%)
 create mode 100755 gfx/fx/misc.png
 rename gfx/fx/{noise.2bpp.lz => noise.2bpp.lz.acb4a76e} (100%)
 create mode 100755 gfx/fx/noise.png
 rename gfx/fx/{objects.2bpp.lz => objects.2bpp.lz.83f812de} (100%)
 create mode 100755 gfx/fx/objects.png
 rename gfx/fx/{plant.2bpp.lz => plant.2bpp.lz.4a00c417} (100%)
 create mode 100644 gfx/fx/plant.png
 rename gfx/fx/{poison.2bpp.lz => poison.2bpp.lz.fc7dc9c1} (100%)
 create mode 100755 gfx/fx/poison.png
 rename gfx/fx/{pokeball.2bpp.lz => pokeball.2bpp.lz.c58f7e01} (100%)
 create mode 100755 gfx/fx/pokeball.png
 rename gfx/fx/{powder.2bpp.lz => powder.2bpp.lz.bfd566bb} (100%)
 create mode 100644 gfx/fx/powder.png
 rename gfx/fx/{psychic.2bpp.lz => psychic.2bpp.lz.d80f285c} (100%)
 create mode 100644 gfx/fx/psychic.png
 rename gfx/fx/{reflect.2bpp.lz => reflect.2bpp.lz.9a9c822d} (100%)
 create mode 100644 gfx/fx/reflect.png
 rename gfx/fx/{rocks.2bpp.lz => rocks.2bpp.lz.73d0153e} (100%)
 create mode 100755 gfx/fx/rocks.png
 rename gfx/fx/{rope.2bpp.lz => rope.2bpp.lz.209d63dd} (100%)
 create mode 100644 gfx/fx/rope.png
 rename gfx/fx/{sand.2bpp.lz => sand.2bpp.lz.c87c0eaa} (100%)
 create mode 100755 gfx/fx/sand.png
 rename gfx/fx/{shapes.2bpp.lz => shapes.2bpp.lz.262d77f0} (100%)
 create mode 100644 gfx/fx/shapes.png
 rename gfx/fx/{shine.2bpp.lz => shine.2bpp.lz.5fb79056} (100%)
 create mode 100644 gfx/fx/shine.png
 rename gfx/fx/{skyattack.2bpp.lz => skyattack.2bpp.lz.31738ab8} (100%)
 create mode 100644 gfx/fx/skyattack.png
 rename gfx/fx/{smoke.2bpp.lz => smoke.2bpp.lz.aa05905e} (100%)
 create mode 100644 gfx/fx/smoke.png
 rename gfx/fx/{speed.2bpp.lz => speed.2bpp.lz.1732b364} (100%)
 create mode 100644 gfx/fx/speed.png
 rename gfx/fx/{status.2bpp.lz => status.2bpp.lz.0c0aa13e} (100%)
 create mode 100644 gfx/fx/status.png
 rename gfx/fx/{water.2bpp.lz => water.2bpp.lz.7b52ed12} (100%)
 create mode 100644 gfx/fx/water.png
 rename gfx/fx/{wave.2bpp.lz => wave.2bpp.lz.bee99402} (100%)
 create mode 100644 gfx/fx/wave.png
 rename gfx/fx/{web.2bpp.lz => web.2bpp.lz.80e3d480} (100%)
 create mode 100644 gfx/fx/web.png
 rename gfx/fx/{whip.2bpp.lz => whip.2bpp.lz.d80d8d6e} (100%)
 create mode 100644 gfx/fx/whip.png
 rename gfx/fx/{wind.2bpp.lz => wind.2bpp.lz.5a785180} (100%)
 create mode 100644 gfx/fx/wind.png

diff --git a/Makefile b/Makefile
index ed74afe5c..b60672e35 100644
--- a/Makefile
+++ b/Makefile
@@ -135,6 +135,24 @@ gfx/slots_3.2bpp: tools/gfx += --interleave --width=24 --remove-duplicates --kee
 gfx/slots_3a.2bpp: tools/gfx += --interleave --width=16
 gfx/slots_3b.2bpp: tools/gfx += --interleave --width=24 --remove-duplicates --keep-whitespace --remove-xflip
 
+gfx/fx/angels.2bpp: tools/gfx += --trim-whitespace
+gfx/fx/beam.2bpp: tools/gfx += --remove-xflip --remove-yflip --remove-whitespace
+gfx/fx/bubble.2bpp: tools/gfx += --trim-whitespace
+gfx/fx/charge.2bpp: tools/gfx += --trim-whitespace
+gfx/fx/egg.2bpp: tools/gfx += --remove-whitespace
+gfx/fx/explosion.2bpp: tools/gfx += --remove-whitespace
+gfx/fx/hit.2bpp: tools/gfx += --remove-whitespace
+gfx/fx/horn.2bpp: tools/gfx += --remove-whitespace
+gfx/fx/lightning.2bpp: tools/gfx += --remove-whitespace
+gfx/fx/misc.2bpp: tools/gfx += --remove-duplicates --remove-xflip
+gfx/fx/noise.2bpp: tools/gfx += --remove-whitespace
+gfx/fx/objects.2bpp: tools/gfx += --remove-whitespace --remove-xflip
+gfx/fx/pokeball.2bpp: tools/gfx += --remove-xflip --keep-whitespace
+gfx/fx/reflect.2bpp: tools/gfx += --remove-whitespace
+gfx/fx/rocks.2bpp: tools/gfx += --remove-whitespace
+gfx/fx/skyattack.2bpp: tools/gfx += --remove-whitespace
+gfx/fx/status.2bpp: tools/gfx += --remove-whitespace
+
 
 %.bin: ;
 %.blk: ;
diff --git a/gfx/fx/aeroblast.2bpp.lz b/gfx/fx/aeroblast.2bpp.lz.2f07c4ea
similarity index 100%
rename from gfx/fx/aeroblast.2bpp.lz
rename to gfx/fx/aeroblast.2bpp.lz.2f07c4ea
diff --git a/gfx/fx/aeroblast.png b/gfx/fx/aeroblast.png
new file mode 100644
index 0000000000000000000000000000000000000000..1fdc07c2ff0e8f8557993f5af53cb50e92501030
GIT binary patch
literal 187
zcmeAS@N?(olHy`uVBq!ia0vp^5<u+01SA;p3qQyMsU}Ys$B>F!t>-oh9yZ`{4t#IV
z6`IlV#yP)%sl(&ONzLgoH~#STx3_4@2Dz{b7ON^B^ICKH;Hk%aTA%&Gj(vBz?><ev
zdILKQP5*Z3P`^uV*^#@G_xiP+`!?n6$$4)s%DugKIbvb(`>+bfpVx06*1a`({T$n4
g7f*6!zIbcP$m(Q2>#FPaRFJDYUHx3vIVCg!02S#^K>z>%

literal 0
HcmV?d00001

diff --git a/gfx/fx/angels.2bpp.lz b/gfx/fx/angels.2bpp.lz.b026d81e
similarity index 100%
rename from gfx/fx/angels.2bpp.lz
rename to gfx/fx/angels.2bpp.lz.b026d81e
diff --git a/gfx/fx/angels.png b/gfx/fx/angels.png
new file mode 100644
index 0000000000000000000000000000000000000000..ef38c61d296f727264c7f84792f0e352ab716044
GIT binary patch
literal 363
zcmV-x0hIoUP)<h;3K|Lk000e1NJLTq001BW002k=00000_y(}P0003pNkl<Zc-m#r
zF>1vy3<lsIX9=O;D+Ib2O+7%tR}1ZyC08(ci_y|6JYKgfy-LViO<h@b-q7bIAC@fH
z3UXV>IRO<nW~(6POF?30R0J0b4xVTB3Q2mxY6Vv&8eRoNBeTnpGSm=xmO>JW9O6ZG
zK33)+r;gZ@c0VL%3Q}<6b!J`!aScobZf0^N<OZToN#4e7k`%$RvEo>caviDccaHU4
zTNr%BLQBJ~;#g7*m5<^vmJ_?*kvjo8m<b*-uiyZS9l8Xnmkwo?Fkf968qnKs*_ld8
zRtzY0QUF)PAy$kgC^A}d9$_jrB6z(jjTNQYy(L>@ZQ4UFmQ#<Q$i1n-yc^S51)}{a
zr+y)=3f`xNHwXR8^1@Vc^$o(VVYmP1bDn}Cp#e{LgdWM~@jnK9R6-%D9ryqM002ov
JPDHLkV1gC9kLmyb

literal 0
HcmV?d00001

diff --git a/gfx/fx/beam.2bpp.lz b/gfx/fx/beam.2bpp.lz.80b6d613
similarity index 100%
rename from gfx/fx/beam.2bpp.lz
rename to gfx/fx/beam.2bpp.lz.80b6d613
diff --git a/gfx/fx/beam.png b/gfx/fx/beam.png
new file mode 100755
index 0000000000000000000000000000000000000000..32a3b1967566d5b03a9c801a6e9d9ac2cc6dd291
GIT binary patch
literal 562
zcmV-20?qx2P)<h;3K|Lk000e1NJLTq000mG002k`1^@s6|1Nd=00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf0mn&1K~z{r-IjrF
z!Y~X(+lgO<kA#n8JueqIj@{Trnx;JoHMF^l<Jg7$eXtq!eQ%=?XX-W>P<X%J<!X7o
zUUJn&w{{gVg^>ZlT$+dh#aRPDldtx@b0&_Sy^ja)=ktklq`+Kgpq(P9^0`4KVP{AL
zFu7_Z5quOyOKci_0ze9hB}$@*>^yMeP4A&a&pj5G@!rB23|0|P4A6e^ZMfOG(xT@O
z_kB>|50rAdUgoj^5-p!<5_v*A>a>9srVSz?2@O`lFoLX*W!(*`LIRZ-RE0f)W5QrS
zR>E$8H;jxLSs_!`e;cbp(vw&fl4%QBA?XHHA(`HZSt03lP!*D8Gp+bf@5IOB(MB=e
zoOA@y0)s&`iT979ldEPhKtpL0jPYTkdGu~1+C+D#w>ppr>?#<at*Yt00M0~F6hkT7
z&@F5@joS;W#L);5h0PS1*sY`s33z!34KPvf*%O0O1RlR<fQ0gxHKhnVlkyg5LZeb0
z=u;t6H%63>(XJke!DQfteumqP8k$8>gh?dY^pXLgku^yhM3f835*i?6FR7Mk3luT?
zt0V0OR>-oA3W!X9G_yi7{mIG-Nspi^{9)U^0idedvcuF+WdHyG07*qoM6N<$f`S<7
AkpKVy

literal 0
HcmV?d00001

diff --git a/gfx/fx/bubble.2bpp.lz b/gfx/fx/bubble.2bpp.lz.03b8ac99
similarity index 100%
rename from gfx/fx/bubble.2bpp.lz
rename to gfx/fx/bubble.2bpp.lz.03b8ac99
diff --git a/gfx/fx/bubble.png b/gfx/fx/bubble.png
new file mode 100644
index 0000000000000000000000000000000000000000..b6febb0a8ba6be73ee396c958e874051fe3dcea6
GIT binary patch
literal 237
zcmV<J022R+P)<h;3K|Lk000e1NJLTq000mG001}w00000o7X=_0002ANkl<Zc-mdg
zF%E(-6b9gz5EqwDGI#_Rj?gPOIN=Sv3|BB|Ob~}2L0BAc;0h!x4HLn|kfzVSq#Cuu
zxBRdFd&FhLWTlbxV3$$DtUMh_X7f)H$mz~bQO%R0u_!XKn_SXd#dv{10MVkJCkdS2
z!Pyt1UumxhtnN{;JifnuS_WYwYPxDi@)@7O!2!*b7^JnDM?4s(MGDdaTtYz!><UyV
ni1p8XK-|D~4NiN|>yW+x#WApSd|AVx00000NkvXXu0mjfwZC71

literal 0
HcmV?d00001

diff --git a/gfx/fx/charge.2bpp.lz b/gfx/fx/charge.2bpp.lz.95d3ea98
similarity index 100%
rename from gfx/fx/charge.2bpp.lz
rename to gfx/fx/charge.2bpp.lz.95d3ea98
diff --git a/gfx/fx/charge.png b/gfx/fx/charge.png
new file mode 100644
index 0000000000000000000000000000000000000000..90cb72f9fb85193cefc022ed4a067642c80144f1
GIT binary patch
literal 188
zcmeAS@N?(olHy`uVBq!ia0vp^0zj<61SA+{FxuV$Qq7(&jv*DdY|m`uZ4TgJxsbhL
z<${JpiAIl!8WM_{5^5V*M0y;84yf>axEmewr*}c+rI+W}B!dDbv;W9uGmv)A*ex@`
zoO5Pxsi9fBo1A8zP1Qr;I^MI7a!)suCMC6+ZM!@@)}wurk@Av{pM$lZ?7gD#{cZ81
mi`?@kh({e={<Zb^?!U~Yw<^!?_N$o-a+as7pUXO@geCxb=|~O$

literal 0
HcmV?d00001

diff --git a/gfx/fx/cut.2bpp.lz b/gfx/fx/cut.2bpp.lz.03d343ed
similarity index 100%
rename from gfx/fx/cut.2bpp.lz
rename to gfx/fx/cut.2bpp.lz.03d343ed
diff --git a/gfx/fx/cut.png b/gfx/fx/cut.png
new file mode 100644
index 0000000000000000000000000000000000000000..e227ad413155014a4ff244c8fcc1290c32dc121c
GIT binary patch
literal 170
zcmeAS@N?(olHy`uVBq!ia0vp^96)Tq1SA-o|JIlRsX|W|$B>F!t|vC~9x@Pcd#G;M
z!0pyxyNT(n>AK7vsu7J^y1YS8qSah?nfNqXzgFKkVZy#gFB><w*l2XF)nCLT(-QV%
zi__eQ`9J0=EqiNzuh)NRTGX4Y3C*8hr|&eHe?d^yB;i}Rags_>df(G?yI=g_&Mz_Z
T^$d=G0CI$<tDnm{r-UW|r;R|}

literal 0
HcmV?d00001

diff --git a/gfx/fx/egg.2bpp.lz b/gfx/fx/egg.2bpp.lz.41dd1a53
similarity index 100%
rename from gfx/fx/egg.2bpp.lz
rename to gfx/fx/egg.2bpp.lz.41dd1a53
diff --git a/gfx/fx/egg.png b/gfx/fx/egg.png
new file mode 100644
index 0000000000000000000000000000000000000000..38aab505d681e4aacfe3ca637bf9deb6fa1e325b
GIT binary patch
literal 200
zcmeAS@N?(olHy`uVBq!ia0vp^0zmA+1SA+Hd^KtVQvIGTjv*Ddl7H~C@cg%L=m=JD
z;`aCx$*OF3uroM<qvehKgl+%X9av86vFAzPOq;Mv^qWIcsC`ESk9rtG>cozt4!0Ft
z>@Tpcek1u$K8nHQ6~Fxz8v!P(B2oLp^?EasHrxv?VA?NkSHjSF{+Pp~Gm;909-S8T
w3aot69%fQ*H9X9M3pI|&TYQ`^x{f!Eiy=n*UA28taWu$@p00i_>zopr06G>yfB*mh

literal 0
HcmV?d00001

diff --git a/gfx/fx/explosion.2bpp.lz b/gfx/fx/explosion.2bpp.lz.55fc334f
similarity index 100%
rename from gfx/fx/explosion.2bpp.lz
rename to gfx/fx/explosion.2bpp.lz.55fc334f
diff --git a/gfx/fx/explosion.png b/gfx/fx/explosion.png
new file mode 100644
index 0000000000000000000000000000000000000000..0af9f1a0d98cf10396c24c3de4e014e7842400aa
GIT binary patch
literal 157
zcmeAS@N?(olHy`uVBq!ia0vp^0zj<61SA+{FxuV$QYoG;jv*Dda?c&)JfI-pa`9sV
z_scUfItNR{_%#peW^xOtZDwzEV3F@Wk?yE$sA#i+cb@^<rR&}7VlT8deCW;n*H^Wz
z>erFZH5po6&sJsZGz@<G;ZEC&TdyjPSh|R=h*H`5Kq+4Bgx|X((RwdH_IkSdxvX<a
GXaWE*6gu1h

literal 0
HcmV?d00001

diff --git a/gfx/fx/fire.2bpp.lz b/gfx/fx/fire.2bpp.lz.d7701cda
similarity index 100%
rename from gfx/fx/fire.2bpp.lz
rename to gfx/fx/fire.2bpp.lz.d7701cda
diff --git a/gfx/fx/fire.png b/gfx/fx/fire.png
new file mode 100644
index 0000000000000000000000000000000000000000..19f01141b29f7d02004f534fa810d685667578a1
GIT binary patch
literal 153
zcmeAS@N?(olHy`uVBq!ia0vp^96)Tq1SA-o|JIlRsRU0K$B>F!sizIO8Vm$nF4muP
z;px~bzTt~VQl{!W4X&n&u8gf~ZYHSj$$Pe#`BH&Zj9_=jW2cLP-BVaq7W`7qa9TX^
z&ad~G>F13<e0d|f@lb!uQJK}PlVX=#Tb66|{STA<1Lw{|C*^N}?DTZ?b6Mw<&;$So
CTsyV^

literal 0
HcmV?d00001

diff --git a/gfx/fx/flower.2bpp.lz b/gfx/fx/flower.2bpp.lz.1bc2e9d2
similarity index 100%
rename from gfx/fx/flower.2bpp.lz
rename to gfx/fx/flower.2bpp.lz.1bc2e9d2
diff --git a/gfx/fx/flower.png b/gfx/fx/flower.png
new file mode 100644
index 0000000000000000000000000000000000000000..61b4f58cefe9f79671e03fd6488eac07b9745017
GIT binary patch
literal 149
zcmeAS@N?(olHy`uVBq!ia0vp^0zj<51SA+rg7$9&QZb$`jv*Dde0vP}4j6DS|2^Gj
z)0$p#CgkIyvJ;oWTX+K>X$48>9QdY~J>jF@M4|1f7ljsTRYb)U6#q8=_u^e*q{ydb
xF3XfsGOqs7ambgrwz~RGb)Pz~n?zbJlik;%tjmepTpobz^K|udS?83{1OP3|H)j9<

literal 0
HcmV?d00001

diff --git a/gfx/fx/globe.2bpp.lz b/gfx/fx/globe.2bpp.lz.710dbb8e
similarity index 100%
rename from gfx/fx/globe.2bpp.lz
rename to gfx/fx/globe.2bpp.lz.710dbb8e
diff --git a/gfx/fx/globe.png b/gfx/fx/globe.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d3a35683064c2dc56153f83435739d670c41e6c
GIT binary patch
literal 292
zcmV+<0o(qGP)<h;3K|Lk000e1NJLTq001BW001BY000009HBjl0002%Nkl<Zc-ke8
zK}rKb6hsR=z%asOkxllw#4PM_;U*5`kI);}=}Rc+0Rpjw%qoFQpz9o7Kp`7%A&f%6
z*#4euK98b)6@?h%daVaB9?AOwTJK&G9D~^HMB&rdO}JB7h%}UlKQFbTf56F$ScVcm
zGMAQNhHt5)(<B^{m%PHEkkOu8p;G0Qd`4c>){#pXQ{6bWJLGv`)x3k5r!S|9)R$+)
z*y{muKTd&5ye*to*(bbDU0`Qd==Hhr%?w{-GWaILZ;JD-#A&L~ZAwIK<o;1td?@fj
qp;u{>rO8@#J8bVq%m#?Y==ldEv6Isq{NcC&0000<MNUMnLSTZ{Q-VVP

literal 0
HcmV?d00001

diff --git a/gfx/fx/haze.2bpp.lz b/gfx/fx/haze.2bpp.lz.91424607
similarity index 100%
rename from gfx/fx/haze.2bpp.lz
rename to gfx/fx/haze.2bpp.lz.91424607
diff --git a/gfx/fx/haze.png b/gfx/fx/haze.png
new file mode 100644
index 0000000000000000000000000000000000000000..8a870ba98592d4d58513c1c426d9dead5200fa8c
GIT binary patch
literal 173
zcmeAS@N?(olHy`uVBq!ia0vp^3Lwk`Bp75C+I9k|5>FS$kcwNWJqLLYDDW_E7G^fE
z;1}ySqW18haLenqkX2FjNpp+D3^bV!tzOle`eaH+%F5-QT^w>od=EZnbx(RNr!STI
zgHJ&0pY`|hf3KF#OG=xYdM&6UW%hFKPM|9O2cO@~zLb7pk<Wd`Lx<|0|68a3m+6e|
V<*UntqhEpC;pyt<vd$@?2>>L-Lrnkx

literal 0
HcmV?d00001

diff --git a/gfx/fx/hit.2bpp.lz b/gfx/fx/hit.2bpp.lz.2b3c83f2
similarity index 100%
rename from gfx/fx/hit.2bpp.lz
rename to gfx/fx/hit.2bpp.lz.2b3c83f2
diff --git a/gfx/fx/hit.png b/gfx/fx/hit.png
new file mode 100644
index 0000000000000000000000000000000000000000..228066331ce55746666b48a73311bf59ae1ba52f
GIT binary patch
literal 306
zcmV-20nPr2P)<h;3K|Lk000e1NJLTq000mG003wL00000msvNk0002_Nkl<Zc-n2z
zF>ZrE5CzaLs)$^I64{0C!wt+OSW)=`QOeMTY(txlTcmIkO61-MA+0C>L%@j=Y4x;&
zhChRVnFXv22!(jIGwfL8u>8rx&VFV1&HOAUS5Gp*q=F1D3!yl_GLP6Xe_NXGc|qle
zUduP;GTi%u89v2zAVWriUl~Lud`ldKqr`bp{)^WP7vb>-mB$_zhX&^27B(`^deU@c
zFXD<sj=;^+NU7V2AB$Ra8@(9Cq!ybR!{vR~psUlvH)*;<pC$?FhonLbl!(CNz=Ciq
z(SfV=zyTAu-_1p>{+2Cxt>L1-RHEDH#V96m^J{?k0@M)~jq}+DN&o-=07*qoM6N<$
Ef?|b;`v3p{

literal 0
HcmV?d00001

diff --git a/gfx/fx/horn.2bpp.lz b/gfx/fx/horn.2bpp.lz.48908aae
similarity index 100%
rename from gfx/fx/horn.2bpp.lz
rename to gfx/fx/horn.2bpp.lz.48908aae
diff --git a/gfx/fx/horn.png b/gfx/fx/horn.png
new file mode 100644
index 0000000000000000000000000000000000000000..56e8ca2418239558d8f3f21a537720eb303655da
GIT binary patch
literal 179
zcmeAS@N?(olHy`uVBq!ia0vp^5+KY3BpCYFRJ8)BDo+>3kcwNnr#1>U8wj{u^e!yQ
z-NDV8)xePS+~nZ_T?bA%w^xTPb7ye$Z)7@qpsMskbM?V_3rswBzTUbaGycQP$()X?
zt55Hp?E5{!dEbor^WGE&c$`{TI3eErio(XPDy?ChX?{=6b}ng8<eb)gD#Gn?k#Su4
c<KnugdV%iJkcMRLN|0+jUHx3vIVCg!0QEFRK>z>%

literal 0
HcmV?d00001

diff --git a/gfx/fx/ice.2bpp.lz b/gfx/fx/ice.2bpp.lz.664d900f
similarity index 100%
rename from gfx/fx/ice.2bpp.lz
rename to gfx/fx/ice.2bpp.lz.664d900f
diff --git a/gfx/fx/ice.png b/gfx/fx/ice.png
new file mode 100644
index 0000000000000000000000000000000000000000..62a67641e82891b3133ddeb572818c8ed442380a
GIT binary patch
literal 137
zcmeAS@N?(olHy`uVBq!ia0vp^96)Tq1SA-o|JIlRsQ^zG$B>F!$v=|Me|Twg_~m(?
zs(Ohv{~J!q@>JzZY$-R$Slgg<(VoZM-nho*JVVHz|MnaUUp8qUTl(orI@?-%o<-Uc
keR^p>ZtzcS^;YC$Vz`s$l<NFqo(ISdPgg&ebxsLQ0Ks=KS^xk5

literal 0
HcmV?d00001

diff --git a/gfx/fx/lightning.2bpp.lz b/gfx/fx/lightning.2bpp.lz.a88fc131
similarity index 100%
rename from gfx/fx/lightning.2bpp.lz
rename to gfx/fx/lightning.2bpp.lz.a88fc131
diff --git a/gfx/fx/lightning.png b/gfx/fx/lightning.png
new file mode 100755
index 0000000000000000000000000000000000000000..6606fad12c5ecfbc1783794faa17c4b0c6559cee
GIT binary patch
literal 820
zcmV-41Izr0P)<h;3K|Lk000e1NJLTq000;O003AB1^@s6?=Lr$00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf0?A24K~!i%?U`GS
zn?MjnjrV9T(zD13hxnqRsOtAmq#Ox>q5IyhN5d%Des>-L@Av!hdcBV8pP!${=kqzP
zdwG7(7gmYG&0wWC+zb#z7%;+chGGOO2x}mgr)YKl;b>Fkd9^q^wQ4KAl5H10H=0bq
z8qGv=*~vatV#X|dRmcb;vmTSMO%ad?f-`j~?gL>Ppf^QT1H=_YuQ;RzcGJO#I20pL
z?lHp97QdDBgCl$-y{T#{G7Q&&2r~AS|L%gvd6d*(g*b#M@_C=3X&;Pqj|dGYq*@ea
zOq#oBl=N+?8rVq0(tUuDJ$gxZvd_7Vs3(H1SH;LqE~aQ!98!Z7;t(3F5{J+LL4;S(
z)TX|pdMI|0PZjj0>taw^>1a)E1`_fhJYsT7QIr;IIu(J4Ohj)Ds%>gl-zyHyT?D=9
zf$Bc+De5JSV8!a8xyU2pP)!kxio?JEvP%tCMbT7)8Bzn^rlS<wbhbsInxYwTC>qRm
z5QGM{gZ{Vat&9AsZ8w$LHXCzBz<@~HqA`A4gvLCx306E>xt-_d+uuiubR!eeeSZ!7
zwt}7`MRrm&*xs|k5!|=W!Y&#$u?rQ|HqBOQMeG=B&av$q>e8l}U@Jbl^skCl3>nyW
zQ|)crWguan^O8yPyGS1)iQ6KVXf_ZCYt@`FEWOT~47P3iUi}4Oe=nnGfJjLQquR&l
zEV3WSWTD)1&)&CWy>dig3#eli=YLRuR#*$$!~AT{Sp$UWjM~PDP}GshrO4ST6jhf0
z>^__ZrB&3xfFqj!)P^aoqJ_-lh`{HaK|1qHziVi**5pzH;9;wvrMM5kr)tEARWk>T
zGb`+5&pzn#kK+t09h#%@mRpM8bl=%0+#=EQeSVr6QT*U2WKi*J3YCg5HDAIA1cM_%
yOGzA>KACDckcf{i5{IFWzL0Sy4pRno9*;l2LvC3e@O&Hq0000<MNUMnLSTY_D|4X$

literal 0
HcmV?d00001

diff --git a/gfx/fx/misc.2bpp.lz b/gfx/fx/misc.2bpp.lz.4b20c3d7
similarity index 100%
rename from gfx/fx/misc.2bpp.lz
rename to gfx/fx/misc.2bpp.lz.4b20c3d7
diff --git a/gfx/fx/misc.png b/gfx/fx/misc.png
new file mode 100755
index 0000000000000000000000000000000000000000..d7e67508e4d92e75270d07fba88f973d044e4b55
GIT binary patch
literal 1082
zcmV-A1jYM_P)<h;3K|Lk000e1NJLTq000mG006)U1^@s64b9_D00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf1J6lBK~!i%?V5{j
zDlrU1p}M~a9|<4XyJInt<JgX~OIw6E(l+cSGjW^;5B2=LaZ;SmXDQ9&kgrE6KzzI1
z<f74x&R`EeYk*<QhSDXGIj~%>S1G;3wg|GGbYg8gF^GD$Xd}|)pkiWq&MY7~Ow<gt
z)5&ZRte9xJA<Rr{?_gL56|_ldA!%$B&y8S)?trrLI^gi^5O*!4%jF`5xON*bl9B<#
z_n0QpiuFQ+G&S(Vws|;&iWn@d0{~+{+0r_&QGrqtffaH{X%5(<6>DHG5ipRbM-N0H
z5ukCkM@t)mUY;wIXCdOb2KW1YsRaKXW%m&I!2PTwm_Mv1f%jWNzqf{IDQzFR0UBju
zX(xXZXk<;w21FZC3=VJSX21&Ic}DdzjobqS_qtJ5FS}7!67F{^Ce!nv$_p4^92k#=
z;{&sLyb$oxE)q>t{|-rfl)HHYgTvdo{O$}~<IKQr<!%W-2y@__1Gv`_0oTA2NBr(I
zF6F@Di3QAp29LP!^%c?8XmOR+a*r7N?ksq`fkF8^h?t%SGX?{@T`jgh*T6O+UfqyH
zH1MK`j0c0LVPxDHL}KEZbU8rf>?pJ6!r!mNkHIS#JbyQ?k`6(CwF^N68oaq=rKK~N
zi9M5MP!+QzVo(*?61+eJ)y7fz4mo&~Wf4o#48W=wbOvBW3<d*DB+@LsJA3Rt(s*(`
z_fVakhaPSOD@M)0iZT;jC$qo@I{W&WXU4Xufrs4eL4Lu=K<{1zB%MYGx7Fx=-6P>F
zP=L=w8N-JxfF3n8@rK(B7;eU)uYJJFg&0(Nk64NT*eJe^^bXq3!gji<ridk7ik^|4
zjnIHXMyBueRJwaX_iBwSG7Fwb757vIQO~xs!GPEm7c`3vJhUlgWdpn5I2)y<?5$SZ
z<N4IU6Khg~nHYoyGjW=Osu&CgD`L<YtcpQ1*dqpFuvZMa^T0F7#6TjrTrP5<v1TR)
zT@tlPMGWLbvR|&MV$i*{k*XLhod+IW4))*<VTH~hTTCG^0C>3>NV#&kIe=gFI-JCh
z!N&j`Hb~C{9&gzua}6l8ct*nzAZA0J)&S2u<7Q9^mv!1m45E-TsA&;oJzI3!^EO6z
z7C3ei{V>-ItY8KW4@ZD=P5!6Cf@j-U<%;UTFpU+4X<V5BLd`IZStP8}9Uk5bKeHQG
zXgS!+VS`;m(4QsB23j<oMh%5pq^CJGu%B8e)RNFZi#;K6XTgdg4Eh-jJaI<24k}{M
z8Q7#%a3iSp4#FXn*?JQ2atmL|6%I#m(BO3X4~EPunI=W&m;e9(07*qoM6N<$f-d>k
AH~;_u

literal 0
HcmV?d00001

diff --git a/gfx/fx/noise.2bpp.lz b/gfx/fx/noise.2bpp.lz.acb4a76e
similarity index 100%
rename from gfx/fx/noise.2bpp.lz
rename to gfx/fx/noise.2bpp.lz.acb4a76e
diff --git a/gfx/fx/noise.png b/gfx/fx/noise.png
new file mode 100755
index 0000000000000000000000000000000000000000..17540a5e8a24dbe52a3ffa07082b9e374be21223
GIT binary patch
literal 526
zcmV+p0`dKcP)<h;3K|Lk000e1NJLTq000;O002-31^@s61AMjl00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf0i#JoK~z{r?Us#h
zgD?z)VebeJ$xCiKR7Z}n^M@U=uAfwurQnOtmv-y-FH0a_ulFkJx~5kTW(TE0Jx!+$
z_ztb&BW@;v(!=;{q&UbdqMgfPvZEfc%M3Jo_$~OnM?g&x3h>t*nqxZ3a|GbMHlG?v
zpj2R_FmVdpDNv)yBA%q)RHbu3UEGbO<T+p0qs$lZPE;lk5!Xy0V%~2!WN+R`01*v~
zX+&XSjz#={eZH<G^8})jlywks7F3HoMdlBgQtQ=45{No%^DXj56@dR<Hk|@8|E@Fe
z%)CbY45H#me0~qA{B41K-(!Z1!r(ZL`yEg*f)@ua7Ew`I9JtLuD-NEMBI$K2T^&G#
z3-N1d4bdFaS_hWEb7nwTJGC$cEUy7XT7`-opm53iCLs)2W81du9q{W`)D+RKd;QkP
zEUH;D!n~MrTRf~G&KY=meqkgTJ^YjZi%QY0#rjqUEobH;ARnT?Tf30=WdgNgr9wb^
zenm`Q*C#j&@?mWaSnC`!ru;!VfVDM1>j?;0Xot{Rvkq)AMVH+a(C=NAAIe+qil$ii
QNdN!<07*qoM6N<$f{lRNP5=M^

literal 0
HcmV?d00001

diff --git a/gfx/fx/objects.2bpp.lz b/gfx/fx/objects.2bpp.lz.83f812de
similarity index 100%
rename from gfx/fx/objects.2bpp.lz
rename to gfx/fx/objects.2bpp.lz.83f812de
diff --git a/gfx/fx/objects.png b/gfx/fx/objects.png
new file mode 100755
index 0000000000000000000000000000000000000000..91ea435b8096a749a934fe1d2ec613d5d260233d
GIT binary patch
literal 705
zcmV;y0zUnTP)<h;3K|Lk000e1NJLTq000mG003YJ1^@s66w&ga00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf0#->xK~z{r<(CVN
z!Y~X(3)(BfA>oj0$1suO*iOtxLc33@+9sKa<9rH-+s@{2KA#^?+jhNPx1iZ}eB3)A
zKAlc-0o)IVgIpHZfS_k`xm@J3M#B(L$(}W~j6>`qfEc~l#*rAb2q?~=kcJrI4<0hH
z?#&w-vT@U5EdZW~WoRn~^7g<J5L?#_Dk8w?#eFcy%=Eed%^=IZ6#<rE0tW+6K(vrd
zbD#~)q7?=M8-XX%h{65w&P-ql&x2Lc?YzP?0=@S&l%)oClj(gzSvUlU?euyJ&W*qm
z>vu#FM&OA-v_gj?%@b#IN7{-Qk?2uN1kZ}WbTbi842~#_5=0^~kRfCynHaQL@Jwc6
zVQ<iZqCF>aUm;wHPO;0d62Yn%Gz0XCt4do)*lD<`Cc_Y_CT<QYxCWIdUXOr1+1~}L
zNCcb#ZL&Iy&m^%zXMnJYK6x|V6M>z9)!u;|X|K>7>!f0ueq2}hvULD319nzGRNfir
z1}o2?CDC)w;Hv$?Bvxq#dMD1%ZMz6oOl+HB2$_jj=jOm`7#W92)PgLkzqlK#qy{+V
zW?!e!077IRS7!2=A+UFnMIr0JRz?fQ9y(Y;%^(s*zzha51UyuZG>SpDlsS~y5R{}(
zqOORrZQeVLHkk-n=f<5*<bdFHZzOkJ#dp?e+$5@^4zK<{94Ht!FOQ`NFn#V6?o17k
zW3C0yq?7~vkHp{P&IHq#fhKx!+5eQOfff@Qk<h>sd$_f$VlcF*h(Xt?Dh93PGh!gE
npB01dyRbjXy~2y<!M6PZLtma#=Rh?200000NkvXXu0mjfc#<!h

literal 0
HcmV?d00001

diff --git a/gfx/fx/plant.2bpp.lz b/gfx/fx/plant.2bpp.lz.4a00c417
similarity index 100%
rename from gfx/fx/plant.2bpp.lz
rename to gfx/fx/plant.2bpp.lz.4a00c417
diff --git a/gfx/fx/plant.png b/gfx/fx/plant.png
new file mode 100644
index 0000000000000000000000000000000000000000..ec1125054b1668cb6104891ce4636967b3f7cfc5
GIT binary patch
literal 293
zcmV+=0owkFP)<h;3K|Lk000e1NJLTq000mG002k=00000ko7W#0002&Nkl<Zc-n=}
zu}T9$5C-5M0v3m`h4G4OMKPAv!W2G$h0SqK5K^YLvkhz!A0RL(?lD3%S8U^}%%1JQ
zI2#oN3!9IHfA-&5n3+O?2@=~YX02V|s#iwGW5i9^5n#dKb3aI7;s^t%VqyqM_)2wR
zg#A_tX<G_j(h<h&abTR^ON$*DzK4%cA*#dT&DU>*Gba^pPd&JMB8;nLL|QEwX;U$V
zO|^!!m;SD|{n`(uuX*;v(90Z${=mqK+L!E_2s@b)Z1mVP79ReRosUxGKYhm-EFiN+
r<UTv|Awm~5LA%DQ>Z#w@|JU~k2=vCB5G0is00000NkvXXu0mjf<y3s_

literal 0
HcmV?d00001

diff --git a/gfx/fx/poison.2bpp.lz b/gfx/fx/poison.2bpp.lz.fc7dc9c1
similarity index 100%
rename from gfx/fx/poison.2bpp.lz
rename to gfx/fx/poison.2bpp.lz.fc7dc9c1
diff --git a/gfx/fx/poison.png b/gfx/fx/poison.png
new file mode 100755
index 0000000000000000000000000000000000000000..ebbbc52be5311a32f15d8c4ec1409082371cc072
GIT binary patch
literal 166
zcmeAS@N?(olHy`uVBq!ia0vp^96;>B1SA-i^n9KLq;fr7978H@rS@FpJZ!+j%Kv9_
ze^dBNwz$|UB3>s9q#PF5nPz6JuxPm#X_U!gF~fNAF3o!r=1ZHMaH}dkYkYEr#CI#f
zU03&M3CSP5Ray3?Iq4be`#n)_|Iczyez?N;-La^d_4Rg~ymuu7YxdVN-+blsA@^NR
P9moNmu6{1-oD!M<IF>-t

literal 0
HcmV?d00001

diff --git a/gfx/fx/pokeball.2bpp.lz b/gfx/fx/pokeball.2bpp.lz.c58f7e01
similarity index 100%
rename from gfx/fx/pokeball.2bpp.lz
rename to gfx/fx/pokeball.2bpp.lz.c58f7e01
diff --git a/gfx/fx/pokeball.png b/gfx/fx/pokeball.png
new file mode 100755
index 0000000000000000000000000000000000000000..47edf2190a2e63e7d2ac4364ea89052a8209890f
GIT binary patch
literal 388
zcmeAS@N?(olHy`uVBq!ia0vp^0zhoR!3HG1@Kjg<DaPU;cPEB*=VV?2IV|apzK#qG
z8~eHcB(eheoCO|{#S9F5M?jcysy3fAP=lnWi(`m~_uFX?`I;4YT2kMy;9trAvh1Ak
z(hE*oj@j3pR0@2T;jQTXy8j{5{J)j6p7WlOS~BI^Mfuest&FXYE%N*~>74#{#cd|z
zk)RWXM;Vecg~FNl?rQH*Dw7s$6nA}FJ?)Uq`P-+(E}Kl%e86hAWkQm`{mvYfxqOR*
zFMBgPDJS`C=B?^{+iZN~J<|(ag%dm)SKembWqn}K5W!{n?H!XqFwnT;OQlzC^Vr@f
zx-gqTuwLw@-WENPTJeS(eksad@3ATvE0`#mDz03%fb~{DkjsISyFOj3)W}k3m8pKN
zm?!?_m7Gym^{)e6OTtd9vs0M5(j4eFw<4Dd+H6I6)0p@smM_V^-z{Rp{NbOy#?F}L
g>klfM6MryGkY@aN@_Bj%Fyt6KUHx3vIVCg!07D^|g#Z8m

literal 0
HcmV?d00001

diff --git a/gfx/fx/powder.2bpp.lz b/gfx/fx/powder.2bpp.lz.bfd566bb
similarity index 100%
rename from gfx/fx/powder.2bpp.lz
rename to gfx/fx/powder.2bpp.lz.bfd566bb
diff --git a/gfx/fx/powder.png b/gfx/fx/powder.png
new file mode 100644
index 0000000000000000000000000000000000000000..b2cb4d459cc037f33190fec7599cf5feb04d3064
GIT binary patch
literal 100
zcmeAS@N?(olHy`uVBq!ia0vp^96&6<1SA+-0xLn3wx^3@NX4yWi~sW-e;ObDDa`ZV
w-uTb|^B<nuA6Bmx;1m&O>ymfusAuV9W@z{=Es%P33O7ifr>mdKI;Vst0O$A}7ytkO

literal 0
HcmV?d00001

diff --git a/gfx/fx/psychic.2bpp.lz b/gfx/fx/psychic.2bpp.lz.d80f285c
similarity index 100%
rename from gfx/fx/psychic.2bpp.lz
rename to gfx/fx/psychic.2bpp.lz.d80f285c
diff --git a/gfx/fx/psychic.png b/gfx/fx/psychic.png
new file mode 100644
index 0000000000000000000000000000000000000000..a6d22db2ff0192ba112f442d9a442d8e84767c1b
GIT binary patch
literal 175
zcmeAS@N?(olHy`uVBq!ia0vp^96+4G1SA+1D|}l6q{=*9978H@<(}Kf+n^xO`Y=4$
zx?yRevbuub!rs>4jI$a%35Uemn!JjfS{f2QnajlMu@@<DU(%eoXjzcjvu_c){ud&o
zt)JT!{Ysxzv^J+#qwBZ6z~R~hIRVTS;z6=!q}u*zH+=eZ-CKfF^`J@>-`1Ap@?!rO
XKOR`&X)Vdc0&<C`tDnm{r-UW|OQSvg

literal 0
HcmV?d00001

diff --git a/gfx/fx/reflect.2bpp.lz b/gfx/fx/reflect.2bpp.lz.9a9c822d
similarity index 100%
rename from gfx/fx/reflect.2bpp.lz
rename to gfx/fx/reflect.2bpp.lz.9a9c822d
diff --git a/gfx/fx/reflect.png b/gfx/fx/reflect.png
new file mode 100644
index 0000000000000000000000000000000000000000..48fbd7d0d4bfedd3b84b21b666c67d6c695c4f7b
GIT binary patch
literal 211
zcmeAS@N?(olHy`uVBq!ia0vp^3P3Eu1SA-~bnNg1QnNf=978H@C3Eop<!9qrxbUli
zn@x`(UvkSKNidT!><GgV_8E#j{NL(-9OU`;|G!v+ME$q_|F@ozJMm-7zx%6Z{&P6C
zGIaH{rEJWSlZ?a9&5`;v|Dk_WR8&^R3fsd6FU&M<Y_l?sXlruhYvycGJX|nI)P-He
zxMm(h3hRcs=|7T98yg#Qdu<Q@XAWB(wl<M1vZ|qx@dY2l>Sq<kxAyH01i9AJ)z4*}
HQ$iB}`Gr&T

literal 0
HcmV?d00001

diff --git a/gfx/fx/rocks.2bpp.lz b/gfx/fx/rocks.2bpp.lz.73d0153e
similarity index 100%
rename from gfx/fx/rocks.2bpp.lz
rename to gfx/fx/rocks.2bpp.lz.73d0153e
diff --git a/gfx/fx/rocks.png b/gfx/fx/rocks.png
new file mode 100755
index 0000000000000000000000000000000000000000..d7fe76b2f414b9b5e284d16020d6f7019cf22cc0
GIT binary patch
literal 669
zcmV;O0%HA%P)<h;3K|Lk000e1NJLTq001BW001xu1^@s6aIAQ500001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf0y0TNK~z{r&6W#t
z!ypVqlio2oWOB%sN3&Fx#mA}K>6_7rV60t;!M=VLE&<o;wdT&{G(KK=1LBXz<8r&*
zYFlvzI|CAbKA+V9Va;UI3}}{C+~+f>1`yUvd*WoSXRktAfu88uCO&4%9_36ERH^%{
zXTn4O{eG|Qj4fIX*qM#QLE``;zctYefEQK2u;P$mV0R8kRI6aaif6(KFpX&@iisMu
zGpJP}v6%^S2CYgYHZqaLrjm+VF)K=B6TXh4LnauOLNnk+&l2=h1BjQUesz7rw)+bc
z^<5Bwp{(<ML_LT&V3@JR|2~U$5?T{v|CgKw&j87uaBRKI!)C<pT>#8J<3+Q=|Ja7F
z_7d4f4;et5ht;C5BY4Nm)PS9_7x%nlCNywFw8!d0yfY9j^HFq;tgOgp8~#SzA7W%`
z(I(qfwKM|~$F+*BVnusdCcKeqK;jxmCRVT_D<)(_v=#6J$@V{tu=lKHU$YtT12I9H
z8zLi7@mVHzunT}@5p6FbpLKmSW|X<#hS(UG6<Qh7%T}Ba^&H@#C<9CXH?(_8IeRW_
z9SE1bP-I)9Ix07AVl)eWkFt%ZPXU`1&@6@RBir^UM{vzkq~mQUqQbr}%15XMZ~{>g
z^@*OS&mQ_i_zQq$8MMoa-t}3wL7zhWv<m*_tZaimLTn6x2I%Ijtl+n0XFxEpSL{gk
zZBN$#_yX@{qQ}sH7!{AiY|NN`lnVbL(POdPi_7H;1-MZQ-f^kO00000NkvXXu0mjf
Dkdr1;

literal 0
HcmV?d00001

diff --git a/gfx/fx/rope.2bpp.lz b/gfx/fx/rope.2bpp.lz.209d63dd
similarity index 100%
rename from gfx/fx/rope.2bpp.lz
rename to gfx/fx/rope.2bpp.lz.209d63dd
diff --git a/gfx/fx/rope.png b/gfx/fx/rope.png
new file mode 100644
index 0000000000000000000000000000000000000000..a12553c7a2408a8f3896df22dfa7cb98b36e3efe
GIT binary patch
literal 256
zcmV+b0ssDqP)<h;3K|Lk000e1NJLTq002k;000mI00000+UtIx0002TNkl<Zc-mc#
zF%E)25JiU=Lt;ZE1r0|5TN^fkiNuCNZMX!7(2W<6nB9AD0i*X&gB@g?T?mQ(W_I4}
zOdfn@WYarZrd+!anvEsG*D|ZjXa~7RbcdzZC@MQVKv08IYArDyNPmHb`x;R=!%2Fd
z;fWlWS0kZy3Va9(nzB*}&`(xcMnJ7+n|7fxQ#}G|?3&mr49z2Dlt<LFmqOS6elQA7
z;2W=j(B3R+{()j7-IdXcz2eF1c4R~X+)1J>3;Od4>V&>txzM?pCV#U40000<MNUMn
GLSTZaCuW@h

literal 0
HcmV?d00001

diff --git a/gfx/fx/sand.2bpp.lz b/gfx/fx/sand.2bpp.lz.c87c0eaa
similarity index 100%
rename from gfx/fx/sand.2bpp.lz
rename to gfx/fx/sand.2bpp.lz.c87c0eaa
diff --git a/gfx/fx/sand.png b/gfx/fx/sand.png
new file mode 100755
index 0000000000000000000000000000000000000000..a54db235d3d4677d61a324a62fd2d0ed1cdc2b39
GIT binary patch
literal 384
zcmeAS@N?(olHy`uVBq!ia0vp^0zhoQ!3HEH;(vt$DaPU;cPEB*=VV?2IV|apzK#qG
z8~eHcB(eheoCO|{#S9F5M?jcysy3fAP=lzai(`m~_th!cLQMudE!vMoA5JLnD7B8|
zQSG1h%A&6RP(t}+wTZVMyGkW!eKgu{&QZNV$Gg%iGxqwYFUL$46wG@rb8uU(rI+$m
zh9u23je@>@wjD<p_HRDa+^C-Rv**a%CXs^?$1aP$dNa$z?JE}pI|Dzn<kRX2%MZM{
z#b{}i##*yq+GB}E(taja+a!T?MJ?9H#Pq@s>?@TH=*Vo;WA2MyB$e^`+K~rwNz3&5
zBa$X)Z)j<_ooRUSuJx0`OfI9y>q?n>Gt4$fS?)RI%NADlVXwXLCZYTzS*$uYg(p3;
z{c%{+K}9;#@XnFRj<M^)?JOi*+D&K8dLfvXblrU7moJJrNk<C!4{5rH)~;*1w|nwI
cuAnNWsSejHy*YHsfT70V>FVdQ&MBb@0FVZeqyPW_

literal 0
HcmV?d00001

diff --git a/gfx/fx/shapes.2bpp.lz b/gfx/fx/shapes.2bpp.lz.262d77f0
similarity index 100%
rename from gfx/fx/shapes.2bpp.lz
rename to gfx/fx/shapes.2bpp.lz.262d77f0
diff --git a/gfx/fx/shapes.png b/gfx/fx/shapes.png
new file mode 100644
index 0000000000000000000000000000000000000000..b99fc601a091bd8d183b4ce185c622c6211b0587
GIT binary patch
literal 237
zcmV<J022R+P)<h;3K|Lk000e1NJLTq000;O004jj00000ewps80002ANkl<Zc-pnm
zu?>ST5QSluJdoU^CquB$bKwy@g);;_O(aO}-Wf}zauM8o65{*|ZusyFl}+?K?xgj0
zNs2y&XOV8<>}|+~0Lgj)U->`R|M><V-bm|}$=F2}rHD-SwR%3oZY(F)brfUj;dg)K
z>AjHI8>9E&J!CRx&duq>E(@`TI?#Hr$X)<@Goo*kJw<yX*+yT7Q-TtEr~|FHvUh;J
n73_h%0}NHJ>sZ0dI`DxnU=;7K#lq-l00000NkvXXu0mjf&F^VO

literal 0
HcmV?d00001

diff --git a/gfx/fx/shine.2bpp.lz b/gfx/fx/shine.2bpp.lz.5fb79056
similarity index 100%
rename from gfx/fx/shine.2bpp.lz
rename to gfx/fx/shine.2bpp.lz.5fb79056
diff --git a/gfx/fx/shine.png b/gfx/fx/shine.png
new file mode 100644
index 0000000000000000000000000000000000000000..1b7e9834b34985e227bc2809c8f31c217dab5cfe
GIT binary patch
literal 273
zcmV+s0q*{ZP)<h;3K|Lk000e1NJLTq000mG005W*00000g3B(c0002kNkl<Zc-obc
zL9W9v2t<AVqc~E1gK{5lyvNee8Iq<=+w}i>@gxik23*2hl&Cd|*V;<u`3;$t0;?3y
zhNJR7@JR*68hz=i<^qIBbUMNr5|9}?aEAW;z9Vc$Z6_foz!9q9S7OkF5p#7+VF*?h
z0gZ?WssJhuWek~fyL*BwxDz>c7K?W{hZq;%GA5WYc9^`^``%Xb;f0#PzPF2W_Ru3?
zR;V<}>`XItIn>NlGf*GV7#vF{xR6aCk!Cs+lEIml0`@k#@AzvKtKOrJ7r4;#gVcHh
X{N*DMkVqkW00000NkvXXu0mjfZe4Pf

literal 0
HcmV?d00001

diff --git a/gfx/fx/skyattack.2bpp.lz b/gfx/fx/skyattack.2bpp.lz.31738ab8
similarity index 100%
rename from gfx/fx/skyattack.2bpp.lz
rename to gfx/fx/skyattack.2bpp.lz.31738ab8
diff --git a/gfx/fx/skyattack.png b/gfx/fx/skyattack.png
new file mode 100644
index 0000000000000000000000000000000000000000..e731c691c49ce5cff853cd95c2d6237bd14fd478
GIT binary patch
literal 393
zcmV;40e1e0P)<h;3K|Lk000e1NJLTq002+`001}w000001#LLz0003{Nkl<Zc-pPh
zK~BUl3<c27m<_0sXUz$K4L!g}8HtMxH(`mm1d+NOX*dE$urynXVkhmiX|n>l>yzWg
zj#KoN2fxG^DhOJm0%3)M99m!mutKx69%V{^7buQYLo6_2NV-NYF_|a5AdQF#1*|#H
zl1@m9r)U=Wg7zw#4-1Yh%@DYGKAAPRpr^Y=XGT23v`cXt(UPSicQh+g?K?mVMmM4D
z$d+q)Muu2n#6tx)FYuZQ#Ql{wEuY(fx;a$v4cHsXd>FprXb^eAPvpp6rwNfQ9^d!r
z({V(__V(ZnF_K|ItQmK&sUZPD^Mv@(d?9yf$9-yuw~>#jYj$|HD@PCLGxlN~R-X{{
zN<2j%Y0syjqC8TDG17Uw9jS<>0Si+Y(K9Dh>Oygkj!k1@6HByEmYpnaoHiu7x`s@{
nev0v~VlP}l4S)R!{15&BWPdZXe7b$600000NkvXXu0mjfwWy;4

literal 0
HcmV?d00001

diff --git a/gfx/fx/smoke.2bpp.lz b/gfx/fx/smoke.2bpp.lz.aa05905e
similarity index 100%
rename from gfx/fx/smoke.2bpp.lz
rename to gfx/fx/smoke.2bpp.lz.aa05905e
diff --git a/gfx/fx/smoke.png b/gfx/fx/smoke.png
new file mode 100644
index 0000000000000000000000000000000000000000..1b09874ba99822aaa76dea46c2fa31ff9ddb42ef
GIT binary patch
literal 191
zcmeAS@N?(olHy`uVBq!ia0vp^0zhoQ1SA;BTlQ)JsWwj+$B>F!rRO*D9#P<74bab2
zjD7s7YXeKLfm6|;-xECE2(H_-<NX{D@h){mJ9%g3ZaIqsI~$fMFkN<9oV}0J<W`m9
zjc1kDD}H4Ddj4jq^jF`RyQVp;-NU-!!oH?ca~vc}td2ceaP*1P;;ML;zwg!`)k$HU
r7$@{Y;Zn+`CDQVXt=d1&z5k1mwQk0*JcpvsAeVW%`njxgN@xNAz-Ug`

literal 0
HcmV?d00001

diff --git a/gfx/fx/speed.2bpp.lz b/gfx/fx/speed.2bpp.lz.1732b364
similarity index 100%
rename from gfx/fx/speed.2bpp.lz
rename to gfx/fx/speed.2bpp.lz.1732b364
diff --git a/gfx/fx/speed.png b/gfx/fx/speed.png
new file mode 100644
index 0000000000000000000000000000000000000000..e219b38c9f1dcb8907373cfe50bdb7d7438effb9
GIT binary patch
literal 136
zcmeAS@N?(olHy`uVBq!ia0vp^5+KY3BpCYFRJ8&re@_?3kcwN$KloV!S4;dmv|_))
ztLVS>0-~mWuhp>dYq5v!%)0u2#r5l+%NyGM{I8Suh;0uDKX_&P`i}{(-UkVkzJ9Nz
j@YVcvz1Re<Xx2pxZ+eT?Tw2rg7G#B|tDnm{r-UW|7Tz@_

literal 0
HcmV?d00001

diff --git a/gfx/fx/status.2bpp.lz b/gfx/fx/status.2bpp.lz.0c0aa13e
similarity index 100%
rename from gfx/fx/status.2bpp.lz
rename to gfx/fx/status.2bpp.lz.0c0aa13e
diff --git a/gfx/fx/status.png b/gfx/fx/status.png
new file mode 100644
index 0000000000000000000000000000000000000000..cb8527963012a389e8fabb08d082252e9e98dcf8
GIT binary patch
literal 364
zcmV-y0h9iTP)<h;3K|Lk000e1NJLTq000mG004Lb00000l#ewl0003qNkl<Zc-n=L
zJx;?w5QU%O&dnYmHB#^;_89zBG)Tk^M{pz#kdBl@M8fO21eTCeq@f~_d<rK8)ke#k
zHTe;;gp1EJJ8#~4JP3TyfiHNm0XumjvQfZt<SbJ+C0+@aT1p(H86}~%+VrW=$RDkG
z{ha!x>NlVMn!3Tiepg=s`zkN67b&ow3}(m&lL`;%{IWwMDABmIMDDT*xk%MTYnRQs
zwrCKoHXE9b$3$N33pC~TONW@oLX^Z2e4>ESPlMHY62cR0&D3+oT6L|_j=JSAZ7@LM
z1B`7AK4LXF{*tX?sTivBBe8uyMDgrTVX1AyaEMOgK1rYMY#*nk+;Sp+b4T6y&0>51
zY`bclV>gH4Qe?`daQk7kp!nii_r|l8$O4&&J3~B+XhjU~K==WXfnK<h)p4W%0000<
KMNUMnLSTaBz@#?-

literal 0
HcmV?d00001

diff --git a/gfx/fx/water.2bpp.lz b/gfx/fx/water.2bpp.lz.7b52ed12
similarity index 100%
rename from gfx/fx/water.2bpp.lz
rename to gfx/fx/water.2bpp.lz.7b52ed12
diff --git a/gfx/fx/water.png b/gfx/fx/water.png
new file mode 100644
index 0000000000000000000000000000000000000000..4e3c3b7199ebe82048f5b83fa36f4ea3c545acc4
GIT binary patch
literal 277
zcmV+w0qXvVP)<h;3K|Lk000e1NJLTq000O8005u@00000UYlxl0002oNkl<Zc-oDS
z!Ab)$6h+TZrp4KGm4U>)+xZK@Lg}(3F8qXk#W)x!UF*hGQc&VEnJLww3x&huLT=83
zhX@m=uFh^rRJ<s{8s*RmW3ZlPO|OU%rDz|pjvGD87tfjEaXfo^ja|@q7WcKUHKD1V
zYr~W!BWWZv2xesXZSIMdu&=Y^+0yZEz9Vf&TXI(m*^+!EPyLR(t)v~n5ngM^tGOp4
z0V)04`gCcQX?K_vOW}CraG-7LasGqx3`J;=VYbV=Gvx@zF_@pur|>3x?D={^9+CH}
bBmd1ejpp(Asq5Tm00000NkvXXu0mjf%^rX3

literal 0
HcmV?d00001

diff --git a/gfx/fx/wave.2bpp.lz b/gfx/fx/wave.2bpp.lz.bee99402
similarity index 100%
rename from gfx/fx/wave.2bpp.lz
rename to gfx/fx/wave.2bpp.lz.bee99402
diff --git a/gfx/fx/wave.png b/gfx/fx/wave.png
new file mode 100644
index 0000000000000000000000000000000000000000..55d4faa5f274bc662b2bdc1a00abb5f1744daa79
GIT binary patch
literal 205
zcmeAS@N?(olHy`uVBq!ia0vp^5<qOg1SA+zg8$wFQd2x#978H@g-*E0d&Gdld7?za
z#7$O0+=dL3&a2seU1z^u>0n(~qCNAaRzqu-d4)}jo6f$>I5_7;=aYQ%Su5CEV|wB<
z8l5@zYQ{8dzczE3!L}Tenr^FY*Vei0@rrl!iTNS>>|O|Sb5o<00N<~cjd?77${L9s
zn@-t<3jJYb&9<#{ohSJEWNBqy+G@vnKkd$cj@Um>o?-v#+DQizn?UaLboFyt=akR{
E05OJ8o&W#<

literal 0
HcmV?d00001

diff --git a/gfx/fx/web.2bpp.lz b/gfx/fx/web.2bpp.lz.80e3d480
similarity index 100%
rename from gfx/fx/web.2bpp.lz
rename to gfx/fx/web.2bpp.lz.80e3d480
diff --git a/gfx/fx/web.png b/gfx/fx/web.png
new file mode 100644
index 0000000000000000000000000000000000000000..2aeffef0ef5fbfe784f76d3adb15f30122cf2c7c
GIT binary patch
literal 191
zcmeAS@N?(olHy`uVBq!ia0vp^0zhoR1SA+{U$=J$Qf;0tjv*DddixdmoE&*vo==ii
zad%Mk>~C7uWP51dqto->Uk~}KFe^7xTtz@DPHpD0xsAsY0vv+h9&ad5^LflI;jP*7
z>*CY4z!L}U`Tlg@jy@ZblwPrw_nOJ1s#2LtORpErKCisPQ^VKeP33LwGuL%03a>nD
p`Pac!WZI}Bb;D2U1?NunFPsNYo&Eh^ZvijJWuC5nF6*2UngBK>OuPU9

literal 0
HcmV?d00001

diff --git a/gfx/fx/whip.2bpp.lz b/gfx/fx/whip.2bpp.lz.d80d8d6e
similarity index 100%
rename from gfx/fx/whip.2bpp.lz
rename to gfx/fx/whip.2bpp.lz.d80d8d6e
diff --git a/gfx/fx/whip.png b/gfx/fx/whip.png
new file mode 100644
index 0000000000000000000000000000000000000000..92d7ded6fd25557a10af0128b3dca862b5a9810b
GIT binary patch
literal 210
zcmV;@04@KCP)<h;3K|Lk000e1NJLTq000mG001Zg00000m;pW90001)Nkl<Zc-l42
zF%E)25CzcRYE1MPdJ4P&6;N(1m)JuP;sr>EoPxs2ehWQ?LcoU2_m2t9%k2Ew$$(Qq
zkdqhDtyNGjI#JM4W6CUeUB!G`d9|7=^)0W7ka-)<MCcr1*|nJKyhZTw0!KdK$*=AE
z(;G*zG-9a4BNe9v<I)iCp(2)Ts(qV8)mdkJl;ghB^N{R`-cB3E4+da<b3QlvNB{r;
M07*qoM6N<$f(R;DNB{r;

literal 0
HcmV?d00001

diff --git a/gfx/fx/wind.2bpp.lz b/gfx/fx/wind.2bpp.lz.5a785180
similarity index 100%
rename from gfx/fx/wind.2bpp.lz
rename to gfx/fx/wind.2bpp.lz.5a785180
diff --git a/gfx/fx/wind.png b/gfx/fx/wind.png
new file mode 100644
index 0000000000000000000000000000000000000000..b02031392794522e97ab45b5a7b534faf7312438
GIT binary patch
literal 286
zcmV+(0pb3MP)<h;3K|Lk000e1NJLTq000O8005W*00000wzBWF0002xNkl<Zc-nQ4
zJ5B>Z5JaCqK)_)f62c{xk@#pr#HJiz0}eof<j?_HThocJK*k9iKtjw$1Yo3<*Tu~6
zTZ54*s4kUW_Y4xZ!Y(O}(F<EAls8-tm{l}W*u-_TLk{+td7gLKxL|n4Vvp@BtYRT{
zguc`jyotFbqh4O*(d^SiIq~FJ2GpV^hu=ncQ7iFngiVtAw4??L6t0)Fw1(9b{%2fT
zss)$Uebf@LN^q|~%&bRoChp@aJYBuMlT@MyG)LV^9v21AINy9U;<fspfBKsrf4H2a
kgQIl5o*x2-xv<KA2gK9#wVs4qGynhq07*qoM6N<$f~Zz}$N&HU

literal 0
HcmV?d00001

diff --git a/tools/gfx.c b/tools/gfx.c
index 8283d9e73..25de45dbe 100644
--- a/tools/gfx.c
+++ b/tools/gfx.c
@@ -7,7 +7,7 @@
 #include "common.h"
 
 static void usage(void) {
-	fprintf(stderr, "Usage: gfx [--trim-whitespace] [--remove-whitespace] [--interleave] [--remove-duplicates [--keep-whitespace]] [--remove-xflip] [-w width] [-d depth] [-h] [-o outfile] infile\n");
+	fprintf(stderr, "Usage: gfx [--trim-whitespace] [--remove-whitespace] [--interleave] [--remove-duplicates [--keep-whitespace]] [--remove-xflip] [--remove-yflip] [-w width] [-d depth] [-h] [-o outfile] infile\n");
 }
 
 static void error(char *message) {
@@ -26,6 +26,7 @@ struct Options {
 	int remove_duplicates;
 	int keep_whitespace;
 	int remove_xflip;
+	int remove_yflip;
 };
 
 struct Options Options = {
@@ -40,6 +41,7 @@ void get_args(int argc, char *argv[]) {
 		{"remove-duplicates", no_argument, &Options.remove_duplicates, 1},
 		{"keep-whitespace", no_argument, &Options.keep_whitespace, 1},
 		{"remove-xflip", no_argument, &Options.remove_xflip, 1},
+		{"remove-yflip", no_argument, &Options.remove_yflip, 1},
 		{"width", required_argument, 0, 'w'},
 		{"depth", required_argument, 0, 'd'},
 		{"help", no_argument, 0, 'h'},
@@ -157,12 +159,12 @@ bool flip_exists(uint8_t *tile, uint8_t *tiles, int tile_size, int num_tiles, bo
 	for (int i = 0; i < tile_size; i++) {
 		int byte = i;
 		if (yflip) {
-			byte = tile_size - 1 - i;
+			byte = tile_size - 1 - (i ^ 1);
 			if (Options.interleave && i < half_size) {
-				byte = half_size - 1 - i;
+				byte = half_size - 1 - (i ^ 1);
 			}
 		}
-		if (flip) {
+		if (xflip) {
 			for (int bit = 0; bit < 8; bit++) {
 				flip[byte] |= ((tile[i] >> bit) & 1) << (7 - bit);
 			}
@@ -176,16 +178,12 @@ bool flip_exists(uint8_t *tile, uint8_t *tiles, int tile_size, int num_tiles, bo
 	return false;
 }
 
-bool xflip_exists(uint8_t *tile, uint8_t *tiles, int tile_size, int num_tiles) {
-	return flip_exists(tile, tiles, tile_size, num_tiles, true, false);
-}
-
-void remove_xflip(struct Graphic *graphic) {
+void remove_flip(struct Graphic *graphic, bool xflip, bool yflip) {
 	int tile_size = Options.depth * 8;
 	if (Options.interleave) tile_size *= 2;
 	int num_tiles = 0;
 	for (int i = 0, j = 0; i < graphic->size && j < graphic->size; i += tile_size, j += tile_size) {
-		while (xflip_exists(&graphic->data[j], graphic->data, tile_size, num_tiles)) {
+		while (flip_exists(&graphic->data[j], graphic->data, tile_size, num_tiles, xflip, yflip)) {
 			if (Options.keep_whitespace && is_whitespace(&graphic->data[j], tile_size)) {
 				break;
 			}
@@ -253,7 +251,13 @@ int main(int argc, char *argv[]) {
 		remove_duplicates(&graphic);
 	}
 	if (Options.remove_xflip) {
-		remove_xflip(&graphic);
+		remove_flip(&graphic, true, false);
+	}
+	if (Options.remove_yflip) {
+		remove_flip(&graphic, false, true);
+	}
+	if (Options.remove_xflip && Options.remove_yflip) {
+		remove_flip(&graphic, true, true);
 	}
 	if (Options.remove_whitespace) {
 		remove_whitespace(&graphic);