diff --git a/engine/title.asm b/engine/title.asm
index 5e444cff1..39025b2f1 100644
--- a/engine/title.asm
+++ b/engine/title.asm
@@ -375,15 +375,15 @@ AnimateTitleCrystal: ; 10ef32
 ; 10ef46
 
 TitleSuicuneGFX: ; 10ef46
-INCBIN "gfx/title/suicune.lz"
+INCBIN "gfx/title/suicune.w128.2bpp.lz"
 ; 10f326
 
 TitleLogoGFX: ; 10f326
-INCBIN "gfx/title/logo.lz"
+INCBIN "gfx/title/logo.w160.t4.2bpp.lz"
 ; 10fcee
 
 TitleCrystalGFX: ; 10fcee
-INCBIN "gfx/title/crystal.lz"
+INCBIN "gfx/title/crystal.w48.interleave.2bpp.lz"
 ; 10fede
 
 TitleScreenPalettes:
diff --git a/gfx/intro/001.lz b/gfx/intro/001.tilemap.lz
similarity index 100%
rename from gfx/intro/001.lz
rename to gfx/intro/001.tilemap.lz
diff --git a/gfx/intro/002.lz b/gfx/intro/002.tilemap.lz
similarity index 100%
rename from gfx/intro/002.lz
rename to gfx/intro/002.tilemap.lz
diff --git a/gfx/intro/003.lz b/gfx/intro/003.tilemap.lz
similarity index 100%
rename from gfx/intro/003.lz
rename to gfx/intro/003.tilemap.lz
diff --git a/gfx/intro/004.lz b/gfx/intro/004.tilemap.lz
similarity index 100%
rename from gfx/intro/004.lz
rename to gfx/intro/004.tilemap.lz
diff --git a/gfx/intro/005.lz b/gfx/intro/005.tilemap.lz
similarity index 100%
rename from gfx/intro/005.lz
rename to gfx/intro/005.tilemap.lz
diff --git a/gfx/intro/006.lz b/gfx/intro/006.tilemap.lz
similarity index 100%
rename from gfx/intro/006.lz
rename to gfx/intro/006.tilemap.lz
diff --git a/gfx/intro/007.lz b/gfx/intro/007.tilemap.lz
similarity index 100%
rename from gfx/intro/007.lz
rename to gfx/intro/007.tilemap.lz
diff --git a/gfx/intro/008.lz b/gfx/intro/008.tilemap.lz
similarity index 100%
rename from gfx/intro/008.lz
rename to gfx/intro/008.tilemap.lz
diff --git a/gfx/intro/009.lz b/gfx/intro/009.tilemap.lz
similarity index 100%
rename from gfx/intro/009.lz
rename to gfx/intro/009.tilemap.lz
diff --git a/gfx/intro/010.lz b/gfx/intro/010.tilemap.lz
similarity index 100%
rename from gfx/intro/010.lz
rename to gfx/intro/010.tilemap.lz
diff --git a/gfx/intro/011.lz b/gfx/intro/011.tilemap.lz
similarity index 100%
rename from gfx/intro/011.lz
rename to gfx/intro/011.tilemap.lz
diff --git a/gfx/intro/012.lz b/gfx/intro/012.tilemap.lz
similarity index 100%
rename from gfx/intro/012.lz
rename to gfx/intro/012.tilemap.lz
diff --git a/gfx/intro/013.lz b/gfx/intro/013.tilemap.lz
similarity index 100%
rename from gfx/intro/013.lz
rename to gfx/intro/013.tilemap.lz
diff --git a/gfx/intro/014.lz b/gfx/intro/014.tilemap.lz
similarity index 100%
rename from gfx/intro/014.lz
rename to gfx/intro/014.tilemap.lz
diff --git a/gfx/intro/015.lz b/gfx/intro/015.tilemap.lz
similarity index 100%
rename from gfx/intro/015.lz
rename to gfx/intro/015.tilemap.lz
diff --git a/gfx/intro/017.lz b/gfx/intro/017.tilemap.lz
similarity index 100%
rename from gfx/intro/017.lz
rename to gfx/intro/017.tilemap.lz
diff --git a/gfx/intro/background.lz b/gfx/intro/background.2bpp.lz
similarity index 100%
rename from gfx/intro/background.lz
rename to gfx/intro/background.2bpp.lz
diff --git a/gfx/intro/crystal_unowns.lz b/gfx/intro/crystal_unowns.2bpp.lz
similarity index 100%
rename from gfx/intro/crystal_unowns.lz
rename to gfx/intro/crystal_unowns.2bpp.lz
diff --git a/gfx/intro/logo.lz b/gfx/intro/logo.2bpp.lz
similarity index 100%
rename from gfx/intro/logo.lz
rename to gfx/intro/logo.2bpp.lz
diff --git a/gfx/intro/pichu_wooper.lz b/gfx/intro/pichu_wooper.2bpp.lz
similarity index 100%
rename from gfx/intro/pichu_wooper.lz
rename to gfx/intro/pichu_wooper.2bpp.lz
diff --git a/gfx/intro/pulse.lz b/gfx/intro/pulse.2bpp.lz
similarity index 100%
rename from gfx/intro/pulse.lz
rename to gfx/intro/pulse.2bpp.lz
diff --git a/gfx/intro/suicune_back.lz b/gfx/intro/suicune_back.2bpp.lz
similarity index 100%
rename from gfx/intro/suicune_back.lz
rename to gfx/intro/suicune_back.2bpp.lz
diff --git a/gfx/intro/suicune_close.lz b/gfx/intro/suicune_close.2bpp.lz
similarity index 100%
rename from gfx/intro/suicune_close.lz
rename to gfx/intro/suicune_close.2bpp.lz
diff --git a/gfx/intro/suicune_jump.lz b/gfx/intro/suicune_jump.2bpp.lz
similarity index 100%
rename from gfx/intro/suicune_jump.lz
rename to gfx/intro/suicune_jump.2bpp.lz
diff --git a/gfx/intro/suicune_run.lz b/gfx/intro/suicune_run.2bpp.lz
similarity index 100%
rename from gfx/intro/suicune_run.lz
rename to gfx/intro/suicune_run.2bpp.lz
diff --git a/gfx/intro/unown_back.lz b/gfx/intro/unown_back.2bpp.lz
similarity index 100%
rename from gfx/intro/unown_back.lz
rename to gfx/intro/unown_back.2bpp.lz
diff --git a/gfx/intro/unowns.lz b/gfx/intro/unowns.2bpp.lz
similarity index 100%
rename from gfx/intro/unowns.lz
rename to gfx/intro/unowns.2bpp.lz
diff --git a/gfx/title/crystal.lz b/gfx/title/crystal.w48.interleave.2bpp.lz
similarity index 100%
rename from gfx/title/crystal.lz
rename to gfx/title/crystal.w48.interleave.2bpp.lz
diff --git a/gfx/title/logo.lz b/gfx/title/logo.w160.t4.2bpp.lz
similarity index 100%
rename from gfx/title/logo.lz
rename to gfx/title/logo.w160.t4.2bpp.lz
diff --git a/gfx/title/suicune.lz b/gfx/title/suicune.w128.2bpp.lz
similarity index 100%
rename from gfx/title/suicune.lz
rename to gfx/title/suicune.w128.2bpp.lz
diff --git a/gfx/trade/game_boy.lz b/gfx/trade/game_boy.2bpp.lz
similarity index 100%
rename from gfx/trade/game_boy.lz
rename to gfx/trade/game_boy.2bpp.lz
diff --git a/main.asm b/main.asm
index 8f7f57105..efe74a039 100644
--- a/main.asm
+++ b/main.asm
@@ -39881,7 +39881,7 @@ Tilemap_298f7: ; 297f7
 TradeArrowGFX:  INCBIN "gfx/trade/arrow.2bpp"
 TradeCableGFX:  INCBIN "gfx/trade/cable.2bpp"
 TradeBubbleGFX: INCBIN "gfx/trade/bubble.2bpp"
-TradeGameBoyLZ: INCBIN "gfx/trade/game_boy.lz"
+TradeGameBoyLZ: INCBIN "gfx/trade/game_boy.2bpp.lz"
 TradeBallGFX:   INCBIN "gfx/trade/ball.2bpp"
 TradePoofGFX:   INCBIN "gfx/trade/poof.2bpp"
 
@@ -87780,122 +87780,122 @@ Functione552f: ; e552f (39:552f)
 	ret
 
 IntroSuicuneRunGFX: ; e555d
-INCBIN "gfx/intro/suicune_run.lz"
+INCBIN "gfx/intro/suicune_run.2bpp.lz"
 ; e592d
 
 IntroPichuWooperGFX: ; e592d
-INCBIN "gfx/intro/pichu_wooper.lz"
+INCBIN "gfx/intro/pichu_wooper.2bpp.lz"
 ; e5c7d
 
 IntroBackgroundGFX: ; e5c7d
-INCBIN "gfx/intro/background.lz"
+INCBIN "gfx/intro/background.2bpp.lz"
 ; e5e6d
 
 IntroTilemap004: ; e5e6d
-INCBIN "gfx/intro/004.lz"
+INCBIN "gfx/intro/004.tilemap.lz"
 ; e5ecd
 
 IntroTilemap003: ; e5ecd
-INCBIN "gfx/intro/003.lz"
+INCBIN "gfx/intro/003.tilemap.lz"
 ; e5edd
 
 UnknownDatae5edd: ; e5edd
 INCBIN "baserom.gbc", $e5edd, $e5f5d - $e5edd
 
 IntroUnownsGFX: ; e5f5d
-INCBIN "gfx/intro/unowns.lz"
+INCBIN "gfx/intro/unowns.2bpp.lz"
 ; e634d
 
 IntroPulseGFX: ; e634d
-INCBIN "gfx/intro/pulse.lz"
+INCBIN "gfx/intro/pulse.2bpp.lz"
 ; e63dd
 
 IntroTilemap002: ; e63dd
-INCBIN "gfx/intro/002.lz"
+INCBIN "gfx/intro/002.tilemap.lz"
 ; e641d
 
 IntroTilemap001: ; e641d
-INCBIN "gfx/intro/001.lz"
+INCBIN "gfx/intro/001.tilemap.lz"
 ; e642d
 
 IntroTilemap006: ; e642d
-INCBIN "gfx/intro/006.lz"
+INCBIN "gfx/intro/006.tilemap.lz"
 ; e647d
 
 IntroTilemap005: ; e647d
-INCBIN "gfx/intro/005.lz"
+INCBIN "gfx/intro/005.tilemap.lz"
 ; e649d
 
 IntroTilemap008: ; e649d
-INCBIN "gfx/intro/008.lz"
+INCBIN "gfx/intro/008.tilemap.lz"
 ; e655d
 
 IntroTilemap007: ; e655d
-INCBIN "gfx/intro/007.lz"
+INCBIN "gfx/intro/007.tilemap.lz"
 ; e65ad
 
 UnknownDatae65ad: ; e65ad
 INCBIN "baserom.gbc", $e65ad, $e662d - $e65ad
 
 IntroCrystalUnownsGFX: ; e662d
-INCBIN "gfx/intro/crystal_unowns.lz"
+INCBIN "gfx/intro/crystal_unowns.2bpp.lz"
 ; e672d
 
 IntroTilemap017: ; e672d
-INCBIN "gfx/intro/017.lz"
+INCBIN "gfx/intro/017.tilemap.lz"
 ; e676d
 
 IntroTilemap015: ; e676d
-INCBIN "gfx/intro/015.lz"
+INCBIN "gfx/intro/015.tilemap.lz"
 ; e679d
 
 UnknownDatae679d: ; e679d
 INCBIN "baserom.gbc", $e679d, $e681d - $e679d
 
 IntroSuicuneCloseGFX: ; e681d
-INCBIN "gfx/intro/suicune_close.lz"
+INCBIN "gfx/intro/suicune_close.2bpp.lz"
 ; e6c3d
 
 IntroTilemap012: ; e6c3d
-INCBIN "gfx/intro/012.lz"
+INCBIN "gfx/intro/012.tilemap.lz"
 ; e6d0d
 
 IntroTilemap011: ; e6d0d
-INCBIN "gfx/intro/011.lz"
+INCBIN "gfx/intro/011.tilemap.lz"
 ; e6d6d
 
 UnknownDatae6d6d: ; e6d6d
 INCBIN "baserom.gbc", $e6d6d, $e6ded - $e6d6d
 
 IntroSuicuneJumpGFX: ; e6ded
-INCBIN "gfx/intro/suicune_jump.lz"
+INCBIN "gfx/intro/suicune_jump.2bpp.lz"
 ; e72ad
 
 IntroSuicuneBackGFX: ; e72ad
-INCBIN "gfx/intro/suicune_back.lz"
+INCBIN "gfx/intro/suicune_back.2bpp.lz"
 ; e764d
 
 IntroTilemap010: ; e764d
-INCBIN "gfx/intro/010.lz"
+INCBIN "gfx/intro/010.tilemap.lz"
 ; e76ad
 
 IntroTilemap009: ; e76ad
-INCBIN "gfx/intro/009.lz"
+INCBIN "gfx/intro/009.tilemap.lz"
 ; e76bd
 
 IntroTilemap014: ; e76bd
-INCBIN "gfx/intro/014.lz"
+INCBIN "gfx/intro/014.tilemap.lz"
 ; e778d
 
 IntroTilemap013: ; e778d
-INCBIN "gfx/intro/013.lz"
+INCBIN "gfx/intro/013.tilemap.lz"
 ; e77dd
 
 UnknownDatae77dd: ; e77dd
 INCBIN "baserom.gbc", $e77dd, $e785d - $e77dd
 
 IntroUnownBackGFX: ; e785d
-INCBIN "gfx/intro/unown_back.lz"
+INCBIN "gfx/intro/unown_back.2bpp.lz"
 ; e799d
 
 INCBIN "baserom.gbc", $e799d, $e7a5d - $e799d
@@ -96737,7 +96737,7 @@ Function108be0: ; 108be0 (42:4be0)
 INCBIN "baserom.gbc",$108bec,$109407 - $108bec
 
 IntroLogoGFX: ; 109407
-INCBIN "gfx/intro/logo.lz"
+INCBIN "gfx/intro/logo.2bpp.lz"
 ; 109847