Convert png to 1bpp/2bpp before assembling

614 files changed, 1018 insertions, 242 deletions

diff --git a/.gitignore b/.gitignore
index 24a192a..57320a0 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+# precompiled python
+*.pyc
+
 # compiled object file
 *.o
 
@@ -8,7 +11,11 @@
 *.map
 *.sym
 
-# for any of the poor souls with save game files in their working directory
+# save game files
 *.sgm
 *.sav
-*.sys
\ No newline at end of file
+*.sys
+
+# converted image data
+*.1bpp
+*.2bpp
diff --git a/Makefile b/Makefile
index 569f91a..fa0e9d7 100755
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,21 @@
 .PHONY: all compare clean
 
+.SUFFIXES:
+.SUFFIXES: .asm .o .gbc .png
+.SECONDEXPANSION:
+
 ROMS := tcg.gbc
 OBJS := main.o
 
-all: clean tcg.gbc compare
+main_dep := $(shell python extras/scan_includes.py main.asm)
+
+all: tcg.gbc compare
 compare: baserom.gbc $(ROMS)
 	cmp $^
 
-%.o: %.asm
+$(OBJS): $$*.asm $$($$*_dep)
+	@python extras/gfx.py 2bpp $(2bppq)
+	@python extras/gfx.py 1bpp $(1bppq)
 	rgbasm -o $@ $<
 
 tcg.gbc: $(OBJS)
@@ -16,4 +24,13 @@ tcg.gbc: $(OBJS)
 
 clean:
 	rm -f $(ROMS)
-	rm -f $(OBJS)
\ No newline at end of file
+	rm -f $(OBJS)
+	find . \( -iname '*.1bpp' -o -iname '*.2bpp' \) -exec rm {} +
+
+%.2bpp: %.png
+	$(eval 2bppq += $<)
+	@rm -f $@
+
+%.1bpp: %.png
+	$(eval 1bppq += $<)
+	@rm -f $@
diff --git a/data/cardgfx.asm b/data/cardgfx.asm
index 99e406f..822231d 100644
--- a/data/cardgfx.asm
+++ b/data/cardgfx.asm
@@ -1,146 +1,146 @@
 SECTION "bank31",ROMX,BANK[$31]
 GrassEnergyCardGfx: ; c4000 (31:4000)
-	INCBIN "gfx/cards/grassenergy.2bpp"
+	INCBIN "gfx/cards/grassenergy.8x6.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.2bpp"
+	INCBIN "gfx/cards/fireenergy.8x6.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.2bpp"
+	INCBIN "gfx/cards/waterenergy.8x6.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.2bpp"
+	INCBIN "gfx/cards/lightningenergy.8x6.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.2bpp"
+	INCBIN "gfx/cards/fightingenergy.8x6.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.2bpp"
+	INCBIN "gfx/cards/psychicenergy.8x6.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.2bpp"
+	INCBIN "gfx/cards/doublecolorlessenergy.8x6.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.2bpp"
+	INCBIN "gfx/cards/bulbasaur.8x6.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.2bpp"
+	INCBIN "gfx/cards/ivysaur.8x6.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.2bpp"
+	INCBIN "gfx/cards/venusaur1.8x6.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.2bpp"
+	INCBIN "gfx/cards/venusaur2.8x6.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.2bpp"
+	INCBIN "gfx/cards/caterpie.8x6.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.2bpp"
+	INCBIN "gfx/cards/metapod.8x6.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.2bpp"
+	INCBIN "gfx/cards/butterfree.8x6.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.2bpp"
+	INCBIN "gfx/cards/weedle.8x6.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.2bpp"
+	INCBIN "gfx/cards/kakuna.8x6.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.2bpp"
+	INCBIN "gfx/cards/beedrill.8x6.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.2bpp"
+	INCBIN "gfx/cards/ekans.8x6.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.2bpp"
+	INCBIN "gfx/cards/arbok.8x6.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.2bpp"
+	INCBIN "gfx/cards/nidoranf.8x6.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.2bpp"
+	INCBIN "gfx/cards/nidorina.8x6.2bpp"
 	RGB 31, 31, 31
 	RGB 16, 26, 16
 	RGB 0, 12, 8
@@ -148,147 +148,147 @@ NidorinaCardGfx: ; c7ca0 (31:7ca0)
 
 SECTION "bank32",ROMX,BANK[$32]
 NidoqueenCardGfx: ; c8000 (32:4000)
-	INCBIN "gfx/cards/nidoqueen.2bpp"
+	INCBIN "gfx/cards/nidoqueen.8x6.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.2bpp"
+	INCBIN "gfx/cards/nidoranm.8x6.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.2bpp"
+	INCBIN "gfx/cards/nidorino.8x6.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.2bpp"
+	INCBIN "gfx/cards/nidoking.8x6.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.2bpp"
+	INCBIN "gfx/cards/zubat.8x6.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.2bpp"
+	INCBIN "gfx/cards/golbat.8x6.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.2bpp"
+	INCBIN "gfx/cards/oddish.8x6.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.2bpp"
+	INCBIN "gfx/cards/gloom.8x6.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.2bpp"
+	INCBIN "gfx/cards/vileplume.8x6.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.2bpp"
+	INCBIN "gfx/cards/paras.8x6.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.2bpp"
+	INCBIN "gfx/cards/parasect.8x6.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.2bpp"
+	INCBIN "gfx/cards/venonat.8x6.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.2bpp"
+	INCBIN "gfx/cards/venomoth.8x6.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.2bpp"
+	INCBIN "gfx/cards/bellsprout.8x6.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.2bpp"
+	INCBIN "gfx/cards/weepinbell.8x6.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.2bpp"
+	INCBIN "gfx/cards/victreebel.8x6.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.2bpp"
+	INCBIN "gfx/cards/grimer.8x6.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.2bpp"
+	INCBIN "gfx/cards/muk.8x6.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.2bpp"
+	INCBIN "gfx/cards/exeggcute.8x6.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.2bpp"
+	INCBIN "gfx/cards/exeggutor.8x6.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.2bpp"
+	INCBIN "gfx/cards/koffing.8x6.2bpp"
 	RGB 31, 31, 12
 	RGB 26, 12, 21
 	RGB 16, 0, 16
@@ -296,147 +296,147 @@ KoffingCardGfx: ; cbca0 (32:7ca0)
 
 SECTION "bank33",ROMX,BANK[$33]
 WeezingCardGfx: ; cc000 (33:4000)
-	INCBIN "gfx/cards/weezing.2bpp"
+	INCBIN "gfx/cards/weezing.8x6.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.2bpp"
+	INCBIN "gfx/cards/tangela1.8x6.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.2bpp"
+	INCBIN "gfx/cards/tangela2.8x6.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.2bpp"
+	INCBIN "gfx/cards/scyther.8x6.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.2bpp"
+	INCBIN "gfx/cards/pinsir.8x6.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.2bpp"
+	INCBIN "gfx/cards/charmander.8x6.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.2bpp"
+	INCBIN "gfx/cards/charmeleon.8x6.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.2bpp"
+	INCBIN "gfx/cards/charizard.8x6.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.2bpp"
+	INCBIN "gfx/cards/vulpix.8x6.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.2bpp"
+	INCBIN "gfx/cards/ninetails1.8x6.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.2bpp"
+	INCBIN "gfx/cards/ninetails2.8x6.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.2bpp"
+	INCBIN "gfx/cards/growlithe.8x6.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.2bpp"
+	INCBIN "gfx/cards/arcanine1.8x6.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.2bpp"
+	INCBIN "gfx/cards/arcanine2.8x6.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.2bpp"
+	INCBIN "gfx/cards/ponyta.8x6.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.2bpp"
+	INCBIN "gfx/cards/rapidash.8x6.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.2bpp"
+	INCBIN "gfx/cards/magmar1.8x6.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.2bpp"
+	INCBIN "gfx/cards/magmar2.8x6.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.2bpp"
+	INCBIN "gfx/cards/flareon1.8x6.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.2bpp"
+	INCBIN "gfx/cards/flareon2.8x6.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.2bpp"
+	INCBIN "gfx/cards/moltres1.8x6.2bpp"
 	RGB 31, 21, 8
 	RGB 31, 8, 0
 	RGB 16, 0, 0
@@ -444,147 +444,147 @@ Moltres1CardGfx: ; cfca0 (33:7ca0)
 
 SECTION "bank34",ROMX,BANK[$34]
 Moltres2CardGfx: ; d0000 (34:4000)
-	INCBIN "gfx/cards/moltres2.2bpp"
+	INCBIN "gfx/cards/moltres2.8x6.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.2bpp"
+	INCBIN "gfx/cards/squirtle.8x6.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.2bpp"
+	INCBIN "gfx/cards/wartortle.8x6.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.2bpp"
+	INCBIN "gfx/cards/blastoise.8x6.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.2bpp"
+	INCBIN "gfx/cards/psyduck.8x6.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.2bpp"
+	INCBIN "gfx/cards/golduck.8x6.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.2bpp"
+	INCBIN "gfx/cards/poliwag.8x6.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.2bpp"
+	INCBIN "gfx/cards/poliwhirl.8x6.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.2bpp"
+	INCBIN "gfx/cards/poliwrath.8x6.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.2bpp"
+	INCBIN "gfx/cards/tentacool.8x6.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.2bpp"
+	INCBIN "gfx/cards/tentacruel.8x6.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.2bpp"
+	INCBIN "gfx/cards/seel.8x6.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.2bpp"
+	INCBIN "gfx/cards/dewgong.8x6.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.2bpp"
+	INCBIN "gfx/cards/shellder.8x6.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.2bpp"
+	INCBIN "gfx/cards/cloyster.8x6.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.2bpp"
+	INCBIN "gfx/cards/krabby.8x6.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.2bpp"
+	INCBIN "gfx/cards/kingler.8x6.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.2bpp"
+	INCBIN "gfx/cards/horsea.8x6.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.2bpp"
+	INCBIN "gfx/cards/seadra.8x6.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.2bpp"
+	INCBIN "gfx/cards/goldeen.8x6.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.2bpp"
+	INCBIN "gfx/cards/seaking.8x6.2bpp"
 	RGB 31, 31, 31
 	RGB 0, 16, 0
 	RGB 21, 0, 0
@@ -592,147 +592,147 @@ SeakingCardGfx: ; d3ca0 (34:7ca0)
 
 SECTION "bank35",ROMX,BANK[$35]
 StaryuCardGfx: ; d4000 (35:4000)
-	INCBIN "gfx/cards/staryu.2bpp"
+	INCBIN "gfx/cards/staryu.8x6.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.2bpp"
+	INCBIN "gfx/cards/starmie.8x6.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.2bpp"
+	INCBIN "gfx/cards/magikarp.8x6.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.2bpp"
+	INCBIN "gfx/cards/gyarados.8x6.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.2bpp"
+	INCBIN "gfx/cards/lapras.8x6.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.2bpp"
+	INCBIN "gfx/cards/vaporeon1.8x6.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.2bpp"
+	INCBIN "gfx/cards/vaporeon2.8x6.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.2bpp"
+	INCBIN "gfx/cards/omanyte.8x6.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.2bpp"
+	INCBIN "gfx/cards/omastar.8x6.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.2bpp"
+	INCBIN "gfx/cards/articuno1.8x6.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.2bpp"
+	INCBIN "gfx/cards/articuno2.8x6.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.2bpp"
+	INCBIN "gfx/cards/pikachu1.8x6.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.2bpp"
+	INCBIN "gfx/cards/pikachu2.8x6.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.2bpp"
+	INCBIN "gfx/cards/pikachu3.8x6.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.2bpp"
+	INCBIN "gfx/cards/pikachu4.8x6.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.2bpp"
+	INCBIN "gfx/cards/flyingpikachu.8x6.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.2bpp"
+	INCBIN "gfx/cards/surfingpikachu1.8x6.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.2bpp"
+	INCBIN "gfx/cards/surfingpikachu2.8x6.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.2bpp"
+	INCBIN "gfx/cards/raichu1.8x6.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.2bpp"
+	INCBIN "gfx/cards/raichu2.8x6.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.2bpp"
+	INCBIN "gfx/cards/magnemite1.8x6.2bpp"
 	RGB 31, 31, 26
 	RGB 4, 12, 21
 	RGB 4, 4, 12
@@ -740,147 +740,147 @@ Magnemite1CardGfx: ; d7ca0 (35:7ca0)
 
 SECTION "bank36",ROMX,BANK[$36]
 Magnemite2CardGfx: ; d8000 (36:4000)
-	INCBIN "gfx/cards/magnemite2.2bpp"
+	INCBIN "gfx/cards/magnemite2.8x6.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.2bpp"
+	INCBIN "gfx/cards/magneton1.8x6.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.2bpp"
+	INCBIN "gfx/cards/magneton2.8x6.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.2bpp"
+	INCBIN "gfx/cards/voltorb.8x6.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.2bpp"
+	INCBIN "gfx/cards/electrode1.8x6.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.2bpp"
+	INCBIN "gfx/cards/electrode2.8x6.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.2bpp"
+	INCBIN "gfx/cards/electabuzz1.8x6.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.2bpp"
+	INCBIN "gfx/cards/electabuzz2.8x6.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.2bpp"
+	INCBIN "gfx/cards/jolteon1.8x6.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.2bpp"
+	INCBIN "gfx/cards/jolteon2.8x6.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.2bpp"
+	INCBIN "gfx/cards/zapdos1.8x6.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.2bpp"
+	INCBIN "gfx/cards/zapdos2.8x6.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.2bpp"
+	INCBIN "gfx/cards/zapdos3.8x6.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.2bpp"
+	INCBIN "gfx/cards/sandshrew.8x6.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.2bpp"
+	INCBIN "gfx/cards/sandslash.8x6.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.2bpp"
+	INCBIN "gfx/cards/diglett.8x6.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.2bpp"
+	INCBIN "gfx/cards/dugtrio.8x6.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.2bpp"
+	INCBIN "gfx/cards/mankey.8x6.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.2bpp"
+	INCBIN "gfx/cards/primeape.8x6.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.2bpp"
+	INCBIN "gfx/cards/machop.8x6.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.2bpp"
+	INCBIN "gfx/cards/machoke.8x6.2bpp"
 	RGB 31, 31, 31
 	RGB 12, 16, 26
 	RGB 0, 4, 21
@@ -888,147 +888,147 @@ MachokeCardGfx: ; dbca0 (36:7ca0)
 
 SECTION "bank37",ROMX,BANK[$37]
 MachampCardGfx: ; dc000 (37:4000)
-	INCBIN "gfx/cards/machamp.2bpp"
+	INCBIN "gfx/cards/machamp.8x6.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.2bpp"
+	INCBIN "gfx/cards/geodude.8x6.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.2bpp"
+	INCBIN "gfx/cards/graveler.8x6.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.2bpp"
+	INCBIN "gfx/cards/golem.8x6.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.2bpp"
+	INCBIN "gfx/cards/onix.8x6.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.2bpp"
+	INCBIN "gfx/cards/cubone.8x6.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.2bpp"
+	INCBIN "gfx/cards/marowak1.8x6.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.2bpp"
+	INCBIN "gfx/cards/marowak2.8x6.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.2bpp"
+	INCBIN "gfx/cards/hitmonlee.8x6.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.2bpp"
+	INCBIN "gfx/cards/hitmonchan.8x6.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.2bpp"
+	INCBIN "gfx/cards/rhyhorn.8x6.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.2bpp"
+	INCBIN "gfx/cards/rhydon.8x6.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.2bpp"
+	INCBIN "gfx/cards/kabuto.8x6.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.2bpp"
+	INCBIN "gfx/cards/kabutops.8x6.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.2bpp"
+	INCBIN "gfx/cards/aerodactyl.8x6.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.2bpp"
+	INCBIN "gfx/cards/abra.8x6.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.2bpp"
+	INCBIN "gfx/cards/kadabra.8x6.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.2bpp"
+	INCBIN "gfx/cards/alakazam.8x6.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.2bpp"
+	INCBIN "gfx/cards/slowpoke1.8x6.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.2bpp"
+	INCBIN "gfx/cards/slowpoke2.8x6.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.2bpp"
+	INCBIN "gfx/cards/slowbro.8x6.2bpp"
 	RGB 31, 26, 12
 	RGB 31, 12, 0
 	RGB 26, 4, 8
@@ -1036,147 +1036,147 @@ SlowbroCardGfx: ; dfca0 (37:7ca0)
 
 SECTION "bank38",ROMX,BANK[$38]
 Gastly1CardGfx: ; e0000 (38:4000)
-	INCBIN "gfx/cards/gastly1.2bpp"
+	INCBIN "gfx/cards/gastly1.8x6.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.2bpp"
+	INCBIN "gfx/cards/gastly2.8x6.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.2bpp"
+	INCBIN "gfx/cards/haunter1.8x6.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.2bpp"
+	INCBIN "gfx/cards/haunter2.8x6.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.2bpp"
+	INCBIN "gfx/cards/gengar.8x6.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.2bpp"
+	INCBIN "gfx/cards/drowzee.8x6.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.2bpp"
+	INCBIN "gfx/cards/hypno.8x6.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.2bpp"
+	INCBIN "gfx/cards/mrmime.8x6.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.2bpp"
+	INCBIN "gfx/cards/jynx.8x6.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.2bpp"
+	INCBIN "gfx/cards/mewtwo1.8x6.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.2bpp"
+	INCBIN "gfx/cards/mewtwo2.8x6.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.2bpp"
+	INCBIN "gfx/cards/mewtwo3.8x6.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.2bpp"
+	INCBIN "gfx/cards/mew1.8x6.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.2bpp"
+	INCBIN "gfx/cards/mew2.8x6.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.2bpp"
+	INCBIN "gfx/cards/mew3.8x6.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.2bpp"
+	INCBIN "gfx/cards/pidgey.8x6.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.2bpp"
+	INCBIN "gfx/cards/pidgeotto.8x6.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.2bpp"
+	INCBIN "gfx/cards/pidgeot1.8x6.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.2bpp"
+	INCBIN "gfx/cards/pidgeot2.8x6.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.2bpp"
+	INCBIN "gfx/cards/rattata.8x6.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.2bpp"
+	INCBIN "gfx/cards/raticate.8x6.2bpp"
 	RGB 31, 31, 26
 	RGB 12, 26, 16
 	RGB 31, 16, 8
@@ -1184,147 +1184,147 @@ RaticateCardGfx: ; e3ca0 (38:7ca0)
 
 SECTION "bank39",ROMX,BANK[$39]
 SpearowCardGfx: ; e4000 (39:4000)
-	INCBIN "gfx/cards/spearow.2bpp"
+	INCBIN "gfx/cards/spearow.8x6.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.2bpp"
+	INCBIN "gfx/cards/fearow.8x6.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.2bpp"
+	INCBIN "gfx/cards/clefairy.8x6.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.2bpp"
+	INCBIN "gfx/cards/clefable.8x6.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.2bpp"
+	INCBIN "gfx/cards/jigglypuff1.8x6.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.2bpp"
+	INCBIN "gfx/cards/jigglypuff2.8x6.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.2bpp"
+	INCBIN "gfx/cards/jigglypuff3.8x6.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.2bpp"
+	INCBIN "gfx/cards/wigglytuff.8x6.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.2bpp"
+	INCBIN "gfx/cards/meowth1.8x6.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.2bpp"
+	INCBIN "gfx/cards/meowth2.8x6.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.2bpp"
+	INCBIN "gfx/cards/persian.8x6.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.2bpp"
+	INCBIN "gfx/cards/farfetchd.8x6.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.2bpp"
+	INCBIN "gfx/cards/doduo.8x6.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.2bpp"
+	INCBIN "gfx/cards/dodrio.8x6.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.2bpp"
+	INCBIN "gfx/cards/lickitung.8x6.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.2bpp"
+	INCBIN "gfx/cards/chansey.8x6.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.2bpp"
+	INCBIN "gfx/cards/kangaskhan.8x6.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.2bpp"
+	INCBIN "gfx/cards/tauros.8x6.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.2bpp"
+	INCBIN "gfx/cards/ditto.8x6.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.2bpp"
+	INCBIN "gfx/cards/eevee.8x6.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.2bpp"
+	INCBIN "gfx/cards/porygon.8x6.2bpp"
 	RGB 31, 31, 31
 	RGB 31, 16, 26
 	RGB 31, 4, 8
@@ -1332,147 +1332,147 @@ PorygonCardGfx: ; e7ca0 (39:7ca0)
 
 SECTION "bank3A",ROMX,BANK[$3A]
 SnorlaxCardGfx: ; e8000 (3a:4000)
-	INCBIN "gfx/cards/snorlax.2bpp"
+	INCBIN "gfx/cards/snorlax.8x6.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.2bpp"
+	INCBIN "gfx/cards/dratini.8x6.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.2bpp"
+	INCBIN "gfx/cards/dragonair.8x6.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.2bpp"
+	INCBIN "gfx/cards/dragonite1.8x6.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.2bpp"
+	INCBIN "gfx/cards/dragonite2.8x6.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.2bpp"
+	INCBIN "gfx/cards/professoroak.8x6.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.2bpp"
+	INCBIN "gfx/cards/imposterprofessoroak.8x6.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.2bpp"
+	INCBIN "gfx/cards/bill.8x6.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.2bpp"
+	INCBIN "gfx/cards/mrfuji.8x6.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.2bpp"
+	INCBIN "gfx/cards/lass.8x6.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.2bpp"
+	INCBIN "gfx/cards/imakuni.8x6.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.2bpp"
+	INCBIN "gfx/cards/pokemontrader.8x6.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.2bpp"
+	INCBIN "gfx/cards/pokemonbreeder.8x6.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.2bpp"
+	INCBIN "gfx/cards/clefairydoll.8x6.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.2bpp"
+	INCBIN "gfx/cards/mysteriousfossil.8x6.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.2bpp"
+	INCBIN "gfx/cards/energyretrieval.8x6.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.2bpp"
+	INCBIN "gfx/cards/superenergyretrieval.8x6.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.2bpp"
+	INCBIN "gfx/cards/energysearch.8x6.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.2bpp"
+	INCBIN "gfx/cards/energyremoval.8x6.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.2bpp"
+	INCBIN "gfx/cards/superenergyremoval.8x6.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.2bpp"
+	INCBIN "gfx/cards/switch.8x6.2bpp"
 	RGB 31, 26, 26
 	RGB 31, 16, 4
 	RGB 26, 4, 8
@@ -1480,126 +1480,126 @@ SwitchCardGfx: ; ebca0 (3a:7ca0)
 
 SECTION "bank3B",ROMX,BANK[$3B]
 PokemonCenterCardGfx: ; ec000 (3b:4000)
-	INCBIN "gfx/cards/pokemoncenter.2bpp"
+	INCBIN "gfx/cards/pokemoncenter.8x6.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.2bpp"
+	INCBIN "gfx/cards/pokeball.8x6.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.2bpp"
+	INCBIN "gfx/cards/scoopup.8x6.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.2bpp"
+	INCBIN "gfx/cards/computersearch.8x6.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.2bpp"
+	INCBIN "gfx/cards/pokedex.8x6.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.2bpp"
+	INCBIN "gfx/cards/pluspower.8x6.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.2bpp"
+	INCBIN "gfx/cards/defender.8x6.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.2bpp"
+	INCBIN "gfx/cards/itemfinder.8x6.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.2bpp"
+	INCBIN "gfx/cards/gustofwind.8x6.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.2bpp"
+	INCBIN "gfx/cards/devolutionspray.8x6.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.2bpp"
+	INCBIN "gfx/cards/potion.8x6.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.2bpp"
+	INCBIN "gfx/cards/superpotion.8x6.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.2bpp"
+	INCBIN "gfx/cards/fullheal.8x6.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.2bpp"
+	INCBIN "gfx/cards/revive.8x6.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.2bpp"
+	INCBIN "gfx/cards/maintenance.8x6.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.2bpp"
+	INCBIN "gfx/cards/pokemonflute.8x6.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.2bpp"
+	INCBIN "gfx/cards/gambler.8x6.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.2bpp"
+	INCBIN "gfx/cards/recycle.8x6.2bpp"
 	RGB 31, 26, 26
 	RGB 31, 12, 21
 	RGB 4, 16, 4
diff --git a/extras/configuration.py b/extras/configuration.py
new file mode 100755
index 0000000..1592fe6
--- /dev/null
+++ b/extras/configuration.py
@@ -0,0 +1,57 @@
+"""
+Configuration
+"""
+
+import os
+
+class ConfigException(Exception):
+    """
+    Configuration error. Maybe a missing config variable.
+    """
+
+class Config(object):
+    """
+    The Config class handles all configuration for pokemontools. Other classes
+    and functions use a Config object to determine where expected files can be
+    located.
+    """
+
+    def __init__(self, **kwargs):
+        """
+        Store all parameters.
+        """
+        self._config = {}
+
+        for (key, value) in kwargs.items():
+            if key not in self.__dict__:
+                self._config[key] = value
+            else:
+                raise ConfigException(
+                    "Can't store \"{0}\" in configuration because the key conflicts with an existing property."
+                    .format(key)
+                )
+
+        if "path" not in self._config:
+            self._config["path"] = os.getcwd()
+
+        # vba save states go into ./save-states/
+        if "save_state_path" not in self._config:
+            self._config["save_state_path"] = os.path.join(self._config["path"], "save-states/")
+
+        # assume rom is at ./baserom.gbc
+        if "rom" not in self._config:
+            self._config["rom_path"] = os.path.join(self._config["path"], "baserom.gbc")
+
+    def __getattr__(self, key):
+        """
+        Grab the value from the class properties, then check the configuration,
+        and raise an exception if nothing works.
+        """
+        if key in self.__dict__:
+            return self.__dict__[key]
+        elif key in self._config:
+            return self._config[key]
+        else:
+            raise ConfigException(
+                "no config found for \"{0}\"".format(key)
+            )
diff --git a/extras/gfx.py b/extras/gfx.py
new file mode 100755
index 0000000..38f6f5f
--- /dev/null
+++ b/extras/gfx.py
@@ -0,0 +1,668 @@
+# -*- coding: utf-8 -*-
+
+import os
+import sys
+import png
+from math import sqrt, floor, ceil
+import argparse
+
+def split(list_, interval):
+    """
+    Split a list by length.
+    """
+    for i in xrange(0, len(list_), interval):
+        j = min(i + interval, len(list_))
+        yield list_[i:j]
+
+def get_tiles(image):
+    """
+    Split a 2bpp image into 8x8 tiles.
+    """
+    return list(split(image, 0x10))
+
+def connect(tiles):
+    """
+    Combine 8x8 tiles into a 2bpp image.
+    """
+    return [byte for tile in tiles for byte in tile]
+
+def transpose(tiles, width=None):
+    """
+    Transpose a tile arrangement along line y=-x.
+
+      00 01 02 03 04 05     00 06 0c 12 18 1e
+      06 07 08 09 0a 0b     01 07 0d 13 19 1f
+      0c 0d 0e 0f 10 11 <-> 02 08 0e 14 1a 20
+      12 13 14 15 16 17     03 09 0f 15 1b 21
+      18 19 1a 1b 1c 1d     04 0a 10 16 1c 22
+      1e 1f 20 21 22 23     05 0b 11 17 1d 23
+
+      00 01 02 03     00 04 08
+      04 05 06 07 <-> 01 05 09
+      08 09 0a 0b     02 06 0a
+                      03 07 0b
+    """
+    if width == None:
+        width = int(sqrt(len(tiles))) # assume square image
+    tiles = sorted(enumerate(tiles), key= lambda (i, tile): i % width)
+    return [tile for i, tile in tiles]
+
+def transpose_tiles(image, width=None):
+    return connect(transpose(get_tiles(image), width))
+
+def interleave(tiles, width):
+    """
+      00 01 02 03 04 05     00 02 04 06 08 0a
+      06 07 08 09 0a 0b     01 03 05 07 09 0b
+      0c 0d 0e 0f 10 11 --> 0c 0e 10 12 14 16
+      12 13 14 15 16 17     0d 0f 11 13 15 17
+      18 19 1a 1b 1c 1d     18 1a 1c 1e 20 22
+      1e 1f 20 21 22 23     19 1b 1d 1f 21 23
+    """
+    interleaved = []
+    left, right = split(tiles[::2], width), split(tiles[1::2], width)
+    for l, r in zip(left, right):
+        interleaved += l + r
+    return interleaved
+
+def deinterleave(tiles, width):
+    """
+      00 02 04 06 08 0a     00 01 02 03 04 05 
+      01 03 05 07 09 0b     06 07 08 09 0a 0b
+      0c 0e 10 12 14 16 --> 0c 0d 0e 0f 10 11
+      0d 0f 11 13 15 17     12 13 14 15 16 17
+      18 1a 1c 1e 20 22     18 19 1a 1b 1c 1d
+      19 1b 1d 1f 21 23     1e 1f 20 21 22 23
+    """
+    deinterleaved = []
+    rows = list(split(tiles, width))
+    for left, right in zip(rows[::2], rows[1::2]):
+        for l, r in zip(left, right):
+            deinterleaved += [l, r]
+    return deinterleaved
+
+def interleave_tiles(image, width):
+    return connect(interleave(get_tiles(image), width))
+
+def deinterleave_tiles(image, width):
+    return connect(deinterleave(get_tiles(image), width))
+
+def condense_tiles_to_map(image):
+    tiles = get_tiles(image)
+    new_tiles = []
+    tilemap = []
+    for tile in tiles:
+        if tile not in new_tiles:
+            new_tiles += [tile]
+        tilemap += [new_tiles.index(tile)]
+    new_image = connect(new_tiles)
+    return new_image, tilemap
+
+def to_file(filename, data):
+    file = open(filename, 'wb')
+    for byte in data:
+        file.write('%c' % byte)
+    file.close()
+
+def bin_to_rgb(word):
+    red   = word & 0b11111
+    word >>= 5
+    green = word & 0b11111
+    word >>= 5
+    blue  = word & 0b11111
+    return (red, green, blue)
+
+def convert_binary_pal_to_text_by_filename(filename):
+    pal = bytearray(open(filename).read())
+    return convert_binary_pal_to_text(pal)
+
+def convert_binary_pal_to_text(pal):
+    output = ''
+    words = [hi * 0x100 + lo for lo, hi in zip(pal[::2], pal[1::2])]
+    for word in words:
+        red, green, blue = ['%.2d' % c for c in bin_to_rgb(word)]
+        output += '\tRGB ' + ', '.join((red, green, blue))
+        output += '\n'
+    return output
+
+def read_rgb_macros(lines):
+    colors = []
+    for line in lines:
+        macro = line.split(" ")[0].strip()
+        if macro == 'RGB':
+            params = ' '.join(line.split(" ")[1:]).split(',')
+            red, green, blue = [int(v) for v in params]
+            colors += [[red, green, blue]]
+    return colors
+
+def flatten(planar):
+    """
+    Flatten planar 2bpp image data into a quaternary pixel map.
+    """
+    strips = []
+    for bottom, top in split(planar, 2):
+        bottom = bottom
+        top = top
+        strip = []
+        for i in xrange(7,-1,-1):
+            color = (
+                (bottom >> i & 1) +
+                (top *2 >> i & 2)
+            )
+            strip += [color]
+        strips += strip
+    return strips
+
+def to_lines(image, width):
+    """
+    Convert a tiled quaternary pixel map to lines of quaternary pixels.
+    """
+    tile_width = 8
+    tile_height = 8
+    num_columns = width / tile_width
+    height = len(image) / width
+
+    lines = []
+    for cur_line in xrange(height):
+        tile_row = cur_line / tile_height
+        line = []
+        for column in xrange(num_columns):
+            anchor = (
+                num_columns * tile_row * tile_width * tile_height +
+                column * tile_width * tile_height +
+                cur_line % tile_height * tile_width
+            )
+            line += image[anchor : anchor + tile_width]
+        lines += [line]
+    return lines
+
+def pal_to_png(filename):
+    """
+    Interpret a .pal file as a png palette.
+    """
+    with open(filename) as rgbs:
+        colors = read_rgb_macros(rgbs.readlines())
+    a = 255
+    palette = []
+    for color in colors:
+        # even distribution over 000-255
+        r, g, b = [int(hue * 8.25) for hue in color]
+        palette += [(r, g, b, a)]
+    white = (255,255,255,255)
+    black = (000,000,000,255)
+    if white not in palette and len(palette) < 4:
+        palette = [white] + palette
+    if black not in palette and len(palette) < 4:
+        palette = palette + [black]
+    return palette
+
+def png_to_rgb(palette):
+    """
+    Convert a png palette to rgb macros.
+    """
+    output = ''
+    for color in palette:
+        r, g, b = [color[c] / 8 for c in 'rgb']
+        output += '\tRGB ' + ', '.join(['%.2d' % hue for hue in (r, g, b)])
+        output += '\n'
+    return output
+
+def read_filename_arguments(filename):
+    int_args = {
+        'w': 'width',
+        'h': 'height',
+        't': 'tile_padding',
+    }
+    parsed_arguments = {}
+    arguments = os.path.splitext(filename)[0].split('.')[1:]
+    for argument in arguments:
+        arg   = argument[0]
+        param = argument[1:]
+        if param.isdigit():
+            arg = int_args.get(arg, False)
+            if arg:
+                parsed_arguments[arg] = int(param)
+        elif len(argument) == 3:
+            w, x, h = argument[:3]
+            if w.isdigit() and h.isdigit() and x == 'x':
+                parsed_arguments['pic_dimensions'] = (int(w), int(h))
+        elif argument == 'interleave':
+            parsed_arguments['interleave'] = True
+        elif argument == 'norepeat':
+            parsed_arguments['norepeat'] = True
+        elif argument == 'arrange':
+            parsed_arguments['norepeat'] = True
+            parsed_arguments['tilemap']  = True
+    return parsed_arguments
+
+def export_2bpp_to_png(filein, fileout=None, pal_file=None, height=0, width=0, tile_padding=0, pic_dimensions=None):
+
+    if fileout == None:
+        fileout = os.path.splitext(filein)[0] + '.png'
+
+    image = open(filein, 'rb').read()
+
+    arguments = {
+        'width': width,
+        'height': height,
+        'pal_file': pal_file,
+        'tile_padding': tile_padding,
+        'pic_dimensions': pic_dimensions,
+    }
+    arguments.update(read_filename_arguments(filein))
+
+    if pal_file == None:
+        if os.path.exists(os.path.splitext(fileout)[0]+'.pal'):
+            arguments['pal_file'] = os.path.splitext(fileout)[0]+'.pal'
+
+    result = convert_2bpp_to_png(image, **arguments)
+    width, height, palette, greyscale, bitdepth, px_map = result
+
+    w = png.Writer(
+        width,
+        height,
+        palette=palette,
+        compression=9,
+        greyscale=greyscale,
+        bitdepth=bitdepth
+    )
+    with open(fileout, 'wb') as f:
+        w.write(f, px_map)
+
+def convert_2bpp_to_png(image, **kwargs):
+    """
+    Convert a planar 2bpp graphic to png.
+    """
+
+    image = bytearray(image)
+
+    pad_color = bytearray([0])
+
+    width          = kwargs.get('width', 0)
+    height         = kwargs.get('height', 0)
+    tile_padding   = kwargs.get('tile_padding', 0)
+    pic_dimensions = kwargs.get('pic_dimensions', None)
+    pal_file       = kwargs.get('pal_file', None)
+    interleave     = kwargs.get('interleave', False)
+
+    # Width must be specified to interleave.
+    if interleave and width:
+        image = interleave_tiles(image, width / 8)
+
+    # Pad the image by a given number of tiles if asked.
+    image += pad_color * 0x10 * tile_padding
+
+    # Some images are transposed in blocks.
+    if pic_dimensions:
+        w, h  = pic_dimensions
+        if not width: width = w * 8
+
+        pic_length = w * h * 0x10
+
+        trailing = len(image) % pic_length
+
+        pic = []
+        for i in xrange(0, len(image) - trailing, pic_length):
+            pic += transpose_tiles(image[i:i+pic_length], h)
+        image = bytearray(pic) + image[len(image) - trailing:]
+
+        # Pad out trailing lines.
+        image += pad_color * 0x10 * ((w - (len(image) / 0x10) % h) % w)
+
+    def px_length(img):
+        return len(img) * 4
+    def tile_length(img):
+        return len(img) * 4 / (8*8)
+
+    if width and height:
+        tile_width = width / 8
+        more_tile_padding = (tile_width - (tile_length(image) % tile_width or tile_width))
+        image += pad_color * 0x10 * more_tile_padding
+
+    elif width and not height:
+        tile_width = width / 8
+        more_tile_padding = (tile_width - (tile_length(image) % tile_width or tile_width))
+        image += pad_color * 0x10 * more_tile_padding
+        height = px_length(image) / width
+
+    elif height and not width:
+        tile_height = height / 8
+        more_tile_padding = (tile_height - (tile_length(image) % tile_height or tile_height))
+        image += pad_color * 0x10 * more_tile_padding
+        width = px_length(image) / height
+
+    # at least one dimension should be given
+    if width * height != px_length(image):
+        # look for possible combos of width/height that would form a rectangle
+        matches = []
+        # Height need not be divisible by 8, but width must.
+        # See pokered gfx/minimize_pic.1bpp.
+        for w in range(8, px_length(image) / 2 + 1, 8):
+            h = px_length(image) / w
+            if w * h == px_length(image):
+                matches += [(w, h)]
+        # go for the most square image
+        if len(matches):
+            width, height = sorted(matches, key= lambda (w, h): (h % 8 != 0, w + h))[0] # favor height
+        else:
+            raise Exception, 'Image can\'t be divided into tiles (%d px)!' % (px_length(image))
+
+    # convert tiles to lines
+    lines = to_lines(flatten(image), width)
+
+    if pal_file == None:
+        palette   = None
+        greyscale = True
+        bitdepth  = 2
+        px_map    = [[3 - pixel for pixel in line] for line in lines]
+
+    else: # gbc color
+        palette   = pal_to_png(pal_file)
+        greyscale = False
+        bitdepth  = 8
+        px_map    = [[pixel for pixel in line] for line in lines]
+
+    return width, height, palette, greyscale, bitdepth, px_map
+
+def export_png_to_2bpp(filein, fileout=None, palout=None, tile_padding=0, pic_dimensions=None):
+
+    arguments = {
+        'tile_padding': tile_padding,
+        'pic_dimensions': pic_dimensions,
+    }
+    arguments.update(read_filename_arguments(filein))
+
+    image, palette, tmap = png_to_2bpp(filein, **arguments)
+
+    if fileout == None:
+        fileout = os.path.splitext(filein)[0] + '.2bpp'
+    to_file(fileout, image)
+
+    if tmap != None:
+        mapout = os.path.splitext(fileout)[0] + '.tilemap'
+        to_file(mapout, tmap)
+
+    if palout == None:
+        palout = os.path.splitext(fileout)[0] + '.pal'
+    export_palette(palette, palout)
+
+def get_image_padding(width, height, wstep=8, hstep=8):
+
+    padding = {
+        'left':   0,
+        'right':  0,
+        'top':    0,
+        'bottom': 0,
+    }
+
+    if width % wstep and width >= wstep:
+       pad = float(width % wstep) / 2
+       padding['left']   = int(ceil(pad))
+       padding['right']  = int(floor(pad))
+
+    if height % hstep and height >= hstep:
+       pad = float(height % hstep) / 2
+       padding['top']    = int(ceil(pad))
+       padding['bottom'] = int(floor(pad))
+
+    return padding
+
+def png_to_2bpp(filein, **kwargs):
+    """
+    Convert a png image to planar 2bpp.
+    """
+
+    tile_padding   = kwargs.get('tile_padding', 0)
+    pic_dimensions = kwargs.get('pic_dimensions', None)
+    interleave     = kwargs.get('interleave', False)
+    norepeat       = kwargs.get('norepeat', False)
+    tilemap        = kwargs.get('tilemap', False)
+
+    with open(filein, 'rb') as data:
+        width, height, rgba, info = png.Reader(data).asRGBA8()
+        rgba = list(rgba)
+        greyscale = info['greyscale']
+
+    # png.Reader returns flat pixel data. Nested is easier to work with
+    len_px  = 4 # rgba
+    image   = []
+    palette = []
+    for line in rgba:
+        newline = []
+        for px in xrange(0, len(line), len_px):
+            color = { 'r': line[px  ],
+                      'g': line[px+1],
+                      'b': line[px+2],
+                      'a': line[px+3], }
+            newline += [color]
+            if color not in palette:
+                palette += [color]
+        image += [newline]
+
+    assert len(palette) <= 4, 'Palette should be 4 colors, is really %d' % len(palette)
+
+    # Pad out smaller palettes with greyscale colors
+    hues = {
+        'white': { 'r': 0xff, 'g': 0xff, 'b': 0xff, 'a': 0xff },
+        'black': { 'r': 0x00, 'g': 0x00, 'b': 0x00, 'a': 0xff },
+        'grey':  { 'r': 0x55, 'g': 0x55, 'b': 0x55, 'a': 0xff },
+        'gray':  { 'r': 0xaa, 'g': 0xaa, 'b': 0xaa, 'a': 0xff },
+    }
+    for hue in hues.values():
+        if len(palette) >= 4:
+            break
+        if hue not in palette:
+            palette += [hue]
+
+    # Sort palettes by luminance
+    def luminance(color):
+        rough = { 'r':  4.7,
+                  'g':  1.4,
+                  'b': 13.8, }
+        return sum(color[key] * rough[key] for key in rough.keys())
+    palette.sort(key=luminance)
+
+    # Game Boy palette order
+    palette.reverse()
+
+    # Map pixels to quaternary color ids
+    padding = get_image_padding(width, height)
+    width += padding['left'] + padding['right']
+    height += padding['top'] + padding['bottom']
+    pad = bytearray([0])
+
+    qmap = []
+    qmap += pad * width * padding['top']
+    for line in image:
+        qmap += pad * padding['left']
+        for color in line:
+            qmap += [palette.index(color)]
+        qmap += pad * padding['right']
+    qmap += pad * width * padding['bottom']
+
+    # Graphics are stored in tiles instead of lines
+    tile_width  = 8
+    tile_height = 8
+    num_columns = max(width, tile_width) / tile_width
+    num_rows = max(height, tile_height) / tile_height
+    image = []
+
+    for row in xrange(num_rows):
+        for column in xrange(num_columns):
+
+            # Split it up into strips to convert to planar data
+            for strip in xrange(min(tile_height, height)):
+                anchor = (
+                    row * num_columns * tile_width * tile_height +
+                    column * tile_width +
+                    strip * width
+                )
+                line = qmap[anchor : anchor + tile_width]
+                bottom, top = 0, 0
+                for bit, quad in enumerate(line):
+                    bottom += (quad & 1) << (7 - bit)
+                    top += (quad /2 & 1) << (7 - bit)
+                image += [bottom, top]
+
+    if pic_dimensions:
+        w, h = pic_dimensions
+
+        tiles = get_tiles(image)
+        pic_length = w * h
+        tile_width = width / 8
+        trailing = len(tiles) % pic_length
+        new_image = []
+        for block in xrange(len(tiles) / pic_length):
+            offset = (h * tile_width) * ((block * w) / tile_width) + ((block * w) % tile_width)
+            pic = []
+            for row in xrange(h):
+                index = offset + (row * tile_width)
+                pic += tiles[index:index + w]
+            new_image += transpose(pic, w)
+        new_image += tiles[len(tiles) - trailing:]
+        image = connect(new_image)
+
+    # Remove any tile padding used to make the png rectangular.
+    image = image[:len(image) - tile_padding * 0x10]
+
+    if interleave:
+        image = deinterleave_tiles(image, num_columns)
+
+    if norepeat:
+        image, tmap = condense_tiles_to_map(image)
+    if not tilemap:
+        tmap = None
+
+    return image, palette, tmap
+
+def export_palette(palette, filename):
+    """
+    Export a palette from png to rgb macros in a .pal file.
+    """
+
+    if os.path.exists(filename):
+
+        # Pic palettes are 2 colors (black/white are added later).
+        with open(filename) as rgbs:
+            colors = read_rgb_macros(rgbs.readlines())
+
+        if len(colors) == 2:
+            palette = palette[1:3]
+
+        text = png_to_rgb(palette)
+        with open(filename, 'w') as out:
+            out.write(text)
+
+def convert_2bpp_to_1bpp(data):
+    """
+    Convert planar 2bpp image data to 1bpp. Assume images are two colors.
+    """
+    return data[::2]
+
+def convert_1bpp_to_2bpp(data):
+    """
+    Convert 1bpp image data to planar 2bpp (black/white).
+    """
+    output = []
+    for i in data:
+        output += [i, i]
+    return output
+
+def export_2bpp_to_1bpp(filename):
+    name, extension = os.path.splitext(filename)
+    image = open(filename, 'rb').read()
+    image = convert_2bpp_to_1bpp(image)
+    to_file(name + '.1bpp', image)
+
+def export_1bpp_to_2bpp(filename):
+    name, extension = os.path.splitext(filename)
+    image = open(filename, 'rb').read()
+    image = convert_1bpp_to_2bpp(image)
+    to_file(name + '.2bpp', image)
+
+def export_1bpp_to_png(filename, fileout=None):
+
+    if fileout == None:
+        fileout = os.path.splitext(filename)[0] + '.png'
+
+    arguments = read_filename_arguments(filename)
+
+    image = open(filename, 'rb').read()
+    image = convert_1bpp_to_2bpp(image)
+
+    result = convert_2bpp_to_png(image, **arguments)
+    width, height, palette, greyscale, bitdepth, px_map = result
+
+    w = png.Writer(width, height, palette=palette, compression=9, greyscale=greyscale, bitdepth=bitdepth)
+    with open(fileout, 'wb') as f:
+        w.write(f, px_map)
+
+def export_png_to_1bpp(filename, fileout=None):
+
+    if fileout == None:
+        fileout = os.path.splitext(filename)[0] + '.1bpp'
+
+    arguments = read_filename_arguments(filename)
+    image = png_to_1bpp(filename, **arguments)
+
+    to_file(fileout, image)
+
+def png_to_1bpp(filename, **kwargs):
+    image, palette, tmap = png_to_2bpp(filename, **kwargs)
+    return convert_2bpp_to_1bpp(image)
+
+def convert_to_2bpp(filenames=[]):
+    for filename in filenames:
+        name, extension = os.path.splitext(filename)
+        if extension == '.1bpp':
+            export_1bpp_to_2bpp(filename)
+        elif extension == '.2bpp':
+            pass
+        elif extension == '.png':
+            export_png_to_2bpp(filename)
+        else:
+            raise Exception, "Don't know how to convert {} to 2bpp!".format(filename)
+
+def convert_to_1bpp(filenames=[]):
+    for filename in filenames:
+        name, extension = os.path.splitext(filename)
+        if extension == '.1bpp':
+            pass
+        elif extension == '.2bpp':
+            export_2bpp_to_1bpp(filename)
+        elif extension == '.png':
+            export_png_to_1bpp(filename)
+        else:
+            raise Exception, "Don't know how to convert {} to 1bpp!".format(filename)
+
+def convert_to_png(filenames=[]):
+    for filename in filenames:
+        name, extension = os.path.splitext(filename)
+        if extension == '.1bpp':
+            export_1bpp_to_png(filename)
+        elif extension == '.2bpp':
+            export_2bpp_to_png(filename)
+        elif extension == '.png':
+            pass
+        else:
+            raise Exception, "Don't know how to convert {} to png!".format(filename)
+
+def main():
+    ap = argparse.ArgumentParser()
+    ap.add_argument('mode')
+    ap.add_argument('filenames', nargs='*')
+    args = ap.parse_args()
+
+    method = {
+        '2bpp': convert_to_2bpp,
+        '1bpp': convert_to_1bpp,
+        'png':  convert_to_png,
+    }.get(args.mode, None)
+
+    if method == None:
+        raise Exception, "Unknown conversion method!"
+
+    method(args.filenames)
+
+if __name__ == "__main__":
+    main()
diff --git a/extras/scan_includes.py b/extras/scan_includes.py
new file mode 100755
index 0000000..7f34e92
--- /dev/null
+++ b/extras/scan_includes.py
@@ -0,0 +1,36 @@
+# coding: utf-8
+
+"""
+Recursively scan an asm file for rgbasm INCLUDEs and INCBINs.
+Used to generate dependencies for each rgbasm object.
+"""
+
+import os
+import sys
+
+import configuration
+conf = configuration.Config()
+
+def recursive_scan(filename, includes = []):
+	if (filename[-4:] == '.asm' or filename[-3] == '.tx') and os.path.exists(filename):
+		lines = open(filename).readlines()
+		for line in lines:
+			for directive in ('INCLUDE', 'INCBIN'):
+				if directive in line:
+					line = line[:line.find(';')]
+					if directive in line:
+						include = line.split('"')[1]
+						if include not in includes:
+							includes += [include]
+							includes = recursive_scan(os.path.join(conf.path, include), includes)
+						break
+	return includes
+
+if __name__ == '__main__':
+	filenames = sys.argv[1:]
+	dependencies = []
+	for filename in filenames:
+		dependencies += recursive_scan(os.path.join(conf.path, filename))
+	dependencies = list(set(dependencies))
+	sys.stdout.write(' '.join(dependencies))
+
diff --git a/gfx/cards/abra.2bpp b/gfx/cards/abra.2bpp
deleted file mode 100644
index 8a60ba9..0000000
--- a/gfx/cards/abra.2bpp
+++ /dev/null
diff --git a/gfx/cards/abra.8x6.png b/gfx/cards/abra.8x6.png
new file mode 100755
index 0000000..dbb16f3
--- /dev/null
+++ b/gfx/cards/abra.8x6.png
diff --git a/gfx/cards/aerodactyl.2bpp b/gfx/cards/aerodactyl.2bpp
deleted file mode 100644
index 2e80573..0000000
--- a/gfx/cards/aerodactyl.2bpp
+++ /dev/null
diff --git a/gfx/cards/aerodactyl.8x6.png b/gfx/cards/aerodactyl.8x6.png
new file mode 100755
index 0000000..68710fc
--- /dev/null
+++ b/gfx/cards/aerodactyl.8x6.png
diff --git a/gfx/cards/alakazam.2bpp b/gfx/cards/alakazam.2bpp
deleted file mode 100644
index a97463a..0000000
--- a/gfx/cards/alakazam.2bpp
+++ /dev/null
@@ -1,2 +0,0 @@
-�������������������������������������Ǻ�����������������������������������������������������������r��������G���_���������j�?���u���y���}���|���|���>����n>�}��Q�������R���
����#������������Ϸ�+��%����������=���|���l���)�"�$��ܫ�����nj�ҕծ���7<������|{�'���*�hװ���l���ԯ������������}o��Mϰp��0� À����͂�
�
-�%u�t��zuι~(/-,OK�X}��̯��3��,�������+�o�7�7����������������w�����F���6
��WR��WR��_Q��\7��Ϭ��?�~�]z�����=��h�dl�����tt�������v���e�����6�t�{z����������,5����5�hHݰ���}:?��.�W����v��,�n��wWkK���������d�J���=�b�A���?�6�7ӼL�f�v�K��������|���_���_������G�������u���{���U�*Q���U���������{��V�O�/�/�5��j���8��Ş���%���''��~b}�������������������������������������������w���w�����m���������U���_���w�����������u���
������
\ No newline at end of file
diff --git a/gfx/cards/alakazam.8x6.png b/gfx/cards/alakazam.8x6.png
new file mode 100755
index 0000000..23961da
--- /dev/null
+++ b/gfx/cards/alakazam.8x6.png
diff --git a/gfx/cards/arbok.2bpp b/gfx/cards/arbok.2bpp
deleted file mode 100644
index 872eb5f..0000000
--- a/gfx/cards/arbok.2bpp
+++ /dev/null
diff --git a/gfx/cards/arbok.8x6.png b/gfx/cards/arbok.8x6.png
new file mode 100755
index 0000000..0992a08
--- /dev/null
+++ b/gfx/cards/arbok.8x6.png
diff --git a/gfx/cards/arcanine1.2bpp b/gfx/cards/arcanine1.2bpp
deleted file mode 100644
index df3883b..0000000
--- a/gfx/cards/arcanine1.2bpp
+++ /dev/null
diff --git a/gfx/cards/arcanine1.8x6.png b/gfx/cards/arcanine1.8x6.png
new file mode 100755
index 0000000..2fae497
--- /dev/null
+++ b/gfx/cards/arcanine1.8x6.png
diff --git a/gfx/cards/arcanine2.2bpp b/gfx/cards/arcanine2.2bpp
deleted file mode 100644
index 78a4a67..0000000
--- a/gfx/cards/arcanine2.2bpp
+++ /dev/null
diff --git a/gfx/cards/arcanine2.8x6.png b/gfx/cards/arcanine2.8x6.png
new file mode 100755
index 0000000..8fcb3d6
--- /dev/null
+++ b/gfx/cards/arcanine2.8x6.png
diff --git a/gfx/cards/articuno1.2bpp b/gfx/cards/articuno1.2bpp
deleted file mode 100644
index 614b73f..0000000
--- a/gfx/cards/articuno1.2bpp
+++ /dev/null
diff --git a/gfx/cards/articuno1.8x6.png b/gfx/cards/articuno1.8x6.png
new file mode 100755
index 0000000..d944c61
--- /dev/null
+++ b/gfx/cards/articuno1.8x6.png
diff --git a/gfx/cards/articuno2.2bpp b/gfx/cards/articuno2.2bpp
deleted file mode 100644
index e9d15b3..0000000
--- a/gfx/cards/articuno2.2bpp
+++ /dev/null
diff --git a/gfx/cards/articuno2.8x6.png b/gfx/cards/articuno2.8x6.png
new file mode 100755
index 0000000..1aabeea
--- /dev/null
+++ b/gfx/cards/articuno2.8x6.png
diff --git a/gfx/cards/beedrill.2bpp b/gfx/cards/beedrill.2bpp
deleted file mode 100644
index 5dbf3ae..0000000
--- a/gfx/cards/beedrill.2bpp
+++ /dev/null
diff --git a/gfx/cards/beedrill.8x6.png b/gfx/cards/beedrill.8x6.png
new file mode 100755
index 0000000..a47d492
--- /dev/null
+++ b/gfx/cards/beedrill.8x6.png
diff --git a/gfx/cards/bellsprout.2bpp b/gfx/cards/bellsprout.2bpp
deleted file mode 100644
index 4e7b4fb..0000000
--- a/gfx/cards/bellsprout.2bpp
+++ /dev/null
diff --git a/gfx/cards/bellsprout.8x6.png b/gfx/cards/bellsprout.8x6.png
new file mode 100755
index 0000000..3082133
--- /dev/null
+++ b/gfx/cards/bellsprout.8x6.png
diff --git a/gfx/cards/bill.2bpp b/gfx/cards/bill.2bpp
deleted file mode 100644
index 75bb26d..0000000
--- a/gfx/cards/bill.2bpp
+++ /dev/null
diff --git a/gfx/cards/bill.8x6.png b/gfx/cards/bill.8x6.png
new file mode 100755
index 0000000..9e15e54
--- /dev/null
+++ b/gfx/cards/bill.8x6.png
diff --git a/gfx/cards/blastoise.2bpp b/gfx/cards/blastoise.2bpp
deleted file mode 100644
index 2200865..0000000
--- a/gfx/cards/blastoise.2bpp
+++ /dev/null
diff --git a/gfx/cards/blastoise.8x6.png b/gfx/cards/blastoise.8x6.png
new file mode 100755
index 0000000..34577fb
--- /dev/null
+++ b/gfx/cards/blastoise.8x6.png
diff --git a/gfx/cards/bulbasaur.2bpp b/gfx/cards/bulbasaur.2bpp
deleted file mode 100644
index 79188e7..0000000
--- a/gfx/cards/bulbasaur.2bpp
+++ /dev/null
diff --git a/gfx/cards/bulbasaur.8x6.png b/gfx/cards/bulbasaur.8x6.png
new file mode 100755
index 0000000..9c9479d
--- /dev/null
+++ b/gfx/cards/bulbasaur.8x6.png
diff --git a/gfx/cards/butterfree.2bpp b/gfx/cards/butterfree.2bpp
deleted file mode 100644
index 6941b06..0000000
--- a/gfx/cards/butterfree.2bpp
+++ /dev/null
diff --git a/gfx/cards/butterfree.8x6.png b/gfx/cards/butterfree.8x6.png
new file mode 100755
index 0000000..14386d3
--- /dev/null
+++ b/gfx/cards/butterfree.8x6.png
diff --git a/gfx/cards/caterpie.2bpp b/gfx/cards/caterpie.2bpp
deleted file mode 100644
index f6238fe..0000000
--- a/gfx/cards/caterpie.2bpp
+++ /dev/null
diff --git a/gfx/cards/caterpie.8x6.png b/gfx/cards/caterpie.8x6.png
new file mode 100755
index 0000000..0608f2f
--- /dev/null
+++ b/gfx/cards/caterpie.8x6.png
diff --git a/gfx/cards/chansey.2bpp b/gfx/cards/chansey.2bpp
deleted file mode 100644
index 25a41ae..0000000
--- a/gfx/cards/chansey.2bpp
+++ /dev/null
diff --git a/gfx/cards/chansey.8x6.png b/gfx/cards/chansey.8x6.png
new file mode 100755
index 0000000..979355f
--- /dev/null
+++ b/gfx/cards/chansey.8x6.png
diff --git a/gfx/cards/charizard.2bpp b/gfx/cards/charizard.2bpp
deleted file mode 100644
index fb5e1e2..0000000
--- a/gfx/cards/charizard.2bpp
+++ /dev/null
diff --git a/gfx/cards/charizard.8x6.png b/gfx/cards/charizard.8x6.png
new file mode 100755
index 0000000..b318348
--- /dev/null
+++ b/gfx/cards/charizard.8x6.png
diff --git a/gfx/cards/charmander.2bpp b/gfx/cards/charmander.2bpp
deleted file mode 100644
index 26a9893..0000000
--- a/gfx/cards/charmander.2bpp
+++ /dev/null
diff --git a/gfx/cards/charmander.8x6.png b/gfx/cards/charmander.8x6.png
new file mode 100755
index 0000000..686e3bb
--- /dev/null
+++ b/gfx/cards/charmander.8x6.png
diff --git a/gfx/cards/charmeleon.2bpp b/gfx/cards/charmeleon.2bpp
deleted file mode 100644
index 35a1515..0000000
--- a/gfx/cards/charmeleon.2bpp
+++ /dev/null
diff --git a/gfx/cards/charmeleon.8x6.png b/gfx/cards/charmeleon.8x6.png
new file mode 100755
index 0000000..6e86218
--- /dev/null
+++ b/gfx/cards/charmeleon.8x6.png
diff --git a/gfx/cards/clefable.2bpp b/gfx/cards/clefable.2bpp
deleted file mode 100644
index 547cd93..0000000
--- a/gfx/cards/clefable.2bpp
+++ /dev/null
diff --git a/gfx/cards/clefable.8x6.png b/gfx/cards/clefable.8x6.png
new file mode 100755
index 0000000..717b4dd
--- /dev/null
+++ b/gfx/cards/clefable.8x6.png
diff --git a/gfx/cards/clefairy.2bpp b/gfx/cards/clefairy.2bpp
deleted file mode 100644
index e955102..0000000
--- a/gfx/cards/clefairy.2bpp
+++ /dev/null
diff --git a/gfx/cards/clefairy.8x6.png b/gfx/cards/clefairy.8x6.png
new file mode 100755
index 0000000..1a12fc9
--- /dev/null
+++ b/gfx/cards/clefairy.8x6.png
diff --git a/gfx/cards/clefairydoll.2bpp b/gfx/cards/clefairydoll.2bpp
deleted file mode 100644
index 6365abc..0000000
--- a/gfx/cards/clefairydoll.2bpp
+++ /dev/null
diff --git a/gfx/cards/clefairydoll.8x6.png b/gfx/cards/clefairydoll.8x6.png
new file mode 100755
index 0000000..9ec7308
--- /dev/null
+++ b/gfx/cards/clefairydoll.8x6.png
diff --git a/gfx/cards/cloyster.2bpp b/gfx/cards/cloyster.2bpp
deleted file mode 100644
index ef29d6b..0000000
--- a/gfx/cards/cloyster.2bpp
+++ /dev/null
diff --git a/gfx/cards/cloyster.8x6.png b/gfx/cards/cloyster.8x6.png
new file mode 100755
index 0000000..2815ae8
--- /dev/null
+++ b/gfx/cards/cloyster.8x6.png
diff --git a/gfx/cards/computersearch.2bpp b/gfx/cards/computersearch.2bpp
deleted file mode 100644
index d6f66b7..0000000
--- a/gfx/cards/computersearch.2bpp
+++ /dev/null
diff --git a/gfx/cards/computersearch.8x6.png b/gfx/cards/computersearch.8x6.png
new file mode 100755
index 0000000..794dee5
--- /dev/null
+++ b/gfx/cards/computersearch.8x6.png
diff --git a/gfx/cards/cubone.2bpp b/gfx/cards/cubone.2bpp
deleted file mode 100644
index 5225ff7..0000000
--- a/gfx/cards/cubone.2bpp
+++ /dev/null
diff --git a/gfx/cards/cubone.8x6.png b/gfx/cards/cubone.8x6.png
new file mode 100755
index 0000000..05c8b6d
--- /dev/null
+++ b/gfx/cards/cubone.8x6.png
diff --git a/gfx/cards/defender.2bpp b/gfx/cards/defender.2bpp
deleted file mode 100644
index fc067ee..0000000
--- a/gfx/cards/defender.2bpp
+++ /dev/null
diff --git a/gfx/cards/defender.8x6.png b/gfx/cards/defender.8x6.png
new file mode 100755
index 0000000..c69e47b
--- /dev/null
+++ b/gfx/cards/defender.8x6.png
diff --git a/gfx/cards/devolutionspray.2bpp b/gfx/cards/devolutionspray.2bpp
deleted file mode 100644
index 52c3d20..0000000
--- a/gfx/cards/devolutionspray.2bpp
+++ /dev/null
diff --git a/gfx/cards/devolutionspray.8x6.png b/gfx/cards/devolutionspray.8x6.png
new file mode 100755
index 0000000..687e0dc
--- /dev/null
+++ b/gfx/cards/devolutionspray.8x6.png
diff --git a/gfx/cards/dewgong.2bpp b/gfx/cards/dewgong.2bpp
deleted file mode 100644
index 8c7a1fb..0000000
--- a/gfx/cards/dewgong.2bpp
+++ /dev/null
diff --git a/gfx/cards/dewgong.8x6.png b/gfx/cards/dewgong.8x6.png
new file mode 100755
index 0000000..75d6726
--- /dev/null
+++ b/gfx/cards/dewgong.8x6.png
diff --git a/gfx/cards/diglett.2bpp b/gfx/cards/diglett.2bpp
deleted file mode 100644
index 7642ec9..0000000
--- a/gfx/cards/diglett.2bpp
+++ /dev/null
diff --git a/gfx/cards/diglett.8x6.png b/gfx/cards/diglett.8x6.png
new file mode 100755
index 0000000..1b04e1c
--- /dev/null
+++ b/gfx/cards/diglett.8x6.png
diff --git a/gfx/cards/ditto.2bpp b/gfx/cards/ditto.2bpp
deleted file mode 100644
index 0b85fdd..0000000
--- a/gfx/cards/ditto.2bpp
+++ /dev/null
diff --git a/gfx/cards/ditto.8x6.png b/gfx/cards/ditto.8x6.png
new file mode 100755
index 0000000..e4e7116
--- /dev/null
+++ b/gfx/cards/ditto.8x6.png
diff --git a/gfx/cards/dodrio.2bpp b/gfx/cards/dodrio.2bpp
deleted file mode 100644
index 8951010..0000000
--- a/gfx/cards/dodrio.2bpp
+++ /dev/null
diff --git a/gfx/cards/dodrio.8x6.png b/gfx/cards/dodrio.8x6.png
new file mode 100755
index 0000000..bfc5408
--- /dev/null
+++ b/gfx/cards/dodrio.8x6.png
diff --git a/gfx/cards/doduo.2bpp b/gfx/cards/doduo.2bpp
deleted file mode 100644
index 81ed230..0000000
--- a/gfx/cards/doduo.2bpp
+++ /dev/null
diff --git a/gfx/cards/doduo.8x6.png b/gfx/cards/doduo.8x6.png
new file mode 100755
index 0000000..0b6425e
--- /dev/null
+++ b/gfx/cards/doduo.8x6.png
diff --git a/gfx/cards/doublecolorlessenergy.2bpp b/gfx/cards/doublecolorlessenergy.2bpp
deleted file mode 100644
index 0682a7d..0000000
--- a/gfx/cards/doublecolorlessenergy.2bpp
+++ /dev/null
diff --git a/gfx/cards/doublecolorlessenergy.8x6.png b/gfx/cards/doublecolorlessenergy.8x6.png
new file mode 100755
index 0000000..a53b3cf
--- /dev/null
+++ b/gfx/cards/doublecolorlessenergy.8x6.png
diff --git a/gfx/cards/dragonair.2bpp b/gfx/cards/dragonair.2bpp
deleted file mode 100644
index cd5ec9d..0000000
--- a/gfx/cards/dragonair.2bpp
+++ /dev/null
diff --git a/gfx/cards/dragonair.8x6.png b/gfx/cards/dragonair.8x6.png
new file mode 100755
index 0000000..632a275
--- /dev/null
+++ b/gfx/cards/dragonair.8x6.png
diff --git a/gfx/cards/dragonite1.2bpp b/gfx/cards/dragonite1.2bpp
deleted file mode 100644
index e3376d4..0000000
--- a/gfx/cards/dragonite1.2bpp
+++ /dev/null
diff --git a/gfx/cards/dragonite1.8x6.png b/gfx/cards/dragonite1.8x6.png
new file mode 100755
index 0000000..f8a258a
--- /dev/null
+++ b/gfx/cards/dragonite1.8x6.png
diff --git a/gfx/cards/dragonite2.2bpp b/gfx/cards/dragonite2.2bpp
deleted file mode 100644
index 1e7da6d..0000000
--- a/gfx/cards/dragonite2.2bpp
+++ /dev/null
diff --git a/gfx/cards/dragonite2.8x6.png b/gfx/cards/dragonite2.8x6.png
new file mode 100755
index 0000000..3db335c
--- /dev/null
+++ b/gfx/cards/dragonite2.8x6.png
diff --git a/gfx/cards/dratini.2bpp b/gfx/cards/dratini.2bpp
deleted file mode 100644
index ab5619e..0000000
--- a/gfx/cards/dratini.2bpp
+++ /dev/null
diff --git a/gfx/cards/dratini.8x6.png b/gfx/cards/dratini.8x6.png
new file mode 100755
index 0000000..2aa6509
--- /dev/null
+++ b/gfx/cards/dratini.8x6.png
diff --git a/gfx/cards/drowzee.2bpp b/gfx/cards/drowzee.2bpp
deleted file mode 100644
index 65750e5..0000000
--- a/gfx/cards/drowzee.2bpp
+++ /dev/null
diff --git a/gfx/cards/drowzee.8x6.png b/gfx/cards/drowzee.8x6.png
new file mode 100755
index 0000000..2cacd4d
--- /dev/null
+++ b/gfx/cards/drowzee.8x6.png
diff --git a/gfx/cards/dugtrio.2bpp b/gfx/cards/dugtrio.2bpp
deleted file mode 100644
index 123aeee..0000000
--- a/gfx/cards/dugtrio.2bpp
+++ /dev/null
diff --git a/gfx/cards/dugtrio.8x6.png b/gfx/cards/dugtrio.8x6.png
new file mode 100755
index 0000000..d894662
--- /dev/null
+++ b/gfx/cards/dugtrio.8x6.png
diff --git a/gfx/cards/eevee.2bpp b/gfx/cards/eevee.2bpp
deleted file mode 100644
index bcc0157..0000000
--- a/gfx/cards/eevee.2bpp
+++ /dev/null
diff --git a/gfx/cards/eevee.8x6.png b/gfx/cards/eevee.8x6.png
new file mode 100755
index 0000000..57fd380
--- /dev/null
+++ b/gfx/cards/eevee.8x6.png
diff --git a/gfx/cards/ekans.2bpp b/gfx/cards/ekans.2bpp
deleted file mode 100644
index f2d8ffe..0000000
--- a/gfx/cards/ekans.2bpp
+++ /dev/null
diff --git a/gfx/cards/ekans.8x6.png b/gfx/cards/ekans.8x6.png
new file mode 100755
index 0000000..f513d08
--- /dev/null
+++ b/gfx/cards/ekans.8x6.png
diff --git a/gfx/cards/electabuzz1.2bpp b/gfx/cards/electabuzz1.2bpp
deleted file mode 100644
index fcac457..0000000
--- a/gfx/cards/electabuzz1.2bpp
+++ /dev/null
diff --git a/gfx/cards/electabuzz1.8x6.png b/gfx/cards/electabuzz1.8x6.png
new file mode 100755
index 0000000..635fc20
--- /dev/null
+++ b/gfx/cards/electabuzz1.8x6.png
diff --git a/gfx/cards/electabuzz2.2bpp b/gfx/cards/electabuzz2.2bpp
deleted file mode 100644
index a5b744c..0000000
--- a/gfx/cards/electabuzz2.2bpp
+++ /dev/null
diff --git a/gfx/cards/electabuzz2.8x6.png b/gfx/cards/electabuzz2.8x6.png
new file mode 100755
index 0000000..c71a04a
--- /dev/null
+++ b/gfx/cards/electabuzz2.8x6.png
diff --git a/gfx/cards/electrode1.2bpp b/gfx/cards/electrode1.2bpp
deleted file mode 100644
index c50fe37..0000000
--- a/gfx/cards/electrode1.2bpp
+++ /dev/null
diff --git a/gfx/cards/electrode1.8x6.png b/gfx/cards/electrode1.8x6.png
new file mode 100755
index 0000000..e45f1ca
--- /dev/null
+++ b/gfx/cards/electrode1.8x6.png
diff --git a/gfx/cards/electrode2.2bpp b/gfx/cards/electrode2.2bpp
deleted file mode 100644
index f9ef5cd..0000000
--- a/gfx/cards/electrode2.2bpp
+++ /dev/null
diff --git a/gfx/cards/electrode2.8x6.png b/gfx/cards/electrode2.8x6.png
new file mode 100755
index 0000000..77ab4ef
--- /dev/null
+++ b/gfx/cards/electrode2.8x6.png
diff --git a/gfx/cards/energyremoval.2bpp b/gfx/cards/energyremoval.2bpp
deleted file mode 100644
index 4afe44c..0000000
--- a/gfx/cards/energyremoval.2bpp
+++ /dev/null
diff --git a/gfx/cards/energyremoval.8x6.png b/gfx/cards/energyremoval.8x6.png
new file mode 100755
index 0000000..4a8a4e3
--- /dev/null
+++ b/gfx/cards/energyremoval.8x6.png
diff --git a/gfx/cards/energyretrieval.2bpp b/gfx/cards/energyretrieval.2bpp
deleted file mode 100644
index eb4fb2d..0000000
--- a/gfx/cards/energyretrieval.2bpp
+++ /dev/null
diff --git a/gfx/cards/energyretrieval.8x6.png b/gfx/cards/energyretrieval.8x6.png
new file mode 100755
index 0000000..c41cf2f
--- /dev/null
+++ b/gfx/cards/energyretrieval.8x6.png
diff --git a/gfx/cards/energysearch.2bpp b/gfx/cards/energysearch.2bpp
deleted file mode 100644
index 69d8c9d..0000000
--- a/gfx/cards/energysearch.2bpp
+++ /dev/null
diff --git a/gfx/cards/energysearch.8x6.png b/gfx/cards/energysearch.8x6.png
new file mode 100755
index 0000000..3326569
--- /dev/null
+++ b/gfx/cards/energysearch.8x6.png
diff --git a/gfx/cards/exeggcute.2bpp b/gfx/cards/exeggcute.2bpp
deleted file mode 100644
index 3c380a7..0000000
--- a/gfx/cards/exeggcute.2bpp
+++ /dev/null
diff --git a/gfx/cards/exeggcute.8x6.png b/gfx/cards/exeggcute.8x6.png
new file mode 100755
index 0000000..9ae34c6
--- /dev/null
+++ b/gfx/cards/exeggcute.8x6.png
diff --git a/gfx/cards/exeggutor.2bpp b/gfx/cards/exeggutor.2bpp
deleted file mode 100644
index 5f9ca75..0000000
--- a/gfx/cards/exeggutor.2bpp
+++ /dev/null
diff --git a/gfx/cards/exeggutor.8x6.png b/gfx/cards/exeggutor.8x6.png
new file mode 100755
index 0000000..0022a16
--- /dev/null
+++ b/gfx/cards/exeggutor.8x6.png
diff --git a/gfx/cards/farfetchd.2bpp b/gfx/cards/farfetchd.2bpp
deleted file mode 100644
index 4b94009..0000000
--- a/gfx/cards/farfetchd.2bpp
+++ /dev/null
diff --git a/gfx/cards/farfetchd.8x6.png b/gfx/cards/farfetchd.8x6.png
new file mode 100755
index 0000000..cd4099b
--- /dev/null
+++ b/gfx/cards/farfetchd.8x6.png
diff --git a/gfx/cards/fearow.2bpp b/gfx/cards/fearow.2bpp
deleted file mode 100644
index d0f5727..0000000
--- a/gfx/cards/fearow.2bpp
+++ /dev/null
diff --git a/gfx/cards/fearow.8x6.png b/gfx/cards/fearow.8x6.png
new file mode 100755
index 0000000..6e25ded
--- /dev/null
+++ b/gfx/cards/fearow.8x6.png
diff --git a/gfx/cards/fightingenergy.2bpp b/gfx/cards/fightingenergy.2bpp
deleted file mode 100644
index 28f6ebe..0000000
--- a/gfx/cards/fightingenergy.2bpp
+++ /dev/null
diff --git a/gfx/cards/fightingenergy.8x6.png b/gfx/cards/fightingenergy.8x6.png
new file mode 100755
index 0000000..a56f096
--- /dev/null
+++ b/gfx/cards/fightingenergy.8x6.png
diff --git a/gfx/cards/fireenergy.2bpp b/gfx/cards/fireenergy.2bpp
deleted file mode 100644
index 5fd5d20..0000000
--- a/gfx/cards/fireenergy.2bpp
+++ /dev/null
diff --git a/gfx/cards/fireenergy.8x6.png b/gfx/cards/fireenergy.8x6.png
new file mode 100755
index 0000000..2f2d81b
--- /dev/null
+++ b/gfx/cards/fireenergy.8x6.png
diff --git a/gfx/cards/flareon1.2bpp b/gfx/cards/flareon1.2bpp
deleted file mode 100644
index f3f6f7f..0000000
--- a/gfx/cards/flareon1.2bpp
+++ /dev/null
diff --git a/gfx/cards/flareon1.8x6.png b/gfx/cards/flareon1.8x6.png
new file mode 100755
index 0000000..de2e528
--- /dev/null
+++ b/gfx/cards/flareon1.8x6.png
diff --git a/gfx/cards/flareon2.2bpp b/gfx/cards/flareon2.2bpp
deleted file mode 100644
index f3626da..0000000
--- a/gfx/cards/flareon2.2bpp
+++ /dev/null
diff --git a/gfx/cards/flareon2.8x6.png b/gfx/cards/flareon2.8x6.png
new file mode 100755
index 0000000..0e3a977
--- /dev/null
+++ b/gfx/cards/flareon2.8x6.png
diff --git a/gfx/cards/flyingpikachu.2bpp b/gfx/cards/flyingpikachu.2bpp
deleted file mode 100644
index 39dee24..0000000
--- a/gfx/cards/flyingpikachu.2bpp
+++ /dev/null
diff --git a/gfx/cards/flyingpikachu.8x6.png b/gfx/cards/flyingpikachu.8x6.png
new file mode 100755
index 0000000..3fd5baf
--- /dev/null
+++ b/gfx/cards/flyingpikachu.8x6.png
diff --git a/gfx/cards/fullheal.2bpp b/gfx/cards/fullheal.2bpp
deleted file mode 100644
index 11eb40a..0000000
--- a/gfx/cards/fullheal.2bpp
+++ /dev/null
diff --git a/gfx/cards/fullheal.8x6.png b/gfx/cards/fullheal.8x6.png
new file mode 100755
index 0000000..4e6e883
--- /dev/null
+++ b/gfx/cards/fullheal.8x6.png
diff --git a/gfx/cards/gambler.2bpp b/gfx/cards/gambler.2bpp
deleted file mode 100644
index 88812f4..0000000
--- a/gfx/cards/gambler.2bpp
+++ /dev/null
diff --git a/gfx/cards/gambler.8x6.png b/gfx/cards/gambler.8x6.png
new file mode 100755
index 0000000..96db9a4
--- /dev/null
+++ b/gfx/cards/gambler.8x6.png
diff --git a/gfx/cards/gastly1.2bpp b/gfx/cards/gastly1.2bpp
deleted file mode 100644
index 1e051a7..0000000
--- a/gfx/cards/gastly1.2bpp
+++ /dev/null
diff --git a/gfx/cards/gastly1.8x6.png b/gfx/cards/gastly1.8x6.png
new file mode 100755
index 0000000..25d751b
--- /dev/null
+++ b/gfx/cards/gastly1.8x6.png
diff --git a/gfx/cards/gastly2.2bpp b/gfx/cards/gastly2.2bpp
deleted file mode 100644
index ab3950d..0000000
--- a/gfx/cards/gastly2.2bpp
+++ /dev/null
diff --git a/gfx/cards/gastly2.8x6.png b/gfx/cards/gastly2.8x6.png
new file mode 100755
index 0000000..f5bc351
--- /dev/null
+++ b/gfx/cards/gastly2.8x6.png
diff --git a/gfx/cards/gengar.2bpp b/gfx/cards/gengar.2bpp
deleted file mode 100644
index c20378e..0000000
--- a/gfx/cards/gengar.2bpp
+++ /dev/null
diff --git a/gfx/cards/gengar.8x6.png b/gfx/cards/gengar.8x6.png
new file mode 100755
index 0000000..9347e59
--- /dev/null
+++ b/gfx/cards/gengar.8x6.png
diff --git a/gfx/cards/geodude.2bpp b/gfx/cards/geodude.2bpp
deleted file mode 100644
index 6bc14b3..0000000
--- a/gfx/cards/geodude.2bpp
+++ /dev/null
diff --git a/gfx/cards/geodude.8x6.png b/gfx/cards/geodude.8x6.png
new file mode 100755
index 0000000..693b23b
--- /dev/null
+++ b/gfx/cards/geodude.8x6.png
diff --git a/gfx/cards/gloom.2bpp b/gfx/cards/gloom.2bpp
deleted file mode 100644
index dcccf11..0000000
--- a/gfx/cards/gloom.2bpp
+++ /dev/null
diff --git a/gfx/cards/gloom.8x6.png b/gfx/cards/gloom.8x6.png
new file mode 100755
index 0000000..391532b
--- /dev/null
+++ b/gfx/cards/gloom.8x6.png
diff --git a/gfx/cards/golbat.2bpp b/gfx/cards/golbat.2bpp
deleted file mode 100644
index 9377ec1..0000000
--- a/gfx/cards/golbat.2bpp
+++ /dev/null
diff --git a/gfx/cards/golbat.8x6.png b/gfx/cards/golbat.8x6.png
new file mode 100755
index 0000000..11b4635
--- /dev/null
+++ b/gfx/cards/golbat.8x6.png
diff --git a/gfx/cards/goldeen.2bpp b/gfx/cards/goldeen.2bpp
deleted file mode 100644
index 3ad727e..0000000
--- a/gfx/cards/goldeen.2bpp
+++ /dev/null
diff --git a/gfx/cards/goldeen.8x6.png b/gfx/cards/goldeen.8x6.png
new file mode 100755
index 0000000..78a9cd4
--- /dev/null
+++ b/gfx/cards/goldeen.8x6.png
diff --git a/gfx/cards/golduck.2bpp b/gfx/cards/golduck.2bpp
deleted file mode 100644
index aec7c50..0000000
--- a/gfx/cards/golduck.2bpp
+++ /dev/null
diff --git a/gfx/cards/golduck.8x6.png b/gfx/cards/golduck.8x6.png
new file mode 100755
index 0000000..cef746e
--- /dev/null
+++ b/gfx/cards/golduck.8x6.png
diff --git a/gfx/cards/golem.2bpp b/gfx/cards/golem.2bpp
deleted file mode 100644
index 3887601..0000000
--- a/gfx/cards/golem.2bpp
+++ /dev/null
diff --git a/gfx/cards/golem.8x6.png b/gfx/cards/golem.8x6.png
new file mode 100755
index 0000000..4d30bc7
--- /dev/null
+++ b/gfx/cards/golem.8x6.png
diff --git a/gfx/cards/grassenergy.2bpp b/gfx/cards/grassenergy.2bpp
deleted file mode 100644
index c487ca6..0000000
--- a/gfx/cards/grassenergy.2bpp
+++ /dev/null
diff --git a/gfx/cards/grassenergy.8x6.png b/gfx/cards/grassenergy.8x6.png
new file mode 100755
index 0000000..2046bcb
--- /dev/null
+++ b/gfx/cards/grassenergy.8x6.png
diff --git a/gfx/cards/graveler.2bpp b/gfx/cards/graveler.2bpp
deleted file mode 100644
index 2617420..0000000
--- a/gfx/cards/graveler.2bpp
+++ /dev/null
diff --git a/gfx/cards/graveler.8x6.png b/gfx/cards/graveler.8x6.png
new file mode 100755
index 0000000..5f82ed3
--- /dev/null
+++ b/gfx/cards/graveler.8x6.png
diff --git a/gfx/cards/grimer.2bpp b/gfx/cards/grimer.2bpp
deleted file mode 100644
index 4825908..0000000
--- a/gfx/cards/grimer.2bpp
+++ /dev/null
diff --git a/gfx/cards/grimer.8x6.png b/gfx/cards/grimer.8x6.png
new file mode 100755
index 0000000..ea79975
--- /dev/null
+++ b/gfx/cards/grimer.8x6.png
diff --git a/gfx/cards/growlithe.2bpp b/gfx/cards/growlithe.2bpp
deleted file mode 100644
index 5c64e7f..0000000
--- a/gfx/cards/growlithe.2bpp
+++ /dev/null
diff --git a/gfx/cards/growlithe.8x6.png b/gfx/cards/growlithe.8x6.png
new file mode 100755
index 0000000..5b51f0f
--- /dev/null
+++ b/gfx/cards/growlithe.8x6.png
diff --git a/gfx/cards/gustofwind.2bpp b/gfx/cards/gustofwind.2bpp
deleted file mode 100644
index 580c040..0000000
--- a/gfx/cards/gustofwind.2bpp
+++ /dev/null
diff --git a/gfx/cards/gustofwind.8x6.png b/gfx/cards/gustofwind.8x6.png
new file mode 100755
index 0000000..31949bd
--- /dev/null
+++ b/gfx/cards/gustofwind.8x6.png
diff --git a/gfx/cards/gyarados.2bpp b/gfx/cards/gyarados.2bpp
deleted file mode 100644
index b7f9e14..0000000
--- a/gfx/cards/gyarados.2bpp
+++ /dev/null
diff --git a/gfx/cards/gyarados.8x6.png b/gfx/cards/gyarados.8x6.png
new file mode 100755
index 0000000..cd975f6
--- /dev/null
+++ b/gfx/cards/gyarados.8x6.png
diff --git a/gfx/cards/haunter1.2bpp b/gfx/cards/haunter1.2bpp
deleted file mode 100644
index 0e97f7f..0000000
--- a/gfx/cards/haunter1.2bpp
+++ /dev/null
diff --git a/gfx/cards/haunter1.8x6.png b/gfx/cards/haunter1.8x6.png
new file mode 100755
index 0000000..b6a60af
--- /dev/null
+++ b/gfx/cards/haunter1.8x6.png
diff --git a/gfx/cards/haunter2.2bpp b/gfx/cards/haunter2.2bpp
deleted file mode 100644
index 33916f3..0000000
--- a/gfx/cards/haunter2.2bpp
+++ /dev/null
diff --git a/gfx/cards/haunter2.8x6.png b/gfx/cards/haunter2.8x6.png
new file mode 100755
index 0000000..abe44ea
--- /dev/null
+++ b/gfx/cards/haunter2.8x6.png
diff --git a/gfx/cards/hitmonchan.2bpp b/gfx/cards/hitmonchan.2bpp
deleted file mode 100644
index 35bce8e..0000000
--- a/gfx/cards/hitmonchan.2bpp
+++ /dev/null
diff --git a/gfx/cards/hitmonchan.8x6.png b/gfx/cards/hitmonchan.8x6.png
new file mode 100755
index 0000000..6709c76
--- /dev/null
+++ b/gfx/cards/hitmonchan.8x6.png
diff --git a/gfx/cards/hitmonlee.2bpp b/gfx/cards/hitmonlee.2bpp
deleted file mode 100644
index 7b0b523..0000000
--- a/gfx/cards/hitmonlee.2bpp
+++ /dev/null
diff --git a/gfx/cards/hitmonlee.8x6.png b/gfx/cards/hitmonlee.8x6.png
new file mode 100755
index 0000000..95a37ed
--- /dev/null
+++ b/gfx/cards/hitmonlee.8x6.png
diff --git a/gfx/cards/horsea.2bpp b/gfx/cards/horsea.2bpp
deleted file mode 100644
index 273f0de..0000000
--- a/gfx/cards/horsea.2bpp
+++ /dev/null
diff --git a/gfx/cards/horsea.8x6.png b/gfx/cards/horsea.8x6.png
new file mode 100755
index 0000000..70f5463
--- /dev/null
+++ b/gfx/cards/horsea.8x6.png
diff --git a/gfx/cards/hypno.2bpp b/gfx/cards/hypno.2bpp
deleted file mode 100644
index 185988c..0000000
--- a/gfx/cards/hypno.2bpp
+++ /dev/null
diff --git a/gfx/cards/hypno.8x6.png b/gfx/cards/hypno.8x6.png
new file mode 100755
index 0000000..f1ecee7
--- /dev/null
+++ b/gfx/cards/hypno.8x6.png
diff --git a/gfx/cards/imakuni.2bpp b/gfx/cards/imakuni.2bpp
deleted file mode 100644
index 5cf85c8..0000000
--- a/gfx/cards/imakuni.2bpp
+++ /dev/null
diff --git a/gfx/cards/imakuni.8x6.png b/gfx/cards/imakuni.8x6.png
new file mode 100755
index 0000000..3a03b73
--- /dev/null
+++ b/gfx/cards/imakuni.8x6.png
diff --git a/gfx/cards/imposterprofessoroak.2bpp b/gfx/cards/imposterprofessoroak.2bpp
deleted file mode 100644
index ca6588e..0000000
--- a/gfx/cards/imposterprofessoroak.2bpp
+++ /dev/null
diff --git a/gfx/cards/imposterprofessoroak.8x6.png b/gfx/cards/imposterprofessoroak.8x6.png
new file mode 100755
index 0000000..4b97377
--- /dev/null
+++ b/gfx/cards/imposterprofessoroak.8x6.png
diff --git a/gfx/cards/itemfinder.2bpp b/gfx/cards/itemfinder.2bpp
deleted file mode 100644
index c563786..0000000
--- a/gfx/cards/itemfinder.2bpp
+++ /dev/null
diff --git a/gfx/cards/itemfinder.8x6.png b/gfx/cards/itemfinder.8x6.png
new file mode 100755
index 0000000..f0c75f4
--- /dev/null
+++ b/gfx/cards/itemfinder.8x6.png
diff --git a/gfx/cards/ivysaur.2bpp b/gfx/cards/ivysaur.2bpp
deleted file mode 100644
index f30ac0c..0000000
--- a/gfx/cards/ivysaur.2bpp
+++ /dev/null
diff --git a/gfx/cards/ivysaur.8x6.png b/gfx/cards/ivysaur.8x6.png
new file mode 100755
index 0000000..8585251
--- /dev/null
+++ b/gfx/cards/ivysaur.8x6.png
diff --git a/gfx/cards/jigglypuff1.2bpp b/gfx/cards/jigglypuff1.2bpp
deleted file mode 100644
index d3d2c00..0000000
--- a/gfx/cards/jigglypuff1.2bpp
+++ /dev/null
diff --git a/gfx/cards/jigglypuff1.8x6.png b/gfx/cards/jigglypuff1.8x6.png
new file mode 100755
index 0000000..88d9c5e
--- /dev/null
+++ b/gfx/cards/jigglypuff1.8x6.png
diff --git a/gfx/cards/jigglypuff2.2bpp b/gfx/cards/jigglypuff2.2bpp
deleted file mode 100644
index f4d3942..0000000
--- a/gfx/cards/jigglypuff2.2bpp
+++ /dev/null
diff --git a/gfx/cards/jigglypuff2.8x6.png b/gfx/cards/jigglypuff2.8x6.png
new file mode 100755
index 0000000..bd141e2
--- /dev/null
+++ b/gfx/cards/jigglypuff2.8x6.png
diff --git a/gfx/cards/jigglypuff3.2bpp b/gfx/cards/jigglypuff3.2bpp
deleted file mode 100644
index 3aeaf6e..0000000
--- a/gfx/cards/jigglypuff3.2bpp
+++ /dev/null
diff --git a/gfx/cards/jigglypuff3.8x6.png b/gfx/cards/jigglypuff3.8x6.png
new file mode 100755
index 0000000..c2ff3f5
--- /dev/null
+++ b/gfx/cards/jigglypuff3.8x6.png
diff --git a/gfx/cards/jolteon1.2bpp b/gfx/cards/jolteon1.2bpp
deleted file mode 100644
index 15e3018..0000000
--- a/gfx/cards/jolteon1.2bpp
+++ /dev/null
diff --git a/gfx/cards/jolteon1.8x6.png b/gfx/cards/jolteon1.8x6.png
new file mode 100755
index 0000000..dfafce4
--- /dev/null
+++ b/gfx/cards/jolteon1.8x6.png
diff --git a/gfx/cards/jolteon2.2bpp b/gfx/cards/jolteon2.2bpp
deleted file mode 100644
index f357d77..0000000
--- a/gfx/cards/jolteon2.2bpp
+++ /dev/null
diff --git a/gfx/cards/jolteon2.8x6.png b/gfx/cards/jolteon2.8x6.png
new file mode 100755
index 0000000..9b4f54a
--- /dev/null
+++ b/gfx/cards/jolteon2.8x6.png
diff --git a/gfx/cards/jynx.2bpp b/gfx/cards/jynx.2bpp
deleted file mode 100644
index 411cee0..0000000
--- a/gfx/cards/jynx.2bpp
+++ /dev/null
diff --git a/gfx/cards/jynx.8x6.png b/gfx/cards/jynx.8x6.png
new file mode 100755
index 0000000..714352d
--- /dev/null
+++ b/gfx/cards/jynx.8x6.png
diff --git a/gfx/cards/kabuto.2bpp b/gfx/cards/kabuto.2bpp
deleted file mode 100644
index 5f2fba3..0000000
--- a/gfx/cards/kabuto.2bpp
+++ /dev/null
diff --git a/gfx/cards/kabuto.8x6.png b/gfx/cards/kabuto.8x6.png
new file mode 100755
index 0000000..6927f76
--- /dev/null
+++ b/gfx/cards/kabuto.8x6.png
diff --git a/gfx/cards/kabutops.2bpp b/gfx/cards/kabutops.2bpp
deleted file mode 100644
index 2e9b8b5..0000000
--- a/gfx/cards/kabutops.2bpp
+++ /dev/null
diff --git a/gfx/cards/kabutops.8x6.png b/gfx/cards/kabutops.8x6.png
new file mode 100755
index 0000000..e7be8fc
--- /dev/null
+++ b/gfx/cards/kabutops.8x6.png
diff --git a/gfx/cards/kadabra.2bpp b/gfx/cards/kadabra.2bpp
deleted file mode 100644
index 263e613..0000000
--- a/gfx/cards/kadabra.2bpp
+++ /dev/null
diff --git a/gfx/cards/kadabra.8x6.png b/gfx/cards/kadabra.8x6.png
new file mode 100755
index 0000000..7781d90
--- /dev/null
+++ b/gfx/cards/kadabra.8x6.png
diff --git a/gfx/cards/kakuna.2bpp b/gfx/cards/kakuna.2bpp
deleted file mode 100644
index f262b4b..0000000
--- a/gfx/cards/kakuna.2bpp
+++ /dev/null
diff --git a/gfx/cards/kakuna.8x6.png b/gfx/cards/kakuna.8x6.png
new file mode 100755
index 0000000..a15d069
--- /dev/null
+++ b/gfx/cards/kakuna.8x6.png
diff --git a/gfx/cards/kangaskhan.2bpp b/gfx/cards/kangaskhan.2bpp
deleted file mode 100644
index d613d03..0000000
--- a/gfx/cards/kangaskhan.2bpp
+++ /dev/null
diff --git a/gfx/cards/kangaskhan.8x6.png b/gfx/cards/kangaskhan.8x6.png
new file mode 100755
index 0000000..5aa16c1
--- /dev/null
+++ b/gfx/cards/kangaskhan.8x6.png
diff --git a/gfx/cards/kingler.2bpp b/gfx/cards/kingler.2bpp
deleted file mode 100644
index dcde9df..0000000
--- a/gfx/cards/kingler.2bpp
+++ /dev/null
diff --git a/gfx/cards/kingler.8x6.png b/gfx/cards/kingler.8x6.png
new file mode 100755
index 0000000..8ef4720
--- /dev/null
+++ b/gfx/cards/kingler.8x6.png
diff --git a/gfx/cards/koffing.2bpp b/gfx/cards/koffing.2bpp
deleted file mode 100644
index ab97210..0000000
--- a/gfx/cards/koffing.2bpp
+++ /dev/null
diff --git a/gfx/cards/koffing.8x6.png b/gfx/cards/koffing.8x6.png
new file mode 100755
index 0000000..599f646
--- /dev/null
+++ b/gfx/cards/koffing.8x6.png
diff --git a/gfx/cards/krabby.2bpp b/gfx/cards/krabby.2bpp
deleted file mode 100644
index 81ba516..0000000
--- a/gfx/cards/krabby.2bpp
+++ /dev/null
diff --git a/gfx/cards/krabby.8x6.png b/gfx/cards/krabby.8x6.png
new file mode 100755
index 0000000..6978939
--- /dev/null
+++ b/gfx/cards/krabby.8x6.png
diff --git a/gfx/cards/lapras.2bpp b/gfx/cards/lapras.2bpp
deleted file mode 100644
index 5da88d3..0000000
--- a/gfx/cards/lapras.2bpp
+++ /dev/null
diff --git a/gfx/cards/lapras.8x6.png b/gfx/cards/lapras.8x6.png
new file mode 100755
index 0000000..9b84af7
--- /dev/null
+++ b/gfx/cards/lapras.8x6.png
diff --git a/gfx/cards/lass.2bpp b/gfx/cards/lass.2bpp
deleted file mode 100644
index b30549a..0000000
--- a/gfx/cards/lass.2bpp
+++ /dev/null
diff --git a/gfx/cards/lass.8x6.png b/gfx/cards/lass.8x6.png
new file mode 100755
index 0000000..895c925
--- /dev/null
+++ b/gfx/cards/lass.8x6.png
diff --git a/gfx/cards/lickitung.2bpp b/gfx/cards/lickitung.2bpp
deleted file mode 100644
index 2b55249..0000000
--- a/gfx/cards/lickitung.2bpp
+++ /dev/null
diff --git a/gfx/cards/lickitung.8x6.png b/gfx/cards/lickitung.8x6.png
new file mode 100755
index 0000000..87739b3
--- /dev/null
+++ b/gfx/cards/lickitung.8x6.png
diff --git a/gfx/cards/lightningenergy.2bpp b/gfx/cards/lightningenergy.2bpp
deleted file mode 100644
index 6b0ec24..0000000
--- a/gfx/cards/lightningenergy.2bpp
+++ /dev/null
diff --git a/gfx/cards/lightningenergy.8x6.png b/gfx/cards/lightningenergy.8x6.png
new file mode 100755
index 0000000..0bd235b
--- /dev/null
+++ b/gfx/cards/lightningenergy.8x6.png
diff --git a/gfx/cards/machamp.2bpp b/gfx/cards/machamp.2bpp
deleted file mode 100644
index ba10e3e..0000000
--- a/gfx/cards/machamp.2bpp
+++ /dev/null
diff --git a/gfx/cards/machamp.8x6.png b/gfx/cards/machamp.8x6.png
new file mode 100755
index 0000000..3eb5066
--- /dev/null
+++ b/gfx/cards/machamp.8x6.png
diff --git a/gfx/cards/machoke.2bpp b/gfx/cards/machoke.2bpp
deleted file mode 100644
index 2030f74..0000000
--- a/gfx/cards/machoke.2bpp
+++ /dev/null
diff --git a/gfx/cards/machoke.8x6.png b/gfx/cards/machoke.8x6.png
new file mode 100755
index 0000000..f67e577
--- /dev/null
+++ b/gfx/cards/machoke.8x6.png
diff --git a/gfx/cards/machop.2bpp b/gfx/cards/machop.2bpp
deleted file mode 100644
index 704cb96..0000000
--- a/gfx/cards/machop.2bpp
+++ /dev/null
diff --git a/gfx/cards/machop.8x6.png b/gfx/cards/machop.8x6.png
new file mode 100755
index 0000000..78ff0c0
--- /dev/null
+++ b/gfx/cards/machop.8x6.png
diff --git a/gfx/cards/magikarp.2bpp b/gfx/cards/magikarp.2bpp
deleted file mode 100644
index aadcd79..0000000
--- a/gfx/cards/magikarp.2bpp
+++ /dev/null
diff --git a/gfx/cards/magikarp.8x6.png b/gfx/cards/magikarp.8x6.png
new file mode 100755
index 0000000..e3c7f43
--- /dev/null
+++ b/gfx/cards/magikarp.8x6.png
diff --git a/gfx/cards/magmar1.2bpp b/gfx/cards/magmar1.2bpp
deleted file mode 100644
index a7b9169..0000000
--- a/gfx/cards/magmar1.2bpp
+++ /dev/null
@@ -1,2 +0,0 @@
-����������������������������������������������������޿̿�������������߿⟡޻ć�̳��ү��ԫ�������������������������������������������������Ӯ�:�C�{�8�y���w������w���?�o/��7ϟo��?Q��������������=~�}�������������������ed����B�3�+���8��筯�Y]��:����:k�}�~����߶����������������������׻�=%���
-܄�80`@����������k+\7�?�߿_Ͽ�`#�5�@o@G���ObE`$�0����yy��>�����������������ǻ���}e��ىn�]*Q/|����>�G�À��׀��x�;�}�k�6�[��=k/�p�@�@s�?�����c����psћ����;;����������??���������;;���owwו-�^߁�����M����M�&�Y�e��ڭm�2��8��8�2�����������߿�~������������������������������?�����������Ϸ���:+jKkK͝�=e=�>���>��$=����e*�\��r|����������g������������������������������?u�������?�������������������O?o���=�]�K3q��
\ No newline at end of file
diff --git a/gfx/cards/magmar1.8x6.png b/gfx/cards/magmar1.8x6.png
new file mode 100755
index 0000000..19f67d8
--- /dev/null
+++ b/gfx/cards/magmar1.8x6.png
diff --git a/gfx/cards/magmar2.2bpp b/gfx/cards/magmar2.2bpp
deleted file mode 100644
index d8c5c9d..0000000
--- a/gfx/cards/magmar2.2bpp
+++ /dev/null
diff --git a/gfx/cards/magmar2.8x6.png b/gfx/cards/magmar2.8x6.png
new file mode 100755
index 0000000..2e4a5f2
--- /dev/null
+++ b/gfx/cards/magmar2.8x6.png
diff --git a/gfx/cards/magnemite1.2bpp b/gfx/cards/magnemite1.2bpp
deleted file mode 100644
index 272e6ca..0000000
--- a/gfx/cards/magnemite1.2bpp
+++ /dev/null
diff --git a/gfx/cards/magnemite1.8x6.png b/gfx/cards/magnemite1.8x6.png
new file mode 100755
index 0000000..167ea0e
--- /dev/null
+++ b/gfx/cards/magnemite1.8x6.png
diff --git a/gfx/cards/magnemite2.2bpp b/gfx/cards/magnemite2.2bpp
deleted file mode 100644
index b8656bd..0000000
--- a/gfx/cards/magnemite2.2bpp
+++ /dev/null
diff --git a/gfx/cards/magnemite2.8x6.png b/gfx/cards/magnemite2.8x6.png
new file mode 100755
index 0000000..4eee6e4
--- /dev/null
+++ b/gfx/cards/magnemite2.8x6.png
diff --git a/gfx/cards/magneton1.2bpp b/gfx/cards/magneton1.2bpp
deleted file mode 100644
index cc31453..0000000
--- a/gfx/cards/magneton1.2bpp
+++ /dev/null
diff --git a/gfx/cards/magneton1.8x6.png b/gfx/cards/magneton1.8x6.png
new file mode 100755
index 0000000..82715d6
--- /dev/null
+++ b/gfx/cards/magneton1.8x6.png
diff --git a/gfx/cards/magneton2.2bpp b/gfx/cards/magneton2.2bpp
deleted file mode 100644
index 2e69a16..0000000
--- a/gfx/cards/magneton2.2bpp
+++ /dev/null
diff --git a/gfx/cards/magneton2.8x6.png b/gfx/cards/magneton2.8x6.png
new file mode 100755
index 0000000..dfcedf1
--- /dev/null
+++ b/gfx/cards/magneton2.8x6.png
diff --git a/gfx/cards/maintenance.2bpp b/gfx/cards/maintenance.2bpp
deleted file mode 100644
index 357df22..0000000
--- a/gfx/cards/maintenance.2bpp
+++ /dev/null
diff --git a/gfx/cards/maintenance.8x6.png b/gfx/cards/maintenance.8x6.png
new file mode 100755
index 0000000..f9c2d51
--- /dev/null
+++ b/gfx/cards/maintenance.8x6.png
diff --git a/gfx/cards/mankey.2bpp b/gfx/cards/mankey.2bpp
deleted file mode 100644
index 60969cc..0000000
--- a/gfx/cards/mankey.2bpp
+++ /dev/null
diff --git a/gfx/cards/mankey.8x6.png b/gfx/cards/mankey.8x6.png
new file mode 100755
index 0000000..2bfd603
--- /dev/null
+++ b/gfx/cards/mankey.8x6.png
diff --git a/gfx/cards/marowak1.2bpp b/gfx/cards/marowak1.2bpp
deleted file mode 100644
index c0a0ca3..0000000
--- a/gfx/cards/marowak1.2bpp
+++ /dev/null
diff --git a/gfx/cards/marowak1.8x6.png b/gfx/cards/marowak1.8x6.png
new file mode 100755
index 0000000..9513375
--- /dev/null
+++ b/gfx/cards/marowak1.8x6.png
diff --git a/gfx/cards/marowak2.2bpp b/gfx/cards/marowak2.2bpp
deleted file mode 100644
index c003ca2..0000000
--- a/gfx/cards/marowak2.2bpp
+++ /dev/null
diff --git a/gfx/cards/marowak2.8x6.png b/gfx/cards/marowak2.8x6.png
new file mode 100755
index 0000000..41f0db9
--- /dev/null
+++ b/gfx/cards/marowak2.8x6.png
diff --git a/gfx/cards/meowth1.2bpp b/gfx/cards/meowth1.2bpp
deleted file mode 100644
index da5def2..0000000
--- a/gfx/cards/meowth1.2bpp
+++ /dev/null
diff --git a/gfx/cards/meowth1.8x6.png b/gfx/cards/meowth1.8x6.png
new file mode 100755
index 0000000..9e86723
--- /dev/null
+++ b/gfx/cards/meowth1.8x6.png
diff --git a/gfx/cards/meowth2.2bpp b/gfx/cards/meowth2.2bpp
deleted file mode 100644
index 9b159d2..0000000
--- a/gfx/cards/meowth2.2bpp
+++ /dev/null
diff --git a/gfx/cards/meowth2.8x6.png b/gfx/cards/meowth2.8x6.png
new file mode 100755
index 0000000..389a5a1
--- /dev/null
+++ b/gfx/cards/meowth2.8x6.png
diff --git a/gfx/cards/metapod.2bpp b/gfx/cards/metapod.2bpp
deleted file mode 100644
index 398a109..0000000
--- a/gfx/cards/metapod.2bpp
+++ /dev/null
diff --git a/gfx/cards/metapod.8x6.png b/gfx/cards/metapod.8x6.png
new file mode 100755
index 0000000..f0fe8f4
--- /dev/null
+++ b/gfx/cards/metapod.8x6.png
diff --git a/gfx/cards/mew1.2bpp b/gfx/cards/mew1.2bpp
deleted file mode 100644
index 34c2790..0000000
--- a/gfx/cards/mew1.2bpp
+++ /dev/null
diff --git a/gfx/cards/mew1.8x6.png b/gfx/cards/mew1.8x6.png
new file mode 100755
index 0000000..0589e52
--- /dev/null
+++ b/gfx/cards/mew1.8x6.png
diff --git a/gfx/cards/mew2.2bpp b/gfx/cards/mew2.2bpp
deleted file mode 100644
index 0fc5972..0000000
--- a/gfx/cards/mew2.2bpp
+++ /dev/null
diff --git a/gfx/cards/mew2.8x6.png b/gfx/cards/mew2.8x6.png
new file mode 100755
index 0000000..5d8d1d7
--- /dev/null
+++ b/gfx/cards/mew2.8x6.png
diff --git a/gfx/cards/mew3.2bpp b/gfx/cards/mew3.2bpp
deleted file mode 100644
index df9ffb5..0000000
--- a/gfx/cards/mew3.2bpp
+++ /dev/null
diff --git a/gfx/cards/mew3.8x6.png b/gfx/cards/mew3.8x6.png
new file mode 100755
index 0000000..38370c5
--- /dev/null
+++ b/gfx/cards/mew3.8x6.png
diff --git a/gfx/cards/mewtwo1.2bpp b/gfx/cards/mewtwo1.2bpp
deleted file mode 100644
index f5ca59f..0000000
--- a/gfx/cards/mewtwo1.2bpp
+++ /dev/null
diff --git a/gfx/cards/mewtwo1.8x6.png b/gfx/cards/mewtwo1.8x6.png
new file mode 100755
index 0000000..11ef01b
--- /dev/null
+++ b/gfx/cards/mewtwo1.8x6.png
diff --git a/gfx/cards/mewtwo2.2bpp b/gfx/cards/mewtwo2.2bpp
deleted file mode 100644
index 92c841e..0000000
--- a/gfx/cards/mewtwo2.2bpp
+++ /dev/null
diff --git a/gfx/cards/mewtwo2.8x6.png b/gfx/cards/mewtwo2.8x6.png
new file mode 100755
index 0000000..2327f24
--- /dev/null
+++ b/gfx/cards/mewtwo2.8x6.png
diff --git a/gfx/cards/mewtwo3.2bpp b/gfx/cards/mewtwo3.2bpp
deleted file mode 100644
index 3d5a52f..0000000
--- a/gfx/cards/mewtwo3.2bpp
+++ /dev/null
diff --git a/gfx/cards/mewtwo3.8x6.png b/gfx/cards/mewtwo3.8x6.png
new file mode 100755
index 0000000..8fa11b2
--- /dev/null
+++ b/gfx/cards/mewtwo3.8x6.png
diff --git a/gfx/cards/moltres1.2bpp b/gfx/cards/moltres1.2bpp
deleted file mode 100644
index d4d9a6f..0000000
--- a/gfx/cards/moltres1.2bpp
+++ /dev/null
diff --git a/gfx/cards/moltres1.8x6.png b/gfx/cards/moltres1.8x6.png
new file mode 100755
index 0000000..30e890c
--- /dev/null
+++ b/gfx/cards/moltres1.8x6.png
diff --git a/gfx/cards/moltres2.2bpp b/gfx/cards/moltres2.2bpp
deleted file mode 100644
index b99bec8..0000000
--- a/gfx/cards/moltres2.2bpp
+++ /dev/null
diff --git a/gfx/cards/moltres2.8x6.png b/gfx/cards/moltres2.8x6.png
new file mode 100755
index 0000000..317700f
--- /dev/null
+++ b/gfx/cards/moltres2.8x6.png
diff --git a/gfx/cards/mrfuji.2bpp b/gfx/cards/mrfuji.2bpp
deleted file mode 100644
index a7ecd26..0000000
--- a/gfx/cards/mrfuji.2bpp
+++ /dev/null
diff --git a/gfx/cards/mrfuji.8x6.png b/gfx/cards/mrfuji.8x6.png
new file mode 100755
index 0000000..b92c7be
--- /dev/null
+++ b/gfx/cards/mrfuji.8x6.png
diff --git a/gfx/cards/mrmime.2bpp b/gfx/cards/mrmime.2bpp
deleted file mode 100644
index f01b96b..0000000
--- a/gfx/cards/mrmime.2bpp
+++ /dev/null
diff --git a/gfx/cards/mrmime.8x6.png b/gfx/cards/mrmime.8x6.png
new file mode 100755
index 0000000..5e11e84
--- /dev/null
+++ b/gfx/cards/mrmime.8x6.png
diff --git a/gfx/cards/muk.2bpp b/gfx/cards/muk.2bpp
deleted file mode 100644
index c3cb73c..0000000
--- a/gfx/cards/muk.2bpp
+++ /dev/null
diff --git a/gfx/cards/muk.8x6.png b/gfx/cards/muk.8x6.png
new file mode 100755
index 0000000..c28014f
--- /dev/null
+++ b/gfx/cards/muk.8x6.png
diff --git a/gfx/cards/mysteriousfossil.2bpp b/gfx/cards/mysteriousfossil.2bpp
deleted file mode 100644
index b60b83c..0000000
--- a/gfx/cards/mysteriousfossil.2bpp
+++ /dev/null
diff --git a/gfx/cards/mysteriousfossil.8x6.png b/gfx/cards/mysteriousfossil.8x6.png
new file mode 100755
index 0000000..ccea06c
--- /dev/null
+++ b/gfx/cards/mysteriousfossil.8x6.png
diff --git a/gfx/cards/nidoking.2bpp b/gfx/cards/nidoking.2bpp
deleted file mode 100644
index 854235a..0000000
--- a/gfx/cards/nidoking.2bpp
+++ /dev/null
diff --git a/gfx/cards/nidoking.8x6.png b/gfx/cards/nidoking.8x6.png
new file mode 100755
index 0000000..98f3173
--- /dev/null
+++ b/gfx/cards/nidoking.8x6.png
diff --git a/gfx/cards/nidoqueen.2bpp b/gfx/cards/nidoqueen.2bpp
deleted file mode 100644
index 2680783..0000000
--- a/gfx/cards/nidoqueen.2bpp
+++ /dev/null
diff --git a/gfx/cards/nidoqueen.8x6.png b/gfx/cards/nidoqueen.8x6.png
new file mode 100755
index 0000000..a6d1d65
--- /dev/null
+++ b/gfx/cards/nidoqueen.8x6.png
diff --git a/gfx/cards/nidoranf.2bpp b/gfx/cards/nidoranf.2bpp
deleted file mode 100644
index 851d1f2..0000000
--- a/gfx/cards/nidoranf.2bpp
+++ /dev/null
diff --git a/gfx/cards/nidoranf.8x6.png b/gfx/cards/nidoranf.8x6.png
new file mode 100755
index 0000000..574f4f0
--- /dev/null
+++ b/gfx/cards/nidoranf.8x6.png
diff --git a/gfx/cards/nidoranm.2bpp b/gfx/cards/nidoranm.2bpp
deleted file mode 100644
index d0c05bb..0000000
--- a/gfx/cards/nidoranm.2bpp
+++ /dev/null
diff --git a/gfx/cards/nidoranm.8x6.png b/gfx/cards/nidoranm.8x6.png
new file mode 100755
index 0000000..9110b37
--- /dev/null
+++ b/gfx/cards/nidoranm.8x6.png
diff --git a/gfx/cards/nidorina.2bpp b/gfx/cards/nidorina.2bpp
deleted file mode 100644
index 267cce8..0000000
--- a/gfx/cards/nidorina.2bpp
+++ /dev/null
diff --git a/gfx/cards/nidorina.8x6.png b/gfx/cards/nidorina.8x6.png
new file mode 100755
index 0000000..3d0714e
--- /dev/null
+++ b/gfx/cards/nidorina.8x6.png
diff --git a/gfx/cards/nidorino.2bpp b/gfx/cards/nidorino.2bpp
deleted file mode 100644
index d0f1b43..0000000
--- a/gfx/cards/nidorino.2bpp
+++ /dev/null
diff --git a/gfx/cards/nidorino.8x6.png b/gfx/cards/nidorino.8x6.png
new file mode 100755
index 0000000..4dfb141
--- /dev/null
+++ b/gfx/cards/nidorino.8x6.png
diff --git a/gfx/cards/ninetails1.2bpp b/gfx/cards/ninetails1.2bpp
deleted file mode 100644
index 400ad69..0000000
--- a/gfx/cards/ninetails1.2bpp
+++ /dev/null
diff --git a/gfx/cards/ninetails1.8x6.png b/gfx/cards/ninetails1.8x6.png
new file mode 100755
index 0000000..3f78c25
--- /dev/null
+++ b/gfx/cards/ninetails1.8x6.png
diff --git a/gfx/cards/ninetails2.2bpp b/gfx/cards/ninetails2.2bpp
deleted file mode 100644
index b679fd2..0000000
--- a/gfx/cards/ninetails2.2bpp
+++ /dev/null
diff --git a/gfx/cards/ninetails2.8x6.png b/gfx/cards/ninetails2.8x6.png
new file mode 100755
index 0000000..c56ffb1
--- /dev/null
+++ b/gfx/cards/ninetails2.8x6.png
diff --git a/gfx/cards/oddish.2bpp b/gfx/cards/oddish.2bpp
deleted file mode 100644
index 20a4e16..0000000
--- a/gfx/cards/oddish.2bpp
+++ /dev/null
diff --git a/gfx/cards/oddish.8x6.png b/gfx/cards/oddish.8x6.png
new file mode 100755
index 0000000..d768061
--- /dev/null
+++ b/gfx/cards/oddish.8x6.png
diff --git a/gfx/cards/omanyte.2bpp b/gfx/cards/omanyte.2bpp
deleted file mode 100644
index 0b5c1fb..0000000
--- a/gfx/cards/omanyte.2bpp
+++ /dev/null
diff --git a/gfx/cards/omanyte.8x6.png b/gfx/cards/omanyte.8x6.png
new file mode 100755
index 0000000..0cac65f
--- /dev/null
+++ b/gfx/cards/omanyte.8x6.png
diff --git a/gfx/cards/omastar.2bpp b/gfx/cards/omastar.2bpp
deleted file mode 100644
index 84d5b1b..0000000
--- a/gfx/cards/omastar.2bpp
+++ /dev/null
diff --git a/gfx/cards/omastar.8x6.png b/gfx/cards/omastar.8x6.png
new file mode 100755
index 0000000..c0aa1d4
--- /dev/null
+++ b/gfx/cards/omastar.8x6.png
diff --git a/gfx/cards/onix.2bpp b/gfx/cards/onix.2bpp
deleted file mode 100644
index 00db6c6..0000000
--- a/gfx/cards/onix.2bpp
+++ /dev/null
diff --git a/gfx/cards/onix.8x6.png b/gfx/cards/onix.8x6.png
new file mode 100755
index 0000000..9ca9ced
--- /dev/null
+++ b/gfx/cards/onix.8x6.png
diff --git a/gfx/cards/paras.2bpp b/gfx/cards/paras.2bpp
deleted file mode 100644
index 67586d4..0000000
--- a/gfx/cards/paras.2bpp
+++ /dev/null
diff --git a/gfx/cards/paras.8x6.png b/gfx/cards/paras.8x6.png
new file mode 100755
index 0000000..f865de2
--- /dev/null
+++ b/gfx/cards/paras.8x6.png
diff --git a/gfx/cards/parasect.2bpp b/gfx/cards/parasect.2bpp
deleted file mode 100644
index 3a72461..0000000
--- a/gfx/cards/parasect.2bpp
+++ /dev/null
diff --git a/gfx/cards/parasect.8x6.png b/gfx/cards/parasect.8x6.png
new file mode 100755
index 0000000..e03ff8f
--- /dev/null
+++ b/gfx/cards/parasect.8x6.png
diff --git a/gfx/cards/persian.2bpp b/gfx/cards/persian.2bpp
deleted file mode 100644
index 0213abd..0000000
--- a/gfx/cards/persian.2bpp
+++ /dev/null
diff --git a/gfx/cards/persian.8x6.png b/gfx/cards/persian.8x6.png
new file mode 100755
index 0000000..0a488d5
--- /dev/null
+++ b/gfx/cards/persian.8x6.png
diff --git a/gfx/cards/pidgeot1.2bpp b/gfx/cards/pidgeot1.2bpp
deleted file mode 100644
index 4e9f212..0000000
--- a/gfx/cards/pidgeot1.2bpp
+++ /dev/null
diff --git a/gfx/cards/pidgeot1.8x6.png b/gfx/cards/pidgeot1.8x6.png
new file mode 100755
index 0000000..c06a7e6
--- /dev/null
+++ b/gfx/cards/pidgeot1.8x6.png
diff --git a/gfx/cards/pidgeot2.2bpp b/gfx/cards/pidgeot2.2bpp
deleted file mode 100644
index e328ee9..0000000
--- a/gfx/cards/pidgeot2.2bpp
+++ /dev/null
diff --git a/gfx/cards/pidgeot2.8x6.png b/gfx/cards/pidgeot2.8x6.png
new file mode 100755
index 0000000..393acea
--- /dev/null
+++ b/gfx/cards/pidgeot2.8x6.png
diff --git a/gfx/cards/pidgeotto.2bpp b/gfx/cards/pidgeotto.2bpp
deleted file mode 100644
index 95ee847..0000000
--- a/gfx/cards/pidgeotto.2bpp
+++ /dev/null
diff --git a/gfx/cards/pidgeotto.8x6.png b/gfx/cards/pidgeotto.8x6.png
new file mode 100755
index 0000000..2adb1bd
--- /dev/null
+++ b/gfx/cards/pidgeotto.8x6.png
diff --git a/gfx/cards/pidgey.2bpp b/gfx/cards/pidgey.2bpp
deleted file mode 100644
index 472defe..0000000
--- a/gfx/cards/pidgey.2bpp
+++ /dev/null
diff --git a/gfx/cards/pidgey.8x6.png b/gfx/cards/pidgey.8x6.png
new file mode 100755
index 0000000..b13d57b
--- /dev/null
+++ b/gfx/cards/pidgey.8x6.png
diff --git a/gfx/cards/pikachu1.2bpp b/gfx/cards/pikachu1.2bpp
deleted file mode 100644
index a3df74c..0000000
--- a/gfx/cards/pikachu1.2bpp
+++ /dev/null
diff --git a/gfx/cards/pikachu1.8x6.png b/gfx/cards/pikachu1.8x6.png
new file mode 100755
index 0000000..9c40f3b
--- /dev/null
+++ b/gfx/cards/pikachu1.8x6.png
diff --git a/gfx/cards/pikachu2.2bpp b/gfx/cards/pikachu2.2bpp
deleted file mode 100644
index 2c3f360..0000000
--- a/gfx/cards/pikachu2.2bpp
+++ /dev/null
diff --git a/gfx/cards/pikachu2.8x6.png b/gfx/cards/pikachu2.8x6.png
new file mode 100755
index 0000000..532caa6
--- /dev/null
+++ b/gfx/cards/pikachu2.8x6.png
diff --git a/gfx/cards/pikachu3.2bpp b/gfx/cards/pikachu3.2bpp
deleted file mode 100644
index 8d4df6a..0000000
--- a/gfx/cards/pikachu3.2bpp
+++ /dev/null
diff --git a/gfx/cards/pikachu3.8x6.png b/gfx/cards/pikachu3.8x6.png
new file mode 100755
index 0000000..506cc14
--- /dev/null
+++ b/gfx/cards/pikachu3.8x6.png
diff --git a/gfx/cards/pikachu4.2bpp b/gfx/cards/pikachu4.2bpp
deleted file mode 100644
index c791cc1..0000000
--- a/gfx/cards/pikachu4.2bpp
+++ /dev/null
diff --git a/gfx/cards/pikachu4.8x6.png b/gfx/cards/pikachu4.8x6.png
new file mode 100755
index 0000000..67d0a59
--- /dev/null
+++ b/gfx/cards/pikachu4.8x6.png
diff --git a/gfx/cards/pinsir.2bpp b/gfx/cards/pinsir.2bpp
deleted file mode 100644
index f60275d..0000000
--- a/gfx/cards/pinsir.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-�����ߋ������ߏ������������������������׎���������������������������������������������������������������w�?�~�������T���ս�����I�l��7��{��T���������}}5=|~��}��������w������_����“�����������?���zz͆ƃ��a�Yͻ���-�١m�6{]���-��}��.7we���M������m���{�w�Ӂ�
ޏ����E��������77��������9��j*;�_������������T8&���Q>0O?�]Q��y����?��?D}�o��˽�Z�?�������??k�������������
,-��/'���n��>a!�7�[�v�g�9f&�!�p��_��\oȺ}u��w��w��M�8�Ϟ��㕕��}u���������������������U�������??u�#c����U�;;!qR�*~��SS,,�+�[������p��=��"no�w��K��<l����8�9�;�RR���������������)���T���������������^�����

�ܿ�wUfv��+�[��y+�{���_��/?�ߋ���z���_�o����ۋ������7?��������������qq��ߏ�������yy==w����o}k��u�ߏ���E�/�?�������M������_���������������������_���
\ No newline at end of file
diff --git a/gfx/cards/pinsir.8x6.png b/gfx/cards/pinsir.8x6.png
new file mode 100755
index 0000000..f6276e6
--- /dev/null
+++ b/gfx/cards/pinsir.8x6.png
diff --git a/gfx/cards/pluspower.2bpp b/gfx/cards/pluspower.2bpp
deleted file mode 100644
index 9611b20..0000000
--- a/gfx/cards/pluspower.2bpp
+++ /dev/null
diff --git a/gfx/cards/pluspower.8x6.png b/gfx/cards/pluspower.8x6.png
new file mode 100755
index 0000000..27914ec
--- /dev/null
+++ b/gfx/cards/pluspower.8x6.png
diff --git a/gfx/cards/pokeball.2bpp b/gfx/cards/pokeball.2bpp
deleted file mode 100644
index 56ba597..0000000
--- a/gfx/cards/pokeball.2bpp
+++ /dev/null
diff --git a/gfx/cards/pokeball.8x6.png b/gfx/cards/pokeball.8x6.png
new file mode 100755
index 0000000..e2ec376
--- /dev/null
+++ b/gfx/cards/pokeball.8x6.png
diff --git a/gfx/cards/pokedex.2bpp b/gfx/cards/pokedex.2bpp
deleted file mode 100644
index 601ef03..0000000
--- a/gfx/cards/pokedex.2bpp
+++ /dev/null
diff --git a/gfx/cards/pokedex.8x6.png b/gfx/cards/pokedex.8x6.png
new file mode 100755
index 0000000..37ec12d
--- /dev/null
+++ b/gfx/cards/pokedex.8x6.png
diff --git a/gfx/cards/pokemonbreeder.2bpp b/gfx/cards/pokemonbreeder.2bpp
deleted file mode 100644
index e845385..0000000
--- a/gfx/cards/pokemonbreeder.2bpp
+++ /dev/null
diff --git a/gfx/cards/pokemonbreeder.8x6.png b/gfx/cards/pokemonbreeder.8x6.png
new file mode 100755
index 0000000..640f844
--- /dev/null
+++ b/gfx/cards/pokemonbreeder.8x6.png
diff --git a/gfx/cards/pokemoncenter.2bpp b/gfx/cards/pokemoncenter.2bpp
deleted file mode 100644
index 3992f5e..0000000
--- a/gfx/cards/pokemoncenter.2bpp
+++ /dev/null
diff --git a/gfx/cards/pokemoncenter.8x6.png b/gfx/cards/pokemoncenter.8x6.png
new file mode 100755
index 0000000..3af1345
--- /dev/null
+++ b/gfx/cards/pokemoncenter.8x6.png
diff --git a/gfx/cards/pokemonflute.2bpp b/gfx/cards/pokemonflute.2bpp
deleted file mode 100644
index 2cf69e8..0000000
--- a/gfx/cards/pokemonflute.2bpp
+++ /dev/null
diff --git a/gfx/cards/pokemonflute.8x6.png b/gfx/cards/pokemonflute.8x6.png
new file mode 100755
index 0000000..5a881ce
--- /dev/null
+++ b/gfx/cards/pokemonflute.8x6.png
diff --git a/gfx/cards/pokemontrader.2bpp b/gfx/cards/pokemontrader.2bpp
deleted file mode 100644
index a86e9ed..0000000
--- a/gfx/cards/pokemontrader.2bpp
+++ /dev/null
diff --git a/gfx/cards/pokemontrader.8x6.png b/gfx/cards/pokemontrader.8x6.png
new file mode 100755
index 0000000..ed87e40
--- /dev/null
+++ b/gfx/cards/pokemontrader.8x6.png
diff --git a/gfx/cards/poliwag.2bpp b/gfx/cards/poliwag.2bpp
deleted file mode 100644
index b9c0698..0000000
--- a/gfx/cards/poliwag.2bpp
+++ /dev/null
diff --git a/gfx/cards/poliwag.8x6.png b/gfx/cards/poliwag.8x6.png
new file mode 100755
index 0000000..ccb98fe
--- /dev/null
+++ b/gfx/cards/poliwag.8x6.png
diff --git a/gfx/cards/poliwhirl.2bpp b/gfx/cards/poliwhirl.2bpp
deleted file mode 100644
index 5ce5857..0000000
--- a/gfx/cards/poliwhirl.2bpp
+++ /dev/null
diff --git a/gfx/cards/poliwhirl.8x6.png b/gfx/cards/poliwhirl.8x6.png
new file mode 100755
index 0000000..50bc6ab
--- /dev/null
+++ b/gfx/cards/poliwhirl.8x6.png
diff --git a/gfx/cards/poliwrath.2bpp b/gfx/cards/poliwrath.2bpp
deleted file mode 100644
index bca5b69..0000000
--- a/gfx/cards/poliwrath.2bpp
+++ /dev/null
diff --git a/gfx/cards/poliwrath.8x6.png b/gfx/cards/poliwrath.8x6.png
new file mode 100755
index 0000000..0920089
--- /dev/null
+++ b/gfx/cards/poliwrath.8x6.png
diff --git a/gfx/cards/ponyta.2bpp b/gfx/cards/ponyta.2bpp
deleted file mode 100644
index 1b3fbfd..0000000
--- a/gfx/cards/ponyta.2bpp
+++ /dev/null
diff --git a/gfx/cards/ponyta.8x6.png b/gfx/cards/ponyta.8x6.png
new file mode 100755
index 0000000..104746a
--- /dev/null
+++ b/gfx/cards/ponyta.8x6.png
diff --git a/gfx/cards/porygon.2bpp b/gfx/cards/porygon.2bpp
deleted file mode 100644
index a5abebe..0000000
--- a/gfx/cards/porygon.2bpp
+++ /dev/null
diff --git a/gfx/cards/porygon.8x6.png b/gfx/cards/porygon.8x6.png
new file mode 100755
index 0000000..c4986e2
--- /dev/null
+++ b/gfx/cards/porygon.8x6.png
diff --git a/gfx/cards/potion.2bpp b/gfx/cards/potion.2bpp
deleted file mode 100644
index 8bc78ef..0000000
--- a/gfx/cards/potion.2bpp
+++ /dev/null
diff --git a/gfx/cards/potion.8x6.png b/gfx/cards/potion.8x6.png
new file mode 100755
index 0000000..f31f3c7
--- /dev/null
+++ b/gfx/cards/potion.8x6.png
diff --git a/gfx/cards/primeape.2bpp b/gfx/cards/primeape.2bpp
deleted file mode 100644
index 57932cc..0000000
--- a/gfx/cards/primeape.2bpp
+++ /dev/null
diff --git a/gfx/cards/primeape.8x6.png b/gfx/cards/primeape.8x6.png
new file mode 100755
index 0000000..897b2e3
--- /dev/null
+++ b/gfx/cards/primeape.8x6.png
diff --git a/gfx/cards/professoroak.2bpp b/gfx/cards/professoroak.2bpp
deleted file mode 100644
index beace4e..0000000
--- a/gfx/cards/professoroak.2bpp
+++ /dev/null
diff --git a/gfx/cards/professoroak.8x6.png b/gfx/cards/professoroak.8x6.png
new file mode 100755
index 0000000..44ec3d7
--- /dev/null
+++ b/gfx/cards/professoroak.8x6.png
diff --git a/gfx/cards/psychicenergy.2bpp b/gfx/cards/psychicenergy.2bpp
deleted file mode 100644
index 07638b7..0000000
--- a/gfx/cards/psychicenergy.2bpp
+++ /dev/null
diff --git a/gfx/cards/psychicenergy.8x6.png b/gfx/cards/psychicenergy.8x6.png
new file mode 100755
index 0000000..03a1356
--- /dev/null
+++ b/gfx/cards/psychicenergy.8x6.png
diff --git a/gfx/cards/psyduck.2bpp b/gfx/cards/psyduck.2bpp
deleted file mode 100644
index 21b7411..0000000
--- a/gfx/cards/psyduck.2bpp
+++ /dev/null
diff --git a/gfx/cards/psyduck.8x6.png b/gfx/cards/psyduck.8x6.png
new file mode 100755
index 0000000..abc2acd
--- /dev/null
+++ b/gfx/cards/psyduck.8x6.png
diff --git a/gfx/cards/raichu1.2bpp b/gfx/cards/raichu1.2bpp
deleted file mode 100644
index 5e5e060..0000000
--- a/gfx/cards/raichu1.2bpp
+++ /dev/null
diff --git a/gfx/cards/raichu1.8x6.png b/gfx/cards/raichu1.8x6.png
new file mode 100755
index 0000000..9ae1dbe
--- /dev/null
+++ b/gfx/cards/raichu1.8x6.png
diff --git a/gfx/cards/raichu2.2bpp b/gfx/cards/raichu2.2bpp
deleted file mode 100644
index 8c09d31..0000000
--- a/gfx/cards/raichu2.2bpp
+++ /dev/null
diff --git a/gfx/cards/raichu2.8x6.png b/gfx/cards/raichu2.8x6.png
new file mode 100755
index 0000000..4a2c2a8
--- /dev/null
+++ b/gfx/cards/raichu2.8x6.png
diff --git a/gfx/cards/rapidash.2bpp b/gfx/cards/rapidash.2bpp
deleted file mode 100644
index 4d9915e..0000000
--- a/gfx/cards/rapidash.2bpp
+++ /dev/null
diff --git a/gfx/cards/rapidash.8x6.png b/gfx/cards/rapidash.8x6.png
new file mode 100755
index 0000000..028e37b
--- /dev/null
+++ b/gfx/cards/rapidash.8x6.png
diff --git a/gfx/cards/raticate.2bpp b/gfx/cards/raticate.2bpp
deleted file mode 100644
index cc0d705..0000000
--- a/gfx/cards/raticate.2bpp
+++ /dev/null
diff --git a/gfx/cards/raticate.8x6.png b/gfx/cards/raticate.8x6.png
new file mode 100755
index 0000000..6370fd8
--- /dev/null
+++ b/gfx/cards/raticate.8x6.png
diff --git a/gfx/cards/rattata.2bpp b/gfx/cards/rattata.2bpp
deleted file mode 100644
index 7c642cd..0000000
--- a/gfx/cards/rattata.2bpp
+++ /dev/null
diff --git a/gfx/cards/rattata.8x6.png b/gfx/cards/rattata.8x6.png
new file mode 100755
index 0000000..005e4c9
--- /dev/null
+++ b/gfx/cards/rattata.8x6.png
diff --git a/gfx/cards/recycle.2bpp b/gfx/cards/recycle.2bpp
deleted file mode 100644
index ef4e84d..0000000
--- a/gfx/cards/recycle.2bpp
+++ /dev/null
diff --git a/gfx/cards/recycle.8x6.png b/gfx/cards/recycle.8x6.png
new file mode 100755
index 0000000..7417ce4
--- /dev/null
+++ b/gfx/cards/recycle.8x6.png
diff --git a/gfx/cards/revive.2bpp b/gfx/cards/revive.2bpp
deleted file mode 100644
index a6ddac7..0000000
--- a/gfx/cards/revive.2bpp
+++ /dev/null
diff --git a/gfx/cards/revive.8x6.png b/gfx/cards/revive.8x6.png
new file mode 100755
index 0000000..df658d1
--- /dev/null
+++ b/gfx/cards/revive.8x6.png
diff --git a/gfx/cards/rhydon.2bpp b/gfx/cards/rhydon.2bpp
deleted file mode 100644
index f81815b..0000000
--- a/gfx/cards/rhydon.2bpp
+++ /dev/null
diff --git a/gfx/cards/rhydon.8x6.png b/gfx/cards/rhydon.8x6.png
new file mode 100755
index 0000000..46c82b1
--- /dev/null
+++ b/gfx/cards/rhydon.8x6.png
diff --git a/gfx/cards/rhyhorn.2bpp b/gfx/cards/rhyhorn.2bpp
deleted file mode 100644
index d09c577..0000000
--- a/gfx/cards/rhyhorn.2bpp
+++ /dev/null
diff --git a/gfx/cards/rhyhorn.8x6.png b/gfx/cards/rhyhorn.8x6.png
new file mode 100755
index 0000000..a689083
--- /dev/null
+++ b/gfx/cards/rhyhorn.8x6.png
diff --git a/gfx/cards/sandshrew.2bpp b/gfx/cards/sandshrew.2bpp
deleted file mode 100644
index 602a1c5..0000000
--- a/gfx/cards/sandshrew.2bpp
+++ /dev/null
diff --git a/gfx/cards/sandshrew.8x6.png b/gfx/cards/sandshrew.8x6.png
new file mode 100755
index 0000000..84b89c2
--- /dev/null
+++ b/gfx/cards/sandshrew.8x6.png
diff --git a/gfx/cards/sandslash.2bpp b/gfx/cards/sandslash.2bpp
deleted file mode 100644
index 8b53788..0000000
--- a/gfx/cards/sandslash.2bpp
+++ /dev/null
diff --git a/gfx/cards/sandslash.8x6.png b/gfx/cards/sandslash.8x6.png
new file mode 100755
index 0000000..867d4bd
--- /dev/null
+++ b/gfx/cards/sandslash.8x6.png
diff --git a/gfx/cards/scoopup.2bpp b/gfx/cards/scoopup.2bpp
deleted file mode 100644
index bed655c..0000000
--- a/gfx/cards/scoopup.2bpp
+++ /dev/null
diff --git a/gfx/cards/scoopup.8x6.png b/gfx/cards/scoopup.8x6.png
new file mode 100755
index 0000000..a6a76fd
--- /dev/null
+++ b/gfx/cards/scoopup.8x6.png
diff --git a/gfx/cards/scyther.2bpp b/gfx/cards/scyther.2bpp
deleted file mode 100644
index 9a15030..0000000
--- a/gfx/cards/scyther.2bpp
+++ /dev/null
@@ -1 +0,0 @@
-������������������������������������������������������������������������������������������������#�v����������������������������������������������o˯�*�n����������������|�������������������_?�_��U���U������������������ζ�Zf�ܭ$]H���O����t|v~�������������ۭ�[k\|������;?������������E�@�������t�ͽ������k���o&}��?�o�V�i~��9�w�����ӷdc�'6/����|�����omS��܋����������������M��<�uU��D�I����ڶ,���������W���h�_������K��F�~�������h��f$Z[]]�^��0>yyvv������������������T���]������_zT��sM�79���a���z��s��ϧ�[��T_�������e��W7�{���wWj{E}��)h��Tu�u��tw������U���ߏw�������uw���7��'/�o�ߛ�ow��������������ur}�������������x�������������?�����w�������������������U���w�ۍu߯�����]����������U��7w߿�����u��W������7���o�e�ۏw߫���E���������
\ No newline at end of file
diff --git a/gfx/cards/scyther.8x6.png b/gfx/cards/scyther.8x6.png
new file mode 100755
index 0000000..d1452f9
--- /dev/null
+++ b/gfx/cards/scyther.8x6.png
diff --git a/gfx/cards/seadra.2bpp b/gfx/cards/seadra.2bpp
deleted file mode 100644
index 9550ce6..0000000
--- a/gfx/cards/seadra.2bpp
+++ /dev/null
diff --git a/gfx/cards/seadra.8x6.png b/gfx/cards/seadra.8x6.png
new file mode 100755
index 0000000..cb62622
--- /dev/null
+++ b/gfx/cards/seadra.8x6.png
diff --git a/gfx/cards/seaking.2bpp b/gfx/cards/seaking.2bpp
deleted file mode 100644
index 3da377b..0000000
--- a/gfx/cards/seaking.2bpp
+++ /dev/null
diff --git a/gfx/cards/seaking.8x6.png b/gfx/cards/seaking.8x6.png
new file mode 100755
index 0000000..c271ee9
--- /dev/null
+++ b/gfx/cards/seaking.8x6.png
diff --git a/gfx/cards/seel.2bpp b/gfx/cards/seel.2bpp
deleted file mode 100644
index 5603497..0000000
--- a/gfx/cards/seel.2bpp
+++ /dev/null
diff --git a/gfx/cards/seel.8x6.png b/gfx/cards/seel.8x6.png
new file mode 100755
index 0000000..4f5d2e6
--- /dev/null
+++ b/gfx/cards/seel.8x6.png
diff --git a/gfx/cards/shellder.2bpp b/gfx/cards/shellder.2bpp
deleted file mode 100644
index 276ddf3..0000000
--- a/gfx/cards/shellder.2bpp
+++ /dev/null
diff --git a/gfx/cards/shellder.8x6.png b/gfx/cards/shellder.8x6.png
new file mode 100755
index 0000000..5bb0c73
--- /dev/null
+++ b/gfx/cards/shellder.8x6.png
diff --git a/gfx/cards/slowbro.2bpp b/gfx/cards/slowbro.2bpp
deleted file mode 100644
index 3269816..0000000
--- a/gfx/cards/slowbro.2bpp
+++ /dev/null
diff --git a/gfx/cards/slowbro.8x6.png b/gfx/cards/slowbro.8x6.png
new file mode 100755
index 0000000..4d719c7
--- /dev/null
+++ b/gfx/cards/slowbro.8x6.png
diff --git a/gfx/cards/slowpoke1.2bpp b/gfx/cards/slowpoke1.2bpp
deleted file mode 100644
index 3c421cc..0000000
--- a/gfx/cards/slowpoke1.2bpp
+++ /dev/null
diff --git a/gfx/cards/slowpoke1.8x6.png b/gfx/cards/slowpoke1.8x6.png
new file mode 100755
index 0000000..cfda0ec
--- /dev/null
+++ b/gfx/cards/slowpoke1.8x6.png
diff --git a/gfx/cards/slowpoke2.2bpp b/gfx/cards/slowpoke2.2bpp
deleted file mode 100644
index 1805a89..0000000
--- a/gfx/cards/slowpoke2.2bpp
+++ /dev/null
diff --git a/gfx/cards/slowpoke2.8x6.png b/gfx/cards/slowpoke2.8x6.png
new file mode 100755
index 0000000..469749a
--- /dev/null
+++ b/gfx/cards/slowpoke2.8x6.png
diff --git a/gfx/cards/snorlax.2bpp b/gfx/cards/snorlax.2bpp
deleted file mode 100644
index fe21b9b..0000000
--- a/gfx/cards/snorlax.2bpp
+++ /dev/null
diff --git a/gfx/cards/snorlax.8x6.png b/gfx/cards/snorlax.8x6.png
new file mode 100755
index 0000000..7b56b21
--- /dev/null
+++ b/gfx/cards/snorlax.8x6.png
diff --git a/gfx/cards/spearow.2bpp b/gfx/cards/spearow.2bpp
deleted file mode 100644
index 436621a..0000000
--- a/gfx/cards/spearow.2bpp
+++ /dev/null
diff --git a/gfx/cards/spearow.8x6.png b/gfx/cards/spearow.8x6.png
new file mode 100755
index 0000000..7325237
--- /dev/null
+++ b/gfx/cards/spearow.8x6.png
diff --git a/gfx/cards/squirtle.2bpp b/gfx/cards/squirtle.2bpp
deleted file mode 100644
index 943c964..0000000
--- a/gfx/cards/squirtle.2bpp
+++ /dev/null
diff --git a/gfx/cards/squirtle.8x6.png b/gfx/cards/squirtle.8x6.png
new file mode 100755
index 0000000..0ae6e8c
--- /dev/null
+++ b/gfx/cards/squirtle.8x6.png
diff --git a/gfx/cards/starmie.2bpp b/gfx/cards/starmie.2bpp
deleted file mode 100644
index 11fdf80..0000000
--- a/gfx/cards/starmie.2bpp
+++ /dev/null
diff --git a/gfx/cards/starmie.8x6.png b/gfx/cards/starmie.8x6.png
new file mode 100755
index 0000000..f7cddf6
--- /dev/null
+++ b/gfx/cards/starmie.8x6.png
diff --git a/gfx/cards/staryu.2bpp b/gfx/cards/staryu.2bpp
deleted file mode 100644
index 478e4f1..0000000
--- a/gfx/cards/staryu.2bpp
+++ /dev/null
diff --git a/gfx/cards/staryu.8x6.png b/gfx/cards/staryu.8x6.png
new file mode 100755
index 0000000..ddbedeb
--- /dev/null
+++ b/gfx/cards/staryu.8x6.png
diff --git a/gfx/cards/superenergyremoval.2bpp b/gfx/cards/superenergyremoval.2bpp
deleted file mode 100644
index f95a51a..0000000
--- a/gfx/cards/superenergyremoval.2bpp
+++ /dev/null
diff --git a/gfx/cards/superenergyremoval.8x6.png b/gfx/cards/superenergyremoval.8x6.png
new file mode 100755
index 0000000..1321085
--- /dev/null
+++ b/gfx/cards/superenergyremoval.8x6.png
diff --git a/gfx/cards/superenergyretrieval.2bpp b/gfx/cards/superenergyretrieval.2bpp
deleted file mode 100644
index 18cd837..0000000
--- a/gfx/cards/superenergyretrieval.2bpp
+++ /dev/null
diff --git a/gfx/cards/superenergyretrieval.8x6.png b/gfx/cards/superenergyretrieval.8x6.png
new file mode 100755
index 0000000..712a11a
--- /dev/null
+++ b/gfx/cards/superenergyretrieval.8x6.png
diff --git a/gfx/cards/superpotion.2bpp b/gfx/cards/superpotion.2bpp
deleted file mode 100644
index d7c460e..0000000
--- a/gfx/cards/superpotion.2bpp
+++ /dev/null
diff --git a/gfx/cards/superpotion.8x6.png b/gfx/cards/superpotion.8x6.png
new file mode 100755
index 0000000..d828a45
--- /dev/null
+++ b/gfx/cards/superpotion.8x6.png
diff --git a/gfx/cards/surfingpikachu1.2bpp b/gfx/cards/surfingpikachu1.2bpp
deleted file mode 100644
index 7d76b20..0000000
--- a/gfx/cards/surfingpikachu1.2bpp
+++ /dev/null
diff --git a/gfx/cards/surfingpikachu1.8x6.png b/gfx/cards/surfingpikachu1.8x6.png
new file mode 100755
index 0000000..fa4e471
--- /dev/null
+++ b/gfx/cards/surfingpikachu1.8x6.png
diff --git a/gfx/cards/surfingpikachu2.2bpp b/gfx/cards/surfingpikachu2.2bpp
deleted file mode 100644
index 42595f4..0000000
--- a/gfx/cards/surfingpikachu2.2bpp
+++ /dev/null
diff --git a/gfx/cards/surfingpikachu2.8x6.png b/gfx/cards/surfingpikachu2.8x6.png
new file mode 100755
index 0000000..d31f6ea
--- /dev/null
+++ b/gfx/cards/surfingpikachu2.8x6.png
diff --git a/gfx/cards/switch.2bpp b/gfx/cards/switch.2bpp
deleted file mode 100644
index 9b0c24e..0000000
--- a/gfx/cards/switch.2bpp
+++ /dev/null
diff --git a/gfx/cards/switch.8x6.png b/gfx/cards/switch.8x6.png
new file mode 100755
index 0000000..f3591a7
--- /dev/null
+++ b/gfx/cards/switch.8x6.png
diff --git a/gfx/cards/tangela1.2bpp b/gfx/cards/tangela1.2bpp
deleted file mode 100644
index 4193c33..0000000
--- a/gfx/cards/tangela1.2bpp
+++ /dev/null
diff --git a/gfx/cards/tangela1.8x6.png b/gfx/cards/tangela1.8x6.png
new file mode 100755
index 0000000..847a59b
--- /dev/null
+++ b/gfx/cards/tangela1.8x6.png
diff --git a/gfx/cards/tangela2.2bpp b/gfx/cards/tangela2.2bpp
deleted file mode 100644
index 099acb7..0000000
--- a/gfx/cards/tangela2.2bpp
+++ /dev/null
diff --git a/gfx/cards/tangela2.8x6.png b/gfx/cards/tangela2.8x6.png
new file mode 100755
index 0000000..3eeecf9
--- /dev/null
+++ b/gfx/cards/tangela2.8x6.png
diff --git a/gfx/cards/tauros.2bpp b/gfx/cards/tauros.2bpp
deleted file mode 100644
index d6c1ae4..0000000
--- a/gfx/cards/tauros.2bpp
+++ /dev/null
diff --git a/gfx/cards/tauros.8x6.png b/gfx/cards/tauros.8x6.png
new file mode 100755
index 0000000..2b93e77
--- /dev/null
+++ b/gfx/cards/tauros.8x6.png
diff --git a/gfx/cards/tentacool.2bpp b/gfx/cards/tentacool.2bpp
deleted file mode 100644
index 62a2ab0..0000000
--- a/gfx/cards/tentacool.2bpp
+++ /dev/null
diff --git a/gfx/cards/tentacool.8x6.png b/gfx/cards/tentacool.8x6.png
new file mode 100755
index 0000000..bf0ad4c
--- /dev/null
+++ b/gfx/cards/tentacool.8x6.png
diff --git a/gfx/cards/tentacruel.2bpp b/gfx/cards/tentacruel.2bpp
deleted file mode 100644
index b637dd0..0000000
--- a/gfx/cards/tentacruel.2bpp
+++ /dev/null
diff --git a/gfx/cards/tentacruel.8x6.png b/gfx/cards/tentacruel.8x6.png
new file mode 100755
index 0000000..aeb54bc
--- /dev/null
+++ b/gfx/cards/tentacruel.8x6.png
diff --git a/gfx/cards/vaporeon1.2bpp b/gfx/cards/vaporeon1.2bpp
deleted file mode 100644
index 4c3939d..0000000
--- a/gfx/cards/vaporeon1.2bpp
+++ /dev/null
diff --git a/gfx/cards/vaporeon1.8x6.png b/gfx/cards/vaporeon1.8x6.png
new file mode 100755
index 0000000..234911f
--- /dev/null
+++ b/gfx/cards/vaporeon1.8x6.png
diff --git a/gfx/cards/vaporeon2.2bpp b/gfx/cards/vaporeon2.2bpp
deleted file mode 100644
index 1eca8e8..0000000
--- a/gfx/cards/vaporeon2.2bpp
+++ /dev/null
diff --git a/gfx/cards/vaporeon2.8x6.png b/gfx/cards/vaporeon2.8x6.png
new file mode 100755
index 0000000..33a7370
--- /dev/null
+++ b/gfx/cards/vaporeon2.8x6.png
diff --git a/gfx/cards/venomoth.2bpp b/gfx/cards/venomoth.2bpp
deleted file mode 100644
index ec801f4..0000000
--- a/gfx/cards/venomoth.2bpp
+++ /dev/null
diff --git a/gfx/cards/venomoth.8x6.png b/gfx/cards/venomoth.8x6.png
new file mode 100755
index 0000000..b261fe8
--- /dev/null
+++ b/gfx/cards/venomoth.8x6.png
diff --git a/gfx/cards/venonat.2bpp b/gfx/cards/venonat.2bpp
deleted file mode 100644
index 47511ef..0000000
--- a/gfx/cards/venonat.2bpp
+++ /dev/null
diff --git a/gfx/cards/venonat.8x6.png b/gfx/cards/venonat.8x6.png
new file mode 100755
index 0000000..62ecbf8
--- /dev/null
+++ b/gfx/cards/venonat.8x6.png
diff --git a/gfx/cards/venusaur1.2bpp b/gfx/cards/venusaur1.2bpp
deleted file mode 100644
index 86adb92..0000000
--- a/gfx/cards/venusaur1.2bpp
+++ /dev/null
diff --git a/gfx/cards/venusaur1.8x6.png b/gfx/cards/venusaur1.8x6.png
new file mode 100755
index 0000000..d4f1b10
--- /dev/null
+++ b/gfx/cards/venusaur1.8x6.png
diff --git a/gfx/cards/venusaur2.2bpp b/gfx/cards/venusaur2.2bpp
deleted file mode 100644
index 9a804f1..0000000
--- a/gfx/cards/venusaur2.2bpp
+++ /dev/null
diff --git a/gfx/cards/venusaur2.8x6.png b/gfx/cards/venusaur2.8x6.png
new file mode 100755
index 0000000..98f8291
--- /dev/null
+++ b/gfx/cards/venusaur2.8x6.png
diff --git a/gfx/cards/victreebel.2bpp b/gfx/cards/victreebel.2bpp
deleted file mode 100644
index 404f87a..0000000
--- a/gfx/cards/victreebel.2bpp
+++ /dev/null
diff --git a/gfx/cards/victreebel.8x6.png b/gfx/cards/victreebel.8x6.png
new file mode 100755
index 0000000..db05501
--- /dev/null
+++ b/gfx/cards/victreebel.8x6.png
diff --git a/gfx/cards/vileplume.2bpp b/gfx/cards/vileplume.2bpp
deleted file mode 100644
index aa1e3b2..0000000
--- a/gfx/cards/vileplume.2bpp
+++ /dev/null
@@ -1,3 +0,0 @@
-���������ƪ�������������������������������������������������������������������������������������j�P���U�����t���������S�g����O����W�������������������y���x����\?���������������W����������u��@���@�������??�����N܌���������������J������ג^m���������\�$�~~??��_�����������t�*�

��oG�'�����������E���A�����������??%�Dp��Aр��Ѐ�@U@j�����앝m}�����������������U������������_�����5�
-����R�)�S��������������?��//_�~���������������������������w�U�����?���8���������A!���s������������
-���g��������Cc��������z����??����������������r�����A����r���o�7�����{�{������������*/EǪ�����������j�������������_���߫�����������������A���
�����U�����U�u����K��ߍ������������������+��ǫ�����?��������Y���������}���W���
\ No newline at end of file
diff --git a/gfx/cards/vileplume.8x6.png b/gfx/cards/vileplume.8x6.png
new file mode 100755
index 0000000..eb6b37b
--- /dev/null
+++ b/gfx/cards/vileplume.8x6.png
diff --git a/gfx/cards/voltorb.2bpp b/gfx/cards/voltorb.2bpp
deleted file mode 100644
index 1ee1b86..0000000
--- a/gfx/cards/voltorb.2bpp
+++ /dev/null
diff --git a/gfx/cards/voltorb.8x6.png b/gfx/cards/voltorb.8x6.png
new file mode 100755
index 0000000..188df1e
--- /dev/null
+++ b/gfx/cards/voltorb.8x6.png
diff --git a/gfx/cards/vulpix.2bpp b/gfx/cards/vulpix.2bpp
deleted file mode 100644
index f305c5c..0000000
--- a/gfx/cards/vulpix.2bpp
+++ /dev/null
diff --git a/gfx/cards/vulpix.8x6.png b/gfx/cards/vulpix.8x6.png
new file mode 100755
index 0000000..8f52a9a
--- /dev/null
+++ b/gfx/cards/vulpix.8x6.png
diff --git a/gfx/cards/wartortle.2bpp b/gfx/cards/wartortle.2bpp
deleted file mode 100644
index ac65bbc..0000000
--- a/gfx/cards/wartortle.2bpp
+++ /dev/null
diff --git a/gfx/cards/wartortle.8x6.png b/gfx/cards/wartortle.8x6.png
new file mode 100755
index 0000000..6f6750d
--- /dev/null
+++ b/gfx/cards/wartortle.8x6.png
diff --git a/gfx/cards/waterenergy.2bpp b/gfx/cards/waterenergy.2bpp
deleted file mode 100644
index 5558ac4..0000000
--- a/gfx/cards/waterenergy.2bpp
+++ /dev/null
diff --git a/gfx/cards/waterenergy.8x6.png b/gfx/cards/waterenergy.8x6.png
new file mode 100755
index 0000000..e66c760
--- /dev/null
+++ b/gfx/cards/waterenergy.8x6.png
diff --git a/gfx/cards/weedle.2bpp b/gfx/cards/weedle.2bpp
deleted file mode 100644
index 303dbc9..0000000
--- a/gfx/cards/weedle.2bpp
+++ /dev/null
diff --git a/gfx/cards/weedle.8x6.png b/gfx/cards/weedle.8x6.png
new file mode 100755
index 0000000..96cae00
--- /dev/null
+++ b/gfx/cards/weedle.8x6.png
diff --git a/gfx/cards/weepinbell.2bpp b/gfx/cards/weepinbell.2bpp
deleted file mode 100644
index fbe271d..0000000
--- a/gfx/cards/weepinbell.2bpp
+++ /dev/null
diff --git a/gfx/cards/weepinbell.8x6.png b/gfx/cards/weepinbell.8x6.png
new file mode 100755
index 0000000..5de2dcc
--- /dev/null
+++ b/gfx/cards/weepinbell.8x6.png
diff --git a/gfx/cards/weezing.2bpp b/gfx/cards/weezing.2bpp
deleted file mode 100644
index 1f455d2..0000000
--- a/gfx/cards/weezing.2bpp
+++ /dev/null
diff --git a/gfx/cards/weezing.8x6.png b/gfx/cards/weezing.8x6.png
new file mode 100755
index 0000000..d939d62
--- /dev/null
+++ b/gfx/cards/weezing.8x6.png
diff --git a/gfx/cards/wigglytuff.2bpp b/gfx/cards/wigglytuff.2bpp
deleted file mode 100644
index cb91651..0000000
--- a/gfx/cards/wigglytuff.2bpp
+++ /dev/null
diff --git a/gfx/cards/wigglytuff.8x6.png b/gfx/cards/wigglytuff.8x6.png
new file mode 100755
index 0000000..e3ad474
--- /dev/null
+++ b/gfx/cards/wigglytuff.8x6.png
diff --git a/gfx/cards/zapdos1.2bpp b/gfx/cards/zapdos1.2bpp
deleted file mode 100644
index 59e2a1b..0000000
--- a/gfx/cards/zapdos1.2bpp
+++ /dev/null
diff --git a/gfx/cards/zapdos1.8x6.png b/gfx/cards/zapdos1.8x6.png
new file mode 100755
index 0000000..f49a336
--- /dev/null
+++ b/gfx/cards/zapdos1.8x6.png
diff --git a/gfx/cards/zapdos2.2bpp b/gfx/cards/zapdos2.2bpp
deleted file mode 100644
index 5fa7bbe..0000000
--- a/gfx/cards/zapdos2.2bpp
+++ /dev/null
diff --git a/gfx/cards/zapdos2.8x6.png b/gfx/cards/zapdos2.8x6.png
new file mode 100755
index 0000000..382b8b9
--- /dev/null
+++ b/gfx/cards/zapdos2.8x6.png
diff --git a/gfx/cards/zapdos3.2bpp b/gfx/cards/zapdos3.2bpp
deleted file mode 100644
index b6a2755..0000000
--- a/gfx/cards/zapdos3.2bpp
+++ /dev/null
diff --git a/gfx/cards/zapdos3.8x6.png b/gfx/cards/zapdos3.8x6.png
new file mode 100755
index 0000000..95a2f33
--- /dev/null
+++ b/gfx/cards/zapdos3.8x6.png
diff --git a/gfx/cards/zubat.2bpp b/gfx/cards/zubat.2bpp
deleted file mode 100644
index 4a6fcd6..0000000
--- a/gfx/cards/zubat.2bpp
+++ /dev/null
diff --git a/gfx/cards/zubat.8x6.png b/gfx/cards/zubat.8x6.png
new file mode 100755
index 0000000..153c0c6
--- /dev/null
+++ b/gfx/cards/zubat.8x6.png
diff --git a/gfx/duel.2bpp b/gfx/duel.2bpp
deleted file mode 100755
index b30f51b..0000000
--- a/gfx/duel.2bpp
+++ /dev/null
diff --git a/gfx/duel.png b/gfx/duel.png
new file mode 100755
index 0000000..9e1b00f
--- /dev/null
+++ b/gfx/duel.png
diff --git a/gfx/ow/sprite0.2bpp b/gfx/ow/sprite0.2bpp
deleted file mode 100644
index 126f20c..0000000
--- a/gfx/ow/sprite0.2bpp
+++ /dev/null
diff --git a/gfx/ow/sprite0.png b/gfx/ow/sprite0.png
new file mode 100755
index 0000000..0eceeb6
--- /dev/null
+++ b/gfx/ow/sprite0.png
diff --git a/gfx/ow/sprite1.2bpp b/gfx/ow/sprite1.2bpp
deleted file mode 100644
index ad7ede9..0000000
--- a/gfx/ow/sprite1.2bpp
+++ /dev/null
diff --git a/gfx/ow/sprite1.png b/gfx/ow/sprite1.png
new file mode 100755
index 0000000..b3fa35f
--- /dev/null
+++ b/gfx/ow/sprite1.png
diff --git a/gfx/ow/sprite10.2bpp b/gfx/ow/sprite10.2bpp
deleted file mode 100644
index 3452933..0000000
--- a/gfx/ow/sprite10.2bpp
+++ /dev/null
diff --git a/gfx/ow/sprite10.png b/gfx/ow/sprite10.png
new file mode 100755
index 0000000..e63ba2b
--- /dev/null
+++ b/gfx/ow/sprite10.png
diff --git a/gfx/ow/sprite11.2bpp b/gfx/ow/sprite11.2bpp
deleted file mode 100644
index b29d326..0000000
--- a/gfx/ow/sprite11.2bpp
+++ /dev/null
diff --git a/gfx/ow/sprite11.png b/gfx/ow/sprite11.png
new file mode 100755
index 0000000..4a231fe
--- /dev/null
+++ b/gfx/ow/sprite11.png
diff --git a/gfx/ow/sprite12.2bpp b/gfx/ow/sprite12.2bpp
deleted file mode 100644
index 4d29201..0000000
--- a/gfx/ow/sprite12.2bpp
+++ /dev/null
diff --git a/gfx/ow/sprite12.png b/gfx/ow/sprite12.png
new file mode 100755
index 0000000..b24cd69
--- /dev/null
+++ b/gfx/ow/sprite12.png
diff --git a/gfx/ow/sprite13.2bpp b/gfx/ow/sprite13.2bpp
deleted file mode 100644
index 4c5dbd5..0000000
--- a/gfx/ow/sprite13.2bpp
+++ /dev/null
diff --git a/gfx/ow/sprite13.png b/gfx/ow/sprite13.png
new file mode 100755
index 0000000..d55c62c
--- /dev/null
+++ b/gfx/ow/sprite13.png
diff --git a/gfx/ow/sprite14.2bpp b/gfx/ow/sprite14.2bpp
deleted file mode 100644
index 6c93a30..0000000
--- a/gfx/ow/sprite14.2bpp
+++ /dev/null
diff --git a/gfx/ow/sprite14.png b/gfx/ow/sprite14.png
new file mode 100755
index 0000000..0026093
--- /dev/null
+++ b/gfx/ow/sprite14.png
diff --git a/gfx/ow/sprite15.2bpp b/gfx/ow/sprite15.2bpp
deleted file mode 100644
index 2520b19..0000000
--- a/gfx/ow/sprite15.2bpp
+++ /dev/null
diff --git a/gfx/ow/sprite15.png b/gfx/ow/sprite15.png
new file mode 100755
index 0000000..67a227d
--- /dev/null
+++ b/gfx/ow/sprite15.png
diff --git a/gfx/ow/sprite16.2bpp b/gfx/ow/sprite16.2bpp
deleted file mode 100644
index 9d35564..0000000
--- a/gfx/ow/sprite16.2bpp
+++ /dev/null
diff --git a/gfx/ow/sprite16.png b/gfx/ow/sprite16.png
new file mode 100755
index 0000000..0baa4eb
--- /dev/null
+++ b/gfx/ow/sprite16.png
diff --git a/gfx/ow/sprite17.2bpp b/gfx/ow/sprite17.2bpp
deleted file mode 100644
index f975b56..0000000
--- a/gfx/ow/sprite17.2bpp
+++ /dev/null
diff --git a/gfx/ow/sprite17.png b/gfx/ow/sprite17.png
new file mode 100755
index 0000000..2f696e6
--- /dev/null
+++ b/gfx/ow/sprite17.png
diff --git a/gfx/ow/sprite18.2bpp b/gfx/ow/sprite18.2bpp
deleted file mode 100644
index b0e7f45..0000000
--- a/gfx/ow/sprite18.2bpp
+++ /dev/null
diff --git a/gfx/ow/sprite18.png b/gfx/ow/sprite18.png
new file mode 100755
index 0000000..97281b6
--- /dev/null
+++ b/gfx/ow/sprite18.png
diff --git a/gfx/ow/sprite19.2bpp b/gfx/ow/sprite19.2bpp
deleted file mode 100644
index 51e9805..0000000
--- a/gfx/ow/sprite19.2bpp
+++ /dev/null
diff --git a/gfx/ow/sprite19.png b/gfx/ow/sprite19.png
new file mode 100755
index 0000000..437a376
--- /dev/null
+++ b/gfx/ow/sprite19.png
diff --git a/gfx/ow/sprite2.2bpp b/gfx/ow/sprite2.2bpp
deleted file mode 100644
index b39e65b..0000000
--- a/gfx/ow/sprite2.2bpp
+++ /dev/null
diff --git a/gfx/ow/sprite2.png b/gfx/ow/sprite2.png
new file mode 100755
index 0000000..0bda3be
--- /dev/null
+++ b/gfx/ow/sprite2.png
diff --git a/gfx/ow/sprite20.2bpp b/gfx/ow/sprite20.2bpp
deleted file mode 100644
index dca427e..0000000
--- a/gfx/ow/sprite20.2bpp
+++ /dev/null
diff --git a/gfx/ow/sprite20.png b/gfx/ow/sprite20.png
new file mode 100755
index 0000000..3da8ad9
--- /dev/null
+++ b/gfx/ow/sprite20.png
diff --git a/gfx/ow/sprite21.2bpp b/gfx/ow/sprite21.2bpp
deleted file mode 100644
index 5789d03..0000000
--- a/gfx/ow/sprite21.2bpp
+++ /dev/null
diff --git a/gfx/ow/sprite21.png b/gfx/ow/sprite21.png
new file mode 100755
index 0000000..7d07d78
--- /dev/null
+++ b/gfx/ow/sprite21.png
diff --git a/gfx/ow/sprite22.2bpp b/gfx/ow/sprite22.2bpp
deleted file mode 100644
index 55231d8..0000000
--- a/gfx/ow/sprite22.2bpp
+++ /dev/null
diff --git a/gfx/ow/sprite22.png b/gfx/ow/sprite22.png
new file mode 100755
index 0000000..2d47555
--- /dev/null
+++ b/gfx/ow/sprite22.png
diff --git a/gfx/ow/sprite23.2bpp b/gfx/ow/sprite23.2bpp
deleted file mode 100644
index 0a85b85..0000000
--- a/gfx/ow/sprite23.2bpp
+++ /dev/null
diff --git a/gfx/ow/sprite23.png b/gfx/ow/sprite23.png
new file mode 100755
index 0000000..8432c39
--- /dev/null
+++ b/gfx/ow/sprite23.png
diff --git a/gfx/ow/sprite24.2bpp b/gfx/ow/sprite24.2bpp
deleted file mode 100644
index 3e36baf..0000000
--- a/gfx/ow/sprite24.2bpp
+++ /dev/null
diff --git a/gfx/ow/sprite24.png b/gfx/ow/sprite24.png
new file mode 100755
index 0000000..0d7b908
--- /dev/null
+++ b/gfx/ow/sprite24.png
diff --git a/gfx/ow/sprite25.2bpp b/gfx/ow/sprite25.2bpp
deleted file mode 100644
index 72f5b1a..0000000
--- a/gfx/ow/sprite25.2bpp
+++ /dev/null
diff --git a/gfx/ow/sprite25.png b/gfx/ow/sprite25.png
new file mode 100755
index 0000000..1e161da
--- /dev/null
+++ b/gfx/ow/sprite25.png
diff --git a/gfx/ow/sprite26.2bpp b/gfx/ow/sprite26.2bpp
deleted file mode 100644
index b5ee98c..0000000
--- a/gfx/ow/sprite26.2bpp
+++ /dev/null
diff --git a/gfx/ow/sprite26.png b/gfx/ow/sprite26.png
new file mode 100755
index 0000000..6a5f4cd
--- /dev/null
+++ b/gfx/ow/sprite26.png
diff --git a/gfx/ow/sprite27.2bpp b/gfx/ow/sprite27.2bpp
deleted file mode 100644
index a6eb1eb..0000000
--- a/gfx/ow/sprite27.2bpp
+++ /dev/null
diff --git a/gfx/ow/sprite27.png b/gfx/ow/sprite27.png
new file mode 100755
index 0000000..7b738e4
--- /dev/null
+++ b/gfx/ow/sprite27.png
diff --git a/gfx/ow/sprite28.2bpp b/gfx/ow/sprite28.2bpp
deleted file mode 100644
index a3f7103..0000000
--- a/gfx/ow/sprite28.2bpp
+++ /dev/null
diff --git a/gfx/ow/sprite28.png b/gfx/ow/sprite28.png
new file mode 100755
index 0000000..0ba9e64
--- /dev/null
+++ b/gfx/ow/sprite28.png
diff --git a/gfx/ow/sprite29.2bpp b/gfx/ow/sprite29.2bpp
deleted file mode 100644
index d7b84b9..0000000
--- a/gfx/ow/sprite29.2bpp
+++ /dev/null
diff --git a/gfx/ow/sprite29.png b/gfx/ow/sprite29.png
new file mode 100755
index 0000000..5926395
--- /dev/null
+++ b/gfx/ow/sprite29.png
diff --git a/gfx/ow/sprite3.2bpp b/gfx/ow/sprite3.2bpp
deleted file mode 100644
index 4e8b4bc..0000000
--- a/gfx/ow/sprite3.2bpp
+++ /dev/null
diff --git a/gfx/ow/sprite3.png b/gfx/ow/sprite3.png
new file mode 100755
index 0000000..2fac558
--- /dev/null
+++ b/gfx/ow/sprite3.png
diff --git a/gfx/ow/sprite30.2bpp b/gfx/ow/sprite30.2bpp
deleted file mode 100644
index 6920ecd..0000000
--- a/gfx/ow/sprite30.2bpp
+++ /dev/null
diff --git a/gfx/ow/sprite30.png b/gfx/ow/sprite30.png
new file mode 100755
index 0000000..ef25140
--- /dev/null
+++ b/gfx/ow/sprite30.png
diff --git a/gfx/ow/sprite31.2bpp b/gfx/ow/sprite31.2bpp
deleted file mode 100644
index 61744d1..0000000
--- a/gfx/ow/sprite31.2bpp
+++ /dev/null
diff --git a/gfx/ow/sprite31.png b/gfx/ow/sprite31.png
new file mode 100755
index 0000000..1494e05
--- /dev/null
+++ b/gfx/ow/sprite31.png
diff --git a/gfx/ow/sprite32.2bpp b/gfx/ow/sprite32.2bpp
deleted file mode 100644
index 1671e7d..0000000
--- a/gfx/ow/sprite32.2bpp
+++ /dev/null
diff --git a/gfx/ow/sprite32.png b/gfx/ow/sprite32.png
new file mode 100755
index 0000000..7d3fac1
--- /dev/null
+++ b/gfx/ow/sprite32.png
diff --git a/gfx/ow/sprite4.2bpp b/gfx/ow/sprite4.2bpp
deleted file mode 100644
index 223a58c..0000000
--- a/gfx/ow/sprite4.2bpp
+++ /dev/null
diff --git a/gfx/ow/sprite4.png b/gfx/ow/sprite4.png
new file mode 100755
index 0000000..a12569b
--- /dev/null
+++ b/gfx/ow/sprite4.png
diff --git a/gfx/ow/sprite5.2bpp b/gfx/ow/sprite5.2bpp
deleted file mode 100644
index a427eaf..0000000
--- a/gfx/ow/sprite5.2bpp
+++ /dev/null
diff --git a/gfx/ow/sprite5.png b/gfx/ow/sprite5.png
new file mode 100755
index 0000000..d46c9bb
--- /dev/null
+++ b/gfx/ow/sprite5.png
diff --git a/gfx/ow/sprite6.2bpp b/gfx/ow/sprite6.2bpp
deleted file mode 100644
index 4fc5982..0000000
--- a/gfx/ow/sprite6.2bpp
+++ /dev/null
diff --git a/gfx/ow/sprite6.png b/gfx/ow/sprite6.png
new file mode 100755
index 0000000..2423fd1
--- /dev/null
+++ b/gfx/ow/sprite6.png
diff --git a/gfx/ow/sprite7.2bpp b/gfx/ow/sprite7.2bpp
deleted file mode 100644
index 12cfb88..0000000
--- a/gfx/ow/sprite7.2bpp
+++ /dev/null
diff --git a/gfx/ow/sprite7.png b/gfx/ow/sprite7.png
new file mode 100755
index 0000000..c7f1d29
--- /dev/null
+++ b/gfx/ow/sprite7.png
diff --git a/gfx/ow/sprite8.2bpp b/gfx/ow/sprite8.2bpp
deleted file mode 100644
index e96f55b..0000000
--- a/gfx/ow/sprite8.2bpp
+++ /dev/null
diff --git a/gfx/ow/sprite8.png b/gfx/ow/sprite8.png
new file mode 100755
index 0000000..2527ae9
--- /dev/null
+++ b/gfx/ow/sprite8.png
diff --git a/gfx/ow/sprite9.2bpp b/gfx/ow/sprite9.2bpp
deleted file mode 100644
index ed09bd4..0000000
--- a/gfx/ow/sprite9.2bpp
+++ /dev/null
diff --git a/gfx/ow/sprite9.png b/gfx/ow/sprite9.png
new file mode 100755
index 0000000..69c5451
--- /dev/null
+++ b/gfx/ow/sprite9.png
diff --git a/gfx/trainers/aaron.2bpp b/gfx/trainers/aaron.2bpp
deleted file mode 100644
index 80741f2..0000000
--- a/gfx/trainers/aaron.2bpp
+++ /dev/null
diff --git a/gfx/trainers/aaron.png b/gfx/trainers/aaron.png
new file mode 100755
index 0000000..bbd8bbc
--- /dev/null
+++ b/gfx/trainers/aaron.png
diff --git a/gfx/trainers/adam.2bpp b/gfx/trainers/adam.2bpp
deleted file mode 100644
index 976f23f..0000000
--- a/gfx/trainers/adam.2bpp
+++ /dev/null
diff --git a/gfx/trainers/adam.png b/gfx/trainers/adam.png
new file mode 100755
index 0000000..859bc86
--- /dev/null
+++ b/gfx/trainers/adam.png
diff --git a/gfx/trainers/amanda.2bpp b/gfx/trainers/amanda.2bpp
deleted file mode 100644
index 34f2527..0000000
--- a/gfx/trainers/amanda.2bpp
+++ /dev/null
diff --git a/gfx/trainers/amanda.png b/gfx/trainers/amanda.png
new file mode 100755
index 0000000..be16167
--- /dev/null
+++ b/gfx/trainers/amanda.png
diff --git a/gfx/trainers/amy.2bpp b/gfx/trainers/amy.2bpp
deleted file mode 100644
index 2f3972e..0000000
--- a/gfx/trainers/amy.2bpp
+++ /dev/null
diff --git a/gfx/trainers/amy.png b/gfx/trainers/amy.png
new file mode 100755
index 0000000..0ca501d
--- /dev/null
+++ b/gfx/trainers/amy.png
diff --git a/gfx/trainers/andrew.2bpp b/gfx/trainers/andrew.2bpp
deleted file mode 100644
index 7795f8c..0000000
--- a/gfx/trainers/andrew.2bpp
+++ /dev/null
diff --git a/gfx/trainers/andrew.png b/gfx/trainers/andrew.png
new file mode 100755
index 0000000..45508af
--- /dev/null
+++ b/gfx/trainers/andrew.png
diff --git a/gfx/trainers/brandon.2bpp b/gfx/trainers/brandon.2bpp
deleted file mode 100644
index b60d6c8..0000000
--- a/gfx/trainers/brandon.2bpp
+++ /dev/null
diff --git a/gfx/trainers/brandon.png b/gfx/trainers/brandon.png
new file mode 100755
index 0000000..32b1934
--- /dev/null
+++ b/gfx/trainers/brandon.png
diff --git a/gfx/trainers/brittany.2bpp b/gfx/trainers/brittany.2bpp
deleted file mode 100644
index 68cec45..0000000
--- a/gfx/trainers/brittany.2bpp
+++ /dev/null
diff --git a/gfx/trainers/brittany.png b/gfx/trainers/brittany.png
new file mode 100755
index 0000000..4e5e2a0
--- /dev/null
+++ b/gfx/trainers/brittany.png
diff --git a/gfx/trainers/chris.2bpp b/gfx/trainers/chris.2bpp
deleted file mode 100644
index 8a82ea8..0000000
--- a/gfx/trainers/chris.2bpp
+++ /dev/null
diff --git a/gfx/trainers/chris.png b/gfx/trainers/chris.png
new file mode 100755
index 0000000..c645e12
--- /dev/null
+++ b/gfx/trainers/chris.png
diff --git a/gfx/trainers/courtney.2bpp b/gfx/trainers/courtney.2bpp
deleted file mode 100644
index 25d34c5..0000000
--- a/gfx/trainers/courtney.2bpp
+++ /dev/null
diff --git a/gfx/trainers/courtney.png b/gfx/trainers/courtney.png
new file mode 100755
index 0000000..fff4a8a
--- /dev/null
+++ b/gfx/trainers/courtney.png
diff --git a/gfx/trainers/daniel.2bpp b/gfx/trainers/daniel.2bpp
deleted file mode 100644
index 15b86d0..0000000
--- a/gfx/trainers/daniel.2bpp
+++ /dev/null
diff --git a/gfx/trainers/daniel.png b/gfx/trainers/daniel.png
new file mode 100755
index 0000000..f3a36ac
--- /dev/null
+++ b/gfx/trainers/daniel.png
diff --git a/gfx/trainers/david.2bpp b/gfx/trainers/david.2bpp
deleted file mode 100644
index 33303c0..0000000
--- a/gfx/trainers/david.2bpp
+++ /dev/null
diff --git a/gfx/trainers/david.png b/gfx/trainers/david.png
new file mode 100755
index 0000000..f1de43e
--- /dev/null
+++ b/gfx/trainers/david.png
diff --git a/gfx/trainers/erik.2bpp b/gfx/trainers/erik.2bpp
deleted file mode 100644
index 50b3269..0000000
--- a/gfx/trainers/erik.2bpp
+++ /dev/null
diff --git a/gfx/trainers/erik.png b/gfx/trainers/erik.png
new file mode 100755
index 0000000..287b615
--- /dev/null
+++ b/gfx/trainers/erik.png
diff --git a/gfx/trainers/gene.2bpp b/gfx/trainers/gene.2bpp
deleted file mode 100644
index c0199b9..0000000
--- a/gfx/trainers/gene.2bpp
+++ /dev/null
diff --git a/gfx/trainers/gene.png b/gfx/trainers/gene.png
new file mode 100755
index 0000000..ee368c1
--- /dev/null
+++ b/gfx/trainers/gene.png
diff --git a/gfx/trainers/heather.2bpp b/gfx/trainers/heather.2bpp
deleted file mode 100644
index 321166b..0000000
--- a/gfx/trainers/heather.2bpp
+++ /dev/null
diff --git a/gfx/trainers/heather.png b/gfx/trainers/heather.png
new file mode 100755
index 0000000..69baa70
--- /dev/null
+++ b/gfx/trainers/heather.png
diff --git a/gfx/trainers/imakuni.2bpp b/gfx/trainers/imakuni.2bpp
deleted file mode 100644
index b4255c7..0000000
--- a/gfx/trainers/imakuni.2bpp
+++ /dev/null
diff --git a/gfx/trainers/imakuni.png b/gfx/trainers/imakuni.png
new file mode 100755
index 0000000..1c6e8a7
--- /dev/null
+++ b/gfx/trainers/imakuni.png
diff --git a/gfx/trainers/isaac.2bpp b/gfx/trainers/isaac.2bpp
deleted file mode 100644
index 2a6d1fc..0000000
--- a/gfx/trainers/isaac.2bpp
+++ /dev/null
diff --git a/gfx/trainers/isaac.png b/gfx/trainers/isaac.png
new file mode 100755
index 0000000..2aab212
--- /dev/null
+++ b/gfx/trainers/isaac.png
diff --git a/gfx/trainers/jack.2bpp b/gfx/trainers/jack.2bpp
deleted file mode 100644
index bd52841..0000000
--- a/gfx/trainers/jack.2bpp
+++ /dev/null
diff --git a/gfx/trainers/jack.png b/gfx/trainers/jack.png
new file mode 100755
index 0000000..e8c3799
--- /dev/null
+++ b/gfx/trainers/jack.png
diff --git a/gfx/trainers/jennifer.2bpp b/gfx/trainers/jennifer.2bpp
deleted file mode 100644
index 2f4fb2e..0000000
--- a/gfx/trainers/jennifer.2bpp
+++ /dev/null
diff --git a/gfx/trainers/jennifer.png b/gfx/trainers/jennifer.png
new file mode 100755
index 0000000..c218186
--- /dev/null
+++ b/gfx/trainers/jennifer.png
diff --git a/gfx/trainers/jessica.2bpp b/gfx/trainers/jessica.2bpp
deleted file mode 100644
index bfd3193..0000000
--- a/gfx/trainers/jessica.2bpp
+++ /dev/null
diff --git a/gfx/trainers/jessica.png b/gfx/trainers/jessica.png
new file mode 100755
index 0000000..0460d52
--- /dev/null
+++ b/gfx/trainers/jessica.png
diff --git a/gfx/trainers/john.2bpp b/gfx/trainers/john.2bpp
deleted file mode 100644
index 1bb03a2..0000000
--- a/gfx/trainers/john.2bpp
+++ /dev/null
diff --git a/gfx/trainers/john.png b/gfx/trainers/john.png
new file mode 100755
index 0000000..51ea430
--- /dev/null
+++ b/gfx/trainers/john.png
diff --git a/gfx/trainers/jonathan.2bpp b/gfx/trainers/jonathan.2bpp
deleted file mode 100644
index 1962e38..0000000
--- a/gfx/trainers/jonathan.2bpp
+++ /dev/null
diff --git a/gfx/trainers/jonathan.png b/gfx/trainers/jonathan.png
new file mode 100755
index 0000000..40d6593
--- /dev/null
+++ b/gfx/trainers/jonathan.png
diff --git a/gfx/trainers/joseph.2bpp b/gfx/trainers/joseph.2bpp
deleted file mode 100644
index 1cdf6a3..0000000
--- a/gfx/trainers/joseph.2bpp
+++ /dev/null
diff --git a/gfx/trainers/joseph.png b/gfx/trainers/joseph.png
new file mode 100755
index 0000000..6ca588f
--- /dev/null
+++ b/gfx/trainers/joseph.png
diff --git a/gfx/trainers/joshua.2bpp b/gfx/trainers/joshua.2bpp
deleted file mode 100644
index 171dade..0000000
--- a/gfx/trainers/joshua.2bpp
+++ /dev/null
diff --git a/gfx/trainers/joshua.png b/gfx/trainers/joshua.png
new file mode 100755
index 0000000..5dd8b7f
--- /dev/null
+++ b/gfx/trainers/joshua.png
diff --git a/gfx/trainers/ken.2bpp b/gfx/trainers/ken.2bpp
deleted file mode 100644
index eaf5c48..0000000
--- a/gfx/trainers/ken.2bpp
+++ /dev/null
diff --git a/gfx/trainers/ken.png b/gfx/trainers/ken.png
new file mode 100755
index 0000000..4da8ca2
--- /dev/null
+++ b/gfx/trainers/ken.png
diff --git a/gfx/trainers/kristin.2bpp b/gfx/trainers/kristin.2bpp
deleted file mode 100644
index e7d2f2f..0000000
--- a/gfx/trainers/kristin.2bpp
+++ /dev/null
diff --git a/gfx/trainers/kristin.png b/gfx/trainers/kristin.png
new file mode 100755
index 0000000..d265ae3
--- /dev/null
+++ b/gfx/trainers/kristin.png
diff --git a/gfx/trainers/matthew.2bpp b/gfx/trainers/matthew.2bpp
deleted file mode 100644
index 1c44eec..0000000
--- a/gfx/trainers/matthew.2bpp
+++ /dev/null
diff --git a/gfx/trainers/matthew.png b/gfx/trainers/matthew.png
new file mode 100755
index 0000000..bd828e6
--- /dev/null
+++ b/gfx/trainers/matthew.png
diff --git a/gfx/trainers/michael.2bpp b/gfx/trainers/michael.2bpp
deleted file mode 100644
index 9d3b4c4..0000000
--- a/gfx/trainers/michael.2bpp
+++ /dev/null
diff --git a/gfx/trainers/michael.png b/gfx/trainers/michael.png
new file mode 100755
index 0000000..454cdc3
--- /dev/null
+++ b/gfx/trainers/michael.png
diff --git a/gfx/trainers/mitch.2bpp b/gfx/trainers/mitch.2bpp
deleted file mode 100644
index 78f18ed..0000000
--- a/gfx/trainers/mitch.2bpp
+++ /dev/null
diff --git a/gfx/trainers/mitch.png b/gfx/trainers/mitch.png
new file mode 100755
index 0000000..38c58fe
--- /dev/null
+++ b/gfx/trainers/mitch.png
diff --git a/gfx/trainers/murray.2bpp b/gfx/trainers/murray.2bpp
deleted file mode 100644
index aa1cdca..0000000
--- a/gfx/trainers/murray.2bpp
+++ /dev/null
diff --git a/gfx/trainers/murray.png b/gfx/trainers/murray.png
new file mode 100755
index 0000000..32bd818
--- /dev/null
+++ b/gfx/trainers/murray.png
diff --git a/gfx/trainers/nicholas.2bpp b/gfx/trainers/nicholas.2bpp
deleted file mode 100644
index 0acf946..0000000
--- a/gfx/trainers/nicholas.2bpp
+++ /dev/null
diff --git a/gfx/trainers/nicholas.png b/gfx/trainers/nicholas.png
new file mode 100755
index 0000000..81f5b53
--- /dev/null
+++ b/gfx/trainers/nicholas.png
diff --git a/gfx/trainers/nikki.2bpp b/gfx/trainers/nikki.2bpp
deleted file mode 100644
index c261e24..0000000
--- a/gfx/trainers/nikki.2bpp
+++ /dev/null
diff --git a/gfx/trainers/nikki.png b/gfx/trainers/nikki.png
new file mode 100755
index 0000000..2c4e205
--- /dev/null
+++ b/gfx/trainers/nikki.png
diff --git a/gfx/trainers/player.2bpp b/gfx/trainers/player.2bpp
deleted file mode 100755
index 128ae20..0000000
--- a/gfx/trainers/player.2bpp
+++ /dev/null
diff --git a/gfx/trainers/player.png b/gfx/trainers/player.png
new file mode 100755
index 0000000..8b81fbe
--- /dev/null
+++ b/gfx/trainers/player.png
diff --git a/gfx/trainers/rick.2bpp b/gfx/trainers/rick.2bpp
deleted file mode 100644
index a4b6bf8..0000000
--- a/gfx/trainers/rick.2bpp
+++ /dev/null
diff --git a/gfx/trainers/rick.png b/gfx/trainers/rick.png
new file mode 100755
index 0000000..7dcbdc0
--- /dev/null
+++ b/gfx/trainers/rick.png
diff --git a/gfx/trainers/robert.2bpp b/gfx/trainers/robert.2bpp
deleted file mode 100644
index 23429f9..0000000
--- a/gfx/trainers/robert.2bpp
+++ /dev/null
diff --git a/gfx/trainers/robert.png b/gfx/trainers/robert.png
new file mode 100755
index 0000000..2172ae6
--- /dev/null
+++ b/gfx/trainers/robert.png
diff --git a/gfx/trainers/rod.2bpp b/gfx/trainers/rod.2bpp
deleted file mode 100644
index 75c9812..0000000
--- a/gfx/trainers/rod.2bpp
+++ /dev/null
diff --git a/gfx/trainers/rod.png b/gfx/trainers/rod.png
new file mode 100755
index 0000000..4c57dd7
--- /dev/null
+++ b/gfx/trainers/rod.png
diff --git a/gfx/trainers/ronald.2bpp b/gfx/trainers/ronald.2bpp
deleted file mode 100755
index 1d40e08..0000000
--- a/gfx/trainers/ronald.2bpp
+++ /dev/null
diff --git a/gfx/trainers/ronald.png b/gfx/trainers/ronald.png
new file mode 100755
index 0000000..26a1245
--- /dev/null
+++ b/gfx/trainers/ronald.png
diff --git a/gfx/trainers/ryan.2bpp b/gfx/trainers/ryan.2bpp
deleted file mode 100644
index 858c305..0000000
--- a/gfx/trainers/ryan.2bpp
+++ /dev/null
diff --git a/gfx/trainers/ryan.png b/gfx/trainers/ryan.png
new file mode 100755
index 0000000..ab0f84c
--- /dev/null
+++ b/gfx/trainers/ryan.png
diff --git a/gfx/trainers/sam.2bpp b/gfx/trainers/sam.2bpp
deleted file mode 100644
index ad5a106..0000000
--- a/gfx/trainers/sam.2bpp
+++ /dev/null
diff --git a/gfx/trainers/sam.png b/gfx/trainers/sam.png
new file mode 100755
index 0000000..7a52ac3
--- /dev/null
+++ b/gfx/trainers/sam.png
diff --git a/gfx/trainers/sara.2bpp b/gfx/trainers/sara.2bpp
deleted file mode 100644
index e88eaf0..0000000
--- a/gfx/trainers/sara.2bpp
+++ /dev/null
diff --git a/gfx/trainers/sara.png b/gfx/trainers/sara.png
new file mode 100755
index 0000000..f6319bb
--- /dev/null
+++ b/gfx/trainers/sara.png
diff --git a/gfx/trainers/stephanie.2bpp b/gfx/trainers/stephanie.2bpp
deleted file mode 100644
index 4ea3a7b..0000000
--- a/gfx/trainers/stephanie.2bpp
+++ /dev/null
diff --git a/gfx/trainers/stephanie.png b/gfx/trainers/stephanie.png
new file mode 100755
index 0000000..a0a3ff8
--- /dev/null
+++ b/gfx/trainers/stephanie.png
diff --git a/gfx/trainers/steve.2bpp b/gfx/trainers/steve.2bpp
deleted file mode 100644
index 21dc73c..0000000
--- a/gfx/trainers/steve.2bpp
+++ /dev/null
diff --git a/gfx/trainers/steve.png b/gfx/trainers/steve.png
new file mode 100755
index 0000000..216cee0
--- /dev/null
+++ b/gfx/trainers/steve.png
diff --git a/gfx/vwf.1bpp b/gfx/vwf.1bpp
deleted file mode 100755
index 6d54a07..0000000
--- a/gfx/vwf.1bpp
+++ /dev/null
diff --git a/gfx/vwf.png b/gfx/vwf.png
new file mode 100755
index 0000000..81210d9
--- /dev/null
+++ b/gfx/vwf.png