diff --git a/gfx/tilesets/00.2bpp.lz b/gfx/tilesets/00.2bpp.lz.0c7e555a
similarity index 100%
rename from gfx/tilesets/00.2bpp.lz
rename to gfx/tilesets/00.2bpp.lz.0c7e555a
diff --git a/gfx/tilesets/00.png b/gfx/tilesets/00.png
new file mode 100644
index 000000000..0fc2db12f
Binary files /dev/null and b/gfx/tilesets/00.png differ
diff --git a/gfx/tilesets/01.2bpp.lz b/gfx/tilesets/01.2bpp.lz.0c7e555a
similarity index 100%
rename from gfx/tilesets/01.2bpp.lz
rename to gfx/tilesets/01.2bpp.lz.0c7e555a
diff --git a/gfx/tilesets/01.png b/gfx/tilesets/01.png
new file mode 100644
index 000000000..0fc2db12f
Binary files /dev/null and b/gfx/tilesets/01.png differ
diff --git a/gfx/tilesets/02.2bpp.lz b/gfx/tilesets/02.2bpp.lz.391603fb
similarity index 100%
rename from gfx/tilesets/02.2bpp.lz
rename to gfx/tilesets/02.2bpp.lz.391603fb
diff --git a/gfx/tilesets/02.png b/gfx/tilesets/02.png
new file mode 100644
index 000000000..126573b7b
Binary files /dev/null and b/gfx/tilesets/02.png differ
diff --git a/gfx/tilesets/03.2bpp.lz b/gfx/tilesets/03.2bpp.lz.a29f5d51
similarity index 100%
rename from gfx/tilesets/03.2bpp.lz
rename to gfx/tilesets/03.2bpp.lz.a29f5d51
diff --git a/gfx/tilesets/03.png b/gfx/tilesets/03.png
new file mode 100644
index 000000000..08b2cbeea
Binary files /dev/null and b/gfx/tilesets/03.png differ
diff --git a/gfx/tilesets/04.2bpp.lz b/gfx/tilesets/04.2bpp.lz.391603fb
similarity index 100%
rename from gfx/tilesets/04.2bpp.lz
rename to gfx/tilesets/04.2bpp.lz.391603fb
diff --git a/gfx/tilesets/04.png b/gfx/tilesets/04.png
new file mode 100644
index 000000000..126573b7b
Binary files /dev/null and b/gfx/tilesets/04.png differ
diff --git a/gfx/tilesets/05.2bpp.lz b/gfx/tilesets/05.2bpp.lz.c848ef13
similarity index 100%
rename from gfx/tilesets/05.2bpp.lz
rename to gfx/tilesets/05.2bpp.lz.c848ef13
diff --git a/gfx/tilesets/05.png b/gfx/tilesets/05.png
new file mode 100644
index 000000000..3ab7b5ce8
Binary files /dev/null and b/gfx/tilesets/05.png differ
diff --git a/gfx/tilesets/06.2bpp.lz b/gfx/tilesets/06.2bpp.lz.252cbd8f
similarity index 100%
rename from gfx/tilesets/06.2bpp.lz
rename to gfx/tilesets/06.2bpp.lz.252cbd8f
diff --git a/gfx/tilesets/06.png b/gfx/tilesets/06.png
new file mode 100644
index 000000000..b49f799d8
Binary files /dev/null and b/gfx/tilesets/06.png differ
diff --git a/gfx/tilesets/07.2bpp.lz b/gfx/tilesets/07.2bpp.lz.e1c4014c
similarity index 100%
rename from gfx/tilesets/07.2bpp.lz
rename to gfx/tilesets/07.2bpp.lz.e1c4014c
diff --git a/gfx/tilesets/07.png b/gfx/tilesets/07.png
new file mode 100644
index 000000000..d4084ebd4
Binary files /dev/null and b/gfx/tilesets/07.png differ
diff --git a/gfx/tilesets/08.2bpp.lz b/gfx/tilesets/08.2bpp.lz.f5a55006
similarity index 100%
rename from gfx/tilesets/08.2bpp.lz
rename to gfx/tilesets/08.2bpp.lz.f5a55006
diff --git a/gfx/tilesets/08.png b/gfx/tilesets/08.png
new file mode 100644
index 000000000..b8f2db2d2
Binary files /dev/null and b/gfx/tilesets/08.png differ
diff --git a/gfx/tilesets/09.2bpp.lz b/gfx/tilesets/09.2bpp.lz.56b1a405
similarity index 100%
rename from gfx/tilesets/09.2bpp.lz
rename to gfx/tilesets/09.2bpp.lz.56b1a405
diff --git a/gfx/tilesets/09.png b/gfx/tilesets/09.png
new file mode 100644
index 000000000..6990a7d7b
Binary files /dev/null and b/gfx/tilesets/09.png differ
diff --git a/gfx/tilesets/10.2bpp.lz b/gfx/tilesets/10.2bpp.lz.b8d0f547
similarity index 100%
rename from gfx/tilesets/10.2bpp.lz
rename to gfx/tilesets/10.2bpp.lz.b8d0f547
diff --git a/gfx/tilesets/10.png b/gfx/tilesets/10.png
new file mode 100644
index 000000000..418a068fa
Binary files /dev/null and b/gfx/tilesets/10.png differ
diff --git a/gfx/tilesets/11.2bpp.lz b/gfx/tilesets/11.2bpp.lz.454cfd8b
similarity index 100%
rename from gfx/tilesets/11.2bpp.lz
rename to gfx/tilesets/11.2bpp.lz.454cfd8b
diff --git a/gfx/tilesets/11.png b/gfx/tilesets/11.png
new file mode 100644
index 000000000..b72e3f401
Binary files /dev/null and b/gfx/tilesets/11.png differ
diff --git a/gfx/tilesets/12.2bpp.lz b/gfx/tilesets/12.2bpp.lz.e2e94f92
similarity index 100%
rename from gfx/tilesets/12.2bpp.lz
rename to gfx/tilesets/12.2bpp.lz.e2e94f92
diff --git a/gfx/tilesets/12.png b/gfx/tilesets/12.png
new file mode 100644
index 000000000..4053283bc
Binary files /dev/null and b/gfx/tilesets/12.png differ
diff --git a/gfx/tilesets/13.2bpp.lz b/gfx/tilesets/13.2bpp.lz.63b414d4
similarity index 100%
rename from gfx/tilesets/13.2bpp.lz
rename to gfx/tilesets/13.2bpp.lz.63b414d4
diff --git a/gfx/tilesets/13.png b/gfx/tilesets/13.png
new file mode 100644
index 000000000..7dde8574e
Binary files /dev/null and b/gfx/tilesets/13.png differ
diff --git a/gfx/tilesets/14.2bpp.lz b/gfx/tilesets/14.2bpp.lz.71d29a2f
similarity index 100%
rename from gfx/tilesets/14.2bpp.lz
rename to gfx/tilesets/14.2bpp.lz.71d29a2f
diff --git a/gfx/tilesets/14.png b/gfx/tilesets/14.png
new file mode 100644
index 000000000..776900638
Binary files /dev/null and b/gfx/tilesets/14.png differ
diff --git a/gfx/tilesets/15.2bpp.lz b/gfx/tilesets/15.2bpp.lz.c1f2ed8f
similarity index 100%
rename from gfx/tilesets/15.2bpp.lz
rename to gfx/tilesets/15.2bpp.lz.c1f2ed8f
diff --git a/gfx/tilesets/15.png b/gfx/tilesets/15.png
new file mode 100644
index 000000000..582b9365d
Binary files /dev/null and b/gfx/tilesets/15.png differ
diff --git a/gfx/tilesets/16.2bpp.lz b/gfx/tilesets/16.2bpp.lz.dd51d079
similarity index 100%
rename from gfx/tilesets/16.2bpp.lz
rename to gfx/tilesets/16.2bpp.lz.dd51d079
diff --git a/gfx/tilesets/16.png b/gfx/tilesets/16.png
new file mode 100644
index 000000000..3d6f1b511
Binary files /dev/null and b/gfx/tilesets/16.png differ
diff --git a/gfx/tilesets/17.2bpp.lz b/gfx/tilesets/17.2bpp.lz.1600ca86
similarity index 100%
rename from gfx/tilesets/17.2bpp.lz
rename to gfx/tilesets/17.2bpp.lz.1600ca86
diff --git a/gfx/tilesets/17.png b/gfx/tilesets/17.png
new file mode 100644
index 000000000..0c148f95d
Binary files /dev/null and b/gfx/tilesets/17.png differ
diff --git a/gfx/tilesets/18.2bpp.lz b/gfx/tilesets/18.2bpp.lz.93800351
similarity index 100%
rename from gfx/tilesets/18.2bpp.lz
rename to gfx/tilesets/18.2bpp.lz.93800351
diff --git a/gfx/tilesets/18.png b/gfx/tilesets/18.png
new file mode 100644
index 000000000..350c04932
Binary files /dev/null and b/gfx/tilesets/18.png differ
diff --git a/gfx/tilesets/19.2bpp.lz b/gfx/tilesets/19.2bpp.lz.0c1544c1
similarity index 100%
rename from gfx/tilesets/19.2bpp.lz
rename to gfx/tilesets/19.2bpp.lz.0c1544c1
diff --git a/gfx/tilesets/19.png b/gfx/tilesets/19.png
new file mode 100644
index 000000000..920ee30ec
Binary files /dev/null and b/gfx/tilesets/19.png differ
diff --git a/gfx/tilesets/20.2bpp.lz b/gfx/tilesets/20.2bpp.lz.35e51007
similarity index 100%
rename from gfx/tilesets/20.2bpp.lz
rename to gfx/tilesets/20.2bpp.lz.35e51007
diff --git a/gfx/tilesets/20.png b/gfx/tilesets/20.png
new file mode 100644
index 000000000..e46a847b9
Binary files /dev/null and b/gfx/tilesets/20.png differ
diff --git a/gfx/tilesets/21.2bpp.lz b/gfx/tilesets/21.2bpp.lz.febbc4ec
similarity index 100%
rename from gfx/tilesets/21.2bpp.lz
rename to gfx/tilesets/21.2bpp.lz.febbc4ec
diff --git a/gfx/tilesets/21.png b/gfx/tilesets/21.png
new file mode 100644
index 000000000..889b02727
Binary files /dev/null and b/gfx/tilesets/21.png differ
diff --git a/gfx/tilesets/22.2bpp.lz b/gfx/tilesets/22.2bpp.lz.467b6a2d
similarity index 100%
rename from gfx/tilesets/22.2bpp.lz
rename to gfx/tilesets/22.2bpp.lz.467b6a2d
diff --git a/gfx/tilesets/22.png b/gfx/tilesets/22.png
new file mode 100644
index 000000000..1cd57402d
Binary files /dev/null and b/gfx/tilesets/22.png differ
diff --git a/gfx/tilesets/23.2bpp.lz b/gfx/tilesets/23.2bpp.lz.bc56789c
similarity index 100%
rename from gfx/tilesets/23.2bpp.lz
rename to gfx/tilesets/23.2bpp.lz.bc56789c
diff --git a/gfx/tilesets/23.png b/gfx/tilesets/23.png
new file mode 100644
index 000000000..268fc998f
Binary files /dev/null and b/gfx/tilesets/23.png differ
diff --git a/gfx/tilesets/24.2bpp.lz b/gfx/tilesets/24.2bpp.lz.3437812a
similarity index 100%
rename from gfx/tilesets/24.2bpp.lz
rename to gfx/tilesets/24.2bpp.lz.3437812a
diff --git a/gfx/tilesets/24.png b/gfx/tilesets/24.png
new file mode 100644
index 000000000..0e5bdee7e
Binary files /dev/null and b/gfx/tilesets/24.png differ
diff --git a/gfx/tilesets/25.2bpp.lz b/gfx/tilesets/25.2bpp.lz.7fcb81d6
similarity index 100%
rename from gfx/tilesets/25.2bpp.lz
rename to gfx/tilesets/25.2bpp.lz.7fcb81d6
diff --git a/gfx/tilesets/25.png b/gfx/tilesets/25.png
new file mode 100644
index 000000000..7a4a5f8eb
Binary files /dev/null and b/gfx/tilesets/25.png differ
diff --git a/gfx/tilesets/26.2bpp.lz b/gfx/tilesets/26.2bpp.lz.8b42470b
similarity index 100%
rename from gfx/tilesets/26.2bpp.lz
rename to gfx/tilesets/26.2bpp.lz.8b42470b
diff --git a/gfx/tilesets/26.png b/gfx/tilesets/26.png
new file mode 100644
index 000000000..f41866c58
Binary files /dev/null and b/gfx/tilesets/26.png differ
diff --git a/gfx/tilesets/27.2bpp.lz b/gfx/tilesets/27.2bpp.lz.27cdd9ad
similarity index 100%
rename from gfx/tilesets/27.2bpp.lz
rename to gfx/tilesets/27.2bpp.lz.27cdd9ad
diff --git a/gfx/tilesets/27.png b/gfx/tilesets/27.png
new file mode 100644
index 000000000..8d2d32e1f
Binary files /dev/null and b/gfx/tilesets/27.png differ
diff --git a/gfx/tilesets/28.2bpp.lz b/gfx/tilesets/28.2bpp.lz.cace291c
similarity index 100%
rename from gfx/tilesets/28.2bpp.lz
rename to gfx/tilesets/28.2bpp.lz.cace291c
diff --git a/gfx/tilesets/28.png b/gfx/tilesets/28.png
new file mode 100644
index 000000000..0a83d2043
Binary files /dev/null and b/gfx/tilesets/28.png differ
diff --git a/gfx/tilesets/29.2bpp.lz b/gfx/tilesets/29.2bpp.lz.e23bc89f
similarity index 100%
rename from gfx/tilesets/29.2bpp.lz
rename to gfx/tilesets/29.2bpp.lz.e23bc89f
diff --git a/gfx/tilesets/29.png b/gfx/tilesets/29.png
new file mode 100644
index 000000000..d70eb53be
Binary files /dev/null and b/gfx/tilesets/29.png differ
diff --git a/gfx/tilesets/30.2bpp.lz b/gfx/tilesets/30.2bpp.lz.25b9c4b6
similarity index 100%
rename from gfx/tilesets/30.2bpp.lz
rename to gfx/tilesets/30.2bpp.lz.25b9c4b6
diff --git a/gfx/tilesets/30.png b/gfx/tilesets/30.png
new file mode 100644
index 000000000..9dc74c45b
Binary files /dev/null and b/gfx/tilesets/30.png differ
diff --git a/gfx/tilesets/31.2bpp.lz b/gfx/tilesets/31.2bpp.lz.6b0ac896
similarity index 100%
rename from gfx/tilesets/31.2bpp.lz
rename to gfx/tilesets/31.2bpp.lz.6b0ac896
diff --git a/gfx/tilesets/31.png b/gfx/tilesets/31.png
new file mode 100644
index 000000000..a85cc0394
Binary files /dev/null and b/gfx/tilesets/31.png differ
diff --git a/gfx/tilesets/32.2bpp.lz b/gfx/tilesets/32.2bpp.lz.8b42470b
similarity index 100%
rename from gfx/tilesets/32.2bpp.lz
rename to gfx/tilesets/32.2bpp.lz.8b42470b
diff --git a/gfx/tilesets/32.png b/gfx/tilesets/32.png
new file mode 100644
index 000000000..f41866c58
Binary files /dev/null and b/gfx/tilesets/32.png differ
diff --git a/gfx/tilesets/33.2bpp.lz b/gfx/tilesets/33.2bpp.lz.8b42470b
similarity index 100%
rename from gfx/tilesets/33.2bpp.lz
rename to gfx/tilesets/33.2bpp.lz.8b42470b
diff --git a/gfx/tilesets/33.png b/gfx/tilesets/33.png
new file mode 100644
index 000000000..f41866c58
Binary files /dev/null and b/gfx/tilesets/33.png differ
diff --git a/gfx/tilesets/34.2bpp.lz b/gfx/tilesets/34.2bpp.lz.8b42470b
similarity index 100%
rename from gfx/tilesets/34.2bpp.lz
rename to gfx/tilesets/34.2bpp.lz.8b42470b
diff --git a/gfx/tilesets/34.png b/gfx/tilesets/34.png
new file mode 100644
index 000000000..f41866c58
Binary files /dev/null and b/gfx/tilesets/34.png differ
diff --git a/gfx/tilesets/35.2bpp.lz b/gfx/tilesets/35.2bpp.lz.8b42470b
similarity index 100%
rename from gfx/tilesets/35.2bpp.lz
rename to gfx/tilesets/35.2bpp.lz.8b42470b
diff --git a/gfx/tilesets/35.png b/gfx/tilesets/35.png
new file mode 100644
index 000000000..f41866c58
Binary files /dev/null and b/gfx/tilesets/35.png differ
diff --git a/gfx/tilesets/36.2bpp.lz b/gfx/tilesets/36.2bpp.lz.8b42470b
similarity index 100%
rename from gfx/tilesets/36.2bpp.lz
rename to gfx/tilesets/36.2bpp.lz.8b42470b
diff --git a/gfx/tilesets/36.png b/gfx/tilesets/36.png
new file mode 100644
index 000000000..f41866c58
Binary files /dev/null and b/gfx/tilesets/36.png differ
diff --git a/gfx/tilesets/flower/cgb_1.2bpp b/gfx/tilesets/flower/cgb_1.2bpp
deleted file mode 100644
index ffe58b93e..000000000
--- a/gfx/tilesets/flower/cgb_1.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-¢M’-mL²A¼²HE0
\ No newline at end of file
diff --git a/gfx/tilesets/flower/cgb_1.png b/gfx/tilesets/flower/cgb_1.png
new file mode 100644
index 000000000..e3fd2867b
Binary files /dev/null and b/gfx/tilesets/flower/cgb_1.png differ
diff --git a/gfx/tilesets/flower/cgb_2.2bpp b/gfx/tilesets/flower/cgb_2.2bpp
deleted file mode 100644
index 5cf6b583f..000000000
--- a/gfx/tilesets/flower/cgb_2.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-¢Y$¤Z%Z˜f%Zš$E
\ No newline at end of file
diff --git a/gfx/tilesets/flower/cgb_2.png b/gfx/tilesets/flower/cgb_2.png
new file mode 100644
index 000000000..901e34a1f
Binary files /dev/null and b/gfx/tilesets/flower/cgb_2.png differ
diff --git a/gfx/tilesets/flower/dmg_1.2bpp b/gfx/tilesets/flower/dmg_1.2bpp
deleted file mode 100644
index ec9e9c6d4..000000000
--- a/gfx/tilesets/flower/dmg_1.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-¢AŒ!a ’1Œ‚HE0
\ No newline at end of file
diff --git a/gfx/tilesets/flower/dmg_1.png b/gfx/tilesets/flower/dmg_1.png
new file mode 100644
index 000000000..428514af4
Binary files /dev/null and b/gfx/tilesets/flower/dmg_1.png differ
diff --git a/gfx/tilesets/flower/dmg_2.2bpp b/gfx/tilesets/flower/dmg_2.2bpp
deleted file mode 100644
index 7bf87eab2..000000000
--- a/gfx/tilesets/flower/dmg_2.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-¢A$˜BB€f
Z‚$E
\ No newline at end of file
diff --git a/gfx/tilesets/flower/dmg_2.png b/gfx/tilesets/flower/dmg_2.png
new file mode 100644
index 000000000..9a5125017
Binary files /dev/null and b/gfx/tilesets/flower/dmg_2.png differ
diff --git a/gfx/tilesets/forest-tree/1.2bpp b/gfx/tilesets/forest-tree/1.2bpp
deleted file mode 100644
index 73414b5b6..000000000
--- a/gfx/tilesets/forest-tree/1.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-«W$¬2¾0[LG`íò
\ No newline at end of file
diff --git a/gfx/tilesets/forest-tree/1.png b/gfx/tilesets/forest-tree/1.png
new file mode 100644
index 000000000..231d9f20e
Binary files /dev/null and b/gfx/tilesets/forest-tree/1.png differ
diff --git a/gfx/tilesets/forest-tree/2.2bpp b/gfx/tilesets/forest-tree/2.2bpp
deleted file mode 100644
index 05a566248..000000000
--- a/gfx/tilesets/forest-tree/2.2bpp
+++ /dev/null
@@ -1,2 +0,0 @@
-«U&ª
-:¾(3$nqß°
\ No newline at end of file
diff --git a/gfx/tilesets/forest-tree/2.png b/gfx/tilesets/forest-tree/2.png
new file mode 100644
index 000000000..e3048f53b
Binary files /dev/null and b/gfx/tilesets/forest-tree/2.png differ
diff --git a/gfx/tilesets/forest-tree/3.2bpp b/gfx/tilesets/forest-tree/3.2bpp
deleted file mode 100644
index f74e64652..000000000
Binary files a/gfx/tilesets/forest-tree/3.2bpp and /dev/null differ
diff --git a/gfx/tilesets/forest-tree/3.png b/gfx/tilesets/forest-tree/3.png
new file mode 100644
index 000000000..0b17d12d3
Binary files /dev/null and b/gfx/tilesets/forest-tree/3.png differ
diff --git a/gfx/tilesets/forest-tree/4.2bpp b/gfx/tilesets/forest-tree/4.2bpp
deleted file mode 100644
index 3a7284a13..000000000
Binary files a/gfx/tilesets/forest-tree/4.2bpp and /dev/null differ
diff --git a/gfx/tilesets/forest-tree/4.png b/gfx/tilesets/forest-tree/4.png
new file mode 100644
index 000000000..04ef9f319
Binary files /dev/null and b/gfx/tilesets/forest-tree/4.png differ
diff --git a/gfx/tilesets/fountain/1.2bpp b/gfx/tilesets/fountain/1.2bpp
deleted file mode 100644
index ce84b04f0..000000000
Binary files a/gfx/tilesets/fountain/1.2bpp and /dev/null differ
diff --git a/gfx/tilesets/fountain/1.png b/gfx/tilesets/fountain/1.png
new file mode 100644
index 000000000..657a5c455
Binary files /dev/null and b/gfx/tilesets/fountain/1.png differ
diff --git a/gfx/tilesets/fountain/2.2bpp b/gfx/tilesets/fountain/2.2bpp
deleted file mode 100644
index 402b6c828..000000000
Binary files a/gfx/tilesets/fountain/2.2bpp and /dev/null differ
diff --git a/gfx/tilesets/fountain/2.png b/gfx/tilesets/fountain/2.png
new file mode 100644
index 000000000..af4652b64
Binary files /dev/null and b/gfx/tilesets/fountain/2.png differ
diff --git a/gfx/tilesets/fountain/3.2bpp b/gfx/tilesets/fountain/3.2bpp
deleted file mode 100644
index bc15f8b1f..000000000
Binary files a/gfx/tilesets/fountain/3.2bpp and /dev/null differ
diff --git a/gfx/tilesets/fountain/3.png b/gfx/tilesets/fountain/3.png
new file mode 100644
index 000000000..ed9c492e8
Binary files /dev/null and b/gfx/tilesets/fountain/3.png differ
diff --git a/gfx/tilesets/fountain/4.2bpp b/gfx/tilesets/fountain/4.2bpp
deleted file mode 100644
index 8a53f417b..000000000
Binary files a/gfx/tilesets/fountain/4.2bpp and /dev/null differ
diff --git a/gfx/tilesets/fountain/4.png b/gfx/tilesets/fountain/4.png
new file mode 100644
index 000000000..cfc95eea7
Binary files /dev/null and b/gfx/tilesets/fountain/4.png differ
diff --git a/gfx/tilesets/fountain/5.2bpp b/gfx/tilesets/fountain/5.2bpp
deleted file mode 100644
index 484691f5f..000000000
Binary files a/gfx/tilesets/fountain/5.2bpp and /dev/null differ
diff --git a/gfx/tilesets/fountain/5.png b/gfx/tilesets/fountain/5.png
new file mode 100644
index 000000000..a8c9475f9
Binary files /dev/null and b/gfx/tilesets/fountain/5.png differ
diff --git a/gfx/tilesets/roofs/0.2bpp b/gfx/tilesets/roofs/0.2bpp
deleted file mode 100644
index 51650e2e1..000000000
Binary files a/gfx/tilesets/roofs/0.2bpp and /dev/null differ
diff --git a/gfx/tilesets/roofs/0.png b/gfx/tilesets/roofs/0.png
new file mode 100644
index 000000000..1aa48fb87
Binary files /dev/null and b/gfx/tilesets/roofs/0.png differ
diff --git a/gfx/tilesets/roofs/1.2bpp b/gfx/tilesets/roofs/1.2bpp
deleted file mode 100644
index eea01d2f2..000000000
Binary files a/gfx/tilesets/roofs/1.2bpp and /dev/null differ
diff --git a/gfx/tilesets/roofs/1.png b/gfx/tilesets/roofs/1.png
new file mode 100644
index 000000000..1d68754f9
Binary files /dev/null and b/gfx/tilesets/roofs/1.png differ
diff --git a/gfx/tilesets/roofs/2.2bpp b/gfx/tilesets/roofs/2.2bpp
deleted file mode 100644
index 67db7f991..000000000
Binary files a/gfx/tilesets/roofs/2.2bpp and /dev/null differ
diff --git a/gfx/tilesets/roofs/2.png b/gfx/tilesets/roofs/2.png
new file mode 100644
index 000000000..b97b8787e
Binary files /dev/null and b/gfx/tilesets/roofs/2.png differ
diff --git a/gfx/tilesets/roofs/3.2bpp b/gfx/tilesets/roofs/3.2bpp
deleted file mode 100644
index 1d88fac5b..000000000
Binary files a/gfx/tilesets/roofs/3.2bpp and /dev/null differ
diff --git a/gfx/tilesets/roofs/3.png b/gfx/tilesets/roofs/3.png
new file mode 100644
index 000000000..14bc411aa
Binary files /dev/null and b/gfx/tilesets/roofs/3.png differ
diff --git a/gfx/tilesets/roofs/4.2bpp b/gfx/tilesets/roofs/4.2bpp
deleted file mode 100644
index 87590db99..000000000
Binary files a/gfx/tilesets/roofs/4.2bpp and /dev/null differ
diff --git a/gfx/tilesets/roofs/4.png b/gfx/tilesets/roofs/4.png
new file mode 100644
index 000000000..25bf71048
Binary files /dev/null and b/gfx/tilesets/roofs/4.png differ
diff --git a/gfx/tilesets/safari/1.2bpp b/gfx/tilesets/safari/1.2bpp
deleted file mode 100644
index d25f1badc..000000000
Binary files a/gfx/tilesets/safari/1.2bpp and /dev/null differ
diff --git a/gfx/tilesets/safari/1.png b/gfx/tilesets/safari/1.png
new file mode 100644
index 000000000..c5b500ccc
Binary files /dev/null and b/gfx/tilesets/safari/1.png differ
diff --git a/gfx/tilesets/safari/2.2bpp b/gfx/tilesets/safari/2.2bpp
deleted file mode 100644
index bdb3c8cf5..000000000
Binary files a/gfx/tilesets/safari/2.2bpp and /dev/null differ
diff --git a/gfx/tilesets/safari/2.png b/gfx/tilesets/safari/2.png
new file mode 100644
index 000000000..1512e35ad
Binary files /dev/null and b/gfx/tilesets/safari/2.png differ
diff --git a/gfx/tilesets/safari/3.2bpp b/gfx/tilesets/safari/3.2bpp
deleted file mode 100644
index 2016d2bd6..000000000
Binary files a/gfx/tilesets/safari/3.2bpp and /dev/null differ
diff --git a/gfx/tilesets/safari/3.png b/gfx/tilesets/safari/3.png
new file mode 100644
index 000000000..449c2a317
Binary files /dev/null and b/gfx/tilesets/safari/3.png differ
diff --git a/gfx/tilesets/safari/4.2bpp b/gfx/tilesets/safari/4.2bpp
deleted file mode 100644
index e0142c688..000000000
Binary files a/gfx/tilesets/safari/4.2bpp and /dev/null differ
diff --git a/gfx/tilesets/safari/4.png b/gfx/tilesets/safari/4.png
new file mode 100644
index 000000000..8e4c8e0e5
Binary files /dev/null and b/gfx/tilesets/safari/4.png differ
diff --git a/gfx/tilesets/sprout-pillar/1.2bpp b/gfx/tilesets/sprout-pillar/1.2bpp
deleted file mode 100644
index 3bb46c953..000000000
--- a/gfx/tilesets/sprout-pillar/1.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-€ÿ¿ÿ¿ÿ¿ÿ¿ÿ¿ÿ¿ÿ¿ÿÀ_ÿ_ßßßßßà?/ÿ/?ï?¯ï?¯ï?ðÿ÷·_÷—÷øÿë»Oû›oû
\ No newline at end of file
diff --git a/gfx/tilesets/sprout-pillar/1.png b/gfx/tilesets/sprout-pillar/1.png
new file mode 100644
index 000000000..c22fb2a13
Binary files /dev/null and b/gfx/tilesets/sprout-pillar/1.png differ
diff --git a/gfx/tilesets/sprout-pillar/10.2bpp b/gfx/tilesets/sprout-pillar/10.2bpp
deleted file mode 100644
index a1af10a55..000000000
--- a/gfx/tilesets/sprout-pillar/10.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-?ÿ_ÿ¿ÿ_ÿ¿ÿÿÿÿÿÿÿÿ¯ÿ_ÿ¯ÿ_ÿÿÿÿÿÿÿÿWÿ¯ÿ×ÿ¯ÿÿÿÿÿÿÿ«ÿWÿëÿWÿ¿ÿÿÿÿÿÿUÿ«ÿuÿ«ÿßÿÿÿÿÿ
\ No newline at end of file
diff --git a/gfx/tilesets/sprout-pillar/10.png b/gfx/tilesets/sprout-pillar/10.png
new file mode 100644
index 000000000..01dbe1afc
Binary files /dev/null and b/gfx/tilesets/sprout-pillar/10.png differ
diff --git a/gfx/tilesets/sprout-pillar/2.2bpp b/gfx/tilesets/sprout-pillar/2.2bpp
deleted file mode 100644
index 08d8cfd74..000000000
--- a/gfx/tilesets/sprout-pillar/2.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-ðÐÿÐðßðÙößðßðÞñøèÿèøïøéþïøïøîùüôÿôü÷üõþ÷ü÷üöýþúÿúþûþûþûþûþúÿ
ÿýÿýÿýÿýÿýÿýÿýÿ
\ No newline at end of file
diff --git a/gfx/tilesets/sprout-pillar/2.png b/gfx/tilesets/sprout-pillar/2.png
new file mode 100644
index 000000000..76fae403b
Binary files /dev/null and b/gfx/tilesets/sprout-pillar/2.png differ
diff --git a/gfx/tilesets/sprout-pillar/3.2bpp b/gfx/tilesets/sprout-pillar/3.2bpp
deleted file mode 100644
index e4bb79a49..000000000
--- a/gfx/tilesets/sprout-pillar/3.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-¿ÿ¿ÿ¿ÿ¿ÿ¿ÿ¿ÿ¿ÿ¿ÿß_ÿ_ßßßßßï?/ÿ/?ï?¯ï?¯ï?÷ÿ÷·_÷—÷ûÿë»Oû›oû
\ No newline at end of file
diff --git a/gfx/tilesets/sprout-pillar/3.png b/gfx/tilesets/sprout-pillar/3.png
new file mode 100644
index 000000000..80ce4657c
Binary files /dev/null and b/gfx/tilesets/sprout-pillar/3.png differ
diff --git a/gfx/tilesets/sprout-pillar/4.2bpp b/gfx/tilesets/sprout-pillar/4.2bpp
deleted file mode 100644
index 08897f1da..000000000
--- a/gfx/tilesets/sprout-pillar/4.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-ßðØ÷ÐðßðÙößðßðÞñïøèÿèøïøéþïøïøîù÷üôÿôü÷üõþ÷ü÷üöýûþúÿúþûþûþûþûþúÿýÿýÿýÿýÿýÿýÿýÿýÿ
\ No newline at end of file
diff --git a/gfx/tilesets/sprout-pillar/4.png b/gfx/tilesets/sprout-pillar/4.png
new file mode 100644
index 000000000..9d523c4bc
Binary files /dev/null and b/gfx/tilesets/sprout-pillar/4.png differ
diff --git a/gfx/tilesets/sprout-pillar/5.2bpp b/gfx/tilesets/sprout-pillar/5.2bpp
deleted file mode 100644
index f66926bab..000000000
--- a/gfx/tilesets/sprout-pillar/5.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-¿ÿ¿ÿ¿ÿ¿ÿ¿ÿ¿ÿ¿ÿ¿ÿß_ÿ_ÿßÿßÿßÿßÿßÿï?/ÿoÿ¯ÿïÿïÿïÿïÿ÷ÿWÿ·ÿ÷ÿ÷ÿ÷ÿ÷ÿûÿ[ÿ«ÿûÿûÿûÿûÿ
\ No newline at end of file
diff --git a/gfx/tilesets/sprout-pillar/5.png b/gfx/tilesets/sprout-pillar/5.png
new file mode 100644
index 000000000..b7796c8d6
Binary files /dev/null and b/gfx/tilesets/sprout-pillar/5.png differ
diff --git a/gfx/tilesets/sprout-pillar/6.2bpp b/gfx/tilesets/sprout-pillar/6.2bpp
deleted file mode 100644
index 5021b1c1f..000000000
--- a/gfx/tilesets/sprout-pillar/6.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-ßðØÿÕÿÚÿßÿßÿßÿßÿïøèÿíÿêÿïÿïÿïÿïÿ÷üôÿõÿöÿ÷ÿ÷ÿ÷ÿ÷ÿûþúÿûÿúÿûÿûÿûÿûÿýÿýÿýÿýÿýÿýÿýÿýÿ
\ No newline at end of file
diff --git a/gfx/tilesets/sprout-pillar/6.png b/gfx/tilesets/sprout-pillar/6.png
new file mode 100644
index 000000000..0ca0e5936
Binary files /dev/null and b/gfx/tilesets/sprout-pillar/6.png differ
diff --git a/gfx/tilesets/sprout-pillar/7.2bpp b/gfx/tilesets/sprout-pillar/7.2bpp
deleted file mode 100644
index 59d6876aa..000000000
--- a/gfx/tilesets/sprout-pillar/7.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-€ÿ‚ý¢Ý ß€ÿ„û„û€ÿÀÿÁþÑîÐïÀÿÂýÂýÀÿàÿàÿè÷è÷àÿáþáþàÿðÿðÿôûôûðÿðÿðÿðÿøÿøÿúýúýøÿøÿøÿøÿ
\ No newline at end of file
diff --git a/gfx/tilesets/sprout-pillar/7.png b/gfx/tilesets/sprout-pillar/7.png
new file mode 100644
index 000000000..3aa4b4e94
Binary files /dev/null and b/gfx/tilesets/sprout-pillar/7.png differ
diff --git a/gfx/tilesets/sprout-pillar/8.2bpp b/gfx/tilesets/sprout-pillar/8.2bpp
deleted file mode 100644
index bb22068b8..000000000
--- a/gfx/tilesets/sprout-pillar/8.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-ÿ?ß?ßÿÿ_¿_¿ÿÿïïÿÿ/ß/ßÿÿ÷÷ÿÿïïÿÿûûÿÿ÷÷ÿ
ÿýý
ÿ
ÿûû
ÿ
\ No newline at end of file
diff --git a/gfx/tilesets/sprout-pillar/8.png b/gfx/tilesets/sprout-pillar/8.png
new file mode 100644
index 000000000..e81475618
Binary files /dev/null and b/gfx/tilesets/sprout-pillar/8.png differ
diff --git a/gfx/tilesets/sprout-pillar/9.2bpp b/gfx/tilesets/sprout-pillar/9.2bpp
deleted file mode 100644
index 1c206fb79..000000000
--- a/gfx/tilesets/sprout-pillar/9.2bpp
+++ /dev/null
@@ -1 +0,0 @@
- ÿÅÿªÿÝÿêÿÝÿÿÿÿÿÐÿâÿÕÿîÿõÿîÿÿÿÿÿèÿñÿêÿ÷ÿúÿ÷ÿÿÿÿÿôÿøÿõÿûÿýÿûÿÿÿÿÿúÿüÿúÿýÿþÿýÿÿÿÿÿ
\ No newline at end of file
diff --git a/gfx/tilesets/sprout-pillar/9.png b/gfx/tilesets/sprout-pillar/9.png
new file mode 100644
index 000000000..da74607be
Binary files /dev/null and b/gfx/tilesets/sprout-pillar/9.png differ
diff --git a/gfx/tilesets/water.png b/gfx/tilesets/water.png
new file mode 100644
index 000000000..0aa2640c9
Binary files /dev/null and b/gfx/tilesets/water.png differ
diff --git a/gfx/tilesets/whirlpool/1.2bpp b/gfx/tilesets/whirlpool/1.2bpp
deleted file mode 100644
index 0a58c6b23..000000000
Binary files a/gfx/tilesets/whirlpool/1.2bpp and /dev/null differ
diff --git a/gfx/tilesets/whirlpool/1.png b/gfx/tilesets/whirlpool/1.png
new file mode 100644
index 000000000..4641dbc0d
Binary files /dev/null and b/gfx/tilesets/whirlpool/1.png differ
diff --git a/gfx/tilesets/whirlpool/2.2bpp b/gfx/tilesets/whirlpool/2.2bpp
deleted file mode 100644
index e1f841cf9..000000000
Binary files a/gfx/tilesets/whirlpool/2.2bpp and /dev/null differ
diff --git a/gfx/tilesets/whirlpool/2.png b/gfx/tilesets/whirlpool/2.png
new file mode 100644
index 000000000..ce5424053
Binary files /dev/null and b/gfx/tilesets/whirlpool/2.png differ
diff --git a/gfx/tilesets/whirlpool/3.2bpp b/gfx/tilesets/whirlpool/3.2bpp
deleted file mode 100644
index 9cdec8335..000000000
Binary files a/gfx/tilesets/whirlpool/3.2bpp and /dev/null differ
diff --git a/gfx/tilesets/whirlpool/3.png b/gfx/tilesets/whirlpool/3.png
new file mode 100644
index 000000000..55b629440
Binary files /dev/null and b/gfx/tilesets/whirlpool/3.png differ
diff --git a/gfx/tilesets/whirlpool/4.2bpp b/gfx/tilesets/whirlpool/4.2bpp
deleted file mode 100644
index 414acce03..000000000
Binary files a/gfx/tilesets/whirlpool/4.2bpp and /dev/null differ
diff --git a/gfx/tilesets/whirlpool/4.png b/gfx/tilesets/whirlpool/4.png
new file mode 100644
index 000000000..2175c5957
Binary files /dev/null and b/gfx/tilesets/whirlpool/4.png differ