Merge pull request #108 from yenatch/master

png->lz and palettes

1261 files changed, 2081 insertions, 216 deletions

diff --git a/Makefile b/Makefile
index 44d24932f..bb1b14d90 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.SUFFIXES: .asm .tx .o .gbc
+.SUFFIXES: .asm .tx .o .gbc .png .2bpp .lz
 
 TEXTFILES =	text/sweethoney.tx \
 		text/phone/bill.tx \
@@ -7,8 +7,25 @@ TEXTFILES =	text/sweethoney.tx \
 		text/phone/trainers1.tx \
 		main.tx
 
+VERTGFX =	gfx/pics/%.png \
+		gfx/trainers/%.png
+
+HORIZGFX =	$(filter-out gfx/%.png, $(VERTGFX))
+
+
+# uncomment this build target to enable png import:
+
+#all: lzs
+
+# the recompressed graphics may be larger than the originals,
+# so take care to reorganize accordingly
+
 all: pokecrystal.gbc
 
+clean:
+	rm -f main.tx pokecrystal.o pokecrystal.gbc ${TEXTFILES}
+
+
 pokecrystal.o: pokecrystal.asm constants.asm wram.asm ${TEXTFILES}
 	rgbasm -o pokecrystal.o pokecrystal.asm
 	
@@ -20,5 +37,19 @@ pokecrystal.gbc: pokecrystal.o
 	rgbfix -Cjv -i BYTE -k 01 -l 0x33 -m 0x10 -p 0 -r 3 -t PM_CRYSTAL $@
 	cmp baserom.gbc $@
 
-clean:
-	rm -f main.tx pokecrystal.o pokecrystal.gbc ${TEXTFILES}
+
+@lzs: ${VERTGFX} ${HORIZGFX}
+
+@pngs:
+	cd extras; python gfx.py mass-decompress; python gfx.py dump-pngs
+
+
+@front.png: tiles.png
+	cd extras; python gfx.py png-to-lz --front $@ $(OBJECT_DIRECTORY)/tiles.2bpp
+@tiles.png:
+	cd extras; python gfx.py png-to-2bpp $@
+@.png: ${VERTGFX}
+	cd extras; python gfx.py png-to-lz --vert $@
+@.png: ${HORIZGFX}
+	cd extras; python gfx.py png-to-lz $@
+
diff --git a/audio/cry_headers.asm b/audio/cry_headers.asm
new file mode 100644
index 000000000..76ba19bdc
--- /dev/null
+++ b/audio/cry_headers.asm
@@ -0,0 +1,1507 @@
+BulbasaurCryHeader: ; 0xf2787
+	dw $0f  ; cry id
+	db $80  ; pitch
+	db $00  ; echo
+	dw $081 ; length
+
+IvysaurCryHeader: ; 0xf278d
+	dw $0f  ; cry id
+	db $20  ; pitch
+	db $00  ; echo
+	dw $100 ; length
+
+VenusaurCryHeader: ; 0xf2793
+	dw $0f  ; cry id
+	db $00  ; pitch
+	db $00  ; echo
+	dw $140 ; length
+
+CharmanderCryHeader: ; 0xf2799
+	dw $04  ; cry id
+	db $60  ; pitch
+	db $00  ; echo
+	dw $0c0 ; length
+
+CharmeleonCryHeader: ; 0xf279f
+	dw $04  ; cry id
+	db $20  ; pitch
+	db $00  ; echo
+	dw $0c0 ; length
+
+CharizardCryHeader: ; 0xf27a5
+	dw $04  ; cry id
+	db $00  ; pitch
+	db $00  ; echo
+	dw $100 ; length
+
+SquirtleCryHeader: ; 0xf27ab
+	dw $1d  ; cry id
+	db $60  ; pitch
+	db $00  ; echo
+	dw $0c0 ; length
+
+WartortleCryHeader: ; 0xf27b1
+	dw $1d  ; cry id
+	db $20  ; pitch
+	db $00  ; echo
+	dw $0c0 ; length
+
+BlastoiseCryHeader: ; 0xf27b7
+	dw $13  ; cry id
+	db $00  ; pitch
+	db $00  ; echo
+	dw $100 ; length
+
+CaterpieCryHeader: ; 0xf27bd
+	dw $16  ; cry id
+	db $80  ; pitch
+	db $00  ; echo
+	dw $0a0 ; length
+
+MetapodCryHeader: ; 0xf27c3
+	dw $1c  ; cry id
+	db $cc  ; pitch
+	db $00  ; echo
+	dw $081 ; length
+
+ButterfreeCryHeader: ; 0xf27c9
+	dw $16  ; cry id
+	db $77  ; pitch
+	db $00  ; echo
+	dw $0c0 ; length
+
+WeedleCryHeader: ; 0xf27cf
+	dw $15  ; cry id
+	db $ee  ; pitch
+	db $00  ; echo
+	dw $081 ; length
+
+KakunaCryHeader: ; 0xf27d5
+	dw $13  ; cry id
+	db $ff  ; pitch
+	db $00  ; echo
+	dw $081 ; length
+
+BeedrillCryHeader: ; 0xf27db
+	dw $13  ; cry id
+	db $60  ; pitch
+	db $00  ; echo
+	dw $100 ; length
+
+PidgeyCryHeader: ; 0xf27e1
+	dw $0e  ; cry id
+	db $df  ; pitch
+	db $00  ; echo
+	dw $084 ; length
+
+PidgeottoCryHeader: ; 0xf27e7
+	dw $14  ; cry id
+	db $28  ; pitch
+	db $00  ; echo
+	dw $140 ; length
+
+PidgeotCryHeader: ; 0xf27ed
+	dw $14  ; cry id
+	db $11  ; pitch
+	db $00  ; echo
+	dw $17f ; length
+
+RattataCryHeader: ; 0xf27f3
+	dw $22  ; cry id
+	db $00  ; pitch
+	db $00  ; echo
+	dw $100 ; length
+
+RaticateCryHeader: ; 0xf27f9
+	dw $22  ; cry id
+	db $20  ; pitch
+	db $00  ; echo
+	dw $17f ; length
+
+SpearowCryHeader: ; 0xf27ff
+	dw $10  ; cry id
+	db $00  ; pitch
+	db $00  ; echo
+	dw $100 ; length
+
+FearowCryHeader: ; 0xf2805
+	dw $18  ; cry id
+	db $40  ; pitch
+	db $00  ; echo
+	dw $120 ; length
+
+EkansCryHeader: ; 0xf280b
+	dw $17  ; cry id
+	db $12  ; pitch
+	db $00  ; echo
+	dw $0c0 ; length
+
+ArbokCryHeader: ; 0xf2811
+	dw $17  ; cry id
+	db $e0  ; pitch
+	db $00  ; echo
+	dw $090 ; length
+
+PikachuCryHeader: ; 0xf2817
+	dw $0f  ; cry id
+	db $ee  ; pitch
+	db $00  ; echo
+	dw $081 ; length
+
+RaichuCryHeader: ; 0xf281d
+	dw $09  ; cry id
+	db $ee  ; pitch
+	db $00  ; echo
+	dw $088 ; length
+
+SandshrewCryHeader: ; 0xf2823
+	dw $00  ; cry id
+	db $20  ; pitch
+	db $00  ; echo
+	dw $0c0 ; length
+
+SandslashCryHeader: ; 0xf2829
+	dw $00  ; cry id
+	db $ff  ; pitch
+	db $00  ; echo
+	dw $17f ; length
+
+NidoranFCryHeader: ; 0xf282f
+	dw $01  ; cry id
+	db $00  ; pitch
+	db $00  ; echo
+	dw $100 ; length
+
+NidorinaCryHeader: ; 0xf2835
+	dw $01  ; cry id
+	db $2c  ; pitch
+	db $00  ; echo
+	dw $160 ; length
+
+NidoqueenCryHeader: ; 0xf283b
+	dw $0a  ; cry id
+	db $00  ; pitch
+	db $00  ; echo
+	dw $100 ; length
+
+NidoranMCryHeader: ; 0xf2841
+	dw $00  ; cry id
+	db $00  ; pitch
+	db $00  ; echo
+	dw $100 ; length
+
+NidorinoCryHeader: ; 0xf2847
+	dw $00  ; cry id
+	db $2c  ; pitch
+	db $00  ; echo
+	dw $140 ; length
+
+NidokingCryHeader: ; 0xf284d
+	dw $09  ; cry id
+	db $00  ; pitch
+	db $00  ; echo
+	dw $100 ; length
+
+ClefairyCryHeader: ; 0xf2853
+	dw $19  ; cry id
+	db $cc  ; pitch
+	db $00  ; echo
+	dw $081 ; length
+
+ClefableCryHeader: ; 0xf2859
+	dw $19  ; cry id
+	db $aa  ; pitch
+	db $00  ; echo
+	dw $0a0 ; length
+
+VulpixCryHeader: ; 0xf285f
+	dw $24  ; cry id
+	db $4f  ; pitch
+	db $00  ; echo
+	dw $090 ; length
+
+NinetalesCryHeader: ; 0xf2865
+	dw $24  ; cry id
+	db $88  ; pitch
+	db $00  ; echo
+	dw $0e0 ; length
+
+JigglypuffCryHeader: ; 0xf286b
+	dw $0e  ; cry id
+	db $ff  ; pitch
+	db $00  ; echo
+	dw $0b5 ; length
+
+WigglytuffCryHeader: ; 0xf2871
+	dw $0e  ; cry id
+	db $68  ; pitch
+	db $00  ; echo
+	dw $0e0 ; length
+
+ZubatCryHeader: ; 0xf2877
+	dw $1d  ; cry id
+	db $e0  ; pitch
+	db $00  ; echo
+	dw $100 ; length
+
+GolbatCryHeader: ; 0xf287d
+	dw $1d  ; cry id
+	db $fa  ; pitch
+	db $00  ; echo
+	dw $100 ; length
+
+OddishCryHeader: ; 0xf2883
+	dw $08  ; cry id
+	db $dd  ; pitch
+	db $00  ; echo
+	dw $081 ; length
+
+GloomCryHeader: ; 0xf2889
+	dw $08  ; cry id
+	db $aa  ; pitch
+	db $00  ; echo
+	dw $0c0 ; length
+
+VileplumeCryHeader: ; 0xf288f
+	dw $23  ; cry id
+	db $22  ; pitch
+	db $00  ; echo
+	dw $17f ; length
+
+ParasCryHeader: ; 0xf2895
+	dw $1e  ; cry id
+	db $20  ; pitch
+	db $00  ; echo
+	dw $160 ; length
+
+ParasectCryHeader: ; 0xf289b
+	dw $1e  ; cry id
+	db $42  ; pitch
+	db $00  ; echo
+	dw $17f ; length
+
+VenonatCryHeader: ; 0xf28a1
+	dw $1a  ; cry id
+	db $44  ; pitch
+	db $00  ; echo
+	dw $0c0 ; length
+
+VenomothCryHeader: ; 0xf28a7
+	dw $1a  ; cry id
+	db $29  ; pitch
+	db $00  ; echo
+	dw $100 ; length
+
+DiglettCryHeader: ; 0xf28ad
+	dw $0b  ; cry id
+	db $aa  ; pitch
+	db $00  ; echo
+	dw $081 ; length
+
+DugtrioCryHeader: ; 0xf28b3
+	dw $0b  ; cry id
+	db $2a  ; pitch
+	db $00  ; echo
+	dw $090 ; length
+
+MeowthCryHeader: ; 0xf28b9
+	dw $19  ; cry id
+	db $77  ; pitch
+	db $00  ; echo
+	dw $090 ; length
+
+PersianCryHeader: ; 0xf28bf
+	dw $19  ; cry id
+	db $99  ; pitch
+	db $00  ; echo
+	dw $17f ; length
+
+PsyduckCryHeader: ; 0xf28c5
+	dw $21  ; cry id
+	db $20  ; pitch
+	db $00  ; echo
+	dw $0e0 ; length
+
+GolduckCryHeader: ; 0xf28cb
+	dw $21  ; cry id
+	db $ff  ; pitch
+	db $00  ; echo
+	dw $0c0 ; length
+
+MankeyCryHeader: ; 0xf28d1
+	dw $0a  ; cry id
+	db $dd  ; pitch
+	db $00  ; echo
+	dw $0e0 ; length
+
+PrimeapeCryHeader: ; 0xf28d7
+	dw $0a  ; cry id
+	db $af  ; pitch
+	db $00  ; echo
+	dw $0c0 ; length
+
+GrowlitheCryHeader: ; 0xf28dd
+	dw $1f  ; cry id
+	db $20  ; pitch
+	db $00  ; echo
+	dw $0c0 ; length
+
+ArcanineCryHeader: ; 0xf28e3
+	dw $15  ; cry id
+	db $00  ; pitch
+	db $00  ; echo
+	dw $100 ; length
+
+PoliwagCryHeader: ; 0xf28e9
+	dw $0e  ; cry id
+	db $ff  ; pitch
+	db $00  ; echo
+	dw $17f ; length
+
+PoliwhirlCryHeader: ; 0xf28ef
+	dw $0e  ; cry id
+	db $77  ; pitch
+	db $00  ; echo
+	dw $0e0 ; length
+
+PoliwrathCryHeader: ; 0xf28f5
+	dw $0e  ; cry id
+	db $00  ; pitch
+	db $00  ; echo
+	dw $17f ; length
+
+AbraCryHeader: ; 0xf28fb
+	dw $1c  ; cry id
+	db $c0  ; pitch
+	db $00  ; echo
+	dw $081 ; length
+
+KadabraCryHeader: ; 0xf2901
+	dw $1c  ; cry id
+	db $a8  ; pitch
+	db $00  ; echo
+	dw $140 ; length
+
+AlakazamCryHeader: ; 0xf2907
+	dw $1c  ; cry id
+	db $98  ; pitch
+	db $00  ; echo
+	dw $17f ; length
+
+MachopCryHeader: ; 0xf290d
+	dw $1f  ; cry id
+	db $ee  ; pitch
+	db $00  ; echo
+	dw $081 ; length
+
+MachokeCryHeader: ; 0xf2913
+	dw $1f  ; cry id
+	db $48  ; pitch
+	db $00  ; echo
+	dw $0e0 ; length
+
+MachampCryHeader: ; 0xf2919
+	dw $1f  ; cry id
+	db $08  ; pitch
+	db $00  ; echo
+	dw $140 ; length
+
+BellsproutCryHeader: ; 0xf291f
+	dw $21  ; cry id
+	db $55  ; pitch
+	db $00  ; echo
+	dw $081 ; length
+
+WeepinbellCryHeader: ; 0xf2925
+	dw $25  ; cry id
+	db $44  ; pitch
+	db $00  ; echo
+	dw $0a0 ; length
+
+VictreebelCryHeader: ; 0xf292b
+	dw $25  ; cry id
+	db $66  ; pitch
+	db $00  ; echo
+	dw $14c ; length
+
+TentacoolCryHeader: ; 0xf2931
+	dw $1a  ; cry id
+	db $00  ; pitch
+	db $00  ; echo
+	dw $100 ; length
+
+TentacruelCryHeader: ; 0xf2937
+	dw $1a  ; cry id
+	db $ee  ; pitch
+	db $00  ; echo
+	dw $17f ; length
+
+GeodudeCryHeader: ; 0xf293d
+	dw $24  ; cry id
+	db $f0  ; pitch
+	db $00  ; echo
+	dw $090 ; length
+
+GravelerCryHeader: ; 0xf2943
+	dw $24  ; cry id
+	db $00  ; pitch
+	db $00  ; echo
+	dw $100 ; length
+
+GolemCryHeader: ; 0xf2949
+	dw $12  ; cry id
+	db $e0  ; pitch
+	db $00  ; echo
+	dw $0c0 ; length
+
+PonytaCryHeader: ; 0xf294f
+	dw $25  ; cry id
+	db $00  ; pitch
+	db $00  ; echo
+	dw $100 ; length
+
+RapidashCryHeader: ; 0xf2955
+	dw $25  ; cry id
+	db $20  ; pitch
+	db $00  ; echo
+	dw $140 ; length
+
+SlowpokeCryHeader: ; 0xf295b
+	dw $02  ; cry id
+	db $00  ; pitch
+	db $00  ; echo
+	dw $100 ; length
+
+SlowbroCryHeader: ; 0xf2961
+	dw $1f  ; cry id
+	db $00  ; pitch
+	db $00  ; echo
+	dw $100 ; length
+
+MagnemiteCryHeader: ; 0xf2967
+	dw $1c  ; cry id
+	db $80  ; pitch
+	db $00  ; echo
+	dw $0e0 ; length
+
+MagnetonCryHeader: ; 0xf296d
+	dw $1c  ; cry id
+	db $20  ; pitch
+	db $00  ; echo
+	dw $140 ; length
+
+FarfetchDCryHeader: ; 0xf2973
+	dw $10  ; cry id
+	db $dd  ; pitch
+	db $00  ; echo
+	dw $081 ; length
+
+DoduoCryHeader: ; 0xf2979
+	dw $0b  ; cry id
+	db $bb  ; pitch
+	db $00  ; echo
+	dw $081 ; length
+
+DodrioCryHeader: ; 0xf297f
+	dw $0b  ; cry id
+	db $99  ; pitch
+	db $00  ; echo
+	dw $0a0 ; length
+
+SeelCryHeader: ; 0xf2985
+	dw $0c  ; cry id
+	db $88  ; pitch
+	db $00  ; echo
+	dw $140 ; length
+
+DewgongCryHeader: ; 0xf298b
+	dw $0c  ; cry id
+	db $23  ; pitch
+	db $00  ; echo
+	dw $17f ; length
+
+GrimerCryHeader: ; 0xf2991
+	dw $05  ; cry id
+	db $00  ; pitch
+	db $00  ; echo
+	dw $100 ; length
+
+MukCryHeader: ; 0xf2997
+	dw $07  ; cry id
+	db $ef  ; pitch
+	db $00  ; echo
+	dw $17f ; length
+
+ShellderCryHeader: ; 0xf299d
+	dw $18  ; cry id
+	db $00  ; pitch
+	db $00  ; echo
+	dw $100 ; length
+
+CloysterCryHeader: ; 0xf29a3
+	dw $18  ; cry id
+	db $6f  ; pitch
+	db $00  ; echo
+	dw $160 ; length
+
+GastlyCryHeader: ; 0xf29a9
+	dw $1c  ; cry id
+	db $00  ; pitch
+	db $00  ; echo
+	dw $100 ; length
+
+HaunterCryHeader: ; 0xf29af
+	dw $1c  ; cry id
+	db $30  ; pitch
+	db $00  ; echo
+	dw $0c0 ; length
+
+GengarCryHeader: ; 0xf29b5
+	dw $07  ; cry id
+	db $00  ; pitch
+	db $00  ; echo
+	dw $17f ; length
+
+OnixCryHeader: ; 0xf29bb
+	dw $17  ; cry id
+	db $ff  ; pitch
+	db $00  ; echo
+	dw $140 ; length
+
+DrowzeeCryHeader: ; 0xf29c1
+	dw $0d  ; cry id
+	db $88  ; pitch
+	db $00  ; echo
+	dw $0a0 ; length
+
+HypnoCryHeader: ; 0xf29c7
+	dw $0d  ; cry id
+	db $ee  ; pitch
+	db $00  ; echo
+	dw $0c0 ; length
+
+KrabbyCryHeader: ; 0xf29cd
+	dw $20  ; cry id
+	db $20  ; pitch
+	db $00  ; echo
+	dw $160 ; length
+
+KinglerCryHeader: ; 0xf29d3
+	dw $20  ; cry id
+	db $ee  ; pitch
+	db $00  ; echo
+	dw $160 ; length
+
+VoltorbCryHeader: ; 0xf29d9
+	dw $06  ; cry id
+	db $ed  ; pitch
+	db $00  ; echo
+	dw $100 ; length
+
+ElectrodeCryHeader: ; 0xf29df
+	dw $06  ; cry id
+	db $a8  ; pitch
+	db $00  ; echo
+	dw $110 ; length
+
+ExeggcuteCryHeader: ; 0xf29e5
+	dw $0b  ; cry id
+	db $00  ; pitch
+	db $00  ; echo
+	dw $100 ; length
+
+ExeggutorCryHeader: ; 0xf29eb
+	dw $0d  ; cry id
+	db $00  ; pitch
+	db $00  ; echo
+	dw $100 ; length
+
+CuboneCryHeader: ; 0xf29f1
+	dw $19  ; cry id
+	db $00  ; pitch
+	db $00  ; echo
+	dw $100 ; length
+
+MarowakCryHeader: ; 0xf29f7
+	dw $08  ; cry id
+	db $4f  ; pitch
+	db $00  ; echo
+	dw $0e0 ; length
+
+HitmonleeCryHeader: ; 0xf29fd
+	dw $12  ; cry id
+	db $80  ; pitch
+	db $00  ; echo
+	dw $140 ; length
+
+HitmonchanCryHeader: ; 0xf2a03
+	dw $0c  ; cry id
+	db $ee  ; pitch
+	db $00  ; echo
+	dw $140 ; length
+
+LickitungCryHeader: ; 0xf2a09
+	dw $0c  ; cry id
+	db $00  ; pitch
+	db $00  ; echo
+	dw $100 ; length
+
+KoffingCryHeader: ; 0xf2a0f
+	dw $12  ; cry id
+	db $e6  ; pitch
+	db $00  ; echo
+	dw $15d ; length
+
+WeezingCryHeader: ; 0xf2a15
+	dw $12  ; cry id
+	db $ff  ; pitch
+	db $00  ; echo
+	dw $17f ; length
+
+RhyhornCryHeader: ; 0xf2a1b
+	dw $04  ; cry id
+	db $00  ; pitch
+	db $00  ; echo
+	dw $100 ; length
+
+RhydonCryHeader: ; 0xf2a21
+	dw $11  ; cry id
+	db $00  ; pitch
+	db $00  ; echo
+	dw $100 ; length
+
+ChanseyCryHeader: ; 0xf2a27
+	dw $14  ; cry id
+	db $0a  ; pitch
+	db $00  ; echo
+	dw $140 ; length
+
+TangelaCryHeader: ; 0xf2a2d
+	dw $12  ; cry id
+	db $00  ; pitch
+	db $00  ; echo
+	dw $100 ; length
+
+KangaskhanCryHeader: ; 0xf2a33
+	dw $03  ; cry id
+	db $00  ; pitch
+	db $00  ; echo
+	dw $100 ; length
+
+HorseaCryHeader: ; 0xf2a39
+	dw $19  ; cry id
+	db $99  ; pitch
+	db $00  ; echo
+	dw $090 ; length
+
+SeadraCryHeader: ; 0xf2a3f
+	dw $19  ; cry id
+	db $3c  ; pitch
+	db $00  ; echo
+	dw $081 ; length
+
+GoldeenCryHeader: ; 0xf2a45
+	dw $16  ; cry id
+	db $80  ; pitch
+	db $00  ; echo
+	dw $0c0 ; length
+
+SeakingCryHeader: ; 0xf2a4b
+	dw $16  ; cry id
+	db $10  ; pitch
+	db $00  ; echo
+	dw $17f ; length
+
+StaryuCryHeader: ; 0xf2a51
+	dw $1e  ; cry id
+	db $02  ; pitch
+	db $00  ; echo
+	dw $0a0 ; length
+
+StarmieCryHeader: ; 0xf2a57
+	dw $1e  ; cry id
+	db $00  ; pitch
+	db $00  ; echo
+	dw $100 ; length
+
+MrMimeCryHeader: ; 0xf2a5d
+	dw $20  ; cry id
+	db $08  ; pitch
+	db $00  ; echo
+	dw $0c0 ; length
+
+ScytherCryHeader: ; 0xf2a63
+	dw $16  ; cry id
+	db $00  ; pitch
+	db $00  ; echo
+	dw $100 ; length
+
+JynxCryHeader: ; 0xf2a69
+	dw $0d  ; cry id
+	db $ff  ; pitch
+	db $00  ; echo
+	dw $17f ; length
+
+ElectabuzzCryHeader: ; 0xf2a6f
+	dw $06  ; cry id
+	db $8f  ; pitch
+	db $00  ; echo
+	dw $17f ; length
+
+MagmarCryHeader: ; 0xf2a75
+	dw $04  ; cry id
+	db $ff  ; pitch
+	db $00  ; echo
+	dw $0b0 ; length
+
+PinsirCryHeader: ; 0xf2a7b
+	dw $14  ; cry id
+	db $00  ; pitch
+	db $00  ; echo
+	dw $100 ; length
+
+TaurosCryHeader: ; 0xf2a81
+	dw $1d  ; cry id
+	db $11  ; pitch
+	db $00  ; echo
+	dw $0c0 ; length
+
+MagikarpCryHeader: ; 0xf2a87
+	dw $17  ; cry id
+	db $80  ; pitch
+	db $00  ; echo
+	dw $080 ; length
+
+GyaradosCryHeader: ; 0xf2a8d
+	dw $17  ; cry id
+	db $00  ; pitch
+	db $00  ; echo
+	dw $100 ; length
+
+LaprasCryHeader: ; 0xf2a93
+	dw $1b  ; cry id
+	db $00  ; pitch
+	db $00  ; echo
+	dw $100 ; length
+
+DittoCryHeader: ; 0xf2a99
+	dw $0e  ; cry id
+	db $ff  ; pitch
+	db $00  ; echo
+	dw $17f ; length
+
+EeveeCryHeader: ; 0xf2a9f
+	dw $1a  ; cry id
+	db $88  ; pitch
+	db $00  ; echo
+	dw $0e0 ; length
+
+VaporeonCryHeader: ; 0xf2aa5
+	dw $1a  ; cry id
+	db $aa  ; pitch
+	db $00  ; echo
+	dw $17f ; length
+
+JolteonCryHeader: ; 0xf2aab
+	dw $1a  ; cry id
+	db $3d  ; pitch
+	db $00  ; echo
+	dw $100 ; length
+
+FlareonCryHeader: ; 0xf2ab1
+	dw $1a  ; cry id
+	db $10  ; pitch
+	db $00  ; echo
+	dw $0a0 ; length
+
+PorygonCryHeader: ; 0xf2ab7
+	dw $25  ; cry id
+	db $aa  ; pitch
+	db $00  ; echo
+	dw $17f ; length
+
+OmanyteCryHeader: ; 0xf2abd
+	dw $1f  ; cry id
+	db $f0  ; pitch
+	db $00  ; echo
+	dw $081 ; length
+
+OmastarCryHeader: ; 0xf2ac3
+	dw $1f  ; cry id
+	db $ff  ; pitch
+	db $00  ; echo
+	dw $0c0 ; length
+
+KabutoCryHeader: ; 0xf2ac9
+	dw $16  ; cry id
+	db $bb  ; pitch
+	db $00  ; echo
+	dw $0c0 ; length
+
+KabutopsCryHeader: ; 0xf2acf
+	dw $18  ; cry id
+	db $ee  ; pitch
+	db $00  ; echo
+	dw $081 ; length
+
+AerodactylCryHeader: ; 0xf2ad5
+	dw $23  ; cry id
+	db $20  ; pitch
+	db $00  ; echo
+	dw $170 ; length
+
+SnorlaxCryHeader: ; 0xf2adb
+	dw $05  ; cry id
+	db $55  ; pitch
+	db $00  ; echo
+	dw $081 ; length
+
+ArticunoCryHeader: ; 0xf2ae1
+	dw $09  ; cry id
+	db $80  ; pitch
+	db $00  ; echo
+	dw $0c0 ; length
+
+ZapdosCryHeader: ; 0xf2ae7
+	dw $18  ; cry id
+	db $ff  ; pitch
+	db $00  ; echo
+	dw $100 ; length
+
+MoltresCryHeader: ; 0xf2aed
+	dw $09  ; cry id
+	db $f8  ; pitch
+	db $00  ; echo
+	dw $0c0 ; length
+
+DratiniCryHeader: ; 0xf2af3
+	dw $0f  ; cry id
+	db $60  ; pitch
+	db $00  ; echo
+	dw $0c0 ; length
+
+DragonairCryHeader: ; 0xf2af9
+	dw $0f  ; cry id
+	db $40  ; pitch
+	db $00  ; echo
+	dw $100 ; length
+
+DragoniteCryHeader: ; 0xf2aff
+	dw $0f  ; cry id
+	db $3c  ; pitch
+	db $00  ; echo
+	dw $140 ; length
+
+MewtwoCryHeader: ; 0xf2b05
+	dw $1e  ; cry id
+	db $99  ; pitch
+	db $00  ; echo
+	dw $17f ; length
+
+MewCryHeader: ; 0xf2b0b
+	dw $1e  ; cry id
+	db $ee  ; pitch
+	db $00  ; echo
+	dw $17f ; length
+
+ChikoritaCryHeader: ; 0xf2b11
+	dw $31  ; cry id
+	db $f0  ; pitch
+	db $ff  ; echo
+	dw $0b0 ; length
+
+BayleefCryHeader: ; 0xf2b17
+	dw $31  ; cry id
+	db $de  ; pitch
+	db $ff  ; echo
+	dw $120 ; length
+
+MeganiumCryHeader: ; 0xf2b1d
+	dw $31  ; cry id
+	db $49  ; pitch
+	db $ff  ; echo
+	dw $200 ; length
+
+CyndaquilCryHeader: ; 0xf2b23
+	dw $30  ; cry id
+	db $47  ; pitch
+	db $03  ; echo
+	dw $080 ; length
+
+QuilavaCryHeader: ; 0xf2b29
+	dw $30  ; cry id
+	db $21  ; pitch
+	db $03  ; echo
+	dw $120 ; length
+
+TyphlosionCryHeader: ; 0xf2b2f
+	dw $3a  ; cry id
+	db $00  ; pitch
+	db $0f  ; echo
+	dw $0d4 ; length
+
+TotodileCryHeader: ; 0xf2b35
+	dw $32  ; cry id
+	db $6c  ; pitch
+	db $04  ; echo
+	dw $0e8 ; length
+
+CroconawCryHeader: ; 0xf2b3b
+	dw $32  ; cry id
+	db $40  ; pitch
+	db $04  ; echo
+	dw $110 ; length
+
+FeraligatrCryHeader: ; 0xf2b41
+	dw $32  ; cry id
+	db $fc  ; pitch
+	db $03  ; echo
+	dw $180 ; length
+
+SentretCryHeader: ; 0xf2b47
+	dw $2e  ; cry id
+	db $8a  ; pitch
+	db $00  ; echo
+	dw $0b8 ; length
+
+FurretCryHeader: ; 0xf2b4d
+	dw $2e  ; cry id
+	db $6b  ; pitch
+	db $00  ; echo
+	dw $102 ; length
+
+HoothootCryHeader: ; 0xf2b53
+	dw $2d  ; cry id
+	db $91  ; pitch
+	db $00  ; echo
+	dw $0d8 ; length
+
+NoctowlCryHeader: ; 0xf2b59
+	dw $2d  ; cry id
+	db $00  ; pitch
+	db $00  ; echo
+	dw $1a0 ; length
+
+LedybaCryHeader: ; 0xf2b5f
+	dw $36  ; cry id
+	db $00  ; pitch
+	db $00  ; echo
+	dw $0de ; length
+
+LedianCryHeader: ; 0xf2b65
+	dw $36  ; cry id
+	db $6a  ; pitch
+	db $ff  ; echo
+	dw $138 ; length
+
+SpinarakCryHeader: ; 0xf2b6b
+	dw $27  ; cry id
+	db $11  ; pitch
+	db $00  ; echo
+	dw $200 ; length
+
+AriadosCryHeader: ; 0xf2b71
+	dw $27  ; cry id
+	db $52  ; pitch
+	db $ff  ; echo
+	dw $1e2 ; length
+
+CrobatCryHeader: ; 0xf2b77
+	dw $1d  ; cry id
+	db $f0  ; pitch
+	db $ff  ; echo
+	dw $140 ; length
+
+ChinchouCryHeader: ; 0xf2b7d
+	dw $30  ; cry id
+	db $c9  ; pitch
+	db $03  ; echo
+	dw $140 ; length
+
+LanturnCryHeader: ; 0xf2b83
+	dw $30  ; cry id
+	db $d0  ; pitch
+	db $02  ; echo
+	dw $110 ; length
+
+PichuCryHeader: ; 0xf2b89
+	dw $40  ; cry id
+	db $00  ; pitch
+	db $00  ; echo
+	dw $140 ; length
+
+CleffaCryHeader: ; 0xf2b8f
+	dw $34  ; cry id
+	db $61  ; pitch
+	db $00  ; echo
+	dw $091 ; length
+
+IgglybuffCryHeader: ; 0xf2b95
+	dw $31  ; cry id
+	db $e8  ; pitch
+	db $00  ; echo
+	dw $0e8 ; length
+
+TogepiCryHeader: ; 0xf2b9b
+	dw $28  ; cry id
+	db $10  ; pitch
+	db $00  ; echo
+	dw $100 ; length
+
+TogeticCryHeader: ; 0xf2ba1
+	dw $2c  ; cry id
+	db $3b  ; pitch
+	db $00  ; echo
+	dw $038 ; length
+
+NatuCryHeader: ; 0xf2ba7
+	dw $3b  ; cry id
+	db $99  ; pitch
+	db $ff  ; echo
+	dw $100 ; length
+
+XatuCryHeader: ; 0xf2bad
+	dw $3b  ; cry id
+	db $59  ; pitch
+	db $ff  ; echo
+	dw $168 ; length
+
+MareepCryHeader: ; 0xf2bb3
+	dw $2b  ; cry id
+	db $22  ; pitch
+	db $00  ; echo
+	dw $0d8 ; length
+
+FlaaffyCryHeader: ; 0xf2bb9
+	dw $2b  ; cry id
+	db $f9  ; pitch
+	db $ff  ; echo
+	dw $180 ; length
+
+AmpharosCryHeader: ; 0xf2bbf
+	dw $3e  ; cry id
+	db $84  ; pitch
+	db $ff  ; echo
+	dw $0e8 ; length
+
+BellossomCryHeader: ; 0xf2bc5
+	dw $34  ; cry id
+	db $84  ; pitch
+	db $00  ; echo
+	dw $150 ; length
+
+MarillCryHeader: ; 0xf2bcb
+	dw $26  ; cry id
+	db $1b  ; pitch
+	db $01  ; echo
+	dw $120 ; length
+
+AzumarillCryHeader: ; 0xf2bd1
+	dw $26  ; cry id
+	db $b6  ; pitch
+	db $00  ; echo
+	dw $180 ; length
+
+SudowoodoCryHeader: ; 0xf2bd7
+	dw $34  ; cry id
+	db $40  ; pitch
+	db $0f  ; echo
+	dw $180 ; length
+
+PolitoedCryHeader: ; 0xf2bdd
+	dw $34  ; cry id
+	db $5d  ; pitch
+	db $fd  ; echo
+	dw $1c8 ; length
+
+HoppipCryHeader: ; 0xf2be3
+	dw $34  ; cry id
+	db $3b  ; pitch
+	db $00  ; echo
+	dw $0c8 ; length
+
+SkiploomCryHeader: ; 0xf2be9
+	dw $34  ; cry id
+	db $27  ; pitch
+	db $00  ; echo
+	dw $138 ; length
+
+JumpluffCryHeader: ; 0xf2bef
+	dw $34  ; cry id
+	db $00  ; pitch
+	db $00  ; echo
+	dw $180 ; length
+
+AipomCryHeader: ; 0xf2bf5
+	dw $41  ; cry id
+	db $af  ; pitch
+	db $ff  ; echo
+	dw $0e8 ; length
+
+SunkernCryHeader: ; 0xf2bfb
+	dw $26  ; cry id
+	db $2b  ; pitch
+	db $01  ; echo
+	dw $0b8 ; length
+
+SunfloraCryHeader: ; 0xf2c01
+	dw $3d  ; cry id
+	db $e0  ; pitch
+	db $ff  ; echo
+	dw $180 ; length
+
+YanmaCryHeader: ; 0xf2c07
+	dw $32  ; cry id
+	db $31  ; pitch
+	db $00  ; echo
+	dw $0c8 ; length
+
+WooperCryHeader: ; 0xf2c0d
+	dw $38  ; cry id
+	db $93  ; pitch
+	db $00  ; echo
+	dw $0af ; length
+
+QuagsireCryHeader: ; 0xf2c13
+	dw $38  ; cry id
+	db $3a  ; pitch
+	db $ff  ; echo
+	dw $140 ; length
+
+EspeonCryHeader: ; 0xf2c19
+	dw $41  ; cry id
+	db $a2  ; pitch
+	db $00  ; echo
+	dw $140 ; length
+
+UmbreonCryHeader: ; 0xf2c1f
+	dw $1a  ; cry id
+	db $17  ; pitch
+	db $ff  ; echo
+	dw $0f0 ; length
+
+MurkrowCryHeader: ; 0xf2c25
+	dw $26  ; cry id
+	db $e1  ; pitch
+	db $ff  ; echo
+	dw $180 ; length
+
+SlowkingCryHeader: ; 0xf2c2b
+	dw $2f  ; cry id
+	db $04  ; pitch
+	db $01  ; echo
+	dw $200 ; length
+
+MisdreavusCryHeader: ; 0xf2c31
+	dw $2d  ; cry id
+	db $30  ; pitch
+	db $01  ; echo
+	dw $0e8 ; length
+
+UnownCryHeader: ; 0xf2c37
+	dw $2d  ; cry id
+	db $62  ; pitch
+	db $01  ; echo
+	dw $100 ; length
+
+WobbuffetCryHeader: ; 0xf2c3d
+	dw $3e  ; cry id
+	db $7b  ; pitch
+	db $02  ; echo
+	dw $144 ; length
+
+GirafarigCryHeader: ; 0xf2c43
+	dw $29  ; cry id
+	db $41  ; pitch
+	db $00  ; echo
+	dw $200 ; length
+
+PinecoCryHeader: ; 0xf2c49
+	dw $2f  ; cry id
+	db $80  ; pitch
+	db $00  ; echo
+	dw $100 ; length
+
+ForretressCryHeader: ; 0xf2c4f
+	dw $2f  ; cry id
+	db $00  ; pitch
+	db $00  ; echo
+	dw $180 ; length
+
+DunsparceCryHeader: ; 0xf2c55
+	dw $42  ; cry id
+	db $c4  ; pitch
+	db $01  ; echo
+	dw $100 ; length
+
+GligarCryHeader: ; 0xf2c5b
+	dw $33  ; cry id
+	db $fe  ; pitch
+	db $fe  ; echo
+	dw $100 ; length
+
+SteelixCryHeader: ; 0xf2c61
+	dw $3a  ; cry id
+	db $ef  ; pitch
+	db $00  ; echo
+	dw $0f7 ; length
+
+SnubbullCryHeader: ; 0xf2c67
+	dw $42  ; cry id
+	db $12  ; pitch
+	db $01  ; echo
+	dw $0e8 ; length
+
+GranbullCryHeader: ; 0xf2c6d
+	dw $42  ; cry id
+	db $00  ; pitch
+	db $00  ; echo
+	dw $180 ; length
+
+QwilfishCryHeader: ; 0xf2c73
+	dw $2f  ; cry id
+	db $60  ; pitch
+	db $01  ; echo
+	dw $0e0 ; length
+
+ScizorCryHeader: ; 0xf2c79
+	dw $3e  ; cry id
+	db $00  ; pitch
+	db $00  ; echo
+	dw $160 ; length
+
+ShuckleCryHeader: ; 0xf2c7f
+	dw $42  ; cry id
+	db $90  ; pitch
+	db $02  ; echo
+	dw $0a8 ; length
+
+HeracrossCryHeader: ; 0xf2c85
+	dw $3e  ; cry id
+	db $35  ; pitch
+	db $00  ; echo
+	dw $0e0 ; length
+
+SneaselCryHeader: ; 0xf2c8b
+	dw $38  ; cry id
+	db $53  ; pitch
+	db $00  ; echo
+	dw $0af ; length
+
+TeddiursaCryHeader: ; 0xf2c91
+	dw $3c  ; cry id
+	db $a2  ; pitch
+	db $07  ; echo
+	dw $06e ; length
+
+UrsaringCryHeader: ; 0xf2c97
+	dw $3c  ; cry id
+	db $40  ; pitch
+	db $06  ; echo
+	dw $0d8 ; length
+
+SlugmaCryHeader: ; 0xf2c9d
+	dw $35  ; cry id
+	db $28  ; pitch
+	db $fe  ; echo
+	dw $140 ; length
+
+MagcargoCryHeader: ; 0xf2ca3
+	dw $3f  ; cry id
+	db $f3  ; pitch
+	db $fd  ; echo
+	dw $1c0 ; length
+
+SwinubCryHeader: ; 0xf2ca9
+	dw $30  ; cry id
+	db $fe  ; pitch
+	db $01  ; echo
+	dw $140 ; length
+
+PiloswineCryHeader: ; 0xf2caf
+	dw $3f  ; cry id
+	db $f7  ; pitch
+	db $fe  ; echo
+	dw $100 ; length
+
+CorsolaCryHeader: ; 0xf2cb5
+	dw $3f  ; cry id
+	db $a1  ; pitch
+	db $00  ; echo
+	dw $0e8 ; length
+
+RemoraidCryHeader: ; 0xf2cbb
+	dw $3d  ; cry id
+	db $0d  ; pitch
+	db $00  ; echo
+	dw $100 ; length
+
+OctilleryCryHeader: ; 0xf2cc1
+	dw $32  ; cry id
+	db $00  ; pitch
+	db $00  ; echo
+	dw $180 ; length
+
+DelibirdCryHeader: ; 0xf2cc7
+	dw $3c  ; cry id
+	db $02  ; pitch
+	db $00  ; echo
+	dw $06a ; length
+
+MantineCryHeader: ; 0xf2ccd
+	dw $39  ; cry id
+	db $42  ; pitch
+	db $ff  ; echo
+	dw $0f0 ; length
+
+SkarmoryCryHeader: ; 0xf2cd3
+	dw $3e  ; cry id
+	db $a9  ; pitch
+	db $08  ; echo
+	dw $180 ; length
+
+HoundourCryHeader: ; 0xf2cd9
+	dw $30  ; cry id
+	db $39  ; pitch
+	db $00  ; echo
+	dw $140 ; length
+
+HoundoomCryHeader: ; 0xf2cdf
+	dw $32  ; cry id
+	db $f6  ; pitch
+	db $fe  ; echo
+	dw $100 ; length
+
+KingdraCryHeader: ; 0xf2ce5
+	dw $35  ; cry id
+	db $fb  ; pitch
+	db $02  ; echo
+	dw $100 ; length
+
+PhanpyCryHeader: ; 0xf2ceb
+	dw $2e  ; cry id
+	db $48  ; pitch
+	db $00  ; echo
+	dw $230 ; length
+
+DonphanCryHeader: ; 0xf2cf1
+	dw $43  ; cry id
+	db $00  ; pitch
+	db $00  ; echo
+	dw $1a0 ; length
+
+Porygon2CryHeader: ; 0xf2cf7
+	dw $29  ; cry id
+	db $73  ; pitch
+	db $00  ; echo
+	dw $240 ; length
+
+StantlerCryHeader: ; 0xf2cfd
+	dw $41  ; cry id
+	db $a0  ; pitch
+	db $fe  ; echo
+	dw $180 ; length
+
+SmeargleCryHeader: ; 0xf2d03
+	dw $40  ; cry id
+	db $e6  ; pitch
+	db $fd  ; echo
+	dw $1f0 ; length
+
+TyrogueCryHeader: ; 0xf2d09
+	dw $41  ; cry id
+	db $2c  ; pitch
+	db $00  ; echo
+	dw $108 ; length
+
+HitmontopCryHeader: ; 0xf2d0f
+	dw $35  ; cry id
+	db $00  ; pitch
+	db $00  ; echo
+	dw $100 ; length
+
+SmoochumCryHeader: ; 0xf2d15
+	dw $26  ; cry id
+	db $68  ; pitch
+	db $00  ; echo
+	dw $100 ; length
+
+ElekidCryHeader: ; 0xf2d1b
+	dw $3d  ; cry id
+	db $28  ; pitch
+	db $fd  ; echo
+	dw $0b4 ; length
+
+MagbyCryHeader: ; 0xf2d21
+	dw $3c  ; cry id
+	db $76  ; pitch
+	db $01  ; echo
+	dw $03a ; length
+
+MiltankCryHeader: ; 0xf2d27
+	dw $33  ; cry id
+	db $33  ; pitch
+	db $fe  ; echo
+	dw $1a0 ; length
+
+BlisseyCryHeader: ; 0xf2d2d
+	dw $2f  ; cry id
+	db $93  ; pitch
+	db $02  ; echo
+	dw $140 ; length
+
+RaikouCryHeader: ; 0xf2d33
+	dw $2a  ; cry id
+	db $2e  ; pitch
+	db $02  ; echo
+	dw $120 ; length
+
+EnteiCryHeader: ; 0xf2d39
+	dw $37  ; cry id
+	db $00  ; pitch
+	db $00  ; echo
+	dw $1a0 ; length
+
+SuicuneCryHeader: ; 0xf2d3f
+	dw $3f  ; cry id
+	db $00  ; pitch
+	db $00  ; echo
+	dw $180 ; length
+
+LarvitarCryHeader: ; 0xf2d45
+	dw $2a  ; cry id
+	db $5f  ; pitch
+	db $00  ; echo
+	dw $0d0 ; length
+
+PupitarCryHeader: ; 0xf2d4b
+	dw $27  ; cry id
+	db $25  ; pitch
+	db $fe  ; echo
+	dw $150 ; length
+
+TyranitarCryHeader: ; 0xf2d51
+	dw $2a  ; cry id
+	db $00  ; pitch
+	db $ff  ; echo
+	dw $180 ; length
+
+LugiaCryHeader: ; 0xf2d57
+	dw $3a  ; cry id
+	db $00  ; pitch
+	db $00  ; echo
+	dw $100 ; length
+
+HoOhCryHeader: ; 0xf2d5d
+	dw $41  ; cry id
+	db $00  ; pitch
+	db $00  ; echo
+	dw $180 ; length
+
+CelebiCryHeader: ; 0xf2d63
+	dw $37  ; cry id
+	db $4a  ; pitch
+	db $01  ; echo
+	dw $111 ; length
+
+
diff --git a/extras/gfx.py b/extras/gfx.py
index 65eac7183..c641ab7f1 100644
--- a/extras/gfx.py
+++ b/extras/gfx.py
@@ -8,10 +8,11 @@ from math import sqrt, floor, ceil
 from crystal import load_rom
 
 from pokemon_constants import pokemon_constants
+from trainers import trainer_group_names
 
 
-
-rom = load_rom()
+if __name__ != "__main__":
+	rom = load_rom()
 
 
 def mkdir_p(path):
@@ -953,17 +954,6 @@ def decompress_misc():
 def decompress_all(debug = False):
 	"""decompress all known compressed data in baserom"""
 	
-	#mkdir_p('../gfx/')
-	#mkdir_p('../gfx/frontpics/')
-	#mkdir_p('../gfx/anim/')
-	#mkdir_p('../gfx/backpics/')
-	#mkdir_p('../gfx/trainers/')
-	#mkdir_p('../gfx/fx/')
-	#mkdir_p('../gfx/intro/')
-	#mkdir_p('../gfx/title/')
-	#mkdir_p('../gfx/tilesets/')
-	#mkdir_p('../gfx/misc/')
-	
 	if debug: print 'fronts'
 	decompress_monsters(front)
 	if debug: print 'backs'
@@ -1032,7 +1022,7 @@ def compress_monster_frontpic(id, fileout):
 	anim = open(fanim, 'rb').read()
 	image = pic + anim
 	
-	lz = Compressed(image, mode, 5)
+	lz = Compressed(image, mode, sizes[id-1])
 	
 	out = '../gfx/pics/' + str(id).zfill(3) + '/front.lz'
 	
@@ -1081,6 +1071,8 @@ def grab_palettes(address, length = 0x80):
 
 
 def dump_monster_pals():
+	rom = load_rom()
+	
 	pals = 0xa8d6
 	pal_length = 0x4
 	for mon in range(251):
@@ -1116,6 +1108,31 @@ def dump_monster_pals():
 		#print name+'ShinyPalette:'+spacing+' INCBIN "'+dir+filename+'"'
 
 
+def dump_trainer_pals():
+	rom = load_rom()
+	
+	pals = 0xb0d2
+	pal_length = 0x4
+	for trainer in range(67):
+		
+		name = trainer_group_names[trainer+1]['constant'].title().replace('_','')
+		num  = str(trainer).zfill(3)
+		dir  = 'gfx/trainers/'
+		
+		address = pals + trainer*pal_length
+		
+		pal_data = []
+		for byte in range(pal_length):
+			pal_data.append(ord(rom[address]))
+			address += 1
+		
+		filename = num+'.pal'
+		to_file('../'+dir+filename, pal_data)
+		
+		spacing = ' ' * (12 - len(name))
+		print name+'Palette:'+spacing+' INCBIN"'+dir+filename+'"'
+
+
 
 def flatten(planar):
 	"""
@@ -1184,22 +1201,58 @@ def to_png(filein, fileout=None, pal_file=None, height=None, width=None):
 	Takes a planar 2bpp graphics file and converts it to png.
 	"""
 	
-	if fileout == None: fileout = ''.join(filein.split('.')[:-1]) + '.png'
+	if fileout == None: fileout = '.'.join(filein.split('.')[:-1]) + '.png'
 	
 	image = open(filein, 'rb').read()
 	
-
+	num_pixels = len(image) * 4
+	
+	if num_pixels == 0: return 'empty image!'
+	
+	
 	# unless the pic is square, at least one dimension should be given
 	
-	if height   == None and width == None:
-		height = int(sqrt(len(image)*4))
-		width = height
+	if width == None and height == None:
+		width  = int(sqrt(num_pixels))
+		height = width
 	
-	elif height == None: height = len(image)*4 / width
+	elif height == None:
+		height = num_pixels / width
 
-	elif width  == None: width = len(image)*4 / height
+	elif width  == None:
+		width  = num_pixels / height
+	
+	
+	# but try to see if it can be made rectangular
+	
+	if width * height != num_pixels:
+		
+		# look for possible combos of width/height that would form a rectangle
+		matches = []
+		
+		# this is pretty inefficient, and there is probably a simpler way
+		for width in range(8,256+1,8): # we only want dimensions that fit in tiles
+			height = num_pixels / width
+			if height % 8 == 0:
+				matches.append((width, height))
+		
+		# go for the most square image
+		width, height = sorted(matches, key=lambda (x,y): x+y)[0] # favors height
+	
+	
+	# if it can't, the only option is a width of 1 tile
+	
+	if width * height != num_pixels:
+		width = 8
+		height = num_pixels / width
+	
+	
+	# if this still isn't rectangular, then the image isn't made of tiles
 	
-	assert height * width == len(image)*4, 'Please specify dimensions for non-square image!'
+	# for now we'll just spit out a warning
+	if width * height != num_pixels:
+		print 'Warning! ' + fileout + ' is ' + width + 'x' + height + '(' + width*height + ' pixels),\n' +\
+		       'but ' + filein + ' is ' + num_pixels + ' pixels!'
 	
 	
 	# map it out
@@ -1233,7 +1286,7 @@ def to_2bpp(filein, fileout=None, palout=None):
 	Takes a png and converts it to planar 2bpp.
 	"""
 	
-	if fileout == None: fileout = ''.join(filein.split('.')[:-1]) + '.2bpp'
+	if fileout == None: fileout = '.'.join(filein.split('.')[:-1]) + '.2bpp'
 	
 	with open(filein, 'rb') as file:
 
@@ -1355,6 +1408,87 @@ def to_2bpp(filein, fileout=None, palout=None):
 	to_file(fileout, image)
 
 
+def png_to_lz(filein):
+	
+	name = os.path.splitext(filein)[0]
+	
+	to_2bpp(filein)
+	image = open(name+'.2bpp', 'rb').read()
+	to_file(name+'.lz', Compressed(image).output)
+
+
+
+
+def mass_to_png(debug=False):
+	# greyscale
+	for root, dirs, files in os.walk('../gfx/'):
+		for name in files:
+			if debug: print os.path.splitext(name), os.path.join(root, name)
+			if os.path.splitext(name)[1] == '.2bpp':
+				to_png(os.path.join(root, name))
+
+def mass_to_colored_png(debug=False):
+	# greyscale
+	for root, dirs, files in os.walk('../gfx/'):
+		if 'pics' not in root and 'trainers' not in root:
+			for name in files:
+				if debug: print os.path.splitext(name), os.path.join(root, name)
+				if os.path.splitext(name)[1] == '.2bpp':
+					to_png(os.path.join(root, name))
+	
+	# only monster and trainer pics for now
+	for root, dirs, files in os.walk('../gfx/pics/'):
+		for name in files:
+			if debug: print os.path.splitext(name), os.path.join(root, name)
+			if os.path.splitext(name)[1] == '.2bpp':
+				if 'normal.pal' in files:
+					to_png(os.path.join(root, name), None, os.path.join(root, 'normal.pal'))
+				else:
+					to_png(os.path.join(root, name))
+	for root, dirs, files in os.walk('../gfx/trainers/'):
+		for name in files:
+			if debug: print os.path.splitext(name), os.path.join(root, name)
+			if os.path.splitext(name)[1] == '.2bpp':
+				to_png(os.path.join(root, name), None, os.path.join(root, name[:-5] + '.pal'))
+
+
+def mass_decompress(debug=False):
+	for root, dirs, files in os.walk('../gfx/'):
+		for file in files:
+			if 'lz' in file:
+				if '/pics' in root:
+					if 'front' in file:
+						id = root.split('pics/')[1][:3]
+						if id != 'egg':
+							with open(root+'/'+file, 'rb') as lz: de = Decompressed(lz.read(), 'vert', sizes[int(id)-1])
+						else:
+							with open(root+'/'+file, 'rb') as lz: de = Decompressed(lz.read(), 'vert', 4)
+						to_file(root+'/'+'front.2bpp', de.pic)
+						to_file(root+'/'+'tiles.2bpp', de.animtiles)
+					elif 'back' in file:
+						with open(root+'/'+file, 'rb') as lz: de = Decompressed(lz.read(), 'vert')
+						to_file(root+'/'+'back.2bpp', de.output)
+				elif '/trainers' in root or '/fx' in root:
+					with open(root+'/'+file, 'rb') as lz: de = Decompressed(lz.read(), 'vert')
+					to_file(root+'/'+file[:-3]+'.2bpp', de.output)
+				else:
+					with open(root+'/'+file, 'rb') as lz: de = Decompressed(lz.read())
+					to_file(root+file[:-3]+'.2bpp', de.output)
+
+def append_terminator_to_lzs(directory):
+	# fix lzs that were extracted with a missing terminator
+	for root, dirs, files in os.walk(directory):
+		for file in files:
+			if '.lz' in file:
+				data = open(root+file,'rb').read()
+				if data[-1] != chr(0xff):
+					data += chr(0xff)
+					new = open(root+file,'wb')
+					new.write(data)
+					new.close()
+
+
+
 
 if __name__ == "__main__":
 	parser = argparse.ArgumentParser()
@@ -1362,12 +1496,60 @@ if __name__ == "__main__":
 	parser.add_argument('arg1', nargs='?', metavar='arg1', type=str)
 	parser.add_argument('arg2', nargs='?', metavar='arg2', type=str)
 	parser.add_argument('arg3', nargs='?', metavar='arg3', type=str)
+	parser.add_argument('arg4', nargs='?', metavar='arg4', type=str)
+	parser.add_argument('arg5', nargs='?', metavar='arg5', type=str)
 	args = parser.parse_args()
 	
-	debug = True
+	debug = False
+	
+	if args.cmd == 'dump-pngs':
+		mass_to_colored_png()
+	
+	elif args.cmd == 'png-to-lz':
+		# python gfx.py png-to-lz [--front anim(2bpp) | --vert] [png]
+		
+		# python gfx.py png-to-lz --front [anim(2bpp)] [png]
+		if args.arg1 == '--front':
+
+			# front.png and tiles.png are combined before compression,
+			# so we have to pass in things like anim file and pic size
+			name = os.path.splitext(args.arg3)[0]
+			
+			to_2bpp(name+'.png', name+'.2bpp')
+			pic  = open(name+'.2bpp', 'rb').read()
+			anim = open(args.arg2, 'rb').read()
+			size = int(sqrt(len(pic)/16)) # assume square pic
+			to_file(name+'.lz', Compressed(pic + anim, 'vert', size).output)
+		
+		
+		# python gfx.py png-to-lz --vert [png]
+		elif args.arg1 == '--vert':
+			
+			# others are vertically oriented (frontpics are always vertical)
+			
+			name = os.path.splitext(args.arg2)[0]
+			
+			to_2bpp(name+'.png', name+'.2bpp')
+			pic = open(name+'.2bpp', 'rb').read()
+			to_file(name+'.lz', Compressed(pic + anim, 'vert').output)
+		
+		
+		# python gfx.py png-to-lz [png]
+		else:
+			
+			# standard usage
+			
+			png_to_lz(args.arg1)
+	
+	elif args.cmd == 'png-to-2bpp':
+		to_2bpp(args.arg1)
 	
-	if args.cmd == 'de':
+	
+	elif args.cmd == 'de':
 		# python gfx.py de [addr] [fileout] [mode]
+		
+		rom = load_rom()
+		
 		addr = int(args.arg1,16)
 		fileout = args.arg2
 		mode = args.arg3
@@ -1388,10 +1570,12 @@ if __name__ == "__main__":
 	
 	elif args.cmd == 'un':
 		# python gfx.py un [address] [num_tiles] [filename]
+		rom = load_rom()
 		get_uncompressed_gfx(int(args.arg1,16), int(args.arg2), args.arg3)
 	
 	elif args.cmd == 'pal':
 		# python gfx.py pal [address] [length]
+		rom = load_rom()
 		print grab_palettes(int(args.arg1,16), int(args.arg2))
 	
 	elif args.cmd == 'png':
@@ -1405,8 +1589,8 @@ if __name__ == "__main__":
 		elif '.png' in args.arg1:
 			to_2bpp(args.arg1, args.arg2)
 	
-	#else:
-		## python gfx.py
-		#decompress_all()
-		#if debug: print 'decompressed known gfx to ../gfx/!'
+	elif args.cmd == 'mass-decompress':
+		mass_decompress()
+		if debug: print 'decompressed known gfx to pokecrystal/gfx/!'
+	
 
diff --git a/gfx/fx/000.2bpp b/gfx/fx/000.2bpp
deleted file mode 100644
index e69de29bb..000000000
--- a/gfx/fx/000.2bpp
+++ /dev/null
diff --git a/gfx/fx/lz/000.lz b/gfx/fx/000.lz
index 55aac9909..55aac9909 100644
--- a/gfx/fx/lz/000.lz
+++ b/gfx/fx/000.lz
diff --git a/gfx/fx/001.2bpp b/gfx/fx/001.2bpp
deleted file mode 100644
index 1d797a8f4..000000000
--- a/gfx/fx/001.2bpp
+++ /dev/null
diff --git a/gfx/fx/lz/001.lz b/gfx/fx/001.lz
index 55aac9909..55aac9909 100644
--- a/gfx/fx/lz/001.lz
+++ b/gfx/fx/001.lz
diff --git a/gfx/fx/002.2bpp b/gfx/fx/002.2bpp
deleted file mode 100644
index c17a4bd75..000000000
--- a/gfx/fx/002.2bpp
+++ /dev/null
diff --git a/gfx/fx/lz/002.lz b/gfx/fx/002.lz
index 228008426..228008426 100644
--- a/gfx/fx/lz/002.lz
+++ b/gfx/fx/002.lz
diff --git a/gfx/fx/003.2bpp b/gfx/fx/003.2bpp
deleted file mode 100644
index 0a6c9a1b6..000000000
--- a/gfx/fx/003.2bpp
+++ /dev/null
diff --git a/gfx/fx/lz/003.lz b/gfx/fx/003.lz
index 85fedf741..85fedf741 100644
--- a/gfx/fx/lz/003.lz
+++ b/gfx/fx/003.lz
diff --git a/gfx/fx/004.2bpp b/gfx/fx/004.2bpp
deleted file mode 100644
index 75fd6b46c..000000000
--- a/gfx/fx/004.2bpp
+++ /dev/null
diff --git a/gfx/fx/lz/004.lz b/gfx/fx/004.lz
index be5245a3c..be5245a3c 100644
--- a/gfx/fx/lz/004.lz
+++ b/gfx/fx/004.lz
diff --git a/gfx/fx/005.2bpp b/gfx/fx/005.2bpp
deleted file mode 100644
index 12beaae7b..000000000
--- a/gfx/fx/005.2bpp
+++ /dev/null
diff --git a/gfx/fx/lz/005.lz b/gfx/fx/005.lz
index 77843898b..77843898b 100644
--- a/gfx/fx/lz/005.lz
+++ b/gfx/fx/005.lz
diff --git a/gfx/fx/006.2bpp b/gfx/fx/006.2bpp
deleted file mode 100644
index 2463fa9b5..000000000
--- a/gfx/fx/006.2bpp
+++ /dev/null
diff --git a/gfx/fx/lz/006.lz b/gfx/fx/006.lz
index 8712f70d6..8712f70d6 100644
--- a/gfx/fx/lz/006.lz
+++ b/gfx/fx/006.lz
diff --git a/gfx/fx/007.2bpp b/gfx/fx/007.2bpp
deleted file mode 100644
index c50e69e68..000000000
--- a/gfx/fx/007.2bpp
+++ /dev/null
diff --git a/gfx/fx/lz/007.lz b/gfx/fx/007.lz
index ca84efefd..ca84efefd 100644
--- a/gfx/fx/lz/007.lz
+++ b/gfx/fx/007.lz
diff --git a/gfx/fx/008.2bpp b/gfx/fx/008.2bpp
deleted file mode 100644
index dabe60c9a..000000000
--- a/gfx/fx/008.2bpp
+++ /dev/null
diff --git a/gfx/fx/lz/008.lz b/gfx/fx/008.lz
index 20a184595..20a184595 100644
--- a/gfx/fx/lz/008.lz
+++ b/gfx/fx/008.lz
diff --git a/gfx/fx/009.2bpp b/gfx/fx/009.2bpp
deleted file mode 100644
index c1d5622e3..000000000
--- a/gfx/fx/009.2bpp
+++ /dev/null
diff --git a/gfx/fx/lz/009.lz b/gfx/fx/009.lz
index e32b7f6d9..e32b7f6d9 100644
--- a/gfx/fx/lz/009.lz
+++ b/gfx/fx/009.lz
diff --git a/gfx/fx/010.2bpp b/gfx/fx/010.2bpp
deleted file mode 100644
index 72b6bab2f..000000000
--- a/gfx/fx/010.2bpp
+++ /dev/null
diff --git a/gfx/fx/lz/010.lz b/gfx/fx/010.lz
index bd76b904f..bd76b904f 100644
--- a/gfx/fx/lz/010.lz
+++ b/gfx/fx/010.lz
diff --git a/gfx/fx/011.2bpp b/gfx/fx/011.2bpp
deleted file mode 100644
index 39f670433..000000000
--- a/gfx/fx/011.2bpp
+++ /dev/null
diff --git a/gfx/fx/lz/011.lz b/gfx/fx/011.lz
index 7964d7256..7964d7256 100644
--- a/gfx/fx/lz/011.lz
+++ b/gfx/fx/011.lz
diff --git a/gfx/fx/012.2bpp b/gfx/fx/012.2bpp
deleted file mode 100644
index 09ad7f109..000000000
--- a/gfx/fx/012.2bpp
+++ /dev/null
diff --git a/gfx/fx/lz/012.lz b/gfx/fx/012.lz
index 04f8d695c..04f8d695c 100644
--- a/gfx/fx/lz/012.lz
+++ b/gfx/fx/012.lz
diff --git a/gfx/fx/013.2bpp b/gfx/fx/013.2bpp
deleted file mode 100644
index a9daa48e7..000000000
--- a/gfx/fx/013.2bpp
+++ /dev/null
diff --git a/gfx/fx/lz/013.lz b/gfx/fx/013.lz
index b8b8c1c0b..b8b8c1c0b 100644
--- a/gfx/fx/lz/013.lz
+++ b/gfx/fx/013.lz
diff --git a/gfx/fx/014.2bpp b/gfx/fx/014.2bpp
deleted file mode 100644
index d86e291b7..000000000
--- a/gfx/fx/014.2bpp
+++ /dev/null
diff --git a/gfx/fx/lz/014.lz b/gfx/fx/014.lz
index 877c1ffd6..877c1ffd6 100644
--- a/gfx/fx/lz/014.lz
+++ b/gfx/fx/014.lz
diff --git a/gfx/fx/015.2bpp b/gfx/fx/015.2bpp
deleted file mode 100644
index d6b89e5c3..000000000
--- a/gfx/fx/015.2bpp
+++ /dev/null
diff --git a/gfx/fx/lz/015.lz b/gfx/fx/015.lz
index 50deefe19..50deefe19 100644
--- a/gfx/fx/lz/015.lz
+++ b/gfx/fx/015.lz
diff --git a/gfx/fx/016.2bpp b/gfx/fx/016.2bpp
deleted file mode 100644
index 1a895b057..000000000
--- a/gfx/fx/016.2bpp
+++ /dev/null
diff --git a/gfx/fx/lz/016.lz b/gfx/fx/016.lz
index a04b7f0e5..a04b7f0e5 100644
--- a/gfx/fx/lz/016.lz
+++ b/gfx/fx/016.lz
diff --git a/gfx/fx/017.2bpp b/gfx/fx/017.2bpp
deleted file mode 100644
index 1a2b886d3..000000000
--- a/gfx/fx/017.2bpp
+++ /dev/null
diff --git a/gfx/fx/lz/017.lz b/gfx/fx/017.lz
index d1771567d..d1771567d 100644
--- a/gfx/fx/lz/017.lz
+++ b/gfx/fx/017.lz
diff --git a/gfx/fx/018.2bpp b/gfx/fx/018.2bpp
deleted file mode 100644
index 43d338135..000000000
--- a/gfx/fx/018.2bpp
+++ /dev/null
diff --git a/gfx/fx/lz/018.lz b/gfx/fx/018.lz
index 65cf5d34d..65cf5d34d 100644
--- a/gfx/fx/lz/018.lz
+++ b/gfx/fx/018.lz
diff --git a/gfx/fx/019.2bpp b/gfx/fx/019.2bpp
deleted file mode 100644
index 21124992f..000000000
--- a/gfx/fx/019.2bpp
+++ /dev/null
diff --git a/gfx/fx/lz/019.lz b/gfx/fx/019.lz
index 28d733cac..28d733cac 100644
--- a/gfx/fx/lz/019.lz
+++ b/gfx/fx/019.lz
diff --git a/gfx/fx/020.2bpp b/gfx/fx/020.2bpp
deleted file mode 100644
index 5096e9326..000000000
--- a/gfx/fx/020.2bpp
+++ /dev/null
diff --git a/gfx/fx/lz/020.lz b/gfx/fx/020.lz
index 6093cbeb5..6093cbeb5 100644
--- a/gfx/fx/lz/020.lz
+++ b/gfx/fx/020.lz
diff --git a/gfx/fx/021.2bpp b/gfx/fx/021.2bpp
deleted file mode 100644
index 37382633c..000000000
--- a/gfx/fx/021.2bpp
+++ /dev/null
diff --git a/gfx/fx/lz/021.lz b/gfx/fx/021.lz
index 5bb06c6f5..5bb06c6f5 100644
--- a/gfx/fx/lz/021.lz
+++ b/gfx/fx/021.lz
diff --git a/gfx/fx/022.2bpp b/gfx/fx/022.2bpp
deleted file mode 100644
index 137dba7a5..000000000
--- a/gfx/fx/022.2bpp
+++ /dev/null
diff --git a/gfx/fx/lz/022.lz b/gfx/fx/022.lz
index c54453263..c54453263 100644
--- a/gfx/fx/lz/022.lz
+++ b/gfx/fx/022.lz
diff --git a/gfx/fx/023.2bpp b/gfx/fx/023.2bpp
deleted file mode 100644
index cf0653bca..000000000
--- a/gfx/fx/023.2bpp
+++ /dev/null
diff --git a/gfx/fx/lz/023.lz b/gfx/fx/023.lz
index 6ce94f0e2..6ce94f0e2 100644
--- a/gfx/fx/lz/023.lz
+++ b/gfx/fx/023.lz
diff --git a/gfx/fx/024.2bpp b/gfx/fx/024.2bpp
deleted file mode 100644
index cee634311..000000000
--- a/gfx/fx/024.2bpp
+++ /dev/null
diff --git a/gfx/fx/lz/024.lz b/gfx/fx/024.lz
index 890303edb..890303edb 100644
--- a/gfx/fx/lz/024.lz
+++ b/gfx/fx/024.lz
diff --git a/gfx/fx/025.2bpp b/gfx/fx/025.2bpp
deleted file mode 100644
index b8878b4a0..000000000
--- a/gfx/fx/025.2bpp
+++ /dev/null
diff --git a/gfx/fx/lz/025.lz b/gfx/fx/025.lz
index 0274acb7a..0274acb7a 100644
--- a/gfx/fx/lz/025.lz
+++ b/gfx/fx/025.lz
diff --git a/gfx/fx/026.2bpp b/gfx/fx/026.2bpp
deleted file mode 100644
index fc991bfba..000000000
--- a/gfx/fx/026.2bpp
+++ /dev/null
diff --git a/gfx/fx/lz/026.lz b/gfx/fx/026.lz
index 8052d1717..8052d1717 100644
--- a/gfx/fx/lz/026.lz
+++ b/gfx/fx/026.lz
diff --git a/gfx/fx/027.2bpp b/gfx/fx/027.2bpp
deleted file mode 100644
index 439c2d01e..000000000
--- a/gfx/fx/027.2bpp
+++ /dev/null
diff --git a/gfx/fx/lz/027.lz b/gfx/fx/027.lz
index 67fe88b78..67fe88b78 100644
--- a/gfx/fx/lz/027.lz
+++ b/gfx/fx/027.lz
diff --git a/gfx/fx/028.2bpp b/gfx/fx/028.2bpp
deleted file mode 100644
index 8b1808108..000000000
--- a/gfx/fx/028.2bpp
+++ /dev/null
diff --git a/gfx/fx/lz/028.lz b/gfx/fx/028.lz
index 006ada64a..006ada64a 100644
--- a/gfx/fx/lz/028.lz
+++ b/gfx/fx/028.lz
diff --git a/gfx/fx/029.2bpp b/gfx/fx/029.2bpp
deleted file mode 100644
index 98a91d85f..000000000
--- a/gfx/fx/029.2bpp
+++ /dev/null
diff --git a/gfx/fx/lz/029.lz b/gfx/fx/029.lz
index 88dc33c3c..88dc33c3c 100644
--- a/gfx/fx/lz/029.lz
+++ b/gfx/fx/029.lz
diff --git a/gfx/fx/030.2bpp b/gfx/fx/030.2bpp
deleted file mode 100644
index 6aa8a2c57..000000000
--- a/gfx/fx/030.2bpp
+++ /dev/null
diff --git a/gfx/fx/lz/030.lz b/gfx/fx/030.lz
index 0494eef74..0494eef74 100644
--- a/gfx/fx/lz/030.lz
+++ b/gfx/fx/030.lz
diff --git a/gfx/fx/031.2bpp b/gfx/fx/031.2bpp
deleted file mode 100644
index e95740f6e..000000000
--- a/gfx/fx/031.2bpp
+++ /dev/null
diff --git a/gfx/fx/lz/031.lz b/gfx/fx/031.lz
index 88752e23f..88752e23f 100644
--- a/gfx/fx/lz/031.lz
+++ b/gfx/fx/031.lz
diff --git a/gfx/fx/032.2bpp b/gfx/fx/032.2bpp
deleted file mode 100644
index 2e57f99e8..000000000
--- a/gfx/fx/032.2bpp
+++ /dev/null
diff --git a/gfx/fx/lz/032.lz b/gfx/fx/032.lz
index d11ceb277..d11ceb277 100644
--- a/gfx/fx/lz/032.lz
+++ b/gfx/fx/032.lz
diff --git a/gfx/fx/033.2bpp b/gfx/fx/033.2bpp
deleted file mode 100644
index a279ba542..000000000
--- a/gfx/fx/033.2bpp
+++ /dev/null
diff --git a/gfx/fx/lz/033.lz b/gfx/fx/033.lz
index a0cc350f7..a0cc350f7 100644
--- a/gfx/fx/lz/033.lz
+++ b/gfx/fx/033.lz
diff --git a/gfx/fx/034.2bpp b/gfx/fx/034.2bpp
deleted file mode 100644
index 858b21209..000000000
--- a/gfx/fx/034.2bpp
+++ /dev/null
diff --git a/gfx/fx/lz/034.lz b/gfx/fx/034.lz
index 58b30a0e1..58b30a0e1 100644
--- a/gfx/fx/lz/034.lz
+++ b/gfx/fx/034.lz
diff --git a/gfx/fx/035.2bpp b/gfx/fx/035.2bpp
deleted file mode 100644
index 956202541..000000000
--- a/gfx/fx/035.2bpp
+++ /dev/null
diff --git a/gfx/fx/lz/035.lz b/gfx/fx/035.lz
index 9b1adb23d..9b1adb23d 100644
--- a/gfx/fx/lz/035.lz
+++ b/gfx/fx/035.lz
diff --git a/gfx/fx/036.2bpp b/gfx/fx/036.2bpp
deleted file mode 100644
index a09807f01..000000000
--- a/gfx/fx/036.2bpp
+++ /dev/null
diff --git a/gfx/fx/lz/036.lz b/gfx/fx/036.lz
index 66eb67572..66eb67572 100644
--- a/gfx/fx/lz/036.lz
+++ b/gfx/fx/036.lz
diff --git a/gfx/fx/037.2bpp b/gfx/fx/037.2bpp
deleted file mode 100644
index e8893f9b9..000000000
--- a/gfx/fx/037.2bpp
+++ /dev/null
diff --git a/gfx/fx/lz/037.lz b/gfx/fx/037.lz
index 3d2da8e1f..3d2da8e1f 100644
--- a/gfx/fx/lz/037.lz
+++ b/gfx/fx/037.lz
diff --git a/gfx/fx/038.2bpp b/gfx/fx/038.2bpp
deleted file mode 100644
index e8eb076f4..000000000
--- a/gfx/fx/038.2bpp
+++ /dev/null
diff --git a/gfx/fx/lz/038.lz b/gfx/fx/038.lz
index ef37872c6..ef37872c6 100644
--- a/gfx/fx/lz/038.lz
+++ b/gfx/fx/038.lz
diff --git a/gfx/fx/039.2bpp b/gfx/fx/039.2bpp
deleted file mode 100644
index b79447135..000000000
--- a/gfx/fx/039.2bpp
+++ /dev/null
diff --git a/gfx/fx/lz/039.lz b/gfx/fx/039.lz
index b1c4c6a1c..b1c4c6a1c 100644
--- a/gfx/fx/lz/039.lz
+++ b/gfx/fx/039.lz
diff --git a/gfx/intro/001.2bpp b/gfx/intro/001.2bpp
deleted file mode 100644
index 8b1b66033..000000000
--- a/gfx/intro/001.2bpp
+++ /dev/null
diff --git a/gfx/intro/lz/001.lz b/gfx/intro/001.lz
index 467aa27c1..467aa27c1 100644
--- a/gfx/intro/lz/001.lz
+++ b/gfx/intro/001.lz
diff --git a/gfx/intro/002.2bpp b/gfx/intro/002.2bpp
deleted file mode 100644
index 6a035d14a..000000000
--- a/gfx/intro/002.2bpp
+++ /dev/null
diff --git a/gfx/intro/lz/002.lz b/gfx/intro/002.lz
index 1f460c26d..1f460c26d 100644
--- a/gfx/intro/lz/002.lz
+++ b/gfx/intro/002.lz
diff --git a/gfx/intro/003.2bpp b/gfx/intro/003.2bpp
deleted file mode 100644
index 98512513c..000000000
--- a/gfx/intro/003.2bpp
+++ /dev/null
diff --git a/gfx/intro/lz/003.lz b/gfx/intro/003.lz
index 30ef28817..30ef28817 100644
--- a/gfx/intro/lz/003.lz
+++ b/gfx/intro/003.lz
diff --git a/gfx/intro/004.2bpp b/gfx/intro/004.2bpp
deleted file mode 100644
index 2dd6b6ea7..000000000
--- a/gfx/intro/004.2bpp
+++ /dev/null
diff --git a/gfx/intro/lz/004.lz b/gfx/intro/004.lz
index dda9d45a4..dda9d45a4 100644
--- a/gfx/intro/lz/004.lz
+++ b/gfx/intro/004.lz
diff --git a/gfx/intro/005.2bpp b/gfx/intro/005.2bpp
deleted file mode 100644
index 3f7d23b64..000000000
--- a/gfx/intro/005.2bpp
+++ /dev/null
diff --git a/gfx/intro/lz/005.lz b/gfx/intro/005.lz
index aabd0661e..aabd0661e 100644
--- a/gfx/intro/lz/005.lz
+++ b/gfx/intro/005.lz
diff --git a/gfx/intro/006.2bpp b/gfx/intro/006.2bpp
deleted file mode 100644
index 4af27a158..000000000
--- a/gfx/intro/006.2bpp
+++ /dev/null
diff --git a/gfx/intro/lz/006.lz b/gfx/intro/006.lz
index b9de6c532..b9de6c532 100644
--- a/gfx/intro/lz/006.lz
+++ b/gfx/intro/006.lz
diff --git a/gfx/intro/007.2bpp b/gfx/intro/007.2bpp
deleted file mode 100644
index 2e3fdb41a..000000000
--- a/gfx/intro/007.2bpp
+++ /dev/null
diff --git a/gfx/intro/lz/007.lz b/gfx/intro/007.lz
index d1974ec77..d1974ec77 100644
--- a/gfx/intro/lz/007.lz
+++ b/gfx/intro/007.lz
diff --git a/gfx/intro/008.2bpp b/gfx/intro/008.2bpp
deleted file mode 100644
index 903f59ae5..000000000
--- a/gfx/intro/008.2bpp
+++ /dev/null
diff --git a/gfx/intro/lz/008.lz b/gfx/intro/008.lz
index ffd675a6d..ffd675a6d 100644
--- a/gfx/intro/lz/008.lz
+++ b/gfx/intro/008.lz
diff --git a/gfx/intro/009.2bpp b/gfx/intro/009.2bpp
deleted file mode 100644
index 554e919a8..000000000
--- a/gfx/intro/009.2bpp
+++ /dev/null
diff --git a/gfx/intro/lz/009.lz b/gfx/intro/009.lz
index f419a8924..f419a8924 100644
--- a/gfx/intro/lz/009.lz
+++ b/gfx/intro/009.lz
diff --git a/gfx/intro/010.2bpp b/gfx/intro/010.2bpp
deleted file mode 100644
index 4ddef19c7..000000000
--- a/gfx/intro/010.2bpp
+++ /dev/null
diff --git a/gfx/intro/lz/010.lz b/gfx/intro/010.lz
index fb2c453d0..fb2c453d0 100644
--- a/gfx/intro/lz/010.lz
+++ b/gfx/intro/010.lz
diff --git a/gfx/intro/011.2bpp b/gfx/intro/011.2bpp
deleted file mode 100644
index 59f365a34..000000000
--- a/gfx/intro/011.2bpp
+++ /dev/null
diff --git a/gfx/intro/lz/011.lz b/gfx/intro/011.lz
index e565424a1..e565424a1 100644
--- a/gfx/intro/lz/011.lz
+++ b/gfx/intro/011.lz
diff --git a/gfx/intro/012.2bpp b/gfx/intro/012.2bpp
deleted file mode 100644
index 3577fc467..000000000
--- a/gfx/intro/012.2bpp
+++ /dev/null
diff --git a/gfx/intro/lz/012.lz b/gfx/intro/012.lz
index 4c35460fc..4c35460fc 100644
--- a/gfx/intro/lz/012.lz
+++ b/gfx/intro/012.lz
diff --git a/gfx/intro/013.2bpp b/gfx/intro/013.2bpp
deleted file mode 100644
index 28e27ad62..000000000
--- a/gfx/intro/013.2bpp
+++ /dev/null
diff --git a/gfx/intro/lz/013.lz b/gfx/intro/013.lz
index 0887b9a14..0887b9a14 100644
--- a/gfx/intro/lz/013.lz
+++ b/gfx/intro/013.lz
diff --git a/gfx/intro/014.2bpp b/gfx/intro/014.2bpp
deleted file mode 100644
index 52829cc74..000000000
--- a/gfx/intro/014.2bpp
+++ /dev/null
diff --git a/gfx/intro/lz/014.lz b/gfx/intro/014.lz
index 8ec565388..8ec565388 100644
--- a/gfx/intro/lz/014.lz
+++ b/gfx/intro/014.lz
diff --git a/gfx/intro/015.2bpp b/gfx/intro/015.2bpp
deleted file mode 100644
index f97c9cb93..000000000
--- a/gfx/intro/015.2bpp
+++ /dev/null
diff --git a/gfx/intro/lz/015.lz b/gfx/intro/015.lz
index 3fc339a46..3fc339a46 100644
--- a/gfx/intro/lz/015.lz
+++ b/gfx/intro/015.lz
diff --git a/gfx/intro/017.2bpp b/gfx/intro/017.2bpp
deleted file mode 100644
index 05c37dbf2..000000000
--- a/gfx/intro/017.2bpp
+++ /dev/null
diff --git a/gfx/intro/lz/017.lz b/gfx/intro/017.lz
index 335d39558..335d39558 100644
--- a/gfx/intro/lz/017.lz
+++ b/gfx/intro/017.lz
diff --git a/gfx/intro/background.2bpp b/gfx/intro/background.2bpp
deleted file mode 100644
index 4d52b49e0..000000000
--- a/gfx/intro/background.2bpp
+++ /dev/null
diff --git a/gfx/intro/lz/background.lz b/gfx/intro/background.lz
index 7d3fc52f7..7d3fc52f7 100644
--- a/gfx/intro/lz/background.lz
+++ b/gfx/intro/background.lz
diff --git a/gfx/intro/crystal_unowns.2bpp b/gfx/intro/crystal_unowns.2bpp
deleted file mode 100644
index d35cb2c4a..000000000
--- a/gfx/intro/crystal_unowns.2bpp
+++ /dev/null
diff --git a/gfx/intro/lz/crystal_unowns.lz b/gfx/intro/crystal_unowns.lz
index bee906290..bee906290 100644
--- a/gfx/intro/lz/crystal_unowns.lz
+++ b/gfx/intro/crystal_unowns.lz
diff --git a/gfx/intro/logo.2bpp b/gfx/intro/logo.2bpp
deleted file mode 100644
index 6c6f334d4..000000000
--- a/gfx/intro/logo.2bpp
+++ /dev/null
diff --git a/gfx/intro/lz/logo.lz b/gfx/intro/logo.lz
index bd93412c0..bd93412c0 100644
--- a/gfx/intro/lz/logo.lz
+++ b/gfx/intro/logo.lz
diff --git a/gfx/intro/pichu_wooper.2bpp b/gfx/intro/pichu_wooper.2bpp
deleted file mode 100644
index 858cc5271..000000000
--- a/gfx/intro/pichu_wooper.2bpp
+++ /dev/null
diff --git a/gfx/intro/lz/pichu_wooper.lz b/gfx/intro/pichu_wooper.lz
index c2a325bb7..c2a325bb7 100644
--- a/gfx/intro/lz/pichu_wooper.lz
+++ b/gfx/intro/pichu_wooper.lz
diff --git a/gfx/intro/pulse.2bpp b/gfx/intro/pulse.2bpp
deleted file mode 100644
index cf6c0dd79..000000000
--- a/gfx/intro/pulse.2bpp
+++ /dev/null
diff --git a/gfx/intro/lz/pulse.lz b/gfx/intro/pulse.lz
index 3ce37c136..3ce37c136 100644
--- a/gfx/intro/lz/pulse.lz
+++ b/gfx/intro/pulse.lz
diff --git a/gfx/intro/suicune_back.2bpp b/gfx/intro/suicune_back.2bpp
deleted file mode 100644
index 600af6e79..000000000
--- a/gfx/intro/suicune_back.2bpp
+++ /dev/null
diff --git a/gfx/intro/lz/suicune_back.lz b/gfx/intro/suicune_back.lz
index 4d13fdc4b..4d13fdc4b 100644
--- a/gfx/intro/lz/suicune_back.lz
+++ b/gfx/intro/suicune_back.lz
diff --git a/gfx/intro/suicune_close.2bpp b/gfx/intro/suicune_close.2bpp
deleted file mode 100644
index 3af7634be..000000000
--- a/gfx/intro/suicune_close.2bpp
+++ /dev/null
diff --git a/gfx/intro/lz/suicune_close.lz b/gfx/intro/suicune_close.lz
index c3b0d30b7..c3b0d30b7 100644
--- a/gfx/intro/lz/suicune_close.lz
+++ b/gfx/intro/suicune_close.lz
diff --git a/gfx/intro/suicune_jump.2bpp b/gfx/intro/suicune_jump.2bpp
deleted file mode 100644
index 8359e3b2e..000000000
--- a/gfx/intro/suicune_jump.2bpp
+++ /dev/null
diff --git a/gfx/intro/lz/suicune_jump.lz b/gfx/intro/suicune_jump.lz
index 9c55bccd0..9c55bccd0 100644
--- a/gfx/intro/lz/suicune_jump.lz
+++ b/gfx/intro/suicune_jump.lz
diff --git a/gfx/intro/suicune_run.2bpp b/gfx/intro/suicune_run.2bpp
deleted file mode 100644
index fa90c46c8..000000000
--- a/gfx/intro/suicune_run.2bpp
+++ /dev/null
diff --git a/gfx/intro/lz/suicune_run.lz b/gfx/intro/suicune_run.lz
index 977e01230..977e01230 100644
--- a/gfx/intro/lz/suicune_run.lz
+++ b/gfx/intro/suicune_run.lz
diff --git a/gfx/intro/unown_back.2bpp b/gfx/intro/unown_back.2bpp
deleted file mode 100644
index 01aa2901b..000000000
--- a/gfx/intro/unown_back.2bpp
+++ /dev/null
diff --git a/gfx/intro/lz/unown_back.lz b/gfx/intro/unown_back.lz
index a1c49ed3a..a1c49ed3a 100644
--- a/gfx/intro/lz/unown_back.lz
+++ b/gfx/intro/unown_back.lz
diff --git a/gfx/intro/unowns.2bpp b/gfx/intro/unowns.2bpp
deleted file mode 100644
index 3e2cb769f..000000000
--- a/gfx/intro/unowns.2bpp
+++ /dev/null
diff --git a/gfx/intro/lz/unowns.lz b/gfx/intro/unowns.lz
index 882af3b34..882af3b34 100644
--- a/gfx/intro/lz/unowns.lz
+++ b/gfx/intro/unowns.lz
diff --git a/gfx/misc/dude.2bpp b/gfx/misc/dude.2bpp
deleted file mode 100644
index 9761df01a..000000000
--- a/gfx/misc/dude.2bpp
+++ /dev/null
diff --git a/gfx/misc/lz/dude.lz b/gfx/misc/dude.lz
index 2e9a6ca01..0c9523d2b 100644
--- a/gfx/misc/lz/dude.lz
+++ b/gfx/misc/dude.lz
diff --git a/gfx/misc/lz/pokegear_sprites.lz b/gfx/misc/lz/pokegear_sprites.lz
deleted file mode 100644
index 30d7e176a..000000000
--- a/gfx/misc/lz/pokegear_sprites.lz
+++ /dev/null
diff --git a/gfx/misc/player.2bpp b/gfx/misc/player.2bpp
deleted file mode 100644
index e055234df..000000000
--- a/gfx/misc/player.2bpp
+++ /dev/null
diff --git a/gfx/misc/lz/player.lz b/gfx/misc/player.lz
index c1a832556..4727323a6 100644
--- a/gfx/misc/lz/player.lz
+++ b/gfx/misc/player.lz
diff --git a/gfx/misc/pokegear.2bpp b/gfx/misc/pokegear.2bpp
deleted file mode 100644
index 6b605f9c9..000000000
--- a/gfx/misc/pokegear.2bpp
+++ /dev/null
diff --git a/gfx/misc/lz/pokegear.lz b/gfx/misc/pokegear.lz
index 64ba93c04..9db046141 100644
--- a/gfx/misc/lz/pokegear.lz
+++ b/gfx/misc/pokegear.lz
diff --git a/gfx/misc/pokegear_sprites.2bpp b/gfx/misc/pokegear_sprites.2bpp
deleted file mode 100644
index 5bc612c7b..000000000
--- a/gfx/misc/pokegear_sprites.2bpp
+++ /dev/null
diff --git a/gfx/misc/pokegear_sprites.lz b/gfx/misc/pokegear_sprites.lz
new file mode 100644
index 000000000..e64a385be
--- /dev/null
+++ b/gfx/misc/pokegear_sprites.lz
diff --git a/gfx/misc/town_map.2bpp b/gfx/misc/town_map.2bpp
deleted file mode 100644
index d0c2a72d9..000000000
--- a/gfx/misc/town_map.2bpp
+++ /dev/null
diff --git a/gfx/misc/lz/town_map.lz b/gfx/misc/town_map.lz
index 19562271e..1ca2ac243 100644
--- a/gfx/misc/lz/town_map.lz
+++ b/gfx/misc/town_map.lz
diff --git a/gfx/pics/001/back.2bpp b/gfx/pics/001/back.2bpp
deleted file mode 100644
index 0bf1a4a8d..000000000
--- a/gfx/pics/001/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/001/front.2bpp b/gfx/pics/001/front.2bpp
deleted file mode 100644
index e3f041d6a..000000000
--- a/gfx/pics/001/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/001/tiles.2bpp b/gfx/pics/001/tiles.2bpp
deleted file mode 100644
index 3ff342f4a..000000000
--- a/gfx/pics/001/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/002/back.2bpp b/gfx/pics/002/back.2bpp
deleted file mode 100644
index 760fb17b6..000000000
--- a/gfx/pics/002/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/002/front.2bpp b/gfx/pics/002/front.2bpp
deleted file mode 100644
index ac4ccaa8a..000000000
--- a/gfx/pics/002/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/002/tiles.2bpp b/gfx/pics/002/tiles.2bpp
deleted file mode 100644
index 05b7ecd8d..000000000
--- a/gfx/pics/002/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/003/back.2bpp b/gfx/pics/003/back.2bpp
deleted file mode 100644
index d61859283..000000000
--- a/gfx/pics/003/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/003/front.2bpp b/gfx/pics/003/front.2bpp
deleted file mode 100644
index 1e9b87406..000000000
--- a/gfx/pics/003/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/003/tiles.2bpp b/gfx/pics/003/tiles.2bpp
deleted file mode 100644
index 91d3eb5dc..000000000
--- a/gfx/pics/003/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/004/back.2bpp b/gfx/pics/004/back.2bpp
deleted file mode 100644
index e81903408..000000000
--- a/gfx/pics/004/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/004/front.2bpp b/gfx/pics/004/front.2bpp
deleted file mode 100644
index e49b93a5b..000000000
--- a/gfx/pics/004/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/004/tiles.2bpp b/gfx/pics/004/tiles.2bpp
deleted file mode 100644
index da329dff7..000000000
--- a/gfx/pics/004/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/005/back.2bpp b/gfx/pics/005/back.2bpp
deleted file mode 100644
index 3d3e1ef94..000000000
--- a/gfx/pics/005/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/005/front.2bpp b/gfx/pics/005/front.2bpp
deleted file mode 100644
index 7ad34dac4..000000000
--- a/gfx/pics/005/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/005/tiles.2bpp b/gfx/pics/005/tiles.2bpp
deleted file mode 100644
index 186526751..000000000
--- a/gfx/pics/005/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/006/back.2bpp b/gfx/pics/006/back.2bpp
deleted file mode 100644
index c1566a62f..000000000
--- a/gfx/pics/006/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/006/front.2bpp b/gfx/pics/006/front.2bpp
deleted file mode 100644
index ce2164b38..000000000
--- a/gfx/pics/006/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/006/tiles.2bpp b/gfx/pics/006/tiles.2bpp
deleted file mode 100644
index e968a5d23..000000000
--- a/gfx/pics/006/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/007/back.2bpp b/gfx/pics/007/back.2bpp
deleted file mode 100644
index 8a76364e4..000000000
--- a/gfx/pics/007/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/007/front.2bpp b/gfx/pics/007/front.2bpp
deleted file mode 100644
index 3e51473e8..000000000
--- a/gfx/pics/007/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/007/tiles.2bpp b/gfx/pics/007/tiles.2bpp
deleted file mode 100644
index 8c2d70e99..000000000
--- a/gfx/pics/007/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/008/back.2bpp b/gfx/pics/008/back.2bpp
deleted file mode 100644
index 234b2b74b..000000000
--- a/gfx/pics/008/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/008/front.2bpp b/gfx/pics/008/front.2bpp
deleted file mode 100644
index 9c3ea23ec..000000000
--- a/gfx/pics/008/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/008/tiles.2bpp b/gfx/pics/008/tiles.2bpp
deleted file mode 100644
index 3d771c0c8..000000000
--- a/gfx/pics/008/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/009/back.2bpp b/gfx/pics/009/back.2bpp
deleted file mode 100644
index bdc44804d..000000000
--- a/gfx/pics/009/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/009/front.2bpp b/gfx/pics/009/front.2bpp
deleted file mode 100644
index 74131548e..000000000
--- a/gfx/pics/009/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/009/tiles.2bpp b/gfx/pics/009/tiles.2bpp
deleted file mode 100644
index 2f70638e3..000000000
--- a/gfx/pics/009/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/010/back.2bpp b/gfx/pics/010/back.2bpp
deleted file mode 100644
index c4bb9e01d..000000000
--- a/gfx/pics/010/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/010/front.2bpp b/gfx/pics/010/front.2bpp
deleted file mode 100644
index 719bf0ec9..000000000
--- a/gfx/pics/010/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/010/tiles.2bpp b/gfx/pics/010/tiles.2bpp
deleted file mode 100644
index 79f966452..000000000
--- a/gfx/pics/010/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/011/back.2bpp b/gfx/pics/011/back.2bpp
deleted file mode 100644
index 35e667fab..000000000
--- a/gfx/pics/011/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/011/front.2bpp b/gfx/pics/011/front.2bpp
deleted file mode 100644
index 604b1a1d6..000000000
--- a/gfx/pics/011/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/011/tiles.2bpp b/gfx/pics/011/tiles.2bpp
deleted file mode 100644
index 7c989efc7..000000000
--- a/gfx/pics/011/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/012/back.2bpp b/gfx/pics/012/back.2bpp
deleted file mode 100644
index d1c7885b2..000000000
--- a/gfx/pics/012/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/012/front.2bpp b/gfx/pics/012/front.2bpp
deleted file mode 100644
index cfc758b7b..000000000
--- a/gfx/pics/012/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/012/tiles.2bpp b/gfx/pics/012/tiles.2bpp
deleted file mode 100644
index c806febab..000000000
--- a/gfx/pics/012/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/013/back.2bpp b/gfx/pics/013/back.2bpp
deleted file mode 100644
index 2fd33288d..000000000
--- a/gfx/pics/013/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/013/front.2bpp b/gfx/pics/013/front.2bpp
deleted file mode 100644
index 7bfef3690..000000000
--- a/gfx/pics/013/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/013/tiles.2bpp b/gfx/pics/013/tiles.2bpp
deleted file mode 100644
index 85290af00..000000000
--- a/gfx/pics/013/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/014/back.2bpp b/gfx/pics/014/back.2bpp
deleted file mode 100644
index f9a1affbe..000000000
--- a/gfx/pics/014/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/014/front.2bpp b/gfx/pics/014/front.2bpp
deleted file mode 100644
index 1a5c931a4..000000000
--- a/gfx/pics/014/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/014/tiles.2bpp b/gfx/pics/014/tiles.2bpp
deleted file mode 100644
index 623a84640..000000000
--- a/gfx/pics/014/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/015/back.2bpp b/gfx/pics/015/back.2bpp
deleted file mode 100644
index e90f3e1a6..000000000
--- a/gfx/pics/015/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/015/front.2bpp b/gfx/pics/015/front.2bpp
deleted file mode 100644
index 091316ee1..000000000
--- a/gfx/pics/015/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/015/tiles.2bpp b/gfx/pics/015/tiles.2bpp
deleted file mode 100644
index 3e7c800a2..000000000
--- a/gfx/pics/015/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/016/back.2bpp b/gfx/pics/016/back.2bpp
deleted file mode 100644
index aedd7533f..000000000
--- a/gfx/pics/016/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/016/front.2bpp b/gfx/pics/016/front.2bpp
deleted file mode 100644
index b907a14e2..000000000
--- a/gfx/pics/016/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/016/tiles.2bpp b/gfx/pics/016/tiles.2bpp
deleted file mode 100644
index d33089bc9..000000000
--- a/gfx/pics/016/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/017/back.2bpp b/gfx/pics/017/back.2bpp
deleted file mode 100644
index 805bde072..000000000
--- a/gfx/pics/017/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/017/front.2bpp b/gfx/pics/017/front.2bpp
deleted file mode 100644
index 416e06cae..000000000
--- a/gfx/pics/017/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/017/tiles.2bpp b/gfx/pics/017/tiles.2bpp
deleted file mode 100644
index 9e288ae80..000000000
--- a/gfx/pics/017/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/018/back.2bpp b/gfx/pics/018/back.2bpp
deleted file mode 100644
index 2fb54f922..000000000
--- a/gfx/pics/018/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/018/front.2bpp b/gfx/pics/018/front.2bpp
deleted file mode 100644
index c0933230f..000000000
--- a/gfx/pics/018/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/018/tiles.2bpp b/gfx/pics/018/tiles.2bpp
deleted file mode 100644
index 2ea1ecd50..000000000
--- a/gfx/pics/018/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/019/back.2bpp b/gfx/pics/019/back.2bpp
deleted file mode 100644
index 65270fe7b..000000000
--- a/gfx/pics/019/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/019/front.2bpp b/gfx/pics/019/front.2bpp
deleted file mode 100644
index baeea7dcb..000000000
--- a/gfx/pics/019/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/019/tiles.2bpp b/gfx/pics/019/tiles.2bpp
deleted file mode 100644
index ae3c8c22e..000000000
--- a/gfx/pics/019/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/020/back.2bpp b/gfx/pics/020/back.2bpp
deleted file mode 100644
index 402c244f5..000000000
--- a/gfx/pics/020/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/020/front.2bpp b/gfx/pics/020/front.2bpp
deleted file mode 100644
index 138a8ab1b..000000000
--- a/gfx/pics/020/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/020/tiles.2bpp b/gfx/pics/020/tiles.2bpp
deleted file mode 100644
index 905bc6454..000000000
--- a/gfx/pics/020/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/021/back.2bpp b/gfx/pics/021/back.2bpp
deleted file mode 100644
index 35627ae67..000000000
--- a/gfx/pics/021/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/021/front.2bpp b/gfx/pics/021/front.2bpp
deleted file mode 100644
index 276f28df6..000000000
--- a/gfx/pics/021/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/021/tiles.2bpp b/gfx/pics/021/tiles.2bpp
deleted file mode 100644
index 6dc4179c3..000000000
--- a/gfx/pics/021/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/022/back.2bpp b/gfx/pics/022/back.2bpp
deleted file mode 100644
index 774622d76..000000000
--- a/gfx/pics/022/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/022/front.2bpp b/gfx/pics/022/front.2bpp
deleted file mode 100644
index 3b160cba3..000000000
--- a/gfx/pics/022/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/022/tiles.2bpp b/gfx/pics/022/tiles.2bpp
deleted file mode 100644
index 41328a364..000000000
--- a/gfx/pics/022/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/023/back.2bpp b/gfx/pics/023/back.2bpp
deleted file mode 100644
index 4d34cd05d..000000000
--- a/gfx/pics/023/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/023/front.2bpp b/gfx/pics/023/front.2bpp
deleted file mode 100644
index 8fa5e7760..000000000
--- a/gfx/pics/023/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/023/tiles.2bpp b/gfx/pics/023/tiles.2bpp
deleted file mode 100644
index 60f983635..000000000
--- a/gfx/pics/023/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/024/back.2bpp b/gfx/pics/024/back.2bpp
deleted file mode 100644
index 5dbe6ebb1..000000000
--- a/gfx/pics/024/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/024/front.2bpp b/gfx/pics/024/front.2bpp
deleted file mode 100644
index 78abdf84d..000000000
--- a/gfx/pics/024/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/024/tiles.2bpp b/gfx/pics/024/tiles.2bpp
deleted file mode 100644
index 008ccb05a..000000000
--- a/gfx/pics/024/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/025/back.2bpp b/gfx/pics/025/back.2bpp
deleted file mode 100644
index 25a355674..000000000
--- a/gfx/pics/025/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/025/front.2bpp b/gfx/pics/025/front.2bpp
deleted file mode 100644
index bfe999d57..000000000
--- a/gfx/pics/025/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/025/tiles.2bpp b/gfx/pics/025/tiles.2bpp
deleted file mode 100644
index d6e1b5c38..000000000
--- a/gfx/pics/025/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/026/back.2bpp b/gfx/pics/026/back.2bpp
deleted file mode 100644
index 9793124bf..000000000
--- a/gfx/pics/026/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/026/front.2bpp b/gfx/pics/026/front.2bpp
deleted file mode 100644
index 4cbf70863..000000000
--- a/gfx/pics/026/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/026/tiles.2bpp b/gfx/pics/026/tiles.2bpp
deleted file mode 100644
index 67ea811f3..000000000
--- a/gfx/pics/026/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/027/back.2bpp b/gfx/pics/027/back.2bpp
deleted file mode 100644
index 4d2dd8b80..000000000
--- a/gfx/pics/027/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/027/front.2bpp b/gfx/pics/027/front.2bpp
deleted file mode 100644
index e5f094180..000000000
--- a/gfx/pics/027/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/027/tiles.2bpp b/gfx/pics/027/tiles.2bpp
deleted file mode 100644
index 5f40002ef..000000000
--- a/gfx/pics/027/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/028/back.2bpp b/gfx/pics/028/back.2bpp
deleted file mode 100644
index ea5d96787..000000000
--- a/gfx/pics/028/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/028/front.2bpp b/gfx/pics/028/front.2bpp
deleted file mode 100644
index 1c642706a..000000000
--- a/gfx/pics/028/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/028/tiles.2bpp b/gfx/pics/028/tiles.2bpp
deleted file mode 100644
index 20c994310..000000000
--- a/gfx/pics/028/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/029/back.2bpp b/gfx/pics/029/back.2bpp
deleted file mode 100644
index a22e2a054..000000000
--- a/gfx/pics/029/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/029/front.2bpp b/gfx/pics/029/front.2bpp
deleted file mode 100644
index f826c8ed9..000000000
--- a/gfx/pics/029/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/029/tiles.2bpp b/gfx/pics/029/tiles.2bpp
deleted file mode 100644
index 67188ed03..000000000
--- a/gfx/pics/029/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/030/back.2bpp b/gfx/pics/030/back.2bpp
deleted file mode 100644
index 5da41e15c..000000000
--- a/gfx/pics/030/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/030/front.2bpp b/gfx/pics/030/front.2bpp
deleted file mode 100644
index b525293f5..000000000
--- a/gfx/pics/030/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/030/tiles.2bpp b/gfx/pics/030/tiles.2bpp
deleted file mode 100644
index 8878242f3..000000000
--- a/gfx/pics/030/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/031/back.2bpp b/gfx/pics/031/back.2bpp
deleted file mode 100644
index 69c6abeeb..000000000
--- a/gfx/pics/031/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/031/front.2bpp b/gfx/pics/031/front.2bpp
deleted file mode 100644
index acafd1169..000000000
--- a/gfx/pics/031/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/031/tiles.2bpp b/gfx/pics/031/tiles.2bpp
deleted file mode 100644
index 90b130b80..000000000
--- a/gfx/pics/031/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/032/back.2bpp b/gfx/pics/032/back.2bpp
deleted file mode 100644
index 692937019..000000000
--- a/gfx/pics/032/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/032/front.2bpp b/gfx/pics/032/front.2bpp
deleted file mode 100644
index d06189661..000000000
--- a/gfx/pics/032/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/032/tiles.2bpp b/gfx/pics/032/tiles.2bpp
deleted file mode 100644
index e040f99bc..000000000
--- a/gfx/pics/032/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/033/back.2bpp b/gfx/pics/033/back.2bpp
deleted file mode 100644
index 352eb8ec3..000000000
--- a/gfx/pics/033/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/033/front.2bpp b/gfx/pics/033/front.2bpp
deleted file mode 100644
index 7d2359bf3..000000000
--- a/gfx/pics/033/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/033/tiles.2bpp b/gfx/pics/033/tiles.2bpp
deleted file mode 100644
index c4ec23093..000000000
--- a/gfx/pics/033/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/034/back.2bpp b/gfx/pics/034/back.2bpp
deleted file mode 100644
index 467063803..000000000
--- a/gfx/pics/034/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/034/front.2bpp b/gfx/pics/034/front.2bpp
deleted file mode 100644
index a89d69ae5..000000000
--- a/gfx/pics/034/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/034/tiles.2bpp b/gfx/pics/034/tiles.2bpp
deleted file mode 100644
index 2ffb2b7e7..000000000
--- a/gfx/pics/034/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/035/back.2bpp b/gfx/pics/035/back.2bpp
deleted file mode 100644
index 4d3a3451c..000000000
--- a/gfx/pics/035/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/035/front.2bpp b/gfx/pics/035/front.2bpp
deleted file mode 100644
index 50c08e3c6..000000000
--- a/gfx/pics/035/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/035/tiles.2bpp b/gfx/pics/035/tiles.2bpp
deleted file mode 100644
index 3eff0fda7..000000000
--- a/gfx/pics/035/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/036/back.2bpp b/gfx/pics/036/back.2bpp
deleted file mode 100644
index dc1790b59..000000000
--- a/gfx/pics/036/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/036/front.2bpp b/gfx/pics/036/front.2bpp
deleted file mode 100644
index 37667db2e..000000000
--- a/gfx/pics/036/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/036/tiles.2bpp b/gfx/pics/036/tiles.2bpp
deleted file mode 100644
index 2064cae82..000000000
--- a/gfx/pics/036/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/037/back.2bpp b/gfx/pics/037/back.2bpp
deleted file mode 100644
index 2a1747ed0..000000000
--- a/gfx/pics/037/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/037/front.2bpp b/gfx/pics/037/front.2bpp
deleted file mode 100644
index 8252c4778..000000000
--- a/gfx/pics/037/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/037/tiles.2bpp b/gfx/pics/037/tiles.2bpp
deleted file mode 100644
index 3386b378e..000000000
--- a/gfx/pics/037/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/038/back.2bpp b/gfx/pics/038/back.2bpp
deleted file mode 100644
index 351678a4a..000000000
--- a/gfx/pics/038/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/038/front.2bpp b/gfx/pics/038/front.2bpp
deleted file mode 100644
index f43497694..000000000
--- a/gfx/pics/038/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/038/tiles.2bpp b/gfx/pics/038/tiles.2bpp
deleted file mode 100644
index e1c510dd5..000000000
--- a/gfx/pics/038/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/039/back.2bpp b/gfx/pics/039/back.2bpp
deleted file mode 100644
index ffa43501b..000000000
--- a/gfx/pics/039/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/039/front.2bpp b/gfx/pics/039/front.2bpp
deleted file mode 100644
index cc92d80e5..000000000
--- a/gfx/pics/039/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/039/tiles.2bpp b/gfx/pics/039/tiles.2bpp
deleted file mode 100644
index 5c3a66bb2..000000000
--- a/gfx/pics/039/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/040/back.2bpp b/gfx/pics/040/back.2bpp
deleted file mode 100644
index 31dfbee96..000000000
--- a/gfx/pics/040/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/040/front.2bpp b/gfx/pics/040/front.2bpp
deleted file mode 100644
index acec3480c..000000000
--- a/gfx/pics/040/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/040/tiles.2bpp b/gfx/pics/040/tiles.2bpp
deleted file mode 100644
index 511c5cc60..000000000
--- a/gfx/pics/040/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/041/back.2bpp b/gfx/pics/041/back.2bpp
deleted file mode 100644
index cd2d675d3..000000000
--- a/gfx/pics/041/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/041/front.2bpp b/gfx/pics/041/front.2bpp
deleted file mode 100644
index 4d2c6934b..000000000
--- a/gfx/pics/041/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/041/tiles.2bpp b/gfx/pics/041/tiles.2bpp
deleted file mode 100644
index 115cc532c..000000000
--- a/gfx/pics/041/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/042/back.2bpp b/gfx/pics/042/back.2bpp
deleted file mode 100644
index 4e80059c9..000000000
--- a/gfx/pics/042/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/042/front.2bpp b/gfx/pics/042/front.2bpp
deleted file mode 100644
index 7cf220bf9..000000000
--- a/gfx/pics/042/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/042/tiles.2bpp b/gfx/pics/042/tiles.2bpp
deleted file mode 100644
index 6b2324937..000000000
--- a/gfx/pics/042/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/043/back.2bpp b/gfx/pics/043/back.2bpp
deleted file mode 100644
index 186377c3e..000000000
--- a/gfx/pics/043/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/043/front.2bpp b/gfx/pics/043/front.2bpp
deleted file mode 100644
index 79c4f0075..000000000
--- a/gfx/pics/043/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/043/tiles.2bpp b/gfx/pics/043/tiles.2bpp
deleted file mode 100644
index 524e83e68..000000000
--- a/gfx/pics/043/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/044/back.2bpp b/gfx/pics/044/back.2bpp
deleted file mode 100644
index 259e1b2b0..000000000
--- a/gfx/pics/044/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/044/front.2bpp b/gfx/pics/044/front.2bpp
deleted file mode 100644
index e04b44802..000000000
--- a/gfx/pics/044/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/044/tiles.2bpp b/gfx/pics/044/tiles.2bpp
deleted file mode 100644
index d9814207f..000000000
--- a/gfx/pics/044/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/045/back.2bpp b/gfx/pics/045/back.2bpp
deleted file mode 100644
index 179559ba0..000000000
--- a/gfx/pics/045/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/045/front.2bpp b/gfx/pics/045/front.2bpp
deleted file mode 100644
index 953b5fc97..000000000
--- a/gfx/pics/045/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/045/tiles.2bpp b/gfx/pics/045/tiles.2bpp
deleted file mode 100644
index 8165dd906..000000000
--- a/gfx/pics/045/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/046/back.2bpp b/gfx/pics/046/back.2bpp
deleted file mode 100644
index f733270ba..000000000
--- a/gfx/pics/046/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/046/front.2bpp b/gfx/pics/046/front.2bpp
deleted file mode 100644
index 906e2c390..000000000
--- a/gfx/pics/046/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/046/tiles.2bpp b/gfx/pics/046/tiles.2bpp
deleted file mode 100644
index 172f8ca8e..000000000
--- a/gfx/pics/046/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/047/back.2bpp b/gfx/pics/047/back.2bpp
deleted file mode 100644
index 6ed60328d..000000000
--- a/gfx/pics/047/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/047/front.2bpp b/gfx/pics/047/front.2bpp
deleted file mode 100644
index 5cbd914b2..000000000
--- a/gfx/pics/047/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/047/tiles.2bpp b/gfx/pics/047/tiles.2bpp
deleted file mode 100644
index 0afd4cc0a..000000000
--- a/gfx/pics/047/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/048/back.2bpp b/gfx/pics/048/back.2bpp
deleted file mode 100644
index 2e78df70b..000000000
--- a/gfx/pics/048/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/048/front.2bpp b/gfx/pics/048/front.2bpp
deleted file mode 100644
index 94b408e7a..000000000
--- a/gfx/pics/048/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/048/tiles.2bpp b/gfx/pics/048/tiles.2bpp
deleted file mode 100644
index d4e59eea9..000000000
--- a/gfx/pics/048/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/049/back.2bpp b/gfx/pics/049/back.2bpp
deleted file mode 100644
index 34a087280..000000000
--- a/gfx/pics/049/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/049/front.2bpp b/gfx/pics/049/front.2bpp
deleted file mode 100644
index 45f0e6dad..000000000
--- a/gfx/pics/049/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/049/tiles.2bpp b/gfx/pics/049/tiles.2bpp
deleted file mode 100644
index 2c64feb0c..000000000
--- a/gfx/pics/049/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/050/back.2bpp b/gfx/pics/050/back.2bpp
deleted file mode 100644
index d534a79dd..000000000
--- a/gfx/pics/050/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/050/front.2bpp b/gfx/pics/050/front.2bpp
deleted file mode 100644
index bbc88b821..000000000
--- a/gfx/pics/050/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/050/tiles.2bpp b/gfx/pics/050/tiles.2bpp
deleted file mode 100644
index 386de68d1..000000000
--- a/gfx/pics/050/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/051/back.2bpp b/gfx/pics/051/back.2bpp
deleted file mode 100644
index 4443c20ae..000000000
--- a/gfx/pics/051/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/051/front.2bpp b/gfx/pics/051/front.2bpp
deleted file mode 100644
index 156f05f2c..000000000
--- a/gfx/pics/051/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/051/tiles.2bpp b/gfx/pics/051/tiles.2bpp
deleted file mode 100644
index 4fa42e420..000000000
--- a/gfx/pics/051/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/052/back.2bpp b/gfx/pics/052/back.2bpp
deleted file mode 100644
index 319e6f576..000000000
--- a/gfx/pics/052/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/052/front.2bpp b/gfx/pics/052/front.2bpp
deleted file mode 100644
index 607be2d70..000000000
--- a/gfx/pics/052/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/052/tiles.2bpp b/gfx/pics/052/tiles.2bpp
deleted file mode 100644
index 0606f5da3..000000000
--- a/gfx/pics/052/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/053/back.2bpp b/gfx/pics/053/back.2bpp
deleted file mode 100644
index 1c715ac63..000000000
--- a/gfx/pics/053/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/053/front.2bpp b/gfx/pics/053/front.2bpp
deleted file mode 100644
index 253b633e4..000000000
--- a/gfx/pics/053/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/053/tiles.2bpp b/gfx/pics/053/tiles.2bpp
deleted file mode 100644
index 67ca309a5..000000000
--- a/gfx/pics/053/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/054/back.2bpp b/gfx/pics/054/back.2bpp
deleted file mode 100644
index 6c356437e..000000000
--- a/gfx/pics/054/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/054/front.2bpp b/gfx/pics/054/front.2bpp
deleted file mode 100644
index 4fb1a6b4b..000000000
--- a/gfx/pics/054/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/054/tiles.2bpp b/gfx/pics/054/tiles.2bpp
deleted file mode 100644
index e03cb4bc5..000000000
--- a/gfx/pics/054/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/055/back.2bpp b/gfx/pics/055/back.2bpp
deleted file mode 100644
index 9d01675ff..000000000
--- a/gfx/pics/055/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/055/front.2bpp b/gfx/pics/055/front.2bpp
deleted file mode 100644
index f3b0566ac..000000000
--- a/gfx/pics/055/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/055/tiles.2bpp b/gfx/pics/055/tiles.2bpp
deleted file mode 100644
index 1ff6e7dd4..000000000
--- a/gfx/pics/055/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/056/back.2bpp b/gfx/pics/056/back.2bpp
deleted file mode 100644
index affdeffdf..000000000
--- a/gfx/pics/056/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/056/front.2bpp b/gfx/pics/056/front.2bpp
deleted file mode 100644
index 378ba8e78..000000000
--- a/gfx/pics/056/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/056/tiles.2bpp b/gfx/pics/056/tiles.2bpp
deleted file mode 100644
index 982c6381e..000000000
--- a/gfx/pics/056/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/057/back.2bpp b/gfx/pics/057/back.2bpp
deleted file mode 100644
index c2519fd57..000000000
--- a/gfx/pics/057/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/057/front.2bpp b/gfx/pics/057/front.2bpp
deleted file mode 100644
index 3db044d66..000000000
--- a/gfx/pics/057/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/057/tiles.2bpp b/gfx/pics/057/tiles.2bpp
deleted file mode 100644
index 458e913e2..000000000
--- a/gfx/pics/057/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/058/back.2bpp b/gfx/pics/058/back.2bpp
deleted file mode 100644
index 78d5e4e1d..000000000
--- a/gfx/pics/058/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/058/front.2bpp b/gfx/pics/058/front.2bpp
deleted file mode 100644
index f10db0e9f..000000000
--- a/gfx/pics/058/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/058/tiles.2bpp b/gfx/pics/058/tiles.2bpp
deleted file mode 100644
index 475b87a04..000000000
--- a/gfx/pics/058/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/059/back.2bpp b/gfx/pics/059/back.2bpp
deleted file mode 100644
index 9a0a1f7d9..000000000
--- a/gfx/pics/059/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/059/front.2bpp b/gfx/pics/059/front.2bpp
deleted file mode 100644
index ade1c9ae4..000000000
--- a/gfx/pics/059/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/059/tiles.2bpp b/gfx/pics/059/tiles.2bpp
deleted file mode 100644
index 415b78a69..000000000
--- a/gfx/pics/059/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/060/back.2bpp b/gfx/pics/060/back.2bpp
deleted file mode 100644
index f29dfe8f3..000000000
--- a/gfx/pics/060/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/060/front.2bpp b/gfx/pics/060/front.2bpp
deleted file mode 100644
index fccab7aca..000000000
--- a/gfx/pics/060/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/060/tiles.2bpp b/gfx/pics/060/tiles.2bpp
deleted file mode 100644
index 51e9e2dfd..000000000
--- a/gfx/pics/060/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/061/back.2bpp b/gfx/pics/061/back.2bpp
deleted file mode 100644
index 097812d26..000000000
--- a/gfx/pics/061/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/061/front.2bpp b/gfx/pics/061/front.2bpp
deleted file mode 100644
index a068bb759..000000000
--- a/gfx/pics/061/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/061/tiles.2bpp b/gfx/pics/061/tiles.2bpp
deleted file mode 100644
index a63f227c4..000000000
--- a/gfx/pics/061/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/062/back.2bpp b/gfx/pics/062/back.2bpp
deleted file mode 100644
index fb0fb1cd5..000000000
--- a/gfx/pics/062/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/062/front.2bpp b/gfx/pics/062/front.2bpp
deleted file mode 100644
index e0c9c79e2..000000000
--- a/gfx/pics/062/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/062/tiles.2bpp b/gfx/pics/062/tiles.2bpp
deleted file mode 100644
index fbc8b58f7..000000000
--- a/gfx/pics/062/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/063/back.2bpp b/gfx/pics/063/back.2bpp
deleted file mode 100644
index 082319326..000000000
--- a/gfx/pics/063/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/063/front.2bpp b/gfx/pics/063/front.2bpp
deleted file mode 100644
index 7b0feb539..000000000
--- a/gfx/pics/063/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/063/tiles.2bpp b/gfx/pics/063/tiles.2bpp
deleted file mode 100644
index 9af0de1ff..000000000
--- a/gfx/pics/063/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/064/back.2bpp b/gfx/pics/064/back.2bpp
deleted file mode 100644
index 129294f1e..000000000
--- a/gfx/pics/064/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/064/front.2bpp b/gfx/pics/064/front.2bpp
deleted file mode 100644
index 25bdb7bed..000000000
--- a/gfx/pics/064/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/064/tiles.2bpp b/gfx/pics/064/tiles.2bpp
deleted file mode 100644
index 77c48c87f..000000000
--- a/gfx/pics/064/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/065/back.2bpp b/gfx/pics/065/back.2bpp
deleted file mode 100644
index b4f3ccf4c..000000000
--- a/gfx/pics/065/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/065/front.2bpp b/gfx/pics/065/front.2bpp
deleted file mode 100644
index 0ce216c12..000000000
--- a/gfx/pics/065/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/065/tiles.2bpp b/gfx/pics/065/tiles.2bpp
deleted file mode 100644
index 745eb54f6..000000000
--- a/gfx/pics/065/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/066/back.2bpp b/gfx/pics/066/back.2bpp
deleted file mode 100644
index f8ea2c523..000000000
--- a/gfx/pics/066/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/066/front.2bpp b/gfx/pics/066/front.2bpp
deleted file mode 100644
index 4e7ea5eff..000000000
--- a/gfx/pics/066/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/066/tiles.2bpp b/gfx/pics/066/tiles.2bpp
deleted file mode 100644
index ddcbafedf..000000000
--- a/gfx/pics/066/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/067/back.2bpp b/gfx/pics/067/back.2bpp
deleted file mode 100644
index 2c407d2f0..000000000
--- a/gfx/pics/067/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/067/front.2bpp b/gfx/pics/067/front.2bpp
deleted file mode 100644
index 9f28e4faa..000000000
--- a/gfx/pics/067/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/067/tiles.2bpp b/gfx/pics/067/tiles.2bpp
deleted file mode 100644
index d12ea1b4b..000000000
--- a/gfx/pics/067/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/068/back.2bpp b/gfx/pics/068/back.2bpp
deleted file mode 100644
index 0bd3c391a..000000000
--- a/gfx/pics/068/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/068/front.2bpp b/gfx/pics/068/front.2bpp
deleted file mode 100644
index ba6d57b67..000000000
--- a/gfx/pics/068/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/068/tiles.2bpp b/gfx/pics/068/tiles.2bpp
deleted file mode 100644
index be0d5bcf8..000000000
--- a/gfx/pics/068/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/069/back.2bpp b/gfx/pics/069/back.2bpp
deleted file mode 100644
index a9f701a81..000000000
--- a/gfx/pics/069/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/069/front.2bpp b/gfx/pics/069/front.2bpp
deleted file mode 100644
index 8fdd54db7..000000000
--- a/gfx/pics/069/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/069/tiles.2bpp b/gfx/pics/069/tiles.2bpp
deleted file mode 100644
index 7f1924e4c..000000000
--- a/gfx/pics/069/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/070/back.2bpp b/gfx/pics/070/back.2bpp
deleted file mode 100644
index 2ac2727fa..000000000
--- a/gfx/pics/070/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/070/front.2bpp b/gfx/pics/070/front.2bpp
deleted file mode 100644
index 2b4c02b35..000000000
--- a/gfx/pics/070/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/070/tiles.2bpp b/gfx/pics/070/tiles.2bpp
deleted file mode 100644
index 3dfba7fc1..000000000
--- a/gfx/pics/070/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/071/back.2bpp b/gfx/pics/071/back.2bpp
deleted file mode 100644
index 6a4efcaba..000000000
--- a/gfx/pics/071/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/071/front.2bpp b/gfx/pics/071/front.2bpp
deleted file mode 100644
index ef8959ce9..000000000
--- a/gfx/pics/071/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/071/tiles.2bpp b/gfx/pics/071/tiles.2bpp
deleted file mode 100644
index 31513f1fc..000000000
--- a/gfx/pics/071/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/072/back.2bpp b/gfx/pics/072/back.2bpp
deleted file mode 100644
index 47fce7d05..000000000
--- a/gfx/pics/072/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/072/front.2bpp b/gfx/pics/072/front.2bpp
deleted file mode 100644
index c0238414f..000000000
--- a/gfx/pics/072/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/072/tiles.2bpp b/gfx/pics/072/tiles.2bpp
deleted file mode 100644
index ffea471b9..000000000
--- a/gfx/pics/072/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/073/back.2bpp b/gfx/pics/073/back.2bpp
deleted file mode 100644
index bbc5df8b1..000000000
--- a/gfx/pics/073/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/073/front.2bpp b/gfx/pics/073/front.2bpp
deleted file mode 100644
index 86df2314f..000000000
--- a/gfx/pics/073/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/073/tiles.2bpp b/gfx/pics/073/tiles.2bpp
deleted file mode 100644
index feaddac76..000000000
--- a/gfx/pics/073/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/074/back.2bpp b/gfx/pics/074/back.2bpp
deleted file mode 100644
index 73d7c4bfb..000000000
--- a/gfx/pics/074/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/074/front.2bpp b/gfx/pics/074/front.2bpp
deleted file mode 100644
index 733dd420b..000000000
--- a/gfx/pics/074/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/074/tiles.2bpp b/gfx/pics/074/tiles.2bpp
deleted file mode 100644
index e85a36c98..000000000
--- a/gfx/pics/074/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/075/back.2bpp b/gfx/pics/075/back.2bpp
deleted file mode 100644
index 224adb210..000000000
--- a/gfx/pics/075/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/075/front.2bpp b/gfx/pics/075/front.2bpp
deleted file mode 100644
index 91860f6ac..000000000
--- a/gfx/pics/075/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/075/tiles.2bpp b/gfx/pics/075/tiles.2bpp
deleted file mode 100644
index 51db1581b..000000000
--- a/gfx/pics/075/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/076/back.2bpp b/gfx/pics/076/back.2bpp
deleted file mode 100644
index 0760bdec6..000000000
--- a/gfx/pics/076/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/076/front.2bpp b/gfx/pics/076/front.2bpp
deleted file mode 100644
index 204db9085..000000000
--- a/gfx/pics/076/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/076/tiles.2bpp b/gfx/pics/076/tiles.2bpp
deleted file mode 100644
index c4fc8b2f0..000000000
--- a/gfx/pics/076/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/077/back.2bpp b/gfx/pics/077/back.2bpp
deleted file mode 100644
index efa487282..000000000
--- a/gfx/pics/077/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/077/front.2bpp b/gfx/pics/077/front.2bpp
deleted file mode 100644
index 7f4787e75..000000000
--- a/gfx/pics/077/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/077/tiles.2bpp b/gfx/pics/077/tiles.2bpp
deleted file mode 100644
index 01e57a31f..000000000
--- a/gfx/pics/077/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/078/back.2bpp b/gfx/pics/078/back.2bpp
deleted file mode 100644
index 97f8b64e0..000000000
--- a/gfx/pics/078/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/078/front.2bpp b/gfx/pics/078/front.2bpp
deleted file mode 100644
index 70e0a35c6..000000000
--- a/gfx/pics/078/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/078/tiles.2bpp b/gfx/pics/078/tiles.2bpp
deleted file mode 100644
index dd90d9f61..000000000
--- a/gfx/pics/078/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/079/back.2bpp b/gfx/pics/079/back.2bpp
deleted file mode 100644
index 2d2dcff5e..000000000
--- a/gfx/pics/079/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/079/front.2bpp b/gfx/pics/079/front.2bpp
deleted file mode 100644
index a34a009b3..000000000
--- a/gfx/pics/079/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/079/tiles.2bpp b/gfx/pics/079/tiles.2bpp
deleted file mode 100644
index d58cfa2c9..000000000
--- a/gfx/pics/079/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/080/back.2bpp b/gfx/pics/080/back.2bpp
deleted file mode 100644
index c3739b6df..000000000
--- a/gfx/pics/080/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/080/front.2bpp b/gfx/pics/080/front.2bpp
deleted file mode 100644
index 03100a380..000000000
--- a/gfx/pics/080/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/080/tiles.2bpp b/gfx/pics/080/tiles.2bpp
deleted file mode 100644
index a79478be2..000000000
--- a/gfx/pics/080/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/081/back.2bpp b/gfx/pics/081/back.2bpp
deleted file mode 100644
index 304eb43a7..000000000
--- a/gfx/pics/081/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/081/front.2bpp b/gfx/pics/081/front.2bpp
deleted file mode 100644
index 4bc67f4da..000000000
--- a/gfx/pics/081/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/081/tiles.2bpp b/gfx/pics/081/tiles.2bpp
deleted file mode 100644
index 24dd5f4a5..000000000
--- a/gfx/pics/081/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/082/back.2bpp b/gfx/pics/082/back.2bpp
deleted file mode 100644
index 26f51f4cb..000000000
--- a/gfx/pics/082/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/082/front.2bpp b/gfx/pics/082/front.2bpp
deleted file mode 100644
index c18541bc5..000000000
--- a/gfx/pics/082/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/082/tiles.2bpp b/gfx/pics/082/tiles.2bpp
deleted file mode 100644
index 21b03b78c..000000000
--- a/gfx/pics/082/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/083/back.2bpp b/gfx/pics/083/back.2bpp
deleted file mode 100644
index 18b16747f..000000000
--- a/gfx/pics/083/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/083/front.2bpp b/gfx/pics/083/front.2bpp
deleted file mode 100644
index c15312f8c..000000000
--- a/gfx/pics/083/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/083/tiles.2bpp b/gfx/pics/083/tiles.2bpp
deleted file mode 100644
index 655f0af93..000000000
--- a/gfx/pics/083/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/084/back.2bpp b/gfx/pics/084/back.2bpp
deleted file mode 100644
index 2ff7cffbe..000000000
--- a/gfx/pics/084/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/084/front.2bpp b/gfx/pics/084/front.2bpp
deleted file mode 100644
index 51dca9267..000000000
--- a/gfx/pics/084/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/084/tiles.2bpp b/gfx/pics/084/tiles.2bpp
deleted file mode 100644
index 7862ae781..000000000
--- a/gfx/pics/084/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/085/back.2bpp b/gfx/pics/085/back.2bpp
deleted file mode 100644
index baf249aec..000000000
--- a/gfx/pics/085/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/085/front.2bpp b/gfx/pics/085/front.2bpp
deleted file mode 100644
index 22f632c89..000000000
--- a/gfx/pics/085/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/085/tiles.2bpp b/gfx/pics/085/tiles.2bpp
deleted file mode 100644
index 809a4b3d0..000000000
--- a/gfx/pics/085/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/086/back.2bpp b/gfx/pics/086/back.2bpp
deleted file mode 100644
index 1049d9aa6..000000000
--- a/gfx/pics/086/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/086/front.2bpp b/gfx/pics/086/front.2bpp
deleted file mode 100644
index 3f9a370bb..000000000
--- a/gfx/pics/086/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/086/tiles.2bpp b/gfx/pics/086/tiles.2bpp
deleted file mode 100644
index fbdb6dd28..000000000
--- a/gfx/pics/086/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/087/back.2bpp b/gfx/pics/087/back.2bpp
deleted file mode 100644
index 09420dc2c..000000000
--- a/gfx/pics/087/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/087/front.2bpp b/gfx/pics/087/front.2bpp
deleted file mode 100644
index 1bcacf291..000000000
--- a/gfx/pics/087/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/087/tiles.2bpp b/gfx/pics/087/tiles.2bpp
deleted file mode 100644
index 86e9b755f..000000000
--- a/gfx/pics/087/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/088/back.2bpp b/gfx/pics/088/back.2bpp
deleted file mode 100644
index 7b3b9166a..000000000
--- a/gfx/pics/088/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/088/front.2bpp b/gfx/pics/088/front.2bpp
deleted file mode 100644
index f898f8efe..000000000
--- a/gfx/pics/088/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/088/tiles.2bpp b/gfx/pics/088/tiles.2bpp
deleted file mode 100644
index 905b9b50a..000000000
--- a/gfx/pics/088/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/089/back.2bpp b/gfx/pics/089/back.2bpp
deleted file mode 100644
index 4ce72e6f9..000000000
--- a/gfx/pics/089/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/089/front.2bpp b/gfx/pics/089/front.2bpp
deleted file mode 100644
index d9a2b508f..000000000
--- a/gfx/pics/089/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/089/tiles.2bpp b/gfx/pics/089/tiles.2bpp
deleted file mode 100644
index 2b6292a11..000000000
--- a/gfx/pics/089/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/090/back.2bpp b/gfx/pics/090/back.2bpp
deleted file mode 100644
index 73b8c54ce..000000000
--- a/gfx/pics/090/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/090/front.2bpp b/gfx/pics/090/front.2bpp
deleted file mode 100644
index 0867198b1..000000000
--- a/gfx/pics/090/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/090/tiles.2bpp b/gfx/pics/090/tiles.2bpp
deleted file mode 100644
index 132cf4d59..000000000
--- a/gfx/pics/090/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/091/back.2bpp b/gfx/pics/091/back.2bpp
deleted file mode 100644
index a592f0d11..000000000
--- a/gfx/pics/091/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/091/front.2bpp b/gfx/pics/091/front.2bpp
deleted file mode 100644
index 4d5a31579..000000000
--- a/gfx/pics/091/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/091/tiles.2bpp b/gfx/pics/091/tiles.2bpp
deleted file mode 100644
index a7307c376..000000000
--- a/gfx/pics/091/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/092/back.2bpp b/gfx/pics/092/back.2bpp
deleted file mode 100644
index 4d3329588..000000000
--- a/gfx/pics/092/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/092/front.2bpp b/gfx/pics/092/front.2bpp
deleted file mode 100644
index ba50abc05..000000000
--- a/gfx/pics/092/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/092/tiles.2bpp b/gfx/pics/092/tiles.2bpp
deleted file mode 100644
index d36b55011..000000000
--- a/gfx/pics/092/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/093/back.2bpp b/gfx/pics/093/back.2bpp
deleted file mode 100644
index ab3cde07e..000000000
--- a/gfx/pics/093/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/093/front.2bpp b/gfx/pics/093/front.2bpp
deleted file mode 100644
index f48d3630e..000000000
--- a/gfx/pics/093/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/093/tiles.2bpp b/gfx/pics/093/tiles.2bpp
deleted file mode 100644
index 9fa466dee..000000000
--- a/gfx/pics/093/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/094/back.2bpp b/gfx/pics/094/back.2bpp
deleted file mode 100644
index e3bbe9343..000000000
--- a/gfx/pics/094/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/094/front.2bpp b/gfx/pics/094/front.2bpp
deleted file mode 100644
index ff799418d..000000000
--- a/gfx/pics/094/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/094/tiles.2bpp b/gfx/pics/094/tiles.2bpp
deleted file mode 100644
index 9a39f1bd7..000000000
--- a/gfx/pics/094/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/095/back.2bpp b/gfx/pics/095/back.2bpp
deleted file mode 100644
index 019a48465..000000000
--- a/gfx/pics/095/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/095/front.2bpp b/gfx/pics/095/front.2bpp
deleted file mode 100644
index c307d3288..000000000
--- a/gfx/pics/095/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/095/tiles.2bpp b/gfx/pics/095/tiles.2bpp
deleted file mode 100644
index e3daeee26..000000000
--- a/gfx/pics/095/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/096/back.2bpp b/gfx/pics/096/back.2bpp
deleted file mode 100644
index f29dd8e47..000000000
--- a/gfx/pics/096/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/096/front.2bpp b/gfx/pics/096/front.2bpp
deleted file mode 100644
index 203f09f18..000000000
--- a/gfx/pics/096/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/096/tiles.2bpp b/gfx/pics/096/tiles.2bpp
deleted file mode 100644
index 76947b04c..000000000
--- a/gfx/pics/096/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/097/back.2bpp b/gfx/pics/097/back.2bpp
deleted file mode 100644
index c6efc5d2f..000000000
--- a/gfx/pics/097/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/097/front.2bpp b/gfx/pics/097/front.2bpp
deleted file mode 100644
index c052c2dbc..000000000
--- a/gfx/pics/097/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/097/tiles.2bpp b/gfx/pics/097/tiles.2bpp
deleted file mode 100644
index 54c214092..000000000
--- a/gfx/pics/097/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/098/back.2bpp b/gfx/pics/098/back.2bpp
deleted file mode 100644
index 87c42ce57..000000000
--- a/gfx/pics/098/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/098/front.2bpp b/gfx/pics/098/front.2bpp
deleted file mode 100644
index bcb043c04..000000000
--- a/gfx/pics/098/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/098/tiles.2bpp b/gfx/pics/098/tiles.2bpp
deleted file mode 100644
index 1622a9087..000000000
--- a/gfx/pics/098/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/099/back.2bpp b/gfx/pics/099/back.2bpp
deleted file mode 100644
index c06c1055f..000000000
--- a/gfx/pics/099/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/099/front.2bpp b/gfx/pics/099/front.2bpp
deleted file mode 100644
index ad2db18e0..000000000
--- a/gfx/pics/099/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/099/tiles.2bpp b/gfx/pics/099/tiles.2bpp
deleted file mode 100644
index 713a4165e..000000000
--- a/gfx/pics/099/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/100/back.2bpp b/gfx/pics/100/back.2bpp
deleted file mode 100644
index f8e99db69..000000000
--- a/gfx/pics/100/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/100/front.2bpp b/gfx/pics/100/front.2bpp
deleted file mode 100644
index 30dcdfd60..000000000
--- a/gfx/pics/100/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/100/tiles.2bpp b/gfx/pics/100/tiles.2bpp
deleted file mode 100644
index 662b92c8a..000000000
--- a/gfx/pics/100/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/101/back.2bpp b/gfx/pics/101/back.2bpp
deleted file mode 100644
index e737b1d90..000000000
--- a/gfx/pics/101/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/101/front.2bpp b/gfx/pics/101/front.2bpp
deleted file mode 100644
index 155955549..000000000
--- a/gfx/pics/101/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/101/tiles.2bpp b/gfx/pics/101/tiles.2bpp
deleted file mode 100644
index 6df57d1e5..000000000
--- a/gfx/pics/101/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/102/back.2bpp b/gfx/pics/102/back.2bpp
deleted file mode 100644
index 5437619ef..000000000
--- a/gfx/pics/102/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/102/front.2bpp b/gfx/pics/102/front.2bpp
deleted file mode 100644
index c238ee277..000000000
--- a/gfx/pics/102/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/102/tiles.2bpp b/gfx/pics/102/tiles.2bpp
deleted file mode 100644
index 6b73cf917..000000000
--- a/gfx/pics/102/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/103/back.2bpp b/gfx/pics/103/back.2bpp
deleted file mode 100644
index 1a71f91bf..000000000
--- a/gfx/pics/103/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/103/front.2bpp b/gfx/pics/103/front.2bpp
deleted file mode 100644
index ad0844e74..000000000
--- a/gfx/pics/103/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/103/tiles.2bpp b/gfx/pics/103/tiles.2bpp
deleted file mode 100644
index 81c0a7ce9..000000000
--- a/gfx/pics/103/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/104/back.2bpp b/gfx/pics/104/back.2bpp
deleted file mode 100644
index 16e4d70d6..000000000
--- a/gfx/pics/104/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/104/front.2bpp b/gfx/pics/104/front.2bpp
deleted file mode 100644
index 069433f93..000000000
--- a/gfx/pics/104/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/104/tiles.2bpp b/gfx/pics/104/tiles.2bpp
deleted file mode 100644
index cb5f693a8..000000000
--- a/gfx/pics/104/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/105/back.2bpp b/gfx/pics/105/back.2bpp
deleted file mode 100644
index 29025344b..000000000
--- a/gfx/pics/105/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/105/front.2bpp b/gfx/pics/105/front.2bpp
deleted file mode 100644
index 672f94098..000000000
--- a/gfx/pics/105/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/105/tiles.2bpp b/gfx/pics/105/tiles.2bpp
deleted file mode 100644
index 7a9dbc04f..000000000
--- a/gfx/pics/105/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/106/back.2bpp b/gfx/pics/106/back.2bpp
deleted file mode 100644
index f464eb4c8..000000000
--- a/gfx/pics/106/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/106/front.2bpp b/gfx/pics/106/front.2bpp
deleted file mode 100644
index e482786d1..000000000
--- a/gfx/pics/106/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/106/tiles.2bpp b/gfx/pics/106/tiles.2bpp
deleted file mode 100644
index 33d55260a..000000000
--- a/gfx/pics/106/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/107/back.2bpp b/gfx/pics/107/back.2bpp
deleted file mode 100644
index a4fd8dd86..000000000
--- a/gfx/pics/107/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/107/front.2bpp b/gfx/pics/107/front.2bpp
deleted file mode 100644
index 296da9557..000000000
--- a/gfx/pics/107/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/107/tiles.2bpp b/gfx/pics/107/tiles.2bpp
deleted file mode 100644
index ea3383dbc..000000000
--- a/gfx/pics/107/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/108/back.2bpp b/gfx/pics/108/back.2bpp
deleted file mode 100644
index 3d6aba145..000000000
--- a/gfx/pics/108/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/108/front.2bpp b/gfx/pics/108/front.2bpp
deleted file mode 100644
index 18f224038..000000000
--- a/gfx/pics/108/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/108/tiles.2bpp b/gfx/pics/108/tiles.2bpp
deleted file mode 100644
index 9a62f8c36..000000000
--- a/gfx/pics/108/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/109/back.2bpp b/gfx/pics/109/back.2bpp
deleted file mode 100644
index 858adbc65..000000000
--- a/gfx/pics/109/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/109/front.2bpp b/gfx/pics/109/front.2bpp
deleted file mode 100644
index 04c8a6bf8..000000000
--- a/gfx/pics/109/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/109/tiles.2bpp b/gfx/pics/109/tiles.2bpp
deleted file mode 100644
index 28effa918..000000000
--- a/gfx/pics/109/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/110/back.2bpp b/gfx/pics/110/back.2bpp
deleted file mode 100644
index dcaca9098..000000000
--- a/gfx/pics/110/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/110/front.2bpp b/gfx/pics/110/front.2bpp
deleted file mode 100644
index 4455ef3a1..000000000
--- a/gfx/pics/110/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/110/tiles.2bpp b/gfx/pics/110/tiles.2bpp
deleted file mode 100644
index 421c0a693..000000000
--- a/gfx/pics/110/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/111/back.2bpp b/gfx/pics/111/back.2bpp
deleted file mode 100644
index 33181ef57..000000000
--- a/gfx/pics/111/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/111/front.2bpp b/gfx/pics/111/front.2bpp
deleted file mode 100644
index a75f18409..000000000
--- a/gfx/pics/111/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/111/tiles.2bpp b/gfx/pics/111/tiles.2bpp
deleted file mode 100644
index 271be8c58..000000000
--- a/gfx/pics/111/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/112/back.2bpp b/gfx/pics/112/back.2bpp
deleted file mode 100644
index 626c7deb2..000000000
--- a/gfx/pics/112/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/112/front.2bpp b/gfx/pics/112/front.2bpp
deleted file mode 100644
index 87d9ddaec..000000000
--- a/gfx/pics/112/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/112/tiles.2bpp b/gfx/pics/112/tiles.2bpp
deleted file mode 100644
index e3206761a..000000000
--- a/gfx/pics/112/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/113/back.2bpp b/gfx/pics/113/back.2bpp
deleted file mode 100644
index 232ebd882..000000000
--- a/gfx/pics/113/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/113/front.2bpp b/gfx/pics/113/front.2bpp
deleted file mode 100644
index ea93cf598..000000000
--- a/gfx/pics/113/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/113/tiles.2bpp b/gfx/pics/113/tiles.2bpp
deleted file mode 100644
index b2a20ef54..000000000
--- a/gfx/pics/113/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/114/back.2bpp b/gfx/pics/114/back.2bpp
deleted file mode 100644
index 702bfab0d..000000000
--- a/gfx/pics/114/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/114/front.2bpp b/gfx/pics/114/front.2bpp
deleted file mode 100644
index dfc130e80..000000000
--- a/gfx/pics/114/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/114/tiles.2bpp b/gfx/pics/114/tiles.2bpp
deleted file mode 100644
index 1f90eadec..000000000
--- a/gfx/pics/114/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/115/back.2bpp b/gfx/pics/115/back.2bpp
deleted file mode 100644
index bd4412725..000000000
--- a/gfx/pics/115/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/115/front.2bpp b/gfx/pics/115/front.2bpp
deleted file mode 100644
index 6ab56901f..000000000
--- a/gfx/pics/115/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/115/tiles.2bpp b/gfx/pics/115/tiles.2bpp
deleted file mode 100644
index ecdb5b7c7..000000000
--- a/gfx/pics/115/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/116/back.2bpp b/gfx/pics/116/back.2bpp
deleted file mode 100644
index 112c16bf2..000000000
--- a/gfx/pics/116/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/116/front.2bpp b/gfx/pics/116/front.2bpp
deleted file mode 100644
index 546926775..000000000
--- a/gfx/pics/116/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/116/tiles.2bpp b/gfx/pics/116/tiles.2bpp
deleted file mode 100644
index 20042dcca..000000000
--- a/gfx/pics/116/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/117/back.2bpp b/gfx/pics/117/back.2bpp
deleted file mode 100644
index fadfbe8d2..000000000
--- a/gfx/pics/117/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/117/front.2bpp b/gfx/pics/117/front.2bpp
deleted file mode 100644
index f409145c1..000000000
--- a/gfx/pics/117/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/117/tiles.2bpp b/gfx/pics/117/tiles.2bpp
deleted file mode 100644
index 708ef9ad6..000000000
--- a/gfx/pics/117/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/118/back.2bpp b/gfx/pics/118/back.2bpp
deleted file mode 100644
index 672aa1809..000000000
--- a/gfx/pics/118/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/118/front.2bpp b/gfx/pics/118/front.2bpp
deleted file mode 100644
index c2c9fa90b..000000000
--- a/gfx/pics/118/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/118/tiles.2bpp b/gfx/pics/118/tiles.2bpp
deleted file mode 100644
index 87986fc3f..000000000
--- a/gfx/pics/118/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/119/back.2bpp b/gfx/pics/119/back.2bpp
deleted file mode 100644
index af64c8c7c..000000000
--- a/gfx/pics/119/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/119/front.2bpp b/gfx/pics/119/front.2bpp
deleted file mode 100644
index 8d055c11a..000000000
--- a/gfx/pics/119/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/119/tiles.2bpp b/gfx/pics/119/tiles.2bpp
deleted file mode 100644
index 4ed2800f7..000000000
--- a/gfx/pics/119/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/120/back.2bpp b/gfx/pics/120/back.2bpp
deleted file mode 100644
index aecc2684a..000000000
--- a/gfx/pics/120/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/120/front.2bpp b/gfx/pics/120/front.2bpp
deleted file mode 100644
index e01d9ec61..000000000
--- a/gfx/pics/120/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/120/tiles.2bpp b/gfx/pics/120/tiles.2bpp
deleted file mode 100644
index 9411fe447..000000000
--- a/gfx/pics/120/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/121/back.2bpp b/gfx/pics/121/back.2bpp
deleted file mode 100644
index dde5e623f..000000000
--- a/gfx/pics/121/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/121/front.2bpp b/gfx/pics/121/front.2bpp
deleted file mode 100644
index 5c6140317..000000000
--- a/gfx/pics/121/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/121/tiles.2bpp b/gfx/pics/121/tiles.2bpp
deleted file mode 100644
index ba051a074..000000000
--- a/gfx/pics/121/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/122/back.2bpp b/gfx/pics/122/back.2bpp
deleted file mode 100644
index 36c3f5387..000000000
--- a/gfx/pics/122/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/122/front.2bpp b/gfx/pics/122/front.2bpp
deleted file mode 100644
index b8342f515..000000000
--- a/gfx/pics/122/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/122/tiles.2bpp b/gfx/pics/122/tiles.2bpp
deleted file mode 100644
index 585bca863..000000000
--- a/gfx/pics/122/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/123/back.2bpp b/gfx/pics/123/back.2bpp
deleted file mode 100644
index 01a4c25d7..000000000
--- a/gfx/pics/123/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/123/front.2bpp b/gfx/pics/123/front.2bpp
deleted file mode 100644
index 52aca2fa3..000000000
--- a/gfx/pics/123/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/123/tiles.2bpp b/gfx/pics/123/tiles.2bpp
deleted file mode 100644
index c055ace8a..000000000
--- a/gfx/pics/123/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/124/back.2bpp b/gfx/pics/124/back.2bpp
deleted file mode 100644
index e4a07ca0d..000000000
--- a/gfx/pics/124/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/124/front.2bpp b/gfx/pics/124/front.2bpp
deleted file mode 100644
index 73712b24c..000000000
--- a/gfx/pics/124/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/124/tiles.2bpp b/gfx/pics/124/tiles.2bpp
deleted file mode 100644
index db0125c4a..000000000
--- a/gfx/pics/124/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/125/back.2bpp b/gfx/pics/125/back.2bpp
deleted file mode 100644
index af32ffc60..000000000
--- a/gfx/pics/125/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/125/front.2bpp b/gfx/pics/125/front.2bpp
deleted file mode 100644
index ee82f09f1..000000000
--- a/gfx/pics/125/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/125/tiles.2bpp b/gfx/pics/125/tiles.2bpp
deleted file mode 100644
index 5e3c52c47..000000000
--- a/gfx/pics/125/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/126/back.2bpp b/gfx/pics/126/back.2bpp
deleted file mode 100644
index 4cae7b88f..000000000
--- a/gfx/pics/126/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/126/front.2bpp b/gfx/pics/126/front.2bpp
deleted file mode 100644
index af281f11e..000000000
--- a/gfx/pics/126/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/126/tiles.2bpp b/gfx/pics/126/tiles.2bpp
deleted file mode 100644
index e578e2672..000000000
--- a/gfx/pics/126/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/127/back.2bpp b/gfx/pics/127/back.2bpp
deleted file mode 100644
index de80f3f3d..000000000
--- a/gfx/pics/127/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/127/front.2bpp b/gfx/pics/127/front.2bpp
deleted file mode 100644
index 3da0bf00c..000000000
--- a/gfx/pics/127/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/127/tiles.2bpp b/gfx/pics/127/tiles.2bpp
deleted file mode 100644
index 085ef6304..000000000
--- a/gfx/pics/127/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/128/back.2bpp b/gfx/pics/128/back.2bpp
deleted file mode 100644
index c69b384a2..000000000
--- a/gfx/pics/128/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/128/front.2bpp b/gfx/pics/128/front.2bpp
deleted file mode 100644
index 18929a21d..000000000
--- a/gfx/pics/128/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/128/tiles.2bpp b/gfx/pics/128/tiles.2bpp
deleted file mode 100644
index 34db5de20..000000000
--- a/gfx/pics/128/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/129/back.2bpp b/gfx/pics/129/back.2bpp
deleted file mode 100644
index f1ad585a4..000000000
--- a/gfx/pics/129/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/129/front.2bpp b/gfx/pics/129/front.2bpp
deleted file mode 100644
index 723c663ed..000000000
--- a/gfx/pics/129/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/129/tiles.2bpp b/gfx/pics/129/tiles.2bpp
deleted file mode 100644
index b5ac03005..000000000
--- a/gfx/pics/129/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/130/back.2bpp b/gfx/pics/130/back.2bpp
deleted file mode 100644
index 980aad36a..000000000
--- a/gfx/pics/130/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/130/front.2bpp b/gfx/pics/130/front.2bpp
deleted file mode 100644
index 380ad1765..000000000
--- a/gfx/pics/130/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/130/tiles.2bpp b/gfx/pics/130/tiles.2bpp
deleted file mode 100644
index ed03372c5..000000000
--- a/gfx/pics/130/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/131/back.2bpp b/gfx/pics/131/back.2bpp
deleted file mode 100644
index d766fc947..000000000
--- a/gfx/pics/131/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/131/front.2bpp b/gfx/pics/131/front.2bpp
deleted file mode 100644
index 55adfb90b..000000000
--- a/gfx/pics/131/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/131/tiles.2bpp b/gfx/pics/131/tiles.2bpp
deleted file mode 100644
index 15d74b90f..000000000
--- a/gfx/pics/131/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/132/back.2bpp b/gfx/pics/132/back.2bpp
deleted file mode 100644
index 83b3a725c..000000000
--- a/gfx/pics/132/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/132/front.2bpp b/gfx/pics/132/front.2bpp
deleted file mode 100644
index bbf86351e..000000000
--- a/gfx/pics/132/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/132/tiles.2bpp b/gfx/pics/132/tiles.2bpp
deleted file mode 100644
index c4f163a50..000000000
--- a/gfx/pics/132/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/133/back.2bpp b/gfx/pics/133/back.2bpp
deleted file mode 100644
index ba0493408..000000000
--- a/gfx/pics/133/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/133/front.2bpp b/gfx/pics/133/front.2bpp
deleted file mode 100644
index 859ca6da6..000000000
--- a/gfx/pics/133/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/133/tiles.2bpp b/gfx/pics/133/tiles.2bpp
deleted file mode 100644
index 13129a596..000000000
--- a/gfx/pics/133/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/134/back.2bpp b/gfx/pics/134/back.2bpp
deleted file mode 100644
index 27c7104ee..000000000
--- a/gfx/pics/134/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/134/front.2bpp b/gfx/pics/134/front.2bpp
deleted file mode 100644
index de515ca32..000000000
--- a/gfx/pics/134/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/134/tiles.2bpp b/gfx/pics/134/tiles.2bpp
deleted file mode 100644
index 3fcaf7b6f..000000000
--- a/gfx/pics/134/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/135/back.2bpp b/gfx/pics/135/back.2bpp
deleted file mode 100644
index a99e1bb4a..000000000
--- a/gfx/pics/135/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/135/front.2bpp b/gfx/pics/135/front.2bpp
deleted file mode 100644
index ac23107d7..000000000
--- a/gfx/pics/135/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/135/tiles.2bpp b/gfx/pics/135/tiles.2bpp
deleted file mode 100644
index f61d41938..000000000
--- a/gfx/pics/135/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/136/back.2bpp b/gfx/pics/136/back.2bpp
deleted file mode 100644
index 69a975ff2..000000000
--- a/gfx/pics/136/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/136/front.2bpp b/gfx/pics/136/front.2bpp
deleted file mode 100644
index 02caa921d..000000000
--- a/gfx/pics/136/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/136/tiles.2bpp b/gfx/pics/136/tiles.2bpp
deleted file mode 100644
index e275749c6..000000000
--- a/gfx/pics/136/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/137/back.2bpp b/gfx/pics/137/back.2bpp
deleted file mode 100644
index fc17d5987..000000000
--- a/gfx/pics/137/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/137/front.2bpp b/gfx/pics/137/front.2bpp
deleted file mode 100644
index d2731f790..000000000
--- a/gfx/pics/137/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/137/tiles.2bpp b/gfx/pics/137/tiles.2bpp
deleted file mode 100644
index e04b2c732..000000000
--- a/gfx/pics/137/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/138/back.2bpp b/gfx/pics/138/back.2bpp
deleted file mode 100644
index 1d25b3190..000000000
--- a/gfx/pics/138/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/138/front.2bpp b/gfx/pics/138/front.2bpp
deleted file mode 100644
index 7e3997752..000000000
--- a/gfx/pics/138/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/138/tiles.2bpp b/gfx/pics/138/tiles.2bpp
deleted file mode 100644
index 95de6257e..000000000
--- a/gfx/pics/138/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/139/back.2bpp b/gfx/pics/139/back.2bpp
deleted file mode 100644
index d79655e38..000000000
--- a/gfx/pics/139/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/139/front.2bpp b/gfx/pics/139/front.2bpp
deleted file mode 100644
index 60b43091b..000000000
--- a/gfx/pics/139/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/139/tiles.2bpp b/gfx/pics/139/tiles.2bpp
deleted file mode 100644
index 445c1c37d..000000000
--- a/gfx/pics/139/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/140/back.2bpp b/gfx/pics/140/back.2bpp
deleted file mode 100644
index 97b4829af..000000000
--- a/gfx/pics/140/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/140/front.2bpp b/gfx/pics/140/front.2bpp
deleted file mode 100644
index 3d3a23abb..000000000
--- a/gfx/pics/140/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/140/tiles.2bpp b/gfx/pics/140/tiles.2bpp
deleted file mode 100644
index 20fc391ce..000000000
--- a/gfx/pics/140/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/141/back.2bpp b/gfx/pics/141/back.2bpp
deleted file mode 100644
index 04bc8e6e5..000000000
--- a/gfx/pics/141/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/141/front.2bpp b/gfx/pics/141/front.2bpp
deleted file mode 100644
index 356a225e3..000000000
--- a/gfx/pics/141/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/141/tiles.2bpp b/gfx/pics/141/tiles.2bpp
deleted file mode 100644
index af1adb64c..000000000
--- a/gfx/pics/141/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/142/back.2bpp b/gfx/pics/142/back.2bpp
deleted file mode 100644
index 9ce97a2c7..000000000
--- a/gfx/pics/142/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/142/front.2bpp b/gfx/pics/142/front.2bpp
deleted file mode 100644
index 27be4867b..000000000
--- a/gfx/pics/142/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/142/tiles.2bpp b/gfx/pics/142/tiles.2bpp
deleted file mode 100644
index a8694c2a6..000000000
--- a/gfx/pics/142/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/143/back.2bpp b/gfx/pics/143/back.2bpp
deleted file mode 100644
index b9aad8f93..000000000
--- a/gfx/pics/143/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/143/front.2bpp b/gfx/pics/143/front.2bpp
deleted file mode 100644
index a7a577f88..000000000
--- a/gfx/pics/143/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/143/tiles.2bpp b/gfx/pics/143/tiles.2bpp
deleted file mode 100644
index 6665d719c..000000000
--- a/gfx/pics/143/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/144/back.2bpp b/gfx/pics/144/back.2bpp
deleted file mode 100644
index 58411cbb6..000000000
--- a/gfx/pics/144/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/144/front.2bpp b/gfx/pics/144/front.2bpp
deleted file mode 100644
index 55d0cf1f2..000000000
--- a/gfx/pics/144/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/144/tiles.2bpp b/gfx/pics/144/tiles.2bpp
deleted file mode 100644
index 8d71c018a..000000000
--- a/gfx/pics/144/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/145/back.2bpp b/gfx/pics/145/back.2bpp
deleted file mode 100644
index 7794404f8..000000000
--- a/gfx/pics/145/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/145/front.2bpp b/gfx/pics/145/front.2bpp
deleted file mode 100644
index 68f79166c..000000000
--- a/gfx/pics/145/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/145/tiles.2bpp b/gfx/pics/145/tiles.2bpp
deleted file mode 100644
index c858aa005..000000000
--- a/gfx/pics/145/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/146/back.2bpp b/gfx/pics/146/back.2bpp
deleted file mode 100644
index 40db77fbf..000000000
--- a/gfx/pics/146/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/146/front.2bpp b/gfx/pics/146/front.2bpp
deleted file mode 100644
index 14e6030e2..000000000
--- a/gfx/pics/146/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/146/tiles.2bpp b/gfx/pics/146/tiles.2bpp
deleted file mode 100644
index f0339c434..000000000
--- a/gfx/pics/146/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/147/back.2bpp b/gfx/pics/147/back.2bpp
deleted file mode 100644
index a65e6e395..000000000
--- a/gfx/pics/147/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/147/front.2bpp b/gfx/pics/147/front.2bpp
deleted file mode 100644
index f49287eea..000000000
--- a/gfx/pics/147/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/147/tiles.2bpp b/gfx/pics/147/tiles.2bpp
deleted file mode 100644
index 0c61fce4b..000000000
--- a/gfx/pics/147/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/148/back.2bpp b/gfx/pics/148/back.2bpp
deleted file mode 100644
index ba83c0f1d..000000000
--- a/gfx/pics/148/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/148/front.2bpp b/gfx/pics/148/front.2bpp
deleted file mode 100644
index 7efa3d861..000000000
--- a/gfx/pics/148/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/148/tiles.2bpp b/gfx/pics/148/tiles.2bpp
deleted file mode 100644
index 325acd3e3..000000000
--- a/gfx/pics/148/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/149/back.2bpp b/gfx/pics/149/back.2bpp
deleted file mode 100644
index 84749d043..000000000
--- a/gfx/pics/149/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/149/front.2bpp b/gfx/pics/149/front.2bpp
deleted file mode 100644
index f198b7b74..000000000
--- a/gfx/pics/149/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/149/tiles.2bpp b/gfx/pics/149/tiles.2bpp
deleted file mode 100644
index 9ff358bee..000000000
--- a/gfx/pics/149/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/150/back.2bpp b/gfx/pics/150/back.2bpp
deleted file mode 100644
index 1e48beca1..000000000
--- a/gfx/pics/150/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/150/front.2bpp b/gfx/pics/150/front.2bpp
deleted file mode 100644
index bfea8d677..000000000
--- a/gfx/pics/150/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/150/tiles.2bpp b/gfx/pics/150/tiles.2bpp
deleted file mode 100644
index 9595c0f27..000000000
--- a/gfx/pics/150/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/151/back.2bpp b/gfx/pics/151/back.2bpp
deleted file mode 100644
index df4e5390c..000000000
--- a/gfx/pics/151/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/151/front.2bpp b/gfx/pics/151/front.2bpp
deleted file mode 100644
index 2250f456b..000000000
--- a/gfx/pics/151/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/151/tiles.2bpp b/gfx/pics/151/tiles.2bpp
deleted file mode 100644
index 3df120b9a..000000000
--- a/gfx/pics/151/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/152/back.2bpp b/gfx/pics/152/back.2bpp
deleted file mode 100644
index 6714ef804..000000000
--- a/gfx/pics/152/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/152/front.2bpp b/gfx/pics/152/front.2bpp
deleted file mode 100644
index 58393f0c7..000000000
--- a/gfx/pics/152/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/152/tiles.2bpp b/gfx/pics/152/tiles.2bpp
deleted file mode 100644
index fb0824fc4..000000000
--- a/gfx/pics/152/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/153/back.2bpp b/gfx/pics/153/back.2bpp
deleted file mode 100644
index 5b8ba4f19..000000000
--- a/gfx/pics/153/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/153/front.2bpp b/gfx/pics/153/front.2bpp
deleted file mode 100644
index 600bb8596..000000000
--- a/gfx/pics/153/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/153/tiles.2bpp b/gfx/pics/153/tiles.2bpp
deleted file mode 100644
index 82d135a9f..000000000
--- a/gfx/pics/153/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/154/back.2bpp b/gfx/pics/154/back.2bpp
deleted file mode 100644
index 4c3da3910..000000000
--- a/gfx/pics/154/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/154/front.2bpp b/gfx/pics/154/front.2bpp
deleted file mode 100644
index 4670ea519..000000000
--- a/gfx/pics/154/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/154/tiles.2bpp b/gfx/pics/154/tiles.2bpp
deleted file mode 100644
index bc7655ddc..000000000
--- a/gfx/pics/154/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/155/back.2bpp b/gfx/pics/155/back.2bpp
deleted file mode 100644
index 9edab0eae..000000000
--- a/gfx/pics/155/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/155/front.2bpp b/gfx/pics/155/front.2bpp
deleted file mode 100644
index 560820309..000000000
--- a/gfx/pics/155/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/155/tiles.2bpp b/gfx/pics/155/tiles.2bpp
deleted file mode 100644
index 076b41386..000000000
--- a/gfx/pics/155/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/156/back.2bpp b/gfx/pics/156/back.2bpp
deleted file mode 100644
index f93fd3b65..000000000
--- a/gfx/pics/156/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/156/front.2bpp b/gfx/pics/156/front.2bpp
deleted file mode 100644
index 4863cabfd..000000000
--- a/gfx/pics/156/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/156/tiles.2bpp b/gfx/pics/156/tiles.2bpp
deleted file mode 100644
index 205bfcd16..000000000
--- a/gfx/pics/156/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/157/back.2bpp b/gfx/pics/157/back.2bpp
deleted file mode 100644
index cdeee1976..000000000
--- a/gfx/pics/157/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/157/front.2bpp b/gfx/pics/157/front.2bpp
deleted file mode 100644
index 35a9562e2..000000000
--- a/gfx/pics/157/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/157/tiles.2bpp b/gfx/pics/157/tiles.2bpp
deleted file mode 100644
index 8ed8eaa58..000000000
--- a/gfx/pics/157/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/158/back.2bpp b/gfx/pics/158/back.2bpp
deleted file mode 100644
index 7f1d812b6..000000000
--- a/gfx/pics/158/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/158/front.2bpp b/gfx/pics/158/front.2bpp
deleted file mode 100644
index b00fce705..000000000
--- a/gfx/pics/158/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/158/tiles.2bpp b/gfx/pics/158/tiles.2bpp
deleted file mode 100644
index 1fb8b4484..000000000
--- a/gfx/pics/158/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/159/back.2bpp b/gfx/pics/159/back.2bpp
deleted file mode 100644
index 75157f23c..000000000
--- a/gfx/pics/159/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/159/front.2bpp b/gfx/pics/159/front.2bpp
deleted file mode 100644
index ddcdb653c..000000000
--- a/gfx/pics/159/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/159/tiles.2bpp b/gfx/pics/159/tiles.2bpp
deleted file mode 100644
index 55c973184..000000000
--- a/gfx/pics/159/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/160/back.2bpp b/gfx/pics/160/back.2bpp
deleted file mode 100644
index cc9e5e921..000000000
--- a/gfx/pics/160/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/160/front.2bpp b/gfx/pics/160/front.2bpp
deleted file mode 100644
index c223ac66f..000000000
--- a/gfx/pics/160/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/160/tiles.2bpp b/gfx/pics/160/tiles.2bpp
deleted file mode 100644
index a8139e495..000000000
--- a/gfx/pics/160/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/161/back.2bpp b/gfx/pics/161/back.2bpp
deleted file mode 100644
index e2be3b374..000000000
--- a/gfx/pics/161/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/161/front.2bpp b/gfx/pics/161/front.2bpp
deleted file mode 100644
index 79afa69e8..000000000
--- a/gfx/pics/161/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/161/tiles.2bpp b/gfx/pics/161/tiles.2bpp
deleted file mode 100644
index c59be4ae8..000000000
--- a/gfx/pics/161/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/162/back.2bpp b/gfx/pics/162/back.2bpp
deleted file mode 100644
index 59fb25d59..000000000
--- a/gfx/pics/162/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/162/front.2bpp b/gfx/pics/162/front.2bpp
deleted file mode 100644
index e3acb697d..000000000
--- a/gfx/pics/162/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/162/tiles.2bpp b/gfx/pics/162/tiles.2bpp
deleted file mode 100644
index 53fc57fca..000000000
--- a/gfx/pics/162/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/163/back.2bpp b/gfx/pics/163/back.2bpp
deleted file mode 100644
index fdbd46122..000000000
--- a/gfx/pics/163/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/163/front.2bpp b/gfx/pics/163/front.2bpp
deleted file mode 100644
index 61e8b429f..000000000
--- a/gfx/pics/163/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/163/tiles.2bpp b/gfx/pics/163/tiles.2bpp
deleted file mode 100644
index eb63c1a97..000000000
--- a/gfx/pics/163/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/164/back.2bpp b/gfx/pics/164/back.2bpp
deleted file mode 100644
index 3140305b8..000000000
--- a/gfx/pics/164/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/164/front.2bpp b/gfx/pics/164/front.2bpp
deleted file mode 100644
index d34b5dae8..000000000
--- a/gfx/pics/164/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/164/tiles.2bpp b/gfx/pics/164/tiles.2bpp
deleted file mode 100644
index dd03384df..000000000
--- a/gfx/pics/164/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/165/back.2bpp b/gfx/pics/165/back.2bpp
deleted file mode 100644
index 1807cb0ae..000000000
--- a/gfx/pics/165/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/165/front.2bpp b/gfx/pics/165/front.2bpp
deleted file mode 100644
index 012c91b91..000000000
--- a/gfx/pics/165/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/165/tiles.2bpp b/gfx/pics/165/tiles.2bpp
deleted file mode 100644
index 84d394f91..000000000
--- a/gfx/pics/165/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/166/back.2bpp b/gfx/pics/166/back.2bpp
deleted file mode 100644
index ebd081ec1..000000000
--- a/gfx/pics/166/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/166/front.2bpp b/gfx/pics/166/front.2bpp
deleted file mode 100644
index 18f76c987..000000000
--- a/gfx/pics/166/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/166/tiles.2bpp b/gfx/pics/166/tiles.2bpp
deleted file mode 100644
index 1476d0f43..000000000
--- a/gfx/pics/166/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/167/back.2bpp b/gfx/pics/167/back.2bpp
deleted file mode 100644
index 8cef79e77..000000000
--- a/gfx/pics/167/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/167/front.2bpp b/gfx/pics/167/front.2bpp
deleted file mode 100644
index effcfd362..000000000
--- a/gfx/pics/167/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/167/tiles.2bpp b/gfx/pics/167/tiles.2bpp
deleted file mode 100644
index 682b14054..000000000
--- a/gfx/pics/167/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/168/back.2bpp b/gfx/pics/168/back.2bpp
deleted file mode 100644
index c3e2d308f..000000000
--- a/gfx/pics/168/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/168/front.2bpp b/gfx/pics/168/front.2bpp
deleted file mode 100644
index 15d520165..000000000
--- a/gfx/pics/168/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/168/tiles.2bpp b/gfx/pics/168/tiles.2bpp
deleted file mode 100644
index c316c85d6..000000000
--- a/gfx/pics/168/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/169/back.2bpp b/gfx/pics/169/back.2bpp
deleted file mode 100644
index f472857a2..000000000
--- a/gfx/pics/169/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/169/front.2bpp b/gfx/pics/169/front.2bpp
deleted file mode 100644
index 60ceb268b..000000000
--- a/gfx/pics/169/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/169/tiles.2bpp b/gfx/pics/169/tiles.2bpp
deleted file mode 100644
index b8d26fb71..000000000
--- a/gfx/pics/169/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/170/back.2bpp b/gfx/pics/170/back.2bpp
deleted file mode 100644
index 88f418e76..000000000
--- a/gfx/pics/170/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/170/front.2bpp b/gfx/pics/170/front.2bpp
deleted file mode 100644
index 377438f3d..000000000
--- a/gfx/pics/170/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/170/tiles.2bpp b/gfx/pics/170/tiles.2bpp
deleted file mode 100644
index 45f885d5a..000000000
--- a/gfx/pics/170/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/171/back.2bpp b/gfx/pics/171/back.2bpp
deleted file mode 100644
index e80485f07..000000000
--- a/gfx/pics/171/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/171/front.2bpp b/gfx/pics/171/front.2bpp
deleted file mode 100644
index 8eb74fe56..000000000
--- a/gfx/pics/171/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/171/tiles.2bpp b/gfx/pics/171/tiles.2bpp
deleted file mode 100644
index ff27d25e5..000000000
--- a/gfx/pics/171/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/172/back.2bpp b/gfx/pics/172/back.2bpp
deleted file mode 100644
index 93f7ffb98..000000000
--- a/gfx/pics/172/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/172/front.2bpp b/gfx/pics/172/front.2bpp
deleted file mode 100644
index 86e90cbd6..000000000
--- a/gfx/pics/172/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/172/tiles.2bpp b/gfx/pics/172/tiles.2bpp
deleted file mode 100644
index 5aae131b9..000000000
--- a/gfx/pics/172/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/173/back.2bpp b/gfx/pics/173/back.2bpp
deleted file mode 100644
index 70502b7b0..000000000
--- a/gfx/pics/173/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/173/front.2bpp b/gfx/pics/173/front.2bpp
deleted file mode 100644
index 69dba752b..000000000
--- a/gfx/pics/173/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/173/tiles.2bpp b/gfx/pics/173/tiles.2bpp
deleted file mode 100644
index 295bc8c2b..000000000
--- a/gfx/pics/173/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/174/back.2bpp b/gfx/pics/174/back.2bpp
deleted file mode 100644
index 4a9dab2ac..000000000
--- a/gfx/pics/174/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/174/front.2bpp b/gfx/pics/174/front.2bpp
deleted file mode 100644
index 33ac4a33c..000000000
--- a/gfx/pics/174/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/174/tiles.2bpp b/gfx/pics/174/tiles.2bpp
deleted file mode 100644
index dfe5c45ea..000000000
--- a/gfx/pics/174/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/175/back.2bpp b/gfx/pics/175/back.2bpp
deleted file mode 100644
index a6a15697a..000000000
--- a/gfx/pics/175/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/175/front.2bpp b/gfx/pics/175/front.2bpp
deleted file mode 100644
index 830c04a43..000000000
--- a/gfx/pics/175/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/175/tiles.2bpp b/gfx/pics/175/tiles.2bpp
deleted file mode 100644
index 490202058..000000000
--- a/gfx/pics/175/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/176/back.2bpp b/gfx/pics/176/back.2bpp
deleted file mode 100644
index 86e920d1e..000000000
--- a/gfx/pics/176/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/176/front.2bpp b/gfx/pics/176/front.2bpp
deleted file mode 100644
index 885e5f440..000000000
--- a/gfx/pics/176/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/176/tiles.2bpp b/gfx/pics/176/tiles.2bpp
deleted file mode 100644
index a2ef39ed8..000000000
--- a/gfx/pics/176/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/177/back.2bpp b/gfx/pics/177/back.2bpp
deleted file mode 100644
index fa29a7ae6..000000000
--- a/gfx/pics/177/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/177/front.2bpp b/gfx/pics/177/front.2bpp
deleted file mode 100644
index 7ab3f4e2c..000000000
--- a/gfx/pics/177/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/177/tiles.2bpp b/gfx/pics/177/tiles.2bpp
deleted file mode 100644
index a546a8370..000000000
--- a/gfx/pics/177/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/178/back.2bpp b/gfx/pics/178/back.2bpp
deleted file mode 100644
index 13e973c0c..000000000
--- a/gfx/pics/178/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/178/front.2bpp b/gfx/pics/178/front.2bpp
deleted file mode 100644
index bf0ec5376..000000000
--- a/gfx/pics/178/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/178/tiles.2bpp b/gfx/pics/178/tiles.2bpp
deleted file mode 100644
index b589509c8..000000000
--- a/gfx/pics/178/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/179/back.2bpp b/gfx/pics/179/back.2bpp
deleted file mode 100644
index ad17faab8..000000000
--- a/gfx/pics/179/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/179/front.2bpp b/gfx/pics/179/front.2bpp
deleted file mode 100644
index 62db8aa05..000000000
--- a/gfx/pics/179/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/179/tiles.2bpp b/gfx/pics/179/tiles.2bpp
deleted file mode 100644
index 4234346c5..000000000
--- a/gfx/pics/179/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/180/back.2bpp b/gfx/pics/180/back.2bpp
deleted file mode 100644
index b0c57dce1..000000000
--- a/gfx/pics/180/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/180/front.2bpp b/gfx/pics/180/front.2bpp
deleted file mode 100644
index c93f05740..000000000
--- a/gfx/pics/180/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/180/tiles.2bpp b/gfx/pics/180/tiles.2bpp
deleted file mode 100644
index 2db8439bc..000000000
--- a/gfx/pics/180/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/181/back.2bpp b/gfx/pics/181/back.2bpp
deleted file mode 100644
index 365636d84..000000000
--- a/gfx/pics/181/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/181/front.2bpp b/gfx/pics/181/front.2bpp
deleted file mode 100644
index cd2091ff6..000000000
--- a/gfx/pics/181/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/181/tiles.2bpp b/gfx/pics/181/tiles.2bpp
deleted file mode 100644
index 90a92fc78..000000000
--- a/gfx/pics/181/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/182/back.2bpp b/gfx/pics/182/back.2bpp
deleted file mode 100644
index fc87054af..000000000
--- a/gfx/pics/182/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/182/front.2bpp b/gfx/pics/182/front.2bpp
deleted file mode 100644
index f8742565d..000000000
--- a/gfx/pics/182/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/182/tiles.2bpp b/gfx/pics/182/tiles.2bpp
deleted file mode 100644
index a79818073..000000000
--- a/gfx/pics/182/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/183/back.2bpp b/gfx/pics/183/back.2bpp
deleted file mode 100644
index bbbb57d15..000000000
--- a/gfx/pics/183/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/183/front.2bpp b/gfx/pics/183/front.2bpp
deleted file mode 100644
index 1db053d56..000000000
--- a/gfx/pics/183/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/183/tiles.2bpp b/gfx/pics/183/tiles.2bpp
deleted file mode 100644
index 22e44da38..000000000
--- a/gfx/pics/183/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/184/back.2bpp b/gfx/pics/184/back.2bpp
deleted file mode 100644
index 7d656ad9e..000000000
--- a/gfx/pics/184/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/184/front.2bpp b/gfx/pics/184/front.2bpp
deleted file mode 100644
index 300e3721f..000000000
--- a/gfx/pics/184/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/184/tiles.2bpp b/gfx/pics/184/tiles.2bpp
deleted file mode 100644
index 4d5ae7595..000000000
--- a/gfx/pics/184/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/185/back.2bpp b/gfx/pics/185/back.2bpp
deleted file mode 100644
index ad2f1d2e1..000000000
--- a/gfx/pics/185/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/185/front.2bpp b/gfx/pics/185/front.2bpp
deleted file mode 100644
index 4d0f66c6d..000000000
--- a/gfx/pics/185/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/185/tiles.2bpp b/gfx/pics/185/tiles.2bpp
deleted file mode 100644
index 9fc1f4e8a..000000000
--- a/gfx/pics/185/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/186/back.2bpp b/gfx/pics/186/back.2bpp
deleted file mode 100644
index f50ea27af..000000000
--- a/gfx/pics/186/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/186/front.2bpp b/gfx/pics/186/front.2bpp
deleted file mode 100644
index b15143240..000000000
--- a/gfx/pics/186/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/186/tiles.2bpp b/gfx/pics/186/tiles.2bpp
deleted file mode 100644
index c1e9c8608..000000000
--- a/gfx/pics/186/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/187/back.2bpp b/gfx/pics/187/back.2bpp
deleted file mode 100644
index e72b80045..000000000
--- a/gfx/pics/187/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/187/front.2bpp b/gfx/pics/187/front.2bpp
deleted file mode 100644
index 4a0a572bd..000000000
--- a/gfx/pics/187/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/187/tiles.2bpp b/gfx/pics/187/tiles.2bpp
deleted file mode 100644
index 7d5426666..000000000
--- a/gfx/pics/187/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/188/back.2bpp b/gfx/pics/188/back.2bpp
deleted file mode 100644
index 4c108d5d1..000000000
--- a/gfx/pics/188/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/188/front.2bpp b/gfx/pics/188/front.2bpp
deleted file mode 100644
index da4edac88..000000000
--- a/gfx/pics/188/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/188/tiles.2bpp b/gfx/pics/188/tiles.2bpp
deleted file mode 100644
index ef1a1b50e..000000000
--- a/gfx/pics/188/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/189/back.2bpp b/gfx/pics/189/back.2bpp
deleted file mode 100644
index f3088baeb..000000000
--- a/gfx/pics/189/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/189/front.2bpp b/gfx/pics/189/front.2bpp
deleted file mode 100644
index 882b44e4d..000000000
--- a/gfx/pics/189/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/189/tiles.2bpp b/gfx/pics/189/tiles.2bpp
deleted file mode 100644
index 912b8a77f..000000000
--- a/gfx/pics/189/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/190/back.2bpp b/gfx/pics/190/back.2bpp
deleted file mode 100644
index e92fbc6bb..000000000
--- a/gfx/pics/190/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/190/front.2bpp b/gfx/pics/190/front.2bpp
deleted file mode 100644
index da1d983de..000000000
--- a/gfx/pics/190/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/190/tiles.2bpp b/gfx/pics/190/tiles.2bpp
deleted file mode 100644
index c1c9f5f71..000000000
--- a/gfx/pics/190/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/191/back.2bpp b/gfx/pics/191/back.2bpp
deleted file mode 100644
index ac07040b5..000000000
--- a/gfx/pics/191/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/191/front.2bpp b/gfx/pics/191/front.2bpp
deleted file mode 100644
index 00396d8db..000000000
--- a/gfx/pics/191/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/191/tiles.2bpp b/gfx/pics/191/tiles.2bpp
deleted file mode 100644
index 4abf6acac..000000000
--- a/gfx/pics/191/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/192/back.2bpp b/gfx/pics/192/back.2bpp
deleted file mode 100644
index 83897f9fe..000000000
--- a/gfx/pics/192/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/192/front.2bpp b/gfx/pics/192/front.2bpp
deleted file mode 100644
index 67f32c179..000000000
--- a/gfx/pics/192/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/192/tiles.2bpp b/gfx/pics/192/tiles.2bpp
deleted file mode 100644
index 3de8db8ee..000000000
--- a/gfx/pics/192/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/193/back.2bpp b/gfx/pics/193/back.2bpp
deleted file mode 100644
index 639c0121f..000000000
--- a/gfx/pics/193/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/193/front.2bpp b/gfx/pics/193/front.2bpp
deleted file mode 100644
index 1c7dc44b4..000000000
--- a/gfx/pics/193/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/193/tiles.2bpp b/gfx/pics/193/tiles.2bpp
deleted file mode 100644
index f9773b2f1..000000000
--- a/gfx/pics/193/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/194/back.2bpp b/gfx/pics/194/back.2bpp
deleted file mode 100644
index 52362b9af..000000000
--- a/gfx/pics/194/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/194/front.2bpp b/gfx/pics/194/front.2bpp
deleted file mode 100644
index f6b25a521..000000000
--- a/gfx/pics/194/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/194/tiles.2bpp b/gfx/pics/194/tiles.2bpp
deleted file mode 100644
index c53e7fe68..000000000
--- a/gfx/pics/194/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/195/back.2bpp b/gfx/pics/195/back.2bpp
deleted file mode 100644
index 6b53330a7..000000000
--- a/gfx/pics/195/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/195/front.2bpp b/gfx/pics/195/front.2bpp
deleted file mode 100644
index 361569789..000000000
--- a/gfx/pics/195/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/195/tiles.2bpp b/gfx/pics/195/tiles.2bpp
deleted file mode 100644
index 146c85033..000000000
--- a/gfx/pics/195/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/196/back.2bpp b/gfx/pics/196/back.2bpp
deleted file mode 100644
index 4428ac785..000000000
--- a/gfx/pics/196/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/196/front.2bpp b/gfx/pics/196/front.2bpp
deleted file mode 100644
index 28d5c409e..000000000
--- a/gfx/pics/196/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/196/tiles.2bpp b/gfx/pics/196/tiles.2bpp
deleted file mode 100644
index f4acd1e08..000000000
--- a/gfx/pics/196/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/197/back.2bpp b/gfx/pics/197/back.2bpp
deleted file mode 100644
index a0be59d4e..000000000
--- a/gfx/pics/197/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/197/front.2bpp b/gfx/pics/197/front.2bpp
deleted file mode 100644
index 04ccb5159..000000000
--- a/gfx/pics/197/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/197/tiles.2bpp b/gfx/pics/197/tiles.2bpp
deleted file mode 100644
index 6dfd81e1a..000000000
--- a/gfx/pics/197/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/198/back.2bpp b/gfx/pics/198/back.2bpp
deleted file mode 100644
index f7245e38a..000000000
--- a/gfx/pics/198/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/198/front.2bpp b/gfx/pics/198/front.2bpp
deleted file mode 100644
index 1fbf410b0..000000000
--- a/gfx/pics/198/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/198/tiles.2bpp b/gfx/pics/198/tiles.2bpp
deleted file mode 100644
index 2b9cee375..000000000
--- a/gfx/pics/198/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/199/back.2bpp b/gfx/pics/199/back.2bpp
deleted file mode 100644
index c87cd0376..000000000
--- a/gfx/pics/199/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/199/front.2bpp b/gfx/pics/199/front.2bpp
deleted file mode 100644
index dd4c491dc..000000000
--- a/gfx/pics/199/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/199/tiles.2bpp b/gfx/pics/199/tiles.2bpp
deleted file mode 100644
index c3fcddb72..000000000
--- a/gfx/pics/199/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/200/back.2bpp b/gfx/pics/200/back.2bpp
deleted file mode 100644
index 6d690f3fd..000000000
--- a/gfx/pics/200/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/200/front.2bpp b/gfx/pics/200/front.2bpp
deleted file mode 100644
index 2ca65419c..000000000
--- a/gfx/pics/200/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/200/tiles.2bpp b/gfx/pics/200/tiles.2bpp
deleted file mode 100644
index 3c0fdc022..000000000
--- a/gfx/pics/200/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/201a/back.2bpp b/gfx/pics/201a/back.2bpp
deleted file mode 100644
index 8e24fb370..000000000
--- a/gfx/pics/201a/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/201a/front.2bpp b/gfx/pics/201a/front.2bpp
deleted file mode 100644
index d98e71138..000000000
--- a/gfx/pics/201a/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/201a/tiles.2bpp b/gfx/pics/201a/tiles.2bpp
deleted file mode 100644
index 143af3a72..000000000
--- a/gfx/pics/201a/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/201b/back.2bpp b/gfx/pics/201b/back.2bpp
deleted file mode 100644
index 966c4fb13..000000000
--- a/gfx/pics/201b/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/201b/front.2bpp b/gfx/pics/201b/front.2bpp
deleted file mode 100644
index e19f2a92b..000000000
--- a/gfx/pics/201b/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/201b/tiles.2bpp b/gfx/pics/201b/tiles.2bpp
deleted file mode 100644
index fe8c26a7f..000000000
--- a/gfx/pics/201b/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/201c/back.2bpp b/gfx/pics/201c/back.2bpp
deleted file mode 100644
index a00ba8aaf..000000000
--- a/gfx/pics/201c/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/201c/front.2bpp b/gfx/pics/201c/front.2bpp
deleted file mode 100644
index 463192c25..000000000
--- a/gfx/pics/201c/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/201c/tiles.2bpp b/gfx/pics/201c/tiles.2bpp
deleted file mode 100644
index 01b0e8239..000000000
--- a/gfx/pics/201c/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/201d/back.2bpp b/gfx/pics/201d/back.2bpp
deleted file mode 100644
index ed46aedcc..000000000
--- a/gfx/pics/201d/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/201d/front.2bpp b/gfx/pics/201d/front.2bpp
deleted file mode 100644
index 99449c727..000000000
--- a/gfx/pics/201d/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/201d/tiles.2bpp b/gfx/pics/201d/tiles.2bpp
deleted file mode 100644
index bf2b1a862..000000000
--- a/gfx/pics/201d/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/201e/back.2bpp b/gfx/pics/201e/back.2bpp
deleted file mode 100644
index bd60b6ce3..000000000
--- a/gfx/pics/201e/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/201e/front.2bpp b/gfx/pics/201e/front.2bpp
deleted file mode 100644
index ebdee409f..000000000
--- a/gfx/pics/201e/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/201e/tiles.2bpp b/gfx/pics/201e/tiles.2bpp
deleted file mode 100644
index 435eac9c3..000000000
--- a/gfx/pics/201e/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/201f/back.2bpp b/gfx/pics/201f/back.2bpp
deleted file mode 100644
index 88c08cdc1..000000000
--- a/gfx/pics/201f/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/201f/front.2bpp b/gfx/pics/201f/front.2bpp
deleted file mode 100644
index b7b7a364f..000000000
--- a/gfx/pics/201f/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/201f/tiles.2bpp b/gfx/pics/201f/tiles.2bpp
deleted file mode 100644
index 24442ee68..000000000
--- a/gfx/pics/201f/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/201g/back.2bpp b/gfx/pics/201g/back.2bpp
deleted file mode 100644
index 7e40e2ac7..000000000
--- a/gfx/pics/201g/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/201g/front.2bpp b/gfx/pics/201g/front.2bpp
deleted file mode 100644
index 38687782f..000000000
--- a/gfx/pics/201g/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/201g/tiles.2bpp b/gfx/pics/201g/tiles.2bpp
deleted file mode 100644
index f49c0a735..000000000
--- a/gfx/pics/201g/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/201h/back.2bpp b/gfx/pics/201h/back.2bpp
deleted file mode 100644
index dbfc71184..000000000
--- a/gfx/pics/201h/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/201h/front.2bpp b/gfx/pics/201h/front.2bpp
deleted file mode 100644
index e93bf79dd..000000000
--- a/gfx/pics/201h/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/201h/tiles.2bpp b/gfx/pics/201h/tiles.2bpp
deleted file mode 100644
index ca026a795..000000000
--- a/gfx/pics/201h/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/201i/back.2bpp b/gfx/pics/201i/back.2bpp
deleted file mode 100644
index 1ebeca277..000000000
--- a/gfx/pics/201i/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/201i/front.2bpp b/gfx/pics/201i/front.2bpp
deleted file mode 100644
index 5bd003a15..000000000
--- a/gfx/pics/201i/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/201i/tiles.2bpp b/gfx/pics/201i/tiles.2bpp
deleted file mode 100644
index f1e56e554..000000000
--- a/gfx/pics/201i/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/201j/back.2bpp b/gfx/pics/201j/back.2bpp
deleted file mode 100644
index 69f756cbc..000000000
--- a/gfx/pics/201j/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/201j/front.2bpp b/gfx/pics/201j/front.2bpp
deleted file mode 100644
index 832a20bed..000000000
--- a/gfx/pics/201j/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/201j/tiles.2bpp b/gfx/pics/201j/tiles.2bpp
deleted file mode 100644
index 170cc0f04..000000000
--- a/gfx/pics/201j/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/201k/back.2bpp b/gfx/pics/201k/back.2bpp
deleted file mode 100644
index b150c171f..000000000
--- a/gfx/pics/201k/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/201k/front.2bpp b/gfx/pics/201k/front.2bpp
deleted file mode 100644
index 65f71e9bf..000000000
--- a/gfx/pics/201k/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/201k/tiles.2bpp b/gfx/pics/201k/tiles.2bpp
deleted file mode 100644
index c10fb621e..000000000
--- a/gfx/pics/201k/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/201l/back.2bpp b/gfx/pics/201l/back.2bpp
deleted file mode 100644
index bd2218e27..000000000
--- a/gfx/pics/201l/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/201l/front.2bpp b/gfx/pics/201l/front.2bpp
deleted file mode 100644
index 82c250071..000000000
--- a/gfx/pics/201l/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/201l/tiles.2bpp b/gfx/pics/201l/tiles.2bpp
deleted file mode 100644
index 749b7e64f..000000000
--- a/gfx/pics/201l/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/201m/back.2bpp b/gfx/pics/201m/back.2bpp
deleted file mode 100644
index 27d5b2de7..000000000
--- a/gfx/pics/201m/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/201m/front.2bpp b/gfx/pics/201m/front.2bpp
deleted file mode 100644
index 6d8a8b1a3..000000000
--- a/gfx/pics/201m/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/201m/tiles.2bpp b/gfx/pics/201m/tiles.2bpp
deleted file mode 100644
index 72e47537f..000000000
--- a/gfx/pics/201m/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/201n/back.2bpp b/gfx/pics/201n/back.2bpp
deleted file mode 100644
index 2feb43f95..000000000
--- a/gfx/pics/201n/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/201n/front.2bpp b/gfx/pics/201n/front.2bpp
deleted file mode 100644
index d691bc972..000000000
--- a/gfx/pics/201n/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/201n/tiles.2bpp b/gfx/pics/201n/tiles.2bpp
deleted file mode 100644
index 130b063ed..000000000
--- a/gfx/pics/201n/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/201o/back.2bpp b/gfx/pics/201o/back.2bpp
deleted file mode 100644
index 2bad62791..000000000
--- a/gfx/pics/201o/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/201o/front.2bpp b/gfx/pics/201o/front.2bpp
deleted file mode 100644
index 86b969d2f..000000000
--- a/gfx/pics/201o/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/201o/tiles.2bpp b/gfx/pics/201o/tiles.2bpp
deleted file mode 100644
index ba3ebd7e8..000000000
--- a/gfx/pics/201o/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/201p/back.2bpp b/gfx/pics/201p/back.2bpp
deleted file mode 100644
index 1d8aea0a5..000000000
--- a/gfx/pics/201p/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/201p/front.2bpp b/gfx/pics/201p/front.2bpp
deleted file mode 100644
index 572354add..000000000
--- a/gfx/pics/201p/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/201p/tiles.2bpp b/gfx/pics/201p/tiles.2bpp
deleted file mode 100644
index 4a9b189c4..000000000
--- a/gfx/pics/201p/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/201q/back.2bpp b/gfx/pics/201q/back.2bpp
deleted file mode 100644
index 3e66ea03f..000000000
--- a/gfx/pics/201q/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/201q/front.2bpp b/gfx/pics/201q/front.2bpp
deleted file mode 100644
index f6a04d981..000000000
--- a/gfx/pics/201q/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/201q/tiles.2bpp b/gfx/pics/201q/tiles.2bpp
deleted file mode 100644
index 3667aa501..000000000
--- a/gfx/pics/201q/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/201r/back.2bpp b/gfx/pics/201r/back.2bpp
deleted file mode 100644
index cd7fc29bd..000000000
--- a/gfx/pics/201r/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/201r/front.2bpp b/gfx/pics/201r/front.2bpp
deleted file mode 100644
index 8255931b4..000000000
--- a/gfx/pics/201r/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/201r/tiles.2bpp b/gfx/pics/201r/tiles.2bpp
deleted file mode 100644
index 417942022..000000000
--- a/gfx/pics/201r/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/201s/back.2bpp b/gfx/pics/201s/back.2bpp
deleted file mode 100644
index fbfd4cd22..000000000
--- a/gfx/pics/201s/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/201s/front.2bpp b/gfx/pics/201s/front.2bpp
deleted file mode 100644
index 73654aa92..000000000
--- a/gfx/pics/201s/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/201s/tiles.2bpp b/gfx/pics/201s/tiles.2bpp
deleted file mode 100644
index acdcd859b..000000000
--- a/gfx/pics/201s/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/201t/back.2bpp b/gfx/pics/201t/back.2bpp
deleted file mode 100644
index fed927472..000000000
--- a/gfx/pics/201t/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/201t/front.2bpp b/gfx/pics/201t/front.2bpp
deleted file mode 100644
index ea920e70d..000000000
--- a/gfx/pics/201t/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/201t/tiles.2bpp b/gfx/pics/201t/tiles.2bpp
deleted file mode 100644
index 1c86d6889..000000000
--- a/gfx/pics/201t/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/201u/back.2bpp b/gfx/pics/201u/back.2bpp
deleted file mode 100644
index 21d910964..000000000
--- a/gfx/pics/201u/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/201u/front.2bpp b/gfx/pics/201u/front.2bpp
deleted file mode 100644
index efe4aa140..000000000
--- a/gfx/pics/201u/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/201u/tiles.2bpp b/gfx/pics/201u/tiles.2bpp
deleted file mode 100644
index 95f0d6840..000000000
--- a/gfx/pics/201u/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/201v/back.2bpp b/gfx/pics/201v/back.2bpp
deleted file mode 100644
index 1517f5de4..000000000
--- a/gfx/pics/201v/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/201v/front.2bpp b/gfx/pics/201v/front.2bpp
deleted file mode 100644
index 32c047dee..000000000
--- a/gfx/pics/201v/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/201v/tiles.2bpp b/gfx/pics/201v/tiles.2bpp
deleted file mode 100644
index ec65b3aaa..000000000
--- a/gfx/pics/201v/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/201w/back.2bpp b/gfx/pics/201w/back.2bpp
deleted file mode 100644
index fcc3418eb..000000000
--- a/gfx/pics/201w/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/201w/front.2bpp b/gfx/pics/201w/front.2bpp
deleted file mode 100644
index a3cc16a74..000000000
--- a/gfx/pics/201w/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/201w/tiles.2bpp b/gfx/pics/201w/tiles.2bpp
deleted file mode 100644
index 397707357..000000000
--- a/gfx/pics/201w/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/201x/back.2bpp b/gfx/pics/201x/back.2bpp
deleted file mode 100644
index 447e64df1..000000000
--- a/gfx/pics/201x/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/201x/front.2bpp b/gfx/pics/201x/front.2bpp
deleted file mode 100644
index f0af4af0e..000000000
--- a/gfx/pics/201x/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/201x/tiles.2bpp b/gfx/pics/201x/tiles.2bpp
deleted file mode 100644
index c753b1918..000000000
--- a/gfx/pics/201x/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/201y/back.2bpp b/gfx/pics/201y/back.2bpp
deleted file mode 100644
index a0ae1e216..000000000
--- a/gfx/pics/201y/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/201y/front.2bpp b/gfx/pics/201y/front.2bpp
deleted file mode 100644
index 20a965e3b..000000000
--- a/gfx/pics/201y/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/201y/tiles.2bpp b/gfx/pics/201y/tiles.2bpp
deleted file mode 100644
index ecbaae1e1..000000000
--- a/gfx/pics/201y/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/201z/back.2bpp b/gfx/pics/201z/back.2bpp
deleted file mode 100644
index a97af8da1..000000000
--- a/gfx/pics/201z/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/201z/front.2bpp b/gfx/pics/201z/front.2bpp
deleted file mode 100644
index 28668d4d1..000000000
--- a/gfx/pics/201z/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/201z/tiles.2bpp b/gfx/pics/201z/tiles.2bpp
deleted file mode 100644
index cf71d5300..000000000
--- a/gfx/pics/201z/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/202/back.2bpp b/gfx/pics/202/back.2bpp
deleted file mode 100644
index 965e70a4a..000000000
--- a/gfx/pics/202/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/202/front.2bpp b/gfx/pics/202/front.2bpp
deleted file mode 100644
index 2040029cb..000000000
--- a/gfx/pics/202/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/202/tiles.2bpp b/gfx/pics/202/tiles.2bpp
deleted file mode 100644
index 5e7ce1617..000000000
--- a/gfx/pics/202/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/203/back.2bpp b/gfx/pics/203/back.2bpp
deleted file mode 100644
index 2fb47c73c..000000000
--- a/gfx/pics/203/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/203/front.2bpp b/gfx/pics/203/front.2bpp
deleted file mode 100644
index 905de2bcf..000000000
--- a/gfx/pics/203/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/203/tiles.2bpp b/gfx/pics/203/tiles.2bpp
deleted file mode 100644
index b2fb43ffd..000000000
--- a/gfx/pics/203/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/204/back.2bpp b/gfx/pics/204/back.2bpp
deleted file mode 100644
index 052c295c7..000000000
--- a/gfx/pics/204/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/204/front.2bpp b/gfx/pics/204/front.2bpp
deleted file mode 100644
index beda00385..000000000
--- a/gfx/pics/204/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/204/tiles.2bpp b/gfx/pics/204/tiles.2bpp
deleted file mode 100644
index 84ab22b54..000000000
--- a/gfx/pics/204/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/205/back.2bpp b/gfx/pics/205/back.2bpp
deleted file mode 100644
index ecb5548db..000000000
--- a/gfx/pics/205/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/205/front.2bpp b/gfx/pics/205/front.2bpp
deleted file mode 100644
index c4ab17598..000000000
--- a/gfx/pics/205/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/205/tiles.2bpp b/gfx/pics/205/tiles.2bpp
deleted file mode 100644
index 1538dc346..000000000
--- a/gfx/pics/205/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/206/back.2bpp b/gfx/pics/206/back.2bpp
deleted file mode 100644
index c0c7de348..000000000
--- a/gfx/pics/206/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/206/front.2bpp b/gfx/pics/206/front.2bpp
deleted file mode 100644
index 0fb2017cc..000000000
--- a/gfx/pics/206/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/206/tiles.2bpp b/gfx/pics/206/tiles.2bpp
deleted file mode 100644
index a9b278e59..000000000
--- a/gfx/pics/206/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/207/back.2bpp b/gfx/pics/207/back.2bpp
deleted file mode 100644
index d33639c36..000000000
--- a/gfx/pics/207/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/207/front.2bpp b/gfx/pics/207/front.2bpp
deleted file mode 100644
index fcbfb86c2..000000000
--- a/gfx/pics/207/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/207/tiles.2bpp b/gfx/pics/207/tiles.2bpp
deleted file mode 100644
index 41b92305d..000000000
--- a/gfx/pics/207/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/208/back.2bpp b/gfx/pics/208/back.2bpp
deleted file mode 100644
index e4cdacc3a..000000000
--- a/gfx/pics/208/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/208/front.2bpp b/gfx/pics/208/front.2bpp
deleted file mode 100644
index d31a5d594..000000000
--- a/gfx/pics/208/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/208/tiles.2bpp b/gfx/pics/208/tiles.2bpp
deleted file mode 100644
index e543a04ba..000000000
--- a/gfx/pics/208/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/209/back.2bpp b/gfx/pics/209/back.2bpp
deleted file mode 100644
index 3a5ca1a78..000000000
--- a/gfx/pics/209/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/209/front.2bpp b/gfx/pics/209/front.2bpp
deleted file mode 100644
index 60ceecee0..000000000
--- a/gfx/pics/209/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/209/tiles.2bpp b/gfx/pics/209/tiles.2bpp
deleted file mode 100644
index b793155d0..000000000
--- a/gfx/pics/209/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/210/back.2bpp b/gfx/pics/210/back.2bpp
deleted file mode 100644
index 5c1ee168f..000000000
--- a/gfx/pics/210/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/210/front.2bpp b/gfx/pics/210/front.2bpp
deleted file mode 100644
index ebf7c57c1..000000000
--- a/gfx/pics/210/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/210/tiles.2bpp b/gfx/pics/210/tiles.2bpp
deleted file mode 100644
index 80947b21f..000000000
--- a/gfx/pics/210/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/211/back.2bpp b/gfx/pics/211/back.2bpp
deleted file mode 100644
index eab4ed581..000000000
--- a/gfx/pics/211/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/211/front.2bpp b/gfx/pics/211/front.2bpp
deleted file mode 100644
index 46384de83..000000000
--- a/gfx/pics/211/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/211/tiles.2bpp b/gfx/pics/211/tiles.2bpp
deleted file mode 100644
index 1c6ffa012..000000000
--- a/gfx/pics/211/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/212/back.2bpp b/gfx/pics/212/back.2bpp
deleted file mode 100644
index 89c1b4684..000000000
--- a/gfx/pics/212/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/212/front.2bpp b/gfx/pics/212/front.2bpp
deleted file mode 100644
index e80eed877..000000000
--- a/gfx/pics/212/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/212/tiles.2bpp b/gfx/pics/212/tiles.2bpp
deleted file mode 100644
index cc2058957..000000000
--- a/gfx/pics/212/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/213/back.2bpp b/gfx/pics/213/back.2bpp
deleted file mode 100644
index 6e9e1db0c..000000000
--- a/gfx/pics/213/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/213/front.2bpp b/gfx/pics/213/front.2bpp
deleted file mode 100644
index ceecc1ec0..000000000
--- a/gfx/pics/213/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/213/tiles.2bpp b/gfx/pics/213/tiles.2bpp
deleted file mode 100644
index 2096b76be..000000000
--- a/gfx/pics/213/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/214/back.2bpp b/gfx/pics/214/back.2bpp
deleted file mode 100644
index 3d89b1354..000000000
--- a/gfx/pics/214/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/214/front.2bpp b/gfx/pics/214/front.2bpp
deleted file mode 100644
index 6a66603bf..000000000
--- a/gfx/pics/214/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/214/tiles.2bpp b/gfx/pics/214/tiles.2bpp
deleted file mode 100644
index 19e390397..000000000
--- a/gfx/pics/214/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/215/back.2bpp b/gfx/pics/215/back.2bpp
deleted file mode 100644
index 97bf834c6..000000000
--- a/gfx/pics/215/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/215/front.2bpp b/gfx/pics/215/front.2bpp
deleted file mode 100644
index 2e1ed57c5..000000000
--- a/gfx/pics/215/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/215/tiles.2bpp b/gfx/pics/215/tiles.2bpp
deleted file mode 100644
index 237fd739e..000000000
--- a/gfx/pics/215/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/216/back.2bpp b/gfx/pics/216/back.2bpp
deleted file mode 100644
index 386caee90..000000000
--- a/gfx/pics/216/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/216/front.2bpp b/gfx/pics/216/front.2bpp
deleted file mode 100644
index d05c1f8ce..000000000
--- a/gfx/pics/216/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/216/tiles.2bpp b/gfx/pics/216/tiles.2bpp
deleted file mode 100644
index fcbc494c9..000000000
--- a/gfx/pics/216/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/217/back.2bpp b/gfx/pics/217/back.2bpp
deleted file mode 100644
index 91d89a0c6..000000000
--- a/gfx/pics/217/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/217/front.2bpp b/gfx/pics/217/front.2bpp
deleted file mode 100644
index c80f99a71..000000000
--- a/gfx/pics/217/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/217/tiles.2bpp b/gfx/pics/217/tiles.2bpp
deleted file mode 100644
index 3641c1b5a..000000000
--- a/gfx/pics/217/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/218/back.2bpp b/gfx/pics/218/back.2bpp
deleted file mode 100644
index 8d788967c..000000000
--- a/gfx/pics/218/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/218/front.2bpp b/gfx/pics/218/front.2bpp
deleted file mode 100644
index 7e2014af8..000000000
--- a/gfx/pics/218/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/218/tiles.2bpp b/gfx/pics/218/tiles.2bpp
deleted file mode 100644
index 4ce4e0d96..000000000
--- a/gfx/pics/218/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/219/back.2bpp b/gfx/pics/219/back.2bpp
deleted file mode 100644
index 991871339..000000000
--- a/gfx/pics/219/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/219/front.2bpp b/gfx/pics/219/front.2bpp
deleted file mode 100644
index 22f67aeb8..000000000
--- a/gfx/pics/219/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/219/tiles.2bpp b/gfx/pics/219/tiles.2bpp
deleted file mode 100644
index 70c7b847c..000000000
--- a/gfx/pics/219/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/220/back.2bpp b/gfx/pics/220/back.2bpp
deleted file mode 100644
index 8539c86e1..000000000
--- a/gfx/pics/220/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/220/front.2bpp b/gfx/pics/220/front.2bpp
deleted file mode 100644
index 31604b6a1..000000000
--- a/gfx/pics/220/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/220/tiles.2bpp b/gfx/pics/220/tiles.2bpp
deleted file mode 100644
index 703019d0d..000000000
--- a/gfx/pics/220/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/221/back.2bpp b/gfx/pics/221/back.2bpp
deleted file mode 100644
index 04b84ae62..000000000
--- a/gfx/pics/221/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/221/front.2bpp b/gfx/pics/221/front.2bpp
deleted file mode 100644
index 774591a2c..000000000
--- a/gfx/pics/221/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/221/tiles.2bpp b/gfx/pics/221/tiles.2bpp
deleted file mode 100644
index 3657ae149..000000000
--- a/gfx/pics/221/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/222/back.2bpp b/gfx/pics/222/back.2bpp
deleted file mode 100644
index d0fbc6659..000000000
--- a/gfx/pics/222/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/222/front.2bpp b/gfx/pics/222/front.2bpp
deleted file mode 100644
index 6252cbb69..000000000
--- a/gfx/pics/222/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/222/tiles.2bpp b/gfx/pics/222/tiles.2bpp
deleted file mode 100644
index ad9ab70c4..000000000
--- a/gfx/pics/222/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/223/back.2bpp b/gfx/pics/223/back.2bpp
deleted file mode 100644
index 0afbb143f..000000000
--- a/gfx/pics/223/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/223/front.2bpp b/gfx/pics/223/front.2bpp
deleted file mode 100644
index ed399f90a..000000000
--- a/gfx/pics/223/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/223/tiles.2bpp b/gfx/pics/223/tiles.2bpp
deleted file mode 100644
index d1bd965a4..000000000
--- a/gfx/pics/223/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/224/back.2bpp b/gfx/pics/224/back.2bpp
deleted file mode 100644
index c0ac2c0cc..000000000
--- a/gfx/pics/224/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/224/front.2bpp b/gfx/pics/224/front.2bpp
deleted file mode 100644
index 8250a2fef..000000000
--- a/gfx/pics/224/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/224/tiles.2bpp b/gfx/pics/224/tiles.2bpp
deleted file mode 100644
index 8cbe5a4b5..000000000
--- a/gfx/pics/224/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/225/back.2bpp b/gfx/pics/225/back.2bpp
deleted file mode 100644
index 8cd3ef3b9..000000000
--- a/gfx/pics/225/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/225/front.2bpp b/gfx/pics/225/front.2bpp
deleted file mode 100644
index 6603cb380..000000000
--- a/gfx/pics/225/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/225/tiles.2bpp b/gfx/pics/225/tiles.2bpp
deleted file mode 100644
index 926dee7fa..000000000
--- a/gfx/pics/225/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/226/back.2bpp b/gfx/pics/226/back.2bpp
deleted file mode 100644
index eb72373de..000000000
--- a/gfx/pics/226/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/226/front.2bpp b/gfx/pics/226/front.2bpp
deleted file mode 100644
index 6da57c6f4..000000000
--- a/gfx/pics/226/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/226/tiles.2bpp b/gfx/pics/226/tiles.2bpp
deleted file mode 100644
index e50ef97af..000000000
--- a/gfx/pics/226/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/227/back.2bpp b/gfx/pics/227/back.2bpp
deleted file mode 100644
index 65c892e8b..000000000
--- a/gfx/pics/227/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/227/front.2bpp b/gfx/pics/227/front.2bpp
deleted file mode 100644
index d70b4fe6d..000000000
--- a/gfx/pics/227/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/227/tiles.2bpp b/gfx/pics/227/tiles.2bpp
deleted file mode 100644
index edbf59b15..000000000
--- a/gfx/pics/227/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/228/back.2bpp b/gfx/pics/228/back.2bpp
deleted file mode 100644
index 22c18edf4..000000000
--- a/gfx/pics/228/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/228/front.2bpp b/gfx/pics/228/front.2bpp
deleted file mode 100644
index 378d7447d..000000000
--- a/gfx/pics/228/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/228/tiles.2bpp b/gfx/pics/228/tiles.2bpp
deleted file mode 100644
index 1f5701799..000000000
--- a/gfx/pics/228/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/229/back.2bpp b/gfx/pics/229/back.2bpp
deleted file mode 100644
index 8fd707725..000000000
--- a/gfx/pics/229/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/229/front.2bpp b/gfx/pics/229/front.2bpp
deleted file mode 100644
index ae2beb0ec..000000000
--- a/gfx/pics/229/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/229/tiles.2bpp b/gfx/pics/229/tiles.2bpp
deleted file mode 100644
index 89738fb53..000000000
--- a/gfx/pics/229/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/230/back.2bpp b/gfx/pics/230/back.2bpp
deleted file mode 100644
index b176f7dac..000000000
--- a/gfx/pics/230/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/230/front.2bpp b/gfx/pics/230/front.2bpp
deleted file mode 100644
index ea789a092..000000000
--- a/gfx/pics/230/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/230/tiles.2bpp b/gfx/pics/230/tiles.2bpp
deleted file mode 100644
index b762eb44a..000000000
--- a/gfx/pics/230/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/231/back.2bpp b/gfx/pics/231/back.2bpp
deleted file mode 100644
index 89cf6f7cd..000000000
--- a/gfx/pics/231/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/231/front.2bpp b/gfx/pics/231/front.2bpp
deleted file mode 100644
index 23123be12..000000000
--- a/gfx/pics/231/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/231/tiles.2bpp b/gfx/pics/231/tiles.2bpp
deleted file mode 100644
index 742277d77..000000000
--- a/gfx/pics/231/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/232/back.2bpp b/gfx/pics/232/back.2bpp
deleted file mode 100644
index abb01098d..000000000
--- a/gfx/pics/232/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/232/front.2bpp b/gfx/pics/232/front.2bpp
deleted file mode 100644
index 0ef2d59aa..000000000
--- a/gfx/pics/232/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/232/tiles.2bpp b/gfx/pics/232/tiles.2bpp
deleted file mode 100644
index 5ab683c40..000000000
--- a/gfx/pics/232/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/233/back.2bpp b/gfx/pics/233/back.2bpp
deleted file mode 100644
index 822db05ab..000000000
--- a/gfx/pics/233/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/233/front.2bpp b/gfx/pics/233/front.2bpp
deleted file mode 100644
index 5e33963d0..000000000
--- a/gfx/pics/233/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/233/tiles.2bpp b/gfx/pics/233/tiles.2bpp
deleted file mode 100644
index 05e67a2cd..000000000
--- a/gfx/pics/233/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/234/back.2bpp b/gfx/pics/234/back.2bpp
deleted file mode 100644
index 1a9f9992f..000000000
--- a/gfx/pics/234/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/234/front.2bpp b/gfx/pics/234/front.2bpp
deleted file mode 100644
index a72fe4f59..000000000
--- a/gfx/pics/234/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/234/tiles.2bpp b/gfx/pics/234/tiles.2bpp
deleted file mode 100644
index f962f1fd4..000000000
--- a/gfx/pics/234/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/235/back.2bpp b/gfx/pics/235/back.2bpp
deleted file mode 100644
index 20537d183..000000000
--- a/gfx/pics/235/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/235/front.2bpp b/gfx/pics/235/front.2bpp
deleted file mode 100644
index 2616ae6e1..000000000
--- a/gfx/pics/235/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/235/tiles.2bpp b/gfx/pics/235/tiles.2bpp
deleted file mode 100644
index baca61d6b..000000000
--- a/gfx/pics/235/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/236/back.2bpp b/gfx/pics/236/back.2bpp
deleted file mode 100644
index aa2307068..000000000
--- a/gfx/pics/236/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/236/front.2bpp b/gfx/pics/236/front.2bpp
deleted file mode 100644
index f19e5092a..000000000
--- a/gfx/pics/236/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/236/tiles.2bpp b/gfx/pics/236/tiles.2bpp
deleted file mode 100644
index 64e2d9731..000000000
--- a/gfx/pics/236/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/237/back.2bpp b/gfx/pics/237/back.2bpp
deleted file mode 100644
index e636b64a9..000000000
--- a/gfx/pics/237/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/237/front.2bpp b/gfx/pics/237/front.2bpp
deleted file mode 100644
index 55a401591..000000000
--- a/gfx/pics/237/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/237/tiles.2bpp b/gfx/pics/237/tiles.2bpp
deleted file mode 100644
index ae3e47270..000000000
--- a/gfx/pics/237/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/238/back.2bpp b/gfx/pics/238/back.2bpp
deleted file mode 100644
index 71c745eaa..000000000
--- a/gfx/pics/238/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/238/front.2bpp b/gfx/pics/238/front.2bpp
deleted file mode 100644
index b310969e6..000000000
--- a/gfx/pics/238/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/238/tiles.2bpp b/gfx/pics/238/tiles.2bpp
deleted file mode 100644
index 17d82ec69..000000000
--- a/gfx/pics/238/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/239/back.2bpp b/gfx/pics/239/back.2bpp
deleted file mode 100644
index eec8d614f..000000000
--- a/gfx/pics/239/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/239/front.2bpp b/gfx/pics/239/front.2bpp
deleted file mode 100644
index aa77ddd6e..000000000
--- a/gfx/pics/239/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/239/tiles.2bpp b/gfx/pics/239/tiles.2bpp
deleted file mode 100644
index 9f0a772de..000000000
--- a/gfx/pics/239/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/240/back.2bpp b/gfx/pics/240/back.2bpp
deleted file mode 100644
index 688fc4815..000000000
--- a/gfx/pics/240/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/240/front.2bpp b/gfx/pics/240/front.2bpp
deleted file mode 100644
index 49267eca5..000000000
--- a/gfx/pics/240/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/240/tiles.2bpp b/gfx/pics/240/tiles.2bpp
deleted file mode 100644
index 3db5ea0a6..000000000
--- a/gfx/pics/240/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/241/back.2bpp b/gfx/pics/241/back.2bpp
deleted file mode 100644
index 0c5ed4f40..000000000
--- a/gfx/pics/241/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/241/front.2bpp b/gfx/pics/241/front.2bpp
deleted file mode 100644
index 04aa39875..000000000
--- a/gfx/pics/241/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/241/tiles.2bpp b/gfx/pics/241/tiles.2bpp
deleted file mode 100644
index ce4855bc1..000000000
--- a/gfx/pics/241/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/242/back.2bpp b/gfx/pics/242/back.2bpp
deleted file mode 100644
index 637c91b93..000000000
--- a/gfx/pics/242/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/242/front.2bpp b/gfx/pics/242/front.2bpp
deleted file mode 100644
index 7ed8227e7..000000000
--- a/gfx/pics/242/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/242/tiles.2bpp b/gfx/pics/242/tiles.2bpp
deleted file mode 100644
index 7132deb80..000000000
--- a/gfx/pics/242/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/243/back.2bpp b/gfx/pics/243/back.2bpp
deleted file mode 100644
index c86247071..000000000
--- a/gfx/pics/243/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/243/front.2bpp b/gfx/pics/243/front.2bpp
deleted file mode 100644
index fcf1cb64c..000000000
--- a/gfx/pics/243/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/243/tiles.2bpp b/gfx/pics/243/tiles.2bpp
deleted file mode 100644
index f97b56df9..000000000
--- a/gfx/pics/243/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/244/back.2bpp b/gfx/pics/244/back.2bpp
deleted file mode 100644
index 81ca99d86..000000000
--- a/gfx/pics/244/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/244/front.2bpp b/gfx/pics/244/front.2bpp
deleted file mode 100644
index b98db5cce..000000000
--- a/gfx/pics/244/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/244/tiles.2bpp b/gfx/pics/244/tiles.2bpp
deleted file mode 100644
index 93ffaa2f5..000000000
--- a/gfx/pics/244/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/245/back.2bpp b/gfx/pics/245/back.2bpp
deleted file mode 100644
index 7205347c6..000000000
--- a/gfx/pics/245/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/245/front.2bpp b/gfx/pics/245/front.2bpp
deleted file mode 100644
index eeb01a9d9..000000000
--- a/gfx/pics/245/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/245/tiles.2bpp b/gfx/pics/245/tiles.2bpp
deleted file mode 100644
index 64bb1b3b2..000000000
--- a/gfx/pics/245/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/246/back.2bpp b/gfx/pics/246/back.2bpp
deleted file mode 100644
index d15a10d75..000000000
--- a/gfx/pics/246/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/246/front.2bpp b/gfx/pics/246/front.2bpp
deleted file mode 100644
index 23f711a6f..000000000
--- a/gfx/pics/246/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/246/tiles.2bpp b/gfx/pics/246/tiles.2bpp
deleted file mode 100644
index 7a0e9978a..000000000
--- a/gfx/pics/246/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/247/back.2bpp b/gfx/pics/247/back.2bpp
deleted file mode 100644
index 67731ae14..000000000
--- a/gfx/pics/247/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/247/front.2bpp b/gfx/pics/247/front.2bpp
deleted file mode 100644
index 9367d2c79..000000000
--- a/gfx/pics/247/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/247/tiles.2bpp b/gfx/pics/247/tiles.2bpp
deleted file mode 100644
index 406bde138..000000000
--- a/gfx/pics/247/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/248/back.2bpp b/gfx/pics/248/back.2bpp
deleted file mode 100644
index 40a592190..000000000
--- a/gfx/pics/248/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/248/front.2bpp b/gfx/pics/248/front.2bpp
deleted file mode 100644
index 6ea3d9fae..000000000
--- a/gfx/pics/248/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/248/tiles.2bpp b/gfx/pics/248/tiles.2bpp
deleted file mode 100644
index f18fbfb30..000000000
--- a/gfx/pics/248/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/249/back.2bpp b/gfx/pics/249/back.2bpp
deleted file mode 100644
index fd7c3b615..000000000
--- a/gfx/pics/249/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/249/front.2bpp b/gfx/pics/249/front.2bpp
deleted file mode 100644
index 45ca8db45..000000000
--- a/gfx/pics/249/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/249/tiles.2bpp b/gfx/pics/249/tiles.2bpp
deleted file mode 100644
index a37dbbfc9..000000000
--- a/gfx/pics/249/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/250/back.2bpp b/gfx/pics/250/back.2bpp
deleted file mode 100644
index 96a1dad0b..000000000
--- a/gfx/pics/250/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/250/front.2bpp b/gfx/pics/250/front.2bpp
deleted file mode 100644
index feb1fb7ba..000000000
--- a/gfx/pics/250/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/250/tiles.2bpp b/gfx/pics/250/tiles.2bpp
deleted file mode 100644
index a7dfba6b1..000000000
--- a/gfx/pics/250/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/251/back.2bpp b/gfx/pics/251/back.2bpp
deleted file mode 100644
index 394ef9769..000000000
--- a/gfx/pics/251/back.2bpp
+++ /dev/null
diff --git a/gfx/pics/251/front.2bpp b/gfx/pics/251/front.2bpp
deleted file mode 100644
index e0229eb53..000000000
--- a/gfx/pics/251/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/251/tiles.2bpp b/gfx/pics/251/tiles.2bpp
deleted file mode 100644
index 26aeda9c8..000000000
--- a/gfx/pics/251/tiles.2bpp
+++ /dev/null
diff --git a/gfx/pics/egg/front.2bpp b/gfx/pics/egg/front.2bpp
deleted file mode 100644
index 8c68b268a..000000000
--- a/gfx/pics/egg/front.2bpp
+++ /dev/null
diff --git a/gfx/pics/egg/tiles.2bpp b/gfx/pics/egg/tiles.2bpp
deleted file mode 100644
index ce66e26c2..000000000
--- a/gfx/pics/egg/tiles.2bpp
+++ /dev/null
diff --git a/gfx/tilesets/00.2bpp b/gfx/tilesets/00.2bpp
deleted file mode 100644
index 517b2dd03..000000000
--- a/gfx/tilesets/00.2bpp
+++ /dev/null
diff --git a/gfx/tilesets/lz/00.lz b/gfx/tilesets/00.lz
index 26cdee7a5..26cdee7a5 100644
--- a/gfx/tilesets/lz/00.lz
+++ b/gfx/tilesets/00.lz
diff --git a/gfx/tilesets/01.2bpp b/gfx/tilesets/01.2bpp
deleted file mode 100644
index 517b2dd03..000000000
--- a/gfx/tilesets/01.2bpp
+++ /dev/null
diff --git a/gfx/tilesets/lz/01.lz b/gfx/tilesets/01.lz
index 26cdee7a5..26cdee7a5 100644
--- a/gfx/tilesets/lz/01.lz
+++ b/gfx/tilesets/01.lz
diff --git a/gfx/tilesets/02.2bpp b/gfx/tilesets/02.2bpp
deleted file mode 100644
index 14b2aa2f0..000000000
--- a/gfx/tilesets/02.2bpp
+++ /dev/null
diff --git a/gfx/tilesets/lz/02.lz b/gfx/tilesets/02.lz
index c33920ea7..c33920ea7 100644
--- a/gfx/tilesets/lz/02.lz
+++ b/gfx/tilesets/02.lz
diff --git a/gfx/tilesets/03.2bpp b/gfx/tilesets/03.2bpp
deleted file mode 100644
index a6f8e9672..000000000
--- a/gfx/tilesets/03.2bpp
+++ /dev/null
diff --git a/gfx/tilesets/lz/03.lz b/gfx/tilesets/03.lz
index d5528e6ea..d5528e6ea 100644
--- a/gfx/tilesets/lz/03.lz
+++ b/gfx/tilesets/03.lz
diff --git a/gfx/tilesets/04.2bpp b/gfx/tilesets/04.2bpp
deleted file mode 100644
index 14b2aa2f0..000000000
--- a/gfx/tilesets/04.2bpp
+++ /dev/null
diff --git a/gfx/tilesets/lz/04.lz b/gfx/tilesets/04.lz
index c33920ea7..c33920ea7 100644
--- a/gfx/tilesets/lz/04.lz
+++ b/gfx/tilesets/04.lz
diff --git a/gfx/tilesets/05.2bpp b/gfx/tilesets/05.2bpp
deleted file mode 100644
index 7d838f863..000000000
--- a/gfx/tilesets/05.2bpp
+++ /dev/null
diff --git a/gfx/tilesets/lz/05.lz b/gfx/tilesets/05.lz
index a4fde3a53..a4fde3a53 100644
--- a/gfx/tilesets/lz/05.lz
+++ b/gfx/tilesets/05.lz
diff --git a/gfx/tilesets/06.2bpp b/gfx/tilesets/06.2bpp
deleted file mode 100644
index 4d92bc64e..000000000
--- a/gfx/tilesets/06.2bpp
+++ /dev/null
diff --git a/gfx/tilesets/lz/06.lz b/gfx/tilesets/06.lz
index 342165f65..342165f65 100644
--- a/gfx/tilesets/lz/06.lz
+++ b/gfx/tilesets/06.lz
diff --git a/gfx/tilesets/07.2bpp b/gfx/tilesets/07.2bpp
deleted file mode 100644
index 5c9024304..000000000
--- a/gfx/tilesets/07.2bpp
+++ /dev/null
diff --git a/gfx/tilesets/lz/07.lz b/gfx/tilesets/07.lz
index 456b0f570..456b0f570 100644
--- a/gfx/tilesets/lz/07.lz
+++ b/gfx/tilesets/07.lz
diff --git a/gfx/tilesets/08.2bpp b/gfx/tilesets/08.2bpp
deleted file mode 100644
index 814b63414..000000000
--- a/gfx/tilesets/08.2bpp
+++ /dev/null
diff --git a/gfx/tilesets/lz/08.lz b/gfx/tilesets/08.lz
index c86fe9093..c86fe9093 100644
--- a/gfx/tilesets/lz/08.lz
+++ b/gfx/tilesets/08.lz
diff --git a/gfx/tilesets/09.2bpp b/gfx/tilesets/09.2bpp
deleted file mode 100644
index 45aa74583..000000000
--- a/gfx/tilesets/09.2bpp
+++ /dev/null
diff --git a/gfx/tilesets/lz/09.lz b/gfx/tilesets/09.lz
index 01e4dc3a5..01e4dc3a5 100644
--- a/gfx/tilesets/lz/09.lz
+++ b/gfx/tilesets/09.lz
diff --git a/gfx/tilesets/10.2bpp b/gfx/tilesets/10.2bpp
deleted file mode 100644
index 7058197b1..000000000
--- a/gfx/tilesets/10.2bpp
+++ /dev/null
diff --git a/gfx/tilesets/lz/10.lz b/gfx/tilesets/10.lz
index d599354af..d599354af 100644
--- a/gfx/tilesets/lz/10.lz
+++ b/gfx/tilesets/10.lz
diff --git a/gfx/tilesets/11.2bpp b/gfx/tilesets/11.2bpp
deleted file mode 100644
index 2f71b9caf..000000000
--- a/gfx/tilesets/11.2bpp
+++ /dev/null
diff --git a/gfx/tilesets/lz/11.lz b/gfx/tilesets/11.lz
index aa592b1d5..aa592b1d5 100644
--- a/gfx/tilesets/lz/11.lz
+++ b/gfx/tilesets/11.lz
diff --git a/gfx/tilesets/12.2bpp b/gfx/tilesets/12.2bpp
deleted file mode 100644
index f2abc097e..000000000
--- a/gfx/tilesets/12.2bpp
+++ /dev/null
diff --git a/gfx/tilesets/lz/12.lz b/gfx/tilesets/12.lz
index e7830d831..e7830d831 100644
--- a/gfx/tilesets/lz/12.lz
+++ b/gfx/tilesets/12.lz
diff --git a/gfx/tilesets/13.2bpp b/gfx/tilesets/13.2bpp
deleted file mode 100644
index 1f222916d..000000000
--- a/gfx/tilesets/13.2bpp
+++ /dev/null
diff --git a/gfx/tilesets/lz/13.lz b/gfx/tilesets/13.lz
index b68f147d0..b68f147d0 100644
--- a/gfx/tilesets/lz/13.lz
+++ b/gfx/tilesets/13.lz
diff --git a/gfx/tilesets/14.2bpp b/gfx/tilesets/14.2bpp
deleted file mode 100644
index eede4c74c..000000000
--- a/gfx/tilesets/14.2bpp
+++ /dev/null
diff --git a/gfx/tilesets/lz/14.lz b/gfx/tilesets/14.lz
index afe093c97..afe093c97 100644
--- a/gfx/tilesets/lz/14.lz
+++ b/gfx/tilesets/14.lz
diff --git a/gfx/tilesets/15.2bpp b/gfx/tilesets/15.2bpp
deleted file mode 100644
index 4361b3d81..000000000
--- a/gfx/tilesets/15.2bpp
+++ /dev/null
diff --git a/gfx/tilesets/lz/15.lz b/gfx/tilesets/15.lz
index ff6eec958..ff6eec958 100644
--- a/gfx/tilesets/lz/15.lz
+++ b/gfx/tilesets/15.lz
diff --git a/gfx/tilesets/16.2bpp b/gfx/tilesets/16.2bpp
deleted file mode 100644
index 89e3764ca..000000000
--- a/gfx/tilesets/16.2bpp
+++ /dev/null
diff --git a/gfx/tilesets/lz/16.lz b/gfx/tilesets/16.lz
index a8821375c..a8821375c 100644
--- a/gfx/tilesets/lz/16.lz
+++ b/gfx/tilesets/16.lz
diff --git a/gfx/tilesets/17.2bpp b/gfx/tilesets/17.2bpp
deleted file mode 100644
index e34064d0d..000000000
--- a/gfx/tilesets/17.2bpp
+++ /dev/null
diff --git a/gfx/tilesets/lz/17.lz b/gfx/tilesets/17.lz
index 56e509f5e..56e509f5e 100644
--- a/gfx/tilesets/lz/17.lz
+++ b/gfx/tilesets/17.lz
diff --git a/gfx/tilesets/18.2bpp b/gfx/tilesets/18.2bpp
deleted file mode 100644
index 7afddc635..000000000
--- a/gfx/tilesets/18.2bpp
+++ /dev/null
diff --git a/gfx/tilesets/lz/18.lz b/gfx/tilesets/18.lz
index ad4129733..ad4129733 100644
--- a/gfx/tilesets/lz/18.lz
+++ b/gfx/tilesets/18.lz
diff --git a/gfx/tilesets/19.2bpp b/gfx/tilesets/19.2bpp
deleted file mode 100644
index 90bbb360b..000000000
--- a/gfx/tilesets/19.2bpp
+++ /dev/null
diff --git a/gfx/tilesets/lz/19.lz b/gfx/tilesets/19.lz
index 6264091ea..6264091ea 100644
--- a/gfx/tilesets/lz/19.lz
+++ b/gfx/tilesets/19.lz
diff --git a/gfx/tilesets/20.2bpp b/gfx/tilesets/20.2bpp
deleted file mode 100644
index e897415ad..000000000
--- a/gfx/tilesets/20.2bpp
+++ /dev/null
diff --git a/gfx/tilesets/lz/20.lz b/gfx/tilesets/20.lz
index 8cf39f262..8cf39f262 100644
--- a/gfx/tilesets/lz/20.lz
+++ b/gfx/tilesets/20.lz
diff --git a/gfx/tilesets/21.2bpp b/gfx/tilesets/21.2bpp
deleted file mode 100644
index c14fa543e..000000000
--- a/gfx/tilesets/21.2bpp
+++ /dev/null
diff --git a/gfx/tilesets/lz/21.lz b/gfx/tilesets/21.lz
index ae250c001..ae250c001 100644
--- a/gfx/tilesets/lz/21.lz
+++ b/gfx/tilesets/21.lz
diff --git a/gfx/tilesets/22.2bpp b/gfx/tilesets/22.2bpp
deleted file mode 100644
index e6147fa32..000000000
--- a/gfx/tilesets/22.2bpp
+++ /dev/null
diff --git a/gfx/tilesets/lz/22.lz b/gfx/tilesets/22.lz
index a788ae8c0..a788ae8c0 100644
--- a/gfx/tilesets/lz/22.lz
+++ b/gfx/tilesets/22.lz
diff --git a/gfx/tilesets/23.2bpp b/gfx/tilesets/23.2bpp
deleted file mode 100644
index 63241c2c8..000000000
--- a/gfx/tilesets/23.2bpp
+++ /dev/null
diff --git a/gfx/tilesets/lz/23.lz b/gfx/tilesets/23.lz
index c51f717b0..c51f717b0 100644
--- a/gfx/tilesets/lz/23.lz
+++ b/gfx/tilesets/23.lz
diff --git a/gfx/tilesets/24.2bpp b/gfx/tilesets/24.2bpp
deleted file mode 100644
index e65ffe37f..000000000
--- a/gfx/tilesets/24.2bpp
+++ /dev/null
diff --git a/gfx/tilesets/lz/24.lz b/gfx/tilesets/24.lz
index 01bb3bdf6..01bb3bdf6 100644
--- a/gfx/tilesets/lz/24.lz
+++ b/gfx/tilesets/24.lz
diff --git a/gfx/tilesets/25.2bpp b/gfx/tilesets/25.2bpp
deleted file mode 100644
index 35b74346c..000000000
--- a/gfx/tilesets/25.2bpp
+++ /dev/null
diff --git a/gfx/tilesets/lz/25.lz b/gfx/tilesets/25.lz
index d2a88f5c6..d2a88f5c6 100644
--- a/gfx/tilesets/lz/25.lz
+++ b/gfx/tilesets/25.lz
diff --git a/gfx/tilesets/26.2bpp b/gfx/tilesets/26.2bpp
deleted file mode 100644
index 98ff24edf..000000000
--- a/gfx/tilesets/26.2bpp
+++ /dev/null
diff --git a/gfx/tilesets/lz/26.lz b/gfx/tilesets/26.lz
index ead4b25bf..ead4b25bf 100644
--- a/gfx/tilesets/lz/26.lz
+++ b/gfx/tilesets/26.lz
diff --git a/gfx/tilesets/27.2bpp b/gfx/tilesets/27.2bpp
deleted file mode 100644
index 74e65237e..000000000
--- a/gfx/tilesets/27.2bpp
+++ /dev/null
diff --git a/gfx/tilesets/lz/27.lz b/gfx/tilesets/27.lz
index 0e2630574..0e2630574 100644
--- a/gfx/tilesets/lz/27.lz
+++ b/gfx/tilesets/27.lz
diff --git a/gfx/tilesets/28.2bpp b/gfx/tilesets/28.2bpp
deleted file mode 100644
index 245d70962..000000000
--- a/gfx/tilesets/28.2bpp
+++ /dev/null
diff --git a/gfx/tilesets/lz/28.lz b/gfx/tilesets/28.lz
index 8ba18b56c..8ba18b56c 100644
--- a/gfx/tilesets/lz/28.lz
+++ b/gfx/tilesets/28.lz
diff --git a/gfx/tilesets/29.2bpp b/gfx/tilesets/29.2bpp
deleted file mode 100644
index a72e06951..000000000
--- a/gfx/tilesets/29.2bpp
+++ /dev/null
diff --git a/gfx/tilesets/lz/29.lz b/gfx/tilesets/29.lz
index 8350f7f9d..8350f7f9d 100644
--- a/gfx/tilesets/lz/29.lz
+++ b/gfx/tilesets/29.lz
diff --git a/gfx/tilesets/30.2bpp b/gfx/tilesets/30.2bpp
deleted file mode 100644
index fe6a79efa..000000000
--- a/gfx/tilesets/30.2bpp
+++ /dev/null
diff --git a/gfx/tilesets/lz/30.lz b/gfx/tilesets/30.lz
index 775ac2c6c..775ac2c6c 100644
--- a/gfx/tilesets/lz/30.lz
+++ b/gfx/tilesets/30.lz
diff --git a/gfx/tilesets/31.2bpp b/gfx/tilesets/31.2bpp
deleted file mode 100644
index 793048c92..000000000
--- a/gfx/tilesets/31.2bpp
+++ /dev/null
diff --git a/gfx/tilesets/lz/31.lz b/gfx/tilesets/31.lz
index 32304f928..32304f928 100644
--- a/gfx/tilesets/lz/31.lz
+++ b/gfx/tilesets/31.lz
diff --git a/gfx/tilesets/32.2bpp b/gfx/tilesets/32.2bpp
deleted file mode 100644
index 98ff24edf..000000000
--- a/gfx/tilesets/32.2bpp
+++ /dev/null
diff --git a/gfx/tilesets/lz/32.lz b/gfx/tilesets/32.lz
index ead4b25bf..ead4b25bf 100644
--- a/gfx/tilesets/lz/32.lz
+++ b/gfx/tilesets/32.lz
diff --git a/gfx/tilesets/33.2bpp b/gfx/tilesets/33.2bpp
deleted file mode 100644
index 98ff24edf..000000000
--- a/gfx/tilesets/33.2bpp
+++ /dev/null
diff --git a/gfx/tilesets/lz/33.lz b/gfx/tilesets/33.lz
index ead4b25bf..ead4b25bf 100644
--- a/gfx/tilesets/lz/33.lz
+++ b/gfx/tilesets/33.lz
diff --git a/gfx/tilesets/34.2bpp b/gfx/tilesets/34.2bpp
deleted file mode 100644
index 98ff24edf..000000000
--- a/gfx/tilesets/34.2bpp
+++ /dev/null
diff --git a/gfx/tilesets/lz/34.lz b/gfx/tilesets/34.lz
index ead4b25bf..ead4b25bf 100644
--- a/gfx/tilesets/lz/34.lz
+++ b/gfx/tilesets/34.lz
diff --git a/gfx/tilesets/35.2bpp b/gfx/tilesets/35.2bpp
deleted file mode 100644
index 98ff24edf..000000000
--- a/gfx/tilesets/35.2bpp
+++ /dev/null
diff --git a/gfx/tilesets/lz/35.lz b/gfx/tilesets/35.lz
index ead4b25bf..ead4b25bf 100644
--- a/gfx/tilesets/lz/35.lz
+++ b/gfx/tilesets/35.lz
diff --git a/gfx/tilesets/36.2bpp b/gfx/tilesets/36.2bpp
deleted file mode 100644
index 98ff24edf..000000000
--- a/gfx/tilesets/36.2bpp
+++ /dev/null
diff --git a/gfx/tilesets/lz/36.lz b/gfx/tilesets/36.lz
index ead4b25bf..ead4b25bf 100644
--- a/gfx/tilesets/lz/36.lz
+++ b/gfx/tilesets/36.lz
diff --git a/gfx/title/crystal.2bpp b/gfx/title/crystal.2bpp
deleted file mode 100644
index 66b9dd011..000000000
--- a/gfx/title/crystal.2bpp
+++ /dev/null
diff --git a/gfx/title/lz/crystal.lz b/gfx/title/crystal.lz
index 2d23414aa..2d23414aa 100644
--- a/gfx/title/lz/crystal.lz
+++ b/gfx/title/crystal.lz
diff --git a/gfx/title/logo.2bpp b/gfx/title/logo.2bpp
deleted file mode 100644
index 00ac8ca18..000000000
--- a/gfx/title/logo.2bpp
+++ /dev/null
diff --git a/gfx/title/lz/logo.lz b/gfx/title/logo.lz
index 171a578b4..171a578b4 100644
--- a/gfx/title/lz/logo.lz
+++ b/gfx/title/logo.lz
diff --git a/gfx/title/suicune.2bpp b/gfx/title/suicune.2bpp
deleted file mode 100644
index ef5cd6cbf..000000000
--- a/gfx/title/suicune.2bpp
+++ /dev/null
diff --git a/gfx/title/lz/suicune.lz b/gfx/title/suicune.lz
index c8df5b38d..c8df5b38d 100644
--- a/gfx/title/lz/suicune.lz
+++ b/gfx/title/suicune.lz
diff --git a/gfx/trainers/000.2bpp b/gfx/trainers/000.2bpp
deleted file mode 100644
index e6bb36e9e..000000000
--- a/gfx/trainers/000.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/000.lz b/gfx/trainers/000.lz
index 323587e3a..323587e3a 100644
--- a/gfx/trainers/lz/000.lz
+++ b/gfx/trainers/000.lz
diff --git a/gfx/trainers/000.pal b/gfx/trainers/000.pal
new file mode 100644
index 000000000..672bd6a28
--- /dev/null
+++ b/gfx/trainers/000.pal
@@ -0,0 +1 @@
+;:�|
\ No newline at end of file
diff --git a/gfx/trainers/001.2bpp b/gfx/trainers/001.2bpp
deleted file mode 100644
index e0fe96541..000000000
--- a/gfx/trainers/001.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/001.lz b/gfx/trainers/001.lz
index 9564767a8..9564767a8 100644
--- a/gfx/trainers/lz/001.lz
+++ b/gfx/trainers/001.lz
diff --git a/gfx/trainers/001.pal b/gfx/trainers/001.pal
new file mode 100644
index 000000000..c95646d05
--- /dev/null
+++ b/gfx/trainers/001.pal
@@ -0,0 +1 @@
+\&�
\ No newline at end of file
diff --git a/gfx/trainers/002.2bpp b/gfx/trainers/002.2bpp
deleted file mode 100644
index bd7756a65..000000000
--- a/gfx/trainers/002.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/002.lz b/gfx/trainers/002.lz
index 7910628aa..7910628aa 100644
--- a/gfx/trainers/lz/002.lz
+++ b/gfx/trainers/002.lz
diff --git a/gfx/trainers/002.pal b/gfx/trainers/002.pal
new file mode 100644
index 000000000..d61ec44e3
--- /dev/null
+++ b/gfx/trainers/002.pal
@@ -0,0 +1 @@
+Z>�
\ No newline at end of file
diff --git a/gfx/trainers/003.2bpp b/gfx/trainers/003.2bpp
deleted file mode 100644
index c068570fe..000000000
--- a/gfx/trainers/003.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/003.lz b/gfx/trainers/003.lz
index 67999aeb8..67999aeb8 100644
--- a/gfx/trainers/lz/003.lz
+++ b/gfx/trainers/003.lz
diff --git a/gfx/trainers/003.pal b/gfx/trainers/003.pal
new file mode 100644
index 000000000..65c2822a0
--- /dev/null
+++ b/gfx/trainers/003.pal
@@ -0,0 +1 @@
+=2�X
\ No newline at end of file
diff --git a/gfx/trainers/004.2bpp b/gfx/trainers/004.2bpp
deleted file mode 100644
index 2f8fd6b57..000000000
--- a/gfx/trainers/004.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/004.lz b/gfx/trainers/004.lz
index ca69273e0..ca69273e0 100644
--- a/gfx/trainers/lz/004.lz
+++ b/gfx/trainers/004.lz
diff --git a/gfx/trainers/004.pal b/gfx/trainers/004.pal
new file mode 100644
index 000000000..0b1e0d893
--- /dev/null
+++ b/gfx/trainers/004.pal
@@ -0,0 +1 @@
+_B,!
\ No newline at end of file
diff --git a/gfx/trainers/005.2bpp b/gfx/trainers/005.2bpp
deleted file mode 100644
index a7f0bfa67..000000000
--- a/gfx/trainers/005.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/005.lz b/gfx/trainers/005.lz
index 7c08ded94..7c08ded94 100644
--- a/gfx/trainers/lz/005.lz
+++ b/gfx/trainers/005.lz
diff --git a/gfx/trainers/005.pal b/gfx/trainers/005.pal
new file mode 100644
index 000000000..0ac0ad8cf
--- /dev/null
+++ b/gfx/trainers/005.pal
@@ -0,0 +1 @@
+Z*0-
\ No newline at end of file
diff --git a/gfx/trainers/006.2bpp b/gfx/trainers/006.2bpp
deleted file mode 100644
index 8cd17954b..000000000
--- a/gfx/trainers/006.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/006.lz b/gfx/trainers/006.lz
index 0a92c7074..0a92c7074 100644
--- a/gfx/trainers/lz/006.lz
+++ b/gfx/trainers/006.lz
diff --git a/gfx/trainers/006.pal b/gfx/trainers/006.pal
new file mode 100644
index 000000000..c306470b2
--- /dev/null
+++ b/gfx/trainers/006.pal
@@ -0,0 +1 @@
+2!
\ No newline at end of file
diff --git a/gfx/trainers/007.2bpp b/gfx/trainers/007.2bpp
deleted file mode 100644
index b70e1c3de..000000000
--- a/gfx/trainers/007.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/007.lz b/gfx/trainers/007.lz
index bbc463594..bbc463594 100644
--- a/gfx/trainers/lz/007.lz
+++ b/gfx/trainers/007.lz
diff --git a/gfx/trainers/007.pal b/gfx/trainers/007.pal
new file mode 100644
index 000000000..2b3187282
--- /dev/null
+++ b/gfx/trainers/007.pal
@@ -0,0 +1 @@
+[2hA
\ No newline at end of file
diff --git a/gfx/trainers/008.2bpp b/gfx/trainers/008.2bpp
deleted file mode 100644
index f364bf724..000000000
--- a/gfx/trainers/008.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/008.lz b/gfx/trainers/008.lz
index 9a5b99abc..9a5b99abc 100644
--- a/gfx/trainers/lz/008.lz
+++ b/gfx/trainers/008.lz
diff --git a/gfx/trainers/008.pal b/gfx/trainers/008.pal
new file mode 100644
index 000000000..61684c019
--- /dev/null
+++ b/gfx/trainers/008.pal
@@ -0,0 +1 @@
+[�$
\ No newline at end of file
diff --git a/gfx/trainers/009.2bpp b/gfx/trainers/009.2bpp
deleted file mode 100644
index 0790560b6..000000000
--- a/gfx/trainers/009.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/009.lz b/gfx/trainers/009.lz
index 276f7c533..276f7c533 100644
--- a/gfx/trainers/lz/009.lz
+++ b/gfx/trainers/009.lz
diff --git a/gfx/trainers/009.pal b/gfx/trainers/009.pal
new file mode 100644
index 000000000..afcdbb026
--- /dev/null
+++ b/gfx/trainers/009.pal
@@ -0,0 +1 @@
+x.

\ No newline at end of file
diff --git a/gfx/trainers/010.2bpp b/gfx/trainers/010.2bpp
deleted file mode 100644
index dac9e5eab..000000000
--- a/gfx/trainers/010.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/010.lz b/gfx/trainers/010.lz
index 3de211cd4..3de211cd4 100644
--- a/gfx/trainers/lz/010.lz
+++ b/gfx/trainers/010.lz
diff --git a/gfx/trainers/010.pal b/gfx/trainers/010.pal
new file mode 100644
index 000000000..49451c709
--- /dev/null
+++ b/gfx/trainers/010.pal
@@ -0,0 +1 @@
+�%�
\ No newline at end of file
diff --git a/gfx/trainers/011.2bpp b/gfx/trainers/011.2bpp
deleted file mode 100644
index c1b4c538d..000000000
--- a/gfx/trainers/011.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/011.lz b/gfx/trainers/011.lz
index f7d3570ae..f7d3570ae 100644
--- a/gfx/trainers/lz/011.lz
+++ b/gfx/trainers/011.lz
diff --git a/gfx/trainers/011.pal b/gfx/trainers/011.pal
new file mode 100644
index 000000000..666509b46
--- /dev/null
+++ b/gfx/trainers/011.pal
@@ -0,0 +1 @@
+Y26
\ No newline at end of file
diff --git a/gfx/trainers/012.2bpp b/gfx/trainers/012.2bpp
deleted file mode 100644
index ece6c924a..000000000
--- a/gfx/trainers/012.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/012.lz b/gfx/trainers/012.lz
index 69406d11d..69406d11d 100644
--- a/gfx/trainers/lz/012.lz
+++ b/gfx/trainers/012.lz
diff --git a/gfx/trainers/012.pal b/gfx/trainers/012.pal
new file mode 100644
index 000000000..aa301bfa2
--- /dev/null
+++ b/gfx/trainers/012.pal
@@ -0,0 +1 @@
+92H1
\ No newline at end of file
diff --git a/gfx/trainers/013.2bpp b/gfx/trainers/013.2bpp
deleted file mode 100644
index cbd46b044..000000000
--- a/gfx/trainers/013.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/013.lz b/gfx/trainers/013.lz
index a0bd871f7..a0bd871f7 100644
--- a/gfx/trainers/lz/013.lz
+++ b/gfx/trainers/013.lz
diff --git a/gfx/trainers/013.pal b/gfx/trainers/013.pal
new file mode 100644
index 000000000..cf184c470
--- /dev/null
+++ b/gfx/trainers/013.pal
@@ -0,0 +1 @@
+^:
\ No newline at end of file
diff --git a/gfx/trainers/014.2bpp b/gfx/trainers/014.2bpp
deleted file mode 100644
index 0e1bd7aab..000000000
--- a/gfx/trainers/014.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/014.lz b/gfx/trainers/014.lz
index bc4501f08..bc4501f08 100644
--- a/gfx/trainers/lz/014.lz
+++ b/gfx/trainers/014.lz
diff --git a/gfx/trainers/014.pal b/gfx/trainers/014.pal
new file mode 100644
index 000000000..67863a9da
--- /dev/null
+++ b/gfx/trainers/014.pal
@@ -0,0 +1 @@
+[:�4
\ No newline at end of file
diff --git a/gfx/trainers/015.2bpp b/gfx/trainers/015.2bpp
deleted file mode 100644
index 4b61b6b30..000000000
--- a/gfx/trainers/015.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/015.lz b/gfx/trainers/015.lz
index c5840a676..c5840a676 100644
--- a/gfx/trainers/lz/015.lz
+++ b/gfx/trainers/015.lz
diff --git a/gfx/trainers/015.pal b/gfx/trainers/015.pal
new file mode 100644
index 000000000..f63d426e9
--- /dev/null
+++ b/gfx/trainers/015.pal
@@ -0,0 +1 @@
+}>5
\ No newline at end of file
diff --git a/gfx/trainers/016.2bpp b/gfx/trainers/016.2bpp
deleted file mode 100644
index 127564f52..000000000
--- a/gfx/trainers/016.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/016.lz b/gfx/trainers/016.lz
index d7a4e29bf..d7a4e29bf 100644
--- a/gfx/trainers/lz/016.lz
+++ b/gfx/trainers/016.lz
diff --git a/gfx/trainers/016.pal b/gfx/trainers/016.pal
new file mode 100644
index 000000000..35ba2e5a7
--- /dev/null
+++ b/gfx/trainers/016.pal
@@ -0,0 +1 @@
+^:�(
\ No newline at end of file
diff --git a/gfx/trainers/017.2bpp b/gfx/trainers/017.2bpp
deleted file mode 100644
index 6cc383e59..000000000
--- a/gfx/trainers/017.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/017.lz b/gfx/trainers/017.lz
index 1a96cdddd..1a96cdddd 100644
--- a/gfx/trainers/lz/017.lz
+++ b/gfx/trainers/017.lz
diff --git a/gfx/trainers/017.pal b/gfx/trainers/017.pal
new file mode 100644
index 000000000..ca14a7d16
--- /dev/null
+++ b/gfx/trainers/017.pal
@@ -0,0 +1 @@
+}BT
\ No newline at end of file
diff --git a/gfx/trainers/018.2bpp b/gfx/trainers/018.2bpp
deleted file mode 100644
index 8c9a846ed..000000000
--- a/gfx/trainers/018.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/018.lz b/gfx/trainers/018.lz
index 9a3df5d3f..9a3df5d3f 100644
--- a/gfx/trainers/lz/018.lz
+++ b/gfx/trainers/018.lz
diff --git a/gfx/trainers/018.pal b/gfx/trainers/018.pal
new file mode 100644
index 000000000..e90176224
--- /dev/null
+++ b/gfx/trainers/018.pal
@@ -0,0 +1 @@
+9:�)
\ No newline at end of file
diff --git a/gfx/trainers/019.2bpp b/gfx/trainers/019.2bpp
deleted file mode 100644
index 9b8085fed..000000000
--- a/gfx/trainers/019.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/019.lz b/gfx/trainers/019.lz
index 033f421b5..033f421b5 100644
--- a/gfx/trainers/lz/019.lz
+++ b/gfx/trainers/019.lz
diff --git a/gfx/trainers/019.pal b/gfx/trainers/019.pal
new file mode 100644
index 000000000..7e7379e12
--- /dev/null
+++ b/gfx/trainers/019.pal
@@ -0,0 +1 @@
+x.�E
\ No newline at end of file
diff --git a/gfx/trainers/020.2bpp b/gfx/trainers/020.2bpp
deleted file mode 100644
index 490f7593c..000000000
--- a/gfx/trainers/020.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/020.lz b/gfx/trainers/020.lz
index 963363d26..963363d26 100644
--- a/gfx/trainers/lz/020.lz
+++ b/gfx/trainers/020.lz
diff --git a/gfx/trainers/020.pal b/gfx/trainers/020.pal
new file mode 100644
index 000000000..7a9de6896
--- /dev/null
+++ b/gfx/trainers/020.pal
@@ -0,0 +1 @@
+_6�!
\ No newline at end of file
diff --git a/gfx/trainers/021.2bpp b/gfx/trainers/021.2bpp
deleted file mode 100644
index 56861e13c..000000000
--- a/gfx/trainers/021.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/021.lz b/gfx/trainers/021.lz
index ec742f9f3..ec742f9f3 100644
--- a/gfx/trainers/lz/021.lz
+++ b/gfx/trainers/021.lz
diff --git a/gfx/trainers/021.pal b/gfx/trainers/021.pal
new file mode 100644
index 000000000..6a6a07f7d
--- /dev/null
+++ b/gfx/trainers/021.pal
@@ -0,0 +1 @@
+�&�]
\ No newline at end of file
diff --git a/gfx/trainers/022.2bpp b/gfx/trainers/022.2bpp
deleted file mode 100644
index 134e0a7b1..000000000
--- a/gfx/trainers/022.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/022.lz b/gfx/trainers/022.lz
index 7d9bd00a3..7d9bd00a3 100644
--- a/gfx/trainers/lz/022.lz
+++ b/gfx/trainers/022.lz
diff --git a/gfx/trainers/022.pal b/gfx/trainers/022.pal
new file mode 100644
index 000000000..2cd724140
--- /dev/null
+++ b/gfx/trainers/022.pal
@@ -0,0 +1 @@
+.Ma
\ No newline at end of file
diff --git a/gfx/trainers/023.2bpp b/gfx/trainers/023.2bpp
deleted file mode 100644
index e3c4336ef..000000000
--- a/gfx/trainers/023.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/023.lz b/gfx/trainers/023.lz
index 48b505847..48b505847 100644
--- a/gfx/trainers/lz/023.lz
+++ b/gfx/trainers/023.lz
diff --git a/gfx/trainers/023.pal b/gfx/trainers/023.pal
new file mode 100644
index 000000000..0f2511307
--- /dev/null
+++ b/gfx/trainers/023.pal
@@ -0,0 +1 @@
+�F�i
\ No newline at end of file
diff --git a/gfx/trainers/024.2bpp b/gfx/trainers/024.2bpp
deleted file mode 100644
index ea50044fd..000000000
--- a/gfx/trainers/024.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/024.lz b/gfx/trainers/024.lz
index 0c7cffa79..0c7cffa79 100644
--- a/gfx/trainers/lz/024.lz
+++ b/gfx/trainers/024.lz
diff --git a/gfx/trainers/024.pal b/gfx/trainers/024.pal
new file mode 100644
index 000000000..57a91a4e3
--- /dev/null
+++ b/gfx/trainers/024.pal
@@ -0,0 +1 @@
+9
e
\ No newline at end of file
diff --git a/gfx/trainers/025.2bpp b/gfx/trainers/025.2bpp
deleted file mode 100644
index 75857dd19..000000000
--- a/gfx/trainers/025.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/025.lz b/gfx/trainers/025.lz
index d6249eba3..d6249eba3 100644
--- a/gfx/trainers/lz/025.lz
+++ b/gfx/trainers/025.lz
diff --git a/gfx/trainers/025.pal b/gfx/trainers/025.pal
new file mode 100644
index 000000000..619222137
--- /dev/null
+++ b/gfx/trainers/025.pal
@@ -0,0 +1 @@
+^>]
\ No newline at end of file
diff --git a/gfx/trainers/026.2bpp b/gfx/trainers/026.2bpp
deleted file mode 100644
index a3882a4ee..000000000
--- a/gfx/trainers/026.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/026.lz b/gfx/trainers/026.lz
index 93dad0319..93dad0319 100644
--- a/gfx/trainers/lz/026.lz
+++ b/gfx/trainers/026.lz
diff --git a/gfx/trainers/026.pal b/gfx/trainers/026.pal
new file mode 100644
index 000000000..45151c6a5
--- /dev/null
+++ b/gfx/trainers/026.pal
@@ -0,0 +1 @@
+Z>6
\ No newline at end of file
diff --git a/gfx/trainers/027.2bpp b/gfx/trainers/027.2bpp
deleted file mode 100644
index 22a92cd15..000000000
--- a/gfx/trainers/027.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/027.lz b/gfx/trainers/027.lz
index cb41d74ee..cb41d74ee 100644
--- a/gfx/trainers/lz/027.lz
+++ b/gfx/trainers/027.lz
diff --git a/gfx/trainers/027.pal b/gfx/trainers/027.pal
new file mode 100644
index 000000000..45151c6a5
--- /dev/null
+++ b/gfx/trainers/027.pal
@@ -0,0 +1 @@
+Z>6
\ No newline at end of file
diff --git a/gfx/trainers/028.2bpp b/gfx/trainers/028.2bpp
deleted file mode 100644
index b387da0b2..000000000
--- a/gfx/trainers/028.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/028.lz b/gfx/trainers/028.lz
index 8c5d30ee6..8c5d30ee6 100644
--- a/gfx/trainers/lz/028.lz
+++ b/gfx/trainers/028.lz
diff --git a/gfx/trainers/028.pal b/gfx/trainers/028.pal
new file mode 100644
index 000000000..c7f00ecf7
--- /dev/null
+++ b/gfx/trainers/028.pal
@@ -0,0 +1 @@
+8.(E
\ No newline at end of file
diff --git a/gfx/trainers/029.2bpp b/gfx/trainers/029.2bpp
deleted file mode 100644
index 2ab3861f0..000000000
--- a/gfx/trainers/029.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/029.lz b/gfx/trainers/029.lz
index 78fb417f4..78fb417f4 100644
--- a/gfx/trainers/lz/029.lz
+++ b/gfx/trainers/029.lz
diff --git a/gfx/trainers/029.pal b/gfx/trainers/029.pal
new file mode 100644
index 000000000..96611b0d1
--- /dev/null
+++ b/gfx/trainers/029.pal
@@ -0,0 +1 @@
+�6�H
\ No newline at end of file
diff --git a/gfx/trainers/030.2bpp b/gfx/trainers/030.2bpp
deleted file mode 100644
index 50dcbb080..000000000
--- a/gfx/trainers/030.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/030.lz b/gfx/trainers/030.lz
index 5ac5597b0..5ac5597b0 100644
--- a/gfx/trainers/lz/030.lz
+++ b/gfx/trainers/030.lz
diff --git a/gfx/trainers/030.pal b/gfx/trainers/030.pal
new file mode 100644
index 000000000..580aaf96b
--- /dev/null
+++ b/gfx/trainers/030.pal
@@ -0,0 +1 @@
+=>
\ No newline at end of file
diff --git a/gfx/trainers/031.2bpp b/gfx/trainers/031.2bpp
deleted file mode 100644
index 18d3e37f9..000000000
--- a/gfx/trainers/031.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/031.lz b/gfx/trainers/031.lz
index 153720e71..153720e71 100644
--- a/gfx/trainers/lz/031.lz
+++ b/gfx/trainers/031.lz
diff --git a/gfx/trainers/031.pal b/gfx/trainers/031.pal
new file mode 100644
index 000000000..d03794127
--- /dev/null
+++ b/gfx/trainers/031.pal
@@ -0,0 +1 @@
+2)=
\ No newline at end of file
diff --git a/gfx/trainers/032.2bpp b/gfx/trainers/032.2bpp
deleted file mode 100644
index 3787e3410..000000000
--- a/gfx/trainers/032.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/032.lz b/gfx/trainers/032.lz
index 42be70abe..42be70abe 100644
--- a/gfx/trainers/lz/032.lz
+++ b/gfx/trainers/032.lz
diff --git a/gfx/trainers/032.pal b/gfx/trainers/032.pal
new file mode 100644
index 000000000..885619e50
--- /dev/null
+++ b/gfx/trainers/032.pal
@@ -0,0 +1 @@
+|>�8
\ No newline at end of file
diff --git a/gfx/trainers/033.2bpp b/gfx/trainers/033.2bpp
deleted file mode 100644
index 069a10c1f..000000000
--- a/gfx/trainers/033.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/033.lz b/gfx/trainers/033.lz
index 92151f891..92151f891 100644
--- a/gfx/trainers/lz/033.lz
+++ b/gfx/trainers/033.lz
diff --git a/gfx/trainers/033.pal b/gfx/trainers/033.pal
new file mode 100644
index 000000000..8c6f5cc88
--- /dev/null
+++ b/gfx/trainers/033.pal
@@ -0,0 +1 @@
+�Bh
\ No newline at end of file
diff --git a/gfx/trainers/034.2bpp b/gfx/trainers/034.2bpp
deleted file mode 100644
index 99870dec4..000000000
--- a/gfx/trainers/034.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/034.lz b/gfx/trainers/034.lz
index bee6dd0e9..bee6dd0e9 100644
--- a/gfx/trainers/lz/034.lz
+++ b/gfx/trainers/034.lz
diff --git a/gfx/trainers/034.pal b/gfx/trainers/034.pal
new file mode 100644
index 000000000..9d3647449
--- /dev/null
+++ b/gfx/trainers/034.pal
@@ -0,0 +1 @@
+�F�$
\ No newline at end of file
diff --git a/gfx/trainers/035.2bpp b/gfx/trainers/035.2bpp
deleted file mode 100644
index 0206b4ad0..000000000
--- a/gfx/trainers/035.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/035.lz b/gfx/trainers/035.lz
index cea17dbac..cea17dbac 100644
--- a/gfx/trainers/lz/035.lz
+++ b/gfx/trainers/035.lz
diff --git a/gfx/trainers/035.pal b/gfx/trainers/035.pal
new file mode 100644
index 000000000..721446b68
--- /dev/null
+++ b/gfx/trainers/035.pal
@@ -0,0 +1 @@
+;*FI
\ No newline at end of file
diff --git a/gfx/trainers/036.2bpp b/gfx/trainers/036.2bpp
deleted file mode 100644
index 636cb720e..000000000
--- a/gfx/trainers/036.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/036.lz b/gfx/trainers/036.lz
index b210aeda1..b210aeda1 100644
--- a/gfx/trainers/lz/036.lz
+++ b/gfx/trainers/036.lz
diff --git a/gfx/trainers/036.pal b/gfx/trainers/036.pal
new file mode 100644
index 000000000..74bf5037a
--- /dev/null
+++ b/gfx/trainers/036.pal
@@ -0,0 +1 @@
+>6�=
\ No newline at end of file
diff --git a/gfx/trainers/037.2bpp b/gfx/trainers/037.2bpp
deleted file mode 100644
index ac563ab1b..000000000
--- a/gfx/trainers/037.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/037.lz b/gfx/trainers/037.lz
index b162cadca..b162cadca 100644
--- a/gfx/trainers/lz/037.lz
+++ b/gfx/trainers/037.lz
diff --git a/gfx/trainers/037.pal b/gfx/trainers/037.pal
new file mode 100644
index 000000000..acef4c5a8
--- /dev/null
+++ b/gfx/trainers/037.pal
@@ -0,0 +1 @@
+�$�
\ No newline at end of file
diff --git a/gfx/trainers/038.2bpp b/gfx/trainers/038.2bpp
deleted file mode 100644
index a000fe41b..000000000
--- a/gfx/trainers/038.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/038.lz b/gfx/trainers/038.lz
index 3f27a6d42..3f27a6d42 100644
--- a/gfx/trainers/lz/038.lz
+++ b/gfx/trainers/038.lz
diff --git a/gfx/trainers/038.pal b/gfx/trainers/038.pal
new file mode 100644
index 000000000..bbc5a0245
--- /dev/null
+++ b/gfx/trainers/038.pal
@@ -0,0 +1 @@
+�
\ No newline at end of file
diff --git a/gfx/trainers/039.2bpp b/gfx/trainers/039.2bpp
deleted file mode 100644
index 75bfb324b..000000000
--- a/gfx/trainers/039.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/039.lz b/gfx/trainers/039.lz
index 425667a73..425667a73 100644
--- a/gfx/trainers/lz/039.lz
+++ b/gfx/trainers/039.lz
diff --git a/gfx/trainers/039.pal b/gfx/trainers/039.pal
new file mode 100644
index 000000000..5950ecfe7
--- /dev/null
+++ b/gfx/trainers/039.pal
@@ -0,0 +1 @@
+��4
\ No newline at end of file
diff --git a/gfx/trainers/040.2bpp b/gfx/trainers/040.2bpp
deleted file mode 100644
index 6f2f60938..000000000
--- a/gfx/trainers/040.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/040.lz b/gfx/trainers/040.lz
index dbdb4ca46..dbdb4ca46 100644
--- a/gfx/trainers/lz/040.lz
+++ b/gfx/trainers/040.lz
diff --git a/gfx/trainers/040.pal b/gfx/trainers/040.pal
new file mode 100644
index 000000000..c71e2189b
--- /dev/null
+++ b/gfx/trainers/040.pal
@@ -0,0 +1 @@
+�F+)
\ No newline at end of file
diff --git a/gfx/trainers/041.2bpp b/gfx/trainers/041.2bpp
deleted file mode 100644
index a5a39e654..000000000
--- a/gfx/trainers/041.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/041.lz b/gfx/trainers/041.lz
index 683ec66bb..683ec66bb 100644
--- a/gfx/trainers/lz/041.lz
+++ b/gfx/trainers/041.lz
diff --git a/gfx/trainers/041.pal b/gfx/trainers/041.pal
new file mode 100644
index 000000000..61684c019
--- /dev/null
+++ b/gfx/trainers/041.pal
@@ -0,0 +1 @@
+[�$
\ No newline at end of file
diff --git a/gfx/trainers/042.2bpp b/gfx/trainers/042.2bpp
deleted file mode 100644
index 6cfd94dd5..000000000
--- a/gfx/trainers/042.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/042.lz b/gfx/trainers/042.lz
index d67e6ea98..d67e6ea98 100644
--- a/gfx/trainers/lz/042.lz
+++ b/gfx/trainers/042.lz
diff --git a/gfx/trainers/042.pal b/gfx/trainers/042.pal
new file mode 100644
index 000000000..c21b8ba80
--- /dev/null
+++ b/gfx/trainers/042.pal
@@ -0,0 +1 @@
+�N
\ No newline at end of file
diff --git a/gfx/trainers/043.2bpp b/gfx/trainers/043.2bpp
deleted file mode 100644
index 1c367cd66..000000000
--- a/gfx/trainers/043.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/043.lz b/gfx/trainers/043.lz
index c7cecda28..c7cecda28 100644
--- a/gfx/trainers/lz/043.lz
+++ b/gfx/trainers/043.lz
diff --git a/gfx/trainers/043.pal b/gfx/trainers/043.pal
new file mode 100644
index 000000000..fbfbe2cf2
--- /dev/null
+++ b/gfx/trainers/043.pal
@@ -0,0 +1 @@
+�%
]
\ No newline at end of file
diff --git a/gfx/trainers/044.2bpp b/gfx/trainers/044.2bpp
deleted file mode 100644
index 9fb35aa68..000000000
--- a/gfx/trainers/044.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/044.lz b/gfx/trainers/044.lz
index 07ad8621b..07ad8621b 100644
--- a/gfx/trainers/lz/044.lz
+++ b/gfx/trainers/044.lz
diff --git a/gfx/trainers/044.pal b/gfx/trainers/044.pal
new file mode 100644
index 000000000..96f11230c
--- /dev/null
+++ b/gfx/trainers/044.pal
@@ -0,0 +1 @@
+4&d(
\ No newline at end of file
diff --git a/gfx/trainers/045.2bpp b/gfx/trainers/045.2bpp
deleted file mode 100644
index f43a9978f..000000000
--- a/gfx/trainers/045.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/045.lz b/gfx/trainers/045.lz
index d967bb3ba..d967bb3ba 100644
--- a/gfx/trainers/lz/045.lz
+++ b/gfx/trainers/045.lz
diff --git a/gfx/trainers/045.pal b/gfx/trainers/045.pal
new file mode 100644
index 000000000..97208d59c
--- /dev/null
+++ b/gfx/trainers/045.pal
@@ -0,0 +1 @@
+�Bg1
\ No newline at end of file
diff --git a/gfx/trainers/046.2bpp b/gfx/trainers/046.2bpp
deleted file mode 100644
index 351bfd61d..000000000
--- a/gfx/trainers/046.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/046.lz b/gfx/trainers/046.lz
index 45da954d9..45da954d9 100644
--- a/gfx/trainers/lz/046.lz
+++ b/gfx/trainers/046.lz
diff --git a/gfx/trainers/046.pal b/gfx/trainers/046.pal
new file mode 100644
index 000000000..93dec80d2
--- /dev/null
+++ b/gfx/trainers/046.pal
@@ -0,0 +1 @@
+&�\
\ No newline at end of file
diff --git a/gfx/trainers/047.2bpp b/gfx/trainers/047.2bpp
deleted file mode 100644
index 5f57db7f5..000000000
--- a/gfx/trainers/047.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/047.lz b/gfx/trainers/047.lz
index a0f853a9d..a0f853a9d 100644
--- a/gfx/trainers/lz/047.lz
+++ b/gfx/trainers/047.lz
diff --git a/gfx/trainers/047.pal b/gfx/trainers/047.pal
new file mode 100644
index 000000000..fb629e535
--- /dev/null
+++ b/gfx/trainers/047.pal
@@ -0,0 +1 @@
+;.�0
\ No newline at end of file
diff --git a/gfx/trainers/048.2bpp b/gfx/trainers/048.2bpp
deleted file mode 100644
index 63a12b37b..000000000
--- a/gfx/trainers/048.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/048.lz b/gfx/trainers/048.lz
index d64ed1f0b..d64ed1f0b 100644
--- a/gfx/trainers/lz/048.lz
+++ b/gfx/trainers/048.lz
diff --git a/gfx/trainers/048.pal b/gfx/trainers/048.pal
new file mode 100644
index 000000000..cf7b40bf0
--- /dev/null
+++ b/gfx/trainers/048.pal
@@ -0,0 +1 @@
+�)�|
\ No newline at end of file
diff --git a/gfx/trainers/049.2bpp b/gfx/trainers/049.2bpp
deleted file mode 100644
index 20ac256be..000000000
--- a/gfx/trainers/049.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/049.lz b/gfx/trainers/049.lz
index 086b8fc02..086b8fc02 100644
--- a/gfx/trainers/lz/049.lz
+++ b/gfx/trainers/049.lz
diff --git a/gfx/trainers/049.pal b/gfx/trainers/049.pal
new file mode 100644
index 000000000..849aa41a7
--- /dev/null
+++ b/gfx/trainers/049.pal
@@ -0,0 +1 @@
+�!M1
\ No newline at end of file
diff --git a/gfx/trainers/050.2bpp b/gfx/trainers/050.2bpp
deleted file mode 100644
index aeacf6c52..000000000
--- a/gfx/trainers/050.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/050.lz b/gfx/trainers/050.lz
index e10b588cc..e10b588cc 100644
--- a/gfx/trainers/lz/050.lz
+++ b/gfx/trainers/050.lz
diff --git a/gfx/trainers/050.pal b/gfx/trainers/050.pal
new file mode 100644
index 000000000..3f79f121d
--- /dev/null
+++ b/gfx/trainers/050.pal
@@ -0,0 +1 @@
+9�8
\ No newline at end of file
diff --git a/gfx/trainers/051.2bpp b/gfx/trainers/051.2bpp
deleted file mode 100644
index 327637fd0..000000000
--- a/gfx/trainers/051.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/051.lz b/gfx/trainers/051.lz
index c1123a84e..c1123a84e 100644
--- a/gfx/trainers/lz/051.lz
+++ b/gfx/trainers/051.lz
diff --git a/gfx/trainers/051.pal b/gfx/trainers/051.pal
new file mode 100644
index 000000000..95c309244
--- /dev/null
+++ b/gfx/trainers/051.pal
@@ -0,0 +1 @@
+�F�M
\ No newline at end of file
diff --git a/gfx/trainers/052.2bpp b/gfx/trainers/052.2bpp
deleted file mode 100644
index d09fabea8..000000000
--- a/gfx/trainers/052.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/052.lz b/gfx/trainers/052.lz
index 81ee09ab7..81ee09ab7 100644
--- a/gfx/trainers/lz/052.lz
+++ b/gfx/trainers/052.lz
diff --git a/gfx/trainers/052.pal b/gfx/trainers/052.pal
new file mode 100644
index 000000000..902e9c807
--- /dev/null
+++ b/gfx/trainers/052.pal
@@ -0,0 +1 @@
+"�
diff --git a/gfx/trainers/053.2bpp b/gfx/trainers/053.2bpp
deleted file mode 100644
index de935307a..000000000
--- a/gfx/trainers/053.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/053.lz b/gfx/trainers/053.lz
index a8963bae7..a8963bae7 100644
--- a/gfx/trainers/lz/053.lz
+++ b/gfx/trainers/053.lz
diff --git a/gfx/trainers/053.pal b/gfx/trainers/053.pal
new file mode 100644
index 000000000..15e59bfc7
--- /dev/null
+++ b/gfx/trainers/053.pal
@@ -0,0 +1 @@
+"/
\ No newline at end of file
diff --git a/gfx/trainers/054.2bpp b/gfx/trainers/054.2bpp
deleted file mode 100644
index 7ebb05352..000000000
--- a/gfx/trainers/054.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/054.lz b/gfx/trainers/054.lz
index b823ddaab..b823ddaab 100644
--- a/gfx/trainers/lz/054.lz
+++ b/gfx/trainers/054.lz
diff --git a/gfx/trainers/054.pal b/gfx/trainers/054.pal
new file mode 100644
index 000000000..22601efb8
--- /dev/null
+++ b/gfx/trainers/054.pal
@@ -0,0 +1 @@
+�F�0
\ No newline at end of file
diff --git a/gfx/trainers/055.2bpp b/gfx/trainers/055.2bpp
deleted file mode 100644
index 4eeb7376b..000000000
--- a/gfx/trainers/055.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/055.lz b/gfx/trainers/055.lz
index aff9d4589..aff9d4589 100644
--- a/gfx/trainers/lz/055.lz
+++ b/gfx/trainers/055.lz
diff --git a/gfx/trainers/055.pal b/gfx/trainers/055.pal
new file mode 100644
index 000000000..1ea2f7418
--- /dev/null
+++ b/gfx/trainers/055.pal
@@ -0,0 +1 @@
+�FQ
\ No newline at end of file
diff --git a/gfx/trainers/056.2bpp b/gfx/trainers/056.2bpp
deleted file mode 100644
index e15d58353..000000000
--- a/gfx/trainers/056.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/056.lz b/gfx/trainers/056.lz
index 4aaa71326..4aaa71326 100644
--- a/gfx/trainers/lz/056.lz
+++ b/gfx/trainers/056.lz
diff --git a/gfx/trainers/056.pal b/gfx/trainers/056.pal
new file mode 100644
index 000000000..73dc08f62
--- /dev/null
+++ b/gfx/trainers/056.pal
@@ -0,0 +1 @@
+92)9
\ No newline at end of file
diff --git a/gfx/trainers/057.2bpp b/gfx/trainers/057.2bpp
deleted file mode 100644
index d408fad62..000000000
--- a/gfx/trainers/057.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/057.lz b/gfx/trainers/057.lz
index a6dc315d8..a6dc315d8 100644
--- a/gfx/trainers/lz/057.lz
+++ b/gfx/trainers/057.lz
diff --git a/gfx/trainers/057.pal b/gfx/trainers/057.pal
new file mode 100644
index 000000000..513535960
--- /dev/null
+++ b/gfx/trainers/057.pal
@@ -0,0 +1 @@
+xMM
\ No newline at end of file
diff --git a/gfx/trainers/058.2bpp b/gfx/trainers/058.2bpp
deleted file mode 100644
index cbdb1e9d9..000000000
--- a/gfx/trainers/058.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/058.lz b/gfx/trainers/058.lz
index 25b4a9ff7..25b4a9ff7 100644
--- a/gfx/trainers/lz/058.lz
+++ b/gfx/trainers/058.lz
diff --git a/gfx/trainers/058.pal b/gfx/trainers/058.pal
new file mode 100644
index 000000000..5d0694cdd
--- /dev/null
+++ b/gfx/trainers/058.pal
@@ -0,0 +1 @@
+}6!
\ No newline at end of file
diff --git a/gfx/trainers/059.2bpp b/gfx/trainers/059.2bpp
deleted file mode 100644
index 3d12642c8..000000000
--- a/gfx/trainers/059.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/059.lz b/gfx/trainers/059.lz
index 465ccb111..465ccb111 100644
--- a/gfx/trainers/lz/059.lz
+++ b/gfx/trainers/059.lz
diff --git a/gfx/trainers/059.pal b/gfx/trainers/059.pal
new file mode 100644
index 000000000..7f12fdbc0
--- /dev/null
+++ b/gfx/trainers/059.pal
@@ -0,0 +1 @@
+}>:
\ No newline at end of file
diff --git a/gfx/trainers/060.2bpp b/gfx/trainers/060.2bpp
deleted file mode 100644
index 9d0de4a21..000000000
--- a/gfx/trainers/060.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/060.lz b/gfx/trainers/060.lz
index 1bdf29c7d..1bdf29c7d 100644
--- a/gfx/trainers/lz/060.lz
+++ b/gfx/trainers/060.lz
diff --git a/gfx/trainers/060.pal b/gfx/trainers/060.pal
new file mode 100644
index 000000000..056b78559
--- /dev/null
+++ b/gfx/trainers/060.pal
@@ -0,0 +1 @@
+�"|T
\ No newline at end of file
diff --git a/gfx/trainers/061.2bpp b/gfx/trainers/061.2bpp
deleted file mode 100644
index 6846924b7..000000000
--- a/gfx/trainers/061.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/061.lz b/gfx/trainers/061.lz
index 2ab555a85..2ab555a85 100644
--- a/gfx/trainers/lz/061.lz
+++ b/gfx/trainers/061.lz
diff --git a/gfx/trainers/061.pal b/gfx/trainers/061.pal
new file mode 100644
index 000000000..daacbc71f
--- /dev/null
+++ b/gfx/trainers/061.pal
@@ -0,0 +1 @@
+>:�<
\ No newline at end of file
diff --git a/gfx/trainers/062.2bpp b/gfx/trainers/062.2bpp
deleted file mode 100644
index e1ba66294..000000000
--- a/gfx/trainers/062.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/062.lz b/gfx/trainers/062.lz
index 15a8dcf88..15a8dcf88 100644
--- a/gfx/trainers/lz/062.lz
+++ b/gfx/trainers/062.lz
diff --git a/gfx/trainers/062.pal b/gfx/trainers/062.pal
new file mode 100644
index 000000000..16f746b0a
--- /dev/null
+++ b/gfx/trainers/062.pal
@@ -0,0 +1 @@
+\F� 
\ No newline at end of file
diff --git a/gfx/trainers/063.2bpp b/gfx/trainers/063.2bpp
deleted file mode 100644
index 3b49b2602..000000000
--- a/gfx/trainers/063.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/063.lz b/gfx/trainers/063.lz
index 9d4cb50c6..9d4cb50c6 100644
--- a/gfx/trainers/lz/063.lz
+++ b/gfx/trainers/063.lz
diff --git a/gfx/trainers/063.pal b/gfx/trainers/063.pal
new file mode 100644
index 000000000..88603e943
--- /dev/null
+++ b/gfx/trainers/063.pal
@@ -0,0 +1 @@
+#,M
\ No newline at end of file
diff --git a/gfx/trainers/064.2bpp b/gfx/trainers/064.2bpp
deleted file mode 100644
index 0a4eaf083..000000000
--- a/gfx/trainers/064.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/064.lz b/gfx/trainers/064.lz
index e3e22f870..e3e22f870 100644
--- a/gfx/trainers/lz/064.lz
+++ b/gfx/trainers/064.lz
diff --git a/gfx/trainers/064.pal b/gfx/trainers/064.pal
new file mode 100644
index 000000000..ef92526d6
--- /dev/null
+++ b/gfx/trainers/064.pal
@@ -0,0 +1 @@
+#,M
\ No newline at end of file
diff --git a/gfx/trainers/065.2bpp b/gfx/trainers/065.2bpp
deleted file mode 100644
index 938d891ce..000000000
--- a/gfx/trainers/065.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/065.lz b/gfx/trainers/065.lz
index beee0721b..beee0721b 100644
--- a/gfx/trainers/lz/065.lz
+++ b/gfx/trainers/065.lz
diff --git a/gfx/trainers/065.pal b/gfx/trainers/065.pal
new file mode 100644
index 000000000..5fc0fb683
--- /dev/null
+++ b/gfx/trainers/065.pal
@@ -0,0 +1 @@
+6� 
\ No newline at end of file
diff --git a/gfx/trainers/066.2bpp b/gfx/trainers/066.2bpp
deleted file mode 100644
index b44dd982e..000000000
--- a/gfx/trainers/066.2bpp
+++ /dev/null
diff --git a/gfx/trainers/lz/066.lz b/gfx/trainers/066.lz
index 38296bc91..38296bc91 100644
--- a/gfx/trainers/lz/066.lz
+++ b/gfx/trainers/066.lz
diff --git a/gfx/trainers/066.pal b/gfx/trainers/066.pal
new file mode 100644
index 000000000..4f185f04c
--- /dev/null
+++ b/gfx/trainers/066.pal
@@ -0,0 +1 @@
+�2�@
\ No newline at end of file
diff --git a/gfx/trainers/palette_pointers.asm b/gfx/trainers/palette_pointers.asm
new file mode 100644
index 000000000..8f47e0f64
--- /dev/null
+++ b/gfx/trainers/palette_pointers.asm
@@ -0,0 +1,68 @@
+FalknerPalette:      INCBIN "gfx/trainers/000.pal"
+WhitneyPalette:      INCBIN "gfx/trainers/001.pal"
+BugsyPalette:        INCBIN "gfx/trainers/002.pal"
+MortyPalette:        INCBIN "gfx/trainers/003.pal"
+PrycePalette:        INCBIN "gfx/trainers/004.pal"
+JasminePalette:      INCBIN "gfx/trainers/005.pal"
+ChuckPalette:        INCBIN "gfx/trainers/006.pal"
+ClairPalette:        INCBIN "gfx/trainers/007.pal"
+Rival1Palette:       INCBIN "gfx/trainers/008.pal"
+PokemonProfPalette:  INCBIN "gfx/trainers/009.pal"
+WillPalette:         INCBIN "gfx/trainers/010.pal"
+CalPalette:          INCBIN "gfx/trainers/011.pal"
+BrunoPalette:        INCBIN "gfx/trainers/012.pal"
+KarenPalette:        INCBIN "gfx/trainers/013.pal"
+KogaPalette:         INCBIN "gfx/trainers/014.pal"
+ChampionPalette:     INCBIN "gfx/trainers/015.pal"
+BrockPalette:        INCBIN "gfx/trainers/016.pal"
+MistyPalette:        INCBIN "gfx/trainers/017.pal"
+LtSurgePalette:      INCBIN "gfx/trainers/018.pal"
+ScientistPalette:    INCBIN "gfx/trainers/019.pal"
+ErikaPalette:        INCBIN "gfx/trainers/020.pal"
+YoungsterPalette:    INCBIN "gfx/trainers/021.pal"
+SchoolboyPalette:    INCBIN "gfx/trainers/022.pal"
+BirdKeeperPalette:   INCBIN "gfx/trainers/023.pal"
+LassPalette:         INCBIN "gfx/trainers/024.pal"
+JaninePalette:       INCBIN "gfx/trainers/025.pal"
+CooltrainermPalette: INCBIN "gfx/trainers/026.pal"
+CooltrainerfPalette: INCBIN "gfx/trainers/027.pal"
+BeautyPalette:       INCBIN "gfx/trainers/028.pal"
+PokemaniacPalette:   INCBIN "gfx/trainers/029.pal"
+GruntmPalette:       INCBIN "gfx/trainers/030.pal"
+GentlemanPalette:    INCBIN "gfx/trainers/031.pal"
+SkierPalette:        INCBIN "gfx/trainers/032.pal"
+TeacherPalette:      INCBIN "gfx/trainers/033.pal"
+SabrinaPalette:      INCBIN "gfx/trainers/034.pal"
+BugCatcherPalette:   INCBIN "gfx/trainers/035.pal"
+FisherPalette:       INCBIN "gfx/trainers/036.pal"
+SwimmermPalette:     INCBIN "gfx/trainers/037.pal"
+SwimmerfPalette:     INCBIN "gfx/trainers/038.pal"
+SailorPalette:       INCBIN "gfx/trainers/039.pal"
+SuperNerdPalette:    INCBIN "gfx/trainers/040.pal"
+Rival2Palette:       INCBIN "gfx/trainers/041.pal"
+GuitaristPalette:    INCBIN "gfx/trainers/042.pal"
+HikerPalette:        INCBIN "gfx/trainers/043.pal"
+BikerPalette:        INCBIN "gfx/trainers/044.pal"
+BlainePalette:       INCBIN "gfx/trainers/045.pal"
+BurglarPalette:      INCBIN "gfx/trainers/046.pal"
+FirebreatherPalette: INCBIN "gfx/trainers/047.pal"
+JugglerPalette:      INCBIN "gfx/trainers/048.pal"
+BlackbeltTPalette:   INCBIN "gfx/trainers/049.pal"
+ExecutivemPalette:   INCBIN "gfx/trainers/050.pal"
+PsychicTPalette:     INCBIN "gfx/trainers/051.pal"
+PicnickerPalette:    INCBIN "gfx/trainers/052.pal"
+CamperPalette:       INCBIN "gfx/trainers/053.pal"
+ExecutivefPalette:   INCBIN "gfx/trainers/054.pal"
+SagePalette:         INCBIN "gfx/trainers/055.pal"
+MediumPalette:       INCBIN "gfx/trainers/056.pal"
+BoarderPalette:      INCBIN "gfx/trainers/057.pal"
+PokefanmPalette:     INCBIN "gfx/trainers/058.pal"
+KimonoGirlPalette:   INCBIN "gfx/trainers/059.pal"
+TwinsPalette:        INCBIN "gfx/trainers/060.pal"
+PokefanfPalette:     INCBIN "gfx/trainers/061.pal"
+RedPalette:          INCBIN "gfx/trainers/062.pal"
+BluePalette:         INCBIN "gfx/trainers/063.pal"
+OfficerPalette:      INCBIN "gfx/trainers/064.pal"
+GruntfPalette:       INCBIN "gfx/trainers/065.pal"
+MysticalmanPalette:  INCBIN "gfx/trainers/066.pal"
+
diff --git a/main.asm b/main.asm
index 8d9845006..698410e21 100644
--- a/main.asm
+++ b/main.asm
@@ -4097,7 +4097,12 @@ INCBIN "baserom.gbc",$a8be,$a8d6 - $a8be
 PokemonPalettes:
 INCLUDE "gfx/pics/palette_pointers.asm"
 
-INCBIN "baserom.gbc",$b0ae,$c000 - $b0ae
+INCBIN "baserom.gbc",$b0ae,$b0d2 - $b0ae
+
+TrainerPalettes:
+INCLUDE "gfx/trainers/palette_pointers.asm"
+
+INCBIN "baserom.gbc",$b1de,$bc3a - $b1de
 
 
 SECTION "bank3",DATA,BANK[$3]
@@ -4962,26 +4967,26 @@ INCBIN "baserom.gbc",$1531f,$174ba - $1531f
 SECTION "bank6",DATA,BANK[$6]
 
 Tileset03GFX: ; 18000
-INCBIN "gfx/tilesets/lz/03.lz"
+INCBIN "gfx/tilesets/03.lz"
 ; 18605
 
 INCBIN "baserom.gbc", $18605, $19006 - $18605
 
 Tileset00GFX:
 Tileset01GFX: ; 19006
-INCBIN "gfx/tilesets/lz/01.lz"
+INCBIN "gfx/tilesets/01.lz"
 ; 19c0d
 
 INCBIN "baserom.gbc", $19c0d, $1a60e - $19c0d
 
 Tileset29GFX: ; 1a60e
-INCBIN "gfx/tilesets/lz/29.lz"
+INCBIN "gfx/tilesets/29.lz"
 ; 1af38
 
 INCBIN "baserom.gbc", $1af38, $1b43e - $1af38
 
 Tileset20GFX: ; 1b43e
-INCBIN "gfx/tilesets/lz/20.lz"
+INCBIN "gfx/tilesets/20.lz"
 ; 1b8f1
 
 INCBIN "baserom.gbc", $1b8f1, $1c000 - $1b8f1
@@ -4992,31 +4997,31 @@ SECTION "bank7",DATA,BANK[$7]
 INCBIN "baserom.gbc", $1c000, $1c30c - $1c000
 
 Tileset07GFX: ; 1c30c
-INCBIN "gfx/tilesets/lz/07.lz"
+INCBIN "gfx/tilesets/07.lz"
 ; 1c73b
 
 INCBIN "baserom.gbc", $1c73b, $1cc3c - $1c73b
 
 Tileset09GFX: ; 1cc3c
-INCBIN "gfx/tilesets/lz/09.lz"
+INCBIN "gfx/tilesets/09.lz"
 ; 1d047
 
 INCBIN "baserom.gbc", $1d047, $1d54c - $1d047
 
 Tileset06GFX: ; 1d54c
-INCBIN "gfx/tilesets/lz/06.lz"
+INCBIN "gfx/tilesets/06.lz"
 ; 1d924
 
 INCBIN "baserom.gbc", $1d924, $1de2c - $1d924
 
 Tileset13GFX: ; 1de2c
-INCBIN "gfx/tilesets/lz/13.lz"
+INCBIN "gfx/tilesets/13.lz"
 ; 1e58c
 
 INCBIN "baserom.gbc", $1e58c, $1ea8c - $1e58c
 
 Tileset24GFX: ; 1ea8c
-INCBIN "gfx/tilesets/lz/24.lz"
+INCBIN "gfx/tilesets/24.lz"
 ; 1ee0e
 
 INCBIN "baserom.gbc", $1ee0e, $1f31c - $1ee0e
@@ -5035,31 +5040,31 @@ SECTION "bank8",DATA,BANK[$8]
 INCBIN "baserom.gbc", $20000, $20181 - $20000
 
 Tileset23GFX: ; 20181
-INCBIN "gfx/tilesets/lz/23.lz"
+INCBIN "gfx/tilesets/23.lz"
 ; 206d2
 
 INCBIN "baserom.gbc", $206d2, $20be1 - $206d2
 
 Tileset10GFX: ; 20be1
-INCBIN "gfx/tilesets/lz/10.lz"
+INCBIN "gfx/tilesets/10.lz"
 ; 213e0
 
 INCBIN "baserom.gbc", $213e0, $218e1 - $213e0
 
 Tileset12GFX: ; 218e1
-INCBIN "gfx/tilesets/lz/12.lz"
+INCBIN "gfx/tilesets/12.lz"
 ; 22026
 
 INCBIN "baserom.gbc", $22026, $22531 - $22026
 
 Tileset14GFX: ; 22531
-INCBIN "gfx/tilesets/lz/14.lz"
+INCBIN "gfx/tilesets/14.lz"
 ; 22ae2
 
 INCBIN "baserom.gbc", $22ae2, $22ff1 - $22ae2
 
 Tileset17GFX: ; 22ff1
-INCBIN "gfx/tilesets/lz/17.lz"
+INCBIN "gfx/tilesets/17.lz"
 ; 23391
 
 INCBIN "baserom.gbc",$23391,$23b11 - $23391
@@ -5244,16 +5249,14 @@ INCLUDE "stats/wild/swarm_water.asm"
 INCBIN "baserom.gbc", $2b930, $2ba1a - $2b930
 
 PlayerGFX: ; 2ba1a
-INCBIN "gfx/misc/lz/player.lz"
-; 2bba0
+INCBIN "gfx/misc/player.lz"
+; 2bba1
 
-INCBIN "baserom.gbc", $2bba0, $2bbaa - $2bba0
+db 0, 0, 0, 0, 0, 0, 0, 0, 0 ; filler
 
 DudeGFX: ; 2bbaa
-INCBIN "gfx/misc/lz/dude.lz"
-; 2bce0
-
-INCBIN "baserom.gbc", $2bce0, $2c000 - $2bce0
+INCBIN "gfx/misc/dude.lz"
+; 2bce1
 
 
 SECTION "bankB",DATA,BANK[$B]
@@ -5418,31 +5421,31 @@ INCBIN "baserom.gbc",$2ef18,$30000 - $2ef18
 SECTION "bankC",DATA,BANK[$C]
 
 Tileset15GFX: ; 30000
-INCBIN "gfx/tilesets/lz/15.lz"
+INCBIN "gfx/tilesets/15.lz"
 ; 304d7
 
 INCBIN "baserom.gbc", $304d7, $309e0 - $304d7
 
 Tileset25GFX: ; 309e0
-INCBIN "gfx/tilesets/lz/25.lz"
+INCBIN "gfx/tilesets/25.lz"
 ; 30e78
 
 INCBIN "baserom.gbc", $30e78, $31380 - $30e78
 
 Tileset27GFX: ; 31380
-INCBIN "gfx/tilesets/lz/27.lz"
+INCBIN "gfx/tilesets/27.lz"
 ; 318dc
 
 INCBIN "baserom.gbc", $318dc, $31de0 - $318dc
 
 Tileset28GFX: ; 31de0
-INCBIN "gfx/tilesets/lz/28.lz"
+INCBIN "gfx/tilesets/28.lz"
 ; 321a6
 
 INCBIN "baserom.gbc", $321a6, $326b0 - $321a6
 
 Tileset30GFX: ; 326b0
-INCBIN "gfx/tilesets/lz/30.lz"
+INCBIN "gfx/tilesets/30.lz"
 ; 329ed
 
 INCBIN "baserom.gbc",$329ed,$34000 - $329ed
@@ -43023,235 +43026,235 @@ INCBIN "baserom.gbc", $84000, $84a2e - $84000
 
 FX00GFX:
 FX01GFX: ; 84a2e
-INCBIN "gfx/fx/lz/001.lz"
+INCBIN "gfx/fx/001.lz"
 ; 84b15
 
 INCBIN "baserom.gbc", $84b15, $84b1e - $84b15
 
 FX02GFX: ; 84b1e
-INCBIN "gfx/fx/lz/002.lz"
+INCBIN "gfx/fx/002.lz"
 ; 84b7a
 
 INCBIN "baserom.gbc", $84b7a, $84b7e - $84b7a
 
 FX03GFX: ; 84b7e
-INCBIN "gfx/fx/lz/003.lz"
+INCBIN "gfx/fx/003.lz"
 ; 84bd0
 
 INCBIN "baserom.gbc", $84bd0, $84bde - $84bd0
 
 FX04GFX: ; 84bde
-INCBIN "gfx/fx/lz/004.lz"
+INCBIN "gfx/fx/004.lz"
 ; 84ca5
 
 INCBIN "baserom.gbc", $84ca5, $84cae - $84ca5
 
 FX05GFX: ; 84cae
-INCBIN "gfx/fx/lz/005.lz"
+INCBIN "gfx/fx/005.lz"
 ; 84de2
 
 INCBIN "baserom.gbc", $84de2, $84dee - $84de2
 
 FX07GFX: ; 84dee
-INCBIN "gfx/fx/lz/007.lz"
+INCBIN "gfx/fx/007.lz"
 ; 84e70
 
 INCBIN "baserom.gbc", $84e70, $84e7e - $84e70
 
 FX08GFX: ; 84e7e
-INCBIN "gfx/fx/lz/008.lz"
+INCBIN "gfx/fx/008.lz"
 ; 84ed4
 
 INCBIN "baserom.gbc", $84ed4, $84ede - $84ed4
 
 FX10GFX: ; 84ede
-INCBIN "gfx/fx/lz/010.lz"
+INCBIN "gfx/fx/010.lz"
 ; 84f13
 
 INCBIN "baserom.gbc", $84f13, $84f1e - $84f13
 
 FX09GFX: ; 84f1e
-INCBIN "gfx/fx/lz/009.lz"
+INCBIN "gfx/fx/009.lz"
 ; 85009
 
 INCBIN "baserom.gbc", $85009, $8500e - $85009
 
 FX12GFX: ; 8500e
-INCBIN "gfx/fx/lz/012.lz"
+INCBIN "gfx/fx/012.lz"
 ; 8506f
 
 INCBIN "baserom.gbc", $8506f, $8507e - $8506f
 
 FX06GFX: ; 8507e
-INCBIN "gfx/fx/lz/006.lz"
+INCBIN "gfx/fx/006.lz"
 ; 8515c
 
 INCBIN "baserom.gbc", $8515c, $8515e - $8515c
 
 FX11GFX: ; 8515e
-INCBIN "gfx/fx/lz/011.lz"
+INCBIN "gfx/fx/011.lz"
 ; 851ad
 
 INCBIN "baserom.gbc", $851ad, $851ae - $851ad
 
 FX13GFX: ; 851ae
-INCBIN "gfx/fx/lz/013.lz"
+INCBIN "gfx/fx/013.lz"
 ; 85243
 
 INCBIN "baserom.gbc", $85243, $8524e - $85243
 
 FX14GFX: ; 8524e
-INCBIN "gfx/fx/lz/014.lz"
+INCBIN "gfx/fx/014.lz"
 ; 852ff
 
 INCBIN "baserom.gbc", $852ff, $8530e - $852ff
 
 FX24GFX: ; 8530e
-INCBIN "gfx/fx/lz/024.lz"
+INCBIN "gfx/fx/024.lz"
 ; 8537c
 
 INCBIN "baserom.gbc", $8537c, $8537e - $8537c
 
 FX15GFX: ; 8537e
-INCBIN "gfx/fx/lz/015.lz"
+INCBIN "gfx/fx/015.lz"
 ; 8539a
 
 INCBIN "baserom.gbc", $8539a, $8539e - $8539a
 
 FX16GFX: ; 8539e
-INCBIN "gfx/fx/lz/016.lz"
+INCBIN "gfx/fx/016.lz"
 ; 8542d
 
 INCBIN "baserom.gbc", $8542d, $8542e - $8542d
 
 FX17GFX: ; 8542e
-INCBIN "gfx/fx/lz/017.lz"
+INCBIN "gfx/fx/017.lz"
 ; 85477
 
 INCBIN "baserom.gbc", $85477, $8547e - $85477
 
 FX18GFX: ; 8547e
-INCBIN "gfx/fx/lz/018.lz"
+INCBIN "gfx/fx/018.lz"
 ; 854eb
 
 INCBIN "baserom.gbc", $854eb, $854ee - $854eb
 
 FX19GFX: ; 854ee
-INCBIN "gfx/fx/lz/019.lz"
+INCBIN "gfx/fx/019.lz"
 ; 855a9
 
 INCBIN "baserom.gbc", $855a9, $855ae - $855a9
 
 FX20GFX: ; 855ae
-INCBIN "gfx/fx/lz/020.lz"
+INCBIN "gfx/fx/020.lz"
 ; 85627
 
 INCBIN "baserom.gbc", $85627, $8562e - $85627
 
 FX22GFX: ; 8562e
-INCBIN "gfx/fx/lz/022.lz"
+INCBIN "gfx/fx/022.lz"
 ; 856ec
 
 INCBIN "baserom.gbc", $856ec, $856ee - $856ec
 
 FX21GFX: ; 856ee
-INCBIN "gfx/fx/lz/021.lz"
+INCBIN "gfx/fx/021.lz"
 ; 85767
 
 INCBIN "baserom.gbc", $85767, $8576e - $85767
 
 FX23GFX: ; 8576e
-INCBIN "gfx/fx/lz/023.lz"
+INCBIN "gfx/fx/023.lz"
 ; 857d0
 
 INCBIN "baserom.gbc", $857d0, $857de - $857d0
 
 FX26GFX: ; 857de
-INCBIN "gfx/fx/lz/026.lz"
+INCBIN "gfx/fx/026.lz"
 ; 85838
 
 INCBIN "baserom.gbc", $85838, $8583e - $85838
 
 FX27GFX: ; 8583e
-INCBIN "gfx/fx/lz/027.lz"
+INCBIN "gfx/fx/027.lz"
 ; 858b0
 
 INCBIN "baserom.gbc", $858b0, $858be - $858b0
 
 FX28GFX: ; 858be
-INCBIN "gfx/fx/lz/028.lz"
+INCBIN "gfx/fx/028.lz"
 ; 85948
 
 INCBIN "baserom.gbc", $85948, $8594e - $85948
 
 FX29GFX: ; 8594e
-INCBIN "gfx/fx/lz/029.lz"
+INCBIN "gfx/fx/029.lz"
 ; 859a8
 
 INCBIN "baserom.gbc", $859a8, $859ae - $859a8
 
 FX30GFX: ; 859ae
-INCBIN "gfx/fx/lz/030.lz"
+INCBIN "gfx/fx/030.lz"
 ; 859ff
 
 INCBIN "baserom.gbc", $859ff, $85a0e - $859ff
 
 FX31GFX: ; 85a0e
-INCBIN "gfx/fx/lz/031.lz"
+INCBIN "gfx/fx/031.lz"
 ; 85ba1
 
 INCBIN "baserom.gbc", $85ba1, $85bae - $85ba1
 
 FX32GFX: ; 85bae
-INCBIN "gfx/fx/lz/032.lz"
+INCBIN "gfx/fx/032.lz"
 ; 85d09
 
 INCBIN "baserom.gbc", $85d09, $85d0e - $85d09
 
 FX33GFX: ; 85d0e
-INCBIN "gfx/fx/lz/033.lz"
+INCBIN "gfx/fx/033.lz"
 ; 85def
 
 INCBIN "baserom.gbc", $85def, $85dfe - $85def
 
 FX34GFX: ; 85dfe
-INCBIN "gfx/fx/lz/034.lz"
+INCBIN "gfx/fx/034.lz"
 ; 85e96
 
 INCBIN "baserom.gbc", $85e96, $85e9e - $85e96
 
 FX25GFX: ; 85e9e
-INCBIN "gfx/fx/lz/025.lz"
+INCBIN "gfx/fx/025.lz"
 ; 85fb8
 
 INCBIN "baserom.gbc", $85fb8, $85fbe - $85fb8
 
 FX35GFX: ; 85fbe
-INCBIN "gfx/fx/lz/035.lz"
+INCBIN "gfx/fx/035.lz"
 ; 86099
 
 INCBIN "baserom.gbc", $86099, $8609e - $86099
 
 FX36GFX: ; 8609e
-INCBIN "gfx/fx/lz/036.lz"
+INCBIN "gfx/fx/036.lz"
 ; 86174
 
 INCBIN "baserom.gbc", $86174, $8617e - $86174
 
 FX37GFX: ; 8617e
-INCBIN "gfx/fx/lz/037.lz"
+INCBIN "gfx/fx/037.lz"
 ; 862eb
 
 INCBIN "baserom.gbc", $862eb, $862ee - $862eb
 
 FX38GFX: ; 862ee
-INCBIN "gfx/fx/lz/038.lz"
+INCBIN "gfx/fx/038.lz"
 ; 8637f
 
 INCBIN "baserom.gbc", $8637f, $8638e - $8637f
 
 FX39GFX: ; 8638e
-INCBIN "gfx/fx/lz/039.lz"
+INCBIN "gfx/fx/039.lz"
 ; 8640b
 
 INCBIN "baserom.gbc", $8640b, $88000 - $8640b
@@ -44292,10 +44295,10 @@ Saturday:
 INCBIN "baserom.gbc", $90a3f, $914dd - $90a3f
 
 PokegearSpritesGFX: ; 914dd
-INCBIN "gfx/misc/lz/pokegear_sprites.lz"
-; 91507
+INCBIN "gfx/misc/pokegear_sprites.lz"
+; 91508
 
-INCBIN "baserom.gbc", $91507, $91bb5 - $91507
+INCBIN "baserom.gbc", $91508, $91bb5 - $91508
 
 TownMapBubble: ; 91bb5
 ; Draw the bubble containing the location text in the town map HUD
@@ -65761,32 +65764,32 @@ GoldenrodDeptStoreRoof_BlockData: ; 0xb1b22
 SECTION "bank2D",DATA,BANK[$2D]
 
 Tileset21GFX: ; b4000
-INCBIN "gfx/tilesets/lz/21.lz"
+INCBIN "gfx/tilesets/21.lz"
 ; b4893
 
 INCBIN "baserom.gbc", $b4893, $b4da0 - $b4893
 
 Tileset22GFX: ; b4da0
-INCBIN "gfx/tilesets/lz/22.lz"
+INCBIN "gfx/tilesets/22.lz"
 ; b50d1
 
 INCBIN "baserom.gbc", $b50d1, $b55e0 - $b50d1
 
 Tileset08GFX: ; b55e0
-INCBIN "gfx/tilesets/lz/08.lz"
+INCBIN "gfx/tilesets/08.lz"
 ; b59db
 
 INCBIN "baserom.gbc", $b59db, $b5ee0 - $b59db
 
 Tileset02GFX:
 Tileset04GFX: ; b5ee0
-INCBIN "gfx/tilesets/lz/04.lz"
+INCBIN "gfx/tilesets/04.lz"
 ; b6ae7
 
 INCBIN "baserom.gbc", $b6ae7, $b74e8 - $b6ae7
 
 Tileset16GFX: ; b74e8
-INCBIN "gfx/tilesets/lz/16.lz"
+INCBIN "gfx/tilesets/16.lz"
 ; b799a
 
 INCBIN "baserom.gbc", $b799a, $b8000 - $b799a
@@ -66563,31 +66566,31 @@ INCLUDE "gfx/pics/unown_frames.asm"
 SECTION "bank37",DATA,BANK[$37]
 
 Tileset31GFX: ; dc000
-INCBIN "gfx/tilesets/lz/31.lz"
+INCBIN "gfx/tilesets/31.lz"
 ; dc3ce
 
 INCBIN "baserom.gbc", $dc3ce, $dc3d0 - $dc3ce
 
 Tileset18GFX: ; dc3d0
-INCBIN "gfx/tilesets/lz/18.lz"
+INCBIN "gfx/tilesets/18.lz"
 ; dcc4e
 
 INCBIN "baserom.gbc", $dcc4e, $dd150 - $dcc4e
 
 Tileset05GFX: ; dd150
-INCBIN "gfx/tilesets/lz/05.lz"
+INCBIN "gfx/tilesets/05.lz"
 ; dd5f8
 
 INCBIN "baserom.gbc", $dd5f8, $ddb00 - $dd5f8
 
 Tileset19GFX: ; ddb00
-INCBIN "gfx/tilesets/lz/19.lz"
+INCBIN "gfx/tilesets/19.lz"
 ; ddf64
 
 INCBIN "baserom.gbc", $ddf64, $de570 - $ddf64
 
 Tileset11GFX: ; de570
-INCBIN "gfx/tilesets/lz/11.lz"
+INCBIN "gfx/tilesets/11.lz"
 ; de98a
 
 INCBIN "baserom.gbc", $de98a, $e0000 - $de98a
@@ -66603,157 +66606,157 @@ SECTION "bank39",DATA,BANK[$39]
 INCBIN "baserom.gbc", $e4000, $e555d - $e4000
 
 IntroSuicuneRunGFX: ; e555d
-INCBIN "gfx/intro/lz/suicune_run.lz"
+INCBIN "gfx/intro/suicune_run.lz"
 ; e592b
 
 INCBIN "baserom.gbc", $e592b, $e592d - $e592b
 
 IntroPichuWooperGFX: ; e592d
-INCBIN "gfx/intro/lz/pichu_wooper.lz"
+INCBIN "gfx/intro/pichu_wooper.lz"
 ; e5c70
 
 INCBIN "baserom.gbc", $e5c70, $e5c7d - $e5c70
 
 IntroBackgroundGFX: ; e5c7d
-INCBIN "gfx/intro/lz/background.lz"
+INCBIN "gfx/intro/background.lz"
 ; e5e69
 
 INCBIN "baserom.gbc", $e5e69, $e5e6d - $e5e69
 
 IntroTilemap004: ; e5e6d
-INCBIN "gfx/intro/lz/004.lz"
+INCBIN "gfx/intro/004.lz"
 ; e5ec5
 
 INCBIN "baserom.gbc", $e5ec5, $e5ecd - $e5ec5
 
 IntroTilemap003: ; e5ecd
-INCBIN "gfx/intro/lz/003.lz"
+INCBIN "gfx/intro/003.lz"
 ; e5ed9
 
 INCBIN "baserom.gbc", $e5ed9, $e5f5d - $e5ed9
 
 IntroUnownsGFX: ; e5f5d
-INCBIN "gfx/intro/lz/unowns.lz"
+INCBIN "gfx/intro/unowns.lz"
 ; e6348
 
 INCBIN "baserom.gbc", $e6348, $e634d - $e6348
 
 IntroPulseGFX: ; e634d
-INCBIN "gfx/intro/lz/pulse.lz"
+INCBIN "gfx/intro/pulse.lz"
 ; e63d4
 
 INCBIN "baserom.gbc", $e63d4, $e63dd - $e63d4
 
 IntroTilemap002: ; e63dd
-INCBIN "gfx/intro/lz/002.lz"
+INCBIN "gfx/intro/002.lz"
 ; e6418
 
 INCBIN "baserom.gbc", $e6418, $e641d - $e6418
 
 IntroTilemap001: ; e641d
-INCBIN "gfx/intro/lz/001.lz"
+INCBIN "gfx/intro/001.lz"
 ; e6429
 
 INCBIN "baserom.gbc", $e6429, $e642d - $e6429
 
 IntroTilemap006: ; e642d
-INCBIN "gfx/intro/lz/006.lz"
+INCBIN "gfx/intro/006.lz"
 ; e6472
 
 INCBIN "baserom.gbc", $e6472, $e647d - $e6472
 
 IntroTilemap005: ; e647d
-INCBIN "gfx/intro/lz/005.lz"
+INCBIN "gfx/intro/005.lz"
 ; e6498
 
 INCBIN "baserom.gbc", $e6498, $e649d - $e6498
 
 IntroTilemap008: ; e649d
-INCBIN "gfx/intro/lz/008.lz"
+INCBIN "gfx/intro/008.lz"
 ; e6550
 
 INCBIN "baserom.gbc", $e6550, $e655d - $e6550
 
 IntroTilemap007: ; e655d
-INCBIN "gfx/intro/lz/007.lz"
+INCBIN "gfx/intro/007.lz"
 ; e65a4
 
 INCBIN "baserom.gbc", $e65a4, $e662d - $e65a4
 
 IntroCrystalUnownsGFX: ; e662d
-INCBIN "gfx/intro/lz/crystal_unowns.lz"
+INCBIN "gfx/intro/crystal_unowns.lz"
 ; e6720
 
 INCBIN "baserom.gbc", $e6720, $e672d - $e6720
 
 IntroTilemap017: ; e672d
-INCBIN "gfx/intro/lz/017.lz"
+INCBIN "gfx/intro/017.lz"
 ; e6761
 
 INCBIN "baserom.gbc", $e6761, $e676d - $e6761
 
 IntroTilemap015: ; e676d
-INCBIN "gfx/intro/lz/015.lz"
+INCBIN "gfx/intro/015.lz"
 ; e6794
 
 INCBIN "baserom.gbc", $e6794, $e681d - $e6794
 
 IntroSuicuneCloseGFX: ; e681d
-INCBIN "gfx/intro/lz/suicune_close.lz"
+INCBIN "gfx/intro/suicune_close.lz"
 ; e6c37
 
 INCBIN "baserom.gbc", $e6c37, $e6c3d - $e6c37
 
 IntroTilemap012: ; e6c3d
-INCBIN "gfx/intro/lz/012.lz"
+INCBIN "gfx/intro/012.lz"
 ; e6d0a
 
 INCBIN "baserom.gbc", $e6d0a, $e6d0d - $e6d0a
 
 IntroTilemap011: ; e6d0d
-INCBIN "gfx/intro/lz/011.lz"
+INCBIN "gfx/intro/011.lz"
 ; e6d65
 
 INCBIN "baserom.gbc", $e6d65, $e6ded - $e6d65
 
 IntroSuicuneJumpGFX: ; e6ded
-INCBIN "gfx/intro/lz/suicune_jump.lz"
+INCBIN "gfx/intro/suicune_jump.lz"
 ; e72a7
 
 INCBIN "baserom.gbc", $e72a7, $e72ad - $e72a7
 
 IntroSuicuneBackGFX: ; e72ad
-INCBIN "gfx/intro/lz/suicune_back.lz"
+INCBIN "gfx/intro/suicune_back.lz"
 ; e7648
 
 INCBIN "baserom.gbc", $e7648, $e764d - $e7648
 
 IntroTilemap010: ; e764d
-INCBIN "gfx/intro/lz/010.lz"
+INCBIN "gfx/intro/010.lz"
 ; e76a0
 
 INCBIN "baserom.gbc", $e76a0, $e76ad - $e76a0
 
 IntroTilemap009: ; e76ad
-INCBIN "gfx/intro/lz/009.lz"
+INCBIN "gfx/intro/009.lz"
 ; e76bb
 
 INCBIN "baserom.gbc", $e76bb, $e76bd - $e76bb
 
 IntroTilemap014: ; e76bd
-INCBIN "gfx/intro/lz/014.lz"
+INCBIN "gfx/intro/014.lz"
 ; e778b
 
 INCBIN "baserom.gbc", $e778b, $e778d - $e778b
 
 IntroTilemap013: ; e778d
-INCBIN "gfx/intro/lz/013.lz"
+INCBIN "gfx/intro/013.lz"
 ; e77d9
 
 INCBIN "baserom.gbc", $e77d9, $e785d - $e77d9
 
 IntroUnownBackGFX: ; e785d
-INCBIN "gfx/intro/lz/unown_back.lz"
+INCBIN "gfx/intro/unown_back.lz"
 ; e799a
 
 INCBIN "baserom.gbc", $e799a, $e7a70 - $e799a
@@ -66850,7 +66853,12 @@ Music_HealPokemon:          INCLUDE "audio/music/healpokemon.asm"
 Music_Evolution:            INCLUDE "audio/music/evolution.asm"
 Music_Printer:              INCLUDE "audio/music/printer.asm"
 
-INCBIN "baserom.gbc", $f0941, $f3fb6 - $f0941
+INCBIN "baserom.gbc", $f0941, $f2787 - $f0941
+
+CryHeaders:
+INCLUDE "audio/cry_headers.asm"
+
+INCBIN "baserom.gbc", $f2d69, $f3fb6 - $f2d69
 
 
 SECTION "bank3D",DATA,BANK[$3D]
@@ -66909,10 +66917,10 @@ INCBIN "gfx/font_battle_extra.2bpp",$0,$200
 INCBIN "baserom.gbc", $f8800, $f8ba0 - $f8800
 
 TownMapGFX: ; f8ba0
-INCBIN "gfx/misc/lz/town_map.lz"
-; f8ea2
+INCBIN "gfx/misc/town_map.lz"
+; f8ea3
 
-INCBIN "baserom.gbc", $f8ea2, $fbbfc - $f8ea2
+INCBIN "baserom.gbc", $f8ea3, $fbbfc - $f8ea3
 
 CalcMagikarpLength: ; fbbfc
 ; Stores Magikarp's length at $d1ea-$d1eb in big endian
@@ -67181,7 +67189,7 @@ SECTION "bank42",DATA,BANK[$42]
 INCBIN "baserom.gbc", $108000, $109407 - $108000
 
 IntroLogoGFX: ; 109407
-INCBIN "gfx/intro/lz/logo.lz"
+INCBIN "gfx/intro/logo.lz"
 ; 10983f
 
 INCBIN "baserom.gbc", $10983f, $10aee1 - $10983f
@@ -67544,19 +67552,19 @@ TitleScreen: ; 10ed67
 INCBIN "baserom.gbc", $10eea7, $10ef46 - $10eea7
 
 TitleSuicuneGFX: ; 10ef46
-INCBIN "gfx/title/lz/suicune.lz"
+INCBIN "gfx/title/suicune.lz"
 ; 10f31b
 
 INCBIN "baserom.gbc", $10f31b, $10f326 - $10f31b
 
 TitleLogoGFX: ; 10f326
-INCBIN "gfx/title/lz/logo.lz"
+INCBIN "gfx/title/logo.lz"
 ; 10fced
 
 INCBIN "baserom.gbc", $10fced, $10fcee - $10fced
 
 TitleCrystalGFX: ; 10fcee
-INCBIN "gfx/title/lz/crystal.lz"
+INCBIN "gfx/title/crystal.lz"
 ; 10fed7
 
 INCBIN "baserom.gbc", $10fed7, $10fede - $10fed7
@@ -68254,23 +68262,23 @@ MagbyFrontpic:       INCBIN "gfx/pics/240/front.lz"
 WeepinbellFrontpic:  INCBIN "gfx/pics/070/front.lz"
 TotodileFrontpic:    INCBIN "gfx/pics/158/front.lz"
 CorsolaFrontpic:     INCBIN "gfx/pics/222/front.lz"
-FirebreatherPic:     INCBIN "gfx/trainers/lz/047.lz"
+FirebreatherPic:     INCBIN "gfx/trainers/047.lz"
 MachopFrontpic:      INCBIN "gfx/pics/066/front.lz"
 ChinchouFrontpic:    INCBIN "gfx/pics/170/front.lz"
 RattataFrontpic:     INCBIN "gfx/pics/019/front.lz"
-ChampionPic:         INCBIN "gfx/trainers/lz/015.lz"
+ChampionPic:         INCBIN "gfx/trainers/015.lz"
 SpearowFrontpic:     INCBIN "gfx/pics/021/front.lz"
 MagikarpFrontpic:    INCBIN "gfx/pics/129/front.lz"
 CharmanderFrontpic:  INCBIN "gfx/pics/004/front.lz"
 CuboneFrontpic:      INCBIN "gfx/pics/104/front.lz"
-BlackbeltTPic:       INCBIN "gfx/trainers/lz/049.lz"
-BikerPic:            INCBIN "gfx/trainers/lz/044.lz"
+BlackbeltTPic:       INCBIN "gfx/trainers/049.lz"
+BikerPic:            INCBIN "gfx/trainers/044.lz"
 NidoranMFrontpic:    INCBIN "gfx/pics/032/front.lz"
 PorygonFrontpic:     INCBIN "gfx/pics/137/front.lz"
-BrunoPic:            INCBIN "gfx/trainers/lz/012.lz"
+BrunoPic:            INCBIN "gfx/trainers/012.lz"
 GrimerFrontpic:      INCBIN "gfx/pics/088/front.lz"
 StaryuFrontpic:      INCBIN "gfx/pics/120/front.lz"
-HikerPic:            INCBIN "gfx/trainers/lz/043.lz"
+HikerPic:            INCBIN "gfx/trainers/043.lz"
 MeowthFrontpic:      INCBIN "gfx/pics/052/front.lz"
 Porygon2Frontpic:    INCBIN "gfx/pics/233/front.lz"
 SandshrewFrontpic:   INCBIN "gfx/pics/027/front.lz"
@@ -68288,15 +68296,15 @@ MisdreavusFrontpic:  INCBIN "gfx/pics/200/front.lz"
 HoundourFrontpic:    INCBIN "gfx/pics/228/front.lz"
 MankeyFrontpic:      INCBIN "gfx/pics/056/front.lz"
 CelebiFrontpic:      INCBIN "gfx/pics/251/front.lz"
-MediumPic:           INCBIN "gfx/trainers/lz/056.lz"
+MediumPic:           INCBIN "gfx/trainers/056.lz"
 PinecoFrontpic:      INCBIN "gfx/pics/204/front.lz"
 KrabbyFrontpic:      INCBIN "gfx/pics/098/front.lz"
-FisherPic:           INCBIN "gfx/trainers/lz/036.lz"
+FisherPic:           INCBIN "gfx/trainers/036.lz"
 JigglypuffFrontpic:  INCBIN "gfx/pics/039/front.lz"
 ParasFrontpic:       INCBIN "gfx/pics/046/front.lz"
 NidokingBackpic:     INCBIN "gfx/pics/034/back.lz"
-PokefanmPic:         INCBIN "gfx/trainers/lz/058.lz"
-BoarderPic:          INCBIN "gfx/trainers/lz/057.lz"
+PokefanmPic:         INCBIN "gfx/trainers/058.lz"
+BoarderPic:          INCBIN "gfx/trainers/057.lz"
 PsyduckFrontpic:     INCBIN "gfx/pics/054/front.lz"
 SquirtleFrontpic:    INCBIN "gfx/pics/007/front.lz"
 MachampBackpic:      INCBIN "gfx/pics/068/back.lz"
@@ -68307,11 +68315,11 @@ LanturnFrontpic:     INCBIN "gfx/pics/171/front.lz"
 TyrogueFrontpic:     INCBIN "gfx/pics/236/front.lz"
 SkiploomFrontpic:    INCBIN "gfx/pics/188/front.lz"
 MareepFrontpic:      INCBIN "gfx/pics/179/front.lz"
-ChuckPic:            INCBIN "gfx/trainers/lz/006.lz"
+ChuckPic:            INCBIN "gfx/trainers/006.lz"
 EeveeFrontpic:       INCBIN "gfx/pics/133/front.lz"
 ButterfreeBackpic:   INCBIN "gfx/pics/012/back.lz"
 ZubatFrontpic:       INCBIN "gfx/pics/041/front.lz"
-KimonoGirlPic:       INCBIN "gfx/trainers/lz/059.lz"
+KimonoGirlPic:       INCBIN "gfx/trainers/059.lz"
 AlakazamBackpic:     INCBIN "gfx/pics/065/back.lz"
 AipomFrontpic:       INCBIN "gfx/pics/190/front.lz"
 AbraFrontpic:        INCBIN "gfx/pics/063/front.lz"
@@ -68332,15 +68340,15 @@ SlugmaFrontpic:      INCBIN "gfx/pics/218/front.lz"
 GrowlitheFrontpic:   INCBIN "gfx/pics/058/front.lz"
 SlowpokeFrontpic:    INCBIN "gfx/pics/079/front.lz"
 SmoochumFrontpic:    INCBIN "gfx/pics/238/front.lz"
-JugglerPic:          INCBIN "gfx/trainers/lz/048.lz"
+JugglerPic:          INCBIN "gfx/trainers/048.lz"
 MarillFrontpic:      INCBIN "gfx/pics/183/front.lz"
-GuitaristPic:        INCBIN "gfx/trainers/lz/042.lz"
-PokefanfPic:         INCBIN "gfx/trainers/lz/061.lz"
+GuitaristPic:        INCBIN "gfx/trainers/042.lz"
+PokefanfPic:         INCBIN "gfx/trainers/061.lz"
 VenomothBackpic:     INCBIN "gfx/pics/049/back.lz"
-ClairPic:            INCBIN "gfx/trainers/lz/007.lz"
-PokemaniacPic:       INCBIN "gfx/trainers/lz/029.lz"
+ClairPic:            INCBIN "gfx/trainers/007.lz"
+PokemaniacPic:       INCBIN "gfx/trainers/029.lz"
 OmanyteFrontpic:     INCBIN "gfx/pics/138/front.lz"
-SkierPic:            INCBIN "gfx/trainers/lz/032.lz"
+SkierPic:            INCBIN "gfx/trainers/032.lz"
 PupitarFrontpic:     INCBIN "gfx/pics/247/front.lz"
 BellsproutFrontpic:  INCBIN "gfx/pics/069/front.lz"
 ShellderFrontpic:    INCBIN "gfx/pics/090/front.lz"
@@ -68350,7 +68358,7 @@ GyaradosBackpic:     INCBIN "gfx/pics/130/back.lz"
 NinetalesBackpic:    INCBIN "gfx/pics/038/back.lz"
 YanmaBackpic:        INCBIN "gfx/pics/193/back.lz"
 PinsirBackpic:       INCBIN "gfx/pics/127/back.lz"
-LassPic:             INCBIN "gfx/trainers/lz/024.lz"
+LassPic:             INCBIN "gfx/trainers/024.lz"
 ClefableBackpic:     INCBIN "gfx/pics/036/back.lz"
 DoduoFrontpic:       INCBIN "gfx/pics/084/front.lz"
 FeraligatrBackpic:   INCBIN "gfx/pics/160/back.lz"
@@ -68362,7 +68370,7 @@ SlowkingBackpic:     INCBIN "gfx/pics/199/back.lz"
 ElekidBackpic:       INCBIN "gfx/pics/239/back.lz"
 CelebiBackpic:       INCBIN "gfx/pics/251/back.lz"
 KrabbyBackpic:       INCBIN "gfx/pics/098/back.lz"
-BugCatcherPic:       INCBIN "gfx/trainers/lz/035.lz"
+BugCatcherPic:       INCBIN "gfx/trainers/035.lz"
 SnorlaxBackpic:      INCBIN "gfx/pics/143/back.lz"
 ; 14bffb
 
@@ -68380,7 +68388,7 @@ LarvitarFrontpic:    INCBIN "gfx/pics/246/front.lz"
 TyranitarBackpic:    INCBIN "gfx/pics/248/back.lz"
 SandslashBackpic:    INCBIN "gfx/pics/028/back.lz"
 SeadraBackpic:       INCBIN "gfx/pics/117/back.lz"
-TwinsPic:            INCBIN "gfx/trainers/lz/060.lz"
+TwinsPic:            INCBIN "gfx/trainers/060.lz"
 FarfetchDBackpic:    INCBIN "gfx/pics/083/back.lz"
 NidoranMBackpic:     INCBIN "gfx/pics/032/back.lz"
 LedybaBackpic:       INCBIN "gfx/pics/165/back.lz"
@@ -68396,13 +68404,13 @@ HypnoBackpic:        INCBIN "gfx/pics/097/back.lz"
 QuilavaBackpic:      INCBIN "gfx/pics/156/back.lz"
 CroconawBackpic:     INCBIN "gfx/pics/159/back.lz"
 SandshrewBackpic:    INCBIN "gfx/pics/027/back.lz"
-SailorPic:           INCBIN "gfx/trainers/lz/039.lz"
-BeautyPic:           INCBIN "gfx/trainers/lz/028.lz"
+SailorPic:           INCBIN "gfx/trainers/039.lz"
+BeautyPic:           INCBIN "gfx/trainers/028.lz"
 ShellderBackpic:     INCBIN "gfx/pics/090/back.lz"
 ZubatBackpic:        INCBIN "gfx/pics/041/back.lz"
 TeddiursaFrontpic:   INCBIN "gfx/pics/216/front.lz"
 CuboneBackpic:       INCBIN "gfx/pics/104/back.lz"
-GruntmPic:           INCBIN "gfx/trainers/lz/030.lz"
+GruntmPic:           INCBIN "gfx/trainers/030.lz"
 GloomBackpic:        INCBIN "gfx/pics/044/back.lz"
 MagcargoBackpic:     INCBIN "gfx/pics/219/back.lz"
 KabutopsBackpic:     INCBIN "gfx/pics/141/back.lz"
@@ -68421,7 +68429,7 @@ SECTION "bank54",DATA,BANK[$54]
 
 OmanyteBackpic:      INCBIN "gfx/pics/138/back.lz"
 PidgeyBackpic:       INCBIN "gfx/pics/016/back.lz"
-ScientistPic:        INCBIN "gfx/trainers/lz/019.lz"
+ScientistPic:        INCBIN "gfx/trainers/019.lz"
 QwilfishBackpic:     INCBIN "gfx/pics/211/back.lz"
 GligarBackpic:       INCBIN "gfx/pics/207/back.lz"
 TyphlosionBackpic:   INCBIN "gfx/pics/157/back.lz"
@@ -68436,8 +68444,8 @@ UnownDFrontpic:      INCBIN "gfx/pics/201d/front.lz"
 MiltankBackpic:      INCBIN "gfx/pics/241/back.lz"
 SteelixBackpic:      INCBIN "gfx/pics/208/back.lz"
 PersianBackpic:      INCBIN "gfx/pics/053/back.lz"
-LtSurgePic:          INCBIN "gfx/trainers/lz/018.lz"
-TeacherPic:          INCBIN "gfx/trainers/lz/033.lz"
+LtSurgePic:          INCBIN "gfx/trainers/018.lz"
+TeacherPic:          INCBIN "gfx/trainers/033.lz"
 EggPic:              INCBIN "gfx/pics/egg/front.lz"
 EeveeBackpic:        INCBIN "gfx/pics/133/back.lz"
 ShuckleFrontpic:     INCBIN "gfx/pics/213/front.lz"
@@ -68446,21 +68454,21 @@ RemoraidFrontpic:    INCBIN "gfx/pics/223/front.lz"
 PoliwagFrontpic:     INCBIN "gfx/pics/060/front.lz"
 OnixBackpic:         INCBIN "gfx/pics/095/back.lz"
 KoffingBackpic:      INCBIN "gfx/pics/109/back.lz"
-BirdKeeperPic:       INCBIN "gfx/trainers/lz/023.lz"
-FalknerPic:          INCBIN "gfx/trainers/lz/000.lz"
-KarenPic:            INCBIN "gfx/trainers/lz/013.lz"
+BirdKeeperPic:       INCBIN "gfx/trainers/023.lz"
+FalknerPic:          INCBIN "gfx/trainers/000.lz"
+KarenPic:            INCBIN "gfx/trainers/013.lz"
 NidorinaBackpic:     INCBIN "gfx/pics/030/back.lz"
 TentacruelBackpic:   INCBIN "gfx/pics/073/back.lz"
 GrowlitheBackpic:    INCBIN "gfx/pics/058/back.lz"
-KogaPic:             INCBIN "gfx/trainers/lz/014.lz"
+KogaPic:             INCBIN "gfx/trainers/014.lz"
 MachokeBackpic:      INCBIN "gfx/pics/067/back.lz"
 RaichuBackpic:       INCBIN "gfx/pics/026/back.lz"
 PoliwrathBackpic:    INCBIN "gfx/pics/062/back.lz"
-SwimmermPic:         INCBIN "gfx/trainers/lz/037.lz"
+SwimmermPic:         INCBIN "gfx/trainers/037.lz"
 SunkernFrontpic:     INCBIN "gfx/pics/191/front.lz"
 NidorinoBackpic:     INCBIN "gfx/pics/033/back.lz"
-MysticalmanPic:      INCBIN "gfx/trainers/lz/066.lz"
-CooltrainerfPic:     INCBIN "gfx/trainers/lz/027.lz"
+MysticalmanPic:      INCBIN "gfx/trainers/066.lz"
+CooltrainerfPic:     INCBIN "gfx/trainers/027.lz"
 ElectrodeFrontpic:   INCBIN "gfx/pics/101/front.lz"
 ; 153fe3
 
@@ -68473,14 +68481,14 @@ SudowoodoBackpic:    INCBIN "gfx/pics/185/back.lz"
 FlaaffyBackpic:      INCBIN "gfx/pics/180/back.lz"
 SentretFrontpic:     INCBIN "gfx/pics/161/front.lz"
 TogeticBackpic:      INCBIN "gfx/pics/176/back.lz"
-BugsyPic:            INCBIN "gfx/trainers/lz/002.lz"
+BugsyPic:            INCBIN "gfx/trainers/002.lz"
 MarowakBackpic:      INCBIN "gfx/pics/105/back.lz"
 GeodudeBackpic:      INCBIN "gfx/pics/074/back.lz"
 ScytherBackpic:      INCBIN "gfx/pics/123/back.lz"
 VileplumeBackpic:    INCBIN "gfx/pics/045/back.lz"
 HitmonchanBackpic:   INCBIN "gfx/pics/107/back.lz"
 JumpluffBackpic:     INCBIN "gfx/pics/189/back.lz"
-CooltrainermPic:     INCBIN "gfx/trainers/lz/026.lz"
+CooltrainermPic:     INCBIN "gfx/trainers/026.lz"
 BlastoiseBackpic:    INCBIN "gfx/pics/009/back.lz"
 MisdreavusBackpic:   INCBIN "gfx/pics/200/back.lz"
 TyrogueBackpic:      INCBIN "gfx/pics/236/back.lz"
@@ -68500,7 +68508,7 @@ RaticateBackpic:     INCBIN "gfx/pics/020/back.lz"
 VulpixBackpic:       INCBIN "gfx/pics/037/back.lz"
 EkansBackpic:        INCBIN "gfx/pics/023/back.lz"
 SeakingBackpic:      INCBIN "gfx/pics/119/back.lz"
-BurglarPic:          INCBIN "gfx/trainers/lz/046.lz"
+BurglarPic:          INCBIN "gfx/trainers/046.lz"
 PsyduckBackpic:      INCBIN "gfx/pics/054/back.lz"
 PikachuBackpic:      INCBIN "gfx/pics/025/back.lz"
 KabutoFrontpic:      INCBIN "gfx/pics/140/front.lz"
@@ -68508,12 +68516,12 @@ MareepBackpic:       INCBIN "gfx/pics/179/back.lz"
 RemoraidBackpic:     INCBIN "gfx/pics/223/back.lz"
 DittoFrontpic:       INCBIN "gfx/pics/132/front.lz"
 KingdraBackpic:      INCBIN "gfx/pics/230/back.lz"
-CamperPic:           INCBIN "gfx/trainers/lz/053.lz"
+CamperPic:           INCBIN "gfx/trainers/053.lz"
 WooperFrontpic:      INCBIN "gfx/pics/194/front.lz"
 ClefairyBackpic:     INCBIN "gfx/pics/035/back.lz"
 VenonatBackpic:      INCBIN "gfx/pics/048/back.lz"
 BellossomBackpic:    INCBIN "gfx/pics/182/back.lz"
-Rival1Pic:           INCBIN "gfx/trainers/lz/008.lz"
+Rival1Pic:           INCBIN "gfx/trainers/008.lz"
 SwinubBackpic:       INCBIN "gfx/pics/220/back.lz"
 ; 158000
 
@@ -68523,14 +68531,14 @@ SECTION "bank56",DATA,BANK[$56]
 ;                            Pics XV
 
 MewtwoBackpic:       INCBIN "gfx/pics/150/back.lz"
-PokemonProfPic:      INCBIN "gfx/trainers/lz/009.lz"
-CalPic:              INCBIN "gfx/trainers/lz/011.lz"
-SwimmerfPic:         INCBIN "gfx/trainers/lz/038.lz"
+PokemonProfPic:      INCBIN "gfx/trainers/009.lz"
+CalPic:              INCBIN "gfx/trainers/011.lz"
+SwimmerfPic:         INCBIN "gfx/trainers/038.lz"
 DiglettFrontpic:     INCBIN "gfx/pics/050/front.lz"
-OfficerPic:          INCBIN "gfx/trainers/lz/064.lz"
+OfficerPic:          INCBIN "gfx/trainers/064.lz"
 MukBackpic:          INCBIN "gfx/pics/089/back.lz"
 DelibirdBackpic:     INCBIN "gfx/pics/225/back.lz"
-SabrinaPic:          INCBIN "gfx/trainers/lz/034.lz"
+SabrinaPic:          INCBIN "gfx/trainers/034.lz"
 MagikarpBackpic:     INCBIN "gfx/pics/129/back.lz"
 AriadosBackpic:      INCBIN "gfx/pics/168/back.lz"
 SneaselBackpic:      INCBIN "gfx/pics/215/back.lz"
@@ -68538,11 +68546,11 @@ UmbreonBackpic:      INCBIN "gfx/pics/197/back.lz"
 MurkrowBackpic:      INCBIN "gfx/pics/198/back.lz"
 IvysaurBackpic:      INCBIN "gfx/pics/002/back.lz"
 SlowbroBackpic:      INCBIN "gfx/pics/080/back.lz"
-PsychicTPic:         INCBIN "gfx/trainers/lz/051.lz"
+PsychicTPic:         INCBIN "gfx/trainers/051.lz"
 GolduckBackpic:      INCBIN "gfx/pics/055/back.lz"
 WeezingBackpic:      INCBIN "gfx/pics/110/back.lz"
 EnteiBackpic:        INCBIN "gfx/pics/244/back.lz"
-GruntfPic:           INCBIN "gfx/trainers/lz/065.lz"
+GruntfPic:           INCBIN "gfx/trainers/065.lz"
 HorseaFrontpic:      INCBIN "gfx/pics/116/front.lz"
 PidgeotBackpic:      INCBIN "gfx/pics/018/back.lz"
 HoOhBackpic:         INCBIN "gfx/pics/250/back.lz"
@@ -68564,12 +68572,12 @@ SnubbullBackpic:     INCBIN "gfx/pics/209/back.lz"
 KinglerBackpic:      INCBIN "gfx/pics/099/back.lz"
 GengarBackpic:       INCBIN "gfx/pics/094/back.lz"
 RattataBackpic:      INCBIN "gfx/pics/019/back.lz"
-YoungsterPic:        INCBIN "gfx/trainers/lz/021.lz"
-WillPic:             INCBIN "gfx/trainers/lz/010.lz"
-SchoolboyPic:        INCBIN "gfx/trainers/lz/022.lz"
+YoungsterPic:        INCBIN "gfx/trainers/021.lz"
+WillPic:             INCBIN "gfx/trainers/010.lz"
+SchoolboyPic:        INCBIN "gfx/trainers/022.lz"
 MagnemiteFrontpic:   INCBIN "gfx/pics/081/front.lz"
-ErikaPic:            INCBIN "gfx/trainers/lz/020.lz"
-JaninePic:           INCBIN "gfx/trainers/lz/025.lz"
+ErikaPic:            INCBIN "gfx/trainers/020.lz"
+JaninePic:           INCBIN "gfx/trainers/025.lz"
 MagnemiteBackpic:    INCBIN "gfx/pics/081/back.lz"
 ; 15bffa
 
@@ -68580,33 +68588,33 @@ SECTION "bank57",DATA,BANK[$57]
 
 HoothootBackpic:     INCBIN "gfx/pics/163/back.lz"
 NoctowlBackpic:      INCBIN "gfx/pics/164/back.lz"
-MortyPic:            INCBIN "gfx/trainers/lz/003.lz"
+MortyPic:            INCBIN "gfx/trainers/003.lz"
 SlugmaBackpic:       INCBIN "gfx/pics/218/back.lz"
 KabutoBackpic:       INCBIN "gfx/pics/140/back.lz"
 VictreebelBackpic:   INCBIN "gfx/pics/071/back.lz"
 MeowthBackpic:       INCBIN "gfx/pics/052/back.lz"
 MeganiumBackpic:     INCBIN "gfx/pics/154/back.lz"
-PicnickerPic:        INCBIN "gfx/trainers/lz/052.lz"
+PicnickerPic:        INCBIN "gfx/trainers/052.lz"
 LickitungBackpic:    INCBIN "gfx/pics/108/back.lz"
 TogepiFrontpic:      INCBIN "gfx/pics/175/front.lz"
-SuperNerdPic:        INCBIN "gfx/trainers/lz/040.lz"
+SuperNerdPic:        INCBIN "gfx/trainers/040.lz"
 HaunterBackpic:      INCBIN "gfx/pics/093/back.lz"
 XatuBackpic:         INCBIN "gfx/pics/178/back.lz"
-RedPic:              INCBIN "gfx/trainers/lz/062.lz"
+RedPic:              INCBIN "gfx/trainers/062.lz"
 Porygon2Backpic:     INCBIN "gfx/pics/233/back.lz"
-JasminePic:          INCBIN "gfx/trainers/lz/005.lz"
+JasminePic:          INCBIN "gfx/trainers/005.lz"
 PinecoBackpic:       INCBIN "gfx/pics/204/back.lz"
 MetapodFrontpic:     INCBIN "gfx/pics/011/front.lz"
 SeelBackpic:         INCBIN "gfx/pics/086/back.lz"
 QuagsireBackpic:     INCBIN "gfx/pics/195/back.lz"
-WhitneyPic:          INCBIN "gfx/trainers/lz/001.lz"
+WhitneyPic:          INCBIN "gfx/trainers/001.lz"
 JolteonBackpic:      INCBIN "gfx/pics/135/back.lz"
 CaterpieFrontpic:    INCBIN "gfx/pics/010/front.lz"
 HoppipBackpic:       INCBIN "gfx/pics/187/back.lz"
-BluePic:             INCBIN "gfx/trainers/lz/063.lz"
+BluePic:             INCBIN "gfx/trainers/063.lz"
 GranbullBackpic:     INCBIN "gfx/pics/210/back.lz"
-GentlemanPic:        INCBIN "gfx/trainers/lz/031.lz"
-ExecutivemPic:       INCBIN "gfx/trainers/lz/050.lz"
+GentlemanPic:        INCBIN "gfx/trainers/031.lz"
+ExecutivemPic:       INCBIN "gfx/trainers/050.lz"
 SpearowBackpic:      INCBIN "gfx/pics/021/back.lz"
 SunkernBackpic:      INCBIN "gfx/pics/191/back.lz"
 LaprasBackpic:       INCBIN "gfx/pics/131/back.lz"
@@ -68619,13 +68627,13 @@ ChinchouBackpic:     INCBIN "gfx/pics/170/back.lz"
 ChanseyBackpic:      INCBIN "gfx/pics/113/back.lz"
 SkiploomBackpic:     INCBIN "gfx/pics/188/back.lz"
 SpinarakFrontpic:    INCBIN "gfx/pics/167/front.lz"
-Rival2Pic:           INCBIN "gfx/trainers/lz/041.lz"
+Rival2Pic:           INCBIN "gfx/trainers/041.lz"
 UnownWFrontpic:      INCBIN "gfx/pics/201w/front.lz"
 CharmanderBackpic:   INCBIN "gfx/pics/004/back.lz"
 RhyhornBackpic:      INCBIN "gfx/pics/111/back.lz"
 UnownCFrontpic:      INCBIN "gfx/pics/201c/front.lz"
-MistyPic:            INCBIN "gfx/trainers/lz/017.lz"
-BlainePic:           INCBIN "gfx/trainers/lz/045.lz"
+MistyPic:            INCBIN "gfx/trainers/017.lz"
+BlainePic:           INCBIN "gfx/trainers/045.lz"
 UnownZFrontpic:      INCBIN "gfx/pics/201z/front.lz"
 SwinubFrontpic:      INCBIN "gfx/pics/220/front.lz"
 LarvitarBackpic:     INCBIN "gfx/pics/246/back.lz"
@@ -68641,7 +68649,7 @@ SECTION "bank58",DATA,BANK[$58]
 ParasBackpic:        INCBIN "gfx/pics/046/back.lz"
 VaporeonBackpic:     INCBIN "gfx/pics/134/back.lz"
 TentacoolBackpic:    INCBIN "gfx/pics/072/back.lz"
-ExecutivefPic:       INCBIN "gfx/trainers/lz/054.lz"
+ExecutivefPic:       INCBIN "gfx/trainers/054.lz"
 BulbasaurBackpic:    INCBIN "gfx/pics/001/back.lz"
 SmoochumBackpic:     INCBIN "gfx/pics/238/back.lz"
 PichuBackpic:        INCBIN "gfx/pics/172/back.lz"
@@ -68655,8 +68663,8 @@ MrMimeBackpic:       INCBIN "gfx/pics/122/back.lz"
 CaterpieBackpic:     INCBIN "gfx/pics/010/back.lz"
 VoltorbFrontpic:     INCBIN "gfx/pics/100/front.lz"
 LugiaBackpic:        INCBIN "gfx/pics/249/back.lz"
-PrycePic:            INCBIN "gfx/trainers/lz/004.lz"
-BrockPic:            INCBIN "gfx/trainers/lz/016.lz"
+PrycePic:            INCBIN "gfx/trainers/004.lz"
+BrockPic:            INCBIN "gfx/trainers/016.lz"
 UnownGFrontpic:      INCBIN "gfx/pics/201g/front.lz"
 ArbokBackpic:        INCBIN "gfx/pics/024/back.lz"
 PolitoedBackpic:     INCBIN "gfx/pics/186/back.lz"
@@ -68664,7 +68672,7 @@ DragoniteBackpic:    INCBIN "gfx/pics/149/back.lz"
 HitmonleeBackpic:    INCBIN "gfx/pics/106/back.lz"
 NatuFrontpic:        INCBIN "gfx/pics/177/front.lz"
 UrsaringBackpic:     INCBIN "gfx/pics/217/back.lz"
-SagePic:             INCBIN "gfx/trainers/lz/055.lz"
+SagePic:             INCBIN "gfx/trainers/055.lz"
 TeddiursaBackpic:    INCBIN "gfx/pics/216/back.lz"
 PhanpyBackpic:       INCBIN "gfx/pics/231/back.lz"
 UnownVFrontpic:      INCBIN "gfx/pics/201v/front.lz"
@@ -114608,7 +114616,7 @@ Tileset33GFX:
 Tileset34GFX:
 Tileset35GFX:
 Tileset36GFX: ; 1dc5a1
-INCBIN "gfx/tilesets/lz/26.lz"
+INCBIN "gfx/tilesets/26.lz"
 ; 1dd1a8
 
 INCBIN "baserom.gbc", $1dd1a8, $1de29f - $1dd1a8
@@ -114646,10 +114654,10 @@ DudeAutoInput_DownA: ; 1de2af
 INCBIN "baserom.gbc",$1de2c5,$1de2e4 - $1de2c5
 
 PokegearGFX: ; 1de2e4
-INCBIN "gfx/misc/lz/pokegear.lz"
-; 1de5c6
+INCBIN "gfx/misc/pokegear.lz"
+; 1de5c7
 
-INCBIN "baserom.gbc",$1de5c6,$1e0000 - $1de5c6
+INCBIN "baserom.gbc",$1de5c7,$1e0000 - $1de5c7
 
 
 SECTION "bank78",DATA,BANK[$78]