diff --git a/gfx/tilesets/00.lz b/gfx/tilesets/00.2bpp.lz
similarity index 100%
rename from gfx/tilesets/00.lz
rename to gfx/tilesets/00.2bpp.lz
diff --git a/gfx/tilesets/01.lz b/gfx/tilesets/01.2bpp.lz
similarity index 100%
rename from gfx/tilesets/01.lz
rename to gfx/tilesets/01.2bpp.lz
diff --git a/gfx/tilesets/02.lz b/gfx/tilesets/02.2bpp.lz
similarity index 100%
rename from gfx/tilesets/02.lz
rename to gfx/tilesets/02.2bpp.lz
diff --git a/gfx/tilesets/03.lz b/gfx/tilesets/03.2bpp.lz
similarity index 100%
rename from gfx/tilesets/03.lz
rename to gfx/tilesets/03.2bpp.lz
diff --git a/gfx/tilesets/04.lz b/gfx/tilesets/04.2bpp.lz
similarity index 100%
rename from gfx/tilesets/04.lz
rename to gfx/tilesets/04.2bpp.lz
diff --git a/gfx/tilesets/05.lz b/gfx/tilesets/05.2bpp.lz
similarity index 100%
rename from gfx/tilesets/05.lz
rename to gfx/tilesets/05.2bpp.lz
diff --git a/gfx/tilesets/06.lz b/gfx/tilesets/06.2bpp.lz
similarity index 100%
rename from gfx/tilesets/06.lz
rename to gfx/tilesets/06.2bpp.lz
diff --git a/gfx/tilesets/07.lz b/gfx/tilesets/07.2bpp.lz
similarity index 100%
rename from gfx/tilesets/07.lz
rename to gfx/tilesets/07.2bpp.lz
diff --git a/gfx/tilesets/08.lz b/gfx/tilesets/08.2bpp.lz
similarity index 100%
rename from gfx/tilesets/08.lz
rename to gfx/tilesets/08.2bpp.lz
diff --git a/gfx/tilesets/09.lz b/gfx/tilesets/09.2bpp.lz
similarity index 100%
rename from gfx/tilesets/09.lz
rename to gfx/tilesets/09.2bpp.lz
diff --git a/gfx/tilesets/10.lz b/gfx/tilesets/10.2bpp.lz
similarity index 100%
rename from gfx/tilesets/10.lz
rename to gfx/tilesets/10.2bpp.lz
diff --git a/gfx/tilesets/11.lz b/gfx/tilesets/11.2bpp.lz
similarity index 100%
rename from gfx/tilesets/11.lz
rename to gfx/tilesets/11.2bpp.lz
diff --git a/gfx/tilesets/12.lz b/gfx/tilesets/12.2bpp.lz
similarity index 100%
rename from gfx/tilesets/12.lz
rename to gfx/tilesets/12.2bpp.lz
diff --git a/gfx/tilesets/13.lz b/gfx/tilesets/13.2bpp.lz
similarity index 100%
rename from gfx/tilesets/13.lz
rename to gfx/tilesets/13.2bpp.lz
diff --git a/gfx/tilesets/14.lz b/gfx/tilesets/14.2bpp.lz
similarity index 100%
rename from gfx/tilesets/14.lz
rename to gfx/tilesets/14.2bpp.lz
diff --git a/gfx/tilesets/15.lz b/gfx/tilesets/15.2bpp.lz
similarity index 100%
rename from gfx/tilesets/15.lz
rename to gfx/tilesets/15.2bpp.lz
diff --git a/gfx/tilesets/16.lz b/gfx/tilesets/16.2bpp.lz
similarity index 100%
rename from gfx/tilesets/16.lz
rename to gfx/tilesets/16.2bpp.lz
diff --git a/gfx/tilesets/17.lz b/gfx/tilesets/17.2bpp.lz
similarity index 100%
rename from gfx/tilesets/17.lz
rename to gfx/tilesets/17.2bpp.lz
diff --git a/gfx/tilesets/18.lz b/gfx/tilesets/18.2bpp.lz
similarity index 100%
rename from gfx/tilesets/18.lz
rename to gfx/tilesets/18.2bpp.lz
diff --git a/gfx/tilesets/19.lz b/gfx/tilesets/19.2bpp.lz
similarity index 100%
rename from gfx/tilesets/19.lz
rename to gfx/tilesets/19.2bpp.lz
diff --git a/gfx/tilesets/20.lz b/gfx/tilesets/20.2bpp.lz
similarity index 100%
rename from gfx/tilesets/20.lz
rename to gfx/tilesets/20.2bpp.lz
diff --git a/gfx/tilesets/21.lz b/gfx/tilesets/21.2bpp.lz
similarity index 100%
rename from gfx/tilesets/21.lz
rename to gfx/tilesets/21.2bpp.lz
diff --git a/gfx/tilesets/22.lz b/gfx/tilesets/22.2bpp.lz
similarity index 100%
rename from gfx/tilesets/22.lz
rename to gfx/tilesets/22.2bpp.lz
diff --git a/gfx/tilesets/23.lz b/gfx/tilesets/23.2bpp.lz
similarity index 100%
rename from gfx/tilesets/23.lz
rename to gfx/tilesets/23.2bpp.lz
diff --git a/gfx/tilesets/24.lz b/gfx/tilesets/24.2bpp.lz
similarity index 100%
rename from gfx/tilesets/24.lz
rename to gfx/tilesets/24.2bpp.lz
diff --git a/gfx/tilesets/25.lz b/gfx/tilesets/25.2bpp.lz
similarity index 100%
rename from gfx/tilesets/25.lz
rename to gfx/tilesets/25.2bpp.lz
diff --git a/gfx/tilesets/26.lz b/gfx/tilesets/26.2bpp.lz
similarity index 100%
rename from gfx/tilesets/26.lz
rename to gfx/tilesets/26.2bpp.lz
diff --git a/gfx/tilesets/27.lz b/gfx/tilesets/27.2bpp.lz
similarity index 100%
rename from gfx/tilesets/27.lz
rename to gfx/tilesets/27.2bpp.lz
diff --git a/gfx/tilesets/28.lz b/gfx/tilesets/28.2bpp.lz
similarity index 100%
rename from gfx/tilesets/28.lz
rename to gfx/tilesets/28.2bpp.lz
diff --git a/gfx/tilesets/29.lz b/gfx/tilesets/29.2bpp.lz
similarity index 100%
rename from gfx/tilesets/29.lz
rename to gfx/tilesets/29.2bpp.lz
diff --git a/gfx/tilesets/30.lz b/gfx/tilesets/30.2bpp.lz
similarity index 100%
rename from gfx/tilesets/30.lz
rename to gfx/tilesets/30.2bpp.lz
diff --git a/gfx/tilesets/31.lz b/gfx/tilesets/31.2bpp.lz
similarity index 100%
rename from gfx/tilesets/31.lz
rename to gfx/tilesets/31.2bpp.lz
diff --git a/gfx/tilesets/32.lz b/gfx/tilesets/32.2bpp.lz
similarity index 100%
rename from gfx/tilesets/32.lz
rename to gfx/tilesets/32.2bpp.lz
diff --git a/gfx/tilesets/33.lz b/gfx/tilesets/33.2bpp.lz
similarity index 100%
rename from gfx/tilesets/33.lz
rename to gfx/tilesets/33.2bpp.lz
diff --git a/gfx/tilesets/34.lz b/gfx/tilesets/34.2bpp.lz
similarity index 100%
rename from gfx/tilesets/34.lz
rename to gfx/tilesets/34.2bpp.lz
diff --git a/gfx/tilesets/35.lz b/gfx/tilesets/35.2bpp.lz
similarity index 100%
rename from gfx/tilesets/35.lz
rename to gfx/tilesets/35.2bpp.lz
diff --git a/gfx/tilesets/36.lz b/gfx/tilesets/36.2bpp.lz
similarity index 100%
rename from gfx/tilesets/36.lz
rename to gfx/tilesets/36.2bpp.lz
diff --git a/tilesets/data_1.asm b/tilesets/data_1.asm
index 1124b3f2e..658a782ed 100644
--- a/tilesets/data_1.asm
+++ b/tilesets/data_1.asm
@@ -1,5 +1,5 @@
 Tileset03GFX: ; 0x18000
-INCBIN "gfx/tilesets/03.lz"
+INCBIN "gfx/tilesets/03.2bpp.lz"
 ; 0x18606
 
 Tileset03Meta: ; 0x18606
@@ -12,7 +12,7 @@ INCBIN "tilesets/03_collision.bin"
 
 Tileset00GFX: ; 0x19006
 Tileset01GFX: ; 0x19006
-INCBIN "gfx/tilesets/01.lz"
+INCBIN "gfx/tilesets/01.2bpp.lz"
 ; 0x19c0e
 
 Tileset00Meta: ; 0x19c0e
@@ -26,7 +26,7 @@ INCBIN "tilesets/01_collision.bin"
 ; 0x1a60e
 
 Tileset29GFX: ; 0x1a60e
-INCBIN "gfx/tilesets/29.lz"
+INCBIN "gfx/tilesets/29.2bpp.lz"
 ; 0x1af3e
 
 Tileset29Meta: ; 0x1af3e
@@ -38,7 +38,7 @@ INCBIN "tilesets/29_collision.bin"
 ; 0x1b43e
 
 Tileset20GFX: ; 0x1b43e
-INCBIN "gfx/tilesets/20.lz"
+INCBIN "gfx/tilesets/20.2bpp.lz"
 ; 0x1b8fe
 
 Tileset20Meta: ; 0x1b8fe
diff --git a/tilesets/data_2.asm b/tilesets/data_2.asm
index ab02b8b7f..c9ab4cdce 100644
--- a/tilesets/data_2.asm
+++ b/tilesets/data_2.asm
@@ -1,5 +1,5 @@
 Tileset07GFX: ; 0x1c30c
-INCBIN "gfx/tilesets/07.lz"
+INCBIN "gfx/tilesets/07.2bpp.lz"
 ; 0x1c73c
 
 Tileset07Meta: ; 0x1c73c
@@ -11,7 +11,7 @@ INCBIN "tilesets/07_collision.bin"
 ; 0x1cc3c
 
 Tileset09GFX: ; 0x1cc3c
-INCBIN "gfx/tilesets/09.lz"
+INCBIN "gfx/tilesets/09.2bpp.lz"
 ; 0x1d04c
 
 Tileset09Meta: ; 0x1d04c
@@ -23,7 +23,7 @@ INCBIN "tilesets/09_collision.bin"
 ; 0x1d54c
 
 Tileset06GFX: ; 0x1d54c
-INCBIN "gfx/tilesets/06.lz"
+INCBIN "gfx/tilesets/06.2bpp.lz"
 ; 0x1d92c
 
 Tileset06Meta: ; 0x1d92c
@@ -35,7 +35,7 @@ INCBIN "tilesets/06_collision.bin"
 ; 0x1de2c
 
 Tileset13GFX: ; 0x1de2c
-INCBIN "gfx/tilesets/13.lz"
+INCBIN "gfx/tilesets/13.2bpp.lz"
 ; 0x1e58c
 
 Tileset13Meta: ; 0x1e58c
@@ -47,7 +47,7 @@ INCBIN "tilesets/13_collision.bin"
 ; 0x1ea8c
 
 Tileset24GFX: ; 0x1ea8c
-INCBIN "gfx/tilesets/24.lz"
+INCBIN "gfx/tilesets/24.2bpp.lz"
 ; 0x1ee1c
 
 Tileset24Meta: ; 0x1ee1c
diff --git a/tilesets/data_3.asm b/tilesets/data_3.asm
index 337573d20..b97d4587d 100644
--- a/tilesets/data_3.asm
+++ b/tilesets/data_3.asm
@@ -1,5 +1,5 @@
 Tileset23GFX: ; 0x20181
-INCBIN "gfx/tilesets/23.lz"
+INCBIN "gfx/tilesets/23.2bpp.lz"
 ; 0x206e1
 
 Tileset23Meta: ; 0x206e1
@@ -11,7 +11,7 @@ INCBIN "tilesets/23_collision.bin"
 ; 0x20be1
 
 Tileset10GFX: ; 0x20be1
-INCBIN "gfx/tilesets/10.lz"
+INCBIN "gfx/tilesets/10.2bpp.lz"
 ; 0x213e1
 
 Tileset10Meta: ; 0x213e1
@@ -23,7 +23,7 @@ INCBIN "tilesets/10_collision.bin"
 ; 0x218e1
 
 Tileset12GFX: ; 0x218e1
-INCBIN "gfx/tilesets/12.lz"
+INCBIN "gfx/tilesets/12.2bpp.lz"
 ; 0x22031
 
 Tileset12Meta: ; 0x22031
@@ -35,7 +35,7 @@ INCBIN "tilesets/12_collision.bin"
 ; 0x22531
 
 Tileset14GFX: ; 0x22531
-INCBIN "gfx/tilesets/14.lz"
+INCBIN "gfx/tilesets/14.2bpp.lz"
 ; 0x22af1
 
 Tileset14Meta: ; 0x22af1
@@ -47,7 +47,7 @@ INCBIN "tilesets/14_collision.bin"
 ; 0x22ff1
 
 Tileset17GFX: ; 0x22ff1
-INCBIN "gfx/tilesets/17.lz"
+INCBIN "gfx/tilesets/17.2bpp.lz"
 ; 0x23391
 
 Tileset17Meta: ; 0x23391
diff --git a/tilesets/data_4.asm b/tilesets/data_4.asm
index f6e490f77..c427d0bf6 100644
--- a/tilesets/data_4.asm
+++ b/tilesets/data_4.asm
@@ -1,5 +1,5 @@
 Tileset15GFX: ; 0x30000
-INCBIN "gfx/tilesets/15.lz"
+INCBIN "gfx/tilesets/15.2bpp.lz"
 ; 0x304e0
 
 Tileset15Meta: ; 0x304e0
@@ -11,7 +11,7 @@ INCBIN "tilesets/15_collision.bin"
 ; 0x309e0
 
 Tileset25GFX: ; 0x309e0
-INCBIN "gfx/tilesets/25.lz"
+INCBIN "gfx/tilesets/25.2bpp.lz"
 ; 0x30e80
 
 Tileset25Meta: ; 0x30e80
@@ -23,7 +23,7 @@ INCBIN "tilesets/25_collision.bin"
 ; 0x31380
 
 Tileset27GFX: ; 0x31380
-INCBIN "gfx/tilesets/27.lz"
+INCBIN "gfx/tilesets/27.2bpp.lz"
 ; 0x318e0
 
 Tileset27Meta: ; 0x318e0
@@ -35,7 +35,7 @@ INCBIN "tilesets/27_collision.bin"
 ; 0x31de0
 
 Tileset28GFX: ; 0x31de0
-INCBIN "gfx/tilesets/28.lz"
+INCBIN "gfx/tilesets/28.2bpp.lz"
 ; 0x321b0
 
 Tileset28Meta: ; 0x321b0
@@ -47,7 +47,7 @@ INCBIN "tilesets/28_collision.bin"
 ; 0x326b0
 
 Tileset30GFX: ; 0x326b0
-INCBIN "gfx/tilesets/30.lz"
+INCBIN "gfx/tilesets/30.2bpp.lz"
 ; 0x329f0
 
 UnusedTileset30Meta: ; 0x329f0
diff --git a/tilesets/data_5.asm b/tilesets/data_5.asm
index 00cc1b956..a985b0b3d 100644
--- a/tilesets/data_5.asm
+++ b/tilesets/data_5.asm
@@ -1,5 +1,5 @@
 Tileset21GFX: ; 0xb4000
-INCBIN "gfx/tilesets/21.lz"
+INCBIN "gfx/tilesets/21.2bpp.lz"
 ; 0xb48a0
 
 Tileset21Meta: ; 0xb48a0
@@ -11,7 +11,7 @@ INCBIN "tilesets/21_collision.bin"
 ; 0xb4da0
 
 Tileset22GFX: ; 0xb4da0
-INCBIN "gfx/tilesets/22.lz"
+INCBIN "gfx/tilesets/22.2bpp.lz"
 ; 0xb50e0
 
 Tileset22Meta: ; 0xb50e0
@@ -23,7 +23,7 @@ INCBIN "tilesets/22_collision.bin"
 ; 0xb55e0
 
 Tileset08GFX: ; 0xb55e0
-INCBIN "gfx/tilesets/08.lz"
+INCBIN "gfx/tilesets/08.2bpp.lz"
 ; 0xb59e0
 
 Tileset08Meta: ; 0xb59e0
@@ -36,7 +36,7 @@ INCBIN "tilesets/08_collision.bin"
 
 Tileset02GFX: ; 0xb5ee0
 Tileset04GFX: ; 0xb5ee0
-INCBIN "gfx/tilesets/04.lz"
+INCBIN "gfx/tilesets/04.2bpp.lz"
 ; 0xb6ae8
 
 Tileset02Meta: ; 0xb6ae8
@@ -48,7 +48,7 @@ INCBIN "tilesets/02_collision.bin"
 ; 0xb74e8
 
 Tileset16GFX: ; 0xb74e8
-INCBIN "gfx/tilesets/16.lz"
+INCBIN "gfx/tilesets/16.2bpp.lz"
 ; 0xb79a8
 
 Tileset16Meta: ; 0xb79a8
diff --git a/tilesets/data_6.asm b/tilesets/data_6.asm
index 93d3b75af..40245b5ca 100644
--- a/tilesets/data_6.asm
+++ b/tilesets/data_6.asm
@@ -1,9 +1,9 @@
 Tileset31GFX: ; 0xdc000
-INCBIN "gfx/tilesets/31.lz"
+INCBIN "gfx/tilesets/31.2bpp.lz"
 ; 0xdc3d0
 
 Tileset18GFX: ; 0xdc3d0
-INCBIN "gfx/tilesets/18.lz"
+INCBIN "gfx/tilesets/18.2bpp.lz"
 ; 0xdcc50
 
 Tileset18Meta: ; 0xdcc50
@@ -15,7 +15,7 @@ INCBIN "tilesets/18_collision.bin"
 ; 0xdd150
 
 Tileset05GFX: ; 0xdd150
-INCBIN "gfx/tilesets/05.lz"
+INCBIN "gfx/tilesets/05.2bpp.lz"
 ; 0xdd600
 
 Tileset05Meta: ; 0xdd600
@@ -27,7 +27,7 @@ INCBIN "tilesets/05_collision.bin"
 ; 0xddb00
 
 Tileset19GFX: ; 0xddb00
-INCBIN "gfx/tilesets/19.lz"
+INCBIN "gfx/tilesets/19.2bpp.lz"
 ; 0xddf70
 
 Tileset19Meta: ; 0xddf70
@@ -43,7 +43,7 @@ INCBIN "tilesets/31_collision.bin"
 ; 0xde570
 
 Tileset11GFX: ; 0xde570
-INCBIN "gfx/tilesets/11.lz"
+INCBIN "gfx/tilesets/11.2bpp.lz"
 ; 0xde990
 
 Tileset11Meta: ; 0xde990
diff --git a/tilesets/data_7.asm b/tilesets/data_7.asm
index 418ecec98..d2d216fc6 100644
--- a/tilesets/data_7.asm
+++ b/tilesets/data_7.asm
@@ -4,7 +4,7 @@ Tileset33GFX: ; 0x1dc5a1
 Tileset34GFX: ; 0x1dc5a1
 Tileset35GFX: ; 0x1dc5a1
 Tileset36GFX: ; 0x1dc5a1
-INCBIN "gfx/tilesets/26.lz"
+INCBIN "gfx/tilesets/26.2bpp.lz"
 ; 0x1dd1a9
 
 Tileset26Meta: ; 0x1dd1a9