diff --git a/engine/credits.asm b/engine/credits.asm
index 42144c5d2..a68f7ceb0 100644
--- a/engine/credits.asm
+++ b/engine/credits.asm
@@ -803,13 +803,13 @@ Function109c1c: ; 109c1c (42:5c1c)
 ; 109c24 (42:5c24)
 
 
-CreditsBorderGFX:    INCBIN "gfx/credits/border.2bpp"
+CreditsBorderGFX:    INCBIN "gfx/credits/border.w72.2bpp"
 
 CreditsMonsGFX:
-CreditsPichuGFX:     INCBIN "gfx/credits/pichu.2bpp"
-CreditsSmoochumGFX:  INCBIN "gfx/credits/smoochum.2bpp"
-CreditsDittoGFX:     INCBIN "gfx/credits/ditto.2bpp"
-CreditsIgglybuffGFX: INCBIN "gfx/credits/igglybuff.2bpp"
+CreditsPichuGFX:     INCBIN "gfx/credits/pichu.w32.2bpp"
+CreditsSmoochumGFX:  INCBIN "gfx/credits/smoochum.w32.2bpp"
+CreditsDittoGFX:     INCBIN "gfx/credits/ditto.w32.2bpp"
+CreditsIgglybuffGFX: INCBIN "gfx/credits/igglybuff.w32.2bpp"
 
 
 CreditsScript: ; 10acb4
diff --git a/gfx/credits/border.2bpp b/gfx/credits/border.w72.2bpp
similarity index 100%
rename from gfx/credits/border.2bpp
rename to gfx/credits/border.w72.2bpp
diff --git a/gfx/credits/ditto.2bpp b/gfx/credits/ditto.w32.2bpp
similarity index 100%
rename from gfx/credits/ditto.2bpp
rename to gfx/credits/ditto.w32.2bpp
diff --git a/gfx/credits/igglybuff.2bpp b/gfx/credits/igglybuff.w32.2bpp
similarity index 100%
rename from gfx/credits/igglybuff.2bpp
rename to gfx/credits/igglybuff.w32.2bpp
diff --git a/gfx/credits/pichu.2bpp b/gfx/credits/pichu.w32.2bpp
similarity index 100%
rename from gfx/credits/pichu.2bpp
rename to gfx/credits/pichu.w32.2bpp
diff --git a/gfx/credits/smoochum.2bpp b/gfx/credits/smoochum.w32.2bpp
similarity index 100%
rename from gfx/credits/smoochum.2bpp
rename to gfx/credits/smoochum.w32.2bpp
diff --git a/gfx/credits/theend.2bpp b/gfx/credits/theend.w64.2bpp
similarity index 100%
rename from gfx/credits/theend.2bpp
rename to gfx/credits/theend.w64.2bpp
diff --git a/gfx/misc/badges.2bpp b/gfx/misc/badges.w16.2bpp
similarity index 100%
rename from gfx/misc/badges.2bpp
rename to gfx/misc/badges.w16.2bpp
diff --git a/gfx/misc/dude.lz b/gfx/misc/dude.6x6.2bpp.lz
similarity index 100%
rename from gfx/misc/dude.lz
rename to gfx/misc/dude.6x6.2bpp.lz
diff --git a/gfx/misc/font.1bpp b/gfx/misc/font.w128.1bpp
similarity index 100%
rename from gfx/misc/font.1bpp
rename to gfx/misc/font.w128.1bpp
diff --git a/gfx/misc/font_inversed.1bpp b/gfx/misc/font_inversed.w128.1bpp
similarity index 100%
rename from gfx/misc/font_inversed.1bpp
rename to gfx/misc/font_inversed.w128.1bpp
diff --git a/gfx/misc/footprints.1bpp b/gfx/misc/footprints.w128.1bpp
similarity index 100%
rename from gfx/misc/footprints.1bpp
rename to gfx/misc/footprints.w128.1bpp
diff --git a/gfx/misc/gbc_only.lz b/gfx/misc/gbc_only.w112.2bpp.lz
similarity index 100%
rename from gfx/misc/gbc_only.lz
rename to gfx/misc/gbc_only.w112.2bpp.lz
diff --git a/gfx/misc/leaders.2bpp b/gfx/misc/leaders.w24.2bpp
similarity index 100%
rename from gfx/misc/leaders.2bpp
rename to gfx/misc/leaders.w24.2bpp
diff --git a/gfx/misc/pack.2bpp b/gfx/misc/pack.w40.2bpp
similarity index 100%
rename from gfx/misc/pack.2bpp
rename to gfx/misc/pack.w40.2bpp
diff --git a/gfx/misc/pack_f.2bpp b/gfx/misc/pack_f.w40.2bpp
similarity index 100%
rename from gfx/misc/pack_f.2bpp
rename to gfx/misc/pack_f.w40.2bpp
diff --git a/gfx/misc/player.lz b/gfx/misc/player.6x6.2bpp.lz
similarity index 100%
rename from gfx/misc/player.lz
rename to gfx/misc/player.6x6.2bpp.lz
diff --git a/gfx/misc/pokegear.lz b/gfx/misc/pokegear.2bpp.lz
similarity index 100%
rename from gfx/misc/pokegear.lz
rename to gfx/misc/pokegear.2bpp.lz
diff --git a/gfx/misc/pokegear_sprites.lz b/gfx/misc/pokegear_sprites.2bpp.lz
similarity index 100%
rename from gfx/misc/pokegear_sprites.lz
rename to gfx/misc/pokegear_sprites.2bpp.lz
diff --git a/gfx/misc/town_map.lz b/gfx/misc/town_map.2bpp.lz
similarity index 100%
rename from gfx/misc/town_map.lz
rename to gfx/misc/town_map.2bpp.lz
diff --git a/main.asm b/main.asm
index e60c53fe2..8f7f57105 100644
--- a/main.asm
+++ b/main.asm
@@ -16425,7 +16425,7 @@ PackMenuGFX:
 INCBIN "gfx/misc/pack_menu.2bpp"
 
 PackGFX:
-INCBIN "gfx/misc/pack.2bpp"
+INCBIN "gfx/misc/pack.w40.2bpp"
 
 Function113d6: ; 113d6
 	call Function114dd
@@ -34515,10 +34515,10 @@ Unknown_254c9: ; 254c9
 
 CardStatusGFX: INCBIN "gfx/misc/card_status.2bpp"
 
-LeaderGFX:  INCBIN "gfx/misc/leaders.2bpp"
-LeaderGFX2: INCBIN "gfx/misc/leaders.2bpp"
-BadgeGFX:   INCBIN "gfx/misc/badges.2bpp"
-BadgeGFX2:  INCBIN "gfx/misc/badges.2bpp"
+LeaderGFX:  INCBIN "gfx/misc/leaders.w24.2bpp"
+LeaderGFX2: INCBIN "gfx/misc/leaders.w24.2bpp"
+BadgeGFX:   INCBIN "gfx/misc/badges.w16.2bpp"
+BadgeGFX2:  INCBIN "gfx/misc/badges.w16.2bpp"
 
 CardRightCornerGFX: INCBIN "gfx/misc/card_right_corner.2bpp"
 
@@ -41629,11 +41629,11 @@ Function2ba01: ; 2ba01
 
 
 ChrisBackpic: ; 2ba1a
-INCBIN "gfx/misc/player.lz"
+INCBIN "gfx/misc/player.6x6.2bpp.lz"
 ; 2bbaa
 
 DudeBackpic: ; 2bbaa
-INCBIN "gfx/misc/dude.lz"
+INCBIN "gfx/misc/dude.6x6.2bpp.lz"
 ; 2bcea
 
 
@@ -51182,7 +51182,7 @@ PackFGFXPointers: ; 48e93
 ; 48e9b
 
 PackFGFX: ; 48e9b
-INCBIN "gfx/misc/pack_f.2bpp"
+INCBIN "gfx/misc/pack_f.w40.2bpp"
 ; 4925b
 
 Function4925b: ; 4925b
@@ -76413,7 +76413,7 @@ Function914bb: ; 914bb (24:54bb)
 INCBIN "baserom.gbc",$914ce,$914dd - $914ce
 
 PokegearSpritesGFX: ; 914dd
-INCBIN "gfx/misc/pokegear_sprites.lz"
+INCBIN "gfx/misc/pokegear_sprites.2bpp.lz"
 ; 91508
 
 INCBIN "baserom.gbc",$91508,$9163e - $91508
@@ -81535,7 +81535,7 @@ Functioncbce5: ; cbce5
 ; cbd2e
 
 TheEndGFX:: ; cbd2e
-INCBIN "gfx/credits/theend.2bpp"
+INCBIN "gfx/credits/theend.w64.2bpp"
 ; cbe2e
 
 
@@ -81710,7 +81710,7 @@ INCLUDE "gfx/pics/kanto_frames.asm"
 
 SECTION "bank36", ROMX, BANK[$36]
 
-FontInversed: INCBIN "gfx/misc/font_inversed.1bpp"
+FontInversed: INCBIN "gfx/misc/font_inversed.w128.1bpp"
 
 
 SECTION "Pic Animations 3", ROMX, BANK[$36]
@@ -87911,7 +87911,7 @@ FontExtra:
 INCBIN "gfx/misc/font_extra.2bpp"
 
 Font:
-INCBIN "gfx/misc/font.1bpp"
+INCBIN "gfx/misc/font.w128.1bpp"
 
 FontBattleExtra:
 INCBIN "gfx/misc/font_battle_extra.2bpp"
@@ -87954,7 +87954,7 @@ INCBIN "baserom.gbc", $f8b10, $f8ba0 - $f8b10
 ; f8ba0
 
 TownMapGFX: ; f8ba0
-INCBIN "gfx/misc/town_map.lz"
+INCBIN "gfx/misc/town_map.2bpp.lz"
 ; f8ea4
 
 GFX_f8ea4: ; f8ea4
@@ -87986,7 +87986,7 @@ INCBIN "baserom.gbc", $f9424, $f9434 - $f9424
 ; f9434
 
 Footprints: ; f9434
-INCBIN "gfx/misc/footprints.1bpp"
+INCBIN "gfx/misc/footprints.w128.1bpp"
 ; fb434
 
 INCBIN "baserom.gbc", $fb434, $fb449 - $fb434
@@ -107093,7 +107093,7 @@ Function1de2c5: ; 1de2c5
 ; 1de2e4
 
 PokegearGFX: ; 1de2e4
-INCBIN "gfx/misc/pokegear.lz"
+INCBIN "gfx/misc/pokegear.2bpp.lz"
 ; 1de5c7
 
 INCBIN "baserom.gbc",$1de5c7,$1de5c8 - $1de5c7
diff --git a/misc/gbc_only.asm b/misc/gbc_only.asm
index dfe9e2fb6..d642d6c24 100644
--- a/misc/gbc_only.asm
+++ b/misc/gbc_only.asm
@@ -137,14 +137,14 @@ DrawGBCOnlyGraphic: ; 4eb27
 
 
 GBCOnlyString: ; 4eb38
-	db "This Game Pak is", $4e
-	db "designed only for", $4e
-	db "use on the", $4e
-	db "Game Boy Color.@"
+	db   "This Game Pak is"
+	next "designed only for"
+	next "use on the"
+	next "Game Boy Color.@"
 ; 4eb76
 
 
 GBCOnlyGFX: ; 4eb76
-INCBIN "gfx/misc/gbc_only.lz"
+INCBIN "gfx/misc/gbc_only.w112.2bpp.lz"
 ; 4f0bc