262 files changed, 262 insertions, 262 deletions

diff --git a/gfx.asm b/gfx.asm
index 72d54ba..9139d06 100644
--- a/gfx.asm
+++ b/gfx.asm
@@ -2,16 +2,16 @@ INCLUDE "macros.asm"
 
 SECTION "bank1D",ROMX,BANK[$1D]
 Fonts:: ; 74000 (1d:4000)
-INCBIN "gfx/fonts.t3.1bpp"
+INCBIN "gfx/fonts.1bpp"
 
 VWF:: ; 76668 (1d:6668)
 INCBIN "gfx/vwf.1bpp"
 
 DuelGraphics:: ; 76968 (1d:6968)
-INCBIN "gfx/duel/duel1.t5.2bpp",$0,$1698
+INCBIN "gfx/duel/duel1.2bpp",$0,$1698
 
 SECTION "bank1E",ROMX,BANK[$1E]
-INCBIN "gfx/duel/duel1.t5.2bpp",$1698,$318
+INCBIN "gfx/duel/duel1.2bpp",$1698,$318
 INCBIN "gfx/duel/duel2.2bpp"
 
 rept $2b68
@@ -26,7 +26,7 @@ INCBIN "baserom.gbc",$84000,$87828 - $84000
 
 IshiharaTilesetGfx: ; 87828 (21:7828)
 	dw $4d
-	INCBIN "gfx/tilesets/ishihara.t3.2bpp"
+	INCBIN "gfx/tilesets/ishihara.2bpp"
 
 SolidTiles1: ; 87cfa (21:7cfa)
 	dw $4
@@ -53,35 +53,35 @@ INCBIN "baserom.gbc",$87ff4,$88000 - $87ff4
 SECTION "bank22",ROMX,BANK[$22]
 OverworldMapTiles: ; 88000 (22:4000)
 	dw $c1
-	INCBIN "gfx/overworld_map.t15.2bpp"
+	INCBIN "gfx/overworld_map.2bpp"
 
 MasonLaboratoryTilesetGfx: ; 88c12 (22:4c12)
 	dw $97
-	INCBIN "gfx/tilesets/masonlaboratory.t9.2bpp"
+	INCBIN "gfx/tilesets/masonlaboratory.2bpp"
 
 ClubEntranceTilesetGfx: ; 89584 (22:5584)
 	dw $81
-	INCBIN "gfx/tilesets/clubentrance.t15.2bpp"
+	INCBIN "gfx/tilesets/clubentrance.2bpp"
 
 ClubLobbyTilesetGfx: ; 89d96 (22:5d96)
 	dw $78
-	INCBIN "gfx/tilesets/clublobby.t8.2bpp"
+	INCBIN "gfx/tilesets/clublobby.2bpp"
 
 FightingClubTilesetGfx: ; 8a518 (22:6518)
 	dw $63
-	INCBIN "gfx/tilesets/fightingclub.t13.2bpp"
+	INCBIN "gfx/tilesets/fightingclub.2bpp"
 
 RockClubTilesetGfx: ; 8ab4a (22:6b4a)
 	dw $3c
-	INCBIN "gfx/tilesets/rockclub.t4.2bpp"
+	INCBIN "gfx/tilesets/rockclub.2bpp"
 
 WaterClubTilesetGfx: ; 8af0c (22:6f0c)
 	dw $a1
-	INCBIN "gfx/tilesets/waterclub.t15.2bpp"
+	INCBIN "gfx/tilesets/waterclub.2bpp"
 
 GrassClubTilesetGfx: ; 8b91e (22:791e)
 	dw $57
-	INCBIN "gfx/tilesets/grassclub.t9.2bpp"
+	INCBIN "gfx/tilesets/grassclub.2bpp"
 
 OWSpritePlayer: ; 8be90 (22:7e90)
 	dw $14
@@ -96,35 +96,35 @@ INCBIN "baserom.gbc",$8bfe4,$8C000 - $8bfe4
 SECTION "bank23",ROMX,BANK[$23]
 LightningClubTilesetGfx: ; 8c000 (23:4000)
 	dw $83
-	INCBIN "gfx/tilesets/lightningclub.t13.2bpp"
+	INCBIN "gfx/tilesets/lightningclub.2bpp"
 
 PsychicClubTilesetGfx: ; 8c832 (23:4832)
 	dw $3a
-	INCBIN "gfx/tilesets/psychicclub.t6.2bpp"
+	INCBIN "gfx/tilesets/psychicclub.2bpp"
 
 ScienceClubTilesetGfx: ; 8cbd4 (23:4bd4)
 	dw $52
-	INCBIN "gfx/tilesets/scienceclub.t14.2bpp"
+	INCBIN "gfx/tilesets/scienceclub.2bpp"
 
 FireClubTilesetGfx: ; 8d0f6 (23:50f6)
 	dw $57
-	INCBIN "gfx/tilesets/fireclub.t9.2bpp"
+	INCBIN "gfx/tilesets/fireclub.2bpp"
 
 ChallengeHallTilesetGfx: ; 8d668 (23:5668)
 	dw $9d
-	INCBIN "gfx/tilesets/challengehall.t3.2bpp"
+	INCBIN "gfx/tilesets/challengehall.2bpp"
 
 PokemonDomeEntranceTilesetGfx: ; 8e03a (23:603a)
 	dw $4e
-	INCBIN "gfx/tilesets/pokemondomeentrance.t2.2bpp"
+	INCBIN "gfx/tilesets/pokemondomeentrance.2bpp"
 
 PokemonDomeTilesetGfx: ; 8e51c (23:651c)
 	dw $cf
-	INCBIN "gfx/tilesets/pokemondome.t1.2bpp"
+	INCBIN "gfx/tilesets/pokemondome.2bpp"
 
 HallOfHonorTilesetGfx: ; 8f20e (23:720e)
 	dw $79
-	INCBIN "gfx/tilesets/hallofhonor.t7.2bpp"
+	INCBIN "gfx/tilesets/hallofhonor.2bpp"
 
 MedalGfx: ; 8f9a0 (23:79a0)
 	dw $48
@@ -160,15 +160,15 @@ INCBIN "baserom.gbc",$8ffe6,$90000 - $8ffe6
 SECTION "bank24",ROMX,BANK[$24]
 CardPop1Gfx: ; 90000 (24:4000)
 	dw $bd
-	INCBIN "gfx/cardpop1.t3.2bpp"
+	INCBIN "gfx/cardpop1.2bpp"
 
 CardPop2Gfx: ; 90bd2 (24:4bd2)
 	dw $6d
-	INCBIN "gfx/cardpop2.t3.2bpp"
+	INCBIN "gfx/cardpop2.2bpp"
 
 CardPop3Gfx: ; 912a4 (24:52a4)
 	dw $5d
-	INCBIN "gfx/cardpop3.t3.2bpp"
+	INCBIN "gfx/cardpop3.2bpp"
 
 Colosseum1Gfx: ; 91876 (24:5876)
 	dw $60
@@ -176,7 +176,7 @@ Colosseum1Gfx: ; 91876 (24:5876)
 
 Colosseum2Gfx: ; 91e78 (24:5e78)
 	dw $56
-	INCBIN "gfx/boosterpacks/colosseum2.t10.2bpp"
+	INCBIN "gfx/boosterpacks/colosseum2.2bpp"
 
 Evolution1Gfx: ; 923da (24:63da)
 	dw $60
@@ -184,7 +184,7 @@ Evolution1Gfx: ; 923da (24:63da)
 
 Evolution2Gfx: ; 929dc (24:69dc)
 	dw $56
-	INCBIN "gfx/boosterpacks/evolution2.t10.2bpp"
+	INCBIN "gfx/boosterpacks/evolution2.2bpp"
 
 Mystery1Gfx: ; 92f3e (24:6f3e)
 	dw $60
@@ -192,7 +192,7 @@ Mystery1Gfx: ; 92f3e (24:6f3e)
 
 Mystery2Gfx: ; 93540 (24:7540)
 	dw $56
-	INCBIN "gfx/boosterpacks/mystery2.t10.2bpp"
+	INCBIN "gfx/boosterpacks/mystery2.2bpp"
 
 RonaldGfx: ; 93aa2 (24:7aa2)
 	dw $24
@@ -225,7 +225,7 @@ Laboratory1Gfx: ; 94000 (25:4000)
 
 Laboratory2Gfx: ; 94602 (25:4602)
 	dw $56
-	INCBIN "gfx/boosterpacks/laboratory2.t10.2bpp"
+	INCBIN "gfx/boosterpacks/laboratory2.2bpp"
 
 CharizardIntro1Gfx: ; 94b64 (25:4b64)
 	dw $60
@@ -253,11 +253,11 @@ AerodactylIntro2Gfx: ; 9696e (25:696e)
 
 Titlescreen1Gfx: ; 96f70 (25:6f70)
 	dw $61
-	INCBIN "gfx/titlescreen/titlescreen1.t15.2bpp"
+	INCBIN "gfx/titlescreen/titlescreen1.2bpp"
 
 Titlescreen2Gfx: ; 97582 (25:7582)
 	dw $61
-	INCBIN "gfx/titlescreen/titlescreen2.t15.2bpp"
+	INCBIN "gfx/titlescreen/titlescreen2.2bpp"
 
 CompaniesGfx: ; 97b94 (25:7b94)
 	dw $31
@@ -272,19 +272,19 @@ INCBIN "baserom.gbc",$97fe8,$98000 - $97fe8
 SECTION "bank26",ROMX,BANK[$26]
 Titlescreen3Gfx: ; 98000 (26:4000)
 	dw $f4
-	INCBIN "gfx/titlescreen/titlescreen3.t12.2bpp"
+	INCBIN "gfx/titlescreen/titlescreen3.2bpp"
 
 Titlescreen4Gfx: ; 98f42 (26:4f42)
 	dw $13b
-	INCBIN "gfx/titlescreen/titlescreen4.t5.2bpp"
+	INCBIN "gfx/titlescreen/titlescreen4.2bpp"
 
 Titlescreen5Gfx: ; 9a2f4 (26:62f4)
 	dw $dc
-	INCBIN "gfx/titlescreen/titlescreen5.t4.2bpp"
+	INCBIN "gfx/titlescreen/titlescreen5.2bpp"
 
 Titlescreen6Gfx: ; 9b0b6 (26:70b6)
 	dw $d4
-	INCBIN "gfx/titlescreen/titlescreen6.t12.2bpp"
+	INCBIN "gfx/titlescreen/titlescreen6.2bpp"
 
 DoctorMasonOWGfx: ; 9bdf8 (26:7df8)
 	dw $14
@@ -824,7 +824,7 @@ Duel50Gfx: ; a81f8 (2a:41f8)
 
 Duel51Gfx: ; a836a (2a:436a)
 	dw $36
-	INCBIN "gfx/duel/51.t10.2bpp"
+	INCBIN "gfx/duel/51.2bpp"
 
 Duel52Gfx: ; a86cc (2a:46cc)
 	dw $0b
@@ -896,147 +896,147 @@ SECTION "bank30",ROMX,BANK[$30]
 
 SECTION "bank31",ROMX,BANK[$31]
 GrassEnergyCardGfx:: ; c4000 (31:4000)
-	INCBIN "gfx/cards/grassenergy.8x6.2bpp"
+	INCBIN "gfx/cards/grassenergy.2bpp"
 	RGB 21, 31, 12
 	RGB 0, 26, 0
 	RGB 0, 12, 0
 	RGB 0, 4, 0
 
 FireEnergyCardGfx: ; c4308 (31:4308)
-	INCBIN "gfx/cards/fireenergy.8x6.2bpp"
+	INCBIN "gfx/cards/fireenergy.2bpp"
 	RGB 31, 26, 31
 	RGB 31, 8, 12
 	RGB 26, 0, 0
 	RGB 4, 0, 0
 
 WaterEnergyCardGfx: ; c4610 (31:4610)
-	INCBIN "gfx/cards/waterenergy.8x6.2bpp"
+	INCBIN "gfx/cards/waterenergy.2bpp"
 	RGB 26, 31, 31
 	RGB 0, 21, 31
 	RGB 0, 12, 21
 	RGB 0, 0, 8
 
 LightningEnergyCardGfx: ; c4918 (31:4918)
-	INCBIN "gfx/cards/lightningenergy.8x6.2bpp"
+	INCBIN "gfx/cards/lightningenergy.2bpp"
 	RGB 31, 31, 26
 	RGB 31, 26, 0
 	RGB 21, 16, 0
 	RGB 4, 4, 0
 
 FightingEnergyCardGfx: ; c4c20 (31:4c20)
-	INCBIN "gfx/cards/fightingenergy.8x6.2bpp"
+	INCBIN "gfx/cards/fightingenergy.2bpp"
 	RGB 31, 31, 26
 	RGB 31, 8, 0
 	RGB 21, 0, 0
 	RGB 4, 0, 0
 
 PsychicEnergyCardGfx: ; c4f28 (31:4f28)
-	INCBIN "gfx/cards/psychicenergy.8x6.2bpp"
+	INCBIN "gfx/cards/psychicenergy.2bpp"
 	RGB 31, 26, 31
 	RGB 26, 12, 26
 	RGB 16, 4, 16
 	RGB 4, 0, 8
 
 DoubleColorlessEnergyCardGfx: ; c5230 (31:5230)
-	INCBIN "gfx/cards/doublecolorlessenergy.8x6.2bpp"
+	INCBIN "gfx/cards/doublecolorlessenergy.2bpp"
 	RGB 31, 31, 31
 	RGB 21, 21, 16
 	RGB 12, 12, 8
 	RGB 4, 4, 0
 
 BulbasaurCardGfx: ; c5538 (31:5538)
-	INCBIN "gfx/cards/bulbasaur.8x6.2bpp"
+	INCBIN "gfx/cards/bulbasaur.2bpp"
 	RGB 26, 31, 26
 	RGB 12, 26, 21
 	RGB 0, 16, 4
 	RGB 0, 4, 4
 
 IvysaurCardGfx: ; c5840 (31:5840)
-	INCBIN "gfx/cards/ivysaur.8x6.2bpp"
+	INCBIN "gfx/cards/ivysaur.2bpp"
 	RGB 26, 31, 26
 	RGB 16, 26, 16
 	RGB 0, 16, 4
 	RGB 0, 4, 4
 
 Venusaur1CardGfx: ; c5b48 (31:5b48)
-	INCBIN "gfx/cards/venusaur1.8x6.2bpp"
+	INCBIN "gfx/cards/venusaur1.2bpp"
 	RGB 31, 26, 26
 	RGB 26, 4, 8
 	RGB 4, 12, 12
 	RGB 0, 0, 8
 
 Venusaur2CardGfx: ; c5e50 (31:5e50)
-	INCBIN "gfx/cards/venusaur2.8x6.2bpp"
+	INCBIN "gfx/cards/venusaur2.2bpp"
 	RGB 21, 31, 21
 	RGB 8, 21, 12
 	RGB 0, 8, 8
 	RGB 0, 0, 8
 
 CaterpieCardGfx: ; c6158 (31:6158)
-	INCBIN "gfx/cards/caterpie.8x6.2bpp"
+	INCBIN "gfx/cards/caterpie.2bpp"
 	RGB 31, 31, 16
 	RGB 8, 26, 4
 	RGB 0, 16, 0
 	RGB 0, 4, 0
 
 MetapodCardGfx: ; c6460 (31:6460)
-	INCBIN "gfx/cards/metapod.8x6.2bpp"
+	INCBIN "gfx/cards/metapod.2bpp"
 	RGB 31, 31, 21
 	RGB 8, 26, 0
 	RGB 4, 16, 0
 	RGB 0, 4, 0
 
 ButterfreeCardGfx: ; c6768 (31:6768)
-	INCBIN "gfx/cards/butterfree.8x6.2bpp"
+	INCBIN "gfx/cards/butterfree.2bpp"
 	RGB 31, 31, 31
 	RGB 16, 16, 26
 	RGB 16, 8, 12
 	RGB 0, 0, 0
 
 WeedleCardGfx: ; c6a70 (31:6a70)
-	INCBIN "gfx/cards/weedle.8x6.2bpp"
+	INCBIN "gfx/cards/weedle.2bpp"
 	RGB 31, 31, 26
 	RGB 31, 26, 0
 	RGB 31, 8, 12
 	RGB 4, 0, 4
 
 KakunaCardGfx: ; c6d78 (31:6d78)
-	INCBIN "gfx/cards/kakuna.8x6.2bpp"
+	INCBIN "gfx/cards/kakuna.2bpp"
 	RGB 31, 31, 26
 	RGB 31, 21, 0
 	RGB 12, 12, 0
 	RGB 0, 4, 0
 
 BeedrillCardGfx: ; c7080 (31:7080)
-	INCBIN "gfx/cards/beedrill.8x6.2bpp"
+	INCBIN "gfx/cards/beedrill.2bpp"
 	RGB 31, 31, 26
 	RGB 31, 26, 4
 	RGB 8, 16, 0
 	RGB 0, 4, 0
 
 EkansCardGfx: ; c7388 (31:7388)
-	INCBIN "gfx/cards/ekans.8x6.2bpp"
+	INCBIN "gfx/cards/ekans.2bpp"
 	RGB 31, 31, 26
 	RGB 31, 16, 8
 	RGB 16, 0, 21
 	RGB 0, 0, 0
 
 ArbokCardGfx: ; c7690 (31:7690)
-	INCBIN "gfx/cards/arbok.8x6.2bpp"
+	INCBIN "gfx/cards/arbok.2bpp"
 	RGB 31, 26, 31
 	RGB 31, 8, 8
 	RGB 16, 0, 21
 	RGB 0, 0, 0
 
 NidoranFCardGfx: ; c7998 (31:7998)
-	INCBIN "gfx/cards/nidoranf.8x6.2bpp"
+	INCBIN "gfx/cards/nidoranf.2bpp"
 	RGB 31, 31, 31
 	RGB 12, 26, 16
 	RGB 0, 12, 8
 	RGB 0, 0, 4
 
 NidorinaCardGfx: ; c7ca0 (31:7ca0)
-	INCBIN "gfx/cards/nidorina.8x6.2bpp"
+	INCBIN "gfx/cards/nidorina.2bpp"
 	RGB 31, 31, 31
 	RGB 16, 26, 16
 	RGB 0, 12, 8
@@ -1044,147 +1044,147 @@ NidorinaCardGfx: ; c7ca0 (31:7ca0)
 
 SECTION "bank32",ROMX,BANK[$32]
 NidoqueenCardGfx: ; c8000 (32:4000)
-	INCBIN "gfx/cards/nidoqueen.8x6.2bpp"
+	INCBIN "gfx/cards/nidoqueen.2bpp"
 	RGB 31, 31, 31
 	RGB 12, 21, 16
 	RGB 0, 12, 8
 	RGB 0, 0, 4
 
 NidoranMCardGfx: ; c8308 (32:4308)
-	INCBIN "gfx/cards/nidoranm.8x6.2bpp"
+	INCBIN "gfx/cards/nidoranm.2bpp"
 	RGB 31, 26, 26
 	RGB 26, 12, 21
 	RGB 16, 4, 12
 	RGB 4, 0, 8
 
 NidorinoCardGfx: ; c8610 (32:4610)
-	INCBIN "gfx/cards/nidorino.8x6.2bpp"
+	INCBIN "gfx/cards/nidorino.2bpp"
 	RGB 31, 26, 26
 	RGB 31, 16, 21
 	RGB 26, 8, 16
 	RGB 4, 0, 8
 
 NidokingCardGfx: ; c8918 (32:4918)
-	INCBIN "gfx/cards/nidoking.8x6.2bpp"
+	INCBIN "gfx/cards/nidoking.2bpp"
 	RGB 31, 31, 31
 	RGB 31, 12, 26
 	RGB 12, 8, 21
 	RGB 4, 0, 8
 
 ZubatCardGfx: ; c8c20 (32:4c20)
-	INCBIN "gfx/cards/zubat.8x6.2bpp"
+	INCBIN "gfx/cards/zubat.2bpp"
 	RGB 31, 31, 16
 	RGB 26, 16, 21
 	RGB 21, 4, 16
 	RGB 0, 0, 4
 
 GolbatCardGfx: ; c8f28 (32:4f28)
-	INCBIN "gfx/cards/golbat.8x6.2bpp"
+	INCBIN "gfx/cards/golbat.2bpp"
 	RGB 26, 26, 31
 	RGB 12, 16, 26
 	RGB 0, 8, 21
 	RGB 0, 0, 4
 
 OddishCardGfx: ; c9230 (32:5230)
-	INCBIN "gfx/cards/oddish.8x6.2bpp"
+	INCBIN "gfx/cards/oddish.2bpp"
 	RGB 31, 31, 31
 	RGB 12, 26, 4
 	RGB 4, 8, 21
 	RGB 0, 0, 4
 
 GloomCardGfx: ; c9538 (32:5538)
-	INCBIN "gfx/cards/gloom.8x6.2bpp"
+	INCBIN "gfx/cards/gloom.2bpp"
 	RGB 31, 31, 26
 	RGB 31, 8, 0
 	RGB 16, 8, 26
 	RGB 0, 0, 4
 
 VileplumeCardGfx: ; c9840 (32:5840)
-	INCBIN "gfx/cards/vileplume.8x6.2bpp"
+	INCBIN "gfx/cards/vileplume.2bpp"
 	RGB 31, 31, 31
 	RGB 31, 0, 4
 	RGB 4, 12, 26
 	RGB 0, 0, 4
 
 ParasCardGfx: ; c9b48 (32:5b48)
-	INCBIN "gfx/cards/paras.8x6.2bpp"
+	INCBIN "gfx/cards/paras.2bpp"
 	RGB 31, 31, 31
 	RGB 31, 12, 4
 	RGB 31, 0, 4
 	RGB 4, 0, 4
 
 ParasectCardGfx: ; c9e50 (32:5e50)
-	INCBIN "gfx/cards/parasect.8x6.2bpp"
+	INCBIN "gfx/cards/parasect.2bpp"
 	RGB 31, 26, 26
 	RGB 31, 12, 8
 	RGB 31, 0, 4
 	RGB 8, 0, 0
 
 VenonatCardGfx: ; ca158 (32:6158)
-	INCBIN "gfx/cards/venonat.8x6.2bpp"
+	INCBIN "gfx/cards/venonat.2bpp"
 	RGB 26, 26, 31
 	RGB 31, 0, 4
 	RGB 16, 0, 21
 	RGB 4, 0, 4
 
 VenomothCardGfx: ; ca460 (32:6460)
-	INCBIN "gfx/cards/venomoth.8x6.2bpp"
+	INCBIN "gfx/cards/venomoth.2bpp"
 	RGB 31, 26, 31
 	RGB 26, 8, 21
 	RGB 21, 0, 12
 	RGB 4, 0, 4
 
 BellsproutCardGfx: ; ca768 (32:6768)
-	INCBIN "gfx/cards/bellsprout.8x6.2bpp"
+	INCBIN "gfx/cards/bellsprout.2bpp"
 	RGB 26, 31, 21
 	RGB 31, 26, 0
 	RGB 8, 21, 0
 	RGB 0, 4, 0
 
 WeepinbellCardGfx: ; caa70 (32:6a70)
-	INCBIN "gfx/cards/weepinbell.8x6.2bpp"
+	INCBIN "gfx/cards/weepinbell.2bpp"
 	RGB 31, 31, 16
 	RGB 31, 21, 0
 	RGB 26, 8, 4
 	RGB 4, 8, 0
 
 VictreebelCardGfx: ; cad78 (32:6d78)
-	INCBIN "gfx/cards/victreebel.8x6.2bpp"
+	INCBIN "gfx/cards/victreebel.2bpp"
 	RGB 26, 31, 21
 	RGB 31, 4, 0
 	RGB 0, 21, 0
 	RGB 0, 4, 0
 
 GrimerCardGfx: ; cb080 (32:7080)
-	INCBIN "gfx/cards/grimer.8x6.2bpp"
+	INCBIN "gfx/cards/grimer.2bpp"
 	RGB 31, 21, 31
 	RGB 16, 4, 26
 	RGB 26, 4, 12
 	RGB 0, 0, 0
 
 MukCardGfx: ; cb388 (32:7388)
-	INCBIN "gfx/cards/muk.8x6.2bpp"
+	INCBIN "gfx/cards/muk.2bpp"
 	RGB 31, 26, 31
 	RGB 16, 12, 26
 	RGB 16, 4, 12
 	RGB 0, 0, 4
 
 ExeggcuteCardGfx: ; cb690 (32:7690)
-	INCBIN "gfx/cards/exeggcute.8x6.2bpp"
+	INCBIN "gfx/cards/exeggcute.2bpp"
 	RGB 31, 26, 31
 	RGB 31, 12, 21
 	RGB 16, 0, 8
 	RGB 8, 0, 8
 
 ExeggutorCardGfx: ; cb998 (32:7998)
-	INCBIN "gfx/cards/exeggutor.8x6.2bpp"
+	INCBIN "gfx/cards/exeggutor.2bpp"
 	RGB 31, 31, 16
 	RGB 31, 16, 0
 	RGB 21, 8, 4
 	RGB 4, 0, 0
 
 KoffingCardGfx: ; cbca0 (32:7ca0)
-	INCBIN "gfx/cards/koffing.8x6.2bpp"
+	INCBIN "gfx/cards/koffing.2bpp"
 	RGB 31, 31, 12
 	RGB 26, 12, 21
 	RGB 16, 0, 16
@@ -1192,147 +1192,147 @@ KoffingCardGfx: ; cbca0 (32:7ca0)
 
 SECTION "bank33",ROMX,BANK[$33]
 WeezingCardGfx: ; cc000 (33:4000)
-	INCBIN "gfx/cards/weezing.8x6.2bpp"
+	INCBIN "gfx/cards/weezing.2bpp"
 	RGB 31, 31, 0
 	RGB 12, 26, 12
 	RGB 21, 4, 16
 	RGB 8, 0, 8
 
 Tangela1CardGfx: ; cc308 (33:4308)
-	INCBIN "gfx/cards/tangela1.8x6.2bpp"
+	INCBIN "gfx/cards/tangela1.2bpp"
 	RGB 31, 31, 31
 	RGB 8, 26, 12
 	RGB 8, 8, 21
 	RGB 4, 0, 0
 
 Tangela2CardGfx: ; cc610 (33:4610)
-	INCBIN "gfx/cards/tangela2.8x6.2bpp"
+	INCBIN "gfx/cards/tangela2.2bpp"
 	RGB 26, 26, 26
 	RGB 8, 16, 4
 	RGB 0, 8, 21
 	RGB 0, 0, 8
 
 ScytherCardGfx: ; cc918 (33:4918)
-	INCBIN "gfx/cards/scyther.8x6.2bpp"
+	INCBIN "gfx/cards/scyther.2bpp"
 	RGB 31, 31, 26
 	RGB 4, 31, 8
 	RGB 0, 16, 0
 	RGB 0, 0, 0
 
 PinsirCardGfx: ; ccc20 (33:4c20)
-	INCBIN "gfx/cards/pinsir.8x6.2bpp"
+	INCBIN "gfx/cards/pinsir.2bpp"
 	RGB 31, 31, 16
 	RGB 21, 12, 8
 	RGB 8, 4, 0
 	RGB 0, 0, 0
 
 CharmanderCardGfx: ; ccf28 (33:4f28)
-	INCBIN "gfx/cards/charmander.8x6.2bpp"
+	INCBIN "gfx/cards/charmander.2bpp"
 	RGB 31, 31, 21
 	RGB 31, 21, 8
 	RGB 26, 8, 0
 	RGB 4, 0, 0
 
 CharmeleonCardGfx: ; cd230 (33:5230)
-	INCBIN "gfx/cards/charmeleon.8x6.2bpp"
+	INCBIN "gfx/cards/charmeleon.2bpp"
 	RGB 26, 31, 21
 	RGB 31, 21, 4
 	RGB 31, 0, 4
 	RGB 4, 0, 0
 
 CharizardCardGfx: ; cd538 (33:5538)
-	INCBIN "gfx/cards/charizard.8x6.2bpp"
+	INCBIN "gfx/cards/charizard.2bpp"
 	RGB 31, 26, 21
 	RGB 31, 16, 8
 	RGB 26, 4, 0
 	RGB 4, 0, 0
 
 VulpixCardGfx: ; cd840 (33:5840)
-	INCBIN "gfx/cards/vulpix.8x6.2bpp"
+	INCBIN "gfx/cards/vulpix.2bpp"
 	RGB 31, 31, 16
 	RGB 31, 12, 4
 	RGB 26, 4, 0
 	RGB 4, 0, 0
 
 Ninetails1CardGfx: ; cdb48 (33:5b48)
-	INCBIN "gfx/cards/ninetails1.8x6.2bpp"
+	INCBIN "gfx/cards/ninetails1.2bpp"
 	RGB 31, 31, 16
 	RGB 31, 26, 0
 	RGB 21, 16, 4
 	RGB 0, 4, 0
 
 Ninetails2CardGfx: ; cde50 (33:5e50)
-	INCBIN "gfx/cards/ninetails2.8x6.2bpp"
+	INCBIN "gfx/cards/ninetails2.2bpp"
 	RGB 31, 26, 26
 	RGB 31, 16, 0
 	RGB 26, 0, 4
 	RGB 4, 0, 0
 
 GrowlitheCardGfx: ; ce158 (33:6158)
-	INCBIN "gfx/cards/growlithe.8x6.2bpp"
+	INCBIN "gfx/cards/growlithe.2bpp"
 	RGB 31, 31, 16
 	RGB 31, 12, 4
 	RGB 21, 8, 4
 	RGB 4, 0, 0
 
 Arcanine1CardGfx: ; ce460 (33:6460)
-	INCBIN "gfx/cards/arcanine1.8x6.2bpp"
+	INCBIN "gfx/cards/arcanine1.2bpp"
 	RGB 31, 31, 16
 	RGB 31, 16, 0
 	RGB 26, 0, 0
 	RGB 8, 0, 0
 
 Arcanine2CardGfx: ; ce768 (33:6768)
-	INCBIN "gfx/cards/arcanine2.8x6.2bpp"
+	INCBIN "gfx/cards/arcanine2.2bpp"
 	RGB 31, 31, 16
 	RGB 31, 12, 0
 	RGB 21, 8, 0
 	RGB 4, 0, 0
 
 PonytaCardGfx: ; cea70 (33:6a70)
-	INCBIN "gfx/cards/ponyta.8x6.2bpp"
+	INCBIN "gfx/cards/ponyta.2bpp"
 	RGB 31, 31, 31
 	RGB 31, 26, 12
 	RGB 31, 4, 0
 	RGB 4, 0, 0
 
 RapidashCardGfx: ; ced78 (33:6d78)
-	INCBIN "gfx/cards/rapidash.8x6.2bpp"
+	INCBIN "gfx/cards/rapidash.2bpp"
 	RGB 31, 31, 16
 	RGB 31, 16, 0
 	RGB 26, 4, 0
 	RGB 8, 0, 0
 
 Magmar1CardGfx: ; cf080 (33:7080)
-	INCBIN "gfx/cards/magmar1.8x6.2bpp"
+	INCBIN "gfx/cards/magmar1.2bpp"
 	RGB 31, 31, 21
 	RGB 31, 21, 0
 	RGB 31, 4, 4
 	RGB 0, 0, 0
 
 Magmar2CardGfx: ; cf388 (33:7388)
-	INCBIN "gfx/cards/magmar2.8x6.2bpp"
+	INCBIN "gfx/cards/magmar2.2bpp"
 	RGB 31, 21, 0
 	RGB 31, 4, 0
 	RGB 8, 4, 0
 	RGB 0, 0, 0
 
 Flareon1CardGfx: ; cf690 (33:7690)
-	INCBIN "gfx/cards/flareon1.8x6.2bpp"
+	INCBIN "gfx/cards/flareon1.2bpp"
 	RGB 31, 31, 26
 	RGB 31, 21, 0
 	RGB 31, 4, 0
 	RGB 0, 0, 0
 
 Flareon2CardGfx: ; cf998 (33:7998)
-	INCBIN "gfx/cards/flareon2.8x6.2bpp"
+	INCBIN "gfx/cards/flareon2.2bpp"
 	RGB 31, 26, 4
 	RGB 31, 12, 4
 	RGB 26, 0, 4
 	RGB 0, 0, 8
 
 Moltres1CardGfx: ; cfca0 (33:7ca0)
-	INCBIN "gfx/cards/moltres1.8x6.2bpp"
+	INCBIN "gfx/cards/moltres1.2bpp"
 	RGB 31, 21, 8
 	RGB 31, 8, 0
 	RGB 16, 0, 0
@@ -1340,147 +1340,147 @@ Moltres1CardGfx: ; cfca0 (33:7ca0)
 
 SECTION "bank34",ROMX,BANK[$34]
 Moltres2CardGfx: ; d0000 (34:4000)
-	INCBIN "gfx/cards/moltres2.8x6.2bpp"
+	INCBIN "gfx/cards/moltres2.2bpp"
 	RGB 31, 31, 31
 	RGB 31, 21, 0
 	RGB 31, 4, 4
 	RGB 0, 0, 0
 
 SquirtleCardGfx: ; d0308 (34:4308)
-	INCBIN "gfx/cards/squirtle.8x6.2bpp"
+	INCBIN "gfx/cards/squirtle.2bpp"
 	RGB 26, 31, 26
 	RGB 12, 26, 16
 	RGB 0, 12, 4
 	RGB 0, 4, 4
 
 WartortleCardGfx: ; d0610 (34:4610)
-	INCBIN "gfx/cards/wartortle.8x6.2bpp"
+	INCBIN "gfx/cards/wartortle.2bpp"
 	RGB 31, 31, 31
 	RGB 16, 16, 26
 	RGB 8, 8, 16
 	RGB 0, 0, 4
 
 BlastoiseCardGfx: ; d0918 (34:4918)
-	INCBIN "gfx/cards/blastoise.8x6.2bpp"
+	INCBIN "gfx/cards/blastoise.2bpp"
 	RGB 26, 31, 31
 	RGB 0, 16, 31
 	RGB 0, 21, 8
 	RGB 0, 4, 4
 
 PsyduckCardGfx: ; d0c20 (34:4c20)
-	INCBIN "gfx/cards/psyduck.8x6.2bpp"
+	INCBIN "gfx/cards/psyduck.2bpp"
 	RGB 31, 31, 8
 	RGB 26, 16, 0
 	RGB 12, 8, 4
 	RGB 0, 0, 4
 
 GolduckCardGfx: ; d0f28 (34:4f28)
-	INCBIN "gfx/cards/golduck.8x6.2bpp"
+	INCBIN "gfx/cards/golduck.2bpp"
 	RGB 31, 31, 31
 	RGB 12, 21, 26
 	RGB 4, 8, 21
 	RGB 0, 0, 4
 
 PoliwagCardGfx: ; d1230 (34:5230)
-	INCBIN "gfx/cards/poliwag.8x6.2bpp"
+	INCBIN "gfx/cards/poliwag.2bpp"
 	RGB 26, 31, 31
 	RGB 8, 31, 21
 	RGB 0, 16, 26
 	RGB 0, 0, 4
 
 PoliwhirlCardGfx: ; d1538 (34:5538)
-	INCBIN "gfx/cards/poliwhirl.8x6.2bpp"
+	INCBIN "gfx/cards/poliwhirl.2bpp"
 	RGB 31, 31, 31
 	RGB 16, 16, 31
 	RGB 16, 4, 31
 	RGB 0, 0, 4
 
 PoliwrathCardGfx: ; d1840 (34:5840)
-	INCBIN "gfx/cards/poliwrath.8x6.2bpp"
+	INCBIN "gfx/cards/poliwrath.2bpp"
 	RGB 31, 31, 31
 	RGB 0, 16, 31
 	RGB 0, 8, 26
 	RGB 0, 4, 4
 
 TentacoolCardGfx: ; d1b48 (34:5b48)
-	INCBIN "gfx/cards/tentacool.8x6.2bpp"
+	INCBIN "gfx/cards/tentacool.2bpp"
 	RGB 31, 31, 21
 	RGB 8, 12, 26
 	RGB 31, 0, 4
 	RGB 0, 0, 4
 
 TentacruelCardGfx: ; d1e50 (34:5e50)
-	INCBIN "gfx/cards/tentacruel.8x6.2bpp"
+	INCBIN "gfx/cards/tentacruel.2bpp"
 	RGB 31, 31, 12
 	RGB 8, 12, 26
 	RGB 31, 4, 0
 	RGB 4, 0, 4
 
 SeelCardGfx: ; d2158 (34:6158)
-	INCBIN "gfx/cards/seel.8x6.2bpp"
+	INCBIN "gfx/cards/seel.2bpp"
 	RGB 31, 31, 31
 	RGB 8, 21, 31
 	RGB 0, 8, 16
 	RGB 0, 0, 4
 
 DewgongCardGfx: ; d2460 (34:6460)
-	INCBIN "gfx/cards/dewgong.8x6.2bpp"
+	INCBIN "gfx/cards/dewgong.2bpp"
 	RGB 26, 31, 31
 	RGB 12, 26, 16
 	RGB 4, 8, 16
 	RGB 0, 0, 4
 
 ShellderCardGfx: ; d2768 (34:6768)
-	INCBIN "gfx/cards/shellder.8x6.2bpp"
+	INCBIN "gfx/cards/shellder.2bpp"
 	RGB 31, 26, 26
 	RGB 16, 12, 16
 	RGB 26, 0, 0
 	RGB 4, 0, 4
 
 CloysterCardGfx: ; d2a70 (34:6a70)
-	INCBIN "gfx/cards/cloyster.8x6.2bpp"
+	INCBIN "gfx/cards/cloyster.2bpp"
 	RGB 31, 26, 26
 	RGB 31, 16, 0
 	RGB 21, 8, 21
 	RGB 8, 0, 4
 
 KrabbyCardGfx: ; d2d78 (34:6d78)
-	INCBIN "gfx/cards/krabby.8x6.2bpp"
+	INCBIN "gfx/cards/krabby.2bpp"
 	RGB 31, 31, 26
 	RGB 31, 21, 0
 	RGB 31, 4, 0
 	RGB 8, 0, 0
 
 KinglerCardGfx: ; d3080 (34:7080)
-	INCBIN "gfx/cards/kingler.8x6.2bpp"
+	INCBIN "gfx/cards/kingler.2bpp"
 	RGB 31, 31, 8
 	RGB 31, 16, 0
 	RGB 31, 4, 0
 	RGB 8, 0, 0
 
 HorseaCardGfx: ; d3388 (34:7388)
-	INCBIN "gfx/cards/horsea.8x6.2bpp"
+	INCBIN "gfx/cards/horsea.2bpp"
 	RGB 26, 31, 31
 	RGB 8, 26, 21
 	RGB 0, 16, 4
 	RGB 4, 4, 0
 
 SeadraCardGfx: ; d3690 (34:7690)
-	INCBIN "gfx/cards/seadra.8x6.2bpp"
+	INCBIN "gfx/cards/seadra.2bpp"
 	RGB 31, 31, 31
 	RGB 12, 26, 21
 	RGB 4, 12, 12
 	RGB 0, 0, 0
 
 GoldeenCardGfx: ; d3998 (34:7998)
-	INCBIN "gfx/cards/goldeen.8x6.2bpp"
+	INCBIN "gfx/cards/goldeen.2bpp"
 	RGB 31, 31, 16
 	RGB 4, 21, 0
 	RGB 21, 0, 0
 	RGB 4, 0, 0
 
 SeakingCardGfx: ; d3ca0 (34:7ca0)
-	INCBIN "gfx/cards/seaking.8x6.2bpp"
+	INCBIN "gfx/cards/seaking.2bpp"
 	RGB 31, 31, 31
 	RGB 0, 16, 0
 	RGB 21, 0, 0
@@ -1488,147 +1488,147 @@ SeakingCardGfx: ; d3ca0 (34:7ca0)
 
 SECTION "bank35",ROMX,BANK[$35]
 StaryuCardGfx: ; d4000 (35:4000)
-	INCBIN "gfx/cards/staryu.8x6.2bpp"
+	INCBIN "gfx/cards/staryu.2bpp"
 	RGB 31, 31, 21
 	RGB 31, 26, 0
 	RGB 16, 16, 0
 	RGB 4, 0, 0
 
 StarmieCardGfx: ; d4308 (35:4308)
-	INCBIN "gfx/cards/starmie.8x6.2bpp"
+	INCBIN "gfx/cards/starmie.2bpp"
 	RGB 31, 31, 26
 	RGB 21, 8, 21
 	RGB 26, 0, 0
 	RGB 0, 0, 4
 
 MagikarpCardGfx: ; d4610 (35:4610)
-	INCBIN "gfx/cards/magikarp.8x6.2bpp"
+	INCBIN "gfx/cards/magikarp.2bpp"
 	RGB 31, 31, 31
 	RGB 31, 26, 8
 	RGB 31, 8, 0
 	RGB 4, 0, 0
 
 GyaradosCardGfx: ; d4918 (35:4918)
-	INCBIN "gfx/cards/gyarados.8x6.2bpp"
+	INCBIN "gfx/cards/gyarados.2bpp"
 	RGB 31, 31, 26
 	RGB 8, 26, 4
 	RGB 0, 12, 16
 	RGB 0, 4, 4
 
 LaprasCardGfx: ; d4c20 (35:4c20)
-	INCBIN "gfx/cards/lapras.8x6.2bpp"
+	INCBIN "gfx/cards/lapras.2bpp"
 	RGB 31, 31, 26
 	RGB 31, 21, 0
 	RGB 4, 21, 26
 	RGB 0, 0, 0
 
 Vaporeon1CardGfx: ; d4f28 (35:4f28)
-	INCBIN "gfx/cards/vaporeon1.8x6.2bpp"
+	INCBIN "gfx/cards/vaporeon1.2bpp"
 	RGB 31, 31, 31
 	RGB 4, 16, 31
 	RGB 4, 8, 21
 	RGB 0, 0, 0
 
 Vaporeon2CardGfx: ; d5230 (35:5230)
-	INCBIN "gfx/cards/vaporeon2.8x6.2bpp"
+	INCBIN "gfx/cards/vaporeon2.2bpp"
 	RGB 31, 31, 26
 	RGB 12, 26, 21
 	RGB 0, 16, 16
 	RGB 0, 0, 4
 
 OmanyteCardGfx: ; d5538 (35:5538)
-	INCBIN "gfx/cards/omanyte.8x6.2bpp"
+	INCBIN "gfx/cards/omanyte.2bpp"
 	RGB 31, 31, 21
 	RGB 26, 21, 4
 	RGB 4, 21, 12
 	RGB 0, 4, 0
 
 OmastarCardGfx: ; d5840 (35:5840)
-	INCBIN "gfx/cards/omastar.8x6.2bpp"
+	INCBIN "gfx/cards/omastar.2bpp"
 	RGB 31, 31, 21
 	RGB 26, 21, 8
 	RGB 4, 16, 21
 	RGB 4, 0, 0
 
 Articuno1CardGfx: ; d5b48 (35:5b48)
-	INCBIN "gfx/cards/articuno1.8x6.2bpp"
+	INCBIN "gfx/cards/articuno1.2bpp"
 	RGB 26, 31, 31
 	RGB 12, 21, 31
 	RGB 4, 12, 21
 	RGB 0, 4, 4
 
 Articuno2CardGfx: ; d5e50 (35:5e50)
-	INCBIN "gfx/cards/articuno2.8x6.2bpp"
+	INCBIN "gfx/cards/articuno2.2bpp"
 	RGB 31, 31, 31
 	RGB 0, 16, 26
 	RGB 0, 8, 12
 	RGB 0, 0, 0
 
 Pikachu1CardGfx: ; d6158 (35:6158)
-	INCBIN "gfx/cards/pikachu1.8x6.2bpp"
+	INCBIN "gfx/cards/pikachu1.2bpp"
 	RGB 31, 21, 0
 	RGB 21, 12, 21
 	RGB 16, 4, 16
 	RGB 0, 0, 4
 
 Pikachu2CardGfx: ; d6460 (35:6460)
-	INCBIN "gfx/cards/pikachu2.8x6.2bpp"
+	INCBIN "gfx/cards/pikachu2.2bpp"
 	RGB 31, 21, 0
 	RGB 21, 12, 0
 	RGB 4, 16, 0
 	RGB 0, 0, 4
 
 Pikachu3CardGfx: ; d6768 (35:6768)
-	INCBIN "gfx/cards/pikachu3.8x6.2bpp"
+	INCBIN "gfx/cards/pikachu3.2bpp"
 	RGB 31, 21, 0
 	RGB 4, 16, 4
 	RGB 16, 8, 4
 	RGB 0, 0, 0
 
 Pikachu4CardGfx: ; d6a70 (35:6a70)
-	INCBIN "gfx/cards/pikachu4.8x6.2bpp"
+	INCBIN "gfx/cards/pikachu4.2bpp"
 	RGB 31, 31, 31
 	RGB 31, 21, 0
 	RGB 0, 16, 0
 	RGB 0, 0, 0
 
 FlyingPikachuCardGfx: ; d6d78 (35:6d78)
-	INCBIN "gfx/cards/flyingpikachu.8x6.2bpp"
+	INCBIN "gfx/cards/flyingpikachu.2bpp"
 	RGB 31, 21, 0
 	RGB 0, 16, 12
 	RGB 26, 4, 0
 	RGB 0, 0, 0
 
 SurfingPikachu1CardGfx: ; d7080 (35:7080)
-	INCBIN "gfx/cards/surfingpikachu1.8x6.2bpp"
+	INCBIN "gfx/cards/surfingpikachu1.2bpp"
 	RGB 31, 21, 0
 	RGB 4, 12, 12
 	RGB 21, 8, 12
 	RGB 4, 0, 0
 
 SurfingPikachu2CardGfx: ; d7388 (35:7388)
-	INCBIN "gfx/cards/surfingpikachu2.8x6.2bpp"
+	INCBIN "gfx/cards/surfingpikachu2.2bpp"
 	RGB 31, 21, 0
 	RGB 4, 12, 12
 	RGB 21, 8, 12
 	RGB 4, 0, 0
 
 Raichu1CardGfx: ; d7690 (35:7690)
-	INCBIN "gfx/cards/raichu1.8x6.2bpp"
+	INCBIN "gfx/cards/raichu1.2bpp"
 	RGB 31, 31, 16
 	RGB 31, 26, 0
 	RGB 12, 12, 0
 	RGB 4, 0, 0
 
 Raichu2CardGfx: ; d7998 (35:7998)
-	INCBIN "gfx/cards/raichu2.8x6.2bpp"
+	INCBIN "gfx/cards/raichu2.2bpp"
 	RGB 31, 31, 0
 	RGB 31, 21, 4
 	RGB 16, 12, 4
 	RGB 0, 0, 4
 
 Magnemite1CardGfx: ; d7ca0 (35:7ca0)
-	INCBIN "gfx/cards/magnemite1.8x6.2bpp"
+	INCBIN "gfx/cards/magnemite1.2bpp"
 	RGB 31, 31, 26
 	RGB 4, 12, 21
 	RGB 4, 4, 12
@@ -1636,147 +1636,147 @@ Magnemite1CardGfx: ; d7ca0 (35:7ca0)
 
 SECTION "bank36",ROMX,BANK[$36]
 Magnemite2CardGfx: ; d8000 (36:4000)
-	INCBIN "gfx/cards/magnemite2.8x6.2bpp"
+	INCBIN "gfx/cards/magnemite2.2bpp"
 	RGB 31, 26, 31
 	RGB 0, 16, 26
 	RGB 26, 4, 0
 	RGB 0, 0, 0
 
 Magneton1CardGfx: ; d8308 (36:4308)
-	INCBIN "gfx/cards/magneton1.8x6.2bpp"
+	INCBIN "gfx/cards/magneton1.2bpp"
 	RGB 31, 31, 26
 	RGB 4, 12, 21
 	RGB 4, 4, 12
 	RGB 0, 0, 0
 
 Magneton2CardGfx: ; d8610 (36:4610)
-	INCBIN "gfx/cards/magneton2.8x6.2bpp"
+	INCBIN "gfx/cards/magneton2.2bpp"
 	RGB 26, 31, 31
 	RGB 31, 4, 4
 	RGB 8, 16, 16
 	RGB 0, 4, 4
 
 VoltorbCardGfx: ; d8918 (36:4918)
-	INCBIN "gfx/cards/voltorb.8x6.2bpp"
+	INCBIN "gfx/cards/voltorb.2bpp"
 	RGB 31, 31, 21
 	RGB 31, 0, 0
 	RGB 12, 4, 0
 	RGB 0, 0, 0
 
 Electrode1CardGfx: ; d8c20 (36:4c20)
-	INCBIN "gfx/cards/electrode1.8x6.2bpp"
+	INCBIN "gfx/cards/electrode1.2bpp"
 	RGB 31, 31, 31
 	RGB 31, 16, 0
 	RGB 26, 0, 0
 	RGB 8, 0, 0
 
 Electrode2CardGfx: ; d8f28 (36:4f28)
-	INCBIN "gfx/cards/electrode2.8x6.2bpp"
+	INCBIN "gfx/cards/electrode2.2bpp"
 	RGB 31, 31, 26
 	RGB 26, 21, 12
 	RGB 26, 0, 0
 	RGB 4, 0, 0
 
 Electabuzz1CardGfx: ; d9230 (36:5230)
-	INCBIN "gfx/cards/electabuzz1.8x6.2bpp"
+	INCBIN "gfx/cards/electabuzz1.2bpp"
 	RGB 31, 31, 16
 	RGB 31, 21, 0
 	RGB 21, 12, 4
 	RGB 0, 0, 0
 
 Electabuzz2CardGfx: ; d9538 (36:5538)
-	INCBIN "gfx/cards/electabuzz2.8x6.2bpp"
+	INCBIN "gfx/cards/electabuzz2.2bpp"
 	RGB 31, 31, 21
 	RGB 31, 26, 0
 	RGB 16, 8, 0
 	RGB 0, 0, 0
 
 Jolteon1CardGfx: ; d9840 (36:5840)
-	INCBIN "gfx/cards/jolteon1.8x6.2bpp"
+	INCBIN "gfx/cards/jolteon1.2bpp"
 	RGB 26, 31, 31
 	RGB 31, 21, 0
 	RGB 0, 4, 31
 	RGB 0, 0, 0
 
 Jolteon2CardGfx: ; d9b48 (36:5b48)
-	INCBIN "gfx/cards/jolteon2.8x6.2bpp"
+	INCBIN "gfx/cards/jolteon2.2bpp"
 	RGB 31, 31, 31
 	RGB 31, 26, 4
 	RGB 26, 8, 4
 	RGB 0, 0, 0
 
 Zapdos1CardGfx: ; d9e50 (36:5e50)
-	INCBIN "gfx/cards/zapdos1.8x6.2bpp"
+	INCBIN "gfx/cards/zapdos1.2bpp"
 	RGB 31, 26, 8
 	RGB 31, 16, 4
 	RGB 16, 12, 4
 	RGB 0, 0, 4
 
 Zapdos2CardGfx: ; da158 (36:6158)
-	INCBIN "gfx/cards/zapdos2.8x6.2bpp"
+	INCBIN "gfx/cards/zapdos2.2bpp"
 	RGB 31, 31, 21
 	RGB 26, 26, 0
 	RGB 31, 8, 4
 	RGB 0, 0, 4
 
 Zapdos3CardGfx: ; da460 (36:6460)
-	INCBIN "gfx/cards/zapdos3.8x6.2bpp"
+	INCBIN "gfx/cards/zapdos3.2bpp"
 	RGB 31, 31, 31
 	RGB 31, 21, 0
 	RGB 31, 4, 0
 	RGB 0, 0, 0
 
 SandshrewCardGfx: ; da768 (36:6768)
-	INCBIN "gfx/cards/sandshrew.8x6.2bpp"
+	INCBIN "gfx/cards/sandshrew.2bpp"
 	RGB 31, 31, 16
 	RGB 31, 31, 4
 	RGB 16, 12, 0
 	RGB 4, 0, 0
 
 SandslashCardGfx: ; daa70 (36:6a70)
-	INCBIN "gfx/cards/sandslash.8x6.2bpp"
+	INCBIN "gfx/cards/sandslash.2bpp"
 	RGB 31, 31, 31
 	RGB 31, 26, 0
 	RGB 26, 12, 4
 	RGB 0, 0, 4
 
 DiglettCardGfx: ; dad78 (36:6d78)
-	INCBIN "gfx/cards/diglett.8x6.2bpp"
+	INCBIN "gfx/cards/diglett.2bpp"
 	RGB 31, 31, 16
 	RGB 31, 21, 4
 	RGB 26, 12, 4
 	RGB 4, 0, 0
 
 DugtrioCardGfx: ; db080 (36:7080)
-	INCBIN "gfx/cards/dugtrio.8x6.2bpp"
+	INCBIN "gfx/cards/dugtrio.2bpp"
 	RGB 31, 31, 16
 	RGB 31, 12, 4
 	RGB 21, 8, 4
 	RGB 4, 0, 0
 
 MankeyCardGfx: ; db388 (36:7388)
-	INCBIN "gfx/cards/mankey.8x6.2bpp"
+	INCBIN "gfx/cards/mankey.2bpp"
 	RGB 31, 31, 21
 	RGB 31, 21, 4
 	RGB 21, 8, 0
 	RGB 4, 0, 0
 
 PrimeapeCardGfx: ; db690 (36:7690)
-	INCBIN "gfx/cards/primeape.8x6.2bpp"
+	INCBIN "gfx/cards/primeape.2bpp"
 	RGB 31, 31, 21
 	RGB 31, 21, 0
 	RGB 21, 8, 0
 	RGB 4, 0, 0
 
 MachopCardGfx: ; db998 (36:7998)
-	INCBIN "gfx/cards/machop.8x6.2bpp"
+	INCBIN "gfx/cards/machop.2bpp"
 	RGB 26, 31, 26
 	RGB 12, 26, 16
 	RGB 8, 16, 8
 	RGB 0, 4, 0
 
 MachokeCardGfx: ; dbca0 (36:7ca0)
-	INCBIN "gfx/cards/machoke.8x6.2bpp"
+	INCBIN "gfx/cards/machoke.2bpp"
 	RGB 31, 31, 31
 	RGB 12, 16, 26
 	RGB 0, 4, 21
@@ -1784,147 +1784,147 @@ MachokeCardGfx: ; dbca0 (36:7ca0)
 
 SECTION "bank37",ROMX,BANK[$37]
 MachampCardGfx: ; dc000 (37:4000)
-	INCBIN "gfx/cards/machamp.8x6.2bpp"
+	INCBIN "gfx/cards/machamp.2bpp"
 	RGB 31, 31, 31
 	RGB 12, 21, 21
 	RGB 4, 12, 21
 	RGB 0, 4, 4
 
 GeodudeCardGfx: ; dc308 (37:4308)
-	INCBIN "gfx/cards/geodude.8x6.2bpp"
+	INCBIN "gfx/cards/geodude.2bpp"
 	RGB 31, 26, 26
 	RGB 26, 8, 4
 	RGB 4, 4, 4
 	RGB 0, 0, 4
 
 GravelerCardGfx: ; dc610 (37:4610)
-	INCBIN "gfx/cards/graveler.8x6.2bpp"
+	INCBIN "gfx/cards/graveler.2bpp"
 	RGB 31, 31, 21
 	RGB 21, 12, 8
 	RGB 12, 4, 4
 	RGB 0, 0, 0
 
 GolemCardGfx: ; dc918 (37:4918)
-	INCBIN "gfx/cards/golem.8x6.2bpp"
+	INCBIN "gfx/cards/golem.2bpp"
 	RGB 31, 31, 12
 	RGB 21, 12, 8
 	RGB 26, 0, 0
 	RGB 0, 0, 0
 
 OnixCardGfx: ; dcc20 (37:4c20)
-	INCBIN "gfx/cards/onix.8x6.2bpp"
+	INCBIN "gfx/cards/onix.2bpp"
 	RGB 26, 31, 31
 	RGB 12, 16, 21
 	RGB 0, 8, 16
 	RGB 0, 0, 4
 
 CuboneCardGfx: ; dcf28 (37:4f28)
-	INCBIN "gfx/cards/cubone.8x6.2bpp"
+	INCBIN "gfx/cards/cubone.2bpp"
 	RGB 26, 31, 31
 	RGB 16, 16, 31
 	RGB 8, 4, 21
 	RGB 0, 0, 8
 
 Marowak1CardGfx: ; dd230 (37:5230)
-	INCBIN "gfx/cards/marowak1.8x6.2bpp"
+	INCBIN "gfx/cards/marowak1.2bpp"
 	RGB 31, 26, 21
 	RGB 26, 16, 8
 	RGB 21, 8, 0
 	RGB 8, 0, 0
 
 Marowak2CardGfx: ; dd538 (37:5538)
-	INCBIN "gfx/cards/marowak2.8x6.2bpp"
+	INCBIN "gfx/cards/marowak2.2bpp"
 	RGB 31, 31, 21
 	RGB 26, 12, 8
 	RGB 16, 4, 0
 	RGB 8, 0, 0
 
 HitmonleeCardGfx: ; dd840 (37:5840)
-	INCBIN "gfx/cards/hitmonlee.8x6.2bpp"
+	INCBIN "gfx/cards/hitmonlee.2bpp"
 	RGB 31, 26, 21
 	RGB 31, 21, 0
 	RGB 21, 8, 0
 	RGB 4, 0, 0
 
 HitmonchanCardGfx: ; ddb48 (37:5b48)
-	INCBIN "gfx/cards/hitmonchan.8x6.2bpp"
+	INCBIN "gfx/cards/hitmonchan.2bpp"
 	RGB 31, 31, 21
 	RGB 26, 16, 4
 	RGB 12, 4, 0
 	RGB 0, 0, 0
 
 RhyhornCardGfx: ; dde50 (37:5e50)
-	INCBIN "gfx/cards/rhyhorn.8x6.2bpp"
+	INCBIN "gfx/cards/rhyhorn.2bpp"
 	RGB 31, 31, 31
 	RGB 16, 16, 21
 	RGB 4, 4, 8
 	RGB 0, 0, 0
 
 RhydonCardGfx: ; de158 (37:6158)
-	INCBIN "gfx/cards/rhydon.8x6.2bpp"
+	INCBIN "gfx/cards/rhydon.2bpp"
 	RGB 31, 31, 26
 	RGB 16, 12, 8
 	RGB 8, 4, 0
 	RGB 0, 0, 0
 
 KabutoCardGfx: ; de460 (37:6460)
-	INCBIN "gfx/cards/kabuto.8x6.2bpp"
+	INCBIN "gfx/cards/kabuto.2bpp"
 	RGB 31, 31, 26
 	RGB 31, 21, 0
 	RGB 16, 8, 4
 	RGB 0, 0, 0
 
 KabutopsCardGfx: ; de768 (37:6768)
-	INCBIN "gfx/cards/kabutops.8x6.2bpp"
+	INCBIN "gfx/cards/kabutops.2bpp"
 	RGB 31, 26, 26
 	RGB 12, 21, 16
 	RGB 16, 12, 8
 	RGB 4, 0, 0
 
 AerodactylCardGfx: ; dea70 (37:6a70)
-	INCBIN "gfx/cards/aerodactyl.8x6.2bpp"
+	INCBIN "gfx/cards/aerodactyl.2bpp"
 	RGB 26, 21, 26
 	RGB 26, 0, 0
 	RGB 12, 4, 12
 	RGB 0, 0, 4
 
 AbraCardGfx: ; ded78 (37:6d78)
-	INCBIN "gfx/cards/abra.8x6.2bpp"
+	INCBIN "gfx/cards/abra.2bpp"
 	RGB 31, 31, 16
 	RGB 31, 16, 4
 	RGB 26, 8, 4
 	RGB 4, 0, 0
 
 KadabraCardGfx: ; df080 (37:7080)
-	INCBIN "gfx/cards/kadabra.8x6.2bpp"
+	INCBIN "gfx/cards/kadabra.2bpp"
 	RGB 31, 31, 16
 	RGB 31, 26, 0
 	RGB 31, 12, 4
 	RGB 4, 0, 0
 
 AlakazamCardGfx: ; df388 (37:7388)
-	INCBIN "gfx/cards/alakazam.8x6.2bpp"
+	INCBIN "gfx/cards/alakazam.2bpp"
 	RGB 31, 31, 16
 	RGB 31, 26, 0
 	RGB 21, 12, 4
 	RGB 4, 0, 0
 
 Slowpoke1CardGfx: ; df690 (37:7690)
-	INCBIN "gfx/cards/slowpoke1.8x6.2bpp"
+	INCBIN "gfx/cards/slowpoke1.2bpp"
 	RGB 31, 31, 31
 	RGB 31, 16, 0
 	RGB 31, 0, 12
 	RGB 0, 0, 0
 
 Slowpoke2CardGfx: ; df998 (37:7998)
-	INCBIN "gfx/cards/slowpoke2.8x6.2bpp"
+	INCBIN "gfx/cards/slowpoke2.2bpp"
 	RGB 31, 26, 26
 	RGB 26, 21, 0
 	RGB 26, 4, 12
 	RGB 16, 4, 4
 
 SlowbroCardGfx: ; dfca0 (37:7ca0)
-	INCBIN "gfx/cards/slowbro.8x6.2bpp"
+	INCBIN "gfx/cards/slowbro.2bpp"
 	RGB 31, 26, 12
 	RGB 31, 12, 0
 	RGB 26, 4, 8
@@ -1932,147 +1932,147 @@ SlowbroCardGfx: ; dfca0 (37:7ca0)
 
 SECTION "bank38",ROMX,BANK[$38]
 Gastly1CardGfx: ; e0000 (38:4000)
-	INCBIN "gfx/cards/gastly1.8x6.2bpp"
+	INCBIN "gfx/cards/gastly1.2bpp"
 	RGB 26, 26, 21
 	RGB 26, 0, 0
 	RGB 8, 8, 8
 	RGB 0, 0, 0
 
 Gastly2CardGfx: ; e0308 (38:4308)
-	INCBIN "gfx/cards/gastly2.8x6.2bpp"
+	INCBIN "gfx/cards/gastly2.2bpp"
 	RGB 31, 31, 31
 	RGB 31, 16, 0
 	RGB 16, 4, 12
 	RGB 4, 0, 4
 
 Haunter1CardGfx: ; e0610 (38:4610)
-	INCBIN "gfx/cards/haunter1.8x6.2bpp"
+	INCBIN "gfx/cards/haunter1.2bpp"
 	RGB 31, 26, 31
 	RGB 31, 0, 4
 	RGB 16, 8, 21
 	RGB 4, 0, 8
 
 Haunter2CardGfx: ; e0918 (38:4918)
-	INCBIN "gfx/cards/haunter2.8x6.2bpp"
+	INCBIN "gfx/cards/haunter2.2bpp"
 	RGB 31, 26, 31
 	RGB 21, 8, 21
 	RGB 12, 0, 12
 	RGB 0, 0, 0
 
 GengarCardGfx: ; e0c20 (38:4c20)
-	INCBIN "gfx/cards/gengar.8x6.2bpp"
+	INCBIN "gfx/cards/gengar.2bpp"
 	RGB 31, 26, 31
 	RGB 31, 0, 8
 	RGB 12, 4, 21
 	RGB 4, 0, 4
 
 DrowzeeCardGfx: ; e0f28 (38:4f28)
-	INCBIN "gfx/cards/drowzee.8x6.2bpp"
+	INCBIN "gfx/cards/drowzee.2bpp"
 	RGB 31, 31, 21
 	RGB 26, 26, 0
 	RGB 12, 8, 4
 	RGB 0, 0, 0
 
 HypnoCardGfx: ; e1230 (38:5230)
-	INCBIN "gfx/cards/hypno.8x6.2bpp"
+	INCBIN "gfx/cards/hypno.2bpp"
 	RGB 31, 31, 26
 	RGB 31, 21, 0
 	RGB 21, 12, 0
 	RGB 4, 4, 0
 
 MrMimeCardGfx: ; e1538 (38:5538)
-	INCBIN "gfx/cards/mrmime.8x6.2bpp"
+	INCBIN "gfx/cards/mrmime.2bpp"
 	RGB 31, 26, 26
 	RGB 12, 21, 8
 	RGB 26, 0, 4
 	RGB 0, 0, 0
 
 JynxCardGfx: ; e1840 (38:5840)
-	INCBIN "gfx/cards/jynx.8x6.2bpp"
+	INCBIN "gfx/cards/jynx.2bpp"
 	RGB 31, 26, 31
 	RGB 31, 26, 0
 	RGB 31, 0, 0
 	RGB 4, 0, 12
 
 Mewtwo1CardGfx: ; e1b48 (38:5b48)
-	INCBIN "gfx/cards/mewtwo1.8x6.2bpp"
+	INCBIN "gfx/cards/mewtwo1.2bpp"
 	RGB 31, 31, 31
 	RGB 26, 16, 26
 	RGB 21, 4, 26
 	RGB 4, 0, 8
 
 Mewtwo2CardGfx: ; e1e50 (38:5e50)
-	INCBIN "gfx/cards/mewtwo2.8x6.2bpp"
+	INCBIN "gfx/cards/mewtwo2.2bpp"
 	RGB 31, 31, 31
 	RGB 21, 12, 21
 	RGB 4, 12, 21
 	RGB 0, 0, 4
 
 Mewtwo3CardGfx: ; e2158 (38:6158)
-	INCBIN "gfx/cards/mewtwo3.8x6.2bpp"
+	INCBIN "gfx/cards/mewtwo3.2bpp"
 	RGB 31, 26, 16
 	RGB 31, 12, 8
 	RGB 21, 0, 8
 	RGB 0, 0, 0
 
 Mew1CardGfx: ; e2460 (38:6460)
-	INCBIN "gfx/cards/mew1.8x6.2bpp"
+	INCBIN "gfx/cards/mew1.2bpp"
 	RGB 31, 31, 31
 	RGB 31, 12, 26
 	RGB 4, 16, 8
 	RGB 0, 0, 0
 
 Mew2CardGfx: ; e2768 (38:6768)
-	INCBIN "gfx/cards/mew2.8x6.2bpp"
+	INCBIN "gfx/cards/mew2.2bpp"
 	RGB 31, 31, 26
 	RGB 26, 12, 21
 	RGB 31, 4, 8
 	RGB 4, 0, 0
 
 Mew3CardGfx: ; e2a70 (38:6a70)
-	INCBIN "gfx/cards/mew3.8x6.2bpp"
+	INCBIN "gfx/cards/mew3.2bpp"
 	RGB 31, 31, 31
 	RGB 26, 12, 21
 	RGB 4, 16, 16
 	RGB 4, 0, 4
 
 PidgeyCardGfx: ; e2d78 (38:6d78)
-	INCBIN "gfx/cards/pidgey.8x6.2bpp"
+	INCBIN "gfx/cards/pidgey.2bpp"
 	RGB 31, 31, 26
 	RGB 31, 26, 0
 	RGB 26, 12, 4
 	RGB 0, 0, 0
 
 PidgeottoCardGfx: ; e3080 (38:7080)
-	INCBIN "gfx/cards/pidgeotto.8x6.2bpp"
+	INCBIN "gfx/cards/pidgeotto.2bpp"
 	RGB 31, 31, 21
 	RGB 26, 0, 4
 	RGB 21, 12, 8
 	RGB 0, 0, 0
 
 Pidgeot1CardGfx: ; e3388 (38:7388)
-	INCBIN "gfx/cards/pidgeot1.8x6.2bpp"
+	INCBIN "gfx/cards/pidgeot1.2bpp"
 	RGB 31, 26, 26
 	RGB 31, 16, 4
 	RGB 26, 4, 0
 	RGB 4, 0, 0
 
 Pidgeot2CardGfx: ; e3690 (38:7690)
-	INCBIN "gfx/cards/pidgeot2.8x6.2bpp"
+	INCBIN "gfx/cards/pidgeot2.2bpp"
 	RGB 31, 31, 31
 	RGB 31, 26, 4
 	RGB 21, 8, 4
 	RGB 0, 0, 0
 
 RattataCardGfx: ; e3998 (38:7998)
-	INCBIN "gfx/cards/rattata.8x6.2bpp"
+	INCBIN "gfx/cards/rattata.2bpp"
 	RGB 31, 31, 26
 	RGB 8, 16, 0
 	RGB 21, 4, 16
 	RGB 0, 0, 4
 
 RaticateCardGfx: ; e3ca0 (38:7ca0)
-	INCBIN "gfx/cards/raticate.8x6.2bpp"
+	INCBIN "gfx/cards/raticate.2bpp"
 	RGB 31, 31, 26
 	RGB 12, 26, 16
 	RGB 31, 16, 8
@@ -2080,147 +2080,147 @@ RaticateCardGfx: ; e3ca0 (38:7ca0)
 
 SECTION "bank39",ROMX,BANK[$39]
 SpearowCardGfx: ; e4000 (39:4000)
-	INCBIN "gfx/cards/spearow.8x6.2bpp"
+	INCBIN "gfx/cards/spearow.2bpp"
 	RGB 31, 31, 31
 	RGB 31, 16, 4
 	RGB 26, 0, 4
 	RGB 0, 0, 0
 
 FearowCardGfx: ; e4308 (39:4308)
-	INCBIN "gfx/cards/fearow.8x6.2bpp"
+	INCBIN "gfx/cards/fearow.2bpp"
 	RGB 31, 31, 31
 	RGB 26, 21, 4
 	RGB 16, 8, 0
 	RGB 4, 0, 0
 
 ClefairyCardGfx: ; e4610 (39:4610)
-	INCBIN "gfx/cards/clefairy.8x6.2bpp"
+	INCBIN "gfx/cards/clefairy.2bpp"
 	RGB 31, 26, 26
 	RGB 31, 16, 16
 	RGB 26, 8, 12
 	RGB 4, 0, 0
 
 ClefableCardGfx: ; e4918 (39:4918)
-	INCBIN "gfx/cards/clefable.8x6.2bpp"
+	INCBIN "gfx/cards/clefable.2bpp"
 	RGB 31, 31, 31
 	RGB 31, 16, 21
 	RGB 31, 4, 4
 	RGB 4, 0, 4
 
 Jigglypuff1CardGfx: ; e4c20 (39:4c20)
-	INCBIN "gfx/cards/jigglypuff1.8x6.2bpp"
+	INCBIN "gfx/cards/jigglypuff1.2bpp"
 	RGB 31, 31, 31
 	RGB 31, 12, 26
 	RGB 0, 21, 12
 	RGB 4, 0, 4
 
 Jigglypuff2CardGfx: ; e4f28 (39:4f28)
-	INCBIN "gfx/cards/jigglypuff2.8x6.2bpp"
+	INCBIN "gfx/cards/jigglypuff2.2bpp"
 	RGB 31, 26, 26
 	RGB 31, 12, 16
 	RGB 0, 8, 21
 	RGB 0, 0, 0
 
 Jigglypuff3CardGfx: ; e5230 (39:5230)
-	INCBIN "gfx/cards/jigglypuff3.8x6.2bpp"
+	INCBIN "gfx/cards/jigglypuff3.2bpp"
 	RGB 31, 31, 31
 	RGB 31, 4, 12
 	RGB 4, 26, 8
 	RGB 4, 0, 4
 
 WigglytuffCardGfx: ; e5538 (39:5538)
-	INCBIN "gfx/cards/wigglytuff.8x6.2bpp"
+	INCBIN "gfx/cards/wigglytuff.2bpp"
 	RGB 31, 31, 31
 	RGB 31, 16, 26
 	RGB 0, 21, 12
 	RGB 4, 0, 4
 
 Meowth1CardGfx: ; e5840 (39:5840)
-	INCBIN "gfx/cards/meowth1.8x6.2bpp"
+	INCBIN "gfx/cards/meowth1.2bpp"
 	RGB 31, 31, 26
 	RGB 31, 21, 0
 	RGB 21, 8, 4
 	RGB 0, 0, 0
 
 Meowth2CardGfx: ; e5b48 (39:5b48)
-	INCBIN "gfx/cards/meowth2.8x6.2bpp"
+	INCBIN "gfx/cards/meowth2.2bpp"
 	RGB 31, 31, 21
 	RGB 31, 26, 0
 	RGB 16, 16, 0
 	RGB 4, 4, 0
 
 PersianCardGfx: ; e5e50 (39:5e50)
-	INCBIN "gfx/cards/persian.8x6.2bpp"
+	INCBIN "gfx/cards/persian.2bpp"
 	RGB 31, 31, 21
 	RGB 31, 26, 4
 	RGB 26, 12, 0
 	RGB 4, 0, 0
 
 FarfetchdCardGfx: ; e6158 (39:6158)
-	INCBIN "gfx/cards/farfetchd.8x6.2bpp"
+	INCBIN "gfx/cards/farfetchd.2bpp"
 	RGB 31, 31, 21
 	RGB 26, 16, 4
 	RGB 21, 8, 4
 	RGB 0, 0, 0
 
 DoduoCardGfx: ; e6460 (39:6460)
-	INCBIN "gfx/cards/doduo.8x6.2bpp"
+	INCBIN "gfx/cards/doduo.2bpp"
 	RGB 31, 31, 26
 	RGB 31, 26, 4
 	RGB 21, 12, 4
 	RGB 0, 0, 0
 
 DodrioCardGfx: ; e6768 (39:6768)
-	INCBIN "gfx/cards/dodrio.8x6.2bpp"
+	INCBIN "gfx/cards/dodrio.2bpp"
 	RGB 31, 31, 16
 	RGB 31, 21, 0
 	RGB 26, 8, 0
 	RGB 8, 0, 0
 
 LickitungCardGfx: ; e6a70 (39:6a70)
-	INCBIN "gfx/cards/lickitung.8x6.2bpp"
+	INCBIN "gfx/cards/lickitung.2bpp"
 	RGB 31, 31, 21
 	RGB 31, 16, 8
 	RGB 26, 4, 4
 	RGB 0, 4, 0
 
 ChanseyCardGfx: ; e6d78 (39:6d78)
-	INCBIN "gfx/cards/chansey.8x6.2bpp"
+	INCBIN "gfx/cards/chansey.2bpp"
 	RGB 31, 26, 26
 	RGB 31, 16, 16
 	RGB 31, 8, 12
 	RGB 4, 4, 4
 
 KangaskhanCardGfx: ; e7080 (39:7080)
-	INCBIN "gfx/cards/kangaskhan.8x6.2bpp"
+	INCBIN "gfx/cards/kangaskhan.2bpp"
 	RGB 31, 31, 26
 	RGB 21, 21, 12
 	RGB 12, 12, 0
 	RGB 4, 0, 0
 
 TaurosCardGfx: ; e7388 (39:7388)
-	INCBIN "gfx/cards/tauros.8x6.2bpp"
+	INCBIN "gfx/cards/tauros.2bpp"
 	RGB 31, 26, 21
 	RGB 21, 12, 4
 	RGB 8, 4, 0
 	RGB 0, 0, 0
 
 DittoCardGfx: ; e7690 (39:7690)
-	INCBIN "gfx/cards/ditto.8x6.2bpp"
+	INCBIN "gfx/cards/ditto.2bpp"
 	RGB 31, 31, 31
 	RGB 16, 12, 21
 	RGB 31, 4, 8
 	RGB 0, 0, 0
 
 EeveeCardGfx: ; e7998 (39:7998)
-	INCBIN "gfx/cards/eevee.8x6.2bpp"
+	INCBIN "gfx/cards/eevee.2bpp"
 	RGB 31, 31, 26
 	RGB 26, 12, 8
 	RGB 12, 4, 0
 	RGB 4, 0, 0
 
 PorygonCardGfx: ; e7ca0 (39:7ca0)
-	INCBIN "gfx/cards/porygon.8x6.2bpp"
+	INCBIN "gfx/cards/porygon.2bpp"
 	RGB 31, 31, 31
 	RGB 31, 16, 26
 	RGB 31, 4, 8
@@ -2228,147 +2228,147 @@ PorygonCardGfx: ; e7ca0 (39:7ca0)
 
 SECTION "bank3A",ROMX,BANK[$3A]
 SnorlaxCardGfx: ; e8000 (3a:4000)
-	INCBIN "gfx/cards/snorlax.8x6.2bpp"
+	INCBIN "gfx/cards/snorlax.2bpp"
 	RGB 31, 31, 21
 	RGB 31, 21, 0
 	RGB 31, 12, 0
 	RGB 0, 0, 8
 
 DratiniCardGfx: ; e8308 (3a:4308)
-	INCBIN "gfx/cards/dratini.8x6.2bpp"
+	INCBIN "gfx/cards/dratini.2bpp"
 	RGB 31, 31, 26
 	RGB 12, 21, 31
 	RGB 8, 8, 16
 	RGB 0, 0, 4
 
 DragonairCardGfx: ; e8610 (3a:4610)
-	INCBIN "gfx/cards/dragonair.8x6.2bpp"
+	INCBIN "gfx/cards/dragonair.2bpp"
 	RGB 31, 31, 31
 	RGB 8, 21, 31
 	RGB 4, 8, 16
 	RGB 0, 0, 4
 
 Dragonite1CardGfx: ; e8918 (3a:4918)
-	INCBIN "gfx/cards/dragonite1.8x6.2bpp"
+	INCBIN "gfx/cards/dragonite1.2bpp"
 	RGB 31, 31, 26
 	RGB 31, 12, 4
 	RGB 4, 16, 8
 	RGB 0, 0, 0
 
 Dragonite2CardGfx: ; e8c20 (3a:4c20)
-	INCBIN "gfx/cards/dragonite2.8x6.2bpp"
+	INCBIN "gfx/cards/dragonite2.2bpp"
 	RGB 31, 26, 12
 	RGB 31, 12, 0
 	RGB 21, 8, 0
 	RGB 4, 0, 0
 
 ProfessorOakCardGfx: ; e8f28 (3a:4f28)
-	INCBIN "gfx/cards/professoroak.8x6.2bpp"
+	INCBIN "gfx/cards/professoroak.2bpp"
 	RGB 31, 31, 31
 	RGB 31, 21, 12
 	RGB 16, 8, 4
 	RGB 0, 0, 4
 
 ImposterProfessorOakCardGfx: ; e9230 (3a:5230)
-	INCBIN "gfx/cards/imposterprofessoroak.8x6.2bpp"
+	INCBIN "gfx/cards/imposterprofessoroak.2bpp"
 	RGB 31, 26, 26
 	RGB 26, 16, 12
 	RGB 16, 0, 21
 	RGB 0, 0, 8
 
 BillCardGfx: ; e9538 (3a:5538)
-	INCBIN "gfx/cards/bill.8x6.2bpp"
+	INCBIN "gfx/cards/bill.2bpp"
 	RGB 31, 31, 21
 	RGB 26, 4, 0
 	RGB 16, 8, 26
 	RGB 0, 0, 0
 
 MrFujiCardGfx: ; e9840 (3a:5840)
-	INCBIN "gfx/cards/mrfuji.8x6.2bpp"
+	INCBIN "gfx/cards/mrfuji.2bpp"
 	RGB 31, 26, 21
 	RGB 31, 16, 8
 	RGB 26, 0, 8
 	RGB 4, 0, 4
 
 LassCardGfx: ; e9b48 (3a:5b48)
-	INCBIN "gfx/cards/lass.8x6.2bpp"
+	INCBIN "gfx/cards/lass.2bpp"
 	RGB 31, 31, 21
 	RGB 31, 4, 0
 	RGB 4, 8, 21
 	RGB 0, 0, 0
 
 ImakuniCardGfx: ; e9e50 (3a:5e50)
-	INCBIN "gfx/cards/imakuni.8x6.2bpp"
+	INCBIN "gfx/cards/imakuni.2bpp"
 	RGB 31, 26, 21
 	RGB 26, 12, 4
 	RGB 12, 4, 0
 	RGB 0, 0, 0
 
 PokemonTraderCardGfx: ; ea158 (3a:6158)
-	INCBIN "gfx/cards/pokemontrader.8x6.2bpp"
+	INCBIN "gfx/cards/pokemontrader.2bpp"
 	RGB 26, 31, 16
 	RGB 16, 26, 4
 	RGB 26, 8, 0
 	RGB 0, 0, 0
 
 PokemonBreederCardGfx: ; ea460 (3a:6460)
-	INCBIN "gfx/cards/pokemonbreeder.8x6.2bpp"
+	INCBIN "gfx/cards/pokemonbreeder.2bpp"
 	RGB 26, 31, 16
 	RGB 12, 21, 26
 	RGB 0, 16, 0
 	RGB 0, 8, 0
 
 ClefairyDollCardGfx: ; ea768 (3a:6768)
-	INCBIN "gfx/cards/clefairydoll.8x6.2bpp"
+	INCBIN "gfx/cards/clefairydoll.2bpp"
 	RGB 31, 26, 26
 	RGB 31, 8, 16
 	RGB 21, 4, 8
 	RGB 8, 0, 0
 
 MysteriousFossilCardGfx: ; eaa70 (3a:6a70)
-	INCBIN "gfx/cards/mysteriousfossil.8x6.2bpp"
+	INCBIN "gfx/cards/mysteriousfossil.2bpp"
 	RGB 31, 26, 21
 	RGB 26, 12, 8
 	RGB 12, 4, 0
 	RGB 4, 0, 0
 
 EnergyRetrievalCardGfx: ; ead78 (3a:6d78)
-	INCBIN "gfx/cards/energyretrieval.8x6.2bpp"
+	INCBIN "gfx/cards/energyretrieval.2bpp"
 	RGB 31, 31, 31
 	RGB 12, 21, 16
 	RGB 12, 0, 26
 	RGB 0, 0, 4
 
 SuperEnergyRetrievalCardGfx: ; eb080 (3a:7080)
-	INCBIN "gfx/cards/superenergyretrieval.8x6.2bpp"
+	INCBIN "gfx/cards/superenergyretrieval.2bpp"
 	RGB 31, 26, 31
 	RGB 12, 16, 26
 	RGB 21, 0, 12
 	RGB 0, 0, 4
 
 EnergySearchCardGfx: ; eb388 (3a:7388)
-	INCBIN "gfx/cards/energysearch.8x6.2bpp"
+	INCBIN "gfx/cards/energysearch.2bpp"
 	RGB 26, 31, 31
 	RGB 0, 21, 31
 	RGB 4, 12, 12
 	RGB 0, 0, 0
 
 EnergyRemovalCardGfx: ; eb690 (3a:7690)
-	INCBIN "gfx/cards/energyremoval.8x6.2bpp"
+	INCBIN "gfx/cards/energyremoval.2bpp"
 	RGB 26, 31, 31
 	RGB 8, 21, 21
 	RGB 4, 8, 8
 	RGB 0, 0, 4
 
 SuperEnergyRemovalCardGfx: ; eb998 (3a:7998)
-	INCBIN "gfx/cards/superenergyremoval.8x6.2bpp"
+	INCBIN "gfx/cards/superenergyremoval.2bpp"
 	RGB 31, 26, 0
 	RGB 31, 4, 0
 	RGB 12, 4, 16
 	RGB 4, 0, 4
 
 SwitchCardGfx: ; ebca0 (3a:7ca0)
-	INCBIN "gfx/cards/switch.8x6.2bpp"
+	INCBIN "gfx/cards/switch.2bpp"
 	RGB 31, 26, 26
 	RGB 31, 16, 4
 	RGB 26, 4, 8
@@ -2376,126 +2376,126 @@ SwitchCardGfx: ; ebca0 (3a:7ca0)
 
 SECTION "bank3B",ROMX,BANK[$3B]
 PokemonCenterCardGfx: ; ec000 (3b:4000)
-	INCBIN "gfx/cards/pokemoncenter.8x6.2bpp"
+	INCBIN "gfx/cards/pokemoncenter.2bpp"
 	RGB 21, 31, 21
 	RGB 31, 0, 0
 	RGB 4, 21, 8
 	RGB 0, 4, 0
 
 PokeBallCardGfx: ; ec308 (3b:4308)
-	INCBIN "gfx/cards/pokeball.8x6.2bpp"
+	INCBIN "gfx/cards/pokeball.2bpp"
 	RGB 31, 31, 26
 	RGB 26, 0, 0
 	RGB 8, 0, 16
 	RGB 0, 0, 4
 
 ScoopUpCardGfx: ; ec610 (3b:4610)
-	INCBIN "gfx/cards/scoopup.8x6.2bpp"
+	INCBIN "gfx/cards/scoopup.2bpp"
 	RGB 31, 26, 26
 	RGB 21, 12, 8
 	RGB 12, 4, 16
 	RGB 4, 0, 4
 
 ComputerSearchCardGfx: ; ec918 (3b:4918)
-	INCBIN "gfx/cards/computersearch.8x6.2bpp"
+	INCBIN "gfx/cards/computersearch.2bpp"
 	RGB 21, 26, 31
 	RGB 8, 26, 16
 	RGB 0, 16, 4
 	RGB 0, 0, 4
 
 PokedexCardGfx: ; ecc20 (3b:4c20)
-	INCBIN "gfx/cards/pokedex.8x6.2bpp"
+	INCBIN "gfx/cards/pokedex.2bpp"
 	RGB 26, 31, 31
 	RGB 31, 0, 0
 	RGB 8, 12, 16
 	RGB 0, 0, 4
 
 PlusPowerCardGfx: ; ecf28 (3b:4f28)
-	INCBIN "gfx/cards/pluspower.8x6.2bpp"
+	INCBIN "gfx/cards/pluspower.2bpp"
 	RGB 31, 26, 26
 	RGB 31, 0, 4
 	RGB 16, 0, 0
 	RGB 4, 0, 0
 
 DefenderCardGfx: ; ed230 (3b:5230)
-	INCBIN "gfx/cards/defender.8x6.2bpp"
+	INCBIN "gfx/cards/defender.2bpp"
 	RGB 26, 26, 31
 	RGB 16, 0, 26
 	RGB 8, 0, 16
 	RGB 0, 0, 4
 
 ItemFinderCardGfx: ; ed538 (3b:5538)
-	INCBIN "gfx/cards/itemfinder.8x6.2bpp"
+	INCBIN "gfx/cards/itemfinder.2bpp"
 	RGB 31, 31, 4
 	RGB 21, 16, 8
 	RGB 8, 0, 21
 	RGB 0, 0, 4
 
 GustofWindCardGfx: ; ed840 (3b:5840)
-	INCBIN "gfx/cards/gustofwind.8x6.2bpp"
+	INCBIN "gfx/cards/gustofwind.2bpp"
 	RGB 31, 26, 26
 	RGB 21, 12, 8
 	RGB 12, 4, 16
 	RGB 4, 0, 4
 
 DevolutionSprayCardGfx: ; edb48 (3b:5b48)
-	INCBIN "gfx/cards/devolutionspray.8x6.2bpp"
+	INCBIN "gfx/cards/devolutionspray.2bpp"
 	RGB 31, 26, 0
 	RGB 31, 12, 0
 	RGB 31, 0, 0
 	RGB 0, 0, 0
 
 PotionCardGfx: ; ede50 (3b:5e50)
-	INCBIN "gfx/cards/potion.8x6.2bpp"
+	INCBIN "gfx/cards/potion.2bpp"
 	RGB 31, 31, 31
 	RGB 21, 26, 26
 	RGB 16, 8, 26
 	RGB 0, 0, 4
 
 SuperPotionCardGfx: ; ee158 (3b:6158)
-	INCBIN "gfx/cards/superpotion.8x6.2bpp"
+	INCBIN "gfx/cards/superpotion.2bpp"
 	RGB 31, 31, 26
 	RGB 31, 21, 4
 	RGB 31, 4, 0
 	RGB 4, 0, 0
 
 FullHealCardGfx: ; ee460 (3b:6460)
-	INCBIN "gfx/cards/fullheal.8x6.2bpp"
+	INCBIN "gfx/cards/fullheal.2bpp"
 	RGB 31, 26, 26
 	RGB 31, 0, 0
 	RGB 0, 16, 0
 	RGB 8, 0, 0
 
 ReviveCardGfx: ; ee768 (3b:6768)
-	INCBIN "gfx/cards/revive.8x6.2bpp"
+	INCBIN "gfx/cards/revive.2bpp"
 	RGB 31, 31, 12
 	RGB 31, 4, 12
 	RGB 31, 8, 0
 	RGB 4, 0, 0
 
 MaintenanceCardGfx: ; eea70 (3b:6a70)
-	INCBIN "gfx/cards/maintenance.8x6.2bpp"
+	INCBIN "gfx/cards/maintenance.2bpp"
 	RGB 26, 31, 26
 	RGB 31, 0, 0
 	RGB 0, 16, 4
 	RGB 0, 0, 0
 
 PokemonFluteCardGfx: ; eed78 (3b:6d78)
-	INCBIN "gfx/cards/pokemonflute.8x6.2bpp"
+	INCBIN "gfx/cards/pokemonflute.2bpp"
 	RGB 31, 31, 21
 	RGB 31, 21, 0
 	RGB 31, 0, 0
 	RGB 4, 0, 0
 
 GamblerCardGfx: ; ef080 (3b:7080)
-	INCBIN "gfx/cards/gambler.8x6.2bpp"
+	INCBIN "gfx/cards/gambler.2bpp"
 	RGB 31, 26, 16
 	RGB 26, 4, 0
 	RGB 0, 8, 0
 	RGB 0, 0, 0
 
 RecycleCardGfx: ; ef388 (3b:7388)
-	INCBIN "gfx/cards/recycle.8x6.2bpp"
+	INCBIN "gfx/cards/recycle.2bpp"
 	RGB 31, 26, 26
 	RGB 31, 12, 21
 	RGB 4, 16, 4
diff --git a/gfx/boosterpacks/colosseum2.t10.png b/gfx/boosterpacks/colosseum2.png
index 1da1a52..1da1a52 100644
--- a/gfx/boosterpacks/colosseum2.t10.png
+++ b/gfx/boosterpacks/colosseum2.png
diff --git a/gfx/boosterpacks/evolution2.t10.png b/gfx/boosterpacks/evolution2.png
index 09affa5..09affa5 100644
--- a/gfx/boosterpacks/evolution2.t10.png
+++ b/gfx/boosterpacks/evolution2.png
diff --git a/gfx/boosterpacks/laboratory2.t10.png b/gfx/boosterpacks/laboratory2.png
index 4feb880..4feb880 100644
--- a/gfx/boosterpacks/laboratory2.t10.png
+++ b/gfx/boosterpacks/laboratory2.png
diff --git a/gfx/boosterpacks/mystery2.t10.png b/gfx/boosterpacks/mystery2.png
index fc04dbf..fc04dbf 100644
--- a/gfx/boosterpacks/mystery2.t10.png
+++ b/gfx/boosterpacks/mystery2.png
diff --git a/gfx/cardpop1.t3.png b/gfx/cardpop1.png
index c607d8d..c607d8d 100644
--- a/gfx/cardpop1.t3.png
+++ b/gfx/cardpop1.png
diff --git a/gfx/cardpop2.t3.png b/gfx/cardpop2.png
index 75e5149..75e5149 100644
--- a/gfx/cardpop2.t3.png
+++ b/gfx/cardpop2.png
diff --git a/gfx/cardpop3.t3.png b/gfx/cardpop3.png
index 48bd233..48bd233 100644
--- a/gfx/cardpop3.t3.png
+++ b/gfx/cardpop3.png
diff --git a/gfx/cards/abra.8x6.png b/gfx/cards/abra.png
index 336068c..336068c 100644
--- a/gfx/cards/abra.8x6.png
+++ b/gfx/cards/abra.png
diff --git a/gfx/cards/aerodactyl.8x6.png b/gfx/cards/aerodactyl.png
index f250570..f250570 100644
--- a/gfx/cards/aerodactyl.8x6.png
+++ b/gfx/cards/aerodactyl.png
diff --git a/gfx/cards/alakazam.8x6.png b/gfx/cards/alakazam.png
index de51bc8..de51bc8 100644
--- a/gfx/cards/alakazam.8x6.png
+++ b/gfx/cards/alakazam.png
diff --git a/gfx/cards/arbok.8x6.png b/gfx/cards/arbok.png
index 4d0bccb..4d0bccb 100644
--- a/gfx/cards/arbok.8x6.png
+++ b/gfx/cards/arbok.png
diff --git a/gfx/cards/arcanine1.8x6.png b/gfx/cards/arcanine1.png
index 31cb8b0..31cb8b0 100644
--- a/gfx/cards/arcanine1.8x6.png
+++ b/gfx/cards/arcanine1.png
diff --git a/gfx/cards/arcanine2.8x6.png b/gfx/cards/arcanine2.png
index 64fc0bd..64fc0bd 100644
--- a/gfx/cards/arcanine2.8x6.png
+++ b/gfx/cards/arcanine2.png
diff --git a/gfx/cards/articuno1.8x6.png b/gfx/cards/articuno1.png
index f9c54c4..f9c54c4 100644
--- a/gfx/cards/articuno1.8x6.png
+++ b/gfx/cards/articuno1.png
diff --git a/gfx/cards/articuno2.8x6.png b/gfx/cards/articuno2.png
index d7bdc49..d7bdc49 100644
--- a/gfx/cards/articuno2.8x6.png
+++ b/gfx/cards/articuno2.png
diff --git a/gfx/cards/beedrill.8x6.png b/gfx/cards/beedrill.png
index ec6af50..ec6af50 100644
--- a/gfx/cards/beedrill.8x6.png
+++ b/gfx/cards/beedrill.png
diff --git a/gfx/cards/bellsprout.8x6.png b/gfx/cards/bellsprout.png
index 6dd6297..6dd6297 100644
--- a/gfx/cards/bellsprout.8x6.png
+++ b/gfx/cards/bellsprout.png
diff --git a/gfx/cards/bill.8x6.png b/gfx/cards/bill.png
index f730116..f730116 100644
--- a/gfx/cards/bill.8x6.png
+++ b/gfx/cards/bill.png
diff --git a/gfx/cards/blastoise.8x6.png b/gfx/cards/blastoise.png
index 68c7ddb..68c7ddb 100644
--- a/gfx/cards/blastoise.8x6.png
+++ b/gfx/cards/blastoise.png
diff --git a/gfx/cards/bulbasaur.8x6.png b/gfx/cards/bulbasaur.png
index fdb0552..fdb0552 100644
--- a/gfx/cards/bulbasaur.8x6.png
+++ b/gfx/cards/bulbasaur.png
diff --git a/gfx/cards/butterfree.8x6.png b/gfx/cards/butterfree.png
index 5c02eb1..5c02eb1 100644
--- a/gfx/cards/butterfree.8x6.png
+++ b/gfx/cards/butterfree.png
diff --git a/gfx/cards/caterpie.8x6.png b/gfx/cards/caterpie.png
index c1784e0..c1784e0 100644
--- a/gfx/cards/caterpie.8x6.png
+++ b/gfx/cards/caterpie.png
diff --git a/gfx/cards/chansey.8x6.png b/gfx/cards/chansey.png
index e63a246..e63a246 100644
--- a/gfx/cards/chansey.8x6.png
+++ b/gfx/cards/chansey.png
diff --git a/gfx/cards/charizard.8x6.png b/gfx/cards/charizard.png
index d5d22ef..d5d22ef 100644
--- a/gfx/cards/charizard.8x6.png
+++ b/gfx/cards/charizard.png
diff --git a/gfx/cards/charmander.8x6.png b/gfx/cards/charmander.png
index 7fadeaf..7fadeaf 100644
--- a/gfx/cards/charmander.8x6.png
+++ b/gfx/cards/charmander.png
diff --git a/gfx/cards/charmeleon.8x6.png b/gfx/cards/charmeleon.png
index c996d81..c996d81 100644
--- a/gfx/cards/charmeleon.8x6.png
+++ b/gfx/cards/charmeleon.png
diff --git a/gfx/cards/clefable.8x6.png b/gfx/cards/clefable.png
index 014b1b9..014b1b9 100644
--- a/gfx/cards/clefable.8x6.png
+++ b/gfx/cards/clefable.png
diff --git a/gfx/cards/clefairy.8x6.png b/gfx/cards/clefairy.png
index cfc66ef..cfc66ef 100644
--- a/gfx/cards/clefairy.8x6.png
+++ b/gfx/cards/clefairy.png
diff --git a/gfx/cards/clefairydoll.8x6.png b/gfx/cards/clefairydoll.png
index c12f8c4..c12f8c4 100644
--- a/gfx/cards/clefairydoll.8x6.png
+++ b/gfx/cards/clefairydoll.png
diff --git a/gfx/cards/cloyster.8x6.png b/gfx/cards/cloyster.png
index 5f59e88..5f59e88 100644
--- a/gfx/cards/cloyster.8x6.png
+++ b/gfx/cards/cloyster.png
diff --git a/gfx/cards/computersearch.8x6.png b/gfx/cards/computersearch.png
index 79f1c78..79f1c78 100644
--- a/gfx/cards/computersearch.8x6.png
+++ b/gfx/cards/computersearch.png
diff --git a/gfx/cards/cubone.8x6.png b/gfx/cards/cubone.png
index 49d5b23..49d5b23 100644
--- a/gfx/cards/cubone.8x6.png
+++ b/gfx/cards/cubone.png
diff --git a/gfx/cards/defender.8x6.png b/gfx/cards/defender.png
index adde4fc..adde4fc 100644
--- a/gfx/cards/defender.8x6.png
+++ b/gfx/cards/defender.png
diff --git a/gfx/cards/devolutionspray.8x6.png b/gfx/cards/devolutionspray.png
index b3b69a4..b3b69a4 100644
--- a/gfx/cards/devolutionspray.8x6.png
+++ b/gfx/cards/devolutionspray.png
diff --git a/gfx/cards/dewgong.8x6.png b/gfx/cards/dewgong.png
index c4be81b..c4be81b 100644
--- a/gfx/cards/dewgong.8x6.png
+++ b/gfx/cards/dewgong.png
diff --git a/gfx/cards/diglett.8x6.png b/gfx/cards/diglett.png
index cae6aef..cae6aef 100644
--- a/gfx/cards/diglett.8x6.png
+++ b/gfx/cards/diglett.png
diff --git a/gfx/cards/ditto.8x6.png b/gfx/cards/ditto.png
index 566dcf4..566dcf4 100644
--- a/gfx/cards/ditto.8x6.png
+++ b/gfx/cards/ditto.png
diff --git a/gfx/cards/dodrio.8x6.png b/gfx/cards/dodrio.png
index 222bb79..222bb79 100644
--- a/gfx/cards/dodrio.8x6.png
+++ b/gfx/cards/dodrio.png
diff --git a/gfx/cards/doduo.8x6.png b/gfx/cards/doduo.png
index fad2467..fad2467 100644
--- a/gfx/cards/doduo.8x6.png
+++ b/gfx/cards/doduo.png
diff --git a/gfx/cards/doublecolorlessenergy.8x6.png b/gfx/cards/doublecolorlessenergy.png
index b3b367b..b3b367b 100644
--- a/gfx/cards/doublecolorlessenergy.8x6.png
+++ b/gfx/cards/doublecolorlessenergy.png
diff --git a/gfx/cards/dragonair.8x6.png b/gfx/cards/dragonair.png
index e0cf766..e0cf766 100644
--- a/gfx/cards/dragonair.8x6.png
+++ b/gfx/cards/dragonair.png
diff --git a/gfx/cards/dragonite1.8x6.png b/gfx/cards/dragonite1.png
index 10c4ed9..10c4ed9 100644
--- a/gfx/cards/dragonite1.8x6.png
+++ b/gfx/cards/dragonite1.png
diff --git a/gfx/cards/dragonite2.8x6.png b/gfx/cards/dragonite2.png
index 9d15c00..9d15c00 100644
--- a/gfx/cards/dragonite2.8x6.png
+++ b/gfx/cards/dragonite2.png
diff --git a/gfx/cards/dratini.8x6.png b/gfx/cards/dratini.png
index 1c66ac3..1c66ac3 100644
--- a/gfx/cards/dratini.8x6.png
+++ b/gfx/cards/dratini.png
diff --git a/gfx/cards/drowzee.8x6.png b/gfx/cards/drowzee.png
index 3239903..3239903 100644
--- a/gfx/cards/drowzee.8x6.png
+++ b/gfx/cards/drowzee.png
diff --git a/gfx/cards/dugtrio.8x6.png b/gfx/cards/dugtrio.png
index bffe640..bffe640 100644
--- a/gfx/cards/dugtrio.8x6.png
+++ b/gfx/cards/dugtrio.png
diff --git a/gfx/cards/eevee.8x6.png b/gfx/cards/eevee.png
index 3114928..3114928 100644
--- a/gfx/cards/eevee.8x6.png
+++ b/gfx/cards/eevee.png
diff --git a/gfx/cards/ekans.8x6.png b/gfx/cards/ekans.png
index 416e073..416e073 100644
--- a/gfx/cards/ekans.8x6.png
+++ b/gfx/cards/ekans.png
diff --git a/gfx/cards/electabuzz1.8x6.png b/gfx/cards/electabuzz1.png
index 75ed8f5..75ed8f5 100644
--- a/gfx/cards/electabuzz1.8x6.png
+++ b/gfx/cards/electabuzz1.png
diff --git a/gfx/cards/electabuzz2.8x6.png b/gfx/cards/electabuzz2.png
index 8ca64a8..8ca64a8 100644
--- a/gfx/cards/electabuzz2.8x6.png
+++ b/gfx/cards/electabuzz2.png
diff --git a/gfx/cards/electrode1.8x6.png b/gfx/cards/electrode1.png
index cdc1fca..cdc1fca 100644
--- a/gfx/cards/electrode1.8x6.png
+++ b/gfx/cards/electrode1.png
diff --git a/gfx/cards/electrode2.8x6.png b/gfx/cards/electrode2.png
index 29ccc8b..29ccc8b 100644
--- a/gfx/cards/electrode2.8x6.png
+++ b/gfx/cards/electrode2.png
diff --git a/gfx/cards/energyremoval.8x6.png b/gfx/cards/energyremoval.png
index 1958df7..1958df7 100644
--- a/gfx/cards/energyremoval.8x6.png
+++ b/gfx/cards/energyremoval.png
diff --git a/gfx/cards/energyretrieval.8x6.png b/gfx/cards/energyretrieval.png
index 270f967..270f967 100644
--- a/gfx/cards/energyretrieval.8x6.png
+++ b/gfx/cards/energyretrieval.png
diff --git a/gfx/cards/energysearch.8x6.png b/gfx/cards/energysearch.png
index d5d5328..d5d5328 100644
--- a/gfx/cards/energysearch.8x6.png
+++ b/gfx/cards/energysearch.png
diff --git a/gfx/cards/exeggcute.8x6.png b/gfx/cards/exeggcute.png
index 585aa5d..585aa5d 100644
--- a/gfx/cards/exeggcute.8x6.png
+++ b/gfx/cards/exeggcute.png
diff --git a/gfx/cards/exeggutor.8x6.png b/gfx/cards/exeggutor.png
index 6687638..6687638 100644
--- a/gfx/cards/exeggutor.8x6.png
+++ b/gfx/cards/exeggutor.png
diff --git a/gfx/cards/farfetchd.8x6.png b/gfx/cards/farfetchd.png
index b156585..b156585 100644
--- a/gfx/cards/farfetchd.8x6.png
+++ b/gfx/cards/farfetchd.png
diff --git a/gfx/cards/fearow.8x6.png b/gfx/cards/fearow.png
index 25f0d12..25f0d12 100644
--- a/gfx/cards/fearow.8x6.png
+++ b/gfx/cards/fearow.png
diff --git a/gfx/cards/fightingenergy.8x6.png b/gfx/cards/fightingenergy.png
index 2c63c5b..2c63c5b 100644
--- a/gfx/cards/fightingenergy.8x6.png
+++ b/gfx/cards/fightingenergy.png
diff --git a/gfx/cards/fireenergy.8x6.png b/gfx/cards/fireenergy.png
index 2cb3419..2cb3419 100644
--- a/gfx/cards/fireenergy.8x6.png
+++ b/gfx/cards/fireenergy.png
diff --git a/gfx/cards/flareon1.8x6.png b/gfx/cards/flareon1.png
index eb5ebe3..eb5ebe3 100644
--- a/gfx/cards/flareon1.8x6.png
+++ b/gfx/cards/flareon1.png
diff --git a/gfx/cards/flareon2.8x6.png b/gfx/cards/flareon2.png
index 6c32566..6c32566 100644
--- a/gfx/cards/flareon2.8x6.png
+++ b/gfx/cards/flareon2.png
diff --git a/gfx/cards/flyingpikachu.8x6.png b/gfx/cards/flyingpikachu.png
index 14168a3..14168a3 100644
--- a/gfx/cards/flyingpikachu.8x6.png
+++ b/gfx/cards/flyingpikachu.png
diff --git a/gfx/cards/fullheal.8x6.png b/gfx/cards/fullheal.png
index 281cc20..281cc20 100644
--- a/gfx/cards/fullheal.8x6.png
+++ b/gfx/cards/fullheal.png
diff --git a/gfx/cards/gambler.8x6.png b/gfx/cards/gambler.png
index 1aeb1e3..1aeb1e3 100644
--- a/gfx/cards/gambler.8x6.png
+++ b/gfx/cards/gambler.png
diff --git a/gfx/cards/gastly1.8x6.png b/gfx/cards/gastly1.png
index 2a7bd88..2a7bd88 100644
--- a/gfx/cards/gastly1.8x6.png
+++ b/gfx/cards/gastly1.png
diff --git a/gfx/cards/gastly2.8x6.png b/gfx/cards/gastly2.png
index b9d56b2..b9d56b2 100644
--- a/gfx/cards/gastly2.8x6.png
+++ b/gfx/cards/gastly2.png
diff --git a/gfx/cards/gengar.8x6.png b/gfx/cards/gengar.png
index 53d9bf9..53d9bf9 100644
--- a/gfx/cards/gengar.8x6.png
+++ b/gfx/cards/gengar.png
diff --git a/gfx/cards/geodude.8x6.png b/gfx/cards/geodude.png
index 1c5a0fb..1c5a0fb 100644
--- a/gfx/cards/geodude.8x6.png
+++ b/gfx/cards/geodude.png
diff --git a/gfx/cards/gloom.8x6.png b/gfx/cards/gloom.png
index 973001b..973001b 100644
--- a/gfx/cards/gloom.8x6.png
+++ b/gfx/cards/gloom.png
diff --git a/gfx/cards/golbat.8x6.png b/gfx/cards/golbat.png
index 342b48c..342b48c 100644
--- a/gfx/cards/golbat.8x6.png
+++ b/gfx/cards/golbat.png
diff --git a/gfx/cards/goldeen.8x6.png b/gfx/cards/goldeen.png
index 8427b7b..8427b7b 100644
--- a/gfx/cards/goldeen.8x6.png
+++ b/gfx/cards/goldeen.png
diff --git a/gfx/cards/golduck.8x6.png b/gfx/cards/golduck.png
index cdbdf51..cdbdf51 100644
--- a/gfx/cards/golduck.8x6.png
+++ b/gfx/cards/golduck.png
diff --git a/gfx/cards/golem.8x6.png b/gfx/cards/golem.png
index e64b911..e64b911 100644
--- a/gfx/cards/golem.8x6.png
+++ b/gfx/cards/golem.png
diff --git a/gfx/cards/grassenergy.8x6.png b/gfx/cards/grassenergy.png
index b9c482f..b9c482f 100644
--- a/gfx/cards/grassenergy.8x6.png
+++ b/gfx/cards/grassenergy.png
diff --git a/gfx/cards/graveler.8x6.png b/gfx/cards/graveler.png
index 13a8892..13a8892 100644
--- a/gfx/cards/graveler.8x6.png
+++ b/gfx/cards/graveler.png
diff --git a/gfx/cards/grimer.8x6.png b/gfx/cards/grimer.png
index 19a6737..19a6737 100644
--- a/gfx/cards/grimer.8x6.png
+++ b/gfx/cards/grimer.png
diff --git a/gfx/cards/growlithe.8x6.png b/gfx/cards/growlithe.png
index 76ce33c..76ce33c 100644
--- a/gfx/cards/growlithe.8x6.png
+++ b/gfx/cards/growlithe.png
diff --git a/gfx/cards/gustofwind.8x6.png b/gfx/cards/gustofwind.png
index 70de29d..70de29d 100644
--- a/gfx/cards/gustofwind.8x6.png
+++ b/gfx/cards/gustofwind.png
diff --git a/gfx/cards/gyarados.8x6.png b/gfx/cards/gyarados.png
index 20c5dac..20c5dac 100644
--- a/gfx/cards/gyarados.8x6.png
+++ b/gfx/cards/gyarados.png
diff --git a/gfx/cards/haunter1.8x6.png b/gfx/cards/haunter1.png
index 1dc1869..1dc1869 100644
--- a/gfx/cards/haunter1.8x6.png
+++ b/gfx/cards/haunter1.png
diff --git a/gfx/cards/haunter2.8x6.png b/gfx/cards/haunter2.png
index ffb76a2..ffb76a2 100644
--- a/gfx/cards/haunter2.8x6.png
+++ b/gfx/cards/haunter2.png
diff --git a/gfx/cards/hitmonchan.8x6.png b/gfx/cards/hitmonchan.png
index e9869ac..e9869ac 100644
--- a/gfx/cards/hitmonchan.8x6.png
+++ b/gfx/cards/hitmonchan.png
diff --git a/gfx/cards/hitmonlee.8x6.png b/gfx/cards/hitmonlee.png
index e67fe78..e67fe78 100644
--- a/gfx/cards/hitmonlee.8x6.png
+++ b/gfx/cards/hitmonlee.png
diff --git a/gfx/cards/horsea.8x6.png b/gfx/cards/horsea.png
index 19a95d8..19a95d8 100644
--- a/gfx/cards/horsea.8x6.png
+++ b/gfx/cards/horsea.png
diff --git a/gfx/cards/hypno.8x6.png b/gfx/cards/hypno.png
index e58a6c2..e58a6c2 100644
--- a/gfx/cards/hypno.8x6.png
+++ b/gfx/cards/hypno.png
diff --git a/gfx/cards/imakuni.8x6.png b/gfx/cards/imakuni.png
index ff95e64..ff95e64 100644
--- a/gfx/cards/imakuni.8x6.png
+++ b/gfx/cards/imakuni.png
diff --git a/gfx/cards/imposterprofessoroak.8x6.png b/gfx/cards/imposterprofessoroak.png
index 2f78301..2f78301 100644
--- a/gfx/cards/imposterprofessoroak.8x6.png
+++ b/gfx/cards/imposterprofessoroak.png
diff --git a/gfx/cards/itemfinder.8x6.png b/gfx/cards/itemfinder.png
index 3ba1499..3ba1499 100644
--- a/gfx/cards/itemfinder.8x6.png
+++ b/gfx/cards/itemfinder.png
diff --git a/gfx/cards/ivysaur.8x6.png b/gfx/cards/ivysaur.png
index 4220b52..4220b52 100644
--- a/gfx/cards/ivysaur.8x6.png
+++ b/gfx/cards/ivysaur.png
diff --git a/gfx/cards/jigglypuff1.8x6.png b/gfx/cards/jigglypuff1.png
index 0986137..0986137 100644
--- a/gfx/cards/jigglypuff1.8x6.png
+++ b/gfx/cards/jigglypuff1.png
diff --git a/gfx/cards/jigglypuff2.8x6.png b/gfx/cards/jigglypuff2.png
index 8fb626e..8fb626e 100644
--- a/gfx/cards/jigglypuff2.8x6.png
+++ b/gfx/cards/jigglypuff2.png
diff --git a/gfx/cards/jigglypuff3.8x6.png b/gfx/cards/jigglypuff3.png
index b67b5ba..b67b5ba 100644
--- a/gfx/cards/jigglypuff3.8x6.png
+++ b/gfx/cards/jigglypuff3.png
diff --git a/gfx/cards/jolteon1.8x6.png b/gfx/cards/jolteon1.png
index 81d403b..81d403b 100644
--- a/gfx/cards/jolteon1.8x6.png
+++ b/gfx/cards/jolteon1.png
diff --git a/gfx/cards/jolteon2.8x6.png b/gfx/cards/jolteon2.png
index 308966c..308966c 100644
--- a/gfx/cards/jolteon2.8x6.png
+++ b/gfx/cards/jolteon2.png
diff --git a/gfx/cards/jynx.8x6.png b/gfx/cards/jynx.png
index 048ae21..048ae21 100644
--- a/gfx/cards/jynx.8x6.png
+++ b/gfx/cards/jynx.png
diff --git a/gfx/cards/kabuto.8x6.png b/gfx/cards/kabuto.png
index 3ebcaf7..3ebcaf7 100644
--- a/gfx/cards/kabuto.8x6.png
+++ b/gfx/cards/kabuto.png
diff --git a/gfx/cards/kabutops.8x6.png b/gfx/cards/kabutops.png
index 4efff6b..4efff6b 100644
--- a/gfx/cards/kabutops.8x6.png
+++ b/gfx/cards/kabutops.png
diff --git a/gfx/cards/kadabra.8x6.png b/gfx/cards/kadabra.png
index fe66443..fe66443 100644
--- a/gfx/cards/kadabra.8x6.png
+++ b/gfx/cards/kadabra.png
diff --git a/gfx/cards/kakuna.8x6.png b/gfx/cards/kakuna.png
index 9739a1b..9739a1b 100644
--- a/gfx/cards/kakuna.8x6.png
+++ b/gfx/cards/kakuna.png
diff --git a/gfx/cards/kangaskhan.8x6.png b/gfx/cards/kangaskhan.png
index 192fba2..192fba2 100644
--- a/gfx/cards/kangaskhan.8x6.png
+++ b/gfx/cards/kangaskhan.png
diff --git a/gfx/cards/kingler.8x6.png b/gfx/cards/kingler.png
index 19966d9..19966d9 100644
--- a/gfx/cards/kingler.8x6.png
+++ b/gfx/cards/kingler.png
diff --git a/gfx/cards/koffing.8x6.png b/gfx/cards/koffing.png
index cda1a9d..cda1a9d 100644
--- a/gfx/cards/koffing.8x6.png
+++ b/gfx/cards/koffing.png
diff --git a/gfx/cards/krabby.8x6.png b/gfx/cards/krabby.png
index 5dda9a9..5dda9a9 100644
--- a/gfx/cards/krabby.8x6.png
+++ b/gfx/cards/krabby.png
diff --git a/gfx/cards/lapras.8x6.png b/gfx/cards/lapras.png
index 2212622..2212622 100644
--- a/gfx/cards/lapras.8x6.png
+++ b/gfx/cards/lapras.png
diff --git a/gfx/cards/lass.8x6.png b/gfx/cards/lass.png
index aad9f17..aad9f17 100644
--- a/gfx/cards/lass.8x6.png
+++ b/gfx/cards/lass.png
diff --git a/gfx/cards/lickitung.8x6.png b/gfx/cards/lickitung.png
index 857e21a..857e21a 100644
--- a/gfx/cards/lickitung.8x6.png
+++ b/gfx/cards/lickitung.png
diff --git a/gfx/cards/lightningenergy.8x6.png b/gfx/cards/lightningenergy.png
index 3fdc83c..3fdc83c 100644
--- a/gfx/cards/lightningenergy.8x6.png
+++ b/gfx/cards/lightningenergy.png
diff --git a/gfx/cards/machamp.8x6.png b/gfx/cards/machamp.png
index 55f52fb..55f52fb 100644
--- a/gfx/cards/machamp.8x6.png
+++ b/gfx/cards/machamp.png
diff --git a/gfx/cards/machoke.8x6.png b/gfx/cards/machoke.png
index 943d13a..943d13a 100644
--- a/gfx/cards/machoke.8x6.png
+++ b/gfx/cards/machoke.png
diff --git a/gfx/cards/machop.8x6.png b/gfx/cards/machop.png
index 256a710..256a710 100644
--- a/gfx/cards/machop.8x6.png
+++ b/gfx/cards/machop.png
diff --git a/gfx/cards/magikarp.8x6.png b/gfx/cards/magikarp.png
index 0f40b78..0f40b78 100644
--- a/gfx/cards/magikarp.8x6.png
+++ b/gfx/cards/magikarp.png
diff --git a/gfx/cards/magmar1.8x6.png b/gfx/cards/magmar1.png
index 571bdc6..571bdc6 100644
--- a/gfx/cards/magmar1.8x6.png
+++ b/gfx/cards/magmar1.png
diff --git a/gfx/cards/magmar2.8x6.png b/gfx/cards/magmar2.png
index 64cd043..64cd043 100644
--- a/gfx/cards/magmar2.8x6.png
+++ b/gfx/cards/magmar2.png
diff --git a/gfx/cards/magnemite1.8x6.png b/gfx/cards/magnemite1.png
index d81dfb3..d81dfb3 100644
--- a/gfx/cards/magnemite1.8x6.png
+++ b/gfx/cards/magnemite1.png
diff --git a/gfx/cards/magnemite2.8x6.png b/gfx/cards/magnemite2.png
index 8cb3f4d..8cb3f4d 100644
--- a/gfx/cards/magnemite2.8x6.png
+++ b/gfx/cards/magnemite2.png
diff --git a/gfx/cards/magneton1.8x6.png b/gfx/cards/magneton1.png
index efcc9f9..efcc9f9 100644
--- a/gfx/cards/magneton1.8x6.png
+++ b/gfx/cards/magneton1.png
diff --git a/gfx/cards/magneton2.8x6.png b/gfx/cards/magneton2.png
index e20b2f4..e20b2f4 100644
--- a/gfx/cards/magneton2.8x6.png
+++ b/gfx/cards/magneton2.png
diff --git a/gfx/cards/maintenance.8x6.png b/gfx/cards/maintenance.png
index 915487a..915487a 100644
--- a/gfx/cards/maintenance.8x6.png
+++ b/gfx/cards/maintenance.png
diff --git a/gfx/cards/mankey.8x6.png b/gfx/cards/mankey.png
index 06b4ab3..06b4ab3 100644
--- a/gfx/cards/mankey.8x6.png
+++ b/gfx/cards/mankey.png
diff --git a/gfx/cards/marowak1.8x6.png b/gfx/cards/marowak1.png
index 10d6eca..10d6eca 100644
--- a/gfx/cards/marowak1.8x6.png
+++ b/gfx/cards/marowak1.png
diff --git a/gfx/cards/marowak2.8x6.png b/gfx/cards/marowak2.png
index a7023bc..a7023bc 100644
--- a/gfx/cards/marowak2.8x6.png
+++ b/gfx/cards/marowak2.png
diff --git a/gfx/cards/meowth1.8x6.png b/gfx/cards/meowth1.png
index 3225611..3225611 100644
--- a/gfx/cards/meowth1.8x6.png
+++ b/gfx/cards/meowth1.png
diff --git a/gfx/cards/meowth2.8x6.png b/gfx/cards/meowth2.png
index 6dd0c10..6dd0c10 100644
--- a/gfx/cards/meowth2.8x6.png
+++ b/gfx/cards/meowth2.png
diff --git a/gfx/cards/metapod.8x6.png b/gfx/cards/metapod.png
index 3c1df91..3c1df91 100644
--- a/gfx/cards/metapod.8x6.png
+++ b/gfx/cards/metapod.png
diff --git a/gfx/cards/mew1.8x6.png b/gfx/cards/mew1.png
index aa5e5d5..aa5e5d5 100644
--- a/gfx/cards/mew1.8x6.png
+++ b/gfx/cards/mew1.png
diff --git a/gfx/cards/mew2.8x6.png b/gfx/cards/mew2.png
index 8658006..8658006 100644
--- a/gfx/cards/mew2.8x6.png
+++ b/gfx/cards/mew2.png
diff --git a/gfx/cards/mew3.8x6.png b/gfx/cards/mew3.png
index 189a97b..189a97b 100644
--- a/gfx/cards/mew3.8x6.png
+++ b/gfx/cards/mew3.png
diff --git a/gfx/cards/mewtwo1.8x6.png b/gfx/cards/mewtwo1.png
index b5566c5..b5566c5 100644
--- a/gfx/cards/mewtwo1.8x6.png
+++ b/gfx/cards/mewtwo1.png
diff --git a/gfx/cards/mewtwo2.8x6.png b/gfx/cards/mewtwo2.png
index 9f36308..9f36308 100644
--- a/gfx/cards/mewtwo2.8x6.png
+++ b/gfx/cards/mewtwo2.png
diff --git a/gfx/cards/mewtwo3.8x6.png b/gfx/cards/mewtwo3.png
index bbe8c6e..bbe8c6e 100644
--- a/gfx/cards/mewtwo3.8x6.png
+++ b/gfx/cards/mewtwo3.png
diff --git a/gfx/cards/moltres1.8x6.png b/gfx/cards/moltres1.png
index cc867ea..cc867ea 100644
--- a/gfx/cards/moltres1.8x6.png
+++ b/gfx/cards/moltres1.png
diff --git a/gfx/cards/moltres2.8x6.png b/gfx/cards/moltres2.png
index 220cbee..220cbee 100644
--- a/gfx/cards/moltres2.8x6.png
+++ b/gfx/cards/moltres2.png
diff --git a/gfx/cards/mrfuji.8x6.png b/gfx/cards/mrfuji.png
index f012d07..f012d07 100644
--- a/gfx/cards/mrfuji.8x6.png
+++ b/gfx/cards/mrfuji.png
diff --git a/gfx/cards/mrmime.8x6.png b/gfx/cards/mrmime.png
index 2c16ea4..2c16ea4 100644
--- a/gfx/cards/mrmime.8x6.png
+++ b/gfx/cards/mrmime.png
diff --git a/gfx/cards/muk.8x6.png b/gfx/cards/muk.png
index 972d445..972d445 100644
--- a/gfx/cards/muk.8x6.png
+++ b/gfx/cards/muk.png
diff --git a/gfx/cards/mysteriousfossil.8x6.png b/gfx/cards/mysteriousfossil.png
index 93752fc..93752fc 100644
--- a/gfx/cards/mysteriousfossil.8x6.png
+++ b/gfx/cards/mysteriousfossil.png
diff --git a/gfx/cards/nidoking.8x6.png b/gfx/cards/nidoking.png
index eff3ccf..eff3ccf 100644
--- a/gfx/cards/nidoking.8x6.png
+++ b/gfx/cards/nidoking.png
diff --git a/gfx/cards/nidoqueen.8x6.png b/gfx/cards/nidoqueen.png
index 5c67daa..5c67daa 100644
--- a/gfx/cards/nidoqueen.8x6.png
+++ b/gfx/cards/nidoqueen.png
diff --git a/gfx/cards/nidoranf.8x6.png b/gfx/cards/nidoranf.png
index 17de19e..17de19e 100644
--- a/gfx/cards/nidoranf.8x6.png
+++ b/gfx/cards/nidoranf.png
diff --git a/gfx/cards/nidoranm.8x6.png b/gfx/cards/nidoranm.png
index 00718d9..00718d9 100644
--- a/gfx/cards/nidoranm.8x6.png
+++ b/gfx/cards/nidoranm.png
diff --git a/gfx/cards/nidorina.8x6.png b/gfx/cards/nidorina.png
index c879610..c879610 100644
--- a/gfx/cards/nidorina.8x6.png
+++ b/gfx/cards/nidorina.png
diff --git a/gfx/cards/nidorino.8x6.png b/gfx/cards/nidorino.png
index 65f851c..65f851c 100644
--- a/gfx/cards/nidorino.8x6.png
+++ b/gfx/cards/nidorino.png
diff --git a/gfx/cards/ninetails1.8x6.png b/gfx/cards/ninetails1.png
index eba870d..eba870d 100644
--- a/gfx/cards/ninetails1.8x6.png
+++ b/gfx/cards/ninetails1.png
diff --git a/gfx/cards/ninetails2.8x6.png b/gfx/cards/ninetails2.png
index 2003e52..2003e52 100644
--- a/gfx/cards/ninetails2.8x6.png
+++ b/gfx/cards/ninetails2.png
diff --git a/gfx/cards/oddish.8x6.png b/gfx/cards/oddish.png
index b37f1c0..b37f1c0 100644
--- a/gfx/cards/oddish.8x6.png
+++ b/gfx/cards/oddish.png
diff --git a/gfx/cards/omanyte.8x6.png b/gfx/cards/omanyte.png
index b56b359..b56b359 100644
--- a/gfx/cards/omanyte.8x6.png
+++ b/gfx/cards/omanyte.png
diff --git a/gfx/cards/omastar.8x6.png b/gfx/cards/omastar.png
index ba090fc..ba090fc 100644
--- a/gfx/cards/omastar.8x6.png
+++ b/gfx/cards/omastar.png
diff --git a/gfx/cards/onix.8x6.png b/gfx/cards/onix.png
index 5d48c2c..5d48c2c 100644
--- a/gfx/cards/onix.8x6.png
+++ b/gfx/cards/onix.png
diff --git a/gfx/cards/paras.8x6.png b/gfx/cards/paras.png
index 6054beb..6054beb 100644
--- a/gfx/cards/paras.8x6.png
+++ b/gfx/cards/paras.png
diff --git a/gfx/cards/parasect.8x6.png b/gfx/cards/parasect.png
index 3c772f4..3c772f4 100644
--- a/gfx/cards/parasect.8x6.png
+++ b/gfx/cards/parasect.png
diff --git a/gfx/cards/persian.8x6.png b/gfx/cards/persian.png
index 0cdc9ee..0cdc9ee 100644
--- a/gfx/cards/persian.8x6.png
+++ b/gfx/cards/persian.png
diff --git a/gfx/cards/pidgeot1.8x6.png b/gfx/cards/pidgeot1.png
index 4f3422a..4f3422a 100644
--- a/gfx/cards/pidgeot1.8x6.png
+++ b/gfx/cards/pidgeot1.png
diff --git a/gfx/cards/pidgeot2.8x6.png b/gfx/cards/pidgeot2.png
index ede4ad5..ede4ad5 100644
--- a/gfx/cards/pidgeot2.8x6.png
+++ b/gfx/cards/pidgeot2.png
diff --git a/gfx/cards/pidgeotto.8x6.png b/gfx/cards/pidgeotto.png
index ec7e03d..ec7e03d 100644
--- a/gfx/cards/pidgeotto.8x6.png
+++ b/gfx/cards/pidgeotto.png
diff --git a/gfx/cards/pidgey.8x6.png b/gfx/cards/pidgey.png
index 5fc97a5..5fc97a5 100644
--- a/gfx/cards/pidgey.8x6.png
+++ b/gfx/cards/pidgey.png
diff --git a/gfx/cards/pikachu1.8x6.png b/gfx/cards/pikachu1.png
index 5696eb2..5696eb2 100644
--- a/gfx/cards/pikachu1.8x6.png
+++ b/gfx/cards/pikachu1.png
diff --git a/gfx/cards/pikachu2.8x6.png b/gfx/cards/pikachu2.png
index b97b530..b97b530 100644
--- a/gfx/cards/pikachu2.8x6.png
+++ b/gfx/cards/pikachu2.png
diff --git a/gfx/cards/pikachu3.8x6.png b/gfx/cards/pikachu3.png
index 4dec614..4dec614 100644
--- a/gfx/cards/pikachu3.8x6.png
+++ b/gfx/cards/pikachu3.png
diff --git a/gfx/cards/pikachu4.8x6.png b/gfx/cards/pikachu4.png
index b355807..b355807 100644
--- a/gfx/cards/pikachu4.8x6.png
+++ b/gfx/cards/pikachu4.png
diff --git a/gfx/cards/pinsir.8x6.png b/gfx/cards/pinsir.png
index 1e23b81..1e23b81 100644
--- a/gfx/cards/pinsir.8x6.png
+++ b/gfx/cards/pinsir.png
diff --git a/gfx/cards/pluspower.8x6.png b/gfx/cards/pluspower.png
index efb4b1c..efb4b1c 100644
--- a/gfx/cards/pluspower.8x6.png
+++ b/gfx/cards/pluspower.png
diff --git a/gfx/cards/pokeball.8x6.png b/gfx/cards/pokeball.png
index bd99dfd..bd99dfd 100644
--- a/gfx/cards/pokeball.8x6.png
+++ b/gfx/cards/pokeball.png
diff --git a/gfx/cards/pokedex.8x6.png b/gfx/cards/pokedex.png
index 970be3e..970be3e 100644
--- a/gfx/cards/pokedex.8x6.png
+++ b/gfx/cards/pokedex.png
diff --git a/gfx/cards/pokemonbreeder.8x6.png b/gfx/cards/pokemonbreeder.png
index 0661bde..0661bde 100644
--- a/gfx/cards/pokemonbreeder.8x6.png
+++ b/gfx/cards/pokemonbreeder.png
diff --git a/gfx/cards/pokemoncenter.8x6.png b/gfx/cards/pokemoncenter.png
index 2ddffb8..2ddffb8 100644
--- a/gfx/cards/pokemoncenter.8x6.png
+++ b/gfx/cards/pokemoncenter.png
diff --git a/gfx/cards/pokemonflute.8x6.png b/gfx/cards/pokemonflute.png
index f9cb9df..f9cb9df 100644
--- a/gfx/cards/pokemonflute.8x6.png
+++ b/gfx/cards/pokemonflute.png
diff --git a/gfx/cards/pokemontrader.8x6.png b/gfx/cards/pokemontrader.png
index c35959d..c35959d 100644
--- a/gfx/cards/pokemontrader.8x6.png
+++ b/gfx/cards/pokemontrader.png
diff --git a/gfx/cards/poliwag.8x6.png b/gfx/cards/poliwag.png
index e555007..e555007 100644
--- a/gfx/cards/poliwag.8x6.png
+++ b/gfx/cards/poliwag.png
diff --git a/gfx/cards/poliwhirl.8x6.png b/gfx/cards/poliwhirl.png
index bf73eca..bf73eca 100644
--- a/gfx/cards/poliwhirl.8x6.png
+++ b/gfx/cards/poliwhirl.png
diff --git a/gfx/cards/poliwrath.8x6.png b/gfx/cards/poliwrath.png
index d4af8a2..d4af8a2 100644
--- a/gfx/cards/poliwrath.8x6.png
+++ b/gfx/cards/poliwrath.png
diff --git a/gfx/cards/ponyta.8x6.png b/gfx/cards/ponyta.png
index 051665a..051665a 100644
--- a/gfx/cards/ponyta.8x6.png
+++ b/gfx/cards/ponyta.png
diff --git a/gfx/cards/porygon.8x6.png b/gfx/cards/porygon.png
index bd21d61..bd21d61 100644
--- a/gfx/cards/porygon.8x6.png
+++ b/gfx/cards/porygon.png
diff --git a/gfx/cards/potion.8x6.png b/gfx/cards/potion.png
index 2ea8805..2ea8805 100644
--- a/gfx/cards/potion.8x6.png
+++ b/gfx/cards/potion.png
diff --git a/gfx/cards/primeape.8x6.png b/gfx/cards/primeape.png
index 6b3186d..6b3186d 100644
--- a/gfx/cards/primeape.8x6.png
+++ b/gfx/cards/primeape.png
diff --git a/gfx/cards/professoroak.8x6.png b/gfx/cards/professoroak.png
index 1073c5a..1073c5a 100644
--- a/gfx/cards/professoroak.8x6.png
+++ b/gfx/cards/professoroak.png
diff --git a/gfx/cards/psychicenergy.8x6.png b/gfx/cards/psychicenergy.png
index d2ed9ab..d2ed9ab 100644
--- a/gfx/cards/psychicenergy.8x6.png
+++ b/gfx/cards/psychicenergy.png
diff --git a/gfx/cards/psyduck.8x6.png b/gfx/cards/psyduck.png
index 22f2188..22f2188 100644
--- a/gfx/cards/psyduck.8x6.png
+++ b/gfx/cards/psyduck.png
diff --git a/gfx/cards/raichu1.8x6.png b/gfx/cards/raichu1.png
index 84aa606..84aa606 100644
--- a/gfx/cards/raichu1.8x6.png
+++ b/gfx/cards/raichu1.png
diff --git a/gfx/cards/raichu2.8x6.png b/gfx/cards/raichu2.png
index 708699a..708699a 100644
--- a/gfx/cards/raichu2.8x6.png
+++ b/gfx/cards/raichu2.png
diff --git a/gfx/cards/rapidash.8x6.png b/gfx/cards/rapidash.png
index 0ae1186..0ae1186 100644
--- a/gfx/cards/rapidash.8x6.png
+++ b/gfx/cards/rapidash.png
diff --git a/gfx/cards/raticate.8x6.png b/gfx/cards/raticate.png
index 8c79e7f..8c79e7f 100644
--- a/gfx/cards/raticate.8x6.png
+++ b/gfx/cards/raticate.png
diff --git a/gfx/cards/rattata.8x6.png b/gfx/cards/rattata.png
index 2bf4f19..2bf4f19 100644
--- a/gfx/cards/rattata.8x6.png
+++ b/gfx/cards/rattata.png
diff --git a/gfx/cards/recycle.8x6.png b/gfx/cards/recycle.png
index e7e809c..e7e809c 100644
--- a/gfx/cards/recycle.8x6.png
+++ b/gfx/cards/recycle.png
diff --git a/gfx/cards/revive.8x6.png b/gfx/cards/revive.png
index 6cf1afa..6cf1afa 100644
--- a/gfx/cards/revive.8x6.png
+++ b/gfx/cards/revive.png
diff --git a/gfx/cards/rhydon.8x6.png b/gfx/cards/rhydon.png
index c420a66..c420a66 100644
--- a/gfx/cards/rhydon.8x6.png
+++ b/gfx/cards/rhydon.png
diff --git a/gfx/cards/rhyhorn.8x6.png b/gfx/cards/rhyhorn.png
index 591f7b5..591f7b5 100644
--- a/gfx/cards/rhyhorn.8x6.png
+++ b/gfx/cards/rhyhorn.png
diff --git a/gfx/cards/sandshrew.8x6.png b/gfx/cards/sandshrew.png
index db01d0c..db01d0c 100644
--- a/gfx/cards/sandshrew.8x6.png
+++ b/gfx/cards/sandshrew.png
diff --git a/gfx/cards/sandslash.8x6.png b/gfx/cards/sandslash.png
index 438b2e2..438b2e2 100644
--- a/gfx/cards/sandslash.8x6.png
+++ b/gfx/cards/sandslash.png
diff --git a/gfx/cards/scoopup.8x6.png b/gfx/cards/scoopup.png
index 3e75ec7..3e75ec7 100644
--- a/gfx/cards/scoopup.8x6.png
+++ b/gfx/cards/scoopup.png
diff --git a/gfx/cards/scyther.8x6.png b/gfx/cards/scyther.png
index 85d9255..85d9255 100644
--- a/gfx/cards/scyther.8x6.png
+++ b/gfx/cards/scyther.png
diff --git a/gfx/cards/seadra.8x6.png b/gfx/cards/seadra.png
index 168eb4e..168eb4e 100644
--- a/gfx/cards/seadra.8x6.png
+++ b/gfx/cards/seadra.png
diff --git a/gfx/cards/seaking.8x6.png b/gfx/cards/seaking.png
index ada6702..ada6702 100644
--- a/gfx/cards/seaking.8x6.png
+++ b/gfx/cards/seaking.png
diff --git a/gfx/cards/seel.8x6.png b/gfx/cards/seel.png
index 9face9f..9face9f 100644
--- a/gfx/cards/seel.8x6.png
+++ b/gfx/cards/seel.png
diff --git a/gfx/cards/shellder.8x6.png b/gfx/cards/shellder.png
index ad49832..ad49832 100644
--- a/gfx/cards/shellder.8x6.png
+++ b/gfx/cards/shellder.png
diff --git a/gfx/cards/slowbro.8x6.png b/gfx/cards/slowbro.png
index ad59fd6..ad59fd6 100644
--- a/gfx/cards/slowbro.8x6.png
+++ b/gfx/cards/slowbro.png
diff --git a/gfx/cards/slowpoke1.8x6.png b/gfx/cards/slowpoke1.png
index a74d1a4..a74d1a4 100644
--- a/gfx/cards/slowpoke1.8x6.png
+++ b/gfx/cards/slowpoke1.png
diff --git a/gfx/cards/slowpoke2.8x6.png b/gfx/cards/slowpoke2.png
index 834cf05..834cf05 100644
--- a/gfx/cards/slowpoke2.8x6.png
+++ b/gfx/cards/slowpoke2.png
diff --git a/gfx/cards/snorlax.8x6.png b/gfx/cards/snorlax.png
index 4eb26a4..4eb26a4 100644
--- a/gfx/cards/snorlax.8x6.png
+++ b/gfx/cards/snorlax.png
diff --git a/gfx/cards/spearow.8x6.png b/gfx/cards/spearow.png
index f76c643..f76c643 100644
--- a/gfx/cards/spearow.8x6.png
+++ b/gfx/cards/spearow.png
diff --git a/gfx/cards/squirtle.8x6.png b/gfx/cards/squirtle.png
index e8907eb..e8907eb 100644
--- a/gfx/cards/squirtle.8x6.png
+++ b/gfx/cards/squirtle.png
diff --git a/gfx/cards/starmie.8x6.png b/gfx/cards/starmie.png
index 5e4c0b1..5e4c0b1 100644
--- a/gfx/cards/starmie.8x6.png
+++ b/gfx/cards/starmie.png
diff --git a/gfx/cards/staryu.8x6.png b/gfx/cards/staryu.png
index 1e63f1c..1e63f1c 100644
--- a/gfx/cards/staryu.8x6.png
+++ b/gfx/cards/staryu.png
diff --git a/gfx/cards/superenergyremoval.8x6.png b/gfx/cards/superenergyremoval.png
index f71ac87..f71ac87 100644
--- a/gfx/cards/superenergyremoval.8x6.png
+++ b/gfx/cards/superenergyremoval.png
diff --git a/gfx/cards/superenergyretrieval.8x6.png b/gfx/cards/superenergyretrieval.png
index be4c186..be4c186 100644
--- a/gfx/cards/superenergyretrieval.8x6.png
+++ b/gfx/cards/superenergyretrieval.png
diff --git a/gfx/cards/superpotion.8x6.png b/gfx/cards/superpotion.png
index b476aba..b476aba 100644
--- a/gfx/cards/superpotion.8x6.png
+++ b/gfx/cards/superpotion.png
diff --git a/gfx/cards/surfingpikachu1.8x6.png b/gfx/cards/surfingpikachu1.png
index 9b84774..9b84774 100644
--- a/gfx/cards/surfingpikachu1.8x6.png
+++ b/gfx/cards/surfingpikachu1.png
diff --git a/gfx/cards/surfingpikachu2.8x6.png b/gfx/cards/surfingpikachu2.png
index 53e796a..53e796a 100644
--- a/gfx/cards/surfingpikachu2.8x6.png
+++ b/gfx/cards/surfingpikachu2.png
diff --git a/gfx/cards/switch.8x6.png b/gfx/cards/switch.png
index cdcec01..cdcec01 100644
--- a/gfx/cards/switch.8x6.png
+++ b/gfx/cards/switch.png
diff --git a/gfx/cards/tangela1.8x6.png b/gfx/cards/tangela1.png
index 0907f14..0907f14 100644
--- a/gfx/cards/tangela1.8x6.png
+++ b/gfx/cards/tangela1.png
diff --git a/gfx/cards/tangela2.8x6.png b/gfx/cards/tangela2.png
index 5fb06c8..5fb06c8 100644
--- a/gfx/cards/tangela2.8x6.png
+++ b/gfx/cards/tangela2.png
diff --git a/gfx/cards/tauros.8x6.png b/gfx/cards/tauros.png
index 8a372a2..8a372a2 100644
--- a/gfx/cards/tauros.8x6.png
+++ b/gfx/cards/tauros.png
diff --git a/gfx/cards/tentacool.8x6.png b/gfx/cards/tentacool.png
index 7da303a..7da303a 100644
--- a/gfx/cards/tentacool.8x6.png
+++ b/gfx/cards/tentacool.png
diff --git a/gfx/cards/tentacruel.8x6.png b/gfx/cards/tentacruel.png
index 74b2c43..74b2c43 100644
--- a/gfx/cards/tentacruel.8x6.png
+++ b/gfx/cards/tentacruel.png
diff --git a/gfx/cards/vaporeon1.8x6.png b/gfx/cards/vaporeon1.png
index 3ac523a..3ac523a 100644
--- a/gfx/cards/vaporeon1.8x6.png
+++ b/gfx/cards/vaporeon1.png
diff --git a/gfx/cards/vaporeon2.8x6.png b/gfx/cards/vaporeon2.png
index a90ba62..a90ba62 100644
--- a/gfx/cards/vaporeon2.8x6.png
+++ b/gfx/cards/vaporeon2.png
diff --git a/gfx/cards/venomoth.8x6.png b/gfx/cards/venomoth.png
index d1c9fce..d1c9fce 100644
--- a/gfx/cards/venomoth.8x6.png
+++ b/gfx/cards/venomoth.png
diff --git a/gfx/cards/venonat.8x6.png b/gfx/cards/venonat.png
index 1638261..1638261 100644
--- a/gfx/cards/venonat.8x6.png
+++ b/gfx/cards/venonat.png
diff --git a/gfx/cards/venusaur1.8x6.png b/gfx/cards/venusaur1.png
index d2d3989..d2d3989 100644
--- a/gfx/cards/venusaur1.8x6.png
+++ b/gfx/cards/venusaur1.png
diff --git a/gfx/cards/venusaur2.8x6.png b/gfx/cards/venusaur2.png
index dcfa858..dcfa858 100644
--- a/gfx/cards/venusaur2.8x6.png
+++ b/gfx/cards/venusaur2.png
diff --git a/gfx/cards/victreebel.8x6.png b/gfx/cards/victreebel.png
index d8536a0..d8536a0 100644
--- a/gfx/cards/victreebel.8x6.png
+++ b/gfx/cards/victreebel.png
diff --git a/gfx/cards/vileplume.8x6.png b/gfx/cards/vileplume.png
index a3766d5..a3766d5 100644
--- a/gfx/cards/vileplume.8x6.png
+++ b/gfx/cards/vileplume.png
diff --git a/gfx/cards/voltorb.8x6.png b/gfx/cards/voltorb.png
index cb39c66..cb39c66 100644
--- a/gfx/cards/voltorb.8x6.png
+++ b/gfx/cards/voltorb.png
diff --git a/gfx/cards/vulpix.8x6.png b/gfx/cards/vulpix.png
index e83d888..e83d888 100644
--- a/gfx/cards/vulpix.8x6.png
+++ b/gfx/cards/vulpix.png
diff --git a/gfx/cards/wartortle.8x6.png b/gfx/cards/wartortle.png
index fad87c7..fad87c7 100644
--- a/gfx/cards/wartortle.8x6.png
+++ b/gfx/cards/wartortle.png
diff --git a/gfx/cards/waterenergy.8x6.png b/gfx/cards/waterenergy.png
index 1fe022e..1fe022e 100644
--- a/gfx/cards/waterenergy.8x6.png
+++ b/gfx/cards/waterenergy.png
diff --git a/gfx/cards/weedle.8x6.png b/gfx/cards/weedle.png
index f53e060..f53e060 100644
--- a/gfx/cards/weedle.8x6.png
+++ b/gfx/cards/weedle.png
diff --git a/gfx/cards/weepinbell.8x6.png b/gfx/cards/weepinbell.png
index bdff148..bdff148 100644
--- a/gfx/cards/weepinbell.8x6.png
+++ b/gfx/cards/weepinbell.png
diff --git a/gfx/cards/weezing.8x6.png b/gfx/cards/weezing.png
index 12d3514..12d3514 100644
--- a/gfx/cards/weezing.8x6.png
+++ b/gfx/cards/weezing.png
diff --git a/gfx/cards/wigglytuff.8x6.png b/gfx/cards/wigglytuff.png
index 3429ddf..3429ddf 100644
--- a/gfx/cards/wigglytuff.8x6.png
+++ b/gfx/cards/wigglytuff.png
diff --git a/gfx/cards/zapdos1.8x6.png b/gfx/cards/zapdos1.png
index b34c5c7..b34c5c7 100644
--- a/gfx/cards/zapdos1.8x6.png
+++ b/gfx/cards/zapdos1.png
diff --git a/gfx/cards/zapdos2.8x6.png b/gfx/cards/zapdos2.png
index 1583f11..1583f11 100644
--- a/gfx/cards/zapdos2.8x6.png
+++ b/gfx/cards/zapdos2.png
diff --git a/gfx/cards/zapdos3.8x6.png b/gfx/cards/zapdos3.png
index 3683243..3683243 100644
--- a/gfx/cards/zapdos3.8x6.png
+++ b/gfx/cards/zapdos3.png
diff --git a/gfx/cards/zubat.8x6.png b/gfx/cards/zubat.png
index 2a0c346..2a0c346 100644
--- a/gfx/cards/zubat.8x6.png
+++ b/gfx/cards/zubat.png
diff --git a/gfx/duel/51.t10.png b/gfx/duel/51.png
index 98eb770..98eb770 100644
--- a/gfx/duel/51.t10.png
+++ b/gfx/duel/51.png
diff --git a/gfx/duel/duel1.t5.png b/gfx/duel/duel1.png
index e36c5fb..e36c5fb 100644
--- a/gfx/duel/duel1.t5.png
+++ b/gfx/duel/duel1.png
diff --git a/gfx/fonts.t3.png b/gfx/fonts.png
index 5dc1fe8..5dc1fe8 100644
--- a/gfx/fonts.t3.png
+++ b/gfx/fonts.png
diff --git a/gfx/overworld_map.t15.png b/gfx/overworld_map.png
index 5d8e819..5d8e819 100644
--- a/gfx/overworld_map.t15.png
+++ b/gfx/overworld_map.png
diff --git a/gfx/tilesets/challengehall.t3.png b/gfx/tilesets/challengehall.png
index 9783378..9783378 100644
--- a/gfx/tilesets/challengehall.t3.png
+++ b/gfx/tilesets/challengehall.png
diff --git a/gfx/tilesets/clubentrance.t15.png b/gfx/tilesets/clubentrance.png
index e641020..e641020 100644
--- a/gfx/tilesets/clubentrance.t15.png
+++ b/gfx/tilesets/clubentrance.png
diff --git a/gfx/tilesets/clublobby.t8.png b/gfx/tilesets/clublobby.png
index 7a5a7be..7a5a7be 100644
--- a/gfx/tilesets/clublobby.t8.png
+++ b/gfx/tilesets/clublobby.png
diff --git a/gfx/tilesets/fightingclub.t13.png b/gfx/tilesets/fightingclub.png
index 6747644..6747644 100644
--- a/gfx/tilesets/fightingclub.t13.png
+++ b/gfx/tilesets/fightingclub.png
diff --git a/gfx/tilesets/fireclub.t9.png b/gfx/tilesets/fireclub.png
index 28638bd..28638bd 100644
--- a/gfx/tilesets/fireclub.t9.png
+++ b/gfx/tilesets/fireclub.png
diff --git a/gfx/tilesets/grassclub.t9.png b/gfx/tilesets/grassclub.png
index 69496ad..69496ad 100644
--- a/gfx/tilesets/grassclub.t9.png
+++ b/gfx/tilesets/grassclub.png
diff --git a/gfx/tilesets/hallofhonor.t7.png b/gfx/tilesets/hallofhonor.png
index 358630d..358630d 100644
--- a/gfx/tilesets/hallofhonor.t7.png
+++ b/gfx/tilesets/hallofhonor.png
diff --git a/gfx/tilesets/ishihara.t3.png b/gfx/tilesets/ishihara.png
index 4761a69..4761a69 100644
--- a/gfx/tilesets/ishihara.t3.png
+++ b/gfx/tilesets/ishihara.png
diff --git a/gfx/tilesets/lightningclub.t13.png b/gfx/tilesets/lightningclub.png
index bbe0572..bbe0572 100644
--- a/gfx/tilesets/lightningclub.t13.png
+++ b/gfx/tilesets/lightningclub.png
diff --git a/gfx/tilesets/masonlaboratory.t9.png b/gfx/tilesets/masonlaboratory.png
index 4c5d90b..4c5d90b 100644
--- a/gfx/tilesets/masonlaboratory.t9.png
+++ b/gfx/tilesets/masonlaboratory.png
diff --git a/gfx/tilesets/pokemondome.t1.png b/gfx/tilesets/pokemondome.png
index b4abf6c..b4abf6c 100644
--- a/gfx/tilesets/pokemondome.t1.png
+++ b/gfx/tilesets/pokemondome.png
diff --git a/gfx/tilesets/pokemondomeentrance.t2.png b/gfx/tilesets/pokemondomeentrance.png
index c80ef7f..c80ef7f 100644
--- a/gfx/tilesets/pokemondomeentrance.t2.png
+++ b/gfx/tilesets/pokemondomeentrance.png
diff --git a/gfx/tilesets/psychicclub.t6.png b/gfx/tilesets/psychicclub.png
index 6a3a00f..6a3a00f 100644
--- a/gfx/tilesets/psychicclub.t6.png
+++ b/gfx/tilesets/psychicclub.png
diff --git a/gfx/tilesets/rockclub.t4.png b/gfx/tilesets/rockclub.png
index 59bf1bb..59bf1bb 100644
--- a/gfx/tilesets/rockclub.t4.png
+++ b/gfx/tilesets/rockclub.png
diff --git a/gfx/tilesets/scienceclub.t14.png b/gfx/tilesets/scienceclub.png
index a736fe1..a736fe1 100644
--- a/gfx/tilesets/scienceclub.t14.png
+++ b/gfx/tilesets/scienceclub.png
diff --git a/gfx/tilesets/waterclub.t15.png b/gfx/tilesets/waterclub.png
index 815e5ae..815e5ae 100644
--- a/gfx/tilesets/waterclub.t15.png
+++ b/gfx/tilesets/waterclub.png
diff --git a/gfx/titlescreen/titlescreen1.t15.png b/gfx/titlescreen/titlescreen1.png
index 82b39e5..82b39e5 100644
--- a/gfx/titlescreen/titlescreen1.t15.png
+++ b/gfx/titlescreen/titlescreen1.png
diff --git a/gfx/titlescreen/titlescreen2.t15.png b/gfx/titlescreen/titlescreen2.png
index f54b7c3..f54b7c3 100644
--- a/gfx/titlescreen/titlescreen2.t15.png
+++ b/gfx/titlescreen/titlescreen2.png
diff --git a/gfx/titlescreen/titlescreen3.t12.png b/gfx/titlescreen/titlescreen3.png
index adddee4..adddee4 100644
--- a/gfx/titlescreen/titlescreen3.t12.png
+++ b/gfx/titlescreen/titlescreen3.png
diff --git a/gfx/titlescreen/titlescreen4.t5.png b/gfx/titlescreen/titlescreen4.png
index 1d3cb92..1d3cb92 100644
--- a/gfx/titlescreen/titlescreen4.t5.png
+++ b/gfx/titlescreen/titlescreen4.png
diff --git a/gfx/titlescreen/titlescreen5.t4.png b/gfx/titlescreen/titlescreen5.png
index 3cb6ab3..3cb6ab3 100644
--- a/gfx/titlescreen/titlescreen5.t4.png
+++ b/gfx/titlescreen/titlescreen5.png
diff --git a/gfx/titlescreen/titlescreen6.t12.png b/gfx/titlescreen/titlescreen6.png
index 4f0dbe8..4f0dbe8 100644
--- a/gfx/titlescreen/titlescreen6.t12.png
+++ b/gfx/titlescreen/titlescreen6.png