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

- gave up on wind.png
- add --remove-yflip
---
 Makefile                          |  18 ++++++++++++++++++
 gfx/fx/aeroblast.2bpp.lz          | Bin 128 -> 0 bytes
 gfx/fx/aeroblast.2bpp.lz.2f07c4ea | Bin 0 -> 128 bytes
 gfx/fx/aeroblast.png              | Bin 0 -> 187 bytes
 gfx/fx/angels.2bpp.lz             | Bin 368 -> 0 bytes
 gfx/fx/angels.2bpp.lz.b026d81e    | Bin 0 -> 368 bytes
 gfx/fx/angels.png                 | Bin 0 -> 363 bytes
 gfx/fx/beam.2bpp.lz               | Bin 144 -> 0 bytes
 gfx/fx/beam.2bpp.lz.80b6d613      | Bin 0 -> 144 bytes
 gfx/fx/beam.png                   | Bin 0 -> 562 bytes
 gfx/fx/bubble.2bpp.lz             | Bin 160 -> 0 bytes
 gfx/fx/bubble.2bpp.lz.03b8ac99    | Bin 0 -> 160 bytes
 gfx/fx/bubble.png                 | Bin 0 -> 237 bytes
 gfx/fx/charge.2bpp.lz             | Bin 112 -> 0 bytes
 gfx/fx/charge.2bpp.lz.95d3ea98    | Bin 0 -> 112 bytes
 gfx/fx/charge.png                 | Bin 0 -> 188 bytes
 gfx/fx/cut.2bpp.lz                | Bin 96 -> 0 bytes
 gfx/fx/cut.2bpp.lz.03d343ed       | Bin 0 -> 96 bytes
 gfx/fx/cut.png                    | Bin 0 -> 170 bytes
 gfx/fx/egg.2bpp.lz                | Bin 128 -> 0 bytes
 gfx/fx/egg.2bpp.lz.41dd1a53       | Bin 0 -> 128 bytes
 gfx/fx/egg.png                    | Bin 0 -> 200 bytes
 gfx/fx/explosion.2bpp.lz          | Bin 96 -> 0 bytes
 gfx/fx/explosion.2bpp.lz.55fc334f | Bin 0 -> 96 bytes
 gfx/fx/explosion.png              | Bin 0 -> 157 bytes
 gfx/fx/fire.2bpp.lz               | Bin 96 -> 0 bytes
 gfx/fx/fire.2bpp.lz.d7701cda      | Bin 0 -> 96 bytes
 gfx/fx/fire.png                   | Bin 0 -> 153 bytes
 gfx/fx/flower.2bpp.lz             | Bin 96 -> 0 bytes
 gfx/fx/flower.2bpp.lz.1bc2e9d2    | Bin 0 -> 96 bytes
 gfx/fx/flower.png                 | Bin 0 -> 149 bytes
 gfx/fx/globe.2bpp.lz              | Bin 240 -> 0 bytes
 gfx/fx/globe.2bpp.lz.710dbb8e     | Bin 0 -> 240 bytes
 gfx/fx/globe.png                  | Bin 0 -> 292 bytes
 gfx/fx/haze.2bpp.lz               | Bin 144 -> 0 bytes
 gfx/fx/haze.2bpp.lz.91424607      | Bin 0 -> 144 bytes
 gfx/fx/haze.png                   | Bin 0 -> 173 bytes
 gfx/fx/hit.2bpp.lz                | Bin 240 -> 0 bytes
 gfx/fx/hit.2bpp.lz.2b3c83f2       | Bin 0 -> 240 bytes
 gfx/fx/hit.png                    | Bin 0 -> 306 bytes
 gfx/fx/horn.2bpp.lz               | Bin 96 -> 0 bytes
 gfx/fx/horn.2bpp.lz.48908aae      | Bin 0 -> 96 bytes
 gfx/fx/horn.png                   | Bin 0 -> 179 bytes
 gfx/fx/ice.2bpp.lz                | Bin 64 -> 0 bytes
 gfx/fx/ice.2bpp.lz.664d900f       | Bin 0 -> 64 bytes
 gfx/fx/ice.png                    | Bin 0 -> 137 bytes
 gfx/fx/lightning.2bpp.lz          | Bin 320 -> 0 bytes
 gfx/fx/lightning.2bpp.lz.a88fc131 | Bin 0 -> 320 bytes
 gfx/fx/lightning.png              | Bin 0 -> 820 bytes
 gfx/fx/misc.2bpp.lz               | Bin 416 -> 0 bytes
 gfx/fx/misc.2bpp.lz.4b20c3d7      | Bin 0 -> 416 bytes
 gfx/fx/misc.png                   | Bin 0 -> 1082 bytes
 gfx/fx/noise.2bpp.lz              | Bin 192 -> 0 bytes
 gfx/fx/noise.2bpp.lz.acb4a76e     | Bin 0 -> 192 bytes
 gfx/fx/noise.png                  | Bin 0 -> 526 bytes
 gfx/fx/objects.2bpp.lz            | Bin 224 -> 0 bytes
 gfx/fx/objects.2bpp.lz.83f812de   | Bin 0 -> 224 bytes
 gfx/fx/objects.png                | Bin 0 -> 705 bytes
 gfx/fx/plant.2bpp.lz              | Bin 224 -> 0 bytes
 gfx/fx/plant.2bpp.lz.4a00c417     | Bin 0 -> 224 bytes
 gfx/fx/plant.png                  | Bin 0 -> 293 bytes
 gfx/fx/poison.2bpp.lz             | Bin 112 -> 0 bytes
 gfx/fx/poison.2bpp.lz.fc7dc9c1    | Bin 0 -> 112 bytes
 gfx/fx/poison.png                 | Bin 0 -> 166 bytes
 gfx/fx/pokeball.2bpp.lz           | Bin 80 -> 0 bytes
 gfx/fx/pokeball.2bpp.lz.c58f7e01  | Bin 0 -> 80 bytes
 gfx/fx/pokeball.png               | Bin 0 -> 388 bytes
 gfx/fx/powder.2bpp.lz             | Bin 32 -> 0 bytes
 gfx/fx/powder.2bpp.lz.bfd566bb    | Bin 0 -> 32 bytes
 gfx/fx/powder.png                 | Bin 0 -> 100 bytes
 gfx/fx/psychic.2bpp.lz            | Bin 112 -> 0 bytes
 gfx/fx/psychic.2bpp.lz.d80f285c   | Bin 0 -> 112 bytes
 gfx/fx/psychic.png                | Bin 0 -> 175 bytes
 gfx/fx/reflect.2bpp.lz            | Bin 112 -> 0 bytes
 gfx/fx/reflect.2bpp.lz.9a9c822d   | Bin 0 -> 112 bytes
 gfx/fx/reflect.png                | Bin 0 -> 211 bytes
 gfx/fx/rocks.2bpp.lz              | Bin 240 -> 0 bytes
 gfx/fx/rocks.2bpp.lz.73d0153e     | Bin 0 -> 240 bytes
 gfx/fx/rocks.png                  | Bin 0 -> 669 bytes
 gfx/fx/rope.2bpp.lz               | Bin 192 -> 0 bytes
 gfx/fx/rope.2bpp.lz.209d63dd      | Bin 0 -> 192 bytes
 gfx/fx/rope.png                   | Bin 0 -> 256 bytes
 gfx/fx/sand.2bpp.lz               | Bin 96 -> 0 bytes
 gfx/fx/sand.2bpp.lz.c87c0eaa      | Bin 0 -> 96 bytes
 gfx/fx/sand.png                   | Bin 0 -> 384 bytes
 gfx/fx/shapes.2bpp.lz             | Bin 160 -> 0 bytes
 gfx/fx/shapes.2bpp.lz.262d77f0    | Bin 0 -> 160 bytes
 gfx/fx/shapes.png                 | Bin 0 -> 237 bytes
 gfx/fx/shine.2bpp.lz              | Bin 224 -> 0 bytes
 gfx/fx/shine.2bpp.lz.5fb79056     | Bin 0 -> 224 bytes
 gfx/fx/shine.png                  | Bin 0 -> 273 bytes
 gfx/fx/skyattack.2bpp.lz          | Bin 352 -> 0 bytes
 gfx/fx/skyattack.2bpp.lz.31738ab8 | Bin 0 -> 352 bytes
 gfx/fx/skyattack.png              | Bin 0 -> 393 bytes
 gfx/fx/smoke.2bpp.lz              | Bin 144 -> 0 bytes
 gfx/fx/smoke.2bpp.lz.aa05905e     | Bin 0 -> 144 bytes
 gfx/fx/smoke.png                  | Bin 0 -> 191 bytes
 gfx/fx/speed.2bpp.lz              | Bin 80 -> 0 bytes
 gfx/fx/speed.2bpp.lz.1732b364     | Bin 0 -> 80 bytes
 gfx/fx/speed.png                  | Bin 0 -> 136 bytes
 gfx/fx/status.2bpp.lz             | Bin 288 -> 0 bytes
 gfx/fx/status.2bpp.lz.0c0aa13e    | Bin 0 -> 288 bytes
 gfx/fx/status.png                 | Bin 0 -> 364 bytes
 gfx/fx/water.2bpp.lz              | Bin 208 -> 0 bytes
 gfx/fx/water.2bpp.lz.7b52ed12     | Bin 0 -> 208 bytes
 gfx/fx/water.png                  | Bin 0 -> 277 bytes
 gfx/fx/wave.2bpp.lz               | Bin 160 -> 0 bytes
 gfx/fx/wave.2bpp.lz.bee99402      | Bin 0 -> 160 bytes
 gfx/fx/wave.png                   | Bin 0 -> 205 bytes
 gfx/fx/web.2bpp.lz                | Bin 128 -> 0 bytes
 gfx/fx/web.2bpp.lz.80e3d480       | Bin 0 -> 128 bytes
 gfx/fx/web.png                    | Bin 0 -> 191 bytes
 gfx/fx/whip.2bpp.lz               | Bin 128 -> 0 bytes
 gfx/fx/whip.2bpp.lz.d80d8d6e      | Bin 0 -> 128 bytes
 gfx/fx/whip.png                   | Bin 0 -> 210 bytes
 gfx/fx/wind.2bpp.lz               | Bin 192 -> 0 bytes
 gfx/fx/wind.2bpp.lz.5a785180      | Bin 0 -> 192 bytes
 gfx/fx/wind.png                   | Bin 0 -> 286 bytes
 tools/gfx.c                       |  26 +++++++++++++++-----------
 119 files changed, 33 insertions(+), 11 deletions(-)
 delete mode 100644 gfx/fx/aeroblast.2bpp.lz
 create mode 100644 gfx/fx/aeroblast.2bpp.lz.2f07c4ea
 create mode 100644 gfx/fx/aeroblast.png
 delete mode 100644 gfx/fx/angels.2bpp.lz
 create mode 100644 gfx/fx/angels.2bpp.lz.b026d81e
 create mode 100644 gfx/fx/angels.png
 delete mode 100644 gfx/fx/beam.2bpp.lz
 create mode 100644 gfx/fx/beam.2bpp.lz.80b6d613
 create mode 100755 gfx/fx/beam.png
 delete mode 100644 gfx/fx/bubble.2bpp.lz
 create mode 100644 gfx/fx/bubble.2bpp.lz.03b8ac99
 create mode 100644 gfx/fx/bubble.png
 delete mode 100644 gfx/fx/charge.2bpp.lz
 create mode 100644 gfx/fx/charge.2bpp.lz.95d3ea98
 create mode 100644 gfx/fx/charge.png
 delete mode 100644 gfx/fx/cut.2bpp.lz
 create mode 100644 gfx/fx/cut.2bpp.lz.03d343ed
 create mode 100644 gfx/fx/cut.png
 delete mode 100644 gfx/fx/egg.2bpp.lz
 create mode 100644 gfx/fx/egg.2bpp.lz.41dd1a53
 create mode 100644 gfx/fx/egg.png
 delete mode 100644 gfx/fx/explosion.2bpp.lz
 create mode 100644 gfx/fx/explosion.2bpp.lz.55fc334f
 create mode 100644 gfx/fx/explosion.png
 delete mode 100644 gfx/fx/fire.2bpp.lz
 create mode 100644 gfx/fx/fire.2bpp.lz.d7701cda
 create mode 100644 gfx/fx/fire.png
 delete mode 100644 gfx/fx/flower.2bpp.lz
 create mode 100644 gfx/fx/flower.2bpp.lz.1bc2e9d2
 create mode 100644 gfx/fx/flower.png
 delete mode 100644 gfx/fx/globe.2bpp.lz
 create mode 100644 gfx/fx/globe.2bpp.lz.710dbb8e
 create mode 100644 gfx/fx/globe.png
 delete mode 100644 gfx/fx/haze.2bpp.lz
 create mode 100644 gfx/fx/haze.2bpp.lz.91424607
 create mode 100644 gfx/fx/haze.png
 delete mode 100644 gfx/fx/hit.2bpp.lz
 create mode 100644 gfx/fx/hit.2bpp.lz.2b3c83f2
 create mode 100644 gfx/fx/hit.png
 delete mode 100644 gfx/fx/horn.2bpp.lz
 create mode 100644 gfx/fx/horn.2bpp.lz.48908aae
 create mode 100644 gfx/fx/horn.png
 delete mode 100644 gfx/fx/ice.2bpp.lz
 create mode 100644 gfx/fx/ice.2bpp.lz.664d900f
 create mode 100644 gfx/fx/ice.png
 delete mode 100644 gfx/fx/lightning.2bpp.lz
 create mode 100644 gfx/fx/lightning.2bpp.lz.a88fc131
 create mode 100755 gfx/fx/lightning.png
 delete mode 100644 gfx/fx/misc.2bpp.lz
 create mode 100644 gfx/fx/misc.2bpp.lz.4b20c3d7
 create mode 100755 gfx/fx/misc.png
 delete mode 100644 gfx/fx/noise.2bpp.lz
 create mode 100644 gfx/fx/noise.2bpp.lz.acb4a76e
 create mode 100755 gfx/fx/noise.png
 delete mode 100644 gfx/fx/objects.2bpp.lz
 create mode 100644 gfx/fx/objects.2bpp.lz.83f812de
 create mode 100755 gfx/fx/objects.png
 delete mode 100644 gfx/fx/plant.2bpp.lz
 create mode 100644 gfx/fx/plant.2bpp.lz.4a00c417
 create mode 100644 gfx/fx/plant.png
 delete mode 100644 gfx/fx/poison.2bpp.lz
 create mode 100644 gfx/fx/poison.2bpp.lz.fc7dc9c1
 create mode 100755 gfx/fx/poison.png
 delete mode 100644 gfx/fx/pokeball.2bpp.lz
 create mode 100644 gfx/fx/pokeball.2bpp.lz.c58f7e01
 create mode 100755 gfx/fx/pokeball.png
 delete mode 100644 gfx/fx/powder.2bpp.lz
 create mode 100644 gfx/fx/powder.2bpp.lz.bfd566bb
 create mode 100644 gfx/fx/powder.png
 delete mode 100644 gfx/fx/psychic.2bpp.lz
 create mode 100644 gfx/fx/psychic.2bpp.lz.d80f285c
 create mode 100644 gfx/fx/psychic.png
 delete mode 100644 gfx/fx/reflect.2bpp.lz
 create mode 100644 gfx/fx/reflect.2bpp.lz.9a9c822d
 create mode 100644 gfx/fx/reflect.png
 delete mode 100644 gfx/fx/rocks.2bpp.lz
 create mode 100644 gfx/fx/rocks.2bpp.lz.73d0153e
 create mode 100755 gfx/fx/rocks.png
 delete mode 100644 gfx/fx/rope.2bpp.lz
 create mode 100644 gfx/fx/rope.2bpp.lz.209d63dd
 create mode 100644 gfx/fx/rope.png
 delete mode 100644 gfx/fx/sand.2bpp.lz
 create mode 100644 gfx/fx/sand.2bpp.lz.c87c0eaa
 create mode 100755 gfx/fx/sand.png
 delete mode 100644 gfx/fx/shapes.2bpp.lz
 create mode 100644 gfx/fx/shapes.2bpp.lz.262d77f0
 create mode 100644 gfx/fx/shapes.png
 delete mode 100644 gfx/fx/shine.2bpp.lz
 create mode 100644 gfx/fx/shine.2bpp.lz.5fb79056
 create mode 100644 gfx/fx/shine.png
 delete mode 100644 gfx/fx/skyattack.2bpp.lz
 create mode 100644 gfx/fx/skyattack.2bpp.lz.31738ab8
 create mode 100644 gfx/fx/skyattack.png
 delete mode 100644 gfx/fx/smoke.2bpp.lz
 create mode 100644 gfx/fx/smoke.2bpp.lz.aa05905e
 create mode 100644 gfx/fx/smoke.png
 delete mode 100644 gfx/fx/speed.2bpp.lz
 create mode 100644 gfx/fx/speed.2bpp.lz.1732b364
 create mode 100644 gfx/fx/speed.png
 delete mode 100644 gfx/fx/status.2bpp.lz
 create mode 100644 gfx/fx/status.2bpp.lz.0c0aa13e
 create mode 100644 gfx/fx/status.png
 delete mode 100644 gfx/fx/water.2bpp.lz
 create mode 100644 gfx/fx/water.2bpp.lz.7b52ed12
 create mode 100644 gfx/fx/water.png
 delete mode 100644 gfx/fx/wave.2bpp.lz
 create mode 100644 gfx/fx/wave.2bpp.lz.bee99402
 create mode 100644 gfx/fx/wave.png
 delete mode 100644 gfx/fx/web.2bpp.lz
 create mode 100644 gfx/fx/web.2bpp.lz.80e3d480
 create mode 100644 gfx/fx/web.png
 delete mode 100644 gfx/fx/whip.2bpp.lz
 create mode 100644 gfx/fx/whip.2bpp.lz.d80d8d6e
 create mode 100644 gfx/fx/whip.png
 delete mode 100644 gfx/fx/wind.2bpp.lz
 create mode 100644 gfx/fx/wind.2bpp.lz.5a785180
 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
deleted file mode 100644
index 5e203cb63..000000000
Binary files a/gfx/fx/aeroblast.2bpp.lz and /dev/null differ
diff --git a/gfx/fx/aeroblast.2bpp.lz.2f07c4ea b/gfx/fx/aeroblast.2bpp.lz.2f07c4ea
new file mode 100644
index 000000000..5e203cb63
Binary files /dev/null and b/gfx/fx/aeroblast.2bpp.lz.2f07c4ea differ
diff --git a/gfx/fx/aeroblast.png b/gfx/fx/aeroblast.png
new file mode 100644
index 000000000..1fdc07c2f
Binary files /dev/null and b/gfx/fx/aeroblast.png differ
diff --git a/gfx/fx/angels.2bpp.lz b/gfx/fx/angels.2bpp.lz
deleted file mode 100644
index 61d89d224..000000000
Binary files a/gfx/fx/angels.2bpp.lz and /dev/null differ
diff --git a/gfx/fx/angels.2bpp.lz.b026d81e b/gfx/fx/angels.2bpp.lz.b026d81e
new file mode 100644
index 000000000..61d89d224
Binary files /dev/null and b/gfx/fx/angels.2bpp.lz.b026d81e differ
diff --git a/gfx/fx/angels.png b/gfx/fx/angels.png
new file mode 100644
index 000000000..ef38c61d2
Binary files /dev/null and b/gfx/fx/angels.png differ
diff --git a/gfx/fx/beam.2bpp.lz b/gfx/fx/beam.2bpp.lz
deleted file mode 100644
index 1ce9ab82c..000000000
Binary files a/gfx/fx/beam.2bpp.lz and /dev/null differ
diff --git a/gfx/fx/beam.2bpp.lz.80b6d613 b/gfx/fx/beam.2bpp.lz.80b6d613
new file mode 100644
index 000000000..1ce9ab82c
Binary files /dev/null and b/gfx/fx/beam.2bpp.lz.80b6d613 differ
diff --git a/gfx/fx/beam.png b/gfx/fx/beam.png
new file mode 100755
index 000000000..32a3b1967
Binary files /dev/null and b/gfx/fx/beam.png differ
diff --git a/gfx/fx/bubble.2bpp.lz b/gfx/fx/bubble.2bpp.lz
deleted file mode 100644
index 3d546191a..000000000
Binary files a/gfx/fx/bubble.2bpp.lz and /dev/null differ
diff --git a/gfx/fx/bubble.2bpp.lz.03b8ac99 b/gfx/fx/bubble.2bpp.lz.03b8ac99
new file mode 100644
index 000000000..3d546191a
Binary files /dev/null and b/gfx/fx/bubble.2bpp.lz.03b8ac99 differ
diff --git a/gfx/fx/bubble.png b/gfx/fx/bubble.png
new file mode 100644
index 000000000..b6febb0a8
Binary files /dev/null and b/gfx/fx/bubble.png differ
diff --git a/gfx/fx/charge.2bpp.lz b/gfx/fx/charge.2bpp.lz
deleted file mode 100644
index 32c82243c..000000000
Binary files a/gfx/fx/charge.2bpp.lz and /dev/null differ
diff --git a/gfx/fx/charge.2bpp.lz.95d3ea98 b/gfx/fx/charge.2bpp.lz.95d3ea98
new file mode 100644
index 000000000..32c82243c
Binary files /dev/null and b/gfx/fx/charge.2bpp.lz.95d3ea98 differ
diff --git a/gfx/fx/charge.png b/gfx/fx/charge.png
new file mode 100644
index 000000000..90cb72f9f
Binary files /dev/null and b/gfx/fx/charge.png differ
diff --git a/gfx/fx/cut.2bpp.lz b/gfx/fx/cut.2bpp.lz
deleted file mode 100644
index 740a48799..000000000
Binary files a/gfx/fx/cut.2bpp.lz and /dev/null differ
diff --git a/gfx/fx/cut.2bpp.lz.03d343ed b/gfx/fx/cut.2bpp.lz.03d343ed
new file mode 100644
index 000000000..740a48799
Binary files /dev/null and b/gfx/fx/cut.2bpp.lz.03d343ed differ
diff --git a/gfx/fx/cut.png b/gfx/fx/cut.png
new file mode 100644
index 000000000..e227ad413
Binary files /dev/null and b/gfx/fx/cut.png differ
diff --git a/gfx/fx/egg.2bpp.lz b/gfx/fx/egg.2bpp.lz
deleted file mode 100644
index fb55f2edc..000000000
Binary files a/gfx/fx/egg.2bpp.lz and /dev/null differ
diff --git a/gfx/fx/egg.2bpp.lz.41dd1a53 b/gfx/fx/egg.2bpp.lz.41dd1a53
new file mode 100644
index 000000000..fb55f2edc
Binary files /dev/null and b/gfx/fx/egg.2bpp.lz.41dd1a53 differ
diff --git a/gfx/fx/egg.png b/gfx/fx/egg.png
new file mode 100644
index 000000000..38aab505d
Binary files /dev/null and b/gfx/fx/egg.png differ
diff --git a/gfx/fx/explosion.2bpp.lz b/gfx/fx/explosion.2bpp.lz
deleted file mode 100644
index 4303302a1..000000000
Binary files a/gfx/fx/explosion.2bpp.lz and /dev/null differ
diff --git a/gfx/fx/explosion.2bpp.lz.55fc334f b/gfx/fx/explosion.2bpp.lz.55fc334f
new file mode 100644
index 000000000..4303302a1
Binary files /dev/null and b/gfx/fx/explosion.2bpp.lz.55fc334f differ
diff --git a/gfx/fx/explosion.png b/gfx/fx/explosion.png
new file mode 100644
index 000000000..0af9f1a0d
Binary files /dev/null and b/gfx/fx/explosion.png differ
diff --git a/gfx/fx/fire.2bpp.lz b/gfx/fx/fire.2bpp.lz
deleted file mode 100644
index e15e9f9bb..000000000
Binary files a/gfx/fx/fire.2bpp.lz and /dev/null differ
diff --git a/gfx/fx/fire.2bpp.lz.d7701cda b/gfx/fx/fire.2bpp.lz.d7701cda
new file mode 100644
index 000000000..e15e9f9bb
Binary files /dev/null and b/gfx/fx/fire.2bpp.lz.d7701cda differ
diff --git a/gfx/fx/fire.png b/gfx/fx/fire.png
new file mode 100644
index 000000000..19f01141b
Binary files /dev/null and b/gfx/fx/fire.png differ
diff --git a/gfx/fx/flower.2bpp.lz b/gfx/fx/flower.2bpp.lz
deleted file mode 100644
index ef628afb4..000000000
Binary files a/gfx/fx/flower.2bpp.lz and /dev/null differ
diff --git a/gfx/fx/flower.2bpp.lz.1bc2e9d2 b/gfx/fx/flower.2bpp.lz.1bc2e9d2
new file mode 100644
index 000000000..ef628afb4
Binary files /dev/null and b/gfx/fx/flower.2bpp.lz.1bc2e9d2 differ
diff --git a/gfx/fx/flower.png b/gfx/fx/flower.png
new file mode 100644
index 000000000..61b4f58ce
Binary files /dev/null and b/gfx/fx/flower.png differ
diff --git a/gfx/fx/globe.2bpp.lz b/gfx/fx/globe.2bpp.lz
deleted file mode 100644
index 99fa15c6f..000000000
Binary files a/gfx/fx/globe.2bpp.lz and /dev/null differ
diff --git a/gfx/fx/globe.2bpp.lz.710dbb8e b/gfx/fx/globe.2bpp.lz.710dbb8e
new file mode 100644
index 000000000..99fa15c6f
Binary files /dev/null and b/gfx/fx/globe.2bpp.lz.710dbb8e differ
diff --git a/gfx/fx/globe.png b/gfx/fx/globe.png
new file mode 100644
index 000000000..8d3a35683
Binary files /dev/null and b/gfx/fx/globe.png differ
diff --git a/gfx/fx/haze.2bpp.lz b/gfx/fx/haze.2bpp.lz
deleted file mode 100644
index e0cdc644c..000000000
Binary files a/gfx/fx/haze.2bpp.lz and /dev/null differ
diff --git a/gfx/fx/haze.2bpp.lz.91424607 b/gfx/fx/haze.2bpp.lz.91424607
new file mode 100644
index 000000000..e0cdc644c
Binary files /dev/null and b/gfx/fx/haze.2bpp.lz.91424607 differ
diff --git a/gfx/fx/haze.png b/gfx/fx/haze.png
new file mode 100644
index 000000000..8a870ba98
Binary files /dev/null and b/gfx/fx/haze.png differ
diff --git a/gfx/fx/hit.2bpp.lz b/gfx/fx/hit.2bpp.lz
deleted file mode 100644
index 5d9ffbe5d..000000000
Binary files a/gfx/fx/hit.2bpp.lz and /dev/null differ
diff --git a/gfx/fx/hit.2bpp.lz.2b3c83f2 b/gfx/fx/hit.2bpp.lz.2b3c83f2
new file mode 100644
index 000000000..5d9ffbe5d
Binary files /dev/null and b/gfx/fx/hit.2bpp.lz.2b3c83f2 differ
diff --git a/gfx/fx/hit.png b/gfx/fx/hit.png
new file mode 100644
index 000000000..228066331
Binary files /dev/null and b/gfx/fx/hit.png differ
diff --git a/gfx/fx/horn.2bpp.lz b/gfx/fx/horn.2bpp.lz
deleted file mode 100644
index a92f74796..000000000
Binary files a/gfx/fx/horn.2bpp.lz and /dev/null differ
diff --git a/gfx/fx/horn.2bpp.lz.48908aae b/gfx/fx/horn.2bpp.lz.48908aae
new file mode 100644
index 000000000..a92f74796
Binary files /dev/null and b/gfx/fx/horn.2bpp.lz.48908aae differ
diff --git a/gfx/fx/horn.png b/gfx/fx/horn.png
new file mode 100644
index 000000000..56e8ca241
Binary files /dev/null and b/gfx/fx/horn.png differ
diff --git a/gfx/fx/ice.2bpp.lz b/gfx/fx/ice.2bpp.lz
deleted file mode 100644
index 3d059700b..000000000
Binary files a/gfx/fx/ice.2bpp.lz and /dev/null differ
diff --git a/gfx/fx/ice.2bpp.lz.664d900f b/gfx/fx/ice.2bpp.lz.664d900f
new file mode 100644
index 000000000..3d059700b
Binary files /dev/null and b/gfx/fx/ice.2bpp.lz.664d900f differ
diff --git a/gfx/fx/ice.png b/gfx/fx/ice.png
new file mode 100644
index 000000000..62a67641e
Binary files /dev/null and b/gfx/fx/ice.png differ
diff --git a/gfx/fx/lightning.2bpp.lz b/gfx/fx/lightning.2bpp.lz
deleted file mode 100644
index 81de5850f..000000000
Binary files a/gfx/fx/lightning.2bpp.lz and /dev/null differ
diff --git a/gfx/fx/lightning.2bpp.lz.a88fc131 b/gfx/fx/lightning.2bpp.lz.a88fc131
new file mode 100644
index 000000000..81de5850f
Binary files /dev/null and b/gfx/fx/lightning.2bpp.lz.a88fc131 differ
diff --git a/gfx/fx/lightning.png b/gfx/fx/lightning.png
new file mode 100755
index 000000000..6606fad12
Binary files /dev/null and b/gfx/fx/lightning.png differ
diff --git a/gfx/fx/misc.2bpp.lz b/gfx/fx/misc.2bpp.lz
deleted file mode 100644
index d0c5f0dfc..000000000
Binary files a/gfx/fx/misc.2bpp.lz and /dev/null differ
diff --git a/gfx/fx/misc.2bpp.lz.4b20c3d7 b/gfx/fx/misc.2bpp.lz.4b20c3d7
new file mode 100644
index 000000000..d0c5f0dfc
Binary files /dev/null and b/gfx/fx/misc.2bpp.lz.4b20c3d7 differ
diff --git a/gfx/fx/misc.png b/gfx/fx/misc.png
new file mode 100755
index 000000000..d7e67508e
Binary files /dev/null and b/gfx/fx/misc.png differ
diff --git a/gfx/fx/noise.2bpp.lz b/gfx/fx/noise.2bpp.lz
deleted file mode 100644
index e195da453..000000000
Binary files a/gfx/fx/noise.2bpp.lz and /dev/null differ
diff --git a/gfx/fx/noise.2bpp.lz.acb4a76e b/gfx/fx/noise.2bpp.lz.acb4a76e
new file mode 100644
index 000000000..e195da453
Binary files /dev/null and b/gfx/fx/noise.2bpp.lz.acb4a76e differ
diff --git a/gfx/fx/noise.png b/gfx/fx/noise.png
new file mode 100755
index 000000000..17540a5e8
Binary files /dev/null and b/gfx/fx/noise.png differ
diff --git a/gfx/fx/objects.2bpp.lz b/gfx/fx/objects.2bpp.lz
deleted file mode 100644
index 1a52d6350..000000000
Binary files a/gfx/fx/objects.2bpp.lz and /dev/null differ
diff --git a/gfx/fx/objects.2bpp.lz.83f812de b/gfx/fx/objects.2bpp.lz.83f812de
new file mode 100644
index 000000000..1a52d6350
Binary files /dev/null and b/gfx/fx/objects.2bpp.lz.83f812de differ
diff --git a/gfx/fx/objects.png b/gfx/fx/objects.png
new file mode 100755
index 000000000..91ea435b8
Binary files /dev/null and b/gfx/fx/objects.png differ
diff --git a/gfx/fx/plant.2bpp.lz b/gfx/fx/plant.2bpp.lz
deleted file mode 100644
index 589fc48b6..000000000
Binary files a/gfx/fx/plant.2bpp.lz and /dev/null differ
diff --git a/gfx/fx/plant.2bpp.lz.4a00c417 b/gfx/fx/plant.2bpp.lz.4a00c417
new file mode 100644
index 000000000..589fc48b6
Binary files /dev/null and b/gfx/fx/plant.2bpp.lz.4a00c417 differ
diff --git a/gfx/fx/plant.png b/gfx/fx/plant.png
new file mode 100644
index 000000000..ec1125054
Binary files /dev/null and b/gfx/fx/plant.png differ
diff --git a/gfx/fx/poison.2bpp.lz b/gfx/fx/poison.2bpp.lz
deleted file mode 100644
index df2cbe604..000000000
Binary files a/gfx/fx/poison.2bpp.lz and /dev/null differ
diff --git a/gfx/fx/poison.2bpp.lz.fc7dc9c1 b/gfx/fx/poison.2bpp.lz.fc7dc9c1
new file mode 100644
index 000000000..df2cbe604
Binary files /dev/null and b/gfx/fx/poison.2bpp.lz.fc7dc9c1 differ
diff --git a/gfx/fx/poison.png b/gfx/fx/poison.png
new file mode 100755
index 000000000..ebbbc52be
Binary files /dev/null and b/gfx/fx/poison.png differ
diff --git a/gfx/fx/pokeball.2bpp.lz b/gfx/fx/pokeball.2bpp.lz
deleted file mode 100644
index e09b082db..000000000
Binary files a/gfx/fx/pokeball.2bpp.lz and /dev/null differ
diff --git a/gfx/fx/pokeball.2bpp.lz.c58f7e01 b/gfx/fx/pokeball.2bpp.lz.c58f7e01
new file mode 100644
index 000000000..e09b082db
Binary files /dev/null and b/gfx/fx/pokeball.2bpp.lz.c58f7e01 differ
diff --git a/gfx/fx/pokeball.png b/gfx/fx/pokeball.png
new file mode 100755
index 000000000..47edf2190
Binary files /dev/null and b/gfx/fx/pokeball.png differ
diff --git a/gfx/fx/powder.2bpp.lz b/gfx/fx/powder.2bpp.lz
deleted file mode 100644
index 375d0bf9c..000000000
Binary files a/gfx/fx/powder.2bpp.lz and /dev/null differ
diff --git a/gfx/fx/powder.2bpp.lz.bfd566bb b/gfx/fx/powder.2bpp.lz.bfd566bb
new file mode 100644
index 000000000..375d0bf9c
Binary files /dev/null and b/gfx/fx/powder.2bpp.lz.bfd566bb differ
diff --git a/gfx/fx/powder.png b/gfx/fx/powder.png
new file mode 100644
index 000000000..b2cb4d459
Binary files /dev/null and b/gfx/fx/powder.png differ
diff --git a/gfx/fx/psychic.2bpp.lz b/gfx/fx/psychic.2bpp.lz
deleted file mode 100644
index d6402dd3d..000000000
Binary files a/gfx/fx/psychic.2bpp.lz and /dev/null differ
diff --git a/gfx/fx/psychic.2bpp.lz.d80f285c b/gfx/fx/psychic.2bpp.lz.d80f285c
new file mode 100644
index 000000000..d6402dd3d
Binary files /dev/null and b/gfx/fx/psychic.2bpp.lz.d80f285c differ
diff --git a/gfx/fx/psychic.png b/gfx/fx/psychic.png
new file mode 100644
index 000000000..a6d22db2f
Binary files /dev/null and b/gfx/fx/psychic.png differ
diff --git a/gfx/fx/reflect.2bpp.lz b/gfx/fx/reflect.2bpp.lz
deleted file mode 100644
index a563de1a8..000000000
Binary files a/gfx/fx/reflect.2bpp.lz and /dev/null differ
diff --git a/gfx/fx/reflect.2bpp.lz.9a9c822d b/gfx/fx/reflect.2bpp.lz.9a9c822d
new file mode 100644
index 000000000..a563de1a8
Binary files /dev/null and b/gfx/fx/reflect.2bpp.lz.9a9c822d differ
diff --git a/gfx/fx/reflect.png b/gfx/fx/reflect.png
new file mode 100644
index 000000000..48fbd7d0d
Binary files /dev/null and b/gfx/fx/reflect.png differ
diff --git a/gfx/fx/rocks.2bpp.lz b/gfx/fx/rocks.2bpp.lz
deleted file mode 100644
index d5481ea6e..000000000
Binary files a/gfx/fx/rocks.2bpp.lz and /dev/null differ
diff --git a/gfx/fx/rocks.2bpp.lz.73d0153e b/gfx/fx/rocks.2bpp.lz.73d0153e
new file mode 100644
index 000000000..d5481ea6e
Binary files /dev/null and b/gfx/fx/rocks.2bpp.lz.73d0153e differ
diff --git a/gfx/fx/rocks.png b/gfx/fx/rocks.png
new file mode 100755
index 000000000..d7fe76b2f
Binary files /dev/null and b/gfx/fx/rocks.png differ
diff --git a/gfx/fx/rope.2bpp.lz b/gfx/fx/rope.2bpp.lz
deleted file mode 100644
index f7d6a480f..000000000
Binary files a/gfx/fx/rope.2bpp.lz and /dev/null differ
diff --git a/gfx/fx/rope.2bpp.lz.209d63dd b/gfx/fx/rope.2bpp.lz.209d63dd
new file mode 100644
index 000000000..f7d6a480f
Binary files /dev/null and b/gfx/fx/rope.2bpp.lz.209d63dd differ
diff --git a/gfx/fx/rope.png b/gfx/fx/rope.png
new file mode 100644
index 000000000..a12553c7a
Binary files /dev/null and b/gfx/fx/rope.png differ
diff --git a/gfx/fx/sand.2bpp.lz b/gfx/fx/sand.2bpp.lz
deleted file mode 100644
index 3508a1f58..000000000
Binary files a/gfx/fx/sand.2bpp.lz and /dev/null differ
diff --git a/gfx/fx/sand.2bpp.lz.c87c0eaa b/gfx/fx/sand.2bpp.lz.c87c0eaa
new file mode 100644
index 000000000..3508a1f58
Binary files /dev/null and b/gfx/fx/sand.2bpp.lz.c87c0eaa differ
diff --git a/gfx/fx/sand.png b/gfx/fx/sand.png
new file mode 100755
index 000000000..a54db235d
Binary files /dev/null and b/gfx/fx/sand.png differ
diff --git a/gfx/fx/shapes.2bpp.lz b/gfx/fx/shapes.2bpp.lz
deleted file mode 100644
index d7d48020f..000000000
Binary files a/gfx/fx/shapes.2bpp.lz and /dev/null differ
diff --git a/gfx/fx/shapes.2bpp.lz.262d77f0 b/gfx/fx/shapes.2bpp.lz.262d77f0
new file mode 100644
index 000000000..d7d48020f
Binary files /dev/null and b/gfx/fx/shapes.2bpp.lz.262d77f0 differ
diff --git a/gfx/fx/shapes.png b/gfx/fx/shapes.png
new file mode 100644
index 000000000..b99fc601a
Binary files /dev/null and b/gfx/fx/shapes.png differ
diff --git a/gfx/fx/shine.2bpp.lz b/gfx/fx/shine.2bpp.lz
deleted file mode 100644
index 3e47170b1..000000000
Binary files a/gfx/fx/shine.2bpp.lz and /dev/null differ
diff --git a/gfx/fx/shine.2bpp.lz.5fb79056 b/gfx/fx/shine.2bpp.lz.5fb79056
new file mode 100644
index 000000000..3e47170b1
Binary files /dev/null and b/gfx/fx/shine.2bpp.lz.5fb79056 differ
diff --git a/gfx/fx/shine.png b/gfx/fx/shine.png
new file mode 100644
index 000000000..1b7e9834b
Binary files /dev/null and b/gfx/fx/shine.png differ
diff --git a/gfx/fx/skyattack.2bpp.lz b/gfx/fx/skyattack.2bpp.lz
deleted file mode 100644
index e0412dd81..000000000
Binary files a/gfx/fx/skyattack.2bpp.lz and /dev/null differ
diff --git a/gfx/fx/skyattack.2bpp.lz.31738ab8 b/gfx/fx/skyattack.2bpp.lz.31738ab8
new file mode 100644
index 000000000..e0412dd81
Binary files /dev/null and b/gfx/fx/skyattack.2bpp.lz.31738ab8 differ
diff --git a/gfx/fx/skyattack.png b/gfx/fx/skyattack.png
new file mode 100644
index 000000000..e731c691c
Binary files /dev/null and b/gfx/fx/skyattack.png differ
diff --git a/gfx/fx/smoke.2bpp.lz b/gfx/fx/smoke.2bpp.lz
deleted file mode 100644
index bf26fed2b..000000000
Binary files a/gfx/fx/smoke.2bpp.lz and /dev/null differ
diff --git a/gfx/fx/smoke.2bpp.lz.aa05905e b/gfx/fx/smoke.2bpp.lz.aa05905e
new file mode 100644
index 000000000..bf26fed2b
Binary files /dev/null and b/gfx/fx/smoke.2bpp.lz.aa05905e differ
diff --git a/gfx/fx/smoke.png b/gfx/fx/smoke.png
new file mode 100644
index 000000000..1b09874ba
Binary files /dev/null and b/gfx/fx/smoke.png differ
diff --git a/gfx/fx/speed.2bpp.lz b/gfx/fx/speed.2bpp.lz
deleted file mode 100644
index 5d09f9a6a..000000000
Binary files a/gfx/fx/speed.2bpp.lz and /dev/null differ
diff --git a/gfx/fx/speed.2bpp.lz.1732b364 b/gfx/fx/speed.2bpp.lz.1732b364
new file mode 100644
index 000000000..5d09f9a6a
Binary files /dev/null and b/gfx/fx/speed.2bpp.lz.1732b364 differ
diff --git a/gfx/fx/speed.png b/gfx/fx/speed.png
new file mode 100644
index 000000000..e219b38c9
Binary files /dev/null and b/gfx/fx/speed.png differ
diff --git a/gfx/fx/status.2bpp.lz b/gfx/fx/status.2bpp.lz
deleted file mode 100644
index e5ce7df8a..000000000
Binary files a/gfx/fx/status.2bpp.lz and /dev/null differ
diff --git a/gfx/fx/status.2bpp.lz.0c0aa13e b/gfx/fx/status.2bpp.lz.0c0aa13e
new file mode 100644
index 000000000..e5ce7df8a
Binary files /dev/null and b/gfx/fx/status.2bpp.lz.0c0aa13e differ
diff --git a/gfx/fx/status.png b/gfx/fx/status.png
new file mode 100644
index 000000000..cb8527963
Binary files /dev/null and b/gfx/fx/status.png differ
diff --git a/gfx/fx/water.2bpp.lz b/gfx/fx/water.2bpp.lz
deleted file mode 100644
index 6a81bbb65..000000000
Binary files a/gfx/fx/water.2bpp.lz and /dev/null differ
diff --git a/gfx/fx/water.2bpp.lz.7b52ed12 b/gfx/fx/water.2bpp.lz.7b52ed12
new file mode 100644
index 000000000..6a81bbb65
Binary files /dev/null and b/gfx/fx/water.2bpp.lz.7b52ed12 differ
diff --git a/gfx/fx/water.png b/gfx/fx/water.png
new file mode 100644
index 000000000..4e3c3b719
Binary files /dev/null and b/gfx/fx/water.png differ
diff --git a/gfx/fx/wave.2bpp.lz b/gfx/fx/wave.2bpp.lz
deleted file mode 100644
index d94a5cb35..000000000
Binary files a/gfx/fx/wave.2bpp.lz and /dev/null differ
diff --git a/gfx/fx/wave.2bpp.lz.bee99402 b/gfx/fx/wave.2bpp.lz.bee99402
new file mode 100644
index 000000000..d94a5cb35
Binary files /dev/null and b/gfx/fx/wave.2bpp.lz.bee99402 differ
diff --git a/gfx/fx/wave.png b/gfx/fx/wave.png
new file mode 100644
index 000000000..55d4faa5f
Binary files /dev/null and b/gfx/fx/wave.png differ
diff --git a/gfx/fx/web.2bpp.lz b/gfx/fx/web.2bpp.lz
deleted file mode 100644
index 84b4018e5..000000000
Binary files a/gfx/fx/web.2bpp.lz and /dev/null differ
diff --git a/gfx/fx/web.2bpp.lz.80e3d480 b/gfx/fx/web.2bpp.lz.80e3d480
new file mode 100644
index 000000000..84b4018e5
Binary files /dev/null and b/gfx/fx/web.2bpp.lz.80e3d480 differ
diff --git a/gfx/fx/web.png b/gfx/fx/web.png
new file mode 100644
index 000000000..2aeffef0e
Binary files /dev/null and b/gfx/fx/web.png differ
diff --git a/gfx/fx/whip.2bpp.lz b/gfx/fx/whip.2bpp.lz
deleted file mode 100644
index da62ba918..000000000
Binary files a/gfx/fx/whip.2bpp.lz and /dev/null differ
diff --git a/gfx/fx/whip.2bpp.lz.d80d8d6e b/gfx/fx/whip.2bpp.lz.d80d8d6e
new file mode 100644
index 000000000..da62ba918
Binary files /dev/null and b/gfx/fx/whip.2bpp.lz.d80d8d6e differ
diff --git a/gfx/fx/whip.png b/gfx/fx/whip.png
new file mode 100644
index 000000000..92d7ded6f
Binary files /dev/null and b/gfx/fx/whip.png differ
diff --git a/gfx/fx/wind.2bpp.lz b/gfx/fx/wind.2bpp.lz
deleted file mode 100644
index 9c2769b83..000000000
Binary files a/gfx/fx/wind.2bpp.lz and /dev/null differ
diff --git a/gfx/fx/wind.2bpp.lz.5a785180 b/gfx/fx/wind.2bpp.lz.5a785180
new file mode 100644
index 000000000..9c2769b83
Binary files /dev/null and b/gfx/fx/wind.2bpp.lz.5a785180 differ
diff --git a/gfx/fx/wind.png b/gfx/fx/wind.png
new file mode 100644
index 000000000..b02031392
Binary files /dev/null and b/gfx/fx/wind.png differ
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);
-- 
cgit v1.2.3